From 58849dfc4f83f01254d8850db83b6e965496a446 Mon Sep 17 00:00:00 2001 From: Default email Date: Fri, 27 Aug 2021 16:25:00 +0200 Subject: [PATCH] Project import generated by Copybara. GitOrigin-RevId: 21c937f8cb1e6adcfeb36dfd6c90d9d9bfab1d28 --- .../doc/builders/packages/firefox.section.md | 7 +- .../doc/languages-frameworks/beam.section.md | 2 +- .../languages-frameworks/python.section.md | 30 + third_party/nixpkgs/lib/fixed-points.nix | 10 +- third_party/nixpkgs/lib/licenses.nix | 4 +- .../nixpkgs/maintainers/maintainer-list.nix | 18 + .../from_md/release-notes/rl-2111.section.xml | 39 + .../manual/release-notes/rl-2111.section.md | 12 + .../nixpkgs/nixos/lib/make-zfs-image.nix | 333 ++ .../scripts/ec2/amazon-image-zfs.nix | 12 + .../maintainers/scripts/ec2/amazon-image.nix | 115 +- .../nixos/modules/config/fonts/fonts.nix | 70 +- .../nixos/modules/config/users-groups.nix | 13 +- .../nixpkgs/nixos/modules/module-list.nix | 1 + .../nixpkgs/nixos/modules/programs/calls.nix | 25 + .../nixos/modules/services/misc/octoprint.nix | 3 + .../modules/services/monitoring/grafana.nix | 4 +- .../nixos/modules/system/boot/stage-1-init.sh | 2 +- .../nixos/modules/tasks/filesystems.nix | 2 + .../nixos/modules/tasks/filesystems/exfat.nix | 8 +- .../modules/virtualisation/amazon-image.nix | 10 +- .../modules/virtualisation/amazon-options.nix | 54 +- third_party/nixpkgs/nixos/release.nix | 14 + .../audio/spotify-tui/default.nix | 6 +- .../applications/backup/vorta/default.nix | 4 +- .../pkgs/applications/blockchains/erigon.nix | 8 +- .../blockchains/exodus/default.nix | 5 +- .../blockchains/go-ethereum/default.nix | 6 +- .../emacs/elisp-packages/elpa-generated.nix | 114 +- .../emacs/elisp-packages/elpa-packages.nix | 2 +- .../emacs/elisp-packages/org-generated.nix | 12 +- .../elisp-packages/recipes-archive-melpa.json | 3842 ++++++++++------- .../applications/editors/glow/default.nix | 2 +- .../applications/editors/micro/default.nix | 2 +- .../applications/editors/neovim/neovim-qt.nix | 3 +- .../applications/editors/rehex/default.nix | 4 +- .../applications/graphics/hydrus/default.nix | 4 +- .../applications/logging/humioctl/default.nix | 2 +- .../applications/misc/archiver/default.nix | 2 +- .../pkgs/applications/misc/charm/default.nix | 2 +- .../applications/misc/cointop/default.nix | 2 +- .../applications/misc/dbeaver/default.nix | 6 +- .../pkgs/applications/misc/dstask/default.nix | 10 +- .../applications/misc/expenses/default.nix | 4 +- .../misc/fbmenugen/0001-Fix-paths.patch | 29 +- .../applications/misc/fbmenugen/default.nix | 6 +- .../misc/joplin-desktop/default.nix | 6 +- .../pkgs/applications/misc/minder/default.nix | 61 +- .../applications/misc/nwg-drawer/default.nix | 4 +- .../pkgs/applications/misc/slides/default.nix | 6 +- .../pkgs/applications/misc/ttyper/default.nix | 22 + .../pkgs/applications/misc/wtf/default.nix | 2 +- .../browsers/chromium/upstream-info.json | 6 +- .../networking/browsers/firefox/wrapper.nix | 2 + .../applications/networking/calls/default.nix | 1 + .../networking/cloudflared/default.nix | 6 +- .../networking/cluster/argo/default.nix | 17 +- .../networking/cluster/argocd/default.nix | 15 +- .../cluster/cloudfoundry-cli/default.nix | 3 +- .../networking/cluster/fluxcd/default.nix | 2 +- .../networking/cluster/fluxctl/default.nix | 2 +- .../networking/cluster/helmfile/default.nix | 2 +- .../cluster/hetzner-kube/default.nix | 7 +- .../networking/cluster/istioctl/default.nix | 4 +- .../networking/cluster/jx/default.nix | 13 +- .../networking/cluster/k3s/default.nix | 7 +- .../networking/cluster/k9s/default.nix | 11 +- .../networking/cluster/kops/default.nix | 9 +- .../networking/cluster/kpt/default.nix | 2 +- .../cluster/kube-router/default.nix | 11 +- .../networking/cluster/kubeless/default.nix | 6 +- .../networking/cluster/kubelogin/default.nix | 9 +- .../networking/cluster/kubeseal/default.nix | 2 +- .../networking/cluster/kuttl/default.nix | 8 +- .../networking/cluster/lens/default.nix | 15 +- .../networking/cluster/minishift/default.nix | 11 +- .../networking/cluster/multus-cni/default.nix | 4 +- .../networking/cluster/popeye/default.nix | 11 +- .../networking/cluster/qbec/default.nix | 13 +- .../networking/cluster/sonobuoy/default.nix | 14 +- .../networking/cluster/stern/default.nix | 4 +- .../networking/cluster/tanka/default.nix | 2 +- .../networking/cluster/terragrunt/default.nix | 6 +- .../networking/cluster/tilt/default.nix | 2 +- .../networking/cluster/velero/default.nix | 13 +- .../networking/dnscontrol/default.nix | 2 +- .../applications/networking/gns3/server.nix | 20 +- .../pantalaimon/default.nix | 14 +- .../signal-desktop/default.nix | 4 +- .../telegram/tdesktop/default.nix | 106 +- .../irc/weechat/scripts/default.nix | 2 + .../irc/weechat/scripts/url_hint/default.nix | 28 + .../thunderbird-bin/release_sources.nix | 522 +-- .../mailreaders/thunderbird/packages.nix | 4 +- .../networking/nextdns/default.nix | 8 +- .../networking/seaweedfs/default.nix | 6 +- .../networking/shellhub-agent/default.nix | 2 +- .../applications/office/gnucash/default.nix | 12 +- .../applications/office/todoman/default.nix | 5 +- .../applications/office/trilium/default.nix | 6 +- .../applications/office/zotero/default.nix | 4 +- .../science/biology/fastp/default.nix | 4 +- .../science/biology/stacks/default.nix | 2 +- .../terminal-emulators/wezterm/default.nix | 2 +- .../git-and-tools/ghorg/default.nix | 2 +- .../git-and-tools/ghq/default.nix | 7 +- .../git-and-tools/git-bug/default.nix | 11 +- .../git-and-tools/git-chglog/default.nix | 3 +- .../git-delete-merged-branches/default.nix | 4 +- .../git-and-tools/gitui/default.nix | 6 +- .../git-and-tools/gst/default.nix | 56 + .../git-and-tools/lab/default.nix | 2 +- .../version-management/git-lfs/default.nix | 2 +- .../gitlab/gitlab-workhorse/default.nix | 2 +- .../version-management/sourcehut/core.nix | 4 +- .../version-management/sourcehut/meta.nix | 4 +- .../video/go-chromecast/default.nix | 2 +- .../pkgs/applications/video/mpv/default.nix | 8 +- .../pkgs/applications/video/mpv/wrapper.nix | 3 +- .../video/openshot-qt/default.nix | 4 +- .../virtualization/cri-o/default.nix | 4 +- .../virtualization/crun/default.nix | 4 +- .../virtualization/docker-slim/default.nix | 9 +- .../virtualization/docker/buildx.nix | 4 +- .../virtualization/docker/proxy.nix | 2 - .../virtualization/imgcrypt/default.nix | 4 +- .../nvidia-container-runtime/default.nix | 2 +- .../nvidia-container-toolkit/default.nix | 2 +- .../window-managers/qtile/default.nix | 4 +- .../pkgs/build-support/docker/default.nix | 7 + .../nixpkgs/pkgs/build-support/emacs/elpa.nix | 2 +- .../nixpkgs/pkgs/build-support/vm/default.nix | 4 +- .../nixpkgs/pkgs/build-support/vm/test.nix | 4 +- .../pkgs/build-support/writers/default.nix | 45 - .../pkgs/build-support/writers/test.nix | 26 - .../pkgs/data/themes/adwaita-qt/default.nix | 4 +- .../themes/marwaita-peppermint/default.nix | 9 +- .../pkgs/data/themes/nordic/default.nix | 34 +- .../compilers/binaryen/default.nix | 4 +- ...-emulate-clang-sysroot-include-logic.patch | 42 + .../compilers/emscripten/default.nix | 35 +- .../compilers/emscripten/package.json | 18 +- .../compilers/emscripten/yarn.lock | 792 +++- .../development/compilers/emscripten/yarn.nix | 872 +++- .../development/compilers/fstar/default.nix | 54 +- .../development/compilers/kotlin/default.nix | 4 +- .../development/compilers/llvm/10/default.nix | 2 +- .../development/compilers/llvm/11/default.nix | 2 +- .../development/compilers/llvm/12/default.nix | 2 +- .../development/compilers/llvm/13/default.nix | 2 +- .../compilers/llvm/13/libcxx/default.nix | 4 + .../compilers/llvm/13/llvm/default.nix | 14 + .../development/compilers/llvm/5/default.nix | 2 +- .../development/compilers/llvm/6/default.nix | 2 +- .../development/compilers/llvm/7/default.nix | 2 +- .../development/compilers/llvm/8/default.nix | 2 +- .../development/compilers/llvm/9/default.nix | 2 +- .../compilers/llvm/git/default.nix | 2 +- .../purescript/purescript/default.nix | 14 +- .../compilers/purescript/purescript/update.sh | 43 + .../embedded/arduino/arduino-cli/default.nix | 4 +- .../development/embedded/platformio/core.nix | 10 +- .../go-modules/generic/default.nix | 7 +- .../go-packages/generic/default.nix | 7 +- .../interpreters/clojure/default.nix | 4 +- .../interpreters/supercollider/default.nix | 4 +- .../development/libraries/cglm/default.nix | 4 +- .../development/libraries/folly/default.nix | 4 +- .../development/libraries/gdal/default.nix | 6 +- .../libraries/intel-gmmlib/default.nix | 4 +- .../development/libraries/lib3mf/default.nix | 4 +- .../libraries/libgnurl/default.nix | 8 +- .../libraries/libwebsockets/default.nix | 4 +- .../pkgs/development/libraries/openexr/3.nix | 4 +- .../libraries/openxr-loader/default.nix | 4 +- .../development/libraries/pupnp/default.nix | 4 +- .../development/libraries/tiledb/default.nix | 4 +- .../libraries/tinyobjloader/default.nix | 4 +- .../development/libraries/xmlsec/default.nix | 4 +- .../ocaml-modules/callipyge/default.nix | 36 + .../ocaml-modules/chacha/default.nix | 41 + .../ocaml-modules/integers/default.nix | 13 +- .../ocaml-modules/noise/default.nix | 60 + .../ocaml-modules/ocaml-lsp/default.nix | 4 +- .../ocaml-modules/ocaml-lsp/jsonrpc.nix | 4 +- .../ocaml-modules/ocaml-lsp/lsp.nix | 6 +- .../ocaml-print-intf/default.nix | 31 + .../development/ocaml-modules/pp/default.nix | 28 + .../ocaml-modules/ppx_cstubs/default.nix | 7 +- .../ocaml-modules/rfc7748/default.nix | 43 + .../development/ocaml-modules/vlq/default.nix | 25 + .../python-modules/Wand/default.nix | 4 +- .../python-modules/agate-sql/default.nix | 4 +- .../python-modules/ailment/default.nix | 4 +- .../python-modules/aioesphomeapi/default.nix | 4 +- .../python-modules/aioextensions/default.nix | 4 +- .../python-modules/aiofiles/default.nix | 35 +- .../python-modules/aioprocessing/default.nix | 10 +- .../python-modules/angr/default.nix | 4 +- .../python-modules/angrop/default.nix | 4 +- .../python-modules/anybadge/default.nix | 27 + .../python-modules/archinfo/default.nix | 4 +- .../python-modules/awesomeversion/default.nix | 4 +- .../python-modules/azure-batch/default.nix | 6 +- .../azure-eventgrid/default.nix | 4 +- .../azure-mgmt-apimanagement/default.nix | 4 +- .../azure-mgmt-compute/default.nix | 6 +- .../azure-mgmt-containerregistry/default.nix | 4 +- .../azure-mgmt-datamigration/default.nix | 4 +- .../azure-mgmt-iothub/default.nix | 4 +- .../azure-mgmt-loganalytics/default.nix | 8 +- .../azure-mgmt-media/default.nix | 6 +- .../default.nix | 6 +- .../azure-mgmt-resource/default.nix | 4 +- .../python-modules/azure-mgmt-sql/default.nix | 6 +- .../python-modules/azure-mgmt-web/default.nix | 4 +- .../azure-synapse-accesscontrol/default.nix | 7 +- .../azure-synapse-artifacts/default.nix | 7 +- .../azure-synapse-spark/default.nix | 4 +- .../python-modules/babelfish/default.nix | 10 +- .../python-modules/bids-validator/default.nix | 4 +- .../bimmer-connected/default.nix | 4 +- .../python-modules/bitarray/default.nix | 4 +- .../python-modules/bleach/default.nix | 4 +- .../python-modules/censys/default.nix | 8 +- .../python-modules/cfgv/default.nix | 4 +- .../python-modules/cirq-google/default.nix | 4 +- .../python-modules/claripy/default.nix | 4 +- .../python-modules/cle/default.nix | 4 +- .../click-help-colors/default.nix | 10 +- .../python-modules/cma/default.nix | 4 +- .../python-modules/codecov/default.nix | 46 +- .../python-modules/coveralls/default.nix | 4 +- .../python-modules/databases/default.nix | 17 +- .../python-modules/databricks-cli/default.nix | 4 +- .../databricks-connect/default.nix | 4 +- .../dataclasses-json/default.nix | 6 +- .../python-modules/debian/default.nix | 19 +- .../django-auth-ldap/default.nix | 6 +- .../python-modules/django-ipware/default.nix | 20 +- .../python-modules/django-q/default.nix | 4 +- .../django-versatileimagefield/default.nix | 7 +- .../django-webpack-loader/default.nix | 4 +- .../python-modules/django_redis/default.nix | 24 +- .../django_reversion/default.nix | 8 +- .../python-modules/djangoql/default.nix | 4 +- .../python-modules/dockerspawner/default.nix | 4 +- .../python-modules/dropbox/default.nix | 14 +- .../python-modules/dulwich/default.nix | 4 +- .../python-modules/elasticsearch/default.nix | 4 +- .../python-modules/feedgenerator/default.nix | 37 +- .../flask-jwt-extended/default.nix | 4 +- .../python-modules/flexmock/default.nix | 4 +- .../python-modules/flower/default.nix | 4 +- .../google-api-core/default.nix | 11 +- .../python-modules/google-auth/default.nix | 6 +- .../default.nix | 13 +- .../google-cloud-audit-log/default.nix | 25 + .../google-cloud-bigquery/default.nix | 10 +- .../google-cloud-core/default.nix | 4 +- .../google-cloud-firestore/default.nix | 6 +- .../google-cloud-logging/default.nix | 10 +- .../google-cloud-spanner/default.nix | 13 +- .../google-resumable-media/default.nix | 4 +- .../python-modules/gradient-utils/default.nix | 7 +- .../python-modules/hap-python/default.nix | 9 +- .../python-modules/hmmlearn/default.nix | 4 +- .../python-modules/holoviews/default.nix | 6 +- .../python-modules/hydra/default.nix | 28 +- .../python-modules/inform/default.nix | 15 +- .../python-modules/itemadapter/default.nix | 4 +- .../development/python-modules/jc/default.nix | 4 +- .../jenkins-job-builder/default.nix | 4 +- .../development/python-modules/jq/default.nix | 4 +- .../python-modules/junos-eznc/default.nix | 6 +- .../jupyter-repo2docker/default.nix | 4 +- .../python-modules/jupyter_server/default.nix | 4 +- .../python-modules/jupyterhub/default.nix | 4 +- .../python-modules/jupyterlab/default.nix | 4 +- .../jupyterlab_server/default.nix | 4 +- .../python-modules/jwcrypto/default.nix | 4 +- .../karton-dashboard/default.nix | 6 +- .../python-modules/limnoria/default.nix | 11 +- .../python-modules/mecab-python3/default.nix | 4 +- .../python-modules/mpldatacursor/default.nix | 31 + .../python-modules/msal/default.nix | 4 +- .../python-modules/nbsphinx/default.nix | 4 +- .../python-modules/networkx/default.nix | 4 +- .../development/python-modules/notebook/2.nix | 4 +- .../python-modules/notebook/default.nix | 4 +- .../python-modules/omegaconf/default.nix | 24 +- .../python-modules/onnx/default.nix | 5 +- .../python-modules/parse-type/default.nix | 45 +- .../python-modules/parsedatetime/default.nix | 3 +- .../python-modules/pdftotext/default.nix | 4 +- .../python-modules/pelican/default.nix | 93 +- .../python-modules/perfplot/default.nix | 6 +- .../python-modules/pex/default.nix | 4 +- .../python-modules/phonenumbers/default.nix | 4 +- .../python-modules/phonopy/default.nix | 4 +- .../python-modules/premailer/default.nix | 4 +- .../python-modules/progress/default.nix | 4 +- .../prometheus-client/default.nix | 29 + .../prometheus-flask-exporter/default.nix | 4 +- .../prometheus_client/default.nix | 19 - .../py-air-control-exporter/default.nix | 4 +- .../pyTelegramBotAPI/default.nix | 4 +- .../python-modules/pyacoustid/default.nix | 11 +- .../python-modules/pyaml/default.nix | 19 +- .../pybtex-docutils/default.nix | 4 +- .../python-modules/pycuda/default.nix | 4 +- .../python-modules/pyee/default.nix | 39 +- .../python-modules/pyflume/default.nix | 16 - .../python-modules/pymatgen/default.nix | 4 +- .../python-modules/pymbolic/default.nix | 4 +- .../python-modules/pymemcache/default.nix | 4 +- .../python-modules/pymunk/default.nix | 6 +- .../python-modules/pymupdf/default.nix | 11 +- .../python-modules/pymupdf/nix-support.patch | 17 - .../python-modules/pyodbc/default.nix | 8 +- .../python-modules/pyrad/default.nix | 8 +- .../python-modules/pysmappee/default.nix | 7 +- .../python-modules/pysyncthru/default.nix | 4 +- .../python-modules/pytest-qt/default.nix | 4 +- .../python-engineio/default.nix | 4 +- .../python-json-logger/default.nix | 4 +- .../python-socketio/default.nix | 4 +- .../python-modules/pytools/default.nix | 4 +- .../python-modules/pyvex/default.nix | 4 +- .../python-modules/pyviz-comms/default.nix | 6 +- .../python-modules/qtawesome/default.nix | 4 +- .../python-modules/qtconsole/default.nix | 4 +- .../python-modules/rapidfuzz/default.nix | 4 +- .../python-modules/ring-doorbell/default.nix | 4 +- .../python-modules/ripser/default.nix | 4 +- .../development/python-modules/rq/default.nix | 6 +- .../python-modules/scikit-build/default.nix | 4 +- .../python-modules/scikit-fmm/default.nix | 4 +- .../python-modules/seaborn/default.nix | 4 +- .../python-modules/sendgrid/default.nix | 4 +- .../python-modules/slack-sdk/default.nix | 4 +- .../python-modules/smbprotocol/default.nix | 4 +- .../snowflake-connector-python/default.nix | 14 +- .../snowflake-sqlalchemy/default.nix | 4 +- .../python-modules/somajo/default.nix | 4 +- .../python-modules/sopel/default.nix | 4 +- .../python-modules/sounddevice/default.nix | 6 +- .../python-modules/stravalib/default.nix | 4 +- .../python-modules/strictyaml/default.nix | 4 +- .../python-modules/stripe/default.nix | 16 +- .../python-modules/tenacity/default.nix | 4 +- .../tensorboard-data-server/default.nix | 25 + .../python-modules/tensorboardx/default.nix | 4 +- .../tensorflow-tensorboard/default.nix | 42 +- .../python-modules/testfixtures/default.nix | 4 +- .../python-modules/titlecase/default.nix | 16 +- .../python-modules/tokenizers/default.nix | 12 +- .../virtualenv-clone/default.nix | 35 +- .../python-modules/websockify/default.nix | 11 +- .../python-modules/west/default.nix | 4 +- .../python-modules/wurlitzer/default.nix | 4 +- .../python-modules/yamllint/default.nix | 4 +- .../python-modules/zeroc-ice/default.nix | 6 +- .../tools/analysis/dotenv-linter/default.nix | 6 +- .../development/tools/bazelisk/default.nix | 2 +- .../pkgs/development/tools/buf/default.nix | 6 +- .../build-managers/apache-maven/default.nix | 4 +- .../bazel/buildtools/default.nix | 2 +- .../tools/build-managers/mage/default.nix | 3 +- .../development/tools/buildpack/default.nix | 2 +- .../pkgs/development/tools/butane/default.nix | 6 +- .../development/tools/cloud-nuke/default.nix | 8 +- .../development/tools/conftest/default.nix | 3 +- .../default.nix | 7 +- .../buildkite-cli/default.nix | 2 +- .../continuous-integration/fly/default.nix | 7 +- .../gitlab-runner/default.nix | 11 +- .../pkgs/development/tools/cue/default.nix | 4 +- .../pkgs/development/tools/dep/default.nix | 2 +- .../pkgs/development/tools/dive/default.nix | 2 +- .../development/tools/earthly/default.nix | 12 +- .../development/tools/esbuild/default.nix | 4 +- .../development/tools/fission/default.nix | 2 +- .../development/tools/github/bump/default.nix | 5 +- .../pkgs/development/tools/glide/default.nix | 7 +- .../development/tools/go-minimock/default.nix | 4 +- .../development/tools/go-swagger/default.nix | 2 +- .../development/tools/go-task/default.nix | 4 +- .../development/tools/gomplate/default.nix | 3 +- .../pkgs/development/tools/gopkgs/deps.nix | 21 - .../pkgs/development/tools/gosec/default.nix | 3 +- .../development/tools/gotestsum/default.nix | 2 +- .../pkgs/development/tools/hcloud/default.nix | 2 +- .../tools/jsonnet-bundler/default.nix | 2 +- .../development/tools/kube-aws/default.nix | 6 +- .../development/tools/kubepug/default.nix | 6 +- .../development/tools/kustomize/default.nix | 18 +- .../development/tools/lazygit/default.nix | 2 +- .../tools/misc/circleci-cli/default.nix | 2 +- .../development/tools/misc/jiq/default.nix | 6 +- .../development/tools/misc/k2tf/default.nix | 2 +- .../tools/misc/linuxkit/default.nix | 2 +- .../development/tools/misc/mkcert/default.nix | 6 +- .../tools/misc/reviewdog/default.nix | 2 +- .../tools/misc/terracognita/default.nix | 2 +- .../tools/misc/terraform-ls/default.nix | 6 +- .../tools/misc/terraform-lsp/default.nix | 2 +- .../development/tools/renderizer/default.nix | 4 +- .../tools/rust/rust-analyzer/default.nix | 10 +- .../ignore-git-and-rustfmt-tests.patch | 18 + .../development/tools/skaffold/default.nix | 13 +- .../development/tools/tf2pulumi/default.nix | 6 +- .../development/tools/toxiproxy/default.nix | 2 +- .../development/tools/vultr-cli/default.nix | 4 +- .../pkgs/development/tools/yj/default.nix | 2 +- .../pkgs/development/web/flyctl/default.nix | 2 +- .../pkgs/development/web/minify/default.nix | 2 +- .../pkgs/development/web/nodejs/v16.nix | 4 +- .../pkgs/games/lgogdownloader/default.nix | 4 +- .../pkgs/misc/vim-plugins/generated.nix | 144 +- .../pkgs/misc/vim-plugins/vim-plugin-names | 1 + .../pkgs/misc/vscode-extensions/default.nix | 16 +- .../os-specific/darwin/smimesign/default.nix | 2 +- .../os-specific/linux/iotop-c/default.nix | 4 +- .../os-specific/linux/kernel/linux-zen.nix | 4 +- .../linux/raspberrypi-eeprom/default.nix | 1 + third_party/nixpkgs/pkgs/pkgs-lib/formats.nix | 29 +- .../nixpkgs/pkgs/pkgs-lib/tests/formats.nix | 26 +- .../pkgs/servers/blockbook/default.nix | 11 +- .../nixpkgs/pkgs/servers/cayley/default.nix | 7 +- .../nixpkgs/pkgs/servers/dex/default.nix | 4 +- .../nixpkgs/pkgs/servers/gotify/default.nix | 4 +- .../nixpkgs/pkgs/servers/hasura/cli.nix | 10 +- .../pkgs/servers/headscale/default.nix | 4 +- .../home-assistant/component-packages.nix | 2 +- .../pkgs/servers/home-assistant/default.nix | 5 - .../pkgs/servers/http/pomerium/default.nix | 4 +- .../nixpkgs/pkgs/servers/keycloak/default.nix | 4 +- .../nixpkgs/pkgs/servers/maddy/default.nix | 2 +- .../pkgs/servers/mail/mailhog/default.nix | 2 +- .../pkgs/servers/matrix-corporal/default.nix | 4 +- .../pkgs/servers/matrix-synapse/default.nix | 2 +- .../pkgs/servers/mattermost/default.nix | 7 +- .../pkgs/servers/mautrix-signal/default.nix | 2 +- .../nixpkgs/pkgs/servers/miniflux/default.nix | 6 +- .../nixpkgs/pkgs/servers/minio/default.nix | 6 +- .../pkgs/servers/misc/gobgpd/default.nix | 7 +- .../alertmanager-irc-relay/default.nix | 2 +- .../servers/monitoring/cadvisor/default.nix | 2 +- .../servers/monitoring/do-agent/default.nix | 7 +- .../servers/monitoring/grafana/default.nix | 6 +- .../monitoring/mackerel-agent/default.nix | 9 +- .../pkgs/servers/monitoring/mtail/default.nix | 4 +- .../monitoring/prometheus/alertmanager.nix | 17 +- .../prometheus/artifactory-exporter.nix | 15 +- .../prometheus/bitcoin-exporter.nix | 2 +- .../monitoring/prometheus/kea-exporter.nix | 2 +- .../monitoring/prometheus/knot-exporter.nix | 2 +- .../monitoring/prometheus/mysqld-exporter.nix | 16 +- .../monitoring/prometheus/nginx-exporter.nix | 4 +- .../prometheus/openldap-exporter.nix | 11 +- .../monitoring/prometheus/promscale.nix | 2 +- .../monitoring/prometheus/pushgateway.nix | 17 +- .../monitoring/prometheus/redis-exporter.nix | 11 +- .../prometheus/smokeping-prober.nix | 4 +- .../monitoring/prometheus/tor-exporter.nix | 2 +- .../monitoring/prometheus/xmpp-alerts.nix | 2 +- .../servers/monitoring/sensu-go/default.nix | 11 +- .../servers/monitoring/thanos/default.nix | 21 +- .../monitoring/unifi-poller/default.nix | 14 +- .../pkgs/servers/nosql/influxdb/default.nix | 2 +- .../servers/nosql/victoriametrics/default.nix | 2 +- .../pkgs/servers/oauth2-proxy/default.nix | 2 +- .../nixpkgs/pkgs/servers/ombi/default.nix | 8 +- .../pkgs/servers/pg_featureserv/default.nix | 2 +- .../pkgs/servers/pg_tileserv/default.nix | 2 +- .../nixpkgs/pkgs/servers/reproxy/default.nix | 4 +- .../servers/rtsp-simple-server/default.nix | 8 +- .../nixpkgs/pkgs/servers/tegola/default.nix | 2 +- .../nixpkgs/pkgs/servers/teleport/default.nix | 4 +- .../pkgs/servers/tvheadend/default.nix | 4 +- .../pkgs/servers/web-apps/matomo/default.nix | 10 +- .../nixpkgs/pkgs/servers/xandikos/default.nix | 2 +- .../pkgs/shells/bash/bash-5.1-patches.nix | 4 + .../pkgs/shells/bash/update-patch-set.sh | 28 +- .../nixpkgs/pkgs/shells/elvish/default.nix | 2 +- .../nixpkgs/pkgs/shells/nushell/default.nix | 6 +- .../pkgs/shells/zsh/antibody/default.nix | 2 +- .../pkgs/tools/admin/aws-vault/default.nix | 7 +- .../pkgs/tools/admin/awsweeper/default.nix | 2 +- .../pkgs/tools/admin/chamber/default.nix | 2 +- .../pkgs/tools/admin/credhub-cli/default.nix | 3 +- .../pkgs/tools/admin/exoscale-cli/default.nix | 2 +- .../pkgs/tools/admin/fioctl/default.nix | 10 +- .../nixpkgs/pkgs/tools/admin/iamy/default.nix | 6 +- .../nixpkgs/pkgs/tools/admin/lego/default.nix | 4 +- .../pkgs/tools/admin/ossutil/default.nix | 33 + .../pkgs/tools/admin/ssmsh/default.nix | 2 +- .../pkgs/tools/backup/kopia/default.nix | 9 +- .../pkgs/tools/compression/xdelta/default.nix | 2 +- .../tools/filesystems/gcsfuse/default.nix | 2 +- .../tools/filesystems/gocryptfs/default.nix | 11 +- .../tools/graphics/astc-encoder/default.nix | 4 +- .../pkgs/tools/graphics/lsix/default.nix | 4 +- .../pkgs/tools/misc/chezmoi/default.nix | 4 +- .../tools/misc/cloud-sql-proxy/default.nix | 2 +- .../tools/misc/complete-alias/default.nix | 4 +- .../pkgs/tools/misc/dashing/default.nix | 2 +- .../pkgs/tools/misc/dateutils/default.nix | 4 +- .../pkgs/tools/misc/disfetch/default.nix | 4 +- .../nixpkgs/pkgs/tools/misc/duf/default.nix | 2 +- .../pkgs/tools/misc/dutree/default.nix | 22 + .../pkgs/tools/misc/esphome/default.nix | 4 +- .../pkgs/tools/misc/flexoptix-app/default.nix | 29 +- .../nixpkgs/pkgs/tools/misc/fwup/default.nix | 2 +- .../pkgs/tools/misc/gh-ost/default.nix | 2 +- .../pkgs/tools/misc/git-town/default.nix | 3 +- .../pkgs/tools/misc/goreleaser/default.nix | 3 +- .../pkgs/tools/misc/gotify-cli/default.nix | 4 +- .../pkgs/tools/misc/infracost/default.nix | 6 +- .../nixpkgs/pkgs/tools/misc/lf/default.nix | 2 +- .../nixpkgs/pkgs/tools/misc/mc/default.nix | 4 +- .../pkgs/tools/misc/microplane/default.nix | 6 +- .../pkgs/tools/misc/miniserve/default.nix | 6 +- .../pkgs/tools/misc/pgcenter/default.nix | 2 +- .../pkgs/tools/misc/pgmetrics/default.nix | 2 +- .../pkgs/tools/misc/pistol/default.nix | 2 +- .../pkgs/tools/misc/starship/default.nix | 6 +- .../pkgs/tools/misc/staruml/default.nix | 49 +- .../pkgs/tools/misc/systrayhelper/default.nix | 14 +- .../nixpkgs/pkgs/tools/misc/tfk8s/default.nix | 3 +- .../nixpkgs/pkgs/tools/misc/vsh/default.nix | 2 +- .../pkgs/tools/misc/yt-dlp/default.nix | 6 +- .../tools/networking/cassowary/default.nix | 2 +- .../pkgs/tools/networking/chisel/default.nix | 2 +- .../pkgs/tools/networking/clash/default.nix | 3 +- .../networking/dd-agent/integrations-core.nix | 2 +- .../pkgs/tools/networking/gobgp/default.nix | 7 +- .../pkgs/tools/networking/grpcui/default.nix | 2 +- .../pkgs/tools/networking/grpcurl/default.nix | 2 +- .../pkgs/tools/networking/hp2p/default.nix | 38 + .../pkgs/tools/networking/hp2p/python3.patch | 120 + .../tools/networking/inetutils/default.nix | 11 +- .../networking/inetutils/service-name.patch | 11 - .../whois-Update-Canadian-TLD-server.patch | 27 - .../whois-Update-Indian-TLD-server.patch | 25 + .../whois-Update-ORG-TLD-server.patch | 38 + .../pkgs/tools/networking/nebula/default.nix | 2 +- .../pkgs/tools/networking/s5cmd/default.nix | 4 +- .../tools/networking/shadowfox/default.nix | 4 +- .../networking/telepresence2/default.nix | 6 +- .../tools/networking/termshark/default.nix | 7 +- .../tools/networking/yggdrasil/default.nix | 11 +- .../package-management/holo-build/default.nix | 2 +- .../package-management/micromamba/default.nix | 41 +- .../package-management/morph/default.nix | 8 +- .../tools/package-management/morph/deps.nix | 66 - .../tools/package-management/nfpm/default.nix | 2 +- .../aws-iam-authenticator/default.nix | 2 +- .../pkgs/tools/security/cfssl/default.nix | 9 +- .../pkgs/tools/security/cosign/default.nix | 6 +- .../pkgs/tools/security/doppler/default.nix | 2 +- .../pkgs/tools/security/gopass/default.nix | 2 +- .../tools/security/gopass/git-credential.nix | 8 +- .../pkgs/tools/security/gopass/jsonapi.nix | 8 +- .../pkgs/tools/security/grype/default.nix | 6 +- .../pkgs/tools/security/httpx/default.nix | 6 +- .../tools/security/keycard-cli/default.nix | 3 +- .../pkgs/tools/security/minica/default.nix | 7 +- .../pkgs/tools/security/quill/default.nix | 6 +- .../pkgs/tools/security/saml2aws/default.nix | 12 +- .../pkgs/tools/security/step-ca/default.nix | 8 +- .../pkgs/tools/security/subjs/default.nix | 2 +- .../pkgs/tools/security/terrascan/default.nix | 6 +- .../pkgs/tools/system/collectd/plugins.nix | 377 +- .../pkgs/tools/system/ctop/default.nix | 2 +- .../pkgs/tools/system/hostctl/default.nix | 3 +- .../pkgs/tools/system/netdata/go.d.plugin.nix | 2 +- .../nixpkgs/pkgs/tools/text/gucci/default.nix | 7 +- .../nixpkgs/pkgs/tools/text/mark/default.nix | 2 +- .../nixpkgs/pkgs/tools/text/runiq/default.nix | 20 + .../pkgs/tools/text/snippetpixie/default.nix | 4 +- .../nixpkgs/pkgs/tools/text/vale/default.nix | 2 +- .../tools/typesetting/bibclean/default.nix | 4 +- .../tools/typesetting/soupault/default.nix | 41 + .../virtualization/distrobuilder/deps.nix | 228 - .../google-compute-engine/default.nix | 91 +- .../virtualization/linode-cli/default.nix | 8 +- .../tools/virtualization/shipyard/default.nix | 4 +- .../nixpkgs/pkgs/top-level/all-packages.nix | 37 +- .../pkgs/top-level/emscripten-packages.nix | 9 +- .../nixpkgs/pkgs/top-level/ocaml-packages.nix | 14 + .../nixpkgs/pkgs/top-level/perl-packages.nix | 44 +- .../nixpkgs/pkgs/top-level/python-aliases.nix | 3 +- .../pkgs/top-level/python-packages.nix | 10 +- 595 files changed, 8075 insertions(+), 4644 deletions(-) create mode 100644 third_party/nixpkgs/nixos/lib/make-zfs-image.nix create mode 100644 third_party/nixpkgs/nixos/maintainers/scripts/ec2/amazon-image-zfs.nix create mode 100644 third_party/nixpkgs/nixos/modules/programs/calls.nix create mode 100644 third_party/nixpkgs/pkgs/applications/misc/ttyper/default.nix create mode 100644 third_party/nixpkgs/pkgs/applications/networking/irc/weechat/scripts/url_hint/default.nix create mode 100644 third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/gst/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/compilers/emscripten/0001-emulate-clang-sysroot-include-logic.patch create mode 100755 third_party/nixpkgs/pkgs/development/compilers/purescript/purescript/update.sh create mode 100644 third_party/nixpkgs/pkgs/development/ocaml-modules/callipyge/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/ocaml-modules/chacha/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/ocaml-modules/noise/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/ocaml-modules/ocaml-print-intf/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/ocaml-modules/pp/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/ocaml-modules/rfc7748/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/ocaml-modules/vlq/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/anybadge/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/google-cloud-audit-log/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/mpldatacursor/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/prometheus-client/default.nix delete mode 100644 third_party/nixpkgs/pkgs/development/python-modules/prometheus_client/default.nix delete mode 100644 third_party/nixpkgs/pkgs/development/python-modules/pymupdf/nix-support.patch create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/tensorboard-data-server/default.nix delete mode 100644 third_party/nixpkgs/pkgs/development/tools/gopkgs/deps.nix create mode 100644 third_party/nixpkgs/pkgs/development/tools/rust/rust-analyzer/ignore-git-and-rustfmt-tests.patch create mode 100644 third_party/nixpkgs/pkgs/tools/admin/ossutil/default.nix create mode 100644 third_party/nixpkgs/pkgs/tools/misc/dutree/default.nix create mode 100644 third_party/nixpkgs/pkgs/tools/networking/hp2p/default.nix create mode 100644 third_party/nixpkgs/pkgs/tools/networking/hp2p/python3.patch delete mode 100644 third_party/nixpkgs/pkgs/tools/networking/inetutils/service-name.patch delete mode 100644 third_party/nixpkgs/pkgs/tools/networking/inetutils/whois-Update-Canadian-TLD-server.patch create mode 100644 third_party/nixpkgs/pkgs/tools/networking/inetutils/whois-Update-Indian-TLD-server.patch create mode 100644 third_party/nixpkgs/pkgs/tools/networking/inetutils/whois-Update-ORG-TLD-server.patch delete mode 100644 third_party/nixpkgs/pkgs/tools/package-management/morph/deps.nix create mode 100644 third_party/nixpkgs/pkgs/tools/text/runiq/default.nix create mode 100644 third_party/nixpkgs/pkgs/tools/typesetting/soupault/default.nix delete mode 100644 third_party/nixpkgs/pkgs/tools/virtualization/distrobuilder/deps.nix diff --git a/third_party/nixpkgs/doc/builders/packages/firefox.section.md b/third_party/nixpkgs/doc/builders/packages/firefox.section.md index b7c430db23..d6426981da 100644 --- a/third_party/nixpkgs/doc/builders/packages/firefox.section.md +++ b/third_party/nixpkgs/doc/builders/packages/firefox.section.md @@ -2,11 +2,12 @@ ## Build wrapped Firefox with extensions and policies {#build-wrapped-firefox-with-extensions-and-policies} -The `wrapFirefox` function allows to pass policies, preferences and extension that are available to firefox. With the help of `fetchFirefoxAddon` this allows build a firefox version that already comes with addons pre-installed: +The `wrapFirefox` function allows to pass policies, preferences and extension that are available to Firefox. With the help of `fetchFirefoxAddon` this allows build a Firefox version that already comes with addons pre-installed: ```nix { - myFirefox = wrapFirefox firefox-unwrapped { + # Nix firefox addons only work with the firefox-esr package. + myFirefox = wrapFirefox firefox-esr-unwrapped { nixExtensions = [ (fetchFirefoxAddon { name = "ublock"; # Has to be unique! @@ -45,5 +46,7 @@ or type into the Firefox url bar: `about:policies#documentation`. Nix installed addons do not have a valid signature, which is why signature verification is disabled. This does not compromise security because downloaded addons are checksumed and manual addons can't be installed. Also make sure that the `name` field of fetchFirefoxAddon is unique. If you remove an addon from the nixExtensions array, rebuild and start Firefox the removed addon will be completly removed with all of its settings. ## Troubleshooting {#sec-firefox-troubleshooting} +If addons are marked as broken or the signature is invalid, make sure you have Firefox ESR installed. Normal Firefox does not provide the ability anymore to disable signature verification for addons thus nix addons get disabled by the normal Firefox binary. + If addons do not appear installed although they have been defined in your nix configuration file reset the local addon state of your Firefox profile by clicking `help -> restart with addons disabled -> restart -> refresh firefox`. This can happen if you switch from manual addon mode to nix addon mode and then back to manual mode and then again to nix addon mode. diff --git a/third_party/nixpkgs/doc/languages-frameworks/beam.section.md b/third_party/nixpkgs/doc/languages-frameworks/beam.section.md index 934e6cdca1..08abd4588c 100644 --- a/third_party/nixpkgs/doc/languages-frameworks/beam.section.md +++ b/third_party/nixpkgs/doc/languages-frameworks/beam.section.md @@ -212,7 +212,7 @@ in Usually, we need to create a `shell.nix` file and do our development inside of the environment specified therein. Just install your version of Erlang and any other interpreters, and then use your normal build tools. As an example with Elixir: ```nix -{ pkgs ? import " {} }: +{ pkgs ? import {} }: with pkgs; diff --git a/third_party/nixpkgs/doc/languages-frameworks/python.section.md b/third_party/nixpkgs/doc/languages-frameworks/python.section.md index 53df328f8d..987ea1af9d 100644 --- a/third_party/nixpkgs/doc/languages-frameworks/python.section.md +++ b/third_party/nixpkgs/doc/languages-frameworks/python.section.md @@ -1602,3 +1602,33 @@ The following rules are desired to be respected: If necessary, `pname` has to be given a different value within `fetchPypi`. * Attribute names in `python-packages.nix` should be sorted alphanumerically to avoid merge conflicts and ease locating attributes. + +## Package set maintenance + +The whole Python package set has a lot of packages that do not see regular +updates, because they either are a very fragile component in the Python +ecosystem, like for example the `hypothesis` package, or packages that have +no maintainer, so maintenance falls back to the package set maintainers. + +### Updating packages in bulk + +There is a tool to update alot of python libraries in bulk, it exists at +`maintainers/scripts/update-python-libraries` with this repository. + +It can quickly update minor or major versions for all packages selected +and create update commits, and supports the `fetchPypi`, `fetchurl` and +`fetchFromGitHub` fetchers. When updating lots of packages that are +hosted on GitHub, exporting a `GITHUB_API_TOKEN` is highly recommended. + +Updating packages in bulk leads to lots of breakages, which is why a +stabilization period on the `python-unstable` branch is required. + +Once the branch is sufficiently stable it should normally be merged +into the `staging` branch. + +An exemplary call to update all python libraries between minor versions +would be: + +```ShellSession +$ maintainers/scripts/update-python-libraries --target minor --commit --use-pkgs-prefix pkgs/development/python-modules/**/default.nix +``` diff --git a/third_party/nixpkgs/lib/fixed-points.nix b/third_party/nixpkgs/lib/fixed-points.nix index f998bc74e1..bf1567a22a 100644 --- a/third_party/nixpkgs/lib/fixed-points.nix +++ b/third_party/nixpkgs/lib/fixed-points.nix @@ -72,10 +72,10 @@ rec { # into one where changes made in the first are available in the # 'super' of the second composeExtensions = - f: g: self: super: - let fApplied = f self super; - super' = super // fApplied; - in fApplied // g self super'; + f: g: final: prev: + let fApplied = f final prev; + prev' = prev // fApplied; + in fApplied // g final prev'; # Compose several extending functions of the type expected by 'extends' into # one where changes made in preceding functions are made available to @@ -84,7 +84,7 @@ rec { # composeManyExtensions : [packageSet -> packageSet -> packageSet] -> packageSet -> packageSet -> packageSet # ^final ^prev ^overrides ^final ^prev ^overrides composeManyExtensions = - lib.foldr (x: y: composeExtensions x y) (self: super: {}); + lib.foldr (x: y: composeExtensions x y) (final: prev: {}); # Create an overridable, recursive attribute set. For example: # diff --git a/third_party/nixpkgs/lib/licenses.nix b/third_party/nixpkgs/lib/licenses.nix index 57939308c3..772985f950 100644 --- a/third_party/nixpkgs/lib/licenses.nix +++ b/third_party/nixpkgs/lib/licenses.nix @@ -452,13 +452,13 @@ in mkLicense lset) ({ inria-compcert = { fullName = "INRIA Non-Commercial License Agreement for the CompCert verified compiler"; - url = "http://compcert.inria.fr/doc/LICENSE"; # https is broken + url = "https://compcert.org/doc/LICENSE.txt"; free = false; }; inria-icesl = { fullName = "INRIA Non-Commercial License Agreement for IceSL"; - url = "http://shapeforge.loria.fr/icesl/EULA_IceSL_binary.pdf"; # https is broken + url = "https://icesl.loria.fr/assets/pdf/EULA_IceSL_binary.pdf"; free = false; }; diff --git a/third_party/nixpkgs/maintainers/maintainer-list.nix b/third_party/nixpkgs/maintainers/maintainer-list.nix index 9af63ce02e..43968e4d80 100644 --- a/third_party/nixpkgs/maintainers/maintainer-list.nix +++ b/third_party/nixpkgs/maintainers/maintainer-list.nix @@ -5314,6 +5314,12 @@ githubId = 20675; name = "Joël Perras"; }; + jpetrucciani = { + email = "j@cobi.dev"; + github = "jpetrucciani"; + githubId = 8117202; + name = "Jacobi Petrucciani"; + }; jpierre03 = { email = "nix@prunetwork.fr"; github = "jpierre03"; @@ -7649,6 +7655,12 @@ githubId = 628342; name = "Tim Steinbach"; }; + nerdypepper = { + email = "nerdy@peppe.rs"; + github = "nerdypepper"; + githubId = 23743547; + name = "Akshay Oppiliappan"; + }; nessdoor = { name = "Tomas Antonio Lopez"; email = "entropy.overseer@protonmail.com"; @@ -9730,6 +9742,12 @@ githubId = 1567527; name = "Sebastian Hyberts"; }; + sebbel = { + email = "hej@sebastian-ball.de"; + github = "sebbel"; + githubId = 1940568; + name = "Sebastian Ball"; + }; sebtm = { email = "mail@sebastian-sellmeier.de"; github = "sebtm"; diff --git a/third_party/nixpkgs/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml b/third_party/nixpkgs/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml index 65abc8ac48..b922f9f120 100644 --- a/third_party/nixpkgs/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml +++ b/third_party/nixpkgs/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml @@ -302,6 +302,12 @@ Superuser created successfully. from 1.0.4 to 4.1.0 + + + Firefox v91 does not support addons with invalid signature + anymore. Firefox ESR needs to be used for nix addon support. + + The erigon ethereum node has moved to a new @@ -309,6 +315,15 @@ Superuser created successfully. a full resync + + + The erigon ethereum node has moved it’s + database location in 2021-08-03, users + upgrading must manually move their chaindata (see + release + notes). + + services.geoip-updater was broken and has @@ -863,6 +878,23 @@ Superuser created successfully. release instead of 1.0.x + + + If exfat is included in + boot.supportedFilesystems and when using + kernel 5.7 or later, the exfatprogs + user-space utilities are used instead of + exfat. + + + + + The todoman package was upgraded from 3.9.0 + to 4.0.0. This introduces breaking changes in the + configuration + file format. + +
@@ -1049,6 +1081,13 @@ Superuser created successfully. sign OCSP responses and server certificates. + + + lib.formats.yaml’s + generate will not generate JSON anymore, + but instead use more of the YAML-specific syntax. + +
diff --git a/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-2111.section.md b/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-2111.section.md index ae6ccf9329..c7e5afb7d0 100644 --- a/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-2111.section.md +++ b/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-2111.section.md @@ -64,6 +64,7 @@ subsonic-compatible api. Available as [navidrome](#opt-services.navidrome.enable ## Backward Incompatibilities {#sec-release-21.11-incompatibilities} + - The `paperless` module and package have been removed. All users should migrate to the successor `paperless-ng` instead. The Paperless project [has been archived](https://github.com/the-paperless-project/paperless/commit/9b0063c9731f7c5f65b1852cb8caff97f5e40ba4) @@ -113,8 +114,12 @@ subsonic-compatible api. Available as [navidrome](#opt-services.navidrome.enable - The `staticjinja` package has been upgraded from 1.0.4 to 4.1.0 +- Firefox v91 does not support addons with invalid signature anymore. Firefox ESR needs to be used for nix addon support. + - The `erigon` ethereum node has moved to a new database format in `2021-05-04`, and requires a full resync +- The `erigon` ethereum node has moved it's database location in `2021-08-03`, users upgrading must manually move their chaindata (see [release notes](https://github.com/ledgerwatch/erigon/releases/tag/v2021.08.03)). + - `services.geoip-updater` was broken and has been replaced by [services.geoipupdate](options.html#opt-services.geoipupdate.enable). - PHP 7.3 is no longer supported due to upstream not supporting this version for the entire lifecycle of the 21.11 release. @@ -250,6 +255,11 @@ To be able to access the web UI this port needs to be opened in the firewall. - The `nomad` package now defaults to a 1.1.x release instead of 1.0.x +- If `exfat` is included in `boot.supportedFilesystems` and when using kernel 5.7 + or later, the `exfatprogs` user-space utilities are used instead of `exfat`. + +- The `todoman` package was upgraded from 3.9.0 to 4.0.0. This introduces breaking changes in the [configuration file](https://todoman.readthedocs.io/en/stable/configure.html#configuration-file) format. + ## Other Notable Changes {#sec-release-21.11-notable-changes} - The setting [`services.openssh.logLevel`](options.html#opt-services.openssh.logLevel) `"VERBOSE"` `"INFO"`. This brings NixOS in line with upstream and other Linux distributions, and reduces log spam on servers due to bruteforcing botnets. @@ -299,3 +309,5 @@ To be able to access the web UI this port needs to be opened in the firewall. - Zfs: `latestCompatibleLinuxPackages` is now exported on the zfs package. One can use `boot.kernelPackages = config.boot.zfs.package.latestCompatibleLinuxPackages;` to always track the latest compatible kernel with a given version of zfs. - Nginx will use the value of `sslTrustedCertificate` if provided for a virtual host, even if `enableACME` is set. This is useful for providers not using the same certificate to sign OCSP responses and server certificates. + +- `lib.formats.yaml`'s `generate` will not generate JSON anymore, but instead use more of the YAML-specific syntax. diff --git a/third_party/nixpkgs/nixos/lib/make-zfs-image.nix b/third_party/nixpkgs/nixos/lib/make-zfs-image.nix new file mode 100644 index 0000000000..40648ca24d --- /dev/null +++ b/third_party/nixpkgs/nixos/lib/make-zfs-image.nix @@ -0,0 +1,333 @@ +# Note: This is a private API, internal to NixOS. Its interface is subject +# to change without notice. +# +# The result of this builder is two disk images: +# +# * `boot` - a small disk formatted with FAT to be used for /boot. FAT is +# chosen to support EFI. +# * `root` - a larger disk with a zpool taking the entire disk. +# +# This two-disk approach is taken to satisfy ZFS's requirements for +# autoexpand. +# +# # Why doesn't autoexpand work with ZFS in a partition? +# +# When ZFS owns the whole disk doesn’t really use a partition: it has +# a marker partition at the start and a marker partition at the end of +# the disk. +# +# If ZFS is constrained to a partition, ZFS leaves expanding the partition +# up to the user. Obviously, the user may not choose to do so. +# +# Once the user expands the partition, calling zpool online -e expands the +# vdev to use the whole partition. It doesn’t happen automatically +# presumably because zed doesn’t get an event saying it’s partition grew, +# whereas it can and does get an event saying the whole disk it is on is +# now larger. +{ lib +, pkgs +, # The NixOS configuration to be installed onto the disk image. + config + +, # size of the FAT boot disk, in megabytes. + bootSize ? 1024 + +, # The size of the root disk, in megabytes. + rootSize ? 2048 + +, # The name of the ZFS pool + rootPoolName ? "tank" + +, # zpool properties + rootPoolProperties ? { + autoexpand = "on"; + } +, # pool-wide filesystem properties + rootPoolFilesystemProperties ? { + acltype = "posixacl"; + atime = "off"; + compression = "on"; + mountpoint = "legacy"; + xattr = "sa"; + } + +, # datasets, with per-attribute options: + # mount: (optional) mount point in the VM + # properties: (optional) ZFS properties on the dataset, like filesystemProperties + # Notes: + # 1. datasets will be created from shorter to longer names as a simple topo-sort + # 2. you should define a root's dataset's mount for `/` + datasets ? { } + +, # The files and directories to be placed in the target file system. + # This is a list of attribute sets {source, target} where `source' + # is the file system object (regular file or directory) to be + # grafted in the file system at path `target'. + contents ? [] + +, # The initial NixOS configuration file to be copied to + # /etc/nixos/configuration.nix. This configuration will be embedded + # inside a configuration which includes the described ZFS fileSystems. + configFile ? null + +, # Shell code executed after the VM has finished. + postVM ? "" + +, name ? "nixos-disk-image" + +, # Disk image format, one of qcow2, qcow2-compressed, vdi, vpc, raw. + format ? "raw" + +, # Include a copy of Nixpkgs in the disk image + includeChannel ? true +}: +let + formatOpt = if format == "qcow2-compressed" then "qcow2" else format; + + compress = lib.optionalString (format == "qcow2-compressed") "-c"; + + filenameSuffix = "." + { + qcow2 = "qcow2"; + vdi = "vdi"; + vpc = "vhd"; + raw = "img"; + }.${formatOpt} or formatOpt; + bootFilename = "nixos.boot${filenameSuffix}"; + rootFilename = "nixos.root${filenameSuffix}"; + + # FIXME: merge with channel.nix / make-channel.nix. + channelSources = + let + nixpkgs = lib.cleanSource pkgs.path; + in + pkgs.runCommand "nixos-${config.system.nixos.version}" {} '' + mkdir -p $out + cp -prd ${nixpkgs.outPath} $out/nixos + chmod -R u+w $out/nixos + if [ ! -e $out/nixos/nixpkgs ]; then + ln -s . $out/nixos/nixpkgs + fi + rm -rf $out/nixos/.git + echo -n ${config.system.nixos.versionSuffix} > $out/nixos/.version-suffix + ''; + + closureInfo = pkgs.closureInfo { + rootPaths = [ config.system.build.toplevel ] + ++ (lib.optional includeChannel channelSources); + }; + + modulesTree = pkgs.aggregateModules + (with config.boot.kernelPackages; [ kernel zfs ]); + + tools = lib.makeBinPath ( + with pkgs; [ + config.system.build.nixos-enter + config.system.build.nixos-install + dosfstools + e2fsprogs + gptfdisk + nix + parted + utillinux + zfs + ] + ); + + hasDefinedMount = disk: ((disk.mount or null) != null); + + stringifyProperties = prefix: properties: lib.concatStringsSep " \\\n" ( + lib.mapAttrsToList + ( + property: value: "${prefix} ${lib.escapeShellArg property}=${lib.escapeShellArg value}" + ) + properties + ); + + featuresToProperties = features: + lib.listToAttrs + (builtins.map (feature: { + name = "feature@${feature}"; + value = "enabled"; + }) features); + + createDatasets = + let + datasetlist = lib.mapAttrsToList lib.nameValuePair datasets; + sorted = lib.sort (left: right: (lib.stringLength left.name) < (lib.stringLength right.name)) datasetlist; + cmd = { name, value }: + let + properties = stringifyProperties "-o" (value.properties or {}); + in + "zfs create -p ${properties} ${name}"; + in + lib.concatMapStringsSep "\n" cmd sorted; + + mountDatasets = + let + datasetlist = lib.mapAttrsToList lib.nameValuePair datasets; + mounts = lib.filter ({ value, ... }: hasDefinedMount value) datasetlist; + sorted = lib.sort (left: right: (lib.stringLength left.value.mount) < (lib.stringLength right.value.mount)) mounts; + cmd = { name, value }: + '' + mkdir -p /mnt${lib.escapeShellArg value.mount} + mount -t zfs ${name} /mnt${lib.escapeShellArg value.mount} + ''; + in + lib.concatMapStringsSep "\n" cmd sorted; + + unmountDatasets = + let + datasetlist = lib.mapAttrsToList lib.nameValuePair datasets; + mounts = lib.filter ({ value, ... }: hasDefinedMount value) datasetlist; + sorted = lib.sort (left: right: (lib.stringLength left.value.mount) > (lib.stringLength right.value.mount)) mounts; + cmd = { name, value }: + '' + umount /mnt${lib.escapeShellArg value.mount} + ''; + in + lib.concatMapStringsSep "\n" cmd sorted; + + + fileSystemsCfgFile = + let + mountable = lib.filterAttrs (_: value: hasDefinedMount value) datasets; + in + pkgs.runCommand "filesystem-config.nix" { + buildInputs = with pkgs; [ jq nixpkgs-fmt ]; + filesystems = builtins.toJSON { + fileSystems = lib.mapAttrs' + ( + dataset: attrs: + { + name = attrs.mount; + value = { + fsType = "zfs"; + device = "${dataset}"; + }; + } + ) + mountable; + }; + passAsFile = [ "filesystems" ]; + } '' + ( + echo "builtins.fromJSON '''" + jq . < "$filesystemsPath" + echo "'''" + ) > $out + + nixpkgs-fmt $out + ''; + + mergedConfig = + if configFile == null + then fileSystemsCfgFile + else + pkgs.runCommand "configuration.nix" { + buildInputs = with pkgs; [ nixpkgs-fmt ]; + } + '' + ( + echo '{ imports = [' + printf "(%s)\n" "$(cat ${fileSystemsCfgFile})"; + printf "(%s)\n" "$(cat ${configFile})"; + echo ']; }' + ) > $out + + nixpkgs-fmt $out + ''; + + image = ( + pkgs.vmTools.override { + rootModules = + [ "zfs" "9p" "9pnet_virtio" "virtio_pci" "virtio_blk" ] ++ + (pkgs.lib.optional (pkgs.stdenv.isi686 || pkgs.stdenv.isx86_64) "rtc_cmos"); + kernel = modulesTree; + } + ).runInLinuxVM ( + pkgs.runCommand name + { + QEMU_OPTS = "-drive file=$bootDiskImage,if=virtio,cache=unsafe,werror=report" + + " -drive file=$rootDiskImage,if=virtio,cache=unsafe,werror=report"; + preVM = '' + PATH=$PATH:${pkgs.qemu_kvm}/bin + mkdir $out + bootDiskImage=boot.raw + qemu-img create -f raw $bootDiskImage ${toString bootSize}M + + rootDiskImage=root.raw + qemu-img create -f raw $rootDiskImage ${toString rootSize}M + ''; + + postVM = '' + ${if formatOpt == "raw" then '' + mv $bootDiskImage $out/${bootFilename} + mv $rootDiskImage $out/${rootFilename} + '' else '' + ${pkgs.qemu}/bin/qemu-img convert -f raw -O ${formatOpt} ${compress} $bootDiskImage $out/${bootFilename} + ${pkgs.qemu}/bin/qemu-img convert -f raw -O ${formatOpt} ${compress} $rootDiskImage $out/${rootFilename} + ''} + bootDiskImage=$out/${bootFilename} + rootDiskImage=$out/${rootFilename} + set -x + ${postVM} + ''; + } '' + export PATH=${tools}:$PATH + set -x + + cp -sv /dev/vda /dev/sda + cp -sv /dev/vda /dev/xvda + + parted --script /dev/vda -- \ + mklabel gpt \ + mkpart no-fs 1MiB 2MiB \ + set 1 bios_grub on \ + align-check optimal 1 \ + mkpart ESP fat32 2MiB -1MiB \ + align-check optimal 2 \ + print + + sfdisk --dump /dev/vda + + + zpool create \ + ${stringifyProperties " -o" rootPoolProperties} \ + ${stringifyProperties " -O" rootPoolFilesystemProperties} \ + ${rootPoolName} /dev/vdb + parted --script /dev/vdb -- print + + ${createDatasets} + ${mountDatasets} + + mkdir -p /mnt/boot + mkfs.vfat -n ESP /dev/vda2 + mount /dev/vda2 /mnt/boot + + mount + + # Install a configuration.nix + mkdir -p /mnt/etc/nixos + # `cat` so it is mutable on the fs + cat ${mergedConfig} > /mnt/etc/nixos/configuration.nix + + export NIX_STATE_DIR=$TMPDIR/state + nix-store --load-db < ${closureInfo}/registration + + nixos-install \ + --root /mnt \ + --no-root-passwd \ + --system ${config.system.build.toplevel} \ + --substituters "" \ + ${lib.optionalString includeChannel ''--channel ${channelSources}''} + + df -h + + umount /mnt/boot + ${unmountDatasets} + + zpool export ${rootPoolName} + '' + ); +in +image diff --git a/third_party/nixpkgs/nixos/maintainers/scripts/ec2/amazon-image-zfs.nix b/third_party/nixpkgs/nixos/maintainers/scripts/ec2/amazon-image-zfs.nix new file mode 100644 index 0000000000..32dd96a7cb --- /dev/null +++ b/third_party/nixpkgs/nixos/maintainers/scripts/ec2/amazon-image-zfs.nix @@ -0,0 +1,12 @@ +{ + imports = [ ./amazon-image.nix ]; + ec2.zfs = { + enable = true; + datasets = { + "tank/system/root".mount = "/"; + "tank/system/var".mount = "/var"; + "tank/local/nix".mount = "/nix"; + "tank/user/home".mount = "/home"; + }; + }; +} diff --git a/third_party/nixpkgs/nixos/maintainers/scripts/ec2/amazon-image.nix b/third_party/nixpkgs/nixos/maintainers/scripts/ec2/amazon-image.nix index 677aff4421..6942b58f23 100644 --- a/third_party/nixpkgs/nixos/maintainers/scripts/ec2/amazon-image.nix +++ b/third_party/nixpkgs/nixos/maintainers/scripts/ec2/amazon-image.nix @@ -4,6 +4,7 @@ with lib; let cfg = config.amazonImage; + in { imports = [ ../../../modules/virtualisation/amazon-image.nix ]; @@ -53,15 +54,7 @@ in { }; }; - config.system.build.amazonImage = import ../../../lib/make-disk-image.nix { - inherit lib config; - inherit (cfg) contents format name; - pkgs = import ../../../.. { inherit (pkgs) system; }; # ensure we use the regular qemu-kvm package - partitionTableType = if config.ec2.efi then "efi" - else if config.ec2.hvm then "legacy+gpt" - else "none"; - diskSize = cfg.sizeMB; - fsType = "ext4"; + config.system.build.amazonImage = let configFile = pkgs.writeText "configuration.nix" '' { modulesPath, ... }: { @@ -72,24 +65,96 @@ in { ${optionalString config.ec2.efi '' ec2.efi = true; ''} + ${optionalString config.ec2.zfs.enable '' + ec2.zfs.enable = true; + networking.hostId = "${config.networking.hostId}"; + ''} } ''; - postVM = '' - extension=''${diskImage##*.} - friendlyName=$out/${cfg.name}.$extension - mv "$diskImage" "$friendlyName" - diskImage=$friendlyName - mkdir -p $out/nix-support - echo "file ${cfg.format} $diskImage" >> $out/nix-support/hydra-build-products + zfsBuilder = import ../../../lib/make-zfs-image.nix { + inherit lib config configFile; + inherit (cfg) contents format name; + pkgs = import ../../../.. { inherit (pkgs) system; }; # ensure we use the regular qemu-kvm package - ${pkgs.jq}/bin/jq -n \ - --arg label ${lib.escapeShellArg config.system.nixos.label} \ - --arg system ${lib.escapeShellArg pkgs.stdenv.hostPlatform.system} \ - --arg logical_bytes "$(${pkgs.qemu}/bin/qemu-img info --output json "$diskImage" | ${pkgs.jq}/bin/jq '."virtual-size"')" \ - --arg file "$diskImage" \ - '$ARGS.named' \ - > $out/nix-support/image-info.json - ''; - }; + includeChannel = true; + + bootSize = 1000; # 1G is the minimum EBS volume + + rootSize = cfg.sizeMB; + rootPoolProperties = { + ashift = 12; + autoexpand = "on"; + }; + + datasets = config.ec2.zfs.datasets; + + postVM = '' + extension=''${rootDiskImage##*.} + friendlyName=$out/${cfg.name} + rootDisk="$friendlyName.root.$extension" + bootDisk="$friendlyName.boot.$extension" + mv "$rootDiskImage" "$rootDisk" + mv "$bootDiskImage" "$bootDisk" + + mkdir -p $out/nix-support + echo "file ${cfg.format} $bootDisk" >> $out/nix-support/hydra-build-products + echo "file ${cfg.format} $rootDisk" >> $out/nix-support/hydra-build-products + + ${pkgs.jq}/bin/jq -n \ + --arg system_label ${lib.escapeShellArg config.system.nixos.label} \ + --arg system ${lib.escapeShellArg pkgs.stdenv.hostPlatform.system} \ + --arg root_logical_bytes "$(${pkgs.qemu}/bin/qemu-img info --output json "$bootDisk" | ${pkgs.jq}/bin/jq '."virtual-size"')" \ + --arg boot_logical_bytes "$(${pkgs.qemu}/bin/qemu-img info --output json "$rootDisk" | ${pkgs.jq}/bin/jq '."virtual-size"')" \ + --arg root "$rootDisk" \ + --arg boot "$bootDisk" \ + '{} + | .label = $system_label + | .system = $system + | .disks.boot.logical_bytes = $boot_logical_bytes + | .disks.boot.file = $boot + | .disks.root.logical_bytes = $root_logical_bytes + | .disks.root.file = $root + ' > $out/nix-support/image-info.json + ''; + }; + + extBuilder = import ../../../lib/make-disk-image.nix { + inherit lib config configFile; + + inherit (cfg) contents format name; + pkgs = import ../../../.. { inherit (pkgs) system; }; # ensure we use the regular qemu-kvm package + + fsType = "ext4"; + partitionTableType = if config.ec2.efi then "efi" + else if config.ec2.hvm then "legacy+gpt" + else "none"; + + diskSize = cfg.sizeMB; + + postVM = '' + extension=''${diskImage##*.} + friendlyName=$out/${cfg.name}.$extension + mv "$diskImage" "$friendlyName" + diskImage=$friendlyName + + mkdir -p $out/nix-support + echo "file ${cfg.format} $diskImage" >> $out/nix-support/hydra-build-products + + ${pkgs.jq}/bin/jq -n \ + --arg system_label ${lib.escapeShellArg config.system.nixos.label} \ + --arg system ${lib.escapeShellArg pkgs.stdenv.hostPlatform.system} \ + --arg logical_bytes "$(${pkgs.qemu}/bin/qemu-img info --output json "$diskImage" | ${pkgs.jq}/bin/jq '."virtual-size"')" \ + --arg file "$diskImage" \ + '{} + | .label = $system_label + | .system = $system + | .logical_bytes = $logical_bytes + | .file = $file + | .disks.root.logical_bytes = $logical_bytes + | .disks.root.file = $file + ' > $out/nix-support/image-info.json + ''; + }; + in if config.ec2.zfs.enable then zfsBuilder else extBuilder; } diff --git a/third_party/nixpkgs/nixos/modules/config/fonts/fonts.nix b/third_party/nixpkgs/nixos/modules/config/fonts/fonts.nix index 3911196c10..60a0885103 100644 --- a/third_party/nixpkgs/nixos/modules/config/fonts/fonts.nix +++ b/third_party/nixpkgs/nixos/modules/config/fonts/fonts.nix @@ -2,6 +2,52 @@ with lib; +let + # A scalable variant of the X11 "core" cursor + # + # If not running a fancy desktop environment, the cursor is likely set to + # the default `cursor.pcf` bitmap font. This is 17px wide, so it's very + # small and almost invisible on 4K displays. + fontcursormisc_hidpi = pkgs.xorg.fontcursormisc.overrideAttrs (old: + let + # The scaling constant is 230/96: the scalable `left_ptr` glyph at + # about 23 points is rendered as 17px, on a 96dpi display. + # Note: the XLFD font size is in decipoints. + size = 2.39583 * config.services.xserver.dpi; + sizeString = builtins.head (builtins.split "\\." (toString size)); + in + { + postInstall = '' + alias='cursor -xfree86-cursor-medium-r-normal--0-${sizeString}-0-0-p-0-adobe-fontspecific' + echo "$alias" > $out/lib/X11/fonts/Type1/fonts.alias + ''; + }); + + hasHidpi = + config.hardware.video.hidpi.enable && + config.services.xserver.dpi != null; + + defaultFonts = + [ pkgs.dejavu_fonts + pkgs.freefont_ttf + pkgs.gyre-fonts # TrueType substitutes for standard PostScript fonts + pkgs.liberation_ttf + pkgs.unifont + pkgs.noto-fonts-emoji + ]; + + defaultXFonts = + [ (if hasHidpi then fontcursormisc_hidpi else pkgs.xorg.fontcursormisc) + pkgs.xorg.fontmiscmisc + ] ++ optionals (config.nixpkgs.config.allowUnfree or false) + [ # these are unfree, and will make usage with xserver fail + pkgs.xorg.fontbhlucidatypewriter100dpi + pkgs.xorg.fontbhlucidatypewriter75dpi + pkgs.xorg.fontbh100dpi + ]; + +in + { imports = [ (mkRemovedOptionModule [ "fonts" "enableCoreFonts" ] "Use fonts.fonts = [ pkgs.corefonts ]; instead.") @@ -32,25 +78,9 @@ with lib; }; - config = { - - fonts.fonts = mkIf config.fonts.enableDefaultFonts - ([ - pkgs.dejavu_fonts - pkgs.freefont_ttf - pkgs.gyre-fonts # TrueType substitutes for standard PostScript fonts - pkgs.liberation_ttf - pkgs.xorg.fontmiscmisc - pkgs.xorg.fontcursormisc - pkgs.unifont - pkgs.noto-fonts-emoji - ] ++ lib.optionals (config.nixpkgs.config.allowUnfree or false) [ - # these are unfree, and will make usage with xserver fail - pkgs.xorg.fontbhlucidatypewriter100dpi - pkgs.xorg.fontbhlucidatypewriter75dpi - pkgs.xorg.fontbh100dpi - ]); - - }; + config = mkMerge [ + { fonts.fonts = mkIf config.fonts.enableDefaultFonts defaultFonts; } + { fonts.fonts = mkIf config.services.xserver.enable defaultXFonts; } + ]; } diff --git a/third_party/nixpkgs/nixos/modules/config/users-groups.nix b/third_party/nixpkgs/nixos/modules/config/users-groups.nix index d5e7745c53..f86be3be2c 100644 --- a/third_party/nixpkgs/nixos/modules/config/users-groups.nix +++ b/third_party/nixpkgs/nixos/modules/config/users-groups.nix @@ -324,7 +324,7 @@ let }; - groupOpts = { name, ... }: { + groupOpts = { name, config, ... }: { options = { @@ -358,6 +358,10 @@ let config = { name = mkDefault name; + + members = mapAttrsToList (n: u: u.name) ( + filterAttrs (n: u: elem config.name u.extraGroups) cfg.users + ); }; }; @@ -419,12 +423,7 @@ let initialPassword initialHashedPassword; shell = utils.toShellPath u.shell; }) cfg.users; - groups = mapAttrsToList (n: g: - { inherit (g) name gid; - members = g.members ++ (mapAttrsToList (n: u: u.name) ( - filterAttrs (n: u: elem g.name u.extraGroups) cfg.users - )); - }) cfg.groups; + groups = attrValues cfg.groups; }); systemShells = diff --git a/third_party/nixpkgs/nixos/modules/module-list.nix b/third_party/nixpkgs/nixos/modules/module-list.nix index f07de862ea..71a1118fd3 100644 --- a/third_party/nixpkgs/nixos/modules/module-list.nix +++ b/third_party/nixpkgs/nixos/modules/module-list.nix @@ -121,6 +121,7 @@ ./programs/bash-my-aws.nix ./programs/bcc.nix ./programs/browserpass.nix + ./programs/calls.nix ./programs/captive-browser.nix ./programs/ccache.nix ./programs/cdemu.nix diff --git a/third_party/nixpkgs/nixos/modules/programs/calls.nix b/third_party/nixpkgs/nixos/modules/programs/calls.nix new file mode 100644 index 0000000000..59961625e5 --- /dev/null +++ b/third_party/nixpkgs/nixos/modules/programs/calls.nix @@ -0,0 +1,25 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.programs.calls; +in { + options = { + programs.calls = { + enable = mkEnableOption '' + Whether to enable GNOME calls: a phone dialer and call handler. + ''; + }; + }; + + config = mkIf cfg.enable { + environment.systemPackages = [ + pkgs.calls + ]; + + services.dbus.packages = [ + pkgs.callaudiod + ]; + }; +} diff --git a/third_party/nixpkgs/nixos/modules/services/misc/octoprint.nix b/third_party/nixpkgs/nixos/modules/services/misc/octoprint.nix index c926d889b3..7129ac6952 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/octoprint.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/octoprint.nix @@ -122,6 +122,9 @@ in ExecStart = "${pluginsEnv}/bin/octoprint serve -b ${cfg.stateDir}"; User = cfg.user; Group = cfg.group; + SupplementaryGroups = [ + "dialout" + ]; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/monitoring/grafana.nix b/third_party/nixpkgs/nixos/modules/services/monitoring/grafana.nix index e0b2624b6c..fb67bbfb84 100644 --- a/third_party/nixpkgs/nixos/modules/services/monitoring/grafana.nix +++ b/third_party/nixpkgs/nixos/modules/services/monitoring/grafana.nix @@ -6,6 +6,8 @@ let cfg = config.services.grafana; opt = options.services.grafana; declarativePlugins = pkgs.linkFarm "grafana-plugins" (builtins.map (pkg: { name = pkg.pname; path = pkg; }) cfg.declarativePlugins); + useMysql = cfg.database.type == "mysql"; + usePostgresql = cfg.database.type == "postgres"; envOptions = { PATHS_DATA = cfg.dataDir; @@ -635,7 +637,7 @@ in { systemd.services.grafana = { description = "Grafana Service Daemon"; wantedBy = ["multi-user.target"]; - after = ["networking.target"]; + after = ["networking.target"] ++ lib.optional usePostgresql "postgresql.service" ++ lib.optional useMysql "mysql.service"; environment = { QT_QPA_PLATFORM = "offscreen"; } // mapAttrs' (n: v: nameValuePair "GF_${n}" (toString v)) envOptions; diff --git a/third_party/nixpkgs/nixos/modules/system/boot/stage-1-init.sh b/third_party/nixpkgs/nixos/modules/system/boot/stage-1-init.sh index ddaf985878..3dfcc010b6 100644 --- a/third_party/nixpkgs/nixos/modules/system/boot/stage-1-init.sh +++ b/third_party/nixpkgs/nixos/modules/system/boot/stage-1-init.sh @@ -542,7 +542,7 @@ while read -u 3 mountPoint; do # If copytoram is enabled: skip mounting the ISO and copy its content to a tmpfs. if [ -n "$copytoram" ] && [ "$device" = /dev/root ] && [ "$mountPoint" = /iso ]; then fsType=$(blkid -o value -s TYPE "$device") - fsSize=$(blockdev --getsize64 "$device") + fsSize=$(blockdev --getsize64 "$device" || stat -Lc '%s' "$device") mkdir -p /tmp-iso mount -t "$fsType" /dev/root /tmp-iso diff --git a/third_party/nixpkgs/nixos/modules/tasks/filesystems.nix b/third_party/nixpkgs/nixos/modules/tasks/filesystems.nix index ea13d396c4..4f56504f45 100644 --- a/third_party/nixpkgs/nixos/modules/tasks/filesystems.nix +++ b/third_party/nixpkgs/nixos/modules/tasks/filesystems.nix @@ -264,6 +264,8 @@ in # # To make changes, edit the fileSystems and swapDevices NixOS options # in your /etc/nixos/configuration.nix file. + # + # # Filesystems. ${concatMapStrings (fs: diff --git a/third_party/nixpkgs/nixos/modules/tasks/filesystems/exfat.nix b/third_party/nixpkgs/nixos/modules/tasks/filesystems/exfat.nix index 1527f993fd..540b9b91c3 100644 --- a/third_party/nixpkgs/nixos/modules/tasks/filesystems/exfat.nix +++ b/third_party/nixpkgs/nixos/modules/tasks/filesystems/exfat.nix @@ -4,8 +4,10 @@ with lib; { config = mkIf (any (fs: fs == "exfat") config.boot.supportedFilesystems) { - - system.fsPackages = [ pkgs.exfat ]; - + system.fsPackages = if config.boot.kernelPackages.kernelOlder "5.7" then [ + pkgs.exfat # FUSE + ] else [ + pkgs.exfatprogs # non-FUSE + ]; }; } diff --git a/third_party/nixpkgs/nixos/modules/virtualisation/amazon-image.nix b/third_party/nixpkgs/nixos/modules/virtualisation/amazon-image.nix index bf5c04543a..fe248a9448 100644 --- a/third_party/nixpkgs/nixos/modules/virtualisation/amazon-image.nix +++ b/third_party/nixpkgs/nixos/modules/virtualisation/amazon-image.nix @@ -41,17 +41,23 @@ in boot.growPartition = cfg.hvm; - fileSystems."/" = { + fileSystems."/" = mkIf (!cfg.zfs.enable) { device = "/dev/disk/by-label/nixos"; fsType = "ext4"; autoResize = true; }; - fileSystems."/boot" = mkIf cfg.efi { + fileSystems."/boot" = mkIf (cfg.efi || cfg.zfs.enable) { + # The ZFS image uses a partition labeled ESP whether or not we're + # booting with EFI. device = "/dev/disk/by-label/ESP"; fsType = "vfat"; }; + services.zfs.expandOnBoot = mkIf cfg.zfs.enable "all"; + + boot.zfs.devNodes = mkIf cfg.zfs.enable "/dev/"; + boot.extraModulePackages = [ config.boot.kernelPackages.ena ]; diff --git a/third_party/nixpkgs/nixos/modules/virtualisation/amazon-options.nix b/third_party/nixpkgs/nixos/modules/virtualisation/amazon-options.nix index 2e807131e9..698edcd835 100644 --- a/third_party/nixpkgs/nixos/modules/virtualisation/amazon-options.nix +++ b/third_party/nixpkgs/nixos/modules/virtualisation/amazon-options.nix @@ -1,7 +1,46 @@ { config, lib, pkgs, ... }: -{ +let + inherit (lib) types; +in { options = { ec2 = { + zfs = { + enable = lib.mkOption { + default = false; + internal = true; + description = '' + Whether the EC2 instance uses a ZFS root. + ''; + }; + + datasets = lib.mkOption { + description = '' + Datasets to create under the `tank` and `boot` zpools. + + **NOTE:** This option is used only at image creation time, and + does not attempt to declaratively create or manage datasets + on an existing system. + ''; + + default = {}; + + type = types.attrsOf (types.submodule { + options = { + mount = lib.mkOption { + description = "Where to mount this dataset."; + type = types.nullOr types.string; + default = null; + }; + + properties = lib.mkOption { + description = "Properties to set on this dataset."; + type = types.attrsOf types.string; + default = {}; + }; + }; + }); + }; + }; hvm = lib.mkOption { default = lib.versionAtLeast config.system.stateVersion "17.03"; internal = true; @@ -18,4 +57,17 @@ }; }; }; + + config = lib.mkIf config.ec2.zfs.enable { + networking.hostId = lib.mkDefault "00000000"; + + fileSystems = let + mountable = lib.filterAttrs (_: value: ((value.mount or null) != null)) config.ec2.zfs.datasets; + in lib.mapAttrs' + (dataset: opts: lib.nameValuePair opts.mount { + device = dataset; + fsType = "zfs"; + }) + mountable; + }; } diff --git a/third_party/nixpkgs/nixos/release.nix b/third_party/nixpkgs/nixos/release.nix index 2367e79e4a..264d82bacc 100644 --- a/third_party/nixpkgs/nixos/release.nix +++ b/third_party/nixpkgs/nixos/release.nix @@ -217,6 +217,20 @@ in rec { }).config.system.build.amazonImage) ); + amazonImageZfs = forMatchingSystems [ "x86_64-linux" "aarch64-linux" ] (system: + + with import ./.. { inherit system; }; + + hydraJob ((import lib/eval-config.nix { + inherit system; + modules = + [ configuration + versionModule + ./maintainers/scripts/ec2/amazon-image-zfs.nix + ]; + }).config.system.build.amazonImage) + + ); # Test job for https://github.com/NixOS/nixpkgs/issues/121354 to test 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 783c15674a..7395ca85d9 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/spotify-tui/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/spotify-tui/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "spotify-tui"; - version = "0.24.0"; + version = "0.25.0"; src = fetchFromGitHub { owner = "Rigellute"; repo = "spotify-tui"; rev = "v${version}"; - sha256 = "1vi6b22ygi6nwydjwqirph9k18akbw81m3bci134nrbnrb30glla"; + sha256 = "sha256-L5gg6tjQuYoAC89XfKE38KCFONwSAwfNoFEUPH4jNAI="; }; - cargoSha256 = "1l91xcgr3hcjaphns1hs0i8w1ynxqwx7rbgpl0i5xnyrkw0gn9lj"; + cargoSha256 = "sha256-iucI4/iMF+uXRlnMttobu4xo3IQXq7tGiSSN8eCrLM0="; nativeBuildInputs = [ installShellFiles ] ++ lib.optionals stdenv.isLinux [ pkg-config python3 ]; buildInputs = [ ] diff --git a/third_party/nixpkgs/pkgs/applications/backup/vorta/default.nix b/third_party/nixpkgs/pkgs/applications/backup/vorta/default.nix index dc02e65bb7..675ebf7d34 100644 --- a/third_party/nixpkgs/pkgs/applications/backup/vorta/default.nix +++ b/third_party/nixpkgs/pkgs/applications/backup/vorta/default.nix @@ -8,13 +8,13 @@ python3Packages.buildPythonApplication rec { pname = "vorta"; - version = "0.7.7"; + version = "0.7.8"; src = fetchFromGitHub { owner = "borgbase"; repo = "vorta"; rev = "v${version}"; - sha256 = "sha256-AH9CvoWAaNLPLC+NL+VXtYq9CNCMt0AFtC1ZGXSlcHQ="; + sha256 = "sha256-qNBswy1dsCE6TEQLr/r7nnZWegDD8BD9pMkcpcuT7Q0="; }; nativeBuildInputs = [ wrapQtAppsHook ]; diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/erigon.nix b/third_party/nixpkgs/pkgs/applications/blockchains/erigon.nix index 6cdad6bf5f..cfd3d5da93 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/erigon.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/erigon.nix @@ -1,17 +1,17 @@ -{ stdenv, lib, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "erigon"; - version = "2021.08.02"; + version = "2021.08.05"; src = fetchFromGitHub { owner = "ledgerwatch"; repo = pname; rev = "v${version}"; - sha256 = "sha256-pyqvzpsDk24UEtSx4qmDew9zRK45pD5i4Qv1uJ03tmk="; + sha256 = "sha256-bCREY3UbMgSTu1nVytrYFsGgdMEaMLy5ZGrLqDNu9YM="; }; - vendorSha256 = "sha256-FwKlQH8vEtWNDql1pmHzKneIwmJ7cg5LYkETVswO6pc="; + vendorSha256 = "0a0d6n2c0anp36z7kvkadd6zvxzvsywfpk5qv6aq4ji4qd0hlq8q"; runVend = true; # Build errors in mdbx when format hardening is enabled: diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/exodus/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/exodus/default.nix index 4426839462..2d5a3130c6 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/exodus/default.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/exodus/default.nix @@ -4,11 +4,11 @@ cups, vivaldi-ffmpeg-codecs, libpulseaudio, at-spi2-core, libxkbcommon, mesa }: stdenv.mkDerivation rec { pname = "exodus"; - version = "21.5.25"; + version = "21.8.19"; src = fetchurl { url = "https://downloads.exodus.io/releases/${pname}-linux-x64-${version}.zip"; - sha256 = "sha256-2EIElhQGA0UprPF2pdIfYM9SWYIteD+kH+rupjxCiz4="; + sha256 = "1ssacadx5hdxq0cljb869ds3d11i4fyy3qd5hzh8wk5mlpdnba6k"; }; sourceRoot = "."; @@ -49,6 +49,7 @@ stdenv.mkDerivation rec { xorg.libXfixes xorg.libXi xorg.libXrender + xorg.libxshmfence xorg.libXtst xorg_sys_opengl util-linux diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/go-ethereum/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/go-ethereum/default.nix index 8257aa43dd..b9f31a3e7f 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/go-ethereum/default.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/go-ethereum/default.nix @@ -9,17 +9,17 @@ let in buildGoModule rec { pname = "go-ethereum"; - version = "1.10.7"; + version = "1.10.8"; src = fetchFromGitHub { owner = "ethereum"; repo = pname; rev = "v${version}"; - sha256 = "sha256-P0+XPSpvVsjia21F3FIg7KO6Qe2ZbY90tM/dRwBBuBk="; + sha256 = "sha256-r4ifLa4CMZvp0MaCkxWo5rWLEnFdX//mYlC08hndXhQ="; }; runVend = true; - vendorSha256 = "sha256-51jt5oBb/3avZnDRfo/NKAtZAU6QBFkzNdVxFnJ+erM="; + vendorSha256 = "sha256-e8aKQMVEEf0BzpdljkOBxznj5P1Go/6EbY9mdhDLyrw="; doCheck = 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 ce30adce60..31ef6a3e4f 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.1.7"; + version = "7.1.8"; src = fetchurl { - url = "https://elpa.gnu.org/packages/ada-mode-7.1.7.tar"; - sha256 = "0bzykgzc3kx1dgngishsf9w4czq3ig6wvrv3832zlxb7q3rmw8j2"; + url = "https://elpa.gnu.org/packages/ada-mode-7.1.8.tar"; + sha256 = "0gggzjj58bxp7n4xdvhqwaxk6z79bbiqs59cc36mxk4gqyzf41xh"; }; packageRequires = [ emacs uniquify-files wisi ]; meta = { @@ -234,10 +234,10 @@ elpaBuild { pname = "auctex"; ename = "auctex"; - version = "13.0.12"; + version = "13.0.13"; src = fetchurl { - url = "https://elpa.gnu.org/packages/auctex-13.0.12.tar"; - sha256 = "0fx3l6yyq63mlnapxiqpdhi5l314r3aj63404nly6hcdvc28g9nm"; + url = "https://elpa.gnu.org/packages/auctex-13.0.13.tar"; + sha256 = "06cb9jphqd0nysc60b4x24zmdryljb168cw66adl7b2x7sdzpkmn"; }; packageRequires = [ emacs ]; meta = { @@ -636,10 +636,10 @@ elpaBuild { pname = "consult"; ename = "consult"; - version = "0.9"; + version = "0.11"; src = fetchurl { - url = "https://elpa.gnu.org/packages/consult-0.9.tar"; - sha256 = "1n3bnvgj92fjd9dai9f95wvyfb20yhaw7b722lkqjg42i10jqzfn"; + url = "https://elpa.gnu.org/packages/consult-0.11.tar"; + sha256 = "14zjhsfhq5g9257maivyzpj5qxi1kprcsdk1qalwybyylyb4q4kk"; }; packageRequires = [ emacs ]; meta = { @@ -666,10 +666,10 @@ elpaBuild { pname = "corfu"; ename = "corfu"; - version = "0.10"; + version = "0.11"; src = fetchurl { - url = "https://elpa.gnu.org/packages/corfu-0.10.tar"; - sha256 = "0sqr4cld84vgfnf0fjgvbbix1p23s0n2xsszfap6d8a2xzzpp044"; + url = "https://elpa.gnu.org/packages/corfu-0.11.tar"; + sha256 = "1sf7ll25ry7vwff4bvqgdh84zviqj6wifmqdb2z8hf12awz63icz"; }; packageRequires = [ emacs ]; meta = { @@ -722,6 +722,21 @@ license = lib.licenses.free; }; }) {}; + csharp-mode = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "csharp-mode"; + ename = "csharp-mode"; + version = "1.0.0"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/csharp-mode-1.0.0.tar"; + sha256 = "0vhm443fkcjsj95r4rs9r0mz9vzfk92883nxhyi35d3jaf112gm1"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/csharp-mode.html"; + license = lib.licenses.free; + }; + }) {}; csv-mode = callPackage ({ cl-lib ? null, elpaBuild, emacs, fetchurl, lib }: elpaBuild { pname = "csv-mode"; @@ -1011,10 +1026,10 @@ elpaBuild { pname = "ebdb"; ename = "ebdb"; - version = "0.7.1"; + version = "0.8.2"; src = fetchurl { - url = "https://elpa.gnu.org/packages/ebdb-0.7.1.tar"; - sha256 = "1z5lh1mib60mvs5kbdsrw2h4whz4n5ad4qkpphs2xjvaz92jgq6s"; + url = "https://elpa.gnu.org/packages/ebdb-0.8.2.tar"; + sha256 = "1idwih5v287q9vdhsnr1bsibdv4h61vmy3b82svf2x9aik1a7vir"; }; packageRequires = [ emacs seq ]; meta = { @@ -1071,10 +1086,10 @@ elpaBuild { pname = "eev"; ename = "eev"; - version = "20210710"; + version = "20210822"; src = fetchurl { - url = "https://elpa.gnu.org/packages/eev-20210710.tar"; - sha256 = "19k5yncyjg7afvkx54k9mplm86jyr3svjjyprrj1frdi219i5piw"; + url = "https://elpa.gnu.org/packages/eev-20210822.tar"; + sha256 = "1682hl8s15snz9vq2r0q7jfpf81gbhlyxp55l2alsmxll4qq72wh"; }; packageRequires = [ emacs ]; meta = { @@ -1194,10 +1209,10 @@ elpaBuild { pname = "emms"; ename = "emms"; - version = "7.5"; + version = "7.6"; src = fetchurl { - url = "https://elpa.gnu.org/packages/emms-7.5.tar"; - sha256 = "0d7nsx2idzbp6d5im5rrsnwppbr2cimvxgx31bhwsm2aq3ya5v2j"; + url = "https://elpa.gnu.org/packages/emms-7.6.tar"; + sha256 = "03cp6mr0kxy41dg4ri5ymbzpkw7bd8zg7hx0a2rb4axiss5qmx7i"; }; packageRequires = [ cl-lib nadvice seq ]; meta = { @@ -1375,6 +1390,21 @@ license = lib.licenses.free; }; }) {}; + flymake-proselint = callPackage ({ elpaBuild, emacs, fetchurl, lib }: + elpaBuild { + pname = "flymake-proselint"; + ename = "flymake-proselint"; + version = "0.2.1"; + src = fetchurl { + url = "https://elpa.gnu.org/packages/flymake-proselint-0.2.1.tar"; + sha256 = "08hbz8k3idr1gb98q3ssmzsdya5afjxl25l9xzqp9q2w5krc8433"; + }; + packageRequires = [ emacs ]; + meta = { + homepage = "https://elpa.gnu.org/packages/flymake-proselint.html"; + license = lib.licenses.free; + }; + }) {}; frame-tabs = callPackage ({ elpaBuild, fetchurl, lib }: elpaBuild { pname = "frame-tabs"; @@ -2148,10 +2178,10 @@ elpaBuild { pname = "map"; ename = "map"; - version = "3.0"; + version = "3.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/map-3.0.tar"; - sha256 = "00wf8lgh1b1i5l838y6di8194rf5gf5djklkhmxj1nlikz66j2ls"; + url = "https://elpa.gnu.org/packages/map-3.1.tar"; + sha256 = "1akkp34psm71ylbf1i02m56ga1dkswhz069j98amixrhw20hq4nx"; }; packageRequires = [ emacs ]; meta = { @@ -2163,10 +2193,10 @@ elpaBuild { pname = "marginalia"; ename = "marginalia"; - version = "0.7"; + version = "0.8"; src = fetchurl { - url = "https://elpa.gnu.org/packages/marginalia-0.7.tar"; - sha256 = "1nz55nx6xp72nahs4g6asl5y5yrlnlnza58bjrlwwzmwsf7daz18"; + url = "https://elpa.gnu.org/packages/marginalia-0.8.tar"; + sha256 = "0afry11i7kgfa0q83p63hmahl7jzsqhn4sl1rnkjy98pnikwv9kd"; }; packageRequires = [ emacs ]; meta = { @@ -2855,10 +2885,10 @@ elpaBuild { pname = "project"; ename = "project"; - version = "0.6.0"; + version = "0.6.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/project-0.6.0.tar"; - sha256 = "0m0r1xgz1ffx6mi2gjz1dkgrn89sh4y5ysi0gj6p1w05bf8p0lc0"; + url = "https://elpa.gnu.org/packages/project-0.6.1.tar"; + sha256 = "174fli3swbn67qcs9isv70vwrf6r41mak6dbs98gia89rlb71c8v"; }; packageRequires = [ emacs xref ]; meta = { @@ -3270,10 +3300,10 @@ elpaBuild { pname = "rt-liberation"; ename = "rt-liberation"; - version = "2.3"; + version = "2.4"; src = fetchurl { - url = "https://elpa.gnu.org/packages/rt-liberation-2.3.tar"; - sha256 = "0sqq5zfzx9dir6d6zvg7vj5v629b508bbxsp7j0sp21rr4fw9nn0"; + url = "https://elpa.gnu.org/packages/rt-liberation-2.4.tar"; + sha256 = "1yqcrgfn9lbv26729x5d9qx4zyp1k05r4f63ikrnk8lhqpjs5i00"; }; packageRequires = []; meta = { @@ -3366,10 +3396,10 @@ elpaBuild { pname = "setup"; ename = "setup"; - version = "0.2.1"; + version = "1.0.0"; src = fetchurl { - url = "https://elpa.gnu.org/packages/setup-0.2.1.tar"; - sha256 = "15paand086g33w2vb6jkyxd3i2pmpp84f31y3j5v8w9ia68pjzms"; + url = "https://elpa.gnu.org/packages/setup-1.0.0.tar"; + sha256 = "05k65r5mgkpbj6f84qscgq4gjbj4wyn7c60b9xjvadw9b55yvfxk"; }; packageRequires = [ emacs ]; meta = { @@ -3396,10 +3426,10 @@ elpaBuild { pname = "shell-command-plus"; ename = "shell-command+"; - version = "2.2.0"; + version = "2.2.1"; src = fetchurl { - url = "https://elpa.gnu.org/packages/shell-command+-2.2.0.tar"; - sha256 = "1ms2xk7xfgd3ngwm90hnmlxwpvyb167bislc2wr3ilfrirbbw476"; + url = "https://elpa.gnu.org/packages/shell-command+-2.2.1.tar"; + sha256 = "1dmi7fn4g55va5ljpyswr3dpgj471747kkdixfyp8zpsbhvr5yf6"; }; packageRequires = [ emacs ]; meta = { @@ -4041,10 +4071,10 @@ elpaBuild { pname = "vertico"; ename = "vertico"; - version = "0.12"; + version = "0.14"; src = fetchurl { - url = "https://elpa.gnu.org/packages/vertico-0.12.tar"; - sha256 = "14qlc438bysg23wfj04zpvpraqzzi4jlz3r11vc56vd0k2hfmvmn"; + url = "https://elpa.gnu.org/packages/vertico-0.14.tar"; + sha256 = "1lvfvrmfi6f1jcf356rj1zl2bcbqxas7wi3yb93mxpn37l22l8mi"; }; packageRequires = [ emacs ]; meta = { diff --git a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix index 332c43996b..495a3cbfd0 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/elpa-packages.nix @@ -66,7 +66,7 @@ self: let # actually unpack source of ada-mode and wisi # which are both needed to compile the tools # we need at runtime - phases = "unpackPhase " + old.phases; # not a list, interestingly… + dontUnpack = false; srcs = [ super.ada-mode.src # ada-mode needs a specific version of wisi, check NEWS or ada-mode's diff --git a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/org-generated.nix b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/org-generated.nix index 6bfe29fc2e..10c63bc0b8 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/org-generated.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/emacs/elisp-packages/org-generated.nix @@ -4,10 +4,10 @@ elpaBuild { pname = "org"; ename = "org"; - version = "20210726"; + version = "20210823"; src = fetchurl { - url = "https://orgmode.org/elpa/org-20210726.tar"; - sha256 = "0bz5dwnknxb5mwb3rk6ckwq8a5imd2cjsx40ql9p9vc0c8rirqd4"; + url = "https://orgmode.org/elpa/org-20210823.tar"; + sha256 = "0yd2ydkkfy9lmlnb0lpsm8ywbk88sq9n4i7dasfzslv7czgccyh7"; }; packageRequires = []; meta = { @@ -19,10 +19,10 @@ elpaBuild { pname = "org-plus-contrib"; ename = "org-plus-contrib"; - version = "20210726"; + version = "20210823"; src = fetchurl { - url = "https://orgmode.org/elpa/org-plus-contrib-20210726.tar"; - sha256 = "0fxjmb1773skyq76qmgx1jqfcglxrxxxqysqiirm48cc6yf13kp7"; + url = "https://orgmode.org/elpa/org-plus-contrib-20210823.tar"; + sha256 = "17lyhsi22wg3l3j4k67glvq9p12r3nlc7fs6ka5jr2xrvfypb5aj"; }; packageRequires = []; 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 3d5880c039..2d2044ded8 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 @@ -1044,8 +1044,8 @@ "auto-complete", "yasnippet" ], - "commit": "8a0dc9888de87ea3aace06628bff52ed32f3ca2b", - "sha256": "1xcsm72by6jiqr9y9fyk70nshsj5dj494faz9734m67fmxq45pfj" + "commit": "e29075f810af73f6bf7803eebf15d96bffee7154", + "sha256": "08vfdp7q6x5fk2nn5dl884cyysxrl2gw8f16g7wqvf7v24jmx71d" }, "stable": { "version": [ @@ -1070,8 +1070,8 @@ "repo": "xcwen/ac-php", "unstable": { "version": [ - 20210617, - 949 + 20210820, + 1000 ], "deps": [ "dash", @@ -1081,8 +1081,8 @@ "s", "xcscope" ], - "commit": "8a0dc9888de87ea3aace06628bff52ed32f3ca2b", - "sha256": "1xcsm72by6jiqr9y9fyk70nshsj5dj494faz9734m67fmxq45pfj" + "commit": "e29075f810af73f6bf7803eebf15d96bffee7154", + "sha256": "08vfdp7q6x5fk2nn5dl884cyysxrl2gw8f16g7wqvf7v24jmx71d" }, "stable": { "version": [ @@ -1489,15 +1489,15 @@ "repo": "cute-jumper/ace-pinyin", "unstable": { "version": [ - 20190917, - 318 + 20210806, + 316 ], "deps": [ "avy", "pinyinlib" ], - "commit": "8b2e9335b02486730ea4ceee790130cc5328f9ea", - "sha256": "1p2h4bva0v8yad075is1zkhn69x78ddwa8ncdfm0zzysddw5w8bq" + "commit": "4dc565807a9b74ba637122f746d1614c60f92af8", + "sha256": "1q1s2xwa4wb0h3r255j9wy37yzim6fa1kl42gnxlg5zwgcb2la9w" }, "stable": { "version": [ @@ -1528,8 +1528,8 @@ "deps": [ "avy-menu" ], - "commit": "594a305704be8ca0ef79a12b787bdb59bc6077c0", - "sha256": "1ykpb4l29iw5bxmip9cn6irgiak2hwb79kg1k5m32wc9p6b4kbjf" + "commit": "bc3524eaa28b21725287b59b903c03624cbd5316", + "sha256": "1d5mkkdd67kkas7vl2dc98lm2dlgx10mb35zfdnz2rzcygi5brs7" }, "stable": { "version": [ @@ -1878,14 +1878,25 @@ "repo": "minad/affe", "unstable": { "version": [ - 20210603, - 1139 + 20210812, + 1934 ], "deps": [ "consult" ], - "commit": "dee51350e1d7d3cfbfb12069dea9246454a3df31", - "sha256": "1dpzwwbkwxmkh430hk3w9p6z1rwns5znzbar071h95gi7phyhm2x" + "commit": "cc63708913fc5d16073bcb96f483c2e207151032", + "sha256": "10764rcakd5v9x2xz0cbv8wnvd1b5m9cwjb75gvbgnhfaxqnxb8n" + }, + "stable": { + "version": [ + 0, + 2 + ], + "deps": [ + "consult" + ], + "commit": "be08c4ec49681474cbebaf0957568f27e42c4b3c", + "sha256": "0lpqpy33bmsh84ib1i278sr8ldn8y9ydqdikch1xi56via4ic2x2" } }, { @@ -1944,15 +1955,15 @@ "repo": "agda/agda", "unstable": { "version": [ - 20210619, - 545 + 20210809, + 721 ], "deps": [ "annotation", "eri" ], - "commit": "c1c20b8d29838b4e0708b768d98e2edce933d15d", - "sha256": "1rscm80nrgr1c00vcp683rvc42wdll08jc3s2srvaxw3iadd03ln" + "commit": "2bab72d99ae3330cbf3a94450a647158838a1d1b", + "sha256": "1xb1rawj2hl12xmpn9xk2zw69wpvx2ssd3wj4k32dhgi2vcg2rck" }, "stable": { "version": [ @@ -2182,16 +2193,16 @@ "fetcher": "github", "repo": "alan-platform/AlanForEmacs", "unstable": { - "version": [ - 20210728, - 1427 + "version": [ + 20210802, + 1950 ], "deps": [ "flycheck", "s" ], - "commit": "6e2005441af34fe54872c00ed793f6084f25c3f8", - "sha256": "0fqbjklfglgiy838j37p0v0rcvzj48vps8zsn0bmnabnd5vsrc3b" + "commit": "9e66137860d05e9c8e1d70a087bfd9cb5ca5ec07", + "sha256": "1xnb2n77bj3ynrgrl13pwdjbbka9s6gwdskz99cjdky2m7z1xh0z" }, "stable": { "version": [ @@ -2327,26 +2338,26 @@ "repo": "cpitclaudel/alectryon", "unstable": { "version": [ - 20210722, - 1554 + 20210817, + 49 ], "deps": [ "flycheck" ], - "commit": "8089607dc118827e832d4bd524b3c0f0f56e8cdd", - "sha256": "1im0k28skb9skxxfkh279j91xjfc4c7qnmwc8l6sgazhglj5rqs6" + "commit": "95a31c4232e71047a64956976622969df9226381", + "sha256": "09rhs337cnb24blf9qcxc3hgg8s9h4rsyiwpnkqd2by4kkhdyign" }, "stable": { "version": [ 1, - 2, + 3, 1 ], "deps": [ "flycheck" ], - "commit": "7b7041fd58c2b1893e4b65b18045880ecc7a1c73", - "sha256": "1lvhzi6fxnmpcr7xac6ri3904cqbp016ivziih3nfchdzznmzljj" + "commit": "ef9b4d4653c95388b9e0b242bc24fea9922cfcbb", + "sha256": "0w6p5qy3cdlngrn1nv79gbgv97idkpxmw47xfcw8fn615wa5j9q4" } }, { @@ -2441,11 +2452,11 @@ "repo": "domtronn/all-the-icons.el", "unstable": { "version": [ - 20210728, - 2330 + 20210817, + 2252 ], - "commit": "e01eeb40858f971e45c014726a14c75556d8cc8f", - "sha256": "0psyfmajz2rsi5asv07514zd7vlwzk42hff4dcbmycyf7s998ifn" + "commit": "b43d2b32f6de83c0dc7792a957f64e8444e59beb", + "sha256": "066kldj7wz6s1qdvkxifv2zx0wimxncgh11r0pchfrji4b0h6pyh" }, "stable": { "version": [ @@ -2457,6 +2468,24 @@ "sha256": "0lwgvgnqf7vihglm0c5bwsxbl4x7f641289cji5s7jwy2dbsqk7g" } }, + { + "ename": "all-the-icons-completion", + "commit": "966b1292537834b4b3582a2c093ff810c44cbcc6", + "sha256": "0wn542h8rymb8g86zn6si5dvars4d9h3kwv1b1w00jl44kxsii8n", + "fetcher": "github", + "repo": "iyefrat/all-the-icons-completion", + "unstable": { + "version": [ + 20210728, + 2119 + ], + "deps": [ + "all-the-icons" + ], + "commit": "96500418541b7376cd0b3e4583b9509c0dd92b27", + "sha256": "0sn5jxmhdpnnjn8x99vc9m9d31kw9alkkdr0xc345aa0ssjlkf6f" + } + }, { "ename": "all-the-icons-dired", "commit": "26f650e465b22a0afdb77318aebfcfbdb832c9ce", @@ -2519,8 +2548,8 @@ "deps": [ "all-the-icons" ], - "commit": "c1c0606a793b71c8c1efc3c55dfcc22182214f24", - "sha256": "0p0icyj9084q7gm3bjknxgxd6g36sgy3b1kpxlm3fmh93j0v6l32" + "commit": "165f1702f6f49f4fc2fb15534ede141102657aef", + "sha256": "0k985lg08dml5cpw9piqhwrh27bbxwqgsy4zcj4f40niaallk6fy" }, "stable": { "version": [ @@ -2575,28 +2604,28 @@ "repo": "seagle0128/all-the-icons-ivy-rich", "unstable": { "version": [ - 20210727, - 757 + 20210823, + 1544 ], "deps": [ "all-the-icons", "ivy-rich" ], - "commit": "2a4baba0343d1e4dcabc29e5ccca596fd032ac90", - "sha256": "1fy86vkn5j0v9brkfzfjrwr1zrp792i7pxywlrflahcbxd8v68pp" + "commit": "09b887c01aeb33d715a1f8269f45c38594614d93", + "sha256": "0l6brqdqqgcijd2jfycy3i2n39bwcq7m12km8hg3kx4bv0zmn00g" }, "stable": { "version": [ 1, 6, - 2 + 3 ], "deps": [ "all-the-icons", "ivy-rich" ], - "commit": "07b8c5271719afa6a4c598c2a19f4a096ca6efe8", - "sha256": "1blr46w08s9f3wrcarqds09is9akdsq8faghshby5fnk9s5srkq3" + "commit": "66824c6468cbe256d7e5012f516f6840b5ab1de9", + "sha256": "19i7gnkwa7v6balx1qhd68rl1bxghl2fy442ymcaxl3yykc2hx9d" } }, { @@ -3175,11 +3204,11 @@ "repo": "bastibe/annotate.el", "unstable": { "version": [ - 20210620, - 751 + 20210819, + 1443 ], - "commit": "9aba6305fef54f32b085a56ce2b843b3d8194ac2", - "sha256": "1n2pgvc4fw8r22ck2r3jmkrrh1vlwv1r35ljy5g3b95zjh11w7g4" + "commit": "4ae1d4f2a6b6d7e598285c6a43ae1785d44147e5", + "sha256": "0i1ldw5iz61p3sp8anihf3a16z56jqgznrwphgf0b1kl0sdsq6lq" }, "stable": { "version": [ @@ -3217,8 +3246,8 @@ 20200914, 644 ], - "commit": "c1c20b8d29838b4e0708b768d98e2edce933d15d", - "sha256": "1rscm80nrgr1c00vcp683rvc42wdll08jc3s2srvaxw3iadd03ln" + "commit": "2bab72d99ae3330cbf3a94450a647158838a1d1b", + "sha256": "1xb1rawj2hl12xmpn9xk2zw69wpvx2ssd3wj4k32dhgi2vcg2rck" }, "stable": { "version": [ @@ -3538,11 +3567,11 @@ "repo": "dieter-wilhelm/apdl-mode", "unstable": { "version": [ - 20210423, - 1115 + 20210819, + 2136 ], - "commit": "5e9de43494cc307a3b43b0eebf774c03670a4582", - "sha256": "00lz9mcxcmlgnnbc05b49arxa2fcckjhsxdcqi66v66zn9h8kr13" + "commit": "9e80feb61a173d776495f8a36545b966acac21f2", + "sha256": "00wihhzn779rqmhb41n1f2wd69cfcqq5z86l5hmcyx7lhn0nykyj" }, "stable": { "version": [ @@ -3668,11 +3697,11 @@ "repo": "emacsorphanage/applescript-mode", "unstable": { "version": [ - 20210223, - 1539 + 20210802, + 1715 ], - "commit": "267a1453f58a6a6577a1d5752c876fdaa2896a6d", - "sha256": "0l5nfj5wz9cjpl9906w8q3p6ciwr6imf4nqh8i2s4dzip4n9w6nl" + "commit": "00c141bbff46c89a96598b605dee05dd1d89f624", + "sha256": "1d3ssyp90k26282p46c91wj1bvqxpvghcsicp14bnh78llwninvc" }, "stable": { "version": [ @@ -3714,11 +3743,11 @@ "repo": "waymondo/apropospriate-theme", "unstable": { "version": [ - 20210514, - 1710 + 20210809, + 1934 ], - "commit": "b17a8ce0686848ffd7c6d20aa66bf2e97b7ce3e5", - "sha256": "0lba49k05kvx63yxcc3nqmiy2bbp7cl81zfap346kwgwss9fbgx5" + "commit": "e84255cf485004b6b2cb37ce9e0be62fd6512f8b", + "sha256": "06rcf08f8qm068ck2mxqbg03vkr0hf5nnsbzpwmn7i6qqw23x6jd" }, "stable": { "version": [ @@ -4101,11 +4130,11 @@ "repo": "jwiegley/emacs-async", "unstable": { "version": [ - 20210501, - 1527 + 20210823, + 528 ], - "commit": "9a8cd0c3d5c120bfa03187c54dba6e33f6e3ca19", - "sha256": "1s2gdilaf38m2dg6nm4kcz5n4n455a9127pl4cbz9lg7mp3l2pg5" + "commit": "d834cd90fe6f1d87dab86b637d23958241cadac3", + "sha256": "00n9w9qh84fp60swcpccimch4lq0rcwqm7aqjym5hqmkc1ncz2bp" }, "stable": { "version": [ @@ -4212,11 +4241,11 @@ "repo": "jcs-elpa/atl-markup", "unstable": { "version": [ - 20200810, - 845 + 20210731, + 609 ], - "commit": "67b67de68f3d878f98c96ea7e340344aed6e6e46", - "sha256": "0qg04bn50s2chnwk7krdfkhq6y944fbgbwxs507qgmg4n0iyzkln" + "commit": "e586473d49acbb16c092017e3e65bf8798c397dc", + "sha256": "0xpbxzv5rc3260bl3d54n7r3r14r1pkvwz48p2nl15hr2fzxaass" }, "stable": { "version": [ @@ -4604,14 +4633,14 @@ "repo": "emacscollective/auto-compile", "unstable": { "version": [ - 20210728, - 2054 + 20210820, + 1353 ], "deps": [ "packed" ], - "commit": "504863340fa82cf8aca785ad1f2a541be598c3d6", - "sha256": "0d1z6k4gcx9yxvvsi9m3pz0nfbql1f2vs29ccjcdycaxlq04k7ls" + "commit": "ff21de70f3523afa2976d1e787e2febefeba2653", + "sha256": "1pwj7zc870vxvgbq7vzz924b6a0jhx0fkn0igkgz2piiyic627b6" }, "stable": { "version": [ @@ -5116,11 +5145,11 @@ "repo": "jcs-elpa/auto-rename-tag", "unstable": { "version": [ - 20210629, - 1537 + 20210805, + 1344 ], - "commit": "9511446c4359100d0b6433579e663852bf8f36ef", - "sha256": "0gkkgkqvs7sq5s43srzzi8s5xm4pj53x9lifg79cad15a6i9a8sc" + "commit": "0967cc8e5aeaf7f6a36793e2d36717fd125647a8", + "sha256": "0y1hwwk2rijfpjkagn9c3rfvf350d8nas9g3lqgc7baq9jragizi" }, "stable": { "version": [ @@ -5532,8 +5561,8 @@ "avy", "embark" ], - "commit": "4f969299a4726058fae8773bd9c4fb7c58371c86", - "sha256": "1mfhqv66j45mqs90i5jywxw8cv5v1df42s4q5svx9f75jjwrn8l7" + "commit": "ca517fdabd182b0b905d0ef0cb380facb6697670", + "sha256": "1pb6rarb86x9bl064jqick3d7znl0a7ibx27yx30nivi5plrkb3j" }, "stable": { "version": [ @@ -5582,8 +5611,8 @@ "deps": [ "avy" ], - "commit": "2c5e0c08d6cb27c213a8eda5c7033e3ff2aa9661", - "sha256": "11sa9a5vh546dpnxmrhxps77c225vkrfqsb6qlsnli2kmp5cxj48" + "commit": "18bb320f395b7e412f7e377cf4c46d205d4b4e1a", + "sha256": "0p96kxyq1pk9cnwxis80vr6xnklcg2n8gp7pj8z41kz1i2fn960m" }, "stable": { "version": [ @@ -5720,8 +5749,8 @@ "repo": "cniles/axe", "unstable": { "version": [ - 20201113, - 2237 + 20210816, + 1530 ], "deps": [ "dash", @@ -5731,8 +5760,8 @@ "s", "xmlgen" ], - "commit": "f6fb37f6035605755be41d018ca8b70caa2bc75a", - "sha256": "10sb1a5r3ip1p7rckc2lzxbc5wv1fa3r10jqrsaz5y218rx3c2j6" + "commit": "eb4a5b3b06c3cbed521e2c0e0985941c367f4e74", + "sha256": "125bqkakk0k6cs0bmhc46xba3if6zl0k7f8l4d07dbnzdinijc8x" } }, { @@ -6094,11 +6123,11 @@ "repo": "belak/base16-emacs", "unstable": { "version": [ - 20210710, - 1645 + 20210805, + 1401 ], - "commit": "7f1db3df9bb6f4a3c9f4d3c10b9a6cf231752547", - "sha256": "0ycxj4lmmkbpmb8yizys25rdh0zrmw4sbgj19wb6zp2d30xk32qf" + "commit": "9836cc26c2f8ed9d809feee2bfd8c082cfdbd033", + "sha256": "146fmjkib6d05xyz88yc903w8wla19f0vy3f91yr4qj7ab74frxf" }, "stable": { "version": [ @@ -6117,11 +6146,11 @@ "repo": "szermatt/emacs-bash-completion", "unstable": { "version": [ - 20210615, - 1601 + 20210821, + 1941 ], - "commit": "d9c97b741db389ceb127b0f0180b2087cb24d0ef", - "sha256": "15m7gbwq1lmca2rlfb2ik86ibmvjnj58yajbp5d23xn03qqd6x6c" + "commit": "c5eaeed156ab906190c662d491269230967104b1", + "sha256": "0r221iirqsbz13s76r68i496izbirrvcw8ql3wsh205zmxa3jqg1" }, "stable": { "version": [ @@ -6312,11 +6341,11 @@ "repo": "bazelbuild/emacs-bazel-mode", "unstable": { "version": [ - 20210715, - 2325 + 20210804, + 1431 ], - "commit": "3b0a3a2200cd93497563812d4026c4d67b13e91a", - "sha256": "0pgn1j6fpj2qjns2zvzaswk5l65mkd6sxs08l6z0q2926gb7dpx9" + "commit": "c4292f69c3bf4faa8393438489a3820c1d52b6ee", + "sha256": "0pk8j1vang644rpy8ch126lnxjpj5hz0qyy511q43q5fnx9fi30d" } }, { @@ -7038,14 +7067,15 @@ "repo": "bdarcus/bibtex-actions", "unstable": { "version": [ - 20210727, - 1208 + 20210825, + 1743 ], "deps": [ - "bibtex-completion" + "bibtex-completion", + "parsebib" ], - "commit": "a2569ef74b40ed6b6459ed1b1b19e12282b426d0", - "sha256": "02yvr60ri07igfq8c0v2a0hybqzkvnacqp34jv1y4dhd5igbhfdc" + "commit": "f4d9af720d3854ce0e746312061372ae30e2cc97", + "sha256": "0lynllvkyy9svi9c5gsqs5vyp0fgyq43a83drf67x0x14lfhdr1a" }, "stable": { "version": [ @@ -7965,15 +7995,15 @@ "repo": "emacscollective/borg", "unstable": { "version": [ - 20210618, - 2112 + 20210812, + 1005 ], "deps": [ "epkg", "magit" ], - "commit": "6ea061f30065493e206132ff3f7a2d8febb859d0", - "sha256": "0m7c512r789pbx2qgzx1zgbr2w4y6ma8l7zhvslji57hzhcvj10y" + "commit": "018d5334b4c9af297799f0644e09946a13d55edd", + "sha256": "03h5cgsk3wxpw6g946ia0dbzazlbpip93zhirjh7vxcqp4wwyvcf" }, "stable": { "version": [ @@ -9699,11 +9729,11 @@ "repo": "ocaml/caml-mode", "unstable": { "version": [ - 20190413, - 1205 + 20210825, + 649 ], - "commit": "38ebde12d3d529e6ef8078967997d32226e69e82", - "sha256": "13gz0s7bnjsnab7wn8mk0zva7756hf68izqp9agd8vqnm0c75nlp" + "commit": "3b6913ee6af31139bdee2c236ce2b3a10eabc74b", + "sha256": "0gsbhwymr2c3fy6mzrvk70q874r9yxf46vlkyljwp1srw095xi7x" }, "stable": { "version": [ @@ -9760,17 +9790,17 @@ 20210707, 2310 ], - "commit": "c4c70235ebbfc1733789f07f084c2d071679feee", - "sha256": "063gfjlay5fdgd19q363np9p5s24hxrwvxbxahkjjfn40mnb6nqi" + "commit": "86ae7e69e2d07d5dfe9eac66c2b359d098c682a3", + "sha256": "0kvadcjrrj60p3ijbz6f51f2ziapig06zzmkycaahailhf9v1s0b" }, "stable": { "version": [ 0, - 8, + 9, 0 ], - "commit": "57a4ca5af5a7f55b768a9d9d6655250bffb1257f", - "sha256": "0z7p9687bdvhddgyb6b3j0c3bngynnyvc8z6yp4hhynvrlvsmy5d" + "commit": "7f554a89784d3455970fe1edfb9f0044ac570aeb", + "sha256": "038i40apywn8sg95kwld4mg9p9m08izcw5xj7mwkmshycmqw65na" } }, { @@ -9811,14 +9841,14 @@ "repo": "kwrooijen/cargo.el", "unstable": { "version": [ - 20210615, - 1543 + 20210813, + 721 ], "deps": [ "markdown-mode" ], - "commit": "1dd9771853b4327ed161232b65520c13ffe3c0c6", - "sha256": "12pwlww471s6n4vy367m3z8gscxpapi7q6sz5siyis9vjwz3ql2y" + "commit": "794f902bb84437afcc5d677d4a7a996c1f98359b", + "sha256": "0df3ldjwrk0kdyv417k1aq4nph749cgip48af56pq7rcffccdyk2" }, "stable": { "version": [ @@ -9920,8 +9950,8 @@ "repo": "cask/cask", "unstable": { "version": [ - 20210621, - 1830 + 20210801, + 1509 ], "deps": [ "ansi", @@ -9932,8 +9962,8 @@ "s", "shut-up" ], - "commit": "9fbc15dfe8b0739082e7bbff65f226dfe74ac9dd", - "sha256": "16pc37b6qaaar8gb4b6rzx7bwdj1lamg34a0nlqw6bkp0wzv1d4v" + "commit": "09c3851c118d2e850314e7f3b9efa786932a145b", + "sha256": "1fdnphlg9ip9cwvl1cxjhvlvgd9hxd5c466r79hrzq81vzn076cg" }, "stable": { "version": [ @@ -10112,11 +10142,11 @@ "repo": "xuchunyang/cc-cedict.el", "unstable": { "version": [ - 20200705, - 443 + 20210814, + 819 ], - "commit": "6bb9481e48b889503626b4e3cb7cfec8d14cbf4b", - "sha256": "0nxq8p7hafpl1xq9daf5lcyk8ragdgnwsfxxd2d0rnzmyflgw5wi" + "commit": "03fbe7d1589d36f627ef9fe7b86f9fe6f623cbb3", + "sha256": "0lp5n3ar1k0scn8xzjylp7mgzf637ibbzai039n72z68nx2drilk" } }, { @@ -10191,11 +10221,11 @@ "repo": "cdominik/cdlatex", "unstable": { "version": [ - 20210621, - 654 + 20210804, + 452 ], - "commit": "614a8d94f67cdc1eeef8371f7b6b90aef8a78158", - "sha256": "1i9la8rh1sgvnk1kwd180x3daaglh3xzlbbfirnjsiqn3yyl9flk" + "commit": "f215b70c5cb02bbc43f5a7d5c8e5e3460ff82428", + "sha256": "0gf4xjzf3afcg88cvjmxq87pqci8s8y2av4phbh3bgd00myjmhfw" }, "stable": { "version": [ @@ -10449,8 +10479,8 @@ 20171115, 2108 ], - "commit": "d33da533194106a0a30dc4a22f11acbd2846cfba", - "sha256": "0q89wmfa4pi2a3vs9qcy27dharxlqpxm9b4lpxbjzii9f08fad0x" + "commit": "90bf324af47e6c607a4d7312a1c69701c2b180fb", + "sha256": "0s3sdvv3r93bz62sk7bk6bdrj5gx6qb9mqd7fd1gkcrryhwb05np" }, "stable": { "version": [ @@ -10683,8 +10713,8 @@ "deps": [ "avy-menu" ], - "commit": "d77c4d64fc8acc386a0fb9727d346c838e75f011", - "sha256": "11hls33r3lq46griyvpfnwkgwfwa4adfjzd03hcx2dn5ji0x0yxb" + "commit": "16e9ce0380a7661c6dae9ccec1172fe4757df682", + "sha256": "0cbs6lpljldz62vy2qqb3bdp3yarx84qpnmayyyah128snb9ic8v" }, "stable": { "version": [ @@ -11240,8 +11270,8 @@ "repo": "clojure-emacs/cider", "unstable": { "version": [ - 20210729, - 521 + 20210825, + 1937 ], "deps": [ "clojure-mode", @@ -11252,8 +11282,8 @@ "sesman", "spinner" ], - "commit": "52ad2bc4ebadf6692d9c2d5cfcae467e149beea6", - "sha256": "15vr53diq6q8sj9cnb3w8smxx6jlxp0ps4vjqk24yv1lgycfq0ng" + "commit": "fd5232d03f62c2304daebbdbdf99f6ad860fa702", + "sha256": "1aj289145kza226xlg2zqi8m9wfrpr05xx6b6dvv1g9508jhxvw6" }, "stable": { "version": [ @@ -11522,36 +11552,37 @@ "repo": "andras-simonyi/citeproc-el", "unstable": { "version": [ - 20210727, - 1320 + 20210822, + 1949 ], "deps": [ "dash", "f", "org", + "parsebib", "queue", "s", "string-inflection" ], - "commit": "ad453630ced1fd1aa1f760b96da1cd702c77aaa9", - "sha256": "1v7k1psvj1n90y5nb8cflapfzn5hf75hxsfdmy4ppliw97b5bq9d" + "commit": "299e52b2dda37960d609efa78c40e255001d163a", + "sha256": "0dqnyff2vfncw3ais2ml7k7lsdsrwjvw3kpynw9mb5si88sxh24b" }, "stable": { "version": [ 0, - 1, - 2 + 9 ], "deps": [ "dash", "f", "org", + "parsebib", "queue", "s", "string-inflection" ], - "commit": "80b395b8a0c7fc92290f0d1bfd1b5520ffd415fd", - "sha256": "1b918gjzds9jzs0ywfr41wd069l234pshpa9rn8srkzlpj5lac4d" + "commit": "15034f1706cc9eb0ef97dfeeb7884da2a43b88a9", + "sha256": "1m5j1abyk68f3d1v781yrx2xkg42vyfgfckbj2yk2lgk6d7rz0p1" } }, { @@ -11572,8 +11603,8 @@ "org", "org-ref" ], - "commit": "22a759c4f0ec80075014dcc594baa4d1b470d995", - "sha256": "1j7jdc2as87zycbfhz2nav97dqnx3xnq321dbjswmidg5fbhsr7q" + "commit": "0fb4c96f48b3055a59a397af24d3f1a82cf77b66", + "sha256": "1n69016gds7kmf3253w36i40rf26g3qvgac7n0z67im9jvjfa6a7" }, "stable": { "version": [ @@ -11600,20 +11631,20 @@ "repo": "universal-ctags/citre", "unstable": { "version": [ - 20210728, - 125 + 20210823, + 1603 ], - "commit": "5c5958e467e4da7a8578039643d5036b3395e3d6", - "sha256": "1fal5cbj1wbji4ail1b8k9bc3c8mps7m68j7lk2086x67l1il9di" + "commit": "9a0dcc5dad0b0796c8febba1470db49b3e845f2b", + "sha256": "13zl0bxnxqm6cq71lj02d906mpmmd1xpwji3d23fvy80nkxzrm86" }, "stable": { "version": [ 0, 1, - 0 + 1 ], - "commit": "dcb5ec12d077c9a8f1c165a0868f98098494f78c", - "sha256": "1mf0d9avyhz83kb5fz2flwwn1knrbgrs0245q0layda9bya5i5yk" + "commit": "b74147e2a166e27c7c6074ffeaa5f273d4f938bf", + "sha256": "04vpcn8x188kl43pra3y57n1kky1fm96q1ym8f8kq93qnbjz0b9x" } }, { @@ -11624,11 +11655,11 @@ "repo": "alvinfrancis/cl-format", "unstable": { "version": [ - 20160413, - 45 + 20210824, + 2016 ], - "commit": "4380cb8009c47cc6d9098b383082b93b1aefa460", - "sha256": "108s96viral3s62a77jfgvjam08hdk97frfmxjg3xpp2ifccjs7h" + "commit": "a391d7696bea972ad9a968426e712feddc284ef4", + "sha256": "191jkjka1pv2ssggk138gni38ckbndjlk344px3r1p0mnv3gmfaq" }, "stable": { "version": [ @@ -11855,26 +11886,20 @@ "repo": "redguardtoo/cliphist", "unstable": { "version": [ - 20210426, - 245 + 20210813, + 750 ], - "deps": [ - "ivy" - ], - "commit": "0d02d72fb63453ff5623b26234a63f66090da7ac", - "sha256": "033z367nmfh6mc1k8kv2m3xsxjw44hnvgiai2n7fp4h9jdv5j8h8" + "commit": "a794c95e2f70a9b042af7bd07e2483fde75f2a2e", + "sha256": "0rbgg6vrvsmjlgwq0v450g41qx4gx9ixx4j30aa4i78ryxz4d76r" }, "stable": { "version": [ 0, - 5, - 7 + 6, + 2 ], - "deps": [ - "ivy" - ], - "commit": "1ef50459fa6044c4d571cec0009368948bcf5fc5", - "sha256": "0xba2gxwy1y8zl9nvga186873icvwfi0yan3qbw2vdkpzry5ifhk" + "commit": "a794c95e2f70a9b042af7bd07e2483fde75f2a2e", + "sha256": "0rbgg6vrvsmjlgwq0v450g41qx4gx9ixx4j30aa4i78ryxz4d76r" } }, { @@ -12222,11 +12247,11 @@ "repo": "clojure-emacs/clojure-mode", "unstable": { "version": [ - 20210706, - 1318 + 20210821, + 2010 ], - "commit": "ba59133b8ebdd98fdd282d21514dc718d600568a", - "sha256": "0lynpgkrl7vn12zfdhknsv94i3myamzlqwi9wd8fh06q9i0a81cz" + "commit": "e1dc7caee76d117a366f8b8b1c2da7e6400636a8", + "sha256": "101fallqv90dgjdiq24hc63yw2a3df12y5cclcg9p4hk8rinc80x" }, "stable": { "version": [ @@ -12252,8 +12277,8 @@ "deps": [ "clojure-mode" ], - "commit": "ba59133b8ebdd98fdd282d21514dc718d600568a", - "sha256": "0lynpgkrl7vn12zfdhknsv94i3myamzlqwi9wd8fh06q9i0a81cz" + "commit": "e1dc7caee76d117a366f8b8b1c2da7e6400636a8", + "sha256": "101fallqv90dgjdiq24hc63yw2a3df12y5cclcg9p4hk8rinc80x" }, "stable": { "version": [ @@ -12555,17 +12580,17 @@ 20210104, 1831 ], - "commit": "9251205512c49bbdda5d82f48126dc5b8e79d70f", - "sha256": "0jkkb213w1zngask7n542rj8idjxvzbxy51pgydhas57m6xng4af" + "commit": "e0a34750f8b7a014d021fbde0e860de5a5073473", + "sha256": "16nmp6arjdgd9s1jj2cnj5dak0sf5ass2w894d6xdqhk9mz8g1gi" }, "stable": { "version": [ 3, 21, - 1 + 2 ], - "commit": "f7cf69e34a1607e8ea2b6d10fef6a6058377c24e", - "sha256": "18gwkb8p9086qg4acfbs74891nzh5wqs3id6iv5zqwc76kvcb4y7" + "commit": "31c5700d4322ecfa169db2fccf385d6eced4e737", + "sha256": "0vjrv831qjc0fkayd096nmb0l0q3aphbd8gp5c6xk1hckpgzgwl0" } }, { @@ -13524,11 +13549,11 @@ "repo": "company-mode/company-mode", "unstable": { "version": [ - 20210721, - 2003 + 20210825, + 1508 ], - "commit": "7b731e7d435d8782c5095f6f269704a5e21eccad", - "sha256": "1av9ln4nhkjqd6x6v43yjnzp07kx1qhzcxjni343x4npix6p41xm" + "commit": "c7234a9df0b1a624ae0633d3a7d08f92109ff85a", + "sha256": "0i5xvi21gmqk2abpll761cz6g0g2i7s2gy63hvi2y3ac611fww2z" }, "stable": { "version": [ @@ -14411,15 +14436,15 @@ "repo": "vspinu/company-math", "unstable": { "version": [ - 20200131, - 2337 + 20210731, + 2019 ], "deps": [ "company", "math-symbol-lists" ], - "commit": "a796053590012e6a15c8b527b521ffc15d137bd0", - "sha256": "1y1fw926insgdl7ib9ynxjrxf3p6wfjkfxvf5vgdca7267cvcll1" + "commit": "45778f5731c97a21a83e3b965cbde42018709afd", + "sha256": "0s3jnslsd2licgav26s0nawwhhs4yrmz9chl0ghkngplichnp9mk" }, "stable": { "version": [ @@ -14450,8 +14475,8 @@ "maxima", "seq" ], - "commit": "74e10d5dedb16f74efc28299c98dd7db9a4392d6", - "sha256": "1r04mbn33y515b9fwr2x9rcbkvriz753dc0rasb8ca59klp1p5cv" + "commit": "ce5fd160c193e387d9e2bacdba4065c4b4262cb1", + "sha256": "18bjr4n1m1y76kh0pp6ci7ywklrmw611ka3avrj23lb0wwrljf86" }, "stable": { "version": [ @@ -14600,15 +14625,15 @@ "repo": "xenodium/company-org-block", "unstable": { "version": [ - 20210623, - 731 + 20210825, + 2107 ], "deps": [ "company", "org" ], - "commit": "4fd9a9c673225196e211bb3ced411d0ef9ff2f88", - "sha256": "1nsgkamrq54vm88imdyhl4326fxl9hvkfp0prckgjcg2r37pkxar" + "commit": "115af0a3625f4669358eca568466d468cacc78bd", + "sha256": "13kdwi4d1pvba6wv9yn1s0dl4cnq61zwf3j647d1s5ybqlrw5f4r" } }, { @@ -14627,8 +14652,8 @@ "cl-lib", "company" ], - "commit": "8a0dc9888de87ea3aace06628bff52ed32f3ca2b", - "sha256": "1xcsm72by6jiqr9y9fyk70nshsj5dj494faz9734m67fmxq45pfj" + "commit": "e29075f810af73f6bf7803eebf15d96bffee7154", + "sha256": "08vfdp7q6x5fk2nn5dl884cyysxrl2gw8f16g7wqvf7v24jmx71d" }, "stable": { "version": [ @@ -15590,8 +15615,8 @@ "repo": "necaris/conda.el", "unstable": { "version": [ - 20210409, - 37 + 20210818, + 103 ], "deps": [ "dash", @@ -15599,8 +15624,8 @@ "pythonic", "s" ], - "commit": "6db0720b6dc8880d7d6e7dc2953b4769ca6bbf71", - "sha256": "1p44pnjy9gyjhnqg986ab5qv4dm1cfz3mr7n6r4kvy0xkilk8ikx" + "commit": "4de6eccda5ffa1a15c6f2695d93234047a127d88", + "sha256": "1mk8511zx429970k5l4mqjazr883mnz63hzk9h9jb17fvhv38d3i" }, "stable": { "version": [ @@ -15754,19 +15779,70 @@ "repo": "minad/consult", "unstable": { "version": [ - 20210729, - 844 + 20210818, + 1128 ], - "commit": "ebed71d554a5eda6914de6519cd30b867e9dbc28", - "sha256": "1bk9h3yh4r7l0jsmas83sa0hvzsbj8zvracf081jdhi7vl27p9zq" + "commit": "105a1ac50169382368a36ed53d7af908d02ffa07", + "sha256": "01kx3zg858bqyajglamxn319qabycnabzj73kl4x7sd55p2yi179" }, "stable": { "version": [ 0, - 9 + 11 ], - "commit": "ee58941308d83a717728f056ea753e80f68cfbc0", - "sha256": "0iy6lrqbpi4lv7141rdawpn278rxinfxspwb81n04azyxrk28vlw" + "commit": "105a1ac50169382368a36ed53d7af908d02ffa07", + "sha256": "01kx3zg858bqyajglamxn319qabycnabzj73kl4x7sd55p2yi179" + } + }, + { + "ename": "consult-dir", + "commit": "461a4fc1ea3fcfac1a10e8004d7a917b14a0b771", + "sha256": "13fnx3ryrb7p220haa7nj9227aqvxggjdrxznfsacyjb1skpl6r1", + "fetcher": "github", + "repo": "karthink/consult-dir", + "unstable": { + "version": [ + 20210820, + 339 + ], + "deps": [ + "consult", + "project" + ], + "commit": "e87362a89c91b33fa683f58ee05947ae4565fda3", + "sha256": "11zrwchwdzbrq97dvi2kk8ff1mic3nx8pl103w3i4c8h2w6a51nx" + } + }, + { + "ename": "consult-eglot", + "commit": "ac5f82428f771a5642312a970ec31dd196139dc7", + "sha256": "06pfr848irdgqppksxc4xsa5icj6m8naggpmd0mzlc3dlz0f9lkq", + "fetcher": "github", + "repo": "mohkale/consult-eglot", + "unstable": { + "version": [ + 20210822, + 1829 + ], + "deps": [ + "consult", + "eglot" + ], + "commit": "a6aeb6fa078cc7ea6537793868f606b55ac63088", + "sha256": "11cwz2259i6fj4xckcvx8q8h3sgwxddjkddgiv7406d88m6ma72m" + }, + "stable": { + "version": [ + 0, + 1, + 0 + ], + "deps": [ + "consult", + "eglot" + ], + "commit": "2d0e08e92bccc5ed247d4e9244c5c9ee69207e2c", + "sha256": "01bjgabrw7kq6xy6m3b4assn7g5paq74m253pxrjzqa86rqh44sx" } }, { @@ -15873,27 +15949,27 @@ "url": "https://codeberg.org/jao/consult-notmuch.git", "unstable": { "version": [ - 20210725, - 2113 + 20210815, + 1919 ], "deps": [ "consult", "notmuch" ], - "commit": "62462df58ecd888ae8a3a8421078227acdfd36d1", - "sha256": "0z4ayx6xh9x9rqj1shm4kw4q1xw99xncisd0c4m9g5qbn4mq6yas" + "commit": "5e5f42faaae3e0d372f103b9de276d1f7f1c18e0", + "sha256": "1q8ynrrii92x0wv6hm8zcy0nydshg6jqibm7a85vhbnanh161qx1" }, "stable": { "version": [ 0, - 3 + 4 ], "deps": [ "consult", "notmuch" ], - "commit": "9e65c421cf54ca12234acad727818fa0fe60fa3e", - "sha256": "19flyh3v1xm2zswzjkvjbijvpbq5r8isafza4fd0yicvqbjyklhx" + "commit": "a5133b9e1f19b6d51e51dd5c5e3a4f236ca29b57", + "sha256": "0x2lz2df1rjq3vdxvqqnxqxh257hq5iyx1w3yc85w7lmnb59gbvy" } }, { @@ -15904,14 +15980,14 @@ "url": "https://codeberg.org/jao/consult-recoll.git", "unstable": { "version": [ - 20210620, - 1955 + 20210807, + 1613 ], "deps": [ "consult" ], - "commit": "7b54edb8ac011015ccb43c9d6193e455b4405425", - "sha256": "1qz0r36nv5d52g9i4g9lcrp9gh1kf16q8lgjwgxxqi0qrq2h99z0" + "commit": "fe7a09b99d1497a30e11a2f86b6415adde00788a", + "sha256": "1bqmr686ncn46fbbq000mpbqrhf76sc9npbyg85053rhnwjdkk84" } }, { @@ -16246,15 +16322,15 @@ "repo": "abo-abo/swiper", "unstable": { "version": [ - 20210509, - 830 + 20210819, + 1455 ], "deps": [ "ivy", "swiper" ], - "commit": "031d4d051da1d8fd20f0f46e8df66c426bf3174c", - "sha256": "16hsnh0l51vayr7a8h4y9h63pw0w5kzsdwhk90bypf2fpjgqdx94" + "commit": "7cdde66c95d5205287e88010bc7a3a978c931db0", + "sha256": "0pvgh4krym43vcyiq4bsjl63gg795jlqh6kaa6llsv1awvywfqww" }, "stable": { "version": [ @@ -16414,16 +16490,16 @@ "repo": "tyler-dodge/counsel-edit-mode", "unstable": { "version": [ - 20210103, - 1508 + 20210824, + 1504 ], "deps": [ "counsel", "ht", "s" ], - "commit": "82234306562f47ec50db212888dbcf21ef0b70f8", - "sha256": "0jfl33npvw6rqk734ml87bfvnjrsgzim0z397j1bg7klva60j7q6" + "commit": "413047aedb20e85555785123dbd54eb8e91f6014", + "sha256": "02ni7lmm1mpxwha39cnbqjwzgdff55af1d9b05dkl0n01q9vglfg" }, "stable": { "version": [ @@ -17312,26 +17388,26 @@ "repo": "bbatsov/crux", "unstable": { "version": [ - 20210309, - 838 + 20210811, + 436 ], "deps": [ "seq" ], - "commit": "20c07848049716a0e1aa2560e23b5f4149f2a74f", - "sha256": "0v65zy9f5wsq9vpibfccyyv6ww4fwgyx3vc38vz83j0c5b2c9r6n" + "commit": "6bfd212a7f7ae32e455802fde1f9e3f4fba932a0", + "sha256": "01727k1fxiq1v2q6slp23gc98yqhflp6dcy3yr0yn9ibqx3pi93q" }, "stable": { "version": [ 0, - 3, + 4, 0 ], "deps": [ "seq" ], - "commit": "5b3c8155a9e9fe6f189645d175976026a2dc7b8d", - "sha256": "0809pb8626i6z1dics3i1cs30p4qd8bzqcgr20lx9k3yq2abq2k7" + "commit": "3445e7e027592c50505c5237ed1484715d2a3892", + "sha256": "1h28chpyq61k72qh749r5kqq1y70wx3xw9c3zyfzmy750wlw6nyj" } }, { @@ -17423,20 +17499,20 @@ "repo": "emacs-csharp/csharp-mode", "unstable": { "version": [ - 20210727, - 1254 + 20210821, + 1939 ], - "commit": "27cd2e8da1f374fd9db121826bf78484b0e4079e", - "sha256": "1qrcxyn9n2xn4k2is8q8brvicncc9x78gq3sl8xw00smww3i3rdj" + "commit": "45fee1a8ae2595a57ecdfbd7ba708c488652173f", + "sha256": "0nl3jsrp7b280h8mw54gcxc8jbn4jgbsp5qc05d41k20akfskwx8" }, "stable": { "version": [ + 1, 0, - 12, - 0 + 1 ], - "commit": "69fe52b5908e1b29b2765d7e01cd6a8f0fc16332", - "sha256": "1x40xm9d5sbxbnyxl12ppkzlgxzyn0bjg2vmc139jpkazmmw7r7k" + "commit": "45fee1a8ae2595a57ecdfbd7ba708c488652173f", + "sha256": "0nl3jsrp7b280h8mw54gcxc8jbn4jgbsp5qc05d41k20akfskwx8" } }, { @@ -18077,11 +18153,11 @@ "repo": "mrkkrp/cyphejor", "unstable": { "version": [ - 20210319, - 1423 + 20210816, + 1607 ], - "commit": "cf580995f891e339a9485ba91d6cb81a2abd61e4", - "sha256": "1k0zwgr80figw0xkni2ih87bi566q3j4009dhicq4ldv2lyaybl9" + "commit": "576d237a46be79449a22e3a7912a3464d7b0c233", + "sha256": "1jlyfzqmysbp83nhgldlri86mpsg9ch4amwdjm8li597w9g08fd0" }, "stable": { "version": [ @@ -18119,8 +18195,8 @@ 20190111, 2150 ], - "commit": "0574dbceef7b8ee16a9cc94091c3629dfa23133d", - "sha256": "1gnwy0pdxwwwicp46w9g9mcsnz070wb7hjvrj33nilsv796m3kss" + "commit": "8af0271186cc642436306274564986888d5e64c8", + "sha256": "0mffl15acpqv3n2hi73nav8jidr74lbps5mhl8vg5c6h3qm2y54l" }, "stable": { "version": [ @@ -18327,8 +18403,8 @@ "repo": "emacs-lsp/dap-mode", "unstable": { "version": [ - 20210720, - 448 + 20210812, + 619 ], "deps": [ "bui", @@ -18340,8 +18416,8 @@ "posframe", "s" ], - "commit": "d472a6c937cf519434e718e873c195f5d1e80f19", - "sha256": "17az0rvcy84iahlfdn246marjn4kgrif4gnv0h1zf4sdznk2aijh" + "commit": "8ec7e98986ea46e3c36b7ecbdf9a6562c90c7632", + "sha256": "01lh0yy3zi87cjma2m1wch0ks45b0v6d05anxqsrpn4bladp8plg" }, "stable": { "version": [ @@ -18697,11 +18773,11 @@ "repo": "emacs-dashboard/emacs-dashboard", "unstable": { "version": [ - 20210718, - 940 + 20210815, + 445 ], - "commit": "67573ceb3db5bc7a5192311c6cac044cb29f61a7", - "sha256": "1ljcym1gwibldsp656a4h9x4hn36ywavqan7h8gk2grr5716cpx2" + "commit": "3926b1b756fb0be5f84776f578a05d31a244d5d4", + "sha256": "146bddpj6w70i1579bh3qdx0lphyfq2zhlhal5mmbcalrd6c785h" }, "stable": { "version": [ @@ -19091,8 +19167,8 @@ "s", "spinner" ], - "commit": "83e7812cda2673884b3d4d218757c7489f817fbb", - "sha256": "1fiwr55s4aq38kyai9k77lb7j0kk53bcrrhd8sw0yqb65a1n363i" + "commit": "341331918cc83b6cabf7ae91e8dba5b0de57b285", + "sha256": "15x0v6s67wz7bql5z57xy2wbklc8b6nb166yswdzfdvrv5301ri1" }, "stable": { "version": [ @@ -19462,14 +19538,14 @@ "repo": "liblit/demangle-mode", "unstable": { "version": [ - 20200926, - 2014 + 20210822, + 2210 ], "deps": [ "cl-lib" ], - "commit": "aaef0bd77a3ea9ce9132e9a53ac021b0f5d33e12", - "sha256": "0pz49zn81bwszcaq24x9p3kkybrl47xl3ndj5xalg4ifw7nw0ygb" + "commit": "04f545adab066708d6151f13da65aaf519f8ac4e", + "sha256": "0jkw3n7fp0fd1pmaxszncx2lvb5g3hszsm2n6axbvy8waqxydz2w" }, "stable": { "version": [ @@ -19701,11 +19777,11 @@ "repo": "astoff/devdocs.el", "unstable": { "version": [ - 20210625, - 1617 + 20210818, + 1622 ], - "commit": "f7c57d1878d78f076e2a2ef1c97129dc8aa4da15", - "sha256": "0fgyv5g23by8gddaai6q7dwv0f87fam91avpd0fx8klckyz3i5ww" + "commit": "19f897f03296fba882a7697d438f0e13529718ad", + "sha256": "0vygmqb7xwlmsl9in0qxnfrl0gjkjaxxg9xnxg55y55k1sf4wlbc" } }, { @@ -19716,11 +19792,11 @@ "repo": "blahgeek/emacs-devdocs-browser", "unstable": { "version": [ - 20210703, - 306 + 20210815, + 1600 ], - "commit": "f8572f208d58b2122df63ffef87fdd5112d83233", - "sha256": "10ywfkkczi6hzcz4hnjqxr77708hi22hgrvrykmwrh4lsfxl0iyq" + "commit": "4d81e4db165671ba3e7326dec72f950b26df4dde", + "sha256": "0jfrsqvlfv1xh8ss0c9pk4b5dffrxq8i3vp08ckigbdbk31fsvmx" } }, { @@ -19933,14 +20009,14 @@ "repo": "dgutov/diff-hl", "unstable": { "version": [ - 20210716, - 241 + 20210811, + 28 ], "deps": [ "cl-lib" ], - "commit": "d225def4a473a16ac994124e063695ef9cef3308", - "sha256": "1wizqf5qj0bxx9b5d0j726in1alqv0wy508y5ivaw7hcyggkg9i7" + "commit": "dbd46bf23c2efc466a640a7e398ca39a51c1145e", + "sha256": "003ks20f0n1w5h8vzsqknzbddrfih036is6q1n43zgqdnh3mlzld" }, "stable": { "version": [ @@ -20686,11 +20762,11 @@ "repo": "thomp/dired-launch", "unstable": { "version": [ - 20210510, - 2137 + 20210818, + 2257 ], - "commit": "757c82e888d80e5746ccb8654ba58389fa7dc0eb", - "sha256": "0la6xgl3lr5pjs3x5y0l1g66cjdilnw6m0h526chgq140265yg3l" + "commit": "d54f661c8b3477f342c6c3b3c6c9a500cde595a9", + "sha256": "1p7pvl8fp043cv9b0gzbrilnk0k54s7jana39xyvb1zrch99zx2s" } }, { @@ -20913,15 +20989,15 @@ "repo": "stsquad/dired-rsync", "unstable": { "version": [ - 20201224, - 2214 + 20210806, + 850 ], "deps": [ "dash", "s" ], - "commit": "fb0f161ac3cce1b224f52547f5bc7e1dcd283191", - "sha256": "0c92cqdsllly2dqrgfa9x8nmdyia1p9gkzyaf4427m1wd08dnfra" + "commit": "7940d9154d0a908693999b0e1ea351a6d365c93d", + "sha256": "0fhbpy9y89jm03hjqp317h0aj9iasbdan0h829rhjhga11x8rw2y" }, "stable": { "version": [ @@ -21064,15 +21140,15 @@ "repo": "ShuguangSun/dired-view-data", "unstable": { "version": [ - 20210724, - 1015 + 20210810, + 1533 ], "deps": [ "ess", "ess-view-data" ], - "commit": "92dc267bcaac1b6258ad595488bf10b88882b5ae", - "sha256": "00zzcrhjkc3f0wfda3a843wk0ajkhyi8qi4jy0lax4myc0i8mpsk" + "commit": "75d5f961926392feb408049d416ed5c4c2213f07", + "sha256": "19ygbq9gibl0pj9663r77w3y00wpw7dpr1zh983w5nj57fa0im3p" }, "stable": { "version": [ @@ -21942,8 +22018,8 @@ "repo": "Silex/docker.el", "unstable": { "version": [ - 20210624, - 1359 + 20210804, + 1308 ], "deps": [ "dash", @@ -21953,8 +22029,8 @@ "tablist", "transient" ], - "commit": "9bcefbe54dbed4d364286fe65a87872e763ff7dc", - "sha256": "184dsvaa60b4j6w8s6146x81l5d2a6hkxjqp69gwiixpyjyvcj6n" + "commit": "a13ff981746fc69b0b0607e55346ef85207d6ea7", + "sha256": "12b1ha8rk8fs3234qvpbc0sp7qa6lbfpf78fvrv7yb1213kxs133" }, "stable": { "version": [ @@ -22148,14 +22224,14 @@ "repo": "jcs-elpa/docstr", "unstable": { "version": [ - 20210417, - 1315 + 20210801, + 643 ], "deps": [ "s" ], - "commit": "5b80126a71662a4bcd3dff7cfbcf70954610092e", - "sha256": "0ywm29gfqfb8dhv3mwwb8fx1vl363gkhba9vdkx0w3r2wvh17l80" + "commit": "aa8c20d162d5e0b3a8677f2f4f3519ce6fdbe2e5", + "sha256": "1vlvxjfw7f3dsa69gg952fv68vswsh3wkxcwz4irwkk0pfcbyxbf" }, "stable": { "version": [ @@ -22178,11 +22254,29 @@ "repo": "progfolio/doct", "unstable": { "version": [ - 20210329, - 2337 + 20210825, + 453 ], - "commit": "67fc46c8a68989b932bce879fbaa62c6a2456a1f", - "sha256": "0ax7lhfk98vmlf5ll7jdm0lb0axckvhji461aa3whccwjgbinif8" + "commit": "c7c8687ae8a7f1230732eaebc89ea668b4f7a37d", + "sha256": "1cylpcjgd8v8kp93x5w1nal5m66bb8j44c7rsm6qwl099br3pa72" + } + }, + { + "ename": "dogears", + "commit": "2a551c7b122dbaca845a0bc0a86137b37521c59e", + "sha256": "04p2ild2kniji0q8gr1c24qwzrvmwbkkrkzpgxs3y8hxa1gb9ync", + "fetcher": "github", + "repo": "alphapapa/dogears.el", + "unstable": { + "version": [ + 20210819, + 59 + ], + "deps": [ + "map" + ], + "commit": "c0fa3f6318c660234e77b108f8486dfc39869071", + "sha256": "0bafs58xrlwk2f8swykwhvs1wilvbm2593gjmvdrwhy4hwg0n6f2" } }, { @@ -22297,16 +22391,16 @@ "repo": "seagle0128/doom-modeline", "unstable": { "version": [ - 20210721, - 1833 + 20210823, + 1606 ], "deps": [ "all-the-icons", "dash", "shrink-path" ], - "commit": "8cbb0457f3f35b3a1615eef176785aacdf5afe97", - "sha256": "1hxs2vdp0qvjcn32yrxxbqq3vgjb68fx0fqsqhh5x3cgvabcim0j" + "commit": "16c654c1212e97a1441cac45fee2dc5cda022103", + "sha256": "1r75kbmzrr3m5rx8nwp0v2cs4aim6pr2p42i3774012q3hi333kv" }, "stable": { "version": [ @@ -22350,14 +22444,14 @@ "repo": "hlissner/emacs-doom-themes", "unstable": { "version": [ - 20210728, - 2333 + 20210731, + 818 ], "deps": [ "cl-lib" ], - "commit": "9e2680b9188ebd58c490598684bb7545ba01950d", - "sha256": "1yricwp9xndkqask5gg4frg5axmjn2g65z8bbazg9gixvsj4gbbq" + "commit": "65fb964f36939cf412d03b3fe410618caf99c494", + "sha256": "0nrgy82l9jffsgd12kx6z2amc8z9d9i9clqc3gvdzx6g0nlnyfli" }, "stable": { "version": [ @@ -22601,11 +22695,11 @@ "repo": "dracula/emacs", "unstable": { "version": [ - 20210627, - 1011 + 20210730, + 1158 ], - "commit": "99ef8ef438e8e11a4486a20c353508b5e20d010e", - "sha256": "0hrqbggmfizl7wcwjcnpgs7ykns6iqwai51mqv61k7m2m37slf6k" + "commit": "62c960dbfe9cadc72784878c1cff20389895e193", + "sha256": "0wks8jcdfbahlv98v41h5jv8slc0c9aqyza9s2lmyi9a0xglp6i7" }, "stable": { "version": [ @@ -23014,8 +23108,8 @@ 20210715, 548 ], - "commit": "d1e683b1489ff830d61566876a94b1da35bc2aaa", - "sha256": "0yi88xd0h3mbggjhay66pz7j55hjvqln7cs0av2na9d5mf70asrb" + "commit": "d6e490c24dfb4607080b6a41930bb9d378bc2a43", + "sha256": "1kq8griallh81wkn91j6kr0gi9y417gakhhfrzzby5gi998lijyb" }, "stable": { "version": [ @@ -23533,20 +23627,20 @@ "repo": "redguardtoo/eacl", "unstable": { "version": [ - 20201112, - 820 + 20210801, + 843 ], - "commit": "527df13dcfb11f7a059ca9e8e4d31ab79423d896", - "sha256": "0ylmd42z0lczliafwhw0ga80y7j1njdypzmfkmnblhlxyiwjxwxk" + "commit": "e7e4be6d2590a9e433817f6ce7420d44f0095235", + "sha256": "14sy7abn8aq5daw7jzfjf21zrcxqni7arzgsr0ns5vr8yjc4m7y0" }, "stable": { "version": [ 2, - 0, - 4 + 1, + 0 ], - "commit": "85a76fa17ebd304392ec9b1dd87d223fdd8fa09f", - "sha256": "0fxb2lv4cqdjxarqhzjgfc43sncc1c6m96n0aflm8l4gdmm090kq" + "commit": "478abf3c72176b8887035921270e254202ff9a0f", + "sha256": "0n1vlzvq5mv7z1yffjjqm9ixd3r0cljr60kg55l9pj9kp72a4iv8" } }, { @@ -23587,15 +23681,15 @@ "repo": "masasam/emacs-easy-hugo", "unstable": { "version": [ - 20210726, - 2034 + 20210815, + 2059 ], "deps": [ "popup", "request" ], - "commit": "279d242d66dd48f7a59405167dff332a569f4c1d", - "sha256": "0cvzq29299lsh6rq4sxmz2fdsnapbv4iqrx2bnsvld9dpm01m6j6" + "commit": "be19464f1e4487414a29650b7dc46e984d3f73cf", + "sha256": "1cdg98303b3k5am7lqyjffx4n09qr49v9fsip8w3p6m357ls7wqw" }, "stable": { "version": [ @@ -23765,26 +23859,26 @@ "repo": "joostkremers/ebib", "unstable": { "version": [ - 20210607, - 2206 + 20210809, + 1349 ], "deps": [ "parsebib" ], - "commit": "7e49d7e1eaeca755c0086a81967673eb5b45d175", - "sha256": "0n6p460nmy6h6sc29j1nmhb6zcbbk7qczab6pz96hyxp1cj9g5gy" + "commit": "831ffcca35601e169c0778035688c5d17d138b58", + "sha256": "04kw0akp35r2ibrcav4kaf34d1xs8pckjiygv7h1nqpv6dmrgfq7" }, "stable": { "version": [ 2, 32, - 1 + 2 ], "deps": [ "parsebib" ], - "commit": "3142de8d64789c611e553667cac3bb84428d004c", - "sha256": "1xgpdw0sxl2c9dn6x6fk0rqpqlqxsjlj0vyag611blj600br7dqr" + "commit": "831ffcca35601e169c0778035688c5d17d138b58", + "sha256": "04kw0akp35r2ibrcav4kaf34d1xs8pckjiygv7h1nqpv6dmrgfq7" } }, { @@ -24254,27 +24348,28 @@ "repo": "editorconfig/editorconfig-emacs", "unstable": { "version": [ - 20210407, - 407 + 20210813, + 1301 ], "deps": [ "cl-lib", "nadvice" ], - "commit": "e10fa22b1304c5801b026c10cc5d65a97ccc0a48", - "sha256": "15a0269qbymkvbqgdmv5d4pb7bhw1cplbwra4ydhgwnvwv5c5q9v" + "commit": "375418d1d63f6ec780876593181b6d39054919da", + "sha256": "1lqxgc24gr67yhi64i9v4w2dcjhpx99jg1kr25gr2byqkkdldkz0" }, "stable": { "version": [ 0, 8, - 1 + 2 ], "deps": [ - "cl-lib" + "cl-lib", + "nadvice" ], - "commit": "0b65d5316bcab4d76b5823ea6ecf8f5880f460d2", - "sha256": "1djlhkap7zddknzvjsjz0agpfsms1ih05zcpg1bikid2vs4gddyr" + "commit": "375418d1d63f6ec780876593181b6d39054919da", + "sha256": "1lqxgc24gr67yhi64i9v4w2dcjhpx99jg1kr25gr2byqkkdldkz0" } }, { @@ -24465,6 +24560,21 @@ "sha256": "0l8w5f4bkqzb8pglvh516q91s6lvc1s1lfilxc9h881vl3934y7l" } }, + { + "ename": "efar", + "commit": "9616dbf81e8cc089d4816f2f652f6913989379be", + "sha256": "1fnibs05dl9q29icblsykacsw48fj3ivxza784z4sj01v49n39xz", + "fetcher": "github", + "repo": "suntsov/efar", + "unstable": { + "version": [ + 20210604, + 503 + ], + "commit": "afc19e212a6f1227b5747b42407226b8222f92c5", + "sha256": "04ld4sk52hm6w4bqlsfd5b1633nb7waf0cmm6rpkgidnzlwv4fxm" + } + }, { "ename": "efire", "commit": "4150455d424326667390f72f6edd22b274d9fa01", @@ -24613,8 +24723,8 @@ "repo": "joaotavora/eglot", "unstable": { "version": [ - 20210721, - 2323 + 20210817, + 912 ], "deps": [ "eldoc", @@ -24623,8 +24733,8 @@ "project", "xref" ], - "commit": "194b178ef41ccd3d937983f3829d44a546bb24d6", - "sha256": "12pmqq3l08p1vggbhccpg9bh0n78qrdmk5q30a1d4jrfkifcfbr0" + "commit": "a697084d8dfe29783985f298d38863ea5d59c632", + "sha256": "10x0jnhdn7565nkp134jmadcdgq36436rvd5zbc8187hc9j90396" }, "stable": { "version": [ @@ -24658,8 +24768,8 @@ "fsharp-mode", "jsonrpc" ], - "commit": "93b1fbc31d73286a18640a36fc2be87d1736e0f2", - "sha256": "0lq1izdlrkwp5xiqjp71adi12jy0xj3fsmn6fg2sv0451bwxghra" + "commit": "c90d762c0692cc43032291d37b8ca3201c3d49bd", + "sha256": "1zavk5aykd04143jqsyygnlxn4n86qvjcg267h9kiihsr8wh108r" }, "stable": { "version": [ @@ -24774,8 +24884,8 @@ "repo": "millejoh/emacs-ipython-notebook", "unstable": { "version": [ - 20210723, - 1958 + 20210809, + 2101 ], "deps": [ "anaphora", @@ -24786,8 +24896,8 @@ "websocket", "with-editor" ], - "commit": "983ee612f81c1f976bc1ebce2bfe574a825ba9ed", - "sha256": "1hfsbw5fgxbxma7smzmdc7qa4f9affrgs19xxk3dk0p659789lip" + "commit": "0600c286bd7b0812f4908d7df1be279b6b65923f", + "sha256": "0cwqngw05fg8rs6vz65wzji6h4fv2smp7xlh1xjbw03nrrz41bc2" }, "stable": { "version": [ @@ -24935,8 +25045,8 @@ 20210613, 1418 ], - "commit": "463f5e985fc53300f87ab7eb054d1738fc6ac93b", - "sha256": "122xbfag9ykvcwq549r3aglrdip1nk68abgqlzhm5mqfpqi0l8a8" + "commit": "ec47ecf257bf010cf1f3061e2061c26f78e61540", + "sha256": "0l7z9dn5gpscvpizj0pvqcn36jhjcr7s1xr4x6fg72alw2bg71dk" }, "stable": { "version": [ @@ -25586,8 +25696,8 @@ 20210606, 1130 ], - "commit": "243add9e74003cd5718f33482b7bb8b4fe140fb5", - "sha256": "1lw8g9narlygqd7ypgbyvm4n12qxigzywglsjw6yjcry70p00kl3" + "commit": "162d7d545ed41c27967d108c04aa31f5a61c8e16", + "sha256": "0v49l289wiral01pvgm30wyv79h5d3ly3i05dmcw1q93g4z4l56d" }, "stable": { "version": [ @@ -25740,26 +25850,26 @@ "repo": "sp1ff/elfeed-score", "unstable": { "version": [ - 20210605, - 2212 + 20210805, + 1535 ], "deps": [ "elfeed" ], - "commit": "dd4a0ceded6200fe2367a2de7b0e45d7fb5b4909", - "sha256": "17hf6b5db4d0cm1996z4sl00y4c8gl3rga97xxp2bmwbhdr7kaxw" + "commit": "53d4154c7d993ea5424535b3f0c4e9e75388e36e", + "sha256": "0ffv2adqnnyvwc6axxi1j32l36q35iddmcazpczh2js2hzp2gw51" }, "stable": { "version": [ 0, - 7, - 9 + 8, + 4 ], "deps": [ "elfeed" ], - "commit": "dd4a0ceded6200fe2367a2de7b0e45d7fb5b4909", - "sha256": "17hf6b5db4d0cm1996z4sl00y4c8gl3rga97xxp2bmwbhdr7kaxw" + "commit": "1842f26d7ab520acbc6f491bc8e064af67be7a6b", + "sha256": "1whf7nxfpb003wk9v15ib4xy1a7dfygdkg7jf3ly5z5l81607ap8" } }, { @@ -25777,8 +25887,8 @@ "elfeed", "simple-httpd" ], - "commit": "243add9e74003cd5718f33482b7bb8b4fe140fb5", - "sha256": "1lw8g9narlygqd7ypgbyvm4n12qxigzywglsjw6yjcry70p00kl3" + "commit": "162d7d545ed41c27967d108c04aa31f5a61c8e16", + "sha256": "0v49l289wiral01pvgm30wyv79h5d3ly3i05dmcw1q93g4z4l56d" }, "stable": { "version": [ @@ -26492,20 +26602,20 @@ "url": "https://thelambdalab.xyz/git/elpher.git", "unstable": { "version": [ - 20210729, - 1123 + 20210823, + 941 ], - "commit": "2cdf02e99dbd2d7f765c08ad2f8477b4ea07d5f7", - "sha256": "19gsy0q8qddsm7mcf8ijkw2f92cqg7q32x7yhqblmmwbqa7zcsjf" + "commit": "0d65ffa3ab238529a11d5c1a5d2dea5a6c27e9b4", + "sha256": "1s6mh7a9r3s0b2nk019pdzzp646ny43mihjd68yq1m2yad7d6y5x" }, "stable": { "version": [ 3, - 1, - 0 + 2, + 2 ], - "commit": "8c20802c5f2262440dadbdca60b7901d09ca022f", - "sha256": "0a6qfm7x4nbfanjv33h1zgcwnywd77qbc4adya5kx8lndcn0669l" + "commit": "7b52709ddf798fe53db3855eef52ca8862e7700d", + "sha256": "0fzqm5gpadqzsl71r1bq72ki8dw8125v4nmhdd3b4rz9jy1rqm2g" } }, { @@ -26844,11 +26954,11 @@ "repo": "emacscollective/elx", "unstable": { "version": [ - 20210615, - 1503 + 20210819, + 2127 ], - "commit": "ef6dfa8e598b2761d0a481526e98e254123a20f6", - "sha256": "0p7c2mnwz85klliy1af96knkdja6q9k9j11r0hfka7g4fak0qi6d" + "commit": "5aa6369b58e72ef2348a5d6ca6bdf32299329c58", + "sha256": "056hb1mss84d4m7fb052c10bfmshf00x772rlpck671n83fi14li" }, "stable": { "version": [ @@ -26874,8 +26984,8 @@ "deps": [ "cl-lib" ], - "commit": "64ba2e3f3096f48928f7be06ed690069b96add22", - "sha256": "1cjzrckbxcl1ahhnnk78778yxsrhwb725cwjbx6i8y6jxwbddpqj" + "commit": "da88fa2d04e37397c519e8b1181163f06a350e2f", + "sha256": "02g42xccwbhgq0wf4v2sd3khyvvsvigixxjb2rdqw70h4j1k8mya" } }, { @@ -27165,11 +27275,11 @@ "repo": "oantolin/embark", "unstable": { "version": [ - 20210729, - 1843 + 20210823, + 1719 ], - "commit": "4f969299a4726058fae8773bd9c4fb7c58371c86", - "sha256": "1mfhqv66j45mqs90i5jywxw8cv5v1df42s4q5svx9f75jjwrn8l7" + "commit": "ca517fdabd182b0b905d0ef0cb380facb6697670", + "sha256": "1pb6rarb86x9bl064jqick3d7znl0a7ibx27yx30nivi5plrkb3j" }, "stable": { "version": [ @@ -27188,15 +27298,15 @@ "repo": "oantolin/embark", "unstable": { "version": [ - 20210729, - 1543 + 20210816, + 1819 ], "deps": [ "consult", "embark" ], - "commit": "4f969299a4726058fae8773bd9c4fb7c58371c86", - "sha256": "1mfhqv66j45mqs90i5jywxw8cv5v1df42s4q5svx9f75jjwrn8l7" + "commit": "ca517fdabd182b0b905d0ef0cb380facb6697670", + "sha256": "1pb6rarb86x9bl064jqick3d7znl0a7ibx27yx30nivi5plrkb3j" }, "stable": { "version": [ @@ -27339,11 +27449,11 @@ "repo": "smihica/emmet-mode", "unstable": { "version": [ - 20180613, - 341 + 20210820, + 1124 ], - "commit": "1acb821e0142136344ccf40c1e5fb664d7db2e70", - "sha256": "1p25h191bm0h5b3w5apg7wks51k7pb7h4dlww4jbl9ri4d33fzcl" + "commit": "6b2e554f7fd27f732810f4b14ea01e3c54b7b3da", + "sha256": "0ymd865b73m402cd4nc64n2wy0qn17aal69rc8vnc7cxyilc9v1c" }, "stable": { "version": [ @@ -27363,29 +27473,29 @@ "url": "https://git.savannah.gnu.org/git/emms.git", "unstable": { "version": [ - 20210726, - 1926 + 20210825, + 1456 ], "deps": [ "cl-lib", "nadvice", "seq" ], - "commit": "a0e26c1a143778f7378ec8a053725726e1e6aeef", - "sha256": "0j1jjwavdl3q33rn6zx9z3ka87d9fihd9s5bhrgw3x4fvgv8gikg" + "commit": "b582a75d033e5a21090c854f58abeefdd238798f", + "sha256": "1gmgh9llriqgq8kjdffmyjw5gb9k385fbh258bf7n5yvgpd3bbsn" }, "stable": { "version": [ 7, - 5 + 6 ], "deps": [ "cl-lib", "nadvice", "seq" ], - "commit": "144c49ac2931b6e57e265cc6139b7c9718f1297e", - "sha256": "0j9qh781zr348qx49zvr59rdpmh4204fqx9sm3mfh3kg6kbc7v8x" + "commit": "8b32529950e5a2e1dd7afed8757ff6bc923c95e2", + "sha256": "0pcs95nmdbxahwsqp1fz0m8pgwsxycvf7xixh40sfjgifvbq0a21" } }, { @@ -27982,13 +28092,14 @@ "stable": { "version": [ 0, - 2 + 4 ], "deps": [ + "inheritenv", "seq" ], - "commit": "d1b991f19a4c4781e73bbc3badd368727fae942c", - "sha256": "0ssf9i6iym2rb530k2w5aj392qa73i6p5y0vwrs5qhkv9lagqq7p" + "commit": "8a9a142cf9d35e62a70d9d100a946f78fe0b066a", + "sha256": "0nqqx4qlw75lmbn0v927sg3xyjkk86ihw1q3rdbbn59va41grds4" } }, { @@ -28113,14 +28224,14 @@ "repo": "emacscollective/epkg", "unstable": { "version": [ - 20210616, - 2229 + 20210806, + 1315 ], "deps": [ "closql" ], - "commit": "44b7b2519f84056ee94a6c4ce21fce146532174c", - "sha256": "0z9sz9ydfjzhawh4qip41h3vid1lslaf0h14hkjz9kx8fkrzib8a" + "commit": "23045743150f9a50ccc164a710c4d495820de803", + "sha256": "0v5v7iw9qyp8ckh9ana61r0fbhffbpsmhjr2yx88kc6ia59vn561" }, "stable": { "version": [ @@ -28135,6 +28246,24 @@ "sha256": "0z9sz9ydfjzhawh4qip41h3vid1lslaf0h14hkjz9kx8fkrzib8a" } }, + { + "ename": "epkg-marginalia", + "commit": "c29882cf057db2895a8ef680f9aea32f6bab1f64", + "sha256": "11s2giwhl21irg0h39n2p4r8f33ldc5ydmh5g49kzlqlz6cgmrrg", + "fetcher": "github", + "repo": "emacscollective/epkg-marginalia", + "unstable": { + "version": [ + 20210802, + 1740 + ], + "deps": [ + "epkg" + ], + "commit": "0879f5b2cf87fff17dcfb74009d289d6a89c9816", + "sha256": "11sbf363qy3i87hppv4admqd2sy0kwpvjgih51hn3rbimbswkwab" + } + }, { "ename": "epl", "commit": "9c6cf24e86d8865bd2e4b405466118de1894851f", @@ -28253,14 +28382,14 @@ "repo": "emacsomancer/equake", "unstable": { "version": [ - 20200824, - 1549 + 20210731, + 2016 ], "deps": [ "dash" ], - "commit": "b0a5e334a7ccf69b837656c8a91c2e9e254e4c76", - "sha256": "1m6p148pcgcfywqzgc0v5wyf1k4knz7kwidf76qhvcff8z9fd5j5" + "commit": "831fcaced262a9dd650bc80241c8214d57de4cdc", + "sha256": "1rgkczdz4ppi0h87vbx10h574xfqn1ba09j3cswhvkxm6w1hram4" } }, { @@ -28384,11 +28513,11 @@ "repo": "alexmurray/erc-matterircd", "unstable": { "version": [ - 20210720, - 412 + 20210804, + 504 ], - "commit": "caafa1a62a76c2132d8b0872d57684f877608408", - "sha256": "0cba6wawwjmidpv1mccmrn2cr5xkyyj44aildifvyqay7nhldp3d" + "commit": "e3a59267c044474f9ca066d36517e9a3d872759c", + "sha256": "1iqyyhaz8zypgj9ij8ivqym0xry10zzyi8qf16fzg2ppxl47bc5i" } }, { @@ -28750,8 +28879,8 @@ 20200914, 644 ], - "commit": "c1c20b8d29838b4e0708b768d98e2edce933d15d", - "sha256": "1rscm80nrgr1c00vcp683rvc42wdll08jc3s2srvaxw3iadd03ln" + "commit": "2bab72d99ae3330cbf3a94450a647158838a1d1b", + "sha256": "1xb1rawj2hl12xmpn9xk2zw69wpvx2ssd3wj4k32dhgi2vcg2rck" }, "stable": { "version": [ @@ -28774,17 +28903,17 @@ 20210315, 1640 ], - "commit": "4a12f98146fb5f0484ae04b6bf1e469c3d882e12", - "sha256": "09rpzlvygp83drcwgbq75bxgi7m8xrap51mrgqc4rfgcmmmc3zk3" + "commit": "988e8112a6db6f5e16380df30f1aa52b1b233662", + "sha256": "0j3b9cd2hzf2i8lzi2xy39bj2q2fqgcsrsim4viknqsv6awqw04y" }, "stable": { "version": [ 24, 0, - 4 + 5 ], - "commit": "c07336b844645f80430505194c01ffd59672804f", - "sha256": "0wy4fbflsm5sc1jjs6vf8ad0621q1m3vmfazz6jrg1s9llsxgr9r" + "commit": "a29aeb16660f2a91aaa24c474d57c6ee7754ee0a", + "sha256": "153kg6351yrkilr4gwg1jh7ifxpz9ar664mz7vdax9sy31q9i771" } }, { @@ -29274,15 +29403,15 @@ "repo": "xuchunyang/eshell-git-prompt", "unstable": { "version": [ - 20200109, - 2250 + 20210817, + 553 ], "deps": [ "cl-lib", "dash" ], - "commit": "48ee35774c9b8d0e2d96110e3ae84bac60f43dfd", - "sha256": "1w0drk4sfljshcnlvvn028v4lzqznglfx8ly0mfridsm85xws3pw" + "commit": "f638ba32b661d15895e767305f59f41eb01197ae", + "sha256": "1hn05bgznc1az4fb4grg8d9acwpmwr4bp6ibch901c79hp79qlkv" }, "stable": { "version": [ @@ -29471,14 +29600,14 @@ "repo": "aaronjensen/eslintd-fix", "unstable": { "version": [ - 20210513, - 425 + 20210731, + 1649 ], "deps": [ "dash" ], - "commit": "5488db4436fc312386fdb123289d7fc5f099702b", - "sha256": "1pipb0l1l3rp3jf1bcd1h3k02ckh2x8x2h9y4bn4cq8xm6bsygvy" + "commit": "3897d8a679a6e98e3f5054aaefe07f6b55f8f128", + "sha256": "0wx0mca7xykjkbyhix2mhqf2l9zc46l14hdy4krnr3xdyb5ibmkr" }, "stable": { "version": [ @@ -29636,11 +29765,11 @@ "repo": "emacs-ess/ESS", "unstable": { "version": [ - 20210707, - 917 + 20210818, + 843 ], - "commit": "4fefd0feaae688e28d6a0c36c9eaa219c448903f", - "sha256": "0m9w0l6x67s5mx76ixgh42abblzi8jbp9xpps4flv08jhz1lkc5i" + "commit": "a7ce81bb768d7cc410885711cf99bad0f8941ac3", + "sha256": "0kz9diqb26ksrgnfqdcdgf48sqjapvfg6z1fjk9ib2q2si6nv0yx" }, "stable": { "version": [ @@ -30231,15 +30360,15 @@ "repo": "emacs-evil/evil", "unstable": { "version": [ - 20210726, - 2220 + 20210810, + 844 ], "deps": [ "cl-lib", "goto-chg" ], - "commit": "5c28294d830a5a79e9b9da2c32e7675d52d76720", - "sha256": "07va0zlaa9ykbjd6mrdpp2d428xpc1zf11vqsys0lfimcx2llxj6" + "commit": "dceb73603d397f7e42a541976d8ec0711248d38c", + "sha256": "1jwah95cnlgsdqkk56d0jhshcxydz5w3x5dsxnxckipddrs3ncfm" }, "stable": { "version": [ @@ -30383,15 +30512,15 @@ "repo": "wbolster/emacs-evil-colemak-basics", "unstable": { "version": [ - 20200630, - 1936 + 20210818, + 1228 ], "deps": [ "evil", "evil-snipe" ], - "commit": "584f8f9496bf5250a439c9c9fee1d94f3b4883f0", - "sha256": "0hv8068yaiqwswzhiikrlyl53w43yqi35m9xypvq6v9dwisrqg00" + "commit": "db01118a76112c61b7617aa44aa8c438d8f1871f", + "sha256": "15ihz0wwc7gzqsmzbrr48zzh3rw3bmbf2ghnhcy13pdq42wridcv" }, "stable": { "version": [ @@ -30433,15 +30562,15 @@ "repo": "emacs-evil/evil-collection", "unstable": { "version": [ - 20210721, - 1454 + 20210823, + 2212 ], "deps": [ "annalist", "evil" ], - "commit": "8d10ad4ea59752595de37a8ddc44e8d3fb14fe89", - "sha256": "18qkc3mbc8sr56823bpdr319dg2k2l29chk7c6zr5ln5jls08q8a" + "commit": "0a836facbc1f917c863699eea3eaecc78ac81686", + "sha256": "0zrg4yj62vfpkffz0219ibwqi1yyadj9aaa6qlyz8z6bjg0d7vjz" }, "stable": { "version": [ @@ -30999,14 +31128,14 @@ "repo": "redguardtoo/evil-matchit", "unstable": { "version": [ - 20210727, - 1106 + 20210819, + 5 ], "deps": [ "evil" ], - "commit": "80dc731ab736545541546ca64187e850bf0e39c8", - "sha256": "1j1p4z6ps58nbsh55l9h30gxbkrzwzkjpq7zl50q6yfc84z7byzk" + "commit": "24a95751f48fb64246de15278734e0179c9f622f", + "sha256": "0gdfnpzzy6y9626nqia7rs5l37bl31nndn1m71dnm0qns5cqfngk" }, "stable": { "version": [ @@ -31029,15 +31158,15 @@ "repo": "gabesoft/evil-mc", "unstable": { "version": [ - 20210206, - 1941 + 20210730, + 1752 ], "deps": [ "cl-lib", "evil" ], - "commit": "f04fb17f35f2722f2ac93c862b4450bb8e5b739a", - "sha256": "1d7mdqw4bx6p8y3c843n40g21099pmvras3bf9il5nhg4i3b12z8" + "commit": "246aecc17481dd23c172a9b845f02a9d9e322c7f", + "sha256": "0d3d72q908rdnd4g03aakraij2himw6q4qqrf9wsr3c846q3bvrn" }, "stable": { "version": [ @@ -31137,8 +31266,8 @@ 20210719, 1305 ], - "commit": "2133167e0699f44fe37830839362e2e6793bce88", - "sha256": "0qrqpwnny7v4l8abf93c7l6dz7wkk1b8i6wv0fdcq6b7jrq1ixh4" + "commit": "6bc41317ba4b8710d713a62e1b78047c3cc2d2d5", + "sha256": "14s2zrl2rpnqpfp647naa80qzb2x4c6jflvs1nhxsvn43s0gdfj9" }, "stable": { "version": [ @@ -31173,14 +31302,14 @@ "repo": "juliapath/evil-numbers", "unstable": { "version": [ - 20210605, - 431 + 20210808, + 1424 ], "deps": [ "evil" ], - "commit": "cd23a7b458d73dc49434a3cf90d3d0caceb5811d", - "sha256": "1naxciaq1ci1ajs4if45wjy5qf8bgkxazyvl1kywrj299wi2qdv9" + "commit": "8ce0066fa4889c9a43db5917d116baa9497837b7", + "sha256": "04dls5fmr4a8b8j3802nm0cf4rngr01bgpsa25rgdq1cdv9x9zb6" }, "stable": { "version": [ @@ -31759,8 +31888,8 @@ "deps": [ "evil" ], - "commit": "5c28294d830a5a79e9b9da2c32e7675d52d76720", - "sha256": "07va0zlaa9ykbjd6mrdpp2d428xpc1zf11vqsys0lfimcx2llxj6" + "commit": "dceb73603d397f7e42a541976d8ec0711248d38c", + "sha256": "1jwah95cnlgsdqkk56d0jhshcxydz5w3x5dsxnxckipddrs3ncfm" }, "stable": { "version": [ @@ -31783,15 +31912,15 @@ "repo": "iyefrat/evil-tex", "unstable": { "version": [ - 20210728, - 2155 + 20210731, + 927 ], "deps": [ "auctex", "evil" ], - "commit": "9b3a560cc43cca73d2947747892f7d4f92c2c573", - "sha256": "0hain42prqaa08fc116a0qy12j8pbj4a8i589s6h87h4hhy8dj8d" + "commit": "aa0ddf8e768a24cda6d50d07f04c8e7813a2dccd", + "sha256": "1n4xg1c2ia1k6vf3rybzx6afsdq47i8jf57x94fkwfm9wvnf9g4r" }, "stable": { "version": [ @@ -31943,6 +32072,25 @@ "sha256": "031p5i3274dazp7rz6m5y38shfgszm1clmkcf58qfqlvy978ammc" } }, + { + "ename": "evil-textobj-treesitter", + "commit": "949eb5d82e26e37685c3155b22b329e387f0fd59", + "sha256": "1mxx6fcj7k1k9gnjgcs316x92jdicsrx6l584vkzx09h7fz2p4da", + "fetcher": "github", + "repo": "meain/evil-textobj-treesitter", + "unstable": { + "version": [ + 20210816, + 355 + ], + "deps": [ + "evil", + "tree-sitter" + ], + "commit": "461195b882b2179a0e6f8efcd37835ab2a0ed5e2", + "sha256": "1yndxnxx842mhfjqs39i5wz1khm1sha2dr1nhzhi60mz4ywyqyl3" + } + }, { "ename": "evil-traces", "commit": "29f1f13a99b065f4510f6967d0cfce37eaa59178", @@ -32821,10 +32969,10 @@ }, { "ename": "ez-query-replace", - "commit": "c40808c7687ace84e4c59bf8c25332c94b6fdd76", - "sha256": "1h9ijr1qagwp9vvikh7ajby0dqgfypjgc45s7d93zb9jrg2n5cgx", + "commit": "170b95e0c183368a5074440c1ac22abf746392f9", + "sha256": "1nlik4qq0slbksmxcpc2xmpzj1mw6yrlpmqagvik97vixmm5lny4", "fetcher": "github", - "repo": "Wilfred/ez-query-replace.el", + "repo": "Wilfred/ez-query-replace", "unstable": { "version": [ 20210724, @@ -33132,14 +33280,14 @@ "repo": "jrosdahl/fancy-dabbrev", "unstable": { "version": [ - 20210720, - 1833 + 20210823, + 1838 ], "deps": [ "popup" ], - "commit": "eff6cba7b09611ce9ade56972f0ceccf227cf174", - "sha256": "0nzg2l9wxyqkhr4wj0mmcc4ydm1lx1smdcnsf1hs2yqh7bdgi02k" + "commit": "f3b05ad56688f2ca13db053e090a1273cf2deed0", + "sha256": "1hj15wi9jxwjamz345jssx9gd4m9cbdisvmq7mg5vhk89k4h0mvd" } }, { @@ -33189,6 +33337,24 @@ "sha256": "1q15wx53zq6b9f567anrfmfpj04f3r6wz28w4237f9lg62yqhm9x" } }, + { + "ename": "fanyi", + "commit": "f3cb0a07efb7a279f3e7a5d3ba5e6eed8daf88d2", + "sha256": "1yzqasw5wdnshd6s4w6rg5xk6rbd99ryqqj9vzxsnv71s59y5wyy", + "fetcher": "github", + "repo": "condy0919/fanyi.el", + "unstable": { + "version": [ + 20210820, + 423 + ], + "deps": [ + "s" + ], + "commit": "5f4fd0dbee514bada012ab3ecc9c767b8910828e", + "sha256": "1lzmhn0bn6qjyq441bp39gq4wd1xvrcygzrfm6v6srywb6s34dm1" + } + }, { "ename": "farmhouse-theme", "commit": "3b0d427db8ab66d2fe323366b0837595b3b59afa", @@ -33526,11 +33692,11 @@ "repo": "technomancy/fennel-mode", "unstable": { "version": [ - 20210724, - 2039 + 20210817, + 1612 ], - "commit": "128702146298dad3f4d5409992e985fe670581d1", - "sha256": "12mvxziyrzgbmcg9kcqbscjld42ybl7km027m0kaln39awc0nb03" + "commit": "47152970a98734723b5086b5c774f50da34c0488", + "sha256": "1p9fi5rrqlcx9gg5gljdndmi318x0z5zzxryi1kbqkkc8119kbsg" }, "stable": { "version": [ @@ -33867,20 +34033,20 @@ "repo": "redguardtoo/find-file-in-project", "unstable": { "version": [ - 20210729, - 5 + 20210813, + 657 ], - "commit": "136018df39520433840d67acbbf92908ab115532", - "sha256": "0rgvk4r1iy4kncmxvgzlgb39dsjvvmihnqwrjgkmzdqfx9891m02" + "commit": "f26f081f835165bfb05e247afbfbcbddf53236a5", + "sha256": "13vsmi02v1rv5h2m62s36dw21781nxsj9dj4hlaxfz2v5avmp00c" }, "stable": { "version": [ 6, - 0, - 7 + 1, + 1 ], - "commit": "2f44af320b4e62053c5b6b523f69a8f16eaaa1c9", - "sha256": "1qkfijqr839y605ssyalr2v9n6b86hr64mxikc96lx6nzdyjyyl0" + "commit": "f26f081f835165bfb05e247afbfbcbddf53236a5", + "sha256": "13vsmi02v1rv5h2m62s36dw21781nxsj9dj4hlaxfz2v5avmp00c" } }, { @@ -34220,8 +34386,8 @@ 20210320, 1244 ], - "commit": "10b3aebc3d4411e6889f3428e8f097c0fbf8585c", - "sha256": "0c850rc9nnbvwf1sbp66xk6p246ylrfpqqhh6bcl7lm8b8v0kfzh" + "commit": "b611a8b269d28d226ed1e78fcc7a3120df20f74c", + "sha256": "0w2h538ljsccnw3a66dz1wpq2jxlq8mdgal2qlzx1dw7kdnxhx9n" }, "stable": { "version": [ @@ -34270,8 +34436,8 @@ "deps": [ "cl-lib" ], - "commit": "80cf4529915c34d2d39b4d3410781a19ef264e9f", - "sha256": "193bwcsj42w07aj8k32zl895yp0kw4rgrphn10dd81jv5411r6ij" + "commit": "e967dd4ac98d777deeede8b497d6337634c06df4", + "sha256": "1hs51fb5m9asrzalkyldwlcnw7w6rhdwsspn846yc8s2yprphjz0" }, "stable": { "version": [ @@ -34863,8 +35029,8 @@ "repo": "flycheck/flycheck", "unstable": { "version": [ - 20210708, - 1337 + 20210825, + 1804 ], "deps": [ "dash", @@ -34872,8 +35038,8 @@ "pkg-info", "seq" ], - "commit": "21d52264aa80bfa4ede94c59e37a20fb6d033b0c", - "sha256": "1k2fqiy0aw30za8d8bhia996ab168j61m8h1s9zi7d5y32q1csnh" + "commit": "784f184cdd9f9cb4e3dbb997c09d93e954142842", + "sha256": "137zsivwh3i4b757hzwf5mhv5sg8j2jg7kg0cjphplwasqk70qm7" }, "stable": { "version": [ @@ -35078,8 +35244,8 @@ "deps": [ "flycheck" ], - "commit": "2e386775f1a0eb5d80e5d70e98474ee32ecafb24", - "sha256": "1ai4p0s6wh4sp972fxkjlc4mn6ai1zc27zh4vm63rfrayri1g31z" + "commit": "53598158fa8b74d2e7efea6210edb274e1f0273c", + "sha256": "1gad7i7mw8yh3cg6d5gn1d5jbsnc73v7rcw2sjvif566x8k7n18z" }, "stable": { "version": [ @@ -35860,15 +36026,16 @@ "repo": "emacs-grammarly/flycheck-grammarly", "unstable": { "version": [ - 20210405, - 1319 + 20210814, + 1627 ], "deps": [ "flycheck", - "grammarly" + "grammarly", + "s" ], - "commit": "abab9e6fadccd6e239f3f7efd91b155c9d5cd716", - "sha256": "1y6v3d4xnlfqcvl5hc4b0y6san1mnf2mx6hcvlbxdphhf12hp560" + "commit": "c4b3c5b4889ee719b6dd0800305f9be869cfd7ec", + "sha256": "0sb8fvkzhc1f1p28mmplj2ld97v8lkpwz4frf62hn3jg21fzj7pk" }, "stable": { "version": [ @@ -36409,8 +36576,8 @@ "deps": [ "flycheck" ], - "commit": "2f5f7502c1e422c1df5b347b8142d67d5cd5caa7", - "sha256": "11bhblr96s8a19sb7lnzrwgihqjcwdnajxr6kiplgqd0wsh2h07v" + "commit": "67d6216229337c9c020a8aecd6ae2417de29b5e8", + "sha256": "1hmh7pzv55c53n46ajvqc1r3sfkz60pa1iz7nms3fc97m7rnc1j8" }, "stable": { "version": [ @@ -36977,14 +37144,14 @@ "repo": "Raku/flycheck-raku", "unstable": { "version": [ - 20210316, - 820 + 20210814, + 903 ], "deps": [ "flycheck" ], - "commit": "4163c0dcc1447bc98bb20b835eb23cb68a638ba9", - "sha256": "0z19zz5dq0pjkzrjg2fbrh9szlgd0lq2j9wmkf4pzkrcb519kchn" + "commit": "50ac228e658a7f86efc298ee3ebd0b9706f083d0", + "sha256": "18wyd7w26wkdpvr76rhblh368dqly7dldkcd71ddjkdi10zas493" } }, { @@ -37785,14 +37952,15 @@ "repo": "emacs-grammarly/flymake-grammarly", "unstable": { "version": [ - 20210403, - 1349 + 20210814, + 1628 ], "deps": [ - "grammarly" + "grammarly", + "s" ], - "commit": "06ba82495614f1dfaffb8894f57789156586448c", - "sha256": "1lc3nv7km5m19l673agh9rxv9afllf7sz4sv0brgp1sbmks1il3b" + "commit": "28888bc8d1c795e1b2d798fb5c6cdcc16571c73e", + "sha256": "0vm10sx3w3y110s0qkdiabqnf5fvfjixgnq456rbh8v30y1wgrkc" }, "stable": { "version": [ @@ -37993,14 +38161,11 @@ "repo": "turbo-cafe/flymake-kondor", "unstable": { "version": [ - 20200925, - 1539 + 20210814, + 1303 ], - "deps": [ - "flymake-quickdef" - ], - "commit": "72052b5ba827faf357608cf720a70221192a8282", - "sha256": "0h8dqk35r10pxx2w4swb3kij4y2vi17j9wfk978x8lf0wd3h3hsy" + "commit": "0058ef5167142a521825e824aced6229e4898ae9", + "sha256": "09f2xn309gyn0nrsf9hcpwprjyliiqlli3ll406gibgs5nh88hds" }, "stable": { "version": [ @@ -38271,21 +38436,6 @@ "sha256": "1xm5i658pf1lb4bfpy6zy5msanhia8r9j7v7rx72amkksja3hwnj" } }, - { - "ename": "flymake-proselint", - "commit": "481c3e415dd731b06747f8b2ee86ccc2536cfca2", - "sha256": "115x8syar7f3crw2pfdcmv60q92i9d270dxw0m251w3906rqhdj2", - "fetcher": "github", - "repo": "manuel-uberti/flymake-proselint", - "unstable": { - "version": [ - 20210621, - 929 - ], - "commit": "adf1ce7daf1380cb50f365a36548165fe4a32423", - "sha256": "1mmwq4b4idhbsygwjmn3fj67idixx4gaap9zfa0v4didahjsjsjh" - } - }, { "ename": "flymake-puppet", "commit": "302dbe34e7949da9c65e9c7bf2ab924db91b968f", @@ -39184,8 +39334,8 @@ "repo": "magit/forge", "unstable": { "version": [ - 20210727, - 1934 + 20210822, + 840 ], "deps": [ "closql", @@ -39198,8 +39348,8 @@ "transient", "yaml" ], - "commit": "34cbaa7b6a77ba2e4c6750f4f922d3e887c08c67", - "sha256": "1bpkzzkm3r0ylfk319k0dr03ikllhps65yir5i7ybwafddj8albp" + "commit": "a3e6f8aab16a8213cd389fe79d8c02300d26cab7", + "sha256": "0n6p63kfibpz4161wb2f6516ncv3h9algxlgdgrd5lsnn0ympr26" }, "stable": { "version": [ @@ -39253,28 +39403,28 @@ "repo": "lassik/emacs-format-all-the-code", "unstable": { "version": [ - 20210708, - 1728 + 20210824, + 1659 ], "deps": [ "inheritenv", "language-id" ], - "commit": "d60a763eaf716d17bf6b8dbff1cc8f54337bfeab", - "sha256": "12gvyr73ab6x4p5iadxdi61d3hwwfbxd9wm6vkja92glyqs2vvbf" + "commit": "06d4d9ee6dd79941d26798cc9754b9c9be87e932", + "sha256": "1bcqj4v5zrqs1ysvvnvar422c3xh1n5yvl1mg7rfwybd0l5pzc80" }, "stable": { "version": [ 0, - 4, + 5, 0 ], "deps": [ "inheritenv", "language-id" ], - "commit": "caa0269ce89789a702823041ca7b309ddaffb5ce", - "sha256": "1y5a704xbnvb46rp1ra9cjjazzs795hvh3p0di2hr5jsql0a0zwa" + "commit": "b18ed67a81b4d81d77f3bd7cf6e004e4e412b630", + "sha256": "1qy4qdvxsagzp8pav2jx29bz37xiwvm5lbwyfp8jlg59715z4cxq" } }, { @@ -39398,26 +39548,26 @@ "repo": "rnkn/fountain-mode", "unstable": { "version": [ - 20210717, - 906 + 20210807, + 106 ], "deps": [ "seq" ], - "commit": "d2e0cb8f328a1219a3830f82fd01e789cac398b2", - "sha256": "04a5mwlxq43mk132j7v4gx9jiss2pah38rgk0dsc6pn00xjf4j9q" + "commit": "7de7159a58e0594c0120d66af78f65264f61ea5f", + "sha256": "0y7dd6qq4b95scj7fay4zzhkf0g0x89npylc4v1hz59b1yyylfqy" }, "stable": { "version": [ 3, 5, - 0 + 1 ], "deps": [ "seq" ], - "commit": "91f4ad083fa620e6e6202460decc3280bd8e4e71", - "sha256": "0xlg5b0sa4qbv68sza23fr5khv36860jbhzfbcqcw1d420xllryx" + "commit": "7de7159a58e0594c0120d66af78f65264f61ea5f", + "sha256": "0y7dd6qq4b95scj7fay4zzhkf0g0x89npylc4v1hz59b1yyylfqy" } }, { @@ -39559,20 +39709,20 @@ "repo": "tarsius/frameshot", "unstable": { "version": [ - 20210728, - 1258 + 20210819, + 2123 ], - "commit": "63d42d913468cd0d75dcccb99e5517057fa34e25", - "sha256": "0ar5dxyxz7nwmh1b1rdiiy76fm43q0pxcpj5959pc7gqxbf5c1rh" + "commit": "029df561ef6572b1ab034490ac48d909d037ac1d", + "sha256": "1b6frjhv4gkix0yj6ibvjgaf4y2b94xq0x4y021v086sp5ifsh3g" }, "stable": { "version": [ 0, 2, - 4 + 5 ], - "commit": "1b5974f0cc7c2a34e5f9fab6b25578dad7df3dbf", - "sha256": "1rcx0la0njg3ij0xgw7l1wl8nlvdd0bj40v51wvmdybyiba7cdx6" + "commit": "029df561ef6572b1ab034490ac48d909d037ac1d", + "sha256": "1b6frjhv4gkix0yj6ibvjgaf4y2b94xq0x4y021v086sp5ifsh3g" } }, { @@ -39881,16 +40031,16 @@ "repo": "waymondo/frog-jump-buffer", "unstable": { "version": [ - 20210308, - 2316 + 20210809, + 1702 ], "deps": [ "avy", "dash", "frog-menu" ], - "commit": "3481626cccea8e77e4eee79b05f99c9171559f7b", - "sha256": "1v7p3ln8jw3qm2ka0jl55wq9smal5k31rzsina9i8c5mcslml1l2" + "commit": "bed6c483445017698a1ec27fc61edeffefc004b2", + "sha256": "0yriw08f9crl2basr1a06m73kln8qk1w0n1ljcr4zr6j7ya1fcdf" } }, { @@ -39949,14 +40099,14 @@ "repo": "fsharp/emacs-fsharp-mode", "unstable": { "version": [ - 20210331, - 1931 + 20210807, + 1417 ], "deps": [ "s" ], - "commit": "93b1fbc31d73286a18640a36fc2be87d1736e0f2", - "sha256": "0lq1izdlrkwp5xiqjp71adi12jy0xj3fsmn6fg2sv0451bwxghra" + "commit": "c90d762c0692cc43032291d37b8ca3201c3d49bd", + "sha256": "1zavk5aykd04143jqsyygnlxn4n86qvjcg267h9kiihsr8wh108r" }, "stable": { "version": [ @@ -40176,14 +40326,14 @@ "repo": "diku-dk/futhark-mode", "unstable": { "version": [ - 20200823, - 1521 + 20210803, + 1401 ], "deps": [ "cl-lib" ], - "commit": "88e7bb1eefbe01f781cc4958bc0431fea90b7d93", - "sha256": "1srb3a7p0zgsjgbrdsyx7ql68ygg9h8y93781v4zjmzq4z9qfl8x" + "commit": "17f048c76bd1dc7f5893b04a14db2b850471f399", + "sha256": "0a8gdr0qh985jai75zqb81yjws6lxlfm811wxk939fsglafbxmxx" } }, { @@ -40622,19 +40772,19 @@ "repo": "emacs-geiser/geiser", "unstable": { "version": [ - 20210428, - 1942 + 20210808, + 16 ], - "commit": "4099dce8f5f17cce8f292cdf0bc1bf2e5cb6975c", - "sha256": "0s02443pxi49c8hmkk3g489ngb5bl95inraq3jabb6dh7gyxgkag" + "commit": "77d4c3a91c0acdb16cefa8a3e0efac3435aebdc0", + "sha256": "07g1zlf9kmfish2wa6m376xba0nv6n4spw8wbmr90a56xj0qpswc" }, "stable": { "version": [ 0, - 16 + 17 ], - "commit": "803dfeb9414ed7b99c5d567170f32c97cafa1114", - "sha256": "0s02443pxi49c8hmkk3g489ngb5bl95inraq3jabb6dh7gyxgkag" + "commit": "77d4c3a91c0acdb16cefa8a3e0efac3435aebdc0", + "sha256": "07g1zlf9kmfish2wa6m376xba0nv6n4spw8wbmr90a56xj0qpswc" } }, { @@ -41709,27 +41859,27 @@ }, { "ename": "git-commit", - "commit": "cec5af50ae7634cc566adfbfdf0f95c3e2951c0c", - "sha256": "1i7122fydqga68cilgzir80xfq77hnrw75zrvn52mjymfli6aza2", + "commit": "2571aed58ce9c4df998588cbcffdde704f4dce54", + "sha256": "171spbjdgnphv1d108y2ivf09yaqfpg61sjc7gs62cwld4krk4l6", "fetcher": "github", "repo": "magit/magit", "unstable": { "version": [ - 20210702, - 822 + 20210806, + 1607 ], "deps": [ "dash", "transient", "with-editor" ], - "commit": "ad406cd28b4e08ddb6964c168c7c8dffb5debbc6", - "sha256": "10h3131a4zjnm90z73p6h8hh3iv8dgd4rd19vhrm05pbi1i6v7m8" + "commit": "5a0cf9aaa9acf53c68c0fe98883c081aa5e29dd3", + "sha256": "16ihqh9aqjgjs14p5i17bw0wrcc1kpzvj62fn7bk8almdy6ph4dn" }, "stable": { "version": [ 3, - 1, + 2, 1 ], "deps": [ @@ -41737,8 +41887,8 @@ "transient", "with-editor" ], - "commit": "143d95cced1ee793106d16da3a182dcc2dd01e88", - "sha256": "0sn4iiicmqfqmvi7zwii6qdp35k09kqn36rpalv0w1i4jcm6j9kk" + "commit": "b70f660e36c024fa9319ea0e2977e45ef3c6f3ac", + "sha256": "179mgh8l5p7fhfmbg5rz810mhbzsxqsxd66jdb2a68vsazs1jw2m" } }, { @@ -41818,11 +41968,11 @@ "repo": "emacsorphanage/git-gutter", "unstable": { "version": [ - 20210703, - 1007 + 20210730, + 429 ], - "commit": "35aa068bc2bd6ad8b0070d9f3948d30b76c2e939", - "sha256": "020hnz41hwwr7kr2d1cs8vhlzn2i8p1hvd8v9z79v7a54f7573b9" + "commit": "1003c8cbe2367482ad02422ace0a85a7d56d01d3", + "sha256": "1w2rlxn731jly7v8ks0w670i6351darkh75dvczic50116hfnwnv" }, "stable": { "version": [ @@ -41935,16 +42085,16 @@ "repo": "akirak/git-identity.el", "unstable": { "version": [ - 20210430, - 1603 + 20210730, + 1037 ], "deps": [ "dash", "f", "hydra" ], - "commit": "5b1191f79f1845d7144bd2a49ad25c49866456aa", - "sha256": "06ybkpaqicx3q5hdjz99v3isj1jhrpmg55wf054dzx6wpjy8na21" + "commit": "07f0846fcc92b6c2fdd61db8aa959effd0e23d9d", + "sha256": "1bk1cvll02348d7dwq6dzdm0ykbxf63p16jq8j07q148qm07yf0h" }, "stable": { "version": [ @@ -42008,11 +42158,11 @@ "repo": "sshaw/git-link", "unstable": { "version": [ - 20210504, - 2207 + 20210815, + 55 ], - "commit": "0d2fd02c160cf2a09ca4b5b4ffa544833df5afed", - "sha256": "1ryb5hfdfv5iaakv74h5wnwislbc4b9ihjc32cy9sc4gizjvrrmp" + "commit": "c4cb0edc92013ae4e3660f94c0c0d4d13fca6ee6", + "sha256": "03gh9rgw5j4m1clsv97jj02ibmfwz0s4dhr0567g1jhavqm7ibl3" }, "stable": { "version": [ @@ -42376,11 +42526,11 @@ "repo": "TxGVNN/github-explorer", "unstable": { "version": [ - 20210718, - 824 + 20210825, + 1440 ], - "commit": "98d759473ddfdddba0d82ff710aafc9ee6f0490b", - "sha256": "084scd1prj0i1ljz6l298a4yknqkj4rjl9yjvqmd605ac8ji3xh1" + "commit": "cd1186fb6ca7728c1cf2478ad3878a6401c65246", + "sha256": "0zfnqsw3918rfcfapzgfalrd5w6rhy01ym6ykdswrlv38zd9kjk6" }, "stable": { "version": [ @@ -42587,11 +42737,11 @@ "repo": "xuchunyang/gitignore-templates.el", "unstable": { "version": [ - 20200228, - 1419 + 20210814, + 144 ], - "commit": "b147d1930645dda76dbd48fb6f4f7f790353de26", - "sha256": "17g66y8swy8pjkrv0in9bb1qbaq04ixn5wp6h7r54nfvjlnl1rza" + "commit": "d28cd1cec00242b688861648d36d086818b06099", + "sha256": "0x4pg4jpgmbvfw854ps9w3xgp8bgm7n7vmcvk3kp7h2s56l8s2xb" }, "stable": { "version": [ @@ -42929,11 +43079,11 @@ "repo": "jimhourihan/glsl-mode", "unstable": { "version": [ - 20200501, - 2304 + 20210808, + 1945 ], - "commit": "b07112016436d9634cd4ef747f9af6b01366d136", - "sha256": "0bav9ipfm0vy26n74ngsmjzc7fsyqz6xmriadzx55s44h8p5dn1s" + "commit": "9b2e5f28e489a1f73c4aed734105618ac0dc0c43", + "sha256": "101y46bdxxgp58li66pwqn6c3skww72gkfmhxpps2v2ijxcvqkl9" } }, { @@ -43625,14 +43775,14 @@ "repo": "s-kostyaev/go-gen-test", "unstable": { "version": [ - 20171023, - 358 + 20210816, + 1215 ], "deps": [ "s" ], - "commit": "44c202ac97e728e93a35cee028a0ea8dd6e4292c", - "sha256": "1vi5xsf0xbcbvapi20hsjangwyp38cbgi8kiccpmingnq2kp8ghs" + "commit": "35df36dcd555233ee1a618c0f6a58ce6db4154d9", + "sha256": "1r0cdpfrrz3lgkd7xzkw77c48w11l9maydm32rz27zpjgzgpakdp" } }, { @@ -44042,8 +44192,8 @@ 20210102, 515 ], - "commit": "1d7d647bb53a49fce03486eba90e97ccf35cf85a", - "sha256": "14ysgyg1cqn83ly6fkwpq7ysibz9pgwcmn9x6lzk38ynkwdwjyz2" + "commit": "d7e933095041aa32033d29f2c87d201b5b43c3b3", + "sha256": "1sa735x8m6c9a1wsavv1w2a3arkx3z7hyp9rkzqz55p2vn0z82vg" }, "stable": { "version": [ @@ -44224,20 +44374,20 @@ "repo": "io12/good-scroll.el", "unstable": { "version": [ - 20210712, - 1206 + 20210820, + 633 ], - "commit": "fac87dd390ad2aabe48afaef950f7a2d9b3ce283", - "sha256": "0kmiv013aqc4ayap39xlx7swrx2m8m12dzpvy2fa035aaj42ylvr" + "commit": "bd369750d3aeb7e210c1c033569a53d0fda898c9", + "sha256": "0dkqipsbl7sl6j6asqv7y0md2kxx91n1k4hms7d4jbj4shka7hnz" }, "stable": { "version": [ 2, 0, - 0 + 1 ], - "commit": "fac87dd390ad2aabe48afaef950f7a2d9b3ce283", - "sha256": "0kmiv013aqc4ayap39xlx7swrx2m8m12dzpvy2fa035aaj42ylvr" + "commit": "8530d6697b1534de0146275c80faccae35fa36fa", + "sha256": "0x7ym7bgyr3qdw3bygbp47q4ybah6769y9zzj7c3dfxyqnihmnpv" } }, { @@ -44626,14 +44776,14 @@ "magit-popup", "s" ], - "commit": "19e1a8188e003bae250ff6c40f61a31b638ce35d", - "sha256": "0iajd0qdcgh4vvl3f81z4r1pki9wkzy3hrywp1mmm5zhfncvhfis" + "commit": "ec5a4a7c63275875655d0fb57962ccefd68d39e5", + "sha256": "0zmam6s2vpdl88qd3h863gzy25m0g6bkmzrgib00807sj2i42704" }, "stable": { "version": [ 0, 26, - 0 + 1 ], "deps": [ "dash", @@ -44641,8 +44791,8 @@ "magit-popup", "s" ], - "commit": "34586b6650fb19689755570628a558ca9ea7946a", - "sha256": "0a7bnw01j4fbhga5x00v5bbk38j2q7mg7ablz6kswlmarqwr4fm6" + "commit": "ec5a4a7c63275875655d0fb57962ccefd68d39e5", + "sha256": "0zmam6s2vpdl88qd3h863gzy25m0g6bkmzrgib00807sj2i42704" } }, { @@ -45008,28 +45158,28 @@ "repo": "ifitzpatrick/graphql-doc.el", "unstable": { "version": [ - 20210530, - 221 + 20210808, + 8 ], "deps": [ "promise", "request" ], - "commit": "a60a646413fce528ecf42be3ee111b3f92d9f95b", - "sha256": "168yqaygyvrw05kip10azdcjsczahrsflg43vl6ki7ii6x595b5s" + "commit": "6ba7961fc9c5c9818bd60abce6ba9dfef2dad452", + "sha256": "0hb6nxyiz36r3ii8iava76cv0k4nckslli20q2iw8s1nszgwbxky" }, "stable": { "version": [ 0, 2, - 0 + 1 ], "deps": [ "promise", "request" ], - "commit": "1623cdd887846057200579cfddc0fa1815d1af9c", - "sha256": "0nqx88ng72vvz1vl7hj1m77ncf9i0d4l3n1bab0kp90fmrgxa69p" + "commit": "6ba7961fc9c5c9818bd60abce6ba9dfef2dad452", + "sha256": "0hb6nxyiz36r3ii8iava76cv0k4nckslli20q2iw8s1nszgwbxky" } }, { @@ -45271,11 +45421,11 @@ "repo": "seagle0128/grip-mode", "unstable": { "version": [ - 20210609, - 1305 + 20210818, + 623 ], - "commit": "c0ca78990395245e5f742166047b04eeff63cf6a", - "sha256": "1pyi6l08j19d30dk66ign0gpjh9wv1l42jnbsapb5migghas558z" + "commit": "1c82e27beec629514a8039e22f4f7c649e77ee2b", + "sha256": "1hgwqk991cnvslqgmvpwgxavm6nhvgn2cig3r8jpwvmfyjlcbyql" }, "stable": { "version": [ @@ -45410,8 +45560,8 @@ 20210617, 1028 ], - "commit": "b1d873cb6186e08c6f7ec782df989b01e955fb4d", - "sha256": "1rsixglxvc5a25v1pbyz23bngql84nvjn8673lmkhdcqcvd3s1hg" + "commit": "7efb041b826f15b10aa9cfb67b971fdc41064980", + "sha256": "175gfhi1621pclwvhbz2a8rramfb47v353x5hxjys1b0p848yk1l" }, "stable": { "version": [ @@ -45764,6 +45914,21 @@ "sha256": "13qy4x4ap43qm5w2vrsy6w01z2s2kymfr9qvlj2yri4xk3r4vrps" } }, + { + "ename": "gumshoe", + "commit": "8683873034caef2ed9ee2a1f9f7753049929c8a4", + "sha256": "1xxlb0kkvbr7j1ic5c9vsg2qfy1w4bm7fmiby7pg1b6c6chaa8r7", + "fetcher": "github", + "repo": "Overdr0ne/gumshoe", + "unstable": { + "version": [ + 20210812, + 1631 + ], + "commit": "35a4b0f45437309a10e2c72e523012c2e2eded07", + "sha256": "16h691h1078m5gm1xqypiapr671i7phsc3kl196m8n3dqypwjj9m" + } + }, { "ename": "guru-mode", "commit": "e60af6ccb902d8ef00cfecbb13cafebbe3b00d89", @@ -46344,11 +46509,11 @@ "repo": "haskell/haskell-mode", "unstable": { "version": [ - 20210622, - 2049 + 20210816, + 716 ], - "commit": "98ba3922360199d5260d47f417f096730ad057c5", - "sha256": "1k7zs7vlbpyhizv4ff1mhagz1mvazmm4bvq215z9f871hhf6l7ff" + "commit": "333205066754348b3dd47c5ce834757dd1bbdf48", + "sha256": "1dd79bhvqcz2jwwki6q99815a99agadqk2dbbn7ib4s135xy4fyb" }, "stable": { "version": [ @@ -46678,16 +46843,16 @@ "repo": "emacs-helm/helm", "unstable": { "version": [ - 20210729, - 1510 + 20210822, + 1700 ], "deps": [ "async", "helm-core", "popup" ], - "commit": "2c6839f32afc5056b1045f21a1b9771452dfa8f9", - "sha256": "0mj1nywzhrj6arw5gnqfk72d0q9im1b2xssp7i10agg2isyfrc98" + "commit": "64b8def85cab9550db0cff3eebaec09d80793a8c", + "sha256": "0bv0mb2dmw84jgmjr79r60276xcxw5lszw3k4a70d1fshmsc0sds" }, "stable": { "version": [ @@ -47586,14 +47751,14 @@ "repo": "emacs-helm/helm", "unstable": { "version": [ - 20210716, - 1933 + 20210822, + 952 ], "deps": [ "async" ], - "commit": "2c6839f32afc5056b1045f21a1b9771452dfa8f9", - "sha256": "0mj1nywzhrj6arw5gnqfk72d0q9im1b2xssp7i10agg2isyfrc98" + "commit": "64b8def85cab9550db0cff3eebaec09d80793a8c", + "sha256": "0bv0mb2dmw84jgmjr79r60276xcxw5lszw3k4a70d1fshmsc0sds" }, "stable": { "version": [ @@ -47879,6 +48044,25 @@ "sha256": "183vj5yi575aqkak19hl8k4mw38r0ki9p1fnpa8nny2srjyy34yb" } }, + { + "ename": "helm-dogears", + "commit": "2a551c7b122dbaca845a0bc0a86137b37521c59e", + "sha256": "184l6s2j2fr2z68d275bwgm9rcfz46y1svbwlghran9m7f114518", + "fetcher": "github", + "repo": "alphapapa/dogears.el", + "unstable": { + "version": [ + 20210822, + 2106 + ], + "deps": [ + "dogears", + "helm" + ], + "commit": "c0fa3f6318c660234e77b108f8486dfc39869071", + "sha256": "0bafs58xrlwk2f8swykwhvs1wilvbm2593gjmvdrwhy4hwg0n6f2" + } + }, { "ename": "helm-emmet", "commit": "acbc5e9fab159ad2d63b10c0fa6ac18636bb2379", @@ -49467,14 +49651,14 @@ "repo": "emacs-helm/helm-mu", "unstable": { "version": [ - 20210104, - 1214 + 20210816, + 913 ], "deps": [ "helm" ], - "commit": "392a8c11ab27b625d9f863cdde14e09893401b15", - "sha256": "1l7l75g6sg8fhsd98pfc5qw6w05qq08ilvy6bpaxfz50g81saypg" + "commit": "b85019d01815a4b58d6016c3a30fefa60d8363f2", + "sha256": "0dld66r7z525y1b22liq2j8fz248ghj8pxfid66508jpxhh71np3" } }, { @@ -51326,6 +51510,24 @@ "sha256": "1s8q97pra27bacvm5knj0sjgj7iqljlhxqiniaw8ij8w4fhcdh93" } }, + { + "ename": "help-find", + "commit": "2635dfe9bb83463c2d05bb8b59e714f5df0f61aa", + "sha256": "0zmrs414djazm3kzzqqj56ama2iids4m166d9h09xdj6nxm00zrq", + "fetcher": "github", + "repo": "duncanburke/help-find", + "unstable": { + "version": [ + 20210822, + 1704 + ], + "deps": [ + "dash" + ], + "commit": "b1d15676c5bc348821256ffa5aaea308f6f28ad4", + "sha256": "0pz6wxw0p4d5zfz2mb9f7mg6k25iqhik428yia3n77ra80jx8ncr" + } + }, { "ename": "help-find-org-mode", "commit": "572003398d1bba572fa9f6332b25ade9306bf718", @@ -51934,20 +52136,20 @@ "url": "https://git.sr.ht/~tsdh/highlight-parentheses.el", "unstable": { "version": [ - 20210420, - 1924 + 20210821, + 1957 ], - "commit": "891538de31524956136e1419e1206af0c8befe02", - "sha256": "08l5gb73ibs1mmfifnks5gxrcg8x8azw9g10jj2f8vn8viwwa7m0" + "commit": "98178e79a92515fcacd278fb486702dedde0bed3", + "sha256": "02psp4sfirvab6bv9nylfqqfrmmz87wv8x1sf8bmrrqqk0rwn37p" }, "stable": { "version": [ 2, 0, - 3 + 4 ], - "commit": "891538de31524956136e1419e1206af0c8befe02", - "sha256": "08l5gb73ibs1mmfifnks5gxrcg8x8azw9g10jj2f8vn8viwwa7m0" + "commit": "8d43acc799328023ea1ca687122bbf8f068b4989", + "sha256": "0i3fcrkkwalgcb9whw6gjcl5f4yr7vd4vp450i8lj9nab22p7mqc" } }, { @@ -52614,15 +52816,15 @@ "repo": "dunn/homebrew-mode", "unstable": { "version": [ - 20200205, - 224 + 20210820, + 1735 ], "deps": [ "dash", "inf-ruby" ], - "commit": "8c04b040656dc99719efd7663c10f26f74df4a47", - "sha256": "0hqpj9fqq0b4nj7ya93jgkagafixqkinyr7qj8dsy2j1q458ynzf" + "commit": "78e20613674247a65483f89a7912111e3ce4b9b0", + "sha256": "0snclyby8y2k7ps1qrbb18sx3d8h3dkw0d81sg1kxhlwddpp6n8y" }, "stable": { "version": [ @@ -52718,6 +52920,21 @@ "sha256": "17k4j4q19l4ahxlzzic1jlbbh7l378j9vgnrcrvpm0lxa9ipclk0" } }, + { + "ename": "hotfuzz", + "commit": "8dfb52c062e2195ba51b5670114980bf108aee8b", + "sha256": "04w3cw5h741dsx5xlqkdisw6kr6l7939x1vf2kns2k143qdcjxqf", + "fetcher": "github", + "repo": "axelf4/hotfuzz", + "unstable": { + "version": [ + 20210731, + 821 + ], + "commit": "c09ee50c337a56114834b66ab3475985e3099d06", + "sha256": "1bl99zr75cbknvx1iilw7zjzzmpcv3h541jsz7cz8si1s4dcyhcq" + } + }, { "ename": "hound", "commit": "90cfc34eb4e8be7bf887533b85feba91131a435b", @@ -52803,16 +53020,16 @@ "repo": "thanhvg/emacs-howdoyou", "unstable": { "version": [ - 20210707, - 1513 + 20210816, + 507 ], "deps": [ "org", "promise", "request" ], - "commit": "4943a4ef8d242952ade64903a05c13094de2fbf0", - "sha256": "1fgg1jcnihx3akp7r0fvwdx71ldl2apbw6xa591f6r5slvh179gn" + "commit": "4f3d70009c1368174355ca7a5eb1259f18ec5f34", + "sha256": "0j8i6c21jzdc88bvdsbshxgv62wvl95kham5w6kfkrlj0ld8i8yg" } }, { @@ -52979,19 +53196,19 @@ "repo": "hniksic/emacs-htmlize", "unstable": { "version": [ - 20200816, - 746 + 20210825, + 2150 ], - "commit": "49205105898ba8993b5253beec55d8bddd820a70", - "sha256": "0caw0wwbscfr4a9ynfabrpkvgibf0hlrkwisib82nhcqcaanf962" + "commit": "dd27bc3f26efd728f2b1f01f9e4ac4f61f2ffbf9", + "sha256": "0kzkspq9cqdz9z6vibx39kpci07fpwm399nl9bpykc1vbj8cm44f" }, "stable": { "version": [ 1, - 55 + 56 ], - "commit": "682edbf751f5c255bfd4af0eb714a8bce0737cec", - "sha256": "0gi3xshscpa53qrj8yplfsqahcilc2ybcc2p7gnh5nbnf2n1n97x" + "commit": "ed220b1f3be1f898e3cfd628196b16d25a65cb5f", + "sha256": "14m8si49br62lgx7asdyp9jysq0v6midrfk32sxy521ydqmqr3c1" } }, { @@ -53187,8 +53404,16 @@ "repo": "humanoid-colors/emacs-humanoid-themes", "unstable": { "version": [ - 20210721, - 2022 + 20210819, + 811 + ], + "commit": "3a157bab0493fe0654de0324ec59eef9b3d15202", + "sha256": "0jm81nax0r4h82gd7pbvxpf2nb7ynmxq099103y0s5xhy1cx6v8l" + }, + "stable": { + "version": [ + 0, + 2 ], "commit": "d140638360a3eb1bf8f17877bd888f898df63ec0", "sha256": "1lybjbbcjsry20p6jzmkg2h7am7hcgfhjkdmby9pk4whnhk9l4lh" @@ -53305,11 +53530,11 @@ "repo": "Riyyi/emacs-hybrid-reverse", "unstable": { "version": [ - 20210630, - 1155 + 20210806, + 1955 ], - "commit": "e59c8392938235ca8d95306aa1c3f1591a43fb45", - "sha256": "0vrdd4w9v07g6092sva8br0n3dlf1n9gj8y56k13a1wn9hwi2wp3" + "commit": "cb784a69e60938efe14b48130558f1bb1af92d3c", + "sha256": "06wibm3xc5mbpq2ha3ssiwczq7c2660dqwkmpbnsqarx2s4v2km5" } }, { @@ -54325,8 +54550,8 @@ "cl-lib", "prop-menu" ], - "commit": "be578820a7e14cb4264a63eac272800a3540a7f3", - "sha256": "174xlr36n8iv8gmapmfy55jgppmbck0m51yhni35674f50q8200y" + "commit": "3cc9361b4c0ca88fd3ba218633ea1edeae18d6fe", + "sha256": "04zj69lwjcwz0dmmwz84lfr3w0cdca94pv69ldvik4qh685cd0n9" }, "stable": { "version": [ @@ -54364,11 +54589,11 @@ "repo": "victorhge/iedit", "unstable": { "version": [ - 20210612, - 546 + 20210812, + 735 ], - "commit": "3247f3029a4e309c71a5b066fa4299d4cbb79fbc", - "sha256": "1w6apgfs4zgcqpcn3qgf0ncx46m6sz7vr4ln00s626ll0c4lhnys" + "commit": "2f504c966e7f640dcd6ecbf40a6a1a05ea286de0", + "sha256": "08lgv18584ksgkz0r39vc6xfjid93v0z3wbds38iynaayimr3p68" }, "stable": { "version": [ @@ -54622,8 +54847,8 @@ 20210423, 731 ], - "commit": "01bf1e1101ac9cd34bfda7016ce0f82f97a3de35", - "sha256": "08w76awwg1g7n67b2rvbwg0i366zshqnhvlp6zyfagjg2bz5gdmf" + "commit": "a90183954522876ebbf1ce96d88b80e6a31b9d34", + "sha256": "1dwa6gvq17p7cj09rf0zwgg6bydny4g7i8mqymfic20vjw2pbmn1" } }, { @@ -55185,14 +55410,14 @@ "repo": "clojure-emacs/inf-clojure", "unstable": { "version": [ - 20210723, - 718 + 20210811, + 645 ], "deps": [ "clojure-mode" ], - "commit": "c23c55e662c16ec94e684b2ec9611e78531921a8", - "sha256": "070h1j2axc40c3j8q6kji4avjpns65hj5kjb8a7pv5xiac9j50cy" + "commit": "38e7dc1829646b93473c31d704bda0dee6644a38", + "sha256": "1g2dacwf8dnm289y7cpy3vpdyp6qndwg52nvgdxzsbg9xx7wdz72" }, "stable": { "version": [ @@ -55245,11 +55470,11 @@ "repo": "J3RN/inf-elixir", "unstable": { "version": [ - 20210722, - 1310 + 20210731, + 2030 ], - "commit": "59b7126540bb848d3a38ccff71e85f3cc0cef39d", - "sha256": "1jdc4daydjzrmk07b8a45adrwjaifnwyn9gfi16yl7bn3wx6zcvq" + "commit": "404f88530975e3540f357f6a4f96c864bd19065b", + "sha256": "14hz77f4sjq0pjr22fp77sk5kh6074qs493aiwc900b1apzh47jk" }, "stable": { "version": [ @@ -56465,11 +56690,11 @@ "repo": "abo-abo/swiper", "unstable": { "version": [ - 20210727, - 1907 + 20210730, + 1743 ], - "commit": "031d4d051da1d8fd20f0f46e8df66c426bf3174c", - "sha256": "16hsnh0l51vayr7a8h4y9h63pw0w5kzsdwhk90bypf2fpjgqdx94" + "commit": "7cdde66c95d5205287e88010bc7a3a978c931db0", + "sha256": "0pvgh4krym43vcyiq4bsjl63gg795jlqh6kaa6llsv1awvywfqww" }, "stable": { "version": [ @@ -56496,8 +56721,8 @@ "avy", "ivy" ], - "commit": "031d4d051da1d8fd20f0f46e8df66c426bf3174c", - "sha256": "16hsnh0l51vayr7a8h4y9h63pw0w5kzsdwhk90bypf2fpjgqdx94" + "commit": "7cdde66c95d5205287e88010bc7a3a978c931db0", + "sha256": "0pvgh4krym43vcyiq4bsjl63gg795jlqh6kaa6llsv1awvywfqww" }, "stable": { "version": [ @@ -56632,15 +56857,15 @@ "repo": "franburstall/ivy-emms", "unstable": { "version": [ - 20200629, - 801 + 20210817, + 1300 ], "deps": [ "emms", "ivy" ], - "commit": "6f547f9f3dcbf0d5b88595760b3505c7195dc96b", - "sha256": "0bqn0hqdrw8psc8r6xcx6dxrjy7llkfpm0fd1k6ra4ybncgaznfg" + "commit": "dfde98c3bdad8136709eac8382ba048fafdcc6ac", + "sha256": "0h7f9yj2dx36pjqdf6n803xhv7m96xgj11hi59kh1rvr8d28pgm0" } }, { @@ -56864,8 +57089,8 @@ "hydra", "ivy" ], - "commit": "031d4d051da1d8fd20f0f46e8df66c426bf3174c", - "sha256": "16hsnh0l51vayr7a8h4y9h63pw0w5kzsdwhk90bypf2fpjgqdx94" + "commit": "7cdde66c95d5205287e88010bc7a3a978c931db0", + "sha256": "0pvgh4krym43vcyiq4bsjl63gg795jlqh6kaa6llsv1awvywfqww" }, "stable": { "version": [ @@ -58216,8 +58441,8 @@ 20210512, 2301 ], - "commit": "c3548cac4c4d2caffb750391b2d7d88c3892d139", - "sha256": "06328yfj7g575dyxa7a17hwbas3ly45hikrax6qzy64zsakp9gx2" + "commit": "c5cc024a06684b91da9bb05fecf681426596af5e", + "sha256": "1qkkqqq4r5j10s4q17r2r4ryim0gpknr5h512jj9yk52a77q1g7d" } }, { @@ -59033,11 +59258,11 @@ "repo": "JuliaEditorSupport/julia-emacs", "unstable": { "version": [ - 20210323, - 612 + 20210824, + 747 ], - "commit": "fe6f6f7a80f8d60ecffa5b2cb43667bb9dc11705", - "sha256": "0afgdga2p7ipdimvi2xncmqxv87x2khg603iifyylfq26wyxscr7" + "commit": "a1ba9a03a4b18a0d9536753efee623ab7afca596", + "sha256": "0czmvm7nm91n9kg5cv6rc5wcw6vwyqfq2fr8lrm4dfzrwvf99204" }, "stable": { "version": [ @@ -59104,8 +59329,8 @@ "repo": "gcv/julia-snail", "unstable": { "version": [ - 20210728, - 523 + 20210818, + 310 ], "deps": [ "dash", @@ -59114,16 +59339,14 @@ "spinner", "vterm" ], - "commit": "7652679de3118c10659fdc492d67ec097e9ef46e", - "sha256": "1n41bvrrnqgj3qijdn4s7zac4xrfvyh759q99agycbsm1xdpkrvj" + "commit": "5b95b278772de8339ac198fe6eaadb0427d680fb", + "sha256": "11spibld7dyggr38hzkrd05lmdf847d57cc9qyk01mb3bli21vxd" }, "stable": { "version": [ 1, - 0, - 0, - -1, - 6 + 1, + 4 ], "deps": [ "dash", @@ -59132,8 +59355,8 @@ "spinner", "vterm" ], - "commit": "03b4296ba7151963eb3c850f3314b02644101f51", - "sha256": "1jgs0pz8bzqg8116kyw3z7jwbf6karrl89ks028q091ylc00nm8b" + "commit": "5b95b278772de8339ac198fe6eaadb0427d680fb", + "sha256": "11spibld7dyggr38hzkrd05lmdf847d57cc9qyk01mb3bli21vxd" } }, { @@ -59333,20 +59556,20 @@ "repo": "leon-barrett/just-mode.el", "unstable": { "version": [ - 20210311, - 2359 + 20210818, + 1526 ], - "commit": "45c248fe72d4a15c5a9f26bc0b27adb874265f53", - "sha256": "065nnm4r6n83lbsn47idrxn3j1vpwnik683fgc4afhi5mm4ij89b" + "commit": "8cf9e686c8c7bb725c724b5220a4a3ed17d005d0", + "sha256": "0i280w7nv6zdzpwsyc9njlz5n75awqgpmmh3wklzrfh7mh1vzp89" }, "stable": { "version": [ 0, 1, - 4 + 5 ], - "commit": "8c0d9bec38f717be1549e74839360e35587739e0", - "sha256": "1568fwh6y9584lyx57iq9ncw0xn4j1ywdbq38sk9hlpgbpsy8ln4" + "commit": "8cf9e686c8c7bb725c724b5220a4a3ed17d005d0", + "sha256": "0i280w7nv6zdzpwsyc9njlz5n75awqgpmmh3wklzrfh7mh1vzp89" } }, { @@ -59678,15 +59901,15 @@ "repo": "ogdenwebb/emacs-kaolin-themes", "unstable": { "version": [ - 20210727, - 1225 + 20210814, + 1741 ], "deps": [ "autothemer", "cl-lib" ], - "commit": "1e6d02784a1c1e9f537b45aa487ee16885283b60", - "sha256": "1prs055mx64ck6dhwsj5xx0pk90mhw0vbinxwr2chn68zkzyvf6g" + "commit": "716aae7e64637e1a7fdeed8ef5b278512b8076f9", + "sha256": "0h7ipf2n9bbp6k1qda1g634gvjx2p3x2g4nkf8473iihk8960k1p" }, "stable": { "version": [ @@ -60030,10 +60253,10 @@ "version": [ 1, 1, - 0 + 1 ], - "commit": "a12ef1fb480b56c34c92f48fc7f7aa8a1d7c4c4b", - "sha256": "0093v1c5nl2bh1lvccqq6fzpgjald3yypp87dsim982aywl2vlv1" + "commit": "04ba7519f34421c235bac458f0192c130f732f12", + "sha256": "09xr0h2ag3pzlz455gv5h915vn1dz56gqx61jx3n7fc4a794pqxw" } }, { @@ -60375,8 +60598,8 @@ "deps": [ "cl-lib" ], - "commit": "388067e764bf3922234196e2e9dd9e8f664c634d", - "sha256": "0rxzl3rsa45jq8b8bjirsc6yry95zxlyp81v5r4hkvgyxqhcp3c1" + "commit": "534300796d5dc528462e2d5deb4c7a8932936909", + "sha256": "1kf4vbv2n2n5jp1qk1hh4f744h26h5283k0x6arpdpx5z7n9acqm" }, "stable": { "version": [ @@ -60487,8 +60710,8 @@ 20210318, 2106 ], - "commit": "a55ad400a52e038f110df10d8f3c1e822b90f76c", - "sha256": "06kwhj190k7g5hqy9ibgphf1xrhkhzp36d0d3kqbqkdfc4jx7xaj" + "commit": "49ef9ff24bf8f545243a30b1e49192d73c1b41f7", + "sha256": "0hs4d5fw1ic8vvzqiq7skb8ag2rdshmz71m2swl38s1bkhnbjbac" }, "stable": { "version": [ @@ -60508,28 +60731,26 @@ "repo": "stardiviner/kiwix.el", "unstable": { "version": [ - 20210724, - 1237 + 20210811, + 31 ], "deps": [ - "elquery", "request" ], - "commit": "71e770ce1e9994cf3e035cbcc7a2f26b1922323c", - "sha256": "0m6insjzl4hc00ank3i5f7y3mq734cbz085yfkm79vziy5j1i2bc" + "commit": "7d6039fa5d5d7561f42c4c2a93c698468ed34e70", + "sha256": "0g99qkch22ws3d8qwp91v0mysjh295bag1ak3bdl8q7rl015p9ik" }, "stable": { "version": [ 1, 1, - 0 + 3 ], "deps": [ - "elquery", "request" ], - "commit": "e191c312e5c9343fd9601c45a8ccd017479ee475", - "sha256": "1lsbd2qjmpbk474n19s9mq2n1i5sdg6jrnbpja6vdmn3a28c5wj7" + "commit": "7d6039fa5d5d7561f42c4c2a93c698468ed34e70", + "sha256": "0g99qkch22ws3d8qwp91v0mysjh295bag1ak3bdl8q7rl015p9ik" } }, { @@ -60840,16 +61061,18 @@ "repo": "kubernetes-el/kubernetes-el", "unstable": { "version": [ - 20210714, - 1307 + 20210825, + 1458 ], "deps": [ "dash", "magit-popup", - "magit-section" + "magit-section", + "transient", + "with-editor" ], - "commit": "ffdae05d4d0e83be5c6884326b69a8ca83f2ae2b", - "sha256": "1fjrl2w3gp5mbdg6mkw23h9zfn2h8rdmxgyw80p0jpm0b31yq1i0" + "commit": "96d9a6f1ab673a014fa9d84763ab6568ef2b9849", + "sha256": "06smpnwv5jj335fx2acgh28dlpa2h631l9qwmd3gi47q5x6yyshq" }, "stable": { "version": [ @@ -60874,15 +61097,15 @@ "repo": "kubernetes-el/kubernetes-el", "unstable": { "version": [ - 20210628, - 2003 + 20210825, + 258 ], "deps": [ "evil", "kubernetes" ], - "commit": "ffdae05d4d0e83be5c6884326b69a8ca83f2ae2b", - "sha256": "1fjrl2w3gp5mbdg6mkw23h9zfn2h8rdmxgyw80p0jpm0b31yq1i0" + "commit": "96d9a6f1ab673a014fa9d84763ab6568ef2b9849", + "sha256": "06smpnwv5jj335fx2acgh28dlpa2h631l9qwmd3gi47q5x6yyshq" }, "stable": { "version": [ @@ -61014,14 +61237,14 @@ "stable": { "version": [ 0, - 1, + 2, 0 ], "deps": [ "seq" ], - "commit": "518203abc6cee13c73c2d91282354ed59f00f15e", - "sha256": "1s3fndzjhz0xvbhdb0y7raa7zqrpws1xm79blgfcxcrv2fbmbzan" + "commit": "02b1afad2c5649221abada2d938ef3736e020a96", + "sha256": "0idzyx6pxn8s78my9b4qjxz6561w6bzjvbp3yv267piyjgvwnzpc" } }, { @@ -61032,16 +61255,16 @@ "repo": "tecosaur/LaTeX-auto-activating-snippets", "unstable": { "version": [ - 20210607, - 1851 + 20210819, + 1935 ], "deps": [ "aas", "auctex", "yasnippet" ], - "commit": "d6cd35d57ed9cd1728913ee75e42f575f090c3b9", - "sha256": "0i571idikvgryyar4sskl9k31jrn88cax7gm18mm6yfjq33ivk18" + "commit": "af78f6a6eec6f2f1096ed9b72fc0570458365423", + "sha256": "1aw534hw7s0iijsyzzf4k496xjrx983whxvy13n7yqdmzqp728fz" }, "stable": { "version": [ @@ -61268,25 +61491,25 @@ "repo": "lassik/emacs-language-id", "unstable": { "version": [ - 20210708, - 1719 + 20210822, + 412 ], "deps": [ "cl-lib" ], - "commit": "5ac941a38b193d680df6bb9e96b0508a33bb3133", - "sha256": "0vxvlvw6zmr2cn6vhci22yyn77n22pr2r4wmscm8j4693kdcqbdj" + "commit": "9efcd0f699bd7f1a55db7a62c8f1b547c6aeddb6", + "sha256": "1r2krv7a0gz5xpss17a15cdj004s0g4qrlqm4qascc1f5p9fgd9x" }, "stable": { "version": [ 0, - 14 + 16 ], "deps": [ "cl-lib" ], - "commit": "5ac941a38b193d680df6bb9e96b0508a33bb3133", - "sha256": "0vxvlvw6zmr2cn6vhci22yyn77n22pr2r4wmscm8j4693kdcqbdj" + "commit": "9efcd0f699bd7f1a55db7a62c8f1b547c6aeddb6", + "sha256": "1r2krv7a0gz5xpss17a15cdj004s0g4qrlqm4qascc1f5p9fgd9x" } }, { @@ -61673,16 +61896,16 @@ "repo": "conao3/leaf-convert.el", "unstable": { "version": [ - 20201012, - 41 + 20210816, + 1103 ], "deps": [ "leaf", "leaf-keywords", "ppp" ], - "commit": "c5bce825e4a171076c8f93692111979bcb428cdc", - "sha256": "09g4ibd0afdv54cim45ab69cc7zsmx8n0100wqwakmhvpq8g4kf6" + "commit": "da86654f1021445cc42c1a5a9195f15097352209", + "sha256": "14pvdkknbng44frlf8accpqd1bc9j99x7xjymgrdbyczbq2srv4n" } }, { @@ -61712,14 +61935,14 @@ "repo": "conao3/leaf-keywords.el", "unstable": { "version": [ - 20210711, - 156 + 20210816, + 1107 ], "deps": [ "leaf" ], - "commit": "f46311f8e7e5ce0d5af928fea99111b3c86de7ce", - "sha256": "1qlg6n5yaagq97x3c2r58pcblk0gz4bysg3cgm5iq3sq9lpf3h2n" + "commit": "849b579f87c263e2f1d7fb7eda93b6ce441f217e", + "sha256": "00fnkk6hl9l64dgmkhsqibhna7gdpazs4j28f7833n1dmg626ki6" }, "stable": { "version": [ @@ -61864,11 +62087,11 @@ "repo": "pfitaxel/learn-ocaml.el", "unstable": { "version": [ - 20210527, - 1449 + 20210820, + 2243 ], - "commit": "b8ba2a0bf56b751f077f13137a1904d66061a4d0", - "sha256": "0cc9s00flbih3kkbkan7xfqlv5qq9j4cz52ljj4xyxbf51r2lh0z" + "commit": "bcc48c818e34d518a0513e9d2c26fd92b3989c27", + "sha256": "1bv57ymdfs848347ckcl0c7jxdjzs12hpg7mcdih04yrlbvxrhq1" } }, { @@ -62215,15 +62438,15 @@ "repo": "alhassy/lf", "unstable": { "version": [ - 20210729, - 229 + 20210808, + 1921 ], "deps": [ "dash", "s" ], - "commit": "54994d4db09d879c247db9aecdc0b6f27dcb7e6a", - "sha256": "0slv6ix6z0pnwr4rphpyy0fk0ff0bx0h6vqb8qjf85gnwz8l6dwr" + "commit": "35db92ca765a0544721fdeea036d77b7d192d083", + "sha256": "0c22347dfrjdrn0cn4bqqsw8gd1663hkgycxkfivpyg0d734g5nq" } }, { @@ -62237,8 +62460,8 @@ 20210603, 1241 ], - "commit": "8b73426766029eb541b69f49cc49b9dfa1c616be", - "sha256": "101mpzj38w6cng09aq5rq4ly4a0p9zgr8jmbvlkf12i8k03lsfsv" + "commit": "f39ec6a9b93f09e1a49ee84405d1e03e04adc7cf", + "sha256": "0ri06q30z699amw7a94a14ccf83zx547przviqw0wla3l2xaw26j" }, "stable": { "version": [ @@ -62388,6 +62611,24 @@ "sha256": "0krxhcay5s9s7i41q7ga5skj31vaz2qx3djcrlwajf203bl8j4m9" } }, + { + "ename": "librera-sync", + "commit": "94c396858f0958e0c211de01aaa8971f2c09d398", + "sha256": "03vqm8rkjcgdzk8ywyvkxrxvpijrg2938zwp955rlgc0blbbra14", + "fetcher": "github", + "repo": "jumper047/librera-sync", + "unstable": { + "version": [ + 20210810, + 529 + ], + "deps": [ + "f" + ], + "commit": "b36ab4f3d8c9df1ed28d78b7d517e90195c97244", + "sha256": "0qmpk52j4fq5rp2kmsm9z8i97x6p458h2xvb53kv03r69ncxc595" + } + }, { "ename": "lice", "commit": "2508699ebfc846742940c5e4356b095b540e2405", @@ -62485,17 +62726,17 @@ 20210303, 1751 ], - "commit": "ec85691c073f0c3cb5a96d3716c70a93ff207faf", - "sha256": "0319awqqr6wv05wwqkhi3wwdj0rv76h3j92dml3mr9nna4lcdaqa" + "commit": "c66377f83a7b178b6e6d8bef5c844420c47ecbdd", + "sha256": "083a97h9ir3qqc39z7dg03k75rg3knza1lzarp6fagxbxl25cprg" }, "stable": { "version": [ 0, - 21, + 23, 0 ], - "commit": "ec88b4d6b430338a1a44a04dca1642fdef15641f", - "sha256": "0319awqqr6wv05wwqkhi3wwdj0rv76h3j92dml3mr9nna4lcdaqa" + "commit": "f3a1d941a08443d034a6c2e090b82ca5c28bdd86", + "sha256": "083a97h9ir3qqc39z7dg03k75rg3knza1lzarp6fagxbxl25cprg" } }, { @@ -62850,8 +63091,8 @@ "repo": "abo-abo/lispy", "unstable": { "version": [ - 20210702, - 1206 + 20210809, + 1001 ], "deps": [ "ace-window", @@ -62860,8 +63101,8 @@ "iedit", "zoutline" ], - "commit": "e9731aa95581951ab2cbfaed28f0ac7d71124ac0", - "sha256": "12vvh1z72bhvh4yhm0r7c3wl3iplf45qkdqk92xc0mp3zf9w6c5g" + "commit": "5ef2e8967f1015e3936ee7a5bf3d3c4b93d5c3a7", + "sha256": "0a5gj6sa49lbn753r6b3xvxxjy2f2c2jv53y79g7mqgr7w6dcx40" }, "stable": { "version": [ @@ -62908,11 +63149,11 @@ "repo": "dgtized/list-environment.el", "unstable": { "version": [ - 20151227, - 256 + 20210810, + 1612 ], - "commit": "b7ca30b05905047be2e55199a6475f8d98ce318b", - "sha256": "1szbs16jlxfj71986dbg0d3j5raaxcwz0xq5ar352731r5mdcqw4" + "commit": "a07dc2d2da83ac13abf59eb3de941e5069e9a1e9", + "sha256": "1wq3mxp3pl3gs2a6n9lh22wv2x4kaflghr03jbh4ahj42n0hnzv4" } }, { @@ -62999,6 +63240,32 @@ "sha256": "07hbz2md52ccy95gv4d5n6szrfmpfqf3w4kwqdg2cf54c7kgf7hw" } }, + { + "ename": "lister", + "commit": "944fe22bd0f893334afb8f60aa1a8bec1158849d", + "sha256": "0r9lqp32bd487l90jglxlgrxyqbxmlhavhmlnys835p13wdrzpnp", + "fetcher": "github", + "repo": "publicimageltd/lister", + "unstable": { + "version": [ + 20210812, + 1729 + ], + "commit": "a8cc3c5d1f0f4b710e15e76477eae40a99a79ad7", + "sha256": "0n6xiyx9syxxq7867ir1nrm5bzjilrp7vcjch279754v238lgcpf" + }, + "stable": { + "version": [ + 0, + 7 + ], + "deps": [ + "seq" + ], + "commit": "06eac24b6d229eb559eb7f8e6097614e647b4dab", + "sha256": "1mdmpm9iv0zfv64sjnfvx8pqm7vi8v053f2rpj7glkgm8nmms5lb" + } + }, { "ename": "lit-mode", "commit": "7a6a1c79c9bba7b17c150ea0663bc61936f15d83", @@ -63274,8 +63541,8 @@ 20210701, 1955 ], - "commit": "23e674f8572f3189fbe3917af6f22e6ec8708818", - "sha256": "1j25p0hmdfyfhlfrdn02q2ng6sgnaqvcjz1ll7rl0liq5acjvd2w" + "commit": "21fcb1a86167e93bf847d60f4f1b4e99eb2f1641", + "sha256": "0rl1cmlx1g07ncyksj1ydi5mvy58ax67jnzdfq6c3s5jlc93kxwd" }, "stable": { "version": [ @@ -63415,11 +63682,11 @@ "url": "https://hg.serna.eu/emacs/lms", "unstable": { "version": [ - 20210724, - 1250 + 20210820, + 2200 ], - "commit": "b4f56e17933d1d4098eeb04ef665a3f18479def9", - "sha256": "0fcz8hz26pwpwbl5dq4w3z6vmnjjjzwckv19zhwxj7bgv9dnm6wa" + "commit": "05c8fd16ff94590393b6b0a9cb193ec9572a9c97", + "sha256": "1aihvp446aci9pxg44ii4pickm04qf6k80mczn2xv8dddjh731sf" } }, { @@ -63873,6 +64140,30 @@ "sha256": "1gs95xnmnn8aa4794k7h8mw1sz1nfdh9v0caqj6yvnsdnwy74n5x" } }, + { + "ename": "loophole", + "commit": "7e7fc46019643eb495bee45efa91fad01c6afc76", + "sha256": "0ff9cidkx9slz34shxn5hs6j3ql7pfl0yf6dc01lsdc76mmw2kk9", + "fetcher": "github", + "repo": "0x60df/loophole", + "unstable": { + "version": [ + 20210825, + 1323 + ], + "commit": "9127dd0876567c8db306793e9c5e8151b9ab392c", + "sha256": "00mvvxrbz0qd73a5jqdlfd1s1mxkw63lcyy5mklp5amfrznwp6m6" + }, + "stable": { + "version": [ + 0, + 6, + 4 + ], + "commit": "5f280e036cad9617212f68348ab5bed159740970", + "sha256": "1ks5hm67100ri0v9mxsgs057laadmkpv01f7g0bn3f3d8kpkizda" + } + }, { "ename": "loopy", "commit": "7f4e68f6feb5d0082580cc28f6184a6091e7c117", @@ -63881,14 +64172,14 @@ "repo": "okamsn/loopy", "unstable": { "version": [ - 20210729, - 144 + 20210811, + 244 ], "deps": [ "map" ], - "commit": "b38817b9e161947ec6433c34952ac0af90ae88cd", - "sha256": "1dzvw3zy7caslx7jidm2vqn2a53pcnvzdli0ywam1yfaj26fv6b3" + "commit": "c37b669a12337fa04c3dad96bd52e9ae961f14e8", + "sha256": "038440d1ki353nkkiphp46z19y9n8q3l4f4fw01wgi21mdai2y7w" } }, { @@ -63899,15 +64190,15 @@ "repo": "okamsn/loopy", "unstable": { "version": [ - 20210705, - 2006 + 20210810, + 307 ], "deps": [ "dash", "loopy" ], - "commit": "b38817b9e161947ec6433c34952ac0af90ae88cd", - "sha256": "1dzvw3zy7caslx7jidm2vqn2a53pcnvzdli0ywam1yfaj26fv6b3" + "commit": "c37b669a12337fa04c3dad96bd52e9ae961f14e8", + "sha256": "038440d1ki353nkkiphp46z19y9n8q3l4f4fw01wgi21mdai2y7w" } }, { @@ -63974,8 +64265,8 @@ "repo": "emacs-lsp/lsp-dart", "unstable": { "version": [ - 20210728, - 201 + 20210819, + 106 ], "deps": [ "dap-mode", @@ -63986,14 +64277,14 @@ "lsp-treemacs", "pkg-info" ], - "commit": "1237f6762a6c8c8f0618c850a3c9be13655118a3", - "sha256": "0bw940zv6alh4gsryyll4k607c5lpl8fzr8v6qd2v91kydsks848" + "commit": "ac52f45742fa5862611b3af04ac679076f100144", + "sha256": "13h2qmhlva5i64n2ybgar71mxnrvxzybh6gwb8xv02zjbbdy9im7" }, "stable": { "version": [ 1, 19, - 1 + 2 ], "deps": [ "dap-mode", @@ -64004,8 +64295,8 @@ "lsp-treemacs", "pkg-info" ], - "commit": "8481da68a9df4061bc2cd884a3b73c14e8fb4bea", - "sha256": "1accwvgwjp6j82i26788g3k9zc4al9xjw700cpdgsxw7mn6lkw8n" + "commit": "ac52f45742fa5862611b3af04ac679076f100144", + "sha256": "13h2qmhlva5i64n2ybgar71mxnrvxzybh6gwb8xv02zjbbdy9im7" } }, { @@ -64105,15 +64396,15 @@ "repo": "emacs-lsp/lsp-haskell", "unstable": { "version": [ - 20210621, - 1334 + 20210813, + 1040 ], "deps": [ "haskell-mode", "lsp-mode" ], - "commit": "eb37ac4a6a43277263bbb17aed6a862a0992ae8e", - "sha256": "04pcwcw5bq6hs0zr553sf9isbslp4pbahbch0yb0l472ihlbcxwh" + "commit": "4e62cf897dd9e9fcef25c6e8e483490a07a5d439", + "sha256": "027j70422h4r82hnqkamxl84n0844hlf0fvh3h3ah7f751hynylb" } }, { @@ -64175,8 +64466,8 @@ "repo": "emacs-lsp/lsp-java", "unstable": { "version": [ - 20210728, - 1739 + 20210806, + 1842 ], "deps": [ "dap-mode", @@ -64188,8 +64479,8 @@ "request", "treemacs" ], - "commit": "7ba9c459a484a9ef8d6a59e509c03d761fccde45", - "sha256": "1pi17qxqpaig8x2hpcdhwnvn3a8smgkkspc2a2gb9xwq9bcjglp5" + "commit": "2a7d27e899edf7ad221a546ed67711ef5487f3ec", + "sha256": "0w5rq9g3gr5miqkhbj400r7gazsxs4lf9906y7a3p2avr400h930" }, "stable": { "version": [ @@ -64300,14 +64591,14 @@ "repo": "ROCKTAKEY/lsp-latex", "unstable": { "version": [ - 20210608, - 1330 + 20210815, + 1426 ], "deps": [ "lsp-mode" ], - "commit": "d1da153dbc762c5262f6e2a10264cc9075ebb6fc", - "sha256": "06vb7dxmjdc86zmv1i4qckx1isv0kvp5h0av2b4cnaci76bjh3s3" + "commit": "3f6b2ac9585682828eef81f895757f74cfba7309", + "sha256": "0da1fyw0h95hzjippqng9h68kykd0610a074wp4cwlsa4xffhjji" }, "stable": { "version": [ @@ -64330,15 +64621,15 @@ "repo": "emacs-languagetool/lsp-ltex", "unstable": { "version": [ - 20210715, - 942 + 20210813, + 916 ], "deps": [ "f", "lsp-mode" ], - "commit": "b9a930757c71f7eb30a0828a502a237bfd882b43", - "sha256": "1hsq4jjz79bb1wl8m65n2zmx10mr8zc7dmg5sp6z6sprgyb3vndh" + "commit": "d9148a65961432b6ea8a4cd20c225f8c188e6dbe", + "sha256": "0v5q51jxkxmm6pipvq9jf2s33mnrf8679ymx5fg51pk1hv0svcih" }, "stable": { "version": [ @@ -64361,8 +64652,8 @@ "repo": "emacs-lsp/lsp-metals", "unstable": { "version": [ - 20210615, - 1413 + 20210815, + 929 ], "deps": [ "dap-mode", @@ -64374,8 +64665,8 @@ "scala-mode", "treemacs" ], - "commit": "9f82ebee48d32cd7bbc3e64b84d1ef5b0926195b", - "sha256": "1l4sxkmlif6dlh6j11fgy6z7hs4739jdcazm0y35cbhq9bspxsnx" + "commit": "ca927e5a837c4e613727c804a14d9c8d36ecfcdc", + "sha256": "0yz4z53iwrz7kz45fqsy3921badcszn6c8zwxsnzgw2qd191hwy1" }, "stable": { "version": [ @@ -64405,8 +64696,8 @@ "repo": "emacs-lsp/lsp-mode", "unstable": { "version": [ - 20210729, - 732 + 20210825, + 1531 ], "deps": [ "dash", @@ -64416,8 +64707,8 @@ "markdown-mode", "spinner" ], - "commit": "f996db04e1159299c4fce2cbf3dc0cfa0e3966c4", - "sha256": "1w903yw2w4gwcz8ma1rpr2il8w76yh6gnifp3p2885r305xhsf5a" + "commit": "0b4bfd43474b5e317e617834261a2b528e3f8ed4", + "sha256": "1flzknh7mls1fg4w72iv36k77lrpkaysxdd0z922xqsg6x48znb9" }, "stable": { "version": [ @@ -64573,8 +64864,8 @@ "ht", "lsp-mode" ], - "commit": "9a0637e59d2a08a66c49fe8cda708e995ec156ed", - "sha256": "1jcf4jzsw10z9068xm20r7qdspd9yxhswpm0jjsm9rcypi2vm78r" + "commit": "72fd57643d2e8eccb9a55058ec0c89bdc04dba7d", + "sha256": "1p90d85bm51fjxy4q3fxjc4xj2vzabyi9db1bjl2j0q9pr2yphsz" } }, { @@ -64591,8 +64882,8 @@ "deps": [ "lsp-mode" ], - "commit": "4f2ea975c3199c0e8e35c0b1e9778cf1ed6bd9c2", - "sha256": "1hmdayrmxw979vigx1z6mlpzb5dwblx5c1f2k3ysms5didznlmcf" + "commit": "4061bc25aaddacb2fb848df08dd8bbbc12975814", + "sha256": "1ds19l8gvilc6bkqh7s1b5f1v4p79xkdjrq3kln0zawqsszr2crs" }, "stable": { "version": [ @@ -64634,16 +64925,16 @@ "repo": "emacs-lsp/lsp-sonarlint", "unstable": { "version": [ - 20200821, - 1703 + 20210820, + 2044 ], "deps": [ "dash", "ht", "lsp-mode" ], - "commit": "ef32b6f734323698fc8ba28646a07515aaafea44", - "sha256": "0mgz6y4x6wy4afh15ara8iv0irk8hkbf8gq2aj9gdandh86iq048" + "commit": "3af97828f9c08d782fb2086e3a73bda5759e6788", + "sha256": "1d1yfgvdyas6vbg992f5s4sayaxjxs33gh13z629x67hx6p22n3r" }, "stable": { "version": [ @@ -64742,16 +65033,16 @@ "repo": "emacs-lsp/lsp-ui", "unstable": { "version": [ - 20210718, - 1626 + 20210820, + 1331 ], "deps": [ "dash", "lsp-mode", "markdown-mode" ], - "commit": "4283414de69312298d51b03e938d95d37d238391", - "sha256": "08wqbwxwapi91mj94mgqy02bjz512sj3nwv77b067xqchz5yv6q5" + "commit": "5d643fbb0c4ef5fc4ee93d9894bf68388095160a", + "sha256": "0005kcj9kr76d5cgviyyfjm9mm13ncra08p8s903b50sm2hsxpp8" }, "stable": { "version": [ @@ -64777,18 +65068,18 @@ "repo": "immerrr/lua-mode", "unstable": { "version": [ - 20210619, - 652 + 20210809, + 1320 ], - "commit": "2bd9077dd0405efc9276f612e24a345698c539c4", - "sha256": "0ldk6v7c3xamyhq6zwp2l79iyxfan0qmlycsvj39z3fljaz953z0" + "commit": "5a9bee8d5fc978dc64fcb677167417010321ba65", + "sha256": "1w67k5wlyz9cyxgxka4ffgzszam45dxy4164xalwr16cgyhpnx05" }, "stable": { "version": [ - 20201010 + 20210802 ], - "commit": "345ebfc1e236d9676e7e9f7364493785e7756348", - "sha256": "0yx0h5kir8r3mi9vqpwsz8nsh1b1w7zk0hahn9003j3dxzi755lv" + "commit": "7ee3febab01aeacfd33357124e7f605e1e110d99", + "sha256": "0qb46p91l0pcrjswr49qvq4z8cjwz56zywz35qdb5x7q90hwczak" } }, { @@ -65229,8 +65520,8 @@ "repo": "magit/magit", "unstable": { "version": [ - 20210728, - 2026 + 20210822, + 529 ], "deps": [ "dash", @@ -65239,13 +65530,13 @@ "transient", "with-editor" ], - "commit": "ad406cd28b4e08ddb6964c168c7c8dffb5debbc6", - "sha256": "10h3131a4zjnm90z73p6h8hh3iv8dgd4rd19vhrm05pbi1i6v7m8" + "commit": "5a0cf9aaa9acf53c68c0fe98883c081aa5e29dd3", + "sha256": "16ihqh9aqjgjs14p5i17bw0wrcc1kpzvj62fn7bk8almdy6ph4dn" }, "stable": { "version": [ 3, - 1, + 2, 1 ], "deps": [ @@ -65255,8 +65546,8 @@ "transient", "with-editor" ], - "commit": "143d95cced1ee793106d16da3a182dcc2dd01e88", - "sha256": "0sn4iiicmqfqmvi7zwii6qdp35k09kqn36rpalv0w1i4jcm6j9kk" + "commit": "b70f660e36c024fa9319ea0e2977e45ef3c6f3ac", + "sha256": "179mgh8l5p7fhfmbg5rz810mhbzsxqsxd66jdb2a68vsazs1jw2m" } }, { @@ -65267,15 +65558,15 @@ "repo": "magit/magit-annex", "unstable": { "version": [ - 20210525, - 2331 + 20210817, + 2049 ], "deps": [ "cl-lib", "magit" ], - "commit": "17e5e60b59eac3cf5938c1b22c29458c0d694b0a", - "sha256": "0ak4chfn95p2vj3y0wiyimj609a4jfzrfpsc1kn0is1jv3dlkl6c" + "commit": "4271a086635ef2e1ca54b81afeda896b65b3ac25", + "sha256": "10wfd113js54zykmsm84z1h4hn10hnb5a7wl9x5770g9asg0dnqa" }, "stable": { "version": [ @@ -65419,26 +65710,27 @@ "repo": "emacsorphanage/magit-gerrit", "unstable": { "version": [ - 20210414, - 1334 + 20210817, + 1949 ], "deps": [ "magit", "transient" ], - "commit": "31f5ce30e374716818df7deb0cdbf462ef67e679", - "sha256": "08pwdjknd7407922w7gli76ji87zqj9j87sinhzjc38cnlhvm77n" + "commit": "45ed8559171a6392d305f6626d0a8228341f88b2", + "sha256": "0ghcxhi7zwk44lyckbs8n4g7ip9ab8n5bgv45r3xv49snnv5glpx" }, "stable": { "version": [ 0, - 3 + 4 ], "deps": [ - "magit" + "magit", + "transient" ], - "commit": "699c5c39c6dbdc8d730721eaf1491f982dd78142", - "sha256": "0ym24gjd6c04zry08abcb09zvjbgj8nc1j12q0r51fhzzadxcxbb" + "commit": "4f6212e1b19d65e422da1a3c8f54a1a5ab396a2c", + "sha256": "1q4kcr2ha2kir7pj0cshmgllgq51543syxkkk5jk3ksfiaba4crj" } }, { @@ -65579,28 +65871,28 @@ "repo": "magit/magit", "unstable": { "version": [ - 20210702, - 819 + 20210806, + 1607 ], "deps": [ "libgit", "magit" ], - "commit": "ad406cd28b4e08ddb6964c168c7c8dffb5debbc6", - "sha256": "10h3131a4zjnm90z73p6h8hh3iv8dgd4rd19vhrm05pbi1i6v7m8" + "commit": "5a0cf9aaa9acf53c68c0fe98883c081aa5e29dd3", + "sha256": "16ihqh9aqjgjs14p5i17bw0wrcc1kpzvj62fn7bk8almdy6ph4dn" }, "stable": { "version": [ 3, - 1, + 2, 1 ], "deps": [ "libgit", "magit" ], - "commit": "143d95cced1ee793106d16da3a182dcc2dd01e88", - "sha256": "0sn4iiicmqfqmvi7zwii6qdp35k09kqn36rpalv0w1i4jcm6j9kk" + "commit": "b70f660e36c024fa9319ea0e2977e45ef3c6f3ac", + "sha256": "179mgh8l5p7fhfmbg5rz810mhbzsxqsxd66jdb2a68vsazs1jw2m" } }, { @@ -65748,26 +66040,26 @@ "repo": "magit/magit", "unstable": { "version": [ - 20210702, - 822 + 20210819, + 1119 ], "deps": [ "dash" ], - "commit": "ad406cd28b4e08ddb6964c168c7c8dffb5debbc6", - "sha256": "10h3131a4zjnm90z73p6h8hh3iv8dgd4rd19vhrm05pbi1i6v7m8" + "commit": "5a0cf9aaa9acf53c68c0fe98883c081aa5e29dd3", + "sha256": "16ihqh9aqjgjs14p5i17bw0wrcc1kpzvj62fn7bk8almdy6ph4dn" }, "stable": { "version": [ 3, - 1, + 2, 1 ], "deps": [ "dash" ], - "commit": "143d95cced1ee793106d16da3a182dcc2dd01e88", - "sha256": "0sn4iiicmqfqmvi7zwii6qdp35k09kqn36rpalv0w1i4jcm6j9kk" + "commit": "b70f660e36c024fa9319ea0e2977e45ef3c6f3ac", + "sha256": "179mgh8l5p7fhfmbg5rz810mhbzsxqsxd66jdb2a68vsazs1jw2m" } }, { @@ -65864,8 +66156,8 @@ "repo": "alphapapa/magit-todos", "unstable": { "version": [ - 20201101, - 2240 + 20210811, + 459 ], "deps": [ "async", @@ -65874,10 +66166,11 @@ "hl-todo", "magit", "pcre2el", - "s" + "s", + "transient" ], - "commit": "78d24cf419138b543460f40509c8c1a168b52ca0", - "sha256": "0jwi7hz7gpz4sg7n38apwpnga6haqad8pshyvl0d8imlz2a0hkpi" + "commit": "60152d5c4e4b73e72e15f23ca16e8cc7734906bc", + "sha256": "1ri53hnhamp3b9nh9dld6wxjvsxrk883kw900gglvw962ndimx5x" }, "stable": { "version": [ @@ -66549,19 +66842,19 @@ "repo": "minad/marginalia", "unstable": { "version": [ - 20210729, - 1226 + 20210823, + 1004 ], - "commit": "a36af71f8ac530fbb24700494f5b2a75f2cc0111", - "sha256": "18xxglr557svzmh2j2n6lybxd9rkwmafxfw6zxd6qxn2b11ps0fh" + "commit": "207eb405706f5415dd0daf490925648fd058cc42", + "sha256": "0sgb4682kz6qyrj4il551yvcz7kbnblh8yxbysjw4psn3aayyam0" }, "stable": { "version": [ 0, - 7 + 8 ], - "commit": "9796fada769f44cb8e05914bd6be3fcc15d791e2", - "sha256": "0yn6dybvsdhr37hnadmbfqi7pf7scxr9z6a6ghsqbrghycddd0mc" + "commit": "b65d66e9301f9a0e3012568ca6721ae4ec276ebc", + "sha256": "1d6xbidxcxd5gxs5cjxbx1i1wdcmgdnn3hh7fxz0sgf1gaxyp5kv" } }, { @@ -66669,11 +66962,11 @@ "repo": "jrblevin/markdown-mode", "unstable": { "version": [ - 20210728, - 756 + 20210819, + 57 ], - "commit": "8158bc8239c531756fbf6602f4b4dea8d52eb4cc", - "sha256": "1g58va0a4m8q82nr16l693wngbbdj3xw07a937a2x21y1pzrgiih" + "commit": "0839d0709e116584bd070305e4a0d28bd03bc547", + "sha256": "04xsls7lffvhxif9c5z3ycq80yf0l31z9znmj9m3z132k7rz3bs4" }, "stable": { "version": [ @@ -67069,11 +67362,11 @@ "url": "https://git.code.sf.net/p/matlab-emacs/src", "unstable": { "version": [ - 20210716, - 1247 + 20210726, + 858 ], - "commit": "3fbc97b3f29c72b01812739536ed416e3e07e3c1", - "sha256": "0fhsp1g8mlh4ias1xgx0yjvh0g1khdy91pl474b2g0ffrml5ab73" + "commit": "c25894b91225ccdf0044f04020adf97cb41e73e4", + "sha256": "0kns1f5kg4z5wqi26mql4ja2lm1rm8zji4sjiqqlbrnk800iic55" } }, { @@ -67159,8 +67452,8 @@ "s", "test-simple" ], - "commit": "74e10d5dedb16f74efc28299c98dd7db9a4392d6", - "sha256": "1r04mbn33y515b9fwr2x9rcbkvriz753dc0rasb8ca59klp1p5cv" + "commit": "ce5fd160c193e387d9e2bacdba4065c4b4262cb1", + "sha256": "18bjr4n1m1y76kh0pp6ci7ywklrmw611ka3avrj23lb0wwrljf86" }, "stable": { "version": [ @@ -67590,16 +67883,16 @@ "repo": "DogLooksGood/meow", "unstable": { "version": [ - 20210622, - 931 + 20210825, + 1800 ], "deps": [ "cl-lib", "dash", "s" ], - "commit": "174cb2fb5f1ae674a405667ed432cd6601f53656", - "sha256": "0ix0ph82j12v1x5bi9w643q0a9cik4yd02bmk5c919wnyfz1syy7" + "commit": "56f0365dca1dbb3e97a32cf3da65f817598731b2", + "sha256": "10qp7s84p0j9byrwsfwbr1vyvad8v5y28v8dv7x7mm05pkcr9vv1" } }, { @@ -67613,8 +67906,8 @@ 20210720, 950 ], - "commit": "ba8ec63cf40b8999238c4639d111ca3bdb1e34cf", - "sha256": "1icd08irnj927d9hs5bzqjfdgc789829xy7032hs946ng44xkcg3" + "commit": "5ca4857302c2d2d329fd01d0db6a22fa5922b42a", + "sha256": "1007z1dr45b588sifb77a7q5g6l0q8mxr4p5scbrbb9f75cpsy9g" }, "stable": { "version": [ @@ -67643,8 +67936,8 @@ "auto-complete", "merlin" ], - "commit": "ba8ec63cf40b8999238c4639d111ca3bdb1e34cf", - "sha256": "1icd08irnj927d9hs5bzqjfdgc789829xy7032hs946ng44xkcg3" + "commit": "5ca4857302c2d2d329fd01d0db6a22fa5922b42a", + "sha256": "1007z1dr45b588sifb77a7q5g6l0q8mxr4p5scbrbb9f75cpsy9g" }, "stable": { "version": [ @@ -67677,8 +67970,8 @@ "company", "merlin" ], - "commit": "ba8ec63cf40b8999238c4639d111ca3bdb1e34cf", - "sha256": "1icd08irnj927d9hs5bzqjfdgc789829xy7032hs946ng44xkcg3" + "commit": "5ca4857302c2d2d329fd01d0db6a22fa5922b42a", + "sha256": "1007z1dr45b588sifb77a7q5g6l0q8mxr4p5scbrbb9f75cpsy9g" }, "stable": { "version": [ @@ -67740,8 +68033,8 @@ "iedit", "merlin" ], - "commit": "ba8ec63cf40b8999238c4639d111ca3bdb1e34cf", - "sha256": "1icd08irnj927d9hs5bzqjfdgc789829xy7032hs946ng44xkcg3" + "commit": "5ca4857302c2d2d329fd01d0db6a22fa5922b42a", + "sha256": "1007z1dr45b588sifb77a7q5g6l0q8mxr4p5scbrbb9f75cpsy9g" }, "stable": { "version": [ @@ -67785,11 +68078,11 @@ "repo": "wentasah/meson-mode", "unstable": { "version": [ - 20210513, - 1354 + 20210820, + 905 ], - "commit": "69fdb63b59ec7d1acd427cb7de7219c18af46f40", - "sha256": "1q2p31nv7xr1s8w54yyyz7vlflbnb4p63jx6960vrk2c9ppi43d8" + "commit": "1a2e2abb098c9288c2cdb3affbad76edd98abf59", + "sha256": "1bpy0iw5h7vrd3vwzk12bq6b134812dwbxxwsbsmbsk0ji4xyyq3" }, "stable": { "version": [ @@ -68669,8 +68962,8 @@ 20210601, 2158 ], - "commit": "5ad0fd71634ac9dc6f97f653bc748f9fb58d80e4", - "sha256": "0fxk860dv8xqd5rfp4bw1pspm58c71mhac2xp2cxi1i2jrg272dn" + "commit": "cc19df172e2e20a76861ac75ead3616f2f7eb870", + "sha256": "10ca4q7j83kvk2rv5dghqs56lilkdxsq0zfz0ycvdk41r26cr10z" }, "stable": { "version": [ @@ -68755,8 +69048,8 @@ "deps": [ "cl-lib" ], - "commit": "05cdbb643469676b91a44badecf84deccb50f262", - "sha256": "09zlqx9xrcj80vdd07yz9gzq5p8mayjlqkrcv7c8vm5wn5dl3gnq" + "commit": "e5cd2b4d0967758471fd2753f78120bdeb93a781", + "sha256": "05647fhsn4qlh8fyijrsni3zfvy2flivyij2rwd8q31h5k2gip3w" }, "stable": { "version": [ @@ -68914,8 +69207,8 @@ 20210318, 1748 ], - "commit": "0accefac11451b9c9196a56223b5fe1e26d75e6e", - "sha256": "04i776arnyg2gzzhiifarb73dr4w3sg38kw9cwp1bl1x5w49x47x" + "commit": "3d7f652d06c8e39cfe252ece804868a20730df07", + "sha256": "1ysfr02mc11sfcxngcki74zbyj4sa9mlk4v0liqk2bv1wx2cpdb5" }, "stable": { "version": [ @@ -69132,11 +69425,11 @@ "repo": "protesilaos/modus-themes", "unstable": { "version": [ - 20210729, - 950 + 20210804, + 1453 ], - "commit": "7447abafd82a1a7f9696ed5c193ae683609b5b82", - "sha256": "14wwfvc0gn3ciigslvbl8didxiif84ragwzwaya4wcchwjg5vzsj" + "commit": "52532a1ac2f3b707e79ba67ada8bf36846e45048", + "sha256": "1y12c9xjs6liwgwbfvy5w8sm9kn6ww8imqgkji8nncpjy3vp81vs" }, "stable": { "version": [ @@ -69407,11 +69700,11 @@ "repo": "sanel/monroe", "unstable": { "version": [ - 20201013, - 1754 + 20210824, + 2348 ], - "commit": "cae86f640df5faf44690bfac591ad464981293a0", - "sha256": "08r36wibg2rsiwjy7wd63w50sq9qfhzrapzrpcfzc9wz7wz26zka" + "commit": "d140512781bda5160b4786f591694a569639b9ad", + "sha256": "1qcdh7b02yyaqdjw815mgjpmrns15alr27ac0cwy3sm0alk5zshk" }, "stable": { "version": [ @@ -69488,11 +69781,11 @@ "stable": { "version": [ 0, - 5, - 5 + 6, + 0 ], - "commit": "392c77174ace6c57921f237f41eaa4c3a83ac303", - "sha256": "0b4kg4dxy4ywwin96vz6x3rpvgr718y5rgrdarmwym9wv1qz0a0c" + "commit": "9b679400ca885b8ff51bcfd75b87f79d66c0ee26", + "sha256": "14x3hd0z0nh0dyfi434vqywi7aawfxhlqj6sp7m17np56zq32yhi" } }, { @@ -69838,8 +70131,8 @@ 20210306, 1053 ], - "commit": "87f9ce226a32225cd3dfedde47a21fa16541ae88", - "sha256": "07364nxahcwn77l1xxr5gl9hqf0jc4q6gkzg0gs3wlwbbm9qdaic" + "commit": "fed70bc909ef2a67d907d1ac89bbcd042d277da5", + "sha256": "05jw43ajq404dq62kykw9ryh5kl0lhl9alxyqq3gixpyds3r2205" }, "stable": { "version": [ @@ -70266,6 +70559,29 @@ "sha256": "1nvsfbfsma59ilf7c3vjngnmx3aapwvvvaafdy5szm5r6lkicqvg" } }, + { + "ename": "mu4e-column-faces", + "commit": "0c86d677b53584c2ce611dcbf362b8c46c3ed640", + "sha256": "0rzz9sdkixb4zlppr3qsagk2qg714mwq2y547qm6yyvxm15w0ba8", + "fetcher": "github", + "repo": "Alexander-Miller/mu4e-column-faces", + "unstable": { + "version": [ + 20210812, + 1721 + ], + "commit": "34b9b3cbe50eaf48a636f2e05a3496111429b265", + "sha256": "02hqz71ds2alb95y65iii6b9rj0r7a9ymib7yv5321ys25j5bqzl" + }, + "stable": { + "version": [ + 1, + 0 + ], + "commit": "2f903099073a863fb9b827d3d10c439237925548", + "sha256": "03szkxv565pdkam60wxcfqv0bcxjbidww53diid6w42b9y8ks54r" + } + }, { "ename": "mu4e-conversation", "commit": "7638aecc7a2cd4b1646c6e32fe83e18ef212bbaa", @@ -70446,8 +70762,8 @@ "dash", "s" ], - "commit": "63a0377ac1ad48171621c9f0c719b62ec9395d35", - "sha256": "180i7igzqv5l22vk6n96g196mnd50lgwcmjkmzwlwdxn4jsgvjbv" + "commit": "267e0594790a5f34e474a5b480015f0f216a6865", + "sha256": "079pqjgq1gkd0mwhzdns5gw3l1xs8qxs0w59njxc8yp8p4ngzcq4" }, "stable": { "version": [ @@ -70550,11 +70866,11 @@ "url": "https://hg.osdn.net/view/multi-project/multi-project", "unstable": { "version": [ - 20210105, - 1229 + 20210814, + 1656 ], - "commit": "f71a56978a57ee5b08e75d01a5d6ec75f20cedba", - "sha256": "10fvwrd0l05lv05shrdl0cw1bg231djkz6gxlgccmdr97d01qwkl" + "commit": "151b4fc935b6f4b286249ce52d6473440fb8d1c5", + "sha256": "0jqfb7kdm5ajdxvy5fmrp240zjlrf8mzhv77hyvipg1yzkka99gb" } }, { @@ -70695,8 +71011,8 @@ "deps": [ "cl-lib" ], - "commit": "616fbdd3696f99d85660ad57ebbb0c44d6c7f426", - "sha256": "10raq8p881zzz7si3wfpcgdnwyl8y7y9rgw28akyigjyq8knl6kf" + "commit": "588daf8c520f4545323e36b8900f02693ddcf5d3", + "sha256": "0yinp3148sa72ckmaycgfy7sw3pccz6h5bl7kiz5j54hfk66hsxk" }, "stable": { "version": [ @@ -71780,6 +72096,35 @@ "sha256": "1cpdarxw9pida7pg7lgq4p4lnq2l3ny2y96j0ckxx7r04p24q611" } }, + { + "ename": "netease-cloud-music", + "commit": "07f4c49aff1e2d476fdca80d39b1be8bc7e34ee7", + "sha256": "19xvy5jbwbgf7lg7lzhjrms5s336cc29cnxamv1a75bwrix04k1b", + "fetcher": "github", + "repo": "SpringHan/netease-cloud-music.el", + "unstable": { + "version": [ + 20210817, + 1148 + ], + "deps": [ + "request" + ], + "commit": "e228a3e8646d4d66f61eb91e306b8bc1cfa9861a", + "sha256": "1wckcxjwj4bx31akxjpbzj3fdbhym0lr29sqq05c8xjbxza8dmkh" + }, + "stable": { + "version": [ + 2, + 0 + ], + "deps": [ + "request" + ], + "commit": "7cfa76d79b8432b0edb4c188c7a9b6634b78fe53", + "sha256": "0ikkg9llch1rh0infwcwf4104ahckxbsrhpbmy01p928rjkhvl3q" + } + }, { "ename": "netease-music", "commit": "ca3d4a8f8d9080e26a8fe2c38c0001d5cfc3c88c", @@ -72161,8 +72506,8 @@ 20181024, 1439 ], - "commit": "d52a43d105040b92442e7c6657b50a2188b80ebd", - "sha256": "1pikcr0m533l03ffkwv9ak5w1zqcln3ar28km2052330mq93gpj4" + "commit": "e90dfd3c7528b9c620eab29121a3591af7bf035e", + "sha256": "052shini6g1a5zjqqrwxvjk92c597qxfkar21pdzs4na0sij7szw" }, "stable": { "version": [ @@ -72260,14 +72605,14 @@ "repo": "NixOS/nix-mode", "unstable": { "version": [ - 20210706, - 2217 + 20210809, + 1724 ], "deps": [ "f" ], - "commit": "3cca5b6527a69c4701394f424726282a1462ede3", - "sha256": "1cf88v8hbcn2kcyh4bv74yhpp7jf4r80zf3pzfw6cqvrgx19px2k" + "commit": "56748ac556d0406cc6c574f7347fe37decd8381e", + "sha256": "1lgakfj8dar3517rl6k6vxjijkdywq05wg7fjjmnv3a0h8ppjjz4" }, "stable": { "version": [ @@ -72442,8 +72787,8 @@ "repo": "dickmao/nndiscourse", "unstable": { "version": [ - 20210219, - 1949 + 20210820, + 1503 ], "deps": [ "anaphora", @@ -72451,8 +72796,8 @@ "json-rpc", "rbenv" ], - "commit": "c6074af3b60ef7af7d9c45b8ad1daa21296a5e04", - "sha256": "0hx8sg6wa688f2bzddbzl81b553vjv8aaafizns9r8icsws7acc0" + "commit": "1b064aa49da9ab24fb36d208ec35a40c29d9e5b3", + "sha256": "0sp807drgl8hmxwhz12r0zr371x8x5f5amp2aap4b4irf665dd22" } }, { @@ -72556,14 +72901,14 @@ "repo": "emacscollective/no-littering", "unstable": { "version": [ - 20210619, - 2158 + 20210825, + 356 ], "deps": [ "cl-lib" ], - "commit": "b12a85a5afff7b5d60f889c1c2e8f5deab7fdbae", - "sha256": "193kyvj2f3zgb39shhcf2qk33rzbp8qp9mkc9p0cvnrc517h6y5r" + "commit": "dcc96cbf5f018a91d406926d3b69715847ef665a", + "sha256": "1c6nq2sykbsjy30zakfpny503644bbwgb4pxhfsd4wywj5yyzw66" }, "stable": { "version": [ @@ -72853,6 +73198,21 @@ "sha256": "1gy3zis9swkriynaq4xc8mc3xiihak0hi718pckbkxwjmnrfyvc0" } }, + { + "ename": "notink-theme", + "commit": "b4aa0fed8fcb8b4b671d13d403d10f705426c5e5", + "sha256": "07h6ls2ikvx1aw67sln43qm8rll9w3hqaqc4xq81k0swsfm2y5fm", + "fetcher": "github", + "repo": "MetroWind/notink-theme", + "unstable": { + "version": [ + 20210816, + 2337 + ], + "commit": "ede878ee06d4f94b5819ed3ccffe121823fbcf44", + "sha256": "0iyxdbdgv1d3hflndfrbp3zbafa2zn3kpwj2lp32rm9sh3bcp79c" + } + }, { "ename": "notmuch", "commit": "d05fbde3aabfec4efdd19a33fd2b1297905acb5a", @@ -72861,20 +73221,50 @@ "url": "https://git.notmuchmail.org/git/notmuch", "unstable": { "version": [ - 20210725, - 1815 + 20210822, + 1412 ], - "commit": "b649b0c871e7fbfcd15a24d51b071bad2680e5d2", - "sha256": "1jvibldc37whindnq64ghnj6iha1k3nvvj8bkv9s2fm90g7y4zy1" + "commit": "84347ffcad24b48390c622e5a96c31c97c094daa", + "sha256": "1zn9j0sc49g7gj1fx2n1lvgcixcvjcc3kg9jlvzwniygqnncwcw2" }, "stable": { "version": [ 0, 32, - 2 + 3 ], - "commit": "af56f3bcdc8a644564a1182f58bd311907193a4a", - "sha256": "1f0xccc51z2fijj4cyx4pcxmam9pygq0z1rb4zrybz1vpsr7zrvk" + "commit": "3f30ee65efec7c35e56af36eaa49af5c2e220d8f", + "sha256": "005nc800cr7f32w7vdpr1bqh65ffflsm8ss6x010i5c79ndfli4n" + } + }, + { + "ename": "notmuch-addr", + "commit": "3cb3070c7bb697c1a4bae1a04ca59873b18e1f33", + "sha256": "0grvncdmy3qp27m1jch995zsjqy90k4hmzl3r6pp3smanrvkdwwp", + "fetcher": "git", + "url": "https://git.sr.ht/~tarsius/notmuch-addr", + "unstable": { + "version": [ + 20210615, + 1512 + ], + "deps": [ + "notmuch" + ], + "commit": "c447ddb94b3c2a473ec1762fc083794acd6057f0", + "sha256": "0x6vvi3j27xi2gkgd9mf7mfprmymdhc4zvna9gn71padpaqf9v50" + }, + "stable": { + "version": [ + 0, + 2, + 0 + ], + "deps": [ + "notmuch" + ], + "commit": "55ef94d7d3a6eb224950975b4ceb885851e2d93a", + "sha256": "1iwr1fya1n5vqj1g91sbxjr4ayaklc50fsap21i5af79jcrz80q6" } }, { @@ -72966,6 +73356,36 @@ "sha256": "0pmikf1djkr07067nkgmdcxyn7l7ibswx6qlnai8v1v51f9h1g9q" } }, + { + "ename": "notmuch-transient", + "commit": "4b80cb36063a910a659fd435f2495a67780dc74b", + "sha256": "0ndgp4avxc9l064a34bk39bw1jp2n5b18n1ha4q9mbkdmm78ahy2", + "fetcher": "git", + "url": "https://git.sr.ht/~tarsius/notmuch-transient", + "unstable": { + "version": [ + 20210703, + 2133 + ], + "deps": [ + "notmuch" + ], + "commit": "d43ac12e397e1f014deef6c76aaf9b187b17ba5b", + "sha256": "1hv3p124wg8lc9jzb8llp47q9x3c9bwy7k6zvsncb1p513n7z8di" + }, + "stable": { + "version": [ + 0, + 1, + 0 + ], + "deps": [ + "notmuch" + ], + "commit": "d43ac12e397e1f014deef6c76aaf9b187b17ba5b", + "sha256": "1hv3p124wg8lc9jzb8llp47q9x3c9bwy7k6zvsncb1p513n7z8di" + } + }, { "ename": "nov", "commit": "20b2cc78b41a26e434b984943681fea774fd3c50", @@ -73364,27 +73784,27 @@ "repo": "douglasdavis/numpydoc.el", "unstable": { "version": [ - 20210616, - 1532 + 20210811, + 1458 ], "deps": [ "dash", "s" ], - "commit": "9209d52ddf43eddc983763b77f6932be61982475", - "sha256": "1sx7jj9w20gxxsqx5wa9m6da0971qp8mgp76hpdc1crqrx1mj55b" + "commit": "2d280dd704a1a54bcb3e8091f06656c3311894bc", + "sha256": "1hqagy3ailigy2r43vhk2aayxxlr3qs4xk18mnx2r6bgmnbrzr5m" }, "stable": { "version": [ 0, - 4 + 5 ], "deps": [ "dash", "s" ], - "commit": "b8efad7723a0c1d5738d74c7ce56ea962726a74f", - "sha256": "11y73fwn4ca6pll5vb1p04l08z48kj2ldks3qavqj4pamdcm698d" + "commit": "99e955f9fb2cea3f361004d48436e603bfc966bc", + "sha256": "1v908k5xcxx90gppkv06fmi0l0b46hw2a1p5a80qb2ybf5xdl6dy" } }, { @@ -74681,8 +75101,8 @@ 20210617, 1726 ], - "commit": "269984a50006efe282c693a6315962c92749296a", - "sha256": "19w93zpffybb4zb0h12rvyfh0857f1vf3hyr1r7rmgwyslfgp6gh" + "commit": "25ac57f10acae37f21ab3b0959d8c9b3125c4e3e", + "sha256": "0c4cvny8anx4p1i136vl881g6dsy0mrd02xzbgv860g9ix5nzvsx" }, "stable": { "version": [ @@ -74875,26 +75295,26 @@ "repo": "oer/oer-reveal", "unstable": { "version": [ - 20210623, - 653 + 20210819, + 850 ], "deps": [ "org-re-reveal" ], - "commit": "e828f86ee607de487cb60393b41c6919d0b66356", - "sha256": "0m3s68n31whryzwjz8iyd9mdzvdm2r9rh9cwlw8br5qh40jbl67b" + "commit": "aa1db964a25f99df945c308fba983de6f044aa8e", + "sha256": "05b3sc2kmmqc82ahky09ilkf6gj2alanpki7ixfa06lydhfg5iby" }, "stable": { "version": [ 3, - 20, + 21, 2 ], "deps": [ "org-re-reveal" ], - "commit": "26d6d8946ddd5f71954564f26e63f6b5f1e9c0aa", - "sha256": "0m3s68n31whryzwjz8iyd9mdzvdm2r9rh9cwlw8br5qh40jbl67b" + "commit": "aa1db964a25f99df945c308fba983de6f044aa8e", + "sha256": "05b3sc2kmmqc82ahky09ilkf6gj2alanpki7ixfa06lydhfg5iby" } }, { @@ -75031,20 +75451,20 @@ "repo": "rnkn/olivetti", "unstable": { "version": [ - 20210510, - 100 + 20210823, + 1054 ], - "commit": "4a0719021625ece4def8f18d28f86a681bee7d28", - "sha256": "1qggyq7yxg25k9iyyx5bsv8zmh1z14gdybc1d4qkyc905395jn0l" + "commit": "08611268bb19509ec087ec416f4a7f76ebae0518", + "sha256": "0nx16w2d1wrqa5cgpbwqfy2al49b9nx2pr9zygiz5qa8jdlzw86l" }, "stable": { "version": [ - 1, - 11, - 4 + 2, + 0, + 2 ], - "commit": "6902410cd857385a3c1aa20ba391901a78d2740b", - "sha256": "1pw1zc0pdwwi9dv8fypfxgn6xbfvm88qzhss880lspialff1wcxn" + "commit": "08611268bb19509ec087ec416f4a7f76ebae0518", + "sha256": "0nx16w2d1wrqa5cgpbwqfy2al49b9nx2pr9zygiz5qa8jdlzw86l" } }, { @@ -75604,14 +76024,14 @@ "repo": "abo-abo/orca", "unstable": { "version": [ - 20210105, - 1749 + 20210809, + 1401 ], "deps": [ "zoutline" ], - "commit": "c50b98da70d08b27ad1751c57bc7edcf27cd1d79", - "sha256": "19kgyxq3dci44hayzli3z528vs3mxfpsa5443wxf5pfgr7lkc9c0" + "commit": "1eaf09e31d440f781ba87d0aaa4defa5568a8f48", + "sha256": "0nh3aivgjzcb8vqbwdvvhkk0lww3x1ry52ac8h9cw2k9hdr37ks1" } }, { @@ -75622,11 +76042,11 @@ "repo": "oantolin/orderless", "unstable": { "version": [ - 20210721, - 2059 + 20210812, + 2035 ], - "commit": "1e84120a28525ccb47b602fc19b7afbeffbbe502", - "sha256": "13smhq5yh5awfqfn3739yw19dxdkqz5fbbczvv8kxf70skjxb9bk" + "commit": "1a7011ac9c476dbb083c5ead88462a5f520ef8aa", + "sha256": "0gmlxfn14gdb241ari4ix3wf9wxg2vpq2kg55h46fchs22wwqyal" }, "stable": { "version": [ @@ -75785,26 +76205,26 @@ "repo": "eyeinsky/org-anki", "unstable": { "version": [ - 20210628, - 2141 + 20210816, + 2047 ], "deps": [ "request" ], - "commit": "8cc47ecef5d90d4f0f2bba669bbd89f88fda4be1", - "sha256": "11a44kfbpa2w54kqqc9mg3bzz0p0jrdjsz8l9sn11irl8xlgrm67" + "commit": "4e70c6869181f020c6989f91f5e916e085ba73df", + "sha256": "12iwllz9mbcv7q652v4bc1wkaml065wr7gvqm08kjds8hmc6f1pl" }, "stable": { "version": [ 0, 0, - 3 + 6 ], "deps": [ "request" ], - "commit": "8cc47ecef5d90d4f0f2bba669bbd89f88fda4be1", - "sha256": "11a44kfbpa2w54kqqc9mg3bzz0p0jrdjsz8l9sn11irl8xlgrm67" + "commit": "c86394d5fd8933d1b6cafbc1dbc36bf61bcc871e", + "sha256": "0jg00hw5k6n7jf19vz1gf9599ad7skm399ng115hpywhas9ly01i" } }, { @@ -75815,14 +76235,26 @@ "repo": "awth13/org-appear", "unstable": { "version": [ - 20210709, - 949 + 20210822, + 39 ], "deps": [ "org" ], - "commit": "148aa124901ae598f69320e3dcada6325cdc2cf0", - "sha256": "0scj53w5kk62k294s7pfr15wqiiwvlprxhnmkrjmfx2gwyb1yh9i" + "commit": "a1aa8496f2fd61305e43e03e6eeee2ff92aa9e24", + "sha256": "0sfz8rpvc9hidjj81wlc48vi7ii90mssgvfnp2z215phv67npbzp" + }, + "stable": { + "version": [ + 0, + 2, + 4 + ], + "deps": [ + "org" + ], + "commit": "a1aa8496f2fd61305e43e03e6eeee2ff92aa9e24", + "sha256": "0sfz8rpvc9hidjj81wlc48vi7ii90mssgvfnp2z215phv67npbzp" } }, { @@ -75878,11 +76310,11 @@ "repo": "calvinwyoung/org-autolist", "unstable": { "version": [ - 20170924, - 1901 + 20210810, + 2215 ], - "commit": "c82d1e83e982b5f0c106b8800e5b0cfd5f73fdc1", - "sha256": "0ykiafbdjb2iy0s1gr6l51gddjbk08iwj4v13hgm8b675bl0cw56" + "commit": "943de3a76a16acd54d924392f86e8ef04f1cb086", + "sha256": "1i6sa7pavgk4gal7fppd68brr8vm4jxma6nbkqwcb1djys1vg21b" }, "stable": { "version": [ @@ -76685,32 +77117,30 @@ "repo": "GuiltyDolphin/org-evil", "unstable": { "version": [ - 20180620, - 1517 + 20210809, + 1724 ], "deps": [ "dash", "evil", - "monitor", "org" ], - "commit": "3b4620edc606412ef75c0b5aa637af22486eb126", - "sha256": "0aqya9l9s55h5wd728iz15f53p5xajrfk8pn9gjxnw0i8m4d09sd" + "commit": "981b0931d043d3b0eb61fcab6258b5a88cc74d15", + "sha256": "05y8k7r9yc8x11v344fnnpc3iq4lcanwhpgy5xnczbbxxlc8x3pk" }, "stable": { "version": [ 0, - 5, + 6, 0 ], "deps": [ "dash", "evil", - "monitor", "org" ], - "commit": "3b4620edc606412ef75c0b5aa637af22486eb126", - "sha256": "0aqya9l9s55h5wd728iz15f53p5xajrfk8pn9gjxnw0i8m4d09sd" + "commit": "981b0931d043d3b0eb61fcab6258b5a88cc74d15", + "sha256": "05y8k7r9yc8x11v344fnnpc3iq4lcanwhpgy5xnczbbxxlc8x3pk" } }, { @@ -76736,20 +77166,20 @@ "repo": "io12/org-fragtog", "unstable": { "version": [ - 20210713, - 551 + 20210815, + 2349 ], - "commit": "479e0a1c3610dfe918d89a5f5a92c8aec37f131d", - "sha256": "02g4a5lsmalc5mcybimx7ils43w3ac6269n9kzcnw59bj0i5kkcj" + "commit": "15861261a437aca2ec858317de71603d2957b423", + "sha256": "0ra4sfy48p8pm1c7h8wlmbl68r4s0f4qc49xapvs550pm4mf3hiq" }, "stable": { "version": [ 0, - 3, - 3 + 4, + 0 ], - "commit": "479e0a1c3610dfe918d89a5f5a92c8aec37f131d", - "sha256": "02g4a5lsmalc5mcybimx7ils43w3ac6269n9kzcnw59bj0i5kkcj" + "commit": "15861261a437aca2ec858317de71603d2957b423", + "sha256": "0ra4sfy48p8pm1c7h8wlmbl68r4s0f4qc49xapvs550pm4mf3hiq" } }, { @@ -76775,8 +77205,8 @@ "repo": "kidd/org-gcal.el", "unstable": { "version": [ - 20210421, - 2203 + 20210805, + 2225 ], "deps": [ "alert", @@ -76784,8 +77214,8 @@ "request", "request-deferred" ], - "commit": "4c2616a4f85adc77b91aa054bb10e76b06f706d5", - "sha256": "0isw9inxbdrf5rwqhjasbbz8av9sn56nwz7xxksr69nk5mv7zm17" + "commit": "80e6f9501fc883f29d26b0c7fea25f8b101512bd", + "sha256": "0bx2smlls1mfsk4c9c9h3f3xy6fxm78damh96rcmgqk0y6mnvzph" }, "stable": { "version": [ @@ -76985,30 +77415,30 @@ "repo": "marcIhm/org-index", "unstable": { "version": [ - 20210709, - 1801 + 20210820, + 519 ], "deps": [ "dash", "org", "s" ], - "commit": "4abf3a90503d1837782a35759066ffa7ec7dea55", - "sha256": "0409n80whcpkgcmhqrywgcj5d6fhqv67dyw4spg54hv9dn1p47zd" + "commit": "7bc78ebf7c1c334e8cc73af44793a7eaffb66a99", + "sha256": "0g1ahvsn50kr79q9bbrmgf78j1wfcibjp0j57qv7kxiqc71s7s19" }, "stable": { "version": [ 7, - 3, - 0 + 4, + 2 ], "deps": [ "dash", "org", "s" ], - "commit": "4abf3a90503d1837782a35759066ffa7ec7dea55", - "sha256": "0409n80whcpkgcmhqrywgcj5d6fhqv67dyw4spg54hv9dn1p47zd" + "commit": "7bc78ebf7c1c334e8cc73af44793a7eaffb66a99", + "sha256": "0g1ahvsn50kr79q9bbrmgf78j1wfcibjp0j57qv7kxiqc71s7s19" } }, { @@ -77068,15 +77498,15 @@ "repo": "ahungry/org-jira", "unstable": { "version": [ - 20210727, - 519 + 20210813, + 1834 ], "deps": [ "cl-lib", "dash", "request" ], - "commit": "c8b05805f897b5325e12d94e4f10a287219db44d", + "commit": "9de4310c3e853f76aa47bc5bf2dc404d4cf3226b", "sha256": "1vd49wxdj8r228xk9hpqig1f68m0iv5rsrj24ya4rdlf3z4671p4" }, "stable": { @@ -77102,14 +77532,14 @@ "repo": "bastibe/org-journal", "unstable": { "version": [ - 20210714, - 911 + 20210812, + 1749 ], "deps": [ "org" ], - "commit": "6c3a2fdb6c85253a32992a29edb976407bad4d77", - "sha256": "0rxrsqj3a8qchjhm9kb37zd9h1h1lcqfg2gwsgab74rfyfgf9ryd" + "commit": "9757996ca058029800c4801fba315b1d1614dcb2", + "sha256": "1h7b165y4z2p7qqbndqh2jyw4fgq50hqxmj2xv24shbjyqg350dh" }, "stable": { "version": [ @@ -77221,14 +77651,14 @@ "repo": "stardiviner/org-link-beautify", "unstable": { "version": [ - 20210724, - 1406 + 20210822, + 322 ], "deps": [ "all-the-icons" ], - "commit": "e34c314b84a0c2aef50772baa7c849f54323f598", - "sha256": "0bq1fl8qn3sf9wmqjj27ii42b95g501c16dbwziapvm3jhw3cz6h" + "commit": "c26ea28e6093d23621b9ec20e811986f604c192e", + "sha256": "05zjjsmavpj7klb814xyd58nszladc9wfkybzr8pqfk304bdv0yx" } }, { @@ -77350,26 +77780,20 @@ "repo": "org-mime/org-mime", "unstable": { "version": [ - 20210309, - 1028 + 20210821, + 341 ], - "deps": [ - "cl-lib" - ], - "commit": "eb21c02ba8f97fe69c14dc657a7883b982664649", - "sha256": "0bgrp39mi8pqfr8hfd2lgjil3br55bgilhj09hy3v6klzypbdviy" + "commit": "21692f16ce436d9d2a546230f1e124beec0be7ee", + "sha256": "0gvir8c8b2m5z784ml5h957f7mxgp3vn7v91p6igaq5bjf5xcfpp" }, "stable": { "version": [ 0, 2, - 1 + 2 ], - "deps": [ - "cl-lib" - ], - "commit": "3974bd41902a810d18a787e49f07cddd7849c693", - "sha256": "0vchyd80ybvr6317dwm50nxcgxfrpc0bz6259vnrh24p5sb8shbj" + "commit": "21692f16ce436d9d2a546230f1e124beec0be7ee", + "sha256": "0gvir8c8b2m5z784ml5h957f7mxgp3vn7v91p6igaq5bjf5xcfpp" } }, { @@ -77414,15 +77838,15 @@ "version": [ 5, 7, - 0 + 1 ], "deps": [ "dash", "org", "s" ], - "commit": "e14205312c54a1c97491c7f847d296b09f5f57b0", - "sha256": "030fsgdp8cg2h8mlxq6769l158pqcwnv4r3bl36lpjs950lv9pas" + "commit": "4435cd5fc94c00f6e6054324a3e022ad0e37ae0f", + "sha256": "0vk9zv6zx7s1wryfhjwzmpj5asdlkn7zlwwvk9hvf5cv9injf1wx" } }, { @@ -77475,13 +77899,13 @@ "repo": "jeremy-compostella/org-msg", "unstable": { "version": [ - 20210728, - 2037 + 20210729, + 2144 ], "deps": [ "htmlize" ], - "commit": "bb51a47513d1c4232aca8ca2c705ec57bd174b4b", + "commit": "eb01f60b1ddc132f616d2c1f4038c23f42fc3847", "sha256": "01xhhq0r36hkfhhacvwm7nwajvl7j8v3qbpn1xhi3vyy3zabhpzp" } }, @@ -77887,8 +78311,8 @@ "deps": [ "org" ], - "commit": "5010b90fd09f484268f731b855d394deb8b5fc3d", - "sha256": "0k8l7qmxbxbzc4g0xh4ipssls78fky0cq2lg3864qdli820wzy5b" + "commit": "7414e406326622dbfb5aaf2905c4ac9f6696d6ed", + "sha256": "0cq2j0fcjlg7zvqim7hkbdsnlzw247vaba847d5n0d1yxl0527b6" } }, { @@ -78171,28 +78595,28 @@ "repo": "oer/org-re-reveal", "unstable": { "version": [ - 20210507, - 1615 + 20210811, + 710 ], "deps": [ "htmlize", "org" ], - "commit": "cf000894f6e5d0627151e2bec5b1a54a311ad53e", - "sha256": "1lfvhc4gly06rq5i2fgjydg4rsy7vgksa8hpydsvklr0ypvc1hcc" + "commit": "ee712db65782ddc2bffe19c60cdc40b72ce56769", + "sha256": "0bnb8h13wpgw1i91zc701agbcdar1ns81b0kqpl8raczr9mg5dvf" }, "stable": { "version": [ 3, - 9, + 10, 0 ], "deps": [ "htmlize", "org" ], - "commit": "4538c06fab9a7259aa1fb40e93a43dcfacef27c1", - "sha256": "1lfvhc4gly06rq5i2fgjydg4rsy7vgksa8hpydsvklr0ypvc1hcc" + "commit": "95c5ad99bc1180d23b69156abc2fb4a95592048c", + "sha256": "0bnb8h13wpgw1i91zc701agbcdar1ns81b0kqpl8raczr9mg5dvf" } }, { @@ -78303,8 +78727,8 @@ "repo": "jkitchin/org-ref", "unstable": { "version": [ - 20210726, - 1533 + 20210823, + 27 ], "deps": [ "bibtex-completion", @@ -78319,28 +78743,30 @@ "pdf-tools", "s" ], - "commit": "839ca73f3ae451efbf82859dcd17b63375cb8d76", - "sha256": "0zhzxmwlgwa0c27rfqpbpz7k477mm5ahhxyvmkvk6nafv5gdryc6" + "commit": "37b64e6cc1068c1b7ffe579851a345aa57772333", + "sha256": "0xd1qp8dfy8n8b2n3rsdzm8vrfl7dii142kw330s8jp3pavww1f6" }, "stable": { "version": [ - 1, - 1, - 1 + 2, + 0, + 0 ], "deps": [ + "bibtex-completion", "dash", "f", "helm", "helm-bibtex", + "htmlize", "hydra", "ivy", "key-chord", "pdf-tools", "s" ], - "commit": "db6c52f41faba686a378a8c57356a563f5cef496", - "sha256": "0kx6w3zz5gmlmr9bx1mdq1k8ykkbnll6m91z90p6f2xm96j627j6" + "commit": "37b64e6cc1068c1b7ffe579851a345aa57772333", + "sha256": "0xd1qp8dfy8n8b2n3rsdzm8vrfl7dii142kw330s8jp3pavww1f6" } }, { @@ -78440,14 +78866,14 @@ }, { "ename": "org-roam", - "commit": "6358b4fe160432cee80e6c15eac26764a92aac8a", - "sha256": "16xab5rz98bavk3vjmb5bxl4r5kpynnw40m0ahy1kl6cax51kx0y", + "commit": "27c8b4c527d17203d6b30a92838c1784a0bcc5fb", + "sha256": "1cb7w656w8z126fz171ikwh0aliyb87k4912kpf54rm22ck8c33s", "fetcher": "github", "repo": "org-roam/org-roam", "unstable": { "version": [ - 20210729, - 1527 + 20210825, + 1600 ], "deps": [ "dash", @@ -78457,13 +78883,13 @@ "magit-section", "org" ], - "commit": "127d6efa485c2d7846e1ec88954f4bf93623281f", - "sha256": "1663brqgysfkn5ja26jm6f4rf8zjdvrbbfkwi0xcfkac2sg2f4bq" + "commit": "74a6fd598a03d8d981c21267e9aa25e73d125bcd", + "sha256": "0mm3d8zbnamscnbqmdkqqsj6qy30j83gqdlgwacw1r8n1ncwx8sa" }, "stable": { "version": [ 2, - 0, + 1, 0 ], "deps": [ @@ -78474,8 +78900,8 @@ "magit-section", "org" ], - "commit": "3a78422a099261317d369be58947f4d4b3df1da3", - "sha256": "0mslrdgd41czay3w7znz4qsv1h0p3zqfsq6bkyxmxfyd2w5z82zf" + "commit": "f819720c510185af713522c592833ec9f2934251", + "sha256": "092xn0sqc7b7f6pdf7m6c3giqqbh6fq02mfz8qrg0wmx4ds1isqp" } }, { @@ -78486,16 +78912,16 @@ "repo": "org-roam/org-roam-bibtex", "unstable": { "version": [ - 20210729, - 1238 + 20210810, + 1626 ], "deps": [ "bibtex-completion", "org-ref", "org-roam" ], - "commit": "919ec8d837a7a3bd25232bdba17a0208efaefb2a", - "sha256": "0ir7516ngagf8mvy3qdir50bfigrqd2pl45c4g2y5cih5lvmfsn6" + "commit": "c13a05b2c855ba1516241d8a1de33bf2c689d6e4", + "sha256": "0m1mr0c6wmiw54qiqz6dm74l1cn0khywndyqfdmss3l52sipzc9x" }, "stable": { "version": [ @@ -78512,46 +78938,6 @@ "sha256": "04vc2w7x2lyamp0qa1y274smsf9x2qxr1igrpz9f4y5ha5332px5" } }, - { - "ename": "org-roam-server", - "commit": "40932819ae514a015f998a687d3cf651b30a79a1", - "sha256": "1bizzzmi1bx996n9g9rmkvpm229ipmpdacmh2jd3pvn8kx6252bm", - "fetcher": "github", - "repo": "org-roam/org-roam-server", - "unstable": { - "version": [ - 20210723, - 1424 - ], - "deps": [ - "dash", - "f", - "org", - "org-roam", - "s", - "simple-httpd" - ], - "commit": "35cd20280428470d37c1bff18d26cd49436ec3a2", - "sha256": "0xf229xkvzwaxwg2aqxgxpsi89aw3dp76ixhpkwyx6l52798nznf" - }, - "stable": { - "version": [ - 1, - 1, - 2 - ], - "deps": [ - "dash", - "f", - "org", - "org-roam", - "s", - "simple-httpd" - ], - "commit": "2093ea5a1a1f2d128dd377778472a481913717b4", - "sha256": "1jp8mkqx1l3w166b16l2d5zsqjcc836bkclplgjk4laysb6msry8" - } - }, { "ename": "org-rtm", "commit": "855ea20024b606314f8590129259747cac0bcc97", @@ -78578,8 +78964,8 @@ "repo": "tyler-dodge/org-runbook", "unstable": { "version": [ - 20210502, - 1732 + 20210825, + 1544 ], "deps": [ "dash", @@ -78590,8 +78976,8 @@ "s", "seq" ], - "commit": "3206b4ea40614ba87a1b12f66ad0f84354bcdafb", - "sha256": "0b2gs6hm8k25539m7hxbhh5jza37mdfv3z763r130fxj3b646v01" + "commit": "db59e2e9d4230997cca4cbf3a5bb1a89fd38f87f", + "sha256": "1444qsf3fyygw0bpl805fqfyh2mygc821iy2i6cpfyaibrz0n6hj" }, "stable": { "version": [ @@ -78736,16 +79122,16 @@ "repo": "alhassy/org-special-block-extras", "unstable": { "version": [ - 20210228, - 212 + 20210806, + 154 ], "deps": [ "dash", "org", "s" ], - "commit": "143146d5bab10e32d4a24f4c3e5e30905b0f3176", - "sha256": "1wbb5isfm1ixv2zbys75cn276zcr2927j3h2crb081acygm78qqv" + "commit": "8b7bbcb239cb08ca96a950cf59bb5e9617bee2cc", + "sha256": "11qni2i00ck0kh2x334gahhr4lhnh03mvn69bzvivnx8rlk6w1f7" }, "stable": { "version": [ @@ -79598,16 +79984,16 @@ "repo": "marcIhm/org-working-set", "unstable": { "version": [ - 20210320, - 1019 + 20210802, + 1435 ], "deps": [ "dash", "org", "s" ], - "commit": "f5512304dccc152816f9957f5627c814bcb0f683", - "sha256": "0kg2bjwp66fml3836zfr15aadh5d7srg8ai69g0nxk1kmalbxkdv" + "commit": "bced50755c45047565a3ab395c3b5e59ab15cc8e", + "sha256": "155gxp0ysfwgiykw0zjzrm86pd9f2nz5whlcjm51apqd0439jjv9" }, "stable": { "version": [ @@ -79917,14 +80303,14 @@ "version": [ 1, 7, - 0 + 1 ], "deps": [ "magit", "org" ], - "commit": "26242895ef1642bf30c63683fb224fdba25e0853", - "sha256": "1xd58yqqsb79lgxkhxs4s50jq8f3639k6fhlza9hsy53apfczkal" + "commit": "f956d802f19ea495efa95af6c673588afeb3adc5", + "sha256": "0mbcr98xq3zim01dk1fbyc1vajnjwx90k62mygv343rhrd05v44m" } }, { @@ -80045,8 +80431,8 @@ 20210722, 737 ], - "commit": "6f3ab471da576938d8200ce600fbb02dcb947f16", - "sha256": "1f8dspi9xizrxylff2zllwzz9lzrg3wr9cx0d5qzs74bs685vwwy" + "commit": "6bb7deaea9ca01137e7cbd74ff23559e6a4d85e7", + "sha256": "0kq5fa3dkz6a8y8zyf588032hlmpvjl7mn7y6m2mjsamf7fxnh3h" }, "stable": { "version": [ @@ -80066,11 +80452,11 @@ "repo": "tbanel/orgaggregate", "unstable": { "version": [ - 20210315, - 1415 + 20210819, + 1739 ], - "commit": "639ec296ccca4e2f7405e9ef72506fad609f2167", - "sha256": "0nkm6y851sm1bp8ch9d7dxi1z07qs1254ab8zjv16hvq8arp0s6c" + "commit": "141577373600e7be16a5b67284165f54e8743505", + "sha256": "0nhaigi53nygw0fvmj335sd2kin3rlhh501sx4asdvdlhm28n2hr" } }, { @@ -80927,11 +81313,11 @@ "url": "https://git.sr.ht/~abrahms/ox-gemini", "unstable": { "version": [ - 20210102, - 1517 + 20210819, + 437 ], - "commit": "d88c10bcb10fc463fa5a2f6e29c8c94b75a314c0", - "sha256": "1f8kbg5vjd1k7fak3v56b77yk612j6vmzx4xzx3m2vq3f0nyxq29" + "commit": "b69e7418fdd12c6228079886d42c12fe1342727c", + "sha256": "0z011ipycqr4rvf305z2fdd7zhgqaak4hx7kgzh0yap20h6xqlww" } }, { @@ -81018,8 +81404,8 @@ "deps": [ "org" ], - "commit": "8345ceb90ff1314d598c6b67ba6ee7616e2b0bc4", - "sha256": "09x5dr4kc9pxz8iw1ibl262164akr1m5gms5cws2q3zy04qjqfzl" + "commit": "6ec3d054ddadbca1f5effb961c1db583e377ca35", + "sha256": "1vhyq9hbvbny9lj0h8fw7xk2i0fxcwn3v8rhwh6fjns86m7zy0lj" }, "stable": { "version": [ @@ -81375,14 +81761,14 @@ "repo": "yjwen/org-reveal", "unstable": { "version": [ - 20210705, - 2321 + 20210815, + 907 ], "deps": [ "org" ], - "commit": "014561540bdc5dc6fe68671cadcc3793a65f6b54", - "sha256": "1hha8f9vb6pmszpz0xx4lj2imm2nh81mgrvsblvbm92k4qvmk6z4" + "commit": "8eae719acc18592a916715e74984e9222bb6d5fa", + "sha256": "12r4s8xkmyiyv8pcf0zy2jh2dp582rx41pggnfh44cd27skafd30" } }, { @@ -81640,16 +82026,16 @@ "repo": "LaurenceWarne/ox-yaow.el", "unstable": { "version": [ - 20210706, - 1059 + 20210815, + 1957 ], "deps": [ "dash", "f", "s" ], - "commit": "c7eca0130c35b3a8adcade637a35d1474368f4e9", - "sha256": "1k8vr1z9h6qywl037fh5p7ji0k78zm18r4qg996jghdk9sfxasfx" + "commit": "e20e52ef2968323d26a2e6cd0843c9b36195a1ff", + "sha256": "0q5k38raqq7ms4wdxqwxhc0pga31wn3v35dc0cv8dr687i9ck0s5" }, "stable": { "version": [ @@ -82281,15 +82667,15 @@ "repo": "joostkremers/pandoc-mode", "unstable": { "version": [ - 20210317, - 2340 + 20210819, + 1141 ], "deps": [ "dash", "hydra" ], - "commit": "2ad3cfa3045e0a3bcbdee02819c6fd356a8bc40c", - "sha256": "1m6c5y95asrw7fkn9sah6a38glr66vb35d3g6gc8lcvh2ikmgjn1" + "commit": "39167ff0e9293b4632cf162a32c9d0b6990a371d", + "sha256": "1rbn8vj1aazwzzzs79455qcd5w04l82xw4y00xn199mch95rim5d" }, "stable": { "version": [ @@ -82660,20 +83046,20 @@ "repo": "joostkremers/parsebib", "unstable": { "version": [ - 20210108, - 1525 + 20210809, + 2049 ], - "commit": "25ea94f57c6f3531dd8383f8c5a45ee8d81272bd", - "sha256": "1d3ysh82gh5mg07hlz3ll782lldnaj0xmyabv18jln4y2xd7ncni" + "commit": "8d7cf64badde2b14baac277cac85e83777da9409", + "sha256": "1hd6izpb4irinjmfy7zxy8fqnr1fm4iw2sipvl9261nm68dzha6z" }, "stable": { "version": [ - 2, - 4, + 3, + 0, 1 ], - "commit": "25ea94f57c6f3531dd8383f8c5a45ee8d81272bd", - "sha256": "1d3ysh82gh5mg07hlz3ll782lldnaj0xmyabv18jln4y2xd7ncni" + "commit": "8d7cf64badde2b14baac277cac85e83777da9409", + "sha256": "1hd6izpb4irinjmfy7zxy8fqnr1fm4iw2sipvl9261nm68dzha6z" } }, { @@ -82720,8 +83106,8 @@ "deps": [ "a" ], - "commit": "eff941126859bc9e949eae5cd6c2592e731629f2", - "sha256": "0fr8giy750nr2mzl61sk0z2c7544q2pyglj4xwz1gk3gxm1b4jay" + "commit": "1bb3800f8f2417b0b881f57448ccb4acd1fe5b8d", + "sha256": "0894vhyx1phq8mdynnnqflcgi2a54hi926f4dk8slawzx1cb9xxb" }, "stable": { "version": [ @@ -83240,11 +83626,20 @@ "repo": "JonWaltman/pcmpl-args.el", "unstable": { "version": [ - 20210729, - 331 + 20210805, + 1537 ], - "commit": "7d444d5793c779a863d5834572c1dae4d87a250b", - "sha256": "0mvpbv0y25qvk42yrhkawbimff92mbd8kgpcb8rb3lvdjv4mh0n0" + "commit": "5f2943fd70d94065496c52d21f05eb89028637cc", + "sha256": "19xwwpfcf0l9jh7xixyjd5adivj27jw00zvxb7n1240k5p332pzi" + }, + "stable": { + "version": [ + 0, + 1, + 3 + ], + "commit": "5f2943fd70d94065496c52d21f05eb89028637cc", + "sha256": "19xwwpfcf0l9jh7xixyjd5adivj27jw00zvxb7n1240k5p332pzi" } }, { @@ -83834,25 +84229,25 @@ "repo": "nex3/perspective-el", "unstable": { "version": [ - 20210709, - 2353 + 20210821, + 259 ], "deps": [ "cl-lib" ], - "commit": "b55aec612db791a1720232df0e2df0d3597d850b", - "sha256": "01bh8cs54mnikzrbhxc03588mrx8wsn2vqgb12j47g4lmg93759w" + "commit": "1c257f35ccabaa807d3a79f6daed7b6a5872d27b", + "sha256": "0rgkajcw7fismqmww1r0yy84hnqripx5dwklf2mfm042whn9bqgf" }, "stable": { "version": [ 2, - 15 + 16 ], "deps": [ "cl-lib" ], - "commit": "dd2a380ac71edf1321a6462f14668baf99879e80", - "sha256": "0l9i7ky25d9ii04w2brgxc8dk2rky50naba8lbfqi7hcc34z8pp6" + "commit": "c052ab2ce23f969ad2b7853ba0b3cbd4a5954c47", + "sha256": "0hg4rj3v748f6k4fwa21g683vs3bfya0wg9r9xdg216kdhfdk5j7" } }, { @@ -84293,11 +84688,11 @@ "repo": "emacs-php/php-mode", "unstable": { "version": [ - 20210714, - 1700 + 20210808, + 1745 ], - "commit": "4b0e9f84d063c476b211ec89b2a17bddac138911", - "sha256": "0jw2c8fmj0m39xms301diid7l1wkhcpxh6mw2mrdla8as31vgygv" + "commit": "8212f415fc5de2dedfc74d797b3951b2cbfb6f58", + "sha256": "1r9arl0v33rqgvi98xz63pf56kb7d8j1j1p74ky89g5zk8zzivd3" }, "stable": { "version": [ @@ -84317,20 +84712,20 @@ "repo": "vpxyz/php-quickhelp", "unstable": { "version": [ - 20210725, - 1413 + 20210819, + 2025 ], - "commit": "18678b9648a4227e612df773bac9ec46fc51b75d", - "sha256": "0x2n95sd85486irk04ig07lmilzc5v3448ys6p0kwn7357iir6wv" + "commit": "d5e11b7a6bad64550521e8822139a33218b8c9bb", + "sha256": "1d9rg699wl67qkb93r4qnjn0ng4xn9c2g6kc98zaiy2v0v2wcv8g" }, "stable": { "version": [ 0, 5, - 4 + 5 ], - "commit": "18678b9648a4227e612df773bac9ec46fc51b75d", - "sha256": "0x2n95sd85486irk04ig07lmilzc5v3448ys6p0kwn7357iir6wv" + "commit": "d5e11b7a6bad64550521e8822139a33218b8c9bb", + "sha256": "1d9rg699wl67qkb93r4qnjn0ng4xn9c2g6kc98zaiy2v0v2wcv8g" } }, { @@ -84586,11 +84981,11 @@ "repo": "johanclaesson/picpocket", "unstable": { "version": [ - 20210103, - 2315 + 20210806, + 1135 ], - "commit": "fa3a49f011b5ae139728548fec7375743f61c7c7", - "sha256": "1vb358jyfs3px70ah60dmlz5azdfkva9xrw3mgrr4060vcy7w4q1" + "commit": "7e30e96c26b1ff0d374612534c3e09d309426252", + "sha256": "0sx4493sxgw0fd7b48h8biygnd10k5bl69hhsd69a4yc7yq1zbnm" } }, { @@ -84992,6 +85387,21 @@ "sha256": "0nk12dcppdyhav6m6yf7abpywyd7amxd4237zsfd32w4zxsx39k1" } }, + { + "ename": "pkg-overview", + "commit": "5d4cf5e09d33a4fe22ebf36ed2b5d487cefbf5c6", + "sha256": "0m6q602yp9xlj2hikyjhc616017q42a39v6p64f6l7v1gk8ri61n", + "fetcher": "github", + "repo": "Boruch-Baum/emacs-pkg-overview", + "unstable": { + "version": [ + 20210802, + 1509 + ], + "commit": "9b2e416758a6c107bb8cc670ec4d2627f82d5590", + "sha256": "1p15jyjpiikx5y3syvhrdxabhhl898af88dv3fi95gm8v39n35i0" + } + }, { "ename": "pkgbuild-mode", "commit": "ca7bf43ef8893bf04e9658390e306ef69e80a156", @@ -85562,8 +85972,8 @@ "repo": "alphapapa/pocket-reader.el", "unstable": { "version": [ - 20200828, - 9 + 20210824, + 658 ], "deps": [ "dash", @@ -85575,8 +85985,8 @@ "rainbow-identifiers", "s" ], - "commit": "dbb7b043edb42341b7f48ce0d81ba08c3c676076", - "sha256": "1xkhk8zb84c8jdgc5yjizzfyf265gk110fv8adww270sqg71la9v" + "commit": "0a177d4a3b4b2532be7f0775e5cc41e6382a45d4", + "sha256": "00ik1lgz9gzpx6701z26y0m064gf574ir4hjf1b2a052917gi97a" }, "stable": { "version": [ @@ -87055,14 +87465,14 @@ "repo": "alphapapa/prism.el", "unstable": { "version": [ - 20201228, - 141 + 20210804, + 417 ], "deps": [ "dash" ], - "commit": "9e38442d95a49199e1a2e69aefbfe139ca9036ab", - "sha256": "1x42lfp3ay31lvdmjsvwqblci1bbwxhddq58fq1ip108lwqazl87" + "commit": "b0cbdaf4916c1cf348a8f0e4f6158e040a627562", + "sha256": "1h5fca47kinwr5qy58nh0bqn259vcj540013wb7kwki6ab33l809" }, "stable": { "version": [ @@ -87484,26 +87894,20 @@ "repo": "bbatsov/projectile", "unstable": { "version": [ - 20210701, - 441 + 20210825, + 649 ], - "deps": [ - "pkg-info" - ], - "commit": "da08a9103b5ba3b38ef031a9627a19436eb318b5", - "sha256": "08y36qvr20888jc2b5172qgah0xpp9bc3iwp38w8clfrjfd28g2s" + "commit": "db5748ea4a6428136769e7e50c6d0a12aa7acd8f", + "sha256": "0zfvv7iyb0n61hd3q1jk0bldpfwhw49kd61c5wd44g437vr7jm6x" }, "stable": { "version": [ 2, - 4, + 5, 0 ], - "deps": [ - "pkg-info" - ], - "commit": "bbb7b8d4c498e88046e4e6227990626f2b5dbe1b", - "sha256": "0w2s1mxbi8qqv0k34q0jj368n0p764rz72grdzzrmdlc96bbd03s" + "commit": "a2a1aba8aa12d0ff0e044c4336a5c2598c259720", + "sha256": "0wyq23xsfwpzfzncs2wr5ap4x2jh9r95qnhlzr8igq3325vm0b4f" } }, { @@ -87564,8 +87968,8 @@ "repo": "asok/projectile-rails", "unstable": { "version": [ - 20210625, - 708 + 20210810, + 1303 ], "deps": [ "dash", @@ -87575,8 +87979,8 @@ "projectile", "rake" ], - "commit": "6a18ada3566ab2cb795129e3dfca2a32cc413fb8", - "sha256": "1xr6ha5jkczpbdqpxf8s4qggvx4arwky6mfwaji2kjnkk0ajjyda" + "commit": "30828afbfa7b0e07970e3e668e975e7916b824c4", + "sha256": "1m1n1rvna9qhq3dl4sd90lnkzvk7vaz2832r3zhfyg6l5d7dybh6" }, "stable": { "version": [ @@ -87897,11 +88301,11 @@ "repo": "ProofGeneral/PG", "unstable": { "version": [ - 20210607, - 1422 + 20210820, + 2321 ], - "commit": "bc86736abb728ec0d28abc90ef0adae21d29a66a", - "sha256": "00cga3n9nj2xa3ivb0fdkkdx3k11fp4879y188738631yd1x2lsa" + "commit": "f84e634c99d0c6bad17e8840baf7b6173563188f", + "sha256": "07gr1czqh23kz0nw29vdg60vrc5yj9p4rymlplb6xbkq91lncnrd" }, "stable": { "version": [ @@ -88004,17 +88408,19 @@ 20200619, 1742 ], - "commit": "53365065d9b8549a5c7b7ef1e7e0fd22926dbd07", - "sha256": "07r0mvflnhhnqc5igmv6r894nrv70a4j6sf9fzz23ka945ss5dgq" + "commit": "38f6e15e77a4e33a669d5d37efd87edfa15c7c04", + "sha256": "1n6xp8yk7vkvgigy46ybvzd3a9597c6qg0zyc9bbhqk93vhwxqkk" }, "stable": { "version": [ 3, - 17, - 3 + 18, + 0, + -1, + 1 ], - "commit": "909a0f36a10075c4b4bc70fdee2c7e32dd612a72", - "sha256": "08644kaxhpjs38q5q4fp01yr0wakg1ijha4g3lzp2ifg7y3c465d" + "commit": "1a1710b19de57c6f68ebe599a6a22de2392e6018", + "sha256": "0v006kvgmy1m4fpkg15pa1pdf1c2xwn4vbr952jrk1z24sfyljdy" } }, { @@ -88858,16 +89264,18 @@ "repo": "dwcoates/pygn-mode", "unstable": { "version": [ - 20210724, - 2207 + 20210824, + 1323 ], "deps": [ "ivy", "nav-flash", + "tree-sitter", + "tree-sitter-langs", "uci-mode" ], - "commit": "7298c3cd798853309bece115848e9d0400a7a627", - "sha256": "049aw0cs8kh4p2113v7f2cxcv9277zby02hxalg86bx0rdy8yaz5" + "commit": "f3d6b5c6c8f74d7c54808759f71ff26c91c0b7e6", + "sha256": "1v5gisi22d2syb5vd9plydncjlz3hqyx9fhzamxjcmpybdzss80m" }, "stable": { "version": [ @@ -88892,15 +89300,15 @@ "repo": "tumashu/pyim", "unstable": { "version": [ - 20210720, - 47 + 20210803, + 226 ], "deps": [ "async", "xr" ], - "commit": "ace904840c676297138ed62abb4f1d05c837fd4c", - "sha256": "117h1zanyjlb566kzdx014xjzryvf6qvqa37zbyb821ajxjlpkk0" + "commit": "c2604a549b26b7a2125f986e9d34f0b58353336d", + "sha256": "1ikvg9qk4zzp3ch5glihdzhwhijs3vhrn6y1wc2d68h17j7li1gl" }, "stable": { "version": [ @@ -89062,17 +89470,17 @@ 20210411, 1931 ], - "commit": "ca3bc53fd8d628473fba25c7736d0abfac8e4a4a", - "sha256": "0yhkj2468si884x748v0a3jhzyg890fvxv02y5g5v8alpj19j1jj" + "commit": "23488352bc0dbdfa519abb527af3d676244b7106", + "sha256": "0gfig5fnmsvqbfcxd973v31zhvrdldma9grxliy83p7jzphs5kgp" }, "stable": { "version": [ 2, - 9, - 6 + 10, + 2 ], - "commit": "444f654e23de0772036c0e29c8e5745e48a8970c", - "sha256": "15yw69v1cj6zkndk60c2g0dgl0khh8bfm1lrwhjffpdjfc7nkc9a" + "commit": "591a23adcfdd2fe20b8cfdb9e4e07772c8f454f8", + "sha256": "06xrv79ns4bsk819iqrhjcb36k925yl2zi93l6sv7r228y0y8jl6" } }, { @@ -89343,11 +89751,11 @@ "repo": "python-mode-devs/python-mode", "unstable": { "version": [ - 20210620, - 1854 + 20210809, + 1849 ], - "commit": "3f0be5ace492d2ddd8405f4b5186ef89caee762e", - "sha256": "17clkgs94dgq5nsjlwkr52m5s446ibfss3qc8a8m0zaz6j4f8l1m" + "commit": "f43ab088af83ec20c5a70acc3559980c94ed2910", + "sha256": "0bflpbjv5j9q15qhm9q0yaaw0sfncx3dw5najvsj2rhiw5i47xx3" }, "stable": { "version": [ @@ -90085,14 +90493,14 @@ "repo": "stardiviner/emacs-rainbow-fart", "unstable": { "version": [ - 20210202, - 846 + 20210803, + 922 ], "deps": [ "flycheck" ], - "commit": "61acc77535720f7ed3b8f680fa9d9a1871832f11", - "sha256": "063a76lvyx83h7smplghcg5zxkncx017kjc25y74diwsda16sn0z" + "commit": "57fe85c0f03917f6867833636a5617cbfa663a29", + "sha256": "1y97a876gsva2pr75b4psfs8hd26vd2drfsbfg79hazcqvr51c5j" } }, { @@ -90391,11 +90799,11 @@ "repo": "thiagoa/rbtagger", "unstable": { "version": [ - 20200911, - 2209 + 20210814, + 1656 ], - "commit": "32d1df138a9b70530ec7a71dc85aa6e133a6cd95", - "sha256": "0bcd54pfy6sw95nc344ahpd2m7a7w6x2qf7badda2sil3bk6fcd1" + "commit": "1cc5e965a221a5987ce0e075825d8002f0862f33", + "sha256": "03drdmjkmzsz1cd78k2crlzcvvqqx43dj892n9z52z8ia3c36dvk" }, "stable": { "version": [ @@ -91001,11 +91409,11 @@ "repo": "nickdrozd/reazon", "unstable": { "version": [ - 20180921, - 1437 + 20210815, + 1519 ], - "commit": "020be6467a83957adcbdcb192b61f2c76a94079b", - "sha256": "18la2g0srybr10vm1dajgbxi67j1l0cs08mr696hxb6m558yxdv5" + "commit": "1bfce512612eb679d06356b5c070e6f8743fd0dc", + "sha256": "1059dqsj19k7yb2lw2vy1s6pdhbl0l4vmsfd2lscwsa6kw42kjp0" }, "stable": { "version": [ @@ -91027,8 +91435,8 @@ 20180324, 821 ], - "commit": "9ac0c71c2858b76dc5499f62c7c7fb7f9e8f16bc", - "sha256": "0a0qf118gj2fag3j57zmli47939rn1jayvs2fwa4l280ipfvp2m7" + "commit": "4b8b5aae9099185e07c2b4cac4943c7f66a3f003", + "sha256": "0y2kcs6zgi3dijagyz6lxbv6gi2mih8m943fhjrzkj35wfvjmhsz" }, "stable": { "version": [ @@ -91935,11 +92343,11 @@ "repo": "tkf/emacs-request", "unstable": { "version": [ - 20210410, - 2218 + 20210816, + 200 ], - "commit": "f3a5b4352e9f444ace2a332939abff504b573887", - "sha256": "0jdha6qjc1ngprmi4nqj8d8hs1dsjkpa39rk85z2132yhaca6lga" + "commit": "2b68b3ca543f1dfbebb43a44f20601c3947bd729", + "sha256": "0b8h93jac2rn0zpm50zmjdz0klhhvhyw1apgpngvzfvq4agx457s" }, "stable": { "version": [ @@ -91966,8 +92374,8 @@ "deferred", "request" ], - "commit": "f3a5b4352e9f444ace2a332939abff504b573887", - "sha256": "0jdha6qjc1ngprmi4nqj8d8hs1dsjkpa39rk85z2132yhaca6lga" + "commit": "2b68b3ca543f1dfbebb43a44f20601c3947bd729", + "sha256": "0b8h93jac2rn0zpm50zmjdz0klhhvhyw1apgpngvzfvq4agx457s" }, "stable": { "version": [ @@ -92110,11 +92518,11 @@ "repo": "pashky/restclient.el", "unstable": { "version": [ - 20210511, - 1331 + 20210813, + 841 ], - "commit": "2cc1fd3496f57288de3f97c27a5f018284db2d23", - "sha256": "0zpdkrj2kka85x56qh266vd1rc1kxh4cwv1gbdxcfpkpckn3xg0l" + "commit": "176d9cb6552f04d98c33e29fc673862bdf3bca03", + "sha256": "108znxclz80rgymx1kmw107afay6sr0042yfyy207b5ki36vghl1" } }, { @@ -92132,8 +92540,8 @@ "helm", "restclient" ], - "commit": "2cc1fd3496f57288de3f97c27a5f018284db2d23", - "sha256": "0zpdkrj2kka85x56qh266vd1rc1kxh4cwv1gbdxcfpkpckn3xg0l" + "commit": "176d9cb6552f04d98c33e29fc673862bdf3bca03", + "sha256": "108znxclz80rgymx1kmw107afay6sr0042yfyy207b5ki36vghl1" } }, { @@ -92766,11 +93174,11 @@ "repo": "jgkamat/rmsbolt", "unstable": { "version": [ - 20210624, - 417 + 20210824, + 110 ], - "commit": "ff496660cc52a6dd33d358ef0acc6d4bb70cc340", - "sha256": "05i0101238yy1da6z543nr9x5gpvgdxrrdn3sw5dibcn6z62ml3p" + "commit": "9b1a5abbdf461e6d4bfee50f71e3c85d00da1c0c", + "sha256": "1lmddhaabxq8kzyb54d944xwmdkcb9a6s4gi5wn3dp7sld7yvn4a" } }, { @@ -92781,14 +93189,14 @@ "repo": "dgutov/robe", "unstable": { "version": [ - 20210626, - 137 + 20210818, + 2338 ], "deps": [ "inf-ruby" ], - "commit": "e1304d123d729aa063671d0ca526b01e72f0f5ed", - "sha256": "1ghwjymcmmr99z060l1shm9sqbjxxdgq6b7ayn8s9mldcqm5pa3q" + "commit": "9e3805c5c7fadcba0da31a59985a8daeeb8a7b0d", + "sha256": "1bmp317cacl5hmmr5rm7jimxw4k0ggrz80c0vfygb5fx02s5jy0w" }, "stable": { "version": [ @@ -92919,11 +93327,11 @@ "repo": "DerBeutlin/ros.el", "unstable": { "version": [ - 20200109, - 1940 + 20210730, + 844 ], - "commit": "0babdd3bbc038ee7436db0cc869df35752456268", - "sha256": "1f0bxbm1rgvf68q6qbsf63mzr44541aapk4237rs7pkxk81nnrrl" + "commit": "63d46cefa8552b59556dcb4af0849253dc501ee9", + "sha256": "0imwdapwfj8qn7zqc4842bvxwip7j8gw9bip7mc05l4c9v2v73r0" } }, { @@ -93591,8 +93999,8 @@ "repo": "brotzeit/rustic", "unstable": { "version": [ - 20210719, - 1514 + 20210805, + 1755 ], "deps": [ "dash", @@ -93605,8 +94013,27 @@ "spinner", "xterm-color" ], - "commit": "26c2e09907135d5be9628c710bb0753c256b7242", - "sha256": "1bilqhln8m6qk5r3q8dvhhsql1c38dnf7m55kysja86bf6yb3s59" + "commit": "1941f52d34e7e4752e1e465e5636b21ef7ad42b9", + "sha256": "16vis13axbk9d4pnr7588wx527hsr6kcbjxnppc23wpd54j7sgh2" + } + }, + { + "ename": "rutils", + "commit": "3bbcad6b15e81543e750c754574504a26e5d1c7e", + "sha256": "16rky6zhpfvcd3pwi5hbw8mmnrcvv7snyxskcfj618f27c97zm50", + "fetcher": "github", + "repo": "ShuguangSun/rutils.el", + "unstable": { + "version": [ + 20210805, + 608 + ], + "deps": [ + "ess", + "transient" + ], + "commit": "e216db63a2ccd50fe5c80679fc5b929dd2c114e8", + "sha256": "0ldbrx7xchy4p26ggs0hmazwfw9cbv97mzl4f02whblq3zkx7h5j" } }, { @@ -94076,8 +94503,8 @@ 20200830, 301 ], - "commit": "bb54b9743aca98017746959e2cf0d9c9e0844110", - "sha256": "0yj3ivxbzgv2x96jsagnvn059hh7r65qpmz7gv76l8b6qnfr1i80" + "commit": "4a02387d997b0b4d20b24e9a17a68270692219ad", + "sha256": "1k2382v1srcx7qc4rqxghqd87lx7c6jrls7wxgqq1warvklxfx87" } }, { @@ -95348,6 +95775,24 @@ "sha256": "0sp952abz7dkq8b8kkzzmnwnkq5w15zsx5dr3h8lzxb92lnank9v" } }, + { + "ename": "session-async", + "commit": "37ad0e564b1eda4a4286b2315f71266b36664013", + "sha256": "15v12aq5zj478q3gxqilx5spk4k1shksn1rdb207aq06184dzjvs", + "fetcher": "git", + "url": "https://codeberg.org/FelipeLema/session-async.el.git", + "unstable": { + "version": [ + 20210817, + 2218 + ], + "deps": [ + "jsonrpc" + ], + "commit": "e2ff39bdd60da67214d07900582b1049f74d03fc", + "sha256": "0b05smmgcxn5144wcsxlhi4bpliv9ffk21m02fh3l32mc5h24b30" + } + }, { "ename": "seti-theme", "commit": "088924b78575359996cf30745497b287cfb11f37", @@ -95866,14 +96311,14 @@ "repo": "purcell/emacs-shfmt", "unstable": { "version": [ - 20200421, - 103 + 20210803, + 222 ], "deps": [ "reformatter" ], - "commit": "49c9e11567874bc4c5c4b3578a6b8f6b1948c691", - "sha256": "002y0ci1hh55qhyyp1m6gw5d9ncbcfk9bhk6qg30s3x1g1dhq2bi" + "commit": "8496b0df2209cf6792c5197b924dd55807f0cffd", + "sha256": "1sb9zdig0ypr3c0dmm26cysc6dsij5vxf3zypqpjdh77si5asx24" }, "stable": { "version": [ @@ -95937,11 +96382,11 @@ "repo": "emacs-w3m/emacs-w3m", "unstable": { "version": [ - 20210725, - 2353 + 20210825, + 707 ], - "commit": "f0baf78897c95799a725d6f9092eef4a55a7f518", - "sha256": "1cb5c8fmdg5fzqcj9dsqxb0xah7kk5sl0crm9rq6l13zvvqn714a" + "commit": "d7166799bd93cf90f77cb9e4c59cb691bb3a1b8c", + "sha256": "1ins9lykfycv5nrm4lz66cfm2ny6mc338pblyw6jbxmnx7q300xv" } }, { @@ -96588,14 +97033,14 @@ "repo": "andreas-roehler/simple-paren", "unstable": { "version": [ - 20210729, - 611 + 20210806, + 1022 ], "deps": [ "cl-lib" ], - "commit": "9601e6b15f36d2e3a721043820a650413cbee42b", - "sha256": "1mclkg8frsljzcklfbbbnr72i9i990ag41n2iivbf1p27xbcp5cc" + "commit": "2281065d00ff8f78a03c1a66fc168fdb198f3d89", + "sha256": "19x12bw75sizc8b04i930zv5f5jypvmhw45frb0z79m7rw41pbs4" } }, { @@ -97014,15 +97459,15 @@ "repo": "slime/slime", "unstable": { "version": [ - 20210709, - 2051 + 20210802, + 2231 ], "deps": [ "cl-lib", "macrostep" ], - "commit": "68f5623f13c9a0d3d47ce70cf56928e00483d9d6", - "sha256": "1hybxng81ra3zqj07xp5vpzd5mx15sfvqa4wydg1kxi9ics6m9i6" + "commit": "8aa055b9ad4a8b5f1b24ff29c9c7009e9475ee2c", + "sha256": "126ji049i5s8dikzyccj12vsqy31qy32g4rns7zx0szqqjiwzin6" }, "stable": { "version": [ @@ -97762,15 +98207,15 @@ "repo": "Fuco1/smartparens", "unstable": { "version": [ - 20210529, - 1129 + 20210817, + 1912 ], "deps": [ "cl-lib", "dash" ], - "commit": "911cc896a0f2eb8b5fbdd6fc8331523ad9889a3a", - "sha256": "12g7q86ncawikvxr87p7vda21pbfiwi3kr3rgkm7b1lx3zabwcai" + "commit": "22794b5b3773504610127c5f011629402dfec20c", + "sha256": "14b65bfsh4fglm65cvzgp412na8ykqkcwaqg84hvw6j6lqrvpg6v" }, "stable": { "version": [ @@ -98274,15 +98719,15 @@ "repo": "SpringHan/sniem", "unstable": { "version": [ - 20210708, - 1128 + 20210825, + 1510 ], "deps": [ "dash", "s" ], - "commit": "1b3071974b55c7f2046bd20a052b8fc795d2c940", - "sha256": "16k64k4mzjaiyq264crcpnmccj7aza2zlr9jg6l7ggjssly3fw5c" + "commit": "212e7c1492a9d208ece2a85e64bd352e9cd53c89", + "sha256": "13afcxy5vs38xzx2mi5xpszwiabyc5hiwq1r9vy6jx6pgsb7pkhc" } }, { @@ -98347,11 +98792,11 @@ "repo": "alphapapa/snow.el", "unstable": { "version": [ - 20201231, - 1632 + 20210813, + 1902 ], - "commit": "7ca25adc94148f182ac58c9f5d35f576a8a3131c", - "sha256": "1bpq8611yqvi7w58qylbyd2k7va6cbg12xyj6md7ipnq79wpfy4j" + "commit": "4cd41a703b730a6b59827853f06b98d91405df5a", + "sha256": "0c770mgxav92j562knmzxdjlabvyhvhqjrgnk3pa13c5rs08800h" } }, { @@ -98488,14 +98933,11 @@ "repo": "bbatsov/solarized-emacs", "unstable": { "version": [ - 20210724, - 703 + 20210823, + 609 ], - "deps": [ - "dash" - ], - "commit": "e281635dbaecb1715805a604f3404e7143a19356", - "sha256": "0a1sv5x49adj5s26khandc86y844vqk7241jc5qsli2dvdbxsqdg" + "commit": "48158887c0a605b7cc1ffdbeb937f182b299f4db", + "sha256": "1l9ylidix4l8979d4wzvd9fpsxvjxb6nii09s1g90rsli4av8ps2" }, "stable": { "version": [ @@ -98674,20 +99116,20 @@ "repo": "mssola/soria", "unstable": { "version": [ - 20210426, - 1433 + 20210813, + 912 ], - "commit": "12d3472e6823ff1bdc1591984367e2ed769afcb7", - "sha256": "1vyg73svawi8g1mq6v5y5g9hw0vnks2nhbwdkbn6d53b7bcr0hpx" + "commit": "cc225f51ea724d8767f97249d8c6b3fc5182d331", + "sha256": "0k73skf3wmfzbiv6lfb7dlyb6icsk36q0sfz4zwq2fpr4s3qzp73" }, "stable": { "version": [ 0, 4, - 0 + 1 ], - "commit": "bca7a42db1245543d81373e67d71278a0e3135a2", - "sha256": "1i1hb5xg97frkhpmv608dlqs8wclwf78sq9q3sy9776m5zfdhcxl" + "commit": "0b30ee125571a715d069846b4dafc5de8923cedd", + "sha256": "1vqhnajljx104yw11q6r1ywdxhdwsz5cf314wmq718zc58w68xrg" } }, { @@ -99172,11 +99614,11 @@ "repo": "condy0919/spdx.el", "unstable": { "version": [ - 20210629, - 1739 + 20210810, + 1723 ], - "commit": "b915b063f9de2eff4b9a37c04559a3f2fbfdba84", - "sha256": "1skwcsv8cvjfsgncgd4hybkhjdf6clb65pnpqfh9jxc866aw9n39" + "commit": "1a623ea518c4fa7af37181eb15b8afd6197e3d93", + "sha256": "05cln85y978sv5fg9mqir14wz3ksyxxcxly8kp1a32mmkj5j1bvi" } }, { @@ -99303,11 +99745,11 @@ "repo": "ideasman42/emacs-spell-fu", "unstable": { "version": [ - 20210617, - 426 + 20210814, + 748 ], - "commit": "1abcb5594e1bfe35716d29e64523e4cebdce737c", - "sha256": "0hk3cly374sgiwdf3crjj45afr8nv4jq4bda1vkdb9yqjla0xw8s" + "commit": "10823ae58f88874aff2a6a35f2da75c8503e726e", + "sha256": "0s7d1fgjk6cc27y37qlqfcjrrpqa0fxagr92qxzcn0mp2lb7pnhc" } }, { @@ -99891,11 +100333,11 @@ "repo": "srfi-explorations/emacs-srfi", "unstable": { "version": [ - 20210727, - 1800 + 20210825, + 1823 ], - "commit": "70935753de73724f338700725462dec2cfda90f7", - "sha256": "1z1cvkbxpw28pgi6fzmkk1w6ha339pw09qy1hzppis8haijj0zxs" + "commit": "a6bbe36afa229b88aa5b406b9ef6e6393d9b2d5d", + "sha256": "102fhdhr3xa9jvdl5i715p07x0lgd3wxkhkh3li91p7gncxhrvyd" }, "stable": { "version": [ @@ -100172,11 +100614,11 @@ "repo": "lueck/standoff-mode", "unstable": { "version": [ - 20171115, - 1731 + 20210810, + 1814 ], - "commit": "76cc8122a39a3ef5947d706377b007ef53a354fe", - "sha256": "034h6mrz8nh42k3dsw7lcaackg95xqa9khkdwl6pj0i3z4rhgph8" + "commit": "c78a04c5cf00320c0e1e6646295e20425537bf9e", + "sha256": "01ifxzzrn31d1gaq7yr88dciwylhy5q6lz4kvwkq6smqmvp3x80w" } }, { @@ -100319,8 +100761,8 @@ 20200606, 1308 ], - "commit": "1b2058a91b7ed920952ea99b5140c60b8c7cdd1b", - "sha256": "1nk6mbxl416dpgwmpy52v161n2ag3gi6crrzvczx524879a9zvkf" + "commit": "c9761ab0439ed1430b635c97cbf7fae7d3019a15", + "sha256": "07g40r27s7qv68qzrplsvjdkrli7jibmak1a7fnbhsgngq9q9ily" }, "stable": { "version": [ @@ -100428,6 +100870,24 @@ "sha256": "1jd930nc2g562n4cqq1ppl2d8dq7bxkr3fh9f0gjms7bcm106kz9" } }, + { + "ename": "streamlink", + "commit": "e6674aefa0082fc5754c888538e447037f3618f8", + "sha256": "17r4dkpap72yz62nk9pr3l48qgpm5hidffmdfnbx7bwl07wzk6cb", + "fetcher": "github", + "repo": "benediktbroich/streamlink", + "unstable": { + "version": [ + 20210811, + 1429 + ], + "deps": [ + "s" + ], + "commit": "c265dc61c02ad29ec01dfd8b5cbe3bac60fbf097", + "sha256": "1v6xr9x82m7f43zd228158pr6cwy90lfg8i68w67n6svj2gx19vp" + } + }, { "ename": "strie", "commit": "7fabdb05de9b8ec18a3a566f99688b50443b6b44", @@ -100791,14 +101251,14 @@ "url": "https://git.sr.ht/~amk/subsonic.el", "unstable": { "version": [ - 20210331, - 1845 + 20210808, + 1328 ], "deps": [ "transient" ], - "commit": "9764405dede46791e411cdcc7963808f76201529", - "sha256": "1d4yda1vv1sfjc36b5aaf811jmlcifc8labglmkx1xvjmc7bggsp" + "commit": "42c2e0b5b81c78741c069c8cfdb9e5d494157dc8", + "sha256": "08q6sccdkad4y3vv9h8bxkdn66dc4b2wxzhf7z87i70v7bw1xnwa" } }, { @@ -101092,8 +101552,8 @@ 20210222, 1037 ], - "commit": "25d0018036f44ff9bd685a1c9a76d8ba57c1024d", - "sha256": "070i3k5djw2m1763ihqngpxfmdxq7gs058fvjaaf62dpkqy9vv3a" + "commit": "839f579fa881467149e77d0e096a4a4a6c5d9878", + "sha256": "18hhl6x3xg5lykfq01iw2p03lj248x7rqaygq8nj64hbw46nzn0v" } }, { @@ -101309,16 +101769,16 @@ "repo": "danielmartin/swift-helpful", "unstable": { "version": [ - 20210405, - 1727 + 20210801, + 2036 ], "deps": [ "dash", "lsp-mode", "swift-mode" ], - "commit": "ed36ea3d8cd80159f7f90b144c4503411b74ae3e", - "sha256": "0bcrnslqhgz122mv6br6w848a3x3g4jkz1pkdpb4726xssfzz8zk" + "commit": "75f2fc6bd4530a230946ae7cc9eaf67a36fa3ee4", + "sha256": "0z6prh1xrc8ddq57kas6kvp6n4pia25aps5pg3aq78cwfchzzrk0" }, "stable": { "version": [ @@ -101342,14 +101802,14 @@ "repo": "swift-emacs/swift-mode", "unstable": { "version": [ - 20210613, - 543 + 20210810, + 757 ], "deps": [ "seq" ], - "commit": "1b47a09f1c0e15c543e0551e7f1e643f437e7711", - "sha256": "1f12rmsxzjz0ixrzvi37gj6kqkjp08mym0qvnxdmqiackagxp2rq" + "commit": "800efe2910e0a8517ac720c8bd0e0714fef142eb", + "sha256": "10b475axhqdqighfisnq505m2lk66bpcq1qgry0fd6iq4m8jkia6" }, "stable": { "version": [ @@ -101432,8 +101892,8 @@ "deps": [ "ivy" ], - "commit": "031d4d051da1d8fd20f0f46e8df66c426bf3174c", - "sha256": "16hsnh0l51vayr7a8h4y9h63pw0w5kzsdwhk90bypf2fpjgqdx94" + "commit": "7cdde66c95d5205287e88010bc7a3a978c931db0", + "sha256": "0pvgh4krym43vcyiq4bsjl63gg795jlqh6kaa6llsv1awvywfqww" }, "stable": { "version": [ @@ -101527,11 +101987,11 @@ "repo": "dimitri/switch-window", "unstable": { "version": [ - 20210331, - 911 + 20210808, + 742 ], - "commit": "2801d9b3a9d7bf0b64cd8b2f2e572124ed2ff9ad", - "sha256": "0x9sz14m433fi77slkwir9b0dwaglswckygk8vfkckcraxw14dhh" + "commit": "8d9fe251d8d38b223d643df975876356ddfc1b98", + "sha256": "0qc004gpyzf0hpsjr1xhsnfnn0g2jkpfxzvysa05p9nwglfpsn09" }, "stable": { "version": [ @@ -101763,8 +102223,8 @@ "repo": "countvajhula/symex.el", "unstable": { "version": [ - 20210727, - 1646 + 20210820, + 2202 ], "deps": [ "evil", @@ -101776,8 +102236,8 @@ "seq", "undo-tree" ], - "commit": "e775e97d5bca462571078f727796727088833949", - "sha256": "0gmwkn5az4xrz9d85xd16bg1h8p5mph344800pqcpapqs389cpba" + "commit": "4561214b453e551253e9a273ef57c84c12c7cd8b", + "sha256": "1adzvdp54l1d6awcbfrbqx41kh40lqk5009h1gpj315l3zq3vhpx" }, "stable": { "version": [ @@ -102010,27 +102470,28 @@ "repo": "vapniks/syslog-mode", "unstable": { "version": [ - 20210727, - 1827 + 20210825, + 116 ], "deps": [ "hide-lines", + "hsluv", "ov" ], - "commit": "299042e1ce65bea0728bc56b0540a7ab8ab02010", - "sha256": "1y2p74am7v0n9bdzsix0fi6fzhi3pafxr8c2n36cm9hf5xdmb4q1" + "commit": "7773a8488db88424e5e86cf4268c9bbe0b94085a", + "sha256": "0cph14cc3dzv3dp8aq6ifs3m92rq8jr4b2rpdjgc8pbcjrs9hvyb" }, "stable": { "version": [ - 2, - 3 + 3, + 0 ], "deps": [ "hide-lines", "ov" ], - "commit": "18f441bf57dd70cdd48a71f1f4566ab35facdb35", - "sha256": "1xl6immya0i5xjpls3vqdqj9rr5jxp5srny8l9j4qxf8kp75byqa" + "commit": "014d78269daa99937fb4fa8f5d34e2b3eb368a5f", + "sha256": "03id3zjiq15nyw0by4fari837c8362fscl7y329gn9ikf7z6hxd9" } }, { @@ -102394,11 +102855,11 @@ "repo": "tmalsburg/tango-plus-theme", "unstable": { "version": [ - 20210615, - 1229 + 20210804, + 1943 ], - "commit": "6ad64d82c8bd8c559b9023cd70b1c2d0c18e9060", - "sha256": "0ig8ng5ycdf256phigh3fzalvd0ncvs54f7kfpq0gp43ky9sgvz0" + "commit": "0460aff3638b7c9e290f28be8eb2b90887a74eed", + "sha256": "1vdr5wsq1bw30zpgmgy0sm7kls0qkn6zs800hf95mixh21l4gzlz" } }, { @@ -102451,8 +102912,8 @@ 20210415, 1322 ], - "commit": "1c0028d6c406cf4884e6aa35313e82041b7e857f", - "sha256": "0gv1iychm7xzdf99l1kiyvqfdhl9s8g900jjq7bj2kkd3r3c22ki" + "commit": "daf9920a8ecb230045f4b07834b3a6f45676f1ce", + "sha256": "0lh90x5hqxm3pyqiy4qb10nxs5ga7w4hc7k6xkax41yhi41bgd58" }, "stable": { "version": [ @@ -102639,28 +103100,28 @@ "repo": "zevlg/telega.el", "unstable": { "version": [ - 20210728, - 1000 + 20210825, + 2144 ], "deps": [ "rainbow-identifiers", "visual-fill-column" ], - "commit": "e3ae2dfe048f25f3929b414279f6ceffbed748cf", - "sha256": "1lawl9gn59qkn7bfp6phzsiaw1nkmz3g38skbzrn86nsk9dczkzl" + "commit": "08d652fd85fdb799e5b68caddc64bbbdcb08205b", + "sha256": "1f5vhxw34qbgxc99zz7m3lml18xw59qdrgdfmxa79nxfrqczabcd" }, "stable": { "version": [ 0, 7, - 25 + 30 ], "deps": [ "rainbow-identifiers", "visual-fill-column" ], - "commit": "f979ac79070c39a4c483c08df96080763287ce4e", - "sha256": "1fdvghwpmja94d65p02j7wa09lwjs3ah1kfb1v17b6l9qd5g80nc" + "commit": "26fee82fac70d55ade55381b475e865d99dde496", + "sha256": "1g29v5fgkqx43wsvh1npx0g3hj00n37lxgvxjvy85fs4h9226gl9" } }, { @@ -102778,11 +103239,11 @@ "repo": "clarete/templatel", "unstable": { "version": [ - 20210425, - 2215 + 20210802, + 249 ], - "commit": "3ee3761d9dd30b1c6af74dc393d43b9a91a75951", - "sha256": "1c58m2x4frwqxbi8n884c4l69pfwzdxsrig8p35y7mbywlwf1s2l" + "commit": "23c9bce8c1e3866e7cdbe9a69777648e13707357", + "sha256": "0rn8d0zn3dlqfvr5m5v687bw96mnv02v6ngq5jvljgykyawh3h58" }, "stable": { "version": [ @@ -103730,18 +104191,18 @@ 20200212, 1903 ], - "commit": "00e9095d6b2eeba01ba1b76b4816891d21ccf7e4", - "sha256": "0k9d7zb6l8v7pihgk5spy73jkdab9c7cwc4zwhbd9v65rd6756zj" + "commit": "876f7c33782aaac147e88d9063fd286f7a8a46e1", + "sha256": "1b2kfqkr9ss9lb5133zpp8sz9w7c77mydv1lvb56fi03lms94a5r" }, "stable": { "version": [ 2021, - 7, - 22, + 8, + 23, 0 ], - "commit": "3a1532f0ee53c6746f50dbad17c248eeced05d21", - "sha256": "1nzx3bw472m3ajmhlwp217jyrxm31j9av4h6fw884icpnn3392s7" + "commit": "a70658fff6a7cc01e323dd7a4a5b7305906796cc", + "sha256": "04r195apvbp4b0nk4j45pxhyl5dl6hr7x35zji548v0q8dgiv5lm" } }, { @@ -103797,8 +104258,8 @@ "deps": [ "haskell-mode" ], - "commit": "531db05f9b15feadbc1a0df194a4f9dcd0d10c0a", - "sha256": "16m17q8kc0fxq1nc47ggxjjna04k27hch93q8pqilp00s7695597" + "commit": "7142775c2039cae4cde9bdd6f68b3e0cbae2de9d", + "sha256": "02913lhc08kwx4m0x6hm40bg1yym449y160bndmpfv4n19d92z44" }, "stable": { "version": [ @@ -103831,8 +104292,8 @@ "s", "typescript-mode" ], - "commit": "c593153373d05b56ae56b0ca3a6752ee86708aaa", - "sha256": "0mrzk9ngmqg0p9hgirlvs08wxcc9vm3hibpy8khgclb8gzxjrs57" + "commit": "1e376e3e9798206ea3e42a5c037a7c00aa64ee00", + "sha256": "1g5q70j55qbvsl5ix9hsbmf5xllph1ch27miln7j3y5mi56k0lq9" }, "stable": { "version": [ @@ -104046,11 +104507,19 @@ "repo": "aimebertrand/timu-spacegrey-theme", "unstable": { "version": [ - 20210710, - 1950 + 20210819, + 2241 ], - "commit": "e0629d59adc92112f51b5f9300e06e714349488d", - "sha256": "104zffdf0jlfqh6rlzl7a7ji5gs11pacy63ab4rjs2kx08p3z0y9" + "commit": "facb4da1a2ee333a3c66f56009c8dec8e9652dab", + "sha256": "0wpam6kjg53j00g4k4ar0zhf0v0nbpp00klk0cbpv06yr4lvswpc" + }, + "stable": { + "version": [ + 1, + 5 + ], + "commit": "f3243f0d27988eb4c29215dbe07d35f37031114f", + "sha256": "0wpam6kjg53j00g4k4ar0zhf0v0nbpp00klk0cbpv06yr4lvswpc" } }, { @@ -104795,11 +105264,11 @@ "repo": "magit/transient", "unstable": { "version": [ - 20210723, - 1601 + 20210819, + 2118 ], - "commit": "efdf91980a6f8bcb151debb877302ead8751ab65", - "sha256": "17gyd76ih8b9f8jw0c47x337lfdynz98xq1kykxs8riwrih1dhip" + "commit": "65f4eac82c564204d20df0a606dc2fcaa72cc41e", + "sha256": "1avxr5xdx8awzj63r97a505xd32d49qwjszbjzd0yfs3i5y243li" }, "stable": { "version": [ @@ -105036,20 +105505,20 @@ }, { "ename": "tree-sitter", - "commit": "18f57da9ff7c07ce05c9dbd23eba87f2f34e17f3", - "sha256": "1jdnsmy1gwz2f6kybmh8lcf9lg7qw58694drz0dmw34w3q7jjwys", + "commit": "315cccbfb1a9aadb546a5b62de5c3b681108ba6c", + "sha256": "1y7y8qrzc4nr31rh9gi8y3qpgb33jfl8aj8lmbagw5b7pc3v5f11", "fetcher": "github", - "repo": "ubolonton/emacs-tree-sitter", + "repo": "emacs-tree-sitter/elisp-tree-sitter", "unstable": { "version": [ - 20210328, - 434 + 20210811, + 1609 ], "deps": [ "tsc" ], - "commit": "7f5d0938002092ec08830a73f64961021303e1e9", - "sha256": "17dwr2lmqi0ssg04a0a99igck60hmrk2a566bprwlwqga3cbkrzm" + "commit": "a0f259c024fa15587d225e1d5440d71109d7e3f3", + "sha256": "1x2p7x7f71kxvayvlg418vr6pa36044fla58saknb9p651hy9rjh" }, "stable": { "version": [ @@ -105097,32 +105566,32 @@ }, { "ename": "tree-sitter-langs", - "commit": "4029e21f74841db0c82f4a343a3b51b09cae2f25", - "sha256": "0jygxdlh94blfn5gxn949ic2v2x49cvl0rfzmvig3igyfwmm33sp", + "commit": "4163e6e43626c5149be06b95ec2e6de55acb85cc", + "sha256": "1bkjd5h817dw5zkbfb1dn4yg6cy29m9g0d650ap5ldi2y605zz5v", "fetcher": "github", - "repo": "ubolonton/tree-sitter-langs", + "repo": "emacs-tree-sitter/tree-sitter-langs", "unstable": { "version": [ - 20210724, - 1056 + 20210825, + 1205 ], "deps": [ "tree-sitter" ], - "commit": "a516144aa9b109582e89702e5d76217e8fae907b", - "sha256": "1p2izm6n3r31jjxq8sazkqxnlhvg3kalf10323q246pdq6frk0qz" + "commit": "81adcdc06a9700ecf9659171da275b1c9dcfdfb6", + "sha256": "0k067rkzdnxs5h5yf5l7pppbnwc0x6c41d97kygi1z03124s77s6" }, "stable": { "version": [ 0, 10, - 0 + 4 ], "deps": [ "tree-sitter" ], - "commit": "5d362ce98dcf656d7a55fcad6ae21c0a2caca861", - "sha256": "11nfyyzyz9x4w4l4hpz0y27awknlwx3kn9dwvkzdn174jk2kxp9a" + "commit": "95c8d2869926014351ffb932ad6749f5dfaff033", + "sha256": "19rjnqsx7xi4g5dj32nb4x7xlxmbhagrm652khfn1chlwd7z94la" } }, { @@ -105169,8 +105638,8 @@ "repo": "Alexander-Miller/treemacs", "unstable": { "version": [ - 20210726, - 1955 + 20210823, + 1524 ], "deps": [ "ace-window", @@ -105182,8 +105651,8 @@ "pfuture", "s" ], - "commit": "ac920b2265ca24c0536dd4502f792f06638a6fdc", - "sha256": "1md7way1yygljfpcf50wlm3mm4r6d33jigl02fyhbqi15dk48d10" + "commit": "f30a2151aec195026bd55affc05259b629fd9006", + "sha256": "0qndkwfnqjdkddhrs0gzn9rg2a7fwwrrnya0iz2hjvxpmcdxr37c" }, "stable": { "version": [ @@ -105219,8 +105688,8 @@ "all-the-icons", "treemacs" ], - "commit": "ac920b2265ca24c0536dd4502f792f06638a6fdc", - "sha256": "1md7way1yygljfpcf50wlm3mm4r6d33jigl02fyhbqi15dk48d10" + "commit": "f30a2151aec195026bd55affc05259b629fd9006", + "sha256": "0qndkwfnqjdkddhrs0gzn9rg2a7fwwrrnya0iz2hjvxpmcdxr37c" } }, { @@ -105231,15 +105700,15 @@ "repo": "Alexander-Miller/treemacs", "unstable": { "version": [ - 20210419, - 1753 + 20210821, + 1041 ], "deps": [ "evil", "treemacs" ], - "commit": "ac920b2265ca24c0536dd4502f792f06638a6fdc", - "sha256": "1md7way1yygljfpcf50wlm3mm4r6d33jigl02fyhbqi15dk48d10" + "commit": "f30a2151aec195026bd55affc05259b629fd9006", + "sha256": "0qndkwfnqjdkddhrs0gzn9rg2a7fwwrrnya0iz2hjvxpmcdxr37c" }, "stable": { "version": [ @@ -105268,8 +105737,8 @@ "deps": [ "treemacs" ], - "commit": "ac920b2265ca24c0536dd4502f792f06638a6fdc", - "sha256": "1md7way1yygljfpcf50wlm3mm4r6d33jigl02fyhbqi15dk48d10" + "commit": "f30a2151aec195026bd55affc05259b629fd9006", + "sha256": "0qndkwfnqjdkddhrs0gzn9rg2a7fwwrrnya0iz2hjvxpmcdxr37c" }, "stable": { "version": [ @@ -105300,8 +105769,8 @@ "pfuture", "treemacs" ], - "commit": "ac920b2265ca24c0536dd4502f792f06638a6fdc", - "sha256": "1md7way1yygljfpcf50wlm3mm4r6d33jigl02fyhbqi15dk48d10" + "commit": "f30a2151aec195026bd55affc05259b629fd9006", + "sha256": "0qndkwfnqjdkddhrs0gzn9rg2a7fwwrrnya0iz2hjvxpmcdxr37c" }, "stable": { "version": [ @@ -105333,8 +105802,8 @@ "persp-mode", "treemacs" ], - "commit": "ac920b2265ca24c0536dd4502f792f06638a6fdc", - "sha256": "1md7way1yygljfpcf50wlm3mm4r6d33jigl02fyhbqi15dk48d10" + "commit": "f30a2151aec195026bd55affc05259b629fd9006", + "sha256": "0qndkwfnqjdkddhrs0gzn9rg2a7fwwrrnya0iz2hjvxpmcdxr37c" }, "stable": { "version": [ @@ -105366,8 +105835,8 @@ "perspective", "treemacs" ], - "commit": "ac920b2265ca24c0536dd4502f792f06638a6fdc", - "sha256": "1md7way1yygljfpcf50wlm3mm4r6d33jigl02fyhbqi15dk48d10" + "commit": "f30a2151aec195026bd55affc05259b629fd9006", + "sha256": "0qndkwfnqjdkddhrs0gzn9rg2a7fwwrrnya0iz2hjvxpmcdxr37c" } }, { @@ -105385,8 +105854,8 @@ "projectile", "treemacs" ], - "commit": "ac920b2265ca24c0536dd4502f792f06638a6fdc", - "sha256": "1md7way1yygljfpcf50wlm3mm4r6d33jigl02fyhbqi15dk48d10" + "commit": "f30a2151aec195026bd55affc05259b629fd9006", + "sha256": "0qndkwfnqjdkddhrs0gzn9rg2a7fwwrrnya0iz2hjvxpmcdxr37c" }, "stable": { "version": [ @@ -105594,27 +106063,28 @@ "repo": "alphapapa/ts.el", "unstable": { "version": [ - 20210705, - 341 + 20210813, + 1617 ], "deps": [ "dash", "s" ], - "commit": "b6814e7e688781a586a775ef3504b9252af65b93", - "sha256": "1bf39qx8k7nn1dj1fp6j47zr1lp28ccrj6ciz7z3dk040rlxnv11" + "commit": "3fee71ceefac71ba55eb34829d7e94bb3df37cee", + "sha256": "1041zwlslj70rfjmpcxbib4h05rclhykr7i7pckvz7smsh4w3p2i" }, "stable": { "version": [ 0, + 2, 2 ], "deps": [ "dash", "s" ], - "commit": "540f6a5adab5d881cc5f50835c0a3fe70e74b992", - "sha256": "0hmzc1ppnkkr0lfq5fhzqr6icv6iqz824a6bnns7zr466hhqp3qb" + "commit": "0bf2ac9680ae077d6f110ea0629728fbc654e945", + "sha256": "0l35gz1hpada2kzascbyqgawa5d3sdyg67gzvak84p9zx62jppn8" } }, { @@ -105634,17 +106104,17 @@ }, { "ename": "tsc", - "commit": "18f57da9ff7c07ce05c9dbd23eba87f2f34e17f3", - "sha256": "1ml2cha9xwdsx35n52aymdvp65r09hss3rvy5lqbq9aw57p9infy", + "commit": "c44eceafdfe3dd4a98010a8dcac2e9e3ddaeae4c", + "sha256": "1gwavabszakqvvyw8yrr17dng7k9w27g8dsaf5zwihp8j46wim27", "fetcher": "github", - "repo": "ubolonton/emacs-tree-sitter", + "repo": "emacs-tree-sitter/elisp-tree-sitter", "unstable": { "version": [ - 20210320, - 1052 + 20210825, + 1402 ], - "commit": "7f5d0938002092ec08830a73f64961021303e1e9", - "sha256": "17dwr2lmqi0ssg04a0a99igck60hmrk2a566bprwlwqga3cbkrzm" + "commit": "a0f259c024fa15587d225e1d5440d71109d7e3f3", + "sha256": "1x2p7x7f71kxvayvlg418vr6pa36044fla58saknb9p651hy9rjh" }, "stable": { "version": [ @@ -105723,14 +106193,14 @@ "repo": "ocaml/tuareg", "unstable": { "version": [ - 20210709, - 321 + 20210825, + 1946 ], "deps": [ "caml" ], - "commit": "b59c422759506402f990b089dbaa91c0578e2c2e", - "sha256": "1maqyhy82ayfiv95ng4bpgxrvjkkz331pw4ld1x99jpwqljpwqzc" + "commit": "d2b38f0249e3db467e9708985571f06ae191edbb", + "sha256": "1gaind3zfj1adl6dhk5yrx2fajqhxb8ch38vk66077s81qqzzw7k" }, "stable": { "version": [ @@ -105745,6 +106215,24 @@ "sha256": "06zxnn85fk5087iq0zxc5l5n9fz8r0367wylmynbfhc9711vccy6" } }, + { + "ename": "tubestatus", + "commit": "ac2ece211c8aa3ff514caf99551d1d4a192d984c", + "sha256": "1v529wg38m58hqyy3wxq5pkqk9a5yaxkj20s735v5i89wnvndsxz", + "fetcher": "github", + "repo": "smallwat3r/tubestatus.el", + "unstable": { + "version": [ + 20210801, + 1522 + ], + "deps": [ + "request" + ], + "commit": "eeda4c2647cfdb910de776398037183f48e3fa72", + "sha256": "1fn405rmwcy8y5sa8lh5grq87n5zxbln2b9agxyilfx4jm6rcnpl" + } + }, { "ename": "tumble", "commit": "579a441d153c4c7d9f8172be94983a632d6fab8f", @@ -106029,8 +106517,8 @@ "f", "mmt" ], - "commit": "fa125bf43757737fbcf91958b76c38b440d54b4c", - "sha256": "1l0qb8gjgsmjjdvxlma7g6fn2z6rj246p2kczrikq8ajg1xh61sr" + "commit": "d08ed004bfc13f8d0bdfc13fc54e8f7402876903", + "sha256": "02fnq52a1i0dgdyhxgqjf89zif23038n8cm9idv9c515835c10m2" }, "stable": { "version": [ @@ -106408,11 +106896,11 @@ "repo": "ideasman42/emacs-undo-fu", "unstable": { "version": [ - 20210418, - 920 + 20210813, + 249 ], - "commit": "e0ad06b5ef2ac2733dad2ad48e3957b5c36edfa5", - "sha256": "0xix4ghri62xdqlh48pydhih1zsnfsy7ncrk6w2wrnz4fa033pia" + "commit": "34b27c01da4c3eb8aa595f3613b7e2e1ed4e54be", + "sha256": "1inh3c88l2dbhcpwivvn88zyq37fba41ccpmyjbkcbyjay52927n" } }, { @@ -106934,6 +107422,25 @@ "sha256": "1af8c7q3vxj23l2ah5waj9hn5pfp66834b4akm76jc5wqf0sr9j1" } }, + { + "ename": "untappd", + "commit": "0d7b1541a317cc253a55696d752ea57453475b8f", + "sha256": "10lqrsrg9kx6134mmc6r4vk1bvggdnjg5mi1xm2b057g11qs8afm", + "fetcher": "github", + "repo": "smallwat3r/untappd.el", + "unstable": { + "version": [ + 20210815, + 1544 + ], + "deps": [ + "emojify", + "request" + ], + "commit": "493d1776d6456b00bf017e71fac9b0721d8cc912", + "sha256": "13p0vr9fnkilw6192gsmz6hi5rx3jqh3dsmqx9siywghj9hfn056" + } + }, { "ename": "untitled-new-buffer", "commit": "a3c6e6adb1a63534275f9d3d3d0fe0f5e85c549b", @@ -107843,16 +108350,16 @@ "repo": "DamienCassou/vdirel", "unstable": { "version": [ - 20190430, - 624 + 20210813, + 754 ], "deps": [ "helm", "org-vcard", "seq" ], - "commit": "a9ef32a70a1f14416e3dc5fee478ce138cc011d3", - "sha256": "1r60gp3h7cj34wc5kjvpxzidb01gyqsd04ykmhk7asv91m598vs3" + "commit": "dccc51bf68ad3f0066a462b354ec395229bd6a7f", + "sha256": "0mlfmigqsqmvn3rzyxnpq5zy6k0xf4vd2ww2qrr7kd2dqyv55hhw" }, "stable": { "version": [ @@ -108004,11 +108511,11 @@ "repo": "federicotdn/verb", "unstable": { "version": [ - 20210525, - 2135 + 20210809, + 2140 ], - "commit": "9e3e8a1edd82f7d056d3744f9e40cf8a5bac4ecc", - "sha256": "1kjzglpyrf1vbsb5gjcwmi5b38fvn5rx95yc8fwbizgisx70abkc" + "commit": "6f5b454782d5c2ce9d86616c3d015935d3d5dd6b", + "sha256": "172520apwczyp6c0apga1bz2vbfzy60jdyiq09sjk34533fymcg4" }, "stable": { "version": [ @@ -108617,17 +109124,17 @@ }, { "ename": "vline", - "commit": "515c6cd2efaa2c330122aabd7b23f29d5e4ec27d", - "sha256": "12kwxblqd8zdqhlcacvpd6z732l3ig92vklzbsv90n31k27yzzyn", + "commit": "25f776e108d31f8f2e4626cf931c1049e7187a0b", + "sha256": "1z14rxi2fgbcdag4fjv9915r210jlskiwivrjq1d4d18zsadaczj", "fetcher": "github", - "repo": "emacsorphanage/vline", + "repo": "buzztaiki/vline", "unstable": { "version": [ - 20120108, - 1245 + 20210805, + 1528 ], - "commit": "8cc7947387f8da2888da25538668afa33a1d8662", - "sha256": "0iqnin1z8fxhh59199zakfd6jw7nj7425y642vrxxn043a3s08vw" + "commit": "f5d7b5743dceca75b81c8c95287cd5b0341debf9", + "sha256": "06qqpjaxsacslxb3f2bm790lwygbq6387n9ccn4v9vz9xlyn9dmi" }, "stable": { "version": [ @@ -108829,11 +109336,11 @@ "repo": "akermu/emacs-libvterm", "unstable": { "version": [ - 20210618, - 1922 + 20210824, + 1453 ], - "commit": "d9dfa624679afdd5db6ad25429ef86d3dd91401e", - "sha256": "07nk6bw70mi9r3kgs5b11pfwfvfa73xwdl3xgclv8l7k87yysd69" + "commit": "9e5a208d8871293a23a2734591fac97a584a41c2", + "sha256": "13r9zxivgml610d0hk9cagpyv982596knad6jwq48cpncckwxrvl" } }, { @@ -108972,16 +109479,16 @@ "repo": "d12frosted/vulpea", "unstable": { "version": [ - 20210718, - 944 + 20210821, + 1625 ], "deps": [ "org", "org-roam", "s" ], - "commit": "ebbfc00978603c40222e260f06dbec9d781e3306", - "sha256": "1gx8h50r7mhm4p675an5a6hrm37zdcaw1lw2kpn7apr6kyi3c6q7" + "commit": "bc0abbc81917edf130476db7007184c015768d05", + "sha256": "0wjpvspyg6h0692gy9vfz42wcwsr599y53b8mfkjmnbdkbdwy1i0" }, "stable": { "version": [ @@ -109065,11 +109572,11 @@ "repo": "emacs-w3m/emacs-w3m", "unstable": { "version": [ - 20210728, - 2251 + 20210817, + 327 ], - "commit": "f0baf78897c95799a725d6f9092eef4a55a7f518", - "sha256": "1cb5c8fmdg5fzqcj9dsqxb0xah7kk5sl0crm9rq6l13zvvqn714a" + "commit": "d7166799bd93cf90f77cb9e4c59cb691bb3a1b8c", + "sha256": "1ins9lykfycv5nrm4lz66cfm2ny6mc338pblyw6jbxmnx7q300xv" } }, { @@ -109142,11 +109649,11 @@ "repo": "wakatime/wakatime-mode", "unstable": { "version": [ - 20200730, - 240 + 20210818, + 1556 ], - "commit": "5e6deddda7a70f4b79832e9e8b6636418812e162", - "sha256": "195h5dnanicxksag72kp19nvsxsbqb34pr3pk6shki6yca2ks7yg" + "commit": "8dfe67c1581a0f3688c572dfdb5f8f71d3f874a0", + "sha256": "1rpl2hj1413kcxvxl27jycjl40js8cybf2qrhvjfwfhxncpwacxv" } }, { @@ -109713,14 +110220,14 @@ "repo": "emacs-love/weblorg", "unstable": { "version": [ - 20210526, - 129 + 20210822, + 1937 ], "deps": [ "templatel" ], - "commit": "ffea6a93f5d35fed8532f1187463a27eb46bff0a", - "sha256": "185crf3dgfqjq58s2bvdmvff5vmy73v4m4l2d17iwjyw3ifji5a8" + "commit": "cc095820669c7c2e77b06a86a887ecec70ae4853", + "sha256": "0ma5shksdha84yf18ay7a6ss4aacjh94827a5wmyv9bc5za5yvq1" }, "stable": { "version": [ @@ -109743,15 +110250,15 @@ "repo": "etu/webpaste.el", "unstable": { "version": [ - 20210306, - 1215 + 20210813, + 1901 ], "deps": [ "cl-lib", "request" ], - "commit": "87ea8b15f417037bb1a46ac849b2f60f08c0bfeb", - "sha256": "1ixvkxdf8sz2xxdjb28pc9bdnz321m736b1riffhfh4w755z7vzp" + "commit": "bbdc5e5b689a787c6b4ae7690751fe9c10d6796e", + "sha256": "1pl02jvqnh6710maxxnbwy5cfdrhav61x9b4da76wdxhv9rhzjjr" }, "stable": { "version": [ @@ -109781,8 +110288,8 @@ "deps": [ "cl-lib" ], - "commit": "34e11124fdd9d73e431499ba8a6b6a8023519664", - "sha256": "066zql1zknnc1dlj9jj4dx7w8y8z2q6i2gnagy3jwwxc8j5pp0c2" + "commit": "fda4455333309545c0787a79d73c19ddbeb57980", + "sha256": "1ga4m9xgiczb6sv7dhmy4841rd9wxsirrvi8va34srpzlq51iq65" }, "stable": { "version": [ @@ -109899,11 +110406,11 @@ "repo": "jstaursky/weyland-yutani-theme", "unstable": { "version": [ - 20210717, - 1858 + 20210802, + 2251 ], - "commit": "246410e1c03f7d8d8e76102f7c5e3cda83acb36b", - "sha256": "184n7k0i2m9syy7mkjxdzjm36iyfx4azchwz0aania4pqm8dz7jv" + "commit": "e89a63a62e071180c9cdd9067679fadc3f7bf796", + "sha256": "0gxlz9b7fvbjkqxsyb4l75g7jsxyms0i1vpnb6y499hl115akcaz" } }, { @@ -110073,11 +110580,11 @@ "repo": "justbur/emacs-which-key", "unstable": { "version": [ - 20210728, - 150 + 20210824, + 11 ], - "commit": "cc84b2d0da629ecb62a92e3fd23cbee4ea20ce56", - "sha256": "0h4f1pdkvp92mqp6vy8vk1xbyjfhgccm4fw00kim08mzf0z8zjyy" + "commit": "4790a14683a2f3e4f72ade197c78e4c0af1cdd4b", + "sha256": "1svz2048qabhy8z9m4p9q5lmdjr5i7vqnaw86x8gmn7vk052h5md" }, "stable": { "version": [ @@ -111146,8 +111653,8 @@ "repo": "abo-abo/worf", "unstable": { "version": [ - 20210702, - 1200 + 20210809, + 1409 ], "deps": [ "ace-link", @@ -111155,8 +111662,8 @@ "swiper", "zoutline" ], - "commit": "28d381e2603a79340a94a410acbbb8a6b3e237d8", - "sha256": "15567bns5kag47d58xapr4z0gfj5py3a8lwfpjlhmzccmarjr7x8" + "commit": "e31759db6aae8a951c0843a4c855bccb626348c4", + "sha256": "1aziil5gmiyk0qb89ydc7h72zdyr2n71z3ybrqji9ypx3vrrdwdx" }, "stable": { "version": [ @@ -111575,11 +112082,11 @@ "repo": "xahlee/xah-css-mode", "unstable": { "version": [ - 20210721, - 2312 + 20210824, + 120 ], - "commit": "372f5bab99c06a3dbdec220ff5558046e1766476", - "sha256": "0gxd1sk8k8z9d0rrjpgdnh7by8yvwbh2awj4gm81c11k2ylbjcgl" + "commit": "20737b65529ca185db663e709cca412e8d03cb1e", + "sha256": "0621vah5xm5zz6mhlgjlbqiccpbq4nssckm3wyqmw30mk2zr29mb" } }, { @@ -111590,11 +112097,11 @@ "repo": "xahlee/xah-elisp-mode", "unstable": { "version": [ - 20210627, - 508 + 20210824, + 730 ], - "commit": "86ddb3ce73bb2a844a126e42386571ca8e884260", - "sha256": "1ks43xdfv287n3sy8n25widkwwx388pm3b8p4r2ld6qz200wqjdq" + "commit": "4bd7858dadff5c5320f169ebabde379e29bb7559", + "sha256": "0ygqzyc398asczryyr4qz5sljzz0a4l87l1vys32vv49g4z1szih" } }, { @@ -111605,11 +112112,11 @@ "repo": "xahlee/xah-find", "unstable": { "version": [ - 20210624, - 327 + 20210815, + 201 ], - "commit": "16b8d62ddb1d5548fcd78a0371481434390ebd54", - "sha256": "10scxxxg84b38rjlmk0r486r7b1nvla57yq6v1h1ymlbp0addvby" + "commit": "88e390e1f7ccee30cd4d5ac112acdf9b4c72780d", + "sha256": "1rhivz291580s0wn0syqhhaqdv7p3df0a7vk8zmx6485nm1hy4mh" } }, { @@ -111620,11 +112127,11 @@ "repo": "xahlee/xah-fly-keys", "unstable": { "version": [ - 20210721, - 1622 + 20210823, + 302 ], - "commit": "afacaeebc3225de13acf19378d7af832d6150871", - "sha256": "08q495fhvcm8n78smsvcz2svzjqjihmzrvp2allysvyy25ni4d5b" + "commit": "c5a510db6aa15de78c809490571a5b2e9d765202", + "sha256": "05xzhrbn3y0wkan6cpk290cvb5gn4gdjkh64s0q466hbybm4lnj5" } }, { @@ -111635,11 +112142,11 @@ "repo": "xahlee/xah-get-thing-or-selection", "unstable": { "version": [ - 20210724, - 159 + 20210813, + 834 ], - "commit": "4f9041e7231108bc86ce722c623884146973343b", - "sha256": "1my96vqbwnnqfmh3r93ch6yqka6kqfq3qis9s3dqrmb91zvcjdl0" + "commit": "ba818dc7fd90b49b780709be5266733ede86a556", + "sha256": "15bjib9n7qakdc70x4xdjaw1q1rm9yz8k55l24mfm848fz62bq30" } }, { @@ -111650,11 +112157,11 @@ "repo": "xahlee/lookup-word-on-internet", "unstable": { "version": [ - 20210708, - 2203 + 20210801, + 102 ], - "commit": "53044a43db3c803fb3e32003c3106403ecfb8e4b", - "sha256": "09x8lrx4sdnx2sr0nkkn19hi7x6hi3gs0ad31xmjx1qgd7bw7as9" + "commit": "d69eb2b66eff70ef311967bf774195bf3331cfff", + "sha256": "12ssjraw8ymphkiyvzpnmh90k9m2sskvklkjcl2ni7qmjc5774v7" } }, { @@ -111665,11 +112172,11 @@ "repo": "xahlee/xah-math-input", "unstable": { "version": [ - 20210419, - 1833 + 20210815, + 211 ], - "commit": "6ccd3ca21aa71a2c1f831fabbdfc9e32c02e180d", - "sha256": "1bibdx0sawgsdzdiivy4x7rf4s5hnz2ypllwz9sk2fdmjyv8d08c" + "commit": "1685bb8652c28a32c6d55fe61bbf4b5cb3f3dcca", + "sha256": "11akmsmynrbzadyw502czrvaw0mly06mzlj4zg5adgvy52mpb0ip" } }, { @@ -111695,11 +112202,11 @@ "repo": "xahlee/xah-replace-pairs", "unstable": { "version": [ - 20210109, - 1741 + 20210815, + 207 ], - "commit": "a051568c21b0bd7907dffebdbe04d0110c038be0", - "sha256": "0z3cvajj5cf23h8lxlj10wm8rxh7vjpnsk8svryx5djd26ffpc11" + "commit": "b5e4f9ebc9e17916e736af9935bf4e17032edde9", + "sha256": "1dy3y27xyprmxymnm43d7vsmsfhdrr1nbbdpvfflqxs9q6hll2xn" } }, { @@ -111831,6 +112338,24 @@ "sha256": "09xiabicada3ziyinlc9fczcdy2nr01fn3fqlq1vpjzb5882k63l" } }, + { + "ename": "xhair", + "commit": "5a15eb95181ddbb8d37bb23a0c5cbcba8a0a3f03", + "sha256": "07sx1yqygnmi2bj917164m3zkgvhli7bb1cccc6n72mw7dhr9wxn", + "fetcher": "github", + "repo": "Boruch-Baum/emacs-xhair", + "unstable": { + "version": [ + 20210801, + 222 + ], + "deps": [ + "vline" + ], + "commit": "c7bd7c501c3545aa99dadac386c882fe7c5edd9c", + "sha256": "03m15lbspk73x59wvb77wgvnkrmrlq4w6kmnrr2i69jgafqh0421" + } + }, { "ename": "xkcd", "commit": "855ea20024b606314f8590129259747cac0bcc97", @@ -112420,20 +112945,20 @@ "repo": "zkry/yaml.el", "unstable": { "version": [ - 20210625, - 528 + 20210730, + 143 ], - "commit": "69c699a15af342199d0dbbbe7676a85487781ae7", - "sha256": "1j1yqpnpn5k17jnrax56and4yss1bimxck3zigbgy5fpng89l8sb" + "commit": "84b88c9ed178af16da18b230c1f61c57cefedf28", + "sha256": "13fjxrr7iyfagbm21p5is5jw1zv56ns2mnac145v8lqli6mrr5gx" }, "stable": { "version": [ 0, 3, - 3 + 4 ], - "commit": "9382bf5a3b1cad1c404bfd13fab8cf6688fe8442", - "sha256": "0xm6c4lk62ifwpc03wmn6602r1izfbk9kpyv3wg3p8ksxllvd0ns" + "commit": "84b88c9ed178af16da18b230c1f61c57cefedf28", + "sha256": "13fjxrr7iyfagbm21p5is5jw1zv56ns2mnac145v8lqli6mrr5gx" } }, { @@ -112474,11 +112999,11 @@ "repo": "yoshiki/yaml-mode", "unstable": { "version": [ - 20210508, - 1641 + 20210808, + 1122 ], - "commit": "3a57058468211f3cb18e71aecc630dcacb87636b", - "sha256": "1p09vzl6miafjhl9aw67day304wc27g72b0vcbr3barfgczypzsa" + "commit": "63b637f846411806ae47e63adc06fe9427be1131", + "sha256": "1z759sg45ws08bj1c97xvxxbvs5a0fq8lgxrh5j5n7yv4jz4vr1k" }, "stable": { "version": [ @@ -112555,11 +113080,11 @@ "repo": "Kungsgeten/yankpad", "unstable": { "version": [ - 20210625, - 1951 + 20210811, + 1934 ], - "commit": "6f5c7e5171030663ebda4f1f872c30d0e165b6b7", - "sha256": "08f5qn1dsikv9dkdvdrb8mmjb3himlnh9bcany2w4pj0apgcwn4d" + "commit": "6562d021cfc76b88a7b39b49adc44fcad835bd3f", + "sha256": "1xh36s2vy521hni9993ajnqv3apinqsiq09yfhfkz4skw22p891g" }, "stable": { "version": [ @@ -112750,14 +113275,14 @@ "repo": "AndreaCrotti/yasnippet-snippets", "unstable": { "version": [ - 20210408, - 1234 + 20210808, + 1851 ], "deps": [ "yasnippet" ], - "commit": "be823d7e1a1a46454d60a9f3dabb16b68b5dd853", - "sha256": "0ak0drxlg3m2v4ya5chpgl82rcl7ic2nmnybhpw1qk51mcmv643y" + "commit": "8bf33e9e54de0dca1728221b0dda6789d99b7930", + "sha256": "1gz4q8knyss9bsz5s5vywi4qvazgwg8ryh7byxkrmbrxibvc9d18" }, "stable": { "version": [ @@ -113265,11 +113790,11 @@ "repo": "bbatsov/zenburn-emacs", "unstable": { "version": [ - 20201121, - 1050 + 20210823, + 504 ], - "commit": "ea9b8f3aedc6640cb0d15d77f7bb5d98830abe97", - "sha256": "171kqnjqhj69jl6idnbrnk2gpjv127h4n3y9cplnqpp7wfigzdzi" + "commit": "13266182dc51534394bd427840bc78e2a78d01bd", + "sha256": "1174b12mqwkl5p16m0rrnswc18blj35jr9pi2l0annvarny3shkj" }, "stable": { "version": [ @@ -113449,15 +113974,15 @@ "repo": "EFLS/zetteldeft", "unstable": { "version": [ - 20210721, - 2026 + 20210819, + 1048 ], "deps": [ "ace-window", "deft" ], - "commit": "f4d2e02e7b9d02799036d2dd864d45115f937fbd", - "sha256": "032wpg75jwh0nq9a36727f037vwaic05yqjmcc0lwz23czrkpsd5" + "commit": "910a6607e172ae20347d74e651d29ebedc58ea06", + "sha256": "1cccj3y7a353b2b8gvbbs2ami1g3a7961j3dwmcar9lc0yrh3hys" }, "stable": { "version": [ @@ -113514,8 +114039,8 @@ 20210605, 513 ], - "commit": "0babe7ec524f59d57c01e2fc66294d1afa01f5eb", - "sha256": "0balv7ggz10izjw7r6z9vx17qq88229jdzpsjas6z37gk61bfngk" + "commit": "acf3ee8bbf6b7e49dbfaa8bc82a4c1b9b1f2b531", + "sha256": "0wc65hr9y1yvyb5ywswiwhk8jjxswzd0qzr92b7pkfwghmf0z1yp" } }, { @@ -113611,14 +114136,25 @@ "repo": "sshirokov/ZNC.el", "unstable": { "version": [ - 20210304, - 2337 + 20210803, + 159 ], "deps": [ "cl-lib" ], - "commit": "57d89fc1e17d94a8e9f3365b0d647a80520cc4a8", - "sha256": "0vbpc5lav8pw7caa4442z15a5s1l9wzjv68dgrbjnjvpn6yz3pay" + "commit": "6f0949c393b7778a96033716787d152ada32f705", + "sha256": "0mfx69xgnwhaaj0gq4nrq7j8c0l3i6y4w7nxkjcqq6jg7zbkppai" + }, + "stable": { + "version": [ + 0, + 4 + ], + "deps": [ + "cl-lib" + ], + "commit": "2605f78e37a8a759067dc14fa25a82824ba1bacc", + "sha256": "1ran86ycnays9s23wk3iczqqgnpbyx0lijiarx65am3jc1yzg5ia" } }, { @@ -114102,8 +114638,8 @@ "avy", "cl-lib" ], - "commit": "18d26571b91a9c56b6a7e0d2a58188e833ab5d0f", - "sha256": "0cl76m06cm0wmb8bx6g6xrxaks2vr6zqpibc9d94gbkr5jzccg9k" + "commit": "fa87da4ac95a1d7fe8aa9198c5568debee8d5627", + "sha256": "03gg15vj2jbd70xjqkxpwgngz340fyhq1jjmd4iasf36fqplxccw" }, "stable": { "version": [ diff --git a/third_party/nixpkgs/pkgs/applications/editors/glow/default.nix b/third_party/nixpkgs/pkgs/applications/editors/glow/default.nix index 728f5e54a3..dde5083d9c 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/glow/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/glow/default.nix @@ -15,7 +15,7 @@ buildGoModule rec { doCheck = false; - buildFlagsArray = [ "-ldflags= -s -w -X=main.Version=${version}" ]; + ldflags = [ "-s" "-w" "-X=main.Version=${version}" ]; meta = with lib; { description = "Render markdown on the CLI, with pizzazz!"; diff --git a/third_party/nixpkgs/pkgs/applications/editors/micro/default.nix b/third_party/nixpkgs/pkgs/applications/editors/micro/default.nix index c10a436b73..c3c42ac24c 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/micro/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/micro/default.nix @@ -17,7 +17,7 @@ buildGoModule rec { vendorSha256 = "sha256-YcAKl4keizkbgQLAZGiCG3CGpNTNad8EvOJEXLX2s0s="; - buildFlagsArray = [ "-ldflags=-s -w -X github.com/zyedidia/micro/v2/internal/util.Version=${version} -X github.com/zyedidia/micro/v2/internal/util.CommitHash=${src.rev}" ]; + ldflags = [ "-s" "-w" "-X github.com/zyedidia/micro/v2/internal/util.Version=${version}" "-X github.com/zyedidia/micro/v2/internal/util.CommitHash=${src.rev}" ]; postInstall = '' installManPage assets/packaging/micro.1 diff --git a/third_party/nixpkgs/pkgs/applications/editors/neovim/neovim-qt.nix b/third_party/nixpkgs/pkgs/applications/editors/neovim/neovim-qt.nix index 0a4d17d997..4d53143ac8 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/neovim/neovim-qt.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/neovim/neovim-qt.nix @@ -1,5 +1,5 @@ { lib, mkDerivation, fetchFromGitHub, cmake, doxygen, makeWrapper -, msgpack, neovim, python3Packages, qtbase }: +, msgpack, neovim, python3Packages, qtbase, qtsvg }: mkDerivation rec { pname = "neovim-qt-unwrapped"; @@ -20,6 +20,7 @@ mkDerivation rec { buildInputs = [ neovim.unwrapped # only used to generate help tags at build time qtbase + qtsvg ] ++ (with python3Packages; [ jinja2 python msgpack ]); diff --git a/third_party/nixpkgs/pkgs/applications/editors/rehex/default.nix b/third_party/nixpkgs/pkgs/applications/editors/rehex/default.nix index baf8b93d7f..6a52c7efc2 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/rehex/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/rehex/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "rehex"; - version = "0.3.91"; + version = "0.3.92"; src = fetchFromGitHub { owner = "solemnwarning"; repo = pname; rev = version; - sha256 = "sha256-lemak/sGff346IOzOnMB4L4TkDRA/1L3KV3VNdWxIFA="; + sha256 = "sha256-yZvJlomUpJwDJOBVSl49lU+JE1YMMs/BSzHepXoFlIY="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/applications/graphics/hydrus/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/hydrus/default.nix index de952e866d..db14df2c1e 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 = "451"; + version = "452"; format = "other"; src = fetchFromGitHub { owner = "hydrusnetwork"; repo = "hydrus"; rev = "v${version}"; - sha256 = "sha256-HoaXbnhwh6kDWgRFVs+VttzIY3MaxriteFTE1fwBUYs="; + sha256 = "1zzrw1fbbbayq322346dqb3a8bzb3xnx1qmdciq01dmlbc3bmza1"; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/logging/humioctl/default.nix b/third_party/nixpkgs/pkgs/applications/logging/humioctl/default.nix index 5ec33d88cd..b5d0578b12 100644 --- a/third_party/nixpkgs/pkgs/applications/logging/humioctl/default.nix +++ b/third_party/nixpkgs/pkgs/applications/logging/humioctl/default.nix @@ -20,7 +20,7 @@ in buildGoModule { sha256 = sha256; }; - buildFlagsArray = "-ldflags=-X main.version=${humioCtlVersion}"; + ldflags = [ "-X main.version=${humioCtlVersion}" ]; nativeBuildInputs = [ installShellFiles ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/archiver/default.nix b/third_party/nixpkgs/pkgs/applications/misc/archiver/default.nix index 4d46047bb9..cf76eda272 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/archiver/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/archiver/default.nix @@ -16,7 +16,7 @@ buildGoModule rec { vendorSha256 = "0avnskay23mpl3qkyf1h75rr7szpsxis2bj5pplhwf8q8q0212xf"; - buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version} -X main.commit=${src.rev} -X main.date=unknown" ]; + ldflags = [ "-s" "-w" "-X main.version=${version}" "-X main.commit=${src.rev}" "-X main.date=unknown" ]; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/applications/misc/charm/default.nix b/third_party/nixpkgs/pkgs/applications/misc/charm/default.nix index 97e8227e6c..224336dffa 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/charm/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/charm/default.nix @@ -15,7 +15,7 @@ buildGoModule rec { doCheck = false; - buildFlagsArray = [ "-ldflags= -s -w -X=main.Version=${version}" ]; + ldflags = [ "-s" "-w" "-X=main.Version=${version}" ]; meta = with lib; { description = "Manage your charm account on the CLI"; diff --git a/third_party/nixpkgs/pkgs/applications/misc/cointop/default.nix b/third_party/nixpkgs/pkgs/applications/misc/cointop/default.nix index 62bcf6a99d..4b2f45c47f 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/cointop/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/cointop/default.nix @@ -13,7 +13,7 @@ buildGoPackage rec { goPackagePath = "github.com/miguelmota/cointop"; - buildFlagsArray = [ "-ldflags=-s -w -X ${goPackagePath}/cointop.version=${version}" ]; + ldflags = [ "-s" "-w" "-X ${goPackagePath}/cointop.version=${version}" ]; meta = with lib; { description = "The fastest and most interactive terminal based UI application for tracking cryptocurrencies"; diff --git a/third_party/nixpkgs/pkgs/applications/misc/dbeaver/default.nix b/third_party/nixpkgs/pkgs/applications/misc/dbeaver/default.nix index e1ce1f2f21..963da1839f 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/dbeaver/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/dbeaver/default.nix @@ -18,13 +18,13 @@ stdenv.mkDerivation rec { pname = "dbeaver"; - version = "21.1.4"; # When updating also update fetchedMavenDeps.sha256 + version = "21.1.5"; # When updating also update fetchedMavenDeps.sha256 src = fetchFromGitHub { owner = "dbeaver"; repo = "dbeaver"; rev = version; - sha256 = "jW4ZSHnjBHckfbcvhl+uTuNJb1hu77D6dzoSTA6y8l4="; + sha256 = "sk19Gfu+s7KG1V4f28bFsskagGAuAsEBJEFJzvNh25M="; }; fetchedMavenDeps = stdenv.mkDerivation { @@ -50,7 +50,7 @@ stdenv.mkDerivation rec { dontFixup = true; outputHashAlgo = "sha256"; outputHashMode = "recursive"; - outputHash = "1K3GvNUT+zC7e8pD15UUCHDRWD7dtxtl8MfAJIsuaYs="; + outputHash = "L8kfYkMCbQOZDrSNIfshR/00qYQLTf8WOGQvxmaIwBg="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/misc/dstask/default.nix b/third_party/nixpkgs/pkgs/applications/misc/dstask/default.nix index c17ed9b3af..4e03059a8c 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/dstask/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/dstask/default.nix @@ -24,11 +24,11 @@ buildGoModule rec { # The other variables are set so that the output of dstask version shows the # git ref and the release version from github. # Ref - buildFlagsArray = [ '' - -ldflags=-w -s - -X "github.com/naggie/dstask.VERSION=${version}" - -X "github.com/naggie/dstask.GIT_COMMIT=v${version}" - '' ]; + ldflags = [ + "-w" "-s" + "-X github.com/naggie/dstask.VERSION=${version}" + "-X github.com/naggie/dstask.GIT_COMMIT=v${version}" + ]; subPackages = [ "cmd/dstask.go" ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/expenses/default.nix b/third_party/nixpkgs/pkgs/applications/misc/expenses/default.nix index cd40b381cb..052a7905f5 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/expenses/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/expenses/default.nix @@ -23,8 +23,8 @@ buildGoModule rec { buildInputs = [ sqlite ]; - buildFlagsArray = [ - "-ldflags=-s -w -X github.com/manojkarthick/expenses/cmd.Version=${version}" + ldflags = [ + "-s" "-w" "-X github.com/manojkarthick/expenses/cmd.Version=${version}" ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/applications/misc/fbmenugen/0001-Fix-paths.patch b/third_party/nixpkgs/pkgs/applications/misc/fbmenugen/0001-Fix-paths.patch index b52aeafb5f..1db7aeb738 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/fbmenugen/0001-Fix-paths.patch +++ b/third_party/nixpkgs/pkgs/applications/misc/fbmenugen/0001-Fix-paths.patch @@ -1,14 +1,14 @@ -From 76c25147328d71960c70bbdd5a9396aac4a362a2 Mon Sep 17 00:00:00 2001 -From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= -Date: Wed, 20 May 2020 14:19:07 -0300 +From b65921873585616c86a591eee9efbc68f84eb3d3 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Jos=C3=A9=20Romildo?= +Date: Wed, 25 Aug 2021 12:03:09 -0300 Subject: [PATCH] Fix paths --- - fbmenugen | 14 ++++++-------- - 1 file changed, 6 insertions(+), 8 deletions(-) + fbmenugen | 11 +++++------ + 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/fbmenugen b/fbmenugen -index 46a18dc..0c8eb08 100755 +index 241be16..5fc9aea 100755 --- a/fbmenugen +++ b/fbmenugen @@ -214,9 +214,7 @@ my %CONFIG = ( @@ -22,15 +22,6 @@ index 46a18dc..0c8eb08 100755 "$home_dir/.local/share/applications", ], #>>> -@@ -232,7 +230,7 @@ my %CONFIG = ( - force_icon_size => 0, - generic_fallback => 0, - locale_support => 1, -- use_gtk3 => 0, -+ use_gtk3 => 1, - - VERSION => $version, - ); @@ -252,7 +250,7 @@ if (not -e $config_file) { } @@ -40,7 +31,7 @@ index 46a18dc..0c8eb08 100755 require File::Copy; File::Copy::copy($etc_schema_file, $schema_file) or warn "$0: can't copy file `$etc_schema_file' to `$schema_file': $!\n"; -@@ -570,7 +568,7 @@ EXIT +@@ -588,7 +586,7 @@ EXIT $generated_menu .= begin_category(@{$schema->{fluxbox}}) . <<"FOOTER"; [config] (Configure) [submenu] (System Styles) {Choose a style...} @@ -49,7 +40,7 @@ index 46a18dc..0c8eb08 100755 [end] [submenu] (User Styles) {Choose a style...} [stylesdir] (~/.fluxbox/styles) -@@ -580,12 +578,12 @@ EXIT +@@ -598,12 +596,13 @@ EXIT [exec] (Screenshot - JPG) {import screenshot.jpg && display -resize 50% screenshot.jpg} [exec] (Screenshot - PNG) {import screenshot.png && display -resize 50% screenshot.png} [exec] (Run) {fbrun} @@ -59,11 +50,11 @@ index 46a18dc..0c8eb08 100755 [commanddialog] (Fluxbox Command) [reconfig] (Reload config) [restart] (Restart) -- [exec] (About) {(fluxbox -v; fluxbox -info | sed 1d) | xmessage -file - -center} + [exec] (About) {(fluxbox -v; fluxbox -info | sed 1d) | xmessage -file - -center} + [exec] (About) {(@fluxbox@/bin/fluxbox -v; @fluxbox@/bin/fluxbox -info | @gnused@/bin/sed 1d) | @xmessage@/bin/xmessage -file - -center} [separator] [exit] (Exit) [end] -- -2.26.2 +2.32.0 diff --git a/third_party/nixpkgs/pkgs/applications/misc/fbmenugen/default.nix b/third_party/nixpkgs/pkgs/applications/misc/fbmenugen/default.nix index 36629179ab..06d7453ede 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/fbmenugen/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/fbmenugen/default.nix @@ -11,13 +11,13 @@ perlPackages.buildPerlPackage rec { pname = "fbmenugen"; - version = "0.85"; + version = "0.86"; src = fetchFromGitHub { owner = "trizen"; repo = pname; rev = version; - sha256 = "1pmms3wzkm8h41a8zrkpn6gq9m9yy5wr5rrzmb84lbacprqq6q7q"; + sha256 = "0ya7s8b5xbaplz365bnr580szxxsngrs2n7smj8vz8a7kwi0319q"; }; patches = [ @@ -68,7 +68,7 @@ perlPackages.buildPerlPackage rec { meta = with lib; { homepage = "https://github.com/trizen/fbmenugen"; description = "Simple menu generator for the Fluxbox Window Manager"; - license = licenses.gpl3; + license = licenses.gpl3Only; platforms = platforms.linux; maintainers = [ maintainers.romildo ]; }; diff --git a/third_party/nixpkgs/pkgs/applications/misc/joplin-desktop/default.nix b/third_party/nixpkgs/pkgs/applications/misc/joplin-desktop/default.nix index a5a9c3e45f..02e3596e05 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/joplin-desktop/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/joplin-desktop/default.nix @@ -2,7 +2,7 @@ let pname = "joplin-desktop"; - version = "2.1.9"; + version = "2.3.5"; name = "${pname}-${version}"; inherit (stdenv.hostPlatform) system; @@ -16,8 +16,8 @@ let src = fetchurl { url = "https://github.com/laurent22/joplin/releases/download/v${version}/Joplin-${version}.${suffix}"; sha256 = { - x86_64-linux = "1s7zydi90yzafii42m3aaf3niqlmdy2m494j2b3yrz2j26njj4q9"; - x86_64-darwin = "1pvl08yhcrnrvdybfmkigaidhfrrg42bb6rzv96zyq9w4k0l0lm8"; + x86_64-linux = "sha256-Qy/CpIEfAZ9735mwcNaJIw+qVmYXVwQ7gJuUj2lpQc4="; + x86_64-darwin = "sha256-7I+fhcFFW/WihuUkSE5Pc8RhKszSgByP58H3sKSJbrc="; }.${system} or throwSystem; }; diff --git a/third_party/nixpkgs/pkgs/applications/misc/minder/default.nix b/third_party/nixpkgs/pkgs/applications/misc/minder/default.nix index 16fa17609e..607eeb5eaa 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/minder/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/minder/default.nix @@ -1,24 +1,62 @@ -{ lib, stdenv, fetchFromGitHub -, pkg-config, meson, ninja, python3 -, wrapGAppsHook, vala, shared-mime-info -, cairo, pantheon, glib, gtk3, libxml2, libgee, libarchive -, discount, gtksourceview3 +{ lib +, stdenv +, fetchFromGitHub +, desktop-file-utils +, meson +, ninja +, pkg-config +, python3 +, shared-mime-info +, vala +, wrapGAppsHook +, cairo +, discount +, glib +, gtk3 +, gtksourceview4 , hicolor-icon-theme # for setup-hook +, libarchive +, libgee +, libhandy +, libxml2 +, pantheon }: stdenv.mkDerivation rec { pname = "minder"; - version = "1.11.3"; + version = "1.13.1"; src = fetchFromGitHub { owner = "phase1geo"; repo = pname; rev = version; - sha256 = "137kyf82n5a2v0cm9q02rhv8rmbjgnj60h64prq90h0d42prj3gd"; + sha256 = "07mq595c1vxwsnwkr2zdci0r06yhs75ph2db09mc63k5fjvi8rya"; }; - nativeBuildInputs = [ pkg-config meson ninja python3 wrapGAppsHook vala shared-mime-info ]; - buildInputs = [ cairo pantheon.granite glib gtk3 libxml2 libgee libarchive hicolor-icon-theme discount gtksourceview3 ]; + nativeBuildInputs = [ + desktop-file-utils + meson + ninja + pkg-config + python3 + shared-mime-info + vala + wrapGAppsHook + ]; + + buildInputs = [ + cairo + discount + glib + gtk3 + gtksourceview4 + hicolor-icon-theme + libarchive + libgee + libhandy + libxml2 + pantheon.granite + ]; postPatch = '' chmod +x meson/post_install.py @@ -32,11 +70,10 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - description = "Mind-mapping application for Elementary OS"; + description = "Mind-mapping application for elementary OS"; homepage = "https://github.com/phase1geo/Minder"; license = licenses.gpl3Plus; platforms = platforms.linux; - maintainers = with maintainers; [ dtzWill ]; + maintainers = with maintainers; [ dtzWill ] ++ teams.pantheon.members; }; } - diff --git a/third_party/nixpkgs/pkgs/applications/misc/nwg-drawer/default.nix b/third_party/nixpkgs/pkgs/applications/misc/nwg-drawer/default.nix index 4e6518c6ff..efe4740d77 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/nwg-drawer/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/nwg-drawer/default.nix @@ -10,13 +10,13 @@ buildGoModule rec { pname = "nwg-drawer"; - version = "0.1.4"; + version = "0.1.7"; src = fetchFromGitHub { owner = "nwg-piotr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-YjMuXSBAgRh6vZUxKHLTqT2lEU/f+AuI/dX4PHfftZg="; + sha256 = "sha256-WUYWS0pkYJwXadhlZDHIl9BuirLTu5TNITZ+cBMArVw="; }; vendorSha256 = "sha256-HyrjquJ91ddkyS8JijHd9HjtfwSQykXCufa2wzl8RNk="; diff --git a/third_party/nixpkgs/pkgs/applications/misc/slides/default.nix b/third_party/nixpkgs/pkgs/applications/misc/slides/default.nix index 491e889f24..c69971919e 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/slides/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/slides/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "slides"; - version = "0.4.1"; + version = "0.5.0"; src = fetchFromGitHub { owner = "maaslalani"; repo = "slides"; rev = "v${version}"; - sha256 = "1cywqrqj199hmx532h4vn0j17ypswq2zkmv8qpxpayvjwimx4pwk"; + sha256 = "175g823n253d3xg8hxycw3gm1hhqb0vz8zs7xxcbdw5rlpd2hjii"; }; checkInputs = [ @@ -18,7 +18,7 @@ buildGoModule rec { ruby ]; - vendorSha256 = "0y6fz9rw702mji571k0gp4kpfx7xbv7rvlnmpfjygy6lmp7wga6f"; + vendorSha256 = "13kx47amwvzyzc251iijsbwa52s8bpld4xllb4y85qkwllfnmq2g"; ldflags = [ "-s" "-w" diff --git a/third_party/nixpkgs/pkgs/applications/misc/ttyper/default.nix b/third_party/nixpkgs/pkgs/applications/misc/ttyper/default.nix new file mode 100644 index 0000000000..664bf9ba72 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/misc/ttyper/default.nix @@ -0,0 +1,22 @@ +{ fetchFromGitHub, lib, rustPlatform }: + +rustPlatform.buildRustPackage rec { + pname = "ttyper"; + version = "0.2.5"; + + src = fetchFromGitHub { + owner = "max-niederman"; + repo = pname; + rev = "v${version}"; + sha256 = "1fsb77ky92fyv3ll6zrbxbd69gm85xnc6bivj7sc3sv5cxhgr7a5"; + }; + + cargoSha256 = "1sqdql0kfr1vsww6hkrp7yjlzx0mnhfma51z699hkx9c492sf1wk"; + + meta = with lib; { + description = "Terminal-based typing test"; + homepage = "https://github.com/max-niederman/ttyper"; + license = licenses.mit; + maintainers = with maintainers; [ figsoda ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/misc/wtf/default.nix b/third_party/nixpkgs/pkgs/applications/misc/wtf/default.nix index 867dee5bcd..30ae2d9be0 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/wtf/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/wtf/default.nix @@ -21,7 +21,7 @@ buildGoModule rec { doCheck = false; - buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ]; + ldflags = [ "-s" "-w" "-X main.version=${version}" ]; subPackages = [ "." ]; 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 00731c0c39..9404851247 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 @@ -31,9 +31,9 @@ } }, "dev": { - "version": "94.0.4606.12", - "sha256": "1yv34wahg1f0l35kvlm3x17wvqdg8yyzmjj6naz2lnl5qai89zr8", - "sha256bin64": "19z9yzj6ig5ym8f9zzs8b4yixkspc0x62sz526r39803pbgs7s7i", + "version": "94.0.4606.20", + "sha256": "0wp9fdw7jkrzhaz8dils7k1ssd6v7kkiz4y9l81s37xxi3xj1drg", + "sha256bin64": "059rn0jj2cajrxx57gmr0ndkgixgfqazb73rxbprqj4857w4d5da", "deps": { "gn": { "version": "2021-08-11", diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/wrapper.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/wrapper.nix index 0ef5233ff6..aa6f7da503 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/wrapper.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/wrapper.nix @@ -91,6 +91,8 @@ let # and an extid attribute extensions = if nameArray != (lib.unique nameArray) then throw "Firefox addon name needs to be unique" + else if ! (lib.hasSuffix "esr" browser.name) then + throw "Nix addons are only supported in Firefox ESR" else builtins.map (a: if ! (builtins.hasAttr "extid" a) then throw "nixExtensions has an invalid entry. Missing extid attribute. Please use fetchfirefoxaddon" diff --git a/third_party/nixpkgs/pkgs/applications/networking/calls/default.nix b/third_party/nixpkgs/pkgs/applications/networking/calls/default.nix index 52e1bc5060..68ab73da01 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/calls/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/calls/default.nix @@ -94,6 +94,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "A phone dialer and call handler"; + longDescription = "GNOME Calls is a phone dialer and call handler. Setting NixOS option `programs.calls.enable = true` is recommended."; homepage = "https://source.puri.sm/Librem5/calls"; license = licenses.gpl3Plus; maintainers = with maintainers; [ craigem lheckemann ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cloudflared/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cloudflared/default.nix index c036890aad..617d84e43d 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cloudflared/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cloudflared/default.nix @@ -2,20 +2,20 @@ buildGoModule rec { pname = "cloudflared"; - version = "2021.8.2"; + version = "2021.8.3"; src = fetchFromGitHub { owner = "cloudflare"; repo = "cloudflared"; rev = version; - sha256 = "sha256-5PMKVWBOWkUhmCSttbhu7UdS3dLqr0epJpQL1jfS31c="; + sha256 = "sha256-gipLjABvJ1QK98uX7Gl6feHXUei95yHlSNkqlQ7pVg4="; }; vendorSha256 = null; doCheck = false; - buildFlagsArray = "-ldflags=-X main.Version=${version}"; + ldflags = [ "-X main.Version=${version}" ]; meta = with lib; { description = "CloudFlare Argo Tunnel daemon (and DNS-over-HTTPS client)"; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/argo/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/argo/default.nix index a49879e535..6372f19ee6 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/argo/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/argo/default.nix @@ -43,15 +43,14 @@ buildGoModule rec { ${staticfiles}/bin/staticfiles -o server/static/files.go ui/dist/app ''; - buildFlagsArray = '' - -ldflags= - -s -w - -X github.com/argoproj/argo-workflows/v3.buildDate=unknown - -X github.com/argoproj/argo-workflows/v3.gitCommit=${src.rev} - -X github.com/argoproj/argo-workflows/v3.gitTag=${src.rev} - -X github.com/argoproj/argo-workflows/v3.gitTreeState=clean - -X github.com/argoproj/argo-workflows/v3.version=${version} - ''; + ldflags = [ + "-s" "-w" + "-X github.com/argoproj/argo-workflows/v3.buildDate=unknown" + "-X github.com/argoproj/argo-workflows/v3.gitCommit=${src.rev}" + "-X github.com/argoproj/argo-workflows/v3.gitTag=${src.rev}" + "-X github.com/argoproj/argo-workflows/v3.gitTreeState=clean" + "-X github.com/argoproj/argo-workflows/v3.version=${version}" + ]; postInstall = '' for shell in bash zsh; do diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/argocd/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/argocd/default.nix index a0468f506d..4101ac9f3f 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/argocd/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/argocd/default.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "argocd"; - version = "2.0.5"; - commit = "4c94d886f56bcb2f9d5b3251fdc049c2d1354b88"; + version = "2.1.1"; + commit = "57abbf95ed160c88b2634ec4d37df9555cc74fb3"; tag = "v${version}"; src = fetchFromGitHub { owner = "argoproj"; repo = "argo-cd"; rev = tag; - sha256 = "sha256-8YymSR15e+6gGGqr5CH4ERHN8RO3wd9NJkM9K7InlFU="; + sha256 = "0jh7kh4751kb7439vbbh5f03kcy56phdcvzypjw8n0w239n5xmmc"; }; - vendorSha256 = "sha256-9dVkGl0gjjMehG2nt1eNpNT5fD9GbJ1mNMzYS8FTm08="; + vendorSha256 = "sha256-KtLEN66Q5WpCi+COId+gPu2XHcs5/D04rYLHV6XohzQ="; nativeBuildInputs = [ packr makeWrapper installShellFiles ]; @@ -22,11 +22,10 @@ buildGoModule rec { packr ''; - buildFlagsArray = + ldflags = let package_url = "github.com/argoproj/argo-cd/v2/common"; in [ - "-ldflags=" - "-s -w" + "-s" "-w" "-X ${package_url}.version=${version}" "-X ${package_url}.buildDate=unknown" "-X ${package_url}.gitCommit=${commit}" @@ -46,7 +45,7 @@ buildGoModule rec { doInstallCheck = true; installCheckPhase = '' $out/bin/argocd version --client | grep ${tag} > /dev/null - $out/bin/argocd-util version | grep ${tag} > /dev/null + $out/bin/argocd-util version --client | grep ${tag} > /dev/null ''; installPhase = '' diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/cloudfoundry-cli/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/cloudfoundry-cli/default.nix index 287640bf5a..619b2834e5 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/cloudfoundry-cli/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/cloudfoundry-cli/default.nix @@ -25,8 +25,7 @@ buildGoModule rec { nativeBuildInputs = [ installShellFiles ]; - buildFlagsArray = [ - "-ldflags=" + ldflags = [ "-s" "-w" "-X code.cloudfoundry.org/cli/version.binaryBuildDate=1970-01-01" diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/fluxcd/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/fluxcd/default.nix index a4699bacba..729f7e4722 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/fluxcd/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/fluxcd/default.nix @@ -28,7 +28,7 @@ buildGoModule rec { subPackages = [ "cmd/flux" ]; - buildFlagsArray = [ "-ldflags=-s -w -X main.VERSION=${version}" ]; + ldflags = [ "-s" "-w" "-X main.VERSION=${version}" ]; postUnpack = '' cp -r ${manifests} source/cmd/flux/manifests diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/fluxctl/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/fluxctl/default.nix index 003f6722d1..4fe8bea907 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/fluxctl/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/fluxctl/default.nix @@ -19,7 +19,7 @@ buildGoModule rec { subPackages = [ "cmd/fluxctl" ]; - buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ]; + ldflags = [ "-s" "-w" "-X main.version=${version}" ]; postInstall = '' for shell in bash fish zsh; do 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 af2771f985..6d70b405e1 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/helmfile/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/helmfile/default.nix @@ -19,7 +19,7 @@ buildGoModule rec { subPackages = [ "." ]; - buildFlagsArray = [ "-ldflags=-s -w -X github.com/roboll/helmfile/pkg/app/version.Version=${version}" ]; + ldflags = [ "-s" "-w" "-X github.com/roboll/helmfile/pkg/app/version.Version=${version}" ]; postInstall = '' wrapProgram $out/bin/helmfile \ diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/hetzner-kube/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/hetzner-kube/default.nix index f66e5f88e7..bf4183268e 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/hetzner-kube/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/hetzner-kube/default.nix @@ -22,10 +22,9 @@ buildGoModule rec { doCheck = false; - buildFlagsArray = '' - -ldflags= - -X github.com/xetys/hetzner-kube/cmd.version=${version} - ''; + ldflags = [ + "-X github.com/xetys/hetzner-kube/cmd.version=${version}" + ]; nativeBuildInputs = [ installShellFiles diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/istioctl/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/istioctl/default.nix index 747523103a..e4ef8d1aa8 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/istioctl/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/istioctl/default.nix @@ -17,14 +17,14 @@ buildGoModule rec { nativeBuildInputs = [ installShellFiles ]; # Bundle release metadata - buildFlagsArray = let + ldflags = let attrs = [ "istio.io/pkg/version.buildVersion=${version}" "istio.io/pkg/version.buildStatus=Nix" "istio.io/pkg/version.buildTag=${version}" "istio.io/pkg/version.buildHub=docker.io/istio" ]; - in ["-ldflags=-s -w ${lib.concatMapStringsSep " " (attr: "-X ${attr}") attrs}"]; + in ["-s" "-w" "${lib.concatMapStringsSep " " (attr: "-X ${attr}") attrs}"]; subPackages = [ "istioctl/cmd/istioctl" ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/jx/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/jx/default.nix index d7fc1cb224..d9b04aaf7f 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/jx/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/jx/default.nix @@ -19,13 +19,12 @@ buildGoModule rec { nativeBuildInputs = [ installShellFiles ]; - buildFlagsArray = '' - -ldflags= - -s -w - -X github.com/jenkins-x/jx/pkg/version.Version=${version} - -X github.com/jenkins-x/jx/pkg/version.Revision=${src.rev} - -X github.com/jenkins-x/jx/pkg/version.GitTreeState=clean - ''; + ldflags = [ + "-s -w" + "-X github.com/jenkins-x/jx/pkg/version.Version=${version}" + "-X github.com/jenkins-x/jx/pkg/version.Revision=${src.rev}" + "-X github.com/jenkins-x/jx/pkg/version.GitTreeState=clean" + ]; postInstall = '' for shell in bash zsh; do diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/k3s/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/k3s/default.nix index 4340543b77..4b60ec6ea2 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/k3s/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/k3s/default.nix @@ -7,7 +7,6 @@ , bridge-utils , conntrack-tools , buildGoPackage -, git , runc , kmod , libseccomp @@ -44,8 +43,8 @@ with lib; # Those pieces of software we entirely ignore upstream's handling of, and just # make sure they're in the path if desired. let - k3sVersion = "1.21.3+k3s1"; # k3s git tag - k3sCommit = "1d1f220fbee9cdeb5416b76b707dde8c231121f2"; # k3s git commit at the above version + k3sVersion = "1.21.4+k3s1"; # k3s git tag + k3sCommit = "3e250fdbab72d88f7e6aae57446023a0567ffc97"; # k3s git commit at the above version traefikChartVersion = "9.18.2"; # taken from ./scripts/download at TRAEFIK_VERSION k3sRootVersion = "0.9.1"; # taken from ./scripts/download at ROOT_VERSION @@ -102,7 +101,7 @@ let k3sRepo = fetchgit { url = "https://github.com/k3s-io/k3s"; rev = "v${k3sVersion}"; - sha256 = "sha256-K4HVXFp5cpByEO4dUwmpzOuhsGh1k7X6k5aShCorTjg="; + sha256 = "1w7drvk0bmlmqrxh1y6dxjy7dk6bdrl72pkd25lc1ir6wbzb05h9"; }; # Stage 1 of the k3s build: # Let's talk about how k3s is structured. diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/k9s/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/k9s/default.nix index 3c7b232cc2..871ab8b934 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/k9s/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/k9s/default.nix @@ -11,12 +11,11 @@ buildGoModule rec { sha256 = "sha256-ws5JC2/WkgwxKwYtP9xtFELRhztzL6tNSvopyeC6H0Q="; }; - buildFlagsArray = '' - -ldflags= - -s -w - -X github.com/derailed/k9s/cmd.version=${version} - -X github.com/derailed/k9s/cmd.commit=${src.rev} - ''; + ldflags = [ + "-s" "-w" + "-X github.com/derailed/k9s/cmd.version=${version}" + "-X github.com/derailed/k9s/cmd.commit=${src.rev}" + ]; vendorSha256 = "sha256-T9khJeg5XPhVyUiu4gEEHZR6RgJF4P8LYFycqJglms8="; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/kops/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/kops/default.nix index 54d13f819a..389be11e50 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/kops/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/kops/default.nix @@ -21,11 +21,10 @@ let nativeBuildInputs = [ go-bindata installShellFiles ]; subPackages = [ "cmd/kops" ]; - buildFlagsArray = '' - -ldflags= - -X k8s.io/kops.Version=${version} - -X k8s.io/kops.GitVersion=${version} - ''; + ldflags = [ + "-X k8s.io/kops.Version=${version}" + "-X k8s.io/kops.GitVersion=${version}" + ]; preBuild = '' (cd go/src/k8s.io/kops diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/kpt/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/kpt/default.nix index be91a64b74..3e6475ca65 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/kpt/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/kpt/default.nix @@ -15,7 +15,7 @@ buildGoModule rec { subPackages = [ "." ]; - buildFlagsArray = [ "-ldflags=-s -w -X github.com/GoogleContainerTools/kpt/run.version=${version}" ]; + ldflags = [ "-s" "-w" "-X github.com/GoogleContainerTools/kpt/run.version=${version}" ]; meta = with lib; { description = "A toolkit to help you manage, manipulate, customize, and apply Kubernetes Resource configuration data files"; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/kube-router/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/kube-router/default.nix index 85b83c994d..b9a282b5cd 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/kube-router/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/kube-router/default.nix @@ -13,13 +13,10 @@ buildGoPackage rec { sha256 = "sha256-/VToLQexvRtcBU+k8WnGEcfLfxme/hgRnhU8723BEFU="; }; - buildFlagsArray = '' - -ldflags= - -X - ${goPackagePath}/pkg/cmd.version=${version} - -X - ${goPackagePath}/pkg/cmd.buildDate=Nix - ''; + ldflags = [ + "-X ${goPackagePath}/pkg/cmd.version=${version}" + "-X ${goPackagePath}/pkg/cmd.buildDate=Nix" + ]; meta = with lib; { homepage = "https://www.kube-router.io/"; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/kubeless/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/kubeless/default.nix index 38323b98b1..537fb61178 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/kubeless/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/kubeless/default.nix @@ -17,9 +17,9 @@ buildGoPackage rec { subPackages = [ "cmd/kubeless" ]; - buildFlagsArray = '' - -ldflags=-s -w -X github.com/kubeless/kubeless/pkg/version.Version=${version} - ''; + ldflags = [ + "-s" "-w" "-X github.com/kubeless/kubeless/pkg/version.Version=${version}" + ]; postInstall = '' for shell in bash; do diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/kubelogin/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/kubelogin/default.nix index f8bec6e0b1..d5f04c14d5 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/kubelogin/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/kubelogin/default.nix @@ -13,11 +13,10 @@ buildGoModule rec { vendorSha256 = "sha256-vJfTf9gD/qrsPAfJeMYLjGa90mYLOshgDehv2Fcl6xM="; - buildFlagsArray = '' - -ldflags= - -X main.version=${version} - -X main.goVersion=${lib.getVersion go} - ''; + ldflags = [ + "-X main.version=${version}" + "-X main.goVersion=${lib.getVersion go}" + ]; meta = with lib; { description = "A Kubernetes credential plugin implementing Azure authentication"; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/kubeseal/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/kubeseal/default.nix index 15670188f1..13fc7a9605 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/kubeseal/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/kubeseal/default.nix @@ -17,7 +17,7 @@ buildGoModule rec { subPackages = [ "cmd/kubeseal" ]; - buildFlagsArray = [ "-ldflags=-s -w -X main.VERSION=${version}" ]; + ldflags = [ "-s" "-w" "-X main.VERSION=${version}" ]; meta = with lib; { description = "A Kubernetes controller and tool for one-way encrypted Secrets"; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/kuttl/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/kuttl/default.nix index fe92a5ddf9..64f13ad6b6 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/kuttl/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/kuttl/default.nix @@ -16,10 +16,10 @@ buildGoModule rec { subPackages = [ "cmd/kubectl-kuttl" ]; - buildFlagsArray = '' - -ldflags=-s -w - -X github.com/kudobuilder/kuttl/pkg/version.gitVersion=${version} - ''; + ldflags = [ + "-s" "-w" + "-X github.com/kudobuilder/kuttl/pkg/version.gitVersion=${version}" + ]; meta = with lib; { description = "The KUbernetes Test TooL (KUTTL) provides a declarative approach to testing production-grade Kubernetes operators"; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/lens/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/lens/default.nix index e6af0146ca..6e04391d7a 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/lens/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/lens/default.nix @@ -2,12 +2,13 @@ let pname = "lens"; - version = "4.2.4"; + version = "5.1.3"; + build = "${version}-latest.20210722.1"; name = "${pname}-${version}"; src = fetchurl { - url = "https://github.com/lensapp/lens/releases/download/v${version}/Lens-${version}.x86_64.AppImage"; - sha256 = "0fzhv8brwwl1ihx6jqq4pi77489hr6f9hpppqq3n8d2imjsqgvlw"; + url = "https://api.k8slens.dev/binaries/Lens-${build}.x86_64.AppImage"; + sha256 = "1iwwyqpn1x1m8n22f99snlhcbcr65i4przx697hlbpmnm40dw7q9"; name="${pname}.AppImage"; }; @@ -22,12 +23,12 @@ in appimageTools.wrapType2 { '' mv $out/bin/${name} $out/bin/${pname} - install -m 444 -D ${appimageContents}/kontena-lens.desktop $out/share/applications/${pname}.desktop - install -m 444 -D ${appimageContents}/usr/share/icons/hicolor/512x512/apps/kontena-lens.png \ - $out/share/icons/hicolor/512x512/apps/${pname}.png + install -m 444 -D ${appimageContents}/lens.desktop $out/share/applications/${pname}.desktop + install -m 444 -D ${appimageContents}/usr/share/icons/hicolor/512x512/apps/lens.png \ + $out/share/icons/hicolor/512x512/apps/${pname}.png substituteInPlace $out/share/applications/${pname}.desktop \ - --replace 'Icon=kontena-lens' 'Icon=${pname}' \ + --replace 'Icon=lens' 'Icon=${pname}' \ --replace 'Exec=AppRun' 'Exec=${pname}' ''; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/minishift/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/minishift/default.nix index 5b3b17b3df..488d0c4327 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/minishift/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/minishift/default.nix @@ -34,12 +34,11 @@ in buildGoPackage rec { --replace '"runtime"' "" ''; - buildFlagsArray = '' - -ldflags= - -X ${goPackagePath}/pkg/version.minishiftVersion=${version} - -X ${goPackagePath}/pkg/version.centOsIsoVersion=${centOsIsoVersion} - -X ${goPackagePath}/pkg/version.openshiftVersion=${openshiftVersion} - ''; + ldflags = [ + "-X ${goPackagePath}/pkg/version.minishiftVersion=${version}" + "-X ${goPackagePath}/pkg/version.centOsIsoVersion=${centOsIsoVersion}" + "-X ${goPackagePath}/pkg/version.openshiftVersion=${openshiftVersion}" + ]; preBuild = '' (cd go/src/github.com/minishift/minishift diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/multus-cni/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/multus-cni/default.nix index 9e91589478..3a8a26af3f 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/multus-cni/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/multus-cni/default.nix @@ -11,11 +11,11 @@ buildGoModule rec { sha256 = "sha256-eVYRbMijOEa+DNCm4w/+WVrTI9607NF9/l5YKkXJuFs="; }; - buildFlagsArray = let + ldflags = let multus = "gopkg.in/intel/multus-cni.v3/pkg/multus"; commit = "f6298a3a294a79f9fbda0b8f175e521799d5f8d7"; in [ - "-ldflags=-s -w -X '${multus}.version=v${version}' -X '${multus}.commit=${commit}'" + "-s" "-w" "-X ${multus}.version=v${version}" "-X ${multus}.commit=${commit}" ]; preInstall = '' diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/popeye/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/popeye/default.nix index 3751ad25c7..910317bd96 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/popeye/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/popeye/default.nix @@ -11,12 +11,11 @@ buildGoModule rec { sha256 = "sha256-oft1zLLd5TP8S9GMjp5kYaoPoOYnbhJwL2wBerkhp+c="; }; - buildFlagsArray = '' - -ldflags= - -s -w - -X github.com/derailed/popeye/cmd.version=${version} - -X github.com/derailed/popeye/cmd.commit=${version} - ''; + ldflags = [ + "-s" "-w" + "-X github.com/derailed/popeye/cmd.version=${version}" + "-X github.com/derailed/popeye/cmd.commit=${version}" + ]; vendorSha256 = "sha256-vUUDLMicop5QzZmAHi5qrc0hx8oV2xWNFHvCWioLhl8="; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/qbec/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/qbec/default.nix index 6f8e564053..f5fb6ee234 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/qbec/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/qbec/default.nix @@ -15,13 +15,12 @@ buildGoModule rec { doCheck = false; - buildFlagsArray = '' - -ldflags= - -s -w - -X github.com/splunk/qbec/internal/commands.version=${version} - -X github.com/splunk/qbec/internal/commands.commit=${src.rev} - -X github.com/splunk/qbec/internal/commands.goVersion=${lib.getVersion go} - ''; + ldflags = [ + "-s" "-w" + "-X github.com/splunk/qbec/internal/commands.version=${version}" + "-X github.com/splunk/qbec/internal/commands.commit=${src.rev}" + "-X github.com/splunk/qbec/internal/commands.goVersion=${lib.getVersion go}" + ]; meta = with lib; { description = "Configure kubernetes objects on multiple clusters using jsonnet https://qbec.io"; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/sonobuoy/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/sonobuoy/default.nix index fc30699f22..b82b6cf610 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/sonobuoy/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/sonobuoy/default.nix @@ -7,14 +7,14 @@ buildGoModule rec { pname = "sonobuoy"; version = "0.53.2"; # Do not forget to update `rev` above - buildFlagsArray = + ldflags = let t = "github.com/vmware-tanzu/sonobuoy"; - in '' - -ldflags= - -s -X ${t}/pkg/buildinfo.Version=v${version} - -X ${t}/pkg/buildinfo.GitSHA=${rev} - -X ${t}/pkg/buildDate=unknown - ''; + in [ + "-s" + "-X ${t}/pkg/buildinfo.Version=v${version}" + "-X ${t}/pkg/buildinfo.GitSHA=${rev}" + "-X ${t}/pkg/buildDate=unknown" + ]; src = fetchFromGitHub { sha256 = "sha256-8bUZsknG1Z2TKWwtuJtnauK8ibikGphl3oiLXT3PZzY="; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/stern/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/stern/default.nix index 602ac8ae53..74508a7322 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/stern/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/stern/default.nix @@ -19,8 +19,8 @@ buildGoModule rec { nativeBuildInputs = [ installShellFiles ]; - buildFlagsArray = - [ "-ldflags=-s -w -X github.com/stern/stern/cmd.version=${version}" ]; + ldflags = + [ "-s" "-w" "-X github.com/stern/stern/cmd.version=${version}" ]; postInstall = let stern = if isCrossBuild then buildPackages.stern else "$out"; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/tanka/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/tanka/default.nix index bf11b35d71..6aee37c57e 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/tanka/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/tanka/default.nix @@ -17,7 +17,7 @@ buildGoModule rec { subPackages = [ "cmd/tk" ]; - buildFlagsArray = [ "-ldflags=-s -w -extldflags \"-static\" -X github.com/grafana/tanka/pkg/tanka.CURRENT_VERSION=v${version}" ]; + ldflags = [ "-s" "-w" "-extldflags '-static'" "-X github.com/grafana/tanka/pkg/tanka.CURRENT_VERSION=v${version}" ]; nativeBuildInputs = [ installShellFiles ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/terragrunt/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/terragrunt/default.nix index dba9ff4ae7..214d3bfe34 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/terragrunt/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/terragrunt/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "terragrunt"; - version = "0.31.5"; + version = "0.31.7"; src = fetchFromGitHub { owner = "gruntwork-io"; repo = pname; rev = "v${version}"; - sha256 = "sha256-yovrqDGvw+GwzEiuveO2eLnP7mVVY5CQB0agzxIsHto="; + sha256 = "sha256-PCBKuTJ0IbYma584qIPrxGfwOIzHszWH+bW8iy0OUvo="; }; - vendorSha256 = "sha256-CVWg2SvRO//xye05G3svGeqgaTKdRcoERrR7Tp0JZUo="; + vendorSha256 = "sha256-y84EFmoJS4SeA5YFIVFU0iWa5NnjU5yvOj7OFE+jGN0="; doCheck = false; 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 d717bd4265..b4e44a05d8 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/tilt/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/tilt/default.nix @@ -17,7 +17,7 @@ buildGoModule rec { subPackages = [ "cmd/tilt" ]; - buildFlagsArray = [ "-ldflags=-X main.version=${version}" ]; + ldflags = [ "-X main.version=${version}" ]; meta = with lib; { description = "Local development tool to manage your developer instance when your team deploys to Kubernetes in production"; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/velero/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/velero/default.nix index 80d02eb19e..76babadc02 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/velero/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/velero/default.nix @@ -14,13 +14,12 @@ buildGoModule rec { sha256 = "sha256-oFDTjpcwlvSiAROG/EKYRCD+qKyZXu1gKotBcD0dfvk="; }; - buildFlagsArray = '' - -ldflags= - -s -w - -X github.com/vmware-tanzu/velero/pkg/buildinfo.Version=${version} - -X github.com/vmware-tanzu/velero/pkg/buildinfo.GitSHA=${commit} - -X github.com/vmware-tanzu/velero/pkg/buildinfo.GitTreeState=clean - ''; + ldflags = [ + "-s" "-w" + "-X github.com/vmware-tanzu/velero/pkg/buildinfo.Version=${version}" + "-X github.com/vmware-tanzu/velero/pkg/buildinfo.GitSHA=${commit}" + "-X github.com/vmware-tanzu/velero/pkg/buildinfo.GitTreeState=clean" + ]; vendorSha256 = "sha256-ypgrdv6nVW+AAwyVsiROXs6jGgDTodGrGqiT2s5elOU="; diff --git a/third_party/nixpkgs/pkgs/applications/networking/dnscontrol/default.nix b/third_party/nixpkgs/pkgs/applications/networking/dnscontrol/default.nix index 494a40c6bf..d767a381ea 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/dnscontrol/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/dnscontrol/default.nix @@ -15,7 +15,7 @@ buildGoModule rec { subPackages = [ "." ]; - buildFlagsArray = [ "-ldflags=-s -w" ]; + ldflags = [ "-s" "-w" ]; meta = with lib; { description = "Synchronize your DNS to multiple providers from a simple DSL"; diff --git a/third_party/nixpkgs/pkgs/applications/networking/gns3/server.nix b/third_party/nixpkgs/pkgs/applications/networking/gns3/server.nix index 7614670882..9feceffc03 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/gns3/server.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/gns3/server.nix @@ -1,15 +1,27 @@ { stable, branch, version, sha256Hash, mkOverride, commonOverrides }: -{ lib, python3, fetchFromGitHub }: +{ lib, python3, fetchFromGitHub, packageOverrides ? self: super: {} + }: let defaultOverrides = commonOverrides ++ [ - (mkOverride "aiofiles" "0.5.0" - "98e6bcfd1b50f97db4980e182ddd509b7cc35909e903a8fe50d8849e02d815af") + (self: super: { + aiofiles = super.aiofiles.overridePythonAttrs (oldAttrs: rec { + pname = "aiofiles"; + version = "0.5.0"; + src = fetchFromGitHub { + owner = "Tinche"; + repo = pname; + rev = "v${version}"; + sha256 = "17bsg2x5r0q6jy74hajnbp717pvbf752w0wgih6pbb4hdvfg5lcf"; + }; + doCheck = false; + }); + }) ]; python = python3.override { - packageOverrides = lib.foldr lib.composeExtensions (self: super: { }) defaultOverrides; + packageOverrides = lib.foldr lib.composeExtensions (self: super: { }) ([ packageOverrides ] ++ defaultOverrides); }; in python.pkgs.buildPythonPackage { pname = "gns3-server"; diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pantalaimon/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pantalaimon/default.nix index 7cfa889d28..153819fc84 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pantalaimon/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/pantalaimon/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, buildPythonApplication, fetchFromGitHub, pythonOlder, attrs, aiohttp, appdirs, click, keyring, Logbook, peewee, janus, prompt-toolkit, matrix-nio, dbus-python, pydbus, notify2, pygobject3, - setuptools, fetchpatch, installShellFiles, + setuptools, installShellFiles, pytest, faker, pytest-aiohttp, aioresponses, @@ -10,7 +10,7 @@ buildPythonApplication rec { pname = "pantalaimon"; - version = "0.9.2"; + version = "0.10.2"; disabled = pythonOlder "3.6"; @@ -19,17 +19,9 @@ buildPythonApplication rec { owner = "matrix-org"; repo = pname; rev = version; - sha256 = "11dfv5b2slqybisq6npmrqxrzslh4bjs4093vrc05s94046d9d9n"; + sha256 = "sha256-sjaJomKMKSZqLlKWTG7Oa87dXa5SnGQlVnrdS707A1w="; }; - patches = [ - # accept newer matrix-nio versions - (fetchpatch { - url = "https://github.com/matrix-org/pantalaimon/commit/73f68c76fb05037bd7fe71688ce39eb1f526a385.patch"; - sha256 = "0wvqcfan8yp67p6khsqkynbkifksp2422b9jy511mvhpy51sqykl"; - }) - ]; - propagatedBuildInputs = [ aiohttp appdirs diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix index 3f4ba56f5d..b73b87fc89 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix @@ -25,7 +25,7 @@ let else ""); in stdenv.mkDerivation rec { pname = "signal-desktop"; - version = "5.14.0"; # Please backport all updates to the stable channel. + version = "5.15.0"; # Please backport all updates to the stable channel. # All releases have a limited lifetime and "expire" 90 days after the release. # When releases "expire" the application becomes unusable until an update is # applied. The expiration date for the current release can be extracted with: @@ -35,7 +35,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb"; - sha256 = "0rb7ixha07v0l3bm9jbgnlf78l9hhjc9acyd1aji9l4fpq3azbq1"; + sha256 = "0cbz2l31cg87n6qlbvwdjy92q9qgmmkrsvaj37cc34ajh7asd833"; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix index 8478b59008..7f97e20a85 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix @@ -1,15 +1,50 @@ -{ mkDerivation, lib, fetchFromGitHub, callPackage -, pkg-config, cmake, ninja, python3, wrapGAppsHook, wrapQtAppsHook +{ mkDerivation +, lib +, fetchFromGitHub +, callPackage +, pkg-config +, cmake +, ninja +, python3 +, wrapGAppsHook +, wrapQtAppsHook , extra-cmake-modules -, qtbase, qtimageformats, gtk3, kwayland, libdbusmenu, lz4, xxHash -, ffmpeg, openalSoft, minizip, libopus, alsa-lib, libpulseaudio, range-v3 -, tl-expected, hunspell, glibmm, webkitgtk, jemalloc +, qtbase +, qtimageformats +, gtk3 +, kwayland +, libdbusmenu +, lz4 +, xxHash +, ffmpeg +, openalSoft +, minizip +, libopus +, alsa-lib +, libpulseaudio +, range-v3 +, tl-expected +, hunspell +, glibmm +, webkitgtk +, jemalloc , rnnoise -# Transitive dependencies: + # Transitive dependencies: , util-linuxMinimal -, pcre, libpthreadstubs, libXdmcp, libselinux, libsepol, epoxy -, at-spi2-core, libXtst, libthai, libdatrie -, xdg-utils, libsysprof-capture, libpsl, brotli +, pcre +, libpthreadstubs +, libXdmcp +, libselinux +, libsepol +, epoxy +, at-spi2-core +, libXtst +, libthai +, libdatrie +, xdg-utils +, libsysprof-capture +, libpsl +, brotli }: # Main reference: @@ -20,10 +55,11 @@ # - https://github.com/void-linux/void-packages/blob/master/srcpkgs/telegram-desktop/template let - tg_owt = callPackage ./tg_owt.nix {}; -in mkDerivation rec { + tg_owt = callPackage ./tg_owt.nix { }; +in +mkDerivation rec { pname = "telegram-desktop"; - version = "2.9.0"; + version = "2.9.3"; # Note: Update via pkgs/applications/networking/instant-messengers/telegram/tdesktop/update.py # Telegram-Desktop with submodules @@ -32,7 +68,7 @@ in mkDerivation rec { repo = "tdesktop"; rev = "v${version}"; fetchSubmodules = true; - sha256 = "0964as7rkjq1px6z15z6kmkiz4zw69wmm3namwn940bsja123qls"; + sha256 = "sha256-ZmhgBL5nbgrNLRmCHocqVNC3KtaLm4LUY1f4Xl8CvB4="; }; postPatch = '' @@ -52,20 +88,52 @@ in mkDerivation rec { dontWrapQtApps = true; nativeBuildInputs = [ - pkg-config cmake ninja python3 wrapGAppsHook wrapQtAppsHook + pkg-config + cmake + ninja + python3 + wrapGAppsHook + wrapQtAppsHook extra-cmake-modules ]; buildInputs = [ - qtbase qtimageformats gtk3 kwayland libdbusmenu lz4 xxHash - ffmpeg openalSoft minizip libopus alsa-lib libpulseaudio range-v3 - tl-expected hunspell glibmm webkitgtk jemalloc + qtbase + qtimageformats + gtk3 + kwayland + libdbusmenu + lz4 + xxHash + ffmpeg + openalSoft + minizip + libopus + alsa-lib + libpulseaudio + range-v3 + tl-expected + hunspell + glibmm + webkitgtk + jemalloc rnnoise tg_owt # Transitive dependencies: util-linuxMinimal # Required for libmount thus not nativeBuildInputs. - pcre libpthreadstubs libXdmcp libselinux libsepol epoxy - at-spi2-core libXtst libthai libdatrie libsysprof-capture libpsl brotli + pcre + libpthreadstubs + libXdmcp + libselinux + libsepol + epoxy + at-spi2-core + libXtst + libthai + libdatrie + libsysprof-capture + libpsl + brotli ]; cmakeFlags = [ diff --git a/third_party/nixpkgs/pkgs/applications/networking/irc/weechat/scripts/default.nix b/third_party/nixpkgs/pkgs/applications/networking/irc/weechat/scripts/default.nix index 4b5d9e8333..ccbf78ec4c 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/irc/weechat/scripts/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/irc/weechat/scripts/default.nix @@ -7,6 +7,8 @@ inherit (perlPackages) PodParser; }; + url_hint = callPackage ./url_hint { }; + weechat-matrix-bridge = callPackage ./weechat-matrix-bridge { inherit (luaPackages) cjson luaffi; }; diff --git a/third_party/nixpkgs/pkgs/applications/networking/irc/weechat/scripts/url_hint/default.nix b/third_party/nixpkgs/pkgs/applications/networking/irc/weechat/scripts/url_hint/default.nix new file mode 100644 index 0000000000..90c98b8fe7 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/networking/irc/weechat/scripts/url_hint/default.nix @@ -0,0 +1,28 @@ +{ lib, stdenv, fetchurl, weechat }: + +stdenv.mkDerivation { + pname = "url_hint"; + version = "0.8"; + + src = fetchurl { + url = "https://raw.githubusercontent.com/weechat/scripts/10671d785ea3f9619d0afd0d7a1158bfa4ee3938/python/url_hint.py"; + sha256 = "0aw59kq74yqh0qbdkldfl6l83d0bz833232xr2w4741szck43kss"; + }; + + dontUnpack = true; + + passthru.scripts = [ "url_hint.py" ]; + + installPhase = '' + runHook preInstall + install -D $src $out/share/url_hint.py + runHook postInstall + ''; + + meta = with lib; { + inherit (weechat.meta) platforms; + description = "url_hint.py is a URL opening script."; + license = licenses.mit; + maintainers = with maintainers; [ eraserhd ]; + }; +} 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 a3a02455e1..0652ff8f7c 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix @@ -1,655 +1,655 @@ { - version = "91.0.2"; + version = "91.0.3"; sources = [ - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-x86_64/af/thunderbird-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-x86_64/af/thunderbird-91.0.3.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "e2c209ddd2f6589e3b1ff629b0fde65ce84b79de88ce63b4950c082c69733402"; + sha256 = "e9fa155cb5f1a2c4530cb568fbb2c4074f12232fa9949c2d5cdffb0d29c105d2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-x86_64/ar/thunderbird-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-x86_64/ar/thunderbird-91.0.3.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "554b79b721b5776d2408c00f0aa37ab0beb244aaa374e2701802417e15beb5c3"; + sha256 = "23264b0c80c0da6bbd4f10403c8a51429a36dd5befac65c6506d0b87ad18168e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-x86_64/ast/thunderbird-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-x86_64/ast/thunderbird-91.0.3.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "7a0e2092124c00d1844462c18caa23965e806c0e7fae7dd07940bccd96f3d9d3"; + sha256 = "3028d99c36c899ce52306d11b9c26e85266e6793b306627f2c4d4f2eae280024"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-x86_64/be/thunderbird-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-x86_64/be/thunderbird-91.0.3.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "b31781509ff194af3eee409e0e22e9cb82a69ffb4d4de418c4d854c14afb0cf7"; + sha256 = "0ca92e3875ea62e50449f576dfb7bb0e892bccd9093d623dc577262a3a386dec"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-x86_64/bg/thunderbird-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-x86_64/bg/thunderbird-91.0.3.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "ae275b3ad6771fbc67dc7a47046a9d7bd20259703c7d016a1d9934436ef2f4ed"; + sha256 = "7c4289991f83cc2b8f6bd57e1f81ca9f49635a7582aba1935737f7dd81fad795"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-x86_64/br/thunderbird-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-x86_64/br/thunderbird-91.0.3.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "c5bac788ae44cdcc89442d8bd5a07f50a936750427232b8e6bd9ea90d2e6fd80"; + sha256 = "d34baf04a9daa69bcb83d8f312faf0436142c2b5850790764628327677c956ee"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-x86_64/ca/thunderbird-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-x86_64/ca/thunderbird-91.0.3.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "0c578a299994e661c4d0d7e55128fef40449837d5da4fe45ed3992e3502bf305"; + sha256 = "ba561ffd34db81a6401754d80f6987da62ff043987a228842b4c4cf2e2008efe"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-x86_64/cak/thunderbird-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-x86_64/cak/thunderbird-91.0.3.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "f5b49ed118b8e1f8b2b78f823455368ec895133f15e677377f0de6305e6e31dc"; + sha256 = "ec086e9a2709d953df3953d69eae2fe72b219b0191a04e9c8837ae16b6729adb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-x86_64/cs/thunderbird-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-x86_64/cs/thunderbird-91.0.3.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "202b566a366e8c1a3c0a147acc9cd9009256193ae01a586b413459c8c526fa71"; + sha256 = "960eafc572d6d45f549f295ae861fe6d95c98da159147bc8ef180177261c70bc"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-x86_64/cy/thunderbird-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-x86_64/cy/thunderbird-91.0.3.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "c1a4887fe96665d56fd8db662e6c78e8764eb75307a941ea73accac190de397c"; + sha256 = "ed664202a59d8f2de0fd8a9e1eb89b55af790316e03b4432a83f0d8356a0d115"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-x86_64/da/thunderbird-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-x86_64/da/thunderbird-91.0.3.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "7de010e7273573ada2732af1c466391d94d645d53c6dd148034cbb62d8c3b217"; + sha256 = "914f30fe4b271ee3f9842636286411c0d2ceaaa7cd93dab139c45db3090fd9df"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-x86_64/de/thunderbird-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-x86_64/de/thunderbird-91.0.3.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "ad93a79718d5d5477e5c2d5491cc5e3a8c5669efaa657252dd959e8ffa4dc464"; + sha256 = "1d0cecb39dd7e9361cef22705e2d8590d25afc6f0b23c9058a2f19c4a8dccc48"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-x86_64/dsb/thunderbird-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-x86_64/dsb/thunderbird-91.0.3.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "66004909207ef8c51d3d41ada64430c9714162e2d6343cf4434b65f5835d0dc7"; + sha256 = "5d857231f6d061b0b7f508801dbbabd872e7048b91b9fb685fa53c211003d0c8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-x86_64/el/thunderbird-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-x86_64/el/thunderbird-91.0.3.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "fbc2fce4edae1dc07fe689e7bd69be035b3fe62f64cba0900dfeef8d7dd62c2d"; + sha256 = "4b8353aae1f416acfc39dd8dd62a121bfb4e722da3907e7be433af294e87680a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-x86_64/en-CA/thunderbird-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-x86_64/en-CA/thunderbird-91.0.3.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "8c5e0ed9cfea8158523df50bf8b680d6541ece70192dfa0b3e12e89dee0d6353"; + sha256 = "68e404576c3fd4a619a3965298e5198bd507a6f6206c2723eebbb41063163e06"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-x86_64/en-GB/thunderbird-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-x86_64/en-GB/thunderbird-91.0.3.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "a63975d61c4474123dad2d8cc0f4324f16bb5812c61ba4d7a22c08a2fdb937ad"; + sha256 = "06aa97bc593ae38d9cceed6ad91db90edee7d73a0f36310b9cc67b274fa7120b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-x86_64/en-US/thunderbird-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-x86_64/en-US/thunderbird-91.0.3.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "0e972bc7910dc9afe82a89cfd45d60cf0ed6f1b0c6adb86169e474c1699dff18"; + sha256 = "e16e01e5dfc6f9da50809ee063d3873f9039f68e975a70ecec8de2de07893712"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-x86_64/es-AR/thunderbird-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-x86_64/es-AR/thunderbird-91.0.3.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "264cdb8e096647552ddcc91ae47f2404a1f280c964595e98426924f4ac201293"; + sha256 = "313f2ac3b4dad0fb6952d9717cfd957efcd676771f4fca0c89848185bd1b4f9b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-x86_64/es-ES/thunderbird-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-x86_64/es-ES/thunderbird-91.0.3.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "b258c31278b5c75a6fb29aa4be29a60ec1ac3344a7b1eef449a8c52d936aaf75"; + sha256 = "e6b2b53c901051602f4d1f8827b3daad1783dce24bee856cea8aa7ae4a536ca9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-x86_64/et/thunderbird-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-x86_64/et/thunderbird-91.0.3.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "dcd630338623c5b24733800e231c5a75514577a20329e9660011c7b2b13600cb"; + sha256 = "4f5801287495d738b7757c85a150e6ac8cb5ef22b056e899b74a26425a2ba165"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-x86_64/eu/thunderbird-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-x86_64/eu/thunderbird-91.0.3.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "cd548c58e9c51e91812266a57e2260a8076d4be5130e6507563b17af51c35d85"; + sha256 = "b90304636198df5b90965073aee3f333e6f69686ba6ebb2b87f4f8ea57bae123"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-x86_64/fi/thunderbird-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-x86_64/fi/thunderbird-91.0.3.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "6b7bc8ea396f46be383d7667a97ea62512fc1869a53f023b764990c9c26e186c"; + sha256 = "0548dd85e75c60e4d6aa46054d548ff2d826ec669607c3f35a4c2010ca2c661b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-x86_64/fr/thunderbird-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-x86_64/fr/thunderbird-91.0.3.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "76fcc5ac921ec8a4eddcf7f37d5f97f38e72e7d0760b1df7c6375dac2fe0faae"; + sha256 = "1fca39902328c4808e7851f3596ca894d8f9c43c12a4f8795802f325f58b62d5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-x86_64/fy-NL/thunderbird-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-x86_64/fy-NL/thunderbird-91.0.3.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "76afc70747bfae0ab55d76b440161fba946417d9a9f959006746e48c02922cf1"; + sha256 = "1120b79a6ce2a926c8b539aad09e6d574d103880ed0623f6e13ba0013c606310"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-x86_64/ga-IE/thunderbird-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-x86_64/ga-IE/thunderbird-91.0.3.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "793d6941c844dfa6c53e5d9bbde70101efb4f303b7f4b07b5f8cbb7f44c41033"; + sha256 = "67d912e2b4d70b553ff9ad2106beab3cf9495fd24a5e947659dd900f576c515f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-x86_64/gd/thunderbird-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-x86_64/gd/thunderbird-91.0.3.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "311bcde1dcf00b3e21593300e7e05afe1b66531864340046c39b34ceabbc0c04"; + sha256 = "5ce277a93edb95dcb9e645f353d9b48181db8b491303ba24241e9833f9d52a8c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-x86_64/gl/thunderbird-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-x86_64/gl/thunderbird-91.0.3.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "2c7beb30c95b5afeb51ffd5d952dd96990fb997aa00f98811a7e656ec0d15293"; + sha256 = "b57d5a4fb9c14fbdbb6de402d0469d681b2f5fc5a7f8ed51b1defc0da672cb8b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-x86_64/he/thunderbird-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-x86_64/he/thunderbird-91.0.3.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "864c0160562fc593109ef4afc0f7871eb881e32277131ea39c2e86358de2b287"; + sha256 = "cf4fdcce74dcb24ad180f45b31e8165e23ebcedaf28c867fc74e4ac8b79da5dd"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-x86_64/hr/thunderbird-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-x86_64/hr/thunderbird-91.0.3.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "053af50f6251daadf2cb8a77157d15bde93f12b913dca64537a533e0937c9f69"; + sha256 = "8d26131d28ee06df1ce63eb21db285f752dac4d3ae71d5c2349c76630e6ebd13"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-x86_64/hsb/thunderbird-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-x86_64/hsb/thunderbird-91.0.3.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "e4cfe2c9136702a928a761c0d5da9429ab3002076c0248ddc12c13de7bda90d3"; + sha256 = "7d38fee7c4a897d01f0e2254c5094962a7ae1908f071b32510bae408d3647bbd"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-x86_64/hu/thunderbird-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-x86_64/hu/thunderbird-91.0.3.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "cd620884dbc0b88454860fbd46a3ab11577396ba758c1e04d2e9f379ed131bd4"; + sha256 = "7271548b70d0d378fb191ca2932b7382d9f5dcc4072eae9c4db0e3260558a97d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-x86_64/hy-AM/thunderbird-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-x86_64/hy-AM/thunderbird-91.0.3.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "4ffaa441ea2dcd474d6ae4ec10258ecee85fd986901860d91e96b415bd232120"; + sha256 = "06d9de4a86cb0791f2c3ea683a637ec5965f9014c656b142601e9c3753231067"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-x86_64/id/thunderbird-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-x86_64/id/thunderbird-91.0.3.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "2e64539c1591c88bfe482befcca6aa609b0352a9de45df24d5912a15058bbd01"; + sha256 = "51ae3415517df352525750a4926e4587f5edce09f88294670a7cc5c5fa830ef4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-x86_64/is/thunderbird-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-x86_64/is/thunderbird-91.0.3.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "84452b732eb0c2b05346e21444e798a868ad90a9c574876cc6234cea69609ad0"; + sha256 = "d7e9406a3a782bf0e4b80caeb42c1607fa3d45e9982550dd17ed1b7cb7279950"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-x86_64/it/thunderbird-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-x86_64/it/thunderbird-91.0.3.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "420cee754b96b8acddbbd29fe880fb364b0456cd64099d829a8e2aa87faafbf6"; + sha256 = "7d6005c6017f87e0374833106de045f9115cbc3ec1825429315a928f3ad19db1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-x86_64/ja/thunderbird-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-x86_64/ja/thunderbird-91.0.3.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "60508f7520e2457a71c4017afb7426f5800e8932ab5fc8b7b84cb20a8d057668"; + sha256 = "7930323cecd2002b37baabf771f1f9a4be304d7b84ce9dac4bab6856d7f9f1d3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-x86_64/ka/thunderbird-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-x86_64/ka/thunderbird-91.0.3.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "1145f89f523f9f7fa4b4030fa0b113150b7188d475a55463bca9600ca0ee2e19"; + sha256 = "10a9e2a23bcde3c94f72701849e3ca0833cc9dbcb821eea65bf412a5feab5ddb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-x86_64/kab/thunderbird-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-x86_64/kab/thunderbird-91.0.3.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "25422658dae8b53a4d72840da7aff4bc70cdf94d08444913c4ac06d49c6e3356"; + sha256 = "12e1ccc30b98bb9a363ab824187c5504fd2c14cf0891455681730968cb7e8126"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-x86_64/kk/thunderbird-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-x86_64/kk/thunderbird-91.0.3.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "0cefe7e7d93d8d3603fc13a34ffff40d0535713f4ae362d34ddeb3fa4ce8b2e0"; + sha256 = "3de1bbb675ceeff35e1a8e581e8c6a200dd68e97bb9e363e5d6b42fd6a9420c9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-x86_64/ko/thunderbird-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-x86_64/ko/thunderbird-91.0.3.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "3644cdc76d557ee2994c4ba4f16d9d2ec66a06a163fdee30a91aa7b8b75f8ab8"; + sha256 = "a7b011c57df5ee00dd80a6ff9df50f957190c14156e8e3557480177a73ac2379"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-x86_64/lt/thunderbird-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-x86_64/lt/thunderbird-91.0.3.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "33371b11574309d011968b0ec7cab94b5a61f7629b60ecb888897fa9d1ba0445"; + sha256 = "fc59f081a579f837afed05b394a8f503f8c24a10c282aaacc522f3fc873281e1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-x86_64/lv/thunderbird-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-x86_64/lv/thunderbird-91.0.3.tar.bz2"; locale = "lv"; arch = "linux-x86_64"; - sha256 = "9460f51bc9a27c7fc69d425cfa013a6b45603764055b0f31cac38e8c5092ee5c"; + sha256 = "c2e43c9f3bcd1889f40917238b6da71919c4ed248ab507bb71d74882d7ea2e27"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-x86_64/ms/thunderbird-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-x86_64/ms/thunderbird-91.0.3.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "a2b2d1bbba8f5469465ff5b301d95f37453e22b7cc259d33b81382debf056889"; + sha256 = "6bf1c022f9384894e4047d7d96e3236cf92427ba6de99a0d650e3da985ff7698"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-x86_64/nb-NO/thunderbird-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-x86_64/nb-NO/thunderbird-91.0.3.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "dbce148234a027c3118d94aefbf77a5ed6b5f0dcb636704408c326c08c76e474"; + sha256 = "82797bc5227b429a51801f60edf485b62c774be19c9befc055d695f9e4ba4e47"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-x86_64/nl/thunderbird-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-x86_64/nl/thunderbird-91.0.3.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "bd99d05225bdaacd4ae1cfde09da0b8667427f7723f48b5ad41c13d09b4e8656"; + sha256 = "0e07d3cea432f914d17016998d5a6cebfe43549e1fb4599f0a92cc73c265fde4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-x86_64/nn-NO/thunderbird-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-x86_64/nn-NO/thunderbird-91.0.3.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "1d48d681562120c52ac5042937406422d0264343f43720bc04870331a3b888ec"; + sha256 = "70dc2d1d427bc93105fc6cba79c27e9f5062a6a9572c5adbe55bad737e359bbc"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-x86_64/pa-IN/thunderbird-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-x86_64/pa-IN/thunderbird-91.0.3.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "271008a2f327abda4c140183e966c9acd6116577ac4bc13db7ab674d40b90206"; + sha256 = "2e07c0661e29e35bc42360894dbc5d4ca0313a3da9f2b96ddcc82936665339e2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-x86_64/pl/thunderbird-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-x86_64/pl/thunderbird-91.0.3.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "da0960c222b4625f717991f2e3f7fb5155c35ef470f87f2d9387469401bac62b"; + sha256 = "5f16cafaa287f67dd33eebd2f0cd3d128b0d0c7119c0721de8e5434be4dbecd0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-x86_64/pt-BR/thunderbird-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-x86_64/pt-BR/thunderbird-91.0.3.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "160cca291d27bfcc6d2196090814378110a210c8ab6d62f5296eb217be4c9e3d"; + sha256 = "6e1eb47c6c794f27d7cbb442954450fafc5d22a17c6c4e53dad80d38e8e4a885"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-x86_64/pt-PT/thunderbird-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-x86_64/pt-PT/thunderbird-91.0.3.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "1b4fc4a92388fa1cfac33f9f77e7f5e2f9c7088ab81b1eb3f8346bd77dd3f08a"; + sha256 = "606df5acad3221f4f9eaf9da7c0b6ad30bd8b87ea71dae30b93796342315ea51"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-x86_64/rm/thunderbird-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-x86_64/rm/thunderbird-91.0.3.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "cd78d4e737fc6c1b3121472e453ac3a20e7f1451b648e6b56e811bb8b05a5bb8"; + sha256 = "efe31e78f7e6a6351366186e608c680533c89c7947575792b05ecf706727af89"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-x86_64/ro/thunderbird-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-x86_64/ro/thunderbird-91.0.3.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "e83ed778d455ac6c892caa75ee14d8bee7f232f8fce9a72555f3fa7f2a9cd7dc"; + sha256 = "a9c829b1e367ea7ce0176901fd07e6c5f67c8d5d178a7e998f01859c53f59ecf"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-x86_64/ru/thunderbird-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-x86_64/ru/thunderbird-91.0.3.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "110a6bf1fd3bfb7b24799b3d12c6660730ccd43b687c82159201849f1a17b2c1"; + sha256 = "94c4dc9fbacb07942978decabd0f9e26fe5183c671f865c6a93e906aebbc0254"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-x86_64/sk/thunderbird-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-x86_64/sk/thunderbird-91.0.3.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "26fa89742dabf2929f81a0882ce527330aa63bb67af9066e2a041cc4a330857c"; + sha256 = "3a52978887a7c52d37704f264f8ec640f6110ea64b568995794ce62b6ae86228"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-x86_64/sl/thunderbird-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-x86_64/sl/thunderbird-91.0.3.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "93f4a4c327a3ed6270d9765bc466bfc03bd4c6fc457f933f7131a77768209ea4"; + sha256 = "c2b3b28c3bdfa969af465a9aa5dc75334f7372a6317df6075ba7d594f52c0294"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-x86_64/sq/thunderbird-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-x86_64/sq/thunderbird-91.0.3.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "bdfe099edfd92ca449f9db5b4207ab1bfc5660964a99c69301f309bd7f4405e2"; + sha256 = "5524ce37c39018b9b60034ca06b3cd5f862149b7885733af8f840e1b39f13865"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-x86_64/sr/thunderbird-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-x86_64/sr/thunderbird-91.0.3.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "be61663f615151c423d1551419bc36c43b74ecb406ee70a66781a4c931d5db1b"; + sha256 = "8cbfac96a6ce6d35dd68d6d4cf9fcafc146e69a81bc8144f6407621fe992fc1a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-x86_64/sv-SE/thunderbird-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-x86_64/sv-SE/thunderbird-91.0.3.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "cea5ade716541897197bdabd7a2de2cc78d478b6bcc2be19bbbe3cc327544f1a"; + sha256 = "6887854f7efa083f25a21874becd7e34c4b57a35b3898a790ad9988415f143e2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-x86_64/th/thunderbird-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-x86_64/th/thunderbird-91.0.3.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "42ae7ae92f60d466f1759170b7516191df49cdbffd8f792c69635839a91c82e8"; + sha256 = "0e220caaf692550e8424c64bafbc3b9f5efb608fa8dc54f007c9e378e1bc9ec6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-x86_64/tr/thunderbird-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-x86_64/tr/thunderbird-91.0.3.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "d087650517976df85e38ee95bafa00f50e878870d5c8b4d3227436c1d238aab1"; + sha256 = "7c0d780968a1dab36372320ca47ea812e2b522074ba124f29472026d5ee88f73"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-x86_64/uk/thunderbird-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-x86_64/uk/thunderbird-91.0.3.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "0963c779f56aa7e102e939cad8c3cb2c91013d8a6a1c81e1b95f9bd59b0707fe"; + sha256 = "34c1e098b7746bfeb531886463114479278d98de450136d49c594f30f537a07e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-x86_64/uz/thunderbird-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-x86_64/uz/thunderbird-91.0.3.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "18c5ef666ccd0e4ea82d705ce96a654546b5eeae66bbec27b74987174bce5c28"; + sha256 = "edeee2d40fe634bc34733511895f1345d8b4e0eed49fa5ef8f5598245884c20d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-x86_64/vi/thunderbird-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-x86_64/vi/thunderbird-91.0.3.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "ae59396c600ac3c13e5c4a7bb45439b7ac8ec31305398c0f943a542686410c35"; + sha256 = "2d51311b5e8811254a1a8b68236f60029e3ac8f3528c5d46bef0040917b520f6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-x86_64/zh-CN/thunderbird-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-x86_64/zh-CN/thunderbird-91.0.3.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "cb6d6648c683677b7513196b883e51666a175b3739dd45fa2c6e2e84869d9257"; + sha256 = "23a97b03c84ba34164a2ea3a80444040da404bcbf702c171e45a12bf1220623f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-x86_64/zh-TW/thunderbird-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-x86_64/zh-TW/thunderbird-91.0.3.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "8bde8041417693842644ae183a7830720be03c02e699d7d5c1d472724a0b8687"; + sha256 = "66e3a359752d1a1dabb881189e9a898729f273b420c57c94c5bfa459967cb364"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-i686/af/thunderbird-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-i686/af/thunderbird-91.0.3.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "b68bfdc320c42caa0b53e84c8ec6d5894079738f2fed7a9eb961b7d809ab2eaf"; + sha256 = "369393b32dd642c757c86f793be6acbf5d9b2cb4e8b893e76cbc422964ef5df2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-i686/ar/thunderbird-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-i686/ar/thunderbird-91.0.3.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "6ba45770a09dbebc1ca5c496374e9cc4c0bdefd19b3c3f384d6829e801ca7224"; + sha256 = "c1cf67bf674031da9c0d6d9aa76c86acb89a6227b029f9b0b80f555d6bb46a4f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-i686/ast/thunderbird-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-i686/ast/thunderbird-91.0.3.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "76ed8764f119a56c1398dccaf6385c92936f84f959cbc38372c866cff653f93c"; + sha256 = "7eb25e0238fcbcd779bd1c0ccb6193750f88aae4eec8544b0ca98734c9253259"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-i686/be/thunderbird-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-i686/be/thunderbird-91.0.3.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "5509d1e4f98fba58d7b5c7dde1ec531eaf3439a22bc8e9eb0843dcbed4d094bf"; + sha256 = "8ae8e53c28005eefd99ea21109fd100359a7a157a72558882781b4fa28420adb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-i686/bg/thunderbird-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-i686/bg/thunderbird-91.0.3.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "28e6184008449d72dcd0d03c9ffd25eef0746100b67c7cf0684b40d9a7a52870"; + sha256 = "ea01a55258e25c897bf5792f0001bfc332aabefbc09ef24d5cc145831ab3a48a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-i686/br/thunderbird-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-i686/br/thunderbird-91.0.3.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "35915f0edd5b0a63b531a8eec680a6403866e0b8f25765cf8ed26344fe82c0a6"; + sha256 = "cdef12d70df4a407adbb8c9f370daed965d20b243433942cabffecdb3a225737"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-i686/ca/thunderbird-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-i686/ca/thunderbird-91.0.3.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "7f869a4728c1ecff758486707836b565897f68f6cf4b13218f0555f9a758630b"; + sha256 = "01864d608a98d179cdd2d67480c650c4764d883b4b6a6d9d73256112d5eccffe"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-i686/cak/thunderbird-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-i686/cak/thunderbird-91.0.3.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "5d512196774e8ba63439a2545c30ba7ec11f6c6a0967642b0e7e58629a036f31"; + sha256 = "968fdc7d1feb0247f159489e6600a8e18ef1715c355418e7341de193da418d26"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-i686/cs/thunderbird-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-i686/cs/thunderbird-91.0.3.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "31ee6eff33541ceb69df9ce1b5fe7ef43e2937bfd0c306611e3e35a698cb6308"; + sha256 = "fbd819e3f5a3be0d0624472b902af1f29c18cf3c9e524826882efacedc6965fe"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-i686/cy/thunderbird-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-i686/cy/thunderbird-91.0.3.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "07dd83614f7920e2f49b9455b9b2734a2f8a8a555f46691b9a4a34a713c6a035"; + sha256 = "f2ed1bc1544046b30ecffaeb62ec09328da115eb7d5da9ae1bada33960624917"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-i686/da/thunderbird-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-i686/da/thunderbird-91.0.3.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "59132d98c63574619e23d49013b7e7e8927c348c2ff1a4f0b990c23e1434bcce"; + sha256 = "f1b7fcb4b904bab9b1e669505d477225b5178dcf3b0ab7ebae5d45092284b04b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-i686/de/thunderbird-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-i686/de/thunderbird-91.0.3.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "22a6a5a2f3cf61570c52d5e531fa6ffd022f83834db61732b79cb0f801234a15"; + sha256 = "8f8c81448ec9c82d18d764ba323577687381d67b839a804eec6a48709866a334"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-i686/dsb/thunderbird-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-i686/dsb/thunderbird-91.0.3.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "9a7702a7a2872ec6088cfa0067d4c2bec9c9ebe9ff31a3ae0f50c797eea1d024"; + sha256 = "8ff175908da6d2032f47d0a74c58576b1552c0e9bf304b678c66c43f9e282289"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-i686/el/thunderbird-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-i686/el/thunderbird-91.0.3.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "13369e948d0cd936a9636e065b9455dee760c282b243b5ad4e932dd935ad0eca"; + sha256 = "da644e9386ff3526a9332869a240ed07b15f40c57a90eaa0678f1d5cad58bc79"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-i686/en-CA/thunderbird-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-i686/en-CA/thunderbird-91.0.3.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "e5e2ed3c68f03b443874f835b8303491dff70ed30e29515013786790bf333506"; + sha256 = "fa5fbc0e60a93ec657a9c8a8140c1318423c5a58e1a6df70706095347a150780"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-i686/en-GB/thunderbird-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-i686/en-GB/thunderbird-91.0.3.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "35422b96dabf6dc2baf470916459dcfc672ad9fb1a6fb842c28f761963766357"; + sha256 = "db11e5ce13b48cb2d8456c2c542eb24adc51fb6d0151b49459b894266fb62b4d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-i686/en-US/thunderbird-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-i686/en-US/thunderbird-91.0.3.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "27c43ab01a49c936c3864282c54bb952f0e62330afac3eefd8848e58f99c43b5"; + sha256 = "b76a3db6b41ed843471fdec8394b58ddfd231d6ff7575ebe650f0c5fa91535e7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-i686/es-AR/thunderbird-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-i686/es-AR/thunderbird-91.0.3.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "205fc7ba9311aee475c4057b933246bf98bb06164fc1a0128d96cbb42cc4ee4a"; + sha256 = "f1182cbc6f3760555ba41a4d2db415519f2a2f2c6c7c6abde94f6c72b5864a52"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-i686/es-ES/thunderbird-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-i686/es-ES/thunderbird-91.0.3.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "a560e4a2d1ece441f122dab0a27a25ba0d3b46cdebd9ebaa9b63f1e4d293c563"; + sha256 = "19e538e90ee435ee29e347720fea42eca5533e4025ef285820c18c62e981023a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-i686/et/thunderbird-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-i686/et/thunderbird-91.0.3.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "60016f69a705c7f953014cbd546d483d3261cc70be2d10a5c3c1012fcc1d88f0"; + sha256 = "c3ca7abbd340306b30ed4a60c8f238d18d06be11fe3ffaa9b1bb917f629bdd31"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-i686/eu/thunderbird-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-i686/eu/thunderbird-91.0.3.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "2c2da546ac66bad5e4e86fc417407497b9248529528d0c348a9be45ad50ff95e"; + sha256 = "27c4d06f073e52c631a46174eff52b4dbc8db509f08e1e394a46552a56a8798b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-i686/fi/thunderbird-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-i686/fi/thunderbird-91.0.3.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "ff8ecc121ef8c05e38f75b44602ae27363f9c27002507ddc263b0fd133a3a6d1"; + sha256 = "57ef2dff097e9cb32ffd4540925c798e13174ee3f6d08473c745952cc2efcf71"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-i686/fr/thunderbird-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-i686/fr/thunderbird-91.0.3.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "bbe6c436894d25a1becb9e83b1640b63a35316468a55a20acc6991b3856c12f4"; + sha256 = "3e4bf7cef09c1c2f787ff37f07fb3284b03d5b579330b6cb0fd1a3d9f5ac137f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-i686/fy-NL/thunderbird-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-i686/fy-NL/thunderbird-91.0.3.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "bf5dbed617af49fd952f21ec795c9970956277a7f380802f8cf28705dff5d045"; + sha256 = "867e4f64830ddd7918fd6f1e1f5a4814b174d4ac21ce1755691493b852732742"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-i686/ga-IE/thunderbird-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-i686/ga-IE/thunderbird-91.0.3.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "b04348cbdce3b99cc0de580ef6aded2a946e4f338873c1069c86feab35f8341d"; + sha256 = "6e5bc42c2e923d37c843b1b971a8afccdaf1de3b271bdde003f58aa2c43c09c2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-i686/gd/thunderbird-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-i686/gd/thunderbird-91.0.3.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "350b1806e3504a57cd54ef89f424f634f89781670427773bec00bbeb9d4712a5"; + sha256 = "d0138ebe2ae5550f5d911d6ca8f0a27aa27338de7cd948b0665ec3e0cdee0947"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-i686/gl/thunderbird-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-i686/gl/thunderbird-91.0.3.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "d9196254a829834a222e007177218a295629efc635052336a8c855e08f1bccd4"; + sha256 = "233b0fc6394a3dd6c96fa3fd800e4254c5cff026bc6d91e53d872f46de06895a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-i686/he/thunderbird-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-i686/he/thunderbird-91.0.3.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "47fb607ce180dd9dea8ee1e011c8a37c02e23a10e2c4de6c40e0c86ae069e533"; + sha256 = "73b9546fb5b7a98be1f4431b374e0ebe59557a765747e04688b0a0319b30c845"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-i686/hr/thunderbird-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-i686/hr/thunderbird-91.0.3.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "a3c3266a345bd6a8443059d11c9dedd3471b5904812d8ff08d94283d439f32a7"; + sha256 = "c500cf6adb60131010054d5f99976559ac2f7f2e83799715c5de0e62765df71c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-i686/hsb/thunderbird-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-i686/hsb/thunderbird-91.0.3.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "10e599806fa3064a57482d4c4b69e7fa3c98327fdc47c0a0e4709f9ee385ad01"; + sha256 = "e67b1e15c968334476ec5775e68893dcffd1dae7ce012ef95a9c97edd506be3b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-i686/hu/thunderbird-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-i686/hu/thunderbird-91.0.3.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "d57356a47cebcc96c57199363df10a0aca1178683343021e79c9e7e0c03f62f9"; + sha256 = "7b452c3dcf394c04f534c03f55f5fd0cad1c4026a818676e85ac57a988f6ca3f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-i686/hy-AM/thunderbird-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-i686/hy-AM/thunderbird-91.0.3.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "32773d9daa46251c1eed72eba229d7567b693681fb46d2da966eb67d025bd020"; + sha256 = "36b89d8d88a80fc1964eb56895df0da4e75ec64837fdca3cfd0681ec14375889"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-i686/id/thunderbird-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-i686/id/thunderbird-91.0.3.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "6d205b1905d193285a2ad1cbcbb1fbf4e1c71cccc9a54f63daa120179e77bba6"; + sha256 = "f91517767696f5b248cdea262dfaf7b7a2fb6a0542481cb1ceba6360c0aa5497"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-i686/is/thunderbird-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-i686/is/thunderbird-91.0.3.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "0fa18f5b9e9e1e3549fcd109fd4dd8392d7573b9429a61053b54b0538efd5b94"; + sha256 = "427f4e82a60587ebfe30987c21731840010dcb92471814501237ed5efe78e866"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-i686/it/thunderbird-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-i686/it/thunderbird-91.0.3.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "67034f9a604606cf6a90b5699b46d12b76957da77336255dee1adcf6dfb4a2e0"; + sha256 = "92f3e2bda56bdd4fccf431103ecfbfd897959e3bc2c15ef64fb1bafe3f8ff15c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-i686/ja/thunderbird-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-i686/ja/thunderbird-91.0.3.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "259a236852334eed51f3e922c3e4e74810b8d9d82f2b6e1486cfdfb9dc659ed9"; + sha256 = "9fb9f0f323246dc94045c6bb09c74d98bfba1005b8b0e68bca843ef34d363b73"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-i686/ka/thunderbird-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-i686/ka/thunderbird-91.0.3.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "93bac3418c44519c9b9eae6d2cb030b18262f6c586b4480b3e5d828faf18afcd"; + sha256 = "5b4d7c8a6d8818fb9e336e0b595139138be5a4fedcbafa0895a62aceb8ef6007"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-i686/kab/thunderbird-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-i686/kab/thunderbird-91.0.3.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "1487aeef3d2b2eecdaac1463e35f04789e155e2d1f0f43e47be81da3abe96e33"; + sha256 = "7661d1af8b25f727219f75ddc0e9c5c75f36d2a84b2af27ac09b548767f01c5b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-i686/kk/thunderbird-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-i686/kk/thunderbird-91.0.3.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "1d3b7a92a8206d1fc0af0f86e26af218f073cb6f4f4dc3519366552f48bb932d"; + sha256 = "a0db8097caceb8f3d58e4c77ee137790b087c569587a06c78cbd5aa2d9b2819d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-i686/ko/thunderbird-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-i686/ko/thunderbird-91.0.3.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "913757dee44a98d85b337f07a743d588a1bdf9425c3f5cd2fb4985fa59340e5f"; + sha256 = "5352f1d9fdff63913c137aa54b5d16893a374c0f1ca245f6de3a4f17ed7d8f47"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-i686/lt/thunderbird-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-i686/lt/thunderbird-91.0.3.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "c3ad9eccb96a5762bff235f95640c01c7a55d09e8ee613aace4cc26ad36aa60e"; + sha256 = "a3bc0caeb2c1c3f81e3d705186ccc83e831c2f094742e93304483cc61666e3ad"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-i686/lv/thunderbird-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-i686/lv/thunderbird-91.0.3.tar.bz2"; locale = "lv"; arch = "linux-i686"; - sha256 = "125e2c82c1daed6ce109f3585e471d4037e531aec7a4998438cfe5f0614884ed"; + sha256 = "4bf8b846a0ffa95a3e74a9dc7a05f5283abdb907529dac2ea346570d7e5e4d97"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-i686/ms/thunderbird-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-i686/ms/thunderbird-91.0.3.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "17deff39fb4dcbbb23d932db247f12528a994ec48d9ce32831148841c38e2b58"; + sha256 = "4d0678116562ab28a7a4bd1ca39b94f87e2f09d79acf2baac51b69c179cf8207"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-i686/nb-NO/thunderbird-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-i686/nb-NO/thunderbird-91.0.3.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "e6f19f4fa520c092db1c0eee28393ff13e38e2214d7073f98cc68a56c5d4575d"; + sha256 = "4f3e467cb652e2c92631723ce599716f6e1b6ba9137aa2fd51bfdda2016b75b8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-i686/nl/thunderbird-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-i686/nl/thunderbird-91.0.3.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "3935d7bb85663ec84c6cab1c42406663b63e883c2fcb35673c156f38f3388a34"; + sha256 = "522186f15b6ff574e8b5a7c64d7f376d2bfcd148fb54b5faddb5647a23703076"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-i686/nn-NO/thunderbird-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-i686/nn-NO/thunderbird-91.0.3.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "a3dc079d6c64bf913728b70be84b9ee7266e368b287660f09e458a1c08ddf0b2"; + sha256 = "3dc1dadd4cb1af7bb11b4c77ebab20a7c43bd75639a866fcdc3a51099e078b0c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-i686/pa-IN/thunderbird-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-i686/pa-IN/thunderbird-91.0.3.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "e3587c4a2a6c479edadbd58228c5438af81ffe0031332a99bfc0d53b62794def"; + sha256 = "586e6a3fd41903dd4eef357207839d195c1eb7e40b152baa2394880db539499a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-i686/pl/thunderbird-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-i686/pl/thunderbird-91.0.3.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "f5c231f36c59669b7f8f2aa7936a29f0e0c459158fe271142c28561eb9586e09"; + sha256 = "2a064b763ae9b0b11d266cf413cec98f00ab6d350f44469a2dea4713ba17521a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-i686/pt-BR/thunderbird-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-i686/pt-BR/thunderbird-91.0.3.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "7c6286427fe27eae8f98ebca95ee36befe110012026909ee95e42b3bc9aae637"; + sha256 = "a897c43eccb7c91732e1fa623ff675877de014a176119ea049e9eadc579e59e9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-i686/pt-PT/thunderbird-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-i686/pt-PT/thunderbird-91.0.3.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "95ef322cf560ac3f428db9e2872168007691862e0a3f2d145713d52ab9da1a50"; + sha256 = "4aa4f70dad8116e2f6fe4dbd6c7bf7cf3c090b6f0e776dfde34c594bc785f33b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-i686/rm/thunderbird-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-i686/rm/thunderbird-91.0.3.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "68c40f4800e7cb24b2281eb5f69351b0592bea4a725a8abc2b634d00a1e8c759"; + sha256 = "f437ac48a9888abc4c63aa14c1e5561ea06a3e0287596fdae10f0f3dd071b0e6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-i686/ro/thunderbird-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-i686/ro/thunderbird-91.0.3.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "00e216d87a7a0bd4b3f852051449f130f98133c40dd5360bedae8322e6a270ab"; + sha256 = "dfc376eb4baac472c634b4b25c43f6eaebb27c98bbda68a5fbe905b545bcf858"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-i686/ru/thunderbird-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-i686/ru/thunderbird-91.0.3.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "997f644eca0b6341002c15b72f4c76e925c6581ccb90a2d1d8f2982527125688"; + sha256 = "3707b961d3b42b23a3883ebf091f7456521257f16fbf906aeda436e85019679e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-i686/sk/thunderbird-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-i686/sk/thunderbird-91.0.3.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "147af1d186d27113544f4c23d0158389ce349a40d4996ab0897e28809f914244"; + sha256 = "6361c53e1908c308929054a87a276e5a43d2eefda75edc4991e845e4055a59c7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-i686/sl/thunderbird-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-i686/sl/thunderbird-91.0.3.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "bc5bcdd54e391b380035450f89439c2338bc4aae8d79c4a553e580dababddc86"; + sha256 = "de5d84cacd50edd00184316d9122e881217017e78f0a73a79b745b130c58fb6d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-i686/sq/thunderbird-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-i686/sq/thunderbird-91.0.3.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "5700bda1ecd8aec35638aa007216079146a627ef330b901f919f177007e6bbd2"; + sha256 = "2ab70162fd53943f6a46c1c9459dadcd6e7ca5ee19c1bca161368739c74068b1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-i686/sr/thunderbird-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-i686/sr/thunderbird-91.0.3.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "648ac37b029ad458ff6759bf6cd06a696d3c02899f6e0d44ecab7a196bbb439b"; + sha256 = "4baaa9d43c1f4c9db85b2a12fa52cbe2d2807b5781ac5c7287901153c1b6c81f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-i686/sv-SE/thunderbird-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-i686/sv-SE/thunderbird-91.0.3.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "38c88fe79c505e9b14a778ae6a8f0ab8d291656ef7cdd1a995a7fe199811098f"; + sha256 = "6151beb596c9742345ee749239e1fcf983feaa8bebc06908fbfefbe169d8cb3e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-i686/th/thunderbird-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-i686/th/thunderbird-91.0.3.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "bead245a51de35bdc4474c04b813c4ce2175c01b7ad999f4f3b2f4587d811c77"; + sha256 = "e063338beec45e1d4ec69ac4c3502df243d98802dd1ce0df28634e003e5a0477"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-i686/tr/thunderbird-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-i686/tr/thunderbird-91.0.3.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "184dd779df35de1906022b32ef0c0b7c4e9555a38eb9ec432772a754efb4c1e1"; + sha256 = "38be40e163b0b0426318d20dca127f257861441e29b9d282f2fa352cfa2c2ccc"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-i686/uk/thunderbird-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-i686/uk/thunderbird-91.0.3.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "8778aba1428169a7a2195040a9c7e1d91d86f15bff554f18d402e1f3447a140d"; + sha256 = "ac1bdb90a15bc245b55e0dcda57e381ce9521d0fbcac240a55806c5ee859d90f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-i686/uz/thunderbird-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-i686/uz/thunderbird-91.0.3.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "2cf61ce3a966c41f5085a097dc0cda9136ae1d624d68e97a01d867ec14ad4d94"; + sha256 = "584cd95cc34193c868949d9aac3213a779cdedde14f6f3088657ab61d32197c7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-i686/vi/thunderbird-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-i686/vi/thunderbird-91.0.3.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "8f9a2b344b25b4cb91f2506515382729c27fd7e1de37c5d16dae51345cee790b"; + sha256 = "1725bbed0bba4e6c3fa7a44df700c4a04b47eaffda3189b8b6efff33d6e30c3a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-i686/zh-CN/thunderbird-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-i686/zh-CN/thunderbird-91.0.3.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "131c829617c6732d29e1a68499f190a80d464b3ede4f10caa153bdf8e59e7f3c"; + sha256 = "9afeaf173047c708595e0e58cbd6cdbd8a55b390420e100f4aea33597803c01a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.2/linux-i686/zh-TW/thunderbird-91.0.2.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/91.0.3/linux-i686/zh-TW/thunderbird-91.0.3.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "049625db5facdd176ac7fced757db678e9afb0d143d775f4c9f79d2cd334eaa0"; + sha256 = "60367168ee3e92774b040f82b5ec733be00c958ac6c2fa07f7821020a571158f"; } ]; } 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 1bc2c8b4a1..fe6ead5c8d 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird/packages.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird/packages.nix @@ -10,12 +10,12 @@ in rec { thunderbird = common rec { pname = "thunderbird"; - version = "91.0.2"; + version = "91.0.3"; application = "comm/mail"; binaryName = pname; src = fetchurl { url = "mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz"; - sha512 = "468be2f5024fd32eb22a661ed5f30de5d74231ee736e6743a9fb84e747bf45fceaaf286a5cbb20eb41f8ab98e0c56310eab3d2e6077fd81ee0ef52b28c33a3f2"; + sha512 = "1c7b4c11066ab64ee1baa9f07bc6bd4478c2ece0bcf8ac381c2f0774582bb781b8151b54326cd38742d039c5de718022649d804dfceaf142863249b1edb68e1e"; }; patches = [ ./no-buildconfig-90.patch diff --git a/third_party/nixpkgs/pkgs/applications/networking/nextdns/default.nix b/third_party/nixpkgs/pkgs/applications/networking/nextdns/default.nix index dadd17be16..4c0f9c1a0f 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/nextdns/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/nextdns/default.nix @@ -2,20 +2,20 @@ buildGoModule rec { pname = "nextdns"; - version = "1.35.0"; + version = "1.36.0"; src = fetchFromGitHub { owner = "nextdns"; repo = "nextdns"; rev = "v${version}"; - sha256 = "sha256-AWbUtzh1kJayhg/ssJUqUX4ywIV2Oy1BgTorhb+x3Vg="; + sha256 = "sha256-aYWnopMRN0CDFpiWymhFT+f7vbKaP2HpjekVIr2rsME="; }; - vendorSha256 = "sha256-EEDRJj5Iaglk0Y86XL/U512OjipBNJzcAv8Tb09a0g0="; + vendorSha256 = "sha256-YZm+DUrH+1xdJrGjmlajbcsnqVODVbZKivVjmqZ2e48="; doCheck = false; - buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ]; + ldflags = [ "-s" "-w" "-X main.version=${version}" ]; meta = with lib; { description = "NextDNS DNS/53 to DoH Proxy"; diff --git a/third_party/nixpkgs/pkgs/applications/networking/seaweedfs/default.nix b/third_party/nixpkgs/pkgs/applications/networking/seaweedfs/default.nix index 36518db099..40cf26962a 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.56"; + version = "2.63"; src = fetchFromGitHub { owner = "chrislusf"; repo = "seaweedfs"; rev = version; - sha256 = "1y9abk2i0qk5c00dnw8wvasy7dmmy6az8d1cf9bq0dwh8g8kylbn"; + sha256 = "sha256-sC7BUbI4BcNp7XqNtgxHuzvksyVFP+gXHxldQPy/7UU="; }; - vendorSha256 = "015qvd0h786z1iwv81i107z92mqhzldp1hkcsp75wzf4j7nmzxvf"; + vendorSha256 = "sha256-PEMc2NUiGKaolVGwviNRvtpVyhypWsJlNWZ0ysjy+YE="; 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 aa5175fca9..ae2dee21fb 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/shellhub-agent/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/shellhub-agent/default.nix @@ -22,7 +22,7 @@ buildGoModule rec { vendorSha256 = "18z3vwcwkyj6hcvl35qmj034237h9l18dvcbx1hxry7qdwv807c9"; - buildFlagsArray = [ "-ldflags=-s -w -X main.AgentVersion=v${version}" ]; + ldflags = [ "-s" "-w" "-X main.AgentVersion=v${version}" ]; passthru = { updateScript = genericUpdater { diff --git a/third_party/nixpkgs/pkgs/applications/office/gnucash/default.nix b/third_party/nixpkgs/pkgs/applications/office/gnucash/default.nix index c9390e70d2..22c9eef5d0 100644 --- a/third_party/nixpkgs/pkgs/applications/office/gnucash/default.nix +++ b/third_party/nixpkgs/pkgs/applications/office/gnucash/default.nix @@ -26,21 +26,13 @@ in stdenv.mkDerivation rec { pname = "gnucash"; - version = "4.5"; + version = "4.6"; src = fetchurl { url = "mirror://sourceforge/gnucash/${pname}-${version}.tar.bz2"; - sha256 = "sha256-vB9IqEU0iKLp9rg7aGE6pVyuvk0pg0YL2sfghLRs/9w="; + sha256 = "0csp8iddhc901vv09gl5lj970g6ili696vwj4vdpkiprp7gh26r5"; }; - patches = [ - # Fix build with GLib 2.68. - (fetchpatch { - url = "https://github.com/Gnucash/gnucash/commit/bbb4113a5a996dcd7bb3494e0be900b275b49a4f.patch"; - sha256 = "Pnvwoq5zutFw7ByduEEANiLM2J50WiXpm2aZ8B2MDMQ="; - }) - ]; - nativeBuildInputs = [ pkg-config makeWrapper cmake gtest swig ]; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/office/todoman/default.nix b/third_party/nixpkgs/pkgs/applications/office/todoman/default.nix index fc9f70094d..e01391519e 100644 --- a/third_party/nixpkgs/pkgs/applications/office/todoman/default.nix +++ b/third_party/nixpkgs/pkgs/applications/office/todoman/default.nix @@ -10,11 +10,11 @@ let in buildPythonApplication rec { pname = "todoman"; - version = "3.9.0"; + version = "4.0.0"; src = fetchPypi { inherit pname version; - sha256 = "e7e5cab13ecce0562b1f13f46ab8cbc079caed4b462f2371929f8a4abff2bcbe"; + sha256 = "4c4d0c6533da8d553f3dd170c9c4ff3752eb11fd7177ee391414a39adfef60ad"; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; @@ -28,7 +28,6 @@ buildPythonApplication rec { click click-log click-repl - configobj humanize icalendar parsedatetime diff --git a/third_party/nixpkgs/pkgs/applications/office/trilium/default.nix b/third_party/nixpkgs/pkgs/applications/office/trilium/default.nix index a1be66c56f..3cf7fd1eae 100644 --- a/third_party/nixpkgs/pkgs/applications/office/trilium/default.nix +++ b/third_party/nixpkgs/pkgs/applications/office/trilium/default.nix @@ -19,16 +19,16 @@ let maintainers = with maintainers; [ fliegendewurst ]; }; - version = "0.47.5"; + version = "0.47.7"; desktopSource = { url = "https://github.com/zadam/trilium/releases/download/v${version}/trilium-linux-x64-${version}.tar.xz"; - sha256 = "16sm93vzlsqmrykbzdvgwszbhq79brd74zp9n9q5wrf4s44xizzv"; + sha256 = "1fcrc01wr8ln1i77q9h89i90wwyijpfp58fa717wbdvyly4860sh"; }; serverSource = { url = "https://github.com/zadam/trilium/releases/download/v${version}/trilium-linux-x64-server-${version}.tar.xz"; - sha256 = "0jk9pf3ljzfdv7d91wxda8z9qz653qas58wsrx42gnf7zxn1l648"; + sha256 = "0qp37y3xgbhl6vj2bkwz1lfylkn82kx7n0lcfr58wxwkn00149ry"; }; in { diff --git a/third_party/nixpkgs/pkgs/applications/office/zotero/default.nix b/third_party/nixpkgs/pkgs/applications/office/zotero/default.nix index 53f021344d..74f05a0b40 100644 --- a/third_party/nixpkgs/pkgs/applications/office/zotero/default.nix +++ b/third_party/nixpkgs/pkgs/applications/office/zotero/default.nix @@ -36,11 +36,11 @@ stdenv.mkDerivation rec { pname = "zotero"; - version = "5.0.96.2"; + version = "5.0.96.3"; src = fetchurl { url = "https://download.zotero.org/client/release/${version}/Zotero-${version}_linux-x86_64.tar.bz2"; - sha256 = "sha256-ZT+qxNLjdG29DhyV0JXtgDHDi2gYPyKrZwgJOro5III="; + sha256 = "sha256-eqSNzmkGNopGJ7VByvUffFEPJz3WHS7b5+jgUAW/hU4="; }; nativeBuildInputs = [ wrapGAppsHook ]; diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/fastp/default.nix b/third_party/nixpkgs/pkgs/applications/science/biology/fastp/default.nix index e396c8597d..c4cae59d1c 100644 --- a/third_party/nixpkgs/pkgs/applications/science/biology/fastp/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/biology/fastp/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "fastp"; - version = "0.20.1"; + version = "0.22.0"; src = fetchFromGitHub { owner = "OpenGene"; repo = "fastp"; rev = "v${version}"; - sha256 = "sha256-pANwppkO9pfV9vctB7HmNCzYRtf+Xt+5HMKzvFuvyFM="; + sha256 = "sha256-XR76hNz7iGXQYSBbBandHZ+oU3wyTf1AKlu9Xeq/GyE="; }; buildInputs = [ zlib ]; diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/stacks/default.nix b/third_party/nixpkgs/pkgs/applications/science/biology/stacks/default.nix index 87b14a9508..89ac4c4962 100644 --- a/third_party/nixpkgs/pkgs/applications/science/biology/stacks/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/biology/stacks/default.nix @@ -14,6 +14,6 @@ stdenv.mkDerivation rec { description = "Software pipeline for building loci from short-read sequences"; homepage = "http://catchenlab.life.illinois.edu/stacks/"; maintainers = [ lib.maintainers.bzizou ]; - license = lib.licenses.gpl3; + license = lib.licenses.gpl3Plus; }; } diff --git a/third_party/nixpkgs/pkgs/applications/terminal-emulators/wezterm/default.nix b/third_party/nixpkgs/pkgs/applications/terminal-emulators/wezterm/default.nix index e67e28662f..19e3a1c37e 100644 --- a/third_party/nixpkgs/pkgs/applications/terminal-emulators/wezterm/default.nix +++ b/third_party/nixpkgs/pkgs/applications/terminal-emulators/wezterm/default.nix @@ -82,7 +82,7 @@ rustPlatform.buildRustPackage rec { install -Dm644 assets/wezterm.appdata.xml $out/share/metainfo/org.wezfurlong.wezterm.appdata.xml # helper scripts - install -Dm644 assets/shell-integration/wezterm.sh $out/share/wezterm/shell-integration/wezterm.sh + install -Dm644 assets/shell-integration/wezterm.sh -t $out/etc/profile.d ''; preFixup = lib.optionalString stdenv.isLinux '' 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 74f644e23a..6a765f8e8b 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 @@ -16,7 +16,7 @@ buildGoModule rec { subPackages = [ "." ]; - buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ]; + ldflags = [ "-s" "-w" "-X main.version=${version}" ]; meta = with lib; { description = "Quickly clone an entire org/users repositories into one directory"; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/ghq/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/ghq/default.nix index 28020f8536..b2f5346bbf 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/ghq/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/ghq/default.nix @@ -15,10 +15,9 @@ buildGoModule rec { doCheck = false; - buildFlagsArray = '' - -ldflags= - -X=main.Version=${version} - ''; + ldflags = [ + "-X=main.Version=${version}" + ]; postInstall = '' install -m 444 -D ${src}/misc/zsh/_ghq $out/share/zsh/site-functions/_ghq diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/git-bug/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/git-bug/default.nix index a90390ddd3..c08e68cc28 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/git-bug/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/git-bug/default.nix @@ -16,12 +16,11 @@ buildGoModule rec { doCheck = false; - buildFlagsArray = '' - -ldflags= - -X github.com/MichaelMure/git-bug/commands.GitCommit=${rev} - -X github.com/MichaelMure/git-bug/commands.GitLastTag=${version} - -X github.com/MichaelMure/git-bug/commands.GitExactTag=${version} - ''; + ldflags = [ + "-X github.com/MichaelMure/git-bug/commands.GitCommit=${rev}" + "-X github.com/MichaelMure/git-bug/commands.GitLastTag=${version}" + "-X github.com/MichaelMure/git-bug/commands.GitExactTag=${version}" + ]; postInstall = '' install -D -m 0644 misc/bash_completion/git-bug "$out/share/bash-completion/completions/git-bug" diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/git-chglog/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/git-chglog/default.nix index 19de4b28bf..143ab6cac9 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/git-chglog/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/git-chglog/default.nix @@ -13,7 +13,7 @@ buildGoModule rec { vendorSha256 = "sha256-jIq+oacyT71m78iMZwWOBsBVAY/WxgyH9zRr8GiMGTU="; - buildFlagsArray = [ "-ldflags= -s -w -X=main.Version=v${version}" ]; + ldflags = [ "-s" "-w" "-X=main.Version=v${version}" ]; subPackages = [ "cmd/git-chglog" ]; @@ -24,4 +24,3 @@ buildGoModule rec { maintainers = with maintainers; [ ldenefle ]; }; } - diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/git-delete-merged-branches/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/git-delete-merged-branches/default.nix index fca3200dce..3e49af5bbb 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/git-delete-merged-branches/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/git-delete-merged-branches/default.nix @@ -2,13 +2,13 @@ python3Packages.buildPythonApplication rec { pname = "git-delete-merged-branches"; - version = "6.3.0"; + version = "6.4.0"; src = fetchFromGitHub { owner = "hartwork"; repo = pname; rev = version; - sha256 = "sha256-mUgSIwU39BT0bCA2UQANe2Yzkgl2xAmXQQ9P2bLoEMc="; + sha256 = "sha256-swAc8ObZY78nVQyjTrVG81xBqTYnWHVDFpiUApbowqU="; }; propagatedBuildInputs = with python3Packages; [ diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/gitui/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/gitui/default.nix index 4fc1bce447..5d1e50d121 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/gitui/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/gitui/default.nix @@ -1,16 +1,16 @@ { lib, stdenv, rustPlatform, fetchFromGitHub, libiconv, perl, python3, Security, AppKit, openssl, xclip }: rustPlatform.buildRustPackage rec { pname = "gitui"; - version = "0.16.2"; + version = "0.17"; src = fetchFromGitHub { owner = "extrawurst"; repo = pname; rev = "v${version}"; - sha256 = "sha256-FRPRkFGf6Z/+smK651wR6ETWrvvQ1AKalxXW6d6otIo="; + sha256 = "sha256-UM1L95VKmUh2E56dlKo3TkNYRlib5Hg5VHGokBqTP+s="; }; - cargoSha256 = "sha256-3ubeZgB7XNKysy6s+cdg4GDj/Mn4Mdp9VupcbBRTRh4="; + cargoSha256 = "sha256-i/Z1pOrg7rKH5uDqkyh7V9jZRHXZ3Bhhw5UpzKWOjJ0="; nativeBuildInputs = [ python3 perl ]; buildInputs = [ openssl ] diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/gst/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/gst/default.nix new file mode 100644 index 0000000000..a323c61bf1 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/gst/default.nix @@ -0,0 +1,56 @@ +{ lib +, buildGoModule +, fetchFromGitHub +, git +, ghq +}: + +buildGoModule rec { + pname = "gst"; + version = "5.0.4"; + + src = fetchFromGitHub { + owner = "uetchy"; + repo = "gst"; + rev = "v${version}"; + sha256 = "0fqgkmhn84402hidxv4niy9himcdwm1h80prkfk9vghwcyynrbsj"; + }; + + vendorSha256 = "0k5xl55vzpl64gwsgaff92jismpx6y7l2ia0kx7gamd1vklf0qwh"; + + doCheck = false; + + nativeBuildInputs = [ + git + ghq + ]; + + ldflags = [ + "-s" "-w" "-X=main.Version=${version}" + ]; + + doInstallCheck = true; + installCheckPhase = '' + if [[ "$("$out/bin/${pname}" --version)" == "${pname} version ${version}" ]]; then + export HOME=$(mktemp -d) + git config --global user.name "Test User" + git config --global user.email "test@example.com" + git config --global init.defaultBranch "main" + git config --global ghq.user "user" + ghq create test > /dev/null 2>&1 + touch $HOME/ghq/github.com/user/test/SmokeTest + $out/bin/${pname} list | grep SmokeTest > /dev/null + echo '${pname} smoke check passed' + else + echo '${pname} smoke check failed' + return 1 + fi + ''; + + meta = { + description = "Supercharge your ghq workflow"; + homepage = "https://github.com/uetchy/gst"; + maintainers = with lib.maintainers; [ _0x4A6F ]; + license = lib.licenses.asl20; + }; +} 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 a373d3dbf8..63f4296308 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 @@ -19,7 +19,7 @@ buildGoModule rec { nativeBuildInputs = [ makeWrapper installShellFiles ]; - buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ]; + ldflags = [ "-s" "-w" "-X main.version=${version}" ]; postInstall = '' wrapProgram $out/bin/lab --prefix PATH ":" "${lib.makeBinPath [ git xdg-utils ]}"; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-lfs/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/git-lfs/default.nix index 5976f1de6a..77a8d9d897 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/git-lfs/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/git-lfs/default.nix @@ -15,7 +15,7 @@ buildGoPackage rec { nativeBuildInputs = [ ronn installShellFiles ]; - buildFlagsArray = [ "-ldflags=-s -w -X ${goPackagePath}/config.Vendor=${version} -X ${goPackagePath}/config.GitCommit=${src.rev}" ]; + ldflags = [ "-s" "-w" "-X ${goPackagePath}/config.Vendor=${version}" "-X ${goPackagePath}/config.GitCommit=${src.rev}" ]; subPackages = [ "." ]; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix index ffd6ff7d16..46caac00c4 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix @@ -18,7 +18,7 @@ buildGoModule rec { vendorSha256 = "sha256-gTObI0pmRUX6Eh5FVdt+5LbckyBuFq1Ly4oPZztazHQ="; buildInputs = [ git ]; - buildFlagsArray = "-ldflags=-X main.Version=${version}"; + ldflags = [ "-X main.Version=${version}" ]; doCheck = false; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/applications/version-management/sourcehut/core.nix b/third_party/nixpkgs/pkgs/applications/version-management/sourcehut/core.nix index d359d524eb..7c3a516ed9 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/sourcehut/core.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/sourcehut/core.nix @@ -16,7 +16,7 @@ , cryptography , beautifulsoup4 , sqlalchemy-utils -, prometheus_client +, prometheus-client , celery , alembic , importlib-metadata @@ -70,7 +70,7 @@ buildPythonPackage rec { cryptography beautifulsoup4 sqlalchemy-utils - prometheus_client + prometheus-client # Unofficial runtime dependencies? celery diff --git a/third_party/nixpkgs/pkgs/applications/version-management/sourcehut/meta.nix b/third_party/nixpkgs/pkgs/applications/version-management/sourcehut/meta.nix index a285d484ed..86d293973d 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/sourcehut/meta.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/sourcehut/meta.nix @@ -14,7 +14,7 @@ , dnspython , sshpubkeys , weasyprint -, prometheus_client +, prometheus-client , python }: let @@ -52,7 +52,7 @@ buildPythonPackage rec { pystache sshpubkeys weasyprint - prometheus_client + prometheus-client dnspython ]; diff --git a/third_party/nixpkgs/pkgs/applications/video/go-chromecast/default.nix b/third_party/nixpkgs/pkgs/applications/video/go-chromecast/default.nix index 5b0ddf7173..7c0894ee06 100644 --- a/third_party/nixpkgs/pkgs/applications/video/go-chromecast/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/go-chromecast/default.nix @@ -13,7 +13,7 @@ buildGoModule rec { vendorSha256 = "sha256-idxElk4Sy7SE9G1OMRw8YH4o8orBa80qhBXPA+ar620="; - buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version} -X main.commit=${src.rev} -X main.date=unknown" ]; + ldflags = [ "-s" "-w" "-X main.version=${version}" "-X main.commit=${src.rev}" "-X main.date=unknown" ]; meta = with lib; { homepage = "https://github.com/vishen/go-chromecast"; diff --git a/third_party/nixpkgs/pkgs/applications/video/mpv/default.nix b/third_party/nixpkgs/pkgs/applications/video/mpv/default.nix index 3bde154305..93c3b2203b 100644 --- a/third_party/nixpkgs/pkgs/applications/video/mpv/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/mpv/default.nix @@ -97,6 +97,8 @@ in stdenv.mkDerivation rec { pname = "mpv"; version = "0.33.1"; + outputs = [ "out" "dev" ]; + src = fetchFromGitHub { owner = "mpv-player"; repo = "mpv"; @@ -153,8 +155,7 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ addOpenGLRunpath docutils perl pkg-config python3 wafHook which - ] - ++ optional swiftSupport swift; + ] ++ optional swiftSupport swift; buildInputs = [ ffmpeg freetype libass libpthreadstubs @@ -206,6 +207,9 @@ in stdenv.mkDerivation rec { cp TOOLS/umpv $out/bin cp $out/share/applications/mpv.desktop $out/share/applications/umpv.desktop sed -i '/Icon=/ ! s/mpv/umpv/g' $out/share/applications/umpv.desktop + + substituteInPlace $out/lib/pkgconfig/mpv.pc \ + --replace "$out/include" "$dev/include" '' + optionalString stdenv.isDarwin '' mkdir -p $out/Applications cp -r build/mpv.app $out/Applications diff --git a/third_party/nixpkgs/pkgs/applications/video/mpv/wrapper.nix b/third_party/nixpkgs/pkgs/applications/video/mpv/wrapper.nix index 4d61971956..5225197772 100644 --- a/third_party/nixpkgs/pkgs/applications/video/mpv/wrapper.nix +++ b/third_party/nixpkgs/pkgs/applications/video/mpv/wrapper.nix @@ -61,7 +61,8 @@ let symlinkJoin { name = "mpv-with-scripts-${mpv.version}"; - paths = [ mpv ]; + # TODO: don't link all mpv outputs and convert package to mpv-unwrapped? + paths = [ mpv.all ]; buildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/applications/video/openshot-qt/default.nix b/third_party/nixpkgs/pkgs/applications/video/openshot-qt/default.nix index c25e53b657..11f102085b 100644 --- a/third_party/nixpkgs/pkgs/applications/video/openshot-qt/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/openshot-qt/default.nix @@ -5,13 +5,13 @@ mkDerivationWith python3Packages.buildPythonApplication rec { pname = "openshot-qt"; - version = "2.5.1"; + version = "2.6.0"; src = fetchFromGitHub { owner = "OpenShot"; repo = "openshot-qt"; rev = "v${version}"; - sha256 = "0qc5i0ay6j2wab1whl41sjb71cj02pg6y79drf7asrprq8b2rmfq"; + sha256 = "0b11h335krvflpksdlhsrq3rqkb8asipnyaf62di2z32ci3irrpq"; }; nativeBuildInputs = [ doxygen wrapGAppsHook ]; diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/cri-o/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/cri-o/default.nix index 26e56ccc60..bc7e25d93d 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/cri-o/default.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/cri-o/default.nix @@ -15,13 +15,13 @@ buildGoModule rec { pname = "cri-o"; - version = "1.21.2"; + version = "1.22.0"; src = fetchFromGitHub { owner = "cri-o"; repo = "cri-o"; rev = "v${version}"; - sha256 = "sha256-hapXwd7K0xbkZ0MKkJ5wv4zfDKRTC3IC4oLYLL460oI="; + sha256 = "sha256-lY/kHvJBN7idFn3YUEHMR4w+M3F89RKMsvvyHmH/EPc="; }; vendorSha256 = null; diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/crun/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/crun/default.nix index a0d8c16d55..cc9d026817 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/crun/default.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/crun/default.nix @@ -38,13 +38,13 @@ let in stdenv.mkDerivation rec { pname = "crun"; - version = "0.21"; + version = "1.0"; src = fetchFromGitHub { owner = "containers"; repo = pname; rev = version; - sha256 = "sha256-PhhaCXtWsknMsEt1F9jMfEWSl+OLQ/C/iTj7t0XuAFw="; + sha256 = "sha256-xpNwhNAbcTKkXl5i4L8aayMAx8O8SWdFlgHguHNiqqw="; fetchSubmodules = true; }; diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/docker-slim/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/docker-slim/default.nix index 6e6db87a6c..a38b0675af 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/docker-slim/default.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/docker-slim/default.nix @@ -23,11 +23,10 @@ buildGoPackage rec { makeWrapper ]; - buildFlagsArray = [ - ''-ldflags= - -s -w -X ${goPackagePath}/pkg/version.appVersionTag=${version} - -X ${goPackagePath}/pkg/version.appVersionRev=${src.rev} - '' + ldflags = [ + "-s" "-w" + "-X ${goPackagePath}/pkg/version.appVersionTag=${version}" + "-X ${goPackagePath}/pkg/version.appVersionRev=${src.rev}" ]; # docker-slim tries to create its state dir next to the binary (inside the nix diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/docker/buildx.nix b/third_party/nixpkgs/pkgs/applications/virtualization/docker/buildx.nix index 4cdb253505..242d6b37d7 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/docker/buildx.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/docker/buildx.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "docker-buildx"; - version = "0.6.1"; + version = "0.6.2"; src = fetchFromGitHub { owner = "docker"; repo = "buildx"; rev = "v${version}"; - sha256 = "sha256-BzF0SvXMFlQ/pvwNJ04C4hx3xc0T3E4zeAlSctPKfcE="; + sha256 = "sha256-X/oTL/CfMunGcS3HDoH/g1gZcJWnVU93OkcGC36KuA4="; }; vendorSha256 = null; diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/docker/proxy.nix b/third_party/nixpkgs/pkgs/applications/virtualization/docker/proxy.nix index 59fc80eefb..a247e2cecf 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/docker/proxy.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/docker/proxy.nix @@ -13,8 +13,6 @@ buildGoPackage rec { goPackagePath = "github.com/docker/libnetwork"; - goDeps = null; - installPhase = '' install -m755 -D ./go/bin/proxy $out/bin/docker-proxy ''; diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/imgcrypt/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/imgcrypt/default.nix index c985632b9e..ce12fb8f38 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/imgcrypt/default.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/imgcrypt/default.nix @@ -11,8 +11,8 @@ buildGoModule rec { sha256 = "177fs3p2xzwjsffcxqqllx6wi6ghfyqbvfgn95v3q7a2993yqk4k"; }; - buildFlagsArray = [ - "-ldflags=-X github.com/containerd/containerd/version.Version=${version}" + ldflags = [ + "-X github.com/containerd/containerd/version.Version=${version}" ]; vendorSha256 = null; diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/nvidia-container-runtime/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/nvidia-container-runtime/default.nix index 92717b9889..43eb1639b4 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/nvidia-container-runtime/default.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/nvidia-container-runtime/default.nix @@ -35,7 +35,7 @@ buildGoPackage rec { }; goPackagePath = "github.com/${pname}/src"; - buildFlagsArray = [ "-ldflags=" "-s -w" ]; + ldflags = [ "-s" "-w" ]; nativeBuildInputs = [ makeWrapper ]; postInstall = '' diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/nvidia-container-toolkit/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/nvidia-container-toolkit/default.nix index 4276f71a40..8cb470d2fa 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/nvidia-container-toolkit/default.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/nvidia-container-toolkit/default.nix @@ -16,7 +16,7 @@ buildGoModule rec { }; vendorSha256 = "17zpiyvf22skfcisflsp6pn56y6a793jcx89kw976fq2x5br1bz7"; - buildFlagsArray = [ "-ldflags=" "-s -w" ]; + ldflags = [ "-s" "-w" ]; nativeBuildInputs = [ makeWrapper ]; postInstall = '' diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/qtile/default.nix b/third_party/nixpkgs/pkgs/applications/window-managers/qtile/default.nix index cd7b5a159e..ae62cdbbba 100644 --- a/third_party/nixpkgs/pkgs/applications/window-managers/qtile/default.nix +++ b/third_party/nixpkgs/pkgs/applications/window-managers/qtile/default.nix @@ -10,7 +10,7 @@ let pythonPackages = python.pkgs; unwrapped = pythonPackages.buildPythonPackage rec { - name = "qtile-${version}"; + pname = "qtile"; version = "0.18.0"; src = fetchFromGitHub { @@ -61,6 +61,8 @@ let }; in (python.withPackages (ps: [ unwrapped ])).overrideAttrs (_: { + # otherwise will be exported as "env", this restores `nix search` behavior + name = "${unwrapped.pname}-${unwrapped.version}"; # export underlying qtile package passthru = { inherit unwrapped; }; }) diff --git a/third_party/nixpkgs/pkgs/build-support/docker/default.nix b/third_party/nixpkgs/pkgs/build-support/docker/default.nix index 832d2949a1..9e4709dd9b 100644 --- a/third_party/nixpkgs/pkgs/build-support/docker/default.nix +++ b/third_party/nixpkgs/pkgs/build-support/docker/default.nix @@ -759,6 +759,13 @@ rec { ]; }; + # This provides a /usr/bin/env, for shell scripts using the + # "#!/usr/bin/env executable" shebang. + usrBinEnv = runCommand "usr-bin-env" { } '' + mkdir -p $out/usr/bin + ln -s ${pkgs.coreutils}/bin/env $out/usr/bin + ''; + # This provides /bin/sh, pointing to bashInteractive. binSh = runCommand "bin-sh" { } '' mkdir -p $out/bin diff --git a/third_party/nixpkgs/pkgs/build-support/emacs/elpa.nix b/third_party/nixpkgs/pkgs/build-support/emacs/elpa.nix index 08257ff254..f7027dc499 100644 --- a/third_party/nixpkgs/pkgs/build-support/emacs/elpa.nix +++ b/third_party/nixpkgs/pkgs/build-support/emacs/elpa.nix @@ -21,7 +21,7 @@ in import ./generic.nix { inherit lib stdenv emacs texinfo writeText gcc; } ({ - phases = "installPhase fixupPhase distPhase"; + dontUnpack = true; installPhase = '' runHook preInstall diff --git a/third_party/nixpkgs/pkgs/build-support/vm/default.nix b/third_party/nixpkgs/pkgs/build-support/vm/default.nix index cfc19c03cf..3a52d75657 100644 --- a/third_party/nixpkgs/pkgs/build-support/vm/default.nix +++ b/third_party/nixpkgs/pkgs/build-support/vm/default.nix @@ -494,7 +494,9 @@ rec { tarball must contain an RPM specfile. */ buildRPM = attrs: runInLinuxImage (stdenv.mkDerivation ({ - phases = "prepareImagePhase sysInfoPhase buildPhase installPhase"; + prePhases = [ prepareImagePhase sysInfoPhase ]; + dontUnpack = true; + dontConfigure = true; outDir = "rpms/${attrs.diskImage.name}"; diff --git a/third_party/nixpkgs/pkgs/build-support/vm/test.nix b/third_party/nixpkgs/pkgs/build-support/vm/test.nix index 6985030326..1a29554ee8 100644 --- a/third_party/nixpkgs/pkgs/build-support/vm/test.nix +++ b/third_party/nixpkgs/pkgs/build-support/vm/test.nix @@ -1,4 +1,4 @@ -with import ../../.. {}; +with import ../../.. { }; with vmTools; { @@ -30,7 +30,7 @@ with vmTools; src = patchelf.src; diskImage = diskImages.ubuntu1204i386; memSize = 512; - phases = "sysInfoPhase unpackPhase patchPhase configurePhase buildPhase checkPhase installPhase fixupPhase distPhase"; + prePhases = [ sysInfoPhase ]; sysInfoPhase = '' dpkg-query --list ''; diff --git a/third_party/nixpkgs/pkgs/build-support/writers/default.nix b/third_party/nixpkgs/pkgs/build-support/writers/default.nix index 47919c251a..111ec68a60 100644 --- a/third_party/nixpkgs/pkgs/build-support/writers/default.nix +++ b/third_party/nixpkgs/pkgs/build-support/writers/default.nix @@ -99,51 +99,6 @@ rec { writeBashBin = name: writeBash "/bin/${name}"; - # writeC writes an executable c package called `name` to `destination` using `libraries`. - # - # Examples: - # writeC "hello-world-ncurses" { libraries = [ pkgs.ncurses ]; } '' - # #include - # int main() { - # initscr(); - # printw("Hello World !!!"); - # refresh(); endwin(); - # return 0; - # } - # '' - writeC = name: { - libraries ? [], - strip ? true - }: - makeBinWriter { - compileScript = '' - PATH=${makeBinPath [ - pkgs.binutils-unwrapped - pkgs.coreutils - pkgs.findutils - pkgs.gcc - pkgs.pkg-config - ]} - export PKG_CONFIG_PATH=${concatMapStringsSep ":" (pkg: "${pkg}/lib/pkgconfig") libraries} - gcc \ - ${optionalString (libraries != []) - "$(pkg-config --cflags --libs ${ - concatMapStringsSep " " (pkg: "$(find ${escapeShellArg pkg}/lib/pkgconfig -name \\*.pc)") libraries - })" - } \ - -O \ - -o "$out" \ - -Wall \ - -x c \ - "$contentPath" - ''; - inherit strip; - } name; - - # writeCBin takes the same arguments as writeC but outputs a directory (like writeScriptBin) - writeCBin = name: - writeC "/bin/${name}"; - # Like writeScript but the first line is a shebang to dash # # Example: diff --git a/third_party/nixpkgs/pkgs/build-support/writers/test.nix b/third_party/nixpkgs/pkgs/build-support/writers/test.nix index 00cad9a96b..69bc7dd2c6 100644 --- a/third_party/nixpkgs/pkgs/build-support/writers/test.nix +++ b/third_party/nixpkgs/pkgs/build-support/writers/test.nix @@ -17,14 +17,6 @@ let if [[ "test" == "test" ]]; then echo "success"; fi ''; - c = writeCBin "test-writers-c" { libraries = [ ]; } '' - #include - int main() { - printf("success\n"); - return 0; - } - ''; - dash = writeDashBin "test-writers-dash-bin" '' test '~' = '~' && echo 'success' ''; @@ -88,24 +80,6 @@ let if [[ "test" == "test" ]]; then echo "success"; fi ''; - c = writeC "test-writers-c" { libraries = [ glib.dev ]; } '' - #include - #include - int main() { - GApplication *application = g_application_new ("hello.world", G_APPLICATION_FLAGS_NONE); - g_application_register (application, NULL, NULL); - GNotification *notification = g_notification_new ("Hello world!"); - g_notification_set_body (notification, "This is an example notification."); - GIcon *icon = g_themed_icon_new ("dialog-information"); - g_notification_set_icon (notification, icon); - g_object_unref (icon); - g_object_unref (notification); - g_object_unref (application); - printf("success\n"); - return 0; - } - ''; - dash = writeDash "test-writers-dash" '' test '~' = '~' && echo 'success' ''; diff --git a/third_party/nixpkgs/pkgs/data/themes/adwaita-qt/default.nix b/third_party/nixpkgs/pkgs/data/themes/adwaita-qt/default.nix index fa69afe50c..3e72d8a74b 100644 --- a/third_party/nixpkgs/pkgs/data/themes/adwaita-qt/default.nix +++ b/third_party/nixpkgs/pkgs/data/themes/adwaita-qt/default.nix @@ -12,13 +12,13 @@ mkDerivation rec { pname = "adwaita-qt"; - version = "1.3.1"; + version = "1.4.0"; src = fetchFromGitHub { owner = "FedoraQt"; repo = pname; rev = version; - sha256 = "sha256-3uHa7veLzaSIm9WSR/Z0X+aSdXziO1TnI/CQgccrKYg="; + sha256 = "sha256-KkqLUhS0JMwJsgu8fv5iGozH3Xv+cXumxx5IewZTTPc="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/data/themes/marwaita-peppermint/default.nix b/third_party/nixpkgs/pkgs/data/themes/marwaita-peppermint/default.nix index 70e7bdef2d..6873cd31f8 100644 --- a/third_party/nixpkgs/pkgs/data/themes/marwaita-peppermint/default.nix +++ b/third_party/nixpkgs/pkgs/data/themes/marwaita-peppermint/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv +{ lib +, stdenv , fetchFromGitHub , gdk-pixbuf , gtk-engine-murrine @@ -8,13 +9,13 @@ stdenv.mkDerivation rec { pname = "marwaita-peppermint"; - version = "0.6"; + version = "10.3"; src = fetchFromGitHub { owner = "darkomarko42"; repo = pname; rev = version; - sha256 = "0mhkkx2qa66z4b2h5iynhy63flwdf6b2phd21r1j8kp4m08dynms"; + sha256 = "09lqp82aymj3silpwmjkkf4mgv3b1xw7181ck89lz2nxb98sr9im"; }; buildInputs = [ @@ -39,7 +40,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Marwaita GTK theme with Peppermint Os Linux style"; homepage = "https://www.pling.com/p/1399569/"; - license = licenses.gpl3; + license = licenses.gpl3Only; platforms = platforms.unix; maintainers = [ maintainers.romildo ]; }; diff --git a/third_party/nixpkgs/pkgs/data/themes/nordic/default.nix b/third_party/nixpkgs/pkgs/data/themes/nordic/default.nix index 1014d48344..3fb2ae45f5 100644 --- a/third_party/nixpkgs/pkgs/data/themes/nordic/default.nix +++ b/third_party/nixpkgs/pkgs/data/themes/nordic/default.nix @@ -2,70 +2,70 @@ stdenv.mkDerivation rec { pname = "nordic"; - version = "unstable-2021-06-04"; + version = "unstable-2021-08-13"; srcs = [ (fetchFromGitHub { owner = "EliverLara"; repo = pname; - rev = "9a98c05f4d4f6c9e701ac20b0bf5c18284ad0015"; - sha256 = "0ghgr7fr7anm8hdq6n46xhkjxydqkr0qlk1q7mdg08j43f0yra7b"; + rev = "937ca200e8148a61c73228030ec260abecc27fb2"; + sha256 = "0h7z7jh5p0916i9lx4n94r6vbydafnikdi6d9p4djvpyhn5nizgy"; name = "Nordic"; }) (fetchFromGitHub { owner = "EliverLara"; repo = pname; - rev = "90ce6f539735af1f231c4fa07708cef602e1c8a2"; - sha256 = "1g6sz7ifpc8jf4iplcsmihqhjdc7yp5xygw8584n122jmh8mak47"; + rev = "e736846a130be7907e977b16d0b3a0ab19631015"; + sha256 = "0dv7z31zw1r3iac5bvwapf9lm99y5l0xfzaw93hn8msh10w5crx8"; name = "Nordic-standard-buttons"; }) (fetchFromGitHub { owner = "EliverLara"; repo = pname; - rev = "529cdb86b4d4474a67a56eb9377e3c7907b452db"; - sha256 = "06li44i5wh4h06fbhvjf5cjma5czjdgnwvm79d8hg6vmi2101b0a"; + rev = "8ff12077f28e25f4e57f055a51e5e3b9b1bf53fd"; + sha256 = "082k0na39qb97kbvc15g3mdfh8d8ricql84i4wdjy3rjfbfwq0pl"; name = "Nordic-darker"; }) (fetchFromGitHub { owner = "EliverLara"; repo = pname; - rev = "1d16f37de315c298a6c3d79a552ed6f18cbb7fb4"; - sha256 = "0nxzygnysg4ciib337vay0qcc80hpryjnclwjwjzj51i95366k25"; + rev = "8c422e4bfdf5680ff323938f49f411680154d3d6"; + sha256 = "1w540zlmsxpwa455wpxy1dpgv2fjr36xwjqbyc8x4y0ya0qfify0"; name = "Nordic-darker-standard-buttons"; }) (fetchFromGitHub { owner = "EliverLara"; repo = pname; - rev = "78a30080bc50ee88c23d393049306ef1925bcdb8"; - sha256 = "10w4815fcf3pd24ar7jp0wcdiwn3zzrdj2p6fqlgx26biz7kf3iv"; + rev = "ce31d794fe1c6b72d3cff2e9513e08ddce014118"; + sha256 = "09d41wllr9hgxshgvpgngx9rlg8pvx5aqgkk5q8jra4jz2a92fhq"; name = "Nordic-bluish-accent"; }) (fetchFromGitHub { owner = "EliverLara"; repo = pname; - rev = "e4363da8d457e8b14f6e4340979225db92d34aa9"; - sha256 = "1sjw2hvg4jgxqzgqhqixq216a7vv5licbc8ii1rsz88ycafsbr7j"; + rev = "8ca4fe244c31775effacc77f0a25ae10c6bee60c"; + sha256 = "1cby8wmaqdqpd9c40wiy7i9wmrazwfhb3h818hg0ni7yfcm2fr58"; name = "Nordic-bluish-accent-standard-buttons"; }) (fetchFromGitHub { owner = "EliverLara"; repo = "${pname}-polar"; - rev = "a38fd7d440309573947d3e53ea3ed295cf027ce7"; - sha256 = "1r6hz0m0y7c1d0ka1x9cd47r0jvpgkld6x3gf2b7w7yvqpmh6a44"; + rev = "a2d1c633ac2bfe261e8f612c8af14af0311c7f67"; + sha256 = "05llvix671i6128vbr3jiik8mipaab7bn0v9i89ydwyfhw822n7v"; name = "Nordic-Polar"; }) (fetchFromGitHub { owner = "EliverLara"; repo = "${pname}-polar"; - rev = "b86d43c48bcac57c49d891b967311fd90f6d4bcd"; - sha256 = "0c725kf5ql42zrqk6dwk6i7wyrhr3gddipvhy6692nv0dszqm0ml"; + rev = "62a1702a17e7ea96e9b692832d68a0a7f26aabb6"; + sha256 = "0r1qn1rj322b44h15hcfbx79hhmb1m4pkv2fpdsn3s2klcxwr1ql"; name = "Nordic-Polar-standard-buttons"; }) ]; diff --git a/third_party/nixpkgs/pkgs/development/compilers/binaryen/default.nix b/third_party/nixpkgs/pkgs/development/compilers/binaryen/default.nix index ee47ebd988..533be22063 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/binaryen/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/binaryen/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "binaryen"; - version = "99"; + version = "101"; src = fetchFromGitHub { owner = "WebAssembly"; repo = "binaryen"; rev = "version_${version}"; - sha256 = "1a6ixxm1f8mrr9mn6a0pimajdzsdr4w1qhr92skxq67168vvc1ic"; + sha256 = "sha256-rNiZQIQqNbc1P2A6UTn0dRHeT3BS+nv1o81aPaJy+5U="; }; nativeBuildInputs = [ cmake python3 ]; diff --git a/third_party/nixpkgs/pkgs/development/compilers/emscripten/0001-emulate-clang-sysroot-include-logic.patch b/third_party/nixpkgs/pkgs/development/compilers/emscripten/0001-emulate-clang-sysroot-include-logic.patch new file mode 100644 index 0000000000..9cb3ca2bf9 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/emscripten/0001-emulate-clang-sysroot-include-logic.patch @@ -0,0 +1,42 @@ +From 67f54fde2b1683aae3800f7a86a4e507c1125be8 Mon Sep 17 00:00:00 2001 +From: Yureka +Date: Sat, 7 Aug 2021 09:16:46 +0200 +Subject: [PATCH] emulate clang 'sysroot + /include' logic + +Authored-By: Alexander Khovansky +Co-Authored-By: Yureka + +Clang provided by nix patches out logic that appends 'sysroot + /include' +to the include path as well as automatic inclusion of libcxx includes (/include/c++/v1). +The patch below adds that logic back by introducing cflags emulating this behavior to emcc +invocations directly. + +Important note: with non-nix clang, sysroot/include dir ends up being the last +in the include search order, right after the resource root. +Hence usage of -idirafter. Clang also documents an -isystem-after flag +but it doesn't appear to work +--- + emcc.py | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +diff --git a/emcc.py b/emcc.py +index 999314afc..0e23c066c 100755 +--- a/emcc.py ++++ b/emcc.py +@@ -759,7 +759,12 @@ def emsdk_ldflags(user_args): + + + def emsdk_cflags(user_args): +- cflags = ['--sysroot=' + shared.Cache.get_sysroot(absolute=True)] ++ cflags = [ ++ '--sysroot=' + shared.Cache.get_sysroot(absolute=True), ++ '-resource-dir=@resourceDir@', ++ '-idirafter' + shared.Cache.get_sysroot(absolute=True) + os.path.join('/include'), ++ '-iwithsysroot' + os.path.join('/include','c++','v1') ++ ] + + def array_contains_any_of(hay, needles): + for n in needles: +-- +2.32.0 + diff --git a/third_party/nixpkgs/pkgs/development/compilers/emscripten/default.nix b/third_party/nixpkgs/pkgs/development/compilers/emscripten/default.nix index 84520ca52e..c514b86a6c 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/emscripten/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/emscripten/default.nix @@ -1,17 +1,17 @@ { lib, stdenv, fetchFromGitHub, python3, nodejs, closurecompiler , jre, binaryen -, llvmPackages_11 -, symlinkJoin, makeWrapper +, llvmPackages +, symlinkJoin, makeWrapper, substituteAll , mkYarnModules }: stdenv.mkDerivation rec { pname = "emscripten"; - version = "2.0.10"; + version = "2.0.27"; llvmEnv = symlinkJoin { name = "emscripten-llvm-${version}"; - paths = with llvmPackages_11; [ clang-unwrapped lld llvm ]; + paths = with llvmPackages; [ clang-unwrapped clang-unwrapped.lib lld llvm ]; }; nodeModules = mkYarnModules { @@ -26,27 +26,32 @@ stdenv.mkDerivation rec { src = fetchFromGitHub { owner = "emscripten-core"; repo = "emscripten"; - sha256 = "0jy4n1pykk9vkm5da9v3qsfrl6j7yhngcazh2792xxs6wzfcs9gk"; + sha256 = "1dpfib2nmbvskqlaqw3kvaay69qpa7d155hd4w05c2xgmahmrd4n"; rev = version; }; nativeBuildInputs = [ makeWrapper ]; buildInputs = [ nodejs python3 ]; + patches = [ + (substituteAll { + src = ./0001-emulate-clang-sysroot-include-logic.patch; + resourceDir = "${llvmEnv}/lib/clang/${llvmPackages.release_version}/"; + }) + ]; + buildPhase = '' + runHook preBuild + patchShebangs . # fixes cmake support sed -i -e "s/print \('emcc (Emscript.*\)/sys.stderr.write(\1); sys.stderr.flush()/g" emcc.py # disables cache in user home, use installation directory instead - sed -i '/^def/!s/root_is_writable()/True/' tools/shared.py + sed -i '/^def/!s/root_is_writable()/True/' tools/config.py sed -i "/^def check_sanity/a\\ return" tools/shared.py - # super ugly: monkeypatch to add sysroot/include to the include - # path because they are otherwise not part of Nix's clang. - sed -i "490a\\ '/include'," tools/shared.py - # required for wasm2c ln -s ${nodeModules}/node_modules . @@ -66,19 +71,19 @@ stdenv.mkDerivation rec { sed -i "s|^EMAR =.*|EMAR='$out/bin/emar'|" tools/shared.py sed -i "s|^EMRANLIB =.*|EMRANLIB='$out/bin/emranlib'|" tools/shared.py - # The tests use the C compiler to compile generated C code, - # use the wrapped compiler - sed -i 's/shared.CLANG_CC/"cc"/' tests/runner.py + runHook postBuild ''; installPhase = '' + runHook preInstall + appdir=$out/share/emscripten mkdir -p $appdir cp -r . $appdir chmod -R +w $appdir mkdir -p $out/bin - for b in em++ em-config emar embuilder.py emcc emcmake emconfigure emmake emranlib emrun emscons; do + for b in em++ em-config emar embuilder.py emcc emcmake emconfigure emmake emranlib emrun emscons emsize; do makeWrapper $appdir/$b $out/bin/$b \ --set NODE_PATH ${nodeModules}/node_modules \ --set EM_EXCLUSIVE_CACHE_ACCESS 1 \ @@ -107,6 +112,8 @@ stdenv.mkDerivation rec { pushd $appdir python tests/runner.py test_hello_world popd + + runHook postInstall ''; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/compilers/emscripten/package.json b/third_party/nixpkgs/pkgs/development/compilers/emscripten/package.json index 36cd2efe27..1102fd62ef 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/emscripten/package.json +++ b/third_party/nixpkgs/pkgs/development/compilers/emscripten/package.json @@ -1,15 +1,21 @@ { "name": "emscripten", - "version": "2.0.10", + "version": "2.0.26", + "private": true, "devDependencies": { - "es-check": "^5.1.0", + "es-check": "^5.2.4", + "eslint": "^7.29.0", + "eslint-config-google": "^0.14.0", + "source-map": "0.5.7", "ws": "~0.4.28" }, "dependencies": { - "acorn": "7.3.1", - "google-closure-compiler": "20200920.0.0", - "html-minifier-terser": "5.0.2", - "source-map": "0.5.6", + "acorn": "8.4.1", + "google-closure-compiler": "20210601.0.0", + "html-minifier-terser": "5.1.1", "wasm2c": "1.0.0" + }, + "scripts": { + "lint": "eslint src/parseTools.js" } } diff --git a/third_party/nixpkgs/pkgs/development/compilers/emscripten/yarn.lock b/third_party/nixpkgs/pkgs/development/compilers/emscripten/yarn.lock index 948fcd4ed7..0e88539529 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/emscripten/yarn.lock +++ b/third_party/nixpkgs/pkgs/development/compilers/emscripten/yarn.lock @@ -2,16 +2,87 @@ # yarn lockfile v1 -acorn@7.3.1: - version "7.3.1" - resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.3.1.tgz#85010754db53c3fbaf3b9ea3e083aa5c5d147ffd" - integrity sha512-tLc0wSnatxAQHVHUapaHdz72pi9KUyHjq5KyHjGg9Y8Ifdc79pTh2XvI6I1/chZbnM7QtNKzh66ooDogPZSleA== +"@babel/code-frame@7.12.11": + version "7.12.11" + resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.12.11.tgz#f4ad435aa263db935b8f10f2c552d23fb716a63f" + integrity sha512-Zt1yodBx1UcyiePMSkWnU4hPqhwq7hGi2nFL1LeA3EUl+q2LQx16MISgJ0+z7dnmgvP9QtIleuETGOiOH1RcIw== + dependencies: + "@babel/highlight" "^7.10.4" + +"@babel/helper-validator-identifier@^7.14.5": + version "7.14.5" + resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.14.5.tgz#d0f0e277c512e0c938277faa85a3968c9a44c0e8" + integrity sha512-5lsetuxCLilmVGyiLEfoHBRX8UCFD+1m2x3Rj97WrW3V7H3u4RWRXA4evMjImCsin2J2YT0QaVDGf+z8ondbAg== + +"@babel/highlight@^7.10.4": + version "7.14.5" + resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.14.5.tgz#6861a52f03966405001f6aa534a01a24d99e8cd9" + integrity sha512-qf9u2WFWVV0MppaL877j2dBtQIDgmidgjGk5VIMw3OadXvYaXn66U1BFlH2t4+t3i+8PhedppRv+i40ABzd+gg== + dependencies: + "@babel/helper-validator-identifier" "^7.14.5" + chalk "^2.0.0" + js-tokens "^4.0.0" + +"@eslint/eslintrc@^0.4.2": + version "0.4.2" + resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-0.4.2.tgz#f63d0ef06f5c0c57d76c4ab5f63d3835c51b0179" + integrity sha512-8nmGq/4ycLpIwzvhI4tNDmQztZ8sp+hI7cyG8i1nQDhkAbRzHpXPidRAHlNvCZQpJTKw5ItIpMw9RSToGF00mg== + dependencies: + ajv "^6.12.4" + debug "^4.1.1" + espree "^7.3.0" + globals "^13.9.0" + ignore "^4.0.6" + import-fresh "^3.2.1" + js-yaml "^3.13.1" + minimatch "^3.0.4" + strip-json-comments "^3.1.1" + +acorn-jsx@^5.3.1: + version "5.3.1" + resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.1.tgz#fc8661e11b7ac1539c47dbfea2e72b3af34d267b" + integrity sha512-K0Ptm/47OKfQRpNQ2J/oIN/3QYiK6FwW+eJbILhsdxh2WTLdl+30o8aGdTbm5JbffpFFAg/g+zi1E+jvJha5ng== + +acorn@8.4.1: + version "8.4.1" + resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.4.1.tgz#56c36251fc7cabc7096adc18f05afe814321a28c" + integrity sha512-asabaBSkEKosYKMITunzX177CXxQ4Q8BSSzMTKD+FefUhipQC70gfW5SiUDhYQ3vk8G+81HqQk7Fv9OXwwn9KA== acorn@^6.4.1: version "6.4.2" resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.4.2.tgz#35866fd710528e92de10cf06016498e47e39e1e6" integrity sha512-XtGIhXwF8YM8bJhGxG5kXgjkEuNGLTkoYqVE+KMR+aspr4KGYmKYg7yUe3KghyQ9yheNwLnjmzh/7+gfDBmHCQ== +acorn@^7.4.0: + version "7.4.1" + resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.4.1.tgz#feaed255973d2e77555b83dbc08851a6c63520fa" + integrity sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A== + +ajv@^6.10.0, ajv@^6.12.4: + version "6.12.6" + resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.6.tgz#baf5a62e802b07d977034586f8c3baf5adf26df4" + integrity sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g== + dependencies: + fast-deep-equal "^3.1.1" + fast-json-stable-stringify "^2.0.0" + json-schema-traverse "^0.4.1" + uri-js "^4.2.2" + +ajv@^8.0.1: + version "8.6.0" + resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.6.0.tgz#60cc45d9c46a477d80d92c48076d972c342e5720" + integrity sha512-cnUG4NSBiM4YFBxgZIj/In3/6KX+rQ2l2YPRVcvAMQGWEPKuXoPIhxzwqh31jA3IPbI4qEOp/5ILI4ynioXsGQ== + dependencies: + fast-deep-equal "^3.1.1" + json-schema-traverse "^1.0.0" + require-from-string "^2.0.2" + uri-js "^4.2.2" + +ansi-colors@^4.1.1: + version "4.1.1" + resolved "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-4.1.1.tgz#cbb9ae256bf750af1eab344f229aa27fe94ba348" + integrity sha512-JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA== + ansi-escapes@^1.1.0: version "1.4.0" resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-1.4.0.tgz#d3a8a83b319aa67793662b13e761c7911422306e" @@ -27,6 +98,11 @@ ansi-regex@^3.0.0: resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-3.0.0.tgz#ed0317c322064f79466c02966bddb605ab37d998" integrity sha1-7QMXwyIGT3lGbAKWa922Bas32Zg= +ansi-regex@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.0.tgz#388539f55179bf39339c81af30a654d69f87cb75" + integrity sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg== + ansi-styles@^2.2.1: version "2.2.1" resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe" @@ -39,6 +115,13 @@ ansi-styles@^3.2.1: dependencies: color-convert "^1.9.0" +ansi-styles@^4.0.0, ansi-styles@^4.1.0: + version "4.3.0" + resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.3.0.tgz#edd803628ae71c04c85ae7a0906edad34b648937" + integrity sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg== + dependencies: + color-convert "^2.0.1" + ansi@^0.3.0, ansi@~0.3.1: version "0.3.1" resolved "https://registry.yarnpkg.com/ansi/-/ansi-0.3.1.tgz#0c42d4fb17160d5a9af1e484bace1c66922c1b21" @@ -52,6 +135,18 @@ are-we-there-yet@~1.1.2: delegates "^1.0.0" readable-stream "^2.0.6" +argparse@^1.0.7: + version "1.0.10" + resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz#bcd6791ea5ae09725e17e5ad988134cd40b3d911" + integrity sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg== + dependencies: + sprintf-js "~1.0.2" + +astral-regex@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/astral-regex/-/astral-regex-2.0.0.tgz#483143c567aeed4785759c0865786dc77d7d2e31" + integrity sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ== + async@~1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/async/-/async-1.0.0.tgz#f8fc04ca3a13784ade9e1641af98578cfbd647a9" @@ -80,13 +175,18 @@ buffer-from@^1.0.0: resolved "https://registry.yarnpkg.com/buffer-from/-/buffer-from-1.1.1.tgz#32713bc028f75c02fdb710d7c7bcec1f2c6070ef" integrity sha512-MQcXEUbCKtEo7bhqEs6560Hyd4XaovZlO/k9V3hjVUF/zwW7KBVdSK4gIt/bzwS9MbR5qob+F5jusZsb0YQK2A== -camel-case@^3.0.0: - version "3.0.0" - resolved "https://registry.yarnpkg.com/camel-case/-/camel-case-3.0.0.tgz#ca3c3688a4e9cf3a4cda777dc4dcbc713249cf73" - integrity sha1-yjw2iKTpzzpM2nd9xNy8cTJJz3M= +callsites@^3.0.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/callsites/-/callsites-3.1.0.tgz#b3630abd8943432f54b3f0519238e33cd7df2f73" + integrity sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ== + +camel-case@^4.1.1: + version "4.1.2" + resolved "https://registry.yarnpkg.com/camel-case/-/camel-case-4.1.2.tgz#9728072a954f805228225a6deea6b38461e1bd5a" + integrity sha512-gxGWBrTT1JuMx6R+o5PTXMmUnhnVzLQ9SNutD4YqKtI6ap897t3tKECYla6gCWEkplXnlNybEkZg9GEGxKFCgw== dependencies: - no-case "^2.2.0" - upper-case "^1.1.1" + pascal-case "^3.1.2" + tslib "^2.0.3" caporal@1.4.0: version "1.4.0" @@ -103,7 +203,7 @@ caporal@1.4.0: tabtab "^2.2.2" winston "^2.3.1" -chalk@2.x: +chalk@2.x, chalk@^2.0.0: version "2.4.2" resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424" integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ== @@ -123,7 +223,15 @@ chalk@^1.0.0: strip-ansi "^3.0.0" supports-color "^2.0.0" -clean-css@^4.2.1: +chalk@^4.0.0: + version "4.1.1" + resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.1.tgz#c80b3fab28bf6371e6863325eee67e618b77e6ad" + integrity sha512-diHzdDKxcU+bAsUboHLPEDQiw0qEe0qd7SYUn3HgcFlWgbDcfLGswOHYeGrHKzG9z6UYf01d9VFMfZxPM1xZSg== + dependencies: + ansi-styles "^4.1.0" + supports-color "^7.1.0" + +clean-css@^4.2.3: version "4.2.3" resolved "https://registry.yarnpkg.com/clean-css/-/clean-css-4.2.3.tgz#507b5de7d97b48ee53d84adb0160ff6216380f78" integrity sha512-VcMWDN54ZN/DS+g58HYL5/n4Zrqe8vHJpGA8KdgUXFU4fuP/aHNw8eld9SyEIyabIMJX/0RaY/fplOo5hYLSFA== @@ -188,11 +296,23 @@ color-convert@^1.9.0: dependencies: color-name "1.1.3" +color-convert@^2.0.1: + version "2.0.1" + resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-2.0.1.tgz#72d3a68d598c9bdb3af2ad1e84f21d896abd4de3" + integrity sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ== + dependencies: + color-name "~1.1.4" + color-name@1.1.3: version "1.1.3" resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25" integrity sha1-p9BVi9icQveV3UIyj3QIMcpTvCU= +color-name@~1.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== + colorette@^1.0.1: version "1.2.2" resolved "https://registry.yarnpkg.com/colorette/-/colorette-1.2.2.tgz#cbcc79d5e99caea2dbf10eb3a26fd8b3e6acfa94" @@ -213,7 +333,7 @@ commander@^2.20.0: resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33" integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ== -commander@^4.0.0: +commander@^4.1.1: version "4.1.1" resolved "https://registry.yarnpkg.com/commander/-/commander-4.1.1.tgz#9fd602bd936294e9e9ef46a3f4d6964044b18068" integrity sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA== @@ -243,6 +363,15 @@ core-util-is@~1.0.0: resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7" integrity sha1-tf1UIgqivFq1eqtxQMlAdUUDwac= +cross-spawn@^7.0.2: + version "7.0.3" + resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6" + integrity sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w== + dependencies: + path-key "^3.1.0" + shebang-command "^2.0.0" + which "^2.0.1" + cycle@1.0.x: version "1.0.3" resolved "https://registry.yarnpkg.com/cycle/-/cycle-1.0.3.tgz#21e80b2be8580f98b468f379430662b046c34ad2" @@ -255,12 +384,51 @@ debug@^2.2.0: dependencies: ms "2.0.0" +debug@^4.0.1, debug@^4.1.1: + version "4.3.1" + resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.1.tgz#f0d229c505e0c6d8c49ac553d1b13dc183f6b2ee" + integrity sha512-doEwdvm4PCeK4K3RQN2ZC2BYUBaxwLARCqZmMjtF8a51J2Rb0xpVloFRnCODwqjpwnAoao4pelN8l3RJdv3gRQ== + dependencies: + ms "2.1.2" + +deep-is@^0.1.3: + version "0.1.3" + resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.3.tgz#b369d6fb5dbc13eecf524f91b070feedc357cf34" + integrity sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ= + delegates@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/delegates/-/delegates-1.0.0.tgz#84c6e159b81904fdca59a0ef44cd870d31250f9a" integrity sha1-hMbhWbgZBP3KWaDvRM2HDTElD5o= -es-check@^5.1.0: +doctrine@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-3.0.0.tgz#addebead72a6574db783639dc87a121773973961" + integrity sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w== + dependencies: + esutils "^2.0.2" + +dot-case@^3.0.4: + version "3.0.4" + resolved "https://registry.yarnpkg.com/dot-case/-/dot-case-3.0.4.tgz#9b2b670d00a431667a8a75ba29cd1b98809ce751" + integrity sha512-Kv5nKlh6yRrdrGvxeJ2e5y2eRUpkUosIW4A2AS38zwSz27zu7ufDwQPi5Jhs3XAlGNetl3bmnGhQsMtkKJnj3w== + dependencies: + no-case "^3.0.4" + tslib "^2.0.3" + +emoji-regex@^8.0.0: + version "8.0.0" + resolved "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz#e818fd69ce5ccfcb404594f842963bf53164cc37" + integrity sha512-MSjYzcWNOA0ewAHpz0MxpYFvwg6yjy1NG3xteoqz644VCo/RPgnr1/GGt+ic3iJTzQ8Eu3TdM14SawnVUmGE6A== + +enquirer@^2.3.5: + version "2.3.6" + resolved "https://registry.yarnpkg.com/enquirer/-/enquirer-2.3.6.tgz#2a7fe5dd634a1e4125a975ec994ff5456dc3734d" + integrity sha512-yjNnPr315/FjS4zIsUxYguYUPP2e1NK4d7E7ZOLiyYCcbFBiTMyID+2wvm2w6+pZ/odMA7cRkjhsPbltwBOrLg== + dependencies: + ansi-colors "^4.1.1" + +es-check@^5.2.4: version "5.2.4" resolved "https://registry.yarnpkg.com/es-check/-/es-check-5.2.4.tgz#76fe2d96ad238bd8ec1d9c3b3d0e98ddbcc723e7" integrity sha512-FZ3qAJ9hwguqPvGGagaKAVDnusSkezeHbiKNM5rOepOjloeVuX2e6meMxQ+mKcnWbAFucCG7fszNrzUT8bvHcQ== @@ -274,6 +442,129 @@ escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.5: resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4" integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ= +escape-string-regexp@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz#14ba83a5d373e3d311e5afca29cf5bfad965bf34" + integrity sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA== + +eslint-config-google@^0.14.0: + version "0.14.0" + resolved "https://registry.yarnpkg.com/eslint-config-google/-/eslint-config-google-0.14.0.tgz#4f5f8759ba6e11b424294a219dbfa18c508bcc1a" + integrity sha512-WsbX4WbjuMvTdeVL6+J3rK1RGhCTqjsFjX7UMSMgZiyxxaNLkoJENbrGExzERFeoTpGw3F3FypTiWAP9ZXzkEw== + +eslint-scope@^5.1.1: + version "5.1.1" + resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-5.1.1.tgz#e786e59a66cb92b3f6c1fb0d508aab174848f48c" + integrity sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw== + dependencies: + esrecurse "^4.3.0" + estraverse "^4.1.1" + +eslint-utils@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-2.1.0.tgz#d2de5e03424e707dc10c74068ddedae708741b27" + integrity sha512-w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg== + dependencies: + eslint-visitor-keys "^1.1.0" + +eslint-visitor-keys@^1.1.0, eslint-visitor-keys@^1.3.0: + version "1.3.0" + resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz#30ebd1ef7c2fdff01c3a4f151044af25fab0523e" + integrity sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ== + +eslint-visitor-keys@^2.0.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz#f65328259305927392c938ed44eb0a5c9b2bd303" + integrity sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw== + +eslint@^7.29.0: + version "7.29.0" + resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.29.0.tgz#ee2a7648f2e729485e4d0bd6383ec1deabc8b3c0" + integrity sha512-82G/JToB9qIy/ArBzIWG9xvvwL3R86AlCjtGw+A29OMZDqhTybz/MByORSukGxeI+YPCR4coYyITKk8BFH9nDA== + dependencies: + "@babel/code-frame" "7.12.11" + "@eslint/eslintrc" "^0.4.2" + ajv "^6.10.0" + chalk "^4.0.0" + cross-spawn "^7.0.2" + debug "^4.0.1" + doctrine "^3.0.0" + enquirer "^2.3.5" + escape-string-regexp "^4.0.0" + eslint-scope "^5.1.1" + eslint-utils "^2.1.0" + eslint-visitor-keys "^2.0.0" + espree "^7.3.1" + esquery "^1.4.0" + esutils "^2.0.2" + fast-deep-equal "^3.1.3" + file-entry-cache "^6.0.1" + functional-red-black-tree "^1.0.1" + glob-parent "^5.1.2" + globals "^13.6.0" + ignore "^4.0.6" + import-fresh "^3.0.0" + imurmurhash "^0.1.4" + is-glob "^4.0.0" + js-yaml "^3.13.1" + json-stable-stringify-without-jsonify "^1.0.1" + levn "^0.4.1" + lodash.merge "^4.6.2" + minimatch "^3.0.4" + natural-compare "^1.4.0" + optionator "^0.9.1" + progress "^2.0.0" + regexpp "^3.1.0" + semver "^7.2.1" + strip-ansi "^6.0.0" + strip-json-comments "^3.1.0" + table "^6.0.9" + text-table "^0.2.0" + v8-compile-cache "^2.0.3" + +espree@^7.3.0, espree@^7.3.1: + version "7.3.1" + resolved "https://registry.yarnpkg.com/espree/-/espree-7.3.1.tgz#f2df330b752c6f55019f8bd89b7660039c1bbbb6" + integrity sha512-v3JCNCE64umkFpmkFGqzVKsOT0tN1Zr+ueqLZfpV1Ob8e+CEgPWa+OxCoGH3tnhimMKIaBm4m/vaRpJ/krRz2g== + dependencies: + acorn "^7.4.0" + acorn-jsx "^5.3.1" + eslint-visitor-keys "^1.3.0" + +esprima@^4.0.0: + version "4.0.1" + resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71" + integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A== + +esquery@^1.4.0: + version "1.4.0" + resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.4.0.tgz#2148ffc38b82e8c7057dfed48425b3e61f0f24a5" + integrity sha512-cCDispWt5vHHtwMY2YrAQ4ibFkAL8RbH5YGBnZBc90MolvvfkkQcJro/aZiAQUlQ3qgrYS6D6v8Gc5G5CQsc9w== + dependencies: + estraverse "^5.1.0" + +esrecurse@^4.3.0: + version "4.3.0" + resolved "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.3.0.tgz#7ad7964d679abb28bee72cec63758b1c5d2c9921" + integrity sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag== + dependencies: + estraverse "^5.2.0" + +estraverse@^4.1.1: + version "4.3.0" + resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.3.0.tgz#398ad3f3c5a24948be7725e83d11a7de28cdbd1d" + integrity sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw== + +estraverse@^5.1.0, estraverse@^5.2.0: + version "5.2.0" + resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-5.2.0.tgz#307df42547e6cc7324d3cf03c155d5cdb8c53880" + integrity sha512-BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ== + +esutils@^2.0.2: + version "2.0.3" + resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.3.tgz#74d2eb4de0b8da1293711910d50775b9b710ef64" + integrity sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g== + exit-hook@^1.0.0: version "1.1.1" resolved "https://registry.yarnpkg.com/exit-hook/-/exit-hook-1.1.1.tgz#f05ca233b48c05d54fff07765df8507e95c02ff8" @@ -298,6 +589,16 @@ eyes@0.1.x: resolved "https://registry.yarnpkg.com/eyes/-/eyes-0.1.8.tgz#62cf120234c683785d902348a800ef3e0cc20bc0" integrity sha1-Ys8SAjTGg3hdkCNIqADvPgzCC8A= +fast-deep-equal@^3.1.1, fast-deep-equal@^3.1.3: + version "3.1.3" + resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525" + integrity sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q== + +fast-json-stable-stringify@^2.0.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz#874bf69c6f404c2b5d99c481341399fd55892633" + integrity sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw== + fast-levenshtein@^2.0.6: version "2.0.6" resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917" @@ -311,11 +612,36 @@ figures@^1.3.5: escape-string-regexp "^1.0.5" object-assign "^4.1.0" +file-entry-cache@^6.0.1: + version "6.0.1" + resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-6.0.1.tgz#211b2dd9659cb0394b073e7323ac3c933d522027" + integrity sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg== + dependencies: + flat-cache "^3.0.4" + +flat-cache@^3.0.4: + version "3.0.4" + resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-3.0.4.tgz#61b0338302b2fe9f957dcc32fc2a87f1c3048b11" + integrity sha512-dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg== + dependencies: + flatted "^3.1.0" + rimraf "^3.0.2" + +flatted@^3.1.0: + version "3.1.1" + resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.1.1.tgz#c4b489e80096d9df1dfc97c79871aea7c617c469" + integrity sha512-zAoAQiudy+r5SvnSw3KJy5os/oRJYHzrzja/tBDqrZtNhUw8bt6y8OBzMWcjWr+8liV8Eb6yOhw8WZ7VFZ5ZzA== + fs.realpath@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f" integrity sha1-FQStJSMVjKpA20onh8sBQRmU6k8= +functional-red-black-tree@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz#1b0ab3bd553b2a0d6399d29c0e3ea0b252078327" + integrity sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc= + gauge@~1.2.5: version "1.2.7" resolved "https://registry.yarnpkg.com/gauge/-/gauge-1.2.7.tgz#e9cec5483d3d4ee0ef44b60a7d99e4935e136d93" @@ -327,7 +653,14 @@ gauge@~1.2.5: lodash.padend "^4.1.0" lodash.padstart "^4.1.0" -glob@^7.1.2: +glob-parent@^5.1.2: + version "5.1.2" + resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.2.tgz#869832c58034fe68a4093c17dc15e8340d8401c4" + integrity sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow== + dependencies: + is-glob "^4.0.1" + +glob@^7.1.2, glob@^7.1.3: version "7.1.7" resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.7.tgz#3b193e9233f01d42d0b3f78294bbeeb418f94a90" integrity sha512-OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ== @@ -339,40 +672,47 @@ glob@^7.1.2: once "^1.3.0" path-is-absolute "^1.0.0" -google-closure-compiler-java@^20200920.0.0: - version "20200920.0.0" - resolved "https://registry.yarnpkg.com/google-closure-compiler-java/-/google-closure-compiler-java-20200920.0.0.tgz#23519b14e004f2a9eda4f5b887842ae46ad7022e" - integrity sha512-q8m/+QLBWrzjg5VZ2b4B628zDvbi0Gyenj9bvZQlPY7mqj68HXhe5aOfKzZO7vXgHDXMvsvI3v/1g5mPAku/5w== +globals@^13.6.0, globals@^13.9.0: + version "13.9.0" + resolved "https://registry.yarnpkg.com/globals/-/globals-13.9.0.tgz#4bf2bf635b334a173fb1daf7c5e6b218ecdc06cb" + integrity sha512-74/FduwI/JaIrr1H8e71UbDE+5x7pIPs1C2rrwC52SszOo043CsWOZEMW7o2Y58xwm9b+0RBKDxY5n2sUpEFxA== + dependencies: + type-fest "^0.20.2" -google-closure-compiler-linux@^20200920.0.0: - version "20200920.0.0" - resolved "https://registry.yarnpkg.com/google-closure-compiler-linux/-/google-closure-compiler-linux-20200920.0.0.tgz#622c28a784e8a93f9cc5e7cd7b675d2ed0e11d0b" - integrity sha512-F5HcTbeklcaxdWzlZu5b1ZKzCt1kSBUWsBfvlrDCFkA2pdBxIIC2VPokGAUZCqlfno2J2gYARz8FNCrx0tCx5g== +google-closure-compiler-java@^20210601.0.0: + version "20210601.0.0" + resolved "https://registry.yarnpkg.com/google-closure-compiler-java/-/google-closure-compiler-java-20210601.0.0.tgz#88dc11b334bee6a704d9674c5143fd2e0d553517" + integrity sha512-bH6nIwOmp4qDWvlbXx5/DE3XA2aDGQoCpmRYZJGONY1Sy6Xfbq0ioXRHH9eBDP9hxhCJ5Sd/K89A0NZ8Nz9RJA== -google-closure-compiler-osx@^20200920.0.0: - version "20200920.0.0" - resolved "https://registry.yarnpkg.com/google-closure-compiler-osx/-/google-closure-compiler-osx-20200920.0.0.tgz#6157a06e7d851d25d60de95c4bcd464d768278b1" - integrity sha512-2WY+HaUWVQNg9WZs9d4Op3zvS6yIVN2AIouU4grwYWXfFk+CMXZou0ASlsOURaYc2WZ22LW/G1w3vINDoCkSww== +google-closure-compiler-linux@^20210601.0.0: + version "20210601.0.0" + resolved "https://registry.yarnpkg.com/google-closure-compiler-linux/-/google-closure-compiler-linux-20210601.0.0.tgz#6e5dd7b00b96dc1fd1ba30e3401af85558768322" + integrity sha512-rnEQt7zz/1P1SfPhJiHQpfCgMPrsVVyEgDs09h67xn6+LXa9L0RP+hrJDEHqSWwjDPz0BkfUUv6zkqZvp1h/lw== -google-closure-compiler-windows@^20200920.0.0: - version "20200920.0.0" - resolved "https://registry.yarnpkg.com/google-closure-compiler-windows/-/google-closure-compiler-windows-20200920.0.0.tgz#755ddeb8032530c6ed13962e328d9af3269d0748" - integrity sha512-0c4Dem3em3ASNpcR/2USx1Kvb+I7L2MvsV1IZ5Pu98jTuhnkmlccQqPzk2rZR6lllVbVFXTb6tju0JxZ7Zoxjg== +google-closure-compiler-osx@^20210601.0.0: + version "20210601.0.0" + resolved "https://registry.yarnpkg.com/google-closure-compiler-osx/-/google-closure-compiler-osx-20210601.0.0.tgz#e23356bc9ef6e68c2980f60a207f603767b50b21" + integrity sha512-A5r4s/WthR2iLMM0mxsluw8EW2AcOomC5ri/H6FjzpMq0RVEnLTgaGYdXolUAfEzH/7XtJJT2+JkYk3HSLCtrg== -google-closure-compiler@20200920.0.0: - version "20200920.0.0" - resolved "https://registry.yarnpkg.com/google-closure-compiler/-/google-closure-compiler-20200920.0.0.tgz#e1c54b7f1be8cbb33649d8d05e761bbf11e4eaa3" - integrity sha512-IOC77xL3+pYcAM+OVfcILKdrZNEy767JmpdVs2sq3I9+4JoHeKaJrmQXgbcXN2reUmzBw5b5m9Kd036Cr8ouBA== +google-closure-compiler-windows@^20210601.0.0: + version "20210601.0.0" + resolved "https://registry.yarnpkg.com/google-closure-compiler-windows/-/google-closure-compiler-windows-20210601.0.0.tgz#b5400d06bbf0bbd2602ee3ae0c2bc7ebd5829692" + integrity sha512-6r94bPShnB0XXh9+5/qXGDHJN2PQGhF9yJPcgBZj+FAZlQGzlYkT0pkyp+loZT3lG+YRbjD28Lgo7xMcY4xgkA== + +google-closure-compiler@20210601.0.0: + version "20210601.0.0" + resolved "https://registry.yarnpkg.com/google-closure-compiler/-/google-closure-compiler-20210601.0.0.tgz#34597c33c9285ebd3a5364f5299f6c9ddc9fc88a" + integrity sha512-lzzEoG2VTB7uUjnWnMyeZMU163w69HJpM27yh8Up9Ha5McHZeESjt3NRwU8cWMbCRdY06nFbRCDIVCRcadHCiw== dependencies: chalk "2.x" - google-closure-compiler-java "^20200920.0.0" + google-closure-compiler-java "^20210601.0.0" minimist "1.x" vinyl "2.x" vinyl-sourcemaps-apply "^0.2.0" optionalDependencies: - google-closure-compiler-linux "^20200920.0.0" - google-closure-compiler-osx "^20200920.0.0" - google-closure-compiler-windows "^20200920.0.0" + google-closure-compiler-linux "^20210601.0.0" + google-closure-compiler-osx "^20210601.0.0" + google-closure-compiler-windows "^20210601.0.0" has-ansi@^2.0.0: version "2.0.0" @@ -386,6 +726,11 @@ has-flag@^3.0.0: resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd" integrity sha1-tdRU3CGZriJWmfNGfloH87lVuv0= +has-flag@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b" + integrity sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ== + has-unicode@^2.0.0: version "2.0.1" resolved "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9" @@ -396,18 +741,36 @@ he@^1.2.0: resolved "https://registry.yarnpkg.com/he/-/he-1.2.0.tgz#84ae65fa7eafb165fddb61566ae14baf05664f0f" integrity sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw== -html-minifier-terser@5.0.2: - version "5.0.2" - resolved "https://registry.yarnpkg.com/html-minifier-terser/-/html-minifier-terser-5.0.2.tgz#0e67a0b062ae1dd0719fc73199479298f807ae16" - integrity sha512-VAaitmbBuHaPKv9bj47XKypRhgDxT/cDLvsPiiF7w+omrN3K0eQhpigV9Z1ilrmHa9e0rOYcD6R/+LCDADGcnQ== +html-minifier-terser@5.1.1: + version "5.1.1" + resolved "https://registry.yarnpkg.com/html-minifier-terser/-/html-minifier-terser-5.1.1.tgz#922e96f1f3bb60832c2634b79884096389b1f054" + integrity sha512-ZPr5MNObqnV/T9akshPKbVgyOqLmy+Bxo7juKCfTfnjNniTAMdy4hz21YQqoofMBJD2kdREaqPPdThoR78Tgxg== dependencies: - camel-case "^3.0.0" - clean-css "^4.2.1" - commander "^4.0.0" + camel-case "^4.1.1" + clean-css "^4.2.3" + commander "^4.1.1" he "^1.2.0" - param-case "^2.1.1" + param-case "^3.0.3" relateurl "^0.2.7" - terser "^4.3.9" + terser "^4.6.3" + +ignore@^4.0.6: + version "4.0.6" + resolved "https://registry.yarnpkg.com/ignore/-/ignore-4.0.6.tgz#750e3db5862087b4737ebac8207ffd1ef27b25fc" + integrity sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg== + +import-fresh@^3.0.0, import-fresh@^3.2.1: + version "3.3.0" + resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.3.0.tgz#37162c25fcb9ebaa2e6e53d5b4d88ce17d9e0c2b" + integrity sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw== + dependencies: + parent-module "^1.0.0" + resolve-from "^4.0.0" + +imurmurhash@^0.1.4: + version "0.1.4" + resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea" + integrity sha1-khi5srkoojixPcT7a21XbyMUU+o= inflight@^1.0.4: version "1.0.6" @@ -442,6 +805,11 @@ inquirer@^1.0.2: strip-ansi "^3.0.0" through "^2.3.6" +is-extglob@^2.1.1: + version "2.1.1" + resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2" + integrity sha1-qIwCU1eR8C7TfHahueqXc8gz+MI= + is-fullwidth-code-point@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz#ef9e31386f031a7f0d643af82fde50c457ef00cb" @@ -454,26 +822,89 @@ is-fullwidth-code-point@^2.0.0: resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz#a3b30a5c4f199183167aaab93beefae3ddfb654f" integrity sha1-o7MKXE8ZkYMWeqq5O+764937ZU8= +is-fullwidth-code-point@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz#f116f8064fe90b3f7844a38997c0b75051269f1d" + integrity sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg== + +is-glob@^4.0.0, is-glob@^4.0.1: + version "4.0.1" + resolved "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.1.tgz#7567dbe9f2f5e2467bc77ab83c4a29482407a5dc" + integrity sha512-5G0tKtBTFImOqDnLB2hG6Bp2qcKEFduo4tZu9MT/H6NQv/ghhy30o55ufafxJ/LdH79LLs2Kfrn85TLKyA7BUg== + dependencies: + is-extglob "^2.1.1" + isarray@~1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11" integrity sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE= +isexe@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10" + integrity sha1-6PvzdNxVb/iUehDcsFctYz8s+hA= + isstream@0.1.x: version "0.1.2" resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a" integrity sha1-R+Y/evVa+m+S4VAOaQ64uFKcCZo= +js-tokens@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499" + integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ== + +js-yaml@^3.13.1: + version "3.14.1" + resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.14.1.tgz#dae812fdb3825fa306609a8717383c50c36a0537" + integrity sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g== + dependencies: + argparse "^1.0.7" + esprima "^4.0.0" + +json-schema-traverse@^0.4.1: + version "0.4.1" + resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz#69f6a87d9513ab8bb8fe63bdb0979c448e684660" + integrity sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg== + +json-schema-traverse@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz#ae7bcb3656ab77a73ba5c49bf654f38e6b6860e2" + integrity sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug== + +json-stable-stringify-without-jsonify@^1.0.1: + version "1.0.1" + resolved "https://registry.yarnpkg.com/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz#9db7b59496ad3f3cfef30a75142d2d930ad72651" + integrity sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE= + +levn@^0.4.1: + version "0.4.1" + resolved "https://registry.yarnpkg.com/levn/-/levn-0.4.1.tgz#ae4562c007473b932a6200d403268dd2fffc6ade" + integrity sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ== + dependencies: + prelude-ls "^1.2.1" + type-check "~0.4.0" + lodash.camelcase@^4.3.0: version "4.3.0" resolved "https://registry.yarnpkg.com/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz#b28aa6288a2b9fc651035c7711f65ab6190331a6" integrity sha1-soqmKIorn8ZRA1x3EfZathkDMaY= +lodash.clonedeep@^4.5.0: + version "4.5.0" + resolved "https://registry.yarnpkg.com/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz#e23f3f9c4f8fbdde872529c1071857a086e5ccef" + integrity sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8= + lodash.difference@^4.5.0: version "4.5.0" resolved "https://registry.yarnpkg.com/lodash.difference/-/lodash.difference-4.5.0.tgz#9ccb4e505d486b91651345772885a2df27fd017c" integrity sha1-nMtOUF1Ia5FlE0V3KIWi3yf9AXw= +lodash.merge@^4.6.2: + version "4.6.2" + resolved "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.2.tgz#558aa53b43b661e1925a0afdfa36a9a1085fe57a" + integrity sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ== + lodash.pad@^4.1.0: version "4.5.1" resolved "https://registry.yarnpkg.com/lodash.pad/-/lodash.pad-4.5.1.tgz#4330949a833a7c8da22cc20f6a26c4d59debba70" @@ -489,6 +920,11 @@ lodash.padstart@^4.1.0: resolved "https://registry.yarnpkg.com/lodash.padstart/-/lodash.padstart-4.6.1.tgz#d2e3eebff0d9d39ad50f5cbd1b52a7bce6bb611b" integrity sha1-0uPuv/DZ05rVD1y9G1KnvOa7YRs= +lodash.truncate@^4.4.2: + version "4.4.2" + resolved "https://registry.yarnpkg.com/lodash.truncate/-/lodash.truncate-4.4.2.tgz#5a350da0b1113b837ecfffd5812cbe58d6eae193" + integrity sha1-WjUNoLERO4N+z//VgSy+WNbq4ZM= + lodash.uniq@^4.5.0: version "4.5.0" resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773" @@ -499,10 +935,19 @@ lodash@^4.17.14, lodash@^4.3.0: resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c" integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg== -lower-case@^1.1.1: - version "1.1.4" - resolved "https://registry.yarnpkg.com/lower-case/-/lower-case-1.1.4.tgz#9a2cabd1b9e8e0ae993a4bf7d5875c39c42e8eac" - integrity sha1-miyr0bno4K6ZOkv31YdcOcQujqw= +lower-case@^2.0.2: + version "2.0.2" + resolved "https://registry.yarnpkg.com/lower-case/-/lower-case-2.0.2.tgz#6fa237c63dbdc4a82ca0fd882e4722dc5e634e28" + integrity sha512-7fm3l3NAF9WfN6W3JOmf5drwpVqX78JtoGJ3A6W0a6ZnldM41w2fV5D490psKFTpMds8TJse/eHLFFsNHHjHgg== + dependencies: + tslib "^2.0.3" + +lru-cache@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-6.0.0.tgz#6d6fe6570ebd96aaf90fcad1dafa3b2566db3a94" + integrity sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA== + dependencies: + yallist "^4.0.0" micromist@1.1.0: version "1.1.0" @@ -535,6 +980,11 @@ ms@2.0.0: resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8" integrity sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g= +ms@2.1.2: + version "2.1.2" + resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009" + integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w== + mute-stream@0.0.6: version "0.0.6" resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.6.tgz#48962b19e169fd1dfc240b3f1e7317627bbc47db" @@ -545,12 +995,18 @@ nan@~1.0.0: resolved "https://registry.yarnpkg.com/nan/-/nan-1.0.0.tgz#ae24f8850818d662fcab5acf7f3b95bfaa2ccf38" integrity sha1-riT4hQgY1mL8q1rPfzuVv6oszzg= -no-case@^2.2.0: - version "2.3.2" - resolved "https://registry.yarnpkg.com/no-case/-/no-case-2.3.2.tgz#60b813396be39b3f1288a4c1ed5d1e7d28b464ac" - integrity sha512-rmTZ9kz+f3rCvK2TD1Ue/oZlns7OGoIWP4fc3llxxRXlOkHKoWPPWJOfFYpITabSow43QJbRIoHQXtt10VldyQ== +natural-compare@^1.4.0: + version "1.4.0" + resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7" + integrity sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc= + +no-case@^3.0.4: + version "3.0.4" + resolved "https://registry.yarnpkg.com/no-case/-/no-case-3.0.4.tgz#d361fd5c9800f558551a8369fc0dcd4662b6124d" + integrity sha512-fgAN3jGAh+RoxUGZHTSOLJIqUc2wmoBwGR4tbpNAKmmovFoWq0OdRkb0VkldReO2a2iBT/OEulG9XSUc10r3zg== dependencies: - lower-case "^1.1.1" + lower-case "^2.0.2" + tslib "^2.0.3" npmlog@^2.0.3: version "2.0.4" @@ -583,6 +1039,18 @@ onetime@^1.0.0: resolved "https://registry.yarnpkg.com/onetime/-/onetime-1.1.0.tgz#a1f7838f8314c516f05ecefcbc4ccfe04b4ed789" integrity sha1-ofeDj4MUxRbwXs78vEzP4EtO14k= +optionator@^0.9.1: + version "0.9.1" + resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.9.1.tgz#4f236a6373dae0566a6d43e1326674f50c291499" + integrity sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw== + dependencies: + deep-is "^0.1.3" + fast-levenshtein "^2.0.6" + levn "^0.4.1" + prelude-ls "^1.2.1" + type-check "^0.4.0" + word-wrap "^1.2.3" + options@>=0.0.5: version "0.0.6" resolved "https://registry.yarnpkg.com/options/-/options-0.0.6.tgz#ec22d312806bb53e731773e7cdaefcf1c643128f" @@ -598,18 +1066,39 @@ os-tmpdir@~1.0.1: resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274" integrity sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ= -param-case@^2.1.1: - version "2.1.1" - resolved "https://registry.yarnpkg.com/param-case/-/param-case-2.1.1.tgz#df94fd8cf6531ecf75e6bef9a0858fbc72be2247" - integrity sha1-35T9jPZTHs915r75oIWPvHK+Ikc= +param-case@^3.0.3: + version "3.0.4" + resolved "https://registry.yarnpkg.com/param-case/-/param-case-3.0.4.tgz#7d17fe4aa12bde34d4a77d91acfb6219caad01c5" + integrity sha512-RXlj7zCYokReqWpOPH9oYivUzLYZ5vAPIfEmCTNViosC78F8F0H9y7T7gG2M39ymgutxF5gcFEsyZQSph9Bp3A== dependencies: - no-case "^2.2.0" + dot-case "^3.0.4" + tslib "^2.0.3" + +parent-module@^1.0.0: + version "1.0.1" + resolved "https://registry.yarnpkg.com/parent-module/-/parent-module-1.0.1.tgz#691d2709e78c79fae3a156622452d00762caaaa2" + integrity sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g== + dependencies: + callsites "^3.0.0" + +pascal-case@^3.1.2: + version "3.1.2" + resolved "https://registry.yarnpkg.com/pascal-case/-/pascal-case-3.1.2.tgz#b48e0ef2b98e205e7c1dae747d0b1508237660eb" + integrity sha512-uWlGT3YSnK9x3BQJaOdcZwrnV6hPpd8jFH1/ucpiLRPh/2zCVJKS19E4GvYHvaCcACn3foXZ0cLB9Wrx1KGe5g== + dependencies: + no-case "^3.0.4" + tslib "^2.0.3" path-is-absolute@^1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/path-is-absolute/-/path-is-absolute-1.0.1.tgz#174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f" integrity sha1-F0uSaHNVNP+8es5r9TpanhtcX18= +path-key@^3.1.0: + version "3.1.1" + resolved "https://registry.yarnpkg.com/path-key/-/path-key-3.1.1.tgz#581f6ade658cbba65a0d3380de7753295054f375" + integrity sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q== + pinkie-promise@^2.0.0: version "2.0.1" resolved "https://registry.yarnpkg.com/pinkie-promise/-/pinkie-promise-2.0.1.tgz#2135d6dfa7a358c069ac9b178776288228450ffa" @@ -622,6 +1111,11 @@ pinkie@^2.0.0: resolved "https://registry.yarnpkg.com/pinkie/-/pinkie-2.0.4.tgz#72556b80cfa0d48a974e80e77248e80ed4f7f870" integrity sha1-clVrgM+g1IqXToDnckjoDtT3+HA= +prelude-ls@^1.2.1: + version "1.2.1" + resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.2.1.tgz#debc6489d7a6e6b0e7611888cec880337d316396" + integrity sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g== + prettyjson@^1.2.1: version "1.2.1" resolved "https://registry.yarnpkg.com/prettyjson/-/prettyjson-1.2.1.tgz#fcffab41d19cab4dfae5e575e64246619b12d289" @@ -635,6 +1129,16 @@ process-nextick-args@^2.0.0, process-nextick-args@~2.0.0: resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz#7820d9b16120cc55ca9ae7792680ae7dba6d7fe2" integrity sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag== +progress@^2.0.0: + version "2.0.3" + resolved "https://registry.yarnpkg.com/progress/-/progress-2.0.3.tgz#7e8cf8d8f5b8f239c1bc68beb4eb78567d572ef8" + integrity sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA== + +punycode@^2.1.0: + version "2.1.1" + resolved "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz#b58b010ac40c22c5657616c8d2c2c02c7bf479ec" + integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A== + readable-stream@^2.0.6, readable-stream@^2.2.2, readable-stream@^2.3.5: version "2.3.7" resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.7.tgz#1eca1cf711aef814c04f62252a36a62f6cb23b57" @@ -648,6 +1152,11 @@ readable-stream@^2.0.6, readable-stream@^2.2.2, readable-stream@^2.3.5: string_decoder "~1.1.1" util-deprecate "~1.0.1" +regexpp@^3.1.0: + version "3.2.0" + resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-3.2.0.tgz#0425a2768d8f23bad70ca4b90461fa2f1213e1b2" + integrity sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg== + relateurl@^0.2.7: version "0.2.7" resolved "https://registry.yarnpkg.com/relateurl/-/relateurl-0.2.7.tgz#54dbf377e51440aca90a4cd274600d3ff2d888a9" @@ -663,6 +1172,16 @@ replace-ext@^1.0.0: resolved "https://registry.yarnpkg.com/replace-ext/-/replace-ext-1.0.1.tgz#2d6d996d04a15855d967443631dd5f77825b016a" integrity sha512-yD5BHCe7quCgBph4rMQ+0KkIRKwWCrHDOX1p1Gp6HwjPM5kVoCdKGNhN7ydqqsX6lJEnQDKZ/tFMiEdQ1dvPEw== +require-from-string@^2.0.2: + version "2.0.2" + resolved "https://registry.yarnpkg.com/require-from-string/-/require-from-string-2.0.2.tgz#89a7fdd938261267318eafe14f9c32e598c36909" + integrity sha512-Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw== + +resolve-from@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-4.0.0.tgz#4abcd852ad32dd7baabfe9b40e00a36db5f392e6" + integrity sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g== + restore-cursor@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-1.0.1.tgz#34661f46886327fed2991479152252df92daa541" @@ -671,6 +1190,13 @@ restore-cursor@^1.0.1: exit-hook "^1.0.0" onetime "^1.0.0" +rimraf@^3.0.2: + version "3.0.2" + resolved "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.2.tgz#f1a5402ba6220ad52cc1282bac1ae3aa49fd061a" + integrity sha512-JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA== + dependencies: + glob "^7.1.3" + run-async@^2.2.0: version "2.4.1" resolved "https://registry.yarnpkg.com/run-async/-/run-async-2.4.1.tgz#8440eccf99ea3e70bd409d49aab88e10c189a455" @@ -686,6 +1212,34 @@ safe-buffer@~5.1.0, safe-buffer@~5.1.1: resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d" integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g== +semver@^7.2.1: + version "7.3.5" + resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.5.tgz#0b621c879348d8998e4b0e4be94b3f12e6018ef7" + integrity sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ== + dependencies: + lru-cache "^6.0.0" + +shebang-command@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/shebang-command/-/shebang-command-2.0.0.tgz#ccd0af4f8835fbdc265b82461aaf0c36663f34ea" + integrity sha512-kHxr2zZpYtdmrN1qDjrrX/Z1rR1kG8Dx+gkpK1G4eXmvXswmcE1hTWBWYUzlraYw1/yZp6YuDY77YtvbN0dmDA== + dependencies: + shebang-regex "^3.0.0" + +shebang-regex@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-3.0.0.tgz#ae16f1644d873ecad843b0307b143362d4c42172" + integrity sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A== + +slice-ansi@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-4.0.0.tgz#500e8dd0fd55b05815086255b3195adf2a45fe6b" + integrity sha512-qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ== + dependencies: + ansi-styles "^4.0.0" + astral-regex "^2.0.0" + is-fullwidth-code-point "^3.0.0" + source-map-support@~0.5.12: version "0.5.19" resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.19.tgz#a98b62f86dcaf4f67399648c085291ab9e8fed61" @@ -694,12 +1248,7 @@ source-map-support@~0.5.12: buffer-from "^1.0.0" source-map "^0.6.0" -source-map@0.5.6: - version "0.5.6" - resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.6.tgz#75ce38f52bf0733c5a7f0c118d81334a2bb5f412" - integrity sha1-dc449SvwczxafwwRjYEzSiu19BI= - -source-map@^0.5.1: +source-map@0.5.7, source-map@^0.5.1: version "0.5.7" resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc" integrity sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w= @@ -717,6 +1266,11 @@ spawn-sync@^1.0.15: concat-stream "^1.4.7" os-shim "^0.1.2" +sprintf-js@~1.0.2: + version "1.0.3" + resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz#04e6926f662895354f3dd015203633b857297e2c" + integrity sha1-BOaSb2YolTVPPdAVIDYzuFcpfiw= + stack-trace@0.0.x: version "0.0.10" resolved "https://registry.yarnpkg.com/stack-trace/-/stack-trace-0.0.10.tgz#547c70b347e8d32b4e108ea1a2a159e5fdde19c0" @@ -739,6 +1293,15 @@ string-width@^2.1.1: is-fullwidth-code-point "^2.0.0" strip-ansi "^4.0.0" +string-width@^4.2.0: + version "4.2.2" + resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.2.tgz#dafd4f9559a7585cfba529c6a0a4f73488ebd4c5" + integrity sha512-XBJbT3N4JhVumXE0eoLU9DCjcaF92KLNqTmFCnG1pf8duUxFGwtP6AD6nkjw9a3IdiRtL3E2w3JDiE/xi3vOeA== + dependencies: + emoji-regex "^8.0.0" + is-fullwidth-code-point "^3.0.0" + strip-ansi "^6.0.0" + string_decoder@~1.1.1: version "1.1.1" resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.1.1.tgz#9cf1611ba62685d7030ae9e4ba34149c3af03fc8" @@ -760,6 +1323,18 @@ strip-ansi@^4.0.0: dependencies: ansi-regex "^3.0.0" +strip-ansi@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.0.tgz#0b1571dd7669ccd4f3e06e14ef1eed26225ae532" + integrity sha512-AuvKTrTfQNYNIctbR1K/YGTR1756GycPsg7b9bdV9Duqur4gv6aKqHXah67Z8ImS7WEz5QVcOtlfW2rZEugt6w== + dependencies: + ansi-regex "^5.0.0" + +strip-json-comments@^3.1.0, strip-json-comments@^3.1.1: + version "3.1.1" + resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.1.1.tgz#31f1281b3832630434831c310c01cccda8cbe006" + integrity sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig== + supports-color@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7" @@ -772,6 +1347,25 @@ supports-color@^5.3.0: dependencies: has-flag "^3.0.0" +supports-color@^7.1.0: + version "7.2.0" + resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-7.2.0.tgz#1b7dcdcb32b8138801b3e478ba6a51caa89648da" + integrity sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw== + dependencies: + has-flag "^4.0.0" + +table@^6.0.9: + version "6.7.1" + resolved "https://registry.yarnpkg.com/table/-/table-6.7.1.tgz#ee05592b7143831a8c94f3cee6aae4c1ccef33e2" + integrity sha512-ZGum47Yi6KOOFDE8m223td53ath2enHcYLgOCjGr5ngu8bdIARQk6mN/wRMv4yMRcHnCSnHbCEha4sobQx5yWg== + dependencies: + ajv "^8.0.1" + lodash.clonedeep "^4.5.0" + lodash.truncate "^4.4.2" + slice-ansi "^4.0.0" + string-width "^4.2.0" + strip-ansi "^6.0.0" + tabtab@^2.2.2: version "2.2.2" resolved "https://registry.yarnpkg.com/tabtab/-/tabtab-2.2.2.tgz#7a047f143b010b4cbd31f857e82961512cbf4e14" @@ -786,7 +1380,7 @@ tabtab@^2.2.2: npmlog "^2.0.3" object-assign "^4.1.0" -terser@^4.3.9: +terser@^4.6.3: version "4.8.0" resolved "https://registry.yarnpkg.com/terser/-/terser-4.8.0.tgz#63056343d7c70bb29f3af665865a46fe03a0df17" integrity sha512-EAPipTNeWsb/3wLPeup1tVPaXfIaU68xMnVdPafIL1TV05OhASArYyIfFvnvJCNrR2NIOvDVNNTFRa+Re2MWyw== @@ -795,6 +1389,11 @@ terser@^4.3.9: source-map "~0.6.1" source-map-support "~0.5.12" +text-table@^0.2.0: + version "0.2.0" + resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4" + integrity sha1-f17oI66AUgfACvLfSoTsP8+lcLQ= + through@^2.3.6: version "2.3.8" resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5" @@ -812,21 +1411,45 @@ tmp@^0.0.29: dependencies: os-tmpdir "~1.0.1" +tslib@^2.0.3: + version "2.3.0" + resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.3.0.tgz#803b8cdab3e12ba581a4ca41c8839bbb0dacb09e" + integrity sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg== + +type-check@^0.4.0, type-check@~0.4.0: + version "0.4.0" + resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.4.0.tgz#07b8203bfa7056c0657050e3ccd2c37730bab8f1" + integrity sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew== + dependencies: + prelude-ls "^1.2.1" + +type-fest@^0.20.2: + version "0.20.2" + resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.20.2.tgz#1bf207f4b28f91583666cb5fbd327887301cd5f4" + integrity sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ== + typedarray@^0.0.6: version "0.0.6" resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777" integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c= -upper-case@^1.1.1: - version "1.1.3" - resolved "https://registry.yarnpkg.com/upper-case/-/upper-case-1.1.3.tgz#f6b4501c2ec4cdd26ba78be7222961de77621598" - integrity sha1-9rRQHC7EzdJrp4vnIilh3ndiFZg= +uri-js@^4.2.2: + version "4.4.1" + resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.4.1.tgz#9b1a52595225859e55f669d928f88c6c57f2a77e" + integrity sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg== + dependencies: + punycode "^2.1.0" util-deprecate@~1.0.1: version "1.0.2" resolved "https://registry.yarnpkg.com/util-deprecate/-/util-deprecate-1.0.2.tgz#450d4dc9fa70de732762fbd2d4a28981419a0ccf" integrity sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8= +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" + integrity sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA== + vinyl-sourcemaps-apply@^0.2.0: version "0.2.1" resolved "https://registry.yarnpkg.com/vinyl-sourcemaps-apply/-/vinyl-sourcemaps-apply-0.2.1.tgz#ab6549d61d172c2b1b87be5c508d239c8ef87705" @@ -835,9 +1458,9 @@ vinyl-sourcemaps-apply@^0.2.0: source-map "^0.5.1" vinyl@2.x: - version "2.2.0" - resolved "https://registry.yarnpkg.com/vinyl/-/vinyl-2.2.0.tgz#d85b07da96e458d25b2ffe19fece9f2caa13ed86" - integrity sha512-MBH+yP0kC/GQ5GwBqrTPTzEfiiLjta7hTtvQtbxBgTeSXsmKQRQecjibMbxIXzVT3Y9KJK+drOz1/k+vsu8Nkg== + version "2.2.1" + resolved "https://registry.yarnpkg.com/vinyl/-/vinyl-2.2.1.tgz#23cfb8bbab5ece3803aa2c0a1eb28af7cbba1974" + integrity sha512-LII3bXRFBZLlezoG5FfZVcXflZgWP/4dCwKtxd5ky9+LOtM4CS3bIRQsmR1KMnMW07jpE8fqR2lcxPZ+8sJIcw== dependencies: clone "^2.1.1" clone-buffer "^1.0.0" @@ -851,6 +1474,13 @@ wasm2c@1.0.0: resolved "https://registry.yarnpkg.com/wasm2c/-/wasm2c-1.0.0.tgz#761671e141c46b8a7c6c54429db1e6bfa3cd0ec0" integrity sha512-4SIESF2JNxrry6XFa/UQcsQibn+bxPkQ/oqixiXz2o8fsMl8J4vtvhH/evgbi8vZajAlaukuihEcQTWb9tVLUA== +which@^2.0.1: + version "2.0.2" + resolved "https://registry.yarnpkg.com/which/-/which-2.0.2.tgz#7c6a8dd0a636a0327e10b59c9286eee93f3f51b1" + integrity sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA== + dependencies: + isexe "^2.0.0" + winston@^2.3.1: version "2.4.5" resolved "https://registry.yarnpkg.com/winston/-/winston-2.4.5.tgz#f2e431d56154c4ea765545fc1003bd340c95b59a" @@ -863,6 +1493,11 @@ winston@^2.3.1: isstream "0.1.x" stack-trace "0.0.x" +word-wrap@^1.2.3: + version "1.2.3" + resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.3.tgz#610636f6b1f703891bd34771ccb17fb93b47079c" + integrity sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ== + wrappy@1: version "1.0.2" resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f" @@ -877,3 +1512,8 @@ ws@~0.4.28: nan "~1.0.0" options ">=0.0.5" tinycolor "0.x" + +yallist@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72" + integrity sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A== diff --git a/third_party/nixpkgs/pkgs/development/compilers/emscripten/yarn.nix b/third_party/nixpkgs/pkgs/development/compilers/emscripten/yarn.nix index f053d5f30c..e4281f4856 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/emscripten/yarn.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/emscripten/yarn.nix @@ -2,11 +2,51 @@ offline_cache = linkFarm "offline" packages; packages = [ { - name = "acorn___acorn_7.3.1.tgz"; + name = "_babel_code_frame___code_frame_7.12.11.tgz"; path = fetchurl { - name = "acorn___acorn_7.3.1.tgz"; - url = "https://registry.yarnpkg.com/acorn/-/acorn-7.3.1.tgz"; - sha1 = "85010754db53c3fbaf3b9ea3e083aa5c5d147ffd"; + name = "_babel_code_frame___code_frame_7.12.11.tgz"; + url = "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.12.11.tgz"; + sha1 = "f4ad435aa263db935b8f10f2c552d23fb716a63f"; + }; + } + { + name = "_babel_helper_validator_identifier___helper_validator_identifier_7.14.5.tgz"; + path = fetchurl { + name = "_babel_helper_validator_identifier___helper_validator_identifier_7.14.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.14.5.tgz"; + sha1 = "d0f0e277c512e0c938277faa85a3968c9a44c0e8"; + }; + } + { + name = "_babel_highlight___highlight_7.14.5.tgz"; + path = fetchurl { + name = "_babel_highlight___highlight_7.14.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.14.5.tgz"; + sha1 = "6861a52f03966405001f6aa534a01a24d99e8cd9"; + }; + } + { + name = "_eslint_eslintrc___eslintrc_0.4.2.tgz"; + path = fetchurl { + name = "_eslint_eslintrc___eslintrc_0.4.2.tgz"; + url = "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-0.4.2.tgz"; + sha1 = "f63d0ef06f5c0c57d76c4ab5f63d3835c51b0179"; + }; + } + { + name = "acorn_jsx___acorn_jsx_5.3.1.tgz"; + path = fetchurl { + name = "acorn_jsx___acorn_jsx_5.3.1.tgz"; + url = "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.1.tgz"; + sha1 = "fc8661e11b7ac1539c47dbfea2e72b3af34d267b"; + }; + } + { + name = "acorn___acorn_8.4.1.tgz"; + path = fetchurl { + name = "acorn___acorn_8.4.1.tgz"; + url = "https://registry.yarnpkg.com/acorn/-/acorn-8.4.1.tgz"; + sha1 = "56c36251fc7cabc7096adc18f05afe814321a28c"; }; } { @@ -17,6 +57,38 @@ sha1 = "35866fd710528e92de10cf06016498e47e39e1e6"; }; } + { + name = "acorn___acorn_7.4.1.tgz"; + path = fetchurl { + name = "acorn___acorn_7.4.1.tgz"; + url = "https://registry.yarnpkg.com/acorn/-/acorn-7.4.1.tgz"; + sha1 = "feaed255973d2e77555b83dbc08851a6c63520fa"; + }; + } + { + name = "ajv___ajv_6.12.6.tgz"; + path = fetchurl { + name = "ajv___ajv_6.12.6.tgz"; + url = "https://registry.yarnpkg.com/ajv/-/ajv-6.12.6.tgz"; + sha1 = "baf5a62e802b07d977034586f8c3baf5adf26df4"; + }; + } + { + name = "ajv___ajv_8.6.0.tgz"; + path = fetchurl { + name = "ajv___ajv_8.6.0.tgz"; + url = "https://registry.yarnpkg.com/ajv/-/ajv-8.6.0.tgz"; + sha1 = "60cc45d9c46a477d80d92c48076d972c342e5720"; + }; + } + { + name = "ansi_colors___ansi_colors_4.1.1.tgz"; + path = fetchurl { + name = "ansi_colors___ansi_colors_4.1.1.tgz"; + url = "https://registry.yarnpkg.com/ansi-colors/-/ansi-colors-4.1.1.tgz"; + sha1 = "cbb9ae256bf750af1eab344f229aa27fe94ba348"; + }; + } { name = "ansi_escapes___ansi_escapes_1.4.0.tgz"; path = fetchurl { @@ -41,6 +113,14 @@ sha1 = "ed0317c322064f79466c02966bddb605ab37d998"; }; } + { + name = "ansi_regex___ansi_regex_5.0.0.tgz"; + path = fetchurl { + name = "ansi_regex___ansi_regex_5.0.0.tgz"; + url = "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.0.tgz"; + sha1 = "388539f55179bf39339c81af30a654d69f87cb75"; + }; + } { name = "ansi_styles___ansi_styles_2.2.1.tgz"; path = fetchurl { @@ -57,6 +137,14 @@ sha1 = "41fbb20243e50b12be0f04b8dedbf07520ce841d"; }; } + { + name = "ansi_styles___ansi_styles_4.3.0.tgz"; + path = fetchurl { + name = "ansi_styles___ansi_styles_4.3.0.tgz"; + url = "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.3.0.tgz"; + sha1 = "edd803628ae71c04c85ae7a0906edad34b648937"; + }; + } { name = "ansi___ansi_0.3.1.tgz"; path = fetchurl { @@ -73,6 +161,22 @@ sha1 = "4b35c2944f062a8bfcda66410760350fe9ddfc21"; }; } + { + name = "argparse___argparse_1.0.10.tgz"; + path = fetchurl { + name = "argparse___argparse_1.0.10.tgz"; + url = "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz"; + sha1 = "bcd6791ea5ae09725e17e5ad988134cd40b3d911"; + }; + } + { + name = "astral_regex___astral_regex_2.0.0.tgz"; + path = fetchurl { + name = "astral_regex___astral_regex_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/astral-regex/-/astral-regex-2.0.0.tgz"; + sha1 = "483143c567aeed4785759c0865786dc77d7d2e31"; + }; + } { name = "async___async_1.0.0.tgz"; path = fetchurl { @@ -114,11 +218,19 @@ }; } { - name = "camel_case___camel_case_3.0.0.tgz"; + name = "callsites___callsites_3.1.0.tgz"; path = fetchurl { - name = "camel_case___camel_case_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/camel-case/-/camel-case-3.0.0.tgz"; - sha1 = "ca3c3688a4e9cf3a4cda777dc4dcbc713249cf73"; + name = "callsites___callsites_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/callsites/-/callsites-3.1.0.tgz"; + sha1 = "b3630abd8943432f54b3f0519238e33cd7df2f73"; + }; + } + { + name = "camel_case___camel_case_4.1.2.tgz"; + path = fetchurl { + name = "camel_case___camel_case_4.1.2.tgz"; + url = "https://registry.yarnpkg.com/camel-case/-/camel-case-4.1.2.tgz"; + sha1 = "9728072a954f805228225a6deea6b38461e1bd5a"; }; } { @@ -145,6 +257,14 @@ sha1 = "a8115c55e4a702fe4d150abd3872822a7e09fc98"; }; } + { + name = "chalk___chalk_4.1.1.tgz"; + path = fetchurl { + name = "chalk___chalk_4.1.1.tgz"; + url = "https://registry.yarnpkg.com/chalk/-/chalk-4.1.1.tgz"; + sha1 = "c80b3fab28bf6371e6863325eee67e618b77e6ad"; + }; + } { name = "clean_css___clean_css_4.2.3.tgz"; path = fetchurl { @@ -225,6 +345,14 @@ sha1 = "bb71850690e1f136567de629d2d5471deda4c1e8"; }; } + { + name = "color_convert___color_convert_2.0.1.tgz"; + path = fetchurl { + name = "color_convert___color_convert_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/color-convert/-/color-convert-2.0.1.tgz"; + sha1 = "72d3a68d598c9bdb3af2ad1e84f21d896abd4de3"; + }; + } { name = "color_name___color_name_1.1.3.tgz"; path = fetchurl { @@ -233,6 +361,14 @@ sha1 = "a7d0558bd89c42f795dd42328f740831ca53bc25"; }; } + { + name = "color_name___color_name_1.1.4.tgz"; + path = fetchurl { + name = "color_name___color_name_1.1.4.tgz"; + url = "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz"; + sha1 = "c2a09a87acbde69543de6f63fa3995c826c536a2"; + }; + } { name = "colorette___colorette_1.2.2.tgz"; path = fetchurl { @@ -305,6 +441,14 @@ sha1 = "b5fd54220aa2bc5ab57aab7140c940754503c1a7"; }; } + { + name = "cross_spawn___cross_spawn_7.0.3.tgz"; + path = fetchurl { + name = "cross_spawn___cross_spawn_7.0.3.tgz"; + url = "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz"; + sha1 = "f73a85b9d5d41d045551c177e2882d4ac85728a6"; + }; + } { name = "cycle___cycle_1.0.3.tgz"; path = fetchurl { @@ -321,6 +465,22 @@ sha1 = "5d128515df134ff327e90a4c93f4e077a536341f"; }; } + { + name = "debug___debug_4.3.1.tgz"; + path = fetchurl { + name = "debug___debug_4.3.1.tgz"; + url = "https://registry.yarnpkg.com/debug/-/debug-4.3.1.tgz"; + sha1 = "f0d229c505e0c6d8c49ac553d1b13dc183f6b2ee"; + }; + } + { + name = "deep_is___deep_is_0.1.3.tgz"; + path = fetchurl { + name = "deep_is___deep_is_0.1.3.tgz"; + url = "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.3.tgz"; + sha1 = "b369d6fb5dbc13eecf524f91b070feedc357cf34"; + }; + } { name = "delegates___delegates_1.0.0.tgz"; path = fetchurl { @@ -329,6 +489,38 @@ sha1 = "84c6e159b81904fdca59a0ef44cd870d31250f9a"; }; } + { + name = "doctrine___doctrine_3.0.0.tgz"; + path = fetchurl { + name = "doctrine___doctrine_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/doctrine/-/doctrine-3.0.0.tgz"; + sha1 = "addebead72a6574db783639dc87a121773973961"; + }; + } + { + name = "dot_case___dot_case_3.0.4.tgz"; + path = fetchurl { + name = "dot_case___dot_case_3.0.4.tgz"; + url = "https://registry.yarnpkg.com/dot-case/-/dot-case-3.0.4.tgz"; + sha1 = "9b2b670d00a431667a8a75ba29cd1b98809ce751"; + }; + } + { + name = "emoji_regex___emoji_regex_8.0.0.tgz"; + path = fetchurl { + name = "emoji_regex___emoji_regex_8.0.0.tgz"; + url = "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-8.0.0.tgz"; + sha1 = "e818fd69ce5ccfcb404594f842963bf53164cc37"; + }; + } + { + name = "enquirer___enquirer_2.3.6.tgz"; + path = fetchurl { + name = "enquirer___enquirer_2.3.6.tgz"; + url = "https://registry.yarnpkg.com/enquirer/-/enquirer-2.3.6.tgz"; + sha1 = "2a7fe5dd634a1e4125a975ec994ff5456dc3734d"; + }; + } { name = "es_check___es_check_5.2.4.tgz"; path = fetchurl { @@ -345,6 +537,118 @@ sha1 = "1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"; }; } + { + name = "escape_string_regexp___escape_string_regexp_4.0.0.tgz"; + path = fetchurl { + name = "escape_string_regexp___escape_string_regexp_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz"; + sha1 = "14ba83a5d373e3d311e5afca29cf5bfad965bf34"; + }; + } + { + name = "eslint_config_google___eslint_config_google_0.14.0.tgz"; + path = fetchurl { + name = "eslint_config_google___eslint_config_google_0.14.0.tgz"; + url = "https://registry.yarnpkg.com/eslint-config-google/-/eslint-config-google-0.14.0.tgz"; + sha1 = "4f5f8759ba6e11b424294a219dbfa18c508bcc1a"; + }; + } + { + name = "eslint_scope___eslint_scope_5.1.1.tgz"; + path = fetchurl { + name = "eslint_scope___eslint_scope_5.1.1.tgz"; + url = "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-5.1.1.tgz"; + sha1 = "e786e59a66cb92b3f6c1fb0d508aab174848f48c"; + }; + } + { + name = "eslint_utils___eslint_utils_2.1.0.tgz"; + path = fetchurl { + name = "eslint_utils___eslint_utils_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-2.1.0.tgz"; + sha1 = "d2de5e03424e707dc10c74068ddedae708741b27"; + }; + } + { + name = "eslint_visitor_keys___eslint_visitor_keys_1.3.0.tgz"; + path = fetchurl { + name = "eslint_visitor_keys___eslint_visitor_keys_1.3.0.tgz"; + url = "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz"; + sha1 = "30ebd1ef7c2fdff01c3a4f151044af25fab0523e"; + }; + } + { + name = "eslint_visitor_keys___eslint_visitor_keys_2.1.0.tgz"; + path = fetchurl { + name = "eslint_visitor_keys___eslint_visitor_keys_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz"; + sha1 = "f65328259305927392c938ed44eb0a5c9b2bd303"; + }; + } + { + name = "eslint___eslint_7.29.0.tgz"; + path = fetchurl { + name = "eslint___eslint_7.29.0.tgz"; + url = "https://registry.yarnpkg.com/eslint/-/eslint-7.29.0.tgz"; + sha1 = "ee2a7648f2e729485e4d0bd6383ec1deabc8b3c0"; + }; + } + { + name = "espree___espree_7.3.1.tgz"; + path = fetchurl { + name = "espree___espree_7.3.1.tgz"; + url = "https://registry.yarnpkg.com/espree/-/espree-7.3.1.tgz"; + sha1 = "f2df330b752c6f55019f8bd89b7660039c1bbbb6"; + }; + } + { + name = "esprima___esprima_4.0.1.tgz"; + path = fetchurl { + name = "esprima___esprima_4.0.1.tgz"; + url = "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz"; + sha1 = "13b04cdb3e6c5d19df91ab6987a8695619b0aa71"; + }; + } + { + name = "esquery___esquery_1.4.0.tgz"; + path = fetchurl { + name = "esquery___esquery_1.4.0.tgz"; + url = "https://registry.yarnpkg.com/esquery/-/esquery-1.4.0.tgz"; + sha1 = "2148ffc38b82e8c7057dfed48425b3e61f0f24a5"; + }; + } + { + name = "esrecurse___esrecurse_4.3.0.tgz"; + path = fetchurl { + name = "esrecurse___esrecurse_4.3.0.tgz"; + url = "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.3.0.tgz"; + sha1 = "7ad7964d679abb28bee72cec63758b1c5d2c9921"; + }; + } + { + name = "estraverse___estraverse_4.3.0.tgz"; + path = fetchurl { + name = "estraverse___estraverse_4.3.0.tgz"; + url = "https://registry.yarnpkg.com/estraverse/-/estraverse-4.3.0.tgz"; + sha1 = "398ad3f3c5a24948be7725e83d11a7de28cdbd1d"; + }; + } + { + name = "estraverse___estraverse_5.2.0.tgz"; + path = fetchurl { + name = "estraverse___estraverse_5.2.0.tgz"; + url = "https://registry.yarnpkg.com/estraverse/-/estraverse-5.2.0.tgz"; + sha1 = "307df42547e6cc7324d3cf03c155d5cdb8c53880"; + }; + } + { + name = "esutils___esutils_2.0.3.tgz"; + path = fetchurl { + name = "esutils___esutils_2.0.3.tgz"; + url = "https://registry.yarnpkg.com/esutils/-/esutils-2.0.3.tgz"; + sha1 = "74d2eb4de0b8da1293711910d50775b9b710ef64"; + }; + } { name = "exit_hook___exit_hook_1.1.1.tgz"; path = fetchurl { @@ -377,6 +681,22 @@ sha1 = "62cf120234c683785d902348a800ef3e0cc20bc0"; }; } + { + name = "fast_deep_equal___fast_deep_equal_3.1.3.tgz"; + path = fetchurl { + name = "fast_deep_equal___fast_deep_equal_3.1.3.tgz"; + url = "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz"; + sha1 = "3a7d56b559d6cbc3eb512325244e619a65c6c525"; + }; + } + { + name = "fast_json_stable_stringify___fast_json_stable_stringify_2.1.0.tgz"; + path = fetchurl { + name = "fast_json_stable_stringify___fast_json_stable_stringify_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz"; + sha1 = "874bf69c6f404c2b5d99c481341399fd55892633"; + }; + } { name = "fast_levenshtein___fast_levenshtein_2.0.6.tgz"; path = fetchurl { @@ -393,6 +713,30 @@ sha1 = "cbe1e3affcf1cd44b80cadfed28dc793a9701d2e"; }; } + { + name = "file_entry_cache___file_entry_cache_6.0.1.tgz"; + path = fetchurl { + name = "file_entry_cache___file_entry_cache_6.0.1.tgz"; + url = "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-6.0.1.tgz"; + sha1 = "211b2dd9659cb0394b073e7323ac3c933d522027"; + }; + } + { + name = "flat_cache___flat_cache_3.0.4.tgz"; + path = fetchurl { + name = "flat_cache___flat_cache_3.0.4.tgz"; + url = "https://registry.yarnpkg.com/flat-cache/-/flat-cache-3.0.4.tgz"; + sha1 = "61b0338302b2fe9f957dcc32fc2a87f1c3048b11"; + }; + } + { + name = "flatted___flatted_3.1.1.tgz"; + path = fetchurl { + name = "flatted___flatted_3.1.1.tgz"; + url = "https://registry.yarnpkg.com/flatted/-/flatted-3.1.1.tgz"; + sha1 = "c4b489e80096d9df1dfc97c79871aea7c617c469"; + }; + } { name = "fs.realpath___fs.realpath_1.0.0.tgz"; path = fetchurl { @@ -401,6 +745,14 @@ sha1 = "1504ad2523158caa40db4a2787cb01411994ea4f"; }; } + { + name = "functional_red_black_tree___functional_red_black_tree_1.0.1.tgz"; + path = fetchurl { + name = "functional_red_black_tree___functional_red_black_tree_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz"; + sha1 = "1b0ab3bd553b2a0d6399d29c0e3ea0b252078327"; + }; + } { name = "gauge___gauge_1.2.7.tgz"; path = fetchurl { @@ -409,6 +761,14 @@ sha1 = "e9cec5483d3d4ee0ef44b60a7d99e4935e136d93"; }; } + { + name = "glob_parent___glob_parent_5.1.2.tgz"; + path = fetchurl { + name = "glob_parent___glob_parent_5.1.2.tgz"; + url = "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.2.tgz"; + sha1 = "869832c58034fe68a4093c17dc15e8340d8401c4"; + }; + } { name = "glob___glob_7.1.7.tgz"; path = fetchurl { @@ -418,43 +778,51 @@ }; } { - name = "google_closure_compiler_java___google_closure_compiler_java_20200920.0.0.tgz"; + name = "globals___globals_13.9.0.tgz"; path = fetchurl { - name = "google_closure_compiler_java___google_closure_compiler_java_20200920.0.0.tgz"; - url = "https://registry.yarnpkg.com/google-closure-compiler-java/-/google-closure-compiler-java-20200920.0.0.tgz"; - sha1 = "23519b14e004f2a9eda4f5b887842ae46ad7022e"; + name = "globals___globals_13.9.0.tgz"; + url = "https://registry.yarnpkg.com/globals/-/globals-13.9.0.tgz"; + sha1 = "4bf2bf635b334a173fb1daf7c5e6b218ecdc06cb"; }; } { - name = "google_closure_compiler_linux___google_closure_compiler_linux_20200920.0.0.tgz"; + name = "google_closure_compiler_java___google_closure_compiler_java_20210601.0.0.tgz"; path = fetchurl { - name = "google_closure_compiler_linux___google_closure_compiler_linux_20200920.0.0.tgz"; - url = "https://registry.yarnpkg.com/google-closure-compiler-linux/-/google-closure-compiler-linux-20200920.0.0.tgz"; - sha1 = "622c28a784e8a93f9cc5e7cd7b675d2ed0e11d0b"; + name = "google_closure_compiler_java___google_closure_compiler_java_20210601.0.0.tgz"; + url = "https://registry.yarnpkg.com/google-closure-compiler-java/-/google-closure-compiler-java-20210601.0.0.tgz"; + sha1 = "88dc11b334bee6a704d9674c5143fd2e0d553517"; }; } { - name = "google_closure_compiler_osx___google_closure_compiler_osx_20200920.0.0.tgz"; + name = "google_closure_compiler_linux___google_closure_compiler_linux_20210601.0.0.tgz"; path = fetchurl { - name = "google_closure_compiler_osx___google_closure_compiler_osx_20200920.0.0.tgz"; - url = "https://registry.yarnpkg.com/google-closure-compiler-osx/-/google-closure-compiler-osx-20200920.0.0.tgz"; - sha1 = "6157a06e7d851d25d60de95c4bcd464d768278b1"; + name = "google_closure_compiler_linux___google_closure_compiler_linux_20210601.0.0.tgz"; + url = "https://registry.yarnpkg.com/google-closure-compiler-linux/-/google-closure-compiler-linux-20210601.0.0.tgz"; + sha1 = "6e5dd7b00b96dc1fd1ba30e3401af85558768322"; }; } { - name = "google_closure_compiler_windows___google_closure_compiler_windows_20200920.0.0.tgz"; + name = "google_closure_compiler_osx___google_closure_compiler_osx_20210601.0.0.tgz"; path = fetchurl { - name = "google_closure_compiler_windows___google_closure_compiler_windows_20200920.0.0.tgz"; - url = "https://registry.yarnpkg.com/google-closure-compiler-windows/-/google-closure-compiler-windows-20200920.0.0.tgz"; - sha1 = "755ddeb8032530c6ed13962e328d9af3269d0748"; + name = "google_closure_compiler_osx___google_closure_compiler_osx_20210601.0.0.tgz"; + url = "https://registry.yarnpkg.com/google-closure-compiler-osx/-/google-closure-compiler-osx-20210601.0.0.tgz"; + sha1 = "e23356bc9ef6e68c2980f60a207f603767b50b21"; }; } { - name = "google_closure_compiler___google_closure_compiler_20200920.0.0.tgz"; + name = "google_closure_compiler_windows___google_closure_compiler_windows_20210601.0.0.tgz"; path = fetchurl { - name = "google_closure_compiler___google_closure_compiler_20200920.0.0.tgz"; - url = "https://registry.yarnpkg.com/google-closure-compiler/-/google-closure-compiler-20200920.0.0.tgz"; - sha1 = "e1c54b7f1be8cbb33649d8d05e761bbf11e4eaa3"; + name = "google_closure_compiler_windows___google_closure_compiler_windows_20210601.0.0.tgz"; + url = "https://registry.yarnpkg.com/google-closure-compiler-windows/-/google-closure-compiler-windows-20210601.0.0.tgz"; + sha1 = "b5400d06bbf0bbd2602ee3ae0c2bc7ebd5829692"; + }; + } + { + name = "google_closure_compiler___google_closure_compiler_20210601.0.0.tgz"; + path = fetchurl { + name = "google_closure_compiler___google_closure_compiler_20210601.0.0.tgz"; + url = "https://registry.yarnpkg.com/google-closure-compiler/-/google-closure-compiler-20210601.0.0.tgz"; + sha1 = "34597c33c9285ebd3a5364f5299f6c9ddc9fc88a"; }; } { @@ -473,6 +841,14 @@ sha1 = "b5d454dc2199ae225699f3467e5a07f3b955bafd"; }; } + { + name = "has_flag___has_flag_4.0.0.tgz"; + path = fetchurl { + name = "has_flag___has_flag_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz"; + sha1 = "944771fd9c81c81265c4d6941860da06bb59479b"; + }; + } { name = "has_unicode___has_unicode_2.0.1.tgz"; path = fetchurl { @@ -490,11 +866,35 @@ }; } { - name = "html_minifier_terser___html_minifier_terser_5.0.2.tgz"; + name = "html_minifier_terser___html_minifier_terser_5.1.1.tgz"; path = fetchurl { - name = "html_minifier_terser___html_minifier_terser_5.0.2.tgz"; - url = "https://registry.yarnpkg.com/html-minifier-terser/-/html-minifier-terser-5.0.2.tgz"; - sha1 = "0e67a0b062ae1dd0719fc73199479298f807ae16"; + name = "html_minifier_terser___html_minifier_terser_5.1.1.tgz"; + url = "https://registry.yarnpkg.com/html-minifier-terser/-/html-minifier-terser-5.1.1.tgz"; + sha1 = "922e96f1f3bb60832c2634b79884096389b1f054"; + }; + } + { + name = "ignore___ignore_4.0.6.tgz"; + path = fetchurl { + name = "ignore___ignore_4.0.6.tgz"; + url = "https://registry.yarnpkg.com/ignore/-/ignore-4.0.6.tgz"; + sha1 = "750e3db5862087b4737ebac8207ffd1ef27b25fc"; + }; + } + { + name = "import_fresh___import_fresh_3.3.0.tgz"; + path = fetchurl { + name = "import_fresh___import_fresh_3.3.0.tgz"; + url = "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.3.0.tgz"; + sha1 = "37162c25fcb9ebaa2e6e53d5b4d88ce17d9e0c2b"; + }; + } + { + name = "imurmurhash___imurmurhash_0.1.4.tgz"; + path = fetchurl { + name = "imurmurhash___imurmurhash_0.1.4.tgz"; + url = "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz"; + sha1 = "9218b9b2b928a238b13dc4fb6b6d576f231453ea"; }; } { @@ -521,6 +921,14 @@ sha1 = "4dec6f32f37ef7bb0b2ed3f1d1a5c3f545074918"; }; } + { + name = "is_extglob___is_extglob_2.1.1.tgz"; + path = fetchurl { + name = "is_extglob___is_extglob_2.1.1.tgz"; + url = "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz"; + sha1 = "a88c02535791f02ed37c76a1b9ea9773c833f8c2"; + }; + } { name = "is_fullwidth_code_point___is_fullwidth_code_point_1.0.0.tgz"; path = fetchurl { @@ -537,6 +945,22 @@ sha1 = "a3b30a5c4f199183167aaab93beefae3ddfb654f"; }; } + { + name = "is_fullwidth_code_point___is_fullwidth_code_point_3.0.0.tgz"; + path = fetchurl { + name = "is_fullwidth_code_point___is_fullwidth_code_point_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz"; + sha1 = "f116f8064fe90b3f7844a38997c0b75051269f1d"; + }; + } + { + name = "is_glob___is_glob_4.0.1.tgz"; + path = fetchurl { + name = "is_glob___is_glob_4.0.1.tgz"; + url = "https://registry.yarnpkg.com/is-glob/-/is-glob-4.0.1.tgz"; + sha1 = "7567dbe9f2f5e2467bc77ab83c4a29482407a5dc"; + }; + } { name = "isarray___isarray_1.0.0.tgz"; path = fetchurl { @@ -545,6 +969,14 @@ sha1 = "bb935d48582cba168c06834957a54a3e07124f11"; }; } + { + name = "isexe___isexe_2.0.0.tgz"; + path = fetchurl { + name = "isexe___isexe_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz"; + sha1 = "e8fbf374dc556ff8947a10dcb0572d633f2cfa10"; + }; + } { name = "isstream___isstream_0.1.2.tgz"; path = fetchurl { @@ -553,6 +985,54 @@ sha1 = "47e63f7af55afa6f92e1500e690eb8b8529c099a"; }; } + { + name = "js_tokens___js_tokens_4.0.0.tgz"; + path = fetchurl { + name = "js_tokens___js_tokens_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz"; + sha1 = "19203fb59991df98e3a287050d4647cdeaf32499"; + }; + } + { + name = "js_yaml___js_yaml_3.14.1.tgz"; + path = fetchurl { + name = "js_yaml___js_yaml_3.14.1.tgz"; + url = "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.14.1.tgz"; + sha1 = "dae812fdb3825fa306609a8717383c50c36a0537"; + }; + } + { + name = "json_schema_traverse___json_schema_traverse_0.4.1.tgz"; + path = fetchurl { + name = "json_schema_traverse___json_schema_traverse_0.4.1.tgz"; + url = "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz"; + sha1 = "69f6a87d9513ab8bb8fe63bdb0979c448e684660"; + }; + } + { + name = "json_schema_traverse___json_schema_traverse_1.0.0.tgz"; + path = fetchurl { + name = "json_schema_traverse___json_schema_traverse_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz"; + sha1 = "ae7bcb3656ab77a73ba5c49bf654f38e6b6860e2"; + }; + } + { + name = "json_stable_stringify_without_jsonify___json_stable_stringify_without_jsonify_1.0.1.tgz"; + path = fetchurl { + name = "json_stable_stringify_without_jsonify___json_stable_stringify_without_jsonify_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz"; + sha1 = "9db7b59496ad3f3cfef30a75142d2d930ad72651"; + }; + } + { + name = "levn___levn_0.4.1.tgz"; + path = fetchurl { + name = "levn___levn_0.4.1.tgz"; + url = "https://registry.yarnpkg.com/levn/-/levn-0.4.1.tgz"; + sha1 = "ae4562c007473b932a6200d403268dd2fffc6ade"; + }; + } { name = "lodash.camelcase___lodash.camelcase_4.3.0.tgz"; path = fetchurl { @@ -561,6 +1041,14 @@ sha1 = "b28aa6288a2b9fc651035c7711f65ab6190331a6"; }; } + { + name = "lodash.clonedeep___lodash.clonedeep_4.5.0.tgz"; + path = fetchurl { + name = "lodash.clonedeep___lodash.clonedeep_4.5.0.tgz"; + url = "https://registry.yarnpkg.com/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz"; + sha1 = "e23f3f9c4f8fbdde872529c1071857a086e5ccef"; + }; + } { name = "lodash.difference___lodash.difference_4.5.0.tgz"; path = fetchurl { @@ -569,6 +1057,14 @@ sha1 = "9ccb4e505d486b91651345772885a2df27fd017c"; }; } + { + name = "lodash.merge___lodash.merge_4.6.2.tgz"; + path = fetchurl { + name = "lodash.merge___lodash.merge_4.6.2.tgz"; + url = "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.2.tgz"; + sha1 = "558aa53b43b661e1925a0afdfa36a9a1085fe57a"; + }; + } { name = "lodash.pad___lodash.pad_4.5.1.tgz"; path = fetchurl { @@ -593,6 +1089,14 @@ sha1 = "d2e3eebff0d9d39ad50f5cbd1b52a7bce6bb611b"; }; } + { + name = "lodash.truncate___lodash.truncate_4.4.2.tgz"; + path = fetchurl { + name = "lodash.truncate___lodash.truncate_4.4.2.tgz"; + url = "https://registry.yarnpkg.com/lodash.truncate/-/lodash.truncate-4.4.2.tgz"; + sha1 = "5a350da0b1113b837ecfffd5812cbe58d6eae193"; + }; + } { name = "lodash.uniq___lodash.uniq_4.5.0.tgz"; path = fetchurl { @@ -610,11 +1114,19 @@ }; } { - name = "lower_case___lower_case_1.1.4.tgz"; + name = "lower_case___lower_case_2.0.2.tgz"; path = fetchurl { - name = "lower_case___lower_case_1.1.4.tgz"; - url = "https://registry.yarnpkg.com/lower-case/-/lower-case-1.1.4.tgz"; - sha1 = "9a2cabd1b9e8e0ae993a4bf7d5875c39c42e8eac"; + name = "lower_case___lower_case_2.0.2.tgz"; + url = "https://registry.yarnpkg.com/lower-case/-/lower-case-2.0.2.tgz"; + sha1 = "6fa237c63dbdc4a82ca0fd882e4722dc5e634e28"; + }; + } + { + name = "lru_cache___lru_cache_6.0.0.tgz"; + path = fetchurl { + name = "lru_cache___lru_cache_6.0.0.tgz"; + url = "https://registry.yarnpkg.com/lru-cache/-/lru-cache-6.0.0.tgz"; + sha1 = "6d6fe6570ebd96aaf90fcad1dafa3b2566db3a94"; }; } { @@ -657,6 +1169,14 @@ sha1 = "5608aeadfc00be6c2901df5f9861788de0d597c8"; }; } + { + name = "ms___ms_2.1.2.tgz"; + path = fetchurl { + name = "ms___ms_2.1.2.tgz"; + url = "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz"; + sha1 = "d09d1f357b443f493382a8eb3ccd183872ae6009"; + }; + } { name = "mute_stream___mute_stream_0.0.6.tgz"; path = fetchurl { @@ -674,11 +1194,19 @@ }; } { - name = "no_case___no_case_2.3.2.tgz"; + name = "natural_compare___natural_compare_1.4.0.tgz"; path = fetchurl { - name = "no_case___no_case_2.3.2.tgz"; - url = "https://registry.yarnpkg.com/no-case/-/no-case-2.3.2.tgz"; - sha1 = "60b813396be39b3f1288a4c1ed5d1e7d28b464ac"; + name = "natural_compare___natural_compare_1.4.0.tgz"; + url = "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz"; + sha1 = "4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7"; + }; + } + { + name = "no_case___no_case_3.0.4.tgz"; + path = fetchurl { + name = "no_case___no_case_3.0.4.tgz"; + url = "https://registry.yarnpkg.com/no-case/-/no-case-3.0.4.tgz"; + sha1 = "d361fd5c9800f558551a8369fc0dcd4662b6124d"; }; } { @@ -721,6 +1249,14 @@ sha1 = "a1f7838f8314c516f05ecefcbc4ccfe04b4ed789"; }; } + { + name = "optionator___optionator_0.9.1.tgz"; + path = fetchurl { + name = "optionator___optionator_0.9.1.tgz"; + url = "https://registry.yarnpkg.com/optionator/-/optionator-0.9.1.tgz"; + sha1 = "4f236a6373dae0566a6d43e1326674f50c291499"; + }; + } { name = "options___options_0.0.6.tgz"; path = fetchurl { @@ -746,11 +1282,27 @@ }; } { - name = "param_case___param_case_2.1.1.tgz"; + name = "param_case___param_case_3.0.4.tgz"; path = fetchurl { - name = "param_case___param_case_2.1.1.tgz"; - url = "https://registry.yarnpkg.com/param-case/-/param-case-2.1.1.tgz"; - sha1 = "df94fd8cf6531ecf75e6bef9a0858fbc72be2247"; + name = "param_case___param_case_3.0.4.tgz"; + url = "https://registry.yarnpkg.com/param-case/-/param-case-3.0.4.tgz"; + sha1 = "7d17fe4aa12bde34d4a77d91acfb6219caad01c5"; + }; + } + { + name = "parent_module___parent_module_1.0.1.tgz"; + path = fetchurl { + name = "parent_module___parent_module_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/parent-module/-/parent-module-1.0.1.tgz"; + sha1 = "691d2709e78c79fae3a156622452d00762caaaa2"; + }; + } + { + name = "pascal_case___pascal_case_3.1.2.tgz"; + path = fetchurl { + name = "pascal_case___pascal_case_3.1.2.tgz"; + url = "https://registry.yarnpkg.com/pascal-case/-/pascal-case-3.1.2.tgz"; + sha1 = "b48e0ef2b98e205e7c1dae747d0b1508237660eb"; }; } { @@ -761,6 +1313,14 @@ sha1 = "174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"; }; } + { + name = "path_key___path_key_3.1.1.tgz"; + path = fetchurl { + name = "path_key___path_key_3.1.1.tgz"; + url = "https://registry.yarnpkg.com/path-key/-/path-key-3.1.1.tgz"; + sha1 = "581f6ade658cbba65a0d3380de7753295054f375"; + }; + } { name = "pinkie_promise___pinkie_promise_2.0.1.tgz"; path = fetchurl { @@ -777,6 +1337,14 @@ sha1 = "72556b80cfa0d48a974e80e77248e80ed4f7f870"; }; } + { + name = "prelude_ls___prelude_ls_1.2.1.tgz"; + path = fetchurl { + name = "prelude_ls___prelude_ls_1.2.1.tgz"; + url = "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.2.1.tgz"; + sha1 = "debc6489d7a6e6b0e7611888cec880337d316396"; + }; + } { name = "prettyjson___prettyjson_1.2.1.tgz"; path = fetchurl { @@ -793,6 +1361,22 @@ sha1 = "7820d9b16120cc55ca9ae7792680ae7dba6d7fe2"; }; } + { + name = "progress___progress_2.0.3.tgz"; + path = fetchurl { + name = "progress___progress_2.0.3.tgz"; + url = "https://registry.yarnpkg.com/progress/-/progress-2.0.3.tgz"; + sha1 = "7e8cf8d8f5b8f239c1bc68beb4eb78567d572ef8"; + }; + } + { + name = "punycode___punycode_2.1.1.tgz"; + path = fetchurl { + name = "punycode___punycode_2.1.1.tgz"; + url = "https://registry.yarnpkg.com/punycode/-/punycode-2.1.1.tgz"; + sha1 = "b58b010ac40c22c5657616c8d2c2c02c7bf479ec"; + }; + } { name = "readable_stream___readable_stream_2.3.7.tgz"; path = fetchurl { @@ -801,6 +1385,14 @@ sha1 = "1eca1cf711aef814c04f62252a36a62f6cb23b57"; }; } + { + name = "regexpp___regexpp_3.2.0.tgz"; + path = fetchurl { + name = "regexpp___regexpp_3.2.0.tgz"; + url = "https://registry.yarnpkg.com/regexpp/-/regexpp-3.2.0.tgz"; + sha1 = "0425a2768d8f23bad70ca4b90461fa2f1213e1b2"; + }; + } { name = "relateurl___relateurl_0.2.7.tgz"; path = fetchurl { @@ -825,6 +1417,22 @@ sha1 = "2d6d996d04a15855d967443631dd5f77825b016a"; }; } + { + name = "require_from_string___require_from_string_2.0.2.tgz"; + path = fetchurl { + name = "require_from_string___require_from_string_2.0.2.tgz"; + url = "https://registry.yarnpkg.com/require-from-string/-/require-from-string-2.0.2.tgz"; + sha1 = "89a7fdd938261267318eafe14f9c32e598c36909"; + }; + } + { + name = "resolve_from___resolve_from_4.0.0.tgz"; + path = fetchurl { + name = "resolve_from___resolve_from_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/resolve-from/-/resolve-from-4.0.0.tgz"; + sha1 = "4abcd852ad32dd7baabfe9b40e00a36db5f392e6"; + }; + } { name = "restore_cursor___restore_cursor_1.0.1.tgz"; path = fetchurl { @@ -833,6 +1441,14 @@ sha1 = "34661f46886327fed2991479152252df92daa541"; }; } + { + name = "rimraf___rimraf_3.0.2.tgz"; + path = fetchurl { + name = "rimraf___rimraf_3.0.2.tgz"; + url = "https://registry.yarnpkg.com/rimraf/-/rimraf-3.0.2.tgz"; + sha1 = "f1a5402ba6220ad52cc1282bac1ae3aa49fd061a"; + }; + } { name = "run_async___run_async_2.4.1.tgz"; path = fetchurl { @@ -857,6 +1473,38 @@ sha1 = "991ec69d296e0313747d59bdfd2b745c35f8828d"; }; } + { + name = "semver___semver_7.3.5.tgz"; + path = fetchurl { + name = "semver___semver_7.3.5.tgz"; + url = "https://registry.yarnpkg.com/semver/-/semver-7.3.5.tgz"; + sha1 = "0b621c879348d8998e4b0e4be94b3f12e6018ef7"; + }; + } + { + name = "shebang_command___shebang_command_2.0.0.tgz"; + path = fetchurl { + name = "shebang_command___shebang_command_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/shebang-command/-/shebang-command-2.0.0.tgz"; + sha1 = "ccd0af4f8835fbdc265b82461aaf0c36663f34ea"; + }; + } + { + name = "shebang_regex___shebang_regex_3.0.0.tgz"; + path = fetchurl { + name = "shebang_regex___shebang_regex_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/shebang-regex/-/shebang-regex-3.0.0.tgz"; + sha1 = "ae16f1644d873ecad843b0307b143362d4c42172"; + }; + } + { + name = "slice_ansi___slice_ansi_4.0.0.tgz"; + path = fetchurl { + name = "slice_ansi___slice_ansi_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-4.0.0.tgz"; + sha1 = "500e8dd0fd55b05815086255b3195adf2a45fe6b"; + }; + } { name = "source_map_support___source_map_support_0.5.19.tgz"; path = fetchurl { @@ -865,14 +1513,6 @@ sha1 = "a98b62f86dcaf4f67399648c085291ab9e8fed61"; }; } - { - name = "source_map___source_map_0.5.6.tgz"; - path = fetchurl { - name = "source_map___source_map_0.5.6.tgz"; - url = "https://registry.yarnpkg.com/source-map/-/source-map-0.5.6.tgz"; - sha1 = "75ce38f52bf0733c5a7f0c118d81334a2bb5f412"; - }; - } { name = "source_map___source_map_0.5.7.tgz"; path = fetchurl { @@ -897,6 +1537,14 @@ sha1 = "b00799557eb7fb0c8376c29d44e8a1ea67e57476"; }; } + { + name = "sprintf_js___sprintf_js_1.0.3.tgz"; + path = fetchurl { + name = "sprintf_js___sprintf_js_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.0.3.tgz"; + sha1 = "04e6926f662895354f3dd015203633b857297e2c"; + }; + } { name = "stack_trace___stack_trace_0.0.10.tgz"; path = fetchurl { @@ -921,6 +1569,14 @@ sha1 = "ab93f27a8dc13d28cac815c462143a6d9012ae9e"; }; } + { + name = "string_width___string_width_4.2.2.tgz"; + path = fetchurl { + name = "string_width___string_width_4.2.2.tgz"; + url = "https://registry.yarnpkg.com/string-width/-/string-width-4.2.2.tgz"; + sha1 = "dafd4f9559a7585cfba529c6a0a4f73488ebd4c5"; + }; + } { name = "string_decoder___string_decoder_1.1.1.tgz"; path = fetchurl { @@ -945,6 +1601,22 @@ sha1 = "a8479022eb1ac368a871389b635262c505ee368f"; }; } + { + name = "strip_ansi___strip_ansi_6.0.0.tgz"; + path = fetchurl { + name = "strip_ansi___strip_ansi_6.0.0.tgz"; + url = "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.0.tgz"; + sha1 = "0b1571dd7669ccd4f3e06e14ef1eed26225ae532"; + }; + } + { + name = "strip_json_comments___strip_json_comments_3.1.1.tgz"; + path = fetchurl { + name = "strip_json_comments___strip_json_comments_3.1.1.tgz"; + url = "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.1.1.tgz"; + sha1 = "31f1281b3832630434831c310c01cccda8cbe006"; + }; + } { name = "supports_color___supports_color_2.0.0.tgz"; path = fetchurl { @@ -961,6 +1633,22 @@ sha1 = "e2e69a44ac8772f78a1ec0b35b689df6530efc8f"; }; } + { + name = "supports_color___supports_color_7.2.0.tgz"; + path = fetchurl { + name = "supports_color___supports_color_7.2.0.tgz"; + url = "https://registry.yarnpkg.com/supports-color/-/supports-color-7.2.0.tgz"; + sha1 = "1b7dcdcb32b8138801b3e478ba6a51caa89648da"; + }; + } + { + name = "table___table_6.7.1.tgz"; + path = fetchurl { + name = "table___table_6.7.1.tgz"; + url = "https://registry.yarnpkg.com/table/-/table-6.7.1.tgz"; + sha1 = "ee05592b7143831a8c94f3cee6aae4c1ccef33e2"; + }; + } { name = "tabtab___tabtab_2.2.2.tgz"; path = fetchurl { @@ -977,6 +1665,14 @@ sha1 = "63056343d7c70bb29f3af665865a46fe03a0df17"; }; } + { + name = "text_table___text_table_0.2.0.tgz"; + path = fetchurl { + name = "text_table___text_table_0.2.0.tgz"; + url = "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz"; + sha1 = "7f5ee823ae805207c00af2df4a84ec3fcfa570b4"; + }; + } { name = "through___through_2.3.8.tgz"; path = fetchurl { @@ -1001,6 +1697,30 @@ sha1 = "f25125ff0dd9da3ccb0c2dd371ee1288bb9128c0"; }; } + { + name = "tslib___tslib_2.3.0.tgz"; + path = fetchurl { + name = "tslib___tslib_2.3.0.tgz"; + url = "https://registry.yarnpkg.com/tslib/-/tslib-2.3.0.tgz"; + sha1 = "803b8cdab3e12ba581a4ca41c8839bbb0dacb09e"; + }; + } + { + name = "type_check___type_check_0.4.0.tgz"; + path = fetchurl { + name = "type_check___type_check_0.4.0.tgz"; + url = "https://registry.yarnpkg.com/type-check/-/type-check-0.4.0.tgz"; + sha1 = "07b8203bfa7056c0657050e3ccd2c37730bab8f1"; + }; + } + { + name = "type_fest___type_fest_0.20.2.tgz"; + path = fetchurl { + name = "type_fest___type_fest_0.20.2.tgz"; + url = "https://registry.yarnpkg.com/type-fest/-/type-fest-0.20.2.tgz"; + sha1 = "1bf207f4b28f91583666cb5fbd327887301cd5f4"; + }; + } { name = "typedarray___typedarray_0.0.6.tgz"; path = fetchurl { @@ -1010,11 +1730,11 @@ }; } { - name = "upper_case___upper_case_1.1.3.tgz"; + name = "uri_js___uri_js_4.4.1.tgz"; path = fetchurl { - name = "upper_case___upper_case_1.1.3.tgz"; - url = "https://registry.yarnpkg.com/upper-case/-/upper-case-1.1.3.tgz"; - sha1 = "f6b4501c2ec4cdd26ba78be7222961de77621598"; + name = "uri_js___uri_js_4.4.1.tgz"; + url = "https://registry.yarnpkg.com/uri-js/-/uri-js-4.4.1.tgz"; + sha1 = "9b1a52595225859e55f669d928f88c6c57f2a77e"; }; } { @@ -1025,6 +1745,14 @@ sha1 = "450d4dc9fa70de732762fbd2d4a28981419a0ccf"; }; } + { + name = "v8_compile_cache___v8_compile_cache_2.3.0.tgz"; + path = fetchurl { + name = "v8_compile_cache___v8_compile_cache_2.3.0.tgz"; + url = "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz"; + sha1 = "2de19618c66dc247dcfb6f99338035d8245a2cee"; + }; + } { name = "vinyl_sourcemaps_apply___vinyl_sourcemaps_apply_0.2.1.tgz"; path = fetchurl { @@ -1034,11 +1762,11 @@ }; } { - name = "vinyl___vinyl_2.2.0.tgz"; + name = "vinyl___vinyl_2.2.1.tgz"; path = fetchurl { - name = "vinyl___vinyl_2.2.0.tgz"; - url = "https://registry.yarnpkg.com/vinyl/-/vinyl-2.2.0.tgz"; - sha1 = "d85b07da96e458d25b2ffe19fece9f2caa13ed86"; + name = "vinyl___vinyl_2.2.1.tgz"; + url = "https://registry.yarnpkg.com/vinyl/-/vinyl-2.2.1.tgz"; + sha1 = "23cfb8bbab5ece3803aa2c0a1eb28af7cbba1974"; }; } { @@ -1049,6 +1777,14 @@ sha1 = "761671e141c46b8a7c6c54429db1e6bfa3cd0ec0"; }; } + { + name = "which___which_2.0.2.tgz"; + path = fetchurl { + name = "which___which_2.0.2.tgz"; + url = "https://registry.yarnpkg.com/which/-/which-2.0.2.tgz"; + sha1 = "7c6a8dd0a636a0327e10b59c9286eee93f3f51b1"; + }; + } { name = "winston___winston_2.4.5.tgz"; path = fetchurl { @@ -1057,6 +1793,14 @@ sha1 = "f2e431d56154c4ea765545fc1003bd340c95b59a"; }; } + { + name = "word_wrap___word_wrap_1.2.3.tgz"; + path = fetchurl { + name = "word_wrap___word_wrap_1.2.3.tgz"; + url = "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.3.tgz"; + sha1 = "610636f6b1f703891bd34771ccb17fb93b47079c"; + }; + } { name = "wrappy___wrappy_1.0.2.tgz"; path = fetchurl { @@ -1073,5 +1817,13 @@ sha1 = "787a6154414f3c99ed83c5772153b20feb0cec32"; }; } + { + name = "yallist___yallist_4.0.0.tgz"; + path = fetchurl { + name = "yallist___yallist_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz"; + sha1 = "9bb92790d9c0effec63be73519e11a35019a3a72"; + }; + } ]; } diff --git a/third_party/nixpkgs/pkgs/development/compilers/fstar/default.nix b/third_party/nixpkgs/pkgs/development/compilers/fstar/default.nix index 7abdf132b5..fec71dc46f 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/fstar/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/fstar/default.nix @@ -1,36 +1,66 @@ { lib, stdenv, fetchFromGitHub, z3, ocamlPackages, makeWrapper, installShellFiles }: +let + # FStar requires sedlex < 2.4 + # see https://github.com/FStarLang/FStar/issues/2343 + sedlex-2_3 = ocamlPackages.sedlex_2.overrideAttrs (_: rec { + pname = "sedlex"; + version = "2.3"; + src = fetchFromGitHub { + owner = "ocaml-community"; + repo = "sedlex"; + rev = "v${version}"; + sha256 = "WXUXUuIaBUrFPQOKtZ7dgDZYdpEVnoJck0dkrCi8g0c="; + }; + }); +in + stdenv.mkDerivation rec { pname = "fstar"; - version = "0.9.6.0"; + version = "2021.07.31"; src = fetchFromGitHub { owner = "FStarLang"; repo = "FStar"; rev = "v${version}"; - sha256 = "0wix7l229afkn6c6sk4nwkfq0nznsiqdkds4ixi2yyf72immwmmb"; + sha256 = "KZTmphpt8nYpOd8EReAZ6iIkS4uY3ZziKQ3A70BL/90="; }; nativeBuildInputs = [ makeWrapper installShellFiles ]; - buildInputs = with ocamlPackages; [ - z3 ocaml findlib batteries menhir menhirLib stdint - zarith camlp4 yojson pprint - ulex ocaml-migrate-parsetree process ppx_deriving ppx_deriving_yojson ocamlbuild - ]; + buildInputs = [ + z3 + ] ++ (with ocamlPackages; [ + ocaml + findlib + ocamlbuild + batteries + zarith + stdint + yojson + fileutils + menhir + menhirLib + pprint + sedlex-2_3 + ppxlib + ppx_deriving + ppx_deriving_yojson + process + ]); makeFlags = [ "PREFIX=$(out)" ]; - preBuild = '' - patchShebangs src/tools - patchShebangs bin + buildFlags = [ "libs" ]; + + postPatch = '' + patchShebangs ulib/gen_mllib.sh + substituteInPlace src/ocaml-output/Makefile --replace '$(COMMIT)' 'v${version}' ''; - buildFlags = [ "-C" "src/ocaml-output" ]; preInstall = '' mkdir -p $out/lib/ocaml/${ocamlPackages.ocaml.version}/site-lib/fstarlib ''; - installFlags = [ "-C" "src/ocaml-output" ]; postInstall = '' wrapProgram $out/bin/fstar.exe --prefix PATH ":" "${z3}/bin" installShellCompletion --bash .completion/bash/fstar.exe.bash diff --git a/third_party/nixpkgs/pkgs/development/compilers/kotlin/default.nix b/third_party/nixpkgs/pkgs/development/compilers/kotlin/default.nix index 7e46e4bf2e..a1de91f2d3 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/kotlin/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/kotlin/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "kotlin"; - version = "1.5.21"; + version = "1.5.30"; src = fetchurl { url = "https://github.com/JetBrains/kotlin/releases/download/v${version}/kotlin-compiler-${version}.zip"; - sha256 = "sha256-8zE6/dar8bjHXGKS9OQfLbr+/I9scnYse6mz2u712lk="; + sha256 = "sha256-Je69ubsuFl5LqO+/j/lDxF1Pw52//CwcqgWejdgTZ18="; }; propagatedBuildInputs = [ jre ] ; diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/10/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/10/default.nix index 11367d453c..690328b26a 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/10/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/10/default.nix @@ -259,4 +259,4 @@ let }; }); -in { inherit tools libraries; } // libraries // tools +in { inherit tools libraries release_version; } // libraries // tools diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/11/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/11/default.nix index 1aad123fba..661e60e24b 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/11/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/11/default.nix @@ -274,4 +274,4 @@ let }; }); -in { inherit tools libraries; } // libraries // tools +in { inherit tools libraries release_version; } // libraries // tools diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/12/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/12/default.nix index 212c6e5287..388c7d95f6 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/12/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/12/default.nix @@ -267,4 +267,4 @@ let }; }); -in { inherit tools libraries; } // libraries // tools +in { inherit tools libraries release_version; } // libraries // tools diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/13/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/13/default.nix index 4b73e78c13..b65a8b2c71 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/13/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/13/default.nix @@ -264,4 +264,4 @@ let }; }); -in { inherit tools libraries; } // libraries // tools +in { inherit tools libraries release_version; } // libraries // tools diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/13/libcxx/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/13/libcxx/default.nix index f511eba81d..c60039274d 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/13/libcxx/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/13/libcxx/default.nix @@ -44,6 +44,10 @@ stdenv.mkDerivation rec { libc++ is an implementation of the C++ standard library, targeting C++11, C++14 and above. ''; + + # https://github.com/NixOS/nixpkgs/pull/133217#issuecomment-895742807 + broken = stdenv.isDarwin; + # "All of the code in libc++ is dual licensed under the MIT license and the # UIUC License (a BSD-like license)": license = with lib.licenses; [ mit ncsa ]; diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/13/llvm/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/13/llvm/default.nix index daf4cfe808..451dfa8463 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/13/llvm/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/13/llvm/default.nix @@ -52,6 +52,20 @@ in stdenv.mkDerivation (rec { patches = [ ./gnu-install-dirs.patch + + # Fix random compiler crashes: https://bugs.llvm.org/show_bug.cgi?id=50611 + (fetchpatch { + url = "https://raw.githubusercontent.com/archlinux/svntogit-packages/4764a4f8c920912a2bfd8b0eea57273acfe0d8a8/trunk/no-strict-aliasing-DwarfCompileUnit.patch"; + sha256 = "18l6mrvm2vmwm77ckcnbjvh6ybvn72rhrb799d4qzwac4x2ifl7g"; + stripLen = 1; + }) + + # Fix tests on non-x86 platforms: https://reviews.llvm.org/D107020 + (fetchpatch { + url = "https://github.com/llvm/llvm-project/commit/5060224d9eed8b8359ed5090bb7c577b8575e9e7.patch"; + sha256 = "1s2n3pqa11pmlifys1jkppmw858p5i64xszpc8ppc98middv19v1"; + stripLen = 1; + }) ] ++ lib.optional enablePolly ./gnu-install-dirs-polly.patch; postPatch = optionalString stdenv.isDarwin '' diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/5/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/5/default.nix index d11c08329d..8205c67da7 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/5/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/5/default.nix @@ -121,4 +121,4 @@ let }; }); -in { inherit tools libraries; } // libraries // tools +in { inherit tools libraries release_version; } // libraries // tools diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/6/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/6/default.nix index a0cc84d8d7..7651b5ab13 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/6/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/6/default.nix @@ -122,4 +122,4 @@ let }; }); -in { inherit tools libraries; } // libraries // tools +in { inherit tools libraries release_version; } // libraries // tools diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/7/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/7/default.nix index 4057f206ca..6864353424 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/7/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/7/default.nix @@ -268,4 +268,4 @@ let }; }); -in { inherit tools libraries; } // libraries // tools +in { inherit tools libraries release_version; } // libraries // tools diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/8/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/8/default.nix index a7a293cfbb..34f204be33 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/8/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/8/default.nix @@ -267,4 +267,4 @@ let }; }); -in { inherit tools libraries; } // libraries // tools +in { inherit tools libraries release_version; } // libraries // tools diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/9/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/9/default.nix index 8521354dbb..8468fc3638 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/9/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/9/default.nix @@ -267,4 +267,4 @@ let }; }); -in { inherit tools libraries; } // libraries // tools +in { inherit tools libraries release_version; } // libraries // tools diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/git/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/git/default.nix index 5ef24f8f45..43c85622ca 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/git/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/git/default.nix @@ -264,4 +264,4 @@ let }; }); -in { inherit tools libraries; } // libraries // tools +in { inherit tools libraries release_version; } // libraries // tools 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 adf9dd13c7..9b71975f50 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/purescript/purescript/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/purescript/purescript/default.nix @@ -18,19 +18,20 @@ let in stdenv.mkDerivation rec { pname = "purescript"; - version = "0.14.3"; + version = "0.14.4"; + # These hashes can be updated automatically by running the ./update.sh script. src = if stdenv.isDarwin then fetchurl { url = "https://github.com/${pname}/${pname}/releases/download/v${version}/macos.tar.gz"; - sha256 = "1ipksp6kx3h030xf1y3y30gazrdz893pklanwak27hbqfy3ckssj"; + sha256 = "0m6zwb5f890d025zpn006qr8cky6zhjycap5az9zh6h47jfbrcf9"; } else fetchurl { url = "https://github.com/${pname}/${pname}/releases/download/v${version}/linux64.tar.gz"; - sha256 = "158jyjpfgd84gbwpxqj41mvpy0fmb1d1iqq2h42sc7041v2f38p0"; + sha256 = "0hgsh6l52z873b2zk3llvqik18ifika48lmr71qyhlqf250ng9m0"; }; @@ -51,8 +52,11 @@ in stdenv.mkDerivation rec { $PURS --bash-completion-script $PURS > $out/share/bash-completion/completions/purs-completion.bash ''; - passthru.tests = { - minimal-module = pkgs.callPackage ./test-minimal-module {}; + passthru = { + updateScript = ./update.sh; + tests = { + minimal-module = pkgs.callPackage ./test-minimal-module {}; + }; }; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/compilers/purescript/purescript/update.sh b/third_party/nixpkgs/pkgs/development/compilers/purescript/purescript/update.sh new file mode 100755 index 0000000000..ea6663d810 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/purescript/purescript/update.sh @@ -0,0 +1,43 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p curl gnused jq -I nixpkgs=. +# +# This script will update the purescript derivation to the latest version. + +set -eo pipefail + +# This is the directory of this update.sh script. +script_dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )" + +purescript_derivation_file="${script_dir}/default.nix" + +# This is the current revision of PureScript in Nixpkgs. +old_version="$(sed -En 's/.*\bversion = "(.*?)".*/\1/p' "$purescript_derivation_file")" + +# This is the latest release version of PureScript on GitHub. +new_version=$(curl --silent "https://api.github.com/repos/purescript/purescript/releases" | jq '.[0].tag_name' --raw-output | sed -e 's/v//') + +echo "Updating purescript from old version v${old_version} to new version v${new_version}." +echo + +echo "Fetching both old and new release tarballs for Darwin and Linux in order to confirm hashes." +echo +old_linux_version_hash="$(nix-prefetch-url "https://github.com/purescript/purescript/releases/download/v${old_version}/linux64.tar.gz")" +echo "v${old_version} linux tarball hash (current version): $old_linux_version_hash" +new_linux_version_hash="$(nix-prefetch-url "https://github.com/purescript/purescript/releases/download/v${new_version}/linux64.tar.gz")" +echo "v${new_version} linux tarball hash: $new_linux_version_hash" +old_darwin_version_hash="$(nix-prefetch-url "https://github.com/purescript/purescript/releases/download/v${old_version}/macos.tar.gz")" +echo "v${old_version} darwin tarball hash (current version): $old_darwin_version_hash" +new_darwin_version_hash="$(nix-prefetch-url "https://github.com/purescript/purescript/releases/download/v${new_version}/macos.tar.gz")" +echo "v${new_version} darwin tarball hash: $new_darwin_version_hash" +echo + +echo "Replacing version and hashes in ${purescript_derivation_file}." +sed -i -e "s/${old_linux_version_hash}/${new_linux_version_hash}/" "$purescript_derivation_file" +sed -i -e "s/${old_darwin_version_hash}/${new_darwin_version_hash}/" "$purescript_derivation_file" +sed -i -e "s/${old_version}/${new_version}/" "$purescript_derivation_file" +echo + +echo "Finished. Make sure you run the following commands to confirm PureScript builds correctly:" +echo ' - `nix build -L -f ./. purescript`' +echo ' - `nix build -L -f ./. purescript.passthru.tests.minimal-module`' +echo ' - `sudo nix build -L -f ./. spago.passthru.tests --option sandbox relaxed`' diff --git a/third_party/nixpkgs/pkgs/development/embedded/arduino/arduino-cli/default.nix b/third_party/nixpkgs/pkgs/development/embedded/arduino/arduino-cli/default.nix index 84c39dba90..8fd4cf0a35 100644 --- a/third_party/nixpkgs/pkgs/development/embedded/arduino/arduino-cli/default.nix +++ b/third_party/nixpkgs/pkgs/development/embedded/arduino/arduino-cli/default.nix @@ -19,8 +19,8 @@ let doCheck = false; - buildFlagsArray = [ - "-ldflags=-s -w -X github.com/arduino/arduino-cli/version.versionString=${version} -X github.com/arduino/arduino-cli/version.commit=unknown" + ldflags = [ + "-s" "-w" "-X github.com/arduino/arduino-cli/version.versionString=${version}" "-X github.com/arduino/arduino-cli/version.commit=unknown" ] ++ lib.optionals stdenv.isLinux [ "-extldflags '-static'" ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/embedded/platformio/core.nix b/third_party/nixpkgs/pkgs/development/embedded/platformio/core.nix index 344835b831..a3dcbdd35f 100644 --- a/third_party/nixpkgs/pkgs/development/embedded/platformio/core.nix +++ b/third_party/nixpkgs/pkgs/development/embedded/platformio/core.nix @@ -9,11 +9,15 @@ let python = python3.override { packageOverrides = self: super: { aiofiles = super.aiofiles.overridePythonAttrs (oldAttrs: rec { + pname = "aiofiles"; version = "0.6.0"; - src = oldAttrs.src.override { - inherit version; - sha256 = "e0281b157d3d5d59d803e3f4557dcc9a3dff28a4dd4829a9ff478adae50ca092"; + src = fetchFromGitHub { + owner = "Tinche"; + repo = pname; + rev = "v${version}"; + sha256 = "0w23d88q65m06884pfcps661clr11w9wm701ihx6kfxjwga6fkzf"; }; + doCheck = false; }); click = super.click.overridePythonAttrs (oldAttrs: rec { diff --git a/third_party/nixpkgs/pkgs/development/go-modules/generic/default.nix b/third_party/nixpkgs/pkgs/development/go-modules/generic/default.nix index a7852bcc7e..3b645f9ce8 100644 --- a/third_party/nixpkgs/pkgs/development/go-modules/generic/default.nix +++ b/third_party/nixpkgs/pkgs/development/go-modules/generic/default.nix @@ -46,8 +46,9 @@ # Not needed with buildGoModule , goPackagePath ? "" -# needed for buildFlags warning +# needed for buildFlags{,Array} warning , buildFlags ? "" +, buildFlagsArray ? "" , ... }@args': @@ -271,6 +272,6 @@ let }; }); in -lib.warnIf (buildFlags != "") - "Use the `ldflags` and/or `tags` attributes instead of `buildFlags`" +lib.warnIf (buildFlags != "" || buildFlagsArray != "") + "Use the `ldflags` and/or `tags` attributes instead of `buildFlags`/`buildFlagsArray`" package diff --git a/third_party/nixpkgs/pkgs/development/go-packages/generic/default.nix b/third_party/nixpkgs/pkgs/development/go-packages/generic/default.nix index 6eaeee2a12..7c4d173b93 100644 --- a/third_party/nixpkgs/pkgs/development/go-packages/generic/default.nix +++ b/third_party/nixpkgs/pkgs/development/go-packages/generic/default.nix @@ -43,8 +43,9 @@ , CGO_ENABLED ? go.CGO_ENABLED -# needed for buildFlags warning +# needed for buildFlags{,Array} warning , buildFlags ? "" +, buildFlagsArray ? "" , meta ? {}, ... } @ args: @@ -260,6 +261,6 @@ let } // meta; }); in -lib.warnIf (buildFlags != "") - "Use the `ldflags` and/or `tags` attributes instead of `buildFlags`" +lib.warnIf (buildFlags != "" || buildFlagsArray != "") + "Use the `ldflags` and/or `tags` attributes instead of `buildFlags`/`buildFlagsArray`" package diff --git a/third_party/nixpkgs/pkgs/development/interpreters/clojure/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/clojure/default.nix index 3fca18f65a..659f9b87e6 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/clojure/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/clojure/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "clojure"; - version = "1.10.3.933"; + version = "1.10.3.943"; src = fetchurl { # https://clojure.org/releases/tools url = "https://download.clojure.org/install/clojure-tools-${version}.tar.gz"; - sha256 = "sha256-xsm0/HNWr8a/7iLQVC9TbUkASWvw/EI3bD0dMDhLZXA="; + sha256 = "sha256-w3DRvZsie22uoJMrNQTxN5hW0pIFjH5zAw5Z41I1M/s="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/interpreters/supercollider/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/supercollider/default.nix index fc8d8f1652..09e97a65e6 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/supercollider/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/supercollider/default.nix @@ -9,11 +9,11 @@ let in mkDerivation rec { pname = "supercollider"; - version = "3.11.2"; + version = "3.12.0"; src = fetchurl { url = "https://github.com/supercollider/supercollider/releases/download/Version-${version}/SuperCollider-${version}-Source.tar.bz2"; - sha256 = "wiwyxrxIJnHU+49RZy33Etl6amJ3I1xNojEpEDA6BQY="; + sha256 = "sha256-RgCL50pyjNgy+H+Crvfgds86pmTao2FS+IF3gRHu5NM="; }; hardeningDisable = [ "stackprotector" ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/cglm/default.nix b/third_party/nixpkgs/pkgs/development/libraries/cglm/default.nix index a1c90f6b46..dfc9f81edb 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/cglm/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/cglm/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "cglm"; - version = "0.8.3"; + version = "0.8.4"; src = fetchFromGitHub { owner = "recp"; repo = "cglm"; rev = "v${version}"; - sha256 = "0crzkxan3kivyah225md5c65zglg5c1cgrsmwhvp51hmrpmxss5v"; + sha256 = "sha256-AJK1M6iyYdL61pZQhbUWzf+YOUE5FEvUyKqxbQqc7H0="; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/folly/default.nix b/third_party/nixpkgs/pkgs/development/libraries/folly/default.nix index a80a5cd9f8..91551d076d 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/folly/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/folly/default.nix @@ -19,13 +19,13 @@ stdenv.mkDerivation (rec { pname = "folly"; - version = "2021.08.02.00"; + version = "2021.08.23.00"; src = fetchFromGitHub { owner = "facebook"; repo = "folly"; rev = "v${version}"; - sha256 = "sha256-Y2CqPlhbfC++udbbURnI9mvRZswC8kmikp1HY0qJz4k="; + sha256 = "sha256-B+J4h12jjusA15+QRR3egmUEwYRrnegtEWMuQX+QuJk="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/gdal/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gdal/default.nix index 15fc84895f..ca5eabd653 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gdal/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gdal/default.nix @@ -7,13 +7,13 @@ with lib; stdenv.mkDerivation rec { pname = "gdal"; - version = "3.2.2"; + version = "3.3.1"; src = fetchFromGitHub { owner = "OSGeo"; repo = "gdal"; - rev = "a33784291d19015217ea2604988e53d448e14a07"; - sha256 = "sha256-ynCju3chDfYtyrGmUE0n3kkaH2Mpm+/DDHHxCahjhSQ="; + rev = "v${version}"; + sha256 = "0832w40a92cl8ydkv0pk7nl1ivhfhbhqbhmpqmdjpi0126jlm2y0"; }; sourceRoot = "source/gdal"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/intel-gmmlib/default.nix b/third_party/nixpkgs/pkgs/development/libraries/intel-gmmlib/default.nix index c0bb8ec9ab..23e4b2b350 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/intel-gmmlib/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/intel-gmmlib/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "intel-gmmlib"; - version = "21.2.1"; + version = "21.2.2"; src = fetchFromGitHub { owner = "intel"; repo = "gmmlib"; rev = "${pname}-${version}"; - sha256 = "1icnxq4sqhi11c82kg0hnavk3gvbwgw2fshc7a7nb6w1wdiibj5n"; + sha256 = "134l0d74ai4mqlp244nvkvg3mgzbzy20mjd274yay8g8hvb1g90v"; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/lib3mf/default.nix b/third_party/nixpkgs/pkgs/development/libraries/lib3mf/default.nix index b75b1b833d..b301ac13c2 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/lib3mf/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/lib3mf/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "lib3mf"; - version = "2.1.1"; + version = "2.2.0"; src = fetchFromGitHub { owner = "3MFConsortium"; repo = pname; rev = "v${version}"; - sha256 = "1417xlxc1y5jnipixhbjfrrjgkrprbbraj8647sff9051m3hpxc3"; + sha256 = "sha256-WMTTYYgpCIM86a6Jw8iah/YVXN9T5youzEieWL/d+Bc="; }; nativeBuildInputs = [ cmake ninja pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libgnurl/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libgnurl/default.nix index a7d91d0c81..bc9a09ab92 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libgnurl/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libgnurl/default.nix @@ -1,5 +1,5 @@ -{ lib, stdenv, fetchurl, libtool, groff, perl, pkg-config, python2, zlib, gnutls, - libidn2, libunistring, nghttp2 }: +{ lib, stdenv, fetchurl, libtool, perl, pkg-config, python3, zlib, gnutls +, libidn2, libunistring }: stdenv.mkDerivation rec { pname = "libgnurl"; @@ -10,9 +10,9 @@ stdenv.mkDerivation rec { sha256 = "1y4laraq37kw8hc8jlzgcw7y37bfd0n71q0sy3d3z6yg7zh2prxi"; }; - nativeBuildInputs = [ libtool groff perl pkg-config python2 ]; + nativeBuildInputs = [ libtool perl pkg-config python3 ]; - buildInputs = [ gnutls zlib libidn2 libunistring nghttp2 ]; + buildInputs = [ gnutls zlib libidn2 libunistring ]; configureFlags = [ "--disable-ntlm-wb" diff --git a/third_party/nixpkgs/pkgs/development/libraries/libwebsockets/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libwebsockets/default.nix index 151d4c7ee4..777beb9bc1 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libwebsockets/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libwebsockets/default.nix @@ -61,7 +61,7 @@ in { }; libwebsockets_4_2 = generic { - version = "4.2.0"; - sha256 = "glnLGXniero/5CW/1TBPZngdOM6gww8DnT5wiX66sW0="; + version = "4.2.1"; + sha256 = "sha256-C+WGfNF4tAgbp/7aRraBgjNOe4I5ihm+8CGelXzfxbU="; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/openexr/3.nix b/third_party/nixpkgs/pkgs/development/libraries/openexr/3.nix index 03539076e6..ee5e849f2e 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/openexr/3.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/openexr/3.nix @@ -8,7 +8,7 @@ stdenv.mkDerivation rec { pname = "openexr"; - version = "3.0.5"; + version = "3.1.1"; outputs = [ "bin" "dev" "out" "doc" ]; @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { owner = "AcademySoftwareFoundation"; repo = "openexr"; rev = "v${version}"; - sha256 = "0inmpby1syyxxzr0sazqvpb8j63vpj09vpkp4xi7m2qd4rxynkph"; + sha256 = "1p0l07vfpb25fx6jcgk1747v8x9xgpifx4cvvgi3g2473wlx6pyb"; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/openxr-loader/default.nix b/third_party/nixpkgs/pkgs/development/libraries/openxr-loader/default.nix index 44d9c01ded..b4a2634867 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/openxr-loader/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/openxr-loader/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "openxr-loader"; - version = "1.0.18"; + version = "1.0.19"; src = fetchFromGitHub { owner = "KhronosGroup"; repo = "OpenXR-SDK-Source"; rev = "release-${version}"; - sha256 = "sha256-Ek4gFL10/aRciCoJBNaaSX/Hdbap4X/K4k+KeAfpKDg="; + sha256 = "sha256-LEXxqzHzTadgK2PV9Wiud9MzblDHdF4L5T4fVydRJW8="; }; nativeBuildInputs = [ cmake python3 ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/pupnp/default.nix b/third_party/nixpkgs/pkgs/development/libraries/pupnp/default.nix index ffa08a6316..2c5c6c2634 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/pupnp/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/pupnp/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { pname = "libupnp"; - version = "1.14.8"; + version = "1.14.10"; outputs = [ "out" "dev" ]; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { owner = "pupnp"; repo = "pupnp"; rev = "release-${version}"; - sha256 = "sha256-Ipgb7fpIT+P/LwcF8ZmW4C1lj57f5rOQXwUl1Kh/oD8="; + sha256 = "sha256-QlV5V1+VPj/C0M3XgwVIJbxzVXfSvP6yMcJz9al6a+U="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/tiledb/default.nix b/third_party/nixpkgs/pkgs/development/libraries/tiledb/default.nix index 7746fbc23b..6bc0d3ef75 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/tiledb/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/tiledb/default.nix @@ -21,13 +21,13 @@ stdenv.mkDerivation rec { pname = "tiledb"; - version = "2.2.9"; + version = "2.3.3"; src = fetchFromGitHub { owner = "TileDB-Inc"; repo = "TileDB"; rev = version; - sha256 = "sha256-kiidUvSff0drmIl6sXdqj2pjoFZL+ReCDOTtMEW3P3g="; + sha256 = "sha256-3Z5+QUzo2f24q11j6s8KX2vHLFkipFvGk2VFComWW/o="; }; # (bundled) blosc headers have a warning on some archs that it will be using diff --git a/third_party/nixpkgs/pkgs/development/libraries/tinyobjloader/default.nix b/third_party/nixpkgs/pkgs/development/libraries/tinyobjloader/default.nix index ad4a999e45..113e5f5ae9 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/tinyobjloader/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/tinyobjloader/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "tinyobjloader"; - version = "1.0.6"; + version = "1.0.7"; src = fetchFromGitHub { owner = "tinyobjloader"; repo = "tinyobjloader"; rev = "v${version}"; - sha256 = "162168995f4xch7hm3iy6m57r8iqkpzi5x9qh1gsghlxwdxxqbis"; + sha256 = "sha256-BNffbicnLTGK2GQ2/bB328LFU9fqHxrpAVj2hJaekWc="; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/xmlsec/default.nix b/third_party/nixpkgs/pkgs/development/libraries/xmlsec/default.nix index 71a1076466..2dceaeda64 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/xmlsec/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/xmlsec/default.nix @@ -6,11 +6,11 @@ lib.fix (self: stdenv.mkDerivation rec { pname = "xmlsec"; - version = "1.2.31"; + version = "1.2.32"; src = fetchurl { url = "https://www.aleksey.com/xmlsec/download/xmlsec1-${version}.tar.gz"; - sha256 = "mxC8Uswx5PdhYuOXXlDbJrcatJxXHYELMRymJr5aCyY="; + sha256 = "sha256-44NwKFMjYATlsI5CS4r+m1P+nzGqp6U4LznZUz63wEM="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/callipyge/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/callipyge/default.nix new file mode 100644 index 0000000000..a9dfb80f2a --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/callipyge/default.nix @@ -0,0 +1,36 @@ +{ lib +, buildDunePackage +, fetchurl +, ocaml + +, alcotest +, eqaf +, fmt +}: + +buildDunePackage rec { + pname = "callipyge"; + version = "0.2"; + + src = fetchurl { + url = "https://github.com/oklm-wsh/Callipyge/releases/download/v${version}/${pname}-${version}.tbz"; + sha256 = "sha256-T/94a88xvK51TggjXecdKc9kyTE9aIyueIt5T24sZB0="; + }; + + useDune2 = true; + + minimumOCamlVersion = "4.03"; + + propagatedBuildInputs = [ fmt eqaf ]; + + # alcotest isn't available for OCaml < 4.05 due to fmt + doCheck = lib.versionAtLeast ocaml.version "4.05"; + checkInputs = [ alcotest ]; + + meta = { + homepage = "https://github.com/oklm-wsh/Callipyge"; + description = "Curve25519 in OCaml"; + license = lib.licenses.mit; + maintainers = with lib.maintainers; [ fufexan ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/chacha/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/chacha/default.nix new file mode 100644 index 0000000000..21bae79ab5 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/chacha/default.nix @@ -0,0 +1,41 @@ +{ lib +, buildDunePackage +, fetchurl +, ocaml + +, alcotest +, cstruct +, mirage-crypto +}: + +buildDunePackage rec { + pname = "chacha"; + version = "1.0.0"; + + src = fetchurl { + url = "https://github.com/abeaumont/ocaml-chacha/releases/download/${version}/${pname}-${version}.tbz"; + sha256 = "sha256-t8dOMQQDpje0QbuOhjSIa3xnXuXcxMVTLENa/rwdgA4="; + }; + + useDune2 = true; + + minimumOCamlVersion = "4.02"; + + propagatedBuildInputs = [ cstruct mirage-crypto ]; + + # alcotest isn't available for OCaml < 4.05 due to fmt + doCheck = lib.versionAtLeast ocaml.version "4.05"; + checkInputs = [ alcotest ]; + + meta = { + homepage = "https://github.com/abeaumont/ocaml-chacha"; + description = "ChaCha20, ChaCha12 and ChaCha8 encryption functions, in OCaml"; + longDescription = '' + An OCaml implementation of ChaCha functions, both ChaCha20 and the reduced + ChaCha8 and ChaCha12 functions. The hot loop is implemented in C for efficiency + reasons. + ''; + license = lib.licenses.bsd2; + maintainers = with lib.maintainers; [ fufexan ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/integers/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/integers/default.nix index 97443bf570..ed5ccbedb6 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/integers/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/integers/default.nix @@ -1,20 +1,23 @@ -{ lib, fetchzip, buildDunePackage, ocaml }: +{ lib, fetchFromGitHub, buildDunePackage, ocaml }: buildDunePackage rec { pname = "integers"; - version = "0.4.0"; + version = "0.5.1"; useDune2 = lib.versionAtLeast ocaml.version "4.08"; - src = fetchzip { - url = "https://github.com/ocamllabs/ocaml-integers/archive/${version}.tar.gz"; - sha256 = "0yp3ab0ph7mp5741g7333x4nx8djjvxzpnv3zvsndyzcycspn9dd"; + src = fetchFromGitHub { + owner = "ocamllabs"; + repo = "ocaml-integers"; + rev = version; + sha256 = "0by5pc851fk7ccxqy1w2qc5jwn9z8whyqhs5gxlm5986vr9msnyi"; }; meta = { description = "Various signed and unsigned integer types for OCaml"; license = lib.licenses.mit; homepage = "https://github.com/ocamllabs/ocaml-integers"; + changelog = "https://github.com/ocamllabs/ocaml-integers/raw/${version}/CHANGES.md"; maintainers = [ lib.maintainers.vbgl ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/noise/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/noise/default.nix new file mode 100644 index 0000000000..59ca274c88 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/noise/default.nix @@ -0,0 +1,60 @@ +{ lib +, buildDunePackage +, fetchurl + +, callipyge +, chacha +, digestif +, hex +, lwt +, lwt_ppx +, nocrypto +, ounit +, ppxlib +, ppx_let +, ppx_deriving +, ppx_deriving_yojson +}: + +buildDunePackage rec { + pname = "noise"; + version = "0.2.0"; + + src = fetchurl { + url = "https://github.com/emillon/ocaml-noise/releases/download/v${version}/${pname}-v${version}.tbz"; + sha256 = "sha256-fe3pT7fsuF2hCvXpInsRg6OvARs/eAh1Un454s1osDs="; + }; + + useDune2 = true; + + minimumOCamlVersion = "4.04"; + + nativeBuildInputs = [ + ppxlib + ppx_deriving + ppx_let + ]; + + propagatedBuildInputs = [ + callipyge + chacha + digestif + hex + nocrypto + ]; + + doCheck = true; + checkInputs = [ + lwt + lwt_ppx + ounit + ppx_deriving_yojson + ]; + + meta = { + homepage = "https://github.com/emillon/ocaml-noise"; + description = "OCaml implementation of the Noise Protocol Framework"; + license = lib.licenses.bsd2; + maintainers = with lib.maintainers; [ fufexan ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/ocaml-lsp/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/ocaml-lsp/default.nix index a56621465f..13ae64292e 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/ocaml-lsp/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/ocaml-lsp/default.nix @@ -1,4 +1,4 @@ -{ buildDunePackage, jsonrpc, lsp, makeWrapper, dot-merlin-reader }: +{ buildDunePackage, jsonrpc, lsp, re, makeWrapper, dot-merlin-reader }: buildDunePackage { pname = "ocaml-lsp-server"; @@ -7,7 +7,7 @@ buildDunePackage { inherit (lsp) preBuild; - buildInputs = lsp.buildInputs ++ [ lsp ]; + buildInputs = lsp.buildInputs ++ [ lsp re ]; nativeBuildInputs = [ makeWrapper ]; 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 4921f579c4..a1d457f877 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,8 +12,8 @@ let params = if lib.versionAtLeast ocaml.version "4.12" then { - version = "1.5.0"; - sha256 = "0g82m3jrp4s0m3fn9xmm8khrb3acccq8ns9p62bqa09pjd4vgdk2"; + version = "1.7.0"; + sha256 = "1va2zj41znsr94bdw485vak96zrcvqwcrqf1sy8zipb6hdhbchya"; } else { version = "1.4.1"; sha256 = "1ssyazc0yrdng98cypwa9m3nzfisdzpp7hqnx684rqj8f0g3gs6f"; 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 6e172dee6e..f81def4a7b 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 @@ -1,4 +1,5 @@ { buildDunePackage +, lib , cppo , stdlib-shims , ppx_yojson_conv_lib @@ -8,6 +9,7 @@ , octavius , dune-build-info , uutf +, pp , csexp , cmdliner }: @@ -23,7 +25,7 @@ buildDunePackage { # ocaml-lsp without messing with your opam switch, but nix should prevent # this type of problems without resorting to vendoring. preBuild = '' - rm -r ocaml-lsp-server/vendor/{octavius,uutf,ocaml-syntax-shims,omd,cmdliner} + rm -r ocaml-lsp-server/vendor/{octavius,uutf,omd,cmdliner} ''; buildInputs = [ @@ -34,7 +36,7 @@ buildDunePackage { dune-build-info omd cmdliner - ]; + ] ++ lib.optional (lib.versionAtLeast jsonrpc.version "1.7.0") pp; propagatedBuildInputs = [ csexp diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/ocaml-print-intf/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/ocaml-print-intf/default.nix new file mode 100644 index 0000000000..5180b58601 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/ocaml-print-intf/default.nix @@ -0,0 +1,31 @@ +{ lib +, fetchFromGitHub +, buildDunePackage +, dune-build-info +, bos +}: +let + author = "avsm"; + pname = "ocaml-print-intf"; + version = "1.2.0"; +in +buildDunePackage rec { + inherit pname version; + useDune2 = true; + + src = fetchFromGitHub { + owner = author; + repo = pname; + rev = "v${version}"; + sha256 = "0hw4gl7irarcywibdjqxmrga8f7yj52wgy7sc7n0wyy74jzxb8np"; + }; + + buildInputs = [ dune-build-info bos ]; + + meta = with lib; { + description = "Pretty print an OCaml cmi/cmt/cmti file in human-readable OCaml signature form "; + homepage = "https://github.com/${author}/${pname}"; + license = lib.licenses.isc; + maintainers = [ lib.maintainers.nerdypepper ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/pp/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/pp/default.nix new file mode 100644 index 0000000000..70c509ec22 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/pp/default.nix @@ -0,0 +1,28 @@ +{ buildDunePackage +, fetchzip +, ppx_expect +, lib +}: + +buildDunePackage rec { + pname = "pp"; + version = "1.1.2"; + + src = fetchzip { + url = "https://github.com/ocaml-dune/pp/releases/download/${version}/pp-${version}.tbz"; + sha256 = "1l1im054pxrkj7zk8m6yj4qfdpxkajpjfvy818ggf0j4nxkaihc5"; + }; + + useDune2 = true; + minimalOCamlVersion = "4.08"; + + checkInputs = [ ppx_expect ]; + doCheck = true; + + meta = with lib; { + description = "A an alternative pretty printing library to the Format module of the OCaml standard library"; + license = licenses.mit; + platforms = platforms.unix; + maintainers = with maintainers; [ symphorien ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/ppx_cstubs/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/ppx_cstubs/default.nix index b4ddb4dd5e..6ad6c4cd89 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/ppx_cstubs/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/ppx_cstubs/default.nix @@ -13,7 +13,7 @@ buildDunePackage rec { pname = "ppx_cstubs"; - version = "0.6.1.1"; + version = "0.6.1.2"; useDune2 = true; @@ -21,7 +21,7 @@ buildDunePackage rec { owner = "fdopen"; repo = "ppx_cstubs"; rev = version; - sha256 = "0rgg78435ypi6ryhcq5ljkch4qjvra2jqjd47c2hhhcbwvi2ssxh"; + sha256 = "15cjb9ygnvp2kv85rrb7ncz7yalifyl7wd2hp2cl8r1qrpgi1d0w"; }; buildInputs = [ @@ -37,8 +37,9 @@ buildDunePackage rec { meta = with lib; { homepage = "https://github.com/fdopen/ppx_cstubs"; + changelog = "https://github.com/fdopen/ppx_cstubs/raw/${version}/CHANGES.md"; description = "Preprocessor for easier stub generation with ocaml-ctypes"; - license = licenses.mit; + license = licenses.lgpl21Plus; maintainers = [ maintainers.osener ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/rfc7748/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/rfc7748/default.nix new file mode 100644 index 0000000000..40356ec9aa --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/rfc7748/default.nix @@ -0,0 +1,43 @@ +{ lib +, buildDunePackage +, fetchFromGitHub +, ocaml + +, ounit +, zarith +}: + +buildDunePackage rec { + pname = "rfc7748"; + version = "1.0"; + + src = fetchFromGitHub { + owner = "burgerdev"; + repo = "ocaml-rfc7748"; + rev = "v${version}"; + sha256 = "sha256-mgZooyfxrKBVQFn01B8PULmFUW9Zq5HJfgHCSJSkJo4="; + }; + + useDune2 = true; + + minimumOCamlVersion = "4.05"; + + propagatedBuildInputs = [ zarith ]; + + # the tests fail for 4.05 + doCheck = lib.versionAtLeast ocaml.version "4.06"; + checkInputs = [ ounit ]; + + meta = { + homepage = "https://github.com/burgerdev/ocaml-rfc7748"; + description = "Elliptic Curve Diffie-Hellman on Edwards Curves (X25519, X448)"; + longDescription = '' + This library implements the ECDH functions 'X25519' and 'X448' as specified + in RFC 7748, 'Elliptic curves for security'. In the spirit of the original + publications, the public API is kept as simple as possible to make it easy + to use and hard to misuse. + ''; + license = lib.licenses.bsd2; + maintainers = with lib.maintainers; [ fufexan ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/vlq/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/vlq/default.nix new file mode 100644 index 0000000000..41991cbf74 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/vlq/default.nix @@ -0,0 +1,25 @@ +{ lib, buildDunePackage, fetchurl +, dune-configurator +}: + +buildDunePackage rec { + pname = "vlq"; + version = "0.2.1"; + + src = fetchurl { + url = "https://github.com/flowtype/ocaml-vlq/releases/download/v${version}/vlq-v${version}.tbz"; + sha256 = "02wr9ph4q0nxmqgbc67ydf165hmrdv9b655krm2glc3ahb6larxi"; + }; + + useDune2 = true; + + buildInputs = [ dune-configurator ]; + + meta = { + description = "encoding variable-length quantities, in particular base64"; + license = lib.licenses.mit; + homepage = "https://github.com/flowtype/ocaml-vlq"; + maintainers = [ lib.maintainers.nomeata ]; + }; + +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/Wand/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/Wand/default.nix index 4faedcada3..7b8ab874eb 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/Wand/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/Wand/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "Wand"; - version = "0.6.6"; + version = "0.6.7"; src = fetchPypi { inherit pname version; - sha256 = "540a2da5fb3ada1f0abf6968e0fa01ca7de6cd517f3be5c52d03a4fc8d54d75e"; + sha256 = "ebc01bccc25dba68414ab55b482341f9ad2b197d7f49d5e724f339bbf63fb6db"; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/agate-sql/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/agate-sql/default.nix index 68f166b3c7..e9747b6f39 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/agate-sql/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/agate-sql/default.nix @@ -11,13 +11,13 @@ buildPythonPackage rec { pname = "agate-sql"; - version = "0.5.6"; + version = "0.5.7"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "056dc9e587fbdfdf3f1c9950f4793a5ee87622c19deba31aa0a6d6681816dcde"; + sha256 = "7622c1f243b5a9a5efddfe28c36eeeb30081e43e3eb72e8f3da22c2edaecf4d8"; }; propagatedBuildInputs = [ agate sqlalchemy ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ailment/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ailment/default.nix index 6cf817f813..c9412428a9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ailment/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ailment/default.nix @@ -7,14 +7,14 @@ buildPythonPackage rec { pname = "ailment"; - version = "9.0.9506"; + version = "9.0.9572"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "angr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-ikIO6AhoBkmz4+8BLOC55Yh6HbzHJOjlktSDMiC0I38="; + sha256 = "sha256-cjVKIlvGu1SCiVkegJ36GevZ9bihYF7n3P/xNqtAapw="; }; propagatedBuildInputs = [ pyvex ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aioesphomeapi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aioesphomeapi/default.nix index b2641cfcbd..4e90ea115c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aioesphomeapi/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aioesphomeapi/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "aioesphomeapi"; - version = "7.0.0"; + version = "8.0.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "esphome"; repo = pname; rev = "v${version}"; - sha256 = "sha256-ho/1fpq4yAgmYNERPqs51oqr08ncaN9+GRTUUuGU7ps="; + sha256 = "sha256-fd77sbtgEhExV/d/LHkF9sheVz7G2SrNXyZsMNeJ4UY="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aioextensions/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aioextensions/default.nix index 3fee1af2f1..cc1ebe3f61 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aioextensions/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aioextensions/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "aioextensions"; - version = "20.11.1621472"; + version = "21.7.2261349"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "abfb2a27590f20b04808192e6c9c5f93298656c013546850c4505b5070a8cc82"; + sha256 = "2eacc52692495f331437e8c8e9782ca71f4617ec84f174ca17acdd77631efc47"; }; propagatedBuildInputs = [ uvloop ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aiofiles/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aiofiles/default.nix index ffa176edc8..05027dc017 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aiofiles/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aiofiles/default.nix @@ -1,22 +1,41 @@ -{ lib +{ stdenv +, lib , buildPythonPackage -, fetchPypi +, fetchFromGitHub +, poetry-core +, pytest-asyncio +, pytestCheckHook , pythonOlder }: buildPythonPackage rec { pname = "aiofiles"; version = "0.7.0"; + format = "pyproject"; - src = fetchPypi { - inherit pname version; - sha256 = "a1c4fc9b2ff81568c83e21392a82f344ea9d23da906e4f6a52662764545e19d4"; + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "Tinche"; + repo = pname; + rev = "v${version}"; + sha256 = "0vvk9j8cfdqvq8hw2qc6ajfzsy8x1afabf83mxafffq92rwknd4y"; }; - disabled = pythonOlder "3.3"; + nativeBuildInputs = [ + poetry-core + ]; - # No tests in archive - doCheck = false; + checkInputs = [ + pytest-asyncio + pytestCheckHook + ]; + + disabledTests = lib.optionals stdenv.isDarwin [ + "test_sendfile_file" + ]; + + pythonImportsCheck = [ "aiofiles" ]; meta = { description = "File support for asyncio"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aioprocessing/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aioprocessing/default.nix index 04963f1d09..2f6b396784 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aioprocessing/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aioprocessing/default.nix @@ -1,22 +1,24 @@ { lib , buildPythonPackage , fetchPypi -, pythonAtLeast +, pythonOlder }: buildPythonPackage rec { pname = "aioprocessing"; - version = "1.1.0"; - disabled = !(pythonAtLeast "3.4"); + version = "2.0.0"; + disabled = pythonOlder "3.4"; src = fetchPypi { inherit pname version; - sha256 = "4603c86ff3fea673d4c643ad3adc519988cd778771b75079bc3be9e5ed4c5b66"; + sha256 = "469dfb746e8c4e0c727ba135cfabf9e034c554f6a73c27f908bfe3625dd74b9e"; }; # Tests aren't included in pypi package doCheck = false; + pythonImportsCheck = [ "aioprocessing" ]; + meta = { description = "A library that integrates the multiprocessing module with asyncio"; homepage = "https://github.com/dano/aioprocessing"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/angr/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/angr/default.nix index db2ee2c13d..20c658909b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/angr/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/angr/default.nix @@ -43,14 +43,14 @@ in buildPythonPackage rec { pname = "angr"; - version = "9.0.9506"; + version = "9.0.9572"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-2bKsLmZeFs7N4YUYxIktDoOn/H8waaOaOJOzyVumuf8="; + sha256 = "sha256-ZA2PKyJVXrSs2IvpjMyHGrtAPUpUZFhUzlKURLEWm5o="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/angrop/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/angrop/default.nix index 5af743b93f..f0e0f4e165 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/angrop/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/angrop/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "angrop"; - version = "9.0.9506"; + version = "9.0.9572"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "angr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-dTaTtiMzIm9PfVkjAED9x9zae+vdRcl1kDMtqUWvpkA="; + sha256 = "sha256-R4i7hQGwc74/szehcWBjkC6b9DsblluHKWxEk0iSFRI="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/anybadge/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/anybadge/default.nix new file mode 100644 index 0000000000..a8aaec9f45 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/anybadge/default.nix @@ -0,0 +1,27 @@ +{ lib, fetchFromGitHub, buildPythonPackage, pytestCheckHook }: + +buildPythonPackage rec { + pname = "anybadge"; + version = "1.7.0"; + + src = fetchFromGitHub { + owner = "jongracecox"; + repo = pname; + rev = "v${version}"; + sha256 = "1d02fnig04zlrhfqqcf4505vy4p51whl2ifilnx3mkhis9lcwrmr"; + }; + + # setup.py reads its version from the TRAVIS_TAG environment variable + TRAVIS_TAG = "v${version}"; + + pythonImportsCheck = [ "anybadge" ]; + + checkInputs = [ pytestCheckHook ]; + + meta = with lib; { + description = "A Python project for generating badges for your projects, with a focus on simplicity and flexibility"; + license = licenses.mit; + homepage = "https://github.com/jongracecox/anybadge"; + maintainers = [ maintainers.fabiangd ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/archinfo/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/archinfo/default.nix index 4693869485..5c8f04f4b9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/archinfo/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/archinfo/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "archinfo"; - version = "9.0.9506"; + version = "9.0.9572"; src = fetchFromGitHub { owner = "angr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-jGXJpwiP2/O2aJhAP15VGqrekiiB0eiIFCjkzNMbqxw="; + sha256 = "sha256-OzgLGjEVOVRnQvWVcci8EGn6gtO8D8QoDnC9dfXGHZU="; }; checkInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/awesomeversion/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/awesomeversion/default.nix index 7b7d432f0c..b5b59ef655 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/awesomeversion/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/awesomeversion/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "awesomeversion"; - version = "21.8.0"; + version = "21.8.1"; disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "ludeeus"; repo = pname; rev = version; - sha256 = "sha256-j5y3f6F+8PzOPxpBHE3LKF3kdRzP4d21N/1Bd6v+MQg="; + sha256 = "sha256-eyo0dzmExJ7WCRAXFvB+ElWi5HTTzJ7XJsmxB2t6yfI="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-batch/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-batch/default.nix index 942ae218fd..9202919ae6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-batch/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-batch/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "azure-batch"; - version = "10.0.0"; + version = "11.0.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "83d7a2b0be42ca456ac2b56fa3dc6ce704c130e888d37d924072c1d3718f32d0"; + sha256 = "ce5fdb0ec962eddfe85cd82205e9177cb0bbdb445265746e38b3bbbf1f16dc73"; }; propagatedBuildInputs = [ @@ -25,6 +25,8 @@ buildPythonPackage rec { # has no tests doCheck = false; + pythonImportsCheck = [ "azure.batch" ]; + meta = with lib; { description = "This is the Microsoft Azure Batch Client Library"; homepage = "https://github.com/Azure/azure-sdk-for-python"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-eventgrid/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-eventgrid/default.nix index 8d2c8f21f2..e2736b88e4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-eventgrid/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-eventgrid/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "azure-eventgrid"; - version = "4.3.0"; + version = "4.5.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "bf50c8a4dc022ff9b1810800cb431b2c68b748eed160dd71fb8eb9bd860c7ecc"; + sha256 = "41ce94305fd3c4e2534f7663fb1be79819fc7d59f2b20544593ea6c914839351"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-apimanagement/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-apimanagement/default.nix index 8ca4df197b..2b2327d9f0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-apimanagement/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-apimanagement/default.nix @@ -6,13 +6,13 @@ }: buildPythonPackage rec { - version = "2.0.0"; + version = "2.1.0"; pname = "azure-mgmt-apimanagement"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "54fade87af54904c8ac9785efccebc537c58a3c1f8726e929e473698f06ebbfc"; + sha256 = "58296bd45e876df33f93f3a41c866c36476f5f3bd46818e8891308794f041c94"; extension = "zip"; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-compute/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-compute/default.nix index 949de6d073..c45eb691de 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-compute/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-compute/default.nix @@ -6,13 +6,13 @@ }: buildPythonPackage rec { - version = "22.0.0"; + version = "22.1.0"; pname = "azure-mgmt-compute"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "7d582f3a4331f681f6bc358b796d9c33d7c0d55aa95c2874fc8dbe692e6bfa6d"; + sha256 = "2aad414843aee0f54427f887f7536cc5155d6852728d44dfeef633ac52135fdc"; }; propagatedBuildInputs = [ @@ -25,6 +25,8 @@ buildPythonPackage rec { # has no tests doCheck = false; + pythonImportsCheck = [ "azure.mgmt.compute" ]; + meta = with lib; { description = "This is the Microsoft Azure Compute Management Client Library"; homepage = "https://github.com/Azure/azure-sdk-for-python"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-containerregistry/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-containerregistry/default.nix index 8bc79a7df2..92658dc607 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-containerregistry/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-containerregistry/default.nix @@ -6,13 +6,13 @@ }: buildPythonPackage rec { - version = "8.0.0"; + version = "8.1.0"; pname = "azure-mgmt-containerregistry"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "480eb5d1bb910da4e87a5d7047e2f3e426083b14911ac64c48badd0218e9e756"; + sha256 = "62efbb03275d920894d79879ad0ed59605163abd32177dcf24e90c1862ebccbd"; extension = "zip"; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-datamigration/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-datamigration/default.nix index f7d2b7b9db..6fd6b4a2a7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-datamigration/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-datamigration/default.nix @@ -12,12 +12,12 @@ buildPythonPackage rec { pname = "azure-mgmt-datamigration"; - version = "9.0.0"; + version = "10.0.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "70373dbeb35a7768a47341bb3b570c559197bc1ba36fc8f8bf15139e4c8bad70"; + sha256 = "5cee70f97fe3a093c3cb70c2a190c2df936b772e94a09ef7e3deb1ed177c9f32"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-iothub/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-iothub/default.nix index f4e1534a61..029a102518 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-iothub/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-iothub/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "azure-mgmt-iothub"; - version = "2.0.0"; + version = "2.1.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "653a765f0beb6af0c9ecbd290b4101e1b5e0f6450405faf28ab8234c15d8b38b"; + sha256 = "2724f48cadb1be7ee96fc26c7bfa178f82cea5d325e785e91d9f26965fa8e46f"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-loganalytics/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-loganalytics/default.nix index 5a93d3d0df..790e7cf86c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-loganalytics/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-loganalytics/default.nix @@ -1,8 +1,6 @@ { lib , buildPythonPackage , fetchPypi -, python -, isPy3k , msrest , msrestazure , azure-common @@ -12,12 +10,12 @@ buildPythonPackage rec { pname = "azure-mgmt-loganalytics"; - version = "10.0.0"; + version = "11.0.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "29330984d0f084dff26cea239d7b733c1a26844da85d33bf3bb53b515ce0bc23"; + sha256 = "41671fc6e95180fb6147cb40567410c34b85fb69bb0a9b3e09feae1ff370ee9d"; }; propagatedBuildInputs = [ @@ -33,6 +31,8 @@ buildPythonPackage rec { # has no tests doCheck = false; + pythonImportsCheck = [ "azure.mgmt.loganalytics" ]; + meta = with lib; { description = "This is the Microsoft Azure Log Analytics Management Client Library"; homepage = "https://github.com/Azure/azure-sdk-for-python"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-media/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-media/default.nix index b4d25a1493..e0dd1af1ad 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-media/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-media/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "azure-mgmt-media"; - version = "7.0.0"; + version = "8.0.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "b45e82a594ed91cd5aa7a5cd5d01f038b7ac3cf12233e7ba2beaaa3477900e8e"; + sha256 = "c08e687c0afa061a3e05acaf29ce81e737480d592b07e0de5f77e9a7f9f00c00"; }; propagatedBuildInputs = [ @@ -31,6 +31,8 @@ buildPythonPackage rec { # has no tests doCheck = false; + pythonImportsCheck = [ "azure.mgmt.media" ]; + meta = with lib; { description = "This is the Microsoft Azure Media Services Client Library"; homepage = "https://github.com/Azure/azure-sdk-for-python"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-recoveryservicesbackup/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-recoveryservicesbackup/default.nix index 25aae3ffad..3ebc199599 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-recoveryservicesbackup/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-recoveryservicesbackup/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "azure-mgmt-recoveryservicesbackup"; - version = "1.0.0"; + version = "2.0.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "fd915aa6a76ef9e0e963615d4c909400c8d5646e26273ae25fa1418ce61e28d2"; + sha256 = "d3e60daefbc20a7fa381c7ad1498f4bf4bb5a1414c1c64188cc9d5c98c4e12ac"; }; propagatedBuildInputs = [ @@ -29,6 +29,8 @@ buildPythonPackage rec { # has no tests doCheck = false; + pythonImportsCheck = [ "azure.mgmt.recoveryservicesbackup" ]; + meta = with lib; { description = "This is the Microsoft Azure Recovery Services Backup Management Client Library"; homepage = "https://github.com/Azure/azure-sdk-for-python"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-resource/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-resource/default.nix index 9ea6acbe8d..3683a70ac1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-resource/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-resource/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { - version = "18.0.0"; + version = "19.0.0"; pname = "azure-mgmt-resource"; disabled = !isPy3k; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "551036e592f409ef477d30937ea7cc4dda5126576965d9c816fdb8401bbd774c"; + sha256 = "bbb60bb9419633c2339569d4e097908638c7944e782b5aef0f5d9535085a9100"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-sql/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-sql/default.nix index a9e41e3279..75b41758b3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-sql/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-sql/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "azure-mgmt-sql"; - version = "3.0.0"; + version = "3.0.1"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "e2fe427ed8f6e368de7176696b38910a16b307dd9c2e1d2144d643a1c0f38e21"; + sha256 = "129042cc011225e27aee6ef2697d585fa5722e5d1aeb0038af6ad2451a285457"; }; propagatedBuildInputs = [ @@ -31,6 +31,8 @@ buildPythonPackage rec { # has no tests doCheck = false; + pythonImportsCheck = [ "azure.mgmt.sql" ]; + meta = with lib; { description = "This is the Microsoft Azure SQL Management Client Library"; homepage = "https://github.com/Azure/azure-sdk-for-python"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-web/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-web/default.nix index b2643eb336..9fc5abe968 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-web/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-web/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "azure-mgmt-web"; - version = "3.0.0"; + version = "4.0.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "274239993a4705c9e1135842137d77a703f63d14ee5c1a5ee87fe1f8a471a061"; + sha256 = "e57437a933e7dea9b0618fe790e0dadc63f9857735361ac8b5f5e8062b9c2a0d"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-synapse-accesscontrol/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-synapse-accesscontrol/default.nix index b9a6a40e73..fc6cd765cd 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-synapse-accesscontrol/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-synapse-accesscontrol/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "azure-synapse-accesscontrol"; - version = "0.6.0"; + version = "0.7.0"; src = fetchPypi { inherit pname version; - sha256 = "2f8f71561ca30ff3b04b172f5a64b231baeb02f4bce4bd6763df93a178c8b5d7"; + sha256 = "565aa26336d560c028775e8ae50d0691aa7089e96170e78342371b773da3137c"; extension = "zip"; }; @@ -20,6 +20,9 @@ buildPythonPackage rec { msrest ]; + # zero tests run + doCheck = false; + pythonImportsCheck = [ "azure.synapse.accesscontrol" ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-synapse-artifacts/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-synapse-artifacts/default.nix index f9c78b6116..8be13364e1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-synapse-artifacts/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-synapse-artifacts/default.nix @@ -6,12 +6,12 @@ buildPythonPackage rec { pname = "azure-synapse-artifacts"; - version = "0.7.0"; + version = "0.8.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "2a538d617dc5d2d167716226d0a24e416324efb35ef22b223e0d9fb6b9889a72"; + sha256 = "3d4fdfd0bd666984f7bdc7bc0c7a6018c35a5d46a81a32dd193b07c03b528b72"; }; propagatedBuildInputs = [ @@ -20,6 +20,9 @@ buildPythonPackage rec { msrest ]; + # zero tests run + doCheck = false; + pythonImportsCheck = [ "azure.synapse.artifacts" ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-synapse-spark/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-synapse-spark/default.nix index 09b25fe9d5..db998e00e6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-synapse-spark/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-synapse-spark/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "azure-synapse-spark"; - version = "0.5.0"; + version = "0.6.0"; src = fetchPypi { inherit pname version; - sha256 = "2b037024dc7c034f47aac551cc918f78590a1e1ae30cd2370c8a14da15994970"; + sha256 = "ac7564a61ba314e0a9406c0f73c3cede04091a131a0c58971bcba0c158b7455d"; extension = "zip"; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/babelfish/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/babelfish/default.nix index ba015f597c..4f64e65bae 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/babelfish/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/babelfish/default.nix @@ -2,18 +2,24 @@ buildPythonPackage rec { pname = "babelfish"; - version = "0.5.5"; + version = "0.6.0"; src = fetchPypi { inherit pname version; - sha256 = "8380879fa51164ac54a3e393f83c4551a275f03617f54a99d70151358e444104"; + sha256 = "2dadfadd1b205ca5fa5dc9fa637f5b7933160a0418684c7c46a7a664033208a2"; }; propagatedBuildInputs = [ setuptools ]; + # no tests executed + doCheck = false; + + pythonImportsCheck = [ "babelfish" ]; + meta = with lib; { homepage = "https://pypi.python.org/pypi/babelfish"; description = "A module to work with countries and languages"; license = licenses.bsd3; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/bids-validator/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/bids-validator/default.nix index e3ee7b9ba7..f39e775fc2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/bids-validator/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/bids-validator/default.nix @@ -4,12 +4,12 @@ }: buildPythonPackage rec { - version = "1.8.0"; + version = "1.8.2"; pname = "bids-validator"; src = fetchPypi { inherit pname version; - sha256 = "6d4ecc384121899e0cd5af773419c5ba722585cb176544560ec9a48f17dfd777"; + sha256 = "7969d55e9ed07f6cf7dfd72ed696a05abe56a2f35e81a1ef677f3694b2adf606"; }; # needs packages which are not available in nixpkgs diff --git a/third_party/nixpkgs/pkgs/development/python-modules/bimmer-connected/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/bimmer-connected/default.nix index 932c90cb7a..ac2785fe33 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/bimmer-connected/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/bimmer-connected/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "bimmer-connected"; - version = "0.7.19"; + version = "0.7.20"; disabled = pythonOlder "3.5"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "bimmerconnected"; repo = "bimmer_connected"; rev = version; - sha256 = "sha256-r5x+9W1XadtXb1ClC/0HnjrR+UmrytzUTCpi9IyBbwU="; + sha256 = "sha256-vcJYcxBX8wHH3FiU2Cg7IlK0iEQZ3SLVa0MryeAwPCA="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/bitarray/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/bitarray/default.nix index 97dded0956..ad97a5f04c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/bitarray/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/bitarray/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "bitarray"; - version = "2.3.1"; + version = "2.3.2"; src = fetchPypi { inherit pname version; - sha256 = "sha256-QgPNtE136zCnReZXbIK34zaB8TSzOBBSVvd+cdvTMN0="; + sha256 = "sha256-S+47qRZLZs72TxCZ6aO4jpndzQyUOAfplENhPhhLSLQ="; }; checkPhase = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/bleach/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/bleach/default.nix index 0827e5519a..6d3c7fffe6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/bleach/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/bleach/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "bleach"; - version = "4.0.0"; + version = "4.1.0"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-/6kiHGrCk5nMUPzDNHM2bt0M+NXiy7u2MpbcMn+2fMg="; + sha256 = "sha256-CQDYs366YagC7kCsAGH4wrXe4pwZJ90dIz4HXr9acdo="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/censys/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/censys/default.nix index 47f61242d6..06e619676a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/censys/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/censys/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "censys"; - version = "2.0.5"; + version = "2.0.6"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "censys"; repo = "censys-python"; rev = "v${version}"; - sha256 = "sha256-/vMDNHNUY3mpK9jSDPVhuA050rwZF8O6IjTCLqQZIWc="; + sha256 = "sha256-Lbd2Pm79n0cFoGHC2rucxgZijzcVYVJJsq1yzqB9QLk="; }; nativeBuildInputs = [ @@ -51,8 +51,8 @@ buildPythonPackage rec { --replace 'backoff = "^1.11.1"' 'backoff = "*"' \ --replace 'requests = ">=2.26.0"' 'requests = "*"' \ --replace 'rich = "^10.6.0"' 'rich = "*"' - substituteInPlace pytest.ini --replace \ - " --cov -rs -p no:warnings" "" + substituteInPlace pytest.ini \ + --replace "--cov" "" ''; # The tests want to write a configuration file diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cfgv/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cfgv/default.nix index 306019b54b..c7b074089a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cfgv/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cfgv/default.nix @@ -2,12 +2,12 @@ buildPythonPackage rec { pname = "cfgv"; - version = "3.3.0"; + version = "3.3.1"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "9e600479b3b99e8af981ecdfc80a0296104ee610cab48a5ae4ffd0b668650eb1"; + sha256 = "f5a830efb9ce7a445376bb66ec94c638a9787422f96264c98edc6bdeed8ab736"; }; propagatedBuildInputs = [ six ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cirq-google/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cirq-google/default.nix index 8692aef4b6..900189dc2e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cirq-google/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cirq-google/default.nix @@ -16,7 +16,9 @@ buildPythonPackage rec { sourceRoot = "source/${pname}"; postPatch = '' - substituteInPlace requirements.txt --replace "protobuf~=3.13.0" "protobuf" + substituteInPlace requirements.txt \ + --replace "protobuf~=3.13.0" "protobuf" \ + --replace "google-api-core[grpc] >= 1.14.0, < 2.0.0dev" "google-api-core[grpc] >= 1.14.0, < 3.0.0dev" ''; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/claripy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/claripy/default.nix index f85a9919a3..26aa064666 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/claripy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/claripy/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "claripy"; - version = "9.0.9506"; + version = "9.0.9572"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "angr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-wczwKTtOJ4VC3UZvd1KT6GfGUk5AS90ggLi2lFjhD+Q="; + sha256 = "sha256-YC605gIM+l9Tnx6lu0ayrnYPE6Xx+aTgDXPziFY/lDA="; }; # Use upstream z3 implementation diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cle/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cle/default.nix index 37a2294934..e2f0a7feed 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cle/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cle/default.nix @@ -15,7 +15,7 @@ let # The binaries are following the argr projects release cycle - version = "9.0.9506"; + version = "9.0.9572"; # Binary files from https://github.com/angr/binaries (only used for testing and only here) binaries = fetchFromGitHub { @@ -35,7 +35,7 @@ buildPythonPackage rec { owner = "angr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-jTVccnCRqsp3EBl/RSKWVekAOsGhRvdIJxRyYV2gI4Q="; + sha256 = "sha256-b1LMHeaQqz0fNleRlME0kgSYZGGXBhFKCp0iRr/2A7c="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/click-help-colors/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/click-help-colors/default.nix index b17dc1a0c1..b63788c606 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/click-help-colors/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/click-help-colors/default.nix @@ -1,21 +1,19 @@ { lib, fetchPypi, buildPythonPackage -, click, pytest +, click, pytestCheckHook }: buildPythonPackage rec { pname = "click-help-colors"; - version = "0.9"; + version = "0.9.1"; src = fetchPypi { inherit pname version; - sha256 = "eb037a2dd95a9e20b3897c2b3ca57e7f6797f76a8d93f7eeedda7fcdcbc9b635"; + sha256 = "78cbcf30cfa81c5fc2a52f49220121e1a8190cd19197d9245997605d3405824d"; }; propagatedBuildInputs = [ click ]; - # tries to use /homeless-shelter to mimic container usage, etc - #doCheck = false; - checkInputs = [ pytest ]; + checkInputs = [ pytestCheckHook ]; pythonImportsCheck = [ "click_help_colors" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cma/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cma/default.nix index 8937f78a7a..473f060769 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cma/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cma/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "cma"; - version = "3.0.3"; + version = "3.1.0"; src = fetchFromGitHub { owner = "CMA-ES"; repo = "pycma"; rev = "r${version}"; - sha256 = "00vv7imdkv0bqcs4b8dg9nggxcl2fkcnhdd46n22bcmnwy8rjxv6"; + sha256 = "1bal4kljxrdm6x5ppyi6i109714h0czdxfsna906dlfplrmq52bf"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/codecov/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/codecov/default.nix index 2e8cbf2922..20c80872fd 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/codecov/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/codecov/default.nix @@ -1,28 +1,50 @@ -{ lib, buildPythonPackage, fetchPypi, requests, coverage, unittest2 }: +{ lib +, buildPythonPackage +, coverage +, ddt +, fetchFromGitHub +, mock +, pytestCheckHook +, requests +}: buildPythonPackage rec { pname = "codecov"; - version = "2.1.11"; + version = "2.1.12"; - src = fetchPypi { - inherit pname version; - sha256 = "6cde272454009d27355f9434f4e49f238c0273b216beda8472a65dc4957f473b"; + src = fetchFromGitHub { + owner = "codecov"; + repo = "codecov-python"; + rev = "v${version}"; + sha256 = "0bdk1cp3hxydpx9knqfv88ywwzw7yqhywi0inxjd6x53qh75prqy"; }; - checkInputs = [ unittest2 ]; # Tests only + propagatedBuildInputs = [ + requests + coverage + ]; - propagatedBuildInputs = [ requests coverage ]; + checkInputs = [ + ddt + mock + pytestCheckHook + ]; - postPatch = '' - sed -i 's/, "argparse"//' setup.py - ''; + pytestFlagsArray = [ "tests/test.py" ]; - # No tests in archive - doCheck = false; + disabledTests = [ + # No git repo available and network + "test_bowerrc_none" + "test_prefix" + "test_send" + ]; + + pythonImportsCheck = [ "codecov" ]; meta = with lib; { description = "Python report uploader for Codecov"; homepage = "https://codecov.io/"; license = licenses.asl20; + maintainers = with maintainers; [ fab ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/coveralls/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/coveralls/default.nix index 1096675821..0c16d2d9ac 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/coveralls/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/coveralls/default.nix @@ -16,13 +16,13 @@ buildPythonPackage rec { pname = "coveralls"; - version = "3.1.0"; + version = "3.2.0"; disabled = isPy27; # wanted by tests src = fetchPypi { inherit pname version; - sha256 = "9b3236e086627340bf2c95f89f757d093cbed43d17179d3f4fb568c347e7d29a"; + sha256 = "15a987d9df877fff44cd81948c5806ffb6eafb757b3443f737888358e96156ee"; }; checkInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/databases/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/databases/default.nix index 98e047836d..6f5373b56b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/databases/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/databases/default.nix @@ -1,7 +1,6 @@ { lib , buildPythonPackage , fetchFromGitHub -, fetchpatch , sqlalchemy , aiocontextvars , isPy27 @@ -14,28 +13,16 @@ buildPythonPackage rec { pname = "databases"; - version = "0.4.3"; + version = "0.5.0"; disabled = isPy27; src = fetchFromGitHub { owner = "encode"; repo = pname; rev = version; - sha256 = "0aq88k7d9036cy6qvlfv9p2dxd6p6fic3j0az43gn6k1ardhdsgf"; + sha256 = "sha256-HNSPLmZTXZL1e5E9VJiXnQuO2WiXLYOveNTlFqdlTG8="; }; - patches = [ - # sqlalchemy 1.4 compat, https://github.com/encode/databases/pull/299 - (fetchpatch { - url = "https://github.com/encode/databases/commit/9d6e0c024833bd41421f0798a94ef2bbf27a31d5.patch"; - sha256 = "0wz9dz6g88ifvvwlhy249cjvqpx72x99wklzcl7b23srpcvb5gv1"; - }) - (fetchpatch { - url = "https://github.com/encode/databases/commit/40c41c2b7b3fedae484ad94d81b27ce88a09c5ed.patch"; - sha256 = "0z458l3vkg4faxbnf31lszfby5d10fa9kgxxy4xxcm0py6d8a2pi"; - }) - ]; - propagatedBuildInputs = [ aiocontextvars sqlalchemy diff --git a/third_party/nixpkgs/pkgs/development/python-modules/databricks-cli/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/databricks-cli/default.nix index 547b9a3af7..e9313447ec 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/databricks-cli/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/databricks-cli/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "databricks-cli"; - version = "0.14.3"; + version = "0.15.0"; src = fetchPypi { inherit pname version; - sha256 = "bdf89a3917a3f8f8b99163e38d40e66dc478c7408954747f145cd09816b05e2c"; + sha256 = "4d0fbe3cb9c86d7342d45357f1db2e01011c507659f21b7a8144709cf8fa9f96"; }; checkInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/databricks-connect/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/databricks-connect/default.nix index afb8e13dc5..1e522059c5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/databricks-connect/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/databricks-connect/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "databricks-connect"; - version = "8.1.6"; + version = "8.1.11"; src = fetchPypi { inherit pname version; - sha256 = "2d6989491a2a33853eb10500574eb62dbcb98ac691d7e98022c5f18e23ad18b2"; + sha256 = "cd9d1b27edd9345a2a32b365a511f8457c5c1a8f107546fe1ef9063dd15aac00"; }; sourceRoot = "."; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dataclasses-json/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dataclasses-json/default.nix index f97217cd29..bfb179f035 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dataclasses-json/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dataclasses-json/default.nix @@ -1,7 +1,6 @@ { lib , buildPythonPackage , fetchFromGitHub -, stringcase , typing-inspect , marshmallow-enum , hypothesis @@ -11,17 +10,16 @@ buildPythonPackage rec { pname = "dataclasses-json"; - version = "0.5.4"; + version = "0.5.5"; src = fetchFromGitHub { owner = "lidatong"; repo = pname; rev = "v${version}"; - sha256 = "193xklf1xrsin7fr24yqx5ckr4m5s9v1bdyr00qr51j74hiy8qsv"; + sha256 = "sha256-b8oWl8AteVuGYb4E+M9aDS2ERgnKN8wS17Y/Bs7ajcI="; }; propagatedBuildInputs = [ - stringcase typing-inspect marshmallow-enum ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/debian/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/debian/default.nix index e97c3420f4..48b5b015b1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/debian/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/debian/default.nix @@ -1,13 +1,17 @@ -{ lib, buildPythonPackage, fetchPypi -, chardet, six}: +{ lib +, buildPythonPackage +, fetchPypi +, chardet +, six +}: buildPythonPackage rec { pname = "python-debian"; - version = "0.1.39"; + version = "0.1.40"; src = fetchPypi { inherit pname version; - sha256 = "6cca96239b5981f5203216d2113fea522477628607ed0a8427e15094a792541c"; + sha256 = "385dfb965eca75164d256486c7cf9bae772d24144249fd18b9d15d3cffb70eea"; }; propagatedBuildInputs = [ chardet six ]; @@ -15,8 +19,11 @@ buildPythonPackage rec { # No tests in archive doCheck = false; - meta = { + pythonImportsCheck = [ "debian" ]; + + meta = with lib; { description = "Debian package related modules"; - license = lib.licenses.gpl2; + license = licenses.gpl2; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/django-auth-ldap/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/django-auth-ldap/default.nix index ed6ee01e34..ab329cd37a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/django-auth-ldap/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/django-auth-ldap/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "django-auth-ldap"; - version = "2.4.0"; + version = "3.0.0"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "60fcbfc3141c99c3c49d3ccd7311a3992a231c319d94b6d2c143968f63676676"; + sha256 = "1f2d5c562d9ba9a5e9a64099ae9798e1a63840a11afe4d1c4a9c74121f066eaa"; }; propagatedBuildInputs = [ ldap django ]; @@ -20,6 +20,8 @@ buildPythonPackage rec { # django.core.exceptions.ImproperlyConfigured: Requested setting INSTALLED_APPS, but settings are not configured. You must either define the environment variable DJANGO_SETTINGS_MODULE or call settings.configure() before accessing settings doCheck = false; + pythonImportsCheck = [ "django_auth_ldap" ]; + meta = with lib; { description = "Django authentication backend that authenticates against an LDAP service"; homepage = "https://github.com/django-auth-ldap/django-auth-ldap"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/django-ipware/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/django-ipware/default.nix index 54c3bf7cee..d773c1490b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/django-ipware/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/django-ipware/default.nix @@ -2,21 +2,25 @@ buildPythonPackage rec { pname = "django-ipware"; - version = "3.0.7"; - - meta = { - description = "A Django application to retrieve user's IP address"; - homepage = "https://github.com/un33k/django-ipware"; - license = lib.licenses.mit; - }; + version = "4.0.0"; src = fetchPypi { inherit pname version; - sha256 = "753f8214a16ccaac54ea977349a96e37b582a28a54065e00c1c46d530862c85e"; + sha256 = "1294f916f3b3475e40e1b0ec1bd320aa2397978eae672721c81cbc2ed517e9ee"; }; propagatedBuildInputs = [ django ]; # django.core.exceptions.ImproperlyConfigured: Requested setting IPWARE_TRUSTED_PROXY_LIST, but settings are not configured. You must either define the environment variable DJANGO_SETTINGS_MODULE or call settings.configure() before accessing settings. doCheck = false; + + # pythonImportsCheck fails with: + # django.core.exceptions.ImproperlyConfigured: Requested setting IPWARE_META_PRECEDENCE_ORDER, but settings are not configured. You must either define the environment variable DJANGO_SETTINGS_MODULE or call settings.configure() before accessing settings. + + meta = with lib; { + description = "A Django application to retrieve user's IP address"; + homepage = "https://github.com/un33k/django-ipware"; + license = licenses.mit; + maintainers = with maintainers; [ ]; + }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/django-q/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/django-q/default.nix index c9c5410416..f81fc01bdd 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/django-q/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/django-q/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "django-q"; - version = "1.3.8"; + version = "1.3.9"; src = fetchPypi { inherit pname version; - sha256 = "db30266fadd6ab9336a8824291910ff1d1c28f7bc9d6e52cdaf33cc275ae6146"; + sha256 = "5c6b4d530aa3aabf9c6aa57376da1ca2abf89a1562b77038b7a04e52a4a0a91b"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/django-versatileimagefield/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/django-versatileimagefield/default.nix index dc7cde76a6..eefda80f18 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/django-versatileimagefield/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/django-versatileimagefield/default.nix @@ -2,18 +2,17 @@ , buildPythonPackage , fetchPypi , django -, python , pillow , python_magic }: buildPythonPackage rec { pname = "django-versatileimagefield"; - version = "2.1"; + version = "2.2"; src = fetchPypi { inherit pname version; - sha256 = "e98f7b0abfbf2559d55b08be40911dcc44b6f3437a6c40d81bf66b6914837fdf"; + sha256 = "6569d5c3e13c69ab8912ba5100084aa5abcdcffb8d1f5abc085b226e7bbd65b3"; }; propagatedBuildInputs = [ pillow python_magic ]; @@ -22,6 +21,8 @@ buildPythonPackage rec { # tests not included with pypi release doCheck = false; + pythonImportsCheck = [ "versatileimagefield" ]; + meta = with lib; { description = "Replaces django's ImageField with a more flexible interface"; homepage = "https://github.com/respondcreate/django-versatileimagefield/"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/django-webpack-loader/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/django-webpack-loader/default.nix index 3e849b4877..c782a5f674 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/django-webpack-loader/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/django-webpack-loader/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "django-webpack-loader"; - version = "0.7.0"; + version = "1.1.0"; src = fetchPypi { inherit pname version; - sha256 = "0izl6bibhz3v538ad5hl13lfr6kvprf62rcl77wq2i5538h8hg3s"; + sha256 = "c7f89a272a177a17a045ceab26bbb7e35d28ca5597c384de96817784b610c977"; }; # django.core.exceptions.ImproperlyConfigured (path issue with DJANGO_SETTINGS_MODULE?) diff --git a/third_party/nixpkgs/pkgs/development/python-modules/django_redis/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/django_redis/default.nix index 56e4e845f0..61101cc8a9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/django_redis/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/django_redis/default.nix @@ -1,27 +1,35 @@ -{ lib, fetchPypi, buildPythonPackage, - mock, django, redis, msgpack }: +{ lib +, fetchPypi +, buildPythonPackage +, mock +, django +, redis +, msgpack +}: buildPythonPackage rec { pname = "django-redis"; - version = "4.12.1"; + version = "5.0.0"; src = fetchPypi { inherit pname version; - sha256 = "306589c7021e6468b2656edc89f62b8ba67e8d5a1c8877e2688042263daa7a63"; + sha256 = "048f665bbe27f8ff2edebae6aa9c534ab137f1e8fa7234147ef470df3f3aa9b8"; }; - doCheck = false; - - buildInputs = [ mock ]; - propagatedBuildInputs = [ django redis msgpack ]; + # django.core.exceptions.ImproperlyConfigured: Requested setting DJANGO_REDIS_SCAN_ITERSIZE, but settings are not configured. You must either define the environment variable DJANGO_SETTINGS_MODULE or call settings.configure() before accessing settings. + doCheck = false; + + pythonImportsCheck = [ "django_redis" ]; + meta = with lib; { description = "Full featured redis cache backend for Django"; homepage = "https://github.com/niwibe/django-redis"; license = licenses.bsd3; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/django_reversion/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/django_reversion/default.nix index 6de1ce6432..348228a8c0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/django_reversion/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/django_reversion/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "django-reversion"; - version = "3.0.9"; + version = "4.0.0"; src = fetchPypi { inherit pname version; - sha256 = "a5af55f086a3f9c38be2f049c251e06005b9ed48ba7a109473736b1fc95a066f"; + sha256 = "ad6d714b4b9b824e22b88d47201cc0f74b5c4294c8d4e1f8d7ac7c3631ef3188"; }; # tests assume the availability of a mysql/postgresql database @@ -18,10 +18,12 @@ buildPythonPackage rec { propagatedBuildInputs = [ django ]; + pythonImportsCheck = [ "reversion" ]; + meta = with lib; { description = "An extension to the Django web framework that provides comprehensive version control facilities"; homepage = "https://github.com/etianen/django-reversion"; license = licenses.bsd3; + maintainers = with maintainers; [ ]; }; - } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/djangoql/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/djangoql/default.nix index bceb852655..e0e83e0c06 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/djangoql/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/djangoql/default.nix @@ -3,11 +3,11 @@ buildPythonPackage rec { pname = "djangoql"; - version = "0.15.2"; + version = "0.15.3"; src = fetchPypi { inherit pname version; - sha256 = "bd9d3accc5e84c439d22211676cf74ab746e557da9bc57afb27fee0ccd00e563"; + sha256 = "e1a2f32573396335a8935dfc2afb29e34eff34babec1150927ff74fcd4bbdb9d"; }; propagatedBuildInputs = [ ply ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dockerspawner/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dockerspawner/default.nix index 192fb94bd4..cae32e4a2b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dockerspawner/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dockerspawner/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "dockerspawner"; - version = "0.11.1"; + version = "12.1.0"; src = fetchPypi { inherit pname version; - sha256 = "83fd8ee012bb32432cb57bd408ff65534749aed8696648e6ac029a87fc474928"; + sha256 = "3894ed8a9157f8ac8f42e0130f43932490ac5d1e89e6f295b1252f08c00ba36b"; }; propagatedBuildInputs = [ 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 f5a9274a0d..73b0b87b01 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dropbox/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dropbox/default.nix @@ -1,29 +1,31 @@ { lib, buildPythonPackage, fetchPypi -, pytest-runner, requests, urllib3, mock, setuptools, stone }: +, requests, urllib3, mock, setuptools, stone }: buildPythonPackage rec { pname = "dropbox"; - version = "11.11.0"; + version = "11.16.0"; src = fetchPypi { inherit pname version; - sha256 = "14dd51e0e3981cb81384a8e13a308de0df13c7c4b6ba7f080177ede947761cbb"; + sha256 = "99e84367d5b983815a3680eea2c7e67bff14637c4702010c5c58611eb714dfe2"; }; postPatch = '' substituteInPlace setup.py \ - --replace "pytest-runner == 5.2.0" "pytest-runner" + --replace "'pytest-runner == 5.2.0'," "" ''; + propagatedBuildInputs = [ requests urllib3 mock setuptools stone ]; + # Set DROPBOX_TOKEN environment variable to a valid token. doCheck = false; - nativeBuildInputs = [ pytest-runner ]; - propagatedBuildInputs = [ requests urllib3 mock setuptools stone ]; + pythonImportsCheck = [ "dropbox" ]; meta = with lib; { description = "A Python library for Dropbox's HTTP-based Core and Datastore APIs"; homepage = "https://www.dropbox.com/developers/core/docs"; license = licenses.mit; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dulwich/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dulwich/default.nix index eacaa00f15..58ac73b472 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dulwich/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dulwich/default.nix @@ -15,12 +15,12 @@ }: buildPythonPackage rec { - version = "0.20.24"; + version = "0.20.25"; pname = "dulwich"; src = fetchPypi { inherit pname version; - sha256 = "1wacchqxxwbhwnfnnhlb40s66f92lkvz6423j4c1w6wb585aqqbb"; + sha256 = "79baea81583eb61eb7bd4a819ab6096686b362c626a4640d84d4fc5539139353"; }; LC_ALL = "en_US.UTF-8"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/elasticsearch/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/elasticsearch/default.nix index 86e7477ab3..c469a7c87f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/elasticsearch/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/elasticsearch/default.nix @@ -7,11 +7,11 @@ buildPythonPackage (rec { pname = "elasticsearch"; - version = "7.13.1"; + version = "7.14.0"; src = fetchPypi { inherit pname version; - sha256 = "d6bcca0b2e5665d08e6fe6fadc2d4d321affd76ce483603078fc9d3ccd2bc0f9"; + sha256 = "f3ab1454e646170bbc6796b8707e4bff125234391d2acc022221e1c0313becb4"; }; # Check is disabled because running them destroy the content of the local cluster! diff --git a/third_party/nixpkgs/pkgs/development/python-modules/feedgenerator/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/feedgenerator/default.nix index d5eb1306b3..c1e988ca76 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/feedgenerator/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/feedgenerator/default.nix @@ -1,23 +1,44 @@ -{ lib, buildPythonPackage, glibcLocales, fetchPypi, six, pytz }: +{ lib +, buildPythonPackage +, fetchPypi +, glibcLocales +, pytestCheckHook +, pythonOlder +, pytz +, six +}: buildPythonPackage rec { pname = "feedgenerator"; - version = "1.9.1"; + version = "1.9.2"; + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "0m6fjnrx3sd0bm6pnbhxxx5ywlwqh8bx0lka386kj28mg3fmm2m2"; + sha256 = "sha256-sG1pQej9aiyecXkQeehsvno3iMciRKzAbwWTtJzaN5s="; }; - buildInputs = [ glibcLocales ]; + buildInputs = [ + glibcLocales + ]; - LC_ALL="en_US.UTF-8"; + LC_ALL = "en_US.UTF-8"; - propagatedBuildInputs = [ six pytz ]; + propagatedBuildInputs = [ + pytz + six + ]; + + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ "feedgenerator" ]; meta = with lib; { - description = "Standalone version of django.utils.feedgenerator, compatible with Py3k"; - homepage = "https://github.com/dmdm/feedgenerator-py3k.git"; + description = "Standalone version of Django's feedgenerator module"; + homepage = "https://github.com/getpelican/feedgenerator"; + license = licenses.bsd3; maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/flask-jwt-extended/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/flask-jwt-extended/default.nix index 7057bb5875..d9eae8ffa5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/flask-jwt-extended/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/flask-jwt-extended/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "Flask-JWT-Extended"; - version = "4.2.1"; + version = "4.2.3"; src = fetchPypi { inherit pname version; - sha256 = "76461f2dbdf502261c69ddecd858eaf4164fbcfbf05aa456f3927fc2ab0315de"; + sha256 = "22b8ffa7587d50aaf65f3009f1d55ef7287da8260eaf4655a5837e33479216c3"; }; propagatedBuildInputs = [ python-dateutil flask pyjwt werkzeug ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/flexmock/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/flexmock/default.nix index 74c3418b54..48a2f931f6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/flexmock/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/flexmock/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "flexmock"; - version = "0.10.4"; + version = "0.10.5"; src = fetchPypi { inherit pname version; - sha256 = "0b6qw3grhgx58kxlkj7mdma7xdvlj02zabvcf7w2qifnfjwwwcsh"; + sha256 = "003422fdbcf5d6570e60a0eafeb54c0af624c6cddab5fc3bfe026e52dd0f9c5a"; }; checkInputs = [ pytest ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/flower/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/flower/default.nix index 67ecdde0d5..0d4f834f1f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/flower/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/flower/default.nix @@ -6,7 +6,7 @@ , mock , pytz , tornado -, prometheus_client +, prometheus-client , pytestCheckHook }: @@ -30,7 +30,7 @@ buildPythonPackage rec { pytz tornado humanize - prometheus_client + prometheus-client ]; checkInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-api-core/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-api-core/default.nix index 653786ace6..e53346510d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-api-core/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-api-core/default.nix @@ -5,7 +5,7 @@ , googleapis-common-protos , grpcio , protobuf -, pytz +, proto-plus , requests , mock , pytest @@ -15,11 +15,11 @@ buildPythonPackage rec { pname = "google-api-core"; - version = "1.30.0"; + version = "2.0.0"; src = fetchPypi { inherit pname version; - sha256 = "0724d354d394b3d763bc10dfee05807813c5210f0bd9b8e2ddf6b6925603411c"; + sha256 = "sha256-vZ6wcJ9OEN1v3bMv0HiKGQtDRCbCWL5uAO9A2hNtdo0="; }; propagatedBuildInputs = [ @@ -27,7 +27,7 @@ buildPythonPackage rec { google-auth grpcio protobuf - pytz + proto-plus requests ]; @@ -47,8 +47,7 @@ buildPythonPackage rec { helpers used by all Google API clients. ''; homepage = "https://github.com/googleapis/python-api-core"; - changelog = - "https://github.com/googleapis/python-api-core/blob/v${version}/CHANGELOG.md"; + changelog = "https://github.com/googleapis/python-api-core/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; maintainers = with maintainers; [ SuperSandro2000 ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-auth/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-auth/default.nix index bfca445a96..c10e3807f2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-auth/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-auth/default.nix @@ -14,24 +14,22 @@ , pytest-localserver , responses , rsa -, six , pyopenssl }: buildPythonPackage rec { pname = "google-auth"; - version = "1.34.0"; + version = "2.0.1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-8QlAiLrgRvsG89Gj198UcX6NlZ6RBbecV3Jb1OF1l6I="; + sha256 = "sha256-6hrwULPgbrc+RHD3BNIwBzB7wOh8E+AV9rkEYPFAe9M="; }; propagatedBuildInputs = [ cachetools pyasn1-modules rsa - six pyopenssl pyu2f ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-access-context-manager/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-access-context-manager/default.nix index 470ec41f83..f2e3276705 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-access-context-manager/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-access-context-manager/default.nix @@ -1,14 +1,19 @@ -{ lib, buildPythonPackage, fetchPypi, pythonOlder, google-api-core }: +{ lib, buildPythonPackage, fetchPypi, google-api-core }: buildPythonPackage rec { pname = "google-cloud-access-context-manager"; - version = "0.1.6"; + version = "0.1.7"; src = fetchPypi { inherit pname version; - sha256 = "011hbbjqjqk6fskb180hfhhsddz3i2a9gz34sf4wy1j2s4my9xy0"; + sha256 = "02adf212c8d280298ffe03a0c91743618693ec394b42cbb85b4a29f8d9544afa"; }; + postPatch = '' + substituteInPlace setup.py \ + --replace "google-api-core[grpc] >= 1.26.0, < 2.0.0dev" "google-api-core[grpc] >= 1.26.0, < 2.0.1" + ''; + propagatedBuildInputs = [ google-api-core ]; # No tests in repo @@ -19,7 +24,7 @@ buildPythonPackage rec { ]; meta = with lib; { - description = "Protobufs for Google Access Context Manager."; + description = "Protobufs for Google Access Context Manager"; homepage = "https://github.com/googleapis/python-access-context-manager"; license = licenses.asl20; maintainers = with maintainers; [ austinbutler SuperSandro2000 ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-audit-log/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-audit-log/default.nix new file mode 100644 index 0000000000..7d101c3228 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-audit-log/default.nix @@ -0,0 +1,25 @@ +{ lib, buildPythonPackage, fetchPypi, googleapis-common-protos, protobuf }: + +buildPythonPackage rec { + pname = "google-cloud-audit-log"; + version = "0.1.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "5bf5a53c641b13828154ab21fb209669be69d71cd462f5d6456bf87722fc0eeb"; + }; + + propagatedBuildInputs = [ googleapis-common-protos protobuf ]; + + # tests are a bit wonky to setup and are not very deep either + doCheck = false; + + pythonImportsCheck = [ "google.cloud.audit" ]; + + meta = with lib; { + description = "Google Cloud Audit Protos"; + homepage = "https://github.com/googleapis/python-audit-log"; + license = licenses.asl20; + maintainers = with maintainers; [ SuperSandro2000 ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-bigquery/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-bigquery/default.nix index 0bd663b4f1..4895661cb4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-bigquery/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-bigquery/default.nix @@ -18,11 +18,11 @@ buildPythonPackage rec { pname = "google-cloud-bigquery"; - version = "2.23.3"; + version = "2.25.1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-FQXtRM7YaU+S+Jqkn9dTQqJR3A1hL/XQjgPTXmANO0I="; + sha256 = "5ecf7c802cc6cf9cd79e79924616d8b7d35ba026f3313a4d90b8b4a28c72d93d"; }; propagatedBuildInputs = [ @@ -53,6 +53,12 @@ buildPythonPackage rec { # requires credentials "test_bigquery_magic" "TestBigQuery" + "test_query_retry_539" + "test_query_retry_539" + "test_list_rows_empty_table" + "test_list_rows_page_size" + "test_list_rows_scalars" + "test_list_rows_scalars_extreme" # Mocking of _ensure_bqstorage_client fails "test_to_arrow_ensure_bqstorage_client_wo_bqstorage" # requires network diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-core/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-core/default.nix index b9edb4224d..a51ed38402 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-core/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-core/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "google-cloud-core"; - version = "1.7.2"; + version = "2.0.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-sQMKrcuyrrTuUUdUJjUa+DwQckVrkY+4/bgGZsS7Y7U="; + sha256 = "sha256-kO6ZZIzPnhGhZ4Gn/FjRPlj2YrQ5xzfUjCTvGGYsJwI="; }; propagatedBuildInputs = [ google-api-core ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-firestore/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-firestore/default.nix index 87bd997ae8..8c4b964b2b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-firestore/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-firestore/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "google-cloud-firestore"; - version = "2.2.0"; + version = "2.3.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-QMwvMPebC2a09XmKQKYFPwVIbZlnUEaXxTh8hlnS9Js="; + sha256 = "sha256-gc68S+utdcO2OSCRAxyTCjnXBfUxWN/D7PfNg3cUzQ8="; }; propagatedBuildInputs = [ @@ -43,6 +43,8 @@ buildPythonPackage rec { # Tests are broken "tests/system/test_system.py" "tests/system/test_system_async.py" + # requires credentials + "tests/unit/v1/test_bulk_writer.py" ]; disabledTests = [ 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 00abd81606..f9017eb33f 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 @@ -4,6 +4,8 @@ , django , flask , google-api-core +, google-cloud-appengine-logging +, google-cloud-audit-log , google-cloud-core , google-cloud-testutils , mock @@ -22,7 +24,13 @@ buildPythonPackage rec { sha256 = "sha256-SZ7tXxPKuAXIeAsNFKDZMan/HWXvzN2eaHctQOfa1MU="; }; - propagatedBuildInputs = [ google-api-core google-cloud-core proto-plus ]; + propagatedBuildInputs = [ + google-api-core + google-cloud-appengine-logging + google-cloud-audit-log + google-cloud-core + proto-plus + ]; checkInputs = [ django diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-spanner/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-spanner/default.nix index 5f03a18118..c6e1021f34 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-spanner/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-spanner/default.nix @@ -14,11 +14,11 @@ buildPythonPackage rec { pname = "google-cloud-spanner"; - version = "3.7.0"; + version = "3.8.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-4LGSB7KU+RGvjSQ/w1vXxa5fkfFT4C5omhk/LnGSUng="; + sha256 = "sha256-K8K0JjKHWojSVFnUr3GhJP4gflYTXH6V7Mywu4hTvRQ="; }; propagatedBuildInputs = [ @@ -43,8 +43,13 @@ buildPythonPackage rec { disabledTestPaths = [ # Requires credentials - "tests/system/test_system.py" - "tests/system/test_system_dbapi.py" + "tests/system/test_backup_api.py" + "tests/system/test_database_api.py" + "tests/system/test_dbapi.py" + "tests/system/test_instance_api.py" + "tests/system/test_session_api.py" + "tests/system/test_streaming_chunking.py" + "tests/system/test_table_api.py" "tests/unit/spanner_dbapi/test_connect.py" "tests/unit/spanner_dbapi/test_connection.py" "tests/unit/spanner_dbapi/test_cursor.py" diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-resumable-media/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-resumable-media/default.nix index 83b192522f..c76cd53a82 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-resumable-media/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-resumable-media/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "google-resumable-media"; - version = "1.3.3"; + version = "2.0.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-zjhVXSUL1wsMJZi/YemQA8uMVpsBduwOPzi4b5//9YE="; + sha256 = "sha256-CUwDgXNGSayTkIPqODO9I5t/upBNJGNC0SaJhAKfIWc="; }; propagatedBuildInputs = [ google-auth google-crc32c requests ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/gradient-utils/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/gradient-utils/default.nix index ee8d1bde62..171f87b5dd 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/gradient-utils/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/gradient-utils/default.nix @@ -5,7 +5,7 @@ , mock , numpy , poetry-core -, prometheus_client +, prometheus-client , pytestCheckHook , requests }: @@ -26,14 +26,15 @@ buildPythonPackage rec { substituteInPlace pyproject.toml \ --replace 'numpy = "1.18.5"' 'numpy = "^1.18.5"' \ --replace 'hyperopt = "0.1.2"' 'hyperopt = ">=0.1.2"' \ - --replace 'wheel = "^0.35.1"' 'wheel = "*"' + --replace 'wheel = "^0.35.1"' 'wheel = "*"' \ + --replace 'prometheus-client = ">=0.8,<0.10"' 'prometheus-client = "*"' ''; nativeBuildInputs = [ poetry-core ]; propagatedBuildInputs = [ hyperopt - prometheus_client + prometheus-client numpy ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/hap-python/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/hap-python/default.nix index e48826eae9..39d7429e81 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/hap-python/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/hap-python/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "hap-python"; - version = "4.0.0"; + version = "4.1.0"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "ikalchev"; repo = "HAP-python"; rev = "v${version}"; - sha256 = "1k4gq23j4f7yppxf8rzrrayn6clj48cdzixjdsmv5awhzsf9n6w4"; + sha256 = "sha256-vUbcsG6mKPgH+IF5i/BYSIkfIizSZzMWz0Kq0yfuKxE="; }; propagatedBuildInputs = [ @@ -42,8 +42,8 @@ buildPythonPackage rec { pytestCheckHook ]; - # Disable tests requiring network access disabledTestPaths = [ + # Disable tests requiring network access "tests/test_accessory_driver.py" "tests/test_hap_handler.py" "tests/test_hap_protocol.py" @@ -56,8 +56,11 @@ buildPythonPackage rec { "test_we_can_start_stop" "test_push_event" "test_bridge_run_stop" + "test_migration_to_include_client_properties" ]; + pythonImportsCheck = [ "pyhap" ]; + meta = with lib; { homepage = "https://github.com/ikalchev/HAP-python"; description = "HomeKit Accessory Protocol implementation in python"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/hmmlearn/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/hmmlearn/default.nix index d079b18a30..17f5126367 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/hmmlearn/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/hmmlearn/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "hmmlearn"; - version = "0.2.5"; + version = "0.2.6"; src = fetchurl { url = "mirror://pypi/h/hmmlearn/${pname}-${version}.tar.gz"; - sha256 = "14fb4ad3fb7529785844a25fae5d32272619fb5973cc02c8784018055470ca01"; + sha256 = "2a289cf28b31be59fa8ba5d3253d4a2a992401d45a8cdc221ae484fbf390c0d7"; }; buildInputs = [ setuptools-scm cython ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/holoviews/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/holoviews/default.nix index 0cf33a8f58..1b4996f4cb 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/holoviews/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/holoviews/default.nix @@ -16,11 +16,11 @@ buildPythonPackage rec { pname = "holoviews"; - version = "1.14.4"; + version = "1.14.5"; src = fetchPypi { inherit pname version; - sha256 = "08e8be82c2e514e1700a75f02307f414179dc0ecfa2202702dd304a381909eaa"; + sha256 = "268e07c09012d24233d8957f0207b9aec33000b639e661ca50e68458d735e6be"; }; propagatedBuildInputs = [ @@ -40,6 +40,8 @@ buildPythonPackage rec { # tests not fully included with pypi release doCheck = false; + pythonImportsCheck = [ "holoviews" ]; + meta = with lib; { description = "Python data analysis and visualization seamless and simple"; homepage = "http://www.holoviews.org/"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/hydra/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/hydra/default.nix index 42f2812a6e..5fb15be0a3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/hydra/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/hydra/default.nix @@ -1,24 +1,30 @@ -{ lib, buildPythonPackage, fetchFromGitHub, isPy27, pytest, omegaconf, pathlib2 }: +{ lib, buildPythonPackage, fetchFromGitHub, pythonOlder, pytestCheckHook +, importlib-resources, omegaconf, jre_headless, antlr4-python3-runtime }: buildPythonPackage rec { pname = "hydra"; - version = "0.11.3"; + version = "1.1.1"; + + disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "facebookresearch"; repo = pname; - rev = version; - sha256 = "0plbls65qfrvvigza3qvy0pwjzgkz8ylpgb1im14k3b125ny41ad"; + rev = "v${version}"; + sha256 = "sha256:1svzysrjg47gb6lxx66fzd8wbhpbbsppprpbqssf5aqvhxgay3qk"; }; - checkInputs = [ pytest ]; - propagatedBuildInputs = [ omegaconf ] ++ lib.optional isPy27 pathlib2; + nativeBuildInputs = [ jre_headless ]; + checkInputs = [ pytestCheckHook ]; + propagatedBuildInputs = [ omegaconf antlr4-python3-runtime ] + ++ lib.optionals (pythonOlder "3.9") [ importlib-resources ]; - checkPhase = '' - runHook preCheck - pytest tests/ - runHook postCheck - ''; + # test environment setup broken under Nix for a few tests: + disabledTests = [ + "test_bash_completion_with_dot_in_path" + "test_install_uninstall" + ]; + disabledTestPaths = [ "tests/test_hydra.py" ]; meta = with lib; { description = "A framework for configuring complex applications"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/inform/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/inform/default.nix index 9f78d86a2b..2397c0bc4d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/inform/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/inform/default.nix @@ -2,8 +2,6 @@ , arrow , six , hypothesis -, pytest -, pytest-runner , pytestCheckHook }: @@ -18,13 +16,18 @@ buildPythonPackage rec { sha256 = "114cyff00j9r7qm2ld4w1a4kklr5gx570vk67p56gpr2553dkmly"; }; - nativeBuildInputs = [ pytest-runner ]; + postPatch = '' + substituteInPlace setup.py \ + --replace "pytest-runner>=2.0" "" + ''; + propagatedBuildInputs = [ arrow six ]; - checkInputs = [ pytest hypothesis ]; - checkPhase = '' + checkInputs = [ pytestCheckHook hypothesis ]; + preCheck = '' patchShebangs test.doctests.py test.inform.py - ./test.doctests.py && ./test.inform.py && pytest + ./test.doctests.py + ./test.inform.py ''; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/itemadapter/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/itemadapter/default.nix index d50ad3a78a..5d85ad7195 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/itemadapter/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/itemadapter/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "itemadapter"; - version = "0.3.0"; + version = "0.4.0"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "ab2651ba20f5f6d0e15f041deba4c13ffc59270def2bd01518d13e94c4cd27d1"; + sha256 = "f05df8da52619da4b8c7f155d8a15af19083c0c7ad941d8c1de799560ad994ca"; }; doCheck = false; # infinite recursion with Scrapy diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jc/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jc/default.nix index b09137d361..bf671fcb1b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jc/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jc/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "jc"; - version = "1.16.0"; + version = "1.16.1"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "kellyjonbrazil"; repo = pname; rev = "v${version}"; - sha256 = "sha256-6kh9FzMW5davxN8jNFFUh+PGSNAW7w8aeoJP25mGY10="; + sha256 = "sha256-R/RKMxSilv8JJW5om+l99vvrZYHjEEK1OCdsYWuxA74="; }; propagatedBuildInputs = [ ruamel_yaml xmltodict pygments ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jenkins-job-builder/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jenkins-job-builder/default.nix index 3ae6bf84ae..5b3f68272f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jenkins-job-builder/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jenkins-job-builder/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "jenkins-job-builder"; - version = "3.9.0"; + version = "3.10.0"; src = fetchPypi { inherit pname version; - sha256 = "4a53e146843d567c375c2e61e70a840d75a412402fd78c1dd3da5642a6aaa375"; + sha256 = "sha256-8MP8YHIkxDqjPsUYv6ROmuRwcGMzPpsVCRwxga3XdYU="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jq/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jq/default.nix index f9f71a587a..3833bf9850 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jq/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jq/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "jq"; - version = "1.1.3"; + version = "1.2.1"; src = fetchPypi { inherit pname version; - sha256 = "1ryxcll7601ki9rwlnryhhxpmwwnxs2qxq7kjm2b0xcqgzx1vv7r"; + sha256 = "73ce588025495e6ebcda20bb9e64b6d9f3f1657c22895143ae243899ac710cbc"; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/junos-eznc/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/junos-eznc/default.nix index c98f20be52..6dcc8e9273 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/junos-eznc/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/junos-eznc/default.nix @@ -18,11 +18,11 @@ buildPythonPackage rec { pname = "junos-eznc"; - version = "2.6.1"; + version = "2.6.2"; src = fetchPypi { inherit pname version; - sha256 = "2f5de7dedaac8dd71bfea23c6a7d883e29947c91de1ba299a9242e0a4406ee46"; + sha256 = "878c479c933346cc8cc60b6d145973568ac23e7c453e193cf55625e7921a9b62"; }; postPatch = '' @@ -40,6 +40,8 @@ buildPythonPackage rec { nosetests -v --with-coverage --cover-package=jnpr.junos --cover-inclusive -a unit ''; + pythonImportsCheck = [ "jnpr.junos" ]; + meta = with lib; { homepage = "http://www.github.com/Juniper/py-junos-eznc"; description = "Junos 'EZ' automation for non-programmers"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jupyter-repo2docker/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jupyter-repo2docker/default.nix index 7597df0d76..1b352f1e24 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jupyter-repo2docker/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jupyter-repo2docker/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi, pythonAtLeast +{ lib, buildPythonPackage, fetchPypi, pythonOlder , docker , escapism , jinja2 @@ -14,7 +14,7 @@ buildPythonPackage rec { version = "2021.3.0"; pname = "jupyter-repo2docker"; - disabled = !(pythonAtLeast "3.4"); + disabled = pythonOlder "3.4"; src = fetchPypi { inherit pname version; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jupyter_server/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jupyter_server/default.nix index a8ae35e2bd..72e1540e07 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jupyter_server/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jupyter_server/default.nix @@ -17,7 +17,7 @@ , nbconvert , send2trash , terminado -, prometheus_client +, prometheus-client , anyio , websocket-client , requests @@ -46,7 +46,7 @@ buildPythonPackage rec { nbconvert send2trash terminado - prometheus_client + prometheus-client anyio websocket-client ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jupyterhub/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jupyterhub/default.nix index 904cd7df0c..a90fa0eb9a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jupyterhub/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jupyterhub/default.nix @@ -13,7 +13,7 @@ , jupyter-telemetry , oauthlib , pamela -, prometheus_client +, prometheus-client , requests , sqlalchemy , tornado @@ -121,7 +121,7 @@ buildPythonPackage rec { jupyter-telemetry oauthlib pamela - prometheus_client + prometheus-client requests sqlalchemy tornado diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jupyterlab/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jupyterlab/default.nix index 95ef213885..6264bbb5c4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jupyterlab/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jupyterlab/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "jupyterlab"; - version = "3.0.16"; + version = "3.1.6"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "7ad4fbe1f6d38255869410fd151a8b15692a663ca97c0a8146b3f5c40e275c23"; + sha256 = "6d2ada6a333861f33a1b555d3cb7b07aa9d1ab80f07997b3d0c43878a98c1174"; }; nativeBuildInputs = [ jupyter-packaging ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jupyterlab_server/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jupyterlab_server/default.nix index 2c60d7b3b2..cca40463b0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jupyterlab_server/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jupyterlab_server/default.nix @@ -16,12 +16,12 @@ buildPythonPackage rec { pname = "jupyterlab_server"; - version = "2.6.0"; + version = "2.7.0"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "f300adf6bb0a952bebe9c807a3b2a345d62da39b476b4f69ea0dc6b5f3f6b97d"; + sha256 = "31457ef564febc42043bc539356c804f6f9144f602e2852150bf0820ed6d7e18"; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jwcrypto/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jwcrypto/default.nix index 182cfd0d48..ca7319eeb1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jwcrypto/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jwcrypto/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "jwcrypto"; - version = "0.9.1"; + version = "1.0"; src = fetchPypi { inherit pname version; - sha256 = "63531529218ba9869e14ef8c9e7b516865ede3facf9b0ef3d3ba68014da211f9"; + sha256 = "f88816eb0a41b8f006af978ced5f171f33782525006cdb055b536a40f4d46ac9"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/karton-dashboard/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/karton-dashboard/default.nix index c2251a0e23..d1dd4478cf 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/karton-dashboard/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/karton-dashboard/default.nix @@ -4,7 +4,7 @@ , flask , karton-core , mistune -, prometheus_client +, prometheus-client }: buildPythonPackage rec { @@ -22,13 +22,13 @@ buildPythonPackage rec { flask karton-core mistune - prometheus_client + prometheus-client ]; postPatch = '' substituteInPlace requirements.txt \ --replace "Flask==1.1.1" "Flask" \ - --replace "prometheus_client==0.9.0" "prometheus-client" + --replace "prometheus-client==0.9.0" "prometheus-client" ''; # Project has no tests. pythonImportsCheck requires MinIO configuration diff --git a/third_party/nixpkgs/pkgs/development/python-modules/limnoria/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/limnoria/default.nix index b8b13fab29..0afd8902d9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/limnoria/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/limnoria/default.nix @@ -2,24 +2,25 @@ , buildPythonPackage , fetchPypi , isPy27 -, pkgs +, git }: buildPythonPackage rec { pname = "limnoria"; - version = "2021.06.15"; + version = "2021.07.21"; disabled = isPy27; # abandoned upstream src = fetchPypi { inherit pname version; - sha256 = "47290281f3f945261a7f8d8c6f207dcb1d277b241f58827d5a76ab8cd453a1d0"; + sha256 = "80ca1db9648e7678f81b373dab04d06025ec6532e68a9be773ddbd159de54e4c"; }; - patchPhase = '' + postPatch = '' sed -i 's/version=version/version="${version}"/' setup.py ''; - buildInputs = [ pkgs.git ]; + buildInputs = [ git ]; + # cannot be imported doCheck = false; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mecab-python3/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mecab-python3/default.nix index bb5ffb7de7..ad717e9d0c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mecab-python3/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mecab-python3/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "mecab-python3"; - version = "1.0.3"; + version = "1.0.4"; src = fetchPypi { inherit pname version; - sha256 = "62abe28a1155398325372291483608427bc82681fef80e7d132904415f9fd42e"; + sha256 = "b150ad5fe4260539b4ef184657e552ef81307fbbe60ae1f258bc814549ea90f8"; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mpldatacursor/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mpldatacursor/default.nix new file mode 100644 index 0000000000..b14470ca21 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/mpldatacursor/default.nix @@ -0,0 +1,31 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, matplotlib +}: + +buildPythonPackage rec { + pname = "mpldatacursor"; + version = "0.7.1"; + + src = fetchFromGitHub { + owner = "joferkington"; + repo = pname; + rev = "v${version}"; + sha256 = "0i1lwl6x6hgjq4xwsc138i4v5895lmnpfqwpzpnj5mlck6fy6rda"; + }; + + propagatedBuildInputs = [ matplotlib ]; + + # No tests included in archive + doCheck = false; + + pythonImportsCheck = [ "mpldatacursor" ]; + + meta = with lib; { + homepage = "https://github.com/joferkington/mpldatacursor"; + description = "Interactive data cursors for matplotlib"; + license = licenses.mit; + maintainers = with maintainers; [ bzizou ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/msal/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/msal/default.nix index b5095cc591..73a40741f3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/msal/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/msal/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "msal"; - version = "1.12.0"; + version = "1.13.0"; src = fetchPypi { inherit pname version; - sha256 = "5cc93f09523c703d4e00a901cf719ade4faf2c3d14961ba52060ae78d5b25327"; + sha256 = "1ab72dbb623fb8663e8fdefc052b1f9d4ae0951ea872f5f488dad58f3618c89d"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/nbsphinx/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/nbsphinx/default.nix index 8611059eb3..1b0a95f3d7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/nbsphinx/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/nbsphinx/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "nbsphinx"; - version = "0.8.6"; + version = "0.8.7"; src = fetchPypi { inherit pname version; - sha256 = "097dee333558f400e9abbb53ce7d4fa64a257cfa89dd20f7554dca7f0cd5e143"; + sha256 = "ff91b5b14ceb1a9d44193b5fc3dd3617e7b8ab59c788f7710049ce5faff2750c"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/networkx/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/networkx/default.nix index c92db16fc6..0ed9f3b9cb 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/networkx/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/networkx/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "networkx"; # upgrade may break sage, please test the sage build or ping @timokau on upgrade - version = "2.5.1"; + version = "2.6.2"; src = fetchPypi { inherit pname version; - sha256 = "109cd585cac41297f71103c3c42ac6ef7379f29788eb54cb751be5a663bb235a"; + sha256 = "2306f1950ce772c5a59a57f5486d59bb9cab98497c45fc49cbc45ac0dec119bb"; }; propagatedBuildInputs = [ decorator setuptools ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/notebook/2.nix b/third_party/nixpkgs/pkgs/development/python-modules/notebook/2.nix index 0e5cfdf439..179fd25bef 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/notebook/2.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/notebook/2.nix @@ -20,7 +20,7 @@ , requests , send2trash , pexpect -, prometheus_client +, prometheus-client }: buildPythonPackage rec { @@ -40,7 +40,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ jinja2 tornado ipython_genutils traitlets jupyter_core send2trash jupyter_client nbformat nbconvert ipykernel terminado requests pexpect - prometheus_client + prometheus-client ]; # disable warning_filters diff --git a/third_party/nixpkgs/pkgs/development/python-modules/notebook/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/notebook/default.nix index 3276c8ec51..bc1296b8a5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/notebook/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/notebook/default.nix @@ -21,7 +21,7 @@ , requests , send2trash , pexpect -, prometheus_client +, prometheus-client , pytestCheckHook }: @@ -43,7 +43,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ jinja2 tornado ipython_genutils traitlets jupyter_core send2trash jupyter_client nbformat nbconvert ipykernel terminado requests pexpect - prometheus_client argon2_cffi + prometheus-client argon2_cffi ]; # disable warning_filters diff --git a/third_party/nixpkgs/pkgs/development/python-modules/omegaconf/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/omegaconf/default.nix index 42249e9337..14fc824f5c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/omegaconf/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/omegaconf/default.nix @@ -1,20 +1,28 @@ -{ lib, buildPythonPackage, fetchFromGitHub, pythonOlder -, pytest, pytest-runner, pyyaml, six, pathlib2, isPy27 }: +{ lib, buildPythonPackage, fetchFromGitHub, pytest-mock, pytestCheckHook +, pyyaml, pythonOlder, jre_minimal, antlr4-python3-runtime }: buildPythonPackage rec { pname = "omegaconf"; - version = "1.4.1"; + version = "2.1.1"; + + disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "omry"; repo = pname; - rev = version; - sha256 = "1vpcdjlq54pm8xmkv2hqm2n1ysvz2a9iqgf55x0w6slrb4595cwb"; + rev = "v${version}"; + sha256 = "0hh6pk4q6nb94bz9rwa6cysf3nj50rmqkjh34pqkh28nzg44afjw"; }; - checkInputs = [ pytest ]; - buildInputs = [ pytest-runner ]; - propagatedBuildInputs = [ pyyaml six ] ++ lib.optional isPy27 pathlib2; + postPatch = '' + substituteInPlace setup.py --replace 'setup_requires=["pytest-runner"]' 'setup_requires=[]' + ''; + + checkInputs = [ pytestCheckHook pytest-mock ]; + nativeBuildInputs = [ jre_minimal ]; + propagatedBuildInputs = [ antlr4-python3-runtime pyyaml ]; + + disabledTestPaths = [ "tests/test_pydev_resolver_plugin.py" ]; # needs pydevd - not in Nixpkgs meta = with lib; { description = "A framework for configuring complex applications"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/onnx/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/onnx/default.nix index cf1d595d90..3f6a86928b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/onnx/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/onnx/default.nix @@ -1,7 +1,6 @@ { lib , buildPythonPackage , fetchPypi -, pythonOlder , isPy27 , cmake , protobuf @@ -15,14 +14,14 @@ buildPythonPackage rec { pname = "onnx"; - version = "1.9.0"; + version = "1.10.1"; # Python 2 is not supported as of Onnx v1.8 disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "0yjv2axz2vc2ysniwislsp53fsb8f61y1warrr2ppn2d9ijml1d9"; + sha256 = "9d941ba76cab55db8913ecad9dc50cefeb368460f6338a91783a5d7643f3a044"; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/parse-type/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/parse-type/default.nix index 709b257e33..8faff81880 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/parse-type/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/parse-type/default.nix @@ -1,28 +1,45 @@ -{ lib, fetchPypi -, buildPythonPackage, pythonOlder -, pytest, pytest-runner -, parse, six, enum34 +{ lib +, buildPythonPackage +, fetchFromGitHub +, parse +, pytestCheckHook +, pythonOlder +, six }: buildPythonPackage rec { - pname = "parse_type"; - version = "0.5.2"; + pname = "parse-type"; + version = "0.5.6"; - src = fetchPypi { - inherit pname version; - sha256 = "02wclgiqky06y36b3q07b7ngpks5j0gmgl6n71ac2j2hscc0nsbz"; + src = fetchFromGitHub { + owner = "jenisys"; + repo = "parse_type"; + rev = "v${version}"; + sha256 = "sha256-CJroqJIi5DpmR8i1lr8OJ+234615PhpVUsqK91XOT3E="; }; - checkInputs = [ pytest pytest-runner ]; - propagatedBuildInputs = [ parse six ] ++ lib.optional (pythonOlder "3.4") enum34; + propagatedBuildInputs = [ + parse + six + ]; - checkPhase = '' - py.test tests + checkInputs = [ + pytestCheckHook + ]; + + postPatch = '' + substituteInPlace pytest.ini \ + --replace "--metadata PACKAGE_UNDER_TEST parse_type" "" \ + --replace "--metadata PACKAGE_VERSION 0.5.6" "" \ + --replace "--html=build/testing/report.html --self-contained-html" "" \ + --replace "--junit-xml=build/testing/report.xml" "" ''; + pythonImportsCheck = [ "parse_type" ]; + meta = with lib; { - homepage = "https://github.com/jenisys/parse_type"; description = "Simplifies to build parse types based on the parse module"; + homepage = "https://github.com/jenisys/parse_type"; license = licenses.bsd3; maintainers = with maintainers; [ alunduil ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/parsedatetime/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/parsedatetime/default.nix index c6a4d19392..4b42071f01 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/parsedatetime/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/parsedatetime/default.nix @@ -29,11 +29,12 @@ buildPythonPackage rec { "testFloat" ]; - pythonImportChecks = [ "parsedatetime" ]; + pythonImportsCheck = [ "parsedatetime" ]; meta = with lib; { description = "Parse human-readable date/time text"; homepage = "https://github.com/bear/parsedatetime"; license = licenses.asl20; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pdftotext/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pdftotext/default.nix index 400dc76c0d..d64b2719f3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pdftotext/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pdftotext/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pdftotext"; - version = "2.1.6"; + version = "2.2.0"; src = fetchPypi { inherit pname version; - sha256 = "caf8ddbaeaf0a5897f07655a71747242addab2e695e84c5d47f2ea92dfe2a594"; + sha256 = "efbbfb14cf37ed7ab2c71936bae44707dfed6bb3be7ea5214e9c44c8c258c7af"; }; buildInputs = [ poppler ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pelican/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pelican/default.nix index 5419407d61..3f9d2e0ceb 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pelican/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pelican/default.nix @@ -1,20 +1,42 @@ -{ lib, buildPythonPackage, fetchFromGitHub, isPy27 -, glibcLocales, git -, mock, nose, markdown, lxml, typogrify -, jinja2, pygments, docutils, pytz, unidecode, six, python-dateutil, feedgenerator -, blinker, pillow, beautifulsoup4, markupsafe, pandoc }: +{ lib +, beautifulsoup4 +, blinker +, buildPythonPackage +, docutils +, feedgenerator +, fetchFromGitHub +, git +, glibcLocales +, isPy27 +, jinja2 +, lxml +, markdown +, markupsafe +, mock +, pytestCheckHook +, pandoc +, pillow +, pygments +, python-dateutil +, pythonOlder +, pytz +, rich +, pytest-xdist +, six +, typogrify +, unidecode +}: buildPythonPackage rec { pname = "pelican"; - version = "4.5.4"; - - disabled = isPy27; + version = "4.6.0"; + disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "getpelican"; - repo = "pelican"; + repo = pname; rev = version; - sha256 = "08l8kk3c7ca1znxmgdmfgzn28dzjcziwflzq80fn9zigqj0y7fi8"; + sha256 = "0xrz0cmjyaylr81rmy5i3qbp4ms1iwh0gpb07q1dwljffb8xzbhr"; # Remove unicode file names which leads to different checksums on HFS+ # vs. other filesystems because of unicode normalisation. extraPostFetch = '' @@ -22,18 +44,6 @@ buildPythonPackage rec { ''; }; - doCheck = true; - - # Exclude custom locale test, which files were removed above to fix the source checksum - checkPhase = '' - nosetests -s \ - --exclude=test_basic_generation_works \ - --exclude=test_custom_generation_works \ - --exclude=test_custom_locale_generation_works \ - --exclude=test_log_filter \ - pelican - ''; - buildInputs = [ glibcLocales pandoc @@ -44,21 +54,46 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ - jinja2 pygments docutils pytz unidecode six python-dateutil feedgenerator - blinker pillow beautifulsoup4 markupsafe lxml + beautifulsoup4 + blinker + docutils + feedgenerator + jinja2 + lxml + markupsafe + pillow + pygments + python-dateutil + pytz + rich + six + unidecode ]; checkInputs = [ - nose + pytest-xdist + pytestCheckHook pandoc ]; - postPatch= '' + postPatch = '' substituteInPlace pelican/tests/test_pelican.py \ --replace "'git'" "'${git}/bin/git'" ''; - LC_ALL="en_US.UTF-8"; + pytestFlagsArray = [ + # DeprecationWarning: 'jinja2.Markup' is deprecated and... + "-W ignore::DeprecationWarning" + ]; + + disabledTests = [ + # AssertionError + "test_basic_generation_works" + "test_custom_generation_works" + "test_custom_locale_generation_works" + ]; + + LC_ALL = "en_US.UTF-8"; # We only want to patch shebangs in /bin, and not those # of the project scripts that are created by Pelican. @@ -69,8 +104,10 @@ buildPythonPackage rec { patchShebangs $out/bin ''; + pythonImportsCheck = [ "pelican" ]; + meta = with lib; { - description = "A tool to generate a static blog from reStructuredText or Markdown input files"; + description = "Static site generator that requires no database or server-side logic"; homepage = "http://getpelican.com/"; license = licenses.agpl3; maintainers = with maintainers; [ offline prikhi ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/perfplot/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/perfplot/default.nix index 8e15cc0be8..af653ed0c8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/perfplot/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/perfplot/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "perfplot"; - version = "0.9.6"; + version = "0.9.8"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "nschloe"; repo = pname; - rev = "v${version}"; - sha256 = "11f31d6xqxp04693symc2dl8890gjaycrb2a35y5xy023abwir5b"; + rev = version; + sha256 = "17dpgd27ik7ka7xpk3mj3anbjj62lwygy1vxlmrmk8xbhrqkim8d"; }; format = "pyproject"; 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 ea10276ae4..5145bec925 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pex/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pex/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "pex"; - version = "2.1.45"; + version = "2.1.46"; src = fetchPypi { inherit pname version; - sha256 = "e5b0de7b23e1f578f93559a08a01630481b0af3dc9fb3e130b14b99baa83491b"; + sha256 = "28958292ab6a149ef7dd7998939a6e899b2f1ba811407ea1edac9d2d84417dfd"; }; nativeBuildInputs = [ setuptools ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/phonenumbers/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/phonenumbers/default.nix index 6d6a624b14..c04ccbd528 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/phonenumbers/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/phonenumbers/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "phonenumbers"; - version = "8.12.30"; + version = "8.12.31"; src = fetchPypi { inherit pname version; - sha256 = "9ca65c36f437881a8f7dac979a5733ae8fb5a0a436aecd47bd2c06494bdf0a20"; + sha256 = "sha256-CR7SsxWFZ/EsmfcZVwocys4AF585tE8ea4lfWdk9rcg="; }; checkInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/phonopy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/phonopy/default.nix index af728d414c..86bece5254 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/phonopy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/phonopy/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "phonopy"; - version = "2.10.0"; + version = "2.11.0"; src = fetchPypi { inherit pname version; - sha256 = "58485042ab7d88fc8b83744d18b2aefd677adb071c8a717ac3710458192743d7"; + sha256 = "2ab47d3eb53a5265f3567974d29760b510b3312217358b76efc27ade9bd1a9f0"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/premailer/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/premailer/default.nix index 8523a47b71..21214b5fe7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/premailer/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/premailer/default.nix @@ -4,12 +4,12 @@ buildPythonPackage rec { pname = "premailer"; - version = "3.9.0"; + version = "3.10.0"; disabled = isPy27; # no longer compatible with urllib src = fetchPypi { inherit pname version; - sha256 = "da18b9e8cb908893b67ab9b7451276fef7c0ab179f40189378545f6bb0ab3695"; + sha256 = "d1875a8411f5dc92b53ef9f193db6c0f879dc378d618e0ad292723e388bfe4c2"; }; buildInputs = [ mock nose ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/progress/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/progress/default.nix index fcc1a7a922..801beaa447 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/progress/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/progress/default.nix @@ -5,12 +5,12 @@ }: buildPythonPackage rec { - version = "1.5"; + version = "1.6"; pname = "progress"; src = fetchPypi { inherit pname version; - sha256 = "0wj3wvdgfmqj44n32wag3mzpp5fjqkkd321x67v1prxvs78yvv39"; + sha256 = "c9c86e98b5c03fa1fe11e3b67c1feda4788b8d0fe7336c2ff7d5644ccfba34cd"; }; checkPhase = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/prometheus-client/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/prometheus-client/default.nix new file mode 100644 index 0000000000..9a01769695 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/prometheus-client/default.nix @@ -0,0 +1,29 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "prometheus-client"; + version = "0.11.0"; + + src = fetchFromGitHub { + owner = "prometheus"; + repo = "client_python"; + rev = "v${version}"; + sha256 = "14swmy4dgpk6cyjsm2advgc2c8api7xaca1sl7swznblh5fyzgzg"; + }; + + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ "prometheus_client" ]; + + meta = with lib; { + description = "Prometheus instrumentation library for Python applications"; + homepage = "https://github.com/prometheus/client_python"; + license = licenses.asl20; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/prometheus-flask-exporter/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/prometheus-flask-exporter/default.nix index dc35aea6cd..7abb9670ac 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/prometheus-flask-exporter/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/prometheus-flask-exporter/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , fetchFromGitHub , flask -, prometheus_client +, prometheus-client , pytestCheckHook }: @@ -17,7 +17,7 @@ buildPythonPackage rec { sha256 = "1dwisp681w0f6zf0000rxd3ksdb48zb9mr38qfdqk2ir24y8w370"; }; - propagatedBuildInputs = [ flask prometheus_client ]; + propagatedBuildInputs = [ flask prometheus-client ]; checkInputs = [ pytestCheckHook ]; pytestFlagsArray = [ "tests/" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/prometheus_client/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/prometheus_client/default.nix deleted file mode 100644 index 7ce36e588d..0000000000 --- a/third_party/nixpkgs/pkgs/development/python-modules/prometheus_client/default.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ lib, buildPythonPackage, fetchPypi }: - -buildPythonPackage rec { - pname = "prometheus_client"; - version = "0.11.0"; - - src = fetchPypi { - inherit pname version; - sha256 = "3a8baade6cb80bcfe43297e33e7623f3118d660d41387593758e2fb1ea173a86"; - }; - - doCheck = false; - - meta = with lib; { - description = "Prometheus instrumentation library for Python applications"; - homepage = "https://github.com/prometheus/client_python"; - license = licenses.asl20; - }; -} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/py-air-control-exporter/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/py-air-control-exporter/default.nix index 1a8a52fd24..d67ddba02b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/py-air-control-exporter/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/py-air-control-exporter/default.nix @@ -5,7 +5,7 @@ , flask , isPy27 , nixosTests -, prometheus_client +, prometheus-client , py-air-control , pytestCheckHook , setuptools-scm @@ -28,7 +28,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ click flask - prometheus_client + prometheus-client py-air-control ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyTelegramBotAPI/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyTelegramBotAPI/default.nix index 1e07b2c01f..58d1d0c694 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyTelegramBotAPI/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyTelegramBotAPI/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "pyTelegramBotAPI"; - version = "3.8.2"; + version = "3.8.3"; src = fetchPypi { inherit pname version; - sha256 = "cf83c652b88b4b1535a306a9b0c2f34bf6c390cebb9553ef34369e6290fc9496"; + sha256 = "afdd887fff42a963f13d09a1f4f5fd24aef08f4b8a594f2ac11e0a29022f1518"; }; propagatedBuildInputs = [ requests ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyacoustid/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyacoustid/default.nix index 5bebb1d5bc..752c276415 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyacoustid/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyacoustid/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "pyacoustid"; - version = "1.2.0"; + version = "1.2.1"; src = fetchPypi { inherit pname version; - sha256 = "0c3dsnfyldnsmyzczp5s5aqvbzcn360s0h4l3gm3k53lg57f762z"; + sha256 = "e62b2929fbc5ead508758d2f700f5d355f7d83d14f5efe33c1d4fc59cbdeba84"; }; propagatedBuildInputs = [ requests audioread ]; @@ -23,10 +23,15 @@ buildPythonPackage rec { acoustid.py ''; + # package has no tests + doCheck = false; + + pythonImportsCheck = [ "acoustid" ]; + meta = with lib; { description = "Bindings for Chromaprint acoustic fingerprinting"; homepage = "https://github.com/sampsyo/pyacoustid"; license = licenses.mit; + maintainers = with maintainers; [ ]; }; - } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyaml/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyaml/default.nix index 524d34c68d..8642c9affb 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyaml/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyaml/default.nix @@ -7,20 +7,27 @@ buildPythonPackage rec { pname = "pyaml"; - version = "20.4.0"; + version = "21.8.3"; src = fetchPypi { inherit pname version; - sha256 = "29a5c2a68660a799103d6949167bd6c7953d031449d08802386372de1db6ad71"; + sha256 = "sha256-oWNtY8R2MooHIT0LcRG7Y1cPGrij7d9gUiYwJQwj2XU="; }; - propagatedBuildInputs = [ pyyaml ]; + propagatedBuildInputs = [ + pyyaml + ]; - checkInputs = [ unidecode ]; + checkInputs = [ + unidecode + ]; - meta = { + pythonImportsCheck = [ "pyaml" ]; + + meta = with lib; { description = "PyYAML-based module to produce pretty and readable YAML-serialized data"; homepage = "https://github.com/mk-fg/pretty-yaml"; - license = lib.licenses.wtfpl; + license = licenses.wtfpl; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pybtex-docutils/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pybtex-docutils/default.nix index 2dbd4e8cff..a4abd26a04 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pybtex-docutils/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pybtex-docutils/default.nix @@ -1,7 +1,7 @@ { lib, buildPythonPackage, fetchPypi, docutils, pybtex, six }: buildPythonPackage rec { - version = "1.0.0"; + version = "1.0.1"; pname = "pybtex-docutils"; doCheck = false; @@ -9,7 +9,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "cead6554b4af99c287dd29f38b1fa152c9542f56a51cb6cbc3997c95b2725b2e"; + sha256 = "d53aa0c31dc94d61fd30ea3f06c749e6f510f9ff0e78cb2765a9300f173d8626"; }; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pycuda/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pycuda/default.nix index 5bf9114d69..cdd07e8611 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pycuda/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pycuda/default.nix @@ -22,11 +22,11 @@ let in buildPythonPackage rec { pname = "pycuda"; - version = "2020.1"; + version = "2021.1"; src = fetchPypi { inherit pname version; - sha256 = "effa3b99b55af67f3afba9b0d1b64b4a0add4dd6a33bdd6786df1aa4cc8761a5"; + sha256 = "ab87312d0fc349d9c17294a087bb9615cffcf966ad7b115f5b051008a48dd6ed"; }; preConfigure = with lib.versions; '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyee/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyee/default.nix index f4afd49bbc..a252cd4505 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyee/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyee/default.nix @@ -1,28 +1,24 @@ -{ buildPythonPackage +{ lib +, buildPythonPackage , fetchPypi -, lib , vcversioner -, pytest-runner , mock -, pytest +, pytestCheckHook , pytest-asyncio , pytest-trio , twisted -, zipp ? null -, pyparsing ? null -, pyhamcrest -, futures ? null -, attrs ? null -, isPy27 +, pythonOlder }: buildPythonPackage rec { pname = "pyee"; - version = "8.1.0"; + version = "8.2.2"; + + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "92dacc5bd2bdb8f95aa8dd2585d47ca1c4840e2adb95ccf90034d64f725bfd31"; + sha256 = "sha256-XH5g+N+VcQ2+F1UOFs4BU/g5kMAO90SEG0Pzce1T6+o="; }; buildInputs = [ @@ -31,23 +27,18 @@ buildPythonPackage rec { checkInputs = [ mock - pyhamcrest - pytest pytest-asyncio pytest-trio - pytest-runner + pytestCheckHook twisted - ] ++ lib.optional isPy27 [ - attrs - futures - pyparsing - zipp ]; - meta = { - description = "A port of Node.js's EventEmitter to python"; + pythonImportsCheck = [ "pyee" ]; + + meta = with lib; { + description = "A port of Node.js's EventEmitter to Python"; homepage = "https://github.com/jfhbrook/pyee"; - license = lib.licenses.mit; - maintainers = with lib.maintainers; [ kmein ]; + license = licenses.mit; + maintainers = with maintainers; [ kmein ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyflume/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyflume/default.nix index 075297794b..ff4e7189c5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyflume/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyflume/default.nix @@ -22,13 +22,6 @@ buildPythonPackage rec { sha256 = "129sz33a270v120bzl9l98nmvdzn7ns4cf9w2v18lmzlldbyz2vn"; }; - prePatch = '' - substituteInPlace setup.py --replace 'pyjwt==2.0.1' 'pyjwt>=2.0.1' - substituteInPlace setup.py --replace 'ratelimit==2.2.1' 'ratelimit>=2.2.1' - substituteInPlace setup.py --replace 'pytz==2019.2' 'pytz>=2019.2' - substituteInPlace setup.py --replace 'requests==2.24.0' 'requests>=2.24.0' - ''; - propagatedBuildInputs = [ pyjwt ratelimit @@ -41,15 +34,6 @@ buildPythonPackage rec { pytestCheckHook ]; - postPatch = '' - # https://github.com/ChrisMandich/PyFlume/issues/18 - substituteInPlace setup.py \ - --replace "pyjwt==2.0.1" "pyjwt>=2.0.1" \ - --replace "ratelimit==2.2.1" "ratelimit>=2.2.1" \ - --replace "pytz==2019.2" "pytz>=2019.2" \ - --replace "requests==2.24.0" "requests>=2.24.0" - ''; - pythonImportsCheck = [ "pyflume" ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pymatgen/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pymatgen/default.nix index d75af9158c..364514b6b5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pymatgen/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pymatgen/default.nix @@ -21,11 +21,11 @@ buildPythonPackage rec { pname = "pymatgen"; - version = "2022.0.8"; + version = "2022.0.11"; src = fetchPypi { inherit pname version; - sha256 = "4f12ac87657e8efe833087c575ec4430900dfcece890bb0486e07f034a2b34a0"; + sha256 = "901d00105142c9added48275188e289e91b3098251ec107aef90acaef3ea6d0d"; }; nativeBuildInputs = [ glibcLocales ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pymbolic/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pymbolic/default.nix index 23c88ca28d..4faf04d289 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pymbolic/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pymbolic/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "pymbolic"; - version = "2020.1"; + version = "2021.1"; src = fetchPypi { inherit pname version; - sha256 = "ca029399f9480f6d51fbac0349fddbb42d937620deb03befa0ba94ac08895e6b"; + sha256 = "67d08ef95568408901e59f79591ba41fd3f2caaecb42b7497c38fc82fd60358c"; }; postConfigure = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pymemcache/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pymemcache/default.nix index ab01259a77..f30b6ea06b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pymemcache/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pymemcache/default.nix @@ -8,13 +8,13 @@ buildPythonPackage rec { pname = "pymemcache"; - version = "3.4.4"; + version = "3.5.0"; src = fetchFromGitHub { owner = "pinterest"; repo = pname; rev = "v${version}"; - sha256 = "1ajlhirxhd4pbzgd84k44znjazjbnbdfm3sk64avs0vgcgclq2n7"; + sha256 = "sha256-O2qmcLWCUSc1f32irelIZOOuOziOUQXFGcuQJBXPvvM="; }; checkInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pymunk/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pymunk/default.nix index 216e248867..4d8dbee2c2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pymunk/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pymunk/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "pymunk"; - version = "6.1.0"; + version = "6.2.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "1k1ncrssywvfrbmai7d20h2mg4lzhq16rhw3dkg4ad5nhik3k0sl"; + sha256 = "1r3jfjg4cpdilrmlyml514hqmjgabyrrs4cvmdr56rylg1sp4gf3"; }; propagatedBuildInputs = [ cffi ]; @@ -38,6 +38,6 @@ buildPythonPackage rec { homepage = "https://www.pymunk.org"; license = with licenses; [ mit ]; maintainers = with maintainers; [ angustrau ]; - platforms = platforms.linux ++ [ "x86_64-darwin" ]; + platforms = platforms.unix; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pymupdf/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pymupdf/default.nix index e749c467ab..0b147c971b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pymupdf/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pymupdf/default.nix @@ -13,21 +13,14 @@ buildPythonPackage rec { pname = "pymupdf"; - version = "1.18.16"; + version = "1.18.17"; src = fetchPypi { pname = "PyMuPDF"; inherit version; - sha256 = "b21e39098fbbe0fdf269fdb2d1dd25a3847bbf22785ee8903d3a5637c2d0b9d7"; + sha256 = "fa39ee5e91eae77818e07b6bb7e0cb0b402ad88e39a74b08626ce1c2150c5414"; }; - patchFlags = [ "--binary" "--ignore-whitespace" ]; - patches = [ - # Add NIX environment support. - # Should be removed next pyMuPDF release. - ./nix-support.patch - ]; - postPatch = '' substituteInPlace setup.py \ --replace '/usr/include/mupdf' ${mupdf.dev}/include/mupdf diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pymupdf/nix-support.patch b/third_party/nixpkgs/pkgs/development/python-modules/pymupdf/nix-support.patch deleted file mode 100644 index e0a14337a8..0000000000 --- a/third_party/nixpkgs/pkgs/development/python-modules/pymupdf/nix-support.patch +++ /dev/null @@ -1,17 +0,0 @@ ---- a/setup.py -+++ b/setup.py -@@ -36,10 +36,14 @@ LIBRARIES = { - "opensuse": OPENSUSE, - "fedora": FEDORA, - "alpine": ALPINE, -+ "nix": FEDORA, - } - - - def load_libraries(): -+ if os.getenv("NIX_STORE"): -+ return LIBRARIES["nix"] -+ - try: - import distro - 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 08ee6db35e..59457d6fcc 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyodbc/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyodbc/default.nix @@ -2,18 +2,20 @@ buildPythonPackage rec { pname = "pyodbc"; - version = "4.0.31"; - disabled = isPyPy; # use pypypdbc instead + version = "4.0.32"; + disabled = isPyPy; # use pypypdbc instead src = fetchPypi { inherit pname version; - sha256 = "89256e79d23415887cacf0a821f9f94baa5d833080521d456687d5e88c40c226"; + sha256 = "9be5f0c3590655e1968488410fe3528bb8023d527e7ccec1f663d64245071a6b"; }; buildInputs = [ unixODBC ]; doCheck = false; # tests require a database server + pythonImportsCheck = [ "pyodbc" ]; + meta = with lib; { description = "Python ODBC module to connect to almost any database"; homepage = "https://github.com/mkleehammer/pyodbc"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyrad/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyrad/default.nix index 31cbf77d94..67841cab7d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyrad/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyrad/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "pyrad"; - version = "2.3"; + version = "2.4"; src = fetchFromGitHub { owner = "pyradius"; repo = pname; rev = version; - sha256 = "0hy7999av47s8100afbhxfjb8phbmrqcv530xlvskndby4a8w94k"; + sha256 = "sha256-oqgkE0xG/8cmLeRZdGoHkaHbjtByeJwzBJwEdxH8oNY="; }; propagatedBuildInputs = [ netaddr six ]; @@ -18,10 +18,12 @@ buildPythonPackage rec { nosetests -e testBind ''; + pythonImportsCheck = [ "pyrad" ]; + meta = with lib; { description = "Python RADIUS Implementation"; homepage = "https://bitbucket.org/zzzeek/sqlsoup"; - license = licenses.mit; + license = licenses.bsd3; maintainers = [ maintainers.globin ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pysmappee/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pysmappee/default.nix index c053e55922..028d591ac9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pysmappee/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pysmappee/default.nix @@ -6,19 +6,20 @@ , pytz , requests , requests_oauthlib +, schedule , pythonOlder }: buildPythonPackage rec { pname = "pysmappee"; - version = "0.2.25"; + version = "0.2.27"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "smappee"; repo = pname; rev = version; - sha256 = "0ld3pb86dq61fcvr6zigdz1vjjcwf7izzkajyg82nmb508a570d7"; + sha256 = "sha256-CzdkeC53ye+IMeGUiD1mK84h2ruC1/ZpjlDjuWMVoyQ="; }; propagatedBuildInputs = [ @@ -27,10 +28,12 @@ buildPythonPackage rec { pytz requests requests_oauthlib + schedule ]; # Project has no tests doCheck = false; + pythonImportsCheck = [ "pysmappee" ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pysyncthru/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pysyncthru/default.nix index 373cb7c6f2..67194d51cb 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pysyncthru/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pysyncthru/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "pysyncthru"; - version = "0.7.7"; + version = "0.7.8"; disabled = isPy27; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "nielstron"; repo = "pysyncthru"; rev = "release-${version}"; - sha256 = "1449lbg9dx13p03v6fl2ap0xk5i5wrmy6amx1pl0rgz712p5jmq7"; + sha256 = "17k9dhnya4304gqmkyvvf94jvikmnkf2lqairl3rfrl7w68jm3vp"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-qt/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-qt/default.nix index 4add58efbc..23942b5223 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-qt/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-qt/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "pytest-qt"; - version = "3.3.0"; + version = "4.0.2"; src = fetchPypi { inherit pname version; - sha256 = "714b0bf86c5313413f2d300ac613515db3a1aef595051ab8ba2ffe619dbe8925"; + sha256 = "dfc5240dec7eb43b76bcb5f9a87eecae6ef83592af49f3af5f1d5d093acaa93e"; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-engineio/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-engineio/default.nix index 486484bca3..1b35f64bd7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-engineio/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-engineio/default.nix @@ -16,13 +16,13 @@ buildPythonPackage rec { pname = "python-engineio"; - version = "4.0.0"; + version = "4.2.0"; src = fetchFromGitHub { owner = "miguelgrinberg"; repo = "python-engineio"; rev = "v${version}"; - sha256 = "00x9pmmnl1yd59wd96ivkiqh4n5nphl8cwk43hf4nqr0icgsyhar"; + sha256 = "sha256-QfX8Volz5nabGVhQLXfSD/QooxLsU6DvCq1WRkRZ6hU="; }; checkInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-json-logger/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-json-logger/default.nix index cb36bf50e1..0276843119 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-json-logger/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-json-logger/default.nix @@ -6,13 +6,13 @@ }: buildPythonPackage rec { - version = "2.0.1"; + version = "2.0.2"; pname = "python-json-logger"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "f26eea7898db40609563bed0a7ca11af12e2a79858632706d835a0f961b7d398"; + sha256 = "202a4f29901a4b8002a6d1b958407eeb2dd1d83c18b18b816f5b64476dde9096"; }; checkInputs = [ nose ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-socketio/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-socketio/default.nix index 8eb58b244e..2b5c9c84a8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-socketio/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-socketio/default.nix @@ -9,13 +9,13 @@ buildPythonPackage rec { pname = "python-socketio"; - version = "5.0.4"; + version = "5.3.0"; src = fetchFromGitHub { owner = "miguelgrinberg"; repo = "python-socketio"; rev = "v${version}"; - sha256 = "0mpqr53mrdzk9ki24y1inpsfvjlvm7pvxf8q4d52m80i5pcd5v5q"; + sha256 = "sha256-jyTTWxShLDDnbT+MYIJIjwpn3xfIB04je78doIOG+FQ="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytools/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytools/default.nix index 79fff88757..af485ce579 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytools/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytools/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "pytools"; - version = "2021.2.7"; + version = "2021.2.8"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "0538f6fe7f00bf765ca5ab38518db48df72de818460006e54b0575accd24d9fb"; + sha256 = "e11adc4914d805ac2bd02656fc6c0ec57c29dd305bd4a44122ca4e651a4bba8b"; }; checkInputs = [ pytest ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyvex/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyvex/default.nix index fee0653d5e..2b8bdb1715 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyvex/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyvex/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "pyvex"; - version = "9.0.9506"; + version = "9.0.9572"; src = fetchPypi { inherit pname version; - sha256 = "sha256-DseMX41dXmmt44SPVHSIFRIJL1u9yZ3kq8pv8TzC/OQ="; + sha256 = "sha256-ish37nO+r1VJY9XS83K8tu60Snhd547n965TFqdBgzs="; }; postPatch = lib.optionalString stdenv.isDarwin '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyviz-comms/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyviz-comms/default.nix index e9e07de4df..71b9b064aa 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyviz-comms/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyviz-comms/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "pyviz_comms"; - version = "0.7.6"; + version = "2.1.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-zZZJqeqd/LmzTXj5pk4YcKqLa5TeVG4smca7U9ZKtdE="; + sha256 = "f4a7126f318fb6b964fef3f92fa55bc46b9218f62a8464a8b18e968b3087dbc0"; }; propagatedBuildInputs = [ param ]; @@ -19,6 +19,8 @@ buildPythonPackage rec { # there are not tests with the package doCheck = false; + pythonImportsCheck = [ "pyviz_comms" ]; + passthru.tests = { inherit panel; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/qtawesome/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/qtawesome/default.nix index af9e724a9e..0a024faf91 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/qtawesome/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/qtawesome/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "QtAwesome"; - version = "1.0.2"; + version = "1.0.3"; src = fetchPypi { inherit pname version; - sha256 = "771dd95ac4f50d647d18b4e892fd310a580b56d258476554c7b3498593dfd887"; + sha256 = "d37bbeb69ddc591e5ff036b741bda8d1d92133811f1f5a7150021506f70b8e6e"; }; propagatedBuildInputs = [ qtpy six ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/qtconsole/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/qtconsole/default.nix index a5173a0a25..5e63001013 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/qtconsole/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/qtconsole/default.nix @@ -15,11 +15,11 @@ buildPythonPackage rec { pname = "qtconsole"; - version = "5.1.0"; + version = "5.1.1"; src = fetchPypi { inherit pname version; - sha256 = "12c734494901658787339dea9bbd82f3dc0d5e394071377a1c77b4a0954d7d8b"; + sha256 = "bbc34bca14f65535afcb401bc74b752bac955e5313001ba640383f7e5857dc49"; }; checkInputs = [ nose ] ++ lib.optionals isPy27 [mock]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/rapidfuzz/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/rapidfuzz/default.nix index 8743e5014e..6b78252de6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/rapidfuzz/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/rapidfuzz/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "rapidfuzz"; - version = "1.4.1"; + version = "1.5.0"; disabled = pythonOlder "3.5"; @@ -18,7 +18,7 @@ buildPythonPackage rec { repo = "RapidFuzz"; rev = "v${version}"; fetchSubmodules = true; - sha256 = "sha256-uZdD25ATJgRrDAHYSQNp7NvEmW7p3LD9vNmxAbf5Mwk="; + sha256 = "sha256-Omo9ActReimYDK9dARG0s32Qq61neDELRechbnwRfwU="; }; checkInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ring-doorbell/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ring-doorbell/default.nix index f70e4921b9..041a959ca5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ring-doorbell/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ring-doorbell/default.nix @@ -12,13 +12,13 @@ buildPythonPackage rec { pname = "ring-doorbell"; - version = "0.7.0"; + version = "0.7.1"; disabled = !isPy3k; src = fetchPypi { pname = "ring_doorbell"; inherit version; - sha256 = "1qnx9q9rzxhh0pygl3f9bg21b5zv7csv9h1w4zngdvsphbs0yiwg"; + sha256 = "sha256-xE3TqXdhiUf9Tzmzc48D65Y5t1ekauacsTwwSG1urz4="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ripser/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ripser/default.nix index 7bc7df0b8f..6c510f577e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ripser/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ripser/default.nix @@ -12,12 +12,12 @@ buildPythonPackage rec { pname = "ripser"; - version = "0.6.0"; + version = "0.6.1"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "5c47deffbf9e163186b0997f2d59486d96a7c65766e76500f754fadfbc89f5d9"; + sha256 = "335112a0f94532ccbe686db7826ee8d0714b32f65891abf92c0a02f3cb0fc5fd"; }; checkInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/rq/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/rq/default.nix index e11a48f6a3..abed10521d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/rq/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/rq/default.nix @@ -2,19 +2,21 @@ buildPythonPackage rec { pname = "rq"; - version = "1.8.1"; + version = "1.9.0"; disabled = isPy27; src = fetchFromGitHub { owner = "rq"; repo = "rq"; rev = "v${version}"; - sha256 = "1lfv3sb27v5xw3y67lirp877gg9230d28qmykxipvhcqwzqc2dqb"; + sha256 = "1drw7yqgsk1z9alv4hwj44a3sggmr20msdzdcdaxzdcqgb3qdpk8"; }; # test require a running redis rerver, which is something we can't do yet doCheck = false; + pythonImportsCheck = [ "rq" ]; + propagatedBuildInputs = [ click redis ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/scikit-build/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/scikit-build/default.nix index 42f10aedf3..749e07ef84 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/scikit-build/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/scikit-build/default.nix @@ -26,11 +26,11 @@ buildPythonPackage rec { pname = "scikit-build"; - version = "0.11.1"; + version = "0.12.0"; src = fetchPypi { inherit pname version; - sha256 = "0p4smkl2rbpl00m5va5qa8hp2hqb3284p2cs6k8zlmi4kgbdyh6s"; + sha256 = "f851382c469bcd9a8c98b1878bcfdd13b68556279d2fd9a329be41956ae5a7fe"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/scikit-fmm/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/scikit-fmm/default.nix index 08101bd2d0..742c404a84 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/scikit-fmm/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/scikit-fmm/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "scikit-fmm"; - version = "2021.2.2"; + version = "2021.7.8"; src = fetchPypi { inherit pname version; - sha256 = "809e20016e6341e4de29b6be4befc477b7002cfd5e2a11b80deae16005f35670"; + sha256 = "f931a2600e7f0824ac51ebde86ee40295146cc1ad5f88fdc208b0a12fcb2ddb3"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/seaborn/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/seaborn/default.nix index 8c771ea286..a57acebb4a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/seaborn/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/seaborn/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "seaborn"; - version = "0.11.1"; + version = "0.11.2"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "44e78eaed937c5a87fc7a892c329a7cc091060b67ebd1d0d306b446a74ba01ad"; + sha256 = "cf45e9286d40826864be0e3c066f98536982baf701a7caa386511792d61ff4f6"; }; checkInputs = [ nose ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sendgrid/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sendgrid/default.nix index f4c913b163..5aabcc2d0f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sendgrid/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sendgrid/default.nix @@ -11,13 +11,13 @@ buildPythonPackage rec { pname = "sendgrid"; - version = "6.8.0"; + version = "6.8.1"; src = fetchFromGitHub { owner = pname; repo = "sendgrid-python"; rev = version; - sha256 = "sha256-PtTsFwE6+6/HzyR721Y9+qaI7gwYtYwuY+wrZpoGY2Q="; + sha256 = "sha256-rK/GouOv5RMDsn5NrCEtIz5a9wO6YATlhsRuhFuHaXY="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/slack-sdk/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/slack-sdk/default.nix index f121ac9aeb..6183ee7b0c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/slack-sdk/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/slack-sdk/default.nix @@ -20,14 +20,14 @@ buildPythonPackage rec { pname = "slack-sdk"; - version = "3.9.1"; + version = "3.10.0"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "slackapi"; repo = "python-slack-sdk"; rev = "v${version}"; - sha256 = "sha256-IskBFccMDG03BFkERRfL7TH1Ppq8Xr9qTxCEoUEqxtk="; + sha256 = "sha256-FOpUO9bXrEOgYGmRmAhHnovzBafu6D2ZSLcgw0+0uzs="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/smbprotocol/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/smbprotocol/default.nix index b182667cfc..93f158508e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/smbprotocol/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/smbprotocol/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "smbprotocol"; - version = "1.6.1"; + version = "1.6.2"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "jborean93"; repo = pname; rev = "v${version}"; - sha256 = "0pyjnmrkiqcd0r1s6zl8w91zy0605k7cyy5n4cvv52079gy0axhd"; + sha256 = "sha256-nSWZfhZD++I5hM2ijqft2U95kyEe3h/nrSfiT3sQiKE="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/snowflake-connector-python/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/snowflake-connector-python/default.nix index 0007b4380b..0b0c961e7d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/snowflake-connector-python/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/snowflake-connector-python/default.nix @@ -10,7 +10,6 @@ , future , idna , ijson -, isPy3k , oscrypto , pyarrow , pyasn1-modules @@ -25,12 +24,12 @@ buildPythonPackage rec { pname = "snowflake-connector-python"; - version = "2.4.5"; + version = "2.5.1"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "f5bd11228e192b4754587869ebd85752327ecb945fcc19c2ed1f66958443ad08"; + sha256 = "8af2a51ac890d9e0ffe0cd509ba83198076e2564fb8fdc63c6814b773e70b33a"; }; propagatedBuildInputs = [ @@ -54,14 +53,6 @@ buildPythonPackage rec { urllib3 ]; - postPatch = '' - # https://github.com/snowflakedb/snowflake-connector-python/issues/705 - substituteInPlace setup.py \ - --replace "idna>=2.5,<3" "idna" \ - --replace "certifi<2021.0.0" "certifi" \ - --replace "chardet>=3.0.2,<4" "chardet" - ''; - # Tests require encrypted secrets, see # https://github.com/snowflakedb/snowflake-connector-python/tree/master/.github/workflows/parameters doCheck = false; @@ -75,5 +66,6 @@ buildPythonPackage rec { description = "Snowflake Connector for Python"; homepage = "https://www.snowflake.com/"; license = licenses.asl20; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/snowflake-sqlalchemy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/snowflake-sqlalchemy/default.nix index 9ec17443dd..fd3385e858 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/snowflake-sqlalchemy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/snowflake-sqlalchemy/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "snowflake-sqlalchemy"; - version = "1.2.4"; + version = "1.3.1"; src = fetchPypi { inherit pname version; - sha256 = "e79d83d4947a0945488699324802eda4ad4a63c7680ad5b2a42c71f4faa2cd8b"; + sha256 = "f7c220db11c1abf3df67177fbcf0ea58d33d8531963f2d5df5f09fdac09b912f"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/somajo/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/somajo/default.nix index e993636903..6027df2be5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/somajo/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/somajo/default.nix @@ -2,14 +2,14 @@ buildPythonPackage rec { pname = "SoMaJo"; - version = "2.1.4"; + version = "2.1.5"; disabled = !isPy3k; src = fetchFromGitHub { owner = "tsproisl"; repo = pname; rev = "v${version}"; - sha256 = "0clcndij4nd5ig7padvb9dj5hfxg6nymn9sf42bjr9ipjihcsbdq"; + sha256 = "17v1vmbjwpxwql25vlbm7xsair7945ljmyaricxx8fd6fxvgn9rr"; }; propagatedBuildInputs = [ regex ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sopel/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sopel/default.nix index 54fc243be2..d4052d8b12 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sopel/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sopel/default.nix @@ -13,12 +13,12 @@ buildPythonPackage rec { pname = "sopel"; - version = "7.1.2"; + version = "7.1.3"; disabled = isPyPy; src = fetchPypi { inherit pname version; - sha256 = "sha256-8RhIw3Qt0BclH1Ws16JNuFfwiRxJ14lM6MBUK9OvNKA="; + sha256 = "0f9e673a7eac9dd3619c2e398e58fa2d8117afca5adb550ba07c66e16a90dbdb"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sounddevice/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sounddevice/default.nix index 7787e8b16b..3cb0e4b663 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sounddevice/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sounddevice/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "sounddevice"; - version = "0.4.1"; + version = "0.4.2"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "f21978921186c0c7183af032fab77b735d824f3e926d76adb3fd0912e289ce0b"; + sha256 = "1c9b07cff59c837d258002ed806ee134ed367ef11042bd7d283d6ce407bf889c"; }; propagatedBuildInputs = [ cffi numpy portaudio ]; @@ -23,6 +23,8 @@ buildPythonPackage rec { # No tests included nor upstream available. doCheck = false; + pythonImportsCheck = [ "sounddevice" ]; + patches = [ (substituteAll { src = ./fix-portaudio-library-path.patch; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/stravalib/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/stravalib/default.nix index 1615f57d5e..a06a375be0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/stravalib/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/stravalib/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "stravalib"; - version = "0.10.2"; + version = "0.10.4"; src = fetchPypi { inherit pname version; - sha256 = "76db248b24cbd6c51cf93b475d8a8df04ec4b6c6287dca244e47f37a433276d7"; + sha256 = "451817c68a11e0c77db9cb628e3c4df0f4806c5a481536598ab3baa1d1c21215"; }; checkInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/strictyaml/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/strictyaml/default.nix index 30028a9599..cbd0893411 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/strictyaml/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/strictyaml/default.nix @@ -7,13 +7,13 @@ }: buildPythonPackage rec { - version = "1.4.2"; + version = "1.4.4"; pname = "strictyaml"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "sha256-3bTk6AfdUQybx/xQ/I0Tae1pbtXMktSUtedSuoJ2paI="; + sha256 = "044ae3bec56f31e18dff8cfa62a2c9c028f4c7fe4c0f761e50761184d3b68eef"; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/stripe/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/stripe/default.nix index 7aa955e99e..e02da9a07c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/stripe/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/stripe/default.nix @@ -1,25 +1,25 @@ -{ lib, buildPythonPackage, fetchPypi, requests, pytest, pytest-cov, pytest-mock, pytest-xdist }: +{ lib, buildPythonPackage, fetchPypi, requests }: buildPythonPackage rec { pname = "stripe"; - version = "2.58.0"; - - # Tests require network connectivity and there's no easy way to disable - # them. ~ C. - doCheck = false; + version = "2.60.0"; src = fetchPypi { inherit pname version; - sha256 = "34829b528e652ffc919d40eff2ba78021149818bab76e33c07801382921cf6d5"; + sha256 = "8966b7793014380f60c6f121ba333d6f333a55818edaf79c8d70464ce0a7a808"; }; propagatedBuildInputs = [ requests ]; - checkInputs = [ pytest pytest-cov pytest-mock pytest-xdist ]; + # Tests require network connectivity and there's no easy way to disable them + doCheck = false; + + pythonImportsCheck = [ "stripe" ]; meta = with lib; { description = "Stripe Python bindings"; homepage = "https://github.com/stripe/stripe-python"; license = licenses.mit; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tenacity/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tenacity/default.nix index 4591677cdf..8de4c87b6f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/tenacity/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/tenacity/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "tenacity"; - version = "7.0.0"; + version = "8.0.1"; src = fetchPypi { inherit pname version; - sha256 = "5bd16ef5d3b985647fe28dfa6f695d343aa26479a04e8792b9d3c8f49e361ae1"; + sha256 = "43242a20e3e73291a28bcbcacfd6e000b02d3857a9a9fff56b297a27afdc932f"; }; nativeBuildInputs = [ pbr setuptools-scm ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tensorboard-data-server/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tensorboard-data-server/default.nix new file mode 100644 index 0000000000..74f53d7c67 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/tensorboard-data-server/default.nix @@ -0,0 +1,25 @@ +{ lib, buildPythonPackage, fetchPypi, pythonOlder }: + +buildPythonPackage rec { + pname = "tensorboard-data-server"; + version = "0.6.1"; + format = "wheel"; + disabled = pythonOlder "3.6"; + + src = fetchPypi { + pname = "tensorboard_data_server"; + inherit version format; + dist = "py3"; + python = "py3"; + sha256 = "sha256-gJ/piHaC01wffR9U8PQPmLsfdxsUJltFPKBR4s5Y/Kc="; + }; + + pythonImportsCheck = [ "tensorboard_data_server" ]; + + meta = with lib; { + description = "Fast data loading for TensorBoard"; + homepage = "https://github.com/tensorflow/tensorboard/tree/master/tensorboard/data/server"; + license = licenses.asl20; + maintainers = with maintainers; [ abbradar ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tensorboardx/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tensorboardx/default.nix index 6d04506cf8..603d2a1cc2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/tensorboardx/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/tensorboardx/default.nix @@ -18,13 +18,13 @@ buildPythonPackage rec { pname = "tensorboardx"; - version = "2.2"; + version = "2.4"; src = fetchFromGitHub { owner = "lanpa"; repo = "tensorboardX"; rev = "v${version}"; - sha256 = "0wjlh5fhamrrff3rm8j5ws9ncblwjgwf3nanxgr1bkn7asgynhys"; + sha256 = "1kcw062bcqvqva5kag9j7q72wk3vdqgf5cnn0lxmsvhlmq5sjdfn"; }; # apparently torch API changed a bit at 1.6 diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tensorflow-tensorboard/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tensorflow-tensorboard/default.nix index 0312542050..123c339fea 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/tensorflow-tensorboard/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/tensorflow-tensorboard/default.nix @@ -1,4 +1,7 @@ -{ lib, fetchPypi, buildPythonPackage, isPy3k +{ lib +, fetchPypi +, buildPythonPackage +, pythonOlder , numpy , wheel , werkzeug @@ -7,6 +10,8 @@ , markdown , absl-py , google-auth-oauthlib +, setuptools +, tensorboard-data-server , tensorboard-plugin-wit , tensorboard-plugin-profile }: @@ -17,27 +22,44 @@ buildPythonPackage rec { pname = "tensorflow-tensorboard"; - version = "2.4.0"; + version = "2.6.0"; format = "wheel"; - disabled = !isPy3k; + disabled = pythonOlder "3.6"; src = fetchPypi { pname = "tensorboard"; inherit version format; + dist = "py3"; python = "py3"; - sha256 = "0f17h6i398n8maam0r3rssqvdqnqbwjyf96nnhf482anm1iwdq6d"; + sha256 = "sha256-99rEzftS0UyeP3RYXOKq+OYgNiCoZOUfr4SYiwn3u9s="; }; + postPatch = '' + chmod u+rwx -R ./dist + pushd dist + wheel unpack --dest unpacked ./*.whl + pushd unpacked/tensorboard-${version} + + substituteInPlace tensorboard-${version}.dist-info/METADATA \ + --replace "google-auth (<2,>=1.6.3)" "google-auth (<3,>=1.6.3)" + + popd + wheel pack ./unpacked/tensorboard-${version} + popd + ''; + propagatedBuildInputs = [ - numpy - werkzeug - protobuf - markdown - grpcio absl-py + grpcio google-auth-oauthlib + markdown + numpy + protobuf + setuptools + tensorboard-data-server tensorboard-plugin-profile tensorboard-plugin-wit + werkzeug # not declared in install_requires, but used at runtime # https://github.com/NixOS/nixpkgs/issues/73840 wheel @@ -60,7 +82,7 @@ buildPythonPackage rec { meta = with lib; { description = "TensorFlow's Visualization Toolkit"; - homepage = "http://tensorflow.org"; + homepage = "https://www.tensorflow.org/"; license = licenses.asl20; maintainers = with maintainers; [ abbradar ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/testfixtures/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/testfixtures/default.nix index 525f23f290..c330b5e18b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/testfixtures/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/testfixtures/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "testfixtures"; - version = "6.18.0"; + version = "6.18.1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-1L0cT5DqyQpz4b3FnDHQOUPyGNaH88WgnkhHiEGor18="; + sha256 = "sha256-CmQic39tibRc3vHi31V29SrQ9QeVYALOECDaqfRCEdY="; }; checkInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/titlecase/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/titlecase/default.nix index 7a250c680e..48fbf84e93 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/titlecase/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/titlecase/default.nix @@ -1,21 +1,25 @@ -{ buildPythonPackage, lib, nose, fetchPypi, regex }: +{ buildPythonPackage, lib, fetchPypi, regex }: buildPythonPackage rec { pname = "titlecase"; - version = "2.2.0"; + version = "2.3"; src = fetchPypi { inherit pname version; - sha256 = "5d97ee51da37fb57c8753b79efa8edfdf3f10c0060de926efee970081e28d52f"; + sha256 = "9a1595ed9b88f3ce4362a7602ee63cf074e10ac80d1256b32ea1ec5ffa265fa0"; }; propagatedBuildInputs = [ regex ]; - checkInputs = [ nose ]; + # no tests run + doCheck = false; - meta = { + pythonImportsCheck = [ "titlecase" ]; + + meta = with lib; { homepage = "https://github.com/ppannuto/python-titlecase"; description = "Python Port of John Gruber's titlecase.pl"; - license = lib.licenses.mit; + license = licenses.mit; + maintainers = with maintainers; [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/tokenizers/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/tokenizers/default.nix index 544dbf1bea..7813797a2f 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/tokenizers/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/tokenizers/default.nix @@ -49,19 +49,19 @@ let }; in buildPythonPackage rec { pname = "tokenizers"; - version = "0.10.3"; + version = "unstable-2021-08-13"; src = fetchFromGitHub { owner = "huggingface"; repo = pname; - rev = "python-v${version}"; - hash = "sha256-X7aUiJJjB2ZDlE8LbK7Pn/15SLTZbP8kb4l9ED7/xvU="; + rev = "e7dd6436dd4a4ffd9e8a4f110ca68e6a38677cb6"; + sha256 = "1p7w9a43a9h6ys5nsa4g89l65dj11037p7a1lqkj4x1yc9kv2y1r"; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src sourceRoot; name = "${pname}-${version}"; - hash = "sha256-gRqxlL6q87sGC0birDhCmGF+CVbfxwOxW6Tl6+5mGoo="; + sha256 = "1yb4jsx6mp9jgd1g3mli6vr6mri2afnwqlmxq1rpvn34z6b3iw9q"; }; sourceRoot = "source/bindings/python"; @@ -97,6 +97,10 @@ in buildPythonPackage rec { ln -s ${openaiMerges} openai-gpt-merges.txt ) ''; + postPatch = '' + echo 'import multiprocessing; multiprocessing.set_start_method("fork")' >> tests/__init__.py + ''; + preCheck = '' HOME=$TMPDIR ''; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/virtualenv-clone/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/virtualenv-clone/default.nix index 4dfebc1307..0cd5d6a7fe 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/virtualenv-clone/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/virtualenv-clone/default.nix @@ -1,29 +1,42 @@ { lib , buildPythonPackage -, fetchPypi -, pytest +, fetchFromGitHub , virtualenv +, pytestCheckHook }: buildPythonPackage rec { pname = "virtualenv-clone"; - version = "0.5.4"; + version = "0.5.6"; + format = "setuptools"; - src = fetchPypi { - inherit pname version; - sha256 = "0absh96fsxk9di7ir76f5djyfm2c214wnyk53avrhjy8akflhpk6"; + src = fetchFromGitHub { + owner = "edwardgeorge"; + repo = pname; + rev = version; + sha256 = "0xb20fhl99dw5vnyb43sjpj9628nbdnwp5g7m8f2id7w8kpwzvfw"; }; - buildInputs = [ pytest ]; - propagatedBuildInputs = [ virtualenv ]; + postPatch = '' + substituteInPlace tests/__init__.py \ + --replace "'virtualenv'" "'${virtualenv}/bin/virtualenv'" - # needs tox to run the tests - doCheck = false; + substituteInPlace tests/test_virtualenv_sys.py \ + --replace "'virtualenv'" "'${virtualenv}/bin/virtualenv'" + ''; + + propagatedBuildInputs = [ + virtualenv + ]; + + checkInputs = [ + pytestCheckHook + ]; meta = with lib; { homepage = "https://github.com/edwardgeorge/virtualenv-clone"; description = "Script to clone virtualenvs"; license = licenses.mit; + maintainers = with maintainers; [ ]; }; - } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/websockify/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/websockify/default.nix index d3072e7504..e1f311ba02 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/websockify/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/websockify/default.nix @@ -5,20 +5,25 @@ }: buildPythonPackage rec { - version = "0.9.0"; + version = "0.10.0"; pname = "websockify"; src = fetchPypi { inherit pname version; - sha256 = "1nnalv0jkkj34hw6yb12lp6r6fj1ps9vkkyshjvx65y5xdwmnny3"; + sha256 = "6c4cc1bc132abb4a99834bcb1b4bd72f51d35a08d08093a817646ecc226ac44e"; }; propagatedBuildInputs = [ numpy ]; + # Ran 0 tests in 0.000s + doCheck = false; + + pythonImportsCheck = [ "websockify" ]; + meta = with lib; { description = "WebSockets support for any application/server"; homepage = "https://github.com/kanaka/websockify"; license = licenses.lgpl3; + maintainers = with maintainers; [ ]; }; - } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/west/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/west/default.nix index fff9582e0b..680e37e7a8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/west/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/west/default.nix @@ -3,14 +3,14 @@ }: buildPythonPackage rec { - version = "0.11.0"; + version = "0.11.1"; pname = "west"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "67fdc85f44be308383b331940dced0756c8c81a85f753c6b97eb0d65d973f31a"; + sha256 = "30771f3ec2a4281cd05c277a90f7dc94ded97d6dc1e1decdf4fe452dbbacc283"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/wurlitzer/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/wurlitzer/default.nix index f37d6de135..f3b8d47deb 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/wurlitzer/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/wurlitzer/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "wurlitzer"; - version = "2.1.0"; + version = "2.1.1"; src = fetchPypi { inherit pname version; - sha256 = "0144228960a992ef46e339e8aa560600bd34cd64e018bfebad88c0dd61bd8ba5"; + sha256 = "5a3ea5a13a8aac2d808864087fec87a0518bf7d9776173ab06a6bb4ade9f4d27"; }; propagatedBuildInputs = lib.optionals isPy27 [ selectors2 ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/yamllint/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/yamllint/default.nix index cd314b60a8..0204b0f929 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/yamllint/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/yamllint/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "yamllint"; - version = "1.26.2"; + version = "1.26.3"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "sha256-CwipZ1Akj98h8egZPLd4dVTvde1Xsn9iHNazvwmvEaE="; + sha256 = "3934dcde484374596d6b52d8db412929a169f6d9e52e20f9ade5bf3523d9b96e"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/zeroc-ice/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/zeroc-ice/default.nix index 2786fc979f..92d9a4a848 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/zeroc-ice/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/zeroc-ice/default.nix @@ -2,15 +2,17 @@ buildPythonPackage rec { pname = "zeroc-ice"; - version = "3.7.5"; + version = "3.7.6"; src = fetchPypi { inherit version pname; - sha256 = "3b4897cc3f2adf3d03802368cedb72a038aa33c988663a667c1c48e42ea10797"; + sha256 = "e8d8a7828e4994545bf57059bd0a0d431d387d31cc4af2eb5eeb93ef28c2d827"; }; buildInputs = [ openssl bzip2 ]; + pythonImportsCheck = [ "Ice" ]; + meta = with lib; { homepage = "https://zeroc.com/"; license = licenses.gpl2; diff --git a/third_party/nixpkgs/pkgs/development/tools/analysis/dotenv-linter/default.nix b/third_party/nixpkgs/pkgs/development/tools/analysis/dotenv-linter/default.nix index 51e43555d5..983dd2c2a9 100644 --- a/third_party/nixpkgs/pkgs/development/tools/analysis/dotenv-linter/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/analysis/dotenv-linter/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "dotenv-linter"; - version = "3.1.0"; + version = "3.1.1"; src = fetchFromGitHub { owner = "dotenv-linter"; repo = "dotenv-linter"; rev = "v${version}"; - sha256 = "sha256-hhaMI2Z97aT/8FxxtWpn+o3BSo26iyBP+ucpO3x4AbQ="; + sha256 = "sha256-kBBn8Lgb3427K00Ag35Ei9oBD7L0Zp/lr0cAKqZpULo="; }; - cargoSha256 = "sha256-F9Xyg8/qp0j0+jyd5EVe2idocubzu+Cj6yAwrHuabvM="; + cargoSha256 = "sha256-7Porqqh6lYeBCK2pAtbL9nxtORB9rqSyVdJDoy1/ZDo="; meta = with lib; { description = "Lightning-fast linter for .env files. Written in Rust"; diff --git a/third_party/nixpkgs/pkgs/development/tools/bazelisk/default.nix b/third_party/nixpkgs/pkgs/development/tools/bazelisk/default.nix index d2de1bcc06..00852a4c90 100644 --- a/third_party/nixpkgs/pkgs/development/tools/bazelisk/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/bazelisk/default.nix @@ -15,7 +15,7 @@ buildGoModule rec { doCheck = false; - buildFlagsArray = [ "-ldflags=-s -w -X main.BazeliskVersion=${version}" ]; + ldflags = [ "-s" "-w" "-X main.BazeliskVersion=${version}" ]; meta = with lib; { description = "A user-friendly launcher for Bazel"; diff --git a/third_party/nixpkgs/pkgs/development/tools/buf/default.nix b/third_party/nixpkgs/pkgs/development/tools/buf/default.nix index f3271b0563..8bc4aee935 100644 --- a/third_party/nixpkgs/pkgs/development/tools/buf/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/buf/default.nix @@ -9,15 +9,15 @@ buildGoModule rec { pname = "buf"; - version = "0.51.1"; + version = "0.52.0"; src = fetchFromGitHub { owner = "bufbuild"; repo = pname; rev = "v${version}"; - sha256 = "sha256-iFSmanP+2PgmOXtubDdLfa+AIQSAWHFNpyB1IP6IF5I="; + sha256 = "sha256-WFL+ztFR8kV6cRY1Ax2TheH+xpA58CLnW69jDpMhe3M="; }; - vendorSha256 = "sha256-0rVHINb04GZlH6DSjMt/h7UdNtZJERAyO1S99rAxUyY="; + vendorSha256 = "sha256-vbphThpEYDDm1iipcY0QXhKKuLSD87sAxiIUi7SfrAc="; patches = [ # Skip a test that requires networking to be available to work. diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/apache-maven/default.nix b/third_party/nixpkgs/pkgs/development/tools/build-managers/apache-maven/default.nix index 9e0103170e..64234b824c 100644 --- a/third_party/nixpkgs/pkgs/development/tools/build-managers/apache-maven/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/apache-maven/default.nix @@ -4,13 +4,13 @@ assert jdk != null; stdenv.mkDerivation rec { pname = "apache-maven"; - version = "3.8.1"; + version = "3.8.2"; builder = ./builder.sh; src = fetchurl { url = "mirror://apache/maven/maven-3/${version}/binaries/${pname}-${version}-bin.tar.gz"; - sha256 = "00pgmc9v2s2970wgl2ksvpqy4lxx17zhjm9fgd10fkamxc2ik2mr"; + sha256 = "sha256-ja4QsJ/re45MB5/DmhHzKWq2MP2bxE7OoPsojOx3cPc="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/bazel/buildtools/default.nix b/third_party/nixpkgs/pkgs/development/tools/build-managers/bazel/buildtools/default.nix index e181917c41..4ff5c39fac 100644 --- a/third_party/nixpkgs/pkgs/development/tools/build-managers/bazel/buildtools/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/bazel/buildtools/default.nix @@ -21,7 +21,7 @@ buildGoModule rec { excludedPackages = [ "generatetables" ]; - buildFlagsArray = [ "-ldflags=-s -w -X main.buildVersion=${version} -X main.buildScmRevision=${src.rev}" ]; + ldflags = [ "-s" "-w" "-X main.buildVersion=${version}" "-X main.buildScmRevision=${src.rev}" ]; meta = with lib; { description = "Tools for working with Google's bazel buildtool. Includes buildifier, buildozer, and unused_deps"; diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/mage/default.nix b/third_party/nixpkgs/pkgs/development/tools/build-managers/mage/default.nix index d8ccd3ad2f..cf719f2c0c 100644 --- a/third_party/nixpkgs/pkgs/development/tools/build-managers/mage/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/mage/default.nix @@ -15,8 +15,7 @@ buildGoModule rec { doCheck = false; - buildFlagsArray = [ - "-ldflags=" + ldflags = [ "-X github.com/magefile/mage/mage.commitHash=v${version}" "-X github.com/magefile/mage/mage.gitTag=v${version}" "-X github.com/magefile/mage/mage.timestamp=1970-01-01T00:00:00Z" diff --git a/third_party/nixpkgs/pkgs/development/tools/buildpack/default.nix b/third_party/nixpkgs/pkgs/development/tools/buildpack/default.nix index 0f31f7b1b3..a3e1b093e7 100644 --- a/third_party/nixpkgs/pkgs/development/tools/buildpack/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/buildpack/default.nix @@ -17,7 +17,7 @@ buildGoModule rec { subPackages = [ "cmd/pack" ]; - buildFlagsArray = [ "-ldflags=-s -w -X github.com/buildpacks/pack.Version=${version}" ]; + ldflags = [ "-s" "-w" "-X github.com/buildpacks/pack.Version=${version}" ]; postInstall = '' installShellCompletion --bash --name pack.bash $(PACK_HOME=$PWD $out/bin/pack completion --shell bash) diff --git a/third_party/nixpkgs/pkgs/development/tools/butane/default.nix b/third_party/nixpkgs/pkgs/development/tools/butane/default.nix index ccb011360e..094aa5fe02 100644 --- a/third_party/nixpkgs/pkgs/development/tools/butane/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/butane/default.nix @@ -19,9 +19,9 @@ buildGoModule rec { subPackages = [ "internal" ]; - buildFlagsArray = '' - -ldflags=-X github.com/coreos/butane/internal/version.Raw=v${version} - ''; + ldflags = [ + "-X github.com/coreos/butane/internal/version.Raw=v${version}" + ]; postInstall = '' mv $out/bin/{internal,butane} diff --git a/third_party/nixpkgs/pkgs/development/tools/cloud-nuke/default.nix b/third_party/nixpkgs/pkgs/development/tools/cloud-nuke/default.nix index 8b34f981a6..2979ae9f5d 100644 --- a/third_party/nixpkgs/pkgs/development/tools/cloud-nuke/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/cloud-nuke/default.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "cloud-nuke"; - version = "0.4.0"; + version = "0.5.0"; src = fetchFromGitHub { owner = "gruntwork-io"; repo = pname; rev = "v${version}"; - sha256 = "sha256-eua+/bfKuIG1TuoC0tA4+O0H2D+u8AbcJIFLDIbzVYg="; + sha256 = "sha256-PVVnls4i19Xc5KXM1AQTHLkxLgmJpIDBFkRW0EGXOUA="; }; - vendorSha256 = "sha256-+rr9TDRIYta0ejOE48O+nZDluvqvSTuGBpRBPZifazA="; + vendorSha256 = "sha256-C9UGpm8JBLQpSFQkvib5Bmn3J88LxUNt4ELJXL4ZQ80="; - buildFlagsArray = [ "-ldflags=-s -w -X main.VERSION=${version}" ]; + ldflags = [ "-s" "-w" "-X main.VERSION=${version}" ]; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/development/tools/conftest/default.nix b/third_party/nixpkgs/pkgs/development/tools/conftest/default.nix index 1ba8cb0a9d..74e823ad9b 100644 --- a/third_party/nixpkgs/pkgs/development/tools/conftest/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/conftest/default.nix @@ -15,8 +15,7 @@ buildGoModule rec { doCheck = false; - buildFlagsArray = [ - "-ldflags=" + ldflags = [ "-s" "-w" "-X github.com/open-policy-agent/conftest/internal/commands.version=${version}" diff --git a/third_party/nixpkgs/pkgs/development/tools/container-linux-config-transpiler/default.nix b/third_party/nixpkgs/pkgs/development/tools/container-linux-config-transpiler/default.nix index b5200e22ca..5b2a7fddeb 100644 --- a/third_party/nixpkgs/pkgs/development/tools/container-linux-config-transpiler/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/container-linux-config-transpiler/default.nix @@ -15,9 +15,9 @@ buildGoPackage rec { sha256="1w6nvgrl5qp3ci9igflk9dlk3020psv5m4f3p57f3qcx9vrcl4lw"; }; - buildFlagsArray = '' - -ldflags=-X ${goPackagePath}/internal/version.Raw=v${version} - ''; + ldflags = [ + "-X ${goPackagePath}/internal/version.Raw=v${version}" + ]; postInstall = '' mv $out/bin/{internal,ct} @@ -32,4 +32,3 @@ buildGoPackage rec { platforms = with platforms; unix; }; } - diff --git a/third_party/nixpkgs/pkgs/development/tools/continuous-integration/buildkite-cli/default.nix b/third_party/nixpkgs/pkgs/development/tools/continuous-integration/buildkite-cli/default.nix index 73aefdd0cd..4604cca7cf 100644 --- a/third_party/nixpkgs/pkgs/development/tools/continuous-integration/buildkite-cli/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/continuous-integration/buildkite-cli/default.nix @@ -17,7 +17,7 @@ buildGoModule rec { subPackages = [ "cmd/bk" ]; - buildFlagsArray = [ "-ldflags=-s -w -X main.VERSION=${version}" ]; + ldflags = [ "-s" "-w" "-X main.VERSION=${version}" ]; meta = with lib; { description = "A command line interface for Buildkite"; diff --git a/third_party/nixpkgs/pkgs/development/tools/continuous-integration/fly/default.nix b/third_party/nixpkgs/pkgs/development/tools/continuous-integration/fly/default.nix index 741bcfbe5a..0b000b0f4d 100644 --- a/third_party/nixpkgs/pkgs/development/tools/continuous-integration/fly/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/continuous-integration/fly/default.nix @@ -17,10 +17,9 @@ buildGoModule rec { subPackages = [ "fly" ]; - buildFlagsArray = '' - -ldflags= - -X github.com/concourse/concourse.Version=${version} - ''; + ldflags = [ + "-X github.com/concourse/concourse.Version=${version}" + ]; postInstall = lib.optionalString (stdenv.hostPlatform == stdenv.buildPlatform) '' mkdir -p $out/share/{bash-completion/completions,zsh/site-functions} diff --git a/third_party/nixpkgs/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix b/third_party/nixpkgs/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix index ee40f1b8cf..a507ba8650 100644 --- a/third_party/nixpkgs/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/continuous-integration/gitlab-runner/default.nix @@ -19,12 +19,11 @@ buildGoPackage rec { goPackagePath = "gitlab.com/gitlab-org/gitlab-runner"; subPackages = [ "." ]; commonPackagePath = "${goPackagePath}/common"; - buildFlagsArray = '' - -ldflags= - -X ${commonPackagePath}.NAME=gitlab-runner - -X ${commonPackagePath}.VERSION=${version} - -X ${commonPackagePath}.REVISION=v${version} - ''; + ldflags = [ + "-X ${commonPackagePath}.NAME=gitlab-runner" + "-X ${commonPackagePath}.VERSION=${version}" + "-X ${commonPackagePath}.REVISION=v${version}" + ]; src = fetchFromGitLab { owner = "gitlab-org"; diff --git a/third_party/nixpkgs/pkgs/development/tools/cue/default.nix b/third_party/nixpkgs/pkgs/development/tools/cue/default.nix index 5170297a43..f177ced309 100644 --- a/third_party/nixpkgs/pkgs/development/tools/cue/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/cue/default.nix @@ -16,8 +16,8 @@ buildGoModule rec { subPackages = [ "cmd/cue" ]; - buildFlagsArray = [ - "-ldflags=-s -w -X cuelang.org/go/cmd/cue/cmd.version=${version}" + ldflags = [ + "-s" "-w" "-X cuelang.org/go/cmd/cue/cmd.version=${version}" ]; meta = { diff --git a/third_party/nixpkgs/pkgs/development/tools/dep/default.nix b/third_party/nixpkgs/pkgs/development/tools/dep/default.nix index ff7bad87af..2c7345d7cc 100644 --- a/third_party/nixpkgs/pkgs/development/tools/dep/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/dep/default.nix @@ -15,7 +15,7 @@ buildGoPackage rec { sha256 = "02akzbjar1v01rdal746vk6mklff29yk2mqfyjk1zrs0mlg38ygd"; }; - buildFlagsArray = ("-ldflags=-s -w -X main.commitHash=${rev} -X main.version=${version}"); + ldflags = [ "-s" "-w" "-X main.commitHash=${rev}" "-X main.version=${version}" ]; meta = with lib; { homepage = "https://github.com/golang/dep"; diff --git a/third_party/nixpkgs/pkgs/development/tools/dive/default.nix b/third_party/nixpkgs/pkgs/development/tools/dive/default.nix index 3b04c0fb89..581b0db3b3 100644 --- a/third_party/nixpkgs/pkgs/development/tools/dive/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/dive/default.nix @@ -19,7 +19,7 @@ buildGoModule rec { buildInputs = lib.optionals stdenv.isLinux [ btrfs-progs gpgme lvm2 ]; - buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ]; + ldflags = [ "-s" "-w" "-X main.version=${version}" ]; meta = with lib; { description = "A tool for exploring each layer in a docker image"; diff --git a/third_party/nixpkgs/pkgs/development/tools/earthly/default.nix b/third_party/nixpkgs/pkgs/development/tools/earthly/default.nix index 1d66e059a7..53da9c1fb4 100644 --- a/third_party/nixpkgs/pkgs/development/tools/earthly/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/earthly/default.nix @@ -13,13 +13,11 @@ buildGoModule rec { vendorSha256 = "sha256-gydhh/EMSuE/beo+A2CRDdDnQGT6DMjMwthylT339I4="; - buildFlagsArray = '' - -ldflags= - -s -w - -X main.Version=v${version} - -X main.DefaultBuildkitdImage=earthly/buildkitd:v${version} - -extldflags -static - ''; + ldflags = [ + "-s" "-w" + "-X main.Version=v${version}" + "-X main.DefaultBuildkitdImage=earthly/buildkitd:v${version}" + ]; BUILDTAGS = "dfrunmount dfrunsecurity dfsecrets dfssh dfrunnetwork"; preBuild = '' diff --git a/third_party/nixpkgs/pkgs/development/tools/esbuild/default.nix b/third_party/nixpkgs/pkgs/development/tools/esbuild/default.nix index ae8579c16a..bd080d235b 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.12.22"; + version = "0.12.23"; src = fetchFromGitHub { owner = "evanw"; repo = "esbuild"; rev = "v${version}"; - sha256 = "sha256-vZlrHfcXOz4QHTH9otpwtPIWHGxK4TAol5o/Tl0M98E="; + sha256 = "sha256-WS3Vy//5lL7xnMOgSeLh6RHAlonQDPQ3K2L+MIK+j7A="; }; vendorSha256 = "sha256-2ABWPqhK2Cf4ipQH7XvRrd+ZscJhYPc3SV2cGT0apdg="; diff --git a/third_party/nixpkgs/pkgs/development/tools/fission/default.nix b/third_party/nixpkgs/pkgs/development/tools/fission/default.nix index a87b20402d..0151a6fb38 100644 --- a/third_party/nixpkgs/pkgs/development/tools/fission/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/fission/default.nix @@ -13,7 +13,7 @@ buildGoModule rec { vendorSha256 = "sha256-1ujJuhK7pm/A1Dd+Wm9dtc65mx9pwLBWMWwEJnbja8s="; - buildFlagsArray = "-ldflags=-s -w -X info.Version=${version}"; + ldflags = [ "-s" "-w" "-X info.Version=${version}" ]; subPackages = [ "cmd/fission-cli" ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/github/bump/default.nix b/third_party/nixpkgs/pkgs/development/tools/github/bump/default.nix index 791b8b7aa9..3531926e4b 100644 --- a/third_party/nixpkgs/pkgs/development/tools/github/bump/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/github/bump/default.nix @@ -15,8 +15,8 @@ buildGoModule rec { doCheck = false; - buildFlagsArray = [ - "-ldflags=-X main.buildVersion=${version} -X main.buildCommit=${version} -X main.buildDate=1970-01-01" + ldflags = [ + "-X main.buildVersion=${version}" "-X main.buildCommit=${version}" "-X main.buildDate=1970-01-01" ]; meta = with lib; { @@ -26,4 +26,3 @@ buildGoModule rec { maintainers = with maintainers; [ doronbehar ]; }; } - diff --git a/third_party/nixpkgs/pkgs/development/tools/glide/default.nix b/third_party/nixpkgs/pkgs/development/tools/glide/default.nix index 05e4ae8106..e97feca116 100644 --- a/third_party/nixpkgs/pkgs/development/tools/glide/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/glide/default.nix @@ -6,10 +6,9 @@ buildGoPackage rec { goPackagePath = "github.com/Masterminds/glide"; - buildFlagsArray = '' - -ldflags= - -X main.version=${version} - ''; + ldflags = [ + "-X main.version=${version}" + ]; src = fetchFromGitHub { rev = "v${version}"; diff --git a/third_party/nixpkgs/pkgs/development/tools/go-minimock/default.nix b/third_party/nixpkgs/pkgs/development/tools/go-minimock/default.nix index 60f53e1e25..1ec03ed2a6 100644 --- a/third_party/nixpkgs/pkgs/development/tools/go-minimock/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/go-minimock/default.nix @@ -11,8 +11,8 @@ buildGoModule rec { sha256 = "sha256-l+ngvmTb9yVgQYT+OeaVd0zz/xNZeXWrjMpVkMpbQIw="; }; - buildFlagsArray = [ - "-ldflags=-s -w -X main.version=${version}" + ldflags = [ + "-s" "-w" "-X main.version=${version}" ]; vendorSha256 = "sha256-hn222ifKRYbASAHBJyMTCDwhykf2Jg9IqIUlK/GabJA="; diff --git a/third_party/nixpkgs/pkgs/development/tools/go-swagger/default.nix b/third_party/nixpkgs/pkgs/development/tools/go-swagger/default.nix index 2147ed00c7..20c2a2b9e9 100644 --- a/third_party/nixpkgs/pkgs/development/tools/go-swagger/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/go-swagger/default.nix @@ -17,7 +17,7 @@ buildGoModule rec { subPackages = [ "cmd/swagger" ]; - buildFlagsArray = [ "-ldflags=-s -w -X github.com/go-swagger/go-swagger/cmd/swagger/commands.Version=${version} -X github.com/go-swagger/go-swagger/cmd/swagger/commands.Commit=${src.rev}" ]; + ldflags = [ "-s" "-w" "-X github.com/go-swagger/go-swagger/cmd/swagger/commands.Version=${version}" "-X github.com/go-swagger/go-swagger/cmd/swagger/commands.Commit=${src.rev}" ]; meta = with lib; { description = "Golang implementation of Swagger 2.0, representation of your RESTful API"; 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 c1cff6562f..4c7d20bb74 100644 --- a/third_party/nixpkgs/pkgs/development/tools/go-task/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/go-task/default.nix @@ -17,8 +17,8 @@ buildGoModule rec { subPackages = [ "cmd/task" ]; - buildFlagsArray = [ - "-ldflags=-s -w -X main.version=${version}" + ldflags = [ + "-s" "-w" "-X main.version=${version}" ]; postInstall = '' diff --git a/third_party/nixpkgs/pkgs/development/tools/gomplate/default.nix b/third_party/nixpkgs/pkgs/development/tools/gomplate/default.nix index 45602a0535..10f853a652 100644 --- a/third_party/nixpkgs/pkgs/development/tools/gomplate/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/gomplate/default.nix @@ -19,8 +19,7 @@ buildGoModule rec { rm net/net_test.go ''; - buildFlagsArray = [ - "-ldflags=" + ldflags = [ "-s" "-w" "-X github.com/${owner}/${pname}/v3/version.Version=${rev}" diff --git a/third_party/nixpkgs/pkgs/development/tools/gopkgs/deps.nix b/third_party/nixpkgs/pkgs/development/tools/gopkgs/deps.nix deleted file mode 100644 index e813a5b225..0000000000 --- a/third_party/nixpkgs/pkgs/development/tools/gopkgs/deps.nix +++ /dev/null @@ -1,21 +0,0 @@ -# file generated from Gopkg.lock using dep2nix (https://github.com/nixcloud/dep2nix) -[ - { - goPackagePath = "github.com/karrick/godirwalk"; - fetch = { - type = "git"; - url = "https://github.com/karrick/godirwalk"; - rev = "5cc8b3875be6c21825a1b54d3029ed415c93c4f7"; - sha256 = "02nlyr0sa0lj1f27fsrxlspcsrx7fs60qwr33l5r6yq52axcikcd"; - }; - } - { - goPackagePath = "github.com/pkg/errors"; - fetch = { - type = "git"; - url = "https://github.com/pkg/errors"; - rev = "645ef00459ed84a119197bfb8d8205042c6df63d"; - sha256 = "001i6n71ghp2l6kdl3qq1v2vmghcz3kicv9a5wgcihrzigm75pp5"; - }; - } -] diff --git a/third_party/nixpkgs/pkgs/development/tools/gosec/default.nix b/third_party/nixpkgs/pkgs/development/tools/gosec/default.nix index 9264ac27fa..9f9bb882de 100644 --- a/third_party/nixpkgs/pkgs/development/tools/gosec/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/gosec/default.nix @@ -17,7 +17,7 @@ buildGoModule rec { doCheck = false; - buildFlagsArray = [ "-ldflags=-s -w -X main.Version=${version} -X main.GitTag=${src.rev} -X main.BuildDate=unknown" ]; + ldflags = [ "-s" "-w" "-X main.Version=${version}" "-X main.GitTag=${src.rev}" "-X main.BuildDate=unknown" ]; meta = with lib; { homepage = "https://github.com/securego/gosec"; @@ -27,4 +27,3 @@ buildGoModule rec { platforms = platforms.linux ++ platforms.darwin; }; } - diff --git a/third_party/nixpkgs/pkgs/development/tools/gotestsum/default.nix b/third_party/nixpkgs/pkgs/development/tools/gotestsum/default.nix index 1e63b07d03..161aba5d68 100644 --- a/third_party/nixpkgs/pkgs/development/tools/gotestsum/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/gotestsum/default.nix @@ -15,7 +15,7 @@ buildGoModule rec { doCheck = false; - buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ]; + ldflags = [ "-s" "-w" "-X main.version=${version}" ]; subPackages = [ "." ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/hcloud/default.nix b/third_party/nixpkgs/pkgs/development/tools/hcloud/default.nix index fe3dfb9a34..f77e3832fe 100644 --- a/third_party/nixpkgs/pkgs/development/tools/hcloud/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/hcloud/default.nix @@ -17,7 +17,7 @@ buildGoModule rec { doCheck = false; - buildFlagsArray = [ "-ldflags=-s -w -X github.com/hetznercloud/cli/cli.Version=${version}" ]; + ldflags = [ "-s" "-w" "-X github.com/hetznercloud/cli/cli.Version=${version}" ]; postInstall = '' for shell in bash zsh; do diff --git a/third_party/nixpkgs/pkgs/development/tools/jsonnet-bundler/default.nix b/third_party/nixpkgs/pkgs/development/tools/jsonnet-bundler/default.nix index 4286a454ff..87da63f0f3 100644 --- a/third_party/nixpkgs/pkgs/development/tools/jsonnet-bundler/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/jsonnet-bundler/default.nix @@ -15,7 +15,7 @@ buildGoModule rec { subPackages = [ "cmd/jb" ]; - buildFlagsArray = [ "-ldflags=-s -w -X main.Version=${version}" ]; + ldflags = [ "-s" "-w" "-X main.Version=${version}" ]; meta = with lib; { description = "A jsonnet package manager"; diff --git a/third_party/nixpkgs/pkgs/development/tools/kube-aws/default.nix b/third_party/nixpkgs/pkgs/development/tools/kube-aws/default.nix index 0e96683b06..e095755df1 100644 --- a/third_party/nixpkgs/pkgs/development/tools/kube-aws/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/kube-aws/default.nix @@ -22,9 +22,9 @@ buildGoPackage rec { go generate ./core/root/config )''; - buildFlagsArray = '' - -ldflags=-X github.com/coreos/kube-aws/core/controlplane/cluster.VERSION=v${version} - ''; + ldflags = [ + "-X github.com/coreos/kube-aws/core/controlplane/cluster.VERSION=v${version}" + ]; meta = { description = "Tool for deploying kubernetes on aws using coreos"; diff --git a/third_party/nixpkgs/pkgs/development/tools/kubepug/default.nix b/third_party/nixpkgs/pkgs/development/tools/kubepug/default.nix index 639e72edb8..df61908686 100644 --- a/third_party/nixpkgs/pkgs/development/tools/kubepug/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/kubepug/default.nix @@ -13,9 +13,9 @@ buildGoModule rec { vendorSha256 = "0jzry4znq4kcl6i9jcawilyjm8av1zxbml6nlr96v8x47ijxav5j"; - buildFlagsArray = '' - -ldflags=-s -w -X=github.com/rikatz/kubepug/version.Version=${src.rev} - ''; + ldflags = [ + "-s" "-w" "-X=github.com/rikatz/kubepug/version.Version=${src.rev}" + ]; subPackages = [ "cmd/kubepug.go" ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/kustomize/default.nix b/third_party/nixpkgs/pkgs/development/tools/kustomize/default.nix index c2453c8ff1..36c425aef1 100644 --- a/third_party/nixpkgs/pkgs/development/tools/kustomize/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/kustomize/default.nix @@ -2,22 +2,22 @@ buildGoModule rec { pname = "kustomize"; - version = "4.2.0"; + version = "4.3.0"; # rev is the commit of the tag, mainly for kustomize version command output rev = "9e8e7a7fe99ec9fbf801463e8607928322fc5245"; - buildFlagsArray = let t = "sigs.k8s.io/kustomize/api/provenance"; in - '' - -ldflags= - -s -X ${t}.version=${version} - -X ${t}.gitCommit=${rev} - ''; + ldflags = let t = "sigs.k8s.io/kustomize/api/provenance"; in + [ + "-s" + "-X ${t}.version=${version}" + "-X ${t}.gitCommit=${rev}" + ]; src = fetchFromGitHub { owner = "kubernetes-sigs"; repo = pname; rev = "kustomize/v${version}"; - sha256 = "sha256-mFF0Yc+j292oajY1i9SApnWaQnVoHxvkGCIurKC0t4o="; + sha256 = "sha256-Oo29/H1rWKOMNBIa8N/ih2Bfmclsn/kqv3il6c2muoQ="; }; # TODO: Remove once https://github.com/kubernetes-sigs/kustomize/pull/3708 got merged. @@ -26,7 +26,7 @@ buildGoModule rec { # avoid finding test and development commands sourceRoot = "source/kustomize"; - vendorSha256 = "sha256-VMvXDIrg/BkuxZVDHvpfHY/hgwQGz2kw1/hu5lhcYEE="; + vendorSha256 = "sha256-oX+6cc5EO2RqK2O212iaW/6CMFCNdYzTpAaqDTFqX1A="; meta = with lib; { description = "Customization of kubernetes YAML configurations"; diff --git a/third_party/nixpkgs/pkgs/development/tools/lazygit/default.nix b/third_party/nixpkgs/pkgs/development/tools/lazygit/default.nix index c7e3a1fabd..21d9f9903d 100644 --- a/third_party/nixpkgs/pkgs/development/tools/lazygit/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/lazygit/default.nix @@ -14,7 +14,7 @@ buildGoModule rec { vendorSha256 = null; subPackages = [ "." ]; - buildFlagsArray = [ "-ldflags=-X main.version=${version} -X main.buildSource=nix" ]; + ldflags = [ "-X main.version=${version}" "-X main.buildSource=nix" ]; meta = with lib; { description = "Simple terminal UI for git commands"; diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/circleci-cli/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/circleci-cli/default.nix index 890229ebc8..6ce86c44d7 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/circleci-cli/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/circleci-cli/default.nix @@ -15,7 +15,7 @@ buildGoModule rec { doCheck = false; - buildFlagsArray = [ "-ldflags=-s -w -X github.com/CircleCI-Public/circleci-cli/version.Version=${version} -X github.com/CircleCI-Public/circleci-cli/version.Commit=${src.rev} -X github.com/CircleCI-Public/circleci-cli/version.packageManager=nix" ]; + ldflags = [ "-s" "-w" "-X github.com/CircleCI-Public/circleci-cli/version.Version=${version}" "-X github.com/CircleCI-Public/circleci-cli/version.Commit=${src.rev}" "-X github.com/CircleCI-Public/circleci-cli/version.packageManager=nix" ]; preBuild = '' substituteInPlace data/data.go \ diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/jiq/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/jiq/default.nix index c52a9ae4c0..61477a4c7d 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/jiq/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/jiq/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "jiq"; - version = "0.7.1"; + version = "0.7.2"; src = fetchFromGitHub { owner = "fiatjaf"; repo = pname; - rev = version; - sha256 = "sha256-EPhnfgmn0AufuxwcwRrEEQk+RD97akFJSzngkTl4LmY="; + rev = "v${version}"; + sha256 = "sha256-txhttYngN+dofA3Yp3gZUZPRRZWGug9ysXq1Q0RP7ig="; }; vendorSha256 = "sha256-ZUmOhPGy+24AuxdeRVF0Vnu8zDGFrHoUlYiDdfIV5lc="; diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/k2tf/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/k2tf/default.nix index 904256ee66..bc24d4563a 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/k2tf/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/k2tf/default.nix @@ -13,7 +13,7 @@ buildGoModule rec { vendorSha256 = "1c2mwhrj0xapc661z1nb6am4qq3rd1pvbvjaxikjyx95n0gs8gjk"; - buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version} -X main.commit=v${version}" ]; + ldflags = [ "-s" "-w" "-X main.version=${version}" "-X main.commit=v${version}" ]; meta = with lib; { description = "Kubernetes YAML to Terraform HCL converter"; diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/linuxkit/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/linuxkit/default.nix index eeb2102bdf..da608ba5a0 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/linuxkit/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/linuxkit/default.nix @@ -15,7 +15,7 @@ buildGoPackage rec { subPackages = [ "src/cmd/linuxkit" ]; - buildFlagsArray = [ "-ldflags=-s -w -X ${goPackagePath}/src/cmd/linuxkit/version.GitCommit=${src.rev} -X ${goPackagePath}/src/cmd/linuxkit/version.Version=${version}" ]; + ldflags = [ "-s" "-w" "-X ${goPackagePath}/src/cmd/linuxkit/version.GitCommit=${src.rev}" "-X ${goPackagePath}/src/cmd/linuxkit/version.Version=${version}" ]; meta = with lib; { description = "A toolkit for building secure, portable and lean operating systems for containers"; diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/mkcert/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/mkcert/default.nix index 0f110ae0b0..bfd5515700 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/mkcert/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/mkcert/default.nix @@ -15,9 +15,9 @@ buildGoModule rec { doCheck = false; - buildFlagsArray = '' - -ldflags=-s -w -X main.Version=v${version} - ''; + ldflags = [ + "-s" "-w" "-X main.Version=v${version}" + ]; meta = with lib; { homepage = "https://github.com/FiloSottile/mkcert"; diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/reviewdog/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/reviewdog/default.nix index 075698ac43..b39ab68f06 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/reviewdog/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/reviewdog/default.nix @@ -17,7 +17,7 @@ buildGoModule rec { subPackages = [ "cmd/reviewdog" ]; - buildFlagsArray = [ "-ldflags=-s -w -X github.com/reviewdog/reviewdog/commands.Version=${version}" ]; + ldflags = [ "-s" "-w" "-X github.com/reviewdog/reviewdog/commands.Version=${version}" ]; meta = with lib; { description = "Automated code review tool integrated with any code analysis tools regardless of programming language"; diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/terracognita/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/terracognita/default.nix index 1d33f5929b..c10543e176 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/terracognita/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/terracognita/default.nix @@ -17,7 +17,7 @@ buildGoModule rec { subPackages = [ "." ]; - buildFlagsArray = [ "-ldflags=-s -w -X github.com/cycloidio/terracognita/cmd.Version=${version}" ]; + ldflags = [ "-s" "-w" "-X github.com/cycloidio/terracognita/cmd.Version=${version}" ]; meta = with lib; { description = "Reads from existing Cloud Providers (reverse Terraform) and generates your infrastructure as code on Terraform configuration"; diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/terraform-ls/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/terraform-ls/default.nix index d484ee56aa..7ea4625bad 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/terraform-ls/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/terraform-ls/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "terraform-ls"; - version = "0.20.1"; + version = "0.21.0"; src = fetchFromGitHub { owner = "hashicorp"; repo = pname; rev = "v${version}"; - sha256 = "sha256-KEuqE09EvI00e2YwPaExuM9ji5Z7YDTOF+4jw6SvtKo="; + sha256 = "sha256-x1HPr1xzByyNnuNr8B4vqdxw+EeFJsqse/FG1I/b0+g="; }; - vendorSha256 = "sha256-hPa1xaYqKs++Ifw732bfs2VHW7DFRggO/faJgX4M2F4="; + vendorSha256 = "sha256-f/y2i/aPeiUBiUaoCyehO8835qtxJkJsSh9/RAowsLI="; ldflags = [ "-s" "-w" "-X main.version=v${version}" "-X main.prerelease=" ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/terraform-lsp/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/terraform-lsp/default.nix index 0cfd63ffa2..d55367e706 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/terraform-lsp/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/terraform-lsp/default.nix @@ -13,7 +13,7 @@ buildGoPackage rec { goPackagePath = "github.com/juliosueiras/terraform-lsp"; - buildFlagsArray = [ "-ldflags=-s -w -X main.Version=${version} -X main.GitCommit=${src.rev}" ]; + ldflags = [ "-s" "-w" "-X main.Version=${version}" "-X main.GitCommit=${src.rev}" ]; meta = with lib; { description = "Language Server Protocol for Terraform"; diff --git a/third_party/nixpkgs/pkgs/development/tools/renderizer/default.nix b/third_party/nixpkgs/pkgs/development/tools/renderizer/default.nix index 18d5cae542..d9987137ce 100644 --- a/third_party/nixpkgs/pkgs/development/tools/renderizer/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/renderizer/default.nix @@ -11,8 +11,8 @@ buildGoModule rec { sha256 = "sha256-jl98LuEsGN40L9IfybJhLnbzoYP/XpwFVQnjrlmDL9A="; }; - buildFlagsArray = [ - "-ldflags=-s -w -X main.version=${version} -X main.commitHash=${src.rev} -X main.date=19700101T000000" + ldflags = [ + "-s" "-w" "-X main.version=${version}" "-X main.commitHash=${src.rev}" "-X main.date=19700101T000000" ]; vendorSha256 = null; diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/rust-analyzer/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/rust-analyzer/default.nix index 9df4d9075a..394b743ec8 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/rust-analyzer/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/rust-analyzer/default.nix @@ -1,8 +1,7 @@ { lib, stdenv, fetchFromGitHub, rustPlatform, CoreServices, cmake , libiconv , useMimalloc ? false -# FIXME: Test doesn't pass under rustc 1.52.1 due to different escaping of `'` in string. -, doCheck ? false +, doCheck ? true }: rustPlatform.buildRustPackage rec { @@ -17,9 +16,16 @@ rustPlatform.buildRustPackage rec { sha256 = "sha256-6Tbgy77Essi3Hyd5kdJ7JJbx7RuFZQWURfRrpScvPPQ="; }; + patches = [ + # Code format and git history check require more dependencies but don't really matter for packaging. + # So just ignore them. + ./ignore-git-and-rustfmt-tests.patch + ]; + buildAndTestSubdir = "crates/rust-analyzer"; cargoBuildFlags = lib.optional useMimalloc "--features=mimalloc"; + cargoTestFlags = lib.optional useMimalloc "--features=mimalloc"; nativeBuildInputs = lib.optional useMimalloc cmake; diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/rust-analyzer/ignore-git-and-rustfmt-tests.patch b/third_party/nixpkgs/pkgs/development/tools/rust/rust-analyzer/ignore-git-and-rustfmt-tests.patch new file mode 100644 index 0000000000..1247e48046 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/rust/rust-analyzer/ignore-git-and-rustfmt-tests.patch @@ -0,0 +1,18 @@ +--- a/crates/rust-analyzer/tests/slow-tests/tidy.rs ++++ b/crates/rust-analyzer/tests/slow-tests/tidy.rs +@@ -6,6 +6,7 @@ use std::{ + use xshell::{cmd, pushd, pushenv, read_file}; + + #[test] ++#[ignore] + fn check_code_formatting() { + let _dir = pushd(sourcegen::project_root()).unwrap(); + let _e = pushenv("RUSTUP_TOOLCHAIN", "stable"); +@@ -138,6 +139,7 @@ fn check_cargo_toml(path: &Path, text: String) -> () { + } + + #[test] ++#[ignore] + fn check_merge_commits() { + let stdout = cmd!("git rev-list --merges --invert-grep --author 'bors\\[bot\\]' HEAD~19..") + .read() diff --git a/third_party/nixpkgs/pkgs/development/tools/skaffold/default.nix b/third_party/nixpkgs/pkgs/development/tools/skaffold/default.nix index 2490c3a3ce..dcacd997d7 100644 --- a/third_party/nixpkgs/pkgs/development/tools/skaffold/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/skaffold/default.nix @@ -15,13 +15,12 @@ buildGoModule rec { subPackages = ["cmd/skaffold"]; - buildFlagsArray = let t = "github.com/GoogleContainerTools/skaffold/pkg/skaffold"; in '' - -ldflags= - -s -w - -X ${t}/version.version=v${version} - -X ${t}/version.gitCommit=${src.rev} - -X ${t}/version.buildDate=unknown - ''; + ldflags = let t = "github.com/GoogleContainerTools/skaffold/pkg/skaffold"; in [ + "-s" "-w" + "-X ${t}/version.version=v${version}" + "-X ${t}/version.gitCommit=${src.rev}" + "-X ${t}/version.buildDate=unknown" + ]; nativeBuildInputs = [ installShellFiles ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/tf2pulumi/default.nix b/third_party/nixpkgs/pkgs/development/tools/tf2pulumi/default.nix index 8a1a03c163..6f195d8684 100644 --- a/third_party/nixpkgs/pkgs/development/tools/tf2pulumi/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/tf2pulumi/default.nix @@ -13,9 +13,9 @@ buildGoModule rec { vendorSha256 = "sha256-wsgNrDnFXbpanEULEjf6OxOeMYmWzjE7vpVUB/UFNp8="; - buildFlagsArray = '' - -ldflags=-s -w -X=github.com/pulumi/tf2pulumi/version.Version=${src.rev} - ''; + ldflags = [ + "-s" "-w" "-X=github.com/pulumi/tf2pulumi/version.Version=${src.rev}" + ]; subPackages = [ "." ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/toxiproxy/default.nix b/third_party/nixpkgs/pkgs/development/tools/toxiproxy/default.nix index 448c14ffaf..5ecd6ad2eb 100644 --- a/third_party/nixpkgs/pkgs/development/tools/toxiproxy/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/toxiproxy/default.nix @@ -12,7 +12,7 @@ buildGoPackage rec { goPackagePath = "github.com/Shopify/toxiproxy"; subPackages = ["cmd" "cli"]; - buildFlagsArray = "-ldflags=-X github.com/Shopify/toxiproxy.Version=v${version}"; + ldflags = [ "-X github.com/Shopify/toxiproxy.Version=v${version}" ]; postInstall = '' mv $out/bin/cli $out/bin/toxiproxy-cli diff --git a/third_party/nixpkgs/pkgs/development/tools/vultr-cli/default.nix b/third_party/nixpkgs/pkgs/development/tools/vultr-cli/default.nix index b953feea22..3b9cebb643 100644 --- a/third_party/nixpkgs/pkgs/development/tools/vultr-cli/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/vultr-cli/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "vultr-cli"; - version = "2.7.0"; + version = "2.8.0"; src = fetchFromGitHub { owner = "vultr"; repo = pname; rev = "v${version}"; - sha256 = "sha256-3q0in41/ZGuZcMiu+5qT8AGttro2it89xp741RCxAYY="; + sha256 = "sha256-BPeOud10cTsZ2flWRMf6F/i9JwnPPDFje3OZIAUa0O8="; }; vendorSha256 = null; diff --git a/third_party/nixpkgs/pkgs/development/tools/yj/default.nix b/third_party/nixpkgs/pkgs/development/tools/yj/default.nix index 303f325dec..017434134c 100644 --- a/third_party/nixpkgs/pkgs/development/tools/yj/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/yj/default.nix @@ -13,7 +13,7 @@ buildGoModule rec { vendorSha256 = "0y0n9fsb85qlpf9slwsxzarmfi98asa4x04qp2r8pagl28l0i8wv"; - buildFlagsArray = [ "-ldflags=-s -w -X main.Version=${version}" ]; + ldflags = [ "-s" "-w" "-X main.Version=${version}" ]; meta = with lib; { description = "Convert YAML <=> TOML <=> JSON <=> HCL"; diff --git a/third_party/nixpkgs/pkgs/development/web/flyctl/default.nix b/third_party/nixpkgs/pkgs/development/web/flyctl/default.nix index 71db0f89cd..c222d5232b 100644 --- a/third_party/nixpkgs/pkgs/development/web/flyctl/default.nix +++ b/third_party/nixpkgs/pkgs/development/web/flyctl/default.nix @@ -21,7 +21,7 @@ buildGoModule rec { doCheck = false; - buildFlagsArray = [ "-ldflags=-s -w -X github.com/superfly/flyctl/flyctl.Version=${version} -X github.com/superfly/flyctl/flyctl.Commit=${src.rev} -X github.com/superfly/flyctl/flyctl.BuildDate=1970-01-01T00:00:00+0000 -X github.com/superfly/flyctl/flyctl.Environment=production" ]; + ldflags = [ "-s" "-w" "-X github.com/superfly/flyctl/flyctl.Version=${version}" "-X github.com/superfly/flyctl/flyctl.Commit=${src.rev}" "-X github.com/superfly/flyctl/flyctl.BuildDate=1970-01-01T00:00:00+0000" "-X github.com/superfly/flyctl/flyctl.Environment=production" ]; meta = with lib; { description = "Command line tools for fly.io services"; diff --git a/third_party/nixpkgs/pkgs/development/web/minify/default.nix b/third_party/nixpkgs/pkgs/development/web/minify/default.nix index ac040d0a91..31c6ba9253 100644 --- a/third_party/nixpkgs/pkgs/development/web/minify/default.nix +++ b/third_party/nixpkgs/pkgs/development/web/minify/default.nix @@ -15,7 +15,7 @@ buildGoModule rec { doCheck = false; - buildFlagsArray = [ "-ldflags=-s -w -X main.Version=${version}" ]; + ldflags = [ "-s" "-w" "-X main.Version=${version}" ]; meta = with lib; { description = "Minifiers for web formats"; diff --git a/third_party/nixpkgs/pkgs/development/web/nodejs/v16.nix b/third_party/nixpkgs/pkgs/development/web/nodejs/v16.nix index 113f0cf95c..805e62be8d 100644 --- a/third_party/nixpkgs/pkgs/development/web/nodejs/v16.nix +++ b/third_party/nixpkgs/pkgs/development/web/nodejs/v16.nix @@ -8,7 +8,7 @@ let in buildNodejs { inherit enableNpm; - version = "16.7.0"; - sha256 = "0drd7zyadjrhng9k0mspz456j3pmr7kli5dd0kx8grbqsgxzv1gs"; + version = "16.8.0"; + sha256 = "14k3njj382im3q4k6dhsxdk07gs81hw2k0nrixfvlw1964k04ydq"; patches = [ ./disable-darwin-v8-system-instrumentation.patch ]; } diff --git a/third_party/nixpkgs/pkgs/games/lgogdownloader/default.nix b/third_party/nixpkgs/pkgs/games/lgogdownloader/default.nix index 4cb9d3a6c0..d92484cfef 100644 --- a/third_party/nixpkgs/pkgs/games/lgogdownloader/default.nix +++ b/third_party/nixpkgs/pkgs/games/lgogdownloader/default.nix @@ -14,13 +14,13 @@ stdenv.mkDerivation rec { pname = "lgogdownloader"; - version = "3.7"; + version = "3.8"; src = fetchFromGitHub { owner = "Sude-"; repo = "lgogdownloader"; rev = "v${version}"; - sha256 = "sha256-3xFlFokqdD1Nstu7TSUCaHUxvSodIb12QNVjmNgn9gs="; + sha256 = "sha256-LywFJCZevlhthOkAZo7JkXcPT9V6Zh28VD/MVQnMQjo="; }; nativeBuildInputs = [ cmake pkg-config help2man ]; diff --git a/third_party/nixpkgs/pkgs/misc/vim-plugins/generated.nix b/third_party/nixpkgs/pkgs/misc/vim-plugins/generated.nix index b607ff0142..45e72bc23c 100644 --- a/third_party/nixpkgs/pkgs/misc/vim-plugins/generated.nix +++ b/third_party/nixpkgs/pkgs/misc/vim-plugins/generated.nix @@ -389,12 +389,12 @@ final: prev: bufferline-nvim = buildVimPluginFrom2Nix { pname = "bufferline-nvim"; - version = "2021-08-21"; + version = "2021-08-23"; src = fetchFromGitHub { owner = "akinsho"; repo = "bufferline.nvim"; - rev = "35ac1c1e2e6f7cbf6a1ad027d8bf019a284b28d5"; - sha256 = "1sdq5yjav7ak5lkw0kiz8mwffnxva94w1xav8y8kxy8f95b78a2g"; + rev = "21fda2cfb4c692f91e4df486dc2e28a37c628a76"; + sha256 = "05wi1zb1b3b08av3l8i40jggvb2mpkqmg0w8dqhxannblfkk8h8c"; }; meta.homepage = "https://github.com/akinsho/bufferline.nvim/"; }; @@ -449,12 +449,12 @@ final: prev: chadtree = buildVimPluginFrom2Nix { pname = "chadtree"; - version = "2021-08-22"; + version = "2021-08-23"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "chadtree"; - rev = "b84f08364a3b3a6eb9795ecdab418d1e786b0be4"; - sha256 = "0jh6xbiqrnldk1l2p1jqfi34wwci7nx2pxhvcv0fi9mb7r5bzvmw"; + rev = "d8089b752346fdccdd4fe85cec82c0f9919823fa"; + sha256 = "12nn4467jhhfi2vwsywzf6fqadwjsymmmmny5d4jsbz3l5xhcfmz"; }; meta.homepage = "https://github.com/ms-jpq/chadtree/"; }; @@ -581,12 +581,12 @@ final: prev: cmp-nvim-lsp = buildVimPluginFrom2Nix { pname = "cmp-nvim-lsp"; - version = "2021-08-16"; + version = "2021-08-23"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "cmp-nvim-lsp"; - rev = "09e4ab0fb66ad07d64b311d1bd7916905bf3364b"; - sha256 = "0573ywym8favv12g78qln4zx15j1ic26y8j2rbdlh8n22zll0v1x"; + rev = "899f70af0786d4100fb29987b9ab03eac7eedd6a"; + sha256 = "1gw478b77smkn3k42h2q3ddq2kcd7vm6mnmjmksvbsfv5xp9pln0"; }; meta.homepage = "https://github.com/hrsh7th/cmp-nvim-lsp/"; }; @@ -713,12 +713,12 @@ final: prev: coc-nvim = buildVimPluginFrom2Nix { pname = "coc-nvim"; - version = "2021-08-22"; + version = "2021-08-23"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc.nvim"; - rev = "5f5e3135de04c9e245c1ecf53b67836c692fd06a"; - sha256 = "1cljdxgqxiyq6gg71pg9k5b8iwvj8nzg4m7llzj957lrhfpavfxg"; + rev = "595e60210f7d0c9e5a21672428bae8c3f518a3b9"; + sha256 = "0mdqb07avwk2f5h5xylq2lkg56jk82dccyrxb17cxfw2dsgbs93m"; }; meta.homepage = "https://github.com/neoclide/coc.nvim/"; }; @@ -966,12 +966,12 @@ final: prev: Coqtail = buildVimPluginFrom2Nix { pname = "Coqtail"; - version = "2021-08-16"; + version = "2021-08-23"; src = fetchFromGitHub { owner = "whonore"; repo = "Coqtail"; - rev = "358747255db85579498dfc6e03dcd808d5b81d34"; - sha256 = "086q1bx6xz3qzkyll6lszcgljyz8b5w4ywa8wvcv71al3cxd9n7b"; + rev = "b292682c16176f961e11e1e68eb799d9b1b3e4e9"; + sha256 = "1278z0rgvg65kprxyg02yl2fixrfy9pg5fj3d796nc607ipzdhvb"; }; meta.homepage = "https://github.com/whonore/Coqtail/"; }; @@ -1508,12 +1508,12 @@ final: prev: dracula-vim = buildVimPluginFrom2Nix { pname = "dracula-vim"; - version = "2021-08-06"; + version = "2021-08-22"; src = fetchFromGitHub { owner = "dracula"; repo = "vim"; - rev = "074a6b34952f2d14be196c217a3995749670f627"; - sha256 = "0vvz81dg64pp0x08imcicrqkp4z90ahfxsikhswraslklc1k1ar1"; + rev = "d1ff992bf605c098577b7f0e632e3ea887b71520"; + sha256 = "04zmqz270willnpfsf61pa9xx5i5phx1g6r6nw317r9rs0dnk0wj"; }; meta.homepage = "https://github.com/dracula/vim/"; }; @@ -1555,6 +1555,18 @@ final: prev: meta.homepage = "https://github.com/editorconfig/editorconfig-vim/"; }; + editorconfig-nvim = buildVimPluginFrom2Nix { + pname = "editorconfig-nvim"; + version = "2021-08-18"; + src = fetchFromGitHub { + owner = "gpanders"; + repo = "editorconfig.nvim"; + rev = "8840aacb025af17e42c6c215a34568f3dbcf94f6"; + sha256 = "1flr9mhz33bcrqp6iwnvhsz18hrd4ynvh7qdihnpd5qn0mwf034w"; + }; + meta.homepage = "https://github.com/gpanders/editorconfig.nvim/"; + }; + elm-vim = buildVimPluginFrom2Nix { pname = "elm-vim"; version = "2020-09-23"; @@ -1823,12 +1835,12 @@ final: prev: friendly-snippets = buildVimPluginFrom2Nix { pname = "friendly-snippets"; - version = "2021-08-19"; + version = "2021-08-23"; src = fetchFromGitHub { owner = "rafamadriz"; repo = "friendly-snippets"; - rev = "2d7bcab215c8b7a8f889b371c4060dda2a6c6541"; - sha256 = "0kxm6nl167b51gjwli64d9qp5s1cdy9za0zfq9hy8phivjk2pmyl"; + rev = "d438b0fc71447c502029320377f0ed53603b9e0c"; + sha256 = "0hnn5rlm9gb59afbfi78rs5lp9fq844x8qrpqnwi0kcz8b3d6bp7"; }; meta.homepage = "https://github.com/rafamadriz/friendly-snippets/"; }; @@ -2039,12 +2051,12 @@ final: prev: gitsigns-nvim = buildVimPluginFrom2Nix { pname = "gitsigns-nvim"; - version = "2021-08-16"; + version = "2021-08-23"; src = fetchFromGitHub { owner = "lewis6991"; repo = "gitsigns.nvim"; - rev = "70705a33ab816c61011ed9c97ebb5925eaeb89c1"; - sha256 = "1bcrba17icpdmk69p284kb2k3jpwimnbcn5msa7xq46wj97hy12k"; + rev = "1ddb1f64f5fb15dac2d02e52af918d1fb11feb2d"; + sha256 = "0y33dsxhw55h28kvqq3655cmnl4nq4z497v69xa72872gf1dsi80"; }; meta.homepage = "https://github.com/lewis6991/gitsigns.nvim/"; }; @@ -2808,12 +2820,12 @@ final: prev: lightspeed-nvim = buildVimPluginFrom2Nix { pname = "lightspeed-nvim"; - version = "2021-08-21"; + version = "2021-08-23"; src = fetchFromGitHub { owner = "ggandor"; repo = "lightspeed.nvim"; - rev = "177ef542f6f26147f16be7b07c1e6fcfa66bf128"; - sha256 = "0c6bwdgi2d43jar05zcfarsas3r7y9v7igr3ldsgd7491wf8hjhg"; + rev = "9a613fb6ea8b8a41e7956f272c8cd0dc9a65102b"; + sha256 = "1l19cn04ibw0pd1isw02mllqxzp4gy4jd0mnv4mzf24ydjkyixkn"; }; meta.homepage = "https://github.com/ggandor/lightspeed.nvim/"; }; @@ -2964,12 +2976,12 @@ final: prev: luasnip = buildVimPluginFrom2Nix { pname = "luasnip"; - version = "2021-08-22"; + version = "2021-08-23"; src = fetchFromGitHub { owner = "l3mon4d3"; repo = "luasnip"; - rev = "6d398e3443933a68607215538e614662d2ffa5c8"; - sha256 = "0ll54nqa3lxzhxyjsya8y4qiyyicfsp5yz25mjdgqmvvf4i39jxz"; + rev = "2ee1dfa64e14201a1016cd7088b612a0d2a116e2"; + sha256 = "0hqj4xv3mxdcknjqhazvnsk01jdc3x6qqgyyf6sy5d4kxm5q9q0w"; }; meta.homepage = "https://github.com/l3mon4d3/luasnip/"; }; @@ -3468,12 +3480,12 @@ final: prev: neosnippet-vim = buildVimPluginFrom2Nix { pname = "neosnippet-vim"; - version = "2021-08-20"; + version = "2021-08-22"; src = fetchFromGitHub { owner = "Shougo"; repo = "neosnippet.vim"; - rev = "c1634915a8f798cded2bef39c6f24a9d988aca10"; - sha256 = "02cvrxfy6n7z5xl5ijw2fkz81j7lm18agyx6qs11a5l5f515h4a2"; + rev = "3f6f5f8ad34d63ecb1060dbd6d7e2513238da528"; + sha256 = "14f0ksrn4grkpjfn766hxg1p19dryngxai33b2322dy0qaw244d2"; }; meta.homepage = "https://github.com/Shougo/neosnippet.vim/"; }; @@ -3696,12 +3708,12 @@ final: prev: null-ls-nvim = buildVimPluginFrom2Nix { pname = "null-ls-nvim"; - version = "2021-08-18"; + version = "2021-08-23"; src = fetchFromGitHub { owner = "jose-elias-alvarez"; repo = "null-ls.nvim"; - rev = "f907d945d0285f42dc9ebffbc075ea725b93b6aa"; - sha256 = "1jg6wxknbzirq9j880yki8bm8v1zdkk60fyis67syf722vric9i8"; + rev = "414ed4690583315705955c80cdf52e86cfc134aa"; + sha256 = "084n4x0ikhxh9h33cqyzr3ajxd9zm9x7lh2q8dv0i5jlyxyb1grf"; }; meta.homepage = "https://github.com/jose-elias-alvarez/null-ls.nvim/"; }; @@ -3864,12 +3876,12 @@ final: prev: nvim-dap-ui = buildVimPluginFrom2Nix { pname = "nvim-dap-ui"; - version = "2021-08-15"; + version = "2021-08-22"; src = fetchFromGitHub { owner = "rcarriga"; repo = "nvim-dap-ui"; - rev = "c9fc568ca157429cd76986ca2bfaa60488a7d2fb"; - sha256 = "09jk0v2ki0hsy1m2hg3dwi66yaqn670vnjbbrbdxrq55n260gds3"; + rev = "8f34bb2e4700d83a84402ec776d4d3336e0e63f9"; + sha256 = "1lfrmi48vkkr92zfwzr5mbdczfw2w9lw04bvwnx77ir798lbp6mc"; }; meta.homepage = "https://github.com/rcarriga/nvim-dap-ui/"; }; @@ -3912,24 +3924,24 @@ final: prev: nvim-gps = buildVimPluginFrom2Nix { pname = "nvim-gps"; - version = "2021-08-22"; + version = "2021-08-23"; src = fetchFromGitHub { owner = "smiteshp"; repo = "nvim-gps"; - rev = "f365bc331c1fd752429427cdfed4aa142e9fc74f"; - sha256 = "1phzrw37y9gzcimy5r3phy2x53c9b2q5l3v5ipcx1k4q6pfkh026"; + rev = "a4be468d8991840641c8db5cc6bbbffc3dafd79d"; + sha256 = "09mn8gysbs54bhicg9s52s87c472h10cmvi76fyljgxrkpbjssw3"; }; meta.homepage = "https://github.com/smiteshp/nvim-gps/"; }; nvim-highlite = buildVimPluginFrom2Nix { pname = "nvim-highlite"; - version = "2021-08-21"; + version = "2021-08-22"; src = fetchFromGitHub { owner = "Iron-E"; repo = "nvim-highlite"; - rev = "dd827f091554065736105c72e1256d1fc8f4f445"; - sha256 = "11jndab13dhd6pqzbd385awzhmxvzz68aza09qmfqkjvmcs1gy8c"; + rev = "671869d981c47ccb2f7370145062a9cd9967d17b"; + sha256 = "14fs6h79ccb0mp9mcllqz42pkqialvs7gwp83xlpgy0kphgksndf"; }; meta.homepage = "https://github.com/Iron-E/nvim-highlite/"; }; @@ -3984,12 +3996,12 @@ final: prev: nvim-lspconfig = buildVimPluginFrom2Nix { pname = "nvim-lspconfig"; - version = "2021-08-20"; + version = "2021-08-22"; src = fetchFromGitHub { owner = "neovim"; repo = "nvim-lspconfig"; - rev = "9adbacf29835bf521a99a8d3f0b6f2157b1b9166"; - sha256 = "0k4b6qsrvlgxr600x9wgkfdraqczx49zqyqfz88xf6pjbx0zyach"; + rev = "5b0fa84ee35006e06142f98b8a5b28d79cfa5000"; + sha256 = "0in0r3irawmgxp1prwryw3dpxj7gd6pviv14w8a7hnw1sd2g84l8"; }; meta.homepage = "https://github.com/neovim/nvim-lspconfig/"; }; @@ -5139,12 +5151,12 @@ final: prev: sql-nvim = buildVimPluginFrom2Nix { pname = "sql-nvim"; - version = "2021-08-21"; + version = "2021-08-23"; src = fetchFromGitHub { owner = "tami5"; repo = "sql.nvim"; - rev = "eb1f0512c3b781740090877b39bc9332c01edb46"; - sha256 = "1dykwqv01fcf8k2q8fz7z4zgc9wh4v551b9mwm44n2lqzg35swzg"; + rev = "a0370391af2998e11c6320ba08a57d5a1827c0ed"; + sha256 = "13k9rdjwrmrv6vm2rn2b3ga02fcmig2ainllh8dxzpln3c3idwbp"; }; meta.homepage = "https://github.com/tami5/sql.nvim/"; }; @@ -5247,12 +5259,12 @@ final: prev: symbols-outline-nvim = buildVimPluginFrom2Nix { pname = "symbols-outline-nvim"; - version = "2021-08-21"; + version = "2021-08-23"; src = fetchFromGitHub { owner = "simrat39"; repo = "symbols-outline.nvim"; - rev = "40b7d5cbaa51c031061827c48e6a05748db7e91d"; - sha256 = "1mk4g1kgg2as3kk010wd9x2f4v60an68mqflpk97ng6a52laj5nw"; + rev = "6f376ef4ceb88ff7f0d9e3141dbe2a2e0854e785"; + sha256 = "1882gb76hp4zpwyljrzl26qjwyyvnavhfv529nj5z5x41vyhsks5"; }; meta.homepage = "https://github.com/simrat39/symbols-outline.nvim/"; }; @@ -5501,12 +5513,12 @@ final: prev: telescope-nvim = buildVimPluginFrom2Nix { pname = "telescope-nvim"; - version = "2021-08-21"; + version = "2021-08-23"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope.nvim"; - rev = "8381a215e091dc9e1f6ad9ceaeadf35ef3cfed8f"; - sha256 = "0cn1ynvva8nzjyrp285ficfa74wky0gikii2hysdi0g4ndnh6ypa"; + rev = "79dc995f820150d5de880c08e814af327ff7e965"; + sha256 = "0acyzc0k14dvd7j4ihvg84fz9lp1alwbf6qbnq083y6pd37mhj7b"; }; meta.homepage = "https://github.com/nvim-telescope/telescope.nvim/"; }; @@ -5622,12 +5634,12 @@ final: prev: toggleterm-nvim = buildVimPluginFrom2Nix { pname = "toggleterm-nvim"; - version = "2021-08-22"; + version = "2021-08-23"; src = fetchFromGitHub { owner = "akinsho"; repo = "toggleterm.nvim"; - rev = "5a4429d33cc8f286a0ad30b89084ec5284d6a652"; - sha256 = "0rflwn9bbnffly5i66n3hxrf9cgbpqphqc2p6bjpxlyydda1vdx3"; + rev = "317caf587448fc8d42189d2dc27dab076857aeb0"; + sha256 = "1gl27njvik0dfg9412gwnqi6ar6nqhpfhliyjm5w96pxaa6xlafp"; }; meta.homepage = "https://github.com/akinsho/toggleterm.nvim/"; }; @@ -6654,12 +6666,12 @@ final: prev: vim-dadbod = buildVimPluginFrom2Nix { pname = "vim-dadbod"; - version = "2021-06-02"; + version = "2021-08-23"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-dadbod"; - rev = "9e4fdb8ab029c0436728a96e1c92677737c2e784"; - sha256 = "1rmiza1km214mvlrdaqycv5hk8ki35giab11b9ggwcigbh743h01"; + rev = "6f8b99868fd5560d6eb47f82ca76ec62e3d5ae78"; + sha256 = "0n1hvyv9555rgi3qajy3d59v1nqdwcrr0l4nqzc0pr0cg9q7d6g3"; }; meta.homepage = "https://github.com/tpope/vim-dadbod/"; }; @@ -7170,12 +7182,12 @@ final: prev: vim-fugitive = buildVimPluginFrom2Nix { pname = "vim-fugitive"; - version = "2021-08-22"; + version = "2021-08-23"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-fugitive"; - rev = "5d1a276b455dd9a32375a5ac84050adff67062e3"; - sha256 = "1bm3fwbg9nmdxpvaqrs31g88ij5b5wxip2s4j9v1i0c0w5jplxjn"; + rev = "8cdb51622fbdbf780edff35ee22d74ad9983698e"; + sha256 = "18073gnl90n7h8j3rk6shs79455svwa47n5jxyb44m1957hvzfgb"; }; meta.homepage = "https://github.com/tpope/vim-fugitive/"; }; diff --git a/third_party/nixpkgs/pkgs/misc/vim-plugins/vim-plugin-names b/third_party/nixpkgs/pkgs/misc/vim-plugins/vim-plugin-names index e0028c8547..b3a956aa78 100644 --- a/third_party/nixpkgs/pkgs/misc/vim-plugins/vim-plugin-names +++ b/third_party/nixpkgs/pkgs/misc/vim-plugins/vim-plugin-names @@ -193,6 +193,7 @@ google/vim-jsonnet google/vim-maktaba gorkunov/smartpairs.vim gotcha/vimelette +gpanders/editorconfig.nvim gregsexton/gitv gruvbox-community/gruvbox as gruvbox-community gu-fan/riv.vim diff --git a/third_party/nixpkgs/pkgs/misc/vscode-extensions/default.nix b/third_party/nixpkgs/pkgs/misc/vscode-extensions/default.nix index 84e727907f..84dc60093d 100644 --- a/third_party/nixpkgs/pkgs/misc/vscode-extensions/default.nix +++ b/third_party/nixpkgs/pkgs/misc/vscode-extensions/default.nix @@ -852,8 +852,8 @@ let mktplcRef = { name = "nix-ide"; publisher = "jnoortheen"; - version = "0.1.7"; - sha256 = "1bw4wyq9abimxbhl7q9g8grvj2ax9qqq6mmqbiqlbsi2arvk0wrm"; + version = "0.1.16"; + sha256 = "04ky1mzyjjr1mrwv3sxz4mgjcq5ylh6n01lvhb19h3fmwafkdxbp"; }; }; @@ -917,6 +917,18 @@ let }; }; + lokalise.i18n-ally = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "i18n-ally"; + publisher = "Lokalise"; + version = "2.7.1"; + sha256 = "sha256-nHBYRSiPQ5ucWPr9VCUgMrosloLnVj40Fh+CEBvWONE="; + }; + meta = { + license = lib.licenses.mit; + }; + }; + mads-hartmann.bash-ide-vscode = buildVscodeMarketplaceExtension { mktplcRef = { publisher = "mads-hartmann"; diff --git a/third_party/nixpkgs/pkgs/os-specific/darwin/smimesign/default.nix b/third_party/nixpkgs/pkgs/os-specific/darwin/smimesign/default.nix index 6b7e388916..d50e00f984 100644 --- a/third_party/nixpkgs/pkgs/os-specific/darwin/smimesign/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/darwin/smimesign/default.nix @@ -13,7 +13,7 @@ buildGoModule rec { vendorSha256 = "1cldxykm9qj5rvyfafam45y5xj4f19700s2f9w7ndhxgfp9vahvz"; - buildFlagsArray = "-ldflags=-X main.versionString=v${version}"; + ldflags = [ "-X main.versionString=v${version}" ]; meta = with lib; { description = "An S/MIME signing utility for macOS and Windows that is compatible with Git"; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/iotop-c/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/iotop-c/default.nix index 47cfa57fe8..ca0eddac66 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/iotop-c/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/iotop-c/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "iotop-c"; - version = "1.17"; + version = "1.18"; src = fetchFromGitHub { owner = "Tomas-M"; repo = "iotop"; rev = "v${version}"; - sha256 = "0hjy30155c3nijx3jgyn5kpj293632p0j6f3lf5acdfax1ynav86"; + sha256 = "sha256-5RbxryvRKWJvjuJJwDK6GYnwdtHGfW7XEc75q4omxIA="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-zen.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-zen.nix index f35b5ad8e4..7750b77657 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-zen.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-zen.nix @@ -2,7 +2,7 @@ let # having the full version string here makes it easier to update - modDirVersion = "5.13.12-zen1"; + modDirVersion = "5.13.13-zen1"; parts = lib.splitString "-" modDirVersion; version = lib.elemAt parts 0; suffix = lib.elemAt parts 1; @@ -19,7 +19,7 @@ buildLinux (args // { owner = "zen-kernel"; repo = "zen-kernel"; rev = "v${modDirVersion}"; - sha256 = "sha256-UHcQZlQ164oVMVK/Fqggoi+aTDFrLv9Tngsy/q74+Bc="; + sha256 = "sha256-aTTbhXy0wsDDCSbX1k27l9g3FliqwE6TbRq2zkI3mnw="; }; structuredExtraConfig = with lib.kernel; { diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/raspberrypi-eeprom/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/raspberrypi-eeprom/default.nix index fd0da72aa9..32378e451e 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/raspberrypi-eeprom/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/raspberrypi-eeprom/default.nix @@ -28,6 +28,7 @@ stdenvNoCC.mkDerivation rec { cp rpi-eeprom-config rpi-eeprom-update $out/bin cp -r firmware/{beta,critical,old,stable} $out/share/rpi-eeprom + cp -P firmware/default firmware/latest $out/share/rpi-eeprom ''; fixupPhase = '' diff --git a/third_party/nixpkgs/pkgs/pkgs-lib/formats.nix b/third_party/nixpkgs/pkgs/pkgs-lib/formats.nix index 44c8f91354..5e17519d4c 100644 --- a/third_party/nixpkgs/pkgs/pkgs-lib/formats.nix +++ b/third_party/nixpkgs/pkgs/pkgs-lib/formats.nix @@ -48,14 +48,31 @@ rec { }; - # YAML has been a strict superset of JSON since 1.2 - yaml = {}: - let jsonSet = json {}; - in jsonSet // { - type = jsonSet.type // { + yaml = {}: { + + generate = name: value: pkgs.runCommand name { + nativeBuildInputs = [ pkgs.remarshal ]; + value = builtins.toJSON value; + passAsFile = [ "value" ]; + } '' + json2yaml "$valuePath" "$out" + ''; + + type = with lib.types; let + valueType = nullOr (oneOf [ + bool + int + float + str + path + (attrsOf valueType) + (listOf valueType) + ]) // { description = "YAML value"; }; - }; + in valueType; + + }; ini = { # Represents lists as duplicate keys diff --git a/third_party/nixpkgs/pkgs/pkgs-lib/tests/formats.nix b/third_party/nixpkgs/pkgs/pkgs-lib/tests/formats.nix index af19f6100e..2bc4e407fe 100644 --- a/third_party/nixpkgs/pkgs/pkgs-lib/tests/formats.nix +++ b/third_party/nixpkgs/pkgs/pkgs-lib/tests/formats.nix @@ -72,21 +72,17 @@ in runBuildTests { path = ./formats.nix; }; expected = '' - { - "attrs": { - "foo": null - }, - "false": false, - "float": 3.141, - "list": [ - null, - null - ], - "null": null, - "path": "${./formats.nix}", - "str": "foo", - "true": true - } + attrs: + foo: null + 'false': false + float: 3.141 + list: + - null + - null + 'null': null + path: ${./formats.nix} + str: foo + 'true': true ''; }; diff --git a/third_party/nixpkgs/pkgs/servers/blockbook/default.nix b/third_party/nixpkgs/pkgs/servers/blockbook/default.nix index 8d75b89d0d..b10f8919af 100644 --- a/third_party/nixpkgs/pkgs/servers/blockbook/default.nix +++ b/third_party/nixpkgs/pkgs/servers/blockbook/default.nix @@ -33,12 +33,11 @@ buildGoModule rec { buildInputs = [ bzip2 lz4 rocksdb snappy zeromq zlib ]; - buildFlagsArray = '' - -ldflags= - -X github.com/trezor/blockbook/common.version=${version} - -X github.com/trezor/blockbook/common.gitcommit=${commit} - -X github.com/trezor/blockbook/common.buildDate=unknown - ''; + ldflags = [ + "-X github.com/trezor/blockbook/common.version=${version}" + "-X github.com/trezor/blockbook/common.gitcommit=${commit}" + "-X github.com/trezor/blockbook/common.buildDate=unknown" + ]; preBuild = lib.optionalString stdenv.isDarwin '' ulimit -n 8192 diff --git a/third_party/nixpkgs/pkgs/servers/cayley/default.nix b/third_party/nixpkgs/pkgs/servers/cayley/default.nix index c9d06d4977..13bf9326c2 100644 --- a/third_party/nixpkgs/pkgs/servers/cayley/default.nix +++ b/third_party/nixpkgs/pkgs/servers/cayley/default.nix @@ -15,10 +15,9 @@ buildGoPackage rec { goDeps = ./deps.nix; - buildFlagsArray = '' - -ldflags= - -X=main.Version=${version} - ''; + ldflags = [ + "-X=main.Version=${version}" + ]; meta = { homepage = "https://cayley.io/"; diff --git a/third_party/nixpkgs/pkgs/servers/dex/default.nix b/third_party/nixpkgs/pkgs/servers/dex/default.nix index 9d577047ee..0f4282699e 100644 --- a/third_party/nixpkgs/pkgs/servers/dex/default.nix +++ b/third_party/nixpkgs/pkgs/servers/dex/default.nix @@ -17,8 +17,8 @@ buildGoModule rec { "cmd/dex" ]; - buildFlagsArray = [ - "-ldflags=-w -s -X github.com/dexidp/dex/version.Version=${src.rev}" + ldflags = [ + "-w" "-s" "-X github.com/dexidp/dex/version.Version=${src.rev}" ]; postInstall = '' diff --git a/third_party/nixpkgs/pkgs/servers/gotify/default.nix b/third_party/nixpkgs/pkgs/servers/gotify/default.nix index d0a3d9c10a..8f3739b4eb 100644 --- a/third_party/nixpkgs/pkgs/servers/gotify/default.nix +++ b/third_party/nixpkgs/pkgs/servers/gotify/default.nix @@ -45,8 +45,8 @@ buildGoModule rec { # produce binaries which panic when executed and are not interesting at all subPackages = [ "." ]; - buildFlagsArray = [ - "-ldflags=-X main.Version=${version} -X main.Mode=prod" + ldflags = [ + "-X main.Version=${version}" "-X main.Mode=prod" ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/servers/hasura/cli.nix b/third_party/nixpkgs/pkgs/servers/hasura/cli.nix index 4338f1bcae..a65d4bb382 100644 --- a/third_party/nixpkgs/pkgs/servers/hasura/cli.nix +++ b/third_party/nixpkgs/pkgs/servers/hasura/cli.nix @@ -13,11 +13,11 @@ buildGoModule rec { doCheck = false; - buildFlagsArray = [''-ldflags= - -X github.com/hasura/graphql-engine/cli/version.BuildVersion=${version} - -s - -w - '']; + ldflags = [ + "-X github.com/hasura/graphql-engine/cli/version.BuildVersion=${version}" + "-s" + "-w" + ]; postInstall = '' mkdir -p $out/share/{bash-completion/completions,zsh/site-functions} diff --git a/third_party/nixpkgs/pkgs/servers/headscale/default.nix b/third_party/nixpkgs/pkgs/servers/headscale/default.nix index 01abc59651..06b2fa867e 100644 --- a/third_party/nixpkgs/pkgs/servers/headscale/default.nix +++ b/third_party/nixpkgs/pkgs/servers/headscale/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "headscale"; - version = "0.6.1"; + version = "0.7.1"; src = fetchFromGitHub { owner = "juanfont"; repo = "headscale"; rev = "v${version}"; - sha256 = "sha256-pzsbCxJ3N30XpjF//02SV6URhA6f6Wz8a6HvGxsK7M4="; + sha256 = "sha256-/mpSIS3UajxFTQm+/Ko6e0hZ8kbPWSNNctaYKaGl8Gs="; }; vendorSha256 = "sha256-ususDOF/LznhK4EInHE7J/ItMjziGfP9Gn8/Q5wd78g="; diff --git a/third_party/nixpkgs/pkgs/servers/home-assistant/component-packages.nix b/third_party/nixpkgs/pkgs/servers/home-assistant/component-packages.nix index 6d91d5fa72..da88c09c5b 100644 --- a/third_party/nixpkgs/pkgs/servers/home-assistant/component-packages.nix +++ b/third_party/nixpkgs/pkgs/servers/home-assistant/component-packages.nix @@ -658,7 +658,7 @@ "profiler" = ps: with ps; [ guppy3 objgraph pyprof2calltree ]; "progettihwsw" = ps: with ps; [ ]; # missing inputs: progettihwsw "proliphix" = ps: with ps; [ ]; # missing inputs: proliphix - "prometheus" = ps: with ps; [ aiohttp-cors prometheus_client ]; + "prometheus" = ps: with ps; [ aiohttp-cors prometheus-client ]; "prosegur" = ps: with ps; [ pyprosegur ]; "prowl" = ps: with ps; [ ]; "proximity" = ps: with ps; [ ]; diff --git a/third_party/nixpkgs/pkgs/servers/home-assistant/default.nix b/third_party/nixpkgs/pkgs/servers/home-assistant/default.nix index 2aea87aff6..7bf04b65c7 100644 --- a/third_party/nixpkgs/pkgs/servers/home-assistant/default.nix +++ b/third_party/nixpkgs/pkgs/servers/home-assistant/default.nix @@ -65,11 +65,6 @@ let }); }) - # Pinned due to bug in ring-doorbell 0.7.0 - # https://github.com/tchellomello/python-ring-doorbell/issues/240 - (mkOverride "ring-doorbell" "0.6.2" - "fbd537722a27b3b854c26506d894b7399bb8dc57ff36083285971227a2d46560") - # Pinned due to API changes in pylast 4.2.1 (mkOverride "pylast" "4.2.0" "0zd0dn2l738ndz62vpa751z0ldnm91dcz9zzbvxv53r08l0s9yf3") diff --git a/third_party/nixpkgs/pkgs/servers/http/pomerium/default.nix b/third_party/nixpkgs/pkgs/servers/http/pomerium/default.nix index ea9628417d..7b28200b28 100644 --- a/third_party/nixpkgs/pkgs/servers/http/pomerium/default.nix +++ b/third_party/nixpkgs/pkgs/servers/http/pomerium/default.nix @@ -25,7 +25,7 @@ buildGoModule rec { "cmd/pomerium-cli" ]; - buildFlagsArray = let + ldflags = let # Set a variety of useful meta variables for stamping the build with. setVars = { Version = "v${version}"; @@ -35,7 +35,7 @@ buildGoModule rec { }; varFlags = concatStringsSep " " (mapAttrsToList (name: value: "-X github.com/pomerium/pomerium/internal/version.${name}=${value}") setVars); in [ - "-ldflags=${varFlags}" + "${varFlags}" ]; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/servers/keycloak/default.nix b/third_party/nixpkgs/pkgs/servers/keycloak/default.nix index f8e9ec33cf..cd8373f084 100644 --- a/third_party/nixpkgs/pkgs/servers/keycloak/default.nix +++ b/third_party/nixpkgs/pkgs/servers/keycloak/default.nix @@ -18,11 +18,11 @@ let in stdenv.mkDerivation rec { pname = "keycloak"; - version = "15.0.1"; + version = "15.0.2"; src = fetchzip { url = "https://github.com/keycloak/keycloak/releases/download/${version}/keycloak-${version}.zip"; - sha256 = "sha256-levWTIO64or3jPejiJzyU0YQqMap5bK6w1EIMmfthD8="; + sha256 = "sha256-GlnSsvAYBjRTtabMVrpWUH0EWEdLIe6ud+HIXJqTsqY="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/servers/maddy/default.nix b/third_party/nixpkgs/pkgs/servers/maddy/default.nix index bc6071bff0..c5fa1b5e67 100644 --- a/third_party/nixpkgs/pkgs/servers/maddy/default.nix +++ b/third_party/nixpkgs/pkgs/servers/maddy/default.nix @@ -13,7 +13,7 @@ buildGoModule rec { vendorSha256 = "sha256-bxKEQaOubjRfLX+dMxVDzLOUInHykUdy9X8wvFE6Va4="; - buildFlagsArray = [ "-ldflags=-s -w -X github.com/foxcpp/maddy.Version=${version}" ]; + ldflags = [ "-s" "-w" "-X github.com/foxcpp/maddy.Version=${version}" ]; subPackages = [ "cmd/maddy" "cmd/maddyctl" ]; diff --git a/third_party/nixpkgs/pkgs/servers/mail/mailhog/default.nix b/third_party/nixpkgs/pkgs/servers/mail/mailhog/default.nix index 0032c4a630..d4c358ec47 100644 --- a/third_party/nixpkgs/pkgs/servers/mail/mailhog/default.nix +++ b/third_party/nixpkgs/pkgs/servers/mail/mailhog/default.nix @@ -13,7 +13,7 @@ buildGoPackage rec { sha256 = "124216850572r1h0ii7ad6jd1cd5czcvkz7k2jzvjb4pv2kl8p3y"; }; - buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ]; + ldflags = [ "-s" "-w" "-X main.version=${version}" ]; meta = with lib; { description = "Web and API based SMTP testing"; diff --git a/third_party/nixpkgs/pkgs/servers/matrix-corporal/default.nix b/third_party/nixpkgs/pkgs/servers/matrix-corporal/default.nix index e489e774be..ae45516877 100644 --- a/third_party/nixpkgs/pkgs/servers/matrix-corporal/default.nix +++ b/third_party/nixpkgs/pkgs/servers/matrix-corporal/default.nix @@ -11,8 +11,8 @@ buildGoModule rec { sha256 = "sha256-u1ppwy+t2ewAH0/+R6e0Ja5A3PQG/lUy2b6kgcMVj8E="; }; - buildFlagsArray = [ - "-ldflags=-s -w -X main.GitCommit=${version} -X main.GitBranch=${version} -X main.GitState=nixpkgs -X main.GitSummary=${version} -X main.Version=${version}" + ldflags = [ + "-s" "-w" "-X main.GitCommit=${version}" "-X main.GitBranch=${version}" "-X main.GitState=nixpkgs" "-X main.GitSummary=${version}" "-X main.Version=${version}" ]; vendorSha256 = "sha256-YmUiGsg2UZfV6SHEPwnbmWPhGQ5teV+we9MBaJyrJr4="; diff --git a/third_party/nixpkgs/pkgs/servers/matrix-synapse/default.nix b/third_party/nixpkgs/pkgs/servers/matrix-synapse/default.nix index 63b79aebe0..f996ebe139 100644 --- a/third_party/nixpkgs/pkgs/servers/matrix-synapse/default.nix +++ b/third_party/nixpkgs/pkgs/servers/matrix-synapse/default.nix @@ -40,7 +40,7 @@ buildPythonApplication rec { netaddr phonenumbers pillow - prometheus_client + prometheus-client psutil psycopg2 pyasn1 diff --git a/third_party/nixpkgs/pkgs/servers/mattermost/default.nix b/third_party/nixpkgs/pkgs/servers/mattermost/default.nix index 6a7ba06df8..14996cecc6 100644 --- a/third_party/nixpkgs/pkgs/servers/mattermost/default.nix +++ b/third_party/nixpkgs/pkgs/servers/mattermost/default.nix @@ -16,10 +16,9 @@ let goPackagePath = "github.com/mattermost/mattermost-server"; - buildFlagsArray = '' - -ldflags= - -X ${goPackagePath}/model.BuildNumber=nixpkgs-${version} - ''; + ldflags = [ + "-X ${goPackagePath}/model.BuildNumber=nixpkgs-${version}" + ]; }; diff --git a/third_party/nixpkgs/pkgs/servers/mautrix-signal/default.nix b/third_party/nixpkgs/pkgs/servers/mautrix-signal/default.nix index 365df2fec6..46f9bcccef 100644 --- a/third_party/nixpkgs/pkgs/servers/mautrix-signal/default.nix +++ b/third_party/nixpkgs/pkgs/servers/mautrix-signal/default.nix @@ -19,7 +19,7 @@ python3.pkgs.buildPythonPackage rec { mautrix phonenumbers pillow - prometheus_client + prometheus-client pycryptodome python-olm python_magic diff --git a/third_party/nixpkgs/pkgs/servers/miniflux/default.nix b/third_party/nixpkgs/pkgs/servers/miniflux/default.nix index f66468b240..fe61e5fc8b 100644 --- a/third_party/nixpkgs/pkgs/servers/miniflux/default.nix +++ b/third_party/nixpkgs/pkgs/servers/miniflux/default.nix @@ -22,9 +22,9 @@ in buildGoModule { go test $(go list ./... | grep -v client) ''; # skip client tests as they require network access - buildFlagsArray = '' - -ldflags=-s -w -X miniflux.app/version.Version=${version} - ''; + ldflags = [ + "-s" "-w" "-X miniflux.app/version.Version=${version}" + ]; postInstall = '' mv $out/bin/miniflux.app $out/bin/miniflux diff --git a/third_party/nixpkgs/pkgs/servers/minio/default.nix b/third_party/nixpkgs/pkgs/servers/minio/default.nix index 56a2850107..9293b4c48f 100644 --- a/third_party/nixpkgs/pkgs/servers/minio/default.nix +++ b/third_party/nixpkgs/pkgs/servers/minio/default.nix @@ -15,16 +15,16 @@ let in buildGoModule rec { pname = "minio"; - version = "2021-08-20T18-32-01Z"; + version = "2021-08-25T00-41-18Z"; src = fetchFromGitHub { owner = "minio"; repo = "minio"; rev = "RELEASE.${version}"; - sha256 = "sha256-Ij0QExsCtEtVOI1Zd0YC46y2ACp/mdE07VNIBRVi4/8="; + sha256 = "sha256-gwP1q+5vjgCnrnvWTxPC66fugVrilC1WbLk3SP4NXqA="; }; - vendorSha256 = "sha256-Nr2zpIgqinUvxV9xW8UuZRnrIvCe3pWTe3qE2UtUyzc="; + vendorSha256 = "sha256-JcgMJ6xz3h3YJ1zoSJLCWdWGmd12MPvxcIPX1ZbhpaM="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/servers/misc/gobgpd/default.nix b/third_party/nixpkgs/pkgs/servers/misc/gobgpd/default.nix index 0a09293226..75bc9f8e60 100644 --- a/third_party/nixpkgs/pkgs/servers/misc/gobgpd/default.nix +++ b/third_party/nixpkgs/pkgs/servers/misc/gobgpd/default.nix @@ -17,10 +17,9 @@ buildGoModule rec { export CGO_ENABLED=0 ''; - buildFlagsArray = '' - -ldflags= - -s -w -extldflags '-static' - ''; + ldflags = [ + "-s" "-w" "-extldflags '-static'" + ]; subPackages = [ "cmd/gobgpd" ]; diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/alertmanager-irc-relay/default.nix b/third_party/nixpkgs/pkgs/servers/monitoring/alertmanager-irc-relay/default.nix index f5d4f6ca88..5a2fcc4a89 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/alertmanager-irc-relay/default.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/alertmanager-irc-relay/default.nix @@ -13,7 +13,7 @@ buildGoModule rec { vendorSha256 = "sha256-VLG15IXS/fXFMTCJKEqGW6qZ9aOLPhazidVsOywG+w4="; - buildFlagsArray = [ "-ldflags=-s -w" ]; + ldflags = [ "-s" "-w" ]; meta = with lib; { description = "Alertmanager IRC Relay is a bot relaying Prometheus alerts to IRC"; diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/cadvisor/default.nix b/third_party/nixpkgs/pkgs/servers/monitoring/cadvisor/default.nix index 8501aa5e02..2db3cd0844 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/cadvisor/default.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/cadvisor/default.nix @@ -15,7 +15,7 @@ buildGoModule rec { vendorSha256 = "sha256-FMO+wNmjFFD9+/9mhNcyZftk8ryhwFXDZeEy/h5EMWc="; - buildFlagsArray = [ "-ldflags=-s -w -X github.com/google/cadvisor/version.Version=${version}" ]; + ldflags = [ "-s" "-w" "-X github.com/google/cadvisor/version.Version=${version}" ]; postInstall = '' mv $out/bin/{cmd,cadvisor} diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/do-agent/default.nix b/third_party/nixpkgs/pkgs/servers/monitoring/do-agent/default.nix index d6e3accdf4..5f70bf702a 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/do-agent/default.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/do-agent/default.nix @@ -11,10 +11,9 @@ buildGoModule rec { sha256 = "sha256-boEgCC3uWvJvb6VKpNhh6vHCfeE7oun5oneI2ITKh9g="; }; - buildFlagsArray = '' - -ldflags= - -X main.version=${version} - ''; + ldflags = [ + "-X main.version=${version}" + ]; vendorSha256 = null; diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/grafana/default.nix b/third_party/nixpkgs/pkgs/servers/monitoring/grafana/default.nix index 56f8b30fbb..996637f51b 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/grafana/default.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/grafana/default.nix @@ -43,9 +43,9 @@ buildGoModule rec { rm -r scripts/go ''; - buildFlagsArray = '' - -ldflags=-s -w -X main.version=${version} - ''; + ldflags = [ + "-s" "-w" "-X main.version=${version}" + ]; postInstall = '' tar -xvf $srcStatic diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/mackerel-agent/default.nix b/third_party/nixpkgs/pkgs/servers/monitoring/mackerel-agent/default.nix index d8987f9e5a..21776c352a 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/mackerel-agent/default.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/mackerel-agent/default.nix @@ -19,11 +19,10 @@ buildGoModule rec { subPackages = [ "." ]; - buildFlagsArray = '' - -ldflags= - -X=main.version=${version} - -X=main.gitcommit=v${version} - ''; + ldflags = [ + "-X=main.version=${version}" + "-X=main.gitcommit=v${version}" + ]; postInstall = '' wrapProgram $out/bin/mackerel-agent \ diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/mtail/default.nix b/third_party/nixpkgs/pkgs/servers/monitoring/mtail/default.nix index c0a7e1129a..e5a3179a86 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/mtail/default.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/mtail/default.nix @@ -21,8 +21,8 @@ buildGoModule rec { go generate -x ./internal/vm/ ''; - buildFlagsArray = [ - "-ldflags=-X main.Version=${version}" + ldflags = [ + "-X main.Version=${version}" ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/alertmanager.nix b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/alertmanager.nix index bc3cf7539e..251c977bd4 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/alertmanager.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/alertmanager.nix @@ -14,15 +14,14 @@ buildGoPackage rec { sha256 = "0zrzyaqs73pz4rmj4xaj15x4n1542m0nb7jqm2j77k07j75r5w41"; }; - buildFlagsArray = let t = "${goPackagePath}/vendor/github.com/prometheus/common/version"; in '' - -ldflags= - -X ${t}.Version=${version} - -X ${t}.Revision=${src.rev} - -X ${t}.Branch=unknown - -X ${t}.BuildUser=nix@nixpkgs - -X ${t}.BuildDate=unknown - -X ${t}.GoVersion=${lib.getVersion go} - ''; + ldflags = let t = "${goPackagePath}/vendor/github.com/prometheus/common/version"; in [ + "-X ${t}.Version=${version}" + "-X ${t}.Revision=${src.rev}" + "-X ${t}.Branch=unknown" + "-X ${t}.BuildUser=nix@nixpkgs" + "-X ${t}.BuildDate=unknown" + "-X ${t}.GoVersion=${lib.getVersion go}" + ]; nativeBuildInputs = [ installShellFiles ]; diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/artifactory-exporter.nix b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/artifactory-exporter.nix index 5e7d386d7e..a91a267bb2 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/artifactory-exporter.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/artifactory-exporter.nix @@ -16,14 +16,13 @@ buildGoModule rec { subPackages = [ "." ]; - buildFlagsArray = '' - -ldflags= - -s -w - -X github.com/prometheus/common/version.Version=${version} - -X github.com/prometheus/common/version.Revision=${rev} - -X github.com/prometheus/common/version.Branch=master - -X github.com/prometheus/common/version.BuildDate=19700101-00:00:00 - ''; + ldflags = [ + "-s" "-w" + "-X github.com/prometheus/common/version.Version=${version}" + "-X github.com/prometheus/common/version.Revision=${rev}" + "-X github.com/prometheus/common/version.Branch=master" + "-X github.com/prometheus/common/version.BuildDate=19700101-00:00:00" + ]; passthru.tests = { inherit (nixosTests.prometheus-exporters) artifactory; }; diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/bitcoin-exporter.nix b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/bitcoin-exporter.nix index 333be37321..f2d50fe850 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/bitcoin-exporter.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/bitcoin-exporter.nix @@ -22,7 +22,7 @@ python3Packages.buildPythonApplication rec { }) ]; - propagatedBuildInputs = with python3Packages; [ prometheus_client bitcoinlib riprova ]; + propagatedBuildInputs = with python3Packages; [ prometheus-client bitcoinlib riprova ]; installPhase = '' mkdir -p $out/bin diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/kea-exporter.nix b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/kea-exporter.nix index 1f5ff7c022..98df8861e8 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/kea-exporter.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/kea-exporter.nix @@ -11,7 +11,7 @@ python3Packages.buildPythonApplication rec { propagatedBuildInputs = with python3Packages; [ click - prometheus_client + prometheus-client ]; checkPhase = '' diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/knot-exporter.nix b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/knot-exporter.nix index bb9aaf5879..f0b6055f2b 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/knot-exporter.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/knot-exporter.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { install -Dm0755 knot_exporter $out/bin/knot_exporter patchShebangs $out/bin - buildPythonPath ${python3.pkgs.prometheus_client} + buildPythonPath ${python3.pkgs.prometheus-client} patchPythonScript $out/bin/knot_exporter runHook postInstall diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/mysqld-exporter.nix b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/mysqld-exporter.nix index e31800f43c..894fbd1ab3 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/mysqld-exporter.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/mysqld-exporter.nix @@ -14,14 +14,14 @@ buildGoModule rec { vendorSha256 = "19785rfzlx8h0h8vmg0ghd40h3p4y6ikhgf8rd2qfj5f6qxfhrgv"; - buildFlagsArray = let t = "github.com/prometheus/common/version"; in '' - -ldflags= - -s -w -X ${t}.Version=${version} - -X ${t}.Revision=${rev} - -X ${t}.Branch=unknown - -X ${t}.BuildUser=nix@nixpkgs - -X ${t}.BuildDate=unknown - ''; + ldflags = let t = "github.com/prometheus/common/version"; in [ + "-s" "-w" + "-X ${t}.Version=${version}" + "-X ${t}.Revision=${rev}" + "-X ${t}.Branch=unknown" + "-X ${t}.BuildUser=nix@nixpkgs" + "-X ${t}.BuildDate=unknown" + ]; # skips tests with external dependencies, e.g. on mysqld checkFlags = [ "-short" ]; diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/nginx-exporter.nix b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/nginx-exporter.nix index 6520625619..8b39915193 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/nginx-exporter.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/nginx-exporter.nix @@ -6,8 +6,8 @@ buildGoPackage rec { goPackagePath = "github.com/nginxinc/nginx-prometheus-exporter"; - buildFlagsArray = [ - "-ldflags=" "-X main.version=${version}" + ldflags = [ + "-X main.version=${version}" ]; src = fetchFromGitHub { diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/openldap-exporter.nix b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/openldap-exporter.nix index a439c84bca..84cb7a62f2 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/openldap-exporter.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/openldap-exporter.nix @@ -11,12 +11,11 @@ buildGoPackage rec { sha256 = "sha256-G4bTYFm1Zh+7gfSIZnfrPyQ15967ebEzl33pgZu23D4="; }; - buildFlagsArray = '' - -ldflags= - -s -w - -X github.com/tomcz/openldap_exporter.tag=v${version} - -X github.com/tomcz/openldap_exporter.commit=unknown - ''; + ldflags = [ + "-s" "-w" + "-X github.com/tomcz/openldap_exporter.tag=v${version}" + "-X github.com/tomcz/openldap_exporter.commit=unknown" + ]; goPackagePath = "github.com/tomcz/openldap_exporter"; diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/promscale.nix b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/promscale.nix index 0727616de3..546bfbb7e2 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/promscale.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/promscale.nix @@ -16,7 +16,7 @@ buildGoModule rec { vendorSha256 = "sha256-DFDTYT7UK1cYwGeCgeQcJmrCoqGPDzicusRPPUbH0Gs="; - buildFlagsArray = [ "-ldflags=-s -w -X github.com/timescale/promscale/pkg/version.Version=${version} -X github.com/timescale/promscale/pkg/version.CommitHash=${src.rev}" ]; + ldflags = [ "-s" "-w" "-X github.com/timescale/promscale/pkg/version.Version=${version}" "-X github.com/timescale/promscale/pkg/version.CommitHash=${src.rev}" ]; doCheck = false; # Requires access to a docker daemon doInstallCheck = true; diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/pushgateway.nix b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/pushgateway.nix index 0bdb0680ae..f14ceec44e 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/pushgateway.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/pushgateway.nix @@ -17,15 +17,14 @@ buildGoPackage rec { buildUser = "nix@nixpkgs"; buildDate = "19700101-00:00:00"; - buildFlagsArray = '' - -ldflags= - -X github.com/prometheus/pushgateway/vendor/github.com/prometheus/common/version.Version=${version} - -X github.com/prometheus/pushgateway/vendor/github.com/prometheus/common/version.Revision=${rev} - -X github.com/prometheus/pushgateway/vendor/github.com/prometheus/common/version.Branch=${rev} - -X github.com/prometheus/pushgateway/vendor/github.com/prometheus/common/version.BuildUser=${buildUser} - -X github.com/prometheus/pushgateway/vendor/github.com/prometheus/common/version.BuildDate=${buildDate} - -X main.goVersion=${lib.getVersion go} - ''; + ldflags = [ + "-X github.com/prometheus/pushgateway/vendor/github.com/prometheus/common/version.Version=${version}" + "-X github.com/prometheus/pushgateway/vendor/github.com/prometheus/common/version.Revision=${rev}" + "-X github.com/prometheus/pushgateway/vendor/github.com/prometheus/common/version.Branch=${rev}" + "-X github.com/prometheus/pushgateway/vendor/github.com/prometheus/common/version.BuildUser=${buildUser}" + "-X github.com/prometheus/pushgateway/vendor/github.com/prometheus/common/version.BuildDate=${buildDate}" + "-X main.goVersion=${lib.getVersion go}" + ]; doInstallCheck = true; installCheckPhase = '' diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/redis-exporter.nix b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/redis-exporter.nix index a2636d9f71..e87c6354ae 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/redis-exporter.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/redis-exporter.nix @@ -13,12 +13,11 @@ buildGoModule rec { vendorSha256 = "11237959ikd7l5glkhfz0g55mbld2hq985b5crwb9bnimaly5lga"; - buildFlagsArray = '' - -ldflags= - -X main.BuildVersion=${version} - -X main.BuildCommitSha=unknown - -X main.BuildDate=unknown - ''; + ldflags = [ + "-X main.BuildVersion=${version}" + "-X main.BuildCommitSha=unknown" + "-X main.BuildDate=unknown" + ]; # needs a redis server doCheck = false; diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/smokeping-prober.nix b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/smokeping-prober.nix index b998e1d24c..8b1cbb962a 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/smokeping-prober.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/smokeping-prober.nix @@ -8,7 +8,7 @@ buildGoModule rec { pname = "smokeping_prober"; version = "${baseVersion}-g${commit}"; - buildFlagsArray = let + ldflags = let setVars = { Version = baseVersion; Revision = commit; @@ -17,7 +17,7 @@ buildGoModule rec { }; varFlags = lib.concatStringsSep " " (lib.mapAttrsToList (name: value: "-X github.com/prometheus/common/version.${name}=${value}") setVars); in [ - "-ldflags=${varFlags} -s -w" + "${varFlags}" "-s" "-w" ]; src = fetchFromGitHub { diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/tor-exporter.nix b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/tor-exporter.nix index 663b532c8f..fcfe87806e 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/tor-exporter.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/tor-exporter.nix @@ -14,7 +14,7 @@ python3Packages.buildPythonApplication rec { sha256 = "1gzf42z0cgdqijbi9cwpjkqzkvnabaxkkfa5ac5h27r3pxx3q4n0"; }; - propagatedBuildInputs = with python3Packages; [ prometheus_client stem retrying ]; + propagatedBuildInputs = with python3Packages; [ prometheus-client stem retrying ]; installPhase = '' mkdir -p $out/share/ diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/xmpp-alerts.nix b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/xmpp-alerts.nix index ddffc9c55d..97593cecca 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/xmpp-alerts.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/xmpp-alerts.nix @@ -20,7 +20,7 @@ python3Packages.buildPythonApplication rec { ] ++ (with python3Packages; [ aiohttp slixmpp - prometheus_client + prometheus-client pyyaml ]); diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/sensu-go/default.nix b/third_party/nixpkgs/pkgs/servers/monitoring/sensu-go/default.nix index 881d677b3e..23294dfb88 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/sensu-go/default.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/sensu-go/default.nix @@ -20,13 +20,12 @@ let doCheck = false; - buildFlagsArray = let + ldflags = let versionPkg = "github.com/sensu/sensu-go/version"; - in '' - -ldflags= - -X ${versionPkg}.Version=${version} - -X ${versionPkg}.BuildSHA=${shortRev} - ''; + in [ + "-X ${versionPkg}.Version=${version}" + "-X ${versionPkg}.BuildSHA=${shortRev}" + ]; meta = { homepage = "https://sensu.io"; diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/thanos/default.nix b/third_party/nixpkgs/pkgs/servers/monitoring/thanos/default.nix index ac19ddda79..fef179945b 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/thanos/default.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/thanos/default.nix @@ -1,29 +1,28 @@ { lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { pname = "thanos"; - version = "0.19.0"; + version = "0.22.0"; src = fetchFromGitHub { rev = "v${version}"; owner = "thanos-io"; repo = "thanos"; - sha256 = "sha256-FryVKOabokw2+RyD94QLVpC9ZGIHPuSXZf5H+eitj80="; + sha256 = "sha256-3jEPfYRewuXTk39sfp6MFKu0LYCzj/VEQTJVUUSkbZk="; }; - vendorSha256 = "sha256-GBjPMZ6BwUOKywNf1Bc2WeA14qvKQ0R5gWvVxgO/7Lo="; + vendorSha256 = "sha256-rXfYlrTm0Av9Sxq+jdxsxIDvJQIo3rcBTydtiXnifTw="; doCheck = false; subPackages = "cmd/thanos"; - buildFlagsArray = let t = "github.com/prometheus/common/version"; in '' - -ldflags= - -X ${t}.Version=${version} - -X ${t}.Revision=unknown - -X ${t}.Branch=unknown - -X ${t}.BuildUser=nix@nixpkgs - -X ${t}.BuildDate=unknown - ''; + ldflags = let t = "github.com/prometheus/common/version"; in [ + "-X ${t}.Version=${version}" + "-X ${t}.Revision=unknown" + "-X ${t}.Branch=unknown" + "-X ${t}.BuildUser=nix@nixpkgs" + "-X ${t}.BuildDate=unknown" + ]; meta = with lib; { description = "Highly available Prometheus setup with long term storage capabilities"; diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/unifi-poller/default.nix b/third_party/nixpkgs/pkgs/servers/monitoring/unifi-poller/default.nix index 992a92a273..745cfdd345 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/unifi-poller/default.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/unifi-poller/default.nix @@ -13,13 +13,13 @@ buildGoModule rec { vendorSha256 = "sha256-LOBkdyfsw7ua6TsLglO5jdR9NWo5Df8rnQ8MH+eIz4g="; - buildFlagsArray = '' - -ldflags=-w -s - -X github.com/prometheus/common/version.Branch=master - -X github.com/prometheus/common/version.BuildDate=unknown - -X github.com/prometheus/common/version.Revision=${src.rev} - -X github.com/prometheus/common/version.Version=${version}-0 - ''; + ldflags = [ + "-w" "-s" + "-X github.com/prometheus/common/version.Branch=master" + "-X github.com/prometheus/common/version.BuildDate=unknown" + "-X github.com/prometheus/common/version.Revision=${src.rev}" + "-X github.com/prometheus/common/version.Version=${version}-0" + ]; meta = with lib; { description = "Collect ALL UniFi Controller, Site, Device & Client Data - Export to InfluxDB or Prometheus"; diff --git a/third_party/nixpkgs/pkgs/servers/nosql/influxdb/default.nix b/third_party/nixpkgs/pkgs/servers/nosql/influxdb/default.nix index df3e116ab7..4f10beda85 100644 --- a/third_party/nixpkgs/pkgs/servers/nosql/influxdb/default.nix +++ b/third_party/nixpkgs/pkgs/servers/nosql/influxdb/default.nix @@ -15,7 +15,7 @@ buildGoModule rec { doCheck = false; - buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ]; + ldflags = [ "-s" "-w" "-X main.version=${version}" ]; excludedPackages = "test"; diff --git a/third_party/nixpkgs/pkgs/servers/nosql/victoriametrics/default.nix b/third_party/nixpkgs/pkgs/servers/nosql/victoriametrics/default.nix index 12ad703751..4ef8fe9575 100644 --- a/third_party/nixpkgs/pkgs/servers/nosql/victoriametrics/default.nix +++ b/third_party/nixpkgs/pkgs/servers/nosql/victoriametrics/default.nix @@ -13,7 +13,7 @@ buildGoModule rec { vendorSha256 = null; - buildFlagsArray = [ "-ldflags=-s -w -X github.com/VictoriaMetrics/VictoriaMetrics/lib/buildinfo.Version=${version}" ]; + ldflags = [ "-s" "-w" "-X github.com/VictoriaMetrics/VictoriaMetrics/lib/buildinfo.Version=${version}" ]; passthru.tests = { inherit (nixosTests) victoriametrics; }; diff --git a/third_party/nixpkgs/pkgs/servers/oauth2-proxy/default.nix b/third_party/nixpkgs/pkgs/servers/oauth2-proxy/default.nix index a5aee60d8b..dfc1756b37 100644 --- a/third_party/nixpkgs/pkgs/servers/oauth2-proxy/default.nix +++ b/third_party/nixpkgs/pkgs/servers/oauth2-proxy/default.nix @@ -14,7 +14,7 @@ buildGoModule rec { vendorSha256 = "sha256-kclpoZ33JOciP2IUCQZB5idA7rgbWxPPFNwZU+pEJFU="; # Taken from https://github.com/oauth2-proxy/oauth2-proxy/blob/master/Makefile - buildFlagsArray = ("-ldflags=-X main.VERSION=${version}"); + ldflags = [ "-X main.VERSION=${version}" ]; meta = with lib; { description = "A reverse proxy that provides authentication with Google, Github, or other providers"; diff --git a/third_party/nixpkgs/pkgs/servers/ombi/default.nix b/third_party/nixpkgs/pkgs/servers/ombi/default.nix index e5e37321d5..0be7a3f009 100644 --- a/third_party/nixpkgs/pkgs/servers/ombi/default.nix +++ b/third_party/nixpkgs/pkgs/servers/ombi/default.nix @@ -10,14 +10,14 @@ let "Unsupported system: ${stdenv.hostPlatform.system}"); hash = { - x64-linux_hash = "sha256-LRScuJVI3/657RYZjY9I3rcmANaEaw48CWIYc0VWHs4="; - arm64-linux_hash = "sha256-k0wi8FlVnU60Cnsng6CNNfoP+UItFLj15OxsqAfkO+4="; - x64-osx_hash = "sha256-czcPj+PC4cfJMqYYZyVy1ReO8pqYFUqeV8o/moHuCRw="; + x64-linux_hash = "sha256-4kvcBRMMH4AnTKSES5Cpst/omTRXVRq1V1y/z5njKJI="; + arm64-linux_hash = "sha256-NLsf0ldvlKSrHJyAXv5Ar2zIetoga6iZPOGTxFOqoQQ="; + x64-osx_hash = "sha256-tjvGuShz/fv3qUknFVKJ+tE/bVtIyPZ7dr4JfTEcDJY="; }."${arch}-${os}_hash"; in stdenv.mkDerivation rec { pname = "ombi"; - version = "4.0.1430"; + version = "4.0.1468"; sourceRoot = "."; diff --git a/third_party/nixpkgs/pkgs/servers/pg_featureserv/default.nix b/third_party/nixpkgs/pkgs/servers/pg_featureserv/default.nix index fd31d728a3..9a4fd07133 100644 --- a/third_party/nixpkgs/pkgs/servers/pg_featureserv/default.nix +++ b/third_party/nixpkgs/pkgs/servers/pg_featureserv/default.nix @@ -13,7 +13,7 @@ buildGoModule rec { vendorSha256 = "1jqrkx850ghmpnfjhqky93r8fq7q63m5ivs0lzljzbvn7ya75f2r"; - buildFlagsArray = [ "-ldflags=-s -w -X github.com/CrunchyData/pg_featureserv/conf.setVersion=${version}" ]; + ldflags = [ "-s" "-w" "-X github.com/CrunchyData/pg_featureserv/conf.setVersion=${version}" ]; meta = with lib; { description = "Lightweight RESTful Geospatial Feature Server for PostGIS in Go"; diff --git a/third_party/nixpkgs/pkgs/servers/pg_tileserv/default.nix b/third_party/nixpkgs/pkgs/servers/pg_tileserv/default.nix index b7f1fa0c1c..a380af0311 100644 --- a/third_party/nixpkgs/pkgs/servers/pg_tileserv/default.nix +++ b/third_party/nixpkgs/pkgs/servers/pg_tileserv/default.nix @@ -13,7 +13,7 @@ buildGoModule rec { vendorSha256 = "sha256-qdlh9H039GwKTxOhx+dzyUHkzJbaOeuguKnBOyAPe/E="; - buildFlagsArray = [ "-ldflags=-s -w -X main.programVersion=${version}" ]; + ldflags = [ "-s" "-w" "-X main.programVersion=${version}" ]; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/servers/reproxy/default.nix b/third_party/nixpkgs/pkgs/servers/reproxy/default.nix index 0d25b42678..25fb5268c1 100644 --- a/third_party/nixpkgs/pkgs/servers/reproxy/default.nix +++ b/third_party/nixpkgs/pkgs/servers/reproxy/default.nix @@ -27,8 +27,8 @@ buildGoModule rec { vendorSha256 = null; - buildFlagsArray = [ - "-ldflags=-s -w -X main.revision=${version}" + ldflags = [ + "-s" "-w" "-X main.revision=${version}" ]; installPhase = '' diff --git a/third_party/nixpkgs/pkgs/servers/rtsp-simple-server/default.nix b/third_party/nixpkgs/pkgs/servers/rtsp-simple-server/default.nix index 58b5658512..c6897167ce 100644 --- a/third_party/nixpkgs/pkgs/servers/rtsp-simple-server/default.nix +++ b/third_party/nixpkgs/pkgs/servers/rtsp-simple-server/default.nix @@ -19,10 +19,10 @@ buildGoModule rec { # Tests need docker doCheck = false; - buildFlagsArray = [ - # In the future, we might need to switch to `main.Version`, considering: - # https://github.com/aler9/rtsp-simple-server/issues/503 - "-ldflags=-X github.com/aler9/rtsp-simple-server/internal/core.version=v${version}" + # In the future, we might need to switch to `main.Version`, considering: + # https://github.com/aler9/rtsp-simple-server/issues/503 + ldflags = [ + "-X github.com/aler9/rtsp-simple-server/internal/core.version=v${version}" ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/servers/tegola/default.nix b/third_party/nixpkgs/pkgs/servers/tegola/default.nix index 5e3aa2d0ef..d94f97baf8 100644 --- a/third_party/nixpkgs/pkgs/servers/tegola/default.nix +++ b/third_party/nixpkgs/pkgs/servers/tegola/default.nix @@ -13,7 +13,7 @@ buildGoPackage rec { sha256 = "sha256-NA2KwyhLLIusf6a6v+OcmHz91kPcIhvG9PRmRk8h+fQ="; }; - buildFlagsArray = [ "-ldflags=-s -w -X ${goPackagePath}/cmd/tegola/cmd.Version=${version}" ]; + ldflags = [ "-s" "-w" "-X ${goPackagePath}/cmd/tegola/cmd.Version=${version}" ]; excludedPackages = [ "example" ]; diff --git a/third_party/nixpkgs/pkgs/servers/teleport/default.nix b/third_party/nixpkgs/pkgs/servers/teleport/default.nix index 97c8568e40..05094045fd 100644 --- a/third_party/nixpkgs/pkgs/servers/teleport/default.nix +++ b/third_party/nixpkgs/pkgs/servers/teleport/default.nix @@ -10,14 +10,14 @@ let in buildGoModule rec { pname = "teleport"; - version = "7.0.2"; + version = "7.0.3"; # This repo has a private submodule "e" which fetchgit cannot handle without failing. src = fetchFromGitHub { owner = "gravitational"; repo = "teleport"; rev = "v${version}"; - sha256 = "sha256-Sj7WQRgEiU5G/MDKFtEy/KJ2g0WENxbCnMA9CNcTUaY="; + sha256 = "sha256-pWe4n/HilieUYfoO0OElC9ccMaTOaMcVadUfWUJJGhk="; }; vendorSha256 = null; diff --git a/third_party/nixpkgs/pkgs/servers/tvheadend/default.nix b/third_party/nixpkgs/pkgs/servers/tvheadend/default.nix index 98a40766d7..6c853b1ccc 100644 --- a/third_party/nixpkgs/pkgs/servers/tvheadend/default.nix +++ b/third_party/nixpkgs/pkgs/servers/tvheadend/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, cmake, makeWrapper, pkg-config -, avahi, dbus, gettext, git, gnutar, gzip, bzip2, ffmpeg_3, libiconv, openssl, python +, avahi, dbus, gettext, git, gnutar, gzip, bzip2, ffmpeg_4, libiconv, openssl, python , v4l-utils, which, zlib }: let @@ -29,7 +29,7 @@ in stdenv.mkDerivation { }; buildInputs = [ - avahi dbus gettext git gnutar gzip bzip2 ffmpeg_3 libiconv openssl python + avahi dbus gettext git gnutar gzip bzip2 ffmpeg_4 libiconv openssl python which zlib ]; diff --git a/third_party/nixpkgs/pkgs/servers/web-apps/matomo/default.nix b/third_party/nixpkgs/pkgs/servers/web-apps/matomo/default.nix index 9a0a1bed0c..673b5bbc3b 100644 --- a/third_party/nixpkgs/pkgs/servers/web-apps/matomo/default.nix +++ b/third_party/nixpkgs/pkgs/servers/web-apps/matomo/default.nix @@ -3,16 +3,16 @@ let versions = { matomo = { - version = "4.3.1"; - sha256 = "Ve4P1cVV/uZ59BcQaUZLTTOwpjX7veof9jR0l3Y9xOQ="; + version = "4.4.1"; + sha256 = "0y8ljdj97znvd3hkkr7s6s9k8m93agw3z9cfw1azzaxgc46akfcl"; }; matomo-beta = { - version = "4.3.1"; + version = "4.4.1"; # `beta` examples: "b1", "rc1", null # TOOD when updating: use null if stable version is >= latest beta or release candidate beta = null; - sha256 = "Ve4P1cVV/uZ59BcQaUZLTTOwpjX7veof9jR0l3Y9xOQ="; + sha256 = "0y8ljdj97znvd3hkkr7s6s9k8m93agw3z9cfw1azzaxgc46akfcl"; }; }; common = pname: { version, sha256, beta ? null }: @@ -102,7 +102,7 @@ let license = licenses.gpl3Plus; homepage = "https://matomo.org/"; platforms = platforms.all; - maintainers = with maintainers; [ florianjacob kiwi ]; + maintainers = with maintainers; [ florianjacob kiwi sebbel ]; }; }; in diff --git a/third_party/nixpkgs/pkgs/servers/xandikos/default.nix b/third_party/nixpkgs/pkgs/servers/xandikos/default.nix index b29151911a..acf96d008f 100644 --- a/third_party/nixpkgs/pkgs/servers/xandikos/default.nix +++ b/third_party/nixpkgs/pkgs/servers/xandikos/default.nix @@ -22,7 +22,7 @@ python3Packages.buildPythonApplication rec { icalendar jinja2 multidict - prometheus_client + prometheus-client ]; passthru.tests.xandikos = nixosTests.xandikos; diff --git a/third_party/nixpkgs/pkgs/shells/bash/bash-5.1-patches.nix b/third_party/nixpkgs/pkgs/shells/bash/bash-5.1-patches.nix index b834deda0f..aa5ad75fbc 100644 --- a/third_party/nixpkgs/pkgs/shells/bash/bash-5.1-patches.nix +++ b/third_party/nixpkgs/pkgs/shells/bash/bash-5.1-patches.nix @@ -5,4 +5,8 @@ patch: [ (patch "002" "1gjx9zqcm407am3n2sh44b8dxm48kgm15rzfiijqxr01m0hn3shm") (patch "003" "1cdnpbfc64yhvkjj4d12s9ywp11g195vzfl1cab24sq55wkcrwi2") (patch "004" "11iwhy6v562bv0kk7lwj7f5jj65ma9bblivy0v02h3ggcibbdbls") +(patch "005" "19bdyigdr81824nxvqr6a7k0cax60wq7376j6b91afbnwvlvbjyc") +(patch "006" "051x8wlwrqk0yr0zg378vh824iklfl5g9pkmcdf62qp8gn9pvqbm") +(patch "007" "0fir80pp1gmlpadmqcgkrv4y119pc7xllchjzg05fd7px73viz5c") +(patch "008" "1lfjgshk8i9vch92p5wgc9r90j3phw79aa7gbai89w183b2z6b7j") ] diff --git a/third_party/nixpkgs/pkgs/shells/bash/update-patch-set.sh b/third_party/nixpkgs/pkgs/shells/bash/update-patch-set.sh index cb4f372f54..03b0022882 100755 --- a/third_party/nixpkgs/pkgs/shells/bash/update-patch-set.sh +++ b/third_party/nixpkgs/pkgs/shells/bash/update-patch-set.sh @@ -1,11 +1,11 @@ #!/usr/bin/env nix-shell -#!nix-shell --pure -i bash -p wget -p gnupg -p cacert +#!nix-shell --pure -i bash -p wget -p gnupg -p cacert -p nix # Update patch set for GNU Bash or Readline. if [ $# -ne 2 ] then - echo "Usage: $(basename $0) PROJECT VERSION" + echo "Usage: $(basename "$0") PROJECT VERSION" echo "" echo "Update the patch set for PROJECT (one of \`bash' or \`readline') for" echo "the given version (e.g., \`4.0'). Produce \`PROJECT-patches.nix'." @@ -14,14 +14,12 @@ fi PROJECT="$1" VERSION="$2" -VERSION_CONDENSED="$(echo $VERSION | sed -es/\\.//g)" -PATCH_LIST="$PROJECT-$VERSION-patches.nix" +DIR=$(dirname "$0") +VERSION_CONDENSED="$(echo "$VERSION" | sed -es/\\.//g)" +PATCH_LIST="$DIR/$PROJECT-$VERSION-patches.nix" set -e -start=1 -end=100 # must be > 99 for correct padding - rm -vf "$PATCH_LIST" wget "https://tiswww.case.edu/php/chet/gpgkey.asc" @@ -35,18 +33,20 @@ rm gpgkey.asc{,.md5} echo "patch: [" ) \ >> "$PATCH_LIST" -for i in `seq -w $start $end` +for i in {001..100} do - wget ftp.gnu.org/gnu/$PROJECT/$PROJECT-$VERSION-patches/$PROJECT$VERSION_CONDENSED-$i || break - wget ftp.gnu.org/gnu/$PROJECT/$PROJECT-$VERSION-patches/$PROJECT$VERSION_CONDENSED-$i.sig - gpg --verify $PROJECT$VERSION_CONDENSED-$i.sig - echo "(patch \"$i\" \"$(nix-hash --flat --type sha256 --base32 $PROJECT$VERSION_CONDENSED-$i)\")" \ + wget -P "$DIR" "ftp.gnu.org/gnu/$PROJECT/$PROJECT-$VERSION-patches/$PROJECT$VERSION_CONDENSED-$i" || break + wget -P "$DIR" "ftp.gnu.org/gnu/$PROJECT/$PROJECT-$VERSION-patches/$PROJECT$VERSION_CONDENSED-$i.sig" + gpg --verify "$DIR/$PROJECT$VERSION_CONDENSED-$i.sig" + hash=$(nix-hash --flat --type sha256 --base32 "$DIR/$PROJECT$VERSION_CONDENSED-$i") + echo "(patch \"$i\" \"$hash\")" \ >> "$PATCH_LIST" - rm -f $PROJECT$VERSION_CONDENSED-$i{,.sig} + rm -f "$DIR/$PROJECT$VERSION_CONDENSED-$i"{,.sig} done echo "]" >> "$PATCH_LIST" -echo "Got $(expr $i - 1) patches." +# bash interprets numbers starting with 0 as octals +echo "Got $((10#$i - 1)) patches." echo "Patch list has been written to \`$PATCH_LIST'." diff --git a/third_party/nixpkgs/pkgs/shells/elvish/default.nix b/third_party/nixpkgs/pkgs/shells/elvish/default.nix index 6ef08992f9..0916c9b25b 100644 --- a/third_party/nixpkgs/pkgs/shells/elvish/default.nix +++ b/third_party/nixpkgs/pkgs/shells/elvish/default.nix @@ -6,7 +6,7 @@ buildGoModule rec { excludedPackages = [ "website" ]; - buildFlagsArray = [ "-ldflags=-s -w -X github.com/elves/elvish/pkg/buildinfo.Version==${version} -X github.com/elves/elvish/pkg/buildinfo.Reproducible=true" ]; + ldflags = [ "-s" "-w" "-X github.com/elves/elvish/pkg/buildinfo.Version==${version}" "-X github.com/elves/elvish/pkg/buildinfo.Reproducible=true" ]; src = fetchFromGitHub { owner = "elves"; diff --git a/third_party/nixpkgs/pkgs/shells/nushell/default.nix b/third_party/nixpkgs/pkgs/shells/nushell/default.nix index eb3d61dc66..eaddb0f56d 100644 --- a/third_party/nixpkgs/pkgs/shells/nushell/default.nix +++ b/third_party/nixpkgs/pkgs/shells/nushell/default.nix @@ -18,16 +18,16 @@ rustPlatform.buildRustPackage rec { pname = "nushell"; - version = "0.35.0"; + version = "0.36.0"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "0p5whwx6wk9k7mrxhr7azrppbj9mv53hd4bl1cgygxz231aq8337"; + sha256 = "sha256-5vBt0Q7f3ydo74cmY4WpIHqMlNYc0Tl35d0DnWUQZbU="; }; - cargoSha256 = "0xs0s02zf78pgd94ifh465mg14rrwjfg7qbzmmq8jha758gfwdi3"; + cargoSha256 = "sha256-F3niVkZbg84cFEY0eGgmMAMEJ+eBHwDS2+3EFRR2fLY="; nativeBuildInputs = [ pkg-config ] ++ lib.optionals (withExtraFeatures && stdenv.isLinux) [ python3 ]; diff --git a/third_party/nixpkgs/pkgs/shells/zsh/antibody/default.nix b/third_party/nixpkgs/pkgs/shells/zsh/antibody/default.nix index d5c197d5da..1db4321259 100644 --- a/third_party/nixpkgs/pkgs/shells/zsh/antibody/default.nix +++ b/third_party/nixpkgs/pkgs/shells/zsh/antibody/default.nix @@ -15,7 +15,7 @@ buildGoModule rec { doCheck = false; - buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ]; + ldflags = [ "-s" "-w" "-X main.version=${version}" ]; meta = with lib; { description = "The fastest shell plugin manager"; diff --git a/third_party/nixpkgs/pkgs/tools/admin/aws-vault/default.nix b/third_party/nixpkgs/pkgs/tools/admin/aws-vault/default.nix index c171601528..afc493c3b6 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/aws-vault/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/aws-vault/default.nix @@ -34,10 +34,9 @@ buildGoModule rec { subPackages = [ "." ]; # set the version. see: aws-vault's Makefile - buildFlagsArray = '' - -ldflags= - -X main.Version=v${version} - ''; + ldflags = [ + "-X main.Version=v${version}" + ]; doInstallCheck = true; diff --git a/third_party/nixpkgs/pkgs/tools/admin/awsweeper/default.nix b/third_party/nixpkgs/pkgs/tools/admin/awsweeper/default.nix index 0ff42ca20f..7d1935415a 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/awsweeper/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/awsweeper/default.nix @@ -13,7 +13,7 @@ buildGoModule rec { vendorSha256 = "sha256-1u1mzANLlWduAQF1GUX7BJSyYlSZwNQISqKwbyRlGog="; - buildFlagsArray = [ "-ldflags=-s -w -X github.com/jckuester/awsweeper/internal.version=${version} -X github.com/jckuester/awsweeper/internal.commit=${src.rev} -X github.com/jckuester/awsweeper/internal.date=unknown" ]; + ldflags = [ "-s" "-w" "-X github.com/jckuester/awsweeper/internal.version=${version}" "-X github.com/jckuester/awsweeper/internal.commit=${src.rev}" "-X github.com/jckuester/awsweeper/internal.date=unknown" ]; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/tools/admin/chamber/default.nix b/third_party/nixpkgs/pkgs/tools/admin/chamber/default.nix index 524970925d..d69e96a455 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/chamber/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/chamber/default.nix @@ -15,7 +15,7 @@ buildGoModule rec { vendorSha256 = "sha256-XpLLolxWu9aMp1cyG4dUQk4YtknbIRMmBUdSeyY4PNk="; - buildFlagsArray = [ "-ldflags=-s -w -X main.Version=v${version}" ]; + ldflags = [ "-s" "-w" "-X main.Version=v${version}" ]; meta = with lib; { description = diff --git a/third_party/nixpkgs/pkgs/tools/admin/credhub-cli/default.nix b/third_party/nixpkgs/pkgs/tools/admin/credhub-cli/default.nix index 0c71850f84..9cfb23ab9d 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/credhub-cli/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/credhub-cli/default.nix @@ -28,8 +28,7 @@ buildGoModule rec { vendorSha256 = null; - buildFlagsArray = [ - "-ldflags=" + ldflags = [ "-s" "-w" "-X code.cloudfoundry.org/credhub-cli/version.Version=${version}" diff --git a/third_party/nixpkgs/pkgs/tools/admin/exoscale-cli/default.nix b/third_party/nixpkgs/pkgs/tools/admin/exoscale-cli/default.nix index 0ffa33a167..544ffcaf1a 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/exoscale-cli/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/exoscale-cli/default.nix @@ -13,7 +13,7 @@ buildGoPackage rec { goPackagePath = "github.com/exoscale/cli"; - buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version} -X main.commit=${src.rev}" ]; + ldflags = [ "-s" "-w" "-X main.version=${version}" "-X main.commit=${src.rev}" ]; # ensures only the cli binary is built and we don't clutter bin/ with submodules subPackages = [ "." ]; diff --git a/third_party/nixpkgs/pkgs/tools/admin/fioctl/default.nix b/third_party/nixpkgs/pkgs/tools/admin/fioctl/default.nix index e271b2d154..98e68c10fb 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/fioctl/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/fioctl/default.nix @@ -2,22 +2,22 @@ buildGoModule rec { pname = "fioctl"; - version = "0.19.1"; + version = "0.20"; src = fetchFromGitHub { owner = "foundriesio"; repo = "fioctl"; rev = "v${version}"; - sha256 = "sha256-s6L/B01TaSCDMyRjZxNBDdhR46H7kDeXvVVP7b1e9Iw="; + sha256 = "sha256-vc+V69cyJZSJa6GXUUNYeXdKvmUrVIQhsBykptcl85s="; }; vendorSha256 = "sha256-SuUY4xwinky5QO+GxyotrFiYX1LnWQNjwWXIUpfVHUE="; runVend = true; - buildFlagsArray = '' - -ldflags=-s -w -X github.com/foundriesio/fioctl/subcommands/version.Commit=${src.rev} - ''; + ldflags = [ + "-s" "-w" "-X github.com/foundriesio/fioctl/subcommands/version.Commit=${src.rev}" + ]; meta = with lib; { description = "A simple CLI to manage your Foundries Factory "; diff --git a/third_party/nixpkgs/pkgs/tools/admin/iamy/default.nix b/third_party/nixpkgs/pkgs/tools/admin/iamy/default.nix index dd35da451a..6ee5f3f880 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/iamy/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/iamy/default.nix @@ -15,9 +15,9 @@ buildGoModule rec { doCheck = false; - buildFlagsArray = [''-ldflags= - -X main.Version=v${version} -s -w - '']; + ldflags = [ + "-X main.Version=v${version}" "-s" "-w" + ]; meta = with lib; { description = "A cli tool for importing and exporting AWS IAM configuration to YAML files"; diff --git a/third_party/nixpkgs/pkgs/tools/admin/lego/default.nix b/third_party/nixpkgs/pkgs/tools/admin/lego/default.nix index 78f4b8cd2c..6856794675 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/lego/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/lego/default.nix @@ -17,8 +17,8 @@ buildGoModule rec { subPackages = [ "cmd/lego" ]; - buildFlagsArray = [ - "-ldflags=-X main.version=${version}" + ldflags = [ + "-X main.version=${version}" ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/tools/admin/ossutil/default.nix b/third_party/nixpkgs/pkgs/tools/admin/ossutil/default.nix new file mode 100644 index 0000000000..d9f4b481f1 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/admin/ossutil/default.nix @@ -0,0 +1,33 @@ +{ lib, buildGoModule, fetchFromGitHub, fetchpatch }: + +buildGoModule rec { + version = "1.7.6"; + pname = "ossutil"; + + src = fetchFromGitHub { + owner = "aliyun"; + repo = "ossutil"; + rev = version; + sha256 = "1hkdk0hidnm7vz320i7s4z7jngx2j70acc93agii2b3r2bb91l3d"; + }; + + # this patch is required to add go mods to fetch dependencies + patches = [ + (fetchpatch { + url = "https://github.com/aliyun/ossutil/commit/64067e979fb24ffb198a0c4eca718e81b63f514e.patch"; + sha256 = "2pn0BcbNNL+iMema54LRpG/ca5kyDugLIZQ/TMhYG/8="; + }) + ]; + + vendorSha256 = "lem9Jg4Ywv3qcIwhiZHNi1VH5HxxNr6mnefOLCzPL70="; + + # don't run tests as they require secret access keys that only travis has + doCheck = false; + + meta = with lib; { + homepage = "https://github.com/aliyun/ossutil"; + description = "A user friendly command line tool to access Alibaba Cloud OSS"; + license = licenses.mit; + maintainers = with maintainers; [ jpetrucciani ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/admin/ssmsh/default.nix b/third_party/nixpkgs/pkgs/tools/admin/ssmsh/default.nix index 3ed29af25f..6c4785c81c 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/ssmsh/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/ssmsh/default.nix @@ -15,7 +15,7 @@ buildGoModule rec { doCheck = true; - buildFlagsArray = [ "-ldflags=-w -s -X main.Version=${version}" ]; + ldflags = [ "-w" "-s" "-X main.Version=${version}" ]; meta = with lib; { homepage = "https://github.com/bwhaley/ssmsh"; diff --git a/third_party/nixpkgs/pkgs/tools/backup/kopia/default.nix b/third_party/nixpkgs/pkgs/tools/backup/kopia/default.nix index 32f051f5ad..ad113ed615 100644 --- a/third_party/nixpkgs/pkgs/tools/backup/kopia/default.nix +++ b/third_party/nixpkgs/pkgs/tools/backup/kopia/default.nix @@ -17,11 +17,10 @@ buildGoModule rec { subPackages = [ "." ]; - buildFlagsArray = '' - -ldflags= - -X github.com/kopia/kopia/repo.BuildVersion=${version} - -X github.com/kopia/kopia/repo.BuildInfo=${src.rev} - ''; + ldflags = [ + "-X github.com/kopia/kopia/repo.BuildVersion=${version}" + "-X github.com/kopia/kopia/repo.BuildInfo=${src.rev}" + ]; meta = with lib; { homepage = "https://kopia.io"; diff --git a/third_party/nixpkgs/pkgs/tools/compression/xdelta/default.nix b/third_party/nixpkgs/pkgs/tools/compression/xdelta/default.nix index ee52f35c97..fbaab91d09 100644 --- a/third_party/nixpkgs/pkgs/tools/compression/xdelta/default.nix +++ b/third_party/nixpkgs/pkgs/tools/compression/xdelta/default.nix @@ -56,6 +56,6 @@ in stdenv.mkDerivation rec { ''; homepage = "http://xdelta.org/"; license = licenses.gpl2Plus; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/gcsfuse/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/gcsfuse/default.nix index 759104b9c0..4f73976980 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/gcsfuse/default.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/gcsfuse/default.nix @@ -20,7 +20,7 @@ buildGoPackage rec { ln -s $out/bin/mount_gcsfuse $out/bin/mount.fuse.gcsfuse ''; - buildFlagsArray = [ "-ldflags=-s -w -X main.gcsfuseVersion=${version}" ]; + ldflags = [ "-s" "-w" "-X main.gcsfuseVersion=${version}" ]; meta = with lib;{ description = "A user-space file system for interacting with Google Cloud Storage"; diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/gocryptfs/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/gocryptfs/default.nix index 4d901d6889..29750531db 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/gocryptfs/default.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/gocryptfs/default.nix @@ -37,12 +37,11 @@ buildGoModule rec { propagatedBuildInputs = [ libfido2 ]; - buildFlagsArray = '' - -ldflags= - -X main.GitVersion=${version} - -X main.GitVersionFuse=[vendored] - -X main.BuildDate=unknown - ''; + ldflags = [ + "-X main.GitVersion=${version}" + "-X main.GitVersionFuse=[vendored]" + "-X main.BuildDate=unknown" + ]; subPackages = [ "." "gocryptfs-xray" "contrib/statfs" ]; diff --git a/third_party/nixpkgs/pkgs/tools/graphics/astc-encoder/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/astc-encoder/default.nix index 10bd5d3edf..d5754c7bae 100644 --- a/third_party/nixpkgs/pkgs/tools/graphics/astc-encoder/default.nix +++ b/third_party/nixpkgs/pkgs/tools/graphics/astc-encoder/default.nix @@ -31,13 +31,13 @@ with rec { gccStdenv.mkDerivation rec { pname = "astc-encoder"; - version = "3.1"; + version = "3.2"; src = fetchFromGitHub { owner = "ARM-software"; repo = "astc-encoder"; rev = version; - sha256 = "sha256-WWxk8F1MtFv1tWbSs45fmu4k9VCAAOjJP8zBz80zLTo="; + sha256 = "sha256-1GVMzM4+viVqurkzJqTL3Yszld5zLmpjygT/z74HMLs="; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/tools/graphics/lsix/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/lsix/default.nix index ba07e2886b..a9f8aa21bf 100644 --- a/third_party/nixpkgs/pkgs/tools/graphics/lsix/default.nix +++ b/third_party/nixpkgs/pkgs/tools/graphics/lsix/default.nix @@ -2,13 +2,13 @@ stdenvNoCC.mkDerivation rec { pname = "lsix"; - version = "1.7.4"; + version = "1.8"; src = fetchFromGitHub { owner = "hackerb9"; repo = pname; rev = version; - sha256 = "sha256-mOueSNhf1ywG4k1kRODBaWRjy0L162BAO1HRPaMMbFM="; + sha256 = "sha256-Qx6/PFm1XBmEI6iI+Ref9jNe6sXIhsVL4VQ1CX+caZE="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/chezmoi/default.nix b/third_party/nixpkgs/pkgs/tools/misc/chezmoi/default.nix index ff9e7a0013..a60a84475b 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/chezmoi/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/chezmoi/default.nix @@ -15,8 +15,8 @@ buildGoModule rec { doCheck = false; - buildFlagsArray = [ - "-ldflags=-s -w -X main.version=${version} -X main.builtBy=nixpkgs" + ldflags = [ + "-s" "-w" "-X main.version=${version}" "-X main.builtBy=nixpkgs" ]; nativeBuildInputs = [ installShellFiles ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/cloud-sql-proxy/default.nix b/third_party/nixpkgs/pkgs/tools/misc/cloud-sql-proxy/default.nix index 552ea140d6..6f5a6ec25f 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/cloud-sql-proxy/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/cloud-sql-proxy/default.nix @@ -16,7 +16,7 @@ buildGoPackage rec { goDeps = ./deps.nix; - buildFlagsArray = [ "-ldflags=" "-X main.versionString=${version}" ]; + ldflags = [ "-X main.versionString=${version}" ]; meta = with lib; { description = "An authenticating proxy for Second Generation Google Cloud SQL databases"; diff --git a/third_party/nixpkgs/pkgs/tools/misc/complete-alias/default.nix b/third_party/nixpkgs/pkgs/tools/misc/complete-alias/default.nix index 721e99427b..c23ed9771f 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/complete-alias/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/complete-alias/default.nix @@ -5,13 +5,13 @@ stdenvNoCC.mkDerivation rec { pname = "complete-alias"; - version = "1.10.0"; + version = "1.18.0"; src = fetchFromGitHub { owner = "cykerway"; repo = pname; rev = version; - sha256 = "1s0prdnmb2qnzc8d7ddldzqa53yc10qq0lbgx2l9dzmz8pdwylyc"; + sha256 = "18lmdb3inphxyjv08ing5wckqnjq0m5zfl0f15mqzlvf2ypar63x"; }; buildPhase = '' diff --git a/third_party/nixpkgs/pkgs/tools/misc/dashing/default.nix b/third_party/nixpkgs/pkgs/tools/misc/dashing/default.nix index 496639ec07..6dfa3f2b77 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/dashing/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/dashing/default.nix @@ -15,7 +15,7 @@ buildGoPackage rec { goDeps = ./deps.nix; - buildFlagsArray = [ "-ldflags=-X main.version=${version}" ]; + ldflags = [ "-X main.version=${version}" ]; meta = with lib; { description = "A Dash Generator Script for Any HTML"; diff --git a/third_party/nixpkgs/pkgs/tools/misc/dateutils/default.nix b/third_party/nixpkgs/pkgs/tools/misc/dateutils/default.nix index e6793813b2..a43f07c0a2 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/dateutils/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/dateutils/default.nix @@ -1,12 +1,12 @@ { lib, stdenv, fetchurl, autoreconfHook, tzdata, fetchpatch }: stdenv.mkDerivation rec { - version = "0.4.8"; + version = "0.4.9"; pname = "dateutils"; src = fetchurl { url = "https://bitbucket.org/hroptatyr/dateutils/downloads/${pname}-${version}.tar.xz"; - sha256 = "0061f36axskm7yq9cp64x5a5phil8d3zgcd668nfmqzk9ji58w1z"; + sha256 = "1hy96h9imxdbg9y7305mgv4grr6x4qic9xy3vhgh15lvjkcmc0kr"; }; nativeBuildInputs = [ autoreconfHook ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/disfetch/default.nix b/third_party/nixpkgs/pkgs/tools/misc/disfetch/default.nix index f3d114ab9c..96f2b28b5e 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/disfetch/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/disfetch/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "disfetch"; - version = "2.14"; + version = "2.15"; src = fetchFromGitHub { owner = "q60"; repo = "disfetch"; rev = version; - sha256 = "sha256-T6FepZBlB1ZZMVFS7zXqSDFCsHbbVNkJNwIHpQ5Ex68="; + sha256 = "sha256-1BxBeZfZK/vjUgTZknQLTLyWnI4LYyc1BmQeMcbwFP8="; }; dontBuild = true; diff --git a/third_party/nixpkgs/pkgs/tools/misc/duf/default.nix b/third_party/nixpkgs/pkgs/tools/misc/duf/default.nix index 076eb33fbb..e95edb08b8 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/duf/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/duf/default.nix @@ -13,7 +13,7 @@ buildGoModule rec { vendorSha256 = "153z0ccd556c0wpnxgyjq7m0c4y2z6fxsqq2p77kly9nr8cpzdb9"; - buildFlagsArray = [ "-ldflags=-s -w -X=main.Version=${version}" ]; + ldflags = [ "-s" "-w" "-X=main.Version=${version}" ]; meta = with lib; { homepage = "https://github.com/muesli/duf/"; diff --git a/third_party/nixpkgs/pkgs/tools/misc/dutree/default.nix b/third_party/nixpkgs/pkgs/tools/misc/dutree/default.nix new file mode 100644 index 0000000000..99ba711b0c --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/misc/dutree/default.nix @@ -0,0 +1,22 @@ +{ fetchFromGitHub, lib, rustPlatform }: + +rustPlatform.buildRustPackage rec { + pname = "dutree"; + version = "0.2.18"; + + src = fetchFromGitHub { + owner = "nachoparker"; + repo = pname; + rev = "v${version}"; + sha256 = "1720295nxwr6r5yr6zhk2cw5y2l4w862f5wm9v7jjmf3a840yl8p"; + }; + + cargoSha256 = "0gg1w0xx36aswfm0y53nqwwz7zds25ysmklbrc8v2r91j74bhkzw"; + + meta = with lib; { + description = "A tool to analyze file system usage written in Rust"; + homepage = "https://github.com/nachoparker/dutree"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ figsoda ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/misc/esphome/default.nix b/third_party/nixpkgs/pkgs/tools/misc/esphome/default.nix index 112841c026..4c58632e0d 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/esphome/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/esphome/default.nix @@ -16,13 +16,13 @@ let in with python.pkgs; buildPythonApplication rec { pname = "esphome"; - version = "2021.8.0"; + version = "2021.8.2"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "sha256-yVqma5WRQTt5Vq7poqHexASc59xthYaNcz/kkefC7qI="; + sha256 = "sha256-R+5eefPUZc6y/B8cZbxsLVrVwvBbVISZQAb1KwiYdFg="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/tools/misc/flexoptix-app/default.nix b/third_party/nixpkgs/pkgs/tools/misc/flexoptix-app/default.nix index 40f30bd7ad..507fbb7dcc 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/flexoptix-app/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/flexoptix-app/default.nix @@ -1,12 +1,12 @@ -{ lib, appimageTools, fetchurl }: let +{ lib, appimageTools, fetchurl, nodePackages }: let pname = "flexoptix-app"; - version = "5.9.0"; + version = "5.11.0"; name = "${pname}-${version}"; src = fetchurl { name = "${name}.AppImage"; url = "https://flexbox.reconfigure.me/download/electron/linux/x64/FLEXOPTIX%20App.${version}.AppImage"; - sha256 = "0gbqaj9b11mxx0knmmh2d5863kaslbb3r6c4h8rjhg8qy4cws7hj"; + sha256 = "sha256:1hzdb2fbkwpsf0d3ws4z32blk6549jwhf1lrlqmcxhzqfvkr4gin"; }; udevRules = fetchurl { @@ -14,12 +14,20 @@ sha256 = "0mr1bhgvavq1ax4206z1vr2y64s3r676w9jjl9ysziklbrsvk5rr"; }; - appimageContents = appimageTools.extractType2 { - inherit name src; - }; + appimageContents = (appimageTools.extract { inherit name src; }).overrideAttrs (oA: { + buildCommand = '' + ${oA.buildCommand} -in appimageTools.wrapType2 { - inherit name src; + # Get rid of the autoupdater + ${nodePackages.asar}/bin/asar extract $out/resources/app.asar app + sed -i 's/async isUpdateAvailable.*/async isUpdateAvailable(updateInfo) { return false;/g' app/node_modules/electron-updater/out/AppUpdater.js + ${nodePackages.asar}/bin/asar pack app $out/resources/app.asar + ''; + }); + +in appimageTools.wrapAppImage { + inherit name; + src = appimageContents; multiPkgs = null; # no 32bit needed extraPkgs = { pkgs, ... }@args: [ @@ -27,11 +35,14 @@ in appimageTools.wrapType2 { ] ++ appimageTools.defaultFhsEnvArgs.multiPkgs args; extraInstallCommands = '' + # Add desktop convencience stuff mv $out/bin/{${name},${pname}} install -Dm444 ${appimageContents}/flexoptix-app.desktop -t $out/share/applications install -Dm444 ${appimageContents}/flexoptix-app.png -t $out/share/pixmaps substituteInPlace $out/share/applications/flexoptix-app.desktop \ - --replace 'Exec=AppRun' "Exec=$out/bin/${pname}" + --replace 'Exec=AppRun' "Exec=$out/bin/${pname} --" + + # Add udev rules mkdir -p $out/lib/udev/rules.d ln -s ${udevRules} $out/lib/udev/rules.d/99-tprogrammer.rules ''; diff --git a/third_party/nixpkgs/pkgs/tools/misc/fwup/default.nix b/third_party/nixpkgs/pkgs/tools/misc/fwup/default.nix index e2b6df253a..f58b73a472 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/fwup/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/fwup/default.nix @@ -59,7 +59,7 @@ stdenv.mkDerivation rec { xdelta ]; - doCheck = true; + doCheck = !stdenv.isDarwin; meta = with lib; { description = "Configurable embedded Linux firmware update creator and runner"; diff --git a/third_party/nixpkgs/pkgs/tools/misc/gh-ost/default.nix b/third_party/nixpkgs/pkgs/tools/misc/gh-ost/default.nix index 2e2d8ccfc1..16594f898b 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/gh-ost/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/gh-ost/default.nix @@ -13,7 +13,7 @@ buildGoPackage rec { goPackagePath = "github.com/github/gh-ost"; - buildFlagsArray = [ "-ldflags=-s -w -X main.AppVersion=${version} -X main.BuildDescribe=${src.rev}" ]; + ldflags = [ "-s" "-w" "-X main.AppVersion=${version}" "-X main.BuildDescribe=${src.rev}" ]; meta = with lib; { description = "Triggerless online schema migration solution for MySQL"; diff --git a/third_party/nixpkgs/pkgs/tools/misc/git-town/default.nix b/third_party/nixpkgs/pkgs/tools/misc/git-town/default.nix index 88d62b896d..18f251fb72 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/git-town/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/git-town/default.nix @@ -12,7 +12,7 @@ buildGoPackage rec { sha256 = "sha256-RmLDlTK+JO2KRLuLvO927W3WYdDlteBIpgTgDXh8lC8="; }; - buildFlagsArray = [ "-ldflags=-X github.com/git-town/git-town/src/cmd.version=v${version} -X github.com/git-town/git-town/src/cmd.buildDate=nix" ]; + ldflags = [ "-X github.com/git-town/git-town/src/cmd.version=v${version}" "-X github.com/git-town/git-town/src/cmd.buildDate=nix" ]; meta = with lib; { description = "Generic, high-level git support for git-flow workflows"; @@ -21,4 +21,3 @@ buildGoPackage rec { license = licenses.mit; }; } - diff --git a/third_party/nixpkgs/pkgs/tools/misc/goreleaser/default.nix b/third_party/nixpkgs/pkgs/tools/misc/goreleaser/default.nix index 35fc8343b5..62c184d6be 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/goreleaser/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/goreleaser/default.nix @@ -13,8 +13,7 @@ buildGoModule rec { vendorSha256 = "sha256-7I/955dPHV8Rkp6VevkebkZaNtSlbzIsGc8qFjtcMXk="; - buildFlagsArray = [ - "-ldflags=" + ldflags = [ "-s" "-w" "-X main.version=${version}" diff --git a/third_party/nixpkgs/pkgs/tools/misc/gotify-cli/default.nix b/third_party/nixpkgs/pkgs/tools/misc/gotify-cli/default.nix index 36a7055f87..05a93b44b9 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/gotify-cli/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/gotify-cli/default.nix @@ -19,8 +19,8 @@ buildGoModule rec { mv $out/bin/cli $out/bin/gotify ''; - buildFlagsArray = [ - "-ldflags=-X main.Version=${version} -X main.Commit=${version} -X main.BuildDate=1970-01-01" + ldflags = [ + "-X main.Version=${version}" "-X main.Commit=${version}" "-X main.BuildDate=1970-01-01" ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/tools/misc/infracost/default.nix b/third_party/nixpkgs/pkgs/tools/misc/infracost/default.nix index fc078ca64d..43dcbc4a74 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/infracost/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/infracost/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "infracost"; - version = "0.9.5"; + version = "0.9.6"; src = fetchFromGitHub { owner = "infracost"; rev = "v${version}"; repo = "infracost"; - sha256 = "sha256-B9byIortXH9v1aZNVU55uXA+5w7rdLijoE+JNq3OZlE="; + sha256 = "sha256-lcvpNhfSgr8ky03sTo7kjnaLUJeIrzFqpYUjvQpT1Po="; }; - vendorSha256 = "sha256-TfaT5xPzdyTR0sH+EsZKCNXONkfjDRvT/jevAVQt+Zg="; + vendorSha256 = "sha256-TKs3xuZaO9PvlAcV5GDa3Jb36zeVWX3LcdcPxWR6KzE="; ldflags = [ "-s" "-w" "-X github.com/infracost/infracost/internal/version.Version=v${version}" ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/lf/default.nix b/third_party/nixpkgs/pkgs/tools/misc/lf/default.nix index 8aa8e9a663..b135ed061d 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/lf/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/lf/default.nix @@ -15,7 +15,7 @@ buildGoModule rec { nativeBuildInputs = [ installShellFiles ]; - buildFlagsArray = [ "-ldflags=-s -w -X main.gVersion=r${version}" ]; + ldflags = [ "-s" "-w" "-X main.gVersion=r${version}" ]; postInstall = '' install -D --mode=444 lf.desktop $out/share/applications/lf.desktop diff --git a/third_party/nixpkgs/pkgs/tools/misc/mc/default.nix b/third_party/nixpkgs/pkgs/tools/misc/mc/default.nix index cb577ee333..b9ff4ad33d 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/mc/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/mc/default.nix @@ -21,11 +21,11 @@ stdenv.mkDerivation rec { pname = "mc"; - version = "4.8.26"; + version = "4.8.27"; src = fetchurl { url = "https://www.midnight-commander.org/downloads/${pname}-${version}.tar.xz"; - sha256 = "sha256-xt6txQWV8tmiLcbCmanyizk+NYNG6/bKREqEadwWbCc="; + sha256 = "sha256-Mb5ZIl/6mSCBbpqLO+CrIloW0Z5Pr0aJDyW9/6AqT/Q="; }; nativeBuildInputs = [ pkg-config autoreconfHook unzip ] diff --git a/third_party/nixpkgs/pkgs/tools/misc/microplane/default.nix b/third_party/nixpkgs/pkgs/tools/misc/microplane/default.nix index 26ae9f4f16..a44ae344bf 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/microplane/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/microplane/default.nix @@ -13,9 +13,9 @@ buildGoModule rec { vendorSha256 = "sha256-PqSjSFTVrIsQ065blIxZ9H/ARku6BEcnjboH+0K0G14="; - buildFlagsArray = '' - -ldflags=-s -w -X main.version=${version} - ''; + ldflags = [ + "-s" "-w" "-X main.version=${version}" + ]; postInstall = '' ln -s $out/bin/microplane $out/bin/mp diff --git a/third_party/nixpkgs/pkgs/tools/misc/miniserve/default.nix b/third_party/nixpkgs/pkgs/tools/misc/miniserve/default.nix index 98fb833578..64fdb40f52 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/miniserve/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/miniserve/default.nix @@ -11,16 +11,16 @@ rustPlatform.buildRustPackage rec { pname = "miniserve"; - version = "0.14.0"; + version = "0.15.0"; src = fetchFromGitHub { owner = "svenstaro"; repo = "miniserve"; rev = "v${version}"; - sha256 = "sha256-Hv1aefuiu7pOlSMUjZLGY6bxVy+6myFH1afZZ5gtmi0="; + sha256 = "sha256-hcGpd23CM5r8tq7Wyf4/aJwTCVJ9POmZJHZvIdcF4Qg="; }; - cargoSha256 = "sha256-CgiHluc9+5+hKwsC7UZimy1586QBUsj+TVlb2lQRXs0="; + cargoSha256 = "sha256-TnafvDbCZhIDnjGJThgYnwFs6O6/RvKFsll3gUh2mjQ="; nativeBuildInputs = [ installShellFiles pkg-config zlib ]; buildInputs = lib.optionals stdenv.isDarwin [ libiconv Security ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/pgcenter/default.nix b/third_party/nixpkgs/pkgs/tools/misc/pgcenter/default.nix index c5ca7e8c91..ac1c0bd356 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/pgcenter/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/pgcenter/default.nix @@ -15,7 +15,7 @@ buildGoModule rec { subPackages = [ "cmd" ]; - buildFlagsArray = [ "-ldflags=-w -s -X main.gitTag=${src.rev} -X main.gitCommit=${src.rev} -X main.gitBranch=master" ]; + ldflags = [ "-w" "-s" "-X main.gitTag=${src.rev}" "-X main.gitCommit=${src.rev}" "-X main.gitBranch=master" ]; postInstall = '' mv $out/bin/cmd $out/bin/pgcenter diff --git a/third_party/nixpkgs/pkgs/tools/misc/pgmetrics/default.nix b/third_party/nixpkgs/pkgs/tools/misc/pgmetrics/default.nix index 955444ff8c..c5a240f714 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/pgmetrics/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/pgmetrics/default.nix @@ -15,7 +15,7 @@ buildGoModule rec { doCheck = false; - buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ]; + ldflags = [ "-s" "-w" "-X main.version=${version}" ]; meta = with lib; { homepage = "https://pgmetrics.io/"; diff --git a/third_party/nixpkgs/pkgs/tools/misc/pistol/default.nix b/third_party/nixpkgs/pkgs/tools/misc/pistol/default.nix index 52c83abdf6..6d91a54e56 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/pistol/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/pistol/default.nix @@ -35,7 +35,7 @@ buildGoModule rec { installManPage pistol.1 ''; - buildFlagsArray = [ "-ldflags=-s -w -X main.Version=${version}" ]; + ldflags = [ "-s" "-w" "-X main.Version=${version}" ]; meta = with lib; { description = "General purpose file previewer designed for Ranger, Lf to make scope.sh redundant"; diff --git a/third_party/nixpkgs/pkgs/tools/misc/starship/default.nix b/third_party/nixpkgs/pkgs/tools/misc/starship/default.nix index 052e6198d4..7ad62ab9d2 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/starship/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/starship/default.nix @@ -11,13 +11,13 @@ rustPlatform.buildRustPackage rec { pname = "starship"; - version = "0.56.0"; + version = "0.57.0"; src = fetchFromGitHub { owner = "starship"; repo = pname; rev = "v${version}"; - sha256 = "0wcldggdavmxajq6dkksdacs5f4729yvxvqiyb9vgalv4akik4yj"; + sha256 = "sha256-cxTBK6eZTlqEaVfWYARQk6BjNuANy39eaXC6qFs/+6k="; }; nativeBuildInputs = [ installShellFiles ] ++ lib.optionals stdenv.isLinux [ pkg-config ]; @@ -32,7 +32,7 @@ rustPlatform.buildRustPackage rec { done ''; - cargoSha256 = "1ligh5mwids7crf2qh657sdij9fcw7pb3w7vqskpvkyk25h2z6r9"; + cargoSha256 = "sha256-TFHRDgIxqJCkcSwpdbcx8vguKU1QuTyslmAsRznxt2s="; preCheck = '' HOME=$TMPDIR diff --git a/third_party/nixpkgs/pkgs/tools/misc/staruml/default.nix b/third_party/nixpkgs/pkgs/tools/misc/staruml/default.nix index 847e8bb842..ab28b8777f 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/staruml/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/staruml/default.nix @@ -1,23 +1,33 @@ { stdenv, lib, fetchurl, makeWrapper , dpkg, patchelf -, gtk2, glib, gdk-pixbuf, alsa-lib, nss, nspr, GConf, cups, libgcrypt, dbus, systemd -, libXdamage, expat }: +, gtk3, glib, systemd +, xorg, nss, nspr +, atk, at-spi2-atk, dbus +, gdk-pixbuf, pango, cairo +, expat, libdrm, mesa +, alsa-lib, at-spi2-core, cups }: let - LD_LIBRARY_PATH = lib.makeLibraryPath - [ glib gtk2 gdk-pixbuf alsa-lib nss nspr GConf cups libgcrypt dbus libXdamage expat ]; + LD_LIBRARY_PATH = lib.makeLibraryPath [ + glib gtk3 xorg.libXdamage + xorg.libX11 xorg.libxcb xorg.libXcomposite + xorg.libXcursor xorg.libXext xorg.libXfixes + xorg.libXi xorg.libXrender xorg.libXtst + nss nspr atk at-spi2-atk dbus + gdk-pixbuf pango cairo + xorg.libXrandr expat libdrm + mesa alsa-lib at-spi2-core + cups + ]; in stdenv.mkDerivation rec { - version = "2.8.1"; + version = "4.0.1"; pname = "staruml"; src = - if stdenv.hostPlatform.system == "i686-linux" then fetchurl { - url = "https://s3.amazonaws.com/staruml-bucket/releases-v2/StarUML-v${version}-32-bit.deb"; - sha256 = "0vb3k9m3l6pmsid4shlk0xdjsriq3gxzm8q7l04didsppg0vvq1n"; - } else fetchurl { - url = "https://s3.amazonaws.com/staruml-bucket/releases-v2/StarUML-v${version}-64-bit.deb"; - sha256 = "05gzrnlssjkhyh0wv019d4r7p40lxnsa1sghazll6f233yrqmxb0"; + fetchurl { + url = "https://staruml.io/download/releases-v4/StarUML_${version}_amd64.deb"; + sha256 = "0vxrs5y4a17bnc27fd2k2qc0vi81v677mi55znylwf3a41fjfcir"; }; nativeBuildInputs = [ makeWrapper dpkg ]; @@ -30,25 +40,24 @@ stdenv.mkDerivation rec { installPhase = '' mkdir $out - mv opt/staruml $out/bin + mv opt/StarUML $out/bin mkdir -p $out/lib ln -s ${stdenv.cc.cc.lib}/lib/libstdc++.so.6 $out/lib/ ln -s ${lib.getLib systemd}/lib/libudev.so.1 $out/lib/libudev.so.0 - for binary in StarUML Brackets-node; do - ${patchelf}/bin/patchelf \ - --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - $out/bin/$binary - wrapProgram $out/bin/$binary \ - --prefix LD_LIBRARY_PATH : $out/lib:${LD_LIBRARY_PATH} - done + patchelf \ + --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ + $out/bin/staruml + wrapProgram $out/bin/staruml \ + --prefix LD_LIBRARY_PATH : $out/lib:${LD_LIBRARY_PATH} ''; meta = with lib; { description = "A sophisticated software modeler"; homepage = "https://staruml.io/"; license = licenses.unfree; - platforms = [ "i686-linux" "x86_64-linux" ]; + maintainers = with maintainers; [ ]; + platforms = [ "x86_64-linux" ]; }; } diff --git a/third_party/nixpkgs/pkgs/tools/misc/systrayhelper/default.nix b/third_party/nixpkgs/pkgs/tools/misc/systrayhelper/default.nix index 03d8e58f8b..2453191d0c 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/systrayhelper/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/systrayhelper/default.nix @@ -16,13 +16,13 @@ buildGoPackage rec { # re date: https://github.com/NixOS/nixpkgs/pull/45997#issuecomment-418186178 # > .. keep the derivation deterministic. Otherwise, we would have to rebuild it every time. - buildFlagsArray = [ ''-ldflags= - -X main.version=v${version} - -X main.commit=${rev} - -X main.date="nix-byrev" - -s - -w - '' ]; + ldflags = [ + "-X main.version=v${version}" + "-X main.commit=${rev}" + "-X main.date=nix-byrev" + "-s" + "-w" + ]; nativeBuildInputs = [ pkg-config libappindicator-gtk3 ]; buildInputs = [ libappindicator-gtk3 ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/tfk8s/default.nix b/third_party/nixpkgs/pkgs/tools/misc/tfk8s/default.nix index 086a05c901..8ca102444a 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/tfk8s/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/tfk8s/default.nix @@ -15,8 +15,7 @@ buildGoModule rec { vendorSha256 = "sha256-eLPmghs05pMMtys97Ja7YGdVMZmMmiaFeMwzaWNxW0I="; runVend = true; - buildFlagsArray = [ - "-ldflags=" + ldflags = [ "-s" "-w" "-X main.toolVersion=${tag}" diff --git a/third_party/nixpkgs/pkgs/tools/misc/vsh/default.nix b/third_party/nixpkgs/pkgs/tools/misc/vsh/default.nix index 13a3df4d6b..416dd4bfcc 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/vsh/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/vsh/default.nix @@ -15,7 +15,7 @@ buildGoModule rec { vendorSha256 = null; # make sure version gets set at compile time - buildFlagsArray = [ "-ldflags=-s -w -X main.vshVersion=v${version}" ]; + ldflags = [ "-s" "-w" "-X main.vshVersion=v${version}" ]; meta = with lib; { description = "HashiCorp Vault interactive shell"; diff --git a/third_party/nixpkgs/pkgs/tools/misc/yt-dlp/default.nix b/third_party/nixpkgs/pkgs/tools/misc/yt-dlp/default.nix index 8f5e14a240..17d75fa493 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/yt-dlp/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/yt-dlp/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchurl, buildPythonPackage +{ lib, buildPythonPackage , zip, ffmpeg, rtmpdump, phantomjs2, atomicparsley, pycryptodome, pandoc , fetchFromGitHub , websockets, mutagen @@ -13,13 +13,13 @@ buildPythonPackage rec { # The websites yt-dlp deals with are a very moving target. That means that # downloads break constantly. Because of that, updates should always be backported # to the latest stable release. - version = "2021.08.02"; + version = "2021.08.10"; src = fetchFromGitHub { owner = "yt-dlp"; repo = "yt-dlp"; rev = version; - sha256 = "QEJKOZGVQNXLU8GfTbwBx2Zv3KO++ozTJcXLWxXA4hI="; + sha256 = "sha256-8mOjIvbC3AFHCXKV5G66cFy7SM7sULzM8czXcqQKbms="; }; nativeBuildInputs = [ installShellFiles makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/tools/networking/cassowary/default.nix b/third_party/nixpkgs/pkgs/tools/networking/cassowary/default.nix index 527ecfbf98..6280b923ec 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/cassowary/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/cassowary/default.nix @@ -15,7 +15,7 @@ buildGoModule rec { doCheck = false; - buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ]; + ldflags = [ "-s" "-w" "-X main.version=${version}" ]; meta = with lib; { homepage = "https://github.com/rogerwelin/cassowary"; diff --git a/third_party/nixpkgs/pkgs/tools/networking/chisel/default.nix b/third_party/nixpkgs/pkgs/tools/networking/chisel/default.nix index 5d82a549e8..9df5625c23 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/chisel/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/chisel/default.nix @@ -16,7 +16,7 @@ buildGoModule rec { vendorSha256 = "sha256-GzsQ6LXxe9UQc13XbsYFOWPe0EzlyHechchKc6xDkAc="; - buildFlagsArray = [ "-ldflags=-s -w -X github.com/jpillora/chisel/share.BuildVersion=${version}" ]; + ldflags = [ "-s" "-w" "-X github.com/jpillora/chisel/share.BuildVersion=${version}" ]; # tests require access to the network doCheck = false; diff --git a/third_party/nixpkgs/pkgs/tools/networking/clash/default.nix b/third_party/nixpkgs/pkgs/tools/networking/clash/default.nix index 61e529dc87..221a6c280b 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/clash/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/clash/default.nix @@ -15,8 +15,7 @@ buildGoModule rec { doCheck = false; - buildFlagsArray = [ - "-ldflags=" + ldflags = [ "-X github.com/Dreamacro/clash/constant.Version=${version}" ]; diff --git a/third_party/nixpkgs/pkgs/tools/networking/dd-agent/integrations-core.nix b/third_party/nixpkgs/pkgs/tools/networking/dd-agent/integrations-core.nix index e466be816e..16b0b1ea09 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/dd-agent/integrations-core.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/dd-agent/integrations-core.nix @@ -65,7 +65,7 @@ let pname = "checks-base"; sourceRoot = "datadog_checks_base"; propagatedBuildInputs = with python.pkgs; [ - requests protobuf prometheus_client uuid simplejson uptime + requests protobuf prometheus-client uuid simplejson uptime ]; }; diff --git a/third_party/nixpkgs/pkgs/tools/networking/gobgp/default.nix b/third_party/nixpkgs/pkgs/tools/networking/gobgp/default.nix index 98925489e5..6ba0752222 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/gobgp/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/gobgp/default.nix @@ -17,10 +17,9 @@ buildGoModule rec { export CGO_ENABLED=0 ''; - buildFlagsArray = '' - -ldflags= - -s -w -extldflags '-static' - ''; + ldflags = [ + "-s" "-w" "-extldflags '-static'" + ]; subPackages = [ "cmd/gobgp" ]; diff --git a/third_party/nixpkgs/pkgs/tools/networking/grpcui/default.nix b/third_party/nixpkgs/pkgs/tools/networking/grpcui/default.nix index a9fb7c823f..1fa47ba917 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/grpcui/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/grpcui/default.nix @@ -17,7 +17,7 @@ buildGoModule rec { subPackages = [ "cmd/grpcui" ]; - buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ]; + ldflags = [ "-s" "-w" "-X main.version=${version}" ]; meta = with lib; { description = "An interactive web UI for gRPC, along the lines of postman"; diff --git a/third_party/nixpkgs/pkgs/tools/networking/grpcurl/default.nix b/third_party/nixpkgs/pkgs/tools/networking/grpcurl/default.nix index 734a751daf..e6cd09dc2f 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/grpcurl/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/grpcurl/default.nix @@ -15,7 +15,7 @@ buildGoModule rec { vendorSha256 = "sha256-nl8vKVhUMSO20qCDyhNkU5cghNy8vIFqSBvLk59nbWg="; - buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ]; + ldflags = [ "-s" "-w" "-X main.version=${version}" ]; meta = with lib; { description = "Like cURL, but for gRPC: Command-line tool for interacting with gRPC servers"; diff --git a/third_party/nixpkgs/pkgs/tools/networking/hp2p/default.nix b/third_party/nixpkgs/pkgs/tools/networking/hp2p/default.nix new file mode 100644 index 0000000000..52f3455ed4 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/networking/hp2p/default.nix @@ -0,0 +1,38 @@ +{ lib, stdenv, fetchFromGitHub, mpi, python3Packages, autoconf, automake } : + +stdenv.mkDerivation rec { + pname = "hp2p"; + version = "3.3"; + + src = fetchFromGitHub { + owner = "cea-hpc"; + repo = "hp2p"; + rev = version; + sha256 = "0zvlwb941rlp3vrf9yzv7njgpj3mh4671ch7qvxfa4hq2ivd52br"; + }; + + patches = [ ./python3.patch ]; + enableParallelBuilding = true; + nativeBuildInputs = [ autoconf automake python3Packages.wrapPython ]; + buildInputs = [ mpi ] ++ (with python3Packages; [ python numpy matplotlib plotly mpldatacursor ]) ; + pythonPath = (with python3Packages; [ numpy matplotlib plotly mpldatacursor ]) ; + + preConfigure = '' + patchShebangs autogen.sh + ./autogen.sh + export CC=mpicc + export CXX=mpic++ + ''; + + postInstall = '' + wrapPythonPrograms + ''; + + meta = with lib; { + description = "A MPI based benchmark for network diagnostics"; + homepage = "https://github.com/cea-hpc/hp2p"; + platforms = platforms.unix; + license = licenses.cecill-c; + maintainers = [ maintainers.bzizou ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/networking/hp2p/python3.patch b/third_party/nixpkgs/pkgs/tools/networking/hp2p/python3.patch new file mode 100644 index 0000000000..13043d9f09 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/networking/hp2p/python3.patch @@ -0,0 +1,120 @@ +diff -u -r source.orig/src/vizhp2p source/src/vizhp2p +--- source.orig/src/vizhp2p 1970-01-01 01:00:01.000000000 +0100 ++++ source/src/vizhp2p 2021-08-24 10:41:42.926881770 +0200 +@@ -94,25 +94,25 @@ + with open(hostfile) as fd: + for line in fd: + if line.startswith(motif_rank): +- print line ++ print(line) + c,v = line[len(motif_rank)+1:-1].split(separator) + nodes[c] = v + + # display k worst nodes indices +- print "\nTop %d bad mean:" % k ++ print("\nTop %d bad mean:" % k) + mean_order = np.argsort(a_mean) +- print [nodes[str(c)] for c in mean_order[:k]] ++ print([nodes[str(c)] for c in mean_order[:k]]) + mean_st = "Top nodes with bad mean:\n" + for i in range(0, k, hostname_per_line): + mean_st += repr([nodes[str(c)] for c + in mean_order[i:i + hostname_per_line]]) + "\n" + +- print "Top %d bad std:" % k +- print [nodes[str(c)] for c in np.argsort(a_std)[-k:][::-1]] ++ print("Top %d bad std:" % k) ++ print([nodes[str(c)] for c in np.argsort(a_std)[-k:][::-1]]) + +- print "Top %d bad mean/std:" % k ++ print("Top %d bad mean/std:" % k) + pen_order = np.argsort(a_mean / a_std) +- print [nodes[str(c)] for c in pen_order[:k]] ++ print([nodes[str(c)] for c in pen_order[:k]]) + pen_st = "Top nodes with bad mean/std:\n" + for i in range(0, k, hostname_per_line): + pen_st += repr([nodes[str(c)] for c +@@ -293,9 +293,9 @@ + # and 'p' (snapshot) + def onrefresh(event): + if event.key == 'r': +- print "refreshing...", ++ print("refreshing...", end=' ') + loop() +- print "ok" ++ print("ok") + elif event.key == 'q': + exit() + elif event.key == 'p': +@@ -303,9 +303,9 @@ + fig1.savefig(snapfile) + snapfile = outputname + "_snapshot_time.png" + fig2.savefig(snapfile) +- print 'snapshot saved (%s)' % snapfile ++ print('snapshot saved (%s)' % snapfile) + else: +- print "The answer to %s is 42." % event.key ++ print("The answer to %s is 42." % event.key) + + + if __name__ == "__main__": +@@ -356,11 +356,11 @@ + countfile = outputname + ".count.bin" + + print("visu_hp2p configuration:") +- print(" DATAFILE : %s"%resfile) +- print(" BIN_TIMER_FILE : %s"%resfile_time) +- print(" HOSTFILE : %s"%hostfile) +- print(" Bad nodes to display: %d"%k) +- print(" GUI resolution : %s"%resolution) ++ print((" DATAFILE : %s"%resfile)) ++ print((" BIN_TIMER_FILE : %s"%resfile_time)) ++ print((" HOSTFILE : %s"%hostfile)) ++ print((" Bad nodes to display: %d"%k)) ++ print((" GUI resolution : %s"%resolution)) + + hostname_per_line = 4 # for GUI layout + refresh_in_sec = 60 +@@ -377,7 +377,7 @@ + # wait for resfile + while not os.path.exists(resfile) : + time.sleep(5) +- print "Waiting for input files..." ++ print("Waiting for input files...") + + # add callback on key press event + cid1 = fig1.canvas.mpl_connect('key_press_event', onrefresh) +Only in source/src: vizhp2p.bak +diff -u -r source.orig/src/vizhp2p_html source/src/vizhp2p_html +--- source.orig/src/vizhp2p_html 1970-01-01 01:00:01.000000000 +0100 ++++ source/src/vizhp2p_html 2021-08-24 10:41:54.799946303 +0200 +@@ -118,7 +118,7 @@ + hostfile = args.hostfile + clustername = args.clustername + if len(args.OutputName) == 0: +- print "No DATAFILE given! Please provide Hp2p output files name !" ++ print("No DATAFILE given! Please provide Hp2p output files name !") + exit(0) + else: + outputname = args.OutputName.split('.')[0] +@@ -134,13 +134,13 @@ + else: + outfile = args.outfile + +- print "%s configuration:"%commandname +- print " DATAFILE : %s"%resfile +- print " HOSTFILE : %s"%hostfile +- print " CLUSTER : %s"%clustername +- print " OUTPUTFILE : %s"%outfile ++ print("%s configuration:"%commandname) ++ print(" DATAFILE : %s"%resfile) ++ print(" HOSTFILE : %s"%hostfile) ++ print(" CLUSTER : %s"%clustername) ++ print(" OUTPUTFILE : %s"%outfile) + if not os.path.exists(resfile): +- print "%s doesn't exist...Exiting"%resfile ++ print("%s doesn't exist...Exiting"%resfile) + exit(0) + + # Data management +Only in source/src: vizhp2p_html.bak diff --git a/third_party/nixpkgs/pkgs/tools/networking/inetutils/default.nix b/third_party/nixpkgs/pkgs/tools/networking/inetutils/default.nix index 285031aaca..523c065368 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/inetutils/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/inetutils/default.nix @@ -3,20 +3,21 @@ }: stdenv.mkDerivation rec { - name = "inetutils-1.9.4"; + pname = "inetutils"; + version = "2.0"; src = fetchurl { - url = "mirror://gnu/inetutils/${name}.tar.gz"; - sha256 = "05n65k4ixl85dc6rxc51b1b732gnmm8xnqi424dy9f1nz7ppb3xy"; + url = "mirror://gnu/${pname}/${pname}-${version}.tar.xz"; + sha256 = "sha256-5XPVZuVTk5QAmYYuf4mUFkoO0S9ahsM0U4CEK9wSRyI="; }; outputs = ["out" "apparmor"]; patches = [ - ./whois-Update-Canadian-TLD-server.patch - ./service-name.patch # https://git.congatec.com/yocto/meta-openembedded/commit/3402bfac6b595c622e4590a8ff5eaaa854e2a2a3 ./inetutils-1_9-PATH_PROCNET_DEV.patch + ./whois-Update-ORG-TLD-server.patch + ./whois-Update-Indian-TLD-server.patch ]; nativeBuildInputs = [ help2man perl /* for `whois' */ ]; diff --git a/third_party/nixpkgs/pkgs/tools/networking/inetutils/service-name.patch b/third_party/nixpkgs/pkgs/tools/networking/inetutils/service-name.patch deleted file mode 100644 index e34516313c..0000000000 --- a/third_party/nixpkgs/pkgs/tools/networking/inetutils/service-name.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- inetutils-1.9.4.org/whois/whois.c 2015-03-31 17:40:50.000000000 +0200 -+++ inetutils-1.9.4/whois/whois.c 2017-04-20 10:23:38.487358708 +0200 -@@ -576,7 +576,7 @@ - hints.ai_family = AF_UNSPEC; - hints.ai_socktype = SOCK_STREAM; - -- if ((i = getaddrinfo (server, port ? port : "whois", &hints, &res)) != 0) -+ if ((i = getaddrinfo (server, port ? port : "nicname", &hints, &res)) != 0) - err_quit ("getaddrinfo: %s", gai_strerror (i)); - - for (ressave = res; res; res = res->ai_next) diff --git a/third_party/nixpkgs/pkgs/tools/networking/inetutils/whois-Update-Canadian-TLD-server.patch b/third_party/nixpkgs/pkgs/tools/networking/inetutils/whois-Update-Canadian-TLD-server.patch deleted file mode 100644 index d63d4e29da..0000000000 --- a/third_party/nixpkgs/pkgs/tools/networking/inetutils/whois-Update-Canadian-TLD-server.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 73e2811a0512556fd5359acc4387f46c79a9884a Mon Sep 17 00:00:00 2001 -From: Mats Erik Andersson -Date: Thu, 2 Mar 2017 15:38:38 +0100 -Subject: [PATCH] whois: Update Canadian TLD server. -Content-Type: text/plain; charset=utf-8 - ---- - ChangeLog | 8 ++++++++ (OMITTED) - whois/tld_serv_list | 2 +- - 2 files changed, 9 insertions(+), 1 deletion(-) - -diff --git a/whois/tld_serv_list b/whois/tld_serv_list -index 056efcf..91697b8 100644 ---- a/whois/tld_serv_list -+++ b/whois/tld_serv_list -@@ -81,7 +81,7 @@ - #.bw # NIC? www.botsnet.bw - #.by NONE # NIC? http://unibel.by www.open.by - .bz NONE # http://www.psg.com/dns/bz/ --.ca whois.cdnnet.ca -+.ca whois.cira.ca - .cc whois.nic.cc - .cd WEB http://www.nic.cd/database/cd/ - #.cf NONE # NIC? http://www.socatel.intnet.cf --- -2.10.0 - diff --git a/third_party/nixpkgs/pkgs/tools/networking/inetutils/whois-Update-Indian-TLD-server.patch b/third_party/nixpkgs/pkgs/tools/networking/inetutils/whois-Update-Indian-TLD-server.patch new file mode 100644 index 0000000000..969b24436f --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/networking/inetutils/whois-Update-Indian-TLD-server.patch @@ -0,0 +1,25 @@ +From 1d64e6ae8fa1ef685f3f54c070eb47e7a45895eb Mon Sep 17 00:00:00 2001 +From: Ashish SHUKLA +Date: Sun, 25 Apr 2021 08:17:52 +0530 +Subject: [PATCH] whois: Update whois server for .IN + +--- + whois/tld_serv_list | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/whois/tld_serv_list b/whois/tld_serv_list +index d9257f36..41083c18 100644 +--- a/whois/tld_serv_list ++++ b/whois/tld_serv_list +@@ -151,7 +151,7 @@ + .ie whois.domainregistry.ie + .il whois.isoc.org.il + .im whois.nic.im +-.in whois.inregistry.net ++.in whois.registry.in + .io whois.nic.io + #.iq # NIC? + .ir whois.nic.ir +-- +2.31.1 + diff --git a/third_party/nixpkgs/pkgs/tools/networking/inetutils/whois-Update-ORG-TLD-server.patch b/third_party/nixpkgs/pkgs/tools/networking/inetutils/whois-Update-ORG-TLD-server.patch new file mode 100644 index 0000000000..dd45ec6ebf --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/networking/inetutils/whois-Update-ORG-TLD-server.patch @@ -0,0 +1,38 @@ +From a7a517ca23682b160a2a3be47f1f3f262f8f306f Mon Sep 17 00:00:00 2001 +From: Ashish SHUKLA +Date: Sun, 25 Apr 2021 08:07:52 +0530 +Subject: [PATCH 1/2] whois: .ORG is not handled by InterNIC anymore + +See https://www.iana.org/domains/root/db/org.html +--- + whois/data.h | 1 - + whois/tld_serv_list | 1 + + 2 files changed, 1 insertion(+), 1 deletion(-) + +diff --git a/whois/data.h b/whois/data.h +index d1eb10ad..82e22b6f 100644 +--- a/whois/data.h ++++ b/whois/data.h +@@ -68,7 +68,6 @@ const char *rwhois_servers[] = { + const char *gtlds[] = { + ".com", + ".net", +- ".org", + ".edu", + NULL + }; +diff --git a/whois/tld_serv_list b/whois/tld_serv_list +index ad7b9826..d9257f36 100644 +--- a/whois/tld_serv_list ++++ b/whois/tld_serv_list +@@ -219,6 +219,7 @@ + .nu whois.nic.nu + .nz whois.srs.net.nz + #.om NONE # NIC? http://www.gto.net.om ++.org whois.pir.org + .pa WEB http://www.nic.pa + #.pe whois.rcp.net.pe # kero.yachay.pe valid 2011-03-10 + .pe kero.yachay.pe +-- +2.31.1 + diff --git a/third_party/nixpkgs/pkgs/tools/networking/nebula/default.nix b/third_party/nixpkgs/pkgs/tools/networking/nebula/default.nix index 06615ae25f..2aec2fb50c 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/nebula/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/nebula/default.nix @@ -17,7 +17,7 @@ buildGoModule rec { subPackages = [ "cmd/nebula" "cmd/nebula-cert" ]; - buildFlagsArray = [ "-ldflags=" "-X main.Build=${version}" ]; + ldflags = [ "-X main.Build=${version}" ]; meta = with lib; { description = "A scalable overlay networking tool with a focus on performance, simplicity and security"; diff --git a/third_party/nixpkgs/pkgs/tools/networking/s5cmd/default.nix b/third_party/nixpkgs/pkgs/tools/networking/s5cmd/default.nix index f4a6c2915b..c472e2626e 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/s5cmd/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/s5cmd/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "s5cmd"; - version = "1.2.1"; + version = "1.3.0"; src = fetchFromGitHub { owner = "peak"; repo = "s5cmd"; rev = "v${version}"; - sha256 = "sha256-09vBYwnTfLIuu2SPP7DYB+U6sUkQffglIOHNn4+47qQ="; + sha256 = "sha256-sood01wI0ZnkXUKDHX14ix3bWHR/PRu6+MDNeos5Jk0="; }; vendorSha256 = null; diff --git a/third_party/nixpkgs/pkgs/tools/networking/shadowfox/default.nix b/third_party/nixpkgs/pkgs/tools/networking/shadowfox/default.nix index e6b1c823eb..a75936a152 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/shadowfox/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/shadowfox/default.nix @@ -15,8 +15,8 @@ buildGoModule rec { doCheck = false; - buildFlagsArray = [ - "-ldflags=-X main.tag=v${version}" + ldflags = [ + "-X main.tag=v${version}" ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/tools/networking/telepresence2/default.nix b/third_party/nixpkgs/pkgs/tools/networking/telepresence2/default.nix index 2cbe5fd918..e7ae903e86 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/telepresence2/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/telepresence2/default.nix @@ -13,9 +13,9 @@ buildGoModule rec { vendorSha256 = "1snmp461h8driy1w1xggk669yxl0sjl1m9pbqm7dwk44yb94zi1q"; - buildFlagsArray = '' - -ldflags=-s -w -X=github.com/telepresenceio/telepresence/v2/pkg/version.Version=${src.rev} - ''; + ldflags = [ + "-s" "-w" "-X=github.com/telepresenceio/telepresence/v2/pkg/version.Version=${src.rev}" + ]; subPackages = [ "cmd/telepresence" ]; diff --git a/third_party/nixpkgs/pkgs/tools/networking/termshark/default.nix b/third_party/nixpkgs/pkgs/tools/networking/termshark/default.nix index 7b9a3c42d6..d35e70ad52 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/termshark/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/termshark/default.nix @@ -22,10 +22,9 @@ buildGoModule rec { wrapProgram $out/bin/termshark --prefix PATH : ${lib.makeBinPath [ wireshark-cli ]} ''; - buildFlagsArray = '' - -ldflags= - -X github.com/gcla/termshark.Version=${version} - ''; + ldflags = [ + "-X github.com/gcla/termshark.Version=${version}" + ]; meta = with lib; { homepage = "https://termshark.io/"; diff --git a/third_party/nixpkgs/pkgs/tools/networking/yggdrasil/default.nix b/third_party/nixpkgs/pkgs/tools/networking/yggdrasil/default.nix index 506869238e..874205f592 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/yggdrasil/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/yggdrasil/default.nix @@ -22,12 +22,11 @@ buildGoModule rec { subPackages = [ "cmd/yggdrasil" "cmd/yggdrasilctl" ]; - buildFlagsArray = '' - -ldflags= - -X github.com/yggdrasil-network/yggdrasil-go/src/version.buildVersion=${version} - -X github.com/yggdrasil-network/yggdrasil-go/src/version.buildName=${pname} - -s -w - ''; + ldflags = [ + "-X github.com/yggdrasil-network/yggdrasil-go/src/version.buildVersion=${version}" + "-X github.com/yggdrasil-network/yggdrasil-go/src/version.buildName=${pname}" + "-s" "-w" + ]; passthru.tests.basic = nixosTests.yggdrasil; diff --git a/third_party/nixpkgs/pkgs/tools/package-management/holo-build/default.nix b/third_party/nixpkgs/pkgs/tools/package-management/holo-build/default.nix index 20e3b555fd..847c8a726d 100644 --- a/third_party/nixpkgs/pkgs/tools/package-management/holo-build/default.nix +++ b/third_party/nixpkgs/pkgs/tools/package-management/holo-build/default.nix @@ -24,7 +24,7 @@ buildGoModule rec { subPackages = [ "src/holo-build" ]; - buildFlagsArray = [ "-ldflags=-s -w -X github.com/holocm/holo-build/src/holo-build/common.version=${version}" ]; + ldflags = [ "-s" "-w" "-X github.com/holocm/holo-build/src/holo-build/common.version=${version}" ]; postBuild = '' make build/man/holo-build.8 VERSION=${version} diff --git a/third_party/nixpkgs/pkgs/tools/package-management/micromamba/default.nix b/third_party/nixpkgs/pkgs/tools/package-management/micromamba/default.nix index a7e563ce67..ad325cd4f4 100644 --- a/third_party/nixpkgs/pkgs/tools/package-management/micromamba/default.nix +++ b/third_party/nixpkgs/pkgs/tools/package-management/micromamba/default.nix @@ -1,23 +1,54 @@ -{ lib, stdenv, fetchFromGitHub, cmake +{ lib, stdenv, fetchFromGitHub, fetchpatch, cmake , cli11, nlohmann_json, curl, libarchive, libyamlcpp, libsolv, reproc }: let libsolv' = libsolv.overrideAttrs (oldAttrs: { cmakeFlags = oldAttrs.cmakeFlags ++ [ - "-DENABLE_CONDA=true" # Maybe enable this in the original libsolv package? No idea about the implications. + "-DENABLE_CONDA=true" ]; + + patches = [ + # Patch added by the mamba team + (fetchpatch { + url = "https://raw.githubusercontent.com/mamba-org/boa-forge/f766da0cc18701c4d107a41de22417a65b53cc2d/libsolv/add_strict_repo_prio_rule.patch"; + sha256 = "19c47i5cpyy88nxskf7k6q6r43i55w61jvnz7fc2r84hpjkcrv7r"; + }) + # Patch added by the mamba team + (fetchpatch { + url = "https://raw.githubusercontent.com/mamba-org/boa-forge/f766da0cc18701c4d107a41de22417a65b53cc2d/libsolv/conda_variant_priorization.patch"; + sha256 = "1iic0yx7h8s662hi2jqx68w5kpyrab4fr017vxd4wyxb6wyk35dd"; + }) + # Patch added by the mamba team + (fetchpatch { + url = "https://raw.githubusercontent.com/mamba-org/boa-forge/f766da0cc18701c4d107a41de22417a65b53cc2d/libsolv/memcpy_to_memmove.patch"; + sha256 = "1c9ir40l6crcxllj5zwhzbrbgibwqaizyykd0vip61gywlfzss64"; + }) + ]; + }); + + # fails linking with yaml-cpp 0.7.x + libyamlcpp' = libyamlcpp.overrideAttrs (oldAttrs: rec { + + version = "0.6.3"; + + src = fetchFromGitHub { + owner = "jbeder"; + repo = "yaml-cpp"; + rev = "yaml-cpp-${version}"; + sha256 = "0ykkxzxcwwiv8l8r697gyqh1nl582krpvi7m7l6b40ijnk4pw30s"; + }; }); in stdenv.mkDerivation rec { pname = "micromamba"; - version = "0.14.1"; + version = "0.15.0"; src = fetchFromGitHub { owner = "mamba-org"; repo = "mamba"; rev = version; - sha256 = "0a5kmwk44ll4d8b2akjc0vm6ap9jfxclcw4fclvjxr2in3am9256"; + sha256 = "1zksp4zqj4wn9p9jb1qx1acajaz20k9xnm80yi7bab2d37y18hcw"; }; nativeBuildInputs = [ cmake ]; @@ -27,7 +58,7 @@ stdenv.mkDerivation rec { nlohmann_json curl libarchive - libyamlcpp + libyamlcpp' libsolv' reproc # python3Packages.pybind11 # Would be necessary if someone wants to build with bindings I guess. diff --git a/third_party/nixpkgs/pkgs/tools/package-management/morph/default.nix b/third_party/nixpkgs/pkgs/tools/package-management/morph/default.nix index 56d824059f..e7b6b3adf1 100644 --- a/third_party/nixpkgs/pkgs/tools/package-management/morph/default.nix +++ b/third_party/nixpkgs/pkgs/tools/package-management/morph/default.nix @@ -15,11 +15,9 @@ buildGoModule rec { nativeBuildInputs = [ makeWrapper go-bindata ]; - buildFlagsArray = '' - -ldflags= - -X - main.version=${version} - ''; + ldflags = [ + "-X main.version=${version}" + ]; postPatch = '' go-bindata -pkg assets -o assets/assets.go data/ diff --git a/third_party/nixpkgs/pkgs/tools/package-management/morph/deps.nix b/third_party/nixpkgs/pkgs/tools/package-management/morph/deps.nix deleted file mode 100644 index fdae5ef39e..0000000000 --- a/third_party/nixpkgs/pkgs/tools/package-management/morph/deps.nix +++ /dev/null @@ -1,66 +0,0 @@ -# file generated from Gopkg.lock using dep2nix (https://github.com/nixcloud/dep2nix) -[ - { - goPackagePath = "github.com/dbcdk/kingpin"; - fetch = { - type = "git"; - url = "https://github.com/dbcdk/kingpin"; - rev = "8554767bc91254c59c7297a99e9867c770e4eadb"; - sha256 = "05hfpgylv5mfnjz2mdd3jl8p3psmczvdbs4ydf9xvvc17c9mlrpq"; - }; - } - { - goPackagePath = "github.com/alecthomas/template"; - fetch = { - type = "git"; - url = "https://github.com/alecthomas/template"; - rev = "a0175ee3bccc567396460bf5acd36800cb10c49c"; - sha256 = "0qjgvvh26vk1cyfq9fadyhfgdj36f1iapbmr5xp6zqipldz8ffxj"; - }; - } - { - goPackagePath = "github.com/alecthomas/units"; - fetch = { - type = "git"; - url = "https://github.com/alecthomas/units"; - rev = "2efee857e7cfd4f3d0138cc3cbb1b4966962b93a"; - sha256 = "1j65b91qb9sbrml9cpabfrcf07wmgzzghrl7809hjjhrmbzri5bl"; - }; - } - { - goPackagePath = "github.com/gobwas/glob"; - fetch = { - type = "git"; - url = "https://github.com/gobwas/glob"; - rev = "5ccd90ef52e1e632236f7326478d4faa74f99438"; - sha256 = "0jxk1x806zn5x86342s72dq2qy64ksb3zrvrlgir2avjhwb18n6z"; - }; - } - { - goPackagePath = "golang.org/x/crypto"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/crypto"; - rev = "0e37d006457bf46f9e6692014ba72ef82c33022c"; - sha256 = "1fj8rvrhgv5j8pmckzphvm3sqkzhcqp3idkxvgv13qrjdfycsa5r"; - }; - } - { - goPackagePath = "golang.org/x/sys"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/sys"; - rev = "ee1b12c67af419cf5a9be3bdbeea7fc1c5f32f11"; - sha256 = "0cgp0xzbhg3fr77n2qrfmmsvhc287srnwi4mghwcjdxp6rx0s988"; - }; - } - { - goPackagePath = "gopkg.in/mattes/go-expand-tilde.v1"; - fetch = { - type = "git"; - url = "https://github.com/mattes/go-expand-tilde"; - rev = "cb884138e64c9a8bf5c7d6106d74b0fca082df0c"; - sha256 = "06xrp05njwam4sn031fkmd4gym5wfsw5q0v24nqhs4883lsx9dwq"; - }; - } -] diff --git a/third_party/nixpkgs/pkgs/tools/package-management/nfpm/default.nix b/third_party/nixpkgs/pkgs/tools/package-management/nfpm/default.nix index 69d2f0d29f..9331bdba68 100644 --- a/third_party/nixpkgs/pkgs/tools/package-management/nfpm/default.nix +++ b/third_party/nixpkgs/pkgs/tools/package-management/nfpm/default.nix @@ -15,7 +15,7 @@ buildGoModule rec { doCheck = false; - buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ]; + ldflags = [ "-s" "-w" "-X main.version=${version}" ]; meta = with lib; { description = "A simple deb and rpm packager written in Go"; diff --git a/third_party/nixpkgs/pkgs/tools/security/aws-iam-authenticator/default.nix b/third_party/nixpkgs/pkgs/tools/security/aws-iam-authenticator/default.nix index d9f4f4a017..476d248c43 100644 --- a/third_party/nixpkgs/pkgs/tools/security/aws-iam-authenticator/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/aws-iam-authenticator/default.nix @@ -15,7 +15,7 @@ buildGoModule rec { deleteVendor = true; vendorSha256 = "+Z8sENIMWXP29Piwb/W6i7UdNXVq6ZnO7AZbSaUYCME="; - buildFlagsArray = [ "-ldflags=-s -w -X main.version=v${version}" ]; + ldflags = [ "-s" "-w" "-X main.version=v${version}" ]; subPackages = [ "cmd/aws-iam-authenticator" ]; diff --git a/third_party/nixpkgs/pkgs/tools/security/cfssl/default.nix b/third_party/nixpkgs/pkgs/tools/security/cfssl/default.nix index 6ef07c2c35..1e95d1d6f2 100644 --- a/third_party/nixpkgs/pkgs/tools/security/cfssl/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/cfssl/default.nix @@ -34,11 +34,10 @@ buildGoModule rec { popd ''; - buildFlagsArray = '' - -ldflags= - -s -w - -X github.com/cloudflare/cfssl/cli/version.version=v${version} - ''; + ldflags = [ + "-s" "-w" + "-X github.com/cloudflare/cfssl/cli/version.version=v${version}" + ]; meta = with lib; { homepage = "https://cfssl.org/"; diff --git a/third_party/nixpkgs/pkgs/tools/security/cosign/default.nix b/third_party/nixpkgs/pkgs/tools/security/cosign/default.nix index f5f60f3da2..0f81fb4a3d 100644 --- a/third_party/nixpkgs/pkgs/tools/security/cosign/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/cosign/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "cosign"; - version = "1.0.1"; + version = "1.1.0"; src = fetchFromGitHub { owner = "sigstore"; repo = pname; rev = "v${version}"; - sha256 = "sha256-j1C4OGyVY41bG+rRr6chbii94H4yeRCum52A8XcnP6g="; + sha256 = "sha256-FG6LAaz6n2l77Wr7SYmwzL10G5gyHPCPG05hQlsOQBI="; }; buildInputs = @@ -17,7 +17,7 @@ buildGoModule rec { nativeBuildInputs = [ pkg-config ]; - vendorSha256 = "sha256-9/KrgokCqSWqC4nOgA1e9H0sOx6O/ZFGFEPxiPEKoNI="; + vendorSha256 = "sha256-OKQVgF/pg4cigMkckX/dclieHCoD39ltR+DegaUfSDk="; excludedPackages = "\\(copasetic\\)"; diff --git a/third_party/nixpkgs/pkgs/tools/security/doppler/default.nix b/third_party/nixpkgs/pkgs/tools/security/doppler/default.nix index ad49251aae..18ca909cd5 100644 --- a/third_party/nixpkgs/pkgs/tools/security/doppler/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/doppler/default.nix @@ -13,7 +13,7 @@ buildGoModule rec { vendorSha256 = "sha256-yb7L4GSKtlwagwdxBMd5aSk9fre1NKKsy6CM4Iv2ya8="; - buildFlagsArray = "-ldflags=-X github.com/DopplerHQ/cli/pkg/version.ProgramVersion=v${version}"; + ldflags = [ "-X github.com/DopplerHQ/cli/pkg/version.ProgramVersion=v${version}" ]; postInstall = '' mv $out/bin/cli $out/bin/doppler diff --git a/third_party/nixpkgs/pkgs/tools/security/gopass/default.nix b/third_party/nixpkgs/pkgs/tools/security/gopass/default.nix index 358acf376b..9e56b4c1a4 100644 --- a/third_party/nixpkgs/pkgs/tools/security/gopass/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/gopass/default.nix @@ -30,7 +30,7 @@ buildGoModule rec { doCheck = false; - buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version} -X main.commit=${src.rev}" ]; + ldflags = [ "-s" "-w" "-X main.version=${version}" "-X main.commit=${src.rev}" ]; wrapperPath = lib.makeBinPath ( [ diff --git a/third_party/nixpkgs/pkgs/tools/security/gopass/git-credential.nix b/third_party/nixpkgs/pkgs/tools/security/gopass/git-credential.nix index fb0da2c1a0..0b15e9b023 100644 --- a/third_party/nixpkgs/pkgs/tools/security/gopass/git-credential.nix +++ b/third_party/nixpkgs/pkgs/tools/security/gopass/git-credential.nix @@ -22,11 +22,9 @@ buildGoModule rec { nativeBuildInputs = [ makeWrapper ]; - preBuild = '' - buildFlagsArray+=( - "-ldflags=-s -w -X main.version=${version} -X main.commit=${src.rev}" - ) - ''; + ldflags = [ + "-s" "-w" "-X main.version=${version}" "-X main.commit=${src.rev}" + ]; postFixup = '' wrapProgram $out/bin/git-credential-gopass --prefix PATH : "${lib.makeBinPath [ gopass ]}" diff --git a/third_party/nixpkgs/pkgs/tools/security/gopass/jsonapi.nix b/third_party/nixpkgs/pkgs/tools/security/gopass/jsonapi.nix index e060adbf5b..c138bde2cc 100644 --- a/third_party/nixpkgs/pkgs/tools/security/gopass/jsonapi.nix +++ b/third_party/nixpkgs/pkgs/tools/security/gopass/jsonapi.nix @@ -23,11 +23,9 @@ buildGoModule rec { nativeBuildInputs = [ installShellFiles makeWrapper ]; - preBuild = '' - buildFlagsArray+=( - "-ldflags=-s -w -X main.version=${version} -X main.commit=${src.rev}" - ) - ''; + ldflags = [ + "-s" "-w" "-X main.version=${version}" "-X main.commit=${src.rev}" + ]; postFixup = '' wrapProgram $out/bin/gopass-jsonapi --prefix PATH : "${lib.makeBinPath [ gopass ]}" diff --git a/third_party/nixpkgs/pkgs/tools/security/grype/default.nix b/third_party/nixpkgs/pkgs/tools/security/grype/default.nix index e27526289a..4dc119980a 100644 --- a/third_party/nixpkgs/pkgs/tools/security/grype/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/grype/default.nix @@ -6,16 +6,16 @@ buildGoModule rec { pname = "grype"; - version = "0.16.0"; + version = "0.17.0"; src = fetchFromGitHub { owner = "anchore"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Xk+AyCcPQDDKKLT/tkZ2znXbBSBEgmqVqmgGBP/3Oos="; + sha256 = "sha256-410mCfYzbqgj3hb3dgVOGPWPCIYrB41soLA8dXK23NE="; }; - vendorSha256 = "sha256-OAzuL1pHLLKgkKjPjupPg7LEz8sY7ehq2PONnjhvzHE="; + vendorSha256 = "sha256-KkS/1VSObniAykAwv7uW+RCrdvb5BM6DbHzDWZ6kPoQ="; propagatedBuildInputs = [ docker ]; diff --git a/third_party/nixpkgs/pkgs/tools/security/httpx/default.nix b/third_party/nixpkgs/pkgs/tools/security/httpx/default.nix index 5905632294..08f4929bd2 100644 --- a/third_party/nixpkgs/pkgs/tools/security/httpx/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/httpx/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "httpx"; - version = "1.1.1"; + version = "1.1.2"; src = fetchFromGitHub { owner = "projectdiscovery"; repo = "httpx"; rev = "v${version}"; - sha256 = "sha256-uuHvU/KUHliY3FUwknp7ninKTY9qs+gI7WljgIvJEF4="; + sha256 = "sha256-8PX1jUbS5qf5KqeZXv3oijtZCPo5LsabqHSA3rsd3tQ="; }; - vendorSha256 = "sha256-/xip2lwmpaSvnQoGj3de8Tgeog+HPrI8mF6catC1O4s="; + vendorSha256 = "sha256-bkk/gXMLiZGHebrIeDsj3OyiEcH4hriI4TFNdoh3SBk="; meta = with lib; { description = "Fast and multi-purpose HTTP toolkit"; diff --git a/third_party/nixpkgs/pkgs/tools/security/keycard-cli/default.nix b/third_party/nixpkgs/pkgs/tools/security/keycard-cli/default.nix index 6e67358b67..93384df9b4 100644 --- a/third_party/nixpkgs/pkgs/tools/security/keycard-cli/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/keycard-cli/default.nix @@ -17,8 +17,7 @@ buildGoPackage rec { sha256 = "sha256-ejFvduZs3eWc6efr9o4pXb6qw2QWWQTtkTxF80vOGNU="; }; - buildFlagsArray = [ - "-ldflags=" + ldflags = [ "-X main.version=${version}" ]; diff --git a/third_party/nixpkgs/pkgs/tools/security/minica/default.nix b/third_party/nixpkgs/pkgs/tools/security/minica/default.nix index 49f1e2beb4..29574e39cd 100644 --- a/third_party/nixpkgs/pkgs/tools/security/minica/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/minica/default.nix @@ -13,10 +13,9 @@ buildGoPackage rec { sha256 = "18518wp3dcjhf3mdkg5iwxqr3326n6jwcnqhyibphnb2a58ap7ny"; }; - buildFlagsArray = '' - -ldflags= - -X main.BuildVersion=${version} - ''; + ldflags = [ + "-X main.BuildVersion=${version}" + ]; meta = with lib; { description = "A simple tool for generating self signed certificates"; diff --git a/third_party/nixpkgs/pkgs/tools/security/quill/default.nix b/third_party/nixpkgs/pkgs/tools/security/quill/default.nix index 74c7996a89..9440823f42 100644 --- a/third_party/nixpkgs/pkgs/tools/security/quill/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/quill/default.nix @@ -2,13 +2,13 @@ rustPlatform.buildRustPackage rec { pname = "quill"; - version = "0.2.1"; + version = "0.2.4"; src = fetchFromGitHub { owner = "dfinity"; repo = "quill"; rev = "v${version}"; - sha256 = "02ga2xkdxs36mfr4lv43cy6wkf27c28bdkzfkp3az5jvyk17mkfr"; + sha256 = "sha256-rR5VgdlJy6TQBmCHuKc7nPjznbeLjCmQdUJKjY0GsNI="; }; ic = fetchFromGitHub { @@ -30,7 +30,7 @@ rustPlatform.buildRustPackage rec { export OPENSSL_LIB_DIR=${openssl.out}/lib ''; - cargoSha256 = "142pzhyi73ljlqas5vbhjhn4vmp9w9ps1mv8q7s3kzg0h7jcvm1k"; + cargoSha256 = "sha256-nLNuOqShOq01gVWoRCbsvfAd7B9VClUA8Hu8/UQNILg="; nativeBuildInputs = [ pkg-config protobuf ]; buildInputs = [ openssl ] diff --git a/third_party/nixpkgs/pkgs/tools/security/saml2aws/default.nix b/third_party/nixpkgs/pkgs/tools/security/saml2aws/default.nix index 8ee2c9a4c4..bd49721a68 100644 --- a/third_party/nixpkgs/pkgs/tools/security/saml2aws/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/saml2aws/default.nix @@ -2,17 +2,17 @@ buildGoModule rec { pname = "saml2aws"; - version = "2.31.0"; + version = "2.32.0"; src = fetchFromGitHub { owner = "Versent"; repo = "saml2aws"; rev = "v${version}"; - sha256 = "sha256-Qe7+INWS9b6lw7QbaaQwIkRwvfx5dRKsZqun3z/U/QA="; + sha256 = "sha256-VMNK6kmMPe1Qwfb/NmMaBhtdqg59KmtiankVNZmhNdY="; }; runVend = true; - vendorSha256 = "sha256-TieQVPSWtIteU0wTqX7si6GrPdYd4WD2eK4ZlLz0VJ8="; + vendorSha256 = "sha256-2tu3wSp9N+icpKvDeUgzYRLc6jXivn1D0jX/5LSgwNw="; buildInputs = lib.optionals stdenv.isDarwin [ AppKit ]; @@ -20,9 +20,9 @@ buildGoModule rec { subPackages = [ "." "cmd/saml2aws" ]; - buildFlagsArray = '' - -ldflags=-X main.Version=${version} - ''; + ldflags = [ + "-X main.Version=${version}" + ]; meta = with lib; { description = "CLI tool which enables you to login and retrieve AWS temporary credentials using a SAML IDP"; diff --git a/third_party/nixpkgs/pkgs/tools/security/step-ca/default.nix b/third_party/nixpkgs/pkgs/tools/security/step-ca/default.nix index 127e7e9805..9b645dcba9 100644 --- a/third_party/nixpkgs/pkgs/tools/security/step-ca/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/step-ca/default.nix @@ -11,18 +11,18 @@ buildGoModule rec { pname = "step-ca"; - version = "0.16.0"; + version = "0.16.2"; src = fetchFromGitHub { owner = "smallstep"; repo = "certificates"; rev = "v${version}"; - sha256 = "sha256-8gesSfyL5ne0JqbB/TvEkQDZziTzJmsnIV+MTOfy3jk="; + sha256 = "sha256-JDoiz/BX8zB+qdwlGPUCa30R+pwWWtjEiXHP5LxdPAE="; }; - vendorSha256 = "sha256-q5hwgx54ca9SwQfkLB5NKvon9o1Djb1Y5rXPKx3HQDU="; + vendorSha256 = "sha256-cFuLW0qkI/l/TvYwQZA2bLlWYjs1hdbQJ5jU7xiuFZI="; - buildFlagsArray = [ "-ldflags=-buildid=" ]; + ldflags = [ "-buildid=" ]; nativeBuildInputs = lib.optionals hsmSupport [ pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/tools/security/subjs/default.nix b/third_party/nixpkgs/pkgs/tools/security/subjs/default.nix index 1b7986c0a7..65d3f18be7 100644 --- a/third_party/nixpkgs/pkgs/tools/security/subjs/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/subjs/default.nix @@ -16,7 +16,7 @@ buildGoModule rec { vendorSha256 = "1y01k8pvv7y9zb15wbk068cvkx0g83484jak2dvcvghqcf5j1fr1"; - buildFlagsArray = [ "-ldflags=-s -w -X main.AppVersion=${version}" ]; + ldflags = [ "-s" "-w" "-X main.AppVersion=${version}" ]; meta = with lib; { description = "Fetcher for Javascript files"; diff --git a/third_party/nixpkgs/pkgs/tools/security/terrascan/default.nix b/third_party/nixpkgs/pkgs/tools/security/terrascan/default.nix index 106012bd7a..eb5320d250 100644 --- a/third_party/nixpkgs/pkgs/tools/security/terrascan/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/terrascan/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "terrascan"; - version = "1.9.0"; + version = "1.10.0"; src = fetchFromGitHub { owner = "accurics"; repo = pname; rev = "v${version}"; - sha256 = "sha256-DTwA8nHWKOXeha0TBoEGJuoUedxJVev0R0GnHuaHEMc="; + sha256 = "sha256-IF5BDe6XnOR7F/ajYBbMuFpIxUawgd/Oo2AthL5aeWE="; }; - vendorSha256 = "sha256-gDhEaJ444d7fITVaEkH5RXMykmZyXjC+mPfaa2vkpIk="; + vendorSha256 = "sha256-PZM8OWvjj8681/CWVE896f3vRHnkNeJj2w/aoOFZ9P0="; # Tests want to download a vulnerable Terraform project doCheck = false; diff --git a/third_party/nixpkgs/pkgs/tools/system/collectd/plugins.nix b/third_party/nixpkgs/pkgs/tools/system/collectd/plugins.nix index dd578cd639..6438a545a4 100644 --- a/third_party/nixpkgs/pkgs/tools/system/collectd/plugins.nix +++ b/third_party/nixpkgs/pkgs/tools/system/collectd/plugins.nix @@ -6,6 +6,7 @@ , jdk , libatasmart , libdbi +, libesmtp , libgcrypt , libmemcached, cyrus_sasl , libmodbus @@ -19,12 +20,14 @@ , libvirt , libxml2 , libapparmor, libcap_ng, numactl -, lvm2 , lua +, lvm2 , lm_sensors , mongoc , mosquitto , net-snmp +, openldap +, openipmi , perl , postgresql , protobufc @@ -35,7 +38,9 @@ , rrdtool , udev , varnish +, xen , yajl +, IOKit # Defaults to `null` for all supported plugins, # list of plugin names for a custom build , enabledPlugins ? null @@ -43,302 +48,90 @@ }: let - # All plugins and their dependencies. - # Please help complete this! + # Plugins that have dependencies. + # Please help to extend these! plugins = { - aggregation = {}; - amqp = { - buildInputs = [ yajl ] ++ - lib.optionals stdenv.isLinux [ rabbitmq-c ]; - }; - apache = { - buildInputs = [ curl ]; - }; - apcups = {}; - apple_sensors = {}; - aquaero = {}; - ascent = { - buildInputs = [ curl libxml2 ]; - }; - barometer = {}; - battery = { - buildInputs = lib.optionals stdenv.isDarwin [ - darwin.apple_sdk.frameworks.IOKit - ]; - }; - bind = { - buildInputs = [ curl libxml2 ]; - }; - ceph = { - buildInputs = [ yajl ]; - }; - cgroups = {}; - chrony = {}; - conntrack = {}; - contextswitch = {}; - cpu = {}; - cpufreq = {}; - cpusleep = {}; - csv = {}; - curl = { - buildInputs = [ curl ]; - }; - curl_json = { - buildInputs = [ curl yajl ]; - }; - curl_xml = { - buildInputs = [ curl libxml2 ]; - }; - dbi = { - buildInputs = [ libdbi ]; - }; - df = {}; - disk = { - buildInputs = lib.optionals stdenv.isLinux [ - udev - ] ++ lib.optionals stdenv.isDarwin [ - darwin.apple_sdk.frameworks.IOKit - ]; - }; - dns = { - buildInputs = [ libpcap ]; - }; - dpdkevents = {}; - dpdkstat = {}; - drbd = {}; - email = {}; - entropy = {}; - ethstat = {}; - exec = {}; - fhcount = {}; - filecount = {}; - fscache = {}; - gmond = {}; - gps = {}; - grpc = {}; - hddtemp = {}; - hugepages = {}; - intel_pmu = {}; - intel_rdt = {}; - interface = {}; - ipc = {}; - ipmi = {}; - iptables = { - buildInputs = [ - libpcap - ] ++ lib.optionals stdenv.isLinux [ - iptables libmnl - ]; - }; - ipvs = {}; - irq = {}; - java = { - buildInputs = [ jdk libgcrypt libxml2 ]; - }; - load = {}; - logfile = {}; - log_logstash = { - buildInputs = [ yajl ]; - }; - lpar = {}; - lua = { - buildInputs = [ lua ]; - }; - lvm = {}; - madwifi = {}; - match_empty_counter = {}; - match_hashed = {}; - match_regex = {}; - match_timediff = {}; - match_value = {}; - mbmon = {}; - mcelog = {}; - md = {}; - memcachec = { - buildInputs = [ libmemcached cyrus_sasl ]; - }; - memcached = {}; - memory = {}; - mic = {}; - modbus = { - buildInputs = lib.optionals stdenv.isLinux [ libmodbus ]; - }; - mqtt = { - buildInputs = [ mosquitto ]; - }; - multimeter = {}; - mysql = { - buildInputs = lib.optionals (libmysqlclient != null) [ - libmysqlclient - ]; - }; - netapp = {}; - netlink = { - buildInputs = [ - libpcap - ] ++ lib.optionals stdenv.isLinux [ - libmnl - ]; - }; - network = { - buildInputs = [ libgcrypt ]; - }; - nfs = {}; - nginx = { - buildInputs = [ curl ]; - }; - notify_desktop = { - buildInputs = [ libnotify gdk-pixbuf ]; - }; - notify_email = {}; - notify_nagios = {}; - ntpd = {}; - numa = {}; - nut = {}; - olsrd = {}; - onewire = {}; - openldap = {}; - openvpn = {}; - oracle = {}; - ovs_events = { - buildInputs = [ yajl ]; - }; - ovs_stats = { - buildInputs = [ yajl ]; - }; - perl = { - buildInputs = [ perl ]; - }; - pf = {}; - pinba = { - buildInputs = [ protobufc ]; - }; - ping = { - buildInputs = [ liboping ]; - }; - postgresql = { - buildInputs = [ postgresql ]; - }; - powerdns = {}; - processes = {}; - protocols = {}; - python = { - buildInputs = [ python ]; - }; - redis = { - buildInputs = [ hiredis ]; - }; - routeros = {}; - rrdcached = { - buildInputs = [ rrdtool libxml2 ]; - }; - rrdtool = { - buildInputs = [ rrdtool libxml2 ]; - }; - sensors = { - buildInputs = lib.optionals stdenv.isLinux [ lm_sensors ]; - }; - serial = {}; - sigrok = { - buildInputs = lib.optionals stdenv.isLinux [ libsigrok udev ]; - }; - smart = { - buildInputs = lib.optionals stdenv.isLinux [ libatasmart udev ]; - }; - snmp = { - buildInputs = lib.optionals stdenv.isLinux [ net-snmp ]; - }; - snmp_agent = { - buildInputs = lib.optionals stdenv.isLinux [ net-snmp ]; - }; - statsd = {}; - swap = {}; - synproxy = {}; - syslog = {}; - table = {}; - tail_csv = {}; - tail = {}; - tape = {}; - target_notification = {}; - target_replace = {}; - target_scale = {}; - target_set = {}; - target_v5upgrade = {}; - tcpconns = {}; - teamspeak2 = {}; - ted = {}; - thermal = {}; - threshold = {}; - tokyotyrant = {}; - turbostat = {}; - unixsock = {}; - uptime = {}; - users = {}; - uuid = {}; - varnish = { - buildInputs = [ curl varnish ]; - }; - virt = { - buildInputs = [ libvirt libxml2 yajl ] ++ - lib.optionals stdenv.isLinux [ lvm2 udev - # those might be no longer required when https://github.com/NixOS/nixpkgs/pull/51767 - # is merged - libapparmor numactl libcap_ng - ]; - }; - vmem = {}; - vserver = {}; - wireless = {}; - write_graphite = {}; - write_http = { - buildInputs = [ curl yajl ]; - }; - write_kafka = { - buildInputs = [ yajl rdkafka ]; - }; - write_log = { - buildInputs = [ yajl ]; - }; - write_mongodb = { - buildInputs = [ mongoc ]; - }; - write_prometheus = { - buildInputs = [ protobufc libmicrohttpd ]; - }; - write_redis = { - buildInputs = [ hiredis ]; - }; - write_riemann = { - buildInputs = [ protobufc riemann_c_client ]; - }; - write_sensu = {}; - write_tsdb = {}; - xencpu = {}; - xmms = {}; - zfs_arc = {}; - zone = {}; - zookeeper = {}; + amqp.buildInputs = [ + yajl + ] ++ lib.optionals stdenv.isLinux [ rabbitmq-c ]; + apache.buildInputs = [ curl ]; + ascent.buildInputs = [ curl libxml2 ]; + battery.buildInputs = lib.optionals stdenv.isDarwin [ + IOKit + ]; + bind.buildInputs = [ curl libxml2 ]; + ceph.buildInputs = [ yajl ]; + curl.buildInputs = [ curl ]; + curl_json.buildInputs = [ curl yajl ]; + curl_xml.buildInputs = [ curl libxml2 ]; + dbi.buildInputs = [ libdbi ]; + disk.buildInputs = lib.optionals stdenv.isLinux [ + udev + ] ++ lib.optionals stdenv.isDarwin [ + IOKit + ]; + dns.buildInputs = [ libpcap ]; + ipmi.buildInputs = [ openipmi ]; + iptables.buildInputs = [ + libpcap + ] ++ lib.optionals stdenv.isLinux [ + iptables libmnl + ]; + java.buildInputs = [ jdk libgcrypt libxml2 ]; + log_logstash.buildInputs = [ yajl ]; + lua.buildInputs = [ lua ]; + memcachec.buildInputs = [ libmemcached cyrus_sasl ]; + modbus.buildInputs = lib.optionals stdenv.isLinux [ libmodbus ]; + mqtt.buildInputs = [ mosquitto ]; + mysql.buildInputs = lib.optionals (libmysqlclient != null) [ + libmysqlclient + ]; + netlink.buildInputs = [ + libpcap + ] ++ lib.optionals stdenv.isLinux [ + libmnl + ]; + network.buildInputs = [ libgcrypt ]; + nginx.buildInputs = [ curl ]; + notify_desktop.buildInputs = [ libnotify gdk-pixbuf ]; + notify_email.buildInputs = [ libesmtp ]; + openldap.buildInputs = [ openldap ]; + ovs_events.buildInputs = [ yajl ]; + ovs_stats.buildInputs = [ yajl ]; + perl.buildInputs = [ perl ]; + pinba.buildInputs = [ protobufc ]; + ping.buildInputs = [ liboping ]; + postgresql.buildInputs = [ postgresql ]; + python.buildInputs = [ python ]; + redis.buildInputs = [ hiredis ]; + rrdcached.buildInputs = [ rrdtool libxml2 ]; + rrdtool.buildInputs = [ rrdtool libxml2 ]; + sensors.buildInputs = lib.optionals stdenv.isLinux [ lm_sensors ]; + sigrok.buildInputs = lib.optionals stdenv.isLinux [ libsigrok udev ]; + smart.buildInputs = lib.optionals stdenv.isLinux [ libatasmart udev ]; + snmp.buildInputs = lib.optionals stdenv.isLinux [ net-snmp ]; + snmp_agent.buildInputs = lib.optionals stdenv.isLinux [ net-snmp ]; + varnish.buildInputs = [ curl varnish ]; + virt.buildInputs = [ + libvirt libxml2 yajl + ] ++ lib.optionals stdenv.isLinux [ lvm2 udev ]; + write_http.buildInputs = [ curl yajl ]; + write_kafka.buildInputs = [ yajl rdkafka ]; + write_log.buildInputs = [ yajl ]; + write_mongodb.buildInputs = [ mongoc ]; + write_prometheus.buildInputs = [ protobufc libmicrohttpd ]; + write_redis.buildInputs = [ hiredis ]; + write_riemann.buildInputs = [ protobufc riemann_c_client ]; + xencpu.buildInputs = [ xen ]; }; - configureFlags = - if enabledPlugins == null - then [] - else (map (plugin: "--enable-${plugin}") enabledPlugins) ++ - (map (plugin: "--disable-${plugin}") - (builtins.filter (plugin: ! builtins.elem plugin enabledPlugins) - (builtins.attrNames plugins)) - ); + configureFlags = lib.optionals (enabledPlugins != null) ( + [ "--disable-all-plugins" ] + ++ (map (plugin: "--enable-${plugin}") enabledPlugins)); pluginBuildInputs = plugin: - if ! builtins.hasAttr plugin plugins - then throw "Unknown collectd plugin: ${plugin}" - else - let - pluginAttrs = builtins.getAttr plugin plugins; - in - if pluginAttrs ? "buildInputs" - then pluginAttrs.buildInputs - else []; + lib.optionals (plugins ? ${plugin} && plugins.${plugin} ? buildInputs) + plugins.${plugin}.buildInputs; buildInputs = if enabledPlugins == null diff --git a/third_party/nixpkgs/pkgs/tools/system/ctop/default.nix b/third_party/nixpkgs/pkgs/tools/system/ctop/default.nix index 45cbca172f..36dfd02c33 100644 --- a/third_party/nixpkgs/pkgs/tools/system/ctop/default.nix +++ b/third_party/nixpkgs/pkgs/tools/system/ctop/default.nix @@ -15,7 +15,7 @@ buildGoModule rec { doCheck = false; - buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version} -X main.build=v${version}" ]; + ldflags = [ "-s" "-w" "-X main.version=${version}" "-X main.build=v${version}" ]; meta = with lib; { description = "Top-like interface for container metrics"; diff --git a/third_party/nixpkgs/pkgs/tools/system/hostctl/default.nix b/third_party/nixpkgs/pkgs/tools/system/hostctl/default.nix index 3c366d56fc..fb3a293a80 100644 --- a/third_party/nixpkgs/pkgs/tools/system/hostctl/default.nix +++ b/third_party/nixpkgs/pkgs/tools/system/hostctl/default.nix @@ -13,7 +13,7 @@ buildGoModule rec { vendorSha256 = "sha256-rGDWrivIdl5FTu/kNR8nAfE2+1hE4cm3uDg7oBobE9M="; - buildFlagsArray = [ "-ldflags=-s -w -X github.com/guumaster/hostctl/cmd/hostctl/actions.version=${version}" ]; + ldflags = [ "-s" "-w" "-X github.com/guumaster/hostctl/cmd/hostctl/actions.version=${version}" ]; nativeBuildInputs = [ installShellFiles ]; postInstall = '' @@ -33,4 +33,3 @@ buildGoModule rec { maintainers = with maintainers; [ blaggacao ]; }; } - diff --git a/third_party/nixpkgs/pkgs/tools/system/netdata/go.d.plugin.nix b/third_party/nixpkgs/pkgs/tools/system/netdata/go.d.plugin.nix index be6e8f2676..53ab6d6982 100644 --- a/third_party/nixpkgs/pkgs/tools/system/netdata/go.d.plugin.nix +++ b/third_party/nixpkgs/pkgs/tools/system/netdata/go.d.plugin.nix @@ -15,7 +15,7 @@ buildGoModule rec { doCheck = false; - buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ]; + ldflags = [ "-s" "-w" "-X main.version=${version}" ]; postInstall = '' mkdir -p $out/lib/netdata/conf.d diff --git a/third_party/nixpkgs/pkgs/tools/text/gucci/default.nix b/third_party/nixpkgs/pkgs/tools/text/gucci/default.nix index 943b86d3b0..c937e6c7ab 100644 --- a/third_party/nixpkgs/pkgs/tools/text/gucci/default.nix +++ b/third_party/nixpkgs/pkgs/tools/text/gucci/default.nix @@ -15,9 +15,9 @@ buildGoPackage rec { goDeps = ./deps.nix; - buildFlagsArray = '' - -ldflags=-X main.AppVersion=${version} - ''; + ldflags = [ + "-X main.AppVersion=${version}" + ]; meta = with lib; { description = "A simple CLI templating tool written in golang"; @@ -27,4 +27,3 @@ buildGoPackage rec { platforms = platforms.unix; }; } - diff --git a/third_party/nixpkgs/pkgs/tools/text/mark/default.nix b/third_party/nixpkgs/pkgs/tools/text/mark/default.nix index 04b08488ee..653af8b796 100644 --- a/third_party/nixpkgs/pkgs/tools/text/mark/default.nix +++ b/third_party/nixpkgs/pkgs/tools/text/mark/default.nix @@ -13,7 +13,7 @@ buildGoModule rec { vendorSha256 = "sha256-y3Q8UebNbLy1jmxUC37mv+2l8dCU3b/Fk8XHn5u57p0="; - buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ]; + ldflags = [ "-s" "-w" "-X main.version=${version}" ]; meta = with lib; { description = "A tool for syncing your markdown documentation with Atlassian Confluence pages"; diff --git a/third_party/nixpkgs/pkgs/tools/text/runiq/default.nix b/third_party/nixpkgs/pkgs/tools/text/runiq/default.nix new file mode 100644 index 0000000000..6d7bb5e7eb --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/text/runiq/default.nix @@ -0,0 +1,20 @@ +{ fetchCrate, lib, rustPlatform }: + +rustPlatform.buildRustPackage rec { + pname = "runiq"; + version = "1.2.1"; + + src = fetchCrate { + inherit pname version; + sha256 = "0xhd1z8mykxg9kiq8nw5agy1jxfk414czq62xm1s13ssig3h7jqj"; + }; + + cargoSha256 = "1g4yfz5xq9lqwh0ggyn8kn8bnzrqfmh7kx455md5ranrqqh0x5db"; + + meta = with lib; { + description = "An efficient way to filter duplicate lines from input, à la uniq"; + homepage = "https://github.com/whitfin/runiq"; + license = licenses.mit; + maintainers = with maintainers; [ figsoda ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/text/snippetpixie/default.nix b/third_party/nixpkgs/pkgs/tools/text/snippetpixie/default.nix index 6cd6bdda0d..301831d1a8 100644 --- a/third_party/nixpkgs/pkgs/tools/text/snippetpixie/default.nix +++ b/third_party/nixpkgs/pkgs/tools/text/snippetpixie/default.nix @@ -24,13 +24,13 @@ stdenv.mkDerivation rec { pname = "snippetpixie"; - version = "1.5.2"; + version = "1.5.3"; src = fetchFromGitHub { owner = "bytepixie"; repo = pname; rev = version; - sha256 = "173fm9h7lnhhbg5qbjz40g0fy60dwd2l55mdcc1j8dh73vz96pfr"; + sha256 = "0gs3d9hdywg4vcfbp4qfcagfjqalfgw9xpvywg4pw1cm3rzbdqmz"; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/tools/text/vale/default.nix b/third_party/nixpkgs/pkgs/tools/text/vale/default.nix index a665e35fdd..d5c64aa9f7 100644 --- a/third_party/nixpkgs/pkgs/tools/text/vale/default.nix +++ b/third_party/nixpkgs/pkgs/tools/text/vale/default.nix @@ -21,7 +21,7 @@ buildGoModule rec { cp -r styles $data/share/vale ''; - buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version}" ]; + ldflags = [ "-s" "-w" "-X main.version=${version}" ]; meta = with lib; { homepage = "https://docs.errata.ai/vale/about"; diff --git a/third_party/nixpkgs/pkgs/tools/typesetting/bibclean/default.nix b/third_party/nixpkgs/pkgs/tools/typesetting/bibclean/default.nix index 8c7e123acf..4003195717 100644 --- a/third_party/nixpkgs/pkgs/tools/typesetting/bibclean/default.nix +++ b/third_party/nixpkgs/pkgs/tools/typesetting/bibclean/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "bibclean"; - version = "3.04"; + version = "3.06"; src = fetchurl { url = "http://ftp.math.utah.edu/pub/bibclean/bibclean-${version}.tar.xz"; - sha256 = "0n5jb6w86y91q5lkcc9sb1kh4c2bk3q2va24gfr0n6v1jzyqp9jg"; + sha256 = "sha256-ZXT5uAQrqPoF6uVBazc4o1w40Sn0jnM+JYeOz7qq3kM="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/tools/typesetting/soupault/default.nix b/third_party/nixpkgs/pkgs/tools/typesetting/soupault/default.nix new file mode 100644 index 0000000000..5b0619468e --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/typesetting/soupault/default.nix @@ -0,0 +1,41 @@ +{ fetchFromGitHub, ocamlPackages, lib }: + +ocamlPackages.buildDunePackage rec { + pname = "soupault"; + version = "3.1.0"; + + useDune2 = true; + + src = fetchFromGitHub { + owner = "dmbaturin"; + repo = pname; + rev = version; + sha256 = "sha256-SVNC2DbdciunSKTCmmX0SqaEXMe1DkVX4VJTqriI8Y4="; + }; + + buildInputs = with ocamlPackages; [ + base64 + containers + ezjsonm + fileutils + fmt + jingoo + lambdasoup + lua-ml + logs + odate + otoml + re + spelll + tsort + yaml + ]; + + meta = with lib; { + description = "A tool that helps you create and manage static websites"; + homepage = "https://soupault.app/"; + license = licenses.mit; + maintainers = [ maintainers.toastal ]; + }; +} + diff --git a/third_party/nixpkgs/pkgs/tools/virtualization/distrobuilder/deps.nix b/third_party/nixpkgs/pkgs/tools/virtualization/distrobuilder/deps.nix deleted file mode 100644 index 7f79d8931f..0000000000 --- a/third_party/nixpkgs/pkgs/tools/virtualization/distrobuilder/deps.nix +++ /dev/null @@ -1,228 +0,0 @@ -# This file was generated by https://github.com/kamilchm/go2nix v1.3.0 -[ - { - goPackagePath = "github.com/antchfx/xpath"; - fetch = { - type = "git"; - url = "https://github.com/antchfx/xpath"; - rev = "b6dbe470e10224a23b2f69db0d4449bc6627ece6"; - sha256 = "1959kzmjijpll6432da84rmzgd7p3yyqdq9chyxnm8318pr5znji"; - }; - } - { - goPackagePath = "github.com/flosch/pongo2"; - fetch = { - type = "git"; - url = "https://github.com/flosch/pongo2"; - rev = "bbf5a6c351f4d4e883daa40046a404d7553e0a00"; - sha256 = "0yqh58phznnxakm64w82gawrpndb0r85vsd1s7h244qqrq7w4avq"; - }; - } - { - goPackagePath = "github.com/gobuffalo/envy"; - fetch = { - type = "git"; - url = "https://github.com/gobuffalo/envy"; - rev = "043cb4b8af871b49563291e32c66bb84378a60ac"; - sha256 = "03jarnkaf42xgfamb0jlya4c1cyk8gnxhcd21m3fx145vz4px398"; - }; - } - { - goPackagePath = "github.com/gobuffalo/logger"; - fetch = { - type = "git"; - url = "https://github.com/gobuffalo/logger"; - rev = "7c291b53e05b81d77bd43109b4a3c6f84e45c8e1"; - sha256 = "1w6rkz0xwq3xj3giwzjkfnai69a0cgg09zx01z7s8r5z450cish3"; - }; - } - { - goPackagePath = "github.com/gobuffalo/packd"; - fetch = { - type = "git"; - url = "https://github.com/gobuffalo/packd"; - rev = "54ea459691466cfb630ccc276723fe3963f3e9d5"; - sha256 = "02sg33jkp219g0z3yf2fn9xm2zds1qxzdznx5mh8vffh4njjg1x8"; - }; - } - { - goPackagePath = "github.com/gobuffalo/packr"; - fetch = { - type = "git"; - url = "https://github.com/gobuffalo/packr"; - rev = "dc520c910ea91354b3ae131bbb029270e4fc1af4"; - sha256 = "1ph05pkbq0ggdab152f7hjlc758nkrw22fqgslnf1nvggadjkvqs"; - }; - } - { - goPackagePath = "github.com/gorilla/websocket"; - fetch = { - type = "git"; - url = "https://github.com/gorilla/websocket"; - rev = "ae1634f6a98965ded3b8789c626cb4e0bd78c3de"; - sha256 = "0nw0mdcs75ghr9a5asrk9a7yc00703yvv4xf6wyd3z44ihs4hrjv"; - }; - } - { - goPackagePath = "github.com/joho/godotenv"; - fetch = { - type = "git"; - url = "https://github.com/joho/godotenv"; - rev = "5c0e6c6ab1a0a9ef0a8822cba3a05d62f7dad941"; - sha256 = "0zfs69q7f5xlkqhd4wzjc8gfdisahapz5g94sa8lzr5b4jg9ycbw"; - }; - } - { - goPackagePath = "github.com/juju/errors"; - fetch = { - type = "git"; - url = "https://github.com/juju/errors"; - rev = "e65537c515d77e35697c471d6c2755375cb3adc4"; - sha256 = "119806fhl4isbxc3g52335jgiv6cddfbapr1absd4v4kkq55i5qh"; - }; - } - { - goPackagePath = "github.com/karrick/godirwalk"; - fetch = { - type = "git"; - url = "https://github.com/karrick/godirwalk"; - rev = "73c17a9b9528eb3ce857b782a2816c0cda581e62"; - sha256 = "0l0m5zi2mf649knxgmch1cblz3a3xiny1c9ki2241phkpwzspjq1"; - }; - } - { - goPackagePath = "github.com/lxc/lxd"; - fetch = { - type = "git"; - url = "https://github.com/lxc/lxd"; - rev = "fd924cb85d99475f9a0349208a8d7d0f30bdb6f0"; - sha256 = "1v246x0bi6ljkfjfjkfjbfh0imfbps2zd0m55cxdsl8y96pfx1hs"; - }; - } - { - goPackagePath = "github.com/mudler/docker-companion"; - fetch = { - type = "git"; - url = "https://github.com/mudler/docker-companion"; - rev = "6a693e9b9eaf2cd08ba628350613f2e08e9af57d"; - sha256 = "06ch1xhfd62dwkmh1z0ihifpmvgnki97k8s7gzivincy80xj0xpc"; - }; - } - { - goPackagePath = "github.com/pkg/errors"; - fetch = { - type = "git"; - url = "https://github.com/pkg/errors"; - rev = "27936f6d90f9c8e1145f11ed52ffffbfdb9e0af7"; - sha256 = "0yzmgi6g4ak4q8y7w6x0n5cbinlcn8yc3gwgzy4yck00qdn25d6y"; - }; - } - { - goPackagePath = "github.com/rogpeppe/go-internal"; - fetch = { - type = "git"; - url = "https://github.com/rogpeppe/go-internal"; - rev = "3670dca80da881cddd5377fb9496daaabb8dec9f"; - sha256 = "0h01adrajbl3h0yx3bkig79ap9n6ikz90cpszhqwvgr63a0xbn13"; - }; - } - { - goPackagePath = "github.com/sirupsen/logrus"; - fetch = { - type = "git"; - url = "https://github.com/sirupsen/logrus"; - rev = "07a84ee7412e7a28663d92930a1d46f81b124ee1"; - sha256 = "00hms8fnbhxb5lir3ykhl5lf1n2yqxddmd47cxp6d5ziv6k5swc8"; - }; - } - { - goPackagePath = "github.com/spf13/cobra"; - fetch = { - type = "git"; - url = "https://github.com/spf13/cobra"; - rev = "2d7544ebdeb5f926805c57af8dccc6c359de28d4"; - sha256 = "04b2bq8g948mn020l4cwhdnqffag29r21x2nyyg6cjqj306gs4vs"; - }; - } - { - goPackagePath = "github.com/spf13/pflag"; - fetch = { - type = "git"; - url = "https://github.com/spf13/pflag"; - rev = "24fa6976df40757dce6aea913e7b81ade90530e1"; - sha256 = "0rf6prz6gl0l1b3wijzdgq887cdwigvzxvz6gqbm5l8pkq3fx1m9"; - }; - } - { - goPackagePath = "golang.org/x/crypto"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/crypto"; - rev = "4def268fd1a49955bfb3dda92fe3db4f924f2285"; - sha256 = "1bfsnari529gw34cz0zqk3d9mrkcj1ay35kangri8kbgll0ss5a6"; - }; - } - { - goPackagePath = "golang.org/x/net"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/net"; - rev = "da137c7871d730100384dbcf36e6f8fa493aef5b"; - sha256 = "1qsiyr3irmb6ii06hivm9p2c7wqyxczms1a9v1ss5698yjr3fg47"; - }; - } - { - goPackagePath = "golang.org/x/sys"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/sys"; - rev = "fae7ac547cb717d141c433a2a173315e216b64c4"; - sha256 = "11pl0dycm5d8ar7g1l1w5q2cx0lms8i15n8mxhilhkdd2xpmh8f0"; - }; - } - { - goPackagePath = "golang.org/x/text"; - fetch = { - type = "git"; - url = "https://go.googlesource.com/text"; - rev = "342b2e1fbaa52c93f31447ad2c6abc048c63e475"; - sha256 = "0flv9idw0jm5nm8lx25xqanbkqgfiym6619w575p7nrdh0riqwqh"; - }; - } - { - goPackagePath = "gopkg.in/antchfx/htmlquery.v1"; - fetch = { - type = "git"; - url = "https://gopkg.in/antchfx/htmlquery.v1"; - rev = "b8d36292614567671decfe6f96c7b8c432d3249b"; - sha256 = "1rsvngqlqyg86g1ff59zmrkn7s8b3c2vpl533amwcv5s2h8npmxy"; - }; - } - { - goPackagePath = "gopkg.in/flosch/pongo2.v3"; - fetch = { - type = "git"; - url = "https://gopkg.in/flosch/pongo2.v3"; - rev = "5e81b817a0c48c1c57cdf1a9056cf76bdee02ca9"; - sha256 = "0fd7d79644zmcirsb1gvhmh0l5vb5nyxmkzkvqpmzzcg6yfczph8"; - }; - } - { - goPackagePath = "gopkg.in/robfig/cron.v2"; - fetch = { - type = "git"; - url = "https://gopkg.in/robfig/cron.v2"; - rev = "be2e0b0deed5a68ffee390b4583a13aff8321535"; - sha256 = "1cmm6dc4cl8269wlknxmicyn1s63irg66lj76b9ncjjfrvijpf0y"; - }; - } - { - goPackagePath = "gopkg.in/yaml.v2"; - fetch = { - type = "git"; - url = "https://gopkg.in/yaml.v2"; - rev = "51d6538a90f86fe93ac480b35f37b2be17fef232"; - sha256 = "01wj12jzsdqlnidpyjssmj0r4yavlqy7dwrg7adqd8dicjc4ncsa"; - }; - } -] diff --git a/third_party/nixpkgs/pkgs/tools/virtualization/google-compute-engine/default.nix b/third_party/nixpkgs/pkgs/tools/virtualization/google-compute-engine/default.nix index ad187544ae..fef461be7d 100644 --- a/third_party/nixpkgs/pkgs/tools/virtualization/google-compute-engine/default.nix +++ b/third_party/nixpkgs/pkgs/tools/virtualization/google-compute-engine/default.nix @@ -3,26 +3,85 @@ , buildPythonPackage , bash , bashInteractive -, systemd , util-linux , boto , setuptools , distro +, stdenv +, pythonOlder +, pytestCheckHook }: +let + guest-configs = stdenv.mkDerivation rec { + pname = "guest-configs"; + version = "20210702.00"; + + src = fetchFromGitHub { + owner = "GoogleCloudPlatform"; + repo = "guest-configs"; + rev = version; + sha256 = "1965kdrb1ig3z4qwzvyzx1fb4282ak5vgxcvvg5k9c759pzbc5nn"; + }; + + buildInputs = [ bash ]; + + dontConfigure = true; + dontBuild = true; + + installPhase = '' + runHook preInstall + + # allows to install the package in `services.udev.packages` in NixOS + mkdir -p $out/lib/udev $out/bin + + cp -r "src/lib/udev/rules.d" $out/lib/udev + cp "src/lib/udev/google_nvme_id" $out/bin + + for rules in $out/lib/udev/*.rules; do + substituteInPlace "$rules" \ + --replace /bin/sh "${bash}/bin/sh" \ + --replace /bin/umount "${util-linux}/bin/umount" \ + --replace /usr/bin/logger "${util-linux}/bin/logger" + done + + # sysctl snippets will be used by google-compute-config.nix + cp -r "src/etc/sysctl.d" $out + + patchShebangs $out/bin/* + + runHook postInstall + ''; + }; +in buildPythonPackage rec { pname = "google-compute-engine"; - version = "20190124"; + version = "20200113.0"; src = fetchFromGitHub { owner = "GoogleCloudPlatform"; repo = "compute-image-packages"; - rev = version; - sha256 = "08cy0jd463kng6hwbd3nfldsp4dpd2lknlvdm88cq795wy0kh4wp"; + rev = "506b9a0dbffec5620887660cd42c57b3cbbadba6"; + sha256 = "0lmc426mvrajghpavhs6hwl19mgnnh08ziqx5yi15fzpnvwmb8vz"; }; - buildInputs = [ bash ]; - propagatedBuildInputs = [ boto setuptools distro ]; + buildInputs = [ bash guest-configs ]; + propagatedBuildInputs = [ (if pythonOlder "3.7" then boto else distro) setuptools ]; + + preBuild = '' + cd packages/python-google-compute-engine + ''; + + disabledTests = [ + "testExtractInterfaceMetadata" + "testCallDhclientIpv6" + "testWriteConfig" + "testCreateInterfaceMapNetifaces" + "testCreateInterfaceMapSysfs" + "testGetNetworkInterface" + ]; + + checkInputs = [ pytestCheckHook ]; postPatch = '' for file in $(find google_compute_engine -type f); do @@ -32,33 +91,15 @@ buildPythonPackage rec { --replace /sbin/hwclock "${util-linux}/bin/hwclock" # SELinux tool ??? /sbin/restorecon done - - substituteInPlace google_config/udev/64-gce-disk-removal.rules \ - --replace /bin/sh "${bash}/bin/sh" \ - --replace /bin/umount "${util-linux}/bin/umount" \ - --replace /usr/bin/logger "${util-linux}/bin/logger" ''; - postInstall = '' - # allows to install the package in `services.udev.packages` in NixOS - mkdir -p $out/lib/udev/rules.d - cp -r google_config/udev/*.rules $out/lib/udev/rules.d - - # sysctl snippets will be used by google-compute-config.nix - mkdir -p $out/sysctl.d - cp google_config/sysctl/*.conf $out/sysctl.d - - patchShebangs $out/bin/* - ''; - - doCheck = false; pythonImportsCheck = [ "google_compute_engine" ]; meta = with lib; { description = "Google Compute Engine tools and services"; homepage = "https://github.com/GoogleCloudPlatform/compute-image-packages"; license = licenses.asl20; - maintainers = with maintainers; [ zimbatm ]; + maintainers = with maintainers; [ cpcloud zimbatm ]; platforms = platforms.linux; }; } diff --git a/third_party/nixpkgs/pkgs/tools/virtualization/linode-cli/default.nix b/third_party/nixpkgs/pkgs/tools/virtualization/linode-cli/default.nix index 8f71a22b96..c815f6fcf6 100644 --- a/third_party/nixpkgs/pkgs/tools/virtualization/linode-cli/default.nix +++ b/third_party/nixpkgs/pkgs/tools/virtualization/linode-cli/default.nix @@ -12,23 +12,23 @@ let # specVersion taken from: https://www.linode.com/docs/api/openapi.yaml at `info.version`. - specVersion = "4.101.0"; + specVersion = "4.102.0"; spec = fetchurl { url = "https://raw.githubusercontent.com/linode/linode-api-docs/v${specVersion}/openapi.yaml"; - sha256 = "1l4xi82b2pvkj7p1bq26ax2ava5vnv324j5sw3hvkkqqf1fmpdl5"; + sha256 = "16njk21gdk8r8a9v607ndw2rs0q6za9ylkgdxmix4j0zvrbrw0qv"; }; in buildPythonApplication rec { pname = "linode-cli"; - version = "5.6.0"; + version = "5.8.1"; src = fetchFromGitHub { owner = "linode"; repo = pname; rev = version; - sha256 = "sha256-AjO4h0PaE/QFwbwUVNoe98XOPZ24ct0mbLkua5/YsEA="; + sha256 = "19lfnwgm09gxk0mcikwl7v4hw2ai2k9lkdjlalz8fsswf81my7h6"; }; # remove need for git history diff --git a/third_party/nixpkgs/pkgs/tools/virtualization/shipyard/default.nix b/third_party/nixpkgs/pkgs/tools/virtualization/shipyard/default.nix index cd8a4c36a9..9c67b5462b 100644 --- a/third_party/nixpkgs/pkgs/tools/virtualization/shipyard/default.nix +++ b/third_party/nixpkgs/pkgs/tools/virtualization/shipyard/default.nix @@ -12,8 +12,8 @@ buildGoModule rec { }; vendorSha256 = "sha256-tTkPFftPDNXafIjAjNg6V6e/+2S/v5Do/YyAXPaGIqA="; - buildFlagsArray = [ - "-ldflags=-s -w -X main.version=${version}" + ldflags = [ + "-s" "-w" "-X main.version=${version}" ]; # Tests require a large variety of tools and resources to run including diff --git a/third_party/nixpkgs/pkgs/top-level/all-packages.nix b/third_party/nixpkgs/pkgs/top-level/all-packages.nix index 982122bf59..0fb2cc738d 100644 --- a/third_party/nixpkgs/pkgs/top-level/all-packages.nix +++ b/third_party/nixpkgs/pkgs/top-level/all-packages.nix @@ -1648,6 +1648,8 @@ with pkgs; hostctl = callPackage ../tools/system/hostctl { }; + hp2p = callPackage ../tools/networking/hp2p { }; + hpe-ltfs = callPackage ../tools/backup/hpe-ltfs { }; http2tcp = callPackage ../tools/networking/http2tcp { }; @@ -3203,6 +3205,8 @@ with pkgs; odafileconverter = libsForQt5.callPackage ../applications/graphics/odafileconverter {}; + ossutil = callPackage ../tools/admin/ossutil {}; + pastel = callPackage ../applications/misc/pastel { inherit (darwin.apple_sdk.frameworks) Security; }; @@ -3788,6 +3792,7 @@ with pkgs; collectd = callPackage ../tools/system/collectd { libsigrok = libsigrok_0_3; # not compatible with >= 0.4.0 yet jdk = jdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 + inherit (darwin.apple_sdk.frameworks) IOKit; }; collectd-data = callPackage ../tools/system/collectd/data.nix { }; @@ -4492,6 +4497,8 @@ with pkgs; sonobuoy = callPackage ../applications/networking/cluster/sonobuoy { }; + soupault = callPackage ../tools/typesetting/soupault { }; + strawberry = libsForQt5.callPackage ../applications/audio/strawberry { }; tealdeer = callPackage ../tools/misc/tealdeer { @@ -4588,7 +4595,9 @@ with pkgs; choose = callPackage ../tools/text/choose { }; - emscripten = callPackage ../development/compilers/emscripten { }; + emscripten = callPackage ../development/compilers/emscripten { + llvmPackages = llvmPackages_13; + }; emscriptenPackages = recurseIntoAttrs (callPackage ./emscripten-packages.nix { }); @@ -5184,6 +5193,8 @@ with pkgs; ghq = callPackage ../applications/version-management/git-and-tools/ghq { }; + gst = callPackage ../applications/version-management/git-and-tools/gst { }; + ghr = callPackage ../applications/version-management/git-and-tools/ghr { }; gibberish-detector = with python3Packages; toPythonApplication gibberish-detector; @@ -9284,7 +9295,7 @@ with pkgs; stricat = callPackage ../tools/security/stricat { }; - staruml = callPackage ../tools/misc/staruml { inherit (gnome2) GConf; libgcrypt = libgcrypt_1_5; }; + staruml = callPackage ../tools/misc/staruml { }; stone-phaser = callPackage ../applications/audio/stone-phaser { }; @@ -11512,9 +11523,7 @@ with pkgs; fsharp = callPackage ../development/compilers/fsharp { }; - fstar = callPackage ../development/compilers/fstar { - ocamlPackages = ocaml-ng.ocamlPackages_4_07; - }; + fstar = callPackage ../development/compilers/fstar { }; dotnetPackages = recurseIntoAttrs (callPackage ./dotnet-packages.nix {}); @@ -12604,7 +12613,7 @@ with pkgs; }; beam = callPackage ./beam-packages.nix { }; - beam_nox = callPackage ./beam-packages.nix { wxSupport = false; }; + beam_nox = callPackage ./beam-packages.nix { beam = beam_nox; wxSupport = false; }; inherit (beam.interpreters) erlang erlangR24 erlangR23 erlangR22 erlangR21 @@ -13165,6 +13174,8 @@ with pkgs; ameba = callPackage ../development/tools/ameba { }; + anybadge = with python3Packages; toPythonApplication anybadge; + augeas = callPackage ../tools/system/augeas { }; inherit (callPackage ../tools/admin/ansible { }) @@ -20648,6 +20659,10 @@ with pkgs; virtlyst = libsForQt5.callPackage ../servers/web-apps/virtlyst { }; + virtualenv = with python3Packages; toPythonApplication virtualenv; + + virtualenv-clone = with python3Packages; toPythonApplication virtualenv-clone; + virtuoso6 = callPackage ../servers/sql/virtuoso/6.x.nix { openssl = openssl_1_0_2; }; @@ -23999,6 +24014,8 @@ with pkgs; du-dust = callPackage ../tools/misc/dust { }; + dutree = callPackage ../tools/misc/dutree { }; + devede = callPackage ../applications/video/devede { }; denemo = callPackage ../applications/audio/denemo { }; @@ -24536,10 +24553,12 @@ with pkgs; firefox-esr-91-unwrapped = firefoxPackages.firefox-esr-91; firefox = wrapFirefox firefox-unwrapped { }; firefox-wayland = wrapFirefox firefox-unwrapped { forceWayland = true; }; - firefox-esr-wayland = wrapFirefox firefox-esr-91-unwrapped { forceWayland = true; }; firefox-esr-78 = wrapFirefox firefox-esr-78-unwrapped { }; firefox-esr-91 = wrapFirefox firefox-esr-91-unwrapped { }; + firefox-esr = firefox-esr-78; + firefox-esr-unwrapped = firefoxPackages.firefox-esr-78; + firefox-esr-wayland = wrapFirefox firefox-esr-91-unwrapped { forceWayland = true; }; firefox-bin-unwrapped = callPackage ../applications/networking/browsers/firefox-bin { channel = "release"; @@ -27867,6 +27886,8 @@ with pkgs; trojita = libsForQt5.callPackage ../applications/networking/mailreaders/trojita { }; + ttyper = callPackage ../applications/misc/ttyper { }; + tudu = callPackage ../applications/office/tudu { }; tuna = python3Packages.callPackage ../os-specific/linux/tuna { }; @@ -32019,6 +32040,8 @@ with pkgs; run-scaled = callPackage ../tools/X11/run-scaled { }; + runiq = callPackage ../tools/text/runiq { }; + runit = callPackage ../tools/system/runit { }; refind = callPackage ../tools/bootloaders/refind { }; diff --git a/third_party/nixpkgs/pkgs/top-level/emscripten-packages.nix b/third_party/nixpkgs/pkgs/top-level/emscripten-packages.nix index 9ae97cdf35..7cf60df98d 100644 --- a/third_party/nixpkgs/pkgs/top-level/emscripten-packages.nix +++ b/third_party/nixpkgs/pkgs/top-level/emscripten-packages.nix @@ -10,12 +10,11 @@ rec { stdenv = pkgs.emscriptenStdenv; }).overrideDerivation (old: { - nativeBuildInputs = [ autoreconfHook pkg-config ]; + nativeBuildInputs = [ pkg-config cmake ]; propagatedBuildInputs = [ zlib ]; - buildInputs = old.buildInputs ++ [ automake autoconf ]; configurePhase = '' HOME=$TMPDIR - emconfigure ./configure --prefix=$out + emcmake cmake . $cmakeFlags -DCMAKE_INSTALL_PREFIX=$out -DCMAKE_INSTALL_INCLUDEDIR=$dev/include ''; checkPhase = '' echo "================= testing json_c using node =================" @@ -26,7 +25,7 @@ rec { `pkg-config zlib --cflags` \ `pkg-config zlib --libs` \ -I . \ - .libs/libjson-c.so \ + libjson-c.a \ -o ./test1.js echo "Using node to execute the test which basically outputs an error on stderr which we grep for" @@ -163,7 +162,7 @@ rec { echo "Compiling a custom test" set -x emcc -O2 -s EMULATE_FUNCTION_POINTER_CASTS=1 test/example.c -DZ_SOLO \ - libz.so.${old.version} -I . -o example.js + -L. libz.so.${old.version} -I . -o example.js echo "Using node to execute the test" ${pkgs.nodejs}/bin/node ./example.js diff --git a/third_party/nixpkgs/pkgs/top-level/ocaml-packages.nix b/third_party/nixpkgs/pkgs/top-level/ocaml-packages.nix index 160c810840..f2f9c912ff 100644 --- a/third_party/nixpkgs/pkgs/top-level/ocaml-packages.nix +++ b/third_party/nixpkgs/pkgs/top-level/ocaml-packages.nix @@ -141,6 +141,8 @@ let cairo2 = callPackage ../development/ocaml-modules/cairo2 { }; + callipyge = callPackage ../development/ocaml-modules/callipyge { }; + caqti = callPackage ../development/ocaml-modules/caqti { }; caqti-async = callPackage ../development/ocaml-modules/caqti/async.nix { }; @@ -159,6 +161,8 @@ let cfstream = callPackage ../development/ocaml-modules/cfstream { }; + chacha = callPackage ../development/ocaml-modules/chacha { }; + charInfo_width = callPackage ../development/ocaml-modules/charInfo_width { }; checkseum = callPackage ../development/ocaml-modules/checkseum { }; @@ -804,6 +808,8 @@ let nocrypto = callPackage ../development/ocaml-modules/nocrypto { }; + noise = callPackage ../development/ocaml-modules/noise { }; + nonstd = callPackage ../development/ocaml-modules/nonstd { }; notty = callPackage ../development/ocaml-modules/notty { }; @@ -878,6 +884,8 @@ let ocaml_pcre = callPackage ../development/ocaml-modules/pcre {}; + ocaml-print-intf = callPackage ../development/ocaml-modules/ocaml-print-intf { }; + pgocaml = callPackage ../development/ocaml-modules/pgocaml {}; pgocaml_ppx = callPackage ../development/ocaml-modules/pgocaml/ppx.nix {}; @@ -1010,6 +1018,8 @@ let inherit (pkgs) postgresql; }; + pp = callPackage ../development/ocaml-modules/pp { }; + ppx_bap = callPackage ../development/ocaml-modules/ppx_bap { }; ppx_bitstring = callPackage ../development/ocaml-modules/bitstring/ppx.nix { @@ -1172,6 +1182,8 @@ let reason-native = lib.recurseIntoAttrs (callPackage ../development/ocaml-modules/reason-native { }); + rfc7748 = callPackage ../development/ocaml-modules/rfc7748 { }; + ezresto = callPackage ../development/ocaml-modules/resto/ezresto.nix { }; ezresto-directory = callPackage ../development/ocaml-modules/resto/ezresto-directory.nix { }; @@ -1304,6 +1316,8 @@ let vg = callPackage ../development/ocaml-modules/vg { }; + vlq = callPackage ../development/ocaml-modules/vlq { }; + visitors = callPackage ../development/ocaml-modules/visitors { }; wasm = callPackage ../development/ocaml-modules/wasm { }; diff --git a/third_party/nixpkgs/pkgs/top-level/perl-packages.nix b/third_party/nixpkgs/pkgs/top-level/perl-packages.nix index 6728030822..dfcbd7042c 100644 --- a/third_party/nixpkgs/pkgs/top-level/perl-packages.nix +++ b/third_party/nixpkgs/pkgs/top-level/perl-packages.nix @@ -7509,10 +7509,10 @@ let ExtUtilsCChecker = buildPerlModule { pname = "ExtUtils-CChecker"; - version = "0.10"; + version = "0.11"; src = fetchurl { - url = "mirror://cpan/authors/id/P/PE/PEVANS/ExtUtils-CChecker-0.10.tar.gz"; - sha256 = "50bfe76870fc1510f56bae4fa2dce0165d9ac4af4e7320d6b8fda14dfea4be0b"; + url = "mirror://cpan/authors/id/P/PE/PEVANS/ExtUtils-CChecker-0.11.tar.gz"; + sha256 = "1x8vafpff5nma18svxp1h3mp069fjmzlsdvnbcgn3z1pgrkkcxqi"; }; buildInputs = [ TestFatal ]; meta = { @@ -7638,10 +7638,10 @@ let ExtUtilsMakeMaker = buildPerlPackage { pname = "ExtUtils-MakeMaker"; - version = "7.56"; + version = "7.62"; src = fetchurl { - url = "mirror://cpan/authors/id/B/BI/BINGOS/ExtUtils-MakeMaker-7.56.tar.gz"; - sha256 = "05h058iwx81qs384kgyx34qnhqznavzwmhdsin65c434hga8jly9"; + url = "mirror://cpan/authors/id/B/BI/BINGOS/ExtUtils-MakeMaker-7.62.tar.gz"; + sha256 = "5022ad857fd76bd3f6b16af099fe2324639d9932e08f21e891fb313d9cae1705"; }; meta = { description = "Create a module Makefile"; @@ -8081,7 +8081,7 @@ let sha256 = "a02fbf285406a8a4d9399284f032f2d55c56975154c2e1674bd109837b8096ec"; }; buildInputs = [ ExtUtilsCChecker ]; - perlPreHook = lib.optionalString stdenv.isi686 "export LD=$CC"; # fix undefined reference to `__stack_chk_fail_local' + perlPreHook = lib.optionalString (stdenv.isi686 || stdenv.isDarwin) "export LD=$CC"; # fix undefined reference to `__stack_chk_fail_local' meta = { description = "Modify attributes of symlinks without dereferencing them"; license = with lib.licenses; [ artistic1 gpl1Plus ]; @@ -8645,13 +8645,13 @@ let FutureAsyncAwait = buildPerlModule rec { pname = "Future-AsyncAwait"; - version = "0.49"; + version = "0.52"; src = fetchurl { url = "mirror://cpan/authors/id/P/PE/PEVANS/Future-AsyncAwait-${version}.tar.gz"; - sha256 = "0cm7cgfjrqs7jazl0f9q6lgkhz6k8qbawin1z36nrwh2ywc94zjb"; + sha256 = "0dwij2r51vij91hx808zc2l5q38h55jahzrh73h4rn816jv597yx"; }; buildInputs = [ TestRefcount ]; - propagatedBuildInputs = [ Future XSParseSublike ]; + propagatedBuildInputs = [ Future XSParseKeyword XSParseSublike ]; perlPreHook = lib.optionalString stdenv.isDarwin "export LD=$CC"; meta = { description = "Deferred subroutine syntax for futures"; @@ -9101,12 +9101,15 @@ let Graph = buildPerlPackage { pname = "Graph"; - version = "0.9712"; + version = "0.9722"; src = fetchurl { - url = "mirror://cpan/authors/id/E/ET/ETJ/Graph-0.9712.tar.gz"; - sha256 = "1as4ngbqxrjv9f31hm3wg8pyiyrz5fbbvlpfsrm68k1yskwkgkcg"; + url = "mirror://cpan/authors/id/E/ET/ETJ/Graph-0.9722.tar.gz"; + sha256 = "c113633833f3a1bef8fa8eb96680be36d00e41ef404bddd7fc0bb98703e28d4d"; + }; + propagatedBuildInputs = [ HeapFibonacci SetObject ]; + meta = { + license = with lib.licenses; [ artistic1 gpl1Plus ]; }; - propagatedBuildInputs = [ HeapFibonacci ]; }; GraphicsTIFF = buildPerlPackage { @@ -24152,11 +24155,12 @@ let XSParseKeyword = buildPerlModule { pname = "XS-Parse-Keyword"; - version = "0.06"; + version = "0.12"; src = fetchurl { - url = "mirror://cpan/authors/id/P/PE/PEVANS/XS-Parse-Keyword-0.06.tar.gz"; - sha256 = "0nnr8akkxb2h2y3d5r51pr84vvxkq89ynmi9azkbnn79jmbcbgvq"; + url = "mirror://cpan/authors/id/P/PE/PEVANS/XS-Parse-Keyword-0.12.tar.gz"; + sha256 = "0crwhcw9ciqndvwvhycd93m6jgyhi77yyj4vi9xfyglpv84p3y68"; }; + buildInputs = [ ExtUtilsCChecker ]; perlPreHook = lib.optionalString stdenv.isDarwin "export LD=$CC"; meta = { description = "XS functions to assist in parsing keyword syntax"; @@ -24167,10 +24171,10 @@ let XSParseSublike = buildPerlModule { pname = "XS-Parse-Sublike"; - version = "0.10"; + version = "0.12"; src = fetchurl { - url = "mirror://cpan/authors/id/P/PE/PEVANS/XS-Parse-Sublike-0.10.tar.gz"; - sha256 = "99a1bdda3ffa67514adb6aa189c902fa78dca41d778a42ae7079f604a045ac43"; + url = "mirror://cpan/authors/id/P/PE/PEVANS/XS-Parse-Sublike-0.12.tar.gz"; + sha256 = "08kpia48f1rqc44rvbns97h3jyy2y5c8qlkh4a95v1m0yr5cb22s"; }; buildInputs = [ TestFatal ]; perlPreHook = lib.optionalString stdenv.isDarwin "export LD=$CC"; diff --git a/third_party/nixpkgs/pkgs/top-level/python-aliases.nix b/third_party/nixpkgs/pkgs/top-level/python-aliases.nix index 3f60f90e08..27b467cbb2 100644 --- a/third_party/nixpkgs/pkgs/top-level/python-aliases.nix +++ b/third_party/nixpkgs/pkgs/top-level/python-aliases.nix @@ -53,7 +53,9 @@ mapAliases ({ HAP-python = hap-python; # added 2021-06-01 lammps-cython = throw "no longer builds and is unmaintained"; MechanicalSoup = mechanicalsoup; # added 2021-06-01 + pam = python-pam; # added 2020-09-07. privacyidea = throw "renamed to pkgs.privacyidea"; # added 2021-06-20 + prometheus_client = prometheus-client; # added 2021-06-10 prompt_toolkit = prompt-toolkit; pylibgen = throw "pylibgen is unmaintained upstreamed, and removed from nixpkgs"; # added 2020-06-20 pymssql = throw "pymssql has been abandoned upstream."; # added 2020-05-04 @@ -63,7 +65,6 @@ mapAliases ({ pytestquickcheck = pytest-quickcheck; # added 2021-07-20 pytestrunner = pytest-runner; # added 2021-01-04 python-lz4 = lz4; # added 2018-06-01 - pam = python-pam; # added 2020-09-07. pytest_xdist = pytest-xdist; # added 2021-01-04 python_simple_hipchat = python-simple-hipchat; # added 2021-07-21 qasm2image = throw "qasm2image is no longer maintained (since November 2018), and is not compatible with the latest pythonPackages.qiskit versions."; # added 2020-12-09 diff --git a/third_party/nixpkgs/pkgs/top-level/python-packages.nix b/third_party/nixpkgs/pkgs/top-level/python-packages.nix index e5405bf7e3..50f4bf108d 100644 --- a/third_party/nixpkgs/pkgs/top-level/python-packages.nix +++ b/third_party/nixpkgs/pkgs/top-level/python-packages.nix @@ -477,6 +477,8 @@ in { anyascii = callPackage ../development/python-modules/anyascii { }; + anybadge = callPackage ../development/python-modules/anybadge { }; + anyio = callPackage ../development/python-modules/anyio { }; anyjson = callPackage ../development/python-modules/anyjson { }; @@ -2995,6 +2997,8 @@ in { google-cloud-asset = callPackage ../development/python-modules/google-cloud-asset { }; + google-cloud-audit-log = callPackage ../development/python-modules/google-cloud-audit-log { }; + google-cloud-automl = callPackage ../development/python-modules/google-cloud-automl { }; google-cloud-bigquery = callPackage ../development/python-modules/google-cloud-bigquery { }; @@ -4642,6 +4646,8 @@ in { mpi4py = callPackage ../development/python-modules/mpi4py { }; + mpldatacursor = callPackage ../development/python-modules/mpldatacursor { }; + mplfinance = callPackage ../development/python-modules/mplfinance { }; mplleaflet = callPackage ../development/python-modules/mplleaflet { }; @@ -5667,7 +5673,7 @@ in { progress = callPackage ../development/python-modules/progress { }; - prometheus_client = callPackage ../development/python-modules/prometheus_client { }; + prometheus-client = callPackage ../development/python-modules/prometheus-client { }; prometheus-flask-exporter = callPackage ../development/python-modules/prometheus-flask-exporter { }; @@ -8641,6 +8647,8 @@ in { tenacity = callPackage ../development/python-modules/tenacity { }; + tensorboard-data-server = callPackage ../development/python-modules/tensorboard-data-server { }; + tensorboard-plugin-profile = callPackage ../development/python-modules/tensorboard-plugin-profile { }; tensorboard-plugin-wit = callPackage ../development/python-modules/tensorboard-plugin-wit {};