From c6ca5b8f138b731bf5606c90d965f7f3c78169e1 Mon Sep 17 00:00:00 2001 From: Default email Date: Mon, 18 Jul 2022 18:21:45 +0200 Subject: [PATCH] Project import generated by Copybara. GitOrigin-RevId: e4d49de45a3b5dbcb881656b4e3986e666141ea9 --- .../languages-frameworks/python.section.md | 43 +- .../nixpkgs/doc/stdenv/stdenv.chapter.md | 2 +- third_party/nixpkgs/lib/systems/default.nix | 1 + third_party/nixpkgs/lib/systems/examples.nix | 10 +- .../nixpkgs/maintainers/maintainer-list.nix | 78 + .../maintainers/scripts/fetch-kde-qt.sh | 164 +- .../writing-nixos-tests.section.md | 4 +- .../writing-nixos-tests.section.xml | 3 + .../from_md/release-notes/rl-2211.section.xml | 9 + .../manual/release-notes/rl-2211.section.md | 2 + .../nixpkgs/nixos/modules/config/i18n.nix | 8 +- .../installer/tools/nix-fallback-paths.nix | 10 +- .../nixpkgs/nixos/modules/misc/ids.nix | 21 + .../nixpkgs/nixos/modules/misc/label.nix | 5 +- .../nixpkgs/nixos/modules/module-list.nix | 2 + .../nixos/modules/programs/_1password-gui.nix | 17 +- .../nixos/modules/programs/_1password.nix | 17 +- .../nixos/modules/programs/dmrconfig.nix | 2 +- .../nixos/modules/programs/streamdeck-ui.nix | 28 + .../nixpkgs/nixos/modules/security/pam.nix | 21 +- .../services/cluster/kubernetes/kubelet.nix | 6 +- .../jenkins/job-builder.nix | 22 +- .../services/display-managers/greetd.nix | 2 +- .../nixos/modules/services/misc/gitlab.nix | 4 +- .../nixos/modules/services/misc/jellyfin.nix | 67 +- .../modules/services/monitoring/netdata.nix | 2 +- .../modules/services/networking/minidlna.nix | 256 +- .../modules/services/networking/mxisd.nix | 16 +- .../services/security/pass-secret-service.nix | 27 + .../modules/services/security/privacyidea.nix | 62 +- .../services/web-apps/atlassian/jira.nix | 46 +- .../services/x11/desktop-managers/plasma5.nix | 4 +- .../systemd-boot/systemd-boot-builder.py | 2 - .../nixos/modules/virtualisation/cri-o.nix | 4 - .../virtualisation/parallels-guest.nix | 61 +- third_party/nixpkgs/nixos/tests/all-tests.nix | 2 + third_party/nixpkgs/nixos/tests/jenkins.nix | 15 +- .../nixpkgs/nixos/tests/kubernetes/dns.nix | 12 +- .../nixpkgs/nixos/tests/kubernetes/rbac.nix | 6 +- .../nixpkgs/nixos/tests/libuiohook.nix | 21 + .../nixpkgs/nixos/tests/pam/pam-u2f.nix | 3 +- .../nixos/tests/pass-secret-service.nix | 69 + third_party/nixpkgs/nixos/tests/pgadmin4.nix | 18 +- .../nixos/tests/web-servers/unit-php.nix | 17 +- .../applications/audio/friture/default.nix | 8 +- .../audio/jack-autoconnect/default.nix | 31 + .../applications/audio/qpwgraph/default.nix | 4 +- .../applications/audio/sonixd/default.nix | 4 +- .../0001-Add-Collection-SearchType.patch | 41 + .../audio/spotify-tui/Cargo.lock.patch | 11 + .../audio/spotify-tui/Cargo.toml.patch | 12 + .../audio/spotify-tui/default.nix | 37 +- .../pkgs/applications/audio/tauon/default.nix | 8 +- .../applications/audio/uade123/default.nix | 20 +- .../blockchains/alfis/default.nix | 6 +- .../blockchains/framesh/default.nix | 35 + .../blockchains/lndmanage/default.nix | 6 +- .../editors/android-studio/common.nix | 2 +- .../emacs/elisp-packages/elpa-generated.nix | 210 +- .../emacs/elisp-packages/nongnu-generated.nix | 364 +- .../elisp-packages/recipes-archive-melpa.json | 5617 ++++++++++------- .../editors/jetbrains/default.nix | 13 +- .../pkgs/applications/editors/mle/default.nix | 48 +- .../applications/editors/pinegrow/default.nix | 4 +- .../editors/standardnotes/default.nix | 16 +- .../editors/vim/plugins/generated.nix | 620 +- .../editors/vim/plugins/vim-plugin-names | 1 + .../emulators/retroarch/cores.nix | 7 + .../emulators/retroarch/hashes.json | 6 + .../emulators/retroarch/update_cores.py | 1 + .../applications/emulators/rpcs3/default.nix | 8 +- .../emulators/ryujinx/default.nix | 6 +- .../applications/emulators/ryujinx/deps.nix | 100 +- .../applications/emulators/ryujinx/updater.sh | 6 +- .../applications/emulators/wibo/default.nix | 34 + .../applications/emulators/wine/sources.nix | 14 +- .../applications/emulators/wine/vkd3d.nix | 4 +- .../applications/emulators/yuzu/default.nix | 12 +- .../applications/emulators/yuzu/update.sh | 2 +- .../applications/gis/qgis/unwrapped-ltr.nix | 4 +- .../pkgs/applications/gis/qgis/unwrapped.nix | 4 +- .../applications/graphics/ImageMagick/6.x.nix | 87 +- .../applications/graphics/ImageMagick/7.0.nix | 133 - .../graphics/ImageMagick/default.nix | 132 + .../applications/graphics/hydrus/default.nix | 6 +- .../graphics/inkscape/default.nix | 4 +- .../pkgs/applications/misc/OSCAR/default.nix | 4 +- .../applications/misc/bottles/default.nix | 6 +- .../pkgs/applications/misc/dasel/default.nix | 4 +- .../applications/misc/dialect/default.nix | 79 + .../applications/misc/electrum/default.nix | 6 +- .../applications/misc/gallery-dl/default.nix | 4 +- .../pkgs/applications/misc/gammu/default.nix | 4 +- .../applications/misc/gammu/systemd.patch | 12 +- .../applications/misc/gpsbabel/default.nix | 1 - .../pkgs/applications/misc/hugo/default.nix | 7 +- .../pkgs/applications/misc/mkgmap/default.nix | 4 +- .../misc/openbangla-keyboard/Cargo.lock | 251 + .../misc/openbangla-keyboard/default.nix | 72 + .../misc/pass-secret-service/default.nix | 44 +- .../int_from_bytes-deprecation-fix.patch | 22 + .../misc/prusa-slicer/super-slicer.nix | 31 +- .../applications/misc/sequeler/default.nix | 2 +- .../pkgs/applications/misc/sigal/default.nix | 2 + .../pkgs/applications/misc/solaar/default.nix | 16 +- .../misc/streamdeck-ui/default.nix | 95 + .../applications/misc/sunwait/default.nix | 2 +- .../misc/terminal-colors/default.nix | 4 +- .../misc/themechanger/default.nix | 4 +- .../pkgs/applications/misc/tut/default.nix | 6 +- .../browsers/chromium/upstream-info.json | 18 +- .../tor-browser-bundle-bin/default.nix | 6 +- .../networking/cluster/helm/default.nix | 8 +- .../networking/cluster/helmfile/default.nix | 28 +- .../networking/cluster/krane/Gemfile.lock | 26 +- .../networking/cluster/krane/gemset.nix | 44 +- .../cluster/kubectl-node-shell/default.nix | 32 + .../networking/cluster/nomad/1.2.nix | 6 +- .../networking/cluster/nomad/1.3.nix | 6 +- .../networking/cluster/talosctl/default.nix | 9 +- .../cluster/terraform-providers/default.nix | 4 - .../terraform-providers/providers.json | 192 +- .../networking/cluster/terranix/default.nix | 4 +- .../networking/cluster/tilt/default.nix | 8 - .../networking/cluster/werf/default.nix | 6 +- .../networking/feedreaders/photon/default.nix | 2 +- .../networking/flexget/default.nix | 5 +- .../google-drive-ocamlfuse/default.nix | 4 +- .../instant-messengers/discord/default.nix | 102 +- .../element/element-desktop-package.json | 7 +- .../element/element-web-package.json | 10 +- .../instant-messengers/element/pin.json | 10 +- .../instant-messengers/gajim/default.nix | 4 +- .../instant-messengers/pidgin/default.nix | 2 +- .../instant-messengers/webex/default.nix | 175 + .../networking/irc/weechat/default.nix | 4 +- .../thunderbird-bin/release_sources.nix | 530 +- .../mailreaders/thunderbird/packages.nix | 6 +- .../remote/aws-workspaces/default.nix | 12 +- .../networking/remote/wayvnc/default.nix | 10 +- .../networking/seaweedfs/default.nix | 6 +- .../networking/shellhub-agent/default.nix | 6 +- .../networking/sync/rclone/default.nix | 6 +- .../applications/office/jabref/default.nix | 164 +- .../office/jabref/gradle.lockfile | 180 + .../pkgs/applications/radio/aldo/default.nix | 2 +- .../applications/radio/dmrconfig/default.nix | 2 +- .../pkgs/applications/radio/tlf/default.nix | 2 +- .../science/biology/delly/default.nix | 4 +- .../science/biology/mafft/default.nix | 27 + .../science/electronics/vhd2vl/default.nix | 11 +- .../science/electronics/vhd2vl/test.patch | 35 - .../science/engineering/jflap/default.nix | 70 + .../engineering/strictdoc/conftest.py.patch | 15 + .../science/engineering/strictdoc/default.nix | 100 + .../science/logic/formula/default.nix | 1 + .../science/logic/zchaff/default.nix | 14 +- .../science/math/gmsh/default.nix | 4 +- .../science/math/nauty/default.nix | 4 +- .../science/math/sage/sage-src.nix | 7 + .../science/misc/nextinspace/default.nix | 6 +- .../science/programming/jflap/default.nix | 33 - .../git-and-tools/gh/default.nix | 4 +- .../git-and-tools/ghorg/default.nix | 4 +- .../git-and-tools/lab/default.nix | 16 +- .../version-management/gitea/default.nix | 4 +- .../version-management/josh/default.nix | 60 + .../version-management/mercurial/default.nix | 6 +- .../video/anime-downloader/default.nix | 8 +- .../video/jellyfin-media-player/default.nix | 3 + .../video/obs-studio/plugins/default.nix | 1 + .../plugins/obs-pipewire-audio-capture.nix | 32 + .../virtualization/crosvm/default.nix | 4 +- .../virtualization/podman/default.nix | 3 - .../virtualization/qemu/default.nix | 8 +- .../window-managers/cwm/default.nix | 4 +- .../window-managers/weston/default.nix | 6 +- .../pkgs/build-support/docker/examples.nix | 2 +- .../dotnet/build-dotnet-module/default.nix | 6 +- .../build-dotnet-module/hooks/default.nix | 9 +- .../hooks/dotnet-build-hook.sh | 1 + .../hooks/dotnet-check-hook.sh | 2 +- .../hooks/dotnet-configure-hook.sh | 2 +- .../hooks/dotnet-install-hook.sh | 1 + .../make-desktopitem/default.nix | 4 +- .../nixpkgs/pkgs/data/fonts/iosevka/bin.nix | 2 +- .../iosevka/comfy-private-build-plans.toml | 34 +- .../nixpkgs/pkgs/data/fonts/iosevka/comfy.nix | 9 +- .../pkgs/data/fonts/iosevka/update-comfy.sh | 33 + .../pkgs/data/fonts/iosevka/variants.nix | 184 +- .../icons/numix-icon-theme-circle/default.nix | 8 +- .../icons/numix-icon-theme-square/default.nix | 8 +- .../apps/elementary-files/default.nix | 10 + .../pkgs/desktops/surf-display/default.nix | 2 +- .../androidndk-pkgs/androidndk-pkgs.nix | 122 +- .../development/androidndk-pkgs/default.nix | 92 +- .../compilers/dotnet/build-dotnet.nix | 48 +- .../compilers/emscripten/default.nix | 4 +- .../compilers/emscripten/package.json | 2 +- .../pkgs/development/compilers/go/1.17.nix | 4 +- .../development/compilers/ligo/default.nix | 3 + .../development/compilers/ligo/ligo.patch | 134 + .../purescript/purescript/default.nix | 7 +- .../development/compilers/zig/default.nix | 7 +- .../development/coq-modules/gaia/default.nix | 3 +- .../coq-modules/mathcomp-finmap/default.nix | 2 + .../development/coq-modules/smtcoq/cvc4.nix | 44 + .../coq-modules/smtcoq/default.nix | 24 +- .../coq-modules/smtcoq/minisat-fenv.patch | 65 + .../embedded/jtag-remote-server/default.nix | 24 + .../interpreters/boron/default.nix | 48 + .../development/interpreters/erlang/R25.nix | 4 +- .../interpreters/renpy/default.nix | 89 + .../renpy/renpy-system-fribidi.diff | 51 + .../libraries/aqbanking/default.nix | 4 +- .../libraries/aqbanking/gwenhywfar.nix | 4 +- .../libraries/aqbanking/libchipcard.nix | 6 +- .../libraries/aqbanking/sources.nix | 29 +- .../libraries/armadillo/default.nix | 4 +- .../development/libraries/catch2/default.nix | 2 +- .../development/libraries/cjose/default.nix | 14 +- .../development/libraries/draco/default.nix | 4 +- .../development/libraries/eclib/default.nix | 4 +- .../development/libraries/fcppt/default.nix | 18 +- .../development/libraries/folly/default.nix | 6 +- .../development/libraries/ftxui/default.nix | 20 +- .../libraries/libbencodetools/default.nix | 21 +- .../development/libraries/libgit2/default.nix | 6 +- .../development/libraries/libgsf/default.nix | 4 +- .../libraries/libmaxminddb/default.nix | 2 +- .../libraries/libplacebo/default.nix | 4 +- .../libraries/libuiohook/default.nix | 71 + .../libraries/lucene++/default.nix | 12 +- .../development/libraries/metal/default.nix | 23 - .../development/libraries/neatvnc/default.nix | 10 +- .../libraries/nlohmann_json/default.nix | 10 +- .../libraries/openzwave/default.nix | 2 +- .../development/libraries/protobuf/3.20.nix | 6 + .../development/libraries/protobuf/3.21.nix | 6 + .../libraries/protobuf/generic-v3-cmake.nix | 107 + .../libraries/protolock/default.nix | 2 +- .../libraries/qt-6/hooks/wrap-qt-apps-hook.sh | 9 +- .../development/libraries/quictls/default.nix | 28 +- .../development/libraries/rocksdb/default.nix | 6 +- .../astronomy/stellarsolver/default.nix | 4 +- .../libraries/science/math/p4est/default.nix | 13 +- .../development/libraries/x265/default.nix | 2 +- .../development/libraries/xapian/default.nix | 9 +- .../libraries/xapian/tools/omega/default.nix | 6 +- .../0001-meson-fix-argp-standalone.patch | 18 + .../development/libraries/zchunk/default.nix | 6 +- .../lisp-modules/lisp-packages.nix | 15 +- .../androidenv/compose-android-packages.nix | 6 +- .../mobile/androidenv/ndk-bundle/default.nix | 21 +- .../make_standalone_toolchain.py_18.patch | 44 - .../development/mobile/androidenv/repo.json | 412 +- .../development/ocaml-modules/bap/default.nix | 10 +- .../ocaml-modules/biocaml/default.nix | 9 +- .../ocaml-modules/bistro/default.nix | 11 +- .../ocaml-modules/chrome-trace/default.nix | 20 + .../ocaml-modules/cohttp/async.nix | 12 +- .../ocaml-modules/faraday/async.nix | 7 +- .../ocaml-modules/gapi-ocaml/default.nix | 14 +- .../ocaml-modules/hack_parallel/default.nix | 8 +- .../hack_parallel/hack_parallel.patch | 68 + .../ocaml-modules/janestreet/0.15.nix | 1007 +++ .../janestreet/bonsai_jsoo_4_0.patch | 13 + .../janestreet/janePackage_0_15.nix | 31 + .../ocaml-modules/janestreet/pythonlib.patch | 22 + .../ocaml-modules/ocaml-lsp/jsonrpc.nix | 10 +- .../ocaml-modules/ocaml-lsp/lsp.nix | 18 +- .../ocaml-modules/phylogenetics/default.nix | 17 +- .../development/ocaml-modules/tls/default.nix | 6 +- .../python-modules/Fabric/default.nix | 4 +- .../adafruit-platformdetect/default.nix | 4 +- .../aioaladdinconnect/default.nix | 4 +- .../python-modules/aioftp/default.nix | 4 +- .../python-modules/ansible-compat/default.nix | 4 +- .../python-modules/ansible/default.nix | 4 +- .../python-modules/apache-beam/default.nix | 35 +- .../python-modules/asn1/default.nix | 4 +- .../python-modules/awslambdaric/default.nix | 5 + .../python-modules/bellows/default.nix | 2 +- .../python-modules/bsuite/default.nix | 101 + .../python-modules/celery-redbeat/default.nix | 46 + .../python-modules/crccheck/default.nix | 2 +- .../python-modules/dalle-mini/default.nix | 4 +- .../python-modules/dash/default.nix | 4 +- .../python-modules/datauri/default.nix | 37 + .../python-modules/dicttoxml2/default.nix | 32 + .../python-modules/distrax/default.nix | 57 + .../django-celery-beat/default.nix | 51 + .../django-celery-email/default.nix | 47 + .../django-health-check/default.nix | 61 + .../django-sampledatahelper/default.nix | 39 - .../django-timezone-field/default.nix | 6 +- .../python-modules/dm-env/default.nix | 38 + .../python-modules/dm-haiku/default.nix | 59 +- .../python-modules/dm-haiku/tests.nix | 68 + .../python-modules/dm-sonnet/default.nix | 54 + .../python-modules/dropbox/default.nix | 4 +- .../python-modules/dvc-data/default.nix | 4 +- .../python-modules/dvc-objects/default.nix | 4 +- .../python-modules/fastapi/default.nix | 6 +- .../python-modules/fastcore/default.nix | 4 +- .../python-modules/fontparts/default.nix | 4 +- .../garages-amsterdam/default.nix | 6 +- .../google-cloud-dns/default.nix | 4 +- .../google-cloud-error-reporting/default.nix | 4 +- .../google-cloud-iot/default.nix | 4 +- .../google-cloud-logging/default.nix | 4 +- .../google-cloud-monitoring/default.nix | 4 +- .../google-cloud-pubsub/default.nix | 4 +- .../google-cloud-speech/default.nix | 4 +- .../google-cloud-translate/default.nix | 4 +- .../google-cloud-vision/default.nix | 4 +- .../python-modules/hahomematic/default.nix | 4 +- .../python-modules/hg-evolve/default.nix | 4 +- .../python-modules/icalendar/default.nix | 4 +- .../python-modules/iminuit/default.nix | 4 +- .../python-modules/iso4217/default.nix | 4 +- .../python-modules/jarowinkler/default.nix | 6 +- .../jupyter-server-mathjax/default.nix | 6 +- .../python-modules/jupytext/default.nix | 14 +- .../python-modules/mitmproxy/default.nix | 6 +- .../python-modules/msldap/default.nix | 4 +- .../python-modules/nbdime/default.nix | 53 +- .../python-modules/nessclient/default.nix | 6 +- .../python-modules/nexia/default.nix | 6 +- .../python-modules/nextcord/paths.patch | 2 +- .../python-modules/openstacksdk/default.nix | 4 +- .../python-modules/optax/default.nix | 38 +- .../python-modules/optax/tests.nix | 35 + .../python-modules/panflute/default.nix | 4 +- .../python-modules/parfive/default.nix | 4 +- .../python-modules/patool/default.nix | 9 +- .../python-modules/peaqevcore/default.nix | 4 +- .../python-modules/pex/default.nix | 4 +- .../python-modules/pick/default.nix | 6 +- .../python-modules/plotnine/default.nix | 76 + .../python-modules/protobuf/default.nix | 7 +- .../python-modules/pubnub/default.nix | 4 +- .../python-modules/pure-pcapy3/default.nix | 2 +- .../python-modules/pydantic/default.nix | 17 +- .../python-modules/pygame_sdl2/default.nix | 6 +- .../python-modules/pygit2/default.nix | 10 + .../python-modules/pygti/default.nix | 6 +- .../python-modules/pygtrie/default.nix | 4 +- .../python-modules/pyialarm/default.nix | 12 +- .../python-modules/pyinstrument/default.nix | 31 + .../python-modules/pylint-django/default.nix | 9 +- .../python-modules/pylitterbot/default.nix | 4 +- .../python-modules/pymc/default.nix | 4 +- .../python-modules/pyodbc/default.nix | 4 +- .../pyserial-asyncio/default.nix | 2 +- .../python-modules/pyside2/default.nix | 10 +- .../python-modules/pytest-bdd/default.nix | 6 +- .../pytest-test-utils/default.nix | 4 +- .../python-modules/pytest-testmon/default.nix | 4 +- .../pytest-unordered/default.nix | 28 + .../python-benedict/default.nix | 6 +- .../python-cinderclient/default.nix | 4 +- .../python-glanceclient/default.nix | 4 +- .../python-ironicclient/default.nix | 4 +- .../python-keystoneclient/default.nix | 4 +- .../python-modules/python-songpal/default.nix | 6 +- .../python-swiftclient/default.nix | 4 +- .../python_openzwave/default.nix | 2 +- .../python-modules/pyunifiprotect/default.nix | 4 +- .../python-modules/regenmaschine/default.nix | 4 +- .../python-modules/reqif/default.nix | 60 + .../python-modules/rlax/default.nix | 65 + .../python-modules/scikit-misc/default.nix | 45 + .../python-modules/sentry-sdk/default.nix | 4 +- .../python-modules/shiboken2/default.nix | 5 +- .../simple-salesforce/default.nix | 6 +- .../simplisafe-python/default.nix | 4 +- .../python-modules/spacy-loggers/default.nix | 4 +- .../sphinx-basic-ng/default.nix | 4 +- .../sphinx-togglebutton/default.nix | 4 +- .../python-modules/sqlite-utils/default.nix | 4 +- .../python-modules/sqlmap/default.nix | 4 +- .../python-modules/statsd/default.nix | 2 +- .../python-modules/streamdeck/default.nix | 36 + .../streamdeck/hardcode-libusb.patch | 13 + .../python-modules/tatsu/default.nix | 6 +- .../python-modules/taxi/default.nix | 37 + .../python-modules/testcontainers/default.nix | 39 + .../python-modules/textx/default.nix | 178 + .../python-modules/textx/tests.nix | 53 + .../transmission-rpc/default.nix | 6 +- .../python-modules/trfl/default.nix | 75 + .../python-modules/twilio/default.nix | 4 +- .../types-setuptools/default.nix | 4 +- .../unifi-discovery/default.nix | 4 +- .../venstarcolortouch/default.nix | 9 +- .../voluptuous-serialize/default.nix | 2 +- .../python-modules/vowpalwabbit/default.nix | 4 +- .../python-modules/webargs/default.nix | 4 +- .../python-modules/webauthn/default.nix | 6 +- .../python-modules/weconnect-mqtt/default.nix | 4 +- .../python-modules/weconnect/default.nix | 6 +- .../python-modules/xapian/default.nix | 2 +- .../python-modules/xlib/default.nix | 4 + .../xlib/fix-no-protocol-specified.patch | 13 + .../python-modules/zha-quirks/default.nix | 2 +- .../python-modules/zigpy-cc/default.nix | 2 +- .../python-modules/zigpy-deconz/default.nix | 2 +- .../python-modules/zigpy-xbee/default.nix | 2 +- .../python-modules/zigpy-zigate/default.nix | 2 +- .../python-modules/zigpy/default.nix | 6 +- .../tools/analysis/cppcheck/default.nix | 21 +- .../pkgs/development/tools/bacon/default.nix | 6 +- .../tools/build-managers/bear/default.nix | 4 +- .../bear/no-double-relative.patch | 35 +- .../development/tools/cambalache/default.nix | 4 +- .../pkgs/development/tools/comby/comby.patch | 1025 +++ .../pkgs/development/tools/comby/default.nix | 3 + .../development/tools/conftest/default.nix | 6 +- .../jenkins/default.nix | 4 +- .../pkgs/development/tools/convco/default.nix | 6 +- .../pkgs/development/tools/cpm/default.nix | 43 + .../tools/database/sqlc/default.nix | 9 +- .../tools/database/sqlfluff/default.nix | 4 +- .../tools/database/trino-cli/default.nix | 4 +- .../pkgs/development/tools/dprint/default.nix | 6 +- .../development/tools/esbuild/default.nix | 4 +- .../pkgs/development/tools/gemstash/Gemfile | 2 + .../development/tools/gemstash/Gemfile.lock | 64 + .../development/tools/gemstash/default.nix | 16 + .../development/tools/gemstash/gemset.nix | 313 + .../development/tools/go-task/default.nix | 6 +- .../tools/golangci-lint/default.nix | 1 - .../tools/misc/universal-ctags/default.nix | 4 +- .../development/tools/mysql-shell/default.nix | 17 +- .../tools/ocaml/opam2json/default.nix | 25 + .../tools/parsing/tree-sitter/default.nix | 8 +- .../parsing/tree-sitter/grammars/default.nix | 2 +- .../grammars/tree-sitter-beancount.json | 8 +- .../tree-sitter/grammars/tree-sitter-c.json | 8 +- .../grammars/tree-sitter-cmake.json | 8 +- .../tree-sitter-embedded-template.json | 8 +- .../grammars/tree-sitter-fennel.json | 8 +- .../grammars/tree-sitter-glimmer.json | 8 +- .../grammars/tree-sitter-glsl.json | 8 +- .../grammars/tree-sitter-gowork.json | 2 +- .../grammars/tree-sitter-haskell.json | 8 +- .../grammars/tree-sitter-heex.json | 8 +- .../grammars/tree-sitter-ledger.json | 8 +- .../tree-sitter/grammars/tree-sitter-lua.json | 8 +- .../grammars/tree-sitter-markdown.json | 8 +- .../grammars/tree-sitter-ocaml.json | 8 +- .../grammars/tree-sitter-org-nvim.json | 8 +- .../tree-sitter/grammars/tree-sitter-php.json | 8 +- .../grammars/tree-sitter-python.json | 8 +- .../tree-sitter/grammars/tree-sitter-rst.json | 8 +- .../grammars/tree-sitter-rust.json | 8 +- .../tree-sitter/grammars/tree-sitter-sql.json | 8 +- .../grammars/tree-sitter-typescript.json | 8 +- .../tree-sitter/grammars/tree-sitter-vim.json | 8 +- .../tree-sitter/grammars/tree-sitter-zig.json | 8 +- .../pkgs/development/tools/pigeon/default.nix | 2 +- .../tools/proto-contrib/default.nix | 3 +- .../protoc-gen-twirp_typescript/default.nix | 2 +- .../pkgs/development/tools/rojo/default.nix | 42 + .../tools/rust/cargo-cross/default.nix | 11 +- .../tools/rust/cargo-embed/default.nix | 8 +- .../tools/rust/cargo-flash/default.nix | 8 +- .../tools/rust/cargo-public-api/default.nix | 34 + .../tools/rust/probe-rs-cli/default.nix | 8 +- .../development/tools/rust/rustup/default.nix | 8 +- .../tools/rust/svd2rust/default.nix | 6 +- .../pkgs/development/tools/sshs/default.nix | 32 + .../development/tools/vgo2nix/default.nix | 5 +- .../pkgs/development/tools/yq-go/default.nix | 6 +- .../pkgs/development/tools/zls/default.nix | 1 + .../pkgs/development/web/flyctl/default.nix | 6 +- .../pkgs/development/web/grails/default.nix | 4 +- .../nixpkgs/pkgs/games/ddnet/default.nix | 4 +- .../nixpkgs/pkgs/games/factorio/versions.json | 40 +- .../nixpkgs/pkgs/games/openrct2/default.nix | 40 +- .../nixpkgs/pkgs/games/osu-lazer/default.nix | 4 +- .../nixpkgs/pkgs/games/osu-lazer/deps.nix | 51 +- .../nixpkgs/pkgs/games/polymc/default.nix | 1 + .../pkgs/games/sgt-puzzles/default.nix | 39 +- .../nixpkgs/pkgs/games/simutrans/default.nix | 2 +- .../pkgs/os-specific/linux/adcli/default.nix | 68 + .../os-specific/linux/bpftools/default.nix | 4 +- .../os-specific/linux/bpftrace/default.nix | 4 +- .../os-specific/linux/displaylink/default.nix | 2 +- .../linux/firmware/linux-firmware/default.nix | 6 +- .../firmware/xow_dongle-firmware/default.nix | 14 +- .../pkgs/os-specific/linux/hdparm/default.nix | 4 +- .../linux/kernel/common-config.nix | 4 + .../linux/kernel/hardened/patches.json | 60 +- .../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 | 4 +- .../os-specific/linux/kernel/linux-5.18.nix | 4 +- .../os-specific/linux/kernel/linux-5.4.nix | 4 +- .../os-specific/linux/kernel/linux-libre.nix | 4 +- .../linux/kernel/linux-rt-5.10.nix | 6 +- .../linux/kernel/xanmod-kernels.nix | 11 +- .../os-specific/linux/kernel/zen-kernels.nix | 10 +- .../linux/logitech-udev-rules/default.nix | 19 - .../os-specific/linux/nvidia-x11/builder.sh | 5 +- .../os-specific/linux/pam_mount/default.nix | 10 +- .../os-specific/linux/prl-tools/default.nix | 159 +- .../linux/prl-tools/prl-tools.patch | 143 + .../os-specific/linux/rtl8192eu/default.nix | 6 +- .../pkgs/os-specific/linux/tiptop/default.nix | 2 +- .../os-specific/linux/tuigreet/default.nix | 6 +- .../pkgs/os-specific/linux/usbtop/default.nix | 2 +- .../pkgs/os-specific/linux/vmware/default.nix | 6 +- .../nixpkgs/pkgs/servers/adguardhome/bins.nix | 20 +- .../pkgs/servers/adguardhome/default.nix | 2 +- .../nixpkgs/pkgs/servers/atlassian/jira.nix | 10 +- .../nixpkgs/pkgs/servers/baserow/default.nix | 172 + .../nixpkgs/pkgs/servers/caddy/default.nix | 6 +- .../nixpkgs/pkgs/servers/consul/default.nix | 6 +- .../nixpkgs/pkgs/servers/dcnnt/default.nix | 4 +- .../pkgs/servers/dns/ncdns/default.nix | 7 +- .../pkgs/servers/endlessh-go/default.nix | 9 +- third_party/nixpkgs/pkgs/servers/etcd/3.4.nix | 6 +- .../pkgs/servers/http/unit/default.nix | 23 +- .../pkgs/servers/mail/rspamd/default.nix | 6 +- .../pkgs/servers/mattermost/default.nix | 12 +- .../servers/monitoring/grafana/default.nix | 6 +- .../monitoring/nagios/plugins/smartmon.nix | 42 + .../servers/monitoring/nagios/plugins/zfs.nix | 44 + .../monitoring/prometheus/domain-exporter.nix | 18 +- .../servers/monitoring/telegraf/default.nix | 2 +- .../nixpkgs/pkgs/servers/mpd/default.nix | 4 +- .../servers/nosql/eventstore/create-deps.sh | 98 - .../pkgs/servers/nosql/eventstore/default.nix | 105 +- .../pkgs/servers/nosql/eventstore/deps.nix | 927 +-- .../pkgs/servers/openafs/1.8/module.nix | 48 +- .../nixpkgs/pkgs/servers/polaris/default.nix | 5 + .../nixpkgs/pkgs/servers/rt/default.nix | 7 +- .../pkgs/servers/sql/postgresql/ext/age.nix | 11 +- .../servers/sql/postgresql/ext/pg_cron.nix | 4 +- .../nixpkgs/pkgs/servers/traefik/default.nix | 6 +- .../pkgs/servers/web-apps/searxng/default.nix | 62 + .../servers/web-apps/snipe-it/default.nix | 4 +- .../pkgs/shells/bash/fzf-obc/default.nix | 30 + .../nixpkgs/pkgs/shells/hilbish/default.nix | 2 +- .../pkgs/shells/zsh/oh-my-zsh/default.nix | 6 +- .../pkgs/shells/zsh/zsh-history/default.nix | 13 +- .../stdenv/linux/bootstrap-files/mips64el.nix | 25 + .../nixpkgs/pkgs/stdenv/linux/default.nix | 1 + .../pkgs/tools/admin/boulder/default.nix | 39 +- .../pkgs/tools/admin/gtk-vnc/default.nix | 4 +- .../pkgs/tools/admin/iredis/default.nix | 58 + .../nixpkgs/pkgs/tools/admin/lxd/default.nix | 4 +- .../pkgs/tools/admin/pgadmin/default.nix | 28 +- .../pkgs/tools/admin/pgadmin/package.json | 17 +- .../pkgs/tools/admin/pgadmin/yarn.lock | 2434 +++---- .../nixpkgs/pkgs/tools/admin/pgadmin/yarn.nix | 2196 ++----- .../nixpkgs/pkgs/tools/admin/syft/default.nix | 3 - .../pkgs/tools/admin/trivy/default.nix | 3 - .../pkgs/tools/admin/wander/default.nix | 4 +- .../tools/archivers/fsarchiver/default.nix | 2 +- .../pkgs/tools/archivers/runzip/default.nix | 10 +- .../pkgs/tools/audio/yabridge/default.nix | 64 +- .../yabridge/hardcode-dependencies.patch | 56 +- .../libyabridge-from-nix-profiles.patch | 71 + ...ch => chainloader-from-nix-profiles.patch} | 26 +- .../pkgs/tools/audio/yabridgectl/default.nix | 17 +- .../remove-dependency-verification.patch | 18 + .../tools/bluetooth/bluetuith/default.nix | 25 + .../pkgs/tools/cd-dvd/ventoy-bin/default.nix | 1 + .../pkgs/tools/filesystems/bindfs/default.nix | 4 +- .../pkgs/tools/misc/adafruit-ampy/default.nix | 2 +- .../nixpkgs/pkgs/tools/misc/cod/default.nix | 2 +- .../pkgs/tools/misc/diffoscope/default.nix | 4 +- .../nixpkgs/pkgs/tools/misc/dsq/default.nix | 3 - .../misc/dt-shell-color-scripts/default.nix | 12 +- .../nixpkgs/pkgs/tools/misc/dua/default.nix | 6 +- .../nixpkgs/pkgs/tools/misc/dust/default.nix | 6 +- .../pkgs/tools/misc/flitter/default.nix | 12 +- .../pkgs/tools/misc/flitter/flitter.patch | 13 + .../nixpkgs/pkgs/tools/misc/fpart/default.nix | 4 +- .../nixpkgs/pkgs/tools/misc/grub/2.0x.nix | 2 +- ...u-false-to-avoid-hostname-dependency.patch | 38 + .../pkgs/tools/misc/hdfview/default.nix | 29 +- .../tools/misc/mutagen-compose/default.nix | 4 +- .../pkgs/tools/misc/mutagen/default.nix | 4 +- .../misc/opentelemetry-collector/contrib.nix | 2 +- .../nixpkgs/pkgs/tools/misc/page/default.nix | 6 +- .../nixpkgs/pkgs/tools/misc/paps/default.nix | 2 +- .../pkgs/tools/misc/patdiff/default.nix | 4 +- .../pkgs/tools/misc/steampipe/default.nix | 4 +- .../nixpkgs/pkgs/tools/misc/stow/default.nix | 7 +- .../pkgs/tools/misc/unicode/default.nix | 16 +- .../pkgs/tools/misc/upterm/default.nix | 4 +- .../pkgs/tools/misc/yt-dlp/default.nix | 4 +- .../tools/networking/boringtun/default.nix | 8 +- .../pkgs/tools/networking/clash/default.nix | 6 +- .../pkgs/tools/networking/curl/default.nix | 49 +- .../pkgs/tools/networking/drill/default.nix | 6 +- .../pkgs/tools/networking/mu/default.nix | 4 +- .../tools/networking/shadowfox/default.nix | 9 +- .../tools/networking/wakeonlan/default.nix | 8 +- .../tools/package-management/nix/common.nix | 4 + .../tools/package-management/nix/default.nix | 54 +- .../nix/patches/flaky-tests.patch | 12 + .../install-nlohmann_json-headers.patch | 36 - .../pkgs/tools/security/gitsign/default.nix | 3 - .../pkgs/tools/security/grype/default.nix | 3 - .../pkgs/tools/security/httpx/default.nix | 6 +- .../pkgs/tools/security/iaito/default.nix | 61 + .../tools/security/pinentry-rofi/default.nix | 41 + .../pkgs/tools/security/semgrep/common.nix | 55 + .../pkgs/tools/security/semgrep/default.nix | 81 + .../tools/security/semgrep/semgrep-core.nix | 22 + .../pkgs/tools/security/spire/default.nix | 4 +- .../pkgs/tools/system/gotop/default.nix | 6 +- .../pkgs/tools/text/mdbook/default.nix | 14 +- .../pkgs/tools/text/miller/default.nix | 14 +- .../tools/typesetting/satysfi/default.nix | 2 + .../pkgs/tools/typesetting/sile/default.nix | 4 +- .../virtualization/linode-cli/default.nix | 8 +- .../nixpkgs/pkgs/top-level/aliases.nix | 4 +- .../nixpkgs/pkgs/top-level/all-packages.nix | 735 ++- .../nixpkgs/pkgs/top-level/linux-kernels.nix | 3 +- .../nixpkgs/pkgs/top-level/ocaml-packages.nix | 15 +- .../nixpkgs/pkgs/top-level/perl-packages.nix | 6 +- .../nixpkgs/pkgs/top-level/python-aliases.nix | 1 + .../pkgs/top-level/python-packages.nix | 44 +- 631 files changed, 18039 insertions(+), 10269 deletions(-) create mode 100644 third_party/nixpkgs/nixos/modules/programs/streamdeck-ui.nix create mode 100644 third_party/nixpkgs/nixos/modules/services/security/pass-secret-service.nix create mode 100644 third_party/nixpkgs/nixos/tests/libuiohook.nix create mode 100644 third_party/nixpkgs/nixos/tests/pass-secret-service.nix create mode 100644 third_party/nixpkgs/pkgs/applications/audio/jack-autoconnect/default.nix create mode 100644 third_party/nixpkgs/pkgs/applications/audio/spotify-tui/0001-Add-Collection-SearchType.patch create mode 100644 third_party/nixpkgs/pkgs/applications/audio/spotify-tui/Cargo.lock.patch create mode 100644 third_party/nixpkgs/pkgs/applications/audio/spotify-tui/Cargo.toml.patch create mode 100644 third_party/nixpkgs/pkgs/applications/blockchains/framesh/default.nix create mode 100644 third_party/nixpkgs/pkgs/applications/emulators/wibo/default.nix delete mode 100644 third_party/nixpkgs/pkgs/applications/graphics/ImageMagick/7.0.nix create mode 100644 third_party/nixpkgs/pkgs/applications/graphics/ImageMagick/default.nix create mode 100644 third_party/nixpkgs/pkgs/applications/misc/dialect/default.nix create mode 100644 third_party/nixpkgs/pkgs/applications/misc/openbangla-keyboard/Cargo.lock create mode 100644 third_party/nixpkgs/pkgs/applications/misc/openbangla-keyboard/default.nix create mode 100644 third_party/nixpkgs/pkgs/applications/misc/pass-secret-service/int_from_bytes-deprecation-fix.patch create mode 100644 third_party/nixpkgs/pkgs/applications/misc/streamdeck-ui/default.nix create mode 100644 third_party/nixpkgs/pkgs/applications/networking/cluster/kubectl-node-shell/default.nix create mode 100644 third_party/nixpkgs/pkgs/applications/networking/instant-messengers/webex/default.nix create mode 100644 third_party/nixpkgs/pkgs/applications/office/jabref/gradle.lockfile create mode 100644 third_party/nixpkgs/pkgs/applications/science/biology/mafft/default.nix delete mode 100644 third_party/nixpkgs/pkgs/applications/science/electronics/vhd2vl/test.patch create mode 100644 third_party/nixpkgs/pkgs/applications/science/engineering/jflap/default.nix create mode 100644 third_party/nixpkgs/pkgs/applications/science/engineering/strictdoc/conftest.py.patch create mode 100644 third_party/nixpkgs/pkgs/applications/science/engineering/strictdoc/default.nix delete mode 100644 third_party/nixpkgs/pkgs/applications/science/programming/jflap/default.nix create mode 100644 third_party/nixpkgs/pkgs/applications/version-management/josh/default.nix create mode 100644 third_party/nixpkgs/pkgs/applications/video/obs-studio/plugins/obs-pipewire-audio-capture.nix create mode 100755 third_party/nixpkgs/pkgs/data/fonts/iosevka/update-comfy.sh create mode 100644 third_party/nixpkgs/pkgs/development/compilers/ligo/ligo.patch create mode 100644 third_party/nixpkgs/pkgs/development/coq-modules/smtcoq/cvc4.nix create mode 100644 third_party/nixpkgs/pkgs/development/coq-modules/smtcoq/minisat-fenv.patch create mode 100644 third_party/nixpkgs/pkgs/development/embedded/jtag-remote-server/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/interpreters/boron/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/interpreters/renpy/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/interpreters/renpy/renpy-system-fribidi.diff create mode 100644 third_party/nixpkgs/pkgs/development/libraries/libuiohook/default.nix delete mode 100644 third_party/nixpkgs/pkgs/development/libraries/metal/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/libraries/protobuf/3.20.nix create mode 100644 third_party/nixpkgs/pkgs/development/libraries/protobuf/3.21.nix create mode 100644 third_party/nixpkgs/pkgs/development/libraries/protobuf/generic-v3-cmake.nix create mode 100644 third_party/nixpkgs/pkgs/development/libraries/zchunk/0001-meson-fix-argp-standalone.patch delete mode 100644 third_party/nixpkgs/pkgs/development/mobile/androidenv/ndk-bundle/make_standalone_toolchain.py_18.patch create mode 100644 third_party/nixpkgs/pkgs/development/ocaml-modules/chrome-trace/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/ocaml-modules/hack_parallel/hack_parallel.patch create mode 100644 third_party/nixpkgs/pkgs/development/ocaml-modules/janestreet/0.15.nix create mode 100644 third_party/nixpkgs/pkgs/development/ocaml-modules/janestreet/bonsai_jsoo_4_0.patch create mode 100644 third_party/nixpkgs/pkgs/development/ocaml-modules/janestreet/janePackage_0_15.nix create mode 100644 third_party/nixpkgs/pkgs/development/ocaml-modules/janestreet/pythonlib.patch create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/bsuite/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/celery-redbeat/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/datauri/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/dicttoxml2/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/distrax/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/django-celery-beat/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/django-celery-email/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/django-health-check/default.nix delete mode 100644 third_party/nixpkgs/pkgs/development/python-modules/django-sampledatahelper/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/dm-env/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/dm-haiku/tests.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/dm-sonnet/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/optax/tests.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/plotnine/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/pyinstrument/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/pytest-unordered/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/reqif/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/rlax/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/scikit-misc/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/streamdeck/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/streamdeck/hardcode-libusb.patch create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/taxi/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/testcontainers/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/textx/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/textx/tests.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/trfl/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/xlib/fix-no-protocol-specified.patch create mode 100644 third_party/nixpkgs/pkgs/development/tools/comby/comby.patch create mode 100644 third_party/nixpkgs/pkgs/development/tools/cpm/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/tools/gemstash/Gemfile create mode 100644 third_party/nixpkgs/pkgs/development/tools/gemstash/Gemfile.lock create mode 100644 third_party/nixpkgs/pkgs/development/tools/gemstash/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/tools/gemstash/gemset.nix create mode 100644 third_party/nixpkgs/pkgs/development/tools/ocaml/opam2json/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/tools/rojo/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/tools/rust/cargo-public-api/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/tools/sshs/default.nix create mode 100644 third_party/nixpkgs/pkgs/os-specific/linux/adcli/default.nix delete mode 100644 third_party/nixpkgs/pkgs/os-specific/linux/logitech-udev-rules/default.nix create mode 100644 third_party/nixpkgs/pkgs/os-specific/linux/prl-tools/prl-tools.patch create mode 100644 third_party/nixpkgs/pkgs/servers/baserow/default.nix create mode 100644 third_party/nixpkgs/pkgs/servers/monitoring/nagios/plugins/smartmon.nix create mode 100644 third_party/nixpkgs/pkgs/servers/monitoring/nagios/plugins/zfs.nix delete mode 100755 third_party/nixpkgs/pkgs/servers/nosql/eventstore/create-deps.sh create mode 100644 third_party/nixpkgs/pkgs/servers/web-apps/searxng/default.nix create mode 100644 third_party/nixpkgs/pkgs/shells/bash/fzf-obc/default.nix create mode 100644 third_party/nixpkgs/pkgs/stdenv/linux/bootstrap-files/mips64el.nix create mode 100644 third_party/nixpkgs/pkgs/tools/admin/iredis/default.nix create mode 100644 third_party/nixpkgs/pkgs/tools/audio/yabridge/libyabridge-from-nix-profiles.patch rename third_party/nixpkgs/pkgs/tools/audio/yabridgectl/{libyabridge-from-nix-profiles.patch => chainloader-from-nix-profiles.patch} (80%) create mode 100644 third_party/nixpkgs/pkgs/tools/audio/yabridgectl/remove-dependency-verification.patch create mode 100644 third_party/nixpkgs/pkgs/tools/bluetooth/bluetuith/default.nix create mode 100644 third_party/nixpkgs/pkgs/tools/misc/flitter/flitter.patch create mode 100644 third_party/nixpkgs/pkgs/tools/misc/hdfview/0001-Hardcode-isUbuntu-false-to-avoid-hostname-dependency.patch create mode 100644 third_party/nixpkgs/pkgs/tools/package-management/nix/patches/flaky-tests.patch delete mode 100644 third_party/nixpkgs/pkgs/tools/package-management/nix/patches/install-nlohmann_json-headers.patch create mode 100644 third_party/nixpkgs/pkgs/tools/security/iaito/default.nix create mode 100644 third_party/nixpkgs/pkgs/tools/security/pinentry-rofi/default.nix create mode 100644 third_party/nixpkgs/pkgs/tools/security/semgrep/common.nix create mode 100644 third_party/nixpkgs/pkgs/tools/security/semgrep/default.nix create mode 100644 third_party/nixpkgs/pkgs/tools/security/semgrep/semgrep-core.nix diff --git a/third_party/nixpkgs/doc/languages-frameworks/python.section.md b/third_party/nixpkgs/doc/languages-frameworks/python.section.md index 09e177c7a4..7df8464917 100644 --- a/third_party/nixpkgs/doc/languages-frameworks/python.section.md +++ b/third_party/nixpkgs/doc/languages-frameworks/python.section.md @@ -602,10 +602,10 @@ been removed, in this case, it's recommended to use `pytestCheckHook`. #### Using pytestCheckHook {#using-pytestcheckhook} `pytestCheckHook` is a convenient hook which will substitute the setuptools -`test` command for a checkPhase which runs `pytest`. This is also beneficial +`test` command for a `checkPhase` which runs `pytest`. This is also beneficial when a package may need many items disabled to run the test suite. -Using the example above, the analagous pytestCheckHook usage would be: +Using the example above, the analagous `pytestCheckHook` usage would be: ``` checkInputs = [ pytestCheckHook ]; @@ -624,7 +624,7 @@ Using the example above, the analagous pytestCheckHook usage would be: ]; ``` -This is expecially useful when tests need to be conditionallydisabled, +This is expecially useful when tests need to be conditionally disabled, for example: ``` @@ -640,31 +640,35 @@ for example: "socket" ]; ``` -Trying to concatenate the related strings to disable tests in a regular checkPhase -would be much harder to read. This also enables us to comment on why specific tests -are disabled. + +Trying to concatenate the related strings to disable tests in a regular +`checkPhase` would be much harder to read. This also enables us to comment on +why specific tests are disabled. #### Using pythonImportsCheck {#using-pythonimportscheck} -Although unit tests are highly prefered to validate correctness of a package, not -all packages have test suites that can be ran easily, and some have none at all. +Although unit tests are highly preferred to validate correctness of a package, not +all packages have test suites that can be run easily, and some have none at all. To help ensure the package still works, `pythonImportsCheck` can attempt to import the listed modules. ``` pythonImportsCheck = [ "requests" "urllib" ]; ``` + roughly translates to: + ``` postCheck = '' PYTHONPATH=$out/${python.sitePackages}:$PYTHONPATH python -c "import requests; import urllib" ''; ``` -However, this is done in it's own phase, and not dependent on whether `doCheck = true;` + +However, this is done in its own phase, and not dependent on whether `doCheck = true;`. This can also be useful in verifying that the package doesn't assume commonly -present packages (e.g. `setuptools`) +present packages (e.g. `setuptools`). #### Using pythonRelaxDepsHook {#using-pythonrelaxdepshook} @@ -719,7 +723,7 @@ pkg3 ``` In general you should always use `pythonRelaxDeps`, because `pythonRemoveDeps` -will convert build errors in runtime errors. However `pythonRemoveDeps` may +will convert build errors into runtime errors. However `pythonRemoveDeps` may still be useful in exceptional cases, and also to remove dependencies wrongly declared by upstream (for example, declaring `black` as a runtime dependency instead of a dev dependency). @@ -738,14 +742,14 @@ creates a special link to the project code. That way, you can run updated code without having to reinstall after each and every change you make. Development mode is also available. Let's see how you can use it. -In the previous Nix expression the source was fetched from an url. We can also +In the previous Nix expression the source was fetched from a url. We can also refer to a local source instead using `src = ./path/to/source/tree;` If we create a `shell.nix` file which calls `buildPythonPackage`, and if `src` is a local source, and if the local source has a `setup.py`, then development mode is activated. -In the following example we create a simple environment that has a Python 3.9 +In the following example, we create a simple environment that has a Python 3.9 version of our package in it, as well as its dependencies and other packages we like to have in the environment, all specified with `propagatedBuildInputs`. Indeed, we can just add any package we like to have in our environment to @@ -862,7 +866,7 @@ Each interpreter has the following attributes: ### Optimizations {#optimizations} -The Python interpreters are by default not build with optimizations enabled, because +The Python interpreters are by default not built with optimizations enabled, because the builds are in that case not reproducible. To enable optimizations, override the interpreter of interest, e.g using @@ -913,7 +917,7 @@ and the aliases #### `buildPythonPackage` function {#buildpythonpackage-function} The `buildPythonPackage` function is implemented in -`pkgs/development/interpreters/python/mk-python-derivation` +`pkgs/development/interpreters/python/mk-python-derivation.nix` using setup hooks. The following is an example: @@ -954,7 +958,7 @@ The `buildPythonPackage` mainly does four things: * In the `postFixup` phase, the `wrapPythonPrograms` bash function is called to wrap all programs in the `$out/bin/*` directory to include `$PATH` environment variable and add dependent libraries to script's `sys.path`. -* In the `installCheck` phase, `${python.interpreter} setup.py test` is ran. +* In the `installCheck` phase, `${python.interpreter} setup.py test` is run. By default tests are run because `doCheck = true`. Test dependencies, like e.g. the test runner, should be added to `checkInputs`. @@ -969,7 +973,7 @@ following are specific to `buildPythonPackage`: * `catchConflicts ? true`: If `true`, abort package build if a package name appears more than once in dependency tree. Default is `true`. -* `disabled` ? false: If `true`, package is not built for the particular Python +* `disabled ? false`: If `true`, package is not built for the particular Python interpreter version. * `dontWrapPythonPrograms ? false`: Skip wrapping of Python programs. * `permitUserSite ? false`: Skip setting the `PYTHONNOUSERSITE` environment @@ -1421,7 +1425,8 @@ in newpkgs.inkscape ### `python setup.py bdist_wheel` cannot create .whl {#python-setup.py-bdist_wheel-cannot-create-.whl} -Executing `python setup.py bdist_wheel` in a `nix-shell `fails with +Executing `python setup.py bdist_wheel` in a `nix-shell`fails with + ``` ValueError: ZIP does not support timestamps before 1980 ``` @@ -1513,7 +1518,7 @@ in pkgs.mkShell rec { # the environment. pythonPackages.python - # This execute some shell code to initialize a venv in $venvDir before + # This executes some shell code to initialize a venv in $venvDir before # dropping into the shell pythonPackages.venvShellHook diff --git a/third_party/nixpkgs/doc/stdenv/stdenv.chapter.md b/third_party/nixpkgs/doc/stdenv/stdenv.chapter.md index 4daaea5c17..5f7f45dc44 100644 --- a/third_party/nixpkgs/doc/stdenv/stdenv.chapter.md +++ b/third_party/nixpkgs/doc/stdenv/stdenv.chapter.md @@ -1218,7 +1218,7 @@ The `validatePkgConfig` hook validates all pkg-config (`.pc`) files in a package ### cmake {#cmake} -Overrides the default configure phase to run the CMake command. By default, we use the Make generator of CMake. In addition, dependencies are added automatically to CMAKE_PREFIX_PATH so that packages are correctly detected by CMake. Some additional flags are passed in to give similar behavior to configure-based packages. You can disable this hook’s behavior by setting configurePhase to a custom value, or by setting dontUseCmakeConfigure. cmakeFlags controls flags passed only to CMake. By default, parallel building is enabled as CMake supports parallel building almost everywhere. When Ninja is also in use, CMake will detect that and use the ninja generator. +Overrides the default configure phase to run the CMake command. By default, we use the Make generator of CMake. In addition, dependencies are added automatically to `CMAKE_PREFIX_PATH` so that packages are correctly detected by CMake. Some additional flags are passed in to give similar behavior to configure-based packages. You can disable this hook’s behavior by setting `configurePhase` to a custom value, or by setting `dontUseCmakeConfigure`. `cmakeFlags` controls flags passed only to CMake. By default, parallel building is enabled as CMake supports parallel building almost everywhere. When Ninja is also in use, CMake will detect that and use the ninja generator. ### xcbuildHook {#xcbuildhook} diff --git a/third_party/nixpkgs/lib/systems/default.nix b/third_party/nixpkgs/lib/systems/default.nix index d9d0918c1c..25340825c4 100644 --- a/third_party/nixpkgs/lib/systems/default.nix +++ b/third_party/nixpkgs/lib/systems/default.nix @@ -36,6 +36,7 @@ rec { config = parse.tripleFromSystem final.parsed; # Determine whether we can execute binaries built for the provided platform. canExecute = platform: + final.isAndroid == platform.isAndroid && parse.isCompatible final.parsed.cpu platform.parsed.cpu && final.parsed.kernel == platform.parsed.kernel; isCompatible = _: throw "2022-05-23: isCompatible has been removed in favor of canExecute, refer to the 22.11 changelog for details"; diff --git a/third_party/nixpkgs/lib/systems/examples.nix b/third_party/nixpkgs/lib/systems/examples.nix index 03bb5ffcda..65dc9c07e3 100644 --- a/third_party/nixpkgs/lib/systems/examples.nix +++ b/third_party/nixpkgs/lib/systems/examples.nix @@ -57,23 +57,23 @@ rec { armv7a-android-prebuilt = { config = "armv7a-unknown-linux-androideabi"; rustc.config = "armv7-linux-androideabi"; - sdkVer = "29"; - ndkVer = "21"; + sdkVer = "28"; + ndkVer = "24"; useAndroidPrebuilt = true; } // platforms.armv7a-android; aarch64-android-prebuilt = { config = "aarch64-unknown-linux-android"; rustc.config = "aarch64-linux-android"; - sdkVer = "29"; - ndkVer = "21"; + sdkVer = "28"; + ndkVer = "24"; useAndroidPrebuilt = true; }; aarch64-android = { config = "aarch64-unknown-linux-android"; sdkVer = "30"; - ndkVer = "21"; + ndkVer = "24"; libc = "bionic"; useAndroidPrebuilt = false; useLLVM = true; diff --git a/third_party/nixpkgs/maintainers/maintainer-list.nix b/third_party/nixpkgs/maintainers/maintainer-list.nix index 6d9da62e2d..1a0b2ab335 100644 --- a/third_party/nixpkgs/maintainers/maintainer-list.nix +++ b/third_party/nixpkgs/maintainers/maintainer-list.nix @@ -417,6 +417,12 @@ githubId = 4732885; name = "Ivan Jager"; }; + aiotter = { + email = "git@aiotter.com"; + github = "aiotter"; + githubId = 37664775; + name = "Yuto Oguchi"; + }; airwoodix = { email = "airwoodix@posteo.me"; github = "airwoodix"; @@ -887,6 +893,13 @@ githubId = 661909; name = "Antonio Nuno Monteiro"; }; + anoa = { + matrix = "@andrewm:amorgan.xyz"; + email = "andrew@amorgan.xyz"; + github = "anoadragon453"; + githubId = 1342360; + name = "Andrew Morgan"; + }; anpryl = { email = "anpryl@gmail.com"; github = "anpryl"; @@ -3733,6 +3746,12 @@ githubId = 1897147; name = "Elijah Caine"; }; + Elinvention = { + email = "elia@elinvention.ovh"; + github = "Elinvention"; + githubId = 5737945; + name = "Elia Argentieri"; + }; elitak = { email = "elitak@gmail.com"; github = "elitak"; @@ -5393,6 +5412,13 @@ githubId = 40234257; name = "ilkecan bozdogan"; }; + ihatethefrench = { + email = "michal@tar.black"; + matrix = "@michal:tar.black"; + github = "ihatethefrench"; + githubId = 30374463; + name = "Michal S."; + }; illegalprime = { email = "themichaeleden@gmail.com"; github = "illegalprime"; @@ -6109,6 +6135,12 @@ githubId = 60272884; name = "Jonathan Jeppener-Haltenhoff"; }; + jocelynthode = { + email = "jocelyn.thode@gmail.com"; + github = "jocelynthode"; + githubId = 3967312; + name = "Jocelyn Thode"; + }; joelancaster = { email = "joe.a.lancas@gmail.com"; github = "JoeLancaster"; @@ -6615,6 +6647,15 @@ githubId = 15373888; name = "Claudius Holeksa"; }; + ken-matsui = { + email = "nix@kmatsui.me"; + github = "ken-matsui"; + githubId = 26405363; + name = "Ken Matsui"; + keys = [{ + fingerprint = "3611 8CD3 6DE8 3334 B44A DDE4 1033 60B3 298E E433"; + }]; + }; kennyballou = { email = "kb@devnulllabs.io"; github = "kennyballou"; @@ -7857,6 +7898,12 @@ githubId = 26470037; name = "Markus Kowalewski"; }; + mariaa144 = { + email = "speechguard_intensivist@aleeas.com"; + github = "mariaa144"; + githubId = 105451387; + name = "Maria"; + }; marijanp = { name = "Marijan Petričević"; email = "marijan.petricevic94@gmail.com"; @@ -8923,6 +8970,15 @@ githubId = 818502; name = "Nathan Yong"; }; + natsukium = { + email = "nixpkgs@natsukium.com"; + github = "natsukium"; + githubId = 25083790; + name = "Tomoya Otabi"; + keys = [{ + fingerprint = "3D14 6004 004C F882 D519 6CD4 9EA4 5A31 DB99 4C53"; + }]; + }; natto1784 = { email = "natto@weirdnatto.in"; github = "natto1784"; @@ -9033,6 +9089,15 @@ github = "nessdoor"; githubId = 25993494; }; + netali = { + name = "Jennifer Graul"; + email = "me@netali.de"; + github = "NetaliDev"; + githubId = 15304894; + keys = [{ + fingerprint = "F729 2594 6F58 0B05 8FB3 F271 9C55 E636 426B 40A9"; + }]; + }; netcrns = { email = "jason.wing@gmx.de"; github = "netcrns"; @@ -9286,6 +9351,12 @@ githubId = 40049608; name = "Andy Chun"; }; + nook = { + name = "Tom Nook"; + email = "0xnook@protonmail.com"; + github = "0xnook"; + githubId = 88323754; + }; noreferences = { email = "norkus@norkus.net"; github = "jozuas"; @@ -11498,6 +11569,13 @@ githubId = 543055; name = "Shadaj Laddad"; }; + shadowrz = { + email = "shadowrz+nixpkgs@disroot.org"; + matrix = "@ShadowRZ:matrixim.cc"; + github = "ShadowRZ"; + githubId = 23130178; + name = "夜坂雅"; + }; shahrukh330 = { email = "shahrukh330@gmail.com"; github = "shahrukh330"; diff --git a/third_party/nixpkgs/maintainers/scripts/fetch-kde-qt.sh b/third_party/nixpkgs/maintainers/scripts/fetch-kde-qt.sh index 22d7815197..9e2348fda7 100755 --- a/third_party/nixpkgs/maintainers/scripts/fetch-kde-qt.sh +++ b/third_party/nixpkgs/maintainers/scripts/fetch-kde-qt.sh @@ -2,30 +2,159 @@ #! nix-shell -i bash -p coreutils findutils gnused nix wget set -efuo pipefail +export LC_COLLATE=C # fix sort order -SRCS= -if [ -d "$1" ]; then - SRCS="$(pwd)/$1/srcs.nix" - . "$1/fetch.sh" -else - SRCS="$(pwd)/$(dirname $1)/srcs.nix" - . "$1" +# parse files and folders from https://download.kde.org/ and https://download.qt.io/ +# you can override this function in fetch.sh +function PARSE_INDEX() { + cat "$1" | grep -o -E -e '\s+href="[^"]+\.tar\.xz"' -e '\s+href="[-_a-zA-Z0-9]+/"' | cut -d'"' -f2 | sort | uniq +} + +if [ $# != 1 ]; then + echo "example use:" >&2 + echo "cd nixpkgs/" >&2 + echo "./maintainers/scripts/fetch-kde-qt.sh pkgs/development/libraries/qt-5/5.12" >&2 + exit 1 fi -tmp=$(mktemp -d) -pushd $tmp >/dev/null -wget -nH -r -c --no-parent "${WGET_ARGS[@]}" >/dev/null +if ! echo "$1" | grep -q '^pkgs/'; then + echo "error: path argument must start with pkgs/" >&2 + exit 1 +fi -csv=$(mktemp) -find . -type f | while read src; do +# need absolute path for the pushd-popd block +if [ -f "$1" ]; then + echo "ok: using fetchfile $1" + fetchfilerel="$1" + fetchfile="$(readlink -f "$fetchfilerel")" # resolve absolute path + basedir="$(dirname "$fetchfile")" + basedirrel="$(dirname "$fetchfilerel")" +elif [ -d "$1" ]; then + echo "ok: using basedir $1" + basedirrel="$1" + basedir="$(readlink -f "$basedirrel")" # resolve absolute path + if ! [ -d "$basedir" ]; then + basedir="$(dirname "$basedir")" + fi + fetchfile="$basedir/fetch.sh" +else + echo 'error: $1 must be file or dir' >&2 + exit 1 +fi + +pkgname=$(basename "$basedir") +SRCS="$basedir/srcs.nix" +srcsrel="$basedirrel/srcs.nix" + +source "$fetchfile" + +if [ -n "$WGET_ARGS" ]; then # old format + BASE_URL="${WGET_ARGS[0]}" # convert to new format + # validate + if ! echo "$BASE_URL" | grep -q -E '^(http|https|ftp)://'; then + printf 'error: from WGET_ARGS, converted invalid BASE_URL: %q\n' "$BASE_URL" >&2 + exit 1 + fi + printf 'ok: from WGET_ARGS, converted BASE_URL: %q\n' "$BASE_URL" +elif [ -n "$BASE_URL" ]; then # new format + : +else + echo "error: fetch.sh must set either WGET_ARGS or BASE_URL" >&2 + exit 1 +fi + +tmptpl=tmp.fetch-kde-qt.$pkgname.XXXXXXXXXX + +tmp=$(mktemp -d $tmptpl) +pushd $tmp >/dev/null +echo "tempdir is $tmp" + +wgetargs='--quiet --show-progress' +#wgetargs='' # debug + +dirlist="$BASE_URL" +filelist="" +base_url_len=${#BASE_URL} + +clean_urls() { + # // -> / + sed -E 's,//+,/,g' | sed -E 's,^(http|https|ftp):/,&/,' +} + +while [ -n "$dirlist" ] +do + for dirurl in $dirlist + do + echo "fetching index.html from $dirurl" + relpath=$(echo "./${dirurl:$base_url_len}" | clean_urls) + mkdir -p "$relpath" + indexfile=$(echo "$relpath/index.html" | clean_urls) + wget $wgetargs -O "$indexfile" "$dirurl" + echo "parsing $indexfile" + filedirlist="$(PARSE_INDEX "$indexfile")" + filelist_next="$(echo "$filedirlist" | grep '\.tar\.xz$' | while read file; do echo "$dirurl/$file"; done)" + filelist_next="$(echo "$filelist_next" | clean_urls)" + [ -n "$filelist" ] && filelist+=$'\n' + filelist+="$filelist_next" + dirlist="$(echo "$filedirlist" | grep -v '\.tar\.xz$' | while read dir; do echo "$dirurl/$dir"; done || true)" + dirlist="$(echo "$dirlist" | clean_urls)" + done +done + +filecount=$(echo "$filelist" | wc -l) + +if [ -z "$filelist" ] +then + echo "error: no files parsed from $tmp/index.html" + exit 1 +fi + +echo "parsed $filecount tar.xz files:"; echo "$filelist" + +# most time is spent here +echo "fetching $filecount sha256 files ..." +urllist="$(echo "$filelist" | while read file; do echo "$file.sha256"; done)" +# wget -r: keep directory structure +echo "$urllist" | xargs wget $wgetargs -nH -r -c --no-parent && { + actual=$(find . -type f -name '*.sha256' | wc -l) + echo "fetching $filecount sha256 files done: got $actual files" +} || { + # workaround: in rare cases, the server does not provide the sha256 files + # for example when the release is just a few hours old + # and the servers are not yet fully synced + actual=$(find . -type f -name '*.sha256' | wc -l) + echo "fetching $filecount sha256 files failed: got only $actual files" + + # TODO fetch only missing tar.xz files + echo "fetching $filecount tar.xz files ..." + urllist="$(echo "$filelist" | while read file; do echo "$BASE_URL/$file"; done)" + echo "$urllist" | xargs wget $wgetargs -nH -r -c --no-parent + + echo "generating sha256 files ..." + find . -type f -name '*.tar.xz' | while read src; do + name=$(basename "$src") + sha256=$(sha256sum "$src" | cut -d' ' -f1) + echo "$sha256 $name" >"$src.sha256" + done +} + +csv=$(mktemp $tmptpl.csv) +echo "writing temporary file $csv ..." +find . -type f -name '*.sha256' | while read sha256file; do + src="${sha256file%.*}" # remove extension + sha256=$(cat $sha256file | cut -d' ' -f1) # base16 + sha256=$(nix-hash --type sha256 --to-base32 $sha256) # Sanitize file name filename=$(basename "$src" | tr '@' '_') nameVersion="${filename%.tar.*}" name=$(echo "$nameVersion" | sed -e 's,-[[:digit:]].*,,' | sed -e 's,-opensource-src$,,' | sed -e 's,-everywhere-src$,,') version=$(echo "$nameVersion" | sed -e 's,^\([[:alpha:]][[:alnum:]]*-\)\+,,') - echo "$name,$version,$src,$filename" >>$csv + echo "$name,$version,$src,$filename,$sha256" >>$csv done +files_before=$(grep -c 'src = ' "$SRCS") + +echo "writing output file $SRCS ..." cat >"$SRCS" <>"$SRCS" <>"$SRCS" +files_after=$(grep -c 'src = ' "$SRCS") +echo "files before: $files_before" +echo "files after: $files_after" + +echo "compare:" +echo "git diff $srcsrel" + popd >/dev/null rm -fr $tmp >/dev/null diff --git a/third_party/nixpkgs/nixos/doc/manual/development/writing-nixos-tests.section.md b/third_party/nixpkgs/nixos/doc/manual/development/writing-nixos-tests.section.md index f4f4056ad9..da965ce09e 100644 --- a/third_party/nixpkgs/nixos/doc/manual/development/writing-nixos-tests.section.md +++ b/third_party/nixpkgs/nixos/doc/manual/development/writing-nixos-tests.section.md @@ -362,7 +362,6 @@ with foo_running: ... # Put `foo` through its paces ``` - `polling_condition` takes the following (optional) arguments: `seconds_interval` @@ -407,6 +406,9 @@ import ./make-test-python.nix nodes = { }; + # Type checking on extra packages doesn't work yet + skipTypeCheck = true; + testScript = '' import numpy as np assert str(np.zeros(4) == "array([0., 0., 0., 0.])") diff --git a/third_party/nixpkgs/nixos/doc/manual/from_md/development/writing-nixos-tests.section.xml b/third_party/nixpkgs/nixos/doc/manual/from_md/development/writing-nixos-tests.section.xml index 46367bdd34..7e4af03829 100644 --- a/third_party/nixpkgs/nixos/doc/manual/from_md/development/writing-nixos-tests.section.xml +++ b/third_party/nixpkgs/nixos/doc/manual/from_md/development/writing-nixos-tests.section.xml @@ -680,6 +680,9 @@ import ./make-test-python.nix nodes = { }; + # Type checking on extra packages doesn't work yet + skipTypeCheck = true; + testScript = '' import numpy as np assert str(np.zeros(4) == "array([0., 0., 0., 0.])") diff --git a/third_party/nixpkgs/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml b/third_party/nixpkgs/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml index 550dddfaf3..864b6e47db 100644 --- a/third_party/nixpkgs/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml +++ b/third_party/nixpkgs/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml @@ -341,6 +341,15 @@ Add udev rules for the Teensy family of microcontrollers. + + + The pass-secret-service package now + includes systemd units from upstream, so adding it to the + NixOS services.dbus.packages option will + make it start automatically as a systemd user service when an + application tries to talk to the libsecret D-Bus API. + + There is a new module for the thunar diff --git a/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-2211.section.md b/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-2211.section.md index b652419bcf..d4059e7393 100644 --- a/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-2211.section.md +++ b/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-2211.section.md @@ -128,6 +128,8 @@ Use `configure.packages` instead. - Add udev rules for the Teensy family of microcontrollers. +- The `pass-secret-service` package now includes systemd units from upstream, so adding it to the NixOS `services.dbus.packages` option will make it start automatically as a systemd user service when an application tries to talk to the libsecret D-Bus API. + - There is a new module for the `thunar` program (the Xfce file manager), which depends on the `xfconf` dbus service, and also has a dbus service and a systemd unit. The option `services.xserver.desktopManager.xfce.thunarPlugins` has been renamed to `programs.thunar.plugins`, and in a future release it may be removed. - There is a new module for the `xfconf` program (the Xfce configuration storage system), which has a dbus service. diff --git a/third_party/nixpkgs/nixos/modules/config/i18n.nix b/third_party/nixpkgs/nixos/modules/config/i18n.nix index 60af360a2a..cdf5c661e5 100644 --- a/third_party/nixpkgs/nixos/modules/config/i18n.nix +++ b/third_party/nixpkgs/nixos/modules/config/i18n.nix @@ -53,16 +53,16 @@ with lib; supportedLocales = mkOption { type = types.listOf types.str; - default = builtins.map (l: l + "/UTF-8") - (unique ( + default = unique + (builtins.map (l: (replaceStrings [ "utf8" "utf-8" "UTF8" ] [ "UTF-8" "UTF-8" "UTF-8" ] l) + "/UTF-8") ( [ "C.UTF-8" config.i18n.defaultLocale ] ++ (attrValues (filterAttrs (n: v: n != "LANGUAGE") config.i18n.extraLocaleSettings)) )); defaultText = literalExpression '' - builtins.map (l: l + "/UTF-8") - (unique ( + unique + (builtins.map (l: (replaceStrings [ "utf8" "utf-8" "UTF8" ] [ "UTF-8" "UTF-8" "UTF-8" ] l) + "/UTF-8") ( [ "C.UTF-8" config.i18n.defaultLocale diff --git a/third_party/nixpkgs/nixos/modules/installer/tools/nix-fallback-paths.nix b/third_party/nixpkgs/nixos/modules/installer/tools/nix-fallback-paths.nix index bd09724ebf..0035ceca6f 100644 --- a/third_party/nixpkgs/nixos/modules/installer/tools/nix-fallback-paths.nix +++ b/third_party/nixpkgs/nixos/modules/installer/tools/nix-fallback-paths.nix @@ -1,7 +1,7 @@ { - x86_64-linux = "/nix/store/6g4fla3vkcxihph282a0v3cd10709y7c-nix-2.9.1"; - i686-linux = "/nix/store/j143221z44469zx21f5m9a47x7y1jpr5-nix-2.9.1"; - aarch64-linux = "/nix/store/c4z3vy1sgm49la8bvmdrrpssgk4iw2nk-nix-2.9.1"; - x86_64-darwin = "/nix/store/cqdwb7khf6zg94bz7lnvfjqx6z775qaw-nix-2.9.1"; - aarch64-darwin = "/nix/store/1brkxcs287n1px2i4fq39l7h51hjv0f8-nix-2.9.1"; + x86_64-linux = "/nix/store/3af6g226v4hsv6x7xzh23d6wqyq0nzjp-nix-2.10.3"; + i686-linux = "/nix/store/43xxh2jip6rpdhylc5z9a5fxx54dw206-nix-2.10.3"; + aarch64-linux = "/nix/store/6qw3r57nra08ars8j8zyj3fl8lz4cvnd-nix-2.10.3"; + x86_64-darwin = "/nix/store/3b7qrm0qjw57fmznrsvm0ai568i89hc2-nix-2.10.3"; + aarch64-darwin = "/nix/store/gp7k17iy1n7hgf97qwnxw28c6v9nhb1i-nix-2.10.3"; } diff --git a/third_party/nixpkgs/nixos/modules/misc/ids.nix b/third_party/nixpkgs/nixos/modules/misc/ids.nix index 60794cef36..e3d7866cab 100644 --- a/third_party/nixpkgs/nixos/modules/misc/ids.nix +++ b/third_party/nixpkgs/nixos/modules/misc/ids.nix @@ -667,6 +667,27 @@ in # uid. Users and groups with the same name should have equal # uids and gids. Also, don't use gids above 399! + # For exceptional cases where you really need a gid above 399, leave a + # comment stating why. + # + # Also, avoid the following GID ranges: + # + # 1000 - 29999: user accounts (see ../config/update-users-groups.pl) + # 30000 - 31000: nixbld users (the upper limit is arbitrarily chosen) + # 61184 - 65519: systemd DynamicUser (see systemd.exec(5)) + # 65535: the error return sentinel value when uid_t was 16 bits + # + # 100000 - 6653600: subgid allocated for user namespaces + # (see ../config/update-users-groups.pl) + # 4294967294: unauthenticated user in some NFS implementations + # 4294967295: error return sentinel value + # + # References: + # https://www.debian.org/doc/debian-policy/ch-opersys.html#uid-and-gid-classes + + onepassword = 31001; # 1Password requires that its GID be larger than 1000 + onepassword-cli = 31002; # 1Password requires that its GID be larger than 1000 + users = 100; nixbld = 30000; nogroup = 65534; diff --git a/third_party/nixpkgs/nixos/modules/misc/label.nix b/third_party/nixpkgs/nixos/modules/misc/label.nix index 02b91555b3..b97cbaa263 100644 --- a/third_party/nixpkgs/nixos/modules/misc/label.nix +++ b/third_party/nixpkgs/nixos/modules/misc/label.nix @@ -11,7 +11,7 @@ in options.system = { nixos.label = mkOption { - type = types.str; + type = types.strMatching "[a-zA-Z0-9:_\\.-]*"; description = '' NixOS version name to be used in the names of generated outputs and boot labels. @@ -19,6 +19,9 @@ in If you ever wanted to influence the labels in your GRUB menu, this is the option for you. + It can only contain letters, numbers and the following symbols: + :, _, . and -. + The default is separated by "-" + "-" + NIXOS_LABEL_VERSION environment variable (defaults to the value of diff --git a/third_party/nixpkgs/nixos/modules/module-list.nix b/third_party/nixpkgs/nixos/modules/module-list.nix index 268ebbf18d..82c0b5d74d 100644 --- a/third_party/nixpkgs/nixos/modules/module-list.nix +++ b/third_party/nixpkgs/nixos/modules/module-list.nix @@ -215,6 +215,7 @@ ./programs/systemtap.nix ./programs/starship.nix ./programs/steam.nix + ./programs/streamdeck-ui.nix ./programs/sway.nix ./programs/system-config-printer.nix ./programs/thefuck.nix @@ -1002,6 +1003,7 @@ ./services/security/oauth2_proxy.nix ./services/security/oauth2_proxy_nginx.nix ./services/security/opensnitch.nix + ./services/security/pass-secret-service.nix ./services/security/privacyidea.nix ./services/security/physlock.nix ./services/security/shibboleth-sp.nix diff --git a/third_party/nixpkgs/nixos/modules/programs/_1password-gui.nix b/third_party/nixpkgs/nixos/modules/programs/_1password-gui.nix index 42f6a0b522..657116c267 100644 --- a/third_party/nixpkgs/nixos/modules/programs/_1password-gui.nix +++ b/third_party/nixpkgs/nixos/modules/programs/_1password-gui.nix @@ -8,19 +8,16 @@ let in { + imports = [ + (mkRemovedOptionModule [ "programs" "_1password-gui" "gid" ] '' + A preallocated GID will be used instead. + '') + ]; + options = { programs._1password-gui = { enable = mkEnableOption "the 1Password GUI application"; - gid = mkOption { - type = types.addCheck types.int (x: x >= 1000); - example = literalExpression "5000"; - description = '' - The gid to assign to the onepassword group, which is needed for browser integration. - It must be 1000 or greater. - ''; - }; - polkitPolicyOwners = mkOption { type = types.listOf types.str; default = [ ]; @@ -44,7 +41,7 @@ in in mkIf cfg.enable { environment.systemPackages = [ package ]; - users.groups.onepassword.gid = cfg.gid; + users.groups.onepassword.gid = config.ids.gids.onepassword; security.wrappers = { "1Password-BrowserSupport" = { diff --git a/third_party/nixpkgs/nixos/modules/programs/_1password.nix b/third_party/nixpkgs/nixos/modules/programs/_1password.nix index 547c12867a..b87e9b776e 100644 --- a/third_party/nixpkgs/nixos/modules/programs/_1password.nix +++ b/third_party/nixpkgs/nixos/modules/programs/_1password.nix @@ -8,19 +8,16 @@ let in { + imports = [ + (mkRemovedOptionModule [ "programs" "_1password" "gid" ] '' + A preallocated GID will be used instead. + '') + ]; + options = { programs._1password = { enable = mkEnableOption "the 1Password CLI tool"; - gid = mkOption { - type = types.addCheck types.int (x: x >= 1000); - example = literalExpression "5001"; - description = '' - The gid to assign to the onepassword-cli group, which is needed for integration with the 1Password GUI. - It must be 1000 or greater. - ''; - }; - package = mkPackageOption pkgs "1Password CLI" { default = [ "_1password" ]; }; @@ -29,7 +26,7 @@ in config = mkIf cfg.enable { environment.systemPackages = [ cfg.package ]; - users.groups.onepassword-cli.gid = cfg.gid; + users.groups.onepassword-cli.gid = config.ids.gids.onepassword-cli; security.wrappers = { "op" = { diff --git a/third_party/nixpkgs/nixos/modules/programs/dmrconfig.nix b/third_party/nixpkgs/nixos/modules/programs/dmrconfig.nix index d2a5117c48..89ac3443a1 100644 --- a/third_party/nixpkgs/nixos/modules/programs/dmrconfig.nix +++ b/third_party/nixpkgs/nixos/modules/programs/dmrconfig.nix @@ -6,7 +6,7 @@ let cfg = config.programs.dmrconfig; in { - meta.maintainers = [ maintainers.etu ]; + meta.maintainers = with maintainers; [ ]; ###### interface options = { diff --git a/third_party/nixpkgs/nixos/modules/programs/streamdeck-ui.nix b/third_party/nixpkgs/nixos/modules/programs/streamdeck-ui.nix new file mode 100644 index 0000000000..1434f82660 --- /dev/null +++ b/third_party/nixpkgs/nixos/modules/programs/streamdeck-ui.nix @@ -0,0 +1,28 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.programs.streamdeck-ui; +in { + options.programs.streamdeck-ui = { + enable = mkEnableOption "streamdeck-ui"; + + autoStart = mkOption { + default = true; + type = types.bool; + description = "Whether streamdeck-ui should be started automatically."; + }; + }; + + config = mkIf cfg.enable { + environment.systemPackages = with pkgs; [ + streamdeck-ui + (mkIf cfg.autoStart (makeAutostartItem { name = "streamdeck-ui"; package = streamdeck-ui; })) + ]; + + services.udev.packages = with pkgs; [ streamdeck-ui ]; + }; + + meta.maintainers = with maintainers; [ majiir ]; +} diff --git a/third_party/nixpkgs/nixos/modules/security/pam.nix b/third_party/nixpkgs/nixos/modules/security/pam.nix index 23d1344a57..ce18af9fbc 100644 --- a/third_party/nixpkgs/nixos/modules/security/pam.nix +++ b/third_party/nixpkgs/nixos/modules/security/pam.nix @@ -483,7 +483,8 @@ let auth ${p11.control} ${pkgs.pam_p11}/lib/security/pam_p11.so ${pkgs.opensc}/lib/opensc-pkcs11.so '') + (let u2f = config.security.pam.u2f; in optionalString cfg.u2fAuth '' - auth ${u2f.control} ${pkgs.pam_u2f}/lib/security/pam_u2f.so ${optionalString u2f.debug "debug"} ${optionalString (u2f.authFile != null) "authfile=${u2f.authFile}"} ${optionalString u2f.interactive "interactive"} ${optionalString u2f.cue "cue"} ${optionalString (u2f.appId != null) "appid=${u2f.appId}"} + auth ${u2f.control} ${pkgs.pam_u2f}/lib/security/pam_u2f.so ${optionalString u2f.debug "debug"} ${optionalString (u2f.authFile != null) "authfile=${u2f.authFile}"} '' + + ''${optionalString u2f.interactive "interactive"} ${optionalString u2f.cue "cue"} ${optionalString (u2f.appId != null) "appid=${u2f.appId}"} ${optionalString (u2f.origin != null) "origin=${u2f.origin}"} '') + optionalString cfg.usbAuth '' auth sufficient ${pkgs.pam_usb}/lib/security/pam_usb.so @@ -895,6 +896,24 @@ in ''; }; + origin = mkOption { + default = null; + type = with types; nullOr str; + description = '' + By default pam-u2f module sets the origin + to pam://$HOSTNAME. + Setting origin to an host independent value will allow you to + reuse credentials across machines + + When using pamu2fcfg, you can specify your + application ID with the -o flag. + + More information can be found + here + ''; + }; + control = mkOption { default = "sufficient"; type = types.enum [ "required" "requisite" "sufficient" "optional" ]; diff --git a/third_party/nixpkgs/nixos/modules/services/cluster/kubernetes/kubelet.nix b/third_party/nixpkgs/nixos/modules/services/cluster/kubernetes/kubelet.nix index af3a5062fe..4363ed35d3 100644 --- a/third_party/nixpkgs/nixos/modules/services/cluster/kubernetes/kubelet.nix +++ b/third_party/nixpkgs/nixos/modules/services/cluster/kubernetes/kubelet.nix @@ -23,7 +23,11 @@ let infraContainer = pkgs.dockerTools.buildImage { name = "pause"; tag = "latest"; - contents = top.package.pause; + copyToRoot = pkgs.buildEnv { + name = "image-root"; + pathsToLink = [ "/bin" ]; + paths = [ top.package.pause ]; + }; config.Cmd = ["/bin/pause"]; }; diff --git a/third_party/nixpkgs/nixos/modules/services/continuous-integration/jenkins/job-builder.nix b/third_party/nixpkgs/nixos/modules/services/continuous-integration/jenkins/job-builder.nix index 3ca1542c18..edbf31f5ca 100644 --- a/third_party/nixpkgs/nixos/modules/services/continuous-integration/jenkins/job-builder.nix +++ b/third_party/nixpkgs/nixos/modules/services/continuous-integration/jenkins/job-builder.nix @@ -156,12 +156,22 @@ in { reloadScript = '' echo "Asking Jenkins to reload config" curl_opts="--silent --fail --show-error" - access_token=${if cfg.accessTokenFile != "" - then "$(cat '${cfg.accessTokenFile}')" - else cfg.accessToken} - jenkins_url="http://${cfg.accessUser}:$access_token@${jenkinsCfg.listenAddress}:${toString jenkinsCfg.port}${jenkinsCfg.prefix}" - crumb=$(curl $curl_opts "$jenkins_url"'/crumbIssuer/api/xml?xpath=concat(//crumbRequestField,":",//crumb)') - curl $curl_opts -X POST -H "$crumb" "$jenkins_url"/reload + access_token_file=${if cfg.accessTokenFile != "" + then cfg.accessTokenFile + else "$RUNTIME_DIRECTORY/jenkins_access_token.txt"} + if [ "${cfg.accessToken}" != "" ]; then + (umask 0077; printf "${cfg.accessToken}" >"$access_token_file") + fi + jenkins_url="http://${jenkinsCfg.listenAddress}:${toString jenkinsCfg.port}${jenkinsCfg.prefix}" + auth_file="$RUNTIME_DIRECTORY/jenkins_auth_file.txt" + trap 'rm -f "$auth_file"' EXIT + (umask 0077; printf "${cfg.accessUser}:@password_placeholder@" >"$auth_file") + "${pkgs.replace-secret}/bin/replace-secret" "@password_placeholder@" "$access_token_file" "$auth_file" + + if ! "${pkgs.jenkins}/bin/jenkins-cli" -s "$jenkins_url" -auth "@$auth_file" reload-configuration; then + echo "error: failed to reload configuration" + exit 1 + fi ''; in '' diff --git a/third_party/nixpkgs/nixos/modules/services/display-managers/greetd.nix b/third_party/nixpkgs/nixos/modules/services/display-managers/greetd.nix index 895961707d..4fc6ca3674 100644 --- a/third_party/nixpkgs/nixos/modules/services/display-managers/greetd.nix +++ b/third_party/nixpkgs/nixos/modules/services/display-managers/greetd.nix @@ -54,7 +54,7 @@ in config = mkIf cfg.enable { services.greetd.settings.terminal.vt = mkDefault cfg.vt; - services.greetd.settings.default_session = mkDefault "greeter"; + services.greetd.settings.default_session.user = mkDefault "greeter"; security.pam.services.greetd = { allowNullPassword = true; diff --git a/third_party/nixpkgs/nixos/modules/services/misc/gitlab.nix b/third_party/nixpkgs/nixos/modules/services/misc/gitlab.nix index ee59cea38d..77556bfe00 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/gitlab.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/gitlab.nix @@ -19,13 +19,13 @@ let # https://gitlab.com/gitlab-org/gitlab/-/issues/360783#note_992870101. gitPackage = let - version = "2.35.3"; + version = "2.35.4"; in pkgs.git.overrideAttrs (oldAttrs: rec { inherit version; src = pkgs.fetchurl { url = "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz"; - sha256 = "sha256-FenbT5vy7Z//MMtioAxcfAkBAV9asEjNtOiwTd7gD6I="; + sha256 = "sha256-mv13OdNkXggeKQkJ+47QcJ6lYmcw6Qjri1ZJ2ETCTOk="; }; }); diff --git a/third_party/nixpkgs/nixos/modules/services/misc/jellyfin.nix b/third_party/nixpkgs/nixos/modules/services/misc/jellyfin.nix index 789b78702e..e2f227b061 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/jellyfin.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/jellyfin.nix @@ -49,7 +49,10 @@ in after = [ "network.target" ]; wantedBy = [ "multi-user.target" ]; + # This is mostly follows: https://github.com/jellyfin/jellyfin/blob/master/fedora/jellyfin.service + # Upstream also disable some hardenings when running in LXC, we do the same with the isContainer option serviceConfig = rec { + Type = "simple"; User = cfg.user; Group = cfg.group; StateDirectory = "jellyfin"; @@ -57,48 +60,50 @@ in CacheDirectory = "jellyfin"; CacheDirectoryMode = "0700"; UMask = "0077"; + WorkingDirectory = "/var/lib/jellyfin"; ExecStart = "${cfg.package}/bin/jellyfin --datadir '/var/lib/${StateDirectory}' --cachedir '/var/cache/${CacheDirectory}'"; Restart = "on-failure"; + TimeoutSec = 15; + SuccessExitStatus = ["0" "143"]; # Security options: - NoNewPrivileges = true; - - AmbientCapabilities = ""; - CapabilityBoundingSet = ""; - - # ProtectClock= adds DeviceAllow=char-rtc r - DeviceAllow = ""; - - LockPersonality = true; - - PrivateTmp = true; - # Disabled to allow Jellyfin to access hw accel devices endpoints - # PrivateDevices = true; - PrivateUsers = true; - - # Disabled as it does not allow Jellyfin to interface with CUDA devices - # ProtectClock = true; - ProtectControlGroups = true; - ProtectHostname = true; - ProtectKernelLogs = true; - ProtectKernelModules = true; - ProtectKernelTunables = true; - - RemoveIPC = true; - - RestrictNamespaces = true; + SystemCallArchitectures = "native"; # AF_NETLINK needed because Jellyfin monitors the network connection - RestrictAddressFamilies = [ "AF_NETLINK" "AF_INET" "AF_INET6" "AF_UNIX" ]; + RestrictAddressFamilies = [ "AF_UNIX" "AF_INET" "AF_INET6" "AF_NETLINK" ]; + RestrictNamespaces = !config.boot.isContainer; RestrictRealtime = true; RestrictSUIDSGID = true; + ProtectControlGroups = !config.boot.isContainer; + ProtectHostname = true; + ProtectKernelLogs = !config.boot.isContainer; + ProtectKernelModules = !config.boot.isContainer; + ProtectKernelTunables = !config.boot.isContainer; + LockPersonality = true; + PrivateTmp = !config.boot.isContainer; + # needed for hardware accelaration + PrivateDevices = false; + PrivateUsers = true; + RemoveIPC = true; - SystemCallArchitectures = "native"; - SystemCallErrorNumber = "EPERM"; SystemCallFilter = [ - "@system-service" - "~@cpu-emulation" "~@debug" "~@keyring" "~@memlock" "~@obsolete" "~@privileged" "~@setuid" + "~@clock" + "~@aio" + "~@chown" + "~@cpu-emulation" + "~@debug" + "~@keyring" + "~@memlock" + "~@module" + "~@mount" + "~@obsolete" + "~@privileged" + "~@raw-io" + "~@reboot" + "~@setuid" + "~@swap" ]; + SystemCallErrorNumber = "EPERM"; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/monitoring/netdata.nix b/third_party/nixpkgs/nixos/modules/services/monitoring/netdata.nix index 489dd337bb..c6a3315d40 100644 --- a/third_party/nixpkgs/nixos/modules/services/monitoring/netdata.nix +++ b/third_party/nixpkgs/nixos/modules/services/monitoring/netdata.nix @@ -201,7 +201,7 @@ in { serviceConfig = { ExecStart = "${cfg.package}/bin/netdata -P /run/netdata/netdata.pid -D -c /etc/netdata/netdata.conf"; ExecReload = "${pkgs.util-linux}/bin/kill -s HUP -s USR1 -s USR2 $MAINPID"; - ExecPostStart = ''while [ "$(netdatacli ping)" != pong ]; do sleep 0.5; done''; + ExecStartPost = ''while [ "$(netdatacli ping)" != pong ]; do sleep 0.5; done''; TimeoutStopSec = 60; Restart = "on-failure"; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/minidlna.nix b/third_party/nixpkgs/nixos/modules/services/networking/minidlna.nix index c860f63efa..57c37718e7 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/minidlna.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/minidlna.nix @@ -5,164 +5,136 @@ with lib; let cfg = config.services.minidlna; - port = 8200; + settingsFormat = pkgs.formats.keyValue { listsAsDuplicateKeys = true; }; + settingsFile = settingsFormat.generate "minidlna.conf" cfg.settings; in { ###### interface - options = { - services.minidlna.enable = mkOption { - type = types.bool; - default = false; - description = - '' - Whether to enable MiniDLNA, a simple DLNA server. It serves - media files such as video and music to DLNA client devices - such as televisions and media players. - ''; - }; + options.services.minidlna.enable = mkOption { + type = types.bool; + default = false; + description = '' + Whether to enable MiniDLNA, a simple DLNA server. + It serves media files such as video and music to DLNA client devices + such as televisions and media players. If you use the firewall consider + adding the following: services.minidlna.openFirewall = true; + ''; + }; - services.minidlna.mediaDirs = mkOption { - type = types.listOf types.str; - default = []; - example = [ "/data/media" "V,/home/alice/video" ]; - description = - '' - Directories to be scanned for media files. The prefixes - A,, V, and + options.services.minidlna.openFirewall = mkOption { + type = types.bool; + default = false; + description = '' + Whether to open both HTTP (TCP) and SSDP (UDP) ports in the firewall. + ''; + }; + + options.services.minidlna.settings = mkOption { + default = {}; + description = '' + The contents of MiniDLNA's configuration file. + When the service is activated, a basic template is generated + from the current options opened here. + ''; + type = types.submodule { + freeformType = settingsFormat.type; + + options.media_dir = mkOption { + type = types.listOf types.str; + default = []; + example = [ "/data/media" "V,/home/alice/video" ]; + description = '' + Directories to be scanned for media files. + The prefixes A,,V, and P, restrict a directory to audio, video - or image files. The directories must be accessible to the + or image files. The directories must be accessible to the minidlna user account. ''; - }; - - services.minidlna.friendlyName = mkOption { - type = types.str; - default = "${config.networking.hostName} MiniDLNA"; - defaultText = literalExpression ''"''${config.networking.hostName} MiniDLNA"''; - example = "rpi3"; - description = - '' - Name that the DLNA server presents to clients. - ''; - }; - - services.minidlna.rootContainer = mkOption { - type = types.str; - default = "."; - example = "B"; - description = - '' - Use a different container as the root of the directory tree presented - to clients. The possible values are: - - "." - standard container - - "B" - "Browse Directory" - - "M" - "Music" - - "P" - "Pictures" - - "V" - "Video" - - Or, you can specify the ObjectID of your desired root container - (eg. 1$F for Music/Playlists) - If you specify "B" and the client device is audio-only then - "Music/Folders" will be used as root. - ''; - }; - - services.minidlna.loglevel = mkOption { - type = types.str; - default = "warn"; - example = "general,artwork,database,inotify,scanner,metadata,http,ssdp,tivo=warn"; - description = - '' - Defines the type of messages that should be logged, and down to - which level of importance they should be considered. - - The possible types are “artwork”, “database”, “general”, “http”, - “inotify”, “metadata”, “scanner”, “ssdp” and “tivo”. - - The levels are “off”, “fatal”, “error”, “warn”, “info” and - “debug”, listed here in order of decreasing importance. “off” - turns off logging messages entirely, “fatal” logs the most - critical messages only, and so on down to “debug” that logs every - single messages. - - The types are comma-separated, followed by an equal sign (‘=’), - followed by a level that applies to the preceding types. This can - be repeated, separating each of these constructs with a comma. - - Defaults to “general,artwork,database,inotify,scanner,metadata, - http,ssdp,tivo=warn” which logs every type of message at the - “warn” level. - ''; - }; - - services.minidlna.announceInterval = mkOption { - type = types.int; - default = 895; - description = - '' + }; + options.notify_interval = mkOption { + type = types.int; + default = 90000; + description = '' The interval between announces (in seconds). + Instead of waiting on announces, one can open port UDP 1900 or + set openFirewall option to use SSDP discovery. + Furthermore announce interval has now been set as 90000 in order + to prevent disconnects with certain clients and to rely solely + on the SSDP method. - By default miniDLNA will announce its presence on the network - approximately every 15 minutes. + Lower values (e.g. 60 seconds) should be used if one does not + want to utilize SSDP. By default miniDLNA will announce its + presence on the network approximately every 15 minutes. Many + people prefer shorter announce intervals on their home networks, + especially when DLNA clients are started on demand. - Many people prefer shorter announce intervals (e.g. 60 seconds) - on their home networks, especially when DLNA clients are - started on demand. + Some relevant information can be found here: + https://sourceforge.net/p/minidlna/discussion/879957/thread/1389d197/ ''; - }; - - services.minidlna.config = mkOption { - type = types.lines; - description = - '' - The contents of MiniDLNA's configuration file. - When the service is activated, a basic template is generated - from the current options opened here. - ''; - }; - - services.minidlna.extraConfig = mkOption { - type = types.lines; - default = ""; - example = '' - # Not exhaustive example - # Support for streaming .jpg and .mp3 files to a TiVo supporting HMO. - enable_tivo=no - # SSDP notify interval, in seconds. - notify_interval=10 - # maximum number of simultaneous connections - # note: many clients open several simultaneous connections while - # streaming - max_connections=50 - # set this to yes to allow symlinks that point outside user-defined - # media_dirs. - wide_links=yes - ''; - description = - '' - Extra minidlna options not yet opened for configuration here - (strict_dlna, model_number, model_name, etc...). This is appended - to the current service already provided. - ''; + }; + options.port = mkOption { + type = types.port; + default = 8200; + description = "Port number for HTTP traffic (descriptions, SOAP, media transfer)."; + }; + options.db_dir = mkOption { + type = types.path; + default = "/var/cache/minidlna"; + example = "/tmp/minidlna"; + description = "Specify the directory where you want MiniDLNA to store its database and album art cache."; + }; + options.friendly_name = mkOption { + type = types.str; + default = "${config.networking.hostName} MiniDLNA"; + defaultText = literalExpression "config.networking.hostName"; + example = "rpi3"; + description = "Name that the DLNA server presents to clients."; + }; + options.root_container = mkOption { + type = types.str; + default = "."; + example = "B"; + description = "Use a different container as the root of the directory tree presented to clients."; + }; + options.log_level = mkOption { + type = types.str; + default = "warn"; + example = "general,artwork,database,inotify,scanner,metadata,http,ssdp,tivo=warn"; + description = "Defines the type of messages that should be logged and down to which level of importance."; + }; + options.inotify = mkOption { + type = types.enum [ "yes" "no" ]; + default = "no"; + description = "Whether to enable inotify monitoring to automatically discover new files."; + }; + options.enable_tivo = mkOption { + type = types.enum [ "yes" "no" ]; + default = "no"; + description = "Support for streaming .jpg and .mp3 files to a TiVo supporting HMO."; + }; + options.wide_links = mkOption { + type = types.enum [ "yes" "no" ]; + default = "no"; + description = "Set this to yes to allow symlinks that point outside user-defined media_dirs."; + }; }; }; + imports = [ + (mkRemovedOptionModule [ "services" "minidlna" "config" ] "") + (mkRemovedOptionModule [ "services" "minidlna" "extraConfig" ] "") + (mkRenamedOptionModule [ "services" "minidlna" "loglevel"] [ "services" "minidlna" "settings" "log_level" ]) + (mkRenamedOptionModule [ "services" "minidlna" "rootContainer"] [ "services" "minidlna" "settings" "root_container" ]) + (mkRenamedOptionModule [ "services" "minidlna" "mediaDirs"] [ "services" "minidlna" "settings" "media_dir" ]) + (mkRenamedOptionModule [ "services" "minidlna" "friendlyName"] [ "services" "minidlna" "settings" "friendly_name" ]) + (mkRenamedOptionModule [ "services" "minidlna" "announceInterval"] [ "services" "minidlna" "settings" "notify_interval" ]) + ]; + ###### implementation config = mkIf cfg.enable { - services.minidlna.config = - '' - port=${toString port} - friendly_name=${cfg.friendlyName} - db_dir=/var/cache/minidlna - log_level=${cfg.loglevel} - inotify=yes - root_container=${cfg.rootContainer} - ${concatMapStrings (dir: '' - media_dir=${dir} - '') cfg.mediaDirs} - notify_interval=${toString cfg.announceInterval} - ${cfg.extraConfig} - ''; + networking.firewall.allowedTCPPorts = mkIf cfg.openFirewall [ cfg.settings.port ]; + networking.firewall.allowedUDPPorts = mkIf cfg.openFirewall [ 1900 ]; users.users.minidlna = { description = "MiniDLNA daemon user"; @@ -186,7 +158,7 @@ in PIDFile = "/run/minidlna/pid"; ExecStart = "${pkgs.minidlna}/sbin/minidlnad -S -P /run/minidlna/pid" + - " -f ${pkgs.writeText "minidlna.conf" cfg.config}"; + " -f ${settingsFile}"; }; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/mxisd.nix b/third_party/nixpkgs/nixos/modules/services/networking/mxisd.nix index 803f0689d1..5b1e0dee8e 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/mxisd.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/mxisd.nix @@ -46,6 +46,15 @@ in { description = "The mxisd/ma1sd package to use"; }; + environmentFile = mkOption { + type = types.nullOr types.str; + default = null; + description = '' + Path to an environment-file which may contain secrets to be + substituted via envsubst. + ''; + }; + dataDir = mkOption { type = types.str; default = "/var/lib/mxisd"; @@ -118,7 +127,12 @@ in { Type = "simple"; User = "mxisd"; Group = "mxisd"; - ExecStart = "${cfg.package}/bin/${executable} -c ${configFile}"; + EnvironmentFile = mkIf (cfg.environmentFile != null) [ cfg.environmentFile ]; + ExecStart = "${cfg.package}/bin/${executable} -c ${cfg.dataDir}/mxisd-config.yaml"; + ExecStartPre = "${pkgs.writeShellScript "mxisd-substitute-secrets" '' + ${pkgs.envsubst}/bin/envsubst -o ${cfg.dataDir}/mxisd-config.yaml \ + -i ${configFile} + ''}"; WorkingDirectory = cfg.dataDir; Restart = "on-failure"; }; diff --git a/third_party/nixpkgs/nixos/modules/services/security/pass-secret-service.nix b/third_party/nixpkgs/nixos/modules/services/security/pass-secret-service.nix new file mode 100644 index 0000000000..6ae190eb95 --- /dev/null +++ b/third_party/nixpkgs/nixos/modules/services/security/pass-secret-service.nix @@ -0,0 +1,27 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.passSecretService; +in +{ + options.services.passSecretService = { + enable = mkEnableOption "pass secret service"; + + package = mkOption { + type = types.package; + default = pkgs.pass-secret-service; + defaultText = literalExpression "pkgs.pass-secret-service"; + description = "Which pass-secret-service package to use."; + example = literalExpression "pkgs.pass-secret-service.override { python3 = pkgs.python310 }"; + }; + }; + + config = mkIf cfg.enable { + systemd.packages = [ cfg.package ]; + services.dbus.packages = [ cfg.package ]; + }; + + meta.maintainers = with maintainers; [ aidalgol ]; +} diff --git a/third_party/nixpkgs/nixos/modules/services/security/privacyidea.nix b/third_party/nixpkgs/nixos/modules/services/security/privacyidea.nix index c1617348fb..13e27f2550 100644 --- a/third_party/nixpkgs/nixos/modules/services/security/privacyidea.nix +++ b/third_party/nixpkgs/nixos/modules/services/security/privacyidea.nix @@ -51,6 +51,16 @@ let ${cfg.extraConfig} ''; + renderValue = x: + if isList x then concatMapStringsSep "," (x: ''"${x}"'') x + else if isString x && hasInfix "," x then ''"${x}"'' + else x; + + ldapProxyConfig = pkgs.writeText "ldap-proxy.ini" + (generators.toINI {} + (flip mapAttrs cfg.ldap-proxy.settings + (const (mapAttrs (const renderValue))))); + in { @@ -172,7 +182,8 @@ in enable = mkEnableOption "PrivacyIDEA LDAP Proxy"; configFile = mkOption { - type = types.path; + type = types.nullOr types.path; + default = null; description = '' Path to PrivacyIDEA LDAP Proxy configuration (proxy.ini). ''; @@ -189,6 +200,26 @@ in default = "pi-ldap-proxy"; description = "Group account under which PrivacyIDEA LDAP proxy runs."; }; + + settings = mkOption { + type = with types; attrsOf (attrsOf (oneOf [ str bool int (listOf str) ])); + default = {}; + description = '' + Attribute-set containing the settings for privacyidea-ldap-proxy. + It's possible to pass secrets using env-vars as substitutes and + use the option + to inject them via envsubst. + ''; + }; + + environmentFile = mkOption { + default = null; + type = types.nullOr types.str; + description = '' + Environment file containing secrets to be substituted into + . + ''; + }; }; }; }; @@ -276,6 +307,18 @@ in (mkIf cfg.ldap-proxy.enable { + assertions = [ + { assertion = let + xor = a: b: a && !b || !a && b; + in xor (cfg.ldap-proxy.settings == {}) (cfg.ldap-proxy.configFile == null); + message = "configFile & settings are mutually exclusive for services.privacyidea.ldap-proxy!"; + } + ]; + + warnings = mkIf (cfg.ldap-proxy.configFile != null) [ + "Using services.privacyidea.ldap-proxy.configFile is deprecated! Use the RFC42-style settings option instead!" + ]; + systemd.services.privacyidea-ldap-proxy = let ldap-proxy-env = pkgs.python3.withPackages (ps: [ ps.privacyidea-ldap-proxy ]); in { @@ -284,14 +327,27 @@ in serviceConfig = { User = cfg.ldap-proxy.user; Group = cfg.ldap-proxy.group; - ExecStart = '' + StateDirectory = "privacyidea-ldap-proxy"; + EnvironmentFile = mkIf (cfg.ldap-proxy.environmentFile != null) + [ cfg.ldap-proxy.environmentFile ]; + ExecStartPre = + "${pkgs.writeShellScript "substitute-secrets-ldap-proxy" '' + ${pkgs.envsubst}/bin/envsubst \ + -i ${ldapProxyConfig} \ + -o $STATE_DIRECTORY/ldap-proxy.ini + ''}"; + ExecStart = let + configPath = if cfg.ldap-proxy.settings != {} + then "%S/privacyidea-ldap-proxy/ldap-proxy.ini" + else cfg.ldap-proxy.configFile; + in '' ${ldap-proxy-env}/bin/twistd \ --nodaemon \ --pidfile= \ -u ${cfg.ldap-proxy.user} \ -g ${cfg.ldap-proxy.group} \ ldap-proxy \ - -c ${cfg.ldap-proxy.configFile} + -c ${configPath} ''; Restart = "always"; }; diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/atlassian/jira.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/atlassian/jira.nix index bc0bf43522..fd89d763c7 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-apps/atlassian/jira.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-apps/atlassian/jira.nix @@ -8,21 +8,22 @@ let pkg = cfg.package.override (optionalAttrs cfg.sso.enable { enableSSO = cfg.sso.enable; - crowdProperties = '' - application.name ${cfg.sso.applicationName} - application.password ${cfg.sso.applicationPassword} - application.login.url ${cfg.sso.crowd}/console/ - - crowd.server.url ${cfg.sso.crowd}/services/ - crowd.base.url ${cfg.sso.crowd}/ - - session.isauthenticated session.isauthenticated - session.tokenkey session.tokenkey - session.validationinterval ${toString cfg.sso.validationInterval} - session.lastvalidation session.lastvalidation - ''; }); + crowdProperties = pkgs.writeText "crowd.properties" '' + application.name ${cfg.sso.applicationName} + application.password @NIXOS_JIRA_CROWD_SSO_PWD@ + application.login.url ${cfg.sso.crowd}/console/ + + crowd.server.url ${cfg.sso.crowd}/services/ + crowd.base.url ${cfg.sso.crowd}/ + + session.isauthenticated session.isauthenticated + session.tokenkey session.tokenkey + session.validationinterval ${toString cfg.sso.validationInterval} + session.lastvalidation session.lastvalidation + ''; + in { @@ -112,9 +113,9 @@ in description = "Exact name of this JIRA instance in Crowd"; }; - applicationPassword = mkOption { + applicationPasswordFile = mkOption { type = types.str; - description = "Application password of this JIRA instance in Crowd"; + description = "Path to the file containing the application password of this JIRA instance in Crowd"; }; validationInterval = mkOption { @@ -181,6 +182,7 @@ in JIRA_HOME = cfg.home; JAVA_HOME = "${cfg.jrePackage}"; CATALINA_OPTS = concatStringsSep " " cfg.catalinaOptions; + JAVA_OPTS = mkIf cfg.sso.enable "-Dcrowd.properties=${cfg.home}/crowd.properties"; }; preStart = '' @@ -191,6 +193,14 @@ in -e 's,protocol="HTTP/1.1",protocol="HTTP/1.1" proxyName="${cfg.proxy.name}" proxyPort="${toString cfg.proxy.port}" scheme="${cfg.proxy.scheme}" secure="${toString cfg.proxy.secure}",' \ '') + '' ${pkg}/conf/server.xml.dist > ${cfg.home}/server.xml + + ${optionalString cfg.sso.enable '' + install -m660 ${crowdProperties} ${cfg.home}/crowd.properties + ${pkgs.replace-secret}/bin/replace-secret \ + '@NIXOS_JIRA_CROWD_SSO_PWD@' \ + ${cfg.sso.applicationPasswordFile} \ + ${cfg.home}/crowd.properties + ''} ''; serviceConfig = { @@ -204,4 +214,10 @@ in }; }; }; + + imports = [ + (mkRemovedOptionModule [ "services" "jira" "sso" "applicationPassword" ] '' + Use `applicationPasswordFile` instead! + '') + ]; } diff --git a/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/plasma5.nix b/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/plasma5.nix index 59006a26cf..0d17d13679 100644 --- a/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/plasma5.nix +++ b/third_party/nixpkgs/nixos/modules/services/x11/desktop-managers/plasma5.nix @@ -354,6 +354,7 @@ in plasma-browser-integration konsole oxygen + (lib.getBin qttools) # Expose qdbus in PATH ]; in requiredPackages @@ -399,9 +400,10 @@ in services.accounts-daemon.enable = true; # when changing an account picture the accounts-daemon reads a temporary file containing the image which systemsettings5 may place under /tmp systemd.services.accounts-daemon.serviceConfig.PrivateTmp = false; + services.power-profiles-daemon.enable = mkDefault true; + services.system-config-printer.enable = mkIf config.services.printing.enable (mkDefault true); services.udisks2.enable = true; services.upower.enable = config.powerManagement.enable; - services.system-config-printer.enable = mkIf config.services.printing.enable (mkDefault true); services.xserver.libinput.enable = mkDefault true; # Extra UDEV rules used by Solid diff --git a/third_party/nixpkgs/nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py b/third_party/nixpkgs/nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py index aca6a1ca2c..77280a9680 100644 --- a/third_party/nixpkgs/nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py +++ b/third_party/nixpkgs/nixos/modules/system/boot/loader/systemd-boot/systemd-boot-builder.py @@ -264,8 +264,6 @@ def main() -> None: if installed_version < available_version: print("updating systemd-boot from %s to %s" % (installed_version, available_version)) subprocess.check_call(["@systemd@/bin/bootctl", "--path=@efiSysMountPoint@", "update"]) - else: - print("leaving systemd-boot %s in place (%s is not newer)" % (installed_version, available_version)) mkdir_p("@efiSysMountPoint@/efi/nixos") mkdir_p("@efiSysMountPoint@/loader/entries") diff --git a/third_party/nixpkgs/nixos/modules/virtualisation/cri-o.nix b/third_party/nixpkgs/nixos/modules/virtualisation/cri-o.nix index cf51100015..38766113f3 100644 --- a/third_party/nixpkgs/nixos/modules/virtualisation/cri-o.nix +++ b/third_party/nixpkgs/nixos/modules/virtualisation/cri-o.nix @@ -71,10 +71,6 @@ in package = mkOption { type = types.package; default = crioPackage; - defaultText = literalDocBook '' - pkgs.cri-o built with - config.${opt.extraPackages}. - ''; internal = true; description = '' The final CRI-O package (including extra packages). diff --git a/third_party/nixpkgs/nixos/modules/virtualisation/parallels-guest.nix b/third_party/nixpkgs/nixos/modules/virtualisation/parallels-guest.nix index d950cecff6..53ad2ac708 100644 --- a/third_party/nixpkgs/nixos/modules/virtualisation/parallels-guest.nix +++ b/third_party/nixpkgs/nixos/modules/virtualisation/parallels-guest.nix @@ -34,7 +34,8 @@ in package = mkOption { type = types.nullOr types.package; default = config.boot.kernelPackages.prl-tools; - defaultText = literalExpression "config.boot.kernelPackages.prl-tools"; + defaultText = "config.boot.kernelPackages.prl-tools"; + example = literalExpression "config.boot.kernelPackages.prl-tools"; description = '' Defines which package to use for prl-tools. Override to change the version. ''; @@ -44,27 +45,6 @@ in }; config = mkIf config.hardware.parallels.enable { - services.xserver = { - drivers = singleton - { name = "prlvideo"; modules = [ prl-tools ]; }; - - screenSection = '' - Option "NoMTRR" - ''; - - config = '' - Section "InputClass" - Identifier "prlmouse" - MatchIsPointer "on" - MatchTag "prlmouse" - Driver "prlmouse" - EndSection - ''; - }; - - hardware.opengl.package = prl-tools; - hardware.opengl.package32 = pkgs.pkgsi686Linux.linuxPackages.prl-tools.override { libsOnly = true; kernel = null; }; - hardware.opengl.setLdLibraryPath = true; services.udev.packages = [ prl-tools ]; @@ -72,37 +52,44 @@ in boot.extraModulePackages = [ prl-tools ]; - boot.kernelModules = [ "prl_tg" "prl_eth" "prl_fs" "prl_fs_freeze" ]; + boot.kernelModules = [ "prl_fs" "prl_fs_freeze" "prl_tg" ] + ++ optional (pkgs.stdenv.hostPlatform.system == "aarch64-linux") "prl_notifier"; services.timesyncd.enable = false; systemd.services.prltoolsd = { - description = "Parallels Tools' service"; + description = "Parallels Tools Service"; wantedBy = [ "multi-user.target" ]; + path = [ prl-tools ]; serviceConfig = { ExecStart = "${prl-tools}/bin/prltoolsd -f"; PIDFile = "/var/run/prltoolsd.pid"; + WorkingDirectory = "${prl-tools}/bin"; }; }; systemd.services.prlfsmountd = mkIf config.hardware.parallels.autoMountShares { - description = "Parallels Shared Folders Daemon"; + description = "Parallels Guest File System Sharing Tool"; wantedBy = [ "multi-user.target" ]; + path = [ prl-tools ]; serviceConfig = rec { ExecStart = "${prl-tools}/sbin/prlfsmountd ${PIDFile}"; ExecStartPre = "${pkgs.coreutils}/bin/mkdir -p /media"; ExecStopPost = "${prl-tools}/sbin/prlfsmountd -u"; PIDFile = "/run/prlfsmountd.pid"; + WorkingDirectory = "${prl-tools}/bin"; }; }; systemd.services.prlshprint = { - description = "Parallels Shared Printer Tool"; + description = "Parallels Printing Tool"; wantedBy = [ "multi-user.target" ]; bindsTo = [ "cups.service" ]; + path = [ prl-tools ]; serviceConfig = { Type = "forking"; ExecStart = "${prl-tools}/bin/prlshprint"; + WorkingDirectory = "${prl-tools}/bin"; }; }; @@ -110,43 +97,47 @@ in prlcc = { description = "Parallels Control Center"; wantedBy = [ "graphical-session.target" ]; + path = [ prl-tools ]; serviceConfig = { ExecStart = "${prl-tools}/bin/prlcc"; + WorkingDirectory = "${prl-tools}/bin"; }; }; prldnd = { - description = "Parallels Control Center"; + description = "Parallels Drag And Drop Tool"; wantedBy = [ "graphical-session.target" ]; + path = [ prl-tools ]; serviceConfig = { ExecStart = "${prl-tools}/bin/prldnd"; - }; - }; - prl_wmouse_d = { - description = "Parallels Walking Mouse Daemon"; - wantedBy = [ "graphical-session.target" ]; - serviceConfig = { - ExecStart = "${prl-tools}/bin/prl_wmouse_d"; + WorkingDirectory = "${prl-tools}/bin"; }; }; prlcp = { - description = "Parallels CopyPaste Tool"; + description = "Parallels Copy Paste Tool"; wantedBy = [ "graphical-session.target" ]; + path = [ prl-tools ]; serviceConfig = { ExecStart = "${prl-tools}/bin/prlcp"; + Restart = "always"; + WorkingDirectory = "${prl-tools}/bin"; }; }; prlsga = { description = "Parallels Shared Guest Applications Tool"; wantedBy = [ "graphical-session.target" ]; + path = [ prl-tools ]; serviceConfig = { ExecStart = "${prl-tools}/bin/prlsga"; + WorkingDirectory = "${prl-tools}/bin"; }; }; prlshprof = { description = "Parallels Shared Profile Tool"; wantedBy = [ "graphical-session.target" ]; + path = [ prl-tools ]; serviceConfig = { ExecStart = "${prl-tools}/bin/prlshprof"; + WorkingDirectory = "${prl-tools}/bin"; }; }; }; diff --git a/third_party/nixpkgs/nixos/tests/all-tests.nix b/third_party/nixpkgs/nixos/tests/all-tests.nix index 3253a3c750..03a7f17c07 100644 --- a/third_party/nixpkgs/nixos/tests/all-tests.nix +++ b/third_party/nixpkgs/nixos/tests/all-tests.nix @@ -279,6 +279,7 @@ in { libresprite = handleTest ./libresprite.nix {}; libreswan = handleTest ./libreswan.nix {}; librewolf = handleTest ./firefox.nix { firefoxPackage = pkgs.librewolf; }; + libuiohook = handleTest ./libuiohook.nix {}; lidarr = handleTest ./lidarr.nix {}; lightdm = handleTest ./lightdm.nix {}; limesurvey = handleTest ./limesurvey.nix {}; @@ -413,6 +414,7 @@ in { pam-oath-login = handleTest ./pam/pam-oath-login.nix {}; pam-u2f = handleTest ./pam/pam-u2f.nix {}; pam-ussh = handleTest ./pam/pam-ussh.nix {}; + pass-secret-service = handleTest ./pass-secret-service.nix {}; pantalaimon = handleTest ./matrix/pantalaimon.nix {}; pantheon = handleTest ./pantheon.nix {}; paperless = handleTest ./paperless.nix {}; diff --git a/third_party/nixpkgs/nixos/tests/jenkins.nix b/third_party/nixpkgs/nixos/tests/jenkins.nix index 265d1a330c..63b5860f0d 100644 --- a/third_party/nixpkgs/nixos/tests/jenkins.nix +++ b/third_party/nixpkgs/nixos/tests/jenkins.nix @@ -18,6 +18,8 @@ import ./make-test-python.nix ({ pkgs, ...} : { enable = true; jobBuilder = { enable = true; + accessUser = "admin"; + accessTokenFile = "/var/lib/jenkins/secrets/initialAdminPassword"; nixJobs = [ { job = { name = "job-1"; @@ -100,12 +102,8 @@ import ./make-test-python.nix ({ pkgs, ...} : { master.wait_until_succeeds("test -f /var/lib/jenkins/jobs/folder-1/config.xml") master.wait_until_succeeds("test -f /var/lib/jenkins/jobs/folder-1/jobs/job-2/config.xml") - # Wait until jenkins is ready, reload configuration and verify it also - # sees the jobs. - master.succeed("curl --fail ${jenkinsUrl}/cli") - master.succeed("curl ${jenkinsUrl}/jnlpJars/jenkins-cli.jar -O") - master.succeed("${pkgs.jre}/bin/java -jar jenkins-cli.jar -s ${jenkinsUrl} -auth admin:$(cat /var/lib/jenkins/secrets/initialAdminPassword) reload-configuration") - out = master.succeed("${pkgs.jre}/bin/java -jar jenkins-cli.jar -s ${jenkinsUrl} -auth admin:$(cat /var/lib/jenkins/secrets/initialAdminPassword) list-jobs") + # Verify that jenkins also sees the jobs. + out = master.succeed("${pkgs.jenkins}/bin/jenkins-cli -s ${jenkinsUrl} -auth admin:$(cat /var/lib/jenkins/secrets/initialAdminPassword) list-jobs") jobs = [x.strip() for x in out.splitlines()] # Seeing jobs inside folders requires the Folders plugin # (https://plugins.jenkins.io/cloudbees-folder/), which we don't have @@ -123,9 +121,8 @@ import ./make-test-python.nix ({ pkgs, ...} : { master.wait_until_fails("test -f /var/lib/jenkins/jobs/folder-1/config.xml") master.wait_until_fails("test -f /var/lib/jenkins/jobs/folder-1/jobs/job-2/config.xml") - # Reload jenkins' configuration and verify it also sees the jobs as removed. - master.succeed("${pkgs.jre}/bin/java -jar jenkins-cli.jar -s ${jenkinsUrl} -auth admin:$(cat /var/lib/jenkins/secrets/initialAdminPassword) reload-configuration") - out = master.succeed("${pkgs.jre}/bin/java -jar jenkins-cli.jar -s ${jenkinsUrl} -auth admin:$(cat /var/lib/jenkins/secrets/initialAdminPassword) list-jobs") + # Verify that jenkins also sees the jobs as removed. + out = master.succeed("${pkgs.jenkins}/bin/jenkins-cli -s ${jenkinsUrl} -auth admin:$(cat /var/lib/jenkins/secrets/initialAdminPassword) list-jobs") jobs = [x.strip() for x in out.splitlines()] assert jobs == [], f"jobs != []: {jobs}" ''; diff --git a/third_party/nixpkgs/nixos/tests/kubernetes/dns.nix b/third_party/nixpkgs/nixos/tests/kubernetes/dns.nix index 3fd1dd31f7..6299b7ff98 100644 --- a/third_party/nixpkgs/nixos/tests/kubernetes/dns.nix +++ b/third_party/nixpkgs/nixos/tests/kubernetes/dns.nix @@ -33,7 +33,11 @@ let redisImage = pkgs.dockerTools.buildImage { name = "redis"; tag = "latest"; - contents = [ pkgs.redis pkgs.bind.host ]; + copyToRoot = pkgs.buildEnv { + name = "image-root"; + pathsToLink = [ "/bin" ]; + paths = [ pkgs.redis pkgs.bind.host ]; + }; config.Entrypoint = ["/bin/redis-server"]; }; @@ -54,7 +58,11 @@ let probeImage = pkgs.dockerTools.buildImage { name = "probe"; tag = "latest"; - contents = [ pkgs.bind.host pkgs.busybox ]; + copyToRoot = pkgs.buildEnv { + name = "image-root"; + pathsToLink = [ "/bin" ]; + paths = [ pkgs.bind.host pkgs.busybox ]; + }; config.Entrypoint = ["/bin/tail"]; }; diff --git a/third_party/nixpkgs/nixos/tests/kubernetes/rbac.nix b/third_party/nixpkgs/nixos/tests/kubernetes/rbac.nix index 9e73fbbd32..779eafbb1d 100644 --- a/third_party/nixpkgs/nixos/tests/kubernetes/rbac.nix +++ b/third_party/nixpkgs/nixos/tests/kubernetes/rbac.nix @@ -84,7 +84,11 @@ let kubectlImage = pkgs.dockerTools.buildImage { name = "kubectl"; tag = "latest"; - contents = [ copyKubectl pkgs.busybox kubectlPod2 ]; + copyToRoot = pkgs.buildEnv { + name = "image-root"; + pathsToLink = [ "/bin" ]; + paths = [ copyKubectl pkgs.busybox kubectlPod2 ]; + }; config.Entrypoint = ["/bin/sh"]; }; diff --git a/third_party/nixpkgs/nixos/tests/libuiohook.nix b/third_party/nixpkgs/nixos/tests/libuiohook.nix new file mode 100644 index 0000000000..66c5033d96 --- /dev/null +++ b/third_party/nixpkgs/nixos/tests/libuiohook.nix @@ -0,0 +1,21 @@ +import ./make-test-python.nix ({ pkgs, lib, ... }: { + name = "libuiohook"; + meta = with lib.maintainers; { maintainers = [ anoa ]; }; + + nodes.client = { nodes, ... }: + let user = nodes.client.config.users.users.alice; + in { + imports = [ ./common/user-account.nix ./common/x11.nix ]; + + environment.systemPackages = [ pkgs.libuiohook.test ]; + + test-support.displayManager.auto.user = user.name; + }; + + testScript = { nodes, ... }: + let user = nodes.client.config.users.users.alice; + in '' + client.wait_for_x() + client.succeed("su - alice -c ${pkgs.libuiohook.test}/share/uiohook_tests >&2 &") + ''; +}) diff --git a/third_party/nixpkgs/nixos/tests/pam/pam-u2f.nix b/third_party/nixpkgs/nixos/tests/pam/pam-u2f.nix index d7c540982c..07408dea79 100644 --- a/third_party/nixpkgs/nixos/tests/pam/pam-u2f.nix +++ b/third_party/nixpkgs/nixos/tests/pam/pam-u2f.nix @@ -12,6 +12,7 @@ import ../make-test-python.nix ({ ... }: debug = true; enable = true; interactive = true; + origin = "nixos-test"; }; }; @@ -19,7 +20,7 @@ import ../make-test-python.nix ({ ... }: '' machine.wait_for_unit("multi-user.target") machine.succeed( - 'egrep "auth required .*/lib/security/pam_u2f.so.*debug.*interactive.*cue" /etc/pam.d/ -R' + 'egrep "auth required .*/lib/security/pam_u2f.so.*debug.*interactive.*cue.*origin=nixos-test" /etc/pam.d/ -R' ) ''; }) diff --git a/third_party/nixpkgs/nixos/tests/pass-secret-service.nix b/third_party/nixpkgs/nixos/tests/pass-secret-service.nix new file mode 100644 index 0000000000..a85a508bfe --- /dev/null +++ b/third_party/nixpkgs/nixos/tests/pass-secret-service.nix @@ -0,0 +1,69 @@ +import ./make-test-python.nix ({ pkgs, lib, ... }: { + name = "pass-secret-service"; + meta.maintainers = with lib; [ aidalgol ]; + + nodes.machine = { nodes, pkgs, ... }: + { + imports = [ ./common/user-account.nix ]; + + services.passSecretService.enable = true; + + environment.systemPackages = [ + # Create a script that tries to make a request to the D-Bus secrets API. + (pkgs.writers.writePython3Bin "secrets-dbus-init" + { + libraries = [ pkgs.python3Packages.secretstorage ]; + } '' + import secretstorage + print("Initializing dbus connection...") + connection = secretstorage.dbus_init() + print("Requesting default collection...") + collection = secretstorage.get_default_collection(connection) + print("Done! dbus-org.freedesktop.secrets should now be active.") + '') + pkgs.pass + ]; + + programs.gnupg = { + agent.enable = true; + agent.pinentryFlavor = "tty"; + dirmngr.enable = true; + }; + }; + + # Some of the commands are run via a virtual console because they need to be + # run under a real login session, with D-Bus running in the environment. + testScript = { nodes, ... }: + let + user = nodes.machine.config.users.users.alice; + gpg-uid = "alice@example.net"; + gpg-pw = "foobar9000"; + ready-file = "/tmp/secrets-dbus-init.done"; + in + '' + # Initialise the pass(1) storage. + machine.succeed(""" + sudo -u alice gpg --pinentry-mode loopback --batch --passphrase ${gpg-pw} \ + --quick-gen-key ${gpg-uid} \ + """) + machine.succeed("sudo -u alice pass init ${gpg-uid}") + + with subtest("Service is not running on login"): + 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("${user.password}\n") + machine.wait_until_succeeds("pgrep -u alice bash") + + _, output = machine.systemctl("status dbus-org.freedesktop.secrets --no-pager", "alice") + assert "Active: inactive (dead)" in output + + with subtest("Service starts after a client tries to talk to the D-Bus API"): + machine.send_chars("secrets-dbus-init; touch ${ready-file}\n") + machine.wait_for_file("${ready-file}") + _, output = machine.systemctl("status dbus-org.freedesktop.secrets --no-pager", "alice") + assert "Active: active (running)" in output + ''; +}) diff --git a/third_party/nixpkgs/nixos/tests/pgadmin4.nix b/third_party/nixpkgs/nixos/tests/pgadmin4.nix index b30299d307..9f5ac3d8d9 100644 --- a/third_party/nixpkgs/nixos/tests/pgadmin4.nix +++ b/third_party/nixpkgs/nixos/tests/pgadmin4.nix @@ -107,11 +107,14 @@ import ./make-test-python.nix ({ pkgs, lib, buildDeps ? [ ], pythonEnv ? [ ], .. ) # don't bother to test LDAP authentification + # exclude resql test due to recent postgres 14.4 update + # see bugreport here https://redmine.postgresql.org/issues/7527 with subtest("run browser test"): machine.succeed( 'cd ${pgadmin4SrcDir}/pgadmin4-${pkgs.pgadmin4.version}/web \ - && python regression/runtests.py --pkg browser --exclude \ - browser.tests.test_ldap_login.LDAPLoginTestCase,browser.tests.test_ldap_login' + && python regression/runtests.py \ + --pkg browser \ + --exclude browser.tests.test_ldap_login.LDAPLoginTestCase,browser.tests.test_ldap_login,resql' ) # fontconfig is necessary for chromium to run @@ -123,10 +126,11 @@ import ./make-test-python.nix ({ pkgs, lib, buildDeps ? [ ], pythonEnv ? [ ], .. && python regression/runtests.py --pkg feature_tests' ) - with subtest("run resql test"): - machine.succeed( - 'cd ${pgadmin4SrcDir}/pgadmin4-${pkgs.pgadmin4.version}/web \ - && python regression/runtests.py --pkg resql' - ) + # reactivate this test again, when the postgres 14.4 test has been fixed + # with subtest("run resql test"): + # machine.succeed( + # 'cd ${pgadmin4SrcDir}/pgadmin4-${pkgs.pgadmin4.version}/web \ + # && python regression/runtests.py --pkg resql' + # ) ''; }) diff --git a/third_party/nixpkgs/nixos/tests/web-servers/unit-php.nix b/third_party/nixpkgs/nixos/tests/web-servers/unit-php.nix index 5bef7fab3e..f0df371945 100644 --- a/third_party/nixpkgs/nixos/tests/web-servers/unit-php.nix +++ b/third_party/nixpkgs/nixos/tests/web-servers/unit-php.nix @@ -10,15 +10,15 @@ in { services.unit = { enable = true; config = pkgs.lib.strings.toJSON { - listeners."*:9080".application = "php_80"; - applications.php_80 = { - type = "php 8.0"; + listeners."*:9081".application = "php_81"; + applications.php_81 = { + type = "php 8.1"; processes = 1; user = "testuser"; group = "testgroup"; root = "${testdir}/www"; index = "info.php"; - options.file = "${pkgs.unit.usedPhp80}/lib/php.ini"; + options.file = "${pkgs.unit.usedPhp81}/lib/php.ini"; }; }; }; @@ -34,14 +34,19 @@ in { }; }; testScript = '' + machine.start() + machine.wait_for_unit("unit.service") + machine.wait_for_open_port(9081) # Check so we get an evaluated PHP back - response = machine.succeed("curl -f -vvv -s http://127.0.0.1:9080/") - assert "PHP Version ${pkgs.unit.usedPhp80.version}" in response, "PHP version not detected" + response = machine.succeed("curl -f -vvv -s http://127.0.0.1:9081/") + assert "PHP Version ${pkgs.unit.usedPhp81.version}" in response, "PHP version not detected" # Check so we have database and some other extensions loaded for ext in ["json", "opcache", "pdo_mysql", "pdo_pgsql", "pdo_sqlite"]: assert ext in response, f"Missing {ext} extension" + + machine.shutdown() ''; }) diff --git a/third_party/nixpkgs/pkgs/applications/audio/friture/default.nix b/third_party/nixpkgs/pkgs/applications/audio/friture/default.nix index bb92af2dd5..eb702d0863 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/friture/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/friture/default.nix @@ -1,8 +1,6 @@ { lib, fetchFromGitHub, python3Packages, wrapQtAppsHook }: -let - py = python3Packages; -in py.buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "friture"; version = "0.49"; @@ -13,10 +11,10 @@ in py.buildPythonApplication rec { sha256 = "sha256-xKgyBV/Qc+9PgXyxcT0xG1GXLC6KnjavJ/0SUE+9VSY="; }; - nativeBuildInputs = (with py; [ numpy cython scipy ]) ++ + nativeBuildInputs = (with python3Packages; [ numpy cython scipy ]) ++ [ wrapQtAppsHook ]; - propagatedBuildInputs = with py; [ + propagatedBuildInputs = with python3Packages; [ sounddevice pyopengl pyopengl-accelerate diff --git a/third_party/nixpkgs/pkgs/applications/audio/jack-autoconnect/default.nix b/third_party/nixpkgs/pkgs/applications/audio/jack-autoconnect/default.nix new file mode 100644 index 0000000000..302571c2be --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/audio/jack-autoconnect/default.nix @@ -0,0 +1,31 @@ +{ lib, mkDerivation, fetchFromGitHub, pkg-config, qmake, qtbase, libjack2 }: +mkDerivation rec { + pname = "jack_autoconnect"; + + # It does not have any versions (yet?) + version = "unstable-2021-02-01"; + + src = fetchFromGitHub { + owner = "kripton"; + repo = pname; + rev = "fe0c8f69149e30979e067646f80b9d326341c02b"; + sha256 = "sha256-imvNc498Q2W9RKmiOoNepSoJzIv2tGvFG6hx+seiifw="; + }; + + buildInputs = [ qtbase libjack2 ]; + nativeBuildInputs = [ pkg-config qmake ]; + + installPhase = '' + mkdir -p -- "$out/bin" + cp -- jack_autoconnect "$out/bin" + ''; + + meta = with lib; { + homepage = "https://github.com/kripton/jack_autoconnect"; + description = + "Tiny application that reacts on port registrations by clients and connects them"; + maintainers = with maintainers; [ unclechu ]; + license = licenses.gpl2Only; + platforms = platforms.linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/audio/qpwgraph/default.nix b/third_party/nixpkgs/pkgs/applications/audio/qpwgraph/default.nix index e415798b46..71d05ac2f3 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/qpwgraph/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/qpwgraph/default.nix @@ -5,14 +5,14 @@ mkDerivation rec { pname = "qpwgraph"; - version = "0.2.5"; + version = "0.3.4"; src = fetchFromGitLab { domain = "gitlab.freedesktop.org"; owner = "rncbc"; repo = "qpwgraph"; rev = "v${version}"; - sha256 = "sha256-OYIBlTO1vXmmY4/ZacvsEQ5EnOfetBvnG2v5xL44czY="; + sha256 = "sha256-JCnvwSredXO1WrTu4BIUaUTTjPcd5U/ZZcRbI/GiFfc="; }; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/applications/audio/sonixd/default.nix b/third_party/nixpkgs/pkgs/applications/audio/sonixd/default.nix index 961fa2c8c1..38110df291 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/sonixd/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/sonixd/default.nix @@ -5,11 +5,11 @@ appimageTools.wrapType2 rec { pname = "sonixd"; - version = "0.15.1"; + version = "0.15.3"; src = fetchurl { url = "https://github.com/jeffvli/sonixd/releases/download/v${version}/Sonixd-${version}-linux-x86_64.AppImage"; - sha256 = "sha256-23WU1nwvrzyw0J+Pplm3JbsScjJxu+RhmwVoe/PjozY="; + sha256 = "sha256-+4L3XAuR7T/z5a58SXre6yUiVi7TvSAs8vPgEC7hcIw="; }; extraInstallCommands = '' diff --git a/third_party/nixpkgs/pkgs/applications/audio/spotify-tui/0001-Add-Collection-SearchType.patch b/third_party/nixpkgs/pkgs/applications/audio/spotify-tui/0001-Add-Collection-SearchType.patch new file mode 100644 index 0000000000..b9daa79a97 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/audio/spotify-tui/0001-Add-Collection-SearchType.patch @@ -0,0 +1,41 @@ +From 408e6a5170bbe9f854bf46e1cbae21265cf25294 Mon Sep 17 00:00:00 2001 +From: Florian Bruhin +Date: Mon, 25 Apr 2022 18:39:07 +0200 +Subject: [PATCH] Add Collection SearchType + +Backport of https://github.com/ramsayleung/rspotify/pull/306 +--- + src/senum.rs | 3 +++ + 1 file changed, 3 insertions(+) + +diff --git a/src/senum.rs b/src/senum.rs +index c94c31c..79d8730 100644 +--- a/src/senum.rs ++++ b/src/senum.rs +@@ -87,6 +87,7 @@ pub enum Type { + User, + Show, + Episode, ++ Collection, + } + impl Type { + pub fn as_str(&self) -> &str { +@@ -98,6 +99,7 @@ pub fn as_str(&self) -> &str { + Type::User => "user", + Type::Show => "show", + Type::Episode => "episode", ++ Type::Collection => "collection", + } + } + } +@@ -112,6 +114,7 @@ fn from_str(s: &str) -> Result { + "user" => Ok(Type::User), + "show" => Ok(Type::Show), + "episode" => Ok(Type::Episode), ++ "collection" => Ok(Type::Collection), + _ => Err(Error::new(ErrorKind::NoEnum(s.to_owned()))), + } + } +-- +2.35.3 + diff --git a/third_party/nixpkgs/pkgs/applications/audio/spotify-tui/Cargo.lock.patch b/third_party/nixpkgs/pkgs/applications/audio/spotify-tui/Cargo.lock.patch new file mode 100644 index 0000000000..7509d6c35c --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/audio/spotify-tui/Cargo.lock.patch @@ -0,0 +1,11 @@ +--- a/Cargo.lock 2022-04-27 17:25:49.017415644 +0300 ++++ b/Cargo.lock 2022-04-27 17:25:51.307433984 +0300 +@@ -1722,8 +1722,6 @@ + [[package]] + name = "rspotify" + version = "0.10.0" +-source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "eefd7bb58b714606b30a490f751d7926942e2874eef5e82934d60d7a4a68dca4" + dependencies = [ + "base64 0.10.1", + "chrono", diff --git a/third_party/nixpkgs/pkgs/applications/audio/spotify-tui/Cargo.toml.patch b/third_party/nixpkgs/pkgs/applications/audio/spotify-tui/Cargo.toml.patch new file mode 100644 index 0000000000..606f69ca74 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/audio/spotify-tui/Cargo.toml.patch @@ -0,0 +1,12 @@ +--- a/Cargo.toml 2022-04-25 18:20:04.329712912 +0200 ++++ b/Cargo.toml 2022-04-25 18:20:44.296429608 +0200 +@@ -29,6 +29,9 @@ + rand = "0.8.3" + anyhow = "1.0.43" + ++[patch.crates-io] ++rspotify = { path = "./rspotify-0.10.0" } ++ + [[bin]] + bench = false + path = "src/main.rs" diff --git a/third_party/nixpkgs/pkgs/applications/audio/spotify-tui/default.nix b/third_party/nixpkgs/pkgs/applications/audio/spotify-tui/default.nix index 055034df4c..2b1d114964 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/spotify-tui/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/spotify-tui/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, rustPlatform, installShellFiles, pkg-config, openssl, python3, libxcb, AppKit, Security }: +{ lib, stdenv, fetchFromGitHub, fetchCrate, rustPlatform, installShellFiles, pkg-config, openssl, python3, libxcb, AppKit, Security }: rustPlatform.buildRustPackage rec { pname = "spotify-tui"; @@ -11,7 +11,40 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-L5gg6tjQuYoAC89XfKE38KCFONwSAwfNoFEUPH4jNAI="; }; - cargoSha256 = "sha256-iucI4/iMF+uXRlnMttobu4xo3IQXq7tGiSSN8eCrLM0="; + # Use patched rspotify + cargoPatches = [ + ./Cargo.lock.patch + ]; + patches = [ + ./Cargo.toml.patch + ]; + + preBuild = let + rspotify = stdenv.mkDerivation rec { + pname = "rspotify"; + version = "0.10.0"; + + src = fetchCrate { + inherit pname version; + sha256 = "sha256-KDtqjVQlMHlhL1xXP3W1YG/YuX9pdCjwW/7g18469Ts="; + }; + + dontBuild = true; + installPhase = '' + mkdir $out + cp -R . $out + ''; + + patches = [ + # add `collection` variant + ./0001-Add-Collection-SearchType.patch + ]; + }; + in '' + ln -s ${rspotify} ./rspotify-${rspotify.version} + ''; + + cargoSha256 = "sha256-S8zuVYcyYvrwggIvlpxNydhoN9kx6xLBwYJSHcbEK40="; nativeBuildInputs = [ installShellFiles ] ++ lib.optionals stdenv.isLinux [ pkg-config python3 ]; buildInputs = [ ] diff --git a/third_party/nixpkgs/pkgs/applications/audio/tauon/default.nix b/third_party/nixpkgs/pkgs/applications/audio/tauon/default.nix index 1809aa52e2..5ae179d9e3 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/tauon/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/tauon/default.nix @@ -23,13 +23,13 @@ stdenv.mkDerivation rec { pname = "tauon"; - version = "7.2.1"; + version = "7.3.1"; src = fetchFromGitHub { owner = "Taiko2k"; repo = "TauonMusicBox"; rev = "v${version}"; - sha256 = "sha256-wEGdqMKLhKjnxNTgqNQpUpYkMk/FuRAKsWX+P/9nUG4="; + sha256 = "sha256-g3mRVPOXU3N+MApLaHAAIIsVuVv2GeB1Nj//8tuS0oI="; }; postPatch = '' @@ -71,7 +71,6 @@ stdenv.mkDerivation rec { mpg123 opusfile pango - pulseaudio wavpack ]; @@ -100,6 +99,7 @@ stdenv.mkDerivation rec { makeWrapperArgs = [ "--prefix PATH : ${lib.makeBinPath [ffmpeg]}" + "--prefix LD_LIBRARY_PATH : ${pulseaudio}/lib" "--prefix PYTHONPATH : $out/share/tauon" "--set GI_TYPELIB_PATH $GI_TYPELIB_PATH" ]; @@ -116,7 +116,7 @@ stdenv.mkDerivation rec { install -Dm755 extra/tauonmb.desktop $out/share/applications/tauonmb.desktop mkdir -p $out/share/icons/hicolor/scalable/apps install -Dm644 extra/tauonmb{,-symbolic}.svg $out/share/icons/hicolor/scalable/apps -''; + ''; meta = with lib; { description = "The Linux desktop music player from the future"; diff --git a/third_party/nixpkgs/pkgs/applications/audio/uade123/default.nix b/third_party/nixpkgs/pkgs/applications/audio/uade123/default.nix index 8191fd381a..a18b38371e 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/uade123/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/uade123/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitLab +, python3 , pkg-config , which , makeWrapper @@ -12,19 +13,21 @@ , vorbis-tools }: -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "uade123"; - version = "unstable-2021-05-21"; + version = "3.01"; src = fetchFromGitLab { owner = "uade-music-player"; repo = "uade"; - rev = "7169a46e777d19957cd7ff8ac31843203e725ddc"; - sha256 = "1dm7c924fy79y3wkb0qi71m1k6yw1x6j3whw7d0w4ka9hv6za03b"; + rev = "uade-${version}"; + sha256 = "0fam3g8mlzrirrac3iwcwsz9jmsqwdy7lkwwdr2q4pkq9cpmh8m5"; }; postPatch = '' - patchShebangs . + patchShebangs configure + substituteInPlace configure \ + --replace 'PYTHON_SETUP_ARGS=""' 'PYTHON_SETUP_ARGS="--prefix=$out"' substituteInPlace src/frontends/mod2ogg/mod2ogg2.sh.in \ --replace '-e stat' '-n stat' \ --replace '/usr/local' "$out" @@ -34,6 +37,7 @@ stdenv.mkDerivation { pkg-config which makeWrapper + python3 ]; buildInputs = [ @@ -43,6 +47,10 @@ stdenv.mkDerivation { lame flac vorbis-tools + (python3.withPackages (p: with p; [ + pillow + tqdm + ])) ]; configureFlags = [ @@ -58,6 +66,8 @@ stdenv.mkDerivation { --prefix PATH : $out/bin:${lib.makeBinPath [ sox lame flac vorbis-tools ]} # This is an old script, don't break expectations by renaming it ln -s $out/bin/mod2ogg2{.sh,} + wrapProgram $out/bin/generate_amiga_oscilloscope_view \ + --prefix PYTHONPATH : "$PYTHONPATH:$out/${python3.sitePackages}" ''; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/alfis/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/alfis/default.nix index e43fbec5d9..bde3bb71e9 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/alfis/default.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/alfis/default.nix @@ -14,16 +14,16 @@ rustPlatform.buildRustPackage rec { pname = "alfis"; - version = "0.7.4"; + version = "0.7.6"; src = fetchFromGitHub { owner = "Revertron"; repo = "Alfis"; rev = "v${version}"; - sha256 = "sha256-mwiG9DwnCX/9REq/oNHi2n/l829Ozgum/WygIb+FV04="; + sha256 = "sha256-g9oaUdmwHGU2EIqSYLGlSN8597ORTzm8XzTxBbiKUNA="; }; - cargoSha256 = "sha256-ylSVyrI9LuctuoMZsZpIH7loBBjxE2onk6L19uV8zCQ="; + cargoSha256 = "sha256-SNROmuChSOHUMhMCTKPOOuoYOATx9JEwuVP0mtGZ/G8="; checkFlags = [ # these want internet access, disable them diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/framesh/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/framesh/default.nix new file mode 100644 index 0000000000..2acc88fc93 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/blockchains/framesh/default.nix @@ -0,0 +1,35 @@ +{ lib, fetchurl, appimageTools }: + +let + pname = "framesh"; + version = "0.5.0-beta.20"; + src = fetchurl { + url = "https://github.com/floating/frame/releases/download/v${version}/Frame-${version}.AppImage"; + sha256 = "sha256-4PU3f5e9NJYnP49nVtCjbGXxWJDCJIArzuaLsWB3Cx0="; + }; + + appimageContents = appimageTools.extractType2 { + inherit pname version src; + }; +in +appimageTools.wrapType2 { + inherit pname version src; + + extraInstallCommands = '' + ln -s $out/bin/${pname}-${version} $out/bin/${pname} + install -m 444 -D ${appimageContents}/frame.desktop $out/share/applications/frame.desktop + install -m 444 -D ${appimageContents}/frame.png \ + $out/share/icons/hicolor/512x512/apps/frame.png + substituteInPlace $out/share/applications/frame.desktop \ + --replace 'Exec=AppRun' 'Exec=${pname}' + ''; + + meta = { + description = "Native web3 interface that lets you sign data, securely manage accounts and transparently interact with dapps via web3 protocols like Ethereum and IPFS"; + homepage = "https://frame.sh/"; + downloadPage = "https://github.com/floating/frame/releases"; + license = lib.licenses.gpl3Only; + platforms = [ "x86_64-linux" ]; + maintainers = with lib.maintainers; [ nook ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/lndmanage/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/lndmanage/default.nix index c9e655448d..41b83e02b4 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/lndmanage/default.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/lndmanage/default.nix @@ -2,13 +2,13 @@ python3Packages.buildPythonApplication rec { pname = "lndmanage"; - version = "0.14.1"; + version = "0.14.2"; src = fetchFromGitHub { owner = "bitromortac"; repo = pname; - rev = "v${version}"; - hash = "sha256-c36AbND01bUr0Klme4fU7GrY1oYcmoEREQI9cwsK7YM="; + rev = "refs/tags/v${version}"; + hash = "sha256-G6KpF/c8FsXrqI0hB0fZlModQThnAOHrCv482UjRng0="; }; propagatedBuildInputs = with python3Packages; [ 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 25dffad43b..bc74edf526 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/android-studio/common.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/android-studio/common.nix @@ -196,7 +196,7 @@ in runCommand { startScript = '' #!${bash}/bin/bash - ${fhsEnv}/bin/${drvName}-fhs-env ${androidStudio}/bin/studio.sh + ${fhsEnv}/bin/${drvName}-fhs-env ${androidStudio}/bin/studio.sh "$@" ''; preferLocalBuild = true; allowSubstitutes = false; 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 5ae2c51a8d..186cfb476a 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 @@ -39,10 +39,10 @@ elpaBuild { pname = "ada-mode"; ename = "ada-mode"; - version = "7.2.0"; + version = "7.2.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/ada-mode-7.2.0.tar"; - sha256 = "00mrcn98bah9cld78qz75mmmk1yrs9k4dbzf6r1x07pngz70fxm2"; + url = "https://elpa.gnu.org/packages/ada-mode-7.2.1.tar"; + sha256 = "1x9gkyi23xsq8zn0n8vb1xgkh85maj2cj95ravhkakb2cd9dmbjv"; }; packageRequires = [ emacs uniquify-files wisi ]; meta = { @@ -155,6 +155,21 @@ license = lib.licenses.free; }; }) {}; + aircon-theme = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "aircon-theme"; + ename = "aircon-theme"; + version = "0.0.5"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/aircon-theme-0.0.5.tar"; + sha256 = "0k9nsm64szi2hvngx9ciyjn8ic9qprfm3gmwp33f0kakq05ykpd1"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/aircon-theme.html"; + license = lib.licenses.free; + }; + }) {}; all = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "all"; @@ -478,10 +493,10 @@ elpaBuild { pname = "cape"; ename = "cape"; - version = "0.7"; + version = "0.8"; src = fetchurl { - url = "https://elpa.gnu.org/packages/cape-0.7.tar"; - sha256 = "1icgd5d55x7x7czw349v8m19mgq4yrx6j6zhbb666h2hdkbnykbg"; + url = "https://elpa.gnu.org/packages/cape-0.8.tar"; + sha256 = "03zc1c2r8h3p9aqk2y8pwysiawbx0f5vgz7582d9qnixdygni117"; }; packageRequires = [ emacs ]; meta = { @@ -756,10 +771,10 @@ elpaBuild { pname = "compat"; ename = "compat"; - version = "28.1.1.1"; + version = "28.1.1.3"; src = fetchurl { - url = "https://elpa.gnu.org/packages/compat-28.1.1.1.tar"; - sha256 = "13ksa6q3m525gd6sdixmak6brfch2rhz8dzzmhvvdh1y04hcnam8"; + url = "https://elpa.gnu.org/packages/compat-28.1.1.3.tar"; + sha256 = "11g27n0103j1xmj1s3m49jcqxn4n4wd9pm69i2g3ikijxs1qw18n"; }; packageRequires = [ emacs nadvice ]; meta = { @@ -801,10 +816,10 @@ elpaBuild { pname = "corfu"; ename = "corfu"; - version = "0.25"; + version = "0.26"; src = fetchurl { - url = "https://elpa.gnu.org/packages/corfu-0.25.tar"; - sha256 = "1ix65l80q8id8vxkvx4wd780cav53lws2z1x3pnj4wmm0n4qwyd9"; + url = "https://elpa.gnu.org/packages/corfu-0.26.tar"; + sha256 = "13wsb0llrnmk65m27drnyaqzv9qicnxbpvqcanj0k90iv411kw21"; }; packageRequires = [ emacs ]; meta = { @@ -876,10 +891,10 @@ elpaBuild { pname = "crdt"; ename = "crdt"; - version = "0.2.7"; + version = "0.3.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/crdt-0.2.7.tar"; - sha256 = "0f6v937zbxj4kci07dv0a1h4q1ak0qabkjq2j258ydxyivvqyvsw"; + url = "https://elpa.gnu.org/packages/crdt-0.3.0.tar"; + sha256 = "0fmrmpjqyzxcmx38kwl6mifq412qfgm9ak7j4f54j33kbp10hjj7"; }; packageRequires = []; meta = { @@ -921,10 +936,10 @@ elpaBuild { pname = "csv-mode"; ename = "csv-mode"; - version = "1.20"; + version = "1.21"; src = fetchurl { - url = "https://elpa.gnu.org/packages/csv-mode-1.20.tar"; - sha256 = "08im1llz04s3ckpj3c3j4wxq4g00fyld2m8ylnh878ss5izzs0lg"; + url = "https://elpa.gnu.org/packages/csv-mode-1.21.tar"; + sha256 = "11f01lyz6i133njigg53r890cic8y13kz7dswc8mj7m60a316dmv"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -936,10 +951,10 @@ elpaBuild { pname = "cursory"; ename = "cursory"; - version = "0.1.4"; + version = "0.2.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/cursory-0.1.4.tar"; - sha256 = "0yjwn6kpxl7b3m8si4sqmdkhr8imcgbvwhwki2sxgybs75lxdg97"; + url = "https://elpa.gnu.org/packages/cursory-0.2.1.tar"; + sha256 = "12q1icz1npan9fjn0sy2zfs3d0iz6b34hqsfggm187igq4zj3rrb"; }; packageRequires = [ emacs ]; meta = { @@ -1037,6 +1052,21 @@ license = lib.licenses.free; }; }) {}; + denote = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "denote"; + ename = "denote"; + version = "0.3.1"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/denote-0.3.1.tar"; + sha256 = "0zdxflmm62gkg6nbrpaxinwb60ghr19pvr3jbgnvbca3bd5yg5wk"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/denote.html"; + license = lib.licenses.free; + }; + }) {}; detached = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "detached"; @@ -1341,10 +1371,10 @@ elpaBuild { pname = "eev"; ename = "eev"; - version = "20220605"; + version = "20220626"; src = fetchurl { - url = "https://elpa.gnu.org/packages/eev-20220605.tar"; - sha256 = "1d8bmps72519hv3raqyjx1sbd7vmihckq8qrzd2v0rglx4smikdk"; + url = "https://elpa.gnu.org/packages/eev-20220626.tar"; + sha256 = "0n09dws1qy23a31s5iv75dzl6xy8m5m7qy9gf7sk1b3133ly4sf5"; }; packageRequires = [ emacs ]; meta = { @@ -1499,10 +1529,10 @@ elpaBuild { pname = "emms"; ename = "emms"; - version = "10"; + version = "11"; src = fetchurl { - url = "https://elpa.gnu.org/packages/emms-10.tar"; - sha256 = "1lgjw9p799sl7nqnl2sk4g67ra10z2ldygx9kb8pmxjrx64mi3qm"; + url = "https://elpa.gnu.org/packages/emms-11.tar"; + sha256 = "000lqhsafyh1n293ksnlyavxv1pzl5pazds4sgxjcqd45lyn55ii"; }; packageRequires = [ cl-lib nadvice seq ]; meta = { @@ -1729,10 +1759,10 @@ elpaBuild { pname = "fontaine"; ename = "fontaine"; - version = "0.2.2"; + version = "0.3.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/fontaine-0.2.2.tar"; - sha256 = "14q10r5086pyknpm8kd9f0scwwbgygqjp8b08k6a4f30a3pl3rqi"; + url = "https://elpa.gnu.org/packages/fontaine-0.3.0.tar"; + sha256 = "0ixi48w3d0yvmw1103gj7iq2acj90p0qlyhna4hpfhnwa247lp2k"; }; packageRequires = [ emacs ]; meta = { @@ -2333,10 +2363,10 @@ elpaBuild { pname = "js2-mode"; ename = "js2-mode"; - version = "20211229"; + version = "20220710"; src = fetchurl { - url = "https://elpa.gnu.org/packages/js2-mode-20211229.tar"; - sha256 = "0qf7z0mmrvlncf1ac6yiza5wmcaf588d53ma41vhj58adaahimz6"; + url = "https://elpa.gnu.org/packages/js2-mode-20220710.tar"; + sha256 = "1wvkqkfbnk3qanbz9167z8dik3667ihgyca8brbkh2b1ld10f9yq"; }; packageRequires = [ cl-lib emacs ]; meta = { @@ -2393,10 +2423,10 @@ elpaBuild { pname = "kind-icon"; ename = "kind-icon"; - version = "0.1.5"; + version = "0.1.6"; src = fetchurl { - url = "https://elpa.gnu.org/packages/kind-icon-0.1.5.tar"; - sha256 = "0qajj89vkgc9gbgff6akzll53jy0kgkv6c9jvwpl32rbg8v0wp63"; + url = "https://elpa.gnu.org/packages/kind-icon-0.1.6.tar"; + sha256 = "0ac53qrz217b054z51244r7whvjmyrq4941ld0bgl9crssrhb588"; }; packageRequires = [ emacs svg-lib ]; meta = { @@ -2498,10 +2528,10 @@ elpaBuild { pname = "lin"; ename = "lin"; - version = "0.3.1"; + version = "0.4.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/lin-0.3.1.tar"; - sha256 = "1blk9vc9fyw6djqh0465bayv2s5s0ap7fps383ihmazmmii6mp2a"; + url = "https://elpa.gnu.org/packages/lin-0.4.0.tar"; + sha256 = "1fynn3fpf3c2yamlpp9j6rakgd21ivyvqrx0hmsgcyr115q5afm4"; }; packageRequires = [ emacs ]; meta = { @@ -3205,10 +3235,10 @@ elpaBuild { pname = "org-modern"; ename = "org-modern"; - version = "0.3"; + version = "0.4"; src = fetchurl { - url = "https://elpa.gnu.org/packages/org-modern-0.3.tar"; - sha256 = "14f5grai6k9xbpyc33pcpgi6ka8pgy7vcnqqi77nclzq2yxhl9c1"; + url = "https://elpa.gnu.org/packages/org-modern-0.4.tar"; + sha256 = "0xn2vmlz43p9b1gscijwzhaxa44dsshlw31llhffqpxlw2amm1lf"; }; packageRequires = [ emacs ]; meta = { @@ -3250,10 +3280,10 @@ elpaBuild { pname = "org-transclusion"; ename = "org-transclusion"; - version = "1.2.0"; + version = "1.3.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/org-transclusion-1.2.0.tar"; - sha256 = "1q36nqxynzh8ygvgw5nmg49c4yq8pgp6lcb6mdqs9paw8pglxcjf"; + url = "https://elpa.gnu.org/packages/org-transclusion-1.3.0.tar"; + sha256 = "1fgxpx5cikp03xzki55b7davx8m6zmrmrd0jzd69mv9gyw3bywg7"; }; packageRequires = [ emacs org ]; meta = { @@ -3580,10 +3610,10 @@ elpaBuild { pname = "pyim"; ename = "pyim"; - version = "4.2.1"; + version = "5.2.3"; src = fetchurl { - url = "https://elpa.gnu.org/packages/pyim-4.2.1.tar"; - sha256 = "15hsz1ji8xa7zqzzmbi0vk95vgsvl4dsd1rann04vfaz30a1rdzv"; + url = "https://elpa.gnu.org/packages/pyim-5.2.3.tar"; + sha256 = "189r0qkd8nv5zjg2ljbzbj086jb8xbl4yd1jliz4azaprv8fhqv0"; }; packageRequires = [ async emacs xr ]; meta = { @@ -3595,10 +3625,10 @@ elpaBuild { pname = "pyim-basedict"; ename = "pyim-basedict"; - version = "0.5.3"; + version = "0.5.4"; src = fetchurl { - url = "https://elpa.gnu.org/packages/pyim-basedict-0.5.3.tar"; - sha256 = "1x3zmcbp5yck5dxfms8d9ym0fdbvwr40fn8wrq0qfl9a58k8i5bx"; + url = "https://elpa.gnu.org/packages/pyim-basedict-0.5.4.tar"; + sha256 = "1zppp12217aakawgndy6daxpw1098lh7lsjar2wwd4qv4xs0d4p6"; }; packageRequires = []; meta = { @@ -3860,10 +3890,10 @@ elpaBuild { pname = "rec-mode"; ename = "rec-mode"; - version = "1.8.4"; + version = "1.9.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/rec-mode-1.8.4.tar"; - sha256 = "03n0g6inhj0mqqcqimh6nfi6rdzgh4w59vdjicvn880r5n8zwn4d"; + url = "https://elpa.gnu.org/packages/rec-mode-1.9.0.tar"; + sha256 = "1w1q6kh567fd8xismq9i6wr1y893lypd30l452yvydi1qjiq1n6x"; }; packageRequires = [ emacs ]; meta = { @@ -3935,10 +3965,10 @@ elpaBuild { pname = "rnc-mode"; ename = "rnc-mode"; - version = "0.2"; + version = "0.3"; src = fetchurl { - url = "https://elpa.gnu.org/packages/rnc-mode-0.2.el"; - sha256 = "0xhvcfqjkb010wc7r218xcjidv1c8597vayyv09vk97z4qxqkrbd"; + url = "https://elpa.gnu.org/packages/rnc-mode-0.3.tar"; + sha256 = "1bd4pxaijcs0w8v9r7x9aiqyqf1rl46153dxl0ilhm3fc90iyf2r"; }; packageRequires = []; meta = { @@ -4061,10 +4091,10 @@ elpaBuild { pname = "setup"; ename = "setup"; - version = "1.2.0"; + version = "1.3.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/setup-1.2.0.tar"; - sha256 = "1fyzkm42gsvsjpk3vahfb7asfldarixm0wsw3g66q3ad0r7cbjnz"; + url = "https://elpa.gnu.org/packages/setup-1.3.0.tar"; + sha256 = "0r13ry73jm31j8fq7v1sh0k113fr4blfkiz85696bdpah2pnca87"; }; packageRequires = [ emacs ]; meta = { @@ -4320,10 +4350,10 @@ elpaBuild { pname = "sql-cassandra"; ename = "sql-cassandra"; - version = "0.2.1"; + version = "0.2.2"; src = fetchurl { - url = "https://elpa.gnu.org/packages/sql-cassandra-0.2.1.tar"; - sha256 = "1w9jhh4gf5nnjq8p2zfdli81yqvnfjri4qlwxiwb913ah48vyi2l"; + url = "https://elpa.gnu.org/packages/sql-cassandra-0.2.2.tar"; + sha256 = "06h301fpqax24x295x06bz08ipjjnxs9smisyz82z08kgszq92c6"; }; packageRequires = [ emacs ]; meta = { @@ -4549,10 +4579,10 @@ elpaBuild { pname = "tempel"; ename = "tempel"; - version = "0.3"; + version = "0.4"; src = fetchurl { - url = "https://elpa.gnu.org/packages/tempel-0.3.tar"; - sha256 = "0aa3f3sfvibp3wl401fdlww70axl9hxasbza70i44vqq0y9csv40"; + url = "https://elpa.gnu.org/packages/tempel-0.4.tar"; + sha256 = "002ng6x1qlhnk7vvpwjl8wkm869k0ihpbdgbnhqjsnpzln1gib0w"; }; packageRequires = [ emacs ]; meta = { @@ -4613,10 +4643,10 @@ elpaBuild { pname = "tmr"; ename = "tmr"; - version = "0.3.0"; + version = "0.4.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/tmr-0.3.0.tar"; - sha256 = "1cv90hg7hsaffkcxryp9d5cyjvmfpxcmrw5knipad77yxzaf4s6b"; + url = "https://elpa.gnu.org/packages/tmr-0.4.0.tar"; + sha256 = "1s4q7gbqjhqsvwzcfqr9ykm2pdrjybsi2fanxm01vvmzwg2bi6d8"; }; packageRequires = [ emacs ]; meta = { @@ -4643,10 +4673,10 @@ elpaBuild { pname = "tramp"; ename = "tramp"; - version = "2.5.2.5"; + version = "2.5.3"; src = fetchurl { - url = "https://elpa.gnu.org/packages/tramp-2.5.2.5.tar"; - sha256 = "05f59x7jl4m187y2cidhnfz7p8q85gav4xpipazfvm5dicxz4j7c"; + url = "https://elpa.gnu.org/packages/tramp-2.5.3.tar"; + sha256 = "16bs90h7b1d188v6glhfp0y4wgxvwn3dl6l4sbswlf1zq3y61zy7"; }; packageRequires = [ emacs ]; meta = { @@ -4778,10 +4808,10 @@ elpaBuild { pname = "uniquify-files"; ename = "uniquify-files"; - version = "1.0.3"; + version = "1.0.4"; src = fetchurl { - url = "https://elpa.gnu.org/packages/uniquify-files-1.0.3.tar"; - sha256 = "1i7svplkw9wxiypw52chdry7f5gf992fb4yg8s7jy77v521fd2af"; + url = "https://elpa.gnu.org/packages/uniquify-files-1.0.4.tar"; + sha256 = "0ry52l9p2sz8nsfh15ffa25s46vqhna466ahmjmnmlihgjhdm85q"; }; packageRequires = [ emacs ]; meta = { @@ -4862,10 +4892,10 @@ elpaBuild { pname = "vc-got"; ename = "vc-got"; - version = "1.1.1"; + version = "1.1.2"; src = fetchurl { - url = "https://elpa.gnu.org/packages/vc-got-1.1.1.tar"; - sha256 = "0f8rwd4scvlyn9i9xq7d2sly7r0ddzi8z565jx1h2lkcs5nbihcb"; + url = "https://elpa.gnu.org/packages/vc-got-1.1.2.tar"; + sha256 = "1824d5c217qimsg4aw8adjvv06gkhv5f3918fi0lkhya1jsvfrx9"; }; packageRequires = [ emacs ]; meta = { @@ -4892,10 +4922,10 @@ elpaBuild { pname = "vcard"; ename = "vcard"; - version = "0.2.1"; + version = "0.2.2"; src = fetchurl { - url = "https://elpa.gnu.org/packages/vcard-0.2.1.tar"; - sha256 = "0nfrh1mz2h7h259kf7sj13z30kmjywfvs83ax5qjkfwxhqm03abf"; + url = "https://elpa.gnu.org/packages/vcard-0.2.2.tar"; + sha256 = "0f06qzmj91kdpdlhlykh7v7jx0xvwxg8072ys145g1mvh5l23yig"; }; packageRequires = [ emacs ]; meta = { @@ -4954,10 +4984,10 @@ elpaBuild { pname = "vertico"; ename = "vertico"; - version = "0.24"; + version = "0.25"; src = fetchurl { - url = "https://elpa.gnu.org/packages/vertico-0.24.tar"; - sha256 = "17vsx1yijx9clly977lvc6y296kq8g859hqwwq1v8zh4k0wqr9hc"; + url = "https://elpa.gnu.org/packages/vertico-0.25.tar"; + sha256 = "1v0icwqp4ppa2j1k1fk4fc5zdzqb4hcdc7khjc1c31q0gad6l3xy"; }; packageRequires = [ emacs ]; meta = { @@ -5187,10 +5217,10 @@ elpaBuild { pname = "wisi"; ename = "wisi"; - version = "3.1.7"; + version = "3.1.8"; src = fetchurl { - url = "https://elpa.gnu.org/packages/wisi-3.1.7.tar"; - sha256 = "1xraks3n97axc978qlgcwr4f7ib3lyr4bvb5lq5z099hd2g01qch"; + url = "https://elpa.gnu.org/packages/wisi-3.1.8.tar"; + sha256 = "1k4vfxjas79yv5xfnmjygf185zkypx65gpqlmxpvfgcmvl7dgbdy"; }; packageRequires = [ emacs seq ]; meta = { @@ -5282,10 +5312,10 @@ elpaBuild { pname = "xr"; ename = "xr"; - version = "1.22"; + version = "1.23"; src = fetchurl { - url = "https://elpa.gnu.org/packages/xr-1.22.tar"; - sha256 = "1l3bqgzvbamfs4n628kg789g7vjn4v81q570gzbw2cwjgk4s6xbj"; + url = "https://elpa.gnu.org/packages/xr-1.23.tar"; + sha256 = "1nz3fhd4qx8fxib78y41jvnzn27lf7mlvpkz565d5zc9q4mr300z"; }; 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 b3303d3dfd..80809de08c 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.6.0"; + version = "1.7.0"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/annotate-1.6.0.tar"; - sha256 = "12843875nvrw5cs2pzag9i2k4vgajbs4rr56js7h6mx9w6jmg8hc"; + url = "https://elpa.nongnu.org/nongnu/annotate-1.7.0.tar"; + sha256 = "0bpicd0m9h1n56ywinfa0wykhx86sxn8i1f2j5vwhwcidap42qaa"; }; packageRequires = []; meta = { @@ -109,10 +109,10 @@ elpaBuild { pname = "apropospriate-theme"; ename = "apropospriate-theme"; - version = "0.1.1"; + version = "0.2.0"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/apropospriate-theme-0.1.1.tar"; - sha256 = "11m80gijxvg4jf9davjja3bvykv161ggsrg7q0bihr0gq0flxgd7"; + url = "https://elpa.nongnu.org/nongnu/apropospriate-theme-0.2.0.tar"; + sha256 = "1s4cvh24zj3wpdqc3lklvi1dkba3jf87nxrzq0s3l1rzhg21pfpj"; }; packageRequires = []; meta = { @@ -245,6 +245,21 @@ license = lib.licenses.free; }; }) {}; + cdlatex = callPackage ({ auctex, elpaBuild, fetchurl, lib }: + elpaBuild { + pname = "cdlatex"; + ename = "cdlatex"; + version = "4.12"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/cdlatex-4.12.tar"; + sha256 = "1m8liqxz76r8f3b8hvyyn7kqgq0fkk5pv4pqgdscbgw36vpcbkry"; + }; + packageRequires = [ auctex ]; + meta = { + homepage = "https://elpa.gnu.org/packages/cdlatex.html"; + license = lib.licenses.free; + }; + }) {}; cider = callPackage ({ clojure-mode , elpaBuild , emacs @@ -375,6 +390,25 @@ license = lib.licenses.free; }; }) {}; + cycle-at-point = callPackage ({ elpaBuild + , emacs + , fetchurl + , lib + , recomplete }: + elpaBuild { + pname = "cycle-at-point"; + ename = "cycle-at-point"; + version = "0.1"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/cycle-at-point-0.1.tar"; + sha256 = "0097w7nw8d1q7ad4b4qjk0svwxqg80jr2p27540vkir7289w59j3"; + }; + packageRequires = [ emacs recomplete ]; + meta = { + homepage = "https://elpa.gnu.org/packages/cycle-at-point.html"; + license = lib.licenses.free; + }; + }) {}; d-mode = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "d-mode"; @@ -405,6 +439,36 @@ license = lib.licenses.free; }; }) {}; + diff-ansi = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "diff-ansi"; + ename = "diff-ansi"; + version = "0.2"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/diff-ansi-0.2.tar"; + sha256 = "1fcy89m6wkhc5hy4lqcd60ckrf9qwimilydjx083nackppdz1xlw"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/diff-ansi.html"; + license = lib.licenses.free; + }; + }) {}; + doc-show-inline = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "doc-show-inline"; + ename = "doc-show-inline"; + version = "0.1"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/doc-show-inline-0.1.tar"; + sha256 = "11khy906vmhz445ryrdb63v0hjq0x59dn152j96vv9jlg5gqdi3b"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/doc-show-inline.html"; + license = lib.licenses.free; + }; + }) {}; dockerfile-mode = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "dockerfile-mode"; @@ -450,6 +514,21 @@ license = lib.licenses.free; }; }) {}; + edit-indirect = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "edit-indirect"; + ename = "edit-indirect"; + version = "0.1.10"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/edit-indirect-0.1.10.tar"; + sha256 = "0mk6s5hc8n9s5c434im6r06mfgmdf5s44zlr9j3hfkjaic1lf45b"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/edit-indirect.html"; + license = lib.licenses.free; + }; + }) {}; editorconfig = callPackage ({ cl-lib ? null , elpaBuild , emacs @@ -489,10 +568,10 @@ elpaBuild { pname = "elpher"; ename = "elpher"; - version = "3.4.1"; + version = "3.4.2"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/elpher-3.4.1.tar"; - sha256 = "1vayhcamdp8nn6hrgffd0yx9k9q3mckbcsfwclhyyfc0x1hcwf92"; + url = "https://elpa.nongnu.org/nongnu/elpher-3.4.2.tar"; + sha256 = "0q7a79jnlihjj936wi199pdxl0ydy04354y0mqpxms00r98hzr9d"; }; packageRequires = [ emacs ]; meta = { @@ -652,10 +731,10 @@ elpaBuild { pname = "evil-numbers"; ename = "evil-numbers"; - version = "0.6"; + version = "0.7"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/evil-numbers-0.6.tar"; - sha256 = "0zl16ljb64cawcj11f4ndz941sllj8nhgjcb4w0r1afxbvpn5rss"; + url = "https://elpa.nongnu.org/nongnu/evil-numbers-0.7.tar"; + sha256 = "1kd60kc8762i9vyig179dnbmrjyw30bm06g26abndw2kjxaqjhr8"; }; packageRequires = [ emacs evil ]; meta = { @@ -703,10 +782,10 @@ elpaBuild { pname = "flymake-popon"; ename = "flymake-popon"; - version = "0.2"; + version = "0.3"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/flymake-popon-0.2.tar"; - sha256 = "08wpfia4q12nhc6l0xmdc54f1s73c0ds6hxwgkk5hjw906rpgn4a"; + url = "https://elpa.nongnu.org/nongnu/flymake-popon-0.3.tar"; + sha256 = "1cmimdkav8cdl7x6qplm4pvj2ifyb3lk8h2q624vh7cxxlh8yq0l"; }; packageRequires = [ emacs flymake popon posframe ]; meta = { @@ -1119,10 +1198,10 @@ elpaBuild { pname = "helm"; ename = "helm"; - version = "3.8.5"; + version = "3.8.6"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/helm-3.8.5.tar"; - sha256 = "1h71qcik375zhkk4rgcxj6ffnzpns2lvzwq82yfhmmhzrrxhds0z"; + url = "https://elpa.nongnu.org/nongnu/helm-3.8.6.tar"; + sha256 = "0h0l36wmzxi03viy0jd3zri84big0syiilvjm639nqhzsr1lbvy2"; }; packageRequires = [ helm-core popup ]; meta = { @@ -1134,10 +1213,10 @@ elpaBuild { pname = "helm-core"; ename = "helm-core"; - version = "3.8.5"; + version = "3.8.6"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/helm-core-3.8.5.tar"; - sha256 = "0117y2gazm8h5fxj23166a53w4r68r1mscgardk0y6xd6lz73yz9"; + url = "https://elpa.nongnu.org/nongnu/helm-core-3.8.6.tar"; + sha256 = "0yzzwdggd37m7kv0gh4amc7l5x0r5x2pxi3lfs36hq2hfsqlfkza"; }; packageRequires = [ async emacs ]; meta = { @@ -1163,6 +1242,21 @@ license = lib.licenses.free; }; }) {}; + hl-block-mode = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "hl-block-mode"; + ename = "hl-block-mode"; + version = "0.1"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/hl-block-mode-0.1.tar"; + sha256 = "08b2n8i0qmjp5r6ijlg66g0j8aiwhrczxyf0ssr9jbga43k4swzq"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/hl-block-mode.html"; + license = lib.licenses.free; + }; + }) {}; htmlize = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "htmlize"; @@ -1178,6 +1272,21 @@ license = lib.licenses.free; }; }) {}; + idle-highlight-mode = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "idle-highlight-mode"; + ename = "idle-highlight-mode"; + version = "1.1.3"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/idle-highlight-mode-1.1.3.tar"; + sha256 = "05w2rqc71h1f13ysdfjma90s35kj5d5i2szcw54cqyky8rymx5dp"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/idle-highlight-mode.html"; + license = lib.licenses.free; + }; + }) {}; idris-mode = callPackage ({ cl-lib ? null , elpaBuild , emacs @@ -1221,10 +1330,10 @@ elpaBuild { pname = "inf-clojure"; ename = "inf-clojure"; - version = "3.1.0"; + version = "3.2.0"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/inf-clojure-3.1.0.tar"; - sha256 = "0jw6rzplicbv2l7si46naspzp5lqwj20b1nmfs9zal58z1gx6zjk"; + url = "https://elpa.nongnu.org/nongnu/inf-clojure-3.2.0.tar"; + sha256 = "1a9hr28l8cxf5j9b5z0mwds4jd36bhdqz9r86c85rylgaibx5ky7"; }; packageRequires = [ clojure-mode emacs ]; meta = { @@ -1232,6 +1341,36 @@ license = lib.licenses.free; }; }) {}; + inf-ruby = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "inf-ruby"; + ename = "inf-ruby"; + version = "2.6.1"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/inf-ruby-2.6.1.tar"; + sha256 = "0z57wwpm7wh04yp7za8fmv4ib56np629kmk4djs8qaz5bv494znr"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/inf-ruby.html"; + license = lib.licenses.free; + }; + }) {}; + inkpot-theme = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "inkpot-theme"; + ename = "inkpot-theme"; + version = "0.1"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/inkpot-theme-0.1.tar"; + sha256 = "0ik7vkwqlsgxmdckd154kh82zg8jr41vwc0a200x9920l5mnfjq2"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/inkpot-theme.html"; + license = lib.licenses.free; + }; + }) {}; j-mode = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "j-mode"; @@ -1565,14 +1704,29 @@ license = lib.licenses.free; }; }) {}; + oblivion-theme = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "oblivion-theme"; + ename = "oblivion-theme"; + version = "0.1"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/oblivion-theme-0.1.tar"; + sha256 = "0095sc82nl5qxz5nlf2bxbynkxa3plcqr8dq187r70p0775jw46m"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/oblivion-theme.html"; + license = lib.licenses.free; + }; + }) {}; org-auto-tangle = callPackage ({ async, elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "org-auto-tangle"; ename = "org-auto-tangle"; - version = "0.4.1"; + version = "0.5.1"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/org-auto-tangle-0.4.1.tar"; - sha256 = "169i1agnv66gkpgn5wxxri42610n2dp1gz9bfafk2n2a8b08mhn1"; + url = "https://elpa.nongnu.org/nongnu/org-auto-tangle-0.5.1.tar"; + sha256 = "12sy30yr8r3g7gmvcdsrrmy62lhvajg3gp62gj7p836kh9xllpsl"; }; packageRequires = [ async emacs ]; meta = { @@ -1805,10 +1959,10 @@ elpaBuild { pname = "popon"; ename = "popon"; - version = "0.4"; + version = "0.7"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/popon-0.4.tar"; - sha256 = "1c3brjhkdnpawi8jsc20jvhc1vl3l39da12rn3lfx2bfxvjvz76w"; + url = "https://elpa.nongnu.org/nongnu/popon-0.7.tar"; + sha256 = "0sr0cv9jlaj83sgk1cb7wd6r12g6gmzdjzm077gxa6jy9p4qrv0q"; }; packageRequires = [ emacs ]; meta = { @@ -1846,6 +2000,21 @@ license = lib.licenses.free; }; }) {}; + proof-general = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "proof-general"; + ename = "proof-general"; + version = "4.5"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/proof-general-4.5.tar"; + sha256 = "13zy339yz6ijgkcnqxzcyg909z77w3capb3gim1riy3sqikvv04x"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/proof-general.html"; + license = lib.licenses.free; + }; + }) {}; prop-menu = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "prop-menu"; @@ -1891,6 +2060,21 @@ license = lib.licenses.free; }; }) {}; + recomplete = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "recomplete"; + ename = "recomplete"; + version = "0.2"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/recomplete-0.2.tar"; + sha256 = "09n21mx90wr53xlhy5mlca675ah9ynnnc2afzjjml98ll81f4k23"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/recomplete.html"; + license = lib.licenses.free; + }; + }) {}; request = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "request"; @@ -1925,10 +2109,10 @@ elpaBuild { pname = "rust-mode"; ename = "rust-mode"; - version = "1.0.4"; + version = "1.0.5"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/rust-mode-1.0.4.tar"; - sha256 = "137z04h29cgy1dmkf2cnchlfzqs4f5v3cc9gv9qxisw9dswlvdvk"; + url = "https://elpa.nongnu.org/nongnu/rust-mode-1.0.5.tar"; + sha256 = "16dw4mfgfazslsf8n9fir2xc3v3jpw9i7bbgcfbhgclm0g2w9j83"; }; packageRequires = [ emacs ]; meta = { @@ -1970,6 +2154,36 @@ license = lib.licenses.free; }; }) {}; + scroll-on-drag = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "scroll-on-drag"; + ename = "scroll-on-drag"; + version = "0.1"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/scroll-on-drag-0.1.tar"; + sha256 = "06bpxfhdhsf6awhjcj21x8kb3g9n6j14s43cd03fp5gb0m5bs478"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/scroll-on-drag.html"; + license = lib.licenses.free; + }; + }) {}; + scroll-on-jump = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "scroll-on-jump"; + ename = "scroll-on-jump"; + version = "0.1"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/scroll-on-jump-0.1.tar"; + sha256 = "0y6r0aa14sv8yh56w46s840bdkgq6y234qz1jbbsgklx42cw6zgg"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/scroll-on-jump.html"; + license = lib.licenses.free; + }; + }) {}; sesman = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "sesman"; @@ -2075,6 +2289,21 @@ license = lib.licenses.free; }; }) {}; + spell-fu = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "spell-fu"; + ename = "spell-fu"; + version = "0.3"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/spell-fu-0.3.tar"; + sha256 = "0yr7m0i89ymp93p4qx8a0y1ghg7ydg1479xgvsz71n35x4sbiwba"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/spell-fu.html"; + license = lib.licenses.free; + }; + }) {}; stylus-mode = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "stylus-mode"; @@ -2124,10 +2353,10 @@ elpaBuild { pname = "swift-mode"; ename = "swift-mode"; - version = "8.4.2"; + version = "8.6.0"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/swift-mode-8.4.2.tar"; - sha256 = "0rkri1414f2w2bw76dwnmylcdca6x9bkdvlq1aznz76ac259klji"; + url = "https://elpa.nongnu.org/nongnu/swift-mode-8.6.0.tar"; + sha256 = "0zasgv311mjc1iih9wv8vb8h53y2pjx24xsbdnn0wk8xcdk4z8j6"; }; packageRequires = [ emacs seq ]; meta = { @@ -2139,10 +2368,10 @@ elpaBuild { pname = "swsw"; ename = "swsw"; - version = "2.1.1"; + version = "2.2"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/swsw-2.1.1.tar"; - sha256 = "0k6cysa4pmxv1kmpn0fqvardbdfayj92cq0r3gxrx9pgqxlqwfix"; + url = "https://elpa.nongnu.org/nongnu/swsw-2.2.tar"; + sha256 = "0bxcpk5329g4xdfnx8n70q53v4aansxfcs3fdpzssayyyv4fk72m"; }; packageRequires = [ emacs ]; meta = { @@ -2150,6 +2379,21 @@ license = lib.licenses.free; }; }) {}; + symbol-overlay = callPackage ({ elpaBuild, emacs, fetchurl, lib, seq }: + elpaBuild { + pname = "symbol-overlay"; + ename = "symbol-overlay"; + version = "4.1"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/symbol-overlay-4.1.tar"; + sha256 = "07gcg45y712dblidak2kxp7w0h0gf39hwzwbkpna66k4c4xjpig8"; + }; + packageRequires = [ emacs seq ]; + meta = { + homepage = "https://elpa.gnu.org/packages/symbol-overlay.html"; + license = lib.licenses.free; + }; + }) {}; systemd = callPackage ({ elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "systemd"; @@ -2291,6 +2535,36 @@ license = lib.licenses.free; }; }) {}; + undo-fu = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "undo-fu"; + ename = "undo-fu"; + version = "0.4"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/undo-fu-0.4.tar"; + sha256 = "15r0lkzbxgvnwdmaxgiwnik2z8622gdzmpxllv8pfr36y6jmsgs8"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/undo-fu.html"; + license = lib.licenses.free; + }; + }) {}; + undo-fu-session = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "undo-fu-session"; + ename = "undo-fu-session"; + version = "0.2"; + src = fetchurl { + url = "https://elpa.nongnu.org/nongnu/undo-fu-session-0.2.tar"; + sha256 = "1vxyazcxw2gxvxh96grsff1lijsd5fh3pjzkbkj7axn3myavp374"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/undo-fu-session.html"; + license = lib.licenses.free; + }; + }) {}; vc-fossil = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "vc-fossil"; @@ -2340,10 +2614,10 @@ elpaBuild { pname = "web-mode"; ename = "web-mode"; - version = "17.2.2"; + version = "17.2.3"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/web-mode-17.2.2.tar"; - sha256 = "19ajwjcxv7vqysk085jyys77vry8nw7rzc7c43khyxb54qvg36i3"; + url = "https://elpa.nongnu.org/nongnu/web-mode-17.2.3.tar"; + sha256 = "1fvkr3yvhx67wkcynid7xppaci3m1d5ggdaii3d4dfp57wwz5c13"; }; packageRequires = [ emacs ]; meta = { @@ -2438,10 +2712,10 @@ elpaBuild { pname = "xah-fly-keys"; ename = "xah-fly-keys"; - version = "17.13.20220526011611"; + version = "17.17.20220709145456"; src = fetchurl { - url = "https://elpa.nongnu.org/nongnu/xah-fly-keys-17.13.20220526011611.tar"; - sha256 = "1lg8805s5y61jr6yrm44zdjm0nad6adc5xr78zm0i0qzigbhhdcq"; + url = "https://elpa.nongnu.org/nongnu/xah-fly-keys-17.17.20220709145456.tar"; + sha256 = "1npgdc9f1vj1d9nyfh30vskybqs2lwhd31b2a7i79ifrxs48kqr4"; }; 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 fdf580cd81..ff65a903ed 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 @@ -120,11 +120,11 @@ "repo": "zzamboni/750words-client", "unstable": { "version": [ - 20210701, - 1950 + 20220625, + 1407 ], - "commit": "0fed7621c04debad64ea6455455494d4e6eb03fa", - "sha256": "1qglbfdc6526aqsba93ngw1a6hp19lqx1wlxzzy9yvggbb02mii2" + "commit": "8abef82d644223c7991beb689072889c72d1faee", + "sha256": "1vbh0gynm4z5rhrzcava5dh1m6hh683fz18b7rjjib31l7fx96s0" } }, { @@ -227,19 +227,19 @@ "repo": "mkjunker/abc-mode", "unstable": { "version": [ - 20210508, - 1552 + 20220713, + 1359 ], - "commit": "80fa954787b57d14e21e19bd65e52abab1686f4a", - "sha256": "0x7y2r5kijzg33jqlwym8lw1ivx00j3g7lzbl171wzyy3qn15bk5" + "commit": "45193b67508861cf77da7e76b71711855c002caa", + "sha256": "10i8wkzwngflfzbwmqv5gv6jzh5v5j7yh1364xdygg4xpnf7qdnv" }, "stable": { "version": [ - 20140225, - 944 + 20220713, + 1359 ], - "commit": "6b5ab7402287dab5a091e94fec9982dc45d9d287", - "sha256": "13f4l9xzx4xm5m80kkb49zh31w0bn0kw9m5ca28rrx4aysqmwryv" + "commit": "45193b67508861cf77da7e76b71711855c002caa", + "sha256": "10i8wkzwngflfzbwmqv5gv6jzh5v5j7yh1364xdygg4xpnf7qdnv" } }, { @@ -1035,8 +1035,8 @@ "auto-complete", "yasnippet" ], - "commit": "f34e09783b77d1158ea139b7b3d8034bc52b0b9f", - "sha256": "1qi529lg3y5l4wrzfyk0w2fz36mpd432bp39s859z4cq06yybxga" + "commit": "dc563f4b1efeac8ae75f217532f4c99b4ba417de", + "sha256": "188hisppjbpia3bmrpsxvkfi8xkirisarnrpvkk3ya4k8lv4z13p" }, "stable": { "version": [ @@ -1061,8 +1061,8 @@ "repo": "xcwen/ac-php", "unstable": { "version": [ - 20220418, - 419 + 20220701, + 253 ], "deps": [ "dash", @@ -1072,8 +1072,8 @@ "s", "xcscope" ], - "commit": "f34e09783b77d1158ea139b7b3d8034bc52b0b9f", - "sha256": "1qi529lg3y5l4wrzfyk0w2fz36mpd432bp39s859z4cq06yybxga" + "commit": "dc563f4b1efeac8ae75f217532f4c99b4ba417de", + "sha256": "188hisppjbpia3bmrpsxvkfi8xkirisarnrpvkk3ya4k8lv4z13p" }, "stable": { "version": [ @@ -1139,8 +1139,8 @@ "auto-complete", "rtags" ], - "commit": "db39790fda5c2443bc790b8971ac140914f7e9c2", - "sha256": "05cigdvlq5lfahr9a1z8rvlw2s99j4pha2in59pshz9ph8cqgq10" + "commit": "c628efc9b485470a48aec2692d79f7c140bc5b92", + "sha256": "03avv7brbrj69368riq3xg4qh65yzl5cyjn9wc2rbyx4jw2q3p4p" }, "stable": { "version": [ @@ -2347,8 +2347,8 @@ "deps": [ "flycheck" ], - "commit": "c8ab1ec50f7c62fb42a78c0617624b91ba62a162", - "sha256": "1jvy66cw9vb5nv0bmzaliqdhjxkkwzz2ydq6zkwax5p15y81sw0q" + "commit": "739b46da22d272e748f60f3efcd2989d696fba71", + "sha256": "10p57vkif119qsc156jrkr3f0fdc5hzh5ymxh3334f6gadzpxq4z" }, "stable": { "version": [ @@ -2489,11 +2489,11 @@ "repo": "domtronn/all-the-icons.el", "unstable": { "version": [ - 20220521, - 816 + 20220628, + 2233 ], - "commit": "ca1ef30004d3fb76aaa70bd47cb83e9fe017a7f7", - "sha256": "149i1wh2wk4j6x8zyz8macz6pfhkmpvf9j6xqhn3psnbdpikjvqp" + "commit": "9c90dbaa31a2fdc163e4394514bf9ee359e46ee5", + "sha256": "0sx1xj9fspv560h23h7hmg3kwcc5vjk337i6ic3c3vl94zhd92r2" }, "stable": { "version": [ @@ -2531,14 +2531,14 @@ "repo": "wyuenho/all-the-icons-dired", "unstable": { "version": [ - 20220304, - 1638 + 20220620, + 1939 ], "deps": [ "all-the-icons" ], - "commit": "147ed0dfd1034a686795a08dc63e2c293128597e", - "sha256": "1vlwhnvgpjsvrlifczlnf4w02vpzp8rqkfw3mphhzxkfzvif5v53" + "commit": "b5d3af1e47de09e6ac80d4d7fba516e6a3c38e26", + "sha256": "1a72ka2sfnn644kgz6ag8sz3j8dxkbmlyd5rv7fq9qwj7487n2yh" }, "stable": { "version": [ @@ -2585,8 +2585,8 @@ "deps": [ "all-the-icons" ], - "commit": "0fcb43eb440e18078c8faf67c27a2189bbb45dfb", - "sha256": "16g81kx77bn3n5ziksmmmsx9c6fvfw21czanq1pivclpw3vdqscb" + "commit": "370fff61b52b9d918da8af6c72edbc21e766c499", + "sha256": "18z8kpc6hni74f0v42lbijnxp92654mnzfadl5pml75jhqscww7k" }, "stable": { "version": [ @@ -2641,15 +2641,15 @@ "repo": "seagle0128/all-the-icons-ivy-rich", "unstable": { "version": [ - 20220607, - 1820 + 20220625, + 1332 ], "deps": [ "all-the-icons", "ivy-rich" ], - "commit": "e489b08aeae53c0288474495b5c0e6847ba1005d", - "sha256": "150p4aqg7dd3k277518ia3zsjkyn8f8a5msmgh9x812gypcrgcpm" + "commit": "616a39f71484b15d21d89ca40cd174e0ca15b8f4", + "sha256": "0k3lg23jd83cav74rvpmwv3v7b7700ih4jgs2hilwszs8kq2kn5g" }, "stable": { "version": [ @@ -2712,11 +2712,11 @@ "repo": "jcs-elpa/alt-codes", "unstable": { "version": [ - 20220212, - 1526 + 20220704, + 644 ], - "commit": "e79c3762130749b02689d1274adce8b93aac9b7a", - "sha256": "0vpcran6yxp9vyy9xhwc9kj7hw3shsvz6igy4yvj0i4xkpkib4p8" + "commit": "cd007b1627afc450a30183da82e50d611afe6b8e", + "sha256": "19fw0ayfha9py11bn564knbi6yzf3cjvzn4pg183mk4lb8h3964h" }, "stable": { "version": [ @@ -3229,11 +3229,11 @@ "repo": "bastibe/annotate.el", "unstable": { "version": [ - 20220603, - 1023 + 20220707, + 1207 ], - "commit": "7f48fad362b15546da7b015b533609a2452497b0", - "sha256": "01kv6bjsnsarnmmy7jrbs74q1pdabz2k4p0330hcny7nl9xp51jj" + "commit": "4c697e70e882657aaf9072d9703c6142e931b265", + "sha256": "1brm6qp3zcprr9s7v1q4jd2wzbnv2dvx2krv754jzdiw3lm92arf" }, "stable": { "version": [ @@ -3271,8 +3271,8 @@ 20200914, 644 ], - "commit": "6385f850a185523bb5241a71f5a7614a148f6b53", - "sha256": "0dllhhbr265dm12nkiil0s7cb24l7pjdjgfwgcsy98imn8pl8z4p" + "commit": "5d30d8e7a25dfced02edefd82699f1f7b6f79316", + "sha256": "022jzidrgx66k40i25wd49p8q9gh8x7s2m7qnxpqcfjbmgdy624p" }, "stable": { "version": [ @@ -3422,6 +3422,30 @@ "sha256": "1382ks8nakanv864flk070haibk7841ygb3nm262i7414zqsyfrk" } }, + { + "ename": "ansilove", + "commit": "8f0e33e241bbdbac9847f4acfe11f255e20c9c67", + "sha256": "05h5r66aq4nbrfgqp39pa6p0zjbzki963yc6ii5jyybllh6x4bis", + "fetcher": "gitlab", + "repo": "xgqt/emacs-ansilove", + "unstable": { + "version": [ + 20220629, + 2339 + ], + "commit": "3e3f6e8baa2135b072855567e4a1fc599a2fc800", + "sha256": "18p448arf6b6hbqvcxfvw6p45zijfzi2rg91dh26xbzaa398p9bj" + }, + "stable": { + "version": [ + 1, + 0, + 0 + ], + "commit": "7841c01c56026f2b4405228803f8a9d4746a5680", + "sha256": "18p448arf6b6hbqvcxfvw6p45zijfzi2rg91dh26xbzaa398p9bj" + } + }, { "ename": "ant", "commit": "7fabdb05de9b8ec18a3a566f99688b50443b6b44", @@ -3624,11 +3648,11 @@ "repo": "radian-software/apheleia", "unstable": { "version": [ - 20220604, - 2239 + 20220620, + 2151 ], - "commit": "67853e98b190cc735a8ad31bd1de64f76f2990c4", - "sha256": "1jbidfz0s7lz190hzwvj7qxh2f3lmbwaynqrarr183pksja4jqwc" + "commit": "12804a50206c708570104637472411288d6133f5", + "sha256": "1dw9d1xm1c1l528bbrm0gckg0qnn9364g37fi41mi10cg6fvi04c" }, "stable": { "version": [ @@ -3784,20 +3808,20 @@ "repo": "waymondo/apropospriate-theme", "unstable": { "version": [ - 20220418, - 1554 + 20220612, + 1555 ], - "commit": "52ed4bf4aaa01c527271d71e6ce00f3607839777", - "sha256": "168z5i0y7rldbqpmxyvi5z19i57l14yhqzzyhl0sv7zdcqa66s21" + "commit": "17ec6fc0f43f7c0bcb970e2b71b8674891a464c7", + "sha256": "1w6y3j5r1ngjx08ymqkfp7xjlycrij9bmcnn6pw2jpih3zgzsyny" }, "stable": { "version": [ 0, - 1, + 2, 0 ], - "commit": "0d918da74a7a225fe5a586e26f5d834e579c5323", - "sha256": "0hqsq7y89crcmqcfbgn885dlvj7f7b0zd9q6adbhyscphk7kasjw" + "commit": "17ec6fc0f43f7c0bcb970e2b71b8674891a464c7", + "sha256": "1w6y3j5r1ngjx08ymqkfp7xjlycrij9bmcnn6pw2jpih3zgzsyny" } }, { @@ -4043,15 +4067,15 @@ "repo": "slotThe/arxiv-citation", "unstable": { "version": [ - 20220601, - 652 + 20220706, + 706 ], "deps": [ "dash", "s" ], - "commit": "ce4bf6958109b3b15bfc3f808ba4882b41fcb3ff", - "sha256": "0q74qgsdy2dahzvxlv9mayd6f6fgyf1q4lf6gvwc0xm9ms5qwf4c" + "commit": "a10af07419b66559569362ea57d897d988c17760", + "sha256": "05109ci3nccisjrn1ycx642zdas126g4vfvszbafb758777x9a02" } }, { @@ -4250,11 +4274,11 @@ "repo": "jwiegley/emacs-async", "unstable": { "version": [ - 20220318, - 1342 + 20220630, + 57 ], - "commit": "c78bab7506a70a735d2c3deab13fa87bf44a83d3", - "sha256": "1pa0cmphja9flib8m86rlsns7q53g06pn0m4ksdj0ig1xmzj4108" + "commit": "7f4ed1e8b44e0b88eadb2efeeaf97f32c38f14c4", + "sha256": "08d1sv97xhk20r7xgb9mxlvdzlj5x7pi542fdm5nrz2s47y4w0xg" }, "stable": { "version": [ @@ -4352,11 +4376,11 @@ "repo": "jcs-elpa/atl-long-lines", "unstable": { "version": [ - 20201026, - 339 + 20220704, + 644 ], - "commit": "d407daa17e0557f366d485c7c39880d2cd19938a", - "sha256": "1hmf0n6gm95ajr15s3vmd1ybk28zklna2n5xp0hrn9q5vj6wv7a5" + "commit": "074183f5d4fe77c9b5f1d0c90287a41aaa3e5eff", + "sha256": "08dc48b4phwgll55qmc8ha8wakckpv7nraacnzlx589hbjd2dsvx" }, "stable": { "version": [ @@ -4376,11 +4400,11 @@ "repo": "jcs-elpa/atl-markup", "unstable": { "version": [ - 20210731, - 609 + 20220704, + 644 ], - "commit": "bac60d0c76f0fe48b5f634502c79e87d7ab057b6", - "sha256": "1yldbkxywmybzv80ynisklzl8qyb7xb5wxlb4q7i355v6654ciap" + "commit": "14639839f5e206b315c800ab4dc09d2d1693fa0b", + "sha256": "0iry5q6vh0528npf50nxxvdv7hzfsb8sni83mnhk1nckldsbwv05" }, "stable": { "version": [ @@ -4673,15 +4697,15 @@ "repo": "emacs-grammarly/auth-source-keytar", "unstable": { "version": [ - 20220222, - 640 + 20220704, + 626 ], "deps": [ "keytar", "s" ], - "commit": "66ee3b73b7739fd35d848fabbeec0b2c44b0b532", - "sha256": "16gkm4ysh0pgg9ag0b6q4xpx8mr1gk6sghr236hjkvjvca5b85sj" + "commit": "c69176b476c9424a42d19ef8c200fcf2dc850749", + "sha256": "10wv8g2m4kvr3yj04v3rs6c65wcqy2n83ql362sn32kh4lp01g4l" }, "stable": { "version": [ @@ -4729,11 +4753,11 @@ "repo": "ccrusius/auth-source-xoauth2", "unstable": { "version": [ - 20200911, - 1554 + 20220628, + 2232 ], - "commit": "d3890eaa3a46dc89758ec6b789949e70ae782896", - "sha256": "1diflmg6sswz0xc1s9cygyg7y1ims8nqcyhs9yx5vn687gf82zlx" + "commit": "8bbfd9395a2dc397639ec265299ccaadb71aeebc", + "sha256": "1csqsp960w1i0pw5z3hagb7kv0hx9nf8h1b5ifljwjgnbpirhs46" }, "stable": { "version": [ @@ -4824,8 +4848,8 @@ "cl-lib", "popup" ], - "commit": "72c44902f893bfffe4ff0075e992541d79cfbb5d", - "sha256": "0rbawimh6540mj0m0xapj7swhz119921vdwgvxrvpyd8n3alww4g" + "commit": "8f33bc4fecb653d48d70a4902078f9d493eb882f", + "sha256": "03vsf4n150bgvqsrk07pjzfh6g5hlzgn842mqa4nxlzy70xqqdzx" }, "stable": { "version": [ @@ -5167,8 +5191,8 @@ "deps": [ "ht" ], - "commit": "26ad2261866d19994f8927002dcc53a80540ffd3", - "sha256": "0zakrvsnbliv0rsm6pm0d98bpf1llbl97cw8r55g7g8r79mjjxrp" + "commit": "616c1391646da49aa3b5a6034d0f8d6a987d5e8c", + "sha256": "1nw96894f4aylh4rljk15s0wfq0skmcj76b8hpmf3kf51jwq09bq" }, "stable": { "version": [ @@ -5314,11 +5338,11 @@ "repo": "jcs-elpa/auto-rename-tag", "unstable": { "version": [ - 20210805, - 1344 + 20220704, + 639 ], - "commit": "ba5e28cd4ca7515f7d7a8c243f913d571ca976d6", - "sha256": "00cv35q52nprj12396c1447bpbi710sapqw3s9v5jm5m3x7w4z9m" + "commit": "955a25bf371fe7edc7c1c5fdda0578731273c108", + "sha256": "00rz98vm2hr7vhqsfyz0fdp82vnq34cpnw8hgp02dv232amldlra" }, "stable": { "version": [ @@ -5391,8 +5415,8 @@ "deps": [ "f" ], - "commit": "39cb574a4b5ec74ad62857320bf5fec58abe876f", - "sha256": "1h9wh1gd7i0j3lg08l25p1n9pr24x9cyc3j1all4j77phl38sxhh" + "commit": "1d9dd74cb1adaf615500208dbc0158630dd92933", + "sha256": "08vgpcqrb1wfs2dl3sxr7v8syfdgnqxxi7awsakyvipyyypgbs5c" }, "stable": { "version": [ @@ -5415,16 +5439,16 @@ "repo": "marcwebbie/auto-virtualenv", "unstable": { "version": [ - 20211215, - 907 + 20220712, + 1612 ], "deps": [ "cl-lib", "pyvenv", "s" ], - "commit": "07064e05feb62277991b8a7c04f7cdad50acaddf", - "sha256": "1f1fi57dc19mp1cbkg7xh62g4xpqc3i0pzqpjkg8m5361gb67qz4" + "commit": "1e1542f5eb34ec5f415553bc8ddbb7f3c3ee6943", + "sha256": "1zh0n5yfjpr1xdrz4w9nhgl73gw8k5xnnv4wmccakn9x4wh76rvi" } }, { @@ -5730,8 +5754,8 @@ "avy", "embark" ], - "commit": "63f0d4dc09afb058450dc10dd3916027a93ee487", - "sha256": "0q8l4ckdmcagiiccvb0s94gc1lywgqh02d8p16ygpcfxz8967w4a" + "commit": "5d0459d27aa7cf738b5af36cf862723a62bef955", + "sha256": "15zk4y43yf58hsh24slszajx40ab0qhha4pwm8fya0wl34cphkzd" }, "stable": { "version": [ @@ -5935,17 +5959,17 @@ }, { "ename": "axiom-environment", - "commit": "8b4c6b03c5ff78ce327dcf66b175e266bbc53dbf", - "sha256": "1hzfxdwhgv0z9136k7bdjhqjrkawsjmvqch6za6p7nkpd9ikr2zb", + "commit": "570bde6b4b89eb74eaf47dda64004cd575f9d953", + "sha256": "11ldwj88hi7chbbxfkhdfx58w1xybk4ch6xmh99fa2vl8ybk16p1", "fetcher": "git", "url": "https://bitbucket.org/pdo/axiom-environment", "unstable": { "version": [ - 20220512, - 1931 + 20220612, + 1535 ], - "commit": "847cc6e728b692ad3fdaec28d0c8c49ec0378a56", - "sha256": "02nf2vn6s6pc63yw2rggdx9capn9432w6j56m9v0c5ygarpxb53p" + "commit": "01d88daa0c864af9918db5a147fbb5e435dec199", + "sha256": "03cxb6zdqmzgjp8r6hcirf8xl772j7xqk2nw17gjkn4xqbwfyn62" } }, { @@ -6296,11 +6320,11 @@ "repo": "base16-project/base16-emacs", "unstable": { "version": [ - 20220526, - 1015 + 20220713, + 402 ], - "commit": "26b84fc93505219517a512eb01e6370365174989", - "sha256": "0qp71j77zg8gippcn277s0j5a9n6dbwv3kdp2nya6li4b412vgba" + "commit": "6f37e4a849a84a41c4404a15d1bac57cbf912324", + "sha256": "0y0yw6wnsfkmv8nrl2a0v6l0aiqc9bjhiwxjz4l8ncbp0gkvad1y" }, "stable": { "version": [ @@ -6460,14 +6484,14 @@ "repo": "jasonmj/battery-notifier", "unstable": { "version": [ - 20210521, - 1238 + 20220705, + 2030 ], "deps": [ "alert" ], - "commit": "ae2043db954e131d9de7347ab1a6107fd07e8893", - "sha256": "1w2cymf9yd3siijplb6vrcxwqhqsqii8bnxki7vqb1s16v7ciczz" + "commit": "b7301d3633afff78609afd45dcf78268f98d52d3", + "sha256": "1mvf2sxrsrv4q0gmalwjw7zgahswwlg3gdpfg7chyklp1v89lnhf" }, "stable": { "version": [ @@ -6514,11 +6538,11 @@ "repo": "bazelbuild/emacs-bazel-mode", "unstable": { "version": [ - 20220222, - 1616 + 20220707, + 1549 ], - "commit": "e07a16666154c8ddc65ddaae599d58b25727350d", - "sha256": "0kdlhp3h2kkijxsmd7jhrbb1dgs6x5q3gpw4qv5ij89xrlxanz7d" + "commit": "8f7875998f233d248097006df224a33873bbc4f2", + "sha256": "0nirvfq49s629163p2k2g8ir8di78p0zp0qriyyycg4v4ir4q63m" } }, { @@ -6559,14 +6583,14 @@ "url": "https://git.savannah.nongnu.org/git/bbdb.git", "unstable": { "version": [ - 20220416, - 405 + 20220706, + 433 ], "deps": [ "cl-lib" ], - "commit": "ed7648f723d3fd03476b8a007a76e9058f7f7f47", - "sha256": "05a6rh2chyafsw9n3aar4dscvq8wdb9bbl3b12vawilj3b5bv9jy" + "commit": "1b121e94871f5d931c75793257db732ba82fdddb", + "sha256": "1mak78xg46hz5l00xqy5g8d6mrfs5z36nb0arjmpam2gvi6mzcz2" }, "stable": { "version": [ @@ -6743,8 +6767,8 @@ "deps": [ "seq" ], - "commit": "bde78180c678b233c94321394f46a81dc6dce1da", - "sha256": "19m90jjbsjzhzf7phlg79l8d2kxgrqnrrg1ipa3sf7vzxxkmsdld" + "commit": "370c21c76be9d7600d98e9666cda56f47610cbb0", + "sha256": "057xjfqcxm3m6fdgv238lxqg33rn4f34lisw0dl04k4vwq9g091r" }, "stable": { "version": [ @@ -6759,6 +6783,24 @@ "sha256": "0mypzfasclq7bmw0i8hfyp8c1ycd3kdgd5h1faygzh9r0phh7ciy" } }, + { + "ename": "bech32", + "commit": "b66ddcba09e89d770ea5a828979474be76e7d1d5", + "sha256": "0c453zjmpyv6rvhis6bnkhmykpvxqf56arqqiwczv0xphpkckx8k", + "fetcher": "github", + "repo": "Titan-C/cardano.el", + "unstable": { + "version": [ + 20220711, + 911 + ], + "deps": [ + "dash" + ], + "commit": "a3ebdcdd91d32f044b68541a00e162396e4acb38", + "sha256": "1jmlg5rbgam3s9n7blmk2b9r9ggzdvsbry1fdsx5gipymbldx1gg" + } + }, { "ename": "beeminder", "commit": "b46e83f2ea2c4df1ef343c79c7e249605c9639b3", @@ -6960,11 +7002,11 @@ "repo": "jcs-elpa/better-scroll", "unstable": { "version": [ - 20210715, - 1004 + 20220704, + 645 ], - "commit": "72dae979d4cf33ac1b63c73df337fcc2c2aafd72", - "sha256": "08cn2pvg8gxb6a88z8fiklcyyf3sagl9h5x7k7f44jfyqwqzpky7" + "commit": "9ec8cb24751784cc114263728d7565fd473facd7", + "sha256": "1dvl99px3y1wv275ygrm224kpnwaalfdxqwwkx4qbgb8lgmbmha7" }, "stable": { "version": [ @@ -7348,8 +7390,8 @@ "bind-key", "key-chord" ], - "commit": "a7422fb8ab1baee19adb2717b5b47b9c3812a84c", - "sha256": "1zz2gg475254hbbxw4y82b2m2iy8cvx0phh030daax315hdbsaqb" + "commit": "0ad5d9d5d8a61517a207ab04bf69e71c081149eb", + "sha256": "112g1944iirjlvfw8fxwd1iy6z8yfawf4qz5jv3aj087cxli55ww" }, "stable": { "version": [ @@ -7376,8 +7418,8 @@ 20210210, 1609 ], - "commit": "a7422fb8ab1baee19adb2717b5b47b9c3812a84c", - "sha256": "1zz2gg475254hbbxw4y82b2m2iy8cvx0phh030daax315hdbsaqb" + "commit": "0ad5d9d5d8a61517a207ab04bf69e71c081149eb", + "sha256": "112g1944iirjlvfw8fxwd1iy6z8yfawf4qz5jv3aj087cxli55ww" }, "stable": { "version": [ @@ -8067,8 +8109,8 @@ "repo": "boogie-org/boogie-friends", "unstable": { "version": [ - 20220419, - 2240 + 20220704, + 1741 ], "deps": [ "cl-lib", @@ -8077,8 +8119,8 @@ "flycheck", "yasnippet" ], - "commit": "d685a52259f50c2db51205ef9cc93f713ae8d8fa", - "sha256": "1879vjan19kdvfkck1xk30jllwbiqpyc4m3v1v6kmac7gxm10min" + "commit": "e162f0d89fbc9d55da7d4a6059449449afc29f3b", + "sha256": "1glcszq0mf63z45dhny02vyxx1shlan0cxg22r2hrm2p36lm8nkm" } }, { @@ -8089,11 +8131,11 @@ "url": "https://codeberg.org/ideasman42/emacs-bookmark-in-project.git", "unstable": { "version": [ - 20220507, - 1118 + 20220708, + 211 ], - "commit": "0e08e4bd4fedc87b2371313d55691356bee0ad7d", - "sha256": "1a0wx4hrs954ff7chpadn95dajcmpgrk5j7yv6ppfh1ml4kx11mn" + "commit": "ccffde03b57d9b16fff59188d8e4090bf64d46d6", + "sha256": "1d4kbzgjdfkpjadbg070slir2v6sqlfw4jqlmpdg7pwc1c4j32rj" } }, { @@ -8184,15 +8226,15 @@ "repo": "emacscollective/borg", "unstable": { "version": [ - 20220527, - 2237 + 20220611, + 1724 ], "deps": [ "epkg", "magit" ], - "commit": "1f87dfcca69decc9db651af6b9f38034ab9fbd51", - "sha256": "1k2lp2g6nsm843gf3a5ddck75pg62dpvnnpjpwbxzjhraswr9z5c" + "commit": "c8b5ee24a289848a8c100bf04e29ae56130d0cf4", + "sha256": "1n766s994kymppgn2gmv2qx7gm5wka5wcwhby1kpv7b2zq3xx9hr" }, "stable": { "version": [ @@ -8377,25 +8419,25 @@ "url": "https://bitbucket.org/MikeWoolley/brf-mode", "unstable": { "version": [ - 20220104, - 2222 + 20220710, + 2116 ], "deps": [ "fringe-helper" ], - "commit": "59ec15094917666f253eaf61d17664525a7971f4", - "sha256": "0cxcjjslh9n678abs289d32880z97xb8cxmglhrhnfly2zx7h8p7" + "commit": "1aaf5b237a2bd550dceff6d76c56e4bf3365ca25", + "sha256": "0pkxp9c9jqrh91jmscsl3b7r892mbb9aid9iqk78cr29zn6q44g5" }, "stable": { "version": [ 1, - 22 + 23 ], "deps": [ "fringe-helper" ], - "commit": "59ec15094917666f253eaf61d17664525a7971f4", - "sha256": "0cxcjjslh9n678abs289d32880z97xb8cxmglhrhnfly2zx7h8p7" + "commit": "1aaf5b237a2bd550dceff6d76c56e4bf3365ca25", + "sha256": "0pkxp9c9jqrh91jmscsl3b7r892mbb9aid9iqk78cr29zn6q44g5" } }, { @@ -8536,8 +8578,8 @@ 20220507, 909 ], - "commit": "c58131f3a8cb71cc0f8efa47766f29578c45bc59", - "sha256": "09kak8szdfbscd0byj1mdgb94ajrrr4kcqf5x3c2bwlgdazr15gx" + "commit": "f7611ba27ccf1f48f9547d23a20a260ee8886677", + "sha256": "0a96fgpqb6ka16s12b67r0i3shqwfdkjy929ygkvkpczmi8088qm" } }, { @@ -8698,19 +8740,19 @@ "repo": "killdash9/buffer-flip.el", "unstable": { "version": [ - 20180307, - 2251 + 20220708, + 1751 ], - "commit": "b8ecbf0251a59c351a3e44607ee502af343da64b", - "sha256": "1zb4k5v4n6j42z7kzlw2y1jp4xbkp6w9zxls3ja36g326mz5mdjz" + "commit": "5b85c1cfd37b60c7419e1d4bf8931ea04c0db743", + "sha256": "02qxwhrcfmrsbrh90fjxf97rpqqj92p32hjhpyi17y9ky1g5x68x" }, "stable": { "version": [ - 2, - 1 + 3, + 0 ], - "commit": "e093360e05164c78255866c1ac8f966aa38ba514", - "sha256": "1s35llycdhhclf9kl1q9l7zzzfqrnnvbiqv5csfw0mngfj0lz77f" + "commit": "5b85c1cfd37b60c7419e1d4bf8931ea04c0db743", + "sha256": "02qxwhrcfmrsbrh90fjxf97rpqqj92p32hjhpyi17y9ky1g5x68x" } }, { @@ -8882,11 +8924,11 @@ "repo": "jcs-elpa/buffer-wrap", "unstable": { "version": [ - 20200924, - 345 + 20220704, + 646 ], - "commit": "124529e089c7ea70877cfa881e55b3a21f28ffd1", - "sha256": "1g7nizs3iy4avaifnw91fps72i2iifkbrlh8fkdymcynnmhkqdvf" + "commit": "8be8508ad5570b1487d9d2fc1b5aa71558f2d0f5", + "sha256": "19k4xxalcirxis6s8gci9hyp8l6vw1dx9z31nnvihb3yd932816i" }, "stable": { "version": [ @@ -8906,8 +8948,8 @@ "repo": "alphapapa/bufler.el", "unstable": { "version": [ - 20210907, - 1145 + 20220711, + 1909 ], "deps": [ "dash", @@ -8916,8 +8958,8 @@ "map", "pretty-hydra" ], - "commit": "a68e0eb2719c67ab8a3ad56c4036364061d06004", - "sha256": "155g4p2yw88cpc8ydfzybc4r6ab2qwcmzdwkrrhnra4psimahjq6" + "commit": "23132ffed65d78c0bf5ab2c4c6385d009db496ec", + "sha256": "15zam24zz4pb4zq20wzp3j31cg87fdwxn4bzn9mrm4q466rbldl7" }, "stable": { "version": [ @@ -9132,25 +9174,25 @@ "repo": "alphapapa/burly.el", "unstable": { "version": [ - 20220413, - 1529 + 20220714, + 2053 ], "deps": [ "map" ], - "commit": "96f59fe24fdce14d14f204372f99bf522ab192bf", - "sha256": "0mzv82qd2w3nsfjj08kmsb8sjg0fmmhjldbymqd60ybx3gq9h9ba" + "commit": "d95cf80cb4e06ef08c2589afb8ab72e369c0b97a", + "sha256": "1v8a94hfnpv772y4k3j65spxsgs94w7g8fgy4yf19alz3n8q8665" }, "stable": { "version": [ 0, - 1 + 2 ], "deps": [ "map" ], - "commit": "2fd586d8f53944ecf0c3673b425706bfe973bd0d", - "sha256": "1vaikknjzmhpszyi4yxjjkp1ihgmhpbnbx1s5pjy4mnhl1ibi33b" + "commit": "aade1b4f12f73a5bf821ae2490a5927443ada12a", + "sha256": "0zaknazhi8if38rmy9irnqwagsl76pqlxnzawzgn1vlv3aawivdk" } }, { @@ -9284,11 +9326,11 @@ "repo": "jorgenschaefer/emacs-buttercup", "unstable": { "version": [ - 20220410, - 1557 + 20220619, + 2214 ], - "commit": "ceedad5efa797e860dbb356bc2c3028a4e0321ec", - "sha256": "1fp9f0lprmzdacjsd78yrbbrzksk2kz0bvals1cbnrqr4dhknxhi" + "commit": "42df1faa653f2765941f478167dafac059dc3a57", + "sha256": "1s9ps7a4459hgvpdslzvkhq3gsdj600l2h9jsxrfbam7lxkp7v35" }, "stable": { "version": [ @@ -9526,14 +9568,14 @@ "repo": "Schnouki/caddyfile-mode", "unstable": { "version": [ - 20181204, - 858 + 20220626, + 945 ], "deps": [ "loop" ], - "commit": "976ad0664c3f44bfa11cb9b8787ddfb094d0a666", - "sha256": "1k9nkqgnighwj0jj4yl8v2vncy5cnlayx3vw4884hf9amkbv6bg1" + "commit": "fc41148f5a7eb320f070666f046fb9d88cf17680", + "sha256": "1s9kbav5wbyividn9zncd153h89nil0i9aj9hgxa95q9fy84r23w" }, "stable": { "version": [ @@ -9787,8 +9829,8 @@ "repo": "chenyanming/calibredb.el", "unstable": { "version": [ - 20220604, - 1655 + 20220612, + 1131 ], "deps": [ "dash", @@ -9798,8 +9840,8 @@ "s", "transient" ], - "commit": "e4ce01a08f0e9cbbaea03ab5259d0cc029e9f2ad", - "sha256": "0jd5d9inxhiymzphf4gw11wwg5lv4jp3hflj9w24grcd77i6wkdg" + "commit": "2f2cfc38f2d1c705134b692127c3008ac1382482", + "sha256": "11y8hiihs1jdf44pdxmylriqngwsxwsny29l6y3jp4mmhrrgz1m7" }, "stable": { "version": [ @@ -9965,19 +10007,19 @@ "repo": "minad/cape", "unstable": { "version": [ - 20220607, - 1615 + 20220714, + 1350 ], - "commit": "67c48f1c3609f1426f02c5d8b81e23b1e8b89659", - "sha256": "15cq18pc97lhibz4nyyjavhgyalyg8wrc6wc9pzg2iq1gp0yrq2x" + "commit": "c36d7405db24e15d1ad019b549b0fc5a2944f66c", + "sha256": "08bai91v6nr8h7kixxsji6wdf06bk20im51s85r2h076ps25y4wp" }, "stable": { "version": [ 0, - 7 + 8 ], - "commit": "51b9bf1276445faebfbad636d9b6a39dc57b22bc", - "sha256": "0731c55bb1vxdh8k7312z1bvf7g8jwr2n04q3ffpqp0fan6ra025" + "commit": "7042b048c8820223551d75c643b958befe7411d2", + "sha256": "0zv3hcnarwyhj4hhfk9kz4gzshks10vd5zfsmpv5nlbhvwp69j3p" } }, { @@ -9991,17 +10033,17 @@ 20210707, 2310 ], - "commit": "81b25899ca8321f507f204b4777f223c26e4d6ab", - "sha256": "1a2fx5zf36770bim9spnhlvdv8mjbhpyg3mvwni5mgjdn4zidb2g" + "commit": "5e029f5af4c2dc912f6add122c29cae8992c4fb5", + "sha256": "03z4img3gafx8az5z3jlj9khb617y206ly8z9d1299zgywk2bryf" }, "stable": { "version": [ 0, 10, - 1 + 2 ], - "commit": "5cff5efc2bbb19b2512b940f79c8c696e0737424", - "sha256": "1cf76mllnm43wndzl26rrlfg2bc7r2a0ig6v9lm41nil9x6simsm" + "commit": "2e88221d3dde22266bfccf40eaee6ff9b40d113d", + "sha256": "0dq23gghvsp71j75xiypbcafsf1if68fr96ihpzxx9fg0w47h6mw" } }, { @@ -10027,11 +10069,11 @@ "repo": "veelenga/carbon-now-sh.el", "unstable": { "version": [ - 20201028, - 950 + 20220701, + 332 ], - "commit": "6444a77a6065803cf97c3321f811bd34a8063d76", - "sha256": "039zsvhicqj4qg5dzvchj8myqfbsib1ia4v668mmalhksijldyma" + "commit": "e66f2e43e288f35ad9075f5fc84d59ad348efc88", + "sha256": "04pld093g14dq139ghbvk67xs1fam729m8az4mkyp3f369gwz3y0" } }, { @@ -10042,14 +10084,14 @@ "repo": "kwrooijen/cargo.el", "unstable": { "version": [ - 20220311, - 827 + 20220707, + 1403 ], "deps": [ "markdown-mode" ], - "commit": "8335b5577dfa526c645f7c1839c473f99b9ad1a8", - "sha256": "0dw46rd1naz9z383bn3zzywz2955r4fw6a1v87m1scr3j42i6q4p" + "commit": "0b9821b029f49654565edffdbfd68ca0f6ca9434", + "sha256": "1gq0g75cj92aabh6pviixwka5biz88cwajdgab94bphmpk7zags7" }, "stable": { "version": [ @@ -10079,6 +10121,21 @@ "sha256": "03vdinqm1hlbcflvks54ff9hqnjdzxih5bxnkm363s7mpr070d0d" } }, + { + "ename": "cargo-transient", + "commit": "a119267f3672641280629dd6637e310f0129ba67", + "sha256": "126vpybxpvkj5vdxzqd78c37paa9mm7qz7i4kacg7z8dra7f9sw9", + "fetcher": "github", + "repo": "peterstuart/cargo-transient", + "unstable": { + "version": [ + 20220714, + 128 + ], + "commit": "69b56ef92cac91384b21dbeed370646285288517", + "sha256": "0l7hi0cmnd2pf7bz36rwjjzhlbx37lyii7bps5mw90zdcwm55azq" + } + }, { "ename": "caroline-theme", "commit": "855ea20024b606314f8590129259747cac0bcc97", @@ -10151,8 +10208,8 @@ "repo": "cask/cask", "unstable": { "version": [ - 20220605, - 2031 + 20220715, + 1113 ], "deps": [ "ansi", @@ -10163,8 +10220,8 @@ "s", "shut-up" ], - "commit": "f2c6609590380bf4791fa18b7581ed6a8db2cbbb", - "sha256": "1zvibg876q5zi7fh72wfl6avskgvvn4az75gjc3bkdckv9rpy43a" + "commit": "10a3b656a6b361589c2e7be70766f6ca3589fc25", + "sha256": "0xpp15yj810nww0932ic7ni3z18hkby3wh8sqrsix58hnpic6blk" }, "stable": { "version": [ @@ -10317,8 +10374,8 @@ 20220515, 435 ], - "commit": "784684c54a0d94c4a1cff8a69fcbdcd5d916e0a5", - "sha256": "0f7nm16fmb9chpc1cii4y035ykhq5mhbzq0m9xp0hdi7pjmarf3l" + "commit": "715935a78d3acef9da52b3a178d5703c162829c3", + "sha256": "1xn2d9rk30cs3wsdkdm9wjqcsapyj1q5qv9cynasazi4y28ws0ky" } }, { @@ -10350,6 +10407,24 @@ "sha256": "091ln3d0jhdgahbwfdm1042b19886n3kwipw5gk8d0jnq5vwrkws" } }, + { + "ename": "cbor", + "commit": "9a6f4ba508da7274466e10fde7e5fb49d3bbb5ea", + "sha256": "08f69nqgj8c0vmyhyapxh27k1yrxzgggk7447wiz8d08fm75ahwb", + "fetcher": "github", + "repo": "Titan-C/cardano.el", + "unstable": { + "version": [ + 20220623, + 22 + ], + "deps": [ + "dash" + ], + "commit": "a3ebdcdd91d32f044b68541a00e162396e4acb38", + "sha256": "1jmlg5rbgam3s9n7blmk2b9r9ggzdvsbry1fdsx5gipymbldx1gg" + } + }, { "ename": "cc-cedict", "commit": "368aaef30c5c4f38d9d2dd09f966e3dcc2463e11", @@ -10437,11 +10512,14 @@ "repo": "cdominik/cdlatex", "unstable": { "version": [ - 20210804, - 452 + 20220701, + 1236 ], - "commit": "8e963c68531f75e459e8ebe7a34fd3ba9d3729a0", - "sha256": "1x5zg7qj4npi1y4030iakwy1mvfa04r79ijc3bwlsc74351wf27z" + "deps": [ + "auctex" + ], + "commit": "4c392765e123f9c5481e7d113486a6acf720ab13", + "sha256": "0dg69rj9zbjvw9qm3lpx46vhp3zgcc3njbvp2dhpqkvya6jnzrnk" }, "stable": { "version": [ @@ -10719,17 +10797,17 @@ 20171115, 2108 ], - "commit": "798512dd6a94abd432e9f1712147a39f623ea718", - "sha256": "1bg2dzr8bqwg3y78r9smllx6bji4gyl3hbbp08ff7q0va0b9zmnd" + "commit": "7c4d31c94a982852f61043ce00c61b0f4be0e689", + "sha256": "1afc53bgm7b4i5bwz9w17nl804q34qy5sh53in1f2402042y2qd0" }, "stable": { "version": [ 3, - 19, + 20, 0 ], - "commit": "945aee7d4538e71a990dbb42ce99bf3f74e17b40", - "sha256": "0g1ak590qjfqd0nyj9spf10jbyb9f8mxrhjm6cq9p3hlzcbjl11c" + "commit": "502608a7b9feb9102878734d048db95118891a55", + "sha256": "0b8isy1p8c5m0j4km18jh3xijcxm4jnm2vwx9mp75mky95742w8h" } }, { @@ -11384,8 +11462,8 @@ }, { "ename": "chronometrist", - "commit": "4f3fa2076ce777618f2982a7ba69b497d68aebc3", - "sha256": "10hab6h4pjgkldq0qlsyr69hq40g9hfsmhaxngfjl4yra355zr6b", + "commit": "570bde6b4b89eb74eaf47dda64004cd575f9d953", + "sha256": "1l46xvxgw1cip9ggm9nf0a25hzc28kyyk18rjbcn8jzfb9qg7l14", "fetcher": "git", "url": "https://codeberg.org/contrapunctus/chronometrist.git", "unstable": { @@ -11398,8 +11476,8 @@ "seq", "ts" ], - "commit": "b80d6ac5b661a90e84ab84bad9badb596c1d1965", - "sha256": "01sdf2w73zapjv1x1dcasy16qs2nsnya3xz5q5avpi5gvmrarb36" + "commit": "85f1642d27e92cc393806a2b9a42044151b563ac", + "sha256": "022l6p2sxivrsk38ri4ay3492qjmiksfkl6wqqaal96nq3amz8qp" }, "stable": { "version": [ @@ -11437,8 +11515,8 @@ }, { "ename": "chronometrist-key-values", - "commit": "4f3fa2076ce777618f2982a7ba69b497d68aebc3", - "sha256": "17fjmdgm8n9za3mwkahqhvz1d69lwhc7yqqryx16myn4kyg0i835", + "commit": "570bde6b4b89eb74eaf47dda64004cd575f9d953", + "sha256": "0b9g2gq1ps1waaflals3xbq5brwhvwmfgm9zwd33rjlmsasb8wf3", "fetcher": "git", "url": "https://codeberg.org/contrapunctus/chronometrist.git", "unstable": { @@ -11449,8 +11527,8 @@ "deps": [ "chronometrist" ], - "commit": "b80d6ac5b661a90e84ab84bad9badb596c1d1965", - "sha256": "01sdf2w73zapjv1x1dcasy16qs2nsnya3xz5q5avpi5gvmrarb36" + "commit": "85f1642d27e92cc393806a2b9a42044151b563ac", + "sha256": "022l6p2sxivrsk38ri4ay3492qjmiksfkl6wqqaal96nq3amz8qp" }, "stable": { "version": [ @@ -11480,8 +11558,8 @@ "chronometrist", "spark" ], - "commit": "b80d6ac5b661a90e84ab84bad9badb596c1d1965", - "sha256": "01sdf2w73zapjv1x1dcasy16qs2nsnya3xz5q5avpi5gvmrarb36" + "commit": "85f1642d27e92cc393806a2b9a42044151b563ac", + "sha256": "022l6p2sxivrsk38ri4ay3492qjmiksfkl6wqqaal96nq3amz8qp" }, "stable": { "version": [ @@ -11553,8 +11631,8 @@ "repo": "clojure-emacs/cider", "unstable": { "version": [ - 20220531, - 616 + 20220628, + 551 ], "deps": [ "clojure-mode", @@ -11564,8 +11642,8 @@ "sesman", "spinner" ], - "commit": "b9e1cc26e2afda003a4b6c1f2a26e04f1c45f3d0", - "sha256": "15a9khkd21dfrw9r435x46533cs3246l1dgjg86cvkgjjhl21f9z" + "commit": "186b4976565a18fcb00e1685a44a87a8559eadcc", + "sha256": "0r0fgmk36hkbwm30ck2gywc9nzgxzil4riwmpc18wxp6alqf3mwi" }, "stable": { "version": [ @@ -11857,36 +11935,68 @@ }, { "ename": "citar", - "commit": "d96246c6f08d0ab2ccd2b04222e304c7ab8914ca", - "sha256": "1arf0fki9by8zx12vgdj1jvvaz9sq32jn9yv6xb2qkx5pzg4sw6j", + "commit": "4e6d67c0f8cfd5c1639a441105d0c7b735371fb7", + "sha256": "0vn0gwi32dd65gmsj4dgi8y1gx1cx7xl216a7crjf48w5gx3yy34", "fetcher": "github", "repo": "emacs-citar/citar", "unstable": { "version": [ - 20220602, - 2157 + 20220715, + 1909 ], "deps": [ "citeproc", "org", "parsebib" ], - "commit": "1976f2938b3fc2ebb963429dce78f2372edb483c", - "sha256": "0fdasl6nzrp8q29njda5z4x79fjlfigjyx4xxgpq0wkq41kw3zy0" + "commit": "c05dce095f340b1ab91434e17eac06b40911fd2a", + "sha256": "010a5azp8ycwar643b5n6d57y7yrhl80scrkml6mjinm95s6snz7" }, "stable": { "version": [ 0, 9, - 5 + 7 ], "deps": [ "citeproc", "org", "parsebib" ], - "commit": "d55cac7a2b8b848990ebd713de8667bf3fe93c6b", - "sha256": "04asi5gr4p1d8llra3qwly2jp1ll3zs0hjcysrrvdcax0jcr473b" + "commit": "1bc880cafdb20f3c258ffcfd47da899c3c242c95", + "sha256": "1f49l1zmy4fnz75b0m2rav5jm8yp6hry44bv9xasiszyy3bn0hv8" + } + }, + { + "ename": "citar-embark", + "commit": "4e6d67c0f8cfd5c1639a441105d0c7b735371fb7", + "sha256": "0rp3958c3r2hk5bfl56vz9gb2fp4lwa6rb1al9bjq3xhn4p0yzwf", + "fetcher": "github", + "repo": "emacs-citar/citar", + "unstable": { + "version": [ + 20220710, + 1109 + ], + "deps": [ + "citar", + "embark" + ], + "commit": "c05dce095f340b1ab91434e17eac06b40911fd2a", + "sha256": "010a5azp8ycwar643b5n6d57y7yrhl80scrkml6mjinm95s6snz7" + }, + "stable": { + "version": [ + 0, + 9, + 7 + ], + "deps": [ + "citar", + "embark" + ], + "commit": "1bc880cafdb20f3c258ffcfd47da899c3c242c95", + "sha256": "1f49l1zmy4fnz75b0m2rav5jm8yp6hry44bv9xasiszyy3bn0hv8" } }, { @@ -11897,8 +12007,8 @@ "repo": "andras-simonyi/citeproc-el", "unstable": { "version": [ - 20220124, - 721 + 20220710, + 2043 ], "deps": [ "dash", @@ -11909,8 +12019,8 @@ "s", "string-inflection" ], - "commit": "ba49516265fa24b138346c4918d39d19b4de8a62", - "sha256": "1zxrzx537ar35i32g7y76k8w5z4x2nip2vw6lr4xwvzl6bwxnfqv" + "commit": "7cc0152706d59954124f8c1559198050783bbc59", + "sha256": "04v1r545304g00kbfzcfk8cr6ma9xqkglkns0f1828smlhknqbw2" }, "stable": { "version": [ @@ -12372,8 +12482,8 @@ "repo": "clojure-emacs/clj-refactor.el", "unstable": { "version": [ - 20220315, - 2251 + 20220711, + 1920 ], "deps": [ "cider", @@ -12386,14 +12496,14 @@ "seq", "yasnippet" ], - "commit": "f368c56c83843396b160440f472a661a3b639862", - "sha256": "0xp17gc5ipm7jzyx8smnq5z3hb7nb36c11f5c637chg3qdhw1r8m" + "commit": "5b289c47c8b008812419a2f9e1e2616c7ab0bb31", + "sha256": "0a7sz592lz6ji6wfnaadbi5acm5f7h45f4pnblqyx6dzw934r517" }, "stable": { "version": [ 3, 5, - 2 + 4 ], "deps": [ "cider", @@ -12406,8 +12516,8 @@ "seq", "yasnippet" ], - "commit": "f368c56c83843396b160440f472a661a3b639862", - "sha256": "0xp17gc5ipm7jzyx8smnq5z3hb7nb36c11f5c637chg3qdhw1r8m" + "commit": "7bf500ce67ceacf5e726f5adcf1b46a41be369ab", + "sha256": "1cl1fn3wvfw19mi0h62lhfd25pqknmszj54li3dnimia4nlgg4q3" } }, { @@ -12478,6 +12588,24 @@ "sha256": "0flnfivz6w3pkham3g08m3xzy3jg1rzvxfa00vkr7ll8iyv4ypqc" } }, + { + "ename": "cljstyle-format", + "commit": "dbc850fd5711658cd4f04a5c796ec5062fb71469", + "sha256": "145p63r2arn3cpn3i6d7d5mvsj4030fpqn6aj9dyqyx5minmd0zq", + "fetcher": "github", + "repo": "dpassen/cljstyle-format", + "unstable": { + "version": [ + 20220706, + 309 + ], + "deps": [ + "reformatter" + ], + "commit": "4ca28444856e0e1e6b24e5343bcd5c601c4aa86a", + "sha256": "088j7walsshafy4nrwqycq9h8yyn29rx8kxcgn2x58y5iz2hfx86" + } + }, { "ename": "clmemo", "commit": "e98b438990dc0dbda264fb4bf7a3237a2661baab", @@ -12560,8 +12688,8 @@ "request", "ts" ], - "commit": "6329aaebc4373edaa4cd1d046582a4cc36db4888", - "sha256": "03n11mr39wj3nyabs24l5caqbzc7lm0wp4wazcsrsxwm7pij9vrs" + "commit": "5f5c2bae76344f4d84f1659590c2eddad25b1139", + "sha256": "0485zn7is5ng2hcc04xz9qjjl93li800jh5vf6dglyzxdiq59gya" }, "stable": { "version": [ @@ -12598,8 +12726,8 @@ }, { "ename": "clojure-essential-ref", - "commit": "8ecff309816256bdc09163aee6ca06b4292d98b7", - "sha256": "0vl4lz9wmymkai7yhv0gqiky5czmzd7yz9g9czfp7lhfh1hpgbkg", + "commit": "570bde6b4b89eb74eaf47dda64004cd575f9d953", + "sha256": "0pv1w7ykniaxypzw8zwv7qpl2xaz7ksfm6vw71dl5v0ppak59awi", "fetcher": "github", "repo": "p3r7/clojure-essential-ref", "unstable": { @@ -12628,8 +12756,8 @@ }, { "ename": "clojure-essential-ref-nov", - "commit": "11341af9478acdaec9d5e0b5011269ac7c0ada86", - "sha256": "1740mmv8qh8gsnzvvvfdxsp676ss8b6filidbxq6b6qz2jyb7fzw", + "commit": "570bde6b4b89eb74eaf47dda64004cd575f9d953", + "sha256": "17awnj8pwjrssnz7ygf2xn30yz0yh5m9z7qz6hx25zrsy0g5bxjy", "fetcher": "github", "repo": "p3r7/clojure-essential-ref", "unstable": { @@ -12668,11 +12796,11 @@ "repo": "clojure-emacs/clojure-mode", "unstable": { "version": [ - 20220418, - 2015 + 20220715, + 1509 ], - "commit": "b6f41d74904daa9312648f3a7bea7a72fd8e140b", - "sha256": "0s9750x739biwbcc8m09spkvkwlf1nlrdz869imjpkagk0pci7xm" + "commit": "fee38d780f7d0b2a42a441e4d8bcfaa4fa672983", + "sha256": "1ck9d8jzs6m5qvg5bnx9i7d94icsfl4698p66vxsn3yqclhc8yzz" }, "stable": { "version": [ @@ -12692,14 +12820,14 @@ "repo": "clojure-emacs/clojure-mode", "unstable": { "version": [ - 20211230, - 817 + 20220715, + 1509 ], "deps": [ "clojure-mode" ], - "commit": "b6f41d74904daa9312648f3a7bea7a72fd8e140b", - "sha256": "0s9750x739biwbcc8m09spkvkwlf1nlrdz869imjpkagk0pci7xm" + "commit": "fee38d780f7d0b2a42a441e4d8bcfaa4fa672983", + "sha256": "1ck9d8jzs6m5qvg5bnx9i7d94icsfl4698p66vxsn3yqclhc8yzz" }, "stable": { "version": [ @@ -13000,20 +13128,22 @@ "url": "https://gitlab.kitware.com/cmake/cmake.git", "unstable": { "version": [ - 20220322, - 1258 + 20220617, + 1532 ], - "commit": "aaf5353c47965cae7e12aa03884be3ae67e9b09a", - "sha256": "00201mylx581g4q2j81v4x39x2axx5xq7himpk9ywxpvygh1r0dv" + "commit": "831757ead326d2133ef3c6b23d4be47495a5b119", + "sha256": "0c2cz5g8x0bpp8scr7bf0zgwj8xi9mkjiz244cvj0s6vhanyv3dl" }, "stable": { "version": [ 3, - 23, - 2 + 24, + 0, + -1, + 3 ], - "commit": "a8bd06dfd47a56e09e660de5e58f26579105d2d4", - "sha256": "09kk81nd4m6p07k7rwg2cfjv2rrwcmkmsz6xi58milq2byqw1n3j" + "commit": "95cce32470b9fbddf3b6f4bd0d186ec5efe50371", + "sha256": "0q2yg9k07c76mfx43cyclv8w5l2lprr5wvk302a3q7jvni248461" } }, { @@ -13081,11 +13211,11 @@ "repo": "tumashu/cnfonts", "unstable": { "version": [ - 20211227, - 248 + 20220715, + 409 ], - "commit": "7279d4178b4d52ae763d2224140488887ce57261", - "sha256": "0zfgpzjsl8nwpi1q40n6canm0bfi76x3cnxsss23iwsa1f6i1ipk" + "commit": "3732ada115cae269e0fa5e3434f92f3e6e6823d9", + "sha256": "1z510dn4ih5av59nridhr99jpd1bsnjwbh15kqnw0nd8zpawixkf" }, "stable": { "version": [ @@ -13198,8 +13328,8 @@ "repo": "wandersoncferreira/code-review", "unstable": { "version": [ - 20220503, - 1344 + 20220629, + 1215 ], "deps": [ "a", @@ -13210,10 +13340,11 @@ "ghub", "magit", "markdown-mode", + "transient", "uuidgen" ], - "commit": "d38fbe59304ed31c759ce733cda16f69a8ef2d8c", - "sha256": "0ph2kp1yy08g0wr3wm55zisz04lwsrmlgxgsfcnznw0qj5c2d5cg" + "commit": "95b36ec8e7935f96b2f3c6c9086d49cf4a72cbff", + "sha256": "1mplrc84a5qd6cqv0kcqm13zdmvn71g5pmilhjdagn36dsb1vn16" }, "stable": { "version": [ @@ -13413,14 +13544,14 @@ "repo": "ankurdave/color-identifiers-mode", "unstable": { "version": [ - 20220327, - 1143 + 20220629, + 1800 ], "deps": [ "dash" ], - "commit": "6fe76f0c3090f6023da3806e9d760e93810905d4", - "sha256": "05lsgksrif3isrlgr31fcwpmndgbl6qggj6jxznj3lqvhq9vz5zj" + "commit": "caed36cc21b6a7f659dda8a3ace1a607daa30f6f", + "sha256": "1s8qi4mbgmyqmmgwa6qdc40dvls0jy51wgpz8mz4rh7msmwxf17v" }, "stable": { "version": [ @@ -13659,14 +13790,14 @@ "repo": "jcs-elpa/com-css-sort", "unstable": { "version": [ - 20201002, - 1430 + 20220704, + 647 ], "deps": [ "s" ], - "commit": "902b30b6577ffd14d8b5169c85249033581c4f1a", - "sha256": "03nildwfjrbkcp25whbcklgm4gaqbwj6c65j1ngmykd2a1l1ghw7" + "commit": "bda336544e61b45e24927d8850fdb28d4b7c267e", + "sha256": "1w4chg2d152sr82mqkxiibf06qh1fbxylzd5asjx9712gy33fy69" }, "stable": { "version": [ @@ -14000,11 +14131,11 @@ "repo": "company-mode/company-mode", "unstable": { "version": [ - 20220425, - 1145 + 20220714, + 1331 ], - "commit": "d5145006b948f93e673f439a766da01f636d39fc", - "sha256": "0ghdk8iif240bg9pv24837y619g1s19dp3akxqjwr89sj2llhyln" + "commit": "890797d3d7ca9c6703aac11753dd1513de67d46d", + "sha256": "0m3xygppb5dm84mjmsw1z014wvch1n3m8lgjdnhpswrb3ff0hhax" }, "stable": { "version": [ @@ -14135,15 +14266,15 @@ "url": "https://bitbucket.org/pdo/axiom-environment", "unstable": { "version": [ - 20191027, - 1928 + 20220612, + 1535 ], "deps": [ "axiom-environment", "company" ], - "commit": "847cc6e728b692ad3fdaec28d0c8c49ec0378a56", - "sha256": "02nf2vn6s6pc63yw2rggdx9capn9432w6j56m9v0c5ygarpxb53p" + "commit": "01d88daa0c864af9918db5a147fbb5e435dec199", + "sha256": "03cxb6zdqmzgjp8r6hcirf8xl772j7xqk2nw17gjkn4xqbwfyn62" } }, { @@ -14450,16 +14581,16 @@ "repo": "jcs-elpa/company-emojify", "unstable": { "version": [ - 20210718, - 424 + 20220704, + 647 ], "deps": [ "company", "emojify", "ht" ], - "commit": "464b0a8e877ef2c80180336be4afe0d8c0b4c72d", - "sha256": "0cdp159qk4cq1fbqymh3v4sjnkj1ijk9x0picj6fqqr7wnqn1gwa" + "commit": "1b3f944973eb0393e3bb63a88659385ade0ea6cc", + "sha256": "157azpvakk3xhj6gq8wv2bpbh657csw6jls6hkryk8y9qhz9siv0" }, "stable": { "version": [ @@ -14554,16 +14685,16 @@ "repo": "jcs-elpa/company-fuzzy", "unstable": { "version": [ - 20220409, - 1753 + 20220704, + 727 ], "deps": [ "company", "ht", "s" ], - "commit": "1f9c92a27bbf50783275a16dd3988666d1ecb023", - "sha256": "1c4bh80gwrdvy98xm92g7qqvi5lnaki5y4ng317px0zg3frj1i24" + "commit": "4b5fa0b4e298447d139f7700eb5c70a2b8d2e386", + "sha256": "05p1zz53449mnc75jy4ic30gfzbgfd6s5cw5qq2454sq4q7ydqnj" }, "stable": { "version": [ @@ -14968,8 +15099,8 @@ "company", "native-complete" ], - "commit": "01d8a2048e13f29dd3aa06281ac8cb466caddb64", - "sha256": "069ch7h1fkm2zvw6nfndyrpxp9s2p7x3d0acswaa7isynygwkcy8" + "commit": "9dbfc842b3af803f636df61dec6129e1d8593ee4", + "sha256": "0yhjmznf4wx6q6fzgrddi1bqnr528mcax7kqlw9pij8990fjhdbn" } }, { @@ -15092,8 +15223,8 @@ "cl-lib", "company" ], - "commit": "f34e09783b77d1158ea139b7b3d8034bc52b0b9f", - "sha256": "1qi529lg3y5l4wrzfyk0w2fz36mpd432bp39s859z4cq06yybxga" + "commit": "dc563f4b1efeac8ae75f217532f4c99b4ba417de", + "sha256": "188hisppjbpia3bmrpsxvkfi8xkirisarnrpvkk3ya4k8lv4z13p" }, "stable": { "version": [ @@ -15341,15 +15472,15 @@ "repo": "jcs-elpa/company-quickhelp-terminal", "unstable": { "version": [ - 20210715, - 1010 + 20220704, + 647 ], "deps": [ "company-quickhelp", "popup" ], - "commit": "a34e0d8c7eca37e99c135e4b7fa5aaff8a15f576", - "sha256": "0l9syc32jsx75jhkphbv506gmilvl3vianja8f732wj3y694bnza" + "commit": "70c8a979d82e436dca8595e3ec049c733246f338", + "sha256": "1ym333y58b7xadxcf4p3aj8p3yns98q4w20xv3nz2vn58j5ha7ym" }, "stable": { "version": [ @@ -15455,8 +15586,8 @@ "company", "rtags" ], - "commit": "db39790fda5c2443bc790b8971ac140914f7e9c2", - "sha256": "05cigdvlq5lfahr9a1z8rvlw2s99j4pha2in59pshz9ph8cqgq10" + "commit": "c628efc9b485470a48aec2692d79f7c140bc5b92", + "sha256": "03avv7brbrj69368riq3xg4qh65yzl5cyjn9wc2rbyx4jw2q3p4p" }, "stable": { "version": [ @@ -15521,8 +15652,8 @@ "company", "solidity-mode" ], - "commit": "20fb77e089e10187b37ae1a94153017b82ed2a0a", - "sha256": "0lyfhb4lirk08jc73c2vhlskfb496vnh0h906a74wz2pwg84q4m5" + "commit": "211dbdf0dfab1139681156e6f9621a5bbe0f74a1", + "sha256": "14mpncf9mpypcinfvzhmvnjlxf5laxxwnf02qjdagiws42lgwm2f" }, "stable": { "version": [ @@ -16044,8 +16175,8 @@ "repo": "necaris/conda.el", "unstable": { "version": [ - 20220604, - 1727 + 20220710, + 1740 ], "deps": [ "dash", @@ -16053,8 +16184,8 @@ "pythonic", "s" ], - "commit": "e4154db0dbfb7faf46b645eddfaad9326e4ea18d", - "sha256": "1ily4abrn85fwy90hfm1nq9kwazb80amdgx4disaa2s62yx6k62j" + "commit": "06a1ac946ed245e0b0fae2755f9641c4c180de9f", + "sha256": "0ngj4prn9lk1ymffpkj5h7wcy1zmqsfm9ljyqqxrcmmjylciglav" }, "stable": { "version": [ @@ -16208,14 +16339,14 @@ "repo": "minad/consult", "unstable": { "version": [ - 20220603, - 1902 + 20220716, + 522 ], "deps": [ "compat" ], - "commit": "b816d1c42f420411c31fe0968ddc868aa2186de7", - "sha256": "014sbc3d2w7p5a8jsyag7qxlmixvs7zycpdrylxxbs9gkivfyyxw" + "commit": "0fa264c2efc17e564af406d60dbe77ae2fb6f010", + "sha256": "13ilnd2599m3sfkbcm9y858qg9l0v1835g89sxbakm9k2mnm7ysl" }, "stable": { "version": [ @@ -16278,6 +16409,25 @@ "sha256": "1wqs6ryx7vihmcd11x6ankfrhwn6bhvkld2hw390y1bmxq30pw3n" } }, + { + "ename": "consult-dash", + "commit": "a9a8dda814aa476a5c1da9bb5f26ac5d3be98bd2", + "sha256": "0bp3whcivylkdiq96g6zz5jbrcqmwns43cqlad6ij2mz5xa44cbf", + "fetcher": "git", + "url": "https://codeberg.org/ravi/consult-dash.git", + "unstable": { + "version": [ + 20220621, + 226 + ], + "deps": [ + "consult", + "dash-docs" + ], + "commit": "0eb8e133a12570f482efcf367dcc7887c15def32", + "sha256": "026am3bjihb9zzxd2bcrr24bg8hspdq91rymv79r6ghx3a17z891" + } + }, { "ename": "consult-dir", "commit": "461a4fc1ea3fcfac1a10e8004d7a917b14a0b771", @@ -16514,15 +16664,15 @@ "repo": "jgru/consult-org-roam", "unstable": { "version": [ - 20220508, - 1232 + 20220706, + 627 ], "deps": [ "consult", "org-roam" ], - "commit": "05cec288f931a1f3cd5984b88a79f1339110e4b9", - "sha256": "0ar9qfkigwpifca05020p4144d6qh42milwz8wrn8ylxwsmm7v0m" + "commit": "9b51aed939054c54934a6969290ad78587051cde", + "sha256": "160rix04azd1wc7fls29bhssjwzwmmnnqcfbkvapsyryvn80q219" } }, { @@ -16563,15 +16713,15 @@ "repo": "OlMon/consult-projectile", "unstable": { "version": [ - 20220511, - 2103 + 20220617, + 1042 ], "deps": [ "consult", "projectile" ], - "commit": "130ba9d3879bc293d81b1aa9fbfd0dffae3b5579", - "sha256": "0gvrhh58097lry1d13xx4il2kbkljrk170hgr8ibxdzq0jf09aah" + "commit": "5ef1ada3be767ea766255801050210f5d796deec", + "sha256": "1x0h9jbgkm32gs75hha3cwk5l24mpq0lmsik03msnc4wl2kvpnhm" } }, { @@ -16588,8 +16738,8 @@ "deps": [ "consult" ], - "commit": "228306eeda8c57db45609ca068f60ee433367c17", - "sha256": "0rxfxws0d65sdjph91g77a2sy1k90y9hgyps4da0a6kvbm3zprgg" + "commit": "d550a76ffb00846a1b91be595e5adf5b9b2b1f93", + "sha256": "1h7i8azk9rvqnknhspfpfgh684p98hlpmcd7na382cdxqji9sgp9" }, "stable": { "version": [ @@ -16760,6 +16910,21 @@ "sha256": "1qm6v88mz6bxz0yg2yw5xfiz5jjnz3i9vwaa3irnywzs6prw7pa4" } }, + { + "ename": "cool-mode", + "commit": "2e18a3bb58344b5b4b295f52402464b09b99d706", + "sha256": "1nwa0hqygzg3g2dq8482n38xli5lfsi0x3ppqrjwwa35sxhg6cjs", + "fetcher": "github", + "repo": "nverno/cool-mode", + "unstable": { + "version": [ + 20220612, + 1904 + ], + "commit": "961e66956412a1dd63f79473a8273da8853f7179", + "sha256": "07dbw0yvk3ijibhghzgaik3cfrv56dr8ax7dyy0kryvjairmhwjc" + } + }, { "ename": "copy-as-format", "commit": "42fe8a2113d1c15701abe7a7e0a68e939c3d789b", @@ -16914,14 +17079,14 @@ "repo": "galeo/corfu-doc", "unstable": { "version": [ - 20220606, - 1654 + 20220621, + 1554 ], "deps": [ "corfu" ], - "commit": "616a2a9fc6fb3222ea2273435ddbc63eba72670d", - "sha256": "0hkcpwkwz9ls2yawlpi2zx2zvrggyqc5qrnl1q4fc3dajnkl1gy4" + "commit": "da931367802d01e87e1e496ba5b51aa9126a705d", + "sha256": "08ql4fi06w1v4f2xx24ajym513pi8pzxhd7y5zwrnk0kq2p8dr4p" } }, { @@ -17002,15 +17167,15 @@ "repo": "abo-abo/swiper", "unstable": { "version": [ - 20220529, - 1130 + 20220626, + 1826 ], "deps": [ "ivy", "swiper" ], - "commit": "f8d80a4055514f92d94f128f5fcb1cda79e5cd22", - "sha256": "1cmafp5rssp27lhvszyzf4mc1z130kkgkl9d36lgg97qk5jp58g8" + "commit": "2051de5882706246da298ce5f60482cd7f469fe7", + "sha256": "0gk0dznnd7y08f83pjgwdxy9i9dz06jj1kk7mq1schbky82a1i57" }, "stable": { "version": [ @@ -17053,14 +17218,14 @@ "url": "https://codeberg.org/ideasman42/emacs-counsel-at-point.git", "unstable": { "version": [ - 20220507, - 1118 + 20220710, + 711 ], "deps": [ "counsel" ], - "commit": "3e731889dd4519d16c38d5ad20f4ecdea0c95475", - "sha256": "1c4y9j0dlwxcahg7r62llv6w66iz48zmsnfwj9pv9pdhw6cnpc23" + "commit": "de081520f5fd5927eba032294b5a8dfb2585edd7", + "sha256": "1qf984qbnssqdj1kxlkr3k5asgpbj22ppxb1zvs34m2365frlhcz" } }, { @@ -17877,26 +18042,26 @@ "repo": "emacsfodder/emacs-theme-creamsody", "unstable": { "version": [ - 20220527, - 927 + 20220616, + 119 ], "deps": [ "autothemer" ], - "commit": "4e1f00a590628034282a914d483fd6008a76c8f8", - "sha256": "0yw40fmisw5wby45pk4jblpshj1vsdhs43d7b25xpvjc6l0j5jz4" + "commit": "21add9e946e2d00c15b609e75d65aa4c292bc7a2", + "sha256": "02cv63iyxslsxrfim20562cnffa0wkv9y9rmg22pj9i060c5fiw4" }, "stable": { "version": [ 0, 3, - 14 + 15 ], "deps": [ "autothemer" ], - "commit": "4e1f00a590628034282a914d483fd6008a76c8f8", - "sha256": "0yw40fmisw5wby45pk4jblpshj1vsdhs43d7b25xpvjc6l0j5jz4" + "commit": "21add9e946e2d00c15b609e75d65aa4c292bc7a2", + "sha256": "02cv63iyxslsxrfim20562cnffa0wkv9y9rmg22pj9i060c5fiw4" } }, { @@ -17907,11 +18072,11 @@ "repo": "kijimaD/create-link", "unstable": { "version": [ - 20211014, - 1617 + 20220621, + 1440 ], - "commit": "e765b1067ced891a90ba0478af7fe675cff9b713", - "sha256": "1nr5dsbmhn9bs0v0h6v7d8a0pkgg859cm677nz7br2xaibdz0z47" + "commit": "276fafcc6fb568ede256c8d459c3beb408ad9b46", + "sha256": "0b174bvd004v8mcm3pxckxy2pc821jizj4x30r7ar0dz6xr0pzhy" }, "stable": { "version": [ @@ -18215,11 +18380,11 @@ "repo": "emacs-csharp/csharp-mode", "unstable": { "version": [ - 20211124, - 1105 + 20220704, + 1242 ], - "commit": "fa06dfa206812476217ada6c4178de34ff1efc42", - "sha256": "1d8capbzdr69sr4xhz2l8aczys1ry5ns1k873575wp8xfdp02ppq" + "commit": "396b5e9b32bb58c9f984a03f5075455af87f7307", + "sha256": "07arvkrmg86kzyxyxzmxarb46g2l94q5inzhp4r05xaxhz6jqfp4" }, "stable": { "version": [ @@ -18380,15 +18545,15 @@ "repo": "neeasade/ct.el", "unstable": { "version": [ - 20220514, - 2027 + 20220610, + 1146 ], "deps": [ "dash", "hsluv" ], - "commit": "6bc55d01780fa921ced0e648d04497e27e23fe54", - "sha256": "03yfk0kwckb6gpp9ndnb9i1vcvx61wcy30jg35zkyfd2h93vjnp2" + "commit": "dd883e2315aba099e32fba9f1039437551b96ef3", + "sha256": "0qky9zjp0hy1335brkr16sifcjgy2w7nmffiqf5i501kkjy3z53c" } }, { @@ -18496,8 +18661,8 @@ }, { "ename": "ctune", - "commit": "927ecd888bc00abff13f5fc335a88dffc2bf6779", - "sha256": "1ymy508h19w6c7z93nww9fzirzk84w24j3dpbj08d08bifndhj1q", + "commit": "570bde6b4b89eb74eaf47dda64004cd575f9d953", + "sha256": "1wwyjs48a7b2qvh1pqhzj4gwqc5lrcr7wfv2h24f28i6sjzygjgq", "fetcher": "github", "repo": "maurooaranda/ctune", "unstable": { @@ -18860,14 +19025,14 @@ "url": "https://codeberg.org/ideasman42/emacs-cycle-at-point.git", "unstable": { "version": [ - 20220507, - 1118 + 20220708, + 500 ], "deps": [ "recomplete" ], - "commit": "85750fa695797b95608b331b64ea49d81f7c8a36", - "sha256": "1cf5mvkwy208dlc4jlax9cb9ffl41aibcpsbfp0sv8ibjrnsaldd" + "commit": "14dbe688fb611d4118229f6197039c69b67d4e35", + "sha256": "0gik0nz85zwkg21fc12rrnsdp35h91405iqvs7wprcmvnilc7irs" } }, { @@ -18953,8 +19118,8 @@ 20211111, 1407 ], - "commit": "8e29b6d47f6f5b10ec1a37f06db440156ac2ac2e", - "sha256": "13vcbw8abqc92hq6cd9izr5fdq4zah3snd1c9ly8pr40gcfhwvdx" + "commit": "6414a07ec88b60d604daf0e51fd850ee974afdcb", + "sha256": "0rcshhb9cc1fzj932yp25i90kv2ryv19k73imrrmn1kk8y53apbp" }, "stable": { "version": [ @@ -19161,21 +19326,22 @@ "repo": "emacs-lsp/dap-mode", "unstable": { "version": [ - 20220518, - 629 + 20220712, + 919 ], "deps": [ "bui", "dash", "f", "ht", + "lsp-docker", "lsp-mode", "lsp-treemacs", "posframe", "s" ], - "commit": "67fd9e5d4e157e72b09ab34daca67619cb98c673", - "sha256": "0ggi7bcx7pmvdlngkv4spbbcb912ih8pn2d57395sx4iykkswyry" + "commit": "ad0b8f9d25a7bd82f8fc9694c5406429e8e34d8c", + "sha256": "1d8k517darmlwx29v8k1q6ycqq3ji92hdl68ab440hbjkm0mz4cw" }, "stable": { "version": [ @@ -19422,11 +19588,11 @@ "repo": "magnars/dash.el", "unstable": { "version": [ - 20220607, - 1100 + 20220608, + 1931 ], - "commit": "0c49a33a61c739eb12e4c3680138c1659926202d", - "sha256": "0wv0hkifzn8qmwa5pxs6lc2dywc0pc6wyfcf13kvjhnj7md4wplh" + "commit": "0ac1ecf6b56eb67bb81a3cf70f8d4354b5782341", + "sha256": "0li53fpvszg51p1m3mw5klyxhgl5fz45zid82pw985znapk5a0l2" }, "stable": { "version": [ @@ -19501,8 +19667,8 @@ "deps": [ "dash" ], - "commit": "0c49a33a61c739eb12e4c3680138c1659926202d", - "sha256": "0wv0hkifzn8qmwa5pxs6lc2dywc0pc6wyfcf13kvjhnj7md4wplh" + "commit": "0ac1ecf6b56eb67bb81a3cf70f8d4354b5782341", + "sha256": "0li53fpvszg51p1m3mw5klyxhgl5fz45zid82pw985znapk5a0l2" }, "stable": { "version": [ @@ -19525,11 +19691,11 @@ "repo": "emacs-dashboard/emacs-dashboard", "unstable": { "version": [ - 20220526, - 738 + 20220615, + 540 ], - "commit": "34d1f97200055e6b521c131270d8322efc6c52be", - "sha256": "03mnvxv0rjnby56y67f5x44s4wcnn9vxzcq1gxkxxz14kn8k42kn" + "commit": "f4e8ed9f0dd2147d4f076948ff7f6c7333042c91", + "sha256": "020x45vyc1skj423l8xj26h8b9m8ikvbcavxai44m6jgaac4ldx0" }, "stable": { "version": [ @@ -19571,14 +19737,14 @@ "repo": "emacs-dashboard/dashboard-ls", "unstable": { "version": [ - 20220326, - 628 + 20220704, + 633 ], "deps": [ "dashboard" ], - "commit": "cd7c32f972f653a665e64aadf9bb88ed9fc10d5e", - "sha256": "0jy63yqix10pkw79i3x48przzbmbh5dm1hjd6w72yfa7ln01c4q4" + "commit": "62cc1aa84c9f5a6657fcd5032574a7670eac5aa0", + "sha256": "06mc82ibz0rgplhh93g7zjagrwfbn3alrbpy1qw89rphhc4v13n0" }, "stable": { "version": [ @@ -19705,26 +19871,26 @@ "repo": "doublep/datetime", "unstable": { "version": [ - 20211016, - 1656 + 20220629, + 1806 ], "deps": [ "extmap" ], - "commit": "77dc214d9ae853c7206ae95cc92d720445c1eeb4", - "sha256": "1qz06p8jdkhs9cfqxiwj4srdlrbjsydwimg58zxhrp679nyv0pf4" + "commit": "3505de8bd176056083a1da73226f9e77cc50c4b7", + "sha256": "1lzmij8hk7s2rj51yx88swvpj2dlgh9wnrcbpgzfh7l9sv22r3lq" }, "stable": { "version": [ 0, 7, - 1 + 2 ], "deps": [ "extmap" ], - "commit": "666569908c76ab83de1512b85f22409f78148479", - "sha256": "108zfj5hz9irgksgg48xdvvaa635m6nzclx7xaymylfcvlycskpl" + "commit": "3fee2884fad912e899a5ba47609bcf94532352f1", + "sha256": "10nf3y4abwkwvi4g11mdwi0dydy4kzfyv21y06dsxm1hc1gmq7zx" } }, { @@ -19852,8 +20018,8 @@ }, { "ename": "ddskk", - "commit": "6eccccb79881eaa04af3ed6395cd2ab981d9c894", - "sha256": "01pb00p126q7swsl12yjrhghln2wgaj65jhjr0k7dkk64x4psyc9", + "commit": "570bde6b4b89eb74eaf47dda64004cd575f9d953", + "sha256": "1bgjpr7dikl360famf7fnd610z8wgj00pg3s5z632wra0yg331yy", "fetcher": "github", "repo": "skk-dev/ddskk", "unstable": { @@ -19908,16 +20074,16 @@ "repo": "Wilfred/deadgrep", "unstable": { "version": [ - 20220507, - 1755 + 20220704, + 1714 ], "deps": [ "dash", "s", "spinner" ], - "commit": "ae333e4069e296e98bf9631088c8198f50891d55", - "sha256": "000s08mwadvdwcsisw741pv3l5znii7qbdc2865i8ywbj5b3dadb" + "commit": "0c57d113aa6840bec073b3432ed62b382f20acc6", + "sha256": "1r16kvq4kpa3c0p1zh2539rb0i82kqy0jbl9avwyi96va0zm4rxp" }, "stable": { "version": [ @@ -20114,11 +20280,11 @@ "url": "https://codeberg.org/ideasman42/emacs-default-font-presets.git", "unstable": { "version": [ - 20220507, - 1118 + 20220708, + 211 ], - "commit": "7117ddadafcf0264c19b7a6bb912d52efe5553f9", - "sha256": "1m2l7ngrf8r4z873dir2b6ivbq2hqb8041bmd9xy76rwyy40v7x1" + "commit": "e16c19107c1cc4466efa099daee192c5cb18e27b", + "sha256": "19dm11brf2an0vhzc56zf9qscbvdyhmc1wynp779hip8b6ic1qmy" } }, { @@ -20176,37 +20342,38 @@ "repo": "jcs-elpa/define-it", "unstable": { "version": [ - 20220414, - 932 + 20220713, + 744 ], "deps": [ + "define-word", "google-translate", "popup", "pos-tip", "posframe", - "request", "s", "wiki-summary" ], - "commit": "749d3fc788cb26032dd30e509596a8988b7b6a7d", - "sha256": "1c58v122k1qa5vv5f2fcway5qkcr8j8kbp6y8fz4b5nj9di8azj9" + "commit": "de026f399d5b7fa9286f7733b2e3416c6f234372", + "sha256": "1dhf64sb0ja5bs7zfbzkwk40ccqmb35kv3cdhshlmdf9d9fj9jv0" }, "stable": { "version": [ 0, 2, - 4 + 5 ], "deps": [ + "define-word", "google-translate", "popup", "pos-tip", - "request", + "posframe", "s", "wiki-summary" ], - "commit": "ec13795cd1185706fcc81ea627d3680f65283891", - "sha256": "05wq0apnljclpjn3ifwl31vx3rlwv9kns5yva26sd8ks7kjyqizj" + "commit": "de026f399d5b7fa9286f7733b2e3416c6f234372", + "sha256": "1dhf64sb0ja5bs7zfbzkwk40ccqmb35kv3cdhshlmdf9d9fj9jv0" } }, { @@ -20560,11 +20727,11 @@ "url": "https://git.sr.ht/~niklaseklund/detached.el", "unstable": { "version": [ - 20220603, - 1446 + 20220704, + 941 ], - "commit": "24b925435c5fb7d5927fd4db5217fbfd4f8ed9c8", - "sha256": "0lvx39i879d8n5m3b2pgjpw7i0a6wlfr2zk3bfk6kjm1vcrhhaz6" + "commit": "b778480d176f0fe16243f2eb4128a48ce0d0f6d5", + "sha256": "140i69c11pkr1kfshscpz23y3sgdsz914yjaqm43px6kr3yr3nvi" }, "stable": { "version": [ @@ -20815,11 +20982,11 @@ "url": "https://codeberg.org/ideasman42/emacs-diff-ansi.git", "unstable": { "version": [ - 20220524, - 18 + 20220710, + 557 ], - "commit": "7e493019234d468354758f7e60032a1fb379de44", - "sha256": "0ri50ralsbmi3j0fbrk0xspnyw7ivpjii59dd09791sgyycaakh4" + "commit": "f4c61c3cb5b4a543bd8eb8c7b796f710deb2269b", + "sha256": "069c279f2i6lx780gprn8spwziam0wh636rl0hx8hal76v1kh4ik" } }, { @@ -20830,11 +20997,11 @@ "url": "https://codeberg.org/ideasman42/emacs-diff-at-point.git", "unstable": { "version": [ - 20220507, - 1118 + 20220708, + 211 ], - "commit": "aabb96b2b59f0e0d94d7b6889fa30016927ea03d", - "sha256": "1zmk2yycsphhz8mqa3ffa3mk6x0cxvmpld7kpa0bn1sp1w8xvssp" + "commit": "b32a741d5967b38749039ceafec85062a45e6bcd", + "sha256": "17mivblmnnm2yy1154fvy5lf36rxn0vmcl2c94pn5rnrbndxpdrd" } }, { @@ -20845,14 +21012,14 @@ "repo": "dgutov/diff-hl", "unstable": { "version": [ - 20220515, - 1714 + 20220620, + 1309 ], "deps": [ "cl-lib" ], - "commit": "e84209e959a17c7b96148e099e391daa29a4835e", - "sha256": "1jjgdjlbpi8d5yb83143jhkb2v4375kvmxkn1q5v3wyqx0f21npx" + "commit": "dabb7be6283488abd8d232ea8ce590d502713ed8", + "sha256": "0j9xq8r4ar6rv6a3gnakm2bzr43r7sqnbgczriifr3ybkssnpzp0" }, "stable": { "version": [ @@ -21204,11 +21371,11 @@ "repo": "jcs-elpa/diminish-buffer", "unstable": { "version": [ - 20220218, - 1541 + 20220704, + 648 ], - "commit": "29c33c7636195f12a10b241448df7eb6760536e1", - "sha256": "1x182g34y13is7x7z32dgrcpbhzyc2narmdl3m702zpnvpd96dn7" + "commit": "6521793eb1a33d56c78bb1e8e579cdeafd224ed7", + "sha256": "06p6aa8k21n975ii6s4aigwm232qibyk5hva4i3y3l7idv6ildn6" }, "stable": { "version": [ @@ -21906,14 +22073,14 @@ "repo": "jojojames/dired-sidebar", "unstable": { "version": [ - 20220601, - 1536 + 20220618, + 237 ], "deps": [ "dired-subtree" ], - "commit": "bede31ae5f4ecdcb8cac01a9ffe746988838a344", - "sha256": "0i7y5xd1q862xg4bsg3apqcm7mha96ark7sk2cq2lpwndy3i4mxf" + "commit": "f08bf15cb6cb3c44102731f50ffd812d8d68316c", + "sha256": "0f39j8d47ids6yr427hvvqk6wlsw9qz3knm4fdf478v0lkxmpxdc" }, "stable": { "version": [ @@ -22251,20 +22418,26 @@ "repo": "alexluigit/dirvish", "unstable": { "version": [ - 20220608, - 1236 + 20220716, + 153 ], - "commit": "f47331477af930a9759cadc9ade8cf81bc03497d", - "sha256": "12h6z8z51bcnvlsb3274zxfpg3rrfhxbldyar0jn2ix0msy6kc50" + "deps": [ + "transient" + ], + "commit": "b8b114d0bcb2ddac7a14a37575f9ce89b5c44f8c", + "sha256": "0fmwq77s45ccyvfpz9h4ha62b18vmkf1z61fq5074caijb7maibw" }, "stable": { "version": [ 1, - 3, - 21 + 8, + 14 ], - "commit": "5e57c8ba2ec278e14c6d3e2c79ae1c29f775bb46", - "sha256": "1pr17dmi57lwmwj5d17w239pdscb747zm36vdmjyy2d3yn1dns4h" + "deps": [ + "transient" + ], + "commit": "21a6805aa989285698d2f2c09feaeb4a03171890", + "sha256": "14d3h27qvfbk9s7mxng0dpl2bx1ikwv5swizia9zfn8w4aplpn93" } }, { @@ -22915,11 +23088,11 @@ "url": "https://codeberg.org/ideasman42/emacs-doc-show-inline.git", "unstable": { "version": [ - 20220507, - 1118 + 20220708, + 211 ], - "commit": "0cceb39df31fd578cfc95d756f667874e6321001", - "sha256": "108w5v4mw7wj1ahg0bhh7bdvg31hq5iqgyjiyf9zdm02wnmz8jhh" + "commit": "1be290742980331736828207208caf2473f3ba60", + "sha256": "14xjn7yzskac5azq8h3dbxijiqmss2xdl1sah4ndwhw2i7ziq1x2" } }, { @@ -22967,26 +23140,25 @@ "repo": "Silex/docker.el", "unstable": { "version": [ - 20220530, - 603 + 20220629, + 527 ], "deps": [ "aio", "dash", "docker-tramp", - "json-mode", "s", "tablist", "transient" ], - "commit": "44f0bbec9b3deb027d17f4c10d8ec4106ed89dfb", - "sha256": "0w62z4y77fx2flyybhk44n2207r55j3djhpdn5xgj0hd1gnprfzr" + "commit": "8d0429d6bd7f7a74cd58b00ac26a0c9148706124", + "sha256": "02z7m57502yxn1rx29j6qlzwwdbjzki1bpia2ac1hygb0ixdxbkm" }, "stable": { "version": [ 2, - 1, - 2 + 2, + 0 ], "deps": [ "aio", @@ -22997,8 +23169,8 @@ "tablist", "transient" ], - "commit": "78881bea51c74ef171788fa989908cd51f5b3f8d", - "sha256": "0wgdabjkcwi9a3615imny8xysbrydnlcz9rmkavp22kypk6ydcjw" + "commit": "bc11d5e4f21eed57e482116848af1f5c9e21bd3b", + "sha256": "1743x2s7ss7h329yayima3pqi62f0qjv56g5y6b7iwk40wpnhv9v" } }, { @@ -23176,14 +23348,14 @@ "repo": "emacs-vs/docstr", "unstable": { "version": [ - 20220608, - 532 + 20220704, + 630 ], "deps": [ "s" ], - "commit": "0a48429c2d0c2aa1de34ea24d2d3f9c8176519de", - "sha256": "145b9rgkrsxbnwjplkm6qx6bdzq1zgx99qrwnrl9kkk13091xhk2" + "commit": "ae851e805c27c0ec2952c30bedd95ae84bc90010", + "sha256": "02jzl98gfwi7gi5vyhqanrwh23gydlzlfkswcyxcdw4vh0qa6xs2" }, "stable": { "version": [ @@ -23206,17 +23378,17 @@ "repo": "progfolio/doct", "unstable": { "version": [ - 20220529, - 1851 + 20220713, + 1659 ], - "commit": "8464809754f3316d5a2fdcf3c01ce1e8736b323b", - "sha256": "01sjb41kii5hhh7gdd132k4iaqqfd0psy9hlc3bi7g4bplp7h7gf" + "commit": "15974ad8d4d7baa071b5ea33877e9dc117c4153e", + "sha256": "0cz0anbp286pcm9ymjlax5p42ifnkkmpcf9q396zl20vgm8xgdib" } }, { "ename": "dogears", - "commit": "2a551c7b122dbaca845a0bc0a86137b37521c59e", - "sha256": "04p2ild2kniji0q8gr1c24qwzrvmwbkkrkzpgxs3y8hxa1gb9ync", + "commit": "570bde6b4b89eb74eaf47dda64004cd575f9d953", + "sha256": "05hwjh2gy6j8dsv2didy86xfqbg10jrr6lhj3dqamjnm0ywkvs2d", "fetcher": "github", "repo": "alphapapa/dogears.el", "unstable": { @@ -23343,29 +23515,28 @@ "repo": "seagle0128/doom-modeline", "unstable": { "version": [ - 20220608, - 936 + 20220716, + 514 ], "deps": [ - "dash", + "compat", "shrink-path" ], - "commit": "999790c984a83288c2b62d0a7294123f8eaf4b52", - "sha256": "0skdczk429p5cp8k24wc9inv6dripm9m5fb306nifq3akpc37dvx" + "commit": "7003009213fd1433e47240e5387b84e6cbb7d350", + "sha256": "0gaqfqk8k8k93r4wcv624507ggmlch596kcxr8mq2mb0dzjmmxmw" }, "stable": { "version": [ 3, - 2, - 2 + 3, + 1 ], "deps": [ - "all-the-icons", - "dash", + "compat", "shrink-path" ], - "commit": "1ecf8fcd779c3ef7472f532e0f7843b3ad9682c7", - "sha256": "08zvi1a6hiii3sw8fk0x26jv7vgzy04aal8zvcbwaaczl063vark" + "commit": "156b02445c3360added80009ab3c1a33dd88c5d9", + "sha256": "0p728hbphfch6kmkjxm1qwxrwz6l94s3sj7wl1wc4mp82zrdsi15" } }, { @@ -23395,27 +23566,26 @@ "repo": "doomemacs/themes", "unstable": { "version": [ - 20220526, - 2301 + 20220622, + 2317 ], "deps": [ "cl-lib" ], - "commit": "ec199971005e720f138b3bf12b4004714a074c8c", - "sha256": "0457frpjinqg9vzbhjdmz5vcw22bg1n3g4gv7j80lw8lbj9ljr61" + "commit": "d79a41f593c69697af1ddaac971c0c47ecc446a8", + "sha256": "120pcas0l1m6w551qxfcl2fx0aysjqp91nn47zdxrr8rs01654wr" }, "stable": { "version": [ 2, - 1, - 6 + 3, + 0 ], "deps": [ - "all-the-icons", "cl-lib" ], - "commit": "39e6971e81181b86a57f65cd0ea31376203a9756", - "sha256": "042pzcdhxi2z07jcscgjbaki9nrrm0cbgbbrnymd1r4q8ckkn8l9" + "commit": "d79a41f593c69697af1ddaac971c0c47ecc446a8", + "sha256": "120pcas0l1m6w551qxfcl2fx0aysjqp91nn47zdxrr8rs01654wr" } }, { @@ -23649,8 +23819,8 @@ 20220209, 724 ], - "commit": "e725c9e790c9e9cdaccdb35faaae9d5cb16ddb89", - "sha256": "1hj40c203a5mj9xngsgw5yihd6pcvr91aggqa0kbd4j16fcsvw9j" + "commit": "60f4e0c67aeeaeb1632cd82b96f4ff5ee83bd1f4", + "sha256": "0ixmdjbi9zvgim6s5j0slc744zwz5l069bvbsinxmi8fzpiln68m" }, "stable": { "version": [ @@ -23897,8 +24067,8 @@ "s", "seq" ], - "commit": "092cb79d1985a0c5017070353abbb93b8977803d", - "sha256": "1lgjph43lc13iil6cp6ihn4w8d9yy7kc0s6y912hialykrscvcas" + "commit": "a657a8c034746069a5b340ef7356cb7d38290ec9", + "sha256": "1cycdzk24g3ay1riz840bvd94vhcy7l0hx6ipb7s18pz5aw7icbb" } }, { @@ -24006,16 +24176,16 @@ "repo": "jacktasia/dumb-jump", "unstable": { "version": [ - 20220524, - 2122 + 20220620, + 2325 ], "deps": [ "dash", "popup", "s" ], - "commit": "1dd583011f4025b1b8c75fd785691851b6c5dfa3", - "sha256": "1c4w5hxydn59ga9731mcg0r0hlbn2fzjalvv0w2flnx77pkl8g6a" + "commit": "ba4127336d897f5656032694bbe22c490ecbb000", + "sha256": "07r4c4wrffbk6qvgyjg4k7jz0viym2qfpkqql6xg1rpan1sp9rk7" }, "stable": { "version": [ @@ -24058,17 +24228,17 @@ 20210909, 1010 ], - "commit": "1c74870571c21e7e95c0ec53d3b714d08fcf2b83", - "sha256": "1y0gihaksjrxbxp8rr43xwbqcjy0y4a60kz7g1qqdafb1y38x5kr" + "commit": "02a51a1318f3bdb9f7b6c016c258d3c9df1c9b9b", + "sha256": "0f74jpf3p9b0x6a28vafix6jmh8xmphl323cz9zbl1ki8jna8n3w" }, "stable": { "version": [ 3, - 2, - 0 + 3, + 1 ], - "commit": "43af00f79e41ce9101d42b36dab13e1f68d49a7a", - "sha256": "0fa8fkj2piis8b56phl6p77pl1na81krdnmmvyw16hq45zbmm9rk" + "commit": "b3232b22e13ff2fe4db994ba7ae3db727d1493cd", + "sha256": "0wdja70l7y1cj1d0sijm0q0cbics8xd9wqka7zyb29y1cc57pasa" } }, { @@ -24645,29 +24815,30 @@ "repo": "masasam/emacs-easy-hugo", "unstable": { "version": [ - 20211017, - 1248 + 20220616, + 2302 ], "deps": [ "popup", "request", "transient" ], - "commit": "baead14d7f2fa86e108269932a94bf376de9c2e5", - "sha256": "1d61wkambq4dr65bv8ldyqzkicgspw4yiyb52x6ngka6gj8cs27h" + "commit": "46aa41a207c9644ef9789512e025d4e7c7f3d5ea", + "sha256": "07nhcnq0b1wha1nd7y6mzqgf7x5dzi4pg11q827fjfap7aw9mh6p" }, "stable": { "version": [ 3, 9, - 55 + 56 ], "deps": [ "popup", - "request" + "request", + "transient" ], - "commit": "b3c9ca2a4e1d90013a7d990056d56cdf2bdf8e40", - "sha256": "1g48c2142yqs8ir2872q0zdl46qprx2mhhhd9jvcscakm4xv3cdf" + "commit": "46aa41a207c9644ef9789512e025d4e7c7f3d5ea", + "sha256": "07nhcnq0b1wha1nd7y6mzqgf7x5dzi4pg11q827fjfap7aw9mh6p" } }, { @@ -24824,26 +24995,41 @@ "repo": "joostkremers/ebib", "unstable": { "version": [ - 20220430, - 2219 + 20220711, + 1845 ], "deps": [ "parsebib" ], - "commit": "0e243a78f435038dda31953c5b48cbddf2a89e27", - "sha256": "14br20mzxg84l8nbzglkwvam9ac1xlkdm6dpdfxw5ri6lkcd2bpf" + "commit": "36b487b798cb432a52c2d5d14c3aec74fc7eece9", + "sha256": "1h3s236drhcpgxxs8pkq2g3wvw6avk0wp9gr2n5d53pmqhdki63x" }, "stable": { "version": [ 2, - 35, + 38, 1 ], "deps": [ "parsebib" ], - "commit": "a338d8b2007e9353a5ced6c98f12f3332e153f12", - "sha256": "0b8nb0pwpq0j5g7rgmdhjp4g9za4ppzxp7b3swkqr06vvhn7db7v" + "commit": "43f4e50d8e20c87f279da1a7317977297387bff1", + "sha256": "1a2pjnfk3yk7r13avjv4xcmq0ld1lw78ngifn9khpl28kd9fgv74" + } + }, + { + "ename": "ebnf-mode", + "commit": "e6f3d2ce327d45e2eac5796ea2aa588542a839a6", + "sha256": "0s5xj0mglfzgbljsnlwj2x2pwv7lv7wm185cq3sdwp15kjn6qmrs", + "fetcher": "github", + "repo": "nverno/ebnf-mode", + "unstable": { + "version": [ + 20220606, + 1846 + ], + "commit": "89a868226e7ddb303548e82a81f76fbb0e5b21c5", + "sha256": "0hqlvjhbx6zz11dhnacqgi62mwwbiji95jgv2zwdl9y1zmizd23c" } }, { @@ -24854,11 +25040,11 @@ "repo": "flexibeast/ebuku", "unstable": { "version": [ - 20220530, - 453 + 20220626, + 1336 ], - "commit": "83ec048a6d9b5376b4416ec8a07c14f243a1b45f", - "sha256": "1zl89afgj085sc6hqb8ibz0fmm4gjwaf3wzpwr8dhdh2qkl8wdiy" + "commit": "b046d9417edda5cb078041ea0e920d0688255060", + "sha256": "14c336pvyxfys3rb9vmqzv9zlbcl0r2k150xrfvyl0qs0syvbc28" } }, { @@ -24884,11 +25070,11 @@ "repo": "qaiviq/echo-bar.el", "unstable": { "version": [ - 20220222, - 214 + 20220705, + 2212 ], - "commit": "06cc8ef88f3b054f676b76815879bd6c71107591", - "sha256": "00cipip1zlfag1mrqi887qq2a3zf4n39a0z5h3vsv38zslq1rz7x" + "commit": "b00e80acbbb708a3528c7b376dfb216deb64e4fe", + "sha256": "081rmpbkq2fx1jx71hfz61szaimcpjh933sa4vqz2cn7cf2l4n5s" } }, { @@ -25696,8 +25882,8 @@ 20200107, 2333 ], - "commit": "dbb395b41a4e4eb69f3f045cbfbe95a1575ac45b", - "sha256": "14g0dpn8j7kh3iiq7qlhaa1wdk6xvl60hkl3j87ncjwkh6h4imcg" + "commit": "f06fabd97dc3333c7a2637b2cfff238704e87078", + "sha256": "13lhpfmwklqn1rwvi5gmkdnqpm7y41jmsgyg6gm53n5vpngpa6ra" }, "stable": { "version": [ @@ -25717,8 +25903,8 @@ "repo": "joaotavora/eglot", "unstable": { "version": [ - 20220519, - 900 + 20220715, + 1158 ], "deps": [ "eldoc", @@ -25728,8 +25914,8 @@ "seq", "xref" ], - "commit": "aa50b4bb9e52d15472c7a4f9c6101506dfa4f8b4", - "sha256": "1sjr6x2xbbyda0g3b04zqd6a7hm2n23dxpcb89yawssiwjn5v8xp" + "commit": "33c464f658de70f36c27237d57b9c9858c68bc81", + "sha256": "1qplg6ilrr5p28mn3jflqkidz04s475q2nl53qdfh2mvhviwwklz" }, "stable": { "version": [ @@ -25755,27 +25941,29 @@ "repo": "fsharp/emacs-fsharp-mode", "unstable": { "version": [ - 20220605, - 1329 + 20220630, + 2007 ], "deps": [ "eglot", "fsharp-mode", "jsonrpc" ], - "commit": "c7842fe63b8bae5aa8bd6a9891036c5ce04e4030", - "sha256": "17ibcl9ilm7ml4gjlvcx40hni8awccm1zk37y0nfvcscigf3i8pr" + "commit": "42e8db5ff67c37228f92ca8750d203aa5bd9e1e5", + "sha256": "10ya3ns0kkgiwlk8rrx4891q4833yyqdf961dsam45kfzdqcxkwl" }, "stable": { "version": [ - 1, - 10 + 2, + 0 ], "deps": [ - "eglot" + "eglot", + "fsharp-mode", + "jsonrpc" ], - "commit": "4a1df3342931f09edc933cb481da70cc5a5ef268", - "sha256": "0dkfd4nlc0hxikvby1271y6zppsvcc0jr12m2w1zrng1pqx666di" + "commit": "15964df7c65a3b46d704c85873619fec073eabc6", + "sha256": "1irw05118p835djcvzb2y67avcpryvs6i1p4mp5snygk4n8nl2gc" } }, { @@ -25898,8 +26086,8 @@ "repo": "millejoh/emacs-ipython-notebook", "unstable": { "version": [ - 20220608, - 1138 + 20220618, + 1101 ], "deps": [ "anaphora", @@ -25910,8 +26098,8 @@ "websocket", "with-editor" ], - "commit": "7b9b14435c1dee85dd1eb5faf5d58edfa5ca5cbb", - "sha256": "1k8qj7h0kshf5crpk05q7bmp7pn6mzzbj80vwd0x9w4dwyrw0kin" + "commit": "693373ba193848a1707b8f6c123a46ee9b1d2036", + "sha256": "02q0yxd9p4fj47c4lkqf9c9s00a6hmadycdix6cwllrjjbmaf9xm" } }, { @@ -26020,11 +26208,11 @@ "repo": "xgqt/emacs-el-fetch", "unstable": { "version": [ - 20220529, - 1847 + 20220622, + 2008 ], - "commit": "7dea7aeffa68ede2cb34678ac2734502309ccbe5", - "sha256": "0fk48py9vx1mamwix2p3b20s3l7bfn9n4adqxrzli3810q3xd1mv" + "commit": "15f6af6035ad1f159ac931268ec3431ce4cdf2ec", + "sha256": "0zdjlcfpq8xb871r2m2i8ah08mqpwnm375s42z3qgbccz63v8hy8" }, "stable": { "version": [ @@ -26152,11 +26340,11 @@ "repo": "rejeep/el-mock.el", "unstable": { "version": [ - 20170824, - 1954 + 20220625, + 1949 ], - "commit": "6ebfe64410d54b4cf76f655e416d49935d5e2ceb", - "sha256": "0s04nrcm7y9zljj4sni5ij2b3jciwqrxxscsm1ibchh48i1gffp7" + "commit": "6cfbc9de8f1927295dca6864907fe4156bd71910", + "sha256": "09c3a1771v6kliwj0bn953pxxyjlk6q9kp31cxcr0nraik7d0mhk" }, "stable": { "version": [ @@ -26458,11 +26646,11 @@ "repo": "Mstrodl/elcord", "unstable": { "version": [ - 20220305, - 1234 + 20220708, + 55 ], - "commit": "70fd716e673b724b30b921f4cfa0033f9c02d0f2", - "sha256": "043516j84q0jx558frk8afavdfr52pvwb23viyb8m54422z1psxl" + "commit": "c3c9d318171c2627a64e6f34eed5942e4f5ad369", + "sha256": "1p78rdpin836giqmz479awbjzp6mass3mjrsbxbrp5yak4swhjwg" } }, { @@ -26501,26 +26689,26 @@ }, { "ename": "eldev", - "commit": "7152d735c59f2f0cb7a218fe706c33bee5d9bfb5", - "sha256": "1zhahxxpi71955yhr3dfj3kjvn49g7ghjs6969rwbq6znx6ykckx", + "commit": "570bde6b4b89eb74eaf47dda64004cd575f9d953", + "sha256": "1rhaldvfjz6ai3574yigidnlnbjy5xmv35kwaf87dbcwv8bpydz6", "fetcher": "github", "repo": "doublep/eldev", "unstable": { "version": [ - 20220607, - 2112 + 20220715, + 2010 ], - "commit": "61e3d10df55c8600f3a1f504dd718a1fe368ab50", - "sha256": "1aswsj7b2913v6v22drl3xc5n286xyf7w0zp3681jpmsba1h2xv3" + "commit": "0d2f46eb41180ada741725f9ea2e1272491591c4", + "sha256": "0c87rb8r2ghhj49xdjpiqq4b8222mi3bmmc97m63844zii1fjsc5" }, "stable": { "version": [ 1, 1, - 2 + 3 ], - "commit": "a837e383093dce56b36548b8a91b611b58bdc3fe", - "sha256": "1a7r2r48fb789nackny6y437nng119bwb40apar8m74233iz1063" + "commit": "45ab1502619c8aa389aeaa25b37f40648e697fcb", + "sha256": "1dgbwaar8l8nl79mlzf5g1n49f1j9yj4772yfmim9vv8ppxnzbqk" } }, { @@ -26531,11 +26719,11 @@ "repo": "casouri/eldoc-box", "unstable": { "version": [ - 20220506, - 28 + 20220612, + 243 ], - "commit": "8d523f4fddbd8986340cf76f349ab18c0b3d5581", - "sha256": "0sa97bxkl04s3kg1fd6c6dynp9jklw74jkgny2qhk1d2lzc64bja" + "commit": "39b44c99a02299fc7270f1c1832fb37149f8b924", + "sha256": "077y6dhxs032r9y7b1if9d2113bvhn3j1vinyh8l16fnnd02cxsi" }, "stable": { "version": [ @@ -26908,8 +27096,8 @@ "repo": "algernon/elfeed-goodies", "unstable": { "version": [ - 20220306, - 2253 + 20220614, + 49 ], "deps": [ "cl-lib", @@ -26918,8 +27106,8 @@ "popwin", "powerline" ], - "commit": "6711de66c22360f80fcfd9730293e5f3d419f787", - "sha256": "1c2wqa08wjmqq9kax1akyad23664h5cwdan9mcrn68w6pgqd9rv8" + "commit": "c9d9cd196746add3010d74f43b5c9866562f39fb", + "sha256": "1b80srhravjf791qlx42hmzlprzlf7p8faqn5cljh3nrrridivxn" } }, { @@ -26984,26 +27172,26 @@ "repo": "sp1ff/elfeed-score", "unstable": { "version": [ - 20220528, - 2320 + 20220702, + 1548 ], "deps": [ "elfeed" ], - "commit": "ff8cfdfcb3fce9ecdfe7e58463c5c5814cb3d1c2", - "sha256": "1x909sbwcnjkamhvi0jkd4qy99a971zxc3ydqx3x2k12slhvaczz" + "commit": "ac938fdc617d489eb25f1d8c0bd800bb7693c588", + "sha256": "0d1yh4wv81n5mnrzdi88z0vbs94m7j3q20r5fc1wk35r4hrl3xqw" }, "stable": { "version": [ 1, 2, - 3 + 4 ], "deps": [ "elfeed" ], - "commit": "419de17d681d75789271b8457509fa3f942eab54", - "sha256": "1mx134xj9n73v55i0yjn86zn19sg93m95gqacs2c6dxzq1v3q14f" + "commit": "ac938fdc617d489eb25f1d8c0bd800bb7693c588", + "sha256": "0d1yh4wv81n5mnrzdi88z0vbs94m7j3q20r5fc1wk35r4hrl3xqw" } }, { @@ -27014,15 +27202,15 @@ "repo": "SqrtMinusOne/elfeed-summary", "unstable": { "version": [ - 20220604, - 850 + 20220702, + 906 ], "deps": [ "elfeed", "magit-section" ], - "commit": "1cf73acae8b791e214dc347c2adf7ec17e8ff41a", - "sha256": "0k7g5v616gw5lsl4rga2k7dzha1mjw50sh2fhk4lkgz41z8jssa1" + "commit": "012f6fee58404205f65fb20877eeaa6f1f6c6270", + "sha256": "01kaf9r45vz2g5pw2avklchis5qn2kp9hd8ngp6qm8myfxnd1grv" }, "stable": { "version": [ @@ -27038,6 +27226,44 @@ "sha256": "0k7g5v616gw5lsl4rga2k7dzha1mjw50sh2fhk4lkgz41z8jssa1" } }, + { + "ename": "elfeed-tube", + "commit": "4676a25e2739917f61e6721724ee064d8addca4b", + "sha256": "1499aks5whs1vy4lzwhvdgh6fd25va7v7lqcrgkpn8i4nfq4bbg7", + "fetcher": "github", + "repo": "karthink/elfeed-tube", + "unstable": { + "version": [ + 20220703, + 2128 + ], + "deps": [ + "aio", + "elfeed" + ], + "commit": "5817c91f5b3b7159965aa73839d2a0a08fd952bd", + "sha256": "1w22n54gm8my4r4kvi2id6s2wghsqdazzk168v79kw8kfw32vyy9" + } + }, + { + "ename": "elfeed-tube-mpv", + "commit": "19d77d8b392cfd3c31f1e52e135fc2f59b2d3ee6", + "sha256": "13c13zdfs920rc875pbphj3nxq9qm528ps6dcxgj1c6f9as0w322", + "fetcher": "github", + "repo": "karthink/elfeed-tube", + "unstable": { + "version": [ + 20220704, + 1952 + ], + "deps": [ + "elfeed-tube", + "mpv" + ], + "commit": "5817c91f5b3b7159965aa73839d2a0a08fd952bd", + "sha256": "1w22n54gm8my4r4kvi2id6s2wghsqdazzk168v79kw8kfw32vyy9" + } + }, { "ename": "elfeed-web", "commit": "62459d16ee44d5fcf170c0ebc981ca2c7d4672f2", @@ -27138,16 +27364,16 @@ "repo": "Wilfred/elisp-def", "unstable": { "version": [ - 20210126, - 750 + 20220704, + 2144 ], "deps": [ "dash", "f", "s" ], - "commit": "dfca043ec0cbead67bd9c526cb009daf771d0fa2", - "sha256": "16ryl9idrfpf8whx7srd6a0b3j50qhvc8brkk7iq42p7srr79ly0" + "commit": "7e9c950288d5f90b6f5ab0a9846e29db384f4fd4", + "sha256": "01ipd1if6l320m8hg6xqhmxbd0k6qn7ysfrc0cng02l0y3k8d44c" }, "stable": { "version": [ @@ -27171,11 +27397,11 @@ "repo": "xuchunyang/elisp-demos", "unstable": { "version": [ - 20220513, - 1626 + 20220707, + 410 ], - "commit": "01c301b516e9949d0239d20f6834afbc9acf0abb", - "sha256": "07rjc6kkhhc0y2wwgsv09z66i9qyfl2b189jrxqcha02rw5sb0lp" + "commit": "4b51dff1ee5b6cb9fac946431753489cd96a67b0", + "sha256": "02qp816ll2n3dvy5vwnpr3m959fz37md7mf7dqn84nfwf16g7k16" }, "stable": { "version": [ @@ -27290,15 +27516,15 @@ "repo": "Wilfred/elisp-refs", "unstable": { "version": [ - 20220220, - 2305 + 20220704, + 2141 ], "deps": [ "dash", "s" ], - "commit": "8f84280997d8b233d66fb9958a34b46078c58b03", - "sha256": "026nvkbyacdxdgn5c4c09r7hpwypcimqjvx9vx07klaw6m6s25ba" + "commit": "af73739084637c8ebadad337a8fe58ff4f1d2ec1", + "sha256": "0kbx2dxvbidl2fjxw41hhdhk4iicvdf9zwxmgdr2glrf3sv9ncb5" }, "stable": { "version": [ @@ -27758,20 +27984,20 @@ "url": "https://thelambdalab.xyz/git/elpher.git", "unstable": { "version": [ - 20220530, - 1219 + 20220715, + 612 ], - "commit": "79c241f1ce5d4e4f2ba377485f4434e93391eb0f", - "sha256": "00av8qfxvr9f4jfai7pr7c1sf50m07z6gfxwy3lzvsv6i88s43fs" + "commit": "b42463a49eca1f319bc1830f70295e8f127fb40b", + "sha256": "04mkk3v3vy49cac18dv641cxz120v0wlzkjvwmzlvfx6zr1gnq5j" }, "stable": { "version": [ 3, 4, - 1 + 2 ], - "commit": "bf0dd36eb2f5b339c6b561dbe3ee9693565b484b", - "sha256": "0dv71zc95m5sa4824vk3d1xk726nh2v50i0yp6w3ydfzzsfph6j6" + "commit": "f117f2f53490dbe521d3a726362b37dba0cd418a", + "sha256": "1c6pid2ip2c2lpww42wxgq4qflx1m8vxilyva03h8xzgr39kwq64" } }, { @@ -27782,11 +28008,11 @@ "repo": "twlz0ne/elpl", "unstable": { "version": [ - 20220314, - 1353 + 20220328, + 316 ], - "commit": "32eaec0fc7d20b8acbd4d459bfb8f8b72d75bb66", - "sha256": "1ggb7kx29pg6jph0xrkg00ybqasbak9bld2z2pl0vh1a61bv8vm4" + "commit": "501871ab543b9967bfe87a8a82f83ab96b7f909e", + "sha256": "0yvgq0dllssrbln0c159g02p740r9dhxgz7jyswf7042d8j7lcaf" } }, { @@ -27797,8 +28023,8 @@ "repo": "jorgenschaefer/elpy", "unstable": { "version": [ - 20220322, - 41 + 20220627, + 1416 ], "deps": [ "company", @@ -27807,8 +28033,8 @@ "s", "yasnippet" ], - "commit": "1746e7009000b7635c0ea6f1559018143aa61642", - "sha256": "120xzzaa8jxls3lri6d53zq6gafnkc6d9mlg09an334kkmh8k2fc" + "commit": "de31d30003c515c25ff7bfd3a361c70c298f78bb", + "sha256": "0l28480q1mb5hm4w2135hzppnnw1bh5a864w9p5als2pxn5lsrq9" }, "stable": { "version": [ @@ -28146,11 +28372,11 @@ "repo": "tecosaur/emacs-everywhere", "unstable": { "version": [ - 20220517, - 1401 + 20220628, + 1501 ], - "commit": "0d0d1854299aa50edb3fd57317949c00f3fcbb03", - "sha256": "1x7c4sj7rj17mc3iwim96vn9m9ar04hj6a8lvilf4814lgvz9q4k" + "commit": "cbe56e216df38756de11370535601b5324fdc63b", + "sha256": "1xdahfnrvfda427grv69agx4ry3mq30nyz1ay01a23ijjlrf4q58" } }, { @@ -28479,11 +28705,11 @@ "repo": "oantolin/embark", "unstable": { "version": [ - 20220608, - 17 + 20220704, + 37 ], - "commit": "63f0d4dc09afb058450dc10dd3916027a93ee487", - "sha256": "0q8l4ckdmcagiiccvb0s94gc1lywgqh02d8p16ygpcfxz8967w4a" + "commit": "5d0459d27aa7cf738b5af36cf862723a62bef955", + "sha256": "15zk4y43yf58hsh24slszajx40ab0qhha4pwm8fya0wl34cphkzd" }, "stable": { "version": [ @@ -28502,15 +28728,15 @@ "repo": "oantolin/embark", "unstable": { "version": [ - 20220526, - 1525 + 20220704, + 37 ], "deps": [ "consult", "embark" ], - "commit": "63f0d4dc09afb058450dc10dd3916027a93ee487", - "sha256": "0q8l4ckdmcagiiccvb0s94gc1lywgqh02d8p16ygpcfxz8967w4a" + "commit": "5d0459d27aa7cf738b5af36cf862723a62bef955", + "sha256": "15zk4y43yf58hsh24slszajx40ab0qhha4pwm8fya0wl34cphkzd" }, "stable": { "version": [ @@ -28525,6 +28751,27 @@ "sha256": "1s0ssf4q9kg4c5w87h2ypyvrhi31mz3s6k4h7pxi9a47lkccq8n1" } }, + { + "ename": "embark-vc", + "commit": "69145c00a0903f876cdc2a76c2aa57defb300678", + "sha256": "05pcr1znlfrls9cr76sif6wiinkd0bz2h06csv508w880h8lb1r5", + "fetcher": "github", + "repo": "elken/embark-vc", + "unstable": { + "version": [ + 20220703, + 1008 + ], + "deps": [ + "code-review", + "embark", + "forge", + "s" + ], + "commit": "6124909d8b07c70a0eb3bcaf47f1c3a28698528a", + "sha256": "0rcnmqvsvwwqa8f9j4jflk9b15l4577ay3q2c3mdhx46g3q1c9cx" + } + }, { "ename": "ember-mode", "commit": "9ac1eef4ad87b1b6b6d8e63d340ba03dc013425b", @@ -28658,28 +28905,28 @@ "url": "https://git.savannah.gnu.org/git/emms.git", "unstable": { "version": [ - 20220422, - 1318 + 20220714, + 1758 ], "deps": [ "cl-lib", "nadvice", "seq" ], - "commit": "22f3d9e5359c565b33f55715f90fbde35e4f675e", - "sha256": "17lkc5r0zg7374fv9fqmnpdwvcyjl6q61gnwrvj3wc7ng5njjihh" + "commit": "061b36c5627706b2a7e4a636ed9644bb68e800bb", + "sha256": "0vhlz7gms0az1flxfhbmp67889spkrjcnga770c45dk61qr45757" }, "stable": { "version": [ - 10 + 11 ], "deps": [ "cl-lib", "nadvice", "seq" ], - "commit": "6afe1b26d679357586380ecd69c9795985231013", - "sha256": "03cb4v50cxbprl695r9812zl35y5a8sdk7q8byflrlk6arihgrxy" + "commit": "912024027e797d2671b4a9ffbfc9f634b8f7aa84", + "sha256": "0hkfjqhfjrggmdnsbi4z742qf92kw40jm3yciypd4j811lkiassk" } }, { @@ -28922,8 +29169,8 @@ 20160726, 1924 ], - "commit": "8f159e8073b9b57a07a54b549df687424eeb98ee", - "sha256": "1hwikjy4ah1zkb4aknc9yni3d9cqgvnh5n955bdljyp0lvpvvhpr" + "commit": "75d8ee5b9d2117e30f02c6ce9c608a005aee5d86", + "sha256": "0bd4ygpslwj2fl2r1c5cnk13c6k5hi7d923j3fi4ajbvm8qzzg6f" }, "stable": { "version": [ @@ -28943,15 +29190,15 @@ "repo": "jcs-elpa/emoji-github", "unstable": { "version": [ - 20200825, - 425 + 20220704, + 648 ], "deps": [ "emojify", "request" ], - "commit": "f683f95ceae812c77c54d398e0dc02c6da4ae17f", - "sha256": "0ghv79g1iirqzy1d10ywspcdcbb5br4vd86fxg44bk4iw7jn40ng" + "commit": "caaa3a10a9c44aba74f4964b04169b0adedeb2f9", + "sha256": "0hk872z33ghv3ppddis83q37qz2iyc3asvw67fr5sfi891hfrswk" }, "stable": { "version": [ @@ -29159,11 +29406,11 @@ "repo": "zenspider/enhanced-ruby-mode", "unstable": { "version": [ - 20220426, - 1750 + 20220707, + 1949 ], - "commit": "f240ac00ccbbd0916b5e3d272c0064a26f527ef8", - "sha256": "0xh0849sr87zbmf7pqgaix6rbwsmkwpw1vqcvl9mxjqlr2ay9y05" + "commit": "23ee0e8690a157d9c81d7aec179c82f0bba309b8", + "sha256": "0rsx48lkv9j9gc9mx6ky65z8ab88fxf06ffyqvxxibnb9idjsmy6" }, "stable": { "version": [ @@ -29567,14 +29814,14 @@ "repo": "emacsomancer/equake", "unstable": { "version": [ - 20220607, - 2211 + 20220627, + 2248 ], "deps": [ "dash" ], - "commit": "1f1f269edd27ffce8b6ead5b317e49fa433b039f", - "sha256": "0am0lixinl10x6j62hz86wg0pdminmm74vfyklzxh0yhvbvlcc5l" + "commit": "25d2bb9b60fdfae72990d8971be3db593ca4266b", + "sha256": "0b2a9qvqxhm2z4zb4qg6d5h0pp82hdmjl8qnk03zr1awi5angiyv" } }, { @@ -30062,8 +30309,8 @@ 20200914, 644 ], - "commit": "6385f850a185523bb5241a71f5a7614a148f6b53", - "sha256": "0dllhhbr265dm12nkiil0s7cb24l7pjdjgfwgcsy98imn8pl8z4p" + "commit": "5d30d8e7a25dfced02edefd82699f1f7b6f79316", + "sha256": "022jzidrgx66k40i25wd49p8q9gh8x7s2m7qnxpqcfjbmgdy624p" }, "stable": { "version": [ @@ -30078,8 +30325,8 @@ }, { "ename": "erlang", - "commit": "d9cd526f43981e0826af59cdc4bb702f644781d9", - "sha256": "1cs768xxbyrr78ln50k4yknmpbcc1iplws3k07r0gx5f3ca73iaq", + "commit": "570bde6b4b89eb74eaf47dda64004cd575f9d953", + "sha256": "1v3iq8wg71g5qf0ypz9h89pq1z02v5clp4sfpcsqppz0x5wp7dr2", "fetcher": "github", "repo": "erlang/otp", "unstable": { @@ -30087,16 +30334,17 @@ 20220215, 1844 ], - "commit": "5f870f8af2d4cad995589414aa5eda92486fa508", - "sha256": "1w0lyvx1fdi3qgkc4fc61rabp1j6qscnm3m26k887q8gwl8k5ss3" + "commit": "34d362faf2a6272280b52585a5570a04d7fd63e4", + "sha256": "1n3x4906iwgw34pvkjc8sv0pzznnj4hp0j2fjlnk2kifi977ay97" }, "stable": { "version": [ 25, - 0 + 0, + 3 ], - "commit": "4ed7957623e5ccbd420a09a506bd6bc9930fe93c", - "sha256": "1nf72yiirdpxcs8m10xc04ryghxxc73x954x38m5a6fhv2hfhp2n" + "commit": "89c04fb1836fb865565125a4d5880b93e784d856", + "sha256": "0zchcm7gv52j30fq5p658h9c593ziirq09kkah6mpsvjfdsmvmgl" } }, { @@ -30107,23 +30355,26 @@ "repo": "k32/erlstack-mode", "unstable": { "version": [ - 20210419, - 1917 + 20220617, + 2049 ], "deps": [ "dash" ], - "commit": "ca264bca24cdaa8b2bac57882716f03f633e42b0", - "sha256": "0541q21srscy8x7w4f8vbag1nsjksv9i1wi6sq5xjqnrl0piyv4k" + "commit": "a4a30f74e48894ccfdefc073a9e1b005ee632017", + "sha256": "132w9xbdc6r7sa03wpyd0vpn0z12pgawv4r21ihpgqpqmk4srrj3" }, "stable": { "version": [ 0, 1, - 0 + 1 ], - "commit": "07398e929978b0eaf2bf119e97cba7b9f9e90d2a", - "sha256": "1gf9k3z9v1s7d01s551ys87j05xh3lpnvv86dq86rz8xinc09kac" + "deps": [ + "dash" + ], + "commit": "a4a30f74e48894ccfdefc073a9e1b005ee632017", + "sha256": "132w9xbdc6r7sa03wpyd0vpn0z12pgawv4r21ihpgqpqmk4srrj3" } }, { @@ -31038,11 +31289,11 @@ "repo": "emacs-ess/ESS", "unstable": { "version": [ - 20220509, - 801 + 20220629, + 1607 ], - "commit": "e83ac622fe7e3cbfc848481a9257e5ed5c7b5afb", - "sha256": "1qi399iidac2hbz1c2ydqcbfcqr5f7ldgqbhchk96az2l41yb6sp" + "commit": "1069abd4e241ebc223e15c2060d1818ac772c845", + "sha256": "1x4fbjfkynnqfg9l8660m5zh47a0irsxlir0fvh1cq6yp0hwkw1r" }, "stable": { "version": [ @@ -31098,14 +31349,14 @@ "repo": "ShuguangSun/ess-r-insert-obj", "unstable": { "version": [ - 20220531, - 31 + 20220610, + 1406 ], "deps": [ "ess" ], - "commit": "105a8edf97cc1e82ce1e959e7b7bd049851a255a", - "sha256": "02ydx9l074wl4f57b0l7lv2vnjvj8rbzppjd2gqh5g7gpy9lggv6" + "commit": "2ded9c23d0af2a7f6c0e02f9ea4af0e5b3cb7fb4", + "sha256": "1rc9hk1jsdfdlq1vfbz8yvg47qvyk19y2ki1w7qsvm8v3sviw959" }, "stable": { "version": [ @@ -31206,15 +31457,15 @@ "repo": "ShuguangSun/ess-view-data", "unstable": { "version": [ - 20220124, - 1430 + 20220610, + 1406 ], "deps": [ "csv-mode", "ess" ], - "commit": "6277684e06d5c3a2cbd340f656b7ffca4046e45b", - "sha256": "1ijxrcfbk8l1jbij9nc7b9j2nk3k5imvjbs5319z85q10k5cz7f9" + "commit": "aab369f84cadebbbca7c3825741d643ebeb6b722", + "sha256": "12f7vinplb9j5yks52cgdjgi242vq6a0404ddlmmj6d131bj3gny" }, "stable": { "version": [ @@ -31423,8 +31674,8 @@ 20201106, 2059 ], - "commit": "035c7d698c99e3891a522d6e6f8fde23c6267c15", - "sha256": "18wdk9bi822lx2ip9g1v443sc6qzq3zvxmyg32nsf6v85102z19k" + "commit": "d205f7781f18f6746d50e562dc5e3595189ccd64", + "sha256": "0979lmrfx2wzv35l4wjw6xk6wipankpqyr2xsss0qvi24dddmm7g" }, "stable": { "version": [ @@ -31656,15 +31907,15 @@ "repo": "emacs-evil/evil", "unstable": { "version": [ - 20220518, - 859 + 20220705, + 1432 ], "deps": [ "cl-lib", "goto-chg" ], - "commit": "157af04d2cf466e301e82b0e667c5e7203fd96a2", - "sha256": "1aqavbxg5656ycjia2pbsvif3zaf0r99v87cym6442pszhdv2hsy" + "commit": "0e501d17c5dc2944f23fe5046b030d0c641665c5", + "sha256": "1iqj8ja7nhp0mh9nih6fmf68xf6qnx24bnyi6gjsdj3df1j7xps3" }, "stable": { "version": [ @@ -31857,15 +32108,15 @@ "repo": "emacs-evil/evil-collection", "unstable": { "version": [ - 20220607, - 105 + 20220712, + 758 ], "deps": [ "annalist", "evil" ], - "commit": "79fc09b0140311377726551ee31622f61d28c571", - "sha256": "05q9fqcj1fq8dqg014i5kk0zwh1d5q13m35052276pjmkgfnfrk7" + "commit": "9cea83273c1af812e2e3feab1ec13ab54aba25a0", + "sha256": "10lnf016qf8wb3wxhky2j2hfni58b2d2m1p97v21b0jwiga7bzcj" }, "stable": { "version": [ @@ -32328,8 +32579,8 @@ "deps": [ "evil" ], - "commit": "4da660e124731ed65e7aaa6c067c30e876619429", - "sha256": "0akhw0a9qsk65lvanb57fqh7hf601xdzkbyi560ximfrsr7f94pi" + "commit": "a55eb647422342f6b1cf867f797b060b3645d9d8", + "sha256": "117in7swc7hljksdkhqhybj7m47d4aif14valpxiqbh45bf9zai2" } }, { @@ -32591,14 +32842,14 @@ "repo": "juliapath/evil-numbers", "unstable": { "version": [ - 20211011, - 103 + 20220711, + 930 ], "deps": [ "evil" ], - "commit": "08f0c1ee93b8a563770eaefaf21ab9087fca7bdb", - "sha256": "0pcacrfvvk6ra9dgq84fdcsh5ziwk78k8dmr2c442fvr2lzch4yn" + "commit": "61dde4e3715fd1255df8f87a37d9c8022e909bf4", + "sha256": "006s8azhypp5n7jnvqkb4rmzqmnsdwj87c3r97zhjzgi2jq953gx" }, "stable": { "version": [ @@ -33153,11 +33404,11 @@ "repo": "7696122/evil-terminal-cursor-changer", "unstable": { "version": [ - 20220514, - 258 + 20220628, + 1831 ], - "commit": "81ede5cfa5d8944aa4777987c846a27e28457266", - "sha256": "01q3h1dmhpcjqs9zchq7wfpibd49pycfnrpn0gj0sh5bspzrqfm7" + "commit": "12ea9c0438c67e560b3866dc78b5c7d1d93f8cc5", + "sha256": "0fz86zmy7wc4rjgx543sf3igrjvyjx1zbd1fw9qq4m2ksp4ld7ik" } }, { @@ -33174,8 +33425,8 @@ "deps": [ "evil" ], - "commit": "157af04d2cf466e301e82b0e667c5e7203fd96a2", - "sha256": "1aqavbxg5656ycjia2pbsvif3zaf0r99v87cym6442pszhdv2hsy" + "commit": "0e501d17c5dc2944f23fe5046b030d0c641665c5", + "sha256": "1iqj8ja7nhp0mh9nih6fmf68xf6qnx24bnyi6gjsdj3df1j7xps3" }, "stable": { "version": [ @@ -33377,15 +33628,15 @@ "repo": "meain/evil-textobj-tree-sitter", "unstable": { "version": [ - 20220527, - 1400 + 20220715, + 1530 ], "deps": [ "evil", "tree-sitter" ], - "commit": "fba268b2fd15657404da308b3e91efa87d9f15be", - "sha256": "0av546si5h8ka9qm07sqwfklq6d864di16cfwg80g4s7anhh7f11" + "commit": "9dce8dab68c954ae32095328cf898eb856fc341a", + "sha256": "08s2za167a76p6z40cdpi1b10968sf4mvwgm0sinvqh26pqqz9n4" } }, { @@ -34062,11 +34313,11 @@ "repo": "extemporelang/extempore-emacs-mode", "unstable": { "version": [ - 20210512, - 2350 + 20220704, + 2241 ], - "commit": "eb2dee8860f3d761e949d7c2ee8e2e469ac1cf51", - "sha256": "0ivb3c00jlqblzjxw36z3nmqqvv2djyzk69yhlzjw2nl2r2xmhnd" + "commit": "92e0fff482a0a4dc2971c39581c5ea9e84ae5e1c", + "sha256": "1chxl2x9wjblhfknx7aa8pgqppc60917n437bxapx4hp3275x16q" } }, { @@ -34584,11 +34835,11 @@ "repo": "WJCFerguson/emacs-faff-theme", "unstable": { "version": [ - 20220527, - 1238 + 20220629, + 1216 ], - "commit": "cb0ce3ef4430eda81aa6225f7083beb8ae03a425", - "sha256": "0zq8k1ggv40fdz6a5ri5nxg7yznvlwx7j3cpl7gig1v1p97h0b8k" + "commit": "5d3c7e2f32f4dcdb22865c385ec48ababe5f293a", + "sha256": "0a2d3h6xmgi06p10yw0c6y1z2mgb11ikxp1afp6lffx8i2dlx1l3" }, "stable": { "version": [ @@ -34715,14 +34966,14 @@ "repo": "condy0919/fanyi.el", "unstable": { "version": [ - 20220519, - 105 + 20220702, + 812 ], "deps": [ "s" ], - "commit": "b09d122a17724668f73d44b9fe0b47add7f596c1", - "sha256": "1ys3aymskjsrvkqq3k91ml1rxms8bp64i9r4q4ya5k8xdz828m5z" + "commit": "07815b29decc08994e7b6ae24be188047531b1b9", + "sha256": "01qnlfcjf7gr0bax94b6s79qf6r3pkvv2h30kmkz630x8a6wsgzf" } }, { @@ -35084,11 +35335,11 @@ "url": "https://git.sr.ht/~technomancy/fennel-mode", "unstable": { "version": [ - 20220510, - 748 + 20220701, + 1956 ], - "commit": "0e9ed013a163d91993a2883ad5c37c02694c2b92", - "sha256": "0rdrap1kyj0csaa25d46xvb5hgbwlcqvmwrq6yicmbsnpdrwpwy7" + "commit": "5664357349462d0564c0bb55cb289a6722f0ecbc", + "sha256": "11l6qhjbmi2367g12gz0rific7ji4qvqxwv76371rawsxbmrv29p" }, "stable": { "version": [ @@ -35123,15 +35374,15 @@ "repo": "jcs-elpa/ffmpeg-player", "unstable": { "version": [ - 20200720, - 1028 + 20220704, + 641 ], "deps": [ "f", "s" ], - "commit": "cab1b591a541f2a5ee25529572c6895e7f78cc4f", - "sha256": "1zziwgx9w76sww9wcnfvj1msmcp3z5lxgv8pkc0szp7a1ckm07hi" + "commit": "fad2f5ce83800b7ddcd5927bd84d377990446981", + "sha256": "08mcbxiqq445cgbgib39c701216ifp9dsk8m4gdbbn9iam3vj3bx" }, "stable": { "version": [ @@ -35301,11 +35552,11 @@ "repo": "jcs-elpa/fill-page", "unstable": { "version": [ - 20210707, - 354 + 20220704, + 650 ], - "commit": "1191c3454c8ae10aafe9ae08e98563948284c677", - "sha256": "1dbxnl14mzxij6209qsa69zbxp64qkz0q2pkayxl6fmi4s2sp3rs" + "commit": "7da1dc1259c1b15e28736d27d87f4cef40a3a18d", + "sha256": "1ryxay5pdwvcdz85wwmxsdpi1cjr38ybfawgg2pxcbyqizydlyry" }, "stable": { "version": [ @@ -35451,11 +35702,11 @@ "repo": "redguardtoo/find-file-in-project", "unstable": { "version": [ - 20220430, - 107 + 20220702, + 1332 ], - "commit": "38ebbc21e32a6e616d315f5f898df4ca825f916d", - "sha256": "1hla8vvm8ia9rxsrrcwh8adg9ygnlpw9s1jci58jbiq2a0ng3mkp" + "commit": "677352621db8bf4a28be4e7a1c73dd3ce111f02a", + "sha256": "0pw373r9ffgkby8k0mwwxrwcb6zq2bk4kij62lqcjkf9bwkd4ghi" }, "stable": { "version": [ @@ -35573,8 +35824,8 @@ "repo": "LaurenceWarne/finito.el", "unstable": { "version": [ - 20220427, - 1932 + 20220704, + 1022 ], "deps": [ "async", @@ -35585,8 +35836,8 @@ "s", "transient" ], - "commit": "a0fe025086046aecf5490c993afe9e716324f7e5", - "sha256": "0g5pv08mv4c9jscsp1cyldwi3xdyppys6m1bsq293v5kk38agmdf" + "commit": "508f6699795528c579b235f4f7726b5aa5ad9595", + "sha256": "1raq1l4ixap83n98wf7a7dzd2mx2i1mgfsksim00x1qy9fpr5qar" }, "stable": { "version": [ @@ -36153,8 +36404,8 @@ "apel", "oauth2" ], - "commit": "289e5bbd66f6f14306a6e0b922ee8f26267e2470", - "sha256": "00w0381nngj497jf240zrh26hhanm6fn9xl74k1f94crsfva3ccq" + "commit": "f8dcbb8b4e6fa0d72212d478fb4a1e74804a2aa8", + "sha256": "1ld9srm0vzjqld2rcm5dyyk1prw0xhj5ladkdmrk9zq4jqflxchr" } }, { @@ -36447,8 +36698,8 @@ "repo": "flycheck/flycheck", "unstable": { "version": [ - 20220514, - 1743 + 20220612, + 1800 ], "deps": [ "dash", @@ -36456,8 +36707,8 @@ "pkg-info", "seq" ], - "commit": "66a973afca1d03b8284baaa7590eb2b8615a1e6a", - "sha256": "1acvldcdac11p92c47a25q5k3lxsibigr98b3b2zcmf5l90l0y49" + "commit": "c955fd6fb970eed5fdecf675369d3d61a41f6c68", + "sha256": "1dcacgzh7hxvsyw7hjc5l2qdy8p3nrgfx5rlzkv57j06h075nq5l" }, "stable": { "version": [ @@ -36788,8 +37039,8 @@ "deps": [ "flycheck" ], - "commit": "6fb8d0204b0293478b5565e378797acab1f2e038", - "sha256": "1f1sg9rv91hgwzwx8nrc15nvk7m1hxm0f25gh592vjr6yy2n668r" + "commit": "ff7bed2315755cfe02ef471edf522e27b78cd5ca", + "sha256": "0h0cbiifzjfm5ymwf98h6nlkaqavdlxvccdsb1h0yf4246scf251" }, "stable": { "version": [ @@ -37367,14 +37618,14 @@ "repo": "flycheck/flycheck-google-cpplint", "unstable": { "version": [ - 20210210, - 300 + 20220616, + 1802 ], "deps": [ "flycheck" ], - "commit": "71109b55b3809b8e3be827cec1b61914adf6b45b", - "sha256": "0xr6v7ah9a1qr3x4a6ajk2p0mqs7jcx0d6bwm49z2sfx2nz88kz9" + "commit": "93c5b26ec55d0df54bc230e2de0890fe074f35d3", + "sha256": "0f0713a0d9l92cy6xc5y1cg4pg88kq58krlz37bkfq3s20yfz097" }, "stable": { "version": [ @@ -37444,16 +37695,16 @@ "repo": "emacs-grammarly/flycheck-grammarly", "unstable": { "version": [ - 20220228, - 731 + 20220704, + 625 ], "deps": [ "flycheck", "grammarly", "s" ], - "commit": "46584fee0a8e72c2b1687f4a4ec45feb1bcb1607", - "sha256": "1hj259iz1n07vj7jw4000l8hq8l4ivkys6xisb3apixr03sz8zg5" + "commit": "fccdba6a6bfb043031a43c62b3c5b635d52bf723", + "sha256": "0f26x7ssvagpilv30hn7wc106m4jbf6qha26jzym4ymyfwj0b503" }, "stable": { "version": [ @@ -37575,14 +37826,14 @@ "repo": "DamienCassou/flycheck-hledger", "unstable": { "version": [ - 20220323, - 726 + 20220715, + 1115 ], "deps": [ "flycheck" ], - "commit": "87b275b9b3d476b5f458e85e760f3f7fa3e66775", - "sha256": "0l4xqrjzz2spld624zsnnx7bqsiyqhfd3wixcjh7rjshiaf5vhb5" + "commit": "c360025b8433abc4da89b0bfcc7ed1ff27004c64", + "sha256": "1q5fggyshzm6r3cg2wdrj5zx2jskx2dn0kdwdwmw6k0vvx0anxh4" }, "stable": { "version": [ @@ -37872,14 +38123,14 @@ "repo": "emacs-languagetool/flycheck-languagetool", "unstable": { "version": [ - 20220402, - 1703 + 20220704, + 637 ], "deps": [ "flycheck" ], - "commit": "e866e3ac1bea1ef7078a6aa926abbee9ca598e5b", - "sha256": "185lgdvvhnps626c50xr5r45pyvy131hn24mgm39n6gqpcmlgxhh" + "commit": "8dca25f9fa79d6871fef9fdeeb1858474a8e9f0c", + "sha256": "1w1w049zcid8l2f0qyqv1g8sfbnwsbp28vkriwcnxywn9vmi4pzc" }, "stable": { "version": [ @@ -38255,8 +38506,8 @@ "flycheck", "phpstan" ], - "commit": "0869b152f82a76138daa53e953285936b9d558bd", - "sha256": "1xm5i658pf1lb4bfpy6zy5msanhia8r9j7v7rx72amkksja3hwnj" + "commit": "4f990bf51cc65b3bdc63f4991e007d03b76932a2", + "sha256": "07iqv6jd7a49vmfp4fz9dwvxhhl50wkpyisazr2rxwfs9i72n00m" }, "stable": { "version": [ @@ -38325,8 +38576,8 @@ "deps": [ "flycheck" ], - "commit": "2d5b72903e69e1e5eec2d03b9006a62fbbf75233", - "sha256": "10s5v97sg0mb8wls9j0vvi626v2ay05f98xjxymfm7n6957k2wm6" + "commit": "205143d22902521b4f1f03e7d49d17c62338dea6", + "sha256": "1cgdqbkfcq3nd8jybhbjfna75wmqfy5zpb9ip1gdli0r700idsm2" }, "stable": { "version": [ @@ -38412,15 +38663,15 @@ "repo": "alexmurray/flycheck-posframe", "unstable": { "version": [ - 20210316, - 618 + 20220715, + 133 ], "deps": [ "flycheck", "posframe" ], - "commit": "8f60c9bf124ab9597d681504a73fdf116a0bde12", - "sha256": "0qh9hzvs95jvfrspglzkwhfq6a5pinab94bbh5vzkg8jc2fq6drf" + "commit": "19896b922c76a0f460bf3fe8d8ebc2f9ac9028d8", + "sha256": "1cdxabqmp8cijzsc3a7qbacqj11cxpimsphrpqnwk3x5y0y83nlj" } }, { @@ -38635,8 +38886,8 @@ "flycheck", "rtags" ], - "commit": "db39790fda5c2443bc790b8971ac140914f7e9c2", - "sha256": "05cigdvlq5lfahr9a1z8rvlw2s99j4pha2in59pshz9ph8cqgq10" + "commit": "c628efc9b485470a48aec2692d79f7c140bc5b92", + "sha256": "03avv7brbrj69368riq3xg4qh65yzl5cyjn9wc2rbyx4jw2q3p4p" }, "stable": { "version": [ @@ -39131,15 +39382,15 @@ "repo": "mohkale/flymake-collection", "unstable": { "version": [ - 20220410, - 1343 + 20220612, + 1340 ], "deps": [ "flymake", "let-alist" ], - "commit": "46afe132148da1e3f989e25b00ee17ae4bf1716c", - "sha256": "046kmnfid30bwihfzp6mv7ya4vf48b8isfq6hm7y15925y695cg9" + "commit": "cd2574574bda1f3d94007cdc3b7e0f8007d69716", + "sha256": "0js7y1ph6r1xgaziggbx7v8jimxyz29fvlzgaq5rbd6ni332jrn5" } }, { @@ -39185,8 +39436,8 @@ "deps": [ "flymake" ], - "commit": "99fcfbd002dbfd99ab66910265507bf767f52ce6", - "sha256": "0ik8rpw1gqrzc7p5ky22clprhvpd0a5i5zrb1p4fnwcywa5mzqr2" + "commit": "d3c632f26a2d13fb288252c288faaf8107b3d86a", + "sha256": "1xylljq1j71xr7xmykk2pl816f8lkxf0314ghmhlfx0pxir9xpih" }, "stable": { "version": [ @@ -39406,15 +39657,15 @@ "repo": "emacs-grammarly/flymake-grammarly", "unstable": { "version": [ - 20220222, - 638 + 20220704, + 626 ], "deps": [ "grammarly", "s" ], - "commit": "2c5711952922358ea9ca9a7351eb45588238f661", - "sha256": "0l0fc2qsg77gv0kha45q6il74xvi0vnh42fkr01dhyf0g1bq4mpq" + "commit": "7ad726f27031fbe816885632155851cc2cfcd522", + "sha256": "0yzandkqkwnsqm3mahq03l6ki45v8g5hz9fz6krnyg82n5bx32zh" }, "stable": { "version": [ @@ -39669,14 +39920,14 @@ "repo": "emacs-languagetool/flymake-languagetool", "unstable": { "version": [ - 20220512, - 2355 + 20220704, + 637 ], "deps": [ "s" ], - "commit": "5f9eef8fe3f342f17593e0caeaba906ba7cab24a", - "sha256": "1mz18inlv78lg40jgq68qq3v62b6mgmz89lcgczg93lyfh81pjp3" + "commit": "857f4f94a7615d7de5305a40045b2b85ae1ff760", + "sha256": "1kmqk7hq07lclnbcmwhwnsbrn4qj4qkbq9kimfc0vy7fcd7qb79p" }, "stable": { "version": [ @@ -39792,8 +40043,8 @@ "deps": [ "flymake" ], - "commit": "2e98ef45d764cd8d4e146097ff763c5ec92c6570", - "sha256": "1mckr39zgx2f0n56iw4mmy26bayb1y0wjcrr6nnxpbl6jr28rqvw" + "commit": "394b961b27b1fddc3c7107046a53d47f58757300", + "sha256": "0rv1i02lg9x5iidmx6bhf6qw22xv8gmnrd3pspnv6xc7p3bq4gwl" }, "stable": { "version": [ @@ -39881,8 +40132,8 @@ "deps": [ "flymake-easy" ], - "commit": "abee6b8f50a631e5bc52499b938fcfd88f958a44", - "sha256": "0vxi77x11ipsgyy008b9gwav7psdv0wx3bg07sbg6fmhaa3y4fqi" + "commit": "1c57813235fb4b1561cadc94b44635b2b612b874", + "sha256": "0c96x0l487a96xkgdasgpp81vjiai31cd5chwgsfyaz9bnw8zdh5" }, "stable": { "version": [ @@ -39910,8 +40161,8 @@ "deps": [ "phpstan" ], - "commit": "0869b152f82a76138daa53e953285936b9d558bd", - "sha256": "1xm5i658pf1lb4bfpy6zy5msanhia8r9j7v7rx72amkksja3hwnj" + "commit": "4f990bf51cc65b3bdc63f4991e007d03b76932a2", + "sha256": "07iqv6jd7a49vmfp4fz9dwvxhhl50wkpyisazr2rxwfs9i72n00m" }, "stable": { "version": [ @@ -40726,11 +40977,11 @@ "repo": "Lindydancer/font-lock-studio", "unstable": { "version": [ - 20170127, - 2051 + 20220629, + 1909 ], - "commit": "12c35967b31233e06946c70627aa3152dacfe261", - "sha256": "0q0s6f5vi3sfifj7vq2nnsmgyyivp1sd3idk32858md5ri71qif0" + "commit": "78472ae1f65721b4da17756ee7e506f3d0487033", + "sha256": "0gyzl2rz9kzrpvb3pfkcwbd0b7rxjxlklzc7zfh7ch6xxg0ghslw" } }, { @@ -40939,8 +41190,8 @@ "repo": "magit/forge", "unstable": { "version": [ - 20220526, - 1854 + 20220622, + 1929 ], "deps": [ "closql", @@ -40954,8 +41205,8 @@ "transient", "yaml" ], - "commit": "66b3993c98c724e0d3e6411036ccdfab95c7a504", - "sha256": "0mfg16vb006avbgw8gygylbqa74cp1fp5cfdr2mp32z6fc77sqcd" + "commit": "ed8abdafd8b15852538bbe064fef037345772627", + "sha256": "0kdj2x3sj7iy9xs2qzw0p7vm2hi7r0brcnqyjwirjj4x5jr6ag61" }, "stable": { "version": [ @@ -41010,15 +41261,15 @@ "repo": "lassik/emacs-format-all-the-code", "unstable": { "version": [ - 20220510, - 2108 + 20220701, + 823 ], "deps": [ "inheritenv", "language-id" ], - "commit": "828280eaf3b46112e17746a7d03235570a633425", - "sha256": "157bn3s0lrmfjzp7a8sw8sqbblp5r85yaqb1phjk0prvdn798q2n" + "commit": "aa22b06283382baf73d78064fcfd6c2f075ead5c", + "sha256": "0fl68l5qcf78z7m7hwb4089vqa0py46fbv9rzars450kpkc82hhg" }, "stable": { "version": [ @@ -41095,11 +41346,11 @@ "repo": "larsbrinkhoff/forth-mode", "unstable": { "version": [ - 20220402, - 2103 + 20220629, + 519 ], - "commit": "122a9916c1ad1f1e3f4888951e1ad92a2fc10804", - "sha256": "1fb99l3kmxhhd9dyl99wy48b0r7zz5279nf4iargv7641xwkksy8" + "commit": "162b79f005a64b1f91e60b8f4c022d1d90cd3d95", + "sha256": "09x4ghfk1wri7awfmhk5l2xgidx590g979n5qk16ydk6f87nlxw0" } }, { @@ -41161,8 +41412,8 @@ "deps": [ "seq" ], - "commit": "fba17c2b316122e26292ba995f1c62191b7b3eb0", - "sha256": "1ryj8qm8zgbms98vbzj728f57mq92vf8rp04aql4zq2ryzxv2rnd" + "commit": "67d8d1f050cbdb19baa37f26401f958bc7597910", + "sha256": "0w38g2l9cx8gqakz0bv75vmrcwjd6hqi7x4j41sa80whmj0mh385" }, "stable": { "version": [ @@ -41462,8 +41713,8 @@ }, { "ename": "friendly-remote-shell", - "commit": "de68633dae1e07006ae7b043c9264d9b8d08d377", - "sha256": "0ja0xgxs26sk2mx57wqb3schmw8ms01sdla260c96ilmy1qj6fvq", + "commit": "570bde6b4b89eb74eaf47dda64004cd575f9d953", + "sha256": "0l6zlwqs94ab2y14l9i26m1b6dlzcvwnnkhad0nxxvn9838ia5ma", "fetcher": "github", "repo": "p3r7/friendly-shell", "unstable": { @@ -41498,8 +41749,8 @@ }, { "ename": "friendly-shell", - "commit": "de68633dae1e07006ae7b043c9264d9b8d08d377", - "sha256": "1xpfykkfrm6gg6p0rjp1hfnjf4k4n6k3v5kxifgbxld4hjl9223d", + "commit": "570bde6b4b89eb74eaf47dda64004cd575f9d953", + "sha256": "1i6z99169349mp1rcxigmaq2ww69cc9f9b65wv6slmczbmbr3crj", "fetcher": "github", "repo": "p3r7/friendly-shell", "unstable": { @@ -41531,8 +41782,8 @@ }, { "ename": "friendly-shell-command", - "commit": "de68633dae1e07006ae7b043c9264d9b8d08d377", - "sha256": "0hsnn18zxwqvk5zpp5kf8mlfya6if0npnfm0crvwqqsipx9nj8v4", + "commit": "570bde6b4b89eb74eaf47dda64004cd575f9d953", + "sha256": "1qnsrp07v3lkxygkq8v7sfxkb3c251ir8zzkfmg7i0vl5i2yi31w", "fetcher": "github", "repo": "p3r7/friendly-shell", "unstable": { @@ -41595,17 +41846,17 @@ }, { "ename": "frimacs", - "commit": "80c47d487c434b7e551a265b32e49da6baa818b6", - "sha256": "0lg5yarriaab4x1zsdfhfci3sivmj2gslwvnc35jmhp2jq4fa9q9", + "commit": "570bde6b4b89eb74eaf47dda64004cd575f9d953", + "sha256": "1dn9z70qv00mb126l28ckvy33y39kvnng0i9nf71wsblgy234fib", "fetcher": "github", "repo": "pdo/frimacs", "unstable": { "version": [ - 20220602, - 1847 + 20220702, + 1004 ], - "commit": "4713aa13c96183bccaeccc135b932f94522c2c05", - "sha256": "02i6niy6axhwdxw56vqqcnin9iba8vblnmf0fprk06rwlxyj7svc" + "commit": "978665a47314f385850097442a3838ad7f3b688d", + "sha256": "1bvjk3g0rcjxn4anwvkd72r4phd534md350h1ryxr0frvgrpkcd1" } }, { @@ -41724,24 +41975,19 @@ "repo": "fsharp/emacs-fsharp-mode", "unstable": { "version": [ - 20220605, - 1329 + 20220630, + 1931 ], - "commit": "c7842fe63b8bae5aa8bd6a9891036c5ce04e4030", - "sha256": "17ibcl9ilm7ml4gjlvcx40hni8awccm1zk37y0nfvcscigf3i8pr" + "commit": "42e8db5ff67c37228f92ca8750d203aa5bd9e1e5", + "sha256": "10ya3ns0kkgiwlk8rrx4891q4833yyqdf961dsam45kfzdqcxkwl" }, "stable": { "version": [ - 1, - 10 + 2, + 0 ], - "deps": [ - "dash", - "eglot", - "s" - ], - "commit": "4a1df3342931f09edc933cb481da70cc5a5ef268", - "sha256": "0dkfd4nlc0hxikvby1271y6zppsvcc0jr12m2w1zrng1pqx666di" + "commit": "15964df7c65a3b46d704c85873619fec073eabc6", + "sha256": "1irw05118p835djcvzb2y67avcpryvs6i1p4mp5snygk4n8nl2gc" } }, { @@ -41794,8 +42040,8 @@ "deps": [ "cl-lib" ], - "commit": "6900d1eab9750001e8525f3990ed6fa4a73a8c44", - "sha256": "0vxak1s31ql6zk1i3c2kj35dxqi5sdp41ip56b586y0f1p9hfcab" + "commit": "5716fde9dd0aa8531894938a9930b07ce96dfa66", + "sha256": "1rgs8ivbh8686kva0l8wi7gx5yp3v6rk50id11axzx9qzj5p1gnw" }, "stable": { "version": [ @@ -41948,14 +42194,14 @@ "repo": "jojojames/fussy", "unstable": { "version": [ - 20220606, - 1543 + 20220713, + 23 ], "deps": [ "flx" ], - "commit": "1e77aa133b1bed8164a927b9090af839d0383774", - "sha256": "0jiip3gcrqvm91bcv647j30kqxbpfqi10w21zi986ggdjjhdcdjs" + "commit": "314280ae62a907004ce82f8bbbddf8feca497e95", + "sha256": "062lg7a6bb57zr1rcisk8hxagm2jd5ywphm881q87c8vkfhki2ar" }, "stable": { "version": [ @@ -42022,8 +42268,8 @@ 20211231, 1837 ], - "commit": "bfba20e435a6f5bba328309a8a5ca20dea7a301d", - "sha256": "0y4lv1cbpfcz8d1dwvqc728s5hyn6b7fb2n0gg4lhz76h1i411ky" + "commit": "74867a4c991b98cf636ff1a2b81c2a6b41ebbcb9", + "sha256": "0rw59nga6phhrzlskq03qwg4k3l4pyn9cdzcmg3vjf1nvssa13g1" }, "stable": { "version": [ @@ -42426,15 +42672,15 @@ "repo": "emacs-geiser/geiser", "unstable": { "version": [ - 20220507, - 34 + 20220614, + 2009 ], "deps": [ "project", "transient" ], - "commit": "d28d19b582347bffebbf0ca905297e744842a5f2", - "sha256": "0g96982zq5yarv1ky86qvin2an30n4fsxqgrcyg6yhas9vz7gc4b" + "commit": "115e1e39278e2ca32fa032b4d985eb6171935a83", + "sha256": "1akc6xpr3xyb9gn002nrjdwlfgq5spfacyf9m76m6y2f6rn0pwdk" }, "stable": { "version": [ @@ -43221,16 +43467,16 @@ "repo": "magit/ghub", "unstable": { "version": [ - 20220429, - 1708 + 20220624, + 803 ], "deps": [ "compat", "let-alist", "treepy" ], - "commit": "f14c1bc84135fe149c42348dce6eaa23ba610224", - "sha256": "01ac9789ns56bsishxl904ypc3kvc1w6svfrww8phd6hpwl0f8wc" + "commit": "94f5aa2ddecc6426ebc69a0c67934ccba6ae9797", + "sha256": "11ylxrc6hrzzw0z2wd9h375fmg42q637c5nf1n8yxmqfx3skj5bm" }, "stable": { "version": [ @@ -43588,16 +43834,16 @@ "repo": "magit/magit", "unstable": { "version": [ - 20220607, - 1403 + 20220615, + 1159 ], "deps": [ "compat", "transient", "with-editor" ], - "commit": "2dfeaa6839c643a54d96c9f855bae11d5cba2453", - "sha256": "052zdj08296s34b7a5p6fapxym7ni1mlw3iqpvw6jhkv9qihmqv2" + "commit": "acd26dd9f3708602d4c721395d790a4af7937eed", + "sha256": "05xfkk4dssqcf1kgxjlr74nya7nbkjmvqhqj6rmxbq89yb46nim5" }, "stable": { "version": [ @@ -43851,17 +44097,17 @@ }, { "ename": "git-lens", - "commit": "a52b516b7b10bdada2f64499c8f43f85a236f254", - "sha256": "02a393b5y4vpmf9ixgyi3a4gbzk4146zql827ljlav3j0434ssw2", - "fetcher": "gitlab", - "repo": "pidu/git-lens", + "commit": "549ce6acba5c3135b3d8b6fff85845c41642c53b", + "sha256": "1a5cnwwjrcsakwadd9sj3di5ihzisq3f3bidx9b665vhk7fpaixn", + "fetcher": "git", + "url": "https://codeberg.org/pidu/git-lens", "unstable": { "version": [ - 20190319, - 1342 + 20220623, + 722 ], - "commit": "f6cc0a37c9c5c422c49c32650e70bc4721707985", - "sha256": "05bkpg7xz8644np9imsj5ms821sbsb784ap5fjdnnn69kllz0d33" + "commit": "8beec55b2c43bdf64172fb2539de97f1dd39a6d0", + "sha256": "09qjan39g91igynzjj5pivdbcvaz5vc3bcr5xch0kyzjhnlh9smf" }, "stable": { "version": [ @@ -43881,11 +44127,11 @@ "repo": "sshaw/git-link", "unstable": { "version": [ - 20220406, - 2328 + 20220613, + 135 ], - "commit": "0197c9812417e18df2c7b5cd5c0084271c2f3286", - "sha256": "0vsgb6jridasscp45prqlwf8lh9x7br3cfqby2lwzgzr8kqphivv" + "commit": "fe2e8aa92dd8f1a9fb3f471658701487ff21f22b", + "sha256": "1pbzcvv4hd6hkbqaln4gmdqmbv46b0556d35m3zkg0hvrrspp7bi" }, "stable": { "version": [ @@ -44010,10 +44256,10 @@ }, { "ename": "git-timemachine", - "commit": "a52b516b7b10bdada2f64499c8f43f85a236f254", - "sha256": "06xdzic7j3d3pqgwxp1q6fs8sf3mi02a9phjvhk90kyvbr8h94ck", - "fetcher": "gitlab", - "repo": "pidu/git-timemachine", + "commit": "549ce6acba5c3135b3d8b6fff85845c41642c53b", + "sha256": "1laxdv9iw1z1wnf092231iyzq4mybg3z6q02qvwi38sinscskvgn", + "fetcher": "git", + "url": "https://codeberg.org/pidu/git-timemachine.git", "unstable": { "version": [ 20220324, @@ -44596,14 +44842,14 @@ "repo": "TxGVNN/gitlab-pipeline", "unstable": { "version": [ - 20210601, - 1339 + 20220619, + 1215 ], "deps": [ "ghub" ], - "commit": "2404f9cf0a064aabea975adada250895c385e057", - "sha256": "00i6q4pggaq97xgvi2ifanh0lx8nq5gbi4r2gy596635x26a55zq" + "commit": "595e699aeab6c28582f309a047c42a0498873a8e", + "sha256": "118njld8c7d0szq2z36drbkm03f27kjiwcw67595ndnnpa7h59mi" }, "stable": { "version": [ @@ -45911,11 +46157,11 @@ "repo": "lorniu/go-translate", "unstable": { "version": [ - 20220514, - 1046 + 20220627, + 545 ], - "commit": "3b48787f5e91b9480ef5066bf3657f67306524ca", - "sha256": "1c27rk6r9103lwmb0mqkfiph521w7af34p2hli9ahjj8da5y91cb" + "commit": "8bbcbce42a7139f079df3e9b9bda0def2cbb690f", + "sha256": "1d4ck11mflkc9i0lninpxlb4xgs7j04br12k5i1ccajwklhxjwbd" }, "stable": { "version": [ @@ -46184,8 +46430,8 @@ 20220210, 1659 ], - "commit": "25bd3525fa8277d40a0163df04f6a06277e6265b", - "sha256": "0nwjz13zyi9fvy96frzjw9y9k42vzgy4h1rpx4p9ar5agi9nrk17" + "commit": "e8808406eab41dab5dbfbaec0aee620d6c618365", + "sha256": "1136gsyzr59rxfp6qkq8agjbxb612bcda07fl7iv1kigbz1c0ggh" } }, { @@ -46400,17 +46646,17 @@ }, { "ename": "goto-char-preview", - "commit": "6c2287c7b4c543e92ccfab120388b2c05174d2db", - "sha256": "1k7dp2zhlk3kyy0br5fqzj6sx9zkg215s3qs8flf3w0xji150r6k", + "commit": "ed8470ceac6a13b83da04691ac955e2ec744092e", + "sha256": "17mraac3rpmam66b3l21qs8bkjhsc7xry90y7yl8dih3xspfb47v", "fetcher": "github", - "repo": "jcs-elpa/goto-char-preview", + "repo": "emacs-vs/goto-char-preview", "unstable": { "version": [ - 20210323, - 332 + 20220704, + 630 ], - "commit": "6fa81449dac4b5b0a0245ff29f13b44cc72cf940", - "sha256": "0d0c3zfy8ffg26nzbwy6i26niyikdxf15f8z2147kahlwl23nsvp" + "commit": "104a04c3228b3cde2432ae802d739859f96c8509", + "sha256": "1akd9bvz736sgwf9wbi97yjaipw6kkrmfz7azb78jl0kwngfzqcc" }, "stable": { "version": [ @@ -46487,17 +46733,17 @@ }, { "ename": "goto-line-preview", - "commit": "6c2287c7b4c543e92ccfab120388b2c05174d2db", - "sha256": "18q5x2rsg8qyll76cyi0rm5ywgcb4p0w1b2zl0pc9y3qi2g2lwvr", + "commit": "ed8470ceac6a13b83da04691ac955e2ec744092e", + "sha256": "1glqfxp7fjx932h4dpwvw4ppwjsxr5ld26zq78zrxwkjgvq9pwkz", "fetcher": "github", - "repo": "jcs-elpa/goto-line-preview", + "repo": "emacs-vs/goto-line-preview", "unstable": { "version": [ - 20210323, - 422 + 20220704, + 630 ], - "commit": "8046c9d4839438437281fece36858575c0810706", - "sha256": "0w09j5k7kvlhq6zdwimx2kmcxc6hbyc3kf2dx3w2b3bc4c8k2xq9" + "commit": "b58af255e822b6bb226085592ca471dee6027b95", + "sha256": "03cxm3hlxzf2nz30p360jpskiw6279frr8v6jw42ismm6ryvlw4d" }, "stable": { "version": [ @@ -46526,13 +46772,13 @@ "magit-popup", "s" ], - "commit": "b4847059960b2faa100c7066f104be86c561229d", - "sha256": "16x2n3xb7yx7ihl4bgzwdwqxv20arlmz7nmiw8j7gy8qvfjnrk0q" + "commit": "87e10dea77313b470dd8cef2a7249db3c9794fbf", + "sha256": "0an2bp3vm6xna884dv8b873yjs8jzxgaxn99cz9gppwhmyvhrvai" }, "stable": { "version": [ 0, - 28, + 29, 0 ], "deps": [ @@ -46541,8 +46787,8 @@ "magit-popup", "s" ], - "commit": "ac1eba30136e553e799a7e59846ca5750b64c054", - "sha256": "0y3wl27zrb7qlc1zn451cmklm2d2ihkrzh4n20fyzx222aq4kbdq" + "commit": "69ac8494c2bead55022dcd1dc18f9ca8b159ccd2", + "sha256": "04lsqq8ik8mgxhnxma24lkwn7qnjwr9djwrq0j0h3pw8bfbk4m29" } }, { @@ -46701,8 +46947,8 @@ 20220407, 1954 ], - "commit": "29210e5a969c02169b68e04f2e28e3bf2fc13363", - "sha256": "1m1j5c7pjs4iv39m8axxp5cq648misvhh7fyyfs22lv3yf805q1l" + "commit": "c612ac1e9f742856914ad6e8eb9e9dc169f489ab", + "sha256": "1lcw4y64l9w0x1y8srd8q4n63mz29gm2j1mgb5g2w2dknf3c3p6i" }, "stable": { "version": [ @@ -46753,16 +46999,16 @@ "repo": "emacs-grammarly/grammarly", "unstable": { "version": [ - 20220509, - 1937 + 20220704, + 624 ], "deps": [ "request", "s", "websocket" ], - "commit": "37d4d7d068c51afefebd58dfa6021662c9c64cf1", - "sha256": "0knwcljmq52xlrnl8nzmja0kacc0bb68g4sgi3gkj7g3rl5g2crs" + "commit": "1242c4f26c70697ed2447b7fca41645e8f9daf96", + "sha256": "1kwkihvkhrl2ibqjpdy04df0vryqfhn55kpizydhw5hxwipq85i4" }, "stable": { "version": [ @@ -46940,11 +47186,11 @@ "repo": "davazp/graphql-mode", "unstable": { "version": [ - 20211127, - 1023 + 20220716, + 827 ], - "commit": "9740e4027bd9313697d5cac5caaa5b15626ab1da", - "sha256": "0rsa38fiiwzvxln4g5xvrsggm9mslw58iw3cx5c07y6kasfqfibb" + "commit": "92136cf9b5a4dcd8c202c8dba9064b497776d2f7", + "sha256": "0df2lsvmxzkpma3crw3y421divkmx8kr2lpx3066ihqwblphr6mi" } }, { @@ -47174,8 +47420,8 @@ 20220430, 1545 ], - "commit": "7fa9e9e6b650f7a6c026b7e24c2af171e8818667", - "sha256": "0jhdj6hvfv5psq5xixjjr13i92q5a2fkibzw25dz5c1f4ky0crcl" + "commit": "6d6ddbe0af39c82a633add8499488ad8dc9e1daa", + "sha256": "0zn160dxhmbl8jxv3mrbbx7j8jwnmpb576nfnf1758hx86czqhw4" }, "stable": { "version": [ @@ -47261,8 +47507,8 @@ "dash", "s" ], - "commit": "29210e5a969c02169b68e04f2e28e3bf2fc13363", - "sha256": "1m1j5c7pjs4iv39m8axxp5cq648misvhh7fyyfs22lv3yf805q1l" + "commit": "c612ac1e9f742856914ad6e8eb9e9dc169f489ab", + "sha256": "1lcw4y64l9w0x1y8srd8q4n63mz29gm2j1mgb5g2w2dknf3c3p6i" }, "stable": { "version": [ @@ -47364,14 +47610,14 @@ "repo": "greduan/emacs-theme-gruvbox", "unstable": { "version": [ - 20220101, - 1208 + 20220625, + 1642 ], "deps": [ "autothemer" ], - "commit": "921bfd7a2f5174b68682b04e6010b156bbfe6c70", - "sha256": "12s9879spz1d5a90x2mp85crxkxz42jq20qk5vkkka1rqfmfmlk1" + "commit": "e88ee445b791b77078ab0be8aa972bfab3078ed0", + "sha256": "0amj785fd2j3xnqb26p363w2hhhn50kw44kfga7wyyljifv3lnjr" }, "stable": { "version": [ @@ -48380,26 +48626,26 @@ "repo": "purplg/hass", "unstable": { "version": [ - 20220526, - 2124 + 20220612, + 2151 ], "deps": [ "request" ], - "commit": "5da5404c8de483ca70dcab13ad07805f1b37e4bd", - "sha256": "1a9m8pny9x8mfi1jkk7y4357hbhqfi7i71shs26ilr0gyivfvxbp" + "commit": "9de26718ba6f369c9f161957cbc5136382fc51e1", + "sha256": "0jb38idqrh16mfn5hkvl1q96njd4s9s0a6phqjhfs8vpg53f27f9" }, "stable": { "version": [ 2, 2, - 1 + 2 ], "deps": [ "request" ], - "commit": "5da5404c8de483ca70dcab13ad07805f1b37e4bd", - "sha256": "1a9m8pny9x8mfi1jkk7y4357hbhqfi7i71shs26ilr0gyivfvxbp" + "commit": "9de26718ba6f369c9f161957cbc5136382fc51e1", + "sha256": "0jb38idqrh16mfn5hkvl1q96njd4s9s0a6phqjhfs8vpg53f27f9" } }, { @@ -48590,28 +48836,28 @@ "repo": "emacs-helm/helm", "unstable": { "version": [ - 20220607, - 1243 + 20220715, + 1758 ], "deps": [ "helm-core", "popup" ], - "commit": "9e706bc154deab9b5932d7849eff249f7c4bf1c9", - "sha256": "1kgh0srn59sbjkrjb1kwvyiyklp3aj6bf8c161b3k73g6gpz3kj4" + "commit": "c451a06123fc90f949b7f734944b80c44033db4f", + "sha256": "1cr78z6m99zyfps5zjfhcrkzk7mggrxwc78wdf7kmpb8yj4hg16k" }, "stable": { "version": [ 3, 8, - 5 + 6 ], "deps": [ "helm-core", "popup" ], - "commit": "5e035c9193bf1e1d4bb709794a154957544dcfc7", - "sha256": "1my6c87ia7h99dbbbw1yxcmgacwss1j36rf3swn3k2ab6k34hsf4" + "commit": "99c0362c2bb879df44f224d0add69a7434447d48", + "sha256": "02z5jxjkqspj6f6j2a87l9bzl2b4mh1560bzl8ia72w2vxg15m8z" } }, { @@ -49059,8 +49305,8 @@ "bufler", "helm" ], - "commit": "a68e0eb2719c67ab8a3ad56c4036364061d06004", - "sha256": "155g4p2yw88cpc8ydfzybc4r6ab2qwcmzdwkrrhnra4psimahjq6" + "commit": "23132ffed65d78c0bf5ab2c4c6385d009db496ec", + "sha256": "15zam24zz4pb4zq20wzp3j31cg87fdwxn4bzn9mrm4q466rbldl7" }, "stable": { "version": [ @@ -49277,15 +49523,15 @@ "repo": "clojure-emacs/helm-cider", "unstable": { "version": [ - 20220102, - 1626 + 20220706, + 944 ], "deps": [ "cider", "helm-core" ], - "commit": "00809e45de919c82753f332f29358f0ddbf21936", - "sha256": "0jjjy68pmmsx0biawyi5581cqh2b4zb0q8f5vs49ihpzn6zc04vk" + "commit": "fe7e48befdb0b20ea1b0fb3626a8a725e54ae626", + "sha256": "0kj3465klq4a1awfp5xzk9rvrz3gv9n6d8b1k1lsmh4vvm4bsb6g" }, "stable": { "version": [ @@ -49496,26 +49742,26 @@ "repo": "emacs-helm/helm", "unstable": { "version": [ - 20220607, - 1243 + 20220708, + 343 ], "deps": [ "async" ], - "commit": "9e706bc154deab9b5932d7849eff249f7c4bf1c9", - "sha256": "1kgh0srn59sbjkrjb1kwvyiyklp3aj6bf8c161b3k73g6gpz3kj4" + "commit": "c451a06123fc90f949b7f734944b80c44033db4f", + "sha256": "1cr78z6m99zyfps5zjfhcrkzk7mggrxwc78wdf7kmpb8yj4hg16k" }, "stable": { "version": [ 3, 8, - 5 + 6 ], "deps": [ "async" ], - "commit": "5e035c9193bf1e1d4bb709794a154957544dcfc7", - "sha256": "1my6c87ia7h99dbbbw1yxcmgacwss1j36rf3swn3k2ab6k34hsf4" + "commit": "99c0362c2bb879df44f224d0add69a7434447d48", + "sha256": "02z5jxjkqspj6f6j2a87l9bzl2b4mh1560bzl8ia72w2vxg15m8z" } }, { @@ -50054,14 +50300,14 @@ "repo": "jcs-elpa/helm-file-preview", "unstable": { "version": [ - 20200927, - 528 + 20220716, + 850 ], "deps": [ "helm" ], - "commit": "5814015490c4540a5779168511d596022c6ebb44", - "sha256": "0rivhzxk0yifjkphf59sq4h37485kggdy8ww7s10nf40n360prz3" + "commit": "b6108fa3f2508087bb2e38085806b7a9d4802884", + "sha256": "07vqdzg9j94rw4vlyr5g0pmqv8knx9nlpa578x1inxlldlyv19a3" }, "stable": { "version": [ @@ -50318,15 +50564,15 @@ "repo": "jcs-elpa/helm-fuzzy", "unstable": { "version": [ - 20200927, - 532 + 20220704, + 651 ], "deps": [ "flx", "helm" ], - "commit": "99bb20cd7ec89ac1e2ae6eaecd9ac4b30f570bee", - "sha256": "1srns7jr7nbgq25x4qapc44p6ivfzlm18xxqnbdadf05ld9jgh2v" + "commit": "8b80a2d371f754c597bdbd30373a38490a2f1499", + "sha256": "0q5lbjhddarm16zhwbxc924k11694rk80vxh80np3j2fyzj4xba9" }, "stable": { "version": [ @@ -51126,26 +51372,26 @@ "repo": "emacs-helm/helm-ls-git", "unstable": { "version": [ - 20220605, - 434 + 20220707, + 1048 ], "deps": [ "helm" ], - "commit": "27a0fae5c8927c5980f49726bd29d0a7274af337", - "sha256": "03k5gpz3vinj4w7k0cfmpjn6rxwiyyscn4jl9zyj2bgdf2m39wfm" + "commit": "bbe111adc204b7dcfa0657e5f56d5b90d2286afd", + "sha256": "1xq2j6ynxjr24gbhqa7224a195skajlkfklg50pvz7bfawml0db0" }, "stable": { "version": [ 1, 9, - 3 + 4 ], "deps": [ "helm" ], - "commit": "312392b786a7ea322914b60760e2693b53772ad6", - "sha256": "1bqk0z6zd3aza7ibb8h0ghya5kid4m6z01gs7jf4sr6p49rzp7hd" + "commit": "dd9ef9ffffcd7d2fa76a838f16edb5ccf86abdf2", + "sha256": "097zpwpn18dgazp19czrcn6iz965qgr45gq9lvjrkkp0w03pbdb6" } }, { @@ -51604,8 +51850,8 @@ "org-ql", "s" ], - "commit": "64a9234733904af20fd495861792f1d5c2b37190", - "sha256": "1w3vly4jh854gb9bgnwqfzry6214v498fmiwm491gi8m5g0d05xp" + "commit": "98b6049eccc4f3b19700d27a86f22d4428013501", + "sha256": "0qn3ww9hp08xbmjicd451zcqm3za84wvizjwlzmxi6hqsaxmzpfm" }, "stable": { "version": [ @@ -52363,8 +52609,8 @@ "helm", "rtags" ], - "commit": "db39790fda5c2443bc790b8971ac140914f7e9c2", - "sha256": "05cigdvlq5lfahr9a1z8rvlw2s99j4pha2in59pshz9ph8cqgq10" + "commit": "c628efc9b485470a48aec2692d79f7c140bc5b92", + "sha256": "03avv7brbrj69368riq3xg4qh65yzl5cyjn9wc2rbyx4jw2q3p4p" }, "stable": { "version": [ @@ -52489,8 +52735,8 @@ "repo": "emacs-helm/helm-searcher", "unstable": { "version": [ - 20210221, - 923 + 20220704, + 634 ], "deps": [ "f", @@ -52498,8 +52744,8 @@ "s", "searcher" ], - "commit": "6409eef130d3561e024813f3af82a61f73c9ae5b", - "sha256": "1l0csk24ls9784k4fry15mdkmryn2dcvssiqv07jjl90n04pjq62" + "commit": "521326e61b878bce0db7e1a862ffc890bd59122f", + "sha256": "0fxd61k1ry4xwkam965yk0vs5h9l6v918lka7fna92hfww3wz4ik" }, "stable": { "version": [ @@ -53362,8 +53608,8 @@ "repo": "Wilfred/helpful", "unstable": { "version": [ - 20220513, - 302 + 20220704, + 1722 ], "deps": [ "dash", @@ -53371,8 +53617,8 @@ "f", "s" ], - "commit": "209971ba9f576ba080352642cfbf25df5692b1d7", - "sha256": "1qrxr0ybvdvx6qw6akb1pv074bmffv4m57855kk8fr1vp4w07z0i" + "commit": "94a07d49a80f66f8ebc54a49a4b4f6899a65fbe3", + "sha256": "1cyac6vvliavhbgmsnrxzay9jgpq00vp0hzbs24amf4djw6j10f1" }, "stable": { "version": [ @@ -53678,8 +53924,8 @@ 20190425, 842 ], - "commit": "fed505b8e71bf51772887c8a94bb57f5b8838b63", - "sha256": "0bsmnyhpsa7x4jp4zc4inyi0rrjm34fbxa3m49hw8kq5ap7dps5k" + "commit": "d8373b376642e9297595468dbe72ec63a6e4b571", + "sha256": "01fd0amk6hdvynyl62vq68pnk6r6kgnn7cxhj0rnm14nv60wxs81" }, "stable": { "version": [ @@ -54029,11 +54275,11 @@ "repo": "fgeller/highlight-thing.el", "unstable": { "version": [ - 20181229, - 1301 + 20220626, + 831 ], - "commit": "561d08a26f78f18d405d4f371f1c813db094e2f3", - "sha256": "1mqxkcdac8qqzxi1jhnqqr98zj272rkk28m6r29v6x34hgdyjwdz" + "commit": "f122a40ef717602937a8e083813395d423963202", + "sha256": "0p01g89b3hxl2mx96mh3masii3zsbh2yih0bkp6a8i8zks3m04is" } }, { @@ -54086,20 +54332,20 @@ "deps": [ "cl-lib" ], - "commit": "f7e7b12fd119e91c795cbe21bebf7b5af5d273b8", - "sha256": "1jdzd6r3x4dc03256y06dp747h2wp7hcm5jkb4n9ima8z2h3v3ck" + "commit": "4c2ea034f4365cd784539f223282907c9e734fba", + "sha256": "0fjmjavj0ndx6cw1w4m1swsj00fa38m833zpq3zhivr5nkzw26pr" }, "stable": { "version": [ 5, 3, - 2 + 4 ], "deps": [ "cl-lib" ], - "commit": "e146d672ea4c00fe17018e7e76e49d59570eeb2b", - "sha256": "0bcrlw76nihbffm7p5jh9vf3r1756p6vwa7hbwp933r4caaiyqid" + "commit": "68d5211b2737c2ba31bbceed9b1abbb36bb83e39", + "sha256": "0qkrgar7blirhx85p0m4pjvwwh5rcs9ypy49hyg9bah1dgrnm88b" } }, { @@ -54292,11 +54538,11 @@ "url": "https://codeberg.org/ideasman42/emacs-hl-block-mode.git", "unstable": { "version": [ - 20220507, - 1118 + 20220710, + 933 ], - "commit": "7e0452c768a4e309d1cdc15025683ebfe71e626f", - "sha256": "0ymkxmpfd19qjdc80a6hrljbwpn78xvj6r769zfskyhqj3a3a2xd" + "commit": "d3ff25a72269fef466c240388850f076eaf30039", + "sha256": "1kkaiwiknakc1h6fprlvx1hqf1pgjqj3q84p6w1qfw85d6ygl7na" } }, { @@ -54343,11 +54589,11 @@ "url": "https://codeberg.org/ideasman42/emacs-hl-prog-extra.git", "unstable": { "version": [ - 20220607, - 140 + 20220710, + 1157 ], - "commit": "e7e24735cd020746e4070c908a6ebd2515c4c19b", - "sha256": "00r7fdgi9mda69sw1c0q9zhjwjdrn74gyw3hk9ml3n3qxnagkfva" + "commit": "286a4916ad4dd764ead07fb17000ad64cbcf11bd", + "sha256": "077yjk1vh47jgfdd2x680maz5mfgmb35rpq98dv6ivdsr7m1p1p9" } }, { @@ -54694,11 +54940,11 @@ "repo": "axelf4/hotfuzz", "unstable": { "version": [ - 20220607, - 1906 + 20220626, + 1704 ], - "commit": "50ea5b54c21dc6a2437e37b17c7ea14f8ba06771", - "sha256": "11aw2b5wixf6qlh3b2wnnms4n1fgp23g1yy48ykb3g6hkwrs2nrs" + "commit": "a19395aca9eff0e31c51efbbe4c6e16229f3b380", + "sha256": "1hm7nd4736lq118b7626clk4371pd94dg9gvwxyjrpgbrf9qc5mv" } }, { @@ -54786,22 +55032,22 @@ "repo": "thanhvg/emacs-howdoyou", "unstable": { "version": [ - 20210909, - 2000 + 20220715, + 1720 ], "deps": [ "org", "promise", "request" ], - "commit": "a01971a7279c8a031de78513c004d7a09d293712", - "sha256": "05jmq05bjj0rfc6c69ykjrv6lavxpb21fnjny958if8hxzd7v1v8" + "commit": "f6c659a45f59a08546578c169524a12f0945c29b", + "sha256": "1iljws88j4jdqxyzcgssak3sra54645my8ls4n8lf6fygcnbvg2c" } }, { "ename": "howm", - "commit": "0099a1f9b0efb3fc3a1420cfe71a647ec6458998", - "sha256": "07wx3wmc51vm42s81km5sdbm600ax2pv83xg0116xsyn05za3bfn", + "commit": "570bde6b4b89eb74eaf47dda64004cd575f9d953", + "sha256": "0jc585z0whcph644k2iic41xvjgzln3w2kdibrmr8lpcifbfr5qk", "fetcher": "git", "url": "https://scm.osdn.net/gitroot/howm/howm.git", "unstable": { @@ -54985,11 +55231,11 @@ "repo": "jcs-elpa/htmltagwrap", "unstable": { "version": [ - 20200929, - 559 + 20220704, + 652 ], - "commit": "1bacc5a6348e29ab506cd530e2ebb7348caf77fd", - "sha256": "0pjm45973khr48w17srwvp4ns1sjifjy8pv2q0gnhks00ab5p5n1" + "commit": "aeabbb7606e033bccbb70d2a1c463ba8a733a4e9", + "sha256": "1khzdwyi6qdpazhpbr749wbcybak2x5gqjqyman002dnpwaxy2fb" }, "stable": { "version": [ @@ -55464,14 +55710,14 @@ "repo": "zzkt/i-ching", "unstable": { "version": [ - 20211112, - 1528 + 20220619, + 817 ], "deps": [ "request" ], - "commit": "992f53ae2bd572b89bc642ca70b8bdaa5eb2553f", - "sha256": "0z00w8ssr1syh5fphk7y7910l66vlcyj2lc76jhs1g7pxs6q5hh9" + "commit": "54f19e2dcb1d16735b94fc7e06a2aa8b1b6f165a", + "sha256": "1y6jabsnkn1fa0czxbh6rz6fcm7557dg4w8nsp30makc2bly02cr" } }, { @@ -55512,11 +55758,11 @@ "repo": "Alexander-Miller/i3wm-Config-Mode", "unstable": { "version": [ - 20201105, - 2022 + 20220617, + 1339 ], - "commit": "c70bdc1367e461299e13a4797bc9d9d950184edd", - "sha256": "1kpnm7ph0ydm0h5jxwff316yy4aff6ml9x7f4z5zgm4wmgn0bxc5" + "commit": "3574d88241118ed6cc5a3022b6dde58d6f5af9dd", + "sha256": "115irh30d2g867a790ygf8zi7m3v662v1ks6hfinpbzzv0sl8nwc" } }, { @@ -55527,11 +55773,11 @@ "repo": "mkcms/interactive-align", "unstable": { "version": [ - 20200711, - 1117 + 20220629, + 1241 ], - "commit": "eca40b8b59ea713dba21b18f5b047a6c086b91dc", - "sha256": "1nvj47d62dffgry0dy08m8rz5fqsrn1yhmkmp5jn57fyhbk6nfal" + "commit": "bc4d30d79f2f4b413288195ef19894ac0fd258b7", + "sha256": "18hldv1id2s3rhh6bsxnv6g0lvw912vlgidwz8540nl6j9vr64dv" }, "stable": { "version": [ @@ -55584,8 +55830,8 @@ 20220321, 1312 ], - "commit": "bfc0ec1f27b02b8ab816dcfd9073e5d78dae1aed", - "sha256": "0x25xzlvqgpf2s00595vbgyk322h74n46x2dbcp2v3158b0cj86c" + "commit": "383499d347b72d919178d6f9e6b69abc2f9aa05e", + "sha256": "08gh7x6qbixglmd4rqd5ymba1779lsnqh9dl27hjj44w8l8jvmlh" }, "stable": { "version": [ @@ -55719,14 +55965,14 @@ "repo": "conao3/iceberg-theme.el", "unstable": { "version": [ - 20200812, - 943 + 20220622, + 1 ], "deps": [ "solarized-theme" ], - "commit": "183b41eae07d94d4a8f299306078410bddc41d34", - "sha256": "1sxadaip63mhfjvgkax45jlv3c8cnbjnq653qbvw98vb8xsrmjc4" + "commit": "c9fdf9a8f5ff417c206730a84731f64a95483935", + "sha256": "03a7mmaykwvmm9yc8ii5k5wgihl88kyq0amp2byjddl7f4mq7zak" }, "stable": { "version": [ @@ -55881,11 +56127,11 @@ "url": "https://codeberg.org/ideasman42/emacs-idle-highlight-mode.git", "unstable": { "version": [ - 20220507, - 1118 + 20220710, + 709 ], - "commit": "5418252a11b00377a59295e50b7436f53afe68bb", - "sha256": "0dmqvpck1hwlw8z2lppyc1cnjw62gm9yykk2j4j3ckdvgcpkj6cj" + "commit": "dd07a8f465adb76c05d4712d03e093e9fdb79485", + "sha256": "08h274za9wn4rcjz0w2r5a8v4mxx1g3lagajcgjlkg266g4nr6ph" } }, { @@ -56299,15 +56545,15 @@ "repo": "idris-hackers/idris-mode", "unstable": { "version": [ - 20220519, - 917 + 20220609, + 1232 ], "deps": [ "cl-lib", "prop-menu" ], - "commit": "3c1f8f8410d909229d12d0227399f2d5c16b1ea4", - "sha256": "1is7n7j7h6w3x5i7byqn3kc41qk2p5wb0cdnr6cjxvlc3zar3wb0" + "commit": "9bc7697406f719258d93835df3c1761efbfecaa7", + "sha256": "1d1f7kx0fw632js7qd1sra5wbpwyamcqs5wpzhyynmr5ybb0vyl7" }, "stable": { "version": [ @@ -56386,19 +56632,19 @@ "repo": "jrosdahl/iflipb", "unstable": { "version": [ - 20210907, - 1717 + 20220612, + 858 ], - "commit": "2854e73cebb463007b686a784b66242999c3366b", - "sha256": "0fyjdfv2pw7lkh3dgmp7cjlcpnsnn82ssfh19wngiskf3p405s1v" + "commit": "9ec1888335107bd314e8f40b3e113d525fed8083", + "sha256": "1396pl33mszli7ib51kn6pvxyxj4zz9dvzw14a9mp2m0ykkm6f6s" }, "stable": { "version": [ 1, - 5 + 6 ], - "commit": "83e698f312a6e621f6d2c87b27d1e4acce96b4bf", - "sha256": "1nnkxzf35gx6a7a2xjf73wc5jzzpg4x0hj96jb3j6rim19yrfs8f" + "commit": "67e33073b4f42de9fc4df76bc04ec8b31aca02ea", + "sha256": "0rdwswsf3qfcm5rx48xj7pc03s1pb712pa0rbzqkj0gdxcid1ssp" } }, { @@ -56409,11 +56655,11 @@ "repo": "rolandwalker/ignoramus", "unstable": { "version": [ - 20210515, - 1422 + 20220611, + 1514 ], - "commit": "e509e134eeb81617414e5381b610108c967dbc45", - "sha256": "0f9fad3d1kf9r5560kgidkipildd7hnwiqv8siv22yd3axqi62dw" + "commit": "f5e4a66191be12c2fc3cf42a5e0849fcc8518a3f", + "sha256": "072i5l6547p9ilkd5gx2r554kfb6bv0h268hwx421wh0cak0w0dh" }, "stable": { "version": [ @@ -56841,14 +57087,14 @@ "repo": "jcs-elpa/impatient-showdown", "unstable": { "version": [ - 20200914, - 221 + 20220704, + 652 ], "deps": [ "impatient-mode" ], - "commit": "832e6725d4b95b2f00ff8be94cd75dc3cc873ca4", - "sha256": "0d54m7hkfaidxjynz762i7cjrgdqy9d3rrkm2r16ql9rmk8hdwvn" + "commit": "8f3e7ef41ea8fc43a747716a2c84c2708d5d4a2a", + "sha256": "0lhd8msnz6pfvvx29j80db0q0y0gbb80hlmhkvlb7ry5dvbkch3j" }, "stable": { "version": [ @@ -56985,11 +57231,11 @@ "repo": "jcs-elpa/indent-control", "unstable": { "version": [ - 20220227, - 653 + 20220704, + 652 ], - "commit": "e04850bb05a816395a92c69b7ad7cd32d33eb62a", - "sha256": "1fvvhpbqq22cab2pa480sanp1jnjyipysa8jgxwrf3r438yhi729" + "commit": "9d4474980f6955187a0800fd1f5669e3ba291915", + "sha256": "0cav7jaa32sslp0db8l59qfiml221i0j7jc6z0m03fahz7z4cvb9" }, "stable": { "version": [ @@ -57049,8 +57295,8 @@ }, { "ename": "indent-lint", - "commit": "2cd74b5fe81e9b2dcdd9f40e8d5693335629f6ec", - "sha256": "1wy8cpyiljjg3315pwivpzlz5cjnxpcigx3pv7rrx5lvdzapz5v8", + "commit": "570bde6b4b89eb74eaf47dda64004cd575f9d953", + "sha256": "0q2d5bbbz79krrhg60glxj62j017g3wrac66cjzlkk1zf37x8fll", "fetcher": "github", "repo": "conao3/indent-lint.el", "unstable": { @@ -57194,26 +57440,26 @@ "repo": "clojure-emacs/inf-clojure", "unstable": { "version": [ - 20220603, - 1523 + 20220715, + 905 ], "deps": [ "clojure-mode" ], - "commit": "8f295050a856b03d6ec14f0fd5e782e7acde6e2d", - "sha256": "0gm2psay483202vjzf27gvlmy7l2y8gawwviv5rbfbsxyb4l5xrm" + "commit": "67b0403aa183d521e36545266100f1f62a34e783", + "sha256": "0446ip809xzyb4n1dz3sm5d90y0lwgvd661h3cjybakpphykzcb4" }, "stable": { "version": [ 3, - 1, + 2, 0 ], "deps": [ "clojure-mode" ], - "commit": "c23c55e662c16ec94e684b2ec9611e78531921a8", - "sha256": "070h1j2axc40c3j8q6kji4avjpns65hj5kjb8a7pv5xiac9j50cy" + "commit": "67b0403aa183d521e36545266100f1f62a34e783", + "sha256": "0446ip809xzyb4n1dz3sm5d90y0lwgvd661h3cjybakpphykzcb4" } }, { @@ -57293,11 +57539,11 @@ "repo": "nonsequitur/inf-ruby", "unstable": { "version": [ - 20220228, - 208 + 20220710, + 959 ], - "commit": "dbf4386bac12f1733257db6105e3f1fca05ffb79", - "sha256": "0sb72prfcglkjvpsgadyql5s9r28dbiihby3szl500lv7cfpc6ds" + "commit": "24bf59caf03db3f24e02ba738df5dab88e57836f", + "sha256": "05sqznzmj4fyvlg5l24fi7bangxn7yh513afhgyhybfhni6nwx60" }, "stable": { "version": [ @@ -57329,13 +57575,13 @@ "stable": { "version": [ 2, - 5 + 6 ], "deps": [ "cl-lib" ], - "commit": "40a7ffdf734ffe7d1968909663146255d7ba69c8", - "sha256": "1ig1wdjg914p9ng1nir2fid4mb3xz2dbpmkdnfy1klq2zp0xw2s3" + "commit": "55caa66a7cc6e0b1a76143fd40eff38416928941", + "sha256": "03fh7i6blnbc0zbmp83fk095hr3q4fdvrvfxad74zghcbc2nk7b7" } }, { @@ -57645,11 +57891,11 @@ "url": "https://codeberg.org/ideasman42/emacs-theme-inkpot.git", "unstable": { "version": [ - 20220507, - 1118 + 20220710, + 1022 ], - "commit": "59056ef2e8850d33abc6e787219fcff404217afc", - "sha256": "1fayzcc9ixpnhma7968y70zdfslcvxrx3sgqsln0kp5zdkzm2691" + "commit": "f4ff574b8a7446205db0eb6b33090ec84c3024da", + "sha256": "1rm21gchjwc39mxf8d3d1pdlbs2wh6lchwmjc3d61s462anl3lp8" } }, { @@ -57763,6 +58009,21 @@ "sha256": "061809gl7dfz4mis5igz9aiis1gq4np3fk75ydmzm0j9isz4dc2q" } }, + { + "ename": "insert-random", + "commit": "dc63e30841995b263094da7119838cf37482689c", + "sha256": "0dnxcbn2x45x8n4k18ry0i595a39s5c9dq4aqbyzzmqiv4ri4j5n", + "fetcher": "github", + "repo": "lassik/emacs-insert-random", + "unstable": { + "version": [ + 20220622, + 1653 + ], + "commit": "049567eeca639017ac2db786cefaf38af7273654", + "sha256": "0ml5sig9c9q3s51wk32njwnfnz6s8jpbmj43ni1l33dlvyc10jl7" + } + }, { "ename": "insert-shebang", "commit": "c257f4f5011cd7d0b2a5ef3adf13f9871bf0be92", @@ -58185,11 +58446,11 @@ "repo": "casouri/iscroll", "unstable": { "version": [ - 20210128, - 1938 + 20220612, + 310 ], - "commit": "d6e11066169d232fe23c2867d44c012722ddfc5a", - "sha256": "0pbcr5bwmw2ikwg266q2fpxaf0z5h5cl1rp3rhhn9i9yn7hlfc78" + "commit": "76aa4e7e72f907e95715351819d9efb6336b8238", + "sha256": "0hz79wfwjwvyn1rvxb3bx9kns9glds61v8n8dgcc5fyahq77r4kj" } }, { @@ -58218,14 +58479,14 @@ "repo": "jcs-elpa/isearch-project", "unstable": { "version": [ - 20210715, - 1041 + 20220704, + 652 ], "deps": [ "f" ], - "commit": "85efbf0c1c651a94062fa820faf48f7bc8d4f8af", - "sha256": "1yhmzrns7bzncg0mc7mxwg5jxvblhfkg7nim5c66hmq3mr60gb48" + "commit": "08b1102c1f55011952aff818261a9478175a5b92", + "sha256": "0fsqa970gqxdrvjkgp468f1shpb7alzh50j1r5bpvkfx9ifdx40h" }, "stable": { "version": [ @@ -58451,8 +58712,8 @@ }, { "ename": "ivy", - "commit": "de5b4f40470cdfb4d2b4b3078436a7457f5703af", - "sha256": "0lrf3xxxi3b78z80sg6jkaz07gzqrv242ajiiy0rvly6da17i06z", + "commit": "570bde6b4b89eb74eaf47dda64004cd575f9d953", + "sha256": "1a4sjk9jmzx75a2qjx3x6926im5qwycxqqc0a3c9ahzi3g6akfx9", "fetcher": "github", "repo": "abo-abo/swiper", "unstable": { @@ -58460,8 +58721,8 @@ 20220529, 1130 ], - "commit": "f8d80a4055514f92d94f128f5fcb1cda79e5cd22", - "sha256": "1cmafp5rssp27lhvszyzf4mc1z130kkgkl9d36lgg97qk5jp58g8" + "commit": "2051de5882706246da298ce5f60482cd7f469fe7", + "sha256": "0gk0dznnd7y08f83pjgwdxy9i9dz06jj1kk7mq1schbky82a1i57" }, "stable": { "version": [ @@ -58488,8 +58749,8 @@ "avy", "ivy" ], - "commit": "f8d80a4055514f92d94f128f5fcb1cda79e5cd22", - "sha256": "1cmafp5rssp27lhvszyzf4mc1z130kkgkl9d36lgg97qk5jp58g8" + "commit": "2051de5882706246da298ce5f60482cd7f469fe7", + "sha256": "0gk0dznnd7y08f83pjgwdxy9i9dz06jj1kk7mq1schbky82a1i57" }, "stable": { "version": [ @@ -58727,16 +58988,16 @@ "repo": "jcs-elpa/ivy-file-preview", "unstable": { "version": [ - 20210124, - 1639 + 20220704, + 653 ], "deps": [ "f", "ivy", "s" ], - "commit": "bb576866d81ee4ee428c8d56663d3e30edf57998", - "sha256": "1plpjs2vkc9n1cb05p7ldfrm0ic2b82lpnmghkd60x64j36yjp20" + "commit": "3b78a194298290babd1a35ed689f333a271471b6", + "sha256": "18k03gp52qykkphh53sj4q33lbw5mhqraqp0ng0md39cwfdwrxsd" }, "stable": { "version": [ @@ -58856,8 +59117,8 @@ "hydra", "ivy" ], - "commit": "f8d80a4055514f92d94f128f5fcb1cda79e5cd22", - "sha256": "1cmafp5rssp27lhvszyzf4mc1z130kkgkl9d36lgg97qk5jp58g8" + "commit": "2051de5882706246da298ce5f60482cd7f469fe7", + "sha256": "0gk0dznnd7y08f83pjgwdxy9i9dz06jj1kk7mq1schbky82a1i57" }, "stable": { "version": [ @@ -59157,8 +59418,8 @@ "ivy", "rtags" ], - "commit": "db39790fda5c2443bc790b8971ac140914f7e9c2", - "sha256": "05cigdvlq5lfahr9a1z8rvlw2s99j4pha2in59pshz9ph8cqgq10" + "commit": "c628efc9b485470a48aec2692d79f7c140bc5b92", + "sha256": "03avv7brbrj69368riq3xg4qh65yzl5cyjn9wc2rbyx4jw2q3p4p" }, "stable": { "version": [ @@ -59181,8 +59442,8 @@ "repo": "jcs-elpa/ivy-searcher", "unstable": { "version": [ - 20210221, - 923 + 20220704, + 653 ], "deps": [ "f", @@ -59190,8 +59451,8 @@ "s", "searcher" ], - "commit": "22867f0987b77e2cba0d251b62f5bd6324cc366f", - "sha256": "0kk39km7nw7izhb5r2rlhbaxcypvjngnmxmxnb2b0jx101kwzrhr" + "commit": "fcaa8087a0cb9e61bedc2102f47c8b9754968288", + "sha256": "00k8xn2jclq27f7y7k5mlqxjn6x3c1jzzsz88cjrrv12ifg698s6" }, "stable": { "version": [ @@ -59412,21 +59673,21 @@ }, { "ename": "jabber", - "commit": "d29cc2a26829e678467664d6b2f5c171dc9dbd25", - "sha256": "0vsmj33qh07amkdlp5i0ldspxsw8pp16lwcq97i1xk59glif0n2f", - "fetcher": "github", - "repo": "legoscia/emacs-jabber", + "commit": "2652ea5e1df78690beb6d45041fa420532901d09", + "sha256": "09wf29r0hri6hlxc8pclj705m7sb43nqj836pxlc13zjbk74yrma", + "fetcher": "git", + "url": "https://codeberg.org/emacs-jabber/emacs-jabber.git", "unstable": { "version": [ - 20180927, - 2325 + 20220713, + 1538 ], "deps": [ "fsm", "srv" ], - "commit": "fff33826f42e040dad7ef64ea312d85215d3b0a1", - "sha256": "1fif38qhiaxskfmqin82n9334bzrkgd1h5ip1djcm571i670gj74" + "commit": "af0315e174fa6446d5c4dd3e6465d48912950e58", + "sha256": "08q0hbm4pvp8sf261w1ihqa93sg8blfybfkhq7wrnvgs6kasgwvq" } }, { @@ -59602,15 +59863,15 @@ "repo": "dakrone/emacs-java-imports", "unstable": { "version": [ - 20211006, - 2153 + 20220712, + 1653 ], "deps": [ "pcache", "s" ], - "commit": "7535a36d85497448a6e83579b822beaca7251ccb", - "sha256": "0zny134wxbwf4igzg9s4f4505hgjb7hy5l9ycqhl7l0ss2baz19j" + "commit": "bbb173c319a32b46680b5c0bffd72b607ed7b71a", + "sha256": "1wg8g4xf2gc9zalckkn35f49kl8ds2jqxqiiynk18r248axpkxkb" }, "stable": { "version": [ @@ -59990,8 +60251,8 @@ "repo": "Emiller88/emacs-jest", "unstable": { "version": [ - 20220114, - 213 + 20220703, + 1950 ], "deps": [ "cl-lib", @@ -60001,8 +60262,8 @@ "projectile", "s" ], - "commit": "760a783a190afb23e12cf3cf3d8949e9a53c7c79", - "sha256": "0j7dnq0ifad92gv2cx352zf5729imvb3y56z3sgcjx70dlcz61d6" + "commit": "398fcd7920dc3e9865574f5228baeaba03d1d297", + "sha256": "0xxv6ghhm6w4r1dr5pcnz8qm7bkk022v11lg71k56v168v55b2p1" } }, { @@ -60315,11 +60576,11 @@ "repo": "ljos/jq-mode", "unstable": { "version": [ - 20200604, - 833 + 20220610, + 1119 ], - "commit": "1af31ba701cf844f938f840ed78867c9a28174b6", - "sha256": "0zxqvy1vya0f0yrfp622hhf400cm5ygwl7mjdj5scwfk2y852xw1" + "commit": "071c1c29bac30351ad338136f2b625e5601365cd", + "sha256": "0idn59kab5y764vs9wnyrdfi4nf9rqyh727yv245afcq71g8zpzs" }, "stable": { "version": [ @@ -60376,8 +60637,8 @@ 20180807, 1352 ], - "commit": "b8b4e3e54118b38fd6003cb97e1ff6e456a24f26", - "sha256": "18wx2lrww2qa2ig7g2vry14ql767hyy01sf6kb6ml1f1fs0crqn9" + "commit": "f93e3724a6e1fbf0d45dbd1a30b3e08c46691778", + "sha256": "1gp2k7i9yhx801zfya0f37773hizx9gwr0lbmp46mz5sqygcz8gj" }, "stable": { "version": [ @@ -60567,24 +60828,24 @@ "repo": "mooz/js2-mode", "unstable": { "version": [ - 20220402, - 2211 + 20220710, + 57 ], "deps": [ "cl-lib" ], - "commit": "fed41615b26404e0bfd7e4f64643981ca798a34b", - "sha256": "007b4z3qpdy6apljb48aay9v1pf6pkrq0prhwhdqcqkq9rbghg7m" + "commit": "841cfec9570ae06a67a131997e2aff32340e81d7", + "sha256": "0whvhmgpv6yxqiljd1l4a880i0dhp0z0jxqaad7jjvwij07vvla4" }, "stable": { "version": [ - 20211229 + 20220710 ], "deps": [ "cl-lib" ], - "commit": "997cac4c80a03062145b541b006c51cc91ee0c24", - "sha256": "1wcz3xji7viqxa5is81jd7in7x1fya6rzybm8qj9rwgdc8camvyb" + "commit": "841cfec9570ae06a67a131997e2aff32340e81d7", + "sha256": "0whvhmgpv6yxqiljd1l4a880i0dhp0z0jxqaad7jjvwij07vvla4" } }, { @@ -60937,6 +61198,21 @@ "sha256": "05zsgnk7grgw9jzwl80h5sxfpifxlr37b4mkbvx7mjq4z14xc2jw" } }, + { + "ename": "jsonian", + "commit": "b6a2f221f15a20916fb6a90f57ea5c5c3a658751", + "sha256": "1ma51fby2gwv9izihv0sypwwfajpnj8arzhl98n2i5dhhj3mlnb9", + "fetcher": "github", + "repo": "iwahbe/jsonian", + "unstable": { + "version": [ + 20220708, + 1813 + ], + "commit": "7ad6d73aff49b346dc9f577ba8a450ac0a8d2aa5", + "sha256": "03q7d5mc0jlgmwxm0lmlrc5pcbpvdxmmbi8qm5wsk9xazdynn7fk" + } + }, { "ename": "jsonl", "commit": "7b74404824208b80bfd47478d105e1f17235b36b", @@ -61170,14 +61446,14 @@ "repo": "shg/julia-vterm.el", "unstable": { "version": [ - 20220524, - 1328 + 20220713, + 216 ], "deps": [ "vterm" ], - "commit": "c5f67a372777bb6a855ba2a89228a713c8dda957", - "sha256": "15h92yq88na3banbf7x0k99bya9z5216qckyrgx3f5ksdci1bbih" + "commit": "fef0df66e1de1733c4df706d76a4fc29788fe251", + "sha256": "1fk67c3cwv0iz0vkn9jaclvhzdsk3j5w13n51sigxgflhdpbr77h" }, "stable": { "version": [ @@ -61232,15 +61508,15 @@ "stable": { "version": [ 2, - 5 + 6 ], "deps": [ "cl-lib", "findr", "inflections" ], - "commit": "40a7ffdf734ffe7d1968909663146255d7ba69c8", - "sha256": "1ig1wdjg914p9ng1nir2fid4mb3xz2dbpmkdnfy1klq2zp0xw2s3" + "commit": "55caa66a7cc6e0b1a76143fd40eff38416928941", + "sha256": "03fh7i6blnbc0zbmp83fk095hr3q4fdvrvfxad74zghcbc2nk7b7" } }, { @@ -61383,31 +61659,29 @@ "repo": "psibi/justl.el", "unstable": { "version": [ - 20220312, - 1104 + 20220702, + 602 ], "deps": [ "f", "s", - "transient", - "xterm-color" + "transient" ], - "commit": "9f77366aaf2227bb0cbd3cdc0f78088032f2e873", - "sha256": "17l4lh9511dw4ri7csvp8258q59brhgrkir60kqmzxglrpmgjj6s" + "commit": "3c7f325132a88d27b0a5e0ea100869797b0cfc16", + "sha256": "0i1dqiyw3b9g70s8c5l6n5fmid433zyxdrcp71xs9smvcb43b6ww" }, "stable": { "version": [ 0, - 7 + 9 ], "deps": [ "f", "s", - "transient", - "xterm-color" + "transient" ], - "commit": "9f77366aaf2227bb0cbd3cdc0f78088032f2e873", - "sha256": "17l4lh9511dw4ri7csvp8258q59brhgrkir60kqmzxglrpmgjj6s" + "commit": "3c7f325132a88d27b0a5e0ea100869797b0cfc16", + "sha256": "0i1dqiyw3b9g70s8c5l6n5fmid433zyxdrcp71xs9smvcb43b6ww" } }, { @@ -61883,8 +62157,8 @@ }, { "ename": "keg", - "commit": "78d46bbc822f5df56aa83b986a4f283949533d5b", - "sha256": "1cmbpak0rn6xz0ccpn1629qp0wn7rpv40js4jr958a2z89448g3g", + "commit": "570bde6b4b89eb74eaf47dda64004cd575f9d953", + "sha256": "0kjvck3ndna71sn29a0ym2d0jbihm92kbkvnd3rbdrja0xkndil9", "fetcher": "github", "repo": "conao3/keg.el", "unstable": { @@ -62313,11 +62587,11 @@ "repo": "emacs-grammarly/keytar", "unstable": { "version": [ - 20220222, - 639 + 20220704, + 626 ], - "commit": "468b528add57e15c2413c8984937fb428fb257f3", - "sha256": "1r481kpijmyawv5v32y202nz932mv24l5v7vrgandrjnaxjv0kgs" + "commit": "4b874662b2eb19d31426faa061d1307359f10013", + "sha256": "1frbnm2zsag28yz84zpsm17lfm623awx826n3b6ycy24j3vkibkp" }, "stable": { "version": [ @@ -62572,8 +62846,8 @@ 20210318, 2106 ], - "commit": "37292f00a8a457762a94011d7719e2c7d03d821c", - "sha256": "1zagb6lx5nhn1za7ybkdz6b33vmmw0k7ms3swxgw1fv2dzyqns4c" + "commit": "a921b58baa9bb4b57025a68557a3630f9c018918", + "sha256": "1a6plr8w6c21lbmlg3jk0ig4xq9bbabf0ys54w4qyxyrqdxf9lhz" }, "stable": { "version": [ @@ -62881,8 +63155,8 @@ }, { "ename": "kubel", - "commit": "6fe35f90b858d0b6710b4bae8a2b80f97f1b8228", - "sha256": "17xsy0kj2dskmr8mmrlvhkrylzgbfd0jqay9qa9avzlh24v85jcm", + "commit": "570bde6b4b89eb74eaf47dda64004cd575f9d953", + "sha256": "0ih1yld98bnkx9lr880d2r65g5ycd52yd29bklmw7gdwvmmqr7cp", "fetcher": "github", "repo": "abrochard/kubel", "unstable": { @@ -62947,14 +63221,14 @@ }, { "ename": "kubernetes", - "commit": "870901c45fb35384953568a972aa36ad445e1ad9", - "sha256": "07x770fcnjg0545bml3jqmd9d9l1bw8i8i4imznqhwx3acm8grzy", + "commit": "570bde6b4b89eb74eaf47dda64004cd575f9d953", + "sha256": "01430ql2z9fdhbadqacbl437vbf4fhcsanysf0d37i0aggjm9hag", "fetcher": "github", "repo": "kubernetes-el/kubernetes-el", "unstable": { "version": [ - 20220331, - 1314 + 20220715, + 1717 ], "deps": [ "dash", @@ -62965,24 +63239,26 @@ "transient", "with-editor" ], - "commit": "e0d0cd6b949802fe63ff8940cc743cc7efedb089", - "sha256": "1xnl8bci3j0l14gkb0n23kr4867cmypyxcydjn59niwab9srg7pm" + "commit": "8163fd38015cbde0485f6eaab41450132bf6e19d", + "sha256": "06p5qz4h5ar86vv4nzpw08x18fjvs2zg5brx55h80hjdgr89b771" }, "stable": { "version": [ 0, - 17, + 18, 0 ], "deps": [ "dash", "magit-popup", "magit-section", + "request", + "s", "transient", "with-editor" ], - "commit": "da188a441079b91a66a3fce9bf200e880bc82abd", - "sha256": "0xxxiqqn8n2a2fa49fijpbg2j7cc92s7vj70dz6hiw0782ql2078" + "commit": "b155d64aa72bd1175770db3518a67a347caa36dd", + "sha256": "169wyzkm7s260q1f61nkr9ys827disa2gj1shchz52g2qwxp9212" } }, { @@ -62993,28 +63269,28 @@ "repo": "kubernetes-el/kubernetes-el", "unstable": { "version": [ - 20211225, - 300 + 20220625, + 534 ], "deps": [ "evil", "kubernetes" ], - "commit": "e0d0cd6b949802fe63ff8940cc743cc7efedb089", - "sha256": "1xnl8bci3j0l14gkb0n23kr4867cmypyxcydjn59niwab9srg7pm" + "commit": "8163fd38015cbde0485f6eaab41450132bf6e19d", + "sha256": "06p5qz4h5ar86vv4nzpw08x18fjvs2zg5brx55h80hjdgr89b771" }, "stable": { "version": [ 0, - 17, + 18, 0 ], "deps": [ "evil", "kubernetes" ], - "commit": "da188a441079b91a66a3fce9bf200e880bc82abd", - "sha256": "0xxxiqqn8n2a2fa49fijpbg2j7cc92s7vj70dz6hiw0782ql2078" + "commit": "b155d64aa72bd1175770db3518a67a347caa36dd", + "sha256": "169wyzkm7s260q1f61nkr9ys827disa2gj1shchz52g2qwxp9212" } }, { @@ -63308,8 +63584,8 @@ "highlight", "math-symbol-lists" ], - "commit": "1fb1d9aa8d162279e0496d976b286fffc721f332", - "sha256": "0qwv6jpszhp47hx4bmj5qp85lpmcka75c7f1jsd8q10r95gmd7l4" + "commit": "2933ac40c75a53b773b421a7069741c5aa07c0a8", + "sha256": "07lcfi4c9jgk285g586zvmlkxhsyn9gwbk6si543qlnm760mlbfk" }, "stable": { "version": [ @@ -63406,8 +63682,8 @@ }, { "ename": "langtool-ignore-fonts", - "commit": "9792610d9325ce5f0cc7d07a621755d8fadd90c3", - "sha256": "1vivb57kyd3gnigf8j1xhnpn3d6jxcs5rb3699qyc18w1zk4y154", + "commit": "570bde6b4b89eb74eaf47dda64004cd575f9d953", + "sha256": "0fgj0807mq8izii4yx1187gdn2ybr2g5pdp9628sfssm9a3v8iv2", "fetcher": "github", "repo": "cjl8zf/langtool-ignore-fonts", "unstable": { @@ -63448,11 +63724,11 @@ "repo": "lassik/emacs-language-id", "unstable": { "version": [ - 20220411, - 1932 + 20220702, + 529 ], - "commit": "5325af36d9cd726de47a698ac159fce59f3fd6d9", - "sha256": "0fyalqpipw6855dacrv72fqmvbmn7nvbgb5byz8wl68qpykyla6b" + "commit": "1d05bb74075879351a33fedc363a5f375a18b8e5", + "sha256": "0msirbjyf5daaycq3zvwsl4gxhk5lw1nxd492wzj4rb1m7dm4wk4" }, "stable": { "version": [ @@ -63557,14 +63833,14 @@ "repo": "slotThe/change-env", "unstable": { "version": [ - 20220531, - 726 + 20220710, + 933 ], "deps": [ "auctex" ], - "commit": "b5c31c9551bea70835762360a57407fba6e37b4e", - "sha256": "1q88pg2izz2m22n0xgd281vhna5znrs3q6nfg3v6bkxp73y17k13" + "commit": "4e6f75f678b207b3bb5031c8b2e31f8d577df445", + "sha256": "1bggvbs9q9yq1p8v188h2hgnhg405n8zjxg8az6h30kpkw8nz04g" } }, { @@ -64119,11 +64395,11 @@ "repo": "ledger/ledger-mode", "unstable": { "version": [ - 20220604, - 1632 + 20220623, + 1125 ], - "commit": "1e6ddafa0fdf8f009c35488fdd6d0b0c8485ad34", - "sha256": "1f2djjxr8sy9adysprfk5zk9dkphnfa4dcv8hzknszchjm6a3lgh" + "commit": "8bad528d43007e0310b5e72e6e021b502b30495c", + "sha256": "11s33ajzjhqjqxilwn06v79vndl3x61z35c0cr5s641h5lxlj442" }, "stable": { "version": [ @@ -64143,11 +64419,11 @@ "repo": "fgeller/leerzeichen.el", "unstable": { "version": [ - 20170422, - 1313 + 20220626, + 835 ], - "commit": "5acf9855ecb2b2cd5da4402bb48df149e7525cc5", - "sha256": "1bx4pv51a9x8f51pjrms8jkfrpa3glwkh308svz05gnyi2g0r8hw" + "commit": "9d4126d5f6563569080845a69b0867119a9fd6ea", + "sha256": "0wfv37gjj8zbbpwj0l5djhqbn7bzznlr4crl96y87l7dk3z090j7" } }, { @@ -64444,11 +64720,11 @@ "repo": "rvirding/lfe", "unstable": { "version": [ - 20220102, - 1653 + 20220709, + 1956 ], - "commit": "6e1e42768d40528e7a13f7cebf0a56cffbeda3c6", - "sha256": "03ml1jk2d25f7rcz08f4g354sw3vb4yx5fanqaa9dnkr9zwrn9wr" + "commit": "d10af0a774d6d9c41ea78fe0185fdd0065a05d66", + "sha256": "1v9xawdmbbrqcax1n47dgysjr14nv1db63kmrjs8qq0ci9jb66dc" }, "stable": { "version": [ @@ -64552,11 +64828,11 @@ "repo": "magit/libegit2", "unstable": { "version": [ - 20210620, - 2017 + 20220620, + 1118 ], - "commit": "77bd28aeaa2a49962e8f714741f5a69b656a2183", - "sha256": "19sxrikxl0kbfnbl2rdjvj96l9abmqhi68jj5hglgpa8qp3flc24" + "commit": "3f3d600f1708afbac449d02046e05782ac974866", + "sha256": "0q20rchhiqqj7khzgkph3cpfp536yd836j8y8cy2s2zpj5j0mpra" } }, { @@ -64605,20 +64881,20 @@ "repo": "mpdel/libmpdel", "unstable": { "version": [ - 20210627, - 755 + 20220706, + 1952 ], - "commit": "e4ae63dd002fe07835c3c8a35b20b6e8347f8e84", - "sha256": "0pryjihv1766x86lqy2anpxwr159dndlzmqxxiiwhhz4skp5498w" + "commit": "c27c08949a742a888eb9921a8528882b2aec6137", + "sha256": "1lp3ld38x0s982zvpgj1hfky3wsdfwjii1yp5j7rq5n6si97aw7i" }, "stable": { "version": [ 1, 3, - 0 + 1 ], - "commit": "b49ab2fe497d61d7d00ed1ad0c3b5a1d6a65e5c4", - "sha256": "0krxhcay5s9s7i41q7ga5skj31vaz2qx3djcrlwajf203bl8j4m9" + "commit": "8cf3512a437251863d56ba4933a8dd53988b1d6d", + "sha256": "0fsg2si7afrnsz91i0ziza6nbc4ds9kpnr2z71wf6896zb1afhfx" } }, { @@ -64688,14 +64964,14 @@ "repo": "jcs-elpa/license-templates", "unstable": { "version": [ - 20200906, - 2047 + 20220704, + 654 ], "deps": [ "request" ], - "commit": "053e7f6517b20d5c9c93952428bd7d98a2700722", - "sha256": "1x99hanrlr8x07d16v19k00q9jgq3s121wsxr0x97d6dpi9hq8l5" + "commit": "8182fa959477388b61c3a5d226e88e63ca2e87d3", + "sha256": "1azzb9cyc4k9sj0gab22d5qx2jfbxzzs89185jzhabappyf4zj5z" }, "stable": { "version": [ @@ -64736,8 +65012,8 @@ 20220209, 755 ], - "commit": "c917420838b088da68b148652d3be468d7b746b5", - "sha256": "1mwa0ggbw4v8cd3v9l2rsydn0hklzc5z37gfxljg843v9b594z97" + "commit": "ff6f66193048893cafcde6985c0ac0c78f76a875", + "sha256": "04cl27697wp38h92p2qv3fq4aagai3vr5lq71xzsh363fmy7ls3p" }, "stable": { "version": [ @@ -64757,8 +65033,8 @@ "repo": "emacs-vs/line-reminder", "unstable": { "version": [ - 20220502, - 1210 + 20220704, + 630 ], "deps": [ "fringe-helper", @@ -64766,8 +65042,8 @@ "indicators", "ov" ], - "commit": "e8fe451f1c22ad2f90c82da42b4da73d5152d835", - "sha256": "1yfvzyy1gkk53ivlzcxpyl2dp6hhw127sl7bkg0ansgdfsnm1zgl" + "commit": "e0fa3c93ff7e422507812b6ac414766fe4d9b1e7", + "sha256": "09jv8zgskljn7bwmr6crm55g6kinfjlndjpzqqhz40z07n4kkpgh" }, "stable": { "version": [ @@ -64869,6 +65145,21 @@ "sha256": "12b9i3rdh16pq9q88bsg771y11rrbj9w74v2qr2bfymbp358qk17" } }, + { + "ename": "lingva", + "commit": "413857d03eb724337ca610c61b8ffbb15eee9aed", + "sha256": "06m8fy9a40zy9sw93f7g4szwr6h2w11dmykbfyswgpxxpaxarkzw", + "fetcher": "git", + "url": "https://codeberg.org/martianh/lingva.el.git", + "unstable": { + "version": [ + 20220623, + 954 + ], + "commit": "2032ffdcace23cca0a2ad4345352c20c1580be9e", + "sha256": "1xfjbqf42jb78w1qddxi0iac5qqbaljarn46ydymm6ak1cwhfpz8" + } + }, { "ename": "link", "commit": "5b08ed7b90e3283e177eff57cb02b12a093dc258", @@ -64900,14 +65191,14 @@ "repo": "noctuid/link-hint.el", "unstable": { "version": [ - 20220414, - 56 + 20220623, + 2310 ], "deps": [ "avy" ], - "commit": "a24546e0dee901bce94e3a11c20b1ed12a22b9c6", - "sha256": "0zdsm2wp04nlnlixgwgrs49hcg6a0pwyxv44y9is449kk5593m11" + "commit": "54612293cc4e01df639c41597cb83a633b0f5514", + "sha256": "0mk65vglhx8z7a1j7ag5rxqbpxjqmk0zb6fihb6gh29d8qlcppfl" } }, { @@ -65009,11 +65300,11 @@ "repo": "jcs-elpa/liquidmetal", "unstable": { "version": [ - 20211004, - 1429 + 20220704, + 654 ], - "commit": "13738280c854654b8118f90c9ab1a6a74410f0c4", - "sha256": "0c5qzp3zw5nz8hwv3zxy26bh67bsxkrnal596c6m8x8747rfvd31" + "commit": "2d8df67f62b3aba0ea3c1dcdd41d83e39e3d8f8f", + "sha256": "1x8allkw2az7g6nz9fbak917rd0gydhvcaqs66xx61qhz26sfr0z" }, "stable": { "version": [ @@ -65166,16 +65457,16 @@ "repo": "noctuid/lispyville", "unstable": { "version": [ - 20220519, - 2339 + 20220715, + 29 ], "deps": [ "cl-lib", "evil", "lispy" ], - "commit": "32d6b1f4b3f5bc792a0610c7e91123a70b582a91", - "sha256": "1h87j2yc79skb56i8j5239nr0hialgwg0fkz418caxzkrjglrf8m" + "commit": "14ee8711d58b649aeac03581d22b10ab077f06bd", + "sha256": "1jlxcr9vikczhryw3xslfy6hzs2ikcf9khbwaw53ymwdxrmphcci" } }, { @@ -65476,11 +65767,11 @@ "repo": "jingtaozf/literate-elisp", "unstable": { "version": [ - 20220524, - 217 + 20220626, + 932 ], - "commit": "4bfc686f5ee5d781f99d6d4d9b7dd057054c8b1c", - "sha256": "0r0mzfj6yxlzh89cs249s2xlryi6z6acvd43picz0jv7ff616fph" + "commit": "62c9ed0478d7e8aa832f848074e15c5be2a0cae7", + "sha256": "1z5cvbrpvz24xc8fm753rz3phkmpfpq77kh4r57qcp3fssy8rn02" }, "stable": { "version": [ @@ -65606,8 +65897,8 @@ 20220518, 204 ], - "commit": "054b959fef7e696864ae29575583d0dec414f2d6", - "sha256": "0ldrdl9bqjfc472wn8qp3d9mj6kadcl082cl106bgl0p365ngarj" + "commit": "0f8ff5d19ccfcc4326a4b7aebea2f8981e058c69", + "sha256": "1vd7sxcaksvl08apq9frbwl1gqgnay6jl47rw4axnmdhwmhi1jh1" }, "stable": { "version": [ @@ -65994,16 +66285,16 @@ "repo": "jcs-elpa/logms", "unstable": { "version": [ - 20210721, - 349 + 20220704, + 654 ], "deps": [ "f", "ht", "s" ], - "commit": "f9addea83793b771b3a61d167ed5419749a349c1", - "sha256": "01yjhy33i0c8xswkqajjj6ibn0xi9s0vlblnng0q7gi4h3glfxwf" + "commit": "c5c2e8c3850417d8c1b0733b77a364002805863c", + "sha256": "0ifjv4c13jd2cgq3l3n88bsca2nayk40wm3v08a86ywmr9bpfrfb" }, "stable": { "version": [ @@ -66081,27 +66372,27 @@ "repo": "doublep/logview", "unstable": { "version": [ - 20220607, - 1757 + 20220609, + 2003 ], "deps": [ "datetime", "extmap" ], - "commit": "a17cafb5445b584e8fa386709192317da5ac4530", - "sha256": "0ck9milv8jv0qxqbb77f1z5q36d8c3hwgryq3mxllc2i0mvssyq6" + "commit": "6446ccf25f834519d7f5c71e5293b062d599b355", + "sha256": "1gnslcf30zpx4nsiimwskwgfwpx6ghx69b83azc0wpi2pj8gv40s" }, "stable": { "version": [ 0, - 14 + 15 ], "deps": [ "datetime", "extmap" ], - "commit": "249663d768a4ab763e0e7bc6974cff047e774794", - "sha256": "1cchmr25z5zj7rgb2fyxkaq8kpw7i5yg1pvn42dvm09c2wrfbj46" + "commit": "b2068d5014ef963b8f6db1f16c18b151040fec20", + "sha256": "08bn7fj336krlrsf7flk0fgx9mdkd44vq8sxyx6s1c1q5bc0hqnk" } }, { @@ -66175,11 +66466,11 @@ "repo": "petermao/look-mode", "unstable": { "version": [ - 20220313, - 2103 + 20220626, + 641 ], - "commit": "4ab32794b07f77b1d243dc07239c417f20cab7b8", - "sha256": "0k7mnwqkd07lwwbb7vn5bfncrp6alfggv9m07bzk7c1v4s9fqwhw" + "commit": "726c5b9098926278603a83e978b488371c0e9143", + "sha256": "00c9v9jp7bgqr0bi0j6fhl6j2fj2xfk7lxrczxbcsvpx1896il93" } }, { @@ -66213,11 +66504,11 @@ "repo": "0x60df/loophole", "unstable": { "version": [ - 20220311, - 1130 + 20220611, + 1100 ], - "commit": "bd93fcd42fc2db76bf6bc3fbb4eb7401444bd04d", - "sha256": "15q0y594k5k9n96dygscc4a6jyslwri5z8sf1kg1shpkwyj3bjyz" + "commit": "f7e9cca980b7467a03d9a161a5e9e5a828bfd6c9", + "sha256": "1g6nlv5h0gly56jypfmcdkisrd7xisgm5pyrw3wcxklgkkw2ym1a" }, "stable": { "version": [ @@ -66349,6 +66640,25 @@ "sha256": "10sab50wmr3zn7jgzx93201ymhmacqacn3m2qllsqkfw2gpsi6dn" } }, + { + "ename": "lsp-cfn", + "commit": "fb4a72ac66cddde37bacaab013d237dfc2ba3171", + "sha256": "1cm8imzp5pr8pppzqnm83xv6sckz76da831d67sdm2lh0hqdjl81", + "fetcher": "github", + "repo": "LaurenceWarne/lsp-cfn.el", + "unstable": { + "version": [ + 20220707, + 824 + ], + "deps": [ + "lsp-mode", + "yaml-mode" + ], + "commit": "8228864e0b16f7107300fb6b8ba595bb84f016fd", + "sha256": "1gshnby7682ymqk6n10n6sr42grlbbwny1n887s5w348z6vlxq93" + } + }, { "ename": "lsp-dart", "commit": "acbba6bc6f1bb6e1153f1f75ca1dc025bb5a8993", @@ -66357,8 +66667,8 @@ "repo": "emacs-lsp/lsp-dart", "unstable": { "version": [ - 20220522, - 1902 + 20220620, + 1516 ], "deps": [ "dap-mode", @@ -66368,14 +66678,14 @@ "lsp-mode", "lsp-treemacs" ], - "commit": "4d28d13d8b468bfb8f992da0ea450269d672562c", - "sha256": "1z936j2x5sy5hagn0i4a4j16ippmkh1d2ccd7kw6ilal4zi4smk9" + "commit": "7868b87ab27cf96878ded35c390e15bb5bb588e6", + "sha256": "1p93bg44lz1wh5xap592kjfjvg0m599418qn7ybmbx7j1l68m15v" }, "stable": { "version": [ 1, 22, - 0 + 2 ], "deps": [ "dap-mode", @@ -66385,8 +66695,8 @@ "lsp-mode", "lsp-treemacs" ], - "commit": "4d28d13d8b468bfb8f992da0ea450269d672562c", - "sha256": "1z936j2x5sy5hagn0i4a4j16ippmkh1d2ccd7kw6ilal4zi4smk9" + "commit": "64c93a047b19b5564cd8aa55dca2189d94dc3a71", + "sha256": "083alvmnl5210b8rbayxy4ga76876pnwm67p2kbm8c5j4i27wpd2" } }, { @@ -66451,8 +66761,8 @@ "repo": "emacs-grammarly/lsp-grammarly", "unstable": { "version": [ - 20220530, - 2101 + 20220704, + 626 ], "deps": [ "grammarly", @@ -66461,8 +66771,8 @@ "request", "s" ], - "commit": "d56ca607cd597e622969c91a78ec74e463260b32", - "sha256": "1rxnfzdyv4ad0b3b1prgxhpnk9y9ayjr5s9r7x38ch43khfqz0cq" + "commit": "ece2c7d8c119213d4622deca756f4affedbabc42", + "sha256": "1yfvmdcpa9qr2vmh6lkxip5vmxj5z7rb9k4fn1xvbw5hbdljpmgx" }, "stable": { "version": [ @@ -66558,8 +66868,8 @@ "repo": "emacs-lsp/lsp-java", "unstable": { "version": [ - 20220325, - 547 + 20220623, + 455 ], "deps": [ "dap-mode", @@ -66571,8 +66881,8 @@ "request", "treemacs" ], - "commit": "39ca56e24d6f9db2c9d889f79808713e4afde027", - "sha256": "011c2b25k650fbxvpifmld6v0bga1s5679zfl10f1srhlk56p47v" + "commit": "a1aff851bcf4f397f2a968557d213db1fede0c8a", + "sha256": "1qbgs2r92fbrhwxdpwzmfmac7vhcfc26i90a23pxk50dbh5byyyb" }, "stable": { "version": [ @@ -66713,14 +67023,14 @@ "repo": "emacs-languagetool/lsp-ltex", "unstable": { "version": [ - 20220508, - 533 + 20220704, + 636 ], "deps": [ "lsp-mode" ], - "commit": "8a133cee26ea8c69831817295136c985039f19ce", - "sha256": "0zfwn3nald6w4xi3swnrd098sinaw93w4aaqdfhdqkq90j81whri" + "commit": "1e99307a49f88e92afc4245f3ddaa130b355ab3e", + "sha256": "188c3acqk8n54lrpbxq7h9djxwmri75z3r9szd5knfbc8x8crhns" }, "stable": { "version": [ @@ -66745,8 +67055,8 @@ "repo": "emacs-lsp/lsp-metals", "unstable": { "version": [ - 20220510, - 1457 + 20220712, + 1400 ], "deps": [ "dap-mode", @@ -66758,8 +67068,8 @@ "scala-mode", "treemacs" ], - "commit": "6980fb902c3c7b43ff0d4056a6cd7d8b4709866e", - "sha256": "0v2zj1jrgvx6gwhp414v9jg8j0qz724dv2fh8xwqksl5qjiq6kaz" + "commit": "39cda6e693e5caad27453d10759897822678d573", + "sha256": "1j2vsvzsnqv8kc1x7ni3jimibn032yxxcf2wxx3ii3z0w97qpb3s" }, "stable": { "version": [ @@ -66789,8 +67099,8 @@ "repo": "emacs-lsp/lsp-mode", "unstable": { "version": [ - 20220607, - 937 + 20220716, + 814 ], "deps": [ "dash", @@ -66800,8 +67110,8 @@ "markdown-mode", "spinner" ], - "commit": "358b5df8df10b4837193af78c2e72df2c381b1fa", - "sha256": "1bqd1ga9jcwhkcm527sisx65lvh3lfsg01xln0iilyi2y7ahvzy7" + "commit": "e4cc46d754bd0cd55e67eed56381bd525ee67fa9", + "sha256": "06dvaw4bdw1815nfzhk2vdcfqhgnpha1jb0l100h908qbbjr232m" }, "stable": { "version": [ @@ -66948,16 +67258,16 @@ "repo": "emacs-lsp/lsp-pyright", "unstable": { "version": [ - 20220411, - 1753 + 20220614, + 1545 ], "deps": [ "dash", "ht", "lsp-mode" ], - "commit": "ab7369d96f4d7d058d0e06e743f86fda8ecc191c", - "sha256": "0dr47dhp0ymb4gmx4xiayiapbkri1hgr2faivp4fqs6gz3w4z4kn" + "commit": "c745228f39fdb35372b29b909f25fa6c98dc7c88", + "sha256": "0rwy6c4id2hihvdgkmvbw4n51kv3pqwk2wnhyhsarnlmk7v8drdm" }, "stable": { "version": [ @@ -67023,6 +67333,38 @@ "sha256": "09jh4q3i0b71srfpsr4w0jk5rn9rz359v8k1pk80636g7448k8gl" } }, + { + "ename": "lsp-scheme", + "commit": "d98529f8e0e54fe957bcf9773fea39ec3b4e91f5", + "sha256": "1qynbm4r6kzpgsmi1xlszpqx28317dfc411y2srlr75kwjykc84a", + "fetcher": "git", + "url": "https://codeberg.org/rgherdt/emacs-lsp-scheme", + "unstable": { + "version": [ + 20220716, + 808 + ], + "deps": [ + "f", + "lsp-mode" + ], + "commit": "16fd04af47fb2168707ed0c455acfcd9c52839f8", + "sha256": "1zd7injh2h02k0z76d7rq4cjaq3krj6jbnnwdna1ngx2vfri16mm" + }, + "stable": { + "version": [ + 0, + 1, + 1 + ], + "deps": [ + "f", + "lsp-mode" + ], + "commit": "c18afd39c841201c811583ff449a495d835b4773", + "sha256": "1h46bqpmnig64yhamniyi8wia256jm0diqqql0wxwi1pw25dcwa6" + } + }, { "ename": "lsp-sonarlint", "commit": "b46e83f2ea2c4df1ef343c79c7e249605c9639b3", @@ -67150,30 +67492,30 @@ "repo": "emacs-lsp/lsp-ui", "unstable": { "version": [ - 20220514, - 2010 + 20220714, + 1453 ], "deps": [ "dash", "lsp-mode", "markdown-mode" ], - "commit": "a0b97db2ada163453c9072d3640202a0b27c29f5", - "sha256": "1dpbx7mny2h7qrd67z6n0grl6nv95zwc9yiiv5b0fby6gank5hv9" + "commit": "9a8983d95d823ae62e5f842a4bd433c860131398", + "sha256": "1pd5lvjlmd6zq64py21yi5zxhcza9g5q48ngfivv7fi7pf3vsv00" }, "stable": { "version": [ 8, 0, - 0 + 1 ], "deps": [ "dash", "lsp-mode", "markdown-mode" ], - "commit": "b625f3cb5e88559ab99bec58f7a14272edb296bc", - "sha256": "00yirx6qzlb8fv8rd53zaw93nw72z3br40rb16scdqj1v20qsp47" + "commit": "9a8983d95d823ae62e5f842a4bd433c860131398", + "sha256": "1pd5lvjlmd6zq64py21yi5zxhcza9g5q48ngfivv7fi7pf3vsv00" } }, { @@ -67266,8 +67608,8 @@ 20220328, 1301 ], - "commit": "924dcda3e4212c0b28e8ce140b9d8e9a1117c5ef", - "sha256": "0gq5f2jg0nlmqg6vlgkvms0axa1yjqbql6xjkgv1qh5iwwgkiinx" + "commit": "3e72cd3474d2668199aec7d2549d852ffe65c8bf", + "sha256": "0kv508dfd7g6vcw8g0kg9ff1iwmmchg7x8w2ln4z3c15vyjpyyh3" } }, { @@ -67494,14 +67836,14 @@ "repo": "amake/macports.el", "unstable": { "version": [ - 20220606, - 34 + 20220708, + 1127 ], "deps": [ "transient" ], - "commit": "bb5c789af7adaaf5b7c0a6013d0397b4cd801b10", - "sha256": "0v63m2i505074i63642ywiaplis65mszg66rn4h7r7x960a6bpyq" + "commit": "b88a924e8e1036e6066a81273c38a8da36b5b4c8", + "sha256": "1vx1s9lpmpaxb3xscrkkjn75rn4dnijj42sdqs289j3hczsb1x29" } }, { @@ -67664,11 +68006,11 @@ "repo": "roadrunner1776/magik", "unstable": { "version": [ - 20220422, - 837 + 20220702, + 1158 ], - "commit": "af1b83786c95d448dcb4df5406eb1cdba975abf5", - "sha256": "0aa1fg658j11990h9dfv9n92qa1f36szamfnq37pw27d08n4vkb8" + "commit": "a7c5553d2780640630d31b469d522ecffdf052f5", + "sha256": "1ba68m3liacpc3x3391h92sz4q6v4lqq3kcxpn2p3h16rpdikkd7" }, "stable": { "version": [ @@ -67682,14 +68024,14 @@ }, { "ename": "magit", - "commit": "2133b10c735ce47fc8d8ff8c51f29ec4b13982a3", - "sha256": "12g26kc5lzyj02wr16qhkh2p5ac8aaxj2dkw2zd0ymnmskpgwzbx", + "commit": "570bde6b4b89eb74eaf47dda64004cd575f9d953", + "sha256": "0k40mk3q5a08ay4sqhh0lmfpjx6zn9van08yjhaw24ayi6l6a78w", "fetcher": "github", "repo": "magit/magit", "unstable": { "version": [ - 20220607, - 1443 + 20220706, + 148 ], "deps": [ "compat", @@ -67699,8 +68041,8 @@ "transient", "with-editor" ], - "commit": "2dfeaa6839c643a54d96c9f855bae11d5cba2453", - "sha256": "052zdj08296s34b7a5p6fapxym7ni1mlw3iqpvw6jhkv9qihmqv2" + "commit": "acd26dd9f3708602d4c721395d790a4af7937eed", + "sha256": "05xfkk4dssqcf1kgxjlr74nya7nbkjmvqhqj6rmxbq89yb46nim5" }, "stable": { "version": [ @@ -67779,14 +68121,14 @@ "url": "https://codeberg.org/ideasman42/emacs-magit-commit-mark.git", "unstable": { "version": [ - 20220511, - 2341 + 20220708, + 211 ], "deps": [ "magit" ], - "commit": "ce2cd6daeb46eaea597a3b2c9d9ead80da9f0d09", - "sha256": "0kawy31kd0ywmrz705i5yf7blpd3zllpik0688j7cn0rq663vv2r" + "commit": "c7008bf9fff5e94060a7483ca68d0627d52f4460", + "sha256": "14fd3xz56liah973cm9mmbwp3ml8zs14dpmfbypxs2mcx5nsjbk7" } }, { @@ -68033,8 +68375,8 @@ "dash", "magit" ], - "commit": "8ebe246f20f4ab5c9f191c38137833c7f01a0432", - "sha256": "08ild7xc9m8pvkb23x5kxdc7ar7gz7470fng1f0zjlk4izbf1nh5" + "commit": "7bf66a164504bcc9564507312a6e95c839cdac30", + "sha256": "1rppbxvbj0h03s5n66h7vahk53rw8zwxlfvix4lwl7nqqqhkd8m3" }, "stable": { "version": [ @@ -68058,16 +68400,16 @@ "repo": "magit/magit", "unstable": { "version": [ - 20220429, - 1720 + 20220615, + 1159 ], "deps": [ "compat", "libgit", "magit" ], - "commit": "2dfeaa6839c643a54d96c9f855bae11d5cba2453", - "sha256": "052zdj08296s34b7a5p6fapxym7ni1mlw3iqpvw6jhkv9qihmqv2" + "commit": "acd26dd9f3708602d4c721395d790a4af7937eed", + "sha256": "05xfkk4dssqcf1kgxjlr74nya7nbkjmvqhqj6rmxbq89yb46nim5" }, "stable": { "version": [ @@ -68215,15 +68557,15 @@ "repo": "magit/magit", "unstable": { "version": [ - 20220513, - 1429 + 20220615, + 1159 ], "deps": [ "compat", "dash" ], - "commit": "2dfeaa6839c643a54d96c9f855bae11d5cba2453", - "sha256": "052zdj08296s34b7a5p6fapxym7ni1mlw3iqpvw6jhkv9qihmqv2" + "commit": "acd26dd9f3708602d4c721395d790a4af7937eed", + "sha256": "05xfkk4dssqcf1kgxjlr74nya7nbkjmvqhqj6rmxbq89yb46nim5" }, "stable": { "version": [ @@ -68818,14 +69160,14 @@ "repo": "jcs-elpa/manage-minor-mode-table", "unstable": { "version": [ - 20200717, - 809 + 20220616, + 1932 ], "deps": [ "manage-minor-mode" ], - "commit": "884aca19bd6affec69c58cbfcac46bab4cd87bde", - "sha256": "1y000660813hdpzjl2bx699qi8am90qrhxnykfr1zjiv4i942sja" + "commit": "e47d0e1856f0a9eb9935abdaf6e14e67ef2ab4cc", + "sha256": "1aqmm5r0wqdfvac3nqwpali2b8lk7vwjs9fww5dhcwmsna8mr9vk" }, "stable": { "version": [ @@ -69001,11 +69343,11 @@ "repo": "minad/marginalia", "unstable": { "version": [ - 20220426, - 449 + 20220707, + 914 ], - "commit": "26f2bd9ee7b63bcad6604108e2f565b34bc6083b", - "sha256": "0bbmhgcx6266rljbw641c7q8q7ygz8i4xvk6zyaqwvmnq09xqfch" + "commit": "4fe73f5724d1e7e61b2e0abf4a530d8a2cdadcb8", + "sha256": "0ini275pkw5dy7y6jhrsddaq2z1lb744b8mdlyfssy0hs53abszg" }, "stable": { "version": [ @@ -69121,11 +69463,11 @@ "repo": "jrblevin/markdown-mode", "unstable": { "version": [ - 20220603, - 300 + 20220708, + 6 ], - "commit": "1f709778ac7990f4a07fdf11fe37bc6541810b29", - "sha256": "1gwx11rzyaz7ym5lzaddcr1mz1pzysykz8kajkkfx2rq65k9skpw" + "commit": "0b8dc23724caa66b18bded28c08f7516cba9d292", + "sha256": "0k3ff8dngak6znsn5k5v9g6hv15d4h942wkcrij6g3kcl2zpa2dg" }, "stable": { "version": [ @@ -69187,6 +69529,39 @@ "sha256": "0a0qskhy6jil583hq3mgbzdsi3m1schzyzrd46yfxdsvqiczg170" } }, + { + "ename": "markdown-soma", + "commit": "cced3200cd4a0998e247e3bcdbb4042a3963d45f", + "sha256": "0alw4mppvh1m8in6kh1vjka7c05yinv3jckd4jaxphlvh0ngmb9k", + "fetcher": "github", + "repo": "jasonm23/markdown-soma", + "unstable": { + "version": [ + 20220716, + 347 + ], + "deps": [ + "dash", + "s" + ], + "commit": "f78ffe4ef3e2f4ce8af818c719148b17acf51097", + "sha256": "1l0dahrd9dlimja1m0l9qxjynpmy27aic0xmn29jgca949c0qj8z" + }, + "stable": { + "version": [ + 0, + 2, + 0, + 2 + ], + "deps": [ + "dash", + "s" + ], + "commit": "507ca274e901aca86cdf84b03218dac3df920812", + "sha256": "1skb7dkpn5s2kv114qysj7h7cwff7diqhfzc322wmj5lbwdicxv5" + } + }, { "ename": "markdown-toc", "commit": "4db1e90be8e34d5ad0c898be10dfa5cd95ccb921", @@ -69244,11 +69619,11 @@ "repo": "Shirakumo/markless.el", "unstable": { "version": [ - 20190306, - 1002 + 20220702, + 1154 ], - "commit": "75fdef45df96978e9326ea4d9bf4e534a250c4c0", - "sha256": "0fxvpd4gij78d53czyzskfly3wljnad84vnjv6lv14pcz2w9z3y0" + "commit": "9c846f58575a446812f7bade284021b625976757", + "sha256": "1nx7azwyj4q0a76n76496krv07rxvqbla3j5z8jg77yrvbv40vnl" } }, { @@ -69333,11 +69708,11 @@ "repo": "jcs-elpa/marquee-header", "unstable": { "version": [ - 20200720, - 1034 + 20220704, + 753 ], - "commit": "5e8518a5f89c19d4aa9d7146cfdb213194d24e5d", - "sha256": "0471f234wi2bd3das0l96j4c3ka4cs6gs4w85hrw8b8bwx19d5xm" + "commit": "14f490b8683bdce53a6272fcc28a9b4137f86a24", + "sha256": "0vkf98hbcla6gl4xvy0wln87msjh5wf9dhnyscbqavgwql6m07k9" }, "stable": { "version": [ @@ -69417,15 +69792,15 @@ "url": "https://codeberg.org/martianh/mastodon.el", "unstable": { "version": [ - 20220513, - 1124 + 20220627, + 1644 ], "deps": [ "request", "seq" ], - "commit": "4ab5a4bb8d603b189a99cc4a4eea4c42e8f97cf0", - "sha256": "00rvnpcbpxpnqqplqvgjny5ddj6ggdk3i532hdw8i9z38r2gafyl" + "commit": "04d35c7e28b8f50b47f2b86d5c4765f4f091d2a4", + "sha256": "17d8srxaqwxar9gd768a82q56xlvkkjkx05pzbhj87zdh788vsic" }, "stable": { "version": [ @@ -69662,8 +70037,8 @@ 20211205, 1100 ], - "commit": "09f32af1a58d0b042b699c76d2b30e9226508f5e", - "sha256": "12pjmg7jxr7gjamjdgkgnmf05ivg7sxilfdqmd7mjzlr1n73iby7" + "commit": "59f58a7e236329e14229b0a9f59766f829336b93", + "sha256": "1k82and8wvl5b0pl27g946m0l4phd5kb06hw5br5d7f9mbic88x8" }, "stable": { "version": [ @@ -70051,11 +70426,11 @@ "repo": "meow-edit/meow", "unstable": { "version": [ - 20220515, - 2054 + 20220715, + 47 ], - "commit": "0a978e0232947d8e3a0895d104fe7f8671daed6f", - "sha256": "0phzafaj4zvih9h5ky7jryixwhv0kxwjvcxijvch7sn1i6fdpvkf" + "commit": "6083e746f7c009b16d2178b7a4eddb309f50d738", + "sha256": "0yapr0aj6yvkfkijnl79nnhqxm5ibhb1z5dqh4kj1h31ng90gry1" }, "stable": { "version": [ @@ -70075,21 +70450,21 @@ "repo": "ocaml/merlin", "unstable": { "version": [ - 20220517, - 1602 + 20220630, + 1249 ], - "commit": "88c0c2e66d65e3a6ba30c14a8dcef6685b285a55", - "sha256": "19cq56369dlzhdf6kxm2iz0qc7w6kxjrm8cjv0rwmswzp5lnsd44" + "commit": "be753d9412387aedcf32aba88a1be9bcd33d97ba", + "sha256": "1cpa9x45w54l4mqqmc8z3s5gscggw37gb6z9i7wwss86fj1wgclh" }, "stable": { "version": [ 4, - 5, + 6, -4, 414 ], - "commit": "cc1582373e5baea1d236a63be39493858032a182", - "sha256": "125gyk63fg9plqkyrkl3wvpr3czjxgvshf4496fc4swldl7z587c" + "commit": "be753d9412387aedcf32aba88a1be9bcd33d97ba", + "sha256": "1cpa9x45w54l4mqqmc8z3s5gscggw37gb6z9i7wwss86fj1wgclh" } }, { @@ -70107,13 +70482,13 @@ "auto-complete", "merlin" ], - "commit": "88c0c2e66d65e3a6ba30c14a8dcef6685b285a55", - "sha256": "19cq56369dlzhdf6kxm2iz0qc7w6kxjrm8cjv0rwmswzp5lnsd44" + "commit": "be753d9412387aedcf32aba88a1be9bcd33d97ba", + "sha256": "1cpa9x45w54l4mqqmc8z3s5gscggw37gb6z9i7wwss86fj1wgclh" }, "stable": { "version": [ 4, - 5, + 6, -4, 414 ], @@ -70121,8 +70496,8 @@ "auto-complete", "merlin" ], - "commit": "cc1582373e5baea1d236a63be39493858032a182", - "sha256": "125gyk63fg9plqkyrkl3wvpr3czjxgvshf4496fc4swldl7z587c" + "commit": "be753d9412387aedcf32aba88a1be9bcd33d97ba", + "sha256": "1cpa9x45w54l4mqqmc8z3s5gscggw37gb6z9i7wwss86fj1wgclh" } }, { @@ -70140,13 +70515,13 @@ "company", "merlin" ], - "commit": "88c0c2e66d65e3a6ba30c14a8dcef6685b285a55", - "sha256": "19cq56369dlzhdf6kxm2iz0qc7w6kxjrm8cjv0rwmswzp5lnsd44" + "commit": "be753d9412387aedcf32aba88a1be9bcd33d97ba", + "sha256": "1cpa9x45w54l4mqqmc8z3s5gscggw37gb6z9i7wwss86fj1wgclh" }, "stable": { "version": [ 4, - 5, + 6, -4, 414 ], @@ -70154,8 +70529,8 @@ "company", "merlin" ], - "commit": "cc1582373e5baea1d236a63be39493858032a182", - "sha256": "125gyk63fg9plqkyrkl3wvpr3czjxgvshf4496fc4swldl7z587c" + "commit": "be753d9412387aedcf32aba88a1be9bcd33d97ba", + "sha256": "1cpa9x45w54l4mqqmc8z3s5gscggw37gb6z9i7wwss86fj1wgclh" } }, { @@ -70202,13 +70577,13 @@ "iedit", "merlin" ], - "commit": "88c0c2e66d65e3a6ba30c14a8dcef6685b285a55", - "sha256": "19cq56369dlzhdf6kxm2iz0qc7w6kxjrm8cjv0rwmswzp5lnsd44" + "commit": "be753d9412387aedcf32aba88a1be9bcd33d97ba", + "sha256": "1cpa9x45w54l4mqqmc8z3s5gscggw37gb6z9i7wwss86fj1wgclh" }, "stable": { "version": [ 4, - 5, + 6, -4, 414 ], @@ -70216,8 +70591,8 @@ "iedit", "merlin" ], - "commit": "cc1582373e5baea1d236a63be39493858032a182", - "sha256": "125gyk63fg9plqkyrkl3wvpr3czjxgvshf4496fc4swldl7z587c" + "commit": "be753d9412387aedcf32aba88a1be9bcd33d97ba", + "sha256": "1cpa9x45w54l4mqqmc8z3s5gscggw37gb6z9i7wwss86fj1wgclh" } }, { @@ -70228,14 +70603,14 @@ "repo": "abrochard/mermaid-mode", "unstable": { "version": [ - 20220426, - 1631 + 20220715, + 2021 ], "deps": [ "f" ], - "commit": "1a6526bc68561b7da6a612152b842a41ffb0aa09", - "sha256": "1l8vcdsgqgfbd5lp3jjjbcpxcrvgn7bz4q9g6hxqrcvkzj0radv0" + "commit": "938f8ed7e6deea7c255414ab62d1478afa1ac07b", + "sha256": "1vydm5vfqnqr4m7fvd18pcqwy9jajcxs1d6rrhvg8ba1r06ka91r" } }, { @@ -70272,8 +70647,8 @@ 20200428, 124 ], - "commit": "ce506b27b15cc39a47c58ff795026eaea8632e2f", - "sha256": "0wpj3ich8wisq0jy304fngj0nkkvdqzfkfcx0s8ib6l04v29ypa5" + "commit": "15498a6f424a4ddea7a3bdcc9d160e6a4dfb27c1", + "sha256": "1ig0775yky8jaci99bfrj6714k1xzdwlslhvf9891zc5f3ckycya" } }, { @@ -70460,14 +70835,14 @@ "repo": "ianxm/emacs-tracker", "unstable": { "version": [ - 20211026, - 1347 + 20220713, + 1131 ], "deps": [ "seq" ], - "commit": "115f6de4a01b9e10936b7e6d1fdadd3770bae391", - "sha256": "11jdk260j9axi4f852vzgzqfb0kpl3hry02wfbhba3qp5bff2j7m" + "commit": "b524398c768227bc14fd12c833dcd4e22d66efd3", + "sha256": "1fz3mvgmn94a3csfhlwgagqpr8838q3jxl3l89zsa9sjmbl4cyfj" } }, { @@ -70728,6 +71103,21 @@ "sha256": "1lgh38pcjnq3va0vcs0rrl0nrf8j6x0fpdwyv3xghskazwsvrxbg" } }, + { + "ename": "mindre-theme", + "commit": "c554027d8124cdf30b3cfa8e8fe0034802d03b31", + "sha256": "1v847sywniw6zdv2h1hgsr2fjarnn61rj2ny8xkddi9rwzzi7zfd", + "fetcher": "github", + "repo": "erikbackman/mindre-theme", + "unstable": { + "version": [ + 20220711, + 2253 + ], + "commit": "06e7e2401a79425b9c02bb44cb995a8e79077d68", + "sha256": "0rw8m675n7fvk6gplcs72yf63h8ik4x1kpywlq4rwzw5izf58d16" + } + }, { "ename": "minesweeper", "commit": "d3828ad7599d13728b5571b882344c3ada434b85", @@ -70769,11 +71159,11 @@ "repo": "muffinmad/emacs-mini-frame", "unstable": { "version": [ - 20210710, - 1941 + 20220627, + 2041 ], - "commit": "57a049b9e1ea4a9b65e82fc10c8c7e70a042f636", - "sha256": "0bhsicy4van5xml8s9if2q7b36fbnzqg7kbg41zknf7nyhzl8pxi" + "commit": "60838f3cab438dcbda8eaa15ab3e5d1af88910e9", + "sha256": "0q01iymz657bg3mcmq7vcl8r0ypsa1pqj1p6gxs7ywx1d33lan4d" } }, { @@ -71515,11 +71905,11 @@ "url": "https://codeberg.org/ideasman42/emacs-mode-line-idle.git", "unstable": { "version": [ - 20220507, - 1118 + 20220710, + 702 ], - "commit": "28658a54fbf20e8224cbc71b074670309ec2e998", - "sha256": "0l9iks709cl62yyj547fzikpc3xfpf9lg0bb1iya1hscix6njbc3" + "commit": "4c309f0890bc888f95c8be31bae6fe5a5d4164a9", + "sha256": "1y94dm0nphdsfrsg236zbkxz2gmy788a0926m2imip7b06a09hwk" } }, { @@ -71635,11 +72025,11 @@ "url": "https://git.sr.ht/~protesilaos/modus-themes", "unstable": { "version": [ - 20220605, - 1714 + 20220714, + 1115 ], - "commit": "6f2b048528d1c40bf5bead0d3e01beff28b78d2b", - "sha256": "0hr7202jhmjcx3z71dn2lzwv7980lalj0kbvjn6jjg4dm71fywjn" + "commit": "abe2047067fe4be527a1dc0ddca27035e19980ca", + "sha256": "1lyvjrc49s0fnkkavysj0dxgw2178hi95n6776s3a3mxianiygzl" }, "stable": { "version": [ @@ -71659,11 +72049,11 @@ "repo": "kuanyui/moe-theme.el", "unstable": { "version": [ - 20220608, - 1159 + 20220707, + 1110 ], - "commit": "4d9e876d24d69d18c4111fa42bd34fe01a124866", - "sha256": "1a18pg8fwx0iicxrab2qj7wfh05pbqb4bh13nhlp2r94w024idd9" + "commit": "786c5f9aefa38b36f6bee0aa56aaa8da00fa0924", + "sha256": "14yhw72d7x5q8si3m8lc0ycfi1l8zmdi1vrllq8ikx0bcnq2i9wm" }, "stable": { "version": [ @@ -71958,11 +72348,11 @@ "repo": "jessieh/mood-one-theme", "unstable": { "version": [ - 20220608, - 25 + 20220613, + 114 ], - "commit": "65e98bafa0277b9c706c6e3564f11edbca5d5699", - "sha256": "1sc8z0fp7q9xkjm5d2x8gv0l0km4m28q71li1pkvdzmxmzn40ayd" + "commit": "033910aaf1bb41f384d1b5b96d55975d1378a34b", + "sha256": "0ban8p3nnxnds3yscdi4h9v3ni9l0diwd4y9cy52xp0kkl4jxayg" }, "stable": { "version": [ @@ -71982,14 +72372,14 @@ "repo": "tarsius/moody", "unstable": { "version": [ - 20220422, - 1616 + 20220620, + 844 ], "deps": [ "compat" ], - "commit": "d56a70bc71cdf90cfd5cf4d8517aa1d808659241", - "sha256": "07n4sqxbifkhsph45waa81ayqk9lpg51zr1zi9474s6wm9vmpf8i" + "commit": "a798096ee4ccf66ef2aa7016c00c8531bd63d27a", + "sha256": "0xqv6wd7zyka0dn5hrk0rq6ym04qn3sfza7cqr7i4fvpdkxlv7iv" }, "stable": { "version": [ @@ -72291,8 +72681,8 @@ 20210306, 1053 ], - "commit": "73f289987769fe1dd381bf436b5888a2a663e276", - "sha256": "09y3x603xgk51jgnry3x59hysv7z8d7v0p3bsp015z9lx3m83b4v" + "commit": "9da52ff96e9ecc33b38612f17a6e9abb60c81bf0", + "sha256": "04i0wg8y4qchq2mskbcrmqf80svssxbbnkximjsm8ihxkq4w0s13" }, "stable": { "version": [ @@ -72418,27 +72808,28 @@ "repo": "mpdel/mpdel", "unstable": { "version": [ - 20210107, - 1303 + 20220706, + 1952 ], "deps": [ "libmpdel", "navigel" ], - "commit": "6682446c6263a79e79c55cf32c0efb066245feec", - "sha256": "0q84gml1g9zwchp4h3r0xvj1sc1ynx0s2drfkpd357br3fw8ivzf" + "commit": "be954f3722d4f28718748eeb5dc859b04d3fefeb", + "sha256": "0aqg6lzih3v9fik370l9q1ans678zng258vnr36f9jj0wayi60z5" }, "stable": { "version": [ - 1, + 2, 0, 0 ], "deps": [ - "libmpdel" + "libmpdel", + "navigel" ], - "commit": "a2da2f2fe2357641909514da788f7c6cbe5801f4", - "sha256": "0pyyvbzskr44dxbmlp3y0r6s459fd51cvwjmnjaqxfxflr5v891g" + "commit": "0a06789e9f74bf6bb23f9097dd8072fb7c545d96", + "sha256": "1wg48z0g6qqsd38r2ydba8dp7cq72cnkzshmhj6900xak6f5ywfd" } }, { @@ -72693,16 +73084,16 @@ "repo": "xzz53/mu4e-alert", "unstable": { "version": [ - 20220528, - 1923 + 20220615, + 1948 ], "deps": [ "alert", "ht", "s" ], - "commit": "85489fae322a655e275be2483b9d02486b172ea8", - "sha256": "17d2nqndb760k96s8wskpx4g6xmfzwaifmbs25pj9114zvpz2byy" + "commit": "3c9af8c7994df0a1a4f0703552ea3beffb485ace", + "sha256": "13li5pqqkzj7dwgpnngnk1ff46i100qw9xknlimpy2vf2k5yqv3y" }, "stable": { "version": [ @@ -72726,11 +73117,11 @@ "repo": "Alexander-Miller/mu4e-column-faces", "unstable": { "version": [ - 20210927, - 1759 + 20220704, + 1920 ], - "commit": "b76a5989cafe88a263688488854187a015beef41", - "sha256": "06jd6pj5ngq5j5r6s7d7298jjfy1xkk0ribxrfsg6vpmd111brbf" + "commit": "c5938a4f4ed23cf543f73d24e0a6f53272bdcd4a", + "sha256": "1lzmrryyqmvshcbnf2i3jji97bvp5faxh7kybdv8ks2v2lgnjgl2" }, "stable": { "version": [ @@ -72808,14 +73199,14 @@ "url": "https://repo.or.cz/mu4e-marker-icons.git", "unstable": { "version": [ - 20220225, - 1137 + 20220714, + 1405 ], "deps": [ "all-the-icons" ], - "commit": "66674ee00dbf953e7d8c1696fb12e9b5b4b272bd", - "sha256": "0pswfq8apihjglysphq3g4la39hyhrms0g010rp691m2mgg1lp39" + "commit": "5e8dab1f07fca183f29e310c208ecb0086ff3222", + "sha256": "1ss36wgxjy3c9gci8xf1wyyl0156cr6p0g395b2rdb9jj1xdk96d" } }, { @@ -73025,11 +73416,11 @@ "url": "https://hg.osdn.net/view/multi-project/multi-project", "unstable": { "version": [ - 20220415, - 2334 + 20220703, + 2154 ], - "commit": "d51551296425b1febd102a38a46f2d3dc4548559", - "sha256": "1bbykm7aalhpx6ndgsd8riy9xszvbghcpbkgbn64hbymsy57nvs5" + "commit": "43a30f9578dc2f5acd4fc2941bedaa031b942b81", + "sha256": "0mg2cpinwcfpcg2i70p5fq0s63q1df38z8pjxfrbkgq86fpar219" } }, { @@ -73156,14 +73547,14 @@ "repo": "magnars/multiple-cursors.el", "unstable": { "version": [ - 20220528, - 1215 + 20220613, + 2122 ], "deps": [ "cl-lib" ], - "commit": "fd8441bfc8738d463601823e5a3d9c2d7123bfbf", - "sha256": "1201q60cnydglq431hkf68kz6gx4i1fs1v00jldliqrxkxm0ignx" + "commit": "225fc0e889e094bfd2913cfd448084cb49211ac6", + "sha256": "0j0958ziik1wpdxb4clyxcl1fzs6ar51vlk8rrqdzwb8if8h9z21" }, "stable": { "version": [ @@ -73368,15 +73759,15 @@ "repo": "agzam/mw-thesaurus.el", "unstable": { "version": [ - 20210224, - 449 + 20220629, + 2024 ], "deps": [ "dash", "request" ], - "commit": "96f02694bc28f31c2a280a05d47e6ff589f525f3", - "sha256": "0gy3lyncyvwimkhfmd0qh1kkc0qgf7sgvbyr1aljdn9qh7n5l34k" + "commit": "39d27eb4511588160b72078b67e11ce645dc76ee", + "sha256": "0nrql6vlbibymrq12pcwa65qqqw922lqf71xh228wcgnj94mhxhl" } }, { @@ -73417,6 +73808,21 @@ "sha256": "0n0142kc7q4vy0n7winbvnc8zv4janlr2x4mi97f8v70drl4b18h" } }, + { + "ename": "my-repo-pins", + "commit": "597e8b0041643c9945f387e5ad76183434c8e647", + "sha256": "0kq03s7aidhi27nv57wqwiv39v8ywamc89ldxdyqj11i1i179vbn", + "fetcher": "github", + "repo": "ninjatrappeur/my-repo-pins", + "unstable": { + "version": [ + 20220711, + 1300 + ], + "commit": "6ba60541656d6f0088fddab6753ddbde7a5f911c", + "sha256": "1hfsm4hs200mlp1mfxwcwv0xrs99h7yh62yh0g3471b2wvp1g7ax" + } + }, { "ename": "myanmar-input-methods", "commit": "76093af2bba82159784994ec9e17a69cd22bf868", @@ -73440,11 +73846,11 @@ "repo": "redguardtoo/mybigword", "unstable": { "version": [ - 20220526, - 1438 + 20220715, + 615 ], - "commit": "ffbfa2a938a58c4e60ccc4c2ec0ae32a11eac485", - "sha256": "1aknn89k9chrn65jxxj82pjia4rqfqp8s71j7x1hb10fscmscdbp" + "commit": "6c35dd44369930b039a37f6174617bb6ab93be27", + "sha256": "04kljxzzja1hb2lr45vik8x7v3l32xmbyl5vq85s0p74qmm5pcxi" }, "stable": { "version": [ @@ -73605,6 +74011,21 @@ "sha256": "1pd6c0jc1zxx3i3nk4qdx7gdf1qn8sc9jgqd72pkkpzvdwv998cp" } }, + { + "ename": "naga-theme", + "commit": "7ce263bd4cfb1985bcc2669a7a4908946f763128", + "sha256": "05flkjzxlr55mydmc5sw20ip0knyifrsdv9q6zsfzf7v13gkvq5c", + "fetcher": "github", + "repo": "kenranunderscore/emacs-naga-theme", + "unstable": { + "version": [ + 20220715, + 1017 + ], + "commit": "44204a9d0dabe1553c28310f6d2d78f144c08990", + "sha256": "0ba20v82m5sy4ya7aiwldvnsnlkfw71grgfrw4cn5xwz6qihl809" + } + }, { "ename": "name-this-color", "commit": "855ea20024b606314f8590129259747cac0bcc97", @@ -73952,11 +74373,11 @@ "repo": "CeleritasCelery/emacs-native-shell-complete", "unstable": { "version": [ - 20220124, - 1806 + 20220707, + 1544 ], - "commit": "01d8a2048e13f29dd3aa06281ac8cb466caddb64", - "sha256": "069ch7h1fkm2zvw6nfndyrpxp9s2p7x3d0acswaa7isynygwkcy8" + "commit": "9dbfc842b3af803f636df61dec6129e1d8593ee4", + "sha256": "0yhjmznf4wx6q6fzgrddi1bqnr528mcax7kqlw9pij8990fjhdbn" } }, { @@ -74184,17 +74605,17 @@ 20220514, 2039 ], - "commit": "12fadb994054306984010d0096b051a972af75cc", - "sha256": "08fbm2sfdw4g0skbwyn9wbb1jcf46l8f23j552y202znfmyqhz2v" + "commit": "b290da108cbaa9b9ef4e92d742f14d74c08e6baf", + "sha256": "0i4nm0y49bs20jggqb7gp622jyn652j2llnr1j2jbcbq5ghvavrc" }, "stable": { "version": [ 0, 0, - 31 + 33 ], - "commit": "61e9d2f4c55601a5a03e1525eb75cfa6ce7325b1", - "sha256": "1sg29z2hca6ssplj4hcam0334rabix0bqbm94blgl0yn1r5cac7r" + "commit": "b290da108cbaa9b9ef4e92d742f14d74c08e6baf", + "sha256": "0i4nm0y49bs20jggqb7gp622jyn652j2llnr1j2jbcbq5ghvavrc" } }, { @@ -74696,11 +75117,11 @@ "repo": "m-cat/nimbus-theme", "unstable": { "version": [ - 20220525, - 220 + 20220610, + 207 ], - "commit": "a5f51bc847553dc1ac7ad54fa5af32cd4623a66d", - "sha256": "12m9vcnpg8vv6kbi6yw0n2x8gall2wz8y5gl1jgiil9nycyxnikg" + "commit": "5beeda54ece58c8eb91ffcf2b365c832c9b454aa", + "sha256": "1wqzfflmk9sw2pwl5jvxv05a0jx2f68ndsy2373xrrfm8kbm2imi" }, "stable": { "version": [ @@ -74723,8 +75144,8 @@ 20181024, 1439 ], - "commit": "55f54511d35716c43637dee2bcb5fbc7839f967b", - "sha256": "0pmxi8nsd9zid9nys8ba26281k34s0gv7dszk2rlx92rb8c3k22i" + "commit": "d4017a2b1ea642f12dabe05ec99b2a16c93e99aa", + "sha256": "1clg0v1kl6aspwssw90qdrzdvd3dw9d86ffh6wydl45v6mylq0d1" }, "stable": { "version": [ @@ -74816,8 +75237,8 @@ }, { "ename": "nix-mode", - "commit": "e1870d786dbfac3b14386c8030e06f2d13ab9da6", - "sha256": "10f3ly4860lkxzykw4fbvhn3i0c2hgj77jfjbhlk2c1jz9x4yyy5", + "commit": "570bde6b4b89eb74eaf47dda64004cd575f9d953", + "sha256": "1ix0gzj84zcb5b85igflgwl1ng1azgbbacddmjx8syhm44rj1v7d", "fetcher": "github", "repo": "NixOS/nix-mode", "unstable": { @@ -75119,14 +75540,14 @@ "repo": "emacscollective/no-littering", "unstable": { "version": [ - 20220530, - 1845 + 20220625, + 1106 ], "deps": [ "compat" ], - "commit": "a5aa3faada054f96b70b32ba9d9447f7a4cf403c", - "sha256": "1gykaxdzv1j5q6h9m36ms5708h3jsn5yjilnajrngv3nkh6mb0qs" + "commit": "d9db6d88ccae0727fa96125fae8601cac80efde0", + "sha256": "1m7fygl2f5myi49liyk2i22piaic1bix5z5if30csc25623sa4yb" }, "stable": { "version": [ @@ -75164,14 +75585,15 @@ "repo": "thomp/noaa", "unstable": { "version": [ - 20220515, - 2359 + 20220711, + 445 ], "deps": [ - "request" + "request", + "s" ], - "commit": "1ebacdfbaa996319adf88a49258814c28ba49b1b", - "sha256": "1gz3blbj1snvdq9vyc2f2brbpkarxid221lpqm8h58jlzxx0by86" + "commit": "c7e42920c2db19428c1b30402aaf99bd65bcac7e", + "sha256": "1fabx74caj6q5a5hhw5yyg68j415qhadarliwfp2n071pf4dickw" } }, { @@ -75393,8 +75815,8 @@ "repo": "p3r7/norns.el", "unstable": { "version": [ - 20220422, - 2152 + 20220707, + 1006 ], "deps": [ "dash", @@ -75403,8 +75825,8 @@ "s", "websocket" ], - "commit": "0eb487e15cf4aaaa30efde9068e205f014fd1dd2", - "sha256": "09z85fzbcibhj5mcp3i003zihqqxx8qpwrq99fjd0szjmk8g8zj7" + "commit": "fea64be77d413ef3d8442a9699b3bfc53859ae80", + "sha256": "0wllc4qmfc7jc2jlri7bwbkpm5745g8fzpjp6k9pawja5yl0rw7y" } }, { @@ -75460,11 +75882,11 @@ "url": "https://git.notmuchmail.org/git/notmuch", "unstable": { "version": [ - 20220602, - 1121 + 20220714, + 1551 ], - "commit": "3a6b479a7360fbdbc1c6def4c1e1581bfd63e8a2", - "sha256": "1r7vr10yz0vjhlv5wbgv1x3519fg9lhdp165ksr1gg8mcp5yca37" + "commit": "349987668ae1da3ee30cdbe3a4acc11bb2219e0d", + "sha256": "0hgzzq0wc9l2kd4cxdmn3ssin635m2ag8dg37fqps996cfsddw0a" }, "stable": { "version": [ @@ -76192,27 +76614,26 @@ "repo": "rocher/ob-ada-spark", "unstable": { "version": [ - 20220515, - 2014 + 20220715, + 1824 ], "deps": [ "f" ], - "commit": "b4f16b255947240e458127e5c737d793ac894ac1", - "sha256": "1vfkp4k5wz6aqq13f8p3la825q7qa3q1m05s2a5mdffn2r7f7nb9" + "commit": "38b72a41c12f8b6e6ba47f9136affa956123d73e", + "sha256": "159cjalj49w9kj603lqkxjchpq3zvlqssdi0nijwddsdf9qsd3sy" }, "stable": { "version": [ 1, - 2, - 5, - 3 + 3, + 0 ], "deps": [ "f" ], - "commit": "b4f16b255947240e458127e5c737d793ac894ac1", - "sha256": "1vfkp4k5wz6aqq13f8p3la825q7qa3q1m05s2a5mdffn2r7f7nb9" + "commit": "38b72a41c12f8b6e6ba47f9136affa956123d73e", + "sha256": "159cjalj49w9kj603lqkxjchpq3zvlqssdi0nijwddsdf9qsd3sy" } }, { @@ -76272,14 +76693,14 @@ "url": "https://bitbucket.org/pdo/axiom-environment", "unstable": { "version": [ - 20190623, - 2052 + 20220612, + 1535 ], "deps": [ "axiom-environment" ], - "commit": "847cc6e728b692ad3fdaec28d0c8c49ec0378a56", - "sha256": "02nf2vn6s6pc63yw2rggdx9capn9432w6j56m9v0c5ygarpxb53p" + "commit": "01d88daa0c864af9918db5a147fbb5e435dec199", + "sha256": "03cxb6zdqmzgjp8r6hcirf8xl772j7xqk2nw17gjkn4xqbwfyn62" } }, { @@ -76544,11 +76965,11 @@ "repo": "fritzgrabo/ob-dsq", "unstable": { "version": [ - 20220425, - 716 + 20220614, + 1942 ], - "commit": "b8dbf53e5d9ed359fbf69e9d14adf68a7c08af10", - "sha256": "0v721spl9n4lz70dh9vx0pc3as5crmyrwfn0zg8hsbf0gq0m745v" + "commit": "45a1e4a24bc89a23912478479b9afb162dd768a3", + "sha256": "13r2izka3wa320z847mvawz7x2v2fw0c8zzy7w9372sgg6d67rgj" } }, { @@ -76634,6 +77055,24 @@ "sha256": "00wplflc4pp0ffhnkya19cqm3ihz8mybfj2ywk3ii2d9x08kjnp3" } }, + { + "ename": "ob-fricas", + "commit": "2710ca2d6c8ca2ab9b44f319a6bde8e3b41ce94a", + "sha256": "0nwgrcvlklsrqv8z6lsvzvs52xf4sd6fwpl4b67amaifsay5bn59", + "fetcher": "github", + "repo": "pdo/frimacs", + "unstable": { + "version": [ + 20220612, + 854 + ], + "deps": [ + "frimacs" + ], + "commit": "978665a47314f385850097442a3838ad7f3b688d", + "sha256": "1bvjk3g0rcjxn4anwvkd72r4phd534md350h1ryxr0frvgrpkcd1" + } + }, { "ename": "ob-fsharp", "commit": "89bc8c5fe6db0573109e82b3d1350d33d6d8aff5", @@ -76652,6 +77091,30 @@ "sha256": "1z1m2dqnvyyv9ff289p8x1hajnz9n0mmfkrkyl1zvipaqd9mgljw" } }, + { + "ename": "ob-git-permalink", + "commit": "7851f708191eb1fdfe326460bdb83b5509f544fb", + "sha256": "1k545yrcxkygv107f1zjclq62gahvdpac9z5pgijfw72n0hjb4gg", + "fetcher": "github", + "repo": "kijimaD/ob-git-permalink", + "unstable": { + "version": [ + 20220627, + 46 + ], + "commit": "14224327a6b34c804b0e90d37b80630a80c56c0a", + "sha256": "16xjma3n24clbiyf2vw13sy3nz902wigj6pd965d50acmihd5z4a" + }, + "stable": { + "version": [ + 0, + 1, + 0 + ], + "commit": "933beadc754b108d541ccaa5bb0f017c41ef107a", + "sha256": "1hys575y90rzhrwc8afc316wqmwxsaif5vjkk3cq2nn82zirl3z9" + } + }, { "ename": "ob-go", "commit": "3afb687d6d3d1e52336ca9a7343278a9f37c3d54", @@ -76790,15 +77253,15 @@ "repo": "shg/ob-julia-vterm.el", "unstable": { "version": [ - 20220518, - 1429 + 20220708, + 2223 ], "deps": [ "julia-vterm", "queue" ], - "commit": "39dbdb265785ae72bcd53706bc53190ec5e11bf0", - "sha256": "0wnvfv2ddvfwm6w446xx3x024g2vi8wzxyj85wdhpdh2hzssfchi" + "commit": "59f25bfe2355c5109e25b5c1ca0c3b895a560363", + "sha256": "1vsgp2j3d8l6v71741sl4wglibb4wmhziyw31sjv4l1s47j1vdyx" }, "stable": { "version": [ @@ -77048,14 +77511,14 @@ "repo": "alf/ob-restclient.el", "unstable": { "version": [ - 20220202, - 1609 + 20220618, + 2139 ], "deps": [ "restclient" ], - "commit": "586f1fa07f76aaca13cb3f86945759f4b9fb8db7", - "sha256": "12cgjk3lpx8d0ms2j6b33s65jr4bg8g9cw9h2l82bm39nd6h5q9d" + "commit": "3ac834b02b8276aae1b760312612c3b940598f90", + "sha256": "10x1ll090ihgjgzr76194mfc1z7yh3sr19dh0h561910gy97w2wk" } }, { @@ -77508,11 +77971,11 @@ "url": "https://codeberg.org/ideasman42/emacs-theme-oblivion.git", "unstable": { "version": [ - 20220507, - 1118 + 20220710, + 1045 ], - "commit": "4129672f60d55c820adf260002476d038ac18165", - "sha256": "12dlvkb3vsfgz3k7cchbcn9g5q5w8g3m1xr21d31zq67wnm3h8lg" + "commit": "3349191b123e5bdcf9177e97d2301bb571800da3", + "sha256": "00w5by87igi5l72xqkg6dn5zh7rk1lxc9p6m0c885ylp9giwalqj" } }, { @@ -77538,20 +78001,20 @@ "repo": "ocaml-ppx/ocamlformat", "unstable": { "version": [ - 20220519, - 1004 + 20220707, + 751 ], - "commit": "3b59f18b040e8bf7484a91435bfffcc34db55864", - "sha256": "11nm1idxnpzrdipnaxi35hzppwmylzdpvmjfnlgrqbmb6bcjinxs" + "commit": "fd908d7b21a88c0f1cd6e9acdd50e83076b3fd17", + "sha256": "0mdwmxv48v67nn4zjljvps18w8snhiddvlzh2jx1g9gs6fdamc4v" }, "stable": { "version": [ 0, - 22, - 4 + 24, + 0 ], - "commit": "838ba9fa00cc27703441220b9a5d3880b17430fb", - "sha256": "171lq3vx4y8xj4by5zy93isx8nhg6ysxg1hxmkqkq16fdaiz8mnc" + "commit": "fd908d7b21a88c0f1cd6e9acdd50e83076b3fd17", + "sha256": "0mdwmxv48v67nn4zjljvps18w8snhiddvlzh2jx1g9gs6fdamc4v" } }, { @@ -77735,26 +78198,26 @@ "repo": "oer/oer-reveal", "unstable": { "version": [ - 20220603, - 1106 + 20220706, + 1759 ], "deps": [ "org-re-reveal" ], - "commit": "0c455d31516baa02603f54917d5ff1f309e31925", - "sha256": "1y8vw5m9z9jc8yam5hxsamiz9hpn2v9q5rmrf9f9s7m4xm5iq10j" + "commit": "f25b51fc4370fedaebb52d82ff72a597bf44ccc4", + "sha256": "1d5v2wmvfgffi6jmkz8mkfy547d5amis64i756cah0kv2km6zdw6" }, "stable": { "version": [ 4, - 4, - 4 + 5, + 0 ], "deps": [ "org-re-reveal" ], - "commit": "0c455d31516baa02603f54917d5ff1f309e31925", - "sha256": "1y8vw5m9z9jc8yam5hxsamiz9hpn2v9q5rmrf9f9s7m4xm5iq10j" + "commit": "48884ade629af4c366092e68f08dd5cb626cfaa4", + "sha256": "1d5v2wmvfgffi6jmkz8mkfy547d5amis64i756cah0kv2km6zdw6" } }, { @@ -78645,30 +79108,30 @@ "repo": "eyeinsky/org-anki", "unstable": { "version": [ - 20220525, - 903 + 20220712, + 1916 ], "deps": [ "dash", "promise", "request" ], - "commit": "c084599a199f794b7e25d5ca4d58f0c0ad87c160", - "sha256": "1h0dlph8cxs8spdqy0zs515hnza5jp15szbv7qgnricbg9k3pkx7" + "commit": "4c3b27efe8eed9a9c8b5636fb15b86975ef7e00e", + "sha256": "19vig86ivx4gycfa54yi8k66zkp45sp8b082673xkmhrvvnnjm0a" }, "stable": { "version": [ 1, 0, - 2 + 4 ], "deps": [ "dash", "promise", "request" ], - "commit": "c084599a199f794b7e25d5ca4d58f0c0ad87c160", - "sha256": "1h0dlph8cxs8spdqy0zs515hnza5jp15szbv7qgnricbg9k3pkx7" + "commit": "4c3b27efe8eed9a9c8b5636fb15b86975ef7e00e", + "sha256": "19vig86ivx4gycfa54yi8k66zkp45sp8b082673xkmhrvvnnjm0a" } }, { @@ -78679,14 +79142,14 @@ "repo": "awth13/org-appear", "unstable": { "version": [ - 20220405, - 1146 + 20220617, + 2355 ], "deps": [ "org" ], - "commit": "8dd1e564153d8007ebc4bb4e14250bde84e26a34", - "sha256": "0aq6vqya8cj6wjgi8yjbrvkjg9if2ampyx4g6szdpmyc5mq7zgll" + "commit": "60ba267c5da336e75e603f8c7ab3f44e6f4e4dac", + "sha256": "03ph0mg9ny8gc8rl1r87ghs3c25wdix5yv70p0854xhkmp5fz5m5" }, "stable": { "version": [ @@ -78762,26 +79225,26 @@ "repo": "yilkalargaw/org-auto-tangle", "unstable": { "version": [ - 20220607, - 2042 + 20220715, + 329 ], "deps": [ "async" ], - "commit": "87b867b46e9d75bb65c6b4d02565c67e225bd429", - "sha256": "1zb7vcmhmjiqpbbhqrqci689rnpn10p985cs5jk9sgg66xsbrgs3" + "commit": "bce665c79fc29f1e80f1eae7db7e91c56b0788fc", + "sha256": "0gj3sqzg5zzqb84vbf08wyqkynyz0zzs4hy5q83zgz02mwwjbv01" }, "stable": { "version": [ 0, - 4, + 5, 1 ], "deps": [ "async" ], - "commit": "87b867b46e9d75bb65c6b4d02565c67e225bd429", - "sha256": "1zb7vcmhmjiqpbbhqrqci689rnpn10p985cs5jk9sgg66xsbrgs3" + "commit": "bce665c79fc29f1e80f1eae7db7e91c56b0788fc", + "sha256": "0gj3sqzg5zzqb84vbf08wyqkynyz0zzs4hy5q83zgz02mwwjbv01" } }, { @@ -78795,8 +79258,8 @@ 20220530, 1620 ], - "commit": "da3a45f95f2e9f7281d533d1e5cec1764ae26a9c", - "sha256": "0zj4g6vfwyyxlpci6fcawvf35bgk7b84rrnm9s9myv53b6nri73f" + "commit": "0f5dc4e00cb050b94289504925b36c7650552a1a", + "sha256": "0sifhn1mllargc6a76xzqnm77vnx8zx9j5f72rcf7hwyp6vihxy7" }, "stable": { "version": [ @@ -79225,16 +79688,16 @@ "url": "https://repo.or.cz/org-contacts.git", "unstable": { "version": [ - 20220604, - 102 + 20220609, + 126 ], "deps": [ "cl-lib", "gnus", "org" ], - "commit": "c1c4cadf3f7890a07d03c531ef823e1fb5f3ef2f", - "sha256": "07jkgmi9i9k0pnlxhrmhx3rjqaxl3q69mz9zmyxrpk7y9dv6hc92" + "commit": "dba21b48952e78e9db27e25628bcfb0353c19b24", + "sha256": "0nmg8p4wxp05ipic9sza7d7rp72h3lnfc793y83c7jbzhv71mri2" } }, { @@ -79245,11 +79708,11 @@ "repo": "thisirs/org-context", "unstable": { "version": [ - 20210216, - 1526 + 20220606, + 1339 ], - "commit": "a08f1f607f819791b9b95ad4f91c5eaa9fdbb091", - "sha256": "18ld5kqr0l7nklybdwbwrnkrh06w71myfynbwp9rh8q4lhzh73jc" + "commit": "47bd45149cb74dab2ebecccfb918f6f8502a4f2c", + "sha256": "1vfwrv3vspdl2bj8rk6jawjk21qlrmby2465skbc5wiriknpyxk9" } }, { @@ -79693,20 +80156,20 @@ "repo": "io12/org-fragtog", "unstable": { "version": [ - 20220110, - 2211 + 20220714, + 2146 ], - "commit": "680606189d5d28039e6f9301b55ec80517a24005", - "sha256": "1912nlnk5v20szlmxr6y7chvms294z0p0hzdfgi8i3c7yrz7lmsj" + "commit": "c675563af3f9ab5558cfd5ea460e2a07477b0cfd", + "sha256": "1xag0pdphigk0ilrj2hacai3p6xgl27jji08aa1zlhq7p3rbay7m" }, "stable": { "version": [ 0, 4, - 1 + 2 ], - "commit": "680606189d5d28039e6f9301b55ec80517a24005", - "sha256": "1912nlnk5v20szlmxr6y7chvms294z0p0hzdfgi8i3c7yrz7lmsj" + "commit": "c675563af3f9ab5558cfd5ea460e2a07477b0cfd", + "sha256": "1xag0pdphigk0ilrj2hacai3p6xgl27jji08aa1zlhq7p3rbay7m" } }, { @@ -79732,8 +80195,8 @@ "repo": "kidd/org-gcal.el", "unstable": { "version": [ - 20220324, - 1852 + 20220708, + 611 ], "deps": [ "alert", @@ -79742,8 +80205,8 @@ "request", "request-deferred" ], - "commit": "f8075bd8eac7288eea1060077ca103d5fd01fb65", - "sha256": "0vmf9l3cc5i0kqyqdvbhd4sndla2j57rvy551rib5knhqx1ry0sd" + "commit": "396a30cf256c8b32a69fd73a081364937b43a1c7", + "sha256": "19d6v06bks41anyisv4sjlsbw4yndi51ccn6hr767y9wyhn1337l" }, "stable": { "version": [ @@ -79881,6 +80344,37 @@ "sha256": "0672pcklp743k8fz39hwf1zxb7f1sywdjsm8d8ha8r6h2rjbyl6k" } }, + { + "ename": "org-hyperscheduler", + "commit": "ecb150e9b5370e6a7a5e5d64a577c2a3b58b8a81", + "sha256": "15pb628cqs1fhmg8w2xgzdih5fymbc2snn01m61mqhjz93s3f58f", + "fetcher": "github", + "repo": "dmitrym0/org-hyperscheduler", + "unstable": { + "version": [ + 20220704, + 2140 + ], + "deps": [ + "log4e", + "websocket" + ], + "commit": "b7f33e7bf19b7ce7c81dbac4de765a854ee7f52f", + "sha256": "0h7r8rxb4aldr31awl8w7fk82nghh5g8ayz9yspyqr3ix4q4n8z7" + }, + "stable": { + "version": [ + 1, + 0, + 0 + ], + "deps": [ + "websocket" + ], + "commit": "252f9412520fb703de96a81061766c74943cd06f", + "sha256": "1qnrjkz7ibd8sn0sy70fwn6vwy3l9gn8lik3j73wf3mcyknb5lya" + } + }, { "ename": "org-id-cleanup", "commit": "b46e83f2ea2c4df1ef343c79c7e249605c9639b3", @@ -80057,16 +80551,16 @@ "repo": "ahungry/org-jira", "unstable": { "version": [ - 20220509, - 2058 + 20220702, + 709 ], "deps": [ "cl-lib", "dash", "request" ], - "commit": "c0c0086419b4e68bb45bf609931916d6d8ae48a2", - "sha256": "0yrmgr4jr49qr94j50cbbpgwszgsw6w7c2c0q4pdz2ckqff0y1fx" + "commit": "97e9535e0f9410dc92eab4330dff061bfde00155", + "sha256": "0awfz4c70pxfj401p4h4j1lxic4pqpgigkldy9wvdkcyhqbphswj" }, "stable": { "version": [ @@ -80244,14 +80738,14 @@ "url": "https://repo.or.cz/org-link-beautify.git", "unstable": { "version": [ - 20220605, - 239 + 20220701, + 359 ], "deps": [ "all-the-icons" ], - "commit": "47d54dd736abc9ef5406e3e7394d54c5110d355d", - "sha256": "0g3j3xnyk1fxs3m7c3vsb7ai7cxjj6iv3qji19a50rjcc7l6s4ja" + "commit": "ee06be6d82d36330cf0f96544e7cfcfdc1b7bb02", + "sha256": "1dnlnk1gin48bc36798y9swj0q96gnsyrdf6sjq7asfm821zv68k" } }, { @@ -80332,6 +80826,29 @@ "sha256": "1p9mz0fz6s63wy7zh4r1ifa7kcycymlcgmqjbpgv85m2783ab0l6" } }, + { + "ename": "org-mac-link", + "commit": "67353b61695609d3d0e9195bcadc782641000e7c", + "sha256": "1jdbjmgc7gca1zar7v9n6z5c2pgmfs0zmpbi1kzgjym3hfxbr8p1", + "fetcher": "gitlab", + "repo": "aimebertrand/org-mac-link", + "unstable": { + "version": [ + 20220616, + 2340 + ], + "commit": "0b18c1d070b9601cc65c40e902169e367e4348c9", + "sha256": "0ijlmfq6dbdmk3jpl87g4knk4l76yxf63nmk3n2nll3v3swbk22g" + }, + "stable": { + "version": [ + 1, + 9 + ], + "commit": "edf9f6f7254f72be939daf92942f76f44b72d32d", + "sha256": "0ijlmfq6dbdmk3jpl87g4knk4l76yxf63nmk3n2nll3v3swbk22g" + } + }, { "ename": "org-make-toc", "commit": "df87749128bcfd27ca93a65084a2e88cd9ed5c3f", @@ -80416,30 +80933,30 @@ "repo": "ndwarshuis/org-ml", "unstable": { "version": [ - 20220601, - 1412 + 20220711, + 1528 ], "deps": [ "dash", "org", "s" ], - "commit": "f191ebfee6dcf6a05b5d1db43cf75f4a20faa8b4", - "sha256": "1vcdbpq746xa5a3rlq9vj4r42ygmws0wg7r7q4zylkvx9gv0c3n5" + "commit": "385e3bee497f858705144d7ab5e6570d31d3ffe8", + "sha256": "0j506lp3lgf9iz94ag041bpdcr837j5lmbazq7v3brblm43dvh9p" }, "stable": { "version": [ 5, 8, - 1 + 4 ], "deps": [ "dash", "org", "s" ], - "commit": "7b0022b3a751bb4396b07f47546c66ddcd5be922", - "sha256": "1vcdbpq746xa5a3rlq9vj4r42ygmws0wg7r7q4zylkvx9gv0c3n5" + "commit": "b81c3035b7e3487f2155323ec570a493607ff575", + "sha256": "0j506lp3lgf9iz94ag041bpdcr837j5lmbazq7v3brblm43dvh9p" } }, { @@ -80468,19 +80985,19 @@ "repo": "minad/org-modern", "unstable": { "version": [ - 20220605, - 2206 + 20220625, + 1302 ], - "commit": "b352680d9ee8c6e6966cc21d595513c3595e3bb7", - "sha256": "1mc1m6x9bj92lfsbrxnasp78sc501mjiad4jrb5m1j42j0d1cs83" + "commit": "239c02aa99dc52755edf38d5e9c9e986683c4249", + "sha256": "0d6871y4n4mz4h13lx9a2q2jyx8gpii0fal9s6rjflx3wnld8fsn" }, "stable": { "version": [ 0, - 3 + 4 ], - "commit": "64fa67a3e4cc7af4084bb879bd8a0e5380333bcf", - "sha256": "187fxw2rg0kw1d2binpa32ckp67r4v10j6ypr077g9qn6nkmyvvn" + "commit": "5de3da1ff55b4567e9df3b234c09427aed2cbcd7", + "sha256": "0af9dzp9n3882kvsp3q4008hffq1mp9hjl964mlp5j8vay3x7qbz" } }, { @@ -80990,14 +81507,14 @@ "repo": "jakebox/org-preview-html", "unstable": { "version": [ - 20220228, - 414 + 20220713, + 151 ], "deps": [ "org" ], - "commit": "cb85524d5090b8189e965cc49d65be04650c17c4", - "sha256": "1ikcsn970pf5m30h6bqshykpnwpn7vwyyi9ymk3fv6pxh772x5wc" + "commit": "220d7ea93945581a9ab9fa7b43c67070bb5680a4", + "sha256": "15z6hijfg28p5siz9iqyknpfs77j5c9hvmxmmdhazisb99v0iq0k" } }, { @@ -81096,14 +81613,14 @@ }, { "ename": "org-ql", - "commit": "e95bb45018c2c257e18af7428395dd1020074689", - "sha256": "1pd6327jqsaypicaf8zd9hxy8f422n9ww9xg8284281x7cnw61xq", + "commit": "570bde6b4b89eb74eaf47dda64004cd575f9d953", + "sha256": "1q0832i5jajgjpcvs4lrc2r0jwbmy9y7z9yvnhk9axnqdpvalm2d", "fetcher": "github", "repo": "alphapapa/org-ql", "unstable": { "version": [ - 20220602, - 1651 + 20220715, + 1850 ], "deps": [ "dash", @@ -81117,8 +81634,8 @@ "transient", "ts" ], - "commit": "64a9234733904af20fd495861792f1d5c2b37190", - "sha256": "1w3vly4jh854gb9bgnwqfzry6214v498fmiwm491gi8m5g0d05xp" + "commit": "98b6049eccc4f3b19700d27a86f22d4428013501", + "sha256": "0qn3ww9hp08xbmjicd451zcqm3za84wvizjwlzmxi6hqsaxmzpfm" }, "stable": { "version": [ @@ -81218,28 +81735,28 @@ "repo": "oer/org-re-reveal", "unstable": { "version": [ - 20220523, - 1744 + 20220622, + 642 ], "deps": [ "htmlize", "org" ], - "commit": "93ba4e91f1d007669d39fc76c097ff5d6a64489e", - "sha256": "0qwlyikci53z1qc33nsg19fazg5p1jrjsjc481afyjf364ds2j1i" + "commit": "f184e66e398e1cfdfd55894c67392805ae531a39", + "sha256": "180dn5iywarljbmx8lm61y30n2d800kg96psrvc8ghfglnvp6964" }, "stable": { "version": [ 3, 14, - 0 + 1 ], "deps": [ "htmlize", "org" ], - "commit": "ac67832e7b342326deef650db6601b95127627bc", - "sha256": "1kcr1zpafgaykbkxfav4iia6fbglpjv4kvj5yjn8wcm1liiaj6ck" + "commit": "f184e66e398e1cfdfd55894c67392805ae531a39", + "sha256": "180dn5iywarljbmx8lm61y30n2d800kg96psrvc8ghfglnvp6964" } }, { @@ -81310,8 +81827,8 @@ }, { "ename": "org-recent-headings", - "commit": "9ac277ed37b6dd8b7c9d31a283442d5365d9e7f9", - "sha256": "1r3xs291ahahz4a6zwqqhckayxi9js53mjx5gghjl1zlv9l5ch6g", + "commit": "570bde6b4b89eb74eaf47dda64004cd575f9d953", + "sha256": "0371vpbq5abzc0hs9rb1hif3zyz5yfvcbml2cnpnfncfavf95l66", "fetcher": "github", "repo": "alphapapa/org-recent-headings", "unstable": { @@ -81394,8 +81911,8 @@ "repo": "jkitchin/org-ref", "unstable": { "version": [ - 20220601, - 2032 + 20220715, + 1202 ], "deps": [ "avy", @@ -81410,8 +81927,8 @@ "parsebib", "s" ], - "commit": "cbe9e870a5f488cdfc5e6a3b5478845ea8acdcde", - "sha256": "05js4f3xnms8c06s63agmhfcwj6cjsp2z83pqmlwga8h74z7f5y7" + "commit": "ebe3bb6f58350ac10da73e583d3ad1078f0690e2", + "sha256": "03z215lmca2xcsfcdb1vfhnhdh178rm0hfbhp89qpxa3hrmx92i5" }, "stable": { "version": [ @@ -81487,29 +82004,28 @@ "repo": "akirak/org-reverse-datetree", "unstable": { "version": [ - 20220521, - 1755 + 20220702, + 511 ], "deps": [ "dash", "org" ], - "commit": "0b24765e270a2dfd84adf3a0f9afa8b72aabad30", - "sha256": "1z529iy3zm8szyr98kmi7m3rfpkx139xcpjz4vazk23zj93mpxrc" + "commit": "bd8bc9b4c15783debcec132c79835e37b03626c8", + "sha256": "004nhqkcv6a9gcnxpkmpr15bzzrx7nn376cbcsxryzyz3z13lx31" }, "stable": { "version": [ 0, 3, - 11, - 1 + 12 ], "deps": [ "dash", "org" ], - "commit": "0b24765e270a2dfd84adf3a0f9afa8b72aabad30", - "sha256": "1z529iy3zm8szyr98kmi7m3rfpkx139xcpjz4vazk23zj93mpxrc" + "commit": "bd8bc9b4c15783debcec132c79835e37b03626c8", + "sha256": "004nhqkcv6a9gcnxpkmpr15bzzrx7nn376cbcsxryzyz3z13lx31" } }, { @@ -81559,8 +82075,8 @@ "repo": "org-roam/org-roam", "unstable": { "version": [ - 20220608, - 1621 + 20220621, + 527 ], "deps": [ "dash", @@ -81569,8 +82085,8 @@ "magit-section", "org" ], - "commit": "fcefc1b1b4027185dc35cc1fe16c268ae65bc076", - "sha256": "0brfmiz97sg7wz7pi148xw422jcmvcfk60rb9nfvw71xdnncqaj0" + "commit": "c3867619147175faf89ed8f3e90a1e67a4fd9655", + "sha256": "18a1sx3z9gvg32kqhg760351nf9w4d81jnzl6y9izsb5p539iqpp" }, "stable": { "version": [ @@ -81597,15 +82113,15 @@ "repo": "org-roam/org-roam-bibtex", "unstable": { "version": [ - 20220213, - 1609 + 20220626, + 1121 ], "deps": [ "bibtex-completion", "org-roam" ], - "commit": "efdac6fe4134c33f50b06a0a6d192003d0e5094c", - "sha256": "13hin77krfwaxfc7bh9bkp2h1kzn1ksng46j129yz3996gv55k1r" + "commit": "201262a839db20af2a49165a80f85f82dad159d1", + "sha256": "1vpdwfs737fqswsg4qi5y55zznh7yym9wynk8qmdciyvkhmxd43p" }, "stable": { "version": [ @@ -81647,16 +82163,16 @@ "repo": "org-roam/org-roam-ui", "unstable": { "version": [ - 20220225, - 2151 + 20220713, + 1144 ], "deps": [ "org-roam", "simple-httpd", "websocket" ], - "commit": "9474a254390b1e42488a1801fed5826b32a8030b", - "sha256": "0v54vxh95izch74wz2dl2dkdqicbvshra55l6qvd4xl5qmfhpjdc" + "commit": "2cd93bfa517d51b4c97d42817713ca5ce61cb0df", + "sha256": "10p9fyk4y5qsg06y2mw0lacjpf1kkjgwrvc8cjcj4xcyka2lz9jf" } }, { @@ -81876,8 +82392,8 @@ "repo": "ndwarshuis/org-sql", "unstable": { "version": [ - 20210404, - 1839 + 20220621, + 2252 ], "deps": [ "dash", @@ -81885,14 +82401,14 @@ "org-ml", "s" ], - "commit": "71b6e01ff94be4c68cfeb17a34518bf1f118cf95", - "sha256": "05c1hgzq69lnw59x1w5bybrdhnyli8d9pzjczixklrrahmx4ig8k" + "commit": "43376abf46b897a9a862cfcc1c087f4b8688634c", + "sha256": "0v2bbwxblzpkf57p6d5i0isia90jxw17p9aaslizpcybqsp3c3ha" }, "stable": { "version": [ 3, 0, - 3 + 4 ], "deps": [ "dash", @@ -81900,14 +82416,14 @@ "org-ml", "s" ], - "commit": "d7dae4f853f57fc2716e332096d0eeeaa280c736", - "sha256": "1bcw3wbg6mhmas4834b494xd0yxniv41mj3bg1s748q1fg8nmfvn" + "commit": "ea000131a6bfe2e22f3d9a65c0b0aeeab34434e3", + "sha256": "0v2bbwxblzpkf57p6d5i0isia90jxw17p9aaslizpcybqsp3c3ha" } }, { "ename": "org-starter", - "commit": "6deeab4833e76d3dadff056626a98dbbb80d1345", - "sha256": "02biskn1m397jpwa3i0wsh6z7zdq3hvjqf6ggy9ngjz9pgpahy18", + "commit": "570bde6b4b89eb74eaf47dda64004cd575f9d953", + "sha256": "02zagl2crifbhdc5wkz719fszx5y70n70whpr4dcn6rpx6qam0rv", "fetcher": "github", "repo": "akirak/org-starter", "unstable": { @@ -82214,15 +82730,15 @@ "url": "https://repo.or.cz/org-tag-beautify.git", "unstable": { "version": [ - 20220602, - 940 + 20220712, + 123 ], "deps": [ "all-the-icons", "org-pretty-tags" ], - "commit": "481f44aa4067b287e0c724c6d5e1185c62d1560c", - "sha256": "016p3fjdd5vpri7bg2yfmk3ldkng7jp65fb0fv9i89kmzkkcq4az" + "commit": "7a6aec1b28416fb4bdda5611f1ca30c77d18a854", + "sha256": "0c40c2g80jy9yw93ahjkm43hfjrv29hkpspx72yfzmnynkv49bg6" } }, { @@ -82646,20 +83162,20 @@ "repo": "nullman/emacs-org-visibility", "unstable": { "version": [ - 20220404, - 1502 + 20220710, + 1747 ], - "commit": "a3aef6573d23309f9a6f340b41fa103cca3c79a6", - "sha256": "0fc9zisw87kn5jp5pkac13jwai9m5jrm9xvbmsig7s2yr12ifwch" + "commit": "24aee13a956bc1cff72f8b04f47e7d9ec01bb3b3", + "sha256": "1b7afdiagnf9biw0px7qc6ayjbbhy5z2gwl7g1whb3h5hvrri4j5" }, "stable": { "version": [ 1, 1, - 5 + 10 ], - "commit": "71b888c9c5cbabb762e83ae7b2b5b9b4e4f4283c", - "sha256": "0fc9zisw87kn5jp5pkac13jwai9m5jrm9xvbmsig7s2yr12ifwch" + "commit": "88f24a2aafef0c2172e780ad42adf937a16071ca", + "sha256": "1b7afdiagnf9biw0px7qc6ayjbbhy5z2gwl7g1whb3h5hvrri4j5" } }, { @@ -82723,16 +83239,16 @@ "repo": "akhramov/org-wild-notifier.el", "unstable": { "version": [ - 20220402, - 2331 + 20220701, + 1147 ], "deps": [ "alert", "async", "dash" ], - "commit": "4b1d874aafdee90815136c308f1f3bd3577971ec", - "sha256": "0wqcm65gisiapkx9m8zd5l6ysir2m7vk0px8adv04kjb5j937isq" + "commit": "9392b06d20b2f88e45a41bea17bb2f10f24fd19c", + "sha256": "1wj1dj2nirdj9m748q1yaakzzv3w39qlgak59yg3slbj6pcpgzl4" }, "stable": { "version": [ @@ -82820,26 +83336,26 @@ "deps": [ "org" ], - "commit": "603a5b692a08340c1865a6f73cacf57c4fd64cb2", - "sha256": "1hwibhqmm7a4zz0fw6qhbgyyw7rx73zd6gn7mg2g4m0c4kwwfifa" + "commit": "9eb18ecd93895a9894970fa85b68257da647812d", + "sha256": "0nmbbrw36bkxygh5pllfa9i1z20b0wzrax7bcz049syjkfl3l621" }, "stable": { "version": [ 0, - 4, + 5, 0 ], "deps": [ "org" ], - "commit": "4048bf9e1be7ab759696a9541eec8f435359bcf3", - "sha256": "1rnir9mc9cp12wg5p19f0m6g6mvfyv1ahr7zq7azl8hvwmnb6gx7" + "commit": "f470db20ad0a7e591daa73c903524ac267ae7236", + "sha256": "0xjhcc4xsfgp55mr73cv7nhl3a8ccy1khsnsvrwfbxnhxxi40pnr" } }, { "ename": "org2blog", - "commit": "08b47bf72bff18efb3281509fd9f1688d8bb0349", - "sha256": "1snrsqpiacmkajmiw12kpglxkrs5ngma7l7r246q0lvf1h4jzbsa", + "commit": "570bde6b4b89eb74eaf47dda64004cd575f9d953", + "sha256": "16hifk8hjk3a4h76dylv6xm5vkbhrqw00v79z3ji6pvp9rz4scv6", "fetcher": "github", "repo": "org2blog/org2blog", "unstable": { @@ -83025,8 +83541,8 @@ "repo": "jcs-elpa/organize-imports-java", "unstable": { "version": [ - 20210715, - 1155 + 20220704, + 657 ], "deps": [ "dash", @@ -83034,8 +83550,8 @@ "ht", "s" ], - "commit": "f9347e8d1f7cf770c7a2bc594ccf3f3c730f9b81", - "sha256": "0k27dy8r1g6ikd61n8vv4dv4la4rpl88a05x4fg8702573vqq1cx" + "commit": "1f422f6f3fa569a6c238ac34aec0320934f06208", + "sha256": "06d71kkn5kasfg9x977vdcd6pbnj44jzalp9igwm6qh5k7krklr3" }, "stable": { "version": [ @@ -83235,19 +83751,19 @@ "repo": "tgbugs/orgstrap", "unstable": { "version": [ - 20211126, - 2201 + 20220715, + 16 ], - "commit": "e54b5cc7f95ded5dc39f60fbf6d72f64f469da58", - "sha256": "1i0h9f45jzw3m341pp242ihcqf7jvzddxidnn1qv971fpvibjvxx" + "commit": "f4df67e94926f9d389f4a456a9cbf721c9b22b89", + "sha256": "1jcqkk3rpw128a0x5cwwwkpfj9q2ypzjg1ck49lhadlf09y4bqm8" }, "stable": { "version": [ 1, - 4 + 5 ], - "commit": "dbcc35f0dc854dfd4412ca4aa9c5894a2ccb0321", - "sha256": "0611zcfkp4min1ixal93qfvbm03w56ydb9hl086vss36ramdiyng" + "commit": "55ee428cd53c8de2a6b2a2ab32eb9f613a4617ec", + "sha256": "1f1r0mgq2bh07b7hj16qfh1s0mmyc2dfczaigjbaw8vhfc8lnvqg" } }, { @@ -83454,11 +83970,11 @@ "repo": "minad/osm", "unstable": { "version": [ - 20220513, - 1002 + 20220702, + 2218 ], - "commit": "563d9646b1f8df37cefcec5d51d20249eba407da", - "sha256": "039ac364f00slx1dxxgsgfcr4x47v9ymn8arcs0fyhdhw7jnky5j" + "commit": "1c5e825fbec4c22ae3a649dec84d51803768b44a", + "sha256": "0p19vcv32pm27vxm33gdggzggac5hb0ji75fhs4g5va69kv1nxyw" }, "stable": { "version": [ @@ -83733,14 +84249,14 @@ "repo": "tarsius/outline-minor-faces", "unstable": { "version": [ - 20220424, - 1803 + 20220613, + 1341 ], "deps": [ "compat" ], - "commit": "ff862866a2c5eb7b20aa96a97fa982e2db1b6640", - "sha256": "0wjrf1b5hjrgxgwqz1701xr6hhlmbnnr79f99162py49clljd5mw" + "commit": "f83db95e07c55b9a7e69df23a6291171d4697e15", + "sha256": "09ji0z1mmn2ihf759i2h21bqr52bfy4axhi6zgkj4dkhjpzrdwi8" }, "stable": { "version": [ @@ -84016,14 +84532,14 @@ "repo": "zzamboni/750words-client", "unstable": { "version": [ - 20210701, - 1950 + 20220625, + 1407 ], "deps": [ "750words" ], - "commit": "0fed7621c04debad64ea6455455494d4e6eb03fa", - "sha256": "1qglbfdc6526aqsba93ngw1a6hp19lqx1wlxzzy9yvggbb02mii2" + "commit": "8abef82d644223c7991beb689072889c72d1faee", + "sha256": "1vbh0gynm4z5rhrzcava5dh1m6hh683fz18b7rjjib31l7fx96s0" } }, { @@ -84034,14 +84550,14 @@ "repo": "yashi/org-asciidoc", "unstable": { "version": [ - 20220428, - 740 + 20220625, + 2321 ], "deps": [ "org" ], - "commit": "c8bc184f9088b76fdf1ce20e6e5d0a1588e1b327", - "sha256": "0799wah7ywzpzjjhmqkyj9v8krzh0j6qa5gs4a7iwvp9r66jwcpl" + "commit": "a55ac6adef39124c9434be47fe9cc0c75c4bfea2", + "sha256": "1yz2nyq651wv82hccp04cqkikzj0jv5hvam48v0s9plynwlrc359" } }, { @@ -84122,8 +84638,8 @@ "deps": [ "org" ], - "commit": "c9629ef4b4bc40d51afefd8c0bb2c683931e6409", - "sha256": "0z1a447v4fy5x6ib8lm4w8m9n2nx41ksbdsjz2xm8iy70is13yd2" + "commit": "0d341b8320d11d8ea93417f4e93055dc49fed007", + "sha256": "0w5m5f21db6vj29r3ia7mfnjj2br9g57w687sp2pifgvivskz45b" }, "stable": { "version": [ @@ -84202,14 +84718,11 @@ "url": "https://git.sr.ht/~jakob/ox-haunt", "unstable": { "version": [ - 20220602, - 143 + 20220615, + 7 ], - "deps": [ - "org" - ], - "commit": "4d585c51d5701b4d43c02db78c7032658cae47fd", - "sha256": "19pwg5qds5xmrv3yxkmhd3ibln3spcldwkmfwixkaq20an9z2d6k" + "commit": "d32c4b1ab258dc34ca7e713152a274eab35d2608", + "sha256": "1h5g32kw3dgdp3vdzx34n8pcmg3ssn2bzmx5an7yksymibmayfjs" }, "stable": { "version": [ @@ -84249,26 +84762,26 @@ "repo": "kaushalmodi/ox-hugo", "unstable": { "version": [ - 20220531, - 2158 + 20220626, + 2055 ], "deps": [ "tomelr" ], - "commit": "df0b12ef1aff2b322403f24006f0ec17676d3606", - "sha256": "0xxj133j2l0002yp4hm4k01klrcvpbzxp6f75rhyvijny0ggmnw4" + "commit": "97ff24fe0b8d29c503b88eea69235b02ae71beb0", + "sha256": "0s58mynwry8087rsp1ypcl7x7p6pikxz8pnarp0vnzjq1gysk4sw" }, "stable": { "version": [ 0, 12, - 1 + 2 ], "deps": [ "tomelr" ], - "commit": "3c8c0bf28cf02128ceff9a972db3ebad01083953", - "sha256": "0q4gyjzvxzw6a0phw2x2v9n43i28n3g9m7szwbhzch4j6ggxzcw4" + "commit": "af3d0cdf8c672be498d54bc9efdd0e40b2528602", + "sha256": "054ln6x92qyicvc5l1m9yjqqzwpg3j66v0shxsypp97vfw2d3ww6" } }, { @@ -84514,16 +85027,16 @@ "repo": "emacsorphanage/ox-pandoc", "unstable": { "version": [ - 20220419, - 750 + 20220705, + 1036 ], "deps": [ "dash", "ht", "org" ], - "commit": "0a35d0fbfa56bdd9ec5ba5bac2fe002b61c05c52", - "sha256": "00fx05jkz3mbgqw5y1g7pfrhrpkcqn5zf0s51r25ykzdfiggcn7a" + "commit": "f8eac5e5692fc44a4724ada43191e7c28a1ccf30", + "sha256": "0gp6mvrzzp5nnijk4c7jjgkgdda6rbhhqnzpxg8cjpn9gzljlm3h" }, "stable": { "version": [ @@ -84609,14 +85122,14 @@ "repo": "yjwen/org-reveal", "unstable": { "version": [ - 20220524, - 1144 + 20220627, + 1539 ], "deps": [ "org" ], - "commit": "43ebe238ef747985b336880305ae5065da67235c", - "sha256": "1j7bz4g6dd5zcsdj24ry71i5sadldcza2ib7k4yayz6xi5qv3gl5" + "commit": "8567d2b1118bde343980b878af9a38f14d85ffcd", + "sha256": "0prxa7rijhxha3z4y1vyy7y0pr8wzavj7gq1aqaw42rvlpnbdv84" } }, { @@ -84627,26 +85140,26 @@ "repo": "masfj/ox-review", "unstable": { "version": [ - 20220502, - 1146 + 20220619, + 724 ], "deps": [ "org" ], - "commit": "4abb1aa4665d246a38a9a53e5b365b3e57ec6d85", - "sha256": "0gxlps90xnmmd2dv9s82c2p2r8zl8nzdlhadw1zq2rxqqhilxn4w" + "commit": "f7dc418f9812088afc0ee0d08f778a5654686ef3", + "sha256": "0yplmrzb2j47plj99l06mznva93wynsqjcz5v4bkryswnwn10jab" }, "stable": { "version": [ 0, - 2, + 3, 0 ], "deps": [ "org" ], - "commit": "8b2e7dcd580ce2c0df9067c699b104b04c330682", - "sha256": "0gxlps90xnmmd2dv9s82c2p2r8zl8nzdlhadw1zq2rxqqhilxn4w" + "commit": "470297cbe833c65fd3c191de30fa0442ff7f4e45", + "sha256": "0yplmrzb2j47plj99l06mznva93wynsqjcz5v4bkryswnwn10jab" } }, { @@ -84913,16 +85426,16 @@ "repo": "LaurenceWarne/ox-yaow.el", "unstable": { "version": [ - 20220103, - 2307 + 20220629, + 1539 ], "deps": [ "dash", "f", "s" ], - "commit": "378eb55e39cbc06ead0f0c399351612dca22d716", - "sha256": "1vls5mhy2crn8zq6j627ywav85v7y782j6azb6bh326hasxhwikl" + "commit": "036b285b800c7b310398bce0212b14d93b717d48", + "sha256": "0fwd8wm15k16hs88dfr9hlaakb2zvkns35pd038fcjxq0d0vjkny" }, "stable": { "version": [ @@ -85085,11 +85598,11 @@ "repo": "melpa/package-build", "unstable": { "version": [ - 20220530, - 1027 + 20220625, + 1438 ], - "commit": "6bbe65de495110970c2c33497ca640a0774e41b3", - "sha256": "0g6x0p6dbz7zk4xrh5n3367zhv026h3a9hbb8jf2f0qw95685cbr" + "commit": "0a47905f0cefac5a4043c923efe6d80b03a79551", + "sha256": "0w4l189pcbx9a511w8fflq481ryg4l6q4q7i2rk10b9kg3v00zkb" }, "stable": { "version": [ @@ -85117,8 +85630,8 @@ }, { "ename": "package-lint", - "commit": "e35516a9733d9ba39f7df441346d2624bc6dd5e7", - "sha256": "0yy39gywsw48isfgq9k7c5ibgfkaxiig0jbgmmd9s5a0rmrydiwf", + "commit": "570bde6b4b89eb74eaf47dda64004cd575f9d953", + "sha256": "1c800nkybmxqwc6ym4xfch04bqk58m1p5spvl54scfiqnm072hz6", "fetcher": "github", "repo": "purcell/package-lint", "unstable": { @@ -85228,14 +85741,14 @@ "repo": "Silex/package-utils", "unstable": { "version": [ - 20210221, - 822 + 20220630, + 2345 ], "deps": [ "restart-emacs" ], - "commit": "6a26accfdf9c0f1cbceb09d970bf9c25a72f562a", - "sha256": "1gmr3ncr98fb7j3iwig9bbawkpj1f0vmq3nmapwqbaqv6gyy93h1" + "commit": "0168172062467b1bff913ea955b2ef709b43ecfa", + "sha256": "0pghwwxmn90vfkdzl8fqc7zg3xkcx7lyiihjwvkgfmzmqs4hwn1p" }, "stable": { "version": [ @@ -85726,8 +86239,8 @@ "deps": [ "autothemer" ], - "commit": "f6738f8e6075cb6b275210d7e978b1420ee9a056", - "sha256": "0f6vphpxvky4x6fnwyp1gx56awsvhdmazf1p6qg191inn3h5wygj" + "commit": "b11d380f1105407d7985b876f3cf021ed3c0a33b", + "sha256": "0ilznhj75k34110sqa1x980ilfb9lqbjlgxdkyq5nsk2jqqrxs5p" }, "stable": { "version": [ @@ -85750,11 +86263,11 @@ "url": "https://mumble.net/~campbell/git/paredit.git", "unstable": { "version": [ - 20191121, - 2328 + 20220709, + 849 ], - "commit": "8330a41e8188fe18d3fa805bb9aa529f015318e8", - "sha256": "10zm5nfs8sx1cmjifjcy6xj3285hx1936xc3kbf6ndzpcqgb9yd5" + "commit": "d0b1a2f42fb47efc8392763d6487fd027e3a2955", + "sha256": "1x91xxvwb3r3h61ff1kknlaakxm1a40r7zg2lck9j52yiza4f191" }, "stable": { "version": [ @@ -85947,14 +86460,14 @@ "repo": "jcs-elpa/parse-it", "unstable": { "version": [ - 20220214, - 1531 + 20220704, + 640 ], "deps": [ "s" ], - "commit": "079da5e65a5ded0b5ebe7cfe799eac668d7323db", - "sha256": "1w00ifh8qa12f9b38acv47c9cb3vnzpyk72p5qf6jf4pjc2izx9c" + "commit": "c16cb7aa1b4437a6b9943feaf058e10cd17056fa", + "sha256": "0404nvvjcl1rdzv1h0a9zn7sijrfykd6c651l11yns3na81nv8x3" }, "stable": { "version": [ @@ -85977,19 +86490,19 @@ "repo": "joostkremers/parsebib", "unstable": { "version": [ - 20220426, - 2049 + 20220620, + 2207 ], - "commit": "dd4c5540fa6c2cd990cba324741d7abbc8ed2f23", - "sha256": "16jx7qay8ipyd202xrslfrcbjrvzzal77iqc69rwci3nlwax8vy5" + "commit": "1ec276bb26371b686d6c57ffd38ca222cf42e8db", + "sha256": "0vb1lqi3m3c4p8lw4lznr4cllkd46bq09lyky2ib37wbb7qddnn7" }, "stable": { "version": [ - 3, + 4, 1 ], - "commit": "3d46fb939371664682c711750367de088aa66f92", - "sha256": "08vrkadjxaw1w1bx8dg12kxxkvgl65p0d7gkpfhwpvv35k0d9z3y" + "commit": "185239020f878cfbe1036270e6c3d1026ba8f255", + "sha256": "1bsxhizwhri8ayryfq59ghkybrql611q2bnjd45hpj7armwq3s8m" } }, { @@ -86179,11 +86692,11 @@ "repo": "juergenhoetzel/password-mode", "unstable": { "version": [ - 20220222, - 1757 + 20220706, + 507 ], - "commit": "456a01e959140cb070e77bce5032a6885c7b7ae0", - "sha256": "08achm8xxpadkqk0jk6nk0x8zk25xwn59xmvybj1rsmm4apnqsqx" + "commit": "883981d9f8d0e2a8ec479c89f5f6b2492c22e01a", + "sha256": "003r3fy05bimv9j8v6hr6saq8bvq7h2k8nfl45bxai8mhsm6fhsd" } }, { @@ -86736,16 +87249,16 @@ "repo": "vedang/pdf-tools", "unstable": { "version": [ - 20220522, - 13 + 20220714, + 2356 ], "deps": [ "let-alist", "nadvice", "tablist" ], - "commit": "f9ccdf99e560bae70d3a13325cec9dc0e3cc45b0", - "sha256": "19hj0hbg3rssw9xjia1g0nmknmvcrxhgb3p0y5vy8nlk0d2h5v4z" + "commit": "386dca5b2d078ba691eefe230478a440ee1f7b16", + "sha256": "0gav9fg6x7gbbvpnjs5l5hdmvb7ynhdr4jkdhxr4s4mz1ba6mp2w" }, "stable": { "version": [ @@ -86964,20 +87477,20 @@ "repo": "Fanael/persistent-scratch", "unstable": { "version": [ - 20220218, - 810 + 20220620, + 408 ], - "commit": "4e159967801b75d07303221c4e5a2b89039c6a11", - "sha256": "1f4s2rjgylqxjnx2885hc58215k3j162v0qlk2agq6m0hk9nn6fb" + "commit": "92f540e7d310ec2e0b636eff1033cf78f0d9eb40", + "sha256": "1hl4xac1zsvpbibahp54phf1b1srhnm2nh30vzmh96aynnf38vqd" }, "stable": { "version": [ 0, 3, - 6 + 7 ], - "commit": "4e159967801b75d07303221c4e5a2b89039c6a11", - "sha256": "1f4s2rjgylqxjnx2885hc58215k3j162v0qlk2agq6m0hk9nn6fb" + "commit": "92f540e7d310ec2e0b636eff1033cf78f0d9eb40", + "sha256": "1hl4xac1zsvpbibahp54phf1b1srhnm2nh30vzmh96aynnf38vqd" } }, { @@ -87148,14 +87661,14 @@ "repo": "nex3/perspective-el", "unstable": { "version": [ - 20220521, - 2138 + 20220706, + 445 ], "deps": [ "cl-lib" ], - "commit": "794afdbc5188ef6f2d78d26302cd78903ce618fa", - "sha256": "1adn4knbhsygsy67q6w86qbhqx2gg6rw5hcnan7x40wq8fi7hr0p" + "commit": "e994fb3067d343732f9fc0ae209cecd5a6192237", + "sha256": "11z80lpiy8hbsc7ik5j1cjic1nbh29lb0wb12n90ddxrxi2p30g3" }, "stable": { "version": [ @@ -87643,11 +88156,11 @@ "repo": "emacs-php/php-mode", "unstable": { "version": [ - 20220606, - 1831 + 20220709, + 1748 ], - "commit": "81717a56b74d7ab76a1126eb4f45167d5eb61c32", - "sha256": "1bnn1lwsqd9rlx1qjrl4h2v6j29cnhagd4ay82psq309yvr4av5x" + "commit": "ca6ae67dab6a8646316d62d400a37dd96d8de3f6", + "sha256": "0m0x5xhj2l3gp03jvjaawk0w3xb4nsddxkgnm31sacchqwxjmxcz" }, "stable": { "version": [ @@ -87793,14 +88306,14 @@ "repo": "emacs-php/phpstan.el", "unstable": { "version": [ - 20210714, - 1805 + 20220710, + 942 ], "deps": [ "php-mode" ], - "commit": "0869b152f82a76138daa53e953285936b9d558bd", - "sha256": "1xm5i658pf1lb4bfpy6zy5msanhia8r9j7v7rx72amkksja3hwnj" + "commit": "4f990bf51cc65b3bdc63f4991e007d03b76932a2", + "sha256": "07iqv6jd7a49vmfp4fz9dwvxhhl50wkpyisazr2rxwfs9i72n00m" }, "stable": { "version": [ @@ -87855,8 +88368,8 @@ "repo": "nlamirault/phpunit.el", "unstable": { "version": [ - 20180829, - 1438 + 20220704, + 1554 ], "deps": [ "cl-lib", @@ -87864,8 +88377,8 @@ "pkg-info", "s" ], - "commit": "fe6bc91c3bd8b329c6d26ad883a025f06b5121ee", - "sha256": "1silbfmv85r73pbc7f5cm4znc6644ngihfnhibk1fgp9j0rf7ahc" + "commit": "02020d4b3e5ae9fdb82be9203fa6d330adcbc0eb", + "sha256": "14x4cmwc8m787dv49kpaw285109d85zv95dlkcxza8g8f493mdw1" }, "stable": { "version": [ @@ -88203,6 +88716,21 @@ "sha256": "1nwj4c3y0kdlkf3jqd2dnibaiazrq6qcj533xk2qw4wmx072yij0" } }, + { + "ename": "pip-frame", + "commit": "e22162292a92714bbe99103084f9e43f03705ca6", + "sha256": "1r4ci7sl9wjjrhhidf6is2vnsw7iis91gss218fpf5r6saqcs80i", + "fetcher": "git", + "url": "https://git.zamazal.org/pdm/pip-frame", + "unstable": { + "version": [ + 20220706, + 810 + ], + "commit": "7a75e73f884f294c979d19a520268f2a4371861b", + "sha256": "0wssm2rrm53hg2gvg7y926zgca2r8hvjib0dbgg6lz6bflshv8bp" + } + }, { "ename": "pip-requirements", "commit": "5eaf6987f92070ccc33d3e28c6bb2b96f72ba1aa", @@ -88602,11 +89130,11 @@ "repo": "thomasluquet/playerctl.el", "unstable": { "version": [ - 20211014, - 856 + 20220714, + 1234 ], - "commit": "4c3a6132616fd28f902590bf6e63332e6055492b", - "sha256": "18b59kcni6xp46r8lkwb8baz2mic9n4zyndib10dvfs6gwjmas2p" + "commit": "0912ed5a5ab6d611b5f35db589f608f1fafdc81a", + "sha256": "1pabavc2yla9dymc0f1gi9fvm139apls8971zakc05qz9jhs721c" } }, { @@ -88921,8 +89449,8 @@ "repo": "alphapapa/pocket-reader.el", "unstable": { "version": [ - 20210824, - 658 + 20220630, + 844 ], "deps": [ "dash", @@ -88934,8 +89462,8 @@ "rainbow-identifiers", "s" ], - "commit": "0a177d4a3b4b2532be7f0775e5cc41e6382a45d4", - "sha256": "00ik1lgz9gzpx6701z26y0m064gf574ir4hjf1b2a052917gi97a" + "commit": "88d1e6019a3408835745e117cb5b83a8e31f11fe", + "sha256": "1rya9d3pcyrhxrk9n7h31b9b6jvw91hzj6xdss5x6lslyfz1aidn" }, "stable": { "version": [ @@ -89492,15 +90020,15 @@ "repo": "TatriX/pomidor", "unstable": { "version": [ - 20210111, - 919 + 20220714, + 1932 ], "deps": [ "alert", "dash" ], - "commit": "52134701fa76b12252b06c9d6fd4e8665596a95a", - "sha256": "1h94dgjcbpd6vr1wgvajx7d0ikz5jl4zdmxjgqzff0cg2vqin3r6" + "commit": "394a52f95587b1d10d0c3bdca503d2cc876db35b", + "sha256": "1y64xs74p39rr1d4i1s0zjhqlcips9k11fr8z6wy1j7s9b142570" } }, { @@ -89618,8 +90146,8 @@ "yafolding", "yasnippet" ], - "commit": "4bdffa94cd89da91b75e9edc56e9e2197ce072a3", - "sha256": "0vr4w7923g3a5sikw4px82plgjk9b3wki8ciqamp7i1p5i5lxbhz" + "commit": "21275741d2921260e836081b8c56245cc22d4dc8", + "sha256": "1fg9rvlmmqkfwi0ghi5j1sirbxddggsiqlydy31lbcx6k7md32s4" }, "stable": { "version": [ @@ -89696,11 +90224,11 @@ "repo": "karthink/popper", "unstable": { "version": [ - 20220406, - 336 + 20220711, + 836 ], - "commit": "6599c9b5a12b411c6cf1536bf200ae233fa24389", - "sha256": "0k306s29qj8dxgjzv24lxz3xnykra99h2gv76802snlyjbnzc50y" + "commit": "d7560f18350faaee8362aee16481268de3cc6457", + "sha256": "12br7pnn01k7hwbcrx9c0dppp2jly7xhif3jrkg1v7mh8cj6sccs" }, "stable": { "version": [ @@ -89722,8 +90250,8 @@ 20211231, 1823 ], - "commit": "976bd8e06100df5a266377d0e5f63b104ba93119", - "sha256": "0ssr7anniahn8l72gykc24c6yma4lkjwrxc3a8wvi6r7qkbdafxq" + "commit": "c65905aa1a3ac32d1dbc8c1060605621e6143f80", + "sha256": "1bvw8fwjwsrhx2z8mmlsmzxmjqin1yrg045sn2pma2gxls85bqv8" }, "stable": { "version": [ @@ -89940,11 +90468,11 @@ "repo": "pitkali/pos-tip", "unstable": { "version": [ - 20191227, - 1356 + 20220715, + 1020 ], - "commit": "179cc126b363f72ca12fab1e0dc462ce0ee79742", - "sha256": "1rz6lqmhs7l49cwwqs7gl2i49l3gvziz1gs556jzsic7jzf9xk1j" + "commit": "bfe74204d1201a33ace81898e7c485382817510a", + "sha256": "1vmmnajdmfaq9psrgv0fd0qf739201qaihhwg5qbqvbm86v2ns1f" }, "stable": { "version": [ @@ -90133,6 +90661,21 @@ "sha256": "19fvibfv3skvs77k3bsd0q5cg3shn9wrdjfyrcybgc9sjfcngv7n" } }, + { + "ename": "ppcompile", + "commit": "33213ca9e98ba41787d1617e6effb4c228d6c8f4", + "sha256": "14wwy6mp0ih9szx6jx6z0s3pdzgwj8m0ihn0apl37ivypmyzzcnb", + "fetcher": "github", + "repo": "whatacold/ppcompile", + "unstable": { + "version": [ + 20220619, + 1535 + ], + "commit": "ff54435af0ea970ec89b48afe050a61e721eb39f", + "sha256": "1bxpfm8cxsccmz7n6cz5chz0a28cfwn0vc2ssf91rv2xw43fziqj" + } + }, { "ename": "ppd-sr-speedbar", "commit": "f930f54048d06f6a97824b66fbb74649eed40b54", @@ -90197,8 +90740,8 @@ "repo": "blahgeek/emacs-pr-review", "unstable": { "version": [ - 20220412, - 440 + 20220629, + 1556 ], "deps": [ "ghub", @@ -90206,8 +90749,8 @@ "magit-section", "markdown-mode" ], - "commit": "cfc5643c4ab66f17a31d82418465ae434486d8db", - "sha256": "0gf5s7f4906qypy3imaqh7zy24xd1ijz57rh72vdvjd33n4x857f" + "commit": "e4db206f2ca9baf65ca7757234bc2baf5634d8cb", + "sha256": "0fl69419hiifmpvphfyhh6z9h7b5qcgpsm6r8z8c0ysang7l7y26" } }, { @@ -90592,14 +91135,14 @@ "repo": "alphapapa/prism.el", "unstable": { "version": [ - 20210804, - 417 + 20220716, + 40 ], "deps": [ "dash" ], - "commit": "b0cbdaf4916c1cf348a8f0e4f6158e040a627562", - "sha256": "1h5fca47kinwr5qy58nh0bqn259vcj540013wb7kwki6ab33l809" + "commit": "9cf6b5e3bcb6044567f3911a4adb796e0c61f207", + "sha256": "1j2ifn1nc94b07ypifimmb6v13askcd93063pppjqjsh1qzm8s6n" }, "stable": { "version": [ @@ -90877,11 +91420,11 @@ "repo": "jcs-elpa/project-abbrev", "unstable": { "version": [ - 20210715, - 1213 + 20220704, + 658 ], - "commit": "f0f8d70317fb6f505ec2762aa82962322b14a9f0", - "sha256": "07dxxr610dmjbx9mm9xyhpfg3piqmj5njxz2arrz47h49xsgl4b0" + "commit": "5c35af3e456f1300f0e170d74da87e563b6cc222", + "sha256": "190g3iqzb2kv3z59b4zbf110g8yzxx64ml1c6ix194w76faghxix" }, "stable": { "version": [ @@ -91004,11 +91547,11 @@ "repo": "buzztaiki/project-rootfile.el", "unstable": { "version": [ - 20220516, - 1419 + 20220708, + 1403 ], - "commit": "65e46311dae24f3458e43c2490ad265c711aa624", - "sha256": "03x0mlndml6mm3jfpk95rnq2fhcdyr199pj9hmxjb1ny1j72lvdl" + "commit": "db981a9d270e438b669aa0772d0ea406689d42ad", + "sha256": "0zg5v9qflqjy6h148xwzin95afhxi3cfgq6kw0fsjafdcwmcila5" } }, { @@ -91052,11 +91595,11 @@ "repo": "bbatsov/projectile", "unstable": { "version": [ - 20220530, - 615 + 20220710, + 959 ], - "commit": "e60883ff370c1545499b97cf56479de1a58c5b3b", - "sha256": "08h4q3fghhc749pb8zak2z5p1sify01bkxhhv9iyrg0iiwl9bl6p" + "commit": "00fce5a62cab56873c37629bef653bb2a1e4a4c1", + "sha256": "1qa5xir20x6qrs3cj79pykp5cpb74y4s23n8664p6kjyhmg7l5cs" }, "stable": { "version": [ @@ -91458,11 +92001,19 @@ "repo": "ProofGeneral/PG", "unstable": { "version": [ - 20220525, - 1052 + 20220714, + 1137 ], - "commit": "ac9ba11fda58800a1cec699fbda8811644847bbe", - "sha256": "03bn22byy8p80wjdpal2w1cq2jkxdnivdd6xdkfh3vl5mb5vwc68" + "commit": "e06a7704a53ee43c4695681c0e40edfdf9b1124d", + "sha256": "1yyprdnfhp5rpax8qsag3szmkgn5f0m4g83pbbp2f33dxxvvx767" + }, + "stable": { + "version": [ + 4, + 5 + ], + "commit": "c366365aaddeb3a65dc0816c8f93ec209dc9de44", + "sha256": "14ll3gxjcw8ghpnhsyk1vpc0ffba0nmm8sz3hq6ddwq2nja5w96x" } }, { @@ -91557,16 +92108,16 @@ 20220303, 1716 ], - "commit": "c0fc2e881bc36aafb0bf539bf41889611370f60c", - "sha256": "108i14rd0wvj04kk6mqz577g142sqs33avbflc728mnkkp9wqmpy" + "commit": "eb6cc788493dd22582df752641307348ae40d173", + "sha256": "1gx99pyvf2248kz07sx4kx0pzinj65bbxkn2679wjqbvg19lcd9w" }, "stable": { "version": [ 21, - 1 + 2 ], - "commit": "e73ed1630fdec85d7fb513c166629ed49cd4eb18", - "sha256": "0h2an911grs5kdvsf4cgypa4x022rgm81arxg42ks6sdzf8895x2" + "commit": "839b18b1ba42639fedecfd751102afcc5736b5d4", + "sha256": "0arri4vlj6qrkxr251kz9iil6grv8clxi0746pimwrd2jppg8jqd" } }, { @@ -91832,32 +92383,30 @@ "repo": "fvdbeek/emacs-pubmed", "unstable": { "version": [ - 20210927, - 1933 + 20220710, + 2149 ], "deps": [ - "deferred", "esxml", "s", "unidecode" ], - "commit": "e1ac5433daf966cf7c5e9178b037191e1eb3e4bd", - "sha256": "0ylsn36zmrn8mds2z74vbyv7sd4699a4wicg4shrf2gd5bbsi72g" + "commit": "7e38b3f8ec72618b89afdeaa113f1787dcb690ca", + "sha256": "1f884r3fs9nybf5y9dwp8f9m8azssxjy55z7bd0nl9pjll9rhsz2" }, "stable": { "version": [ 0, - 5, - 2 + 6, + 1 ], "deps": [ - "deferred", "esxml", "s", "unidecode" ], - "commit": "e1ac5433daf966cf7c5e9178b037191e1eb3e4bd", - "sha256": "0ylsn36zmrn8mds2z74vbyv7sd4699a4wicg4shrf2gd5bbsi72g" + "commit": "7e38b3f8ec72618b89afdeaa113f1787dcb690ca", + "sha256": "1f884r3fs9nybf5y9dwp8f9m8azssxjy55z7bd0nl9pjll9rhsz2" } }, { @@ -91967,11 +92516,11 @@ "repo": "AmaiKinono/puni", "unstable": { "version": [ - 20220517, - 1536 + 20220702, + 1336 ], - "commit": "a8f6e66be99051f34f0ab2704bdea04667d8b005", - "sha256": "0h6isykcwh7b1vxm5qikcfd3g6v0lv487q7gf5j9p6v5gs1f9yb9" + "commit": "e1c4cac260ac0aae5328e9378bec70baa5102e4c", + "sha256": "06b66xz0yfx0jp50i94hand8rhzizbg4h9af7vc3644g0sjvwsl8" } }, { @@ -92154,7 +92703,7 @@ 20220522, 1152 ], - "commit": "d904639f1fca12435e38adb6cc602cd468fa618b", + "commit": "cf2daa75aee75d4dec772103c577c614c85409ad", "sha256": "1sr64n1cg1pdxfa3n8ckq3hy92asnwi2b5nl88qy3jy1mybah4d2" }, "stable": { @@ -92461,28 +93010,28 @@ "repo": "tumashu/pyim", "unstable": { "version": [ - 20220608, - 343 + 20220709, + 519 ], "deps": [ "async", "xr" ], - "commit": "21eb4d60d0af85099ddd820e4a367e662185beac", - "sha256": "1bj63c8hp05hah0cwsn4df3wjqfp556brqbhhr4n5sx57mfgr2xj" + "commit": "3d9d16b578a1136ef344b61db5f0d55cefcf4164", + "sha256": "032an8d6mr67q4xip9x6imw7ljslnck8s1mx44gxdrz94zi2rk4h" }, "stable": { "version": [ - 4, + 5, 2, - 1 + 3 ], "deps": [ "async", "xr" ], - "commit": "6b4cea1b541f5efd18067d4cafa1ca4b059a0c63", - "sha256": "1qcdf1v20sm99gbirjycppm3rnig1qvk8iiv50zmd6z38l48j7vh" + "commit": "3d9d16b578a1136ef344b61db5f0d55cefcf4164", + "sha256": "032an8d6mr67q4xip9x6imw7ljslnck8s1mx44gxdrz94zi2rk4h" } }, { @@ -92493,11 +93042,11 @@ "repo": "tumashu/pyim-basedict", "unstable": { "version": [ - 20220531, - 555 + 20220614, + 1108 ], - "commit": "0e6da11c4f500f6a3642dca167592eb27066ba52", - "sha256": "0h3w44q1ivhrrhy19ckis4z54kqrh7madzjif1ai2fnxfqk0zi5p" + "commit": "d61af27686f7a39e6c138b7261a686e7ea7a0ef7", + "sha256": "0fzyh8qmicq2vy9j1ca708ir67dpxp1cwjaw0sw469p24cvj12yy" }, "stable": { "version": [ @@ -92647,17 +93196,17 @@ 20210411, 1931 ], - "commit": "72855d5d08a91ca5faa8c5442ff6f4aedfadf7ca", - "sha256": "1f4q7yb159jg57wmd29300sjis8y53nr9b880cd5yb8da7j3fbzb" + "commit": "40c9e66e4756e76318469f1484602ca92d505d3f", + "sha256": "1pg5xr14kskkfl9qmvzdwgd4lr2njzv9ai9f22faw4xs2kkqfr7l" }, "stable": { "version": [ 2, 14, - 1 + 4 ], - "commit": "6447553ab509c9e811b7da53168e17fe2cadf187", - "sha256": "1v2qid36mig87q7cqblv0nzja7xj4ls15q5hy7jzvhpj20fsmp5f" + "commit": "bf29a5520e8d0e432ca715e0614a62052b3809e2", + "sha256": "05vfjxb5gbc1wwarqmbm55kbqp5623xwk47ny5xh5ng8qchw9drn" } }, { @@ -92995,11 +93544,11 @@ "repo": "python-mode-devs/python-mode", "unstable": { "version": [ - 20220608, - 1625 + 20220709, + 1619 ], - "commit": "68f5313712e20e2f292e723a84ebb5db609e38e5", - "sha256": "1lhnfac9jc5p80pvi9akv4b288g3i9x2j5658z5v0g5rwfipqncz" + "commit": "cf4c7be22343032e00c7bcf24071aba63ad14f01", + "sha256": "0w33wl6chl02kgr427c8rxcgdyfa6agm7fh8926grc29hzcjjhzd" }, "stable": { "version": [ @@ -93019,8 +93568,8 @@ "repo": "wbolster/emacs-python-pytest", "unstable": { "version": [ - 20220502, - 1237 + 20220714, + 1951 ], "deps": [ "dash", @@ -93028,8 +93577,8 @@ "s", "transient" ], - "commit": "5e72c343cb81866358e4437390c5eb84c3203440", - "sha256": "16inr0vqfas907bifbd9jh8m7p41hpk6n6ca7x42qkz80ay3i9px" + "commit": "d031fa91e21bb2112635ef048955ef44e23695a8", + "sha256": "1i08xfbwfig3lshkww6k7c5vf2qcapipcmpb2x66jkwdq0n97g0n" }, "stable": { "version": [ @@ -93372,15 +93921,15 @@ "repo": "quelpa/quelpa-leaf", "unstable": { "version": [ - 20210124, - 348 + 20220704, + 635 ], "deps": [ "leaf", "quelpa" ], - "commit": "9b2197770304772fa5262d0b9bfd26908746a2fb", - "sha256": "0v9ky8s3yfxvdyvc83b7qlv4xxb9j65g4iwkzc3kdn0zsbakrjp0" + "commit": "bd306aed20349ac96472a05da096c584f9c17408", + "sha256": "1ridwj8svsx7mg33nwk5qh0g5cwvf1hb67h99pcs3i5a17vmycdx" }, "stable": { "version": [ @@ -93671,17 +94220,17 @@ }, { "ename": "racket-mode", - "commit": "9af8dea03aba378f21c6109faf48278b4d2bf59f", - "sha256": "0cmlz314w5227br0vns5d7jhpspv1byzalgzv8f9v2qjyvk6jvsn", + "commit": "570bde6b4b89eb74eaf47dda64004cd575f9d953", + "sha256": "1yyp6w4dzhs4gjmpffmlk4zxm29cg06zk09ailpi5hpmva8p4nxg", "fetcher": "github", "repo": "greghendershott/racket-mode", "unstable": { "version": [ - 20220607, - 1810 + 20220705, + 1452 ], - "commit": "1c88636d5da4537b897e7b9b23edfd9495a24d10", - "sha256": "12nfrdvgndn11a17zaawv2i6mbjfiw1gih683l0cj0xknx11rg8j" + "commit": "9dae07533f0fde32c12af5260055a2c3cc199312", + "sha256": "1wbrxfmagp1v7wyhhwiv6yplw8bnpyjzs4bd7nqgsvvjgf3lk2h4" } }, { @@ -94418,8 +94967,8 @@ "loc-changes", "test-simple" ], - "commit": "3c88611c4ed59069093187c2a039b8d05cbe53e8", - "sha256": "0dcrq6lad538a18nll3fp55d4m2jl65axzilgrksmqshhhi18qk1" + "commit": "45f7e4409470abf964c7cb1d526248e4fa7078e0", + "sha256": "1xb1k6cl8xvjy1l16r4l0f2s0isac579apizyly6p8d7y45kzdky" }, "stable": { "version": [ @@ -94807,11 +95356,11 @@ "repo": "ncaq/recentf-remove-sudo-tramp-prefix", "unstable": { "version": [ - 20210509, - 43 + 20220621, + 749 ], - "commit": "c462344739867f35d39c8794c358b4c4b5af7dcc", - "sha256": "1bpf9bqnhwb6gcr6gxi2fgr03fdh0s7k0k3pgy543dpafhlzm2ac" + "commit": "95ff600058371dd08f615095a55850d2910021bb", + "sha256": "1nvrc61lcyij2y64hbrsap9fc2lxx2srg763wyvhclzdi4lk4px6" } }, { @@ -94871,11 +95420,11 @@ "url": "https://codeberg.org/ideasman42/emacs-recomplete.git", "unstable": { "version": [ - 20220507, - 1118 + 20220708, + 211 ], - "commit": "021ca9b047caadd4903aa6f417890d6497ae437a", - "sha256": "1a78hmq8p5a8w0pciansci69vm3m65kcxsfp184bajq1nx8ydn6d" + "commit": "541e98dad23c019b62af37cf4971ed17226c8713", + "sha256": "02mc088551sj5iyd41ra3vfp6a5m9j22yg44w5axa9539klv0i98" } }, { @@ -95039,8 +95588,8 @@ "repo": "thanhvg/emacs-reddigg", "unstable": { "version": [ - 20220312, - 1339 + 20220715, + 538 ], "deps": [ "ht", @@ -95048,8 +95597,8 @@ "promise", "request" ], - "commit": "c00407087e155c4fb672e5544e2ef3cb33f1f7eb", - "sha256": "14mfv9fx3zdca1xbbs31m3c2hjxjq25692j8ln73knlgy0y659dd" + "commit": "5e2ea1316a3fd6c46352402ed44a7d73881dbf73", + "sha256": "0mp2csl2rbawx6kq9drrxivalz11s8jhahxqisd7aj8p78h0x0am" } }, { @@ -95216,11 +95765,11 @@ "repo": "purcell/emacs-reformatter", "unstable": { "version": [ - 20210831, - 1405 + 20220627, + 825 ], - "commit": "452a99b556ebf1953f92fe3e16c20d10d1fed466", - "sha256": "1brdpwnjl46hzlbyhkizy73p9vvfqyydi140rbmxap29y9iyzi1d" + "commit": "84cff54b0873fcca6fc0314d7584284e86708e8d", + "sha256": "0gib2ylmm5kp23s2mkhx9b83bh9pxszzdrx55rf1b9gh13qz2nw9" }, "stable": { "version": [ @@ -95481,6 +96030,21 @@ "sha256": "1jka61j6zrc0yzjcplnyg1kp1d45ikwnkmayjg41v9w0pfrzzim3" } }, + { + "ename": "repeat-help", + "commit": "0f9283ef3cea68b0d581ae544ec4192b83eb4998", + "sha256": "0xqmf2hid78hqacklvsxrfdp4a6a1p9bl7ygd6qrrmh4i46cbjc8", + "fetcher": "github", + "repo": "karthink/repeat-help", + "unstable": { + "version": [ + 20220706, + 1225 + ], + "commit": "47fd9041bfb33af6a24a49db37e174c96b7f8fe4", + "sha256": "168g6av6llbyns2x4i8djv8x4h6k0391l8cmnxm4b4c2mw53qfn5" + } + }, { "ename": "repeatable-motion", "commit": "0dd56ebaea098715b9c201f07e6196c38977f8e3", @@ -95703,11 +96267,11 @@ "repo": "tkf/emacs-request", "unstable": { "version": [ - 20211107, - 1907 + 20220614, + 1604 ], - "commit": "c769cf33f2ac0a1a9798b508935c4b260e856ab5", - "sha256": "0dqcg1dlzirmgsgg8ar2csn5mnlpr64y6n5skrqc6wcshzyzp038" + "commit": "38ed1d2e64138eb16a9d8ed2987cff2e01b4a93b", + "sha256": "0c8jmw4jif6vcizz2ba9yvh334ci45q7alhsayij0rwmwawgykgc" }, "stable": { "version": [ @@ -95727,15 +96291,15 @@ "repo": "tkf/emacs-request", "unstable": { "version": [ - 20210214, - 37 + 20220614, + 1604 ], "deps": [ "deferred", "request" ], - "commit": "c769cf33f2ac0a1a9798b508935c4b260e856ab5", - "sha256": "0dqcg1dlzirmgsgg8ar2csn5mnlpr64y6n5skrqc6wcshzyzp038" + "commit": "38ed1d2e64138eb16a9d8ed2987cff2e01b4a93b", + "sha256": "0c8jmw4jif6vcizz2ba9yvh334ci45q7alhsayij0rwmwawgykgc" }, "stable": { "version": [ @@ -95810,11 +96374,11 @@ "repo": "jjlee/rescript-mode", "unstable": { "version": [ - 20210902, - 2140 + 20220613, + 1246 ], - "commit": "350d717f5c2564817179c4b6b1c615b10fd062e8", - "sha256": "1068ypgnlza1y8zpzpr1fayda72bxcfcy9ikmhrpkzhpvznqr2x4" + "commit": "2aae2fbd4971dff965c758ec19688780ed7bff21", + "sha256": "0bb4r8r5qs2axq4g1g7rk75lx2rvbgpzpgiqkmzjcgdl8w83kz86" } }, { @@ -95998,15 +96562,15 @@ "repo": "jcs-elpa/reveal-in-folder", "unstable": { "version": [ - 20220110, - 1821 + 20220704, + 659 ], "deps": [ "f", "s" ], - "commit": "a94de082d8f6a1219532e85f432b4919c175fe9b", - "sha256": "0hs61cl97r6bwl2di5fjgrh6cmhjjfgk750159028a7pfcm3qyjd" + "commit": "ccc5d8c61d386bb817863624fea0dba1273e7255", + "sha256": "1rmxpw3an4kdjmzv3qbh1gb1anc3pb5a0zxl6mh2yrppwggyh29c" }, "stable": { "version": [ @@ -96104,11 +96668,11 @@ "url": "https://codeberg.org/ideasman42/emacs-revert-buffer-all.git", "unstable": { "version": [ - 20220509, - 1045 + 20220710, + 706 ], - "commit": "91d0f4f7a0c0c3015887f4ed808537ebebd6385e", - "sha256": "1sja06pzvx1hds786q4a071zl8r8034is3l8s8zp5k4kxd6vg760" + "commit": "7fe7fd335542e76c5099e51b17ea29614482faa1", + "sha256": "1a0xvk3cwfy0j09nbrhmpijjnpimaz1dpld9ny7ldypy6hlwjlhy" } }, { @@ -96380,8 +96944,8 @@ "repo": "DogLooksGood/emacs-rime", "unstable": { "version": [ - 20220522, - 2351 + 20220620, + 951 ], "deps": [ "cl-lib", @@ -96389,7 +96953,7 @@ "popup", "posframe" ], - "commit": "0b4a2709159f5e975544b26302b8463deb7640d8", + "commit": "3eeef9c445fa056a4b32137f9ef72c27ced2d4ab", "sha256": "1sk09z05xvg94pkf4181hvlg9q0m71kinzxv8223ls8df6ymc43k" }, "stable": { @@ -96440,8 +97004,8 @@ "ruby-compilation", "ruby-mode" ], - "commit": "134438af8fbdfa9c8077267c768d273a9792b484", - "sha256": "0ndrqj7qsf9rky4v928803ib66p37vyhxgyc42vshx86q73v4cyg" + "commit": "9b3110f4043bc4f07d83e5ada26d64f90ef68aed", + "sha256": "089w0rs9121f1cn5ag0v0qnsim0xrha9iqq1dqriw0plw5bfjmh5" }, "stable": { "version": [ @@ -96820,15 +97384,15 @@ "repo": "pezra/rspec-mode", "unstable": { "version": [ - 20220517, - 2325 + 20220622, + 909 ], "deps": [ "cl-lib", "ruby-mode" ], - "commit": "41224216cb7762a18eb0e309095796f3eb319e01", - "sha256": "0ym2i3w071iqh32p36fb22br62cbfs6zyhpm9khbspgmvpxaas8x" + "commit": "778c76a6a4bd93faf137d5ca47e7823e1665051c", + "sha256": "0gpw0yf1rc65qv2n51fwjms0ihbhsbdy5akwh69hcq7wmrlr75fj" }, "stable": { "version": [ @@ -96869,11 +97433,11 @@ "repo": "Andersbakken/rtags", "unstable": { "version": [ - 20210313, - 1541 + 20211101, + 2149 ], - "commit": "db39790fda5c2443bc790b8971ac140914f7e9c2", - "sha256": "05cigdvlq5lfahr9a1z8rvlw2s99j4pha2in59pshz9ph8cqgq10" + "commit": "c628efc9b485470a48aec2692d79f7c140bc5b92", + "sha256": "03avv7brbrj69368riq3xg4qh65yzl5cyjn9wc2rbyx4jw2q3p4p" }, "stable": { "version": [ @@ -96898,8 +97462,8 @@ "deps": [ "rtags" ], - "commit": "db39790fda5c2443bc790b8971ac140914f7e9c2", - "sha256": "05cigdvlq5lfahr9a1z8rvlw2s99j4pha2in59pshz9ph8cqgq10" + "commit": "c628efc9b485470a48aec2692d79f7c140bc5b92", + "sha256": "03avv7brbrj69368riq3xg4qh65yzl5cyjn9wc2rbyx4jw2q3p4p" } }, { @@ -97018,8 +97582,8 @@ "deps": [ "inf-ruby" ], - "commit": "134438af8fbdfa9c8077267c768d273a9792b484", - "sha256": "0ndrqj7qsf9rky4v928803ib66p37vyhxgyc42vshx86q73v4cyg" + "commit": "9b3110f4043bc4f07d83e5ada26d64f90ef68aed", + "sha256": "089w0rs9121f1cn5ag0v0qnsim0xrha9iqq1dqriw0plw5bfjmh5" }, "stable": { "version": [ @@ -97348,11 +97912,11 @@ "url": "https://codeberg.org/ideasman42/emacs-run-stuff.git", "unstable": { "version": [ - 20220507, - 1118 + 20220710, + 1035 ], - "commit": "0aeabc7ef3f2a209c0c69300f6d61921ec448ffc", - "sha256": "0ylsj92fq98i7vbibav7807070adaz24jn497qcd15n8ndfrvri5" + "commit": "1c51c273ab2f1750278284a15bf6cff464bddc2a", + "sha256": "0f450kxzd7xjgh0frqzgfw9p4a8mij54xxmrhc5hbq12pxrddk0f" } }, { @@ -97439,20 +98003,20 @@ "repo": "rust-lang/rust-mode", "unstable": { "version": [ - 20220217, - 2009 + 20220626, + 1126 ], - "commit": "0df2f22479b98f76d97de90e1c390ff1b0902a46", - "sha256": "0c8bhdsip75wa966zhli2khncqf1zhbxyxfqics1lh10ncxa7qw0" + "commit": "01ba44166cf16d9b78d99f2fa0c3c54c0f206894", + "sha256": "1mcvalgsilg1lsmnxpsg6qjd4z0k2d5dfij92gdqhzgc3188ad1p" }, "stable": { "version": [ 1, 0, - 4 + 5 ], - "commit": "e35a1800fc0f9ed178539d6fb82ed885c1014fb5", - "sha256": "10972zw2h1dijx08j5h7aa4d717vhrmahzkslisy3dk2gd8y2v0q" + "commit": "7bff48894dc532caf4010be3060370d315ef75f6", + "sha256": "0sjhssxaqdd9mayfcjaf6pb0z4sv0xm5wjaqmk6wdmh543m2v1s8" } }, { @@ -97486,8 +98050,8 @@ "repo": "brotzeit/rustic", "unstable": { "version": [ - 20220531, - 1820 + 20220715, + 1010 ], "deps": [ "dash", @@ -97501,13 +98065,13 @@ "spinner", "xterm-color" ], - "commit": "2c5b46e4e103edb6a4f60a6e38f3bc0c3099d470", - "sha256": "1rqfbkl16c287gg4p7y6hny5020j2q11yldamdcmrk83is7v06px" + "commit": "baef1faba8c73587455f8582ee6ba3ef32077a69", + "sha256": "0vbwcbslbmrh3jmwb2m2jk394s0jnbsw26lmcg0fs17byxfzssv4" }, "stable": { "version": [ 3, - 1 + 2 ], "deps": [ "dash", @@ -97521,8 +98085,8 @@ "spinner", "xterm-color" ], - "commit": "3bdc3042d3d321a0b0c45147c22732dc6bdfcdf3", - "sha256": "1bryx1w388ryhxk0ydigqf14hfdy518g8h06gimdim6bi1npvyl0" + "commit": "0bd7932ebe30c19068b8c4fc154e00787a678200", + "sha256": "000awxvnwxg2hmhhn6yd9pnvflr91npfs2v1p5y7hcwg1d6mmvgk" } }, { @@ -97533,15 +98097,15 @@ "repo": "ShuguangSun/rutils.el", "unstable": { "version": [ - 20210805, - 608 + 20220619, + 1421 ], "deps": [ "ess", "transient" ], - "commit": "e216db63a2ccd50fe5c80679fc5b929dd2c114e8", - "sha256": "0ldbrx7xchy4p26ggs0hmazwfw9cbv97mzl4f02whblq3zkx7h5j" + "commit": "dd500ab8062ce40cb339ec8620bdfc63fdd28364", + "sha256": "1hzly8kxdhddz4b4i7cxafl54aqpk6q4ziwh1k92s1767mjqwg2d" } }, { @@ -97686,8 +98250,8 @@ }, { "ename": "sage-shell-mode", - "commit": "eb875c50c2f97919fd0027869c5d9970e1eaf373", - "sha256": "0ivqiigmp9cf88j4xapzanjpbx692r70wb4i25mnppqsi3jlwxdv", + "commit": "570bde6b4b89eb74eaf47dda64004cd575f9d953", + "sha256": "0hj0xs97m1rhfcck2f3w75yzykm45zi37cx68p74zzsiqa79v3k3", "fetcher": "github", "repo": "sagemath/sage-shell-mode", "unstable": { @@ -97996,8 +98560,8 @@ 20200830, 301 ], - "commit": "6aae7963498675dfb5bedaaef2cb8e56bdcddcab", - "sha256": "1ildv2wi9j1gp99l2d69gdc2a5h4i1jm17f59xr987l942mwnwnf" + "commit": "ea8950bd3cd7f06da333c15463492e484098e591", + "sha256": "191j84kjyqqhhgxmi3ansckn9ql2nyprfl20vaqr7fqm0gk53xil" } }, { @@ -98257,11 +98821,11 @@ "repo": "kyanagi/scratch-ext-el", "unstable": { "version": [ - 20140104, - 516 + 20220617, + 132 ], - "commit": "388c53cddd0466b451264894667ed64a6947ad67", - "sha256": "0ng0by647r49mia7vmjqc97gwlwgs8kmaz0lw2y54jdz8m0bbngp" + "commit": "8bbe1649503bb2e3676643e6e49fde155c1d6c70", + "sha256": "1nma84s5x1q264b73s1kqyyrf0g3j63zmnnxrxk9ly09y7cdqgpb" } }, { @@ -98369,11 +98933,11 @@ "url": "https://codeberg.org/ideasman42/emacs-scroll-on-drag.git", "unstable": { "version": [ - 20220510, - 1204 + 20220708, + 211 ], - "commit": "01c14f4c024548ed1f644263faa0786c10afc978", - "sha256": "09fifi2gsjk47aif3j0vysfgpshh7az3zlyiblpw5zqnmq3xl1a1" + "commit": "6d4de55bb6b72aaec53b82b8f8cdccc5396d6bf5", + "sha256": "0irv4xp7zlyiw1rfpdr1skspp9m6wvvcbmyxzkldpnbn2gbiy8xi" } }, { @@ -98384,11 +98948,11 @@ "url": "https://codeberg.org/ideasman42/emacs-scroll-on-jump.git", "unstable": { "version": [ - 20220509, - 1046 + 20220708, + 211 ], - "commit": "8fde237ae6d6a54730445b399513bc6d31d7daba", - "sha256": "0fbqmwz519bqdafjygpbk5zj08m3z3rm62sd2071qsxqrf70z72v" + "commit": "0cba79dcb28fd82abe9d1c1bbc00fd7655dcedf6", + "sha256": "1y44f074j4aigg9h2j2fzy94ndb1xx7mashk441y4mh1ghv8nmrr" } }, { @@ -98568,15 +99132,15 @@ "repo": "jcs-elpa/searcher", "unstable": { "version": [ - 20210124, - 1524 + 20220704, + 758 ], "deps": [ "dash", "f" ], - "commit": "2a0e37f818f4486dd624300a8dd77ac1b6d96070", - "sha256": "1dy336ga5268mqqhw1fpwd9zbagfldfbp11jc3yd1aasj9y32s99" + "commit": "6debf99431a5cb4d1db55e5379453c6a181a133f", + "sha256": "18jl7ccv7b4p9gr9dkqpidkwazqly7nic99x29av0f8vicmg00w3" }, "stable": { "version": [ @@ -99131,15 +99695,15 @@ "repo": "MaximeWack/seriestracker", "unstable": { "version": [ - 20220212, - 304 + 20220704, + 1713 ], "deps": [ "dash", "transient" ], - "commit": "4706db081bd214b272e0bcaabb66887e4b5b0968", - "sha256": "0ghnxli8xjlr5yb0c1jlax42dc4bjhz49x6mjm7m2jz94sa397ls" + "commit": "ce8b86a9eee175de513d00ce3e1aa754adbf5c8a", + "sha256": "1324lz9xibxfiridfkkfdb01dp51sm3rva5hq63wd72z0ai51ilr" } }, { @@ -99555,11 +100119,11 @@ "repo": "qhga/shanty-themes", "unstable": { "version": [ - 20220509, - 1656 + 20220623, + 1528 ], - "commit": "14a0e9de08aa6412931b121ae97b700e10ccaa80", - "sha256": "188h918n55mhw3jss10nsdc2m04ngdy1mbh7kfh6hhc9d36ydj7y" + "commit": "906104f6a6b185efc19285fcc3bc943f094fb594", + "sha256": "1gxb0sgq2ng9l7nfjbwjzc0ylxdgms018srs6550d779mi5gc8b7" } }, { @@ -99748,11 +100312,11 @@ "repo": "redguardtoo/shellcop", "unstable": { "version": [ - 20220526, - 1424 + 20220629, + 817 ], - "commit": "4e71f5b9199a0ad10017104a6b2bf5ef5f207dfc", - "sha256": "10aydyxli33h4vg0mkbmni41swy78cbj85k9j0qf1lhiqxzah8k5" + "commit": "3f051e42288ddfe4cd7cd0ee62efad90227de24b", + "sha256": "1v0p8f5m1i3sm15q4mi687wk9gx5bv8yx38n15ap36vwkrybxzad" }, "stable": { "version": [ @@ -99865,20 +100429,20 @@ "repo": "redguardtoo/shenshou", "unstable": { "version": [ - 20220607, - 39 + 20220709, + 654 ], - "commit": "317a87ca4b1a3f1860d9ce88aeabac154598a834", - "sha256": "045z3h0yk5bkdiipp158s47bphmbz1fgmfx9fdm5acf1w1sdqm8q" + "commit": "f3f991f9773283f3834e8518eb6910aa29e88f9e", + "sha256": "0gmih585vb1qlcz152gkx8q9xdfjg456w43d4bd0q363ysqjfd70" }, "stable": { "version": [ 0, 0, - 4 + 5 ], - "commit": "317a87ca4b1a3f1860d9ce88aeabac154598a834", - "sha256": "045z3h0yk5bkdiipp158s47bphmbz1fgmfx9fdm5acf1w1sdqm8q" + "commit": "f3f991f9773283f3834e8518eb6910aa29e88f9e", + "sha256": "0gmih585vb1qlcz152gkx8q9xdfjg456w43d4bd0q363ysqjfd70" } }, { @@ -99960,17 +100524,17 @@ "repo": "emacs-w3m/emacs-w3m", "unstable": { "version": [ - 20220606, - 2301 + 20220707, + 40 ], - "commit": "45155e42ea10990295d47d5ee3cb29be16a1f9f6", - "sha256": "1cjz3sli309i2qrwxic63x1am4hpn8r9gwjnfjb62b954wdhhf97" + "commit": "e3ca74f62602e69af5ff3271bd98977bd490e9de", + "sha256": "0jznj2zh2bb32sy7cgwkb8sy4x9w63y8f929nq6271s6ljg8akc2" } }, { "ename": "shm", - "commit": "a3c6e6adb1a63534275f9d3d3d0fe0f5e85c549b", - "sha256": "0z9qwwqf63wmizzby3yanqa31050f9jp6zrfhx7grf8a9aj89m89", + "commit": "570bde6b4b89eb74eaf47dda64004cd575f9d953", + "sha256": "0criq0v92l9xw3dzcs17c2dab1bjrznqs8x8nnbvr0iid6h8809h", "fetcher": "github", "repo": "projectional-haskell/structured-haskell-mode", "unstable": { @@ -100036,11 +100600,11 @@ "repo": "jcs-elpa/show-eol", "unstable": { "version": [ - 20210715, - 1227 + 20220704, + 659 ], - "commit": "b59e0fcca14dd2d8424d8ba0800da2e35bb52cc7", - "sha256": "1vz7fvx36r0dmim7n61zi00zvdk03sjxqsh5xcd6vxfv5869hxz5" + "commit": "1a332666192f377dca933b0da71e6528b288fc09", + "sha256": "166af5nmhskkaih955prgbdyqhl3gms20x9wlaj2ckhqapdgikdk" }, "stable": { "version": [ @@ -100413,11 +100977,68 @@ "url": "https://codeberg.org/ideasman42/emacs-sidecar-locals.git", "unstable": { "version": [ - 20220510, - 413 + 20220710, + 1040 ], - "commit": "7fd5daec1e0a7a091b343948bbb5c77e73724776", - "sha256": "1mbfvq1xbplk33363yqshqq7zmvqra73i0i126dcnzpd95pwqsqm" + "commit": "3aa9c890ebc38800ab26f5f877da32a79ce87d18", + "sha256": "1rg2wc5xkbqq59lbqsha5y80brh9ikdnv79klalww5wx412yfyyx" + } + }, + { + "ename": "sideline", + "commit": "8e4a88a8929650d1b5a8f3bf21521f570ec79c6c", + "sha256": "13w56f9v686h72lwgdd6k4x4h221nixj7glpw8dzy56pwfs06daa", + "fetcher": "github", + "repo": "emacs-sideline/sideline", + "unstable": { + "version": [ + 20220706, + 720 + ], + "commit": "32c2c9f8d752073c2b637ea8f0b4473804339f64", + "sha256": "1n1diyz95d0g1gq0yzf86a94fcgsqvh834ww7pblgq1yk7ld9hzd" + }, + "stable": { + "version": [ + 0, + 1, + 1 + ], + "commit": "6b93ded69686fc5bd3b7ccde8334720814dc12c4", + "sha256": "1rnzyhkqbihp8j0g8nfg1wdzvyldks162wapr48lis74xjzzavdk" + } + }, + { + "ename": "sideline-flycheck", + "commit": "3aad0e0d246dca4166dd273219f8223153561e9f", + "sha256": "16mcbbsfz1vinnqwiibdqiw1344302wkgjbf6ah0a3ik0kn7z2r6", + "fetcher": "github", + "repo": "emacs-sideline/sideline-flycheck", + "unstable": { + "version": [ + 20220629, + 752 + ], + "deps": [ + "flycheck", + "ht", + "sideline" + ], + "commit": "7f11c14c938a88a35728b04add991903486ddd31", + "sha256": "0y30iw3psllf0g8llvzm8sd0kkhazhn433fwq0nq6hy21rm4r12x" + }, + "stable": { + "version": [ + 0, + 1, + 0 + ], + "deps": [ + "flycheck", + "sideline" + ], + "commit": "91d7f2d43cc8abbf96bcae389553b6d722c8bad9", + "sha256": "1lrjrp47h2crj7df4npvwpmd53amz37z37byp13nczxcq1yzw806" } }, { @@ -100645,14 +101266,14 @@ "repo": "andreas-roehler/simple-paren", "unstable": { "version": [ - 20220207, - 2007 + 20220713, + 902 ], "deps": [ "cl-lib" ], - "commit": "a454901635dfe4142d8c4f0153e737ddc778d708", - "sha256": "0b0ix9h5in324bbyv9q9l9xrifpfhjs6zhr6r5cadd36iip40r6g" + "commit": "05331d19942f48e2fc857a07152698d5a6eb4780", + "sha256": "0lsv3b9fc527f79a19j9qjpagf6jw15y88bh1rgvvf96rhfizvij" } }, { @@ -100796,11 +101417,11 @@ "repo": "smallwat3r/emacs-simplicity-theme", "unstable": { "version": [ - 20220519, - 1439 + 20220628, + 1930 ], - "commit": "692d908961990f463632089041d4705cbb1c5912", - "sha256": "0a1igxk9jrybrf8qgh8nqdqkk7i7gvq7jq66w34gi9lbckmfvi05" + "commit": "35a51e39b581d91481865eecff9fa4178e8bdc2b", + "sha256": "1ly91cbivj6z4f7fdr2x8zzbad0sraq651vs99a32659gm03r7g7" } }, { @@ -100826,14 +101447,14 @@ "repo": "laishulu/emacs-smart-input-source", "unstable": { "version": [ - 20220511, - 1734 + 20220628, + 1545 ], "deps": [ "terminal-focus-reporting" ], - "commit": "0eeb75db3eb031bde3e5820ee39a2b7549dc5d8b", - "sha256": "06ky6358cc00z18srp6wcid9f0pjy1kwlvvmfznhsfqkjr6pshzp" + "commit": "be84587cfc443aacfde728f290a2cd6ea690da29", + "sha256": "18jwg0amk6lsj7xj7kh173wc2kqqj6ax9xr6rf6iai2z9yyn9im5" } }, { @@ -100907,8 +101528,8 @@ "deps": [ "request" ], - "commit": "fc88e82aa4b0a71b1fbe0217df4020538ebd8cd5", - "sha256": "0cjch25ljjw0pqj69rckp9b0lw1iz41dd1nl794gfagvl86gl92f" + "commit": "ac8ba166446048bfc5b2b4a5719aad61a5487182", + "sha256": "1x98prikm7fdj5m0m63yj6lf26rh1zb7j8bqfcx4yd5m389h8i74" } }, { @@ -101132,21 +101753,21 @@ }, { "ename": "slime", - "commit": "47609a81b81330820f6ddf717400dc7fa06aaabf", - "sha256": "1ds8iprxr04wdhnnw4129v5l3w3k5rjp5ax156ppqr5i7wxx1zac", + "commit": "570bde6b4b89eb74eaf47dda64004cd575f9d953", + "sha256": "06f005f7q6wk6n6kyiamw5zgp1hx5mca45n06y8798f1dwwnq9wl", "fetcher": "github", "repo": "slime/slime", "unstable": { "version": [ - 20220526, - 1343 + 20220712, + 817 ], "deps": [ "cl-lib", "macrostep" ], - "commit": "1f9a95f3a07b2aa5b01d8be427b90837be5cea6a", - "sha256": "12fndsp7rkzvs7r1srrccywv5lmr6xbp7fx96ijymff82fqblcy9" + "commit": "805c29672c8a1f6c68286ab379359f9ab9ad9dc2", + "sha256": "0fp8yfw91g04nqfjll0yv2szx3xrk42h8g789j27jj85qp5i051y" }, "stable": { "version": [ @@ -101377,11 +101998,11 @@ "repo": "joaotavora/sly", "unstable": { "version": [ - 20220603, - 843 + 20220713, + 1433 ], - "commit": "b501b4335096fd4306c2c1eb86382b69e91c09e5", - "sha256": "1naj8cm0rd4pimrncmv6dka73l22avypclhr00dmpnh174vizpnp" + "commit": "ef5211456a59d639c98b2ed42428726d32728ff8", + "sha256": "02wmkfysrix7a1915f1lp1v3v3jpl4xh6bnzd5c4jcl8mj3vypn9" } }, { @@ -101392,15 +102013,15 @@ "repo": "mmgeorge/sly-asdf", "unstable": { "version": [ - 20220117, - 714 + 20220707, + 5 ], "deps": [ "popup", "sly" ], - "commit": "89fff94868f01d000b8bb4dd9d7e4d6389e61259", - "sha256": "0zdj094r08n8g9mxki2qqx3ajy6f17xsijpdb02553v713q41287" + "commit": "3180921efdc19a2195960e1d601b2a6f31a6feea", + "sha256": "0gncp8xv33s4wx594bgd35vr1455bcggv1bg28qv75mhv41nzw97" }, "stable": { "version": [ @@ -101575,11 +102196,11 @@ "repo": "malsyned/smart-dash", "unstable": { "version": [ - 20210427, - 1709 + 20220704, + 1645 ], - "commit": "bc740889dd81e7dc8a90a33d1f075f21aba9b2d3", - "sha256": "0kadfyvvzfk66d5k263j8cykqh9lbwrdqizs2mag6ahnadpahhyy" + "commit": "461cc1c9b4ebb48d167b3545d8e842e9e7c9fd59", + "sha256": "0dzy4cyi5fdsgcdbc2536zsq0q283fnbq9kzchvz7l9f2v5g3hks" } }, { @@ -101876,15 +102497,15 @@ "repo": "Fuco1/smartparens", "unstable": { "version": [ - 20220510, - 934 + 20220623, + 1523 ], "deps": [ "cl-lib", "dash" ], - "commit": "ec15aaa748b21c9b8453dd95604ccc95fc1138cf", - "sha256": "0cza0wnk3fyyh13srczf2976xwhyfmq2v9m7q6k2lyn7jyfvfxiq" + "commit": "8b6a3c3b31afd5b3f846e09859b5fc62eb06e7c1", + "sha256": "1bifalcx0v9h28q9mdnbad4mrxzr58f4l0wfnw1jhg5khgx4kgl2" }, "stable": { "version": [ @@ -102081,6 +102702,30 @@ "sha256": "1rk1x096akhn5rip8vp2lf0yyyybqwq3w75vkmkg4dcb9cbrwz1q" } }, + { + "ename": "smithy-mode", + "commit": "8ba66c571d58ee77e80402795aba46215b02630c", + "sha256": "095wz48q3j2i1q6y4yah37qq97gk8qa0d08sias0qvv5chcdadbf", + "fetcher": "github", + "repo": "mnemitz/smithy-mode", + "unstable": { + "version": [ + 20220619, + 1304 + ], + "commit": "7016040ae45eba97575d9250a20df19cc496c165", + "sha256": "0z9hv8q97cg5vv8xv8g8yz0ici4kdckl2ajq0nl2by7hb0r350r7" + }, + "stable": { + "version": [ + 0, + 1, + 3 + ], + "commit": "7dff0e7a497a055577226c7ae7ecdeaf7078b4c1", + "sha256": "08cxagjk0am2bialx86dg00d5wpbrvnrymlcm6l16zlqyd93zfa4" + } + }, { "ename": "sml-basis", "commit": "043c253879bbc159c4867e58d4741ba2e9b8bb91", @@ -102630,24 +103275,20 @@ "repo": "bbatsov/solarized-emacs", "unstable": { "version": [ - 20220324, - 445 + 20220619, + 1203 ], - "commit": "86e5f94ea033c8b2a21084774063a493b62a4e81", - "sha256": "17z6cj8ids88xj2i6zs1s0mxs0fhn3gr7g5nhhy8s8khnzmyy2vj" + "commit": "94e7c342da1b04326028708e5503973d554bd828", + "sha256": "1a5s9j32v04sc5adly98y1zlx3q9i4m3b0zggrbgy56qk10yqdx4" }, "stable": { "version": [ - 1, - 3, - 1 + 2, + 0, + 0 ], - "deps": [ - "cl-lib", - "dash" - ], - "commit": "55cd77b61b6968048c61e13358ba487d217f24c0", - "sha256": "15ql8xcixgm7mbs7rsbybwszanqibq057j5b5ds89a31dw7zxf1g" + "commit": "86e5f94ea033c8b2a21084774063a493b62a4e81", + "sha256": "17z6cj8ids88xj2i6zs1s0mxs0fhn3gr7g5nhhy8s8khnzmyy2vj" } }, { @@ -102658,16 +103299,16 @@ "repo": "ethereum/emacs-solidity", "unstable": { "version": [ - 20210411, - 758 + 20220713, + 2146 ], "deps": [ "dash", "flycheck", "solidity-mode" ], - "commit": "20fb77e089e10187b37ae1a94153017b82ed2a0a", - "sha256": "0lyfhb4lirk08jc73c2vhlskfb496vnh0h906a74wz2pwg84q4m5" + "commit": "211dbdf0dfab1139681156e6f9621a5bbe0f74a1", + "sha256": "14mpncf9mpypcinfvzhmvnjlxf5laxxwnf02qjdagiws42lgwm2f" }, "stable": { "version": [ @@ -102685,8 +103326,8 @@ }, { "ename": "solidity-mode", - "commit": "02d3fdae111b14a87aaa7a1b3f44e545c5e3d2ac", - "sha256": "15vz3ayl1p3dn2cavm68rqv901c1b7dxm2j8iazwzj3q15ln8xvn", + "commit": "570bde6b4b89eb74eaf47dda64004cd575f9d953", + "sha256": "148yhjlybmsfw9h93il1w2czy34m01zp8fxn594n7ssingjnp22g", "fetcher": "github", "repo": "ethereum/emacs-solidity", "unstable": { @@ -102694,8 +103335,8 @@ 20220308, 1517 ], - "commit": "20fb77e089e10187b37ae1a94153017b82ed2a0a", - "sha256": "0lyfhb4lirk08jc73c2vhlskfb496vnh0h906a74wz2pwg84q4m5" + "commit": "211dbdf0dfab1139681156e6f9621a5bbe0f74a1", + "sha256": "14mpncf9mpypcinfvzhmvnjlxf5laxxwnf02qjdagiws42lgwm2f" }, "stable": { "version": [ @@ -103289,11 +103930,11 @@ "url": "https://codeberg.org/ideasman42/emacs-spatial-navigate.git", "unstable": { "version": [ - 20220507, - 1118 + 20220708, + 211 ], - "commit": "09ebd2ba7779998c31296bf8b6ffebf854f3eb73", - "sha256": "1zwynrnsbkvac8xi4y81s6z4h9p8vknxd7ii0lqw5cmphx0fdbqb" + "commit": "6840ca694d281d39de76c1af0cb2ec526b40820a", + "sha256": "0mh7nmqz9wmfpvq7w4xc23k2kvmamvbbblb01xf9if7szyiyyksf" } }, { @@ -103304,11 +103945,11 @@ "repo": "condy0919/spdx.el", "unstable": { "version": [ - 20220518, - 117 + 20220715, + 157 ], - "commit": "e23ac498e9c96f5e93569271d192e6c247134412", - "sha256": "1dyc7ax2idr30ph2y05lxb94pg0qnpj23l17bg0rscv00pg8883c" + "commit": "052b0c908ccb387f50ab8a80befa6a1443ba5b70", + "sha256": "0ddxsggg5i4ncr40wxlqlsn1x0390l7lqj61hy55pk64c0pzrz2q" } }, { @@ -103435,11 +104076,11 @@ "url": "https://codeberg.org/ideasman42/emacs-spell-fu.git", "unstable": { "version": [ - 20220507, - 1118 + 20220710, + 1038 ], - "commit": "1299bfca2ec9bdca0424fcaa330ddadc8f8d1143", - "sha256": "0w8ydbl1wnjn4wj8zfypab5pngxgmg4d06srkarfym2v75ksass7" + "commit": "dd35cffc34d2d3714865a5b1194edd242d8d50bf", + "sha256": "19j24y5i6xllfbca3z7223xxk9fy9avgfway5wi2x9ncxj1vgjbf" } }, { @@ -103537,28 +104178,6 @@ "sha256": "1jkqwclk65rcyv5qj2vq7qpiimlrqij7c7fbjvxv4pf4zd2wx0k8" } }, - { - "ename": "spiral", - "commit": "f454d98d219785c98dc9b17cf062ef22fece480d", - "sha256": "01jvrgc8wd308r3hwwn08dpyrank17353ybmabvzc90vzc1n0kcd", - "fetcher": "github", - "repo": "volrath/spiral", - "unstable": { - "version": [ - 20180223, - 1140 - ], - "deps": [ - "a", - "avy", - "clojure-mode", - "highlight", - "treepy" - ], - "commit": "907b9792467139a942ba7b07ca0276b90770baf9", - "sha256": "1rggzzvya26abbzd8bc2kpv59kzgm75wqv1vwqnj9c8im1jvs1na" - } - }, { "ename": "splitjoin", "commit": "2a2670edb1155f02d1cbe2600db84a82c8f3398b", @@ -104549,11 +105168,11 @@ "repo": "motform/stimmung-themes", "unstable": { "version": [ - 20220511, - 1245 + 20220705, + 1627 ], - "commit": "d34e83d6a00c248c7ce9ab34425773c30910f634", - "sha256": "0vfwa5iw6ac7yijqzridn07ybl295s2kxfc45ld9sp62gj4qxs95" + "commit": "d09863f13a1a32906d962e55abd5b13ca7e844a5", + "sha256": "15im06zbg87mqgxiqpj70hkki2iqhpdy10nwjcs8kxnrp1vz6vxw" } }, { @@ -104958,8 +105577,8 @@ }, { "ename": "subemacs", - "commit": "18714a6b5ca4dcc51fa509fee1dc9afb0595c707", - "sha256": "0sqh80jhh3v37l5af7w6k9lqvj39bd91pn6a9rwdlfk389hp90zm", + "commit": "570bde6b4b89eb74eaf47dda64004cd575f9d953", + "sha256": "03y0hnqpcs0vkhw2kryb1r5w9w0f4699xc8iil74mgia266znrpy", "fetcher": "github", "repo": "kbauer/subemacs", "unstable": { @@ -105578,16 +106197,16 @@ "repo": "danielmartin/swift-helpful", "unstable": { "version": [ - 20220402, - 1433 + 20220707, + 846 ], "deps": [ "dash", "lsp-mode", "swift-mode" ], - "commit": "fe5c4a97fabbc89bd4761cfe4f8f8ce6f6d89703", - "sha256": "1wjb0cdxz9wkbz1xj062z67i8vjkyfl86206px8xvfx6dgbnikd0" + "commit": "b46c580e4b8f55761431ec677866de3fc66592e9", + "sha256": "0x7ys9bdkvpn09zqrhw60wjcv1l50kc67lm5ginkc02zpiivzcjv" }, "stable": { "version": [ @@ -105611,26 +106230,26 @@ "repo": "swift-emacs/swift-mode", "unstable": { "version": [ - 20220313, - 542 + 20220709, + 602 ], "deps": [ "seq" ], - "commit": "0d1ef0ef183398143b13fb8c76c1284df0d5e616", - "sha256": "0s7y6xkvy2lg3bs4508dh7szsfrvmxrihbf22ysijaqgzd69s86j" + "commit": "cdd194cbadcee724a9813da386f0a612082b1ab1", + "sha256": "16c5xfc29gi8mv0liy8n689zy8fp8jbymljik3qpcazrhyav7rf7" }, "stable": { "version": [ 8, - 4, - 2 + 6, + 0 ], "deps": [ "seq" ], - "commit": "e24626440ce350596f4c1676f6644437a0500bbd", - "sha256": "09pr8v78nz8nza9l4g87i0xfnp84rmjm2kq1ff6g4a6nisdxyfxm" + "commit": "cdd194cbadcee724a9813da386f0a612082b1ab1", + "sha256": "16c5xfc29gi8mv0liy8n689zy8fp8jbymljik3qpcazrhyav7rf7" } }, { @@ -105701,8 +106320,8 @@ "deps": [ "ivy" ], - "commit": "f8d80a4055514f92d94f128f5fcb1cda79e5cd22", - "sha256": "1cmafp5rssp27lhvszyzf4mc1z130kkgkl9d36lgg97qk5jp58g8" + "commit": "2051de5882706246da298ce5f60482cd7f469fe7", + "sha256": "0gk0dznnd7y08f83pjgwdxy9i9dz06jj1kk7mq1schbky82a1i57" }, "stable": { "version": [ @@ -106032,8 +106651,8 @@ "repo": "countvajhula/symex.el", "unstable": { "version": [ - 20220323, - 1808 + 20220705, + 1558 ], "deps": [ "evil", @@ -106045,8 +106664,8 @@ "seq", "undo-tree" ], - "commit": "8ab435c2866869977c92ad64c3706f626acfb4d3", - "sha256": "1jc9a27cpdldigyna3spdmx7ad0pcxfgl27xk1ikh74cbvry0ir4" + "commit": "533eb8ad0ce43c6a7667a2c8a9a8fd6ae275c820", + "sha256": "1al6d586rip99q42farhh117li0d14in0vvy4dy2lm68nk7b095n" }, "stable": { "version": [ @@ -106199,14 +106818,14 @@ "repo": "emacs-berlin/syntactic-close", "unstable": { "version": [ - 20210105, - 1400 + 20220618, + 817 ], "deps": [ "cl-lib" ], - "commit": "ffe8b28907973fda775254432f88b55c92b5ae1f", - "sha256": "03qgrchvzw489594s6ghd0wmq53qzlxqsjlcwcnvlj185hg5fiwp" + "commit": "28410740e42ad9bb84416164406269b177fb49fa", + "sha256": "0mxnnrrqkpyjqps6fs7bwy6n4jvl0glwkmzk1fbcy1cmkl1pxm80" } }, { @@ -106264,14 +106883,11 @@ "repo": "enricoflor/syntree", "unstable": { "version": [ - 20220122, - 2341 + 20220615, + 2331 ], - "deps": [ - "transient" - ], - "commit": "45d010b071c32cab4a3a5d336d6c01cde49657f8", - "sha256": "0dlq1z4d1sfhzv14y8b3xk9ixjsjd9wl66nbd18aqkm86rx0320f" + "commit": "1ad84a7905959b1d2c4f2fee37fbccc87d711864", + "sha256": "1c47v2bwgpjbz05sszmd8a85flwrs9ikmvny9jjk5kc8z40kxg2q" } }, { @@ -106435,6 +107051,21 @@ "sha256": "09nndx83ws5v2i9x0dzk6l1a0lq29ffzh3y05n0n64nf5j0a7zvk" } }, + { + "ename": "tab-bar-buffers", + "commit": "6b499d0fe5f355a892c3bada4d8892a823ad277f", + "sha256": "1ivpqgnw6qf0lpj1q3vf4msw1y8nd21lrvlqv7vhvgzbznildwi4", + "fetcher": "github", + "repo": "ajrosen/tab-bar-buffers", + "unstable": { + "version": [ + 20220628, + 45 + ], + "commit": "7da11a70ca0aa6287b4f0cd629db0f1b70420938", + "sha256": "09j8xdhgdl1vwargf2dn1sdscc6jim26f7fvi46fm7f6xrs3a0zs" + } + }, { "ename": "tab-bar-echo-area", "commit": "82df49c34664a5078d92e6015abc6f965d34791e", @@ -106602,14 +107233,14 @@ "repo": "mclear-tools/tabspaces", "unstable": { "version": [ - 20220607, - 526 + 20220614, + 2113 ], "deps": [ "project" ], - "commit": "0ce73ece84027939428ade3d46706cbd0a61ec3f", - "sha256": "09li624kg8p5637lq85sl6f4lrmlc71a9cgy1xj0rs63jv2wf3w3" + "commit": "a42bf779354d042ba53f8096f68e44d0021db07a", + "sha256": "0y9hwxcg670dbxcgxji6hr56zqa9qipkmpd74qd2sj03720y7nqa" } }, { @@ -106739,11 +107370,11 @@ "repo": "juba/color-theme-tangotango", "unstable": { "version": [ - 20220106, - 1039 + 20220714, + 2034 ], - "commit": "9509035842c5ea44f594879199a74c9fc6d2a368", - "sha256": "0dn8r1rjn89y087kz2rx46kvzz7f99km78pydbs9bbklmn24692n" + "commit": "dbefd8638c36595467efbce5a26da208320ac30a", + "sha256": "093izf3zppfcb85bgdmq516sarkmwvwfi4b6jnpd6cnj7wl9zr1j" } }, { @@ -106826,8 +107457,8 @@ "deps": [ "cider" ], - "commit": "82f343bac637e62f31152d72086c7facd4dfea27", - "sha256": "0bdai4gwz8nyc26gmb10z6pq6r2gw04iflzsc476xrp56d2abgbc" + "commit": "d0ca5ecffa39d83704c423a2f8f7cd4f93f9915b", + "sha256": "04nc27y8pwd1y78qq0d10iygmgk3scs3gsp9wdg016rwd7axca2j" }, "stable": { "version": [ @@ -106969,15 +107600,15 @@ "repo": "zevlg/telega.el", "unstable": { "version": [ - 20220602, - 2031 + 20220713, + 2342 ], "deps": [ "rainbow-identifiers", "visual-fill-column" ], - "commit": "892ac2e88f764af516abc307ff199cb819442e4e", - "sha256": "17ysqxb5j2qi3kkjwnb8rvwan6yz90av5967sypdss2by0hlwd97" + "commit": "11c0c785ed9e479b65514a10022d5c34984aab59", + "sha256": "0g4lk0lp4hj05hvl7pyxfc9lpmaknlr85h71sawpnvkr8853v2as" }, "stable": { "version": [ @@ -107090,19 +107721,19 @@ "repo": "minad/tempel", "unstable": { "version": [ - 20220509, - 2139 + 20220709, + 816 ], - "commit": "b88c58a89390cf3834de898109c5e69a5cf434cd", - "sha256": "0mk2ghqvg4raja1hg5hwg6774blba56sg2bmfh8xma4slg5n8js5" + "commit": "ff9756b0646b1d06443eb4bdc64db443f1aa6c40", + "sha256": "0iyh6wxchqg83gpwvg6lz4qy4c2qh25iqjpjm56kif52346a99d2" }, "stable": { "version": [ 0, - 3 + 4 ], - "commit": "ee964c24b69579fcd5ec3c7d3d1d84d1ca3d90e4", - "sha256": "1cq7gg4fh105229my57wbb7v72l8mx957pvsg8k3zc1l0hbc796i" + "commit": "ff9756b0646b1d06443eb4bdc64db443f1aa6c40", + "sha256": "0iyh6wxchqg83gpwvg6lz4qy4c2qh25iqjpjm56kif52346a99d2" } }, { @@ -107936,11 +108567,11 @@ "repo": "monkeyjunglejuice/matrix-emacs-theme", "unstable": { "version": [ - 20220607, - 322 + 20220622, + 1214 ], - "commit": "403226efb0c38898a8a848c60b8da0f94470b055", - "sha256": "19dqbynjhwcyxdzp0zxx6kxzdb2kz9bal8xhpblf16ajga593g3g" + "commit": "289ed872003708ef1595e5e6765b50ca53e34ac8", + "sha256": "128szhyyndfp2hvhyp5628z6nmn0k137y77qbhm3ga5laixdsd2z" } }, { @@ -108133,18 +108764,18 @@ 20200212, 1903 ], - "commit": "d00a78590a91c6fccb361713d32b846c22164af5", - "sha256": "059wbqiij52hxmx0i65baifk421d2i2qrnsp51i5ayk5w8ai1iwh" + "commit": "74238342142e0ad93141c9654fea285110223753", + "sha256": "0dwinv4jg87vhnlgfy5z1hsgsjlkgsb993221jqah031rsnpkh30" }, "stable": { "version": [ 2022, - 6, - 6, + 7, + 11, 0 ], - "commit": "954b49b17037fe12fdcbffadcf42c0e525b3233e", - "sha256": "1w4yjqpqah3w2c58m6b73qsamknsy9i1i8rwgqnw9srr1ba6as55" + "commit": "a7f17c88d6977bb26e574d0df0dd911002b22975", + "sha256": "08fgd03z3kkbl50rqlczs53yzvp3s3z18d39015szgc6riw80z6j" } }, { @@ -108200,8 +108831,8 @@ "deps": [ "haskell-mode" ], - "commit": "fda9c1ecb3722698935245e5409ef8ccdfca16c8", - "sha256": "117r67apl06z2smyb5j2a45m4a9s2i8izjxllascc18q4vjlrqxl" + "commit": "c9df210748d3a3d00c16c880e901cc03bd9f2362", + "sha256": "1j3inr3v1jrl7sp845pxdi9qcsjmz0ifmh18m9wkq8j0nsb27i0y" }, "stable": { "version": [ @@ -108472,11 +109103,11 @@ "repo": "aimebertrand/timu-spacegrey-theme", "unstable": { "version": [ - 20220525, - 1238 + 20220604, + 1042 ], - "commit": "d9ff61d8e5393952e19da434b9f226be75eee493", - "sha256": "0649npmyj4x1hi57dic7gmr49723q0dv5ccj824qjq3jb0ng21hm" + "commit": "1051753f371535c0af2008a372a456b3769c7f69", + "sha256": "1nfl9r99w5gfdf7z00f4kha4b9z3zw4x9nv0qnbph4xb6milc4dj" }, "stable": { "version": [ @@ -108828,17 +109459,17 @@ }, { "ename": "tok-theme", - "commit": "0ce13bfb5447542d1d582ead6a68e3b69fa739c7", - "sha256": "14yka2q185bpg9xkkhkcziirf78ki5lkql470hii4nxq18b8d7zc", - "fetcher": "github", - "repo": "topikettunen/tok-theme", + "commit": "63fa3bbe82abfd1c2dbb6409dc3cdd6297fe5cc2", + "sha256": "16xkh4kgfbyx45j7jdx44y5q37b3z7yjpy266y7k1cpdvgjgnfky", + "fetcher": "git", + "url": "https://git.sr.ht/~tok/tok-theme", "unstable": { "version": [ - 20220601, - 708 + 20220713, + 748 ], - "commit": "3e7e946f0e474fa2d2a5bbdddf7f168e6ed759ba", - "sha256": "0jd54rxrc3b26z3d9p4d8bg9dxs5p20s5qkc0h3vfbwfhcjj2vwf" + "commit": "3c88eca01a7978c8e425b714346631227e68f3e1", + "sha256": "0bnmx2iaa9sgkaxlv5dd2kmfrwli5zdnq1f8fi45yqqnfy9nxxnz" } }, { @@ -108968,11 +109599,11 @@ "repo": "trevorpogue/topspace", "unstable": { "version": [ - 20220608, - 1302 + 20220702, + 609 ], - "commit": "6692cd1346ce0b0a1fbdcbfa496b49365bcd660b", - "sha256": "18lj15y63lx57vzximsa0f7rhbr4vr39abj0r4b7fl5ivs46k3gy" + "commit": "0399f73f9b976737f51ad8079ad620673eb0106c", + "sha256": "0rprfg1gjd7bxhlhjan715035bxakjf9m44i76d614g6vc158zs1" }, "stable": { "version": [ @@ -109354,8 +109985,8 @@ "deps": [ "compat" ], - "commit": "2e4426fe8161893382f09b3f4635e152ee02488e", - "sha256": "1ila9yn99vbbllmzn3ysfvwhavc930g9av6faqai8m4abs0j05k5" + "commit": "a583d2b2f5f8963f08cb5a15a4d4dd55faa13585", + "sha256": "1dgwyqkl86nqqyjv8fqipyb61if6gkd2awm572smybh3k3z3w0rn" }, "stable": { "version": [ @@ -109505,11 +110136,11 @@ "repo": "jcs-elpa/transwin", "unstable": { "version": [ - 20200910, - 1636 + 20220704, + 640 ], - "commit": "4128b85b1ee075a55c88fd53d04823cb48a3cce6", - "sha256": "1b8df9bnsyx8gx70inp2waxi00n5bq7j0w7sgjp9bcz3514iwd76" + "commit": "9f3c5ef4029f992fe94b70d54b8d00f0a4cbce1c", + "sha256": "19ail8y13ywp0rzl1r78iyg7176nijlqjw348is83kdv6qbf8fcc" }, "stable": { "version": [ @@ -109614,8 +110245,8 @@ }, { "ename": "tree-edit", - "commit": "7ec29a86aac242dd20a4632ee40e6fd582ad8a0d", - "sha256": "0jr5hsgd0ma4pvndzz55m33bxgvishyz4pq55k2db33bxyy7mdww", + "commit": "570bde6b4b89eb74eaf47dda64004cd575f9d953", + "sha256": "02lqcgm7vrw5bg4i3514b371qwpv9abca7kxw2fsd86xpb8dv7mv", "fetcher": "github", "repo": "ethan-leba/tree-edit", "unstable": { @@ -109652,8 +110283,8 @@ }, { "ename": "tree-sitter", - "commit": "1ae754064cd1f062bbdd6ecf9af03fa0c2798cf6", - "sha256": "0y02pqxwpz6q00n2d2m9xnry9ig7kp1f88lshs3crvm1bl7j8609", + "commit": "570bde6b4b89eb74eaf47dda64004cd575f9d953", + "sha256": "1r2b0v10h21xi14z4dc1k3hlw3dchf7qylsfy22ah22yzbsldc30", "fetcher": "github", "repo": "emacs-tree-sitter/elisp-tree-sitter", "unstable": { @@ -109680,6 +110311,26 @@ "sha256": "1sdvz827v436qijs6xafakkfw2d16bvp8frymd818rppjc7a9dif" } }, + { + "ename": "tree-sitter-ess-r", + "commit": "1ec1bcac455635438ed1b49e014bf3c79991a515", + "sha256": "0za6a9whlsdh0dxr4xwz05jhnfx9548ba0fwpph7m8v6rjsgsnwj", + "fetcher": "github", + "repo": "ShuguangSun/tree-sitter-ess-r", + "unstable": { + "version": [ + 20220710, + 515 + ], + "deps": [ + "ess", + "tree-sitter", + "tree-sitter-langs" + ], + "commit": "2781d18303110549b4e61cb6b465b1dcbe3635f8", + "sha256": "0zxy9263v5sp0sv9l10ps7i7czsjr3vj27kl09wf92mhykxqcjx9" + } + }, { "ename": "tree-sitter-indent", "commit": "fddb298f3020cd2eb7628f6282e0f35628a3eb17", @@ -109711,6 +110362,24 @@ "sha256": "1dfmlmmf13qzzfpmpc6lgwjhz8hnz5ys2fw4w3rrz6swfaa2vr53" } }, + { + "ename": "tree-sitter-ispell", + "commit": "439aa2fbf7c92dd4a62cad408b14ab7c63d86531", + "sha256": "08pbi5934qz5lzy82pnb9lihx62npdlwrdw8kc37lqxb28yqx9rz", + "fetcher": "github", + "repo": "erickgnavar/tree-sitter-ispell.el", + "unstable": { + "version": [ + 20220704, + 340 + ], + "deps": [ + "tree-sitter" + ], + "commit": "2efe943dd62096a819b7c2d6b61c93a4f18aeb22", + "sha256": "1j4ws5wbylm3glh860bcaria9mjl0iqflxrlbq4zwj9if3pa7hlj" + } + }, { "ename": "tree-sitter-langs", "commit": "f07a741d1a14f99a634041cc9b4c200e75461ae5", @@ -109785,8 +110454,8 @@ "repo": "Alexander-Miller/treemacs", "unstable": { "version": [ - 20220601, - 1749 + 20220622, + 2016 ], "deps": [ "ace-window", @@ -109798,8 +110467,8 @@ "pfuture", "s" ], - "commit": "faa2d10b894df9df0b6789047ea7ae05434d3030", - "sha256": "0p0fj8d0cjpw4v2a4xhnf9x983h8xxfz7ardyc9g4qcm9ybs58xr" + "commit": "e80c3020270720ff114f7a2ad62c85e1fb627678", + "sha256": "0c91awhg02awbhmz632s0d0b9h4sn6adn22lgj52b9fddv9nq77r" }, "stable": { "version": [ @@ -109835,8 +110504,8 @@ "all-the-icons", "treemacs" ], - "commit": "faa2d10b894df9df0b6789047ea7ae05434d3030", - "sha256": "0p0fj8d0cjpw4v2a4xhnf9x983h8xxfz7ardyc9g4qcm9ybs58xr" + "commit": "e80c3020270720ff114f7a2ad62c85e1fb627678", + "sha256": "0c91awhg02awbhmz632s0d0b9h4sn6adn22lgj52b9fddv9nq77r" }, "stable": { "version": [ @@ -109859,15 +110528,15 @@ "repo": "Alexander-Miller/treemacs", "unstable": { "version": [ - 20220511, - 1852 + 20220616, + 1202 ], "deps": [ "evil", "treemacs" ], - "commit": "faa2d10b894df9df0b6789047ea7ae05434d3030", - "sha256": "0p0fj8d0cjpw4v2a4xhnf9x983h8xxfz7ardyc9g4qcm9ybs58xr" + "commit": "e80c3020270720ff114f7a2ad62c85e1fb627678", + "sha256": "0c91awhg02awbhmz632s0d0b9h4sn6adn22lgj52b9fddv9nq77r" }, "stable": { "version": [ @@ -109890,14 +110559,14 @@ "repo": "Alexander-Miller/treemacs", "unstable": { "version": [ - 20211229, - 1448 + 20220622, + 801 ], "deps": [ "treemacs" ], - "commit": "faa2d10b894df9df0b6789047ea7ae05434d3030", - "sha256": "0p0fj8d0cjpw4v2a4xhnf9x983h8xxfz7ardyc9g4qcm9ybs58xr" + "commit": "e80c3020270720ff114f7a2ad62c85e1fb627678", + "sha256": "0c91awhg02awbhmz632s0d0b9h4sn6adn22lgj52b9fddv9nq77r" }, "stable": { "version": [ @@ -109919,16 +110588,16 @@ "repo": "Alexander-Miller/treemacs", "unstable": { "version": [ - 20220502, - 1310 + 20220616, + 1202 ], "deps": [ "magit", "pfuture", "treemacs" ], - "commit": "faa2d10b894df9df0b6789047ea7ae05434d3030", - "sha256": "0p0fj8d0cjpw4v2a4xhnf9x983h8xxfz7ardyc9g4qcm9ybs58xr" + "commit": "e80c3020270720ff114f7a2ad62c85e1fb627678", + "sha256": "0c91awhg02awbhmz632s0d0b9h4sn6adn22lgj52b9fddv9nq77r" }, "stable": { "version": [ @@ -109960,8 +110629,8 @@ "persp-mode", "treemacs" ], - "commit": "faa2d10b894df9df0b6789047ea7ae05434d3030", - "sha256": "0p0fj8d0cjpw4v2a4xhnf9x983h8xxfz7ardyc9g4qcm9ybs58xr" + "commit": "e80c3020270720ff114f7a2ad62c85e1fb627678", + "sha256": "0c91awhg02awbhmz632s0d0b9h4sn6adn22lgj52b9fddv9nq77r" }, "stable": { "version": [ @@ -109993,8 +110662,8 @@ "perspective", "treemacs" ], - "commit": "faa2d10b894df9df0b6789047ea7ae05434d3030", - "sha256": "0p0fj8d0cjpw4v2a4xhnf9x983h8xxfz7ardyc9g4qcm9ybs58xr" + "commit": "e80c3020270720ff114f7a2ad62c85e1fb627678", + "sha256": "0c91awhg02awbhmz632s0d0b9h4sn6adn22lgj52b9fddv9nq77r" }, "stable": { "version": [ @@ -110025,8 +110694,8 @@ "projectile", "treemacs" ], - "commit": "faa2d10b894df9df0b6789047ea7ae05434d3030", - "sha256": "0p0fj8d0cjpw4v2a4xhnf9x983h8xxfz7ardyc9g4qcm9ybs58xr" + "commit": "e80c3020270720ff114f7a2ad62c85e1fb627678", + "sha256": "0c91awhg02awbhmz632s0d0b9h4sn6adn22lgj52b9fddv9nq77r" }, "stable": { "version": [ @@ -110056,8 +110725,8 @@ "dash", "treemacs" ], - "commit": "faa2d10b894df9df0b6789047ea7ae05434d3030", - "sha256": "0p0fj8d0cjpw4v2a4xhnf9x983h8xxfz7ardyc9g4qcm9ybs58xr" + "commit": "e80c3020270720ff114f7a2ad62c85e1fb627678", + "sha256": "0c91awhg02awbhmz632s0d0b9h4sn6adn22lgj52b9fddv9nq77r" }, "stable": { "version": [ @@ -110163,11 +110832,11 @@ "repo": "ianyepan/tron-legacy-emacs-theme", "unstable": { "version": [ - 20220312, - 1645 + 20220610, + 1746 ], - "commit": "d775d9f348a942230ea57b6520e1eb56a5d67569", - "sha256": "03v8izw95ksl104w4zgacy0wpcvl4x3kwzamvd11d7ndlzn3jqpy" + "commit": "72655ce5ea0580cc23966821d2813e4d5e961f93", + "sha256": "1ba7abw53qmn0d1swxcvgdx6xgrx79ql0mri5mm7nxf7abifskxp" }, "stable": { "version": [ @@ -110402,14 +111071,14 @@ "repo": "ocaml/tuareg", "unstable": { "version": [ - 20220104, - 2039 + 20220713, + 1857 ], "deps": [ "caml" ], - "commit": "04f5ab6be9ae1c594bab359819dbaf708ae57fda", - "sha256": "1pbrz7x13zh2k2hang2mdcnm1yzl8ijzg0q3rndk7hpc9sq2rwzh" + "commit": "978acff45e99f011896b7f4718b289dd5ea12998", + "sha256": "0zf4snd235sfifa2k6qdifmp3ai5j2yqagxjh1shlzw1i17f9q2k" }, "stable": { "version": [ @@ -110432,14 +111101,14 @@ "repo": "smallwat3r/tubestatus.el", "unstable": { "version": [ - 20220303, - 1736 + 20220620, + 2028 ], "deps": [ "request" ], - "commit": "c81373f1bc32cbd2e2d642ee10ee1cb31915acb0", - "sha256": "1ili2jfp8ycigq022ws92x6x91k0myq34ipq318b461shd1by4yq" + "commit": "bf722d441ff96ff8fac6c8d2a798e283fef5613b", + "sha256": "08cwyabcb0qzydsw14n9vk93y471yp8cyif9pcbmx2qrr9kd07xa" } }, { @@ -110658,6 +111327,24 @@ "sha256": "193v98i84xybm3n0f30jin5q10i87vbcnbdhl4zqi7jij9p5v98z" } }, + { + "ename": "twtxt", + "commit": "5490cd1e9008185e1c587fccf70f796e5a4da296", + "sha256": "0fpq3nz30v0g355xq0pcwf8iqykvn9af1wdx76v5fgzimlrpwy7l", + "fetcher": "github", + "repo": "deadblackclover/twtxt-el", + "unstable": { + "version": [ + 20220628, + 309 + ], + "deps": [ + "request" + ], + "commit": "eb9efa19086fcae343353f6a5e88c3377fd06dd4", + "sha256": "142kjwh5ya237j10hj6kvm28d22l8vmhbaahpn87bl70lcpqv3fb" + } + }, { "ename": "typescript-mode", "commit": "94455323364d5a6b00e2786d577134eb350826b4", @@ -110666,11 +111353,11 @@ "repo": "emacs-typescript/typescript.el", "unstable": { "version": [ - 20220506, - 827 + 20220705, + 2151 ], - "commit": "4f056f6db77839dc8653afff68dfecf62d83ec70", - "sha256": "0viyrfxnpmj164kiaai8j0wlrylss8mvpp3q57ldk2r6ijm85klb" + "commit": "83bf47e406761d951bd9eab2f0674e4fa3874a1b", + "sha256": "1f9wnmw6dz22nd5liyadjic2na8zlqflzvqdmrhlaj575k2fr56g" }, "stable": { "version": [ @@ -110719,28 +111406,28 @@ "repo": "mrkkrp/typit", "unstable": { "version": [ - 20220106, - 1722 + 20220616, + 2033 ], "deps": [ "f", "mmt" ], - "commit": "61dba759f8178550bc067a360c42ce1089e99a66", - "sha256": "15m4nfsig8w9hykqy9mzd014pqx4fj9yykiw273bwm384lf3dq6y" + "commit": "eb67151f0693103bd7ef09a4a121c0f18b53c395", + "sha256": "0djxmni5mfc9wzm0zg7fsd7138ic5qznbmqd5jyrk4mpf0li8nhy" }, "stable": { "version": [ 0, - 2, - 2 + 3, + 0 ], "deps": [ "f", "mmt" ], - "commit": "61dba759f8178550bc067a360c42ce1089e99a66", - "sha256": "15m4nfsig8w9hykqy9mzd014pqx4fj9yykiw273bwm384lf3dq6y" + "commit": "eb67151f0693103bd7ef09a4a121c0f18b53c395", + "sha256": "0djxmni5mfc9wzm0zg7fsd7138ic5qznbmqd5jyrk4mpf0li8nhy" } }, { @@ -111094,11 +111781,11 @@ "repo": "jcs-elpa/undersea-theme", "unstable": { "version": [ - 20200719, - 618 + 20220616, + 1950 ], - "commit": "1bba7a3d42885a7ce432ca18d3755c40f2af6d27", - "sha256": "0hql80w0zl87piwwp2q3ccl71vd3c064kppv9kdrz6lnh3amjh3k" + "commit": "6bc351c4cb49ccc7210801e6b54ecc2993289b92", + "sha256": "0vvz0s5jq2a9dlqbnq18mlkh4dkpp8kizkjyn7jk38npqy4syyv1" }, "stable": { "version": [ @@ -111141,11 +111828,11 @@ "url": "https://codeberg.org/ideasman42/emacs-undo-fu.git", "unstable": { "version": [ - 20220509, - 1045 + 20220710, + 351 ], - "commit": "97e7f4f6e0754fd1b01db9638b3f534b5b4941c2", - "sha256": "0gx4cm6qdl06y9vrwy5wj3zn618zf3w0b8qpdnns3q4xc7qz3b6g" + "commit": "2c00eff32487e90d40588dcc69dc0e8d40a99f61", + "sha256": "1p4bg3c9ph5hcdwwx9h0qpm415vfi0frisi49zac3q60q90bqx9m" } }, { @@ -111156,11 +111843,11 @@ "url": "https://codeberg.org/ideasman42/emacs-undo-fu-session.git", "unstable": { "version": [ - 20220509, - 1044 + 20220710, + 1043 ], - "commit": "52c71b1cee2fe944e0013a2823e6fde10b26bc65", - "sha256": "0ijw245wg9rxhz419hjw62jsgpwjy9r26z9jbd018r7f4qa5gh3s" + "commit": "c95d1fbb28cb38fc68f3ba7cb5ef0e0136055118", + "sha256": "0ylbapnrn2n7piblsf0vafj99na2jbhzgw721mdvy25qmaiz59vd" } }, { @@ -111352,8 +112039,8 @@ "repo": "rolandwalker/unicode-fonts", "unstable": { "version": [ - 20200803, - 1335 + 20220713, + 1837 ], "deps": [ "font-utils", @@ -111362,8 +112049,8 @@ "persistent-soft", "ucs-utils" ], - "commit": "47f2397ade28eba621baa865fd69e4efb71407a5", - "sha256": "1c9byhlkzjvijhl7izwxfp4z6dwism4np4m8705i23ccrpf039jw" + "commit": "44d0a22420c39709d1e1fa659a3f135facf3c986", + "sha256": "00qdwkphwpc5kddn3k3ck1isykbhlvqmfb45877a65274am79pd7" }, "stable": { "version": [ @@ -111846,8 +112533,8 @@ }, { "ename": "use-package", - "commit": "51a19a251c879a566d4ae451d94fcb35e38a478b", - "sha256": "0d0zpgxhj6crsdi9sfy30fn3is036apm1kz8fhjg1yzdapf1jdyp", + "commit": "570bde6b4b89eb74eaf47dda64004cd575f9d953", + "sha256": "0rlccqjdynh03ww9jqnnyvn86mr9cd4hlfni8hz2r7a726b70xf1", "fetcher": "github", "repo": "jwiegley/use-package", "unstable": { @@ -111858,8 +112545,8 @@ "deps": [ "bind-key" ], - "commit": "a7422fb8ab1baee19adb2717b5b47b9c3812a84c", - "sha256": "1zz2gg475254hbbxw4y82b2m2iy8cvx0phh030daax315hdbsaqb" + "commit": "0ad5d9d5d8a61517a207ab04bf69e71c081149eb", + "sha256": "112g1944iirjlvfw8fxwd1iy6z8yfawf4qz5jv3aj087cxli55ww" }, "stable": { "version": [ @@ -111891,8 +112578,8 @@ "key-chord", "use-package" ], - "commit": "a7422fb8ab1baee19adb2717b5b47b9c3812a84c", - "sha256": "1zz2gg475254hbbxw4y82b2m2iy8cvx0phh030daax315hdbsaqb" + "commit": "0ad5d9d5d8a61517a207ab04bf69e71c081149eb", + "sha256": "112g1944iirjlvfw8fxwd1iy6z8yfawf4qz5jv3aj087cxli55ww" }, "stable": { "version": [ @@ -111954,8 +112641,8 @@ "system-packages", "use-package" ], - "commit": "a7422fb8ab1baee19adb2717b5b47b9c3812a84c", - "sha256": "1zz2gg475254hbbxw4y82b2m2iy8cvx0phh030daax315hdbsaqb" + "commit": "0ad5d9d5d8a61517a207ab04bf69e71c081149eb", + "sha256": "112g1944iirjlvfw8fxwd1iy6z8yfawf4qz5jv3aj087cxli55ww" }, "stable": { "version": [ @@ -112038,11 +112725,11 @@ "repo": "jcs-elpa/use-ttf", "unstable": { "version": [ - 20220220, - 150 + 20220704, + 700 ], - "commit": "4cc7a372f035674f4037a0051c125739bc2e3299", - "sha256": "0dpwsfg3nmr39vxidk2jlsd1f4dryalzcbh6fcszpmhijx2pk63p" + "commit": "6473227e4e26896db099d54bd2ba1d05619395bc", + "sha256": "1mf2r3c6dhx39j5kr2nv5mc7nh99hi2bz361al0kw5r5shk0mvid" }, "stable": { "version": [ @@ -112062,11 +112749,11 @@ "url": "https://codeberg.org/ideasman42/emacs-utimeclock.git", "unstable": { "version": [ - 20220425, - 939 + 20220710, + 1024 ], - "commit": "cfd5109e004d3e2522f5e758b3ff7238fcf385d6", - "sha256": "0ii3rvxq0408snj8rmclrk1b1kkx46lkak16q8xlxz1gx01kn64d" + "commit": "32994d27771f77a384b246e69a621c4d26e27f4f", + "sha256": "1zjb0sr4z0qpdivzdpskidxcdl3c6y6f80yim7yfs1bhdd049kld" } }, { @@ -112083,20 +112770,20 @@ "deps": [ "tuareg" ], - "commit": "42614160c20764b443d082083740e8dcc6cf2f78", - "sha256": "0ahxx8l0n7ki256rm2ka62rvil9292ijzm7w5i466gbvp6pa4mdf" + "commit": "a779b0515c98819cadec8e2e5ffc580f12df9bf1", + "sha256": "04gqc4c71k6vy7n9haghni9yh5ky621ynrvpsml9iph6akrabga8" }, "stable": { "version": [ 2, - 9, - 1 + 10, + 0 ], "deps": [ "tuareg" ], - "commit": "d273db2a3561e5c760bafd0075f1f82af000e6c7", - "sha256": "1pmsmi0j4gb1vsd69j0bppkv79wbwz5xcffq78n1i2ibhff6r4j0" + "commit": "e56a75d2826fbe0ba3bc27a6d19fe08e02c3216d", + "sha256": "1pcix3h9f7is06581iax4i08zkd6sv8y5hy1vvxhqhcsd9z0qfl3" } }, { @@ -113544,11 +114231,11 @@ "repo": "emacs-vs/vs-dark-theme", "unstable": { "version": [ - 20220515, - 714 + 20220703, + 809 ], - "commit": "29694e7951374a8711a0a84a6fd76c70946cc2cb", - "sha256": "1h37hrpiiarw8lhqqw92zkxqb4wyl488kw5l3hp7q36p3dxbs4g1" + "commit": "87b1b300375bb9f06f92e253c6941113b9bce5b4", + "sha256": "1za8p2xj5drn71xx1yvy8k96576z3rfgfcjgj4h697ldlsbz3xgi" }, "stable": { "version": [ @@ -113567,11 +114254,11 @@ "repo": "emacs-vs/vs-light-theme", "unstable": { "version": [ - 20220515, - 714 + 20220703, + 806 ], - "commit": "718c458901ec58db2844a2960ebe01581574efe4", - "sha256": "1fn1s34g3nys5z2rc1w1lm8879043afp9fz4i4zhxyl5dq4ly5jk" + "commit": "af9c8ee7e99ec4ffb20d15512efafc49d509f5db", + "sha256": "1cvvhckf3s21v7bs20jgza57dazm6ck6k8lzlmj6f3fmhif27hvx" }, "stable": { "version": [ @@ -113608,8 +114295,8 @@ 20220320, 530 ], - "commit": "cec18a9d816fef372a4e70f6ad1e16a42aa93b06", - "sha256": "1byssa2rv2j9s3m10v7ihi1avqkjc5wqj62393wkp85k73z9v3dq" + "commit": "d247fcf2b0c4f21398276e12faf3f2a4c26b2306", + "sha256": "00fyz1cjw1s95yigi1shxn8jqvqpf3g4jv3vn282r6951xlshc8v" }, "stable": { "version": [ @@ -113638,17 +114325,17 @@ }, { "ename": "vterm", - "commit": "91a71615c0a32565e455ac81d9bc90443aa8caf9", - "sha256": "0nn15pz2ys4bmpyks190x22f8s2fcr793f95h0c2m67cfjmnd478", + "commit": "570bde6b4b89eb74eaf47dda64004cd575f9d953", + "sha256": "0dd1fcpkhmk7c0r0bl93sack68iyfnnzmii40ixjhm7ma5ms0lnz", "fetcher": "github", "repo": "akermu/emacs-libvterm", "unstable": { "version": [ - 20220429, - 21 + 20220613, + 1614 ], - "commit": "b44723552f86407d528c4a6c8057382c061b008e", - "sha256": "0rq2skwylvc7s4vfpbbsdykws4akyp9sc6xgrh2ql5yydhhnv2h3" + "commit": "3155a477b43c1567d754768f5be79296440ebaf8", + "sha256": "1pki7ih33n09k0q23053xc6vwn9gcvas91g3z5y19b9c5nr9b1sr" } }, { @@ -113787,30 +114474,32 @@ "repo": "d12frosted/vulpea", "unstable": { "version": [ - 20220204, - 936 + 20220714, + 1856 ], "deps": [ + "dash", "org", "org-roam", "s" ], - "commit": "ba44342aea6a81c7b7ca6fcaae9a537701789b5e", - "sha256": "0avqxd264dpbyh8cza0pv8miflyaaqlx27xdjix4xj42wq8k6rzm" + "commit": "8070a599583f0126a089f386e35df62451e51a91", + "sha256": "1zwgsg8p1xghzzim1kpzijin098p707skhwm38cgv258hp4sgw22" }, "stable": { "version": [ 0, - 2, + 3, 0 ], "deps": [ + "dash", "org", "org-roam", "s" ], - "commit": "16f61797090df570c182c8b3aefd6fe6c9768e93", - "sha256": "04i55w017d2i3sf49rs7jj4yzv51bppz6dlybk09cy5giwafv9cx" + "commit": "505ac5e627105b0d05504e10b7796e5499256eaf", + "sha256": "0bkcmisaf8rgg65kmzikplpss53m2ijw783n9s3kmbh215h63m58" } }, { @@ -113903,8 +114592,8 @@ 20220606, 2300 ], - "commit": "45155e42ea10990295d47d5ee3cb29be16a1f9f6", - "sha256": "1cjz3sli309i2qrwxic63x1am4hpn8r9gwjnfjb62b954wdhhf97" + "commit": "e3ca74f62602e69af5ff3271bd98977bd490e9de", + "sha256": "0jznj2zh2bb32sy7cgwkb8sy4x9w63y8f929nq6271s6ljg8akc2" } }, { @@ -113977,11 +114666,11 @@ "repo": "wakatime/wakatime-mode", "unstable": { "version": [ - 20211104, - 1455 + 20220621, + 616 ], - "commit": "a53c0e819258ea9dbea3ad64b16e4c6c6201f5a5", - "sha256": "0iig6sqngd51cmsmcp31dawfjl7vd0rr7r1q82vv1jwk6xa7wsqg" + "commit": "a9c7ab37dbaeadb36b90bcd38b31e4447706b251", + "sha256": "0qp4rpg0kkxqvzhs4avjp03ys6ilcd2am05dmqp7d52yi6g59gr4" } }, { @@ -114102,11 +114791,11 @@ "repo": "nryotaro/wallpreview", "unstable": { "version": [ - 20220220, - 427 + 20220703, + 1108 ], - "commit": "b1b8f19ae82b344a9577cea7b883ad513ec52222", - "sha256": "11s37l15g9sgvk0blvvw22griy1h51q14c42290yms8whnbp001z" + "commit": "6eae0549afdfe725b453ca4fb0878c728735892d", + "sha256": "09mnzii7hilnnqvkzwrrbphgg3z3all75ijs3lgmc9q3d5is5vxr" } }, { @@ -114164,16 +114853,16 @@ "repo": "wanderlust/wanderlust", "unstable": { "version": [ - 20220508, - 1540 + 20220710, + 221 ], "deps": [ "apel", "flim", "semi" ], - "commit": "e3cd5e39454737c0b641e114ddcc550122288a2a", - "sha256": "0qm5gyss1mxwcxgc4s201c0bvh7kfkfg8fii766nfnddfywccj43" + "commit": "d0296bb70abe97fdc3d855ee76eff0414a5fae62", + "sha256": "0n4h4486bzqk6wlqlc7p05ahiwqr7pbhgfc0j5hgz188lf9kjqra" } }, { @@ -114410,11 +115099,11 @@ "repo": "fxbois/web-mode", "unstable": { "version": [ - 20220531, - 615 + 20220615, + 602 ], - "commit": "cdbd74b5e71d78ca7cb0768771f38e7b764fa0ac", - "sha256": "0ghkdnq1iad2flz49fwjxxn9q1ryiwq65276axbx1j7572rxshwa" + "commit": "7b5459f58c381f31eed257480b000a9a46209094", + "sha256": "054jawhk1cd3bjr6b320bmbjkmpx3mbp7fyn9l20gm4h5sjs4y70" }, "stable": { "version": [ @@ -115285,11 +115974,11 @@ "repo": "progfolio/wikinfo", "unstable": { "version": [ - 20220121, - 2017 + 20220629, + 1826 ], - "commit": "b149228023d4abb29555ce69877df521887cafe9", - "sha256": "153jmq14x4bim9v5xhd4zd100bqy2amj62sqjlmxf60pmd6xqc69" + "commit": "bd5d58bbee4eb7eaa923b3c310aa8d3082a6333e", + "sha256": "1nnnjv9878sm8sqw24mkc8cjb7qaj4gnai8j3d2lgdf0399km6zg" } }, { @@ -115902,11 +116591,11 @@ "repo": "hsjunnesson/wolfram.el", "unstable": { "version": [ - 20190805, - 1007 + 20220621, + 1228 ], - "commit": "a172712d5045834f5434cca2843a7c3506805db8", - "sha256": "10z04y8p72rqs2b2bgf1xfq99iidgbwg3ipxwkhwcaq32027h36z" + "commit": "b1d9905666eb075fb2f40d09beec272200f6eb3b", + "sha256": "05682cbflka1nvqr1jm1bpf92ia7zr7ad1cwndpgsxggidnsns3q" }, "stable": { "version": [ @@ -116040,8 +116729,8 @@ "deps": [ "s" ], - "commit": "f1f0354dee403b0ee9b2187bc346e9badff69ec3", - "sha256": "0yq5vrampjibn7p9ixx8fp0jzdhw4acr7i5jxjczypnhp96f6vk0" + "commit": "1c5ea8bd88b32571d3f4be64c1ad73784af83136", + "sha256": "006ib6b0zznm014y83sqhahqdm5i3vv69f6p30w65d46yc2fhjdp" } }, { @@ -116126,11 +116815,11 @@ "repo": "pashinin/workgroups2", "unstable": { "version": [ - 20220423, - 1150 + 20220702, + 842 ], - "commit": "ccd6948c92ea21d0dec56dff029b3f46df408de5", - "sha256": "1k4z9yi92mj2c82xww9bzpbgl2fcbi3fv79hlyalv20pqlky0zjy" + "commit": "a8a4d07bff27f72970fe7e204997f1ba0e80263b", + "sha256": "1rykmk2fgplvnp08lcl460pmdphj3cq3xmji2jp9xgjjhsd8yziq" }, "stable": { "version": [ @@ -116153,11 +116842,11 @@ "url": "https://codeberg.org/akib/emacs-workroom.git", "unstable": { "version": [ - 20220607, - 1715 + 20220608, + 1718 ], - "commit": "c38489669e8b0ddc7a6a13544a099fc51b65d388", - "sha256": "1jng8a0qwsdxghpisvibjgxd0yr7l4nn5gvv16fpm2vfqjgaglwh" + "commit": "e1092127bdf93d8f1ae0c58ec595d0181f606f1e", + "sha256": "104ba079b0s63ac6702hx71hp4ky76krki246x55dansvypcsydq" } }, { @@ -116281,8 +116970,8 @@ "deps": [ "visual-fill-column" ], - "commit": "a736205c194d7525feb1e1f10f4186c7b2b62bef", - "sha256": "1mhakk78gxhv2cahvg3ynzrfwj09l5aknvncmd3r09csrc0cwkfg" + "commit": "1fd52848eb58301c864712fd26c4ec37a938cc19", + "sha256": "1y15xkci3fiw7k67vnavjmxchbc9mnmz7qg1pcvxksflxrks6lq2" }, "stable": { "version": [ @@ -116454,14 +117143,14 @@ "repo": "Lompik/x-path-walker", "unstable": { "version": [ - 20201220, - 628 + 20220714, + 1056 ], "deps": [ "helm-core" ], - "commit": "e553968b6ddebe39ea00904a2e9ff4cff6096985", - "sha256": "0iq8pglzzx83k4wcld250vy0x3n9vz8689bwpbqkapg5p3m8c6v1" + "commit": "c91deaaba0d5cc9018008a39c96222deacba3868", + "sha256": "126r74rbgp9v1g11lz55pwfyfl5b64axixm8khr523gi2kirh83m" } }, { @@ -116472,14 +117161,11 @@ "repo": "jobbflykt/x509-mode", "unstable": { "version": [ - 20220607, - 715 + 20220705, + 757 ], - "deps": [ - "cl-lib" - ], - "commit": "2b44e4aec3a733bd22e00a56906eb5151f8b8d81", - "sha256": "01w6bddbrx0bh2dkrwd1p98hpnp0k6w5r7nb3p9l95gk8pvvmnby" + "commit": "49fbab6166d03e5d4c8b856de6ef04b99ba16eb4", + "sha256": "0kjfrqavz76mbiabzl01hywgjgfrn86a28y86kh01dd7f9njll97" } }, { @@ -116925,11 +117611,11 @@ "url": "https://codeberg.org/ideasman42/emacs-xref-rst.git", "unstable": { "version": [ - 20220518, - 1102 + 20220708, + 211 ], - "commit": "bc76bc228d51f64a2e57be8f230cf8a7746ea54a", - "sha256": "1yrvymgqwxib93dd6q57p3glj8ll6385wbnpzf3q7pbmdiihi82y" + "commit": "c497c0d9b97692a39c984d0e6bb06dcdc4ad0082", + "sha256": "17whfpdwliafpfnf7qbkapmk92gqm4hwycb91mpa8gbz133xa9nf" } }, { @@ -117239,20 +117925,20 @@ "repo": "zkry/yaml.el", "unstable": { "version": [ - 20220518, - 1229 + 20220713, + 358 ], - "commit": "adb3e52a214a5154267085639f95a3ffae1ec2d3", - "sha256": "0ziqjiszidr6kwnpwnzfsi1as0iawjvbg7nb9jhkbzvbal1mxh2s" + "commit": "0ac7f365bb6b4507259b31679bb37ac291e1f1c7", + "sha256": "0n0cf5y862ajyf2q0pnvbkhg57ggsri33x8y4q99s0a17ksk4qrm" }, "stable": { "version": [ 0, - 3, - 5 + 5, + 1 ], - "commit": "adb3e52a214a5154267085639f95a3ffae1ec2d3", - "sha256": "0ziqjiszidr6kwnpwnzfsi1as0iawjvbg7nb9jhkbzvbal1mxh2s" + "commit": "0ac7f365bb6b4507259b31679bb37ac291e1f1c7", + "sha256": "0n0cf5y862ajyf2q0pnvbkhg57ggsri33x8y4q99s0a17ksk4qrm" } }, { @@ -117554,14 +118240,14 @@ "repo": "AndreaCrotti/yasnippet-snippets", "unstable": { "version": [ - 20220401, - 1534 + 20220713, + 1234 ], "deps": [ "yasnippet" ], - "commit": "c5bf4c4085aa61b9c07563de89f7aacc2a357db5", - "sha256": "12kvg1nl93893pwhhx49a78camb8m8yzrgn6wg7kh9y50bqmh9ma" + "commit": "cd665c9cba4bab646f6d50ac098bee63573a4ca5", + "sha256": "113yn1imk8pffn3vyqbjmg7j64x0y0dgqx56jss8wbf17nzck17w" }, "stable": { "version": [ @@ -118039,11 +118725,11 @@ "repo": "bbatsov/zenburn-emacs", "unstable": { "version": [ - 20220527, - 1800 + 20220710, + 623 ], - "commit": "b600814c8ddfe8812582f4ba4b62db817d665860", - "sha256": "1d08g55z9m3cj3v9fvw647i6x7dz4g7z9c3y3yq35dlaz6rlsk0m" + "commit": "cff73bfea8deef2c97cc1ceac4b03702702c4a83", + "sha256": "1nj4zbf0551whlzgx4gc0p0l5223ag1rwjmjsvk08knvr14jnjm5" }, "stable": { "version": [ @@ -118253,26 +118939,56 @@ "repo": "Vidianos-Giannitsis/zetteldesk.el", "unstable": { "version": [ - 20220528, - 1904 + 20220703, + 1648 ], "deps": [ "org-roam" ], - "commit": "177771d7e1eddf86e0b6f6e94332200cf26dedaa", - "sha256": "0zncqyzhmcvxprg4ba9wn6mgi35sih465r45bygcc97g19hlxy43" + "commit": "b9367a738628dbb569ab878b65240a567eadaaf6", + "sha256": "1n03p2q95vl3qw3dldh4y8h562jly6wnjiajpwyx10ckycxb8wry" }, "stable": { "version": [ 1, - 0, + 1, 0 ], "deps": [ "org-roam" ], - "commit": "0237a5a0f9cc40dc543c9713c37bbb34d548de50", - "sha256": "1isqd3a0mkcfqqj386h3glmxq02323a1gdykf8wpsm67x8myjgij" + "commit": "99c5434a809da0b783f31b10872c8cb2a2176e2d", + "sha256": "1bw4d98k8fk9xbm4fcx03p1mc7yq3l5vmdyhwdsj92h3zarcdggk" + } + }, + { + "ename": "zetteldesk-info", + "commit": "7357be3a8a408c0e04de76dedc926b5e7aedbd0c", + "sha256": "1x0bhi7lhryak9bp4vxs1gblyri3gmr2p7cll43a7gibk587nvl8", + "fetcher": "github", + "repo": "Vidianos-Giannitsis/zetteldesk.el", + "unstable": { + "version": [ + 20220626, + 1100 + ], + "deps": [ + "zetteldesk" + ], + "commit": "b9367a738628dbb569ab878b65240a567eadaaf6", + "sha256": "1n03p2q95vl3qw3dldh4y8h562jly6wnjiajpwyx10ckycxb8wry" + }, + "stable": { + "version": [ + 1, + 1, + 0 + ], + "deps": [ + "zetteldesk" + ], + "commit": "99c5434a809da0b783f31b10872c8cb2a2176e2d", + "sha256": "1bw4d98k8fk9xbm4fcx03p1mc7yq3l5vmdyhwdsj92h3zarcdggk" } }, { @@ -118283,21 +118999,21 @@ "repo": "Vidianos-Giannitsis/zetteldesk.el", "unstable": { "version": [ - 20220530, - 2045 + 20220703, + 1648 ], "deps": [ "hydra", "major-mode-hydra", "zetteldesk" ], - "commit": "177771d7e1eddf86e0b6f6e94332200cf26dedaa", - "sha256": "0zncqyzhmcvxprg4ba9wn6mgi35sih465r45bygcc97g19hlxy43" + "commit": "b9367a738628dbb569ab878b65240a567eadaaf6", + "sha256": "1n03p2q95vl3qw3dldh4y8h562jly6wnjiajpwyx10ckycxb8wry" }, "stable": { "version": [ 1, - 0, + 1, 0 ], "deps": [ @@ -118305,8 +119021,72 @@ "major-mode-hydra", "zetteldesk" ], - "commit": "0237a5a0f9cc40dc543c9713c37bbb34d548de50", - "sha256": "1isqd3a0mkcfqqj386h3glmxq02323a1gdykf8wpsm67x8myjgij" + "commit": "99c5434a809da0b783f31b10872c8cb2a2176e2d", + "sha256": "1bw4d98k8fk9xbm4fcx03p1mc7yq3l5vmdyhwdsj92h3zarcdggk" + } + }, + { + "ename": "zetteldesk-ref", + "commit": "ddb1388ca43bd1bb7c23537d206b2eab33e40bbc", + "sha256": "0rwcs44svlgqq003pliqghsmpn2hji79wdc4k0z5ldyr812a3yg0", + "fetcher": "github", + "repo": "Vidianos-Giannitsis/zetteldesk.el", + "unstable": { + "version": [ + 20220619, + 2028 + ], + "deps": [ + "bibtex-completion", + "zetteldesk" + ], + "commit": "b9367a738628dbb569ab878b65240a567eadaaf6", + "sha256": "1n03p2q95vl3qw3dldh4y8h562jly6wnjiajpwyx10ckycxb8wry" + }, + "stable": { + "version": [ + 1, + 1, + 0 + ], + "deps": [ + "bibtex-completion", + "zetteldesk" + ], + "commit": "99c5434a809da0b783f31b10872c8cb2a2176e2d", + "sha256": "1bw4d98k8fk9xbm4fcx03p1mc7yq3l5vmdyhwdsj92h3zarcdggk" + } + }, + { + "ename": "zetteldesk-remark", + "commit": "c57b2cd5bf2ca91e4fcc465f159b5463116c1980", + "sha256": "12qiizrfk28wy0gs53cym69ckc0bf7clv2b5p30nbmlpiry4lgk6", + "fetcher": "github", + "repo": "Vidianos-Giannitsis/zetteldesk.el", + "unstable": { + "version": [ + 20220626, + 1100 + ], + "deps": [ + "org-remark", + "zetteldesk" + ], + "commit": "b9367a738628dbb569ab878b65240a567eadaaf6", + "sha256": "1n03p2q95vl3qw3dldh4y8h562jly6wnjiajpwyx10ckycxb8wry" + }, + "stable": { + "version": [ + 1, + 1, + 0 + ], + "deps": [ + "org-remark", + "zetteldesk" + ], + "commit": "99c5434a809da0b783f31b10872c8cb2a2176e2d", + "sha256": "1bw4d98k8fk9xbm4fcx03p1mc7yq3l5vmdyhwdsj92h3zarcdggk" } }, { @@ -118323,20 +119103,20 @@ "deps": [ "s" ], - "commit": "603a5b692a08340c1865a6f73cacf57c4fd64cb2", - "sha256": "1hwibhqmm7a4zz0fw6qhbgyyw7rx73zd6gn7mg2g4m0c4kwwfifa" + "commit": "9eb18ecd93895a9894970fa85b68257da647812d", + "sha256": "0nmbbrw36bkxygh5pllfa9i1z20b0wzrax7bcz049syjkfl3l621" }, "stable": { "version": [ 0, - 4, + 5, 0 ], "deps": [ "s" ], - "commit": "4048bf9e1be7ab759696a9541eec8f435359bcf3", - "sha256": "1rnir9mc9cp12wg5p19f0m6g6mvfyv1ahr7zq7azl8hvwmnb6gx7" + "commit": "f470db20ad0a7e591daa73c903524ac267ae7236", + "sha256": "0xjhcc4xsfgp55mr73cv7nhl3a8ccy1khsnsvrwfbxnhxxi40pnr" } }, { @@ -118434,11 +119214,11 @@ "repo": "localauthor/zk", "unstable": { "version": [ - 20220604, - 1536 + 20220707, + 1957 ], - "commit": "2dee0650892494410c0e0a340c565b79606f53e4", - "sha256": "1bf19614bp7954j4d23d7mx30jshvb6dpd4cdpxkxil1h7dc7f5q" + "commit": "f72397e1244fc9a2eb0be7f07b5a60c584545f24", + "sha256": "1jszbgimsd2zv7mh0h0cyjigm1sxjr9hvkyah0j07rz8all0svk9" }, "stable": { "version": [ @@ -118457,14 +119237,14 @@ "repo": "localauthor/zk", "unstable": { "version": [ - 20220604, - 1536 + 20220713, + 2002 ], "deps": [ "zk" ], - "commit": "2dee0650892494410c0e0a340c565b79606f53e4", - "sha256": "1bf19614bp7954j4d23d7mx30jshvb6dpd4cdpxkxil1h7dc7f5q" + "commit": "f72397e1244fc9a2eb0be7f07b5a60c584545f24", + "sha256": "1jszbgimsd2zv7mh0h0cyjigm1sxjr9hvkyah0j07rz8all0svk9" }, "stable": { "version": [ @@ -118478,6 +119258,25 @@ "sha256": "1az7n1f0203kk7x50ljjz3dcirkbk0zxzc54b3xxv64sd806vfw6" } }, + { + "ename": "zk-luhmann", + "commit": "09e58226704ff9a86ff9045bdb86088f06b80a80", + "sha256": "1wa48jqcjvlk52l3f1pkkzfws7454axplj2kd1nfnw0z5l0951ax", + "fetcher": "github", + "repo": "localauthor/zk-luhmann", + "unstable": { + "version": [ + 20220713, + 1653 + ], + "deps": [ + "zk", + "zk-index" + ], + "commit": "566fa6a5933455a3f42f700bc91f9f9958878861", + "sha256": "15h28v1aljbwril0mx5swk6vy0972qymxiki2y7a6wsczx252zrh" + } + }, { "ename": "zlc", "commit": "cae2ac3513e371a256be0f1a7468e38e686c2487", @@ -118865,20 +119664,20 @@ "repo": "Vonfry/zoxide.el", "unstable": { "version": [ - 20220302, - 522 + 20220711, + 33 ], - "commit": "41c090402816b15eb226ff9368f0ca40c7244f92", - "sha256": "09hvl5ddggkgl4ckmnfhlwf2wwli1pw799sy5f5i6dr6r07mqi37" + "commit": "b09c06962316d28b14ecbb2340af7c0636ab6d16", + "sha256": "1fngxjd4yg73rnx9hwvkp66x972m72ysm1b7dj76fkvfdrcdz0gb" }, "stable": { "version": [ 1, 2, - 0 + 1 ], - "commit": "1ec22ca486aaa838828ec516e91f8880b478bd19", - "sha256": "1f4j53a1bm4kpgmlpfxnqb9zm8q0qxl7frxd8a0nqwfrxrzkqp8p" + "commit": "b09c06962316d28b14ecbb2340af7c0636ab6d16", + "sha256": "1fngxjd4yg73rnx9hwvkp66x972m72ysm1b7dj76fkvfdrcdz0gb" } }, { diff --git a/third_party/nixpkgs/pkgs/applications/editors/jetbrains/default.nix b/third_party/nixpkgs/pkgs/applications/editors/jetbrains/default.nix index 394c668989..4e6a91b603 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/jetbrains/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/jetbrains/default.nix @@ -166,7 +166,7 @@ let }; }); - buildPycharm = { pname, version, src, license, description, wmClass, product, ... }: + buildPycharm = { pname, version, src, license, description, wmClass, product, cythonSpeedup ? stdenv.isLinux, ... }: (mkJetBrainsProduct { inherit pname version src wmClass jdk product; productShort = "PyCharm"; @@ -189,6 +189,17 @@ let ''; maintainers = with maintainers; [ ]; }; + }).overrideAttrs (finalAttrs: previousAttrs: optionalAttrs cythonSpeedup { + buildInputs = with python3.pkgs; [ python3 setuptools ]; + preInstall = '' + echo "compiling cython debug speedups" + if [[ -d plugins/python-ce ]]; then + ${python3.interpreter} plugins/python-ce/helpers/pydev/setup_cython.py build_ext --inplace + else + ${python3.interpreter} plugins/python/helpers/pydev/setup_cython.py build_ext --inplace + fi + ''; + # See https://www.jetbrains.com/help/pycharm/2022.1/cython-speedups.html }); buildRider = { pname, version, src, license, description, wmClass, ... }: diff --git a/third_party/nixpkgs/pkgs/applications/editors/mle/default.nix b/third_party/nixpkgs/pkgs/applications/editors/mle/default.nix index 506f94237f..e6744ac8a8 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/mle/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/mle/default.nix @@ -1,26 +1,53 @@ -{ lib, stdenv, fetchFromGitHub, termbox, pcre, uthash, lua5_3, makeWrapper, installShellFiles }: +{ lib +, stdenv +, fetchFromGitHub +, fetchpatch +, pcre +, uthash +, lua5_4 +, makeWrapper +, installShellFiles +}: stdenv.mkDerivation rec { pname = "mle"; - version = "1.4.3"; + version = "1.5.0"; src = fetchFromGitHub { owner = "adsr"; repo = "mle"; rev = "v${version}"; - sha256 = "16dbwfdd6sqqn7jfaxd5wdy8y9ghbihnz6bgn3xhqcww8rj1sia1"; + sha256 = "1nhd00lsx9v12zdmps92magz76c2d8zzln3lxvzl4ng73gbvq3n0"; }; - # Fix location of Lua 5.3 header and library + # Bug fixes found after v1.5.0 release + patches = [ + (fetchpatch { + name = "skip_locale_dep_test.patch"; + url = "https://github.com/adsr/mle/commit/e4dc4314b02a324701d9ae9873461d34cce041e5.patch"; + sha256 = "sha256-j3Z/n+2LqB9vEkWzvRVSOrF6yE+hk6f0dvEsTQ74erw="; + }) + (fetchpatch { + name = "fix_input_trail.patch"; + url = "https://github.com/adsr/mle/commit/bc05ec0eee4143d824010c6688fce526550ed508.patch"; + sha256 = "sha256-dM63EBDQfHLAqGZk3C5NtNAv23nCTxXVW8XpLkAeEyQ="; + }) + ]; + + # Fix location of Lua 5.4 header and library postPatch = '' - substituteInPlace Makefile --replace "-llua5.3" "-llua"; - substituteInPlace mle.h --replace " $NEW_VERSION" if [[ "$OLD_VERSION" == "$NEW_VERSION" ]]; then echo "Already up to date!" - if [[ "$1" != "--deps-only" ]]; then + if [[ "${1-default}" != "--deps-only" ]]; then exit 0 fi fi cd ../../../.. -if [[ "$1" != "--deps-only" ]]; then +if [[ "${1-default}" != "--deps-only" ]]; then SHA="$(nix-prefetch-git https://github.com/ryujinx/ryujinx --rev "$COMMIT" --quiet | jq -r '.sha256')" update-source-version ryujinx "$NEW_VERSION" "$SHA" --rev="$COMMIT" fi diff --git a/third_party/nixpkgs/pkgs/applications/emulators/wibo/default.nix b/third_party/nixpkgs/pkgs/applications/emulators/wibo/default.nix new file mode 100644 index 0000000000..7a0d4e5f09 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/emulators/wibo/default.nix @@ -0,0 +1,34 @@ +{ lib +, stdenv +, fetchFromGitHub +, cmake +}: + +stdenv.mkDerivation rec { + pname = "wibo"; + version = "0.2.0"; + + src = fetchFromGitHub { + owner = "decompals"; + repo = "WiBo"; + rev = version; + sha256 = "sha256-zv+FiordPo7aho3RJqDEe/1sJtjVt6Vy665VeNul/Kw="; + }; + + nativeBuildInputs = [ + cmake + ]; + + meta = with lib; { + description = "Quick-and-dirty wrapper to run 32-bit windows EXEs on linux"; + longDescription = '' + A minimal, low-fuss wrapper that can run really simple command-line + 32-bit Windows binaries on Linux - with less faff and less dependencies + than WINE. + ''; + homepage = "https://github.com/decompals/WiBo"; + license = licenses.mit; + maintainers = with maintainers; [ r-burns ]; + platforms = [ "i686-linux" ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/emulators/wine/sources.nix b/third_party/nixpkgs/pkgs/applications/emulators/wine/sources.nix index a7cc12db55..fbd318cb4a 100644 --- a/third_party/nixpkgs/pkgs/applications/emulators/wine/sources.nix +++ b/third_party/nixpkgs/pkgs/applications/emulators/wine/sources.nix @@ -21,14 +21,14 @@ in rec { ## see http://wiki.winehq.org/Gecko gecko32 = fetchurl rec { - version = "2.47.2"; + version = "2.47.3"; url = "https://dl.winehq.org/wine/wine-gecko/${version}/wine-gecko-${version}-x86.msi"; - sha256 = "07d6nrk2g0614kvwdjym1wq21d2bwy3pscwikk80qhnd6rrww875"; + sha256 = "sha256-5bmwbTzjVWRqjS5y4ETjfh4MjRhGTrGYWtzRh6f0jgE="; }; gecko64 = fetchurl rec { - version = "2.47.2"; + version = "2.47.3"; url = "https://dl.winehq.org/wine/wine-gecko/${version}/wine-gecko-${version}-x86_64.msi"; - sha256 = "0iffhvdawc499nbn4k99k33cr7g8sdfcvq8k3z1g6gw24h87d5h5"; + sha256 = "sha256-pT7pVDkrbR/j1oVF9uTiqXr7yNyLA6i0QzSVRc4TlnU="; }; ## see http://wiki.winehq.org/Mono @@ -46,9 +46,9 @@ in rec { unstable = fetchurl rec { # NOTE: Don't forget to change the SHA256 for staging as well. - version = "7.10"; + version = "7.13"; url = "https://dl.winehq.org/wine/source/7.x/wine-${version}.tar.xz"; - sha256 = "sha256-P+skzYWYwQ9q9xHnSsK10kQrtNO4wHj506JTroc2SA0="; + sha256 = "sha256-a/6+kz2qUJVprnmwv2ofG08H4b+K/Balm+4TdIuSymQ="; inherit (stable) gecko32 gecko64 patches; mono = fetchurl rec { @@ -61,7 +61,7 @@ in rec { staging = fetchFromGitHub rec { # https://github.com/wine-staging/wine-staging/releases inherit (unstable) version; - sha256 = "sha256-5Pt98pla6t+B3FjB80hOWJUO64jY1EmOPQ0hEkFBWxY="; + sha256 = "sha256-U1awbhJRT3aAJstyEjv2Dp20FqyQ4ntnFFRYJb12C/U="; owner = "wine-staging"; repo = "wine-staging"; rev = "v${version}"; diff --git a/third_party/nixpkgs/pkgs/applications/emulators/wine/vkd3d.nix b/third_party/nixpkgs/pkgs/applications/emulators/wine/vkd3d.nix index 4f06b886e2..c345c052c4 100644 --- a/third_party/nixpkgs/pkgs/applications/emulators/wine/vkd3d.nix +++ b/third_party/nixpkgs/pkgs/applications/emulators/wine/vkd3d.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "vkd3d"; - version = "1.3"; + version = "1.4"; src = fetchurl { url = "https://dl.winehq.org/vkd3d/source/vkd3d-${version}.tar.xz"; - sha256 = "134b347806d34a4d2b39ea29ff1c2b38443793803a3adc50800855bb929fb8b2"; + sha256 = "sha256-yLqF9gSCyHPAVs9tuw6veRvIq30W1ipH83uYQbapCr0="; }; nativeBuildInputs = [ flex bison ]; diff --git a/third_party/nixpkgs/pkgs/applications/emulators/yuzu/default.nix b/third_party/nixpkgs/pkgs/applications/emulators/yuzu/default.nix index 11af548772..bc63771494 100644 --- a/third_party/nixpkgs/pkgs/applications/emulators/yuzu/default.nix +++ b/third_party/nixpkgs/pkgs/applications/emulators/yuzu/default.nix @@ -5,23 +5,23 @@ }: let - # Fetched from https://api.yuzu-emu.org/gamedb, last updated 2022-05-12 + # Fetched from https://api.yuzu-emu.org/gamedb, last updated 2022-07-14 # Please make sure to update this when updating yuzu! compat-list = fetchurl { name = "yuzu-compat-list"; - url = "https://web.archive.org/web/20220512184801/https://api.yuzu-emu.org/gamedb"; + url = "https://web.archive.org/web/20220714160745/https://api.yuzu-emu.org/gamedb"; sha256 = "sha256-anOmO7NscHDsQxT03+YbJEyBkXjhcSVGgKpDwt//GHw="; }; in { mainline = libsForQt5.callPackage ./generic.nix rec { pname = "yuzu-mainline"; - version = "1014"; + version = "1092"; src = fetchFromGitHub { owner = "yuzu-emu"; repo = "yuzu-mainline"; rev = "mainline-0-${version}"; - sha256 = "1x3d1fjssadv4kybc6mk153jlvncsfgm5aipkq5n5i8sr7mmr3nw"; + sha256 = "1avcq924q0r8pfv1s0a88iyii7yixcxpb3yhlj0xg9zqnwp9r23y"; fetchSubmodules = true; }; @@ -30,13 +30,13 @@ in { early-access = libsForQt5.callPackage ./generic.nix rec { pname = "yuzu-ea"; - version = "2725"; + version = "2841"; src = fetchFromGitHub { owner = "pineappleEA"; repo = "pineapple-src"; rev = "EA-${version}"; - sha256 = "1nmcl9y9chr7cdvnra5zs1v42d3i801hmsjdlz3fmp15n04bcjmp"; + sha256 = "16lrq9drv0x7gs1siq37m4zmh6d2g3vhnw9qcqajr9p0vmlpnh6l"; fetchSubmodules = true; }; diff --git a/third_party/nixpkgs/pkgs/applications/emulators/yuzu/update.sh b/third_party/nixpkgs/pkgs/applications/emulators/yuzu/update.sh index e128db066f..8dedcab028 100755 --- a/third_party/nixpkgs/pkgs/applications/emulators/yuzu/update.sh +++ b/third_party/nixpkgs/pkgs/applications/emulators/yuzu/update.sh @@ -53,7 +53,7 @@ updateEarlyAccess() { OLD_EA_HASH="$(getLocalHash "yuzu-ea")" NEW_EA_VERSION="$(curl -s ${GITHUB_TOKEN:+"-u \":$GITHUB_TOKEN\""} \ - "https://api.github.com/repos/pineappleEA/pineapple-src/releases?per_page=1" | jq -r '.[0].name' | cut -d"-" -f2 | cut -d" " -f1)" + "https://api.github.com/repos/pineappleEA/pineapple-src/releases?per_page=1" | jq -r '.[0].tag_name' | cut -d"-" -f2 | cut -d" " -f1)" if [[ "${OLD_EA_VERSION}" = "${NEW_EA_VERSION}" ]]; then echo "yuzu-ea is already up to date!" 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 0ad11bc630..8acc917b04 100644 --- a/third_party/nixpkgs/pkgs/applications/gis/qgis/unwrapped-ltr.nix +++ b/third_party/nixpkgs/pkgs/applications/gis/qgis/unwrapped-ltr.nix @@ -69,14 +69,14 @@ let six ]; in mkDerivation rec { - version = "3.22.8"; + version = "3.22.9"; pname = "qgis-ltr-unwrapped"; src = fetchFromGitHub { owner = "qgis"; repo = "QGIS"; rev = "final-${lib.replaceStrings [ "." ] [ "_" ] version}"; - sha256 = "sha256-YxF7FzyNNt+bdk96g2sWWv9haqV0L6Ab96D0hV0BFrA="; + sha256 = "sha256-QHdcK34e7tC0AUstE8pbsBHzHXbmOd3gI2/zqsxb6X4="; }; passthru = { diff --git a/third_party/nixpkgs/pkgs/applications/gis/qgis/unwrapped.nix b/third_party/nixpkgs/pkgs/applications/gis/qgis/unwrapped.nix index 1c46cd81f6..f0cfbda170 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.26.0"; + version = "3.26.1"; pname = "qgis-unwrapped"; src = fetchFromGitHub { owner = "qgis"; repo = "QGIS"; rev = "final-${lib.replaceStrings [ "." ] [ "_" ] version}"; - sha256 = "sha256-yHQi5ai7fdgznTf562Bj0QPE+SXg972O7+r01RY7itE="; + sha256 = "sha256-FjMe/5uEbmSeQrAtkKvoGh4VlPkbGMHNzlCpn27C5CQ="; }; passthru = { diff --git a/third_party/nixpkgs/pkgs/applications/graphics/ImageMagick/6.x.nix b/third_party/nixpkgs/pkgs/applications/graphics/ImageMagick/6.x.nix index 032af6cf61..d0b76706dc 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/ImageMagick/6.x.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/ImageMagick/6.x.nix @@ -1,6 +1,25 @@ { lib, stdenv, fetchFromGitHub, pkg-config, libtool -, bzip2, zlib, libX11, libXext, libXt, fontconfig, freetype, ghostscript, libjpeg, djvulibre -, lcms2, openexr, libpng, liblqr1, librsvg, libtiff, libxml2, openjpeg, libwebp, fftw, libheif, libde265 +, bzip2Support ? true, bzip2 +, zlibSupport ? true, zlib +, libX11Support ? !stdenv.hostPlatform.isMinGW, libX11 +, libXtSupport ? !stdenv.hostPlatform.isMinGW, libXt +, fontconfigSupport ? true, fontconfig +, freetypeSupport ? true, freetype +, ghostscriptSupport ? false, ghostscript +, libjpegSupport ? true, libjpeg +, djvulibreSupport ? true, djvulibre +, lcms2Support ? true, lcms2 +, openexrSupport ? !stdenv.hostPlatform.isMinGW, openexr +, libpngSupport ? true, libpng +, liblqr1Support ? true, liblqr1 +, librsvgSupport ? !stdenv.hostPlatform.isMinGW, librsvg +, libtiffSupport ? true, libtiff +, libxml2Support ? true, libxml2 +, openjpegSupport ? !stdenv.hostPlatform.isMinGW, openjpeg +, libwebpSupport ? !stdenv.hostPlatform.isMinGW, libwebp +, libheifSupport ? true, libheif +, libde265Support ? true, libde265 +, fftw , ApplicationServices, Foundation }: @@ -30,35 +49,47 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - configureFlags = - [ "--with-frozenpaths" ] - ++ (if arch != null then [ "--with-gcc-arch=${arch}" ] else [ "--without-gcc-arch" ]) - ++ lib.optional (librsvg != null) "--with-rsvg" - ++ lib.optional (liblqr1 != null) "--with-lqr" - ++ lib.optionals (ghostscript != null) - [ "--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 - ; + configureFlags = [ + "--with-frozenpaths" + (lib.withFeatureAs (arch != null) "gcc-arch" arch) + (lib.withFeature librsvgSupport "rsvg") + (lib.withFeature liblqr1Support "lqr") + (lib.withFeatureAs ghostscriptSupport "gs-font-dir" "${ghostscript}/share/ghostscript/fonts") + (lib.withFeature ghostscriptSupport "gslib") + ] ++ lib.optionals stdenv.hostPlatform.isMinGW [ + # due to libxml2 being without DLLs ATM + "--enable-static" "--disable-shared" + ]; nativeBuildInputs = [ pkg-config libtool ]; - buildInputs = - [ zlib fontconfig freetype ghostscript - liblqr1 libpng libtiff libxml2 libheif libde265 djvulibre - ] - ++ lib.optionals (!stdenv.hostPlatform.isMinGW) - [ openexr librsvg openjpeg ] - ++ lib.optionals stdenv.isDarwin - [ ApplicationServices Foundation ]; + buildInputs = [ ] + ++ lib.optional zlibSupport zlib + ++ lib.optional fontconfigSupport fontconfig + ++ lib.optional ghostscriptSupport ghostscript + ++ lib.optional liblqr1Support liblqr1 + ++ lib.optional libpngSupport libpng + ++ lib.optional libtiffSupport libtiff + ++ lib.optional libxml2Support libxml2 + ++ lib.optional libheifSupport libheif + ++ lib.optional libde265Support libde265 + ++ lib.optional djvulibreSupport djvulibre + ++ lib.optional openexrSupport openexr + ++ lib.optional librsvgSupport librsvg + ++ lib.optional openjpegSupport openjpeg + ++ lib.optionals stdenv.isDarwin [ + ApplicationServices + Foundation + ]; - propagatedBuildInputs = - [ bzip2 freetype libjpeg lcms2 fftw ] - ++ lib.optionals (!stdenv.hostPlatform.isMinGW) - [ libX11 libXext libXt libwebp ] - ; + propagatedBuildInputs = [ fftw ] + ++ lib.optional bzip2Support bzip2 + ++ lib.optional freetypeSupport freetype + ++ lib.optional libjpegSupport libjpeg + ++ lib.optional lcms2Support lcms2 + ++ lib.optional libX11Support libX11 + ++ lib.optional libXtSupport libXt + ++ lib.optional libwebpSupport libwebp; doCheck = false; # fails 6 out of 76 tests @@ -72,7 +103,7 @@ stdenv.mkDerivation rec { substituteInPlace "$file" --replace ${pkg-config}/bin/pkg-config \ "PKG_CONFIG_PATH='$dev/lib/pkgconfig' '${pkg-config}/bin/${pkg-config.targetPrefix}pkg-config'" done - '' + lib.optionalString (ghostscript != null) '' + '' + lib.optionalString ghostscriptSupport '' for la in $out/lib/*.la; do sed 's|-lgs|-L${lib.getLib ghostscript}/lib -lgs|' -i $la done diff --git a/third_party/nixpkgs/pkgs/applications/graphics/ImageMagick/7.0.nix b/third_party/nixpkgs/pkgs/applications/graphics/ImageMagick/7.0.nix deleted file mode 100644 index 14525e6d5f..0000000000 --- a/third_party/nixpkgs/pkgs/applications/graphics/ImageMagick/7.0.nix +++ /dev/null @@ -1,133 +0,0 @@ -{ 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 -, testers -, imagemagick -}: - -let - arch = - 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 == "powerpc64le-linux" then "ppc64le" - else null; -in - -stdenv.mkDerivation rec { - pname = "imagemagick"; - version = "7.1.0-39"; - - src = fetchFromGitHub { - owner = "ImageMagick"; - repo = "ImageMagick"; - rev = version; - hash = "sha256-2KSsRkzaC3muNwH4GJfIiMy4pnSjh8waDpYRTuu6GG0="; - }; - - outputs = [ "out" "dev" "doc" ]; # bin/ isn't really big - outputMan = "out"; # it's tiny - - enableParallelBuilding = true; - - configureFlags = - [ "--with-frozenpaths" ] - ++ (if arch != null then [ "--with-gcc-arch=${arch}" ] else [ "--without-gcc-arch" ]) - ++ lib.optional (librsvg != null) "--with-rsvg" - ++ lib.optional (liblqr1 != null) "--with-lqr" - ++ lib.optional (libjxl != null ) "--with-jxl" - ++ lib.optionals (ghostscript != null) - [ - "--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 - libjxl - ] - ++ lib.optionals (!stdenv.hostPlatform.isMinGW) - [ openexr librsvg openjpeg ] - ++ lib.optionals stdenv.isDarwin [ - ApplicationServices - Foundation - ]; - - propagatedBuildInputs = - [ bzip2 freetype libjpeg lcms2 curl ] - ++ lib.optionals (!stdenv.hostPlatform.isMinGW) - [ libX11 libXext libXt libwebp ] - ; - - postInstall = '' - (cd "$dev/include" && ln -s ImageMagick* ImageMagick) - moveToOutput "bin/*-config" "$dev" - moveToOutput "lib/ImageMagick-*/config-Q16HDRI" "$dev" # includes configure params - for file in "$dev"/bin/*-config; do - substituteInPlace "$file" --replace pkg-config \ - "PKG_CONFIG_PATH='$dev/lib/pkgconfig' '${pkg-config}/bin/${pkg-config.targetPrefix}pkg-config'" - done - '' + lib.optionalString (ghostscript != null) '' - for la in $out/lib/*.la; do - sed 's|-lgs|-L${lib.getLib ghostscript}/lib -lgs|' -i $la - done - ''; - - passthru.tests.version = - testers.testVersion { package = imagemagick; }; - - meta = with lib; { - homepage = "http://www.imagemagick.org/"; - description = "A software suite to create, edit, compose, or convert bitmap images"; - platforms = platforms.linux ++ platforms.darwin; - maintainers = with maintainers; [ erictapen dotlambda ]; - license = licenses.asl20; - mainProgram = "magick"; - }; -} diff --git a/third_party/nixpkgs/pkgs/applications/graphics/ImageMagick/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/ImageMagick/default.nix new file mode 100644 index 0000000000..3b58aba1e5 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/graphics/ImageMagick/default.nix @@ -0,0 +1,132 @@ +{ lib +, stdenv +, fetchFromGitHub +, pkg-config +, libtool +, bzip2Support ? true, bzip2 +, zlibSupport ? true, zlib +, libX11Support ? !stdenv.hostPlatform.isMinGW, libX11 +, libXtSupport ? !stdenv.hostPlatform.isMinGW, libXt +, fontconfigSupport ? true, fontconfig +, freetypeSupport ? true, freetype +, ghostscriptSupport ? false, ghostscript +, libjpegSupport ? true, libjpeg +, djvulibreSupport ? true, djvulibre +, lcms2Support ? true, lcms2 +, openexrSupport ? !stdenv.hostPlatform.isMinGW, openexr +, libjxlSupport ? true, libjxl +, libpngSupport ? true, libpng +, liblqr1Support ? true, liblqr1 +, librawSupport ? true, libraw +, librsvgSupport ? !stdenv.hostPlatform.isMinGW, librsvg +, libtiffSupport ? true, libtiff +, libxml2Support ? true, libxml2 +, openjpegSupport ? !stdenv.hostPlatform.isMinGW, openjpeg +, libwebpSupport ? !stdenv.hostPlatform.isMinGW, libwebp +, libheifSupport ? true, libheif +, potrace +, curl +, ApplicationServices +, Foundation +, testers +, imagemagick +}: + +assert libXtSupport -> libX11Support; + +let + arch = + 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 == "powerpc64le-linux" then "ppc64le" + else null; +in + +stdenv.mkDerivation rec { + pname = "imagemagick"; + version = "7.1.0-43"; + + src = fetchFromGitHub { + owner = "ImageMagick"; + repo = "ImageMagick"; + rev = builtins.replaceStrings [ "-" ] [ "." ] version; + hash = "sha256-SOy7Ci1rzLB12ofSQBWmX86dfbr/ywsRPunHRswlAt4="; + }; + + outputs = [ "out" "dev" "doc" ]; # bin/ isn't really big + outputMan = "out"; # it's tiny + + enableParallelBuilding = true; + + configureFlags = [ + "--with-frozenpaths" + (lib.withFeatureAs (arch != null) "gcc-arch" arch) + (lib.withFeature librsvgSupport "rsvg") + (lib.withFeature liblqr1Support "lqr") + (lib.withFeature libjxlSupport "jxl") + (lib.withFeatureAs ghostscriptSupport "gs-font-dir" "${ghostscript}/share/ghostscript/fonts") + (lib.withFeature ghostscriptSupport "gslib") + ] ++ lib.optionals stdenv.hostPlatform.isMinGW [ + # due to libxml2 being without DLLs ATM + "--enable-static" "--disable-shared" + ]; + + nativeBuildInputs = [ pkg-config libtool ]; + + buildInputs = [ potrace ] + ++ lib.optional zlibSupport zlib + ++ lib.optional fontconfigSupport fontconfig + ++ lib.optional ghostscriptSupport ghostscript + ++ lib.optional liblqr1Support liblqr1 + ++ lib.optional libpngSupport libpng + ++ lib.optional librawSupport libraw + ++ lib.optional libtiffSupport libtiff + ++ lib.optional libxml2Support libxml2 + ++ lib.optional libheifSupport libheif + ++ lib.optional djvulibreSupport djvulibre + ++ lib.optional libjxlSupport libjxl + ++ lib.optional openexrSupport openexr + ++ lib.optional librsvgSupport librsvg + ++ lib.optional openjpegSupport openjpeg + ++ lib.optionals stdenv.isDarwin [ + ApplicationServices + Foundation + ]; + + propagatedBuildInputs = [ curl ] + ++ lib.optional bzip2Support bzip2 + ++ lib.optional freetypeSupport freetype + ++ lib.optional libjpegSupport libjpeg + ++ lib.optional lcms2Support lcms2 + ++ lib.optional libX11Support libX11 + ++ lib.optional libXtSupport libXt + ++ lib.optional libwebpSupport libwebp; + + postInstall = '' + (cd "$dev/include" && ln -s ImageMagick* ImageMagick) + moveToOutput "bin/*-config" "$dev" + moveToOutput "lib/ImageMagick-*/config-Q16HDRI" "$dev" # includes configure params + for file in "$dev"/bin/*-config; do + substituteInPlace "$file" --replace pkg-config \ + "PKG_CONFIG_PATH='$dev/lib/pkgconfig' '${pkg-config}/bin/${pkg-config.targetPrefix}pkg-config'" + done + '' + lib.optionalString ghostscriptSupport '' + for la in $out/lib/*.la; do + sed 's|-lgs|-L${lib.getLib ghostscript}/lib -lgs|' -i $la + done + ''; + + passthru.tests.version = + testers.testVersion { package = imagemagick; }; + + meta = with lib; { + homepage = "http://www.imagemagick.org/"; + description = "A software suite to create, edit, compose, or convert bitmap images"; + platforms = platforms.linux ++ platforms.darwin; + maintainers = with maintainers; [ erictapen dotlambda ]; + license = licenses.asl20; + mainProgram = "magick"; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/graphics/hydrus/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/hydrus/default.nix index dcebff3fcf..d44ef1f9cf 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 = "488d"; + version = "491"; format = "other"; src = fetchFromGitHub { owner = "hydrusnetwork"; repo = "hydrus"; rev = "refs/tags/v${version}"; - sha256 = "sha256-FWiopOf+eabiWAfjQW83V7I/e5lOLUVW3djoQePHPRs="; + sha256 = "sha256-ceKawn2jyfZPP4HzhkB1jIQoStCPRO/Ni/+Ys1R2FJQ="; }; nativeBuildInputs = [ @@ -42,7 +42,7 @@ python3Packages.buildPythonPackage rec { pyopenssl pyside2 pysocks - pythonPackages.mpv + python3Packages.mpv pyyaml qtpy requests diff --git a/third_party/nixpkgs/pkgs/applications/graphics/inkscape/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/inkscape/default.nix index 4a6e28c3cf..88f6279348 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/inkscape/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/inkscape/default.nix @@ -57,11 +57,11 @@ let in stdenv.mkDerivation rec { pname = "inkscape"; - version = "1.2"; + version = "1.2.1"; src = fetchurl { url = "https://media.inkscape.org/dl/resources/file/inkscape-${version}.tar.xz"; - sha256 = "jZsxFCVUlFZk7f7+LWtVkQpQmXZfcXanEQfDTx3N5q0="; + sha256 = "Rs59oOunykutwdtw6cu2fgrfm7NCaH3G4ItcohuNTBs="; }; # Inkscape hits the ARGMAX when linking on macOS. It appears to be diff --git a/third_party/nixpkgs/pkgs/applications/misc/OSCAR/default.nix b/third_party/nixpkgs/pkgs/applications/misc/OSCAR/default.nix index 9b5d2e68ad..3d8ea91195 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.1"; + version = "1.4.0"; src = fetchFromGitLab { owner = "pholy"; repo = "OSCAR-code"; rev = "v${version}"; - sha256 = "sha256-/70NoyiQ33RFdSTBAyi5c/JPZ2AV1/iRvkAZ6VjpUXw="; + sha256 = "sha256-bgETkpyL0yhCD1FfTVN0s9RNOPkDp88W/1Gdxvu+Ons="; }; buildInputs = [ qtbase qttools qtserialport libGLU ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/bottles/default.nix b/third_party/nixpkgs/pkgs/applications/misc/bottles/default.nix index bf11f3e7f4..9b24e55cfb 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/bottles/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/bottles/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub +{ lib, fetchFromGitHub, gitUpdater , meson, ninja, pkg-config, wrapGAppsHook , desktop-file-utils, gsettings-desktop-schemas, libnotify, libhandy, webkitgtk , python3Packages, gettext @@ -95,6 +95,10 @@ python3Packages.buildPythonApplication rec { makeWrapperArgs+=("''${gappsWrapperArgs[@]}") ''; + passthru.updateScript = gitUpdater { + inherit pname version; + }; + meta = with lib; { description = "An easy-to-use wineprefix manager"; homepage = "https://usebottles.com/"; diff --git a/third_party/nixpkgs/pkgs/applications/misc/dasel/default.nix b/third_party/nixpkgs/pkgs/applications/misc/dasel/default.nix index 7506f57e73..3298625601 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/dasel/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/dasel/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "dasel"; - version = "1.24.3"; + version = "1.25.0"; src = fetchFromGitHub { owner = "TomWright"; repo = "dasel"; rev = "v${version}"; - sha256 = "sha256-aAP5hyo4t5IX4wLwyNDuXxAYbAkS36S1UewYs9ZFJM4="; + sha256 = "sha256-VAakbuAkH7kuAx16m2vo4exikI03inXBW3OEIs5WwSY="; }; vendorSha256 = "sha256-zli9SEBU6n0JusAquqb9+O2W4yPZS7zmC5PCebVSeIA="; diff --git a/third_party/nixpkgs/pkgs/applications/misc/dialect/default.nix b/third_party/nixpkgs/pkgs/applications/misc/dialect/default.nix new file mode 100644 index 0000000000..a4f9d94d9e --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/misc/dialect/default.nix @@ -0,0 +1,79 @@ +{ lib +, fetchFromGitHub +, wrapGAppsHook4 +, python3 +, appstream-glib +, blueprint-compiler +, desktop-file-utils +, meson +, ninja +, pkg-config +, glib +, gtk4 +, gobject-introspection +, gst_all_1 +, libsoup_3 +, libadwaita +}: + +python3.pkgs.buildPythonApplication rec { + pname = "dialect"; + version = "2.0.1"; + + format = "other"; + + src = fetchFromGitHub { + owner = "dialect-app"; + repo = pname; + rev = version; + fetchSubmodules = true; + hash = "sha256-Ke23QnvKpmyuaqkiBQL1cUa0T7lSfYPLFi6wa9G8LYk="; + }; + + nativeBuildInputs = [ + appstream-glib + blueprint-compiler + desktop-file-utils + gobject-introspection + meson + ninja + pkg-config + wrapGAppsHook4 + ]; + + buildInputs = [ + gtk4 + glib + gobject-introspection + gst_all_1.gstreamer + gst_all_1.gst-plugins-base + libsoup_3 + libadwaita + ]; + + propagatedBuildInputs = with python3.pkgs; [ + dbus-python + gtts + pygobject3 + ]; + + # Prevent double wrapping, let the Python wrapper use the args in preFixup. + dontWrapGApps = true; + + preFixup = '' + makeWrapperArgs+=("''${gappsWrapperArgs[@]}") + ''; + + doCheck = false; + + # handle setup hooks better + strictDeps = false; + + meta = with lib; { + homepage = "https://github.com/dialect-app/dialect"; + description = "A translation app for GNOME"; + maintainers = with maintainers; [ linsui ]; + license = licenses.gpl3Plus; + platforms = platforms.linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/misc/electrum/default.nix b/third_party/nixpkgs/pkgs/applications/misc/electrum/default.nix index 4f95efa175..025d89e413 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/electrum/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/electrum/default.nix @@ -21,7 +21,7 @@ }: let - version = "4.2.1"; + version = "4.2.2"; libsecp256k1_name = if stdenv.isLinux then "libsecp256k1.so.0" @@ -37,7 +37,7 @@ let owner = "spesmilo"; repo = "electrum"; rev = version; - sha256 = "sha256-BoikYSsQZAv8WswIr5nmBsGmjZbTXaLAbdO2QtPvc7c="; + sha256 = "sha256-bFceOu+3SLtD2eY+aSBEn13xJw7a3aVwX39QfAuqVSo="; postFetch = '' mv $out ./all @@ -53,7 +53,7 @@ python3.pkgs.buildPythonApplication { src = fetchurl { url = "https://download.electrum.org/${version}/Electrum-${version}.tar.gz"; - sha256 = "sha256-2SxSTH9P380j2KaCbkXjgmQO7K2z81AG6PMA/EMggXA="; + sha256 = "sha256-ucLLfqmTKO5Qpg+PnmcdQwht7cWMWJoFjQWnDecEtVs="; }; postUnpack = '' diff --git a/third_party/nixpkgs/pkgs/applications/misc/gallery-dl/default.nix b/third_party/nixpkgs/pkgs/applications/misc/gallery-dl/default.nix index a21bf78596..9801d17d5b 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/gallery-dl/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/gallery-dl/default.nix @@ -2,11 +2,11 @@ buildPythonApplication rec { pname = "gallery_dl"; - version = "1.22.3"; + version = "1.22.4"; src = fetchPypi { inherit pname version; - sha256 = "sha256-6nveSEpi5fdlf6ooUXFrX1WaVDOQi6mvgDGAGgwi1zc="; + sha256 = "sha256-dJbzhZQIaMBXVd2r40F/fZfokkSq8pVSsRrymxrIynk="; }; propagatedBuildInputs = [ requests yt-dlp ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/gammu/default.nix b/third_party/nixpkgs/pkgs/applications/misc/gammu/default.nix index 736685f5eb..1a67163d06 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/gammu/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/gammu/default.nix @@ -8,13 +8,13 @@ with lib; stdenv.mkDerivation rec { pname = "gammu"; - version = "1.40.0"; + version = "1.42.0"; src = fetchFromGitHub { owner = "gammu"; repo = "gammu"; rev = version; - sha256 = "1jjaa9r3x6i8gv3yn1ngg815s6gsxblsw4wb5ddm77kamn2qyvpf"; + sha256 = "sha256-aeaGHVxOMiXRU6RHws+oAnzdO9RY1jw/X/xuGfSt76I="; }; patches = [ ./bashcomp-dir.patch ./systemd.patch ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/gammu/systemd.patch b/third_party/nixpkgs/pkgs/applications/misc/gammu/systemd.patch index 22b49a5a2f..315fd64a3b 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/gammu/systemd.patch +++ b/third_party/nixpkgs/pkgs/applications/misc/gammu/systemd.patch @@ -1,8 +1,8 @@ diff --git a/cmake/templates/gammu.spec.in b/cmake/templates/gammu.spec.in -index 8302353..e3ca59a 100644 +index 25c08b3d6..86f72d8c7 100644 --- a/cmake/templates/gammu.spec.in +++ b/cmake/templates/gammu.spec.in -@@ -387,9 +387,9 @@ fi +@@ -386,9 +386,9 @@ fi %doc %{_mandir}/man7/gammu-smsd-run.7* %doc %{_mandir}/man7/gammu-smsd-sql.7* %doc %{_mandir}/man7/gammu-smsd-tables.7* @@ -16,13 +16,13 @@ index 8302353..e3ca59a 100644 %files -n libGammu%{so_ver} -f libgammu.lang %defattr(-,root,root,-) diff --git a/contrib/CMakeLists.txt b/contrib/CMakeLists.txt -index 78cc7fc..d674c36 100644 +index 378411086..b871e6525 100644 --- a/contrib/CMakeLists.txt +++ b/contrib/CMakeLists.txt -@@ -97,7 +97,7 @@ endif (INSTALL_BASH_COMPLETION) - if (WITH_SYSTEMD) +@@ -100,7 +100,7 @@ if (WITH_SYSTEMD) + configure_file( init/gammu-smsd.service init/gammu-smsd.service ) install ( - FILES init/gammu-smsd.service + FILES ${CMAKE_CURRENT_BINARY_DIR}/init/gammu-smsd.service - DESTINATION "${SYSTEMD_SERVICES_INSTALL_DIR}" + DESTINATION "${CMAKE_INSTALL_PREFIX}/systemd" COMPONENT "systemd" diff --git a/third_party/nixpkgs/pkgs/applications/misc/gpsbabel/default.nix b/third_party/nixpkgs/pkgs/applications/misc/gpsbabel/default.nix index b09e7ef725..d7ba62f28c 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/gpsbabel/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/gpsbabel/default.nix @@ -96,7 +96,6 @@ stdenv.mkDerivation rec { ''); meta = with lib; { - broken = stdenv.isDarwin; description = "Convert, upload and download data from GPS and Map programs"; longDescription = '' GPSBabel converts waypoints, tracks, and routes between popular diff --git a/third_party/nixpkgs/pkgs/applications/misc/hugo/default.nix b/third_party/nixpkgs/pkgs/applications/misc/hugo/default.nix index 070727b772..72f91a56d9 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/hugo/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/hugo/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "hugo"; - version = "0.99.1"; + version = "0.101.0"; src = fetchFromGitHub { owner = "gohugoio"; repo = pname; rev = "v${version}"; - sha256 = "sha256-NFsXu4UxBmsSM6sNRSSoIUj6QjfB5iSXXbTNftakyHI="; + sha256 = "sha256-Fodcefp8xdSV2tt6ZYaKdcLqVe2upEngQr6M+wV5wnw="; }; - vendorSha256 = "sha256-A1ct8BjtKudNqfytCiaEGfgbRCMv45MIQxTka4ZFblg="; + vendorSha256 = "sha256-tZQIKxY96G6ReegqjapJ2rLd7n92+axJ7F8UglF61eM="; doCheck = false; @@ -33,7 +33,6 @@ buildGoModule rec { ''; meta = with lib; { - broken = stdenv.isDarwin && stdenv.isx86_64; description = "A fast and modern static website engine"; homepage = "https://gohugo.io"; license = licenses.asl20; diff --git a/third_party/nixpkgs/pkgs/applications/misc/mkgmap/default.nix b/third_party/nixpkgs/pkgs/applications/misc/mkgmap/default.nix index aa69148bd9..2726f37f4a 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/mkgmap/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/mkgmap/default.nix @@ -15,12 +15,12 @@ let in stdenv.mkDerivation rec { pname = "mkgmap"; - version = "4904"; + version = "4905"; src = fetchsvn { url = "https://svn.mkgmap.org.uk/mkgmap/mkgmap/trunk"; rev = version; - sha256 = "sha256-43gJkpk19Ef3vUbRNt3VDstxCLJl6smsAjtcrovGjEE="; + sha256 = "sha256-EYUysLit/bO/IjVmAbxqIvVFm9Ub50+RKFn7ZdspapU="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/applications/misc/openbangla-keyboard/Cargo.lock b/third_party/nixpkgs/pkgs/applications/misc/openbangla-keyboard/Cargo.lock new file mode 100644 index 0000000000..6fa93003a6 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/misc/openbangla-keyboard/Cargo.lock @@ -0,0 +1,251 @@ +# This file is automatically @generated by Cargo. +# It is not intended for manual editing. +version = 3 + +[[package]] +name = "ahash" +version = "0.3.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e8fd72866655d1904d6b0997d0b07ba561047d070fbe29de039031c641b61217" + +[[package]] +name = "aho-corasick" +version = "0.7.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e37cfd5e7657ada45f742d6e99ca5788580b5c529dc78faf11ece6dc702656f" +dependencies = [ + "memchr", +] + +[[package]] +name = "autocfg" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" + +[[package]] +name = "cfg-if" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" + +[[package]] +name = "crossbeam-channel" +version = "0.5.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c02a4d71819009c192cf4872265391563fd6a84c81ff2c0f2a7026ca4c1d85c" +dependencies = [ + "cfg-if", + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-deque" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6455c0ca19f0d2fbf751b908d5c55c1f5cbc65e03c4225427254b46890bdde1e" +dependencies = [ + "cfg-if", + "crossbeam-epoch", + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-epoch" +version = "0.9.9" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "07db9d94cbd326813772c968ccd25999e5f8ae22f4f8d1b11effa37ef6ce281d" +dependencies = [ + "autocfg", + "cfg-if", + "crossbeam-utils", + "memoffset", + "once_cell", + "scopeguard", +] + +[[package]] +name = "crossbeam-utils" +version = "0.8.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d82ee10ce34d7bc12c2122495e7593a9c41347ecdd64185af4ecf72cb1a7f83" +dependencies = [ + "cfg-if", + "once_cell", +] + +[[package]] +name = "edit-distance" +version = "2.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bbbaaaf38131deb9ca518a274a45bfdb8771f139517b073b16c2d3d32ae5037b" + +[[package]] +name = "either" +version = "1.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f107b87b6afc2a64fd13cac55fe06d6c8859f12d4b14cbcdd2c67d0976781be" + +[[package]] +name = "hashbrown" +version = "0.8.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e91b62f79061a0bc2e046024cb7ba44b08419ed238ecbd9adbd787434b9e8c25" +dependencies = [ + "ahash", + "autocfg", + "rayon", + "serde", +] + +[[package]] +name = "hermit-abi" +version = "0.1.19" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" +dependencies = [ + "libc", +] + +[[package]] +name = "itoa" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "112c678d4050afce233f4f2852bb2eb519230b3cf12f33585275537d7e41578d" + +[[package]] +name = "libc" +version = "0.2.126" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "349d5a591cd28b49e1d1037471617a32ddcda5731b99419008085f72d5a53836" + +[[package]] +name = "memchr" +version = "2.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2dffe52ecf27772e601905b7522cb4ef790d2cc203488bbd0e2fe85fcb74566d" + +[[package]] +name = "memoffset" +version = "0.6.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce" +dependencies = [ + "autocfg", +] + +[[package]] +name = "num_cpus" +version = "1.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "19e64526ebdee182341572e50e9ad03965aa510cd94427a4549448f285e957a1" +dependencies = [ + "hermit-abi", + "libc", +] + +[[package]] +name = "once_cell" +version = "1.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "18a6dbe30758c9f83eb00cbea4ac95966305f5a7772f3f42ebfc7fc7eddbd8e1" + +[[package]] +name = "rayon" +version = "1.5.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bd99e5772ead8baa5215278c9b15bf92087709e9c1b2d1f97cdb5a183c933a7d" +dependencies = [ + "autocfg", + "crossbeam-deque", + "either", + "rayon-core", +] + +[[package]] +name = "rayon-core" +version = "1.9.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "258bcdb5ac6dad48491bb2992db6b7cf74878b0384908af124823d118c99683f" +dependencies = [ + "crossbeam-channel", + "crossbeam-deque", + "crossbeam-utils", + "num_cpus", +] + +[[package]] +name = "regex" +version = "1.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c4eb3267174b8c6c2f654116623910a0fef09c4753f8dd83db29c48a0df988b" +dependencies = [ + "aho-corasick", + "memchr", + "regex-syntax", +] + +[[package]] +name = "regex-syntax" +version = "0.6.27" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a3f87b73ce11b1619a3c6332f45341e0047173771e8b8b73f87bfeefb7b56244" + +[[package]] +name = "riti" +version = "0.1.0" +dependencies = [ + "edit-distance", + "either", + "hashbrown", + "rayon", + "regex", + "rupantor", + "serde_json", + "stringplus", +] + +[[package]] +name = "rupantor" +version = "0.3.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "04eb802986005129b0946dbb4baa420bf14cea547c5ee6b57ba081d9e85f6a4b" +dependencies = [ + "serde_json", + "stringplus", +] + +[[package]] +name = "ryu" +version = "1.0.10" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f3f6f92acf49d1b98f7a81226834412ada05458b7364277387724a237f062695" + +[[package]] +name = "scopeguard" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" + +[[package]] +name = "serde" +version = "1.0.139" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0171ebb889e45aa68b44aee0859b3eede84c6f5f5c228e6f140c0b2a0a46cad6" + +[[package]] +name = "serde_json" +version = "1.0.82" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "82c2c1fdcd807d1098552c5b9a36e425e42e9fbd7c6a37a8425f390f781f7fa7" +dependencies = [ + "itoa", + "ryu", + "serde", +] + +[[package]] +name = "stringplus" +version = "0.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9057d3b491a3eee749e52560657c4d93b0badc04fb3fa8dae3c942c5c066f222" diff --git a/third_party/nixpkgs/pkgs/applications/misc/openbangla-keyboard/default.nix b/third_party/nixpkgs/pkgs/applications/misc/openbangla-keyboard/default.nix new file mode 100644 index 0000000000..28b730e0b2 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/misc/openbangla-keyboard/default.nix @@ -0,0 +1,72 @@ +{ lib +, stdenv +, fetchFromGitHub +, cmake +, pkg-config +, rustPlatform +, wrapQtAppsHook +, ibus +, qtbase +, zstd +}: + +stdenv.mkDerivation rec { + pname = "openbangla-keyboard"; + version = "2.0.0"; + + src = fetchFromGitHub { + owner = "openbangla"; + repo = "openbangla-keyboard"; + rev = version; + hash = "sha256-UoLiysaA0Wob/SLBqm36Txqb8k7bwoQ56h8ZufHR74I="; + fetchSubmodules = true; + }; + + nativeBuildInputs = [ + cmake + pkg-config + rustPlatform.rust.cargo + rustPlatform.rust.rustc + rustPlatform.cargoSetupHook + wrapQtAppsHook + ]; + + buildInputs = [ + ibus + qtbase + zstd + ]; + + cargoDeps = rustPlatform.fetchCargoTarball { + inherit src; + postPatch = '' + cp ${./Cargo.lock} Cargo.lock + ''; + sourceRoot = "source/${cargoRoot}"; + sha256 = "sha256-01MWuUUirsgpoprMArRp3qxKNayPHTkYWk31nXcIC34="; + }; + + cargoRoot = "src/engine/riti"; + postPatch = '' + cp ${./Cargo.lock} ${cargoRoot}/Cargo.lock + + substituteInPlace CMakeLists.txt \ + --replace "/usr" "$out" + + substituteInPlace src/shared/FileSystem.cpp \ + --replace "/usr" "$out" + ''; + + postInstall = '' + mkdir -p $out/bin + ln -s $out/share/openbangla-keyboard/openbangla-gui $out/bin/openbangla-gui + ''; + + meta = with lib; { + description = "An OpenSource, Unicode compliant Bengali Input Method"; + homepage = "https://openbangla.github.io/"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ hqurve ]; + platforms = platforms.linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/misc/pass-secret-service/default.nix b/third_party/nixpkgs/pkgs/applications/misc/pass-secret-service/default.nix index 12f8935797..6a57c15b74 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/pass-secret-service/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/pass-secret-service/default.nix @@ -1,26 +1,50 @@ -{ lib, fetchFromGitHub, python3, dbus, gnupg }: +{ lib +, fetchFromGitHub +, python3 +, dbus +, gnupg +, coreutils +, nixosTests +}: python3.pkgs.buildPythonApplication rec { pname = "pass-secret-service"; # PyPI has old alpha version. Since then the project has switched from using a # seemingly abandoned D-Bus package pydbus and started using maintained # dbus-next. So let's use latest from GitHub. - version = "unstable-2020-04-12"; + version = "unstable-2022-03-21"; src = fetchFromGitHub { owner = "mdellweg"; repo = "pass_secret_service"; - rev = "f6fbca6ac3ccd16bfec407d845ed9257adf74dfa"; - sha256 = "0rm4pbx1fiwds1v7f99khhh7x3inv9yniclwd95mrbgljk3cc6a4"; + rev = "149f8557e07098eee2f46561eea61e83255ac59b"; + sha256 = "sha256-+/pFi6+K8rl0Ihm6cp/emUQVtau6+Apl8/VEr9AI0Xs="; }; + patches = [ + # Only needed until https://github.com/mdellweg/pass_secret_service/pull/30 + # is merged. + ./int_from_bytes-deprecation-fix.patch + ]; # Need to specify session.conf file for tests because it won't be found under # /etc/ in check phase. postPatch = '' substituteInPlace Makefile \ --replace "dbus-run-session" "dbus-run-session --config-file=${dbus}/share/dbus-1/session.conf" \ - --replace '-p $(relpassstore)' '-p $(PASSWORD_STORE_DIR)' + --replace '-p $(relpassstore)' '-p $(PASSWORD_STORE_DIR)' \ + --replace 'pytest-3' 'pytest' + + substituteInPlace systemd/org.freedesktop.secrets.service \ + --replace "/bin/false" "${coreutils}/bin/false" + substituteInPlace systemd/dbus-org.freedesktop.secrets.service \ + --replace "/usr/local" "$out" + ''; + + postInstall = '' + mkdir -p "$out/share/dbus-1/services/" "$out/lib/systemd/user/" + cp systemd/org.freedesktop.secrets.service "$out/share/dbus-1/services/" + cp systemd/dbus-org.freedesktop.secrets.service "$out/lib/systemd/user/" ''; propagatedBuildInputs = with python3.pkgs; [ @@ -44,17 +68,15 @@ python3.pkgs.buildPythonApplication rec { ps.pypass ]; - checkPhase = '' - runHook preCheck - make test - runHook postCheck - ''; + checkTarget = "test"; + + passthru.tests.pass-secret-service = nixosTests.pass-secret-service; meta = { description = "Libsecret D-Bus API with pass as the backend"; homepage = "https://github.com/mdellweg/pass_secret_service/"; license = lib.licenses.gpl3Only; platforms = lib.platforms.all; - maintainers = with lib.maintainers; [ jluttine ]; + maintainers = with lib.maintainers; [ jluttine aidalgol ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/misc/pass-secret-service/int_from_bytes-deprecation-fix.patch b/third_party/nixpkgs/pkgs/applications/misc/pass-secret-service/int_from_bytes-deprecation-fix.patch new file mode 100644 index 0000000000..b7e78e7b79 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/misc/pass-secret-service/int_from_bytes-deprecation-fix.patch @@ -0,0 +1,22 @@ +--- a/pass_secret_service/interfaces/session.py ++++ b/pass_secret_service/interfaces/session.py +@@ -4,7 +4,6 @@ + import os + import hmac + from hashlib import sha256 +-from cryptography.utils import int_from_bytes + from cryptography.hazmat.backends import default_backend + from cryptography.hazmat.primitives.ciphers import Cipher + from cryptography.hazmat.primitives.ciphers.modes import CBC +@@ -27,9 +26,9 @@ class Session(ServiceInterface, SerialMixin): + @classmethod + @run_in_executor + def _create_dh(cls, input): +- priv_key = int_from_bytes(os.urandom(0x80), "big") ++ priv_key = int.from_bytes(os.urandom(0x80), "big") + pub_key = pow(2, priv_key, dh_prime) +- shared_secret = pow(int_from_bytes(input, "big"), priv_key, dh_prime) ++ shared_secret = pow(int.from_bytes(input, "big"), priv_key, dh_prime) + salt = b"\x00" * 0x20 + shared_key = hmac.new(salt, shared_secret.to_bytes(0x80, "big"), sha256).digest() + aes_key = hmac.new(shared_key, b"\x01", sha256).digest()[:0x10] diff --git a/third_party/nixpkgs/pkgs/applications/misc/prusa-slicer/super-slicer.nix b/third_party/nixpkgs/pkgs/applications/misc/prusa-slicer/super-slicer.nix index 742fa6f8e2..b385542d67 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/prusa-slicer/super-slicer.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/prusa-slicer/super-slicer.nix @@ -1,16 +1,35 @@ -{ lib, fetchFromGitHub, makeDesktopItem, prusa-slicer, wxGTK31-gtk3 }: +{ lib, fetchFromGitHub, fetchpatch, makeDesktopItem, prusa-slicer, wxGTK31-gtk3 }: let appname = "SuperSlicer"; pname = "super-slicer"; description = "PrusaSlicer fork with more features and faster development cycle"; versions = { - stable = { version = "2.3.57.12"; sha256 = "sha256-lePhDRHI++9zs54bTt2/Lu6ZQ7egjJCWb752aI0s7Mw=="; }; - latest = { version = "2.3.57.12"; sha256 = "sha256-lePhDRHI++9zs54bTt2/Lu6ZQ7egjJCWb752aI0s7Mw=="; }; + stable = { + version = "2.3.57.12"; + sha256 = "sha256-lePhDRHI++9zs54bTt2/Lu6ZQ7egjJCWb752aI0s7Mw=="; + patches = null; + }; + latest = { + version = "2.4.58.3"; + sha256 = "sha256-pEZcBEvK4Mq8nytiXLJvta7Bk6qZRJfTNrYz7N/aUAE="; + patches = [ + # Fix detection of TBB, see https://github.com/prusa3d/PrusaSlicer/issues/6355 + (fetchpatch { + url = "https://github.com/prusa3d/PrusaSlicer/commit/76f4d6fa98bda633694b30a6e16d58665a634680.patch"; + sha256 = "1r806ycp704ckwzgrw1940hh1l6fpz0k1ww3p37jdk6mygv53nv6"; + }) + # Fix compile error with boost 1.79. See https://github.com/supermerill/SuperSlicer/issues/2823 + (fetchpatch { + url = "https://raw.githubusercontent.com/gentoo/gentoo/81e3ca3b7c131e8345aede89e3bbcd700e1ad567/media-gfx/superslicer/files/superslicer-2.4.58.3-boost-1.79-port-v2.patch"; + sha256 = "sha256-xMbUjumPZ/7ulyRuBA76CwIv4BOpd+yKXCINSf58FxI="; + }) + ]; + }; }; - override = { version, sha256 }: super: { - inherit version pname; + override = { version, sha256, patches }: super: { + inherit version pname patches; src = fetchFromGitHub { owner = "supermerill"; @@ -20,8 +39,6 @@ let fetchSubmodules = true; }; - patches = null; - # We don't need PS overrides anymore, and gcode-viewer is embedded in the binary. postInstall = null; separateDebugInfo = true; diff --git a/third_party/nixpkgs/pkgs/applications/misc/sequeler/default.nix b/third_party/nixpkgs/pkgs/applications/misc/sequeler/default.nix index 7ba7d15478..fce2688838 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/sequeler/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/sequeler/default.nix @@ -45,7 +45,7 @@ in stdenv.mkDerivation rec { ''; homepage = "https://github.com/Alecaddd/sequeler"; license = licenses.gpl3; - maintainers = with maintainers; [ etu ] ++ teams.pantheon.members; + maintainers = with maintainers; [ ] ++ teams.pantheon.members; platforms = platforms.linux; mainProgram = "com.github.alecaddd.sequeler"; }; diff --git a/third_party/nixpkgs/pkgs/applications/misc/sigal/default.nix b/third_party/nixpkgs/pkgs/applications/misc/sigal/default.nix index bc48ce3e2a..8289cc428d 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/sigal/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/sigal/default.nix @@ -28,6 +28,8 @@ python3.pkgs.buildPythonApplication rec { feedgenerator zopfli cryptography + + setuptools # needs pkg_resources ]; checkInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/misc/solaar/default.nix b/third_party/nixpkgs/pkgs/applications/misc/solaar/default.nix index 230abcf285..7f2e4207d0 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/solaar/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/solaar/default.nix @@ -10,18 +10,21 @@ }: # Although we copy in the udev rules here, you probably just want to use -# logitech-udev-rules instead of adding this to services.udev.packages on NixOS +# `logitech-udev-rules`, which is an alias to `udev` output of this derivation, +# instead of adding this to `services.udev.packages` on NixOS, python3Packages.buildPythonApplication rec { pname = "solaar"; - version = "1.1.3"; + version = "1.1.4"; src = fetchFromGitHub { owner = "pwr-Solaar"; repo = "Solaar"; rev = version; - hash = "sha256-6z22MnhUL9Da3G7UDmZsBAi2gHLNpiFEwe+pAtnP91s="; + hash = "sha256-nDfVF7g0M54DRpkH1rnZB8o+nCV4A6b1uKMOMRQ3GbI="; }; + outputs = [ "out" "udev" ]; + nativeBuildInputs = [ wrapGAppsHook gdk-pixbuf ]; buildInputs = [ libappindicator librsvg ]; @@ -41,12 +44,9 @@ python3Packages.buildPythonApplication rec { postInstall = '' ln -s $out/bin/solaar $out/bin/solaar-cli - install -Dm444 -t $out/etc/udev/rules.d rules.d/*.rules + install -Dm444 -t $udev/etc/udev/rules.d rules.d-uinput/*.rules ''; - # No tests - doCheck = false; - meta = with lib; { description = "Linux devices manager for the Logitech Unifying Receiver"; longDescription = '' @@ -61,7 +61,7 @@ python3Packages.buildPythonApplication rec { ''; homepage = "https://pwr-solaar.github.io/Solaar/"; license = licenses.gpl2Only; - maintainers = with maintainers; [ spinus ysndr ]; + maintainers = with maintainers; [ spinus ysndr oxalica ]; platforms = platforms.linux; }; } diff --git a/third_party/nixpkgs/pkgs/applications/misc/streamdeck-ui/default.nix b/third_party/nixpkgs/pkgs/applications/misc/streamdeck-ui/default.nix new file mode 100644 index 0000000000..141652e63d --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/misc/streamdeck-ui/default.nix @@ -0,0 +1,95 @@ +{ lib +, python3Packages +, fetchFromGitHub +, poetry +, copyDesktopItems +, wrapQtAppsHook +, writeText +, makeDesktopItem +, xvfb-run +}: + +python3Packages.buildPythonApplication rec { + pname = "streamdeck-ui"; + version = "2.0.4"; + + src = fetchFromGitHub { + repo = pname; + owner = "timothycrosley"; + rev = "v${version}"; + hash = "sha256-NV4BkHEgfxIOuLfmn0vcPNqivmHLD6v7jLdLZgnrb0Q="; + }; + + desktopItems = [ (makeDesktopItem { + name = "streamdeck-ui"; + desktopName = "Stream Deck UI"; + icon = "streamdeck-ui"; + exec = "streamdeck --no-ui"; + comment = "UI for the Elgato Stream Deck"; + categories = [ "Utility" ]; + noDisplay = true; + }) ]; + + postInstall = + let + udevRules = '' + SUBSYSTEM=="usb", ATTRS{idVendor}=="0fd9", ATTRS{idProduct}=="0060", TAG+="uaccess" + SUBSYSTEM=="usb", ATTRS{idVendor}=="0fd9", ATTRS{idProduct}=="0063", TAG+="uaccess" + SUBSYSTEM=="usb", ATTRS{idVendor}=="0fd9", ATTRS{idProduct}=="006c", TAG+="uaccess" + SUBSYSTEM=="usb", ATTRS{idVendor}=="0fd9", ATTRS{idProduct}=="006d", TAG+="uaccess" + SUBSYSTEM=="usb", ATTRS{idVendor}=="0fd9", ATTRS{idProduct}=="0080", TAG+="uaccess" + ''; + in + '' + mkdir -p "$out/etc/udev/rules.d" + cp ${writeText "70-streamdeck.rules" udevRules} $out/etc/udev/rules.d/70-streamdeck.rules + + mkdir -p "$out/share/pixmaps" + cp streamdeck_ui/logo.png $out/share/pixmaps/streamdeck-ui.png + ''; + + dontWrapQtApps = true; + makeWrapperArgs = [ "\${qtWrapperArgs[@]}" ]; + + format = "pyproject"; + + nativeBuildInputs = [ + poetry + copyDesktopItems + wrapQtAppsHook + ]; + + propagatedBuildInputs = with python3Packages; [ + setuptools + filetype + cairosvg + pillow + pynput + pyside2 + streamdeck + xlib + ]; + + checkInputs = [ + xvfb-run + python3Packages.pytest + python3Packages.hypothesis-auto + ]; + + # Ignored tests are not in a running or passing state. + # Fixes have been merged upstream but not yet released. + # Revisit these ignored tests on each update. + checkPhase = '' + xvfb-run pytest tests \ + --ignore=tests/test_api.py \ + --ignore=tests/test_filter.py \ + --ignore=tests/test_stream_deck_monitor.py + ''; + + meta = with lib; { + description = "Linux compatible UI for the Elgato Stream Deck"; + homepage = "https://timothycrosley.github.io/streamdeck-ui/"; + license = licenses.mit; + maintainers = with maintainers; [ majiir ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/misc/sunwait/default.nix b/third_party/nixpkgs/pkgs/applications/misc/sunwait/default.nix index 2d1f8f46f5..71c174a07e 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/sunwait/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/sunwait/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation { description = "Calculates sunrise or sunset times with civil, nautical, astronomical and custom twilights"; homepage = "https://github.com/risacher/sunwait"; license = licenses.gpl3Only; - maintainers = with maintainers; [ etu ]; + maintainers = with maintainers; [ ]; platforms = platforms.all; }; } diff --git a/third_party/nixpkgs/pkgs/applications/misc/terminal-colors/default.nix b/third_party/nixpkgs/pkgs/applications/misc/terminal-colors/default.nix index 08e810a13f..96df3d1783 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/terminal-colors/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/terminal-colors/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { pname = "terminal-colors"; - version = "3.0.1"; + version = "3.0.2"; outputs = [ "out" "man" ]; src = fetchFromGitHub { owner = "eikenb"; repo = pname; rev = "v${version}"; - hash = "sha256-hekt77/FhSTMEARVuck49/Q1dIuqkwbOYmgGD1IItyc="; + hash = "sha256-KRoP/Reo5nDKJYG9zVTVpoYL7soAGMNk46vDoaLfnv4="; }; buildInputs = [ python3 ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/themechanger/default.nix b/third_party/nixpkgs/pkgs/applications/misc/themechanger/default.nix index 17e5d458b8..945bd8de54 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/themechanger/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/themechanger/default.nix @@ -15,14 +15,14 @@ python3Packages.buildPythonApplication rec { pname = "themechanger"; - version = "0.11.0"; + version = "0.11.1"; format = "other"; src = fetchFromGitHub { owner = "ALEX11BR"; repo = "ThemeChanger"; rev = "v${version}"; - sha256 = "sha256-umRkGPeNDZOmx6pjWLU9rRdHX6QFuHY/dsuQ8oI2YLI="; + sha256 = "sha256-zSbh+mqCKquOyQASwVUW6hghmUc37nTuoa8pWCHM/a8="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/misc/tut/default.nix b/third_party/nixpkgs/pkgs/applications/misc/tut/default.nix index e7299326e8..8fa43da809 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/tut/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/tut/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "tut"; - version = "0.0.46"; + version = "1.0.13"; src = fetchFromGitHub { owner = "RasmusLindroth"; repo = pname; rev = version; - sha256 = "sha256-C9kyA6QuL8sqzCooaPzSP7VOpu7jcSFCUx9oaZLZ7/w="; + sha256 = "sha256-EORvIqA2bsmNUY1euUBmEYNMU02nW0doRDmTQjt15Os="; }; - vendorSha256 = "sha256-kMGEAN/I2XsIc6zCDbhbbstYlyjDpXQsOPUzjaJqJBk="; + vendorSha256 = "sha256-ilq1sfFY6WuNACryDGjkpF5eUTan8Y6Yt26vot9XR54="; meta = with lib; { description = "A TUI for Mastodon with vim inspired keys"; 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 a2f6d93f4d..3ed40359ed 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 @@ -19,9 +19,9 @@ } }, "beta": { - "version": "104.0.5112.39", - "sha256": "0xgw1n5lcqqbs0b8bpd05f1z0q2lpajg2dxangd1yfl7y16yfxv9", - "sha256bin64": "0abprih2sh483cqv9rqs67ha3cm9744h3gdc342lgqj3x8bmspmj", + "version": "104.0.5112.48", + "sha256": "1zk4ywphcy6nrv0yf38yhl2bcq6fk34makglx31aalf2nhhw945i", + "sha256bin64": "14cx0m6jak4cma62axli0l4gqzqqh4gs7gam2dfahmwxsgcdwwn7", "deps": { "gn": { "version": "2022-06-08", @@ -32,15 +32,15 @@ } }, "dev": { - "version": "105.0.5148.2", - "sha256": "0qnkpda0chsxgfby5g38xmpkilyz2v12mrwlayfsp2iqhc7d07vz", - "sha256bin64": "045czwsra17iclgyzsnbbjr55lrmhzf97c2k0wwjrmd59cx4b1sa", + "version": "105.0.5176.3", + "sha256": "11zdihvy1n7d3vfl88477ppbfjd3mmkdsj4pfmfqm4mpw7zgi7fy", + "sha256bin64": "08rhg2am01dbb15djh7200wsg0wb48na09i706035wnnf0d8z313", "deps": { "gn": { - "version": "2022-06-22", + "version": "2022-07-11", "url": "https://gn.googlesource.com/gn", - "rev": "29accf5ac2eadfc53e687081583b7bc1592a8839", - "sha256": "0z9gaw8p88yhb7fi844pvylsbgjy3ni7bnca1yx37928fjw3ppln" + "rev": "9ef321772ecc161937db69acb346397e0ccc484d", + "sha256": "0j85kgf8c1psys6kfsq5mph8n80hcbzhr7d2blqiiysmjj0wc6ng" } } }, 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 042e3e661d..766e6bfe5f 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 @@ -87,7 +87,7 @@ let fteLibPath = makeLibraryPath [ stdenv.cc.cc gmp ]; # Upstream source - version = "11.0.15"; + version = "11.5"; lang = "en-US"; @@ -98,7 +98,7 @@ let "https://tor.eff.org/dist/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz" "https://tor.calyxinstitute.org/dist/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz" ]; - sha256 = "1gv44bi3gfg5z46fvs9wy46fgvfshad5kbxl43x3x4r70ps1nc3l"; + sha256 = "sha256-Itag51LOYmxDrpDxafHXv0L+zMB6bs3dEdIIddd82cI="; }; i686-linux = fetchurl { @@ -107,7 +107,7 @@ let "https://tor.eff.org/dist/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz" "https://tor.calyxinstitute.org/dist/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz" ]; - sha256 = "109291wwcy63k8hs23kx8vffpj4zvywdpy8srwaq367l0ffvfqn2"; + sha256 = "sha256-U0cTWusoRKM9VWZiOfoIU3dhKvR21OatoVvhHMDE9oo="; }; }; in diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/helm/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/helm/default.nix index e62e7c9998..c89cbc27db 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/helm/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/helm/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "kubernetes-helm"; - version = "3.9.0"; - gitCommit = "7ceeda6c585217a19a1131663d8cd1f7d641b2a7"; + version = "3.9.1"; + gitCommit = "a7c043acb5ff905c261cfdc923a35776ba5e66e4"; src = fetchFromGitHub { owner = "helm"; repo = "helm"; rev = "v${version}"; - sha256 = "sha256-pdWFCepVGSJmlYnvcJCaNaGSllbeh/oCdosrab8jA4s="; + sha256 = "sha256-bhd8SyxiJ/8XrZpVwqvHSRe5gvE2VVEwmvUbVPsSC/4="; }; - vendorSha256 = "sha256-r0a38ZB6VlyzKB66+OAllRLXhqwO0qbksZjOrBWdjqM="; + vendorSha256 = "sha256-v6jY90ht1S1tmO/Z9VGWDOz4zOSF0G77NSIqwAsktFo="; subPackages = [ "cmd/helm" ]; ldflags = [ diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/helmfile/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/helmfile/default.nix index 14cb38d60c..2a9b047723 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/helmfile/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/helmfile/default.nix @@ -1,27 +1,39 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub, installShellFiles }: buildGoModule rec { pname = "helmfile"; - version = "0.144.0"; + version = "0.145.2"; src = fetchFromGitHub { - owner = "roboll"; + owner = "helmfile"; repo = "helmfile"; rev = "v${version}"; - sha256 = "sha256-mfRPrgnOXqfmbpvaIxJNkgkdTEJKcFycrgFmQ7YDvTU="; + sha256 = "sha256-ipGMGby7qUoFJNc+7+Gq+JaBUdxm19NwhklWsTpslVI="; }; - vendorSha256 = "sha256-ddf3m0DGsjubzp/aERvhfJ51UKKSNMC1Xu7ybyif8HA="; + vendorSha256 = "sha256-031Xdr3u35uirDBZhExdh8PMAZa1gfMTC2II8VMbr6Q="; doCheck = false; subPackages = [ "." ]; - ldflags = [ "-s" "-w" "-X github.com/roboll/helmfile/pkg/app/version.Version=${version}" ]; + ldflags = [ "-s" "-w" "-X github.com/helmfile/helmfile/pkg/app/version.Version=${version}" ]; + + nativeBuildInputs = [ installShellFiles ]; + + postInstall = '' + installShellCompletion --cmd helmfile \ + --bash ./autocomplete/helmfile_bash_autocomplete \ + --zsh ./autocomplete/helmfile_zsh_autocomplete + ''; meta = { - description = "Deploy Kubernetes Helm charts"; - homepage = "https://github.com/roboll/helmfile"; + description = "Declarative spec for deploying Helm charts"; + longDescription = '' + Declaratively deploy your Kubernetes manifests, Kustomize configs, + and charts as Helm releases in one shot. + ''; + homepage = "https://helmfile.readthedocs.io/"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ pneumaticat yurrriq ]; platforms = lib.platforms.unix; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/krane/Gemfile.lock b/third_party/nixpkgs/pkgs/applications/networking/cluster/krane/Gemfile.lock index e886f40c8a..fa2cdb980d 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/krane/Gemfile.lock +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/krane/Gemfile.lock @@ -29,8 +29,8 @@ GEM faraday-em_synchrony (1.0.0) faraday-excon (1.1.0) faraday-httpclient (1.0.1) - faraday-multipart (1.0.3) - multipart-post (>= 1.2, < 3) + faraday-multipart (1.0.4) + multipart-post (~> 2) faraday-net_http (1.0.1) faraday-net_http_persistent (1.2.0) faraday-patron (1.0.0) @@ -53,17 +53,17 @@ GEM http-form_data (~> 2.2) http-parser (~> 1.2.0) http-accept (1.7.0) - http-cookie (1.0.4) + http-cookie (1.0.5) domain_name (~> 0.5) http-form_data (2.3.0) http-parser (1.2.3) ffi-compiler (>= 1.0, < 2.0) - i18n (1.10.0) + i18n (1.11.0) concurrent-ruby (~> 1.0) jsonpath (1.1.2) multi_json - jwt (2.3.0) - krane (2.4.6) + jwt (2.4.1) + krane (2.4.7) activesupport (>= 5.0) colorize (~> 0.8) concurrent-ruby (~> 1.1) @@ -83,11 +83,11 @@ GEM mime-types (3.4.1) mime-types-data (~> 3.2015) mime-types-data (3.2022.0105) - minitest (5.15.0) + minitest (5.16.2) multi_json (1.15.0) - multipart-post (2.1.1) + multipart-post (2.2.3) netrc (0.11.0) - oj (3.13.11) + oj (3.13.16) os (1.1.4) public_suffix (4.0.7) rake (13.0.6) @@ -98,18 +98,18 @@ GEM mime-types (>= 1.16, < 4.0) netrc (~> 0.8) ruby2_keywords (0.0.5) - signet (0.16.1) + signet (0.17.0) addressable (~> 2.8) - faraday (>= 0.17.5, < 3.0) + faraday (>= 0.17.5, < 3.a) jwt (>= 1.5, < 3.0) multi_json (~> 1.10) - statsd-instrument (3.1.2) + statsd-instrument (3.2.1) thor (1.2.1) tzinfo (2.0.4) concurrent-ruby (~> 1.0) unf (0.1.4) unf_ext - unf_ext (0.0.8.1) + unf_ext (0.0.8.2) PLATFORMS ruby diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/krane/gemset.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/krane/gemset.nix index 3c18789c09..d29904200c 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/krane/gemset.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/krane/gemset.nix @@ -119,10 +119,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "03qfi9020ynf7hkdiaq01sd2mllvw7fg4qiin3pk028b4wv23j3j"; + sha256 = "09871c4hd7s5ws1wl4gs7js1k2wlby6v947m2bbzg43pnld044lh"; type = "gem"; }; - version = "1.0.3"; + version = "1.0.4"; }; faraday-net_http = { groups = ["default"]; @@ -233,10 +233,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "19370bc97gsy2j4hanij246hv1ddc85hw0xjb6sj7n1ykqdlx9l9"; + sha256 = "13rilvlv8kwbzqfb644qp6hrbsj82cbqmnzcvqip1p6vqx36sxbk"; type = "gem"; }; - version = "1.0.4"; + version = "1.0.5"; }; http-form_data = { groups = ["default"]; @@ -265,10 +265,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0b2qyvnk4yynlg17ymkq4g5xgr275637fhl1mjh0valw3cb1fhhg"; + sha256 = "1g0g9qaarwn9ga8889r7lnaybygvd2a2dp4ilc73g4rsxxcrgy0x"; type = "gem"; }; - version = "1.10.0"; + version = "1.11.0"; }; jsonpath = { dependencies = ["multi_json"]; @@ -286,10 +286,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0bg8pjx0mpvl10k6d8a6gc8dzlv2z5jkqcjbjcirnk032iriq838"; + sha256 = "1lsk71qh5d7bm1qqrjvcwhp4h71ckkdbzxnw4xkd9cin8gjfvvr6"; type = "gem"; }; - version = "2.3.0"; + version = "2.4.1"; }; krane = { dependencies = ["activesupport" "colorize" "concurrent-ruby" "ejson" "googleauth" "jsonpath" "kubeclient" "oj" "statsd-instrument" "thor"]; @@ -297,10 +297,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "16rf7qzwshlbhrc9fdgq44fcf2qbgjwik1kwkv1gncy12lvwfdmz"; + sha256 = "0hmsz359zkpw1spyxx22wijzjls22qsak6rbrlv1ybk3hhk13vjg"; type = "gem"; }; - version = "2.4.6"; + version = "2.4.7"; }; kubeclient = { dependencies = ["http" "jsonpath" "recursive-open-struct" "rest-client"]; @@ -349,10 +349,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "06xf558gid4w8lwx13jwfdafsch9maz8m0g85wnfymqj63x5nbbd"; + sha256 = "14a9ign0hj3z3j4cpfplj2djaskx3skzyx4fl3x53d7saxmhrgn1"; type = "gem"; }; - version = "5.15.0"; + version = "5.16.2"; }; multi_json = { groups = ["default"]; @@ -369,10 +369,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1zgw9zlwh2a6i1yvhhc4a84ry1hv824d6g2iw2chs3k5aylpmpfj"; + sha256 = "1n0kvnrcrjn31jb97kcx3wj1f5kkjza7yygfq8rxzf3i57g7jaa6"; type = "gem"; }; - version = "2.1.1"; + version = "2.2.3"; }; netrc = { groups = ["default"]; @@ -389,10 +389,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0bm8sdh7vz7ss3y21v961rd8nww23w5g4yhgvnd7jk331kdjyyzl"; + sha256 = "1i8yrwnf5mzixl8a4h3cfx93gkzcs7q6grpyv0zng1vga9cmk28n"; type = "gem"; }; - version = "3.13.11"; + version = "3.13.16"; }; os = { groups = ["default"]; @@ -461,20 +461,20 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1jwyggz80xb3yi2hycmmw214c4072g8i56y0b0gsmpkiyk5d0vh1"; + sha256 = "0100rclkhagf032rg3r0gf3f4znrvvvqrimy6hpa73f21n9k2a0x"; type = "gem"; }; - version = "0.16.1"; + version = "0.17.0"; }; statsd-instrument = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1q98rkmgrzb59zmswhr6863z6dk042i90jbp9pflwa2vy2xkfj0y"; + sha256 = "0653pjqln9r52nfkcjna0wf4q9ws114pz29wav2nlf18v8jazqbf"; type = "gem"; }; - version = "3.1.2"; + version = "3.2.1"; }; thor = { groups = ["default"]; @@ -513,9 +513,9 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0bf120xbq23zjyf8zi8h1576d71g58srr8rndig0whn10w72vrxz"; + sha256 = "1yj2nz2l101vr1x9w2k83a0fag1xgnmjwp8w8rw4ik2rwcz65fch"; type = "gem"; }; - version = "0.0.8.1"; + version = "0.0.8.2"; }; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/kubectl-node-shell/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/kubectl-node-shell/default.nix new file mode 100644 index 0000000000..031fa0c21b --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/kubectl-node-shell/default.nix @@ -0,0 +1,32 @@ +{ stdenvNoCC, lib, fetchFromGitHub, bash }: + +stdenvNoCC.mkDerivation rec { + pname = "kubectl-node-shell"; + version = "1.6.0"; + + src = fetchFromGitHub { + owner = "kvaps"; + repo = "kubectl-node-shell"; + rev = "v${version}"; + sha256 = "sha256-dAsNgvHgquXdb2HhLDYLk9IALneKkOxQxKb7BD90+1E="; + }; + + strictDeps = true; + buildInputs = [ bash ]; + + installPhase = '' + runHook preInstall + + install -m755 ./kubectl-node_shell -D $out/bin/kubectl-node_shell + + runHook postInstall + ''; + + meta = with lib; { + description = "Exec into node via kubectl"; + homepage = "https://github.com/kvaps/kubectl-node-shell"; + license = licenses.asl20; + maintainers = with maintainers; [ jocelynthode ]; + platforms = platforms.linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/nomad/1.2.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/nomad/1.2.nix index 5df8752844..5a35a9493e 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/nomad/1.2.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/nomad/1.2.nix @@ -4,7 +4,7 @@ callPackage ./generic.nix { inherit buildGoModule; - version = "1.2.8"; - sha256 = "11yn8g9wsdb35q97wn5vy93kgbn5462k0a33wxlfdz14i5h00yj8"; - vendorSha256 = "06wyfnlm37qjvd1pwzygflfpcp9p52f61wgi6pb9l7hnqy2ph6j5"; + version = "1.2.9"; + sha256 = "05pd4y5aq91ac73447aqr0pk56rx5qhqzzp5cw4w06yh5iry0bmn"; + vendorSha256 = "08nqqd3dz8bzxnh729kckvg59wnvmixmsh8g74nlxk90gq07zsn4"; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/nomad/1.3.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/nomad/1.3.nix index 0145a5b109..2ab2cf9963 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/nomad/1.3.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/nomad/1.3.nix @@ -4,7 +4,7 @@ callPackage ./generic.nix { inherit buildGoModule; - version = "1.3.1"; - sha256 = "03ckhqh5xznvhbk380ka0g9w9hrvsi389h5maw68f3g3acx68jm7"; - vendorSha256 = "08k5dxaq4r2q0km6y9mc14haski6l7hmhmzn5wjb961hwf5hkfgh"; + version = "1.3.2"; + sha256 = "0vrcdm0xjimi5z1j180wigf4gd806w73jxvrzclv2d2pr7pab6qq"; + vendorSha256 = "139bzvaw0nyl0whvs74m2hj2xww08zfd615wkn2y10c8f5h69arj"; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/talosctl/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/talosctl/default.nix index 42d451bd44..5f6c61417a 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/talosctl/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/talosctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "talosctl"; - version = "1.1.0"; + version = "1.1.1"; src = fetchFromGitHub { owner = "siderolabs"; repo = "talos"; rev = "v${version}"; - sha256 = "sha256-52WzQ5LWgIX/XBJPNvWV0tAPnw1AiINDL/7D3UYvvn4="; + sha256 = "sha256-pCdcgQC6oihHKyrq9MkJr0c3EErPrMImNsk+TX9Z5GA="; }; - vendorSha256 = "sha256-iluI4UGw5cZ70wmC9jDiGttvxZ7xFyqcL9IZX4ubJqs="; + vendorSha256 = "sha256-BhLksvv5j3fSqHj7gY+aWPN9Uni7/B5/ltIAMJ/ljEE="; ldflags = [ "-s" "-w" ]; @@ -35,8 +35,5 @@ buildGoModule rec { homepage = "https://www.talos.dev/"; license = licenses.mpl20; maintainers = with maintainers; [ flokli ]; - # requires >= 10.14 SDK https://github.com/NixOS/nixpkgs/issues/101229 - # Undefined symbols for architecture x86_64: "_SecTrustEvaluateWithError" - broken = stdenv.isDarwin && stdenv.isx86_64; }; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/default.nix index e89af8de6b..364a7d6605 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/default.nix @@ -59,10 +59,6 @@ let # These are the providers that don't fall in line with the default model special-providers = { - # go-module vendor fails with 1.18 - buildkite = automated-providers.buildkite.override { mkProviderGoModule = buildGo117Module; }; - # go-module vendor fails with 1.18 - checkly = automated-providers.checkly.override { mkProviderGoModule = buildGo117Module; }; # mkisofs needed to create ISOs holding cloud-init data and wrapped to terraform via deecb4c1aab780047d79978c636eeb879dd68630 libvirt = automated-providers.libvirt.overrideAttrs (_: { propagatedBuildInputs = [ cdrtools ]; }); # fails to build on x86_64-darwin with 1.18 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 e7a2bf6918..cd8cf81c90 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 @@ -30,10 +30,10 @@ "owner": "aiven", "provider-source-address": "registry.terraform.io/aiven/aiven", "repo": "terraform-provider-aiven", - "rev": "v3.2.1", - "sha256": "sha256-XEosTsTMrJM4WYizjbT5Rv8dkrOssnxXNV1K92OpmEk=", - "vendorSha256": "sha256-k6pKet1YdQYCyFICw67nKI3RGNZ4b+zA+T9jpa2ZLFM=", - "version": "3.2.1" + "rev": "v3.3.1", + "sha256": "sha256-bp3qwz6HJGiJ/R5LKkT6Rr86lsAiKbcGcuKLZvklwEs=", + "vendorSha256": "sha256-EMBcnCXtGJk9eSe3TkDZobn2fSJS8KxHCinybLUBGYU=", + "version": "3.3.1" }, "akamai": { "owner": "akamai", @@ -49,10 +49,10 @@ "owner": "aliyun", "provider-source-address": "registry.terraform.io/aliyun/alicloud", "repo": "terraform-provider-alicloud", - "rev": "v1.174.0", - "sha256": "sha256-sdfdc2QOuEmfB0f7A15GZAGY82L9e54DqDXZ7FM6Avg=", + "rev": "v1.176.0", + "sha256": "sha256-YMcB1CdnXdYHBUdghFP/4BHCtWfOSzPXMD+VZp49VY0=", "vendorSha256": "sha256-6FiVXy/q3WImYDbwvj9e3ns9gilaL6GBW5qCpaUNCW0=", - "version": "1.174.0" + "version": "1.176.0" }, "ansible": { "owner": "nbering", @@ -76,10 +76,10 @@ "owner": "auth0", "provider-source-address": "registry.terraform.io/auth0/auth0", "repo": "terraform-provider-auth0", - "rev": "v0.32.0", - "sha256": "sha256-zy5brS1KsQM8JZahcmIsBdUS389OoQ53d4OGHpF6zwo=", - "vendorSha256": "sha256-xQEgoYPXt3ivgOMk+yQMS0SlPhDJ5qCVsI12LMU6ZcI=", - "version": "0.32.0" + "rev": "v0.33.0", + "sha256": "sha256-yAt2uBrkHS6TalHArSikRxTo8s0g/PoNoPBS/d/iWzY=", + "vendorSha256": "sha256-HJtG2sCQpY9rTSwHj2PjSiF8236VLufF9B9TyubGD/Q=", + "version": "0.33.0" }, "avi": { "owner": "vmware", @@ -112,47 +112,46 @@ "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/azuread", "repo": "terraform-provider-azuread", - "rev": "v2.26.0", - "sha256": "sha256-M61kkeBRLb0fDPH1FZH5koFRZqCVfTlEXJ8N0Amc8ac=", + "rev": "v2.26.1", + "sha256": "sha256-9S+J0z9ilRqfpZv3aZe6Fv1Jyo2ShRQzeoMuRsDBiUo=", "vendorSha256": null, - "version": "2.26.0" + "version": "2.26.1" }, "azurerm": { "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/azurerm", "repo": "terraform-provider-azurerm", - "rev": "v3.13.0", - "sha256": "sha256-ptEsCgJsB++RYtc+SekUPoV9ONRfGCCoPGM6alwQ/wY=", + "rev": "v3.14.0", + "sha256": "sha256-/lE+PuljWG57d3tSiNo0ED4Cj2fJbyDsWNqdYcl1vS4=", "vendorSha256": null, - "version": "3.13.0" + "version": "3.14.0" }, "azurestack": { "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/azurestack", "repo": "terraform-provider-azurestack", - "rev": "v0.10.0", - "sha256": "sha256-iJUWZMN4XxK6ATwoXyXnYxqdY7YCcwOmjTbQYc3NnFE=", + "rev": "v1.0.0", + "sha256": "sha256-aSwVa7y1AJ6sExx+bO/93oLBNgSBDJjuPYPY8i3C9T0=", "vendorSha256": null, - "version": "0.10.0" + "version": "1.0.0" }, "baiducloud": { - "deleteVendor": true, "owner": "baidubce", "provider-source-address": "registry.terraform.io/baidubce/baiducloud", "repo": "terraform-provider-baiducloud", - "rev": "v1.13.0", - "sha256": "sha256-C/dvFwtqOJAXgk5CNr06cehOiVZ2c4Zcqcb+g/k0iPY=", - "vendorSha256": "sha256-GZZKJkK9ug6iUhaAXxR2nKfQQ96MHiYv/hsaB5O9Oig=", - "version": "1.13.0" + "rev": "v1.14.0", + "sha256": "sha256-D0Yddg4kC+NtBVeCzBA/0Aa4rl6xpGhyA5HdEKiJcX0=", + "vendorSha256": null, + "version": "1.14.0" }, "bigip": { "owner": "F5Networks", "provider-source-address": "registry.terraform.io/F5Networks/bigip", "repo": "terraform-provider-bigip", - "rev": "v1.14.0", - "sha256": "sha256-Z3YqiKGlMrn55ZZsRjuvKAFRNW1G2D2Iczlk42yHk34=", + "rev": "v1.15.0", + "sha256": "sha256-AjAXZzTTyizeR/SO8MolaL2TdogAA/ydeaGd3pf5CYo=", "vendorSha256": null, - "version": "1.14.0" + "version": "1.15.0" }, "bitbucket": { "owner": "DrFaust92", @@ -175,19 +174,21 @@ "buildkite": { "owner": "buildkite", "provider-source-address": "registry.terraform.io/buildkite/buildkite", + "proxyVendor": true, "repo": "terraform-provider-buildkite", "rev": "v0.11.0", "sha256": "sha256-BpQpMAecpknI8b1q6XuZPty8I/AUTAwQWm5Y28XJ+G4=", - "vendorSha256": "sha256-smBADIbH/t2IUt2w0VQ2BOU6iAuxVRa1yu4C5P2VeIo=", + "vendorSha256": "sha256-j56iEtoyKzB8oIMptJDbXCKXOC1L5v1+cpwWU1+uARE=", "version": "0.11.0" }, "checkly": { "owner": "checkly", "provider-source-address": "registry.terraform.io/checkly/checkly", + "proxyVendor": true, "repo": "terraform-provider-checkly", "rev": "v1.6.1", "sha256": "sha256-vzYOieW4KdYcaPSSa6j57GsPAAIdwmWu5hIBCCmnstM=", - "vendorSha256": "sha256-VnYRDBneQ+bUzISJM9DJdBEBmjA1WOXPo+kaYBW4w4U=", + "vendorSha256": "sha256-XErR45BMWgAzeLU20CDd2j5tsokkoOMQhUar2ZsU5+0=", "version": "1.6.1" }, "checkpoint": { @@ -222,10 +223,10 @@ "owner": "cloudflare", "provider-source-address": "registry.terraform.io/cloudflare/cloudflare", "repo": "terraform-provider-cloudflare", - "rev": "v3.18.0", - "sha256": "sha256-xmAy4xYpgn1hOIX1qNXIBQUGgeoaGVU8SOC8wos93kQ=", - "vendorSha256": "sha256-uvgghtPjFrzGGlrJod8VZb4DylPZT0P1BIiD5SFBifc=", - "version": "3.18.0" + "rev": "v3.19.0", + "sha256": "sha256-OgB4FhuEJJFbciOyUX2NAJnZP1aCFhTPRvYC0uylm5M=", + "vendorSha256": "sha256-EsFLZlgZGZBLgcl5mqeRycOB1jqFkBENeO+lFgSgXeA=", + "version": "3.19.0" }, "cloudfoundry": { "owner": "cloudfoundry-community", @@ -286,10 +287,10 @@ "owner": "DataDog", "provider-source-address": "registry.terraform.io/DataDog/datadog", "repo": "terraform-provider-datadog", - "rev": "v3.12.0", - "sha256": "sha256-17VtO+dHYMVvbG8cOVRx5qKPvmOoUGkNUl4aHrdsemQ=", - "vendorSha256": "sha256-Od80m/RsxUQpyalF4jN1Hv6/+kVwYEmqeJyiTbEwC2g=", - "version": "3.12.0" + "rev": "v3.13.1", + "sha256": "sha256-Xwkf8qjobnTD/dANWbi7cPHJmaPkvn80CMO39Jog6Lk=", + "vendorSha256": "sha256-X+zfXao9k9coOvebybYK/zJ4sTm6fu831PpFST+DuQY=", + "version": "3.13.1" }, "dhall": { "owner": "awakesecurity", @@ -340,10 +341,10 @@ "owner": "kreuzwerker", "provider-source-address": "registry.terraform.io/kreuzwerker/docker", "repo": "terraform-provider-docker", - "rev": "v2.17.0", - "sha256": "sha256-V+FuDhgih/hTpyuT13INY5vWIaNS/7Z8RlK15mR+CnE=", - "vendorSha256": "sha256-nTulwft8xfpE83ZLJvG7xllQJIqd2M0zzbqpfD3/Mno=", - "version": "2.17.0" + "rev": "v2.19.0", + "sha256": "sha256-hzIGA8RCDoISJwq6RyQZDqj7CfWsgPkYMv8Yhf/KEKQ=", + "vendorSha256": "sha256-Wzd0TsOtiEyVIneQd6JfhdNzDP6Z3T96C5wtr/GCW/M=", + "version": "2.19.0" }, "dome9": { "owner": "dome9", @@ -367,10 +368,10 @@ "owner": "equinix", "provider-source-address": "registry.terraform.io/equinix/equinix", "repo": "terraform-provider-equinix", - "rev": "v1.6.1", - "sha256": "sha256-QktIBtSz7UZoU6+z/sjpU4bZhc+Cw1BptO6hW19uJoU=", - "vendorSha256": "sha256-G1lDfygJnuJaQ4ms2/R6oynZCJAtIwx7xoU6Bec3CfQ=", - "version": "1.6.1" + "rev": "v1.7.0", + "sha256": "sha256-H2cvJMtZnJFk3snohEcxS++xzsc45TWBZquWRe3vseM=", + "vendorSha256": "sha256-oANCzm5HSxs5vTiu1kIGJQcwAvNg84G9qXnoBge9fAs=", + "version": "1.7.0" }, "exoscale": { "owner": "exoscale", @@ -430,39 +431,39 @@ "owner": "integrations", "provider-source-address": "registry.terraform.io/integrations/github", "repo": "terraform-provider-github", - "rev": "v4.26.1", - "sha256": "sha256-cfHv8QCx3OCnrXbj/B19bUSg/w4zuIphn6IdNYwGbLU=", + "rev": "v4.27.0", + "sha256": "sha256-cQMkBhXvD5sO9obHGH64GcDg6v5X5qs9QHwjyBNkRww=", "vendorSha256": null, - "version": "4.26.1" + "version": "4.27.0" }, "gitlab": { "owner": "gitlabhq", "provider-source-address": "registry.terraform.io/gitlabhq/gitlab", "repo": "terraform-provider-gitlab", - "rev": "v3.16.0", - "sha256": "sha256-RG1d0B6SdT3c9zIHtOZUZBHOdi7azc9uJe0aDdY5c/U=", + "rev": "v3.16.1", + "sha256": "sha256-sPcgnlczDc0YoNnFgCd0uETLgEhP5n5Al59HtIGGdf4=", "vendorSha256": "sha256-5OXllLq5VjFpay2vVEXczqvSmgLeAQ66fXqYf+eDJOI=", - "version": "3.16.0" + "version": "3.16.1" }, "google": { "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/google", "proxyVendor": true, "repo": "terraform-provider-google", - "rev": "v4.27.0", - "sha256": "sha256-YI6lMHKuREzMf1gkFuBbllSjZcpi0oxZSRoXN7IgkDQ=", + "rev": "v4.28.0", + "sha256": "sha256-Dy0T5/G8vzaE688o/lb4H3ccE0mGnTRDQHIxcvs1C9k=", "vendorSha256": "sha256-c836amEF3krq1ERNZGTUgQ6nzPUKg8GiJ2RkDmcVPNk=", - "version": "4.27.0" + "version": "4.28.0" }, "google-beta": { "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/google-beta", "proxyVendor": true, "repo": "terraform-provider-google-beta", - "rev": "v4.27.0", - "sha256": "sha256-vntZXROQUgiUYUxiDi/WFDNoUPCTw02fKQzF9bcx5cM=", + "rev": "v4.28.0", + "sha256": "sha256-faYPwFcusDVM1TM5I9sgpUBER8TB2ltaTryyDvLQz9g=", "vendorSha256": "sha256-c836amEF3krq1ERNZGTUgQ6nzPUKg8GiJ2RkDmcVPNk=", - "version": "4.27.0" + "version": "4.28.0" }, "googleworkspace": { "owner": "hashicorp", @@ -549,10 +550,10 @@ "owner": "huaweicloud", "provider-source-address": "registry.terraform.io/huaweicloud/huaweicloud", "repo": "terraform-provider-huaweicloud", - "rev": "v1.38.0", - "sha256": "sha256-kLjuZY9PoGjt2e3jBX0O1VTis2P8++pHWJXLnwltk1I=", + "rev": "v1.38.1", + "sha256": "sha256-8NvrHfHFHmEDt5coyVxHNG+WZDCcGc7cKscTU1bwKHM=", "vendorSha256": null, - "version": "1.38.0" + "version": "1.38.1" }, "huaweicloudstack": { "owner": "huaweicloud", @@ -621,10 +622,10 @@ "owner": "mrparkers", "provider-source-address": "registry.terraform.io/mrparkers/keycloak", "repo": "terraform-provider-keycloak", - "rev": "v3.9.0", - "sha256": "sha256-MdsOZptj46RuvLK6wZJL3va8kMSzqxaS4wGEUpgky7Q=", + "rev": "v3.9.1", + "sha256": "sha256-+VRVYJDCTcqlB+rfNLVZyBaA6GBNOibWMZAcePRF7Ro=", "vendorSha256": "sha256-8x0MlwAzeA2O6wXXHSk++K0ePmzE9/2lfo2ID83LzRM=", - "version": "3.9.0" + "version": "3.9.1" }, "ksyun": { "owner": "kingsoftcloud", @@ -755,11 +756,12 @@ "mongodbatlas": { "owner": "mongodb", "provider-source-address": "registry.terraform.io/mongodb/mongodbatlas", + "proxyVendor": true, "repo": "terraform-provider-mongodbatlas", - "rev": "v1.4.2", - "sha256": "sha256-bu/DpqeOIIgtUauBVzbKW+DHJUoD2oVhIhmk+M7fcBg=", - "vendorSha256": "sha256-yomqc0uxB02zi/IfZKIOBq3mcs0GkHbRpaQos0jcELw=", - "version": "1.4.2" + "rev": "v1.4.3", + "sha256": "sha256-0Fwu9fnPVydiQ/A4ebmMcFDyZCc7JxPxqzILIFoYZ4A=", + "vendorSha256": "sha256-s55ErNhQ5Yw8a8R+a1ratSkBdwe9NMhtWAsEy/jEjr8=", + "version": "1.4.3" }, "namecheap": { "owner": "namecheap", @@ -792,10 +794,10 @@ "owner": "newrelic", "provider-source-address": "registry.terraform.io/newrelic/newrelic", "repo": "terraform-provider-newrelic", - "rev": "v2.48.1", - "sha256": "sha256-MySfZw6Og1gJs11u9r88uF1gcJbgsnPzduJZmr+06Jg=", - "vendorSha256": "sha256-/hkQ9SIsJhTfG0YEhTa+RGlZD4wHl5grFggbkgvHFGI=", - "version": "2.48.1" + "rev": "v2.48.2", + "sha256": "sha256-iLgc9nkeQIElVvu7+Pw5yZyzsx3VovCKOoJMIPigBGo=", + "vendorSha256": "sha256-ch+xeSTIu1zkbPN/zq3BKywNLt6ip1HxYCvSmU+0+mI=", + "version": "2.48.2" }, "nomad": { "owner": "hashicorp", @@ -847,10 +849,10 @@ "owner": "oracle", "provider-source-address": "registry.terraform.io/oracle/oci", "repo": "terraform-provider-oci", - "rev": "v4.83.0", - "sha256": "sha256-WuvWE3k2j1whH7UaEx7fa4lZF+GZUKp7T1bVpatxF1w=", + "rev": "v4.84.0", + "sha256": "sha256-fLWA7SPoCzO2TZkxnUw5K07OCAQYd+X5BMnHeIdAEdA=", "vendorSha256": null, - "version": "4.83.0" + "version": "4.84.0" }, "okta": { "owner": "okta", @@ -892,10 +894,10 @@ "owner": "opentelekomcloud", "provider-source-address": "registry.terraform.io/opentelekomcloud/opentelekomcloud", "repo": "terraform-provider-opentelekomcloud", - "rev": "v1.29.9", - "sha256": "sha256-jVDpiNGGw93XLAMYaDrO3mEcok3bnzC4y9tz6C27lhM=", - "vendorSha256": "sha256-ImrWG+IPNkFr9lTGdiYaBU2OnHrKXIiNIDGSy4Br+Aw=", - "version": "1.29.9" + "rev": "v1.30.0", + "sha256": "sha256-goXQlsOw/nE4d+9VXfqr1yhf/DEOtlVdIS2QJ2s4+8M=", + "vendorSha256": "sha256-0QKYpjA9iv8dSOZ5mIqJ/hpQxlgd+5Y/txBDa0Gsqqc=", + "version": "1.30.0" }, "opsgenie": { "owner": "opsgenie", @@ -919,10 +921,10 @@ "owner": "PagerDuty", "provider-source-address": "registry.terraform.io/PagerDuty/pagerduty", "repo": "terraform-provider-pagerduty", - "rev": "v2.5.1", - "sha256": "sha256-BcPfV+2izOiEk0hEuZOFDkQKPSXWzZ1skwu/moeKTD8=", + "rev": "v2.5.2", + "sha256": "sha256-2+GFn8LO/PUFuYzzvSIcKXdJ++SAuo7Mfh2GkGyksTE=", "vendorSha256": null, - "version": "2.5.1" + "version": "2.5.2" }, "panos": { "owner": "PaloAltoNetworks", @@ -1072,10 +1074,10 @@ "owner": "Snowflake-Labs", "provider-source-address": "registry.terraform.io/Snowflake-Labs/snowflake", "repo": "terraform-provider-snowflake", - "rev": "v0.37.1", - "sha256": "sha256-2nCl//1s1M/XmoJLMyZJXgUr1ilE0V9RyEGfQuw/h6g=", + "rev": "v0.39.0", + "sha256": "sha256-I15vLcZtVPs/37vRuJk5qiiWxNXY561gpWkOLw4ZN6w=", "vendorSha256": "sha256-I0d7Nm8h7vBHxvcyTousg7Uc+QuYu8FCPabPNMw8rGM=", - "version": "0.37.1" + "version": "0.39.0" }, "sops": { "owner": "carlpett", @@ -1126,10 +1128,10 @@ "owner": "tencentcloudstack", "provider-source-address": "registry.terraform.io/tencentcloudstack/tencentcloud", "repo": "terraform-provider-tencentcloud", - "rev": "v1.75.7", - "sha256": "sha256-FSdBAaG1xrr0Jnl7wPsaooraerlqKti5uskZyixkbSY=", + "rev": "v1.76.0", + "sha256": "sha256-Qfe2j6y2qn1GVtsv9+Sy7r9tmPMuAkkNNsOqno2nCx8=", "vendorSha256": null, - "version": "1.75.7" + "version": "1.76.0" }, "tfe": { "owner": "hashicorp", @@ -1181,10 +1183,10 @@ "owner": "turbot", "provider-source-address": "registry.terraform.io/turbot/turbot", "repo": "terraform-provider-turbot", - "rev": "v1.8.3", - "sha256": "sha256-6WPQjUJW5gTxJiXpNg5zyhlNxMuoLIs3ku/UpQk/o0s=", + "rev": "v1.9.1", + "sha256": "sha256-x27daeW4M5/7sUtFcMeJMVBO5TPRXSLuFoREdgJ2J6g=", "vendorSha256": null, - "version": "1.8.3" + "version": "1.9.1" }, "ucloud": { "owner": "ucloud", @@ -1199,10 +1201,10 @@ "owner": "cloudposse", "provider-source-address": "registry.terraform.io/cloudposse/utils", "repo": "terraform-provider-utils", - "rev": "0.17.26", - "sha256": "sha256-Lfl5BIFJNR8tDHjGJvA8AzteE+XcjkVRqTqmcDGZJCw=", - "vendorSha256": "sha256-BZNWM1ICaMl3q98WyTYs5JHxBBMj5TVpa5w5lH06XPg=", - "version": "0.17.26" + "rev": "0.17.27", + "sha256": "sha256-FE2G0EOjI4D9HzH05eiwTHc4ZN+5NfcJXYoMUZN+OWM=", + "vendorSha256": "sha256-/ZxmvsKTteAvl9NoCyxSQk4llDsGZmZTZxEIPlqXvY0=", + "version": "0.17.27" }, "vault": { "owner": "hashicorp", diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/terranix/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/terranix/default.nix index 98ce3c474f..2f6890b4c6 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/terranix/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/terranix/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "terranix"; - version = "2.5.3"; + version = "2.5.4"; src = fetchFromGitHub { owner = "mrVanDalo"; repo = "terranix"; rev = version; - sha256 = "sha256-Jhq0pkyF1KWJ6HgeWLoRfIxo7QHvOwwXzsIxZQgQtK4="; + sha256 = "sha256-zctvB0zpPY2C1HkMyEK6NFNuPVNGcU9b8gv9HafBd2A="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/tilt/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/tilt/default.nix index 21619683b3..1dd8361f20 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/tilt/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/tilt/default.nix @@ -24,13 +24,5 @@ buildGoModule rec { homepage = "https://tilt.dev/"; license = licenses.asl20; maintainers = with maintainers; [ anton-dessiatov ]; - - # TODO: Remove once nixpkgs uses macOS SDK 10.14+ for x86_64-darwin - # Undefined symbols for architecture x86_64: - # "_SecTrustEvaluateWithError", referenced from: - # _crypto/x509/internal/macos.x509_SecTrustEvaluateWithError_trampoline.abi0 in go.o - # "_utimensat", referenced from: - # _syscall.libc_utimensat_trampoline.abi0 in go.o - broken = stdenv.isDarwin && stdenv.isx86_64; }; } 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 d66d3380fc..6fb80f9504 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/werf/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/werf/default.nix @@ -10,16 +10,16 @@ buildGoModule rec { pname = "werf"; - version = "1.2.120"; + version = "1.2.124"; src = fetchFromGitHub { owner = "werf"; repo = "werf"; rev = "v${version}"; - sha256 = "sha256-Yy3nZGeEiolZawzvZCHM6vZje+eexbbsZN9lHJaDYwM="; + sha256 = "sha256-fdCFdsRMdH9xu2YIYt6r7BxqbdzrzUxLxB1k4WEnGIo="; }; - vendorSha256 = "sha256-OqDiq2+XysHhmw8oI1eyCL0358Ii0f0FyMLJ9JgyULc="; + vendorSha256 = "sha256-AbTlchqVD3TySrcHcF3/QfMhbkNg4A4oef9Qkn2v6xY="; proxyVendor = true; diff --git a/third_party/nixpkgs/pkgs/applications/networking/feedreaders/photon/default.nix b/third_party/nixpkgs/pkgs/applications/networking/feedreaders/photon/default.nix index 0a02c1db18..08df4af2db 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/feedreaders/photon/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/feedreaders/photon/default.nix @@ -15,7 +15,7 @@ buildGoModule rec { proxyVendor = true; - vendorSha256 = "sha256-1vlgnY4kZJfoAtbv+r8onxL03Ak32zKLJgtrBYZX09g="; + vendorSha256 = "sha256-n9XNqXIoqn+f0xKCenJWXUYXtQhtbNBar68onWH/WV4="; meta = with lib; { description = "RSS/Atom reader with the focus on speed, usability and a bit of unix philosophy"; diff --git a/third_party/nixpkgs/pkgs/applications/networking/flexget/default.nix b/third_party/nixpkgs/pkgs/applications/networking/flexget/default.nix index d8e4fbe492..3f27dd59b7 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/flexget/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/flexget/default.nix @@ -5,14 +5,14 @@ python3Packages.buildPythonApplication rec { pname = "flexget"; - version = "3.3.19"; + version = "3.3.21"; # Fetch from GitHub in order to use `requirements.in` src = fetchFromGitHub { owner = "flexget"; repo = "flexget"; rev = "refs/tags/v${version}"; - hash = "sha256-dt4XEGJGNq0njhuJBYA6xbyTx1jkrZlJ0Pl83Xjat6I="; + hash = "sha256-0XpToyy5Q3d2IpEMaeyhTri4xCBrI3Kmy5lMTqnAqC0="; }; postPatch = '' @@ -44,6 +44,7 @@ python3Packages.buildPythonApplication rec { jsonschema loguru more-itertools + packaging psutil pynzb PyRSS2Gen diff --git a/third_party/nixpkgs/pkgs/applications/networking/google-drive-ocamlfuse/default.nix b/third_party/nixpkgs/pkgs/applications/networking/google-drive-ocamlfuse/default.nix index 02df4313f7..eb677eb00d 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/google-drive-ocamlfuse/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/google-drive-ocamlfuse/default.nix @@ -1,5 +1,5 @@ { lib, buildDunePackage, fetchFromGitHub -, ocaml_extlib, ocamlfuse, gapi_ocaml, ocaml_sqlite3 +, ocaml_extlib, ocamlfuse, gapi-ocaml, ocaml_sqlite3 , tiny_httpd , ounit }: @@ -18,7 +18,7 @@ buildDunePackage rec { doCheck = true; checkInputs = [ ounit ]; - buildInputs = [ ocaml_extlib ocamlfuse gapi_ocaml ocaml_sqlite3 tiny_httpd ]; + buildInputs = [ ocaml_extlib ocamlfuse gapi-ocaml ocaml_sqlite3 tiny_httpd ]; meta = { inherit (src.meta) homepage; 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 87fad54f7b..f3af6d9e8b 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,50 +3,47 @@ let versions = if stdenv.isLinux then { stable = "0.0.18"; ptb = "0.0.29"; - canary = "0.0.135"; + canary = "0.0.136"; } else { stable = "0.0.264"; ptb = "0.0.59"; canary = "0.0.283"; }; version = versions.${branch}; - srcs = let - darwin-ptb = fetchurl { - url = "https://dl-ptb.discordapp.net/apps/osx/${version}/DiscordPTB.dmg"; - sha256 = "sha256-LS7KExVXkOv8O/GrisPMbBxg/pwoDXIOo1dK9wk1yB8="; - }; - in { + srcs = rec { x86_64-linux = { stable = fetchurl { - url = - "https://dl.discordapp.net/apps/linux/${version}/discord-${version}.tar.gz"; + url = "https://dl.discordapp.net/apps/linux/${version}/discord-${version}.tar.gz"; sha256 = "1hl01rf3l6kblx5v7rwnwms30iz8zw6dwlkjsx2f1iipljgkh5q4"; }; ptb = fetchurl { - url = - "https://dl-ptb.discordapp.net/apps/linux/${version}/discord-ptb-${version}.tar.gz"; + url = "https://dl-ptb.discordapp.net/apps/linux/${version}/discord-ptb-${version}.tar.gz"; sha256 = "d78NnQZ3MkLje8mHrI6noH2iD2oEvSJ3cDnsmzQsUYc="; }; canary = fetchurl { - url = - "https://dl-canary.discordapp.net/apps/linux/${version}/discord-canary-${version}.tar.gz"; - sha256 = "sha256-dmG+3BWS1BMHHQAv4fsXuObVeAJBeD+TqnyQz69AMac="; + url = "https://dl-canary.discordapp.net/apps/linux/${version}/discord-canary-${version}.tar.gz"; + sha256 = "sha256-OrGg4jXziesHBhQORxREN/wq776RgNGaTyjJNV4pSAU="; }; }; - x86_64-darwin = { - stable = fetchurl { - url = "https://dl.discordapp.net/apps/osx/${version}/Discord.dmg"; - sha256 = "1jvlxmbfqhslsr16prsgbki77kq7i3ipbkbn67pnwlnis40y9s7p"; + aarch64-darwin = { + ptb = fetchurl { + url = "https://dl-ptb.discordapp.net/apps/osx/${version}/DiscordPTB.dmg"; + sha256 = "sha256-LS7KExVXkOv8O/GrisPMbBxg/pwoDXIOo1dK9wk1yB8="; }; - ptb = darwin-ptb; canary = fetchurl { - url = - "https://dl-canary.discordapp.net/apps/osx/${version}/DiscordCanary.dmg"; + url = "https://dl-canary.discordapp.net/apps/osx/${version}/DiscordCanary.dmg"; sha256 = "0mqpk1szp46mih95x42ld32rrspc6jx1j7qdaxf01whzb3d4pi9l"; }; }; - # Only PTB bundles a MachO Universal binary with ARM support. - aarch64-darwin = { ptb = darwin-ptb; }; + # Stable does not (yet) provide aarch64-darwin support. PTB and Canary, however, do. + x86_64-darwin = + aarch64-darwin + // { + stable = fetchurl { + url = "https://dl.discordapp.net/apps/osx/${version}/Discord.dmg"; + sha256 = "1jvlxmbfqhslsr16prsgbki77kq7i3ipbkbn67pnwlnis40y9s7p"; + }; + }; }; src = srcs.${stdenv.hostPlatform.system}.${branch}; @@ -58,35 +55,40 @@ let license = licenses.unfree; maintainers = with maintainers; [ ldesgoui MP2E devins2518 ]; platforms = [ "x86_64-linux" "x86_64-darwin" ] - ++ lib.optionals (branch == "ptb") [ "aarch64-darwin" ]; + ++ lib.optionals (branch != "stable") [ "aarch64-darwin" ]; }; - package = if stdenv.isLinux then ./linux.nix else ./darwin.nix; + package = + if stdenv.isLinux + then ./linux.nix + else ./darwin.nix; openasar = callPackage ./openasar.nix { }; - packages = (builtins.mapAttrs - (_: value: callPackage package - (value // { - inherit src version openasar; - meta = meta // { mainProgram = value.binaryName; }; - }) - ) - { - stable = rec { - pname = "discord"; - binaryName = "Discord"; - desktopName = "Discord"; - }; - ptb = rec { - pname = "discord-ptb"; - binaryName = "DiscordPTB"; - desktopName = "Discord PTB"; - }; - canary = rec { - pname = "discord-canary"; - binaryName = "DiscordCanary"; - desktopName = "Discord Canary"; - }; - } + packages = ( + builtins.mapAttrs + (_: value: + callPackage package (value + // { + inherit src version openasar; + meta = meta // { mainProgram = value.binaryName; }; + })) + { + stable = rec { + pname = "discord"; + binaryName = "Discord"; + desktopName = "Discord"; + }; + ptb = rec { + pname = "discord-ptb"; + binaryName = "DiscordPTB"; + desktopName = "Discord PTB"; + }; + canary = rec { + pname = "discord-canary"; + binaryName = "DiscordCanary"; + desktopName = "Discord Canary"; + }; + } ); -in packages.${branch} +in +packages.${branch} diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json index 269d928f43..004db42eba 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/element-desktop-package.json @@ -2,7 +2,7 @@ "name": "element-desktop", "productName": "Element", "main": "lib/electron-main.js", - "version": "1.10.15", + "version": "1.11.0", "description": "A feature-rich client for Matrix.org", "author": "Element", "repository": { @@ -61,7 +61,8 @@ "app-builder-lib": "^22.14.10", "asar": "^2.0.1", "chokidar": "^3.5.2", - "electron": "^17", + "detect-libc": "^1.0.3", + "electron": "^19", "electron-builder": "22.11.4", "electron-builder-squirrel-windows": "22.11.4", "electron-devtools-installer": "^3.1.1", @@ -73,7 +74,7 @@ "find-npm-prefix": "^1.0.2", "fs-extra": "^8.1.0", "glob": "^7.1.6", - "matrix-web-i18n": "^1.2.0", + "matrix-web-i18n": "^1.3.0", "mkdirp": "^1.0.3", "needle": "^2.5.0", "node-pre-gyp": "^0.15.0", diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/element-web-package.json b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/element-web-package.json index a67fc7a682..323fe41473 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/element-web-package.json +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/element-web-package.json @@ -1,6 +1,6 @@ { "name": "element-web", - "version": "1.10.15", + "version": "1.11.0", "description": "A feature-rich client for Matrix.org", "author": "New Vector Ltd.", "repository": { @@ -56,10 +56,10 @@ "@matrix-org/olm": "https://gitlab.matrix.org/api/v4/projects/27/packages/npm/@matrix-org/olm/-/@matrix-org/olm-3.2.8.tgz", "browser-request": "^0.3.3", "gfm.css": "^1.1.2", - "jsrsasign": "^10.2.0", + "jsrsasign": "^10.5.25", "katex": "^0.12.0", - "matrix-js-sdk": "18.1.0", - "matrix-react-sdk": "3.47.0", + "matrix-js-sdk": "19.0.0", + "matrix-react-sdk": "3.48.0", "matrix-widget-api": "^0.1.0-beta.18", "prop-types": "^15.7.2", "react": "17.0.2", @@ -125,7 +125,7 @@ "loader-utils": "^1.4.0", "matrix-mock-request": "^2.0.0", "matrix-react-test-utils": "^0.2.3", - "matrix-web-i18n": "^1.2.0", + "matrix-web-i18n": "^1.3.0", "mini-css-extract-plugin": "^0.12.0", "minimist": "^1.2.6", "mkdirp": "^1.0.4", diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/pin.json b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/pin.json index c40d978c8c..a8494fe749 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/pin.json +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/element/pin.json @@ -1,7 +1,7 @@ { - "version": "1.10.15", - "desktopSrcHash": "2XSTE6NbhWYAH3tr1Kd16vEAGn3ApZ0a9PdpoHJn3uE=", - "desktopYarnHash": "1rnzaxy7l7912j6df8w2kw66pqwrs7kg7hd0680i38c1db5f4y6n", - "webSrcHash": "lX31OWJ6/S+PbOKvEqYALtOIoaJjwg4ng/wHOfXCSqg=", - "webYarnHash": "0j6xv64w5vszhlfqz37asqxsql0m89gscrl270dlxzycd4ybzghz" + "version": "1.11.0", + "desktopSrcHash": "WYXPsiR3hKj+cPvs5bLzZ301vLISp3ANLf/GgBBMYqM=", + "desktopYarnHash": "0v60ak06g87i3q5rqgxy3v3whk3njj0v1ml9rfdab1mbzrj6209c", + "webSrcHash": "L6ONDjGy8Uuo7E4O5ajIYdDLYL59JkuUk9hAAlTID1k=", + "webYarnHash": "15qhw2z05ylxvidaaifpxxdpd68s7qbwpgx9y95x6v82fcr7xhrz" } diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/gajim/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/gajim/default.nix index 7c18ebf763..9725676da0 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/gajim/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/gajim/default.nix @@ -22,11 +22,11 @@ python3.pkgs.buildPythonApplication rec { pname = "gajim"; - version = "1.4.3"; + version = "1.4.6"; src = fetchurl { url = "https://gajim.org/downloads/${lib.versions.majorMinor version}/gajim-${version}.tar.gz"; - sha256 = "sha256:0n6v96pwgds8655877fjgsphq4rd4gb9mz7cbqp4nkd4m7kvr3xv"; + sha256 = "sha256-iiZ2Nv6voq67+OJ26hk+3JQSKevx9ti8s6DreSAsQk8="; }; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin/default.nix index bd6febeaf9..01e1384854 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pidgin/default.nix @@ -88,7 +88,7 @@ let unwrapped = stdenv.mkDerivation rec { homepage = "https://pidgin.im/"; license = licenses.gpl2Plus; platforms = platforms.unix; - maintainers = [ maintainers.vcunat ]; + maintainers = [ ]; }; }; diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/webex/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/webex/default.nix new file mode 100644 index 0000000000..293f6747d3 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/webex/default.nix @@ -0,0 +1,175 @@ +{ lib +, writeScript +, stdenv +, fetchurl +, alsaLib +, at-spi2-atk +, at-spi2-core +, atk +, cairo +, cups +, dbus +, expat +, fontconfig +, freetype +, gdk-pixbuf +, glib +, gtk3 +, harfbuzz +, libdrm +, libgcrypt +, libglvnd +, libkrb5 +, libpulseaudio +, libsecret +, udev +, libxcb +, libxkbcommon +, lshw +, mesa +, nspr +, nss +, pango +, zlib +, libX11 +, libXcomposite +, libXcursor +, libXdamage +, libXext +, libXfixes +, libXi +, libXrandr +, libXrender +, libXtst +, libxshmfence +, xcbutil +, xcbutilimage +, xcbutilkeysyms +, xcbutilrenderutil +, xcbutilwm +, p7zip +, wayland +, libXScrnSaver +}: + +stdenv.mkDerivation rec { + pname = "webex"; + version = "42.8.0.22907"; + + src = fetchurl { + url = "https://binaries.webex.com/WebexDesktop-Ubuntu-Blue/20220712081040/Webex_ubuntu.7z"; + sha256 = "b83950cdcf978a3beda93de27b25b70554fc82fcf072a5a7ea858d2ce0d176ac"; + }; + + buildInputs = [ + alsaLib + at-spi2-atk + at-spi2-core + atk + cairo + cups + dbus + expat + fontconfig + freetype + glib + gdk-pixbuf + gtk3 + harfbuzz + lshw + mesa + nspr + nss + pango + zlib + libdrm + libgcrypt + libglvnd + libkrb5 + libpulseaudio + libsecret + udev + libxcb + libxkbcommon + libX11 + libXcomposite + libXcursor + libXdamage + libXext + libXfixes + libXi + libXrandr + libXrender + libXtst + libxshmfence + xcbutil + xcbutilimage + libXScrnSaver + xcbutilkeysyms + xcbutilrenderutil + xcbutilwm + p7zip + wayland + ]; + + libPath = "$out/opt/Webex/lib:$out/opt/Webex/bin:${lib.makeLibraryPath buildInputs}"; + + unpackPhase = '' + 7z x $src + mv Webex_ubuntu/opt . + ''; + + postPatch = '' + substituteInPlace opt/Webex/bin/webex.desktop --replace /opt $out/opt + ''; + + dontPatchELF = true; + + buildPhase = '' + patchelf \ + --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + --set-rpath "${libPath}" \ + opt/Webex/bin/CiscoCollabHost \ + opt/Webex/bin/CiscoCollabHostCef \ + opt/Webex/bin/CiscoCollabHostCefWM \ + opt/Webex/bin/WebexFileSelector \ + opt/Webex/bin/pxgsettings + for each in $(find opt/Webex -type f | grep \\.so); do + patchelf --set-rpath "${libPath}" "$each" + done + ''; + + installPhase = '' + mkdir -p "$out/bin" "$out/share/applications" + cp -r opt "$out" + + ln -s "$out/opt/Webex/bin/CiscoCollabHost" "$out/bin/webex" + chmod +x $out/bin/webex + + mv "$out/opt/Webex/bin/webex.desktop" "$out/share/applications/webex.desktop" + ''; + + passthru.updateScript = writeScript "webex-update-script" '' + #!/usr/bin/env nix-shell + #!nix-shell -i bash -p curl jq common-updater-scripts + set -eou pipefail; + + channel=blue + manifest=$(curl -s "https://client-upgrade-a.wbx2.com/client-upgrade/api/v1/webexteamsdesktop/upgrade/@me?channel=$channel&model=ubuntu" | jq '.manifest') + + url=$(jq -r '.packageLocation' <<< "$manifest") + version=$(jq -r '.version' <<< "$manifest") + hash=$(jq -r '.checksum' <<< "$manifest") + + update-source-version ${pname} "$version" "$hash" "$url" --file=./pkgs/applications/networking/instant-messengers/webex/default.nix + ''; + + meta = with lib; { + description = "The all-in-one app to call, meet, message, and get work done"; + homepage = "https://webex.com/"; + downloadPage = "https://www.webex.com/downloads.html"; + license = licenses.unfree; + maintainers = with lib.maintainers; [ uvnikita ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/networking/irc/weechat/default.nix b/third_party/nixpkgs/pkgs/applications/networking/irc/weechat/default.nix index 1b5f797e98..1835e59e86 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/irc/weechat/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/irc/weechat/default.nix @@ -28,14 +28,14 @@ let in assert lib.all (p: p.enabled -> ! (builtins.elem null p.buildInputs)) plugins; stdenv.mkDerivation rec { - version = "3.5"; + version = "3.6"; pname = "weechat"; hardeningEnable = [ "pie" ]; src = fetchurl { url = "https://weechat.org/files/src/weechat-${version}.tar.bz2"; - sha256 = "sha256-8ZSa2dQPTiChGW00T5OASHmd0C2PatUtTu9Gr4CF4Oc="; + sha256 = "sha256-GkYN/Y4LQQr7GdSDu0ucXXM9wWPAqKD1txJXkOhJMDc="; }; outputs = [ "out" "man" ] ++ map (p: p.name) enabledPlugins; diff --git a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix index 47cabe1b20..d60f472a5c 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix @@ -1,665 +1,665 @@ { - version = "102.0.1"; + version = "102.0.2"; sources = [ - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.1/linux-x86_64/af/thunderbird-102.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-x86_64/af/thunderbird-102.0.2.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "454de70b44e21806b6854beb2f9313360b56c19ffcebec76ffff35a31c1c5280"; + sha256 = "bf31f2fd59685a3cdefabc8512fe57603392183ec653f369adf750d37332da0d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.1/linux-x86_64/ar/thunderbird-102.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-x86_64/ar/thunderbird-102.0.2.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "f3a54d1ddb506900da8bea7e6d3a9c340b226d66be4af6f63d83f485d8f525a6"; + sha256 = "f1b456ee95540ab8965647d9bd795a1411701a95f3a5d09fb8694eb27b66b58e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.1/linux-x86_64/ast/thunderbird-102.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-x86_64/ast/thunderbird-102.0.2.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "130c458c0832cc83c508539c9980b9ae4654011311d269ea07f0b6d8dee20694"; + sha256 = "79ad9345d0a2d0545a1ba18f0c0d97372065a53da58c258c8cb58a5881308349"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.1/linux-x86_64/be/thunderbird-102.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-x86_64/be/thunderbird-102.0.2.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "c86b351adfd2104234e1b89e5943b298f7131f5e40c0f5b254e9630e7c99cffc"; + sha256 = "77e43b688c0888959f07f57e9bf46d74b84387483aef3d0b6153249850b33a6f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.1/linux-x86_64/bg/thunderbird-102.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-x86_64/bg/thunderbird-102.0.2.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "c86d41cec6adf1f2d15d2b5ece051dee9fdc242fc9e78780baad23dd190f9d9a"; + sha256 = "e02fe0e198cc340b9dd63af7a064fc3f6ff0301eac8b11546f30e44abe482959"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.1/linux-x86_64/br/thunderbird-102.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-x86_64/br/thunderbird-102.0.2.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "954958eb30962697291000cf0d20538a4a6f442f849528217de0c5fd62d9a76c"; + sha256 = "f4fb54301e34c77be5503808a183303ec702dcc004a9e2781acc786ba53a6f46"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.1/linux-x86_64/ca/thunderbird-102.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-x86_64/ca/thunderbird-102.0.2.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "94a92262c541ca7d7b9505e455acf44c1fc1d4df64b9e69396548ebb64cc3925"; + sha256 = "e0da55902658afa56cd28ba704a0d266f65fc92fc4c8029d52f43b5414b1a2e9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.1/linux-x86_64/cak/thunderbird-102.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-x86_64/cak/thunderbird-102.0.2.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "552471f2fa1baf4220ae94817b0056d427521e635d062e21787569f3bb4659de"; + sha256 = "f82182d598a8de79a634713bf4390a6134f225ed693f3edf88a69caa939e2f8b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.1/linux-x86_64/cs/thunderbird-102.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-x86_64/cs/thunderbird-102.0.2.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "8bd171e6d4940f22198c5515e74490cc0e94f1499385172a0139aaf0fb4897ac"; + sha256 = "262c93857029d9a8376fb2846e0d93ff9b42de13d18a15d6c2cd3a07cecea6af"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.1/linux-x86_64/cy/thunderbird-102.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-x86_64/cy/thunderbird-102.0.2.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "af1ac6ed62fbb6ed3eee4bba31a9c304793ae658e3706211dff313b817f34efa"; + sha256 = "084ac1957a02e8a91773fa327861ca23191429fbdb237f9ee727e518edacea48"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.1/linux-x86_64/da/thunderbird-102.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-x86_64/da/thunderbird-102.0.2.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "3ae39c9665f420c5b62a29112e88ffc5148fab63b51b08ebf4af3cd135069772"; + sha256 = "d9e8f431470511c45932d0d498a26492b1829a4f8004f573dc0b7b8397adfa24"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.1/linux-x86_64/de/thunderbird-102.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-x86_64/de/thunderbird-102.0.2.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "46ace85f7a8c0c158380b6b04427aebc0eccf4158835719fb75463eea1e7d6d0"; + sha256 = "2cc8cb967f90284fd2c1fc7bed97eda6aa045316732582ab9c8a1ec9839e212d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.1/linux-x86_64/dsb/thunderbird-102.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-x86_64/dsb/thunderbird-102.0.2.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "a98b0e8efeedcaf0baa7bca97b7363d180fe0367498577b80d743c366d48a37a"; + sha256 = "734fbccd006fa3158bb982897fd99b57143ed3b3fa55786b71b6e8a53e56ee3f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.1/linux-x86_64/el/thunderbird-102.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-x86_64/el/thunderbird-102.0.2.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "975d73dcd530d608db7553debbedff96e36ccc2ab370f71d67196f705eccf3ff"; + sha256 = "62e36b4f5152691489d8992b7a51773e90b73da553dbb125adb65f271f5f6d0f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.1/linux-x86_64/en-CA/thunderbird-102.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-x86_64/en-CA/thunderbird-102.0.2.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "82ab4ada8ac96c06cf17238386e6f149df8b29b4ba3680106845d4944f4d7d6e"; + sha256 = "523a1f718c29ab241d94e3f780ca3c5825d9db5c9a8d5a7e4920f004566cf4d9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.1/linux-x86_64/en-GB/thunderbird-102.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-x86_64/en-GB/thunderbird-102.0.2.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "277111b433009d09df7a9184862f30c226237fcfc3dbf179053978606d81a581"; + sha256 = "8503130f0f43250cc365e99a672ce02e15b78c40aa20d4585d0b048bc43695ae"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.1/linux-x86_64/en-US/thunderbird-102.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-x86_64/en-US/thunderbird-102.0.2.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "b80be6cc016c735df935fe65f08a96a89e83186e644cde31b1637cc88febb868"; + sha256 = "a98f9cb5d33e3225e9e152b3f47c7046c8a16e43aa43a7e2534ecef12e8f902d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.1/linux-x86_64/es-AR/thunderbird-102.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-x86_64/es-AR/thunderbird-102.0.2.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "86b445d53bce5b27fafb24a2efa0da2e8f8f6aae7f9a38b93c8e4b4a5f6bcb82"; + sha256 = "9ea04912f380917a8f721f29a2a3a8ecc4eca436f838bc70f8fd138189450a1c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.1/linux-x86_64/es-ES/thunderbird-102.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-x86_64/es-ES/thunderbird-102.0.2.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "f02084c767981fe54e4250c1c62f73534e615b5dac793d1d8b311ca5c8f30f42"; + sha256 = "bf902ecef24010f1ac7c88a5906ec78ef1b7697e06ad08c327bd17a08e6fa7e4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.1/linux-x86_64/es-MX/thunderbird-102.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-x86_64/es-MX/thunderbird-102.0.2.tar.bz2"; locale = "es-MX"; arch = "linux-x86_64"; - sha256 = "2b65f1bfff33534b9524c3adab09d82e67bae16b296a9294627f15974f04eab9"; + sha256 = "b25bcc0f5a030e3f1a0f999b9d7680cff0ca2ff250eb4e193415d732b6ea548b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.1/linux-x86_64/et/thunderbird-102.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-x86_64/et/thunderbird-102.0.2.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "2ab7d95ea3f450808e0f38261292b887aa408cf084293ae7c98ba42a86451ed2"; + sha256 = "602f002ffe740b2ba7b7e2474628cbaaa053fa3305a20ea5469d126fa81156a0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.1/linux-x86_64/eu/thunderbird-102.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-x86_64/eu/thunderbird-102.0.2.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "6925c89f39573d7d1cca563f1470821e9edfa65fd2567369fdc3d6100af107ae"; + sha256 = "ecb63e896bc9c07b3f0367fda6045ace405616221fc6072261a981fb65276194"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.1/linux-x86_64/fi/thunderbird-102.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-x86_64/fi/thunderbird-102.0.2.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "b18d727c75fb116bdcdaf89d5100ece3cb61924f4bc9729a23b019c515b41a53"; + sha256 = "753752f6da47d9f486cb61a60a8eeb8bbd8ecf18d7bc37035dab4869e3d5255a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.1/linux-x86_64/fr/thunderbird-102.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-x86_64/fr/thunderbird-102.0.2.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "955c988742b8bf9905091492c8d236196f732ebf5bb8681c41bfc133ed89b27b"; + sha256 = "982175567ff4dfb950e198d810b1bdf2d557b053c0cf2a0ac7637bc932e34c39"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.1/linux-x86_64/fy-NL/thunderbird-102.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-x86_64/fy-NL/thunderbird-102.0.2.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "6827fb58aa391e9b5fb4c3582833e433b1e8401ead98929efc1fa3b59a38f307"; + sha256 = "fc37a298eac00ee1b137520b130397688af0870f390fd373e2cb2afc24626b22"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.1/linux-x86_64/ga-IE/thunderbird-102.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-x86_64/ga-IE/thunderbird-102.0.2.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "83f1b874a3eedbd2fb23af44a03b10db94de9c6b28def83519cae6e47cd0e19b"; + sha256 = "7c86dd97d76481025ae72333c50b89cf3abeec18bfcadc916d33498e28bbdf48"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.1/linux-x86_64/gd/thunderbird-102.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-x86_64/gd/thunderbird-102.0.2.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "fe4b91f0afcc5b8055148c30a7eb269fed838902fe00c596ef3e985a6f0e40dc"; + sha256 = "0bff5a9c420df5fe9d14b74d3013ab53b18d61cb7de4d8f054d8bb05d8e1110f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.1/linux-x86_64/gl/thunderbird-102.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-x86_64/gl/thunderbird-102.0.2.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "f0968870549b314002a437ec15ab9d967eacb70b928da1e941b9e8997ae68b28"; + sha256 = "4749c8f5eeed740fe2c01afedb2e528ecfb9820c8856cae652803555a30845c9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.1/linux-x86_64/he/thunderbird-102.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-x86_64/he/thunderbird-102.0.2.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "8acd12edccf719579e29b9907aa46e57a261ac9718d7d441b6036d06d2fd6b23"; + sha256 = "52fab3f4ee2f74be4792bd233020ad514ecda12286bed194eb985a3ce479621e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.1/linux-x86_64/hr/thunderbird-102.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-x86_64/hr/thunderbird-102.0.2.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "95b340f7b2dc6edc51f8b4cdbe8774f3ab4738fcab5661949c30018ada3495af"; + sha256 = "7b1881e7ed5e6f55fc744589a766480908f867c5fcef3c2aa2e723c5c3b2ab44"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.1/linux-x86_64/hsb/thunderbird-102.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-x86_64/hsb/thunderbird-102.0.2.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "2a8640dea2b7787045e66e2c8d12350a38ccc0d762f570f85c4d7c22533d103c"; + sha256 = "3e76a53cdf1854e08115c7bbf488f94a14f5965088a73df6b1d4aff6423aecd4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.1/linux-x86_64/hu/thunderbird-102.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-x86_64/hu/thunderbird-102.0.2.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "c5e80fa639e9f31d1edf0f52d034b596af7ed8a364ab20592b9624e403c4e5aa"; + sha256 = "8935b6a67f6f1d849eb007c6145909db1d6f5c1ec44ccf0e03c943ea5fff8d23"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.1/linux-x86_64/hy-AM/thunderbird-102.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-x86_64/hy-AM/thunderbird-102.0.2.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "f79caf36c6e20726953f48b7aa3c96c78e96d252758265fd5aa5a26c37259bb5"; + sha256 = "8142f0068ec9636a2269df7f732e99e080d42b9e65922968fe4e631f0eae3062"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.1/linux-x86_64/id/thunderbird-102.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-x86_64/id/thunderbird-102.0.2.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "c1808206a1423f4cdadcac3479464b99372c52f8d64070010c38be45f89c06a4"; + sha256 = "c798aaf2548942168671fcb64487fce251d1daf54b7fe4ebd1a868028acb9018"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.1/linux-x86_64/is/thunderbird-102.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-x86_64/is/thunderbird-102.0.2.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "a686c4747605022fda0b1b1710e204c348ebbe62dd7e32def972ebf34d5d14db"; + sha256 = "9740e7ea80d038821a00da541813e8fef924a40c7a90e2cdedf42ca075b953ff"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.1/linux-x86_64/it/thunderbird-102.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-x86_64/it/thunderbird-102.0.2.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "c3394587c80a3270329ca4c0ecea0c2e353c0b51b75b6d932ad3214939d1874a"; + sha256 = "3d5e4c0bd729894db0e3b8ce0eb01c07b68cd1e3480c8b906345ca8a28a24fd7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.1/linux-x86_64/ja/thunderbird-102.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-x86_64/ja/thunderbird-102.0.2.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "f50de906192c67cc1ea264b8d698dc438195185c7820efdd1063ab1d4b0e764e"; + sha256 = "fde66a7b89e8581545fb80f549c262c3248562e29bd9a639344469ecca8a0720"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.1/linux-x86_64/ka/thunderbird-102.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-x86_64/ka/thunderbird-102.0.2.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "626caf1b5ddfc7dddadb789fd6d63f2dcbf0d471b948ae682bbffd8e46178e6b"; + sha256 = "2ebc499ba3084fb9d544fed31037a9d0e92587e40680855fd6051842c2968e6d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.1/linux-x86_64/kab/thunderbird-102.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-x86_64/kab/thunderbird-102.0.2.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "de3af9ce4a383c141eda103e4284f9a7c8ac148f11ff2a273ae704e3b5c840b1"; + sha256 = "101a29d4a11e06eb07c2e9e2912eb92940787692714d52512438488fd47b33d3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.1/linux-x86_64/kk/thunderbird-102.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-x86_64/kk/thunderbird-102.0.2.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "3591faca0222ac7cf631ecebcd3258bbbebe6ba5355935005c6549053cd41bf9"; + sha256 = "9988f45d389abbd5f5d60fadb4aa629a761d87177688a2012ac530150f830c7d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.1/linux-x86_64/ko/thunderbird-102.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-x86_64/ko/thunderbird-102.0.2.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "47e93aae87cb1b3baf83eed8c4893cbff9f9569055388c72e0f0cfa9d21a06ad"; + sha256 = "f2af42b4ca5a75dd96bcaad3365ace3888d58b0051a1e6f7fe5d028ad9906635"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.1/linux-x86_64/lt/thunderbird-102.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-x86_64/lt/thunderbird-102.0.2.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "64d8916baf88e605d5116835ccb2ed08691437e6360447634c01fa536a28001a"; + sha256 = "978f9f7890d4dc8551589fab115107e2f33d8ec7825806a986436cfbfc75da6e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.1/linux-x86_64/lv/thunderbird-102.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-x86_64/lv/thunderbird-102.0.2.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "4e420206e45dc31966139a89228c725333c366da7bdb53e44bc67f93e8a8cde0"; + sha256 = "81b1ba931b5ab3973779a157d3ed7cbe647e4a2d1c1e3a68a11594e7b4d3b4da"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.1/linux-x86_64/ms/thunderbird-102.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-x86_64/ms/thunderbird-102.0.2.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "449f76d08e8c7e2c07a73df948baf10ecbcc1555c4b7d77fd559183512e84976"; + sha256 = "f0e5dc7e5427674b471df56619380efe6ea72fb50f826d0baff04a66f64f44ab"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.1/linux-x86_64/nb-NO/thunderbird-102.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-x86_64/nb-NO/thunderbird-102.0.2.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "498b193017d191b4fa05a392de73ea5debabdeb21c5bdc4f64a4f211b5fe7744"; + sha256 = "449f60fc5c127413acd74a4d2575763745440b973249e5ae624379d259e41baf"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.1/linux-x86_64/nl/thunderbird-102.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-x86_64/nl/thunderbird-102.0.2.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "29ee15c75fd3a479f5bf353d4937c89eefbdb9e32300c144adca203039bed613"; + sha256 = "fafe5a13869c3076be69c8d0fb94d3044c4774663e12fb75bab2f68f63c47455"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.1/linux-x86_64/nn-NO/thunderbird-102.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-x86_64/nn-NO/thunderbird-102.0.2.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "76dcb30575d1de2270c9ec57abef7724ea75663a4bc2bb84e9f45a6d0069eb3c"; + sha256 = "275b2e1bee94a1ef3adb97b4d1ca520c4f27696cb71b81bc80d9be354293bcad"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.1/linux-x86_64/pa-IN/thunderbird-102.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-x86_64/pa-IN/thunderbird-102.0.2.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "80ec69da063f10d786693d1f3de4eea036caca93b3c01410c39f8665b240830c"; + sha256 = "37a7d35f52c1b805334a1320cfaa04182b6c1428f77e8722478aba4d5303d4ce"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.1/linux-x86_64/pl/thunderbird-102.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-x86_64/pl/thunderbird-102.0.2.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "0df38d8212c4099a7cc4db574184cb5b9b06cdae87572588989bf758173f3556"; + sha256 = "b0331dab8d0d2a09d95d5e87c948b10a47af47f47fb59dd11356693b85e3b2fd"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.1/linux-x86_64/pt-BR/thunderbird-102.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-x86_64/pt-BR/thunderbird-102.0.2.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "55815e0ead146617c8984f286292fcafa32f61252e22562853669ef7310df4c9"; + sha256 = "8309588bba6f3858987e5c0d6ec083f3cd5195d49d5f9cc216b61ab972abc652"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.1/linux-x86_64/pt-PT/thunderbird-102.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-x86_64/pt-PT/thunderbird-102.0.2.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "d5f69cfaeabd786fad1073b7df7707cfd31e9a3a6bb247e946d4083938e45092"; + sha256 = "ebbc0276bf25a2ce9561ad9e40d286448ba57cb9441bd57cd1114cd1226075e7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.1/linux-x86_64/rm/thunderbird-102.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-x86_64/rm/thunderbird-102.0.2.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "a41c65976b903516210a7fe414c64eb342b393d5e1f13efac21aaffc98f63ea7"; + sha256 = "a97e6c804bef1a28e80920d528865dc41851d75cb4415fde9a4610d6fcacdfaa"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.1/linux-x86_64/ro/thunderbird-102.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-x86_64/ro/thunderbird-102.0.2.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "017ff03aee6d036a7d2fcf5de6b982eb632a8b1dcc3c9cfc0b69119fc3e3c35d"; + sha256 = "9dee91ec00405b58f730b7a9a23a59f1dc0e4506cfbaf4135134f13b5029ff29"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.1/linux-x86_64/ru/thunderbird-102.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-x86_64/ru/thunderbird-102.0.2.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "0a6dcc5a9497aaf0baf6aa5f2c965bf089c7bda014e46ed001cab0d204f1b456"; + sha256 = "4558b9eef1db93aa4e8602530809be81bc62317872b344bc6679c7da5ec0def3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.1/linux-x86_64/sk/thunderbird-102.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-x86_64/sk/thunderbird-102.0.2.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "d0480749c04000abb83c03723f213ffd022c73759a64a919693085c376c26d62"; + sha256 = "e2ef80bb2c1b98b78380c7ade61f1272dde33b9b57a155841a37fc5cd360a9a4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.1/linux-x86_64/sl/thunderbird-102.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-x86_64/sl/thunderbird-102.0.2.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "283f66e365428f6856a355526f783baf5cf5dc60a2f869875012f8fbb383b8c8"; + sha256 = "20cfe9c9999eefcb77b20c5227ab9001e3682770bef73ba8f994b714d99b83e8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.1/linux-x86_64/sq/thunderbird-102.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-x86_64/sq/thunderbird-102.0.2.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "9459d097e66bc7cdcdcf475eb7909137b840c88807f8f194016c8c952161b20f"; + sha256 = "17d92fc90a0832711b7d39e2ae959cf0ed6b4dcb53998ce1de529d6088711963"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.1/linux-x86_64/sr/thunderbird-102.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-x86_64/sr/thunderbird-102.0.2.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "d6ec958e4e6de1509a0c8bed35f0e89850d4ba185fee218e67496b4cf7b6f63f"; + sha256 = "0a9613c7265cebc62198dbb369b790748c5b8c47c0d0112ac03abc4e599ee2f5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.1/linux-x86_64/sv-SE/thunderbird-102.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-x86_64/sv-SE/thunderbird-102.0.2.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "7a3fbf4da06d5ac236558c441611159e0ff3e2f663c4f818d41868b0ae546e85"; + sha256 = "64347005f48bf84851a7834175f82071a98a3a850ed832f3d42c298a7ca1a366"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.1/linux-x86_64/th/thunderbird-102.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-x86_64/th/thunderbird-102.0.2.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "2bee3eb44e010b8b6e68ff749a5961b153b1d7c01b1957683453bd5e22ca54c8"; + sha256 = "5ae8c2c1c6a82110b60402d3868e74a8606ea44acf3d1fc370673bb0e280da04"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.1/linux-x86_64/tr/thunderbird-102.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-x86_64/tr/thunderbird-102.0.2.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "43f1e8bcf72e14c4d58f4c941762ba1196ecbf7b7e15b04ee7dccf37f9c0101e"; + sha256 = "05023d2d511261c0237f65ab1e28981d5ae8c4e493a225f74c121186d3b43848"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.1/linux-x86_64/uk/thunderbird-102.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-x86_64/uk/thunderbird-102.0.2.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "6e9e6d4f0c452e452612aaaafde3dace4dea7fc9615cfeffd4764e7961cbeaf2"; + sha256 = "f5a6805d7a2f2b33e6c9357598a55032e288c70c838bfb7b3cd66020475bdbfb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.1/linux-x86_64/uz/thunderbird-102.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-x86_64/uz/thunderbird-102.0.2.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "e38f1318db70ac3bf9baec33bf34a1b22037c0fa547255f8f25497f73ccd02e2"; + sha256 = "e5f656f5a367879bb699f2676ba51b3e8bed10d3ec756ab95c2406b745490fa8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.1/linux-x86_64/vi/thunderbird-102.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-x86_64/vi/thunderbird-102.0.2.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "c086167af3cd9aa8d377bca005dd0c174de941ed9f579d8647daf0912874559f"; + sha256 = "e7aff2fc6dc436f99f32a5762562ac66961ea51f4e7d012f44ffa8cb8e820c8b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.1/linux-x86_64/zh-CN/thunderbird-102.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-x86_64/zh-CN/thunderbird-102.0.2.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "41fba211d58537791450ace7f026f965c131c7ac4bb8ca0b52c4dae5faa71ff7"; + sha256 = "658a6ce621e30cfe63071320c3eb376731a58a138a4372bf0908f83457511752"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.1/linux-x86_64/zh-TW/thunderbird-102.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-x86_64/zh-TW/thunderbird-102.0.2.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "330bc05195617ad6206e54a27dd568cd36e77ac1bc9a2af542db1f368aadbcc1"; + sha256 = "4e3989b239a7f574e73f407282d1b62d6d3fa828c489dc454d80db1a58dc4575"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.1/linux-i686/af/thunderbird-102.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-i686/af/thunderbird-102.0.2.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "ff93121ae975054cf1a1cdd4f9aff514a920ab368215e7f52a3b297b1427d34e"; + sha256 = "5252c4a31ca1676208a4ee0b8172945a2a55285da5d397168e39afd8b744cfd3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.1/linux-i686/ar/thunderbird-102.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-i686/ar/thunderbird-102.0.2.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "325433620ace7a8dc63a57460baa16e0d42c22863b6478ef2cdb6f6a8e401183"; + sha256 = "4b1dff9eaf981a6a52c9dbb7c6eff636b2a675e937e04564edbfea99fab4b636"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.1/linux-i686/ast/thunderbird-102.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-i686/ast/thunderbird-102.0.2.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "73f0e83d15263559b5b2d71ec77e425ac19ab9c8c3dd7537a03a1c2d696088be"; + sha256 = "722f72b3f018d60161f82b6709bcb866c483b5c77501ae20ff617ed088c957c8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.1/linux-i686/be/thunderbird-102.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-i686/be/thunderbird-102.0.2.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "44a142daae26b47847a763478a774539b6d98f1ffefabd4aa8f32f9f41017493"; + sha256 = "dd85fdcdc39c68e01f2daf08db11f309e139f3c0298ce1956a0ee70e9a205ffa"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.1/linux-i686/bg/thunderbird-102.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-i686/bg/thunderbird-102.0.2.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "b9fbe8c6dd69b7899af85ca4dea24a41cad5f9bcdd9a08d3960b7cf8193423be"; + sha256 = "bf937297e3144adfd5a6b995965057be524eb85363a0402972139845ecf82f44"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.1/linux-i686/br/thunderbird-102.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-i686/br/thunderbird-102.0.2.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "2ec9e4e767a0189495b2142680189051a32330d41517593b77dcdf2d6cca6c43"; + sha256 = "206b8c6a0aa5f1f3ccefc5bc7de65fd7ef457d5e9093f1613e7d1021a5845e05"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.1/linux-i686/ca/thunderbird-102.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-i686/ca/thunderbird-102.0.2.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "93365a27dfda0857379c105364aa758ee160e8aabfa4c10408499a414496bdd5"; + sha256 = "72247980162026fc55057ad1e235dcfcea859386ce04cbc7afd0f2e7276fa533"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.1/linux-i686/cak/thunderbird-102.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-i686/cak/thunderbird-102.0.2.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "716235bdce0c09bf6f4cc989491d76f8a20e7d9a52dcf745e5a1c95d43378c09"; + sha256 = "f19bd02105be26da636c7e2518f39b2c566594ea07dcc6c742e10ede9834e82f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.1/linux-i686/cs/thunderbird-102.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-i686/cs/thunderbird-102.0.2.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "1ad4813a05cb78bb89fdb0ba744f7078303d785a912b1bd94124d18b018699a0"; + sha256 = "8edc31d5b132274a12077939cc45dc805498b3a3ef798bb8038ab3921597adda"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.1/linux-i686/cy/thunderbird-102.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-i686/cy/thunderbird-102.0.2.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "e21e387f62801511a72f48adf4738eef9aa8b51f3fe67d6014a023745b6720fc"; + sha256 = "6497e711b5e4a9cf97307bdccd462f778527a45f1d1ced675f2452d549da0b7c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.1/linux-i686/da/thunderbird-102.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-i686/da/thunderbird-102.0.2.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "056b5dd2d75eb30fac31113456086e553e19a99625abc7d8956b4a05f017b9b8"; + sha256 = "8795c5eebfd9fbe26b46556cbe7f606b2a73dc1071f4987b71ceb97e6c30fe9d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.1/linux-i686/de/thunderbird-102.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-i686/de/thunderbird-102.0.2.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "fc89ec2ba04a09f39645f6be9517ab159872229c79e60959743c1e4c9cfda2f9"; + sha256 = "b805d8339a9e8082c6497adf2afc2a649bb036562f732e8e15f472ff7f84d6a5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.1/linux-i686/dsb/thunderbird-102.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-i686/dsb/thunderbird-102.0.2.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "c98fa2a8462d3ab251c8b8e3f7440ed4187b5d1e4f75f6c5fbd48ad634757cf0"; + sha256 = "c1d7038e6b6dd30fcb71d5bbcc46332915e959c79e3772f66b920747f903c497"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.1/linux-i686/el/thunderbird-102.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-i686/el/thunderbird-102.0.2.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "a322ed85be837a0311aa39b5222125ad69de3c3617bf9983399918800e5090a9"; + sha256 = "e22bfbc3624474bc187551d16f390186b131c7552ff492a39c044ec4aa1d3ff8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.1/linux-i686/en-CA/thunderbird-102.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-i686/en-CA/thunderbird-102.0.2.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "de4d5feca4c217f2a544f2c851cdce560b609e773234a166faa0e25fe3573b27"; + sha256 = "955d58c13452c7937d40f643c4ae27595e32fdde947e326036519695bf529e19"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.1/linux-i686/en-GB/thunderbird-102.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-i686/en-GB/thunderbird-102.0.2.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "299f791ec2b19abc8168e58149117ae8e23880e0976727323c1ad17c5033c341"; + sha256 = "1667598685761e043dfe6966b7e26e76a0de391e64c807610898f5d12c3426e9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.1/linux-i686/en-US/thunderbird-102.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-i686/en-US/thunderbird-102.0.2.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "edba2d157fbdb9eb552059d265436647563ec8490b2e5997650e5780d53b3915"; + sha256 = "156f92a9e0e45fa42f2c3b938d921c66b25ccb123505e2ca469d1107138a1c99"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.1/linux-i686/es-AR/thunderbird-102.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-i686/es-AR/thunderbird-102.0.2.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "5837cd1f2d31af7a5eb6bae4123eb15cbed390f033c1bb9de2fdb277a3413835"; + sha256 = "b5ba861b6e6aea74b9fffdcfef921f4c66e0680a57e1c13a2fd2d4cb068c62c7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.1/linux-i686/es-ES/thunderbird-102.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-i686/es-ES/thunderbird-102.0.2.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "5185a024317336ea998f1d2365bdc3eabe6c9a71ca99806a972cb3190d5bcc93"; + sha256 = "614a0738702412054c9c42e0b78796230030558b9819f164e80cb66a210f41d6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.1/linux-i686/es-MX/thunderbird-102.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-i686/es-MX/thunderbird-102.0.2.tar.bz2"; locale = "es-MX"; arch = "linux-i686"; - sha256 = "2f8bb364cba43373cf1eebefed79e5ad2bdef4d02410a7730f34f0f5053e7eed"; + sha256 = "239387c3450a99bda49eb044d15e2adbb2765794ae5219d4318d88afaef66410"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.1/linux-i686/et/thunderbird-102.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-i686/et/thunderbird-102.0.2.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "2c7abf7a5daff6f0851110a3a33f101d2703311d102bc388263ce4154a3c3c17"; + sha256 = "fdc1f424c43c9f7efc9e760d7f2dfdb7a5ead58bf26a0d5669b539ba04e6db0c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.1/linux-i686/eu/thunderbird-102.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-i686/eu/thunderbird-102.0.2.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "8b5e8498d1d895ad57e22e8ad9c55797c8a0ecf2cf5fd2577ff0ec3f9a530601"; + sha256 = "e229f46845b2f192623b88a8103d704d3fe271070e187c5796b0cf309afcea04"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.1/linux-i686/fi/thunderbird-102.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-i686/fi/thunderbird-102.0.2.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "67b0266bab2c9a07b7978c6aaa15f3eef1782774c233802dca75f38200114cd3"; + sha256 = "cc31a8a0235674ab72c00de931659167805741e71f1d2e3553bd30de457c8d33"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.1/linux-i686/fr/thunderbird-102.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-i686/fr/thunderbird-102.0.2.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "a1d3973fa54cf28543f7337e1efdd8233de97fcaaa252ce9467a10b49cc86119"; + sha256 = "0bade93a0a2b8bbd342baaddbda0ed9418a0ec9ff3dd5db54f688279d0a778b9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.1/linux-i686/fy-NL/thunderbird-102.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-i686/fy-NL/thunderbird-102.0.2.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "6ec8a9bc391f796ce342f08e008515f2e4425ed97eb17c26570eed1b124bebe3"; + sha256 = "476a21ca877b15a6bc619686ca3884f02017b295e25675f09a0cfc2f0ad21900"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.1/linux-i686/ga-IE/thunderbird-102.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-i686/ga-IE/thunderbird-102.0.2.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "cec26fd13cc1cb90f217096d26aac69c08faa96e1e15bcfb937532e72cb0ca4d"; + sha256 = "da21aaf27c50ccc17558006e5e955578e5d9319ad2aef6eb70dc64fff63594db"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.1/linux-i686/gd/thunderbird-102.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-i686/gd/thunderbird-102.0.2.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "607b856cb3da90e29370aff516b1f68dd2b1761ce708477b8e73e1c991fe65b4"; + sha256 = "6ad7f63a5d0f9509caa82249c310fe1d4e178460ecc1fba1c465626a1711ea4f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.1/linux-i686/gl/thunderbird-102.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-i686/gl/thunderbird-102.0.2.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "a66a49b55521e67a1ba5b617cbcae407445fe96163f5ee82172bb71ad6488dfc"; + sha256 = "516d2579a2801d20e956b2c80d576ebeae9251896256875e52a722d42014c55d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.1/linux-i686/he/thunderbird-102.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-i686/he/thunderbird-102.0.2.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "50928b757128d3843fcc46d5f1dcd802413339f0cbb67076a4e8fd2ea831969e"; + sha256 = "f30ca9bffe64f7f72980031a424e33db5ab0b7665e53e2db96862316b5d04f15"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.1/linux-i686/hr/thunderbird-102.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-i686/hr/thunderbird-102.0.2.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "30c2c448d20550708564675039889be52031cef837c3b7e5f83050b5f33dff4f"; + sha256 = "62bf938f8f185de8d5d485c229142c71a1fd533ebcb4fc1cbf49d541ab70f7c7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.1/linux-i686/hsb/thunderbird-102.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-i686/hsb/thunderbird-102.0.2.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "38c12bab7912d56fb5eec9d5206e93d3738244488544f3da6ab7fd4d1efcd81e"; + sha256 = "07bb48f656bfb77142c3a509b4470d4c022dff3f6378ef6c01f858c8aa9c0d0b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.1/linux-i686/hu/thunderbird-102.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-i686/hu/thunderbird-102.0.2.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "8775fabcafb17eed9edd224cb148fd4b50f2716f6ea7221f1cb7d7c578a99662"; + sha256 = "8ab53272bb1f9992ffc5dddf67099b0b966991549a07d8275e6f6999c1b881a3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.1/linux-i686/hy-AM/thunderbird-102.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-i686/hy-AM/thunderbird-102.0.2.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "85c5f40ae8eba422d18ad1fe67bb8841c1cfb283aafb87a92d001c6d54828cca"; + sha256 = "53459949bda746c5a2e02a9919efa730c6dae96ed818f3cca2c4f4bfcbee4c09"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.1/linux-i686/id/thunderbird-102.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-i686/id/thunderbird-102.0.2.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "ef40632b6058d5818c38800e9a62364b2d014afcae1352a069214fd0bbd7ec5c"; + sha256 = "705d28efb1bd9ab1516d00d44c7e60f3c3345ba4249cca5913c647d87075385b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.1/linux-i686/is/thunderbird-102.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-i686/is/thunderbird-102.0.2.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "373ce7e5e97355bc21149bd68d16576a24b8edbc35839989d048ff0ca34076de"; + sha256 = "27d56900ab0eee73aafb9d4a2a5650e2535872d4d202bcad6ef7003b4ea6c7fb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.1/linux-i686/it/thunderbird-102.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-i686/it/thunderbird-102.0.2.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "1e2901dbb9c85e90c26394c8dc10701f551365638868b3f69e2113a8091cac3e"; + sha256 = "84649aaebabf5bf67121b1a36f9bc6fe3609ca4995e53512fb109848f8007721"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.1/linux-i686/ja/thunderbird-102.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-i686/ja/thunderbird-102.0.2.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "bc4781a58fc62db1c20b8383369b101c079a3bd90c05768d369f508cb1d5625a"; + sha256 = "a8879ac875b3ce85962099245dbe8b73fa12b50b56132f5891b0be2abb61c06f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.1/linux-i686/ka/thunderbird-102.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-i686/ka/thunderbird-102.0.2.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "35eeaffc00156d4831b3e2b83406c6aff4abbe936f88a508c2646022aa5beae5"; + sha256 = "9d9c229c15a370d2efb3819587424c89573a66fe2be49622791ccfab40ef3c6c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.1/linux-i686/kab/thunderbird-102.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-i686/kab/thunderbird-102.0.2.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "1c833ea6368f7927dc4c421bfa7f3636b4ff23a0be61966c40761f281fa70ff5"; + sha256 = "5c972699c55e5290784a902c58655edfed6e30d6423a7f52b1fcb0e26e416507"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.1/linux-i686/kk/thunderbird-102.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-i686/kk/thunderbird-102.0.2.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "f322e97b61ce78cdb7745ccc835c8b66f92becc5d8ec76dde25fa58960234ef4"; + sha256 = "be446aaebe589f3d5274635102f06b9dd2aaf4ff34b7dc0a332700b520b623c0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.1/linux-i686/ko/thunderbird-102.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-i686/ko/thunderbird-102.0.2.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "5ec704f7bfe5e1cf2ce4d0c43b8b9144c8fc9a174359f5464215042ae25d8e43"; + sha256 = "452731102d29b927e442b2b0ec5c4a82a7a354933d255ef43619f11f9e03e334"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.1/linux-i686/lt/thunderbird-102.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-i686/lt/thunderbird-102.0.2.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "d5bb7833ab24c59b22b3724b0b8e19e4a64cd4c4ba3be507c8e6d419702f45bc"; + sha256 = "eb12af786067c1a8bc43aee746a1d1b300fc0bab998af7352abae2d0bd4b61fc"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.1/linux-i686/lv/thunderbird-102.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-i686/lv/thunderbird-102.0.2.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha256 = "29a78baf23df55224c5433b32a7811ec07c33a6ef4024681761f74a737803bf5"; + sha256 = "7277d68a04e10ca043d8563d1949f26da622a2952004664562c85a7943f4fed6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.1/linux-i686/ms/thunderbird-102.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-i686/ms/thunderbird-102.0.2.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "f5f3619d9df419ef4198822c1c23a2a702eb24a36a54e7d589aab684f1abba91"; + sha256 = "d923e39e46b3678427554e265d62b085683d074960b5e25bea720cfa8e9bde95"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.1/linux-i686/nb-NO/thunderbird-102.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-i686/nb-NO/thunderbird-102.0.2.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "d92f72fe78c788e8ef665b7bafec33b38095929ed8de47e07aa9e778fb2327e0"; + sha256 = "0ece7236c20992b5dc7f525fc6390f6fff38d2798255dd8aa692cef9a9bcb3ba"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.1/linux-i686/nl/thunderbird-102.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-i686/nl/thunderbird-102.0.2.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "2aa07aeb1addc342554ee83d2891edc06920559a59effc44670f5c6a6e7f860d"; + sha256 = "48a7a11e49f22424e79f3eab5c6961f2f3ec81e2b5ecf4578740214306974841"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.1/linux-i686/nn-NO/thunderbird-102.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-i686/nn-NO/thunderbird-102.0.2.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "91c87d6e439a86132e187412e4a259ee2826802edfdefc134cf5819387bc5de7"; + sha256 = "099097ab9d94fc49a91a14f7f15a886770de282db4db4334f6c7b8931384e6ba"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.1/linux-i686/pa-IN/thunderbird-102.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-i686/pa-IN/thunderbird-102.0.2.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "ee081d6c7573bf1f264bbe20f9632b8c402b5e3467e600e3add06b8d31ce27b4"; + sha256 = "83d409241a8dafa600759f0ef0f66bef38fcf4ef0ac0a7d7bdf9f0a85f5873c6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.1/linux-i686/pl/thunderbird-102.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-i686/pl/thunderbird-102.0.2.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "3bff1bdcd3a8f0edc053f74cdbd240d1938c4f2daa93e807ccb7294e1e5f290a"; + sha256 = "cbd7e676ad0848a69f387b496346b1c3664d62cec195dc897b5e5b7a940329e6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.1/linux-i686/pt-BR/thunderbird-102.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-i686/pt-BR/thunderbird-102.0.2.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "72f0dacc8c03d229a8fc4ec2e638d5fbaa703f09e5803a53a42265805658c028"; + sha256 = "6ef30480b304a1b6f05fbdcabfedfe11e2e77519acc4aa3cfe7124c54df8ce95"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.1/linux-i686/pt-PT/thunderbird-102.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-i686/pt-PT/thunderbird-102.0.2.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "153af8a3ebcc3662ceed7067872aff9b592aeb1364349bc36ed9384fc6164cb4"; + sha256 = "f870cb3a29830cb9c83007e466307a2c7f1f3606caa16679fa7b71a71eaa815f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.1/linux-i686/rm/thunderbird-102.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-i686/rm/thunderbird-102.0.2.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "831be41ea92e5c51a85a0d3e2cab4d1e4c9750250dda91bedd77600ad34f9d64"; + sha256 = "10b52b1e6fdc2dc6d905f04d396e99fbc02804a0b927aefc8332349b67340ebf"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.1/linux-i686/ro/thunderbird-102.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-i686/ro/thunderbird-102.0.2.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "c8d220b2daebd9435702c3dfb5b140a69ebcbb185c43fdc1ad39bc4861f27692"; + sha256 = "26a1ef950fec4b46f81f963faae8082a79c836b76105283561be81c59fe290a9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.1/linux-i686/ru/thunderbird-102.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-i686/ru/thunderbird-102.0.2.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "3ccb3843d22911efc3245b4f5b93fd4cbae804788723e1c8da7ef39a5ba254ea"; + sha256 = "e22db3e3aa6519dd990e16d6e10c8cf003999aa83b9f50f4ba80d3c86c73dba7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.1/linux-i686/sk/thunderbird-102.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-i686/sk/thunderbird-102.0.2.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "a2a80498b2ca10d5fcc3298f25545c0422850ecd685b9d48f7045d00ef5eddc2"; + sha256 = "d7d1fe7d44c07ef15ebf3504ee66f2f5c9f9a9710d4e1f4f9e42816b26b44a4e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.1/linux-i686/sl/thunderbird-102.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-i686/sl/thunderbird-102.0.2.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "726b3573a42d94bb9953e19762c02cfe4f974d0aee7767c8844890ffc3ecad9e"; + sha256 = "b91300228f4449ac4cf9f8013ef0872946504e1ba8aae18053d371359f7e17da"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.1/linux-i686/sq/thunderbird-102.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-i686/sq/thunderbird-102.0.2.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "fa3981a4244f63c85fb41da164186631f7c613c750d3041dc7546ad63bb57661"; + sha256 = "6198d701388f2b3eea954bd5189c1d6b8d1633fa8f66e2dc3a123ec40bffc382"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.1/linux-i686/sr/thunderbird-102.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-i686/sr/thunderbird-102.0.2.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "8ff5186165c3fee05d74ab331e54e8d84a820170e5247171472d7ffbced7e20c"; + sha256 = "07b0d41ee93edea4d3fca98b5d2f3c6a046b6516eeb32d4f75a16a159723077a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.1/linux-i686/sv-SE/thunderbird-102.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-i686/sv-SE/thunderbird-102.0.2.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "a80b833326045d6624ed5de30496801bdef37e197dc9667882bff41ec3735d42"; + sha256 = "0a7f891e29298536a8f221492955bc1c0ca1f617a16e073f862380d059c753aa"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.1/linux-i686/th/thunderbird-102.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-i686/th/thunderbird-102.0.2.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "cab27baf78d86a8161f81b9333e9175b418ac28e2885fda64f18a9926363b13c"; + sha256 = "f6faf753d9d46d3bf1c6ac2c63ed8ffa3ae82f32d5e7d38362eed05708630d5d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.1/linux-i686/tr/thunderbird-102.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-i686/tr/thunderbird-102.0.2.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "f66125a35d2f453ac614c5aac0f0bd42de3f0ddeb71c03e2145bfc90f2c09fcf"; + sha256 = "9b7aef5d3d2c97a5aa96060c8cce9b80ef862f1fa6a948e8f079cf3401e38f14"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.1/linux-i686/uk/thunderbird-102.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-i686/uk/thunderbird-102.0.2.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "f2c05d4e9a772f12a6ad1a698e3b700371c5fc8a2e379333aa3ffd38ecabd11e"; + sha256 = "490703856b02172c146c2703b630b9d06586a093f88ebeddfff9a666dd713335"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.1/linux-i686/uz/thunderbird-102.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-i686/uz/thunderbird-102.0.2.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "aa747105858af3cd3e5f255d75b9a41d6427d86d0c7950582d8688bb227d112d"; + sha256 = "f4629622b8e5d6aff9f1dac72eea73ccbac27491913e6f03464efe5c19187129"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.1/linux-i686/vi/thunderbird-102.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-i686/vi/thunderbird-102.0.2.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "954b804a671c0d820d07a47b80fb8bc43a6d7a931702f5feb3e5904986265a2b"; + sha256 = "a6ebcf38e4f860376fbcc6811e7fe9d688960a98a581d7eba7097b6b54db1898"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.1/linux-i686/zh-CN/thunderbird-102.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-i686/zh-CN/thunderbird-102.0.2.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "c03f7ab97a7f0fd0f13ae849a0c13f147ec32e4b26a7f878ef6d248f9d4172b1"; + sha256 = "75787fd56d89d2841f58381efc28435acc70399bdbc8589b7b0e50f8c63fa892"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.1/linux-i686/zh-TW/thunderbird-102.0.1.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/102.0.2/linux-i686/zh-TW/thunderbird-102.0.2.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "2ca14ce31ec75ae61eacebd6022154a1b6d8c476eb90a860f2084115932511b9"; + sha256 = "854c1e0c700a023e3361b48d34a3048ca783ba0b3c8b4fd9e3ec1d30bbaf4e30"; } ]; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird/packages.nix b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird/packages.nix index b56d798285..be24852735 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird/packages.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird/packages.nix @@ -29,6 +29,7 @@ rec { }; updateScript = callPackage ./update.nix { attrPath = "thunderbird-91-unwrapped"; + versionPrefix = "91"; }; }).override { geolocationSupport = false; @@ -38,13 +39,13 @@ rec { }; thunderbird-102 = (buildMozillaMach rec { pname = "thunderbird"; - version = "102.0.1"; + version = "102.0.2"; application = "comm/mail"; applicationName = "Mozilla Thunderbird"; binaryName = pname; src = fetchurl { url = "mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz"; - sha512 = "72e6ac7946d8bdcee1a46a321c1226fb88facc299cf01f63b139e7e84a4692284cb20e615c5f9a6da12c974a17e2deb548dde48a77d56b1850f71bdcedb137d8"; + sha512 = "c757543aff8b0acc48f1e2d5fb94024fa894a34f27275eb9c9193d8d2c6aee7643d8b762e7b511c2217130a93ffb0d5e7a405b2bfb15ea129b2a6f9ae9c7e9f2"; }; extraPatches = [ # The file to be patched is different from firefox's `no-buildconfig-ffx90.patch`. @@ -63,6 +64,7 @@ rec { }; updateScript = callPackage ./update.nix { attrPath = "thunderbird-unwrapped"; + versionPrefix = "102"; }; }).override { geolocationSupport = false; diff --git a/third_party/nixpkgs/pkgs/applications/networking/remote/aws-workspaces/default.nix b/third_party/nixpkgs/pkgs/applications/networking/remote/aws-workspaces/default.nix index 4eea552810..71a3080a49 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/remote/aws-workspaces/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/remote/aws-workspaces/default.nix @@ -1,19 +1,19 @@ { stdenv, lib , makeWrapper, dpkg, fetchurl, autoPatchelfHook -, curl, libkrb5, lttng-ust, libpulseaudio, gtk3, openssl_1_1, icu, webkitgtk, librsvg, gdk-pixbuf, libsoup, glib-networking +, curl, libkrb5, lttng-ust, libpulseaudio, gtk3, openssl_1_1, icu70, webkitgtk, librsvg, gdk-pixbuf, libsoup, glib-networking, graphicsmagick_q16 }: stdenv.mkDerivation rec { pname = "aws-workspaces"; - version = "4.0.1.1302"; + version = "4.1.0.1523"; src = fetchurl { # ref https://d3nt0h4h6pmmc4.cloudfront.net/ubuntu/dists/bionic/main/binary-amd64/Packages urls = [ "https://d3nt0h4h6pmmc4.cloudfront.net/ubuntu/dists/bionic/main/binary-amd64/workspacesclient_${version}_amd64.deb" - "https://web.archive.org/web/20210921220718/https://d3nt0h4h6pmmc4.cloudfront.net/ubuntu/dists/bionic/main/binary-amd64/workspacesclient_${version}_amd64.deb" + "https://web.archive.org/web/20220709124028/https://d3nt0h4h6pmmc4.cloudfront.net/ubuntu/dists/bionic/main/binary-amd64/workspacesclient_${version}_amd64.deb" ]; - sha256 = "208e67a544be5be7ff25218d68b4eb2ea9e65abfed444c99a0f7a6738d69ab9a"; + sha256 = "sha256-nOrIOPZ0yOBGOQgNQxnm1cVR9NJ+BTEC12UB7Ux1yuk="; }; nativeBuildInputs = [ @@ -33,12 +33,13 @@ stdenv.mkDerivation rec { libpulseaudio gtk3 openssl_1_1.out - icu + icu70 webkitgtk librsvg gdk-pixbuf libsoup glib-networking + graphicsmagick_q16 ]; unpackPhase = '' @@ -47,6 +48,7 @@ stdenv.mkDerivation rec { preFixup = '' patchelf --replace-needed liblttng-ust.so.0 liblttng-ust.so $out/lib/libcoreclrtraceptprovider.so + patchelf --replace-needed libGraphicsMagick++-Q16.so.12 libGraphicsMagick++.so.12 $out/usr/lib/x86_64-linux-gnu/pcoip-client/vchan_plugins/libvchan-plugin-clipboard.so ''; installPhase = '' diff --git a/third_party/nixpkgs/pkgs/applications/networking/remote/wayvnc/default.nix b/third_party/nixpkgs/pkgs/applications/networking/remote/wayvnc/default.nix index 21244a1859..e8618c4d38 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/remote/wayvnc/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/remote/wayvnc/default.nix @@ -1,20 +1,20 @@ { lib, stdenv, fetchFromGitHub, meson, pkg-config, ninja, scdoc, wayland-scanner -, pixman, libxkbcommon, wayland, neatvnc, libdrm, libX11, aml, pam +, pixman, libxkbcommon, wayland, neatvnc, libdrm, libX11, aml, pam, mesa }: stdenv.mkDerivation rec { pname = "wayvnc"; - version = "0.4.1"; + version = "0.5.0"; src = fetchFromGitHub { owner = "any1"; repo = pname; rev = "v${version}"; - sha256 = "0cws9jfnmxqycmlyllvvqzw4jsbrwwk10v9gy8wifv3c61rwgdkk"; + sha256 = "sha256-/OKkQKt43lR0UCmQeSDMl1hXh03k+dX3UweigMWEUx4="; }; nativeBuildInputs = [ meson pkg-config ninja scdoc wayland-scanner ]; - buildInputs = [ pixman libxkbcommon wayland neatvnc libdrm libX11 aml pam ]; + buildInputs = [ pixman libxkbcommon wayland neatvnc libdrm libX11 aml pam mesa ]; meta = with lib; { description = "A VNC server for wlroots based Wayland compositors"; @@ -29,6 +29,6 @@ stdenv.mkDerivation rec { changelog = "https://github.com/any1/wayvnc/releases/tag/v${version}"; license = licenses.isc; platforms = platforms.linux; - maintainers = with maintainers; [ primeos ]; + maintainers = with maintainers; [ nickcao ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/seaweedfs/default.nix b/third_party/nixpkgs/pkgs/applications/networking/seaweedfs/default.nix index bd6df5ef6b..e9dc1eb492 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/seaweedfs/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/seaweedfs/default.nix @@ -7,16 +7,16 @@ buildGoModule rec { pname = "seaweedfs"; - version = "2.91"; + version = "3.15"; src = fetchFromGitHub { owner = "chrislusf"; repo = "seaweedfs"; rev = version; - sha256 = "sha256-lpr+Z4INDUrMUArR9yU/US/d7rhQ3AcTS3bh/suOe4M="; + sha256 = "sha256-07cIqGKmw2Co7GEc/APiOWTgflUwDIQPQzs73XTAPQA="; }; - vendorSha256 = "sha256-T8JUc8UqdgBADWfQL1oY0lrwOOKTmbBiI7rtNiDvlGo="; + vendorSha256 = "sha256-4U96s9PJLuVuzgWXCMLKfXK/XK1EaC+ep2c8TpKVRlc="; subPackages = [ "weed" ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/shellhub-agent/default.nix b/third_party/nixpkgs/pkgs/applications/networking/shellhub-agent/default.nix index f584eea5cc..531c0f9658 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/shellhub-agent/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/shellhub-agent/default.nix @@ -8,18 +8,18 @@ buildGoModule rec { pname = "shellhub-agent"; - version = "0.9.2"; + version = "0.9.3"; src = fetchFromGitHub { owner = "shellhub-io"; repo = "shellhub"; rev = "v${version}"; - sha256 = "clLSkby7bmjScUpSZkVvHt5nSIoQOaYrxsoLqiuQZik="; + sha256 = "WSK2b1DYSYEFqmVIOlhjFGyqC9ok/9rWAz2ZgUZejzo="; }; modRoot = "./agent"; - vendorSha256 = "sha256-XVLsmU4EfOTFVpF5he+FCyDr/NuApUBC9R00nO1HJrg="; + vendorSha256 = "sha256-UDsgfsdq8DecyTAFrmWO09V3JIuTA5YLCEAei0tYRy4="; ldflags = [ "-s" "-w" "-X main.AgentVersion=v${version}" ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/sync/rclone/default.nix b/third_party/nixpkgs/pkgs/applications/networking/sync/rclone/default.nix index a08c010192..c93f35bff9 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/sync/rclone/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/sync/rclone/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "rclone"; - version = "1.58.1"; + version = "1.59.0"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-Hh0IVNaLAUOmdYJ6cbYFyDCLwL+0HyZdRzKnXAT0CB8="; + sha256 = "sha256-SHUAEjdcqzNiIxSsmYb71JiOhWPoi8Z2nJAReRw2M5k="; }; - vendorSha256 = "sha256-MPo1t1gzlrzAzbTOv/dSs2BH8NwlXmf6vo1DOFP2TrM="; + vendorSha256 = "sha256-ajOUvZ/0D8QL4MY6xO+hZziyUtIB0WQERU6Ov06K9I8="; subPackages = [ "." ]; diff --git a/third_party/nixpkgs/pkgs/applications/office/jabref/default.nix b/third_party/nixpkgs/pkgs/applications/office/jabref/default.nix index 8d1f639622..78fe02e944 100644 --- a/third_party/nixpkgs/pkgs/applications/office/jabref/default.nix +++ b/third_party/nixpkgs/pkgs/applications/office/jabref/default.nix @@ -1,74 +1,144 @@ -{ lib, stdenv, fetchurl, makeWrapper, makeDesktopItem, wrapGAppsHook, gtk3, gsettings-desktop-schemas -, zlib , libX11, libXext, libXi, libXrender, libXtst, libGL, alsa-lib, cairo, freetype, pango, gdk-pixbuf, glib }: +{ lib +, stdenv +, fetchFromGitHub +, makeWrapper +, makeDesktopItem +, copyDesktopItems +, unzip +, xdg-utils +, jdk +, gradle +, perl +}: stdenv.mkDerivation rec { - version = "5.5"; + version = "5.6"; pname = "jabref"; - src = fetchurl { - url = "https://github.com/JabRef/jabref/releases/download/v${version}/JabRef-${version}-portable_linux.tar.gz"; - sha256 = "sha256-9MHNehyAmu7CiBp1rgb4zTkSqmjXm2tcmiGKFBFapKI="; + src = fetchFromGitHub { + owner = "JabRef"; + repo = "jabref"; + rev = "v${version}"; + hash = "sha256-w3F1td7KmdSor/2vKar3w17bChe1yH7JMobOaCjZqd4="; }; - preferLocalBuild = true; + desktopItems = [ + (makeDesktopItem { + comment = meta.description; + name = "jabref"; + desktopName = "JabRef"; + genericName = "Bibliography manager"; + categories = [ "Office" ]; + icon = "jabref"; + exec = "jabref"; + }) + ]; - desktopItem = makeDesktopItem { - comment = meta.description; - name = "jabref"; - desktopName = "JabRef"; - genericName = "Bibliography manager"; - categories = [ "Office" ]; - icon = "jabref"; - exec = "jabref"; + deps = stdenv.mkDerivation { + pname = "${pname}-deps"; + inherit src version; + + postPatch = '' + sed -i -e '/testImplementation/d' -e '/testRuntimeOnly/d' build.gradle + echo 'dependencyLocking { lockAllConfigurations() }' >> build.gradle + cp ${./gradle.lockfile} ./ + ''; + + nativeBuildInputs = [ gradle perl ]; + buildPhase = '' + export GRADLE_USER_HOME=$(mktemp -d) + gradle --no-daemon downloadDependencies + ''; + # perl code mavenizes pathes (com.squareup.okio/okio/1.13.0/a9283170b7305c8d92d25aff02a6ab7e45d06cbe/okio-1.13.0.jar -> com/squareup/okio/okio/1.13.0/okio-1.13.0.jar) + installPhase = '' + find $GRADLE_USER_HOME/caches/modules-2 -type f -regex '.*\.\(jar\|pom\)' \ + | perl -pe 's#(.*/([^/]+)/([^/]+)/([^/]+)/[0-9a-f]{30,40}/([^/\s]+))$# ($x = $2) =~ tr|\.|/|; "install -Dm444 $1 \$out/$x/$3/$4/''${\($5 =~ s/-jvm//r)}" #e' \ + | sh + ''; + # Don't move info to share/ + forceShare = [ "dummy" ]; + outputHashMode = "recursive"; + outputHash = { + x86_64-linux = "sha256-ySGXZM9LCJUjGCrKMc+5I6duEbmSsp3tU3t/o5nM+5M="; + aarch64-linux = "sha256-mfWyGGBqjRQ8q9ddR57O2rwtby2T1H6Ra2m0JGVZ1Zs="; + }.${stdenv.hostPlatform.system} or (throw "Unsupported system ${stdenv.hostPlatform.system}"); }; - nativeBuildInputs = [ makeWrapper wrapGAppsHook ]; - buildInputs = [ gsettings-desktop-schemas ] ++ systemLibs; + preBuild = '' + # Include CSL styles and locales in our build + cp -r buildres/csl/* src/main/resources/ - systemLibs = [ gtk3 zlib libX11 libXext libXi libXrender libXtst libGL alsa-lib cairo freetype pango gdk-pixbuf glib ]; - systemLibPaths = lib.makeLibraryPath systemLibs; + # Use the local packages from -deps + sed -i -e '/repositories {/a maven { url uri("${deps}") }' \ + build.gradle \ + buildSrc/build.gradle \ + settings.gradle + ''; + + nativeBuildInputs = [ + jdk + gradle + makeWrapper + copyDesktopItems + unzip + ]; + + buildPhase = '' + runHook preBuild + + export GRADLE_USER_HOME=$(mktemp -d) + gradle \ + --offline \ + --no-daemon \ + -PprojVersion="${version}" \ + -PprojVersionInfo="${version} NixOS" \ + assemble + + runHook postBuild + ''; installPhase = '' - mkdir -p $out/share/java $out/share/icons + runHook preInstall - cp -r lib $out/lib + install -dm755 $out/share/java/jabref + install -Dm644 LICENSE.md $out/share/licenses/jabref/LICENSE.md + install -Dm644 src/main/resources/icons/jabref.svg $out/share/pixmaps/jabref.svg - for f in $out/lib/runtime/bin/j*; do - patchelf \ - --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath "${ lib.makeLibraryPath [ zlib ]}:$out/lib/runtime/lib:$out/lib/runtime/lib/server" $f - done + # script to support browser extensions + install -Dm755 buildres/linux/jabrefHost.py $out/lib/jabrefHost.py + # This can be removed in the next version + sed -i -e "/importBibtex/s/{}/'{}'/" $out/lib/jabrefHost.py + install -Dm644 buildres/linux/native-messaging-host/firefox/org.jabref.jabref.json $out/lib/mozilla/native-messaging-hosts/org.jabref.jabref.json + sed -i -e "s|/opt/jabref|$out|" $out/lib/mozilla/native-messaging-hosts/org.jabref.jabref.json - for f in $out/lib/runtime/lib/*.so; do - patchelf \ - --set-rpath "${systemLibPaths}:$out/lib/runtime/lib:$out/lib/runtime/lib/server" $f - done + # Resources in the jar can't be found, workaround copied from AUR + cp -r build/resources $out/share/java/jabref - # patching the libs in the JImage runtime image is quite impossible as there is no documented way - # of rebuilding the image after it has been extracted - # the image format itself is "intendedly not documented" - maybe one of the reasons the - # devolpers constantly broke "jimage recreate" and dropped it in OpenJDK 9 Build 116 Early Access - # so, for now just copy the image and provide our lib paths through the wrapper + # workaround for https://github.com/NixOS/nixpkgs/issues/162064 + tar xf build/distributions/JabRef-${version}.tar -C $out --strip-components=1 + unzip $out/lib/javafx-web-18-linux${lib.optionalString stdenv.isAarch64 "-aarch64"}.jar libjfxwebkit.so -d $out/lib/ - makeWrapper $out/lib/runtime/bin/java $out/bin/jabref \ - --add-flags '-Djava.library.path=${systemLibPaths}' --add-flags "-p $out/lib/app -m org.jabref/org.jabref.JabRefLauncher" \ - --prefix LD_LIBRARY_PATH : '${systemLibPaths}' + wrapProgram $out/bin/JabRef \ + --prefix PATH : ${lib.makeBinPath [ xdg-utils ]} \ + --set JAVA_HOME "${jdk}" \ + --set JAVA_OPTS "-Djava.library.path=$out/lib/ --patch-module org.jabref=$out/share/java/jabref/resources/main" - cp -r ${desktopItem}/share/applications $out/share/ + # lowercase alias (for convenience and required for browser extensions) + ln -sf $out/bin/JabRef $out/bin/jabref - # we still need to unpack the runtime image to get the icon - mkdir unpacked - $out/lib/runtime/bin/jimage extract --dir=./unpacked lib/runtime/lib/modules - cp unpacked/org.jabref/icons/jabref.svg $out/share/icons/jabref.svg + runHook postInstall ''; meta = with lib; { - broken = (stdenv.isLinux && stdenv.isAarch64); description = "Open source bibliography reference manager"; homepage = "https://www.jabref.org"; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; + sourceProvenance = with sourceTypes; [ + fromSource + binaryBytecode # source bundles dependencies as jars + binaryNativeCode # source bundles dependencies as jars + ]; license = licenses.gpl2; - platforms = platforms.unix; - maintainers = [ maintainers.gebner ]; + platforms = [ "x86_64-linux" "aarch64-linux" ]; + maintainers = with maintainers; [ gebner linsui ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/office/jabref/gradle.lockfile b/third_party/nixpkgs/pkgs/applications/office/jabref/gradle.lockfile new file mode 100644 index 0000000000..560420fb6e --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/office/jabref/gradle.lockfile @@ -0,0 +1,180 @@ +# This is a Gradle generated file for dependency locking. +# Manual edits can break the build and are not advised. +# This file is expected to be part of source control. +classworlds:classworlds:1.1-alpha-2=modernizer +com.fasterxml.jackson.core:jackson-annotations:2.13.2=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.fasterxml.jackson.core:jackson-core:2.13.2=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.fasterxml.jackson.core:jackson-databind:2.13.2=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.fasterxml.jackson.dataformat:jackson-dataformat-yaml:2.13.2=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.13.2=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.fasterxml.jackson:jackson-bom:2.13.2=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.github.tomtung:latex2unicode_2.12:0.2.6=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.code.findbugs:jsr305:3.0.2=checkstyle +com.google.code.gson:gson:2.9.0=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.errorprone:error_prone_annotations:2.11.0=checkstyle,compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:failureaccess:1.0.1=checkstyle,compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:guava:31.1-jre=checkstyle,compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.guava:listenablefuture:9999.0-empty-to-avoid-conflict-with-guava=checkstyle,compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.google.j2objc:j2objc-annotations:1.3=checkstyle,compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.googlecode.javaewah:JavaEWAH:1.1.13=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.h2database:h2-mvstore:2.1.212=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.ibm.icu:icu4j-charset:70.1=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.ibm.icu:icu4j:69.1=antlr4 +com.ibm.icu:icu4j:70.1=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.jfoenix:jfoenix:9.0.10=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.konghq:unirest-java:3.13.8=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.microsoft.azure:applicationinsights-core:2.4.1=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.microsoft.azure:applicationinsights-logging-log4j2:2.4.1=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.oracle.ojdbc:ojdbc10:19.3.0.0=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.oracle.ojdbc:ons:19.3.0.0=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.oracle.ojdbc:osdt_cert:19.3.0.0=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.oracle.ojdbc:osdt_core:19.3.0.0=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.oracle.ojdbc:simplefan:19.3.0.0=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.oracle.ojdbc:ucp:19.3.0.0=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.puppycrawl.tools:checkstyle:10.1=checkstyle +com.sun.activation:jakarta.activation:2.0.1=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath,xjc +com.sun.istack:istack-commons-runtime:4.0.1=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath,xjc +com.sun.istack:istack-commons-tools:4.0.1=xjc +com.sun.xml.bind.external:relaxng-datatype:3.0.2=xjc +com.sun.xml.bind.external:rngom:3.0.2=xjc +com.sun.xml.dtd-parser:dtd-parser:1.4.5=xjc +com.tobiasdiez:easybind:2.2=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.vladsch.flexmark:flexmark-ext-gfm-strikethrough:0.64.0=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.vladsch.flexmark:flexmark-ext-gfm-tasklist:0.64.0=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.vladsch.flexmark:flexmark-util-ast:0.64.0=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.vladsch.flexmark:flexmark-util-builder:0.64.0=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.vladsch.flexmark:flexmark-util-collection:0.64.0=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.vladsch.flexmark:flexmark-util-data:0.64.0=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.vladsch.flexmark:flexmark-util-dependency:0.64.0=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.vladsch.flexmark:flexmark-util-format:0.64.0=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.vladsch.flexmark:flexmark-util-html:0.64.0=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.vladsch.flexmark:flexmark-util-misc:0.64.0=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.vladsch.flexmark:flexmark-util-options:0.64.0=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.vladsch.flexmark:flexmark-util-sequence:0.64.0=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.vladsch.flexmark:flexmark-util-visitor:0.64.0=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.vladsch.flexmark:flexmark-util:0.64.0=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +com.vladsch.flexmark:flexmark:0.64.0=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +commons-beanutils:commons-beanutils:1.9.4=checkstyle +commons-cli:commons-cli:1.5.0=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +commons-codec:commons-codec:1.11=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +commons-collections:commons-collections:3.2.2=checkstyle +commons-io:commons-io:2.11.0=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +commons-logging:commons-logging:1.2=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +de.saxsys:mvvmfx-validation:1.9.0-SNAPSHOT=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +de.saxsys:mvvmfx:1.8.0=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +de.undercouch:citeproc-java:3.0.0-alpha.6=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +eu.lestard:doc-annotations:0.2=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +info.debatty:java-string-similarity:2.0.0=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +info.picocli:picocli:4.6.3=checkstyle +io.github.java-diff-utils:java-diff-utils:4.11=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +jakarta.annotation:jakarta.annotation-api:1.3.5=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +jakarta.xml.bind:jakarta.xml.bind-api:3.0.1=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath,xjc +junit:junit:3.8.1=modernizer +net.harawata:appdirs:1.2.1=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.java.dev.jna:jna-platform:5.6.0=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.java.dev.jna:jna:5.6.0=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.jcip:jcip-annotations:1.0=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.jodah:typetools:0.6.1=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +net.sf.jopt-simple:jopt-simple:4.6=jmh,jmhCompileClasspath,jmhRuntimeClasspath +net.sf.saxon:Saxon-HE:10.6=checkstyle +org.abego.treelayout:org.abego.treelayout.core:1.0.3=antlr4 +org.antlr:ST4:4.3.1=antlr3,antlr4 +org.antlr:antlr-runtime:3.5.2=antlr4,compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.antlr:antlr-runtime:3.5.3=antlr3 +org.antlr:antlr4-runtime:4.9.3=antlr4,checkstyle,compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.antlr:antlr4:4.9.3=antlr4 +org.antlr:antlr:3.5.3=antlr3 +org.apache.commons:commons-csv:1.9.0=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.apache.commons:commons-lang3:3.12.0=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.apache.commons:commons-math3:3.2=jmh,jmhCompileClasspath,jmhRuntimeClasspath +org.apache.commons:commons-text:1.9=compile,jmhRuntimeClasspath,runtimeClasspath,testRuntimeClasspath +org.apache.httpcomponents:httpasyncclient:4.1.5=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.apache.httpcomponents:httpclient:4.5.13=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.apache.httpcomponents:httpcore-nio:4.4.13=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.apache.httpcomponents:httpcore:4.4.13=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.apache.httpcomponents:httpmime:4.5.13=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.apache.lucene:lucene-analysis-common:9.1.0=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.apache.lucene:lucene-core:9.1.0=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.apache.lucene:lucene-highlighter:9.1.0=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.apache.lucene:lucene-memory:9.1.0=compile,jmhRuntimeClasspath,runtimeClasspath,testRuntimeClasspath +org.apache.lucene:lucene-queries:9.1.0=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.apache.lucene:lucene-queryparser:9.1.0=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.apache.lucene:lucene-sandbox:9.1.0=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.apache.maven.wagon:wagon-provider-api:1.0-beta-2=modernizer +org.apache.maven:maven-artifact-manager:2.0.9=modernizer +org.apache.maven:maven-artifact:2.0.9=modernizer +org.apache.maven:maven-model:2.0.9=modernizer +org.apache.maven:maven-plugin-api:2.0=modernizer +org.apache.maven:maven-plugin-registry:2.0.9=modernizer +org.apache.maven:maven-profile:2.0.9=modernizer +org.apache.maven:maven-project:2.0.9=modernizer +org.apache.maven:maven-repository-metadata:2.0.9=modernizer +org.apache.maven:maven-settings:2.0.9=modernizer +org.apache.pdfbox:fontbox:3.0.0-RC1=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.apache.pdfbox:pdfbox:3.0.0-RC1=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.apache.pdfbox:xmpbox:3.0.0-RC1=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.apache.tika:tika-core:2.3.0=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.bouncycastle:bcprov-jdk15on:1.70=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.checkerframework:checker-qual:3.12.0=checkstyle,compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.codehaus.mojo:animal-sniffer-annotations:1.18=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.codehaus.plexus:plexus-container-default:1.0-alpha-9-stable-1=modernizer +org.controlsfx:controlsfx:11.1.1=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.eclipse.jgit:org.eclipse.jgit:6.1.0.202203080745-r=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.fxmisc.flowless:flowless:0.6.9=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.fxmisc.richtext:richtextfx:0.10.9=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.fxmisc.undo:undofx:2.1.1=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.fxmisc.wellbehaved:wellbehavedfx:0.3.3=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.gaul:modernizer-maven-annotations:2.3.0=modernizer +org.gaul:modernizer-maven-plugin:2.3.0=modernizer +org.glassfish.hk2.external:jakarta.inject:2.6.1=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.glassfish.jaxb:codemodel:3.0.2=xjc +org.glassfish.jaxb:jaxb-core:3.0.2=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath,xjc +org.glassfish.jaxb:jaxb-runtime:3.0.2=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath,xjc +org.glassfish.jaxb:jaxb-xjc:3.0.2=xjc +org.glassfish.jaxb:txw2:3.0.2=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath,xjc +org.glassfish.jaxb:xsom:3.0.2=xjc +org.glassfish:javax.json:1.0.4=antlr4 +org.jacoco:org.jacoco.agent:0.8.7=jacocoAgent,jacocoAnt +org.jacoco:org.jacoco.ant:0.8.7=jacocoAnt +org.jacoco:org.jacoco.core:0.8.7=jacocoAnt +org.jacoco:org.jacoco.report:0.8.7=jacocoAnt +org.javassist:javassist:3.28.0-GA=checkstyle +org.jbibtex:jbibtex:1.0.19=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.jetbrains:annotations:15.0=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.jsoup:jsoup:1.14.3=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.kordamp.ikonli:ikonli-core:12.3.1=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.kordamp.ikonli:ikonli-javafx:12.3.1=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.kordamp.ikonli:ikonli-materialdesign2-pack:12.3.1=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.libreoffice:libreoffice:7.3.2=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.libreoffice:unoloader:7.3.2=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.mariadb.jdbc:mariadb-java-client:2.7.5=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.openjdk.jmh:jmh-core:1.25=jmh,jmhCompileClasspath,jmhRuntimeClasspath +org.openjdk.jmh:jmh-generator-asm:1.25=jmh,jmhCompileClasspath,jmhRuntimeClasspath +org.openjdk.jmh:jmh-generator-bytecode:1.25=jmh,jmhCompileClasspath,jmhRuntimeClasspath +org.openjdk.jmh:jmh-generator-reflection:1.25=jmh,jmhCompileClasspath,jmhRuntimeClasspath +org.openjfx:javafx-base:18=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.openjfx:javafx-controls:18=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.openjfx:javafx-fxml:18=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.openjfx:javafx-graphics:18=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.openjfx:javafx-media:18=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.openjfx:javafx-swing:18=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.openjfx:javafx-web:18=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.ow2.asm:asm-analysis:9.1=jacocoAnt +org.ow2.asm:asm-analysis:9.2=modernizer +org.ow2.asm:asm-commons:9.1=jacocoAnt +org.ow2.asm:asm-commons:9.2=modernizer +org.ow2.asm:asm-tree:9.1=jacocoAnt +org.ow2.asm:asm-tree:9.2=modernizer +org.ow2.asm:asm:5.0.3=jmh,jmhCompileClasspath,jmhRuntimeClasspath +org.ow2.asm:asm:9.1=jacocoAnt +org.ow2.asm:asm:9.2=modernizer +org.postgresql:postgresql:42.3.3=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.reactfx:reactfx:2.0-M5=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.reflections:reflections:0.10.2=checkstyle +org.scala-lang:scala-library:2.12.8=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.slf4j:slf4j-api:2.0.0-alpha7=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.tinylog:slf4j-tinylog:2.4.1=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.tinylog:tinylog-api:2.4.1=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.tinylog:tinylog-impl:2.4.1=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +org.yaml:snakeyaml:1.30=compile,compileClasspath,jmhCompileClasspath,jmhRuntimeClasspath,runtimeClasspath,testCompileClasspath,testRuntimeClasspath +empty=annotationProcessor,jmhAnnotationProcessor,testAnnotationProcessor diff --git a/third_party/nixpkgs/pkgs/applications/radio/aldo/default.nix b/third_party/nixpkgs/pkgs/applications/radio/aldo/default.nix index b850ea1014..cbe906e467 100644 --- a/third_party/nixpkgs/pkgs/applications/radio/aldo/default.nix +++ b/third_party/nixpkgs/pkgs/applications/radio/aldo/default.nix @@ -20,7 +20,7 @@ in stdenv.mkDerivation { description = "Morse code training program"; homepage = "http://aldo.nongnu.org/"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ etu ]; + maintainers = with maintainers; [ ]; platforms = platforms.linux; }; } diff --git a/third_party/nixpkgs/pkgs/applications/radio/dmrconfig/default.nix b/third_party/nixpkgs/pkgs/applications/radio/dmrconfig/default.nix index b91e9bc63a..dab93eabe7 100644 --- a/third_party/nixpkgs/pkgs/applications/radio/dmrconfig/default.nix +++ b/third_party/nixpkgs/pkgs/applications/radio/dmrconfig/default.nix @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { ''; homepage = "https://github.com/sergev/dmrconfig"; license = licenses.asl20; - maintainers = [ maintainers.etu ]; + maintainers = with maintainers; [ ]; platforms = platforms.linux; }; } diff --git a/third_party/nixpkgs/pkgs/applications/radio/tlf/default.nix b/third_party/nixpkgs/pkgs/applications/radio/tlf/default.nix index f988957066..aad6260288 100644 --- a/third_party/nixpkgs/pkgs/applications/radio/tlf/default.nix +++ b/third_party/nixpkgs/pkgs/applications/radio/tlf/default.nix @@ -46,7 +46,7 @@ stdenv.mkDerivation rec { ''; homepage = "https://tlf.github.io/"; license = licenses.gpl2; - maintainers = with maintainers; [ etu ]; + maintainers = with maintainers; [ ]; platforms = platforms.linux; }; } diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/delly/default.nix b/third_party/nixpkgs/pkgs/applications/science/biology/delly/default.nix index f2e0d3a50c..454f23ce88 100644 --- a/third_party/nixpkgs/pkgs/applications/science/biology/delly/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/biology/delly/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "delly"; - version = "0.9.1"; + version = "1.0.3"; src = fetchFromGitHub { owner = "dellytools"; repo = pname; rev = "v${version}"; - sha256 = "sha256-p1pryP+ktGt8OHFiASJQ3T+K94cNBG9fLxsJ2n/T+DA="; + sha256 = "sha256-37AEaTOFmJ2yYXLwjNa7UXBoH/NxOK8+vlXhUhj6CM4="; }; buildInputs = [ zlib htslib bzip2 xz ncurses boost ]; diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/mafft/default.nix b/third_party/nixpkgs/pkgs/applications/science/biology/mafft/default.nix new file mode 100644 index 0000000000..764a0f0da8 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/science/biology/mafft/default.nix @@ -0,0 +1,27 @@ +{ lib, stdenv, fetchurl }: + +stdenv.mkDerivation rec { + pname = "mafft"; + version = "7.490"; + + src = fetchurl { + url = "https://mafft.cbrc.jp/alignment/software/mafft-${version}-with-extensions-src.tgz"; + sha256 = "0hb5jzcqdnjn3micm5z301lrnyvmn9pnnnxjz4h2wa4yicyz7vnn"; + }; + + preBuild = '' + cd ./core + make clean + ''; + + makeFlags = [ "CC=${stdenv.cc.targetPrefix}cc" "PREFIX=$(out)" ]; + + meta = with lib; + { + description = "Multiple alignment program for amino acid or nucleotide sequences"; + homepage = "https://mafft.cbrc.jp/alignment/software/"; + license = licenses.bsd3; + maintainers = with maintainers; [ natsukium ]; + platforms = platforms.unix; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/science/electronics/vhd2vl/default.nix b/third_party/nixpkgs/pkgs/applications/science/electronics/vhd2vl/default.nix index 089ebb9bb1..9fc65b7392 100644 --- a/third_party/nixpkgs/pkgs/applications/science/electronics/vhd2vl/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/electronics/vhd2vl/default.nix @@ -1,5 +1,6 @@ { lib, stdenv , fetchFromGitHub +, fetchpatch , bison , flex , verilog @@ -18,8 +19,12 @@ stdenv.mkDerivation rec { }; patches = lib.optionals (!stdenv.isAarch64) [ - # fix build with verilog 11.0 - ./test.patch + # fix build with verilog 11.0 - https://github.com/ldoolitt/vhd2vl/pull/15 + # for some strange reason, this is not needed for aarch64 + (fetchpatch { + url = "https://github.com/ldoolitt/vhd2vl/commit/ce9b8343ffd004dfe8779a309f4b5a594dbec45e.patch"; + sha256 = "1qaqhm2mk66spb2dir9n91b385rarglc067js1g6pcg8mg5v3hhf"; + }) ]; nativeBuildInputs = [ @@ -41,7 +46,7 @@ stdenv.mkDerivation rec { installPhase = '' runHook preInstall - install -D -m755 src/vhd2vl $out/bin/vdh2vl + install -D -m755 src/vhd2vl $out/bin/vhd2vl runHook postInstall ''; diff --git a/third_party/nixpkgs/pkgs/applications/science/electronics/vhd2vl/test.patch b/third_party/nixpkgs/pkgs/applications/science/electronics/vhd2vl/test.patch deleted file mode 100644 index 85b91964e3..0000000000 --- a/third_party/nixpkgs/pkgs/applications/science/electronics/vhd2vl/test.patch +++ /dev/null @@ -1,35 +0,0 @@ ---- a/translated_examples/fifo.v 1970-01-01 00:00:01.000000000 +0000 -+++ a/temp/verilog/fifo.v 2022-05-11 03:44:43.173604945 +0000 -@@ -107,7 +107,7 @@ - //--- Read address counter -------------- - //--------------------------------------- - assign add_RD_CE = (iempty == 1'b1) ? 1'b0 : (RD == 1'b0) ? 1'b0 : 1'b1; -- assign n_add_RD = (add_RD) + 4'h1; -+ assign n_add_RD = add_RD + 4'h1; - always @(posedge clk_RD, posedge rst) begin - if((rst == 1'b1)) begin - add_RD <= {5{1'b0}}; -diff -u '--exclude=Makefile' '--exclude-from=examples/exclude' translated_examples/test.v temp/verilog/test.v ---- a/translated_examples/test.v 1970-01-01 00:00:01.000000000 +0000 -+++ a/temp/verilog/test.v 2022-05-11 03:44:43.189604945 +0000 -@@ -125,7 +125,7 @@ - endcase - end - -- assign code1[1:0] = a[6:5] ^ ({a[4],b[6]}); -+ assign code1[1:0] = a[6:5] ^ {a[4],b[6]}; - // Asynch process - always @(we, addr, config1, bip) begin - if(we == 1'b1) begin -diff -u '--exclude=Makefile' '--exclude-from=examples/exclude' translated_examples/withselect.v temp/verilog/withselect.v ---- a/translated_examples/withselect.v 1970-01-01 00:00:01.000000000 +0000 -+++ a/temp/verilog/withselect.v 2022-05-11 03:44:43.193604945 +0000 -@@ -33,7 +33,7 @@ - endcase - end - -- assign code1[1:0] = a[6:5] ^ ({a[4],b[6]}); -+ assign code1[1:0] = a[6:5] ^ {a[4],b[6]}; - assign foo = {(((1 + 1))-((0))+1){1'b0}}; - assign egg = {78{1'b0}}; - assign baz = {(((bus_width * 4))-((bus_width * 3 - 1))+1){1'b1}}; diff --git a/third_party/nixpkgs/pkgs/applications/science/engineering/jflap/default.nix b/third_party/nixpkgs/pkgs/applications/science/engineering/jflap/default.nix new file mode 100644 index 0000000000..0559f89227 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/science/engineering/jflap/default.nix @@ -0,0 +1,70 @@ +{ lib +, stdenvNoCC +, fetchurl +, jre8 +, makeWrapper +, makeDesktopItem +, copyDesktopItems +}: + +stdenvNoCC.mkDerivation rec { + pname = "jflap"; + version = "7.1"; + + src = fetchurl { + url = "https://www.jflap.org/jflaptmp/july27-18/JFLAP${version}.jar"; + sha256 = "oiwJXdxWsYFj6Ovu7xZbOgTLVw8160a5YQUWbgbJlAY="; + }; + + nativeBuildInputs = [ + makeWrapper + copyDesktopItems + ]; + + buildInputs = [ + jre8 + ]; + + dontUnpack = true; + + desktopItems = [ + (makeDesktopItem { + name = "jflap"; + desktopName = "jflap"; + genericName = "Formal language application"; + exec = "jflap"; + icon = fetchurl { + url = "https://www.jflap.org/jflapLogo2.jpg"; + sha256 = "sha256-IiworHI+GT6Fm6B0E+FXnKe+hN8nZYPrxHGZFAcsWDw="; + }; + comment = meta.description; + categories = [ + "Development" + "Education" + "ComputerScience" + "DataVisualization" + "Engineering" + "Java" + ]; + }) + ]; + + installPhase = '' + runHook preInstall + mkdir -p $out/share/java + cp -s $src $out/share/java/jflap.jar + makeWrapper ${jre8}/bin/java $out/bin/jflap \ + --prefix _JAVA_OPTIONS : "-Dawt.useSystemAAFontSettings=on" \ + --add-flags "-jar $out/share/java/jflap.jar" + runHook postInstall + ''; + + meta = with lib; { + description = "GUI tool for experimenting with formal languages topics"; + homepage = "https://www.jflap.org/"; + license = licenses.unfree; + sourceProvenance = with sourceTypes; [ binaryBytecode ]; + maintainers = with maintainers; [ grnnja yuu ]; + platforms = jre8.meta.platforms; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/science/engineering/strictdoc/conftest.py.patch b/third_party/nixpkgs/pkgs/applications/science/engineering/strictdoc/conftest.py.patch new file mode 100644 index 0000000000..2fadf242b7 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/science/engineering/strictdoc/conftest.py.patch @@ -0,0 +1,15 @@ +diff --git a/tests/unit/conftest.py b/tests/unit/conftest.py +index 932747c..9b3d6ac 100644 +--- a/tests/unit/conftest.py ++++ b/tests/unit/conftest.py +@@ -1,9 +1,7 @@ + import os + import sys + +-STRICTDOC_ROOT_PATH = os.path.abspath( +- os.path.join(__file__, "../../../../strictdoc") +-) ++STRICTDOC_ROOT_PATH = "@strictdoc_root_path@" + assert os.path.exists(STRICTDOC_ROOT_PATH), "does not exist: {}".format( + STRICTDOC_ROOT_PATH + ) diff --git a/third_party/nixpkgs/pkgs/applications/science/engineering/strictdoc/default.nix b/third_party/nixpkgs/pkgs/applications/science/engineering/strictdoc/default.nix new file mode 100644 index 0000000000..3fc61b8451 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/science/engineering/strictdoc/default.nix @@ -0,0 +1,100 @@ +{ lib +, stdenv +, buildPythonApplication +, fetchFromGitHub +, python3 +, pythonOlder +, html5lib +, invoke +, openpyxl +, poetry-core +, tidylib +, beautifulsoup4 +, dataclasses +, datauri +, docutils +, jinja2 +, lxml +, markupsafe +, pygments +, reqif +, setuptools +, textx +, xlrd +, XlsxWriter +, pytestCheckHook +}: + +buildPythonApplication rec { + pname = "strictdoc"; + version = "0.0.26"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "strictdoc-project"; + repo = pname; + rev = version; + sha256 = "sha256-SMAwji75AjW8CzXRKBDF+fR/a5++GhgIvkcuD+a/vp4="; + }; + + patches = [ + ./conftest.py.patch + ]; + + postPatch = '' + substituteInPlace ./tests/unit/conftest.py \ + --replace @strictdoc_root_path@ "${placeholder "out"}/${python3.sitePackages}/strictdoc" + + substituteInPlace requirements.txt \ + --replace "jinja2 >= 2.11.2, <3.0" "jinja2 >= 2.11.2" \ + --replace "reqif >= 0.0.18, == 0.*" "reqif>=0.0.8" \ + --replace "==" ">=" \ + --replace "~=" ">=" + ''; + + nativeBuildInputs = [ + html5lib + invoke + openpyxl + poetry-core + tidylib + ]; + + propagatedBuildInputs = [ + beautifulsoup4 + datauri + docutils + jinja2 + lxml + markupsafe + pygments + reqif + setuptools + textx + xlrd + XlsxWriter + ] ++ lib.optionals (pythonOlder "3.7") [ + dataclasses + ]; + + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "strictdoc" + ]; + + disabledTests = [ + # fixture 'fs' not found + "test_001_load_from_files" + ]; + + meta = with lib; { + description = "Software requirements specification tool"; + homepage = "https://github.com/strictdoc-project/strictdoc"; + changelog = "https://github.com/strictdoc-project/strictdoc/releases"; + license = licenses.asl20; + maintainers = with maintainers; [ yuu ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/formula/default.nix b/third_party/nixpkgs/pkgs/applications/science/logic/formula/default.nix index f366003914..5b39e91531 100644 --- a/third_party/nixpkgs/pkgs/applications/science/logic/formula/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/logic/formula/default.nix @@ -31,5 +31,6 @@ buildDotnetModule rec { license = licenses.mspl; maintainers = with maintainers; [ siraben ]; platforms = platforms.unix; + mainProgram = "formula"; }; } diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/zchaff/default.nix b/third_party/nixpkgs/pkgs/applications/science/logic/zchaff/default.nix index 5fd73a8def..57f673042d 100644 --- a/third_party/nixpkgs/pkgs/applications/science/logic/zchaff/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/logic/zchaff/default.nix @@ -1,15 +1,19 @@ -{ lib, clangStdenv, fetchurl }: +{ lib, clangStdenv, fetchzip }: clangStdenv.mkDerivation rec { pname = "zchaff"; - version = "2004.5.13"; + version = "2007.3.12"; - src = fetchurl { - url = "https://www.princeton.edu/~chaff/zchaff/zchaff.${version}.tar.gz"; - sha256 = "sha256-IgOdb2KsFbRV3gPvIPkHa71ixnYRxyx91vt7m0jzIAw="; + src = fetchzip { + url = "https://www.princeton.edu/~chaff/zchaff/zchaff.64bit.${version}.zip"; + sha256 = "sha256-88fAtJb7o+Qv2GohTdmquxMEq4oCbiKbqLFmS7zs1Ak="; }; patches = [ ./sat_solver.patch ]; + postPatch = '' + substituteInPlace zchaff_solver.cpp --replace "// #define VERIFY_ON" "#define VERIFY_ON" + ''; + makeFlags = [ "CC=${clangStdenv.cc.targetPrefix}c++" ]; installPhase= '' runHook preInstall 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 7e7b7a4752..03a427e06c 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.10.4"; + version = "4.10.5"; src = fetchurl { url = "https://gmsh.info/src/gmsh-${version}-source.tgz"; - sha256 = "sha256-9H6SfyTzVPONROJsIaJJXEzb3D1eubiD1afjoic/vRM="; + sha256 = "sha256-zAMMWu5l59WPhQuLb1WmiUXIm8hx+U4SOSefWiEPxOo="; }; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/science/math/nauty/default.nix b/third_party/nixpkgs/pkgs/applications/science/math/nauty/default.nix index 9fae8c31ea..ef8c041039 100644 --- a/third_party/nixpkgs/pkgs/applications/science/math/nauty/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/math/nauty/default.nix @@ -4,11 +4,11 @@ }: stdenv.mkDerivation rec { pname = "nauty"; - version = "2.7r3"; + version = "2.7r4"; src = fetchurl { url = "https://pallini.di.uniroma1.it/nauty${builtins.replaceStrings ["."] [""] version}.tar.gz"; - sha256 = "sha256-TwZltxalP3oU6irjAFnyPQZM4/5MEsATQE724e4LiMI="; + sha256 = "sha256-uBDIWm/imfO0yfJKr5KcrH+VRsLzXCDh3Qrbx0CISKY="; }; outputs = [ "out" "dev" ]; diff --git a/third_party/nixpkgs/pkgs/applications/science/math/sage/sage-src.nix b/third_party/nixpkgs/pkgs/applications/science/math/sage/sage-src.nix index 95da9b26e5..a0375a5184 100644 --- a/third_party/nixpkgs/pkgs/applications/science/math/sage/sage-src.nix +++ b/third_party/nixpkgs/pkgs/applications/science/math/sage/sage-src.nix @@ -117,6 +117,13 @@ stdenv.mkDerivation rec { # 5.0 hits nixpkgs. # https://github.com/sphinx-doc/sphinx/pull/10372 ./patches/docutils-0.18.1-deprecation.patch + + (fetchSageDiff { + name = "eclib-20220621-update.patch"; + base = "9.7.beta4"; + rev = "9b65d73399b33043777ba628a4d318638aec6e0e"; + sha256 = "sha256-pcb9Q9a0ROCZTyfT7TRMtgEqCom8SgrtAaZ8ATgeqVI="; + }) ]; patches = nixPatches ++ bugfixPatches ++ packageUpgradePatches; diff --git a/third_party/nixpkgs/pkgs/applications/science/misc/nextinspace/default.nix b/third_party/nixpkgs/pkgs/applications/science/misc/nextinspace/default.nix index fd7e581831..8f168ab838 100644 --- a/third_party/nixpkgs/pkgs/applications/science/misc/nextinspace/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/misc/nextinspace/default.nix @@ -5,14 +5,14 @@ python3.pkgs.buildPythonApplication rec { pname = "nextinspace"; - version = "2.0.3"; + version = "2.0.5"; format = "pyproject"; src = fetchFromGitHub { owner = "not-stirred"; repo = pname; - rev = "v${version}"; - hash = "sha256-Macx2pQglB95Bhc939TFVCHd1qvqJsco91EXKCIQLgg="; + rev = "refs/tags/v${version}"; + hash = "sha256-CrhzCvIA3YAFsWvdemvK1RLMacsM5RtgMjLeiqz5MwY="; }; nativeBuildInputs = with python3.pkgs; [ diff --git a/third_party/nixpkgs/pkgs/applications/science/programming/jflap/default.nix b/third_party/nixpkgs/pkgs/applications/science/programming/jflap/default.nix deleted file mode 100644 index 4a6193f1ac..0000000000 --- a/third_party/nixpkgs/pkgs/applications/science/programming/jflap/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ lib, stdenv, fetchurl, jre, makeWrapper }: - -stdenv.mkDerivation rec { - pname = "jflap"; - version = "7.1"; - - src = fetchurl { - url = "https://www.jflap.org/jflaptmp/july27-18/JFLAP7.1.jar"; - sha256 = "oiwJXdxWsYFj6Ovu7xZbOgTLVw8160a5YQUWbgbJlAY="; - }; - - nativeBuildInputs = [ makeWrapper ]; - - dontUnpack = true; - dontBuild = true; - - installPhase = '' - runHook preInstall - mkdir -p $out/share/java - cp -s $src $out/share/java/jflap.jar - makeWrapper ${jre}/bin/java $out/bin/jflap --add-flags "-jar $out/share/java/jflap.jar" - runHook postInstall - ''; - - meta = with lib; { - description = "GUI tool for experimenting with formal languages topics"; - homepage = "https://www.jflap.org/"; - license = licenses.unfree; - sourceProvenance = with sourceTypes; [ binaryBytecode ]; - maintainers = [ maintainers.grnnja ]; - platforms = platforms.all; - }; -} 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 b21e9b8555..e8bde32832 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,13 +2,13 @@ buildGoModule rec { pname = "gh"; - version = "2.14.1"; + version = "2.14.2"; src = fetchFromGitHub { owner = "cli"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-Mp8frinjAdsNYIFLFsk8yCeQLgo6cW33B4JadNHbifE="; + sha256 = "sha256-/0cX1GSzrmTFsRA1L5pCNHMO5cb5RFx4DsInBEn3emw="; }; vendorSha256 = "sha256-yhUP6BaR2xloy3/g7pKhn5ljwTEm8XwPaOiZCIfIM7E="; 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 2b2fde8ea2..32ef030962 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.7.16"; + version = "1.8.0"; src = fetchFromGitHub { owner = "gabrie30"; repo = "ghorg"; rev = "v${version}"; - sha256 = "sha256-dQJ21QT3mDGS4nPB9o6033/Sn0+XV0P8Wjqvfcc5Loo="; + sha256 = "sha256-0ewiCLBAvK0cLsEFN1W7fQyn66Vu2aLor9+VYuX05Os="; }; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/lab/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/lab/default.nix index d73d1d13bd..9134663756 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/lab/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/lab/default.nix @@ -1,14 +1,14 @@ -{ lib, buildGoModule, fetchFromGitHub, makeWrapper, xdg-utils, installShellFiles, git }: +{ lib, buildGoModule, fetchFromGitHub, makeBinaryWrapper, xdg-utils, installShellFiles, git }: buildGoModule rec { pname = "lab"; - version = "0.25.0"; + version = "0.25.1"; src = fetchFromGitHub { owner = "zaquestion"; repo = "lab"; rev = "v${version}"; - sha256 = "sha256-7AUhH2aBRpsjUzZQGE2fHDOa1k0rMUfZJqUEKZXpJuM="; + sha256 = "sha256-VCvjP/bSd/0ywvNWPsseXn/SPkdp+BsXc/jTvB11EOk="; }; subPackages = [ "." ]; @@ -17,16 +17,16 @@ buildGoModule rec { doCheck = false; - nativeBuildInputs = [ makeWrapper installShellFiles ]; + nativeBuildInputs = [ makeBinaryWrapper installShellFiles ]; ldflags = [ "-s" "-w" "-X main.version=${version}" ]; postInstall = '' wrapProgram $out/bin/lab --prefix PATH ":" "${lib.makeBinPath [ git xdg-utils ]}"; - for shell in bash fish zsh; do - $out/bin/lab completion $shell > lab.$shell - installShellCompletion lab.$shell - done + installShellCompletion --cmd lab \ + --bash <($out/bin/lab completion bash) \ + --fish <($out/bin/lab completion fish) \ + --zsh <($out/bin/lab completion zsh) ''; meta = with lib; { 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 2cddeea816..c9af0c8f1f 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/gitea/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/gitea/default.nix @@ -14,12 +14,12 @@ buildGoPackage rec { pname = "gitea"; - version = "1.16.8"; + version = "1.16.9"; # 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-W/AbRfnEQfnTjXJ8wTKEFOTld4rFsBvJiXnYK8Ugoj0="; + sha256 = "sha256-LxPYUSyRSfDlGwCC2IFPEISP4wsRJsUbwi9F7sxbMOE="; }; unpackPhase = '' diff --git a/third_party/nixpkgs/pkgs/applications/version-management/josh/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/josh/default.nix new file mode 100644 index 0000000000..acf2b24c07 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/version-management/josh/default.nix @@ -0,0 +1,60 @@ +{ lib +, stdenv +, fetchFromGitHub +, rustPlatform +, libgit2 +, openssl +, pkg-config +, makeWrapper +, git +, darwin +}: + +rustPlatform.buildRustPackage rec { + pname = "josh"; + version = "22.06.22"; + + src = fetchFromGitHub { + owner = "esrlabs"; + repo = "josh"; + rev = "r" + version; + sha256 = "0511qv9zyjvv4zfz6zyi69ssbkrwa24n0ah5w9mb4gzd547as8pq"; + }; + + cargoSha256 = "0zfjjyyz4pxar1mfkkj9aij4dnwqy3asdrmay1iy6ijjn1qd97n4"; + + nativeBuildInputs = [ + pkg-config + makeWrapper + ]; + + buildInputs = [ + libgit2 + openssl + ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ + darwin.Security + ]; + + cargoBuildFlags = [ + "-p" "josh" + "-p" "josh-proxy" + # TODO: josh-ui + ]; + + postInstall = '' + wrapProgram "$out/bin/josh-proxy" --prefix PATH : "${git}/bin" + ''; + + meta = { + description = "Just One Single History"; + homepage = "https://josh-project.github.io/josh/"; + downloadPage = "https://github.com/josh-project/josh"; + changelog = "https://github.com/josh-project/josh/releases/tag/${version}"; + license = lib.licenses.mit; + maintainers = [ + lib.maintainers.sternenseemann + lib.maintainers.tazjin + ]; + platforms = lib.platforms.all; + }; +} 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 98e415704c..0f6e5c995d 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/mercurial/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/mercurial/default.nix @@ -21,11 +21,11 @@ let self = python3Packages.buildPythonApplication rec { pname = "mercurial${lib.optionalString fullBuild "-full"}"; - version = "6.1.4"; + version = "6.2"; src = fetchurl { url = "https://mercurial-scm.org/release/mercurial-${version}.tar.gz"; - sha256 = "sha256-82H5gCs241esAZzrcSyhHegzKwfere7Y36kE8Fv3yng="; + sha256 = "sha256-04K14/q4kxEmATIBcxQWV0s1roV4dAS7KggZ9Bu4iXI="; }; format = "other"; @@ -35,7 +35,7 @@ let cargoDeps = if rustSupport then rustPlatform.fetchCargoTarball { inherit src; name = "mercurial-${version}"; - sha256 = "sha256-GEsRA8od2S9v5xipCwsCmkdLvKKpbbKJGNqPFmrZASQ="; + sha256 = "sha256-L4BbU6GTq54DFucqvBZeWtA8zUPvPCwmtIxv/SxgAXk="; sourceRoot = "mercurial-${version}/rust"; } else null; cargoRoot = if rustSupport then "rust" else null; diff --git a/third_party/nixpkgs/pkgs/applications/video/anime-downloader/default.nix b/third_party/nixpkgs/pkgs/applications/video/anime-downloader/default.nix index eb69f4be81..60e89c2fdf 100644 --- a/third_party/nixpkgs/pkgs/applications/video/anime-downloader/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/anime-downloader/default.nix @@ -1,4 +1,4 @@ -{ lib, python3, aria2, mpv, nodejs, fetchFromGitHub }: +{ lib, python3, aria2, mpv, nodejs, qt5, fetchFromGitHub }: python3.pkgs.buildPythonApplication rec { pname = "anime-downloader"; @@ -11,6 +11,8 @@ python3.pkgs.buildPythonApplication rec { sha256 = "sha256-Uk2mtsSrb8fCD9JCFzvLBzMEB7ViVDrKPSOKy9ALJ6o="; }; + nativeBuildInputs = [ qt5.wrapQtAppsHook ]; + propagatedBuildInputs = [ aria2 mpv @@ -31,6 +33,10 @@ python3.pkgs.buildPythonApplication rec { tabulate ]); + preFixup = '' + wrapQtApp "$out/bin/anime" --prefix PATH : ${lib.makeBinPath propagatedBuildInputs} + ''; + doCheck = false; # FIXME: checks must be disabled because they are lacking the qt env. # They fail like this, even if built and wrapped with all Qt and runtime dependencies. diff --git a/third_party/nixpkgs/pkgs/applications/video/jellyfin-media-player/default.nix b/third_party/nixpkgs/pkgs/applications/video/jellyfin-media-player/default.nix index 0afd173deb..4f2b4ef440 100644 --- a/third_party/nixpkgs/pkgs/applications/video/jellyfin-media-player/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/jellyfin-media-player/default.nix @@ -23,6 +23,7 @@ , qtwebengine , qtx11extras , jellyfin-web +, withDbus ? stdenv.isLinux, dbus }: mkDerivation rec { @@ -74,6 +75,8 @@ mkDerivation rec { "-DCMAKE_BUILD_TYPE=Release" "-DQTROOT=${qtbase}" "-GNinja" + ] ++ lib.optionals (!withDbus) [ + "-DLINUX_X11POWER=ON" ]; preBuild = '' diff --git a/third_party/nixpkgs/pkgs/applications/video/obs-studio/plugins/default.nix b/third_party/nixpkgs/pkgs/applications/video/obs-studio/plugins/default.nix index 844d4a50b8..9b46ae4de3 100644 --- a/third_party/nixpkgs/pkgs/applications/video/obs-studio/plugins/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/obs-studio/plugins/default.nix @@ -9,5 +9,6 @@ wlrobs = callPackage ./wlrobs.nix {}; looking-glass-obs = callPackage ./looking-glass-obs.nix {}; obs-nvfbc = callPackage ./obs-nvfbc.nix {}; + obs-pipewire-audio-capture = callPackage ./obs-pipewire-audio-capture.nix {}; obs-vkcapture = callPackage ./obs-vkcapture.nix {}; } diff --git a/third_party/nixpkgs/pkgs/applications/video/obs-studio/plugins/obs-pipewire-audio-capture.nix b/third_party/nixpkgs/pkgs/applications/video/obs-studio/plugins/obs-pipewire-audio-capture.nix new file mode 100644 index 0000000000..150e7e6025 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/video/obs-studio/plugins/obs-pipewire-audio-capture.nix @@ -0,0 +1,32 @@ +{ lib +, stdenv +, fetchFromGitHub +, cmake +, ninja +, obs-studio +, pipewire +, pkg-config +}: + +stdenv.mkDerivation rec { + pname = "obs-pipewire-audio-capture"; + version = "1.0.4"; + + src = fetchFromGitHub { + owner = "dimtpap"; + repo = pname; + rev = "${version}"; + sha256 = "OX27NTUsceEC8kHqlM+oeGjPxguake6lwaXFYsoEqKU="; + }; + + nativeBuildInputs = [ cmake ninja pkg-config ]; + buildInputs = [ obs-studio pipewire ]; + + meta = with lib; { + description = " Audio device and application capture for OBS Studio using PipeWire "; + homepage = "https://github.com/dimtpap/obs-pipewire-audio-capture"; + maintainers = with maintainers; [ Elinvention ]; + license = licenses.gpl2; + platforms = [ "x86_64-linux" "i686-linux" ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/crosvm/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/crosvm/default.nix index 2afbe123b5..68ba3b56e2 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/crosvm/default.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/crosvm/default.nix @@ -8,7 +8,7 @@ let upstreamInfo = with builtins; fromJSON (readFile ./upstream-info.json); arch = with stdenv.hostPlatform; - if isAarch64 then "arm" + if isAarch64 then "aarch64" else if isx86_64 then "x86_64" else throw "no seccomp policy files available for host platform"; @@ -20,6 +20,8 @@ in src = fetchgit (builtins.removeAttrs upstreamInfo.src [ "date" "path" ]); + separateDebugInfo = true; + patches = [ ./default-seccomp-policy-dir.diff ]; diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/podman/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/podman/default.nix index d663d0ec8b..370c37ffec 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/podman/default.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/podman/default.nix @@ -97,8 +97,5 @@ buildGoModule rec { changelog = "https://github.com/containers/podman/blob/v${version}/RELEASE_NOTES.md"; license = licenses.asl20; maintainers = with maintainers; [ marsam ] ++ teams.podman.members; - # requires >= 10.13 SDK https://github.com/NixOS/nixpkgs/issues/101229 - # Undefined symbols for architecture x86_64: "_utimensat" - broken = stdenv.isDarwin && stdenv.isx86_64; }; } diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/qemu/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/qemu/default.nix index a481b50f3e..fb41e303f5 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/qemu/default.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/qemu/default.nix @@ -115,8 +115,14 @@ stdenv.mkDerivation rec { url = "https://gitlab.com/raboof/qemu/-/commit/3fb5e8fe4434130b1167a995b2a01c077cca2cd5.patch"; sha256 = "sha256-evzrN3i4ntc/AFG0C0rezQpQbWcnx74nXO+5DLErX8o="; }) + # fix 9p on macOS host, landed in master + (fetchpatch { + name = "fix-9p-on-macos.patch"; + url = "https://gitlab.com/qemu/qemu/-/commit/f5643914a9e8f79c606a76e6a9d7ea82a3fc3e65.patch"; + sha256 = "sha256-8i13wU135h+YxoXFtkXweBN3hMslpWoNoeQ7Ydmn3V4="; + }) ] - ++ lib.optional nixosTestRunner ./force-uid0-on-9p.patch; + ++ lib.optional nixosTestRunner ./force-uid0-on-9p.patch; postPatch = '' # Otherwise tries to ensure /var/run exists. diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/cwm/default.nix b/third_party/nixpkgs/pkgs/applications/window-managers/cwm/default.nix index 24c5950815..37abe5c154 100644 --- a/third_party/nixpkgs/pkgs/applications/window-managers/cwm/default.nix +++ b/third_party/nixpkgs/pkgs/applications/window-managers/cwm/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "cwm"; - version = "6.7"; + version = "7.1"; src = fetchFromGitHub { owner = "leahneukirchen"; repo = pname; rev = "v${version}"; - sha256 = "0f9xmki2hx10k8iisfzc7nm1l31zkf1r06pdgn06ar9w9nizrld9"; + sha256 = "sha256-lkjsxGMXOrnu4cUiV/TO7yzd9FzM297MhaFKauqmiHo="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/weston/default.nix b/third_party/nixpkgs/pkgs/applications/window-managers/weston/default.nix index eef1a14639..10f67558cf 100644 --- a/third_party/nixpkgs/pkgs/applications/window-managers/weston/default.nix +++ b/third_party/nixpkgs/pkgs/applications/window-managers/weston/default.nix @@ -10,11 +10,11 @@ with lib; stdenv.mkDerivation rec { pname = "weston"; - version = "10.0.0"; + version = "10.0.1"; src = fetchurl { - url = "https://wayland.freedesktop.org/releases/${pname}-${version}.tar.xz"; - sha256 = "1bj7wnadr7ssn6xw7k8ki0wpj6np3kjd2pcysfz3h0mr290rc8sw"; + url = "https://gitlab.freedesktop.org/wayland/weston/-/releases/${version}/downloads/weston-${version}.tar.xz"; + sha256 = "05a10gfbadyxkwgsncc5vc343f493csgh10vk0878nl6d98557la"; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/build-support/docker/examples.nix b/third_party/nixpkgs/pkgs/build-support/docker/examples.nix index f92a55c2e4..16941a7261 100644 --- a/third_party/nixpkgs/pkgs/build-support/docker/examples.nix +++ b/third_party/nixpkgs/pkgs/build-support/docker/examples.nix @@ -588,7 +588,7 @@ rec { chown 1000 ./home/jane ln -s ${pkgs.hello.overrideAttrs (o: { # A unique `hello` to make sure that it isn't included via another mechanism by accident. - configureFlags = o.configureFlags or "" + " --program-prefix=layeredImageWithFakeRootCommands-"; + configureFlags = o.configureFlags or [] ++ [ " --program-prefix=layeredImageWithFakeRootCommands-" ]; doCheck = false; })} ./hello ''; 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 a689cbcfb6..15fe5a2c5d 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 @@ -96,9 +96,13 @@ in stdenvNoCC.mkDerivation (args // { dotnetInstallHook dotnetFixupHook - dotnet-sdk cacert makeWrapper + dotnet-sdk + ]; + + makeWrapperArgs = args.makeWrapperArgs or [ ] ++ [ + "--prefix LD_LIBRARY_PATH : ${dotnet-sdk.icu}/lib" ]; # Stripping breaks the executable 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 index 76f7eea5bf..1cc88602ff 100644 --- 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 @@ -11,6 +11,9 @@ , buildType }: +let + libraryPath = lib.makeLibraryPath runtimeDeps; +in { dotnetConfigureHook = callPackage ({ }: makeSetupHook { @@ -35,7 +38,7 @@ name = "dotnet-check-hook"; deps = [ dotnet-test-sdk ]; substitutions = { - inherit buildType; + inherit buildType libraryPath; disabledTests = lib.optionalString (disabledTests != []) (lib.concatStringsSep "&FullyQualifiedName!=" disabledTests); }; @@ -53,10 +56,10 @@ dotnetFixupHook = callPackage ({ }: makeSetupHook { name = "dotnet-fixup-hook"; - deps = [ dotnet-runtime makeWrapper ]; + deps = [ dotnet-runtime ]; substitutions = { dotnetRuntime = dotnet-runtime; - runtimeDeps = lib.makeLibraryPath runtimeDeps; + runtimeDeps = libraryPath; }; } ./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 index cd1c401735..5a5ece6d99 100644 --- 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 @@ -25,6 +25,7 @@ dotnetBuildHook() { -p:BuildInParallel=$parallelBuildFlag \ -p:ContinuousIntegrationBuild=true \ -p:Deterministic=true \ + -p:UseAppHost=true \ --configuration "@buildType@" \ --no-restore \ ${versionFlag-} \ 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 index 6b3deaa52f..bc7b1b5c3d 100644 --- 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 @@ -11,7 +11,7 @@ dotnetCheckHook() { fi for project in ${testProjectFile[@]}; do - env \ + env "LD_LIBRARY_PATH=@libraryPath@" \ dotnet test "$project" \ -maxcpucount:$maxCpuFlag \ -p:ContinuousIntegrationBuild=true \ 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 index 1686c15d26..3e8c141895 100644 --- 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 @@ -1,6 +1,6 @@ declare -a projectFile testProjectFile -# inherit arguments from derivation +# Inherit arguments from derivation dotnetFlags=( ${dotnetFlags[@]-} ) dotnetRestoreFlags=( ${dotnetRestoreFlags[@]-} ) 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 index fcd3e74590..7984c5ebd3 100644 --- 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 @@ -11,6 +11,7 @@ dotnetInstallHook() { dotnet publish "$project" \ -p:ContinuousIntegrationBuild=true \ -p:Deterministic=true \ + -p:UseAppHost=true \ --output "$out/lib/${pname}" \ --configuration "@buildType@" \ --no-build \ diff --git a/third_party/nixpkgs/pkgs/build-support/make-desktopitem/default.nix b/third_party/nixpkgs/pkgs/build-support/make-desktopitem/default.nix index e09fd0e20f..af314aa338 100644 --- a/third_party/nixpkgs/pkgs/build-support/make-desktopitem/default.nix +++ b/third_party/nixpkgs/pkgs/build-support/make-desktopitem/default.nix @@ -4,7 +4,7 @@ # Please keep in spec order for easier maintenance. # When adding a new value, don't forget to update the Version field below! # See https://specifications.freedesktop.org/desktop-entry-spec/desktop-entry-spec-latest.html -{ name # The name of the desktop file +lib.makeOverridable ({ name # The name of the desktop file , type ? "Application" # version is hardcoded , desktopName # The name of the application @@ -115,4 +115,4 @@ writeTextFile { destination = "/share/applications/${name}.desktop"; text = builtins.concatStringsSep "\n" content; checkPhase = ''${buildPackages.desktop-file-utils}/bin/desktop-file-validate "$target"''; -} +}) diff --git a/third_party/nixpkgs/pkgs/data/fonts/iosevka/bin.nix b/third_party/nixpkgs/pkgs/data/fonts/iosevka/bin.nix index 05ad166234..f180e5b4ff 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/iosevka/bin.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/iosevka/bin.nix @@ -11,7 +11,7 @@ let (builtins.attrNames (builtins.removeAttrs variantHashes [ "iosevka" ])); in stdenv.mkDerivation rec { pname = "${name}-bin"; - version = "15.5.2"; + version = "15.6.0"; src = fetchurl { url = "https://github.com/be5invis/Iosevka/releases/download/v${version}/ttc-${name}-${version}.zip"; diff --git a/third_party/nixpkgs/pkgs/data/fonts/iosevka/comfy-private-build-plans.toml b/third_party/nixpkgs/pkgs/data/fonts/iosevka/comfy-private-build-plans.toml index d5b0221a64..1affc3a8c8 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/iosevka/comfy-private-build-plans.toml +++ b/third_party/nixpkgs/pkgs/data/fonts/iosevka/comfy-private-build-plans.toml @@ -1,5 +1,5 @@ # The file below is copy/pasted from -# https://github.com/protesilaos/iosevka-comfy/blob/0.1.0/private-build-plans.toml. It +# https://raw.githubusercontent.com/protesilaos/iosevka-comfy/0.2.1/private-build-plans.toml. It # seems like ofborg will prevent me from using fetchurl to download # this file automatically. [buildPlans.iosevka-comfy] # is your plan name @@ -303,9 +303,19 @@ serifs = "sans" [buildPlans.iosevka-comfy-duo.variants] inherits = "buildPlans.iosevka-comfy" -# The short middle leg in 'm' that we need in the narrow monospaced -# variants is necessary for legibility, especially at small point sizes. -# Otherwise it is a gimmick, so we remove it in the "wider" builds. +# The '0' has a forward slash that cuts diagonally through the middle of +# the circle, connecting the bottom left part to the top right of the +# oval shape. Whereas the narrow variants have a dashed forward slash +# which does not connect the two sides as it is positioned inside the +# oval shape. +[buildPlans.iosevka-comfy-duo.variants.design] +cv71 = 9 # 0 oval forward slash + +# The 'm' character has three legs of equal length, insetad of a shorter +# middle leg. The short middle leg in the narrow variants is necessary +# for legibility, especially at small point sizes (otherwise the +# character's legs visually blend into what appears to be a solid +# block). [buildPlans.iosevka-comfy-duo.variants.upright] cv38 = 5 # m earless normal middle leg @@ -371,9 +381,19 @@ serifs = "sans" [buildPlans.iosevka-comfy-wide.variants] inherits = "buildPlans.iosevka-comfy" -# The short middle leg in 'm' that we need in the narrow monospaced -# variants is necessary for legibility, especially at small point sizes. -# Otherwise it is a gimmick, so we remove it in the "wider" builds. +# The '0' has a forward slash that cuts diagonally through the middle of +# the circle, connecting the bottom left part to the top right of the +# oval shape. Whereas the narrow variants have a dashed forward slash +# which does not connect the two sides as it is positioned inside the +# oval shape. +[buildPlans.iosevka-comfy-wide.variants.design] +cv71 = 9 # 0 oval forward slash + +# The 'm' character has three legs of equal length, insetad of a shorter +# middle leg. The short middle leg in the narrow variants is necessary +# for legibility, especially at small point sizes (otherwise the +# character's legs visually blend into what appears to be a solid +# block). [buildPlans.iosevka-comfy-wide.variants.upright] cv38 = 5 # m earless normal middle leg diff --git a/third_party/nixpkgs/pkgs/data/fonts/iosevka/comfy.nix b/third_party/nixpkgs/pkgs/data/fonts/iosevka/comfy.nix index 9cc2ecfb63..3e42151857 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/iosevka/comfy.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/iosevka/comfy.nix @@ -1,10 +1,15 @@ {stdenv, lib, nodejs, nodePackages, remarshal, ttfautohint-nox, fetchurl}: let - sets = [ "comfy" "comfy-duo" "comfy-wide" "comfy-wide-fixed"]; + sets = [ "comfy" "comfy-fixed" "comfy-duo" "comfy-wide" "comfy-wide-fixed" ]; privateBuildPlan = builtins.readFile ./comfy-private-build-plans.toml; overrideAttrs = (attrs: { - version = "0.1.0"; + version = "0.2.1"; + + passthru = { + updateScript = ./update-comfy.sh; + }; + meta = with lib; { homepage = "https://github.com/protesilaos/iosevka-comfy"; description = '' diff --git a/third_party/nixpkgs/pkgs/data/fonts/iosevka/update-comfy.sh b/third_party/nixpkgs/pkgs/data/fonts/iosevka/update-comfy.sh new file mode 100755 index 0000000000..63e68c768d --- /dev/null +++ b/third_party/nixpkgs/pkgs/data/fonts/iosevka/update-comfy.sh @@ -0,0 +1,33 @@ +#! /usr/bin/env nix-shell +#! nix-shell -i bash -p curl jq + +set -euo pipefail +cd "$(dirname "${BASH_SOURCE[0]}")" + +repo=protesilaos/iosevka-comfy +oldVersion=$(nix-instantiate --eval -E 'with import ../../../.. {}; lib.getVersion iosevka-comfy.comfy' | tr -d \") +version=$(curl -s https://api.github.com/repos/$repo/tags | jq '.[0].name' | tr -d \") +buildPlansUrl=https://raw.githubusercontent.com/$repo/$(echo $version)/private-build-plans.toml + +if test "$oldVersion" = "$version"; then + echo "New version same as old version, nothing to do." >&2 + exit 0 +fi + +sed --in-place "s/$oldVersion/$version/" comfy.nix + +cat > ./comfy-private-build-plans.toml <> ./comfy-private-build-plans.toml + +sets=$(grep '^\[buildPlans\.iosevka-comfy[^.]*\]' comfy-private-build-plans.toml \ + | sed 's/^.*iosevka-\(comfy[^]]*\)].*$/"\1" /' \ + | tr -d '\n' \ + | sort) + +sed --in-place "s/sets = .*$/sets = [ $sets];/" comfy.nix diff --git a/third_party/nixpkgs/pkgs/data/fonts/iosevka/variants.nix b/third_party/nixpkgs/pkgs/data/fonts/iosevka/variants.nix index 39112a7254..f666dec7a5 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/iosevka/variants.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/iosevka/variants.nix @@ -1,95 +1,95 @@ # This file was autogenerated. DO NOT EDIT! { - iosevka = "1f96ngb6m5ssp5hcdv5mrb28jcqx4w8hmz9igi64rrbg3flj93ix"; - iosevka-aile = "19b9mip3bffdfiwlr0gn2qs9zymdrill4kak1pbx2y6kjlbsz7c1"; - iosevka-curly = "0mkkxi0sb50il400bvv5rsgcf0gdbzir0br9m6syxzqwg90lakl7"; - iosevka-curly-slab = "1qbbk2nzgwp4skiwg5cck9i6hzdsqfd88l1cypbk4l4jvvmx0gxm"; - iosevka-etoile = "1l6f8dgk8ajbd35gbf1hdrzjrn96fh6v2wqsp3q0ncyqa210yasp"; - iosevka-slab = "1fnp92s7f73nzy1qlfaal15hl2wgayixl26z8gpcvkzz964zgip7"; - iosevka-ss01 = "0fchf91kmgrisb0na5yig43w8dvpqasj87ppmc12jghybn6zfz8z"; - iosevka-ss02 = "00sn5207s75w79qxlcn153vf0k9jfpwhvn7iydnrdibjgy1wr1h4"; - iosevka-ss03 = "0j227mq286jm7ndd4lr9v3s6wmcw3ya5mbmyc2b7n0hq0jqnbi3h"; - iosevka-ss04 = "1za5893fmbc78jzh7l1ggp3hzm3wjxmmdanc0xg5dj95nrp878di"; - iosevka-ss05 = "0x6z60ig01x3r95izqr2w94d8ddiqawvml6ga1r476xsv3djvl4w"; - iosevka-ss06 = "1w4p4bqrl29v2dpbrk8cdxr1zmipa5n8d2gnyd1ay0p8mrmclfl3"; - iosevka-ss07 = "1abk0fnz5d5rlz226s8m45ndqss4f1sn9249fdhgbph939lcfqlr"; - iosevka-ss08 = "0ilw5013rkl1sflri40pi1h56iir1hadnmxk8a3aa2l7ysmslz44"; - iosevka-ss09 = "1v4y06d521c8hg03vw78h1lhdpvlij3ihdpm7g1ir2mfr1wz2dj9"; - iosevka-ss10 = "1kk7gm2xzy3i8rr149f2lydwdzkgs21hp46yminv6k0ipzfhhy28"; - iosevka-ss11 = "10sz5gncvizvi3f8sx7m6x7g1s1459v47xnap0j8w9qjp1c8d6c7"; - iosevka-ss12 = "12gwiq5fpx3xiv40k0i3k7c3hj15vf0vp7i1glp00yv4v6vrx8an"; - iosevka-ss13 = "05912nq3ll7ihalzazrs2r32krknfg9gpn8i05m7xn31zakizx98"; - iosevka-ss14 = "0lfzxqywx6vjr9vwkgmf73j1bcqjyzgg2n0dk2l523bxlq26j9ng"; - iosevka-ss15 = "0z5vx4hjclf06rirnacd3sdxa0cv6mbgdkiayjbl7k5j3xw2sh5r"; - iosevka-ss16 = "1lhhbdkd5dd87l2b5jmkacnx8h2pp6gwql9clj7sq006ir6a7in4"; - iosevka-ss17 = "0000x8zsfh7kpjdcqhd9fqi9sp4hfkq3i1rmwhlxjmjwcx1rbccd"; - iosevka-ss18 = "16chvb7fz9nn5g87nx2qxfbzqydi6aqdrr5l5hbd42zgx06rxg6b"; - sgr-iosevka = "1pxbqg4c9s63c6yg0hfzw2pky2izgi8m4rl987k7bisqmsmw7dz5"; - sgr-iosevka-aile = "16b44mhvd86cfzazwgrxzvlb4pl79qgcyllw07r4xis3x1gb9n4x"; - sgr-iosevka-curly = "011rr2z0c1sdydyb4g3wb7icf6w13qagsimg6wvwq5v49ybv2p51"; - sgr-iosevka-curly-slab = "0rvddn0fw3p454f5kpnh5lc0vgg5zg9v5658a16yqq0pyabbqm1v"; - sgr-iosevka-etoile = "1l4ljc4g1gfn8n79783cid991rpvffw2abp0br4j0sd8fy4vd97s"; - sgr-iosevka-fixed = "0hkfc8lpqda5vrbckcb740vyysgr7xbfns0v2gsdgj8kbvmw21bc"; - sgr-iosevka-fixed-curly = "19r03fvhcm49nknvf52cp2hrgiaas29jm6skw2xci377adl8xvy7"; - sgr-iosevka-fixed-curly-slab = "1smas7dhsz5qqg22hwlzwhf2wqrasj9gm28pyrwqbqri68982d8i"; - sgr-iosevka-fixed-slab = "1qsafga9xfx6zyyhnlli6d33n9mak5a44lj4klnipm631cfax539"; - sgr-iosevka-fixed-ss01 = "1w3683s7dgwh4njqv4726ghanfki119grszlpkd4ry5l88naw9wz"; - sgr-iosevka-fixed-ss02 = "0lxdx1d6ynywjifarcr5ijga60d8mj4jn4av57yk0m7430qj535m"; - sgr-iosevka-fixed-ss03 = "0wzpn8ra4y6g8gyhx62yyq2s1k7vvp0rbr5cnn810hfqjhc49dhi"; - sgr-iosevka-fixed-ss04 = "0135yadsykcnpjcn9ldhr3pj9l6qnqnixfyn2xvvkxlmlkhizkm9"; - sgr-iosevka-fixed-ss05 = "18vwd9sz6mlzg23dms1w79a98xsy2prkm0d6wkmyczi3pmwc11f2"; - sgr-iosevka-fixed-ss06 = "12mwqq8js5njlddkakpsb798vc8bbiabd2kkvkkvsqmbanpic9ih"; - sgr-iosevka-fixed-ss07 = "19r5a11n8m8k5nqlzgh4wr28gid81gxm7f28bgcz8jmjyvhrkmsq"; - sgr-iosevka-fixed-ss08 = "0ya22ig0aawfi9k7q2hbqd7nfkhij8mj6jaqcp5fqlglgy8r437b"; - sgr-iosevka-fixed-ss09 = "0cyvzalw9jp09kssc9p6pyfw843pbjgyhhjs311b5l8sr33add4k"; - sgr-iosevka-fixed-ss10 = "1bvjm58jcgpjcjyhas10bp0wy5zlvqfkzwj4pzn5h4640vlv7rab"; - sgr-iosevka-fixed-ss11 = "0zm7ncl1n910lqzrp20wp8dayl0wnaijwjzjza7y7wi8f3wi072f"; - sgr-iosevka-fixed-ss12 = "0y3iqkx7hkry9yj7vszvqywbpnim26gdlm6a9gq57i3ilnkh3fqq"; - sgr-iosevka-fixed-ss13 = "10snkzp4ihfd25760sf535s0z736lszx9kmr37bjs0yfk91qcd6i"; - sgr-iosevka-fixed-ss14 = "1h4l025xzsxfhwzs19bzib6kf4asj0066ynwn6a7hjicsy2l8als"; - sgr-iosevka-fixed-ss15 = "1jplpd42ik9lvdxl4kl1hqpz7h1m580r10p0pnnpv64zw9vqpzzc"; - sgr-iosevka-fixed-ss16 = "0w2fgg3c0qkwpsvj4jq287wjgidpx49gnd4ijyqqwlzwyijc8v2a"; - sgr-iosevka-fixed-ss17 = "0m8qpimcan5i2s7v8dhy8j85lzddgmlqjyjf1sfg6694d2ar0hpb"; - sgr-iosevka-fixed-ss18 = "0hbaa84j5izsmibmnx1cwg4s37bc5iq6pib1shlk97fd7c96b3g7"; - sgr-iosevka-slab = "1fxwc9s9ic33fn65gc565fg7h91ny9vj09lvhqpwc5v6jqky7bx8"; - sgr-iosevka-ss01 = "1x72r1k4bz7xg92f8h5lp627dvvcw1li7iq3z511hprf08diyj6w"; - sgr-iosevka-ss02 = "1xzysnn656j8pwsy1grfgbsdkyhizfviah9b6plkfs0crkpjfrd4"; - sgr-iosevka-ss03 = "18d8in437sp0bc3bqb6rim97ygzsmyimnyp7m0czn8f9nyq920xc"; - sgr-iosevka-ss04 = "1vbdqygbw3m0vk4jxd7f8qzap9cms9h0f9i7sr6cn50k998f9pnx"; - sgr-iosevka-ss05 = "0fzkh4a6ni4mc26ss0x4bmhil0xm81p3xwhk0w0cr4qz7m5hk5b7"; - sgr-iosevka-ss06 = "1b7zmjlgzwjnvvkh743ma3lla7jqcq6fsg526kfh0ghxzhhp4s9y"; - sgr-iosevka-ss07 = "0l75xqx4lp5pa65s6phany5gwhswmfs3y0sck211sfzgifmlqf73"; - sgr-iosevka-ss08 = "06zj3msqc69xlmm2sjwcr5s7ibk4qlych7fhhfzjyrawy7mvxrq9"; - sgr-iosevka-ss09 = "11ba3rlp7mnnklznjhmhqfhy3qcnj7fn3w1wjzpqczvi71kskrff"; - sgr-iosevka-ss10 = "04y5q4wspay4y7clrybgyrdyx43kw89zknszzd2df6bz7jpa583x"; - sgr-iosevka-ss11 = "13igcnw8ja2xcpdyshm75qv293x050nx5r9yzxq6rxbppgv7yac2"; - sgr-iosevka-ss12 = "0f3qnldpcavacrnj3x1av7729api33zll4x00zi1rhxd0akldrlb"; - sgr-iosevka-ss13 = "1zy59pa7h2bchxl9gp6xvlj56a6p7jms2m49rsss8l9x5aq2gar1"; - sgr-iosevka-ss14 = "1m66cyr8iybxa7hag65lv82q28mnx02yncklssb516gv5swd4sly"; - sgr-iosevka-ss15 = "03n0qglqhlvg078jnj4l2ni3257g9l5zrbl7y3j051qpn3lkradg"; - sgr-iosevka-ss16 = "0zqyxinrmfnlmkd735laz8ijb22mp1p04xhgqvgvx1npnjkz79jx"; - sgr-iosevka-ss17 = "13dyw8im15njkml0wzqky1jp1rf4pnp8c1jhich4c6s24y0nvnkk"; - sgr-iosevka-ss18 = "1bmh3k5g4h9qq539dh7qhpb5ai1sqrnk6yla6yr8bwpym53knysd"; - sgr-iosevka-term = "0rzl36kz7xfg2cqr8hq8d3vqgg3wnk6ki44xxpspdfgkhyhffz5v"; - sgr-iosevka-term-curly = "0212hs0yp8d46vc12gg3wahmxd2chscrpxcpcwi19cpii8m1jvsx"; - sgr-iosevka-term-curly-slab = "04vyaj8ah3vj90zrd3jv2iqhgdcndqa0sn31ff4s28jzqwfg4d5q"; - sgr-iosevka-term-slab = "0g60dz0y69wwa47x4q5kdpf2bjwjzsmr2zdnphsxwp0iari3mnls"; - sgr-iosevka-term-ss01 = "16s7mgll7filyjjzw5cd5xmfgy7w658xxp8h6x52prcb8b1jpaxr"; - sgr-iosevka-term-ss02 = "1vbarkid9v77qk83ymls3ppgh81kh5qch7k2zqd293dvb25p1irc"; - sgr-iosevka-term-ss03 = "0zgy4v7i7wnbr1rgwcq8mn7128m82f25i9xmbyv3nk66ic4dn17v"; - sgr-iosevka-term-ss04 = "1vl1w9y1xrpnpdzgcnp86gq9k7kyili1spccb6rbziw7il0sva5w"; - sgr-iosevka-term-ss05 = "0kfbkpd1zdh8wdqh72h6q20fq6yfr0xp48bk1nk4k5y1pakibdcs"; - sgr-iosevka-term-ss06 = "1mmc5w6div7nz8c0bfhhzxi6hm0w0qhfn4v7barkl5pw39iy7hls"; - sgr-iosevka-term-ss07 = "16ki4n6vw9vxhwkx7mc0gid456hzznhcv8adq5ky8f78x0d1b7sa"; - sgr-iosevka-term-ss08 = "1c3fbn01dpp684znawk0c8d0vq9ldsiybwsl9jmz3ighx1wli6d0"; - sgr-iosevka-term-ss09 = "1ch6g56y7jfm2720cvn3v1kb7lj23db23p4frnyx32wxngfb8fc7"; - sgr-iosevka-term-ss10 = "08pq3y4112x7s72b7clv4j0hna6v4ks75ap62g0ll6xw541s5g7k"; - sgr-iosevka-term-ss11 = "0bivi2kd01q2007zja7cnphy6g3f369qgc4i848agpsin7dzxavh"; - sgr-iosevka-term-ss12 = "1jfinia1kmwm6kjyx5sfbzfhb9qyjq51hjynpafrlyc2jzi4jh2w"; - sgr-iosevka-term-ss13 = "19jg7r1jz3b39brsp8l0xklmydm015v4z3lcm8waw84g6ahpsz4d"; - sgr-iosevka-term-ss14 = "1060bnwvc0mfkfq03m45giv7n5b9cdn7ssz8y0dkavfkxxqjf3rb"; - sgr-iosevka-term-ss15 = "1zjl2jxsvkp31h756l95bhg7vk2vmpsrrdvr8s1blgbywf73vs0h"; - sgr-iosevka-term-ss16 = "104myf8pvxiqjzy6ws2b8yjxddrlmnympnlgi2klbda0snvipcah"; - sgr-iosevka-term-ss17 = "0aas4q54mhrd0vnh0ridgcb5q9m8xism9lk87kwxr6nmkyp5fabj"; - sgr-iosevka-term-ss18 = "0z0gcvvpiyb86i5x6c1haggbb02l2jx1asa8ag17mwdaf7cp792m"; + iosevka = "1frma5fnrfq1z06mvpy3wvp7jkww8qlji308b3pxv0nxwgjd1vyv"; + iosevka-aile = "086ml3r09k3raxrwdmqgn7s7xga1zgrkvzxsldzwjpsw9jsax0m6"; + iosevka-curly = "000n3wsjsk562lpydmck2c36sxd0w2wkjgz8f7dm8iw57ls9pn6g"; + iosevka-curly-slab = "1cybjnmiwqjxj0rw3lil7n5vc6c30dg7ak0dz4g6q5klbnsw354s"; + iosevka-etoile = "0gxhsgsxzkz34lln20aqz0rd8wvm58090f6v8z4fi5qsm0dla06s"; + iosevka-slab = "00nd3h8vyqzlwbp45by6crzjq9rjpmj0nmmbbq17xvjgxxfhjsxr"; + iosevka-ss01 = "1yq8bnrbw3g24xsnrwbq1vl05m4dlcpjl29h8g8irhhpbnnm44nx"; + iosevka-ss02 = "1r40drbjxpwb7aqa24hh90nxayzj3gah110fsf8yjq5l5azg9ds8"; + iosevka-ss03 = "1mlg9qjfdfia0vwd86gi9ygbbnamld56lpf4h6m7gr8y8v00p07i"; + iosevka-ss04 = "0ap45s2si80gbz78q5v8qqga2ipy9dsz9hkq5dyfh8axlx1wiy7p"; + iosevka-ss05 = "1mah12ihqwqlkmr01l5z6kasb6h6xifgd7acfypz5547ip2zy425"; + iosevka-ss06 = "09w0hm5djjhfvy6lhbynvlq6ckd70zisv0z5y7w4jfmanif8jns3"; + iosevka-ss07 = "17imf7021ncpl9f8nbm1c0bjz5grz1iqgvpz48vpqd56632ac6k6"; + iosevka-ss08 = "199bf0qa76z59ad5d7fcgkiq8m4fxcia7q162zzjlxpl5bgv0665"; + iosevka-ss09 = "0w7jcgi4vn5ix58ji5cybpbnzvdl21k1r6rxad76z97ywwqbflag"; + iosevka-ss10 = "18vm9p6jdbyfc8q3cz8wf3sgd0xn7pzyw3qxld9d2qg83siybsmk"; + iosevka-ss11 = "0aj1l0g3zzcr3grkj1l6s39449g60v6hvjfmb4xx4kxg7h1h5b4i"; + iosevka-ss12 = "0zl2ffmgnlrcaj8mzfgp5x5z7iras5svdpf0zl2xcgjn15k17lkx"; + iosevka-ss13 = "0b58jjhd17i9pc5gdcx3xj9y8bgzwxrlh21j6di4cgvgj41gh46k"; + iosevka-ss14 = "0vlqr5s40xcc2645vsaap42cgfswi2p4hbpqbfjfzsmf41w6j6qc"; + iosevka-ss15 = "01qgvdmy8frbasb5d39c12dxjlha6iv1dq621il0dzm0850x48ys"; + iosevka-ss16 = "12vl98p6w73l4rfy2scn57jrvg2jxk99d2vsndri013grx488lq5"; + iosevka-ss17 = "0336m1i7vdd86jgyfdnsw4f6pdzcd4d757gxf8pa3h6jyczcn8n1"; + iosevka-ss18 = "07sqd4zwc85q8mh9l1bc2nbyr966b0bh9fff9rk91jrk106fijcl"; + sgr-iosevka = "0adxnngdwz6lmp4yla8amk0840y9k6d3k1jl90z5qd3dpl0m0w7z"; + sgr-iosevka-aile = "07470h9apwbmnai1rzx5s9jw3195gsxqv6q0z1gnf56mp94wihg1"; + sgr-iosevka-curly = "1jii49qqlrpvzczwqi39001j0qwbrzklc96bwampn9f0la1iqcbf"; + sgr-iosevka-curly-slab = "0bwfsimzkw4pbk6qy4nvbpwcw0h3m16qsjaqwrwfhnzy8hqc6akc"; + sgr-iosevka-etoile = "091ikanzxmkb673wfcfdg9qm56xqv4vwd3c1ph0c5bzc2nz3il50"; + sgr-iosevka-fixed = "1nz7x90zcbmvwldiz5zv5j22qyjgjn4ba42liki747lr930f38lm"; + sgr-iosevka-fixed-curly = "17y7h5jwim59zybpmkv3rqdcc41dxax5145xmhyzvagblsc7qlpk"; + sgr-iosevka-fixed-curly-slab = "1xfaszbpydi6vzif14bymv5cqlwxvvkdadba4jhy0psc7b30k095"; + sgr-iosevka-fixed-slab = "0pbmhr3nbb777ym30qmhlp4swq0q1f5aqc6i7453fc0lhygmcg55"; + sgr-iosevka-fixed-ss01 = "1klxs5npm5i1sxgrnkbkf1rbn1dvrdxp6mr34kjxkjxrd5flrb6m"; + sgr-iosevka-fixed-ss02 = "0aw0yqmvahk0wagyb2k6q6jibpdlyza3q7zn2a7pi36pcnm9b2rn"; + sgr-iosevka-fixed-ss03 = "0ssxx7a7cskd8lcfy3lnjic1qgzy087d6vk7hmhnlg52jhcfbkjm"; + sgr-iosevka-fixed-ss04 = "0fhqzj5ksvcp1rxa8g11a0jwznhwb5xw41wpvjqy1za1qh2h6shw"; + sgr-iosevka-fixed-ss05 = "06z42m7x565wzsf9sfxi4p4846cb3mgz7mr5h3xa528789fk1sx0"; + sgr-iosevka-fixed-ss06 = "0hzy5bj3ac009q515ylxlc73d1qwdfqcxfq8jxla5h6cgcfipnl4"; + sgr-iosevka-fixed-ss07 = "1051ah3q8wgdana4a9v38szd36wdy0h3c15sf1blm0cv3y0q7cv3"; + sgr-iosevka-fixed-ss08 = "05pg3ywxg8m4c1ij8xpd43azz1671v1bsw7r3szbiqmmlq651h9w"; + sgr-iosevka-fixed-ss09 = "0way85q2jwkhz8ixicx73s1x1hsyznr524am95igqkzwaz7c72q9"; + sgr-iosevka-fixed-ss10 = "12b91hk7i00766gmd04dgh3c6m42bvbc25y9h049c6rfimzd9f75"; + sgr-iosevka-fixed-ss11 = "1pn06gz3jrksg6f2glk45gj9i7jmgnh4f509fi7qqa73r3an0pl8"; + sgr-iosevka-fixed-ss12 = "0nb7g0kbi4riczhjl1dqbzg3kwwsw1vlxnsc5p0qfh8h1rnfpg9g"; + sgr-iosevka-fixed-ss13 = "1nj3nbp0b9a4nmskxg4vv98y7qp7gnj6rqkckvsw7bw43mxa2faq"; + sgr-iosevka-fixed-ss14 = "1fhwx95702qyr23iwp400l16lgq12pd3ckbf5dn1hyhfmm691cvg"; + sgr-iosevka-fixed-ss15 = "088xdxr11gdpn5j4fbf4xscq4prc1cydb23xcsmpnci6gsv4ppzg"; + sgr-iosevka-fixed-ss16 = "1p20k188c75jisrg7bqr6fq9pra07b44vyvj10ngm38xwfgqb5lz"; + sgr-iosevka-fixed-ss17 = "03giwk9xlnirgshbkpbkqav3l97n2fm7y3wd21g449vi7r9srimk"; + sgr-iosevka-fixed-ss18 = "1yl501fcik0kcm20b98n9a285zv9m3yc33ngkjdgj12ssgb02lj8"; + sgr-iosevka-slab = "0svls9wajw539bj5xziqbcp3wgc3f3hvwvz0rsicc9wgm7h47i33"; + sgr-iosevka-ss01 = "09i5iylma19jfiqcl0svm7dz4d2agi1ylkvzvsh050ggsk57nzv6"; + sgr-iosevka-ss02 = "1l0c7519wj46m14aq318rlhajq51hkv5sddhl8nvaqpdmrxx0zcj"; + sgr-iosevka-ss03 = "02yz6wqaqnc0in8b6j2n02kf6lws4x16182a5djnh3nnml2jhvi6"; + sgr-iosevka-ss04 = "0llrnx6vh6fl0fn5jjxzkq4rk91siy90pcpwin010sm3bppc0qgf"; + sgr-iosevka-ss05 = "166y9hywcm6d1zw2szqfrlaj9qaankamcs0ff02vd7q399bkl9a2"; + sgr-iosevka-ss06 = "0q41sikcv60nkvxqs5l3zw1dram20192dd5nr17nsd2lrbbdw1qx"; + sgr-iosevka-ss07 = "1nxgsj6ykgh5dj3gjba2ild1y5knilm7pzi5b5qbqpal89ymk5dq"; + sgr-iosevka-ss08 = "19bidxh3zxid6md8y0zp6ij4yxhqbyhqxfmld12pcskvp9xdv5bc"; + sgr-iosevka-ss09 = "15w7dqb73q2v0qkh0wmlhjd3sphcq6qilb8iqz0ifg3kbsix3hd3"; + sgr-iosevka-ss10 = "04gcwjpi313sqmdq1limfzycjyhr6p05vnr8jsabvgbxididikdi"; + sgr-iosevka-ss11 = "1mvhrqgbppx35h2v62ykhihdkh4zw2lwz5i7fd5qdw0ysiv1006d"; + sgr-iosevka-ss12 = "0r7qlba9mx1fibs0jrqgjzbffk1j49912zzim441n9539n6rmpvp"; + sgr-iosevka-ss13 = "1qvn83frjhy2w16i9jnhp3874rjlf0z95n7x1kmcg89hzy3x7288"; + sgr-iosevka-ss14 = "1yjbdgj1b03p2cwvwsh7jl0npj4a840whgn35j61fi9ap74jld8c"; + sgr-iosevka-ss15 = "1jrixb0lw04axv2h6d92mbwgavyzpc189n72b8wf729kwi22bvww"; + sgr-iosevka-ss16 = "1mvgl5dh9frqmqvia17zwpyyy9hwm8iayx2azm7mhjkkff0f0sd9"; + sgr-iosevka-ss17 = "00059jzz2w9xdfcl2lws2i0lwqgn08fakn0di6clqhjig695yglc"; + sgr-iosevka-ss18 = "03sy0az47x9sc0qxjc1wvhkmp71wqrm7q998ijxmj6mkbd3kc24v"; + sgr-iosevka-term = "0r5ah7rxqqi4cha3r6nz6dli6z55s1g91yb1x6b2q04irvm0hzrc"; + sgr-iosevka-term-curly = "1c9vf1kcl0yai5smzh9dldhkbwanbxji2a1j6y1sw59kn9n7aygf"; + sgr-iosevka-term-curly-slab = "02m3fpdj9gxskap4sp43pjr4ylyvr6fpbsbl5csjl5x4rlrh71kr"; + sgr-iosevka-term-slab = "1bnb803vcrkk05igm80v3k8b3p6ji14bsa5rjrplxq7yrjq7ybk4"; + sgr-iosevka-term-ss01 = "1wfz766fi0xi5nb80wdlpp4j4klggz8v2aa1prl6mbvmzq4g1alk"; + sgr-iosevka-term-ss02 = "12vcmbx597h0mfmib9wzqpc7bchbim2jyqnk835fhgrdrddb1w0j"; + sgr-iosevka-term-ss03 = "0a4dfrah8rg5bc7x8r08n2ijr6nfxr5nwbwj7ig0snbw1rrizm4i"; + sgr-iosevka-term-ss04 = "0ix8wn6dbqs072s3bmcjc1k8jfi4zpgjikbbdld3fgsg13gncz2p"; + sgr-iosevka-term-ss05 = "19jjvadmffizdymy21dniz43ac1qkik5i33a4imchk64kcn7nqin"; + sgr-iosevka-term-ss06 = "0lx61ikw9c2glr7smxyqkx68271sww47khkdy68llmw16c1dcapc"; + sgr-iosevka-term-ss07 = "12nx451b67cc6kx6pkb9x2jyk683xvjz3m21wg7zjplskrhlfaqa"; + sgr-iosevka-term-ss08 = "19n39wpz09kp9km9gmb16q6g4xbp288dgnlpdy4jxnway3i23drp"; + sgr-iosevka-term-ss09 = "1j4sh9fjyxi5qa85w72bs7sin5189qis8zdr2fbl39ma7igj5l5f"; + sgr-iosevka-term-ss10 = "02bv19gc1n73qyrdghp5nfzf2vwcvws3qnrcx7k3jpz23xf1n8s8"; + sgr-iosevka-term-ss11 = "1a93vv86sg38ipji4cbpndcr9bfcc2n4bg0s3f19lzyqpw3pa6r9"; + sgr-iosevka-term-ss12 = "1c3d3cxna1m7qq77fc278jja7yz84591pazc1adij28l3xl7xh1z"; + sgr-iosevka-term-ss13 = "0ss0l4373867csgis87miymby4m1vvxs321lqq00m73x35y9xrj2"; + sgr-iosevka-term-ss14 = "0dzg0g5p9p1p8yajdz0xnir8advs69fyj325qwh5616in9y3lv32"; + sgr-iosevka-term-ss15 = "0rx346bjrm33n9ww9bc4czn9dda16bkxjf6h9m4bnvlgxdflgd3y"; + sgr-iosevka-term-ss16 = "14i3f4bwnsb3haai8003pi9hsahcmxm1r1vccbrzny5vx78892py"; + sgr-iosevka-term-ss17 = "0idfiqxj0ixrmvfa0bhl1sg6pvaivcw0csjcfxpp7d406553a70i"; + sgr-iosevka-term-ss18 = "1732sskv5jzpdaaf4dc6xcp45r5fpxxxdq35jlnxbwng0njww3qy"; } 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 d44f531252..235895d8b0 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 @@ -1,14 +1,14 @@ -{ lib, stdenv, fetchFromGitHub, gtk3, numix-icon-theme, hicolor-icon-theme }: +{ lib, stdenv, fetchFromGitHub, gtk3, numix-icon-theme, hicolor-icon-theme, gitUpdater }: stdenv.mkDerivation rec { pname = "numix-icon-theme-circle"; - version = "22.06.14"; + version = "22.07.11"; src = fetchFromGitHub { owner = "numixproject"; repo = pname; rev = version; - sha256 = "sha256-TPJKBDQXwZnYOfDqeCDvjNzwj9lWFKPrUTd9F07wTvQ="; + sha256 = "sha256-0wDSK1sBYEQ+3wr5BkZvvtFdG66uMzHYAtyvpaZZlTI="; }; nativeBuildInputs = [ gtk3 ]; @@ -34,6 +34,8 @@ stdenv.mkDerivation rec { runHook postInstall ''; + passthru.updateScript = gitUpdater {inherit pname version; }; + meta = with lib; { description = "Numix icon theme (circle version)"; homepage = "https://numixproject.github.io"; 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 4c23f1c01b..1f37dfe1f2 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 @@ -1,14 +1,14 @@ -{ lib, stdenv, fetchFromGitHub, gtk3, numix-icon-theme, hicolor-icon-theme }: +{ lib, stdenv, fetchFromGitHub, gtk3, numix-icon-theme, hicolor-icon-theme, gitUpdater }: stdenv.mkDerivation rec { pname = "numix-icon-theme-square"; - version = "22.06.14"; + version = "22.07.11"; src = fetchFromGitHub { owner = "numixproject"; repo = pname; rev = version; - sha256 = "sha256-2DWDoUcSjADkOr+4/JaqAHbUzpFSQGYNye9/DvioFrM="; + sha256 = "sha256-ZLQYS9KQETgjSSdwWiA2tiQGS5hiEt4Gl0hUw5RI/S0="; }; nativeBuildInputs = [ gtk3 ]; @@ -34,6 +34,8 @@ stdenv.mkDerivation rec { runHook postInstall ''; + passthru.updateScript = gitUpdater {inherit pname version; }; + meta = with lib; { description = "Numix icon theme (square version)"; homepage = "https://numixproject.github.io"; diff --git a/third_party/nixpkgs/pkgs/desktops/pantheon/apps/elementary-files/default.nix b/third_party/nixpkgs/pkgs/desktops/pantheon/apps/elementary-files/default.nix index 6944dfac1e..9817962920 100644 --- a/third_party/nixpkgs/pkgs/desktops/pantheon/apps/elementary-files/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/pantheon/apps/elementary-files/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , nix-update-script , pkg-config , meson @@ -32,6 +33,15 @@ stdenv.mkDerivation rec { outputs = [ "out" "dev" ]; + patches = [ + # Fix terminal critical warnings and possible crash when removing bookmark + # https://github.com/elementary/files/pull/2062 + (fetchpatch { + url = "https://github.com/elementary/files/commit/daa5ab244b45aafdd7be49eb0bd6f052ded5b5a7.patch"; + sha256 = "sha256-crGvbo9Ye9656cOy6YqNreMLE2pEMO0Rg8oz81OfJkw="; + }) + ]; + src = fetchFromGitHub { owner = "elementary"; repo = "files"; diff --git a/third_party/nixpkgs/pkgs/desktops/surf-display/default.nix b/third_party/nixpkgs/pkgs/desktops/surf-display/default.nix index 3a74982eb4..c1f5f71650 100644 --- a/third_party/nixpkgs/pkgs/desktops/surf-display/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/surf-display/default.nix @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Kiosk browser session manager based on the surf browser"; homepage = "https://code.it-zukunft-schule.de/cgit/surf-display/"; - maintainers = with maintainers; [ etu ]; + maintainers = with maintainers; [ ]; license = licenses.gpl2; platforms = platforms.linux; }; diff --git a/third_party/nixpkgs/pkgs/development/androidndk-pkgs/androidndk-pkgs.nix b/third_party/nixpkgs/pkgs/development/androidndk-pkgs/androidndk-pkgs.nix index 736e088454..2d56196204 100644 --- a/third_party/nixpkgs/pkgs/development/androidndk-pkgs/androidndk-pkgs.nix +++ b/third_party/nixpkgs/pkgs/development/androidndk-pkgs/androidndk-pkgs.nix @@ -1,6 +1,5 @@ -{ lib, stdenv -, makeWrapper -, runCommand, wrapBintoolsWith, wrapCCWith +{ lib, stdenv, makeWrapper +, runCommand, wrapBintoolsWith, wrapCCWith, autoPatchelfHook , buildAndroidndk, androidndk, targetAndroidndkPkgs }: @@ -11,6 +10,9 @@ let # N.B. The Android NDK uses slightly different LLVM-style platform triples # than we do. We don't just use theirs because ours are less ambiguous and # some builds need that clarity. + # + # FIXME: + # There's some dragons here. Build host and target concepts are being mixed up. ndkInfoFun = { config, ... }: { x86_64-apple-darwin = { double = "darwin-x86_64"; @@ -21,65 +23,96 @@ let i686-unknown-linux-android = { triple = "i686-linux-android"; arch = "x86"; - toolchain = "x86"; - gccVer = "4.9"; }; x86_64-unknown-linux-android = { triple = "x86_64-linux-android"; arch = "x86_64"; - toolchain = "x86_64"; - gccVer = "4.9"; }; armv7a-unknown-linux-androideabi = { arch = "arm"; triple = "arm-linux-androideabi"; - toolchain = "arm-linux-androideabi"; - gccVer = "4.9"; }; aarch64-unknown-linux-android = { arch = "arm64"; triple = "aarch64-linux-android"; - toolchain = "aarch64-linux-android"; - gccVer = "4.9"; }; }.${config} or (throw "Android NDK doesn't support ${config}, as far as we know"); + buildInfo = ndkInfoFun stdenv.buildPlatform; hostInfo = ndkInfoFun stdenv.hostPlatform; targetInfo = ndkInfoFun stdenv.targetPlatform; - prefix = lib.optionalString (stdenv.targetPlatform != stdenv.hostPlatform) (stdenv.targetPlatform.config + "-"); + inherit (stdenv.targetPlatform) sdkVer; + suffixSalt = lib.replaceStrings ["-" "."] ["_" "_"] stdenv.targetPlatform.config; + + # targetInfo.triple is what Google thinks the toolchain should be, this is a little + # different from what we use. We make it four parts to conform with the existing + # standard more properly. + targetConfig = lib.optionalString (stdenv.targetPlatform != stdenv.hostPlatform) (stdenv.targetPlatform.config); in rec { # Misc tools - binaries = runCommand "ndk-toolchain-binutils" { - pname = "ndk-toolchain-binutils"; + binaries = stdenv.mkDerivation { + pname = "${targetConfig}-ndk-toolchain"; inherit (androidndk) version; - nativeBuildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper autoPatchelfHook ]; propagatedBuildInputs = [ androidndk ]; passthru = { - targetPrefix = prefix; isClang = true; # clang based cc, but bintools ld }; - } '' - mkdir -p $out/bin + dontUnpack = true; + dontBuild = true; + dontStrip = true; + dontConfigure = true; + dontPatch = true; + autoPatchelfIgnoreMissingDeps = true; + installPhase = '' + # https://developer.android.com/ndk/guides/other_build_systems + mkdir -p $out + cp -r ${androidndk}/libexec/android-sdk/ndk-bundle/toolchains/llvm/prebuilt/${buildInfo.double} $out/toolchain + find $out/toolchain -type d -exec chmod 777 {} \; - # llvm toolchain - for prog in ${androidndk}/libexec/android-sdk/ndk-bundle/toolchains/llvm/prebuilt/${hostInfo.double}/bin/*; do - ln -s $prog $out/bin/$(basename $prog) - ln -s $prog $out/bin/${prefix}$(basename $prog) - done + if [ ! -d $out/toolchain/sysroot/usr/lib/${targetInfo.triple}/${sdkVer} ]; then + echo "NDK does not contain libraries for SDK version ${sdkVer}"; + exit 1 + fi - # bintools toolchain - for prog in ${androidndk}/libexec/android-sdk/ndk-bundle/toolchains/${targetInfo.toolchain}-${targetInfo.gccVer}/prebuilt/${hostInfo.double}/bin/*; do - prog_suffix=$(basename $prog | sed 's/${targetInfo.triple}-//') - ln -s $prog $out/bin/${stdenv.targetPlatform.config}-$prog_suffix - done + ln -vfs $out/toolchain/sysroot/usr/lib $out/lib + ln -s $out/toolchain/sysroot/usr/lib/${targetInfo.triple}/*.so $out/lib/ + ln -s $out/toolchain/sysroot/usr/lib/${targetInfo.triple}/*.a $out/lib/ + chmod +w $out/lib/* + ln -s $out/toolchain/sysroot/usr/lib/${targetInfo.triple}/${sdkVer}/*.so $out/lib/ + ln -s $out/toolchain/sysroot/usr/lib/${targetInfo.triple}/${sdkVer}/*.o $out/lib/ - # shitty googly wrappers - rm -f $out/bin/${stdenv.targetPlatform.config}-gcc $out/bin/${stdenv.targetPlatform.config}-g++ - ''; + echo "INPUT(-lc++_static)" > $out/lib/libc++.a + + ln -s $out/toolchain/bin $out/bin + ln -s $out/toolchain/${targetInfo.triple}/bin/* $out/bin/ + for f in $out/bin/${targetInfo.triple}-*; do + ln -s $f ''${f/${targetInfo.triple}-/${targetConfig}-} + done + for f in $(find $out/toolchain -type d -name ${targetInfo.triple}); do + ln -s $f ''${f/${targetInfo.triple}/${targetConfig}} + done + + rm -f $out/bin/${targetConfig}-ld + ln -s $out/bin/lld $out/bin/${targetConfig}-ld + + (cd $out/bin; + for tool in llvm-*; do + ln -sf $tool ${targetConfig}-$(echo $tool | sed 's/llvm-//') + ln -sf $tool $(echo $tool | sed 's/llvm-//') + done) + + # handle last, as llvm-as is for llvm bytecode + ln -sf $out/bin/${targetInfo.triple}-as $out/bin/${targetConfig}-as + ln -sf $out/bin/${targetInfo.triple}-as $out/bin/as + + patchShebangs $out/bin + ''; + }; binutils = wrapBintoolsWith { bintools = binaries; @@ -95,9 +128,16 @@ rec { libc = targetAndroidndkPkgs.libraries; extraBuildCommands = '' echo "-D__ANDROID_API__=${stdenv.targetPlatform.sdkVer}" >> $out/nix-support/cc-cflags - echo "-target ${stdenv.targetPlatform.config}" >> $out/nix-support/cc-cflags - echo "-resource-dir=$(echo ${androidndk}/libexec/android-sdk/ndk-bundle/toolchains/llvm/prebuilt/${hostInfo.double}/lib*/clang/*)" >> $out/nix-support/cc-cflags - echo "--gcc-toolchain=${androidndk}/libexec/android-sdk/ndk-bundle/toolchains/${targetInfo.toolchain}-${targetInfo.gccVer}/prebuilt/${hostInfo.double}" >> $out/nix-support/cc-cflags + # Android needs executables linked with -pie since version 5.0 + # Use -fPIC for compilation, and link with -pie if no -shared flag used in ldflags + echo "-target ${targetInfo.triple} -fPIC" >> $out/nix-support/cc-cflags + echo "-z,noexecstack -z,relro -z,now" >> $out/nix-support/cc-ldflags + echo 'if [[ ! " $@ " =~ " -shared " ]]; then NIX_LDFLAGS_${suffixSalt}+=" -pie"; fi' >> $out/nix-support/add-flags.sh + echo "-Xclang -mnoexecstack" >> $out/nix-support/cc-cxxflags + if [ ${targetInfo.triple} == arm-linux-androideabi ]; then + # https://android.googlesource.com/platform/external/android-cmake/+/refs/heads/cmake-master-dev/android.toolchain.cmake + echo "--fix-cortex-a8" >> $out/nix-support/cc-ldflags + fi ''; }; @@ -107,10 +147,14 @@ rec { # cross-compiling packages to wrap incorrectly wrap binaries we don't include # anyways. libraries = runCommand "bionic-prebuilt" {} '' - mkdir -p $out - cp -r ${buildAndroidndk}/libexec/android-sdk/ndk-bundle/sysroot/usr/include $out/include - chmod +w $out/include - cp -r ${buildAndroidndk}/libexec/android-sdk/ndk-bundle/sysroot/usr/include/${targetInfo.triple}/* $out/include - ln -s ${buildAndroidndk}/libexec/android-sdk/ndk-bundle/platforms/android-${stdenv.hostPlatform.sdkVer}/arch-${hostInfo.arch}/usr/${if hostInfo.arch == "x86_64" then "lib64" else "lib"} $out/lib + lpath=${buildAndroidndk}/libexec/android-sdk/ndk-bundle/toolchains/llvm/prebuilt/${buildInfo.double}/sysroot/usr/lib/${targetInfo.triple}/${sdkVer} + if [ ! -d $lpath ]; then + echo "NDK does not contain libraries for SDK version ${sdkVer} <$lpath>" + exit 1 + fi + mkdir -p $out/lib + cp $lpath/*.so $lpath/*.a $out/lib + chmod +w $out/lib/* + cp $lpath/* $out/lib ''; } diff --git a/third_party/nixpkgs/pkgs/development/androidndk-pkgs/default.nix b/third_party/nixpkgs/pkgs/development/androidndk-pkgs/default.nix index 5f71304d38..a7001ce1d4 100644 --- a/third_party/nixpkgs/pkgs/development/androidndk-pkgs/default.nix +++ b/third_party/nixpkgs/pkgs/development/androidndk-pkgs/default.nix @@ -2,36 +2,6 @@ }: { - "18b" = - let - ndkVersion = "18.1.5063045"; - - buildAndroidComposition = buildPackages.buildPackages.androidenv.composeAndroidPackages { - includeNDK = true; - inherit ndkVersion; - }; - - androidComposition = androidenv.composeAndroidPackages { - includeNDK = true; - inherit ndkVersion; - }; - in - import ./androidndk-pkgs.nix { - inherit lib; - inherit (buildPackages) - makeWrapper; - inherit (pkgs) - stdenv - runCommand wrapBintoolsWith wrapCCWith; - # buildPackages.foo rather than buildPackages.buildPackages.foo would work, - # but for splicing messing up on infinite recursion for the variants we - # *dont't* use. Using this workaround, but also making a test to ensure - # these two really are the same. - buildAndroidndk = buildAndroidComposition.ndk-bundle; - androidndk = androidComposition.ndk-bundle; - targetAndroidndkPkgs = targetPackages.androidndkPkgs_18b; - }; - "21" = let ndkVersion = "21.0.6113669"; @@ -49,7 +19,7 @@ import ./androidndk-pkgs.nix { inherit lib; inherit (buildPackages) - makeWrapper; + makeWrapper autoPatchelfHook; inherit (pkgs) stdenv runCommand wrapBintoolsWith wrapCCWith; @@ -62,4 +32,64 @@ targetAndroidndkPkgs = targetPackages.androidndkPkgs_21; }; + "23b" = + let + ndkVersion = "23.1.7779620"; + + buildAndroidComposition = buildPackages.buildPackages.androidenv.composeAndroidPackages { + includeNDK = true; + inherit ndkVersion; + }; + + androidComposition = androidenv.composeAndroidPackages { + includeNDK = true; + inherit ndkVersion; + }; + in + import ./androidndk-pkgs.nix { + inherit lib; + inherit (buildPackages) + makeWrapper autoPatchelfHook; + inherit (pkgs) + stdenv + runCommand wrapBintoolsWith wrapCCWith; + # buildPackages.foo rather than buildPackages.buildPackages.foo would work, + # but for splicing messing up on infinite recursion for the variants we + # *dont't* use. Using this workaround, but also making a test to ensure + # these two really are the same. + buildAndroidndk = buildAndroidComposition.ndk-bundle; + androidndk = androidComposition.ndk-bundle; + targetAndroidndkPkgs = targetPackages.androidndkPkgs_23b; + }; + + "24" = + let + ndkVersion = "24.0.8215888"; + + buildAndroidComposition = buildPackages.buildPackages.androidenv.composeAndroidPackages { + includeNDK = true; + inherit ndkVersion; + }; + + androidComposition = androidenv.composeAndroidPackages { + includeNDK = true; + inherit ndkVersion; + }; + in + import ./androidndk-pkgs.nix { + inherit lib; + inherit (buildPackages) + makeWrapper autoPatchelfHook; + inherit (pkgs) + stdenv + runCommand wrapBintoolsWith wrapCCWith; + # buildPackages.foo rather than buildPackages.buildPackages.foo would work, + # but for splicing messing up on infinite recursion for the variants we + # *dont't* use. Using this workaround, but also making a test to ensure + # these two really are the same. + buildAndroidndk = buildAndroidComposition.ndk-bundle; + androidndk = androidComposition.ndk-bundle; + targetAndroidndkPkgs = targetPackages.androidndkPkgs_24; + }; + } diff --git a/third_party/nixpkgs/pkgs/development/compilers/dotnet/build-dotnet.nix b/third_party/nixpkgs/pkgs/development/compilers/dotnet/build-dotnet.nix index e16049e859..cadb6fb31d 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/dotnet/build-dotnet.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/dotnet/build-dotnet.nix @@ -4,12 +4,14 @@ , icu #passing icu as an argument, because dotnet 3.1 has troubles with icu71 }: -assert builtins.elem type [ "aspnetcore" "runtime" "sdk"]; +assert builtins.elem type [ "aspnetcore" "runtime" "sdk" ]; { lib , stdenv , fetchurl , writeText +, autoPatchelfHook +, makeWrapper , libunwind , openssl , libuuid @@ -19,19 +21,21 @@ assert builtins.elem type [ "aspnetcore" "runtime" "sdk"]; }: let - pname = if type == "aspnetcore" then - "aspnetcore-runtime" - else if type == "runtime" then - "dotnet-runtime" - else - "dotnet-sdk"; + pname = + if type == "aspnetcore" then + "aspnetcore-runtime" + else if type == "runtime" then + "dotnet-runtime" + else + "dotnet-sdk"; descriptions = { aspnetcore = "ASP.NET Core Runtime ${version}"; runtime = ".NET Runtime ${version}"; sdk = ".NET SDK ${version}"; }; -in stdenv.mkDerivation rec { +in +stdenv.mkDerivation rec { inherit pname version; # Some of these dependencies are `dlopen()`ed. @@ -43,12 +47,20 @@ in stdenv.mkDerivation rec { libunwind libuuid openssl - ] ++ lib.optionals stdenv.isLinux [ - lttng-ust_2_12 - ]); + ] ++ lib.optional stdenv.isLinux lttng-ust_2_12); - src = fetchurl (srcs."${stdenv.hostPlatform.system}" or (throw - "Missing source (url and hash) for host system: ${stdenv.hostPlatform.system}")); + nativeBuildInputs = [ + makeWrapper + ] ++ lib.optional stdenv.isLinux autoPatchelfHook; + + buildInputs = [ + stdenv.cc.cc + ]; + + src = fetchurl ( + srcs."${stdenv.hostPlatform.system}" or (throw + "Missing source (url and hash) for host system: ${stdenv.hostPlatform.system}") + ); sourceRoot = "."; @@ -68,10 +80,16 @@ in stdenv.mkDerivation rec { patchelf --set-rpath "${rpath}" $out/dotnet find $out -type f -name "*.so" -exec patchelf --set-rpath '$ORIGIN:${rpath}' {} \; find $out -type f \( -name "apphost" -or -name "createdump" \) -exec patchelf --set-interpreter "${stdenv.cc.bintools.dynamicLinker}" --set-rpath '$ORIGIN:${rpath}' {} \; + + wrapProgram $out/bin/dotnet \ + --prefix LD_LIBRARY_PATH : ${icu}/lib ''; doInstallCheck = true; installCheckPhase = '' + # Fixes cross + export DOTNET_SYSTEM_GLOBALIZATION_INVARIANT=1 + $out/bin/dotnet --info ''; @@ -85,6 +103,10 @@ in stdenv.mkDerivation rec { export DOTNET_CLI_TELEMETRY_OPTOUT=1 ''; + passthru = { + inherit icu; + }; + meta = with lib; { description = builtins.getAttr type descriptions; homepage = "https://dotnet.github.io/"; diff --git a/third_party/nixpkgs/pkgs/development/compilers/emscripten/default.nix b/third_party/nixpkgs/pkgs/development/compilers/emscripten/default.nix index 0a99fa170b..b8544d01ea 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/emscripten/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/emscripten/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { pname = "emscripten"; - version = "3.1.14"; + version = "3.1.15"; llvmEnv = symlinkJoin { name = "emscripten-llvm-${version}"; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "emscripten-core"; repo = "emscripten"; - sha256 = "sha256-CVFC278ibwUMib2F64Uc7FP+D1JPUJ/9/3w0wz1PWqg="; + sha256 = "sha256-aRevSQZsJepRcoeRf5U504FV707ZarpiG8qbD/v3OPg="; rev = version; }; diff --git a/third_party/nixpkgs/pkgs/development/compilers/emscripten/package.json b/third_party/nixpkgs/pkgs/development/compilers/emscripten/package.json index dfd416c3b5..7a5316b9b6 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/emscripten/package.json +++ b/third_party/nixpkgs/pkgs/development/compilers/emscripten/package.json @@ -1,6 +1,6 @@ { "name": "emscripten", - "version": "3.1.14", + "version": "3.1.15", "private": true, "devDependencies": { "es-check": "^6.2.1", diff --git a/third_party/nixpkgs/pkgs/development/compilers/go/1.17.nix b/third_party/nixpkgs/pkgs/development/compilers/go/1.17.nix index 94d3472ca6..db2133d011 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/go/1.17.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/go/1.17.nix @@ -60,11 +60,11 @@ in stdenv.mkDerivation rec { pname = "go"; - version = "1.17.11"; + version = "1.17.12"; src = fetchurl { url = "https://dl.google.com/go/go${version}.src.tar.gz"; - sha256 = "sha256-rCZJpllExqWr5VBUAA7uPXcZaIDaNqNVX2LgZUDo61Q="; + sha256 = "sha256-DVG1s/KAwPAfU0WYwCGdtYePM32mE3qe5ph3dBNgcgk="; }; strictDeps = true; diff --git a/third_party/nixpkgs/pkgs/development/compilers/ligo/default.nix b/third_party/nixpkgs/pkgs/development/compilers/ligo/default.nix index 36ec5bba2e..ab61043048 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/ligo/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/ligo/default.nix @@ -46,6 +46,7 @@ coq.ocamlPackages.buildDunePackage rec { yojson getopt core + core_unix pprint linenoise @@ -83,6 +84,8 @@ coq.ocamlPackages.buildDunePackage rec { doCheck = false; # Tests fail, but could not determine the reason + patches = [ ./ligo.patch ]; # fix for core >= 0.15.0 + meta = with lib; { homepage = "https://ligolang.org/"; downloadPage = "https://ligolang.org/docs/intro/installation"; diff --git a/third_party/nixpkgs/pkgs/development/compilers/ligo/ligo.patch b/third_party/nixpkgs/pkgs/development/compilers/ligo/ligo.patch new file mode 100644 index 0000000000..1a076cf18c --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/ligo/ligo.patch @@ -0,0 +1,134 @@ +diff --git a/ligo.opam b/ligo.opam +index d561c74d1..3a8d34feb 100644 +--- a/ligo.opam ++++ b/ligo.opam +@@ -10,7 +10,9 @@ license: "MIT" + # If you change the dependencies, run `opam lock` in the root + depends: [ + # Jane Street Core +- "core" ++ "core" { >= "v0.14.0" & < "v0.16.0" } ++ "core_kernel" { >= "v0.14.0" & "v0.16.0" } ++ "core_unix" { >= "v0.14.0" & "v0.16.0" } + # Tooling + "odoc" { build } + "ocamlfind" { build } +diff --git a/ligo.opam.locked b/ligo.opam.locked +index b4501cc76..c8ed8a41f 100644 +--- a/ligo.opam.locked ++++ b/ligo.opam.locked +@@ -50,8 +50,9 @@ depends: [ + "conf-rust" {= "0.1"} + "conf-which" {= "1"} + "coq" {= "8.13.2"} +- "core" {= "v0.14.1"} +- "core_kernel" {= "v0.14.2"} ++ "core" {= "v0.15.0"} ++ "core_kernel" {= "v0.15.0"} ++ "core_unix" {= "v0.15.0"} + "cppo" {= "1.6.8"} + "csexp" {= "1.5.1"} + "cstruct" {= "6.0.1"} +diff --git a/src/bin/cli.ml b/src/bin/cli.ml +index a6fc13e0d..ef5177868 100644 +--- a/src/bin/cli.ml ++++ b/src/bin/cli.ml +@@ -12,7 +12,7 @@ let entry_point = + let source_file = + let name = "SOURCE_FILE" in + let _doc = "the path to the smart contract file." in +- Command.Param.(anon (name %: Filename.arg_type)) ++ Command.Param.(anon (name %: Filename_unix.arg_type)) + + let package_name = + let name = "PACKAGE_NAME" in +@@ -662,7 +662,7 @@ let main = Command.group ~preserve_subcommand_order:() ~summary:"the LigoLANG co + ] + + let run ?argv () = +- Command.run ~version:Version.version ?argv main; ++ Command_unix.run ~version:Version.version ?argv main; + (* Effect to error code *) + match !return with + Done -> 0; +@@ -677,4 +677,3 @@ let run ?argv () = + match exn with + | Failure msg -> message msg + | exn -> message (Exn.to_string exn) +- +diff --git a/src/bin/cli_helpers.ml b/src/bin/cli_helpers.ml +index b64a17d53..8c4c43dde 100644 +--- a/src/bin/cli_helpers.ml ++++ b/src/bin/cli_helpers.ml +@@ -66,7 +66,7 @@ let run_command (cmd : command) = + (fun p -> Lwt.map + (fun status -> + match status with +- Caml.Unix.WEXITED 0 -> Ok () ++ Caml_unix.WEXITED 0 -> Ok () + | _ -> Error ("unknown error")) + p#status) in + Lwt_main.run status +\ No newline at end of file +diff --git a/src/bin/dune b/src/bin/dune +index 295c056f3..08d980439 100644 +--- a/src/bin/dune ++++ b/src/bin/dune +@@ -11,7 +11,9 @@ + repl + install + cli_helpers +- ligo_api) ++ ligo_api ++ core_unix.command_unix ++ core_unix.filename_unix) + (modules cli version)) + + (library +diff --git a/src/main/interpreter/dune b/src/main/interpreter/dune +index c55e24a88..f9762a297 100644 +--- a/src/main/interpreter/dune ++++ b/src/main/interpreter/dune +@@ -4,4 +4,4 @@ + (instrumentation + (backend bisect_ppx)) + (libraries tezos-011-PtHangz2-test-helpers ast_aggregated ligo_interpreter +- main_errors ligo_compile build fuzz ligo_run self_ast_typed)) ++ main_errors ligo_compile build fuzz ligo_run self_ast_typed core_unix.sys_unix)) +diff --git a/src/main/interpreter/interpreter.ml b/src/main/interpreter/interpreter.ml +index b0379029c..530e08c3a 100644 +--- a/src/main/interpreter/interpreter.ml ++++ b/src/main/interpreter/interpreter.ml +@@ -2,6 +2,7 @@ open Simple_utils.Trace + open Simple_utils + open Ligo_interpreter.Types + open Ligo_interpreter.Combinators ++module Sys = Sys_unix + + module AST = Ast_aggregated + +diff --git a/vendors/ligo-utils/simple-utils/dune b/vendors/ligo-utils/simple-utils/dune +index ca9f2bf5c..62c39087b 100644 +--- a/vendors/ligo-utils/simple-utils/dune ++++ b/vendors/ligo-utils/simple-utils/dune +@@ -6,6 +6,7 @@ + (libraries + ;; Third party + core ++ core_kernel.caml_unix + yojson + result + unix +diff --git a/vendors/ligo-utils/simple-utils/snippet.ml b/vendors/ligo-utils/simple-utils/snippet.ml +index 658f115f2..f23000590 100644 +--- a/vendors/ligo-utils/simple-utils/snippet.ml ++++ b/vendors/ligo-utils/simple-utils/snippet.ml +@@ -1,7 +1,7 @@ + (* used to show code snippets in error messages *) + + let print_code ppf (l:Region.t) (input_line: unit -> string) = +- let dumb =String.equal (Caml.Unix.getenv "TERM") "dumb" in ++ let dumb =String.equal (Caml_unix.getenv "TERM") "dumb" in + let start = l#start#line in + let start_column = l#start#offset `Byte in + let stop = l#stop#line in 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 46d7430966..f1f97216ef 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/purescript/purescript/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/purescript/purescript/default.nix @@ -18,7 +18,7 @@ let in stdenv.mkDerivation rec { pname = "purescript"; - version = "0.15.2"; + version = "0.15.4"; # 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 = "06fsq9ynfvfqn3ac5jxdj81lmzd6bh84p7jz5qib31h27iy5aq4h"; + sha256 = "0rksc6c98pp48lcavair6apjpgq3s1zz0lhkc59vbz67c8zxc26d"; } else fetchurl { url = "https://github.com/${pname}/${pname}/releases/download/v${version}/linux64.tar.gz"; - sha256 = "1p37k6briczw6gvw04idkx734ms1swgrx9sl4hi6xwvxkfp1nm0m"; + sha256 = "13p6qsba6kmcsppc3z6vcm3v5c7jxhp10nyvxry4nmj9mkdmjaiy"; }; @@ -61,6 +61,7 @@ in stdenv.mkDerivation rec { description = "A strongly-typed functional programming language that compiles to JavaScript"; homepage = "https://www.purescript.org/"; license = licenses.bsd3; + sourceProvenance = with lib.sourceTypes; [ binaryNativeCode ]; maintainers = with maintainers; [ justinwoo mbbx6spp cdepillabout ]; platforms = [ "x86_64-linux" "x86_64-darwin" ]; mainProgram = "purs"; diff --git a/third_party/nixpkgs/pkgs/development/compilers/zig/default.nix b/third_party/nixpkgs/pkgs/development/compilers/zig/default.nix index a2cd8f44ce..d64c002bf7 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/zig/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/zig/default.nix @@ -1,4 +1,5 @@ { lib +, stdenv , fetchFromGitHub , cmake , llvmPackages @@ -6,9 +7,6 @@ , zlib }: -let - inherit (llvmPackages) stdenv; -in stdenv.mkDerivation rec { pname = "zig"; version = "0.9.1"; @@ -50,8 +48,7 @@ stdenv.mkDerivation rec { description = "General-purpose programming language and toolchain for maintaining robust, optimal, and reusable software"; license = licenses.mit; - maintainers = with maintainers; [ andrewrk AndersonTorres ]; + maintainers = with maintainers; [ aiotter andrewrk AndersonTorres ]; platforms = platforms.unix; - broken = stdenv.isDarwin; # See https://github.com/NixOS/nixpkgs/issues/86299 }; } 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 53c317db87..9879ef55db 100644 --- a/third_party/nixpkgs/pkgs/development/coq-modules/gaia/default.nix +++ b/third_party/nixpkgs/pkgs/development/coq-modules/gaia/default.nix @@ -6,11 +6,12 @@ with lib; mkCoqDerivation { release."1.11".sha256 = "sha256:0gwb0blf37sv9gb0qpn34dab71zdcx7jsnqm3j9p58qw65cgsqn5"; release."1.12".sha256 = "sha256:0c6cim4x6f9944g8v0cp0lxs244lrhb04ms4y2s6y1wh321zj5mi"; release."1.13".sha256 = "sha256:0i8ix2rbw10v34bi0yrx0z89ng96ydqbxm8rv2rnfgy4d1b27x6q"; + release."1.14".sha256 = "sha256-wgeQC0fIN3PSmRY1K6/KTy+rJmqqxdo3Bhsz1vjVAes="; releaseRev = (v: "v${v}"); inherit version; defaultVersion = with versions; switch [ coq.version mathcomp.version ] [ - { cases = [ (range "8.10" "8.15") (isGe "1.12.0") ]; out = "1.13"; } + { cases = [ (range "8.10" "8.15") (isGe "1.12.0") ]; out = "1.14"; } { cases = [ (range "8.10" "8.12") "1.11.0" ]; out = "1.11"; } ] null; diff --git a/third_party/nixpkgs/pkgs/development/coq-modules/mathcomp-finmap/default.nix b/third_party/nixpkgs/pkgs/development/coq-modules/mathcomp-finmap/default.nix index 744d5ea985..dc19cd6e56 100644 --- a/third_party/nixpkgs/pkgs/development/coq-modules/mathcomp-finmap/default.nix +++ b/third_party/nixpkgs/pkgs/development/coq-modules/mathcomp-finmap/default.nix @@ -7,6 +7,7 @@ with lib; mkCoqDerivation { owner = "math-comp"; inherit version; defaultVersion = with versions; switch [ coq.version mathcomp.version ] [ + { cases = [ (range "8.13" "8.15") (isGe "1.12") ]; out = "1.5.2"; } { cases = [ (isGe "8.10") (isGe "1.11") ]; out = "1.5.1"; } { cases = [ (range "8.7" "8.11") "1.11.0" ]; out = "1.5.0"; } { cases = [ (isEq "8.11") (range "1.8" "1.10") ]; out = "1.4.0+coq-8.11"; } @@ -16,6 +17,7 @@ with lib; mkCoqDerivation { { cases = [ (range "8.6" "8.7") (range "1.6.1" "1.7") ]; out = "1.0.0"; } ] null; release = { + "1.5.2".sha256 = "sha256-0KmmSjc2AlUo6BKr9RZ4FjL9wlGISlTGU0X1Eu7l4sw="; "1.5.1".sha256 = "0ryfml4pf1dfya16d8ma80favasmrygvspvb923n06kfw9v986j7"; "1.5.0".sha256 = "0vx9n1fi23592b3hv5p5ycy7mxc8qh1y5q05aksfwbzkk5zjkwnq"; "1.4.1".sha256 = "0kx4nx24dml1igk0w0qijmw221r5bgxhwhl5qicnxp7ab3c35s8p"; diff --git a/third_party/nixpkgs/pkgs/development/coq-modules/smtcoq/cvc4.nix b/third_party/nixpkgs/pkgs/development/coq-modules/smtcoq/cvc4.nix new file mode 100644 index 0000000000..7e31ba67b4 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/coq-modules/smtcoq/cvc4.nix @@ -0,0 +1,44 @@ +{ lib, stdenv, cln, fetchurl, gmp, swig, pkg-config +, readline, libantlr3c, boost, jdk8, autoreconfHook +, python3, antlr3_4 +}: + +stdenv.mkDerivation rec { + pname = "cvc4"; + version = "1.6"; + + src = fetchurl { + url = "https://cvc4.cs.stanford.edu/downloads/builds/src/cvc4-${version}.tar.gz"; + sha256 = "1iw793zsi48q91lxpf8xl8lnvv0jsj4whdad79rakywkm1gbs62w"; + }; + + nativeBuildInputs = [ autoreconfHook pkg-config ]; + buildInputs = [ gmp readline swig libantlr3c antlr3_4 boost jdk8 python3 ] + ++ lib.optionals stdenv.isLinux [ cln ]; + + configureFlags = [ + "--enable-language-bindings=c,c++,java" + "--enable-gpl" + "--with-readline" + "--with-boost=${boost.dev}" + ] ++ lib.optionals stdenv.isLinux [ "--with-cln" ]; + + prePatch = '' + patch -p1 -i ${./minisat-fenv.patch} -d src/prop/minisat + patch -p1 -i ${./minisat-fenv.patch} -d src/prop/bvminisat + ''; + + preConfigure = '' + patchShebangs ./src/ + ''; + + enableParallelBuilding = true; + + meta = with lib; { + description = "A high-performance theorem prover and SMT solver"; + homepage = "http://cvc4.cs.stanford.edu/web/"; + license = licenses.gpl3; + platforms = platforms.unix; + maintainers = with maintainers; [ vbgl thoughtpolice gebner ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/coq-modules/smtcoq/default.nix b/third_party/nixpkgs/pkgs/development/coq-modules/smtcoq/default.nix index ebaebe6974..093c1ef15d 100644 --- a/third_party/nixpkgs/pkgs/development/coq-modules/smtcoq/default.nix +++ b/third_party/nixpkgs/pkgs/development/coq-modules/smtcoq/default.nix @@ -1,21 +1,31 @@ -{ lib, stdenv, mkCoqDerivation, coq, trakt, cvc4, veriT, version ? null }: +{ lib, stdenv, pkgs, mkCoqDerivation, coq, trakt, veriT, zchaff, fetchurl, version ? null }: with lib; +let + # version of veriT that works with SMTCoq + veriT' = veriT.overrideAttrs (oA: { + src = fetchurl { + url = "https://www.lri.fr/~keller/Documents-recherche/Smtcoq/veriT9f48a98.tar.gz"; + sha256 = "sha256-Pe46PxQVHWwWwx5Ei4Bl95A0otCiXZuUZ2nXuZPYnhY="; + }; + meta.broken = false; + }); + cvc4 = pkgs.callPackage ./cvc4.nix {}; +in + mkCoqDerivation { pname = "smtcoq"; owner = "smtcoq"; - release."itp22".rev = "1d60d37558d85a4bfd794220ec48849982bdc979"; - release."itp22".sha256 = "sha256-CdPfgDfeJy8Q6ZlQeVCSR/x8ZlJ2kSEF6F5UnAespnQ="; + release."2021-09-17".rev = "f36bf11e994cc269c2ec92b061b082e3516f472f"; + release."2021-09-17".sha256 = "sha256-bF7ES+tXraaAJwVEwAMx3CUESpNlAUerQjr4d2eaGJQ="; inherit version; defaultVersion = with versions; switch coq.version [ - { case = isEq "8.13"; out = "itp22"; } + { case = isEq "8.13"; out = "2021-09-17"; } ] null; - propagatedBuildInputs = [ trakt cvc4 ] - ++ lib.optionals (!stdenv.isDarwin) [ veriT ] - ++ (with coq.ocamlPackages; [ num zarith ]); + propagatedBuildInputs = [ trakt cvc4 veriT' zchaff ] ++ (with coq.ocamlPackages; [ num zarith ]); mlPlugin = true; nativeBuildInputs = with coq.ocamlPackages; [ ocamlbuild ]; diff --git a/third_party/nixpkgs/pkgs/development/coq-modules/smtcoq/minisat-fenv.patch b/third_party/nixpkgs/pkgs/development/coq-modules/smtcoq/minisat-fenv.patch new file mode 100644 index 0000000000..686d5a1c5b --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/coq-modules/smtcoq/minisat-fenv.patch @@ -0,0 +1,65 @@ +From 7f1016ceab9b0f57a935bd51ca6df3d18439b472 Mon Sep 17 00:00:00 2001 +From: Will Dietz +Date: Tue, 17 Oct 2017 22:57:02 -0500 +Subject: [PATCH] use fenv instead of non-standard fpu_control + +--- + core/Main.cc | 8 ++++++-- + simp/Main.cc | 8 ++++++-- + utils/System.h | 2 +- + 3 files changed, 13 insertions(+), 5 deletions(-) + +diff --git a/core/Main.cc b/core/Main.cc +index 2b0d97b..8ad95fb 100644 +--- a/core/Main.cc ++++ b/core/Main.cc +@@ -78,8 +78,12 @@ int main(int argc, char** argv) + // printf("This is MiniSat 2.0 beta\n"); + + #if defined(__linux__) +- fpu_control_t oldcw, newcw; +- _FPU_GETCW(oldcw); newcw = (oldcw & ~_FPU_EXTENDED) | _FPU_DOUBLE; _FPU_SETCW(newcw); ++ fenv_t fenv; ++ ++ fegetenv(&fenv); ++ fenv.__control_word &= ~0x300; /* _FPU_EXTENDED */ ++ fenv.__control_word |= 0x200; /* _FPU_DOUBLE */ ++ fesetenv(&fenv); + printf("WARNING: for repeatability, setting FPU to use double precision\n"); + #endif + // Extra options: +diff --git a/simp/Main.cc b/simp/Main.cc +index 2804d7f..39bfb71 100644 +--- a/simp/Main.cc ++++ b/simp/Main.cc +@@ -79,8 +79,12 @@ int main(int argc, char** argv) + // printf("This is MiniSat 2.0 beta\n"); + + #if defined(__linux__) +- fpu_control_t oldcw, newcw; +- _FPU_GETCW(oldcw); newcw = (oldcw & ~_FPU_EXTENDED) | _FPU_DOUBLE; _FPU_SETCW(newcw); ++ fenv_t fenv; ++ ++ fegetenv(&fenv); ++ fenv.__control_word &= ~0x300; /* _FPU_EXTENDED */ ++ fenv.__control_word |= 0x200; /* _FPU_DOUBLE */ ++ fesetenv(&fenv); + printf("WARNING: for repeatability, setting FPU to use double precision\n"); + #endif + // Extra options: +diff --git a/utils/System.h b/utils/System.h +index 1758192..c0ad13a 100644 +--- a/utils/System.h ++++ b/utils/System.h +@@ -22,7 +22,7 @@ OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWA + #define Minisat_System_h + + #if defined(__linux__) +-#include ++#include + #endif + + #include "mtl/IntTypes.h" +-- +2.14.2 + diff --git a/third_party/nixpkgs/pkgs/development/embedded/jtag-remote-server/default.nix b/third_party/nixpkgs/pkgs/development/embedded/jtag-remote-server/default.nix new file mode 100644 index 0000000000..bcfba506a0 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/embedded/jtag-remote-server/default.nix @@ -0,0 +1,24 @@ +{ stdenv, fetchFromGitHub, lib, cmake, pkg-config, libftdi1 }: + +stdenv.mkDerivation rec { + pname = "jtag-remote-server"; + version = "unstable-2022-06-09"; + + src = fetchFromGitHub { + owner = "jiegec"; + repo = pname; + rev = "917d8d298423ba1aa6e75aa92e009b7f27f74a57"; + hash = "sha256-Jy0OyRgn9SYpjP3HYWPvRirfxXk4/vMYvZuI3XpPtBw="; + }; + + nativeBuildInputs = [ cmake pkg-config ]; + buildInputs = [ libftdi1 ]; + + meta = with lib; { + description = "Remote JTAG server for remote debugging"; + homepage = "https://github.com/jiegec/jtag-remote-server"; + license = licenses.mit; + maintainers = with maintainers; [ nickcao ]; + platforms = platforms.unix; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/interpreters/boron/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/boron/default.nix new file mode 100644 index 0000000000..249a39c58f --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/interpreters/boron/default.nix @@ -0,0 +1,48 @@ +{ lib +, stdenv +, fetchurl +, zlib +}: + +stdenv.mkDerivation rec { + pname = "boron"; + version = "2.0.8"; + + src = fetchurl { + url = "https://sourceforge.net/projects/urlan/files/Boron/boron-${version}.tar.gz"; + sha256 = "sha256-Ni/LJgOABC2wXDMsg1ZAuZWSQdFT9/Fa4lH4+V0gy8M="; + }; + + # this is not a standard Autotools-like `configure` script + dontAddPrefix = true; + + preConfigure = '' + patchShebangs configure + ''; + + configureFlags = [ "--thread" ]; + + makeFlags = [ "DESTDIR=$(out)" ]; + + buildInputs = [ + zlib + ]; + + installTargets = [ "install" "install-dev" ]; + + doCheck = true; + + checkPhase = '' + patchShebangs . + make -C test + ''; + + meta = with lib; { + homepage = "http://urlan.sourceforge.net/boron/"; + description = "Scripting language and C library useful for building DSLs"; + license = licenses.lgpl3Plus; + platforms = platforms.linux; + maintainers = with maintainers; [ mausch ]; + }; +} + diff --git a/third_party/nixpkgs/pkgs/development/interpreters/erlang/R25.nix b/third_party/nixpkgs/pkgs/development/interpreters/erlang/R25.nix index f11633d3d1..381ea8d5c2 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/erlang/R25.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/erlang/R25.nix @@ -3,6 +3,6 @@ # How to obtain `sha256`: # nix-prefetch-url --unpack https://github.com/erlang/otp/archive/OTP-${version}.tar.gz mkDerivation { - version = "25.0"; - sha256 = "1nf72yiirdpxcs8m10xc04ryghxxc73x954x38m5a6fhv2hfhp2n"; + version = "25.0.3"; + sha256 = "0zchcm7gv52j30fq5p658h9c593ziirq09kkah6mpsvjfdsmvmgl"; } diff --git a/third_party/nixpkgs/pkgs/development/interpreters/renpy/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/renpy/default.nix new file mode 100644 index 0000000000..73c95c7405 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/interpreters/renpy/default.nix @@ -0,0 +1,89 @@ +{ lib, stdenv, fetchFromGitHub, python3, pkg-config, SDL2 +, libpng, ffmpeg, freetype, glew, libGL, libGLU, fribidi, zlib +, makeWrapper +}: + +stdenv.mkDerivation rec { + pname = "renpy"; + + # https://renpy.org/doc/html/changelog.html#versioning + # base_version is of the form major.minor.patch + # vc_version is of the form YYMMDDCC + # version corresponds to the tag on GitHub + base_version = "8.0.0"; + vc_version = "22062402"; + version = "${base_version}.${vc_version}"; + + src = fetchFromGitHub { + owner = "renpy"; + repo = "renpy"; + rev = version; + sha256 = "sha256-37Hbs0i5eXMjVaETX7ImJCak0y8XtEHUaRFceA9J39A="; + }; + + nativeBuildInputs = [ + pkg-config + makeWrapper + python3.pkgs.cython + ]; + + buildInputs = [ + SDL2 libpng ffmpeg freetype glew libGLU libGL fribidi zlib + ] ++ (with python3.pkgs; [ + python pygame_sdl2 tkinter future six pefile requests + ]); + + RENPY_DEPS_INSTALL = lib.concatStringsSep "::" (map (path: path) [ + SDL2 SDL2.dev libpng ffmpeg.out freetype glew.dev libGLU libGL fribidi zlib + ]); + + enableParallelBuilding = true; + + patches = [ + ./renpy-system-fribidi.diff + ]; + + postPatch = '' + substituteInPlace module/setup.py \ + --replace "@fribidi@" "${fribidi}" + + cp tutorial/game/tutorial_director.rpy{m,} + + cat > renpy/vc_version.py << EOF + vc_version = ${vc_version} + official = False + nightly = False + EOF + ''; + + buildPhase = with python3.pkgs; '' + runHook preBuild + ${python.interpreter} module/setup.py build --parallel=$NIX_BUILD_CORES + runHook postBuild + ''; + + installPhase = with python3.pkgs; '' + runHook preInstall + + ${python.interpreter} module/setup.py install --prefix=$out + mkdir -p $out/share/renpy + cp -vr sdk-fonts gui launcher renpy the_question tutorial renpy.py $out/share/renpy + + makeWrapper ${python.interpreter} $out/bin/renpy \ + --set PYTHONPATH "$PYTHONPATH:$out/${python.sitePackages}" \ + --add-flags "-O $out/share/renpy/renpy.py" + + runHook postInstall + ''; + + NIX_CFLAGS_COMPILE = with python3.pkgs; "-I${pygame_sdl2}/include/${python.libPrefix}"; + + meta = with lib; { + description = "Visual Novel Engine"; + homepage = "https://renpy.org/"; + changelog = "https://renpy.org/doc/html/changelog.html"; + license = licenses.mit; + platforms = platforms.linux; + maintainers = with maintainers; [ shadowrz ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/interpreters/renpy/renpy-system-fribidi.diff b/third_party/nixpkgs/pkgs/development/interpreters/renpy/renpy-system-fribidi.diff new file mode 100644 index 0000000000..8c93b75a7b --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/interpreters/renpy/renpy-system-fribidi.diff @@ -0,0 +1,51 @@ +diff --git a/module/renpybidicore.c b/module/renpybidicore.c +index 849430d..d883a52 100644 +--- a/module/renpybidicore.c ++++ b/module/renpybidicore.c +@@ -1,10 +1,6 @@ + #include + +-#ifdef RENPY_BUILD + #include +-#else +-#include +-#endif + + #include + +diff --git a/module/setup.py b/module/setup.py +index bd16816..f6b8794 100755 +--- a/module/setup.py ++++ b/module/setup.py +@@ -118,29 +118,17 @@ cython( + sdl + [ png, 'z', 'm' ]) + + FRIBIDI_SOURCES = """ +-fribidi-src/lib/fribidi.c +-fribidi-src/lib/fribidi-arabic.c +-fribidi-src/lib/fribidi-bidi.c +-fribidi-src/lib/fribidi-bidi-types.c +-fribidi-src/lib/fribidi-deprecated.c +-fribidi-src/lib/fribidi-joining.c +-fribidi-src/lib/fribidi-joining-types.c +-fribidi-src/lib/fribidi-mem.c +-fribidi-src/lib/fribidi-mirroring.c +-fribidi-src/lib/fribidi-run.c +-fribidi-src/lib/fribidi-shape.c + renpybidicore.c + """.split() + cython( + "_renpybidi", + FRIBIDI_SOURCES, ++ ["fribidi"], + includes=[ +- BASE + "/fribidi-src/", +- BASE + "/fribidi-src/lib/", ++ "@fribidi@/include/fribidi/", + ], + define_macros=[ + ("FRIBIDI_ENTRY", ""), +- ("HAVE_CONFIG_H", "1"), + ]) + + if not (android or ios or emscripten): diff --git a/third_party/nixpkgs/pkgs/development/libraries/aqbanking/default.nix b/third_party/nixpkgs/pkgs/development/libraries/aqbanking/default.nix index 2db69f8028..102703107c 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/aqbanking/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/aqbanking/default.nix @@ -3,14 +3,14 @@ }: let - inherit ((import ./sources.nix).aqbanking) sha256 releaseId version; + inherit ((import ./sources.nix).aqbanking) hash releaseId version; in stdenv.mkDerivation rec { pname = "aqbanking"; inherit version; src = fetchurl { url = "https://www.aquamaniac.de/rdm/attachments/download/${releaseId}/${pname}-${version}.tar.gz"; - inherit sha256; + inherit hash; }; # Set the include dir explicitly, this fixes a build error when building diff --git a/third_party/nixpkgs/pkgs/development/libraries/aqbanking/gwenhywfar.nix b/third_party/nixpkgs/pkgs/development/libraries/aqbanking/gwenhywfar.nix index 2eb67a022b..e6b535ffe4 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/aqbanking/gwenhywfar.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/aqbanking/gwenhywfar.nix @@ -11,14 +11,14 @@ }: let - inherit ((import ./sources.nix).gwenhywfar) sha256 releaseId version; + inherit ((import ./sources.nix).gwenhywfar) hash releaseId version; in stdenv.mkDerivation rec { pname = "gwenhywfar"; inherit version; src = fetchurl { url = "https://www.aquamaniac.de/rdm/attachments/download/${releaseId}/${pname}-${version}.tar.gz"; - inherit sha256; + inherit hash; }; configureFlags = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/aqbanking/libchipcard.nix b/third_party/nixpkgs/pkgs/development/libraries/aqbanking/libchipcard.nix index f483f232e3..9190e1ad9b 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/aqbanking/libchipcard.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/aqbanking/libchipcard.nix @@ -1,14 +1,14 @@ { lib, stdenv, fetchurl, pkg-config, gwenhywfar, pcsclite, zlib }: let - inherit ((import ./sources.nix).libchipcard) sha256 releaseId version; + inherit ((import ./sources.nix).libchipcard) hash releaseId version; in stdenv.mkDerivation rec { pname = "libchipcard"; inherit version; src = fetchurl { url = "https://www.aquamaniac.de/rdm/attachments/download/${releaseId}/${pname}-${version}.tar.gz"; - inherit sha256; + inherit hash; }; nativeBuildInputs = [ pkg-config ]; @@ -17,8 +17,6 @@ in stdenv.mkDerivation rec { makeFlags = [ "crypttokenplugindir=$(out)/lib/gwenhywfar/plugins/ct" ]; - configureFlags = [ "--with-gwen-dir=${gwenhywfar}" ]; - meta = with lib; { description = "Library for access to chipcards"; homepage = "https://www.aquamaniac.de/rdm/projects/libchipcard"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/aqbanking/sources.nix b/third_party/nixpkgs/pkgs/development/libraries/aqbanking/sources.nix index 60f61324e6..2adea166da 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/aqbanking/sources.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/aqbanking/sources.nix @@ -1,11 +1,22 @@ { - gwenhywfar.version = "5.6.0"; - gwenhywfar.sha256 = "1isbj4a7vdgagp3kkvx2pjcjy8lba6kzjr11fmr06aci1694dbsp"; - gwenhywfar.releaseId = "364"; - libchipcard.version = "5.0.4"; - libchipcard.sha256 = "0fj2h39ll4kiv28ch8qgzdbdbnzs8gl812qnm660bw89rynpjnnj"; - libchipcard.releaseId = "158"; - aqbanking.version = "6.3.0"; - aqbanking.sha256 = "1k2mhdnk0jc0inq1hmp74m3y7azxrjm8r07x5k1pp4ic0yi5vs50"; - aqbanking.releaseId = "372"; + # https://www.aquamaniac.de/rdm/projects/gwenhywfar/files + gwenhywfar = { + version = "5.9.0"; + hash = "sha256-6Ix9M4Ojy75Gyzsimfcd+55vpWX1oWaLQpc5HIdLDhI="; + releaseId = "415"; + }; + + # https://www.aquamaniac.de/rdm/projects/libchipcard/files + libchipcard = { + version = "5.1.6"; + hash = "sha256-bAf1J0F/dWIHT5kBLaTRHrTbr9M/SeZrRCzNbjuM/SA="; + releaseId = "382"; + }; + + # https://www.aquamaniac.de/rdm/projects/aqbanking/files + aqbanking = { + version = "6.5.0"; + hash = "sha256-TS076ghulq2ntoGSBtTrQWjOt+Mtzppo3Gxuq8yetj4="; + releaseId = "435"; + }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/armadillo/default.nix b/third_party/nixpkgs/pkgs/development/libraries/armadillo/default.nix index 539288acd4..43fa2027cc 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/armadillo/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/armadillo/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "armadillo"; - version = "11.2.0"; + version = "11.2.2"; src = fetchurl { url = "mirror://sourceforge/arma/armadillo-${version}.tar.xz"; - sha256 = "sha256-31yiFZAcaMY0Z8C/7hTwjjTYdaR6sPCVCCqzLd/08kM="; + sha256 = "sha256-1AHZmkImwoxb+9nUMB8LM/4sgAyoZavgDNnFk+OTpic="; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/catch2/default.nix b/third_party/nixpkgs/pkgs/development/libraries/catch2/default.nix index bbbf08c6f0..111f1054f3 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/catch2/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/catch2/default.nix @@ -20,6 +20,6 @@ stdenv.mkDerivation rec { homepage = "http://catch-lib.net"; license = licenses.boost; maintainers = with maintainers; [ edwtjo knedlsepp ]; - platforms = with platforms; unix; + platforms = platforms.unix ++ [ "x86_64-windows" ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/cjose/default.nix b/third_party/nixpkgs/pkgs/development/libraries/cjose/default.nix index 57b5c6c1b8..1ce4ba8fe3 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/cjose/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/cjose/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "cjose"; - version = "0.6.1"; + version = "0.6.2"; src = fetchFromGitHub { - owner = "cisco"; + owner = "zmartzone"; repo = "cjose"; - rev = version; - sha256 = "1msyjwmylb5c7jc16ryx3xb9cdwx682ihsm0ni766y6dfwx8bkhp"; + rev = "v${version}"; + sha256 = "sha256-FHKuaf4Gg3On7d3UBbGD8k1gA8kGsCOaWtLMohr5woA="; }; nativeBuildInputs = [ autoreconfHook pkg-config doxygen ]; @@ -30,9 +30,9 @@ stdenv.mkDerivation rec { ]; meta = with lib; { - homepage = "https://github.com/cisco/cjose"; - changelog = "https://github.com/cisco/cjose/blob/${version}/CHANGELOG.md"; - description = "C library for Javascript Object Signing and Encryption"; + homepage = "https://github.com/zmartzone/cjose"; + changelog = "https://github.com/zmartzone/cjose/blob/${version}/CHANGELOG.md"; + description = "C library for Javascript Object Signing and Encryption. This is a maintained fork of the original project"; license = licenses.mit; maintainers = with maintainers; [ midchildan ]; platforms = platforms.all; diff --git a/third_party/nixpkgs/pkgs/development/libraries/draco/default.nix b/third_party/nixpkgs/pkgs/development/libraries/draco/default.nix index d35e9a229a..dfce876506 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/draco/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/draco/default.nix @@ -16,14 +16,14 @@ let cmakeBool = b: if b then "ON" else "OFF"; in stdenv.mkDerivation rec { - version = "1.5.2"; + version = "1.5.3"; pname = "draco"; src = fetchFromGitHub { owner = "google"; repo = "draco"; rev = version; - sha256 = "sha256-o6KQJFrnxx2kz6g3vXk1w435OmaJhAJjzsKM/gmVJ2M="; + sha256 = "sha256-LbWtZtgvZQdgwAGHVsouH6cAIVXP+9Q5n8KjzaBRrBQ="; fetchSubmodules = true; }; diff --git a/third_party/nixpkgs/pkgs/development/libraries/eclib/default.nix b/third_party/nixpkgs/pkgs/development/libraries/eclib/default.nix index 74a6f21992..af358be312 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/eclib/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/eclib/default.nix @@ -14,7 +14,7 @@ assert withFlint -> flint != null; stdenv.mkDerivation rec { pname = "eclib"; - version = "20210625"; # upgrade might break the sage interface + version = "20220621"; # upgrade might break the sage interface # sage tests to run: # src/sage/interfaces/mwrank.py # src/sage/libs/eclib @@ -29,7 +29,7 @@ stdenv.mkDerivation rec { # see https://github.com/JohnCremona/eclib/issues/64#issuecomment-789788561 # for upstream's explanation of the above url = "https://github.com/JohnCremona/eclib/releases/download/${version}/eclib-${version}.tar.bz2"; - sha256 = "sha256-fA3MPz/L+Q39sA8wxAYOUowlHRcgOd8VF4tpsBGI6BA="; + sha256 = "sha256-EfoCNhnXGuN5SxgPFES4BaevhSRzU1JvT3ARq9NMJhM="; }; buildInputs = [ pari diff --git a/third_party/nixpkgs/pkgs/development/libraries/fcppt/default.nix b/third_party/nixpkgs/pkgs/development/libraries/fcppt/default.nix index 380fdcce29..f9259e23c2 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/fcppt/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/fcppt/default.nix @@ -1,19 +1,25 @@ -{ lib, stdenv, fetchFromGitHub, cmake, boost, catch2, metal }: +{ lib, stdenv, fetchFromGitHub, cmake, boost, catch2 }: stdenv.mkDerivation rec { pname = "fcppt"; - version = "3.5.0"; + version = "4.2.1"; src = fetchFromGitHub { owner = "freundlich"; repo = "fcppt"; rev = version; - sha256 = "045cmn4sym6ria96l4fsc1vrs8l4xrl1gzkmja82f4ddj8qkji2f"; + sha256 = "1pcmi2ck12nanw1rnwf8lmyx85iq20897k6daxx3hw5f23j1kxv6"; }; nativeBuildInputs = [ cmake ]; - buildInputs = [ boost catch2 metal ]; + buildInputs = [ boost catch2 ]; - cmakeFlags = [ "-DCMAKE_SKIP_BUILD_RPATH=false" "-DENABLE_BOOST=true" "-DENABLE_EXAMPLES=true" "-DENABLE_CATCH=true" "-DENABLE_TEST=true" ]; + cmakeFlags = [ + "-DCMAKE_SKIP_BUILD_RPATH=false" + "-DENABLE_BOOST=true" + "-DENABLE_EXAMPLES=true" + "-DENABLE_CATCH=true" + "-DENABLE_TEST=true" + ]; meta = with lib; { description = "Freundlich's C++ toolkit"; @@ -27,6 +33,6 @@ stdenv.mkDerivation rec { homepage = "https://fcppt.org"; license = licenses.boost; maintainers = with maintainers; [ pmiddend ]; - platforms = platforms.linux; + platforms = [ "x86_64-linux" "x86_64-windows" ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/folly/default.nix b/third_party/nixpkgs/pkgs/development/libraries/folly/default.nix index 8cc763f229..a8cf6cec57 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/folly/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/folly/default.nix @@ -16,6 +16,7 @@ , xz , zlib , zstd +, jemalloc , follyMobile ? false }: @@ -50,7 +51,10 @@ stdenv.mkDerivation rec { libunwind fmt_8 zstd - ]; + ] ++ lib.optional stdenv.isLinux jemalloc; + + # jemalloc headers are required in include/folly/portability/Malloc.h + propagatedBuildInputs = lib.optional stdenv.isLinux jemalloc; NIX_CFLAGS_COMPILE = [ "-DFOLLY_MOBILE=${if follyMobile then "1" else "0"}" "-fpermissive" ]; cmakeFlags = [ "-DBUILD_SHARED_LIBS=ON" ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/ftxui/default.nix b/third_party/nixpkgs/pkgs/development/libraries/ftxui/default.nix index 27a21ceca6..68679d262b 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/ftxui/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/ftxui/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , cmake , doxygen , graphviz @@ -8,21 +9,34 @@ stdenv.mkDerivation rec { pname = "ftxui"; - version = "2.0.0"; + version = "3.0.0"; src = fetchFromGitHub { owner = "ArthurSonzogni"; - repo = pname; + repo = "ftxui"; rev = "v${version}"; - sha256 = "sha256-BfNUk2DbBpKMBEu1tQWl85tgjB/4NAh86VVSS9zAjKo="; + sha256 = "sha256-2pCk4drYIprUKcjnrlX6WzPted7MUAp973EmAQX3RIE="; }; + patches = [ + # Can be removed once https://github.com/ArthurSonzogni/FTXUI/pull/403 hits a stable release + (fetchpatch { + name = "fix-postevent-segfault.patch"; + url = "https://github.com/ArthurSonzogni/FTXUI/commit/f9256fa132e9d3c50ef1e1eafe2774160b38e063.patch"; + sha256 = "sha256-0040/gJcCXzL92FQLhZ2dNMJhNqXXD+UHFv4Koc07K0="; + }) + ]; + nativeBuildInputs = [ cmake doxygen graphviz ]; + cmakeFlags = [ + "-DFTXUI_BUILD_EXAMPLES=OFF" + ]; + # gtest and gbenchmark don't seem to generate any binaries doCheck = false; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libbencodetools/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libbencodetools/default.nix index 42e6fb9f4e..93daedef23 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libbencodetools/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libbencodetools/default.nix @@ -1,23 +1,30 @@ -{ stdenv, lib, fetchFromGitLab +{ stdenv +, lib +, fetchFromGitLab +, python3 }: stdenv.mkDerivation rec { pname = "libbencodetools"; - version = "unstable-2021-04-15"; + version = "unstable-2022-05-11"; src = fetchFromGitLab { owner = "heikkiorsila"; repo = "bencodetools"; - rev = "1ab11f6509a348975e8aec829d7abbf2f8e9b7d1"; - sha256 = "1i2dgvxxwj844yn45hnfx3785ljbvbkri0nv0jx51z4i08w7cz0h"; + rev = "384d78d297a561dddbbd0f4632f0c74c0db41577"; + sha256 = "1d699q9r33hkmmqkbh92ax54mcdf9smscmc0dza2gp4srkhr83qm"; }; postPatch = '' - patchShebangs . + patchShebangs configure + substituteInPlace configure \ + --replace 'python_install_option=""' 'python_install_option="--prefix=$out"' ''; - configureFlags = [ - "--without-python" + enableParallelBuilding = true; + + nativeBuildInputs = [ + python3 ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/libraries/libgit2/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libgit2/default.nix index 10f3ceaac2..c0e3ab0aca 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libgit2/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libgit2/default.nix @@ -11,24 +11,26 @@ , http-parser , libiconv , Security +, staticBuild ? stdenv.hostPlatform.isStatic }: stdenv.mkDerivation rec { pname = "libgit2"; - version = "1.4.3"; + version = "1.5.0"; # also check the following packages for updates: python3.pkgs.pygit2 and libgit2-glib src = fetchFromGitHub { owner = "libgit2"; repo = "libgit2"; rev = "v${version}"; - sha256 = "sha256-WnRzH5uMVEStA5ns4GNgMD5YoLQoats9aPLfnz9RoQs="; + sha256 = "sha256-lXFQo+tt56BFoPgdkTfz6WdIngeotTm+8cAGcBP6XqY="; }; cmakeFlags = [ "-DTHREADSAFE=ON" "-DUSE_HTTP_PARSER=system" "-DUSE_SSH=ON" + "-DBUILD_SHARED_LIBS=${if staticBuild then "OFF" else "ON"}" ]; nativeBuildInputs = [ cmake python3 pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libgsf/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libgsf/default.nix index 8bc2dc7616..30324b04d8 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libgsf/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libgsf/default.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation rec { pname = "libgsf"; - version = "1.14.49"; + version = "1.14.50"; outputs = [ "out" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "6evjZojwEMnm5AyJA/NzKUjeuKygMleNB9B1G9gs+Fc="; + sha256 = "bmwg0HeDOQadWDwNY3WdKX6BfqENDYl+u+ll8W4ujlI="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/libmaxminddb/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libmaxminddb/default.nix index 855296bddb..852d26344e 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libmaxminddb/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libmaxminddb/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { description = "C library for working with MaxMind geolocation DB files"; homepage = "https://github.com/maxmind/libmaxminddb"; license = licenses.asl20; - maintainers = [ maintainers.vcunat ]; + maintainers = [ maintainers.ajs124 ]; mainProgram = "mmdblookup"; platforms = platforms.all; }; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libplacebo/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libplacebo/default.nix index 94492132b9..807b69f17f 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libplacebo/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libplacebo/default.nix @@ -17,14 +17,14 @@ stdenv.mkDerivation rec { pname = "libplacebo"; - version = "4.192.1"; + version = "4.208.0"; src = fetchFromGitLab { domain = "code.videolan.org"; owner = "videolan"; repo = pname; rev = "v${version}"; - sha256 = "13z2f0vwf9fgfzqgkqzvqwa8c8nkymrg5hv7xslfx53dacjfidhy"; + sha256 = "161dp5781s74ca3gglaxlmchx7glyshf0wg43w98pl22n1jcm5qk"; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/libuiohook/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libuiohook/default.nix new file mode 100644 index 0000000000..3f1f48317f --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/libuiohook/default.nix @@ -0,0 +1,71 @@ +{ lib +, stdenv +, fetchFromGitHub +, nixosTests +, cmake +, pkg-config +, AppKit +, ApplicationServices +, Carbon +, libX11 +, libxkbcommon +, xinput +, xorg +}: + +stdenv.mkDerivation rec { + pname = "libuiohook"; + version = "1.2.2"; + + src = fetchFromGitHub { + owner = "kwhat"; + repo = pname; + rev = version; + sha256 = "1qlz55fp4i9dd8sdwmy1m8i4i1jy1s09cpmlxzrgf7v34w72ncm7"; + }; + + nativeBuildInputs = [ cmake pkg-config ]; + + buildInputs = + if stdenv.isDarwin then [ AppKit ApplicationServices Carbon ] + else [ + libX11 + libxkbcommon + xinput + ] ++ + (with xorg; [ + libXau + libXdmcp + libXi + libXinerama + libXt + libXtst + libXext + libxkbfile + ]); + + outputs = [ "out" "test" ]; + + # We build the tests, but they're only installed when using the "test" output. + # This will produce a "uiohook_tests" binary which can be run to test the + # functionality of the library on the current system. + # Running the test binary requires a running X11 session. + cmakeFlags = [ + "-DENABLE_TEST:BOOL=ON" + ]; + + postInstall = '' + mkdir -p $test/share + cp ./uiohook_tests $test/share + ''; + + meta = with lib; { + description = "A C library to provide global keyboard and mouse hooks from userland"; + homepage = "https://github.com/kwhat/libuiohook"; + license = licenses.gpl3Only; + platforms = platforms.all; + maintainers = with maintainers; [ anoa ]; + }; + + passthru.tests.libuiohook = nixosTests.libuiohook; +} diff --git a/third_party/nixpkgs/pkgs/development/libraries/lucene++/default.nix b/third_party/nixpkgs/pkgs/development/libraries/lucene++/default.nix index 96be84ee2a..08a3485050 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/lucene++/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/lucene++/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, boost, gtest, zlib }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake, boost, gtest, zlib }: stdenv.mkDerivation rec { pname = "lucene++"; @@ -14,6 +14,16 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cmake ]; buildInputs = [ boost gtest zlib ]; + cmakeFlags = [ "-DCMAKE_INSTALL_LIBDIR=lib" ]; + + patches = [ + (fetchpatch { + name = "pkgconfig_use_correct_LIBDIR_for_destination_library"; + url = "https://github.com/luceneplusplus/LucenePlusPlus/commit/39cd44bd54e918d25ee464477992ad0dc234dcba.patch"; + sha256 = "sha256-PP6ENNhPJMWrYDlTnr156XV8d5aX/VNX8v4vvi9ZiWo"; + }) + ]; + postPatch = '' substituteInPlace src/test/CMakeLists.txt \ --replace "add_subdirectory(gtest)" "" diff --git a/third_party/nixpkgs/pkgs/development/libraries/metal/default.nix b/third_party/nixpkgs/pkgs/development/libraries/metal/default.nix deleted file mode 100644 index 2f43485e05..0000000000 --- a/third_party/nixpkgs/pkgs/development/libraries/metal/default.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ lib, stdenv, fetchFromGitHub, cmake }: -stdenv.mkDerivation rec { - pname = "metal"; - version = "2.1.2"; - - src = fetchFromGitHub { - owner = "brunocodutra"; - repo = "metal"; - rev = "v${version}"; - sha256 = "sha256-1I+EZtIz/2y4+dJGBONhTlUQGHgRdvXc1ZAOC9pmStw="; - }; - - nativeBuildInputs = [ cmake ]; - - meta = with lib; { - description = "Single-header C++11 library designed to make you love template metaprogramming"; - homepage = "https://github.com/brunocodutra/metal"; - license = licenses.mit; - maintainers = with maintainers; [ pmiddend ]; - platforms = platforms.all; - }; - -} diff --git a/third_party/nixpkgs/pkgs/development/libraries/neatvnc/default.nix b/third_party/nixpkgs/pkgs/development/libraries/neatvnc/default.nix index 980424b7fd..68c0dff173 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/neatvnc/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/neatvnc/default.nix @@ -1,20 +1,20 @@ { lib, stdenv, fetchFromGitHub, meson, pkg-config, ninja -, pixman, gnutls, libdrm, libjpeg_turbo, zlib, aml +, pixman, gnutls, libdrm, libjpeg_turbo, zlib, aml, mesa, ffmpeg }: stdenv.mkDerivation rec { pname = "neatvnc"; - version = "0.4.0"; + version = "0.5.1"; src = fetchFromGitHub { owner = "any1"; repo = pname; rev = "v${version}"; - sha256 = "1wpq1vyjqra877vwc3n4i0c1dyhmabyn993cslf1k142ikyc0a8w"; + sha256 = "sha256-hdfiF3CUosOksx+Fze54kPfDqS9hvXWmCBB1VQ4uyiQ="; }; nativeBuildInputs = [ meson pkg-config ninja ]; - buildInputs = [ pixman gnutls libdrm libjpeg_turbo zlib aml ]; + buildInputs = [ pixman gnutls libdrm libjpeg_turbo zlib aml mesa ffmpeg ]; meta = with lib; { description = "A VNC server library"; @@ -29,6 +29,6 @@ stdenv.mkDerivation rec { changelog = "https://github.com/any1/neatvnc/releases/tag/v${version}"; license = licenses.isc; platforms = platforms.linux; - maintainers = with maintainers; [ primeos ]; + maintainers = with maintainers; [ nickcao ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/nlohmann_json/default.nix b/third_party/nixpkgs/pkgs/development/libraries/nlohmann_json/default.nix index 0e3fb180c8..ec4df7927f 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/nlohmann_json/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/nlohmann_json/default.nix @@ -10,23 +10,23 @@ let rev = "v3.0.0"; sha256 = "O6p2PFB7c2KE9VqWvmTaFywbW1hSzAP5V42EuemX+ls="; }; -in stdenv.mkDerivation rec { +in stdenv.mkDerivation (finalAttrs: { pname = "nlohmann_json"; version = "3.10.5"; src = fetchFromGitHub { owner = "nlohmann"; repo = "json"; - rev = "v${version}"; + rev = "v${finalAttrs.version}"; sha256 = "DTsZrdB9GcaNkx7ZKxcgCA3A9ShM5icSF0xyGguJNbk="; }; nativeBuildInputs = [ cmake ]; cmakeFlags = [ - "-DBuildTests=${if doCheck then "ON" else "OFF"}" + "-DBuildTests=${if finalAttrs.doCheck then "ON" else "OFF"}" "-DJSON_MultipleHeaders=ON" - ] ++ lib.optional doCheck "-DJSON_TestDataDirectory=${testData}"; + ] ++ lib.optional finalAttrs.doCheck "-DJSON_TestDataDirectory=${testData}"; doCheck = stdenv.hostPlatform == stdenv.buildPlatform; @@ -44,4 +44,4 @@ in stdenv.mkDerivation rec { license = licenses.mit; platforms = platforms.all; }; -} +}) diff --git a/third_party/nixpkgs/pkgs/development/libraries/openzwave/default.nix b/third_party/nixpkgs/pkgs/development/libraries/openzwave/default.nix index 723288ab4a..07fe1db829 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/openzwave/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/openzwave/default.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { description = "C++ library to control Z-Wave Networks via a USB Z-Wave Controller"; homepage = "http://www.openzwave.net/"; license = licenses.gpl3; - maintainers = with maintainers; [ etu ]; + maintainers = with maintainers; [ ]; platforms = platforms.linux; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/protobuf/3.20.nix b/third_party/nixpkgs/pkgs/development/libraries/protobuf/3.20.nix new file mode 100644 index 0000000000..93d180159b --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/protobuf/3.20.nix @@ -0,0 +1,6 @@ +{ callPackage, abseil-cpp, ... }: + +callPackage ./generic-v3.nix { + version = "3.20.1"; + sha256 = "sha256-pAMacD0UQetqysZHszu5slPqp0iREtDmHFv1cgcUBJA="; +} diff --git a/third_party/nixpkgs/pkgs/development/libraries/protobuf/3.21.nix b/third_party/nixpkgs/pkgs/development/libraries/protobuf/3.21.nix new file mode 100644 index 0000000000..70c6095ae7 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/protobuf/3.21.nix @@ -0,0 +1,6 @@ +{ callPackage, abseil-cpp, ... }: + +callPackage ./generic-v3-cmake.nix { + version = "3.21.2"; + sha256 = "sha256-DUv07pWiZV7jNeSA2ClDOz9DY0x/hiJynxkbSTeJOSs="; +} diff --git a/third_party/nixpkgs/pkgs/development/libraries/protobuf/generic-v3-cmake.nix b/third_party/nixpkgs/pkgs/development/libraries/protobuf/generic-v3-cmake.nix new file mode 100644 index 0000000000..0b6967a673 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/protobuf/generic-v3-cmake.nix @@ -0,0 +1,107 @@ +# The cmake version of this build is meant to enable both cmake and .pc being exported +# this is important because grpc exports a .cmake file which also expects for protobuf +# to have been exported through cmake as well. +{ lib +, stdenv +, abseil-cpp +, buildPackages +, cmake +, fetchFromGitHub +, fetchpatch +, gtest +, zlib +, version +, sha256 + +# downstream dependencies +, python3 + +, ... +}: + +let + self = stdenv.mkDerivation { + pname = "protobuf"; + inherit version; + + src = fetchFromGitHub { + owner = "protocolbuffers"; + repo = "protobuf"; + rev = "v${version}"; + inherit sha256; + }; + + # re-create submodule logic + postPatch = '' + rm -rf gmock + cp -r ${gtest.src}/googlemock third_party/gmock + cp -r ${gtest.src}/googletest third_party/ + chmod -R a+w third_party/ + + ln -s ../googletest third_party/gmock/gtest + ln -s ../gmock third_party/googletest/googlemock + ln -s $(pwd)/third_party/googletest third_party/googletest/googletest + '' + lib.optionalString stdenv.isDarwin '' + substituteInPlace src/google/protobuf/testing/googletest.cc \ + --replace 'tmpnam(b)' '"'$TMPDIR'/foo"' + ''; + + patches = lib.optionals (lib.versionOlder version "3.22") [ + # fix protobuf-targets.cmake installation paths, and allow for CMAKE_INSTALL_LIBDIR to be absolute + # https://github.com/protocolbuffers/protobuf/pull/10090 + (fetchpatch { + url = "https://github.com/protocolbuffers/protobuf/commit/a7324f88e92bc16b57f3683403b6c993bf68070b.patch"; + sha256 = "sha256-SmwaUjOjjZulg/wgNmR/F5b8rhYA2wkKAjHIOxjcQdQ="; + }) + ]; + + nativeBuildInputs = let + protobufVersion = "${lib.versions.major version}_${lib.versions.minor version}"; + in [ + cmake + ] ++ lib.optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ + # protoc of the same version must be available for build. For non-cross builds, it's able to + # re-use the executable generated as part of the build + buildPackages."protobuf${protobufVersion}" + ]; + + buildInputs = [ + abseil-cpp + zlib + ]; + + # After 3.20, CMakeLists.txt can now be found at the top-level, however + # a stub cmake/CMakeLists.txt still exists for compatibility with previous build assumptions + cmakeDir = "../cmake"; + cmakeFlags = [ + "-Dprotobuf_ABSL_PROVIDER=package" + ] ++ lib.optionals (!stdenv.targetPlatform.isStatic) [ + "-Dprotobuf_BUILD_SHARED_LIBS=ON" + ]; + + # unfortunately the shared libraries have yet to been patched by nix, thus tests will fail + doCheck = false; + + passthru = { + tests = { + pythonProtobuf = python3.pkgs.protobuf.override(_: { + protobuf = self; + }); + }; + }; + + meta = { + description = "Google's data interchange format"; + longDescription = '' + Protocol Buffers are a way of encoding structured data in an efficient + yet extensible format. Google uses Protocol Buffers for almost all of + its internal RPC protocols and file formats. + ''; + license = lib.licenses.bsd3; + platforms = lib.platforms.unix; + homepage = "https://developers.google.com/protocol-buffers/"; + maintainers = with lib.maintainers; [ jonringer ]; + }; + }; +in + self diff --git a/third_party/nixpkgs/pkgs/development/libraries/protolock/default.nix b/third_party/nixpkgs/pkgs/development/libraries/protolock/default.nix index a9b45ddf61..324c21df92 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/protolock/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/protolock/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "sha256-vWwRZVArmlTIGwD4zV3dEHN2kkoeCZuNIvjCBVAviPo="; }; - vendorSha256 = "sha256-kgSJUSjY8kgrGCNDPgw1WA8KwAqI5koJQ0IcE+tC5nk="; + vendorSha256 = "sha256-pYtP+Tkh2TcGsbk7zQNaoYLEQrqGOL0gkMG5dUkfpt4="; postInstall = '' rm $out/bin/plugin* diff --git a/third_party/nixpkgs/pkgs/development/libraries/qt-6/hooks/wrap-qt-apps-hook.sh b/third_party/nixpkgs/pkgs/development/libraries/qt-6/hooks/wrap-qt-apps-hook.sh index c085cdaca5..b669da3d05 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/qt-6/hooks/wrap-qt-apps-hook.sh +++ b/third_party/nixpkgs/pkgs/development/libraries/qt-6/hooks/wrap-qt-apps-hook.sh @@ -22,6 +22,11 @@ qtUnseenHostPath() { qtHostPathHook() { qtUnseenHostPath "$1" || return 0 + if ! [ -v qtPluginPrefix ] + then + echo "wrapQtAppsHook qtHostPathHook: qtPluginPrefix is unset. hint: add qt6.qtbase to buildInputs" + fi + local pluginDir="$1/${qtPluginPrefix:?}" if [ -d "$pluginDir" ] then @@ -34,7 +39,7 @@ qtHostPathHook() { qtWrapperArgs+=(--prefix QML2_IMPORT_PATH : "$qmlDir") fi } -addEnvHooks "$hostOffset" qtHostPathHook +addEnvHooks "$targetOffset" qtHostPathHook makeQtWrapper() { local original="$1" @@ -85,8 +90,6 @@ wrapQtAppsHook() { find "$targetDir" ! -type d -executable -print0 | while IFS= read -r -d '' file do - isELF "$file" || isMachO "$file" || continue - if [ -f "$file" ] then echo "wrapping $file" diff --git a/third_party/nixpkgs/pkgs/development/libraries/quictls/default.nix b/third_party/nixpkgs/pkgs/development/libraries/quictls/default.nix index 0f85836a9c..22981bfef7 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/quictls/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/quictls/default.nix @@ -7,17 +7,18 @@ # This will cause c_rehash to refer to perl via the environment, but otherwise # will produce a perfectly functional openssl binary and library. , withPerl ? stdenv.hostPlatform == stdenv.buildPlatform +, removeReferencesTo }: stdenv.mkDerivation rec { pname = "quictls"; - version = "3.0.3+quick_unstable-2022-05.04"; + version = "3.0.5+quick_unstable-2022-07.05"; src = fetchFromGitHub { owner = "quictls"; repo = "openssl"; - rev = "368c9d581b17f0bbe425f8dedeaa7b864a7b29ce"; - sha256 = "sha256-W3bILxhyeziWQNZUHUg/D9eV8LnmHJqEFwyzWjJrRuc="; + rev = "75e940831d0570d6b020cfebf128ae500f424867"; + sha256 = "sha256-1HBGKafcCbM0RZWLvyl3vpSfGBsAcGDgjz1Nm/qclWM="; }; patches = [ @@ -51,7 +52,7 @@ stdenv.mkDerivation rec { !(stdenv.hostPlatform.useLLVM or false) && stdenv.cc.isGNU; - nativeBuildInputs = [ perl ]; + nativeBuildInputs = [ perl removeReferencesTo ]; buildInputs = lib.optional withCryptodev cryptodev # perl is included to allow the interpreter path fixup hook to set the # correct interpreter in c_rehash. @@ -68,6 +69,12 @@ stdenv.mkDerivation rec { x86_64-linux = "./Configure linux-x86_64"; x86_64-solaris = "./Configure solaris64-x86_64-gcc"; riscv64-linux = "./Configure linux64-riscv64"; + mips64el-linux = + if stdenv.hostPlatform.isMips64n64 + then "./Configure linux64-mips64" + else if stdenv.hostPlatform.isMips64n32 + then "./Configure linux-mips64" + else throw "unsupported ABI for ${stdenv.hostPlatform.system}"; }.${stdenv.hostPlatform.system} or ( if stdenv.hostPlatform == stdenv.buildPlatform then "./config" @@ -105,7 +112,11 @@ stdenv.mkDerivation rec { # OpenSSL needs a specific `no-shared` configure flag. # See https://wiki.openssl.org/index.php/Compilation_and_Installation#Configure_Options # for a comprehensive list of configuration options. - ++ lib.optional static "no-shared"; + ++ lib.optional static "no-shared" + # This introduces a reference to the CTLOG_FILE which is undesired when + # trying to build binaries statically. + ++ lib.optional static "no-ct" + ; makeFlags = [ "MANDIR=$(man)/share/man" @@ -118,13 +129,16 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; - postInstall = lib.optionalString (!static) '' + postInstall = (if static then '' + # OPENSSLDIR has a reference to self + ${removeReferencesTo}/bin/remove-references-to -t $out $out/lib/*.a + '' else '' # If we're building dynamic libraries, then don't install static # libraries. if [ -n "$(echo $out/lib/*.so $out/lib/*.dylib $out/lib/*.dll)" ]; then rm "$out/lib/"*.a fi - '' + lib.optionalString (!stdenv.hostPlatform.isWindows) + '') + lib.optionalString (!stdenv.hostPlatform.isWindows) # Fix bin/c_rehash's perl interpreter line # # - openssl 1_0_2: embeds a reference to buildPackages.perl diff --git a/third_party/nixpkgs/pkgs/development/libraries/rocksdb/default.nix b/third_party/nixpkgs/pkgs/development/libraries/rocksdb/default.nix index 3f50c0665f..19f755ca05 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/rocksdb/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/rocksdb/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "rocksdb"; - version = "6.29.3"; + version = "7.3.1"; src = fetchFromGitHub { owner = "facebook"; repo = pname; rev = "v${version}"; - sha256 = "sha256-O0nIPRKj0ZOEjynh7h9kM6V965hQKs+4GgIbN+Os0I4="; + sha256 = "sha256-5fh8hH6f0Mv9XQAoHYIiY019qkC5PuLS2qlE+ladWWM="; }; nativeBuildInputs = [ cmake ninja ]; @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { buildInputs = lib.optional enableJemalloc jemalloc; NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isGNU "-Wno-error=deprecated-copy -Wno-error=pessimizing-move" - + lib.optionalString stdenv.cc.isClang "-Wno-error=unused-private-field"; + + lib.optionalString stdenv.cc.isClang "-Wno-error=unused-private-field -faligned-allocation"; cmakeFlags = [ "-DPORTABLE=1" diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/astronomy/stellarsolver/default.nix b/third_party/nixpkgs/pkgs/development/libraries/science/astronomy/stellarsolver/default.nix index 754f408ca2..9236ac55eb 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/science/astronomy/stellarsolver/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/science/astronomy/stellarsolver/default.nix @@ -3,13 +3,13 @@ mkDerivation rec { pname = "stellarsolver"; - version = "2.2"; + version = "2.3"; src = fetchFromGitHub { owner = "rlancaste"; repo = pname; rev = version; - sha256 = "sha256-Ay7bszR4D5KKFiVLXfweJcc8jgUSZljnZVblEx7xh8o="; + sha256 = "sha256-DSydgn9brVQlVNfW8Lnw/ZNs7aftokkCuJshgqmegpY="; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/math/p4est/default.nix b/third_party/nixpkgs/pkgs/development/libraries/science/math/p4est/default.nix index c38b0d623b..9396a91444 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/science/math/p4est/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/science/math/p4est/default.nix @@ -1,5 +1,8 @@ -{ lib, stdenv, fetchFromGitHub -, autoreconfHook, pkg-config +{ lib +, stdenv +, fetchFromGitHub +, autoreconfHook +, pkg-config , p4est-withMetis ? true, metis , p4est-sc }: @@ -31,9 +34,11 @@ stdenv.mkDerivation { postPatch = '' sed -i -e "s:\(^\s*ACLOCAL_AMFLAGS.*\)\s@P4EST_SC_AMFLAGS@\s*$:\1 -I ${p4est-sc}/share/aclocal:" Makefile.am ''; - preConfigure = '' + preAutoreconf = '' echo "2.8.0" > .tarball-version - ${if mpiSupport then "unset CC" else ""} + ''; + preConfigure = lib.optionalString mpiSupport '' + unset CC ''; configureFlags = p4est-sc.configureFlags diff --git a/third_party/nixpkgs/pkgs/development/libraries/x265/default.nix b/third_party/nixpkgs/pkgs/development/libraries/x265/default.nix index 20c56f4d90..3bf11737eb 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/x265/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/x265/default.nix @@ -104,7 +104,7 @@ stdenv.mkDerivation rec { cmakeFlags = cmakeCommonFlags ++ [ "-DGIT_ARCHETYPE=1" # https://bugs.gentoo.org/814116 - "-DENABLE_SHARED=ON" + "-DENABLE_SHARED=${if stdenv.hostPlatform.isStatic then "OFF" else "ON"}" "-DHIGH_BIT_DEPTH=OFF" "-DENABLE_HDR10_PLUS=ON" ] ++ [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/xapian/default.nix b/third_party/nixpkgs/pkgs/development/libraries/xapian/default.nix index 4d23752b24..6d617564b0 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/xapian/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/xapian/default.nix @@ -2,14 +2,14 @@ , libuuid, zlib }: let - generic = version: sha256: stdenv.mkDerivation { + generic = version: hash: stdenv.mkDerivation { pname = "xapian"; inherit version; passthru = { inherit version; }; src = fetchurl { url = "https://oligarchy.co.uk/xapian/${version}/xapian-core-${version}.tar.xz"; - inherit sha256; + inherit hash; }; outputs = [ "out" "man" "doc" ]; @@ -38,5 +38,8 @@ let }; }; in { - xapian_1_4 = generic "1.4.19" "sha256-H8pI/KbMNSbMS6k90ZT+nBMmhXt47c+zfmjQhtcUqcM="; + # Don't forget to change the hashes in xapian-omega and + # python3Packages.xapian. They inherit the version from this package, and + # should always be built with the equivalent xapian version. + xapian_1_4 = generic "1.4.20" "sha256-zivl7/cgdcgQbANA5wsQk9vOviq0LcHBvgjdOtQZRC0="; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/xapian/tools/omega/default.nix b/third_party/nixpkgs/pkgs/development/libraries/xapian/tools/omega/default.nix index 79e5786f04..eb03defbf2 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/xapian/tools/omega/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/xapian/tools/omega/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, xapian, perl, pcre, zlib, libmagic }: +{ lib, stdenv, fetchurl, pkg-config, xapian, perl, pcre2, zlib, libmagic }: stdenv.mkDerivation rec { pname = "xapian-omega"; @@ -6,10 +6,10 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://oligarchy.co.uk/xapian/${version}/xapian-omega-${version}.tar.xz"; - sha256 = "0zji8ckp4h5xdy2wbir3lvk680w1g1l4h5swmaxsx7ah12lkrjcr"; + hash = "sha256-Cf19bGCzlP0A2EcAZJlpofzDqiuIuyxsoiD9+o0liB8="; }; - buildInputs = [ xapian perl pcre zlib libmagic ]; + buildInputs = [ xapian perl pcre2 zlib libmagic ]; nativeBuildInputs = [ pkg-config ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/libraries/zchunk/0001-meson-fix-argp-standalone.patch b/third_party/nixpkgs/pkgs/development/libraries/zchunk/0001-meson-fix-argp-standalone.patch new file mode 100644 index 0000000000..cd51d17b15 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/zchunk/0001-meson-fix-argp-standalone.patch @@ -0,0 +1,18 @@ +diff --git a/meson.build b/meson.build +index 1c6b32d..aa7dd25 100644 +--- a/meson.build ++++ b/meson.build +@@ -58,10 +58,10 @@ endif + + # argp-standalone dependency (if required) + if build_machine.system() == 'windows' or build_machine.system() == 'darwin' or build_machine.system() == 'freebsd' or not cc.links('#include \nstatic error_t parse_opt (int key, char *arg, struct argp_state *state) { argp_usage(state); return 0; }; void main() {}') +- if fs.is_dir(join_paths([get_option('prefix'), 'include'])) +- inc += include_directories(join_paths([get_option('prefix'), 'include'])) ++ argplib = cc.find_library('argp', has_headers : ['argp.h'], required: false) ++ if not argplib.found() ++ argplib = dependency('argp-standalone') + endif +- argplib = cc.find_library('argp', dirs : join_paths([get_option('prefix'), 'lib'])) + else + argplib = dependency('', required : false) + endif diff --git a/third_party/nixpkgs/pkgs/development/libraries/zchunk/default.nix b/third_party/nixpkgs/pkgs/development/libraries/zchunk/default.nix index c639eb7b30..50b23a1d99 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/zchunk/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/zchunk/default.nix @@ -20,6 +20,11 @@ stdenv.mkDerivation rec { hash = "sha256-7H1WF5VkpA65xCdEa0Sw4r4jj+kGhDVCMr5AeE+3Ii4="; }; + # unbreak on darwin by finding argp-standalone, based on the patch from + # buildroot: + # https://github.com/buildroot/buildroot/raw/master/package/zchunk/0001-meson-fix-argp-standalone-wrap-and-find_library.patch + patches = lib.optional stdenv.isDarwin ./0001-meson-fix-argp-standalone.patch; + nativeBuildInputs = [ meson ninja @@ -47,6 +52,5 @@ stdenv.mkDerivation rec { license = licenses.bsd2; maintainers = with maintainers; [ AndersonTorres ]; platforms = platforms.unix; - broken = stdenv.isDarwin; # does not find argp-standalone }; } diff --git a/third_party/nixpkgs/pkgs/development/lisp-modules/lisp-packages.nix b/third_party/nixpkgs/pkgs/development/lisp-modules/lisp-packages.nix index fe31e2ba34..69a4596c22 100644 --- a/third_party/nixpkgs/pkgs/development/lisp-modules/lisp-packages.nix +++ b/third_party/nixpkgs/pkgs/development/lisp-modules/lisp-packages.nix @@ -125,7 +125,7 @@ let lispPackages = rec { }; nyxt = pkgs.lispPackages.buildLispPackage rec { baseName = "nyxt"; - version = "2.2.3"; + version = "2.2.4"; description = "Browser"; @@ -150,6 +150,17 @@ let lispPackages = rec { # Prevent nyxt from trying to obtain dependencies as submodules makeFlags = [ "NYXT_SUBMODULES=false" ] ++ x.buildFlags or []; + + patches = x.patches or [] ++ [ + # Work around crash when opening _any_ URL + # https://github.com/atlas-engineer/nyxt/issues/1781 + # https://github.com/NixOS/nixpkgs/issues/158005 + (pkgs.fetchpatch { + name = "nyxt-webkit-disable-sandbox.patch"; + url = "https://github.com/atlas-engineer/nyxt/commit/48ac0d8727f1ca1428188a1ab2c05b7be5f6cc51.patch"; + sha256 = "0570mcfn5wmjha6jmfdgglp0w5b7rpfnv3flzn77clgbknwbxi0m"; + }) + ]; }; deps = with pkgs.lispPackages; [ @@ -203,7 +214,7 @@ let lispPackages = rec { owner = "atlas-engineer"; repo = "nyxt"; rev = "${version}"; - sha256 = "1v1szbj44pwxh3k70fvg78xjfkab29dqnlafa722sppdyqd06cqp"; + sha256 = "12l7ir3q29v06jx0zng5cvlbmap7p709ka3ik6x29lw334qshm9b"; }; packageName = "nyxt"; diff --git a/third_party/nixpkgs/pkgs/development/mobile/androidenv/compose-android-packages.nix b/third_party/nixpkgs/pkgs/development/mobile/androidenv/compose-android-packages.nix index 8270960d9b..c6d838544e 100644 --- a/third_party/nixpkgs/pkgs/development/mobile/androidenv/compose-android-packages.nix +++ b/third_party/nixpkgs/pkgs/development/mobile/androidenv/compose-android-packages.nix @@ -3,7 +3,7 @@ }: { toolsVersion ? "26.1.1" -, platformToolsVersion ? "33.0.1" +, platformToolsVersion ? "33.0.2" , buildToolsVersions ? [ "32.0.0" ] , includeEmulator ? false , emulatorVersion ? "31.3.7" @@ -11,7 +11,7 @@ , includeSources ? false , includeSystemImages ? false , systemImageTypes ? [ "google_apis_playstore" ] -, abiVersions ? [ "armeabi-v7a" ] +, abiVersions ? [ "armeabi-v7a" "arm64-v8a" ] , cmakeVersions ? [ ] , includeNDK ? false , ndkVersion ? "24.0.8215888" @@ -181,7 +181,7 @@ rec { makeNdkBundle = ndkVersion: import ./ndk-bundle { inherit deployAndroidPackage os autoPatchelfHook makeWrapper pkgs pkgsHostHost lib platform-tools stdenv; - package = packages.ndk-bundle.${ndkVersion}; + package = packages.ndk-bundle.${ndkVersion} or packages.ndk.${ndkVersion}; }; # All NDK bundles. diff --git a/third_party/nixpkgs/pkgs/development/mobile/androidenv/ndk-bundle/default.nix b/third_party/nixpkgs/pkgs/development/mobile/androidenv/ndk-bundle/default.nix index 58cc8f9d57..5d0e2c2b17 100644 --- a/third_party/nixpkgs/pkgs/development/mobile/androidenv/ndk-bundle/default.nix +++ b/third_party/nixpkgs/pkgs/development/mobile/androidenv/ndk-bundle/default.nix @@ -12,23 +12,22 @@ deployAndroidPackage { nativeBuildInputs = [ makeWrapper ] ++ lib.optionals stdenv.isLinux [ autoPatchelfHook ]; autoPatchelfIgnoreMissingDeps = true; - buildInputs = lib.optional (os == "linux") [ pkgs.glibc pkgs.stdenv.cc.cc pkgs.python2 pkgs.ncurses5 pkgs.zlib pkgs.libcxx.out pkgs.libxml2 ]; + buildInputs = lib.optional (os == "linux") [ pkgs.zlib ]; patchInstructions = lib.optionalString (os == "linux") ('' patchShebangs . - # Fix the shebangs of the auto-generated scripts. - substituteInPlace ./build/tools/make_standalone_toolchain.py \ - --replace '#!/bin/bash' '#!${pkgs.bash}/bin/bash' - - '' + lib.optionalString (builtins.compareVersions (lib.getVersion package) "21" > 0) '' - patch -p1 \ - --no-backup-if-mismatch < ${./make_standalone_toolchain.py_18.patch} || true - wrapProgram ./build/tools/make_standalone_toolchain.py --prefix PATH : "${runtime_paths}" - '' + '' - # TODO: allow this stuff rm -rf docs tests + # Ndk now has a prebuilt toolchains inside, the file layout has changed, we do a symlink + # to still support the old standalone toolchains builds. + if [ -d $out/libexec/android-sdk/ndk ] && [ ! -d $out/libexec/android-sdk/ndk-bundle ]; then + ln -sf $out/libexec/android-sdk/ndk/${package.revision} $out/libexec/android-sdk/ndk-bundle + else + echo "The ndk-bundle layout has changed. The nix expressions have to be updated!" + exit 1 + fi + # Patch the executables of the toolchains, but not the libraries -- they are needed for crosscompiling if [ -d $out/libexec/android-sdk/ndk-bundle/toolchains/renderscript/prebuilt/linux-x86_64/lib64 ]; then addAutoPatchelfSearchPath $out/libexec/android-sdk/ndk-bundle/toolchains/renderscript/prebuilt/linux-x86_64/lib64 diff --git a/third_party/nixpkgs/pkgs/development/mobile/androidenv/ndk-bundle/make_standalone_toolchain.py_18.patch b/third_party/nixpkgs/pkgs/development/mobile/androidenv/ndk-bundle/make_standalone_toolchain.py_18.patch deleted file mode 100644 index 7af2d44a0f..0000000000 --- a/third_party/nixpkgs/pkgs/development/mobile/androidenv/ndk-bundle/make_standalone_toolchain.py_18.patch +++ /dev/null @@ -1,44 +0,0 @@ -diff -Naur android-ndk-r18b/build/tools/make_standalone_toolchain.py android-ndk-r18b-new/build/tools/make_standalone_toolchain.py ---- android-ndk-r18b/build/tools/make_standalone_toolchain.py 2018-10-11 12:49:38.000000000 +0200 -+++ android-ndk-r18b-new/build/tools/make_standalone_toolchain.py 2018-11-20 21:55:52.689991420 +0100 -@@ -30,7 +30,7 @@ - import sys - import tempfile - import textwrap -- -+import subprocess - - THIS_DIR = os.path.realpath(os.path.dirname(__file__)) - NDK_DIR = os.path.realpath(os.path.join(THIS_DIR, '../..')) -@@ -173,6 +173,7 @@ - logger().debug('Copying %s', src_file) - shutil.copy2(src_file, dst_dir) - -+ subprocess.check_call(["chmod", "-R", "+w", dst]) - - def make_clang_scripts(install_dir, triple, api, windows): - """Creates Clang wrapper scripts. -@@ -365,6 +366,7 @@ - install_headers = os.path.join(install_sysroot, 'usr/include') - os.makedirs(os.path.dirname(install_headers)) - shutil.copytree(headers, install_headers) -+ subprocess.check_call(["chmod", "-R", "+w", install_path]) - - arch_headers = os.path.join(sysroot, 'usr/include', triple) - copy_directory_contents(arch_headers, os.path.join(install_headers)) -@@ -375,6 +377,7 @@ - install_sysroot, 'usr/lib{}'.format(lib_suffix)) - if os.path.exists(lib_path): - shutil.copytree(lib_path, lib_install) -+ subprocess.check_call(["chmod", "-R", "+w", install_path]) - - static_lib_path = os.path.join(sysroot, 'usr/lib', triple) - static_lib_install = os.path.join(install_sysroot, 'usr/lib') -@@ -389,6 +392,7 @@ - NDK_DIR, 'prebuilt', 'android-' + arch, 'gdbserver') - gdbserver_install = os.path.join(install_path, 'share', 'gdbserver') - shutil.copytree(gdbserver_path, gdbserver_install) -+ subprocess.check_call(["chmod", "-R", "+w", install_path]) - - toolchain_lib_dir = os.path.join(gcc_path, 'lib/gcc', triple) - dirs = os.listdir(toolchain_lib_dir) diff --git a/third_party/nixpkgs/pkgs/development/mobile/androidenv/repo.json b/third_party/nixpkgs/pkgs/development/mobile/androidenv/repo.json index 5ccbc430fc..bf69c67820 100644 --- a/third_party/nixpkgs/pkgs/development/mobile/androidenv/repo.json +++ b/third_party/nixpkgs/pkgs/development/mobile/androidenv/repo.json @@ -1241,6 +1241,21 @@ }, "23": { "google_apis": { + "arm64-v8a": { + "archives": [ + { + "os": "all", + "sha1": "2d1ae21b1978e202917b7c6a5f49ab8bc87c6417", + "size": 493891214, + "url": "https://dl.google.com/android/repository/sys-img/google_apis/arm64-v8a-23_r33.zip" + } + ], + "displayName": "Google APIs ARM 64 v8a System Image", + "license": "android-sdk-license", + "name": "system-image-23-google_apis-arm64-v8a", + "path": "system-images/android-23/google_apis/arm64-v8a", + "revision": "23-google_apis-arm64-v8a" + }, "armeabi-v7a": { "archives": [ { @@ -1663,43 +1678,117 @@ } } }, - "Tiramisu": { + "33": { "google_apis_playstore": { "arm64-v8a": { "archives": [ { "os": "macosx", - "sha1": "2b6d4dc0af98b2b4d3ed4ac82b6d8ee0bfe38383", - "size": 1457296537, - "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/arm64-v8a-Tiramisu_r02-darwin.zip" + "sha1": "0b850a4f317d7a6abe854a6845705c9ca4437764", + "size": 1492105537, + "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/arm64-v8a-33_r05-darwin.zip" }, { "os": "linux", - "sha1": "2b6d4dc0af98b2b4d3ed4ac82b6d8ee0bfe38383", - "size": 1457296537, - "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/arm64-v8a-Tiramisu_r02-linux.zip" + "sha1": "0b850a4f317d7a6abe854a6845705c9ca4437764", + "size": 1492105537, + "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/arm64-v8a-33_r05-linux.zip" } ], "displayName": "Google Play ARM 64 v8a System Image", "license": "android-sdk-arm-dbt-license", - "name": "system-image-Tiramisu-google_apis_playstore-arm64-v8a", - "path": "system-images/android-Tiramisu/google_apis_playstore/arm64-v8a", - "revision": "Tiramisu-google_apis_playstore-arm64-v8a" + "name": "system-image-33-google_apis_playstore-arm64-v8a", + "path": "system-images/android-33/google_apis_playstore/arm64-v8a", + "revision": "33-google_apis_playstore-arm64-v8a" }, "x86_64": { "archives": [ { "os": "all", - "sha1": "2d2fb4c36efa836f348d6acbfc588f9eed70934e", - "size": 1438511715, - "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86_64-Tiramisu_r02.zip" + "sha1": "ed2931ebef4f7bedff8610254748d6496ce5d3c4", + "size": 1496628942, + "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86_64-33_r05.zip" } ], "displayName": "Google Play Intel x86 Atom_64 System Image", "license": "android-sdk-preview-license", - "name": "system-image-Tiramisu-google_apis_playstore-x86_64", - "path": "system-images/android-Tiramisu/google_apis_playstore/x86_64", - "revision": "Tiramisu-google_apis_playstore-x86_64" + "name": "system-image-33-google_apis_playstore-x86_64", + "path": "system-images/android-33/google_apis_playstore/x86_64", + "revision": "33-google_apis_playstore-x86_64" + } + } + }, + "Tiramisu": { + "android-tv": { + "arm64-v8a": { + "archives": [ + { + "os": "all", + "sha1": "4b70bed5ffb28162cdde7852e0597d957910270d", + "size": 840304267, + "url": "https://dl.google.com/android/repository/sys-img/android-tv/arm64-v8a-Tiramisu_r03.zip" + } + ], + "displayName": "Android TV ARM 64 v8a System Image", + "license": "android-sdk-license", + "name": "system-image-Tiramisu-android-tv-arm64-v8a", + "path": "system-images/android-Tiramisu/android-tv/arm64-v8a", + "revision": "Tiramisu-android-tv-arm64-v8a" + }, + "x86": { + "archives": [ + { + "os": "all", + "sha1": "547a24d9dec83e11486ef4ea45848d9fa99f35c2", + "size": 832895525, + "url": "https://dl.google.com/android/repository/sys-img/android-tv/x86-Tiramisu_r03.zip" + } + ], + "displayName": "Android TV Intel x86 Atom System Image", + "license": "android-sdk-license", + "name": "system-image-Tiramisu-android-tv-x86", + "path": "system-images/android-Tiramisu/android-tv/x86", + "revision": "Tiramisu-android-tv-x86" + } + } + }, + "TiramisuPrivacySandbox": { + "google_apis_playstore": { + "arm64-v8a": { + "archives": [ + { + "os": "macosx", + "sha1": "4653d7aa2dbd2629c3afc1c700284de0f7791bb2", + "size": 1514681298, + "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/arm64-v8a-TiramisuPrivacySandbox_r05-darwin.zip" + }, + { + "os": "linux", + "sha1": "4653d7aa2dbd2629c3afc1c700284de0f7791bb2", + "size": 1514681298, + "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/arm64-v8a-TiramisuPrivacySandbox_r05-linux.zip" + } + ], + "displayName": "Google Play ARM 64 v8a System Image", + "license": "android-sdk-arm-dbt-license", + "name": "system-image-TiramisuPrivacySandbox-google_apis_playstore-arm64-v8a", + "path": "system-images/android-TiramisuPrivacySandbox/google_apis_playstore/arm64-v8a", + "revision": "TiramisuPrivacySandbox-google_apis_playstore-arm64-v8a" + }, + "x86_64": { + "archives": [ + { + "os": "all", + "sha1": "2a4ea6ce714155ea8ddfea26cf61ad219f32c02a", + "size": 1519169526, + "url": "https://dl.google.com/android/repository/sys-img/google_apis_playstore/x86_64-TiramisuPrivacySandbox_r05.zip" + } + ], + "displayName": "Google Play Intel x86 Atom_64 System Image", + "license": "android-sdk-preview-license", + "name": "system-image-TiramisuPrivacySandbox-google_apis_playstore-x86_64", + "path": "system-images/android-TiramisuPrivacySandbox/google_apis_playstore/x86_64", + "revision": "TiramisuPrivacySandbox-google_apis_playstore-x86_64" } } } @@ -3298,32 +3387,32 @@ "path": "build-tools/32.1.0-rc1", "revision": "32.1.0-rc1" }, - "33.0.0-rc2": { + "33.0.0": { "archives": [ - { - "os": "windows", - "sha1": "789aa6dfb2155b81e073108c70982f73c890a95b", - "size": 55466255, - "url": "https://dl.google.com/android/repository/830151c9e0c410f6148390f0de30bd349ba91efd.build-tools_r33-rc2-windows.zip" - }, { "os": "linux", - "sha1": "013f98217b7af4f5677ab1a47e98da18ad57721c", - "size": 57876882, - "url": "https://dl.google.com/android/repository/build-tools_r33-rc2-linux.zip" + "sha1": "c561971600d4ce682b128b0bd5d4ab71c5f2ad35", + "size": 56000182, + "url": "https://dl.google.com/android/repository/build-tools_r33-linux.zip" }, { "os": "macosx", - "sha1": "586f8f77847ba3899b7652d6514e8c6a78ab673a", - "size": 59910819, - "url": "https://dl.google.com/android/repository/f8baa248444f0a5aca1119b48e897908a3da49d5.build-tools_r33-rc2-macosx.zip" + "sha1": "3693851532ba9640710d2dd360d85aa5b04c5151", + "size": 60023096, + "url": "https://dl.google.com/android/repository/build-tools_r33-macosx.zip" + }, + { + "os": "windows", + "sha1": "f4ef853e5e755ea5ffc50de73a9e420fc76c662e", + "size": 55610532, + "url": "https://dl.google.com/android/repository/build-tools_r33-windows.zip" } ], - "displayName": "Android SDK Build-Tools 33-rc2", - "license": "android-sdk-preview-license", + "displayName": "Android SDK Build-Tools 33", + "license": "android-sdk-license", "name": "build-tools", - "path": "build-tools/33.0.0-rc2", - "revision": "33.0.0-rc2" + "path": "build-tools/33.0.0", + "revision": "33.0.0" } }, "cmake": { @@ -3625,62 +3714,116 @@ "name": "cmdline-tools", "path": "cmdline-tools/6.0", "revision": "6.0" - } - }, - "emulator": { - "31.2.9": { + }, + "7.0": { "archives": [ { "os": "linux", - "sha1": "164b759748b3d2ee2616da74173867b11b18f64f", - "size": 276337192, - "url": "https://dl.google.com/android/repository/emulator-linux_x64-8316981.zip" - }, - { - "os": "windows", - "sha1": "2b6768485a8e6492823a9156fa43c55092afd533", - "size": 345298639, - "url": "https://dl.google.com/android/repository/emulator-windows_x64-8316981.zip" + "sha1": "5e7bf2dd563d34917d32f3c5920a85562a795c93", + "size": 114168525, + "url": "https://dl.google.com/android/repository/commandlinetools-linux-8512546_latest.zip" }, { "os": "macosx", - "sha1": "af2d950318d8ae8cc516a1401a94f888f615aca6", - "size": 313877066, - "url": "https://dl.google.com/android/repository/emulator-darwin_x64-8316981.zip" + "sha1": "9a663c49dbd3709fc2b7d49db2814b383d811b4a", + "size": 114168511, + "url": "https://dl.google.com/android/repository/commandlinetools-mac-8512546_latest.zip" + }, + { + "os": "windows", + "sha1": "1bdd32ac4b9fffea04f5bc341108e8b4fea6f32c", + "size": 114147385, + "url": "https://dl.google.com/android/repository/commandlinetools-win-8512546_latest.zip" + } + ], + "displayName": "Android SDK Command-line Tools", + "license": "android-sdk-license", + "name": "cmdline-tools", + "path": "cmdline-tools/7.0", + "revision": "7.0" + } + }, + "emulator": { + "31.2.10": { + "archives": [ + { + "os": "linux", + "sha1": "1f2c3ddeb2c9ac4feef5946098a0a710d08e9c6d", + "size": 276337904, + "url": "https://dl.google.com/android/repository/emulator-linux_x64-8420304.zip" + }, + { + "os": "windows", + "sha1": "206491b5c4e531b2c66dc80402702b9fa1a64c2a", + "size": 345300871, + "url": "https://dl.google.com/android/repository/emulator-windows_x64-8420304.zip" + }, + { + "os": "macosx", + "sha1": "677b6a00c145eb8bf4306daeb2231c8efd507177", + "size": 313876814, + "url": "https://dl.google.com/android/repository/emulator-darwin_x64-8420304.zip" } ], "displayName": "Android Emulator", "license": "android-sdk-license", "name": "emulator", "path": "emulator", - "revision": "31.2.9" + "revision": "31.2.10" }, - "31.3.7": { + "31.3.8": { "archives": [ { "os": "macosx", - "sha1": "0020b44623995a5a9a5b0d114f8fd942e9d3cbed", - "size": 347204784, - "url": "https://dl.google.com/android/repository/emulator-darwin_x64-8408431.zip" + "sha1": "7214e8384c97a7c9875142149d3bf9c940e9b5a0", + "size": 347222379, + "url": "https://dl.google.com/android/repository/emulator-darwin_x64-8598121.zip" }, { "os": "linux", - "sha1": "46ba0c398fcd2704bee015c95e44d8f317b7b720", - "size": 293765376, - "url": "https://dl.google.com/android/repository/emulator-linux_x64-8408431.zip" + "sha1": "0f781977a6cc5377b64444121ff75a513841a4fa", + "size": 293782881, + "url": "https://dl.google.com/android/repository/emulator-linux_x64-8598121.zip" }, { "os": "windows", - "sha1": "c09a35dd8c7eb7d8c53bf89c86019f5dbcd89b9d", - "size": 380137986, - "url": "https://dl.google.com/android/repository/emulator-windows_x64-8408431.zip" + "sha1": "b4f30bad4e68da41cc9bd44965259b2111a011a1", + "size": 380151866, + "url": "https://dl.google.com/android/repository/emulator-windows_x64-8598121.zip" } ], "displayName": "Android Emulator", "license": "android-sdk-preview-license", "name": "emulator", "path": "emulator", - "revision": "31.3.7" + "revision": "31.3.8" + }, + "31.3.9": { + "archives": [ + { + "os": "macosx", + "sha1": "6e7b549113252728cfe0992d58e8cb1790dce9d6", + "size": 347241742, + "url": "https://dl.google.com/android/repository/emulator-darwin_x64-8700579.zip" + }, + { + "os": "linux", + "sha1": "1c1a7ef65476d3de34f19455a0093cb68e8e90f7", + "size": 293801439, + "url": "https://dl.google.com/android/repository/emulator-linux_x64-8700579.zip" + }, + { + "os": "windows", + "sha1": "ea834211b199a7fcf6b6758a53c4594d01b44ab9", + "size": 380168712, + "url": "https://dl.google.com/android/repository/emulator-windows_x64-8700579.zip" + } + ], + "displayName": "Android Emulator", + "license": "android-sdk-license", + "name": "emulator", + "path": "emulator", + "revision": "31.3.9" } }, "extras": { @@ -4523,6 +4666,33 @@ "path": "ndk/23.1.7779620", "revision": "23.1.7779620" }, + "23.2.8568313": { + "archives": [ + { + "os": "macosx", + "sha1": "1fc65d8f6083f3f5cd01e0cf97c6adc10f4f076f", + "size": 982917530, + "url": "https://dl.google.com/android/repository/android-ndk-r23c-darwin.zip" + }, + { + "os": "linux", + "sha1": "e5053c126a47e84726d9f7173a04686a71f9a67a", + "size": 724733960, + "url": "https://dl.google.com/android/repository/android-ndk-r23c-linux.zip" + }, + { + "os": "windows", + "sha1": "f2c5def76a9de371f27d028864fe301ab4fe0cf8", + "size": 788336993, + "url": "https://dl.google.com/android/repository/android-ndk-r23c-windows.zip" + } + ], + "displayName": "NDK (Side by side) 23.2.8568313", + "license": "android-sdk-license", + "name": "ndk", + "path": "ndk/23.2.8568313", + "revision": "23.2.8568313" + }, "24.0.7856742-rc1": { "archives": [ { @@ -4684,6 +4854,60 @@ "name": "ndk", "path": "ndk/25.0.8221429", "revision": "25.0.8221429-rc2" + }, + "25.0.8355429-rc3": { + "archives": [ + { + "os": "macosx", + "sha1": "224594abb41357c20cb4a9f4a732c484b2e743ba", + "size": 748047157, + "url": "https://dl.google.com/android/repository/android-ndk-r25-beta3-darwin.zip" + }, + { + "os": "linux", + "sha1": "79c8db05e20edde0cbb02d2326e7b8405f7eb977", + "size": 510520692, + "url": "https://dl.google.com/android/repository/android-ndk-r25-beta3-linux.zip" + }, + { + "os": "windows", + "sha1": "7d2c398045f6bbad03f6fb2f2ba419a2a48ab1e7", + "size": 506142216, + "url": "https://dl.google.com/android/repository/android-ndk-r25-beta3-windows.zip" + } + ], + "displayName": "NDK (Side by side) 25.0.8355429", + "license": "android-sdk-preview-license", + "name": "ndk", + "path": "ndk/25.0.8355429", + "revision": "25.0.8355429-rc3" + }, + "25.0.8528842-rc4": { + "archives": [ + { + "os": "macosx", + "sha1": "d7f344ecc68518a8178d15b1b80e27bc5c69f00d", + "size": 716633626, + "url": "https://dl.google.com/android/repository/android-ndk-r25-beta4-darwin.zip" + }, + { + "os": "linux", + "sha1": "d13f688fd286709f0d950c75119ec9fcad8a47ff", + "size": 531018178, + "url": "https://dl.google.com/android/repository/android-ndk-r25-beta4-linux.zip" + }, + { + "os": "windows", + "sha1": "668b063c7c535c4f8be52c84acebb5779935203b", + "size": 464031742, + "url": "https://dl.google.com/android/repository/android-ndk-r25-beta4-windows.zip" + } + ], + "displayName": "NDK (Side by side) 25.0.8528842", + "license": "android-sdk-preview-license", + "name": "ndk", + "path": "ndk/25.0.8528842", + "revision": "25.0.8528842-rc4" } }, "ndk-bundle": { @@ -5381,32 +5605,32 @@ } }, "platform-tools": { - "33.0.1": { + "33.0.2": { "archives": [ { "os": "macosx", - "sha1": "82f7c23e9e4acf6c86991bb23cd5d9f861f7819f", - "size": 13131422, - "url": "https://dl.google.com/android/repository/platform-tools_r33.0.1-darwin.zip" + "sha1": "9b5661e0c18a2e5b6935e2b96bcc7be580cd6dcd", + "size": 13038676, + "url": "https://dl.google.com/android/repository/platform-tools_r33.0.2-darwin.zip" }, { "os": "linux", - "sha1": "4792ee4593e8e2395ddb87a3e82d60629eb0e977", - "size": 7449306, - "url": "https://dl.google.com/android/repository/platform-tools_r33.0.1-linux.zip" + "sha1": "6bf4f747ad929b02378b44ce083b4502d26109c7", + "size": 7406632, + "url": "https://dl.google.com/android/repository/platform-tools_r33.0.2-linux.zip" }, { "os": "windows", - "sha1": "e91ab59b5ddc5e387c5171b37c3813eaa2fa3846", - "size": 6331279, - "url": "https://dl.google.com/android/repository/platform-tools_r33.0.1-windows.zip" + "sha1": "2d7599f59b54f02c4ecd33d656091a3c1e55ad9c", + "size": 6304111, + "url": "https://dl.google.com/android/repository/platform-tools_r33.0.2-windows.zip" } ], "displayName": "Android SDK Platform-Tools", "license": "android-sdk-license", "name": "platform-tools", "path": "platform-tools", - "revision": "33.0.1" + "revision": "33.0.2" } }, "platforms": { @@ -5809,6 +6033,21 @@ "path": "platforms/android-32", "revision": "32" }, + "33": { + "archives": [ + { + "os": "all", + "sha1": "298f5800e37f3c089ab0eb58d4f6aef4058b689b", + "size": 67324871, + "url": "https://dl.google.com/android/repository/platform-33_r01.zip" + } + ], + "displayName": "Android SDK Platform 33", + "license": "android-sdk-license", + "name": "platforms", + "path": "platforms/android-33", + "revision": "33" + }, "4": { "archives": [ { @@ -5935,20 +6174,20 @@ "path": "platforms/android-9", "revision": "9" }, - "Tiramisu": { + "TiramisuPrivacySandbox": { "archives": [ { "os": "all", - "sha1": "2ac79862a909392d68d8ad503c45809e725d71f6", - "size": 67290653, - "url": "https://dl.google.com/android/repository/platform-Tiramisu_r02.zip" + "sha1": "8dd74a564f71c8381f5230682c5da291d230cc81", + "size": 67918949, + "url": "https://dl.google.com/android/repository/platform-TiramisuPrivacySandbox_r03.zip" } ], - "displayName": "Android SDK Platform Tiramisu", + "displayName": "Android SDK Platform TiramisuPrivacySandbox", "license": "android-sdk-license", "name": "platforms", - "path": "platforms/android-Tiramisu", - "revision": "Tiramisu" + "path": "platforms/android-TiramisuPrivacySandbox", + "revision": "TiramisuPrivacySandbox" } }, "skiaparser": { @@ -6304,6 +6543,21 @@ "name": "sources", "path": "sources/android-31", "revision": "31" + }, + "32": { + "archives": [ + { + "os": "all", + "sha1": "d7195c6de611b99d7ec3565eabe2fd21268b7f98", + "size": 46933291, + "url": "https://dl.google.com/android/repository/sources-32_r01.zip" + } + ], + "displayName": "Sources for Android 32", + "license": "android-sdk-license", + "name": "sources", + "path": "sources/android-32", + "revision": "32" } }, "tools": { 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 4f87715a74..eaaf621900 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/bap/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/bap/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, fetchurl +{ lib, stdenv, fetchFromGitHub, fetchurl, fetchpatch , ocaml, findlib, ocamlbuild, ocaml_oasis , bitstring, camlzip, cmdliner, core_kernel, ezjsonm, fileutils, ocaml_lwt, ocamlgraph, ocurl, re, uri, zarith, piqi, piqi-ocaml, uuidm, llvm, frontc, ounit, ppx_jane, parsexp , utop, libxml2, ncurses @@ -64,7 +64,13 @@ stdenv.mkDerivation rec { disableIda = "--disable-ida"; disableGhidra = "--disable-ghidra"; - patches = [ ./curses_is_ncurses.patch ]; + patches = [ + ./curses_is_ncurses.patch + (fetchpatch { + url = "https://github.com/BinaryAnalysisPlatform/bap/commit/8b1bba30ebb551256a5b15122e70d07f40184039.patch"; + sha256 = "0il0ik5f6nyqyrlln3n43mz1zpqq34lfnhmp10wdsah4ck2dy75h"; + }) + ]; preConfigure = '' substituteInPlace oasis/elf-loader --replace bitstring.ppx ppx_bitstring diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/biocaml/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/biocaml/default.nix index 596ed6161d..b82ec73617 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/biocaml/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/biocaml/default.nix @@ -4,7 +4,7 @@ buildDunePackage rec { pname = "biocaml"; - version = "0.11.1"; + version = "0.11.2"; useDune2 = true; @@ -14,7 +14,12 @@ buildDunePackage rec { owner = "biocaml"; repo = pname; rev = "v${version}"; - sha256 = "1il84vvypgkhdyc2j5fmgh14a58069s6ijbd5dvyl2i7jdxaazji"; + sha256 = "01yw12yixs45ya1scpb9jy2f7dw1mbj7741xib2xpq3kkc1hc21s"; + }; + + patches = fetchpatch { + url = "https://github.com/biocaml/biocaml/commit/3ef74d0eb4bb48d2fb7dd8b66fb3ad8fe0aa4d78.patch"; + sha256 = "0rcvf8gwq7sz15mghl9ing722rl2zpnqif9dfxrnpdxiv0rl0731"; }; buildInputs = [ ppx_jane ppx_sexp_conv ]; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/bistro/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/bistro/default.nix index 348d1bb97d..43cbd33f73 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/bistro/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/bistro/default.nix @@ -1,10 +1,13 @@ { lib , ocaml +, fetchpatch , fetchFromGitHub , buildDunePackage , base64 , bos , core +, core_kernel +, core_unix , lwt_react , ocamlgraph , ppx_sexp_conv @@ -15,21 +18,23 @@ buildDunePackage rec { pname = "bistro"; - version = "unstable-2021-11-13"; + version = "unstable-2022-05-07"; useDune2 = true; src = fetchFromGitHub { owner = "pveber"; repo = pname; - rev = "fb285b2c6d8adccda3c71e2293bceb01febd6624"; - sha256 = "sha256-JChDU1WH8W9Czkppx9SHiVIu9/7QFWJy2A89oksp0Ek="; + rev = "d363bd2d8257babbcb6db15bd83fd6465df7c268"; + sha256 = "0g11324j1s2631zzf7zxc8s0nqd4fwvcni0kbvfpfxg96gy2wwfm"; }; propagatedBuildInputs = [ base64 bos core + core_kernel + core_unix lwt_react ocamlgraph ppx_sexp_conv diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/chrome-trace/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/chrome-trace/default.nix new file mode 100644 index 0000000000..fb6c14b336 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/chrome-trace/default.nix @@ -0,0 +1,20 @@ +{ lib, buildDunePackage, dune_3 }: + +buildDunePackage rec { + pname = "chrome-trace"; + inherit (dune_3) src version; + + duneVersion = "3"; + + dontAddPrefix = true; + + preBuild = '' + rm -r vendor/csexp + ''; + + meta = with lib; { + description = "Chrome trace event generation library"; + inherit (dune_3.meta) homepage; + license = licenses.mit; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/cohttp/async.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/cohttp/async.nix index fed31fbe49..2ad452ff6e 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/cohttp/async.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/cohttp/async.nix @@ -1,4 +1,6 @@ { lib +, fetchpatch +, fetchurl , buildDunePackage , ppx_sexp_conv , base @@ -47,13 +49,21 @@ buildDunePackage { ipaddr ]; - doCheck = true; + # Examples don't compile with core 0.15. See https://github.com/mirage/ocaml-cohttp/pull/864. + doCheck = false; checkInputs = [ ounit mirage-crypto core ]; + # Compatibility with core 0.15. No longer needed after updating cohttp to 5.0.0. + patches = fetchpatch { + url = "https://github.com/mirage/ocaml-cohttp/commit/5a7124478ed31c6b1fa6a9a50602c2ec839083b5.patch"; + sha256 = "0i99rl8604xqwb6d0yzk9ws4dflbn0j4hv2nba2qscbqrrn22rw3"; + }; + patchFlags = "-p1 -F3"; + meta = cohttp.meta // { description = "CoHTTP implementation for the Async concurrency library"; }; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/faraday/async.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/faraday/async.nix index 666eb68492..05b085f92a 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/faraday/async.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/faraday/async.nix @@ -1,9 +1,14 @@ -{ buildDunePackage, faraday, core, async }: +{ buildDunePackage, fetchpatch, faraday, core, async }: buildDunePackage rec { pname = "faraday-async"; inherit (faraday) version src useDune2; + patches = fetchpatch { + url = "https://github.com/inhabitedtype/faraday/commit/31c3fc7f91ecca0f1deea10b40fd5e33bcd35f75.patch"; + sha256 = "05z5gk7hxq7qvwg6f73hdhfcnx19p1dq6wqh8prx667y8zsaq2zj"; + }; + minimumOCamlVersion = "4.08"; propagatedBuildInputs = [ faraday core async ]; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/gapi-ocaml/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/gapi-ocaml/default.nix index c417d94e29..f9e566eb04 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/gapi-ocaml/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/gapi-ocaml/default.nix @@ -1,31 +1,29 @@ { lib, fetchFromGitHub, buildDunePackage, ocaml , cryptokit, ocamlnet, ocurl, yojson -, ounit +, ounit2 }: buildDunePackage rec { pname = "gapi-ocaml"; - version = "0.4.2"; + version = "0.4.3"; - useDune2 = true; - - minimumOCamlVersion = "4.02"; + minimalOCamlVersion = "4.02"; src = fetchFromGitHub { owner = "astrada"; repo = pname; rev = "v${version}"; - sha256 = "sha256-imicHOlNjPHHW/lcWRJmURafYZFe/6J3efKPJcel8J8="; + sha256 = "sha256-V0GB9Bd06IdcI5PDFHGVZ0Y/qi7tTs/4ITqPXUOxCLs="; }; propagatedBuildInputs = [ cryptokit ocamlnet ocurl yojson ]; doCheck = lib.versionAtLeast ocaml.version "4.04"; - checkInputs = [ ounit ]; + checkInputs = [ ounit2 ]; meta = { description = "OCaml client for google services"; - homepage = "http://gapi-ocaml.forge.ocamlcore.org"; + inherit (src.meta) homepage; license = lib.licenses.mit; maintainers = with lib.maintainers; [ bennofs ]; }; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/hack_parallel/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/hack_parallel/default.nix index 122ee2149f..8d1414731f 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/hack_parallel/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/hack_parallel/default.nix @@ -1,5 +1,5 @@ -{ lib, fetchFromGitHub, buildDunePackage, core, core_kernel, pkg-config, sqlite -}: +{ lib, fetchFromGitHub, buildDunePackage, core, core_unix, pkg-config +, sqlite }: buildDunePackage rec { pname = "hack_parallel"; version = "1.0.1"; @@ -13,9 +13,11 @@ buildDunePackage rec { sha256 = "0qjlkw35r4q2cm0n2x0i73zvx1xgrp6axaia2nm8zxpm49mid629"; }; + patches = [ ./hack_parallel.patch ]; + nativeBuildInputs = [ pkg-config ]; - propagatedBuildInputs = [ core core_kernel sqlite ]; + propagatedBuildInputs = [ core core_unix sqlite ]; meta = { description = diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/hack_parallel/hack_parallel.patch b/third_party/nixpkgs/pkgs/development/ocaml-modules/hack_parallel/hack_parallel.patch new file mode 100644 index 0000000000..174803a348 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/hack_parallel/hack_parallel.patch @@ -0,0 +1,68 @@ +diff --git a/src/heap/sharedMem.ml b/src/heap/sharedMem.ml +index 600e272..511b724 100644 +--- a/src/heap/sharedMem.ml ++++ b/src/heap/sharedMem.ml +@@ -521,7 +521,7 @@ end = struct + + let stack: t option ref = ref None + +- let has_local_changes () = Core_kernel.Option.is_some (!stack) ++ let has_local_changes () = Core.Option.is_some (!stack) + + let rec mem stack_opt key = + match stack_opt with +diff --git a/src/interface/memory.ml b/src/interface/memory.ml +index 3554b17..09aa1f5 100644 +--- a/src/interface/memory.ml ++++ b/src/interface/memory.ml +@@ -66,10 +66,10 @@ let get_heap_handle () = + + + let heap_use_ratio () = +- Core_kernel.Float.of_int (SharedMemory.heap_size ()) /. +- Core_kernel.Float.of_int initial_heap_size ++ Core.Float.of_int (SharedMemory.heap_size ()) /. ++ Core.Float.of_int initial_heap_size + + + let slot_use_ratio () = + let { SharedMemory.used_slots; slots; _ } = SharedMemory.hash_stats () in +- Core_kernel.Float.of_int used_slots /. Core_kernel.Float.of_int slots ++ Core.Float.of_int used_slots /. Core.Float.of_int slots +diff --git a/src/interface/scheduler.ml b/src/interface/scheduler.ml +index 9b8282a..b5d41b5 100644 +--- a/src/interface/scheduler.ml ++++ b/src/interface/scheduler.ml +@@ -48,7 +48,7 @@ let map_reduce + | Some exact_size when exact_size > 0 -> + (List.length work / exact_size) + 1 + | _ -> +- let bucket_multiplier = Core_kernel.Int.min bucket_multiplier (1 + (List.length work / 400)) in ++ let bucket_multiplier = Core.Int.min bucket_multiplier (1 + (List.length work / 400)) in + number_of_workers * bucket_multiplier + in + MultiWorker.call +diff --git a/src/utils/dune b/src/utils/dune +index 50a4c42..45e4a5a 100644 +--- a/src/utils/dune ++++ b/src/utils/dune +@@ -15,6 +15,7 @@ + sysinfo) + (libraries + core ++ core_unix + str + hack_parallel.collections + hack_parallel.disk +diff --git a/src/utils/hh_logger.ml b/src/utils/hh_logger.ml +index 4c99f05..8075ed5 100644 +--- a/src/utils/hh_logger.ml ++++ b/src/utils/hh_logger.ml +@@ -9,6 +9,7 @@ + *) + + open Core ++module Unix = Core_unix + + let timestamp_string () = + let open Unix in diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/janestreet/0.15.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/janestreet/0.15.nix new file mode 100644 index 0000000000..8510b3a8c2 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/janestreet/0.15.nix @@ -0,0 +1,1007 @@ +{ self +, fetchpatch +, lib +, openssl +, patdiff +, zstd +}: + +with self; + +{ + + abstract_algebra = janePackage { + pname = "abstract_algebra"; + minimumOCamlVersion = "4.08"; + hash = "12imf6ibm7qb8r1fpqnrl20x2z14zl3ri1vzg0z8qby9l8bv2fbd"; + meta.description = "A small library describing abstract algebra concepts"; + propagatedBuildInputs = [ base ppx_jane ]; + }; + + accessor = janePackage { + pname = "accessor"; + minimumOCamlVersion = "4.09"; + hash = "17rzf0jpc9s3yrxcnn630jhgsw5mrnrhwbfh62hqxqanascc5rxh"; + meta.description = "A library that makes it nicer to work with nested functional data structures"; + propagatedBuildInputs = [ higher_kinded ]; + }; + + accessor_async = janePackage { + pname = "accessor_async"; + minimumOCamlVersion = "4.09"; + hash = "17r6af55ms0i496jsfx0xpdm336c2vhyf49b3s8s1gpz521wrgmc"; + meta.description = "Accessors for Async types, for use with the Accessor library"; + propagatedBuildInputs = [ accessor_core async_kernel ]; + }; + + accessor_base = janePackage { + pname = "accessor_base"; + minimumOCamlVersion = "4.09"; + hash = "1qvq005vxf6n1c7swzb4bzcqdh471bfb9gcmdj4m57xg85xznc1n"; + meta.description = "Accessors for Base types, for use with the Accessor library"; + propagatedBuildInputs = [ ppx_accessor ]; + }; + + accessor_core = janePackage { + minimumOCamlVersion = "4.09"; + pname = "accessor_core"; + hash = "0zrs5zbyrhfbah73g22l19bw1mmljhyb3l2mrwcxgbjq9pqp0k9v"; + meta.description = "Accessors for Core types, for use with the Accessor library"; + propagatedBuildInputs = [ accessor_base core_kernel ]; + }; + + async = janePackage { + pname = "async"; + hash = "0pykmnsil754jsnr8gss91ykyjvivngx4ii0ih3nsg1x2jl9xmy2"; + meta.description = "Monadic concurrency library"; + propagatedBuildInputs = [ async_rpc_kernel async_unix textutils ]; + doCheck = false; # we don't have netkit_sockets + }; + + async_extra = janePackage { + pname = "async_extra"; + hash = "0pxp0b4shz9krsj8xfzajv8a1mijgf0xdgxrn2abdqrz3rvj6pig"; + meta.description = "Monadic concurrency library"; + propagatedBuildInputs = [ async_kernel ]; + }; + + async_find = janePackage { + pname = "async_find"; + hash = "119988nkcnw6l6wch4llqkvsrawv2gkbn5q4hngpdwvnw0g0aapv"; + meta.description = "Directory traversal with Async"; + propagatedBuildInputs = [ async ]; + }; + + async_inotify = janePackage { + pname = "async_inotify"; + hash = "1nxz6bijp7liy18ljrxg92v2m8v8fqcs1pmzg9kbcf0d4vij8j2p"; + meta.description = "Async wrapper for inotify"; + propagatedBuildInputs = [ async_find inotify ]; + }; + + async_interactive = janePackage { + pname = "async_interactive"; + hash = "00hr2lhs8p3hwnyllmns59rwlpimc5b7r6v4zn6cmpb1riblaxqp"; + meta.description = "Utilities for building simple command-line based user interfaces"; + propagatedBuildInputs = [ async ]; + }; + + async_js = janePackage { + pname = "async_js"; + hash = "184j077bz686k5lrqswircnrdqldb316ngpzq7xri1pcsl39sy3q"; + meta.description = "A small library that provide Async support for JavaScript platforms"; + buildInputs = [ js_of_ocaml-ppx ]; + propagatedBuildInputs = [ async_rpc_kernel js_of_ocaml uri-sexp ]; + }; + + async_kernel = janePackage { + pname = "async_kernel"; + hash = "01if6c8l2h64v7sk56xr8acnmj6g9whxcjrzzzvczspq88hq2bfh"; + meta.description = "Monadic concurrency library"; + propagatedBuildInputs = [ core_kernel ]; + }; + + async_rpc_kernel = janePackage { + pname = "async_rpc_kernel"; + hash = "1b5rp5yam03ir4f1sixpzjg1zdqmkb7lvnaa82kac4fzk80gfrfr"; + meta.description = "Platform-independent core of Async RPC library"; + propagatedBuildInputs = [ async_kernel protocol_version_header ]; + }; + + async_rpc_websocket = janePackage { + pname = "async_rpc_websocket"; + hash = "1n93jhkz5r76xcc40c4i4sxcyfz1dbppz8sjfxpwcwjyi6lyhp1p"; + meta.description = "Library to serve and dispatch Async RPCs over websockets"; + propagatedBuildInputs = [ async_rpc_kernel async_websocket cohttp_async_websocket ]; + }; + + async_sendfile = janePackage { + pname = "async_sendfile"; + hash = "0lnagdxfnac4z29narphf2ab5a23ys883zmc45r96rssfx82i3fs"; + meta.description = "Thin wrapper around [Linux_ext.sendfile] to send full files"; + propagatedBuildInputs = [ async_unix ]; + }; + + async_shell = janePackage { + pname = "async_shell"; + hash = "07iwlyrc4smk6hsnz89cz2ihp670mllq0y9wbdafvagm1y1p62vx"; + meta.description = "Shell helpers for Async"; + propagatedBuildInputs = [ async shell ]; + }; + + async_smtp = janePackage { + pname = "async_smtp"; + hash = "1m00j7wcb0blipnc1m6by70gd96a1k621b4dgvgffp8as04a461r"; + meta.description = "SMTP client and server"; + propagatedBuildInputs = [ async_extra async_inotify async_sendfile async_shell async_ssl email_message resource_cache re2_stable sexp_macro ]; + }; + + async_ssl = janePackage { + pname = "async_ssl"; + hash = "1b7f7p3xj4jr2n2dxy2lp7a9k7944w6x2nrg6524clvcsd1ax4hn"; + meta.description = "Async wrappers for SSL"; + buildInputs = [ dune-configurator ]; + propagatedBuildInputs = [ async ctypes openssl ]; + # in ctypes.foreign 0.18.0 threaded and unthreaded have been merged + postPatch = '' + substituteInPlace bindings/dune \ + --replace "ctypes.foreign.threaded" "ctypes.foreign" + ''; + }; + + async_unix = janePackage { + pname = "async_unix"; + hash = "0z4fgpn93iw0abd7l9kac28qgzgc5qr2x0s1n2zh49lsdn02n6ys"; + meta.description = "Monadic concurrency library"; + propagatedBuildInputs = [ async_kernel core_unix ]; + }; + + async_websocket = janePackage { + pname = "async_websocket"; + hash = "16ixqfnx9jp77bvx11dlzsq0pzfpyiif60hl2q06zncyswky9xgb"; + meta.description = "A library that implements the websocket protocol on top of Async"; + propagatedBuildInputs = [ async cryptokit ]; + }; + + base = janePackage { + pname = "base"; + hash = "1qyycqqr4dijvxm4hhy79c964wd91kpsfvb89kna1qwgllg0hrpj"; + minimumOCamlVersion = "4.10"; + meta.description = "Full standard library replacement for OCaml"; + buildInputs = [ dune-configurator ]; + propagatedBuildInputs = [ sexplib0 ]; + checkInputs = [ alcotest ]; + }; + + base_bigstring = janePackage { + pname = "base_bigstring"; + hash = "1hv3hw2fwqmkrxms1g6rw3c18mmla1z5bva3anx45mnff903iv4q"; + minimumOCamlVersion = "4.08"; + meta.description = "String type based on [Bigarray], for use in I/O and C-bindings"; + propagatedBuildInputs = [ int_repr ppx_jane ]; + }; + + base_quickcheck = janePackage { + pname = "base_quickcheck"; + hash = "0q73kfr67cz5wp4qn4rq3lpa922hqmvwdiinnans0js65fvlgqsi"; + minimumOCamlVersion = "4.04.2"; + meta.description = "Randomized testing framework, designed for compatibility with Base"; + propagatedBuildInputs = [ ppx_base ppx_fields_conv ppx_let ppx_sexp_value splittable_random ]; + }; + + bignum = janePackage { + pname = "bignum"; + hash = "12q3xcv78b4s9srnc17jbyn53d5drmwmyvgp62p7nk3fs4f7cr4f"; + propagatedBuildInputs = [ core_kernel zarith zarith_stubs_js ]; + meta.description = "Core-flavoured wrapper around zarith's arbitrary-precision rationals"; + }; + + bin_prot = janePackage { + pname = "bin_prot"; + hash = "1qfqglscc25wwnjx7byqmjcnjww1msnr8940gyg8h93wdq43fjnh"; + minimumOCamlVersion = "4.04.2"; + meta.description = "A binary protocol generator"; + propagatedBuildInputs = [ ppx_compare ppx_custom_printf ppx_fields_conv ppx_optcomp ppx_variants_conv ]; + }; + + bonsai = janePackage { + pname = "bonsai"; + hash = "150zx2g1dmhyrxwqq8j7f2m3hjpmk5bk182ihx2gdbarhw1ainpm"; + meta.description = "A library for building dynamic webapps, using Js_of_ocaml"; + buildInputs = [ ppx_pattern_bind ]; + nativeBuildInputs = [ js_of_ocaml-compiler ocaml-embed-file ]; + propagatedBuildInputs = [ + async + async_extra + async_rpc_websocket + cohttp-async + core_bench + fuzzy_match + incr_dom + js_of_ocaml-ppx + patdiff + ppx_css + ppx_typed_fields + profunctor + textutils + ]; + patches = [ ./bonsai_jsoo_4_0.patch ]; + }; + + cinaps = janePackage { + pname = "cinaps"; + version = "0.15.1"; + hash = "0g856cxmxg4vicwslhqldplkpwi158s2d62vwzv26xg5m6wjn9rg"; + minimumOCamlVersion = "4.04"; + meta.description = "Trivial metaprogramming tool"; + propagatedBuildInputs = [ re ]; + doCheck = false; # fails because ppx_base doesn't include ppx_js_style + }; + + cohttp_async_websocket = janePackage { + pname = "cohttp_async_websocket"; + hash = "0d0smavnxpnwrmhlcf3b5a3cm3n9kz1y8fh6l28xv6zrn4sc7ik8"; + meta.description = "Websocket library for use with cohttp and async"; + propagatedBuildInputs = [ async_websocket cohttp-async ppx_jane uri-sexp ]; + }; + + core = janePackage { + pname = "core"; + hash = "1m2ybvlz9zlb2d0jc0j7wdgd18mx9sh3ds2ylkv0cfjx1pzi0l25"; + meta.description = "Industrial strength alternative to OCaml's standard library"; + buildInputs = [ jst-config ]; + propagatedBuildInputs = [ base base_bigstring base_quickcheck ppx_jane time_now ]; + doCheck = false; # circular dependency with core_kernel + }; + + core_bench = janePackage { + pname = "core_bench"; + hash = "0v6lm9vz6y1qd7h8pg9l5jsy8qr74vlk1nd4qzchld4jhwq7mbdi"; + meta.description = "Benchmarking library"; + propagatedBuildInputs = [ textutils ]; + }; + + core_extended = janePackage { + pname = "core_extended"; + hash = "0sx79hc1y1daczib2p4nbyw4aqnznmdd83knrhs5q153j7lnlalx"; + meta.description = "Extra components that are not as closely vetted or as stable as Core"; + propagatedBuildInputs = [ core_unix record_builder ]; + }; + + core_kernel = janePackage { + pname = "core_kernel"; + hash = "05mb4vbf293iq1xx4acyrmi9cgcw6capwrsa54ils62alby6w6yq"; + meta.description = "System-independent part of Core"; + buildInputs = [ jst-config ]; + propagatedBuildInputs = [ base_bigstring core int_repr sexplib ]; + doCheck = false; # we don't have quickcheck_deprecated + }; + + core_unix = janePackage { + pname = "core_unix"; + hash = "1xzxqzg23in5ivz0v3qshzpr4w92laayscqj9im7jylh2ar1xi0a"; + meta.description = "Unix-specific portions of Core"; + buildInputs = [ jst-config ]; + propagatedBuildInputs = [ core_kernel expect_test_helpers_core ocaml_intrinsics ppx_jane timezone spawn ]; + postPatch = '' + patchShebangs unix_pseudo_terminal/src/discover.sh + ''; + }; + + csvfields = janePackage { + pname = "csvfields"; + hash = "0z47pq17bw776hzvk48ypbd92ps9vlvl86mnhw3j6cqx4ahbjik3"; + propagatedBuildInputs = [ core num ]; + meta.description = "Runtime support for ppx_xml_conv and ppx_csv_conv"; + }; + + delimited_parsing = janePackage { + pname = "delimited_parsing"; + hash = "0d050v58zzi8c4qiwxbfcyrdw6zvncnnl3qj79qi0yq4xkg7820r"; + propagatedBuildInputs = [ async core_extended ]; + meta.description = "Parsing of character (e.g., comma) separated and fixed-width values"; + }; + + ecaml = janePackage { + pname = "ecaml"; + hash = "08g2bl06vkn3bkqzkmvk2646aqb6jj4a7n3wgzpcx1c2gl3iw5i6"; + meta.description = "Library for writing Emacs plugin in OCaml"; + propagatedBuildInputs = [ async expect_test_helpers_core ]; + }; + + email_message = janePackage { + pname = "email_message"; + hash = "00h66l2g5rjaay0hbyqy4v9i866g779miriwv20h9k4mliqdq7in"; + meta.description = "E-mail message parser"; + propagatedBuildInputs = [ angstrom async base64 cryptokit magic-mime re2 ]; + }; + + expect_test_helpers_async = janePackage { + pname = "expect_test_helpers_async"; + hash = "14v4966p5dmqgjb9sgrvnsixv0w0bagicn8v44g9mf9d88z8pfym"; + meta.description = "Async helpers for writing expectation tests"; + propagatedBuildInputs = [ async expect_test_helpers_core ]; + }; + + expect_test_helpers_core = janePackage { + pname = "expect_test_helpers_core"; + hash = "0bxs3g0zzym8agfcbpg5lmrh6hcb86z861bq40xhhfwqf4pzdbfa"; + meta.description = "Helpers for writing expectation tests"; + propagatedBuildInputs = [ core_kernel sexp_pretty ]; + }; + + fieldslib = janePackage { + pname = "fieldslib"; + hash = "0xwf9mdxlyr3f0vv5y82cyw2bsckwl8rwf6jm6bai1gqpgxjq756"; + minimumOCamlVersion = "4.04.2"; + meta.description = "Syntax extension to define first class values representing record fields, to get and set record fields, iterate and fold over all fields of a record and create new record values"; + propagatedBuildInputs = [ base ]; + }; + + fuzzy_match = janePackage { + pname = "fuzzy_match"; + hash = "0s5w81698b07l5m11nwx8xbjcpmp54dnf5fcrnlva22jrlsf14h4"; + meta.description = "A library for fuzzy string matching"; + propagatedBuildInputs = [ core ppx_jane ]; + }; + + higher_kinded = janePackage { + pname = "higher_kinded"; + minimumOCamlVersion = "4.09"; + hash = "0rafxxajqswi070h8sinhjna0swh1hc6d7i3q7y099yj3wlr2y1l"; + meta.description = "A library with an encoding of higher kinded types in OCaml"; + propagatedBuildInputs = [ base ppx_jane ]; + }; + + incr_dom = janePackage { + pname = "incr_dom"; + hash = "1sija9w2im8vdp61h387w0mww9hh7jgkgsjcccps4lbv936ac7c1"; + meta.description = "A library for building dynamic webapps, using Js_of_ocaml"; + buildInputs = [ js_of_ocaml-ppx ]; + propagatedBuildInputs = [ async_js incr_map incr_select virtual_dom ]; + patches = [ ./incr_dom_jsoo_4_0.patch ]; + }; + + incr_map = janePackage { + pname = "incr_map"; + hash = "0aq8wfylvq68him92vzh1fqmr7r0lfwc5cdiqr10r5x032vzpnii"; + meta.description = "Helpers for incremental operations on map like data structures"; + buildInputs = [ ppx_pattern_bind ]; + propagatedBuildInputs = [ abstract_algebra incremental ]; + }; + + incr_select = janePackage { + pname = "incr_select"; + hash = "0qm2i4hb5jh2ra95kq881s4chkwbd2prvql1c0nahd63h829m57l"; + meta.description = "Handling of large set of incremental outputs from a single input"; + propagatedBuildInputs = [ incremental ]; + }; + + incremental = janePackage { + pname = "incremental"; + hash = "1dp30mhljnbcxqimydwbmxx0x4y4xnb55gyhldm1f5qrwdxdl747"; + meta.description = "Library for incremental computations"; + propagatedBuildInputs = [ core_kernel ]; + }; + + int_repr = janePackage { + pname = "int_repr"; + hash = "0ph88ym3s9dk30n17si2xam40sp8wv1xffw5cl3bskc2vfya1nvl"; + meta.description = "Integers of various widths"; + propagatedBuildInputs = [ base ppx_jane ]; + }; + + jane-street-headers = janePackage { + pname = "jane-street-headers"; + hash = "1lzk3w66x4429n2j75lwm55xafc46mywgdrbh9nc9jwqwgzf0wwx"; + minimumOCamlVersion = "4.04.2"; + meta.description = "Jane Street C header files"; + }; + + jsonaf = janePackage { + pname = "jsonaf"; + hash = "1j9rn8vsvfpgmdpmdqb5qhvss5171j8n3ii1bcgnavqinchbvqa6"; + meta.description = "A library for parsing, manipulating, and serializing data structured as JSON"; + propagatedBuildInputs = [ base ppx_jane angstrom faraday ]; + }; + + jst-config = janePackage { + pname = "jst-config"; + hash = "1lxqsj5k3v8p7g802vj1xc6bs5wrfpszh3q61xvpcd42pf3ahma9"; + meta.description = "Compile-time configuration for Jane Street libraries"; + buildInputs = [ dune-configurator ppx_assert stdio ]; + patches = [ + # remove on next release + (fetchpatch { + url = "https://github.com/janestreet/jst-config/commit/e5fdac6e5df9ba93e014a4d2db841fdbf209446f.patch"; + sha256 = "sha256-8hVC76z5ilYD/++xRHVswy/l+zzDt63jH4hfSJ/rPaA="; + }) + ]; + }; + + ocaml-compiler-libs = janePackage { + pname = "ocaml-compiler-libs"; + version = "0.12.4"; + minimumOCamlVersion = "4.04.1"; + hash = "00if2f7j9d8igdkj4rck3p74y17j6b233l91mq02drzrxj199qjv"; + meta.description = "OCaml compiler libraries repackaged"; + }; + + ocaml-embed-file = janePackage { + pname = "ocaml-embed-file"; + hash = "1nzgc0q05f0j3q1kwfpyhhhpgwrfjvmkqqifrkrm4y7d1i44bfnw"; + propagatedBuildInputs = [ async ppx_jane ]; + meta.description = "Files contents as module constants"; + }; + + ocaml_intrinsics = janePackage { + pname = "ocaml_intrinsics"; + minimumOCamlVersion = "4.08"; + hash = "1fdfl78b8br0j9w4046i0fmmaqn4cgl06q94rsniyagx9747pnsr"; + meta.description = "Intrinsics"; + buildInputs = [ dune-configurator ]; + doCheck = false; # test rules broken + }; + + parsexp = janePackage { + pname = "parsexp"; + hash = "1grzpxi39318vcqhwf723hqh11k68irh59zb3dyg9lw8wjn7752a"; + minimumOCamlVersion = "4.04.2"; + meta.description = "S-expression parsing library"; + propagatedBuildInputs = [ base sexplib0 ]; + }; + + patience_diff = janePackage { + pname = "patience_diff"; + hash = "17yrhn4qfi31m8g1ygb3m6i9z4fqd8f60fn6viazgx06s3x4xp3v"; + meta.description = "Diff library using Bram Cohen's patience diff algorithm"; + propagatedBuildInputs = [ core_kernel ]; + }; + + posixat = janePackage { + pname = "posixat"; + hash = "1xgycwa0janrfn9psb7xrm0820blr82mqf1lvjy9ipqalj7v9w1f"; + minimumOCamlVersion = "4.07"; + propagatedBuildInputs = [ ppx_optcomp ppx_sexp_conv ]; + meta.description = "Binding to the posix *at functions"; + }; + + ppx_accessor = janePackage { + pname = "ppx_accessor"; + minimumOCamlVersion = "4.09"; + hash = "0qv51if1nk0zff2v6q946h8ac7bpd5xa4ivyixl9g4h2mk29w4qb"; + meta.description = "[@@deriving] plugin to generate accessors for use with the Accessor libraries"; + propagatedBuildInputs = [ accessor ]; + }; + + ppx_assert = janePackage { + pname = "ppx_assert"; + hash = "0dic250q3flrjs3i70a2qqqnhqqj75ddlixpy7hdfghjw32azw90"; + minimumOCamlVersion = "4.04.2"; + meta.description = "Assert-like extension nodes that raise useful errors on failure"; + propagatedBuildInputs = [ ppx_cold ppx_compare ppx_here ppx_sexp_conv ]; + }; + + ppx_base = janePackage { + pname = "ppx_base"; + hash = "13rfmy2fxvwi7z5l1mai474ri5anqjm8q4hs7dblplsjjd9m5ld1"; + minimumOCamlVersion = "4.04.2"; + meta.description = "Base set of ppx rewriters"; + propagatedBuildInputs = [ ppx_cold ppx_enumerate ppx_hash ]; + }; + + ppx_bench = janePackage { + pname = "ppx_bench"; + hash = "0bc0gbm922417wqisafxh35jslcp7xy1s0h0a1q32rhx0ivxx3g6"; + minimumOCamlVersion = "4.04.2"; + meta.description = "Syntax extension for writing in-line benchmarks in ocaml code"; + propagatedBuildInputs = [ ppx_inline_test ]; + }; + + ppx_bin_prot = janePackage { + pname = "ppx_bin_prot"; + hash = "1280wsls061fmvmdysjqn3lv4mnkyg400jnjf4jyfr14s33h1ad5"; + minimumOCamlVersion = "4.04.2"; + meta.description = "Generation of bin_prot readers and writers from types"; + propagatedBuildInputs = [ bin_prot ppx_here ]; + doCheck = false; # circular dependency with ppx_jane + }; + + ppx_cold = janePackage { + pname = "ppx_cold"; + hash = "0x7xgpvy0l28k971xy08ibhr4w9nh8d9zvxc6jfxxx4fbfcv5gca"; + minimumOCamlVersion = "4.04.2"; + meta.description = "Expands [@cold] into [@inline never][@specialise never][@local never]"; + propagatedBuildInputs = [ ppxlib ]; + }; + + ppx_compare = janePackage { + pname = "ppx_compare"; + hash = "1wjwqkr71p61vjidbr80l93y4kkad7xsfyp04w8qfqrj7h5nm625"; + minimumOCamlVersion = "4.04.2"; + meta.description = "Generation of comparison functions from types"; + propagatedBuildInputs = [ ppxlib base ]; + }; + + ppx_custom_printf = janePackage { + pname = "ppx_custom_printf"; + hash = "1k8nmq6kwqz2wpkm9ymq749dz1vd8lxrjc711knp1wyz5935hnsv"; + minimumOCamlVersion = "4.04.2"; + meta.description = "Printf-style format-strings for user-defined string conversion"; + propagatedBuildInputs = [ ppx_sexp_conv ]; + }; + + ppx_css = janePackage { + pname = "ppx_css"; + hash = "09dpmj3f3m3z1ji9hq775iqr3cfmv5gh7q9zlblizj4wx4y0ibyi"; + meta.description = "A ppx that takes in css strings and produces a module for accessing the unique names defined within"; + propagatedBuildInputs = [ core_kernel ppxlib js_of_ocaml js_of_ocaml-ppx sedlex ]; + }; + + ppx_disable_unused_warnings = janePackage { + pname = "ppx_disable_unused_warnings"; + hash = "0sb5i4v7p9df2bxk66rjs30k9fqdrwsq1jgykjv6wyrx2d9bv955"; + minimumOCamlVersion = "4.04.2"; + meta.description = "Expands [@disable_unused_warnings] into [@warning \"-20-26-32-33-34-35-36-37-38-39-60-66-67\"]"; + propagatedBuildInputs = [ ppxlib ]; + }; + + ppx_enumerate = janePackage { + pname = "ppx_enumerate"; + hash = "1i0f6jv5cappw3idd70wpg76d7x6mvxapa89kri1bwz47hhg4pkz"; + minimumOCamlVersion = "4.04.2"; + meta.description = "Generate a list containing all values of a finite type"; + propagatedBuildInputs = [ ppxlib ]; + }; + + ppx_expect = janePackage { + pname = "ppx_expect"; + hash = "134dl5qhjxsj2mcmrx9f3m0iys0n5mjfpz9flj8zn8d2jir43776"; + minimumOCamlVersion = "4.04.2"; + meta.description = "Cram like framework for OCaml"; + propagatedBuildInputs = [ ppx_here ppx_inline_test re ]; + doCheck = false; # test build rules broken + }; + + ppx_fields_conv = janePackage { + pname = "ppx_fields_conv"; + hash = "094wsnw7fcwgl9xg6vkjb0wbgpn9scsp847yhdd184sz9v1amz14"; + minimumOCamlVersion = "4.04.2"; + meta.description = "Generation of accessor and iteration functions for ocaml records"; + propagatedBuildInputs = [ fieldslib ppxlib ]; + }; + + ppx_fixed_literal = janePackage { + pname = "ppx_fixed_literal"; + hash = "10siwcqrqa4gh0mg6fkaby0jjskc01r81pcblc67h3vmbjjh08j9"; + minimumOCamlVersion = "4.04.2"; + meta.description = "Simpler notation for fixed point literals"; + propagatedBuildInputs = [ ppxlib ]; + }; + + ppx_hash = janePackage { + pname = "ppx_hash"; + hash = "15agkwavadllzxdv4syjna02083nfnap8qs4yqf5s0adjw73fzyg"; + minimumOCamlVersion = "4.04.2"; + meta.description = "A ppx rewriter that generates hash functions from type expressions and definitions"; + propagatedBuildInputs = [ ppx_compare ppx_sexp_conv ]; + }; + + ppx_here = janePackage { + pname = "ppx_here"; + hash = "0jv81k8x18q8rxdyfwavrvx8yq9k5m3abpmgdg6zipx2ajcjzvag"; + minimumOCamlVersion = "4.04.2"; + meta.description = "Expands [%here] into its location"; + propagatedBuildInputs = [ ppxlib ]; + doCheck = false; # test build rules broken + }; + + ppx_ignore_instrumentation = janePackage { + pname = "ppx_ignore_instrumentation"; + hash = "16fgig88g3jr0m3i636fr52h29h1yzhi8nhnl4029zn808kcdyj2"; + minimumOCamlVersion = "4.08"; + meta.description = "Ignore Jane Street specific instrumentation extensions"; + propagatedBuildInputs = [ ppxlib ]; + }; + + ppx_inline_test = janePackage { + pname = "ppx_inline_test"; + hash = "1a0gaj9p6gbn5j7c258mnzr7yjlq0hqi3aqqgyj1g2dbk1sxdbjz"; + minimumOCamlVersion = "4.04.2"; + meta.description = "Syntax extension for writing in-line tests in ocaml code"; + propagatedBuildInputs = [ ppxlib time_now ]; + doCheck = false; # test build rules broken + }; + + ppx_jane = janePackage { + pname = "ppx_jane"; + hash = "1p6847gdfnnj6qpa4yh57s6wwpsl7rfgy0q7993chz24h9mhz5lk"; + minimumOCamlVersion = "4.04.2"; + meta.description = "Standard Jane Street ppx rewriters"; + propagatedBuildInputs = [ base_quickcheck ppx_bin_prot ppx_disable_unused_warnings ppx_expect ppx_fixed_literal ppx_ignore_instrumentation ppx_log ppx_module_timer ppx_optcomp ppx_optional ppx_pipebang ppx_stable ppx_string ppx_typerep_conv ppx_variants_conv ]; + }; + + ppx_js_style = janePackage { + pname = "ppx_js_style"; + hash = "0q2p9pvmlncgv0hprph95xiv7s6q44ynvp4yl4dckf1qx68rb3ba"; + minimumOCamlVersion = "4.04.2"; + meta.description = "Code style checker for Jane Street Packages"; + propagatedBuildInputs = [ octavius ppxlib ]; + }; + + ppx_let = janePackage { + pname = "ppx_let"; + hash = "04v3fq0vnvvavxbc7hfsrg8732pwxbyw8pjl3xfplqdqci6fj15n"; + minimumOCamlVersion = "4.04.2"; + meta.description = "Monadic let-bindings"; + propagatedBuildInputs = [ ppxlib ppx_here ]; + }; + + ppx_log = janePackage { + pname = "ppx_log"; + hash = "08i9gz3f4w3bmlrfdw7ja9awsfkhhldz03bnnc4hijfmn8sawzi0"; + minimumOCamlVersion = "4.08.0"; + meta.description = "Ppx_sexp_message-like extension nodes for lazily rendering log messages"; + propagatedBuildInputs = [ base ppx_here ppx_sexp_conv ppx_sexp_message sexplib ]; + }; + + ppx_module_timer = janePackage { + pname = "ppx_module_timer"; + hash = "0lzi5hxi10p89ddqbrc667267f888kqslal76gfhmszyk60n20av"; + minimumOCamlVersion = "4.04.2"; + meta.description = "Ppx rewriter that records top-level module startup times"; + propagatedBuildInputs = [ time_now ]; + }; + + ppx_optcomp = janePackage { + pname = "ppx_optcomp"; + hash = "0ypivfipi8fcr9pqyvl2ajpcivmr1irdwwv248i4x6mggpc2pl0b"; + minimumOCamlVersion = "4.04.2"; + meta.description = "Optional compilation for OCaml"; + propagatedBuildInputs = [ ppxlib ]; + }; + + ppx_optional = janePackage { + pname = "ppx_optional"; + hash = "0amxwxhkyzamgnxx400qhvxzqr3m4sazhhkc516lm007pynv7xq2"; + minimumOCamlVersion = "4.04.2"; + meta.description = "Pattern matching on flat options"; + propagatedBuildInputs = [ ppxlib ]; + }; + + ppx_pattern_bind = janePackage { + pname = "ppx_pattern_bind"; + hash = "01nfdk9yvk92r7sjl4ngxfsx8fyqh2dsjxz0i299nszv9jc4rn4f"; + minimumOCamlVersion = "4.07"; + meta.description = "A ppx for writing fast incremental bind nodes in a pattern match"; + propagatedBuildInputs = [ ppx_let ]; + }; + + ppx_pipebang = janePackage { + pname = "ppx_pipebang"; + hash = "0sm5dghyalhws3hy1cc2ih36az1k4q02hcgj6l26gwyma3y4irvq"; + minimumOCamlVersion = "4.04.2"; + meta.description = "A ppx rewriter that inlines reverse application operators `|>` and `|!`"; + propagatedBuildInputs = [ ppxlib ]; + }; + + ppx_python = janePackage { + pname = "ppx_python"; + hash = "1d2wf0rkvxg07q6xq2zmxh6hmvnwlsmny3mm92jsg1s7bdl39gap"; + meta.description = "A [@@deriving] plugin to generate Python conversion functions "; + propagatedBuildInputs = [ ppx_base ppxlib pyml ]; + }; + + ppx_sexp_conv = janePackage { + pname = "ppx_sexp_conv"; + minimumOCamlVersion = "4.04.2"; + hash = "1fyf7hgxprn7pj58rmmrfpv938a0avpzvvk6wzihpmfm6whgbdm8"; + meta.description = "[@@deriving] plugin to generate S-expression conversion functions"; + propagatedBuildInputs = [ ppxlib sexplib0 base ]; + }; + + ppx_sexp_message = janePackage { + pname = "ppx_sexp_message"; + hash = "0a7hx50bkkc5n5msc3zzc4ixnp7674x3mallknb9j31jnd8l90nj"; + minimumOCamlVersion = "4.04.2"; + meta.description = "A ppx rewriter for easy construction of s-expressions"; + propagatedBuildInputs = [ ppx_here ppx_sexp_conv ]; + }; + + ppx_sexp_value = janePackage { + pname = "ppx_sexp_value"; + hash = "0kz83j9v6yz3v8c6vr9ilhkcci4hhjd6i6r6afnx72jh6i7d3hnv"; + minimumOCamlVersion = "4.04.2"; + meta.description = "A ppx rewriter that simplifies building s-expressions from ocaml values"; + propagatedBuildInputs = [ ppx_here ppx_sexp_conv ]; + }; + + ppx_stable = janePackage { + pname = "ppx_stable"; + hash = "1as0v0x8c9ilyhngax55lvwyyi4a2wshyan668v0f2s1608cwb1l"; + minimumOCamlVersion = "4.04.2"; + meta.description = "Stable types conversions generator"; + propagatedBuildInputs = [ ppxlib ]; + }; + + ppx_string = janePackage { + pname = "ppx_string"; + minimumOCamlVersion = "4.04.2"; + hash = "1dp5frk6cig5m3m5rrh2alw63snyf845x7zlkkaljip02pqcbw1s"; + meta.description = "Ppx extension for string interpolation"; + propagatedBuildInputs = [ ppx_base ppxlib stdio ]; + }; + + ppx_typed_fields = janePackage { + pname = "ppx_typed_fields"; + hash = "0hxililjgy4jh66b4xmphrfhv6qpp7dz7xbz3islp357hf18niqy"; + meta.description = "GADT-based field accessors and utilities"; + propagatedBuildInputs = [ core ppx_jane ppxlib ]; + }; + + ppx_typerep_conv = janePackage { + pname = "ppx_typerep_conv"; + minimumOCamlVersion = "4.04.2"; + hash = "1q1lzykpm83ra4l5jh4rfddhd3c96kx4s4rvx0w4b51z1qk56zam"; + meta.description = "Generation of runtime types from type declarations"; + propagatedBuildInputs = [ ppxlib typerep ]; + }; + + ppx_variants_conv = janePackage { + pname = "ppx_variants_conv"; + minimumOCamlVersion = "4.04.2"; + hash = "1dh0bw9dn246k00pymf59yjkl6x6bxd76lkk9b5xpq2692wwlc3s"; + meta.description = "Generation of accessor and iteration functions for ocaml variant types"; + propagatedBuildInputs = [ variantslib ppxlib ]; + }; + + profunctor = janePackage { + pname = "profunctor"; + hash = "151vk0cagjwn0isnnwryn6gmvnpds4dyj1in9jvv5is8yij203gg"; + meta.description = "A library providing a signature for simple profunctors and traversal of a record"; + propagatedBuildInputs = [ base ppx_jane record_builder ]; + }; + + protocol_version_header = janePackage { + pname = "protocol_version_header"; + hash = "0s638cwf1357gg754rc4306654hhrhzqaqm2lp3yv5vj3ml8p4qy"; + meta.description = "Protocol versioning"; + propagatedBuildInputs = [ core_kernel ]; + }; + + pythonlib = janePackage { + pname = "pythonlib"; + hash = "0p88vmp19zmr0r58dz6sawsmbn4yi2vyymad2c82kp93kg66nm1v"; + meta.description = "A library to help writing wrappers around ocaml code for python"; + patches = lib.optional (lib.versionAtLeast ocaml.version "4.13") ./pythonlib.patch; + propagatedBuildInputs = [ ppx_expect ppx_let ppx_python stdio typerep ]; + }; + + re2 = janePackage { + pname = "re2"; + hash = "0z1cajd8abrryf3gz322jpynba79nv4a2kmmcdz0314ran5w68v3"; + meta.description = "OCaml bindings for RE2, Google's regular expression library"; + propagatedBuildInputs = [ core_kernel ]; + prePatch = '' + substituteInPlace src/re2_c/dune --replace 'CXX=g++' 'CXX=c++' + substituteInPlace src/dune --replace '(cxx_flags (:standard \ -pedantic) (-I re2_c/libre2))' '(cxx_flags (:standard \ -pedantic) (-I re2_c/libre2) (-x c++))' + ''; + }; + + re2_stable = janePackage { + pname = "re2_stable"; + version = "0.14.0"; + hash = "0kjc0ff6b3509s3b9n4q8ilb06d5fngdh3z58cm95vg7zkcas9w3"; + meta.description = "Re2_stable adds an incomplete but stable serialization of Re2"; + propagatedBuildInputs = [ core re2 ]; + }; + + record_builder = janePackage { + pname = "record_builder"; + hash = "004nqcmwll0vy47mb3d3jlk21cc6adcjy62dkv2k966n9jkh472h"; + meta.description = "A library which provides traversal of records with an applicative"; + propagatedBuildInputs = [ base ppx_jane ]; + }; + + resource_cache = janePackage { + pname = "resource_cache"; + hash = "13wzx8ixgbb7jj5yrps890irw2wvkchnihsn7rfrcvnvrjzzjshm"; + meta.description = "General resource cache"; + propagatedBuildInputs = [ async_rpc_kernel ]; + }; + + sexp = janePackage { + pname = "sexp"; + hash = "00xlsymm1mpgs8cqkb6c36vh5hfw0saghvwiqh7jry65qc5nvv9z"; + propagatedBuildInputs = [ + async + core + csvfields + jsonaf + re2 + sexp_diff + sexp_macro + sexp_pretty + sexp_select + ]; + meta.description = "S-expression swiss knife"; + }; + + sexp_diff = janePackage { + pname = "sexp_diff"; + hash = "1p5xwhj634ij4a0m5k6a3abddi5315y7is1a6ha1lifdz3v985ll"; + propagatedBuildInputs = [ core_kernel ]; + meta.description = "Code for computing the diff of two sexps"; + }; + + sexp_macro = janePackage { + pname = "sexp_macro"; + hash = "1l5dsv9gawmf5dg3rf8sxphp9qs3n4n038nlmf9rxzypzyn112k8"; + propagatedBuildInputs = [ async sexplib ]; + meta.description = "Sexp macros"; + }; + + sexp_pretty = janePackage { + pname = "sexp_pretty"; + hash = "1p1jspwjvrhm8li22xl0n8wngs12d9g7nc1svk6xc32jralnxblg"; + minimumOCamlVersion = "4.07"; + meta.description = "S-expression pretty-printer"; + propagatedBuildInputs = [ ppx_base re sexplib ]; + }; + + sexp_select = janePackage { + pname = "sexp_select"; + hash = "0mmvga9w3gbb2gd1h4l8f1c3l2lrpn1zld2a8xgqyfqfff3vg31p"; + minimumOCamlVersion = "4.07"; + propagatedBuildInputs = [ base ppx_jane ]; + meta.description = "A library to use CSS-style selectors to traverse sexp trees"; + }; + + sexplib0 = janePackage { + pname = "sexplib0"; + hash = "0jag0bz2173b0n7hx013fhghydhh92arqjlrcnf5x025bw8nz66v"; + minimumOCamlVersion = "4.04.2"; + meta.description = "Library containing the definition of S-expressions and some base converters"; + }; + + sexplib = janePackage { + pname = "sexplib"; + hash = "05h34fm3p0179xivc14bixc50pzc8zws46l5gsq310kpm37srq3c"; + minimumOCamlVersion = "4.04.2"; + meta.description = "Library for serializing OCaml values to and from S-expressions"; + propagatedBuildInputs = [ num parsexp ]; + }; + + shell = janePackage { + pname = "shell"; + hash = "1vzdif7w9y1kw2qynlfixwphdgiflrf43j0fzinjp9f56vlhghhy"; + meta.description = "Yet another implementation of fork&exec and related functionality"; + buildInputs = [ jst-config ]; + propagatedBuildInputs = [ textutils ]; + checkInputs = [ ounit ]; + # This currently fails with dune + strictDeps = false; + }; + + shexp = janePackage { + pname = "shexp"; + hash = "05iswnhi92f4yvrh76j3254bvls6fbrdb56mv6vc6mi5f8z4l79i"; + minimumOCamlVersion = "4.07"; + propagatedBuildInputs = [ posixat spawn ]; + meta.description = "Process library and s-expression based shell"; + }; + + spawn = janePackage { + pname = "spawn"; + minimumOCamlVersion = "4.02.3"; + hash = "1fjr91psas5zmk1hxvxh0dchhn0pkyzlr4gg232f5g9vdgissi0p"; + meta.description = "Spawning sub-processes"; + buildInputs = [ ppx_expect ]; + }; + + splay_tree = janePackage { + pname = "splay_tree"; + hash = "1jxfh7f2hjrms5pm2cy1cf6ivphgiqqvyyr9hdcz8d3vi612p4dm"; + meta.description = "A splay tree implementation"; + propagatedBuildInputs = [ core_kernel ]; + }; + + splittable_random = janePackage { + pname = "splittable_random"; + hash = "0ap5z4z1aagz4z02q9642cbl25jzws9lbc2x5xkpyjlc0qcm9v3m"; + meta.description = "PRNG that can be split into independent streams"; + propagatedBuildInputs = [ base ppx_assert ppx_bench ppx_sexp_message ]; + }; + + stdio = janePackage { + pname = "stdio"; + hash = "0g00b00kpjcadikq2asng35w7kvd24q9ldkiylwmn3gv3lrbipa8"; + minimumOCamlVersion = "4.04.2"; + meta.description = "Standard IO library for OCaml"; + propagatedBuildInputs = [ base ]; + }; + + textutils = janePackage { + pname = "textutils"; + hash = "1wass49h645wql9b7nck2iqlkf4648dkxvlvxixr7z80zcnb5rxr"; + meta.description = "Text output utilities"; + propagatedBuildInputs = [ core_unix textutils_kernel ]; + }; + + textutils_kernel = janePackage { + pname = "textutils_kernel"; + hash = "068g11d98wsb5a6ds0p5xybdmx5nx9bxa0k11dmh3l57kn4c169x"; + meta.description = "Text output utilities"; + propagatedBuildInputs = [ core ppx_jane uutf ]; + }; + + time_now = janePackage { + pname = "time_now"; + hash = "1pa0hyh470j9jylii4983qagb6hq2dz6s0q2fnrcph9qbw83bc0c"; + minimumOCamlVersion = "4.04.2"; + meta.description = "Reports the current time"; + buildInputs = [ jst-config ppx_optcomp ]; + propagatedBuildInputs = [ jane-street-headers base ppx_base ]; + }; + + timezone = janePackage { + pname = "timezone"; + hash = "00a007aji5rbz42kgbq1w90py6fm9k9akycs5abkcfll5rd0cbhx"; + meta.description = "Time-zone handling"; + propagatedBuildInputs = [ core_kernel ]; + }; + + topological_sort = janePackage { + pname = "topological_sort"; + hash = "0iqhp8n6g5n1ng80brjpav54229lykm2c1fc104s58lk3rqfvj9v"; + meta.description = "Topological sort algorithm"; + propagatedBuildInputs = [ ppx_jane stdio ]; + }; + + typerep = janePackage { + pname = "typerep"; + hash = "1qxfi01qim0hrgd6d0bgvpxg36i99mmm8cw4wqpr9kxyqvgzv26z"; + minimumOCamlVersion = "4.04.2"; + meta.description = "Typerep is a library for runtime types"; + propagatedBuildInputs = [ base ]; + }; + + variantslib = janePackage { + pname = "variantslib"; + hash = "033ns8ph6bd8g5cdfryjfcnrnzkdshppjyw5kl7cvszjfrz33ij7"; + minimumOCamlVersion = "4.04.2"; + meta.description = "Part of Jane Street's Core library"; + propagatedBuildInputs = [ base ]; + }; + + vcaml = janePackage { + pname = "vcaml"; + hash = "12fd29x9dgf4f14xrx7z4y1bm1wbfynrs3jismjbiqnckfpbqrib"; + meta.description = "OCaml bindings for the Neovim API"; + propagatedBuildInputs = [ angstrom-async async_extra expect_test_helpers_async faraday ]; + }; + + virtual_dom = janePackage { + pname = "virtual_dom"; + hash = "15xia9v4ighzm0gv3vbqk9nvg47cvzqmfnl2zr67yxv4b98kyzv3"; + meta.description = "OCaml bindings for the virtual-dom library"; + buildInputs = [ js_of_ocaml-ppx ]; + propagatedBuildInputs = [ core_kernel gen_js_api js_of_ocaml lambdasoup tyxml ]; + }; + + zarith_stubs_js = janePackage { + pname = "zarith_stubs_js"; + hash = "119xgr3kla9q1bvs4a5z2ivbmsrz4db3a9z0gf77ryqg4i22ywvl"; + minimumOCamlVersion = "4.04.2"; + meta.description = "Javascripts stubs for the Zarith library"; + }; + + zstandard = janePackage { + pname = "zstandard"; + hash = "1blkv35g5q1drkc6zmc4m027gjz6vfdadra1kw1xkp1wlc2l4v3k"; + meta.description = "OCaml bindings to Zstandard"; + buildInputs = [ ppx_jane ]; + propagatedBuildInputs = [ core_kernel ctypes zstd ]; + }; + +} diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/janestreet/bonsai_jsoo_4_0.patch b/third_party/nixpkgs/pkgs/development/ocaml-modules/janestreet/bonsai_jsoo_4_0.patch new file mode 100644 index 0000000000..e658ba05ca --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/janestreet/bonsai_jsoo_4_0.patch @@ -0,0 +1,13 @@ +diff --git a/web_ui/element_size_hooks/visibility_tracker.ml b/web_ui/element_size_hooks/visibility_tracker.ml +index 2e5dbe0..61df433 100644 +--- a/web_ui/element_size_hooks/visibility_tracker.ml ++++ b/web_ui/element_size_hooks/visibility_tracker.ml +@@ -23,8 +23,6 @@ let get_conservative_vis_bounds (element : Dom_html.element Js.t) : Bounds.t opt + and client_height = client_bounds##.height + and window_height = Dom_html.window##.innerHeight + and window_width = Dom_html.window##.innerWidth in +- let%bind.Option window_height = Js.Optdef.to_option window_height in +- let%bind.Option window_width = Js.Optdef.to_option window_width in + let window_height = Float.of_int window_height + and window_width = Float.of_int window_width + and client_width = Js.Optdef.get client_width (Fn.const 0.0) diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/janestreet/janePackage_0_15.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/janestreet/janePackage_0_15.nix new file mode 100644 index 0000000000..6785990899 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/janestreet/janePackage_0_15.nix @@ -0,0 +1,31 @@ +{ lib, fetchFromGitHub, buildDunePackage, defaultVersion ? "0.15.0" }: + +{ pname +, version ? defaultVersion +, hash +, minimumOCamlVersion ? "4.11" +, doCheck ? true +, buildInputs ? [] +, strictDeps ? true +, ...}@args: + +buildDunePackage (args // { + useDune2 = true; + inherit version buildInputs strictDeps; + + inherit minimumOCamlVersion; + + src = fetchFromGitHub { + owner = "janestreet"; + repo = pname; + rev = "v${version}"; + sha256 = hash; + }; + + inherit doCheck; + + meta = { + license = lib.licenses.mit; + homepage = "https://github.com/janestreet/${pname}"; + } // args.meta; +}) diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/janestreet/pythonlib.patch b/third_party/nixpkgs/pkgs/development/ocaml-modules/janestreet/pythonlib.patch new file mode 100644 index 0000000000..71a32fd023 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/janestreet/pythonlib.patch @@ -0,0 +1,22 @@ +diff --git a/src/type.ml b/src/type.ml +index 8a9e648..3f3b0e9 100644 +--- a/src/type.ml ++++ b/src/type.ml +@@ -31,12 +31,12 @@ let of_type_desc type_desc ~env = + | Tunivar _ -> Or_error.error_string "not handled: Tunivar" + | Tvariant _ -> Or_error.error_string "not handled: Tvariant" + | Tnil -> Or_error.error_string "not handled: Tnil" +- | Tobject (_, _) -> Or_error.error_string "not handled: Tobject" +- | Tfield (_, _, _, _) -> Or_error.error_string "not handled: Tfield" +- | Tpackage (_, _, _) -> Or_error.error_string "not handled: Tpackage" +- | Tpoly (_, _) -> Or_error.error_string "not handled: Tpoly" ++ | Tobject _ -> Or_error.error_string "not handled: Tobject" ++ | Tfield _ -> Or_error.error_string "not handled: Tfield" ++ | Tpackage _ -> Or_error.error_string "not handled: Tpackage" ++ | Tpoly _ -> Or_error.error_string "not handled: Tpoly" + | Tlink e -> walk e.desc +- | Tsubst e -> walk e.desc ++ | Tsubst (e, _) -> walk e.desc + | Ttuple es -> + let%bind tuple = List.map es ~f:(fun e -> walk e.desc) |> Or_error.all in + (match tuple with diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/ocaml-lsp/jsonrpc.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/ocaml-lsp/jsonrpc.nix index 2e6802a504..4e79e0310a 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/ocaml-lsp/jsonrpc.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/ocaml-lsp/jsonrpc.nix @@ -12,17 +12,21 @@ let params = if lib.versionAtLeast ocaml.version "4.14" then { - version = "1.11.3"; - sha256 = "sha256-KlMFh05O04I0Xil2B+nL2hUxZw0jaDMUnI23oUwGyhs="; + name = "lsp"; + version = "1.12.4"; + sha256 = "sha256-kZuYAny8VjWdq+ipEdPSTRcGzqjNBOgXOi0dOwb52EY="; } else if lib.versionAtLeast ocaml.version "4.13" then { + name = "jsonrpc"; version = "1.10.5"; sha256 = "sha256-TeJS6t1ruWhWPvWNatrnSUWI6T17XKiosHLYizBDDcw="; } else if lib.versionAtLeast ocaml.version "4.12" then { + name = "jsonrpc"; version = "1.9.0"; sha256 = "sha256:1ac44n6g3rf84gvhcca545avgf9vpkwkkkm0s8ipshfhp4g4jikh"; } else { + name = "jsonrpc"; version = "1.4.1"; sha256 = "1ssyazc0yrdng98cypwa9m3nzfisdzpp7hqnx684rqj8f0g3gs6f"; } @@ -32,7 +36,7 @@ buildDunePackage rec { pname = "jsonrpc"; inherit (params) version; src = fetchurl { - url = "https://github.com/ocaml/ocaml-lsp/releases/download/${version}/jsonrpc-${version}.tbz"; + url = "https://github.com/ocaml/ocaml-lsp/releases/download/${version}/${params.name}-${version}.tbz"; inherit (params) sha256; }; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/ocaml-lsp/lsp.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/ocaml-lsp/lsp.nix index faa1495190..3111d4277c 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/ocaml-lsp/lsp.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/ocaml-lsp/lsp.nix @@ -13,6 +13,7 @@ , dyn , re , stdune +, chrome-trace , dune_3 , csexp , pp @@ -40,7 +41,22 @@ buildDunePackage rec { ''; buildInputs = - if lib.versionAtLeast version "1.10.0" then + if lib.versionAtLeast version "1.12.0" then + [ + pp + re + ppx_yojson_conv_lib + octavius + dune-build-info + dune-rpc + omd + cmdliner + ocamlformat-rpc-lib + dyn + stdune + chrome-trace + ] + else if lib.versionAtLeast version "1.10.0" then [ pp re diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/phylogenetics/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/phylogenetics/default.nix index 11da66bd76..1cf9651e6e 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/phylogenetics/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/phylogenetics/default.nix @@ -1,6 +1,6 @@ { lib , buildDunePackage -, fetchurl +, fetchFromGitHub , ppx_deriving , bppsuite , alcotest @@ -16,18 +16,15 @@ buildDunePackage rec { pname = "phylogenetics"; - version = "0.1.0"; + version = "unstable-2022-05-06"; - src = fetchurl { - url = "https://github.com/biocaml/phylogenetics/releases/download/v${version}/${pname}-${version}.tbz"; - sha256 = "sha256:064ldljzh17h8pp0c27xd1pf6c50yhccw2g3hddzhk07a95q8v16"; + src = fetchFromGitHub { + owner = "biocaml"; + repo = pname; + rev = "cd7c624d0f98e31b02933ca4511b9809b26d35b5"; + sha256 = "sha256:0w0xyah3hj05hxg1rsa40hhma3dm1cyq0zvnjrihhf22laxap7ga"; }; - # Ensure compatibility with printbox ≥ 0.6 - preConfigure = '' - substituteInPlace lib/dune --replace printbox printbox-text - ''; - minimalOCamlVersion = "4.08"; checkInputs = [ alcotest bppsuite ]; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/tls/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/tls/default.nix index 81f0a176bf..3f45aa9196 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/tls/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/tls/default.nix @@ -6,11 +6,11 @@ buildDunePackage rec { pname = "tls"; - version = "0.15.2"; + version = "0.15.3"; src = fetchurl { - url = "https://github.com/mirleft/ocaml-tls/releases/download/v${version}/tls-v${version}.tbz"; - sha256 = "b76371757249bbeabb12c333de4ea2a09c095767bdbbc83322538c0da1fc1e36"; + url = "https://github.com/mirleft/ocaml-tls/releases/download/v${version}/tls-${version}.tbz"; + sha256 = "0nj6fhgrirn8ky4hb24m3ilhr41ynzgk6bqmjs17g8rdibwmdd2x"; }; minimumOCamlVersion = "4.08"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/Fabric/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/Fabric/default.nix index f39b2e1418..bafaee5d02 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/Fabric/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/Fabric/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "fabric"; - version = "2.7.0"; + version = "2.7.1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-C/eXpoxLOJcg3E3WGBSXpYxB7XYuKD2ePBsBSLMqmv8="; + sha256 = "sha256-dvj+9ZzyBh29hJu85P5JvdggiEOFAEsMpZE2rD2xKeQ="; }; # only relevant to python < 3.4 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 3758e000b1..c5d1d1b9e8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/adafruit-platformdetect/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/adafruit-platformdetect/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "adafruit-platformdetect"; - version = "3.24.1"; + version = "3.25.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "Adafruit-PlatformDetect"; inherit version; - hash = "sha256-srM5VX0QXZMLmYmqKttcB8W8oMlGz64e6dQh04OQq8Q="; + hash = "sha256-8K8OKHxuPG5bibb49Epgv9lMuZ7Ipk9753sI22e6j24="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aioaladdinconnect/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aioaladdinconnect/default.nix index 6e42c4ba01..52680d0963 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aioaladdinconnect/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aioaladdinconnect/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "aioaladdinconnect"; - version = "0.1.23"; + version = "0.1.25"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -15,7 +15,7 @@ buildPythonPackage rec { src = fetchPypi { pname = "AIOAladdinConnect"; inherit version; - hash = "sha256-H5deAXFQR2AwTLqLeE2fRrx2Btz6Tsb+EDkFMc8qJIc="; + hash = "sha256-ruuiRhPPqsZxJgaKVtwQK8Zf7gG9r2NYnrBCosTtL/M="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aioftp/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aioftp/default.nix index 77b1d34b6a..da0e8021d5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aioftp/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aioftp/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "aioftp"; - version = "0.21.2"; + version = "0.21.3"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-JWzeBdCPXLYMmKkvCqQQF/mHoRbdRvj0vKVF4+D8LSI="; + sha256 = "sha256-xtrlCzqgfwlbLZOoN9Y23ZPyNaqv5Ure+Cvg+OVWf9I="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ansible-compat/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ansible-compat/default.nix index a0e5c50e0a..8ecac450b1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ansible-compat/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ansible-compat/default.nix @@ -12,12 +12,12 @@ buildPythonPackage rec { pname = "ansible-compat"; - version = "2.1.0"; + version = "2.2.0"; format = "pyproject"; src = fetchPypi { inherit pname version; - sha256 = "sha256-Yrrhu1wgZj1e4b/sBPBzwIvnIQQK+e9b3ceQTmZ40YQ="; + sha256 = "sha256-Z2247ARJ0fBwOGJbjruM7vX4rToa8+6C1O1mubBMtvo="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ansible/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ansible/default.nix index 69d80afb87..0a8ae13204 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ansible/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ansible/default.nix @@ -20,7 +20,7 @@ let pname = "ansible"; - version = "6.0.0"; + version = "6.1.0"; in buildPythonPackage { inherit pname version; @@ -30,7 +30,7 @@ buildPythonPackage { src = fetchPypi { inherit pname version; - sha256 = "sha256-ZBosJ7xXaPmorRSIDx9uVxwfKvHUXnbycdduP3R1TFM="; + sha256 = "sha256-keSyOUXxkKqhI8a6T4rMuOf4kFmRvTuxm4mvvcpFaCI="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/apache-beam/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/apache-beam/default.nix index e3545ee0e6..17e5389a5b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/apache-beam/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/apache-beam/default.nix @@ -5,7 +5,6 @@ , dill , fastavro , fetchFromGitHub -, fetchpatch , freezegun , grpcio , grpcio-tools @@ -38,35 +37,25 @@ , sqlalchemy , tenacity , typing-extensions +, scikit-learn }: buildPythonPackage rec { pname = "apache-beam"; - version = "2.37.0"; - disabled = pythonAtLeast "3.10"; + version = "2.40.0"; src = fetchFromGitHub { owner = "apache"; repo = "beam"; rev = "v${version}"; - sha256 = "sha256-FmfTxRLqXUHhhAZIxCRx2+phX0bmU5rIHaftBU4yBJY="; + sha256 = "sha256-0S7Dj6PMSbZkEAY6ZLUpKVfe/tFxsq60TTAFj0Qhtv0="; }; - patches = [ - # patch in the pyarrow.Table.to_batches(max_chunksize=...) argument fix - (fetchpatch { - url = "https://github.com/apache/beam/commit/2418a14ee99ff490d1c82944043f97f37ec97a85.patch"; - sha256 = "sha256-G8ARBBf7nmF46P2ncnlteGFnPWq5iCqZDfuaosre9jY="; - stripLen = 2; - }) - ]; - # See https://github.com/NixOS/nixpkgs/issues/156957. postPatch = '' substituteInPlace setup.py \ --replace "dill>=0.3.1.1,<0.3.2" "dill" \ - --replace "httplib2>=0.8,<0.20.0" "httplib2" \ - --replace "pyarrow>=0.15.1,<7.0.0" "pyarrow" + --replace "pyarrow>=0.15.1,<8.0.0" "pyarrow" ''; sourceRoot = "source/sdks/python"; @@ -115,6 +104,7 @@ buildPythonPackage rec { pytestCheckHook pyyaml requests-mock + scikit-learn sqlalchemy tenacity ]; @@ -150,6 +140,21 @@ buildPythonPackage rec { # different runners - I don't expect them to help debugging these # when running via our (= custom from their PoV) testing infra. "test_with_main_session" + # AssertionErrors + "test_unified_repr" + "testDictComprehension" + "testDictComprehensionSimple" + "testGenerator" + "testGeneratorComprehension" + "testListComprehension" + "testNoneReturn" + "testSet" + "testTupleListComprehension" + "test_newtype" + "test_pardo_type_inference" + "test_get_output_batch_type" + "test_pformat_namedtuple_with_unnamed_fields" + "test_row_coder_fail_early_bad_schema" ]; meta = with lib; { 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 b46152f3a0..7e1b8834cd 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.5.0"; + version = "2.6.0"; disabled = pythonOlder "3.7"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "andrivet"; repo = "python-asn1"; rev = "v${version}"; - sha256 = "sha256-5Fnk94aUkV9lHnd64wuHzGcPqW7AC0O0dEwXMBL+tuo="; + sha256 = "sha256-oz9xZhFU4himXttVtfW6tTn7lfB0c7MlgxtbKxdJtUA="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/awslambdaric/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/awslambdaric/default.nix index 9347665c28..bc6bbcd30d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/awslambdaric/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/awslambdaric/default.nix @@ -49,6 +49,11 @@ buildPythonPackage rec { checkInputs = [ pytestCheckHook ]; + disabledTests = [ + # Test fails with: Assertion error + "test_handle_event_request_fault_exception_logging_syntax_error" + ]; + pythonImportsCheck = [ "awslambdaric" "runtime_client" ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/bellows/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/bellows/default.nix index be8afd022a..f02dc42b5b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/bellows/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/bellows/default.nix @@ -54,6 +54,6 @@ buildPythonPackage rec { description = "Python module to implement EZSP for EmberZNet devices"; homepage = "https://github.com/zigpy/bellows"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ etu mvnetbiz ]; + maintainers = with maintainers; [ mvnetbiz ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/bsuite/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/bsuite/default.nix new file mode 100644 index 0000000000..c577e6142f --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/bsuite/default.nix @@ -0,0 +1,101 @@ +{ lib +, fetchPypi +, buildPythonPackage +, frozendict +, termcolor +, matplotlib +, gym +, pandas +, scipy +, absl-py +, dm-env +, plotnine +, scikitimage +, dm-tree +, patsy +, tensorflow-probability +, dm-haiku +, statsmodels +, mizani +, trfl +, optax +, pytestCheckHook +, dm-sonnet }: + +buildPythonPackage rec { + pname = "bsuite"; + version = "0.3.5"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-ak9McvXl7Nz5toUaPaRaJek9lurxiQiIW209GnZEjX0="; + }; + + buildInputs = [ + absl-py + dm-env + dm-tree + frozendict + gym + matplotlib + mizani + pandas + patsy + plotnine + scikitimage + scipy + statsmodels + termcolor + ]; + + checkInputs = [ + dm-haiku + dm-sonnet + optax + pytestCheckHook + tensorflow-probability + trfl + ]; + + pythonImportsCheck = [ + "bsuite" + ]; + + disabledTestPaths = [ + # Disabled because tests require module rlax but this results in infinite + # recursion error + "bsuite/baselines/jax/actor_critic/run_test.py" + "bsuite/baselines/jax/actor_critic_rnn/run_test.py" + "bsuite/baselines/jax/boot_dqn/run_test.py" + "bsuite/baselines/jax/dqn/run_test.py" + ]; + + disabledTests = [ + # Tests require network connection + "test_run9" + "test_longer_action_sequence" + "test_reset" + "test_step_after_reset" + "test_step_on_fresh_environment" + "test_longer_action_sequence" + "test_reset" + "test_step_after_reset" + "test_step_on_fresh_environment" + "test_longer_action_sequence" + "test_reset" + "test_step_after_reset" + "test_step_on_fresh_environment" + "test_logger" + "test_episode_truncation" + ]; + + meta = with lib; { + description = '' + Core RL Behaviour Suite. A collection of reinforcement learning + experiments + ''; + homepage = "https://github.com/deepmind/bsuite"; + license = licenses.asl20; + maintainers = with maintainers; [ onny ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/celery-redbeat/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/celery-redbeat/default.nix new file mode 100644 index 0000000000..a1be0b9582 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/celery-redbeat/default.nix @@ -0,0 +1,46 @@ +{ stdenv +, lib +, buildPythonPackage +, fetchFromGitHub +, python-dateutil +, celery +, redis +, tenacity +, pytestCheckHook +, fakeredis +, mock +}: + +buildPythonPackage rec { + pname = "celery-redbeat"; + version = "2.0.0"; + + src = fetchFromGitHub { + owner = "sibson"; + repo = "redbeat"; + rev = "v${version}"; + hash = "sha256-pu4umhfNFZ30bQu5PcT2LYN4WGzFj4p4/qHm3pVIV+c="; + }; + + propagatedBuildInputs = [ + python-dateutil + celery + redis + tenacity + ]; + + checkInputs = [ + pytestCheckHook + fakeredis + mock + ]; + + pythonImportsCheck = [ "redbeat" ]; + + meta = with lib; { + description = "Database-backed Periodic Tasks"; + homepage = "https://github.com/celery/django-celery-beat"; + license = licenses.bsd3; + maintainers = with maintainers; [ onny ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/crccheck/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/crccheck/default.nix index 891e67f644..a75a0c9611 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/crccheck/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/crccheck/default.nix @@ -20,7 +20,7 @@ in buildPythonPackage { description = "Python library for CRCs and checksums"; homepage = "https://sourceforge.net/projects/crccheck/"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ etu ]; + maintainers = with maintainers; [ ]; platforms = platforms.linux; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dalle-mini/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dalle-mini/default.nix index e6612a3cd2..1cafda7087 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dalle-mini/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dalle-mini/default.nix @@ -15,11 +15,11 @@ buildPythonPackage rec { pname = "dalle-mini"; - version = "0.1.0"; + version = "0.1.1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-Sbos44uWGnJLYMx/xy0wkyAJHlDhVIeOS7rnYt2W53w="; + sha256 = "sha256-/wGIuYSWEUgJmeRN5K9/xuoCs+hpFX4/Tu1un1C4ljk="; }; format = "setuptools"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dash/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dash/default.nix index f5387a0d53..3d1fb2621d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dash/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dash/default.nix @@ -21,7 +21,7 @@ buildPythonPackage rec { pname = "dash"; - version = "2.5.1"; + version = "2.6.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -30,7 +30,7 @@ buildPythonPackage rec { owner = "plotly"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-ptJ/rRAENiwcvnCM80gewUwW5Q77gD0b/NF534LpPfY="; + hash = "sha256-pZax5qkQ73SVhIKVR+q6xAm6hp+v7jSu6b9HBk5Rr8w="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/datauri/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/datauri/default.nix new file mode 100644 index 0000000000..da6ffe3bd2 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/datauri/default.nix @@ -0,0 +1,37 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "datauri"; + version = "1.1.0"; + + src = fetchFromGitHub { + owner = "fcurella"; + repo = "python-datauri"; + rev = "v${version}"; + sha256 = "sha256-Eevd/xxKgxvvsAfI/L/KShH+PfxffBGyVwKewLgyEu0="; + }; + + pythonImportsCheck = [ + "datauri" + ]; + + checkInputs = [ + pytestCheckHook + ]; + + disabledTestPaths = [ + # UnicodeDecodeError: 'utf-8' codec can't decode + "tests/test_file_ebcdic.txt" + ]; + + meta = with lib; { + description = "Data URI manipulation made easy."; + homepage = "https://github.com/fcurella/python-datauri"; + license = licenses.unlicense; + maintainers = with maintainers; [ yuu ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dicttoxml2/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dicttoxml2/default.nix new file mode 100644 index 0000000000..5f407d61b6 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/dicttoxml2/default.nix @@ -0,0 +1,32 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder +}: + +buildPythonPackage rec { + pname = "dicttoxml2"; + version = "2.0.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-8/Zbv8WxDP5Bn4hgd7hTstmYv7amTlTxhQoKvzYrG/I="; + }; + + # Module has no tests + doCheck = false; + + pythonImportsCheck = [ + "dicttoxml2" + ]; + + meta = with lib;{ + description = "Converts a Python dictionary or other native data type into a valid XML string"; + homepage = "https://pypi.org/project/dicttoxml2/"; + license = licenses.gpl2Only; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/distrax/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/distrax/default.nix new file mode 100644 index 0000000000..be277f97ba --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/distrax/default.nix @@ -0,0 +1,57 @@ +{ lib +, fetchPypi +, buildPythonPackage +, numpy +, tensorflow-probability +, chex +, dm-haiku +, pytestCheckHook +, jaxlib }: + +buildPythonPackage rec { + pname = "distrax"; + version = "0.1.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-b/+rxjdowNMuhUBhRCuN45z/iUbj1hN1qCSQqqAtZIw="; + }; + + buildInputs = [ + chex + jaxlib + numpy + tensorflow-probability + ]; + + checkInputs = [ + dm-haiku + pytestCheckHook + ]; + + pythonImportsCheck = [ + "distrax" + ]; + + disabledTestPaths = [ + # TypeErrors + "distrax/_src/bijectors/tfp_compatible_bijector_test.py" + "distrax/_src/distributions/distribution_from_tfp_test.py" + "distrax/_src/distributions/laplace_test.py" + "distrax/_src/distributions/multinomial_test.py" + "distrax/_src/distributions/mvn_diag_plus_low_rank_test.py" + "distrax/_src/distributions/mvn_kl_test.py" + "distrax/_src/distributions/straight_through_test.py" + "distrax/_src/distributions/tfp_compatible_distribution_test.py" + "distrax/_src/distributions/transformed_test.py" + "distrax/_src/distributions/uniform_test.py" + "distrax/_src/utils/transformations_test.py" + ]; + + meta = with lib; { + description = "Probability distributions in JAX"; + homepage = "https://github.com/deepmind/distrax"; + license = licenses.asl20; + maintainers = with maintainers; [ onny ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/django-celery-beat/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/django-celery-beat/default.nix new file mode 100644 index 0000000000..be1b627525 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/django-celery-beat/default.nix @@ -0,0 +1,51 @@ +{ lib +, fetchPypi +, buildPythonPackage +, python-crontab +, celery +, django-timezone-field +, tzdata +, ephem +, pytest-timeout +, pytest-django +, case +, pytestCheckHook }: + +buildPythonPackage rec { + pname = "django-celery-beat"; + version = "2.3.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-uiT4btlWug7itDI3pJMD6/Wqfg+wzLfgVCt+MaRj3Lo="; + }; + + propagatedBuildInputs = [ + python-crontab + celery + django-timezone-field + tzdata + ]; + + checkInputs = [ + ephem + pytest-timeout + pytest-django + case + pytestCheckHook + ]; + + disabledTestPaths = [ + # Connection error + "t/unit/test_schedulers.py" + ]; + + pythonImportsCheck = [ "django_celery_beat" ]; + + meta = with lib; { + description = "Celery Periodic Tasks backed by the Django ORM"; + homepage = "https://github.com/celery/django-celery-beat"; + license = licenses.bsd3; + maintainers = with maintainers; [ onny ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/django-celery-email/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/django-celery-email/default.nix new file mode 100644 index 0000000000..950fb4f75e --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/django-celery-email/default.nix @@ -0,0 +1,47 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, django +, django-appconf +, celery +, pytest-django +, pytestCheckHook +, python }: + +buildPythonPackage rec { + pname = "django-celery-email"; + version = "3.0.0"; + + src = fetchFromGitHub { + owner = "pmclanahan"; + repo = pname; + rev = version; + sha256 = "sha256-LBavz5Nh2ObmIwLCem8nHvsuKgPwkzbS/OzFPmSje/M="; + }; + + propagatedBuildInputs = [ + django + django-appconf + celery + ]; + + DJANGO_SETTINGS_MODULE = "tests.settings"; + + checkInputs = [ + pytest-django + pytestCheckHook + ]; + + checkPhase = '' + ${python.executable} runtests.py + ''; + + pythonImportsCheck = [ "djcelery_email" ]; + + meta = with lib; { + homepage = "https://github.com/pmclanahan/django-celery-email"; + description = "Django email backend that uses a celery task for sending the email"; + license = licenses.bsd3; + maintainers = with maintainers; [ onny ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/django-health-check/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/django-health-check/default.nix new file mode 100644 index 0000000000..6f38ae77e1 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/django-health-check/default.nix @@ -0,0 +1,61 @@ +{ lib +, fetchFromGitHub +, buildPythonPackage +, sphinx +, setuptools-scm +, django +, redis +, celery +, pytest-django +, pytestCheckHook +, mock +, gitMinimal }: + +buildPythonPackage rec { + pname = "django-health-check"; + version = "3.16.5"; + + src = fetchFromGitHub { + owner = "KristianOellegaard"; + repo = pname; + rev = version; + hash = "sha256-Jfzi+o4ja2sNCSPfX9eRq3WGid1gcfehhayAD1L4f2U="; + leaveDotGit = true; + }; + + buildInputs = [ + sphinx + django + ]; + + nativeBuildInputs = [ + setuptools-scm + gitMinimal + ]; + + checkInputs = [ + pytest-django + pytestCheckHook + mock + celery + redis + ]; + + postPatch = '' + # We don't want to generate coverage + substituteInPlace setup.cfg \ + --replace "pytest-runner" "" \ + --replace "--cov=health_check" "" \ + --replace "--cov-report=term" "" \ + --replace "--cov-report=xml" "" + ''; + + pythonImportsCheck = [ "health_check" ]; + + meta = with lib; { + description = "Pluggable app that runs a full check on the deployment"; + homepage = "https://github.com/KristianOellegaard/django-health-check"; + license = licenses.mit; + maintainers = with maintainers; [ onny ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/django-sampledatahelper/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/django-sampledatahelper/default.nix deleted file mode 100644 index 4ff2b7ba85..0000000000 --- a/third_party/nixpkgs/pkgs/development/python-modules/django-sampledatahelper/default.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ lib -, buildPythonPackage -, fetchFromGitHub -, versiontools -, django -, sampledata -, nose -, pillow -, six -}: - -buildPythonPackage rec { - pname = "django-sampledatahelper"; - version = "0.5"; - - # no tests on PyPI - src = fetchFromGitHub { - owner = "kaleidos"; - repo = "django-sampledatahelper"; - rev = "8576f352ec26a3650f4386a6e1285b723f6aec23"; # no tag - sha256 = "1fx3ql4b9791594zkary19n20x5ra1m1n3pjaya9di1qy64csac4"; - }; - - nativeBuildInputs = [ versiontools ]; - - propagatedBuildInputs = [ django sampledata ]; - - checkInputs = [ nose pillow six ]; - - checkPhase = '' - DJANGO_SETTINGS_MODULE=tests.settings NOSE_EXCLUDE=test_calling_command nosetests -v - ''; - - meta = { - description = "Helper class for generate sample data for django apps development"; - homepage = "https://github.com/kaleidos/django-sampledatahelper"; - license = lib.licenses.bsd3; - }; -} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/django-timezone-field/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/django-timezone-field/default.nix index 5d43afc779..f8f85adf0d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/django-timezone-field/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/django-timezone-field/default.nix @@ -13,15 +13,15 @@ buildPythonPackage rec { pname = "django-timezone-field"; - version = "4.2.3"; - format = "setuptools"; + version = "5.0"; disabled = pythonOlder "3.5"; + format = "pyproject"; src = fetchFromGitHub { owner = "mfogel"; repo = pname; rev = version; - sha256 = "sha256-purzXzPvnYNVsASsK6s9m4XieUL80FOjeSbUP4bpRj8="; + sha256 = "sha256-GXkvF/kAOU1JK0GDpUT1irCQlkxIWieYRqPd0fr2HXw="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dm-env/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dm-env/default.nix new file mode 100644 index 0000000000..92c234c215 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/dm-env/default.nix @@ -0,0 +1,38 @@ +{ lib +, fetchPypi +, buildPythonPackage +, dm-tree +, numpy +, absl-py +, nose }: + +buildPythonPackage rec { + pname = "dm-env"; + version = "1.5"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-Pv2ZsGUlY1mVB8QV1ItRiWyIvi8BwrYlCvi6tRVx41M="; + }; + + buildInputs = [ + absl-py + dm-tree + numpy + ]; + + checkInputs = [ + nose + ]; + + pythonImportsCheck = [ + "dm_env" + ]; + + meta = with lib; { + description = "Pure Python client for Apache Kafka"; + homepage = "https://github.com/dpkp/kafka-python"; + license = licenses.asl20; + maintainers = with maintainers; [ onny ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dm-haiku/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dm-haiku/default.nix index 2c4c24b936..87de983330 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dm-haiku/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dm-haiku/default.nix @@ -1,66 +1,49 @@ { buildPythonPackage -, chex -, cloudpickle -, dill -, dm-tree , fetchFromGitHub -, jaxlib -, jmp +, callPackage , lib -, pytest-xdist -, pytestCheckHook +, jmp , tabulate -, tensorflow +, jaxlib }: buildPythonPackage rec { pname = "dm-haiku"; - version = "0.0.6"; + version = "0.0.7"; src = fetchFromGitHub { owner = "deepmind"; repo = pname; rev = "v${version}"; - hash = "sha256-qvKMeGPiWXvvyV+GZdTWdsC6Wp08AmP8nDtWk7sZtqM="; + hash = "sha256-Qa3g3vOPZJt/wBjjuZHAcFUz/gwN/yvirV/8V9CnIko="; }; - propagatedBuildInputs = [ - jmp - tabulate + outputs = [ + "out" + "testsout" ]; - checkInputs = [ - chex - cloudpickle - dill - dm-tree + propagatedBuildInputs = [ jaxlib - pytest-xdist - pytestCheckHook - tensorflow + jmp + tabulate ]; pythonImportsCheck = [ "haiku" ]; - disabledTestPaths = [ - # These tests require `bsuite` which isn't packaged in `nixpkgs`. - "examples/impala_lite_test.py" - "examples/impala/actor_test.py" - "examples/impala/learner_test.py" - # This test breaks on multiple cases with TF-related errors, - # likely that's the reason the upstream uses TF-nightly for tests? - # `nixpkgs` doesn't have the corresponding TF version packaged. - "haiku/_src/integration/jax2tf_test.py" - # `TypeError: lax.conv_general_dilated requires arguments to have the same dtypes, got float32, float16`. - "haiku/_src/integration/numpy_inputs_test.py" - ]; + postInstall = '' + mkdir $testsout + cp -R examples $testsout/examples + ''; - disabledTests = [ - # See https://github.com/deepmind/dm-haiku/issues/366. - "test_jit_Recurrent" - ]; + # check in passthru.tests.pytest to escape infinite recursion with bsuite + doCheck = false; + + passthru.tests = { + pytest = callPackage ./tests.nix { }; + }; meta = with lib; { description = "Haiku is a simple neural network library for JAX developed by some of the authors of Sonnet."; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dm-haiku/tests.nix b/third_party/nixpkgs/pkgs/development/python-modules/dm-haiku/tests.nix new file mode 100644 index 0000000000..93a4f3cd47 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/dm-haiku/tests.nix @@ -0,0 +1,68 @@ +{ stdenv +, buildPythonPackage +, dm-haiku +, chex +, cloudpickle +, dill +, dm-tree +, jaxlib +, pytest-xdist +, pytestCheckHook +, tensorflow +, bsuite +, frozendict +, dm-env +, scikitimage +, rlax +, distrax +, tensorflow-probability +, optax }: + +buildPythonPackage rec { + pname = "dm-haiku-tests"; + inherit (dm-haiku) version; + + src = dm-haiku.testsout; + + dontBuild = true; + dontInstall = true; + + checkInputs = [ + bsuite + chex + cloudpickle + dill + distrax + dm-env + dm-haiku + dm-tree + frozendict + jaxlib + pytest-xdist + pytestCheckHook + optax + rlax + scikitimage + tensorflow + tensorflow-probability + ]; + + disabledTests = [ + # See https://github.com/deepmind/dm-haiku/issues/366. + "test_jit_Recurrent" + # Assertion errors + "test_connect_conv_padding_function_same0" + "test_connect_conv_padding_function_valid0" + "test_connect_conv_padding_function_same1" + "test_connect_conv_padding_function_same2" + "test_connect_conv_padding_function_valid1" + "test_connect_conv_padding_function_valid2" + "test_invalid_axis_ListString" + "test_invalid_axis_String" + "test_simple_case" + "test_simple_case_with_scale" + "test_slice_axis" + "test_zero_inputs" + ]; + +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dm-sonnet/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dm-sonnet/default.nix new file mode 100644 index 0000000000..f857eac850 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/dm-sonnet/default.nix @@ -0,0 +1,54 @@ +{ lib +, fetchFromGitHub +, buildPythonPackage +, numpy +, tabulate +, six +, dm-tree +, absl-py +, wrapt +, docutils +, tensorflow +, tensorflow-datasets }: + +buildPythonPackage rec { + pname = "dm-sonnet"; + version = "2.0.0"; + + src = fetchFromGitHub { + owner = "deepmind"; + repo = "sonnet"; + rev = "v${version}"; + sha256 = "sha256-YSMeH5ZTfP1OdLBepsxXAVczBG/ghSjCWjoz/I+TFl8="; + }; + + buildInputs = [ + absl-py + dm-tree + numpy + six + tabulate + wrapt + ]; + + propagatedBuildInputs = [ + tabulate + tensorflow + ]; + + checkInputs = [ + docutils + tensorflow-datasets + ]; + + pythonImportsCheck = [ + "sonnet" + ]; + + meta = with lib; { + description = "Library for building neural networks in TensorFlow"; + homepage = "https://github.com/deepmind/sonnet"; + license = licenses.asl20; + maintainers = with maintainers; [ onny ]; + }; +} 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 bb75c68e32..6240567e88 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dropbox/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dropbox/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "dropbox"; - version = "11.32.0"; + version = "11.33.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "dropbox"; repo = "dropbox-sdk-python"; rev = "refs/tags/v${version}"; - hash = "sha256-eb4GhmQJk60x02sFEYPF9x07lVRhVMFKYd9owO78S00="; + hash = "sha256-re1TYujoLWjvDE0/ikTMQmXufdS1Q5IMViiFY2/QRMw="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dvc-data/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dvc-data/default.nix index 70b17c74a0..0274b52341 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dvc-data/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dvc-data/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "dvc-data"; - version = "0.0.23"; + version = "0.0.24"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "iterative"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-4npImK6OML0/nhM+S7YiguN7RNHOnxnH+WAuqcdiVSw="; + hash = "sha256-Sk4l9TL0SU6sPrBBed/Y4xDB/GzVzv2YTUD0IdjhB2M="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dvc-objects/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dvc-objects/default.nix index 37d4f716b3..903a39383b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dvc-objects/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dvc-objects/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "dvc-objects"; - version = "0.0.23"; + version = "0.0.24"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "iterative"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-kiPDBhqQQJkVR/PWCKd4OFCIRznY3y6pgXiBQ3hBaaM="; + hash = "sha256-Hy/KLmu5mEIUazRi+XesTbKe+or/fzFL8e0zdV2WtC0="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; 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 5366745a6f..fdb81b4a7c 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.78.0"; + version = "0.79.0"; format = "flit"; disabled = pythonOlder "3.6"; @@ -27,8 +27,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "tiangolo"; repo = pname; - rev = version; - hash = "sha256-4JS0VLVg67O7VdcDw2k2u+98kiCdCHvCAEGHYGWEIOA="; + rev = "refs/tags/${version}"; + hash = "sha256-HaA9a/tqKtB24YtObk/XAsUy2mmWNonRyPXHflGRiPQ="; }; postPatch = '' 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 322f830302..c86dcd79aa 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.5.0"; + version = "1.5.5"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "fastai"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-mK/0q6EuS2UBd0kqtlWanX6W7568c7cfhecQXHOqF0M="; + sha256 = "sha256-q0hdWucmR1qMMWIY8xZ/ccItcwb9EIVQauecJYSsQjc="; }; 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 1dfaa3f3d5..28972b62b9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/fontparts/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/fontparts/default.nix @@ -6,13 +6,13 @@ buildPythonPackage rec { pname = "fontParts"; - version = "0.10.6"; + version = "0.10.7"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-mEnQWmzzZ5S8rWzmXuJDjcuoICi6Q+aneX8hGXj11Gg="; + sha256 = "sha256-u0hKI2LLWAUGIVRECk6b5y7UKgJHUx2I8R5Q+qkKxcg="; extension = "zip"; }; 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 cc89020e44..2b25decd4f 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 @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "garages-amsterdam"; - version = "4.0.0"; + version = "4.1.0"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -16,8 +16,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "klaasnicolaas"; repo = "garages_amsterdam"; - rev = "v${version}"; - sha256 = "sha256-3YSCf5sUnq2+Bt7LA30XeIMg4zsaPF3K5SVzGZ68SbY="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-ZWp543msRAgn/fFplEt6saSNbZ2flC5gwjxrll4w0W0="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-dns/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-dns/default.nix index 3ce93893a9..00bedca7c4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-dns/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-dns/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "google-cloud-dns"; - version = "0.34.0"; + version = "0.34.1"; src = fetchPypi { inherit pname version; - sha256 = "bd75d6e9fd456ce643ee936a113a1ead5405704515caa679db30d7f036e447f3"; + sha256 = "sha256-RPpi7pPFHGxXIWBY2S0qkRa3E6SocanRajqDuZ4wwfk="; }; propagatedBuildInputs = [ google-api-core google-cloud-core ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-error-reporting/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-error-reporting/default.nix index 67351536ad..3a7b81e16b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-error-reporting/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-error-reporting/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "google-cloud-error-reporting"; - version = "1.5.3"; + version = "1.6.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-J+MzM6aaVy4xmlNUFhSOgAomT007p3ODYVXN71UmZJA="; + hash = "sha256-o0q3/M8PiiIZr7swJusn21CIOKF2uCAebuavxNsA/Hg="; }; propagatedBuildInputs = [ 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 33da23b93f..12b9bfd7f1 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.6.0"; + version = "2.6.1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-XfF4+F4+LmRyxn8Zs3gI2RegFb3Y+uoAinEqcLeWCGM="; + sha256 = "sha256-eQPmfjtWUXxrrMgRgZ+pXc6lGP5bWq1VSecaHEvSk8I="; }; propagatedBuildInputs = [ grpc-google-iam-v1 google-api-core libcst proto-plus ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-logging/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-logging/default.nix index 658c145bdd..e08ee40aa0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-logging/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-logging/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "google-cloud-logging"; - version = "3.2.0"; + version = "3.2.1"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-DHFg4s1saEVhTk+IDqrmLaIM4nwjmBj72osp16YnruY="; + hash = "sha256-oREcVPdcbbBFMQz55xLm8Q0bemTrVwsj+4ew73A11Kw="; }; propagatedBuildInputs = [ 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 3325942f04..fd418f85a3 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 @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "google-cloud-monitoring"; - version = "2.10.0"; + version = "2.10.1"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-hnDzNkFluRjq/Bxk6NIXezGLDEMAcW4MLQG7F5U9Ez8="; + hash = "sha256-VQRCqlP0iCxYt50uzrVFSkvHrsYb3R8SmrdhZHxLFKw="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-pubsub/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-pubsub/default.nix index 68cf0fa7ef..8ecae2963b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-pubsub/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-pubsub/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "google-cloud-pubsub"; - version = "2.13.3"; + version = "2.13.4"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-4ocFDAimS1oFVJTpGWJYedJ35MJoJ7eheiWFiMX/JUk="; + hash = "sha256-ZhcBynfvHc0nveZP9z0y2IJf44vTzy8xB3XV5iJOLu0="; }; propagatedBuildInputs = [ 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 8c46aec477..50340a8dfb 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 @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "google-cloud-speech"; - version = "2.14.1"; + version = "2.15.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-ImE08djcrhhC0VQJmL69hbfUDBALPUyW9IaSh1CIJqs="; + hash = "sha256-/KQ8QM21L5aDy5NuNgrfTPTckU1d1AgdfzHY7/SPFdg="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-translate/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-translate/default.nix index ca961844a0..f87d3e819e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-translate/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-translate/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "google-cloud-translate"; - version = "3.7.4"; + version = "3.8.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-B5MBpdcS6NN7rwvjLwbY55rV0dLDwWtnAadWsH2AwXE="; + hash = "sha256-xdnMOy1JkmNnC+seLsxJp+Oq2G3oGXsKHS3//Bzfgq8="; }; propagatedBuildInputs = [ 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 174b14522e..ce4142fa11 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 @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "google-cloud-vision"; - version = "2.7.3"; + version = "2.8.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-eS67OJ8VfmXYFMrhKBNP++Jt+Q1hxcWMWwymdd/P4vE="; + hash = "sha256-LOGfvz61Fw6QNH83lFe8TwI3a72fHLeTFFcqM9QL3QY="; }; propagatedBuildInputs = [ 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 e81f412ca6..197fc18e88 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 = "2022.7.7"; + version = "2022.7.8"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "danielperna84"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-obkvx7P2nkn7z3kMJeY9ERzkuCAlmE27mwjUUPxOisc="; + sha256 = "sha256-Tzl7LH4Wisge3B7d2ChQnNPBAj1SNGmHI94k8fkMuqk="; }; propagatedBuildInputs = [ 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 f068fab049..831ed1235e 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.5.1"; + version = "10.5.2"; src = fetchPypi { inherit pname version; - sha256 = "sha256-JGk9PdCDXiDkP8Arw2pfpU+sEj/sCHwwHHWVwF3Ofzw="; + sha256 = "sha256-45FOAQDJgAfhlTF/XBmIfvmMM1X7LUzsHAb7NMQl9Fs="; }; checkInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/icalendar/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/icalendar/default.nix index 1e7200cffe..5ef8864417 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/icalendar/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/icalendar/default.nix @@ -7,12 +7,12 @@ }: buildPythonPackage rec { - version = "4.0.9"; + version = "4.1.0"; pname = "icalendar"; src = fetchPypi { inherit pname version; - sha256 = "cc73fa9c848744843046228cb66ea86cd8c18d73a51b140f7c003f760b84a997"; + sha256 = "sha256-l0i3wC78xD5Y0GFa4JdqxPJl6Q2t7ptPiE3imQXBs5U="; }; buildInputs = [ setuptools ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/iminuit/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/iminuit/default.nix index d5337c0b19..f0b744bfbc 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/iminuit/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/iminuit/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "iminuit"; - version = "2.12.1"; + version = "2.13.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-+le1b3wpze7QL5U1p7ZYB6zWoZfyCIUQlIIiLxoCPt4="; + hash = "sha256-40eFwqLArqb/hmcv6BuAoErJ1Cp57YJJYw8lKaj2oPo="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/iso4217/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/iso4217/default.nix index 8df5f962ce..5832b6e4a7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/iso4217/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/iso4217/default.nix @@ -16,7 +16,7 @@ let in buildPythonPackage rec { pname = "iso4217"; - version = "1.9"; + version = "1.11"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "dahlia"; repo = pname; rev = version; - hash = "sha256-7VrXAP/Qyzy2BDTmFwDlxHvF7HhndJsDMt/qHcsmhzs="; + hash = "sha256-zJYtEIrsuHKPwnSoRjyZC/0rgAZoNMZ0Oh8gQcIb20Q="; }; propagatedBuildInputs = lib.optionals (pythonOlder "3.9") [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jarowinkler/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jarowinkler/default.nix index 13b99050f0..f144cc49a9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jarowinkler/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jarowinkler/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "jarowinkler"; - version = "1.1.0"; + version = "1.1.2"; disabled = pythonOlder "3.6"; @@ -24,8 +24,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "maxbachmann"; repo = "JaroWinkler"; - rev = "v${version}"; - hash = "sha256-ilkslDrTOaq6mgg+nYMMqxrjvZHXMIcipu25wvV3+Mk="; + rev = "refs/tags/v${version}"; + hash = "sha256-yaJcmHkLxiRqrBiIel97mFxpav3N5QQSM+L9jA1kn5A="; }; nativeBuildInputs = [ 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 cd5e1e0f76..6b3ac52767 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 @@ -1,4 +1,6 @@ -{ lib, buildPythonPackage, fetchPypi +{ lib +, buildPythonPackage +, fetchPypi , jupyter-packaging , jupyter_server , pytest-tornasync @@ -30,6 +32,8 @@ buildPythonPackage rec { pythonImportsCheck = [ "jupyter_server_mathjax" ]; + __darwinAllowLocalNetworking = true; + meta = with lib; { description = "MathJax resources as a Jupyter Server Extension"; homepage = "https://jupyter.org"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jupytext/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jupytext/default.nix index a7a7d48c9d..aa4bcaf9b9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jupytext/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jupytext/default.nix @@ -1,4 +1,5 @@ { lib +, stdenv , buildPythonPackage , fetchFromGitHub , GitPython @@ -18,7 +19,7 @@ buildPythonPackage rec { pname = "jupytext"; - version = "1.13.8"; + version = "1.14.0"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -27,7 +28,7 @@ buildPythonPackage rec { owner = "mwouts"; repo = pname; rev = "refs/tags/v${version}"; - sha256 = "sha256-ebe5sQJxA8QE6eJp6vPUyMaEvZUPqzCmQ6damzo1BVo="; + sha256 = "sha256-a/dvY7MLCjYGOvsCC5tiIIJpApNriRtBN63VK+McEVw="; }; buildInputs = [ @@ -51,12 +52,6 @@ buildPythonPackage rec { pytestCheckHook ]; - postPatch = '' - # https://github.com/mwouts/jupytext/pull/885 - substituteInPlace setup.py \ - --replace "markdown-it-py~=1.0" "markdown-it-py>=1.0.0,<3.0.0" - ''; - preCheck = '' # Tests that use a Jupyter notebook require $HOME to be writable export HOME=$(mktemp -d); @@ -69,6 +64,9 @@ buildPythonPackage rec { disabledTests = [ "test_apply_black_through_jupytext" # we can't do anything about ill-formatted notebooks + ] ++ lib.optionals stdenv.isDarwin [ + # requires access to trash + "test_load_save_rename" ]; pythonImportsCheck = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mitmproxy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mitmproxy/default.nix index 055cb8aee9..ea0f5dd104 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mitmproxy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mitmproxy/default.nix @@ -45,14 +45,14 @@ buildPythonPackage rec { pname = "mitmproxy"; - version = "8.0.0"; + version = "8.1.1"; disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-Efazsi8BjBrk7lBKSn2APKHxCc7mzxNrC92BL0VsnCM="; + sha256 = "sha256-nW/WfiY6uF67qNa95tvNvSv/alP2WmzTk34LEBma/04="; }; propagatedBuildInputs = [ @@ -110,6 +110,8 @@ buildPythonPackage rec { # https://github.com/mitmproxy/mitmproxy/commit/36ebf11916704b3cdaf4be840eaafa66a115ac03 # Tests require terminal "test_integration" + "test_contentview_flowview" + "test_flowview" ]; dontUsePytestXdist = true; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/msldap/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/msldap/default.nix index 7a2a2611d3..0c0eecbac1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/msldap/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/msldap/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "msldap"; - version = "0.3.38"; + version = "0.3.40"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-zJEp8/jPTAb3RpzyXySdtVl2uSLpSirGkJh7GB/3Qwc="; + hash = "sha256-4sIqbjlrTX1l1zhj7URhISDo4lcP+JW1Qh3fajUAhbs="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/nbdime/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/nbdime/default.nix index fa72ab748d..da00ff3702 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/nbdime/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/nbdime/default.nix @@ -1,11 +1,13 @@ -{ lib, buildPythonPackage, fetchPypi, isPy3k +{ lib +, buildPythonPackage +, fetchPypi +, isPy3k , hypothesis , setuptools-scm , six , attrs , py , setuptools -, pytest-cov , pytest-timeout , pytest-tornado , mock @@ -33,26 +35,6 @@ buildPythonPackage rec { sha256 = "67767320e971374f701a175aa59abd3a554723039d39fae908e72d16330d648b"; }; - checkInputs = [ - hypothesis - pytest-cov - pytest-timeout - pytest-tornado - jsonschema - mock - tabulate - pytestCheckHook - ]; - - disabledTests = [ - "test_apply_filter_no_repo" - "test_diff_api_checkpoint" - "test_filter_cmd_invalid_filter" - "test_inline_merge" - "test_interrogate_filter_no_repo" - "test_merge" - ]; - nativeBuildInputs = [ setuptools-scm ]; propagatedBuildInputs = [ @@ -69,7 +51,32 @@ buildPythonPackage rec { GitPython notebook jinja2 - ]; + ]; + + checkInputs = [ + hypothesis + pytest-timeout + pytest-tornado + jsonschema + mock + tabulate + pytestCheckHook + ]; + + disabledTests = [ + "test_apply_filter_no_repo" + "test_diff_api_checkpoint" + "test_filter_cmd_invalid_filter" + "test_inline_merge_source_add" + "test_inline_merge_source_patches" + "test_inline_merge_source_replace" + "test_inline_merge_cells_insertion" + "test_inline_merge_cells_replacement" + "test_interrogate_filter_no_repo" + "test_merge_input_strategy_inline" + ]; + + __darwinAllowLocalNetworking = true; meta = with lib; { homepage = "https://github.com/jupyter/nbdime"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/nessclient/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/nessclient/default.nix index d91a80eb9d..591d74a95a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/nessclient/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/nessclient/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "nessclient"; - version = "0.9.16b2"; + version = "0.10.0"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -19,8 +19,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "nickw444"; repo = pname; - rev = version; - sha256 = "1g3q9bv1nn1b8n6bklc05k8pac4cndzfxfr7liky0gnnbri15k81"; + rev = "refs/tags/${version}"; + sha256 = "sha256-zjUYdSHIMCB4cCAsOOQZ9YgmFTskzlTUs5z/xPFt01Q="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/nexia/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/nexia/default.nix index 8e07c37fad..8aaa833d2f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/nexia/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/nexia/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "nexia"; - version = "2.0.1"; + version = "2.0.2"; format = "setuptools"; disabled = pythonOlder "3.5"; @@ -19,8 +19,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "bdraco"; repo = pname; - rev = version; - sha256 = "sha256-Wb9qxJBbmac1B3wYJxFCdXiQ3LqIl3CHIZnNvZ5Jr5k="; + rev = "refs/tags/${version}"; + sha256 = "sha256-JbWKNM7fNhIuBnIHAvRegAxmE0OOwsTDQWaMtuDVQcc="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/nextcord/paths.patch b/third_party/nixpkgs/pkgs/development/python-modules/nextcord/paths.patch index 8e6b58897f..b5c9ce4f77 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/nextcord/paths.patch +++ b/third_party/nixpkgs/pkgs/development/python-modules/nextcord/paths.patch @@ -7,7 +7,7 @@ index 52e4ddbd..d8b8090b 100644 _lib = libopus_loader(_filename) else: - opus = ctypes.util.find_library("opus") -+ opus = ctypes.util.find_library("@opus@") ++ opus = "@libopus@" if opus is None: _lib = None diff --git a/third_party/nixpkgs/pkgs/development/python-modules/openstacksdk/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/openstacksdk/default.nix index 98906606fa..edd5b0ec0d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/openstacksdk/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/openstacksdk/default.nix @@ -19,14 +19,14 @@ buildPythonPackage rec { pname = "openstacksdk"; - version = "0.99.0"; + version = "0.100.0"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-P3PDzCgInpOzQut/NIsoX1pl/+UFiYvhXbJQx1u4Ves="; + hash = "sha256-AT9WDdoxtW5sGiL0h9n4y/3xvClcDoh1N3TFVHjPB0c="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/optax/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/optax/default.nix index b0f896a18e..42541d9078 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/optax/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/optax/default.nix @@ -1,28 +1,29 @@ { absl-py , buildPythonPackage , chex -, dm-haiku , fetchFromGitHub , jaxlib , lib , numpy -, pytest-xdist -, pytestCheckHook -, tensorflow -, tensorflow-datasets +, callPackage }: buildPythonPackage rec { pname = "optax"; - version = "0.1.1"; + version = "0.1.3"; src = fetchFromGitHub { owner = "deepmind"; repo = pname; rev = "v${version}"; - hash = "sha256-s/BcqzhdfWzR61MStusUPQtuT4+t8NcC5gBGiGggFqw="; + hash = "sha256-XAYztMBQpLBHNuNED/iodbwIMJSN/0GxdmTGQ5jD9Ws="; }; + outputs = [ + "out" + "testsout" + ]; + buildInputs = [ jaxlib ]; propagatedBuildInputs = [ @@ -31,24 +32,21 @@ buildPythonPackage rec { numpy ]; - checkInputs = [ - dm-haiku - pytest-xdist - pytestCheckHook - tensorflow - tensorflow-datasets - ]; + postInstall = '' + mkdir $testsout + cp -R examples $testsout/examples + ''; pythonImportsCheck = [ "optax" ]; - disabledTestPaths = [ - # Requires `flax` which depends on `optax` creating circular dependency. - "optax/_src/equivalence_test.py" - # See https://github.com/deepmind/optax/issues/323. - "examples/lookahead_mnist_test.py" - ]; + # check in passthru.tests.pytest to escape infinite recursion with flax + doCheck = false; + + passthru.tests = { + pytest = callPackage ./tests.nix { }; + }; meta = with lib; { description = "Optax is a gradient processing and optimization library for JAX."; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/optax/tests.nix b/third_party/nixpkgs/pkgs/development/python-modules/optax/tests.nix new file mode 100644 index 0000000000..fedff61302 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/optax/tests.nix @@ -0,0 +1,35 @@ +{ stdenv +, buildPythonPackage +, dm-haiku +, pytest-xdist +, pytestCheckHook +, tensorflow +, tensorflow-datasets +, flax +, optax +}: + +buildPythonPackage rec { + pname = "optax-tests"; + inherit (optax) version; + + src = optax.testsout; + + dontBuild = true; + dontInstall = true; + + checkInputs = [ + dm-haiku + pytest-xdist + pytestCheckHook + tensorflow + tensorflow-datasets + flax + ]; + + disabledTestPaths = [ + # See https://github.com/deepmind/optax/issues/323 + "examples/lookahead_mnist_test.py" + ]; + +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/panflute/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/panflute/default.nix index 610c63aeac..a0c4930ab0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/panflute/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/panflute/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec{ pname = "panflute"; - version = "2.1.5"; + version = "2.2.3"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-7xHcWVoZh51PlonvmoOCBKJGNMpjT7z8jkoO1B65EqE="; + hash = "sha256-AJMz+gt8Wa45aFZSLm15RjiiJlJnkWC4Lobk8o8Pu8Y="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/parfive/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/parfive/default.nix index 5bb1b04439..131d8de094 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/parfive/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/parfive/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "parfive"; - version = "1.5.1"; + version = "2.0.1"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "c411fd7269a49d1c72a964e97de474ec082115777b363aeed98a6595f90b8676"; + sha256 = "sha256-/b4KrYg0mXoQJ/L+9ol7gD2myB0aLgDj0IWa8sxarKU="; }; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/patool/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/patool/default.nix index 2fa07d32cc..cbc3a05044 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/patool/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/patool/default.nix @@ -1,17 +1,16 @@ { lib, buildPythonPackage, fetchFromGitHub, pytestCheckHook, p7zip, - unzip, cabextract, zip, zopfli, lzip, zpaq, gnutar, gnugrep, diffutils, file, + cabextract, zip, lzip, zpaq, gnutar, gnugrep, diffutils, file, gzip, bzip2, xz}: # unrar is unfree, as well as 7z with unrar support, not including it (patool doesn't support unar) +# it will still use unrar if present in the path let compression-utilities = [ p7zip - unzip gnutar cabextract zip - zopfli lzip zpaq gzip @@ -34,9 +33,9 @@ buildPythonPackage rec { sha256 = "0v4r77sm3yzh7y1whfwxmp01cchd82jbhvbg9zsyd2yb944imzjy"; }; - prePatch = '' + postPatch = '' substituteInPlace patoolib/util.py \ - --replace "path = None" 'path = append_to_path(os.environ["PATH"], "${lib.makeBinPath compression-utilities}")' + --replace "path = None" 'path = os.environ["PATH"] + ":${lib.makeBinPath compression-utilities}"' ''; checkInputs = [ pytestCheckHook ] ++ compression-utilities; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/peaqevcore/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/peaqevcore/default.nix index 13bd0826fe..f9eebea5d3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/peaqevcore/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/peaqevcore/default.nix @@ -6,14 +6,14 @@ buildPythonPackage rec { pname = "peaqevcore"; - version = "3.1.6"; + version = "3.2.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-ZKW1RpBF1iKumr2dB/spj7VLrfHFcomZnslos/ecKxQ="; + hash = "sha256-cNbCGz/mXR7xrwdxmtD36v8ROCvLe5w1sD0M6aSrONE="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pex/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pex/default.nix index 5e27b6b4fc..495af83848 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pex/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pex/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "pex"; - version = "2.1.97"; + version = "2.1.99"; format = "flit"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-h2fDyL1spMBjnqTvjj3C3eXFFmgtvX7NyTUo5my6Lk4="; + hash = "sha256-P+r0JOSVwIVWkQROvsbpUocwB4x0HrVyy9oY9CdNj6s="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pick/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pick/default.nix index f69bd06ea8..6af86d37af 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pick/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pick/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "pick"; - version = "1.2.0"; + version = "1.3.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -16,8 +16,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "wong2"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-9y9O6Iqo07Q+aPM6AvyvjAMQzZQOSpal92Qto8p8bzI="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-McxgXg+nTQzCjTgKIC8VmlNIfTTMwDo+dGAGwocpIlM="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/plotnine/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/plotnine/default.nix new file mode 100644 index 0000000000..9e0b1c8176 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/plotnine/default.nix @@ -0,0 +1,76 @@ +{ lib +, fetchPypi +, buildPythonPackage +, matplotlib +, scipy +, patsy +, pandas +, statsmodels +, pytestCheckHook +, geopandas +, scikit-misc +, adjusttext +, mizani }: + +buildPythonPackage rec { + pname = "plotnine"; + version = "0.9.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-DompMBXzxx1oRKx6qfsNoJuQj199+n3V1opcoysuvOo="; + }; + + postPatch = '' + substituteInPlace pyproject.toml \ + --replace " --cov=plotnine --cov-report=xml" "" + ''; + + buildInputs = [ + matplotlib + mizani + pandas + patsy + scipy + statsmodels + ]; + + checkInputs = [ + adjusttext + geopandas + pytestCheckHook + scikit-misc + ]; + + preCheck = '' + export HOME=$(mktemp -d) + ''; + + pythonImportsCheck = [ + "plotnine" + ]; + + disabledTestPaths = [ + # Assertion Errors + "tests/test_theme.py" + "tests/test_scale_internals.py" + "tests/test_scale_labelling.py" + "tests/test_position.py" + "tests/test_geom_text_label.py" + "tests/test_geom_smooth.py" + "tests/test_geom_segment.py" + "tests/test_geom_ribbon_area.py" + "tests/test_geom_map.py" + "tests/test_facets.py" + "tests/test_facet_labelling.py" + "tests/test_coords.py" + "tests/test_annotation_logticks.py" + ]; + + meta = with lib; { + description = "Grammar of graphics for python"; + homepage = "https://plotnine.readthedocs.io/en/stable"; + license = licenses.mit; + maintainers = with maintainers; [ onny ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/protobuf/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/protobuf/default.nix index 30e9fbf9ea..ee1d0bbffb 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/protobuf/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/protobuf/default.nix @@ -19,7 +19,12 @@ buildPythonPackage { doCheck = doCheck && !isPy27; # setuptools>=41.4 no longer collects correctly on python2 propagatedBuildInputs = [ six ] ++ lib.optionals isPy27 [ google-apputils ]; - propagatedNativeBuildInputs = [ buildPackages.protobuf ]; # For protoc. + propagatedNativeBuildInputs = let + protobufVersion = "${lib.versions.major protobuf.version}_${lib.versions.minor protobuf.version}"; + in [ + buildPackages."protobuf${protobufVersion}" # For protoc of the same version. + ]; + nativeBuildInputs = [ pyext ] ++ lib.optionals isPy27 [ google-apputils ]; buildInputs = [ protobuf ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pubnub/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pubnub/default.nix index 88fb56750a..f650ad955b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pubnub/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pubnub/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "pubnub"; - version = "6.3.3"; + version = "6.4.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = pname; repo = "python"; rev = "refs/tags/v${version}"; - hash = "sha256-OVciXd1u112h9tPNW5XpT7aDknpMGEYroe4m7HxBqaw="; + hash = "sha256-NpGhZrfUXKpz520l1S+cCfTrI2T/7XlO0Kk1e+XR8Ew="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pure-pcapy3/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pure-pcapy3/default.nix index 56b8da5db2..ad405c5938 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pure-pcapy3/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pure-pcapy3/default.nix @@ -24,6 +24,6 @@ buildPythonPackage rec { description = "Reimplementation of pcapy"; homepage = "https://github.com/rcloran/pure-pcapy-3"; license = licenses.bsd2; - maintainers = with maintainers; [ etu ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pydantic/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pydantic/default.nix index 25a5d54d52..19396b8ee5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pydantic/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pydantic/default.nix @@ -1,4 +1,5 @@ { lib +, stdenv , buildPythonPackage , cython , devtools @@ -10,6 +11,8 @@ , pythonOlder , typing-extensions # dependencies for building documentation. +# docs fail to build in Darwin sandbox: https://github.com/samuelcolvin/pydantic/issues/4245 +, withDocs ? (stdenv.hostPlatform == stdenv.buildPlatform && !stdenv.isDarwin) , ansi2html , markdown-include , mkdocs @@ -25,7 +28,13 @@ buildPythonPackage rec { pname = "pydantic"; version = "1.9.0"; - outputs = [ "out" "doc" ]; + + outputs = [ + "out" + ] ++ lib.optionals withDocs [ + "doc" + ]; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { @@ -41,7 +50,7 @@ buildPythonPackage rec { nativeBuildInputs = [ cython - + ] ++ lib.optionals withDocs [ # dependencies for building documentation ansi2html markdown-include @@ -73,12 +82,12 @@ buildPythonPackage rec { # Must include current directory into PYTHONPATH, since documentation # building process expects "import pydantic" to work. - preBuild = '' + preBuild = lib.optionalString withDocs '' PYTHONPATH=$PWD:$PYTHONPATH make docs ''; # Layout documentation in same way as "sphinxHook" does. - postInstall = '' + postInstall = lib.optionalString withDocs '' mkdir -p $out/share/doc/$name mv ./site $out/share/doc/$name/html ''; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pygame_sdl2/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pygame_sdl2/default.nix index 00965b4a14..2d0004cdfc 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pygame_sdl2/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pygame_sdl2/default.nix @@ -1,15 +1,15 @@ -{ lib, buildPythonPackage, fetchurl, isPy27 +{ lib, buildPythonPackage, fetchurl, isPy27, renpy , cython, SDL2, SDL2_image, SDL2_ttf, SDL2_mixer, libjpeg, libpng }: buildPythonPackage rec { pname = "pygame_sdl2"; version = "2.1.0"; - renpy_version = "7.2.0"; + renpy_version = renpy.base_version; name = "${pname}-${version}-${renpy_version}"; src = fetchurl { url = "https://www.renpy.org/dl/${renpy_version}/pygame_sdl2-${version}-for-renpy-${renpy_version}.tar.gz"; - sha256 = "1amgsb6mm8ssf7vdcs5dr8rlxrgyhh29m4i573z1cw61ynd7vgcw"; + sha256 = "sha256-iKsnmuSBzfHlIOHUwWECfvPa9LuBbCr9Kmq5dolxUlU="; }; # force rebuild of headers needed for install diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pygit2/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pygit2/default.nix index 71589deae6..9e293e65a0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pygit2/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pygit2/default.nix @@ -4,6 +4,7 @@ , cacert , cached-property , cffi +, fetchpatch , fetchPypi , isPyPy , libgit2 @@ -24,6 +25,15 @@ buildPythonPackage rec { hash = "sha256-IIlEM98RRkgarK434rDzu7/eoCbbL1UGEXC9mCPkCxk="; }; + patches = [ + # libgit 2 fix + (fetchpatch { + url = "https://github.com/libgit2/pygit2/commit/14b1df84060ea4ab085202382e80672ec1a104e3.patch"; + includes = [ "src/types.h" ]; + sha256 = "sha256-2krkyAT30l/olSEl2ugWCsylvGuT7VvkuSFVshIXktA="; + }) + ]; + preConfigure = lib.optionalString stdenv.isDarwin '' export DYLD_LIBRARY_PATH="${libgit2}/lib" ''; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pygti/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pygti/default.nix index 62316b3d4d..29fc09120f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pygti/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pygti/default.nix @@ -10,15 +10,15 @@ buildPythonPackage rec { pname = "pygti"; - version = "0.9.2"; + version = "0.9.3"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "vigonotion"; repo = "pygti"; - rev = "v${version}"; - sha256 = "0zqa2krsniaqisjr0xqw009wdyy3y48zar9lrwysjsqci7k07d9x"; + rev = "refs/tags/v${version}"; + sha256 = "sha256-5Pc6gAI3xICS+f7tYwC9OVOAHJSW8AGPOvPYs0/6/iI="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pygtrie/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pygtrie/default.nix index 8ee176e80c..c7738a9f3e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pygtrie/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pygtrie/default.nix @@ -1,10 +1,10 @@ { lib, fetchPypi, buildPythonPackage, ... }: buildPythonPackage rec { pname = "pygtrie"; - version = "2.4.2"; + version = "2.5.0"; src = fetchPypi { inherit pname version; - sha256 = "43205559d28863358dbbf25045029f58e2ab357317a59b11f11ade278ac64692"; + sha256 = "sha256-IDUUrYJutAPasdLi3dA04NFTS75NvgITuwWT9mvrpOI="; }; meta = { homepage = "https://github.com/mina86/pygtrie"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyialarm/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyialarm/default.nix index 501f1497a3..db4bf7eb3c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyialarm/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyialarm/default.nix @@ -1,6 +1,6 @@ { lib , buildPythonPackage -, dicttoxml +, dicttoxml2 , fetchFromGitHub , pythonOlder , xmltodict @@ -8,25 +8,27 @@ buildPythonPackage rec { pname = "pyialarm"; - version = "2.0.0"; + version = "2.2.0"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "RyuzakiKK"; repo = pname; rev = "v${version}"; - sha256 = "sha256-rJS6KgEy4iuiY6QRue6K6woyGefuTN7/4RLCu8cb8M4="; + hash = "sha256-rOdeYewjoFVbHdNPHN6ZC2g6X5yr84/JFE6tGSDIoRU="; }; propagatedBuildInputs = [ - dicttoxml + dicttoxml2 xmltodict ]; # Project has no tests doCheck = false; - pythonImportsCheck = [ "pyialarm" ]; + pythonImportsCheck = [ + "pyialarm" + ]; meta = with lib; { description = "Python library to interface with Antifurto365 iAlarm systems"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyinstrument/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyinstrument/default.nix new file mode 100644 index 0000000000..45425e1d11 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyinstrument/default.nix @@ -0,0 +1,31 @@ +{ stdenv +, lib +, buildPythonPackage +, fetchFromGitHub +}: + +buildPythonPackage rec { + pname = "pyinstrument"; + version = "4.1.1"; + + src = fetchFromGitHub { + owner = "joerick"; + repo = pname; + rev = "v${version}"; + hash = "sha256-4gM60UhzN+VnNMTHw6NSU7/LUPHaMgg105D+dO6SDfg="; + }; + + # Module import recursion + doCheck = false; + + pythonImportsCheck = [ + "pyinstrument" + ]; + + meta = with lib; { + description = "Call stack profiler for Python"; + homepage = "https://github.com/joerick/pyinstrument"; + license = licenses.bsd3; + maintainers = with maintainers; [ onny ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pylint-django/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pylint-django/default.nix index ca26f11ccb..e6d7c6bd63 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pylint-django/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pylint-django/default.nix @@ -33,12 +33,11 @@ buildPythonPackage rec { ]; disabledTests = [ - # Skip outdated tests and the one with a missing dependency (django_tables2) + # AttributeError, AssertionError "external_django_tables2_noerror_meta_class" - "external_factory_boy_noerror" - "func_noerror_foreign_key_attributes" - "func_noerror_foreign_key_key_cls_unbound" - "test_everything" + "external_tastypie_noerror_foreign_key" + "func_noerror_model_unicode_lambda" + "0001_noerror_initial" ]; pythonImportsCheck = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pylitterbot/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pylitterbot/default.nix index 4852e33dfb..cdb971b6a7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pylitterbot/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pylitterbot/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "pylitterbot"; - version = "2022.3.0"; + version = "2022.7.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "natekspencer"; repo = pname; rev = version; - sha256 = "sha256-hoDj7NbDQqXLA3I3Lmh9TBzmjluaJMz2aNPca6fXy+M="; + sha256 = "sha256-iniSlsZVWdDuwM/6asX4xyVrtrQvt7wEBwDVutjCogU="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pymc/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pymc/default.nix index a33a892ffc..ba9b82b352 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pymc/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pymc/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "pymc"; - version = "4.1.2"; + version = "4.1.3"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "pymc-devs"; repo = "pymc"; rev = "refs/tags/v${version}"; - hash = "sha256-QSM9wQwX5EdU6w8ALDSabTpo89GNIBMEB8hJEp9jQB4="; + hash = "sha256-fqhtfMGopzVgonF5+qyFhm72KV0hX8QE95slI/HBZYU="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyodbc/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyodbc/default.nix index 59457d6fcc..e62417b2df 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyodbc/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyodbc/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "pyodbc"; - version = "4.0.32"; + version = "4.0.34"; disabled = isPyPy; # use pypypdbc instead src = fetchPypi { inherit pname version; - sha256 = "9be5f0c3590655e1968488410fe3528bb8023d527e7ccec1f663d64245071a6b"; + sha256 = "sha256-fqeGlTK5a41Smx8I6oV2X5TffkpY6Wiy+NRVNGoD5Fw="; }; buildInputs = [ unixODBC ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyserial-asyncio/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyserial-asyncio/default.nix index c7990adb46..93ec0535b8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyserial-asyncio/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyserial-asyncio/default.nix @@ -28,7 +28,7 @@ buildPythonPackage rec { description = "Asyncio extension package for pyserial"; homepage = "https://github.com/pyserial/pyserial-asyncio"; license = licenses.bsd3; - maintainers = with maintainers; [ etu ]; + maintainers = with maintainers; [ ]; platforms = platforms.linux; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyside2/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyside2/default.nix index 3be201d3c9..81df3cbe94 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyside2/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyside2/default.nix @@ -24,14 +24,22 @@ stdenv.mkDerivation rec { ]; nativeBuildInputs = [ cmake ninja qt5.qmake python ]; - buildInputs = with qt5; [ + buildInputs = (with qt5; [ qtbase qtxmlpatterns qtmultimedia qttools qtx11extras qtlocation qtscript qtwebsockets qtwebengine qtwebchannel qtcharts qtsensors qtsvg + ]) ++ [ + python.pkgs.setuptools ]; propagatedBuildInputs = [ shiboken2 ]; dontWrapQtApps = true; + postInstall = '' + cd ../../.. + ${python.interpreter} setup.py egg_info --build-type=pyside2 + cp -r PySide2.egg-info $out/${python.sitePackages}/ + ''; + meta = with lib; { description = "LGPL-licensed Python bindings for Qt"; license = licenses.lgpl21; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-bdd/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-bdd/default.nix index 6ca95bca4c..cfae0cb2bf 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-bdd/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-bdd/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "pytest-bdd"; - version = "5.0.0"; + version = "6.0.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -23,8 +23,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "pytest-dev"; repo = pname; - rev = version; - sha256 = "sha256-3P9ongMAsLITOCRPmME492xnkdVc8IdOVrINK57gfOY="; + rev = "refs/tags/${version}"; + sha256 = "sha256-1dyAhvEw8gUe78qDpgrcwl6grWKiwPgSe/QeFAjBzZg="; }; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-test-utils/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-test-utils/default.nix index e8c219192b..51e9972cba 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-test-utils/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-test-utils/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "pytest-test-utils"; - version = "0.0.7"; + version = "0.0.8"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "iterative"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-z5kCFJ8jDzEIUWDjru5vKlZErUvK1iy0WokrCKsvVQo="; + hash = "sha256-5gB+hnJR2+NQd/n7RGrX1bzfKt8Np7IbWw61SZgNVJY="; }; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-testmon/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-testmon/default.nix index 667927bfe1..9652e02894 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-testmon/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-testmon/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "pytest-testmon"; - version = "1.3.3"; + version = "1.3.4"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-Csg5wIm9+ZdAQYdZozlx09rMaVz3GazeS5Z/f4jRECw="; + sha256 = "sha256-jr+uKjtm5nFYHrZpG63VNK/wO93TQJh1x4SoTxJtlw0="; }; propagatedBuildInputs = [ pytest coverage ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-unordered/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-unordered/default.nix new file mode 100644 index 0000000000..5dc0916991 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-unordered/default.nix @@ -0,0 +1,28 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "pytest-unordered"; + version = "0.4.1"; + + src = fetchFromGitHub { + owner = "utapyngo"; + repo = pname; + rev = "972012a984b1e9fb3e98f9e8fe9e2ada16ad8110"; + hash = "sha256-mCcR6WZb2+V5n0PwgsjvnChWnANkIyQ0YtqwTKBYtaA="; + }; + + checkInputs = [ pytestCheckHook ]; + + pythonImportsCheck = [ "pytest_unordered" ]; + + meta = with lib; { + description = "Test equality of unordered collections in pytest"; + homepage = "https://github.com/utapyngo/pytest-unordered"; + license = licenses.mit; + maintainers = with maintainers; [ onny ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-benedict/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-benedict/default.nix index 03d6be7c30..ada0ded7e7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-benedict/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-benedict/default.nix @@ -4,6 +4,7 @@ , fetchFromGitHub , ftfy , mailchecker +, orjson , phonenumbers , pytestCheckHook , python-dateutil @@ -19,7 +20,7 @@ buildPythonPackage rec { pname = "python-benedict"; - version = "0.25.1"; + version = "0.25.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -28,7 +29,7 @@ buildPythonPackage rec { owner = "fabiocaccamo"; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-egOrotWgRyB6pdWUIRWogwdoK82g/1JfRDc85W4FrjQ="; + hash = "sha256-WSsT+p23VctVt9A+WFKNHcgUHFijfT775eMF3RzaXDA="; }; propagatedBuildInputs = [ @@ -39,6 +40,7 @@ buildPythonPackage rec { python-slugify pyyaml ftfy + orjson requests six toml diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-cinderclient/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-cinderclient/default.nix index 2f08341a2c..4b33fbfec8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-cinderclient/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-cinderclient/default.nix @@ -17,11 +17,11 @@ buildPythonPackage rec { pname = "python-cinderclient"; - version = "8.3.0"; + version = "9.0.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-4AEDh1Ap3IXLtZEx0AzMhTT2kpVqzeMrWjzFr0wkWAs="; + sha256 = "sha256-oiV6si2kRyRJ3cdSVRNBIm2iv8FrZ9mGnN6vRbqGv6o="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-glanceclient/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-glanceclient/default.nix index f534d4968a..10537b419a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-glanceclient/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-glanceclient/default.nix @@ -20,14 +20,14 @@ buildPythonApplication rec { pname = "python-glanceclient"; - version = "4.0.0"; + version = "4.0.1"; format = "setuptools"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-a3tFLmSKuaKbBQy32EkU7sPIEQtN5gaDqoGT03gka+w="; + hash = "sha256-pfQnIvrZFw16eRF2kPxmthWpY7qWkBu9SUavQnXO8zQ="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-ironicclient/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-ironicclient/default.nix index 83449a9285..44c258675a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-ironicclient/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-ironicclient/default.nix @@ -20,11 +20,11 @@ buildPythonApplication rec { pname = "python-ironicclient"; - version = "4.11.0"; + version = "5.0.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-zGG/3Cq7mARyuGGvqa4KGWFmx/UN+W2KMuy+RNenzXM="; + sha256 = "sha256-mA8+4cvWhxPn7LGVcWvwxGRBnlM671YgFfE10zhVPtQ="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-keystoneclient/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-keystoneclient/default.nix index 470e0734dd..198ef19465 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-keystoneclient/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-keystoneclient/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "python-keystoneclient"; - version = "4.5.0"; + version = "5.0.0"; format = "setuptools"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-bX8FxpLn2yaSd4KEx3mubOqLIVmRS0QXpfoL/qHinNw="; + hash = "sha256-D1DaM78gtVrPxZ1PlGD6Lvwb4V/QXsPyNnTQPror6j8="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-songpal/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-songpal/default.nix index 7215bd7328..1fff6a55c9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-songpal/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-songpal/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "python-songpal"; - version = "0.14.1"; + version = "0.15"; format = "pyproject"; @@ -21,8 +21,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "rytilahti"; repo = "python-songpal"; - rev = version; - hash = "sha256-lLRAXoz95hSt1JcWbQ1g5xmvDOeUmeXPa9pCuJktaeY="; + rev = "refs/tags/${version}"; + hash = "sha256-NoO3cgviFbXosEnx46nXdW02jYOfRPHUdc1VeCvwBsQ="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-swiftclient/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-swiftclient/default.nix index bf0149e9e1..7c672d5d83 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-swiftclient/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-swiftclient/default.nix @@ -12,14 +12,14 @@ buildPythonApplication rec { pname = "python-swiftclient"; - version = "4.0.0"; + version = "4.0.1"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-V7bx/yO0ZoQ4AqaBb0trvGiWtq0F1ld6/udiK+OilTg="; + hash = "sha256-O2jHNpnF+8OKzXtvEUPWmSOz+vcQ82XZd6QQS9kni/8="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python_openzwave/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python_openzwave/default.nix index 8f649d4d4d..e24f4f65d5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python_openzwave/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python_openzwave/default.nix @@ -36,7 +36,7 @@ buildPythonPackage rec { description = "Python wrapper for the OpenZWave C++ library"; homepage = "https://github.com/OpenZWave/python-openzwave"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ etu ]; + maintainers = with maintainers; [ ]; inherit (openzwave.meta) platforms; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyunifiprotect/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyunifiprotect/default.nix index f105cca798..c63bcbf399 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyunifiprotect/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyunifiprotect/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { pname = "pyunifiprotect"; - version = "4.0.9"; + version = "4.0.11"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -35,7 +35,7 @@ buildPythonPackage rec { owner = "briis"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-1jKZWF+xNQVNzgOTNwEG/rloPXZYYwoVMYmQ+jep1/0="; + hash = "sha256-81nottXXenkIPiDnR8O44ELStoh8i2yROYCPvBLiWSU="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/regenmaschine/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/regenmaschine/default.nix index 444ff144bb..71b8ecad8e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/regenmaschine/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/regenmaschine/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "regenmaschine"; - version = "2022.07.1"; + version = "2022.07.3"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "bachya"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-x8KyNB3aNiRT64/rrA7y8LM7ZOd524ok++n1Fwjz1Gc="; + sha256 = "sha256-z7FrVnGQjpTjdIX/gatP/ZjzOLaj2D8XsQ+UTYBOHgE="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/reqif/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/reqif/default.nix new file mode 100644 index 0000000000..3f8376f659 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/reqif/default.nix @@ -0,0 +1,60 @@ +{ lib +, buildPythonPackage +, python3 +, pythonOlder +, fetchFromGitHub +, poetry-core +, beautifulsoup4 +, lxml +, jinja2 +, dataclasses +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "reqif"; + version = "0.0.8"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "strictdoc-project"; + repo = pname; + rev = version; + sha256 = "sha256-PtzRJUvv+Oee08+sdakFviKIhwfLngyal1WSWDtMELg="; + }; + + postPatch = '' + substituteInPlace ./tests/unit/conftest.py --replace \ + "os.path.abspath(os.path.join(__file__, \"../../../../reqif\"))" \ + "\"${placeholder "out"}/${python3.sitePackages}/reqif\"" + substituteInPlace pyproject.toml --replace "^" ">=" + substituteInPlace requirements.txt --replace "==" ">=" + ''; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + beautifulsoup4 + lxml + jinja2 + ] ++ lib.optionals (pythonOlder "3.7") [ + dataclasses + ]; + + pythonImportsCheck = [ + "reqif" + ]; + + checkInputs = [ + pytestCheckHook + ]; + + meta = with lib; { + description = "Python library for ReqIF format"; + homepage = "https://github.com/strictdoc-project/reqif"; + license = licenses.asl20; + maintainers = with maintainers; [ yuu ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/rlax/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/rlax/default.nix new file mode 100644 index 0000000000..adff2f0ac5 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/rlax/default.nix @@ -0,0 +1,65 @@ +{ lib +, fetchPypi +, buildPythonPackage +, chex +, jaxlib +, tensorflow-probability +, optax +, dm-haiku +, bsuite +, frozendict +, pytestCheckHook +, dm-env +, distrax }: + +buildPythonPackage rec { + pname = "rlax"; + version = "0.1.2"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-hAG0idz5VkGVvxaJWoxlVZ8myeHF6ndDxB0SyJm7qV8="; + }; + + buildInputs = [ + chex + jaxlib + distrax + tensorflow-probability + ]; + + checkInputs = [ + bsuite + dm-env + dm-haiku + frozendict + optax + pytestCheckHook + ]; + + pythonImportsCheck = [ + "rlax" + ]; + + disabledTests = [ + # RuntimeErrors + "test_cross_replica_scatter_add0" + "test_cross_replica_scatter_add1" + "test_cross_replica_scatter_add2" + "test_cross_replica_scatter_add3" + "test_cross_replica_scatter_add4" + "test_learn_scale_shift" + "test_normalize_unnormalize_is_identity" + "test_outputs_preserved" + "test_scale_bounded" + "test_slow_update" + "test_unnormalize_linear" + ]; + + meta = with lib; { + description = "Library of reinforcement learning building blocks in JAX"; + homepage = "https://github.com/deepmind/rlax"; + license = licenses.asl20; + maintainers = with maintainers; [ onny ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/scikit-misc/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/scikit-misc/default.nix new file mode 100644 index 0000000000..bfe0ab7d5b --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/scikit-misc/default.nix @@ -0,0 +1,45 @@ +{ lib +, fetchPypi +, buildPythonPackage +, cython +, gfortran +, pytestCheckHook +, numpy }: + +buildPythonPackage rec { + pname = "scikit-misc"; + version = "0.1.4"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-93RqA0eBEGPh7PkSHflINXhQA5U8OLW6hPY/xQjCKRE="; + }; + + postPatch = '' + substituteInPlace pytest.ini \ + --replace "--cov --cov-report=xml" "" + ''; + + nativeBuildInputs = [ + gfortran + ]; + + buildInputs = [ + cython + numpy + ]; + + # Tests fail because of infinite recursion error + doCheck = false; + + pythonImportsCheck = [ + "skmisc" + ]; + + meta = with lib; { + description = "Miscellaneous tools for scientific computing"; + homepage = "https://github.com/has2k1/scikit-misc"; + license = licenses.bsd3; + maintainers = with maintainers; [ onny ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sentry-sdk/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sentry-sdk/default.nix index 1b55414ca5..eca91def23 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sentry-sdk/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sentry-sdk/default.nix @@ -46,7 +46,7 @@ buildPythonPackage rec { pname = "sentry-sdk"; - version = "1.7.0"; + version = "1.7.2"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -55,7 +55,7 @@ buildPythonPackage rec { owner = "getsentry"; repo = "sentry-python"; rev = version; - hash = "sha256-Wee4toHLbiwYXMtsxALetAJ+JxxN/DsNPIiZeeWNuI0="; + hash = "sha256-0VQ1P3xWC1keoXaPfIzh+uGXvRAK3nOrc6fLKIhfiHk="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/shiboken2/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/shiboken2/default.nix index 11461a9545..c4210cfeda 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/shiboken2/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/shiboken2/default.nix @@ -17,7 +17,7 @@ stdenv.mkDerivation { CLANG_INSTALL_DIR = llvmPackages.libclang.out; nativeBuildInputs = [ cmake ]; - buildInputs = [ llvmPackages.libclang python qt5.qtbase qt5.qtxmlpatterns ]; + buildInputs = [ llvmPackages.libclang python python.pkgs.setuptools qt5.qtbase qt5.qtxmlpatterns ]; cmakeFlags = [ "-DBUILD_TESTS=OFF" @@ -26,6 +26,9 @@ stdenv.mkDerivation { dontWrapQtApps = true; postInstall = '' + cd ../../.. + ${python.interpreter} setup.py egg_info --build-type=shiboken2 + cp -r shiboken2.egg-info $out/${python.sitePackages}/ rm $out/bin/shiboken_tool.py ''; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/simple-salesforce/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/simple-salesforce/default.nix index e9c054bdd4..af81f519f0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/simple-salesforce/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/simple-salesforce/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "simple-salesforce"; - version = "1.11.6"; + version = "1.12.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -20,8 +20,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = pname; repo = pname; - rev = "v${version}"; - sha256 = "sha256-/uaFEQnilcelHKjbmrnyLm5Mzj2V8P4oEH+cgJn+KvI="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-Y+pNEjj6OBPhe0RPpcHF452YLFPm/zYaCCbMt3e/GKM="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/simplisafe-python/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/simplisafe-python/default.nix index 07f0c1bf1e..62edf7b0fc 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/simplisafe-python/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/simplisafe-python/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { pname = "simplisafe-python"; - version = "2022.06.1"; + version = "2022.07.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -29,7 +29,7 @@ buildPythonPackage rec { owner = "bachya"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-5zhj1EAFZ2XCeSfcFN+7gHrcPx/YrEZQ8QfcmLUboIg="; + sha256 = "sha256-v3N2f5B6BrwTb4ik2bME8OLzwsHZ3qWx+Jx1pv7KX8A="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/spacy-loggers/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/spacy-loggers/default.nix index d74962779a..9de42f2a6c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/spacy-loggers/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/spacy-loggers/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "spacy-loggers"; - version = "1.0.2"; + version = "1.0.3"; src = fetchPypi { inherit pname version; - sha256 = "sha256-511E9M+Z5nY9cTLKfIxCDgqSeQIioIvI654k6iwTU24="; + sha256 = "sha256-APb9VU25/R/eZQGyPh8Ocvbu8Uux5/wVRW0R0dLekso="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sphinx-basic-ng/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sphinx-basic-ng/default.nix index df55a1316f..e6da481b96 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sphinx-basic-ng/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sphinx-basic-ng/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "sphinx-basic-ng"; - version = "0.0.1.a11"; + version = "0.0.1.a12"; disable = pythonOlder "3.7"; src = fetchFromGitHub { owner = "pradyunsg"; repo = "sphinx-basic-ng"; rev = version; - sha256 = "sha256-Eur3CadC2NTuBXosG4SN9t2L0qkqN+Q79bcvhvlG/f8="; + sha256 = "sha256-3/a/xHPNO96GEMLgWGTLdFoojVsjNyxYgY1gAZr75S0="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sphinx-togglebutton/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sphinx-togglebutton/default.nix index b524e8a1b8..f1056261fb 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sphinx-togglebutton/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sphinx-togglebutton/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "sphinx-togglebutton"; - version = "0.3.1"; + version = "0.3.2"; src = fetchPypi { inherit pname version; - sha256 = "1f13c25c27a8ff40d6fc924d324746c0adb0dedeef40730c8a8b64ff55c6c92c"; + sha256 = "sha256-qwyLNmQnsB5MiYAtXQeEcsQn+m6dEtUhw0+gRCVZ3Ho="; }; propagatedBuildInputs = [ wheel sphinx docutils ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sqlite-utils/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sqlite-utils/default.nix index e682365f92..fccbc4affa 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sqlite-utils/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sqlite-utils/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "sqlite-utils"; - version = "3.27"; + version = "3.28"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-SercPK2Svrq7rEULglvjq1J3FV0x0aHHKs72HmXkTGo="; + hash = "sha256-eQsB9L4WwydWubXq4HtrfJBbZhPKU41kaHfFCwWwpTo="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sqlmap/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sqlmap/default.nix index a6516d8e0b..87696e3acd 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sqlmap/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sqlmap/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "sqlmap"; - version = "1.6.6"; + version = "1.6.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-eXQ3sddIDHJ/pc6n5pmJoi3FvA8j2GMyWtToiKVIaVg="; + sha256 = "sha256-J0USsiCWaysQOir/wpkw6GT1ILckjK7EUiY541aoahA="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/statsd/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/statsd/default.nix index 561a1d14ca..da455c02d6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/statsd/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/statsd/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { sha256 = "07yxnlalvcglgwa9pjs1clwrmwx7a4575jai7q05jz3g4i6dprp3"; }; - buildInputs = [ nose mock ]; + checkInputs = [ nose mock ]; patchPhase = '' # Failing test: ERROR: statsd.tests.test_ipv6_resolution_udp diff --git a/third_party/nixpkgs/pkgs/development/python-modules/streamdeck/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/streamdeck/default.nix new file mode 100644 index 0000000000..7d7f007103 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/streamdeck/default.nix @@ -0,0 +1,36 @@ +{ lib +, stdenv +, buildPythonPackage +, fetchPypi +, substituteAll +, pkgs +}: + +buildPythonPackage rec { + pname = "streamdeck"; + version = "0.9.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "0116a376afc18f3abbf79cc1a4409f81472e19197d5641b9e97e697d105cbdc0"; + }; + + patches = [ + # substitute libusb path + (substituteAll { + src = ./hardcode-libusb.patch; + libusb = "${pkgs.hidapi}/lib/libhidapi-libusb${stdenv.hostPlatform.extensions.sharedLibrary}"; + }) + ]; + + pythonImportsCheck = [ "StreamDeck" ]; + doCheck = false; + + meta = with lib; { + description = "Python library to control the Elgato Stream Deck"; + homepage = "https://github.com/abcminiuser/python-elgato-streamdeck"; + license = licenses.mit; + maintainers = with maintainers; [ majiir ]; + broken = stdenv.isDarwin; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/streamdeck/hardcode-libusb.patch b/third_party/nixpkgs/pkgs/development/python-modules/streamdeck/hardcode-libusb.patch new file mode 100644 index 0000000000..acef15b540 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/streamdeck/hardcode-libusb.patch @@ -0,0 +1,13 @@ +diff --git a/src/StreamDeck/Transport/LibUSBHIDAPI.py b/src/StreamDeck/Transport/LibUSBHIDAPI.py +index 824c59c..f13754e 100644 +--- a/src/StreamDeck/Transport/LibUSBHIDAPI.py ++++ b/src/StreamDeck/Transport/LibUSBHIDAPI.py +@@ -110,7 +110,7 @@ class LibUSBHIDAPI(Transport): + + search_library_names = { + "Windows": ["hidapi.dll", "libhidapi-0.dll"], +- "Linux": ["libhidapi-libusb.so", "libhidapi-libusb.so.0"], ++ "Linux": ["@libusb@"], + "Darwin": ["libhidapi.dylib"], + } + diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tatsu/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tatsu/default.nix index b2a719a020..a78952b1e4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/tatsu/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/tatsu/default.nix @@ -5,15 +5,15 @@ buildPythonPackage rec { pname = "tatsu"; - version = "5.8.0"; + version = "5.8.1"; # upstream only supports 3.10+ disabled = pythonOlder "3.10"; src = fetchFromGitHub { owner = "neogeny"; repo = "TatSu"; - rev = "v${version}"; - sha256 = "sha256-spTIHiyspjrIV8DKR7YNpNTNO9SlcLOROuABhmu3ckA="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-2zEpP1WATqzAo0HsBGdjjk/RoliyIim1OltPoJTlxIU="; }; nativeBuildInputs = [ pytest-runner ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/taxi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/taxi/default.nix new file mode 100644 index 0000000000..a0ccf0167c --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/taxi/default.nix @@ -0,0 +1,37 @@ +{ lib +, buildPythonPackage +, fetchPypi +, appdirs +, requests +, click +, setuptools +, backends ? [ ] +}: + +buildPythonPackage rec { + pname = "taxi"; + version = "6.1.1"; + + src = fetchPypi { + inherit version; + pname = "taxi"; + sha256 = "b2562ed58bd6eae7896f4f8e48dbee9845cd2d452b26dd15c26f839b4864cb02"; + }; + + # No tests in pypy package + doCheck = false; + + propagatedBuildInputs = [ + appdirs + requests + click + setuptools + ] ++ backends; + + meta = with lib; { + homepage = "https://github.com/sephii/taxi/"; + description = "Timesheeting made easy"; + license = licenses.wtfpl; + maintainers = with maintainers; [ jocelynthode ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/testcontainers/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/testcontainers/default.nix new file mode 100644 index 0000000000..a690be8833 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/testcontainers/default.nix @@ -0,0 +1,39 @@ +{ lib +, fetchFromGitHub +, buildPythonPackage +, deprecation +, docker +, wrapt +}: + +buildPythonPackage rec { + pname = "testcontainers"; + version = "3.5.0"; + + src = fetchFromGitHub { + owner = "testcontainers"; + repo = "testcontainers-python"; + rev = "v${version}"; + sha256 = "sha256-uB3MbRVQzbUdZRxkGl635O+K17bkHIGY2JbU8R23Kt0="; + }; + + buildInputs = [ + deprecation + docker + wrapt + ]; + + # Tests require various container and database services running + doCheck = false; + + pythonImportsCheck = [ + "testcontainers" + ]; + + meta = with lib; { + description = "Allows using docker containers for functional and integration testing"; + homepage = "https://github.com/testcontainers/testcontainers-python"; + license = licenses.asl20; + maintainers = with maintainers; [ onny ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/textx/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/textx/default.nix new file mode 100644 index 0000000000..9243d3a3ed --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/textx/default.nix @@ -0,0 +1,178 @@ +{ lib +, buildPythonPackage +, python3 +, fetchFromGitHub +, mkdocs +, twine +, arpeggio +, click +, future +, setuptools +, callPackage +, gprof2dot +, html5lib +, jinja2 +, memory_profiler +, psutil +, pytestCheckHook +}: + +let + textx = buildPythonPackage rec { + pname = "textx"; + version = "3.0.0"; + format = "setuptools"; + + src = fetchFromGitHub { + owner = pname; + repo = pname; + rev = version; + sha256 = "sha256-uZlO82dKtWQQR5+Q7dWk3+ZoUzAjDJ8qzC4UMLCtnBk="; + }; + + postPatch = '' + substituteInPlace setup.cfg --replace "click >=7.0, <8.0" "click >=7.0" + ''; + + outputs = [ + "out" + "testout" + ]; + + nativeBuildInputs = [ + mkdocs + twine + ]; + + propagatedBuildInputs = [ + arpeggio + click + future + setuptools + ]; + + postInstall = '' + # FileNotFoundError: [Errno 2] No such file or directory: '$out/lib/python3.10/site-packages/textx/textx.tx + cp "$src/textx/textx.tx" "$out/${python3.sitePackages}/${pname}/" + + # Install tests as the tests output. + mkdir $testout + cp -r tests $testout/tests + ''; + + pythonImportsCheck = [ + "textx" + ]; + + # Circular dependencies, do tests in passthru.tests instead. + doCheck = false; + + passthru.tests = { + textxTests = callPackage ./tests.nix { + inherit + textx-data-dsl + textx-example-project + textx-flow-codegen + textx-flow-dsl + textx-types-dsl; + }; + }; + + meta = with lib; { + description = "Domain-specific languages and parsers in Python"; + homepage = "https://github.com/textx/textx/"; + license = licenses.mit; + maintainers = with maintainers; [ yuu ]; + }; + }; + + textx-data-dsl = buildPythonPackage rec { + pname = "textx-data-dsl"; + version = "1.0.0"; + inherit (textx) src; + # `format` isn't included in the output of `mk-python-derivation`. + # So can't inherit format: `error: attribute 'format' missing`. + format = "setuptools"; + pathToSourceRoot = "tests/functional/registration/projects/data_dsl"; + sourceRoot = "${src.name}/" + pathToSourceRoot; + propagatedBuildInputs = [ + textx + textx-types-dsl + ]; + meta = with lib; { + inherit (textx.meta) license maintainers; + description = "Sample textX language for testing"; + homepage = textx.homepage + "tree/${version}/" + pathToSourceRoot; + }; + }; + + textx-flow-codegen = buildPythonPackage rec { + pname = "textx-flow-codegen"; + version = "1.0.0"; + inherit (textx) src; + format = "setuptools"; + pathToSourceRoot = "tests/functional/registration/projects/flow_codegen"; + sourceRoot = "${src.name}/" + pathToSourceRoot; + propagatedBuildInputs = [ + click + textx + ]; + meta = with lib; { + inherit (textx.meta) license maintainers; + description = "Sample textX language for testing"; + homepage = textx.homepage + "tree/${version}/" + pathToSourceRoot; + }; + }; + + textx-flow-dsl = buildPythonPackage rec { + pname = "textx-flow-dsl"; + version = "1.0.0"; + inherit (textx) src; + format = "setuptools"; + pathToSourceRoot = "tests/functional/registration/projects/flow_dsl"; + sourceRoot = "${src.name}/" + pathToSourceRoot; + propagatedBuildInputs = [ + textx + ]; + meta = with lib; { + inherit (textx.meta) license maintainers; + description = "Sample textX language for testing"; + homepage = textx.homepage + "tree/${version}/" + pathToSourceRoot; + }; + }; + + textx-types-dsl = buildPythonPackage rec { + pname = "textx-types-dsl"; + version = "1.0.0"; + inherit (textx) src; + format = "setuptools"; + pathToSourceRoot = "tests/functional/registration/projects/types_dsl"; + sourceRoot = "${src.name}/" + pathToSourceRoot; + propagatedBuildInputs = [ + textx + ]; + meta = with lib; { + inherit (textx.meta) license maintainers; + description = "Sample textX language for testing"; + homepage = textx.homepage + "tree/${version}/" + pathToSourceRoot; + }; + }; + + textx-example-project = buildPythonPackage rec { + pname = "textx-example-project"; + version = "1.0.0"; + inherit (textx) src; + format = "setuptools"; + pathToSourceRoot = "tests/functional/subcommands/example_project"; + sourceRoot = "${src.name}/" + pathToSourceRoot; + propagatedBuildInputs = [ + textx + ]; + meta = with lib; { + inherit (textx.meta) license maintainers; + description = "Sample textX sub-command for testing"; + homepage = textx.homepage + "tree/${version}/" + pathToSourceRoot; + }; + }; +in + textx diff --git a/third_party/nixpkgs/pkgs/development/python-modules/textx/tests.nix b/third_party/nixpkgs/pkgs/development/python-modules/textx/tests.nix new file mode 100644 index 0000000000..021224e9f3 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/textx/tests.nix @@ -0,0 +1,53 @@ +{ lib +, buildPythonPackage +, click +, gprof2dot +, html5lib +, jinja2 +, memory_profiler +, psutil +, pytestCheckHook +, setuptools +, textx +, textx-data-dsl +, textx-example-project +, textx-flow-codegen +, textx-flow-dsl +, textx-types-dsl +}: + +buildPythonPackage { + pname = "textx-tests"; + inherit (textx) version; + + srcs = textx.testout; + + dontBuild = true; + dontInstall = true; + + checkInputs = [ + click + gprof2dot + html5lib + jinja2 + memory_profiler + psutil + pytestCheckHook + setuptools + textx-data-dsl + textx-example-project + textx-flow-codegen + textx-flow-dsl + textx-types-dsl + ]; + + pytestFlagsArray = [ + "tests/functional" + ]; + + meta = with lib; { + inherit (textx.meta) license maintainers; + description = "passthru.tests for textx"; + homepage = textx.homepage + "tree/${version}/" + "tests/"; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/transmission-rpc/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/transmission-rpc/default.nix index 1e510db972..2788d0ec8c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/transmission-rpc/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/transmission-rpc/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "transmission-rpc"; - version = "3.3.0"; + version = "3.3.2"; disabled = pythonOlder "3.6"; format = "pyproject"; @@ -20,8 +20,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "Trim21"; repo = "transmission-rpc"; - rev = "v${version}"; - sha256 = "sha256-Ys9trQMCHqxBSaTobWt8WZwi1F8HKTUKaIxvyo6ZPP0="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-GkhNOKatT/hJFw1l1xrf43jtgxvJ+WVvhz83Oe0MZ6w="; }; # remove once upstream has tagged version with dumped typing-extensions diff --git a/third_party/nixpkgs/pkgs/development/python-modules/trfl/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/trfl/default.nix new file mode 100644 index 0000000000..0f986f7148 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/trfl/default.nix @@ -0,0 +1,75 @@ +{ lib +, fetchFromGitHub +, buildPythonPackage +, numpy +, absl-py +, dm-tree +, wrapt +, tensorflow +, tensorflow-probability +, pytestCheckHook +, nose }: + +buildPythonPackage rec { + pname = "trfl"; + version = "1.2.0"; + + src = fetchFromGitHub { + owner = "deepmind"; + repo = pname; + rev = "ed6eff5b79ed56923bcb102e152c01ea52451d4c"; + sha256 = "sha256-UsDUKJCHSJ4gP+P95Pm7RsPpqTJqJhrsW47C7fTZ77I="; + }; + + buildInputs = [ + absl-py + dm-tree + numpy + wrapt + ]; + + propagatedBuildInputs = [ + tensorflow + tensorflow-probability + ]; + + checkInputs = [ + nose + pytestCheckHook + ]; + + pythonImportsCheck = [ + "trfl" + ]; + + # Tests currently fail with assertion errors + doCheck = false; + + disabledTestPaths = [ + # AssertionErrors + "trfl/indexing_ops_test.py" + "trfl/vtrace_ops_test.py" + "trfl/value_ops_test.py" + "trfl/target_update_ops_test.py" + "trfl/sequence_ops_test.py" + "trfl/retrace_ops_test.py" + "trfl/policy_ops_test.py" + "trfl/policy_gradient_ops_test.py" + "trfl/pixel_control_ops_test.py" + "trfl/periodic_ops_test.py" + "trfl/dpg_ops_test.py" + "trfl/distribution_ops_test.py" + "trfl/dist_value_ops_test.py" + "trfl/discrete_policy_gradient_ops_test.py" + "trfl/continuous_retrace_ops_test.py" + "trfl/clipping_ops_test.py" + "trfl/action_value_ops_test.py" + ]; + + meta = with lib; { + description = "TensorFlow Reinforcement Learning"; + homepage = "https://github.com/deepmind/trfl"; + license = licenses.asl20; + maintainers = with maintainers; [ onny ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/twilio/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/twilio/default.nix index 7f4a102d52..2b85e9ef8b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/twilio/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/twilio/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "twilio"; - version = "7.10.0"; + version = "7.11.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "twilio"; repo = "twilio-python"; rev = "refs/tags/${version}"; - hash = "sha256-UoSZ4g9RVnmnfZ7XxLafsNCSj396rrHz36fMwEoNL84="; + hash = "sha256-JeguDPbsG3aeXDqqojfJHGpDVniY+IvWMD2GCgCUvuQ="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/types-setuptools/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/types-setuptools/default.nix index be41acffdd..fafb100aa8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/types-setuptools/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/types-setuptools/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "types-setuptools"; - version = "62.6.1"; + version = "63.2.0"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-r/2WijpyGOHJbxgG60V/QCfqyAOzyq3cz5ik5XdrFyQ="; + sha256 = "sha256-/JpsR3ajmND1eyWcqJN0g0IXTFKjXVk9CLVvUqqZwaQ="; }; # Module doesn't have tests diff --git a/third_party/nixpkgs/pkgs/development/python-modules/unifi-discovery/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/unifi-discovery/default.nix index 309c87f8b3..5b1e864598 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/unifi-discovery/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/unifi-discovery/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "unifi-discovery"; - version = "1.1.4"; + version = "1.1.5"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "bdraco"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-+af1boeJtTI89ZJqgXXsxXQXGDhG4ewgukfKDdhWl9g="; + hash = "sha256-WO1oLD09fokMR7lVCqs1Qeodjc+Yg431otl9rohtmPo="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/venstarcolortouch/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/venstarcolortouch/default.nix index 10f92a9978..0672060d35 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/venstarcolortouch/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/venstarcolortouch/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "venstarcolortouch"; - version = "0.17"; + version = "0.18"; src = fetchPypi { inherit pname version; - sha256 = "sha256-HgUtGC2lXJ6BFhOnFK7DF4b/IooXIFPGcpJ4ru3kPNs="; + sha256 = "sha256-ucz0Ejpgiss8boF8dzt45FwpieNoJ6S3DUvtay6FDrw="; }; propagatedBuildInputs = [ @@ -19,7 +19,10 @@ buildPythonPackage rec { # Project has no tests doCheck = false; - pythonImportsCheck = [ "venstarcolortouch" ]; + + pythonImportsCheck = [ + "venstarcolortouch" + ]; meta = with lib; { description = "Python interface for Venstar ColorTouch thermostats Resources"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/voluptuous-serialize/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/voluptuous-serialize/default.nix index 97cd40fbc6..31ea68662a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/voluptuous-serialize/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/voluptuous-serialize/default.nix @@ -32,6 +32,6 @@ buildPythonPackage rec { homepage = "https://github.com/home-assistant-libs/voluptuous-serialize"; license = licenses.asl20; description = "Convert Voluptuous schemas to dictionaries so they can be serialized"; - maintainers = with maintainers; [ etu ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/vowpalwabbit/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/vowpalwabbit/default.nix index 87c3d7fe30..8e50197244 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/vowpalwabbit/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/vowpalwabbit/default.nix @@ -18,11 +18,11 @@ buildPythonPackage rec { pname = "vowpalwabbit"; - version = "9.0.1"; + version = "9.2.0"; src = fetchPypi{ inherit pname version; - sha256 = "sha256-rDUgOjroY8S73+s+MWyBl86u+8XCH4O8KMCo9zUlqAs="; + sha256 = "sha256-hh1AdMO9G2OwnG4qFiEbMHVpKwFGc7MBiOnde0vN9aU="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/webargs/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/webargs/default.nix index 31cedc7b40..57b0e82b6b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/webargs/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/webargs/default.nix @@ -4,12 +4,12 @@ buildPythonPackage rec { pname = "webargs"; - version = "8.1.0"; + version = "8.2.0"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "f1f0b7f054a22263cf750529fc0926709ca47da9a2c417d423ad88d9fa6a5d33"; + sha256 = "sha256-mdaJQMRS4HcmSFoV/vQ/EviubAxbORvLp2Bl1FJ/uF0="; }; pythonImportsCheck = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/webauthn/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/webauthn/default.nix index 757d591738..8b551f1c66 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/webauthn/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/webauthn/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "webauthn"; - version = "1.5.2"; + version = "1.6.0"; disabled = pythonOlder "3"; src = fetchFromGitHub { owner = "duo-labs"; repo = "py_webauthn"; - rev = "v${version}"; - sha256 = "sha256-sjl65vx1VthVX6ED3lXXAcn2D5WzzGAINKBjCc10rcs="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-Ts0zKnQg1EaBNB9xQmzOpEVwDSFwHNjIhEP1jTwEOFI="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/weconnect-mqtt/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/weconnect-mqtt/default.nix index 174d9e5b9f..eb8c8f51d7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/weconnect-mqtt/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/weconnect-mqtt/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "weconnect-mqtt"; - version = "0.37.2"; + version = "0.38.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "tillsteinbach"; repo = "WeConnect-mqtt"; rev = "refs/tags/v${version}"; - hash = "sha256-CzdQ5aYaxOZ2rE5vMP53u66OvBBWhi6yXvzGbbCHEuc="; + hash = "sha256-ybSslUdOlD87Kl6dkNRO/pHLBmQB3ioT/3p4uHYssBI="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/weconnect/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/weconnect/default.nix index f0c96acf5e..719682eb00 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/weconnect/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/weconnect/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "weconnect"; - version = "0.44.2"; + version = "0.45.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "tillsteinbach"; repo = "WeConnect-python"; rev = "v${version}"; - hash = "sha256-Sbo8KfcwmFjbQ0/MTMLO7HYVTksBI5kNjxQhHvgy/p4="; + hash = "sha256-iAKw05vMaGTQ/V1uwqbkO2AZOOtsMOfSnponnE5AdXE="; }; propagatedBuildInputs = [ @@ -43,7 +43,7 @@ buildPythonPackage rec { --replace "setup_requires=SETUP_REQUIRED," "setup_requires=[]," \ --replace "tests_require=TEST_REQUIRED," "tests_require=[]," substituteInPlace image_extra_requirements.txt \ - --replace "pillow~=9.0.1" "pillow" + --replace "pillow~=9.2.0" "pillow" substituteInPlace pytest.ini \ --replace "--cov=weconnect --cov-config=.coveragerc --cov-report html" "" \ --replace "pytest-cov" "" diff --git a/third_party/nixpkgs/pkgs/development/python-modules/xapian/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/xapian/default.nix index a71ade1b41..752204760d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/xapian/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/xapian/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { src = fetchurl { url = "https://oligarchy.co.uk/xapian/${version}/xapian-bindings-${version}.tar.xz"; - sha256 = "0j9awiiw9zf97r60m848absq43k37gghpyw7acxqjazfzd71fxvm"; + hash = "sha256-eGzCjQVmCyJ5VEE68OL2bk6tKgbT322rrqSERUtgHvU="; }; configureFlags = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/xlib/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/xlib/default.nix index edb4761af3..05d5e095a1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/xlib/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/xlib/default.nix @@ -22,6 +22,10 @@ buildPythonPackage rec { sha256 = "155p9xhsk01z9vdml74h07svlqy6gljnx9c6qbydcr14lwghwn06"; }; + patches = [ + ./fix-no-protocol-specified.patch + ]; + nativeBuildInputs = [ setuptools-scm ]; buildInputs = [ xorg.libX11 ]; propagatedBuildInputs = [ six ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/xlib/fix-no-protocol-specified.patch b/third_party/nixpkgs/pkgs/development/python-modules/xlib/fix-no-protocol-specified.patch new file mode 100644 index 0000000000..1f3ab927f8 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/xlib/fix-no-protocol-specified.patch @@ -0,0 +1,13 @@ +diff --git a/Xlib/xauth.py b/Xlib/xauth.py +index 2ed7dd5..303bd49 100644 +--- a/Xlib/xauth.py ++++ b/Xlib/xauth.py +@@ -120,6 +120,8 @@ class Xauthority(object): + matches = {} + + for efam, eaddr, enum, ename, edata in self.entries: ++ if enum == b'' and ename not in matches: ++ enum = num + if efam == family and eaddr == address and num == enum: + matches[ename] = edata + 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 9e274af99d..033c9937fa 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 @@ -40,7 +40,7 @@ buildPythonPackage rec { description = "ZHA Device Handlers are custom quirks implementations for Zigpy"; homepage = "https://github.com/dmulcahey/zha-device-handlers"; license = licenses.asl20; - maintainers = with maintainers; [ etu ]; + maintainers = with maintainers; [ ]; platforms = platforms.linux; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/zigpy-cc/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/zigpy-cc/default.nix index a89ad26ae7..ed4629c07f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/zigpy-cc/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/zigpy-cc/default.nix @@ -54,7 +54,7 @@ buildPythonPackage rec { description = "Library which communicates with Texas Instruments CC2531 radios for zigpy"; homepage = "https://github.com/zigpy/zigpy-cc"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ etu mvnetbiz ]; + maintainers = with maintainers; [ mvnetbiz ]; platforms = platforms.linux; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/zigpy-deconz/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/zigpy-deconz/default.nix index fbe0e6b6ac..3f7c7b46bf 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/zigpy-deconz/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/zigpy-deconz/default.nix @@ -44,7 +44,7 @@ buildPythonPackage rec { description = "Library which communicates with Deconz radios for zigpy"; homepage = "https://github.com/zigpy/zigpy-deconz"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ etu mvnetbiz ]; + maintainers = with maintainers; [ mvnetbiz ]; platforms = platforms.linux; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/zigpy-xbee/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/zigpy-xbee/default.nix index 0a1b62ef18..ba7292968a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/zigpy-xbee/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/zigpy-xbee/default.nix @@ -47,7 +47,7 @@ buildPythonPackage rec { description = "A library which communicates with XBee radios for zigpy"; homepage = "https://github.com/zigpy/zigpy-xbee"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ etu mvnetbiz ]; + maintainers = with maintainers; [ mvnetbiz ]; platforms = platforms.linux; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/zigpy-zigate/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/zigpy-zigate/default.nix index 80d5d6e993..83a7c4174d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/zigpy-zigate/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/zigpy-zigate/default.nix @@ -51,7 +51,7 @@ buildPythonPackage rec { description = "Library which communicates with ZiGate radios for zigpy"; homepage = "https://github.com/zigpy/zigpy-zigate"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ etu mvnetbiz ]; + maintainers = with maintainers; [ mvnetbiz ]; platforms = platforms.linux; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/zigpy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/zigpy/default.nix index fcea3b96cf..4988535538 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/zigpy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/zigpy/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "zigpy"; - version = "0.47.2"; + version = "0.47.3"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "zigpy"; repo = "zigpy"; rev = "refs/tags/${version}"; - sha256 = "sha256-Jx7KnukwWaSi16Buh+Dt7RiCFEbQXXypnKYbYoMQyDY="; + sha256 = "sha256-iEPE4YPpIJK4xZMT4SFKZ2tu61TiehB9HP81Jo3pg30="; }; propagatedBuildInputs = [ @@ -64,7 +64,7 @@ buildPythonPackage rec { description = "Library implementing a ZigBee stack"; homepage = "https://github.com/zigpy/zigpy"; license = licenses.gpl3Plus; - maintainers = with maintainers; [ etu mvnetbiz ]; + maintainers = with maintainers; [ mvnetbiz ]; platforms = platforms.linux; }; } diff --git a/third_party/nixpkgs/pkgs/development/tools/analysis/cppcheck/default.nix b/third_party/nixpkgs/pkgs/development/tools/analysis/cppcheck/default.nix index 9521e1e2df..7b85a76185 100644 --- a/third_party/nixpkgs/pkgs/development/tools/analysis/cppcheck/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/analysis/cppcheck/default.nix @@ -1,22 +1,33 @@ -{ lib, stdenv, fetchFromGitHub, libxslt, docbook_xsl, docbook_xml_dtd_45, pcre, withZ3 ? true, z3, python3 }: +{ lib +, stdenv +, fetchFromGitHub +, pcre +, python3 +, libxslt +, docbook_xsl +, docbook_xml_dtd_45 +, withZ3 ? true +, z3 +, which +}: stdenv.mkDerivation rec { pname = "cppcheck"; - version = "2.8"; + version = "2.8.2"; src = fetchFromGitHub { owner = "danmar"; repo = "cppcheck"; rev = version; - sha256 = "sha256-2gPgsu4XOPAEsxGNoDFl2Q7Vr/58SI98FnPeKZMv0go="; + sha256 = "sha256-Zv5dGjEtlloWdL2rkGEVLrVTS/QSRDjvDrequVSwgM0="; }; buildInputs = [ pcre (python3.withPackages (ps: [ps.pygments])) ] ++ lib.optionals withZ3 [ z3 ]; - nativeBuildInputs = [ libxslt docbook_xsl docbook_xml_dtd_45 ]; + nativeBuildInputs = [ libxslt docbook_xsl docbook_xml_dtd_45 which ]; - makeFlags = [ "PREFIX=$(out)" "FILESDIR=$(out)/cfg" "HAVE_RULES=yes" ] + makeFlags = [ "PREFIX=$(out)" "MATCHCOMPILER=yes" "FILESDIR=$(out)/share/cppcheck" "HAVE_RULES=yes" ] ++ lib.optionals withZ3 [ "USE_Z3=yes" "CPPFLAGS=-DNEW_Z3=1" ]; outputs = [ "out" "man" ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/bacon/default.nix b/third_party/nixpkgs/pkgs/development/tools/bacon/default.nix index 6f5fc569de..d6374b0163 100644 --- a/third_party/nixpkgs/pkgs/development/tools/bacon/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/bacon/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "bacon"; - version = "2.2.0"; + version = "2.2.1"; src = fetchFromGitHub { owner = "Canop"; repo = pname; rev = "v${version}"; - sha256 = "sha256-GoaWlnlE/UfLX3HjbQXPMBOdlplParq7HHAfCUcdGLc="; + sha256 = "sha256-DpTN/Aw27M1s8T6ka1gwlI4WZ2MqP3PJ96XwxqlS0eM="; }; - cargoSha256 = "sha256-3heAu8n1Dm7ewYTSCwxtgpF2vn/D5B52BuM9qz0X7Yc="; + cargoSha256 = "sha256-yY8oFvb++vye17aSCGw5BZ/Jgd46vPNJpqK+gKRoPvw="; buildInputs = lib.optional stdenv.isDarwin CoreServices; diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/bear/default.nix b/third_party/nixpkgs/pkgs/development/tools/build-managers/bear/default.nix index 21f7512588..e636f938c7 100644 --- a/third_party/nixpkgs/pkgs/development/tools/build-managers/bear/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/bear/default.nix @@ -17,13 +17,13 @@ stdenv.mkDerivation rec { pname = "bear"; - version = "3.0.14"; + version = "3.0.19"; src = fetchFromGitHub { owner = "rizsotto"; repo = pname; rev = version; - sha256 = "0qy96dyd29bjvfhi46y30hli5cvshw8am0spvcv9v43660wbczd7"; + sha256 = "sha256-Jj38dmzr8NDDMercfWyJrMFxGBSExCGPeG2IVEtnSxY="; }; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/bear/no-double-relative.patch b/third_party/nixpkgs/pkgs/development/tools/build-managers/bear/no-double-relative.patch index 257c7ffea3..e8087feb1a 100644 --- a/third_party/nixpkgs/pkgs/development/tools/build-managers/bear/no-double-relative.patch +++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/bear/no-double-relative.patch @@ -1,22 +1,27 @@ -diff --git i/source/config.h.in w/source/config.h.in -index ffcce3a..0caba6d 100644 ---- i/source/config.h.in -+++ w/source/config.h.in -@@ -107,7 +107,7 @@ namespace cmd { +diff --git a/source/config.h.in b/source/config.h.in +index 6b659c2..f7bdf22 100644 +--- a/source/config.h.in ++++ b/source/config.h.in +@@ -108,8 +108,8 @@ namespace cmd { } namespace wrapper { -- constexpr char DEFAULT_PATH[] = "@ROOT_INSTALL_PREFIX@/@PRIVATE_INSTALLDIR@/wrapper"; -+ constexpr char DEFAULT_PATH[] = "@PRIVATE_INSTALLDIR@/wrapper"; - constexpr char DEFAULT_DIR_PATH[] = "@ROOT_INSTALL_PREFIX@/@PRIVATE_INSTALLDIR@/wrapper.d"; +- constexpr char DEFAULT_PATH[] = "@ROOT_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@/bear/wrapper"; +- constexpr char DEFAULT_DIR_PATH[] = "@ROOT_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@/bear/wrapper.d"; ++ constexpr char DEFAULT_PATH[] = "@CMAKE_INSTALL_LIBDIR@/bear/wrapper"; ++ constexpr char DEFAULT_DIR_PATH[] = "@CMAKE_INSTALL_LIBDIR@/bear/wrapper.d"; constexpr char FLAG_VERBOSE[] = "--verbose"; -@@ -120,7 +120,7 @@ namespace cmd { - } - - namespace library { -- constexpr char DEFAULT_PATH[] = "@ROOT_INSTALL_PREFIX@/@PRIVATE_INSTALLDIR@/@CMAKE_SHARED_LIBRARY_PREFIX@exec@CMAKE_SHARED_LIBRARY_SUFFIX@"; -+ constexpr char DEFAULT_PATH[] = "@PRIVATE_INSTALLDIR@/@CMAKE_SHARED_LIBRARY_PREFIX@exec@CMAKE_SHARED_LIBRARY_SUFFIX@"; - + constexpr char FLAG_DESTINATION[] = "--destination"; +@@ -134,9 +134,9 @@ namespace cmd { + // And use the `libexec.so` path default value with a single path, + // that matches both. (The match can be achieved by the $LIB token + // expansion from the dynamic loader. See `man ld.so` for more.) +- constexpr char DEFAULT_PATH[] = "@ROOT_INSTALL_PREFIX@/$LIB/bear/@CMAKE_SHARED_LIBRARY_PREFIX@exec@CMAKE_SHARED_LIBRARY_SUFFIX@"; ++ constexpr char DEFAULT_PATH[] = "$LIB/bear/@CMAKE_SHARED_LIBRARY_PREFIX@exec@CMAKE_SHARED_LIBRARY_SUFFIX@"; + #else +- constexpr char DEFAULT_PATH[] = "@ROOT_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@/bear/@CMAKE_SHARED_LIBRARY_PREFIX@exec@CMAKE_SHARED_LIBRARY_SUFFIX@"; ++ constexpr char DEFAULT_PATH[] = "@CMAKE_INSTALL_LIBDIR@/bear/@CMAKE_SHARED_LIBRARY_PREFIX@exec@CMAKE_SHARED_LIBRARY_SUFFIX@"; + #endif constexpr char KEY_REPORTER[] = "INTERCEPT_REPORT_COMMAND"; constexpr char KEY_DESTINATION[] = "INTERCEPT_REPORT_DESTINATION"; diff --git a/third_party/nixpkgs/pkgs/development/tools/cambalache/default.nix b/third_party/nixpkgs/pkgs/development/tools/cambalache/default.nix index 781dd86cd7..0fc470ca9a 100644 --- a/third_party/nixpkgs/pkgs/development/tools/cambalache/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/cambalache/default.nix @@ -20,7 +20,7 @@ python3.pkgs.buildPythonApplication rec { pname = "cambalache"; - version = "0.10.2"; + version = "0.10.3"; format = "other"; @@ -29,7 +29,7 @@ python3.pkgs.buildPythonApplication rec { owner = "jpu"; repo = pname; rev = version; - sha256 = "sha256-/0HMtNR9R/Oq1ZoBaLe4iU0OOVZUozuo8gP0j9J8hdc="; + sha256 = "sha256-Xm8h3BBRibdLCeI/OeprF5dCCiNrfJCg7aE24uleCds="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/tools/comby/comby.patch b/third_party/nixpkgs/pkgs/development/tools/comby/comby.patch new file mode 100644 index 0000000000..ec1f514198 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/comby/comby.patch @@ -0,0 +1,1025 @@ +diff --git a/comby-kernel.opam b/comby-kernel.opam +index 828c5a3..00f6c3d 100644 +--- a/comby-kernel.opam ++++ b/comby-kernel.opam +@@ -20,7 +20,7 @@ build: [ + depends: [ + "dune" {>= "2.8.0"} + "ocaml" {>= "4.08.1"} +- "core_kernel" ++ "core_kernel" {>= "v0.15.0"} + "mparser" {>= "1.3"} + "mparser-pcre" + "ppx_deriving" +diff --git a/comby-semantic.opam b/comby-semantic.opam +index cb9dcc7..443749f 100644 +--- a/comby-semantic.opam ++++ b/comby-semantic.opam +@@ -20,7 +20,7 @@ build: [ + depends: [ + "dune" {>= "2.8.0"} + "ocaml" {>= "4.08.1"} +- "core_kernel" ++ "core_kernel" {>= "v0.15.0"} + "ppx_deriving" + "lwt" + "cohttp" +diff --git a/comby.opam b/comby.opam +index 98bdc19..d45892c 100644 +--- a/comby.opam ++++ b/comby.opam +@@ -31,7 +31,7 @@ depends: [ + "cohttp-lwt-unix" + "comby-kernel" {= "1.7.0"} + "comby-semantic" {= "1.7.0"} +- "core" ++ "core" {>= "v0.15.0"} + "hack_parallel" {arch != "arm32" & arch != "arm64"} + "lwt" + "lwt_react" +diff --git a/dune b/dune +index 53b1312..a71571a 100644 +--- a/dune ++++ b/dune +@@ -1,6 +1,8 @@ + (env + (dev +- (flags (:standard -w A-3-4-32-34-37-39-40-41-42-44-45-48-49-50-57-60-66-67))) ++ (flags ++ (:standard -w A-3-4-32-34-37-39-40-41-42-44-45-48-49-50-57-60-66-67))) + (release +- (flags (:standard -w A-3-4-32-34-37-39-40-41-42-44-45-48-49-50-57-60-66-67)) +- (ocamlopt_flags (-O3)))) ++ (flags ++ (:standard -w A-3-4-32-34-37-39-40-41-42-44-45-48-49-50-57-60-66-67)) ++ (ocamlopt_flags (-O3)))) +diff --git a/lib/app/configuration/command_configuration.ml b/lib/app/configuration/command_configuration.ml +index eed8420..aea4dfa 100644 +--- a/lib/app/configuration/command_configuration.ml ++++ b/lib/app/configuration/command_configuration.ml +@@ -16,21 +16,21 @@ type 'a next = + + let fold_directory ?(sorted=false) root ~init ~f = + let rec aux acc absolute_path depth = +- if Sys.is_file absolute_path = `Yes then ++ if Sys_unix.is_file absolute_path = `Yes then + match f acc ~depth ~absolute_path ~is_file:true with + | Continue acc + | Skip acc -> acc +- else if Sys.is_directory absolute_path = `Yes then ++ else if Sys_unix.is_directory absolute_path = `Yes then + match f acc ~depth ~absolute_path ~is_file:false with + | Skip acc -> acc + | Continue acc -> + let dir_contents = + if Option.is_some (Sys.getenv "COMBY_TEST") || sorted then +- Sys.ls_dir absolute_path ++ Sys_unix.ls_dir absolute_path + |> List.sort ~compare:String.compare + |> List.rev + else +- Sys.ls_dir absolute_path ++ Sys_unix.ls_dir absolute_path + in + List.fold dir_contents ~init:acc ~f:(fun acc subdir -> + aux acc (Filename.concat absolute_path subdir) (depth + 1)) +@@ -50,8 +50,8 @@ let parse_source_directories + let exact_file_paths, file_patterns = + List.partition_map file_filters ~f:(fun path -> + let is_exact path = +- (String.contains path '/' && Sys.is_file path = `Yes) +- || (Sys.is_file ("." ^/ path) = `Yes) (* See if it matches something in the current directory *) ++ (String.contains path '/' && Sys_unix.is_file path = `Yes) ++ || (Sys_unix.is_file ("." ^/ path) = `Yes) (* See if it matches something in the current directory *) + in + if is_exact path then Either.First path else Either.Second path) + in +@@ -167,8 +167,8 @@ let parse_templates ?metasyntax ?(warn_for_missing_file_in_dir = false) paths = + let f acc ~depth:_ ~absolute_path ~is_file = + let is_leaf_directory absolute_path = + not is_file && +- Sys.ls_dir absolute_path +- |> List.for_all ~f:(fun path -> Sys.is_directory (absolute_path ^/ path) = `No) ++ Sys_unix.ls_dir absolute_path ++ |> List.for_all ~f:(fun path -> Sys_unix.is_directory (absolute_path ^/ path) = `No) + in + if is_leaf_directory absolute_path then + match parse_directory absolute_path with +@@ -178,7 +178,7 @@ let parse_templates ?metasyntax ?(warn_for_missing_file_in_dir = false) paths = + Continue acc + in + List.concat_map paths ~f:(fun path -> +- if Sys.is_directory path = `Yes then ++ if Sys_unix.is_directory path = `Yes then + fold_directory path ~sorted:true ~init:[] ~f + else + parse_toml ?metasyntax path) +@@ -421,7 +421,7 @@ let parse_metasyntax metasyntax_path = + match metasyntax_path with + | None -> Matchers.Metasyntax.default_metasyntax + | Some metasyntax_path -> +- match Sys.file_exists metasyntax_path with ++ match Sys_unix.file_exists metasyntax_path with + | `No | `Unknown -> + Format.eprintf "Could not open file: %s@." metasyntax_path; + exit 1 +@@ -470,12 +470,12 @@ let emit_errors { input_options; output_options; _ } = + ; Option.is_some input_options.directory_depth + && Option.value_exn (input_options.directory_depth) < 0 + , "-depth must be 0 or greater." +- ; Sys.is_directory input_options.target_directory = `No ++ ; Sys_unix.is_directory input_options.target_directory = `No + , "Directory specified with -d or -directory is not a directory." + ; output_options.json_only_diff && not output_options.json_lines + , "-json-only-diff can only be supplied with -json-lines." + ; Option.is_some output_options.interactive_review && +- (not (String.equal input_options.target_directory (Sys.getcwd ()))) ++ (not (String.equal input_options.target_directory (Sys_unix.getcwd ()))) + , "Please remove the -d option and `cd` to the directory where you want to \ + review from. The -review, -editor, or -default-no options should only be run \ + at the root directory of the project files to patch." +@@ -483,11 +483,11 @@ let emit_errors { input_options; output_options; _ } = + match input_options.templates with + | Some inputs -> + List.find_map inputs ~f:(fun input -> +- if Sys.is_file input = `Yes then ++ if Sys_unix.is_file input = `Yes then + (match Toml.Parser.from_filename input with + | `Error (s, _) -> Some s + | _ -> None) +- else if not (Sys.is_directory input = `Yes) then ++ else if not (Sys_unix.is_directory input = `Yes) then + Some (Format.sprintf "Directory %S specified with -templates is not a directory." input) + else + None) +@@ -599,7 +599,7 @@ let filter_zip_entries file_filters exclude_directory_prefix exclude_file_prefix + + let syntax custom_matcher_path = + match +- Sys.file_exists custom_matcher_path with ++ Sys_unix.file_exists custom_matcher_path with + | `No | `Unknown -> + Format.eprintf "Could not open file: %s@." custom_matcher_path; + exit 1 +@@ -783,7 +783,7 @@ let create + | Directory -> + let target_directory = + if target_directory = "." then +- Filename.realpath target_directory ++ Filename_unix.realpath target_directory + else + target_directory + in +diff --git a/lib/app/configuration/dune b/lib/app/configuration/dune +index e0f9748..e417cfe 100644 +--- a/lib/app/configuration/dune ++++ b/lib/app/configuration/dune +@@ -1,6 +1,21 @@ + (library +- (name configuration) +- (public_name comby.configuration) +- (instrumentation (backend bisect_ppx)) +- (preprocess (pps ppx_deriving.show ppx_sexp_conv ppx_sexp_message ppx_deriving_yojson)) +- (libraries comby-kernel comby-semantic comby.patdiff comby.camlzip core yojson ppx_deriving_yojson toml lwt lwt.unix tar tar-unix)) ++ (name configuration) ++ (public_name comby.configuration) ++ (instrumentation ++ (backend bisect_ppx)) ++ (preprocess ++ (pps ppx_deriving.show ppx_sexp_conv ppx_sexp_message ppx_deriving_yojson)) ++ (libraries ++ comby-kernel ++ comby-semantic ++ comby.patdiff ++ comby.camlzip ++ core ++ core_unix.sys_unix ++ yojson ++ ppx_deriving_yojson ++ toml ++ lwt ++ lwt.unix ++ tar ++ tar-unix)) +diff --git a/lib/app/configuration/external_semantic.ml b/lib/app/configuration/external_semantic.ml +index bdc7051..ac69b1b 100644 +--- a/lib/app/configuration/external_semantic.ml ++++ b/lib/app/configuration/external_semantic.ml +@@ -2,13 +2,10 @@ open Core_kernel + + open Comby_semantic + +-let debug = +- match Sys.getenv "DEBUG_COMBY" with +- | exception Not_found -> false +- | _ -> true ++let debug = Sys.getenv "DEBUG_COMBY" |> Option.is_some + + let lsif_hover ~name:_ ~filepath ~line ~column = +- String.chop_prefix_if_exists filepath ~prefix:(Sys.getcwd ()) |> fun filepath_relative_root -> ++ String.chop_prefix_if_exists filepath ~prefix:(Sys_unix.getcwd ()) |> fun filepath_relative_root -> + if debug then Format.printf "File relative root: %s@." filepath; + if debug then Format.printf "Querying type at %d::%d@." line column; + let context = +diff --git a/lib/app/dune b/lib/app/dune +index 2ed553c..a91f826 100644 +--- a/lib/app/dune ++++ b/lib/app/dune +@@ -1,9 +1,8 @@ + (library +- (name comby) +- (public_name comby) +- (instrumentation (backend bisect_ppx)) +- (preprocess (pps ppx_deriving.show ppx_deriving.eq ppx_sexp_conv)) +- (libraries +- core +- comby-kernel +- comby.pipeline)) ++ (name comby) ++ (public_name comby) ++ (instrumentation ++ (backend bisect_ppx)) ++ (preprocess ++ (pps ppx_deriving.show ppx_deriving.eq ppx_sexp_conv)) ++ (libraries core comby-kernel comby.pipeline)) +diff --git a/lib/app/interactive/dune b/lib/app/interactive/dune +index 815aff5..63c1757 100644 +--- a/lib/app/interactive/dune ++++ b/lib/app/interactive/dune +@@ -1,5 +1,12 @@ + (library +- (name interactive) +- (public_name comby.interactive) +- (preprocess (pps ppx_sexp_conv)) +- (libraries comby-kernel comby.configuration core shell.filename_extended lwt lwt.unix)) ++ (name interactive) ++ (public_name comby.interactive) ++ (preprocess ++ (pps ppx_sexp_conv)) ++ (libraries ++ comby-kernel ++ comby.configuration ++ core ++ shell.filename_extended ++ lwt ++ lwt.unix)) +diff --git a/lib/app/interactive/interactive.ml b/lib/app/interactive/interactive.ml +index d4bf200..b27105a 100644 +--- a/lib/app/interactive/interactive.ml ++++ b/lib/app/interactive/interactive.ml +@@ -1,5 +1,6 @@ + open Core + open Lwt ++module Unix = Core_unix + + open Configuration + +@@ -37,6 +38,7 @@ module Diff = struct + ~big_enough:line_big_enough + ~prev + ~next ++ () + | Some prog -> + let compare x y = + let cmd = sprintf "%s %S %S" prog x y in +@@ -52,7 +54,7 @@ module Diff = struct + let compare = compare + end) + in +- P.get_hunks ~transform ~context ~big_enough:line_big_enough ~prev ~next ++ P.get_hunks ~transform ~context ~big_enough:line_big_enough ~prev ~next () + in + match float_tolerance with + | None -> hunks +diff --git a/lib/app/pipeline/dune b/lib/app/pipeline/dune +index 3369b9e..e6ec880 100644 +--- a/lib/app/pipeline/dune ++++ b/lib/app/pipeline/dune +@@ -1,11 +1,23 @@ + (library +- (name pipeline) +- (public_name comby.pipeline) +- (instrumentation (backend bisect_ppx)) +- (preprocess (pps ppx_sexp_conv ppx_deriving_yojson)) +- (libraries comby-kernel comby.statistics comby.configuration comby.interactive comby.camlzip core core.uuid yojson ppx_deriving_yojson parany +- (select parallel_hack.ml from +- (hack_parallel -> parallel_hack.available.ml) +- (!hack_parallel -> parallel_hack.parany_fallback.ml)) +- )) +- ++ (name pipeline) ++ (public_name comby.pipeline) ++ (instrumentation ++ (backend bisect_ppx)) ++ (preprocess ++ (pps ppx_sexp_conv ppx_deriving_yojson)) ++ (libraries ++ comby-kernel ++ comby.statistics ++ comby.configuration ++ comby.interactive ++ comby.camlzip ++ core ++ core_unix.uuid ++ yojson ++ ppx_deriving_yojson ++ parany ++ (select ++ parallel_hack.ml ++ from ++ (hack_parallel -> parallel_hack.available.ml) ++ (!hack_parallel -> parallel_hack.parany_fallback.ml)))) +diff --git a/lib/app/pipeline/parallel_hack.available.ml b/lib/app/pipeline/parallel_hack.available.ml +index a901eea..ad33070 100644 +--- a/lib/app/pipeline/parallel_hack.available.ml ++++ b/lib/app/pipeline/parallel_hack.available.ml +@@ -1,4 +1,5 @@ + open Core ++module Unix = Core_unix + + open Hack_parallel + +diff --git a/lib/app/statistics/dune b/lib/app/statistics/dune +index b14d5b1..12aff7f 100644 +--- a/lib/app/statistics/dune ++++ b/lib/app/statistics/dune +@@ -1,6 +1,8 @@ + (library +- (name statistics) +- (public_name comby.statistics) +- (instrumentation (backend bisect_ppx)) +- (preprocess (pps ppx_deriving_yojson)) +- (libraries yojson ppx_deriving_yojson ppx_deriving_yojson.runtime)) ++ (name statistics) ++ (public_name comby.statistics) ++ (instrumentation ++ (backend bisect_ppx)) ++ (preprocess ++ (pps ppx_deriving_yojson)) ++ (libraries yojson ppx_deriving_yojson ppx_deriving_yojson.runtime)) +diff --git a/lib/app/vendored/camlzip/dune b/lib/app/vendored/camlzip/dune +index 56ea8ff..1c67be1 100644 +--- a/lib/app/vendored/camlzip/dune ++++ b/lib/app/vendored/camlzip/dune +@@ -7,7 +7,9 @@ + ; as long as the unix parts are not needed, but I want it to + ; compile executables for tests + (libraries unix) +- (foreign_stubs (language c) (names zlibstubs)) ++ (foreign_stubs ++ (language c) ++ (names zlibstubs)) + (c_library_flags + (:include c_flags.sexp) + (:include c_library_flags.sexp))) +@@ -21,7 +23,9 @@ + + (env + (dev +- (flags (:standard -w A-3-4-27-29-32-34-35-39-40-41-42-44-45-48-49-50-57-60))) ++ (flags ++ (:standard -w A-3-4-27-29-32-34-35-39-40-41-42-44-45-48-49-50-57-60))) + (release +- (flags (:standard -w A-3-4-27-29-32-34-35-39-40-41-42-44-45-48-49-50-57-60)) +- (ocamlopt_flags (-O3)))) ++ (flags ++ (:standard -w A-3-4-27-29-32-34-35-39-40-41-42-44-45-48-49-50-57-60)) ++ (ocamlopt_flags (-O3)))) +diff --git a/lib/app/vendored/patdiff/kernel/src/dune b/lib/app/vendored/patdiff/kernel/src/dune +index 7a6353d..b79cba2 100644 +--- a/lib/app/vendored/patdiff/kernel/src/dune ++++ b/lib/app/vendored/patdiff/kernel/src/dune +@@ -1,3 +1,6 @@ +-(library (name patdiff_kernel) (public_name comby.patdiff_kernel) ++(library ++ (name patdiff_kernel) ++ (public_name comby.patdiff_kernel) + (libraries core_kernel.composition_infix core_kernel patience_diff re) +- (preprocess (pps ppx_jane))) ++ (preprocess ++ (pps ppx_jane))) +diff --git a/lib/app/vendored/patdiff/kernel/src/patdiff_core.ml b/lib/app/vendored/patdiff/kernel/src/patdiff_core.ml +index 4f53a0b..88ee0e3 100644 +--- a/lib/app/vendored/patdiff/kernel/src/patdiff_core.ml ++++ b/lib/app/vendored/patdiff/kernel/src/patdiff_core.ml +@@ -138,6 +138,7 @@ module Make (Output_impls : Output_impls) = struct + ~big_enough:line_big_enough + ~prev + ~next ++ () + ;; + + type word_or_newline = +@@ -345,6 +346,7 @@ module Make (Output_impls : Output_impls) = struct + ~big_enough:word_big_enough + ~prev:prev_pieces + ~next:next_pieces ++ () + ;; + + let ranges_are_just_whitespace (ranges : _ Patience_diff.Range.t list) = +diff --git a/lib/app/vendored/patdiff/lib/src/compare_core.ml b/lib/app/vendored/patdiff/lib/src/compare_core.ml +index fafb201..8b40d09 100644 +--- a/lib/app/vendored/patdiff/lib/src/compare_core.ml ++++ b/lib/app/vendored/patdiff/lib/src/compare_core.ml +@@ -1,5 +1,6 @@ + open! Core + open! Import ++module Unix = Core_unix + + let lines_of_contents contents = + let lines = Array.of_list (String.split_lines contents) in +@@ -100,6 +101,7 @@ let compare_lines (config : Configuration.t) ?prev_diff ?next_diff ~prev ~next ( + ~big_enough:line_big_enough + ~prev + ~next ++ () + | Some prog -> + let compare x y = + let cmd = sprintf "%s %S %S" prog x y in +@@ -116,7 +118,7 @@ let compare_lines (config : Configuration.t) ?prev_diff ?next_diff ~prev ~next ( + let compare = compare + end) + in +- P.get_hunks ~transform ~context ~big_enough:line_big_enough ~prev ~next ++ P.get_hunks ~transform ~context ~big_enough:line_big_enough ~prev ~next () + in + let hunks = + match config.float_tolerance with +@@ -361,7 +363,7 @@ let rec diff_dirs_internal (config : Configuration.t) ~prev_dir ~next_dir ~file_ + | None -> Fn.const true + | Some file_filter -> file_filter + in +- Sys.ls_dir (File_name.real_name_exn dir) ++ Sys_unix.ls_dir (File_name.real_name_exn dir) + |> List.filter ~f:(fun x -> + let x = File_name.real_name_exn dir ^/ x in + match Unix.stat x with +diff --git a/lib/app/vendored/patdiff/lib/src/compare_core.mli b/lib/app/vendored/patdiff/lib/src/compare_core.mli +index e919512..caa8dcb 100644 +--- a/lib/app/vendored/patdiff/lib/src/compare_core.mli ++++ b/lib/app/vendored/patdiff/lib/src/compare_core.mli +@@ -1,5 +1,6 @@ + open! Core + open! Import ++module Unix = Core_unix + + val diff_files + : Configuration.t +diff --git a/lib/app/vendored/patdiff/lib/src/configuration.ml b/lib/app/vendored/patdiff/lib/src/configuration.ml +index 6879daa..7d59706 100644 +--- a/lib/app/vendored/patdiff/lib/src/configuration.ml ++++ b/lib/app/vendored/patdiff/lib/src/configuration.ml +@@ -481,7 +481,7 @@ let rec load_exn' ~set config_file = + | Error _another_exn -> raise exn + | Ok c -> + (let new_file = config_file ^ ".new" in +- match Sys.file_exists new_file with ++ match Sys_unix.file_exists new_file with + | `Yes | `Unknown -> () + | `No -> + (try Sexp.save_hum new_file (On_disk.V1.sexp_of_t c) with +@@ -564,7 +564,7 @@ let get_config ?filename () = + (* ~/.patdiff exists *) + Option.bind (Sys.getenv "HOME") ~f:(fun home -> + let f = home ^/ ".patdiff" in +- match Sys.file_exists f with ++ match Sys_unix.file_exists f with + | `Yes -> Some f + | `No | `Unknown -> None) + in +diff --git a/lib/app/vendored/patdiff/lib/src/dune b/lib/app/vendored/patdiff/lib/src/dune +index 007acad..b6a0f80 100644 +--- a/lib/app/vendored/patdiff/lib/src/dune ++++ b/lib/app/vendored/patdiff/lib/src/dune +@@ -1,4 +1,13 @@ +-(library (name patdiff) (public_name comby.patdiff) +- (libraries core_kernel.composition_infix core core.linux_ext comby.patdiff_kernel ++(library ++ (name patdiff) ++ (public_name comby.patdiff) ++ (libraries ++ core_kernel.composition_infix ++ core ++ core_unix ++ core_unix.linux_ext ++ core_unix.sys_unix ++ comby.patdiff_kernel + patience_diff) +- (preprocess (pps ppx_jane))) ++ (preprocess ++ (pps ppx_jane))) +diff --git a/lib/app/vendored/patdiff/lib/src/html_output.ml b/lib/app/vendored/patdiff/lib/src/html_output.ml +index 3d08f91..93ae8af 100644 +--- a/lib/app/vendored/patdiff/lib/src/html_output.ml ++++ b/lib/app/vendored/patdiff/lib/src/html_output.ml +@@ -1,5 +1,6 @@ + open! Core + open! Import ++module Unix = Core_unix + + include Patdiff_kernel.Html_output.Private.Make (struct + let mtime file = +diff --git a/lib/kernel/dune b/lib/kernel/dune +index 0961dad..07a929b 100644 +--- a/lib/kernel/dune ++++ b/lib/kernel/dune +@@ -1,10 +1,12 @@ + (library +- (name comby_kernel) +- (public_name comby-kernel) +- (instrumentation (backend bisect_ppx)) +- (preprocess (pps ppx_deriving.show ppx_deriving.eq ppx_sexp_conv)) +- (libraries +- core_kernel +- comby-kernel.match +- comby-kernel.matchers +- comby-kernel.replacement)) ++ (name comby_kernel) ++ (public_name comby-kernel) ++ (instrumentation ++ (backend bisect_ppx)) ++ (preprocess ++ (pps ppx_deriving.show ppx_deriving.eq ppx_sexp_conv)) ++ (libraries ++ core_kernel ++ comby-kernel.match ++ comby-kernel.matchers ++ comby-kernel.replacement)) +diff --git a/lib/kernel/match/dune b/lib/kernel/match/dune +index 03b120a..4d48b61 100644 +--- a/lib/kernel/match/dune ++++ b/lib/kernel/match/dune +@@ -1,6 +1,12 @@ + (library +- (name match) +- (public_name comby-kernel.match) +- (instrumentation (backend bisect_ppx)) +- (preprocess (pps ppx_deriving.eq ppx_sexp_conv ppx_deriving_yojson)) +- (libraries core_kernel yojson ppx_deriving_yojson ppx_deriving_yojson.runtime)) ++ (name match) ++ (public_name comby-kernel.match) ++ (instrumentation ++ (backend bisect_ppx)) ++ (preprocess ++ (pps ppx_deriving.eq ppx_sexp_conv ppx_deriving_yojson)) ++ (libraries ++ core_kernel ++ yojson ++ ppx_deriving_yojson ++ ppx_deriving_yojson.runtime)) +diff --git a/lib/kernel/matchers/alpha.ml b/lib/kernel/matchers/alpha.ml +index e31094d..01adb52 100644 +--- a/lib/kernel/matchers/alpha.ml ++++ b/lib/kernel/matchers/alpha.ml +@@ -13,20 +13,11 @@ module R = MakeRegexp(Regexp) + let configuration_ref = ref (Configuration.create ()) + let weaken_delimiter_hole_matching = false + +-let debug = +- match Sys.getenv "DEBUG_COMBY" with +- | exception Not_found -> false +- | _ -> true ++let debug = Sys.getenv "DEBUG_COMBY" |> Option.is_some + +-let debug_hole = +- match Sys.getenv "DEBUG_COMBY_HOLE" with +- | exception Not_found -> false +- | _ -> true ++let debug_hole = Sys.getenv "DEBUG_COMBY_HOLE" |> Option.is_some + +-let debug_position = +- match Sys.getenv "DEBUG_COMBY_POS" with +- | exception Not_found -> false +- | _ -> true ++let debug_position = Sys.getenv "DEBUG_COMBY_POS" |> Option.is_some + + let f _ = return Types.Unit + +@@ -147,7 +138,7 @@ module Make (Lang : Types.Language.S) (Meta : Types.Metasyntax.S) (Ext : Types.E + ] + >>= fun _ -> f Types.Unit + +- let sequence_chain (plist : ('c, Match.t) parser sexp_list) : ('c, Match.t) parser = ++ let sequence_chain (plist : ('c, Match.t) parser list) : ('c, Match.t) parser = + List.fold plist ~init:(return Types.Unit) ~f:(>>) + + let with_debug_matcher s tag = +diff --git a/lib/kernel/matchers/dune b/lib/kernel/matchers/dune +index 12ed326..4625458 100644 +--- a/lib/kernel/matchers/dune ++++ b/lib/kernel/matchers/dune +@@ -1,6 +1,18 @@ + (library +- (name matchers) +- (public_name comby-kernel.matchers) +- (instrumentation (backend bisect_ppx)) +- (preprocess (pps ppx_here ppx_sexp_conv ppx_sexp_message ppx_deriving_yojson)) +- (libraries comby-kernel.replacement comby-kernel.parsers comby-kernel.match comby-kernel.vangstrom core_kernel mparser mparser-pcre re yojson ppx_deriving_yojson)) ++ (name matchers) ++ (public_name comby-kernel.matchers) ++ (instrumentation ++ (backend bisect_ppx)) ++ (preprocess ++ (pps ppx_here ppx_sexp_conv ppx_sexp_message ppx_deriving_yojson)) ++ (libraries ++ comby-kernel.replacement ++ comby-kernel.parsers ++ comby-kernel.match ++ comby-kernel.vangstrom ++ core_kernel ++ mparser ++ mparser-pcre ++ re ++ yojson ++ ppx_deriving_yojson)) +diff --git a/lib/kernel/matchers/evaluate.ml b/lib/kernel/matchers/evaluate.ml +index 9ea71a0..288f79a 100644 +--- a/lib/kernel/matchers/evaluate.ml ++++ b/lib/kernel/matchers/evaluate.ml +@@ -3,10 +3,7 @@ open Core_kernel + open Match + open Types.Ast + +-let debug = +- match Sys.getenv "DEBUG_COMBY" with +- | exception Not_found -> false +- | _ -> true ++let debug = Sys.getenv "DEBUG_COMBY" |> Option.is_some + + type result = bool * Match.environment option + +diff --git a/lib/kernel/matchers/omega.ml b/lib/kernel/matchers/omega.ml +index eeec516..1eb3ccc 100644 +--- a/lib/kernel/matchers/omega.ml ++++ b/lib/kernel/matchers/omega.ml +@@ -32,15 +32,9 @@ let push_source_ref : string ref = ref "" + + let filepath_ref : string option ref = ref None + +-let debug = +- match Sys.getenv "DEBUG_COMBY" with +- | exception Not_found -> false +- | _ -> true ++let debug = Sys.getenv "DEBUG_COMBY" |> Option.is_some + +-let rewrite = +- match Sys.getenv "REWRITE" with +- | exception Not_found -> false +- | _ -> true ++let rewrite = Sys.getenv "REWRITE" |> Option.is_some + + let actual = Buffer.create 10 + +diff --git a/lib/kernel/matchers/preprocess.ml b/lib/kernel/matchers/preprocess.ml +index 84f3ed0..b6d10e7 100644 +--- a/lib/kernel/matchers/preprocess.ml ++++ b/lib/kernel/matchers/preprocess.ml +@@ -1,9 +1,6 @@ + open Core_kernel + +-let debug = +- match Sys.getenv "DEBUG_COMBY" with +- | exception Not_found -> false +- | _ -> true ++let debug = Sys.getenv "DEBUG_COMBY" |> Option.is_some + + let append_rule (module Parser : Types.Rule.S) rule parent_rule = + let open Option in +diff --git a/lib/kernel/matchers/regexp.ml b/lib/kernel/matchers/regexp.ml +index ef0bd59..906820b 100644 +--- a/lib/kernel/matchers/regexp.ml ++++ b/lib/kernel/matchers/regexp.ml +@@ -3,7 +3,7 @@ open Vangstrom + let debug = + match Sys.getenv "DEBUG_COMBY" with + | exception Not_found -> false +- | _ -> true ++ | (_ : string) -> true + + module type Regexp_engine_intf = sig + type t +diff --git a/lib/kernel/matchers/rewrite.ml b/lib/kernel/matchers/rewrite.ml +index 32c4740..2fc28db 100644 +--- a/lib/kernel/matchers/rewrite.ml ++++ b/lib/kernel/matchers/rewrite.ml +@@ -4,10 +4,7 @@ open Core_kernel + open Match + open Replacement + +-let debug = +- match Sys.getenv "DEBUG_COMBY" with +- | exception Not_found -> false +- | _ -> true ++let debug = Sys.getenv "DEBUG_COMBY" |> Option.is_some + + let counter = + let uuid_for_id_counter = ref 0 in +diff --git a/lib/kernel/matchers/template.ml b/lib/kernel/matchers/template.ml +index 423a07f..136236c 100644 +--- a/lib/kernel/matchers/template.ml ++++ b/lib/kernel/matchers/template.ml +@@ -4,10 +4,7 @@ open Core_kernel + open Match + open Types.Template + +-let debug = +- match Sys.getenv "DEBUG_COMBY" with +- | exception Not_found -> false +- | _ -> true ++let debug = Sys.getenv "DEBUG_COMBY" |> Option.is_some + + module Make (Metasyntax : Types.Metasyntax.S) (External : Types.External.S) : Types.Template.S = struct + +diff --git a/lib/kernel/parsers/dune b/lib/kernel/parsers/dune +index 28b020c..0cc1fa5 100644 +--- a/lib/kernel/parsers/dune ++++ b/lib/kernel/parsers/dune +@@ -1,6 +1,8 @@ + (library +- (name parsers) +- (public_name comby-kernel.parsers) +- (instrumentation (backend bisect_ppx)) +- (preprocess (pps ppx_sexp_conv)) +- (libraries core_kernel comby-kernel.vangstrom mparser)) ++ (name parsers) ++ (public_name comby-kernel.parsers) ++ (instrumentation ++ (backend bisect_ppx)) ++ (preprocess ++ (pps ppx_sexp_conv)) ++ (libraries core_kernel comby-kernel.vangstrom mparser)) +diff --git a/lib/kernel/replacement/dune b/lib/kernel/replacement/dune +index 3e62de6..485b716 100644 +--- a/lib/kernel/replacement/dune ++++ b/lib/kernel/replacement/dune +@@ -1,6 +1,13 @@ + (library +- (name replacement) +- (public_name comby-kernel.replacement) +- (instrumentation (backend bisect_ppx)) +- (preprocess (pps ppx_deriving_yojson)) +- (libraries comby-kernel.match core_kernel yojson ppx_deriving_yojson ppx_deriving_yojson.runtime)) ++ (name replacement) ++ (public_name comby-kernel.replacement) ++ (instrumentation ++ (backend bisect_ppx)) ++ (preprocess ++ (pps ppx_deriving_yojson)) ++ (libraries ++ comby-kernel.match ++ core_kernel ++ yojson ++ ppx_deriving_yojson ++ ppx_deriving_yojson.runtime)) +diff --git a/lib/semantic/dune b/lib/semantic/dune +index 9a244d3..186a2ed 100644 +--- a/lib/semantic/dune ++++ b/lib/semantic/dune +@@ -1,11 +1,8 @@ + (library +- (name comby_semantic) +- (public_name comby-semantic) +- (instrumentation (backend bisect_ppx)) +- (preprocess (pps ppx_deriving.show ppx_deriving.eq ppx_sexp_conv)) +- (libraries +- core_kernel +- lwt +- cohttp +- cohttp-lwt-unix +- yojson)) ++ (name comby_semantic) ++ (public_name comby-semantic) ++ (instrumentation ++ (backend bisect_ppx)) ++ (preprocess ++ (pps ppx_deriving.show ppx_deriving.eq ppx_sexp_conv)) ++ (libraries core_kernel lwt cohttp cohttp-lwt-unix yojson)) +diff --git a/lib/semantic/lsif.ml b/lib/semantic/lsif.ml +index 49747bc..d6b3e19 100644 +--- a/lib/semantic/lsif.ml ++++ b/lib/semantic/lsif.ml +@@ -3,10 +3,7 @@ open Lwt + open Cohttp + open Cohttp_lwt_unix + +-let debug = +- match Sys.getenv "DEBUG_COMBY" with +- | exception Not_found -> false +- | _ -> true ++let debug = Sys.getenv "DEBUG_COMBY" |> Option.is_some + + module Formatting = struct + type t = +diff --git a/src/dune b/src/dune +index 444a5a3..f006195 100644 +--- a/src/dune ++++ b/src/dune +@@ -1,10 +1,17 @@ + (executables +- (libraries comby core ppx_deriving_yojson ppx_deriving_yojson.runtime +- (select if_hack_parallel.ml from +- (hack_parallel -> if_hack_parallel.available.ml) +- (!hack_parallel -> if_hack_parallel.unavailable.ml)) +- ) +- (preprocess (pps ppx_deriving_yojson ppx_let ppx_deriving.show ppx_sexp_conv)) ++ (libraries ++ comby ++ core ++ core_unix.command_unix ++ ppx_deriving_yojson ++ ppx_deriving_yojson.runtime ++ (select ++ if_hack_parallel.ml ++ from ++ (hack_parallel -> if_hack_parallel.available.ml) ++ (!hack_parallel -> if_hack_parallel.unavailable.ml))) ++ (preprocess ++ (pps ppx_deriving_yojson ppx_let ppx_deriving.show ppx_sexp_conv)) + (modules main if_hack_parallel) + (modes byte exe) + (names main)) +@@ -20,4 +27,5 @@ + (install + (package comby) + (section bin) +- (files (main.exe as comby))) ++ (files ++ (main.exe as comby))) +diff --git a/src/main.ml b/src/main.ml +index 5cad346..48784d1 100644 +--- a/src/main.ml ++++ b/src/main.ml +@@ -1,4 +1,5 @@ + open Core ++module Unix = Core_unix + open Command.Let_syntax + + open Comby_kernel +@@ -47,7 +48,7 @@ let substitute_environment_only_and_exit metasyntax_path anonymous_arguments jso + match metasyntax_path with + | None -> Matchers.Metasyntax.default_metasyntax + | Some metasyntax_path -> +- match Sys.file_exists metasyntax_path with ++ match Sys_unix.file_exists metasyntax_path with + | `No | `Unknown -> + Format.eprintf "Could not open file: %s@." metasyntax_path; + exit 1 +@@ -95,7 +96,7 @@ let base_command_parameters : (unit -> 'result) Command.Param.t = + and verbose = flag "verbose" no_arg ~doc:(Format.sprintf "Log to %s" verbose_out_file) + and rule = flag "rule" (optional_with_default "where true" string) ~doc:"rule Apply rules to matches." + and match_timeout = flag "timeout" (optional_with_default 3 int) ~doc:"seconds Set match timeout on a source. Default: 3 seconds" +- and target_directory = flag "directory" ~aliases:["d"] (optional_with_default (Sys.getcwd ()) string) ~doc:(Format.sprintf "path Run recursively on files in a directory relative to the root. Default is current directory: %s" @@ Sys.getcwd ()) ++ and target_directory = flag "directory" ~aliases:["d"] (optional_with_default (Sys_unix.getcwd ()) string) ~doc:(Format.sprintf "path Run recursively on files in a directory relative to the root. Default is current directory: %s" @@ Sys_unix.getcwd ()) + and directory_depth = flag "depth" (optional int) ~doc:"n Depth to recursively descend into directories" + and templates = flag "templates" ~aliases:["config"; "configuration"] (optional (Arg_type.comma_separated string)) ~doc:"paths CSV of directories containing templates, or TOML configuration files" + and file_filters = flag "extensions" ~aliases:["e"; "file-extensions"; "f"] (optional (Arg_type.comma_separated string)) ~doc:"extensions Comma-separated extensions to include, like \".go\" or \".c,.h\". It is just a file suffix, so you can use it to filter file names like \"main.go\". The extension will be used to infer a matcher, unless -custom-matcher or -matcher is specified" +@@ -146,7 +147,7 @@ let base_command_parameters : (unit -> 'result) Command.Param.t = + | l -> + List.map l ~f:(fun pattern -> + if String.contains pattern '/' then +- match Filename.realpath pattern with ++ match Filename_unix.realpath pattern with + | exception Unix.Unix_error _ -> + Format.eprintf + "No such file or directory: %s. Comby interprets \ +@@ -203,7 +204,7 @@ let base_command_parameters : (unit -> 'result) Command.Param.t = + let omega = omega || omega_env in + let fast_offset_conversion_env = Option.is_some @@ Sys.getenv "FAST_OFFSET_CONVERSION_COMBY" in + let fast_offset_conversion = fast_offset_conversion_env || fast_offset_conversion in +- let arch = Unix.Utsname.machine (Core.Unix.uname ()) in ++ let arch = Unix.Utsname.machine (Unix.uname ()) in + let compute_mode = match sequential, parany, arch with + | true, _, _ -> `Sequential + | _, true, _ +@@ -301,7 +302,7 @@ let parse_comby_dot_file () = + + let () = + If_hack_parallel.check_entry_point (); +- Command.run default_command ~version:"1.7.1" ~extend:(fun _ -> +- match Sys.file_exists ".comby" with ++ Command_unix.run default_command ~version:"1.7.1" ~extend:(fun _ -> ++ match Sys_unix.file_exists ".comby" with + | `Yes -> parse_comby_dot_file () + | _ -> []) +diff --git a/test/alpha/dune b/test/alpha/dune +index d7e5532..020677c 100644 +--- a/test/alpha/dune ++++ b/test/alpha/dune +@@ -1,17 +1,14 @@ + (library + (name alpha_test_integration) + (package comby) +- (modules +- test_special_matcher_cases +- test_substring_disabled) ++ (modules test_special_matcher_cases test_substring_disabled) + (inline_tests) +- (preprocess (pps ppx_expect ppx_sexp_message ppx_deriving_yojson)) +- (libraries +- comby +- cohttp-lwt-unix +- core +- camlzip)) ++ (preprocess ++ (pps ppx_expect ppx_sexp_message ppx_deriving_yojson)) ++ (libraries comby cohttp-lwt-unix core camlzip)) + + (alias +-(name runtest) +-(deps (source_tree example) (source_tree example/src/.ignore-me))) ++ (name runtest) ++ (deps ++ (source_tree example) ++ (source_tree example/src/.ignore-me))) +diff --git a/test/common/dune b/test/common/dune +index aa83b0c..3793242 100644 +--- a/test/common/dune ++++ b/test/common/dune +@@ -34,16 +34,14 @@ + test_regex_holes + test_template_constraints + test_custom_metasyntax +- test_rewrite_attributes +- ) ++ test_rewrite_attributes) + (inline_tests) +- (preprocess (pps ppx_expect ppx_sexp_message ppx_deriving_yojson)) +- (libraries +- comby +- cohttp-lwt-unix +- core +- camlzip)) ++ (preprocess ++ (pps ppx_expect ppx_sexp_message ppx_deriving_yojson)) ++ (libraries comby cohttp-lwt-unix core camlzip)) + + (alias +-(name runtest) +-(deps (source_tree example) (source_tree example/src/.ignore-me))) ++ (name runtest) ++ (deps ++ (source_tree example) ++ (source_tree example/src/.ignore-me))) +diff --git a/test/common/test_cli.ml b/test/common/test_cli.ml +index 3606367..d5d0c0b 100644 +--- a/test/common/test_cli.ml ++++ b/test/common/test_cli.ml +@@ -1,7 +1,10 @@ + open Core + open Camlzip + ++module Filename = Filename_unix ++module Sys = Sys_unix + module Time = Core_kernel.Time_ns.Span ++module Unix = Core_unix + + let binary_path = "../../../../comby" + +diff --git a/test/common/test_cli_helper.ml b/test/common/test_cli_helper.ml +index 5791ee6..18372ae 100644 +--- a/test/common/test_cli_helper.ml ++++ b/test/common/test_cli_helper.ml +@@ -1,6 +1,7 @@ + open Core + + module Time = Core_kernel.Time_ns.Span ++module Unix = Core_unix + + let binary_path = "../../../../comby" + +diff --git a/test/omega/dune b/test/omega/dune +index 3b31a7e..bf68dcb 100644 +--- a/test/omega/dune ++++ b/test/omega/dune +@@ -2,20 +2,19 @@ + (name omega_test_integration) + (package comby) + (modules +-; +-; TODO +-; ++ ; ++ ; TODO ++ ; + test_optional_holes + test_special_matcher_cases + test_substring_disabled) + (inline_tests) +- (preprocess (pps ppx_expect ppx_sexp_message ppx_deriving_yojson)) +- (libraries +- comby +- cohttp-lwt-unix +- core +- camlzip)) ++ (preprocess ++ (pps ppx_expect ppx_sexp_message ppx_deriving_yojson)) ++ (libraries comby cohttp-lwt-unix core camlzip)) + + (alias +-(name runtest) +-(deps (source_tree example) (source_tree example/src/.ignore-me))) ++ (name runtest) ++ (deps ++ (source_tree example) ++ (source_tree example/src/.ignore-me))) diff --git a/third_party/nixpkgs/pkgs/development/tools/comby/default.nix b/third_party/nixpkgs/pkgs/development/tools/comby/default.nix index cd3251841a..34eb269604 100644 --- a/third_party/nixpkgs/pkgs/development/tools/comby/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/comby/default.nix @@ -26,6 +26,8 @@ let sha256 = "0k60hj8wcrvrk0isr210vnalylkd63ria1kgz5n49inl7w1hfwpv"; }; + patches = [ ./comby.patch ]; + nativeBuildInputs = [ ocamlPackages.ppx_deriving ocamlPackages.ppx_deriving_yojson @@ -35,6 +37,7 @@ let buildInputs = [ ocamlPackages.core + ocamlPackages.core_kernel ocamlPackages.ocaml_pcre ocamlPackages.mparser ocamlPackages.mparser-pcre diff --git a/third_party/nixpkgs/pkgs/development/tools/conftest/default.nix b/third_party/nixpkgs/pkgs/development/tools/conftest/default.nix index 15a358b4e6..393d3cdcf8 100644 --- a/third_party/nixpkgs/pkgs/development/tools/conftest/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/conftest/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "conftest"; - version = "0.33.0"; + version = "0.33.1"; src = fetchFromGitHub { owner = "open-policy-agent"; repo = "conftest"; rev = "v${version}"; - sha256 = "sha256-0MS2Ra+3RhBLE3qWfoMihc1PvyK4wzsoeFIKPucjlJQ="; + sha256 = "sha256-ok6fBdT0YWXnl8JR/uszUzFM+gJR7LTtOSgGaXvuY88="; }; - vendorSha256 = "sha256-oYAU2YuIAxwy/uOkOEgCKazSJlttKdHV+KUYV0WXOn8="; + vendorSha256 = "sha256-WGrvYPNnHNpsjTxgK8Y/94ELH/peGv7OwZCBFr1UMKk="; ldflags = [ "-s" diff --git a/third_party/nixpkgs/pkgs/development/tools/continuous-integration/jenkins/default.nix b/third_party/nixpkgs/pkgs/development/tools/continuous-integration/jenkins/default.nix index 00395854cf..87a90aa90b 100644 --- a/third_party/nixpkgs/pkgs/development/tools/continuous-integration/jenkins/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/continuous-integration/jenkins/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "jenkins"; - version = "2.346.1"; + version = "2.346.2"; src = fetchurl { url = "https://get.jenkins.io/war-stable/${version}/jenkins.war"; - sha256 = "09rvwpywf8wc3605kc0x171kmxfigqg4dq7gkd1hng1xqbjjqvhp"; + sha256 = "0ymp4zy73rxakk7i1pxai1i0hxp65ilzi57dan3mqspaprfllk7g"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/convco/default.nix b/third_party/nixpkgs/pkgs/development/tools/convco/default.nix index 720423472c..1ab32615d8 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.10"; + version = "0.3.11"; src = fetchFromGitHub { owner = "convco"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Jr1rNxVguASl6fPfGNx2/MDlMC+KokgQyzhBnvqnwFs="; + sha256 = "sha256-v/0NtJYprd8YxwSdeH4v7mY0v3vElDx2PNIIUKsczW8="; }; - cargoSha256 = "sha256-mStoWH/SusAcbAR3MeBWaY21TdJZJcKm1VxmA3zmlTw="; + cargoSha256 = "sha256-Zh/Aiuu1Mx2osscSG0E1MTGKCVsYtL66FUnew6OCyZ4="; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/cpm/default.nix b/third_party/nixpkgs/pkgs/development/tools/cpm/default.nix new file mode 100644 index 0000000000..cb707cb7b7 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/cpm/default.nix @@ -0,0 +1,43 @@ +{ lib +, stdenvNoCC +, fetchFromGitHub +}: + +stdenvNoCC.mkDerivation rec { + pname = "cpm"; + version = "0.35.1"; + + src = fetchFromGitHub { + owner = "cpm-cmake"; + repo = "CPM.cmake"; + rev = "v${version}"; + hash = "sha256-Oon/5iwkUUASsUDvde69iEwLe8/CAzwYKYsyzH5K+V0="; + }; + + dontConfigure = true; + + dontBuild = true; + + installPhase = '' + runHook preInstall + + mkdir -p ${placeholder "out"}/share/cpm/ + cp ./cmake/CPM.cmake ${placeholder "out"}/share/cpm/ + + runHook postInstall + ''; + + meta = with lib; { + homepage = "https://github.com/cpm-cmake/CPM.cmake"; + description = "CMake's missing package manager"; + longDescription = '' + CPM.cmake is a cross-platform CMake script that adds dependency + management capabilities to CMake. It's built as a thin wrapper around + CMake's FetchContent module that adds version control, caching, a + simple API and more. + ''; + license = licenses.mit; + maintainers = with maintainers; [ ken-matsui ]; + platforms = platforms.all; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/tools/database/sqlc/default.nix b/third_party/nixpkgs/pkgs/development/tools/database/sqlc/default.nix index d63a220dff..4866eb03eb 100644 --- a/third_party/nixpkgs/pkgs/development/tools/database/sqlc/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/database/sqlc/default.nix @@ -15,17 +15,14 @@ buildGoModule { }; proxyVendor = true; - vendorSha256 = "sha256-zZ0IrtfQvczoB7th9ZCUlYOtyZr3Y3yF0pKzRCqmCjo="; + vendorSha256 = "sha256-miyNIF6RNOuvNEA9Hf+hOyRJG+5IcXU4Vo4Fzn+nIb4="; subPackages = [ "cmd/sqlc" ]; - meta = let - inherit (lib) licenses platforms maintainers; - in { - description = " Generate type-safe code from SQL"; + meta = with lib; { + description = "Generate type-safe code from SQL"; homepage = "https://sqlc.dev/"; license = licenses.mit; - platforms = platforms.all; maintainers = [ maintainers.adisbladis ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/tools/database/sqlfluff/default.nix b/third_party/nixpkgs/pkgs/development/tools/database/sqlfluff/default.nix index 7ab8f7edc8..6b05b8f83c 100644 --- a/third_party/nixpkgs/pkgs/development/tools/database/sqlfluff/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/database/sqlfluff/default.nix @@ -5,13 +5,13 @@ python3.pkgs.buildPythonApplication rec { pname = "sqlfluff"; - version = "1.2.0"; + version = "1.2.1"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "refs/tags/${version}"; - hash = "sha256-n5DprvSbli7wEV+oRA+U5UnaAGPit2Zd2gFb9fCgG8A="; + hash = "sha256-BTb01EKPBBTZR8g3RkW0llj169wk6Y7Ui4UoCR+YWsc="; }; propagatedBuildInputs = with python3.pkgs; [ diff --git a/third_party/nixpkgs/pkgs/development/tools/database/trino-cli/default.nix b/third_party/nixpkgs/pkgs/development/tools/database/trino-cli/default.nix index aeeebf484d..1dbd242b17 100644 --- a/third_party/nixpkgs/pkgs/development/tools/database/trino-cli/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/database/trino-cli/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "trino-cli"; - version = "387"; + version = "390"; jarfilename = "${pname}-${version}-executable.jar"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "mirror://maven/io/trino/${pname}/${version}/${jarfilename}"; - sha256 = "sha256-26TYtfxKLP3dW2uOoxc6rRnGXxnmbKG99xR0X7ntXDY="; + sha256 = "sha256-rqs2rWmr5hv4F/tc7xWBgkNht/l3meJUnpEyOn2cU48="; }; dontUnpack = true; diff --git a/third_party/nixpkgs/pkgs/development/tools/dprint/default.nix b/third_party/nixpkgs/pkgs/development/tools/dprint/default.nix index ae84a786de..63a6a6a39f 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.29.1"; + version = "0.30.3"; src = fetchCrate { inherit pname version; - sha256 = "sha256-uLNZUIp8+fKr6l+vi8rqjXn9PrwAmpYnYuwtYjl2y+o="; + sha256 = "sha256-/lptdZEcnbBQL9hYj0xyI95fMT22tGy8zeQz+8VwMog="; }; - cargoSha256 = "sha256-bmbrnzUZfHvO5waMixZoD0DmWxVGtUXhIwZLLlHqPhs="; + cargoSha256 = "sha256-BJGOaZgY03CYC8fa0wnlDmc9SO72lrLmdafovFD3BBI="; buildInputs = lib.optionals stdenv.isDarwin [ Security ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/esbuild/default.nix b/third_party/nixpkgs/pkgs/development/tools/esbuild/default.nix index ec909eddb6..3d8138d642 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.48"; + version = "0.14.49"; src = fetchFromGitHub { owner = "evanw"; repo = "esbuild"; rev = "v${version}"; - sha256 = "sha256-ziZOIPBIUGyuS3SEKKAYDH7Tv1mLOegw9YqTpGV2plI="; + sha256 = "sha256-bQt9dLkwvXT4pLxTwYp+5Bg6IgwBnB8uu1gdAmhPn0A="; }; vendorSha256 = "sha256-QPkBR+FscUc3jOvH7olcGUhM6OW4vxawmNJuRQxPuGs="; diff --git a/third_party/nixpkgs/pkgs/development/tools/gemstash/Gemfile b/third_party/nixpkgs/pkgs/development/tools/gemstash/Gemfile new file mode 100644 index 0000000000..55e71911a5 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/gemstash/Gemfile @@ -0,0 +1,2 @@ +source 'https://rubygems.org' +gem 'gemstash' diff --git a/third_party/nixpkgs/pkgs/development/tools/gemstash/Gemfile.lock b/third_party/nixpkgs/pkgs/development/tools/gemstash/Gemfile.lock new file mode 100644 index 0000000000..b7f9f963f3 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/gemstash/Gemfile.lock @@ -0,0 +1,64 @@ +GEM + remote: https://rubygems.org/ + specs: + activesupport (5.2.6.2) + concurrent-ruby (~> 1.0, >= 1.0.2) + i18n (>= 0.7, < 2) + minitest (~> 5.1) + tzinfo (~> 1.1) + concurrent-ruby (1.1.9) + dalli (2.7.11) + faraday (0.17.5) + multipart-post (>= 1.2, < 3) + faraday_middleware (0.14.0) + faraday (>= 0.7.4, < 1.0) + gemstash (2.1.0) + activesupport (>= 4.2, < 6) + dalli (~> 2.7) + faraday (~> 0.9) + faraday_middleware (~> 0.10) + lru_redux (~> 1.1) + puma (~> 4.0) + sequel (~> 5.0) + server_health_check-rack (~> 0.1) + sinatra (>= 1.4, < 3.0) + sqlite3 (~> 1.3) + thor (~> 0.20) + i18n (1.10.0) + concurrent-ruby (~> 1.0) + lru_redux (1.1.0) + minitest (5.15.0) + multipart-post (2.1.1) + mustermann (1.1.1) + ruby2_keywords (~> 0.0.1) + nio4r (2.5.8) + puma (4.3.11) + nio4r (~> 2.0) + rack (2.2.3) + rack-protection (2.2.0) + rack + ruby2_keywords (0.0.5) + sequel (5.54.0) + server_health_check (1.0.2) + server_health_check-rack (0.1.0) + server_health_check (~> 1.0, >= 1.0.1) + sinatra (2.2.0) + mustermann (~> 1.0) + rack (~> 2.2) + rack-protection (= 2.2.0) + tilt (~> 2.0) + sqlite3 (1.4.2) + thor (0.20.3) + thread_safe (0.3.6) + tilt (2.0.10) + tzinfo (1.2.9) + thread_safe (~> 0.1) + +PLATFORMS + ruby + +DEPENDENCIES + gemstash + +BUNDLED WITH + 2.1.4 diff --git a/third_party/nixpkgs/pkgs/development/tools/gemstash/default.nix b/third_party/nixpkgs/pkgs/development/tools/gemstash/default.nix new file mode 100644 index 0000000000..13ab213c15 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/gemstash/default.nix @@ -0,0 +1,16 @@ +{ lib, bundlerApp, bundlerUpdateScript }: + +bundlerApp rec { + pname = "gemstash"; + gemdir = ./.; + exes = [ pname ]; + + passthru.updateScript = bundlerUpdateScript pname; + + meta = with lib; { + description = "A cache for RubyGems.org and a private gem server"; + homepage = "https://github.com/rubygems/gemstash"; + license = licenses.mit; + maintainers = [ maintainers.viraptor ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/tools/gemstash/gemset.nix b/third_party/nixpkgs/pkgs/development/tools/gemstash/gemset.nix new file mode 100644 index 0000000000..fd5ddcd653 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/gemstash/gemset.nix @@ -0,0 +1,313 @@ +{ + activesupport = { + dependencies = ["concurrent-ruby" "i18n" "minitest" "tzinfo"]; + gem_platform = "ruby"; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "164lmi9w96wdwd00dnly8f9dcak3blv49ymyqz30q2fdjn45c775"; + type = "gem"; + }; + target_platform = "ruby"; + version = "5.2.6.2"; + }; + concurrent-ruby = { + gem_platform = "ruby"; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0nwad3211p7yv9sda31jmbyw6sdafzmdi2i2niaz6f0wk5nq9h0f"; + type = "gem"; + }; + target_platform = "ruby"; + version = "1.1.9"; + }; + dalli = { + gem_platform = "ruby"; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0br39scmr187w3ifl5gsddl2fhq6ahijgw6358plqjdzrizlg764"; + type = "gem"; + }; + target_platform = "ruby"; + version = "2.7.11"; + }; + faraday = { + dependencies = ["multipart-post"]; + gem_platform = "ruby"; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0bs2lm0wd273kwq8nk1p8pk43n1wrizv4c1bdywkpcm9g2f5sp6p"; + type = "gem"; + }; + target_platform = "ruby"; + version = "0.17.5"; + }; + faraday_middleware = { + dependencies = ["faraday"]; + gem_platform = "ruby"; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1x7jgvpzl1nm7hqcnc8carq6yj1lijq74jv8pph4sb3bcpfpvcsc"; + type = "gem"; + }; + target_platform = "ruby"; + version = "0.14.0"; + }; + gemstash = { + dependencies = ["activesupport" "dalli" "faraday" "faraday_middleware" "lru_redux" "puma" "sequel" "server_health_check-rack" "sinatra" "sqlite3" "thor"]; + gem_platform = "ruby"; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0fimbc5xnsxq1g2zb7kn4qf3rp4klx7fxbigg34gr9i9apq8qfrc"; + type = "gem"; + }; + target_platform = "ruby"; + version = "2.1.0"; + }; + i18n = { + dependencies = ["concurrent-ruby"]; + gem_platform = "ruby"; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0b2qyvnk4yynlg17ymkq4g5xgr275637fhl1mjh0valw3cb1fhhg"; + type = "gem"; + }; + target_platform = "ruby"; + version = "1.10.0"; + }; + lru_redux = { + gem_platform = "ruby"; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1yxghzg7476sivz8yyr9nkak2dlbls0b89vc2kg52k0nmg6d0wgf"; + type = "gem"; + }; + target_platform = "ruby"; + version = "1.1.0"; + }; + minitest = { + gem_platform = "ruby"; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "06xf558gid4w8lwx13jwfdafsch9maz8m0g85wnfymqj63x5nbbd"; + type = "gem"; + }; + target_platform = "ruby"; + version = "5.15.0"; + }; + multipart-post = { + gem_platform = "ruby"; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1zgw9zlwh2a6i1yvhhc4a84ry1hv824d6g2iw2chs3k5aylpmpfj"; + type = "gem"; + }; + target_platform = "ruby"; + version = "2.1.1"; + }; + mustermann = { + dependencies = ["ruby2_keywords"]; + gem_platform = "ruby"; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0ccm54qgshr1lq3pr1dfh7gphkilc19dp63rw6fcx7460pjwy88a"; + type = "gem"; + }; + target_platform = "ruby"; + version = "1.1.1"; + }; + nio4r = { + gem_platform = "ruby"; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0xk64wghkscs6bv2n22853k2nh39d131c6rfpnlw12mbjnnv9v1v"; + type = "gem"; + }; + target_platform = "ruby"; + version = "2.5.8"; + }; + puma = { + dependencies = ["nio4r"]; + gem_platform = "ruby"; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1xvkz9xrd1cqnlm0qac1iwwxzndx3cc17zrjncpa4lzjfwbxhsnm"; + type = "gem"; + }; + target_platform = "ruby"; + version = "4.3.11"; + }; + rack = { + gem_platform = "ruby"; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0i5vs0dph9i5jn8dfc6aqd6njcafmb20rwqngrf759c9cvmyff16"; + type = "gem"; + }; + target_platform = "ruby"; + version = "2.2.3"; + }; + rack-protection = { + dependencies = ["rack"]; + gem_platform = "ruby"; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1hz6h6d67r217qi202qmxq2xkn3643ay3iybhl3dq3qd6j8nm3b2"; + type = "gem"; + }; + target_platform = "ruby"; + version = "2.2.0"; + }; + ruby2_keywords = { + gem_platform = "ruby"; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1vz322p8n39hz3b4a9gkmz9y7a5jaz41zrm2ywf31dvkqm03glgz"; + type = "gem"; + }; + target_platform = "ruby"; + version = "0.0.5"; + }; + sequel = { + gem_platform = "ruby"; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1wzb16vyslr7bpy7g5k2m35yz90bpf12f3pzj5w6icf1vldnc3nf"; + type = "gem"; + }; + target_platform = "ruby"; + version = "5.54.0"; + }; + server_health_check = { + gem_platform = "ruby"; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "06chz92parchhj1457lf5lbj3hrmvqpq6mfskxcnj5f4qa14n5wd"; + type = "gem"; + }; + target_platform = "ruby"; + version = "1.0.2"; + }; + server_health_check-rack = { + dependencies = ["server_health_check"]; + gem_platform = "ruby"; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0cgqr94x18f60n27sk9lgg471c6vk6qy132z7i1ppp32kvmjfphs"; + type = "gem"; + }; + target_platform = "ruby"; + version = "0.1.0"; + }; + sinatra = { + dependencies = ["mustermann" "rack" "rack-protection" "tilt"]; + gem_platform = "ruby"; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1x3rci7k30g96y307hvglpdgm3f7nga3k3n4i8n1v2xxx290800y"; + type = "gem"; + }; + target_platform = "ruby"; + version = "2.2.0"; + }; + sqlite3 = { + gem_platform = "ruby"; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0lja01cp9xd5m6vmx99zwn4r7s97r1w5cb76gqd8xhbm1wxyzf78"; + type = "gem"; + }; + target_platform = "ruby"; + version = "1.4.2"; + }; + thor = { + gem_platform = "ruby"; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1yhrnp9x8qcy5vc7g438amd5j9sw83ih7c30dr6g6slgw9zj3g29"; + type = "gem"; + }; + target_platform = "ruby"; + version = "0.20.3"; + }; + thread_safe = { + gem_platform = "ruby"; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0nmhcgq6cgz44srylra07bmaw99f5271l0dpsvl5f75m44l0gmwy"; + type = "gem"; + }; + target_platform = "ruby"; + version = "0.3.6"; + }; + tilt = { + gem_platform = "ruby"; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0rn8z8hda4h41a64l0zhkiwz2vxw9b1nb70gl37h1dg2k874yrlv"; + type = "gem"; + }; + target_platform = "ruby"; + version = "2.0.10"; + }; + tzinfo = { + dependencies = ["thread_safe"]; + gem_platform = "ruby"; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0zwqqh6138s8b321fwvfbywxy00lw1azw4ql3zr0xh1aqxf8cnvj"; + type = "gem"; + }; + target_platform = "ruby"; + version = "1.2.9"; + }; +} 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 a416b5b504..dda4796704 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.12.1"; + version = "3.14.0"; src = fetchFromGitHub { owner = pname; repo = "task"; rev = "v${version}"; - sha256 = "sha256-N/xx5gATuLrHcWnMXgFMmz3wbFtaHsiPfDaNhdTbk5c="; + sha256 = "sha256-J/pWx/osqP29GERBdzWwPNeA4Rzo6CYdW7GrmspevwM="; }; - vendorSha256 = "sha256-73DtLYyq3sltzv4VtZMlZaSbP9zA9RZw2wgXVkzwrso="; + vendorSha256 = "sha256-NlQ/5ibRgmuGDcuiUdzvuexYGnR/34v9fw1DUe3yXxE="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/development/tools/golangci-lint/default.nix b/third_party/nixpkgs/pkgs/development/tools/golangci-lint/default.nix index 7e2570bcd2..33fa43f03d 100644 --- a/third_party/nixpkgs/pkgs/development/tools/golangci-lint/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/golangci-lint/default.nix @@ -35,6 +35,5 @@ buildGoModule rec { homepage = "https://golangci-lint.run/"; license = licenses.gpl3Plus; maintainers = with maintainers; [ anpryl manveru mic92 ]; - broken = stdenv.isDarwin && stdenv.isx86_64; }; } 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 c3bf856bc9..08e3e54562 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.20220529.0"; + version = "5.9.20220710.0"; src = fetchFromGitHub { owner = "universal-ctags"; repo = "ctags"; rev = "p${version}"; - sha256 = "sha256-Lu4eYMA5Uf/A8r11W6v7xTAnj0gtCjKQ4aX5IbV0dbo="; + sha256 = "sha256-/7g1AGLbl49s8hbwy3IGwshKAGKRJrdbECau2acMtjE="; }; depsBuildBuild = [ buildPackages.stdenv.cc ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/mysql-shell/default.nix b/third_party/nixpkgs/pkgs/development/tools/mysql-shell/default.nix index 915ed33c46..e838463641 100644 --- a/third_party/nixpkgs/pkgs/development/tools/mysql-shell/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/mysql-shell/default.nix @@ -31,14 +31,12 @@ , CoreServices , developer_cmds , DarwinTools +, makeWrapper }: let - pythonDeps = [ python3.pkgs.certifi python3.pkgs.paramiko ]; - site = '' - - import sys; sys.path.extend([${lib.concatStringsSep ", " (map (x: ''"${x}/${python3.sitePackages}"'') pythonDeps)}]) - ''; + pythonDeps = with python3.pkgs; [ certifi paramiko pyyaml ]; + pythonPath = lib.makeSearchPath python3.sitePackages pythonDeps; in stdenv.mkDerivation rec{ pname = "mysql-shell"; @@ -62,12 +60,9 @@ stdenv.mkDerivation rec{ substituteInPlace ../mysql-${version}/cmake/os/Darwin.cmake --replace /usr/bin/libtool libtool substituteInPlace cmake/libutils.cmake --replace /usr/bin/libtool libtool - - # For python dependencies - echo '${site}' >> python/packages/mysqlsh/__init__.py ''; - nativeBuildInputs = [ pkg-config cmake git bison ] ++ lib.optionals (!stdenv.isDarwin) [ rpcsvc-proto ]; + nativeBuildInputs = [ pkg-config cmake git bison makeWrapper ] ++ lib.optionals (!stdenv.isDarwin) [ rpcsvc-proto ]; buildInputs = [ boost @@ -121,6 +116,10 @@ stdenv.mkDerivation rec{ CXXFLAGS = [ "-DV8_COMPRESS_POINTERS=1" "-DV8_31BIT_SMIS_ON_64BIT_ARCH=1" ]; + postFixup = '' + wrapProgram $out/bin/mysqlsh --set PYTHONPATH "${pythonPath}" + ''; + meta = with lib; { homepage = "https://dev.mysql.com/doc/mysql-shell/${lib.versions.majorMinor version}/en/"; description = "A new command line scriptable shell for MySQL"; diff --git a/third_party/nixpkgs/pkgs/development/tools/ocaml/opam2json/default.nix b/third_party/nixpkgs/pkgs/development/tools/ocaml/opam2json/default.nix new file mode 100644 index 0000000000..198a5f575e --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/ocaml/opam2json/default.nix @@ -0,0 +1,25 @@ +{ lib, stdenv, fetchFromGitHub, opam-installer, ocamlPackages }: +stdenv.mkDerivation rec { + pname = "opam2json"; + version = "0.2"; + + src = fetchFromGitHub { + owner = "tweag"; + repo = pname; + rev = "v${version}"; + sha256 = "fe8bm/V/4r2iNxgbitT2sXBqDHQ0GBSnSUSBg/1aXoI="; + }; + + buildInputs = with ocamlPackages; [ yojson opam-file-format cmdliner ]; + nativeBuildInputs = with ocamlPackages; [ ocaml findlib opam-installer ]; + + preInstall = ''export PREFIX="$out"''; + + meta = with lib; { + platforms = platforms.all; + description = "convert opam file syntax to JSON"; + maintainers = [ maintainers.balsoft ]; + license = licenses.gpl3; + homepage = "https://github.com/tweag/opam2json"; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/default.nix b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/default.nix index 441dc4988f..0db37008ae 100644 --- a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/default.nix @@ -20,7 +20,7 @@ , enableShared ? !stdenv.hostPlatform.isStatic , enableStatic ? stdenv.hostPlatform.isStatic , webUISupport ? false -, extraGrammars ? {} +, extraGrammars ? { } }: # TODO: move to carnix or https://github.com/kolloch/crate2nix @@ -69,9 +69,11 @@ let { tree-sitter-ocaml-interface = grammars'.tree-sitter-ocaml // { location = "interface"; }; } // { tree-sitter-org-nvim = grammars'.tree-sitter-org-nvim // { language = "org"; }; } // { tree-sitter-typescript = grammars'.tree-sitter-typescript // { location = "typescript"; }; } // - { tree-sitter-tsx = grammars'.tree-sitter-typescript // { location = "tsx"; }; }; + { tree-sitter-tsx = grammars'.tree-sitter-typescript // { location = "tsx"; }; } // + { tree-sitter-markdown = grammars'.tree-sitter-markdown // { location = "tree-sitter-markdown"; }; } // + { tree-sitter-markdown-inline = grammars'.tree-sitter-markdown // { language = "markdown_inline"; location = "tree-sitter-markdown-inline"; }; }; in - lib.mapAttrs change (grammars); + lib.mapAttrs change (grammars); # Usage: # pkgs.tree-sitter.withPlugins (p: [ p.tree-sitter-c p.tree-sitter-java ... ]) diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix index 37f6794bc2..2f82e53ab6 100644 --- a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/default.nix @@ -30,9 +30,9 @@ tree-sitter-glimmer = lib.importJSON ./tree-sitter-glimmer.json; tree-sitter-glsl = lib.importJSON ./tree-sitter-glsl.json; tree-sitter-go = lib.importJSON ./tree-sitter-go.json; - tree-sitter-gowork = lib.importJSON ./tree-sitter-gowork.json; tree-sitter-godot-resource = lib.importJSON ./tree-sitter-godot-resource.json; tree-sitter-gomod = lib.importJSON ./tree-sitter-gomod.json; + tree-sitter-gowork = lib.importJSON ./tree-sitter-gowork.json; tree-sitter-graphql = lib.importJSON ./tree-sitter-graphql.json; tree-sitter-haskell = lib.importJSON ./tree-sitter-haskell.json; tree-sitter-hcl = lib.importJSON ./tree-sitter-hcl.json; diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-beancount.json b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-beancount.json index 254e657260..6862eecdfd 100644 --- a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-beancount.json +++ b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-beancount.json @@ -1,9 +1,9 @@ { "url": "https://github.com/polarmutex/tree-sitter-beancount", - "rev": "78b8ddca3ab774573a4e3bf64eabd79e9452cea9", - "date": "2021-11-11T10:25:06-05:00", - "path": "/nix/store/lzvc19ky1wxbc1cjf2zr351hbdfq22mm-tree-sitter-beancount", - "sha256": "19s1fgn1vgxz5q6qvcfdr1lqj1vnkjrwlkl9chapbdaliw0dy110", + "rev": "b807e0c5255221f5e4baa08b3325d08e2ba56ba2", + "date": "2022-07-02T10:33:09-04:00", + "path": "/nix/store/9kqvj3rpqlqgxr5nkcc43pkcvs460h14-tree-sitter-beancount", + "sha256": "0vh2sz5qjsgkmqlcw0kyq01wj5mxwymhyg9w8hfyd7kd779lfa86", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-c.json b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-c.json index 3b83f06df2..9fb8a320e0 100644 --- a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-c.json +++ b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-c.json @@ -1,9 +1,9 @@ { "url": "https://github.com/tree-sitter/tree-sitter-c", - "rev": "3ced8d6cd212a6f576cd4ef3d533bcb9c09eface", - "date": "2022-05-30T15:48:31+02:00", - "path": "/nix/store/hh79856h2fw1i3i4g75a78rbzgi8qk3s-tree-sitter-c", - "sha256": "0g43xn98i01cgqzv0ck1inj267y7qjwpxzy5l245kdmxgfg4czm8", + "rev": "517bf92b2c5e8baa4241cbb8a49085ed7c3c48d4", + "date": "2022-07-08T09:44:02-07:00", + "path": "/nix/store/0nz381ay9ybngxvialwxisji9j4gwadb-tree-sitter-c", + "sha256": "03klq9mb9jnhjxf8lv0mk02gdp83zcyrvx1bzrqbd9jdza3ji1xl", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cmake.json b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cmake.json index 9e5bce1b0a..5a90c5dcce 100644 --- a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cmake.json +++ b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-cmake.json @@ -1,9 +1,9 @@ { "url": "https://github.com/uyha/tree-sitter-cmake", - "rev": "5020572408a386d5d2dfac3516584f5edda7a49b", - "date": "2022-01-26T22:53:15+01:00", - "path": "/nix/store/in8jrkjf5vca2azpnyq2dgmzz9jcvjy6-tree-sitter-cmake", - "sha256": "0y49x8d36vdq2lcj67f3ms53qxym3578b3aw9gs2ckibwzrbfbgy", + "rev": "599836393074e4744d78dad76b8b8eb8e1f690ff", + "date": "2022-07-08T12:16:35+07:00", + "path": "/nix/store/w6nxam1m3kq35faqcx17qmgn250fv461-tree-sitter-cmake", + "sha256": "02gbi24rxq4qqlxzl17vi81xjk3d3y41ig6g8w2yc6f2ihiw85na", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-embedded-template.json b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-embedded-template.json index 266de6ad18..4c55b73a11 100644 --- a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-embedded-template.json +++ b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-embedded-template.json @@ -1,9 +1,9 @@ { "url": "https://github.com/tree-sitter/tree-sitter-embedded-template", - "rev": "d21df11b0ecc6fd211dbe11278e92ef67bd17e97", - "date": "2021-12-23T08:53:16-08:00", - "path": "/nix/store/zy74brmd1x2q68bpvi5v4z52bhmkcmy8-tree-sitter-embedded-template", - "sha256": "0h3nj6fz512riyx2b65pg9pjprkpkasnglwljlzi6s1in9fdig3x", + "rev": "1a538da253d73f896b9f6c0c7d79cda58791ac5c", + "date": "2022-06-20T17:01:16+02:00", + "path": "/nix/store/6mrkhc8bkfnmfaq94a30am9ygh971y97-tree-sitter-embedded-template", + "sha256": "0j73jk9byrhwddb4qsh67gf5fwj9fgdz6byphh3jj8f0ajzdxrmx", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-fennel.json b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-fennel.json index 5bea07ef1e..f30b880b64 100644 --- a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-fennel.json +++ b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-fennel.json @@ -1,9 +1,9 @@ { "url": "https://github.com/travonted/tree-sitter-fennel", - "rev": "d37fd84a702b78ff0282f223ece83c61ab062a6e", - "date": "2022-02-21T08:13:28-05:00", - "path": "/nix/store/lafx5rw9r9jp9056sv0sk89kxfjlb9x3-tree-sitter-fennel", - "sha256": "1wqvz8v877jh7shv50xbnx1bxvdlnfnpmndwzsb0smidnzx7lbw2", + "rev": "517195970428aacca60891b050aa53eabf4ba78d", + "date": "2022-06-22T09:39:24-04:00", + "path": "/nix/store/v8by7ilv9fyv20rp714xq7vhwwi7vz0g-tree-sitter-fennel", + "sha256": "02ja5narbahc02f6gmnr5j2sg5sbjcc71hbny6n0nd57kcnapfgd", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-glimmer.json b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-glimmer.json index 5dc18d6c7b..4e4935dfab 100644 --- a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-glimmer.json +++ b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-glimmer.json @@ -1,9 +1,9 @@ { "url": "https://github.com/alexlafroscia/tree-sitter-glimmer", - "rev": "5ed38d3cba65376e4734b0f1763c2f049ad5a1cf", - "date": "2021-09-25T09:50:19-04:00", - "path": "/nix/store/z0nhsn3v519mbxrhj5x1y7h7k7giviw2-tree-sitter-glimmer", - "sha256": "0whij8420niywdi0lna8w5fizq30vhldz3wssisw91gjfdn8d9mz", + "rev": "a23d28de811976f3ca310df735fe09a5d2de16ab", + "date": "2022-06-24T09:27:51-04:00", + "path": "/nix/store/m0hr0x0s3j7r6dn1kv6c77c9qbl4ggkw-tree-sitter-glimmer", + "sha256": "07dzpjyc644clh2x3r48w3mi3i68pkac5mwzha2iaxly9fndm0zk", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-glsl.json b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-glsl.json index e6873a191a..509d7b9077 100644 --- a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-glsl.json +++ b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-glsl.json @@ -1,9 +1,9 @@ { "url": "https://github.com/thehamsta/tree-sitter-glsl", - "rev": "a480a02033f8d5c67e798a6f7584ec0d2be568b0", - "date": "2022-05-22T00:37:43+02:00", - "path": "/nix/store/jw1wnz2wfgibdz9pz0zlxyvs9p3pcayg-tree-sitter-glsl", - "sha256": "04yd7s26z4lmjrw325sn68nwma3mj1pl1kj1xvvwzxb9cxb91657", + "rev": "57652a006b726251ae4d03862ffecbe39b1515bf", + "date": "2022-07-10T20:32:50+02:00", + "path": "/nix/store/n3rfnc7z8ps4jzgxyb9hv9kffb2alcmw-tree-sitter-glsl", + "sha256": "1iayzjbwfmjbak3igrgms7wpa58syy2xym6n2hpi3369v7rfgsg8", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-gowork.json b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-gowork.json index 590d0c77d6..c20c4c717d 100644 --- a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-gowork.json +++ b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-gowork.json @@ -2,7 +2,7 @@ "url": "https://github.com/omertuc/tree-sitter-go-work", "rev": "6dd9dd79fb51e9f2abc829d5e97b15015b6a8ae2", "date": "2021-12-18T20:13:22+01:00", - "path": "/nix/store/7a4raw2gi4xgbg858cs0davbplj7m8rq-tree-sitter-gowork", + "path": "/nix/store/7a4raw2gi4xgbg858cs0davbplj7m8rq-tree-sitter-go-work", "sha256": "1kzrs4rpby3b0h87rbr02k55k3mmkmdy7rvl11q95b3ym0smmyqb", "fetchLFS": false, "fetchSubmodules": false, diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-haskell.json b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-haskell.json index 89a249a68c..74d8289dfa 100644 --- a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-haskell.json +++ b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-haskell.json @@ -1,9 +1,9 @@ { "url": "https://github.com/tree-sitter/tree-sitter-haskell", - "rev": "ca0a13f1acb60cf32e74cced3cb623b6c70fa77c", - "date": "2022-06-06T23:15:37+02:00", - "path": "/nix/store/dmq8mc361rkhrpa5s06h1z9k8khkvi78-tree-sitter-haskell", - "sha256": "1r3mfnj1f6p2cqriay22jjfggrmyywimidzmzw8h5q84flngdg2s", + "rev": "cf394604ae2ec2a5e65b1afbc7dea21258ede403", + "date": "2022-07-02T11:46:11+02:00", + "path": "/nix/store/04cbp4wc4ga3d36d9xvqz2wy9bdnyapv-tree-sitter-haskell", + "sha256": "1kvh5gwg3c59snqhpsg23b690rnbmcya0i38mqq9n1pdmv2pzxyi", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-heex.json b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-heex.json index 0220be6596..925c106fd2 100644 --- a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-heex.json +++ b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-heex.json @@ -1,9 +1,9 @@ { "url": "https://github.com/connorlay/tree-sitter-heex", - "rev": "4d8d646bba27ec11bbf76ea37410a604d2e18bfc", - "date": "2022-06-09T17:09:44-05:00", - "path": "/nix/store/hcn9zl21asz1h6h2abqjpcc37sr56s6s-tree-sitter-heex", - "sha256": "0s38g23npq4k2yfwijmp14wmk7klhlycr4jl9a1hnh8qqihxjbj1", + "rev": "961bc4d2937cfd24ceb0a5a6b2da607809f8822e", + "date": "2022-06-13T09:15:37-07:00", + "path": "/nix/store/5qackjn309ls9qja23wkwhqiid9rc6l3-tree-sitter-heex", + "sha256": "1by6c4gcqxy9czvwabbmlfr1hlw8z2w7f623llbag956scp2b9al", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ledger.json b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ledger.json index 879893ca4b..b095716519 100644 --- a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ledger.json +++ b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ledger.json @@ -1,9 +1,9 @@ { "url": "https://github.com/cbarrete/tree-sitter-ledger", - "rev": "1050a25df55a62878102d10e524b5184b316b7ad", - "date": "2022-04-01T08:21:18-04:00", - "path": "/nix/store/hfhxv3k8kxpg7m31xzrf56lbaa4ips65-tree-sitter-ledger", - "sha256": "0qivr9wjab8m1ha4zisznijpw4x3phv0q0nh8lnsx7bjbz6f7xfx", + "rev": "47b8971448ce5e9abac865f450c1b14fb3b6eee9", + "date": "2022-07-09T09:40:08-04:00", + "path": "/nix/store/qzp0n5gcw7hakcv3ahxf1nrqrk8j2l3w-tree-sitter-ledger", + "sha256": "0j5fsgmmvc8z0ihsifc38qbvx8xdwd25bxq2a0k6kb8mbbmzk30f", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-lua.json b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-lua.json index 52ade503e8..5312806c00 100644 --- a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-lua.json +++ b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-lua.json @@ -1,9 +1,9 @@ { "url": "https://github.com/MunifTanjim/tree-sitter-lua", - "rev": "2b4ffd5a5ffd0c6b4c84f0d9e003050a70db2a37", - "date": "2022-04-08T22:29:43+06:00", - "path": "/nix/store/gj2bbwc3105djyl3l5b0hjr1y1jg7262-tree-sitter-lua", - "sha256": "1l383clymmzk0q9b21kcgnmpww4hsh938yd3z9djpkhagadpqpjs", + "rev": "a041a547270c17f3d3aca11cb882f5c8eb88a572", + "date": "2022-07-07T14:08:02+06:00", + "path": "/nix/store/cs0rf42nnyw4w2rlzhw137iqh06dy5mh-tree-sitter-lua", + "sha256": "0db2wjwzzx40i38cs04w8pn0zqqv18ry4m2div0a0b2wgdhzf33f", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-markdown.json b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-markdown.json index f33e3022ac..b416bccb81 100644 --- a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-markdown.json +++ b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-markdown.json @@ -1,9 +1,9 @@ { "url": "https://github.com/MDeiml/tree-sitter-markdown", - "rev": "6d112e7a9c1694504bb78ee0b92dcd509625e0df", - "date": "2022-04-26T12:23:01+02:00", - "path": "/nix/store/598nrwznzg37r9pskrmzwnhrw3f4knnw-tree-sitter-markdown", - "sha256": "03d601dp65p30c88p0r6rx13wlkbg1q3ch11wfn4sa2rhba8zpyk", + "rev": "142a5b4a1b092b64c9f5db8f11558f9dd4009a1b", + "date": "2022-07-04T10:48:30+02:00", + "path": "/nix/store/wac43pvz3wdwl2i6a8a0ik6l99c9lzmq-tree-sitter-markdown", + "sha256": "0q1czdv7szw9rk4h9i9xjc29s0g3m1grhsjq6rl5vm70h998fbmg", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ocaml.json b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ocaml.json index abf7df917e..9cf696fe81 100644 --- a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ocaml.json +++ b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-ocaml.json @@ -1,9 +1,9 @@ { "url": "https://github.com/tree-sitter/tree-sitter-ocaml", - "rev": "23d419ba45789c5a47d31448061557716b02750a", - "date": "2021-08-26T21:21:27+02:00", - "path": "/nix/store/942q4rv9vs77wwvvw46yx0jnqja2cbig-tree-sitter-ocaml", - "sha256": "1bh3afd3iix0gf6ldjngf2c65nyfdwvbmsq25gcxm04jwbg9c6k8", + "rev": "cc26b1ef111100f26a137bcbcd39fd4e35be9a59", + "date": "2022-06-19T21:41:43+02:00", + "path": "/nix/store/m5z0cdxb8mg1ff64529p8sfj9afq50l5-tree-sitter-ocaml", + "sha256": "1qra2zihw09ff16gxfmpmdmyj0rilvnk1xc9y4wb01j2a4292fc1", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-org-nvim.json b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-org-nvim.json index 0a88da3e45..33b3088227 100644 --- a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-org-nvim.json +++ b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-org-nvim.json @@ -1,9 +1,9 @@ { "url": "https://github.com/milisims/tree-sitter-org", - "rev": "7ab140276cff85bf6dd08914e04188f4da1ff0ab", - "date": "2022-06-01T13:56:57-04:00", - "path": "/nix/store/ig79jii0vihy6vjq5j35ymgpbppjcsgd-tree-sitter-org", - "sha256": "0j3520h0bvxn6sm8fg1a400y2rnp0l9jrf31n8rbkq9ri34bzi5x", + "rev": "bc8a040492b56754a35b3b00a3052fdb7ba12969", + "date": "2022-06-27T11:07:56-04:00", + "path": "/nix/store/6xpvk9i1250slzsh2ap3pr0fawmibngw-tree-sitter-org", + "sha256": "19z45bd276g4xggg2vqmr6fjwyi88xmpx1ihqq908152pq83zmv6", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-php.json b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-php.json index d7b8f83ef5..98dcf351a7 100644 --- a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-php.json +++ b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-php.json @@ -1,9 +1,9 @@ { "url": "https://github.com/tree-sitter/tree-sitter-php", - "rev": "866e4a155739a1374da5247b876e70f8639005f6", - "date": "2022-06-06T09:18:54+02:00", - "path": "/nix/store/23f9s4z321mnjnqfxjdj75rkcvwv2xpa-tree-sitter-php", - "sha256": "11nagsvq2jsinrhsfpnylz1lkp6hiw3jndshnjvzvkjmmpavm1gr", + "rev": "ece74b20942a5b23acaf3622512c6d0db1491a7e", + "date": "2022-06-24T15:38:28-07:00", + "path": "/nix/store/cqqyvb0vfp0q34lf3w5jds5dq4riac9z-tree-sitter-php", + "sha256": "0ggx747j3hpgwqw7cjh07n866mvdcyv3mvblffbrb8b1xn3bll84", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-python.json b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-python.json index b1213507b5..fe96836732 100644 --- a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-python.json +++ b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-python.json @@ -1,9 +1,9 @@ { "url": "https://github.com/tree-sitter/tree-sitter-python", - "rev": "dafcef7943229ec9d530b36ed67d758e659f4c6c", - "date": "2022-05-31T14:13:03-07:00", - "path": "/nix/store/9f82z98jx9jlpb96niav0zd173lxmlla-tree-sitter-python", - "sha256": "07dkwp46wp8fnh94qy4rlvn8yq0wzawnmbrz7z1jk14ymr6s5hkh", + "rev": "de221eccf9a221f5b85474a553474a69b4b5784d", + "date": "2022-06-27T15:09:45-07:00", + "path": "/nix/store/r8cac3zd9xd3l3knzl6k98zhq0wshv0n-tree-sitter-python", + "sha256": "1mp2rqv6p2nla0sh1s5hprq32b9nkwbj2q21dcpvdcg6gack1sdf", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-rst.json b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-rst.json index db200508b4..ae10412d47 100644 --- a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-rst.json +++ b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-rst.json @@ -1,9 +1,9 @@ { "url": "https://github.com/stsewd/tree-sitter-rst", - "rev": "b74770c0166f28c1a0ab293513a78712ca1c338b", - "date": "2022-01-22T20:59:44-05:00", - "path": "/nix/store/ymhzq6hwq43gf918zyxk7can4qfkz7n1-tree-sitter-rst", - "sha256": "0q50vwk72lrgnrdjjn5aj1fjksrwkd0gfmdnrjy59a6cw8m1gmf0", + "rev": "d4b6c33ec15a4c22d0003dd37a5b20baa352b843", + "date": "2022-06-13T13:46:50-05:00", + "path": "/nix/store/scmhiai4dfc8k7nw6f0j1nmdhzv2j1ji-tree-sitter-rst", + "sha256": "127g78x2macl5fc1vhkfgkkd3zzj1yv9m2067j53nrivaff3jj8d", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-rust.json b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-rust.json index b56e34d696..9dcd2a657e 100644 --- a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-rust.json +++ b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-rust.json @@ -1,9 +1,9 @@ { "url": "https://github.com/tree-sitter/tree-sitter-rust", - "rev": "36ae187ed6dd3803a8a89dbb54f3124c8ee74662", - "date": "2022-05-30T15:48:43+02:00", - "path": "/nix/store/h3abmx5hwki3lnymgk1awmkrc070733m-tree-sitter-rust", - "sha256": "1x1k4cn8x3my2rp735byn0z1sjiw17vkzaqnm10jr8jg5nxigl7a", + "rev": "0f14a10011ac6e56f309fb99a94829c3312b743a", + "date": "2022-07-11T12:34:08-04:00", + "path": "/nix/store/9767f79glbdja848ri2i0vii41g3z84n-tree-sitter-rust", + "sha256": "15js3v1kyl7h34ichy5q6zs5n0sm2b0iwgfdh34jrcgnlbvbgy52", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-sql.json b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-sql.json index d8413f75d7..c80f1eaddd 100644 --- a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-sql.json +++ b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-sql.json @@ -1,9 +1,9 @@ { "url": "https://github.com/m-novikov/tree-sitter-sql", - "rev": "2ec2fedbb38d09737e2a1cdd207f6416dc1cb109", - "date": "2022-06-11T22:57:56+02:00", - "path": "/nix/store/zzx4b5cnsrrdzkb5rbmx5d8vzbyr0rbi-tree-sitter-sql", - "sha256": "0dcpdshymyszsr1dflsr3j6ynrnrq0g4qdxqcz7d0anpwh3xw4cs", + "rev": "218b672499729ef71e4d66a949e4a1614488aeaa", + "date": "2022-06-30T19:50:55+02:00", + "path": "/nix/store/rcdcgwb28jblgb65k5zjw5zgmigiqjfl-tree-sitter-sql", + "sha256": "1j68h5jzc0d3a44v5mw005lh3zsrh0salfzydl9br1n8byl1awms", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-typescript.json b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-typescript.json index df1e810151..58bd0d8f80 100644 --- a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-typescript.json +++ b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-typescript.json @@ -1,9 +1,9 @@ { "url": "https://github.com/tree-sitter/tree-sitter-typescript", - "rev": "1b3ba31c7538825b05815f4f5bffcca6394edc63", - "date": "2022-06-02T09:10:56-07:00", - "path": "/nix/store/g3q8azmyclcdns0ihwl5im46qlsfxbfj-tree-sitter-typescript", - "sha256": "1iw6823zh2m95gjmly34j49ixga07fhax7z6g2q6px06gj4fm5df", + "rev": "49e82b1bce36d6046df911901684cd66b5345d58", + "date": "2022-07-06T12:52:21-07:00", + "path": "/nix/store/wzkgvx1sj0js8sdkm8cmip4rmsgqy3ij-tree-sitter-typescript", + "sha256": "1kgl0dvcjzlbpfbdf1mq9693p5j7kvcqfmxis2w30js2lmrp0wgb", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-vim.json b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-vim.json index 10908da4ae..7777e3c7e4 100644 --- a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-vim.json +++ b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-vim.json @@ -1,9 +1,9 @@ { "url": "https://github.com/vigoux/tree-sitter-viml", - "rev": "4b9d2dda6de64fe5abc9bf96b5727ba73ed08515", - "date": "2022-05-07T11:41:23+02:00", - "path": "/nix/store/zm2pfjv3fn2qg6iy1s03mn5kjawsy3qg-tree-sitter-viml", - "sha256": "0p7fj5vvxxz4d43j91zwv3h8df4m4c26w9gq2qx561vjh5w1q7fn", + "rev": "2d75bf329e3df6e1c13f81262567b9aeb6c241d1", + "date": "2022-07-12T08:30:33+02:00", + "path": "/nix/store/l19kbw907jxk26qf5cl5w5nz17sywjf6-tree-sitter-viml", + "sha256": "1pc6s2pc4svk64imkc486nz8fkhkpmwamn17gvnblinsjxr8369y", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-zig.json b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-zig.json index 0ad82155c7..d67ca3c189 100644 --- a/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-zig.json +++ b/third_party/nixpkgs/pkgs/development/tools/parsing/tree-sitter/grammars/tree-sitter-zig.json @@ -1,9 +1,9 @@ { "url": "https://github.com/maxxnino/tree-sitter-zig", - "rev": "4cff36421dae9c05388b86cd64d2bab4b9ed6676", - "date": "2022-04-02T10:33:48+07:00", - "path": "/nix/store/ripw74y32a8nzsr9n30jfhh16wjxlxvb-tree-sitter-zig", - "sha256": "0k9z0f6vfj1pfz3qkscb41wz2nzjp0xpz9mvm6264q655rq73dlc", + "rev": "8d3224c3bd0890fe08358886ebf54fca2ed448a6", + "date": "2022-06-25T10:13:16+07:00", + "path": "/nix/store/an534h97z3gi6zk5mzysbx2fp8rvy9c4-tree-sitter-zig", + "sha256": "0mw4s92qmxkh9a13h9hg6kv9b704vzx3kr4j6dap0c80dffvfjhk", "fetchLFS": false, "fetchSubmodules": false, "deepClone": false, diff --git a/third_party/nixpkgs/pkgs/development/tools/pigeon/default.nix b/third_party/nixpkgs/pkgs/development/tools/pigeon/default.nix index b94a9f4bfc..31d668eb85 100644 --- a/third_party/nixpkgs/pkgs/development/tools/pigeon/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/pigeon/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "sha256-0Cp/OnFvVZj9UZgl3F5MCzemBaHI4smGWU46VQnhLOg="; }; - vendorSha256 = "sha256-07zoQL4mLPSERBkZ3sz35Av7zdZsjTyGR8zbA86EEjU="; + vendorSha256 = "sha256-JbBXRkxnB7LeeWdBLIQvyjvWo0zZ1EOuEUPXxHWiq+E="; proxyVendor = true; diff --git a/third_party/nixpkgs/pkgs/development/tools/proto-contrib/default.nix b/third_party/nixpkgs/pkgs/development/tools/proto-contrib/default.nix index f60bfb4b72..7fb4e8aca4 100644 --- a/third_party/nixpkgs/pkgs/development/tools/proto-contrib/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/proto-contrib/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "0ksxic7cypv9gg8q5lkl5bla1n9i65z7b03cx9lwq6252glmf2jk"; }; - vendorSha256 = "093blawprs2yf478zp9p1zc7mmimgpiwrw6nh8nqml89y5b5zldc"; + vendorSha256 = "sha256-XAFB+DDWN7CLfNxIBqYJy88gUNrUJYExzy2/BFnBe8c="; doCheck = false; @@ -20,6 +20,5 @@ buildGoModule rec { homepage = "https://github.com/emicklei/proto-contrib"; license = licenses.mit; maintainers = with maintainers; [ kalbasit ]; - platforms = platforms.linux ++ platforms.darwin; }; } diff --git a/third_party/nixpkgs/pkgs/development/tools/protoc-gen-twirp_typescript/default.nix b/third_party/nixpkgs/pkgs/development/tools/protoc-gen-twirp_typescript/default.nix index ead72184b7..2aabe3bcce 100644 --- a/third_party/nixpkgs/pkgs/development/tools/protoc-gen-twirp_typescript/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/protoc-gen-twirp_typescript/default.nix @@ -11,7 +11,7 @@ buildGoModule { sha256 = "sha256-LfF/n96LwRX8aoPHzCRI/QbDmZR9yMhE5yGhFAqa8nA="; }; - vendorSha256 = "sha256-xZlP4rg1FMx6ddkKYlSdF6NrtY8xBZ3aEZSATgSf13M="; + vendorSha256 = "sha256-WISWuq1neVX4xQkoamc6FznZahOQHwgkYmERJF40OFQ="; subPackages = [ "." ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/rojo/default.nix b/third_party/nixpkgs/pkgs/development/tools/rojo/default.nix new file mode 100644 index 0000000000..3a2645e788 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/rojo/default.nix @@ -0,0 +1,42 @@ +{ lib +, stdenv +, fetchFromGitHub +, rustPlatform +, pkg-config +, openssl +}: + +rustPlatform.buildRustPackage rec { + pname = "rojo"; + version = "7.2.1"; + + src = fetchFromGitHub { + owner = "rojo-rbx"; + repo = "rojo"; + rev = "v${version}"; + sha256 = "sha256-Kmq/lBwayYkFU4mbjExj7M9wpg59OkIiTc+2ZrwpuBc="; + fetchSubmodules = true; + }; + + cargoSha256 = "sha256-qx6Ja0DMe4cEmDSpovtY9T3+0nJS9XivR92K3UKgacE="; + + nativeBuildInputs = [ + pkg-config + ]; + + buildInputs = [ + openssl + ]; + + meta = with lib; { + description = "Project management tool for Roblox"; + longDescription = '' + Rojo is a tool designed to enable Roblox developers to use professional-grade software engineering tools. + ''; + homepage = "https://rojo.space"; + downloadPage = "https://github.com/rojo-rbx/rojo/releases/tag/v${version}"; + changelog = "https://github.com/rojo-rbx/rojo/raw/v${version}/CHANGELOG.md"; + license = licenses.mpl20; + maintainers = with maintainers; [ wackbyte ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-cross/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-cross/default.nix index ff76a755cd..7428e84fae 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-cross/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-cross/default.nix @@ -7,21 +7,22 @@ rustPlatform.buildRustPackage rec { pname = "cargo-cross"; - version = "0.2.1"; + version = "0.2.4"; src = fetchFromGitHub { owner = "rust-embedded"; repo = "cross"; rev = "v${version}"; - sha256 = "1py5w4kf612x4qxi190ilsrx0zzwdzk9i47ppvqblska1s47qa2w"; + sha256 = "sha256-gaY34ziC+ugw/HUTSh0Uk5WBfWMRZLybfpAMkUzsj8g="; }; - cargoSha256 = "sha256-zk6cbN4iSHnyoeWupufVf2yQK6aq3S99uk9lqpjCw4c="; + cargoSha256 = "sha256-bdcdlnNr4CdkIJNoo8tb4ohVDmAcKIOP0nRr6BM+EPw="; + # Fixes https://github.com/cross-rs/cross/issues/943 cargoPatches = [ (fetchpatch { - url = "https://github.com/rust-embedded/cross/commit/e86ad2e5a55218395df7eaaf91900e22b809083c.patch"; - sha256 = "1zrcj5fm3irmlrfkgb65kp2pjkry0rg5nn9pwsk9p0i6dpapjc7k"; + url = "https://github.com/cross-rs/cross/commit/d639578881d21d28d91d155722201cc53b00c5e7.patch"; + sha256 = "sha256-FWaYIEMonb1Z8g5yXfd/Rl/LnxSYVwLfFIvPY1mJNxU="; }) ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-embed/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-embed/default.nix index 70b34dc350..03eecf8a31 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-embed/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-embed/default.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-embed"; - version = "0.12.0"; + version = "0.13.0"; src = fetchFromGitHub { owner = "probe-rs"; repo = pname; rev = "v${version}"; - sha256 = "1is58n8y5lvnvzkbnh3gfk3r3f2r1w4l2qjdp2k8373apxzjxdvr"; + sha256 = "sha256-UlQ7KJmzPWu0vVsYPIkYeqkFFhxe7mEMfUVN7iMaUw0="; }; - cargoSha256 = "0kalwigck9lf734zdpzg01sf2zzyrgdgq2rg3qj7hy94gfxlsk63"; + cargoSha256 = "sha256-RkYX5z764Kkr0xK7yYQ0lCw0/7KpmdJmKWqLzwkj4hs="; nativeBuildInputs = [ pkg-config rustfmt ]; buildInputs = [ libusb1 libftdi1 ] ++ lib.optionals stdenv.isDarwin [ AppKit ]; @@ -32,6 +32,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://probe.rs/"; changelog = "https://github.com/probe-rs/cargo-embed/blob/v${version}/CHANGELOG.md"; license = with licenses; [ asl20 /* or */ mit ]; - maintainers = with maintainers; [ fooker ]; + maintainers = with maintainers; [ fooker newam ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-flash/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-flash/default.nix index 49e9bbaceb..537392a65b 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-flash/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-flash/default.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-flash"; - version = "0.12.1"; + version = "0.13.0"; src = fetchFromGitHub { owner = "probe-rs"; repo = pname; rev = "v${version}"; - sha256 = "sha256-bd0TY8bdpLHLCdDQgJeJvqjAcSF67+LGSNx8yafYbys="; + sha256 = "sha256-O6T1Wul0nJaTVp9MEOj9FT+FUt4oYfqR5pGFaAxuK30="; }; - cargoSha256 = "sha256-bx2N8zP7BmqU6oM/7Nf2i9S1uNWItReQMD59vtG1RKE="; + cargoSha256 = "sha256-E2gBkr50hjkzY+ZVgMm7tpdwr9yuyFh65Ht6FAPvxYg="; nativeBuildInputs = [ pkg-config rustfmt ]; buildInputs = [ libusb1 ] ++ lib.optionals stdenv.isDarwin [ AppKit ]; @@ -29,6 +29,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://probe.rs/"; changelog = "https://github.com/probe-rs/cargo-flash/blob/v${version}/CHANGELOG.md"; license = with licenses; [ asl20 /* or */ mit ]; - maintainers = with maintainers; [ fooker ]; + maintainers = with maintainers; [ fooker newam ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-public-api/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-public-api/default.nix new file mode 100644 index 0000000000..ef4f8dcb2f --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-public-api/default.nix @@ -0,0 +1,34 @@ +{ lib +, rustPlatform +, fetchCrate +, pkg-config +, openssl +, stdenv +}: + +rustPlatform.buildRustPackage rec { + pname = "cargo-public-api"; + version = "0.12.2"; + + src = fetchCrate { + inherit pname version; + sha256 = "sha256-ZpzR6A9mV6ARz2+SedVtLjNANOEj8Ks09AWcQooltug="; + }; + + cargoSha256 = "sha256-8BZ1fPzRSJysyLCmoMxk+8xOfmfIs7viHFCeSfnxvt8="; + + nativeBuildInputs = [ pkg-config ]; + + buildInputs = [ openssl ]; + + # Tests fail + doCheck = false; + + meta = with lib; { + description = "List and diff the public API of Rust library crates between releases and commits. Detect breaking API changes and semver violations"; + homepage = "https://github.com/Enselic/cargo-public-api"; + license = licenses.mit; + maintainers = with maintainers; [ matthiasbeyer ]; + }; +} + diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/probe-rs-cli/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/probe-rs-cli/default.nix index 4978c4a3c3..0cce6354fb 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/probe-rs-cli/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/probe-rs-cli/default.nix @@ -2,14 +2,14 @@ rustPlatform.buildRustPackage rec { pname = "probe-rs-cli"; - version = "0.12.0"; + version = "0.13.0"; src = fetchCrate { inherit pname version; - sha256 = "sha256-XYrB/aKuFCe0FNe6N9vqDdr408tAiN6YvT5BL6lCxmU="; + sha256 = "sha256-3aKRUABJ1LkRGzwDSwQZeNXKGeRmTlbHKSGewfKn+2Q="; }; - cargoSha256 = "sha256-aXSJMSGNl2fzob1j/qiPHHZLisYQeU1gUO5cYbzSHYA="; + cargoSha256 = "sha256-bOfdpRVm9zqpFF/YmD06u4OKdyqXwfCSTNlTIZZygeg="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ libusb1 ] ++ lib.optionals stdenv.isDarwin [ AppKit ]; @@ -19,6 +19,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://probe.rs/"; changelog = "https://github.com/probe-rs/probe-rs/blob/v${version}/CHANGELOG.md"; license = with licenses; [ asl20 /* or */ mit ]; - maintainers = with maintainers; [ xgroleau ]; + maintainers = with maintainers; [ xgroleau newam ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/rustup/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/rustup/default.nix index 3d137f5841..65bad79aa8 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/rustup/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/rustup/default.nix @@ -22,16 +22,16 @@ in rustPlatform.buildRustPackage rec { pname = "rustup"; - version = "1.24.3"; + version = "1.25.1"; src = fetchFromGitHub { owner = "rust-lang"; repo = "rustup"; rev = version; - sha256 = "sha256-JpOOFwlTgwwBCrXOGYskFTgS6RZ7mHQJGT0jnHavxvI="; + sha256 = "sha256-zCr8xu0j/pBsdJEAYTCGrEouA8QumBnyhM4YLFZJqZI="; }; - cargoSha256 = "sha256-hAfGpKaWD94IxFFpnW9XwQp4P9clUX6mmekwodCK0Ag="; + cargoSha256 = "sha256-FDVZn2PjqxovQmmandJICkidurhoXCAxo3bibuxQSMY="; nativeBuildInputs = [ makeWrapper pkg-config ]; @@ -61,7 +61,7 @@ rustPlatform.buildRustPackage rec { mv rustup-init rustup binlinks=( cargo rustc rustdoc rust-gdb rust-lldb rls rustfmt cargo-fmt - cargo-clippy clippy-driver cargo-miri + cargo-clippy clippy-driver cargo-miri rust-gdbgui ) for link in ''${binlinks[@]}; do ln -s rustup $link diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/svd2rust/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/svd2rust/default.nix index dbd0876eb5..7efcfb08c4 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/svd2rust/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/svd2rust/default.nix @@ -2,14 +2,14 @@ rustPlatform.buildRustPackage rec { pname = "svd2rust"; - version = "0.24.0"; + version = "0.24.1"; src = fetchCrate { inherit pname version; - sha256 = "sha256-P0s2mrfYA7DUThvje0LH3Pq0Os6UZJrrnjnzAm8UlDQ="; + sha256 = "sha256-BIATH7GsTPtvEFpCb8Kfb0k6s8K7xfhRHni+IgzAQ8k="; }; - cargoSha256 = "sha256-TDgd8RG97ROeAQJ1uDF2m+yIa8US7zFz+5qrQtFbazE="; + cargoSha256 = "sha256-kg+QW84bq+aD3/t0DmtL1W8ESC5Ug4X+I0pFJRalu7Q="; buildInputs = lib.optional stdenv.isDarwin libiconv; diff --git a/third_party/nixpkgs/pkgs/development/tools/sshs/default.nix b/third_party/nixpkgs/pkgs/development/tools/sshs/default.nix new file mode 100644 index 0000000000..76cd63876a --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/sshs/default.nix @@ -0,0 +1,32 @@ +{ lib +, buildGoModule +, fetchFromGitHub +, nix-update-script +}: + +buildGoModule rec { + pname = "sshs"; + version = "3.2.0"; + + src = fetchFromGitHub { + owner = "quantumsheep"; + repo = pname; + rev = version; + sha256 = "D9doNVb2sTnzM8tF8cSJbIoaIYjGurkUHEyhcE3OqQg="; + }; + + vendorSha256 = "QWFz85bOrTnPGum5atccB5hKeATlZvDAt32by+DO/Fo="; + + ldflags = [ "-s" "-w" "-X github.com/quantumsheep/sshs/cmd.Version=${version}" ]; + + passthru.updateScript = nix-update-script { + attrPath = pname; + }; + + meta = with lib; { + description = "Terminal user interface for SSH"; + homepage = "https://github.com/quantumsheep/sshs"; + license = licenses.mit; + maintainers = with maintainers; [ ihatethefrench ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/tools/vgo2nix/default.nix b/third_party/nixpkgs/pkgs/development/tools/vgo2nix/default.nix index 365bb920e4..6841b069b1 100644 --- a/third_party/nixpkgs/pkgs/development/tools/vgo2nix/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/vgo2nix/default.nix @@ -34,7 +34,10 @@ buildGoModule { description = "Convert go.mod files to nixpkgs buildGoPackage compatible deps.nix files"; homepage = "https://github.com/nix-community/vgo2nix"; license = licenses.mit; - maintainers = with maintainers; [ adisbladis SuperSandro2000 ]; + maintainers = with maintainers; [ adisbladis ]; mainProgram = "vgo2nix"; + # vendoring fails with cryptic error: + # reading file:///nix/store/..../github.com/orivej/e/@v/v0.0.0-20180728214217-ac3492690fda.zip: no such file or directory + broken = true; }; } 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 7725c7d6e8..408dff3faa 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.25.3"; + version = "4.26.1"; src = fetchFromGitHub { owner = "mikefarah"; repo = "yq"; rev = "v${version}"; - sha256 = "sha256-136qmLHPBWPGiyIckSO9y3zpDxikGVy6w/f4UxWpvrw="; + sha256 = "sha256-5EDFttaUgef2/EQUSORY17UjbErCjVDdy3Dls1mMYLQ="; }; - vendorSha256 = "sha256-pPZ5pR4RHzrb7k8akrBarUv7CHMCw+T4hfFJNGTrn8Y="; + vendorSha256 = "sha256-w9TaCYxu3a8R3oCfyNyioe2W9PrejhTj/3eaBeg7UAw="; nativeBuildInputs = [ installShellFiles ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/zls/default.nix b/third_party/nixpkgs/pkgs/development/tools/zls/default.nix index a48dbf9e30..8cb041b90b 100644 --- a/third_party/nixpkgs/pkgs/development/tools/zls/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/zls/default.nix @@ -28,5 +28,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/zigtools/zls"; license = licenses.mit; maintainers = with maintainers; [ fortuneteller2k ]; + platforms = platforms.unix; }; } diff --git a/third_party/nixpkgs/pkgs/development/web/flyctl/default.nix b/third_party/nixpkgs/pkgs/development/web/flyctl/default.nix index 5ea9a4a78e..cdc82dc26a 100644 --- a/third_party/nixpkgs/pkgs/development/web/flyctl/default.nix +++ b/third_party/nixpkgs/pkgs/development/web/flyctl/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "flyctl"; - version = "0.0.350"; + version = "0.0.351"; src = fetchFromGitHub { owner = "superfly"; repo = "flyctl"; rev = "v${version}"; - sha256 = "sha256-bpaDgjR1Om+4IYLIUjqJkxa9mbdscItwnTWYG7Wlms0="; + sha256 = "sha256-vxX11kaQMOQ2LJ/2q4QrlzMmuJtkn1Oe1iBHQgXn0mI="; }; - vendorSha256 = "sha256-OKA3J4MExysucOJl9UkH3mI4VbJgoOEIVa/iv22kxac="; + vendorSha256 = "sha256-gAdKrPU6js3zrzX2+NWQZSXxGuuUiggprua4gvd++OQ="; subPackages = [ "." ]; diff --git a/third_party/nixpkgs/pkgs/development/web/grails/default.nix b/third_party/nixpkgs/pkgs/development/web/grails/default.nix index c300062c52..2497956b91 100644 --- a/third_party/nixpkgs/pkgs/development/web/grails/default.nix +++ b/third_party/nixpkgs/pkgs/development/web/grails/default.nix @@ -11,11 +11,11 @@ let in stdenv.mkDerivation rec { pname = "grails"; - version = "5.1.6"; + version = "5.1.7"; src = fetchurl { url = "https://github.com/grails/grails-core/releases/download/v${version}/grails-${version}.zip"; - sha256 = "sha256-H4c/Nu6iOgaRLl/uV51nYnNQg5p9cjl/taexZnl4t+I="; + sha256 = "sha256-Sk+VvuEyzZ9sSeI9fOuHgmgSu89WjriiK/6UU/eWqag="; }; nativeBuildInputs = [ unzip ]; diff --git a/third_party/nixpkgs/pkgs/games/ddnet/default.nix b/third_party/nixpkgs/pkgs/games/ddnet/default.nix index 39bae61160..33b8ca4f0e 100644 --- a/third_party/nixpkgs/pkgs/games/ddnet/default.nix +++ b/third_party/nixpkgs/pkgs/games/ddnet/default.nix @@ -26,13 +26,13 @@ stdenv.mkDerivation rec { pname = "ddnet"; - version = "16.2.1"; + version = "16.2.2"; src = fetchFromGitHub { owner = "ddnet"; repo = pname; rev = version; - sha256 = "sha256-xDUvBsiQk7qZN9HEMCrCfxJSCZ/PruEdS5EjnHFufTA="; + sha256 = "sha256-MrCPMtWdEsWUuvKaPWZK4Mh6nhPcKpsxkFKkWugdz8A="; }; nativeBuildInputs = [ cmake ninja pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/games/factorio/versions.json b/third_party/nixpkgs/pkgs/games/factorio/versions.json index e3673edd4a..ba33d689b6 100644 --- a/third_party/nixpkgs/pkgs/games/factorio/versions.json +++ b/third_party/nixpkgs/pkgs/games/factorio/versions.json @@ -2,30 +2,30 @@ "x86_64-linux": { "alpha": { "experimental": { - "name": "factorio_alpha_x64-1.1.59.tar.xz", + "name": "factorio_alpha_x64-1.1.61.tar.xz", "needsAuth": true, - "sha256": "0qwq3mjsmhb119pvbfznpncw898z4zs2if4fd7p6rqfz0wip93qk", + "sha256": "1rgb3i6l9v5vv3qw0ngfxryamql2fhhqymv4dr86rxjy863rpx65", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/1.1.59/alpha/linux64", - "version": "1.1.59" + "url": "https://factorio.com/get-download/1.1.61/alpha/linux64", + "version": "1.1.61" }, "stable": { - "name": "factorio_alpha_x64-1.1.59.tar.xz", + "name": "factorio_alpha_x64-1.1.61.tar.xz", "needsAuth": true, - "sha256": "0qwq3mjsmhb119pvbfznpncw898z4zs2if4fd7p6rqfz0wip93qk", + "sha256": "1rgb3i6l9v5vv3qw0ngfxryamql2fhhqymv4dr86rxjy863rpx65", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/1.1.59/alpha/linux64", - "version": "1.1.59" + "url": "https://factorio.com/get-download/1.1.61/alpha/linux64", + "version": "1.1.61" } }, "demo": { "experimental": { - "name": "factorio_demo_x64-1.1.59.tar.xz", + "name": "factorio_demo_x64-1.1.60.tar.xz", "needsAuth": false, - "sha256": "1nddk8184kgq4ni0y9j2l8sa3szvcbsq9l90b35l9jb6sqflgki0", + "sha256": "1sckcc8dndml2ahka96qlhyjqinbgzh2sns2qfphsph9x26q1vxn", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/1.1.59/demo/linux64", - "version": "1.1.59" + "url": "https://factorio.com/get-download/1.1.60/demo/linux64", + "version": "1.1.60" }, "stable": { "name": "factorio_demo_x64-1.1.59.tar.xz", @@ -38,20 +38,20 @@ }, "headless": { "experimental": { - "name": "factorio_headless_x64-1.1.59.tar.xz", + "name": "factorio_headless_x64-1.1.61.tar.xz", "needsAuth": false, - "sha256": "1p5wyki6wxnvnp7zqjjw9yggiy0p78rx49wmq3q7kq0mxfz054dg", + "sha256": "0ndnc0f22bqjg1v6ah7i4nzghvk7cn73sgm22lf715di6f6srr38", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/1.1.59/headless/linux64", - "version": "1.1.59" + "url": "https://factorio.com/get-download/1.1.61/headless/linux64", + "version": "1.1.61" }, "stable": { - "name": "factorio_headless_x64-1.1.59.tar.xz", + "name": "factorio_headless_x64-1.1.61.tar.xz", "needsAuth": false, - "sha256": "1p5wyki6wxnvnp7zqjjw9yggiy0p78rx49wmq3q7kq0mxfz054dg", + "sha256": "0ndnc0f22bqjg1v6ah7i4nzghvk7cn73sgm22lf715di6f6srr38", "tarDirectory": "x64", - "url": "https://factorio.com/get-download/1.1.59/headless/linux64", - "version": "1.1.59" + "url": "https://factorio.com/get-download/1.1.61/headless/linux64", + "version": "1.1.61" } } } diff --git a/third_party/nixpkgs/pkgs/games/openrct2/default.nix b/third_party/nixpkgs/pkgs/games/openrct2/default.nix index 41c3ccac1f..b9ffec66bc 100644 --- a/third_party/nixpkgs/pkgs/games/openrct2/default.nix +++ b/third_party/nixpkgs/pkgs/games/openrct2/default.nix @@ -1,29 +1,50 @@ { lib, stdenv, fetchFromGitHub -, SDL2, cmake, curl, duktape, fontconfig, freetype, icu, jansson, libGLU -, libiconv, libpng, libpthreadstubs, libzip, nlohmann_json, openssl, pkg-config -, speexdsp, zlib + +, SDL2 +, cmake +, curl +, discord-rpc +, duktape +, flac +, fontconfig +, freetype +, gbenchmark +, icu +, jansson +, libGLU +, libiconv +, libogg +, libpng +, libpthreadstubs +, libvorbis +, libzip +, nlohmann_json +, openssl +, pkg-config +, speexdsp +, zlib }: let - openrct2-version = "0.4.0"; + openrct2-version = "0.4.1"; # Those versions MUST match the pinned versions within the CMakeLists.txt # file. The REPLAYS repository from the CMakeLists.txt is not necessary. - objects-version = "1.2.7"; + objects-version = "1.3.2"; title-sequences-version = "0.4.0"; openrct2-src = fetchFromGitHub { owner = "OpenRCT2"; repo = "OpenRCT2"; rev = "v${openrct2-version}"; - sha256 = "sha256-4MDOLOPsKzk1vb1o/G90/NTyYJWBSrGRX6ZJETbBIaI="; + sha256 = "sha256-fMs0zrMzv9jXreZE4QyYIdvWUU/FUFVPuo4EzAF/2rU="; }; objects-src = fetchFromGitHub { owner = "OpenRCT2"; repo = "objects"; rev = "v${objects-version}"; - sha256 = "sha256-R4+rEdGdvYwFrkm/S3+zXmU+UDam51dI/pWKmFXNrbE="; + sha256 = "sha256-BG0IRiNb2l6/3P7tvuUqMoYNh1zkOS0lCFDDh7m9Q7Y="; }; title-sequences-src = fetchFromGitHub { @@ -47,15 +68,20 @@ stdenv.mkDerivation { buildInputs = [ SDL2 curl + discord-rpc duktape + flac fontconfig freetype + gbenchmark icu jansson libGLU libiconv + libogg libpng libpthreadstubs + libvorbis libzip nlohmann_json openssl diff --git a/third_party/nixpkgs/pkgs/games/osu-lazer/default.nix b/third_party/nixpkgs/pkgs/games/osu-lazer/default.nix index a05f7ae2c7..945f70ebbc 100644 --- a/third_party/nixpkgs/pkgs/games/osu-lazer/default.nix +++ b/third_party/nixpkgs/pkgs/games/osu-lazer/default.nix @@ -14,13 +14,13 @@ buildDotnetModule rec { pname = "osu-lazer"; - version = "2022.409.0"; + version = "2022.709.1"; src = fetchFromGitHub { owner = "ppy"; repo = "osu"; rev = version; - sha256 = "sha256-qG9797SA0iMq9IF5SzQLgnhoUd2FKSAVXUPem1LQc1M="; + sha256 = "sha256-7tK3jRTfkCn4quQ52fgGsXeXIViaIQTcteq6FMiJzyU="; }; projectFile = "osu.Desktop/osu.Desktop.csproj"; diff --git a/third_party/nixpkgs/pkgs/games/osu-lazer/deps.nix b/third_party/nixpkgs/pkgs/games/osu-lazer/deps.nix index 56206d2a42..fa41323829 100644 --- a/third_party/nixpkgs/pkgs/games/osu-lazer/deps.nix +++ b/third_party/nixpkgs/pkgs/games/osu-lazer/deps.nix @@ -1,10 +1,10 @@ { fetchNuGet }: [ (fetchNuGet { pname = "AutoMapper"; version = "11.0.1"; sha256 = "1z1x5c1dkwk6142km5q6jglhpq9x82alwjjy5a72c8qnq9ppdfg3"; }) - (fetchNuGet { pname = "Clowd.Squirrel"; version = "2.8.28-pre"; sha256 = "0l4saz51pz8iwsbqj1c3zlf22hiab4vl671rby97kkfbjwv9ra4s"; }) + (fetchNuGet { pname = "Clowd.Squirrel"; version = "2.9.40"; sha256 = "171pq2zh26hlnwjv4n1lvsammi94an72ggms9n1n1qfi7zak1i4l"; }) (fetchNuGet { pname = "DiffPlex"; version = "1.7.1"; sha256 = "1q78r70pirgb7j5wkh454ws237lihh0fig212cpbj02cz53c2h6j"; }) (fetchNuGet { pname = "DiscordRichPresence"; version = "1.0.175"; sha256 = "180sax976327d70qbinv07f65g3w2zbw80n49hckg8wd4rw209vd"; }) (fetchNuGet { pname = "FFmpeg.AutoGen"; version = "4.3.0.1"; sha256 = "0n6x57mnnvcjnrs8zyvy07h5zm4bcfy9gh4n4bvd9fx5ys4pxkvv"; }) - (fetchNuGet { pname = "Fody"; version = "6.6.0"; sha256 = "0cx708ah61cxmvpaq040mhqwrv937rvlmskwihg1w118729k9yv0"; }) + (fetchNuGet { pname = "Fody"; version = "6.6.2"; sha256 = "1jnpvqzi7bdk96skqax82765q1kjpx921yqakqawkx5b3bhqpihs"; }) (fetchNuGet { pname = "HidSharpCore"; version = "1.2.1.1"; sha256 = "1zkndglmz0s8rblfhnqcvv90rkq2i7lf4bc380g7z8h1avf2ikll"; }) (fetchNuGet { pname = "HtmlAgilityPack"; version = "1.11.42"; sha256 = "0cvnc1qdfcjbqkh335bv4wp44zisb4hc69lq3zphiyzqfrjisnyb"; }) (fetchNuGet { pname = "Humanizer"; version = "2.14.1"; sha256 = "18cycx9gvbc3735chdi2r583x73m2fkz1ws03yi3g640j9zv00fp"; }) @@ -67,15 +67,15 @@ (fetchNuGet { pname = "MessagePack"; version = "2.3.85"; sha256 = "0n7kv4i6knhv1dd35cv45sfpidsiy9albfdmbrdschykd1mzxmiy"; }) (fetchNuGet { pname = "MessagePack.Annotations"; version = "2.3.85"; sha256 = "0axjgy9r533bw00lflnc6acjyza76mf2x1nn6fw7qacvak9rqxm3"; }) (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "6.0.6"; sha256 = "0ndah9cqkgswhi60wrnni10j1d2hdg8jljij83lk1wbfqbng86jm"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.Connections.Abstractions"; version = "6.0.3"; sha256 = "0mc84qjsbsi7m1yx42w4zh8bdkqyqlvvx9iw80g4wsbrflkq5pwi"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.Http.Connections.Client"; version = "6.0.3"; sha256 = "1vadkmcxj2nv01mg8027z0ywxk2fddyj5aqflanslbfclsz4779i"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.Http.Connections.Common"; version = "6.0.3"; sha256 = "11a5w8p0nkfyp21aafpmrf0lvjpbg2p4yqay4dxbjg0w99w2kwq6"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.SignalR.Client"; version = "6.0.3"; sha256 = "00kga3smvhc3a1hvv174wk3av6pn83diyrq8hz4fgww4qazzq2h9"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.SignalR.Client.Core"; version = "6.0.3"; sha256 = "02bsa301vznnysc8slapanwnzs382fc0hasvb6p053llayw7j3if"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.SignalR.Common"; version = "6.0.3"; sha256 = "11s22x9gr6yv705cb9pbgkak8vm9vgarr7y062vrnm0ys1spw5pf"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.SignalR.Protocols.Json"; version = "6.0.3"; sha256 = "0h0wqfd6m8qjx0x0pyikisglqhzswpr1lz0mv4y6lj0mkq88ndc8"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.SignalR.Protocols.MessagePack"; version = "6.0.3"; sha256 = "0rg93blnrg4aja1xsys3y90qrd3i11ljhsdpbmxl5jiimy2ldqml"; }) - (fetchNuGet { pname = "Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson"; version = "6.0.3"; sha256 = "135yyj40z3azacl2zrrciy7n3dhc5y98jacv9lpv4am0ik9lgv72"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.Connections.Abstractions"; version = "6.0.5"; sha256 = "05crn1mj59yvljlmhfdy6wkblw8fj9hamyq9zvijl6ah684a9fwq"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.Http.Connections.Client"; version = "6.0.5"; sha256 = "1nirf76vwhg4r96mvc6ajbm2b4gkmvn7s8dp5zdf9vxmnka9r76l"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.Http.Connections.Common"; version = "6.0.5"; sha256 = "162kqhv8gsx6w52xa4hd7mkvgzwpf424k4pnqvjyz3m5piym10af"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.SignalR.Client"; version = "6.0.5"; sha256 = "0wrpw1l3jbid7hv76h8jvcpjaw3mc2ybmxhp2fk65d9bjni9xjmf"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.SignalR.Client.Core"; version = "6.0.5"; sha256 = "139sfsgq6nkr55yd8sfqk536k9517lhha51a3fck7svqwr7fapxx"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.SignalR.Common"; version = "6.0.5"; sha256 = "0grkijyfbq0pa76hflp5xiddii75zm98prpxw0gn64qj4i3sxlx0"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.SignalR.Protocols.Json"; version = "6.0.5"; sha256 = "0b5xy15jz3kw4qzfpi2p9h6k0flv6sazjmplyx9x0rl4ysq01jjq"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.SignalR.Protocols.MessagePack"; version = "6.0.5"; sha256 = "0z6cjyl0ycwcgmgncapmls8cirhy50dmymzz48mnfsv5456w232c"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.SignalR.Protocols.NewtonsoftJson"; version = "6.0.5"; sha256 = "1dhgpv4iwrg0p68bz2w1bzk9vqdh0m0b7dvdlm2p0gqdc5kvwkry"; }) (fetchNuGet { pname = "Microsoft.Bcl.AsyncInterfaces"; version = "1.0.0"; sha256 = "00dx5armvkqjxvkldz3invdlck9nj7w21dlsr2aqp1rqbyrbsbbh"; }) (fetchNuGet { pname = "Microsoft.Bcl.AsyncInterfaces"; version = "5.0.0"; sha256 = "0cp5jbax2mf6xr3dqiljzlwi05fv6n9a35z337s92jcljiq674kf"; }) (fetchNuGet { pname = "Microsoft.Bcl.AsyncInterfaces"; version = "6.0.0"; sha256 = "15gqy2m14fdlvy1g59207h5kisznm355kbw010gy19vh47z8gpz3"; }) @@ -104,7 +104,7 @@ (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "6.0.0"; sha256 = "1vi67fw7q99gj7jd64gnnfr4d2c0ijpva7g9prps48ja6g91x6a9"; }) (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "6.0.0-rc.1.21451.13"; sha256 = "11dg16x6g0gssb143qpghxz1s41himvhr7yhjwxs9hacx4ij2dm1"; }) (fetchNuGet { pname = "Microsoft.Extensions.DependencyModel"; version = "5.0.0"; sha256 = "1mma1zxi0b40972cwfvkj9y0w9r7vjbi74784jzcb22pric00k5x"; }) - (fetchNuGet { pname = "Microsoft.Extensions.Features"; version = "6.0.3"; sha256 = "0y7ja54mhqgwyimnzx6hnv0jcg06if0a5a78qh2n4djp1q8iqjpp"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Features"; version = "6.0.5"; sha256 = "01lsvmqg58570nwsm6j2x86dda1j51nlzyl5hfrfrz5l2kpx6pas"; }) (fetchNuGet { pname = "Microsoft.Extensions.Logging"; version = "5.0.0"; sha256 = "1qa1l18q2jh9azya8gv1p8anzcdirjzd9dxxisb4911i9m1648i3"; }) (fetchNuGet { pname = "Microsoft.Extensions.Logging"; version = "6.0.0"; sha256 = "0fd9jii3y3irfcwlsiww1y9npjgabzarh33rn566wpcz24lijszi"; }) (fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "5.0.0"; sha256 = "1yza38675dbv1qqnnhqm23alv2bbaqxp0pb7zinjmw8j2mr5r6wc"; }) @@ -122,6 +122,7 @@ (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "5.0.0"; sha256 = "0mwpwdflidzgzfx2dlpkvvnkgkr2ayaf0s80737h4wa35gaj11rc"; }) (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.0.1"; sha256 = "0ppdkwy6s9p7x9jix3v4402wb171cdiibq7js7i13nxpdky7074p"; }) (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.1.0"; sha256 = "193xwf33fbm0ni3idxzbr5fdq3i2dlfgihsac9jj7whj0gd902nh"; }) + (fetchNuGet { pname = "Microsoft.Toolkit.HighPerformance"; version = "7.1.2"; sha256 = "18l950mq0l8s1z771l9p332ni7jryidjh4hi9p37l6p8frcnccxb"; }) (fetchNuGet { pname = "Microsoft.Win32.Primitives"; version = "4.3.0"; sha256 = "0j0c1wj4ndj21zsgivsc24whiya605603kxrbiw6wkfdync464wq"; }) (fetchNuGet { pname = "Microsoft.Win32.Registry"; version = "4.5.0"; sha256 = "1zapbz161ji8h82xiajgriq6zgzmb1f3ar517p2h63plhsq5gh2q"; }) (fetchNuGet { pname = "Microsoft.Win32.Registry"; version = "5.0.0"; sha256 = "102hvhq2gmlcbq8y2cb7hdr2dnmjzfp2k3asr1ycwrfacwyaak7n"; }) @@ -140,19 +141,19 @@ (fetchNuGet { pname = "NuGet.ProjectModel"; version = "5.11.0"; sha256 = "1i0dcak9qdj8s68c5f3zhrjs5sc4rsim92dy1qw4x9cavv5jrp05"; }) (fetchNuGet { pname = "NuGet.Protocol"; version = "5.11.0"; sha256 = "041pva6ykc5h6az7bb87mkg32c95cvxlixgspnd34zbdldr4ypdb"; }) (fetchNuGet { pname = "NuGet.Versioning"; version = "5.11.0"; sha256 = "041351n1rbyqpfxqyxbvjgfrcbbawymbq96givz5pvdbabvyf5vq"; }) - (fetchNuGet { pname = "NUnit"; version = "3.13.2"; sha256 = "00bkjgarkwbj497da9d7lajala1ns67h1kx53w4bapwkf32jlcvn"; }) + (fetchNuGet { pname = "NUnit"; version = "3.13.3"; sha256 = "0wdzfkygqnr73s6lpxg5b1pwaqz9f414fxpvpdmf72bvh4jaqzv6"; }) (fetchNuGet { pname = "OpenTabletDriver"; version = "0.6.0.2"; sha256 = "0blwfs1cacxq0vs6fy7zjnsny8qdsr5jlxix3icmphyqgz0g4g39"; }) (fetchNuGet { pname = "OpenTabletDriver.Configurations"; version = "0.6.0.2"; sha256 = "18q6gjayqrwk6n1kf359z94z8zyb3yz4hr1dpgglk51sq6wi2z84"; }) (fetchNuGet { pname = "OpenTabletDriver.Native"; version = "0.6.0.2"; sha256 = "12hf4v8j8asc9wlywpykajb8yrzx10w6h11qbykckmrfxvz8pc0a"; }) (fetchNuGet { pname = "OpenTabletDriver.Plugin"; version = "0.6.0.2"; sha256 = "0z2n5jysw06zp2cxmfqddbg3g88jdm1irr2hv04q8valq0plaq5c"; }) - (fetchNuGet { pname = "ppy.LocalisationAnalyser"; version = "2022.320.0"; sha256 = "1sjam1mskkcilngrbjah74j1nwjgb9vr2j09sj6ip2hic216hzcf"; }) - (fetchNuGet { pname = "ppy.osu.Framework"; version = "2022.408.0"; sha256 = "1nkgsd14dwdq9xkx7c6c4fd6zfxwbrfk9cddp33s31xs6sppxn9c"; }) - (fetchNuGet { pname = "ppy.osu.Framework.NativeLibs"; version = "2022.222.0"; sha256 = "13qkpkrqxvd6xz676f9wzzjwm7d6iq1h24x7d1q4bab0q4wfqj5c"; }) - (fetchNuGet { pname = "ppy.osu.Game.Resources"; version = "2022.407.0"; sha256 = "0mnjfradvs49awfgn84nc5iqwaai08q7i8zm0clphf5dj8dx5w1v"; }) - (fetchNuGet { pname = "ppy.osuTK.NS20"; version = "1.0.187"; sha256 = "0ididsxn3005dvs0hvx7bz2xzjsfpa8kmnyfqq4c2ybjxlx15gkw"; }) - (fetchNuGet { pname = "ppy.SDL2-CS"; version = "1.0.501-alpha"; sha256 = "03ixv0nhszsyyf0bvyd25nkyn3c3cndzbxnva19lagvf0l9gnvjg"; }) - (fetchNuGet { pname = "Realm"; version = "10.10.0"; sha256 = "0dgcirbrn0idxmrnl9rw8mi3irkxz75cqnxbxwnb8m34jv2g8gfy"; }) - (fetchNuGet { pname = "Realm.Fody"; version = "10.10.0"; sha256 = "1sip0q0qiscf77qqm32a1hiwkn67c31yljkajwnxkp35dhz78140"; }) + (fetchNuGet { pname = "ppy.LocalisationAnalyser"; version = "2022.607.0"; sha256 = "07rf10lpnly9d8wf7mwys3jsr4kh0rkf86rjck1hmb73b8524jq9"; }) + (fetchNuGet { pname = "ppy.osu.Framework"; version = "2022.707.0"; sha256 = "08s5yfj1h5d6mzkamssbx6fqfgc5q6rr31wvwdj0kfvnfz470iax"; }) + (fetchNuGet { pname = "ppy.osu.Framework.NativeLibs"; version = "2022.525.0"; sha256 = "1zsqj3xng06bb46vg79xx35n2dsh3crqg951r1ga2gxqzgzy4nk0"; }) + (fetchNuGet { pname = "ppy.osu.Game.Resources"; version = "2022.702.0"; sha256 = "1vw8prjdvf91zpkqwn6n0kv834kwv9fd2si6lx9jm3z3wsf3ydkz"; }) + (fetchNuGet { pname = "ppy.osuTK.NS20"; version = "1.0.192"; sha256 = "0k6nlsxdl6qa5kbn66nbxh5x43hkgpnz8h3zjlbr5siqdjcrvcvg"; }) + (fetchNuGet { pname = "ppy.SDL2-CS"; version = "1.0.563-alpha"; sha256 = "09bk81nibfwicjmy8bg4h14myp3x0a7yz4axwdfnk33pj5dsn953"; }) + (fetchNuGet { pname = "Realm"; version = "10.14.0"; sha256 = "0pbnqp2z27lm6i8j8pbb2500gyyv8gb73kskv49ympvpa09mzcrv"; }) + (fetchNuGet { pname = "Realm.Fody"; version = "10.14.0"; sha256 = "0k182hsz4b4z61p4hh4ac7l9rg11xhk1r5p0ylhv6qggyq1p2zjj"; }) (fetchNuGet { pname = "Remotion.Linq"; version = "2.2.0"; sha256 = "1y46ni0xswmmiryp8sydjgryafwn458dr91f9xn653w73kdyk4xf"; }) (fetchNuGet { pname = "runtime.any.System.Collections"; version = "4.3.0"; sha256 = "0bv5qgm6vr47ynxqbnkc7i797fdi8gbjjxii173syrx14nmrkwg0"; }) (fetchNuGet { pname = "runtime.any.System.Diagnostics.Tools"; version = "4.3.0"; sha256 = "1wl76vk12zhdh66vmagni66h5xbhgqq7zkdpgw21jhxhvlbcl8pk"; }) @@ -195,8 +196,8 @@ (fetchNuGet { pname = "runtime.unix.System.Net.Sockets"; version = "4.3.0"; sha256 = "03npdxzy8gfv035bv1b9rz7c7hv0rxl5904wjz51if491mw0xy12"; }) (fetchNuGet { pname = "runtime.unix.System.Private.Uri"; version = "4.3.0"; sha256 = "1jx02q6kiwlvfksq1q9qr17fj78y5v6mwsszav4qcz9z25d5g6vk"; }) (fetchNuGet { pname = "runtime.unix.System.Runtime.Extensions"; version = "4.3.0"; sha256 = "0pnxxmm8whx38dp6yvwgmh22smknxmqs5n513fc7m4wxvs1bvi4p"; }) - (fetchNuGet { pname = "Sentry"; version = "3.14.1"; sha256 = "1cpmh00k5dii61i3x7f6zln7077k0cscdcxg5izw6zq250vxxhyh"; }) - (fetchNuGet { pname = "SharpCompress"; version = "0.30.1"; sha256 = "1hib2hxjrlikwsczym1qn2slaapgjw8qzd8gmid8bryaz8hv044h"; }) + (fetchNuGet { pname = "Sentry"; version = "3.17.1"; sha256 = "1k83a5kz6yyfd3iamxfa7wrgayxvs72slywq15aaw5ywl1a5c6i0"; }) + (fetchNuGet { pname = "SharpCompress"; version = "0.31.0"; sha256 = "01az7amjkxjbya5rdcqwxzrh2d3kybf1gsd3617rsxvvxadyra1r"; }) (fetchNuGet { pname = "SharpFNT"; version = "2.0.0"; sha256 = "1bgacgh9hbck0qvji6frbb50sdiqfdng2fvvfgfw8b9qaql91mx0"; }) (fetchNuGet { pname = "SixLabors.ImageSharp"; version = "2.1.0"; sha256 = "0lmj3qs39v5jcf2rjwav43nqnc7g6sd4l226l2jw85nidzmpvkwr"; }) (fetchNuGet { pname = "SQLitePCLRaw.bundle_e_sqlite3"; version = "2.0.4"; sha256 = "1l3vbkwismsx5jcy3d5bj4bzh8bni8bk2gq4lqplz82pz5phjpxm"; }) @@ -237,7 +238,7 @@ (fetchNuGet { pname = "System.IO.FileSystem"; version = "4.3.0"; sha256 = "0z2dfrbra9i6y16mm9v1v6k47f0fm617vlb7s5iybjjsz6g1ilmw"; }) (fetchNuGet { pname = "System.IO.FileSystem.Primitives"; version = "4.3.0"; sha256 = "0j6ndgglcf4brg2lz4wzsh1av1gh8xrzdsn9f0yznskhqn1xzj9c"; }) (fetchNuGet { pname = "System.IO.Packaging"; version = "6.0.0"; sha256 = "112nq0k2jc4vh71rifqqmpjxkaanxfapk7g8947jkfgq3lmfmaac"; }) - (fetchNuGet { pname = "System.IO.Pipelines"; version = "6.0.2"; sha256 = "0faql0cpxgpm5rwygg5j08q13602i6brvsx9f9m4sv2ysadmk0gf"; }) + (fetchNuGet { pname = "System.IO.Pipelines"; version = "6.0.3"; sha256 = "1jgdazpmwc21dd9naq3l9n5s8a1jnbwlvgkf1pnm0aji6jd4xqdz"; }) (fetchNuGet { pname = "System.Linq"; version = "4.1.0"; sha256 = "1ppg83svb39hj4hpp5k7kcryzrf3sfnm08vxd5sm2drrijsla2k5"; }) (fetchNuGet { pname = "System.Linq"; version = "4.3.0"; sha256 = "1w0gmba695rbr80l1k2h4mrwzbzsyfl2z4klmpbsvsg5pm4a56s7"; }) (fetchNuGet { pname = "System.Linq.Expressions"; version = "4.1.0"; sha256 = "1gpdxl6ip06cnab7n3zlcg6mqp7kknf73s8wjinzi4p0apw82fpg"; }) @@ -314,7 +315,7 @@ (fetchNuGet { pname = "System.Text.Encodings.Web"; version = "6.0.0"; sha256 = "06n9ql3fmhpjl32g3492sj181zjml5dlcc5l76xq2h38c4f87sai"; }) (fetchNuGet { pname = "System.Text.Json"; version = "5.0.0"; sha256 = "1gpgl18z6qrgmqrikgh99xkjwzb1didrjp77bch7nrlra21gr4ks"; }) (fetchNuGet { pname = "System.Text.Json"; version = "5.0.2"; sha256 = "0vd0wd29cdhgcjngl9sw391sn2s8xm974y15zvym0whsdgjwiqfx"; }) - (fetchNuGet { pname = "System.Text.Json"; version = "6.0.2"; sha256 = "1lz6gx1r4if8sbx6yp9h0mi0g9ffr40x0cg518l0z2aiqgil3fk0"; }) + (fetchNuGet { pname = "System.Text.Json"; version = "6.0.4"; sha256 = "19ygfw7b6rasjk0v6bdra85a5rh1qq4q2wgrclzvcrps66lcv5w1"; }) (fetchNuGet { pname = "System.Text.RegularExpressions"; version = "4.3.0"; sha256 = "1bgq51k7fwld0njylfn7qc5fmwrk2137gdq7djqdsw347paa9c2l"; }) (fetchNuGet { pname = "System.Threading"; version = "4.0.11"; sha256 = "19x946h926bzvbsgj28csn46gak2crv2skpwsx80hbgazmkgb1ls"; }) (fetchNuGet { pname = "System.Threading"; version = "4.3.0"; sha256 = "0rw9wfamvhayp5zh3j7p1yfmx9b5khbf4q50d8k5rk993rskfd34"; }) diff --git a/third_party/nixpkgs/pkgs/games/polymc/default.nix b/third_party/nixpkgs/pkgs/games/polymc/default.nix index 2fa5ce7cf0..c285423900 100644 --- a/third_party/nixpkgs/pkgs/games/polymc/default.nix +++ b/third_party/nixpkgs/pkgs/games/polymc/default.nix @@ -48,6 +48,7 @@ stdenv.mkDerivation rec { libGL glfw openal + stdenv.cc.cc.lib ]; in '' # xorg.xrandr needed for LWJGL [2.9.2, 3) https://github.com/LWJGL/lwjgl/issues/128 diff --git a/third_party/nixpkgs/pkgs/games/sgt-puzzles/default.nix b/third_party/nixpkgs/pkgs/games/sgt-puzzles/default.nix index 1c0b7aeda4..7419b6810c 100644 --- a/third_party/nixpkgs/pkgs/games/sgt-puzzles/default.nix +++ b/third_party/nixpkgs/pkgs/games/sgt-puzzles/default.nix @@ -1,39 +1,38 @@ { lib, stdenv, fetchurl, desktop-file-utils -, gtk3, libX11 -, makeWrapper, pkg-config, perl, autoreconfHook, wrapGAppsHook +, gtk3, libX11, cmake, imagemagick +, pkg-config, perl, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "sgt-puzzles"; - version = "20200610.9aa7b7c"; + version = "20220613.387d323"; src = fetchurl { url = "http://www.chiark.greenend.org.uk/~sgtatham/puzzles/puzzles-${version}.tar.gz"; - sha256 = "0rrd1c77ar91zqy4rr4xp1z7x3ywnshlac99cga4hnrgwb7vwl3f"; + hash = "sha256-Vcm7gxC9R7vvLkgkHblvEOONGLkYSHGMRfSBktgN/oQ="; }; sgt-puzzles-menu = fetchurl { - url = "https://raw.githubusercontent.com/Oleh-Kravchenko/portage/master/games-puzzle/sgt-puzzles/files/sgt-puzzles.menu"; + url = "https://raw.githubusercontent.com/gentoo/gentoo/720e614d0107e86fc1e520bac17726578186843d/games-puzzle/sgt-puzzles/files/sgt-puzzles.menu"; sha256 = "088w0x9g3j8pn725ix8ny8knhdsfgjr3hpswsh9fvfkz5vlg2xkm"; }; - nativeBuildInputs = [ autoreconfHook desktop-file-utils makeWrapper - pkg-config perl wrapGAppsHook ]; + nativeBuildInputs = [ + cmake + desktop-file-utils + imagemagick + perl + pkg-config + wrapGAppsHook + ]; buildInputs = [ gtk3 libX11 ]; - makeFlags = [ "prefix=$(out)" "gamesdir=$(out)/bin"]; - - preInstall = '' - mkdir -p "$out"/{bin,share/doc/sgtpuzzles} - cp gamedesc.txt LICENCE README "$out/share/doc/sgtpuzzles" - ''; - postInstall = '' for i in $(basename -s $out/bin/*); do ln -s $out/bin/$i $out/bin/sgt-puzzle-$i - install -Dm644 icons/$i-48d24.png -t $out/share/icons/hicolor/48x48/apps/ + install -Dm644 icons/$i-96d24.png -t $out/share/icons/hicolor/96x96/apps/ # Generate/validate/install .desktop files. echo "[Desktop Entry]" > $i.desktop @@ -43,7 +42,7 @@ stdenv.mkDerivation rec { --set-key Name --set-value $i \ --set-key Comment --set-value "${meta.description}" \ --set-key Categories --set-value "Game;LogicGame;X-sgt-puzzles;" \ - --set-key Icon --set-value $out/share/icons/hicolor/48x48/apps/$i-48d24 \ + --set-key Icon --set-value $out/share/icons/hicolor/96x96/apps/$i-96d24.png \ $i.desktop done @@ -57,16 +56,10 @@ stdenv.mkDerivation rec { install -Dm644 ${sgt-puzzles-menu} -t $out/etc/xdg/menus/applications-merged/ ''; - preConfigure = '' - perl mkfiles.pl - export NIX_LDFLAGS="$NIX_LDFLAGS -lX11" - export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -Wno-error" - cp Makefile.gtk Makefile - ''; meta = with lib; { description = "Simon Tatham's portable puzzle collection"; license = licenses.mit; - maintainers = [ maintainers.raskin ]; + maintainers = with maintainers; [ raskin tomfitzhenry ]; platforms = platforms.linux; homepage = "https://www.chiark.greenend.org.uk/~sgtatham/puzzles/"; }; diff --git a/third_party/nixpkgs/pkgs/games/simutrans/default.nix b/third_party/nixpkgs/pkgs/games/simutrans/default.nix index 1e5e25dbd3..1f051242ad 100644 --- a/third_party/nixpkgs/pkgs/games/simutrans/default.nix +++ b/third_party/nixpkgs/pkgs/games/simutrans/default.nix @@ -163,7 +163,7 @@ let homepage = "http://www.simutrans.com/"; license = with licenses; [ artistic1 gpl1Plus ]; - maintainers = with maintainers; [ vcunat phile314 ]; + maintainers = with maintainers; [ phile314 ]; platforms = with platforms; linux; # TODO: ++ darwin; }; }; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/adcli/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/adcli/default.nix new file mode 100644 index 0000000000..977c1d09db --- /dev/null +++ b/third_party/nixpkgs/pkgs/os-specific/linux/adcli/default.nix @@ -0,0 +1,68 @@ +{ lib +, stdenv +, fetchFromGitLab +, fetchpatch +, openldap +, libkrb5 +, libxslt +, autoreconfHook +, pkg-config +, cyrus_sasl +, util-linux +, xmlto +, docbook_xsl +, docbook_xml_dtd_43 +}: + +stdenv.mkDerivation rec { + pname = "adcli"; + version = "0.9.1"; + + src = fetchFromGitLab { + domain = "gitlab.freedesktop.org"; + owner = "realmd"; + repo = pname; + rev = version; + sha256 = "sha256-Zzt4qgLiJNuSrbtDWuxJEfGL7sWSbqN301q3qXZpn9c="; + }; + + # https://bugs.gentoo.org/820224 + # Without this it produces some weird missing symbol error in glibc + patches = [ + (fetchpatch { + url = "https://gitweb.gentoo.org/repo/gentoo.git/plain/app-crypt/adcli/files/adcli-0.9.1-glibc-2.34-resolv.patch?id=01db544de893262e857685e11b33c2a74210181f"; + sha256 = "sha256-dZ6dkzxd+0XjY/X9/2IWMan3syvCDGFHiMbxFxMHGFA="; + }) + ]; + + postPatch = '' + substituteInPlace tools/Makefile.am \ + --replace 'sbin_PROGRAMS' 'bin_PROGRAMS' + + substituteInPlace doc/Makefile.am \ + --replace 'http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl' \ + '${docbook_xsl}/xml/xsl/docbook/manpages/docbook.xsl' + + function patch_docbook(){ + substituteInPlace $1 \ + --replace "http://www.oasis-open.org/docbook/xml/4.3/docbookx.dtd" \ + "${docbook_xml_dtd_43}/xml/dtd/docbook/docbookx.dtd" + } + patch_docbook doc/adcli.xml + patch_docbook doc/adcli-devel.xml + patch_docbook doc/adcli-docs.xml + ''; + nativeBuildInputs = [ autoreconfHook pkg-config docbook_xsl ]; + + buildInputs = [ openldap libkrb5 libxslt cyrus_sasl util-linux xmlto docbook_xsl ]; + + configureFlags = [ "--disable-debug" ]; + + meta = with lib; { + homepage = "https://www.freedesktop.org/software/realmd/adcli/adcli.html"; + description = "A helper library and tools for Active Directory client operations."; + license = licenses.lgpl21Only; + maintainers = with maintainers; [ SohamG ]; + platforms = platforms.linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/bpftools/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/bpftools/default.nix index f2ca8d8747..b4621feeb3 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/bpftools/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/bpftools/default.nix @@ -1,5 +1,5 @@ { lib, stdenv -, libopcodes, libbfd, libelf, readline +, libopcodes, libbfd, elfutils, readline , linuxPackages_latest, zlib , python3, bison, flex }: @@ -9,7 +9,7 @@ stdenv.mkDerivation { inherit (linuxPackages_latest.kernel) version src; nativeBuildInputs = [ python3 bison flex ]; - buildInputs = [ libopcodes libbfd libelf zlib readline ]; + buildInputs = [ libopcodes libbfd elfutils zlib readline ]; preConfigure = '' patchShebangs scripts/bpf_doc.py diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/bpftrace/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/bpftrace/default.nix index cf7517718f..6cc9e40bdb 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/bpftrace/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/bpftrace/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchFromGitHub , cmake, pkg-config, flex, bison , llvmPackages, elfutils -, libelf, libbfd, libbpf, libopcodes, bcc +, libbfd, libbpf, libopcodes, bcc , cereal, asciidoctor , nixosTests , util-linux @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { buildInputs = with llvmPackages; [ llvm libclang - elfutils libelf bcc + elfutils bcc libbpf libbfd libopcodes cereal asciidoctor ]; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/displaylink/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/displaylink/default.nix index 1823613a58..785e59840d 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/displaylink/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/displaylink/default.nix @@ -70,7 +70,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "DisplayLink DL-5xxx, DL-41xx and DL-3x00 Driver for Linux"; - maintainers = with maintainers; [ nshalman abbradar peterhoeg eyjhb ]; + maintainers = with maintainers; [ abbradar peterhoeg eyjhb ]; platforms = [ "x86_64-linux" "i686-linux" ]; license = licenses.unfree; homepage = "https://www.displaylink.com/"; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/firmware/linux-firmware/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/firmware/linux-firmware/default.nix index 1ad89613a2..78f1001a35 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/firmware/linux-firmware/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/firmware/linux-firmware/default.nix @@ -2,11 +2,11 @@ stdenvNoCC.mkDerivation rec { pname = "linux-firmware"; - version = "20220610"; + version = "20220708"; src = fetchzip { url = "https://git.kernel.org/pub/scm/linux/kernel/git/firmware/linux-firmware.git/snapshot/linux-firmware-${version}.tar.gz"; - sha256 = "sha256-vsMkuTafr//ryivdBphTGZPoTsmTuvp+BFp3lKo3YYI="; + sha256 = "sha256-jsmbBxQ4RHBySBq2lks5tJ6YTwwlkvVe2Xc0CDJY8IE="; }; installFlags = [ "DESTDIR=$(out)" ]; @@ -16,7 +16,7 @@ stdenvNoCC.mkDerivation rec { outputHashMode = "recursive"; outputHashAlgo = "sha256"; - outputHash = "sha256-qJoaJacxb60ugdk5s1oZ9CLGjWKDnT5jWZEwHPnK50Y="; + outputHash = "sha256-FNYZMJnqR2waODUXisch3ObdEjwQN94QSiBE2dDW4sk="; meta = with lib; { description = "Binary firmware collection packaged by kernel.org"; 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 index 0375eb0eea..72e3817f2a 100644 --- 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 @@ -4,8 +4,8 @@ stdenv.mkDerivation rec { pname = "xow_dongle-firmware"; version = "2017-07"; - dontUnpack = true; - dontInstall = true; + dontConfigure = true; + dontBuild = true; src = fetchurl { url = "http://download.windowsupdate.com/c/msdownload/update/driver/drvs/2017/07/1cd6a87c-623f-4407-a52d-c31be49e925c_e19f60808bdcbfbd3c3df6be3e71ffc52e43261e.cab"; @@ -14,10 +14,14 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ cabextract ]; - buildPhase = '' + sourceRoot = "./."; + + unpackCmd = '' cabextract -F FW_ACC_00U.bin ${src} - mkdir -p $out/lib/firmware - cp -a FW_ACC_00U.bin $out/lib/firmware/xow_dongle.bin + ''; + + installPhase = '' + install -Dm644 FW_ACC_00U.bin ${placeholder "out"}/lib/firmware/xow_dongle.bin ''; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/hdparm/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/hdparm/default.nix index 2b112a9590..1dd0fa6a20 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/hdparm/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/hdparm/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "hdparm"; - version = "9.63"; + version = "9.64"; src = fetchurl { url = "mirror://sourceforge/hdparm/hdparm-${version}.tar.gz"; - sha256 = "sha256-cHhd6uu6WHeonBI1aLQd7pkNpV/FFCDxP2CaEHKJlpE="; + sha256 = "sha256-MVuVaVHD/qAnKH3iBDgVNCF8C9Dze0k1h3/i2wyrhZo="; }; preBuild = '' diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/common-config.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/common-config.nix index 1962b5ba5a..708d63ed4c 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/common-config.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/common-config.nix @@ -45,6 +45,10 @@ let # aarch64 defconfig since 5.13 DEBUG_INFO_REDUCED = whenAtLeast "5.13" (option no); DEBUG_INFO_BTF = whenAtLeast "5.2" (option yes); + # Allow loading modules with mismatched BTFs + # FIXME: figure out how to actually make BTFs reproducible instead + # See https://github.com/NixOS/nixpkgs/pull/181456 for details. + MODULE_ALLOW_BTF_MISMATCH = whenAtLeast "5.18" (option yes); BPF_LSM = whenAtLeast "5.7" (option yes); DEBUG_KERNEL = yes; DEBUG_DEVRES = no; 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 c183b871ef..0e00eac0ba 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,61 +2,61 @@ "4.14": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-4.14.286-hardened1.patch", - "sha256": "00vcsd4w2agvsd057k8m95cg9li81awi17hjb50207nx3g8hdrka", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.286-hardened1/linux-hardened-4.14.286-hardened1.patch" + "name": "linux-hardened-4.14.288-hardened1.patch", + "sha256": "0d592ppnd1bw375zyrfj92kg0k60knbq6g1lpawx7xhflklrlcfw", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.288-hardened1/linux-hardened-4.14.288-hardened1.patch" }, - "sha256": "1x26fys9c2zai69wvvwpcxhdbbl02vijn4h7g6k6nq4y36fvkfyx", - "version": "4.14.286" + "sha256": "0yyzxyz66mfngx3ll3pl43413xb67iyxddzh3lpzqcfg7d0rxfwz", + "version": "4.14.288" }, "4.19": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-4.19.250-hardened1.patch", - "sha256": "121pivhdlvkx8vblxdi6w39xwa16liq700hblsw8r0kba6jhzkhm", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.250-hardened1/linux-hardened-4.19.250-hardened1.patch" + "name": "linux-hardened-4.19.252-hardened1.patch", + "sha256": "04jrv10z1kjqlnb58wmc3765xdpp8lm59vyhi94kbra3krzq7yax", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.252-hardened1/linux-hardened-4.19.252-hardened1.patch" }, - "sha256": "0p3mnl49708inhnrh461s6cnyn20qsqb9dw541h7crgsyd30mqvf", - "version": "4.19.250" + "sha256": "0ac7k6x9h8gqi37n8d4fyi52h4cmzyy8f5vfv1aiihww4kvzca7v", + "version": "4.19.252" }, "5.10": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-5.10.128-hardened1.patch", - "sha256": "14pjxnk1p9fqmbxq4p45gc6p1cz86qg3x4ac5qa17rhdnaxm7pk7", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.128-hardened1/linux-hardened-5.10.128-hardened1.patch" + "name": "linux-hardened-5.10.130-hardened1.patch", + "sha256": "13wf4khc1nqljrvmc283145j6wxcd22qvqg8gwrjndqxlb5qb5bl", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.130-hardened1/linux-hardened-5.10.130-hardened1.patch" }, - "sha256": "0jyk3is94c3xin48saqywfr66iwqvzqq1rs5px4zkpfp139fjngc", - "version": "5.10.128" + "sha256": "0b4nm96yvkb9r5rkwlq9vsmllzqvvffdnpyl8dvrgqm8a7caci71", + "version": "5.10.130" }, "5.15": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-5.15.52-hardened1.patch", - "sha256": "03shqi5lcsvrgklm2qgggwkxww0fs8bs25xc0l6mmiqa3sabws63", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.15.52-hardened1/linux-hardened-5.15.52-hardened1.patch" + "name": "linux-hardened-5.15.54-hardened1.patch", + "sha256": "1zk6lgm9hg4m7pp16l8dhdv4pf0c1x94sfaah1ppjlq8i64704hd", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.15.54-hardened1/linux-hardened-5.15.54-hardened1.patch" }, - "sha256": "01bdmgbl31nm0wg5mrzn6xgls4h5gig96mjrmn790npjm5fhls7l", - "version": "5.15.52" + "sha256": "0kffavh9mbycqljacmvjd04nfrl4r4v8i0zgvq49qgm7n25m8ksr", + "version": "5.15.54" }, "5.18": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-5.18.8-hardened1.patch", - "sha256": "1i0y11flb4alxaqf2inms8x2yzar20zg6vc9s9gs507z97yh24v2", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.18.8-hardened1/linux-hardened-5.18.8-hardened1.patch" + "name": "linux-hardened-5.18.11-hardened1.patch", + "sha256": "19g8w933srq3p3zsi38j26cda5a43lzkhhla4pcbd54kmvwjyyjl", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.18.11-hardened1/linux-hardened-5.18.11-hardened1.patch" }, - "sha256": "0dhaj1zcsr5sfg62byzvvkhm9j419px6v9v04ngcy0d0vc2yn8q8", - "version": "5.18.8" + "sha256": "1bqm32nqas1dvcx5b0qh3cshh3gcmpl8wbkn4adhgxw2lxa8w3g2", + "version": "5.18.11" }, "5.4": { "patch": { "extra": "-hardened1", - "name": "linux-hardened-5.4.203-hardened1.patch", - "sha256": "1wjh14vh929vjgw4kkcyvyc1w0c7v0mlv2ywycj6zv1klwxzfnbh", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.203-hardened1/linux-hardened-5.4.203-hardened1.patch" + "name": "linux-hardened-5.4.205-hardened1.patch", + "sha256": "074jyvxmk8fhskndxhc80ibprnh1h2f5z16i7b2pp3723dlm5p5l", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.205-hardened1/linux-hardened-5.4.205-hardened1.patch" }, - "sha256": "12kr55nf6pmb0d52x5r3ilfssyqng9s8cpnbm9aglv062ddkz4zw", - "version": "5.4.203" + "sha256": "1m8ms5nizw3iimhw61kr11a09b6h8cfi8az3wwg4mcpb0k58lqrp", + "version": "5.4.205" } } 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 f730fd372b..8220a15234 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.287"; + version = "4.14.288"; # 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 = "05pnz2wch5b430j82sjqhxyfbpln4p1569avj2qkk62x4164kdbq"; + sha256 = "0yyzxyz66mfngx3ll3pl43413xb67iyxddzh3lpzqcfg7d0rxfwz"; }; } // (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 a158767af4..c3906f10eb 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.251"; + version = "4.19.252"; # 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 = "1x6ag81wzcynfa4l819mamk9k11fxgq5m1gain93avparjnwi1rp"; + sha256 = "0ac7k6x9h8gqi37n8d4fyi52h4cmzyy8f5vfv1aiihww4kvzca7v"; }; } // (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 2bc24b6d1b..ea49282823 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.322"; + version = "4.9.323"; extraMeta.branch = "4.9"; extraMeta.broken = stdenv.isAarch64; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "02g4lkiq6y5i6vrrk2i9h6dxka6mfjpk9dz3517adw5qf79ph6b2"; + sha256 = "1h96ai9w5q2axhliw85aymdsg8py9y6gl8big5r2gwkbls6h7pa3"; }; } // (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 60604adac7..495a6ff8b5 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.129"; + version = "5.10.131"; # 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 = "1zlw89m7wpy02rnk8mizng43i77hrkwzl280sivqz1c05c2jzrxa"; + sha256 = "1ki11mvl3dky7iih90znr47vr66dxnlwrqwg2jkk1hqn5i243i4b"; }; } // (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 df40fd3bd4..9735868b14 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.15.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.15.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.15.53"; + version = "5.15.55"; # 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 = "01vvyw6sjkkjs7l4cy04yv19d9f3wmpy5gqfm763y7q58dr73apk"; + sha256 = "1k7x7fp675wglfd357n7hjidnm3j8zj3gcymyazg6fkcid8bvxhy"; }; } // (args.argsOverride or { })) diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.18.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.18.nix index f1f0a8c841..2ad48c7afc 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.18.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.18.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.18.10"; + version = "5.18.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 = "1qyyfdfp8qn8a6brgly0h72jvz9s0wp2pjyrcpknzvmqvc0kv7pr"; + sha256 = "09wmgfrnv1df6jg9v3svwhvnxl0j6h4f240p903xlmgj884lvds0"; }; } // (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 045daa8b3a..5fd398d111 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.204"; + version = "5.4.206"; # 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 = "0ivsfdw55mysihylk5n46r7limf1rqddipap17mkfnyq345b3hgx"; + sha256 = "1asvc7y1f938icspxx39n6y6r0w9mp0k9vik84rsx1hzzv0db41c"; }; } // (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 8b4382f80a..a1eb20eaae 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 = "18798"; - sha256 = "04mxzf8k3g65yw73da9fgk27hraf69239m5757fsr5a6pj88z6lb"; + rev = "18825"; + sha256 = "0gqmdlcxq3ws3mafbf47j40vrrfr5966nily6l7gj8hq2j0016cj"; } , ... }: 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 cd182803ec..58be2be6e9 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.120-rt70"; # updated by ./update-rt.sh + version = "5.10.131-rt72"; # 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 = "12qfgmzif2dy3kj4rqrnlx1if87c4fjmnya1bqpwx3hm0ih7ayjv"; + sha256 = "1ki11mvl3dky7iih90znr47vr66dxnlwrqwg2jkk1hqn5i243i4b"; }; kernelPatches = let rt-patch = { name = "rt"; patch = fetchurl { url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz"; - sha256 = "0l0fp7bqfj11qcq3dqd5lv468z1hha0y774dfiliv97lx7gq34m9"; + sha256 = "0ag000h9m7phvgrqa4jcmd94x0rk8z8bh7qhqqlywbiz2b1b91qa"; }; }; in [ rt-patch ] ++ kernelPatches; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/xanmod-kernels.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/xanmod-kernels.nix index 761426da86..33ddc3f6b6 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/xanmod-kernels.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/xanmod-kernels.nix @@ -2,15 +2,15 @@ let stableVariant = { - version = "5.15.43"; + version = "5.15.53"; suffix = "xanmod1"; - hash = "sha256-MeH9RUPDiuN22eAZ18v+N3aIT18dQ3FnTkcQV0MjB4k="; + hash = "sha256-mLgzaXG6QaJ0hfzfNlLbAEldxHK6iHuMVUv6p8zqRBo="; }; edgeVariant = { - version = "5.18.1"; + version = "5.18.10"; suffix = "xanmod1"; - hash = "sha256-dqvB4F2S7cklSJ7XTUNvWVKTsZGLevOXME5lvhmfyis="; + hash = "sha256-RtvrJujd854bKf1YPiPavTh9oplpFN9ykr624K17vKE="; }; xanmodKernelFor = { version, suffix, hash }: buildLinux (args // rec { @@ -39,9 +39,6 @@ let # AMD P-state driver X86_AMD_PSTATE = yes; - # Linux RNG framework - LRNG = whenOlder "5.18" yes; - # Paragon's NTFS3 driver NTFS3_FS = module; NTFS3_LZX_XPRESS = yes; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/zen-kernels.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/zen-kernels.nix index 1e9ca540ea..aa9115d2b1 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/zen-kernels.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/zen-kernels.nix @@ -4,16 +4,16 @@ let # comments with variant added for update script # ./update-zen.py zen zenVariant = { - version = "5.18.11"; #zen + version = "5.18.12"; #zen suffix = "zen1"; #zen - sha256 = "11dp4wxn4ilndzpp16aazf7569w3r46qh31f5lhbryqwfpa8vzb1"; #zen + sha256 = "1h0qnwq967ncqv40msa94jlwqf9rw2kgrr4gwx6n8i6wn0dmxpbq"; #zen isLqx = false; }; # ./update-zen.py lqx lqxVariant = { - version = "5.18.11"; #lqx + version = "5.18.12"; #lqx suffix = "lqx1"; #lqx - sha256 = "0q0n88sszq6kpy3s0n0a8nd0rxa7xh4hklkbvv8z2r43l8d4zazr"; #lqx + sha256 = "0bxmscx7m9fp73brj6x3d2vk5fnys7a502vllsf8dg74k0g83781"; #lqx isLqx = true; }; zenKernelsFor = { version, suffix, sha256, isLqx }: buildLinux (args // { @@ -32,7 +32,7 @@ let extraMeta = { branch = lib.versions.majorMinor version + "/master"; - maintainers = with lib.maintainers; [ atemu andresilva pedrohlc psydvl ]; + maintainers = with lib.maintainers; [ andresilva pedrohlc psydvl ]; description = "Built using the best configuration and kernel sources for desktop, multimedia, and gaming workloads." + lib.optionalString isLqx " (Same as linux_zen but less aggressive release schedule)"; }; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/logitech-udev-rules/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/logitech-udev-rules/default.nix deleted file mode 100644 index 0b0e9e8f20..0000000000 --- a/third_party/nixpkgs/pkgs/os-specific/linux/logitech-udev-rules/default.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ lib, stdenv, solaar }: - -# ltunifi and solaar both provide udev rules but solaar's rules are more -# up-to-date so we simply use that instead of having to maintain our own rules - -stdenv.mkDerivation { - pname = "logitech-udev-rules"; - inherit (solaar) version; - - buildCommand = '' - install -Dm444 -t $out/etc/udev/rules.d ${solaar.src}/rules.d/*.rules - ''; - - meta = with lib; { - description = "udev rules for Logitech devices"; - inherit (solaar.meta) homepage license platforms; - maintainers = with maintainers; [ peterhoeg ]; - }; -} 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 9d6916be58..a774619457 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 @@ -120,8 +120,9 @@ installPhase() { fi # Install libraries needed by Proton to support DLSS - install -Dm644 -t $i/lib/nvidia/wine/ nvngx.dll _nvngx.dll - + if [ -e nvngx.dll ] && [ -e _nvngx.dll ]; then + install -Dm644 -t $i/lib/nvidia/wine/ nvngx.dll _nvngx.dll + fi done if [ -n "$bin" ]; then diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/pam_mount/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/pam_mount/default.nix index 12209d1b88..c49351f324 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/pam_mount/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/pam_mount/default.nix @@ -1,12 +1,12 @@ -{ lib, stdenv, fetchurl, autoreconfHook, pkg-config, libtool, pam, libHX, libxml2, pcre, perl, openssl, cryptsetup, util-linux }: +{ lib, stdenv, fetchurl, autoreconfHook, pkg-config, libtool, pam, libHX, libxml2, pcre2, perl, openssl, cryptsetup, util-linux }: stdenv.mkDerivation rec { pname = "pam_mount"; - version = "2.17"; + version = "2.19"; src = fetchurl { url = "mirror://sourceforge/pam-mount/pam_mount/${pname}-${version}.tar.xz"; - sha256 = "1q2n6a2ah6nghdn8i6ad2wj247njwb5nx48cggxknaa6lqxylidy"; + sha256 = "02m6w04xhgv2yx69yxph8giw0sp39s9lvvlffslyna46fnr64qvb"; }; patches = [ @@ -20,7 +20,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook libtool pkg-config ]; - buildInputs = [ pam libHX util-linux libxml2 pcre perl openssl cryptsetup ]; + buildInputs = [ pam libHX util-linux libxml2 pcre2 perl openssl cryptsetup ]; enableParallelBuilding = true; @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { description = "PAM module to mount volumes for a user session"; homepage = "https://pam-mount.sourceforge.net/"; license = with licenses; [ gpl2 gpl3 lgpl21 lgpl3 ]; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ netali ]; platforms = platforms.linux; }; } diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/prl-tools/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/prl-tools/default.nix index e6c246de0d..ce0c05346e 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/prl-tools/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/prl-tools/default.nix @@ -1,50 +1,59 @@ { stdenv, lib, makeWrapper, p7zip -, gawk, util-linux, xorg, glib, dbus-glib, zlib +, gawk, util-linux, xorg, glib, dbus-glib, zlib, bbe, bash, timetrap, netcat, cups , kernel ? null, libsOnly ? false -, undmg, fetchurl +, fetchurl, undmg, perl, autoPatchelfHook }: assert (!libsOnly) -> kernel != null; +assert lib.elem stdenv.hostPlatform.system [ "x86_64-linux" "i686-linux" "aarch64-linux" ]; -let xorgFullVer = lib.getVersion xorg.xorgserver; - xorgVer = lib.versions.majorMinor xorgFullVer; - x64 = if stdenv.hostPlatform.system == "x86_64-linux" then true - else if stdenv.hostPlatform.system == "i686-linux" then false - else throw "Parallels Tools for Linux only support {x86-64,i686}-linux targets"; -in stdenv.mkDerivation rec { - version = "${prl_major}.2.1-41615"; - prl_major = "12"; + version = "17.1.4-51567"; pname = "prl-tools"; # We download the full distribution to extract prl-tools-lin.iso from # => ${dmg}/Parallels\ Desktop.app/Contents/Resources/Tools/prl-tools-lin.iso src = fetchurl { - url = "https://download.parallels.com/desktop/v${prl_major}/${version}/ParallelsDesktop-${version}.dmg"; - sha256 = "1jwzwif69qlhmfky9kigjaxpxfj0lyrl1iyrpqy4iwqvajdgbbym"; + url = "https://download.parallels.com/desktop/v${lib.versions.major version}/${version}/ParallelsDesktop-${version}.dmg"; + sha256 = "sha256-gjLxQOTFuVghv1Bj+zfbNW97q1IN2rurSnPQi13gzRA="; }; hardeningDisable = [ "pic" "format" ]; - # also maybe python2 to generate xorg.conf - nativeBuildInputs = [ p7zip undmg ] ++ lib.optionals (!libsOnly) [ makeWrapper ] ++ kernel.moduleBuildDependencies; + nativeBuildInputs = [ p7zip undmg perl bbe autoPatchelfHook ] + ++ lib.optionals (!libsOnly) [ makeWrapper ] ++ kernel.moduleBuildDependencies; + + buildInputs = with xorg; [ libXrandr libXext libX11 libXcomposite libXinerama ] + ++ lib.optionals (!libsOnly) [ libXi glib dbus-glib zlib ]; + + runtimeDependencies = [ glib xorg.libXrandr ]; inherit libsOnly; unpackPhase = '' undmg "${src}" - export sourceRoot=prl-tools-build - 7z x "Parallels Desktop.app/Contents/Resources/Tools/prl-tools-lin.iso" -o$sourceRoot + 7z x "Parallels Desktop.app/Contents/Resources/Tools/prl-tools-lin${lib.optionalString stdenv.isAarch64 "-arm"}.iso" -o$sourceRoot if test -z "$libsOnly"; then ( cd $sourceRoot/kmods; tar -xaf prl_mod.tar.gz ) fi - ( cd $sourceRoot/tools; tar -xaf prltools${if x64 then ".x64" else ""}.tar.gz ) ''; - kernelVersion = if libsOnly then "" else lib.getName kernel.name; - kernelDir = if libsOnly then "" else "${kernel.dev}/lib/modules/${kernelVersion}"; - scriptPath = lib.concatStringsSep ":" (lib.optionals (!libsOnly) [ "${util-linux}/bin" "${gawk}/bin" ]); + patches = lib.optionals (lib.versionAtLeast kernel.version "5.18") [ ./prl-tools.patch ]; + + kernelVersion = lib.optionalString (!libsOnly) kernel.modDirVersion; + kernelDir = lib.optionalString (!libsOnly) "${kernel.dev}/lib/modules/${kernelVersion}"; + + libPath = lib.concatStringsSep ":" [ "${glib.out}/lib" "${xorg.libXrandr}/lib" ]; + + scriptPath = lib.concatStringsSep ":" (lib.optionals (!libsOnly) [ + "${util-linux}/bin" + "${gawk}/bin" + "${bash}/bin" + "${timetrap}/bin" + "${netcat}/bin" + "${cups}/sbin" + ]); buildPhase = '' if test -z "$libsOnly"; then @@ -57,112 +66,80 @@ stdenv.mkDerivation rec { SRC=$kernelDir/build \ KVER=$kernelVersion ) - - # Xorg config (maybe would be useful for other versions) - #python2 installer/xserver-config.py xorg ${xorgVer} /dev/null parallels.conf fi ''; - libPath = with xorg; - lib.makeLibraryPath ([ stdenv.cc.cc libXrandr libXext libX11 libXcomposite libXinerama ] - ++ lib.optionals (!libsOnly) [ libXi glib dbus-glib zlib ]); - - installPhase = '' if test -z "$libsOnly"; then ( # kernel modules cd kmods mkdir -p $out/lib/modules/${kernelVersion}/extra - cp prl_eth/pvmnet/prl_eth.ko $out/lib/modules/${kernelVersion}/extra - cp prl_tg/Toolgate/Guest/Linux/prl_tg/prl_tg.ko $out/lib/modules/${kernelVersion}/extra cp prl_fs/SharedFolders/Guest/Linux/prl_fs/prl_fs.ko $out/lib/modules/${kernelVersion}/extra cp prl_fs_freeze/Snapshot/Guest/Linux/prl_freeze/prl_fs_freeze.ko $out/lib/modules/${kernelVersion}/extra + cp prl_tg/Toolgate/Guest/Linux/prl_tg/prl_tg.ko $out/lib/modules/${kernelVersion}/extra + ${lib.optionalString stdenv.isAarch64 + "cp prl_notifier/Installation/lnx/prl_notifier/prl_notifier.ko $out/lib/modules/${kernelVersion}/extra"} ) fi ( # tools - cd tools + cd tools/tools${if stdenv.isAarch64 then "-arm64" else if stdenv.isx86_64 then "64" else "32"} mkdir -p $out/lib if test -z "$libsOnly"; then + # prltoolsd contains hardcoded /bin/bash path + # we're lucky because it uses only -c command + # => replace to /bin/sh + bbe -e "s:/bin/bash:/bin/sh\x00\x00:" -o bin/prltoolsd.tmp bin/prltoolsd + rm -f bin/prltoolsd + mv bin/prltoolsd.tmp bin/prltoolsd + # install binaries for i in bin/* sbin/prl_nettool sbin/prl_snapshot; do + # also patch binaries to replace /usr/bin/XXX to XXX + # here a two possible cases: + # 1. it is uses as null terminated string and should be truncated by null; + # 2. it is uses inside shell script and should be truncated by space. + for p in bin/* sbin/prl_nettool sbin/prl_snapshot sbin/prlfsmountd; do + p=$(basename $p) + bbe -e "s:/usr/bin/$p\x00:./$p\x00\x00\x00\x00\x00\x00\x00\x00:" -o $i.tmp $i + bbe -e "s:/usr/sbin/$p\x00:./$p\x00\x00\x00\x00\x00\x00\x00\x00 :" -o $i $i.tmp + bbe -e "s:/usr/bin/$p:$p :" -o $i.tmp $i + bbe -e "s:/usr/sbin/$p:$p :" -o $i $i.tmp + done + install -Dm755 $i $out/$i done - # other binaries - for i in xorg.7.1/usr/bin/*; do - cp $i $out/bin + + install -Dm755 ../../tools/prlfsmountd.sh $out/sbin/prlfsmountd + for f in $out/bin/* $out/sbin/*; do + wrapProgram $f \ + --prefix LD_LIBRARY_PATH ':' "$libPath" \ + --prefix PATH ':' "$scriptPath" done - for i in $out/bin/* $out/sbin/*; do - patchelf \ - --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath "$out/lib:$libPath" \ - $i || true - done - - mkdir -p $out/bin - install -Dm755 ../installer/prlfsmountd.sh $out/sbin/prlfsmountd - wrapProgram $out/sbin/prlfsmountd \ - --prefix PATH ':' "$scriptPath" - - for i in lib/*.a; do + for i in lib/libPrl*.0.0; do cp $i $out/lib + ln -s $out/$i $out/''${i%.0.0} done - for i in xorg.7.1/usr/lib/libprl_wmouse_watcher.*; do - cp $i $out/lib - done + mkdir -p $out/share/man/man8 + install -Dm644 ../mount.prl_fs.8 $out/share/man/man8 - mkdir -p $out/lib/udev/rules.d - for i in *.rules; do - sed 's,/bin/bash,${stdenv.shell},g' $i > $out/lib/udev/rules.d/$i - done + substituteInPlace ../99prltoolsd-hibernate \ + --replace "/bin/bash" "${bash}/bin/bash" - ( - cd xorg.${xorgVer} - # Install the X modules. - ( - cd x-server/modules - for i in */*; do - install -Dm755 $i $out/lib/xorg/modules/$i - done - ) - ( - cd usr/lib - libGLXname=$(echo libglx.so*) - install -Dm755 $libGLXname $out/lib/xorg/modules/extensions/$libGLXname - ln -s $libGLXname $out/lib/xorg/modules/extensions/libglx.so - ln -s $libGLXname $out/lib/xorg/modules/extensions/libglx.so.1 - ) - ) + mkdir -p $out/etc/pm/sleep.d + install -Dm644 ../99prltoolsd-hibernate $out/etc/pm/sleep.d fi - - for i in xorg.7.1/usr/lib/libGL.*; do - cp $i $out/lib - done - - cd $out - find -name \*.so\* -type f -exec \ - patchelf --set-rpath "$out/lib:$libPath" {} \; - - cd lib - libGLname=$(echo libGL.so*) - ln -s $libGLname libGL.so - ln -s $libGLname libGL.so.1 ) ''; - dontStrip = true; - dontPatchELF = true; - meta = with lib; { description = "Parallels Tools for Linux guests"; homepage = "https://parallels.com"; - platforms = [ "i686-linux" "x86_64-linux" ]; + platforms = platforms.linux; license = licenses.unfree; - # I was making this package blindly and requesting testing from the real user, - # so I can't even test it by myself and won't provide future updates. - maintainers = with maintainers; [ abbradar ]; + maintainers = with maintainers; [ catap wegank ]; }; } diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/prl-tools/prl-tools.patch b/third_party/nixpkgs/pkgs/os-specific/linux/prl-tools/prl-tools.patch new file mode 100644 index 0000000000..561371e1e8 --- /dev/null +++ b/third_party/nixpkgs/pkgs/os-specific/linux/prl-tools/prl-tools.patch @@ -0,0 +1,143 @@ +diff -puNr prl-tools-build/kmods/prl_tg/Toolgate/Guest/Linux/prl_tg/prltg.c prl-tools-build/kmods/prl_tg/Toolgate/Guest/Linux/prl_tg/prltg.c +--- prl-tools-build/kmods/prl_tg/Toolgate/Guest/Linux/prl_tg/prltg.c ++++ prl-tools-build/kmods/prl_tg/Toolgate/Guest/Linux/prl_tg/prltg.c +@@ -382,7 +382,7 @@ static int prl_tg_initialize(struct tg_d + } + #endif + /* Set DMA ability. Only lower 4G is possible to address */ +- rc = pci_set_dma_mask(pdev, DMA_BIT_MASK(64)); ++ rc = dma_set_mask(&pdev->dev, DMA_BIT_MASK(64)); + if (rc) { + printk(KERN_ERR "no usable DMA configuration\n"); + goto err_out; +diff -puNr prl-tools-build/kmods/prl_tg/Toolgate/Guest/Linux/prl_tg/prltg_call.c prl-tools-build/kmods/prl_tg/Toolgate/Guest/Linux/prl_tg/prltg_call.c +--- prl-tools-build/kmods/prl_tg/Toolgate/Guest/Linux/prl_tg/prltg_call.c ++++ prl-tools-build/kmods/prl_tg/Toolgate/Guest/Linux/prl_tg/prltg_call.c +@@ -76,7 +76,7 @@ static int tg_req_map_internal(struct TG + uple->p[i] = vmalloc_to_page(mem); + page_cache_get(uple->p[i]); + +- dst->RequestPages[i] = pci_map_page(pdev, uple->p[i], 0, PAGE_SIZE, DMA_BIDIRECTIONAL) >> PAGE_SHIFT; ++ dst->RequestPages[i] = dma_map_page(&pdev->dev, uple->p[i], 0, PAGE_SIZE, DMA_BIDIRECTIONAL) >> PAGE_SHIFT; + if (!dst->RequestPages[i]) { + page_cache_release(uple->p[i]); + goto err; +@@ -88,7 +88,7 @@ static int tg_req_map_internal(struct TG + + err: + for (i = 0; i < uple->count; i++) { +- pci_unmap_page(pdev, dst->RequestPages[i] << PAGE_SHIFT, PAGE_SIZE, DMA_BIDIRECTIONAL); ++ dma_unmap_page(&pdev->dev, dst->RequestPages[i] << PAGE_SHIFT, PAGE_SIZE, DMA_BIDIRECTIONAL); + page_cache_release(uple->p[i]); + } + kfree(uple); +@@ -129,7 +129,7 @@ static TG_PAGED_BUFFER *tg_req_map_user_ + pfn = (u64 *)dbuf - 1; + + for (; npages > 0; npages--, mapped++) { +- dma_addr_t addr = pci_map_page(pdev, uple->p[npages-1], 0, PAGE_SIZE, DMA_BIDIRECTIONAL); ++ dma_addr_t addr = dma_map_page(&pdev->dev, uple->p[npages-1], 0, PAGE_SIZE, DMA_BIDIRECTIONAL); + + if (!addr) { + DPRINTK("[3] %d < %d \n", got, npages); +@@ -144,7 +144,7 @@ static TG_PAGED_BUFFER *tg_req_map_user_ + + err_unmap: + for (i = 0; i < mapped; i++, pfn++) +- pci_unmap_page(pdev, *pfn << PAGE_SHIFT, PAGE_SIZE, DMA_BIDIRECTIONAL); ++ dma_unmap_page(&pdev->dev, *pfn << PAGE_SHIFT, PAGE_SIZE, DMA_BIDIRECTIONAL); + + err_put: + for(i = 0; i < got; i++) +@@ -176,7 +176,7 @@ static TG_PAGED_BUFFER *tg_req_map_kerne + goto err; + } + +- addr = pci_map_page(pdev, page, 0, PAGE_SIZE, DMA_BIDIRECTIONAL); ++ addr = dma_map_page(&pdev->dev, page, 0, PAGE_SIZE, DMA_BIDIRECTIONAL); + if (!addr) { + DPRINTK("[2] va:%p can't map\n", buffer); + goto err; +@@ -189,7 +189,7 @@ static TG_PAGED_BUFFER *tg_req_map_kerne + + err: + for (; i > 0; i--, pfn--) +- pci_unmap_page(pdev, *pfn << PAGE_SHIFT, PAGE_SIZE, DMA_BIDIRECTIONAL); ++ dma_unmap_page(&pdev->dev, *pfn << PAGE_SHIFT, PAGE_SIZE, DMA_BIDIRECTIONAL); + + return ERR_PTR(-ENOMEM); + } +@@ -203,7 +203,7 @@ static inline int tg_req_unmap_internal( + dst->RequestSize + ~PAGE_MASK) >> PAGE_SHIFT; + + for (i = 0; i < count; i++) +- pci_unmap_page(req->dev->pci_dev, dst->RequestPages[i] << PAGE_SHIFT, PAGE_SIZE, DMA_BIDIRECTIONAL); ++ dma_unmap_page(&req->dev->pci_dev->dev, dst->RequestPages[i] << PAGE_SHIFT, PAGE_SIZE, DMA_BIDIRECTIONAL); + + return count; + } +@@ -264,7 +264,7 @@ static void tg_req_unmap_pages(struct TG + + pfn = (u64 *)(dbuf + 1); + for (; npages > 0; npages--, pfn++) +- pci_unmap_page(pdev, (*pfn) << PAGE_SHIFT, PAGE_SIZE, DMA_BIDIRECTIONAL); ++ dma_unmap_page(&pdev->dev, (*pfn) << PAGE_SHIFT, PAGE_SIZE, DMA_BIDIRECTIONAL); + + dbuf = (TG_PAGED_BUFFER *)pfn; + } +@@ -374,7 +374,7 @@ static int tg_req_submit(struct TG_PENDI + * also no any offset inside page needed. + */ + req->pg = vmalloc_to_page(dst); +- req->phys = pci_map_page(dev->pci_dev, vmalloc_to_page(dst), 0, PAGE_SIZE, DMA_BIDIRECTIONAL); ++ req->phys = dma_map_page(&dev->pci_dev->dev, vmalloc_to_page(dst), 0, PAGE_SIZE, DMA_BIDIRECTIONAL); + if (!req->phys) { + DPRINTK("Can not allocate memory for DMA mapping\n"); + goto out; +@@ -405,7 +405,7 @@ static int tg_req_submit(struct TG_PENDI + out: + if (ret != TG_STATUS_PENDING) { + page_cache_release(req->pg); +- pci_unmap_page(dev->pci_dev, req->phys, PAGE_SIZE, DMA_BIDIRECTIONAL); ++ dma_unmap_page(&dev->pci_dev->dev, req->phys, PAGE_SIZE, DMA_BIDIRECTIONAL); + } + + DPRINTK("EXIT\n"); +@@ -460,7 +460,7 @@ out_wait: + wait_for_completion(&req->waiting); + out: + page_cache_release(req->pg); +- pci_unmap_page(dev->pci_dev, req->phys, PAGE_SIZE, DMA_BIDIRECTIONAL); ++ dma_unmap_page(&dev->pci_dev->dev, req->phys, PAGE_SIZE, DMA_BIDIRECTIONAL); + DPRINTK("EXIT\n"); + return ret; + } +diff -puNr prl-tools-build/kmods/prl_fs/SharedFolders/Guest/Linux/prl_fs/inode.c prl-tools-build/kmods/prl_fs/SharedFolders/Guest/Linux/prl_fs/inode.c +--- prl-tools-build/kmods/prl_fs/SharedFolders/Guest/Linux/prl_fs/inode.c ++++ prl-tools-build/kmods/prl_fs/SharedFolders/Guest/Linux/prl_fs/inode.c +@@ -16,6 +16,7 @@ + #include + #include + #include ++#include + + #if (LINUX_VERSION_CODE >= KERNEL_VERSION(2, 6, 40)) && \ + (LINUX_VERSION_CODE < KERNEL_VERSION(3, 0, 0)) +@@ -57,7 +58,7 @@ unsigned long *prlfs_dfl( struct dentry + } + + #if LINUX_VERSION_CODE >= KERNEL_VERSION(5, 9, 0) +-#define prl_uaccess_kernel() uaccess_kernel() ++#define prl_uaccess_kernel() (false) + #else + #define prl_uaccess_kernel() segment_eq(get_fs(), KERNEL_DS) + #endif +@@ -954,7 +955,7 @@ static const struct address_space_operat + .writepage = prlfs_writepage, + .write_begin = simple_write_begin, + .write_end = prlfs_write_end, +- .set_page_dirty = __set_page_dirty_nobuffers, ++ .dirty_folio = filemap_dirty_folio, + }; + + diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/rtl8192eu/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/rtl8192eu/default.nix index 1f2559e063..c91353e465 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/rtl8192eu/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/rtl8192eu/default.nix @@ -6,13 +6,13 @@ let modDestDir = "$out/lib/modules/${kernel.modDirVersion}/kernel/drivers/net/wi in stdenv.mkDerivation rec { pname = "rtl8192eu"; - version = "${kernel.version}-4.4.1.20220313"; + version = "${kernel.version}-4.4.1.20220614"; src = fetchFromGitHub { owner = "Mange"; repo = "rtl8192eu-linux-driver"; - rev = "e0f967cea1d0037c730246c572f7fef000865ff7"; - sha256 = "sha256-Wgp1MZ/z8AxbZPYsmR6t7Q4nsL0TFEqTEsrkkWPI6gI="; + rev = "6ba1f320963376f15ea216238c0b62ff3e71fa82"; + sha256 = "sha256-c5swRxSjWT1tCcR7tfFKdAdVVmAEYgMZuOwUxGYYESI="; }; hardeningDisable = [ "pic" ]; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/tiptop/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/tiptop/default.nix index bb9fa28598..7e88e1b14b 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/tiptop/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/tiptop/default.nix @@ -38,7 +38,7 @@ stdenv.mkDerivation rec { homepage = "http://tiptop.gforge.inria.fr"; license = licenses.gpl2; platforms = platforms.linux; - maintainers = [ maintainers.vcunat ]; + maintainers = [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/tuigreet/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/tuigreet/default.nix index 95de5b8c8d..8660c4a1a4 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/tuigreet/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/tuigreet/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "tuigreet"; - version = "0.7.2"; + version = "0.8.0"; src = fetchFromGitHub { owner = "apognu"; repo = pname; rev = version; - sha256 = "sha256-Mu4GGlX7ZjBaBECXRD6iJCqDMSzcj17BriJ6Nas0J70="; + sha256 = "sha256-8/2I6bk29/GqZ1ACuN9RgBiGAy7yt0iw2fagHfu4/BI="; }; - cargoSha256 = "sha256-H5xqk7Yd3M8sFGHlmhAS0fhh3eM4dkvkNQGVxRSXUJs="; + cargoSha256 = "sha256-fOs9a0/1c8Kh4JA5up3XSQ+km/FwSYzl0w4UDL4yU4M="; meta = with lib; { description = "Graphical console greeter for greetd"; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/usbtop/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/usbtop/default.nix index 6948d51e5d..fb3d32df09 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/usbtop/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/usbtop/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://github.com/aguinet/usbtop"; description = "A top utility that shows an estimated instantaneous bandwidth on USB buses and devices"; - maintainers = with maintainers; [ etu ]; + maintainers = with maintainers; [ ]; license = licenses.bsd3; platforms = platforms.linux; }; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/vmware/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/vmware/default.nix index 5fd6bb12e1..ecc43bf3f3 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/vmware/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/vmware/default.nix @@ -7,8 +7,8 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "mkubecek"; repo = "vmware-host-modules"; - rev = "w${vmware-workstation.version}-k5.17"; - sha256 = "sha256-EM6YU2nOwNlAXpQ7cGrLS1N+gAS1KxleVjJTzo22De0="; + rev = "w${vmware-workstation.version}-k5.18"; + sha256 = "sha256-sAeCjaSrBXGP5szfCY5CpMrGwzCw4aM67EN+YfA3AWA="; }; hardeningDisable = [ "pic" ]; @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { homepage = "https://github.com/mkubecek/vmware-host-modules"; license = licenses.gpl2Only; platforms = [ "x86_64-linux" ]; - broken = (kernel.kernelOlder "5.5" && kernel.isHardened) || kernel.kernelAtLeast "5.18"; + broken = (kernel.kernelOlder "5.5" && kernel.isHardened) || kernel.kernelAtLeast "5.19"; maintainers = with maintainers; [ deinferno ]; }; } diff --git a/third_party/nixpkgs/pkgs/servers/adguardhome/bins.nix b/third_party/nixpkgs/pkgs/servers/adguardhome/bins.nix index d2346d7ff5..e7689ca797 100644 --- a/third_party/nixpkgs/pkgs/servers/adguardhome/bins.nix +++ b/third_party/nixpkgs/pkgs/servers/adguardhome/bins.nix @@ -1,23 +1,23 @@ { fetchurl, fetchzip }: { x86_64-darwin = fetchzip { - sha256 = "sha256-z7QFnx414sdGazUZIenAVA+7LcSZT0tTb/ldv1SGV3Q="; - url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.7/AdGuardHome_darwin_amd64.zip"; + sha256 = "sha256-PYq6AKX3Ifo8vMnPYGjqHwFejOBuQjhfDG5nXnccfvE="; + url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.8/AdGuardHome_darwin_amd64.zip"; }; aarch64-darwin = fetchzip { - sha256 = "sha256-Pbl7YaDVxdER/ubOiPq54ASB4ILnH0B3GiQlQBe7gFs="; - url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.7/AdGuardHome_darwin_arm64.zip"; + sha256 = "sha256-ep5/VMO7LmfD6+chG2SGwkc5awoeqACQeP04YpMXI1s="; + url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.8/AdGuardHome_darwin_arm64.zip"; }; i686-linux = fetchurl { - sha256 = "sha256-P2PsSdpW5i2hwBPUKb+viYewlVHTER/eBkwPp3koawo="; - url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.7/AdGuardHome_linux_386.tar.gz"; + sha256 = "sha256-rD5UDkAMeBfnrEpxfZWgDQEUN+82D6Ul2gjclS8A8CU="; + url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.8/AdGuardHome_linux_386.tar.gz"; }; x86_64-linux = fetchurl { - sha256 = "sha256-cbTlVBlGdFgEz2b6pb0SJ7yUf4wFXnZwLCkmvX75FzU="; - url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.7/AdGuardHome_linux_amd64.tar.gz"; + sha256 = "sha256-buBp5WZ1jIzQDbxzVOZC/t3iv1Dw0P/PN3wGBbGaYvU="; + url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.8/AdGuardHome_linux_amd64.tar.gz"; }; aarch64-linux = fetchurl { - sha256 = "sha256-TKZ3bOM5oq30GtLn9ifNyY6+2Li4nf1+r2L0ExG/10c="; - url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.7/AdGuardHome_linux_arm64.tar.gz"; + sha256 = "sha256-d6Z46L6qeXi5UNPY3/nlTJvVCuQ0lamtR49Z73O87Wc="; + url = "https://github.com/AdguardTeam/AdGuardHome/releases/download/v0.107.8/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 b193fd2cfd..66b8b12e09 100644 --- a/third_party/nixpkgs/pkgs/servers/adguardhome/default.nix +++ b/third_party/nixpkgs/pkgs/servers/adguardhome/default.nix @@ -7,7 +7,7 @@ in stdenv.mkDerivation rec { pname = "adguardhome"; - version = "0.107.7"; + version = "0.107.8"; src = sources.${system} or (throw "Source for ${pname} is not available for ${system}"); installPhase = '' diff --git a/third_party/nixpkgs/pkgs/servers/atlassian/jira.nix b/third_party/nixpkgs/pkgs/servers/atlassian/jira.nix index 6434a756bc..5b4d9d695f 100644 --- a/third_party/nixpkgs/pkgs/servers/atlassian/jira.nix +++ b/third_party/nixpkgs/pkgs/servers/atlassian/jira.nix @@ -3,7 +3,7 @@ , fetchurl , gawk , enableSSO ? false -, crowdProperties ? null +, makeWrapper }: stdenv.mkDerivation rec { @@ -15,6 +15,8 @@ stdenv.mkDerivation rec { sha256 = "sha256-Zog0m8tsx8mDLU1rsW5zhhHgyRmi4JGWuy9DV8yp9nY="; }; + nativeBuildInputs = [ makeWrapper ]; + buildPhase = '' mv conf/server.xml conf/server.xml.dist ln -sf /run/atlassian-jira/server.xml conf/server.xml @@ -27,10 +29,6 @@ stdenv.mkDerivation rec { substituteInPlace atlassian-jira/WEB-INF/classes/seraph-config.xml \ --replace com.atlassian.jira.security.login.JiraSeraphAuthenticator \ com.atlassian.jira.security.login.SSOSeraphAuthenticator - '' + lib.optionalString (crowdProperties != null) '' - cat < atlassian-jira/WEB-INF/classes/crowd.properties - ${crowdProperties} - EOF ''; installPhase = '' @@ -41,6 +39,6 @@ stdenv.mkDerivation rec { description = "Proprietary issue tracking product, also providing project management functions"; homepage = "https://www.atlassian.com/software/jira"; license = licenses.unfree; - maintainers = with maintainers; [ fpletz globin ciil megheaiulian techknowlogick ]; + maintainers = with maintainers; [ fpletz globin ciil megheaiulian techknowlogick ma27 ]; }; } diff --git a/third_party/nixpkgs/pkgs/servers/baserow/default.nix b/third_party/nixpkgs/pkgs/servers/baserow/default.nix new file mode 100644 index 0000000000..bb09196983 --- /dev/null +++ b/third_party/nixpkgs/pkgs/servers/baserow/default.nix @@ -0,0 +1,172 @@ +{ lib +, buildPythonPackage +, fetchFromGitLab +, regex +, service-identity +, itsdangerous +, requests +, redis +, channels +, channels-redis +, psycopg2 +, gunicorn +, django-cors-headers +, django-celery-email +, advocate +, django-storages +, pillow +, faker +, uvicorn +, twisted +, django +, drf-jwt +, cryptography +, tqdm +, celery-redbeat +, drf-spectacular +, websockets +, asgiref +, antlr4-python3-runtime +, psutil +, dj-database-url +, django-health-check +, celery +, unicodecsv +, django-celery-beat +, django-redis +, zipp +, boto3 +, cached-property +, importlib-resources +, zope_interface +, freezegun +, pyinstrument +, responses +, pytestCheckHook +, setuptools +, pytest-django +, python +, httpretty +, pytest-unordered +, openapi-spec-validator }: + +let + + baserow_premium = with python.pkgs; ( buildPythonPackage rec { + pname = "baserow_premium"; + version = "1.10.2"; + + src = fetchFromGitLab { + owner = "bramw"; + repo = pname; + rev = version; + sha256 = "sha256-4BrhTwAxHboXz8sMZL0V68skgNw2D2/YJuiWVNe0p4w="; + }; + + sourceRoot = "source/premium/backend"; + + doCheck = false; + }); + +in + +buildPythonPackage rec { + pname = "baserow"; + version = "1.10.2"; + + src = fetchFromGitLab { + owner = "bramw"; + repo = pname; + rev = version; + sha256 = "sha256-4BrhTwAxHboXz8sMZL0V68skgNw2D2/YJuiWVNe0p4w="; + }; + + sourceRoot = "source/backend"; + + postPatch = '' + # remove dependency constraints + sed 's/[~<>=].*//' -i requirements/base.in requirements/base.txt + sed 's/zope-interface/zope.interface/' -i requirements/base.in requirements/base.txt + ''; + + propagatedBuildInputs = [ + advocate + antlr4-python3-runtime + boto3 + cached-property + celery-redbeat + channels + channels-redis + dj-database-url + django-celery-beat + django-celery-email + django-cors-headers + django-health-check + django-redis + django-storages + drf-jwt + drf-spectacular + faker + gunicorn + importlib-resources + itsdangerous + pillow + psutil + psycopg2 + redis + regex + requests + service-identity + setuptools + tqdm + twisted + unicodecsv + uvicorn + zipp + ]; + + checkInputs = [ + baserow_premium + boto3 + freezegun + httpretty + openapi-spec-validator + pyinstrument + pytestCheckHook + pytest-django + pytest-unordered + responses + zope_interface + ]; + + fixupPhase = '' + cp -r src/baserow/contrib/database/{api,action,trash,formula,file_import} \ + $out/lib/${python.libPrefix}/site-packages/baserow/contrib/database/ + cp -r src/baserow/core/management/backup $out/lib/${python.libPrefix}/site-packages/baserow/core/management/ + ''; + + # Disable linting checks + disabledTests = [ + "flake8_plugins" + ]; + + disabledTestPaths = [ + # Disable premium tests + "../premium/backend/src/baserow_premium" + "../premium/backend/tests/baserow_premium" + # Disable database related tests + "tests/baserow/contrib/database" + "tests/baserow/api" + "tests/baserow/core" + "tests/baserow/ws" + ]; + + DJANGO_SETTINGS_MODULE = "baserow.config.settings.test"; + + meta = with lib; { + homepage = "https://baserow.io"; + description = "No-code database and Airtable alternative"; + license = licenses.mit; + maintainers = with maintainers; [ onny ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/servers/caddy/default.nix b/third_party/nixpkgs/pkgs/servers/caddy/default.nix index 0ba836eeb6..fbd5822df6 100644 --- a/third_party/nixpkgs/pkgs/servers/caddy/default.nix +++ b/third_party/nixpkgs/pkgs/servers/caddy/default.nix @@ -1,6 +1,6 @@ { lib, buildGoModule, fetchFromGitHub, nixosTests }: let - version = "2.5.1"; + version = "2.5.2"; dist = fetchFromGitHub { owner = "caddyserver"; repo = "dist"; @@ -18,10 +18,10 @@ buildGoModule { owner = "caddyserver"; repo = "caddy"; rev = "v${version}"; - sha256 = "sha256-Y4GAx/8XcW7+6eXCQ6k4e/3WZ/6MkTr5za1AXp6El9o="; + sha256 = "sha256-Z9A2DRdX0LWjIKdHAHk2IRxsUzvC90Gf5ohFLXNHcsw="; }; - vendorSha256 = "sha256-xu3klc9yb4Ws8fvXRV286IDhi/zQVN1PKCiFKb8VJBo="; + vendorSha256 = "sha256-aB95wEc69nhloF8qoBeIiiitSyiUTc2KpxyCEnge4rc="; postInstall = '' install -Dm644 ${dist}/init/caddy.service ${dist}/init/caddy-api.service -t $out/lib/systemd/system diff --git a/third_party/nixpkgs/pkgs/servers/consul/default.nix b/third_party/nixpkgs/pkgs/servers/consul/default.nix index 56003bd1ed..d6545756b5 100644 --- a/third_party/nixpkgs/pkgs/servers/consul/default.nix +++ b/third_party/nixpkgs/pkgs/servers/consul/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "consul"; - version = "1.12.2"; + version = "1.12.3"; rev = "v${version}"; # Note: Currently only release tags are supported, because they have the Consul UI @@ -17,7 +17,7 @@ buildGoModule rec { owner = "hashicorp"; repo = pname; inherit rev; - sha256 = "sha256-X2vW6fnT5IY+YxGnAP5Flk610vIwLg3Qu/rEerFyNCw="; + sha256 = "sha256-QCSlRGbYCOOS81M7sl8Skr1/DhEX+U+0dCroWydzifw="; }; passthru.tests.consul = nixosTests.consul; @@ -26,7 +26,7 @@ buildGoModule rec { # has a split module structure in one repo subPackages = ["." "connect/certgen"]; - vendorSha256 = "sha256-Qcm+uPlvzg0r+a/rYVCUaQ7iIgCpW7MyL7KrHkNm4XQ="; + vendorSha256 = "sha256-3WjmAbY7AVApZZXdCfbjr2X9I8vvwR2EfNmCJv9Gk6A="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/servers/dcnnt/default.nix b/third_party/nixpkgs/pkgs/servers/dcnnt/default.nix index 0cab4a326c..a7759191a1 100644 --- a/third_party/nixpkgs/pkgs/servers/dcnnt/default.nix +++ b/third_party/nixpkgs/pkgs/servers/dcnnt/default.nix @@ -2,11 +2,11 @@ buildPythonApplication rec { pname = "dcnnt"; - version = "0.6.0"; + version = "0.7.0"; src = fetchPypi { inherit pname version; - sha256 = "ef8578526163cb3e25fa352ba2f6f4d39309f477a72282416c89eddfb69c3a91"; + sha256 = "sha256-LP3tOInpqVpO/BWla7/gZCGUUZ/1J8dHegGa0hRiRDQ="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/servers/dns/ncdns/default.nix b/third_party/nixpkgs/pkgs/servers/dns/ncdns/default.nix index 7729305da5..8feae334be 100644 --- a/third_party/nixpkgs/pkgs/servers/dns/ncdns/default.nix +++ b/third_party/nixpkgs/pkgs/servers/dns/ncdns/default.nix @@ -100,13 +100,14 @@ buildGoModule { cp -r _tpl "$out/share/tpl" ''; + passthru.tests.ncdns = nixosTests.ncdns; + meta = with lib; { description = "Namecoin to DNS bridge daemon"; homepage = "https://github.com/namecoin/ncdns"; license = licenses.gpl3Plus; maintainers = with maintainers; [ rnhmjoj ]; + # module github.com/btcsuite/btcd@latest found (v0.23.1), but does not contain package github.com/btcsuite/btcd/btcec + broken = true; }; - - passthru.tests.ncdns = nixosTests.ncdns; - } diff --git a/third_party/nixpkgs/pkgs/servers/endlessh-go/default.nix b/third_party/nixpkgs/pkgs/servers/endlessh-go/default.nix index eae3cd6a8d..320d5c4137 100644 --- a/third_party/nixpkgs/pkgs/servers/endlessh-go/default.nix +++ b/third_party/nixpkgs/pkgs/servers/endlessh-go/default.nix @@ -5,22 +5,25 @@ buildGoModule rec { pname = "endlessh-go"; - version = "20220308.1"; + version = "20220710"; src = fetchFromGitHub { owner = "shizunge"; repo = "endlessh-go"; rev = version; - hash = "sha256-U+h/WmTVwwUIBEOiNa/EKS6HvkeoGNmP3NpeP1fcqYw="; + sha256 = "sha256-T8DLzHfITMLeHJtKuK4AjEzGGCIDJUPlqF2Lj56xPxY="; }; - vendorSha256 = "sha256-h/DpbXO+LUsB9NOAXUfNx3VOfEsiolfBEMBrAqVlU3A="; + vendorSha256 = "sha256-hMCjYAqsI6h9B8iGVYQcNbKU5icalOHavvPKwOmvf/w="; proxyVendor = true; + ldflags = [ "-s" "-w" ]; + meta = with lib; { description = "An implementation of endlessh exporting Prometheus metrics"; homepage = "https://github.com/shizunge/endlessh-go"; + changelog = "https://github.com/shizunge/endlessh-go/releases/tag/${version}"; license = licenses.gpl3Plus; maintainers = with maintainers; [ azahi ]; }; diff --git a/third_party/nixpkgs/pkgs/servers/etcd/3.4.nix b/third_party/nixpkgs/pkgs/servers/etcd/3.4.nix index 538b7a7d23..ad3c1e3520 100644 --- a/third_party/nixpkgs/pkgs/servers/etcd/3.4.nix +++ b/third_party/nixpkgs/pkgs/servers/etcd/3.4.nix @@ -2,9 +2,9 @@ buildGoModule rec { pname = "etcd"; - version = "3.4.18"; + version = "3.4.19"; - vendorSha256 = null; + vendorSha256 = "sha256-ZONIsizxRiwZWRu4y9VzZcCpyBKoa0j3h3JqoMMPGu0="; doCheck = false; @@ -12,7 +12,7 @@ buildGoModule rec { owner = "etcd-io"; repo = "etcd"; rev = "v${version}"; - sha256 = "sha256-/bXcW5g8mNFEjvfg+1loLFi8+IaWdcTE/lUPsHzEaIo="; + sha256 = "sha256-8X7xTZrZ/AjUgrW9XgD8B7eKFfOulj8WBjXoImAtJoM="; }; buildPhase = '' diff --git a/third_party/nixpkgs/pkgs/servers/http/unit/default.nix b/third_party/nixpkgs/pkgs/servers/http/unit/default.nix index 43617f4057..3483623db2 100644 --- a/third_party/nixpkgs/pkgs/servers/http/unit/default.nix +++ b/third_party/nixpkgs/pkgs/servers/http/unit/default.nix @@ -1,11 +1,14 @@ { lib, stdenv, fetchFromGitHub, nixosTests, which , pcre2 , withPython3 ? true, python3, ncurses -, withPHP80 ? true, php80 +, withPHP80 ? false, php80 +, withPHP81 ? true, php81 , withPerl532 ? false, perl532 , withPerl534 ? true, perl534 , withPerldevel ? false, perldevel -, withRuby_2_7 ? false, ruby_2_7 +, withRuby_2_7 ? true, ruby_2_7 +, withRuby_3_0 ? false, ruby_3_0 +, withRuby_3_1 ? false, ruby_3_1 , withSSL ? true, openssl ? null , withIPv6 ? true , withDebug ? false @@ -24,16 +27,17 @@ let }; php80-unit = php80.override phpConfig; + php81-unit = php81.override phpConfig; in stdenv.mkDerivation rec { - version = "1.26.1"; + version = "1.27.0"; pname = "unit"; src = fetchFromGitHub { owner = "nginx"; repo = pname; rev = version; - sha256 = "sha256-rTT7EJSHepGOwNXVqlOBOhZayZQXyNo3B2Oa1oLf2FI="; + sha256 = "sha256-H/WIrCyocEO/HZfVMyI9IwD565JsUIzC8n1qUYmCvWc="; }; nativeBuildInputs = [ which ]; @@ -41,10 +45,13 @@ in stdenv.mkDerivation rec { buildInputs = [ pcre2.dev ] ++ optionals withPython3 [ python3 ncurses ] ++ optional withPHP80 php80-unit + ++ optional withPHP81 php81-unit ++ optional withPerl532 perl532 ++ optional withPerl534 perl534 ++ optional withPerldevel perldevel ++ optional withRuby_2_7 ruby_2_7 + ++ optional withRuby_3_0 ruby_3_0 + ++ optional withRuby_3_1 ruby_3_1 ++ optional withSSL openssl; configureFlags = [ @@ -58,14 +65,22 @@ in stdenv.mkDerivation rec { # Optionally add the PHP derivations used so they can be addressed in the configs usedPhp80 = optionals withPHP80 php80-unit; + usedPhp81 = optionals withPHP81 php81-unit; postConfigure = '' ${optionalString withPython3 "./configure python --module=python3 --config=python3-config --lib-path=${python3}/lib"} ${optionalString withPHP80 "./configure php --module=php80 --config=${php80-unit.unwrapped.dev}/bin/php-config --lib-path=${php80-unit}/lib"} + ${optionalString withPHP81 "./configure php --module=php81 --config=${php81-unit.unwrapped.dev}/bin/php-config --lib-path=${php81-unit}/lib"} ${optionalString withPerl532 "./configure perl --module=perl532 --perl=${perl532}/bin/perl"} ${optionalString withPerl534 "./configure perl --module=perl534 --perl=${perl534}/bin/perl"} ${optionalString withPerldevel "./configure perl --module=perldev --perl=${perldevel}/bin/perl"} ${optionalString withRuby_2_7 "./configure ruby --module=ruby27 --ruby=${ruby_2_7}/bin/ruby"} + ${optionalString withRuby_3_0 "./configure ruby --module=ruby30 --ruby=${ruby_3_0}/bin/ruby"} + ${optionalString withRuby_3_1 "./configure ruby --module=ruby31 --ruby=${ruby_3_1}/bin/ruby"} + ''; + + postInstall = '' + rmdir $out/state ''; passthru.tests.unit-php = nixosTests.unit-php; diff --git a/third_party/nixpkgs/pkgs/servers/mail/rspamd/default.nix b/third_party/nixpkgs/pkgs/servers/mail/rspamd/default.nix index a720500380..05d71c9bad 100644 --- a/third_party/nixpkgs/pkgs/servers/mail/rspamd/default.nix +++ b/third_party/nixpkgs/pkgs/servers/mail/rspamd/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchFromGitHub, cmake, perl -, glib, luajit, openssl, pcre2, pkg-config, sqlite, ragel, icu +, glib, luajit, openssl, pcre, pkg-config, sqlite, ragel, icu , hyperscan, jemalloc, blas, lapack, lua, libsodium , withBlas ? true , withHyperscan ? stdenv.isx86_64 @@ -23,12 +23,14 @@ stdenv.mkDerivation rec { hardeningEnable = [ "pie" ]; nativeBuildInputs = [ cmake pkg-config perl ]; - buildInputs = [ glib openssl pcre2 sqlite ragel icu jemalloc libsodium ] + buildInputs = [ glib openssl pcre sqlite ragel icu jemalloc libsodium ] ++ lib.optional withHyperscan hyperscan ++ lib.optionals withBlas [ blas lapack ] ++ lib.optional withLuaJIT luajit ++ lib.optional (!withLuaJIT) lua; cmakeFlags = [ + # pcre2 jit seems to cause crashes: https://github.com/NixOS/nixpkgs/pull/181908 + "-DENABLE_PCRE2=OFF" "-DDEBIAN_BUILD=ON" "-DRUNDIR=/run/rspamd" "-DDBDIR=/var/lib/rspamd" diff --git a/third_party/nixpkgs/pkgs/servers/mattermost/default.nix b/third_party/nixpkgs/pkgs/servers/mattermost/default.nix index c8b8d4ffb0..a9d18d5b3f 100644 --- a/third_party/nixpkgs/pkgs/servers/mattermost/default.nix +++ b/third_party/nixpkgs/pkgs/servers/mattermost/default.nix @@ -1,27 +1,27 @@ { lib -, buildGo118Module +, buildGoModule , fetchFromGitHub , fetchurl , nixosTests }: -buildGo118Module rec { +buildGoModule rec { pname = "mattermost"; - version = "7.0.1"; + version = "7.1.1"; src = fetchFromGitHub { owner = "mattermost"; repo = "mattermost-server"; rev = "v${version}"; - sha256 = "sha256-oxZaOOV5pkK9HAi/AQ+MLZgfwvF6d/ArzYrXzUQGTDA="; + sha256 = "sha256-eo+NfV4S8utWdmYvp+F0sNlgptIC0zNXWXMrh7xfqN8="; }; webapp = fetchurl { url = "https://releases.mattermost.com/${version}/mattermost-${version}-linux-amd64.tar.gz"; - sha256 = "sha256-NWVDPDqdx7mdWCr/qBi8HsUsCJbT63x37UZGecHsZr4="; + sha256 = "sha256-NqCZyUdbw3OrQRuPH6NSWYhHKG3R4QHlH9IVIbIPEeU="; }; - vendorSha256 = "sha256-0sKuk0klxeep8J96RntDP9DHsVM4vrOmsKXiaWurVis="; + vendorSha256 = "sha256-98riYN6MaBsKyaueogjXI7x3Lcionk0xcGt4DH684QU="; subPackages = [ "cmd/mattermost" ]; diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/grafana/default.nix b/third_party/nixpkgs/pkgs/servers/monitoring/grafana/default.nix index 9eb3258d82..eda6b1ec95 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 = "9.0.2"; + version = "9.0.3"; excludedPackages = [ "alert_webhook_listener" "clean-swagger" "release_publisher" "slow_proxy" "slow_proxy_mac" "macaron" "devenv" ]; @@ -10,12 +10,12 @@ buildGoModule rec { rev = "v${version}"; owner = "grafana"; repo = "grafana"; - sha256 = "sha256-5N1Buj4bzlkuVXENbZsTajhzjtJUzR1O1JmbOHQU1MQ="; + sha256 = "sha256-oFVAiQt+ZxLB1On1wKM2R2qTEl5zBbWpkvBOLQ081+A="; }; srcStatic = fetchurl { url = "https://dl.grafana.com/oss/release/grafana-${version}.linux-amd64.tar.gz"; - sha256 = "1zamibfjfr4kdixajrb8cs2w95sj2hzhw7ak1yilfgiiq4kpkpah"; + sha256 = "sha256-l2XTC0OxIeUD4sjM4w9WsT9s5akGjWpFmnZnmI/vSEA="; }; vendorSha256 = "sha256-ncMIu6J7D3xflZSxf8txpaQd0YW62CtzcO5w/PUE1UU="; diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/nagios/plugins/smartmon.nix b/third_party/nixpkgs/pkgs/servers/monitoring/nagios/plugins/smartmon.nix new file mode 100644 index 0000000000..42554cfafe --- /dev/null +++ b/third_party/nixpkgs/pkgs/servers/monitoring/nagios/plugins/smartmon.nix @@ -0,0 +1,42 @@ +{ lib +, stdenv +, fetchFromGitHub +, python3 +, smartmontools +}: + +stdenv.mkDerivation rec { + pname = "check_smartmon"; + version = "1.0.1"; + + src = fetchFromGitHub { + owner = "driehuis"; + repo = "Nagios_check_smartmon"; + rev = version; + sha256 = "tiIeFiHdDgqoeznk9XdCE7owIMnnsQ0fmtj8foFoUD8="; + }; + + buildInputs = [ + (python3.withPackages (pp: [ pp.psutil ])) + smartmontools + ]; + + postPatch = '' + patchShebangs check_smartmon.py + substituteInPlace check_smartmon.py \ + --replace '"/usr/sbin/smartctl"' '"${smartmontools}/bin/smartctl"' + ''; + + installPhase = '' + runHook preInstall + install -Dm 755 check_smartmon.py $out/bin/check_smartmon + runHook postInstall + ''; + + meta = with lib; { + description = "A Nagios-Plugin that uses smartmontools to check disk health status and temperature"; + homepage = "https://github.com/driehuis/Nagios_check_smartmon"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ mariaa144 ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/nagios/plugins/zfs.nix b/third_party/nixpkgs/pkgs/servers/monitoring/nagios/plugins/zfs.nix new file mode 100644 index 0000000000..724aa498af --- /dev/null +++ b/third_party/nixpkgs/pkgs/servers/monitoring/nagios/plugins/zfs.nix @@ -0,0 +1,44 @@ +{ lib +, stdenv +, fetchFromGitHub +, python3 +, zfs +, sudo +}: + +stdenv.mkDerivation rec { + pname = "check_zfs"; + version = "2.0"; + + src = fetchFromGitHub { + owner = "zlacelle"; + repo = "nagios_check_zfs_linux"; + rev = version; + sha256 = "gPLCNt6hp4E94s9/PRgsnBN5XXQQ+s2MGcgRFeknXg4="; + }; + + buildInputs = [ python3 zfs sudo ]; + + postPatch = '' + patchShebangs check_zfs.py + substituteInPlace check_zfs.py \ + --replace "'/usr/bin/sudo'" "'${sudo}/bin/sudo'" \ + --replace "'/sbin/zpool'" "'${zfs}/bin/zpool'" \ + --replace "'/sbin/zfs'" "'${zfs}/bin/zfs'" + ''; + + installPhase = '' + runHook preInstall + + install -Dm 755 check_zfs.py $out/bin/check_zfs + + runHook postInstall + ''; + + meta = with lib; { + description = "Check the health, capacity, fragmentation, and other things for use with Nagios monitoring"; + homepage = "https://github.com/zlacelle/nagios_check_zfs_linux"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ mariaa144 ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/domain-exporter.nix b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/domain-exporter.nix index 78c35d8cf1..fc455b92ae 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/domain-exporter.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/domain-exporter.nix @@ -1,17 +1,25 @@ -{ lib, buildGoModule, fetchFromGitHub, nixosTests }: +{ lib, buildGoModule, fetchFromGitHub, fetchpatch, nixosTests }: buildGoModule rec { pname = "domain-exporter"; - version = "1.11.0"; + version = "1.17.1"; src = fetchFromGitHub { owner = "caarlos0"; repo = "domain_exporter"; rev = "v${version}"; - sha256 = "018y0xwdn2f2shhwaa0hqm4y8xsbqwif0733qb0377wpjbj4v137"; + hash = "sha256-18r+jUdVcv7hA9KdWkgvu2tNUIGf9f1uj2cwwMDnAs8="; }; - vendorSha256 = "0s1hs8byba9y57abg386n09wfg1wcqpzs164ap0km8ap2i96bdlb"; + patches = [ + (fetchpatch { + url = "https://github.com/caarlos0/domain_exporter/commit/32815b0956056c5c14313d0b860d1e9db754e545.patch"; + hash = "sha256-iEYnJ4BU+MWQd0BgKmRb8RNj/lH2V/Z9uwFS2muR4Go="; + name = "sg_domains.patch"; + }) + ]; + + vendorSha256 = "sha256-LHs2DSLNe+E3NUXZS7TV5M53ueUbCjjNM87UPRTaCpo="; doCheck = false; # needs internet connection @@ -21,6 +29,6 @@ buildGoModule rec { homepage = "https://github.com/caarlos0/domain_exporter"; description = "Exports the expiration time of your domains as prometheus metrics"; license = licenses.mit; - maintainers = with maintainers; [ mmilata prusnak ]; + maintainers = with maintainers; [ mmilata prusnak peterhoeg ]; }; } diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/telegraf/default.nix b/third_party/nixpkgs/pkgs/servers/monitoring/telegraf/default.nix index 2285693df6..8428885d99 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/telegraf/default.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/telegraf/default.nix @@ -15,7 +15,7 @@ buildGoModule rec { sha256 = "sha256-Cftxm+Lb3ekK8YZrklD/C+p0EpyEVU/xxVI5oiNgBxk="; }; - vendorSha256 = "sha256-E1p9hnxNFse7Zg8FGcZrbVqThrGTVSP04nH/ZP8WBlk="; + vendorSha256 = "sha256-VyNPIYRMAC51zp38BKoM5/bLbfwULtFEtRC3LQjVJK4="; proxyVendor = true; ldflags = [ diff --git a/third_party/nixpkgs/pkgs/servers/mpd/default.nix b/third_party/nixpkgs/pkgs/servers/mpd/default.nix index 0fc0a6197b..79a84f965b 100644 --- a/third_party/nixpkgs/pkgs/servers/mpd/default.nix +++ b/third_party/nixpkgs/pkgs/servers/mpd/default.nix @@ -116,13 +116,13 @@ let in stdenv.mkDerivation rec { pname = "mpd"; - version = "0.23.7"; + version = "0.23.8"; src = fetchFromGitHub { owner = "MusicPlayerDaemon"; repo = "MPD"; rev = "v${version}"; - sha256 = "sha256-Tc2EVNOvZTz0gYClgqbAicYDyOf6GtVOFm8t7uM6dLQ="; + sha256 = "sha256-yIzSEk4fgtNANKIxna0dP9HKIcGBVBkpqiyLCjvPDHE="; }; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/servers/nosql/eventstore/create-deps.sh b/third_party/nixpkgs/pkgs/servers/nosql/eventstore/create-deps.sh deleted file mode 100755 index afeee592de..0000000000 --- a/third_party/nixpkgs/pkgs/servers/nosql/eventstore/create-deps.sh +++ /dev/null @@ -1,98 +0,0 @@ -#! /usr/bin/env nix-shell -#! nix-shell -i bash -p dotnet-sdk_5 jq xmlstarlet curl nixpkgs-fmt -set -euo pipefail - -# Run this script to generate deps.nix - -# TODO: consolidate with other dotnet deps generation scripts by which -# this script is inspired: -# - pkgs/servers/nosql/eventstore/create-deps.sh -# - pkgs/development/dotnet-modules/python-language-server/create_deps.sh -# - pkgs/applications/emulators/ryujinx/updater.sh - -cd "$(dirname "${BASH_SOURCE[0]}")" - -deps_file="$(realpath "./deps.nix")" - -exec 2>&1 6> "$deps_file" - -store_src="$( nix-build ../../../.. -A eventstore.src --no-out-link )" -src="$(mktemp -d)" -cp -rT "$store_src" "$src" -chmod -R +w "$src" -pushd "$src" - -URLBASE="https://www.nuget.org/api/v2/package" - -DEPS_HEADER=" -{ fetchurl }: -let - nugetUrlBase = \"$URLBASE\"; - fetchNuGet = { pname, version, sha256 }: fetchurl { - inherit sha256; - url = \"\${nugetUrlBase}/\${pname}/\${version}\"; - }; -in [" - -DEPS_FOOTER="]" - -DEPS_TEMPLATE=" -(fetchNuGet { - pname = \"%s\"; - version = \"%s\"; - sha256 = \"%s\"; -})" - -tmpdir="$(mktemp -d -p "$(pwd)")" # must be under source root -trap 'rm -rf "$tmpdir"' EXIT - -HOME="$tmpdir" dotnet restore --packages "$tmpdir"/.nuget/packages \ - --no-cache --force --runtime linux-x64 \ - src/EventStore.sln >&2 - -mapfile -t repos < <( - xmlstarlet sel -t -v 'configuration/packageSources/add/@value' -n NuGet.config "$tmpdir"/.nuget/NuGet/NuGet.Config | - while IFS= read index - do - curl --compressed -fsL "$index" | \ - jq -r '.resources[] | select(."@type" == "PackageBaseAddress/3.0.0")."@id"' - done -) - -echo $DEPS_HEADER >&6 - -cd "$tmpdir/.nuget/packages" -for package in * -do - cd "$package" - for version in * - do - found=false - for repo in "${repos[@]}" - do - url="$repo$package/$version/$package.$version.nupkg" - if curl -fsL "$url" -o /dev/null - then - found=true - break - fi - done - - if ! $found - then - echo "couldn't find $package $version" >&2 - exit 1 - fi - - sha256=$(nix-prefetch-url "$url" 2>/dev/null) - - printf "$DEPS_TEMPLATE" $package $version $sha256 >&6 - done - cd .. -done - -echo $DEPS_FOOTER >&6 - -exec 6>&- - -nixpkgs-fmt "$deps_file" diff --git a/third_party/nixpkgs/pkgs/servers/nosql/eventstore/default.nix b/third_party/nixpkgs/pkgs/servers/nosql/eventstore/default.nix index 035d906b2b..60a69d2000 100644 --- a/third_party/nixpkgs/pkgs/servers/nosql/eventstore/default.nix +++ b/third_party/nixpkgs/pkgs/servers/nosql/eventstore/default.nix @@ -1,80 +1,81 @@ -{ lib, stdenv -, fetchFromGitHub -, fetchurl -, makeWrapper +{ lib +, git , dotnetCorePackages +, glibcLocales +, buildDotnetModule +, fetchFromGitHub +, bintools +, stdenv , mono -, Nuget }: -let - - dotnet-sdk = dotnetCorePackages.sdk_5_0; - - deps = import ./deps.nix { inherit fetchurl; }; - -in - -stdenv.mkDerivation rec { - +buildDotnetModule rec { pname = "EventStore"; - version = "5.0.8"; + version = "21.10.5"; src = fetchFromGitHub { owner = "EventStore"; repo = "EventStore"; rev = "oss-v${version}"; - sha256 = "021m610gzmrp2drywl1q3y6xxpy4qayn580d855ag952z9s6w9nj"; + sha256 = "sha256-uUDjTGCiQgXmvOUsujIA0JkGQGuw9U4zLKDP1WIFq1o="; + leaveDotGit = true; }; - buildInputs = [ - makeWrapper - dotnet-sdk - mono - Nuget + # Fixes application reporting 0.0.0.0 as its version. + MINVERVERSIONOVERRIDE = version; + + dotnet-sdk = dotnetCorePackages.sdk_5_0; + dotnet-runtime = dotnetCorePackages.aspnetcore_5_0; + + nativeBuildInputs = [ git glibcLocales bintools ]; + + runtimeDeps = [ mono ]; + + nugetBinariesToPatch = lib.optionals stdenv.isLinux [ + "grpc.tools/2.39.1/tools/linux_x64/protoc" + "grpc.tools/2.39.1/tools/linux_x64/grpc_csharp_plugin" ]; - # that dependency seems to not be required for building, but pulls in libcurl which fails to be located. - # see: https://github.com/EventStore/EventStore/issues/1897 - patchPhase = '' - for f in $(find . -iname "*.csproj"); do - sed -i '/Include="Microsoft.SourceLink.GitHub"/d' $f - done - ''; - - buildPhase = '' - export FrameworkPathOverride=${mono}/lib/mono/4.7.1-api - - # disable default-source so nuget does not try to download from online-repo - nuget sources Disable -Name "nuget.org" - # add all dependencies to a source called 'nixos' - for package in ${toString deps}; do - nuget add $package -Source nixos + postConfigure = '' + # Fixes execution of native protoc binaries during build + for binary in $nugetBinariesToPatch; do + path="$HOME/.nuget/packages/$binary" + patchelf --set-interpreter "$(cat $NIX_BINTOOLS/nix-support/dynamic-linker)" $path done - dotnet restore --source nixos src/EventStore.sln - dotnet build --no-restore -c Release src/EventStore.sln + # Fixes git execution by GitInfo on mac os + substituteInPlace "$HOME/.nuget/packages/gitinfo/2.0.26/build/GitInfo.targets" \ + --replace "/usr/bin/git" " " \ + --replace "/usr/local/bin/git" "" ''; - installPhase = '' - mkdir -p $out/{bin,lib/eventstore} - cp -r bin/Release/* $out/lib/eventstore - makeWrapper "${mono}/bin/mono" $out/bin/eventstored \ - --add-flags "$out/lib/eventstore/EventStore.ClusterNode/net471/EventStore.ClusterNode.exe" - ''; + nugetDeps = ./deps.nix; + + projectFile = "src/EventStore.ClusterNode/EventStore.ClusterNode.csproj"; doCheck = true; + testProjectFile = "src/EventStore.Projections.Core.Tests/EventStore.Projections.Core.Tests.csproj"; - checkPhase = '' - dotnet test src/EventStore.Projections.Core.Tests/EventStore.Projections.Core.Tests.csproj -- RunConfiguration.TargetPlatform=x64 + doInstallCheck = true; + installCheckPhase = '' + $out/bin/EventStore.ClusterNode --insecure \ + --db "$HOME/data" \ + --index "$HOME/index" \ + --log "$HOME/log" \ + -runprojections all --startstandardprojections \ + --EnableAtomPubOverHttp & + + PID=$! + + sleep 30s; + kill "$PID"; ''; - meta = { + meta = with lib; { homepage = "https://geteventstore.com/"; description = "Event sourcing database with processing logic in JavaScript"; - license = lib.licenses.bsd3; - maintainers = with lib.maintainers; [ puffnfresh ]; + license = licenses.bsd3; + maintainers = with maintainers; [ puffnfresh mdarocha ]; platforms = [ "x86_64-linux" "x86_64-darwin" ]; }; - } diff --git a/third_party/nixpkgs/pkgs/servers/nosql/eventstore/deps.nix b/third_party/nixpkgs/pkgs/servers/nosql/eventstore/deps.nix index 24b1c00514..92b57b9440 100644 --- a/third_party/nixpkgs/pkgs/servers/nosql/eventstore/deps.nix +++ b/third_party/nixpkgs/pkgs/servers/nosql/eventstore/deps.nix @@ -1,633 +1,296 @@ -{ fetchurl }: -let - nugetUrlBase = "https://www.nuget.org/api/v2/package"; - fetchNuGet = { pname, version, sha256 }: fetchurl { inherit sha256; url = "${nugetUrlBase}/${pname}/${version}"; }; -in -[ - - (fetchNuGet { - pname = "hdrhistogram"; - version = "2.5.0"; - sha256 = "1s2np7m3pp17rgambax9a3x5pd2grx74cr325q3xapjz2gd58sj1"; - }) - (fetchNuGet { - pname = "microsoft.build.tasks.git"; - version = "1.0.0-beta-63127-02"; - sha256 = "10avjhp4vjbmix4rwacbw6cim2d4kbmz64q4n7r6zz94395l61b6"; - }) - (fetchNuGet { - pname = "microsoft.codecoverage"; - version = "15.9.0"; - sha256 = "10v5xrdilnm362g9545qxvlrbwc9vn65jhpb1i0jlhyqsj6bfwzg"; - }) - (fetchNuGet { - pname = "microsoft.netcore.platforms"; - version = "1.1.0"; - sha256 = "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm"; - }) - (fetchNuGet { - pname = "microsoft.netcore.platforms"; - version = "1.1.1"; - sha256 = "164wycgng4mi9zqi2pnsf1pq6gccbqvw6ib916mqizgjmd8f44pj"; - }) - (fetchNuGet { - pname = "microsoft.netcore.platforms"; - version = "2.1.0"; - sha256 = "0nmdnkmwyxj8cp746hs9an57zspqlmqdm55b00i7yk8a22s6akxz"; - }) - (fetchNuGet { - pname = "microsoft.netcore.targets"; - version = "1.1.0"; - sha256 = "193xwf33fbm0ni3idxzbr5fdq3i2dlfgihsac9jj7whj0gd902nh"; - }) - (fetchNuGet { - pname = "microsoft.netframework.referenceassemblies"; - version = "1.0.0"; - sha256 = "0na724xhvqm63vq9y18fl9jw9q2v99bdwr353378s5fsi11qzxp9"; - }) - (fetchNuGet { - pname = "microsoft.netframework.referenceassemblies.net452"; - version = "1.0.0"; - sha256 = "1f0vqrnkggnn4fgfbb2wp4hg9b1n1zvcknvgpphl5dfrk4b0zag8"; - }) - (fetchNuGet { - pname = "microsoft.netframework.referenceassemblies.net46"; - version = "1.0.0"; - sha256 = "1yl609ilni8adiyryn9rm967sjm499pkx4xj06gpb16dm8d9jkji"; - }) - (fetchNuGet { - pname = "microsoft.netframework.referenceassemblies.net471"; - version = "1.0.0"; - sha256 = "101incszmaxdhrfzqbfya04fqivi81xvazdfc5l0hr7hm42r6k2m"; - }) - (fetchNuGet { - pname = "microsoft.net.test.sdk"; - version = "15.9.0"; - sha256 = "0g7wjgiigs4v8qa32g9ysqgx8bx55dzmbxfkc4ic95mpd1vkjqxw"; - }) - (fetchNuGet { - pname = "microsoft.sourcelink.common"; - version = "1.0.0-beta-63127-02"; - sha256 = "0y29xx3x9nd14n1sr8ycxhf6y1a83pv3sayfxjib8wi6s866lagb"; - }) - (fetchNuGet { - pname = "microsoft.sourcelink.github"; - version = "1.0.0-beta-63127-02"; - sha256 = "1096d5n7mfvgm1apdmafjkxkqray6r2cw6zjhhxj2zn98836w1n2"; - }) - (fetchNuGet { - pname = "microsoft.win32.primitives"; - version = "4.3.0"; - sha256 = "0j0c1wj4ndj21zsgivsc24whiya605603kxrbiw6wkfdync464wq"; - }) - (fetchNuGet { - pname = "netstandard.library"; - version = "2.0.3"; - sha256 = "1fn9fxppfcg4jgypp2pmrpr6awl3qz1xmnri0cygpkwvyx27df1y"; - }) - (fetchNuGet { - pname = "newtonsoft.json"; - version = "11.0.2"; - sha256 = "1784xi44f4k8v1fr696hsccmwpy94bz7kixxqlri98zhcxn406b2"; - }) - (fetchNuGet { - pname = "nlog"; - version = "4.5.10"; - sha256 = "0d4yqxrhqn2k36h3v1f5pn6qqlagbzg67v6gvxqhz3s4zyc3b8rg"; - }) - (fetchNuGet { - pname = "nunit"; - version = "3.11.0"; - sha256 = "0mmc8snwjjmbkhk6cv5c0ha77czzy9bca4q59244rxciw9sxk1cz"; - }) - (fetchNuGet { - pname = "nunit3testadapter"; - version = "3.10.0"; - sha256 = "0ahzfk9y2dq0wl91ll5hss89hqw7la85ndll5030nslizsgm5q2i"; - }) - (fetchNuGet { - pname = "protobuf-net"; - version = "2.4.0"; - sha256 = "106lxm9afga7ihlknyy7mlfplyq40mrndksqrsn8ia2a47fbqqld"; - }) - (fetchNuGet { - pname = "runtime.any.system.collections"; - version = "4.3.0"; - sha256 = "0bv5qgm6vr47ynxqbnkc7i797fdi8gbjjxii173syrx14nmrkwg0"; - }) - (fetchNuGet { - pname = "runtime.any.system.diagnostics.tracing"; - version = "4.3.0"; - sha256 = "00j6nv2xgmd3bi347k00m7wr542wjlig53rmj28pmw7ddcn97jbn"; - }) - (fetchNuGet { - pname = "runtime.any.system.globalization"; - version = "4.3.0"; - sha256 = "1daqf33hssad94lamzg01y49xwndy2q97i2lrb7mgn28656qia1x"; - }) - (fetchNuGet { - pname = "runtime.any.system.globalization.calendars"; - version = "4.3.0"; - sha256 = "1ghhhk5psqxcg6w88sxkqrc35bxcz27zbqm2y5p5298pv3v7g201"; - }) - (fetchNuGet { - pname = "runtime.any.system.io"; - version = "4.3.0"; - sha256 = "0l8xz8zn46w4d10bcn3l4yyn4vhb3lrj2zw8llvz7jk14k4zps5x"; - }) - (fetchNuGet { - pname = "runtime.any.system.reflection"; - version = "4.3.0"; - sha256 = "02c9h3y35pylc0zfq3wcsvc5nqci95nrkq0mszifc0sjx7xrzkly"; - }) - (fetchNuGet { - pname = "runtime.any.system.reflection.extensions"; - version = "4.3.0"; - sha256 = "0zyri97dfc5vyaz9ba65hjj1zbcrzaffhsdlpxc9bh09wy22fq33"; - }) - (fetchNuGet { - pname = "runtime.any.system.reflection.primitives"; - version = "4.3.0"; - sha256 = "0x1mm8c6iy8rlxm8w9vqw7gb7s1ljadrn049fmf70cyh42vdfhrf"; - }) - (fetchNuGet { - pname = "runtime.any.system.resources.resourcemanager"; - version = "4.3.0"; - sha256 = "03kickal0iiby82wa5flar18kyv82s9s6d4xhk5h4bi5kfcyfjzl"; - }) - (fetchNuGet { - pname = "runtime.any.system.runtime"; - version = "4.3.0"; - sha256 = "1cqh1sv3h5j7ixyb7axxbdkqx6cxy00p4np4j91kpm492rf4s25b"; - }) - (fetchNuGet { - pname = "runtime.any.system.runtime.handles"; - version = "4.3.0"; - sha256 = "0bh5bi25nk9w9xi8z23ws45q5yia6k7dg3i4axhfqlnj145l011x"; - }) - (fetchNuGet { - pname = "runtime.any.system.runtime.interopservices"; - version = "4.3.0"; - sha256 = "0c3g3g3jmhlhw4klrc86ka9fjbl7i59ds1fadsb2l8nqf8z3kb19"; - }) - (fetchNuGet { - pname = "runtime.any.system.text.encoding"; - version = "4.3.0"; - sha256 = "0aqqi1v4wx51h51mk956y783wzags13wa7mgqyclacmsmpv02ps3"; - }) - (fetchNuGet { - pname = "runtime.any.system.text.encoding.extensions"; - version = "4.3.0"; - sha256 = "0lqhgqi0i8194ryqq6v2gqx0fb86db2gqknbm0aq31wb378j7ip8"; - }) - (fetchNuGet { - pname = "runtime.any.system.threading.tasks"; - version = "4.3.0"; - sha256 = "03mnvkhskbzxddz4hm113zsch1jyzh2cs450dk3rgfjp8crlw1va"; - }) - (fetchNuGet { - pname = "runtime.debian.8-x64.runtime.native.system.security.cryptography.openssl"; - version = "4.3.0"; - sha256 = "16rnxzpk5dpbbl1x354yrlsbvwylrq456xzpsha1n9y3glnhyx9d"; - }) - (fetchNuGet { - pname = "runtime.debian.8-x64.runtime.native.system.security.cryptography.openssl"; - version = "4.3.2"; - sha256 = "0rwpqngkqiapqc5c2cpkj7idhngrgss5qpnqg0yh40mbyflcxf8i"; - }) - (fetchNuGet { - pname = "runtime.fedora.23-x64.runtime.native.system.security.cryptography.openssl"; - version = "4.3.0"; - sha256 = "0hkg03sgm2wyq8nqk6dbm9jh5vcq57ry42lkqdmfklrw89lsmr59"; - }) - (fetchNuGet { - pname = "runtime.fedora.23-x64.runtime.native.system.security.cryptography.openssl"; - version = "4.3.2"; - sha256 = "1n06gxwlinhs0w7s8a94r1q3lwqzvynxwd3mp10ws9bg6gck8n4r"; - }) - (fetchNuGet { - pname = "runtime.fedora.24-x64.runtime.native.system.security.cryptography.openssl"; - version = "4.3.0"; - sha256 = "0c2p354hjx58xhhz7wv6div8xpi90sc6ibdm40qin21bvi7ymcaa"; - }) - (fetchNuGet { - pname = "runtime.fedora.24-x64.runtime.native.system.security.cryptography.openssl"; - version = "4.3.2"; - sha256 = "0404wqrc7f2yc0wxv71y3nnybvqx8v4j9d47hlscxy759a525mc3"; - }) - (fetchNuGet { - pname = "runtime.native.system"; - version = "4.3.0"; - sha256 = "15hgf6zaq9b8br2wi1i3x0zvmk410nlmsmva9p0bbg73v6hml5k4"; - }) - (fetchNuGet { - pname = "runtime.native.system.net.http"; - version = "4.3.0"; - sha256 = "1n6rgz5132lcibbch1qlf0g9jk60r0kqv087hxc0lisy50zpm7kk"; - }) - (fetchNuGet { - pname = "runtime.native.system.net.security"; - version = "4.3.0"; - sha256 = "0dnqjhw445ay3chpia9p6vy4w2j6s9vy3hxszqvdanpvvyaxijr3"; - }) - (fetchNuGet { - pname = "runtime.native.system.security.cryptography.apple"; - version = "4.3.0"; - sha256 = "1b61p6gw1m02cc1ry996fl49liiwky6181dzr873g9ds92zl326q"; - }) - (fetchNuGet { - pname = "runtime.native.system.security.cryptography.openssl"; - version = "4.3.0"; - sha256 = "18pzfdlwsg2nb1jjjjzyb5qlgy6xjxzmhnfaijq5s2jw3cm3ab97"; - }) - (fetchNuGet { - pname = "runtime.native.system.security.cryptography.openssl"; - version = "4.3.2"; - sha256 = "0zy5r25jppz48i2bkg8b9lfig24xixg6nm3xyr1379zdnqnpm8f6"; - }) - (fetchNuGet { - pname = "runtime.opensuse.13.2-x64.runtime.native.system.security.cryptography.openssl"; - version = "4.3.0"; - sha256 = "0qyynf9nz5i7pc26cwhgi8j62ps27sqmf78ijcfgzab50z9g8ay3"; - }) - (fetchNuGet { - pname = "runtime.opensuse.13.2-x64.runtime.native.system.security.cryptography.openssl"; - version = "4.3.2"; - sha256 = "096ch4n4s8k82xga80lfmpimpzahd2ip1mgwdqgar0ywbbl6x438"; - }) - (fetchNuGet { - pname = "runtime.opensuse.42.1-x64.runtime.native.system.security.cryptography.openssl"; - version = "4.3.0"; - sha256 = "1klrs545awhayryma6l7g2pvnp9xy4z0r1i40r80zb45q3i9nbyf"; - }) - (fetchNuGet { - pname = "runtime.opensuse.42.1-x64.runtime.native.system.security.cryptography.openssl"; - version = "4.3.2"; - sha256 = "1dm8fifl7rf1gy7lnwln78ch4rw54g0pl5g1c189vawavll7p6rj"; - }) - (fetchNuGet { - pname = "runtime.osx.10.10-x64.runtime.native.system.security.cryptography.apple"; - version = "4.3.0"; - sha256 = "10yc8jdrwgcl44b4g93f1ds76b176bajd3zqi2faf5rvh1vy9smi"; - }) - (fetchNuGet { - pname = "runtime.osx.10.10-x64.runtime.native.system.security.cryptography.openssl"; - version = "4.3.0"; - sha256 = "0zcxjv5pckplvkg0r6mw3asggm7aqzbdjimhvsasb0cgm59x09l3"; - }) - (fetchNuGet { - pname = "runtime.osx.10.10-x64.runtime.native.system.security.cryptography.openssl"; - version = "4.3.2"; - sha256 = "1m9z1k9kzva9n9kwinqxl97x2vgl79qhqjlv17k9s2ymcyv2bwr6"; - }) - (fetchNuGet { - pname = "runtime.rhel.7-x64.runtime.native.system.security.cryptography.openssl"; - version = "4.3.0"; - sha256 = "0vhynn79ih7hw7cwjazn87rm9z9fj0rvxgzlab36jybgcpcgphsn"; - }) - (fetchNuGet { - pname = "runtime.rhel.7-x64.runtime.native.system.security.cryptography.openssl"; - version = "4.3.2"; - sha256 = "1cpx56mcfxz7cpn57wvj18sjisvzq8b5vd9rw16ihd2i6mcp3wa1"; - }) - (fetchNuGet { - pname = "runtime.ubuntu.14.04-x64.runtime.native.system.security.cryptography.openssl"; - version = "4.3.0"; - sha256 = "160p68l2c7cqmyqjwxydcvgw7lvl1cr0znkw8fp24d1by9mqc8p3"; - }) - (fetchNuGet { - pname = "runtime.ubuntu.14.04-x64.runtime.native.system.security.cryptography.openssl"; - version = "4.3.2"; - sha256 = "15gsm1a8jdmgmf8j5v1slfz8ks124nfdhk2vxs2rw3asrxalg8hi"; - }) - (fetchNuGet { - pname = "runtime.ubuntu.16.04-x64.runtime.native.system.security.cryptography.openssl"; - version = "4.3.0"; - sha256 = "15zrc8fgd8zx28hdghcj5f5i34wf3l6bq5177075m2bc2j34jrqy"; - }) - (fetchNuGet { - pname = "runtime.ubuntu.16.04-x64.runtime.native.system.security.cryptography.openssl"; - version = "4.3.2"; - sha256 = "0q0n5q1r1wnqmr5i5idsrd9ywl33k0js4pngkwq9p368mbxp8x1w"; - }) - (fetchNuGet { - pname = "runtime.ubuntu.16.10-x64.runtime.native.system.security.cryptography.openssl"; - version = "4.3.0"; - sha256 = "1p4dgxax6p7rlgj4q73k73rslcnz4wdcv8q2flg1s8ygwcm58ld5"; - }) - (fetchNuGet { - pname = "runtime.ubuntu.16.10-x64.runtime.native.system.security.cryptography.openssl"; - version = "4.3.2"; - sha256 = "1x0g58pbpjrmj2x2qw17rdwwnrcl0wvim2hdwz48lixvwvp22n9c"; - }) - (fetchNuGet { - pname = "runtime.unix.microsoft.win32.primitives"; - version = "4.3.0"; - sha256 = "0y61k9zbxhdi0glg154v30kkq7f8646nif8lnnxbvkjpakggd5id"; - }) - (fetchNuGet { - pname = "runtime.unix.system.diagnostics.debug"; - version = "4.3.0"; - sha256 = "1lps7fbnw34bnh3lm31gs5c0g0dh7548wfmb8zz62v0zqz71msj5"; - }) - (fetchNuGet { - pname = "runtime.unix.system.io.filesystem"; - version = "4.3.0"; - sha256 = "14nbkhvs7sji5r1saj2x8daz82rnf9kx28d3v2qss34qbr32dzix"; - }) - (fetchNuGet { - pname = "runtime.unix.system.net.primitives"; - version = "4.3.0"; - sha256 = "0bdnglg59pzx9394sy4ic66kmxhqp8q8bvmykdxcbs5mm0ipwwm4"; - }) - (fetchNuGet { - pname = "runtime.unix.system.private.uri"; - version = "4.3.0"; - sha256 = "1jx02q6kiwlvfksq1q9qr17fj78y5v6mwsszav4qcz9z25d5g6vk"; - }) - (fetchNuGet { - pname = "runtime.unix.system.runtime.extensions"; - version = "4.3.0"; - sha256 = "0pnxxmm8whx38dp6yvwgmh22smknxmqs5n513fc7m4wxvs1bvi4p"; - }) - (fetchNuGet { - pname = "system.buffers"; - version = "4.3.0"; - sha256 = "0fgns20ispwrfqll4q1zc1waqcmylb3zc50ys9x8zlwxh9pmd9jy"; - }) - (fetchNuGet { - pname = "system.collections"; - version = "4.3.0"; - sha256 = "19r4y64dqyrq6k4706dnyhhw7fs24kpp3awak7whzss39dakpxk9"; - }) - (fetchNuGet { - pname = "system.collections.concurrent"; - version = "4.3.0"; - sha256 = "0wi10md9aq33jrkh2c24wr2n9hrpyamsdhsxdcnf43b7y86kkii8"; - }) - (fetchNuGet { - pname = "system.diagnostics.debug"; - version = "4.3.0"; - sha256 = "00yjlf19wjydyr6cfviaph3vsjzg3d5nvnya26i2fvfg53sknh3y"; - }) - (fetchNuGet { - pname = "system.diagnostics.diagnosticsource"; - version = "4.3.0"; - sha256 = "0z6m3pbiy0qw6rn3n209rrzf9x1k4002zh90vwcrsym09ipm2liq"; - }) - (fetchNuGet { - pname = "system.diagnostics.tracing"; - version = "4.3.0"; - sha256 = "1m3bx6c2s958qligl67q7grkwfz3w53hpy7nc97mh6f7j5k168c4"; - }) - (fetchNuGet { - pname = "system.globalization"; - version = "4.3.0"; - sha256 = "1cp68vv683n6ic2zqh2s1fn4c2sd87g5hpp6l4d4nj4536jz98ki"; - }) - (fetchNuGet { - pname = "system.globalization.calendars"; - version = "4.3.0"; - sha256 = "1xwl230bkakzzkrggy1l1lxmm3xlhk4bq2pkv790j5lm8g887lxq"; - }) - (fetchNuGet { - pname = "system.globalization.extensions"; - version = "4.3.0"; - sha256 = "02a5zfxavhv3jd437bsncbhd2fp1zv4gxzakp1an9l6kdq1mcqls"; - }) - (fetchNuGet { - pname = "system.io"; - version = "4.3.0"; - sha256 = "05l9qdrzhm4s5dixmx68kxwif4l99ll5gqmh7rqgw554fx0agv5f"; - }) - (fetchNuGet { - pname = "system.io.filesystem"; - version = "4.3.0"; - sha256 = "0z2dfrbra9i6y16mm9v1v6k47f0fm617vlb7s5iybjjsz6g1ilmw"; - }) - (fetchNuGet { - pname = "system.io.filesystem.primitives"; - version = "4.3.0"; - sha256 = "0j6ndgglcf4brg2lz4wzsh1av1gh8xrzdsn9f0yznskhqn1xzj9c"; - }) - (fetchNuGet { - pname = "system.linq"; - version = "4.3.0"; - sha256 = "1w0gmba695rbr80l1k2h4mrwzbzsyfl2z4klmpbsvsg5pm4a56s7"; - }) - (fetchNuGet { - pname = "system.net.http"; - version = "4.3.4"; - sha256 = "0kdp31b8819v88l719j6my0yas6myv9d1viql3qz5577mv819jhl"; - }) - (fetchNuGet { - pname = "system.net.primitives"; - version = "4.3.0"; - sha256 = "0c87k50rmdgmxx7df2khd9qj7q35j9rzdmm2572cc55dygmdk3ii"; - }) - (fetchNuGet { - pname = "system.net.requests"; - version = "4.3.0"; - sha256 = "0pcznmwqqk0qzp0gf4g4xw7arhb0q8v9cbzh3v8h8qp6rjcr339a"; - }) - (fetchNuGet { - pname = "system.net.security"; - version = "4.3.2"; - sha256 = "1aw1ca1vssqrillrh4qkarx0lxwc8wcaqdkfdima8376wb98j2q8"; - }) - (fetchNuGet { - pname = "system.net.webheadercollection"; - version = "4.3.0"; - sha256 = "0ms3ddjv1wn8sqa5qchm245f3vzzif6l6fx5k92klqpn7zf4z562"; - }) - (fetchNuGet { - pname = "system.private.servicemodel"; - version = "4.5.3"; - sha256 = "0nyw9m9dj327hn0qb0jmgwpch0f40jv301fk4mrchga8g99xbpng"; - }) - (fetchNuGet { - pname = "system.private.uri"; - version = "4.3.0"; - sha256 = "04r1lkdnsznin0fj4ya1zikxiqr0h6r6a1ww2dsm60gqhdrf0mvx"; - }) - (fetchNuGet { - pname = "system.reflection"; - version = "4.3.0"; - sha256 = "0xl55k0mw8cd8ra6dxzh974nxif58s3k1rjv1vbd7gjbjr39j11m"; - }) - (fetchNuGet { - pname = "system.reflection.dispatchproxy"; - version = "4.5.0"; - sha256 = "0v9sg38h91aljvjyc77m1y5v34p50hjdbxvvxwa1whlajhafadcn"; - }) - (fetchNuGet { - pname = "system.reflection.emit"; - version = "4.3.0"; - sha256 = "11f8y3qfysfcrscjpjym9msk7lsfxkk4fmz9qq95kn3jd0769f74"; - }) - (fetchNuGet { - pname = "system.reflection.emit.ilgeneration"; - version = "4.3.0"; - sha256 = "0w1n67glpv8241vnpz1kl14sy7zlnw414aqwj4hcx5nd86f6994q"; - }) - (fetchNuGet { - pname = "system.reflection.emit.lightweight"; - version = "4.3.0"; - sha256 = "0ql7lcakycrvzgi9kxz1b3lljd990az1x6c4jsiwcacrvimpib5c"; - }) - (fetchNuGet { - pname = "system.reflection.extensions"; - version = "4.3.0"; - sha256 = "02bly8bdc98gs22lqsfx9xicblszr2yan7v2mmw3g7hy6miq5hwq"; - }) - (fetchNuGet { - pname = "system.reflection.primitives"; - version = "4.3.0"; - sha256 = "04xqa33bld78yv5r93a8n76shvc8wwcdgr1qvvjh959g3rc31276"; - }) - (fetchNuGet { - pname = "system.reflection.typeextensions"; - version = "4.4.0"; - sha256 = "0n9r1w4lp2zmadyqkgp4sk9wy90sj4ygq4dh7kzamx26i9biys5h"; - }) - (fetchNuGet { - pname = "system.resources.resourcemanager"; - version = "4.3.0"; - sha256 = "0sjqlzsryb0mg4y4xzf35xi523s4is4hz9q4qgdvlvgivl7qxn49"; - }) - (fetchNuGet { - pname = "system.runtime"; - version = "4.3.0"; - sha256 = "066ixvgbf2c929kgknshcxqj6539ax7b9m570cp8n179cpfkapz7"; - }) - (fetchNuGet { - pname = "system.runtime.extensions"; - version = "4.3.0"; - sha256 = "1ykp3dnhwvm48nap8q23893hagf665k0kn3cbgsqpwzbijdcgc60"; - }) - (fetchNuGet { - pname = "system.runtime.handles"; - version = "4.3.0"; - sha256 = "0sw2gfj2xr7sw9qjn0j3l9yw07x73lcs97p8xfc9w1x9h5g5m7i8"; - }) - (fetchNuGet { - pname = "system.runtime.interopservices"; - version = "4.3.0"; - sha256 = "00hywrn4g7hva1b2qri2s6rabzwgxnbpw9zfxmz28z09cpwwgh7j"; - }) - (fetchNuGet { - pname = "system.runtime.numerics"; - version = "4.3.0"; - sha256 = "19rav39sr5dky7afygh309qamqqmi9kcwvz3i0c5700v0c5cg61z"; - }) - (fetchNuGet { - pname = "system.security.claims"; - version = "4.3.0"; - sha256 = "0jvfn7j22l3mm28qjy3rcw287y9h65ha4m940waaxah07jnbzrhn"; - }) - (fetchNuGet { - pname = "system.security.cryptography.algorithms"; - version = "4.3.0"; - sha256 = "03sq183pfl5kp7gkvq77myv7kbpdnq3y0xj7vi4q1kaw54sny0ml"; - }) - (fetchNuGet { - pname = "system.security.cryptography.cng"; - version = "4.3.0"; - sha256 = "1k468aswafdgf56ab6yrn7649kfqx2wm9aslywjam1hdmk5yypmv"; - }) - (fetchNuGet { - pname = "system.security.cryptography.csp"; - version = "4.3.0"; - sha256 = "1x5wcrddf2s3hb8j78cry7yalca4lb5vfnkrysagbn6r9x6xvrx1"; - }) - (fetchNuGet { - pname = "system.security.cryptography.encoding"; - version = "4.3.0"; - sha256 = "1jr6w70igqn07k5zs1ph6xja97hxnb3mqbspdrff6cvssgrixs32"; - }) - (fetchNuGet { - pname = "system.security.cryptography.openssl"; - version = "4.3.0"; - sha256 = "0givpvvj8yc7gv4lhb6s1prq6p2c4147204a0wib89inqzd87gqc"; - }) - (fetchNuGet { - pname = "system.security.cryptography.primitives"; - version = "4.3.0"; - sha256 = "0pyzncsv48zwly3lw4f2dayqswcfvdwq2nz0dgwmi7fj3pn64wby"; - }) - (fetchNuGet { - pname = "system.security.cryptography.x509certificates"; - version = "4.3.0"; - sha256 = "0valjcz5wksbvijylxijjxb1mp38mdhv03r533vnx1q3ikzdav9h"; - }) - (fetchNuGet { - pname = "system.security.principal"; - version = "4.3.0"; - sha256 = "12cm2zws06z4lfc4dn31iqv7072zyi4m910d4r6wm8yx85arsfxf"; - }) - (fetchNuGet { - pname = "system.security.principal.windows"; - version = "4.5.0"; - sha256 = "0rmj89wsl5yzwh0kqjgx45vzf694v9p92r4x4q6yxldk1cv1hi86"; - }) - (fetchNuGet { - pname = "system.servicemodel.primitives"; - version = "4.5.3"; - sha256 = "1v90pci049cn44y0km885k1vrilhb34w6q2zva4y6f3ay84klrih"; - }) - (fetchNuGet { - pname = "system.text.encoding"; - version = "4.3.0"; - sha256 = "1f04lkir4iladpp51sdgmis9dj4y8v08cka0mbmsy0frc9a4gjqr"; - }) - (fetchNuGet { - pname = "system.text.encoding.extensions"; - version = "4.3.0"; - sha256 = "11q1y8hh5hrp5a3kw25cb6l00v5l5dvirkz8jr3sq00h1xgcgrxy"; - }) - (fetchNuGet { - pname = "system.text.regularexpressions"; - version = "4.3.0"; - sha256 = "1bgq51k7fwld0njylfn7qc5fmwrk2137gdq7djqdsw347paa9c2l"; - }) - (fetchNuGet { - pname = "system.threading"; - version = "4.3.0"; - sha256 = "0rw9wfamvhayp5zh3j7p1yfmx9b5khbf4q50d8k5rk993rskfd34"; - }) - (fetchNuGet { - pname = "system.threading.tasks"; - version = "4.3.0"; - sha256 = "134z3v9abw3a6jsw17xl3f6hqjpak5l682k2vz39spj4kmydg6k7"; - }) - (fetchNuGet { - pname = "system.threading.tasks.extensions"; - version = "4.3.0"; - sha256 = "1xxcx2xh8jin360yjwm4x4cf5y3a2bwpn2ygkfkwkicz7zk50s2z"; - }) - (fetchNuGet { - pname = "system.threading.threadpool"; - version = "4.3.0"; - sha256 = "027s1f4sbx0y1xqw2irqn6x161lzj8qwvnh2gn78ciiczdv10vf1"; - }) - (fetchNuGet { - pname = "system.xml.readerwriter"; - version = "4.3.0"; - sha256 = "0c47yllxifzmh8gq6rq6l36zzvw4kjvlszkqa9wq3fr59n0hl3s1"; - }) - (fetchNuGet { - pname = "system.xml.xmldocument"; - version = "4.3.0"; - sha256 = "0bmz1l06dihx52jxjr22dyv5mxv6pj4852lx68grjm7bivhrbfwi"; - }) - (fetchNuGet { - pname = "system.xml.xmlserializer"; - version = "4.3.0"; - sha256 = "07pa4sx196vxkgl3csvdmw94nydlsm9ir38xxcs84qjn8cycd912"; - }) - (fetchNuGet { - pname = "yamldotnet"; - version = "5.2.1"; - sha256 = "0nb34qcdhs5qn4783idg28f2kr89vaiyjn4v2barhv7i75zhym6y"; - }) +{ fetchNuGet }: [ + (fetchNuGet { pname = "CompareNETObjects"; version = "4.65.0"; sha256 = "09p4xs6f7y8dykxx369ycp7z0jl7ai9bx23nazn8yxs5s38d9x2g"; }) + (fetchNuGet { pname = "ConfigureAwaitChecker.Analyzer"; version = "4.0.0"; sha256 = "013pzi7f4hf68wjswg0pzamjjsj63rl6jr1ivpd15v86y7vs6r9g"; }) + (fetchNuGet { pname = "Esprima"; version = "2.1.2"; sha256 = "15gvrak3qqm7s943nx7fzpsjjcjygwvwjjjvypw42gjvj8pcywaq"; }) + (fetchNuGet { pname = "EventStore.Client"; version = "21.2.0"; sha256 = "1crnk0nbwcz4l2dv3ia96skmfn274nbyh5j1p0g9rjbzyy7kzf5j"; }) + (fetchNuGet { pname = "EventStore.Plugins"; version = "21.2.0"; sha256 = "0fn2c2xi6yrwznnff3xpkhv5z5rnpka6wsaq1hb1jpxlxfscp670"; }) + (fetchNuGet { pname = "GitHubActionsTestLogger"; version = "1.2.0"; sha256 = "0kndl162zas1ic185v10bm23hmrai54ng7wqlk3sp39gmdqhmyf5"; }) + (fetchNuGet { pname = "GitInfo"; version = "2.0.26"; sha256 = "050l74vkamvbsp8f02b8aknizcknk4fr26dvwvw86mm8iw1dlvrv"; }) + (fetchNuGet { pname = "Google.Protobuf"; version = "3.15.8"; sha256 = "0k7hiijdrjw2y37yadd0jxx6hm4cd969v8svvddhksh6yqwnzh08"; }) + (fetchNuGet { pname = "Grpc.AspNetCore"; version = "2.39.0"; sha256 = "05im3lh8ar47m2zciwykjn6yqh2m4791pfzqr26408027wjm9vya"; }) + (fetchNuGet { pname = "Grpc.AspNetCore.Server"; version = "2.39.0"; sha256 = "17dhi75q2q0ra5n8qp0dlpgq1vqh186hgs3pqda60ya6hyc1fa45"; }) + (fetchNuGet { pname = "Grpc.AspNetCore.Server.ClientFactory"; version = "2.39.0"; sha256 = "0n21bfk1gabqpy9wpyzrzmilz4p8r1b4h0nq9waiqphkbv8g6frh"; }) + (fetchNuGet { pname = "Grpc.Core"; version = "2.39.1"; sha256 = "1c302krbhy063lpd52mgg9xx9ripp17314mfhym78r1q3nwrp15l"; }) + (fetchNuGet { pname = "Grpc.Core.Api"; version = "2.39.1"; sha256 = "014b57zhflycsvdc2gmyv2a1vji7qzj1c7l4d1vgksb3ndwaxzrx"; }) + (fetchNuGet { pname = "Grpc.Net.Client"; version = "2.39.0"; sha256 = "0km3zlkm3yq14yzcyq9g62i7a9qfihg1mczhbm6g8v5xkwbf667l"; }) + (fetchNuGet { pname = "Grpc.Net.ClientFactory"; version = "2.39.0"; sha256 = "115iky8qcazzl993mdf34v6hxzvhk9mpnk7kgxlw4cc1cf0iv16q"; }) + (fetchNuGet { pname = "Grpc.Net.Common"; version = "2.39.0"; sha256 = "19mghqpgvr5slnlmjvv8hxhq3v9wq7bzab3bcg2b7623z0yxylr4"; }) + (fetchNuGet { pname = "Grpc.Tools"; version = "2.39.1"; sha256 = "1i5x4sm4rqfs8hc3vgwj05nlhqf0zx9vp72na65z2xyfabc0ybgc"; }) + (fetchNuGet { pname = "HdrHistogram"; version = "2.5.0"; sha256 = "1s2np7m3pp17rgambax9a3x5pd2grx74cr325q3xapjz2gd58sj1"; }) + (fetchNuGet { pname = "HostStat.NET"; version = "1.0.2"; sha256 = "1khxpp1fy36njjcmikr0xnxk7zv9d3rcnm6f7x2s94agins23hg7"; }) + (fetchNuGet { pname = "Jint"; version = "3.0.0-beta-2038"; sha256 = "0gnp5pqsxd9lr7b4i73mpq5lyq16vzn0pr8rcyvnjjf3fanls8kc"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.linux-x64"; version = "5.0.12"; sha256 = "1asph5v7kgmscfgsyv9gg7cwvg52gnm6m0ldm2m4pfkpsxqyp2mi"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.App.Runtime.osx-x64"; version = "5.0.12"; sha256 = "02kv8xh6xvpav7vqj281321ly1imghxcc18cdgadiq8dwgm87xwp"; }) + (fetchNuGet { pname = "Microsoft.AspNetCore.TestHost"; version = "5.0.6"; sha256 = "1ps8pdsarm92gxp6ys0haw562v0hk7xvrkqhlm2vy55jghnc58wz"; }) + (fetchNuGet { pname = "Microsoft.CodeCoverage"; version = "16.9.1"; sha256 = "18isx8w4kwnlk6hq5ay8i4lgzwhx0zg9brayfdk2lakagvv6yyaf"; }) + (fetchNuGet { pname = "Microsoft.CSharp"; version = "4.0.1"; sha256 = "0zxc0apx1gcx361jlq8smc9pfdgmyjh6hpka8dypc9w23nlsh6yj"; }) + (fetchNuGet { pname = "Microsoft.CSharp"; version = "4.7.0"; sha256 = "0gd67zlw554j098kabg887b5a6pq9kzavpa3jjy5w53ccjzjfy8j"; }) + (fetchNuGet { pname = "Microsoft.Diagnostics.NETCore.Client"; version = "0.2.61701"; sha256 = "1ic1607jj4ln8dbibf1fz5v9svk9x2kqlgvhndc6ijaqnbc4wcr1"; }) + (fetchNuGet { pname = "Microsoft.Diagnostics.Tracing.TraceEvent"; version = "2.0.57"; sha256 = "15km2b3dmlbivi9cja26ml70vkssm7xal40gym799lxzi9406xbp"; }) + (fetchNuGet { pname = "Microsoft.DotNet.InternalAbstractions"; version = "1.0.0"; sha256 = "0mp8ihqlb7fsa789frjzidrfjc1lrhk88qp3xm5qvr7vf4wy4z8x"; }) + (fetchNuGet { pname = "Microsoft.DotNet.PlatformAbstractions"; version = "2.0.4"; sha256 = "1fdzln4im9hb55agzwchbfgm3vmngigmbpci5j89b0gqcxixmv8j"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Configuration"; version = "2.0.0"; sha256 = "0yssxq9di5h6xw2cayp5hj3l9b2p0jw9wcjz73rwk4586spac9s9"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Configuration"; version = "3.0.3"; sha256 = "0fiwv35628rzkpixpbqcj8ln4c0hnwhr3is8ha38a9pdzlrs6zx8"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Configuration"; version = "3.1.5"; sha256 = "1i7zm8ghgxwp655anyfm910qm7rcpvrz48fxjyzw9w63hj4sv6bk"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Abstractions"; version = "2.0.0"; sha256 = "1ilz2yrgg9rbjyhn6a5zh9pr51nmh11z7sixb4p7vivgydj9gxwf"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Abstractions"; version = "3.0.3"; sha256 = "18l6ys6z7j07vf5pa3g0d018dfgk5vb9hf3393cmmh448rpjq41m"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Abstractions"; version = "3.1.5"; sha256 = "03jwqjrfyx11ax19bq84c28qzaiyj4whrx7vayy4hr7sv0p28h8k"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Binder"; version = "2.0.0"; sha256 = "1prvdbma6r18n5agbhhabv6g357p1j70gq4m9g0vs859kf44nrgc"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Binder"; version = "3.0.3"; sha256 = "0zy90kvlvxinwqz38cwj1jmp06a8gar1crdbycjk5wy8d6w5m0br"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Configuration.FileExtensions"; version = "3.1.5"; sha256 = "1aaxj8nl2irwp4278yxbhypgrap5hs24anvy5cs6ifnx5y05sz22"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Configuration.Json"; version = "3.1.5"; sha256 = "19z89zq57gbgd3nqfzdw0k9an2akggzijhzvdrmbfk96gvrlwlzb"; }) + (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection"; version = "3.0.3"; sha256 = "0nd36n0zfqv5l4w4jlbs2smaw0x7lw49aw1wgk3wsyv69s74p3gj"; }) + (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "2.0.0"; sha256 = "1pwrfh9b72k9rq6mb2jab5qhhi225d5rjalzkapiayggmygc8nhz"; }) + (fetchNuGet { pname = "Microsoft.Extensions.DependencyInjection.Abstractions"; version = "3.0.3"; sha256 = "1hyilp5gr19xz7zcyar6h8jpfksqbn5s9kz0qrfqwvqhq2p7sm5g"; }) + (fetchNuGet { pname = "Microsoft.Extensions.DependencyModel"; version = "2.0.4"; sha256 = "041i1vlcibpzgalxxzdk81g5pgmqvmz2g61k0rqa2sky0wpvijx9"; }) + (fetchNuGet { pname = "Microsoft.Extensions.FileProviders.Abstractions"; version = "3.1.5"; sha256 = "112p011ld2x5m565q3gyn1rksxxypwyqkq65krajmxxwv7dvhfh8"; }) + (fetchNuGet { pname = "Microsoft.Extensions.FileProviders.Composite"; version = "3.1.5"; sha256 = "1gznx5yc7v3radgb4zxw58i15kz63mi1y77j7xrql98lwq0gfa79"; }) + (fetchNuGet { pname = "Microsoft.Extensions.FileProviders.Embedded"; version = "3.1.5"; sha256 = "15g4hsk6nqa9nxas6vsxlhw5098jj29c36r5q2gwq5vj0cangpwr"; }) + (fetchNuGet { pname = "Microsoft.Extensions.FileProviders.Physical"; version = "3.1.5"; sha256 = "05x6xr9binr3rgmxrsrjfpddxk484mvhc8wq7g9h8v0kl2plr48d"; }) + (fetchNuGet { pname = "Microsoft.Extensions.FileSystemGlobbing"; version = "3.1.5"; sha256 = "1hip15ixl1l6pmvg6ldfgjcyxpasiwdisrxjlkjlnw87sniw4vax"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Http"; version = "3.0.3"; sha256 = "0glfid82amr4mxjqpq2ar6vhq6wv88sp463yvhg4pravkcrd0611"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Logging"; version = "2.0.0"; sha256 = "1jkwjcq1ld9znz1haazk8ili2g4pzfdp6i7r7rki4hg3jcadn386"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Logging"; version = "3.0.3"; sha256 = "0kyh6bk9iywbdvn29zm1770fwmag58y7c8rfpx886anxs6p9rh61"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "2.0.0"; sha256 = "1x5isi71z02khikzvm7vaschb006pqqrsv86ky1x08a4hir4s43h"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Logging.Abstractions"; version = "3.0.3"; sha256 = "1wj871vl1azasbn2lrzzycvzkk72rvaxywnj193xwv11420b0mjh"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Options"; version = "2.0.0"; sha256 = "0g4zadlg73f507krilhaaa7h0jdga216syrzjlyf5fdk25gxmjqh"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Options"; version = "3.0.3"; sha256 = "0lq433x3z3dhf4w10vrxnqami6xsr6mwasla3qhmfx7yfybgz7y0"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Options.ConfigurationExtensions"; version = "2.0.0"; sha256 = "1isc3rjbzz60f7wbmgcwslx5d10hm5hisnk7v54vfi2bz7132gll"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "2.0.0"; sha256 = "1xppr5jbny04slyjgngxjdm0maxdh47vq481ps944d7jrfs0p3mb"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "2.2.0"; sha256 = "0znah6arbcqari49ymigg3wiy2hgdifz8zsq8vdc3ynnf45r7h0c"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "3.0.3"; sha256 = "08zlr6kl92znj9v2cs1wsjw6s98nxbkwnxk8pccbv0b4c7xhb3pf"; }) + (fetchNuGet { pname = "Microsoft.Extensions.Primitives"; version = "3.1.5"; sha256 = "0n2pk1sy8ikd29282sx4ps9r1wnhzgg4nwmkka9ypjizd8lkkk2m"; }) + (fetchNuGet { pname = "Microsoft.FASTER.Core"; version = "1.9.5"; sha256 = "1vp2644301bsdad0sd20pjqa8lbf1vc8yvd9rkl986h56hgwczsj"; }) + (fetchNuGet { pname = "Microsoft.Net.Http.Headers"; version = "2.2.8"; sha256 = "1s0n68z6v5mbys4jjrd4jdxrrz81iq4dzmmbmxzmlf59769x8rj9"; }) + (fetchNuGet { pname = "Microsoft.NET.Test.Sdk"; version = "16.9.1"; sha256 = "1761mvkp5mwhw150fvazdhh4ybvxpvx05g9znf8n1fqx832wxrw5"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Host.osx-x64"; version = "5.0.12"; sha256 = "0950m6x86jp5dybzakfsp74qzrk4pk8wkazc178v36j14sqmj2zq"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.linux-x64"; version = "5.0.12"; sha256 = "1fdbrjrmjd31y1amp0inlmki9w3fwzv8nz41pqmc943g3cpmyg9f"; }) + (fetchNuGet { pname = "Microsoft.NETCore.App.Runtime.osx-x64"; version = "5.0.12"; sha256 = "0z8l0gzy9dih0mn5a2rknyph1w73y4m03s250wghym1zp6rz910p"; }) + (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.0.1"; sha256 = "01al6cfxp68dscl15z7rxfw9zvhm64dncsw09a1vmdkacsa2v6lr"; }) + (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.1.0"; sha256 = "08vh1r12g6ykjygq5d3vq09zylgb84l63k49jc4v8faw9g93iqqm"; }) + (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "1.1.1"; sha256 = "164wycgng4mi9zqi2pnsf1pq6gccbqvw6ib916mqizgjmd8f44pj"; }) + (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "2.0.0"; sha256 = "1fk2fk2639i7nzy58m9dvpdnzql4vb8yl8vr19r2fp8lmj9w2jr0"; }) + (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "2.1.0"; sha256 = "0nmdnkmwyxj8cp746hs9an57zspqlmqdm55b00i7yk8a22s6akxz"; }) + (fetchNuGet { pname = "Microsoft.NETCore.Platforms"; version = "3.1.0"; sha256 = "1gc1x8f95wk8yhgznkwsg80adk1lc65v9n5rx4yaa4bc5dva0z3j"; }) + (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.0.1"; sha256 = "0ppdkwy6s9p7x9jix3v4402wb171cdiibq7js7i13nxpdky7074p"; }) + (fetchNuGet { pname = "Microsoft.NETCore.Targets"; version = "1.1.0"; sha256 = "193xwf33fbm0ni3idxzbr5fdq3i2dlfgihsac9jj7whj0gd902nh"; }) + (fetchNuGet { pname = "Microsoft.NETFramework.ReferenceAssemblies"; version = "1.0.0"; sha256 = "0na724xhvqm63vq9y18fl9jw9q2v99bdwr353378s5fsi11qzxp9"; }) + (fetchNuGet { pname = "Microsoft.TestPlatform.ObjectModel"; version = "16.8.3"; sha256 = "0szyg2p18w9lhlp52iylrr97w3kdalab089imhc53x1850avddsg"; }) + (fetchNuGet { pname = "Microsoft.TestPlatform.ObjectModel"; version = "16.9.1"; sha256 = "1igpx7ldxqx9fkrbhakd2bybc0dgpvj86zr30vpfj31ncm6lp4id"; }) + (fetchNuGet { pname = "Microsoft.TestPlatform.TestHost"; version = "16.9.1"; sha256 = "1frx5r7l0jd3j6my4s2qas13fkljgfn87a84xk8l7sisafpfsvzp"; }) + (fetchNuGet { pname = "Microsoft.Win32.Primitives"; version = "4.0.1"; sha256 = "1n8ap0cmljbqskxpf8fjzn7kh1vvlndsa75k01qig26mbw97k2q7"; }) + (fetchNuGet { pname = "Microsoft.Win32.Primitives"; version = "4.3.0"; sha256 = "0j0c1wj4ndj21zsgivsc24whiya605603kxrbiw6wkfdync464wq"; }) + (fetchNuGet { pname = "Microsoft.Win32.Registry"; version = "4.0.0"; sha256 = "1spf4m9pikkc19544p29a47qnhcd885klncahz133hbnyqbkmz9k"; }) + (fetchNuGet { pname = "Microsoft.Win32.Registry"; version = "4.3.0"; sha256 = "1gxyzxam8163vk1kb6xzxjj4iwspjsz9zhgn1w9rjzciphaz0ig7"; }) + (fetchNuGet { pname = "Microsoft.Win32.Registry"; version = "4.7.0"; sha256 = "0bx21jjbs7l5ydyw4p6cn07chryxpmchq2nl5pirzz4l3b0q4dgs"; }) + (fetchNuGet { pname = "Microsoft.Win32.SystemEvents"; version = "4.7.0"; sha256 = "0pjll2a62hc576hd4wgyasva0lp733yllmk54n37svz5ac7nfz0q"; }) + (fetchNuGet { pname = "MinVer"; version = "2.3.0"; sha256 = "0h6mhh76jhmf60kyjrw8daxpsvprml814v7a8dc3vf5s1lvn2x4j"; }) + (fetchNuGet { pname = "Mono.Posix.NETStandard"; version = "1.0.0"; sha256 = "0xlja36hwpjm837haq15mjh2prcf68lyrmn72nvgpz8qnf9vappw"; }) + (fetchNuGet { pname = "NETStandard.Library"; version = "2.0.0"; sha256 = "1bc4ba8ahgk15m8k4nd7x406nhi0kwqzbgjk2dmw52ss553xz7iy"; }) + (fetchNuGet { pname = "NETStandard.Library"; version = "2.0.3"; sha256 = "1fn9fxppfcg4jgypp2pmrpr6awl3qz1xmnri0cygpkwvyx27df1y"; }) + (fetchNuGet { pname = "Newtonsoft.Json"; version = "11.0.2"; sha256 = "1784xi44f4k8v1fr696hsccmwpy94bz7kixxqlri98zhcxn406b2"; }) + (fetchNuGet { pname = "Newtonsoft.Json"; version = "9.0.1"; sha256 = "0mcy0i7pnfpqm4pcaiyzzji4g0c8i3a5gjz28rrr28110np8304r"; }) + (fetchNuGet { pname = "NuGet.Frameworks"; version = "5.0.0"; sha256 = "18ijvmj13cwjdrrm52c8fpq021531zaz4mj4b4zapxaqzzxf2qjr"; }) + (fetchNuGet { pname = "NUnit"; version = "3.13.2"; sha256 = "00bkjgarkwbj497da9d7lajala1ns67h1kx53w4bapwkf32jlcvn"; }) + (fetchNuGet { pname = "NUnit3TestAdapter"; version = "3.17.0"; sha256 = "0kxc6z3b8ccdrcyqz88jm5yh5ch9nbg303v67q8sp5hhs8rl8nk6"; }) + (fetchNuGet { pname = "protobuf-net"; version = "2.4.0"; sha256 = "106lxm9afga7ihlknyy7mlfplyq40mrndksqrsn8ia2a47fbqqld"; }) + (fetchNuGet { pname = "runtime.any.System.Collections"; version = "4.3.0"; sha256 = "0bv5qgm6vr47ynxqbnkc7i797fdi8gbjjxii173syrx14nmrkwg0"; }) + (fetchNuGet { pname = "runtime.any.System.Diagnostics.Tools"; version = "4.3.0"; sha256 = "1wl76vk12zhdh66vmagni66h5xbhgqq7zkdpgw21jhxhvlbcl8pk"; }) + (fetchNuGet { pname = "runtime.any.System.Diagnostics.Tracing"; version = "4.3.0"; sha256 = "00j6nv2xgmd3bi347k00m7wr542wjlig53rmj28pmw7ddcn97jbn"; }) + (fetchNuGet { pname = "runtime.any.System.Globalization"; version = "4.3.0"; sha256 = "1daqf33hssad94lamzg01y49xwndy2q97i2lrb7mgn28656qia1x"; }) + (fetchNuGet { pname = "runtime.any.System.Globalization.Calendars"; version = "4.3.0"; sha256 = "1ghhhk5psqxcg6w88sxkqrc35bxcz27zbqm2y5p5298pv3v7g201"; }) + (fetchNuGet { pname = "runtime.any.System.IO"; version = "4.3.0"; sha256 = "0l8xz8zn46w4d10bcn3l4yyn4vhb3lrj2zw8llvz7jk14k4zps5x"; }) + (fetchNuGet { pname = "runtime.any.System.Reflection"; version = "4.3.0"; sha256 = "02c9h3y35pylc0zfq3wcsvc5nqci95nrkq0mszifc0sjx7xrzkly"; }) + (fetchNuGet { pname = "runtime.any.System.Reflection.Extensions"; version = "4.3.0"; sha256 = "0zyri97dfc5vyaz9ba65hjj1zbcrzaffhsdlpxc9bh09wy22fq33"; }) + (fetchNuGet { pname = "runtime.any.System.Reflection.Primitives"; version = "4.3.0"; sha256 = "0x1mm8c6iy8rlxm8w9vqw7gb7s1ljadrn049fmf70cyh42vdfhrf"; }) + (fetchNuGet { pname = "runtime.any.System.Resources.ResourceManager"; version = "4.3.0"; sha256 = "03kickal0iiby82wa5flar18kyv82s9s6d4xhk5h4bi5kfcyfjzl"; }) + (fetchNuGet { pname = "runtime.any.System.Runtime"; version = "4.3.0"; sha256 = "1cqh1sv3h5j7ixyb7axxbdkqx6cxy00p4np4j91kpm492rf4s25b"; }) + (fetchNuGet { pname = "runtime.any.System.Runtime.Handles"; version = "4.3.0"; sha256 = "0bh5bi25nk9w9xi8z23ws45q5yia6k7dg3i4axhfqlnj145l011x"; }) + (fetchNuGet { pname = "runtime.any.System.Runtime.InteropServices"; version = "4.3.0"; sha256 = "0c3g3g3jmhlhw4klrc86ka9fjbl7i59ds1fadsb2l8nqf8z3kb19"; }) + (fetchNuGet { pname = "runtime.any.System.Text.Encoding"; version = "4.3.0"; sha256 = "0aqqi1v4wx51h51mk956y783wzags13wa7mgqyclacmsmpv02ps3"; }) + (fetchNuGet { pname = "runtime.any.System.Text.Encoding.Extensions"; version = "4.3.0"; sha256 = "0lqhgqi0i8194ryqq6v2gqx0fb86db2gqknbm0aq31wb378j7ip8"; }) + (fetchNuGet { pname = "runtime.any.System.Threading.Tasks"; version = "4.3.0"; sha256 = "03mnvkhskbzxddz4hm113zsch1jyzh2cs450dk3rgfjp8crlw1va"; }) + (fetchNuGet { pname = "runtime.any.System.Threading.Timer"; version = "4.3.0"; sha256 = "0aw4phrhwqz9m61r79vyfl5la64bjxj8l34qnrcwb28v49fg2086"; }) + (fetchNuGet { pname = "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "16rnxzpk5dpbbl1x354yrlsbvwylrq456xzpsha1n9y3glnhyx9d"; }) + (fetchNuGet { pname = "runtime.debian.8-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.2"; sha256 = "0rwpqngkqiapqc5c2cpkj7idhngrgss5qpnqg0yh40mbyflcxf8i"; }) + (fetchNuGet { pname = "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0hkg03sgm2wyq8nqk6dbm9jh5vcq57ry42lkqdmfklrw89lsmr59"; }) + (fetchNuGet { pname = "runtime.fedora.23-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.2"; sha256 = "1n06gxwlinhs0w7s8a94r1q3lwqzvynxwd3mp10ws9bg6gck8n4r"; }) + (fetchNuGet { pname = "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0c2p354hjx58xhhz7wv6div8xpi90sc6ibdm40qin21bvi7ymcaa"; }) + (fetchNuGet { pname = "runtime.fedora.24-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.2"; sha256 = "0404wqrc7f2yc0wxv71y3nnybvqx8v4j9d47hlscxy759a525mc3"; }) + (fetchNuGet { pname = "runtime.native.System"; version = "4.0.0"; sha256 = "1ppk69xk59ggacj9n7g6fyxvzmk1g5p4fkijm0d7xqfkig98qrkf"; }) + (fetchNuGet { pname = "runtime.native.System"; version = "4.3.0"; sha256 = "15hgf6zaq9b8br2wi1i3x0zvmk410nlmsmva9p0bbg73v6hml5k4"; }) + (fetchNuGet { pname = "runtime.native.System.Net.Http"; version = "4.3.0"; sha256 = "1n6rgz5132lcibbch1qlf0g9jk60r0kqv087hxc0lisy50zpm7kk"; }) + (fetchNuGet { pname = "runtime.native.System.Security.Cryptography.Apple"; version = "4.3.0"; sha256 = "1b61p6gw1m02cc1ry996fl49liiwky6181dzr873g9ds92zl326q"; }) + (fetchNuGet { pname = "runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "18pzfdlwsg2nb1jjjjzyb5qlgy6xjxzmhnfaijq5s2jw3cm3ab97"; }) + (fetchNuGet { pname = "runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.2"; sha256 = "0zy5r25jppz48i2bkg8b9lfig24xixg6nm3xyr1379zdnqnpm8f6"; }) + (fetchNuGet { pname = "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0qyynf9nz5i7pc26cwhgi8j62ps27sqmf78ijcfgzab50z9g8ay3"; }) + (fetchNuGet { pname = "runtime.opensuse.13.2-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.2"; sha256 = "096ch4n4s8k82xga80lfmpimpzahd2ip1mgwdqgar0ywbbl6x438"; }) + (fetchNuGet { pname = "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "1klrs545awhayryma6l7g2pvnp9xy4z0r1i40r80zb45q3i9nbyf"; }) + (fetchNuGet { pname = "runtime.opensuse.42.1-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.2"; sha256 = "1dm8fifl7rf1gy7lnwln78ch4rw54g0pl5g1c189vawavll7p6rj"; }) + (fetchNuGet { pname = "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.Apple"; version = "4.3.0"; sha256 = "10yc8jdrwgcl44b4g93f1ds76b176bajd3zqi2faf5rvh1vy9smi"; }) + (fetchNuGet { pname = "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0zcxjv5pckplvkg0r6mw3asggm7aqzbdjimhvsasb0cgm59x09l3"; }) + (fetchNuGet { pname = "runtime.osx.10.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.2"; sha256 = "1m9z1k9kzva9n9kwinqxl97x2vgl79qhqjlv17k9s2ymcyv2bwr6"; }) + (fetchNuGet { pname = "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0vhynn79ih7hw7cwjazn87rm9z9fj0rvxgzlab36jybgcpcgphsn"; }) + (fetchNuGet { pname = "runtime.rhel.7-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.2"; sha256 = "1cpx56mcfxz7cpn57wvj18sjisvzq8b5vd9rw16ihd2i6mcp3wa1"; }) + (fetchNuGet { pname = "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "160p68l2c7cqmyqjwxydcvgw7lvl1cr0znkw8fp24d1by9mqc8p3"; }) + (fetchNuGet { pname = "runtime.ubuntu.14.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.2"; sha256 = "15gsm1a8jdmgmf8j5v1slfz8ks124nfdhk2vxs2rw3asrxalg8hi"; }) + (fetchNuGet { pname = "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "15zrc8fgd8zx28hdghcj5f5i34wf3l6bq5177075m2bc2j34jrqy"; }) + (fetchNuGet { pname = "runtime.ubuntu.16.04-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.2"; sha256 = "0q0n5q1r1wnqmr5i5idsrd9ywl33k0js4pngkwq9p368mbxp8x1w"; }) + (fetchNuGet { pname = "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "1p4dgxax6p7rlgj4q73k73rslcnz4wdcv8q2flg1s8ygwcm58ld5"; }) + (fetchNuGet { pname = "runtime.ubuntu.16.10-x64.runtime.native.System.Security.Cryptography.OpenSsl"; version = "4.3.2"; sha256 = "1x0g58pbpjrmj2x2qw17rdwwnrcl0wvim2hdwz48lixvwvp22n9c"; }) + (fetchNuGet { pname = "runtime.unix.Microsoft.Win32.Primitives"; version = "4.3.0"; sha256 = "0y61k9zbxhdi0glg154v30kkq7f8646nif8lnnxbvkjpakggd5id"; }) + (fetchNuGet { pname = "runtime.unix.System.Console"; version = "4.3.0"; sha256 = "1pfpkvc6x2if8zbdzg9rnc5fx51yllprl8zkm5npni2k50lisy80"; }) + (fetchNuGet { pname = "runtime.unix.System.Diagnostics.Debug"; version = "4.3.0"; sha256 = "1lps7fbnw34bnh3lm31gs5c0g0dh7548wfmb8zz62v0zqz71msj5"; }) + (fetchNuGet { pname = "runtime.unix.System.IO.FileSystem"; version = "4.3.0"; sha256 = "14nbkhvs7sji5r1saj2x8daz82rnf9kx28d3v2qss34qbr32dzix"; }) + (fetchNuGet { pname = "runtime.unix.System.Net.Primitives"; version = "4.3.0"; sha256 = "0bdnglg59pzx9394sy4ic66kmxhqp8q8bvmykdxcbs5mm0ipwwm4"; }) + (fetchNuGet { pname = "runtime.unix.System.Private.Uri"; version = "4.3.0"; sha256 = "1jx02q6kiwlvfksq1q9qr17fj78y5v6mwsszav4qcz9z25d5g6vk"; }) + (fetchNuGet { pname = "runtime.unix.System.Runtime.Extensions"; version = "4.3.0"; sha256 = "0pnxxmm8whx38dp6yvwgmh22smknxmqs5n513fc7m4wxvs1bvi4p"; }) + (fetchNuGet { pname = "Serilog"; version = "2.0.0"; sha256 = "194c39cwribx7p2sic0w8hjmc83194bc985kl7aqpmljfz376gsc"; }) + (fetchNuGet { pname = "Serilog"; version = "2.10.0"; sha256 = "08bih205i632ywryn3zxkhb15dwgyaxbhmm1z3b5nmby9fb25k7v"; }) + (fetchNuGet { pname = "Serilog"; version = "2.9.0"; sha256 = "0z0ib82w9b229a728bbyhzc2hnlbl0ki7nnvmgnv3l741f2vr4i6"; }) + (fetchNuGet { pname = "Serilog.Enrichers.Process"; version = "2.0.1"; sha256 = "1zmc5g9paqbvw84cjp8i12z174ac078m44l89qwwm4k5a6m3w57g"; }) + (fetchNuGet { pname = "Serilog.Enrichers.Thread"; version = "3.1.0"; sha256 = "1y75aiv2k1sxnh012ixkx92fq1yl8srqggy8l439igg4p223hcqi"; }) + (fetchNuGet { pname = "Serilog.Expressions"; version = "3.2.0"; sha256 = "1bdmi5267racf4fjwgliysmim8crjaga63082xlqq3bgi9sb5m4n"; }) + (fetchNuGet { pname = "Serilog.Extensions.Logging"; version = "3.0.1"; sha256 = "069qy7dm5nxb372ij112ppa6m99b4iaimj3sji74m659fwrcrl9a"; }) + (fetchNuGet { pname = "Serilog.Filters.Expressions"; version = "2.1.0"; sha256 = "0pwlcisijbkdhgab2k4vwjqimminxnkzgdrxvq7pz5ba2brsy28l"; }) + (fetchNuGet { pname = "Serilog.Settings.Configuration"; version = "3.1.0"; sha256 = "1cj5am4n073331gbfm2ylqb9cadl4q3ppzgwmm5c8m1drxpiwkb5"; }) + (fetchNuGet { pname = "Serilog.Sinks.Async"; version = "1.4.0"; sha256 = "00kqrn3xmfzg469y155vihsiby8dbbs382fi6qg8p2zg3i5dih1d"; }) + (fetchNuGet { pname = "Serilog.Sinks.Console"; version = "3.1.1"; sha256 = "0j99as641y1k6havwwkhyr0n08vibiblmfjj6nz051mz8g3864fn"; }) + (fetchNuGet { pname = "Serilog.Sinks.File"; version = "4.1.0"; sha256 = "1ry7p9hf1zlnai1j5zjhjp4dqm2agsbpq6cvxgpf5l8m26x6mgca"; }) + (fetchNuGet { pname = "Serilog.Sinks.TextWriter"; version = "2.1.0"; sha256 = "0p13m8spj6psybwdw21gjaxw854va8n6m2rbdy0w78q135br1kcd"; }) + (fetchNuGet { pname = "Superpower"; version = "2.3.0"; sha256 = "0bdsc3c0d6jb0wr67siqfba0ldl0jxbwis6xr0whzqzf6m2cyahm"; }) + (fetchNuGet { pname = "System.AppContext"; version = "4.1.0"; sha256 = "0fv3cma1jp4vgj7a8hqc9n7hr1f1kjp541s6z0q1r6nazb4iz9mz"; }) + (fetchNuGet { pname = "System.Buffers"; version = "4.3.0"; sha256 = "0fgns20ispwrfqll4q1zc1waqcmylb3zc50ys9x8zlwxh9pmd9jy"; }) + (fetchNuGet { pname = "System.Buffers"; version = "4.4.0"; sha256 = "183f8063w8zqn99pv0ni0nnwh7fgx46qzxamwnans55hhs2l0g19"; }) + (fetchNuGet { pname = "System.Buffers"; version = "4.5.0"; sha256 = "1ywfqn4md6g3iilpxjn5dsr0f5lx6z0yvhqp4pgjcamygg73cz2c"; }) + (fetchNuGet { pname = "System.Collections"; version = "4.0.11"; sha256 = "1ga40f5lrwldiyw6vy67d0sg7jd7ww6kgwbksm19wrvq9hr0bsm6"; }) + (fetchNuGet { pname = "System.Collections"; version = "4.3.0"; sha256 = "19r4y64dqyrq6k4706dnyhhw7fs24kpp3awak7whzss39dakpxk9"; }) + (fetchNuGet { pname = "System.Collections.Concurrent"; version = "4.3.0"; sha256 = "0wi10md9aq33jrkh2c24wr2n9hrpyamsdhsxdcnf43b7y86kkii8"; }) + (fetchNuGet { pname = "System.Collections.NonGeneric"; version = "4.3.0"; sha256 = "07q3k0hf3mrcjzwj8fwk6gv3n51cb513w4mgkfxzm3i37sc9kz7k"; }) + (fetchNuGet { pname = "System.Collections.Specialized"; version = "4.3.0"; sha256 = "1sdwkma4f6j85m3dpb53v9vcgd0zyc9jb33f8g63byvijcj39n20"; }) + (fetchNuGet { pname = "System.ComponentModel"; version = "4.3.0"; sha256 = "0986b10ww3nshy30x9sjyzm0jx339dkjxjj3401r3q0f6fx2wkcb"; }) + (fetchNuGet { pname = "System.ComponentModel.Composition"; version = "4.7.0"; sha256 = "04gc3fcjbwpspd0rsgpr0b938rh4yzblh30lvh6m78kjxgid0nlg"; }) + (fetchNuGet { pname = "System.ComponentModel.EventBasedAsync"; version = "4.3.0"; sha256 = "1rv9bkb8yyhqqqrx6x95njv6mdxlbvv527b44mrd93g8fmgkifl7"; }) + (fetchNuGet { pname = "System.ComponentModel.Primitives"; version = "4.3.0"; sha256 = "1svfmcmgs0w0z9xdw2f2ps05rdxmkxxhf0l17xk9l1l8xfahkqr0"; }) + (fetchNuGet { pname = "System.ComponentModel.TypeConverter"; version = "4.3.0"; sha256 = "17ng0p7v3nbrg3kycz10aqrrlw4lz9hzhws09pfh8gkwicyy481x"; }) + (fetchNuGet { pname = "System.Configuration.ConfigurationManager"; version = "4.7.0"; sha256 = "0pav0n21ghf2ax6fiwjbng29f27wkb4a2ddma0cqx04s97yyk25d"; }) + (fetchNuGet { pname = "System.Console"; version = "4.3.0"; sha256 = "1flr7a9x920mr5cjsqmsy9wgnv3lvd0h1g521pdr1lkb2qycy7ay"; }) + (fetchNuGet { pname = "System.Diagnostics.Debug"; version = "4.0.11"; sha256 = "0gmjghrqmlgzxivd2xl50ncbglb7ljzb66rlx8ws6dv8jm0d5siz"; }) + (fetchNuGet { pname = "System.Diagnostics.Debug"; version = "4.3.0"; sha256 = "00yjlf19wjydyr6cfviaph3vsjzg3d5nvnya26i2fvfg53sknh3y"; }) + (fetchNuGet { pname = "System.Diagnostics.DiagnosticSource"; version = "4.3.0"; sha256 = "0z6m3pbiy0qw6rn3n209rrzf9x1k4002zh90vwcrsym09ipm2liq"; }) + (fetchNuGet { pname = "System.Diagnostics.PerformanceCounter"; version = "4.7.0"; sha256 = "1m00cf40rmfphd5l19wis571yygwbwgyxnhp4ya4bv1130lagil1"; }) + (fetchNuGet { pname = "System.Diagnostics.Process"; version = "4.1.0"; sha256 = "061lrcs7xribrmq7kab908lww6kn2xn1w3rdc41q189y0jibl19s"; }) + (fetchNuGet { pname = "System.Diagnostics.Process"; version = "4.3.0"; sha256 = "0g4prsbkygq8m21naqmcp70f24a1ksyix3dihb1r1f71lpi3cfj7"; }) + (fetchNuGet { pname = "System.Diagnostics.Tools"; version = "4.0.1"; sha256 = "19cknvg07yhakcvpxg3cxa0bwadplin6kyxd8mpjjpwnp56nl85x"; }) + (fetchNuGet { pname = "System.Diagnostics.Tracing"; version = "4.3.0"; sha256 = "1m3bx6c2s958qligl67q7grkwfz3w53hpy7nc97mh6f7j5k168c4"; }) + (fetchNuGet { pname = "System.Drawing.Common"; version = "4.7.0"; sha256 = "0yfw7cpl54mgfcylvlpvrl0c8r1b0zca6p7r3rcwkvqy23xqcyhg"; }) + (fetchNuGet { pname = "System.Dynamic.Runtime"; version = "4.0.11"; sha256 = "1pla2dx8gkidf7xkciig6nifdsb494axjvzvann8g2lp3dbqasm9"; }) + (fetchNuGet { pname = "System.Formats.Asn1"; version = "5.0.0"; sha256 = "1axc8z0839yvqi2cb63l73l6d9j6wd20lsbdymwddz9hvrsgfwpn"; }) + (fetchNuGet { pname = "System.Globalization"; version = "4.0.11"; sha256 = "070c5jbas2v7smm660zaf1gh0489xanjqymkvafcs4f8cdrs1d5d"; }) + (fetchNuGet { pname = "System.Globalization"; version = "4.3.0"; sha256 = "1cp68vv683n6ic2zqh2s1fn4c2sd87g5hpp6l4d4nj4536jz98ki"; }) + (fetchNuGet { pname = "System.Globalization.Calendars"; version = "4.3.0"; sha256 = "1xwl230bkakzzkrggy1l1lxmm3xlhk4bq2pkv790j5lm8g887lxq"; }) + (fetchNuGet { pname = "System.Globalization.Extensions"; version = "4.3.0"; sha256 = "02a5zfxavhv3jd437bsncbhd2fp1zv4gxzakp1an9l6kdq1mcqls"; }) + (fetchNuGet { pname = "System.Interactive.Async"; version = "5.0.0"; sha256 = "00flf80ahpyhrsny2kfl9bsyh1mxmsdsigpq3rzhaps9wgdbmzjz"; }) + (fetchNuGet { pname = "System.IO"; version = "4.1.0"; sha256 = "1g0yb8p11vfd0kbkyzlfsbsp5z44lwsvyc0h3dpw6vqnbi035ajp"; }) + (fetchNuGet { pname = "System.IO"; version = "4.3.0"; sha256 = "05l9qdrzhm4s5dixmx68kxwif4l99ll5gqmh7rqgw554fx0agv5f"; }) + (fetchNuGet { pname = "System.IO.FileSystem"; version = "4.0.1"; sha256 = "0kgfpw6w4djqra3w5crrg8xivbanh1w9dh3qapb28q060wb9flp1"; }) + (fetchNuGet { pname = "System.IO.FileSystem"; version = "4.3.0"; sha256 = "0z2dfrbra9i6y16mm9v1v6k47f0fm617vlb7s5iybjjsz6g1ilmw"; }) + (fetchNuGet { pname = "System.IO.FileSystem.Primitives"; version = "4.0.1"; sha256 = "1s0mniajj3lvbyf7vfb5shp4ink5yibsx945k6lvxa96r8la1612"; }) + (fetchNuGet { pname = "System.IO.FileSystem.Primitives"; version = "4.3.0"; sha256 = "0j6ndgglcf4brg2lz4wzsh1av1gh8xrzdsn9f0yznskhqn1xzj9c"; }) + (fetchNuGet { pname = "System.IO.Pipelines"; version = "4.7.2"; sha256 = "16v4qaypm72cfsfqr8z3k6yrpzn0m3apgkh6aljfwpycdk150sf9"; }) + (fetchNuGet { pname = "System.IO.Pipelines"; version = "5.0.1"; sha256 = "1zvfcd2l1d5qxifsqd0cjyv57nr61a9ac2ca5jinyqmj32wgjd6v"; }) + (fetchNuGet { pname = "System.Linq"; version = "4.1.0"; sha256 = "1ppg83svb39hj4hpp5k7kcryzrf3sfnm08vxd5sm2drrijsla2k5"; }) + (fetchNuGet { pname = "System.Linq"; version = "4.3.0"; sha256 = "1w0gmba695rbr80l1k2h4mrwzbzsyfl2z4klmpbsvsg5pm4a56s7"; }) + (fetchNuGet { pname = "System.Linq.Async"; version = "5.0.0"; sha256 = "1bc1bfnahyk6y31mrxn7nd071436m94p4r9b2j835pghcqawqfbc"; }) + (fetchNuGet { pname = "System.Linq.Expressions"; version = "4.1.0"; sha256 = "1gpdxl6ip06cnab7n3zlcg6mqp7kknf73s8wjinzi4p0apw82fpg"; }) + (fetchNuGet { pname = "System.Memory"; version = "4.5.0"; sha256 = "1layqpcx1q4l805fdnj2dfqp6ncx2z42ca06rgsr6ikq4jjgbv30"; }) + (fetchNuGet { pname = "System.Memory"; version = "4.5.1"; sha256 = "0f07d7hny38lq9w69wx4lxkn4wszrqf9m9js6fh9is645csm167c"; }) + (fetchNuGet { pname = "System.Memory"; version = "4.5.3"; sha256 = "0naqahm3wljxb5a911d37mwjqjdxv9l0b49p5dmfyijvni2ppy8a"; }) + (fetchNuGet { pname = "System.Net.Http"; version = "4.3.4"; sha256 = "0kdp31b8819v88l719j6my0yas6myv9d1viql3qz5577mv819jhl"; }) + (fetchNuGet { pname = "System.Net.Primitives"; version = "4.3.0"; sha256 = "0c87k50rmdgmxx7df2khd9qj7q35j9rzdmm2572cc55dygmdk3ii"; }) + (fetchNuGet { pname = "System.Numerics.Vectors"; version = "4.4.0"; sha256 = "0rdvma399070b0i46c4qq1h2yvjj3k013sqzkilz4bz5cwmx1rba"; }) + (fetchNuGet { pname = "System.ObjectModel"; version = "4.0.12"; sha256 = "1sybkfi60a4588xn34nd9a58png36i0xr4y4v4kqpg8wlvy5krrj"; }) + (fetchNuGet { pname = "System.Private.ServiceModel"; version = "4.5.3"; sha256 = "0nyw9m9dj327hn0qb0jmgwpch0f40jv301fk4mrchga8g99xbpng"; }) + (fetchNuGet { pname = "System.Private.ServiceModel"; version = "4.7.0"; sha256 = "1nr2xqzzc4hzqjhmn6pfva6dxwbqbxliwn60snx2ji8426fda633"; }) + (fetchNuGet { pname = "System.Private.Uri"; version = "4.3.0"; sha256 = "04r1lkdnsznin0fj4ya1zikxiqr0h6r6a1ww2dsm60gqhdrf0mvx"; }) + (fetchNuGet { pname = "System.Reflection"; version = "4.1.0"; sha256 = "1js89429pfw79mxvbzp8p3q93il6rdff332hddhzi5wqglc4gml9"; }) + (fetchNuGet { pname = "System.Reflection"; version = "4.3.0"; sha256 = "0xl55k0mw8cd8ra6dxzh974nxif58s3k1rjv1vbd7gjbjr39j11m"; }) + (fetchNuGet { pname = "System.Reflection.DispatchProxy"; version = "4.5.0"; sha256 = "0v9sg38h91aljvjyc77m1y5v34p50hjdbxvvxwa1whlajhafadcn"; }) + (fetchNuGet { pname = "System.Reflection.Emit"; version = "4.0.1"; sha256 = "0ydqcsvh6smi41gyaakglnv252625hf29f7kywy2c70nhii2ylqp"; }) + (fetchNuGet { pname = "System.Reflection.Emit.ILGeneration"; version = "4.0.1"; sha256 = "1pcd2ig6bg144y10w7yxgc9d22r7c7ww7qn1frdfwgxr24j9wvv0"; }) + (fetchNuGet { pname = "System.Reflection.Emit.Lightweight"; version = "4.0.1"; sha256 = "1s4b043zdbx9k39lfhvsk68msv1nxbidhkq6nbm27q7sf8xcsnxr"; }) + (fetchNuGet { pname = "System.Reflection.Extensions"; version = "4.0.1"; sha256 = "0m7wqwq0zqq9gbpiqvgk3sr92cbrw7cp3xn53xvw7zj6rz6fdirn"; }) + (fetchNuGet { pname = "System.Reflection.Extensions"; version = "4.3.0"; sha256 = "02bly8bdc98gs22lqsfx9xicblszr2yan7v2mmw3g7hy6miq5hwq"; }) + (fetchNuGet { pname = "System.Reflection.Metadata"; version = "1.6.0"; sha256 = "1wdbavrrkajy7qbdblpbpbalbdl48q3h34cchz24gvdgyrlf15r4"; }) + (fetchNuGet { pname = "System.Reflection.Primitives"; version = "4.0.1"; sha256 = "1bangaabhsl4k9fg8khn83wm6yial8ik1sza7401621jc6jrym28"; }) + (fetchNuGet { pname = "System.Reflection.Primitives"; version = "4.3.0"; sha256 = "04xqa33bld78yv5r93a8n76shvc8wwcdgr1qvvjh959g3rc31276"; }) + (fetchNuGet { pname = "System.Reflection.TypeExtensions"; version = "4.1.0"; sha256 = "1bjli8a7sc7jlxqgcagl9nh8axzfl11f4ld3rjqsyxc516iijij7"; }) + (fetchNuGet { pname = "System.Reflection.TypeExtensions"; version = "4.3.0"; sha256 = "0y2ssg08d817p0vdag98vn238gyrrynjdj4181hdg780sif3ykp1"; }) + (fetchNuGet { pname = "System.Resources.ResourceManager"; version = "4.0.1"; sha256 = "0b4i7mncaf8cnai85jv3wnw6hps140cxz8vylv2bik6wyzgvz7bi"; }) + (fetchNuGet { pname = "System.Resources.ResourceManager"; version = "4.3.0"; sha256 = "0sjqlzsryb0mg4y4xzf35xi523s4is4hz9q4qgdvlvgivl7qxn49"; }) + (fetchNuGet { pname = "System.Runtime"; version = "4.1.0"; sha256 = "02hdkgk13rvsd6r9yafbwzss8kr55wnj8d5c7xjnp8gqrwc8sn0m"; }) + (fetchNuGet { pname = "System.Runtime"; version = "4.3.0"; sha256 = "066ixvgbf2c929kgknshcxqj6539ax7b9m570cp8n179cpfkapz7"; }) + (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "4.4.0"; sha256 = "0a6ahgi5b148sl5qyfpyw383p3cb4yrkm802k29fsi4mxkiwir29"; }) + (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "4.5.0"; sha256 = "17labczwqk3jng3kkky73m0jhi8wc21vbl7cz5c0hj2p1dswin43"; }) + (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "4.5.1"; sha256 = "1xcrjx5fwg284qdnxyi2d0lzdm5q4frlpkp0nf6vvkx1kdz2prrf"; }) + (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "4.5.2"; sha256 = "1vz4275fjij8inf31np78hw50al8nqkngk04p3xv5n4fcmf1grgi"; }) + (fetchNuGet { pname = "System.Runtime.CompilerServices.Unsafe"; version = "5.0.0"; sha256 = "02k25ivn50dmqx5jn8hawwmz24yf0454fjd823qk6lygj9513q4x"; }) + (fetchNuGet { pname = "System.Runtime.Extensions"; version = "4.1.0"; sha256 = "0rw4rm4vsm3h3szxp9iijc3ksyviwsv6f63dng3vhqyg4vjdkc2z"; }) + (fetchNuGet { pname = "System.Runtime.Extensions"; version = "4.3.0"; sha256 = "1ykp3dnhwvm48nap8q23893hagf665k0kn3cbgsqpwzbijdcgc60"; }) + (fetchNuGet { pname = "System.Runtime.Handles"; version = "4.0.1"; sha256 = "1g0zrdi5508v49pfm3iii2hn6nm00bgvfpjq1zxknfjrxxa20r4g"; }) + (fetchNuGet { pname = "System.Runtime.Handles"; version = "4.3.0"; sha256 = "0sw2gfj2xr7sw9qjn0j3l9yw07x73lcs97p8xfc9w1x9h5g5m7i8"; }) + (fetchNuGet { pname = "System.Runtime.InteropServices"; version = "4.1.0"; sha256 = "01kxqppx3dr3b6b286xafqilv4s2n0gqvfgzfd4z943ga9i81is1"; }) + (fetchNuGet { pname = "System.Runtime.InteropServices"; version = "4.3.0"; sha256 = "00hywrn4g7hva1b2qri2s6rabzwgxnbpw9zfxmz28z09cpwwgh7j"; }) + (fetchNuGet { pname = "System.Runtime.InteropServices.RuntimeInformation"; version = "4.0.0"; sha256 = "0glmvarf3jz5xh22iy3w9v3wyragcm4hfdr17v90vs7vcrm7fgp6"; }) + (fetchNuGet { pname = "System.Runtime.InteropServices.RuntimeInformation"; version = "4.3.0"; sha256 = "0q18r1sh4vn7bvqgd6dmqlw5v28flbpj349mkdish2vjyvmnb2ii"; }) + (fetchNuGet { pname = "System.Runtime.Numerics"; version = "4.3.0"; sha256 = "19rav39sr5dky7afygh309qamqqmi9kcwvz3i0c5700v0c5cg61z"; }) + (fetchNuGet { pname = "System.Runtime.Serialization.Primitives"; version = "4.1.1"; sha256 = "042rfjixknlr6r10vx2pgf56yming8lkjikamg3g4v29ikk78h7k"; }) + (fetchNuGet { pname = "System.Security.AccessControl"; version = "4.5.0"; sha256 = "1wvwanz33fzzbnd2jalar0p0z3x0ba53vzx1kazlskp7pwyhlnq0"; }) + (fetchNuGet { pname = "System.Security.AccessControl"; version = "4.7.0"; sha256 = "0n0k0w44flkd8j0xw7g3g3vhw7dijfm51f75xkm1qxnbh4y45mpz"; }) + (fetchNuGet { pname = "System.Security.Cryptography.Algorithms"; version = "4.3.0"; sha256 = "03sq183pfl5kp7gkvq77myv7kbpdnq3y0xj7vi4q1kaw54sny0ml"; }) + (fetchNuGet { pname = "System.Security.Cryptography.Cng"; version = "4.3.0"; sha256 = "1k468aswafdgf56ab6yrn7649kfqx2wm9aslywjam1hdmk5yypmv"; }) + (fetchNuGet { pname = "System.Security.Cryptography.Cng"; version = "4.4.0"; sha256 = "1grg9id80m358crr5y4q4rhhbrm122yw8jrlcl1ybi7nkmmck40n"; }) + (fetchNuGet { pname = "System.Security.Cryptography.Cng"; version = "4.5.0"; sha256 = "1pm4ykbcz48f1hdmwpia432ha6qbb9kbrxrrp7cg3m8q8xn52ngn"; }) + (fetchNuGet { pname = "System.Security.Cryptography.Cng"; version = "5.0.0"; sha256 = "06hkx2za8jifpslkh491dfwzm5dxrsyxzj5lsc0achb6yzg4zqlw"; }) + (fetchNuGet { pname = "System.Security.Cryptography.Csp"; version = "4.3.0"; sha256 = "1x5wcrddf2s3hb8j78cry7yalca4lb5vfnkrysagbn6r9x6xvrx1"; }) + (fetchNuGet { pname = "System.Security.Cryptography.Encoding"; version = "4.3.0"; sha256 = "1jr6w70igqn07k5zs1ph6xja97hxnb3mqbspdrff6cvssgrixs32"; }) + (fetchNuGet { pname = "System.Security.Cryptography.OpenSsl"; version = "4.3.0"; sha256 = "0givpvvj8yc7gv4lhb6s1prq6p2c4147204a0wib89inqzd87gqc"; }) + (fetchNuGet { pname = "System.Security.Cryptography.Pkcs"; version = "4.5.0"; sha256 = "16dhiz2qypk289dxiqa9rb7jmslnami6bykalv5dvbd8j91zikpy"; }) + (fetchNuGet { pname = "System.Security.Cryptography.Pkcs"; version = "5.0.1"; sha256 = "0hf5a6xql76nwhfygf2gcbrids00pfajsd60wzrkikjhcrasmk95"; }) + (fetchNuGet { pname = "System.Security.Cryptography.Primitives"; version = "4.3.0"; sha256 = "0pyzncsv48zwly3lw4f2dayqswcfvdwq2nz0dgwmi7fj3pn64wby"; }) + (fetchNuGet { pname = "System.Security.Cryptography.ProtectedData"; version = "4.7.0"; sha256 = "1s1sh8k10s0apa09c5m2lkavi3ys90y657whg2smb3y8mpkfr5vm"; }) + (fetchNuGet { pname = "System.Security.Cryptography.X509Certificates"; version = "4.3.0"; sha256 = "0valjcz5wksbvijylxijjxb1mp38mdhv03r533vnx1q3ikzdav9h"; }) + (fetchNuGet { pname = "System.Security.Cryptography.Xml"; version = "4.5.0"; sha256 = "1rk40x0msf9k7sxnjyizagjns1z25dh3cf22bx6hsx6vhf0sk08l"; }) + (fetchNuGet { pname = "System.Security.Permissions"; version = "4.5.0"; sha256 = "192ww5rm3c9mirxgl1nzyrwd18am3izqls0hzm0fvcdjl5grvbhm"; }) + (fetchNuGet { pname = "System.Security.Permissions"; version = "4.7.0"; sha256 = "13f366sj36jwbvld957gk2q64k2xbj48r8b0k9avrri2nlq1fs04"; }) + (fetchNuGet { pname = "System.Security.Principal.Windows"; version = "4.5.0"; sha256 = "0rmj89wsl5yzwh0kqjgx45vzf694v9p92r4x4q6yxldk1cv1hi86"; }) + (fetchNuGet { pname = "System.Security.Principal.Windows"; version = "4.7.0"; sha256 = "1a56ls5a9sr3ya0nr086sdpa9qv0abv31dd6fp27maqa9zclqq5d"; }) + (fetchNuGet { pname = "System.ServiceModel.Http"; version = "4.7.0"; sha256 = "1b2d1mrakb97ap31a6j21jvmy1z12rssclj2353kma30xqjxy9w3"; }) + (fetchNuGet { pname = "System.ServiceModel.Primitives"; version = "4.5.3"; sha256 = "1v90pci049cn44y0km885k1vrilhb34w6q2zva4y6f3ay84klrih"; }) + (fetchNuGet { pname = "System.ServiceModel.Primitives"; version = "4.7.0"; sha256 = "19fkymhk6f499scw2i4bsy4q8h28lrc4mwscgff2jgcl9m25gss1"; }) + (fetchNuGet { pname = "System.Text.Encoding"; version = "4.0.11"; sha256 = "1dyqv0hijg265dwxg6l7aiv74102d6xjiwplh2ar1ly6xfaa4iiw"; }) + (fetchNuGet { pname = "System.Text.Encoding"; version = "4.3.0"; sha256 = "1f04lkir4iladpp51sdgmis9dj4y8v08cka0mbmsy0frc9a4gjqr"; }) + (fetchNuGet { pname = "System.Text.Encoding.Extensions"; version = "4.0.11"; sha256 = "08nsfrpiwsg9x5ml4xyl3zyvjfdi4mvbqf93kjdh11j4fwkznizs"; }) + (fetchNuGet { pname = "System.Text.Encoding.Extensions"; version = "4.3.0"; sha256 = "11q1y8hh5hrp5a3kw25cb6l00v5l5dvirkz8jr3sq00h1xgcgrxy"; }) + (fetchNuGet { pname = "System.Text.RegularExpressions"; version = "4.1.0"; sha256 = "1mw7vfkkyd04yn2fbhm38msk7dz2xwvib14ygjsb8dq2lcvr18y7"; }) + (fetchNuGet { pname = "System.Text.RegularExpressions"; version = "4.3.0"; sha256 = "1bgq51k7fwld0njylfn7qc5fmwrk2137gdq7djqdsw347paa9c2l"; }) + (fetchNuGet { pname = "System.Threading"; version = "4.0.11"; sha256 = "19x946h926bzvbsgj28csn46gak2crv2skpwsx80hbgazmkgb1ls"; }) + (fetchNuGet { pname = "System.Threading"; version = "4.3.0"; sha256 = "0rw9wfamvhayp5zh3j7p1yfmx9b5khbf4q50d8k5rk993rskfd34"; }) + (fetchNuGet { pname = "System.Threading.Tasks"; version = "4.0.11"; sha256 = "0nr1r41rak82qfa5m0lhk9mp0k93bvfd7bbd9sdzwx9mb36g28p5"; }) + (fetchNuGet { pname = "System.Threading.Tasks"; version = "4.3.0"; sha256 = "134z3v9abw3a6jsw17xl3f6hqjpak5l682k2vz39spj4kmydg6k7"; }) + (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.0.0"; sha256 = "1cb51z062mvc2i8blpzmpn9d9mm4y307xrwi65di8ri18cz5r1zr"; }) + (fetchNuGet { pname = "System.Threading.Tasks.Extensions"; version = "4.3.0"; sha256 = "1xxcx2xh8jin360yjwm4x4cf5y3a2bwpn2ygkfkwkicz7zk50s2z"; }) + (fetchNuGet { pname = "System.Threading.Thread"; version = "4.0.0"; sha256 = "1gxxm5fl36pjjpnx1k688dcw8m9l7nmf802nxis6swdaw8k54jzc"; }) + (fetchNuGet { pname = "System.Threading.Thread"; version = "4.3.0"; sha256 = "0y2xiwdfcph7znm2ysxanrhbqqss6a3shi1z3c779pj2s523mjx4"; }) + (fetchNuGet { pname = "System.Threading.ThreadPool"; version = "4.0.10"; sha256 = "0fdr61yjcxh5imvyf93n2m3n5g9pp54bnw2l1d2rdl9z6dd31ypx"; }) + (fetchNuGet { pname = "System.Threading.ThreadPool"; version = "4.3.0"; sha256 = "027s1f4sbx0y1xqw2irqn6x161lzj8qwvnh2gn78ciiczdv10vf1"; }) + (fetchNuGet { pname = "System.Threading.Timer"; version = "4.0.1"; sha256 = "15n54f1f8nn3mjcjrlzdg6q3520571y012mx7v991x2fvp73lmg6"; }) + (fetchNuGet { pname = "System.Windows.Extensions"; version = "4.7.0"; sha256 = "11dmyx3j0jafjx5r9mkj1v4w2a4rzrdn8fgwm2d1g7fs1ayqcvy9"; }) + (fetchNuGet { pname = "System.Xml.ReaderWriter"; version = "4.0.11"; sha256 = "0c6ky1jk5ada9m94wcadih98l6k1fvf6vi7vhn1msjixaha419l5"; }) + (fetchNuGet { pname = "System.Xml.ReaderWriter"; version = "4.3.0"; sha256 = "0c47yllxifzmh8gq6rq6l36zzvw4kjvlszkqa9wq3fr59n0hl3s1"; }) + (fetchNuGet { pname = "System.Xml.XDocument"; version = "4.0.11"; sha256 = "0n4lvpqzy9kc7qy1a4acwwd7b7pnvygv895az5640idl2y9zbz18"; }) + (fetchNuGet { pname = "System.Xml.XmlDocument"; version = "4.3.0"; sha256 = "0bmz1l06dihx52jxjr22dyv5mxv6pj4852lx68grjm7bivhrbfwi"; }) + (fetchNuGet { pname = "System.Xml.XPath"; version = "4.3.0"; sha256 = "1cv2m0p70774a0sd1zxc8fm8jk3i5zk2bla3riqvi8gsm0r4kpci"; }) + (fetchNuGet { pname = "System.Xml.XPath.XmlDocument"; version = "4.3.0"; sha256 = "1h9lh7qkp0lff33z847sdfjj8yaz98ylbnkbxlnsbflhj9xyfqrm"; }) + (fetchNuGet { pname = "YamlDotNet"; version = "5.2.1"; sha256 = "0nb34qcdhs5qn4783idg28f2kr89vaiyjn4v2barhv7i75zhym6y"; }) ] diff --git a/third_party/nixpkgs/pkgs/servers/openafs/1.8/module.nix b/third_party/nixpkgs/pkgs/servers/openafs/1.8/module.nix index 6e738d025e..f27b818890 100644 --- a/third_party/nixpkgs/pkgs/servers/openafs/1.8/module.nix +++ b/third_party/nixpkgs/pkgs/servers/openafs/1.8/module.nix @@ -38,14 +38,9 @@ stdenv.mkDerivation { buildInputs = [ libkrb5 ]; patches = [ - # Add autoconf-archive to src/external - (fetchBase64Patch { - url = "https://gerrit.openafs.org/changes/14942/revisions/006616bd8e88b2d386a5ddc23973cf3e625cb80d/patch"; - hash = "sha256-55sc2sKy5XkQHAv6ysVxi69+0xVsHnN2TS144UTeLHU="; - }) # Import of code from autoconf-archive - (fetchBase64Patch { - url = "https://gerrit.openafs.org/changes/14943/revisions/d3782b1d4e6fd81c5432e95112eb44305f07f272/patch"; + (fetchpatch { + url = "https://git.openafs.org/?p=openafs.git;a=patch;h=d8205bbb482554812fbe66afa3c337d991a247b6"; hash = "sha256-ohkjSux+S3+6slh6uZIw5UJXlvhy9UUDpDlP0YFRwmw="; }) # Use autoconf-archive m4 from src/external @@ -53,6 +48,11 @@ stdenv.mkDerivation { url = "https://gerrit.openafs.org/changes/14944/revisions/ea2a0e128d71802f61b8da2e44de3c6325c5f328/patch"; hash = "sha256-PAUk/MXL5p8xwhn40/UGmo3UIhvl1PB2FwgqhmqsjJ4="; }) + # cf: Use common macro to test compiler flags + (fetchpatch { + url = "https://git.openafs.org/?p=openafs.git;a=patch;h=790824ff749b6ee01c4d7101493cbe8773ef41c6"; + hash = "sha256-Zc7AjCsH7eTmZJWCrx7ci1tBjEAgcFXS9lY1YBeboLA="; + }) # Linux-5.17: kernel func complete_and_exit renamed (fetchBase64Patch { url = "https://gerrit.openafs.org/changes/14945/revisions/a714e865efe41aa1112f6f9c8479112660dacd6f/patch"; @@ -63,6 +63,36 @@ stdenv.mkDerivation { url = "https://gerrit.openafs.org/changes/14946/revisions/449d1faf87e2841e80be38cf2b4a5cf5ff4df2d8/patch"; hash = "sha256-3bRTHYeMRIleLhob56m2Xt0dWzIMDo3QrytY0K1/q7c="; }) + # afs: Introduce afs_IsDCacheFresh + (fetchpatch { + url = "https://git.openafs.org/?p=openafs.git;a=patch;h=0d8ce846ab2e6c45166a61f04eb3af271cbd27db"; + hash = "sha256-+xgRYVXz8XpT5c4Essc4VEn9Fj53vasAYhcFkK0oCBc="; + }) + # LINUX: Don't panic on some file open errors + (fetchpatch { + url = "https://git.openafs.org/?p=openafs.git;a=patch;h=af73b9a3b1fc625694807287c0897391feaad52d"; + hash = "sha256-k0d+Gav1LApU24SaMI0pmR3gGfWyicqdCpTpVJLcx7U="; + }) + # Linux-5.18 replace set_page_dirty with dirty_folio + (fetchpatch { + url = "https://git.openafs.org/?p=openafs.git;a=patch;h=6aa129e743e882cf30c35afd67eabf82274c5fca"; + hash = "sha256-8R0rdKYs7+Zl1sdizOZzpBjy6e9J+42R9HzsNUa/PQ4="; + }) + # afs: introduce afs_alloc_ncr/afs_free_ncr + (fetchpatch { + url = "https://git.openafs.org/?p=openafs.git;a=patch;h=209eb92448001e59525413610356070d8e4f10a0"; + hash = "sha256-t455gTaK5U+m0qcyKjTqnWTOb4qz6VN/JYZzRAAV8kM="; + }) + # afs: introduce get_dcache_readahead + (fetchpatch { + url = "https://git.openafs.org/?p=openafs.git;a=patch;h=44e24ae5d7dc41e54d23638d5f64ab2e81e43ad0"; + hash = "sha256-gtUNDSHAq+RY1Rm17YcxcUALy7FEBQf9k8/ELQlPORU="; + }) + # Linux-5.18: replace readpages with readahead + (fetchBase64Patch { + url = "https://gerrit.openafs.org/changes/14953/revisions/0497b0cd7bffb6335ab9bcbf5a1310b8c6a4b299/patch"; + hash = "sha256-a5pd+CHHPr1mGxsF7tSlaBqoiKw2IGr1mJ7EaDHDJSw="; + }) ]; hardeningDisable = [ "pic" ]; @@ -102,7 +132,7 @@ stdenv.mkDerivation { homepage = "https://www.openafs.org"; license = licenses.ipl10; platforms = platforms.linux; - maintainers = with maintainers; [ maggesi spacefrogg ]; - broken = kernel.isHardened || kernel.kernelAtLeast "5.18"; + maintainers = with maintainers; [ andersk maggesi spacefrogg ]; + broken = kernel.isHardened || kernel.kernelAtLeast "5.19"; }; } diff --git a/third_party/nixpkgs/pkgs/servers/polaris/default.nix b/third_party/nixpkgs/pkgs/servers/polaris/default.nix index fb9384ea05..da53dc9925 100644 --- a/third_party/nixpkgs/pkgs/servers/polaris/default.nix +++ b/third_party/nixpkgs/pkgs/servers/polaris/default.nix @@ -38,6 +38,11 @@ rustPlatform.buildRustPackage rec { cp -a docs/swagger $out/share/polaris-swagger ''; + preCheck = '' + # 'Err' value: Os { code: 24, kind: Uncategorized, message: "Too many open files" } + ulimit -n 4096 + ''; + passthru.updateScript = ./update.sh; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/servers/rt/default.nix b/third_party/nixpkgs/pkgs/servers/rt/default.nix index a113c25f39..894da7a652 100644 --- a/third_party/nixpkgs/pkgs/servers/rt/default.nix +++ b/third_party/nixpkgs/pkgs/servers/rt/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "rt"; - version = "5.0.2"; + version = "5.0.3"; src = fetchFromGitHub { repo = pname; rev = "${pname}-${version}"; owner = "bestpractical"; - sha256 = "1qdvbsmdynjw2v0clnmhdmrky7w4dsiysv92n7d7jdbawnicqahn"; + hash = "sha256-ZitlueLEbV3mGJg0aDrLa5IReJiOVaEf+JicbA9zUS4="; }; patches = [ @@ -120,8 +120,7 @@ stdenv.mkDerivation rec { ]; preAutoreconf = '' - substituteInPlace configure.ac \ - --replace "rt-3.9.EXPORTED" "rt-${version}" + echo rt-${version} > .tag ''; preConfigure = '' configureFlags="$configureFlags --with-web-user=$UID" diff --git a/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/age.nix b/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/age.nix index 781a1c86be..e1725f1da8 100644 --- a/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/age.nix +++ b/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/age.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "age"; - version = "0.6.0"; + version = "1.0.0-rc1"; src = fetchFromGitHub { owner = "apache"; - repo = "incubator-age"; + repo = "age"; rev = "v${version}"; - sha256 = "1cl6p9qz2yhgm603ljlyjdn0msk3hzga1frjqsmqmpp3nw4dbkka"; + sha256 = "sha256-b5cBpS5xWaohRZf5H0DwzNq0BodqWDjkAP44osPVYps="; }; buildInputs = [ postgresql ]; @@ -54,10 +54,11 @@ stdenv.mkDerivation rec { }; meta = with lib; { - broken = true; + # Only supports PostgreSQL 11 https://github.com/apache/age/issues/225 + broken = versions.major postgresql.version != "11"; description = "A graph database extension for PostgreSQL"; homepage = "https://age.apache.org/"; - changelog = "https://github.com/apache/incubator-age/releases/tag/v${version}"; + changelog = "https://github.com/apache/age/raw/v${version}/RELEASE"; maintainers = with maintainers; [ ]; platforms = postgresql.meta.platforms; license = licenses.asl20; diff --git a/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/pg_cron.nix b/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/pg_cron.nix index 73d90ccdec..e437de887c 100644 --- a/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/pg_cron.nix +++ b/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/pg_cron.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "pg_cron"; - version = "1.4.1"; + version = "1.4.2"; buildInputs = [ postgresql ]; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { owner = "citusdata"; repo = pname; rev = "v${version}"; - sha256 = "1fknr7z1m24dpp4hm5s6y5phdns7yvvj88cl481wjhw8bigz6kns"; + sha256 = "sha256-P0Fd10Q1p+KrExb35G6otHpc6pD61WnMll45H2jkevM="; }; installPhase = '' diff --git a/third_party/nixpkgs/pkgs/servers/traefik/default.nix b/third_party/nixpkgs/pkgs/servers/traefik/default.nix index 0e0d3cd22d..425f8bcb8e 100644 --- a/third_party/nixpkgs/pkgs/servers/traefik/default.nix +++ b/third_party/nixpkgs/pkgs/servers/traefik/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "traefik"; - version = "2.7.2"; + version = "2.8.1"; # Archive with static assets for webui src = fetchzip { url = "https://github.com/traefik/traefik/releases/download/v${version}/traefik-v${version}.src.tar.gz"; - sha256 = "sha256-AJbvK3hr+cNYcoN+3Zz5WruTvWfh1junEnhRzvXVN+U="; + sha256 = "sha256-+5A94I9WKFs2/etoQpwImt6yneX8pt44F9NfFF/X0Hk="; stripRoot = false; }; - vendorSha256 = "sha256-T36d8mjbThlH1mukcHgaYlhq/P46ShTHgM9zcH4L7dc="; + vendorSha256 = "sha256-QHddmS1edjHckl3tpI9BDL4jjdvsMCw9aA9K/g3fSug="; subPackages = [ "cmd/traefik" ]; diff --git a/third_party/nixpkgs/pkgs/servers/web-apps/searxng/default.nix b/third_party/nixpkgs/pkgs/servers/web-apps/searxng/default.nix new file mode 100644 index 0000000000..937f0ac48c --- /dev/null +++ b/third_party/nixpkgs/pkgs/servers/web-apps/searxng/default.nix @@ -0,0 +1,62 @@ +{ lib +, python3 +, python3Packages +, fetchFromGitHub +}: + +python3Packages.buildPythonApplication rec { + pname = "searxng"; + version = "unstable-2022-06-29"; + + src = fetchFromGitHub { + owner = pname; + repo = pname; + rev = "107006515ee9fe9cad9a6f6387db658953d32486"; + sha256 = "sha256-uV5XiOVuES9wuBx9S8WhM8jhuxRHlSMvW5Ki8WlDwfM="; + }; + + postPatch = '' + sed -i 's/==.*$//' requirements.txt + ''; + + preBuild = '' + export SEARX_DEBUG="true"; + ''; + + propagatedBuildInputs = with python3Packages; [ + babel + certifi + python-dateutil + flask + flaskbabel + brotli + jinja2 + langdetect + lxml + h2 + pygments + pyyaml + redis + uvloop + setproctitle + httpx + httpx-socks + markdown-it-py + ]; + + # tests try to connect to network + doCheck = false; + + postInstall = '' + # Create a symlink for easier access to static data + mkdir -p $out/share + ln -s ../${python3.sitePackages}/searx/static $out/share/ + ''; + + meta = with lib; { + homepage = "https://github.com/searxng/searxng"; + description = "A fork of Searx, a privacy-respecting, hackable metasearch engine"; + license = licenses.agpl3Plus; + maintainers = with maintainers; [ kranzes ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/servers/web-apps/snipe-it/default.nix b/third_party/nixpkgs/pkgs/servers/web-apps/snipe-it/default.nix index 02a1ff30d8..0f0c03a595 100644 --- a/third_party/nixpkgs/pkgs/servers/web-apps/snipe-it/default.nix +++ b/third_party/nixpkgs/pkgs/servers/web-apps/snipe-it/default.nix @@ -18,13 +18,13 @@ let in package.override rec { pname = "snipe-it"; - version = "6.0.5"; + version = "6.0.7"; src = fetchFromGitHub { owner = "snipe"; repo = pname; rev = "v${version}"; - sha256 = "15dp8y0kdjg9x4iwa5ha5w4qbwwsdg5z8337rmkkla2yjmf4lrxb"; + sha256 = "09jvkz7j2qb79mjnyrz75015xpgf8l483yha3ma14pzk4pibn620"; }; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/shells/bash/fzf-obc/default.nix b/third_party/nixpkgs/pkgs/shells/bash/fzf-obc/default.nix new file mode 100644 index 0000000000..7621ae8c73 --- /dev/null +++ b/third_party/nixpkgs/pkgs/shells/bash/fzf-obc/default.nix @@ -0,0 +1,30 @@ +{ lib, stdenv, fetchFromGitHub }: + +stdenv.mkDerivation rec { + pname = "fzf-obc"; + version = "1.3.0"; + + src = fetchFromGitHub { + owner = "rockandska"; + repo = pname; + rev = version; + sha256 = "sha256-KIAlDpt1Udl+RLp3728utgQ9FCjZz/OyoG92MOJmgPI="; + }; + + dontBuild = true; + + installPhase = '' + mkdir -p $out/share/fzf-obc/{bin,lib/fzf-obc,plugins/{kill,gradle}} + install -m644 bin/* $out/share/fzf-obc/bin + install -m644 lib/fzf-obc/* $out/share/fzf-obc/lib/fzf-obc + install -m644 plugins/kill/* $out/share/fzf-obc/plugins/kill + install -m644 plugins/gradle/* $out/share/fzf-obc/plugins/gradle + ''; + + meta = with lib; { + homepage = "https://fzf-obc.readthedocs.io"; + description = "Completion script adding fzf over all know bash completion functions"; + license = licenses.unfree; + maintainers = with maintainers; [ loicreynier ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/shells/hilbish/default.nix b/third_party/nixpkgs/pkgs/shells/hilbish/default.nix index 68e00dc84d..c956f0fc44 100644 --- a/third_party/nixpkgs/pkgs/shells/hilbish/default.nix +++ b/third_party/nixpkgs/pkgs/shells/hilbish/default.nix @@ -8,7 +8,7 @@ buildGoModule rec { owner = "Rosettea"; repo = "Hilbish"; rev = "v${version}"; - sha256 = "sha256-n4+qUCbjqxLmGuCQ0QTscJ3me0UZUP/7ggvGp1pNkfg="; + sha256 = "sha256-fUGeQM+7FRGTRL3J4c2+c+NTwrM6d99F2ucKsou2kRk="; fetchSubmodules = true; }; diff --git a/third_party/nixpkgs/pkgs/shells/zsh/oh-my-zsh/default.nix b/third_party/nixpkgs/pkgs/shells/zsh/oh-my-zsh/default.nix index 8d73c63f67..b631c54b07 100644 --- a/third_party/nixpkgs/pkgs/shells/zsh/oh-my-zsh/default.nix +++ b/third_party/nixpkgs/pkgs/shells/zsh/oh-my-zsh/default.nix @@ -5,15 +5,15 @@ , git, nix, nixfmt, jq, coreutils, gnused, curl, cacert, bash }: stdenv.mkDerivation rec { - version = "2022-06-19"; + version = "2022-07-12"; pname = "oh-my-zsh"; - rev = "4c82a2eedf0c43d47601ffa8b0303ed1326fab8f"; + rev = "249c708ed3a4a7a63d16a6e911a46b6fb9623cbd"; src = fetchFromGitHub { inherit rev; owner = "ohmyzsh"; repo = "ohmyzsh"; - sha256 = "evFMOZUVpF8Qv3os+hx8Z7nC216sZclxO1g9ZaO//QU="; + sha256 = "zBLgAS96uovLIrKLoVSjRJKeoRkGWu6TQqsvoYokLV4="; }; strictDeps = true; diff --git a/third_party/nixpkgs/pkgs/shells/zsh/zsh-history/default.nix b/third_party/nixpkgs/pkgs/shells/zsh/zsh-history/default.nix index 9f88d972e7..604d593a0b 100644 --- a/third_party/nixpkgs/pkgs/shells/zsh/zsh-history/default.nix +++ b/third_party/nixpkgs/pkgs/shells/zsh/zsh-history/default.nix @@ -11,9 +11,9 @@ buildGoModule rec { sha256 = "13n643ik1zjvpk8h9458yd9ffahhbdnigmbrbmpn7b7g23wqqsi3"; }; - nativeBuildInputs = [ installShellFiles ]; + vendorSha256 = "sha256-n5QFN1B2GjbzylFuW9Y4r0+ioIJlfKwcGK8X3ZwKLI8="; - vendorSha256 = "1863ad97y82fx0an1ysalkxnqjz3zfz228wag9a92wdssl1vwzws"; + nativeBuildInputs = [ installShellFiles ]; doCheck = false; @@ -23,16 +23,15 @@ buildGoModule rec { installShellCompletion --zsh --name _history $out/share/zsh/completions/_history ''; + passthru.tests = { + zsh-history-shell-integration = nixosTests.zsh-history; + }; + meta = with lib; { description = "A CLI to provide enhanced history for your ZSH shell"; homepage = "https://github.com/b4b4r07/history"; license = licenses.mit; maintainers = with maintainers; [ ]; mainProgram = "history"; - platforms = platforms.unix; - }; - - passthru.tests = { - zsh-history-shell-integration = nixosTests.zsh-history; }; } diff --git a/third_party/nixpkgs/pkgs/stdenv/linux/bootstrap-files/mips64el.nix b/third_party/nixpkgs/pkgs/stdenv/linux/bootstrap-files/mips64el.nix new file mode 100644 index 0000000000..452a247fb0 --- /dev/null +++ b/third_party/nixpkgs/pkgs/stdenv/linux/bootstrap-files/mips64el.nix @@ -0,0 +1,25 @@ +# +# Files came from this Hydra build: +# +# https://hydra.nixos.org/build/182757245 +# +# Which used nixpkgs revision ef3fe254f3c59455386bc92fe84164f9679b92b1 +# to instantiate: +# +# /nix/store/a2bvv663wjnyhq8m7v84aspsd3sgf9h6-stdenv-bootstrap-tools-mips64el-unknown-linux-gnuabi64.drv +# +# and then built: +# +# /nix/store/aw3dmsrh22831l83vi3q9apg9qi3x8ms-stdenv-bootstrap-tools-mips64el-unknown-linux-gnuabi64 +# +{ + busybox = import { + url = "http://tarballs.nixos.org/stdenv-linux/mips64el/ef3fe254f3c59455386bc92fe84164f9679b92b1/busybox"; + sha256 = "sha256-sTE58ofjqAqX3Xtq1g9wDxzIe6Vo//GHbicfqJoivDI="; + executable = true; + }; + bootstrapTools =import { + url = "http://tarballs.nixos.org/stdenv-linux/mips64el/ef3fe254f3c59455386bc92fe84164f9679b92b1/bootstrap-tools.tar.xz"; + sha256 = "sha256-tTgjeXpd2YgnfP4JvRuO0bXd2j8GqzBcd57JI3wH9x0="; + }; +} diff --git a/third_party/nixpkgs/pkgs/stdenv/linux/default.nix b/third_party/nixpkgs/pkgs/stdenv/linux/default.nix index 880286bbcd..3670f8d8c2 100644 --- a/third_party/nixpkgs/pkgs/stdenv/linux/default.nix +++ b/third_party/nixpkgs/pkgs/stdenv/linux/default.nix @@ -16,6 +16,7 @@ armv7l-linux = import ./bootstrap-files/armv7l.nix; aarch64-linux = import ./bootstrap-files/aarch64.nix; mipsel-linux = import ./bootstrap-files/loongson2f.nix; + mips64el-linux = import ./bootstrap-files/mips64el.nix; powerpc64le-linux = import ./bootstrap-files/powerpc64le.nix; riscv64-linux = import ./bootstrap-files/riscv64.nix; }; diff --git a/third_party/nixpkgs/pkgs/tools/admin/boulder/default.nix b/third_party/nixpkgs/pkgs/tools/admin/boulder/default.nix index e953248b26..b22e3559a8 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/boulder/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/boulder/default.nix @@ -1,31 +1,40 @@ -{ stdenv -, lib -, buildGoModule +{ lib , fetchFromGitHub +, buildGoModule +, gitUpdater }: buildGoModule rec { pname = "boulder"; - version = "2022-06-21"; - rev = "09f87bb31a57f9a04932b7175fab1e3cabffd86f"; + version = "2022-07-11"; src = fetchFromGitHub { owner = "letsencrypt"; repo = "boulder"; rev = "release-${version}"; - sha256 = "sha256-Q5fMM3UXMFqmpJks1xnINeKBA7dDam4bfczO3D43Yoo="; + sha256 = "sha256-fDKB7q2e+qdHt+t/BQWX7LkpyiZQtZSHp/x5uv0/c7c="; + leaveDotGit = true; + postFetch = '' + cd $out + git rev-parse HEAD > $out/COMMIT + find "$out" -name .git -print0 | xargs -0 rm -rf + ''; }; vendorSha256 = null; subPackages = [ "cmd/boulder" ]; - ldflags = with lib; - mapAttrsToList (n: v: ''"-X github.com/letsencrypt/boulder/core.Build${n}=${v}"'') { - ID = substring 0 8 rev; - Host = "nixbld@localhost"; - Time = "Thu 1 Jan 00:00:00 UTC 1970"; - }; + ldflags = [ + "-s" + "-w" + "-X github.com/letsencrypt/boulder/core.BuildHost=nixbld@localhost" + ]; + + preBuild = '' + ldflags+=" -X \"github.com/letsencrypt/boulder/core.BuildID=$(cat COMMIT)\"" + ldflags+=" -X \"github.com/letsencrypt/boulder/core.BuildTime=$(date -u -d @0)\"" + ''; postInstall = '' for i in $($out/bin/boulder --list); do @@ -36,6 +45,11 @@ buildGoModule rec { # There are no tests for cmd/boulder. doCheck = false; + passthru.updateScript = gitUpdater { + inherit pname version; + rev-prefix = "release-"; + }; + meta = with lib; { homepage = "https://github.com/letsencrypt/boulder"; description = "An ACME-based certificate authority, written in Go"; @@ -48,6 +62,5 @@ buildGoModule rec { ''; license = licenses.mpl20; maintainers = with maintainers; [ azahi ]; - broken = stdenv.isDarwin; }; } diff --git a/third_party/nixpkgs/pkgs/tools/admin/gtk-vnc/default.nix b/third_party/nixpkgs/pkgs/tools/admin/gtk-vnc/default.nix index 060c95a8f7..f4c4b0facd 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/gtk-vnc/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/gtk-vnc/default.nix @@ -23,13 +23,13 @@ stdenv.mkDerivation rec { pname = "gtk-vnc"; - version = "1.3.0"; + version = "1.3.1"; outputs = [ "out" "bin" "man" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "X6qlgjuMvowLC6HkVsTnDEsa5mhcn+gaQoLZjPAKIR0="; + sha256 = "USdjrE4FWdAVi2aCyl3Ro71jPwgvXkNJ1xWOa1+A8c4="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/tools/admin/iredis/default.nix b/third_party/nixpkgs/pkgs/tools/admin/iredis/default.nix new file mode 100644 index 0000000000..ecaef00a77 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/admin/iredis/default.nix @@ -0,0 +1,58 @@ +{ lib, python3Packages }: + +with python3Packages; + +buildPythonApplication rec { + pname = "iredis"; + version = "1.12.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "c3031094db0aa03d48b6f9be750e32d3e901942a96cc05283029086cb871cd81"; + }; + + postPatch = '' + substituteInPlace setup.py \ + --replace "click>=7.0,<8.0" "click" \ + --replace "wcwidth==0.1.9" "wcwidth" \ + --replace "redis>=3.4.0,<4.0.0" "redis" \ + --replace "mistune>=2.0,<3.0" "mistune" + ''; + + propagatedBuildInputs = [ + pygments + click + configobj + importlib-resources + mistune_2_0 + packaging + pendulum + prompt-toolkit + redis + wcwidth + ]; + + checkInputs = [ + pytestCheckHook + pexpect + ]; + + pytestFlagsArray = [ + # Fails on sandbox + "--ignore=tests/unittests/test_client.py" + "--deselect=tests/unittests/test_render_functions.py::test_render_unixtime_config_raw" + "--deselect=tests/unittests/test_render_functions.py::test_render_time" + # Only execute unittests, because cli tests require a running Redis + "tests/unittests/" + ]; + + pythonImportsCheck = [ "iredis" ]; + + meta = with lib; { + description = "A Terminal Client for Redis with AutoCompletion and Syntax Highlighting"; + changelog = "https://github.com/laixintao/iredis/raw/v${version}/CHANGELOG.md"; + homepage = "https://iredis.io/"; + license = licenses.bsd3; + maintainers = with maintainers; [ marsam ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/admin/lxd/default.nix b/third_party/nixpkgs/pkgs/tools/admin/lxd/default.nix index d664cdd508..1484f97b93 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/lxd/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/lxd/default.nix @@ -1,4 +1,4 @@ -{ lib, hwdata, pkg-config, lxc, buildGo118Package, fetchurl +{ lib, hwdata, pkg-config, lxc, buildGoPackage, fetchurl , makeWrapper, acl, rsync, gnutar, xz, btrfs-progs, gzip, dnsmasq, attr , squashfsTools, iproute2, iptables, libcap , dqlite, raft-canonical, sqlite-replication, udev @@ -9,7 +9,7 @@ , nixosTests }: -buildGo118Package rec { +buildGoPackage rec { pname = "lxd"; version = "5.3"; diff --git a/third_party/nixpkgs/pkgs/tools/admin/pgadmin/default.nix b/third_party/nixpkgs/pkgs/tools/admin/pgadmin/default.nix index e1bdca822f..58bba70e90 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/pgadmin/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/pgadmin/default.nix @@ -10,11 +10,11 @@ let pname = "pgadmin"; - version = "6.10"; + version = "6.11"; src = fetchurl { url = "https://ftp.postgresql.org/pub/pgadmin/pgadmin4/v${version}/source/pgadmin4-${version}.tar.gz"; - sha256 = "sha256-wl7qC0p1NLX4+ulb4AGNPU6D0r838t6t/IYwJZcDnVQ="; + sha256 = "sha256-1MvvQvVoWiV5hhgJUcAHbMyZzkADunLtwmszaO4EeCA="; }; yarnDeps = mkYarnModules { @@ -66,24 +66,14 @@ let pyotp botocore boto3 + azure-mgmt-subscription + azure-mgmt-rdbms + azure-mgmt-resource + azure-identity ]; - # override necessary on pgadmin4 6.10 + # override necessary on pgadmin4 6.11 pythonPackages = python3.pkgs.overrideScope (final: prev: rec { - flask = prev.flask.overridePythonAttrs (oldAttrs: rec { - version = "2.0.3"; - src = oldAttrs.src.override { - inherit version; - sha256 = "sha256-4RIMIoyi9VO0cN9KX6knq2YlhGdSYGmYGz6wqRkCaH0="; - }; - disabledTests = (oldAttrs.disabledTests or [ ]) ++ [ - "test_aborting" - ]; - }); - flask-paranoid = prev.flask-paranoid.overridePythonAttrs (oldAttrs: rec { - # tests fail due to downgrades here - doCheck = false; - }); werkzeug = prev.werkzeug.overridePythonAttrs (oldAttrs: rec { version = "2.0.3"; src = oldAttrs.src.override { @@ -128,7 +118,9 @@ pythonPackages.buildPythonApplication rec { --replace "boto3==1.20.*" "boto3>=1.20" \ --replace "botocore==1.23.*" "botocore>=1.23" \ --replace "pytz==2021.*" "pytz" \ - --replace "Werkzeug==2.0.3" "werkzeug>=2.*" + --replace "Werkzeug==2.0.3" "werkzeug>=2.*" \ + --replace "azure-identity==1.9.0" "azure-identity==1.*" \ + --replace "azure-mgmt-resource==21.0.0" "azure-mgmt-resource==21.*" # don't use Server Mode (can be overridden later) substituteInPlace pkg/pip/setup_pip.py \ --replace "req = req.replace('psycopg2', 'psycopg2-binary')" "req = req" \ diff --git a/third_party/nixpkgs/pkgs/tools/admin/pgadmin/package.json b/third_party/nixpkgs/pkgs/tools/admin/pgadmin/package.json index 693ff843e3..60eef375e5 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/pgadmin/package.json +++ b/third_party/nixpkgs/pkgs/tools/admin/pgadmin/package.json @@ -19,7 +19,7 @@ "@emotion/react": "^11.1.5", "@emotion/styled": "^10.0.14", "@emotion/utils": "^1.0.0", - "@svgr/webpack": "^5.5.0", + "@svgr/webpack": "^6.2.1", "@wojtekmaj/enzyme-adapter-react-17": "^0.4.1", "autoprefixer": "^10.2.4", "axios-mock-adapter": "^1.17.0", @@ -37,10 +37,6 @@ "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", "istanbul-instrumenter-loader": "^3.0.1", "jasmine-core": "^3.6.0", @@ -74,7 +70,7 @@ "webpack": "^5.21.2", "webpack-bundle-analyzer": "^4.4.0", "webpack-cli": "^4.5.0", - "yarn-audit-html": "^2.0.0" + "yarn-audit-html": "^3.0.1" }, "dependencies": { "@babel/plugin-proposal-class-properties": "^7.10.4", @@ -86,8 +82,6 @@ "@material-ui/icons": "^4.11.2", "@material-ui/lab": "4.0.0-alpha.58", "@material-ui/pickers": "^3.2.10", - "@mui/icons-material": "^5.4.2", - "@mui/material": "^5.4.3", "@projectstorm/react-diagrams": "^6.6.1", "@simonwep/pickr": "^1.5.1", "@szhsin/react-menu": "^2.2.0", @@ -111,7 +105,8 @@ "bootstrap4-toggle": "^3.6.1", "brace": "^0.11.1", "browserfs": "^1.4.3", - "chart.js": "^2.9.3", + "chart.js": "^3.0.0", + "chartjs-plugin-zoom": "^1.2.1", "classnames": "^2.2.6", "closest": "^0.0.1", "codemirror": "^5.59.2", @@ -141,11 +136,11 @@ "moment-timezone": "^0.5.34", "mousetrap": "^1.6.3", "notificar": "^1.0.1", - "notistack": "^2.0.0", + "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/#b0287d39b54de28cb2a83f0c19a95ce823f6feae", + "pgadmin4-tree": "git+https://github.com/EnterpriseDB/pgadmin4-treeview/#07cc449e1d89ecc8cce3679d8cff5a35f1db67ee", "postcss": "^8.2.15", "raf": "^3.4.1", "rc-dock": "^3.2.9", diff --git a/third_party/nixpkgs/pkgs/tools/admin/pgadmin/yarn.lock b/third_party/nixpkgs/pkgs/tools/admin/pgadmin/yarn.lock index 0dd2ac0253..182e681f91 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/pgadmin/yarn.lock +++ b/third_party/nixpkgs/pkgs/tools/admin/pgadmin/yarn.lock @@ -2,13 +2,13 @@ # yarn lockfile v1 -"@ampproject/remapping@^2.0.0": - version "2.0.2" - resolved "https://registry.yarnpkg.com/@ampproject/remapping/-/remapping-2.0.2.tgz#f3d9760bf30588c51408dbe7c05ff2bb13069307" - integrity sha512-sE8Gx+qSDMLoJvb3QarJJlDQK7SSY4rK3hxp4XsiANeFOmjU46ZI7Y9adAQRJrmbz8zbtZkp3mJTT+rGxtF0XA== +"@ampproject/remapping@^2.1.0": + version "2.2.0" + resolved "https://registry.yarnpkg.com/@ampproject/remapping/-/remapping-2.2.0.tgz#56c133824780de3174aed5ab6834f3026790154d" + integrity sha512-qRmjj8nj9qmLTQXXmaR1cck3UXSRMPrbsLJAasZpF+t3riI71BXed5ebIOYwQntykeZuhjsdweEc9BxH5Jc26w== dependencies: - "@jridgewell/trace-mapping" "^0.2.2" - sourcemap-codec "1.4.8" + "@jridgewell/gen-mapping" "^0.1.0" + "@jridgewell/trace-mapping" "^0.3.9" "@babel/code-frame@7.12.11": version "7.12.11" @@ -45,11 +45,16 @@ dependencies: "@babel/highlight" "^7.16.7" -"@babel/compat-data@^7.13.0", "@babel/compat-data@^7.13.11", "@babel/compat-data@^7.13.8", "@babel/compat-data@^7.14.5", "@babel/compat-data@^7.14.7", "@babel/compat-data@^7.16.4", "@babel/compat-data@^7.16.8": +"@babel/compat-data@^7.13.0", "@babel/compat-data@^7.13.11", "@babel/compat-data@^7.13.8", "@babel/compat-data@^7.14.5", "@babel/compat-data@^7.14.7", "@babel/compat-data@^7.16.4": version "7.17.0" resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.17.0.tgz#86850b8597ea6962089770952075dcaabb8dba34" integrity sha512-392byTlpGWXMv4FbyWw3sAZ/FrW/DrwqLGXpy0mbyNe9Taqv1mg9yON5/o0cnr8XYCkFTZbC1eV+c+LAROgrng== +"@babel/compat-data@^7.17.10": + version "7.17.10" + resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.17.10.tgz#711dc726a492dfc8be8220028b1b92482362baab" + integrity sha512-GZt/TCsG70Ms19gfZO1tM4CVnXsPgEPBCpJu+Qz3L0LUDsY5nZqFZglIoPC1kIYOtNBZlrnFT+klg12vFGZXrw== + "@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" @@ -72,25 +77,25 @@ semver "^6.3.0" source-map "^0.5.0" -"@babel/core@^7.12.3": - version "7.17.0" - resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.17.0.tgz#16b8772b0a567f215839f689c5ded6bb20e864d5" - integrity sha512-x/5Ea+RO5MvF9ize5DeVICJoVrNv0Mi2RnIABrZEKYvPEpldXwauPkgvYA17cKa6WpU3LoYvYbuEMFtSNFsarA== +"@babel/core@^7.15.5": + version "7.18.2" + resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.18.2.tgz#87b2fcd7cce9becaa7f5acebdc4f09f3dd19d876" + integrity sha512-A8pri1YJiC5UnkdrWcmfZTJTV85b4UXTAfImGmCfYmax4TR9Cw8sDS0MOk++Gp2mE/BefVJ5nwy5yzqNJbP/DQ== dependencies: - "@ampproject/remapping" "^2.0.0" + "@ampproject/remapping" "^2.1.0" "@babel/code-frame" "^7.16.7" - "@babel/generator" "^7.17.0" - "@babel/helper-compilation-targets" "^7.16.7" - "@babel/helper-module-transforms" "^7.16.7" - "@babel/helpers" "^7.17.0" - "@babel/parser" "^7.17.0" + "@babel/generator" "^7.18.2" + "@babel/helper-compilation-targets" "^7.18.2" + "@babel/helper-module-transforms" "^7.18.0" + "@babel/helpers" "^7.18.2" + "@babel/parser" "^7.18.0" "@babel/template" "^7.16.7" - "@babel/traverse" "^7.17.0" - "@babel/types" "^7.17.0" + "@babel/traverse" "^7.18.2" + "@babel/types" "^7.18.2" convert-source-map "^1.7.0" debug "^4.1.0" gensync "^1.0.0-beta.2" - json5 "^2.1.2" + json5 "^2.2.1" semver "^6.3.0" "@babel/eslint-parser@^7.17.0": @@ -127,6 +132,15 @@ jsesc "^2.5.1" source-map "^0.5.0" +"@babel/generator@^7.18.2": + version "7.18.2" + resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.18.2.tgz#33873d6f89b21efe2da63fe554460f3df1c5880d" + integrity sha512-W1lG5vUwFvfMd8HVXqdfbuG7RuaSrTCCD8cl8fP8wOivdbtbIg2Db3IWUcgvfxKbbn6ZBGYRW/Zk1MIwK49mgw== + dependencies: + "@babel/types" "^7.18.2" + "@jridgewell/gen-mapping" "^0.3.0" + jsesc "^2.5.1" + "@babel/helper-annotate-as-pure@^7.15.4", "@babel/helper-annotate-as-pure@^7.16.0": version "7.16.0" resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.16.0.tgz#9a1f0ebcda53d9a2d00108c4ceace6a5d5f1f08d" @@ -169,6 +183,16 @@ browserslist "^4.17.5" semver "^6.3.0" +"@babel/helper-compilation-targets@^7.17.10", "@babel/helper-compilation-targets@^7.18.2": + version "7.18.2" + resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.18.2.tgz#67a85a10cbd5fc7f1457fec2e7f45441dc6c754b" + integrity sha512-s1jnPotJS9uQnzFtiZVBUxe67CuBa679oWFHpxYYnTpRL/1ffhyX44R9uYiXoa/pLXcY9H2moJta0iaanlk/rQ== + dependencies: + "@babel/compat-data" "^7.17.10" + "@babel/helper-validator-option" "^7.16.7" + browserslist "^4.20.2" + semver "^6.3.0" + "@babel/helper-create-class-features-plugin@^7.13.0": version "7.17.1" resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.17.1.tgz#9699f14a88833a7e055ce57dcd3ffdcd25186b21" @@ -207,6 +231,19 @@ "@babel/helper-replace-supers" "^7.16.7" "@babel/helper-split-export-declaration" "^7.16.7" +"@babel/helper-create-class-features-plugin@^7.17.12", "@babel/helper-create-class-features-plugin@^7.18.0": + version "7.18.0" + resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.18.0.tgz#fac430912606331cb075ea8d82f9a4c145a4da19" + integrity sha512-Kh8zTGR9de3J63e5nS0rQUdRs/kbtwoeQQ0sriS0lItjC96u8XXZN6lKpuyWd2coKSU13py/y+LTmThLuVX0Pg== + dependencies: + "@babel/helper-annotate-as-pure" "^7.16.7" + "@babel/helper-environment-visitor" "^7.16.7" + "@babel/helper-function-name" "^7.17.9" + "@babel/helper-member-expression-to-functions" "^7.17.7" + "@babel/helper-optimise-call-expression" "^7.16.7" + "@babel/helper-replace-supers" "^7.16.7" + "@babel/helper-split-export-declaration" "^7.16.7" + "@babel/helper-create-regexp-features-plugin@^7.12.13", "@babel/helper-create-regexp-features-plugin@^7.16.7": version "7.17.0" resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.17.0.tgz#1dcc7d40ba0c6b6b25618997c5dbfd310f186fe1" @@ -223,6 +260,14 @@ "@babel/helper-annotate-as-pure" "^7.16.0" regexpu-core "^4.7.1" +"@babel/helper-create-regexp-features-plugin@^7.17.12": + version "7.17.12" + resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.17.12.tgz#bb37ca467f9694bbe55b884ae7a5cc1e0084e4fd" + integrity sha512-b2aZrV4zvutr9AIa6/gA3wsZKRwTKYoDxYiFKcESS3Ug2GTXzwBEvMuuFLhCQpEnRXs1zng4ISAXSUxxKBIcxw== + dependencies: + "@babel/helper-annotate-as-pure" "^7.16.7" + regexpu-core "^5.0.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" @@ -258,6 +303,11 @@ dependencies: "@babel/types" "^7.16.7" +"@babel/helper-environment-visitor@^7.18.2": + version "7.18.2" + resolved "https://registry.yarnpkg.com/@babel/helper-environment-visitor/-/helper-environment-visitor-7.18.2.tgz#8a6d2dedb53f6bf248e31b4baf38739ee4a637bd" + integrity sha512-14GQKWkX9oJzPiQQ7/J36FTXcD4kSp8egKjO9nINlSKiHITRA9q/R74qu8S9xlc/b/yjsJItQUeeh3xnGN0voQ== + "@babel/helper-explode-assignable-expression@^7.16.7": version "7.16.7" resolved "https://registry.yarnpkg.com/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.16.7.tgz#12a6d8522fdd834f194e868af6354e8650242b7a" @@ -292,6 +342,14 @@ "@babel/template" "^7.16.7" "@babel/types" "^7.16.7" +"@babel/helper-function-name@^7.17.9": + version "7.17.9" + resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.17.9.tgz#136fcd54bc1da82fcb47565cf16fd8e444b1ff12" + integrity sha512-7cRisGlVtiVqZ0MW0/yFB4atgpGLWEHUVYnb448hZK4x+vih0YO5UoS11XIYtZYqHd0dIPMdUSv8q5K4LdMnIg== + dependencies: + "@babel/template" "^7.16.7" + "@babel/types" "^7.17.0" + "@babel/helper-get-function-arity@^7.14.5", "@babel/helper-get-function-arity@^7.16.7": version "7.16.7" resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.16.7.tgz#ea08ac753117a669f1508ba06ebcc49156387419" @@ -341,6 +399,13 @@ dependencies: "@babel/types" "^7.16.7" +"@babel/helper-member-expression-to-functions@^7.17.7": + version "7.17.7" + resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.17.7.tgz#a34013b57d8542a8c4ff8ba3f747c02452a4d8c4" + integrity sha512-thxXgnQ8qQ11W2wVUObIqDL4p148VMxkt5T/qpN5k2fboRyzFGFmKsTGViquyM5QHKUy48OZoca8kw4ajaDPyw== + dependencies: + "@babel/types" "^7.17.0" + "@babel/helper-module-imports@^7.0.0", "@babel/helper-module-imports@^7.12.13": version "7.13.12" resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.13.12.tgz#c6a369a6f3621cb25da014078684da9196b61977" @@ -391,6 +456,20 @@ "@babel/traverse" "^7.16.7" "@babel/types" "^7.16.7" +"@babel/helper-module-transforms@^7.18.0": + version "7.18.0" + resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.18.0.tgz#baf05dec7a5875fb9235bd34ca18bad4e21221cd" + integrity sha512-kclUYSUBIjlvnzN2++K9f2qzYKFgjmnmjwL4zlmU5f8ZtzgWe8s0rUPSTGy2HmK4P8T52MQsS+HTQAgZd3dMEA== + dependencies: + "@babel/helper-environment-visitor" "^7.16.7" + "@babel/helper-module-imports" "^7.16.7" + "@babel/helper-simple-access" "^7.17.7" + "@babel/helper-split-export-declaration" "^7.16.7" + "@babel/helper-validator-identifier" "^7.16.7" + "@babel/template" "^7.16.7" + "@babel/traverse" "^7.18.0" + "@babel/types" "^7.18.0" + "@babel/helper-optimise-call-expression@^7.16.0": version "7.16.0" resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.16.0.tgz#cecdb145d70c54096b1564f8e9f10cd7d193b338" @@ -415,6 +494,11 @@ resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.16.7.tgz#aa3a8ab4c3cceff8e65eb9e73d87dc4ff320b2f5" integrity sha512-Qg3Nk7ZxpgMrsox6HreY1ZNKdBq7K72tDSliA6dCl5f007jR4ne8iD5UzuNnCJH2xBf2BEEVGr+/OL6Gdp7RxA== +"@babel/helper-plugin-utils@^7.17.12": + version "7.17.12" + resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.17.12.tgz#86c2347da5acbf5583ba0a10aed4c9bf9da9cf96" + integrity sha512-JDkf04mqtN3y4iAbO1hv9U2ARpPyPL1zqyWs/2WG1pgSq9llHFjStX5jdxb84himgJm+8Ng+x0oiWF/nw/XQKA== + "@babel/helper-remap-async-to-generator@^7.16.8": version "7.16.8" resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.16.8.tgz#29ffaade68a367e2ed09c90901986918d25e57e3" @@ -445,6 +529,17 @@ "@babel/traverse" "^7.16.0" "@babel/types" "^7.16.0" +"@babel/helper-replace-supers@^7.18.2": + version "7.18.2" + resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.18.2.tgz#41fdfcc9abaf900e18ba6e5931816d9062a7b2e0" + integrity sha512-XzAIyxx+vFnrOxiQrToSUOzUOn0e1J2Li40ntddek1Y69AXUTXoDJ40/D5RdjFu7s7qHiaeoTiempZcbuVXh2Q== + dependencies: + "@babel/helper-environment-visitor" "^7.18.2" + "@babel/helper-member-expression-to-functions" "^7.17.7" + "@babel/helper-optimise-call-expression" "^7.16.7" + "@babel/traverse" "^7.18.2" + "@babel/types" "^7.18.2" + "@babel/helper-simple-access@^7.12.13", "@babel/helper-simple-access@^7.16.7": version "7.16.7" resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.16.7.tgz#d656654b9ea08dbb9659b69d61063ccd343ff0f7" @@ -452,6 +547,13 @@ dependencies: "@babel/types" "^7.16.7" +"@babel/helper-simple-access@^7.17.7", "@babel/helper-simple-access@^7.18.2": + version "7.18.2" + resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.18.2.tgz#4dc473c2169ac3a1c9f4a51cfcd091d1c36fcff9" + integrity sha512-7LIrjYzndorDY88MycupkpQLKS1AFfsVRm2k/9PtKScSy5tZq0McZTj+DiMRynboZfIqOKvo03pmhTaUgiD6fQ== + dependencies: + "@babel/types" "^7.18.2" + "@babel/helper-skip-transparent-expression-wrappers@^7.16.0": version "7.16.0" resolved "https://registry.yarnpkg.com/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.16.0.tgz#0ee3388070147c3ae051e487eca3ebb0e2e8bb09" @@ -519,14 +621,14 @@ "@babel/traverse" "^7.13.0" "@babel/types" "^7.13.0" -"@babel/helpers@^7.17.0": - version "7.17.0" - resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.17.0.tgz#79cdf6c66a579f3a7b5e739371bc63ca0306886b" - integrity sha512-Xe/9NFxjPwELUvW2dsukcMZIp6XwPSbI4ojFBJuX5ramHuVE22SVcZIwqzdWo5uCgeTXW8qV97lMvSOjq+1+nQ== +"@babel/helpers@^7.18.2": + version "7.18.2" + resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.18.2.tgz#970d74f0deadc3f5a938bfa250738eb4ac889384" + integrity sha512-j+d+u5xT5utcQSzrh9p+PaJX94h++KN+ng9b9WEJq7pkUPAd61FGqhjuUEdfknb3E/uDBb7ruwEeKkIxNJPIrg== dependencies: "@babel/template" "^7.16.7" - "@babel/traverse" "^7.17.0" - "@babel/types" "^7.17.0" + "@babel/traverse" "^7.18.2" + "@babel/types" "^7.18.2" "@babel/highlight@^7.10.4", "@babel/highlight@^7.12.13", "@babel/highlight@^7.14.5": version "7.14.5" @@ -570,23 +672,28 @@ resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.17.0.tgz#f0ac33eddbe214e4105363bb17c3341c5ffcc43c" integrity sha512-VKXSCQx5D8S04ej+Dqsr1CzYvvWgf20jIw2D+YhQCrIlr2UZGaDds23Y0xg75/skOxpLCRpUZvk/1EAVkGoDOw== -"@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.16.7.tgz#4eda6d6c2a0aa79c70fa7b6da67763dfe2141050" - integrity sha512-anv/DObl7waiGEnC24O9zqL0pSuI9hljihqiDuFHC8d7/bjr/4RLGPWuc8rYOff/QPzbEPSkzG8wGG9aDuhHRg== - dependencies: - "@babel/helper-plugin-utils" "^7.16.7" +"@babel/parser@^7.18.0": + version "7.18.4" + resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.18.4.tgz#6774231779dd700e0af29f6ad8d479582d7ce5ef" + integrity sha512-FDge0dFazETFcxGw/EXzOkN8uJp0PC7Qbm+Pe9T+av2zlBpOgunFHkQPPn+eRuClU73JF+98D531UgayY89tow== -"@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.16.7.tgz#cc001234dfc139ac45f6bcf801866198c8c72ff9" - integrity sha512-di8vUHRdf+4aJ7ltXhaDbPoszdkh59AQtJM5soLsuHpQJdFQZOA4uGj0V2u/CZ8bJ/u8ULDL5yq6FO/bCXnKHw== +"@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression@^7.17.12": + version "7.17.12" + resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.17.12.tgz#1dca338caaefca368639c9ffb095afbd4d420b1e" + integrity sha512-xCJQXl4EeQ3J9C4yOmpTrtVGmzpm2iSzyxbkZHw7UCnZBftHpF/hpII80uWVyVrc40ytIClHjgWGTG1g/yB+aw== dependencies: - "@babel/helper-plugin-utils" "^7.16.7" + "@babel/helper-plugin-utils" "^7.17.12" + +"@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@^7.17.12": + version "7.17.12" + resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.17.12.tgz#0d498ec8f0374b1e2eb54b9cb2c4c78714c77753" + integrity sha512-/vt0hpIw0x4b6BLKUkwlvEoiGZYYLNZ96CzyHYPbtG2jZGz6LBe7/V+drYrc/d+ovrF9NBi0pmtvmNb/FsWtRQ== + dependencies: + "@babel/helper-plugin-utils" "^7.17.12" "@babel/helper-skip-transparent-expression-wrappers" "^7.16.0" - "@babel/plugin-proposal-optional-chaining" "^7.16.7" + "@babel/plugin-proposal-optional-chaining" "^7.17.12" -"@babel/plugin-proposal-async-generator-functions@^7.13.8", "@babel/plugin-proposal-async-generator-functions@^7.16.8": +"@babel/plugin-proposal-async-generator-functions@^7.13.8": version "7.16.8" resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.16.8.tgz#3bdd1ebbe620804ea9416706cd67d60787504bc8" integrity sha512-71YHIvMuiuqWJQkebWJtdhQTfd4Q4mF76q2IX37uZPkG9+olBxsX+rH1vkhFto4UeJZ9dPY2s+mDvhDm1u2BGQ== @@ -595,6 +702,15 @@ "@babel/helper-remap-async-to-generator" "^7.16.8" "@babel/plugin-syntax-async-generators" "^7.8.4" +"@babel/plugin-proposal-async-generator-functions@^7.17.12": + version "7.17.12" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.17.12.tgz#094a417e31ce7e692d84bab06c8e2a607cbeef03" + integrity sha512-RWVvqD1ooLKP6IqWTA5GyFVX2isGEgC5iFxKzfYOIy/QEFdxYyCybBDtIGjipHpb9bDWHzcqGqFakf+mVmBTdQ== + dependencies: + "@babel/helper-plugin-utils" "^7.17.12" + "@babel/helper-remap-async-to-generator" "^7.16.8" + "@babel/plugin-syntax-async-generators" "^7.8.4" + "@babel/plugin-proposal-class-properties@^7.10.4": version "7.13.0" resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.13.0.tgz#146376000b94efd001e57a40a88a525afaab9f37" @@ -603,7 +719,7 @@ "@babel/helper-create-class-features-plugin" "^7.13.0" "@babel/helper-plugin-utils" "^7.13.0" -"@babel/plugin-proposal-class-properties@^7.13.0", "@babel/plugin-proposal-class-properties@^7.16.7": +"@babel/plugin-proposal-class-properties@^7.13.0": version "7.16.7" resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.16.7.tgz#925cad7b3b1a2fcea7e59ecc8eb5954f961f91b0" integrity sha512-IobU0Xme31ewjYOShSIqd/ZGM/r/cuOz2z0MDbNrhF5FW+ZVgi0f2lyeoj9KFPDOAqsYxmLWZte1WOwlvY9aww== @@ -611,13 +727,21 @@ "@babel/helper-create-class-features-plugin" "^7.16.7" "@babel/helper-plugin-utils" "^7.16.7" -"@babel/plugin-proposal-class-static-block@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-static-block/-/plugin-proposal-class-static-block-7.16.7.tgz#712357570b612106ef5426d13dc433ce0f200c2a" - integrity sha512-dgqJJrcZoG/4CkMopzhPJjGxsIe9A8RlkQLnL/Vhhx8AA9ZuaRwGSlscSh42hazc7WSrya/IK7mTeoF0DP9tEw== +"@babel/plugin-proposal-class-properties@^7.17.12": + version "7.17.12" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.17.12.tgz#84f65c0cc247d46f40a6da99aadd6438315d80a4" + integrity sha512-U0mI9q8pW5Q9EaTHFPwSVusPMV/DV9Mm8p7csqROFLtIE9rBF5piLqyrBGigftALrBcsBGu4m38JneAe7ZDLXw== dependencies: - "@babel/helper-create-class-features-plugin" "^7.16.7" - "@babel/helper-plugin-utils" "^7.16.7" + "@babel/helper-create-class-features-plugin" "^7.17.12" + "@babel/helper-plugin-utils" "^7.17.12" + +"@babel/plugin-proposal-class-static-block@^7.18.0": + version "7.18.0" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-static-block/-/plugin-proposal-class-static-block-7.18.0.tgz#7d02253156e3c3793bdb9f2faac3a1c05f0ba710" + integrity sha512-t+8LsRMMDE74c6sV7KShIw13sqbqd58tlqNrsWoWBTIMw7SVQ0cZ905wLNS/FBCy/3PyooRHLFFlfrUNyyz5lA== + dependencies: + "@babel/helper-create-class-features-plugin" "^7.18.0" + "@babel/helper-plugin-utils" "^7.17.12" "@babel/plugin-syntax-class-static-block" "^7.14.5" "@babel/plugin-proposal-dynamic-import@^7.13.8", "@babel/plugin-proposal-dynamic-import@^7.16.7": @@ -628,7 +752,7 @@ "@babel/helper-plugin-utils" "^7.16.7" "@babel/plugin-syntax-dynamic-import" "^7.8.3" -"@babel/plugin-proposal-export-namespace-from@^7.12.13", "@babel/plugin-proposal-export-namespace-from@^7.16.7": +"@babel/plugin-proposal-export-namespace-from@^7.12.13": version "7.16.7" resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.16.7.tgz#09de09df18445a5786a305681423ae63507a6163" integrity sha512-ZxdtqDXLRGBL64ocZcs7ovt71L3jhC1RGSyR996svrCi3PYqHNkb3SwPJCs8RIzD86s+WPpt2S73+EHCGO+NUA== @@ -636,7 +760,15 @@ "@babel/helper-plugin-utils" "^7.16.7" "@babel/plugin-syntax-export-namespace-from" "^7.8.3" -"@babel/plugin-proposal-json-strings@^7.13.8", "@babel/plugin-proposal-json-strings@^7.16.7": +"@babel/plugin-proposal-export-namespace-from@^7.17.12": + version "7.17.12" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.17.12.tgz#b22864ccd662db9606edb2287ea5fd1709f05378" + integrity sha512-j7Ye5EWdwoXOpRmo5QmRyHPsDIe6+u70ZYZrd7uz+ebPYFKfRcLcNu3Ro0vOlJ5zuv8rU7xa+GttNiRzX56snQ== + dependencies: + "@babel/helper-plugin-utils" "^7.17.12" + "@babel/plugin-syntax-export-namespace-from" "^7.8.3" + +"@babel/plugin-proposal-json-strings@^7.13.8": version "7.16.7" resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.16.7.tgz#9732cb1d17d9a2626a08c5be25186c195b6fa6e8" integrity sha512-lNZ3EEggsGY78JavgbHsK9u5P3pQaW7k4axlgFLYkMd7UBsiNahCITShLjNQschPyjtO6dADrL24757IdhBrsQ== @@ -644,7 +776,15 @@ "@babel/helper-plugin-utils" "^7.16.7" "@babel/plugin-syntax-json-strings" "^7.8.3" -"@babel/plugin-proposal-logical-assignment-operators@^7.13.8", "@babel/plugin-proposal-logical-assignment-operators@^7.16.7": +"@babel/plugin-proposal-json-strings@^7.17.12": + version "7.17.12" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.17.12.tgz#f4642951792437233216d8c1af370bb0fbff4664" + integrity sha512-rKJ+rKBoXwLnIn7n6o6fulViHMrOThz99ybH+hKHcOZbnN14VuMnH9fo2eHE69C8pO4uX1Q7t2HYYIDmv8VYkg== + dependencies: + "@babel/helper-plugin-utils" "^7.17.12" + "@babel/plugin-syntax-json-strings" "^7.8.3" + +"@babel/plugin-proposal-logical-assignment-operators@^7.13.8": version "7.16.7" resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.16.7.tgz#be23c0ba74deec1922e639832904be0bea73cdea" integrity sha512-K3XzyZJGQCr00+EtYtrDjmwX7o7PLK6U9bi1nCwkQioRFVUv6dJoxbQjtWVtP+bCPy82bONBKG8NPyQ4+i6yjg== @@ -652,7 +792,15 @@ "@babel/helper-plugin-utils" "^7.16.7" "@babel/plugin-syntax-logical-assignment-operators" "^7.10.4" -"@babel/plugin-proposal-nullish-coalescing-operator@^7.13.8", "@babel/plugin-proposal-nullish-coalescing-operator@^7.16.7": +"@babel/plugin-proposal-logical-assignment-operators@^7.17.12": + version "7.17.12" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.17.12.tgz#c64a1bcb2b0a6d0ed2ff674fd120f90ee4b88a23" + integrity sha512-EqFo2s1Z5yy+JeJu7SFfbIUtToJTVlC61/C7WLKDntSw4Sz6JNAIfL7zQ74VvirxpjB5kz/kIx0gCcb+5OEo2Q== + dependencies: + "@babel/helper-plugin-utils" "^7.17.12" + "@babel/plugin-syntax-logical-assignment-operators" "^7.10.4" + +"@babel/plugin-proposal-nullish-coalescing-operator@^7.13.8": version "7.16.7" resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.16.7.tgz#141fc20b6857e59459d430c850a0011e36561d99" integrity sha512-aUOrYU3EVtjf62jQrCj63pYZ7k6vns2h/DQvHPWGmsJRYzWXZ6/AsfgpiRy6XiuIDADhJzP2Q9MwSMKauBQ+UQ== @@ -660,6 +808,14 @@ "@babel/helper-plugin-utils" "^7.16.7" "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.3" +"@babel/plugin-proposal-nullish-coalescing-operator@^7.17.12": + version "7.17.12" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.17.12.tgz#1e93079bbc2cbc756f6db6a1925157c4a92b94be" + integrity sha512-ws/g3FSGVzv+VH86+QvgtuJL/kR67xaEIF2x0iPqdDfYW6ra6JF3lKVBkWynRLcNtIC1oCTfDRVxmm2mKzy+ag== + dependencies: + "@babel/helper-plugin-utils" "^7.17.12" + "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.3" + "@babel/plugin-proposal-numeric-separator@^7.12.13", "@babel/plugin-proposal-numeric-separator@^7.16.7": version "7.16.7" resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.16.7.tgz#d6b69f4af63fb38b6ca2558442a7fb191236eba9" @@ -679,7 +835,7 @@ "@babel/plugin-syntax-object-rest-spread" "^7.8.3" "@babel/plugin-transform-parameters" "^7.14.5" -"@babel/plugin-proposal-object-rest-spread@^7.13.8", "@babel/plugin-proposal-object-rest-spread@^7.16.7": +"@babel/plugin-proposal-object-rest-spread@^7.13.8": version "7.16.7" resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.16.7.tgz#94593ef1ddf37021a25bdcb5754c4a8d534b01d8" integrity sha512-3O0Y4+dw94HA86qSg9IHfyPktgR7q3gpNVAeiKQd+8jBKFaU5NQS1Yatgo4wY+UFNuLjvxcSmzcsHqrhgTyBUA== @@ -690,6 +846,17 @@ "@babel/plugin-syntax-object-rest-spread" "^7.8.3" "@babel/plugin-transform-parameters" "^7.16.7" +"@babel/plugin-proposal-object-rest-spread@^7.18.0": + version "7.18.0" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.18.0.tgz#79f2390c892ba2a68ec112eb0d895cfbd11155e8" + integrity sha512-nbTv371eTrFabDfHLElkn9oyf9VG+VKK6WMzhY2o4eHKaG19BToD9947zzGMO6I/Irstx9d8CwX6njPNIAR/yw== + dependencies: + "@babel/compat-data" "^7.17.10" + "@babel/helper-compilation-targets" "^7.17.10" + "@babel/helper-plugin-utils" "^7.17.12" + "@babel/plugin-syntax-object-rest-spread" "^7.8.3" + "@babel/plugin-transform-parameters" "^7.17.12" + "@babel/plugin-proposal-optional-catch-binding@^7.13.8", "@babel/plugin-proposal-optional-catch-binding@^7.16.7": version "7.16.7" resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.16.7.tgz#c623a430674ffc4ab732fd0a0ae7722b67cb74cf" @@ -698,7 +865,7 @@ "@babel/helper-plugin-utils" "^7.16.7" "@babel/plugin-syntax-optional-catch-binding" "^7.8.3" -"@babel/plugin-proposal-optional-chaining@^7.13.8", "@babel/plugin-proposal-optional-chaining@^7.16.7": +"@babel/plugin-proposal-optional-chaining@^7.13.8": version "7.16.7" resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.16.7.tgz#7cd629564724816c0e8a969535551f943c64c39a" integrity sha512-eC3xy+ZrUcBtP7x+sq62Q/HYd674pPTb/77XZMb5wbDPGWIdUbSr4Agr052+zaUPSb+gGRnjxXfKFvx5iMJ+DA== @@ -707,7 +874,16 @@ "@babel/helper-skip-transparent-expression-wrappers" "^7.16.0" "@babel/plugin-syntax-optional-chaining" "^7.8.3" -"@babel/plugin-proposal-private-methods@^7.13.0", "@babel/plugin-proposal-private-methods@^7.16.11": +"@babel/plugin-proposal-optional-chaining@^7.17.12": + version "7.17.12" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.17.12.tgz#f96949e9bacace3a9066323a5cf90cfb9de67174" + integrity sha512-7wigcOs/Z4YWlK7xxjkvaIw84vGhDv/P1dFGQap0nHkc8gFKY/r+hXc8Qzf5k1gY7CvGIcHqAnOagVKJJ1wVOQ== + dependencies: + "@babel/helper-plugin-utils" "^7.17.12" + "@babel/helper-skip-transparent-expression-wrappers" "^7.16.0" + "@babel/plugin-syntax-optional-chaining" "^7.8.3" + +"@babel/plugin-proposal-private-methods@^7.13.0": version "7.16.11" resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.16.11.tgz#e8df108288555ff259f4527dbe84813aac3a1c50" integrity sha512-F/2uAkPlXDr8+BHpZvo19w3hLFKge+k75XUprE6jaqKxjGkSYcK+4c+bup5PdW/7W/Rpjwql7FTVEDW+fRAQsw== @@ -715,17 +891,25 @@ "@babel/helper-create-class-features-plugin" "^7.16.10" "@babel/helper-plugin-utils" "^7.16.7" -"@babel/plugin-proposal-private-property-in-object@^7.16.7": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.16.7.tgz#b0b8cef543c2c3d57e59e2c611994861d46a3fce" - integrity sha512-rMQkjcOFbm+ufe3bTZLyOfsOUOxyvLXZJCTARhJr+8UMSoZmqTe1K1BgkFcrW37rAchWg57yI69ORxiWvUINuQ== +"@babel/plugin-proposal-private-methods@^7.17.12": + version "7.17.12" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.17.12.tgz#c2ca3a80beb7539289938da005ad525a038a819c" + integrity sha512-SllXoxo19HmxhDWm3luPz+cPhtoTSKLJE9PXshsfrOzBqs60QP0r8OaJItrPhAj0d7mZMnNF0Y1UUggCDgMz1A== + dependencies: + "@babel/helper-create-class-features-plugin" "^7.17.12" + "@babel/helper-plugin-utils" "^7.17.12" + +"@babel/plugin-proposal-private-property-in-object@^7.17.12": + version "7.17.12" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.17.12.tgz#b02efb7f106d544667d91ae97405a9fd8c93952d" + integrity sha512-/6BtVi57CJfrtDNKfK5b66ydK2J5pXUKBKSPD2G1whamMuEnZWgoOIfO8Vf9F/DoD4izBLD/Au4NMQfruzzykg== dependencies: "@babel/helper-annotate-as-pure" "^7.16.7" - "@babel/helper-create-class-features-plugin" "^7.16.7" - "@babel/helper-plugin-utils" "^7.16.7" + "@babel/helper-create-class-features-plugin" "^7.17.12" + "@babel/helper-plugin-utils" "^7.17.12" "@babel/plugin-syntax-private-property-in-object" "^7.14.5" -"@babel/plugin-proposal-unicode-property-regex@^7.12.13", "@babel/plugin-proposal-unicode-property-regex@^7.16.7": +"@babel/plugin-proposal-unicode-property-regex@^7.12.13": version "7.16.7" resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.16.7.tgz#635d18eb10c6214210ffc5ff4932552de08188a2" integrity sha512-QRK0YI/40VLhNVGIjRNAAQkEHws0cswSdFFjpFyt943YmJIU1da9uW63Iu6NFV6CxTZW5eTDCrwZUstBWgp/Rg== @@ -733,6 +917,14 @@ "@babel/helper-create-regexp-features-plugin" "^7.16.7" "@babel/helper-plugin-utils" "^7.16.7" +"@babel/plugin-proposal-unicode-property-regex@^7.17.12": + version "7.17.12" + resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.17.12.tgz#3dbd7a67bd7f94c8238b394da112d86aaf32ad4d" + integrity sha512-Wb9qLjXf3ZazqXA7IvI7ozqRIXIGPtSo+L5coFmEkhTQK18ao4UDDD0zdTGAarmbLj2urpRwrc6893cu5Bfh0A== + dependencies: + "@babel/helper-create-regexp-features-plugin" "^7.17.12" + "@babel/helper-plugin-utils" "^7.17.12" + "@babel/plugin-proposal-unicode-property-regex@^7.4.4": version "7.16.0" resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.16.0.tgz#890482dfc5ea378e42e19a71e709728cabf18612" @@ -776,6 +968,13 @@ dependencies: "@babel/helper-plugin-utils" "^7.8.3" +"@babel/plugin-syntax-import-assertions@^7.17.12": + version "7.17.12" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.17.12.tgz#58096a92b11b2e4e54b24c6a0cc0e5e607abcedd" + integrity sha512-n/loy2zkq9ZEM8tEOwON9wTQSTNDTDEz6NujPtJGLU7qObzT1N4c4YZZf8E6ATB2AjNQg/Ib2AIpO03EZaCehw== + dependencies: + "@babel/helper-plugin-utils" "^7.17.12" + "@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" @@ -790,6 +989,13 @@ dependencies: "@babel/helper-plugin-utils" "^7.16.7" +"@babel/plugin-syntax-jsx@^7.17.12": + version "7.17.12" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.17.12.tgz#834035b45061983a491f60096f61a2e7c5674a47" + integrity sha512-spyY3E3AURfxh/RHtjx5j6hs8am5NbUBGfcZ2vB3uShSpZdQyXSf5rR5Mk76vbtlAZOelyVQ71Fg0x9SG4fsog== + dependencies: + "@babel/helper-plugin-utils" "^7.17.12" + "@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" @@ -853,14 +1059,28 @@ dependencies: "@babel/helper-plugin-utils" "^7.14.5" -"@babel/plugin-transform-arrow-functions@^7.13.0", "@babel/plugin-transform-arrow-functions@^7.16.7": +"@babel/plugin-syntax-typescript@^7.17.12": + version "7.17.12" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.17.12.tgz#b54fc3be6de734a56b87508f99d6428b5b605a7b" + integrity sha512-TYY0SXFiO31YXtNg3HtFwNJHjLsAyIIhAhNWkQ5whPPS7HWUFlg9z0Ta4qAQNjQbP1wsSt/oKkmZ/4/WWdMUpw== + dependencies: + "@babel/helper-plugin-utils" "^7.17.12" + +"@babel/plugin-transform-arrow-functions@^7.13.0": version "7.16.7" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.16.7.tgz#44125e653d94b98db76369de9c396dc14bef4154" integrity sha512-9ffkFFMbvzTvv+7dTp/66xvZAWASuPD5Tl9LK3Z9vhOmANo6j94rik+5YMBt4CwHVMWLWpMsriIc2zsa3WW3xQ== dependencies: "@babel/helper-plugin-utils" "^7.16.7" -"@babel/plugin-transform-async-to-generator@^7.13.0", "@babel/plugin-transform-async-to-generator@^7.16.8": +"@babel/plugin-transform-arrow-functions@^7.17.12": + version "7.17.12" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.17.12.tgz#dddd783b473b1b1537ef46423e3944ff24898c45" + integrity sha512-PHln3CNi/49V+mza4xMwrg+WGYevSF1oaiXaC2EQfdp4HWlSjRsrDXWJiQBKpP7749u6vQ9mcry2uuFOv5CXvA== + dependencies: + "@babel/helper-plugin-utils" "^7.17.12" + +"@babel/plugin-transform-async-to-generator@^7.13.0": version "7.16.8" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.16.8.tgz#b83dff4b970cf41f1b819f8b49cc0cfbaa53a808" integrity sha512-MtmUmTJQHCnyJVrScNzNlofQJ3dLFuobYn3mwOTKHnSCMtbNsqvF71GQmJfFjdrXSsAA7iysFmYWw4bXZ20hOg== @@ -869,6 +1089,15 @@ "@babel/helper-plugin-utils" "^7.16.7" "@babel/helper-remap-async-to-generator" "^7.16.8" +"@babel/plugin-transform-async-to-generator@^7.17.12": + version "7.17.12" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.17.12.tgz#dbe5511e6b01eee1496c944e35cdfe3f58050832" + integrity sha512-J8dbrWIOO3orDzir57NRsjg4uxucvhby0L/KZuGsWDj0g7twWK3g7JhJhOrXtuXiw8MeiSdJ3E0OW9H8LYEzLQ== + dependencies: + "@babel/helper-module-imports" "^7.16.7" + "@babel/helper-plugin-utils" "^7.17.12" + "@babel/helper-remap-async-to-generator" "^7.16.8" + "@babel/plugin-transform-block-scoped-functions@^7.12.13", "@babel/plugin-transform-block-scoped-functions@^7.16.7": version "7.16.7" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.16.7.tgz#4d0d57d9632ef6062cdf354bb717102ee042a620" @@ -876,14 +1105,21 @@ dependencies: "@babel/helper-plugin-utils" "^7.16.7" -"@babel/plugin-transform-block-scoping@^7.12.13", "@babel/plugin-transform-block-scoping@^7.16.7": +"@babel/plugin-transform-block-scoping@^7.12.13": version "7.16.7" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.16.7.tgz#f50664ab99ddeaee5bc681b8f3a6ea9d72ab4f87" integrity sha512-ObZev2nxVAYA4bhyusELdo9hb3H+A56bxH3FZMbEImZFiEDYVHXQSJ1hQKFlDnlt8G9bBrCZ5ZpURZUrV4G5qQ== dependencies: "@babel/helper-plugin-utils" "^7.16.7" -"@babel/plugin-transform-classes@^7.13.0", "@babel/plugin-transform-classes@^7.16.7": +"@babel/plugin-transform-block-scoping@^7.17.12": + version "7.18.4" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.18.4.tgz#7988627b3e9186a13e4d7735dc9c34a056613fb9" + integrity sha512-+Hq10ye+jlvLEogSOtq4mKvtk7qwcUQ1f0Mrueai866C82f844Yom2cttfJdMdqRLTxWpsbfbkIkOIfovyUQXw== + dependencies: + "@babel/helper-plugin-utils" "^7.17.12" + +"@babel/plugin-transform-classes@^7.13.0": version "7.16.7" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.16.7.tgz#8f4b9562850cd973de3b498f1218796eb181ce00" integrity sha512-WY7og38SFAGYRe64BrjKf8OrE6ulEHtr5jEYaZMwox9KebgqPi67Zqz8K53EKk1fFEJgm96r32rkKZ3qA2nCWQ== @@ -897,20 +1133,48 @@ "@babel/helper-split-export-declaration" "^7.16.7" globals "^11.1.0" -"@babel/plugin-transform-computed-properties@^7.13.0", "@babel/plugin-transform-computed-properties@^7.16.7": +"@babel/plugin-transform-classes@^7.17.12": + version "7.18.4" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.18.4.tgz#51310b812a090b846c784e47087fa6457baef814" + integrity sha512-e42NSG2mlKWgxKUAD9EJJSkZxR67+wZqzNxLSpc51T8tRU5SLFHsPmgYR5yr7sdgX4u+iHA1C5VafJ6AyImV3A== + dependencies: + "@babel/helper-annotate-as-pure" "^7.16.7" + "@babel/helper-environment-visitor" "^7.18.2" + "@babel/helper-function-name" "^7.17.9" + "@babel/helper-optimise-call-expression" "^7.16.7" + "@babel/helper-plugin-utils" "^7.17.12" + "@babel/helper-replace-supers" "^7.18.2" + "@babel/helper-split-export-declaration" "^7.16.7" + globals "^11.1.0" + +"@babel/plugin-transform-computed-properties@^7.13.0": version "7.16.7" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.16.7.tgz#66dee12e46f61d2aae7a73710f591eb3df616470" integrity sha512-gN72G9bcmenVILj//sv1zLNaPyYcOzUho2lIJBMh/iakJ9ygCo/hEF9cpGb61SCMEDxbbyBoVQxrt+bWKu5KGw== dependencies: "@babel/helper-plugin-utils" "^7.16.7" -"@babel/plugin-transform-destructuring@^7.13.0", "@babel/plugin-transform-destructuring@^7.16.7": +"@babel/plugin-transform-computed-properties@^7.17.12": + version "7.17.12" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.17.12.tgz#bca616a83679698f3258e892ed422546e531387f" + integrity sha512-a7XINeplB5cQUWMg1E/GI1tFz3LfK021IjV1rj1ypE+R7jHm+pIHmHl25VNkZxtx9uuYp7ThGk8fur1HHG7PgQ== + dependencies: + "@babel/helper-plugin-utils" "^7.17.12" + +"@babel/plugin-transform-destructuring@^7.13.0": version "7.16.7" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.16.7.tgz#ca9588ae2d63978a4c29d3f33282d8603f618e23" integrity sha512-VqAwhTHBnu5xBVDCvrvqJbtLUa++qZaWC0Fgr2mqokBlulZARGyIvZDoqbPlPaKImQ9dKAcCzbv+ul//uqu70A== dependencies: "@babel/helper-plugin-utils" "^7.16.7" +"@babel/plugin-transform-destructuring@^7.18.0": + version "7.18.0" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.18.0.tgz#dc4f92587e291b4daa78aa20cc2d7a63aa11e858" + integrity sha512-Mo69klS79z6KEfrLg/1WkmVnB8javh75HX4pi2btjvlIoasuxilEyjtsQW6XPrubNd7AQy0MMaNIaQE4e7+PQw== + dependencies: + "@babel/helper-plugin-utils" "^7.17.12" + "@babel/plugin-transform-dotall-regex@^7.12.13", "@babel/plugin-transform-dotall-regex@^7.16.7": version "7.16.7" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.16.7.tgz#6b2d67686fab15fb6a7fd4bd895d5982cfc81241" @@ -927,13 +1191,20 @@ "@babel/helper-create-regexp-features-plugin" "^7.12.13" "@babel/helper-plugin-utils" "^7.12.13" -"@babel/plugin-transform-duplicate-keys@^7.12.13", "@babel/plugin-transform-duplicate-keys@^7.16.7": +"@babel/plugin-transform-duplicate-keys@^7.12.13": version "7.16.7" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.16.7.tgz#2207e9ca8f82a0d36a5a67b6536e7ef8b08823c9" integrity sha512-03DvpbRfvWIXyK0/6QiR1KMTWeT6OcQ7tbhjrXyFS02kjuX/mu5Bvnh5SDSWHxyawit2g5aWhKwI86EE7GUnTw== dependencies: "@babel/helper-plugin-utils" "^7.16.7" +"@babel/plugin-transform-duplicate-keys@^7.17.12": + version "7.17.12" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.17.12.tgz#a09aa709a3310013f8e48e0e23bc7ace0f21477c" + integrity sha512-EA5eYFUG6xeerdabina/xIoB95jJ17mAkR8ivx6ZSu9frKShBjpOGZPn511MTDTkiCO+zXnzNczvUM69YSf3Zw== + dependencies: + "@babel/helper-plugin-utils" "^7.17.12" + "@babel/plugin-transform-exponentiation-operator@^7.12.13", "@babel/plugin-transform-exponentiation-operator@^7.16.7": version "7.16.7" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.16.7.tgz#efa9862ef97e9e9e5f653f6ddc7b665e8536fe9b" @@ -942,13 +1213,20 @@ "@babel/helper-builder-binary-assignment-operator-visitor" "^7.16.7" "@babel/helper-plugin-utils" "^7.16.7" -"@babel/plugin-transform-for-of@^7.13.0", "@babel/plugin-transform-for-of@^7.16.7": +"@babel/plugin-transform-for-of@^7.13.0": version "7.16.7" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.16.7.tgz#649d639d4617dff502a9a158c479b3b556728d8c" integrity sha512-/QZm9W92Ptpw7sjI9Nx1mbcsWz33+l8kuMIQnDwgQBG5s3fAfQvkRjQ7NqXhtNcKOnPkdICmUHyCaWW06HCsqg== dependencies: "@babel/helper-plugin-utils" "^7.16.7" +"@babel/plugin-transform-for-of@^7.18.1": + version "7.18.1" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.18.1.tgz#ed14b657e162b72afbbb2b4cdad277bf2bb32036" + integrity sha512-+TTB5XwvJ5hZbO8xvl2H4XaMDOAK57zF4miuC9qQJgysPNEAZZ9Z69rdF5LJkozGdZrjBIUAIyKUWRMmebI7vg== + dependencies: + "@babel/helper-plugin-utils" "^7.17.12" + "@babel/plugin-transform-function-name@^7.12.13", "@babel/plugin-transform-function-name@^7.16.7": version "7.16.7" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.16.7.tgz#5ab34375c64d61d083d7d2f05c38d90b97ec65cf" @@ -958,13 +1236,20 @@ "@babel/helper-function-name" "^7.16.7" "@babel/helper-plugin-utils" "^7.16.7" -"@babel/plugin-transform-literals@^7.12.13", "@babel/plugin-transform-literals@^7.16.7": +"@babel/plugin-transform-literals@^7.12.13": version "7.16.7" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.16.7.tgz#254c9618c5ff749e87cb0c0cef1a0a050c0bdab1" integrity sha512-6tH8RTpTWI0s2sV6uq3e/C9wPo4PTqqZps4uF0kzQ9/xPLFQtipynvmT1g/dOfEJ+0EQsHhkQ/zyRId8J2b8zQ== dependencies: "@babel/helper-plugin-utils" "^7.16.7" +"@babel/plugin-transform-literals@^7.17.12": + version "7.17.12" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.17.12.tgz#97131fbc6bbb261487105b4b3edbf9ebf9c830ae" + integrity sha512-8iRkvaTjJciWycPIZ9k9duu663FT7VrBdNqNgxnVXEFwOIp55JWcZd23VBRySYbnS3PwQ3rGiabJBBBGj5APmQ== + dependencies: + "@babel/helper-plugin-utils" "^7.17.12" + "@babel/plugin-transform-member-expression-literals@^7.12.13", "@babel/plugin-transform-member-expression-literals@^7.16.7": version "7.16.7" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.16.7.tgz#6e5dcf906ef8a098e630149d14c867dd28f92384" @@ -972,7 +1257,7 @@ dependencies: "@babel/helper-plugin-utils" "^7.16.7" -"@babel/plugin-transform-modules-amd@^7.13.0", "@babel/plugin-transform-modules-amd@^7.16.7": +"@babel/plugin-transform-modules-amd@^7.13.0": version "7.16.7" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.16.7.tgz#b28d323016a7daaae8609781d1f8c9da42b13186" integrity sha512-KaaEtgBL7FKYwjJ/teH63oAmE3lP34N3kshz8mm4VMAw7U3PxjVwwUmxEFksbgsNUaO3wId9R2AVQYSEGRa2+g== @@ -981,7 +1266,16 @@ "@babel/helper-plugin-utils" "^7.16.7" babel-plugin-dynamic-import-node "^2.3.3" -"@babel/plugin-transform-modules-commonjs@^7.13.8", "@babel/plugin-transform-modules-commonjs@^7.16.8": +"@babel/plugin-transform-modules-amd@^7.18.0": + version "7.18.0" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.18.0.tgz#7ef1002e67e36da3155edc8bf1ac9398064c02ed" + integrity sha512-h8FjOlYmdZwl7Xm2Ug4iX2j7Qy63NANI+NQVWQzv6r25fqgg7k2dZl03p95kvqNclglHs4FZ+isv4p1uXMA+QA== + dependencies: + "@babel/helper-module-transforms" "^7.18.0" + "@babel/helper-plugin-utils" "^7.17.12" + babel-plugin-dynamic-import-node "^2.3.3" + +"@babel/plugin-transform-modules-commonjs@^7.13.8": version "7.16.8" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.16.8.tgz#cdee19aae887b16b9d331009aa9a219af7c86afe" integrity sha512-oflKPvsLT2+uKQopesJt3ApiaIS2HW+hzHFcwRNtyDGieAeC/dIHZX8buJQ2J2X1rxGPy4eRcUijm3qcSPjYcA== @@ -991,7 +1285,17 @@ "@babel/helper-simple-access" "^7.16.7" babel-plugin-dynamic-import-node "^2.3.3" -"@babel/plugin-transform-modules-systemjs@^7.13.8", "@babel/plugin-transform-modules-systemjs@^7.16.7": +"@babel/plugin-transform-modules-commonjs@^7.18.2": + version "7.18.2" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.18.2.tgz#1aa8efa2e2a6e818b6a7f2235fceaf09bdb31e9e" + integrity sha512-f5A865gFPAJAEE0K7F/+nm5CmAE3y8AWlMBG9unu5j9+tk50UQVK0QS8RNxSp7MJf0wh97uYyLWt3Zvu71zyOQ== + dependencies: + "@babel/helper-module-transforms" "^7.18.0" + "@babel/helper-plugin-utils" "^7.17.12" + "@babel/helper-simple-access" "^7.18.2" + babel-plugin-dynamic-import-node "^2.3.3" + +"@babel/plugin-transform-modules-systemjs@^7.13.8": version "7.16.7" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.16.7.tgz#887cefaef88e684d29558c2b13ee0563e287c2d7" integrity sha512-DuK5E3k+QQmnOqBR9UkusByy5WZWGRxfzV529s9nPra1GE7olmxfqO2FHobEOYSPIjPBTr4p66YDcjQnt8cBmw== @@ -1002,7 +1306,18 @@ "@babel/helper-validator-identifier" "^7.16.7" babel-plugin-dynamic-import-node "^2.3.3" -"@babel/plugin-transform-modules-umd@^7.13.0", "@babel/plugin-transform-modules-umd@^7.16.7": +"@babel/plugin-transform-modules-systemjs@^7.18.0": + version "7.18.4" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.18.4.tgz#3d6fd9868c735cce8f38d6ae3a407fb7e61e6d46" + integrity sha512-lH2UaQaHVOAeYrUUuZ8i38o76J/FnO8vu21OE+tD1MyP9lxdZoSfz+pDbWkq46GogUrdrMz3tiz/FYGB+bVThg== + dependencies: + "@babel/helper-hoist-variables" "^7.16.7" + "@babel/helper-module-transforms" "^7.18.0" + "@babel/helper-plugin-utils" "^7.17.12" + "@babel/helper-validator-identifier" "^7.16.7" + babel-plugin-dynamic-import-node "^2.3.3" + +"@babel/plugin-transform-modules-umd@^7.13.0": version "7.16.7" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.16.7.tgz#23dad479fa585283dbd22215bff12719171e7618" integrity sha512-EMh7uolsC8O4xhudF2F6wedbSHm1HHZ0C6aJ7K67zcDNidMzVcxWdGr+htW9n21klm+bOn+Rx4CBsAntZd3rEQ== @@ -1010,20 +1325,43 @@ "@babel/helper-module-transforms" "^7.16.7" "@babel/helper-plugin-utils" "^7.16.7" -"@babel/plugin-transform-named-capturing-groups-regex@^7.12.13", "@babel/plugin-transform-named-capturing-groups-regex@^7.16.8": +"@babel/plugin-transform-modules-umd@^7.18.0": + version "7.18.0" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.18.0.tgz#56aac64a2c2a1922341129a4597d1fd5c3ff020f" + integrity sha512-d/zZ8I3BWli1tmROLxXLc9A6YXvGK8egMxHp+E/rRwMh1Kip0AP77VwZae3snEJ33iiWwvNv2+UIIhfalqhzZA== + dependencies: + "@babel/helper-module-transforms" "^7.18.0" + "@babel/helper-plugin-utils" "^7.17.12" + +"@babel/plugin-transform-named-capturing-groups-regex@^7.12.13": version "7.16.8" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.16.8.tgz#7f860e0e40d844a02c9dcf9d84965e7dfd666252" integrity sha512-j3Jw+n5PvpmhRR+mrgIh04puSANCk/T/UA3m3P1MjJkhlK906+ApHhDIqBQDdOgL/r1UYpz4GNclTXxyZrYGSw== dependencies: "@babel/helper-create-regexp-features-plugin" "^7.16.7" -"@babel/plugin-transform-new-target@^7.12.13", "@babel/plugin-transform-new-target@^7.16.7": +"@babel/plugin-transform-named-capturing-groups-regex@^7.17.12": + version "7.17.12" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.17.12.tgz#9c4a5a5966e0434d515f2675c227fd8cc8606931" + integrity sha512-vWoWFM5CKaTeHrdUJ/3SIOTRV+MBVGybOC9mhJkaprGNt5demMymDW24yC74avb915/mIRe3TgNb/d8idvnCRA== + dependencies: + "@babel/helper-create-regexp-features-plugin" "^7.17.12" + "@babel/helper-plugin-utils" "^7.17.12" + +"@babel/plugin-transform-new-target@^7.12.13": version "7.16.7" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.16.7.tgz#9967d89a5c243818e0800fdad89db22c5f514244" integrity sha512-xiLDzWNMfKoGOpc6t3U+etCE2yRnn3SM09BXqWPIZOBpL2gvVrBWUKnsJx0K/ADi5F5YC5f8APFfWrz25TdlGg== dependencies: "@babel/helper-plugin-utils" "^7.16.7" +"@babel/plugin-transform-new-target@^7.17.12": + version "7.17.12" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.17.12.tgz#10842cd605a620944e81ea6060e9e65c265742e3" + integrity sha512-CaOtzk2fDYisbjAD4Sd1MTKGVIpRtx9bWLyj24Y/k6p4s4gQ3CqDGJauFJxt8M/LEx003d0i3klVqnN73qvK3w== + dependencies: + "@babel/helper-plugin-utils" "^7.17.12" + "@babel/plugin-transform-object-super@^7.12.13", "@babel/plugin-transform-object-super@^7.16.7": version "7.16.7" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.16.7.tgz#ac359cf8d32cf4354d27a46867999490b6c32a94" @@ -1039,6 +1377,13 @@ dependencies: "@babel/helper-plugin-utils" "^7.16.7" +"@babel/plugin-transform-parameters@^7.17.12": + version "7.17.12" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.17.12.tgz#eb467cd9586ff5ff115a9880d6fdbd4a846b7766" + integrity sha512-6qW4rWo1cyCdq1FkYri7AHpauchbGLXpdwnYsfxFb+KtddHENfsY5JZb35xUwkK5opOLcJ3BNd2l7PhRYGlwIA== + dependencies: + "@babel/helper-plugin-utils" "^7.17.12" + "@babel/plugin-transform-property-literals@^7.12.13", "@babel/plugin-transform-property-literals@^7.16.7": version "7.16.7" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.16.7.tgz#2dadac85155436f22c696c4827730e0fe1057a55" @@ -1046,12 +1391,12 @@ dependencies: "@babel/helper-plugin-utils" "^7.16.7" -"@babel/plugin-transform-react-constant-elements@^7.12.1": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-constant-elements/-/plugin-transform-react-constant-elements-7.16.7.tgz#19e9e4c2df2f6c3e6b3aea11778297d81db8df62" - integrity sha512-lF+cfsyTgwWkcw715J88JhMYJ5GpysYNLhLP1PkvkhTRN7B3e74R/1KsDxFxhRpSn0UUD3IWM4GvdBR2PEbbQQ== +"@babel/plugin-transform-react-constant-elements@^7.14.5": + version "7.17.12" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-constant-elements/-/plugin-transform-react-constant-elements-7.17.12.tgz#cc580857696b6dd9e5e3d079e673d060a0657f37" + integrity sha512-maEkX2xs2STuv2Px8QuqxqjhV2LsFobT1elCgyU5704fcyTu9DyD/bJXxD/mrRiVyhpHweOQ00OJ5FKhHq9oEw== dependencies: - "@babel/helper-plugin-utils" "^7.16.7" + "@babel/helper-plugin-utils" "^7.17.12" "@babel/plugin-transform-react-display-name@^7.12.13", "@babel/plugin-transform-react-display-name@^7.16.7": version "7.16.7" @@ -1078,6 +1423,17 @@ "@babel/plugin-syntax-jsx" "^7.16.7" "@babel/types" "^7.16.7" +"@babel/plugin-transform-react-jsx@^7.17.12": + version "7.17.12" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.17.12.tgz#2aa20022709cd6a3f40b45d60603d5f269586dba" + integrity sha512-Lcaw8bxd1DKht3thfD4A12dqo1X16he1Lm8rIv8sTwjAYNInRS1qHa9aJoqvzpscItXvftKDCfaEQzwoVyXpEQ== + dependencies: + "@babel/helper-annotate-as-pure" "^7.16.7" + "@babel/helper-module-imports" "^7.16.7" + "@babel/helper-plugin-utils" "^7.17.12" + "@babel/plugin-syntax-jsx" "^7.17.12" + "@babel/types" "^7.17.12" + "@babel/plugin-transform-react-pure-annotations@^7.12.1", "@babel/plugin-transform-react-pure-annotations@^7.16.7": version "7.16.7" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-react-pure-annotations/-/plugin-transform-react-pure-annotations-7.16.7.tgz#232bfd2f12eb551d6d7d01d13fe3f86b45eb9c67" @@ -1086,20 +1442,35 @@ "@babel/helper-annotate-as-pure" "^7.16.7" "@babel/helper-plugin-utils" "^7.16.7" -"@babel/plugin-transform-regenerator@^7.12.13", "@babel/plugin-transform-regenerator@^7.16.7": +"@babel/plugin-transform-regenerator@^7.12.13": version "7.16.7" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.16.7.tgz#9e7576dc476cb89ccc5096fff7af659243b4adeb" integrity sha512-mF7jOgGYCkSJagJ6XCujSQg+6xC1M77/03K2oBmVJWoFGNUtnVJO4WHKJk3dnPC8HCcj4xBQP1Egm8DWh3Pb3Q== dependencies: regenerator-transform "^0.14.2" -"@babel/plugin-transform-reserved-words@^7.12.13", "@babel/plugin-transform-reserved-words@^7.16.7": +"@babel/plugin-transform-regenerator@^7.18.0": + version "7.18.0" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.18.0.tgz#44274d655eb3f1af3f3a574ba819d3f48caf99d5" + integrity sha512-C8YdRw9uzx25HSIzwA7EM7YP0FhCe5wNvJbZzjVNHHPGVcDJ3Aie+qGYYdS1oVQgn+B3eAIJbWFLrJ4Jipv7nw== + dependencies: + "@babel/helper-plugin-utils" "^7.17.12" + regenerator-transform "^0.15.0" + +"@babel/plugin-transform-reserved-words@^7.12.13": version "7.16.7" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.16.7.tgz#1d798e078f7c5958eec952059c460b220a63f586" integrity sha512-KQzzDnZ9hWQBjwi5lpY5v9shmm6IVG0U9pB18zvMu2i4H90xpT4gmqwPYsn8rObiadYe2M0gmgsiOIF5A/2rtg== dependencies: "@babel/helper-plugin-utils" "^7.16.7" +"@babel/plugin-transform-reserved-words@^7.17.12": + version "7.17.12" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.17.12.tgz#7dbd349f3cdffba751e817cf40ca1386732f652f" + integrity sha512-1KYqwbJV3Co03NIi14uEHW8P50Md6KqFgt0FfpHdK6oyAHQVTosgPuPSiWud1HX0oYJ1hGRRlk0fP87jFpqXZA== + dependencies: + "@babel/helper-plugin-utils" "^7.17.12" + "@babel/plugin-transform-shorthand-properties@^7.12.13", "@babel/plugin-transform-shorthand-properties@^7.16.7": version "7.16.7" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.16.7.tgz#e8549ae4afcf8382f711794c0c7b6b934c5fbd2a" @@ -1107,7 +1478,7 @@ dependencies: "@babel/helper-plugin-utils" "^7.16.7" -"@babel/plugin-transform-spread@^7.13.0", "@babel/plugin-transform-spread@^7.16.7": +"@babel/plugin-transform-spread@^7.13.0": version "7.16.7" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.16.7.tgz#a303e2122f9f12e0105daeedd0f30fb197d8ff44" integrity sha512-+pjJpgAngb53L0iaA5gU/1MLXJIfXcYepLgXB3esVRf4fqmj8f2cxM3/FKaHsZms08hFQJkFccEWuIpm429TXg== @@ -1115,6 +1486,14 @@ "@babel/helper-plugin-utils" "^7.16.7" "@babel/helper-skip-transparent-expression-wrappers" "^7.16.0" +"@babel/plugin-transform-spread@^7.17.12": + version "7.17.12" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.17.12.tgz#c112cad3064299f03ea32afed1d659223935d1f5" + integrity sha512-9pgmuQAtFi3lpNUstvG9nGfk9DkrdmWNp9KeKPFmuZCpEnxRzYlS8JgwPjYj+1AWDOSvoGN0H30p1cBOmT/Svg== + dependencies: + "@babel/helper-plugin-utils" "^7.17.12" + "@babel/helper-skip-transparent-expression-wrappers" "^7.16.0" + "@babel/plugin-transform-sticky-regex@^7.12.13", "@babel/plugin-transform-sticky-regex@^7.16.7": version "7.16.7" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.16.7.tgz#c84741d4f4a38072b9a1e2e3fd56d359552e8660" @@ -1122,20 +1501,34 @@ dependencies: "@babel/helper-plugin-utils" "^7.16.7" -"@babel/plugin-transform-template-literals@^7.13.0", "@babel/plugin-transform-template-literals@^7.16.7": +"@babel/plugin-transform-template-literals@^7.13.0": version "7.16.7" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.16.7.tgz#f3d1c45d28967c8e80f53666fc9c3e50618217ab" integrity sha512-VwbkDDUeenlIjmfNeDX/V0aWrQH2QiVyJtwymVQSzItFDTpxfyJh3EVaQiS0rIN/CqbLGr0VcGmuwyTdZtdIsA== dependencies: "@babel/helper-plugin-utils" "^7.16.7" -"@babel/plugin-transform-typeof-symbol@^7.12.13", "@babel/plugin-transform-typeof-symbol@^7.16.7": +"@babel/plugin-transform-template-literals@^7.18.2": + version "7.18.2" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.18.2.tgz#31ed6915721864847c48b656281d0098ea1add28" + integrity sha512-/cmuBVw9sZBGZVOMkpAEaVLwm4JmK2GZ1dFKOGGpMzEHWFmyZZ59lUU0PdRr8YNYeQdNzTDwuxP2X2gzydTc9g== + dependencies: + "@babel/helper-plugin-utils" "^7.17.12" + +"@babel/plugin-transform-typeof-symbol@^7.12.13": version "7.16.7" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.16.7.tgz#9cdbe622582c21368bd482b660ba87d5545d4f7e" integrity sha512-p2rOixCKRJzpg9JB4gjnG4gjWkWa89ZoYUnl9snJ1cWIcTH/hvxZqfO+WjG6T8DRBpctEol5jw1O5rA8gkCokQ== dependencies: "@babel/helper-plugin-utils" "^7.16.7" +"@babel/plugin-transform-typeof-symbol@^7.17.12": + version "7.17.12" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.17.12.tgz#0f12f57ac35e98b35b4ed34829948d42bd0e6889" + integrity sha512-Q8y+Jp7ZdtSPXCThB6zjQ74N3lj0f6TDh1Hnf5B+sYlzQ8i5Pjp8gW0My79iekSpT4WnI06blqP6DT0OmaXXmw== + dependencies: + "@babel/helper-plugin-utils" "^7.17.12" + "@babel/plugin-transform-typescript@^7.16.0": version "7.16.1" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.16.1.tgz#cc0670b2822b0338355bc1b3d2246a42b8166409" @@ -1145,6 +1538,15 @@ "@babel/helper-plugin-utils" "^7.14.5" "@babel/plugin-syntax-typescript" "^7.16.0" +"@babel/plugin-transform-typescript@^7.17.12": + version "7.18.4" + resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.18.4.tgz#587eaf6a39edb8c06215e550dc939faeadd750bf" + integrity sha512-l4vHuSLUajptpHNEOUDEGsnpl9pfRLsN1XUoDQDD/YBuXTM+v37SHGS+c6n4jdcZy96QtuUuSvZYMLSSsjH8Mw== + dependencies: + "@babel/helper-create-class-features-plugin" "^7.18.0" + "@babel/helper-plugin-utils" "^7.17.12" + "@babel/plugin-syntax-typescript" "^7.17.12" + "@babel/plugin-transform-unicode-escapes@^7.12.13", "@babel/plugin-transform-unicode-escapes@^7.16.7": version "7.16.7" resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.16.7.tgz#da8717de7b3287a2c6d659750c964f302b31ece3" @@ -1234,37 +1636,38 @@ core-js-compat "^3.9.0" semver "^6.3.0" -"@babel/preset-env@^7.12.1": - version "7.16.11" - resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.16.11.tgz#5dd88fd885fae36f88fd7c8342475c9f0abe2982" - integrity sha512-qcmWG8R7ZW6WBRPZK//y+E3Cli151B20W1Rv7ln27vuPaXU/8TKms6jFdiJtF7UDTxcrb7mZd88tAeK9LjdT8g== +"@babel/preset-env@^7.15.6": + version "7.18.2" + resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.18.2.tgz#f47d3000a098617926e674c945d95a28cb90977a" + integrity sha512-PfpdxotV6afmXMU47S08F9ZKIm2bJIQ0YbAAtDfIENX7G1NUAXigLREh69CWDjtgUy7dYn7bsMzkgdtAlmS68Q== dependencies: - "@babel/compat-data" "^7.16.8" - "@babel/helper-compilation-targets" "^7.16.7" - "@babel/helper-plugin-utils" "^7.16.7" + "@babel/compat-data" "^7.17.10" + "@babel/helper-compilation-targets" "^7.18.2" + "@babel/helper-plugin-utils" "^7.17.12" "@babel/helper-validator-option" "^7.16.7" - "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression" "^7.16.7" - "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining" "^7.16.7" - "@babel/plugin-proposal-async-generator-functions" "^7.16.8" - "@babel/plugin-proposal-class-properties" "^7.16.7" - "@babel/plugin-proposal-class-static-block" "^7.16.7" + "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression" "^7.17.12" + "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining" "^7.17.12" + "@babel/plugin-proposal-async-generator-functions" "^7.17.12" + "@babel/plugin-proposal-class-properties" "^7.17.12" + "@babel/plugin-proposal-class-static-block" "^7.18.0" "@babel/plugin-proposal-dynamic-import" "^7.16.7" - "@babel/plugin-proposal-export-namespace-from" "^7.16.7" - "@babel/plugin-proposal-json-strings" "^7.16.7" - "@babel/plugin-proposal-logical-assignment-operators" "^7.16.7" - "@babel/plugin-proposal-nullish-coalescing-operator" "^7.16.7" + "@babel/plugin-proposal-export-namespace-from" "^7.17.12" + "@babel/plugin-proposal-json-strings" "^7.17.12" + "@babel/plugin-proposal-logical-assignment-operators" "^7.17.12" + "@babel/plugin-proposal-nullish-coalescing-operator" "^7.17.12" "@babel/plugin-proposal-numeric-separator" "^7.16.7" - "@babel/plugin-proposal-object-rest-spread" "^7.16.7" + "@babel/plugin-proposal-object-rest-spread" "^7.18.0" "@babel/plugin-proposal-optional-catch-binding" "^7.16.7" - "@babel/plugin-proposal-optional-chaining" "^7.16.7" - "@babel/plugin-proposal-private-methods" "^7.16.11" - "@babel/plugin-proposal-private-property-in-object" "^7.16.7" - "@babel/plugin-proposal-unicode-property-regex" "^7.16.7" + "@babel/plugin-proposal-optional-chaining" "^7.17.12" + "@babel/plugin-proposal-private-methods" "^7.17.12" + "@babel/plugin-proposal-private-property-in-object" "^7.17.12" + "@babel/plugin-proposal-unicode-property-regex" "^7.17.12" "@babel/plugin-syntax-async-generators" "^7.8.4" "@babel/plugin-syntax-class-properties" "^7.12.13" "@babel/plugin-syntax-class-static-block" "^7.14.5" "@babel/plugin-syntax-dynamic-import" "^7.8.3" "@babel/plugin-syntax-export-namespace-from" "^7.8.3" + "@babel/plugin-syntax-import-assertions" "^7.17.12" "@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" @@ -1274,44 +1677,44 @@ "@babel/plugin-syntax-optional-chaining" "^7.8.3" "@babel/plugin-syntax-private-property-in-object" "^7.14.5" "@babel/plugin-syntax-top-level-await" "^7.14.5" - "@babel/plugin-transform-arrow-functions" "^7.16.7" - "@babel/plugin-transform-async-to-generator" "^7.16.8" + "@babel/plugin-transform-arrow-functions" "^7.17.12" + "@babel/plugin-transform-async-to-generator" "^7.17.12" "@babel/plugin-transform-block-scoped-functions" "^7.16.7" - "@babel/plugin-transform-block-scoping" "^7.16.7" - "@babel/plugin-transform-classes" "^7.16.7" - "@babel/plugin-transform-computed-properties" "^7.16.7" - "@babel/plugin-transform-destructuring" "^7.16.7" + "@babel/plugin-transform-block-scoping" "^7.17.12" + "@babel/plugin-transform-classes" "^7.17.12" + "@babel/plugin-transform-computed-properties" "^7.17.12" + "@babel/plugin-transform-destructuring" "^7.18.0" "@babel/plugin-transform-dotall-regex" "^7.16.7" - "@babel/plugin-transform-duplicate-keys" "^7.16.7" + "@babel/plugin-transform-duplicate-keys" "^7.17.12" "@babel/plugin-transform-exponentiation-operator" "^7.16.7" - "@babel/plugin-transform-for-of" "^7.16.7" + "@babel/plugin-transform-for-of" "^7.18.1" "@babel/plugin-transform-function-name" "^7.16.7" - "@babel/plugin-transform-literals" "^7.16.7" + "@babel/plugin-transform-literals" "^7.17.12" "@babel/plugin-transform-member-expression-literals" "^7.16.7" - "@babel/plugin-transform-modules-amd" "^7.16.7" - "@babel/plugin-transform-modules-commonjs" "^7.16.8" - "@babel/plugin-transform-modules-systemjs" "^7.16.7" - "@babel/plugin-transform-modules-umd" "^7.16.7" - "@babel/plugin-transform-named-capturing-groups-regex" "^7.16.8" - "@babel/plugin-transform-new-target" "^7.16.7" + "@babel/plugin-transform-modules-amd" "^7.18.0" + "@babel/plugin-transform-modules-commonjs" "^7.18.2" + "@babel/plugin-transform-modules-systemjs" "^7.18.0" + "@babel/plugin-transform-modules-umd" "^7.18.0" + "@babel/plugin-transform-named-capturing-groups-regex" "^7.17.12" + "@babel/plugin-transform-new-target" "^7.17.12" "@babel/plugin-transform-object-super" "^7.16.7" - "@babel/plugin-transform-parameters" "^7.16.7" + "@babel/plugin-transform-parameters" "^7.17.12" "@babel/plugin-transform-property-literals" "^7.16.7" - "@babel/plugin-transform-regenerator" "^7.16.7" - "@babel/plugin-transform-reserved-words" "^7.16.7" + "@babel/plugin-transform-regenerator" "^7.18.0" + "@babel/plugin-transform-reserved-words" "^7.17.12" "@babel/plugin-transform-shorthand-properties" "^7.16.7" - "@babel/plugin-transform-spread" "^7.16.7" + "@babel/plugin-transform-spread" "^7.17.12" "@babel/plugin-transform-sticky-regex" "^7.16.7" - "@babel/plugin-transform-template-literals" "^7.16.7" - "@babel/plugin-transform-typeof-symbol" "^7.16.7" + "@babel/plugin-transform-template-literals" "^7.18.2" + "@babel/plugin-transform-typeof-symbol" "^7.17.12" "@babel/plugin-transform-unicode-escapes" "^7.16.7" "@babel/plugin-transform-unicode-regex" "^7.16.7" "@babel/preset-modules" "^0.1.5" - "@babel/types" "^7.16.8" + "@babel/types" "^7.18.2" babel-plugin-polyfill-corejs2 "^0.3.0" babel-plugin-polyfill-corejs3 "^0.5.0" babel-plugin-polyfill-regenerator "^0.3.0" - core-js-compat "^3.20.2" + core-js-compat "^3.22.1" semver "^6.3.0" "@babel/preset-modules@^0.1.4", "@babel/preset-modules@^0.1.5": @@ -1337,18 +1740,27 @@ "@babel/plugin-transform-react-jsx-development" "^7.12.17" "@babel/plugin-transform-react-pure-annotations" "^7.12.1" -"@babel/preset-react@^7.12.5": - version "7.16.7" - resolved "https://registry.yarnpkg.com/@babel/preset-react/-/preset-react-7.16.7.tgz#4c18150491edc69c183ff818f9f2aecbe5d93852" - integrity sha512-fWpyI8UM/HE6DfPBzD8LnhQ/OcH8AgTaqcqP2nGOXEUV+VKBR5JRN9hCk9ai+zQQ57vtm9oWeXguBCPNUjytgA== +"@babel/preset-react@^7.14.5": + version "7.17.12" + resolved "https://registry.yarnpkg.com/@babel/preset-react/-/preset-react-7.17.12.tgz#62adbd2d1870c0de3893095757ed5b00b492ab3d" + integrity sha512-h5U+rwreXtZaRBEQhW1hOJLMq8XNJBQ/9oymXiCXTuT/0uOwpbT0gUt+sXeOqoXBgNuUKI7TaObVwoEyWkpFgA== dependencies: - "@babel/helper-plugin-utils" "^7.16.7" + "@babel/helper-plugin-utils" "^7.17.12" "@babel/helper-validator-option" "^7.16.7" "@babel/plugin-transform-react-display-name" "^7.16.7" - "@babel/plugin-transform-react-jsx" "^7.16.7" + "@babel/plugin-transform-react-jsx" "^7.17.12" "@babel/plugin-transform-react-jsx-development" "^7.16.7" "@babel/plugin-transform-react-pure-annotations" "^7.16.7" +"@babel/preset-typescript@^7.15.0": + version "7.17.12" + resolved "https://registry.yarnpkg.com/@babel/preset-typescript/-/preset-typescript-7.17.12.tgz#40269e0a0084d56fc5731b6c40febe1c9a4a3e8c" + integrity sha512-S1ViF8W2QwAKUGJXxP9NAfNaqGDdEBJKpYkxHf5Yy2C4NPPzXGeR3Lhk7G8xJaaLcFTRfNjVbtbVtm8Gb0mqvg== + dependencies: + "@babel/helper-plugin-utils" "^7.17.12" + "@babel/helper-validator-option" "^7.16.7" + "@babel/plugin-transform-typescript" "^7.17.12" + "@babel/preset-typescript@^7.8.3": version "7.16.0" resolved "https://registry.yarnpkg.com/@babel/preset-typescript/-/preset-typescript-7.16.0.tgz#b0b4f105b855fb3d631ec036cdc9d1ffd1fa5eac" @@ -1372,7 +1784,7 @@ dependencies: regenerator-runtime "^0.13.4" -"@babel/runtime@^7.17.2", "@babel/runtime@^7.7.6": +"@babel/runtime@^7.7.6": version "7.17.8" resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.17.8.tgz#3e56e4aff81befa55ac3ac6a0967349fd1c5bca2" integrity sha512-dQpEpK0O9o6lj6oPu0gRDbbnk+4LeHlNcBpspf6Olzt3GIX4P1lWF1gS+pHLDFlaJvbR6q7jCfQ08zA4QJBnmA== @@ -1436,7 +1848,7 @@ debug "^4.1.0" globals "^11.1.0" -"@babel/traverse@^7.16.7", "@babel/traverse@^7.16.8", "@babel/traverse@^7.17.0": +"@babel/traverse@^7.16.7", "@babel/traverse@^7.16.8": version "7.17.0" resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.17.0.tgz#3143e5066796408ccc880a33ecd3184f3e75cd30" integrity sha512-fpFIXvqD6kC7c7PUNnZ0Z8cQXlarCLtCUpt2S1Dx7PjoRtCFffvOkHHSom+m5HIxMZn5bIBVb71lhabcmjEsqg== @@ -1452,13 +1864,21 @@ debug "^4.1.0" globals "^11.1.0" -"@babel/types@^7.12.6", "@babel/types@^7.13.12", "@babel/types@^7.16.0", "@babel/types@^7.16.7", "@babel/types@^7.16.8", "@babel/types@^7.17.0": - version "7.17.0" - resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.17.0.tgz#a826e368bccb6b3d84acd76acad5c0d87342390b" - integrity sha512-TmKSNO4D5rzhL5bjWFcVHHLETzfQ/AmbKpKPOSjlP0WoHZ6L911fgoOKY4Alp/emzG4cHJdyN49zpgkbXFEHHw== +"@babel/traverse@^7.18.0", "@babel/traverse@^7.18.2": + version "7.18.2" + resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.18.2.tgz#b77a52604b5cc836a9e1e08dca01cba67a12d2e8" + integrity sha512-9eNwoeovJ6KH9zcCNnENY7DMFwTU9JdGCFtqNLfUAqtUHRCOsTOqWoffosP8vKmNYeSBUv3yVJXjfd8ucwOjUA== dependencies: - "@babel/helper-validator-identifier" "^7.16.7" - to-fast-properties "^2.0.0" + "@babel/code-frame" "^7.16.7" + "@babel/generator" "^7.18.2" + "@babel/helper-environment-visitor" "^7.18.2" + "@babel/helper-function-name" "^7.17.9" + "@babel/helper-hoist-variables" "^7.16.7" + "@babel/helper-split-export-declaration" "^7.16.7" + "@babel/parser" "^7.18.0" + "@babel/types" "^7.18.2" + debug "^4.1.0" + globals "^11.1.0" "@babel/types@^7.13.0", "@babel/types@^7.14.5", "@babel/types@^7.4.4": version "7.15.4" @@ -1468,6 +1888,22 @@ "@babel/helper-validator-identifier" "^7.14.9" to-fast-properties "^2.0.0" +"@babel/types@^7.13.12", "@babel/types@^7.16.0", "@babel/types@^7.16.7", "@babel/types@^7.16.8", "@babel/types@^7.17.0": + version "7.17.0" + resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.17.0.tgz#a826e368bccb6b3d84acd76acad5c0d87342390b" + integrity sha512-TmKSNO4D5rzhL5bjWFcVHHLETzfQ/AmbKpKPOSjlP0WoHZ6L911fgoOKY4Alp/emzG4cHJdyN49zpgkbXFEHHw== + dependencies: + "@babel/helper-validator-identifier" "^7.16.7" + to-fast-properties "^2.0.0" + +"@babel/types@^7.15.6", "@babel/types@^7.17.12", "@babel/types@^7.18.0", "@babel/types@^7.18.2": + version "7.18.4" + resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.18.4.tgz#27eae9b9fd18e9dccc3f9d6ad051336f307be354" + integrity sha512-ThN1mBcMq5pG/Vm2IcBmPPfyPXbd8S02rS+OBIDENdufvqC7Z/jHPCv9IcP01277aKtDI8g/2XysBN4hA8niiw== + dependencies: + "@babel/helper-validator-identifier" "^7.16.7" + to-fast-properties "^2.0.0" + "@colors/colors@1.5.0": version "1.5.0" resolved "https://registry.yarnpkg.com/@colors/colors/-/colors-1.5.0.tgz#bb504579c1cae923e6576a4f5da43d25f97bdbd9" @@ -1511,17 +1947,6 @@ "@emotion/weak-memoize" "^0.2.5" stylis "^4.0.10" -"@emotion/cache@^11.7.1": - version "11.7.1" - resolved "https://registry.yarnpkg.com/@emotion/cache/-/cache-11.7.1.tgz#08d080e396a42e0037848214e8aa7bf879065539" - integrity sha512-r65Zy4Iljb8oyjtLeCuBH8Qjiy107dOYC6SJq7g7GV5UCQWMObY4SJDPGFjiiVpPrOJ2hmJOoBiYTC7hwx9E2A== - dependencies: - "@emotion/memoize" "^0.7.4" - "@emotion/sheet" "^1.1.0" - "@emotion/utils" "^1.0.0" - "@emotion/weak-memoize" "^0.2.5" - stylis "4.0.13" - "@emotion/core@^10.0.14": version "10.1.1" resolved "https://registry.yarnpkg.com/@emotion/core/-/core-10.1.1.tgz#c956c1365f2f2481960064bcb8c4732e5fb612c3" @@ -1555,13 +1980,6 @@ dependencies: "@emotion/memoize" "0.7.4" -"@emotion/is-prop-valid@^1.1.2": - version "1.1.2" - resolved "https://registry.yarnpkg.com/@emotion/is-prop-valid/-/is-prop-valid-1.1.2.tgz#34ad6e98e871aa6f7a20469b602911b8b11b3a95" - integrity sha512-3QnhqeL+WW88YjYbQL5gUIkthuMw7a0NGbZ7wfFVk2kg/CK5w8w5FFa0RzWjyY1+sujN0NWbtSHH6OJmWHtJpQ== - 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" @@ -1617,11 +2035,6 @@ resolved "https://registry.yarnpkg.com/@emotion/sheet/-/sheet-1.0.3.tgz#00c326cd7985c5ccb8fe2c1b592886579dcfab8f" integrity sha512-YoX5GyQ4db7LpbmXHMuc8kebtBGP6nZfRC5Z13OKJMixBEwdZrJ914D6yJv/P+ZH/YY3F5s89NYX2hlZAf3SRQ== -"@emotion/sheet@^1.1.0": - version "1.1.0" - resolved "https://registry.yarnpkg.com/@emotion/sheet/-/sheet-1.1.0.tgz#56d99c41f0a1cda2726a05aa6a20afd4c63e58d2" - integrity sha512-u0AX4aSo25sMAygCuQTzS+HsImZFuS8llY8O7b9MDRzbJM0kVJlAz6KNDqcG7pOuQZJmj/8X/rAW+66kMnMW+g== - "@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" @@ -1709,18 +2122,45 @@ resolved "https://registry.yarnpkg.com/@istanbuljs/schema/-/schema-0.1.3.tgz#e45e384e4b8ec16bce2fd903af78450f6bf7ec98" integrity sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA== +"@jridgewell/gen-mapping@^0.1.0": + version "0.1.1" + resolved "https://registry.yarnpkg.com/@jridgewell/gen-mapping/-/gen-mapping-0.1.1.tgz#e5d2e450306a9491e3bd77e323e38d7aff315996" + integrity sha512-sQXCasFk+U8lWYEe66WxRDOE9PjVz4vSM51fTu3Hw+ClTpUSQb718772vH3pyS5pShp6lvQM7SxgIDXXXmOX7w== + dependencies: + "@jridgewell/set-array" "^1.0.0" + "@jridgewell/sourcemap-codec" "^1.4.10" + +"@jridgewell/gen-mapping@^0.3.0": + version "0.3.1" + resolved "https://registry.yarnpkg.com/@jridgewell/gen-mapping/-/gen-mapping-0.3.1.tgz#cf92a983c83466b8c0ce9124fadeaf09f7c66ea9" + integrity sha512-GcHwniMlA2z+WFPWuY8lp3fsza0I8xPFMWL5+n8LYyP6PSvPrXf4+n8stDHZY2DM0zy9sVkRDy1jDI4XGzYVqg== + dependencies: + "@jridgewell/set-array" "^1.0.0" + "@jridgewell/sourcemap-codec" "^1.4.10" + "@jridgewell/trace-mapping" "^0.3.9" + "@jridgewell/resolve-uri@^3.0.3": version "3.0.4" resolved "https://registry.yarnpkg.com/@jridgewell/resolve-uri/-/resolve-uri-3.0.4.tgz#b876e3feefb9c8d3aa84014da28b5e52a0640d72" integrity sha512-cz8HFjOFfUBtvN+NXYSFMHYRdxZMaEl0XypVrhzxBgadKIXhIkRd8aMeHhmF56Sl7SuS8OnUpQ73/k9LE4VnLg== -"@jridgewell/trace-mapping@^0.2.2": - version "0.2.5" - resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.2.5.tgz#d5061cc513fd3a0a949feb56b8073989865b1abe" - integrity sha512-K+Eths78fXDFOvQ2hgJhCiI5s+g81r2yXmACBpbn+f2+Qt94PNoTgUcAXPT8DZkhXCsZRsHVWVtY5KIBMcpDqQ== +"@jridgewell/set-array@^1.0.0": + version "1.1.1" + resolved "https://registry.yarnpkg.com/@jridgewell/set-array/-/set-array-1.1.1.tgz#36a6acc93987adcf0ba50c66908bd0b70de8afea" + integrity sha512-Ct5MqZkLGEXTVmQYbGtx9SVqD2fqwvdubdps5D3djjAkgkKwT918VNOz65pEHFaYTeWcukmJmH5SwsA9Tn2ObQ== + +"@jridgewell/sourcemap-codec@^1.4.10": + version "1.4.13" + resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.13.tgz#b6461fb0c2964356c469e115f504c95ad97ab88c" + integrity sha512-GryiOJmNcWbovBxTfZSF71V/mXbgcV3MewDe3kIMCLyIh5e7SKAeUZs+rMnJ8jkMolZ/4/VsdBmMrw3l+VdZ3w== + +"@jridgewell/trace-mapping@^0.3.9": + version "0.3.13" + resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.13.tgz#dcfe3e95f224c8fe97a87a5235defec999aa92ea" + integrity sha512-o1xbKhp9qnIAoHJSWd6KlCZfqslL4valSF81H8ImioOAxluWYWOpWkpyktY2vnt4tbrX9XYaxovq6cgowaJp2w== dependencies: "@jridgewell/resolve-uri" "^3.0.3" - sourcemap-codec "1.4.8" + "@jridgewell/sourcemap-codec" "^1.4.10" "@material-ui/core@4.11.0": version "4.11.0" @@ -1816,93 +2256,6 @@ prop-types "^15.7.2" react-is "^16.8.0 || ^17.0.0" -"@mui/base@5.0.0-alpha.74": - version "5.0.0-alpha.74" - resolved "https://registry.yarnpkg.com/@mui/base/-/base-5.0.0-alpha.74.tgz#15509242e7911446d5957375b1b18cbb72b3a750" - integrity sha512-pw3T1xNXpW8pLo9+BvtyazZb0CSjNJsjbzznlbV/aNkBfjNPXQVI3X1NDm3WSI8y6M96WDIVO7XrHAohOwALSQ== - dependencies: - "@babel/runtime" "^7.17.2" - "@emotion/is-prop-valid" "^1.1.2" - "@mui/types" "^7.1.3" - "@mui/utils" "^5.5.3" - "@popperjs/core" "^2.11.4" - clsx "^1.1.1" - prop-types "^15.7.2" - react-is "^17.0.2" - -"@mui/icons-material@^5.4.2": - version "5.5.1" - resolved "https://registry.yarnpkg.com/@mui/icons-material/-/icons-material-5.5.1.tgz#848a57972617411370775980cbc6990588d4aafb" - integrity sha512-40f68p5+Yhq3dCn3QYHqQt5RETPyR3AkDw+fma8PtcjqvZ+d+jF84kFmT6NqwA3he7TlwluEtkyAmPzUE4uPdA== - dependencies: - "@babel/runtime" "^7.17.2" - -"@mui/material@^5.4.3": - version "5.5.3" - resolved "https://registry.yarnpkg.com/@mui/material/-/material-5.5.3.tgz#411e53a69da3f9d6664e99f1bdcdaf2760540fdc" - integrity sha512-eADa3kUYbbr1jNjcufn0a7HeU8cSo0agbrkj720hodxVFNIfzq7a2e58Z+PaZqll55kMGBvlYJ7rTcXU399x5A== - dependencies: - "@babel/runtime" "^7.17.2" - "@mui/base" "5.0.0-alpha.74" - "@mui/system" "^5.5.3" - "@mui/types" "^7.1.3" - "@mui/utils" "^5.5.3" - "@types/react-transition-group" "^4.4.4" - clsx "^1.1.1" - csstype "^3.0.11" - hoist-non-react-statics "^3.3.2" - prop-types "^15.7.2" - react-is "^17.0.2" - react-transition-group "^4.4.2" - -"@mui/private-theming@^5.5.3": - version "5.5.3" - resolved "https://registry.yarnpkg.com/@mui/private-theming/-/private-theming-5.5.3.tgz#c232a39dd3c268fdef7e92ccc40d51bda9eec3ab" - integrity sha512-Wf7NurY7lk8SBWelSBY2U02zxLt1773JpIcXTHuEC9/GZdQA4CXCJGl2cVQzheKhee5rZ+8JwGulrRiVl1m+4A== - dependencies: - "@babel/runtime" "^7.17.2" - "@mui/utils" "^5.5.3" - prop-types "^15.7.2" - -"@mui/styled-engine@^5.5.2": - version "5.5.2" - resolved "https://registry.yarnpkg.com/@mui/styled-engine/-/styled-engine-5.5.2.tgz#1f92dd27d76f0b7df7aa52c7c7a710e59b2275a6" - integrity sha512-jkz5AHHbA43akBo5L3y1X1/X0f+RvXvCp3eXKt+iOf3qnKSAausbtlVz7gBbC4xIWDnP1Jb/6T+t/0/7gObRYA== - dependencies: - "@babel/runtime" "^7.17.2" - "@emotion/cache" "^11.7.1" - prop-types "^15.7.2" - -"@mui/system@^5.5.3": - version "5.5.3" - resolved "https://registry.yarnpkg.com/@mui/system/-/system-5.5.3.tgz#c78d4c16009430389ffd3495d694945422d72ca5" - integrity sha512-J9JcySJuEqfEoP334K/2gEWm2vOx73Uqjii3qlFVhWRBOAJ0Pjyk0sN5W/eVRbwhUm95DNgh2V5s8dRK3vzyVw== - dependencies: - "@babel/runtime" "^7.17.2" - "@mui/private-theming" "^5.5.3" - "@mui/styled-engine" "^5.5.2" - "@mui/types" "^7.1.3" - "@mui/utils" "^5.5.3" - clsx "^1.1.1" - csstype "^3.0.11" - prop-types "^15.7.2" - -"@mui/types@^7.1.3": - version "7.1.3" - resolved "https://registry.yarnpkg.com/@mui/types/-/types-7.1.3.tgz#d7636f3046110bcccc63e6acfd100e2ad9ca712a" - integrity sha512-DDF0UhMBo4Uezlk+6QxrlDbchF79XG6Zs0zIewlR4c0Dt6GKVFfUtzPtHCH1tTbcSlq/L2bGEdiaoHBJ9Y1gSA== - -"@mui/utils@^5.5.3": - version "5.5.3" - resolved "https://registry.yarnpkg.com/@mui/utils/-/utils-5.5.3.tgz#f6e1f10c0e8f4d0bf750588c2c3a96ad819c5b65" - integrity sha512-t627eVRpl3SlxVya0cIVNs8jPl4KCEiGaTSWY9iKKTcMNaeDbuRML+zv/CFHDPr1zFv+FjJSP02ySB+tZ8xIag== - dependencies: - "@babel/runtime" "^7.17.2" - "@types/prop-types" "^15.7.4" - "@types/react-is" "^16.7.1 || ^17.0.0" - prop-types "^15.7.2" - react-is "^17.0.2" - "@nodelib/fs.scandir@2.1.5": version "2.1.5" resolved "https://registry.yarnpkg.com/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz#7619c2eb21b25483f6d167548b4cfd5a7488c3d5" @@ -1945,11 +2298,6 @@ resolved "https://registry.yarnpkg.com/@polka/url/-/url-1.0.0-next.21.tgz#5de5a2385a35309427f6011992b544514d559aa1" integrity sha512-a5Sab1C4/icpTZVzZc5Ghpz88yQtGOyNqYXcZgOssB2uuAr+wF/MvN6bgtW32q7HHrvBki+BsZ0OuNv6EV3K9g== -"@popperjs/core@^2.11.4": - version "2.11.4" - resolved "https://registry.yarnpkg.com/@popperjs/core/-/core-2.11.4.tgz#d8c7b8db9226d2d7664553a0741ad7d0397ee503" - integrity sha512-q/ytXxO5NKvyT37pmisQAItCFqA7FD/vNb8dgaJy3/630Fsc+Mz9/9f2SziBoIZ30TJooXyTwZmhi1zjXmObYg== - "@popperjs/core@^2.9.0": version "2.10.2" resolved "https://registry.yarnpkg.com/@popperjs/core/-/core-2.10.2.tgz#0798c03351f0dea1a5a4cabddf26a55a7cbee590" @@ -2033,108 +2381,109 @@ resolved "https://registry.yarnpkg.com/@sphinxxxx/color-conversion/-/color-conversion-2.2.2.tgz#03ecc29279e3c0c832f6185a5bfa3497858ac8ca" integrity sha512-XExJS3cLqgrmNBIP3bBw6+1oQ1ksGjFh0+oClDKFYpCCqx/hlqwWO5KO/S63fzUo67SxI9dMrF0y5T/Ey7h8Zw== -"@svgr/babel-plugin-add-jsx-attribute@^5.4.0": - version "5.4.0" - resolved "https://registry.yarnpkg.com/@svgr/babel-plugin-add-jsx-attribute/-/babel-plugin-add-jsx-attribute-5.4.0.tgz#81ef61947bb268eb9d50523446f9c638fb355906" - integrity sha512-ZFf2gs/8/6B8PnSofI0inYXr2SDNTDScPXhN7k5EqD4aZ3gi6u+rbmZHVB8IM3wDyx8ntKACZbtXSm7oZGRqVg== +"@svgr/babel-plugin-add-jsx-attribute@^6.0.0": + version "6.0.0" + resolved "https://registry.yarnpkg.com/@svgr/babel-plugin-add-jsx-attribute/-/babel-plugin-add-jsx-attribute-6.0.0.tgz#bd6d1ff32a31b82b601e73672a789cc41e84fe18" + integrity sha512-MdPdhdWLtQsjd29Wa4pABdhWbaRMACdM1h31BY+c6FghTZqNGT7pEYdBoaGeKtdTOBC/XNFQaKVj+r/Ei2ryWA== -"@svgr/babel-plugin-remove-jsx-attribute@^5.4.0": - version "5.4.0" - resolved "https://registry.yarnpkg.com/@svgr/babel-plugin-remove-jsx-attribute/-/babel-plugin-remove-jsx-attribute-5.4.0.tgz#6b2c770c95c874654fd5e1d5ef475b78a0a962ef" - integrity sha512-yaS4o2PgUtwLFGTKbsiAy6D0o3ugcUhWK0Z45umJ66EPWunAz9fuFw2gJuje6wqQvQWOTJvIahUwndOXb7QCPg== +"@svgr/babel-plugin-remove-jsx-attribute@^6.0.0": + version "6.0.0" + resolved "https://registry.yarnpkg.com/@svgr/babel-plugin-remove-jsx-attribute/-/babel-plugin-remove-jsx-attribute-6.0.0.tgz#58654908beebfa069681a83332544b17e5237e89" + integrity sha512-aVdtfx9jlaaxc3unA6l+M9YRnKIZjOhQPthLKqmTXC8UVkBLDRGwPKo+r8n3VZN8B34+yVajzPTZ+ptTSuZZCw== -"@svgr/babel-plugin-remove-jsx-empty-expression@^5.0.1": - version "5.0.1" - resolved "https://registry.yarnpkg.com/@svgr/babel-plugin-remove-jsx-empty-expression/-/babel-plugin-remove-jsx-empty-expression-5.0.1.tgz#25621a8915ed7ad70da6cea3d0a6dbc2ea933efd" - integrity sha512-LA72+88A11ND/yFIMzyuLRSMJ+tRKeYKeQ+mR3DcAZ5I4h5CPWN9AHyUzJbWSYp/u2u0xhmgOe0+E41+GjEueA== +"@svgr/babel-plugin-remove-jsx-empty-expression@^6.0.0": + version "6.0.0" + resolved "https://registry.yarnpkg.com/@svgr/babel-plugin-remove-jsx-empty-expression/-/babel-plugin-remove-jsx-empty-expression-6.0.0.tgz#d06dd6e8a8f603f92f9979bb9990a1f85a4f57ba" + integrity sha512-Ccj42ApsePD451AZJJf1QzTD1B/BOU392URJTeXFxSK709i0KUsGtbwyiqsKu7vsYxpTM0IA5clAKDyf9RCZyA== -"@svgr/babel-plugin-replace-jsx-attribute-value@^5.0.1": - version "5.0.1" - resolved "https://registry.yarnpkg.com/@svgr/babel-plugin-replace-jsx-attribute-value/-/babel-plugin-replace-jsx-attribute-value-5.0.1.tgz#0b221fc57f9fcd10e91fe219e2cd0dd03145a897" - integrity sha512-PoiE6ZD2Eiy5mK+fjHqwGOS+IXX0wq/YDtNyIgOrc6ejFnxN4b13pRpiIPbtPwHEc+NT2KCjteAcq33/F1Y9KQ== +"@svgr/babel-plugin-replace-jsx-attribute-value@^6.0.0": + version "6.0.0" + resolved "https://registry.yarnpkg.com/@svgr/babel-plugin-replace-jsx-attribute-value/-/babel-plugin-replace-jsx-attribute-value-6.0.0.tgz#0b85837577b02c31c09c758a12932820f5245cee" + integrity sha512-88V26WGyt1Sfd1emBYmBJRWMmgarrExpKNVmI9vVozha4kqs6FzQJ/Kp5+EYli1apgX44518/0+t9+NU36lThQ== -"@svgr/babel-plugin-svg-dynamic-title@^5.4.0": - version "5.4.0" - resolved "https://registry.yarnpkg.com/@svgr/babel-plugin-svg-dynamic-title/-/babel-plugin-svg-dynamic-title-5.4.0.tgz#139b546dd0c3186b6e5db4fefc26cb0baea729d7" - integrity sha512-zSOZH8PdZOpuG1ZVx/cLVePB2ibo3WPpqo7gFIjLV9a0QsuQAzJiwwqmuEdTaW2pegyBE17Uu15mOgOcgabQZg== +"@svgr/babel-plugin-svg-dynamic-title@^6.0.0": + version "6.0.0" + resolved "https://registry.yarnpkg.com/@svgr/babel-plugin-svg-dynamic-title/-/babel-plugin-svg-dynamic-title-6.0.0.tgz#28236ec26f7ab9d486a487d36ae52d58ba15676f" + integrity sha512-F7YXNLfGze+xv0KMQxrl2vkNbI9kzT9oDK55/kUuymh1ACyXkMV+VZWX1zEhSTfEKh7VkHVZGmVtHg8eTZ6PRg== -"@svgr/babel-plugin-svg-em-dimensions@^5.4.0": - version "5.4.0" - resolved "https://registry.yarnpkg.com/@svgr/babel-plugin-svg-em-dimensions/-/babel-plugin-svg-em-dimensions-5.4.0.tgz#6543f69526632a133ce5cabab965deeaea2234a0" - integrity sha512-cPzDbDA5oT/sPXDCUYoVXEmm3VIoAWAPT6mSPTJNbQaBNUuEKVKyGH93oDY4e42PYHRW67N5alJx/eEol20abw== +"@svgr/babel-plugin-svg-em-dimensions@^6.0.0": + version "6.0.0" + resolved "https://registry.yarnpkg.com/@svgr/babel-plugin-svg-em-dimensions/-/babel-plugin-svg-em-dimensions-6.0.0.tgz#40267c5dea1b43c4f83a0eb6169e08b43d8bafce" + integrity sha512-+rghFXxdIqJNLQK08kwPBD3Z22/0b2tEZ9lKiL/yTfuyj1wW8HUXu4bo/XkogATIYuXSghVQOOCwURXzHGKyZA== -"@svgr/babel-plugin-transform-react-native-svg@^5.4.0": - version "5.4.0" - resolved "https://registry.yarnpkg.com/@svgr/babel-plugin-transform-react-native-svg/-/babel-plugin-transform-react-native-svg-5.4.0.tgz#00bf9a7a73f1cad3948cdab1f8dfb774750f8c80" - integrity sha512-3eYP/SaopZ41GHwXma7Rmxcv9uRslRDTY1estspeB1w1ueZWd/tPlMfEOoccYpEMZU3jD4OU7YitnXcF5hLW2Q== +"@svgr/babel-plugin-transform-react-native-svg@^6.0.0": + version "6.0.0" + resolved "https://registry.yarnpkg.com/@svgr/babel-plugin-transform-react-native-svg/-/babel-plugin-transform-react-native-svg-6.0.0.tgz#eb688d0a5f539e34d268d8a516e81f5d7fede7c9" + integrity sha512-VaphyHZ+xIKv5v0K0HCzyfAaLhPGJXSk2HkpYfXIOKb7DjLBv0soHDxNv6X0vr2titsxE7klb++u7iOf7TSrFQ== -"@svgr/babel-plugin-transform-svg-component@^5.5.0": - version "5.5.0" - resolved "https://registry.yarnpkg.com/@svgr/babel-plugin-transform-svg-component/-/babel-plugin-transform-svg-component-5.5.0.tgz#583a5e2a193e214da2f3afeb0b9e8d3250126b4a" - integrity sha512-q4jSH1UUvbrsOtlo/tKcgSeiCHRSBdXoIoqX1pgcKK/aU3JD27wmMKwGtpB8qRYUYoyXvfGxUVKchLuR5pB3rQ== +"@svgr/babel-plugin-transform-svg-component@^6.2.0": + version "6.2.0" + resolved "https://registry.yarnpkg.com/@svgr/babel-plugin-transform-svg-component/-/babel-plugin-transform-svg-component-6.2.0.tgz#7ba61d9fc1fb42b0ba1a04e4630019fa7e993c4f" + integrity sha512-bhYIpsORb++wpsp91fymbFkf09Z/YEKR0DnFjxvN+8JHeCUD2unnh18jIMKnDJTWtvpTaGYPXELVe4OOzFI0xg== -"@svgr/babel-preset@^5.5.0": - version "5.5.0" - resolved "https://registry.yarnpkg.com/@svgr/babel-preset/-/babel-preset-5.5.0.tgz#8af54f3e0a8add7b1e2b0fcd5a882c55393df327" - integrity sha512-4FiXBjvQ+z2j7yASeGPEi8VD/5rrGQk4Xrq3EdJmoZgz/tpqChpo5hgXDvmEauwtvOc52q8ghhZK4Oy7qph4ig== +"@svgr/babel-preset@^6.2.0": + version "6.2.0" + resolved "https://registry.yarnpkg.com/@svgr/babel-preset/-/babel-preset-6.2.0.tgz#1d3ad8c7664253a4be8e4a0f0e6872f30d8af627" + integrity sha512-4WQNY0J71JIaL03DRn0vLiz87JXx0b9dYm2aA8XHlQJQoixMl4r/soYHm8dsaJZ3jWtkCiOYy48dp9izvXhDkQ== dependencies: - "@svgr/babel-plugin-add-jsx-attribute" "^5.4.0" - "@svgr/babel-plugin-remove-jsx-attribute" "^5.4.0" - "@svgr/babel-plugin-remove-jsx-empty-expression" "^5.0.1" - "@svgr/babel-plugin-replace-jsx-attribute-value" "^5.0.1" - "@svgr/babel-plugin-svg-dynamic-title" "^5.4.0" - "@svgr/babel-plugin-svg-em-dimensions" "^5.4.0" - "@svgr/babel-plugin-transform-react-native-svg" "^5.4.0" - "@svgr/babel-plugin-transform-svg-component" "^5.5.0" + "@svgr/babel-plugin-add-jsx-attribute" "^6.0.0" + "@svgr/babel-plugin-remove-jsx-attribute" "^6.0.0" + "@svgr/babel-plugin-remove-jsx-empty-expression" "^6.0.0" + "@svgr/babel-plugin-replace-jsx-attribute-value" "^6.0.0" + "@svgr/babel-plugin-svg-dynamic-title" "^6.0.0" + "@svgr/babel-plugin-svg-em-dimensions" "^6.0.0" + "@svgr/babel-plugin-transform-react-native-svg" "^6.0.0" + "@svgr/babel-plugin-transform-svg-component" "^6.2.0" -"@svgr/core@^5.5.0": - version "5.5.0" - resolved "https://registry.yarnpkg.com/@svgr/core/-/core-5.5.0.tgz#82e826b8715d71083120fe8f2492ec7d7874a579" - integrity sha512-q52VOcsJPvV3jO1wkPtzTuKlvX7Y3xIcWRpCMtBF3MrteZJtBfQw/+u0B1BHy5ColpQc1/YVTrPEtSYIMNZlrQ== +"@svgr/core@^6.2.1": + version "6.2.1" + resolved "https://registry.yarnpkg.com/@svgr/core/-/core-6.2.1.tgz#195de807a9f27f9e0e0d678e01084b05c54fdf61" + integrity sha512-NWufjGI2WUyrg46mKuySfviEJ6IxHUOm/8a3Ph38VCWSp+83HBraCQrpEM3F3dB6LBs5x8OElS8h3C0oOJaJAA== dependencies: - "@svgr/plugin-jsx" "^5.5.0" + "@svgr/plugin-jsx" "^6.2.1" camelcase "^6.2.0" - cosmiconfig "^7.0.0" + cosmiconfig "^7.0.1" -"@svgr/hast-util-to-babel-ast@^5.5.0": - version "5.5.0" - resolved "https://registry.yarnpkg.com/@svgr/hast-util-to-babel-ast/-/hast-util-to-babel-ast-5.5.0.tgz#5ee52a9c2533f73e63f8f22b779f93cd432a5461" - integrity sha512-cAaR/CAiZRB8GP32N+1jocovUtvlj0+e65TB50/6Lcime+EA49m/8l+P2ko+XPJ4dw3xaPS3jOL4F2X4KWxoeQ== +"@svgr/hast-util-to-babel-ast@^6.2.1": + version "6.2.1" + resolved "https://registry.yarnpkg.com/@svgr/hast-util-to-babel-ast/-/hast-util-to-babel-ast-6.2.1.tgz#ae065567b74cbe745afae617053adf9a764bea25" + integrity sha512-pt7MMkQFDlWJVy9ULJ1h+hZBDGFfSCwlBNW1HkLnVi7jUhyEXUaGYWi1x6bM2IXuAR9l265khBT4Av4lPmaNLQ== dependencies: - "@babel/types" "^7.12.6" + "@babel/types" "^7.15.6" + entities "^3.0.1" -"@svgr/plugin-jsx@^5.5.0": - version "5.5.0" - resolved "https://registry.yarnpkg.com/@svgr/plugin-jsx/-/plugin-jsx-5.5.0.tgz#1aa8cd798a1db7173ac043466d7b52236b369000" - integrity sha512-V/wVh33j12hGh05IDg8GpIUXbjAPnTdPTKuP4VNLggnwaHMPNQNae2pRnyTAILWCQdz5GyMqtO488g7CKM8CBA== +"@svgr/plugin-jsx@^6.2.1": + version "6.2.1" + resolved "https://registry.yarnpkg.com/@svgr/plugin-jsx/-/plugin-jsx-6.2.1.tgz#5668f1d2aa18c2f1bb7a1fc9f682d3f9aed263bd" + integrity sha512-u+MpjTsLaKo6r3pHeeSVsh9hmGRag2L7VzApWIaS8imNguqoUwDq/u6U/NDmYs/KAsrmtBjOEaAAPbwNGXXp1g== dependencies: - "@babel/core" "^7.12.3" - "@svgr/babel-preset" "^5.5.0" - "@svgr/hast-util-to-babel-ast" "^5.5.0" + "@babel/core" "^7.15.5" + "@svgr/babel-preset" "^6.2.0" + "@svgr/hast-util-to-babel-ast" "^6.2.1" svg-parser "^2.0.2" -"@svgr/plugin-svgo@^5.5.0": - version "5.5.0" - resolved "https://registry.yarnpkg.com/@svgr/plugin-svgo/-/plugin-svgo-5.5.0.tgz#02da55d85320549324e201c7b2e53bf431fcc246" - integrity sha512-r5swKk46GuQl4RrVejVwpeeJaydoxkdwkM1mBKOgJLBUJPGaLci6ylg/IjhrRsREKDkr4kbMWdgOtbXEh0fyLQ== +"@svgr/plugin-svgo@^6.2.0": + version "6.2.0" + resolved "https://registry.yarnpkg.com/@svgr/plugin-svgo/-/plugin-svgo-6.2.0.tgz#4cbe6a33ccccdcae4e3b63ded64cc1cbe1faf48c" + integrity sha512-oDdMQONKOJEbuKwuy4Np6VdV6qoaLLvoY86hjvQEgU82Vx1MSWRyYms6Sl0f+NtqxLI/rDVufATbP/ev996k3Q== dependencies: - cosmiconfig "^7.0.0" + cosmiconfig "^7.0.1" deepmerge "^4.2.2" - svgo "^1.2.2" + svgo "^2.5.0" -"@svgr/webpack@^5.5.0": - version "5.5.0" - resolved "https://registry.yarnpkg.com/@svgr/webpack/-/webpack-5.5.0.tgz#aae858ee579f5fa8ce6c3166ef56c6a1b381b640" - integrity sha512-DOBOK255wfQxguUta2INKkzPj6AIS6iafZYiYmHn6W3pHlycSRRlvWKCfLDG10fXfLWqE3DJHgRUOyJYmARa7g== +"@svgr/webpack@^6.2.1": + version "6.2.1" + resolved "https://registry.yarnpkg.com/@svgr/webpack/-/webpack-6.2.1.tgz#ef5d51c1b6be4e7537fb9f76b3f2b2e22b63c58d" + integrity sha512-h09ngMNd13hnePwgXa+Y5CgOjzlCvfWLHg+MBnydEedAnuLRzUHUJmGS3o2OsrhxTOOqEsPOFt5v/f6C5Qulcw== dependencies: - "@babel/core" "^7.12.3" - "@babel/plugin-transform-react-constant-elements" "^7.12.1" - "@babel/preset-env" "^7.12.1" - "@babel/preset-react" "^7.12.5" - "@svgr/core" "^5.5.0" - "@svgr/plugin-jsx" "^5.5.0" - "@svgr/plugin-svgo" "^5.5.0" - loader-utils "^2.0.0" + "@babel/core" "^7.15.5" + "@babel/plugin-transform-react-constant-elements" "^7.14.5" + "@babel/preset-env" "^7.15.6" + "@babel/preset-react" "^7.14.5" + "@babel/preset-typescript" "^7.15.0" + "@svgr/core" "^6.2.1" + "@svgr/plugin-jsx" "^6.2.1" + "@svgr/plugin-svgo" "^6.2.0" "@szhsin/react-menu@^2.2.0": version "2.3.3" @@ -2242,16 +2591,11 @@ resolved "https://registry.yarnpkg.com/@types/parse-json/-/parse-json-4.0.0.tgz#2f8bb441434d163b35fb8ffdccd7138927ffb8c0" integrity sha512-//oorEZjL6sbPcKUaCdIGlIUeH26mgzimjBB77G6XRgnDl/L5wOnpyBGRe/Mmf5CVW3PwEBE1NjiMZ/ssFh4wA== -"@types/prop-types@*", "@types/prop-types@^15.7.4": +"@types/prop-types@*": version "15.7.4" resolved "https://registry.yarnpkg.com/@types/prop-types/-/prop-types-15.7.4.tgz#fcf7205c25dff795ee79af1e30da2c9790808f11" integrity sha512-rZ5drC/jWjrArrS8BR6SIr4cWpW09RNTYt9AMZo3Jwwif+iacXAqgVjm0B0Bv/S1jhDXKHqRVNCbACkJ89RAnQ== -"@types/q@^1.5.1": - version "1.5.5" - resolved "https://registry.yarnpkg.com/@types/q/-/q-1.5.5.tgz#75a2a8e7d8ab4b230414505d92335d1dcb53a6df" - integrity sha512-L28j2FcJfSZOnL1WBjDYp2vUHCeIFlyYI/53EwD/rKUBQ7MtUUfbQWiyKJGpcnv4/WgrhWsFKrcPstcAt/J0tQ== - "@types/react-dom@^16.0.11": version "16.9.14" resolved "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-16.9.14.tgz#674b8f116645fe5266b40b525777fc6bb8eb3bcd" @@ -2259,13 +2603,6 @@ dependencies: "@types/react" "^16" -"@types/react-is@^16.7.1 || ^17.0.0": - version "17.0.3" - resolved "https://registry.yarnpkg.com/@types/react-is/-/react-is-17.0.3.tgz#2d855ba575f2fc8d17ef9861f084acc4b90a137a" - integrity sha512-aBTIWg1emtu95bLTLx0cpkxwGW3ueZv71nE2YFBpL8k/z5czEW8yYpOo8Dp+UUAFAtKwNaOsh/ioSeQnWlZcfw== - dependencies: - "@types/react" "*" - "@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" @@ -2273,13 +2610,6 @@ dependencies: "@types/react" "*" -"@types/react-transition-group@^4.4.4": - version "4.4.4" - resolved "https://registry.yarnpkg.com/@types/react-transition-group/-/react-transition-group-4.4.4.tgz#acd4cceaa2be6b757db61ed7b432e103242d163e" - integrity sha512-7gAPz7anVK5xzbeQW9wFBDg7G++aPLAFY0QaSMOou9rJZpbuI58WAuJrgu+qR92l61grlnCUe7AFX8KGahAgug== - dependencies: - "@types/react" "*" - "@types/react@*": version "16.14.10" resolved "https://registry.yarnpkg.com/@types/react/-/react-16.14.10.tgz#76bc1c42ed5ab0d2ab13e5c58faaccaad3449477" @@ -2712,18 +3042,6 @@ aproba@^1.0.3: 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" @@ -3198,54 +3516,6 @@ bignumber.js@^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" @@ -3258,14 +3528,6 @@ bindings@^1.5.0: 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" @@ -3292,7 +3554,7 @@ body-parser@^1.19.0: raw-body "2.4.0" type-is "~1.6.17" -boolbase@^1.0.0, boolbase@~1.0.0: +boolbase@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/boolbase/-/boolbase-1.0.0.tgz#68dff5fbe60c51eb37725ea9e3ed310dcc1e776e" integrity sha1-aN/1++YMUes3cl6p4+0xDcwed24= @@ -3508,28 +3770,16 @@ browserslist@^4.17.5, browserslist@^4.19.1: node-releases "^2.0.1" picocolors "^1.0.0" -buffer-alloc-unsafe@^1.1.0: - version "1.1.0" - resolved "https://registry.yarnpkg.com/buffer-alloc-unsafe/-/buffer-alloc-unsafe-1.1.0.tgz#bd7dc26ae2972d0eda253be061dba992349c19f0" - integrity sha512-TEM2iMIEQdJ2yjPJoSIsldnleVaAk1oW3DBVUykyOLsEsFmEc9kn+SFFPz+gl54KQNxlDnAwCXosOS9Okx2xAg== - -buffer-alloc@^1.2.0: - version "1.2.0" - resolved "https://registry.yarnpkg.com/buffer-alloc/-/buffer-alloc-1.2.0.tgz#890dd90d923a873e08e10e5fd51a57e5b7cce0ec" - integrity sha512-CFsHQgjtW1UChdXgbyJGtnm+O/uLQeZdtbDo8mfUgYXCHSM1wgrVxXm6bSyrUuErEb+4sYVGCzASBRot7zyrow== +browserslist@^4.20.2, browserslist@^4.20.3: + version "4.20.3" + resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.20.3.tgz#eb7572f49ec430e054f56d52ff0ebe9be915f8bf" + integrity sha512-NBhymBQl1zM0Y5dQT/O+xiLP9/rzOIQdKM/eMJBAq7yBgaB6krIYLGejrwVYnSHZdqjscB1SPuAjHwxjvN6Wdg== 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= + caniuse-lite "^1.0.30001332" + electron-to-chromium "^1.4.118" + escalade "^3.1.1" + node-releases "^2.0.3" + picocolors "^1.0.0" buffer-from@^1.0.0: version "1.1.2" @@ -3541,14 +3791,6 @@ buffer-xor@^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" @@ -3606,19 +3848,6 @@ cacache@^15.2.0: 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" @@ -3677,15 +3906,10 @@ caniuse-lite@^1.0.0, caniuse-lite@^1.0.30001272, caniuse-lite@^1.0.30001274, can resolved "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001338.tgz" integrity sha512-1gLHWyfVoRDsHieO+CaeYe7jSo/MT7D7lhaXUiwwbuR5BwQxORs0f1tAwUSQr3YbxRXJvxHM/PA5FfPQRnsPeQ== -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" +caniuse-lite@^1.0.30001332: + version "1.0.30001346" + resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001346.tgz#e895551b46b9cc9cc9de852facd42f04839a8fbe" + integrity sha512-q6ibZUO2t88QCIPayP/euuDREq+aMAxFE5S70PkrLh0iTDj/zEhgvJRKC2+CvXY6EWc6oQwUR48lL5vCW6jiXQ== chalk@^1.1.3: version "1.1.3" @@ -3698,7 +3922,7 @@ chalk@^1.1.3: strip-ansi "^3.0.0" supports-color "^2.0.0" -chalk@^2.0.0, chalk@^2.4.1, chalk@^2.4.2: +chalk@^2.0.0, 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== @@ -3715,28 +3939,17 @@ chalk@^4.0.0, chalk@^4.1.0: 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" +chart.js@^3.0.0: + version "3.8.0" + resolved "https://registry.yarnpkg.com/chart.js/-/chart.js-3.8.0.tgz#c6c14c457b9dc3ce7f1514a59e9b262afd6f1a94" + integrity sha512-cr8xhrXjLIXVLOBZPkBZVF6NDeiVIrPLHcMhnON7UufudL+CNeRrD+wpYanswlm8NpudMdrt3CHoLMQMxJhHRg== -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== +chartjs-plugin-zoom@^1.2.1: + version "1.2.1" + resolved "https://registry.yarnpkg.com/chartjs-plugin-zoom/-/chartjs-plugin-zoom-1.2.1.tgz#7e350ba20d907f397d0c055239dcc67d326df705" + integrity sha512-2zbWvw2pljrtMLMXkKw1uxYzAne5PtjJiOZftcut4Lo3Ee8qUt95RpMKDWrZ+pBZxZKQKOD/etdU4pN2jxZUmg== 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" + hammerjs "^2.0.8" cheerio-select@^1.5.0: version "1.5.0" @@ -3843,13 +4056,6 @@ clone-deep@^4.0.1: 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" @@ -3867,15 +4073,6 @@ co@^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" @@ -3886,7 +4083,7 @@ codemirror@^5.59.2: resolved "https://registry.yarnpkg.com/codemirror/-/codemirror-5.63.3.tgz#97042a242027fe0c87c09b36bc01931d37b76527" integrity sha512-1C+LELr+5grgJYqwZKqxrcbPsHFHapVaVAloBsFBASbpLnQqLw1U8yXJ3gT5D+rhxIiSpo+kTqN+hQ+9ialIXw== -color-convert@^1.9.0, color-convert@^1.9.3: +color-convert@^1.9.0: version "1.9.3" resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz#bb71850690e1f136567de629d2d5471deda4c1e8" integrity sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg== @@ -3905,7 +4102,7 @@ color-name@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: +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== @@ -3930,7 +4127,7 @@ combine-source-map@^0.8.0, combine-source-map@~0.8.0: lodash.memoize "~3.0.3" source-map "~0.5.3" -commander@^2.19.0, commander@^2.20.0, commander@^2.8.1: +commander@^2.19.0, commander@^2.20.0: version "2.20.3" resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33" integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ== @@ -3945,6 +4142,11 @@ commander@^7.0.0, commander@^7.2.0: resolved "https://registry.yarnpkg.com/commander/-/commander-7.2.0.tgz#a36cb57d0b501ce108e4d20559a150a391d97ab7" integrity sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw== +commander@^8.2.0: + version "8.3.0" + resolved "https://registry.yarnpkg.com/commander/-/commander-8.3.0.tgz#4837ea1b2da67b9c616a67afbb0fafee567bca66" + integrity sha512-OkTL9umf+He2DZkUq8f8J9of7yL6RJKI24dVITBmNfZBmri9zYZQrKkuXiKhyfPSu8tUhnVBB1iKXevvnlR4Ww== + commondir@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/commondir/-/commondir-1.0.1.tgz#ddd800da0c66127393cca5950ea968a3aaf1253b" @@ -3970,14 +4172,6 @@ concat-stream@^1.6.0, concat-stream@^1.6.1, concat-stream@~1.6.0: readable-stream "^2.2.2" typedarray "^0.0.6" -config-chain@^1.1.11: - version "1.1.13" - resolved "https://registry.yarnpkg.com/config-chain/-/config-chain-1.1.13.tgz#fad0795aa6a6cdaff9ed1b68e9dff94372c232f4" - integrity sha512-qj+f8APARXHrM0hraqXYb2/bOVSV4PvJQlNZ/DVj0QrmNM2q2euizkeuVckQ57J+W0mRH6Hvi+k50M4Jul2VRQ== - dependencies: - ini "^1.3.4" - proto-list "~1.2.1" - connect@^3.7.0: version "3.7.0" resolved "https://registry.yarnpkg.com/connect/-/connect-3.7.0.tgz#5d49348910caa5e07a01800b030d0c35f20484f8" @@ -4003,13 +4197,6 @@ constants-browserify@~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" @@ -4053,7 +4240,7 @@ copy-webpack-plugin@^7.0.0: schema-utils "^3.0.0" serialize-javascript "^5.0.1" -core-js-compat@^3.20.2, core-js-compat@^3.21.0, core-js-compat@^3.8.1, core-js-compat@^3.9.0: +core-js-compat@^3.21.0, core-js-compat@^3.8.1, core-js-compat@^3.9.0: version "3.21.0" resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.21.0.tgz#bcc86aa5a589cee358e7a7fa0a4979d5a76c3885" integrity sha512-OSXseNPSK2OPJa6GdtkMz/XxeXx8/CJvfhQWTqd6neuUraujcL4jVsjkLQz1OWnax8xVQJnRPe0V2jqNWORA+A== @@ -4061,6 +4248,14 @@ core-js-compat@^3.20.2, core-js-compat@^3.21.0, core-js-compat@^3.8.1, core-js-c browserslist "^4.19.1" semver "7.0.0" +core-js-compat@^3.22.1: + version "3.22.8" + resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.22.8.tgz#46fa34ce1ddf742acd7f95f575f66bbb21e05d62" + integrity sha512-pQnwg4xtuvc2Bs/5zYQPaEYYSuTxsF7LBWF0SvnVhthZo/Qe+rJpcEekrdNK5DWwDJ0gv0oI9NNX5Mppdy0ctg== + dependencies: + browserslist "^4.20.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" @@ -4095,7 +4290,7 @@ cosmiconfig@^6.0.0: path-type "^4.0.0" yaml "^1.7.2" -cosmiconfig@^7.0.0: +cosmiconfig@^7.0.0, cosmiconfig@^7.0.1: version "7.0.1" resolved "https://registry.yarnpkg.com/cosmiconfig/-/cosmiconfig-7.0.1.tgz#714d756522cace867867ccb4474c5d01bbae5d6d" integrity sha512-a1YWNUV2HwGimB7dU2s1wUMurNKjpx60HxBB6xUM8Re+2s1g1IIfJvFR0/iCF+XHdE0GMTKTuLR32UQff4TEyQ== @@ -4144,27 +4339,7 @@ cross-env@^7.0.3: 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: +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== @@ -4243,21 +4418,6 @@ css-minimizer-webpack-plugin@^3.0.0: serialize-javascript "^6.0.0" 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.3: version "4.1.3" resolved "https://registry.yarnpkg.com/css-select/-/css-select-4.1.3.tgz#a70440f70317f2669118ad74ff105e65849c7067" @@ -4278,14 +4438,6 @@ css-to-react-native@^3.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" @@ -4302,11 +4454,6 @@ css-vendor@^2.0.8: "@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, css-what@^5.0.1: version "5.1.0" resolved "https://registry.yarnpkg.com/css-what/-/css-what-5.1.0.tgz#3f7b707aadf633baf62c2ceb8579b545bb40f7fe" @@ -4367,7 +4514,7 @@ cssnano@^5.0.2, cssnano@^5.0.6: lilconfig "^2.0.3" yaml "^1.10.2" -csso@^4.0.2, csso@^4.2.0: +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== @@ -4379,11 +4526,6 @@ csstype@^2.5.2, csstype@^2.5.7: resolved "https://registry.yarnpkg.com/csstype/-/csstype-2.6.18.tgz#980a8b53085f34af313410af064f2bd241784218" integrity sha512-RSU6Hyeg14am3Ah4VZEmeX8H7kLwEEirXe6aU2IPfKNvhXwTflK5HQRDNI0ypQXoqmm+QPyG2IaPuQE5zMwSIQ== -csstype@^3.0.11: - version "3.0.11" - resolved "https://registry.yarnpkg.com/csstype/-/csstype-3.0.11.tgz#d66700c5eacfac1940deb4e3ee5642792d85cd33" - integrity sha512-sa6P2wJ+CAbgyy4KFssIb/JNMLxFvKF1pCYCSXS8ZMuqZnMsrxqI2E5sPyoTpxoPU/gVZMzr2zjOfg8GIZOMsw== - csstype@^3.0.2: version "3.0.9" resolved "https://registry.yarnpkg.com/csstype/-/csstype-3.0.9.tgz#6410af31b26bd0520933d02cbc64fce9ce3fbf0b" @@ -4461,71 +4603,6 @@ decamelize@^5.0.0: resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-5.0.1.tgz#db11a92e58c741ef339fb0a2868d8a06a9a7b1e9" integrity sha512-VfxadyCECXgQlkoEAjeghAr5gY3Hf+IKjKb+X8tGVDtveCjN+USwprd2q3QXBR9T1+x2DG0XZF5/w+7HAtSaXA== -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" @@ -4675,14 +4752,6 @@ dom-serialize@^2.2.1: 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.2: version "1.3.2" resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-1.3.2.tgz#6206437d32ceefaec7161803230c7a20bc1b4d91" @@ -4697,11 +4766,6 @@ domain-browser@^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" @@ -4714,14 +4778,6 @@ domhandler@4.2.2, domhandler@^4.0.0, domhandler@^4.2.0: 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, domutils@^2.7.0: version "2.8.0" resolved "https://registry.yarnpkg.com/domutils/-/domutils-2.8.0.tgz#4437def5db6e2d1f5d6ee859bd95ca7d02048135" @@ -4731,41 +4787,6 @@ domutils@^2.5.2, domutils@^2.6.0, domutils@^2.7.0: 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" @@ -4778,11 +4799,6 @@ duplexer2@^0.1.2, duplexer2@~0.1.0, duplexer2@~0.1.2: 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" @@ -4805,6 +4821,11 @@ electron-to-chromium@^1.3.886: resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.889.tgz#0b7c6f7628559592d5406deda281788f37107790" integrity sha512-suEUoPTD1mExjL9TdmH7cvEiWJVM2oEiAi+Y1p0QKxI2HcRlT44qDTP2c1aZmVwRemIPYOpxmV7CxQCOWcm4XQ== +electron-to-chromium@^1.4.118: + version "1.4.144" + resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.144.tgz#9a5d1f41452ecc65b686d529ae919248da44f406" + integrity sha512-R3RV3rU1xWwFJlSClVWDvARaOk6VUO/FubHLodIASDB3Mc2dzuWvNdfOgH9bwHUTqT79u92qw60NWfwUdzAqdg== + electron-to-chromium@^1.4.17: version "1.4.63" resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.63.tgz#866db72d1221fda89419dc22669d03833e11625d" @@ -4845,13 +4866,6 @@ encoding@^0.1.12: 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@~6.0.1: version "6.0.2" resolved "https://registry.yarnpkg.com/engine.io-client/-/engine.io-client-6.0.2.tgz#ccfc059051e65ca63845e65929184757754cc34e" @@ -4915,6 +4929,11 @@ entities@^2.0.0: resolved "https://registry.yarnpkg.com/entities/-/entities-2.2.0.tgz#098dc90ebb83d8dffa089d55256b351d34c4da55" integrity sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A== +entities@^3.0.1: + version "3.0.1" + resolved "https://registry.yarnpkg.com/entities/-/entities-3.0.1.tgz#2b887ca62585e96db3903482d336c1006c3001d4" + integrity sha512-WiyBqoomrwMdFG1e0kqvASYfnlb0lp8M5o5Fw2OFq1hNZxxcNk8Ik0Xm7LxzBhuidnZB/UtBqVCgUz3kBOP51Q== + env-paths@^2.2.0: version "2.2.1" resolved "https://registry.yarnpkg.com/env-paths/-/env-paths-2.2.1.tgz#420399d416ce1fbe9bc0a07c62fa68d67fd0f8f2" @@ -4994,7 +5013,7 @@ error-ex@^1.3.1: dependencies: is-arrayish "^0.2.1" -es-abstract@^1.17.2, es-abstract@^1.18.0-next.1, es-abstract@^1.18.5, es-abstract@^1.19.0, es-abstract@^1.19.1: +es-abstract@^1.18.0-next.1, es-abstract@^1.18.5, es-abstract@^1.19.0, es-abstract@^1.19.1: version "1.19.1" resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.19.1.tgz#d4885796876916959de78edaa0df456627115ec3" integrity sha512-2vJ6tjA/UfqLm2MPs7jxVybLoB8i1t1Jd9R3kISld20sIxPcTbLuggQOUxeWeAvIUkduv/CfMjuh4WmiXr2v9w== @@ -5226,58 +5245,6 @@ evp_bytestokey@^1.0.0, evp_bytestokey@^1.0.3: 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.1.1" resolved "https://registry.yarnpkg.com/execa/-/execa-5.1.1.tgz#f80ad9cbf4298f7bd1d4c9555c21e93741c411dd" @@ -5293,13 +5260,6 @@ execa@^5.0.0: 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" @@ -5307,21 +5267,6 @@ exports-loader@^2.0.0: 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" @@ -5379,13 +5324,6 @@ fast-safe-stringify@^2.0.7: resolved "https://registry.yarnpkg.com/fast-safe-stringify/-/fast-safe-stringify-2.1.1.tgz#c406a83b6e70d9e35ce3b30a81141df30aeba884" integrity sha512-W+KJc2dmILlPplD/H4K9l9LcAHAfPtP6BY84uVLXQ6Evcz9Lcg33Y2z1IVblT6xdY54PXYVHEv+0Wpq8Io6zkA== -fast-xml-parser@^3.19.0: - version "3.21.1" - resolved "https://registry.yarnpkg.com/fast-xml-parser/-/fast-xml-parser-3.21.1.tgz#152a1d51d445380f7046b304672dd55d15c9e736" - integrity sha512-FTFVjYoBOZTJekiUsawGsSYV9QL0A+zDYCRj7y34IO6Jg+2IMYEtQa+bbictpdpV8dHxXywqU7C0gRDEOFtBFg== - dependencies: - strnum "^1.0.4" - fastest-levenshtein@^1.0.12: version "1.0.12" resolved "https://registry.yarnpkg.com/fastest-levenshtein/-/fastest-levenshtein-1.0.12.tgz#9990f7d3a88cc5a9ffd1f1745745251700d497e2" @@ -5398,13 +5336,6 @@ fastq@^1.6.0: 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" @@ -5412,36 +5343,11 @@ file-entry-cache@^6.0.1: 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" @@ -5459,15 +5365,6 @@ filename-reserved-regex@^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" @@ -5518,13 +5415,6 @@ find-up@^5.0.0: locate-path "^6.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" @@ -5558,19 +5448,6 @@ fraction.js@^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" @@ -5665,40 +5542,6 @@ get-intrinsic@^1.0.2, get-intrinsic@^1.1.0, get-intrinsic@^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" @@ -5791,50 +5634,7 @@ globby@^12.0.2: merge2 "^1.4.1" slash "^4.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: +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.8" resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.8.tgz#e412b8d33f5e006593cbd3cee6df9f2cebbe802a" integrity sha512-qkIilPUYcNhJpd33n0GBXTB1MMPp14TxEsEs0pTrsSVucApsYzW5V+Q8Qxhik6KU3evy+qkAAowTByymK0avdg== @@ -5853,6 +5653,11 @@ gzip-size@^6.0.0: dependencies: duplexer "^0.1.2" +hammerjs@^2.0.8: + version "2.0.8" + resolved "https://registry.yarnpkg.com/hammerjs/-/hammerjs-2.0.8.tgz#04ef77862cff2bb79d30f7692095930222bf60f1" + integrity sha512-tSQXBXS/MWQOn/RKckawJ61vvsDpCom87JgxiYdGwHdOa0ht0vzUWDlfioofFCRU0L+6NGDt6XzbgoJvZkMeRQ== + handlebars@^4.0.11: version "4.7.7" resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.7.7.tgz#9ce33416aad02dbd6c8fafa8240d5d98004945a1" @@ -5897,23 +5702,11 @@ has-flag@^4.0.0: resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b" integrity sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ== -has-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-tostringtag@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/has-tostringtag/-/has-tostringtag-1.0.0.tgz#7e133818a7d394734f941e73c3d3f9291e658b25" @@ -6044,11 +5837,6 @@ htmlparser2@6.1.0, htmlparser2@^6.1.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" @@ -6096,11 +5884,6 @@ https-proxy-agent@^5.0.0: 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" @@ -6137,7 +5920,7 @@ icss-utils@^5.0.0, icss-utils@^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: +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== @@ -6168,43 +5951,6 @@ image-minimizer-webpack-plugin@^2.2.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" @@ -6231,11 +5977,6 @@ import-fresh@^3.0.0, import-fresh@^3.1.0, import-fresh@^3.2.1: 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.3" resolved "https://registry.yarnpkg.com/import-local/-/import-local-3.0.3.tgz#4d51c2c495ca9393da259ec66b62e022920211e0" @@ -6296,11 +6037,6 @@ inherits@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" @@ -6348,14 +6084,6 @@ interpret@^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" @@ -6508,21 +6236,11 @@ is-in-browser@^1.0.2, is-in-browser@^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" @@ -6540,12 +6258,7 @@ is-number@^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: +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= @@ -6557,11 +6270,6 @@ is-plain-object@^2.0.4: 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.4: version "1.1.4" resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.4.tgz#eef5663cd59fa4c0ae339505323df6854bb15958" @@ -6582,21 +6290,11 @@ is-resolvable@^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-shared-array-buffer@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/is-shared-array-buffer/-/is-shared-array-buffer-1.0.1.tgz#97b0c85fbdacb59c9c446fe653b82cf2b5b7cfe6" integrity sha512-IU0NmyknYZN0rChcKhRO1X8LYz5Isj/Fsqh8NJOSf+N/hCOTwy29F32Ik7a+QszE63IdvmwdTPDd6cZ5pg4cwA== -is-stream@^1.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.1" resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-2.0.1.tgz#fac1e3d53b97ad5a9d0ae9cef2389f5810a5c077" @@ -6614,13 +6312,6 @@ is-subset@^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.4" resolved "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.0.4.tgz#a6dac93b635b063ca6872236de88910a57af139c" @@ -6747,14 +6438,6 @@ istanbul-reports@^3.0.0: 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" @@ -6865,11 +6548,6 @@ json-bignumber@^1.0.1: 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" @@ -6919,6 +6597,11 @@ json5@^2.1.2: dependencies: minimist "^1.2.5" +json5@^2.2.1: + version "2.2.1" + resolved "https://registry.yarnpkg.com/json5/-/json5-2.2.1.tgz#655d50ed1e6f95ad1a3caababd2b0efda10b395c" + integrity sha512-1hqLFMSrGHRHxav9q9gNjJ5EXznIxGVO09xQRrwplcS8qs28pZ8s8hupZAmqDwZUmVZ2Qb2jnyPOWcDH8m8dlA== + jsoneditor-react@^3.1.1: version "3.1.2" resolved "https://registry.yarnpkg.com/jsoneditor-react/-/jsoneditor-react-3.1.2.tgz#bc36356ac5ecb0d8f88d49a5ccbeecdd7f996164" @@ -7149,13 +6832,6 @@ karma@^6.3.15: ua-parser-js "^0.7.30" 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, kind-of@^6.0.3: version "6.0.3" resolved "https://registry.yarnpkg.com/kind-of/-/kind-of-6.0.3.tgz#07c05034a6c349fa06e24fa35aa76db4580ce4dd" @@ -7353,24 +7029,6 @@ loose-envify@^1.0.0, loose-envify@^1.1.0, loose-envify@^1.4.0: 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" @@ -7383,13 +7041,6 @@ lunr@^0.7.0: 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" @@ -7429,10 +7080,10 @@ map-obj@^4.1.0: resolved "https://registry.yarnpkg.com/map-obj/-/map-obj-4.3.0.tgz#9304f906e93faae70880da102a9f1df0ea8bb05a" integrity sha512-hdN1wVrZbb29eBGiGjJbeP8JbKjq1urkHJ/LIP/NY48MZ1QVXUsQBV1G1zvYFHn1XE06cwjBsOI2K3Ulnj1YXQ== -marked@^2.0.0: - version "2.1.3" - resolved "https://registry.yarnpkg.com/marked/-/marked-2.1.3.tgz#bd017cef6431724fd4b27e0657f5ceb14bff3753" - integrity sha512-/Q+7MGzaETqifOMWYEA7HVMaZb4XbcRfaOzcSsHZEith83KGlvaSG33u0SKu89Mj5h+T8V2hM+8O45Qc5XTgwA== +marked@^3.0.7: + version "3.0.8" + resolved "https://registry.yarnpkg.com/marked/-/marked-3.0.8.tgz#2785f0dc79cbdc6034be4bb4f0f0a396bd3f8aeb" + integrity sha512-0gVrAjo5m0VZSJb4rpL59K1unJAMb/hm8HRXqasD8VeC8m91ytDPMritgFSlKonfdt+rRYYpP/JfLxgIX8yoSw== matches-selector@0.0.1: version "0.0.1" @@ -7453,11 +7104,6 @@ mdn-data@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" @@ -7517,7 +7163,7 @@ miller-rabin@^4.0.0: bn.js "^4.0.0" brorand "^1.0.1" -mime-db@1.50.0, mime-db@^1.28.0: +mime-db@1.50.0: version "1.50.0" resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.50.0.tgz#abd4ac94e98d3c0e185016c67ab45d5fde40c11f" integrity sha512-9tMZCDlYHqeERXEHO9f/hKfNXhre5dK2eE/krIvUjZbS2KPcqGDfNShIWS1uW9XOTKQKqK6qbeOci18rbfW77A== @@ -7544,11 +7190,6 @@ mimic-fn@^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== - min-indent@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/min-indent/-/min-indent-1.0.1.tgz#a63f681673b30571fbe8bc25686ae746eefa9869" @@ -7653,7 +7294,7 @@ mkdirp-classic@^0.5.2: resolved "https://registry.yarnpkg.com/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz#fa10c9115cc6d8865be221ba47ee9bed78601113" integrity sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A== -mkdirp@^0.5.5, mkdirp@~0.5.1: +mkdirp@^0.5.5: version "0.5.5" resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.5.tgz#d91cefd62d1436ca0f41620e251288d420099def" integrity sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ== @@ -7735,7 +7376,7 @@ moment-timezone@^0.5.34: dependencies: moment ">= 2.9.0" -"moment@>= 2.9.0", moment@^2.10.2, moment@^2.29.0, moment@^2.29.3, moment@~2.29.2: +"moment@>= 2.9.0", moment@^2.29.0, moment@^2.29.3, moment@~2.29.2: version "2.29.3" resolved "https://registry.yarnpkg.com/moment/-/moment-2.29.3.tgz#edd47411c322413999f7a5940d526de183c031f3" integrity sha512-c6YRvhEo//6T2Jz/vVtYzqBzwvPT95JBQ+smCytzf7c50oMZRsR/a4w88aD34I+/QVSfnoAnSBFPJHItlOMJVw== @@ -7750,14 +7391,6 @@ mousetrap@^1.6.3: 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" @@ -7825,11 +7458,6 @@ neo-async@^2.6.0, neo-async@^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.4.0" resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-8.4.0.tgz#6e1112b10617f0f8559c64b3f737e8109e5a8338" @@ -7851,6 +7479,11 @@ node-releases@^2.0.1: resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.1.tgz#3d1d395f204f1f2f29a54358b9fb678765ad2fc5" integrity sha512-CqyzN6z7Q6aMeF/ktcMVTzhAHCEpf8SOarwpzpf8pNBY2k5/oM34UHldUwp8VKI7uxct2HxSRdJjBaZeESzcxA== +node-releases@^2.0.3: + version "2.0.5" + resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.5.tgz#280ed5bc3eba0d96ce44897d8aee478bfb3d9666" + integrity sha512-U9h1NLROZTq9uE1SNffn6WuPDg8icmi3ns4rEl/oTfIle4iLjTliCzgTsbaIFMq/Xn078/lfY/BL0GWZ+psK4Q== + nopt@^5.0.0: version "5.0.0" resolved "https://registry.yarnpkg.com/nopt/-/nopt-5.0.0.tgz#530942bb58a512fccafe53fe210f13a25355dc88" @@ -7878,15 +7511,6 @@ normalize-range@^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@^6.0.1: version "6.1.0" resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-6.1.0.tgz#40d0885b535deffe3f3147bec877d05fe4c5668a" @@ -7897,30 +7521,15 @@ notificar@^1.0.1: resolved "https://registry.yarnpkg.com/notificar/-/notificar-1.0.1.tgz#11ba233c261eee02f5d688ee300ece5f72522887" integrity sha512-jiCay0IY0N+gloyDks+v4WV+OKU4lIXUhQgxw4Iu9bXpw80cNXTezVv46OCK5+E8G8fkt1Bj76DNepULqlQS3Q== -notistack@^2.0.0: - version "2.0.5" - resolved "https://registry.yarnpkg.com/notistack/-/notistack-2.0.5.tgz#8eb53720453f6e02182cd0e6784ced630a7bb7e6" - integrity sha512-Ig2T1Muqkc1PaSQcEDrK7diKv6cBxw02Iq6uv074ySfgq524TV5lK41diAb6OSsaiWfp3aRt+T3+0MF8m2EcJQ== +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: +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== @@ -7937,13 +7546,6 @@ npmlog@^4.1.2: 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" @@ -7956,7 +7558,7 @@ number-is-nan@^1.0.0: 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: +object-assign@^4, object-assign@^4.1.0, object-assign@^4.1.1: version "4.1.1" resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863" integrity sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM= @@ -8007,15 +7609,6 @@ object.fromentries@^2.0.3, object.fromentries@^2.0.4: define-properties "^1.1.3" es-abstract "^1.19.1" -object.getownpropertydescriptors@^2.1.0: - version "2.1.3" - resolved "https://registry.yarnpkg.com/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.3.tgz#b223cf38e17fefb97a63c10c91df72ccb386df9e" - integrity sha512-VdDoCwvJI4QdC6ndjpqFmoL3/+HxffFBbcJzKi5hwLLqqx3mdbedRpfZDdK0SrOSauj8X4GzBvnDZl4vTN7dOw== - dependencies: - call-bind "^1.0.2" - define-properties "^1.1.3" - es-abstract "^1.19.1" - object.hasown@^1.0.0: version "1.1.0" resolved "https://registry.yarnpkg.com/object.hasown/-/object.hasown-1.1.0.tgz#7232ed266f34d197d15cac5880232f7a4790afe5" @@ -8024,7 +7617,7 @@ object.hasown@^1.0.0: define-properties "^1.1.3" es-abstract "^1.19.1" -object.values@^1.1.0, object.values@^1.1.1, object.values@^1.1.4: +object.values@^1.1.1, object.values@^1.1.4: version "1.1.5" resolved "https://registry.yarnpkg.com/object.values/-/object.values-1.1.5.tgz#959f63e3ce9ef108720333082131e4a459b716ac" integrity sha512-QUZRW0ilQ3PnPpbNtgdNV1PDbEqLIiSFB3l+EnGtBQ/8SUTLj1PZwtQHABZtLgwpJZTSZhuGLOGk57Drx2IvYg== @@ -8040,14 +7633,14 @@ on-finished@~2.3.0: dependencies: ee-first "1.1.1" -once@^1.3.0, once@^1.3.1, once@^1.4.0: +once@^1.3.0: version "1.4.0" resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1" integrity sha1-WDsap3WWHUsROsF9nFC6753Xa9E= dependencies: wrappy "1" -onetime@^5.1.0, onetime@^5.1.2: +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== @@ -8071,72 +7664,16 @@ optionator@^0.9.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" @@ -8165,13 +7702,6 @@ p-locate@^5.0.0: dependencies: p-limit "^3.0.2" -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" @@ -8197,20 +7727,6 @@ p-series@^1.0.0, p-series@^1.1.0: "@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" @@ -8305,11 +7821,6 @@ path-is-absolute@^1.0.0, path-is-absolute@^1.0.1: resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f" integrity sha1-F0uSaHNVNP+8es5r9TpanhtcX18= -path-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" @@ -8353,19 +7864,14 @@ pbkdf2@^3.0.3: 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/#2c288ccc0ae0c98b41e56e79abf1204be3861702": +"pgadmin4-tree@git+https://github.com/EnterpriseDB/pgadmin4-treeview/#07cc449e1d89ecc8cce3679d8cff5a35f1db67ee": version "1.0.0" - resolved "git+https://github.com/EnterpriseDB/pgadmin4-treeview/#2c288ccc0ae0c98b41e56e79abf1204be3861702" + resolved "git+https://github.com/EnterpriseDB/pgadmin4-treeview/#07cc449e1d89ecc8cce3679d8cff5a35f1db67ee" dependencies: "@types/classnames" "^2.2.6" "@types/react" "^16.7.18" @@ -8379,7 +7885,7 @@ performance-now@^2.1.0: notificar "^1.0.1" path-fx "^2.0.0" react "^16.6.3" - react-aspen "^1.1.1" + react-aspen "^1.2.0" react-dom "^16.6.3" react-virtualized-auto-sizer "^1.0.6" valid-filename "^2.0.1" @@ -8399,33 +7905,6 @@ picomodal@^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" @@ -8433,15 +7912,6 @@ pkg-dir@^4.1.0, pkg-dir@^4.2.0: 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" @@ -8729,16 +8199,6 @@ prelude-ls@^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" @@ -8785,16 +8245,6 @@ prop-types@^15.5.8, prop-types@^15.6.0, prop-types@^15.6.2, prop-types@^15.7.2: 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" @@ -8807,14 +8257,6 @@ public-encrypt@^4.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" @@ -8845,15 +8287,6 @@ qs@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" @@ -9048,7 +8481,7 @@ re-resizable@6.9.1: dependencies: fast-memoize "^2.5.1" -react-aspen@^1.1.0, react-aspen@^1.1.1: +react-aspen@^1.1.0: 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== @@ -9059,6 +8492,17 @@ react-aspen@^1.1.0, react-aspen@^1.1.1: path-fx "^2.1.1" react-window "^1.3.1" +react-aspen@^1.2.0: + version "1.2.0" + resolved "https://registry.yarnpkg.com/react-aspen/-/react-aspen-1.2.0.tgz#375fa82a8db627542fc8b9e6e421baa49a65ab95" + integrity sha512-w+vUn4ScCzcxDB5xEsKIuIkUnySEQXlp/zqPFChWEpYG12mPO7h7z/LWuK2QXUoDbIP96Fcf1+UAI9I/cstPqg== + 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" @@ -9204,7 +8648,7 @@ react-timer-hook@^3.0.5: resolved "https://registry.yarnpkg.com/react-timer-hook/-/react-timer-hook-3.0.5.tgz#a8d930f99b180cd88da245965a26a17df3e7457b" integrity sha512-n+98SdmYvui2ne3KyWb3Ldu4k0NYQa3g/VzW6VEIfZJ8GAk/jJsIY700M8Nd2vNSTj05c7wKyQfJBqZ0x7zfiA== -react-transition-group@^4.0.0, react-transition-group@^4.3.0, react-transition-group@^4.4.0, react-transition-group@^4.4.2: +react-transition-group@^4.0.0, react-transition-group@^4.3.0, react-transition-group@^4.4.0: version "4.4.2" resolved "https://registry.yarnpkg.com/react-transition-group/-/react-transition-group-4.4.2.tgz#8b59a56f09ced7b55cbd53c36768b922890d5470" integrity sha512-/RNYfRAMlZwDSr6z4zNKV6xu53/e2BuaBbGhbyYIXTrmgu/bGHzmqOs7mJSJBHy9Ud+ApHx3QjrkKSp1pxvlFg== @@ -9285,7 +8729,7 @@ readable-stream@^1.0.33: 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: +readable-stream@^2.0.2, readable-stream@^2.0.6, 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== @@ -9370,6 +8814,13 @@ regenerator-transform@^0.14.2: dependencies: "@babel/runtime" "^7.8.4" +regenerator-transform@^0.15.0: + version "0.15.0" + resolved "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.15.0.tgz#cbd9ead5d77fae1a48d957cf889ad0586adb6537" + integrity sha512-LsrGtPmbYg19bcPHwdtmXwbW+TqNvtY4riE3P83foeHRroMbH6/2ddFBfab3t7kbzc7v7p4wbkIecHImqt0QNg== + dependencies: + "@babel/runtime" "^7.8.4" + 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" @@ -9496,13 +8947,6 @@ resolve@^2.0.0-next.3: 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" @@ -9530,13 +8974,6 @@ rifm@^0.7.0: 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" @@ -9567,16 +9004,16 @@ run-parallel@^1.1.9: 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== +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== + "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" @@ -9607,7 +9044,7 @@ sass@^1.24.4: dependencies: chokidar ">=3.0.0 <4.0.0" -sax@^1.2.4, 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== @@ -9662,36 +9099,17 @@ schema-utils@^3.0.0, schema-utils@^3.1.0, schema-utils@^3.1.1: 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: +semver@^5.3.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== @@ -9759,13 +9177,6 @@ shasum-object@^1.0.0: 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" @@ -9773,11 +9184,6 @@ shebang-command@^2.0.0: 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" @@ -9807,7 +9213,7 @@ side-channel@^1.0.4: 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: +signal-exit@^3.0.0, signal-exit@^3.0.3: version "3.0.5" resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.5.tgz#9e3e8cc0c75a99472b44321033a7702e7738252f" integrity sha512-KWcOiKeQj6ZyXx7zq4YxSMgHRlod4czeBQZrPb8OKcohcqAXShm7E20kEMle9WBt26hFcAf0qLOcp5zmY7kOqQ== @@ -9934,27 +9340,6 @@ socks@^2.6.1: 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" @@ -10001,11 +9386,6 @@ source-map@~0.7.2: resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.7.3.tgz#5302f8169031735226544092e64981f751750383" integrity sha512-CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ== -sourcemap-codec@1.4.8: - version "1.4.8" - resolved "https://registry.yarnpkg.com/sourcemap-codec/-/sourcemap-codec-1.4.8.tgz#ea804bd94857402e6992d05a38ef1ae35a9ab4c4" - integrity sha512-9NykojV5Uih4lgo5So5dtw+f0JgJX30KCNI8gwhz2J9A15wD0Ml6tjHKwf6fTSa6fAdVBdZeNOs9eJ71qCk8vA== - spdx-correct@^3.0.0: version "3.1.1" resolved "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-3.1.1.tgz#dece81ac9c1e6713e5f7d1b6f17d468fa53d89a9" @@ -10107,11 +9487,6 @@ streamroller@^3.0.2: 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" @@ -10217,18 +9592,6 @@ strip-comments@^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" @@ -10246,18 +9609,6 @@ strip-json-comments@^3.1.0, strip-json-comments@^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" - -strnum@^1.0.4: - version "1.0.4" - resolved "https://registry.yarnpkg.com/strnum/-/strnum-1.0.4.tgz#e97e36a7d6ba9f93d0d6b496b2ed0678d422832b" - integrity sha512-lMzNMfDpaQOLt4B2mEbfzYS0+T7dvCXeojnlGf6f1AygvWDMcWyXYaLbyICfjVu29sErR8fnRagQfBW/N/hGgw== - style-loader@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/style-loader/-/style-loader-2.0.0.tgz#9669602fd4690740eaaec137799a03addbbc393c" @@ -10304,11 +9655,6 @@ stylehacks@^5.0.1: browserslist "^4.16.0" postcss-selector-parser "^6.0.4" -stylis@4.0.13: - version "4.0.13" - resolved "https://registry.yarnpkg.com/stylis/-/stylis-4.0.13.tgz#f5db332e376d13cc84ecfe5dace9a2a51d954c91" - integrity sha512-xGPXiFVl4YED9Jh7Euv2V220mriG9u4B2TA6Ybjc1catrstKD2PpIdU3U0RKpkVBC2EhmL/F0sPCr9vrFTNRag== - stylis@^4.0.10, stylis@^4.0.7: version "4.0.10" resolved "https://registry.yarnpkg.com/stylis/-/stylis-4.0.10.tgz#446512d1097197ab3f02fb3c258358c3f7a14240" @@ -10393,26 +9739,7 @@ svgo-loader@^2.2.0: js-yaml "^3.13.1" loader-utils "^1.0.3" -svgo@^1.2.2, 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.7.0: +svgo@^2.5.0, svgo@^2.7.0: version "2.8.0" resolved "https://registry.yarnpkg.com/svgo/-/svgo-2.8.0.tgz#4ff80cce6710dc2795f0c7c74101e6764cfccd24" integrity sha512-+N/Q9kV1+F+UeWYoSiULYo4xYSDQlTgb+ayMobAXPwMnLvop7oxKMo9OzIrX5x3eS4L4f2UHhc9axXwY8DpChg== @@ -10460,19 +9787,6 @@ tapable@^2.1.1, tapable@^2.2.0: resolved "https://registry.yarnpkg.com/tapable/-/tapable-2.2.1.tgz#1967a73ef4060a82f12ab96af86d52fdb76eeca0" integrity sha512-GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ== -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" @@ -10485,19 +9799,6 @@ tar@^6.0.2, tar@^6.1.2: 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" @@ -10559,16 +9860,11 @@ through2@^2.0.0: readable-stream "~2.3.6" xtend "~4.0.1" -"through@>=2.2.7 <3", through@^2.3.8: +"through@>=2.2.7 <3": 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" @@ -10605,11 +9901,6 @@ tmp@^0.2.1: 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" @@ -10642,13 +9933,6 @@ trim-newlines@^4.0.2: resolved "https://registry.yarnpkg.com/trim-newlines/-/trim-newlines-4.0.2.tgz#d6aaaf6a0df1b4b536d183879a6b939489808c7c" integrity sha512-GJtWyq9InR/2HRiLZgpIKv+ufIKrVrvjQWEj7PxAXNc5dwbNJkqhAUoAGgzRmULAnoOM5EIpveYd3J2VeSAIew== -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" @@ -10696,13 +9980,6 @@ tty-browserify@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" @@ -10710,11 +9987,6 @@ type-check@^0.4.0, type-check@~0.4.0: 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.20.2: version "0.20.2" resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.20.2.tgz#1bf207f4b28f91583666cb5fbd327887301cd5f4" @@ -10768,14 +10040,6 @@ unbox-primitive@^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" @@ -10872,11 +10136,6 @@ unpipe@1.0.0, unpipe@~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" @@ -10898,25 +10157,6 @@ url-loader@^1.1.2: 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" @@ -10930,16 +10170,6 @@ util-deprecate@^1.0.1, util-deprecate@^1.0.2, util-deprecate@~1.0.1: 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" @@ -10971,11 +10201,6 @@ utrie@^1.0.1: dependencies: base64-arraybuffer "^1.0.1" -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: version "2.3.0" resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz#2de19618c66dc247dcfb6f99338035d8245a2cee" @@ -11178,7 +10403,7 @@ which-typed-array@^1.1.2: has-tostringtag "^1.0.0" is-typed-array "^1.1.7" -which@^1.2.1, which@^1.2.9: +which@^1.2.1: version "1.3.1" resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a" integrity sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ== @@ -11285,11 +10510,6 @@ y18n@^5.0.5: 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" @@ -11318,22 +10538,14 @@ yargs@^16.1.1: 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== +yarn-audit-html@^3.0.1: + version "3.0.1" + resolved "https://registry.yarnpkg.com/yarn-audit-html/-/yarn-audit-html-3.0.1.tgz#222de37f2233f95a37b651efc2ac52e53a666a03" + integrity sha512-tdtbJyKD7lhGS3f1df/boxhNrnEfmjVCyjHGc/9WebZ3gHvF/dxyLDPOzio1vpJRczaYqW3WVF6M1Srgt1O2yQ== dependencies: - commander "^7.0.0" + commander "^8.2.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" + marked "^3.0.7" yeast@0.1.2: version "0.1.2" diff --git a/third_party/nixpkgs/pkgs/tools/admin/pgadmin/yarn.nix b/third_party/nixpkgs/pkgs/tools/admin/pgadmin/yarn.nix index 9633c2e5d1..13bd759ccc 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/pgadmin/yarn.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/pgadmin/yarn.nix @@ -2,11 +2,11 @@ offline_cache = linkFarm "offline" packages; packages = [ { - name = "_ampproject_remapping___remapping_2.0.2.tgz"; + name = "_ampproject_remapping___remapping_2.2.0.tgz"; path = fetchurl { - name = "_ampproject_remapping___remapping_2.0.2.tgz"; - url = "https://registry.yarnpkg.com/@ampproject/remapping/-/remapping-2.0.2.tgz"; - sha512 = "sE8Gx+qSDMLoJvb3QarJJlDQK7SSY4rK3hxp4XsiANeFOmjU46ZI7Y9adAQRJrmbz8zbtZkp3mJTT+rGxtF0XA=="; + name = "_ampproject_remapping___remapping_2.2.0.tgz"; + url = "https://registry.yarnpkg.com/@ampproject/remapping/-/remapping-2.2.0.tgz"; + sha512 = "qRmjj8nj9qmLTQXXmaR1cck3UXSRMPrbsLJAasZpF+t3riI71BXed5ebIOYwQntykeZuhjsdweEc9BxH5Jc26w=="; }; } { @@ -57,6 +57,14 @@ sha512 = "392byTlpGWXMv4FbyWw3sAZ/FrW/DrwqLGXpy0mbyNe9Taqv1mg9yON5/o0cnr8XYCkFTZbC1eV+c+LAROgrng=="; }; } + { + name = "_babel_compat_data___compat_data_7.17.10.tgz"; + path = fetchurl { + name = "_babel_compat_data___compat_data_7.17.10.tgz"; + url = "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.17.10.tgz"; + sha512 = "GZt/TCsG70Ms19gfZO1tM4CVnXsPgEPBCpJu+Qz3L0LUDsY5nZqFZglIoPC1kIYOtNBZlrnFT+klg12vFGZXrw=="; + }; + } { name = "_babel_core___core_7.13.8.tgz"; path = fetchurl { @@ -66,11 +74,11 @@ }; } { - name = "_babel_core___core_7.17.0.tgz"; + name = "_babel_core___core_7.18.2.tgz"; path = fetchurl { - name = "_babel_core___core_7.17.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/core/-/core-7.17.0.tgz"; - sha512 = "x/5Ea+RO5MvF9ize5DeVICJoVrNv0Mi2RnIABrZEKYvPEpldXwauPkgvYA17cKa6WpU3LoYvYbuEMFtSNFsarA=="; + name = "_babel_core___core_7.18.2.tgz"; + url = "https://registry.yarnpkg.com/@babel/core/-/core-7.18.2.tgz"; + sha512 = "A8pri1YJiC5UnkdrWcmfZTJTV85b4UXTAfImGmCfYmax4TR9Cw8sDS0MOk++Gp2mE/BefVJ5nwy5yzqNJbP/DQ=="; }; } { @@ -105,6 +113,14 @@ sha512 = "RR8hUCfRQn9j9RPKEVXo9LiwoxLPYn6hNZlvUOR8tSnaxlD0p0+la00ZP9/SnRt6HchKr+X0fO2r8vrETiJGew=="; }; } + { + name = "_babel_generator___generator_7.18.2.tgz"; + path = fetchurl { + name = "_babel_generator___generator_7.18.2.tgz"; + url = "https://registry.yarnpkg.com/@babel/generator/-/generator-7.18.2.tgz"; + sha512 = "W1lG5vUwFvfMd8HVXqdfbuG7RuaSrTCCD8cl8fP8wOivdbtbIg2Db3IWUcgvfxKbbn6ZBGYRW/Zk1MIwK49mgw=="; + }; + } { name = "_babel_helper_annotate_as_pure___helper_annotate_as_pure_7.16.0.tgz"; path = fetchurl { @@ -145,6 +161,14 @@ sha512 = "mGojBwIWcwGD6rfqgRXVlVYmPAv7eOpIemUG3dGnDdCY4Pae70ROij3XmfrH6Fa1h1aiDylpglbZyktfzyo/hA=="; }; } + { + name = "_babel_helper_compilation_targets___helper_compilation_targets_7.18.2.tgz"; + path = fetchurl { + name = "_babel_helper_compilation_targets___helper_compilation_targets_7.18.2.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.18.2.tgz"; + sha512 = "s1jnPotJS9uQnzFtiZVBUxe67CuBa679oWFHpxYYnTpRL/1ffhyX44R9uYiXoa/pLXcY9H2moJta0iaanlk/rQ=="; + }; + } { name = "_babel_helper_create_class_features_plugin___helper_create_class_features_plugin_7.17.1.tgz"; path = fetchurl { @@ -169,6 +193,14 @@ sha512 = "S3+IHG72pJFb0RmJgeXg/TjVKt641ZsLla028haXJjdqCf9eccE5r1JsdO//L7nzTDzXjtC+hwV/lrkEb2+t0Q=="; }; } + { + name = "_babel_helper_create_class_features_plugin___helper_create_class_features_plugin_7.18.0.tgz"; + path = fetchurl { + name = "_babel_helper_create_class_features_plugin___helper_create_class_features_plugin_7.18.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.18.0.tgz"; + sha512 = "Kh8zTGR9de3J63e5nS0rQUdRs/kbtwoeQQ0sriS0lItjC96u8XXZN6lKpuyWd2coKSU13py/y+LTmThLuVX0Pg=="; + }; + } { name = "_babel_helper_create_regexp_features_plugin___helper_create_regexp_features_plugin_7.17.0.tgz"; path = fetchurl { @@ -185,6 +217,14 @@ sha512 = "3DyG0zAFAZKcOp7aVr33ddwkxJ0Z0Jr5V99y3I690eYLpukJsJvAbzTy1ewoCqsML8SbIrjH14Jc/nSQ4TvNPA=="; }; } + { + name = "_babel_helper_create_regexp_features_plugin___helper_create_regexp_features_plugin_7.17.12.tgz"; + path = fetchurl { + name = "_babel_helper_create_regexp_features_plugin___helper_create_regexp_features_plugin_7.17.12.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.17.12.tgz"; + sha512 = "b2aZrV4zvutr9AIa6/gA3wsZKRwTKYoDxYiFKcESS3Ug2GTXzwBEvMuuFLhCQpEnRXs1zng4ISAXSUxxKBIcxw=="; + }; + } { name = "_babel_helper_define_polyfill_provider___helper_define_polyfill_provider_0.1.5.tgz"; path = fetchurl { @@ -209,6 +249,14 @@ sha512 = "SLLb0AAn6PkUeAfKJCCOl9e1R53pQlGAfc4y4XuMRZfqeMYLE0dM1LMhqbGAlGQY0lfw5/ohoYWAe9V1yibRag=="; }; } + { + name = "_babel_helper_environment_visitor___helper_environment_visitor_7.18.2.tgz"; + path = fetchurl { + name = "_babel_helper_environment_visitor___helper_environment_visitor_7.18.2.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-environment-visitor/-/helper-environment-visitor-7.18.2.tgz"; + sha512 = "14GQKWkX9oJzPiQQ7/J36FTXcD4kSp8egKjO9nINlSKiHITRA9q/R74qu8S9xlc/b/yjsJItQUeeh3xnGN0voQ=="; + }; + } { name = "_babel_helper_explode_assignable_expression___helper_explode_assignable_expression_7.16.7.tgz"; path = fetchurl { @@ -241,6 +289,14 @@ sha512 = "QfDfEnIUyyBSR3HtrtGECuZ6DAyCkYFp7GHl75vFtTnn6pjKeK0T1DB5lLkFvBea8MdaiUABx3osbgLyInoejA=="; }; } + { + name = "_babel_helper_function_name___helper_function_name_7.17.9.tgz"; + path = fetchurl { + name = "_babel_helper_function_name___helper_function_name_7.17.9.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.17.9.tgz"; + sha512 = "7cRisGlVtiVqZ0MW0/yFB4atgpGLWEHUVYnb448hZK4x+vih0YO5UoS11XIYtZYqHd0dIPMdUSv8q5K4LdMnIg=="; + }; + } { name = "_babel_helper_get_function_arity___helper_get_function_arity_7.16.7.tgz"; path = fetchurl { @@ -297,6 +353,14 @@ sha512 = "VtJ/65tYiU/6AbMTDwyoXGPKHgTsfRarivm+YbB5uAzKUyuPjgZSgAFeG87FCigc7KNHu2Pegh1XIT3lXjvz3Q=="; }; } + { + name = "_babel_helper_member_expression_to_functions___helper_member_expression_to_functions_7.17.7.tgz"; + path = fetchurl { + name = "_babel_helper_member_expression_to_functions___helper_member_expression_to_functions_7.17.7.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.17.7.tgz"; + sha512 = "thxXgnQ8qQ11W2wVUObIqDL4p148VMxkt5T/qpN5k2fboRyzFGFmKsTGViquyM5QHKUy48OZoca8kw4ajaDPyw=="; + }; + } { name = "_babel_helper_module_imports___helper_module_imports_7.13.12.tgz"; path = fetchurl { @@ -337,6 +401,14 @@ sha512 = "gaqtLDxJEFCeQbYp9aLAefjhkKdjKcdh6DB7jniIGU3Pz52WAmP268zK0VgPz9hUNkMSYeH976K2/Y6yPadpng=="; }; } + { + name = "_babel_helper_module_transforms___helper_module_transforms_7.18.0.tgz"; + path = fetchurl { + name = "_babel_helper_module_transforms___helper_module_transforms_7.18.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.18.0.tgz"; + sha512 = "kclUYSUBIjlvnzN2++K9f2qzYKFgjmnmjwL4zlmU5f8ZtzgWe8s0rUPSTGy2HmK4P8T52MQsS+HTQAgZd3dMEA=="; + }; + } { name = "_babel_helper_optimise_call_expression___helper_optimise_call_expression_7.16.0.tgz"; path = fetchurl { @@ -369,6 +441,14 @@ sha512 = "Qg3Nk7ZxpgMrsox6HreY1ZNKdBq7K72tDSliA6dCl5f007jR4ne8iD5UzuNnCJH2xBf2BEEVGr+/OL6Gdp7RxA=="; }; } + { + name = "_babel_helper_plugin_utils___helper_plugin_utils_7.17.12.tgz"; + path = fetchurl { + name = "_babel_helper_plugin_utils___helper_plugin_utils_7.17.12.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.17.12.tgz"; + sha512 = "JDkf04mqtN3y4iAbO1hv9U2ARpPyPL1zqyWs/2WG1pgSq9llHFjStX5jdxb84himgJm+8Ng+x0oiWF/nw/XQKA=="; + }; + } { name = "_babel_helper_remap_async_to_generator___helper_remap_async_to_generator_7.16.8.tgz"; path = fetchurl { @@ -393,6 +473,14 @@ sha512 = "TQxuQfSCdoha7cpRNJvfaYxxxzmbxXw/+6cS7V02eeDYyhxderSoMVALvwupA54/pZcOTtVeJ0xccp1nGWladA=="; }; } + { + name = "_babel_helper_replace_supers___helper_replace_supers_7.18.2.tgz"; + path = fetchurl { + name = "_babel_helper_replace_supers___helper_replace_supers_7.18.2.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.18.2.tgz"; + sha512 = "XzAIyxx+vFnrOxiQrToSUOzUOn0e1J2Li40ntddek1Y69AXUTXoDJ40/D5RdjFu7s7qHiaeoTiempZcbuVXh2Q=="; + }; + } { name = "_babel_helper_simple_access___helper_simple_access_7.16.7.tgz"; path = fetchurl { @@ -401,6 +489,14 @@ sha512 = "ZIzHVyoeLMvXMN/vok/a4LWRy8G2v205mNP0XOuf9XRLyX5/u9CnVulUtDgUTama3lT+bf/UqucuZjqiGuTS1g=="; }; } + { + name = "_babel_helper_simple_access___helper_simple_access_7.18.2.tgz"; + path = fetchurl { + name = "_babel_helper_simple_access___helper_simple_access_7.18.2.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.18.2.tgz"; + sha512 = "7LIrjYzndorDY88MycupkpQLKS1AFfsVRm2k/9PtKScSy5tZq0McZTj+DiMRynboZfIqOKvo03pmhTaUgiD6fQ=="; + }; + } { name = "_babel_helper_skip_transparent_expression_wrappers___helper_skip_transparent_expression_wrappers_7.16.0.tgz"; path = fetchurl { @@ -482,11 +578,11 @@ }; } { - name = "_babel_helpers___helpers_7.17.0.tgz"; + name = "_babel_helpers___helpers_7.18.2.tgz"; path = fetchurl { - name = "_babel_helpers___helpers_7.17.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.17.0.tgz"; - sha512 = "Xe/9NFxjPwELUvW2dsukcMZIp6XwPSbI4ojFBJuX5ramHuVE22SVcZIwqzdWo5uCgeTXW8qV97lMvSOjq+1+nQ=="; + name = "_babel_helpers___helpers_7.18.2.tgz"; + url = "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.18.2.tgz"; + sha512 = "j+d+u5xT5utcQSzrh9p+PaJX94h++KN+ng9b9WEJq7pkUPAd61FGqhjuUEdfknb3E/uDBb7ruwEeKkIxNJPIrg=="; }; } { @@ -538,19 +634,27 @@ }; } { - name = "_babel_plugin_bugfix_safari_id_destructuring_collision_in_function_expression___plugin_bugfix_safari_id_destructuring_collision_in_function_expression_7.16.7.tgz"; + name = "_babel_parser___parser_7.18.4.tgz"; path = fetchurl { - name = "_babel_plugin_bugfix_safari_id_destructuring_collision_in_function_expression___plugin_bugfix_safari_id_destructuring_collision_in_function_expression_7.16.7.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.16.7.tgz"; - sha512 = "anv/DObl7waiGEnC24O9zqL0pSuI9hljihqiDuFHC8d7/bjr/4RLGPWuc8rYOff/QPzbEPSkzG8wGG9aDuhHRg=="; + name = "_babel_parser___parser_7.18.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/parser/-/parser-7.18.4.tgz"; + sha512 = "FDge0dFazETFcxGw/EXzOkN8uJp0PC7Qbm+Pe9T+av2zlBpOgunFHkQPPn+eRuClU73JF+98D531UgayY89tow=="; }; } { - name = "_babel_plugin_bugfix_v8_spread_parameters_in_optional_chaining___plugin_bugfix_v8_spread_parameters_in_optional_chaining_7.16.7.tgz"; + name = "_babel_plugin_bugfix_safari_id_destructuring_collision_in_function_expression___plugin_bugfix_safari_id_destructuring_collision_in_function_expression_7.17.12.tgz"; path = fetchurl { - name = "_babel_plugin_bugfix_v8_spread_parameters_in_optional_chaining___plugin_bugfix_v8_spread_parameters_in_optional_chaining_7.16.7.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.16.7.tgz"; - sha512 = "di8vUHRdf+4aJ7ltXhaDbPoszdkh59AQtJM5soLsuHpQJdFQZOA4uGj0V2u/CZ8bJ/u8ULDL5yq6FO/bCXnKHw=="; + name = "_babel_plugin_bugfix_safari_id_destructuring_collision_in_function_expression___plugin_bugfix_safari_id_destructuring_collision_in_function_expression_7.17.12.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.17.12.tgz"; + sha512 = "xCJQXl4EeQ3J9C4yOmpTrtVGmzpm2iSzyxbkZHw7UCnZBftHpF/hpII80uWVyVrc40ytIClHjgWGTG1g/yB+aw=="; + }; + } + { + name = "_babel_plugin_bugfix_v8_spread_parameters_in_optional_chaining___plugin_bugfix_v8_spread_parameters_in_optional_chaining_7.17.12.tgz"; + path = fetchurl { + name = "_babel_plugin_bugfix_v8_spread_parameters_in_optional_chaining___plugin_bugfix_v8_spread_parameters_in_optional_chaining_7.17.12.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.17.12.tgz"; + sha512 = "/vt0hpIw0x4b6BLKUkwlvEoiGZYYLNZ96CzyHYPbtG2jZGz6LBe7/V+drYrc/d+ovrF9NBi0pmtvmNb/FsWtRQ=="; }; } { @@ -561,6 +665,14 @@ sha512 = "71YHIvMuiuqWJQkebWJtdhQTfd4Q4mF76q2IX37uZPkG9+olBxsX+rH1vkhFto4UeJZ9dPY2s+mDvhDm1u2BGQ=="; }; } + { + name = "_babel_plugin_proposal_async_generator_functions___plugin_proposal_async_generator_functions_7.17.12.tgz"; + path = fetchurl { + name = "_babel_plugin_proposal_async_generator_functions___plugin_proposal_async_generator_functions_7.17.12.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.17.12.tgz"; + sha512 = "RWVvqD1ooLKP6IqWTA5GyFVX2isGEgC5iFxKzfYOIy/QEFdxYyCybBDtIGjipHpb9bDWHzcqGqFakf+mVmBTdQ=="; + }; + } { name = "_babel_plugin_proposal_class_properties___plugin_proposal_class_properties_7.13.0.tgz"; path = fetchurl { @@ -578,11 +690,19 @@ }; } { - name = "_babel_plugin_proposal_class_static_block___plugin_proposal_class_static_block_7.16.7.tgz"; + name = "_babel_plugin_proposal_class_properties___plugin_proposal_class_properties_7.17.12.tgz"; path = fetchurl { - name = "_babel_plugin_proposal_class_static_block___plugin_proposal_class_static_block_7.16.7.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-proposal-class-static-block/-/plugin-proposal-class-static-block-7.16.7.tgz"; - sha512 = "dgqJJrcZoG/4CkMopzhPJjGxsIe9A8RlkQLnL/Vhhx8AA9ZuaRwGSlscSh42hazc7WSrya/IK7mTeoF0DP9tEw=="; + name = "_babel_plugin_proposal_class_properties___plugin_proposal_class_properties_7.17.12.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.17.12.tgz"; + sha512 = "U0mI9q8pW5Q9EaTHFPwSVusPMV/DV9Mm8p7csqROFLtIE9rBF5piLqyrBGigftALrBcsBGu4m38JneAe7ZDLXw=="; + }; + } + { + name = "_babel_plugin_proposal_class_static_block___plugin_proposal_class_static_block_7.18.0.tgz"; + path = fetchurl { + name = "_babel_plugin_proposal_class_static_block___plugin_proposal_class_static_block_7.18.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-class-static-block/-/plugin-proposal-class-static-block-7.18.0.tgz"; + sha512 = "t+8LsRMMDE74c6sV7KShIw13sqbqd58tlqNrsWoWBTIMw7SVQ0cZ905wLNS/FBCy/3PyooRHLFFlfrUNyyz5lA=="; }; } { @@ -601,6 +721,14 @@ sha512 = "ZxdtqDXLRGBL64ocZcs7ovt71L3jhC1RGSyR996svrCi3PYqHNkb3SwPJCs8RIzD86s+WPpt2S73+EHCGO+NUA=="; }; } + { + name = "_babel_plugin_proposal_export_namespace_from___plugin_proposal_export_namespace_from_7.17.12.tgz"; + path = fetchurl { + name = "_babel_plugin_proposal_export_namespace_from___plugin_proposal_export_namespace_from_7.17.12.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.17.12.tgz"; + sha512 = "j7Ye5EWdwoXOpRmo5QmRyHPsDIe6+u70ZYZrd7uz+ebPYFKfRcLcNu3Ro0vOlJ5zuv8rU7xa+GttNiRzX56snQ=="; + }; + } { name = "_babel_plugin_proposal_json_strings___plugin_proposal_json_strings_7.16.7.tgz"; path = fetchurl { @@ -609,6 +737,14 @@ sha512 = "lNZ3EEggsGY78JavgbHsK9u5P3pQaW7k4axlgFLYkMd7UBsiNahCITShLjNQschPyjtO6dADrL24757IdhBrsQ=="; }; } + { + name = "_babel_plugin_proposal_json_strings___plugin_proposal_json_strings_7.17.12.tgz"; + path = fetchurl { + name = "_babel_plugin_proposal_json_strings___plugin_proposal_json_strings_7.17.12.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.17.12.tgz"; + sha512 = "rKJ+rKBoXwLnIn7n6o6fulViHMrOThz99ybH+hKHcOZbnN14VuMnH9fo2eHE69C8pO4uX1Q7t2HYYIDmv8VYkg=="; + }; + } { name = "_babel_plugin_proposal_logical_assignment_operators___plugin_proposal_logical_assignment_operators_7.16.7.tgz"; path = fetchurl { @@ -617,6 +753,14 @@ sha512 = "K3XzyZJGQCr00+EtYtrDjmwX7o7PLK6U9bi1nCwkQioRFVUv6dJoxbQjtWVtP+bCPy82bONBKG8NPyQ4+i6yjg=="; }; } + { + name = "_babel_plugin_proposal_logical_assignment_operators___plugin_proposal_logical_assignment_operators_7.17.12.tgz"; + path = fetchurl { + name = "_babel_plugin_proposal_logical_assignment_operators___plugin_proposal_logical_assignment_operators_7.17.12.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.17.12.tgz"; + sha512 = "EqFo2s1Z5yy+JeJu7SFfbIUtToJTVlC61/C7WLKDntSw4Sz6JNAIfL7zQ74VvirxpjB5kz/kIx0gCcb+5OEo2Q=="; + }; + } { name = "_babel_plugin_proposal_nullish_coalescing_operator___plugin_proposal_nullish_coalescing_operator_7.16.7.tgz"; path = fetchurl { @@ -625,6 +769,14 @@ sha512 = "aUOrYU3EVtjf62jQrCj63pYZ7k6vns2h/DQvHPWGmsJRYzWXZ6/AsfgpiRy6XiuIDADhJzP2Q9MwSMKauBQ+UQ=="; }; } + { + name = "_babel_plugin_proposal_nullish_coalescing_operator___plugin_proposal_nullish_coalescing_operator_7.17.12.tgz"; + path = fetchurl { + name = "_babel_plugin_proposal_nullish_coalescing_operator___plugin_proposal_nullish_coalescing_operator_7.17.12.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.17.12.tgz"; + sha512 = "ws/g3FSGVzv+VH86+QvgtuJL/kR67xaEIF2x0iPqdDfYW6ra6JF3lKVBkWynRLcNtIC1oCTfDRVxmm2mKzy+ag=="; + }; + } { name = "_babel_plugin_proposal_numeric_separator___plugin_proposal_numeric_separator_7.16.7.tgz"; path = fetchurl { @@ -649,6 +801,14 @@ sha512 = "3O0Y4+dw94HA86qSg9IHfyPktgR7q3gpNVAeiKQd+8jBKFaU5NQS1Yatgo4wY+UFNuLjvxcSmzcsHqrhgTyBUA=="; }; } + { + name = "_babel_plugin_proposal_object_rest_spread___plugin_proposal_object_rest_spread_7.18.0.tgz"; + path = fetchurl { + name = "_babel_plugin_proposal_object_rest_spread___plugin_proposal_object_rest_spread_7.18.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.18.0.tgz"; + sha512 = "nbTv371eTrFabDfHLElkn9oyf9VG+VKK6WMzhY2o4eHKaG19BToD9947zzGMO6I/Irstx9d8CwX6njPNIAR/yw=="; + }; + } { name = "_babel_plugin_proposal_optional_catch_binding___plugin_proposal_optional_catch_binding_7.16.7.tgz"; path = fetchurl { @@ -665,6 +825,14 @@ sha512 = "eC3xy+ZrUcBtP7x+sq62Q/HYd674pPTb/77XZMb5wbDPGWIdUbSr4Agr052+zaUPSb+gGRnjxXfKFvx5iMJ+DA=="; }; } + { + name = "_babel_plugin_proposal_optional_chaining___plugin_proposal_optional_chaining_7.17.12.tgz"; + path = fetchurl { + name = "_babel_plugin_proposal_optional_chaining___plugin_proposal_optional_chaining_7.17.12.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.17.12.tgz"; + sha512 = "7wigcOs/Z4YWlK7xxjkvaIw84vGhDv/P1dFGQap0nHkc8gFKY/r+hXc8Qzf5k1gY7CvGIcHqAnOagVKJJ1wVOQ=="; + }; + } { name = "_babel_plugin_proposal_private_methods___plugin_proposal_private_methods_7.16.11.tgz"; path = fetchurl { @@ -674,11 +842,19 @@ }; } { - name = "_babel_plugin_proposal_private_property_in_object___plugin_proposal_private_property_in_object_7.16.7.tgz"; + name = "_babel_plugin_proposal_private_methods___plugin_proposal_private_methods_7.17.12.tgz"; path = fetchurl { - name = "_babel_plugin_proposal_private_property_in_object___plugin_proposal_private_property_in_object_7.16.7.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.16.7.tgz"; - sha512 = "rMQkjcOFbm+ufe3bTZLyOfsOUOxyvLXZJCTARhJr+8UMSoZmqTe1K1BgkFcrW37rAchWg57yI69ORxiWvUINuQ=="; + name = "_babel_plugin_proposal_private_methods___plugin_proposal_private_methods_7.17.12.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.17.12.tgz"; + sha512 = "SllXoxo19HmxhDWm3luPz+cPhtoTSKLJE9PXshsfrOzBqs60QP0r8OaJItrPhAj0d7mZMnNF0Y1UUggCDgMz1A=="; + }; + } + { + name = "_babel_plugin_proposal_private_property_in_object___plugin_proposal_private_property_in_object_7.17.12.tgz"; + path = fetchurl { + name = "_babel_plugin_proposal_private_property_in_object___plugin_proposal_private_property_in_object_7.17.12.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.17.12.tgz"; + sha512 = "/6BtVi57CJfrtDNKfK5b66ydK2J5pXUKBKSPD2G1whamMuEnZWgoOIfO8Vf9F/DoD4izBLD/Au4NMQfruzzykg=="; }; } { @@ -689,6 +865,14 @@ sha512 = "QRK0YI/40VLhNVGIjRNAAQkEHws0cswSdFFjpFyt943YmJIU1da9uW63Iu6NFV6CxTZW5eTDCrwZUstBWgp/Rg=="; }; } + { + name = "_babel_plugin_proposal_unicode_property_regex___plugin_proposal_unicode_property_regex_7.17.12.tgz"; + path = fetchurl { + name = "_babel_plugin_proposal_unicode_property_regex___plugin_proposal_unicode_property_regex_7.17.12.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.17.12.tgz"; + sha512 = "Wb9qLjXf3ZazqXA7IvI7ozqRIXIGPtSo+L5coFmEkhTQK18ao4UDDD0zdTGAarmbLj2urpRwrc6893cu5Bfh0A=="; + }; + } { name = "_babel_plugin_proposal_unicode_property_regex___plugin_proposal_unicode_property_regex_7.16.0.tgz"; path = fetchurl { @@ -737,6 +921,14 @@ sha512 = "MXf5laXo6c1IbEbegDmzGPwGNTsHZmEy6QGznu5Sh2UCWvueywb2ee+CCE4zQiZstxU9BMoQO9i6zUFSY0Kj0Q=="; }; } + { + name = "_babel_plugin_syntax_import_assertions___plugin_syntax_import_assertions_7.17.12.tgz"; + path = fetchurl { + name = "_babel_plugin_syntax_import_assertions___plugin_syntax_import_assertions_7.17.12.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-syntax-import-assertions/-/plugin-syntax-import-assertions-7.17.12.tgz"; + sha512 = "n/loy2zkq9ZEM8tEOwON9wTQSTNDTDEz6NujPtJGLU7qObzT1N4c4YZZf8E6ATB2AjNQg/Ib2AIpO03EZaCehw=="; + }; + } { name = "_babel_plugin_syntax_json_strings___plugin_syntax_json_strings_7.8.3.tgz"; path = fetchurl { @@ -753,6 +945,14 @@ sha512 = "Esxmk7YjA8QysKeT3VhTXvF6y77f/a91SIs4pWb4H2eWGQkCKFgQaG6hdoEVZtGsrAcb2K5BW66XsOErD4WU3Q=="; }; } + { + name = "_babel_plugin_syntax_jsx___plugin_syntax_jsx_7.17.12.tgz"; + path = fetchurl { + name = "_babel_plugin_syntax_jsx___plugin_syntax_jsx_7.17.12.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.17.12.tgz"; + sha512 = "spyY3E3AURfxh/RHtjx5j6hs8am5NbUBGfcZ2vB3uShSpZdQyXSf5rR5Mk76vbtlAZOelyVQ71Fg0x9SG4fsog=="; + }; + } { name = "_babel_plugin_syntax_logical_assignment_operators___plugin_syntax_logical_assignment_operators_7.10.4.tgz"; path = fetchurl { @@ -825,6 +1025,14 @@ sha512 = "Xv6mEXqVdaqCBfJFyeab0fH2DnUoMsDmhamxsSi4j8nLd4Vtw213WMJr55xxqipC/YVWyPY3K0blJncPYji+dQ=="; }; } + { + name = "_babel_plugin_syntax_typescript___plugin_syntax_typescript_7.17.12.tgz"; + path = fetchurl { + name = "_babel_plugin_syntax_typescript___plugin_syntax_typescript_7.17.12.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.17.12.tgz"; + sha512 = "TYY0SXFiO31YXtNg3HtFwNJHjLsAyIIhAhNWkQ5whPPS7HWUFlg9z0Ta4qAQNjQbP1wsSt/oKkmZ/4/WWdMUpw=="; + }; + } { name = "_babel_plugin_transform_arrow_functions___plugin_transform_arrow_functions_7.16.7.tgz"; path = fetchurl { @@ -833,6 +1041,14 @@ sha512 = "9ffkFFMbvzTvv+7dTp/66xvZAWASuPD5Tl9LK3Z9vhOmANo6j94rik+5YMBt4CwHVMWLWpMsriIc2zsa3WW3xQ=="; }; } + { + name = "_babel_plugin_transform_arrow_functions___plugin_transform_arrow_functions_7.17.12.tgz"; + path = fetchurl { + name = "_babel_plugin_transform_arrow_functions___plugin_transform_arrow_functions_7.17.12.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.17.12.tgz"; + sha512 = "PHln3CNi/49V+mza4xMwrg+WGYevSF1oaiXaC2EQfdp4HWlSjRsrDXWJiQBKpP7749u6vQ9mcry2uuFOv5CXvA=="; + }; + } { name = "_babel_plugin_transform_async_to_generator___plugin_transform_async_to_generator_7.16.8.tgz"; path = fetchurl { @@ -841,6 +1057,14 @@ sha512 = "MtmUmTJQHCnyJVrScNzNlofQJ3dLFuobYn3mwOTKHnSCMtbNsqvF71GQmJfFjdrXSsAA7iysFmYWw4bXZ20hOg=="; }; } + { + name = "_babel_plugin_transform_async_to_generator___plugin_transform_async_to_generator_7.17.12.tgz"; + path = fetchurl { + name = "_babel_plugin_transform_async_to_generator___plugin_transform_async_to_generator_7.17.12.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.17.12.tgz"; + sha512 = "J8dbrWIOO3orDzir57NRsjg4uxucvhby0L/KZuGsWDj0g7twWK3g7JhJhOrXtuXiw8MeiSdJ3E0OW9H8LYEzLQ=="; + }; + } { name = "_babel_plugin_transform_block_scoped_functions___plugin_transform_block_scoped_functions_7.16.7.tgz"; path = fetchurl { @@ -857,6 +1081,14 @@ sha512 = "ObZev2nxVAYA4bhyusELdo9hb3H+A56bxH3FZMbEImZFiEDYVHXQSJ1hQKFlDnlt8G9bBrCZ5ZpURZUrV4G5qQ=="; }; } + { + name = "_babel_plugin_transform_block_scoping___plugin_transform_block_scoping_7.18.4.tgz"; + path = fetchurl { + name = "_babel_plugin_transform_block_scoping___plugin_transform_block_scoping_7.18.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.18.4.tgz"; + sha512 = "+Hq10ye+jlvLEogSOtq4mKvtk7qwcUQ1f0Mrueai866C82f844Yom2cttfJdMdqRLTxWpsbfbkIkOIfovyUQXw=="; + }; + } { name = "_babel_plugin_transform_classes___plugin_transform_classes_7.16.7.tgz"; path = fetchurl { @@ -865,6 +1097,14 @@ sha512 = "WY7og38SFAGYRe64BrjKf8OrE6ulEHtr5jEYaZMwox9KebgqPi67Zqz8K53EKk1fFEJgm96r32rkKZ3qA2nCWQ=="; }; } + { + name = "_babel_plugin_transform_classes___plugin_transform_classes_7.18.4.tgz"; + path = fetchurl { + name = "_babel_plugin_transform_classes___plugin_transform_classes_7.18.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.18.4.tgz"; + sha512 = "e42NSG2mlKWgxKUAD9EJJSkZxR67+wZqzNxLSpc51T8tRU5SLFHsPmgYR5yr7sdgX4u+iHA1C5VafJ6AyImV3A=="; + }; + } { name = "_babel_plugin_transform_computed_properties___plugin_transform_computed_properties_7.16.7.tgz"; path = fetchurl { @@ -873,6 +1113,14 @@ sha512 = "gN72G9bcmenVILj//sv1zLNaPyYcOzUho2lIJBMh/iakJ9ygCo/hEF9cpGb61SCMEDxbbyBoVQxrt+bWKu5KGw=="; }; } + { + name = "_babel_plugin_transform_computed_properties___plugin_transform_computed_properties_7.17.12.tgz"; + path = fetchurl { + name = "_babel_plugin_transform_computed_properties___plugin_transform_computed_properties_7.17.12.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.17.12.tgz"; + sha512 = "a7XINeplB5cQUWMg1E/GI1tFz3LfK021IjV1rj1ypE+R7jHm+pIHmHl25VNkZxtx9uuYp7ThGk8fur1HHG7PgQ=="; + }; + } { name = "_babel_plugin_transform_destructuring___plugin_transform_destructuring_7.16.7.tgz"; path = fetchurl { @@ -881,6 +1129,14 @@ sha512 = "VqAwhTHBnu5xBVDCvrvqJbtLUa++qZaWC0Fgr2mqokBlulZARGyIvZDoqbPlPaKImQ9dKAcCzbv+ul//uqu70A=="; }; } + { + name = "_babel_plugin_transform_destructuring___plugin_transform_destructuring_7.18.0.tgz"; + path = fetchurl { + name = "_babel_plugin_transform_destructuring___plugin_transform_destructuring_7.18.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.18.0.tgz"; + sha512 = "Mo69klS79z6KEfrLg/1WkmVnB8javh75HX4pi2btjvlIoasuxilEyjtsQW6XPrubNd7AQy0MMaNIaQE4e7+PQw=="; + }; + } { name = "_babel_plugin_transform_dotall_regex___plugin_transform_dotall_regex_7.16.7.tgz"; path = fetchurl { @@ -905,6 +1161,14 @@ sha512 = "03DvpbRfvWIXyK0/6QiR1KMTWeT6OcQ7tbhjrXyFS02kjuX/mu5Bvnh5SDSWHxyawit2g5aWhKwI86EE7GUnTw=="; }; } + { + name = "_babel_plugin_transform_duplicate_keys___plugin_transform_duplicate_keys_7.17.12.tgz"; + path = fetchurl { + name = "_babel_plugin_transform_duplicate_keys___plugin_transform_duplicate_keys_7.17.12.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.17.12.tgz"; + sha512 = "EA5eYFUG6xeerdabina/xIoB95jJ17mAkR8ivx6ZSu9frKShBjpOGZPn511MTDTkiCO+zXnzNczvUM69YSf3Zw=="; + }; + } { name = "_babel_plugin_transform_exponentiation_operator___plugin_transform_exponentiation_operator_7.16.7.tgz"; path = fetchurl { @@ -921,6 +1185,14 @@ sha512 = "/QZm9W92Ptpw7sjI9Nx1mbcsWz33+l8kuMIQnDwgQBG5s3fAfQvkRjQ7NqXhtNcKOnPkdICmUHyCaWW06HCsqg=="; }; } + { + name = "_babel_plugin_transform_for_of___plugin_transform_for_of_7.18.1.tgz"; + path = fetchurl { + name = "_babel_plugin_transform_for_of___plugin_transform_for_of_7.18.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.18.1.tgz"; + sha512 = "+TTB5XwvJ5hZbO8xvl2H4XaMDOAK57zF4miuC9qQJgysPNEAZZ9Z69rdF5LJkozGdZrjBIUAIyKUWRMmebI7vg=="; + }; + } { name = "_babel_plugin_transform_function_name___plugin_transform_function_name_7.16.7.tgz"; path = fetchurl { @@ -937,6 +1209,14 @@ sha512 = "6tH8RTpTWI0s2sV6uq3e/C9wPo4PTqqZps4uF0kzQ9/xPLFQtipynvmT1g/dOfEJ+0EQsHhkQ/zyRId8J2b8zQ=="; }; } + { + name = "_babel_plugin_transform_literals___plugin_transform_literals_7.17.12.tgz"; + path = fetchurl { + name = "_babel_plugin_transform_literals___plugin_transform_literals_7.17.12.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.17.12.tgz"; + sha512 = "8iRkvaTjJciWycPIZ9k9duu663FT7VrBdNqNgxnVXEFwOIp55JWcZd23VBRySYbnS3PwQ3rGiabJBBBGj5APmQ=="; + }; + } { name = "_babel_plugin_transform_member_expression_literals___plugin_transform_member_expression_literals_7.16.7.tgz"; path = fetchurl { @@ -953,6 +1233,14 @@ sha512 = "KaaEtgBL7FKYwjJ/teH63oAmE3lP34N3kshz8mm4VMAw7U3PxjVwwUmxEFksbgsNUaO3wId9R2AVQYSEGRa2+g=="; }; } + { + name = "_babel_plugin_transform_modules_amd___plugin_transform_modules_amd_7.18.0.tgz"; + path = fetchurl { + name = "_babel_plugin_transform_modules_amd___plugin_transform_modules_amd_7.18.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.18.0.tgz"; + sha512 = "h8FjOlYmdZwl7Xm2Ug4iX2j7Qy63NANI+NQVWQzv6r25fqgg7k2dZl03p95kvqNclglHs4FZ+isv4p1uXMA+QA=="; + }; + } { name = "_babel_plugin_transform_modules_commonjs___plugin_transform_modules_commonjs_7.16.8.tgz"; path = fetchurl { @@ -961,6 +1249,14 @@ sha512 = "oflKPvsLT2+uKQopesJt3ApiaIS2HW+hzHFcwRNtyDGieAeC/dIHZX8buJQ2J2X1rxGPy4eRcUijm3qcSPjYcA=="; }; } + { + name = "_babel_plugin_transform_modules_commonjs___plugin_transform_modules_commonjs_7.18.2.tgz"; + path = fetchurl { + name = "_babel_plugin_transform_modules_commonjs___plugin_transform_modules_commonjs_7.18.2.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.18.2.tgz"; + sha512 = "f5A865gFPAJAEE0K7F/+nm5CmAE3y8AWlMBG9unu5j9+tk50UQVK0QS8RNxSp7MJf0wh97uYyLWt3Zvu71zyOQ=="; + }; + } { name = "_babel_plugin_transform_modules_systemjs___plugin_transform_modules_systemjs_7.16.7.tgz"; path = fetchurl { @@ -969,6 +1265,14 @@ sha512 = "DuK5E3k+QQmnOqBR9UkusByy5WZWGRxfzV529s9nPra1GE7olmxfqO2FHobEOYSPIjPBTr4p66YDcjQnt8cBmw=="; }; } + { + name = "_babel_plugin_transform_modules_systemjs___plugin_transform_modules_systemjs_7.18.4.tgz"; + path = fetchurl { + name = "_babel_plugin_transform_modules_systemjs___plugin_transform_modules_systemjs_7.18.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.18.4.tgz"; + sha512 = "lH2UaQaHVOAeYrUUuZ8i38o76J/FnO8vu21OE+tD1MyP9lxdZoSfz+pDbWkq46GogUrdrMz3tiz/FYGB+bVThg=="; + }; + } { name = "_babel_plugin_transform_modules_umd___plugin_transform_modules_umd_7.16.7.tgz"; path = fetchurl { @@ -977,6 +1281,14 @@ sha512 = "EMh7uolsC8O4xhudF2F6wedbSHm1HHZ0C6aJ7K67zcDNidMzVcxWdGr+htW9n21klm+bOn+Rx4CBsAntZd3rEQ=="; }; } + { + name = "_babel_plugin_transform_modules_umd___plugin_transform_modules_umd_7.18.0.tgz"; + path = fetchurl { + name = "_babel_plugin_transform_modules_umd___plugin_transform_modules_umd_7.18.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.18.0.tgz"; + sha512 = "d/zZ8I3BWli1tmROLxXLc9A6YXvGK8egMxHp+E/rRwMh1Kip0AP77VwZae3snEJ33iiWwvNv2+UIIhfalqhzZA=="; + }; + } { name = "_babel_plugin_transform_named_capturing_groups_regex___plugin_transform_named_capturing_groups_regex_7.16.8.tgz"; path = fetchurl { @@ -985,6 +1297,14 @@ sha512 = "j3Jw+n5PvpmhRR+mrgIh04puSANCk/T/UA3m3P1MjJkhlK906+ApHhDIqBQDdOgL/r1UYpz4GNclTXxyZrYGSw=="; }; } + { + name = "_babel_plugin_transform_named_capturing_groups_regex___plugin_transform_named_capturing_groups_regex_7.17.12.tgz"; + path = fetchurl { + name = "_babel_plugin_transform_named_capturing_groups_regex___plugin_transform_named_capturing_groups_regex_7.17.12.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.17.12.tgz"; + sha512 = "vWoWFM5CKaTeHrdUJ/3SIOTRV+MBVGybOC9mhJkaprGNt5demMymDW24yC74avb915/mIRe3TgNb/d8idvnCRA=="; + }; + } { name = "_babel_plugin_transform_new_target___plugin_transform_new_target_7.16.7.tgz"; path = fetchurl { @@ -993,6 +1313,14 @@ sha512 = "xiLDzWNMfKoGOpc6t3U+etCE2yRnn3SM09BXqWPIZOBpL2gvVrBWUKnsJx0K/ADi5F5YC5f8APFfWrz25TdlGg=="; }; } + { + name = "_babel_plugin_transform_new_target___plugin_transform_new_target_7.17.12.tgz"; + path = fetchurl { + name = "_babel_plugin_transform_new_target___plugin_transform_new_target_7.17.12.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.17.12.tgz"; + sha512 = "CaOtzk2fDYisbjAD4Sd1MTKGVIpRtx9bWLyj24Y/k6p4s4gQ3CqDGJauFJxt8M/LEx003d0i3klVqnN73qvK3w=="; + }; + } { name = "_babel_plugin_transform_object_super___plugin_transform_object_super_7.16.7.tgz"; path = fetchurl { @@ -1009,6 +1337,14 @@ sha512 = "AT3MufQ7zZEhU2hwOA11axBnExW0Lszu4RL/tAlUJBuNoRak+wehQW8h6KcXOcgjY42fHtDxswuMhMjFEuv/aw=="; }; } + { + name = "_babel_plugin_transform_parameters___plugin_transform_parameters_7.17.12.tgz"; + path = fetchurl { + name = "_babel_plugin_transform_parameters___plugin_transform_parameters_7.17.12.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.17.12.tgz"; + sha512 = "6qW4rWo1cyCdq1FkYri7AHpauchbGLXpdwnYsfxFb+KtddHENfsY5JZb35xUwkK5opOLcJ3BNd2l7PhRYGlwIA=="; + }; + } { name = "_babel_plugin_transform_property_literals___plugin_transform_property_literals_7.16.7.tgz"; path = fetchurl { @@ -1018,11 +1354,11 @@ }; } { - name = "_babel_plugin_transform_react_constant_elements___plugin_transform_react_constant_elements_7.16.7.tgz"; + name = "_babel_plugin_transform_react_constant_elements___plugin_transform_react_constant_elements_7.17.12.tgz"; path = fetchurl { - name = "_babel_plugin_transform_react_constant_elements___plugin_transform_react_constant_elements_7.16.7.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-react-constant-elements/-/plugin-transform-react-constant-elements-7.16.7.tgz"; - sha512 = "lF+cfsyTgwWkcw715J88JhMYJ5GpysYNLhLP1PkvkhTRN7B3e74R/1KsDxFxhRpSn0UUD3IWM4GvdBR2PEbbQQ=="; + name = "_babel_plugin_transform_react_constant_elements___plugin_transform_react_constant_elements_7.17.12.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-react-constant-elements/-/plugin-transform-react-constant-elements-7.17.12.tgz"; + sha512 = "maEkX2xs2STuv2Px8QuqxqjhV2LsFobT1elCgyU5704fcyTu9DyD/bJXxD/mrRiVyhpHweOQ00OJ5FKhHq9oEw=="; }; } { @@ -1049,6 +1385,14 @@ sha512 = "8D16ye66fxiE8m890w0BpPpngG9o9OVBBy0gH2E+2AR7qMR2ZpTYJEqLxAsoroenMId0p/wMW+Blc0meDgu0Ag=="; }; } + { + name = "_babel_plugin_transform_react_jsx___plugin_transform_react_jsx_7.17.12.tgz"; + path = fetchurl { + name = "_babel_plugin_transform_react_jsx___plugin_transform_react_jsx_7.17.12.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.17.12.tgz"; + sha512 = "Lcaw8bxd1DKht3thfD4A12dqo1X16he1Lm8rIv8sTwjAYNInRS1qHa9aJoqvzpscItXvftKDCfaEQzwoVyXpEQ=="; + }; + } { name = "_babel_plugin_transform_react_pure_annotations___plugin_transform_react_pure_annotations_7.16.7.tgz"; path = fetchurl { @@ -1065,6 +1409,14 @@ sha512 = "mF7jOgGYCkSJagJ6XCujSQg+6xC1M77/03K2oBmVJWoFGNUtnVJO4WHKJk3dnPC8HCcj4xBQP1Egm8DWh3Pb3Q=="; }; } + { + name = "_babel_plugin_transform_regenerator___plugin_transform_regenerator_7.18.0.tgz"; + path = fetchurl { + name = "_babel_plugin_transform_regenerator___plugin_transform_regenerator_7.18.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.18.0.tgz"; + sha512 = "C8YdRw9uzx25HSIzwA7EM7YP0FhCe5wNvJbZzjVNHHPGVcDJ3Aie+qGYYdS1oVQgn+B3eAIJbWFLrJ4Jipv7nw=="; + }; + } { name = "_babel_plugin_transform_reserved_words___plugin_transform_reserved_words_7.16.7.tgz"; path = fetchurl { @@ -1073,6 +1425,14 @@ sha512 = "KQzzDnZ9hWQBjwi5lpY5v9shmm6IVG0U9pB18zvMu2i4H90xpT4gmqwPYsn8rObiadYe2M0gmgsiOIF5A/2rtg=="; }; } + { + name = "_babel_plugin_transform_reserved_words___plugin_transform_reserved_words_7.17.12.tgz"; + path = fetchurl { + name = "_babel_plugin_transform_reserved_words___plugin_transform_reserved_words_7.17.12.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.17.12.tgz"; + sha512 = "1KYqwbJV3Co03NIi14uEHW8P50Md6KqFgt0FfpHdK6oyAHQVTosgPuPSiWud1HX0oYJ1hGRRlk0fP87jFpqXZA=="; + }; + } { name = "_babel_plugin_transform_shorthand_properties___plugin_transform_shorthand_properties_7.16.7.tgz"; path = fetchurl { @@ -1089,6 +1449,14 @@ sha512 = "+pjJpgAngb53L0iaA5gU/1MLXJIfXcYepLgXB3esVRf4fqmj8f2cxM3/FKaHsZms08hFQJkFccEWuIpm429TXg=="; }; } + { + name = "_babel_plugin_transform_spread___plugin_transform_spread_7.17.12.tgz"; + path = fetchurl { + name = "_babel_plugin_transform_spread___plugin_transform_spread_7.17.12.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.17.12.tgz"; + sha512 = "9pgmuQAtFi3lpNUstvG9nGfk9DkrdmWNp9KeKPFmuZCpEnxRzYlS8JgwPjYj+1AWDOSvoGN0H30p1cBOmT/Svg=="; + }; + } { name = "_babel_plugin_transform_sticky_regex___plugin_transform_sticky_regex_7.16.7.tgz"; path = fetchurl { @@ -1105,6 +1473,14 @@ sha512 = "VwbkDDUeenlIjmfNeDX/V0aWrQH2QiVyJtwymVQSzItFDTpxfyJh3EVaQiS0rIN/CqbLGr0VcGmuwyTdZtdIsA=="; }; } + { + name = "_babel_plugin_transform_template_literals___plugin_transform_template_literals_7.18.2.tgz"; + path = fetchurl { + name = "_babel_plugin_transform_template_literals___plugin_transform_template_literals_7.18.2.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.18.2.tgz"; + sha512 = "/cmuBVw9sZBGZVOMkpAEaVLwm4JmK2GZ1dFKOGGpMzEHWFmyZZ59lUU0PdRr8YNYeQdNzTDwuxP2X2gzydTc9g=="; + }; + } { name = "_babel_plugin_transform_typeof_symbol___plugin_transform_typeof_symbol_7.16.7.tgz"; path = fetchurl { @@ -1113,6 +1489,14 @@ sha512 = "p2rOixCKRJzpg9JB4gjnG4gjWkWa89ZoYUnl9snJ1cWIcTH/hvxZqfO+WjG6T8DRBpctEol5jw1O5rA8gkCokQ=="; }; } + { + name = "_babel_plugin_transform_typeof_symbol___plugin_transform_typeof_symbol_7.17.12.tgz"; + path = fetchurl { + name = "_babel_plugin_transform_typeof_symbol___plugin_transform_typeof_symbol_7.17.12.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.17.12.tgz"; + sha512 = "Q8y+Jp7ZdtSPXCThB6zjQ74N3lj0f6TDh1Hnf5B+sYlzQ8i5Pjp8gW0My79iekSpT4WnI06blqP6DT0OmaXXmw=="; + }; + } { name = "_babel_plugin_transform_typescript___plugin_transform_typescript_7.16.1.tgz"; path = fetchurl { @@ -1121,6 +1505,14 @@ sha512 = "NO4XoryBng06jjw/qWEU2LhcLJr1tWkhpMam/H4eas/CDKMX/b2/Ylb6EI256Y7+FVPCawwSM1rrJNOpDiz+Lg=="; }; } + { + name = "_babel_plugin_transform_typescript___plugin_transform_typescript_7.18.4.tgz"; + path = fetchurl { + name = "_babel_plugin_transform_typescript___plugin_transform_typescript_7.18.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.18.4.tgz"; + sha512 = "l4vHuSLUajptpHNEOUDEGsnpl9pfRLsN1XUoDQDD/YBuXTM+v37SHGS+c6n4jdcZy96QtuUuSvZYMLSSsjH8Mw=="; + }; + } { name = "_babel_plugin_transform_unicode_escapes___plugin_transform_unicode_escapes_7.16.7.tgz"; path = fetchurl { @@ -1146,11 +1538,11 @@ }; } { - name = "_babel_preset_env___preset_env_7.16.11.tgz"; + name = "_babel_preset_env___preset_env_7.18.2.tgz"; path = fetchurl { - name = "_babel_preset_env___preset_env_7.16.11.tgz"; - url = "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.16.11.tgz"; - sha512 = "qcmWG8R7ZW6WBRPZK//y+E3Cli151B20W1Rv7ln27vuPaXU/8TKms6jFdiJtF7UDTxcrb7mZd88tAeK9LjdT8g=="; + name = "_babel_preset_env___preset_env_7.18.2.tgz"; + url = "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.18.2.tgz"; + sha512 = "PfpdxotV6afmXMU47S08F9ZKIm2bJIQ0YbAAtDfIENX7G1NUAXigLREh69CWDjtgUy7dYn7bsMzkgdtAlmS68Q=="; }; } { @@ -1170,11 +1562,19 @@ }; } { - name = "_babel_preset_react___preset_react_7.16.7.tgz"; + name = "_babel_preset_react___preset_react_7.17.12.tgz"; path = fetchurl { - name = "_babel_preset_react___preset_react_7.16.7.tgz"; - url = "https://registry.yarnpkg.com/@babel/preset-react/-/preset-react-7.16.7.tgz"; - sha512 = "fWpyI8UM/HE6DfPBzD8LnhQ/OcH8AgTaqcqP2nGOXEUV+VKBR5JRN9hCk9ai+zQQ57vtm9oWeXguBCPNUjytgA=="; + name = "_babel_preset_react___preset_react_7.17.12.tgz"; + url = "https://registry.yarnpkg.com/@babel/preset-react/-/preset-react-7.17.12.tgz"; + sha512 = "h5U+rwreXtZaRBEQhW1hOJLMq8XNJBQ/9oymXiCXTuT/0uOwpbT0gUt+sXeOqoXBgNuUKI7TaObVwoEyWkpFgA=="; + }; + } + { + name = "_babel_preset_typescript___preset_typescript_7.17.12.tgz"; + path = fetchurl { + name = "_babel_preset_typescript___preset_typescript_7.17.12.tgz"; + url = "https://registry.yarnpkg.com/@babel/preset-typescript/-/preset-typescript-7.17.12.tgz"; + sha512 = "S1ViF8W2QwAKUGJXxP9NAfNaqGDdEBJKpYkxHf5Yy2C4NPPzXGeR3Lhk7G8xJaaLcFTRfNjVbtbVtm8Gb0mqvg=="; }; } { @@ -1258,11 +1658,11 @@ }; } { - name = "_babel_types___types_7.17.0.tgz"; + name = "_babel_traverse___traverse_7.18.2.tgz"; path = fetchurl { - name = "_babel_types___types_7.17.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/types/-/types-7.17.0.tgz"; - sha512 = "TmKSNO4D5rzhL5bjWFcVHHLETzfQ/AmbKpKPOSjlP0WoHZ6L911fgoOKY4Alp/emzG4cHJdyN49zpgkbXFEHHw=="; + name = "_babel_traverse___traverse_7.18.2.tgz"; + url = "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.18.2.tgz"; + sha512 = "9eNwoeovJ6KH9zcCNnENY7DMFwTU9JdGCFtqNLfUAqtUHRCOsTOqWoffosP8vKmNYeSBUv3yVJXjfd8ucwOjUA=="; }; } { @@ -1273,6 +1673,22 @@ sha512 = "0f1HJFuGmmbrKTCZtbm3cU+b/AqdEYk5toj5iQur58xkVMlS0JWaKxTBSmCXd47uiN7vbcozAupm6Mvs80GNhw=="; }; } + { + name = "_babel_types___types_7.17.0.tgz"; + path = fetchurl { + name = "_babel_types___types_7.17.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/types/-/types-7.17.0.tgz"; + sha512 = "TmKSNO4D5rzhL5bjWFcVHHLETzfQ/AmbKpKPOSjlP0WoHZ6L911fgoOKY4Alp/emzG4cHJdyN49zpgkbXFEHHw=="; + }; + } + { + name = "_babel_types___types_7.18.4.tgz"; + path = fetchurl { + name = "_babel_types___types_7.18.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/types/-/types-7.18.4.tgz"; + sha512 = "ThN1mBcMq5pG/Vm2IcBmPPfyPXbd8S02rS+OBIDENdufvqC7Z/jHPCv9IcP01277aKtDI8g/2XysBN4hA8niiw=="; + }; + } { name = "_colors_colors___colors_1.5.0.tgz"; path = fetchurl { @@ -1321,14 +1737,6 @@ sha512 = "mAZ5QRpLriBtaj/k2qyrXwck6yeoz1V5lMt/jfj6igWU35yYlNKs2LziXVgvH81gnJZ+9QQNGelSsnuoAy6uIw=="; }; } - { - name = "_emotion_cache___cache_11.7.1.tgz"; - path = fetchurl { - name = "_emotion_cache___cache_11.7.1.tgz"; - url = "https://registry.yarnpkg.com/@emotion/cache/-/cache-11.7.1.tgz"; - sha512 = "r65Zy4Iljb8oyjtLeCuBH8Qjiy107dOYC6SJq7g7GV5UCQWMObY4SJDPGFjiiVpPrOJ2hmJOoBiYTC7hwx9E2A=="; - }; - } { name = "_emotion_core___core_10.1.1.tgz"; path = fetchurl { @@ -1361,14 +1769,6 @@ sha512 = "u5WtneEAr5IDG2Wv65yhunPSMLIpuKsbuOktRojfrEiEvRyC85LgPMZI63cr7NUqT8ZIGdSVg8ZKGxIug4lXcA=="; }; } - { - name = "_emotion_is_prop_valid___is_prop_valid_1.1.2.tgz"; - path = fetchurl { - name = "_emotion_is_prop_valid___is_prop_valid_1.1.2.tgz"; - url = "https://registry.yarnpkg.com/@emotion/is-prop-valid/-/is-prop-valid-1.1.2.tgz"; - sha512 = "3QnhqeL+WW88YjYbQL5gUIkthuMw7a0NGbZ7wfFVk2kg/CK5w8w5FFa0RzWjyY1+sujN0NWbtSHH6OJmWHtJpQ=="; - }; - } { name = "_emotion_memoize___memoize_0.7.4.tgz"; path = fetchurl { @@ -1425,14 +1825,6 @@ sha512 = "YoX5GyQ4db7LpbmXHMuc8kebtBGP6nZfRC5Z13OKJMixBEwdZrJ914D6yJv/P+ZH/YY3F5s89NYX2hlZAf3SRQ=="; }; } - { - name = "_emotion_sheet___sheet_1.1.0.tgz"; - path = fetchurl { - name = "_emotion_sheet___sheet_1.1.0.tgz"; - url = "https://registry.yarnpkg.com/@emotion/sheet/-/sheet-1.1.0.tgz"; - sha512 = "u0AX4aSo25sMAygCuQTzS+HsImZFuS8llY8O7b9MDRzbJM0kVJlAz6KNDqcG7pOuQZJmj/8X/rAW+66kMnMW+g=="; - }; - } { name = "_emotion_styled_base___styled_base_10.0.31.tgz"; path = fetchurl { @@ -1537,6 +1929,22 @@ sha512 = "ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA=="; }; } + { + name = "_jridgewell_gen_mapping___gen_mapping_0.1.1.tgz"; + path = fetchurl { + name = "_jridgewell_gen_mapping___gen_mapping_0.1.1.tgz"; + url = "https://registry.yarnpkg.com/@jridgewell/gen-mapping/-/gen-mapping-0.1.1.tgz"; + sha512 = "sQXCasFk+U8lWYEe66WxRDOE9PjVz4vSM51fTu3Hw+ClTpUSQb718772vH3pyS5pShp6lvQM7SxgIDXXXmOX7w=="; + }; + } + { + name = "_jridgewell_gen_mapping___gen_mapping_0.3.1.tgz"; + path = fetchurl { + name = "_jridgewell_gen_mapping___gen_mapping_0.3.1.tgz"; + url = "https://registry.yarnpkg.com/@jridgewell/gen-mapping/-/gen-mapping-0.3.1.tgz"; + sha512 = "GcHwniMlA2z+WFPWuY8lp3fsza0I8xPFMWL5+n8LYyP6PSvPrXf4+n8stDHZY2DM0zy9sVkRDy1jDI4XGzYVqg=="; + }; + } { name = "_jridgewell_resolve_uri___resolve_uri_3.0.4.tgz"; path = fetchurl { @@ -1546,11 +1954,27 @@ }; } { - name = "_jridgewell_trace_mapping___trace_mapping_0.2.5.tgz"; + name = "_jridgewell_set_array___set_array_1.1.1.tgz"; path = fetchurl { - name = "_jridgewell_trace_mapping___trace_mapping_0.2.5.tgz"; - url = "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.2.5.tgz"; - sha512 = "K+Eths78fXDFOvQ2hgJhCiI5s+g81r2yXmACBpbn+f2+Qt94PNoTgUcAXPT8DZkhXCsZRsHVWVtY5KIBMcpDqQ=="; + name = "_jridgewell_set_array___set_array_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/@jridgewell/set-array/-/set-array-1.1.1.tgz"; + sha512 = "Ct5MqZkLGEXTVmQYbGtx9SVqD2fqwvdubdps5D3djjAkgkKwT918VNOz65pEHFaYTeWcukmJmH5SwsA9Tn2ObQ=="; + }; + } + { + name = "_jridgewell_sourcemap_codec___sourcemap_codec_1.4.13.tgz"; + path = fetchurl { + name = "_jridgewell_sourcemap_codec___sourcemap_codec_1.4.13.tgz"; + url = "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.13.tgz"; + sha512 = "GryiOJmNcWbovBxTfZSF71V/mXbgcV3MewDe3kIMCLyIh5e7SKAeUZs+rMnJ8jkMolZ/4/VsdBmMrw3l+VdZ3w=="; + }; + } + { + name = "_jridgewell_trace_mapping___trace_mapping_0.3.13.tgz"; + path = fetchurl { + name = "_jridgewell_trace_mapping___trace_mapping_0.3.13.tgz"; + url = "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.13.tgz"; + sha512 = "o1xbKhp9qnIAoHJSWd6KlCZfqslL4valSF81H8ImioOAxluWYWOpWkpyktY2vnt4tbrX9XYaxovq6cgowaJp2w=="; }; } { @@ -1617,70 +2041,6 @@ sha512 = "Uul8w38u+PICe2Fg2pDKCaIG7kOyhowZ9vjiC1FsVwPABTW8vPPKfF6OvxRq3IiBaI1faOJmgdvMG7rMJARBhA=="; }; } - { - name = "_mui_base___base_5.0.0_alpha.74.tgz"; - path = fetchurl { - name = "_mui_base___base_5.0.0_alpha.74.tgz"; - url = "https://registry.yarnpkg.com/@mui/base/-/base-5.0.0-alpha.74.tgz"; - sha512 = "pw3T1xNXpW8pLo9+BvtyazZb0CSjNJsjbzznlbV/aNkBfjNPXQVI3X1NDm3WSI8y6M96WDIVO7XrHAohOwALSQ=="; - }; - } - { - name = "_mui_icons_material___icons_material_5.5.1.tgz"; - path = fetchurl { - name = "_mui_icons_material___icons_material_5.5.1.tgz"; - url = "https://registry.yarnpkg.com/@mui/icons-material/-/icons-material-5.5.1.tgz"; - sha512 = "40f68p5+Yhq3dCn3QYHqQt5RETPyR3AkDw+fma8PtcjqvZ+d+jF84kFmT6NqwA3he7TlwluEtkyAmPzUE4uPdA=="; - }; - } - { - name = "_mui_material___material_5.5.3.tgz"; - path = fetchurl { - name = "_mui_material___material_5.5.3.tgz"; - url = "https://registry.yarnpkg.com/@mui/material/-/material-5.5.3.tgz"; - sha512 = "eADa3kUYbbr1jNjcufn0a7HeU8cSo0agbrkj720hodxVFNIfzq7a2e58Z+PaZqll55kMGBvlYJ7rTcXU399x5A=="; - }; - } - { - name = "_mui_private_theming___private_theming_5.5.3.tgz"; - path = fetchurl { - name = "_mui_private_theming___private_theming_5.5.3.tgz"; - url = "https://registry.yarnpkg.com/@mui/private-theming/-/private-theming-5.5.3.tgz"; - sha512 = "Wf7NurY7lk8SBWelSBY2U02zxLt1773JpIcXTHuEC9/GZdQA4CXCJGl2cVQzheKhee5rZ+8JwGulrRiVl1m+4A=="; - }; - } - { - name = "_mui_styled_engine___styled_engine_5.5.2.tgz"; - path = fetchurl { - name = "_mui_styled_engine___styled_engine_5.5.2.tgz"; - url = "https://registry.yarnpkg.com/@mui/styled-engine/-/styled-engine-5.5.2.tgz"; - sha512 = "jkz5AHHbA43akBo5L3y1X1/X0f+RvXvCp3eXKt+iOf3qnKSAausbtlVz7gBbC4xIWDnP1Jb/6T+t/0/7gObRYA=="; - }; - } - { - name = "_mui_system___system_5.5.3.tgz"; - path = fetchurl { - name = "_mui_system___system_5.5.3.tgz"; - url = "https://registry.yarnpkg.com/@mui/system/-/system-5.5.3.tgz"; - sha512 = "J9JcySJuEqfEoP334K/2gEWm2vOx73Uqjii3qlFVhWRBOAJ0Pjyk0sN5W/eVRbwhUm95DNgh2V5s8dRK3vzyVw=="; - }; - } - { - name = "_mui_types___types_7.1.3.tgz"; - path = fetchurl { - name = "_mui_types___types_7.1.3.tgz"; - url = "https://registry.yarnpkg.com/@mui/types/-/types-7.1.3.tgz"; - sha512 = "DDF0UhMBo4Uezlk+6QxrlDbchF79XG6Zs0zIewlR4c0Dt6GKVFfUtzPtHCH1tTbcSlq/L2bGEdiaoHBJ9Y1gSA=="; - }; - } - { - name = "_mui_utils___utils_5.5.3.tgz"; - path = fetchurl { - name = "_mui_utils___utils_5.5.3.tgz"; - url = "https://registry.yarnpkg.com/@mui/utils/-/utils-5.5.3.tgz"; - sha512 = "t627eVRpl3SlxVya0cIVNs8jPl4KCEiGaTSWY9iKKTcMNaeDbuRML+zv/CFHDPr1zFv+FjJSP02ySB+tZ8xIag=="; - }; - } { name = "_nodelib_fs.scandir___fs.scandir_2.1.5.tgz"; path = fetchurl { @@ -1729,14 +2089,6 @@ sha512 = "a5Sab1C4/icpTZVzZc5Ghpz88yQtGOyNqYXcZgOssB2uuAr+wF/MvN6bgtW32q7HHrvBki+BsZ0OuNv6EV3K9g=="; }; } - { - name = "_popperjs_core___core_2.11.4.tgz"; - path = fetchurl { - name = "_popperjs_core___core_2.11.4.tgz"; - url = "https://registry.yarnpkg.com/@popperjs/core/-/core-2.11.4.tgz"; - sha512 = "q/ytXxO5NKvyT37pmisQAItCFqA7FD/vNb8dgaJy3/630Fsc+Mz9/9f2SziBoIZ30TJooXyTwZmhi1zjXmObYg=="; - }; - } { name = "_popperjs_core___core_2.10.2.tgz"; path = fetchurl { @@ -1842,115 +2194,115 @@ }; } { - name = "_svgr_babel_plugin_add_jsx_attribute___babel_plugin_add_jsx_attribute_5.4.0.tgz"; + name = "_svgr_babel_plugin_add_jsx_attribute___babel_plugin_add_jsx_attribute_6.0.0.tgz"; path = fetchurl { - name = "_svgr_babel_plugin_add_jsx_attribute___babel_plugin_add_jsx_attribute_5.4.0.tgz"; - url = "https://registry.yarnpkg.com/@svgr/babel-plugin-add-jsx-attribute/-/babel-plugin-add-jsx-attribute-5.4.0.tgz"; - sha512 = "ZFf2gs/8/6B8PnSofI0inYXr2SDNTDScPXhN7k5EqD4aZ3gi6u+rbmZHVB8IM3wDyx8ntKACZbtXSm7oZGRqVg=="; + name = "_svgr_babel_plugin_add_jsx_attribute___babel_plugin_add_jsx_attribute_6.0.0.tgz"; + url = "https://registry.yarnpkg.com/@svgr/babel-plugin-add-jsx-attribute/-/babel-plugin-add-jsx-attribute-6.0.0.tgz"; + sha512 = "MdPdhdWLtQsjd29Wa4pABdhWbaRMACdM1h31BY+c6FghTZqNGT7pEYdBoaGeKtdTOBC/XNFQaKVj+r/Ei2ryWA=="; }; } { - name = "_svgr_babel_plugin_remove_jsx_attribute___babel_plugin_remove_jsx_attribute_5.4.0.tgz"; + name = "_svgr_babel_plugin_remove_jsx_attribute___babel_plugin_remove_jsx_attribute_6.0.0.tgz"; path = fetchurl { - name = "_svgr_babel_plugin_remove_jsx_attribute___babel_plugin_remove_jsx_attribute_5.4.0.tgz"; - url = "https://registry.yarnpkg.com/@svgr/babel-plugin-remove-jsx-attribute/-/babel-plugin-remove-jsx-attribute-5.4.0.tgz"; - sha512 = "yaS4o2PgUtwLFGTKbsiAy6D0o3ugcUhWK0Z45umJ66EPWunAz9fuFw2gJuje6wqQvQWOTJvIahUwndOXb7QCPg=="; + name = "_svgr_babel_plugin_remove_jsx_attribute___babel_plugin_remove_jsx_attribute_6.0.0.tgz"; + url = "https://registry.yarnpkg.com/@svgr/babel-plugin-remove-jsx-attribute/-/babel-plugin-remove-jsx-attribute-6.0.0.tgz"; + sha512 = "aVdtfx9jlaaxc3unA6l+M9YRnKIZjOhQPthLKqmTXC8UVkBLDRGwPKo+r8n3VZN8B34+yVajzPTZ+ptTSuZZCw=="; }; } { - name = "_svgr_babel_plugin_remove_jsx_empty_expression___babel_plugin_remove_jsx_empty_expression_5.0.1.tgz"; + name = "_svgr_babel_plugin_remove_jsx_empty_expression___babel_plugin_remove_jsx_empty_expression_6.0.0.tgz"; path = fetchurl { - name = "_svgr_babel_plugin_remove_jsx_empty_expression___babel_plugin_remove_jsx_empty_expression_5.0.1.tgz"; - url = "https://registry.yarnpkg.com/@svgr/babel-plugin-remove-jsx-empty-expression/-/babel-plugin-remove-jsx-empty-expression-5.0.1.tgz"; - sha512 = "LA72+88A11ND/yFIMzyuLRSMJ+tRKeYKeQ+mR3DcAZ5I4h5CPWN9AHyUzJbWSYp/u2u0xhmgOe0+E41+GjEueA=="; + name = "_svgr_babel_plugin_remove_jsx_empty_expression___babel_plugin_remove_jsx_empty_expression_6.0.0.tgz"; + url = "https://registry.yarnpkg.com/@svgr/babel-plugin-remove-jsx-empty-expression/-/babel-plugin-remove-jsx-empty-expression-6.0.0.tgz"; + sha512 = "Ccj42ApsePD451AZJJf1QzTD1B/BOU392URJTeXFxSK709i0KUsGtbwyiqsKu7vsYxpTM0IA5clAKDyf9RCZyA=="; }; } { - name = "_svgr_babel_plugin_replace_jsx_attribute_value___babel_plugin_replace_jsx_attribute_value_5.0.1.tgz"; + name = "_svgr_babel_plugin_replace_jsx_attribute_value___babel_plugin_replace_jsx_attribute_value_6.0.0.tgz"; path = fetchurl { - name = "_svgr_babel_plugin_replace_jsx_attribute_value___babel_plugin_replace_jsx_attribute_value_5.0.1.tgz"; - url = "https://registry.yarnpkg.com/@svgr/babel-plugin-replace-jsx-attribute-value/-/babel-plugin-replace-jsx-attribute-value-5.0.1.tgz"; - sha512 = "PoiE6ZD2Eiy5mK+fjHqwGOS+IXX0wq/YDtNyIgOrc6ejFnxN4b13pRpiIPbtPwHEc+NT2KCjteAcq33/F1Y9KQ=="; + name = "_svgr_babel_plugin_replace_jsx_attribute_value___babel_plugin_replace_jsx_attribute_value_6.0.0.tgz"; + url = "https://registry.yarnpkg.com/@svgr/babel-plugin-replace-jsx-attribute-value/-/babel-plugin-replace-jsx-attribute-value-6.0.0.tgz"; + sha512 = "88V26WGyt1Sfd1emBYmBJRWMmgarrExpKNVmI9vVozha4kqs6FzQJ/Kp5+EYli1apgX44518/0+t9+NU36lThQ=="; }; } { - name = "_svgr_babel_plugin_svg_dynamic_title___babel_plugin_svg_dynamic_title_5.4.0.tgz"; + name = "_svgr_babel_plugin_svg_dynamic_title___babel_plugin_svg_dynamic_title_6.0.0.tgz"; path = fetchurl { - name = "_svgr_babel_plugin_svg_dynamic_title___babel_plugin_svg_dynamic_title_5.4.0.tgz"; - url = "https://registry.yarnpkg.com/@svgr/babel-plugin-svg-dynamic-title/-/babel-plugin-svg-dynamic-title-5.4.0.tgz"; - sha512 = "zSOZH8PdZOpuG1ZVx/cLVePB2ibo3WPpqo7gFIjLV9a0QsuQAzJiwwqmuEdTaW2pegyBE17Uu15mOgOcgabQZg=="; + name = "_svgr_babel_plugin_svg_dynamic_title___babel_plugin_svg_dynamic_title_6.0.0.tgz"; + url = "https://registry.yarnpkg.com/@svgr/babel-plugin-svg-dynamic-title/-/babel-plugin-svg-dynamic-title-6.0.0.tgz"; + sha512 = "F7YXNLfGze+xv0KMQxrl2vkNbI9kzT9oDK55/kUuymh1ACyXkMV+VZWX1zEhSTfEKh7VkHVZGmVtHg8eTZ6PRg=="; }; } { - name = "_svgr_babel_plugin_svg_em_dimensions___babel_plugin_svg_em_dimensions_5.4.0.tgz"; + name = "_svgr_babel_plugin_svg_em_dimensions___babel_plugin_svg_em_dimensions_6.0.0.tgz"; path = fetchurl { - name = "_svgr_babel_plugin_svg_em_dimensions___babel_plugin_svg_em_dimensions_5.4.0.tgz"; - url = "https://registry.yarnpkg.com/@svgr/babel-plugin-svg-em-dimensions/-/babel-plugin-svg-em-dimensions-5.4.0.tgz"; - sha512 = "cPzDbDA5oT/sPXDCUYoVXEmm3VIoAWAPT6mSPTJNbQaBNUuEKVKyGH93oDY4e42PYHRW67N5alJx/eEol20abw=="; + name = "_svgr_babel_plugin_svg_em_dimensions___babel_plugin_svg_em_dimensions_6.0.0.tgz"; + url = "https://registry.yarnpkg.com/@svgr/babel-plugin-svg-em-dimensions/-/babel-plugin-svg-em-dimensions-6.0.0.tgz"; + sha512 = "+rghFXxdIqJNLQK08kwPBD3Z22/0b2tEZ9lKiL/yTfuyj1wW8HUXu4bo/XkogATIYuXSghVQOOCwURXzHGKyZA=="; }; } { - name = "_svgr_babel_plugin_transform_react_native_svg___babel_plugin_transform_react_native_svg_5.4.0.tgz"; + name = "_svgr_babel_plugin_transform_react_native_svg___babel_plugin_transform_react_native_svg_6.0.0.tgz"; path = fetchurl { - name = "_svgr_babel_plugin_transform_react_native_svg___babel_plugin_transform_react_native_svg_5.4.0.tgz"; - url = "https://registry.yarnpkg.com/@svgr/babel-plugin-transform-react-native-svg/-/babel-plugin-transform-react-native-svg-5.4.0.tgz"; - sha512 = "3eYP/SaopZ41GHwXma7Rmxcv9uRslRDTY1estspeB1w1ueZWd/tPlMfEOoccYpEMZU3jD4OU7YitnXcF5hLW2Q=="; + name = "_svgr_babel_plugin_transform_react_native_svg___babel_plugin_transform_react_native_svg_6.0.0.tgz"; + url = "https://registry.yarnpkg.com/@svgr/babel-plugin-transform-react-native-svg/-/babel-plugin-transform-react-native-svg-6.0.0.tgz"; + sha512 = "VaphyHZ+xIKv5v0K0HCzyfAaLhPGJXSk2HkpYfXIOKb7DjLBv0soHDxNv6X0vr2titsxE7klb++u7iOf7TSrFQ=="; }; } { - name = "_svgr_babel_plugin_transform_svg_component___babel_plugin_transform_svg_component_5.5.0.tgz"; + name = "_svgr_babel_plugin_transform_svg_component___babel_plugin_transform_svg_component_6.2.0.tgz"; path = fetchurl { - name = "_svgr_babel_plugin_transform_svg_component___babel_plugin_transform_svg_component_5.5.0.tgz"; - url = "https://registry.yarnpkg.com/@svgr/babel-plugin-transform-svg-component/-/babel-plugin-transform-svg-component-5.5.0.tgz"; - sha512 = "q4jSH1UUvbrsOtlo/tKcgSeiCHRSBdXoIoqX1pgcKK/aU3JD27wmMKwGtpB8qRYUYoyXvfGxUVKchLuR5pB3rQ=="; + name = "_svgr_babel_plugin_transform_svg_component___babel_plugin_transform_svg_component_6.2.0.tgz"; + url = "https://registry.yarnpkg.com/@svgr/babel-plugin-transform-svg-component/-/babel-plugin-transform-svg-component-6.2.0.tgz"; + sha512 = "bhYIpsORb++wpsp91fymbFkf09Z/YEKR0DnFjxvN+8JHeCUD2unnh18jIMKnDJTWtvpTaGYPXELVe4OOzFI0xg=="; }; } { - name = "_svgr_babel_preset___babel_preset_5.5.0.tgz"; + name = "_svgr_babel_preset___babel_preset_6.2.0.tgz"; path = fetchurl { - name = "_svgr_babel_preset___babel_preset_5.5.0.tgz"; - url = "https://registry.yarnpkg.com/@svgr/babel-preset/-/babel-preset-5.5.0.tgz"; - sha512 = "4FiXBjvQ+z2j7yASeGPEi8VD/5rrGQk4Xrq3EdJmoZgz/tpqChpo5hgXDvmEauwtvOc52q8ghhZK4Oy7qph4ig=="; + name = "_svgr_babel_preset___babel_preset_6.2.0.tgz"; + url = "https://registry.yarnpkg.com/@svgr/babel-preset/-/babel-preset-6.2.0.tgz"; + sha512 = "4WQNY0J71JIaL03DRn0vLiz87JXx0b9dYm2aA8XHlQJQoixMl4r/soYHm8dsaJZ3jWtkCiOYy48dp9izvXhDkQ=="; }; } { - name = "_svgr_core___core_5.5.0.tgz"; + name = "_svgr_core___core_6.2.1.tgz"; path = fetchurl { - name = "_svgr_core___core_5.5.0.tgz"; - url = "https://registry.yarnpkg.com/@svgr/core/-/core-5.5.0.tgz"; - sha512 = "q52VOcsJPvV3jO1wkPtzTuKlvX7Y3xIcWRpCMtBF3MrteZJtBfQw/+u0B1BHy5ColpQc1/YVTrPEtSYIMNZlrQ=="; + name = "_svgr_core___core_6.2.1.tgz"; + url = "https://registry.yarnpkg.com/@svgr/core/-/core-6.2.1.tgz"; + sha512 = "NWufjGI2WUyrg46mKuySfviEJ6IxHUOm/8a3Ph38VCWSp+83HBraCQrpEM3F3dB6LBs5x8OElS8h3C0oOJaJAA=="; }; } { - name = "_svgr_hast_util_to_babel_ast___hast_util_to_babel_ast_5.5.0.tgz"; + name = "_svgr_hast_util_to_babel_ast___hast_util_to_babel_ast_6.2.1.tgz"; path = fetchurl { - name = "_svgr_hast_util_to_babel_ast___hast_util_to_babel_ast_5.5.0.tgz"; - url = "https://registry.yarnpkg.com/@svgr/hast-util-to-babel-ast/-/hast-util-to-babel-ast-5.5.0.tgz"; - sha512 = "cAaR/CAiZRB8GP32N+1jocovUtvlj0+e65TB50/6Lcime+EA49m/8l+P2ko+XPJ4dw3xaPS3jOL4F2X4KWxoeQ=="; + name = "_svgr_hast_util_to_babel_ast___hast_util_to_babel_ast_6.2.1.tgz"; + url = "https://registry.yarnpkg.com/@svgr/hast-util-to-babel-ast/-/hast-util-to-babel-ast-6.2.1.tgz"; + sha512 = "pt7MMkQFDlWJVy9ULJ1h+hZBDGFfSCwlBNW1HkLnVi7jUhyEXUaGYWi1x6bM2IXuAR9l265khBT4Av4lPmaNLQ=="; }; } { - name = "_svgr_plugin_jsx___plugin_jsx_5.5.0.tgz"; + name = "_svgr_plugin_jsx___plugin_jsx_6.2.1.tgz"; path = fetchurl { - name = "_svgr_plugin_jsx___plugin_jsx_5.5.0.tgz"; - url = "https://registry.yarnpkg.com/@svgr/plugin-jsx/-/plugin-jsx-5.5.0.tgz"; - sha512 = "V/wVh33j12hGh05IDg8GpIUXbjAPnTdPTKuP4VNLggnwaHMPNQNae2pRnyTAILWCQdz5GyMqtO488g7CKM8CBA=="; + name = "_svgr_plugin_jsx___plugin_jsx_6.2.1.tgz"; + url = "https://registry.yarnpkg.com/@svgr/plugin-jsx/-/plugin-jsx-6.2.1.tgz"; + sha512 = "u+MpjTsLaKo6r3pHeeSVsh9hmGRag2L7VzApWIaS8imNguqoUwDq/u6U/NDmYs/KAsrmtBjOEaAAPbwNGXXp1g=="; }; } { - name = "_svgr_plugin_svgo___plugin_svgo_5.5.0.tgz"; + name = "_svgr_plugin_svgo___plugin_svgo_6.2.0.tgz"; path = fetchurl { - name = "_svgr_plugin_svgo___plugin_svgo_5.5.0.tgz"; - url = "https://registry.yarnpkg.com/@svgr/plugin-svgo/-/plugin-svgo-5.5.0.tgz"; - sha512 = "r5swKk46GuQl4RrVejVwpeeJaydoxkdwkM1mBKOgJLBUJPGaLci6ylg/IjhrRsREKDkr4kbMWdgOtbXEh0fyLQ=="; + name = "_svgr_plugin_svgo___plugin_svgo_6.2.0.tgz"; + url = "https://registry.yarnpkg.com/@svgr/plugin-svgo/-/plugin-svgo-6.2.0.tgz"; + sha512 = "oDdMQONKOJEbuKwuy4Np6VdV6qoaLLvoY86hjvQEgU82Vx1MSWRyYms6Sl0f+NtqxLI/rDVufATbP/ev996k3Q=="; }; } { - name = "_svgr_webpack___webpack_5.5.0.tgz"; + name = "_svgr_webpack___webpack_6.2.1.tgz"; path = fetchurl { - name = "_svgr_webpack___webpack_5.5.0.tgz"; - url = "https://registry.yarnpkg.com/@svgr/webpack/-/webpack-5.5.0.tgz"; - sha512 = "DOBOK255wfQxguUta2INKkzPj6AIS6iafZYiYmHn6W3pHlycSRRlvWKCfLDG10fXfLWqE3DJHgRUOyJYmARa7g=="; + name = "_svgr_webpack___webpack_6.2.1.tgz"; + url = "https://registry.yarnpkg.com/@svgr/webpack/-/webpack-6.2.1.tgz"; + sha512 = "h09ngMNd13hnePwgXa+Y5CgOjzlCvfWLHg+MBnydEedAnuLRzUHUJmGS3o2OsrhxTOOqEsPOFt5v/f6C5Qulcw=="; }; } { @@ -2105,14 +2457,6 @@ sha512 = "rZ5drC/jWjrArrS8BR6SIr4cWpW09RNTYt9AMZo3Jwwif+iacXAqgVjm0B0Bv/S1jhDXKHqRVNCbACkJ89RAnQ=="; }; } - { - name = "_types_q___q_1.5.5.tgz"; - path = fetchurl { - name = "_types_q___q_1.5.5.tgz"; - url = "https://registry.yarnpkg.com/@types/q/-/q-1.5.5.tgz"; - sha512 = "L28j2FcJfSZOnL1WBjDYp2vUHCeIFlyYI/53EwD/rKUBQ7MtUUfbQWiyKJGpcnv4/WgrhWsFKrcPstcAt/J0tQ=="; - }; - } { name = "_types_react_dom___react_dom_16.9.14.tgz"; path = fetchurl { @@ -2121,14 +2465,6 @@ sha512 = "FIX2AVmPTGP30OUJ+0vadeIFJJ07Mh1m+U0rxfgyW34p3rTlXI+nlenvAxNn4BP36YyI9IJ/+UJ7Wu22N1pI7A=="; }; } - { - name = "_types_react_is___react_is_17.0.3.tgz"; - path = fetchurl { - name = "_types_react_is___react_is_17.0.3.tgz"; - url = "https://registry.yarnpkg.com/@types/react-is/-/react-is-17.0.3.tgz"; - sha512 = "aBTIWg1emtu95bLTLx0cpkxwGW3ueZv71nE2YFBpL8k/z5czEW8yYpOo8Dp+UUAFAtKwNaOsh/ioSeQnWlZcfw=="; - }; - } { name = "_types_react_transition_group___react_transition_group_4.4.1.tgz"; path = fetchurl { @@ -2137,14 +2473,6 @@ sha512 = "vIo69qKKcYoJ8wKCJjwSgCTM+z3chw3g18dkrDfVX665tMH7tmbDxEAnPdey4gTlwZz5QuHGzd+hul0OVZDqqQ=="; }; } - { - name = "_types_react_transition_group___react_transition_group_4.4.4.tgz"; - path = fetchurl { - name = "_types_react_transition_group___react_transition_group_4.4.4.tgz"; - url = "https://registry.yarnpkg.com/@types/react-transition-group/-/react-transition-group-4.4.4.tgz"; - sha512 = "7gAPz7anVK5xzbeQW9wFBDg7G++aPLAFY0QaSMOou9rJZpbuI58WAuJrgu+qR92l61grlnCUe7AFX8KGahAgug=="; - }; - } { name = "_types_react___react_16.14.10.tgz"; path = fetchurl { @@ -2625,22 +2953,6 @@ 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 { @@ -3137,46 +3449,6 @@ 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 { @@ -3193,14 +3465,6 @@ 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 { @@ -3394,35 +3658,11 @@ }; } { - name = "buffer_alloc_unsafe___buffer_alloc_unsafe_1.1.0.tgz"; + name = "browserslist___browserslist_4.20.3.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 = "browserslist___browserslist_4.20.3.tgz"; + url = "https://registry.yarnpkg.com/browserslist/-/browserslist-4.20.3.tgz"; + sha512 = "NBhymBQl1zM0Y5dQT/O+xiLP9/rzOIQdKM/eMJBAq7yBgaB6krIYLGejrwVYnSHZdqjscB1SPuAjHwxjvN6Wdg=="; }; } { @@ -3441,14 +3681,6 @@ 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 { @@ -3497,14 +3729,6 @@ 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 { @@ -3578,11 +3802,11 @@ }; } { - name = "caw___caw_2.0.1.tgz"; + name = "caniuse_lite___caniuse_lite_1.0.30001346.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 = "caniuse_lite___caniuse_lite_1.0.30001346.tgz"; + url = "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001346.tgz"; + sha512 = "q6ibZUO2t88QCIPayP/euuDREq+aMAxFE5S70PkrLh0iTDj/zEhgvJRKC2+CvXY6EWc6oQwUR48lL5vCW6jiXQ=="; }; } { @@ -3610,27 +3834,19 @@ }; } { - name = "chart.js___chart.js_2.9.4.tgz"; + name = "chart.js___chart.js_3.8.0.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 = "chart.js___chart.js_3.8.0.tgz"; + url = "https://registry.yarnpkg.com/chart.js/-/chart.js-3.8.0.tgz"; + sha512 = "cr8xhrXjLIXVLOBZPkBZVF6NDeiVIrPLHcMhnON7UufudL+CNeRrD+wpYanswlm8NpudMdrt3CHoLMQMxJhHRg=="; }; } { - name = "chartjs_color_string___chartjs_color_string_0.6.0.tgz"; + name = "chartjs_plugin_zoom___chartjs_plugin_zoom_1.2.1.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 = "chartjs_plugin_zoom___chartjs_plugin_zoom_1.2.1.tgz"; + url = "https://registry.yarnpkg.com/chartjs-plugin-zoom/-/chartjs-plugin-zoom-1.2.1.tgz"; + sha512 = "2zbWvw2pljrtMLMXkKw1uxYzAne5PtjJiOZftcut4Lo3Ee8qUt95RpMKDWrZ+pBZxZKQKOD/etdU4pN2jxZUmg=="; }; } { @@ -3729,14 +3945,6 @@ 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 { @@ -3761,14 +3969,6 @@ 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 { @@ -3865,6 +4065,14 @@ sha512 = "QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw=="; }; } + { + name = "commander___commander_8.3.0.tgz"; + path = fetchurl { + name = "commander___commander_8.3.0.tgz"; + url = "https://registry.yarnpkg.com/commander/-/commander-8.3.0.tgz"; + sha512 = "OkTL9umf+He2DZkUq8f8J9of7yL6RJKI24dVITBmNfZBmri9zYZQrKkuXiKhyfPSu8tUhnVBB1iKXevvnlR4Ww=="; + }; + } { name = "commondir___commondir_1.0.1.tgz"; path = fetchurl { @@ -3897,14 +4105,6 @@ sha512 = "27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw=="; }; } - { - name = "config_chain___config_chain_1.1.13.tgz"; - path = fetchurl { - name = "config_chain___config_chain_1.1.13.tgz"; - url = "https://registry.yarnpkg.com/config-chain/-/config-chain-1.1.13.tgz"; - sha512 = "qj+f8APARXHrM0hraqXYb2/bOVSV4PvJQlNZ/DVj0QrmNM2q2euizkeuVckQ57J+W0mRH6Hvi+k50M4Jul2VRQ=="; - }; - } { name = "connect___connect_3.7.0.tgz"; path = fetchurl { @@ -3937,14 +4137,6 @@ 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 { @@ -4001,6 +4193,14 @@ sha512 = "OSXseNPSK2OPJa6GdtkMz/XxeXx8/CJvfhQWTqd6neuUraujcL4jVsjkLQz1OWnax8xVQJnRPe0V2jqNWORA+A=="; }; } + { + name = "core_js_compat___core_js_compat_3.22.8.tgz"; + path = fetchurl { + name = "core_js_compat___core_js_compat_3.22.8.tgz"; + url = "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.22.8.tgz"; + sha512 = "pQnwg4xtuvc2Bs/5zYQPaEYYSuTxsF7LBWF0SvnVhthZo/Qe+rJpcEekrdNK5DWwDJ0gv0oI9NNX5Mppdy0ctg=="; + }; + } { name = "core_js___core_js_2.6.12.tgz"; path = fetchurl { @@ -4081,22 +4281,6 @@ 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 { @@ -4161,22 +4345,6 @@ sha512 = "KlB8l5uoNcf9F7i5kXnkxoqJGd2BXH4f0+Lj2vSWSmuvMLYO1kNsJ1KHSzeDW8e45/whgSOPcKVT/3JopkT8dg=="; }; } - { - 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 { @@ -4193,14 +4361,6 @@ 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 { @@ -4217,14 +4377,6 @@ 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 { @@ -4281,14 +4433,6 @@ sha512 = "RSU6Hyeg14am3Ah4VZEmeX8H7kLwEEirXe6aU2IPfKNvhXwTflK5HQRDNI0ypQXoqmm+QPyG2IaPuQE5zMwSIQ=="; }; } - { - name = "csstype___csstype_3.0.11.tgz"; - path = fetchurl { - name = "csstype___csstype_3.0.11.tgz"; - url = "https://registry.yarnpkg.com/csstype/-/csstype-3.0.11.tgz"; - sha512 = "sa6P2wJ+CAbgyy4KFssIb/JNMLxFvKF1pCYCSXS8ZMuqZnMsrxqI2E5sPyoTpxoPU/gVZMzr2zjOfg8GIZOMsw=="; - }; - } { name = "csstype___csstype_3.0.9.tgz"; path = fetchurl { @@ -4393,62 +4537,6 @@ sha512 = "VfxadyCECXgQlkoEAjeghAr5gY3Hf+IKjKb+X8tGVDtveCjN+USwprd2q3QXBR9T1+x2DG0XZF5/w+7HAtSaXA=="; }; } - { - 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 { @@ -4625,14 +4713,6 @@ 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 { @@ -4649,14 +4729,6 @@ 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 { @@ -4673,14 +4745,6 @@ sha512 = "PzE9aBMsdZO8TK4BnuJwH0QT41wgMbRzuZrHUcpYncEjmQazq8QEaBWgLG7ZyC/DAZKEgglpIA6j4Qn/HmxS3w=="; }; } - { - name = "domutils___domutils_1.7.0.tgz"; - path = fetchurl { - name = "domutils___domutils_1.7.0.tgz"; - url = "https://registry.yarnpkg.com/domutils/-/domutils-1.7.0.tgz"; - sha512 = "Lgd2XcJ/NjEw+7tFvfKxOzCYKZsdct5lczQ2ZaQY8Djz7pfAD3Gbp8ySJWtreII/vDlMVmxwa6pHmdxIYgttDg=="; - }; - } { name = "domutils___domutils_2.8.0.tgz"; path = fetchurl { @@ -4689,22 +4753,6 @@ sha512 = "w96Cjofp72M5IIhpjgobBimYEfoPjx1Vx0BSX9P30WBdZW2WIKU0T1Bd0kz2eNZ9ikjKgHbEyKx8BB6H1L3h3A=="; }; } - { - 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 { @@ -4721,14 +4769,6 @@ 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 { @@ -4761,6 +4801,14 @@ sha512 = "suEUoPTD1mExjL9TdmH7cvEiWJVM2oEiAi+Y1p0QKxI2HcRlT44qDTP2c1aZmVwRemIPYOpxmV7CxQCOWcm4XQ=="; }; } + { + name = "electron_to_chromium___electron_to_chromium_1.4.144.tgz"; + path = fetchurl { + name = "electron_to_chromium___electron_to_chromium_1.4.144.tgz"; + url = "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.4.144.tgz"; + sha512 = "R3RV3rU1xWwFJlSClVWDvARaOk6VUO/FubHLodIASDB3Mc2dzuWvNdfOgH9bwHUTqT79u92qw60NWfwUdzAqdg=="; + }; + } { name = "electron_to_chromium___electron_to_chromium_1.4.63.tgz"; path = fetchurl { @@ -4809,14 +4857,6 @@ 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_6.0.2.tgz"; path = fetchurl { @@ -4873,6 +4913,14 @@ sha512 = "p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A=="; }; } + { + name = "entities___entities_3.0.1.tgz"; + path = fetchurl { + name = "entities___entities_3.0.1.tgz"; + url = "https://registry.yarnpkg.com/entities/-/entities-3.0.1.tgz"; + sha512 = "WiyBqoomrwMdFG1e0kqvASYfnlb0lp8M5o5Fw2OFq1hNZxxcNk8Ik0Xm7LxzBhuidnZB/UtBqVCgUz3kBOP51Q=="; + }; + } { name = "env_paths___env_paths_2.2.1.tgz"; path = fetchurl { @@ -5153,38 +5201,6 @@ 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.1.1.tgz"; path = fetchurl { @@ -5193,14 +5209,6 @@ sha512 = "8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg=="; }; } - { - 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 { @@ -5209,22 +5217,6 @@ 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 { @@ -5297,14 +5289,6 @@ sha512 = "W+KJc2dmILlPplD/H4K9l9LcAHAfPtP6BY84uVLXQ6Evcz9Lcg33Y2z1IVblT6xdY54PXYVHEv+0Wpq8Io6zkA=="; }; } - { - name = "fast_xml_parser___fast_xml_parser_3.21.1.tgz"; - path = fetchurl { - name = "fast_xml_parser___fast_xml_parser_3.21.1.tgz"; - url = "https://registry.yarnpkg.com/fast-xml-parser/-/fast-xml-parser-3.21.1.tgz"; - sha512 = "FTFVjYoBOZTJekiUsawGsSYV9QL0A+zDYCRj7y34IO6Jg+2IMYEtQa+bbictpdpV8dHxXywqU7C0gRDEOFtBFg=="; - }; - } { name = "fastest_levenshtein___fastest_levenshtein_1.0.12.tgz"; path = fetchurl { @@ -5321,14 +5305,6 @@ sha512 = "YpkpUnK8od0o1hmeSc7UUs/eB/vIPWJYjKck2QKIzAf71Vm1AAQ3EbuZB3g2JIy+pg+ERD0vqI79KyZiB2e2Nw=="; }; } - { - name = "fd_slicer___fd_slicer_1.1.0.tgz"; - path = fetchurl { - name = "fd_slicer___fd_slicer_1.1.0.tgz"; - url = "https://registry.yarnpkg.com/fd-slicer/-/fd-slicer-1.1.0.tgz"; - sha1 = "JcfInLH5B3+IkbvmHY85Dq4lbx4="; - }; - } { name = "file_entry_cache___file_entry_cache_6.0.1.tgz"; path = fetchurl { @@ -5337,14 +5313,6 @@ 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 { @@ -5353,38 +5321,6 @@ 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 { @@ -5409,14 +5345,6 @@ 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 { @@ -5465,14 +5393,6 @@ sha512 = "78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng=="; }; } - { - 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 { @@ -5521,22 +5441,6 @@ 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 { @@ -5649,46 +5553,6 @@ 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 { @@ -5777,22 +5641,6 @@ sha512 = "wiSuFQLZ+urS9x2gGPl1H5drc5twabmm4m2gTR27XDFyjUHJUNsS8o/2aKyIF6IoBaR630atdher0XJ5g6OMmA=="; }; } - { - 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.8.tgz"; path = fetchurl { @@ -5817,6 +5665,14 @@ sha512 = "ax7ZYomf6jqPTQ4+XCpUGyXKHk5WweS+e05MBO4/y3WJ5RkmPXNKvX+bx1behVILVwr6JSQvZAku021CHPXG3Q=="; }; } + { + name = "hammerjs___hammerjs_2.0.8.tgz"; + path = fetchurl { + name = "hammerjs___hammerjs_2.0.8.tgz"; + url = "https://registry.yarnpkg.com/hammerjs/-/hammerjs-2.0.8.tgz"; + sha512 = "tSQXBXS/MWQOn/RKckawJ61vvsDpCom87JgxiYdGwHdOa0ht0vzUWDlfioofFCRU0L+6NGDt6XzbgoJvZkMeRQ=="; + }; + } { name = "handlebars___handlebars_4.7.7.tgz"; path = fetchurl { @@ -5873,14 +5729,6 @@ 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 { @@ -5889,14 +5737,6 @@ 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_tostringtag___has_tostringtag_1.0.0.tgz"; path = fetchurl { @@ -6041,14 +5881,6 @@ 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 { @@ -6097,14 +5929,6 @@ 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 { @@ -6193,38 +6017,6 @@ 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 { @@ -6249,14 +6041,6 @@ 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.3.tgz"; path = fetchurl { @@ -6337,14 +6121,6 @@ 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 { @@ -6393,14 +6169,6 @@ 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 { @@ -6601,14 +6369,6 @@ 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 { @@ -6617,14 +6377,6 @@ 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 { @@ -6649,14 +6401,6 @@ 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 { @@ -6673,14 +6417,6 @@ 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.4.tgz"; path = fetchurl { @@ -6705,14 +6441,6 @@ 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_shared_array_buffer___is_shared_array_buffer_1.0.1.tgz"; path = fetchurl { @@ -6721,14 +6449,6 @@ sha512 = "IU0NmyknYZN0rChcKhRO1X8LYz5Isj/Fsqh8NJOSf+N/hCOTwy29F32Ik7a+QszE63IdvmwdTPDd6cZ5pg4cwA=="; }; } - { - name = "is_stream___is_stream_1.1.0.tgz"; - path = fetchurl { - name = "is_stream___is_stream_1.1.0.tgz"; - url = "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz"; - sha1 = "EtSj3U5o4Lec6428hBc66A2RykQ="; - }; - } { name = "is_stream___is_stream_2.0.1.tgz"; path = fetchurl { @@ -6753,14 +6473,6 @@ 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.4.tgz"; path = fetchurl { @@ -6897,14 +6609,6 @@ sha512 = "5+19PlhnGabNWB7kOFnuxT8H3T/iIyQzIbQMxXsURmmvKg86P2sbkrGOT77VnHw0Qr0gc2XzRaRfMZYYbSQCJQ=="; }; } - { - 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 { @@ -7049,14 +6753,6 @@ 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 { @@ -7129,6 +6825,14 @@ sha512 = "f+8cldu7X/y7RAJurMEJmdoKXGB/X550w2Nr3tTbezL6RwEE/iMcm+tZnXeoZtKuOq6ft8+CqzEkrIgx1fPoQA=="; }; } + { + name = "json5___json5_2.2.1.tgz"; + path = fetchurl { + name = "json5___json5_2.2.1.tgz"; + url = "https://registry.yarnpkg.com/json5/-/json5-2.2.1.tgz"; + sha512 = "1hqLFMSrGHRHxav9q9gNjJ5EXznIxGVO09xQRrwplcS8qs28pZ8s8hupZAmqDwZUmVZ2Qb2jnyPOWcDH8m8dlA=="; + }; + } { name = "jsoneditor_react___jsoneditor_react_3.1.2.tgz"; path = fetchurl { @@ -7337,14 +7041,6 @@ sha512 = "2TfjHwrRExC8yHoWlPBULyaLwAFmXmxQrcuFImt/JsAsSZu1uOWTZ1ZsWjqQtWpHLiatJOHL5jFjXSJIgCd01g=="; }; } - { - 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 { @@ -7601,30 +7297,6 @@ 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 { @@ -7641,14 +7313,6 @@ 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 { @@ -7682,11 +7346,11 @@ }; } { - name = "marked___marked_2.1.3.tgz"; + name = "marked___marked_3.0.8.tgz"; path = fetchurl { - name = "marked___marked_2.1.3.tgz"; - url = "https://registry.yarnpkg.com/marked/-/marked-2.1.3.tgz"; - sha512 = "/Q+7MGzaETqifOMWYEA7HVMaZb4XbcRfaOzcSsHZEith83KGlvaSG33u0SKu89Mj5h+T8V2hM+8O45Qc5XTgwA=="; + name = "marked___marked_3.0.8.tgz"; + url = "https://registry.yarnpkg.com/marked/-/marked-3.0.8.tgz"; + sha512 = "0gVrAjo5m0VZSJb4rpL59K1unJAMb/hm8HRXqasD8VeC8m91ytDPMritgFSlKonfdt+rRYYpP/JfLxgIX8yoSw=="; }; } { @@ -7713,14 +7377,6 @@ 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 { @@ -7825,14 +7481,6 @@ 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 = "min_indent___min_indent_1.0.1.tgz"; path = fetchurl { @@ -8057,14 +7705,6 @@ 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 { @@ -8161,14 +7801,6 @@ 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.4.0.tgz"; path = fetchurl { @@ -8185,6 +7817,14 @@ sha512 = "CqyzN6z7Q6aMeF/ktcMVTzhAHCEpf8SOarwpzpf8pNBY2k5/oM34UHldUwp8VKI7uxct2HxSRdJjBaZeESzcxA=="; }; } + { + name = "node_releases___node_releases_2.0.5.tgz"; + path = fetchurl { + name = "node_releases___node_releases_2.0.5.tgz"; + url = "https://registry.yarnpkg.com/node-releases/-/node-releases-2.0.5.tgz"; + sha512 = "U9h1NLROZTq9uE1SNffn6WuPDg8icmi3ns4rEl/oTfIle4iLjTliCzgTsbaIFMq/Xn078/lfY/BL0GWZ+psK4Q=="; + }; + } { name = "nopt___nopt_5.0.0.tgz"; path = fetchurl { @@ -8217,14 +7857,6 @@ 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_6.1.0.tgz"; path = fetchurl { @@ -8242,27 +7874,11 @@ }; } { - name = "notistack___notistack_2.0.5.tgz"; + name = "notistack___notistack_1.0.10.tgz"; path = fetchurl { - name = "notistack___notistack_2.0.5.tgz"; - url = "https://registry.yarnpkg.com/notistack/-/notistack-2.0.5.tgz"; - sha512 = "Ig2T1Muqkc1PaSQcEDrK7diKv6cBxw02Iq6uv074ySfgq524TV5lK41diAb6OSsaiWfp3aRt+T3+0MF8m2EcJQ=="; - }; - } - { - 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 = "notistack___notistack_1.0.10.tgz"; + url = "https://registry.yarnpkg.com/notistack/-/notistack-1.0.10.tgz"; + sha512 = "z0y4jJaVtOoH3kc3GtNUlhNTY+5LE04QDeLVujX3VPhhzg67zw055mZjrBF+nzpv3V9aiPNph1EgRU4+t8kQTQ=="; }; } { @@ -8281,14 +7897,6 @@ 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 { @@ -8361,14 +7969,6 @@ sha512 = "CAyG5mWQRRiBU57Re4FKoTBjXfDoNwdFVH2Y1tS9PqCsfUTymAohOkEMSG3aRNKmv4lV3O7p1et7c187q6bynw=="; }; } - { - name = "object.getownpropertydescriptors___object.getownpropertydescriptors_2.1.3.tgz"; - path = fetchurl { - name = "object.getownpropertydescriptors___object.getownpropertydescriptors_2.1.3.tgz"; - url = "https://registry.yarnpkg.com/object.getownpropertydescriptors/-/object.getownpropertydescriptors-2.1.3.tgz"; - sha512 = "VdDoCwvJI4QdC6ndjpqFmoL3/+HxffFBbcJzKi5hwLLqqx3mdbedRpfZDdK0SrOSauj8X4GzBvnDZl4vTN7dOw=="; - }; - } { name = "object.hasown___object.hasown_1.1.0.tgz"; path = fetchurl { @@ -8425,14 +8025,6 @@ 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 { @@ -8441,14 +8033,6 @@ 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 { @@ -8457,62 +8041,6 @@ 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 { @@ -8545,14 +8073,6 @@ sha512 = "LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw=="; }; } - { - 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 { @@ -8585,22 +8105,6 @@ 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 { @@ -8721,14 +8225,6 @@ 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 { @@ -8785,14 +8281,6 @@ 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 { @@ -8807,8 +8295,8 @@ let repo = fetchgit { url = "https://github.com/EnterpriseDB/pgadmin4-treeview/"; - rev = "2c288ccc0ae0c98b41e56e79abf1204be3861702"; - sha256 = "021y8hd78p61c8k6h5q9dqgms7l89gf51h5q05cjr554ayyyqs24"; + rev = "07cc449e1d89ecc8cce3679d8cff5a35f1db67ee"; + sha256 = "1a31ms86ldd5hxhwzxp7c2bn6q97wvkfvp3n7qaczc0jq3mrb45z"; }; in runCommand "pgadmin4-treeview" { buildInputs = [gnutar]; } '' @@ -8841,46 +8329,6 @@ 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 { @@ -8889,14 +8337,6 @@ 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 { @@ -9209,22 +8649,6 @@ 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 { @@ -9281,22 +8705,6 @@ 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 { @@ -9305,14 +8713,6 @@ 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 { @@ -9361,14 +8761,6 @@ 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 { @@ -9561,6 +8953,14 @@ sha512 = "m+r+UIAw29PKgt+2on7zR/fCa7dnvLeM/x2HorGPa39xm4ELHY0PhN0oyE2mO95yqha7mqexD7RXd6iKfVKv7g=="; }; } + { + name = "react_aspen___react_aspen_1.2.0.tgz"; + path = fetchurl { + name = "react_aspen___react_aspen_1.2.0.tgz"; + url = "https://registry.yarnpkg.com/react-aspen/-/react-aspen-1.2.0.tgz"; + sha512 = "w+vUn4ScCzcxDB5xEsKIuIkUnySEQXlp/zqPFChWEpYG12mPO7h7z/LWuK2QXUoDbIP96Fcf1+UAI9I/cstPqg=="; + }; + } { name = "react_checkbox_tree___react_checkbox_tree_1.7.2.tgz"; path = fetchurl { @@ -9897,6 +9297,14 @@ sha512 = "eOf6vka5IO151Jfsw2NO9WpGX58W6wWmefK3I1zEGr0lOD0u8rwPaNqQL1aRxUaxLeKO3ArNh3VYg1KbaD+FFw=="; }; } + { + name = "regenerator_transform___regenerator_transform_0.15.0.tgz"; + path = fetchurl { + name = "regenerator_transform___regenerator_transform_0.15.0.tgz"; + url = "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.15.0.tgz"; + sha512 = "LsrGtPmbYg19bcPHwdtmXwbW+TqNvtY4riE3P83foeHRroMbH6/2ddFBfab3t7kbzc7v7p4wbkIecHImqt0QNg=="; + }; + } { name = "regexp.prototype.flags___regexp.prototype.flags_1.3.1.tgz"; path = fetchurl { @@ -10049,14 +9457,6 @@ 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 { @@ -10097,14 +9497,6 @@ 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 { @@ -10137,14 +9529,6 @@ 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 { @@ -10153,6 +9537,14 @@ sha512 = "rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ=="; }; } + { + name = "safe_buffer___safe_buffer_5.1.2.tgz"; + path = fetchurl { + name = "safe_buffer___safe_buffer_5.1.2.tgz"; + url = "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz"; + sha512 = "Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="; + }; + } { name = "safer_buffer___safer_buffer_2.1.2.tgz"; path = fetchurl { @@ -10241,14 +9633,6 @@ sha512 = "Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw=="; }; } - { - 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 { @@ -10257,22 +9641,6 @@ 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 { @@ -10369,14 +9737,6 @@ 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 { @@ -10385,14 +9745,6 @@ 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 { @@ -10569,30 +9921,6 @@ 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 { @@ -10657,14 +9985,6 @@ sha512 = "CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ=="; }; } - { - name = "sourcemap_codec___sourcemap_codec_1.4.8.tgz"; - path = fetchurl { - name = "sourcemap_codec___sourcemap_codec_1.4.8.tgz"; - url = "https://registry.yarnpkg.com/sourcemap-codec/-/sourcemap-codec-1.4.8.tgz"; - sha512 = "9NykojV5Uih4lgo5So5dtw+f0JgJX30KCNI8gwhz2J9A15wD0Ml6tjHKwf6fTSa6fAdVBdZeNOs9eJ71qCk8vA=="; - }; - } { name = "spdx_correct___spdx_correct_3.1.1.tgz"; path = fetchurl { @@ -10785,14 +10105,6 @@ sha512 = "ur6y5S5dopOaRXBuRIZ1u6GC5bcEXHRZKgfBjfCglMhmIf+roVCECjvkEYzNQOXIN2/JPnkMPW/8B3CZoKaEPA=="; }; } - { - 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 { @@ -10905,22 +10217,6 @@ 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 { @@ -10945,22 +10241,6 @@ 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 = "strnum___strnum_1.0.4.tgz"; - path = fetchurl { - name = "strnum___strnum_1.0.4.tgz"; - url = "https://registry.yarnpkg.com/strnum/-/strnum-1.0.4.tgz"; - sha512 = "lMzNMfDpaQOLt4B2mEbfzYS0+T7dvCXeojnlGf6f1AygvWDMcWyXYaLbyICfjVu29sErR8fnRagQfBW/N/hGgw=="; - }; - } { name = "style_loader___style_loader_2.0.0.tgz"; path = fetchurl { @@ -11001,14 +10281,6 @@ sha512 = "Es0rVnHIqbWzveU1b24kbw92HsebBepxfcqe5iix7t9j0PQqhs0IxXVXv0pY2Bxa08CgMkzD6OWql7kbGOuEdA=="; }; } - { - name = "stylis___stylis_4.0.13.tgz"; - path = fetchurl { - name = "stylis___stylis_4.0.13.tgz"; - url = "https://registry.yarnpkg.com/stylis/-/stylis-4.0.13.tgz"; - sha512 = "xGPXiFVl4YED9Jh7Euv2V220mriG9u4B2TA6Ybjc1catrstKD2PpIdU3U0RKpkVBC2EhmL/F0sPCr9vrFTNRag=="; - }; - } { name = "stylis___stylis_4.0.10.tgz"; path = fetchurl { @@ -11097,14 +10369,6 @@ 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.8.0.tgz"; path = fetchurl { @@ -11153,14 +10417,6 @@ sha512 = "GNzQvQTOIP6RyTfE2Qxb8ZVlNmw0n88vp1szwWRimP02mnTsx3Wtn5qRdqY9w2XduFNUgvOwhNnQsjwCp+kqaQ=="; }; } - { - 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 { @@ -11169,22 +10425,6 @@ 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 { @@ -11249,14 +10489,6 @@ 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 { @@ -11305,14 +10537,6 @@ 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 { @@ -11361,14 +10585,6 @@ sha512 = "GJtWyq9InR/2HRiLZgpIKv+ufIKrVrvjQWEj7PxAXNc5dwbNJkqhAUoAGgzRmULAnoOM5EIpveYd3J2VeSAIew=="; }; } - { - 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 { @@ -11425,14 +10641,6 @@ 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 { @@ -11441,14 +10649,6 @@ 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.20.2.tgz"; path = fetchurl { @@ -11521,14 +10721,6 @@ 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 { @@ -11657,14 +10849,6 @@ 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 { @@ -11689,30 +10873,6 @@ 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 { @@ -11729,14 +10889,6 @@ 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 { @@ -11769,14 +10921,6 @@ sha512 = "JPaDXF3vzgZxfeEwutdGzlrNoVFL5UvZcbO6Qo9D4GoahrieUPoMU8GCpVpR7MQqcKhmShIh8VlbEN3PLM3EBg=="; }; } - { - 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 { @@ -12113,14 +11257,6 @@ 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 { @@ -12154,19 +11290,11 @@ }; } { - name = "yarn_audit_html___yarn_audit_html_2.1.0.tgz"; + name = "yarn_audit_html___yarn_audit_html_3.0.1.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 = "yarn_audit_html___yarn_audit_html_3.0.1.tgz"; + url = "https://registry.yarnpkg.com/yarn-audit-html/-/yarn-audit-html-3.0.1.tgz"; + sha512 = "tdtbJyKD7lhGS3f1df/boxhNrnEfmjVCyjHGc/9WebZ3gHvF/dxyLDPOzio1vpJRczaYqW3WVF6M1Srgt1O2yQ=="; }; } { diff --git a/third_party/nixpkgs/pkgs/tools/admin/syft/default.nix b/third_party/nixpkgs/pkgs/tools/admin/syft/default.nix index e8803532d5..0bc554d96f 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/syft/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/syft/default.nix @@ -74,8 +74,5 @@ buildGoModule rec { ''; license = with licenses; [ asl20 ]; maintainers = with maintainers; [ jk ]; - # Need updated macOS SDK - # https://github.com/NixOS/nixpkgs/issues/101229 - broken = (stdenv.isDarwin && stdenv.isx86_64); }; } diff --git a/third_party/nixpkgs/pkgs/tools/admin/trivy/default.nix b/third_party/nixpkgs/pkgs/tools/admin/trivy/default.nix index 121c854f92..6515088c39 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/trivy/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/trivy/default.nix @@ -49,8 +49,5 @@ buildGoModule rec { ''; license = licenses.asl20; maintainers = with maintainers; [ jk ]; - # Need updated macOS SDK - # https://github.com/NixOS/nixpkgs/issues/101229 - broken = (stdenv.isDarwin && stdenv.isx86_64); }; } diff --git a/third_party/nixpkgs/pkgs/tools/admin/wander/default.nix b/third_party/nixpkgs/pkgs/tools/admin/wander/default.nix index b8157483eb..628377d7f6 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/wander/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/wander/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "wander"; - version = "0.4.1"; + version = "0.5.1"; src = fetchFromGitHub { owner = "robinovitch61"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Z3jvKBhzlATTh6zPoJoMmg/DAE5/Ur3Tb3sdgGPEm6k="; + sha256 = "sha256-B+mMC5XGUTNTcxwKhvSSc7QbsLkg8qu7/jJf5U/q6s8="; }; vendorSha256 = "sha256-gWQ8GbtghhCRq6tOU6qmWBuponmfUkUDAk3+dPtmMiE="; diff --git a/third_party/nixpkgs/pkgs/tools/archivers/fsarchiver/default.nix b/third_party/nixpkgs/pkgs/tools/archivers/fsarchiver/default.nix index 646f93b77c..cfa3c3c511 100644 --- a/third_party/nixpkgs/pkgs/tools/archivers/fsarchiver/default.nix +++ b/third_party/nixpkgs/pkgs/tools/archivers/fsarchiver/default.nix @@ -38,7 +38,7 @@ in stdenv.mkDerivation { ''; homepage = "https://www.fsarchiver.org/"; license = licenses.lgpl2; - maintainers = [ maintainers.etu ]; + maintainers = with maintainers; [ ]; platforms = platforms.linux; }; } diff --git a/third_party/nixpkgs/pkgs/tools/archivers/runzip/default.nix b/third_party/nixpkgs/pkgs/tools/archivers/runzip/default.nix index c251cfe0dc..fddf90a5d2 100644 --- a/third_party/nixpkgs/pkgs/tools/archivers/runzip/default.nix +++ b/third_party/nixpkgs/pkgs/tools/archivers/runzip/default.nix @@ -1,11 +1,11 @@ -{ lib, stdenv, fetchFromGitHub, libzip, autoreconfHook }: +{ lib, stdenv, fetchFromGitHub, libzip, libiconv, autoreconfHook }: stdenv.mkDerivation rec { version = "1.4"; pname = "runzip"; nativeBuildInputs = [ autoreconfHook ]; - buildInputs = [ libzip ]; + buildInputs = [ libiconv libzip ]; src = fetchFromGitHub { owner = "vlm"; @@ -16,8 +16,8 @@ stdenv.mkDerivation rec { meta = { description = "A tool to convert filename encoding inside a ZIP archive"; - license = lib.licenses.bsd2 ; - maintainers = [lib.maintainers.raskin]; - platforms = lib.platforms.linux; + license = lib.licenses.bsd2; + maintainers = [ lib.maintainers.raskin ]; + platforms = lib.platforms.unix; }; } diff --git a/third_party/nixpkgs/pkgs/tools/audio/yabridge/default.nix b/third_party/nixpkgs/pkgs/tools/audio/yabridge/default.nix index eb897f839a..6287c53238 100644 --- a/third_party/nixpkgs/pkgs/tools/audio/yabridge/default.nix +++ b/third_party/nixpkgs/pkgs/tools/audio/yabridge/default.nix @@ -8,17 +8,24 @@ , ninja , pkg-config , wine -, boost , libxcb , nix-update-script }: let + # Derived from subprojects/asio.wrap + asio = fetchFromGitHub { + owner = "chriskohlhoff"; + repo = "asio"; + rev = "asio-1-22-1"; + sha256 = "sha256-UDLhx2yI6Txg0wP5H4oNIhgKIB2eMxUGCyT2x/7GgVg="; + }; + # Derived from subprojects/bitsery.wrap bitsery = fetchFromGitHub { owner = "fraillt"; repo = "bitsery"; - rev = "c0fc083c9de805e5825d7553507569febf6a6f93"; + rev = "v5.2.2"; sha256 = "sha256-VwzVtxt+E/SVcxqIJw8BKPO2q7bu/hkhY+nB7FHrZpY="; }; @@ -26,15 +33,23 @@ let function2 = fetchFromGitHub { owner = "Naios"; repo = "function2"; - rev = "02ca99831de59c7c3a4b834789260253cace0ced"; + rev = "4.2.0"; sha256 = "sha256-wrt+fCcM6YD4ZRZYvqqB+fNakCNmltdPZKlNkPLtgMs="; }; + # Derived from subprojects/ghc_filesystem.wrap + ghc_filesystem = fetchFromGitHub { + owner = "gulrak"; + repo = "filesystem"; + rev = "v1.5.12"; + sha256 = "sha256-j4RE5Ach7C7Kef4+H9AHSXa2L8OVyJljDwBduKcC4eE="; + }; + # Derived from subprojects/tomlplusplus.wrap tomlplusplus = fetchFromGitHub { owner = "marzer"; repo = "tomlplusplus"; - rev = "8e669aa6990e0ed219c169d491472d749f54c393"; + rev = "v3.0.1"; sha256 = "sha256-l8ckbCqjz3GUfwStcl3H2C+un5dZfT2uLtayvdu93D4="; }; @@ -42,29 +57,29 @@ let vst3 = fetchFromGitHub { owner = "robbert-vdh"; repo = "vst3sdk"; - rev = "v3.7.4_build_25-patched"; + rev = "v3.7.5_build_44-patched"; fetchSubmodules = true; - sha256 = "sha256-oHRJZItw+he5M+beVZkUrhJir6rgFZ80ORzA73mJT2A="; + sha256 = "sha256-6cuEUa+BXa6MnAYIBq873n0NRLadcPfMX+kpf4ysE6M="; }; in multiStdenv.mkDerivation rec { pname = "yabridge"; - version = "3.8.1"; + version = "4.0.2"; # NOTE: Also update yabridgectl's cargoHash when this is updated src = fetchFromGitHub { owner = "robbert-vdh"; repo = pname; rev = version; - sha256 = "sha256-5Mi/aIjOKbn7guTj+AKGQRv+k7w4gzfdA9Mw4ocUlOE="; + sha256 = "sha256-rce6gxnB+RpG84Xakw0h4vZ8lyEQ41swWQGuwpomV2I="; }; # Unpack subproject sources postUnpack = ''( cd "$sourceRoot/subprojects" + cp -R --no-preserve=mode,ownership ${asio} asio cp -R --no-preserve=mode,ownership ${bitsery} bitsery - cp packagefiles/bitsery/* bitsery cp -R --no-preserve=mode,ownership ${function2} function2 - cp packagefiles/function2/* function2 + cp -R --no-preserve=mode,ownership ${ghc_filesystem} ghc_filesystem cp -R --no-preserve=mode,ownership ${tomlplusplus} tomlplusplus cp -R --no-preserve=mode,ownership ${vst3} vst3 )''; @@ -73,14 +88,23 @@ in multiStdenv.mkDerivation rec { # Hard code bitbridge & runtime dependencies (substituteAll { src = ./hardcode-dependencies.patch; - boost32 = pkgsi686Linux.boost; libxcb32 = pkgsi686Linux.xorg.libxcb; inherit libnotify wine; }) + + # Patch the chainloader to search for libyabridge through NIX_PROFILES + ./libyabridge-from-nix-profiles.patch ]; postPatch = '' patchShebangs . + ( + cd subprojects + cp packagefiles/asio/* asio + cp packagefiles/bitsery/* bitsery + cp packagefiles/function2/* function2 + cp packagefiles/ghc_filesystem/* ghc_filesystem + ) ''; nativeBuildInputs = [ @@ -91,18 +115,12 @@ in multiStdenv.mkDerivation rec { ]; buildInputs = [ - boost libxcb ]; - # Meson is no longer able to pick up Boost automatically. - # https://github.com/NixOS/nixpkgs/issues/86131 - BOOST_INCLUDEDIR = "${lib.getDev boost}/include"; - BOOST_LIBRARYDIR = "${lib.getLib boost}/lib"; - mesonFlags = [ "--cross-file" "cross-wine.conf" - "-Dwith-bitbridge=true" + "-Dbitbridge=true" # Requires CMake and is unnecessary "-Dtomlplusplus:generate_cmake_config=false" @@ -111,10 +129,8 @@ in multiStdenv.mkDerivation rec { installPhase = '' runHook preInstall mkdir -p "$out/bin" "$out/lib" - cp yabridge-group*.exe{,.so} "$out/bin" - cp yabridge-host*.exe{,.so} "$out/bin" - cp libyabridge-vst2.so "$out/lib" - cp libyabridge-vst3.so "$out/lib" + cp yabridge-host{,-32}.exe{,.so} "$out/bin" + cp libyabridge{,-chainloader}-{vst2,vst3}.so "$out/lib" runHook postInstall ''; @@ -131,8 +147,8 @@ in multiStdenv.mkDerivation rec { }; meta = with lib; { - description = "Yet Another VST bridge, run Windows VST2 plugins under Linux"; - homepage = "https://github.com/robbert-vdh/yabridge"; + description = "A modern and transparent way to use Windows VST2 and VST3 plugins on Linux"; + homepage = src.meta.homepage; license = licenses.gpl3Plus; maintainers = with maintainers; [ kira-bruneau ]; platforms = [ "x86_64-linux" ]; diff --git a/third_party/nixpkgs/pkgs/tools/audio/yabridge/hardcode-dependencies.patch b/third_party/nixpkgs/pkgs/tools/audio/yabridge/hardcode-dependencies.patch index 16385db69e..e54ba1e938 100644 --- a/third_party/nixpkgs/pkgs/tools/audio/yabridge/hardcode-dependencies.patch +++ b/third_party/nixpkgs/pkgs/tools/audio/yabridge/hardcode-dependencies.patch @@ -1,16 +1,8 @@ diff --git a/meson.build b/meson.build -index c71d4fdb..b3f381ba 100644 +index bfab6361..9085db0f 100644 --- a/meson.build +++ b/meson.build -@@ -201,6 +201,7 @@ if with_32bit_libraries or with_bitbridge - 'boost_filesystem', - static : with_static_boost, - dirs : [ -+ '@boost32@/lib', - # Used by Arch based distros - '/usr/local/lib32', - '/usr/lib32', -@@ -224,7 +225,7 @@ if is_64bit_system +@@ -187,7 +187,7 @@ if is_64bit_system xcb_64bit_dep = dependency('xcb') endif if with_32bit_libraries or with_bitbridge @@ -19,25 +11,29 @@ index c71d4fdb..b3f381ba 100644 endif # These are all headers-only libraries, and thus won't require separate 32-bit -diff --git a/src/plugin/utils.cpp b/src/plugin/utils.cpp -index fc2c8b25..c73249e3 100644 ---- a/src/plugin/utils.cpp -+++ b/src/plugin/utils.cpp -@@ -107,7 +107,7 @@ std::string PluginInfo::wine_version() const { - access(wineloader_path.c_str(), X_OK) == 0) { - wine_path = wineloader_path; - } else { -- wine_path = bp::search_path("wine").string(); -+ wine_path = "@wine@/bin/wine"; +diff --git a/src/common/notifications.cpp b/src/common/notifications.cpp +index da27a1bf..18482e06 100644 +--- a/src/common/notifications.cpp ++++ b/src/common/notifications.cpp +@@ -49,7 +49,7 @@ bool send_notification(const std::string& title, + } } - bp::ipstream output; -@@ -436,7 +436,7 @@ Configuration load_config_for(const fs::path& yabridge_path) { - bool send_notification(const std::string& title, - const std::string body, - bool append_origin) { -- const fs::path notify_send_path = bp::search_path("notify-send"); -+ const fs::path notify_send_path = "@libnotify@/bin/notify-send"; - if (notify_send_path.empty()) { - return false; - } +- Process process("notify-send"); ++ Process process("@libnotify@/bin/notify-send"); + process.arg("--urgency=normal"); + process.arg("--app-name=yabridge"); + process.arg(title); +diff --git a/src/plugin/utils.cpp b/src/plugin/utils.cpp +index acd431bc..8566281c 100644 +--- a/src/plugin/utils.cpp ++++ b/src/plugin/utils.cpp +@@ -93,7 +93,7 @@ std::string PluginInfo::wine_version() const { + // The '*.exe' scripts generated by winegcc allow you to override the binary + // used to run Wine, so will will handle this in the same way for our Wine + // version detection. We'll be using `execvpe` +- std::string wine_path = "wine"; ++ std::string wine_path = "@wine@/bin/wine"; + // NOLINTNEXTLINE(concurrency-mt-unsafe) + if (const char* wineloader_path = getenv("WINELOADER"); + wineloader_path && access(wineloader_path, X_OK) == 0) { diff --git a/third_party/nixpkgs/pkgs/tools/audio/yabridge/libyabridge-from-nix-profiles.patch b/third_party/nixpkgs/pkgs/tools/audio/yabridge/libyabridge-from-nix-profiles.patch new file mode 100644 index 0000000000..4d714d38fa --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/audio/yabridge/libyabridge-from-nix-profiles.patch @@ -0,0 +1,71 @@ +diff --git a/src/chainloader/utils.cpp b/src/chainloader/utils.cpp +index ccd65d33..c7136b37 100644 +--- a/src/chainloader/utils.cpp ++++ b/src/chainloader/utils.cpp +@@ -29,8 +29,10 @@ + namespace fs = ghc::filesystem; + + void* find_plugin_library(const std::string& name) { ++ Logger logger = Logger::create_exception_logger(); ++ + // Just using a goto for this would probably be cleaner, but yeah... +- const auto impl = [&name]() -> void* { ++ const auto impl = [&name, &logger]() -> void* { + // If `name` exists right next to the Wine plugin host binary, then + // we'll try loading that. Otherwise we'll fall back to regular + // `dlopen()` for distro packaged versions of yabridge +@@ -52,27 +54,28 @@ void* find_plugin_library(const std::string& name) { + } + } + +- if (void* handle = dlopen(name.c_str(), RTLD_LAZY | RTLD_LOCAL)) { +- return handle; ++ auto nix_profiles = getenv("NIX_PROFILES"); ++ if (!nix_profiles || nix_profiles[0] == '\0') { ++ logger.log(""); ++ logger.log("ERROR: 'NIX_PROFILES' environment variable is not set"); ++ logger.log(""); ++ return nullptr; + } + +- // One last Hail Mary, in case ldconfig was not set up correctly. This +- // might be relevant for some of the `/usr/local/*` locations (although +- // you really, really shouldn't install yabridge there, please, thank +- // you). Yabridgectl searches through these same directories. +- for (const auto& lib_dir : { +- "/usr/lib", +- "/usr/lib/x86_64-linux-gnu", +- "/usr/lib64", +- "/usr/local/lib", +- "/usr/local/lib/x86_64-linux-gnu", +- "/usr/local/lib64", +- }) { +- const fs::path candidate = fs::path(lib_dir) / name; +- if (void* handle = +- dlopen(candidate.c_str(), RTLD_LAZY | RTLD_LOCAL)) { ++ // NIX_PROFILES is iterated in reverse from the most specific (the ++ // user profile) to the least specific (the system profile). ++ const std::string_view nix_profiles_view = nix_profiles; ++ auto segment_end = nix_profiles_view.size(); ++ while (segment_end != std::string::npos) { ++ const auto next_segment_end = nix_profiles_view.rfind(' ', segment_end - 1); ++ const auto segment_begin = next_segment_end + 1; ++ const auto profile = nix_profiles_view.substr(segment_begin, segment_end - segment_begin); ++ const auto candidate = fs::path(profile) / "lib" / name; ++ if (auto handle = dlopen(candidate.c_str(), RTLD_LAZY | RTLD_LOCAL)) { + return handle; + } ++ ++ segment_end = next_segment_end; + } + + return nullptr; +@@ -82,8 +85,6 @@ void* find_plugin_library(const std::string& name) { + if (!handle) { + const fs::path this_plugin_path = get_this_file_location(); + +- Logger logger = Logger::create_exception_logger(); +- + logger.log(""); + logger.log("Could not find '" + name + "'"); + logger.log(""); diff --git a/third_party/nixpkgs/pkgs/tools/audio/yabridgectl/libyabridge-from-nix-profiles.patch b/third_party/nixpkgs/pkgs/tools/audio/yabridgectl/chainloader-from-nix-profiles.patch similarity index 80% rename from third_party/nixpkgs/pkgs/tools/audio/yabridgectl/libyabridge-from-nix-profiles.patch rename to third_party/nixpkgs/pkgs/tools/audio/yabridgectl/chainloader-from-nix-profiles.patch index 905068f75f..b687a6c01a 100644 --- a/third_party/nixpkgs/pkgs/tools/audio/yabridgectl/libyabridge-from-nix-profiles.patch +++ b/third_party/nixpkgs/pkgs/tools/audio/yabridgectl/chainloader-from-nix-profiles.patch @@ -1,23 +1,23 @@ diff --git a/tools/yabridgectl/src/config.rs b/tools/yabridgectl/src/config.rs -index bc5f6a81..0fcd38d3 100644 +index 523a083b..399302e0 100644 --- a/tools/yabridgectl/src/config.rs +++ b/tools/yabridgectl/src/config.rs -@@ -23,6 +23,7 @@ use std::collections::{BTreeMap, BTreeSet, HashSet}; +@@ -22,6 +22,7 @@ use serde_derive::{Deserialize, Serialize}; + use std::collections::{BTreeMap, BTreeSet, HashSet}; use std::env; - use std::fmt::Display; use std::fs; +use std::iter; use std::path::{Path, PathBuf}; use which::which; use xdg::BaseDirectories; -@@ -235,34 +236,27 @@ impl Config { +@@ -213,34 +214,27 @@ impl Config { } } None => { - // Search in the system library locations and in `~/.local/share/yabridge` if no - // path was set explicitely. We'll also search through `/usr/local/lib` just in case - // but since we advocate against installing yabridge there we won't list this path -- // in the error message when `libyabridge-vst2.so` can't be found. +- // in the error message when `libyabridge-chainloader-vst2.so` can't be found. - let system_path = Path::new("/usr/lib"); + // Search through NIX_PROFILES & data home directory if no path was set explicitly. + // NIX_PROFILES is iterated in reverse from the most specific (the user profile) to @@ -43,7 +43,7 @@ index bc5f6a81..0fcd38d3 100644 + let mut candidates = lib_directories - .iter() - .map(|directory| directory.join(LIBYABRIDGE_VST2_NAME)); + .map(|directory| directory.join(VST2_CHAINLOADER_NAME)); + match candidates.find(|directory| directory.exists()) { Some(candidate) => candidate, @@ -53,21 +53,21 @@ index bc5f6a81..0fcd38d3 100644 - default search path using 'yabridgectl set --path='.", + "Could not find '{}' through 'NIX_PROFILES' or '{}'. You can override the \ + default search path using 'yabridgectl set --path='.", - LIBYABRIDGE_VST2_NAME, + VST2_CHAINLOADER_NAME, - system_path.display(), user_path.display() )); } diff --git a/tools/yabridgectl/src/main.rs b/tools/yabridgectl/src/main.rs -index 48cce4fa..209e40e4 100644 +index 302ff8ae..9d9bbeac 100644 --- a/tools/yabridgectl/src/main.rs +++ b/tools/yabridgectl/src/main.rs -@@ -151,7 +151,7 @@ fn main() -> Result<()> { - .help("Path to the directory containing 'libyabridge-{vst2,vst3}.so'") +@@ -130,7 +130,7 @@ fn main() -> Result<()> { + .help("Path to the directory containing 'libyabridge-chainloader-{vst2,vst3}.so'") .long_help( - "Path to the directory containing 'libyabridge-{vst2,vst3}.so'. If this \ -- is not set, then yabridgectl will look in both '/usr/lib' and \ -+ is not set, then yabridgectl will look through 'NIX_PROFILES' and \ + "Path to the directory containing 'libyabridge-chainloader-{vst2,vst3}.so'. \ +- If this is not set, then yabridgectl will look in both '/usr/lib' and \ ++ If this is not set, then yabridgectl will look through 'NIX_PROFILES' and \ '~/.local/share/yabridge' by default.", ) .validator(validate_path) diff --git a/third_party/nixpkgs/pkgs/tools/audio/yabridgectl/default.nix b/third_party/nixpkgs/pkgs/tools/audio/yabridgectl/default.nix index 6ab94ef363..ebd5577e7d 100644 --- a/third_party/nixpkgs/pkgs/tools/audio/yabridgectl/default.nix +++ b/third_party/nixpkgs/pkgs/tools/audio/yabridgectl/default.nix @@ -11,13 +11,14 @@ rustPlatform.buildRustPackage rec { src = yabridge.src; sourceRoot = "source/tools/yabridgectl"; - cargoSha256 = "sha256-ducF55d5OvCwlNFtt2r6pG5e9VevM2AzHSvPnWvIp1Y="; + cargoSha256 = "sha256-09GsrQAI08Qih/TpbEAh4hn7IfvwyFdEoyzsSjcjGXY="; patches = [ - # By default, yabridgectl locates libyabridge.so by using - # hard coded distro specific lib paths. This patch replaces those - # hard coded paths with lib paths from NIX_PROFILES. - ./libyabridge-from-nix-profiles.patch + # Patch yabridgectl to search for the chainloader through NIX_PROFILES + ./chainloader-from-nix-profiles.patch + + # Dependencies are hardcoded in yabridge, so the check is unnecessary and likely incorrect + ./remove-dependency-verification.patch ]; patchFlags = [ "-p3" ]; @@ -26,12 +27,14 @@ rustPlatform.buildRustPackage rec { postFixup = '' wrapProgram "$out/bin/yabridgectl" \ - --prefix PATH : ${lib.makeBinPath [ wine ]} + --prefix PATH : ${lib.makeBinPath [ + wine # winedump + ]} ''; meta = with lib; { description = "A small, optional utility to help set up and update yabridge for several directories at once"; - homepage = "https://github.com/robbert-vdh/yabridge/tree/master/tools/yabridgectl"; + homepage = "${src.meta.homepage}/tree/${version}/tools/yabridgectl"; license = licenses.gpl3Plus; maintainers = with maintainers; [ kira-bruneau ]; platforms = yabridge.meta.platforms; diff --git a/third_party/nixpkgs/pkgs/tools/audio/yabridgectl/remove-dependency-verification.patch b/third_party/nixpkgs/pkgs/tools/audio/yabridgectl/remove-dependency-verification.patch new file mode 100644 index 0000000000..2f860fb4f1 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/audio/yabridgectl/remove-dependency-verification.patch @@ -0,0 +1,18 @@ +diff --git a/tools/yabridgectl/src/actions.rs b/tools/yabridgectl/src/actions.rs +index 9ecdb140..061a8ff3 100644 +--- a/tools/yabridgectl/src/actions.rs ++++ b/tools/yabridgectl/src/actions.rs +@@ -712,13 +712,6 @@ pub fn do_sync(config: &mut Config, options: &SyncOptions) -> Result<()> { + // be the case if we get to this point though. + verify_path_setup(config)?; + +- // This check is only performed once per combination of Wine and yabridge versions +- verify_wine_setup(config)?; +- +- // Yabridge uses notify-send to relay important information when something's very wrong, so +- // we'll check whether this is installed +- verify_external_dependencies()?; +- + Ok(()) + } + diff --git a/third_party/nixpkgs/pkgs/tools/bluetooth/bluetuith/default.nix b/third_party/nixpkgs/pkgs/tools/bluetooth/bluetuith/default.nix new file mode 100644 index 0000000000..9687b1da1e --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/bluetooth/bluetuith/default.nix @@ -0,0 +1,25 @@ +{ buildGoModule, fetchFromGitHub, lib, stdenv }: + +buildGoModule rec { + pname = "bluetuith"; + version = "0.0.3"; + + src = fetchFromGitHub { + owner = "darkhz"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-7JqpF9iga6RO+/r2JK0N9gjieVRUNkHhGNsfVFfKfRY="; + }; + + vendorSha256 = "sha256-MsVrhEG2DOFJAXvt5rvfctGUbb3hQsBJ7cjOSzWA+bc="; + + ldflags = [ "-s" "-w" ]; + + meta = with lib; { + description = "TUI-based bluetooth connection manager"; + homepage = "https://github.com/darkhz/bluetuith"; + license = licenses.mit; + platforms = platforms.linux; + maintainers = with maintainers; [ thehedgeh0g ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/cd-dvd/ventoy-bin/default.nix b/third_party/nixpkgs/pkgs/tools/cd-dvd/ventoy-bin/default.nix index 245475a10d..361739e980 100644 --- a/third_party/nixpkgs/pkgs/tools/cd-dvd/ventoy-bin/default.nix +++ b/third_party/nixpkgs/pkgs/tools/cd-dvd/ventoy-bin/default.nix @@ -208,5 +208,6 @@ in stdenv.mkDerivation rec { maintainers = with maintainers; [ k4leg AndersonTorres ]; platforms = [ "x86_64-linux" "i686-linux" "aarch64-linux" "mipsel-linux" ]; sourceProvenance = with sourceTypes; [ binaryNativeCode ]; + mainProgram = "ventoy"; }; } diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/bindfs/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/bindfs/default.nix index cc4bfc917e..21d1615948 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/bindfs/default.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/bindfs/default.nix @@ -1,12 +1,12 @@ { lib, stdenv, fetchurl, fuse, pkg-config }: stdenv.mkDerivation rec { - version = "1.16.1"; + version = "1.17.0"; pname = "bindfs"; src = fetchurl { url = "https://bindfs.org/downloads/${pname}-${version}.tar.gz"; - sha256 = "sha256-Veo9KqjkjQvqI7fAsDlQz+tJI1W/2Nu4oXOh44PyKLw="; + sha256 = "sha256-cNpX1J53lP5UuFdb/danlDqrVK2i6OL99L4E4AEUUdw="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/adafruit-ampy/default.nix b/third_party/nixpkgs/pkgs/tools/misc/adafruit-ampy/default.nix index 90af547f68..4a9a5866c6 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/adafruit-ampy/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/adafruit-ampy/default.nix @@ -21,6 +21,6 @@ buildPythonApplication rec { homepage = "https://github.com/pycampers/ampy"; license = licenses.mit; description = "Utility to interact with a MicroPython board over a serial connection"; - maintainers = with maintainers; [ etu ]; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/tools/misc/cod/default.nix b/third_party/nixpkgs/pkgs/tools/misc/cod/default.nix index 582d0fe5ce..4fdb8ce7ab 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/cod/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/cod/default.nix @@ -29,10 +29,10 @@ buildGoModule rec { ''; meta = with lib; { - broken = stdenv.isDarwin; description = "Tool for generating Bash/Fish/Zsh autocompletions based on `--help` output"; homepage = "https://github.com/dim-an/cod/"; license = licenses.asl20; maintainers = with maintainers; [ SuperSandro2000 ]; + broken = true; }; } diff --git a/third_party/nixpkgs/pkgs/tools/misc/diffoscope/default.nix b/third_party/nixpkgs/pkgs/tools/misc/diffoscope/default.nix index de8fdfdea5..d12b6ecf66 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 = "218"; + version = "219"; src = fetchurl { url = "https://diffoscope.org/archive/diffoscope-${version}.tar.bz2"; - sha256 = "sha256-W4adsal6l1TdlUhITNGnNUmYUIpEsOZRro2/SEdzV2Y="; + sha256 = "sha256-gD97/2Oyp4PQk63RDXv8l+2dgjqrq/JSmjcB846kP7c="; }; outputs = [ "out" "man" ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/dsq/default.nix b/third_party/nixpkgs/pkgs/tools/misc/dsq/default.nix index d9fe703f28..6aa22a7f64 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/dsq/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/dsq/default.nix @@ -56,8 +56,5 @@ buildGoModule rec { homepage = "https://github.com/multiprocessio/dsq"; license = licenses.asl20; maintainers = with maintainers; [ liff ]; - # TODO: Remove once nixpkgs uses macOS SDK 10.14+ for x86_64-darwin - # Undefined symbols for architecture x86_64: "_SecTrustEvaluateWithError" - broken = stdenv.isDarwin && stdenv.isx86_64; }; } diff --git a/third_party/nixpkgs/pkgs/tools/misc/dt-shell-color-scripts/default.nix b/third_party/nixpkgs/pkgs/tools/misc/dt-shell-color-scripts/default.nix index 6a0b3da441..4dedbd66b3 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/dt-shell-color-scripts/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/dt-shell-color-scripts/default.nix @@ -1,22 +1,23 @@ { stdenv , lib , fetchFromGitLab +, installShellFiles , runtimeShell , makeWrapper }: stdenv.mkDerivation { pname = "dt-shell-color-scripts"; - version = "unstable-2022-02-22"; + version = "unstable-2022-07-25"; src = fetchFromGitLab { owner = "dwt1"; repo = "shell-color-scripts"; - rev = "fcd013ea2e1ff80e01adbcea9d0eaf9c73db94c0"; - sha256 = "sha256-bd3NBf99rCiADUKQb6fzCBDaKBmYaZHcO4qokm/39do="; + rev = "da2e3c512b94f312ee54a38d5cde131b0511ad01"; + sha256 = "sha256-cdTgBbtsbJHaJuLIcZh0g0jKOrQyFx3P6QhYNx8hz0U="; }; - nativeBuildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper installShellFiles ]; installPhase = '' runHook preInstall @@ -25,6 +26,9 @@ stdenv.mkDerivation { mkdir -p $out/bin mkdir -p $out/opt/shell-color-scripts/ cp -r colorscripts $out/opt/shell-color-scripts/colorscripts + installManPage colorscript.1 + installShellCompletion --fish completions/colorscript.fish + installShellCompletion --zsh completions/_colorscript chmod +x colorscript.sh cp colorscript.sh $out/bin/colorscript substituteInPlace $out/bin/colorscript \ diff --git a/third_party/nixpkgs/pkgs/tools/misc/dua/default.nix b/third_party/nixpkgs/pkgs/tools/misc/dua/default.nix index 526eb705e4..33504df8d4 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/dua/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/dua/default.nix @@ -2,7 +2,7 @@ rustPlatform.buildRustPackage rec { pname = "dua"; - version = "2.17.7"; + version = "2.17.8"; buildInputs = lib.optionals stdenv.isDarwin [ libiconv Foundation ]; @@ -10,7 +10,7 @@ rustPlatform.buildRustPackage rec { owner = "Byron"; repo = "dua-cli"; rev = "v${version}"; - sha256 = "sha256-FiTjN4coOJZ3Uu9LfaJxcpvVKS+5MVYWQPmwllBh1Jg="; + sha256 = "sha256-zlXv5RY/JRDS2vzC/LhSumZX+OOeaFoOmLq5TaulGDY="; # Remove unicode file names which leads to different checksums on HFS+ # vs. other filesystems because of unicode normalisation. postFetch = '' @@ -18,7 +18,7 @@ rustPlatform.buildRustPackage rec { ''; }; - cargoSha256 = "sha256-xCHbS+D7ss85hklv9xftJTsctvQlAjkKtuJbTt5R8nM="; + cargoSha256 = "sha256-PSAhRUODedmJg67K00W0RQ5LycMme2bidL4L8gd6qkw="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/tools/misc/dust/default.nix b/third_party/nixpkgs/pkgs/tools/misc/dust/default.nix index 15ecf7dfe4..88498f9b5d 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.8.0"; + version = "0.8.1"; src = fetchFromGitHub { owner = "bootandy"; repo = "dust"; rev = "v${version}"; - sha256 = "sha256-qC8AlLyg8MU9ZON0hITTaM5AmRFZMOqJVt7PJ5fCtus="; + sha256 = "sha256-7hhg54x8EZ3x40a8kaOUzhyHDF0CJ5dZibGVvcFF9zk="; # Remove unicode file names which leads to different checksums on HFS+ # vs. other filesystems because of unicode normalisation. postFetch = '' @@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec { ''; }; - cargoSha256 = "sha256-XW6SIeEmHzicq8pbKJCPYZ5s6jl+kp6Bsjh2WIre4yo="; + cargoSha256 = "sha256-fbNP89xg0Di/p/y78C9kar3UKOqkAJ94rJqZOWK3Rp0="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/tools/misc/flitter/default.nix b/third_party/nixpkgs/pkgs/tools/misc/flitter/default.nix index 49903559c1..a46b3b72ab 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/flitter/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/flitter/default.nix @@ -20,11 +20,17 @@ ocamlPackages.buildDunePackage rec { sha256 = "1k3m7bjq5yrrq7vhnbdykni65dsqhq6knnv9wvwq3svb3n07z4w3"; }; + # compatibility with core >= 0.15 + patches = [ ./flitter.patch ]; + # https://github.com/alexozer/flitter/issues/28 postPatch = '' - for f in src/colors.ml src/duration.ml src/event_loop.ml src/splits.ml; do + for f in src/*.ml; do substituteInPlace "$f" \ - --replace 'Unix.gettimeofday' 'Caml_unix.gettimeofday' + --replace 'Unix.gettimeofday' 'Caml_unix.gettimeofday' \ + --replace 'Core_kernel' 'Core' \ + --replace 'sexp_option' 'option[@sexp.option]' \ + --replace 'sexp_list' 'list[@sexp.list]' done ''; @@ -33,7 +39,7 @@ ocamlPackages.buildDunePackage rec { ]; buildInputs = with ocamlPackages; [ - core + core_unix lwt_ppx sexp_pretty color diff --git a/third_party/nixpkgs/pkgs/tools/misc/flitter/flitter.patch b/third_party/nixpkgs/pkgs/tools/misc/flitter/flitter.patch new file mode 100644 index 0000000000..f59b8a22eb --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/misc/flitter/flitter.patch @@ -0,0 +1,13 @@ +diff --git a/src/dune b/src/dune +index a50b09a..54cc770 100644 +--- a/src/dune ++++ b/src/dune +@@ -1,7 +1,7 @@ + (library + (name flitter) + (wrapped false) +- (libraries core lwt.unix notty notty.unix re color sexp_pretty) ++ (libraries core core_kernel.caml_unix lwt.unix notty notty.unix re color sexp_pretty) + (preprocess (pps lwt_ppx ppx_sexp_conv)) + ) + diff --git a/third_party/nixpkgs/pkgs/tools/misc/fpart/default.nix b/third_party/nixpkgs/pkgs/tools/misc/fpart/default.nix index 40b6d80199..3158bec6d2 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/fpart/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/fpart/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "fpart"; - version = "1.4.0"; + version = "1.5.1"; src = fetchFromGitHub { owner = "martymac"; repo = "fpart"; rev = "${pname}-${version}"; - sha256 = "sha256-O+OV/uhehKMWhND3L7wtIL9lMUSN5bX2YRRD7ftcIGY="; + sha256 = "sha256-SULtbfUUzYgD/Q6wmgYSIldiGgk9MY4dr0hveTTMwvw="; }; nativeBuildInputs = [ autoreconfHook ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/grub/2.0x.nix b/third_party/nixpkgs/pkgs/tools/misc/grub/2.0x.nix index f45116ddf2..3849e26a01 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/grub/2.0x.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/grub/2.0x.nix @@ -90,7 +90,7 @@ stdenv.mkDerivation rec { hardeningDisable = [ "all" ]; - separateDebugInfo = true; + separateDebugInfo = !xenSupport; # Work around a bug in the generated flex lexer (upstream flex bug?) NIX_CFLAGS_COMPILE = "-Wno-error"; diff --git a/third_party/nixpkgs/pkgs/tools/misc/hdfview/0001-Hardcode-isUbuntu-false-to-avoid-hostname-dependency.patch b/third_party/nixpkgs/pkgs/tools/misc/hdfview/0001-Hardcode-isUbuntu-false-to-avoid-hostname-dependency.patch new file mode 100644 index 0000000000..fde26e0dca --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/misc/hdfview/0001-Hardcode-isUbuntu-false-to-avoid-hostname-dependency.patch @@ -0,0 +1,38 @@ +From e5eb394458e19ce8f8a231e8b2005c80c64fd426 Mon Sep 17 00:00:00 2001 +From: Jiajie Chen +Date: Fri, 15 Jul 2022 10:13:23 +0800 +Subject: [PATCH] Hardcode isUbuntu=false to avoid hostname dependency. + +The original build.xml detects whether the system is ubuntu based on its +hostname, which is useless in nixpkgs and brings additional dependency. + +As suggested by @risicle in #180613, we can simply hardcode isUbuntu to +false. + +Signed-off-by: Jiajie Chen +--- + build.xml | 8 +++----- + 1 file changed, 3 insertions(+), 5 deletions(-) + +diff --git a/build.xml b/build.xml +index c4f0974..15a6078 100644 +--- a/build.xml ++++ b/build.xml +@@ -143,11 +143,9 @@ + + + +- +- +- +- +- ++ ++ + +