From 07b8fe05462e5e5a9ec860169a7cd5a5d86bbc69 Mon Sep 17 00:00:00 2001 From: Default email Date: Fri, 12 Mar 2021 08:09:13 +0100 Subject: [PATCH] Project import generated by Copybara. GitOrigin-RevId: 916ee862e87ac5ee2439f2fb7856386b4dc906ae --- .../nixpkgs/doc/builders/fetchers.chapter.md | 4 + .../builders/images/dockertools.section.md | 28 +- .../doc/languages-frameworks/coq.section.md | 6 +- .../nixpkgs/maintainers/maintainer-list.nix | 6 + .../doc/manual/configuration/x-windows.xml | 16 +- .../development/writing-nixos-tests.xml | 11 + .../doc/manual/release-notes/rl-2105.xml | 38 + .../nixpkgs/nixos/modules/module-list.nix | 1 + .../nixos/modules/services/audio/spotifyd.nix | 1 + .../modules/services/backup/borgmatic.nix | 57 ++ .../modules/services/misc/apache-kafka.nix | 23 +- .../monitoring/prometheus/exporters.nix | 26 +- .../prometheus/exporters/artifactory.nix | 59 ++ .../monitoring/prometheus/exporters/knot.nix | 50 + .../prometheus/exporters/systemd.nix | 18 + .../modules/services/networking/privoxy.nix | 310 ++++-- .../modules/services/web-apps/nextcloud.nix | 14 +- .../modules/services/web-apps/whitebophir.nix | 9 +- .../nixos/modules/services/x11/xserver.nix | 7 +- third_party/nixpkgs/nixos/tests/all-tests.nix | 1 + .../nixpkgs/nixos/tests/docker-tools.nix | 16 + third_party/nixpkgs/nixos/tests/kafka.nix | 6 +- .../nixpkgs/nixos/tests/nextcloud/basic.nix | 22 +- third_party/nixpkgs/nixos/tests/privoxy.nix | 113 +++ .../nixos/tests/prometheus-exporters.nix | 49 + .../applications/audio/bchoppr/default.nix | 4 +- .../pkgs/applications/audio/csa/default.nix | 2 +- .../applications/audio/denemo/default.nix | 4 +- .../applications/audio/musescore/darwin.nix | 2 +- .../bump-security-framework-crate.patch | 19 + .../applications/audio/ncspot/default.nix | 11 +- .../applications/audio/plexamp/default.nix | 7 +- .../applications/audio/reaper/default.nix | 4 +- .../applications/blockchains/ergo/default.nix | 4 +- .../applications/blockchains/go-ethereum.nix | 4 +- .../pkgs/applications/blockchains/lnd.nix | 6 +- .../editors/emacs-modes/elpa-packages.nix | 3 + .../applications/editors/vscode/vscode.nix | 10 +- .../graphics/megapixels/default.nix | 13 +- .../sane/backends/airscan/default.nix | 10 +- .../misc/1password-gui/default.nix | 4 +- .../applications/misc/almanah/default.nix | 4 +- .../applications/misc/cointop/default.nix | 4 +- .../pkgs/applications/misc/dasel/default.nix | 4 +- .../applications/misc/dmensamenu/default.nix | 4 +- .../pkgs/applications/misc/dunst/default.nix | 11 +- .../applications/misc/foxtrotgps/default.nix | 16 +- .../misc/foxtrotgps/gps-status-fix.patch | 14 - .../applications/misc/gallery-dl/default.nix | 4 +- .../applications/misc/index-fm/default.nix | 52 + .../pkgs/applications/misc/keeweb/default.nix | 19 +- .../applications/misc/merkaartor/default.nix | 53 +- .../pkgs/applications/misc/mkgmap/default.nix | 4 +- .../applications/misc/obsidian/default.nix | 4 +- .../pkgs/applications/misc/sent/default.nix | 7 +- .../applications/misc/sidequest/default.nix | 10 +- .../pkgs/applications/misc/ticker/default.nix | 4 +- .../pkgs/applications/misc/tickrs/default.nix | 6 +- .../pkgs/applications/misc/tipp10/default.nix | 10 +- .../networking/browsers/brave/default.nix | 6 +- .../networking/browsers/castor/default.nix | 10 +- .../networking/browsers/chromium/common.nix | 5 +- .../networking/browsers/chromium/default.nix | 4 +- .../browsers/chromium/upstream-info.json | 34 +- .../cluster/helm/plugins/helm-secrets.nix | 4 +- .../networking/cluster/helmfile/default.nix | 4 +- .../networking/cluster/kube3d/default.nix | 20 +- .../networking/cluster/minikube/default.nix | 6 +- .../networking/cluster/nerdctl/default.nix | 32 +- .../networking/cluster/terraform/default.nix | 6 +- .../networking/cluster/terragrunt/default.nix | 15 +- .../instant-messengers/signal-cli/default.nix | 4 +- .../telepathy/gabble/default.nix | 4 +- .../telepathy/haze/default.nix | 4 +- .../telepathy/idle/default.nix | 4 +- .../telepathy/logger/default.nix | 4 +- .../telepathy/salut/default.nix | 4 +- .../networking/irc/qweechat/default.nix | 31 - .../thunderbird-bin/release_sources.nix | 530 +++++----- .../mailreaders/thunderbird/default.nix | 4 +- .../networking/p2p/eiskaltdcpp/default.nix | 4 +- .../networking/remote/remmina/default.nix | 4 +- .../networking/remote/teamviewer/default.nix | 4 +- .../networking/seaweedfs/default.nix | 4 +- .../networking/sniffers/wireshark/default.nix | 14 +- .../networking/sync/rclone/default.nix | 6 +- .../networking/testssl/default.nix | 4 +- .../applications/office/portfolio/default.nix | 4 +- .../applications/office/zotero/default.nix | 4 +- .../science/biology/octopus/default.nix | 18 +- .../hal-hardware-analyzer/default.nix | 4 +- .../science/electronics/verilator/default.nix | 4 +- .../science/math/giac/default.nix | 43 +- .../science/math/palp/default.nix | 6 +- .../science/math/qalculate-gtk/default.nix | 4 +- ...disable-pexpect-intermittent-failure.patch | 29 - .../math/sage/patches/pillow-update.patch | 39 - .../register-pretty-printer-earlier.patch | 36 - .../patches/sagespawn-implicit-casting.patch | 13 - .../science/math/sage/sage-src.nix | 102 +- .../applications/search/recoll/default.nix | 4 +- .../git-and-tools/subgit/default.nix | 4 +- .../version-management/gitlab/data.json | 10 +- .../gitlab/gitaly/default.nix | 4 +- .../gitlab/gitlab-workhorse/default.nix | 4 +- .../version-management/gitlab/rubyEnv/Gemfile | 3 + .../gitlab/rubyEnv/Gemfile.lock | 3 +- .../gitlab/rubyEnv/gemset.nix | 4 +- .../version-management/gitlab/yarnPkgs.nix | 8 +- .../applications/video/avidemux/default.nix | 4 +- .../applications/video/droidcam/default.nix | 4 +- .../applications/video/minitube/default.nix | 14 +- .../applications/video/shotcut/default.nix | 4 +- .../virtualization/docker-compose/default.nix | 4 +- .../window-managers/cagebreak/default.nix | 5 +- .../pkgs/build-support/coq/default.nix | 35 +- .../build-support/coq/meta-fetch/default.nix | 11 +- .../pkgs/build-support/docker/default.nix | 20 +- .../pkgs/build-support/docker/examples.nix | 14 + .../docker/stream_layered_image.py | 10 +- .../build-support/fetchsourcehut/default.nix | 25 + .../nixpkgs/pkgs/data/fonts/iosevka/bin.nix | 2 +- .../pkgs/data/fonts/iosevka/variants.nix | 46 +- .../desktops/gnome-3/core/rygel/default.nix | 4 +- .../desktops/gnome-3/games/tali/default.nix | 4 +- .../desktops/lxqt/lxqt-policykit/default.nix | 2 + .../development/compilers/gambit/build.nix | 36 +- .../development/compilers/gerbil/build.nix | 2 +- .../development/compilers/mruby/default.nix | 4 +- .../development/compilers/vyper/default.nix | 4 +- .../coq-modules/multinomials/default.nix | 9 +- .../development/interpreters/alda/default.nix | 4 +- .../interpreters/ceptre/default.nix | 2 +- .../interpreters/duktape/default.nix | 10 +- .../interpreters/evcxr/default.nix | 6 +- .../interpreters/jruby/default.nix | 2 +- .../interpreters/metamath/default.nix | 10 +- .../development/interpreters/mujs/default.nix | 4 +- .../interpreters/sollya/default.nix | 29 + .../interpreters/tinyscheme/default.nix | 4 +- .../development/libraries/arb/default.nix | 13 +- .../libraries/backward-cpp/default.nix | 2 +- .../development/libraries/brigand/default.nix | 2 +- .../libraries/cminpack/default.nix | 10 +- .../libraries/croaring/default.nix | 2 +- .../development/libraries/ethash/default.nix | 2 +- .../development/libraries/gensio/default.nix | 2 +- .../libraries/intel-media-driver/default.nix | 4 +- .../libraries/java/commons/lang/default.nix | 4 +- .../development/libraries/libbap/default.nix | 5 + .../development/libraries/libqb/default.nix | 4 +- .../development/libraries/librsb/default.nix | 86 ++ .../libraries/liburing/default.nix | 4 +- .../libraries/libwebsockets/default.nix | 2 +- .../development/libraries/lyra/default.nix | 2 +- .../development/libraries/mauikit/default.nix | 42 + .../libraries/mediastreamer/default.nix | 4 +- .../nemo-qml-plugin-dbus/default.nix | 4 +- .../development/libraries/openmpi/default.nix | 4 +- .../development/libraries/openpa/default.nix | 2 +- .../development/libraries/ortp/default.nix | 4 +- .../libraries/qtutilities/default.nix | 7 +- .../science/math/rankwidth/default.nix | 6 +- ...clean-extra-logfile-output-from-pari.patch | 39 + .../libraries/science/math/sympow/default.nix | 2 + .../libraries/telepathy/glib/default.nix | 45 +- .../development/libraries/tepl/default.nix | 4 +- .../libraries/wxwidgets/3.0/default.nix | 19 +- .../mobile/cocoapods/Gemfile-beta.lock | 22 +- .../development/mobile/cocoapods/Gemfile.lock | 22 +- .../mobile/cocoapods/gemset-beta.nix | 40 +- .../development/mobile/cocoapods/gemset.nix | 40 +- .../ocaml-modules/batteries/default.nix | 4 +- .../ocaml-modules/ctypes/default.nix | 8 +- .../ocaml-modules/janestreet/0.12.nix | 7 +- .../ocaml-modules/janestreet/0.14.nix | 8 +- .../ocaml-modules/janestreet/default.nix | 7 +- .../ocaml-modules/janestreet/janePackage.nix | 6 +- .../janestreet/janePackage_0_12.nix | 6 +- .../janestreet/janePackage_0_14.nix | 6 +- .../ocaml-modules/ppx_cstubs/default.nix | 44 + .../ocaml-modules/ppx_deriving/default.nix | 29 +- .../ocaml-modules/ppxlib/default.nix | 4 + .../ocaml-modules/sodium/default.nix | 5 + .../sodium/lib-gen-link-bigarray.patch | 7 + .../octave-modules/sparsersb/default.nix | 4 +- .../development/php-packages/apcu/default.nix | 4 +- .../php-packages/smbclient/default.nix | 4 +- .../python-modules/APScheduler/default.nix | 17 +- .../python-modules/HAP-python/default.nix | 46 +- .../python-modules/Wand/default.nix | 4 +- .../python-modules/aiostream/default.nix | 4 +- .../python-modules/ansible-lint/default.nix | 2 +- .../python-modules/asdf/default.nix | 2 + .../python-modules/ase/default.nix | 4 +- .../python-modules/asyncpg/default.nix | 4 +- .../azure-mgmt-containerservice/default.nix | 4 +- .../azure-mgmt-cosmosdb/default.nix | 4 +- .../azure-mgmt-hanaonazure/default.nix | 4 +- .../azure-mgmt-iotcentral/default.nix | 4 +- .../azure-mgmt-media/default.nix | 4 +- .../azure-mgmt-storage/default.nix | 4 +- .../azure-servicebus/default.nix | 4 +- .../azure-synapse-accesscontrol/default.nix | 4 +- .../azure-synapse-artifacts/default.nix | 4 +- .../azure-synapse-spark/default.nix | 4 +- .../python-modules/bayespy/default.nix | 4 +- .../python-modules/boto3/default.nix | 4 +- .../python-modules/botocore/default.nix | 4 +- .../python-modules/buildbot/default.nix | 4 +- .../python-modules/buildbot/pkg.nix | 2 +- .../python-modules/buildbot/plugins.nix | 10 +- .../python-modules/buildbot/worker.nix | 2 +- .../python-modules/buildout/default.nix | 4 +- .../python-modules/cairosvg/default.nix | 2 +- .../python-modules/cartopy/default.nix | 3 +- .../python-modules/casbin/default.nix | 4 +- .../python-modules/cliff/default.nix | 4 +- .../python-modules/clifford/default.nix | 2 + .../python-modules/coloredlogs/default.nix | 4 +- .../python-modules/construct/2.10.54.nix | 29 + .../python-modules/convertdate/2.2.x.nix | 36 + .../python-modules/convertdate/default.nix | 3 + .../python-modules/cornice/default.nix | 4 +- .../python-modules/cssutils/default.nix | 32 +- .../python-modules/cysignals/default.nix | 11 + .../python-modules/dask-jobqueue/default.nix | 1 + .../python-modules/dateparser/0.x.nix | 55 ++ .../python-modules/defcon/default.nix | 12 +- .../django-extensions/default.nix | 4 +- .../python-modules/docker/default.nix | 14 +- .../python-modules/elementpath/default.nix | 4 +- .../flowlogs_reader/default.nix | 4 +- .../python-modules/fontparts/default.nix | 4 +- .../google-cloud-dns/default.nix | 4 +- .../google-cloud-monitoring/default.nix | 2 +- .../python-modules/gspread/default.nix | 4 +- .../python-modules/gssapi/default.nix | 4 +- .../python-modules/hcloud/default.nix | 4 +- .../python-modules/hdmedians/default.nix | 4 +- .../development/python-modules/jc/default.nix | 4 +- .../python-modules/labelbox/default.nix | 4 +- .../python-modules/libcst/default.nix | 9 +- .../python-modules/marisa-trie/default.nix | 7 +- .../python-modules/mmh3/default.nix | 4 +- .../python-modules/mpi4py/default.nix | 8 +- .../python-modules/objgraph/default.nix | 4 +- .../python-modules/pikepdf/default.nix | 4 +- .../python-modules/plotly/default.nix | 4 +- .../python-modules/pre-commit/default.nix | 5 +- ...he-hardcoded-path-to-python-binaries.patch | 14 +- .../python-modules/pymysensors/default.nix | 4 +- .../python-modules/pystray/default.nix | 4 +- .../python-modules/pytest-sanic/default.nix | 37 +- .../python-modules/pytile/default.nix | 8 +- .../python-modules/pytorch/default.nix | 15 +- .../python-modules/safety/default.nix | 4 +- .../python-modules/sagemaker/default.nix | 4 +- .../python-modules/sanic/default.nix | 9 +- .../python-modules/sentry-sdk/default.nix | 4 +- .../snowflake-connector-python/default.nix | 11 +- .../snowflake-sqlalchemy/default.nix | 1 + .../python-modules/update-dotdee/default.nix | 4 +- .../development/python-modules/vcrpy/3.nix | 48 + .../python-modules/vcrpy/default.nix | 3 + .../python-modules/watchdog/default.nix | 11 +- .../python-modules/yamllint/default.nix | 30 +- .../tools/analysis/nix-linter/default.nix | 12 +- .../tools/analysis/tfsec/default.nix | 4 +- .../tools/build-managers/bear/default.nix | 10 +- .../bear/no-double-relative.patch | 10 +- .../tools/build-managers/sbt/default.nix | 4 +- .../jenkins/default.nix | 4 +- .../database/timescaledb-tune/default.nix | 6 +- .../pkgs/development/tools/ginkgo/default.nix | 6 +- .../development/tools/glpaper/default.nix | 12 +- .../development/tools/go-task/default.nix | 6 +- .../development/tools/go-tools/default.nix | 4 +- .../pkgs/development/tools/gops/default.nix | 4 +- .../pkgs/development/tools/hcloud/default.nix | 6 +- .../development/tools/kustomize/default.nix | 13 +- .../tools/misc/circleci-cli/default.nix | 4 +- .../development/tools/misc/hydra/common.nix | 4 +- .../development/tools/misc/hydra/default.nix | 9 +- .../hydra/hydra-nix-receiveContents.patch | 18 - .../tools/misc/openocd/default.nix | 18 +- .../development/tools/misc/rman/default.nix | 5 +- .../pkgs/development/tools/ocaml/dune/2.nix | 4 +- .../tools/open-policy-agent/default.nix | 21 +- .../tools/parsing/jikespg/default.nix | 19 +- .../tools/rust/bindgen/default.nix | 6 +- .../tools/rust/cargo-make/default.nix | 6 +- .../development/tools/wrangler/default.nix | 9 +- .../pkgs/development/web/cypress/default.nix | 4 +- .../nixpkgs/pkgs/games/among-sus/default.nix | 7 +- .../nixpkgs/pkgs/games/boohu/default.nix | 2 +- .../nixpkgs/pkgs/games/bzflag/default.nix | 4 +- .../nixpkgs/pkgs/games/eidolon/default.nix | 7 +- .../nixpkgs/pkgs/games/harmonist/default.nix | 6 +- .../nixpkgs/pkgs/games/harmonist/deps.nix | 94 +- .../nixpkgs/pkgs/games/maelstrom/default.nix | 39 + .../games/maelstrom/fix-compilation.patch | 42 + .../nixpkgs/pkgs/games/tintin/default.nix | 4 +- .../nixpkgs/pkgs/games/xcowsay/default.nix | 9 +- .../pkgs/misc/emulators/libdsk/default.nix | 4 +- .../pkgs/misc/tmux-plugins/default.nix | 81 +- .../pkgs/misc/vim-plugins/generated.nix | 436 ++++---- .../pkgs/misc/vim-plugins/overrides.nix | 10 +- .../pkgs/misc/vim-plugins/vim-plugin-names | 2 +- .../vscode-extensions/terraform/default.nix | 4 +- .../terraform/fix-terraform-ls.patch | 11 +- .../pkgs/os-specific/darwin/m-cli/default.nix | 2 +- .../firmware/system76-firmware/default.nix | 6 +- .../linux/kernel/common-config.nix | 2 + .../linux/kernel/hardened/patches.json | 24 +- .../os-specific/linux/kernel/linux-4.14.nix | 4 +- .../os-specific/linux/kernel/linux-4.19.nix | 4 +- .../os-specific/linux/kernel/linux-4.4.nix | 4 +- .../os-specific/linux/kernel/linux-4.9.nix | 4 +- .../os-specific/linux/kernel/linux-5.10.nix | 4 +- .../os-specific/linux/kernel/linux-5.11.nix | 4 +- .../os-specific/linux/kernel/linux-5.4.nix | 4 +- .../os-specific/linux/kernel/linux-libre.nix | 4 +- .../linux/kernel/linux-rt-5.10.nix | 6 +- .../linux/kernel/linux-rt-5.11.nix | 6 +- .../os-specific/linux/kernel/linux-rt-5.4.nix | 6 +- .../os-specific/linux/rdma-core/default.nix | 4 +- .../pkgs/os-specific/linux/uclibc/default.nix | 4 +- .../pkgs/os-specific/linux/zfs/default.nix | 8 +- .../windows/mcfgthreads/default.nix | 4 + .../pkgs/servers/apache-kafka/default.nix | 20 +- .../pkgs/servers/computing/slurm/default.nix | 4 +- .../home-assistant/component-packages.nix | 4 +- .../pkgs/servers/home-assistant/default.nix | 4 +- .../pkgs/servers/home-assistant/frontend.nix | 4 +- .../pkgs/servers/http/unit/default.nix | 4 +- .../nixpkgs/pkgs/servers/jackett/default.nix | 4 +- .../nixpkgs/pkgs/servers/klipper/default.nix | 8 +- .../pkgs/servers/matrix-synapse/default.nix | 4 +- .../pkgs/servers/mattermost/matterircd.nix | 4 +- .../nixpkgs/pkgs/servers/minio/default.nix | 6 +- .../grafana-image-renderer/default.nix | 8 +- .../grafana-image-renderer/package.json | 6 +- .../grafana-image-renderer/yarn.lock | 558 +++++++++-- .../grafana-image-renderer/yarn.nix | 576 +++++++++-- .../servers/monitoring/grafana/default.nix | 8 +- .../prometheus/artifactory-exporter.nix | 36 + .../monitoring/prometheus/knot-exporter.nix | 39 + .../monitoring/prometheus/promscale.nix | 4 +- .../prometheus/systemd-exporter.nix | 25 + .../pkgs/servers/nosql/redis/default.nix | 4 +- .../nixpkgs/pkgs/servers/ser2net/default.nix | 4 +- .../nixpkgs/pkgs/servers/sql/dolt/default.nix | 6 +- .../servers/sql/postgresql/ext/repmgr.nix | 4 +- .../nixpkgs/pkgs/servers/squid/default.nix | 4 +- .../nixpkgs/pkgs/servers/trezord/default.nix | 8 +- .../servers/web-apps/whitebophir/default.nix | 3 +- .../whitebophir/node-packages-generated.nix | 148 +-- .../web-apps/whitebophir/node-packages.json | 2 +- .../pkgs/shells/fish/plugins/clownfish.nix | 20 + .../pkgs/shells/fish/plugins/default.nix | 7 + .../pkgs/shells/fish/plugins/fishtape_3.nix | 25 + .../pkgs/shells/fish/plugins/fzf-fish.nix | 34 + .../pkgs/shells/zsh/oh-my-zsh/default.nix | 2 +- .../pkgs/tools/X11/autocutsel/default.nix | 4 +- .../pkgs/tools/admin/awscli/default.nix | 4 +- .../pkgs/tools/audio/abcmidi/default.nix | 7 +- .../pkgs/tools/audio/beets/default.nix | 9 +- .../pkgs/tools/audio/yabridge/default.nix | 6 +- .../pkgs/tools/audio/yabridgectl/default.nix | 6 +- .../pkgs/tools/backup/borgmatic/default.nix | 50 + .../tools/filesystems/mtdutils/default.nix | 19 +- .../filesystems/unionfs-fuse/default.nix | 29 +- .../pkgs/tools/misc/cutecom/default.nix | 13 +- .../pkgs/tools/misc/fselect/default.nix | 3 +- .../pkgs/tools/misc/goreleaser/default.nix | 6 +- .../nixpkgs/pkgs/tools/misc/lorri/default.nix | 8 +- .../tools/misc/mongodb-compass/default.nix | 4 +- .../nixpkgs/pkgs/tools/misc/tmuxp/default.nix | 4 +- .../pkgs/tools/misc/tremor-rs/default.nix | 3 +- .../tools/misc/uutils-coreutils/default.nix | 7 +- .../nixpkgs/pkgs/tools/misc/ytfzf/default.nix | 11 +- .../pkgs/tools/networking/clash/default.nix | 6 +- .../pkgs/tools/networking/croc/default.nix | 6 +- .../tools/networking/dnsproxy/default.nix | 4 +- .../pkgs/tools/networking/gping/default.nix | 6 +- .../pkgs/tools/networking/kea/default.nix | 4 +- .../tools/networking/minio-client/default.nix | 6 +- .../pkgs/tools/networking/privoxy/default.nix | 25 +- .../pkgs/tools/networking/ripmime/default.nix | 5 +- .../pkgs/tools/networking/wget/default.nix | 4 +- .../pkgs/tools/networking/whois/default.nix | 4 +- .../tools/package-management/nix/default.nix | 23 +- .../tools/security/bundler-audit/Gemfile.lock | 6 +- .../tools/security/bundler-audit/gemset.nix | 8 +- .../pkgs/tools/security/gitleaks/default.nix | 6 +- .../tools/security/hashcat-utils/default.nix | 2 +- .../pkgs/tools/security/hcxtools/default.nix | 4 +- .../pkgs/tools/security/prs/default.nix | 6 +- .../rbw/bump-security-framework-crate.patch | 19 + .../pkgs/tools/security/rbw/default.nix | 17 +- .../tools/security/theharvester/default.nix | 6 +- .../pkgs/tools/security/uddup/default.nix | 35 + .../pkgs/tools/security/wipe/default.nix | 2 +- .../nixpkgs/pkgs/tools/system/bfs/default.nix | 4 +- .../nixpkgs/pkgs/tools/system/gdu/default.nix | 4 +- .../pkgs/tools/system/stress-ng/default.nix | 4 +- .../pkgs/tools/system/thermald/default.nix | 4 +- .../pkgs/tools/system/uptimed/default.nix | 8 +- .../tools/text/fst/0001-cargo-lockfile.patch | 935 ++++++++++++++++++ .../nixpkgs/pkgs/tools/text/fst/default.nix | 45 + .../nixpkgs/pkgs/tools/text/shfmt/default.nix | 2 +- .../nixpkgs/pkgs/tools/text/tab/default.nix | 4 +- .../tools/typesetting/tectonic/default.nix | 6 +- .../nixpkgs/pkgs/top-level/aliases.nix | 1 + .../nixpkgs/pkgs/top-level/all-packages.nix | 31 +- .../nixpkgs/pkgs/top-level/ocaml-packages.nix | 4 + .../pkgs/top-level/octave-packages.nix | 6 +- .../pkgs/top-level/python-packages.nix | 540 ++++++---- .../nixpkgs/pkgs/top-level/qt5-packages.nix | 2 + 420 files changed, 6202 insertions(+), 2451 deletions(-) create mode 100644 third_party/nixpkgs/nixos/modules/services/backup/borgmatic.nix create mode 100644 third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/artifactory.nix create mode 100644 third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/knot.nix create mode 100644 third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/systemd.nix create mode 100644 third_party/nixpkgs/nixos/tests/privoxy.nix create mode 100644 third_party/nixpkgs/pkgs/applications/audio/ncspot/bump-security-framework-crate.patch delete mode 100644 third_party/nixpkgs/pkgs/applications/misc/foxtrotgps/gps-status-fix.patch create mode 100644 third_party/nixpkgs/pkgs/applications/misc/index-fm/default.nix delete mode 100644 third_party/nixpkgs/pkgs/applications/networking/irc/qweechat/default.nix delete mode 100644 third_party/nixpkgs/pkgs/applications/science/math/sage/patches/disable-pexpect-intermittent-failure.patch delete mode 100644 third_party/nixpkgs/pkgs/applications/science/math/sage/patches/pillow-update.patch delete mode 100644 third_party/nixpkgs/pkgs/applications/science/math/sage/patches/register-pretty-printer-earlier.patch delete mode 100644 third_party/nixpkgs/pkgs/applications/science/math/sage/patches/sagespawn-implicit-casting.patch create mode 100644 third_party/nixpkgs/pkgs/build-support/fetchsourcehut/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/interpreters/sollya/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/libraries/librsb/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/libraries/mauikit/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/libraries/science/math/sympow/clean-extra-logfile-output-from-pari.patch create mode 100644 third_party/nixpkgs/pkgs/development/ocaml-modules/ppx_cstubs/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/ocaml-modules/sodium/lib-gen-link-bigarray.patch create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/construct/2.10.54.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/convertdate/2.2.x.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/dateparser/0.x.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/vcrpy/3.nix delete mode 100644 third_party/nixpkgs/pkgs/development/tools/misc/hydra/hydra-nix-receiveContents.patch create mode 100644 third_party/nixpkgs/pkgs/games/maelstrom/default.nix create mode 100644 third_party/nixpkgs/pkgs/games/maelstrom/fix-compilation.patch create mode 100644 third_party/nixpkgs/pkgs/servers/monitoring/prometheus/artifactory-exporter.nix create mode 100644 third_party/nixpkgs/pkgs/servers/monitoring/prometheus/knot-exporter.nix create mode 100644 third_party/nixpkgs/pkgs/servers/monitoring/prometheus/systemd-exporter.nix create mode 100644 third_party/nixpkgs/pkgs/shells/fish/plugins/clownfish.nix create mode 100644 third_party/nixpkgs/pkgs/shells/fish/plugins/fishtape_3.nix create mode 100644 third_party/nixpkgs/pkgs/shells/fish/plugins/fzf-fish.nix create mode 100644 third_party/nixpkgs/pkgs/tools/backup/borgmatic/default.nix create mode 100644 third_party/nixpkgs/pkgs/tools/security/rbw/bump-security-framework-crate.patch create mode 100644 third_party/nixpkgs/pkgs/tools/security/uddup/default.nix create mode 100644 third_party/nixpkgs/pkgs/tools/text/fst/0001-cargo-lockfile.patch create mode 100644 third_party/nixpkgs/pkgs/tools/text/fst/default.nix diff --git a/third_party/nixpkgs/doc/builders/fetchers.chapter.md b/third_party/nixpkgs/doc/builders/fetchers.chapter.md index 16e4baa966..317c9430cd 100644 --- a/third_party/nixpkgs/doc/builders/fetchers.chapter.md +++ b/third_party/nixpkgs/doc/builders/fetchers.chapter.md @@ -72,3 +72,7 @@ This is used with Savannah repositories. The arguments expected are very similar ## `fetchFromRepoOrCz` This is used with repo.or.cz repositories. The arguments expected are very similar to fetchFromGitHub above. + +## `fetchFromSourcehut` + +This is used with sourcehut repositories. The arguments expected are very similar to fetchFromGitHub above. Don't forget the tilde (~) in front of the user name! diff --git a/third_party/nixpkgs/doc/builders/images/dockertools.section.md b/third_party/nixpkgs/doc/builders/images/dockertools.section.md index 0d7774e891..40d4dba1b8 100644 --- a/third_party/nixpkgs/doc/builders/images/dockertools.section.md +++ b/third_party/nixpkgs/doc/builders/images/dockertools.section.md @@ -38,15 +38,15 @@ The above example will build a Docker image `redis/latest` from the given base i - `name` specifies the name of the resulting image. This is the only required argument for `buildImage`. -- `tag` specifies the tag of the resulting image. By default it\'s `null`, which indicates that the nix output hash will be used as tag. +- `tag` specifies the tag of the resulting image. By default it's `null`, which indicates that the nix output hash will be used as tag. -- `fromImage` is the repository tarball containing the base image. It must be a valid Docker image, such as exported by `docker save`. By default it\'s `null`, which can be seen as equivalent to `FROM scratch` of a `Dockerfile`. +- `fromImage` is the repository tarball containing the base image. It must be a valid Docker image, such as exported by `docker save`. By default it's `null`, which can be seen as equivalent to `FROM scratch` of a `Dockerfile`. -- `fromImageName` can be used to further specify the base image within the repository, in case it contains multiple images. By default it\'s `null`, in which case `buildImage` will peek the first image available in the repository. +- `fromImageName` can be used to further specify the base image within the repository, in case it contains multiple images. By default it's `null`, in which case `buildImage` will peek the first image available in the repository. -- `fromImageTag` can be used to further specify the tag of the base image within the repository, in case an image contains multiple tags. By default it\'s `null`, in which case `buildImage` will peek the first tag available for the base image. +- `fromImageTag` can be used to further specify the tag of the base image within the repository, in case an image contains multiple tags. By default it's `null`, in which case `buildImage` will peek the first tag available for the base image. -- `contents` is a derivation that will be copied in the new layer of the resulting image. This can be similarly seen as `ADD contents/ /` in a `Dockerfile`. By default it\'s `null`. +- `contents` is a derivation that will be copied in the new layer of the resulting image. This can be similarly seen as `ADD contents/ /` in a `Dockerfile`. By default it's `null`. - `runAsRoot` is a bash script that will run as root in an environment that overlays the existing layers of the base image with the new resulting layer, including the previously copied `contents` derivation. This can be similarly seen as `RUN ...` in a `Dockerfile`. @@ -109,7 +109,7 @@ Create a Docker image with many of the store paths being on their own layer to i : Tag of the generated image. - *Default:* the output path\'s hash + *Default:* the output path's hash `contents` _optional_ @@ -139,7 +139,7 @@ Create a Docker image with many of the store paths being on their own layer to i `extraCommands` _optional_ -: Shell commands to run while building the final layer, without access to most of the layer contents. Changes to this layer are \"on top\" of all the other layers, so can create additional directories and files. +: Shell commands to run while building the final layer, without access to most of the layer contents. Changes to this layer are "on top" of all the other layers, so can create additional directories and files. ### Behavior of `contents` in the final image {#dockerTools-buildLayeredImage-arg-contents} @@ -183,9 +183,9 @@ Modern Docker installations support up to 128 layers, however older versions sup If the produced image will not be extended by other Docker builds, it is safe to set `maxLayers` to `128`. However it will be impossible to extend the image further. -The first (`maxLayers-2`) most \"popular\" paths will have their own individual layers, then layer \#`maxLayers-1` will contain all the remaining \"unpopular\" paths, and finally layer \#`maxLayers` will contain the Image configuration. +The first (`maxLayers-2`) most "popular" paths will have their own individual layers, then layer \#`maxLayers-1` will contain all the remaining "unpopular" paths, and finally layer \#`maxLayers` will contain the Image configuration. -Docker\'s Layers are not inherently ordered, they are content-addressable and are not explicitly layered until they are composed in to an Image. +Docker's Layers are not inherently ordered, they are content-addressable and are not explicitly layered until they are composed in to an Image. ## streamLayeredImage {#ssec-pkgs-dockerTools-streamLayeredImage} @@ -226,15 +226,15 @@ pullImage { - `imageDigest` specifies the digest of the image to be downloaded. This argument is required. -- `finalImageName`, if specified, this is the name of the image to be created. Note it is never used to fetch the image since we prefer to rely on the immutable digest ID. By default it\'s equal to `imageName`. +- `finalImageName`, if specified, this is the name of the image to be created. Note it is never used to fetch the image since we prefer to rely on the immutable digest ID. By default it's equal to `imageName`. -- `finalImageTag`, if specified, this is the tag of the image to be created. Note it is never used to fetch the image since we prefer to rely on the immutable digest ID. By default it\'s `latest`. +- `finalImageTag`, if specified, this is the tag of the image to be created. Note it is never used to fetch the image since we prefer to rely on the immutable digest ID. By default it's `latest`. - `sha256` is the checksum of the whole fetched image. This argument is required. -- `os`, if specified, is the operating system of the fetched image. By default it\'s `linux`. +- `os`, if specified, is the operating system of the fetched image. By default it's `linux`. -- `arch`, if specified, is the cpu architecture of the fetched image. By default it\'s `x86_64`. +- `arch`, if specified, is the cpu architecture of the fetched image. By default it's `x86_64`. `nix-prefetch-docker` command can be used to get required image parameters: @@ -278,7 +278,7 @@ The `name` argument is the name of the derivation output, which defaults to `fro ## shadowSetup {#ssec-pkgs-dockerTools-shadowSetup} -This constant string is a helper for setting up the base files for managing users and groups, only if such files don\'t exist already. It is suitable for being used in a [`buildImage` `runAsRoot`](#ex-dockerTools-buildImage-runAsRoot) script for cases like in the example below: +This constant string is a helper for setting up the base files for managing users and groups, only if such files don't exist already. It is suitable for being used in a [`buildImage` `runAsRoot`](#ex-dockerTools-buildImage-runAsRoot) script for cases like in the example below: ```nix buildImage { diff --git a/third_party/nixpkgs/doc/languages-frameworks/coq.section.md b/third_party/nixpkgs/doc/languages-frameworks/coq.section.md index 8f564c6e46..5964d46e2f 100644 --- a/third_party/nixpkgs/doc/languages-frameworks/coq.section.md +++ b/third_party/nixpkgs/doc/languages-frameworks/coq.section.md @@ -21,8 +21,8 @@ The recommended way of defining a derivation for a Coq library, is to use the `c * if it is a string of the form `owner:branch` then it tries to download the `branch` of owner `owner` for a project of the same name using the same vcs, and the `version` attribute of the resulting derivation is set to `"dev"`, additionally if the owner is not provided (i.e. if the `owner:` prefix is missing), it defaults to the original owner of the package (see below), * if it is a string of the form `"#N"`, and the domain is github, then it tries to download the current head of the pull request `#N` from github, * `defaultVersion` (optional). Coq libraries may be compatible with some specific versions of Coq only. The `defaultVersion` attribute is used when no `version` is provided (or if `version = null`) to select the version of the library to use by default, depending on the context. This selection will mainly depend on a `coq` version number but also possibly on other packages versions (e.g. `mathcomp`). If its value ends up to be `null`, the package is marked for removal in end-user `coqPackages` attribute set. -* `release` (optional, defaults to `{}`), lists all the known releases of the library and for each of them provides an attribute set with at least a `sha256` attribute (you may use the shell command `nix-prefetch-url --unpack ` to find it, where `` is for example `https://github.com/owner/repo/archive/version.tar.gz`), each attribute set of the list of releases also takes optional overloading arguments for the fetcher as below (i.e.`domain`, `owner`, `repo`, `rev` assuming the default fetcher is used) and optional overrides for the result of the fetcher (i.e. `version` and `src`). -* `fetcher` (optional, default to a generic fetching mechanism supporting github or gitlab based infrastructures), is a function that takes at least an `owner`, a `repo`, a `rev`, and a `sha256` and returns an attribute set with a `version` and `src`. +* `release` (optional, defaults to `{}`), lists all the known releases of the library and for each of them provides an attribute set with at least a `sha256` attribute (you may put the empty string `""` in order to automatically insert a fake sha256, this will trigger an error which will allow you to find the correct sha256), each attribute set of the list of releases also takes optional overloading arguments for the fetcher as below (i.e.`domain`, `owner`, `repo`, `rev` assuming the default fetcher is used) and optional overrides for the result of the fetcher (i.e. `version` and `src`). +* `fetcher` (optional, defaults to a generic fetching mechanism supporting github or gitlab based infrastructures), is a function that takes at least an `owner`, a `repo`, a `rev`, and a `sha256` and returns an attribute set with a `version` and `src`. * `repo` (optional, defaults to the value of `pname`), * `owner` (optional, defaults to `"coq-community"`). * `domain` (optional, defaults to `"github.com"`), domains including the strings `"github"` or `"gitlab"` in their names are automatically supported, otherwise, one must change the `fetcher` argument to support them (cf `pkgs/development/coq-modules/heq/default.nix` for an example), @@ -31,6 +31,8 @@ The recommended way of defining a derivation for a Coq library, is to use the `c * `namePrefix` (optional), provides a way to alter the computation of `name` from `pname`, by explaining which dependencies must occur in `name`, * `extraBuildInputs` (optional), by default `buildInputs` just contains `coq`, this allows to add more build inputs, * `mlPlugin` (optional, defaults to `false`). Some extensions (plugins) might require OCaml and sometimes other OCaml packages. Standard dependencies can be added by setting the current option to `true`. For a finer grain control, the `coq.ocamlPackages` attribute can be used in `extraBuildInputs` to depend on the same package set Coq was built against. +* `useDune2ifVersion` (optional, default to `(x: false)` uses Dune2 to build the package if the provided predicate evaluates to true on the version, e.g. `useDune2if = versions.isGe "1.1"` will use dune if the version of the package is greater or equal to `"1.1"`, +* `useDune2` (optional, defaults to `false`) uses Dune2 to build the package if set to true, the presence of this attribute overrides the behavior of the previous one. * `enableParallelBuilding` (optional, defaults to `true`), since it is activated by default, we provide a way to disable it. * `extraInstallFlags` (optional), allows to extend `installFlags` which initializes the variable `COQMF_COQLIB` so as to install in the proper subdirectory. Indeed Coq libraries should be installed in `$(out)/lib/coq/${coq.coq-version}/user-contrib/`. Such directories are automatically added to the `$COQPATH` environment variable by the hook defined in the Coq derivation. * `setCOQBIN` (optional, defaults to `true`), by default, the environment variable `$COQBIN` is set to the current Coq's binary, but one can disable this behavior by setting it to `false`, diff --git a/third_party/nixpkgs/maintainers/maintainer-list.nix b/third_party/nixpkgs/maintainers/maintainer-list.nix index 63248693c3..a9bf9e61f9 100644 --- a/third_party/nixpkgs/maintainers/maintainer-list.nix +++ b/third_party/nixpkgs/maintainers/maintainer-list.nix @@ -4015,6 +4015,12 @@ githubId = 993484; name = "Greg Hale"; }; + imlonghao = { + email = "nixos@esd.cc"; + github = "imlonghao"; + githubId = 4951333; + name = "Hao Long"; + }; immae = { email = "ismael@bouya.org"; github = "immae"; diff --git a/third_party/nixpkgs/nixos/doc/manual/configuration/x-windows.xml b/third_party/nixpkgs/nixos/doc/manual/configuration/x-windows.xml index dd879702d7..a499f0080d 100644 --- a/third_party/nixpkgs/nixos/doc/manual/configuration/x-windows.xml +++ b/third_party/nixpkgs/nixos/doc/manual/configuration/x-windows.xml @@ -150,7 +150,6 @@ = [ "nvidiaLegacy390" ]; = [ "nvidiaLegacy340" ]; = [ "nvidiaLegacy304" ]; - = [ "nvidiaLegacy173" ]; You may need to reboot after enabling this driver to prevent a clash with other kernel modules. @@ -159,21 +158,16 @@ Proprietary AMD drivers - AMD provides a proprietary driver for its graphics cards that has better 3D - performance than the X.org drivers. It is not enabled by default because - it’s not free software. You can enable it as follows: + AMD provides a proprietary driver for its graphics cards that is not + enabled by default because it’s not Free Software, is often broken + in nixpkgs and as of this writing doesn't offer more features or + performance. If you still want to use it anyway, you need to explicitly set: - = [ "ati_unfree" ]; + = [ "amdgpu-pro" ]; You will need to reboot after enabling this driver to prevent a clash with other kernel modules. - - - For recent AMD GPUs you most likely want to keep either the defaults - or "amdgpu" (both free). - - Touchpads diff --git a/third_party/nixpkgs/nixos/doc/manual/development/writing-nixos-tests.xml b/third_party/nixpkgs/nixos/doc/manual/development/writing-nixos-tests.xml index cab4c067e0..5f70f74d5d 100644 --- a/third_party/nixpkgs/nixos/doc/manual/development/writing-nixos-tests.xml +++ b/third_party/nixpkgs/nixos/doc/manual/development/writing-nixos-tests.xml @@ -448,6 +448,17 @@ import ./make-test-python.nix { Python code… ''; } + + This will produce a Nix warning at evaluation time. To fully disable the + linter, wrap the test script in comment directives to disable the Black linter + directly (again, don't commit this within the Nixpkgs repository): + + testScript = + '' + # fmt: off + Python code… + # fmt: on + ''; diff --git a/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-2105.xml b/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-2105.xml index 2f87869fbe..e052632eca 100644 --- a/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-2105.xml +++ b/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-2105.xml @@ -39,6 +39,24 @@ (#7547). + + + Privoxy has been updated + to version 3.0.32 (See announcement). + Compared to the previous release, Privoxy has gained support for HTTPS + inspection (still experimental), Brotli decompression, several new filters + and lots of bug fixes, including security ones. In addition, the package + is now built with compression and external filters support, which were + previously disabled. + + + Regarding the NixOS module, new options for HTTPS inspection have been added + and has been replaced by the new + + (See RFC 0042 + for the motivation). + + @@ -539,6 +557,26 @@ self: super: imagemagick6Big if you need the older version. + + + no longer uses the deprecated cirrus and vesa device dependent X drivers by default. It also enables both amdgpu and nouveau drivers by default now. + + + + + The apacheKafka packages are now built with + version-matched JREs. Versions 2.6 and above, the ones that recommend it, + use jdk11, while versions below remain on jdk8. The NixOS service has + been adjusted to start the service using the same version as the package, + adjustable with the new + services.apache-kafka.jre + option. Furthermore, the default list of + services.apache-kafka.jvmOptions + have been removed. You should set your own according to the + upstream documentation + for your Kafka version. + + diff --git a/third_party/nixpkgs/nixos/modules/module-list.nix b/third_party/nixpkgs/nixos/modules/module-list.nix index 9bb81d085c..f226194efd 100644 --- a/third_party/nixpkgs/nixos/modules/module-list.nix +++ b/third_party/nixpkgs/nixos/modules/module-list.nix @@ -242,6 +242,7 @@ ./services/backup/automysqlbackup.nix ./services/backup/bacula.nix ./services/backup/borgbackup.nix + ./services/backup/borgmatic.nix ./services/backup/duplicati.nix ./services/backup/duplicity.nix ./services/backup/mysql-backup.nix diff --git a/third_party/nixpkgs/nixos/modules/services/audio/spotifyd.nix b/third_party/nixpkgs/nixos/modules/services/audio/spotifyd.nix index a589153248..9279a03aed 100644 --- a/third_party/nixpkgs/nixos/modules/services/audio/spotifyd.nix +++ b/third_party/nixpkgs/nixos/modules/services/audio/spotifyd.nix @@ -27,6 +27,7 @@ in wantedBy = [ "multi-user.target" ]; after = [ "network-online.target" "sound.target" ]; description = "spotifyd, a Spotify playing daemon"; + environment.SHELL = "/bin/sh"; serviceConfig = { ExecStart = "${pkgs.spotifyd}/bin/spotifyd --no-daemon --cache-path /var/cache/spotifyd --config-path ${spotifydConf}"; Restart = "always"; diff --git a/third_party/nixpkgs/nixos/modules/services/backup/borgmatic.nix b/third_party/nixpkgs/nixos/modules/services/backup/borgmatic.nix new file mode 100644 index 0000000000..5e5c0bbecc --- /dev/null +++ b/third_party/nixpkgs/nixos/modules/services/backup/borgmatic.nix @@ -0,0 +1,57 @@ +{ config, lib, pkgs, ... }: + +with lib; + +let + cfg = config.services.borgmatic; + cfgfile = pkgs.writeText "config.yaml" (builtins.toJSON cfg.settings); +in { + options.services.borgmatic = { + enable = mkEnableOption "borgmatic"; + + settings = mkOption { + description = '' + See https://torsion.org/borgmatic/docs/reference/configuration/ + ''; + type = types.submodule { + freeformType = with lib.types; attrsOf anything; + options.location = { + source_directories = mkOption { + type = types.listOf types.str; + description = '' + List of source directories to backup (required). Globs and + tildes are expanded. + ''; + example = [ "/home" "/etc" "/var/log/syslog*" ]; + }; + repositories = mkOption { + type = types.listOf types.str; + description = '' + Paths to local or remote repositories (required). Tildes are + expanded. Multiple repositories are backed up to in + sequence. Borg placeholders can be used. See the output of + "borg help placeholders" for details. See ssh_command for + SSH options like identity file or port. If systemd service + is used, then add local repository paths in the systemd + service file to the ReadWritePaths list. + ''; + example = [ + "user@backupserver:sourcehostname.borg" + "user@backupserver:{fqdn}" + ]; + }; + }; + }; + }; + }; + + config = mkIf cfg.enable { + + environment.systemPackages = [ pkgs.borgmatic ]; + + environment.etc."borgmatic/config.yaml".source = cfgfile; + + systemd.packages = [ pkgs.borgmatic ]; + + }; +} diff --git a/third_party/nixpkgs/nixos/modules/services/misc/apache-kafka.nix b/third_party/nixpkgs/nixos/modules/services/misc/apache-kafka.nix index f3a650a260..69dfadfe54 100644 --- a/third_party/nixpkgs/nixos/modules/services/misc/apache-kafka.nix +++ b/third_party/nixpkgs/nixos/modules/services/misc/apache-kafka.nix @@ -90,19 +90,7 @@ in { jvmOptions = mkOption { description = "Extra command line options for the JVM running Kafka."; - default = [ - "-server" - "-Xmx1G" - "-Xms1G" - "-XX:+UseCompressedOops" - "-XX:+UseParNewGC" - "-XX:+UseConcMarkSweepGC" - "-XX:+CMSClassUnloadingEnabled" - "-XX:+CMSScavengeBeforeRemark" - "-XX:+DisableExplicitGC" - "-Djava.awt.headless=true" - "-Djava.net.preferIPv4Stack=true" - ]; + default = []; type = types.listOf types.str; example = [ "-Djava.net.preferIPv4Stack=true" @@ -118,6 +106,13 @@ in { type = types.package; }; + jre = mkOption { + description = "The JRE with which to run Kafka"; + default = cfg.package.passthru.jre; + defaultText = "pkgs.apacheKafka.passthru.jre"; + type = types.package; + }; + }; config = mkIf cfg.enable { @@ -138,7 +133,7 @@ in { after = [ "network.target" ]; serviceConfig = { ExecStart = '' - ${pkgs.jre}/bin/java \ + ${cfg.jre}/bin/java \ -cp "${cfg.package}/libs/*" \ -Dlog4j.configuration=file:${logConfig} \ ${toString cfg.jvmOptions} \ diff --git a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters.nix b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters.nix index 940f281893..115ecbf12b 100644 --- a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters.nix +++ b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters.nix @@ -3,7 +3,7 @@ let inherit (lib) concatStrings foldl foldl' genAttrs literalExample maintainers mapAttrsToList mkDefault mkEnableOption mkIf mkMerge mkOption - optional types; + optional types mkOptionDefault flip attrNames; cfg = config.services.prometheus.exporters; @@ -22,6 +22,7 @@ let exporterOpts = genAttrs [ "apcupsd" + "artifactory" "bind" "bird" "blackbox" @@ -31,6 +32,7 @@ let "fritzbox" "json" "keylight" + "knot" "lnd" "mail" "mikrotik" @@ -51,6 +53,7 @@ let "smokeping" "sql" "surfboard" + "systemd" "tor" "unifi" "unifi-poller" @@ -64,7 +67,7 @@ let mkExporterOpts = ({ name, port }: { enable = mkEnableOption "the prometheus ${name} exporter"; port = mkOption { - type = types.int; + type = types.port; default = port; description = '' Port to listen on. @@ -92,9 +95,8 @@ let ''; }; firewallFilter = mkOption { - type = types.str; - default = "-p tcp -m tcp --dport ${toString cfg.${name}.port}"; - defaultText = "-p tcp -m tcp --dport ${toString port}"; + type = types.nullOr types.str; + default = null; example = literalExample '' "-i eth0 -p tcp -m tcp --dport ${toString port}" ''; @@ -122,12 +124,14 @@ let mkSubModule = { name, port, extraOpts, imports }: { ${name} = mkOption { - type = types.submodule { + type = types.submodule [{ inherit imports; options = (mkExporterOpts { inherit name port; } // extraOpts); - }; + } ({ config, ... }: mkIf config.openFirewall { + firewallFilter = mkOptionDefault "-p tcp -m tcp --dport ${toString config.port}"; + })]; internal = true; default = {}; }; @@ -232,7 +236,13 @@ in Please specify either 'services.prometheus.exporters.sql.configuration' or 'services.prometheus.exporters.sql.configFile' ''; - } ]; + } ] ++ (flip map (attrNames cfg) (exporter: { + assertion = cfg.${exporter}.firewallFilter != null -> cfg.${exporter}.openFirewall; + message = '' + The `firewallFilter'-option of exporter ${exporter} doesn't have any effect unless + `openFirewall' is set to `true'! + ''; + })); }] ++ [(mkIf config.services.minio.enable { services.prometheus.exporters.minio.minioAddress = mkDefault "http://localhost:9000"; services.prometheus.exporters.minio.minioAccessKey = mkDefault config.services.minio.accessKey; diff --git a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/artifactory.nix b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/artifactory.nix new file mode 100644 index 0000000000..2adcecc728 --- /dev/null +++ b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/artifactory.nix @@ -0,0 +1,59 @@ +{ config, lib, pkgs, options }: + +with lib; + +let + cfg = config.services.prometheus.exporters.artifactory; +in +{ + port = 9531; + extraOpts = { + scrapeUri = mkOption { + type = types.str; + default = "http://localhost:8081/artifactory"; + description = '' + URI on which to scrape JFrog Artifactory. + ''; + }; + + artiUsername = mkOption { + type = types.str; + description = '' + Username for authentication against JFrog Artifactory API. + ''; + }; + + artiPassword = mkOption { + type = types.str; + default = ""; + description = '' + Password for authentication against JFrog Artifactory API. + One of the password or access token needs to be set. + ''; + }; + + artiAccessToken = mkOption { + type = types.str; + default = ""; + description = '' + Access token for authentication against JFrog Artifactory API. + One of the password or access token needs to be set. + ''; + }; + }; + serviceOpts = { + serviceConfig = { + ExecStart = '' + ${pkgs.prometheus-artifactory-exporter}/bin/artifactory_exporter \ + --web.listen-address ${cfg.listenAddress}:${toString cfg.port} \ + --artifactory.scrape-uri ${cfg.scrapeUri} \ + ${concatStringsSep " \\\n " cfg.extraFlags} + ''; + Environment = [ + "ARTI_USERNAME=${cfg.artiUsername}" + "ARTI_PASSWORD=${cfg.artiPassword}" + "ARTI_ACCESS_TOKEN=${cfg.artiAccessToken}" + ]; + }; + }; +} diff --git a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/knot.nix b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/knot.nix new file mode 100644 index 0000000000..46c28fe0a5 --- /dev/null +++ b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/knot.nix @@ -0,0 +1,50 @@ +{ config, lib, pkgs, options }: + +with lib; + +let + cfg = config.services.prometheus.exporters.knot; +in { + port = 9433; + extraOpts = { + knotLibraryPath = mkOption { + type = types.str; + default = "${pkgs.knot-dns.out}/lib/libknot.so"; + defaultText = "\${pkgs.knot-dns}/lib/libknot.so"; + description = '' + Path to the library of knot-dns. + ''; + }; + + knotSocketPath = mkOption { + type = types.str; + default = "/run/knot/knot.sock"; + description = '' + Socket path of knotd + 8. + ''; + }; + + knotSocketTimeout = mkOption { + type = types.int; + default = 2000; + description = '' + Timeout in seconds. + ''; + }; + }; + serviceOpts = { + serviceConfig = { + ExecStart = '' + ${pkgs.prometheus-knot-exporter}/bin/knot_exporter \ + --web-listen-addr ${cfg.listenAddress} \ + --web-listen-port ${toString cfg.port} \ + --knot-library-path ${cfg.knotLibraryPath} \ + --knot-socket-path ${cfg.knotSocketPath} \ + --knot-socket-timeout ${toString cfg.knotSocketTimeout} \ + ${concatStringsSep " \\\n " cfg.extraFlags} + ''; + SupplementaryGroups = [ "knot" ]; + }; + }; +} diff --git a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/systemd.nix b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/systemd.nix new file mode 100644 index 0000000000..0514469b8a --- /dev/null +++ b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/systemd.nix @@ -0,0 +1,18 @@ +{ config, pkgs, lib, ... }: + +with lib; + +let cfg = config.services.prometheus.exporters.systemd; + +in { + port = 9558; + + serviceOpts = { + serviceConfig = { + ExecStart = '' + ${pkgs.prometheus-systemd-exporter}/bin/systemd_exporter \ + --web.listen-address ${cfg.listenAddress}:${toString cfg.port} + ''; + }; + }; +} diff --git a/third_party/nixpkgs/nixos/modules/services/networking/privoxy.nix b/third_party/nixpkgs/nixos/modules/services/networking/privoxy.nix index 7caae32820..7c22b7d09b 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/privoxy.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/privoxy.nix @@ -4,26 +4,46 @@ with lib; let - inherit (pkgs) privoxy; - cfg = config.services.privoxy; - confFile = pkgs.writeText "privoxy.conf" ('' - user-manual ${privoxy}/share/doc/privoxy/user-manual - confdir ${privoxy}/etc/ - listen-address ${cfg.listenAddress} - enable-edit-actions ${if (cfg.enableEditActions == true) then "1" else "0"} - ${concatMapStrings (f: "actionsfile ${f}\n") cfg.actionsFiles} - ${concatMapStrings (f: "filterfile ${f}\n") cfg.filterFiles} - '' + optionalString cfg.enableTor '' - forward-socks5t / 127.0.0.1:9063 . - toggle 1 - enable-remote-toggle 0 - enable-edit-actions 0 - enable-remote-http-toggle 0 - '' + '' - ${cfg.extraConfig} - ''); + serialise = name: val: + if isList val then concatMapStrings (serialise name) val + else if isBool val then serialise name (if val then "1" else "0") + else "${name} ${toString val}\n"; + + configType = with types; + let atom = oneOf [ int bool string path ]; + in attrsOf (either atom (listOf atom)) + // { description = '' + privoxy configuration type. The format consists of an attribute + set of settings. Each setting can be either a value (integer, string, + boolean or path) or a list of such values. + ''; + }; + + ageType = types.str // { + check = x: + isString x && + (builtins.match "([0-9]+([smhdw]|min|ms|us)*)+" x != null); + description = "tmpfiles.d(5) age format"; + }; + + configFile = pkgs.writeText "privoxy.conf" + (concatStrings ( + # Relative paths in some options are relative to confdir. Privoxy seems + # to parse the options in order of appearance, so this must come first. + # Nix however doesn't preserve the order in attrsets, so we have to + # hardcode confdir here. + [ "confdir ${pkgs.privoxy}/etc\n" ] + ++ mapAttrsToList serialise cfg.settings + )); + + inspectAction = pkgs.writeText "inspect-all-https.action" + '' + # Enable HTTPS inspection for all requests + {+https-inspection} + / + ''; in @@ -31,70 +51,144 @@ in ###### interface - options = { + options.services.privoxy = { - services.privoxy = { + enable = mkEnableOption "Privoxy, non-caching filtering proxy"; - enable = mkOption { - type = types.bool; - default = false; - description = '' - Whether to enable the Privoxy non-caching filtering proxy. - ''; + enableTor = mkOption { + type = types.bool; + default = false; + description = '' + Whether to configure Privoxy to use Tor's faster SOCKS port, + suitable for HTTP. + ''; + }; + + inspectHttps = mkOption { + type = types.bool; + default = false; + description = '' + Whether to configure Privoxy to inspect HTTPS requests, meaning all + encrypted traffic will be filtered as well. This works by decrypting + and re-encrypting the requests using a per-domain generated certificate. + + To issue per-domain certificates, Privoxy must be provided with a CA + certificate, using the ca-cert-file, + ca-key-file settings. + + + The CA certificate must also be added to the system trust roots, + otherwise browsers will reject all Privoxy certificates as invalid. + You can do so by using the option + . + + ''; + }; + + certsLifetime = mkOption { + type = ageType; + default = "10d"; + example = "12h"; + description = '' + If inspectHttps is enabled, the time generated HTTPS + certificates will be stored in a temporary directory for reuse. Once + the lifetime has expired the directory will cleared and the certificate + will have to be generated again, on-demand. + + Depending on the traffic, you may want to reduce the lifetime to limit + the disk usage, since Privoxy itself never deletes the certificates. + + The format is that of the tmpfiles.d(5) + Age parameter. + ''; + }; + + userActions = mkOption { + type = types.lines; + default = ""; + description = '' + Actions to be included in a user.action file. This + will have a higher priority and can be used to override all other + actions. + ''; + }; + + userFilters = mkOption { + type = types.lines; + default = ""; + description = '' + Filters to be included in a user.filter file. This + will have a higher priority and can be used to override all other + filters definitions. + ''; + }; + + settings = mkOption { + type = types.submodule { + freeformType = configType; + + options.listen-address = mkOption { + type = types.str; + default = "127.0.0.1:8118"; + description = "Pair of address:port the proxy server is listening to."; + }; + + options.enable-edit-actions = mkOption { + type = types.bool; + default = false; + description = "Whether the web-based actions file editor may be used."; + }; + + options.actionsfile = mkOption { + type = types.listOf types.str; + # This must come after all other entries, in order to override the + # other actions/filters installed by Privoxy or the user. + apply = x: x ++ optional (cfg.userActions != "") + (toString (pkgs.writeText "user.actions" cfg.userActions)); + default = [ "match-all.action" "default.action" ]; + description = '' + List of paths to Privoxy action files. These paths may either be + absolute or relative to the privoxy configuration directory. + ''; + }; + + options.filterfile = mkOption { + type = types.listOf types.str; + default = [ "default.filter" ]; + apply = x: x ++ optional (cfg.userFilters != "") + (toString (pkgs.writeText "user.filter" cfg.userFilters)); + description = '' + List of paths to Privoxy filter files. These paths may either be + absolute or relative to the privoxy configuration directory. + ''; + }; }; + default = {}; + example = literalExample '' + { # Listen on IPv6 only + listen-address = "[::]:8118"; - listenAddress = mkOption { - type = types.str; - default = "127.0.0.1:8118"; - description = '' - Address the proxy server is listening to. - ''; - }; + # Forward .onion requests to Tor + forward-socks5 = ".onion localhost:9050 ."; - actionsFiles = mkOption { - type = types.listOf types.str; - example = [ "match-all.action" "default.action" "/etc/privoxy/user.action" ]; - default = [ "match-all.action" "default.action" ]; - description = '' - List of paths to Privoxy action files. - These paths may either be absolute or relative to the privoxy configuration directory. - ''; - }; + # Log redirects and filters + debug = [ 128 64 ]; + # This is equivalent to writing these lines + # in the Privoxy configuration file: + # debug 128 + # debug 64 + } + ''; + description = '' + This option is mapped to the main Privoxy configuration file. + Check out the Privoxy user manual at + + for available settings and documentation. - filterFiles = mkOption { - type = types.listOf types.str; - example = [ "default.filter" "/etc/privoxy/user.filter" ]; - default = [ "default.filter" ]; - description = '' - List of paths to Privoxy filter files. - These paths may either be absolute or relative to the privoxy configuration directory. - ''; - }; - - enableEditActions = mkOption { - type = types.bool; - default = false; - description = '' - Whether or not the web-based actions file editor may be used. - ''; - }; - - enableTor = mkOption { - type = types.bool; - default = false; - description = '' - Whether to configure Privoxy to use Tor's faster SOCKS port, - suitable for HTTP. - ''; - }; - - extraConfig = mkOption { - type = types.lines; - default = "" ; - description = '' - Extra configuration. Contents will be added verbatim to the configuration file. - ''; - }; + + Repeated settings can be represented by using a list. + + ''; }; }; @@ -104,23 +198,33 @@ in config = mkIf cfg.enable { users.users.privoxy = { + description = "Privoxy daemon user"; isSystemUser = true; - home = "/var/empty"; group = "privoxy"; }; users.groups.privoxy = {}; + systemd.tmpfiles.rules = optional cfg.inspectHttps + "d ${cfg.settings.certificate-directory} 0770 privoxy privoxy ${cfg.certsLifetime}"; + systemd.services.privoxy = { description = "Filtering web proxy"; after = [ "network.target" "nss-lookup.target" ]; wantedBy = [ "multi-user.target" ]; - serviceConfig.ExecStart = "${privoxy}/bin/privoxy --no-daemon --user privoxy ${confFile}"; - - serviceConfig.PrivateDevices = true; - serviceConfig.PrivateTmp = true; - serviceConfig.ProtectHome = true; - serviceConfig.ProtectSystem = "full"; + serviceConfig = { + User = "privoxy"; + Group = "privoxy"; + ExecStart = "${pkgs.privoxy}/bin/privoxy --no-daemon ${configFile}"; + PrivateDevices = true; + PrivateTmp = true; + ProtectHome = true; + ProtectSystem = "full"; + }; + unitConfig = mkIf cfg.inspectHttps { + ConditionPathExists = with cfg.settings; + [ ca-cert-file ca-key-file ]; + }; }; services.tor.settings.SOCKSPort = mkIf cfg.enableTor [ @@ -128,8 +232,48 @@ in { addr = "127.0.0.1"; port = 9063; IsolateDestAddr = false; } ]; + services.privoxy.settings = { + user-manual = "${pkgs.privoxy}/share/doc/privoxy/user-manual"; + # This is needed for external filters + temporary-directory = "/tmp"; + filterfile = [ "default.filter" ]; + actionsfile = + [ "match-all.action" + "default.action" + ] ++ optional cfg.inspectHttps (toString inspectAction); + } // (optionalAttrs cfg.enableTor { + forward-socks5 = "127.0.0.1:9063 ."; + toggle = true; + enable-remote-toggle = false; + enable-edit-actions = false; + enable-remote-http-toggle = false; + }) // (optionalAttrs cfg.inspectHttps { + # This allows setting absolute key/crt paths + ca-directory = "/var/empty"; + certificate-directory = "/run/privoxy/certs"; + trusted-cas-file = "/etc/ssl/certs/ca-certificates.crt"; + }); + }; + imports = + let + top = x: [ "services" "privoxy" x ]; + setting = x: [ "services" "privoxy" "settings" x ]; + in + [ (mkRenamedOptionModule (top "enableEditActions") (setting "enable-edit-actions")) + (mkRenamedOptionModule (top "listenAddress") (setting "listen-address")) + (mkRenamedOptionModule (top "actionsFiles") (setting "actionsfile")) + (mkRenamedOptionModule (top "filterFiles") (setting "filterfile")) + (mkRemovedOptionModule (top "extraConfig") + '' + Use services.privoxy.settings instead. + This is part of the general move to use structured settings instead of raw + text for config as introduced by RFC0042: + https://github.com/NixOS/rfcs/blob/master/rfcs/0042-config-option.md + '') + ]; + meta.maintainers = with lib.maintainers; [ rnhmjoj ]; } diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/nextcloud.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/nextcloud.nix index 5636415f6a..9a541aba6e 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-apps/nextcloud.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-apps/nextcloud.nix @@ -10,7 +10,7 @@ let extensions = { enabled, all }: (with all; enabled - ++ [ imagick ] # Always enabled + ++ optional (!cfg.disableImagemagick) imagick # Optionally enabled depending on caching settings ++ optional cfg.caching.apcu apcu ++ optional cfg.caching.redis redis @@ -303,6 +303,18 @@ in { }; }; + disableImagemagick = mkOption { + type = types.bool; + default = false; + description = '' + Whether to not load the ImageMagick module into PHP. + This is used by the theming app and for generating previews of certain images (e.g. SVG and HEIF). + You may want to disable it for increased security. In that case, previews will still be available + for some images (e.g. JPEG and PNG). + See https://github.com/nextcloud/server/issues/13099 + ''; + }; + caching = { apcu = mkOption { type = types.bool; diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/whitebophir.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/whitebophir.nix index a19812547c..b265296d5c 100644 --- a/third_party/nixpkgs/nixos/modules/services/web-apps/whitebophir.nix +++ b/third_party/nixpkgs/nixos/modules/services/web-apps/whitebophir.nix @@ -16,6 +16,12 @@ in { description = "Whitebophir package to use."; }; + listenAddress = mkOption { + type = types.str; + default = "0.0.0.0"; + description = "Address to listen on (use 0.0.0.0 to allow access from any address)."; + }; + port = mkOption { type = types.port; default = 5001; @@ -30,7 +36,8 @@ in { wantedBy = [ "multi-user.target" ]; after = [ "network.target" ]; environment = { - PORT = "${toString cfg.port}"; + PORT = toString cfg.port; + HOST = toString cfg.listenAddress; WBO_HISTORY_DIR = "/var/lib/whitebophir"; }; diff --git a/third_party/nixpkgs/nixos/modules/services/x11/xserver.nix b/third_party/nixpkgs/nixos/modules/services/x11/xserver.nix index 8858559d8f..35bd4dabb6 100644 --- a/third_party/nixpkgs/nixos/modules/services/x11/xserver.nix +++ b/third_party/nixpkgs/nixos/modules/services/x11/xserver.nix @@ -251,11 +251,10 @@ in videoDrivers = mkOption { type = types.listOf types.str; - # !!! We'd like "nv" here, but it segfaults the X server. - default = [ "radeon" "cirrus" "vesa" "modesetting" ]; + default = [ "amdgpu" "radeon" "nouveau" "modesetting" "fbdev" ]; example = [ - "ati_unfree" "amdgpu" "amdgpu-pro" - "nv" "nvidia" "nvidiaLegacy390" "nvidiaLegacy340" "nvidiaLegacy304" + "nvidia" "nvidiaLegacy390" "nvidiaLegacy340" "nvidiaLegacy304" + "amdgpu-pro" ]; # TODO(@oxij): think how to easily add the rest, like those nvidia things relatedPackages = concatLists diff --git a/third_party/nixpkgs/nixos/tests/all-tests.nix b/third_party/nixpkgs/nixos/tests/all-tests.nix index fe60b0b83f..00e84a9df8 100644 --- a/third_party/nixpkgs/nixos/tests/all-tests.nix +++ b/third_party/nixpkgs/nixos/tests/all-tests.nix @@ -326,6 +326,7 @@ in predictable-interface-names = handleTest ./predictable-interface-names.nix {}; printing = handleTest ./printing.nix {}; privacyidea = handleTest ./privacyidea.nix {}; + privoxy = handleTest ./privoxy.nix {}; prometheus = handleTest ./prometheus.nix {}; prometheus-exporters = handleTest ./prometheus-exporters.nix {}; prosody = handleTest ./xmpp/prosody.nix {}; diff --git a/third_party/nixpkgs/nixos/tests/docker-tools.nix b/third_party/nixpkgs/nixos/tests/docker-tools.nix index 6638ec4927..1cc554d002 100644 --- a/third_party/nixpkgs/nixos/tests/docker-tools.nix +++ b/third_party/nixpkgs/nixos/tests/docker-tools.nix @@ -254,5 +254,21 @@ import ./make-test-python.nix ({ pkgs, ... }: { "docker run --rm ${examples.layeredStoreSymlink.imageName} bash -c 'test -L ${examples.layeredStoreSymlink.passthru.symlink}'", "docker rmi ${examples.layeredStoreSymlink.imageName}", ) + + with subtest("buildImage supports registry/ prefix in image name"): + docker.succeed( + "docker load --input='${examples.prefixedImage}'" + ) + docker.succeed( + "docker images --format '{{.Repository}}' | grep -F '${examples.prefixedImage.imageName}'" + ) + + with subtest("buildLayeredImage supports registry/ prefix in image name"): + docker.succeed( + "docker load --input='${examples.prefixedLayeredImage}'" + ) + docker.succeed( + "docker images --format '{{.Repository}}' | grep -F '${examples.prefixedLayeredImage.imageName}'" + ) ''; }) diff --git a/third_party/nixpkgs/nixos/tests/kafka.nix b/third_party/nixpkgs/nixos/tests/kafka.nix index d5c54f7d99..034601c815 100644 --- a/third_party/nixpkgs/nixos/tests/kafka.nix +++ b/third_party/nixpkgs/nixos/tests/kafka.nix @@ -30,11 +30,6 @@ let ''; package = kafkaPackage; zookeeper = "zookeeper1:2181"; - # These are the default options, but UseCompressedOops doesn't work with 32bit JVM - jvmOptions = [ - "-server" "-Xmx1G" "-Xms1G" "-XX:+UseParNewGC" "-XX:+UseConcMarkSweepGC" "-XX:+CMSClassUnloadingEnabled" - "-XX:+CMSScavengeBeforeRemark" "-XX:+DisableExplicitGC" "-Djava.awt.headless=true" "-Djava.net.preferIPv4Stack=true" - ] ++ optionals (! pkgs.stdenv.isi686 ) [ "-XX:+UseCompressedOops" ]; }; networking.firewall.allowedTCPPorts = [ 9092 ]; @@ -82,4 +77,5 @@ let in with pkgs; { kafka_2_4 = makeKafkaTest "kafka_2_4" apacheKafka_2_4; kafka_2_5 = makeKafkaTest "kafka_2_5" apacheKafka_2_5; + kafka_2_6 = makeKafkaTest "kafka_2_6" apacheKafka_2_6; } diff --git a/third_party/nixpkgs/nixos/tests/nextcloud/basic.nix b/third_party/nixpkgs/nixos/tests/nextcloud/basic.nix index 0b8e193712..5074b6cdaf 100644 --- a/third_party/nixpkgs/nixos/tests/nextcloud/basic.nix +++ b/third_party/nixpkgs/nixos/tests/nextcloud/basic.nix @@ -7,7 +7,7 @@ in { maintainers = [ globin eqyiel ]; }; - nodes = { + nodes = rec { # The only thing the client needs to do is download a file. client = { ... }: { services.davfs2.enable = true; @@ -47,9 +47,14 @@ in { environment.systemPackages = [ cfg.services.nextcloud.occ ]; }; + + nextcloudWithoutMagick = args@{ config, pkgs, lib, ... }: + lib.mkMerge + [ (nextcloud args) + { services.nextcloud.disableImagemagick = true; } ]; }; - testScript = let + testScript = { nodes, ... }: let withRcloneEnv = pkgs.writeScript "with-rclone-env" '' #!${pkgs.runtimeShell} export RCLONE_CONFIG_NEXTCLOUD_TYPE=webdav @@ -68,8 +73,19 @@ in { #!${pkgs.runtimeShell} diff <(echo 'hi') <(${pkgs.rclone}/bin/rclone cat nextcloud:test-shared-file) ''; + + findInClosure = what: drv: pkgs.runCommand "find-in-closure" { exportReferencesGraph = [ "graph" drv ]; inherit what; } '' + test -e graph + grep "$what" graph >$out || true + ''; + nextcloudUsesImagick = findInClosure "imagick" nodes.nextcloud.config.system.build.vm; + nextcloudWithoutDoesntUseIt = findInClosure "imagick" nodes.nextcloudWithoutMagick.config.system.build.vm; in '' - start_all() + assert open("${nextcloudUsesImagick}").read() != "" + assert open("${nextcloudWithoutDoesntUseIt}").read() == "" + + nextcloud.start() + client.start() nextcloud.wait_for_unit("multi-user.target") # This is just to ensure the nextcloud-occ program is working nextcloud.succeed("nextcloud-occ status") diff --git a/third_party/nixpkgs/nixos/tests/privoxy.nix b/third_party/nixpkgs/nixos/tests/privoxy.nix new file mode 100644 index 0000000000..d16cc49869 --- /dev/null +++ b/third_party/nixpkgs/nixos/tests/privoxy.nix @@ -0,0 +1,113 @@ +import ./make-test-python.nix ({ lib, pkgs, ... }: + +let + # Note: For some reason Privoxy can't issue valid + # certificates if the CA is generated using gnutls :( + certs = pkgs.runCommand "example-certs" + { buildInputs = [ pkgs.openssl ]; } + '' + mkdir $out + + # generate CA keypair + openssl req -new -nodes -x509 \ + -extensions v3_ca -keyout $out/ca.key \ + -out $out/ca.crt -days 365 \ + -subj "/O=Privoxy CA/CN=Privoxy CA" + + # generate server key/signing request + openssl genrsa -out $out/server.key 3072 + openssl req -new -key $out/server.key \ + -out server.csr -sha256 \ + -subj "/O=An unhappy server./CN=example.com" + + # sign the request/generate the certificate + openssl x509 -req -in server.csr -CA $out/ca.crt \ + -CAkey $out/ca.key -CAcreateserial -out $out/server.crt \ + -days 500 -sha256 + ''; +in + +{ + name = "privoxy"; + meta = with lib.maintainers; { + maintainers = [ rnhmjoj ]; + }; + + machine = { ... }: { + services.nginx.enable = true; + services.nginx.virtualHosts."example.com" = { + addSSL = true; + sslCertificate = "${certs}/server.crt"; + sslCertificateKey = "${certs}/server.key"; + locations."/".root = pkgs.writeTextFile + { name = "bad-day"; + destination = "/how-are-you/index.html"; + text = "I've had a bad day!\n"; + }; + locations."/ads".extraConfig = '' + return 200 "Hot Nixpkgs PRs in your area. Click here!\n"; + ''; + }; + + services.privoxy = { + enable = true; + inspectHttps = true; + settings = { + ca-cert-file = "${certs}/ca.crt"; + ca-key-file = "${certs}/ca.key"; + debug = 65536; + }; + userActions = '' + {+filter{positive}} + example.com + + {+block{Fake ads}} + example.com/ads + ''; + userFilters = '' + FILTER: positive This is a filter example. + s/bad/great/ig + ''; + }; + + security.pki.certificateFiles = [ "${certs}/ca.crt" ]; + + networking.hosts."::1" = [ "example.com" ]; + networking.proxy.httpProxy = "http://localhost:8118"; + networking.proxy.httpsProxy = "http://localhost:8118"; + }; + + testScript = + '' + with subtest("Privoxy is running"): + machine.wait_for_unit("privoxy") + machine.wait_for_open_port("8118") + machine.succeed("curl -f http://config.privoxy.org") + + with subtest("Privoxy can filter http requests"): + machine.wait_for_open_port("80") + assert "great day" in machine.succeed( + "curl -sfL http://example.com/how-are-you? | tee /dev/stderr" + ) + + with subtest("Privoxy can filter https requests"): + machine.wait_for_open_port("443") + assert "great day" in machine.succeed( + "curl -sfL https://example.com/how-are-you? | tee /dev/stderr" + ) + + with subtest("Blocks are working"): + machine.wait_for_open_port("443") + machine.fail("curl -f https://example.com/ads 1>&2") + machine.succeed("curl -f https://example.com/PRIVOXY-FORCE/ads 1>&2") + + with subtest("Temporary certificates are cleaned"): + # Count current certificates + machine.succeed("test $(ls /run/privoxy/certs | wc -l) -gt 0") + # Forward in time 12 days, trigger the timer.. + machine.succeed("date -s \"$(date --date '12 days')\"") + machine.systemctl("start systemd-tmpfiles-clean") + # ...and count again + machine.succeed("test $(ls /run/privoxy/certs | wc -l) -eq 0") + ''; +}) diff --git a/third_party/nixpkgs/nixos/tests/prometheus-exporters.nix b/third_party/nixpkgs/nixos/tests/prometheus-exporters.nix index 89d17c9de8..78a3afad0b 100644 --- a/third_party/nixpkgs/nixos/tests/prometheus-exporters.nix +++ b/third_party/nixpkgs/nixos/tests/prometheus-exporters.nix @@ -75,6 +75,21 @@ let ''; }; + artifactory = { + exporterConfig = { + enable = true; + artiUsername = "artifactory-username"; + artiPassword = "artifactory-password"; + }; + exporterTest = '' + wait_for_unit("prometheus-artifactory-exporter.service") + wait_for_open_port(9531) + succeed( + "curl -sSf http://localhost:9531/metrics | grep -q 'artifactory_up'" + ) + ''; + }; + bind = { exporterConfig = { enable = true; @@ -248,6 +263,24 @@ let ''; }; + knot = { + exporterConfig = { + enable = true; + }; + metricProvider = { + services.knot = { + enable = true; + extraArgs = [ "-v" ]; + }; + }; + exporterTest = '' + wait_for_unit("knot.service") + wait_for_unit("prometheus-knot-exporter.service") + wait_for_open_port(9433) + succeed("curl -sSf 'localhost:9433' | grep -q 'knot_server_zone_count 0.0'") + ''; + }; + keylight = { # A hardware device is required to properly test this exporter, so just # perform a couple of basic sanity checks that the exporter is running @@ -802,6 +835,22 @@ let ''; }; + systemd = { + exporterConfig = { + enable = true; + }; + metricProvider = { }; + exporterTest = '' + wait_for_unit("prometheus-systemd-exporter.service") + wait_for_open_port(9558) + succeed( + "curl -sSf localhost:9558/metrics | grep -q '{}'".format( + 'systemd_unit_state{name="basic.target",state="active",type="target"} 1' + ) + ) + ''; + }; + tor = { exporterConfig = { enable = true; diff --git a/third_party/nixpkgs/pkgs/applications/audio/bchoppr/default.nix b/third_party/nixpkgs/pkgs/applications/audio/bchoppr/default.nix index aafad7f82e..b15b8d127a 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/bchoppr/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/bchoppr/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "bchoppr"; - version = "1.10.2"; + version = "1.10.4"; src = fetchFromGitHub { owner = "sjaehn"; repo = pname; rev = version; - sha256 = "sha256-FBzdWUgncDCPJGb8T1HvzuuTlDhKa9JJrSrUoPQOSAU="; + sha256 = "sha256-/csds8QOgn5IogyMg/5PMKdlCISakS3GDkyj2tTt0BY="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/applications/audio/csa/default.nix b/third_party/nixpkgs/pkgs/applications/audio/csa/default.nix index 5121f6d616..0f7ad460a8 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/csa/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/csa/default.nix @@ -23,6 +23,6 @@ stdenv.mkDerivation rec { ''; license = licenses.gpl3; maintainers = [ maintainers.magnetophon ]; - platforms = platforms.linux; + platforms = platforms.unix; }; } diff --git a/third_party/nixpkgs/pkgs/applications/audio/denemo/default.nix b/third_party/nixpkgs/pkgs/applications/audio/denemo/default.nix index 4abaec8dad..3a2dbd139d 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/denemo/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/denemo/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { pname = "denemo"; - version = "2.4.0"; + version = "2.5.0"; src = fetchurl { url = "https://ftp.gnu.org/gnu/denemo/denemo-${version}.tar.gz"; - sha256 = "145kq0zfgdadykl3i6na221i4s5wzdrcqq48amzyfarnrqk2rmpd"; + sha256 = "sha256-B6GbBL/o/z0emT+Iw6XvWmAsJCmIwSGCyV1DkhDyfBY="; }; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/audio/musescore/darwin.nix b/third_party/nixpkgs/pkgs/applications/audio/musescore/darwin.nix index 8cc876ab19..1314172932 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/musescore/darwin.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/musescore/darwin.nix @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { homepage = "https://musescore.org/"; license = licenses.gpl2; platforms = platforms.darwin; - maintainers = with maintainers; [ yurrriq ]; + maintainers = []; repositories.git = "https://github.com/musescore/MuseScore"; }; } diff --git a/third_party/nixpkgs/pkgs/applications/audio/ncspot/bump-security-framework-crate.patch b/third_party/nixpkgs/pkgs/applications/audio/ncspot/bump-security-framework-crate.patch new file mode 100644 index 0000000000..5c8008abb1 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/audio/ncspot/bump-security-framework-crate.patch @@ -0,0 +1,19 @@ +Bump security-framework from 2.1.1 to 2.1.2 + +security-framework=2.1.1 doesn't build on Darwin 10.12. +https://github.com/kornelski/rust-security-framework/issues/124 + +--- c/Cargo.lock ++++ i/Cargo.lock +@@ -3138,9 +3138,9 @@ checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" + + [[package]] + name = "security-framework" +-version = "2.1.1" ++version = "2.1.2" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "2dfd318104249865096c8da1dfabf09ddbb6d0330ea176812a62ec75e40c4166" ++checksum = "d493c5f39e02dfb062cd8f33301f90f9b13b650e8c1b1d0fd75c19dd64bff69d" + dependencies = [ + "bitflags 1.2.1", + "core-foundation", diff --git a/third_party/nixpkgs/pkgs/applications/audio/ncspot/default.nix b/third_party/nixpkgs/pkgs/applications/audio/ncspot/default.nix index e78eaca549..ad8d64b972 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/ncspot/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/ncspot/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, rustPlatform, pkg-config, ncurses, openssl +{ stdenv, lib, fetchFromGitHub, rustPlatform, pkg-config, ncurses, openssl, libiconv , withALSA ? true, alsaLib ? null , withPulseAudio ? false, libpulseaudio ? null , withPortAudio ? false, portaudio ? null @@ -14,22 +14,25 @@ let in rustPlatform.buildRustPackage rec { pname = "ncspot"; - version = "0.4.0"; + version = "0.5.0"; src = fetchFromGitHub { owner = "hrkfdn"; repo = "ncspot"; rev = "v${version}"; - sha256 = "sha256-4V0LG9mDvezeLHHTAmfAXdssOAOlZs30b8IejKEKN4g="; + sha256 = "1h1il2mzngxmcsl169431lwzl0skv420arg9i06856r5wil37jf7"; }; - cargoSha256 = "sha256-POvIkoxLAXVBTsB37aAEUKhk6DRF9IfvfTcrP5PLFEQ="; + cargoSha256 = "13yn7l4hhl48lbpj0zsbraqzkkz6knc373j6rcf8d1p4z76yili4"; cargoBuildFlags = [ "--no-default-features" "--features" "${lib.concatStringsSep "," features}" ]; nativeBuildInputs = [ pkg-config ]; + cargoPatches = [ ./bump-security-framework-crate.patch ]; + buildInputs = [ ncurses openssl ] + ++ lib.optional stdenv.isDarwin libiconv ++ lib.optional withALSA alsaLib ++ lib.optional withPulseAudio libpulseaudio ++ lib.optional withPortAudio portaudio diff --git a/third_party/nixpkgs/pkgs/applications/audio/plexamp/default.nix b/third_party/nixpkgs/pkgs/applications/audio/plexamp/default.nix index c484f6e192..a26af9023a 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/plexamp/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/plexamp/default.nix @@ -2,13 +2,13 @@ let pname = "plexamp"; - version = "3.4.1"; + version = "3.4.3"; name = "${pname}-${version}"; src = fetchurl { url = "https://plexamp.plex.tv/plexamp.plex.tv/desktop/Plexamp-${version}.AppImage"; name="${pname}-${version}.AppImage"; - sha256 = "Vv+e1q5ThuXDPX8baSU+7/U63p6/dvh0ZvScO1Loj+U="; + sha256 = "1rzhrc5yr5f6bxydgmcjwrg85vkbkn6lqj72512lyhq5gg7zmm1w"; }; appimageContents = appimageTools.extractType2 { @@ -32,8 +32,9 @@ in appimageTools.wrapType2 { meta = with lib; { description = "A beautiful Plex music player for audiophiles, curators, and hipsters"; homepage = "https://plexamp.com/"; + changelog = "https://forums.plex.tv/t/plexamp-release-notes/221280/25"; license = licenses.unfree; - maintainers = with maintainers; [ killercup ]; + maintainers = with maintainers; [ killercup synthetica ]; platforms = [ "x86_64-linux" ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/audio/reaper/default.nix b/third_party/nixpkgs/pkgs/applications/audio/reaper/default.nix index 8e70bff2b9..19def55a15 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/reaper/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/reaper/default.nix @@ -15,11 +15,11 @@ stdenv.mkDerivation rec { pname = "reaper"; - version = "6.23"; + version = "6.25"; src = fetchurl { url = "https://www.reaper.fm/files/${lib.versions.major version}.x/reaper${builtins.replaceStrings ["."] [""] version}_linux_x86_64.tar.xz"; - sha256 = "1s9c8prqk38738hjaixiy8ljp94cqw7jq3160890477jyk6cvicd"; + sha256 = "0i1idlr4ar28wvwcvwn9hqzb63kki1x1995cr87a9slxfa7zcshb"; }; nativeBuildInputs = [ autoPatchelfHook makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/ergo/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/ergo/default.nix index 7c03d06da5..597db2ae8f 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/ergo/default.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/ergo/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "ergo"; - version = "4.0.7"; + version = "4.0.8"; src = fetchurl { url = "https://github.com/ergoplatform/ergo/releases/download/v${version}/ergo-${version}.jar"; - sha256 = "sha256-CDNH7vYLG7Gn22yl+cXtGAD+c8tbNU52FmdxneTM2u4="; + sha256 = "sha256-swU4CnX2BxL3ILH/sXux8ZHMo5nAPLQOIiWmr4C8BOQ="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/go-ethereum.nix b/third_party/nixpkgs/pkgs/applications/blockchains/go-ethereum.nix index 4dab912cf1..0f99f28b42 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/go-ethereum.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/go-ethereum.nix @@ -8,13 +8,13 @@ let in buildGoModule rec { pname = "go-ethereum"; - version = "1.10.0"; + version = "1.10.1"; src = fetchFromGitHub { owner = "ethereum"; repo = pname; rev = "v${version}"; - sha256 = "sha256-pEzaEpqr+Ird8d5zmoXMyAoS0aEGBYFmpgdPcH4OsMI="; + sha256 = "sha256-4lHT0P8Euau0AJNtg1YstJJRQ58WTUlIH+HCKEjCq/s="; }; runVend = true; diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/lnd.nix b/third_party/nixpkgs/pkgs/applications/blockchains/lnd.nix index f5c1329090..147d826dfa 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/lnd.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/lnd.nix @@ -1,18 +1,18 @@ { buildGoModule , fetchFromGitHub , lib -, tags ? [ "autopilotrpc" "signrpc" "walletrpc" "chainrpc" "invoicesrpc" "watchtowerrpc" ] +, tags ? [ "autopilotrpc" "signrpc" "walletrpc" "chainrpc" "invoicesrpc" "watchtowerrpc" "routerrpc" ] }: buildGoModule rec { pname = "lnd"; - version = "0.12.0-beta"; + version = "0.12.1-beta"; src = fetchFromGitHub { owner = "lightningnetwork"; repo = "lnd"; rev = "v${version}"; - sha256 = "0mjfmmi5d5d2hny3938rxxdgar3qyk6x909l25fvjr4q3l4sz4x0"; + sha256 = "0ly6909cg0qzdsp9idp1g7zqd6liw7f142d7n7vga64s1ksvv6lx"; }; vendorSha256 = "00q8dydskzg4rhxnnpzpbmmvc3q4wzm8z3dps2bv0nx3fk0fmrl3"; diff --git a/third_party/nixpkgs/pkgs/applications/editors/emacs-modes/elpa-packages.nix b/third_party/nixpkgs/pkgs/applications/editors/emacs-modes/elpa-packages.nix index 98c265894e..034b698137 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/emacs-modes/elpa-packages.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/emacs-modes/elpa-packages.nix @@ -53,6 +53,9 @@ self: let seq = if lib.versionAtLeast self.emacs.version "27" then null else super.seq; + project = if lib.versionAtLeast self.emacs.version "28" + then null + else super.project; }; elpaPackages = super // overrides; diff --git a/third_party/nixpkgs/pkgs/applications/editors/vscode/vscode.nix b/third_party/nixpkgs/pkgs/applications/editors/vscode/vscode.nix index e772796c34..ba03bb65c2 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/vscode/vscode.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/vscode/vscode.nix @@ -13,10 +13,10 @@ let archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz"; sha256 = { - x86_64-linux = "0c0m5qkqv3zhcxmwx72b7z67sjcd1miv8d10kxpk9vffyrxkmj93"; - x86_64-darwin = "1spd5rbhra4n38lp0sgxd2cr1bngsmi32a43g02vdmmhkmk0iixc"; - aarch64-linux = "1ql3hn6c59g7d0cwhg54ixww2i9jmkjw3nyzz97yw8wk63zwz024"; - armv7l-linux = "0pdqcbw7rygvdzys787kf8ag17g9qyv7k33dqhi5h2zc96j867c0"; + x86_64-linux = "1px6x99cv8nb8lcy3vgcicr4ar0bfj5rfnc5a1yw8rs5p1qnflgw"; + x86_64-darwin = "0grzivqb2fyvwh0fjh9vr205fjcsrd1iqhkwk3mgv792zfrb7ksf"; + aarch64-linux = "0p0msxgc13kqmpq7wk61igc1qbgmgg9463s44dp4ii3630iyr4lw"; + armv7l-linux = "147lki1wr5nzsg1mq12jmdjq9qr6vbdpmzbpr5nrvq23cak94ff8"; }.${system}; in callPackage ./generic.nix rec { @@ -25,7 +25,7 @@ in # Please backport all compatible updates to the stable release. # This is important for the extension ecosystem. - version = "1.53.2"; + version = "1.54.2"; pname = "vscode"; executableName = "code" + lib.optionalString isInsiders "-insiders"; diff --git a/third_party/nixpkgs/pkgs/applications/graphics/megapixels/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/megapixels/default.nix index 29aaed1278..1a70337884 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/megapixels/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/megapixels/default.nix @@ -7,10 +7,11 @@ , wrapGAppsHook , gtk3 , gnome3 +, zbar , tiffSupport ? true , libraw , jpgSupport ? true -, imagemagick +, graphicsmagick , exiftool }: @@ -20,24 +21,24 @@ let inherit (lib) makeBinPath optional optionals optionalString; runtimePath = makeBinPath ( optional tiffSupport libraw - ++ optionals jpgSupport [ imagemagick exiftool ] + ++ optionals jpgSupport [ graphicsmagick exiftool ] ); in stdenv.mkDerivation rec { pname = "megapixels"; - version = "0.14.0"; + version = "0.15.0"; src = fetchgit { url = "https://git.sr.ht/~martijnbraam/megapixels"; rev = version; - sha256 = "136rv9sx0kgfkpqn5s90j7j4qhb8h04p14g5qhqshb89kmmsmxiw"; + sha256 = "1y8irwi8lbjs948j90gpic96dx5wjmwacd41hb3d9vzhkyni2dvb"; }; nativeBuildInputs = [ meson ninja pkg-config wrapGAppsHook ]; - buildInputs = [ gtk3 gnome3.adwaita-icon-theme ] + buildInputs = [ gtk3 gnome3.adwaita-icon-theme zbar ] ++ optional tiffSupport libraw - ++ optional jpgSupport imagemagick; + ++ optional jpgSupport graphicsmagick; preFixup = optionalString (tiffSupport || jpgSupport) '' gappsWrapperArgs+=( diff --git a/third_party/nixpkgs/pkgs/applications/graphics/sane/backends/airscan/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/sane/backends/airscan/default.nix index 3cce81ef8a..d2ff433989 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/sane/backends/airscan/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/sane/backends/airscan/default.nix @@ -1,17 +1,17 @@ -{ lib, stdenv, fetchFromGitHub, pkg-config, avahi, libsoup, libjpeg, libpng, gnutls -, sane-backends, meson, ninja }: +{ lib, stdenv, fetchFromGitHub, meson, ninja, pkg-config, avahi, libjpeg, libpng +, libxml2, gnutls, sane-backends }: stdenv.mkDerivation rec { pname = "sane-airscan"; - version = "0.99.16"; + version = "0.99.24"; nativeBuildInputs = [ meson ninja pkg-config ]; - buildInputs = [ avahi libsoup libjpeg libpng gnutls sane-backends ]; + buildInputs = [ avahi gnutls libjpeg libpng libxml2 sane-backends ]; src = fetchFromGitHub { owner = "alexpevzner"; repo = pname; rev = version; - sha256 = "00lgcdbpns0shwlpkvrpfm4z05s7v5q3al4kcw6ii7xnkzmv1721"; + sha256 = "sha256-2zSLC9P7Q/GMefHvmrUz6nV2hgScb4BhPAkahNBouqk="; }; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/applications/misc/1password-gui/default.nix b/third_party/nixpkgs/pkgs/applications/misc/1password-gui/default.nix index 924e006c4c..fc653953e5 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/1password-gui/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/1password-gui/default.nix @@ -8,11 +8,11 @@ stdenv.mkDerivation rec { pname = "1password"; - version = "0.9.26"; + version = "8.0.27"; src = fetchurl { url = "https://onepassword.s3.amazonaws.com/linux/appimage/${pname}-${version}.AppImage"; - hash = "sha256-LvHvWUS2iEm9m+v+kk7wf+P9xZkOyuoLk4xM4+P2vF8="; + hash = "sha256-qzZXs7ak4052Igq+YWuzgDqJ7143q5qw5P3b3eN3NkU="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/almanah/default.nix b/third_party/nixpkgs/pkgs/applications/misc/almanah/default.nix index b8029b6229..eb5dc8950f 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/almanah/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/almanah/default.nix @@ -25,11 +25,11 @@ stdenv.mkDerivation rec { pname = "almanah"; - version = "0.12.2"; + version = "0.12.3"; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "IWYOnOu0C9uQ9k1dgWkJ6Kv+o/jY+6Llfsi4PusHE24="; + sha256 = "lMpDQOxlGljP66APR49aPbTZnfrGakbQ2ZcFvmiPMFo="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/misc/cointop/default.nix b/third_party/nixpkgs/pkgs/applications/misc/cointop/default.nix index ffdcf021b0..d62d96e530 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/cointop/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/cointop/default.nix @@ -2,13 +2,13 @@ buildGoPackage rec { pname = "cointop"; - version = "1.6.2"; + version = "1.6.3"; src = fetchFromGitHub { owner = "miguelmota"; repo = pname; rev = "v${version}"; - sha256 = "sha256-4Ae8lzaec7JeYfmeLleatUS/xQUjea7O4XJ9DOgJIMs="; + sha256 = "sha256-h4102oWYSuY4uq/Pyo9u25Pdsai7AK2W9yUmS/zdjrw="; }; goPackagePath = "github.com/miguelmota/cointop"; diff --git a/third_party/nixpkgs/pkgs/applications/misc/dasel/default.nix b/third_party/nixpkgs/pkgs/applications/misc/dasel/default.nix index aa19ce2c53..73295c96e4 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/dasel/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/dasel/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "dasel"; - version = "1.13.2"; + version = "1.13.4"; src = fetchFromGitHub { owner = "TomWright"; repo = pname; rev = "v${version}"; - sha256 = "sha256-++8vTK0OR44Mcdh5g2bJEq7aO+fWySKw0XlSz2KJNio="; + sha256 = "sha256-4/67GwNIRcbC6qYe5s8DD16b2uVcG0DI1ScQk31Ffk0="; }; vendorSha256 = "sha256-BdX4DO77mIf/+aBdkNVFUzClsIml1UMcgvikDbbdgcY="; diff --git a/third_party/nixpkgs/pkgs/applications/misc/dmensamenu/default.nix b/third_party/nixpkgs/pkgs/applications/misc/dmensamenu/default.nix index a8817a542e..d5208ea7b0 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/dmensamenu/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/dmensamenu/default.nix @@ -2,13 +2,13 @@ buildPythonApplication rec { pname = "dmensamenu"; - version = "1.2.1"; + version = "1.2.2"; src = fetchFromGitHub { owner = "dotlambda"; repo = "dmensamenu"; rev = version; - sha256 = "15c8g2vdban3dw3g979icypgpx52irpvv39indgk19adicgnzzqp"; + sha256 = "1ck1i1k40bli6m3n49ff6987hglby9fn4vfr28jpkm3h70s2km3n"; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/applications/misc/dunst/default.nix b/third_party/nixpkgs/pkgs/applications/misc/dunst/default.nix index 65e86bb7db..5dffbf56a3 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/dunst/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/dunst/default.nix @@ -2,7 +2,7 @@ , pkg-config, which, perl, libXrandr , cairo, dbus, systemd, gdk-pixbuf, glib, libX11, libXScrnSaver , gtk3, wayland, wayland-protocols -, libXinerama, libnotify, pango, xorgproto, librsvg, dunstify ? false +, libXinerama, libnotify, pango, xorgproto, librsvg }: stdenv.mkDerivation rec { @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { owner = "dunst-project"; repo = "dunst"; rev = "v${version}"; - sha256 = "0irwkqcgwkqaylcpvqgh25gn2ysbdm2kydipxfzcq1ddj9ns6f9c"; + sha256 = "0lga1kj2vjbj9g9rl93nivngjmk5fkxdxwal8w96x9whwk9jvdga"; }; nativeBuildInputs = [ perl pkg-config which systemd makeWrapper ]; @@ -29,15 +29,12 @@ stdenv.mkDerivation rec { makeFlags = [ "PREFIX=$(out)" "VERSION=$(version)" + "SYSCONFDIR=$(out)/etc" "SERVICEDIR_DBUS=$(out)/share/dbus-1/services" "SERVICEDIR_SYSTEMD=$(out)/lib/systemd/user" ]; - buildFlags = if dunstify then [ "dunstify" ] else []; - - postInstall = lib.optionalString dunstify '' - install -Dm755 dunstify $out/bin - '' + '' + postInstall = '' wrapProgram $out/bin/dunst \ --set GDK_PIXBUF_MODULE_FILE "$GDK_PIXBUF_MODULE_FILE" ''; diff --git a/third_party/nixpkgs/pkgs/applications/misc/foxtrotgps/default.nix b/third_party/nixpkgs/pkgs/applications/misc/foxtrotgps/default.nix index 5d0f07492a..8692ac9893 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/foxtrotgps/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/foxtrotgps/default.nix @@ -6,8 +6,8 @@ let srcs = { foxtrot = fetchbzr { url = "lp:foxtrotgps"; - rev = "326"; - sha256 = "191pgcy5rng8djy22a5z9s8gssc73f9p5hm4ig52ra189cb48d8k"; + rev = "329"; + sha256 = "0fwgnsrah63h1xdgm5xdi5ancrz89shdp5sdzw1qc1m7i9a03rid"; }; screenshots = fetchbzr { url = "lp:foxtrotgps/screenshots"; @@ -17,23 +17,21 @@ let }; in stdenv.mkDerivation rec { pname = "foxtrotgps"; - version = "1.2.2+326"; + version = "1.2.2+329"; # Pull directly from bzr because gpsd API version 9 is not supported on latest release src = srcs.foxtrot; - patches = [ - ./gps-status-fix.patch + nativeBuildInputs = [ + pkg-config autoreconfHook texinfo help2man + imagemagick wrapGAppsHook intltool ]; - nativeBuildInputs = [ pkg-config autoreconfHook texinfo help2man imagemagick wrapGAppsHook ]; - buildInputs = [ curl.dev gnome2.libglade.dev gpsd gtk2.dev - intltool libexif sqlite.dev (python3Packages.python.withPackages (pythonPackages: with python3Packages; @@ -58,7 +56,7 @@ in stdenv.mkDerivation rec { innovation. ''; homepage = "https://www.foxtrotgps.org/"; - license = licenses.gpl2; + license = licenses.gpl2Plus; platforms = platforms.unix; maintainers = with maintainers; [ wucke13 ]; }; diff --git a/third_party/nixpkgs/pkgs/applications/misc/foxtrotgps/gps-status-fix.patch b/third_party/nixpkgs/pkgs/applications/misc/foxtrotgps/gps-status-fix.patch deleted file mode 100644 index e9b3624a17..0000000000 --- a/third_party/nixpkgs/pkgs/applications/misc/foxtrotgps/gps-status-fix.patch +++ /dev/null @@ -1,14 +0,0 @@ ---- foxtrot/src/gps_functions.c.orig 2020-12-04 15:02:22.290163204 -0600 -+++ foxtrot/src/gps_functions.c 2020-12-04 15:04:54.470648534 -0600 -@@ -762,7 +762,11 @@ - { - gpsdata->fix.time = (time_t) 0; - } -+#if GPSD_API_MAJOR_VERSION >= 9 -+ gpsdata->valid = (libgps_gpsdata.fix.status != STATUS_NO_FIX); -+#else - gpsdata->valid = (libgps_gpsdata.status != STATUS_NO_FIX); -+#endif - if (gpsdata->valid) - { - gpsdata->seen_valid = TRUE; diff --git a/third_party/nixpkgs/pkgs/applications/misc/gallery-dl/default.nix b/third_party/nixpkgs/pkgs/applications/misc/gallery-dl/default.nix index 6ccc31ef9b..438d466ab5 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/gallery-dl/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/gallery-dl/default.nix @@ -2,11 +2,11 @@ buildPythonApplication rec { pname = "gallery_dl"; - version = "1.16.5"; + version = "1.17.0"; src = fetchPypi { inherit pname version; - sha256 = "fb8c927630b292abf5052f8f75c3eebccbdffa609566768d4dc4d9665df91e68"; + sha256 = "bf5196b9e18a45d62d7e823894f12def310264a258956882cbac13b5e856bf00"; }; propagatedBuildInputs = [ requests ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/index-fm/default.nix b/third_party/nixpkgs/pkgs/applications/misc/index-fm/default.nix new file mode 100644 index 0000000000..328db96500 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/misc/index-fm/default.nix @@ -0,0 +1,52 @@ +{ lib +, mkDerivation +, fetchFromGitLab +, cmake +, extra-cmake-modules +, breeze-icons +, karchive +, kcoreaddons +, ki18n +, kio +, kirigami2 +, mauikit +, qtmultimedia +, qtquickcontrols2 +}: + +mkDerivation rec { + pname = "index"; + version = "1.2.1"; + + src = fetchFromGitLab { + domain = "invent.kde.org"; + owner = "maui"; + repo = "index-fm"; + rev = "v${version}"; + sha256 = "1v6z44c88cqgr3b758yq6l5d2zj1vhlnaq7v8rrhs7s5dsimzlx8"; + }; + + nativeBuildInputs = [ + cmake + extra-cmake-modules + ]; + + buildInputs = [ + breeze-icons + karchive + kcoreaddons + ki18n + kio + kirigami2 + mauikit + qtmultimedia + qtquickcontrols2 + ]; + + meta = with lib; { + description = "Multi-platform file manager"; + homepage = "https://invent.kde.org/maui/index-fm"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/misc/keeweb/default.nix b/third_party/nixpkgs/pkgs/applications/misc/keeweb/default.nix index 391e698dcf..3b2ca74c64 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/keeweb/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/keeweb/default.nix @@ -1,10 +1,10 @@ -{ lib, stdenv, fetchurl, appimageTools, undmg, libsecret }: +{ lib, stdenv, fetchurl, appimageTools, undmg, libsecret, libxshmfence }: let inherit (stdenv.hostPlatform) system; throwSystem = throw "Unsupported system: ${system}"; pname = "keeweb"; - version = "1.16.7"; + version = "1.17.0"; name = "${pname}-${version}"; suffix = { @@ -16,9 +16,9 @@ let src = fetchurl { url = "https://github.com/keeweb/keeweb/releases/download/v${version}/KeeWeb-${version}.${suffix}"; sha256 = { - x86_64-linux = "0a4yh2jh9sph17mqqi62gm5jc4yffkysq6yiggyzz5f8xw4p315j"; - x86_64-darwin = "0ix1apddqvz561pw5lx47x091wlfj27zh8k8v7kn5xvm09hswfkr"; - aarch64-darwin = "0p0kql79kcb3w947g1ljhbj15b8aqrwcrbi0cknb12f6iq47lkz7"; + x86_64-linux = "1c7zvwnd46d3lrlcdigv341flz44jl6mnvr6zqny5mfz221ynbj7"; + x86_64-darwin = "1n4haxychm5jjhjnpncavjh0wr4dagqi78qfsx5gwlv86hzryzwy"; + aarch64-darwin = "1j7z63cbfms02f2lhl949wy3lc376jw8kqmjfn9j949s0l5fanpb"; }.${system} or throwSystem; }; @@ -29,6 +29,7 @@ let meta = with lib; { description = "Free cross-platform password manager compatible with KeePass"; homepage = "https://keeweb.info/"; + changelog = "https://github.com/keeweb/keeweb/blob/v${version}/release-notes.md"; license = licenses.mit; maintainers = with maintainers; [ sikmir ]; platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-darwin" ]; @@ -37,7 +38,7 @@ let linux = appimageTools.wrapType2 rec { inherit name src meta; - extraPkgs = pkgs: with pkgs; [ libsecret ]; + extraPkgs = pkgs: with pkgs; [ libsecret libxshmfence ]; extraInstallCommands = '' mv $out/bin/{${name},${pname}} @@ -54,11 +55,11 @@ let nativeBuildInputs = [ undmg ]; - sourceRoot = "KeeWeb.app"; + sourceRoot = "."; installPhase = '' - mkdir -p $out/Applications/KeeWeb.app - cp -R . $out/Applications/KeeWeb.app + mkdir -p $out/Applications + cp -r *.app $out/Applications ''; }; in diff --git a/third_party/nixpkgs/pkgs/applications/misc/merkaartor/default.nix b/third_party/nixpkgs/pkgs/applications/misc/merkaartor/default.nix index 8eee8c1f09..010d28eef5 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/merkaartor/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/merkaartor/default.nix @@ -1,5 +1,20 @@ -{ mkDerivation, lib, fetchFromGitHub, qmake, pkg-config, fetchpatch -, boost, gdal, proj, qtbase, qtsvg, qtwebview, qtwebkit }: +{ mkDerivation +, lib +, stdenv +, fetchFromGitHub +, fetchpatch +, qmake +, qttools +, qttranslations +, gdal +, proj +, qtsvg +, qtwebkit +, withGeoimage ? true, exiv2 +, withGpsdlib ? (!stdenv.isDarwin), gpsd +, withLibproxy ? false, libproxy +, withZbar ? false, zbar +}: mkDerivation rec { pname = "merkaartor"; @@ -13,24 +28,48 @@ mkDerivation rec { }; patches = [ + # Fix build with Qt 5.15 (missing QPainterPath include) (fetchpatch { url = "https://github.com/openstreetmap/merkaartor/commit/e72553a7ea2c7ba0634cc3afcd27a9f7cfef089c.patch"; sha256 = "NAisplnS3xHSlRpX+fH15NpbaD+uM57OCsTYGKlIR7U="; }) + # Added a condition to use the new timespec_t on gpsd APIs >= 9 + (fetchpatch { + url = "https://github.com/openstreetmap/merkaartor/commit/13b358fa7899bb34e277b32a4c0d92833050f2c6.patch"; + sha256 = "129fpjm7illz7ngx3shps5ivrxwf14apw55842xhskwwb0rf5szb"; + }) ]; - nativeBuildInputs = [ qmake pkg-config ]; + nativeBuildInputs = [ qmake qttools ]; - buildInputs = [ boost gdal proj qtbase qtsvg qtwebview qtwebkit ]; + buildInputs = [ gdal proj qtsvg qtwebkit ] + ++ lib.optional withGeoimage exiv2 + ++ lib.optional withGpsdlib gpsd + ++ lib.optional withLibproxy libproxy + ++ lib.optional withZbar zbar; - enableParallelBuilding = true; + preConfigure = '' + lrelease src/src.pro + ''; - NIX_CFLAGS_COMPILE = "-DACCEPT_USE_OF_DEPRECATED_PROJ_API_H"; + qmakeFlags = [ "TRANSDIR_SYSTEM=${qttranslations}/translations" ] + ++ lib.optional withGeoimage "GEOIMAGE=1" + ++ lib.optional withGpsdlib "GPSDLIB=1" + ++ lib.optional withLibproxy "LIBPROXY=1" + ++ lib.optional withZbar "ZBAR=1"; + + postInstall = lib.optionalString stdenv.isDarwin '' + mkdir -p $out/Applications + mv binaries/bin/merkaartor.app $out/Applications + mv binaries/bin/plugins $out/Applications/merkaartor.app/Contents + wrapQtApp $out/Applications/merkaartor.app/Contents/MacOS/merkaartor + ''; meta = with lib; { description = "OpenStreetMap editor"; homepage = "http://merkaartor.be/"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ sikmir ]; + platforms = platforms.unix; }; } diff --git a/third_party/nixpkgs/pkgs/applications/misc/mkgmap/default.nix b/third_party/nixpkgs/pkgs/applications/misc/mkgmap/default.nix index ae82a324df..bd5d96c599 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/mkgmap/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/mkgmap/default.nix @@ -14,11 +14,11 @@ let in stdenv.mkDerivation rec { pname = "mkgmap"; - version = "4601"; + version = "4604"; src = fetchurl { url = "http://www.mkgmap.org.uk/download/mkgmap-r${version}-src.tar.gz"; - sha256 = "TQ2Ee0sy9q4PUvY3TD6zaQ9oy1xgsw5OAw4RQ7ecCUM="; + sha256 = "HmQwi3kIVhZOQpSfG3V48vUTbncsJLb/YCqsXrmtmQM="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/applications/misc/obsidian/default.nix b/third_party/nixpkgs/pkgs/applications/misc/obsidian/default.nix index 3f898a1324..66fef3361e 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/obsidian/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/obsidian/default.nix @@ -30,12 +30,12 @@ let in stdenv.mkDerivation rec { pname = "obsidian"; - version = "0.11.0"; + version = "0.11.3"; src = fetchurl { url = "https://github.com/obsidianmd/obsidian-releases/releases/download/v${version}/obsidian-${version}.tar.gz"; - sha256 = "1acy0dny04c8rdxqvsq70aa7vd8rgyjarcrf57mhh26ai5wiw81s"; + sha256 = "brpNQiWpIbvnPuCXrNJhBjgqPlhIb3dz3LFRf0M4K0Q="; }; nativeBuildInputs = [ makeWrapper graphicsmagick ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/sent/default.nix b/third_party/nixpkgs/pkgs/applications/misc/sent/default.nix index f4b811e075..fcf021a5ac 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/sent/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/sent/default.nix @@ -2,10 +2,11 @@ , patches ? [] }: stdenv.mkDerivation rec { - name = "sent-1"; + pname = "sent"; + version = "1"; src = fetchurl { - url = "https://dl.suckless.org/tools/${name}.tar.gz"; + url = "https://dl.suckless.org/tools/sent-${version}.tar.gz"; sha256 = "0cxysz5lp25mgww73jl0mgip68x7iyvialyzdbriyaff269xxwvv"; }; @@ -26,7 +27,7 @@ stdenv.mkDerivation rec { description = "A simple plaintext presentation tool"; homepage = "https://tools.suckless.org/sent/"; license = licenses.isc; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = with maintainers; [ pSub ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/misc/sidequest/default.nix b/third_party/nixpkgs/pkgs/applications/misc/sidequest/default.nix index c904c22126..c83cd77265 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/sidequest/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/sidequest/default.nix @@ -1,7 +1,7 @@ { stdenv, lib, fetchurl, buildFHSUserEnv, makeDesktopItem, makeWrapper, atomEnv, libuuid, at-spi2-atk, icu, openssl, zlib }: let pname = "sidequest"; - version = "0.10.11"; + version = "0.10.19"; desktopItem = makeDesktopItem rec { name = "SideQuest"; @@ -15,8 +15,8 @@ inherit pname version; src = fetchurl { - url = "https://github.com/the-expanse/SideQuest/releases/download/v${version}/SideQuest-${version}.tar.xz"; - sha256 = "0fw952kdh1gn00y6sx2ag0rnb2paxq9ikg4bzgmbj7rrd1c6l2k9"; + url = "https://github.com/SideQuestVR/SideQuest/releases/download/v${version}/SideQuest-${version}.tar.xz"; + sha256 = "14zqp12nigc4kv6hppyx2s59mmriimnzczay4xi3vh7zcw207px2"; }; nativeBuildInputs = [ makeWrapper ]; @@ -46,8 +46,8 @@ meta = with lib; { description = "An open app store and side-loading tool for Android-based VR devices such as the Oculus Go, Oculus Quest or Moverio BT 300"; - homepage = "https://github.com/the-expanse/SideQuest"; - downloadPage = "https://github.com/the-expanse/SideQuest/releases"; + homepage = "https://github.com/SideQuestVR/SideQuest"; + downloadPage = "https://github.com/SideQuestVR/SideQuest/releases"; license = licenses.mit; maintainers = with maintainers; [ joepie91 rvolosatovs ]; platforms = [ "x86_64-linux" ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/ticker/default.nix b/third_party/nixpkgs/pkgs/applications/misc/ticker/default.nix index bc3e8dfd6d..d024eb031e 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/ticker/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/ticker/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "ticker"; - version = "3.1.8"; + version = "3.1.9"; src = fetchFromGitHub { owner = "achannarasappa"; repo = pname; rev = "v${version}"; - sha256 = "sha256-U2TYUB4RHUBPoXe/te+QpXglbVcrT6SItiDrA7ODX6w="; + sha256 = "sha256-/OpDcsRIwuj1bvtpPyk1Qc9QZGJMLiOLj8NBfbT7hdo="; }; vendorSha256 = "sha256-aUBj7ZGWBeWc71y1CWm/KCw+El5TwH29S+KxyZGH1Zo="; diff --git a/third_party/nixpkgs/pkgs/applications/misc/tickrs/default.nix b/third_party/nixpkgs/pkgs/applications/misc/tickrs/default.nix index 114b146408..c789dbdce7 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/tickrs/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/tickrs/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "tickrs"; - version = "0.13.1"; + version = "0.14.1"; src = fetchFromGitHub { owner = "tarkah"; repo = pname; rev = "v${version}"; - sha256 = "sha256-PGJztoGVIjUwx4x42LdpxJQMZH60x6JWY+yTHQgjHWM="; + sha256 = "sha256-FbbxkAP1RQVYL91mlAw0PcEWUDxgCrCd9QjLPE+bqmo="; }; - cargoSha256 = "sha256-0NNdo28fLoqwKXBQ1fBTKPGE/zE7pnWnIjgCITsaGJc="; + cargoSha256 = "sha256-94U84/UxHAf5yrCnqpxjwHi/ekFHbFBs9b7pBewKvjw="; nativeBuildInputs = [ perl ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/tipp10/default.nix b/third_party/nixpkgs/pkgs/applications/misc/tipp10/default.nix index 3333760a75..37aafb7827 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/tipp10/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/tipp10/default.nix @@ -3,13 +3,13 @@ mkDerivation rec { pname = "tipp10"; - version = "unstable-20200616"; + version = "3.2.1"; src = fetchFromGitLab { owner = "tipp10"; repo = "tipp10"; - rev = "2dd6d45c8a91cff7075675d8875721456cdd5f1b"; - sha256 = "16x51rv4r6cz5vsmrfbakqzbfxy456h82ibzacknp35f41cjdqq4"; + rev = "v${version}"; + sha256 = "4cxN2AnvYhZAMuA/qfmdLVICJNk6VCpRnfelbxYRvPg="; }; nativeBuildInputs = [ cmake qttools ]; @@ -17,8 +17,8 @@ mkDerivation rec { meta = with lib; { description = "Learn and train typing with the ten-finger system"; - homepage = "https://gitlab.com/a_a/tipp10"; - license = licenses.gpl2; + homepage = "https://gitlab.com/tipp10/tipp10"; + license = licenses.gpl2Only; maintainers = with maintainers; [ petabyteboy ]; platforms = platforms.all; }; diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/brave/default.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/brave/default.nix index 0de942a172..430f9e38e2 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/brave/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/brave/default.nix @@ -90,11 +90,11 @@ in stdenv.mkDerivation rec { pname = "brave"; - version = "1.21.73"; + version = "1.21.74"; src = fetchurl { url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb"; - sha256 = "12jkj9h1smipqlkidnd3r492yfnncl0b2dmjq22qp2vsrscc3jfg"; + sha256 = "2csyjwn5j5+cRmjq0+gHLWvIVjtaSaN9rVZ8ikI0gec="; }; dontConfigure = true; @@ -160,7 +160,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://brave.com/"; description = "Privacy-oriented browser for Desktop and Laptop computers"; - changelog = "https://github.com/brave/brave-browser/blob/v${version}/CHANGELOG.md"; + changelog = "https://github.com/brave/brave-browser/blob/master/CHANGELOG_DESKTOP.md"; longDescription = '' Brave browser blocks the ads and trackers that slow you down, chew up your bandwidth, and invade your privacy. Brave lets you diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/castor/default.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/castor/default.nix index daead82e48..259a878090 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/castor/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/castor/default.nix @@ -1,5 +1,5 @@ { lib -, fetchurl +, fetchFromSourcehut , rustPlatform , pkg-config , wrapGAppsHook @@ -15,9 +15,11 @@ rustPlatform.buildRustPackage rec { pname = "castor"; version = "0.8.16"; - src = fetchurl { - url = "https://git.sr.ht/~julienxx/castor/archive/${version}.tar.gz"; - sha256 = "1qwsprwazkzcs70h219fhh5jj5s5hm1k120fn3pk4qivii4lyhah"; + src = fetchFromSourcehut { + owner = "~julienxx"; + repo = pname; + rev = version; + sha256 = "0rwg1w7srjwa23mkypl8zk6674nhph4xsc6nc01f6g5k959szylr"; }; cargoSha256 = "0yn2kfiaz6d8wc8rdqli2pwffp5vb1v3zi7520ysrd5b6fc2csf2"; diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/common.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/common.nix index 6c77ed3d18..3197e272f0 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/common.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/common.nix @@ -17,7 +17,7 @@ , protobuf, speechd, libXdamage, cups , ffmpeg, libxslt, libxml2, at-spi2-core , jre8 -, pipewire_0_2 +, pipewire , libva , libdrm, wayland, mesa, libxkbcommon # Ozone @@ -140,7 +140,7 @@ let libXScrnSaver libXcursor libXtst libxshmfence libGLU libGL pciutils protobuf speechd libXdamage at-spi2-core jre - pipewire_0_2 + pipewire libva libdrm wayland mesa.drivers libxkbcommon ] ++ optional gnomeKeyringSupport libgnome-keyring3 @@ -263,6 +263,7 @@ let use_pulseaudio = true; link_pulseaudio = true; } // optionalAttrs (chromiumVersionAtLeast "89") { + rtc_pipewire_version = "0.3"; # TODO: Can be removed once ungoogled-chromium is at M90 # Disable PGO (defaults to 2 since M89) because it fails without additional changes: # error: Could not read profile ../../chrome/build/pgo_profiles/chrome-linux-master-1610647094-405a32bcf15e5a84949640f99f84a5b9f61e2f2e.profdata: Unsupported instrumentation profile format version chrome_pgo_phase = 0; diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/default.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/default.nix index 79899d822b..cf2fedde97 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/default.nix @@ -2,7 +2,7 @@ , llvmPackages_11, ed, gnugrep, coreutils, xdg-utils , glib, gtk3, gnome3, gsettings-desktop-schemas, gn, fetchgit , libva ? null -, pipewire_0_2 +, pipewire , gcc, nspr, nss, runCommand , lib @@ -161,7 +161,7 @@ in stdenv.mkDerivation { buildCommand = let browserBinary = "${chromiumWV}/libexec/chromium/chromium"; - libPath = lib.makeLibraryPath [ libva pipewire_0_2 ]; + libPath = lib.makeLibraryPath [ libva pipewire ]; in with lib; '' mkdir -p "$out/bin" 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 9db51f2421..98fe339773 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 @@ -18,22 +18,22 @@ } }, "beta": { - "version": "89.0.4389.72", - "sha256": "0kxwq1m6zdsq3ns2agvk1hqkhwlv1693h41rlmvhy3nim9jhnsll", - "sha256bin64": "0w1972r71gp8jjr9370f9xb8v2f109mxjrsm8893sn4kbz8zmxby", + "version": "90.0.4430.19", + "sha256": "174isyx4g62d8ggn9imp41dfklcbxi3y5nfprm4jbjmn5cb7v8xa", + "sha256bin64": "0z665iykdsmjrjbijsrcq80y2anvcfykasznf8w4brg9l9k59wv8", "deps": { "gn": { - "version": "2021-01-07", + "version": "2021-02-09", "url": "https://gn.googlesource.com/gn", - "rev": "595e3be7c8381d4eeefce62a63ec12bae9ce5140", - "sha256": "08y7cjlgjdbzja5ij31wxc9i191845m01v1hc7y176svk9y0hj1d" + "rev": "dfcbc6fed0a8352696f92d67ccad54048ad182b3", + "sha256": "1941bzg37c4dpsk3sh6ga3696gpq6vjzpcw9rsnf6kdr9mcgdxvn" } } }, "dev": { - "version": "90.0.4430.11", - "sha256": "0rzg1yji1rxddxcy03lwqv9rdqnk3c25v2g57mq9n37c6jqisyq4", - "sha256bin64": "015a1agwwf5g7x70rzfb129h6r7hfd86593853nqgy1m9yprxqab", + "version": "90.0.4430.19", + "sha256": "174isyx4g62d8ggn9imp41dfklcbxi3y5nfprm4jbjmn5cb7v8xa", + "sha256bin64": "1155mk933xvhd8141dp210akkmbcchly3q4cr7v176id50dvpnxl", "deps": { "gn": { "version": "2021-02-09", @@ -44,19 +44,19 @@ } }, "ungoogled-chromium": { - "version": "88.0.4324.182", - "sha256": "10av060ix6lgsvv99lyvyy03r0m3zwdg4hddbi6dycrdxk1iyh9h", - "sha256bin64": "1rjg23xiybpnis93yb5zkvglm3r4fds9ip5mgl6f682z5x0yj05b", + "version": "89.0.4389.82", + "sha256": "0yg33d6zldz3j1jghhdci63fn46i10dkz3nb95jdrbv8gd018jfz", + "sha256bin64": "1sqzzillq38qyh85449ncz8bni93mjxb6r4z8y5h8k2w3j38jc0q", "deps": { "gn": { - "version": "2020-11-05", + "version": "2021-01-07", "url": "https://gn.googlesource.com/gn", - "rev": "53d92014bf94c3893886470a1c7c1289f8818db0", - "sha256": "1xcm07qjk6m2czi150fiqqxql067i832adck6zxrishm70c9jbr9" + "rev": "595e3be7c8381d4eeefce62a63ec12bae9ce5140", + "sha256": "08y7cjlgjdbzja5ij31wxc9i191845m01v1hc7y176svk9y0hj1d" }, "ungoogled-patches": { - "rev": "88.0.4324.182-1", - "sha256": "1c9y1dn9s06pskkjw2r8lsbplak8m2rwh4drixvjpif7b4cgdhay" + "rev": "89.0.4389.82-1", + "sha256": "183w22q6mpmw7s1l65dzvc5i422vl7qax6q4xpgr3krcx4y00878" } } } diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/helm/plugins/helm-secrets.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/helm/plugins/helm-secrets.nix index d53abe3569..bef5d230ec 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/helm/plugins/helm-secrets.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/helm/plugins/helm-secrets.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "helm-secrets"; - version = "3.4.1"; + version = "3.5.0"; src = fetchFromGitHub { owner = "jkroepke"; repo = pname; rev = "v${version}"; - sha256 = "sha256-EXCr0QjupsBBKTm6Opw5bcNwAD4FGGyOiqaa8L91/OI="; + hash = "sha256-EXCr0QjupsBBKTm6Opw5bcNwAD4FGGyOiqaa8L91/OI="; }; nativeBuildInputs = [ makeWrapper ]; 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 5ac152c849..3c6d667690 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/helmfile/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/helmfile/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "helmfile"; - version = "0.138.6"; + version = "0.138.7"; src = fetchFromGitHub { owner = "roboll"; repo = "helmfile"; rev = "v${version}"; - sha256 = "sha256-slqHG4uD0sbCNNr5Ve9eemyylUs4w1JizfoIMbrbVeg="; + sha256 = "sha256-LFNsSd+S+mQiTk7bCnSD/Kp/D0Jefxo80eRsGkStBhs="; }; vendorSha256 = "sha256-WlV6moJymQ7VyZXXuViCNN1WP4NzBUszavxpKjQR8to="; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/kube3d/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/kube3d/default.nix index 5bfceefad5..8f44531516 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/kube3d/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/kube3d/default.nix @@ -1,8 +1,8 @@ -{ lib, buildGoModule, fetchFromGitHub, installShellFiles, k3sVersion ? "1.20.0-k3s2" }: +{ lib, buildGoModule, fetchFromGitHub, installShellFiles, k3sVersion ? "1.20.4-k3s1" }: buildGoModule rec { pname = "kube3d"; - version = "4.2.0"; + version = "4.3.0"; excludedPackages = "tools"; @@ -10,20 +10,17 @@ buildGoModule rec { owner = "rancher"; repo = "k3d"; rev = "v${version}"; - sha256 = "sha256-R2RbQlceOD/uY3IdLLiM23gESh/oWnsiTWxHeH/Si18="; + sha256 = "sha256-ybEYKr0rQY8Qg74V1mXqShq5Z2d/Adf0bSSbEMIyo3I="; }; vendorSha256 = null; nativeBuildInputs = [ installShellFiles ]; - buildFlagsArray = [ - "-ldflags=" - "-w" - "-s" - "-X github.com/rancher/k3d/v4/version.Version=v${version}" - "-X github.com/rancher/k3d/v4/version.K3sVersion=v${k3sVersion}" - ]; + preBuild = let t = "github.com/rancher/k3d/v4/version"; in + '' + buildFlagsArray+=("-ldflags" "-s -w -X ${t}.Version=v${version} -X ${t}.K3sVersion=v${k3sVersion}") + ''; doCheck = false; @@ -36,6 +33,7 @@ buildGoModule rec { meta = with lib; { homepage = "https://github.com/rancher/k3d"; + changelog = "https://github.com/rancher/k3d/blob/v${version}/CHANGELOG.md"; description = "A helper to run k3s (Lightweight Kubernetes. 5 less than k8s) in a docker container - k3d"; longDescription = '' k3s is the lightweight Kubernetes distribution by Rancher: rancher/k3s @@ -44,7 +42,7 @@ buildGoModule rec { multi-node k3s cluster on a single machine using docker. ''; license = licenses.mit; - platforms = platforms.linux; maintainers = with maintainers; [ kuznero jlesquembre ngerstle jk ]; + platforms = platforms.linux; }; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/minikube/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/minikube/default.nix index 66ff583e8c..79cfebd2af 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/minikube/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/minikube/default.nix @@ -11,9 +11,9 @@ buildGoModule rec { pname = "minikube"; - version = "1.18.0"; + version = "1.18.1"; - vendorSha256 = "0fy9x9zlmwpncyj55scvriv4vr4kjvqss85b0a1zs2srvlnf8gz2"; + vendorSha256 = "sha256-rw1tqz+Y5iSXWIxXV4433Hwgyfz8jYMzKWurCi2hmhM="; doCheck = false; @@ -21,7 +21,7 @@ buildGoModule rec { owner = "kubernetes"; repo = "minikube"; rev = "v${version}"; - sha256 = "1yjcaq0lg5a7ip2qxjmnzq3pa1gjhdfdq9a4xk2zxyqcam4dh6v2"; + sha256 = "sha256-8QI/Kn5LHSD3at7icmEDhjuYP811A4l+2KrRmKTwi8w="; }; nativeBuildInputs = [ go-bindata installShellFiles pkg-config which ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/nerdctl/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/nerdctl/default.nix index b16d0448ca..84a6cd644e 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/nerdctl/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/nerdctl/default.nix @@ -2,6 +2,7 @@ , buildGoModule , fetchFromGitHub , makeWrapper +, installShellFiles , buildkit , cni-plugins , extraPackages ? [ ] @@ -9,26 +10,23 @@ buildGoModule rec { pname = "nerdctl"; - version = "0.6.1"; + version = "0.7.1"; src = fetchFromGitHub { owner = "AkihiroSuda"; repo = pname; rev = "v${version}"; - sha256 = "sha256-zexvTPEQw7iW1d3ahHmqTn+UaT/bJMlr1sVlWErc2ck="; + sha256 = "sha256-tMzob+ljGBKkfbxwMqy+8bqVp51Eqyx4kXhsj/LRfzQ="; }; - vendorSha256 = "sha256-bX1GfKbAbdEAnW3kPNsbF/cJWufxvuhm//G88qJ3u08="; + vendorSha256 = "sha256-zUX/kneVz8uXmxly8yqmcttK3Wj4EmBaT8gmg3hDms4="; - nativeBuildInputs = [ makeWrapper ]; + nativeBuildInputs = [ makeWrapper installShellFiles ]; - buildFlagsArray = [ - "-ldflags=" - "-w" - "-s" - "-X github.com/AkihiroSuda/nerdctl/pkg/version.Version=v${version}" - "-X github.com/AkihiroSuda/nerdctl/pkg/version.Revision=" - ]; + preBuild = let t = "github.com/AkihiroSuda/nerdctl/pkg/version"; in + '' + buildFlagsArray+=("-ldflags" "-s -w -X ${t}.Version=v${version} -X ${t}.Revision=") + ''; # Many checks require a containerd socket and running nerdctl after it's built doCheck = false; @@ -37,17 +35,19 @@ buildGoModule rec { wrapProgram $out/bin/nerdctl \ --prefix PATH : "${lib.makeBinPath ([ buildkit ] ++ extraPackages)}" \ --prefix CNI_PATH : "${cni-plugins}/bin" + + # nerdctl panics without XDG_RUNTIME_DIR set + export XDG_RUNTIME_DIR=$TMPDIR + + installShellCompletion --cmd nerdctl \ + --bash <($out/bin/nerdctl completion bash) ''; doInstallCheck = true; installCheckPhase = '' runHook preInstallCheck - # nerdctl expects XDG_RUNTIME_DIR to be set - export XDG_RUNTIME_DIR=$TMPDIR - $out/bin/nerdctl --help - # --version will error without containerd.sock access - $out/bin/nerdctl --help | grep "${version}" + $out/bin/nerdctl --version | grep "nerdctl version ${version}" runHook postInstallCheck ''; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform/default.nix index 4a6e95057a..a74f5df58f 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform/default.nix @@ -157,9 +157,9 @@ in rec { }); terraform_0_14 = pluggable (generic { - version = "0.14.7"; - sha256 = "0lnq65ibdxrw2rlyipk469a5hh16vgym1698nmfn62ak8fdrd8la"; - vendorSha256 = "0pk5mgj19a8by7wbn5xd6kgr1kxrazhvg851fvs8mq3j0ayb32nb"; + version = "0.14.8"; + sha256 = "0kpw8w28pfyr136z5d4pxw7g9ch6rk2lfwh3lwz25mngq1lljmn0"; + vendorSha256 = "1d93aqkjdrvabkvix6h1qaxpjzv7w1wa7xa44czdnjs2lapx4smm"; patches = [ ./provider-path.patch ]; passthru = { inherit plugins; }; }); diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/terragrunt/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/terragrunt/default.nix index 6bf2e47616..6191089592 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/terragrunt/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/terragrunt/default.nix @@ -2,25 +2,22 @@ buildGoModule rec { pname = "terragrunt"; - version = "0.28.7"; + version = "0.28.9"; src = fetchFromGitHub { owner = "gruntwork-io"; repo = pname; rev = "v${version}"; - sha256 = "sha256-pM3R85gdP2eVoXx//2tKePNAi14eM8Ut+eXR+vB0Ukk="; + sha256 = "sha256-sqwR+bXx5ab5OsmW44C5MIXjzQFM1QsBvsM0R3pL3H8="; }; - vendorSha256 = "sha256-lRJerUYafpkXAGf8MEM8SeG3aB86mlMo7iLpeHFAnd4="; + vendorSha256 = "sha256-9DBCP/4mp/Gr2ie0nk7WGfL+M7snMEztdHZzxdIFbzM="; doCheck = false; - buildFlagsArray = [ - "-ldflags=" - "-s" - "-w" - "-X main.VERSION=v${version}" - ]; + preBuild = '' + buildFlagsArray+=("-ldflags" "-s -w -X main.VERSION=v${version}") + ''; doInstallCheck = true; installCheckPhase = '' diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/signal-cli/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/signal-cli/default.nix index 0ef024225f..05ab8b49a6 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/signal-cli/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/signal-cli/default.nix @@ -2,12 +2,12 @@ stdenv.mkDerivation rec { pname = "signal-cli"; - version = "0.8.0"; + version = "0.8.1"; # Building from source would be preferred, but is much more involved. src = fetchurl { url = "https://github.com/AsamK/signal-cli/releases/download/v${version}/signal-cli-${version}.tar.gz"; - sha256 = "sha256-0YzeGtdsCUG8N7Av/zzHoC9KKu1rqjQDToaOEXzuoJc="; + sha256 = "sha256-Lq1RSJ1VIa6MFTiTbGqNy7IqliJwGeuegm/1+RRtu+I="; }; buildInputs = lib.optionals stdenv.isLinux [ libmatthew_java dbus dbus_java ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix index 3fe88c287c..deb01f1ef2 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/telepathy/gabble/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, pkg-config, libxslt, telepathy-glib, libxml2, dbus-glib, dbus +{ lib, stdenv, fetchurl, pkg-config, libxslt, telepathy-glib, python2, libxml2, dbus-glib, dbus , sqlite, libsoup, libnice, gnutls}: stdenv.mkDerivation rec { @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkg-config libxslt ]; - buildInputs = [ libxml2 dbus-glib sqlite libsoup libnice telepathy-glib gnutls telepathy-glib.python ]; + buildInputs = [ libxml2 dbus-glib sqlite libsoup libnice telepathy-glib gnutls python2 ]; checkInputs = [ dbus.daemon ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/telepathy/haze/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/telepathy/haze/default.nix index 74e4d1039e..11acf05c19 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/telepathy/haze/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/telepathy/haze/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, fetchpatch, pidgin, telepathy-glib, glib, dbus-glib, pkg-config, libxslt }: +{ lib, stdenv, fetchurl, fetchpatch, pidgin, telepathy-glib, python2, glib, dbus-glib, pkg-config, libxslt }: stdenv.mkDerivation rec { pname = "telepathy-haze"; @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1jgrp32p6rllj089ynbsk3n9xrvsvzmwzhf0ql05kkgj0nf08xiy"; }; - buildInputs = [ glib telepathy-glib dbus-glib pidgin telepathy-glib.python ]; + buildInputs = [ glib telepathy-glib dbus-glib pidgin python2 ]; nativeBuildInputs = [ pkg-config libxslt ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/telepathy/idle/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/telepathy/idle/default.nix index 041ec5e7c5..fe7ef49cd0 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/telepathy/idle/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/telepathy/idle/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, glib, dconf, pkg-config, dbus-glib, telepathy-glib, libxslt, makeWrapper }: +{ lib, stdenv, fetchurl, glib, dconf, pkg-config, dbus-glib, telepathy-glib, python2, libxslt, makeWrapper }: stdenv.mkDerivation rec { pname = "telepathy-idle"; @@ -10,7 +10,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ pkg-config makeWrapper ]; - buildInputs = [ glib telepathy-glib dbus-glib libxslt telepathy-glib.python (lib.getLib dconf) ]; + buildInputs = [ glib telepathy-glib dbus-glib libxslt python2 (lib.getLib dconf) ]; preFixup = '' wrapProgram "$out/libexec/telepathy-idle" \ diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix index bae29f4b31..a6b1a5256f 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/telepathy/logger/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, dbus-glib, libxml2, sqlite, telepathy-glib, pkg-config +{ lib, stdenv, fetchurl, dbus-glib, libxml2, sqlite, telepathy-glib, python2, pkg-config , dconf, makeWrapper, intltool, libxslt, gobject-introspection, dbus }: stdenv.mkDerivation rec { @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { ]; buildInputs = [ dbus-glib libxml2 sqlite telepathy-glib - dbus telepathy-glib.python + dbus python2 ]; configureFlags = [ "--enable-call" ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/telepathy/salut/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/telepathy/salut/default.nix index cf166f7e2d..99465cc797 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/telepathy/salut/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/telepathy/salut/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, libxslt, glib, libxml2, telepathy-glib, avahi, libsoup +{ lib, stdenv, fetchurl, libxslt, glib, libxml2, telepathy-glib, python2, avahi, libsoup , libuuid, openssl, pcre, sqlite, pkg-config }: stdenv.mkDerivation rec { @@ -12,7 +12,7 @@ stdenv.mkDerivation rec { # pcre needed because https://github.com/NixOS/nixpkgs/pull/15046 buildInputs = [ glib libxml2 telepathy-glib avahi libsoup libuuid openssl - sqlite pcre telepathy-glib.python ]; + sqlite pcre python2 ]; nativeBuildInputs = [ libxslt pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/irc/qweechat/default.nix b/third_party/nixpkgs/pkgs/applications/networking/irc/qweechat/default.nix deleted file mode 100644 index c4a67c8098..0000000000 --- a/third_party/nixpkgs/pkgs/applications/networking/irc/qweechat/default.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ lib, fetchFromGitHub, python27Packages }: - -python27Packages.buildPythonApplication rec { - version = "2016-07-29"; - name = "qweechat-unstable-${version}"; - namePrefix = ""; - - src = fetchFromGitHub { - owner = "weechat"; - repo = "qweechat"; - rev = "f5e54d01691adb3abef47e051a6412186c33313c"; - sha256 = "0dhlriwvkrsn7jj01p2wqhf2p63n9qd173jsgccgxlacm2zzvhaz"; - }; - - prePatch = '' - substituteInPlace setup.py \ - --replace 'qweechat = qweechat.qweechat' 'qweechat = qweechat.qweechat:main' - ''; - - propagatedBuildInputs = with python27Packages; [ - pyside setuptools - ]; - - meta = with lib; { - homepage = "https://github.com/weechat/qweechat"; - description = "Qt remote GUI for WeeChat"; - license = licenses.gpl3; - maintainers = with maintainers; [ ramkromberg ]; - platforms = with platforms; linux; - }; -} 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 5c129803ce..18110dc7a3 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird-bin/release_sources.nix @@ -1,665 +1,665 @@ { - version = "78.8.0"; + version = "78.8.1"; sources = [ - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/af/thunderbird-78.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-x86_64/af/thunderbird-78.8.1.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "9e4334e885fd43138f32138976e7539ed3e438d18322764aa21df5c30b38d987"; + sha256 = "086a23b05a2baf8e8a1b44891017c6fef8c45d4e4802b519ceeda2bf62496649"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/ar/thunderbird-78.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-x86_64/ar/thunderbird-78.8.1.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "b51e15fcb534d82909cd3578cc02bc9b1f5f79cddab89349009b6edf7292208f"; + sha256 = "b5b643119f0d0336d61972d91f20764590d7453cb391165283e00dc980d3bdef"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/ast/thunderbird-78.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-x86_64/ast/thunderbird-78.8.1.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "75d944c21a5077fab03dc474bcadb09a21392f25ffe5f5baa1e6ec1b59d319cd"; + sha256 = "2e219961dc2b33f7680be0a6fbd03c0032fdbb557a3dedaf32773efb6cf7a061"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/be/thunderbird-78.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-x86_64/be/thunderbird-78.8.1.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "3b28e58054f40d60cdde6cb0789d5f885dd695c459666680aad53a67cefa4ec2"; + sha256 = "ce8a7e4f025b6064ff4eef01c634b2b7f52ec0ffa5eb7094f0483c7d6f31b939"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/bg/thunderbird-78.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-x86_64/bg/thunderbird-78.8.1.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "fd5e34527ff0f33b7c072e34f0e6a8c27963bb4849b3876ef6a4a0243b89b3cd"; + sha256 = "a7dff0d43d11473d47df6672da8515b5d1393eea581193fdb8b334cfd8c780e8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/br/thunderbird-78.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-x86_64/br/thunderbird-78.8.1.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "de272588fe4ef2f24b9a73952f408ff0e22aa3dc481007cbd8dd64e3552e65be"; + sha256 = "70b0a987b1677fe1b78b4105dc15aea80448e71cde8a2a31f32429111b07c92b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/ca/thunderbird-78.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-x86_64/ca/thunderbird-78.8.1.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "fda9add048104e2709421add69957c79914dc3ec65b29f2bdf90f345d397ff8d"; + sha256 = "0e311309e7a9b03afd92fb3f38582ad318c10d3342238db42d30504123bca080"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/cak/thunderbird-78.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-x86_64/cak/thunderbird-78.8.1.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "d9c394a8f69ce1442c5444d1f6fd7350922fd9616e1dc696399fbdfd539f99b0"; + sha256 = "86506acf4c23672469c6bc533019e0a2b4872efcad07468dd3c5a2f1b6ac7dd1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/cs/thunderbird-78.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-x86_64/cs/thunderbird-78.8.1.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "c5cea000c58d4f42d54306835fe1c15ca358286e3f4b48862857ae6dc531859b"; + sha256 = "6a63442f96a88c9b80b436eb280a5e67553751c946802bfe81db017eb1a11874"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/cy/thunderbird-78.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-x86_64/cy/thunderbird-78.8.1.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "9e790ef1f09af98e84bd3246fd4cfa679cca354532472a5323eeb4bafa92f7a2"; + sha256 = "7b70af973f706976b87cac4e48623a3c3dad20538d2bc0bd4cdfd57bf1937f54"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/da/thunderbird-78.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-x86_64/da/thunderbird-78.8.1.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "62d2af10af31a472a3a2d2b3aa582c96d92466428aac3f1f007003cfcbe0c106"; + sha256 = "2b3eb2c351b4df91d2520ae4b93687eba47a6f7b6182086345cad0629ffc9538"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/de/thunderbird-78.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-x86_64/de/thunderbird-78.8.1.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "98bdf6c67d230b46014526d756a06dc2897de3f24f027fac3abb8550e5e608bf"; + sha256 = "ecd00d0713704e323acd7a1a0da88bfc3c92a85a99611f6af1b5425387428af0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/dsb/thunderbird-78.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-x86_64/dsb/thunderbird-78.8.1.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "2350e2884af5757ef7d61e37fe2090a5e0f504a2c192c78d66af982f9e4a9d92"; + sha256 = "8808ff0c67014db313413aea3e8dbe7c0e0501c878572f2db1765d4b8c6ebe3b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/el/thunderbird-78.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-x86_64/el/thunderbird-78.8.1.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "bfc20efee36a77fa124d6980396c2a51e0d59d1480ba32f53b550986ebda61a9"; + sha256 = "f83554e57ccf5a3c56b6111a928e2e983c07bac131ba8a74e9449250b644fafa"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/en-CA/thunderbird-78.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-x86_64/en-CA/thunderbird-78.8.1.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "094cb02d5bb3ae13025005c458befa34428a9338e6bc489fc7cf14d70ec42e00"; + sha256 = "138384402cfedf4d725b5e74f1c3150d078fd422d5440246e841b9ee5c458128"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/en-GB/thunderbird-78.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-x86_64/en-GB/thunderbird-78.8.1.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "3ca1112e55371d628b518ce12d4bcef08ff1ae71a0820405e236b2399cf1d6f9"; + sha256 = "9058897455dad34af97f1f3e1ccd517244de9c2f9a51ff3a8d222d8439b5865c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/en-US/thunderbird-78.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-x86_64/en-US/thunderbird-78.8.1.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "074aa418d841d65f8c702cd86046595ce715e3156d8cd7f0da9dba48580b230c"; + sha256 = "7ab2fdf949a7cfd7abbba7bb2307bad08fdebed24a0446514be89c308af587b7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/es-AR/thunderbird-78.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-x86_64/es-AR/thunderbird-78.8.1.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "4f4552f137958ab583183237322cb48327242e8354689aba9c557e448abed7f9"; + sha256 = "71396deb4b1148a20af83bf7bf62dca00ec43b8cb64b5902f8bf52d861dd861b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/es-ES/thunderbird-78.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-x86_64/es-ES/thunderbird-78.8.1.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "61787b7e70a6722e5921246bedf1182d7f52b28f1abc218b5bad7544fbe7dc87"; + sha256 = "6dd479e524e4bfa7ab1488d808bfde041c34d2a13de1003f1c2a2ee0db0fc772"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/et/thunderbird-78.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-x86_64/et/thunderbird-78.8.1.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "b85fd3bcea1284b79d5a8816ff0056060b4bad22ffeb2b2e50f6b8bbc61da8c0"; + sha256 = "259ee045328d21c877ca67223f91e438496e6675cb97d825482a8213b3bbb161"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/eu/thunderbird-78.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-x86_64/eu/thunderbird-78.8.1.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "a80cbc3f5227a6712ae04fa3a6f553c91c8ee757e9f58483ed3db300e7661fc5"; + sha256 = "18a4fadc4a8d167489924042510c06d58c599997e28f652eacc3e4c85841a932"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/fa/thunderbird-78.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-x86_64/fa/thunderbird-78.8.1.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha256 = "fee67058c3b6b6ab5ef10c2bdd9ac9cdc86c1a65177f86b9b39e69435923feb8"; + sha256 = "0b397cd272cd386dc4d0cca7999198098a8cf4dc9088b93b05a7de75de9a9397"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/fi/thunderbird-78.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-x86_64/fi/thunderbird-78.8.1.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "c3e2b90ec439de73a4afead978bc53e64966dda277d7b40cc0c2080df4180238"; + sha256 = "9f1b5bed03fcf37f0e3a5155c36a691766ab88cb9604821b4f07ee9f25cfbc9c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/fr/thunderbird-78.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-x86_64/fr/thunderbird-78.8.1.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "c7dc2fb5a67a5e3d884276c74dbed0d975db2686b7c9e47ee3b8e9cacba248db"; + sha256 = "ff806999956ffe547bd987870a804942462276a10f1334df00797e56482dc4a5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/fy-NL/thunderbird-78.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-x86_64/fy-NL/thunderbird-78.8.1.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "13a0b3041c1178ea08fd4a65968f3e3a244a1e2a09931a1b9e142bb39db3da2a"; + sha256 = "50f7343fa2fa61fa46e7a05f86479743271bde3021efa27ba948923467fb0170"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/ga-IE/thunderbird-78.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-x86_64/ga-IE/thunderbird-78.8.1.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "e53725b3e31b9d397a3c92d2cb1bc5cdc206b5fa3310dbce3fcf8b82bdd50af4"; + sha256 = "e2912457c0e390f84f375fde8946c1eca15b036fb4016ca7cd608a9c61eb5060"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/gd/thunderbird-78.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-x86_64/gd/thunderbird-78.8.1.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "04fc55448d9a12b4dc0995b48e0744868195f633b3489f0c38e4d154f9a2d1f2"; + sha256 = "c5b2f349c98fa51f5b6dc57cc9d16f408d9659fa979c4ee86b5c51f2c163f8a5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/gl/thunderbird-78.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-x86_64/gl/thunderbird-78.8.1.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "18db14f47f958e4eaf8954805df109819124e4f0ea1713781add31105b258c4e"; + sha256 = "0580beef930019c5312ba4ed38e6570f4d4b85857d4c002461b07f705e261b3e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/he/thunderbird-78.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-x86_64/he/thunderbird-78.8.1.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "99b47c6caa14ddf6af2d5ebdcad25f2d53300f8599c8b9f0304ab374dd0d2ebb"; + sha256 = "d7ddfedb469437e7df9b0ef967e578047ca70b5d45dc5175ca08f5d1b920d5c1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/hr/thunderbird-78.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-x86_64/hr/thunderbird-78.8.1.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "29ce83e46a61c22c3bd4e4cbacc0fd7ec04a36460bfbeb76b62eaa752a0d10e2"; + sha256 = "5c9c1535488e987113f356a94ffea5e5005f1eea92fb9eaa530793006d2df8cd"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/hsb/thunderbird-78.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-x86_64/hsb/thunderbird-78.8.1.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "a3f3fae8b4b0eb67dc4ea7f12aff3246effa7e61ee07d626cb05802ce1dbb2d8"; + sha256 = "3dfc77687f2ad8f9bd9a452d519172953a44b3574057f871e466d3dfc2e78cc2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/hu/thunderbird-78.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-x86_64/hu/thunderbird-78.8.1.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "3207c91a73d67f21d809d1508bbd103a453ebe18db85dc099ff7be75b4d0752e"; + sha256 = "f043129670231c41cdeb8d742e50873306e34860fb702876105c88a80aef0629"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/hy-AM/thunderbird-78.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-x86_64/hy-AM/thunderbird-78.8.1.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "80a659841237012e80c88530602c0845ddb42ad0d7fea4fb56d8026924cf50c6"; + sha256 = "7c4e3df3c4115e3de684970d68c5a3aad8a5ac1151ce802d4adbb381f5d76529"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/id/thunderbird-78.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-x86_64/id/thunderbird-78.8.1.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "ab68d00bab6baa18c3ab0f5d77d6c0575e1af687e0473b61c69ba329d8ec392a"; + sha256 = "95776b92e84b5f1183129b3a7576542e807f701afbafd6e811522f709b30e933"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/is/thunderbird-78.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-x86_64/is/thunderbird-78.8.1.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "69ba962cdd99500b3d65a9dee4a29780e2d2c807ad9ae5260fcae37593f2038d"; + sha256 = "ac74b9ecc8312aa833ba9db2ff7d017c0891105da5e64580b9af8797fb77ca84"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/it/thunderbird-78.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-x86_64/it/thunderbird-78.8.1.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "0ddd769c4cc7a145bfe4f5a03b208e95ecea0219766b1351ce160c3c731eeb3e"; + sha256 = "d3409725adfb192951a14569bf1d3c779162fbb1f33c7be944345e3df191ebe3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/ja/thunderbird-78.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-x86_64/ja/thunderbird-78.8.1.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "45d8db5b361aa6c941ffa13651fd7c2a44db52f70ddf67bae9b5a0e3513db05b"; + sha256 = "9c7bbe228994d06397cd4490b0e6c667b8ab14b94398ef9b0a0bc135d3c6c392"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/ka/thunderbird-78.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-x86_64/ka/thunderbird-78.8.1.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "66a0cbb3fccda23ac1f6547e69fce19bbf843882baa9d92ba8eb2f325cabe22d"; + sha256 = "39681dd197986b4535b6f08904aa140f5517b3663dd16f055d514be509bea217"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/kab/thunderbird-78.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-x86_64/kab/thunderbird-78.8.1.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "e3d03fabe85a31756db1a0ff27e7ac29e4ca127f2f87612aa12c698171b3a610"; + sha256 = "30f473c45c5d2d60271469ee60174ce10989edea02bfe61503dca4be04f783c6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/kk/thunderbird-78.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-x86_64/kk/thunderbird-78.8.1.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "2367aa9c3e5e1b94a2661d8bdd56c39f3cbf95058c2c77639fecc01fe674b305"; + sha256 = "b5dc4df14dd5de27a32332af867c233089081d43514d36a6955fb34dc46b0955"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/ko/thunderbird-78.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-x86_64/ko/thunderbird-78.8.1.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "1c728ae7c8fc39c38aec45240f9c25879b7fe028d60ad1089e8564d5915eb3ab"; + sha256 = "b151223ca74a4624912941ca5a33ea620ffadc4840a6b58b0459abc4b9fbcccf"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/lt/thunderbird-78.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-x86_64/lt/thunderbird-78.8.1.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "9f70983576df0e51a508941b0714bb43c3eb7ce494abfc1e3cf5b8a471c42047"; + sha256 = "9405ddf255265811d274bb1c5d05fa5066976d36f1a7e5687a9c4930488ec269"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/ms/thunderbird-78.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-x86_64/ms/thunderbird-78.8.1.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "19962ca7f30a397f2668e1dcb71ee5a5ffbefc1cf2c66d27978895fb06e2816f"; + sha256 = "63daf0a4f33b6e04ca92b1b6df187c0fa52fad97863e66356fe6fc592610be0e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/nb-NO/thunderbird-78.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-x86_64/nb-NO/thunderbird-78.8.1.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "fa4d681a30cb5d00771614de4ec40b92c5a593262818dd86dca79ca7ac0e7881"; + sha256 = "94e855d4d4c7724cae5060f595ddc5c6afbbcce95a47544c4e13131fc5e6fed5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/nl/thunderbird-78.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-x86_64/nl/thunderbird-78.8.1.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "ca2f0bbb087020e045c38068aa64b0f562aa9d3b08d76227f0cffaa84258b467"; + sha256 = "d3fef411d76b25d4791814bc2c867df1ff4d6388514026a243715c0b01eb6cc8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/nn-NO/thunderbird-78.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-x86_64/nn-NO/thunderbird-78.8.1.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "97777d687d9bae2f495940a59dd513431f5ffa4520ce08a9af35db32783965d4"; + sha256 = "b144ebaa2ec9a7596c671de0b00a2040b64681cbc92e6ede6f93b8dc85039f73"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/pa-IN/thunderbird-78.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-x86_64/pa-IN/thunderbird-78.8.1.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "c50088c6b911c10fa7ca84ce284ffaa45c4a81a5276277809972c080c5bb3321"; + sha256 = "5231448246edb5051015c7f8f6f9c8b2d4373746d5a6dde94a9ebf4c672c60e8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/pl/thunderbird-78.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-x86_64/pl/thunderbird-78.8.1.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "1391c90597bb89e9edaaf58dc46894d84619649a2f7aa68a69bef41a167c4cab"; + sha256 = "8250c42c98c9f5c8c2b071b0eb31b7b27e019513585bf0154bd9ea5c901a2aa9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/pt-BR/thunderbird-78.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-x86_64/pt-BR/thunderbird-78.8.1.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "11229cb39877d227071809e4a53fdd078813241e736e3cb9b4868fff0329560d"; + sha256 = "625c7d2d6620c045b153866ee310d8d04fd9998cfc51f5f458de19d7fd7452b7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/pt-PT/thunderbird-78.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-x86_64/pt-PT/thunderbird-78.8.1.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "e29d5d58d86af538700f69f6102c5f5dff3102173febfe559c959f15b8d19838"; + sha256 = "2ead9fe00dd88dbf7245275f2cee002cf3205dd3256303f582635ca33b3aa60e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/rm/thunderbird-78.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-x86_64/rm/thunderbird-78.8.1.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "53925070690b9cb88e62e73b52ceac7663bcc9af82834a6028a1fc83e8fe954b"; + sha256 = "b4b40e417a4bb52aed6bbb7f042d5e164ea2e9f4acf8cde680d4f19f37862e1f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/ro/thunderbird-78.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-x86_64/ro/thunderbird-78.8.1.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "ac6e9b71f0008560768dbf3675c3a2d99e1436d810cc35705219d1141cd5657c"; + sha256 = "cd0e8aa8e6b02cd7a432e2e943e1a61a65f152bdb9902a1f948e514c46cb8304"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/ru/thunderbird-78.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-x86_64/ru/thunderbird-78.8.1.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "e70c93d3ac2ab6bd0b618b43ecb34fb5dd756325cc2b524249b6ba47d0abcf47"; + sha256 = "00602137ac0d86bbc08ddac08cb2805daed3d8c2b78b2408b34107bbd61c4e32"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/si/thunderbird-78.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-x86_64/si/thunderbird-78.8.1.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha256 = "ffebac6b9c87abe040a25a39e9f84c05f8d143afe54bb293828945ccd694b44f"; + sha256 = "f1ad95430fcba364c0741c03fbbdbad602ad521959685ace7f3056fa801188af"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/sk/thunderbird-78.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-x86_64/sk/thunderbird-78.8.1.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "bb9be9c2427965ef4007bef0e6da049680959ecb47fa120a49a78418def11aee"; + sha256 = "30ebe0eaac08884d10f8cffa77d145600154b6969a212873bb189aea91187d54"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/sl/thunderbird-78.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-x86_64/sl/thunderbird-78.8.1.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "3889b8b457cc078dd0c5a3ef0564a285622fb2295ce003322eb76227876397af"; + sha256 = "3f38b1934f6fd66efb97b83c83f76f09c649ef09108fe1a92515752b2d79c890"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/sq/thunderbird-78.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-x86_64/sq/thunderbird-78.8.1.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "2ba1e13b129c81e2fcf2382481d477ee9209bcbd413b357426659c4c59951fd4"; + sha256 = "79780bad07999285a3ad37d85b82d7037fe4784b3a83f79f6907c73ad1a7ee55"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/sr/thunderbird-78.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-x86_64/sr/thunderbird-78.8.1.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "5eb98fb8b36f0ada831306b37eb63ab3b959baf55e0adb0641400eb7cf143e4a"; + sha256 = "68430529f488d89730864a267a20c5f86b1ffa0b473bdf153c43e06a95a81c5d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/sv-SE/thunderbird-78.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-x86_64/sv-SE/thunderbird-78.8.1.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "20f9c865e9c2ac8c7af880126748e6a7260d310b1c4abd142631a5507d3a7715"; + sha256 = "3e2a8112b2da35af3402d0974a70c00ca6cde4cbf43f07141ff7b184d373d444"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/th/thunderbird-78.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-x86_64/th/thunderbird-78.8.1.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "da966ee74484fea59f0a431639f9745f600c65e1d50ba625c7dcb04edf8f3b12"; + sha256 = "9b94b35004bec519e8bc8fa152c677189fc37e78a3bdedc0d77afb81bffb0c58"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/tr/thunderbird-78.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-x86_64/tr/thunderbird-78.8.1.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "15e7953aafcd2476c8f0a5bbde7c5bd4be634dc8ccb6e7c599e49885e653a1c4"; + sha256 = "b1f0281f5a1a2454a38ccc66510b4de44c19f4300a990f994d5c0ac76b002782"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/uk/thunderbird-78.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-x86_64/uk/thunderbird-78.8.1.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "d5b81175250441ef8850d3d62886223ebb824554180e78537367afc63fe13b6c"; + sha256 = "ae53f162d9016a3f2b3e104c86aefb34ed9e96ce14cc3feb1584ce61617c3b49"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/uz/thunderbird-78.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-x86_64/uz/thunderbird-78.8.1.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "7a8ed91075d4d3f884a9fbd750bdd57b51b781cc299bc9648adbcb218524d3c7"; + sha256 = "6d43cbdac67084253eda88d0cd58440229def6d03904b4e1a8c9b9133ed7bb55"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/vi/thunderbird-78.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-x86_64/vi/thunderbird-78.8.1.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "38b0e4005a2023191ea237e54328040e2dd9c92f38d6a00b57ab0ef1114b2f60"; + sha256 = "f29e5e685c3b072ece7ef6cd645b2596025848e9b72b00fbb49378b8f25ef3a9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/zh-CN/thunderbird-78.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-x86_64/zh-CN/thunderbird-78.8.1.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "196c4f43f93cb3bced090a62d229799a7e5f4f174ed2304ed6013eba4eaa53db"; + sha256 = "e4789a8b85555be1fab438e694562bec0b2022a6955ad098b837c48d3954452c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-x86_64/zh-TW/thunderbird-78.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-x86_64/zh-TW/thunderbird-78.8.1.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "ad26a1b2a35acdc290eb6709b96880b1e72fb66d70443a83b1da9d9f16a4eb2d"; + sha256 = "7d4246056adf297ac1bf3c7de20d067453e41350b089841d617e2ac6ecaab0ac"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-i686/af/thunderbird-78.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-i686/af/thunderbird-78.8.1.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "af7973120feb000127c70c53d84efd256f5758751fe1f1c77fa1daa1cccfdded"; + sha256 = "1c09247e43ebfd2cd10995e76ff791b6c78d4545ebcfa37959b154e5307e17a7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-i686/ar/thunderbird-78.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-i686/ar/thunderbird-78.8.1.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "49581a6febcca71de9b67ca92ed0cab6f52863e59754575effe629b6c7d9f627"; + sha256 = "bd7a46b42a8200f0515be9798bda145f398e2db32357ae8c46c1dc89cc823dd5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-i686/ast/thunderbird-78.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-i686/ast/thunderbird-78.8.1.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "a1462259b3157128582889f266ed8b36656de974a64faec39e461fc64de78403"; + sha256 = "418fc4d19a9d4ce982e534c7be95b79dd2c15311040e2c50e5644f3a5e3cf245"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-i686/be/thunderbird-78.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-i686/be/thunderbird-78.8.1.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "c677a9d1802e58c9fce12058da7f3c504f4b4f67a727897e0f0e8d8005fe26cb"; + sha256 = "27b9271c984eb739cc4782050bf5f896da01ced7803dae8e81181ac4a8c0df86"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-i686/bg/thunderbird-78.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-i686/bg/thunderbird-78.8.1.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "0424f520fed1d43ac5145d7607b775f7d4f6f880e41e9638085a9a185bf160e4"; + sha256 = "b63ca81e05c4a16497339374f297ced5033daa275fd48fe9884d4945f216771a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-i686/br/thunderbird-78.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-i686/br/thunderbird-78.8.1.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "1be23d98643548dd40007db54ffcbf6df52e80c74f05d92175bf2109ef4308f3"; + sha256 = "f213c17427b907a21a3c4eb2976eccca91423a1400260b22ea59c588a2e1e9d1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-i686/ca/thunderbird-78.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-i686/ca/thunderbird-78.8.1.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "d743f55888ed0d0e4acd31e158fd8db3f7709f534cd570696216c2adcb081c99"; + sha256 = "8bd818f98c17b8e954883c462064994c469fa805aadf74b6e0915824e1ad929a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-i686/cak/thunderbird-78.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-i686/cak/thunderbird-78.8.1.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "875378354c62fa050d1559539df54e7d5dcf1fecbb4cda733648dc5488121b6e"; + sha256 = "6213c8b217db157f40e008af10780edef5a02ffdc2442240597a00252f4f58ea"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-i686/cs/thunderbird-78.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-i686/cs/thunderbird-78.8.1.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "677239766430bd055e83a25a03ad825602b88c5b6e236dbf8c7f36abc3956fa3"; + sha256 = "22491715bd72408d7c15d8fc137ccc496a0ea075217485a8e31abf73ca09bad7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-i686/cy/thunderbird-78.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-i686/cy/thunderbird-78.8.1.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "e14dd47506b180b29bd8ed3e70c9d0e66ac264dbbe374bcf82b6849ff1b92c18"; + sha256 = "3d4f07b0055d92dcbaaafa139959de7071b2b3d74c49452bbb2556b1ed3ae82e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-i686/da/thunderbird-78.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-i686/da/thunderbird-78.8.1.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "ea8f4fc8eaf461da09050a03282dfeec7ca1987c5741f875546ad22dc904748a"; + sha256 = "409779e136c0efb3dff667e50b9ba318937d3e96ac918b8272741ea004ec3f5c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-i686/de/thunderbird-78.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-i686/de/thunderbird-78.8.1.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "f60f678ee1ee593b99fb95116ac7d157d860c0fabe8b37865fd5b703634e9c78"; + sha256 = "ac5ca1fe2247cd4d05862c00592c86dda480108b7a40e284ccc67718a1762f78"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-i686/dsb/thunderbird-78.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-i686/dsb/thunderbird-78.8.1.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "fbc2d5841e1ab6401d4ff4cf1f03102c4bf59662e4687354f36f15efebdf92f9"; + sha256 = "769d47c388ef4dfced4ba770f78eeedcafdc834dc4fa4175eaa92710ddc2e0de"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-i686/el/thunderbird-78.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-i686/el/thunderbird-78.8.1.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "ef9d01738f186aa87e55e41d3ba835fe0d3a616d6ab2c0115849577e98aafb66"; + sha256 = "1a2daf5b0ccc36acae027da2281998b4333ea4e9981c7106243c68188517f482"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-i686/en-CA/thunderbird-78.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-i686/en-CA/thunderbird-78.8.1.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "3ed96eb3b0f4a301ee350cad37b0544391aa937757ac1e6f0be9b20f13207915"; + sha256 = "3a55772b7bec93bec83de289b5b36129e8e0d988d54db3d66ffcaf8326786ae3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-i686/en-GB/thunderbird-78.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-i686/en-GB/thunderbird-78.8.1.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "eef090aed2c10f3275f1161e34fec1ed46af057c52279765797297eb2b7d7053"; + sha256 = "f41b610c6a3f4f5d3e2c648d05ca210cf9bdbb998b94f298f81dd84601c00be9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-i686/en-US/thunderbird-78.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-i686/en-US/thunderbird-78.8.1.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "163c1289f515179281c44e1c4eebdcff4a3d641cc91ae8acc57c8e43ab07c07c"; + sha256 = "9598fd9175cc0d641387f6ac7f475d970b4f0864872b5d875d170039d6c97b39"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-i686/es-AR/thunderbird-78.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-i686/es-AR/thunderbird-78.8.1.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "e84f8d773bc91ccb45b4295b05e2154a831b54ed5156d5979bfa6b54f0a33e70"; + sha256 = "603106740e8db3a7c9220897b9146ef53937bd57a60258a04548e1afb41d983c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-i686/es-ES/thunderbird-78.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-i686/es-ES/thunderbird-78.8.1.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "c40e97e1d321ada605a4d441452705b24b6968662b118d074780b2f864dfa62f"; + sha256 = "e0f5f3d6aed26310bfee54099c73a13417be36eb737f6123526e94a5286f6336"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-i686/et/thunderbird-78.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-i686/et/thunderbird-78.8.1.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "4a69f41eb0c60a63cc0f4b4580ad12b7ac0328062dd66bbb7d63e276594e3007"; + sha256 = "bc4a1dc96e8ba31d0817f369af4e3e10b672aa854538093ef1d02126bcff24bb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-i686/eu/thunderbird-78.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-i686/eu/thunderbird-78.8.1.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "bec059640483556ab03dcf53c966fcf3fb46cf8a1f38b14f0981f0cb75411943"; + sha256 = "2c61d117e5fa23d62197f9b2c0512547356b65098eee5fd72285317caca6b51a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-i686/fa/thunderbird-78.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-i686/fa/thunderbird-78.8.1.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha256 = "8a186051fb3d7b7e2293d2b591fb0f9708be6985e4ff8b9e1809cd98bf44690b"; + sha256 = "6b93377b457ec1e0dd343bc4d2193c6bb3030450e76757ac042c67e353075310"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-i686/fi/thunderbird-78.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-i686/fi/thunderbird-78.8.1.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "6c407bc175f75f84ec83386cc8ea7fcdd4b25523326e86755f033f2512446007"; + sha256 = "9e07a2060b821047c494e03d9ab74b8f3aeea322aa1e1bdde080637187f89e05"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-i686/fr/thunderbird-78.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-i686/fr/thunderbird-78.8.1.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "429fe2900ac9caf79d386f3826898b6fed6302030fa7b7c2e7386cc3d849eab5"; + sha256 = "d4ea501f5a42effdb758ca24f2da7bd4ca1d83a8ea6da467fd63cbef96f8b373"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-i686/fy-NL/thunderbird-78.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-i686/fy-NL/thunderbird-78.8.1.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "718807d6cf9af7d205bc273343e60b8f7ddeb531253f738a3275afc65c659916"; + sha256 = "9aa11144cf22a5db5200628ac5e55a55b83ffda35306cf1909aabac9fe4878c2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-i686/ga-IE/thunderbird-78.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-i686/ga-IE/thunderbird-78.8.1.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "900ac6c3d62879521ca5a39622994d8d2d352271f088f6e7cc142d533a146800"; + sha256 = "15af980b46c8cf80b60a999e2ca3b30c92719638af51d9e82133f58de61d7ed5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-i686/gd/thunderbird-78.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-i686/gd/thunderbird-78.8.1.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "3e5fcc21742434445d3508690d90ff9782bdc4a9568e422899897293333c51e4"; + sha256 = "cdeb93b31a1a9521dd7f91081f28c1a64e0e6a218f1c0015ae9c54d73cc91f0d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-i686/gl/thunderbird-78.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-i686/gl/thunderbird-78.8.1.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "8c83f977b0ec5ef8b25e0ae0b7735590d1c5a42bebd90ca3f53a6a50ab8e1f12"; + sha256 = "48d973991c0cbb9988339c185d1ea8fda4c6cea6f0667cfaf8f2bdeec4c55a23"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-i686/he/thunderbird-78.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-i686/he/thunderbird-78.8.1.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "7aa66ca6d1c58a1e55c8b76aa0a872af69dec41e403176a95bae7f1b73941eec"; + sha256 = "c2f50a1fb3e877e3c08927eef96f104f5f970cb7629af21de3344e539617422b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-i686/hr/thunderbird-78.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-i686/hr/thunderbird-78.8.1.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "7341f850d220f9e66bf018d27e44cb8906c31fbe7346d850b4b646b517eedf7c"; + sha256 = "ec3596067c8245cd5cef8fc649c3d1fd6d38bb802e2a05947ab9e62b8d393b91"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-i686/hsb/thunderbird-78.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-i686/hsb/thunderbird-78.8.1.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "a4ed28817e4680f53271bf3c24a5479f00bc9c8614c141065462e396bb46be36"; + sha256 = "0209d678b9353513bcab3c647100c35d772d25b1969bb9970266c09f2db01e05"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-i686/hu/thunderbird-78.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-i686/hu/thunderbird-78.8.1.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "0331825ce5c8595e0270f5c92b3818abd53514a2304b55d41d264175c01c100b"; + sha256 = "817cef3a34c40ed31a59421f89a94de5b7be165cd1bd93fca7b2560cad3e05eb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-i686/hy-AM/thunderbird-78.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-i686/hy-AM/thunderbird-78.8.1.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "aecb16b8b69fbcd65b3ce43595f00a67214616f85f936d9b8f395fda3bec1769"; + sha256 = "ca49953791109563cdc81a3458a5b3dd15ebb49a255752052e927daad199b0fa"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-i686/id/thunderbird-78.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-i686/id/thunderbird-78.8.1.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "aea434ed29197b5a6afe21fe5b1fa361bf3ef17bee6cdb7fd3d1f5e76fd8b8ea"; + sha256 = "33fb9d6c721f79e4808f077573828c26b671434b0308db9c33386dbd975c4a53"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-i686/is/thunderbird-78.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-i686/is/thunderbird-78.8.1.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "7747d287ce2f13f8b136f9186168cfbcb7e9e9bf65d949dd9291f69afdd63999"; + sha256 = "d498ac95c289612a253962d1988ac9d1526864926c9a4b9cc2985fe1d84ae03d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-i686/it/thunderbird-78.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-i686/it/thunderbird-78.8.1.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "0c5cbc6a5ccdb940e6e5ed2ec2970f9b252c9106e51d9342b665cc3625283c9f"; + sha256 = "cff73b132740bf3854977f62afe8076c7c660559cc8a96fbc36c4ffadd46d50e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-i686/ja/thunderbird-78.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-i686/ja/thunderbird-78.8.1.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "60b05dbf93b1947fa3fe8b3c85eb700f0e15ec702c0d1ffd1a9b494517482041"; + sha256 = "d8ffe86ccbc4de40a0909f55b750380454a2f51f450b4c8b49886612a49997fc"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-i686/ka/thunderbird-78.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-i686/ka/thunderbird-78.8.1.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "0b80a9e27408e9ab91cbfe1682b5a0679723f22164390ddf6f77992b90bb6ec6"; + sha256 = "1bf02cd11b554b597b6f5facdd07b6ae7826ad24a2f1ceb432bca6fcd0396749"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-i686/kab/thunderbird-78.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-i686/kab/thunderbird-78.8.1.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "d7b61aaca643ad9e0e8a61256e5ff42d855353d93fdcfc40641046385196f7fa"; + sha256 = "aa0295643ee24b0e76d5567c4f43f94ddf4a820cde2bd5be5a6dbc0b2f1c7271"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-i686/kk/thunderbird-78.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-i686/kk/thunderbird-78.8.1.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "c9140b1223585cb5c95c17cea964c0658875b24e4f126f67e13766cc2880daf1"; + sha256 = "265e5000114d7f3d204885a5c4eb5ef71780699f185f570da90737001023d4b5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-i686/ko/thunderbird-78.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-i686/ko/thunderbird-78.8.1.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "3486ddea77036a357636235d2839d4e3abb8bb703d6b2aeab4dab7bd510d2975"; + sha256 = "a1622a295ab259400d61e9487f40b7e34c143b81afb1f354647a48cb56425d13"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-i686/lt/thunderbird-78.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-i686/lt/thunderbird-78.8.1.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "07d85f0ad5ae0992076369c5e7082b1846c53122953de8e7cdb947ddbb741bfa"; + sha256 = "423926d31fac238ec493de6f48d14530cf58bf0829b73505f7ea4138f6bdeb56"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-i686/ms/thunderbird-78.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-i686/ms/thunderbird-78.8.1.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "d063f14194c3e89a5379a9d9d0edd38f987040269cf69a0e60b1a2fe5e8773a1"; + sha256 = "acdfdeecc6c5ff04c1428185bbe63a6e38b1545daa9e69888b78e2b5ba3b9194"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-i686/nb-NO/thunderbird-78.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-i686/nb-NO/thunderbird-78.8.1.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "129ee98d2f0d899664face9c7e4214b9f120141ffa230f5f195efd013e7bfcb0"; + sha256 = "f62a4f2d2c8e93b58f3a0c35e6885c1e46a8b6ed1fd0414e719c480f99fa2cf8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-i686/nl/thunderbird-78.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-i686/nl/thunderbird-78.8.1.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "df58d1e22671e09219719c86580dd605e6def1dc6f65c63306b5d3624382542a"; + sha256 = "c2dda812534a9155f79fc2249cafd8e77e572cc20bdaf1bbf637bea4daf5e612"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-i686/nn-NO/thunderbird-78.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-i686/nn-NO/thunderbird-78.8.1.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "12041cf3f1edaa62eafa5b338b890482d85df33ca4b1506a007aa862d31a5c0c"; + sha256 = "84fae5d60ec7223c0404033ad2e2b776c4a9353b55e0256c7ca7122aebc031a2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-i686/pa-IN/thunderbird-78.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-i686/pa-IN/thunderbird-78.8.1.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "479250fc9203ec4895341ea37bda544c47c972ea12b8e2462539533c90a7b384"; + sha256 = "0fa48cf1ab0d1e23e4d230fb6f78e7f6d07d99360e341c239ea572c201204870"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-i686/pl/thunderbird-78.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-i686/pl/thunderbird-78.8.1.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "a4563a29cea75560c0de441a1fc311cdefb938bc91feea283b8e18da7252a3fe"; + sha256 = "90fa65f13718539a899dfae11aaaec05b9c1a4f56c8b835436f9401d7c453b01"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-i686/pt-BR/thunderbird-78.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-i686/pt-BR/thunderbird-78.8.1.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "45414f14d31eb81f2b590fb702d5a586069c32a1b854116dd88a4104abd15fce"; + sha256 = "f203c40580edbe2fc8645af1477bd1b750a64241702fda3bd0747efb7c44510b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-i686/pt-PT/thunderbird-78.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-i686/pt-PT/thunderbird-78.8.1.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "f12515b2b18a1cd7040d35e9452a6b2b4f3bd2ebc277815d9f85167fcd61b645"; + sha256 = "42b5b7f39b75550e39accb221d0728cf6181e4251d130859c85a139bc4b2267c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-i686/rm/thunderbird-78.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-i686/rm/thunderbird-78.8.1.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "ba4b770ef2ac9663120bd6b7f4f42647e995e6db2ca3bbdcbfeea9734e6ba985"; + sha256 = "15165421181470218c152da68adea6e1f8a2abef4c7fd70f19d210620d29dab6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-i686/ro/thunderbird-78.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-i686/ro/thunderbird-78.8.1.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "cae153b7ba51b3c86568bf672fc13edf2029a2b6b5dfe44dc0b493bcb2228855"; + sha256 = "974f8139cf98576a588088fef03788f513e6e45fa054d4d53cc2131254e0b794"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-i686/ru/thunderbird-78.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-i686/ru/thunderbird-78.8.1.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "39241b2643770adde562ac748c69456eba9a4fcaef257c47bdc72938ee3119f7"; + sha256 = "eae2f2f1e5bfcf389f34b9635c838cfcbfbc0d93e9daf6635c0faffea2df1d7f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-i686/si/thunderbird-78.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-i686/si/thunderbird-78.8.1.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha256 = "8df14f85560561334caf28ad280e093fbaa8fa6af32fde417e8f29088a31ccb3"; + sha256 = "cac0bdfbbc3b5cb21e38473aae44e4f8d2ebf192b6c35d7e075c47e25684da48"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-i686/sk/thunderbird-78.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-i686/sk/thunderbird-78.8.1.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "42ac111340581dc6f067d26f6aa51fb354e27d38af5b61deb34d6e79ec015011"; + sha256 = "6a30b2b648b24e3cd4e2c3b668e73802796f296a2f81aa8e470ec0909f8dbc87"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-i686/sl/thunderbird-78.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-i686/sl/thunderbird-78.8.1.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "07c234d2ec1e512a177a2f87713dcb3bd0d9b8a8683e840f767a041f127fe73a"; + sha256 = "0d4e597db5264bef212cdc3e86564acad1ed4cad3cae9eb61e583025b401bfa2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-i686/sq/thunderbird-78.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-i686/sq/thunderbird-78.8.1.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "da4a269007d5cc4f4077a5f6da98d5d34fceb7a4043598bee4776aaf867a64d3"; + sha256 = "8a4dd36ac981c89924755526fae8634f20d0d7dbdbb6fc9c324a5badbf7394db"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-i686/sr/thunderbird-78.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-i686/sr/thunderbird-78.8.1.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "6719dba0153c8f60b4ce6fb0d68b2f52f8b7840f5659a1ad884bf2a4b6455a3a"; + sha256 = "6002d49812cbba0289db444e84b8a139c0784056a26e3a0592fd1806ce865cbe"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-i686/sv-SE/thunderbird-78.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-i686/sv-SE/thunderbird-78.8.1.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "140c6b0ea0171443714951064d60de5372c85e04e2c3282a86e7b11e682737c1"; + sha256 = "498303591a0d28ce2bbb59693fd55bdbf292c7feba8002c9cacdce7ec08b50d0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-i686/th/thunderbird-78.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-i686/th/thunderbird-78.8.1.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "99a659426d84ee98f94c9162ce49c1d098529a233ffb7cbfd5a7e26eda23b554"; + sha256 = "6c31f40537ba39bdba93eb46f480f8a1a446a6b028834f6886934b102ce1b861"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-i686/tr/thunderbird-78.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-i686/tr/thunderbird-78.8.1.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "e5bdb857cb059119c1a3de847947125d2caeef7a5c9f75e0e1a4f3bdaa8c168b"; + sha256 = "b8f5a0be988b89dc7e8b14750d6aa0ccbdbf2c1a1c3abee376b94b1443223757"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-i686/uk/thunderbird-78.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-i686/uk/thunderbird-78.8.1.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "3a6530c8bb8976aec06b71fdb3eb4a4fcf3fef27668f1323b7c934026f9b7429"; + sha256 = "036065e1fc91907370ffe75883b1d1e8fd1a416a9a726583c758d7a0765b84ad"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-i686/uz/thunderbird-78.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-i686/uz/thunderbird-78.8.1.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "ce246a13ed9cc8a03212f0b74f24907e75502a8cdf9ebf59f0153882dfa96c28"; + sha256 = "3b5d683b237a88018e5b1999aee497d766007a3c1743517ab0b54e43f37e52b1"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-i686/vi/thunderbird-78.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-i686/vi/thunderbird-78.8.1.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "bfa8c72c3c2cf08f36bb13b9844574aecb3e69636ede5a60e24a7d816ee7aa0e"; + sha256 = "0d31b2bd82161ec51314e57405345a9a004b268371c16de06fa4d2160eda0230"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-i686/zh-CN/thunderbird-78.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-i686/zh-CN/thunderbird-78.8.1.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "68c8f68454806be4cff160621b97c897a752db5498c48dd45889f861d741c0b3"; + sha256 = "3994c114510a6c7457c78d3755518b1332bcf1b48371d2b88c000f977b5bb3a0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.0/linux-i686/zh-TW/thunderbird-78.8.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.8.1/linux-i686/zh-TW/thunderbird-78.8.1.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "79ad159cb37d2c68a26dba5298cc62eb25a0f46c845bd3f556e198658b62bede"; + sha256 = "c38e5b2378bd0af57945e0e172e49b30fed491b91ffa79a946cce8f2bccf96f8"; } ]; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird/default.nix b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird/default.nix index 78a9ef0dbb..6104163938 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird/default.nix @@ -73,13 +73,13 @@ assert waylandSupport -> gtk3Support == true; stdenv.mkDerivation rec { pname = "thunderbird"; - version = "78.8.0"; + version = "78.8.1"; src = fetchurl { url = "mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz"; sha512 = - "18hx7qi4nwfbygh1ykczvs7vyvmcqwj4x838lpillimzwjd7chyrbjz2b2h15ckfgndbrxmwvvd3v50bj04xpqigvz18g46nav1mly7"; + "08dnjqcdd5bs7wpl5imir0nsmvaqkri67cas1sn7ab4nb1f61lfdz4xg4x5v6f39sm5yxw2cy6rg5fc5lbiqza5bgs00gfg79kgfn2i"; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/networking/p2p/eiskaltdcpp/default.nix b/third_party/nixpkgs/pkgs/applications/networking/p2p/eiskaltdcpp/default.nix index 3e1d5073f5..0174d13301 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/p2p/eiskaltdcpp/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/p2p/eiskaltdcpp/default.nix @@ -4,13 +4,13 @@ mkDerivation rec { pname = "eiskaltdcpp"; - version = "2.4.1"; + version = "2.4.2"; src = fetchFromGitHub { owner = "eiskaltdcpp"; repo = "eiskaltdcpp"; rev = "v${version}"; - sha256 = "0ln8dafa8sni3289g30ndv1wr3ij5lz4abcb2qwcabb79zqxl8hy"; + sha256 = "sha256-JmAopXFS6MkxW0wDQ1bC/ibRmWgOpzU0971hcqAehLU="; }; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/remote/remmina/default.nix b/third_party/nixpkgs/pkgs/applications/networking/remote/remmina/default.nix index 02f1e7ed34..3421050d1e 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/remote/remmina/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/remote/remmina/default.nix @@ -13,13 +13,13 @@ with lib; stdenv.mkDerivation rec { pname = "remmina"; - version = "1.4.10"; + version = "1.4.12"; src = fetchFromGitLab { owner = "Remmina"; repo = "Remmina"; rev = "v${version}"; - sha256 = "sha256-n3YfLKCv6CoBeUIv+1yN6RIih63PTFj5zr+dZDJwYdw="; + sha256 = "sha256-CjlNEmca4Kob5rdpZa+YfvdOIDDDYfhNsGYqGDxSGKY="; }; nativeBuildInputs = [ cmake ninja pkg-config wrapGAppsHook ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/remote/teamviewer/default.nix b/third_party/nixpkgs/pkgs/applications/networking/remote/teamviewer/default.nix index 30bd5346ac..1b564e8daf 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/remote/teamviewer/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/remote/teamviewer/default.nix @@ -6,11 +6,11 @@ mkDerivation rec { pname = "teamviewer"; - version = "15.8.3"; + version = "15.15.5"; src = fetchurl { url = "https://dl.tvcdn.de/download/linux/version_15x/teamviewer_${version}_amd64.deb"; - sha256 = "1c947yxgs0mv5x6qvy40dypbbhhjbglma1pwl66z39gzg51n2dmc"; + sha256 = "sha256-H/CSc2RcjI+Fm8awYcXm3ioAJpbSNEMwGVrTozMux3A="; }; unpackPhase = '' diff --git a/third_party/nixpkgs/pkgs/applications/networking/seaweedfs/default.nix b/third_party/nixpkgs/pkgs/applications/networking/seaweedfs/default.nix index 3e5a23a3f3..e038fba6d8 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/seaweedfs/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/seaweedfs/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "seaweedfs"; - version = "2.27"; + version = "2.29"; src = fetchFromGitHub { owner = "chrislusf"; repo = "seaweedfs"; rev = version; - sha256 = "sha256-0KT/5seJs8GkatL4BsZ+r71t6AJrpHB6Q92sCvplKcQ="; + sha256 = "sha256-wyqshtL3wGrmb1oEMOMk2QmDXW9M5tt9d1QEtMFiXa4="; }; vendorSha256 = "sha256-uT/Y/TfpqDyOUElc4M/w/v77bWF3tTJz+Yu0KRMcxk4="; diff --git a/third_party/nixpkgs/pkgs/applications/networking/sniffers/wireshark/default.nix b/third_party/nixpkgs/pkgs/applications/networking/sniffers/wireshark/default.nix index 5c5bb1ff96..cc179dc1e1 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/sniffers/wireshark/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/sniffers/wireshark/default.nix @@ -1,6 +1,6 @@ { lib, stdenv, fetchurl, pkg-config, pcre, perl, flex, bison, gettext, libpcap, libnl, c-ares , gnutls, libgcrypt, libgpgerror, geoip, openssl, lua5, python3, libcap, glib -, libssh, nghttp2, zlib, cmake, fetchpatch, makeWrapper +, libssh, nghttp2, zlib, cmake, makeWrapper , withQt ? true, qt5 ? null , ApplicationServices, SystemConfiguration, gmp }: @@ -10,7 +10,7 @@ assert withQt -> qt5 != null; with lib; let - version = "3.4.3"; + version = "3.4.4"; variant = if withQt then "qt" else "cli"; in stdenv.mkDerivation { @@ -20,7 +20,7 @@ in stdenv.mkDerivation { src = fetchurl { url = "https://www.wireshark.org/download/src/all-versions/wireshark-${version}.tar.xz"; - sha256 = "0ar6pxzrcpxdriz437d6ziwlhb8k5wlvrkalp3hgqwzwy1vwqrzl"; + sha256 = "0aad3m8nh4i75dgjs68217135bzqmhmlgjklmpjh1ihmjwgd373j"; }; cmakeFlags = [ @@ -33,13 +33,11 @@ in stdenv.mkDerivation { # Avoid referencing -dev paths because of debug assertions. NIX_CFLAGS_COMPILE = [ "-DQT_NO_DEBUG" ]; - nativeBuildInputs = [ - bison cmake flex pkg-config - ] ++ optional withQt qt5.wrapQtAppsHook; + nativeBuildInputs = [ bison cmake flex makeWrapper pkg-config ] ++ optional withQt qt5.wrapQtAppsHook; buildInputs = [ gettext pcre perl libpcap lua5 libssh nghttp2 openssl libgcrypt - libgpgerror gnutls geoip c-ares python3 glib zlib makeWrapper + libgpgerror gnutls geoip c-ares python3 glib zlib ] ++ optionals withQt (with qt5; [ qtbase qtmultimedia qtsvg qttools ]) ++ optionals stdenv.isLinux [ libcap libnl ] ++ optionals stdenv.isDarwin [ SystemConfiguration ApplicationServices gmp ] @@ -96,7 +94,7 @@ in stdenv.mkDerivation { meta = with lib; { homepage = "https://www.wireshark.org/"; description = "Powerful network protocol analyzer"; - license = licenses.gpl2; + license = licenses.gpl2Plus; longDescription = '' Wireshark (formerly known as "Ethereal") is a powerful network diff --git a/third_party/nixpkgs/pkgs/applications/networking/sync/rclone/default.nix b/third_party/nixpkgs/pkgs/applications/networking/sync/rclone/default.nix index e2199cfcfb..58f9745454 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/sync/rclone/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/sync/rclone/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "rclone"; - version = "1.54.0"; + version = "1.54.1"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-A0c5bHP5W/NTwAh1ifGaw4AG37qYXK9P/Fjk68gkUNk="; + sha256 = "sha256-DexqYAkGmgROnYpknnuWc3Q//IMOTSxgrr1w/TrueH4="; }; vendorSha256 = "sha256-Cpn/dUD9E2BzUlAISC+IDCW59OkEKZTpqdlvF/clV+M="; @@ -41,6 +41,6 @@ buildGoModule rec { homepage = "https://rclone.org"; changelog = "https://github.com/rclone/rclone/blob/v${version}/docs/content/changelog.md"; license = licenses.mit; - maintainers = with maintainers; [ danielfullmer marsam ]; + maintainers = with maintainers; [ danielfullmer marsam SuperSandro2000 ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/testssl/default.nix b/third_party/nixpkgs/pkgs/applications/networking/testssl/default.nix index 611f4cf0c1..b4d17a1a49 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/testssl/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/testssl/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "testssl.sh"; - version = "3.0.2"; + version = "3.0.4"; src = fetchFromGitHub { owner = "drwetter"; repo = pname; rev = version; - sha256 = "0vfpj3g3il3imbydx3j8gx1pgzrxi0czcl9jmi749vnkf5mkmh8w"; + sha256 = "sha256-Rcvkzw1DfoRXrk0vlpL6CojEHYfYga3voc2hm4qxdmw="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/applications/office/portfolio/default.nix b/third_party/nixpkgs/pkgs/applications/office/portfolio/default.nix index 23dd03a1b7..95d4ef34af 100644 --- a/third_party/nixpkgs/pkgs/applications/office/portfolio/default.nix +++ b/third_party/nixpkgs/pkgs/applications/office/portfolio/default.nix @@ -24,11 +24,11 @@ let in stdenv.mkDerivation rec { pname = "PortfolioPerformance"; - version = "0.50.4"; + version = "0.51.1"; src = fetchurl { url = "https://github.com/buchen/portfolio/releases/download/${version}/PortfolioPerformance-${version}-linux.gtk.x86_64.tar.gz"; - sha256 = "sha256-ZOw3Zyd6+fT/Z2tndRVqA8tVvgeq/TbdEdoAk9vSM0k="; + sha256 = "sha256-sQisFv+MVGod/gmF0/EWNDvYzkpF3qbDuL5eDr7w0Bs="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/office/zotero/default.nix b/third_party/nixpkgs/pkgs/applications/office/zotero/default.nix index 91673ed146..1584972cbe 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.95"; + version = "5.0.96"; src = fetchurl { url = "https://download.zotero.org/client/release/${version}/Zotero-${version}_linux-x86_64.tar.bz2"; - sha256 = "16rahl14clgnl7gzpw7rxx23yxbw1nbrz219q051zkjkkw5ai8lv"; + sha256 = "sha256-W8Iu8UoTqC3aK7lB4bq1L7cNmjaEvjEK+ODcZ9kk3f8="; }; nativeBuildInputs = [ wrapGAppsHook ]; diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/octopus/default.nix b/third_party/nixpkgs/pkgs/applications/science/biology/octopus/default.nix index b7a4a4c1a2..fa88e5c47b 100644 --- a/third_party/nixpkgs/pkgs/applications/science/biology/octopus/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/biology/octopus/default.nix @@ -1,16 +1,28 @@ -{lib, stdenv, fetchFromGitHub, cmake, boost, gmp, htslib, zlib, lzma, pkg-config}: +{lib, stdenv, fetchpatch, fetchFromGitHub, cmake, boost, gmp, htslib, zlib, lzma, pkg-config}: stdenv.mkDerivation rec { pname = "octopus"; - version = "0.7.0"; + version = "0.7.1"; src = fetchFromGitHub { owner = "luntergroup"; repo = "octopus"; rev = "v${version}"; - sha256 = "0y3g0xc3x3adbcmds6hh60023pfv1qrz6ak7jd88fg9vxi9bdrfb"; + sha256 = "sha256-TZ57uKTZ87FWpLNGPY8kbML1EDM8fnEFbXR+Z3dmiao="; }; + patches = [ + # Backport TZ patchs (https://github.com/luntergroup/octopus/issues/149) + (fetchpatch { + url = "https://github.com/luntergroup/octopus/commit/3dbd8cc33616129ad356e99a4dae82e4f6702250.patch"; + sha256 = "sha256-UCufVU9x+L1zCEhkr/48KFYRvh8w26w8Jr+O+wULKK8="; + }) + (fetchpatch { + url = "https://github.com/luntergroup/octopus/commit/af5a66a2792bd098fb53eb79fb4822625f09305e.patch"; + sha256 = "sha256-r8jv6EZHfTWVLYUBau3F+ilOd9IeH8rmatorEY5LXP4="; + }) + ]; + nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ boost gmp htslib zlib lzma ]; diff --git a/third_party/nixpkgs/pkgs/applications/science/electronics/hal-hardware-analyzer/default.nix b/third_party/nixpkgs/pkgs/applications/science/electronics/hal-hardware-analyzer/default.nix index e84e9b7400..346483b923 100644 --- a/third_party/nixpkgs/pkgs/applications/science/electronics/hal-hardware-analyzer/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/electronics/hal-hardware-analyzer/default.nix @@ -4,14 +4,14 @@ }: stdenv.mkDerivation rec { - version = "3.2.5"; + version = "3.2.6"; pname = "hal-hardware-analyzer"; src = fetchFromGitHub { owner = "emsec"; repo = "hal"; rev = "v${version}"; - sha256 = "0hc10wbngh4gfiiy9ndkf1y6dclcgy38x1n9k5wpvmf13vdah3zy"; + sha256 = "sha256-GRHRrAxZ10hmAXkGGSQEwNJTbnMbJ9jMyKnOUq+KoWo="; }; # make sure bundled dependencies don't get in the way - install also otherwise # copies them in full to the output, bloating the package diff --git a/third_party/nixpkgs/pkgs/applications/science/electronics/verilator/default.nix b/third_party/nixpkgs/pkgs/applications/science/electronics/verilator/default.nix index fe988642c0..5871ad01d9 100644 --- a/third_party/nixpkgs/pkgs/applications/science/electronics/verilator/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/electronics/verilator/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "verilator"; - version = "4.108"; + version = "4.110"; src = fetchurl { url = "https://www.veripool.org/ftp/${pname}-${version}.tgz"; - sha256 = "00i7am41w9v4smhl64z7s95wdb55f684y89mc0hbc07j1ggc33lf"; + sha256 = "sha256-Rxb+AFhmGinWtZyvjnRxsu3b3tbtRO3njcHGUJTs/sw="; }; enableParallelBuilding = true; diff --git a/third_party/nixpkgs/pkgs/applications/science/math/giac/default.nix b/third_party/nixpkgs/pkgs/applications/science/math/giac/default.nix index f89fe3e1db..4700402ff2 100644 --- a/third_party/nixpkgs/pkgs/applications/science/math/giac/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/math/giac/default.nix @@ -2,32 +2,44 @@ , gmp, mpfr, pari, ntl, gsl, mpfi, ecm, glpk, nauty , readline, gettext, libpng, libao, gfortran, perl , enableGUI ? false, libGL, libGLU, xorg, fltk +, enableMicroPy ? false, python3 }: assert (!blas.isILP64) && (!lapack.isILP64); stdenv.mkDerivation rec { pname = "giac${lib.optionalString enableGUI "-with-xcas"}"; - version = "1.5.0-87"; # TODO try to remove preCheck phase on upgrade + version = "1.6.0-47"; # TODO try to remove preCheck phase on upgrade src = fetchurl { url = "https://www-fourier.ujf-grenoble.fr/~parisse/debian/dists/stable/main/source/giac_${version}.tar.gz"; - sha256 = "1d0h1yb7qvh9x7wwv9yrzmcp712f49w1iljkxp4y6g9pzsmg1mmv"; + sha256 = "sha256-c5A9/I6L/o3Y3dxEPoTKpw/fJqYMr6euLldaQ1HWT5c="; }; - patches = lib.optionals (!enableGUI) [ - # when enableGui is false, giac is compiled without fltk. That means some - # outputs differ in the make check. Patch around this: + patches = [ (fetchpatch { - url = "https://git.sagemath.org/sage.git/plain/build/pkgs/giac/patches/nofltk-check.patch?id=7553a3c8dfa7bcec07241a07e6a4e7dcf5bb4f26"; + name = "pari_2_11.patch"; + url = "https://git.sagemath.org/sage.git/plain/build/pkgs/giac/patches/pari_2_11.patch?id=21ba7540d385a9864b44850d6987893dfa16bfc0"; + sha256 = "sha256-vEo/5MNzMdYRPWgLFPsDcMT1W80Qzj4EPBjx/B8j68k="; + }) + ] ++ lib.optionals (!enableGUI) [ + # when enableGui is false, giac is compiled without fltk. That + # means some outputs differ in the make check. Patch around this: + (fetchpatch { + name = "nofltk-check.patch"; + url = "https://git.sagemath.org/sage.git/plain/build/pkgs/giac/patches/nofltk-check.patch?id=7553a3c8dfa7bcec07241a07e6a4e7dcf5bb4f26"; sha256 = "0xkmfc028vg5w6va04gp2x2iv31n8v4shd6vbyvk4blzgfmpj2cw"; }) ]; postPatch = '' - for i in doc/*/Makefile*; do + for i in doc/*/Makefile* micropython*/xcas/Makefile*; do substituteInPlace "$i" --replace "/bin/cp" "cp"; done; + '' + + # workaround for 1.6.0-47, should not be necessary in future versions + lib.optionalString (!enableMicroPy) '' + sed -i -e 's/micropython-[0-9.]* //' Makefile* ''; nativeBuildInputs = [ @@ -44,7 +56,7 @@ stdenv.mkDerivation rec { lapack blas ] ++ lib.optionals enableGUI [ libGL libGLU fltk xorg.libX11 - ]; + ] ++ lib.optional enableMicroPy python3; /* fixes: configure:16211: checking for main in -lntl @@ -58,13 +70,12 @@ stdenv.mkDerivation rec { outputs = [ "out" ] ++ lib.optional (!enableGUI) "doc"; doCheck = true; - preCheck = '' - # One test in this file fails. That test just tests a part of the pari - # interface that isn't actually used in giac. Of course it would be better - # to only remove that one test, but that would require a patch. - # Removing the whole test set should be good enough for now. - # Upstream report: https://xcas.univ-grenoble-alpes.fr/forum/viewtopic.php?f=4&t=2102#p10326 - echo > check/chk_fhan11 + preCheck = lib.optionalString (!enableGUI) '' + # even with the nofltk patch, some changes in src/misc.cc (grep + # for HAVE_LIBFLTK) made it so that giac behaves differently + # when fltk is disabled. disable these tests for now. + echo > check/chk_fhan2 + echo > check/chk_fhan9 ''; enableParallelBuilding = true; @@ -75,7 +86,7 @@ stdenv.mkDerivation rec { "--enable-ao" "--enable-ecm" "--enable-glpk" ] ++ lib.optionals enableGUI [ "--enable-gui" "--with-x" - ]; + ] ++ lib.optional (!enableMicroPy) "--disable-micropy"; postInstall = '' # example Makefiles contain the full path to some commands diff --git a/third_party/nixpkgs/pkgs/applications/science/math/palp/default.nix b/third_party/nixpkgs/pkgs/applications/science/math/palp/default.nix index 2866b4b946..ffe17bc3de 100644 --- a/third_party/nixpkgs/pkgs/applications/science/math/palp/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/math/palp/default.nix @@ -10,11 +10,11 @@ let in stdenv.mkDerivation rec { pname = "palp"; - version = "2.11"; + version = "2.20"; src = fetchurl { - url = "http://hep.itp.tuwien.ac.at/~kreuzer/CY/palp/palp-${version}.tar.gz"; - sha256 = "00jpm73fw9jjq58z6rysr1mwv489j6rpfqqlhm9ab0dln4kyhh05"; + url = "http://hep.itp.tuwien.ac.at/~kreuzer/CY/palp/${pname}-${version}.tar.gz"; + sha256 = "1q1cl3vpdir16szy0jcadysydcrjp48hqxyx42kr8g9digkqjgkj"; }; hardeningDisable = [ diff --git a/third_party/nixpkgs/pkgs/applications/science/math/qalculate-gtk/default.nix b/third_party/nixpkgs/pkgs/applications/science/math/qalculate-gtk/default.nix index 3d80d8c039..7ee8679308 100644 --- a/third_party/nixpkgs/pkgs/applications/science/math/qalculate-gtk/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/math/qalculate-gtk/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "qalculate-gtk"; - version = "3.16.0"; + version = "3.17.0"; src = fetchFromGitHub { owner = "qalculate"; repo = "qalculate-gtk"; rev = "v${version}"; - sha256 = "1vqzrh5zxwfvih6c3lak0wkkw6bajl88xzl1zk84gxsk9wdymrk4"; + sha256 = "sha256-Nxe1DZL8mh9aBWXQdlp5wC1l5b9mchlrRyE+LKC+yLI="; }; hardeningDisable = [ "format" ]; diff --git a/third_party/nixpkgs/pkgs/applications/science/math/sage/patches/disable-pexpect-intermittent-failure.patch b/third_party/nixpkgs/pkgs/applications/science/math/sage/patches/disable-pexpect-intermittent-failure.patch deleted file mode 100644 index 374c720791..0000000000 --- a/third_party/nixpkgs/pkgs/applications/science/math/sage/patches/disable-pexpect-intermittent-failure.patch +++ /dev/null @@ -1,29 +0,0 @@ -diff --git a/src/sage/interfaces/singular.py b/src/sage/interfaces/singular.py -index 88a33b0349..b3321f0bec 100644 ---- a/src/sage/interfaces/singular.py -+++ b/src/sage/interfaces/singular.py -@@ -495,24 +495,6 @@ class Singular(ExtraTabCompletion, Expect): - """ - Send an interrupt to Singular. If needed, additional - semi-colons are sent until we get back at the prompt. -- -- TESTS: -- -- The following works without restarting Singular:: -- -- sage: a = singular(1) -- sage: _ = singular._expect.sendline('1+') # unfinished input -- sage: try: -- ....: alarm(0.5) -- ....: singular._expect_expr('>') # interrupt this -- ....: except KeyboardInterrupt: -- ....: pass -- Control-C pressed. Interrupting Singular. Please wait a few seconds... -- -- We can still access a:: -- -- sage: 2*a -- 2 - """ - # Work around for Singular bug - # http://www.singular.uni-kl.de:8002/trac/ticket/727 diff --git a/third_party/nixpkgs/pkgs/applications/science/math/sage/patches/pillow-update.patch b/third_party/nixpkgs/pkgs/applications/science/math/sage/patches/pillow-update.patch deleted file mode 100644 index 19d6155226..0000000000 --- a/third_party/nixpkgs/pkgs/applications/science/math/sage/patches/pillow-update.patch +++ /dev/null @@ -1,39 +0,0 @@ -diff --git a/src/sage/repl/image.py b/src/sage/repl/image.py -index d7d00b0..cd1607a 100644 ---- a/src/sage/repl/image.py -+++ b/src/sage/repl/image.py -@@ -77,7 +77,7 @@ class Image(SageObject): - - - ``size`` -- 2-tuple, containing (width, height) in pixels. - -- - ``color`` -- string or tuple of numeric. What colour to use -+ - ``color`` -- string, numeric or tuple of numeric. What colour to use - for the image. Default is black. If given, this should be a - a tuple with one value per band. When creating RGB images, - you can also use colour strings as supported by the -@@ -91,9 +91,15 @@ class Image(SageObject): - EXAMPLES:: - - sage: from sage.repl.image import Image -- sage: Image('P', (16, 16), (13,)) -+ sage: Image('P', (16, 16), 13) - 16x16px 8-bit Color image - """ -+ # pillow does not support Sage integers as color -+ from sage.rings.integer import Integer -+ if isinstance(color, Integer): -+ color = int(color) -+ elif isinstance(color, tuple): -+ color = tuple(int(i) if isinstance(i, Integer) else i for i in color) - self._pil = PIL.Image.new(mode, size, color) - - @property -@@ -233,7 +239,7 @@ class Image(SageObject): - EXAMPLES:: - - sage: from sage.repl.image import Image -- sage: img = Image('P', (12, 34), (13,)) -+ sage: img = Image('P', (12, 34), 13) - sage: filename = tmp_filename(ext='.png') - sage: img.save(filename) - sage: with open(filename, 'rb') as f: diff --git a/third_party/nixpkgs/pkgs/applications/science/math/sage/patches/register-pretty-printer-earlier.patch b/third_party/nixpkgs/pkgs/applications/science/math/sage/patches/register-pretty-printer-earlier.patch deleted file mode 100644 index 83bd83a6d3..0000000000 --- a/third_party/nixpkgs/pkgs/applications/science/math/sage/patches/register-pretty-printer-earlier.patch +++ /dev/null @@ -1,36 +0,0 @@ -diff --git a/src/sage/doctest/forker.py b/src/sage/doctest/forker.py -index cb3667659e..867f547d71 100644 ---- a/src/sage/doctest/forker.py -+++ b/src/sage/doctest/forker.py -@@ -200,6 +200,15 @@ def init_sage(controller=None): - from sage.cpython._py2_random import Random - sage.misc.randstate.DEFAULT_PYTHON_RANDOM = Random - -+ # IPython's pretty printer sorts the repr of dicts by their keys by default -+ # (or their keys' str() if they are not otherwise orderable). However, it -+ # disables this for CPython 3.6+ opting to instead display dicts' "natural" -+ # insertion order, which is preserved in those versions). -+ # However, this order is random in some instances. -+ # Also modifications of code may affect the order. -+ # So here we fore sorted dict printing. -+ IPython.lib.pretty.for_type(dict, _sorted_dict_pprinter_factory('{', '}')) -+ - if controller is None: - import sage.repl.ipython_kernel.all_jupyter - else: -@@ -222,15 +231,6 @@ def init_sage(controller=None): - from sage.repl.rich_output.backend_doctest import BackendDoctest - dm.switch_backend(BackendDoctest()) - -- # IPython's pretty printer sorts the repr of dicts by their keys by default -- # (or their keys' str() if they are not otherwise orderable). However, it -- # disables this for CPython 3.6+ opting to instead display dicts' "natural" -- # insertion order, which is preserved in those versions). -- # However, this order is random in some instances. -- # Also modifications of code may affect the order. -- # So here we fore sorted dict printing. -- IPython.lib.pretty.for_type(dict, _sorted_dict_pprinter_factory('{', '}')) -- - # Switch on extra debugging - from sage.structure.debug_options import debug - debug.refine_category_hash_check = True diff --git a/third_party/nixpkgs/pkgs/applications/science/math/sage/patches/sagespawn-implicit-casting.patch b/third_party/nixpkgs/pkgs/applications/science/math/sage/patches/sagespawn-implicit-casting.patch deleted file mode 100644 index 2ee5db3e29..0000000000 --- a/third_party/nixpkgs/pkgs/applications/science/math/sage/patches/sagespawn-implicit-casting.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/src/sage/interfaces/sagespawn.pyx b/src/sage/interfaces/sagespawn.pyx -index 9041238f1d..469befbc66 100644 ---- a/src/sage/interfaces/sagespawn.pyx -+++ b/src/sage/interfaces/sagespawn.pyx -@@ -228,7 +228,7 @@ class SagePtyProcess(PtyProcess): - Check that the process eventually dies after calling - ``terminate_async``:: - -- sage: s.ptyproc.terminate_async(interval=0.2) -+ sage: s.ptyproc.terminate_async(interval=float(0.2)) - sage: while True: - ....: try: - ....: os.kill(s.pid, 0) diff --git a/third_party/nixpkgs/pkgs/applications/science/math/sage/sage-src.nix b/third_party/nixpkgs/pkgs/applications/science/math/sage/sage-src.nix index 99a163eb0b..3e4ed900a9 100644 --- a/third_party/nixpkgs/pkgs/applications/science/math/sage/sage-src.nix +++ b/third_party/nixpkgs/pkgs/applications/science/math/sage/sage-src.nix @@ -9,6 +9,20 @@ # This is done because multiple derivations rely on these sources and they should # all get the same sources with the same patches applied. +let + # Fetch a diff between `base` and `rev` on sage's git server. + # Used to fetch trac tickets by setting the `base` to the last release and the + # `rev` to the last commit of the ticket. + fetchSageDiff = { base, name, rev, sha256, ...}@args: ( + fetchpatch ({ + inherit name sha256; + url = "https://git.sagemath.org/sage.git/patch?id2=${base}&id=${rev}"; + # We don't care about sage's own build system (which builds all its dependencies). + # Exclude build system changes to avoid conflicts. + excludes = [ "build/*" ]; + } // builtins.removeAttrs args [ "rev" "base" "sha256" ]) + ); +in stdenv.mkDerivation rec { version = "9.2"; pname = "sage-src"; @@ -40,17 +54,13 @@ stdenv.mkDerivation rec { # https://groups.google.com/forum/#!topic/sage-packaging/YGOm8tkADrE ./patches/sphinx-docbuild-subprocesses.patch - # Sage's workaround to pretty print dicts (in - # src/sage/doctest/forker.py:init_sage) runs too late (after - # controller.load_environment(), which imports sage.all.*) to to - # affect sage.sandpiles.Sandpile{Config,Divisor}'s pretty printer. - # Due to the sandpiles module being lazily loaded, this only - # affects the first run (subsequent runs read from an import cache - # at ~/.sage/cache and are not affected), which is probably why - # other distributions don't hit this bug. This breaks two sandpile - # tests, so do the workaround a little bit earlier. - # https://trac.sagemath.org/ticket/31053 - ./patches/register-pretty-printer-earlier.patch + # Register sorted dict pprinter earlier (https://trac.sagemath.org/ticket/31053) + (fetchSageDiff { + base = "9.3.beta4"; + name = "register-pretty-printer-earlier.patch"; + rev = "d658230ce06ca19f4a3b3a4576297ee82f2d2151"; + sha256 = "sha256-9mPUV7K5PoLDH2vVaYaOfvDLDpmxU0Aj7m/eaXYotDs="; + }) ]; # Since sage unfortunately does not release bugfix releases, packagers must @@ -63,17 +73,20 @@ stdenv.mkDerivation rec { # fix intermittent errors in Sage 9.2's psage.py (this patch is # already included in Sage 9.3): https://trac.sagemath.org/ticket/30730 - (fetchpatch { + (fetchSageDiff { + base = "9.2.rc2"; name = "fix-psage-is-locked.patch"; - url = "https://git.sagemath.org/sage.git/patch/?id=75df605f216ddc7b6ca719be942d666b241520e9"; + rev = "75df605f216ddc7b6ca719be942d666b241520e9"; sha256 = "0g9pl1wbb3sgs26d3bvv70cpa77sfskylv4kd255y1794f1fgk4q"; }) # fix intermittent errors in sagespawn.pyx: https://trac.sagemath.org/ticket/31052 - ./patches/sagespawn-implicit-casting.patch - - # disable pexpect interrupt test (see https://trac.sagemath.org/ticket/30945) - ./patches/disable-pexpect-intermittent-failure.patch + (fetchSageDiff { + base = "9.2"; + name = "sagespawn-implicit-casting.patch"; + rev = "2959ac792ebd6107fe87c9af1541083de5ba02d6"; + sha256 = "sha256-bWIpEGir9Kawak5CJegBMNcHm/CqhWmdru+emeSsvO0="; + }) ]; # Patches needed because of package updates. We could just pin the versions of @@ -82,20 +95,7 @@ stdenv.mkDerivation rec { # compatible with never dependency versions when possible. All these changes # should come from or be proposed to upstream. This list will probably never # be empty since dependencies update all the time. - packageUpgradePatches = let - # Fetch a diff between `base` and `rev` on sage's git server. - # Used to fetch trac tickets by setting the `base` to the last release and the - # `rev` to the last commit of the ticket. - fetchSageDiff = { base, rev, name ? "sage-diff-${base}-${rev}.patch", ...}@args: ( - fetchpatch ({ - inherit name; - url = "https://git.sagemath.org/sage.git/patch?id2=${base}&id=${rev}"; - # We don't care about sage's own build system (which builds all its dependencies). - # Exclude build system changes to avoid conflicts. - excludes = [ "build/*" ]; - } // builtins.removeAttrs args [ "rev" "base" ]) - ); - in [ + packageUpgradePatches = [ # After updating smypow to (https://trac.sagemath.org/ticket/3360) we can # now set the cache dir to be withing the .sage directory. This is not # strictly necessary, but keeps us from littering in the user's HOME. @@ -105,7 +105,20 @@ stdenv.mkDerivation rec { ./patches/ignore-cmp-deprecation.patch # adapt sage's Image class to pillow 8.0.1 (https://trac.sagemath.org/ticket/30971) - ./patches/pillow-update.patch + (fetchSageDiff { + base = "9.3.beta2"; + name = "pillow-8.0.1-update.patch"; + rev = "f05f2d0aac9c4b5abe68105cee2cc7f2c8461847"; + sha256 = "sha256-uY2UlgSd5hhOUUukB4Xc3Gjy0/e7p/qyq9jdvz10IOs="; + }) + + # don't use deprecated numpy type aliases (https://trac.sagemath.org/ticket/31364) + (fetchSageDiff { + base = "9.3.beta7"; + name = "dont-use-deprecated-numpy-type-aliases.patch"; + rev = "dfdef60515d4a4269e82d91280f76a7fdf10bf97"; + sha256 = "sha256-77/3LkT5J7DQN8IPlGJKB6ZcJPaF7xwje06JNns+0AE="; + }) # fix test output with sympy 1.7 (https://trac.sagemath.org/ticket/30985) ./patches/sympy-1.7-update.patch @@ -115,6 +128,31 @@ stdenv.mkDerivation rec { # updated eclib output has punctuation changes and tidier whitespace ./patches/eclib-20210223-test-formatting.patch + + # upgrade arb to 2.18.1 (https://trac.sagemath.org/ticket/28623) + (fetchSageDiff { + base = "9.3.beta3"; + name = "arb-2.18.1-update.patch"; + rev = "0c9c4ed35c2eaf34ae0d19387c07b7f460e4abce"; + sha256 = "sha256-CjOJIsyyVCziAfvE6pWSihPO35IZMcY2/taXAsqhPLY="; + }) + + # giac 1.6.0-47 update (https://trac.sagemath.org/ticket/30537) + (fetchSageDiff { + base = "9.3.beta7"; + name = "giac-1.6.0-47-update.patch"; + rev = "f05720bf63dfaf33a4e3b6d3ed2c2c0ec46b5d31"; + sha256 = "sha256-gDUq+84eXd5GxLBWUSI61GMJpBF2KX4LBVOt3mS1NF8="; + }) + + # Make gcd/lcm interact better with pari and gmpy2 (https://trac.sagemath.org/ticket/30849) + # needed for pari 2.13.1 update, which we will do in the future + (fetchSageDiff { + base = "9.3.beta0"; + name = "make-gcd-lcm-interact-better-with-pari-and-gmpy2.patch"; + rev = "75c1516f0abb9e6f8c335e38e4031f6ef674ed30"; + sha256 = "sha256-RukkieIZcXNrju904H2oyGKdtpdE+9vNzvyjN2IBNg0="; + }) ]; patches = nixPatches ++ bugfixPatches ++ packageUpgradePatches; diff --git a/third_party/nixpkgs/pkgs/applications/search/recoll/default.nix b/third_party/nixpkgs/pkgs/applications/search/recoll/default.nix index 99e323d16d..b14eb99420 100644 --- a/third_party/nixpkgs/pkgs/applications/search/recoll/default.nix +++ b/third_party/nixpkgs/pkgs/applications/search/recoll/default.nix @@ -37,11 +37,11 @@ assert stdenv.hostPlatform.system != "powerpc-linux"; mkDerivation rec { pname = "recoll"; - version = "1.27.12"; + version = "1.28.6"; src = fetchurl { url = "https://www.lesbonscomptes.com/${pname}/${pname}-${version}.tar.gz"; - sha256 = "0bgadm8p319fws66ca4rpv9fx2bllbphgn892rh78db81lz20i5v"; + sha256 = "sha256-fSblLddWTJKRzw4VAQp+p3xPe5grB2xITgN6vKr0xLc="; }; configureFlags = [ "--enable-recollq" "--disable-webkit" ] diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/subgit/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/subgit/default.nix index 2f275827a2..8f06050d09 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/subgit/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/subgit/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchurl, unzip, makeWrapper, jre }: stdenv.mkDerivation rec { - name = "subgit-3.3.10"; + name = "subgit-3.3.11"; meta = { description = "A tool for a smooth, stress-free SVN to Git migration"; @@ -21,6 +21,6 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://subgit.com/download/${name}.zip"; - sha256 = "1z7cmaghfy5yjs50b3y6av9h2d6xmpamyxql7vvr3dy6kflvv8fk"; + sha256 = "sha256-ltTpmXPCIGTmVDxKc6oelMEzQWXRbIf0NESzRugaXo0="; }; } diff --git a/third_party/nixpkgs/pkgs/applications/version-management/gitlab/data.json b/third_party/nixpkgs/pkgs/applications/version-management/gitlab/data.json index e0312cddd4..001d0b158b 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/gitlab/data.json +++ b/third_party/nixpkgs/pkgs/applications/version-management/gitlab/data.json @@ -1,13 +1,13 @@ { - "version": "13.8.4", - "repo_hash": "1q8q5v7c6g7yss26d6wg29h28fq1azy1smai97yk80cr0kirab8v", + "version": "13.8.5", + "repo_hash": "0dpyqynd6rscg07s58y0cjn7vfj2h21h51ja0fm6ll76wb02sbm6", "owner": "gitlab-org", "repo": "gitlab", - "rev": "v13.8.4-ee", + "rev": "v13.8.5-ee", "passthru": { - "GITALY_SERVER_VERSION": "13.8.4", + "GITALY_SERVER_VERSION": "13.8.5", "GITLAB_PAGES_VERSION": "1.34.0", "GITLAB_SHELL_VERSION": "13.15.1", - "GITLAB_WORKHORSE_VERSION": "8.59.0" + "GITLAB_WORKHORSE_VERSION": "8.59.2" } } diff --git a/third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitaly/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitaly/default.nix index af879bc127..a201d79a12 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitaly/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/gitlab/gitaly/default.nix @@ -33,14 +33,14 @@ let }; }; in buildGoModule rec { - version = "13.8.4"; + version = "13.8.5"; pname = "gitaly"; src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitaly"; rev = "v${version}"; - sha256 = "sha256-y8uy70ccQPba+JJmWace4LgLJkJNzVdFhrvq0AB8G5w="; + sha256 = "sha256-hKIjKltPPmz50Ru7elpHdeoyGAqgp+txR3fKleqY7hM="; }; vendorSha256 = "sha256-oVw6vXI3CyOn4l02PkYx3HVpZfzQPi3yBuf9tRvoWoM="; 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 8f00434144..05be0e1681 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 @@ -3,13 +3,13 @@ buildGoModule rec { pname = "gitlab-workhorse"; - version = "8.59.0"; + version = "8.59.2"; src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-workhorse"; rev = "v${version}"; - sha256 = "sha256-6JVt5hNWvnUm64SFqns1f1+xMP/KyPQ8H93jqXNT8n8="; + sha256 = "sha256-hMcE7dlUw34DyUO0v5JxwvvEh/HC2emrIKc1K1U4bPE="; }; vendorSha256 = "0vkw12w7vr0g4hf4f0im79y7l36d3ah01n1vl7siy94si47g8ir5"; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile b/third_party/nixpkgs/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile index c7ed1cd4d7..23b58d721f 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile +++ b/third_party/nixpkgs/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile @@ -307,6 +307,9 @@ gem 'premailer-rails', '~> 1.10.3' # LabKit: Tracing and Correlation gem 'gitlab-labkit', '0.14.0' +# Thrift is a dependency of gitlab-labkit, we want a version higher than 0.14.0 +# because of https://gitlab.com/gitlab-org/gitlab/-/issues/321900 +gem 'thrift', '>= 0.14.0' # I18n gem 'ruby_parser', '~> 3.15', require: false diff --git a/third_party/nixpkgs/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock b/third_party/nixpkgs/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock index b370024b95..26a757a768 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock +++ b/third_party/nixpkgs/pkgs/applications/version-management/gitlab/rubyEnv/Gemfile.lock @@ -1176,7 +1176,7 @@ GEM rack (>= 1, < 3) thor (0.20.3) thread_safe (0.3.6) - thrift (0.13.0) + thrift (0.14.0) tilt (2.0.10) timecop (0.9.1) timeliness (0.3.10) @@ -1522,6 +1522,7 @@ DEPENDENCIES terser (= 1.0.2) test-prof (~> 0.12.0) thin (~> 1.7.0) + thrift (>= 0.14.0) timecop (~> 0.9.1) toml-rb (~> 1.0.0) truncato (~> 0.7.11) diff --git a/third_party/nixpkgs/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix b/third_party/nixpkgs/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix index 20857db266..d13ca29863 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/gitlab/rubyEnv/gemset.nix @@ -5154,10 +5154,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "08076cmdx0g51yrkd7dlxlr45nflink3jhdiq7006ljc2pc3212q"; + sha256 = "1v4q8wlc4kr952r24q9x60cvimn27g34h0j23imwqkrjcbngsj5n"; type = "gem"; }; - version = "0.13.0"; + version = "0.14.0"; }; tilt = { groups = ["default" "development" "test"]; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/gitlab/yarnPkgs.nix b/third_party/nixpkgs/pkgs/applications/version-management/gitlab/yarnPkgs.nix index 74d4020f22..a9e255417d 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/gitlab/yarnPkgs.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/gitlab/yarnPkgs.nix @@ -12330,11 +12330,11 @@ }; } { - name = "swagger_ui_dist___swagger_ui_dist_3.32.4.tgz"; + name = "swagger_ui_dist___swagger_ui_dist_3.43.0.tgz"; path = fetchurl { - name = "swagger_ui_dist___swagger_ui_dist_3.32.4.tgz"; - url = "https://registry.yarnpkg.com/swagger-ui-dist/-/swagger-ui-dist-3.32.4.tgz"; - sha1 = "6fa920a99e38eaaf129580ac158cf730494a2190"; + name = "swagger_ui_dist___swagger_ui_dist_3.43.0.tgz"; + url = "https://registry.yarnpkg.com/swagger-ui-dist/-/swagger-ui-dist-3.43.0.tgz"; + sha1 = "b064a2cec1d27776f9a124bc70423cfa0bbc0d3f"; }; } { diff --git a/third_party/nixpkgs/pkgs/applications/video/avidemux/default.nix b/third_party/nixpkgs/pkgs/applications/video/avidemux/default.nix index da3c25def3..9b2073bc79 100644 --- a/third_party/nixpkgs/pkgs/applications/video/avidemux/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/avidemux/default.nix @@ -25,11 +25,11 @@ assert !withQT -> default != "qt5"; stdenv.mkDerivation rec { pname = "avidemux"; - version = "2.7.6"; + version = "2.7.8"; src = fetchurl { url = "mirror://sourceforge/avidemux/avidemux/${version}/avidemux_${version}.tar.gz"; - sha256 = "1kwkn976ppahrcr74bnv6sqx75pzl9y21m1mvr5ksi1m6lgp924s"; + sha256 = "sha256-YopAT1If8oEnYHAK4+KqeOWBaw/z+2/QWsPnUkjZdAE="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/applications/video/droidcam/default.nix b/third_party/nixpkgs/pkgs/applications/video/droidcam/default.nix index 3e6a06db1a..eed4c030cf 100644 --- a/third_party/nixpkgs/pkgs/applications/video/droidcam/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/droidcam/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "droidcam"; - version = "1.7.1"; + version = "1.7.2"; src = fetchFromGitHub { owner = "aramg"; repo = "droidcam"; rev = "v${version}"; - sha256 = "sha256-f7wLi4ReExkqb+SfOK0juzKbwdcqUVkklIUOIMtmnxM="; + sha256 = "sha256-Ny/PJu+ifs9hQRDUv1pONBb6fKJzoiNtjPOFc4veU8c="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/video/minitube/default.nix b/third_party/nixpkgs/pkgs/applications/video/minitube/default.nix index a5bd030e47..84b5e2a1d7 100644 --- a/third_party/nixpkgs/pkgs/applications/video/minitube/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/minitube/default.nix @@ -1,28 +1,26 @@ { mkDerivation, lib, fetchFromGitHub, phonon, phonon-backend-vlc, qtbase, qmake , qtdeclarative, qttools, qtx11extras, mpv -# "Free" key generated by nckx . I no longer have a Google -# account. You'll need to generate (and please share :-) a new one if it breaks. -, withAPIKey ? "AIzaSyBtFgbln3bu1swQC-naMxMtKh384D3xJZE" }: +# "Free" key generated by pasqui23 +, withAPIKey ? "AIzaSyBQvZXseEVvgu5Ega_DI-AIJ55v0OsHmVY" }: mkDerivation rec { pname = "minitube"; - version = "3.6"; + version = "3.8.1"; src = fetchFromGitHub { - sha256 = "6IaBPYL/yGWKUHxPe1FnAR1gDHImXYGItYWq7VNjwEU="; + sha256 = "3lpZyPwo4NnxZJKfmCFsH4WdakV4KB5BtCr5xsleeIQ="; rev = version; repo = "minitube"; owner = "flaviotordini"; fetchSubmodules = true; }; - buildInputs = [ phonon phonon-backend-vlc qtbase qtdeclarative qtx11extras mpv ]; nativeBuildInputs = [ qmake qttools ]; - qmakeFlags = [ "DEFINES+=APP_GOOGLE_API_KEY=${withAPIKey}" ]; + buildInputs = [ phonon phonon-backend-vlc qtbase qtdeclarative qtx11extras mpv ]; - enableParallelBuilding = true; + qmakeFlags = [ "DEFINES+=APP_GOOGLE_API_KEY=${withAPIKey}" ]; meta = with lib; { description = "Stand-alone YouTube video player"; diff --git a/third_party/nixpkgs/pkgs/applications/video/shotcut/default.nix b/third_party/nixpkgs/pkgs/applications/video/shotcut/default.nix index b8e07e9c3e..24cb3769aa 100644 --- a/third_party/nixpkgs/pkgs/applications/video/shotcut/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/shotcut/default.nix @@ -25,13 +25,13 @@ assert lib.versionAtLeast mlt.version "6.24.0"; mkDerivation rec { pname = "shotcut"; - version = "21.01.29"; + version = "21.02.27"; src = fetchFromGitHub { owner = "mltframework"; repo = "shotcut"; rev = "v${version}"; - sha256 = "0Q+63IRY4UbiYS+IMnn7hlr6w3IYtWynjBfTBvtWBMo="; + sha256 = "bcuJz27jDAB3OPEKq3xNgfv6C31UoMKosS4YIRZNMjM="; }; enableParallelBuilding = true; diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/docker-compose/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/docker-compose/default.nix index 885a48fd7c..a9e332e2a4 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/docker-compose/default.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/docker-compose/default.nix @@ -8,12 +8,12 @@ }: buildPythonApplication rec { - version = "1.28.3"; + version = "1.28.5"; pname = "docker-compose"; src = fetchPypi { inherit pname version; - sha256 = "78a48ef8ff4fed092261ecb1a60d9b28b7776e72ed6df591a900008039308b0f"; + sha256 = "b3ff8f0352eb4055c4c483cb498aeff7c90195fa679f3caf7098a2d6fa6030e5"; }; # lots of networking and other fails diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/cagebreak/default.nix b/third_party/nixpkgs/pkgs/applications/window-managers/cagebreak/default.nix index a4e5d7f702..93ac815346 100644 --- a/third_party/nixpkgs/pkgs/applications/window-managers/cagebreak/default.nix +++ b/third_party/nixpkgs/pkgs/applications/window-managers/cagebreak/default.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "cagebreak"; - version = "1.5.0"; + version = "1.6.0"; src = fetchFromGitHub { owner = "project-repo"; repo = "cagebreak"; rev = version; - hash = "sha256-P6zBVQEv+fKdverNIXhoEavu51uGKbSHx3Sh5FWsc2E="; + hash = "sha256-F7fqDVbJS6pVgmj6C1/l9PAaz5yzcYpaq6oc6a6v/Qk="; }; nativeBuildInputs = [ meson ninja pkg-config wayland scdoc makeWrapper ]; @@ -29,6 +29,7 @@ stdenv.mkDerivation rec { mesonFlags = [ "-Dxwayland=${lib.boolToString withXwayland}" "-Dversion_override=${version}" + "-Dman-pages=true" ]; postInstall = '' diff --git a/third_party/nixpkgs/pkgs/build-support/coq/default.nix b/third_party/nixpkgs/pkgs/build-support/coq/default.nix index 8d86602bf3..03922303ee 100644 --- a/third_party/nixpkgs/pkgs/build-support/coq/default.nix +++ b/third_party/nixpkgs/pkgs/build-support/coq/default.nix @@ -25,13 +25,16 @@ in dropAttrs ? [], keepAttrs ? [], dropDerivationAttrs ? [], + useDune2ifVersion ? (x: false), + useDune2 ? false, ... }@args: let args-to-remove = foldl (flip remove) ([ "version" "fetcher" "repo" "owner" "domain" "releaseRev" "displayVersion" "defaultVersion" "useMelquiondRemake" - "release" "extraBuildInputs" "extraPropagatedBuildInputs" "namePrefix" "meta" + "release" "extraBuildInputs" "extraPropagatedBuildInputs" "namePrefix" + "meta" "useDune2ifVersion" "useDune2" "extraInstallFlags" "setCOQBIN" "mlPlugin" "dropAttrs" "dropDerivationAttrs" "keepAttrs" ] ++ dropAttrs) keepAttrs; fetch = import ../coq/meta-fetch/default.nix @@ -54,6 +57,7 @@ let append-version = p: n: p + display-pkg n "" coqPackages.${n}.version + "-"; prefix-name = foldl append-version "" namePrefix; var-coqlib-install = (optionalString (versions.isGe "8.7" coq.coq-version) "COQMF_") + "COQLIB"; + useDune2 = args.useDune2 or useDune2ifVersion fetched.version; in stdenv.mkDerivation (removeAttrs ({ @@ -62,7 +66,10 @@ stdenv.mkDerivation (removeAttrs ({ inherit (fetched) version src; - buildInputs = [ coq ] ++ optionals mlPlugin coq.ocamlBuildInputs ++ extraBuildInputs; + buildInputs = [ coq ] + ++ optionals mlPlugin coq.ocamlBuildInputs + ++ optionals useDune2 [coq.ocaml coq.ocamlPackages.dune_2] + ++ extraBuildInputs; inherit enableParallelBuilding; meta = ({ platforms = coq.meta.platforms; } // @@ -73,20 +80,30 @@ stdenv.mkDerivation (removeAttrs ({ optionalAttrs (fetched.broken or false) { coqFilter = true; broken = true; }) // (args.meta or {}) ; -} // -(optionalAttrs setCOQBIN { COQBIN = "${coq}/bin/"; }) // -(optionalAttrs (!args?installPhase && !args?useMelquiondRemake) { +} +// (optionalAttrs setCOQBIN { COQBIN = "${coq}/bin/"; }) +// (optionalAttrs (!args?installPhase && !args?useMelquiondRemake) { installFlags = [ "${var-coqlib-install}=$(out)/lib/coq/${coq.coq-version}/" ] ++ optional (match ".*doc$" (args.installTargets or "") != null) "DOCDIR=$(out)/share/coq/${coq.coq-version}/" ++ extraInstallFlags; -}) // -(optionalAttrs (args?useMelquiondRemake) rec { +}) +// (optionalAttrs useDune2 { + installPhase = '' + runHook preInstall + dune install --prefix=$out + mv $out/lib/coq $out/lib/TEMPORARY + mkdir $out/lib/coq/ + mv $out/lib/TEMPORARY $out/lib/coq/${coq.coq-version} + runHook postInstall + ''; +}) +// (optionalAttrs (args?useMelquiondRemake) rec { COQUSERCONTRIB = "$out/lib/coq/${coq.coq-version}/user-contrib"; preConfigurePhases = "autoconf"; configureFlags = [ "--libdir=${COQUSERCONTRIB}/${useMelquiondRemake.logpath or ""}" ]; buildPhase = "./remake -j$NIX_BUILD_CORES"; installPhase = "./remake install"; -}) // -(removeAttrs args args-to-remove)) dropDerivationAttrs) +}) +// (removeAttrs args args-to-remove)) dropDerivationAttrs) diff --git a/third_party/nixpkgs/pkgs/build-support/coq/meta-fetch/default.nix b/third_party/nixpkgs/pkgs/build-support/coq/meta-fetch/default.nix index b01ae72a20..e7b15af4f0 100644 --- a/third_party/nixpkgs/pkgs/build-support/coq/meta-fetch/default.nix +++ b/third_party/nixpkgs/pkgs/build-support/coq/meta-fetch/default.nix @@ -39,10 +39,13 @@ switch arg [ { case = isPathString; out = { version = "dev"; src = arg; }; } { case = pred.union isVersion isShortVersion; out = let v = if isVersion arg then arg else shortVersion arg; in - if !release.${v}?sha256 then throw "meta-fetch: a sha256 must be provided for each release" - else { - version = release.${v}.version or v; - src = release.${v}.src or fetcher (location // { rev = releaseRev v; } // release.${v}); + let + given-sha256 = release.${v}.sha256 or ""; + sha256 = if given-sha256 == "" then lib.fakeSha256 else given-sha256; + rv = release.${v} // { inherit sha256; }; in + { + version = rv.version or v; + src = rv.src or fetcher (location // { rev = releaseRev v; } // rv); }; } { case = isString; diff --git a/third_party/nixpkgs/pkgs/build-support/docker/default.nix b/third_party/nixpkgs/pkgs/build-support/docker/default.nix index 4d57b39919..fec289f0ff 100644 --- a/third_party/nixpkgs/pkgs/build-support/docker/default.nix +++ b/third_party/nixpkgs/pkgs/build-support/docker/default.nix @@ -447,7 +447,7 @@ rec { let stream = streamLayeredImage args; in - runCommand "${name}.tar.gz" { + runCommand "${baseNameOf name}.tar.gz" { inherit (stream) imageName; passthru = { inherit (stream) imageTag; }; nativeBuildInputs = [ pigz ]; @@ -518,9 +518,9 @@ rec { }; result = runCommand "docker-image-${baseName}.tar.gz" { nativeBuildInputs = [ jshon pigz coreutils findutils jq moreutils ]; - # Image name and tag must be lowercase + # Image name must be lowercase imageName = lib.toLower name; - imageTag = if tag == null then "" else lib.toLower tag; + imageTag = if tag == null then "" else tag; inherit fromImage baseJson; layerClosure = writeReferencesToFile layer; passthru.buildArgs = args; @@ -746,8 +746,10 @@ rec { (lib.assertMsg (maxLayers > 1) "the maxLayers argument of dockerTools.buildLayeredImage function must be greather than 1 (current value: ${toString maxLayers})"); let + baseName = baseNameOf name; + streamScript = writePython3 "stream" {} ./stream_layered_image.py; - baseJson = writeText "${name}-base.json" (builtins.toJSON { + baseJson = writeText "${baseName}-base.json" (builtins.toJSON { inherit config; architecture = defaultArch; os = "linux"; @@ -759,7 +761,7 @@ rec { # things like permissions set on 'extraCommands' are not overriden # by Nix. Then we precompute the sha256 for performance. customisationLayer = symlinkJoin { - name = "${name}-customisation-layer"; + name = "${baseName}-customisation-layer"; paths = contentsList; inherit extraCommands; postBuild = '' @@ -788,7 +790,7 @@ rec { # so they'll be excluded from the created images. unnecessaryDrvs = [ baseJson overallClosure ]; - conf = runCommand "${name}-conf.json" { + conf = runCommand "${baseName}-conf.json" { inherit maxLayers created; imageName = lib.toLower name; passthru.imageTag = @@ -841,18 +843,20 @@ rec { cat ${baseJson} | jq ' . + { + "store_dir": $store_dir, "store_layers": $store_layers, "customisation_layer", $customisation_layer, "repo_tag": $repo_tag, "created": $created } - ' --argjson store_layers "$store_layers" \ + ' --arg store_dir "${storeDir}" \ + --argjson store_layers "$store_layers" \ --arg customisation_layer ${customisationLayer} \ --arg repo_tag "$imageName:$imageTag" \ --arg created "$created" | tee $out ''; - result = runCommand "stream-${name}" { + result = runCommand "stream-${baseName}" { inherit (conf) imageName; passthru = { inherit (conf) imageTag; diff --git a/third_party/nixpkgs/pkgs/build-support/docker/examples.nix b/third_party/nixpkgs/pkgs/build-support/docker/examples.nix index 86375a40ba..9e33a42af2 100644 --- a/third_party/nixpkgs/pkgs/build-support/docker/examples.nix +++ b/third_party/nixpkgs/pkgs/build-support/docker/examples.nix @@ -427,4 +427,18 @@ rec { tag = "latest"; contents = [ pkgs.bash symlink ]; } // { passthru = { inherit symlink; }; }; + + # image with registry/ prefix + prefixedImage = pkgs.dockerTools.buildImage { + name = "registry-1.docker.io/image"; + tag = "latest"; + config.Cmd = [ "${pkgs.hello}/bin/hello" ]; + }; + + # layered image with registry/ prefix + prefixedLayeredImage = pkgs.dockerTools.buildLayeredImage { + name = "registry-1.docker.io/layered-image"; + tag = "latest"; + config.Cmd = [ "${pkgs.hello}/bin/hello" ]; + }; } diff --git a/third_party/nixpkgs/pkgs/build-support/docker/stream_layered_image.py b/third_party/nixpkgs/pkgs/build-support/docker/stream_layered_image.py index e35bd0b0e8..60d67442c1 100644 --- a/third_party/nixpkgs/pkgs/build-support/docker/stream_layered_image.py +++ b/third_party/nixpkgs/pkgs/build-support/docker/stream_layered_image.py @@ -130,12 +130,13 @@ class ExtractChecksum: LayerInfo = namedtuple("LayerInfo", ["size", "checksum", "path", "paths"]) -def add_layer_dir(tar, paths, mtime): +def add_layer_dir(tar, paths, store_dir, mtime): """ Appends given store paths to a TarFile object as a new layer. tar: 'tarfile.TarFile' object for the new layer to be added to. paths: List of store paths. + store_dir: the root directory of the nix store mtime: 'mtime' of the added files and the layer tarball. Should be an integer representing a POSIX time. @@ -143,9 +144,9 @@ def add_layer_dir(tar, paths, mtime): the layer added. """ - invalid_paths = [i for i in paths if not i.startswith("/nix/store/")] + invalid_paths = [i for i in paths if not i.startswith(store_dir)] assert len(invalid_paths) == 0, \ - "Expecting absolute store paths, but got: {invalid_paths}" + f"Expecting absolute paths from {store_dir}, but got: {invalid_paths}" # First, calculate the tarball checksum and the size. extract_checksum = ExtractChecksum() @@ -245,6 +246,7 @@ def main(): else datetime.fromisoformat(conf["created"]) ) mtime = int(created.timestamp()) + store_dir = conf["store_dir"] with tarfile.open(mode="w|", fileobj=sys.stdout.buffer) as tar: layers = [] @@ -253,7 +255,7 @@ def main(): "Creating layer", num, "from paths:", store_layer, file=sys.stderr) - info = add_layer_dir(tar, store_layer, mtime=mtime) + info = add_layer_dir(tar, store_layer, store_dir, mtime=mtime) layers.append(info) print("Creating the customisation layer...", file=sys.stderr) diff --git a/third_party/nixpkgs/pkgs/build-support/fetchsourcehut/default.nix b/third_party/nixpkgs/pkgs/build-support/fetchsourcehut/default.nix new file mode 100644 index 0000000000..ed2f074200 --- /dev/null +++ b/third_party/nixpkgs/pkgs/build-support/fetchsourcehut/default.nix @@ -0,0 +1,25 @@ +{ fetchzip, lib }: + +{ owner +, repo, rev +, domain ? "sr.ht" +, vc ? "git" +, name ? "source" +, ... # For hash agility +} @ args: + +with lib; + +assert (lib.assertOneOf "vc" vc [ "hg" "git" ]); + +let + baseUrl = "https://${vc}.${domain}/${owner}/${repo}"; + +in fetchzip (recursiveUpdate { + inherit name; + url = "${baseUrl}/archive/${rev}.tar.gz"; + meta.homepage = "${baseUrl}/"; + extraPostFetch = optionalString (vc == "hg") '' + rm -f "$out/.hg_archival.txt" + ''; # impure file; see #12002 +} (removeAttrs args [ "owner" "repo" "rev" "domain" "vc" ])) // { inherit rev; } diff --git a/third_party/nixpkgs/pkgs/data/fonts/iosevka/bin.nix b/third_party/nixpkgs/pkgs/data/fonts/iosevka/bin.nix index ee10c5bd18..26d67ba170 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/iosevka/bin.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/iosevka/bin.nix @@ -10,7 +10,7 @@ let (builtins.attrNames (builtins.removeAttrs variantHashes [ "iosevka" ])); in stdenv.mkDerivation rec { pname = "${name}-bin"; - version = "5.0.4"; + version = "5.0.5"; src = fetchurl { url = "https://github.com/be5invis/Iosevka/releases/download/v${version}/ttc-${name}-${version}.zip"; diff --git a/third_party/nixpkgs/pkgs/data/fonts/iosevka/variants.nix b/third_party/nixpkgs/pkgs/data/fonts/iosevka/variants.nix index 10f8cc67c7..6c31d3edb7 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/iosevka/variants.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/iosevka/variants.nix @@ -1,26 +1,26 @@ # This file was autogenerated. DO NOT EDIT! { - iosevka = "0g32pzxij72fjy0ycwzy23dg06ypmxcg24dk4scvhjp9b5ajx79k"; - iosevka-aile = "0yynkwhanza4y593ajn8hkshk46dl9g84qf1shmy21wd3lqr7psx"; - iosevka-curly = "0zd5hh0hr6prn32yd7fibl2wighv9f6p7jwgfrwcizljai44adnx"; - iosevka-curly-slab = "147bzw9lr8f54yh0hv8887sxy4571563mxjcag0dfw8z3rfffw8c"; - iosevka-etoile = "04jjg4vp0fag7xgiqxnql60gyvlpjmgqqj5q4j3rys9nyw3pl0gi"; - iosevka-slab = "10qwardvknnw6l3yiyji9v02450vfj76lvnlszijv78lfm1xp1qk"; - iosevka-ss01 = "12z1yjspzcbzgs224n1dxis4ghybfkzpw4dwr1wzza553kplwz6w"; - iosevka-ss02 = "08vrlzcyqa83mn2155p4h6hsk20jx3sv0yqimxfsyrwcalc63dcq"; - iosevka-ss03 = "0rhp4rdza36hazs20h4bk524xsgx54pxbw69k235km71m9x6ba59"; - iosevka-ss04 = "1ijjcy8z0fbfrw2fjqnmxbi9l6r41sixk72h3vp75gzrkq7dbh86"; - iosevka-ss05 = "06q9wxkyp7iv9pz3xj6d3v8ay82425wcgl9dybr3dfp4mcsdn7zz"; - iosevka-ss06 = "10pdw28dgdk5343rzbbj5mgmagv4ndl2gg4f02kzq0vlv5xh8vj6"; - iosevka-ss07 = "16xym710sq398zi223cjzxpcblc851ypl7v2dzhvskgsasvj4ypr"; - iosevka-ss08 = "14mqs6gi71p544asr1sz48g6q9zl6zj6sadhhcf8gdsnwa475ds2"; - iosevka-ss09 = "049va8vpzjczslirsxklwcpcsiaqrpc2zm9rmnf5qfyf7f1rn4yd"; - iosevka-ss10 = "1g8s9d7vlb2yx5d8cgsxcl5hb38g1f80d3l04lj2gr22lzk0y271"; - iosevka-ss11 = "15j3wfz8ybszp702c8ycv8kwnbdpa07w8kw9njhsfzvb5iw1xx0i"; - iosevka-ss12 = "1k5250sik2yfa5s5dxaqp0s45wfbxh1s1xn06qjj81ywmw9hy6yg"; - iosevka-ss13 = "1ym8mn2qqwys01wrkplx11kajkfi0x5vzn8m234cbzn8drlgh0l5"; - iosevka-ss14 = "0wkc7kwz6bzxxijycm4d4samy83zsghd8lyq0yn6g48rb6kj9fgw"; - iosevka-ss15 = "0j46sr85vcq25n8ia7nk8rgr3rmgr69wwf7pgllllscablacw73k"; - iosevka-ss16 = "017vipi1cmcjglx0x6da6ans1bsr3xlr43n4mv5qj7h50j1dv3l6"; - iosevka-ss17 = "0kbvy54v543znrzb9584mv6h96hfp9fndxb6wg32clqhzm2yh7fw"; + iosevka = "1fva80sxdcmsl8y3m23ndif3ff54if37g1xqpda1f13yrbd9ii8q"; + iosevka-aile = "0fy58yd17k8k41j5f48572d4vad3zz7c2mbc6vsiii9abfkwwalr"; + iosevka-curly = "1lxw8na3qvc5g04prczl7qprdkvd0zf91ybmv276dnkq27abnjn4"; + iosevka-curly-slab = "19b6xr5vjnb20j34x2ynfji63qibczn0mm2j76d01py304839bws"; + iosevka-etoile = "0fhcn69idb6w8abpmmvpdp9c08zdhy0zwn8nbyy9jcznwj8vwb7m"; + iosevka-slab = "0jlm3l13p9c965zx6z4df65lzxzj9yjjvpwlnx94ipayinxa1iff"; + iosevka-ss01 = "1i6bvslpxj87p3xi198l486ba40ixicdkmj29vcb1d7w1hhr6wnm"; + iosevka-ss02 = "1raczi1ja4barvjg5cp3j96kyph4aj8qlp9i10q7835sy29q3285"; + iosevka-ss03 = "0cn9hi5w9rx8xhbh9a75c7s9pxa3dkqfhd24lbp72hwfgv5nk1v0"; + iosevka-ss04 = "0v8fvif71604vyqanphq9mmlmx4xy0y2bykvplhrj1zmrj6v2ing"; + iosevka-ss05 = "1fh99av3ml2zhjvdif02r2f82n4hsswpgd2i42d964swjdplxdga"; + iosevka-ss06 = "0b0kl49djpc77qpmr1g2nzrg0q477xkjiqxb2i33pkrjsxn4vhn7"; + iosevka-ss07 = "1d2by3najsambqxyzapnmd200hah39jq0mqdalidb2kjh5lx9n6k"; + iosevka-ss08 = "05m03zn9pfl1khvl9xvgmlaygh1ni67lj2pc8zjgqydyls1vmxl4"; + iosevka-ss09 = "1hzglj7sclg6h4jc9ibb1777apl11885w1gpscv81b8n1h0qhnb7"; + iosevka-ss10 = "1fr52sclgp10k0lh86scjn3aylvsfnr7msg7jfsr3bkg61f5x1da"; + iosevka-ss11 = "1cmdjmlqvhn3qvqdfflwa4wgza364jn9gbj5vq8rsd6qili175ix"; + iosevka-ss12 = "0bk56hh9894z59rpkk5s9hhmkz1b2gmvfys46frijg3am54xh03q"; + iosevka-ss13 = "1kgxlxz1cdkzrfbnkavscf48im9lwiya9rcqlaa10k0ssas28br5"; + iosevka-ss14 = "06djgn86r2yy3ll2ask5mr9qhqibqzr7v95db5dzxcbz7hrmaaxf"; + iosevka-ss15 = "0qcld7h38c7cif518sa84x50igxjkh38ckav9qhhv7ls1n5h0jpm"; + iosevka-ss16 = "0qa6h8qx60rajbpp0v4wxia5n3yinp2nvwy2dsi1270prra7r49x"; + iosevka-ss17 = "1s04vlkll42am6w3lcka518zv2dlrwwnykdid0sp81najwmq0fk3"; } diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/core/rygel/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome-3/core/rygel/default.nix index 65096c359d..75b2bd2927 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome-3/core/rygel/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome-3/core/rygel/default.nix @@ -28,14 +28,14 @@ stdenv.mkDerivation rec { pname = "rygel"; - version = "0.40.0"; + version = "0.40.1"; # TODO: split out lib outputs = [ "out" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0xrbdsgm78h3g4qcvq2p8k70q31x9xdbb35bixz36q6h9s1wqznn"; + sha256 = "QkDXd1mcjNCeZ9pEzLOV0KbceEedgJzWIZgixbVooy0="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/games/tali/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome-3/games/tali/default.nix index 36c76c358e..b9409605f2 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome-3/games/tali/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome-3/games/tali/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "tali"; - version = "3.38.0"; + version = "3.38.3"; src = fetchurl { url = "mirror://gnome/sources/tali/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "196f6hiap61sdqr7kvywk74yl0m2j7fvqml37p6cgfm7gfrhrvi9"; + sha256 = "AhVCi1DEoIJ/sN4uTmum5WZ4+bp22NJbfuyoUhXyWjk="; }; passthru = { diff --git a/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-policykit/default.nix b/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-policykit/default.nix index fc4378d861..adda2339f3 100644 --- a/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-policykit/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/lxqt/lxqt-policykit/default.nix @@ -8,6 +8,7 @@ , qttools , qtx11extras , qtsvg +, polkit , polkit-qt , kwindowsystem , liblxqt @@ -38,6 +39,7 @@ mkDerivation rec { qttools qtx11extras qtsvg + polkit polkit-qt kwindowsystem liblxqt diff --git a/third_party/nixpkgs/pkgs/development/compilers/gambit/build.nix b/third_party/nixpkgs/pkgs/development/compilers/gambit/build.nix index a4b884147d..84d51a2bc3 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/gambit/build.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/gambit/build.nix @@ -25,10 +25,11 @@ gccStdenv.mkDerivation rec { inherit src version git-version; bootstrap = gambit-support.gambit-bootstrap; + nativeBuildInputs = [ git autoconf ]; # TODO: if/when we can get all the library packages we depend on to have static versions, # we could use something like (makeStaticLibraries openssl) to enable creation # of statically linked binaries by gsc. - buildInputs = [ git autoconf bootstrap openssl ]; + buildInputs = [ openssl ]; # TODO: patch gambit's source so it has the full path to sed, grep, fgrep? Is there more? # Or wrap relevant programs to add a suitable PATH ? @@ -62,11 +63,11 @@ gccStdenv.mkDerivation rec { lib.optional (!gccStdenv.isDarwin) "--enable-poll"; configurePhase = '' - export CC=${gcc}/bin/gcc \ - CXX=${gcc}/bin/g++ \ - CPP=${gcc}/bin/cpp \ - CXXCPP=${gcc}/bin/cpp \ - LD=${gcc}/bin/ld \ + export CC=${gccStdenv.cc.targetPrefix}gcc \ + CXX=${gccStdenv.cc.targetPrefix}g++ \ + CPP=${gccStdenv.cc.targetPrefix}cpp \ + CXXCPP=${gccStdenv.cc.targetPrefix}cpp \ + LD=${gccStdenv.cc.targetPrefix}ld \ XMKMF=${coreutils}/bin/false unset CFLAGS LDFLAGS LIBS CPPFLAGS CXXFLAGS @@ -76,22 +77,23 @@ gccStdenv.mkDerivation rec { # OS-specific paths are hardcoded in ./configure substituteInPlace config.status \ - --replace /usr/local/opt/openssl/lib "${openssl.out}/lib" \ - --replace /usr/local/opt/openssl@1.1/lib "${openssl.out}/lib" + --replace "/usr/local/opt/openssl@1.1" "${openssl.out}" \ + --replace "/usr/local/opt/openssl" "${openssl.out}" + ./config.status ''; buildPhase = '' # Make bootstrap compiler, from release bootstrap - mkdir -p boot && - cp -rp ${bootstrap}/gambit/. boot/. && - chmod -R u+w boot && - cd boot && - cp ../gsc/makefile.in ../gsc/*.scm gsc/ && # */ - ./configure && - for i in lib gsi gsc ; do (cd $i ; make -j$NIX_BUILD_CORES) ; done && - cd .. && - cp boot/gsc/gsc gsc-boot && + mkdir -p boot + cp -rp ${bootstrap}/gambit/. boot/. + chmod -R u+w boot + cd boot + cp ../gsc/makefile.in ../gsc/*.scm gsc/ + ./configure + for i in lib gsi gsc ; do (cd $i ; make -j$NIX_BUILD_CORES) ; done + cd .. + cp boot/gsc/gsc gsc-boot # Now use the bootstrap compiler to build the real thing! make -j$NIX_BUILD_CORES from-scratch diff --git a/third_party/nixpkgs/pkgs/development/compilers/gerbil/build.nix b/third_party/nixpkgs/pkgs/development/compilers/gerbil/build.nix index 8297dafff8..3d2fd7551e 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/gerbil/build.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/gerbil/build.nix @@ -1,4 +1,4 @@ -{ pkgs, gccStdenv, lib, coreutils, bash, # makeStaticLibraries, +{ pkgs, gccStdenv, lib, coreutils, openssl, zlib, sqlite, libxml2, libyaml, libmysqlclient, lmdb, leveldb, postgresql, version, git-version, gambit-support, diff --git a/third_party/nixpkgs/pkgs/development/compilers/mruby/default.nix b/third_party/nixpkgs/pkgs/development/compilers/mruby/default.nix index 25d35adff9..4d046cd7f8 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/mruby/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/mruby/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "mruby"; - version = "2.1.2"; + version = "3.0.0"; src = fetchFromGitHub { owner = "mruby"; repo = "mruby"; rev = version; - sha256 = "0fhfv8pi7i8jn2vgk2n2rjnbnfa12nhj514v8i4k353n7q4pmkh3"; + sha256 = "sha256-C3K7ZooaOMa+V2HjxwiKxrrMb7ffl4QAgPsftRtb60c="; }; nativeBuildInputs = [ ruby bison rake ]; diff --git a/third_party/nixpkgs/pkgs/development/compilers/vyper/default.nix b/third_party/nixpkgs/pkgs/development/compilers/vyper/default.nix index 81ee04edf0..d0bfa5b0b9 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/vyper/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/vyper/default.nix @@ -14,11 +14,11 @@ in buildPythonPackage rec { pname = "vyper"; - version = "0.2.8"; + version = "0.2.11"; src = fetchPypi { inherit pname version; - sha256 = "0d9fv630ayd1989qnklldh08vksa2lf0r06lm914qy5r5cvbl1v2"; + sha256 = "e763561a161c35c03b92a0c176096dd9b4c78ab003c2f08324d443f459b3de84"; }; nativeBuildInputs = [ pytestrunner ]; diff --git a/third_party/nixpkgs/pkgs/development/coq-modules/multinomials/default.nix b/third_party/nixpkgs/pkgs/development/coq-modules/multinomials/default.nix index 4958ad893e..dfa6a63571 100644 --- a/third_party/nixpkgs/pkgs/development/coq-modules/multinomials/default.nix +++ b/third_party/nixpkgs/pkgs/development/coq-modules/multinomials/default.nix @@ -1,5 +1,5 @@ { coq, mkCoqDerivation, mathcomp, mathcomp-finmap, mathcomp-bigenough, - lib, version ? null }: + lib, version ? null, useDune2 ? false }@args: with lib; mkCoqDerivation { namePrefix = [ "coq" "mathcomp" ]; @@ -7,12 +7,16 @@ with lib; mkCoqDerivation { owner = "math-comp"; inherit version; defaultVersion = with versions; switch [ coq.version mathcomp.version ] [ + { cases = [ (range "8.10" "8.13") "1.12.0" ]; out = "1.5.4"; } + { cases = [ (range "8.10" "8.12") "1.12.0" ]; out = "1.5.3"; } { cases = [ (range "8.7" "8.12") "1.11.0" ]; out = "1.5.2"; } { cases = [ (range "8.7" "8.11") (range "1.8" "1.10") ]; out = "1.5.0"; } { cases = [ (range "8.7" "8.10") (range "1.8" "1.10") ]; out = "1.4"; } { cases = [ "8.6" (range "1.6" "1.7") ]; out = "1.1"; } ] null; release = { + "1.5.4".sha256 = "0s4sbh4y88l125hdxahr56325hdhxxdmqmrz7vv8524llyv3fciq"; + "1.5.3".sha256 = "1462x40y2qydjd2wcg8r6qr8cx3xv4ixzh2h8vp9h7arylkja1qd"; "1.5.2".sha256 = "15aspf3jfykp1xgsxf8knqkxv8aav2p39c2fyirw7pwsfbsv2c4s"; "1.5.1".sha256 = "13nlfm2wqripaq671gakz5mn4r0xwm0646araxv0nh455p9ndjs3"; "1.5.0".sha256 = "064rvc0x5g7y1a0nip6ic91vzmq52alf6in2bc2dmss6dmzv90hw"; @@ -24,6 +28,8 @@ with lib; mkCoqDerivation { "1.0".sha256 = "1qmbxp1h81cy3imh627pznmng0kvv37k4hrwi2faa101s6bcx55m"; }; + useDune2ifVersion = versions.isGe "1.5.3"; + propagatedBuildInputs = [ mathcomp.ssreflect mathcomp.algebra mathcomp-finmap mathcomp-bigenough ]; @@ -32,3 +38,4 @@ with lib; mkCoqDerivation { license = licenses.cecill-c; }; } +// optionalAttrs (args?useDune2) { inherit useDune2; } diff --git a/third_party/nixpkgs/pkgs/development/interpreters/alda/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/alda/default.nix index 19e90a00e6..85c48ee201 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/alda/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/alda/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "alda"; - version = "1.4.3"; + version = "1.4.4"; src = fetchurl { url = "https://github.com/alda-lang/alda/releases/download/${version}/alda"; - sha256 = "1c9rbwb3ga8w7zi0ndqq02hjr4drdw8s509qxxd3fh5vfy6x3qi2"; + sha256 = "sha256-zIq8coSh4B9VGrixkQfhySK7qhlFG2p7O0suvbiScKY="; }; dontUnpack = true; diff --git a/third_party/nixpkgs/pkgs/development/interpreters/ceptre/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/ceptre/default.nix index a9b8f54ab8..c3fa6a645e 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/ceptre/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/ceptre/default.nix @@ -20,6 +20,6 @@ stdenv.mkDerivation { description = "A linear logic programming language for modeling generative interactive systems"; homepage = "https://github.com/chrisamaphone/interactive-lp"; maintainers = with maintainers; [ pSub ]; - platforms = with platforms; linux; + platforms = platforms.unix; }; } diff --git a/third_party/nixpkgs/pkgs/development/interpreters/duktape/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/duktape/default.nix index f864f5bf6f..360666d898 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/duktape/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/duktape/default.nix @@ -8,6 +8,14 @@ stdenv.mkDerivation rec { sha256 = "19szwxzvl2g65fw95ggvb8h0ma5bd9vvnnccn59hwnc4dida1x4n"; }; + postPatch = '' + substituteInPlace Makefile.sharedlibrary \ + --replace 'gcc' '${stdenv.cc.targetPrefix}cc' \ + --replace 'g++' '${stdenv.cc.targetPrefix}c++' + substituteInPlace Makefile.cmdline \ + --replace 'gcc' '${stdenv.cc.targetPrefix}cc' \ + --replace 'g++' '${stdenv.cc.targetPrefix}c++' + ''; buildPhase = '' make -f Makefile.sharedlibrary make -f Makefile.cmdline @@ -27,6 +35,6 @@ stdenv.mkDerivation rec { downloadPage = "https://duktape.org/download.html"; license = licenses.mit; maintainers = [ maintainers.fgaz ]; - platforms = platforms.linux; + platforms = platforms.all; }; } diff --git a/third_party/nixpkgs/pkgs/development/interpreters/evcxr/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/evcxr/default.nix index fa428b9833..7f248c8d43 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/evcxr/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/evcxr/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "evcxr"; - version = "0.7.0"; + version = "0.8.1"; src = fetchFromGitHub { owner = "google"; repo = "evcxr"; rev = "v${version}"; - sha256 = "sha256-33XeepqwYmTMcObroPTuxykYuM9qYI1+LV5lZIFSomg="; + sha256 = "sha256-5YbvPDyGaoKPelLep2tVica08SI7Cyo9SLMnE6dmWe4="; }; - cargoSha256 = "sha256-tjCID3YeGkxcq/LqJDMHGNpv1MCXKtcLlDnNkFwx1zU="; + cargoSha256 = "sha256-hqVmNBrvagqhGPWTaBXuY8lULolWIoR5ovEhH5k1tz4="; RUST_SRC_PATH = "${rustPlatform.rustLibSrc}"; diff --git a/third_party/nixpkgs/pkgs/development/interpreters/jruby/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/jruby/default.nix index 7fe50a124e..be1a1a15c8 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/jruby/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/jruby/default.nix @@ -23,7 +23,7 @@ jruby = stdenv.mkDerivation rec { for i in $out/bin/jruby{,.bash}; do wrapProgram $i \ - --set JAVA_HOME ${jre} + --set JAVA_HOME ${jre.home} done ln -s $out/bin/jruby $out/bin/ruby diff --git a/third_party/nixpkgs/pkgs/development/interpreters/metamath/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/metamath/default.nix index a2b94667a6..d5c021a815 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/metamath/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/metamath/default.nix @@ -1,12 +1,10 @@ { lib, stdenv, fetchFromGitHub, autoreconfHook }: -let - version = "0.196"; -in stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "metamath"; - inherit version; + version = "0.196"; - buildInputs = [ autoreconfHook ]; + nativeBuildInputs = [ autoreconfHook ]; src = fetchFromGitHub { owner = "metamath"; @@ -25,7 +23,7 @@ in stdenv.mkDerivation { ''; homepage = "http://us.metamath.org"; downloadPage = "http://us.metamath.org/#downloads"; - license = licenses.gpl2Only; + license = licenses.gpl2Plus; maintainers = [ maintainers.taneb ]; platforms = platforms.all; }; diff --git a/third_party/nixpkgs/pkgs/development/interpreters/mujs/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/mujs/default.nix index 5e600a92fb..a0e23614eb 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/mujs/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/mujs/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "mujs"; - version = "1.0.7"; + version = "1.0.9"; src = fetchurl { url = "https://mujs.com/downloads/mujs-${version}.tar.xz"; - sha256 = "1ilhay15z4k7mlzs6g2d00snivin7vp72dfw5wwpmc0x70jr31l2"; + sha256 = "sha256-zKjWafQtO2OEPelF370s5KkArbT+gQv3lQQpYdGw6HY="; }; buildInputs = [ readline ]; diff --git a/third_party/nixpkgs/pkgs/development/interpreters/sollya/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/sollya/default.nix new file mode 100644 index 0000000000..5c439347f0 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/interpreters/sollya/default.nix @@ -0,0 +1,29 @@ +{ lib +, stdenv +, fetchurl +, gmp +, mpfr +, mpfi +, libxml2 +, fplll +}: + +stdenv.mkDerivation rec { + pname = "sollya"; + version = "7.0"; + + src = fetchurl { + url = "https://www.sollya.org/releases/sollya-${version}/sollya-${version}.tar.gz"; + sha256 = "0amrxg7567yy5xqpgchxggjpfr11xyl27vy29c7vlh7v8a17nj1h"; + }; + + buildInputs = [ gmp mpfr mpfi libxml2 fplll ]; + + meta = with lib; { + description = "A tool environment for safe floating-point code development"; + homepage = "https://www.sollya.org/"; + license = licenses.cecill-c; + platforms = platforms.linux; + maintainers = with maintainers; [ eduardosm ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/interpreters/tinyscheme/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/tinyscheme/default.nix index 8dd27b3f00..3d4cfea465 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/tinyscheme/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/tinyscheme/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "tinyscheme"; - version = "1.41"; + version = "1.42"; src = fetchurl { url = "mirror://sourceforge/tinyscheme/${pname}-${version}.tar.gz"; - sha256 = "168rk4zrlhsknbvldq2jsgabpwlqkx6la44gkqmijmf7jhs11h7a"; + sha256 = "sha256-F7Cxv/0i89SdWDPiKhILM5A50s/aC0bW/FHdLwG0B60="; }; patchPhase = '' diff --git a/third_party/nixpkgs/pkgs/development/libraries/arb/default.nix b/third_party/nixpkgs/pkgs/development/libraries/arb/default.nix index 527545e683..97af236af0 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/arb/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/arb/default.nix @@ -1,14 +1,21 @@ -{ lib, stdenv, fetchFromGitHub, mpir, gmp, mpfr, flint }: +{ lib +, stdenv +, fetchFromGitHub +, mpir +, gmp +, mpfr +, flint +}: stdenv.mkDerivation rec { pname = "arb"; - version = "2.17.0"; + version = "2.19.0"; src = fetchFromGitHub { owner = "fredrik-johansson"; repo = pname; rev = version; - sha256 = "05lpy3hkl5f8ik19aw40cqydrb932xaf2n8hbq9ib5dnk7f010p1"; + sha256 = "sha256-J/LQVZ8gmssazE7ru89EtvW6cVjaLEHgUHuwjW1nuOE="; }; buildInputs = [ mpir gmp mpfr flint ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/backward-cpp/default.nix b/third_party/nixpkgs/pkgs/development/libraries/backward-cpp/default.nix index af727e394d..03f49c3ee5 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/backward-cpp/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/backward-cpp/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { description = "Beautiful stack trace pretty printer for C++"; homepage = "https://github.com/bombela/backward-cpp"; license = licenses.mit; - platforms = platforms.linux; + platforms = platforms.all; maintainers = with maintainers; [ cstrahan ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/brigand/default.nix b/third_party/nixpkgs/pkgs/development/libraries/brigand/default.nix index eb46ccc8cd..3c0778de1d 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/brigand/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/brigand/default.nix @@ -21,6 +21,6 @@ stdenv.mkDerivation { homepage = "https://github.com/edouarda/brigand"; license = licenses.boost; maintainers = with maintainers; [ pmiddend ]; - platforms = platforms.linux; + platforms = platforms.all; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/cminpack/default.nix b/third_party/nixpkgs/pkgs/development/libraries/cminpack/default.nix index 39d4849f38..10d0686043 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/cminpack/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/cminpack/default.nix @@ -8,8 +8,12 @@ stdenv.mkDerivation rec { sha256 = "17yh695aim508x1kn9zf6g13jxwk3pi3404h5ix4g5lc60hzs1rw"; }; - patchPhase = '' - sed -i s,/usr/local,$out, Makefile + postPatch = '' + substituteInPlace Makefile \ + --replace '/usr/local' '${placeholder "out"}' \ + --replace 'gcc' '${stdenv.cc.targetPrefix}cc' \ + --replace 'ranlib -t' '${stdenv.cc.targetPrefix}ranlib' \ + --replace 'ranlib' '${stdenv.cc.targetPrefix}ranlib' ''; preInstall = '' @@ -20,7 +24,7 @@ stdenv.mkDerivation rec { homepage = "http://devernay.free.fr/hacks/cminpack/cminpack.html"; license = lib.licenses.bsd3; description = "Software for solving nonlinear equations and nonlinear least squares problems"; - platforms = lib.platforms.linux; + platforms = lib.platforms.all; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/croaring/default.nix b/third_party/nixpkgs/pkgs/development/libraries/croaring/default.nix index b9c293edfb..5c1afcbf13 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/croaring/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/croaring/default.nix @@ -23,6 +23,6 @@ stdenv.mkDerivation rec { homepage = "http://roaringbitmap.org/"; license = licenses.asl20; maintainers = with maintainers; [ orivej ]; - platforms = platforms.linux; + platforms = platforms.all; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/ethash/default.nix b/third_party/nixpkgs/pkgs/development/libraries/ethash/default.nix index 0a10fa3c48..2c9eb3ca44 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/ethash/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/ethash/default.nix @@ -40,7 +40,7 @@ stdenv.mkDerivation rec { meta = with lib; { description = "PoW algorithm for Ethereum 1.0 based on Dagger-Hashimoto"; homepage = "https://github.com/ethereum/ethash"; - platforms = [ "x86_64-linux" ]; + platforms = platforms.unix; maintainers = with maintainers; [ nand0p ]; license = licenses.asl20; }; diff --git a/third_party/nixpkgs/pkgs/development/libraries/gensio/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gensio/default.nix index 4efc713bb1..aef412468a 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gensio/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gensio/default.nix @@ -34,6 +34,6 @@ stdenv.mkDerivation rec { homepage = "https://sourceforge.net/projects/ser2net/"; license = licenses.gpl2; maintainers = with maintainers; [ emantor ]; - platforms = with platforms; linux; + platforms = platforms.unix; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/intel-media-driver/default.nix b/third_party/nixpkgs/pkgs/development/libraries/intel-media-driver/default.nix index 01c6ef002e..e9d389bfc1 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/intel-media-driver/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/intel-media-driver/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "intel-media-driver"; - version = "21.1.1"; + version = "21.1.2"; src = fetchFromGitHub { owner = "intel"; repo = "media-driver"; rev = "intel-media-${version}"; - sha256 = "1cgmpy2wqhv8zljz73wm4rggpk9w1prpmab5qphfp7ljajfv7k8r"; + sha256 = "17g9xilcrpmkn6higgpvd9bly1h61xxyp1kx9zwl6rgzs2pryby2"; }; cmakeFlags = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/java/commons/lang/default.nix b/third_party/nixpkgs/pkgs/development/libraries/java/commons/lang/default.nix index 5009fe6cac..974f7bf9a1 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/java/commons/lang/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/java/commons/lang/default.nix @@ -1,12 +1,12 @@ { lib, stdenv, fetchurl }: stdenv.mkDerivation rec { - version = "3.11"; + version = "3.12.0"; pname = "commons-lang"; src = fetchurl { url = "mirror://apache/commons/lang/binaries/commons-lang3-${version}-bin.tar.gz"; - sha256 = "08w7zg9v48rlaq0n17dnph8jydz9srh1pl3ffs3xdfsg9a7axjm4"; + sha256 = "sha256-MwEkZd/Lf3kKyjM+CevxBeKl+5XCxjiz33kNPvqQjig="; }; installPhase = '' diff --git a/third_party/nixpkgs/pkgs/development/libraries/libbap/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libbap/default.nix index b8e71c2dfd..c15de88f6a 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libbap/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libbap/default.nix @@ -12,6 +12,11 @@ stdenv.mkDerivation { sha256 = "0m4spva3z6fgbwlg4zq53l5p227dic893q2qq65pvzxyf7k7nmil"; }; + postPatch = '' + substituteInPlace Makefile.in \ + --replace "-linkpkg" "-thread -linkpkg" + ''; + nativeBuildInputs = [ autoreconfHook which ]; buildInputs = [ ocaml bap findlib ctypes ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libqb/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libqb/default.nix index f5f255b111..73938bd8f9 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libqb/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libqb/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libqb"; - version = "2.0.2"; + version = "2.0.3"; src = fetchFromGitHub { owner = "ClusterLabs"; repo = pname; rev = "v${version}"; - sha256 = "1gpfcz84igqncky09hdibxmzapzl37y8914avgq89rsizynj1wsm"; + sha256 = "sha256-a9CnqfrQUL0DdPPOJjfh9tQ0O8iRHPP3iBmy3MKvt/0="; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/librsb/default.nix b/third_party/nixpkgs/pkgs/development/libraries/librsb/default.nix new file mode 100644 index 0000000000..ef8b9ee441 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/librsb/default.nix @@ -0,0 +1,86 @@ +{ lib, stdenv, fetchurl +, gfortran +, pkg-config, libtool +, m4, gnum4 +, file +# Memory Hierarchy (End-user can provide this.) +, memHierarchy ? "" +# Headers/Libraries +, blas, zlib +# RPC headers (rpc/xdr.h) +, openmpi +, help2man +, doxygen +, octave +}: + +stdenv.mkDerivation rec { + pname = "librsb"; + version = "1.2.0.9"; + + src = fetchurl { + url = "mirror://sourceforge/${pname}/${pname}-${version}.tar.gz"; + sha256 = "1ynrsgnvv1jfm8dv3jwjrip9x9icxv7w3qrk149025j6fbaza8gl"; + }; + + # The default configure flags are still present when building + # --disable-static --disable-dependency-tracking + # Along with the --prefix=... flag (but we want that one). + configureFlags = [ + "--enable-static" + "--enable-doc-build" + "--enable-octave-testing" + "--enable-sparse-blas-interface" + "--enable-fortran-module-install" + "--enable-pkg-config-install" + "--enable-matrix-types=all" + "--with-zlib=${zlib}/lib/libz.so" + "--with-memhinfo=${memHierarchy}" + ]; + + # Ensure C/Fortran code is position-independent. + NIX_CFLAGS_COMPILE = [ "-fPIC" "-Ofast" ]; + FCFLAGS = [ "-fPIC" "-Ofast" ]; + + enableParallelBuilding = true; + + nativeBuildInputs = [ + gfortran + pkg-config libtool + m4 gnum4 + file + blas zlib + openmpi + octave + help2man # Turn "--help" into a man-page + doxygen # Build documentation + ]; + + # Need to run cleanall target to remove any previously-generated files. + preBuild = '' + make cleanall + ''; + + checkInputs = [ + octave + ]; + checkTarget = "tests"; + + meta = with lib; { + homepage = "http://librsb.sourceforge.net/"; + description = "Shared memory parallel sparse matrix and sparse BLAS library"; + longDescription = '' + Library for sparse matrix computations featuring the Recursive Sparse + Blocks (RSB) matrix format. This format allows cache efficient and + multi-threaded (that is, shared memory parallel) operations on large + sparse matrices. + librsb implements the Sparse BLAS standard, as specified in the BLAS + Forum documents. + Contains libraries and header files for developing applications that + want to make use of librsb. + ''; + license = with licenses; [ lgpl3Plus ]; + maintainers = with maintainers; [ KarlJoad ]; + platforms = platforms.all; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/libraries/liburing/default.nix b/third_party/nixpkgs/pkgs/development/libraries/liburing/default.nix index 6a94f37181..10554cb528 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/liburing/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/liburing/default.nix @@ -4,12 +4,12 @@ stdenv.mkDerivation rec { pname = "liburing"; - version = "0.7"; + version = "2.0"; src = fetchgit { url = "http://git.kernel.dk/${pname}"; rev = "liburing-${version}"; - sha256 = "15z44l7y4c6s6dlf7v8lq4znlsjbja2r4ifbni0l8cdcnq0w3zh3"; + sha256 = "0has1yd1ns5q5jgcmhrbgwhbwq0wix3p7xv3dyrwdf784p56izkn"; }; separateDebugInfo = true; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libwebsockets/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libwebsockets/default.nix index 33c1cecfbc..f88f5614cc 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libwebsockets/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libwebsockets/default.nix @@ -20,7 +20,7 @@ let "-DLWS_WITH_PLUGINS=ON" "-DLWS_WITH_IPV6=ON" "-DLWS_WITH_SOCKS5=ON" - ]; + ] ++ lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) "-DLWS_WITHOUT_TESTAPPS=ON"; NIX_CFLAGS_COMPILE = lib.optionalString stdenv.cc.isGNU "-Wno-error=unused-but-set-variable"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/lyra/default.nix b/third_party/nixpkgs/pkgs/development/libraries/lyra/default.nix index 9f5fd1d3a3..ed02af56f7 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/lyra/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/lyra/default.nix @@ -25,7 +25,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://github.com/bfgroup/Lyra"; description = "A simple to use, composable, command line parser for C++ 11 and beyond"; - platforms = platforms.linux; + platforms = platforms.unix; license = licenses.boost; maintainers = with maintainers; [ davidtwco ]; }; diff --git a/third_party/nixpkgs/pkgs/development/libraries/mauikit/default.nix b/third_party/nixpkgs/pkgs/development/libraries/mauikit/default.nix new file mode 100644 index 0000000000..38e938080b --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/mauikit/default.nix @@ -0,0 +1,42 @@ +{ lib +, mkDerivation +, fetchFromGitLab +, cmake +, extra-cmake-modules +, kio +, qtbase +, qtquickcontrols2 +, syntax-highlighting +}: + +mkDerivation rec { + pname = "mauikit"; + version = "1.2.1"; + + src = fetchFromGitLab { + domain = "invent.kde.org"; + owner = "maui"; + repo = "mauikit"; + rev = "v${version}"; + sha256 = "1wimbpbn9yqqdcjd59x83z0mw2fycjz09py2rwimfi8ldmvi5lgy"; + }; + + nativeBuildInputs = [ + cmake + extra-cmake-modules + ]; + + buildInputs = [ + kio + qtquickcontrols2 + syntax-highlighting + ]; + + meta = with lib; { + homepage = "https://mauikit.org/"; + description = "Free and modular front-end framework for developing fast and compelling user experiences"; + license = licenses.lgpl2Plus; + maintainers = with maintainers; [ dotlambda ]; + broken = versionOlder qtbase.version "5.14.0"; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/libraries/mediastreamer/default.nix b/third_party/nixpkgs/pkgs/development/libraries/mediastreamer/default.nix index 6cdc24770d..6321e35f7f 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/mediastreamer/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/mediastreamer/default.nix @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { pname = "mediastreamer2"; - version = "4.4.24"; + version = "4.4.32"; src = fetchFromGitLab { domain = "gitlab.linphone.org"; @@ -41,7 +41,7 @@ stdenv.mkDerivation rec { group = "BC"; repo = pname; rev = version; - sha256 = "sha256-wAWcSvsLRzscpx9YAnBcsoYuy+77yJrU3+cNbRu0i7U="; + sha256 = "sha256-kaNQuhxsUx74hBhfpB76NuNTT+8h74nfiv1re43tHps="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/nemo-qml-plugin-dbus/default.nix b/third_party/nixpkgs/pkgs/development/libraries/nemo-qml-plugin-dbus/default.nix index 5a680b9da9..a07a692f29 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/nemo-qml-plugin-dbus/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/nemo-qml-plugin-dbus/default.nix @@ -2,14 +2,14 @@ mkDerivation rec { pname = "nemo-qml-plugin-dbus"; - version = "2.1.23"; + version = "2.1.24"; src = fetchFromGitLab { domain = "git.sailfishos.org"; owner = "mer-core"; repo = "nemo-qml-plugin-dbus"; rev = version; - sha256 = "0ww478ds7a6h4naa7vslj6ckn9cpsgcml0q7qardkzmdmxsrv1ag"; + sha256 = "1ilg929456d3k0xkvxa5r4k7i4kkw9i8kgah5xx1yq0d9wka0l77"; }; nativeBuildInputs = [ qmake ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/openmpi/default.nix b/third_party/nixpkgs/pkgs/development/libraries/openmpi/default.nix index 802685970a..46b2748cad 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/openmpi/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/openmpi/default.nix @@ -18,7 +18,7 @@ assert !cudaSupport || cudatoolkit != null; let - version = "4.0.5"; + version = "4.1.0"; cudatoolkit_joined = symlinkJoin { name = "${cudatoolkit.name}-unsplit"; @@ -30,7 +30,7 @@ in stdenv.mkDerivation rec { src = with lib.versions; fetchurl { url = "https://www.open-mpi.org/software/ompi/v${major version}.${minor version}/downloads/${pname}-${version}.tar.bz2"; - sha256 = "02f0r9d3xgs08svkmj8v7lzviyxqnkk4yd3z0wql550xnriki3y5"; + sha256 = "sha256-c4Zvt3CQgZtqjIXLhTljjTfWh3RVglt04onWR6Of1bU="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/libraries/openpa/default.nix b/third_party/nixpkgs/pkgs/development/libraries/openpa/default.nix index bc8efdc857..23f025e2aa 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/openpa/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/openpa/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { homepage = "https://trac.mpich.org/projects/openpa"; license = lib.licenses.mit; maintainers = with lib.maintainers; [ leenaars ]; - platforms = with lib.platforms; linux; + platforms = lib.platforms.unix; longDescription = '' OPA (or sometimes OpenPA or Open Portable Atomics) is an open source library intended to provide a consistent C API for performing diff --git a/third_party/nixpkgs/pkgs/development/libraries/ortp/default.nix b/third_party/nixpkgs/pkgs/development/libraries/ortp/default.nix index d9d26d0b53..2b99f29f4c 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/ortp/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/ortp/default.nix @@ -6,7 +6,7 @@ stdenv.mkDerivation rec { pname = "ortp"; - version = "4.4.24"; + version = "4.4.32"; src = fetchFromGitLab { domain = "gitlab.linphone.org"; @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { group = "BC"; repo = pname; rev = version; - sha256 = "sha256-jM2kRInti7lG72bSTbdVZLshb3gvgm2EccnZNwzi8UU="; + sha256 = "sha256-tcSrDfo1AZM7yQarwfV4n6p1UOShXGKjMW5u57/cM+Q="; }; # Do not build static libraries diff --git a/third_party/nixpkgs/pkgs/development/libraries/qtutilities/default.nix b/third_party/nixpkgs/pkgs/development/libraries/qtutilities/default.nix index f5398d92df..99cf50a7ba 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/qtutilities/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/qtutilities/default.nix @@ -5,18 +5,17 @@ , qttools , qtbase , cmake -, pkg-config }: stdenv.mkDerivation rec { pname = "qtutilities"; - version = "6.3.0"; + version = "6.3.3"; src = fetchFromGitHub { owner = "Martchus"; repo = pname; rev = "v${version}"; - sha256 = "sha256-vHx2JMPqioY8jUpBOIFdhhN1mIUV3LS8ayQOo3g7bY0="; + sha256 = "sha256-RoI1huVei4SmAUhuYruzgod0/qIlnrZSHEMceQc2jzc="; }; buildInputs = [ qtbase cpp-utilities ]; @@ -27,7 +26,7 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "https://github.com/Martchus/qtutilities"; description = "Common C++ classes and routines used by @Martchus' applications featuring argument parser, IO and conversion utilities"; - license = licenses.gpl2; + license = licenses.gpl2Plus; maintainers = with maintainers; [ doronbehar ]; platforms = platforms.linux; }; diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/math/rankwidth/default.nix b/third_party/nixpkgs/pkgs/development/libraries/science/math/rankwidth/default.nix index 38c9444d0d..c00d579702 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/science/math/rankwidth/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/science/math/rankwidth/default.nix @@ -4,18 +4,18 @@ stdenv.mkDerivation rec { pname = "rankwidth"; - version = "0.7"; + version = "0.9"; src = fetchurl { url = "mirror://sageupstream/rw/rw-${version}.tar.gz"; - sha256 = "1rv2v42x2506x7f10349m1wpmmfxrv9l032bkminni2gbip9cjg0"; + sha256 = "sha256-weA1Bv4lzfy0KMBR/Fay0q/7Wwb7o/LOdWYxRmvvtEE="; }; configureFlags = [ "--enable-executable=no" # no igraph dependency ]; - # check phase is empty for now (as of version 0.7) + # check phase is empty for now (as of version 0.9) doCheck = true; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/math/sympow/clean-extra-logfile-output-from-pari.patch b/third_party/nixpkgs/pkgs/development/libraries/science/math/sympow/clean-extra-logfile-output-from-pari.patch new file mode 100644 index 0000000000..cbcf18b4cd --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/science/math/sympow/clean-extra-logfile-output-from-pari.patch @@ -0,0 +1,39 @@ +commit 433a8b99da9d71e96434bd421c2468cbda29d37c +Author: Mauricio Collares +Date: Tue Mar 2 22:07:11 2021 -0300 + + trim logfile information from pari 2.13 output + + Pari (since commit 609fb01faf827d91dfa9136849a647a3bbfe8036) prints + extra logfile information such as + + [logfile is "/tmp/nix-shell.2BquN9/home/.sympow/datafiles/P02HM.txt"] + + which messes up sympow's parsing. This commit reuses the same trimming + mechanism already in sympow to trim this new message. + +diff --git a/Configure b/Configure +index 1ef9756..776bec2 100755 +--- a/Configure ++++ b/Configure +@@ -322,7 +322,7 @@ echo "datafiles/param_data: \$(OTHERb)" >> $FILE + echo " \$(MKDIR) -p datafiles" >> $FILE + echo " \$(TOUCH) datafiles/param_data" >> $FILE + echo " \$(SH) armd.sh" >> $FILE +-echo " \$(SED) -i -e '/logfile =/d' datafiles/*.txt" >> $FILE ++echo " \$(SED) -i -e '/logfile /d' datafiles/*.txt" >> $FILE + echo "sympow.1: sympow" >> $FILE + echo " \$(HELP2MAN) \$(H2MFLAGS) -s 1 -n \"SYMPOW program\" -I sympow.h2m -o \$@ ./\$<" >> $FILE + echo "clean:" >> $FILE +diff --git a/generate.c b/generate.c +index dbb811f..783320c 100644 +--- a/generate.c ++++ b/generate.c +@@ -148,6 +148,7 @@ static void trimit(char *A) + " -e '" + "/^\?/d" ";" + "/^(/d" ";" ++ "/logfile /d" ";" + "/Warning:/d" ";" + "/^About to find TOO_BIG/d" ";" + "/^Now working backwards/d" ";" diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/math/sympow/default.nix b/third_party/nixpkgs/pkgs/development/libraries/science/math/sympow/default.nix index 3c31ed8a36..c31c705d39 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/science/math/sympow/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/science/math/sympow/default.nix @@ -20,6 +20,8 @@ stdenv.mkDerivation rec { sha256 = "132l0xv00ld1svvv9wh99wfra4zzjv2885h2sq0dsl98wiyvi5zl"; }; + patches = [ ./clean-extra-logfile-output-from-pari.patch ]; + postUnpack = '' patchShebangs . ''; diff --git a/third_party/nixpkgs/pkgs/development/libraries/telepathy/glib/default.nix b/third_party/nixpkgs/pkgs/development/libraries/telepathy/glib/default.nix index 8bb7522b19..9ab269aaac 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/telepathy/glib/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/telepathy/glib/default.nix @@ -1,24 +1,49 @@ -{ lib, stdenv, fetchurl, dbus-glib, glib, python2, pkg-config, libxslt -, gobject-introspection, vala, glibcLocales }: +{ lib +, stdenv +, fetchurl +, dbus-glib +, glib +, python3 +, pkg-config +, libxslt +, gobject-introspection +, vala +, glibcLocales +}: stdenv.mkDerivation rec { - name = "telepathy-glib-0.24.1"; + pname = "telepathy-glib"; + version = "0.24.2"; outputs = [ "out" "dev" ]; src = fetchurl { - url = "${meta.homepage}/releases/telepathy-glib/${name}.tar.gz"; - sha256 = "1symyzbjmxvksn2ifdkk50lafjm2llf2sbmky062gq2pz3cg23cy"; + url = "${meta.homepage}/releases/telepathy-glib/${pname}-${version}.tar.gz"; + sha256 = "sKN013HN0IESXzjDq9B5ZXZCMBxxpUPVVeK/IZGSc/A="; }; + nativeBuildInputs = [ + pkg-config + libxslt + gobject-introspection + vala + ]; + + buildInputs = [ + glibcLocales + python3 + ]; + + propagatedBuildInputs = [ + dbus-glib + glib + ]; + configureFlags = [ "--enable-vala-bindings" ]; - LC_ALL = "en_US.UTF-8"; - propagatedBuildInputs = [ dbus-glib glib ]; - nativeBuildInputs = [ pkg-config libxslt gobject-introspection vala ]; - buildInputs = [ glibcLocales python2 ]; + LC_ALL = "en_US.UTF-8"; enableParallelBuilding = true; @@ -26,8 +51,6 @@ stdenv.mkDerivation rec { substituteInPlace telepathy-glib/telepathy-glib.pc.in --replace Requires.private Requires ''; - passthru.python = python2; - meta = with lib; { homepage = "https://telepathy.freedesktop.org"; platforms = platforms.unix; diff --git a/third_party/nixpkgs/pkgs/development/libraries/tepl/default.nix b/third_party/nixpkgs/pkgs/development/libraries/tepl/default.nix index d9d7408173..84d50faf54 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/tepl/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/tepl/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "tepl"; - version = "5.0.0"; + version = "5.0.1"; outputs = [ "out" "dev" ]; src = fetchurl { url = "mirror://gnome/sources/${pname}/${lib.versions.majorMinor version}/${pname}-${version}.tar.xz"; - sha256 = "0x2s0ks575b57jdqnp9r9miz40pm705n2dlj2k8bfj1hyl22kgf6"; + sha256 = "sSdJZ2CfUkSEs4d1+p7LKWxtZhaqvQUvKGM5oomRKAQ="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/wxwidgets/3.0/default.nix b/third_party/nixpkgs/pkgs/development/libraries/wxwidgets/3.0/default.nix index a1c2820a5f..30e807cde0 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/wxwidgets/3.0/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/wxwidgets/3.0/default.nix @@ -4,41 +4,38 @@ , xorgproto, gst_all_1, setfile , libGLSupported ? lib.elem stdenv.hostPlatform.system lib.platforms.mesaPlatforms , withMesa ? libGLSupported -, libGLU ? null, libGL ? null +, libGLU, libGL , compat24 ? false, compat26 ? true, unicode ? true , withGtk2 ? true -, withWebKit ? false, webkitgtk ? null -, AGL ? null, Carbon ? null, Cocoa ? null, Kernel ? null, QTKit ? null +, withWebKit ? false, webkitgtk +, AGL, Carbon, Cocoa, Kernel, QTKit }: with lib; -assert withMesa -> libGLU != null && libGL != null; -assert withWebKit -> webkitgtk != null; - assert assertMsg (withGtk2 -> withWebKit == false) "wxGTK30: You cannot enable withWebKit when using withGtk2."; stdenv.mkDerivation rec { - version = "3.0.4"; pname = "wxwidgets"; + version = "3.0.5"; src = fetchFromGitHub { owner = "wxWidgets"; repo = "wxWidgets"; rev = "v${version}"; - sha256 = "19mqglghjjqjgz4rbybn3qdgn2cz9xc511nq1pvvli9wx2k8syl1"; + sha256 = "1l33629ifx2dl2j71idqbd2qb6zb1d566ijpkvz6irrr50s6gbx7"; }; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ libXinerama libSM libXxf86vm xorgproto gst_all_1.gstreamer gst_all_1.gst-plugins-base - ] ++ optionals withGtk2 [ gtk2 ] + ] ++ optional withGtk2 gtk2 ++ optional (!withGtk2) gtk3 ++ optional withMesa libGLU ++ optional withWebKit webkitgtk ++ optionals stdenv.isDarwin [ setfile Carbon Cocoa Kernel QTKit ]; - nativeBuildInputs = [ pkg-config ]; - propagatedBuildInputs = optional stdenv.isDarwin AGL; patches = [ diff --git a/third_party/nixpkgs/pkgs/development/mobile/cocoapods/Gemfile-beta.lock b/third_party/nixpkgs/pkgs/development/mobile/cocoapods/Gemfile-beta.lock index 9c5e10d3a4..6f4522ebf1 100644 --- a/third_party/nixpkgs/pkgs/development/mobile/cocoapods/Gemfile-beta.lock +++ b/third_party/nixpkgs/pkgs/development/mobile/cocoapods/Gemfile-beta.lock @@ -1,8 +1,8 @@ GEM remote: https://rubygems.org/ specs: - CFPropertyList (3.0.2) - activesupport (5.2.4.4) + CFPropertyList (3.0.3) + activesupport (5.2.4.5) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 0.7, < 2) minitest (~> 5.1) @@ -14,10 +14,10 @@ GEM json (>= 1.5.1) atomos (0.1.3) claide (1.0.3) - cocoapods (1.10.0) + cocoapods (1.10.1) addressable (~> 2.6) claide (>= 1.0.2, < 2.0) - cocoapods-core (= 1.10.0) + cocoapods-core (= 1.10.1) cocoapods-deintegrate (>= 1.0.3, < 2.0) cocoapods-downloader (>= 1.4.0, < 2.0) cocoapods-plugins (>= 1.0.0, < 2.0) @@ -32,7 +32,7 @@ GEM nap (~> 1.0) ruby-macho (~> 1.4) xcodeproj (>= 1.19.0, < 2.0) - cocoapods-core (1.10.0) + cocoapods-core (1.10.1) activesupport (> 5.0, < 6) addressable (~> 2.6) algoliasearch (~> 1.0) @@ -52,19 +52,19 @@ GEM netrc (~> 0.11) cocoapods-try (1.2.0) colored2 (3.1.2) - concurrent-ruby (1.1.7) + concurrent-ruby (1.1.8) escape (0.0.4) ethon (0.12.0) ffi (>= 1.3.0) - ffi (1.13.1) + ffi (1.15.0) fourflusher (2.3.1) fuzzy_match (2.0.4) gh_inspector (1.1.3) httpclient (2.8.3) - i18n (1.8.5) + i18n (1.8.9) concurrent-ruby (~> 1.0) - json (2.3.1) - minitest (5.14.2) + json (2.5.1) + minitest (5.14.4) molinillo (0.6.6) nanaimo (0.3.0) nap (1.1.0) @@ -74,7 +74,7 @@ GEM thread_safe (0.3.6) typhoeus (1.4.0) ethon (>= 0.9.0) - tzinfo (1.2.7) + tzinfo (1.2.9) thread_safe (~> 0.1) xcodeproj (1.19.0) CFPropertyList (>= 2.3.3, < 4.0) diff --git a/third_party/nixpkgs/pkgs/development/mobile/cocoapods/Gemfile.lock b/third_party/nixpkgs/pkgs/development/mobile/cocoapods/Gemfile.lock index d4de7cd698..cf718b02c0 100644 --- a/third_party/nixpkgs/pkgs/development/mobile/cocoapods/Gemfile.lock +++ b/third_party/nixpkgs/pkgs/development/mobile/cocoapods/Gemfile.lock @@ -1,8 +1,8 @@ GEM remote: https://rubygems.org/ specs: - CFPropertyList (3.0.2) - activesupport (5.2.4.4) + CFPropertyList (3.0.3) + activesupport (5.2.4.5) concurrent-ruby (~> 1.0, >= 1.0.2) i18n (>= 0.7, < 2) minitest (~> 5.1) @@ -14,10 +14,10 @@ GEM json (>= 1.5.1) atomos (0.1.3) claide (1.0.3) - cocoapods (1.10.0) + cocoapods (1.10.1) addressable (~> 2.6) claide (>= 1.0.2, < 2.0) - cocoapods-core (= 1.10.0) + cocoapods-core (= 1.10.1) cocoapods-deintegrate (>= 1.0.3, < 2.0) cocoapods-downloader (>= 1.4.0, < 2.0) cocoapods-plugins (>= 1.0.0, < 2.0) @@ -32,7 +32,7 @@ GEM nap (~> 1.0) ruby-macho (~> 1.4) xcodeproj (>= 1.19.0, < 2.0) - cocoapods-core (1.10.0) + cocoapods-core (1.10.1) activesupport (> 5.0, < 6) addressable (~> 2.6) algoliasearch (~> 1.0) @@ -52,19 +52,19 @@ GEM netrc (~> 0.11) cocoapods-try (1.2.0) colored2 (3.1.2) - concurrent-ruby (1.1.7) + concurrent-ruby (1.1.8) escape (0.0.4) ethon (0.12.0) ffi (>= 1.3.0) - ffi (1.13.1) + ffi (1.15.0) fourflusher (2.3.1) fuzzy_match (2.0.4) gh_inspector (1.1.3) httpclient (2.8.3) - i18n (1.8.5) + i18n (1.8.9) concurrent-ruby (~> 1.0) - json (2.3.1) - minitest (5.14.2) + json (2.5.1) + minitest (5.14.4) molinillo (0.6.6) nanaimo (0.3.0) nap (1.1.0) @@ -74,7 +74,7 @@ GEM thread_safe (0.3.6) typhoeus (1.4.0) ethon (>= 0.9.0) - tzinfo (1.2.7) + tzinfo (1.2.9) thread_safe (~> 0.1) xcodeproj (1.19.0) CFPropertyList (>= 2.3.3, < 4.0) diff --git a/third_party/nixpkgs/pkgs/development/mobile/cocoapods/gemset-beta.nix b/third_party/nixpkgs/pkgs/development/mobile/cocoapods/gemset-beta.nix index 195f0901a1..9c18d393bc 100644 --- a/third_party/nixpkgs/pkgs/development/mobile/cocoapods/gemset-beta.nix +++ b/third_party/nixpkgs/pkgs/development/mobile/cocoapods/gemset-beta.nix @@ -5,10 +5,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0dpnk20s754fz6jfz9sp3ri49hn46ksw4hf6ycnlw7s3hsdxqgcd"; + sha256 = "0fp4gr3g25qgl01y3pd88wfh4pjc5zj3bz4v7rkxxwaxdjg7a9cc"; type = "gem"; }; - version = "5.2.4.4"; + version = "5.2.4.5"; }; addressable = { dependencies = ["public_suffix"]; @@ -47,10 +47,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1825ll26p28swjiw8n3x2pnh5ygsmg83spf82fnzcjn2p87vc5lf"; + sha256 = "0ia09r8bj3bjhcfiyr3vlk9zx7vahfypbs2lyrxix9x1jx3lfzq4"; type = "gem"; }; - version = "3.0.2"; + version = "3.0.3"; }; claide = { groups = ["default"]; @@ -68,10 +68,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1bbpg93gqjryxwr864z7s3jp3ic5pig313jcly4g3n159ssx3a4j"; + sha256 = "0k1fgp93nbgvp5m76wf067jcqy5zzbx0kczcxvhrzdxkkixzm30a"; type = "gem"; }; - version = "1.10.0"; + version = "1.10.1"; }; cocoapods-core = { dependencies = ["activesupport" "addressable" "algoliasearch" "concurrent-ruby" "fuzzy_match" "nap" "netrc" "public_suffix" "typhoeus"]; @@ -79,10 +79,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1sb07hj2kjygrzbdkzsyabcsfmip8gcfpjgacw4gfc71h3cnzra4"; + sha256 = "0x5lh6ws3rn2zxv7bagam54rkcslxrx6w1anwd35rjxsn4xx0d83"; type = "gem"; }; - version = "1.10.0"; + version = "1.10.1"; }; cocoapods-deintegrate = { groups = ["default"]; @@ -161,10 +161,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1vnxrbhi7cq3p4y2v9iwd10v1c7l15is4var14hwnb2jip4fyjzz"; + sha256 = "0mr23wq0szj52xnj0zcn1k0c7j4v79wlwbijkpfcscqww3l6jlg3"; type = "gem"; }; - version = "1.1.7"; + version = "1.1.8"; }; escape = { groups = ["default"]; @@ -192,10 +192,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "12lpwaw82bb0rm9f52v1498bpba8aj2l2q359mkwbxsswhpga5af"; + sha256 = "0nq1fb3vbfylccwba64zblxy96qznxbys5900wd7gm9bpplmf432"; type = "gem"; }; - version = "1.13.1"; + version = "1.15.0"; }; fourflusher = { groups = ["default"]; @@ -243,30 +243,30 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "153sx77p16vawrs4qpkv7qlzf9v5fks4g7xqcj1dwk40i6g7rfzk"; + sha256 = "08p6b13p99j1rrcrw1l3v0kb9mxbsvy6nk31r8h4rnszdgzpga32"; type = "gem"; }; - version = "1.8.5"; + version = "1.8.9"; }; json = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "158fawfwmv2sq4whqqaksfykkiad2xxrrj0nmpnc6vnlzi1bp7iz"; + sha256 = "0lrirj0gw420kw71bjjlqkqhqbrplla61gbv1jzgsz6bv90qr3ci"; type = "gem"; }; - version = "2.3.1"; + version = "2.5.1"; }; minitest = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "170y2cvx51gm3cm3nhdf7j36sxnkh6vv8ls36p90ric7w8w16h4v"; + sha256 = "19z7wkhg59y8abginfrm2wzplz7py3va8fyngiigngqvsws6cwgl"; type = "gem"; }; - version = "5.14.2"; + version = "5.14.4"; }; molinillo = { groups = ["default"]; @@ -355,10 +355,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1i3jh086w1kbdj3k5l60lc3nwbanmzdf8yjj3mlrx9b2gjjxhi9r"; + sha256 = "0zwqqh6138s8b321fwvfbywxy00lw1azw4ql3zr0xh1aqxf8cnvj"; type = "gem"; }; - version = "1.2.7"; + version = "1.2.9"; }; xcodeproj = { dependencies = ["CFPropertyList" "atomos" "claide" "colored2" "nanaimo"]; diff --git a/third_party/nixpkgs/pkgs/development/mobile/cocoapods/gemset.nix b/third_party/nixpkgs/pkgs/development/mobile/cocoapods/gemset.nix index 732d2a2cdd..90c1687aea 100644 --- a/third_party/nixpkgs/pkgs/development/mobile/cocoapods/gemset.nix +++ b/third_party/nixpkgs/pkgs/development/mobile/cocoapods/gemset.nix @@ -5,10 +5,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0dpnk20s754fz6jfz9sp3ri49hn46ksw4hf6ycnlw7s3hsdxqgcd"; + sha256 = "0fp4gr3g25qgl01y3pd88wfh4pjc5zj3bz4v7rkxxwaxdjg7a9cc"; type = "gem"; }; - version = "5.2.4.4"; + version = "5.2.4.5"; }; addressable = { dependencies = ["public_suffix"]; @@ -45,10 +45,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1825ll26p28swjiw8n3x2pnh5ygsmg83spf82fnzcjn2p87vc5lf"; + sha256 = "0ia09r8bj3bjhcfiyr3vlk9zx7vahfypbs2lyrxix9x1jx3lfzq4"; type = "gem"; }; - version = "3.0.2"; + version = "3.0.3"; }; claide = { groups = ["default"]; @@ -66,10 +66,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1bbpg93gqjryxwr864z7s3jp3ic5pig313jcly4g3n159ssx3a4j"; + sha256 = "0k1fgp93nbgvp5m76wf067jcqy5zzbx0kczcxvhrzdxkkixzm30a"; type = "gem"; }; - version = "1.10.0"; + version = "1.10.1"; }; cocoapods-core = { dependencies = ["activesupport" "addressable" "algoliasearch" "concurrent-ruby" "fuzzy_match" "nap" "netrc" "public_suffix" "typhoeus"]; @@ -77,10 +77,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1sb07hj2kjygrzbdkzsyabcsfmip8gcfpjgacw4gfc71h3cnzra4"; + sha256 = "0x5lh6ws3rn2zxv7bagam54rkcslxrx6w1anwd35rjxsn4xx0d83"; type = "gem"; }; - version = "1.10.0"; + version = "1.10.1"; }; cocoapods-deintegrate = { groups = ["default"]; @@ -153,10 +153,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1vnxrbhi7cq3p4y2v9iwd10v1c7l15is4var14hwnb2jip4fyjzz"; + sha256 = "0mr23wq0szj52xnj0zcn1k0c7j4v79wlwbijkpfcscqww3l6jlg3"; type = "gem"; }; - version = "1.1.7"; + version = "1.1.8"; }; escape = { source = { @@ -182,10 +182,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "12lpwaw82bb0rm9f52v1498bpba8aj2l2q359mkwbxsswhpga5af"; + sha256 = "0nq1fb3vbfylccwba64zblxy96qznxbys5900wd7gm9bpplmf432"; type = "gem"; }; - version = "1.13.1"; + version = "1.15.0"; }; fourflusher = { groups = ["default"]; @@ -229,30 +229,30 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "153sx77p16vawrs4qpkv7qlzf9v5fks4g7xqcj1dwk40i6g7rfzk"; + sha256 = "08p6b13p99j1rrcrw1l3v0kb9mxbsvy6nk31r8h4rnszdgzpga32"; type = "gem"; }; - version = "1.8.5"; + version = "1.8.9"; }; json = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "158fawfwmv2sq4whqqaksfykkiad2xxrrj0nmpnc6vnlzi1bp7iz"; + sha256 = "0lrirj0gw420kw71bjjlqkqhqbrplla61gbv1jzgsz6bv90qr3ci"; type = "gem"; }; - version = "2.3.1"; + version = "2.5.1"; }; minitest = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "170y2cvx51gm3cm3nhdf7j36sxnkh6vv8ls36p90ric7w8w16h4v"; + sha256 = "19z7wkhg59y8abginfrm2wzplz7py3va8fyngiigngqvsws6cwgl"; type = "gem"; }; - version = "5.14.2"; + version = "5.14.4"; }; molinillo = { source = { @@ -333,10 +333,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1i3jh086w1kbdj3k5l60lc3nwbanmzdf8yjj3mlrx9b2gjjxhi9r"; + sha256 = "0zwqqh6138s8b321fwvfbywxy00lw1azw4ql3zr0xh1aqxf8cnvj"; type = "gem"; }; - version = "1.2.7"; + version = "1.2.9"; }; xcodeproj = { dependencies = ["CFPropertyList" "atomos" "claide" "colored2" "nanaimo"]; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/batteries/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/batteries/default.nix index d4b7f3ff9a..7785a70e05 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/batteries/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/batteries/default.nix @@ -1,13 +1,13 @@ { stdenv, lib, fetchurl, ocaml, findlib, ocamlbuild, qtest, num }: -let version = "3.2.0"; in +let version = "3.3.0"; in stdenv.mkDerivation { name = "ocaml${ocaml.version}-batteries-${version}"; src = fetchurl { url = "https://github.com/ocaml-batteries-team/batteries-included/releases/download/v${version}/batteries-${version}.tar.gz"; - sha256 = "0a77njgc6c6kz4rpwqgmnii7f1na6hzsa55nqqm3dndhq9xh628w"; + sha256 = "002pqkcg18zx59hsf172wg6s7lwsiagp5sfvf5yssp7xxal5jdgx"; }; buildInputs = [ ocaml findlib ocamlbuild ]; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/ctypes/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/ctypes/default.nix index 9cb3a3d4cb..f8ccffcf21 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/ctypes/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/ctypes/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchzip, ocaml, findlib, libffi, pkg-config, ncurses, integers }: +{ lib, stdenv, fetchzip, ocaml, findlib, libffi, pkg-config, ncurses, integers, bigarray-compat }: if !lib.versionAtLeast ocaml.version "4.02" then throw "ctypes is not available for OCaml ${ocaml.version}" @@ -6,16 +6,16 @@ else stdenv.mkDerivation rec { name = "ocaml${ocaml.version}-ctypes-${version}"; - version = "0.17.1"; + version = "0.18.0"; src = fetchzip { url = "https://github.com/ocamllabs/ocaml-ctypes/archive/${version}.tar.gz"; - sha256 = "16brmdnz7wi2z25qqhd5s5blyq4app6jbv6g9pa4vyg6h0nzbcys"; + sha256 = "03zrbnl16m67ls0yfhq7a4k4238x6x6b3m456g4dw2yqwc153vks"; }; nativeBuildInputs = [ pkg-config ]; buildInputs = [ ocaml findlib ncurses ]; - propagatedBuildInputs = [ integers libffi ]; + propagatedBuildInputs = [ integers libffi bigarray-compat ]; buildPhase = '' make XEN=false libffi.config ctypes-base ctypes-stubs diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/janestreet/0.12.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/janestreet/0.12.nix index 4585a3b859..295960764d 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/janestreet/0.12.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/janestreet/0.12.nix @@ -382,7 +382,12 @@ rec { async_ssl = janePackage { pname = "async_ssl"; hash = "02ard8x5q5c42d9jdqmyzfx624yjq8cxxmvq3zb82hf6p8cc57ml"; - meta.description = "An Async-pipe-based interface with OpenSSL"; + meta = { + description = "An Async-pipe-based interface with OpenSSL"; + # ctypes no longer works with dune 1 + # dune 2 no longer supports jbuild + broken = true; + }; propagatedBuildInputs = [ async ctypes openssl ]; }; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/janestreet/0.14.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/janestreet/0.14.nix index c46b87e92f..1c9cdb1532 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/janestreet/0.14.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/janestreet/0.14.nix @@ -147,6 +147,11 @@ rec { meta.description = "Async wrappers for SSL"; buildInputs = [ dune-configurator ]; propagatedBuildInputs = [ async ctypes openssl ]; + # in ctypes.foreign 0.18.0 threaded and unthreaded have been merged + postPatch = '' + substituteInPlace bindings/dune \ + --replace "ctypes.foreign.threaded" "ctypes.foreign" + ''; }; async_unix = janePackage { @@ -240,7 +245,8 @@ rec { core_kernel = janePackage { pname = "core_kernel"; - hash = "012sp02v35j41lzkvf073620602fgiswz2n224j06mk3bm8jmjms"; + version = "0.14.1"; + hash = "0pikg4ln6177gbs0jfix7xj50zlcm7058h64lxnd7wspnj7mq8sd"; meta.description = "System-independent part of Core"; buildInputs = [ jst-config ]; propagatedBuildInputs = [ base_bigstring sexplib ]; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/janestreet/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/janestreet/default.nix index 25b498bb7d..a4c026ffb8 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/janestreet/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/janestreet/default.nix @@ -417,7 +417,12 @@ rec { pname = "async_ssl"; hash = "1p83fzfla4rb820irdrz3f2hp8kq5zrhw47rqmfv6qydlca1bq64"; propagatedBuildInputs = [ async ctypes openssl ]; - meta.description = "Async wrappers for SSL"; + meta = { + description = "Async wrappers for SSL"; + # ctypes no longer works with dune 1 + # dune 2 no longer supports jbuild + broken = true; + }; }; sexp_pretty = janePackage { diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/janestreet/janePackage.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/janestreet/janePackage.nix index 0dd0dde6ec..9a67db4966 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/janestreet/janePackage.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/janestreet/janePackage.nix @@ -14,6 +14,8 @@ buildDunePackage (args // { sha256 = hash; }; - meta.license = lib.licenses.asl20; - meta.homepage = "https://github.com/janestreet/${pname}"; + meta = { + license = lib.licenses.asl20; + homepage = "https://github.com/janestreet/${pname}"; + } // args.meta; }) diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/janestreet/janePackage_0_12.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/janestreet/janePackage_0_12.nix index 5b7d9c3210..6c7d746e94 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/janestreet/janePackage_0_12.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/janestreet/janePackage_0_12.nix @@ -14,6 +14,8 @@ buildDunePackage (args // { sha256 = hash; }; - meta.license = lib.licenses.mit; - meta.homepage = "https://github.com/janestreet/${pname}"; + meta = { + license = lib.licenses.mit; + homepage = "https://github.com/janestreet/${pname}"; + } // args.meta; }) diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/janestreet/janePackage_0_14.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/janestreet/janePackage_0_14.nix index 9675c8d019..1ed2e6bc4f 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/janestreet/janePackage_0_14.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/janestreet/janePackage_0_14.nix @@ -22,6 +22,8 @@ buildDunePackage (args // { inherit doCheck; - meta.license = lib.licenses.mit; - meta.homepage = "https://github.com/janestreet/${pname}"; + meta = { + license = lib.licenses.mit; + homepage = "https://github.com/janestreet/${pname}"; + } // args.meta; }) 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 new file mode 100644 index 0000000000..b4ddb4dd5e --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/ppx_cstubs/default.nix @@ -0,0 +1,44 @@ +{ lib +, fetchFromGitHub +, buildDunePackage +, bigarray-compat +, containers +, cppo +, ctypes +, integers +, num +, ppxlib +, re +}: + +buildDunePackage rec { + pname = "ppx_cstubs"; + version = "0.6.1.1"; + + useDune2 = true; + + src = fetchFromGitHub { + owner = "fdopen"; + repo = "ppx_cstubs"; + rev = version; + sha256 = "0rgg78435ypi6ryhcq5ljkch4qjvra2jqjd47c2hhhcbwvi2ssxh"; + }; + + buildInputs = [ + bigarray-compat + containers + cppo + ctypes + integers + num + ppxlib + re + ]; + + meta = with lib; { + homepage = "https://github.com/fdopen/ppx_cstubs"; + description = "Preprocessor for easier stub generation with ocaml-ctypes"; + license = licenses.mit; + maintainers = [ maintainers.osener ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/ppx_deriving/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/ppx_deriving/default.nix index 910e539009..7d415bd894 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/ppx_deriving/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/ppx_deriving/default.nix @@ -1,15 +1,28 @@ -{ lib, fetchurl, buildDunePackage -, cppo, ppxlib, ppx_derivers, result, ounit, ocaml-migrate-parsetree +{ lib +, fetchurl +, buildDunePackage +, cppo +, ppxlib +, ppx_derivers +, result +, ounit +, ocaml-migrate-parsetree +, ocaml-migrate-parsetree-2-1 }: let params = - if lib.versionAtLeast ppxlib.version "0.15" - then { + if lib.versionAtLeast ppxlib.version "0.20" then { + version = "5.2.1"; + sha256 = "11h75dsbv3rs03pl67hdd3lbim7wjzh257ij9c75fcknbfr5ysz9"; + useOMP2 = true; + } else if lib.versionAtLeast ppxlib.version "0.15" then { version = "5.1"; sha256 = "1i64fd7qrfzbam5hfbl01r0sx4iihsahcwqj13smmrjlnwi3nkxh"; + useOMP2 = false; } else { version = "5.0"; sha256 = "0fkzrn4pdyvf1kl0nwvhqidq01pnq3ql8zk1jd56hb0cxaw851w3"; + useOMP2 = false; } ; in @@ -25,7 +38,13 @@ buildDunePackage rec { }; buildInputs = [ ppxlib cppo ]; - propagatedBuildInputs = [ ocaml-migrate-parsetree ppx_derivers result ]; + propagatedBuildInputs = [ + (if params.useOMP2 + then ocaml-migrate-parsetree-2-1 + else ocaml-migrate-parsetree) + ppx_derivers + result + ]; doCheck = true; checkInputs = [ ounit ]; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/ppxlib/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/ppxlib/default.nix index 03085a13cd..11b608e6ef 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/ppxlib/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/ppxlib/default.nix @@ -25,6 +25,10 @@ let param = { sha256 = "1ciy6va2gjrpjs02kha83pzh0x1gkmfsfsdgabbs1v14a8qgfibm"; min_version = "4.07"; }; + "0.22.0" = { + sha256 = "0kf7lgcwygf6zlx7rwddqpqvasa6v7xiq0bqal8vxlib6lpg074q"; + min_version = "4.07"; + }; }."${version}"; in if param ? max_version && lib.versionAtLeast ocaml.version param.max_version diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/sodium/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/sodium/default.nix index d0c203689e..dc090e9174 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/sodium/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/sodium/default.nix @@ -15,6 +15,11 @@ stdenv.mkDerivation rec { sha256 = "124gpi1jhac46x05gp5viykyrafnlp03v1cmkl13c6pgcs8w04pv"; }; + patches = [ + # ctypes.stubs no longer pulls in bigarray automatically + ./lib-gen-link-bigarray.patch + ]; + buildInputs = [ ocaml findlib ocamlbuild ]; propagatedBuildInputs = [ ctypes libsodium ]; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/sodium/lib-gen-link-bigarray.patch b/third_party/nixpkgs/pkgs/development/ocaml-modules/sodium/lib-gen-link-bigarray.patch new file mode 100644 index 0000000000..f05f533209 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/sodium/lib-gen-link-bigarray.patch @@ -0,0 +1,7 @@ +diff --git a/lib_gen/_tags b/lib_gen/_tags +index 7a7e632..7a4e0b7 100644 +--- a/lib_gen/_tags ++++ b/lib_gen/_tags +@@ -1 +1 @@ +-<*.{ml,byte,native}>: package(ctypes.stubs) ++<*.{ml,byte,native}>: package(ctypes.stubs), package(bigarray) diff --git a/third_party/nixpkgs/pkgs/development/octave-modules/sparsersb/default.nix b/third_party/nixpkgs/pkgs/development/octave-modules/sparsersb/default.nix index b8147f8d28..ecea6c0f62 100644 --- a/third_party/nixpkgs/pkgs/development/octave-modules/sparsersb/default.nix +++ b/third_party/nixpkgs/pkgs/development/octave-modules/sparsersb/default.nix @@ -13,7 +13,7 @@ buildOctavePackage rec { sha256 = "0nl7qppa1cm51188hqhbfswlih9hmy1yz7v0f5i07z0g0kbd62xw"; }; - buildInputs = [ + propagatedBuildInputs = [ librsb ]; @@ -22,7 +22,5 @@ buildOctavePackage rec { license = licenses.gpl3Plus; maintainers = with maintainers; [ KarlJoad ]; description = "Interface to the librsb package implementing the RSB sparse matrix format for fast shared-memory sparse matrix computations"; - # Mark this way until KarlJoad builds librsb specifically for this package. - broken = true; }; } diff --git a/third_party/nixpkgs/pkgs/development/php-packages/apcu/default.nix b/third_party/nixpkgs/pkgs/development/php-packages/apcu/default.nix index 04b611fd59..3301d949c2 100644 --- a/third_party/nixpkgs/pkgs/development/php-packages/apcu/default.nix +++ b/third_party/nixpkgs/pkgs/development/php-packages/apcu/default.nix @@ -3,8 +3,8 @@ buildPecl { pname = "apcu"; - version = "5.1.19"; - sha256 = "1q3c4y9jqh1yz5vps2iiz2x04vn0y1g5ibxg1x8zp7n7sncvqzw3"; + version = "5.1.20"; + sha256 = "sha256-uZ1A+v7Ab00TL87lPnUm3b/B0EHqbgThc4nfrSj5w5A="; buildInputs = [ pcre' ]; doCheck = true; diff --git a/third_party/nixpkgs/pkgs/development/php-packages/smbclient/default.nix b/third_party/nixpkgs/pkgs/development/php-packages/smbclient/default.nix index 0486db82cc..0b485e0480 100644 --- a/third_party/nixpkgs/pkgs/development/php-packages/smbclient/default.nix +++ b/third_party/nixpkgs/pkgs/development/php-packages/smbclient/default.nix @@ -1,8 +1,8 @@ { buildPecl, lib, samba, pkg-config }: buildPecl { pname = "smbclient"; - version = "1.0.5"; - sha256 = "sha256-cNvTa1qzYrlhuX4oNehXt+XKqmqfonyomW/usQdQQO0="; + version = "1.0.6"; + sha256 = "sha256-ZsQzdDt6NLRWBsA75om9zkxSvB6zBsvvPhXJZrX/KNc="; # TODO: remove this when upstream merges a fix - https://github.com/eduardok/libsmbclient-php/pull/66 LIBSMBCLIENT_INCDIR = "${samba.dev}/include/samba-4.0"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/APScheduler/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/APScheduler/default.nix index 32a9dda6c8..507147dc8d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/APScheduler/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/APScheduler/default.nix @@ -1,8 +1,8 @@ { lib , buildPythonPackage , fetchPypi -, setuptools_scm -, pytest +, setuptools-scm +, pytestCheckHook , pytestcov , sqlalchemy , tornado @@ -29,11 +29,11 @@ buildPythonPackage rec { }; buildInputs = [ - setuptools_scm + setuptools-scm ]; checkInputs = [ - pytest + pytestCheckHook pytestcov sqlalchemy tornado @@ -51,18 +51,11 @@ buildPythonPackage rec { setuptools ] ++ lib.optional (!isPy3k) futures; - checkPhase = '' - py.test - ''; - pythonImportsCheck = [ "apscheduler" ]; - # Somehow it cannot find pytestcov - doCheck = false; - meta = with lib; { description = "A Python library that lets you schedule your Python code to be executed"; - homepage = "https://pypi.python.org/pypi/APScheduler/"; + homepage = "https://github.com/agronholm/apscheduler"; license = licenses.mit; }; } 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 2e740fcc2c..c12285a287 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 @@ -1,11 +1,13 @@ { lib , buildPythonPackage +, base36 , cryptography , curve25519-donna , ecdsa , ed25519 , fetchFromGitHub , h11 +, pyqrcode , pytest-asyncio , pytest-timeout , pytestCheckHook @@ -15,7 +17,7 @@ buildPythonPackage rec { pname = "HAP-python"; - version = "3.3.2"; + version = "3.4.0"; disabled = pythonOlder "3.5"; # pypi package does not include tests @@ -23,15 +25,17 @@ buildPythonPackage rec { owner = "ikalchev"; repo = pname; rev = "v${version}"; - sha256 = "sha256-oDTyFIhf7oogYyh9LpmVtagi1kDXLCc/7c2UH1dL2Sg="; + sha256 = "0mkrs3fwiyp4am9fx1dnhd9h7rphfwymr46khw40xavrfb5jmsa7"; }; propagatedBuildInputs = [ + base36 cryptography curve25519-donna ecdsa ed25519 h11 + pyqrcode zeroconf ]; @@ -41,35 +45,19 @@ buildPythonPackage rec { pytestCheckHook ]; + # Disable tests requiring network access + disabledTestPaths = [ + "tests/test_accessory_driver.py" + "tests/test_hap_handler.py" + "tests/test_hap_protocol.py" + ]; + disabledTests = [ - # Disable tests needing network - "camera" - "pair" - "test_async_subscribe_client_topic" - "test_auto_add_aid_mac" - "test_connection_management" - "test_crypto_failure_closes_connection" - "test_empty_encrypted_data" - "test_external_zeroconf" - "test_get_accessories" - "test_get_characteristics" - "test_handle_set_handle_set" - "test_handle_snapshot_encrypted_non_existant_accessory" - "test_http_11_keep_alive" - "test_http10_close" - "test_mdns_service_info" - "test_mixing_service_char_callbacks_partial_failure" - "test_not_standalone_aid" - "test_persist" - "test_push_event" - "test_send_events" - "test_service_callbacks" - "test_set_characteristics_with_crypto" - "test_setup_endpoints" - "test_start" - "test_upgrade_to_encrypted" + "test_persist_and_load" + "test_we_can_connect" + "test_idle_connection_cleanup" "test_we_can_start_stop" - "test_xhm_uri" + "test_push_event" ]; meta = with lib; { 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 054cce0ce5..4faedcada3 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.5"; + version = "0.6.6"; src = fetchPypi { inherit pname version; - sha256 = "ec981b4f07f7582fc564aba8b57763a549392e9ef8b6a338e9da54cdd229cf95"; + sha256 = "540a2da5fb3ada1f0abf6968e0fa01ca7de6cd517f3be5c52d03a4fc8d54d75e"; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aiostream/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aiostream/default.nix index a48e2ae024..b51a710569 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aiostream/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aiostream/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "aiostream"; - version = "0.4.1"; + version = "0.4.2"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "vxgmichel"; repo = pname; rev = "v${version}"; - sha256 = "1wwnjrzkd61k3arxzk7yhg7cc1099bcwr5kz5n91ai6ma5ln139s"; + sha256 = "0ss41hzvlnyll5xc5ddxqyqqw4gnd67yyhci25xnb1vpcz0jqsq8"; }; checkInputs = [ pytestCheckHook pytestcov pytest-asyncio ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ansible-lint/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ansible-lint/default.nix index 2718ba7670..23899d4901 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ansible-lint/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ansible-lint/default.nix @@ -43,7 +43,7 @@ buildPythonPackage rec { ''; checkPhase = '' - pytest -k 'not test_run_playbook_github and not test_run_single_role_path_no_trailing_slash_script' + pytest -W ignore::DeprecationWarning -k 'not test_run_playbook_github and not test_run_single_role_path_no_trailing_slash_script' ''; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/asdf/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/asdf/default.nix index 4006a034d4..19c1921f7c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/asdf/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/asdf/default.nix @@ -48,5 +48,7 @@ buildPythonPackage rec { homepage = "https://github.com/spacetelescope/asdf"; license = licenses.bsd3; maintainers = [ maintainers.costrouc ]; + # many ValueError in tests + broken = true; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/ase/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/ase/default.nix index fcbeb1f1f4..8684025772 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/ase/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/ase/default.nix @@ -12,12 +12,12 @@ buildPythonPackage rec { pname = "ase"; - version = "3.20.1"; + version = "3.21.1"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "72c81f21b6adb907595fce8d883c0231301cbd8e9f6e5ce8e98bab927054daca"; + sha256 = "78b01d88529d5f604e76bc64be102d48f058ca50faad72ac740d717545711c7b"; }; propagatedBuildInputs = [ numpy scipy matplotlib flask pillow psycopg2 ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/asyncpg/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/asyncpg/default.nix index e2f2f24278..674212bf92 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/asyncpg/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/asyncpg/default.nix @@ -3,12 +3,12 @@ buildPythonPackage rec { pname = "asyncpg"; - version = "0.21.0"; + version = "0.22.0"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "53cb2a0eb326f61e34ef4da2db01d87ce9c0ebe396f65a295829df334e31863f"; + sha256 = "348ad471d9bdd77f0609a00c860142f47c81c9123f4064d13d65c8569415d802"; }; checkInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix index 8e93026b60..8433025bbc 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-containerservice/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "azure-mgmt-containerservice"; - version = "14.0.0"; + version = "15.0.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "fbb13448fb52a4090ee91940ae8676403dbe8ae81044b7a5cd3c9e58b47d66de"; + sha256 = "e205aada94bb630e1ba5ee57751849456e1535aec3f2173edf2cbf596b99c0d9"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-cosmosdb/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-cosmosdb/default.nix index 3814770b2e..22823bfdd5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-cosmosdb/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-cosmosdb/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "azure-mgmt-cosmosdb"; - version = "6.0.0"; + version = "6.1.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "15e4140870f2756fbd43965ccceca55361a634a0504bbdb033a1909eff14dfb1"; + sha256 = "7eb28eae4354e0a68e098de314b380d92f6482f53b2947dc8a36913195bdfde0"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-hanaonazure/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-hanaonazure/default.nix index 9a23d31309..c4453e8c0c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-hanaonazure/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-hanaonazure/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "azure-mgmt-hanaonazure"; - version = "0.14.0"; + version = "0.15.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "7f8b912ca62431c1697b4914c12cc5f8123e60ee6c65d123591f937744d204e0"; + sha256 = "f5699cd2f6ad09555c3f1a75c8703e12db76bbbb7ec8b621dcb948d4fc9829a5"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-iotcentral/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-iotcentral/default.nix index 2f368b8264..c7528dace2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-iotcentral/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-iotcentral/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "azure-mgmt-iotcentral"; - version = "4.0.0"; + version = "4.1.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "ab793fde2b5eeb73ab37434013d4b5ba7750031220013edb3c1758c45a00a91a"; + sha256 = "e6d4810f454c0d63a5e816eaa7e54a073a3f70b2256162ff1c234cfe91783ae6"; }; propagatedBuildInputs = [ 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 90effb44c6..6320588ed4 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 @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "azure-mgmt-media"; - version = "3.0.0"; + version = "3.1.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "8944775725c5253614d257576d841ee68afa34f570b05c0924a7f73f1db28a24"; + sha256 = "c35316d3d63dc99feb97ad7f12a7b411046537f5c6d79ef14f6067bcc379292f"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-storage/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-storage/default.nix index 2f1032c2bb..6f14ce174c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-storage/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-storage/default.nix @@ -8,14 +8,14 @@ }: buildPythonPackage rec { - version = "16.0.0"; + version = "17.0.0"; pname = "azure-mgmt-storage"; disabled = !isPy3k; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "2f9d714d9722b1ef4bac6563676612e6e795c4e90f6f3cd323616fdadb0a99e5"; + sha256 = "c0e3fd99028d98c80dddabe1c22dfeb3d694e5c1393c6de80766eb240739e4bc"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-servicebus/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-servicebus/default.nix index 356de52212..b0c0a9e96c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-servicebus/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-servicebus/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "azure-servicebus"; - version = "7.0.1"; + version = "7.1.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "46d1e7b9da537da831c3184d42d3e2bc3c7ab9234e204a9d4c2e5dc54010721b"; + sha256 = "c5b3681ce4d7a44c223ddddfdec4c8d2eadede3b11b598ac09c4dbf4b729e89b"; }; 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 1f8ba7dbe8..b9a6a40e73 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.4.0"; + version = "0.6.0"; src = fetchPypi { inherit pname version; - sha256 = "a4f32423d9facaae512c433f5460b4ceec73a6c20b44b00e9de9de7a0e86dacd"; + sha256 = "2f8f71561ca30ff3b04b172f5a64b231baeb02f4bce4bd6763df93a178c8b5d7"; extension = "zip"; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-synapse-artifacts/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-synapse-artifacts/default.nix index 5a414388c4..76ad616360 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.4.0"; + version = "0.5.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "09fd9cf8c25c901d2daf7e436062065ada866f212f371f9d66f394d39ccaa23b"; + sha256 = "a13124dc9405277f697f6452728d7dcf4c50601ee76055fd42f12b51494d6579"; }; propagatedBuildInputs = [ 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 571f3f9d08..09b25fe9d5 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.4.0"; + version = "0.5.0"; src = fetchPypi { inherit pname version; - sha256 = "7f5881fda4108363c8c6fdee0494fa067ba81e60f038883859d23fc197f5f286"; + sha256 = "2b037024dc7c034f47aac551cc918f78590a1e1ae30cd2370c8a14da15994970"; extension = "zip"; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/bayespy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/bayespy/default.nix index 6ebe9919ec..5d0f098b8a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/bayespy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/bayespy/default.nix @@ -4,7 +4,7 @@ buildPythonPackage rec { pname = "bayespy"; - version = "0.5.20"; + version = "0.5.21"; # Python 2 not supported and not some old Python 3 because MPL doesn't support # them properly. @@ -12,7 +12,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "8c16cdc73bbcd9a1124a0495056065b7ce938dbe6c2c780dc330c83fb4d2640a"; + sha256 = "0d86e9ae73e6472c26aeb4de7abd9bf99492fedcbb0485ed7fa23609d2673b42"; }; checkInputs = [ pytest nose glibcLocales ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/boto3/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/boto3/default.nix index 32b3bfc4b8..b8d184a058 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/boto3/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/boto3/default.nix @@ -13,11 +13,11 @@ buildPythonPackage rec { pname = "boto3"; - version = "1.17.22"; # N.B: if you change this, change botocore and awscli to a matching version + version = "1.17.25"; # N.B: if you change this, change botocore and awscli to a matching version src = fetchPypi { inherit pname version; - sha256 = "sha256-Thd8ndSsRdnkGGfPt0f0yYXWsF/xRjesWGGmDaqVx8E="; + sha256 = "sha256-Jz6WriuVpgNqTDVH52onCxerdhzHYFOCPJ42HSaCE+8="; }; propagatedBuildInputs = [ botocore jmespath s3transfer ] ++ lib.optionals (!isPy3k) [ futures ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/botocore/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/botocore/default.nix index 29f00d87ad..d6069e14a9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/botocore/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/botocore/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "botocore"; - version = "1.20.22"; # N.B: if you change this, change boto3 and awscli to a matching version + version = "1.20.25"; # N.B: if you change this, change boto3 and awscli to a matching version src = fetchPypi { inherit pname version; - sha256 = "sha256-MuhvnRhVW9O03GlKJjmhwfyMi0KknaVDuVrJ0ExAdws="; + sha256 = "sha256-uAtO/l+vsp8ko2V9H3eqFwUlyHa1/ZOE1eWFnQQFIG4="; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/buildbot/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/buildbot/default.nix index 30a7e5174a..ea4910712c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/buildbot/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/buildbot/default.nix @@ -25,11 +25,11 @@ let package = buildPythonPackage rec { pname = "buildbot"; - version = "2.10.1"; + version = "3.0.0"; src = fetchPypi { inherit pname version; - sha256 = "0jmgpvgn36kfc1sa27a1l1g26dawhl99a1wl8gn4ajbcbcvc2pkh"; + sha256 = "0li47fpm398dk69q6g2zjaxx46w00g3n0jszz88kf57sakri553y"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/buildbot/pkg.nix b/third_party/nixpkgs/pkgs/development/python-modules/buildbot/pkg.nix index f3dc0440ac..71da12049e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/buildbot/pkg.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/buildbot/pkg.nix @@ -6,7 +6,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "0ymqkjz1zk4gs0hkxjh07napc4k24xxb8f3pganw27fca60xcii0"; + sha256 = "0ihcxdkbm1lq79fdjmcrj316zh6sjlc3162yynww8nggv2mlnz6v"; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/buildbot/plugins.nix b/third_party/nixpkgs/pkgs/development/python-modules/buildbot/plugins.nix index ed2f363901..a9a9538f5b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/buildbot/plugins.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/buildbot/plugins.nix @@ -7,7 +7,7 @@ src = fetchPypi { inherit pname version; - sha256 = "0x2k95lwx2gz2zj2ys646qiylhyqzlbiqf1k3q1l8w1wlggwv3xp"; + sha256 = "0pk7h5wwvmdn74ngj5rspz7z9y80ryzgqd2z2qy7kf9chpz7qczk"; }; # Remove unneccessary circular dependency on buildbot @@ -34,7 +34,7 @@ src = fetchPypi { inherit pname version; - sha256 = "0fpam6x8x207la1xrr8m45yx35r646iizrs4gsaghlysmr95jb3i"; + sha256 = "1y9dpxi7r5r2ya5y0i28b4g5fvla6wrbjz9rffqaqldf4h316jx2"; }; buildInputs = [ buildbot-pkg ]; @@ -56,7 +56,7 @@ src = fetchPypi { inherit pname version; - sha256 = "0ari338hmi1bb1pln3mxv4k9aclbcby6z3km61wg3va511qhrrbq"; + sha256 = "0vhnqqxl693b2d14ayifpjz8zlg3dngl127svr08amzmbad7irh1"; }; buildInputs = [ buildbot-pkg ]; @@ -78,7 +78,7 @@ src = fetchPypi { inherit pname version; - sha256 = "0a5nrklyzfasaa119y4ivr7449rvsgifpkyravinacrl1g9phlls"; + sha256 = "1dgs33z3sjr3s8ymqyxjkx2g6iah3p91ng9hxllmyyp4xpxaxyhk"; }; buildInputs = [ buildbot-pkg ]; @@ -100,7 +100,7 @@ src = fetchPypi { inherit pname version; - sha256 = "0rris2p7ic9p9ms3qcczia4nn5mb1yx2gv5mlnmg2yligjad2jaf"; + sha256 = "06j6f2k0r8nyh8swh689cy4zq50lmy5glx0pa3zdpnk02k4x3q72"; }; buildInputs = [ buildbot-pkg ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/buildbot/worker.nix b/third_party/nixpkgs/pkgs/development/python-modules/buildbot/worker.nix index 02139d15e7..7feb409a26 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/buildbot/worker.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/buildbot/worker.nix @@ -7,7 +7,7 @@ buildPythonPackage (rec { src = fetchPypi { inherit pname version; - sha256 = "10ap7jlxs9vcmnyafr62mxlgsp709165nw55xmv9sw18r7m8wsm6"; + sha256 = "0zrd9h9i7fnmh81zvscxzq3rspyvjvidzbgcziq2m0z522krs8qq"; }; propagatedBuildInputs = [ twisted future ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/buildout/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/buildout/default.nix index a9fe66a37e..796eaa1825 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/buildout/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/buildout/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "zc.buildout"; - version = "2.13.3"; + version = "2.13.4"; src = fetchPypi { inherit pname version; - sha256 = "1dyc5g3yv7wm3hf3fcsh6y1wivzjj1bspafr5qqb653z9a31lsfn"; + sha256 = "b978b2f9317b317ee4191f78fcc4f05b1ac41bdaaae47f0956f14c8285feef63"; }; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cairosvg/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cairosvg/default.nix index 58b8c26730..5e8e8d985a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cairosvg/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cairosvg/default.nix @@ -23,7 +23,7 @@ buildPythonPackage rec { sha256 = "sha256-sLmSnPXboAUXjXRqgDb88AJVUPSYylTbYYczIjhHg7w="; }; - buildInputs = [ pytest-runner ]; + nativeBuildInputs = [ pytest-runner ]; propagatedBuildInputs = [ cairocffi cssselect2 defusedxml pillow tinycss2 ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cartopy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cartopy/default.nix index f41aa6985d..7e3e320675 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cartopy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cartopy/default.nix @@ -54,6 +54,7 @@ buildPythonPackage rec { license = licenses.lgpl3; homepage = "https://scitools.org.uk/cartopy/docs/latest/"; maintainers = with maintainers; [ mredaelli ]; + # following tests fail: test_eccentric_globe and test_ellipse_globe + broken = true; }; - } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/casbin/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/casbin/default.nix index 7e26181cf5..d6e33ff8cb 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/casbin/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/casbin/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "casbin"; - version = "0.16.2"; + version = "0.18.2"; disabled = isPy27; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = pname; repo = "pycasbin"; rev = "v${version}"; - sha256 = "0jan4xikyi1p92rsir8camc6ify81wnd9l57v1pgmjf5fgb5r2w8"; + sha256 = "0gi7qm02sdlmmmz6vi8d7b7kibgw4q67kix55y4jsvi0bvwc0i8w"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cliff/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cliff/default.nix index 33a129d287..54cc753417 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cliff/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cliff/default.nix @@ -16,11 +16,11 @@ buildPythonPackage rec { pname = "cliff"; - version = "3.6.0"; + version = "3.7.0"; src = fetchPypi { inherit pname version; - sha256 = "a3f4fa67eeafbcfa7cf9fe4b1755d410876528e1d0d115740db00b50a1250272"; + sha256 = "389c81960de13f05daf1cbd546f33199e86c518ba4266c79ec7a153a280980ea"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/clifford/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/clifford/default.nix index 3226e3854c..b26689cf38 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/clifford/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/clifford/default.nix @@ -63,5 +63,7 @@ buildPythonPackage rec { homepage = "https://clifford.readthedocs.io"; license = licenses.bsd3; maintainers = [ maintainers.costrouc ]; + # many TypeError's in tests + broken = true; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/coloredlogs/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/coloredlogs/default.nix index caa783bb82..8cdd714bf1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/coloredlogs/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/coloredlogs/default.nix @@ -12,13 +12,13 @@ buildPythonPackage rec { pname = "coloredlogs"; - version = "14.0"; + version = "15.0"; src = fetchFromGitHub { owner = "xolox"; repo = "python-coloredlogs"; rev = version; - sha256 = "0rnmxwrim4razlv4vi3krxk5lc5ksck6h5374j8avqwplika7q2x"; + sha256 = "sha256-C1Eo+XrrL3bwhT49KyOE6xjbAHJxn9Qy4s1RR5ERVtA="; }; # capturer is broken on darwin / py38, so we skip the test until a fix for diff --git a/third_party/nixpkgs/pkgs/development/python-modules/construct/2.10.54.nix b/third_party/nixpkgs/pkgs/development/python-modules/construct/2.10.54.nix new file mode 100644 index 0000000000..6bb279490a --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/construct/2.10.54.nix @@ -0,0 +1,29 @@ +{ lib, stdenv, buildPythonPackage, fetchFromGitHub, pythonOlder +, six, pytestCheckHook, pytest-benchmark, enum34, numpy, arrow, ruamel_yaml +}: + +buildPythonPackage rec { + pname = "construct"; + version = "2.10.54"; + + # no tests in PyPI tarball + src = fetchFromGitHub { + owner = pname; + repo = pname; + rev = "v${version}"; + sha256 = "1mqspsn6bf3ibvih1zna2glkg8iw7vy5zg9gzg0d1m8zcndk2c48"; + }; + + checkInputs = [ pytestCheckHook pytest-benchmark enum34 numpy arrow ruamel_yaml ]; + + disabledTests = lib.optionals stdenv.isDarwin [ "test_multiprocessing" ]; + + pytestFlagsArray = [ "--benchmark-disable" ]; + + meta = with lib; { + description = "Powerful declarative parser (and builder) for binary data"; + homepage = "https://construct.readthedocs.org/"; + license = licenses.mit; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/convertdate/2.2.x.nix b/third_party/nixpkgs/pkgs/development/python-modules/convertdate/2.2.x.nix new file mode 100644 index 0000000000..d67f4c5a34 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/convertdate/2.2.x.nix @@ -0,0 +1,36 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pymeeus +, pytz +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "convertdate"; + version = "2.2.2"; + + # Tests are not available in the PyPI tarball so use GitHub instead. + src = fetchFromGitHub { + owner = "fitnr"; + repo = pname; + rev = "v${version}"; + sha256 = "1xgi7x9b9kxm0q51bqnmwdm5lp8vwhx5yk4d1b23r37spz9dbhw5"; + }; + + propagatedBuildInputs = [ + pymeeus + pytz + ]; + + checkInputs = [ + pytestCheckHook + ]; + + meta = with lib; { + homepage = "https://github.com/fitnr/convertdate"; + description = "Utils for converting between date formats and calculating holidays"; + license = licenses.mit; + maintainers = with maintainers; [ jluttine ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/convertdate/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/convertdate/default.nix index f285a74e54..0dee95541b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/convertdate/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/convertdate/default.nix @@ -1,5 +1,6 @@ { lib , buildPythonPackage +, isPy27 , fetchFromGitHub , pymeeus , pytz @@ -10,6 +11,8 @@ buildPythonPackage rec { pname = "convertdate"; version = "2.3.0"; + disabled = isPy27; + # Tests are not available in the PyPI tarball so use GitHub instead. src = fetchFromGitHub { owner = "fitnr"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cornice/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cornice/default.nix index fc470e012f..ba6df4fd24 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cornice/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cornice/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "cornice"; - version = "5.0.3"; + version = "5.1.0"; src = fetchPypi { inherit pname version; - sha256 = "f971831e90343374b21c0c97d523e23eb09cec41a2a8fc2e85bb5c2585348576"; + sha256 = "c81cd9429759c0de475f580bbff92d5646cfc5f43e8aa24492037e2e90677ee6"; }; propagatedBuildInputs = [ pyramid simplejson six venusian ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cssutils/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cssutils/default.nix index a12fbf48c8..4ea08c8a7b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cssutils/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cssutils/default.nix @@ -1,22 +1,38 @@ -{ lib, buildPythonPackage, fetchPypi, mock }: +{ lib +, buildPythonPackage +, isPy27 +, fetchPypi +, mock +, pytestCheckHook +}: buildPythonPackage rec { pname = "cssutils"; - version = "1.0.2"; + version = "2.0.0"; + + disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "a2fcf06467553038e98fea9cfe36af2bf14063eb147a70958cfcaa8f5786acaf"; + sha256 = "984b5dbe3a2a0483d7cb131609a17f4cbaa34dda306c419924858a88588fed7c"; }; - buildInputs = [ mock ]; + checkInputs = [ + mock + pytestCheckHook + ]; - # couple of failing tests - doCheck = false; + disabledTests = [ + "test_parseUrl" # accesses network + ]; + + pythonImportsCheck = [ "cssutils" ]; meta = with lib; { - description = "A Python package to parse and build CSS"; - homepage = "http://cthedot.de/cssutils/"; + description = "A CSS Cascading Style Sheets library for Python"; + homepage = "https://github.com/jaraco/cssutils"; + changelog = "https://github.com/jaraco/cssutils/blob/v${version}/CHANGES.rst"; license = licenses.lgpl3Plus; + maintainers = with maintainers; [ dotlambda ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cysignals/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cysignals/default.nix index 736afab425..201a8c42d6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cysignals/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cysignals/default.nix @@ -1,4 +1,5 @@ { lib +, fetchpatch , fetchPypi , buildPythonPackage , cython @@ -16,6 +17,16 @@ buildPythonPackage rec { sha256 = "1ckxzch3wk5cg80mppky5jib5z4fzslny3001r5zg4ar1ixbc1w1"; }; + patches = [ + # fixes intermittent crashes in Sage tests (including in interfaces/singular.py) + # will be included in cysignals 1.10.3: https://github.com/sagemath/cysignals/pull/127 + (fetchpatch { + name = "fix-verify_exc_value.patch"; + url = "https://github.com/sagemath/cysignals/commit/49a7eee4bba3ab8f340cf56c371fa4f5ed702dcc.patch"; + sha256 = "sha256-Pfc5tL9VDSP6ftDoHoIb+MDi5rjYqr0PRfIajFuuYVs="; + }) + ]; + # explicit check: # build/src/cysignals/implementation.c:27:2: error: #error "cysignals must be compiled without _FORTIFY_SOURCE" hardeningDisable = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dask-jobqueue/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dask-jobqueue/default.nix index 8a3174fff3..7719842fba 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dask-jobqueue/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dask-jobqueue/default.nix @@ -29,5 +29,6 @@ buildPythonPackage rec { description = "Deploy Dask on job schedulers like PBS, SLURM, and SGE"; license = licenses.bsd3; maintainers = [ maintainers.costrouc ]; + broken = true; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dateparser/0.x.nix b/third_party/nixpkgs/pkgs/development/python-modules/dateparser/0.x.nix new file mode 100644 index 0000000000..49e2d1f279 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/dateparser/0.x.nix @@ -0,0 +1,55 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, mock +, parameterized +, pytestCheckHook +, dateutil +, pytz +, regex +, tzlocal +, convertdate +, umalqurra +, jdatetime +, ruamel_yaml +}: + +buildPythonPackage rec { + pname = "dateparser"; + version = "0.7.6"; + + src = fetchFromGitHub { + owner = "scrapinghub"; + repo = "dateparser"; + rev = "v${version}"; + sha256 = "0j3sm4hlx7z0ci5fnjq5n9i02vvlfz0wxa889ydryfknjhy5apqw"; + }; + + checkInputs = [ + mock + parameterized + pytestCheckHook + ]; + + pytestFlagsArray = [ "tests" ]; + + disabledTestPaths = [ + "tests/test_dateparser_data_integrity.py" # ImportError: No module named ruamel.yaml + ]; + + propagatedBuildInputs = [ + # install_requires + dateutil pytz regex tzlocal + # extra_requires + convertdate umalqurra jdatetime ruamel_yaml + ]; + + pythonImportsCheck = [ "dateparser" ]; + + meta = with lib; { + description = "Date parsing library designed to parse dates from HTML pages"; + homepage = "https://github.com/scrapinghub/dateparser"; + license = licenses.bsd3; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/defcon/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/defcon/default.nix index 25c5902999..36025e85bf 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/defcon/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/defcon/default.nix @@ -1,18 +1,24 @@ { lib, buildPythonPackage, fetchPypi, pythonOlder -, fonttools +, fonttools, setuptools-scm , pytest, pytestrunner, lxml, fs, unicodedata2, fontpens }: buildPythonPackage rec { pname = "defcon"; - version = "0.7.2"; + version = "0.8.0"; + + disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "1lfqsvxmq1j0nvp26gidnqkj1dyxv7jalc6i7fz1r3nc7niflrqr"; + sha256 = "028j7i39m75fnbyc6jsvwwiz31vq4slxwf47y6yszy1qn61xkcna"; extension = "zip"; }; + nativeBuildInputs = [ + setuptools-scm + ]; + propagatedBuildInputs = [ fonttools ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/django-extensions/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/django-extensions/default.nix index 455eeebddd..9bd72965cf 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/django-extensions/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/django-extensions/default.nix @@ -18,13 +18,13 @@ buildPythonPackage rec { pname = "django-extensions"; - version = "3.1.0"; + version = "3.1.1"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "hZ6GS2VkXH8KfKZuL1rR6JS/nDkx8SfKuUx5XrvTbec="; + sha256 = "0ss5x3d21c3g8i1s79l4akazlf116yp4y50gx4vrk1dxh3jb29zj"; }; LC_ALL = "en_US.UTF-8"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/docker/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/docker/default.nix index 8a9e9c9080..ab7a7b664b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/docker/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/docker/default.nix @@ -1,8 +1,11 @@ -{ lib, stdenv, buildPythonPackage, fetchPypi, isPy27 +{ lib +, stdenv +, buildPythonPackage +, fetchPypi +, isPy27 , backports_ssl_match_hostname , mock , paramiko -, pytest , pytestCheckHook , requests , six @@ -11,11 +14,11 @@ buildPythonPackage rec { pname = "docker"; - version = "4.4.3"; + version = "4.4.4"; src = fetchPypi { inherit pname version; - sha256 = "de5753b7f6486dd541a98393e423e387579b8974a5068748b83f852cc76a89d6"; + sha256 = "d3393c878f575d3a9ca3b94471a3c89a6d960b35feb92f033c0de36cc9d934db"; }; nativeBuildInputs = lib.optional isPy27 mock; @@ -32,8 +35,9 @@ buildPythonPackage rec { ]; pytestFlagsArray = [ "tests/unit" ]; + # Deselect socket tests on Darwin because it hits the path length limit for a Unix domain socket - disabledTests = lib.optionals stdenv.isDarwin [ "stream_response" "socket_file" ]; + disabledTests = lib.optionals stdenv.isDarwin [ "api_test" "stream_response" "socket_file" ]; dontUseSetuptoolsCheck = true; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/elementpath/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/elementpath/default.nix index f675d90e93..745b7a7b10 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/elementpath/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/elementpath/default.nix @@ -1,7 +1,7 @@ { lib, buildPythonPackage, fetchFromGitHub, isPy27 }: buildPythonPackage rec { - version = "2.1.4"; + version = "2.2.0"; pname = "elementpath"; disabled = isPy27; # uses incompatible class syntax @@ -9,7 +9,7 @@ buildPythonPackage rec { owner = "sissaschool"; repo = "elementpath"; rev = "v${version}"; - sha256 = "00v6npm7d4bk4cnpzacxybn165x6vjqrydssznn0bxzv8aynm1vb"; + sha256 = "1xfn5yasi849vs06ffxq6phapm6gc3p8yvdyvqmb47gbnji5mpb5"; }; # avoid circular dependency with xmlschema which directly depends on this diff --git a/third_party/nixpkgs/pkgs/development/python-modules/flowlogs_reader/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/flowlogs_reader/default.nix index 9fd36fab29..f8468209bb 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/flowlogs_reader/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/flowlogs_reader/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "flowlogs_reader"; - version = "2.3.0"; + version = "2.4.0"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "19118ff77925c66a6782152066d86bc8d5c6ed60189b642263fb0c6eb7cb22ef"; + sha256 = "e47637b40a068a0c814ba2087fb691b43aa12e6174ab06b6cdb7109bb94624e4"; }; propagatedBuildInputs = [ botocore boto3 docutils ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/fontparts/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/fontparts/default.nix index 9a57b1574a..3280f5f4bb 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/fontparts/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/fontparts/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "fontParts"; - version = "0.9.9"; + version = "0.9.10"; src = fetchPypi { inherit pname version; - sha256 = "1iz04kpxgc5fx2rl4585hr1vp4cdajqbddlskkhlmzkn9hvz528i"; + sha256 = "0hwjnqbkcfkhigx581w4532vddsx5wiy73gx46kjisp0hlir9628"; extension = "zip"; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-dns/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-dns/default.nix index fa4c8c6c52..3e80f9def4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-dns/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-dns/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "google-cloud-dns"; - version = "0.32.1"; + version = "0.32.2"; src = fetchPypi { inherit pname version; - sha256 = "01l6pvfic0vxcvd97ckbxyc7ccr9vb9ln4lyhpp3amdmcy0far3j"; + sha256 = "0ec98a9933b2abd95b174c9cae0477b90aa4c1f5068b69a9f8ced6d20db1cd5a"; }; propagatedBuildInputs = [ google-api-core google-cloud-core ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-monitoring/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-monitoring/default.nix index fb38954629..60783d3ded 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-monitoring/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-monitoring/default.nix @@ -35,7 +35,7 @@ buildPythonPackage rec { meta = with lib; { description = "Stackdriver Monitoring API client library"; - homepage = "https://github.com/GoogleCloudPlatform/google-cloud-python"; + homepage = "https://github.com/googleapis/python-monitoring"; license = licenses.asl20; maintainers = with maintainers; [ SuperSandro2000 ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/gspread/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/gspread/default.nix index 0370f80b4a..beaf1e4f90 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/gspread/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/gspread/default.nix @@ -7,12 +7,12 @@ }: buildPythonPackage rec { - version = "3.6.0"; + version = "3.7.0"; pname = "gspread"; src = fetchPypi { inherit pname version; - sha256 = "e04f1a6267b3929fc1600424c5ec83906d439672cafdd61a9d5b916a139f841c"; + sha256 = "4bda4ab8c5edb9e41cf4ae40d4d5fb30447522b4e43608e05c01351ab1b96912"; }; propagatedBuildInputs = [ requests google-auth google-auth-oauthlib ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/gssapi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/gssapi/default.nix index e5149f6025..c8149a5fed 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/gssapi/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/gssapi/default.nix @@ -7,7 +7,7 @@ , decorator , nose , krb5Full -, darwin +, GSS , parameterized , shouldbe , cython @@ -44,7 +44,7 @@ buildPythonPackage rec { ]; buildInputs = lib.optionals stdenv.isDarwin [ - darwin.apple_sdk.frameworks.GSS + GSS ]; checkInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/hcloud/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/hcloud/default.nix index 8f9d69a894..192589cdc8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/hcloud/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/hcloud/default.nix @@ -12,11 +12,11 @@ buildPythonPackage rec { pname = "hcloud"; - version = "1.10.0"; + version = "1.11.0"; src = fetchPypi { inherit pname version; - sha256 = "11sdyays90lmkbdxhllc8ccx0xhrafb7dknqgjlrfpzq04v67vyy"; + sha256 = "1yq7g9hk6b95nqd0f7kvh9r8ij8k9hs6gmjif83qip98xvkdwf0b"; }; propagatedBuildInputs = [ future requests python-dateutil ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/hdmedians/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/hdmedians/default.nix index f1b0d13e56..cc953aa696 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/hdmedians/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/hdmedians/default.nix @@ -7,12 +7,12 @@ }: buildPythonPackage rec { - version = "0.14.1"; + version = "0.14.2"; pname = "hdmedians"; src = fetchPypi { inherit pname version; - sha256 = "ccefaae26302afd843c941b3b662f1119d5a36dec118077310f811a7a1ed8871"; + sha256 = "b47aecb16771e1ba0736557255d80ae0240b09156bff434321de559b359ac2d6"; }; # nose was specified in setup.py as a build dependency... 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 e1318b51ae..61c9e85ced 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.14.3"; + version = "1.14.4"; disabled = isPy27; src = fetchFromGitHub { owner = "kellyjonbrazil"; repo = "jc"; rev = "v${version}"; - sha256 = "sha256-6ofw74onFECJYYSuZlOVcNVAVuJaJKV4pkaJ4cTrvPk="; + sha256 = "sha256-RJiJByORpdMWZkA7q7A+WoV4S/UcOP/VZ5TVxFMLYSg="; }; propagatedBuildInputs = [ ruamel_yaml xmltodict pygments ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/labelbox/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/labelbox/default.nix index 85e0fbe713..1c29d74736 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/labelbox/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/labelbox/default.nix @@ -14,11 +14,11 @@ buildPythonPackage rec { pname = "labelbox"; - version = "2.4.10"; + version = "2.4.11"; src = fetchPypi { inherit pname version; - sha256 = "b58604ee50c54a35994e54741d9071ecfebb6d6b9b2737604a95f29c4f23d6ec"; + sha256 = "e5a631a94ac2059648a884bebf39f7ca1e689baef4a2497f9aa5ec598e24deb7"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/libcst/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/libcst/default.nix index 00f8634e47..fd8c4da638 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/libcst/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/libcst/default.nix @@ -3,7 +3,6 @@ , fetchFromGitHub , pythonOlder , hypothesis -, doCheck ? true , dataclasses , hypothesmith , pytestCheckHook @@ -29,12 +28,13 @@ buildPythonPackage rec { disabled = pythonOlder "3.6"; - propagatedBuildInputs = [ hypothesis typing-inspect pyyaml ] + propagatedBuildInputs = [ hypothesis typing-extensions typing-inspect pyyaml ] ++ lib.optional (pythonOlder "3.7") dataclasses; checkInputs = [ black hypothesmith isort pytestCheckHook ]; - inherit doCheck; + # can't run tests due to circular dependency on hypothesmith -> licst + doCheck = false; preCheck = '' python -m libcst.codegen.generate visitors @@ -44,8 +44,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "libcst" ]; meta = with lib; { - description = - "A Concrete Syntax Tree (CST) parser and serializer library for Python."; + description = "A Concrete Syntax Tree (CST) parser and serializer library for Python."; homepage = "https://github.com/Instagram/libcst"; license = with licenses; [ mit asl20 psfl ]; maintainers = with maintainers; [ ruuda SuperSandro2000 ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/marisa-trie/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/marisa-trie/default.nix index 031f7b0402..e646ee71ec 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/marisa-trie/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/marisa-trie/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchPypi +, cython , pytestrunner , pytest , hypothesis @@ -20,7 +21,11 @@ buildPythonPackage rec { --replace "hypothesis==" "hypothesis>=" ''; - nativeBuildInputs = [ pytestrunner ]; + nativeBuildInputs = [ cython pytestrunner ]; + + preBuild = '' + ./update_cpp.sh + ''; checkInputs = [ pytest hypothesis ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mmh3/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mmh3/default.nix index cd2b01d057..66d33d97f7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mmh3/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mmh3/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "mmh3"; - version = "2.5.1"; + version = "3.0.0"; src = fetchPypi { inherit pname version; - sha256 = "0265pvfbcsijf51szsh14qk3l3zgs0rb5rbrw11zwan52yi0jlhq"; + sha256 = "d1ec578c09a07d3518ec9be540b87546397fa3455de73c166fcce51eaa5c41c5"; }; pythonImportsCheck = [ "mmh3" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/mpi4py/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/mpi4py/default.nix index 058133665f..6e8fd896d9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/mpi4py/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/mpi4py/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchPypi, python, buildPythonPackage, mpi, openssh }: +{ lib, fetchPypi, fetchpatch, python, buildPythonPackage, mpi, openssh }: buildPythonPackage rec { pname = "mpi4py"; @@ -9,6 +9,12 @@ buildPythonPackage rec { sha256 = "012d716c8b9ed1e513fcc4b18e5af16a8791f51e6d1716baccf988ad355c5a1f"; }; + patches = [ (fetchpatch { + name = "disable-broken-test"; # upstream patch + url = "https://github.com/mpi4py/mpi4py/commit/e13cc3ee59ec6ec2c6ee20e384e1e649d5027e8a.patch"; + sha256 = "0iwknrhxnfmsqjj8ahpn50c8pcdyv9p3wmcqi1jhr4i5y7lnmvvx"; + })]; + passthru = { inherit mpi; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/objgraph/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/objgraph/default.nix index c79b11252b..0d2da52f01 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/objgraph/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/objgraph/default.nix @@ -3,7 +3,7 @@ , fetchPypi , isPyPy , substituteAll -, graphvizPkg +, graphvizPkgs , graphviz , mock }: @@ -23,7 +23,7 @@ buildPythonPackage rec { patches = [ (substituteAll { src = ./hardcode-graphviz-path.patch; - graphviz = graphvizPkg; + graphviz = graphvizPkgs; }) ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pikepdf/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pikepdf/default.nix index 8ed27ea962..565822c335 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pikepdf/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pikepdf/default.nix @@ -23,12 +23,12 @@ buildPythonPackage rec { pname = "pikepdf"; - version = "2.5.2"; + version = "2.8.0"; disabled = ! isPy3k; src = fetchPypi { inherit pname version; - sha256 = "sha256-j8PpeyTa+9SxrAV8jxRMGEZ85V00KhqMQmiIkOrVjvM="; + sha256 = "74ff96fddd21cd4c0830eb549137ea9eccbdbff8cef4f684322b9afb8e42ccb5"; }; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/plotly/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/plotly/default.nix index f11cf1c098..e2496d6097 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/plotly/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/plotly/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "plotly"; - version = "4.13.0"; + version = "4.14.3"; src = fetchPypi { inherit pname version; - sha256 = "20df14f7883807f57d96ac245841e086a1799f2c2778462a7f3bca704e369c66"; + sha256 = "14cxlfl79i9bh3awsf4xgwr14ywm7lnrz2a81s7gp0if77nsx2kx"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pre-commit/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pre-commit/default.nix index 88fb6e3abf..1b5af02dca 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pre-commit/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pre-commit/default.nix @@ -2,7 +2,6 @@ , aspy-yaml , cached-property , cfgv -, futures , identify , importlib-metadata , importlib-resources @@ -16,13 +15,13 @@ buildPythonPackage rec { pname = "pre-commit"; - version = "2.7.1"; + version = "2.11.0"; disabled = isPy27; src = fetchPypi { inherit version; pname = "pre_commit"; - sha256 = "0w2a104yhbw1z92rcwpq0gdjsxvr2bwx5ry5xhlf2psnfkjx6ky5"; + sha256 = "15f1chxrbmfcajk1ngk3jvf6jjbigb5dg66wnn7phmlywaawpy06"; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pre-commit/languages-use-the-hardcoded-path-to-python-binaries.patch b/third_party/nixpkgs/pkgs/development/python-modules/pre-commit/languages-use-the-hardcoded-path-to-python-binaries.patch index c1bead48b3..6d274aae3c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pre-commit/languages-use-the-hardcoded-path-to-python-binaries.patch +++ b/third_party/nixpkgs/pkgs/development/python-modules/pre-commit/languages-use-the-hardcoded-path-to-python-binaries.patch @@ -12,15 +12,15 @@ index 26f4919..4885ec1 100644 if version != C.DEFAULT: cmd.extend(['-n', version]) diff --git a/pre_commit/languages/python.py b/pre_commit/languages/python.py -index e17376e..0c1d2ab 100644 +index 43b7280..f0f2338 100644 --- a/pre_commit/languages/python.py +++ b/pre_commit/languages/python.py -@@ -204,7 +204,7 @@ def install_environment( +@@ -192,7 +192,7 @@ def install_environment( + additional_dependencies: Sequence[str], ) -> None: envdir = prefix.path(helpers.environment_dir(ENVIRONMENT_DIR, version)) +- venv_cmd = [sys.executable, '-mvirtualenv', envdir] ++ venv_cmd = ['@virtualenv@/bin/virtualenv', envdir] python = norm_version(version) -- venv_cmd = (sys.executable, '-mvirtualenv', envdir, '-p', python) -+ venv_cmd = ('@virtualenv@/bin/virtualenv', envdir, '-p', python) - install_cmd = ('python', '-mpip', 'install', '.', *additional_dependencies) - - with clean_path_on_failure(envdir): + if python is not None: + venv_cmd.extend(('-p', python)) diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pymysensors/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pymysensors/default.nix index bbfeec3a36..24d7d4c282 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pymysensors/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pymysensors/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "pymysensors"; - version = "0.20.1"; + version = "0.21.0"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "theolind"; repo = pname; rev = version; - sha256 = "1hz3551ydsmd23havd0dljmvkhzjnmd28k41ws60s8ms3gzlzqfy"; + sha256 = "1k75gwvyzslyjr3cdx8b74fb302k2i7bda4q92rb75rhgp4gch55"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pystray/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pystray/default.nix index 6b4bdb59f1..39fab3e7bf 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pystray/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pystray/default.nix @@ -3,13 +3,13 @@ buildPythonPackage rec { pname = "pystray"; - version = "0.16.0"; + version = "0.17.2"; src = fetchFromGitHub { owner = "moses-palmer"; repo = "pystray"; rev = "v${version}"; - sha256 = "0q5yqfm5mzffx9vnp9xcnclgjzgs0b7f50i9xmxn1m1iha1zawh1"; + sha256 = "sha256-/dU+jwe/3qhypq7e5tawhJKzSryW7EIbmrpP+VLDvHA="; }; propagatedBuildInputs = [ pillow xlib six ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest-sanic/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest-sanic/default.nix index 0044a13d2c..e2353c4840 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytest-sanic/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest-sanic/default.nix @@ -1,28 +1,41 @@ { lib -, buildPythonPackage -, fetchPypi -, pytest -, aiohttp , async_generator +, buildPythonPackage +, doCheck ? true +, fetchFromGitHub +, httpx +, pytest +, pytestCheckHook +, sanic +, websockets }: buildPythonPackage rec { pname = "pytest-sanic"; - version = "1.6.2"; + version = "1.7.0"; - src = fetchPypi { - inherit pname version; - sha256 = "6428ed8cc2e6cfa05b92689a8589149aacdc1f0640fcf9673211aa733e6a5209"; + src = fetchFromGitHub { + owner = "yunstanford"; + repo = pname; + rev = "v${version}"; + sha256 = "1zpgnw1lqbll59chv4hgcn31mdql1nv4gw9crbihky3ly3d3ncqi"; }; propagatedBuildInputs = [ - pytest - aiohttp async_generator + httpx + pytest + websockets ]; - # circular dependency on sanic - doCheck = false; + checkInputs = [ + sanic + pytestCheckHook + ]; + + inherit doCheck; + + pythonImportsCheck = [ "pytest_sanic" ]; meta = with lib; { description = "A pytest plugin for Sanic"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytile/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytile/default.nix index 226fdbc715..720fdff743 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytile/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytile/default.nix @@ -13,18 +13,22 @@ buildPythonPackage rec { pname = "pytile"; - version = "5.1.1"; + version = "5.2.1"; disabled = pythonAtLeast "3.9"; src = fetchFromGitHub { owner = "bachya"; repo = pname; rev = version; - sha256 = "sha256-bVoFTaK/Alemtc5I+Z/M9y/FWczvJ+P86R0DMD89/BM="; + sha256 = "0d63xga4gjlfl9fzv3i4j605rrx2qgbzam6cl609ny96s8q8h1px"; }; format = "pyproject"; + postPatch = '' + substituteInPlace pyproject.toml --replace 'aiohttp = "^3.7.4"' 'aiohttp = "^3.7.3"' + ''; + nativeBuildInputs = [ poetry-core ]; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytorch/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytorch/default.nix index 98efb169df..22a87b386e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytorch/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytorch/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, fetchFromGitHub, fetchpatch, buildPythonPackage, python, - cudaSupport ? false, cudatoolkit ? null, cudnn ? null, nccl ? null, magma ? null, + cudaSupport ? false, cudatoolkit, cudnn, nccl, magma, mklDnnSupport ? true, useSystemNccl ? true, MPISupport ? false, mpi, buildDocs ? false, @@ -30,8 +30,6 @@ isPy3k, pythonOlder }: # assert that everything needed for cuda is present and that the correct cuda versions are used -assert !cudaSupport || cudatoolkit != null; -assert cudnn == null || cudatoolkit != null; assert !cudaSupport || (let majorIs = lib.versions.major cudatoolkit.version; in majorIs == "9" || majorIs == "10" || majorIs == "11"); @@ -297,12 +295,13 @@ in buildPythonPackage rec { install_name_tool -change @rpath/libc10.dylib $lib/lib/libc10.dylib $lib/lib/libshm.dylib ''; - - meta = { + meta = with lib; { description = "Open source, prototype-to-production deep learning platform"; homepage = "https://pytorch.org/"; - license = lib.licenses.bsd3; - platforms = with lib.platforms; linux ++ lib.optionals (!cudaSupport) darwin; - maintainers = with lib.maintainers; [ danieldk teh thoughtpolice tscholak ]; # tscholak esp. for darwin-related builds + license = licenses.bsd3; + platforms = with platforms; linux ++ lib.optionals (!cudaSupport) darwin; + maintainers = with maintainers; [ danieldk teh thoughtpolice tscholak ]; # tscholak esp. for darwin-related builds + # error: use of undeclared identifier 'noU'; did you mean 'no'? + broken = stdenv.isDarwin; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/safety/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/safety/default.nix index c268f26995..dd840c3389 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/safety/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/safety/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "safety"; - version = "1.9.0"; + version = "1.10.3"; src = fetchPypi { inherit pname version; - sha256 = "23bf20690d4400edc795836b0c983c2b4cbbb922233108ff925b7dd7750f00c9"; + sha256 = "sha256-MOOU0CogrEm39lKS0Z04+pJ6j5WCzf060a27xmxkGtU="; }; propagatedBuildInputs = [ requests dparse click setuptools ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sagemaker/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sagemaker/default.nix index d6ed054624..f8de633c61 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sagemaker/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sagemaker/default.nix @@ -14,11 +14,11 @@ buildPythonPackage rec { pname = "sagemaker"; - version = "2.29.0"; + version = "2.29.1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-xhm9KJiJdg8LD8Q33A61V6zXz1K9S4cROxy9iCxjK7M="; + sha256 = "sha256-5hFX6tVLolPxC/40ssdr0XYp3Vn3fVvBWGi7Utp6/k8="; }; pythonImportsCheck = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sanic/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sanic/default.nix index f503b0b855..e5faa440ad 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sanic/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sanic/default.nix @@ -1,4 +1,4 @@ -{ lib, buildPythonPackage, fetchPypi +{ lib, buildPythonPackage, fetchPypi, doCheck ? true , aiofiles, httptools, httpx, multidict, ujson, uvloop, websockets , pytestCheckHook, beautifulsoup4, gunicorn, httpcore, uvicorn , pytest-asyncio, pytest-benchmark, pytest-dependency, pytest-sanic, pytest-sugar, pytestcov @@ -13,7 +13,7 @@ buildPythonPackage rec { sha256 = "06p0lsxqbfbka2yaqlpp0bg5pf7ma44zi6kq7qbb6hhry48dp1w6"; }; - patchPhase = '' + postPatch = '' substituteInPlace setup.py \ --replace '"multidict==5.0.0"' '"multidict"' \ --replace '"httpx==0.15.4"' '"httpx"' \ @@ -30,14 +30,19 @@ buildPythonPackage rec { pytest-asyncio pytest-benchmark pytest-dependency pytest-sanic pytest-sugar pytestcov ]; + inherit doCheck; + disabledTests = [ "test_gunicorn" # No "examples" directory in pypi distribution. "test_logo" # Fails to filter out "DEBUG asyncio:selector_events.py:59 Using selector: EpollSelector" "test_zero_downtime" # No "examples.delayed_response.app" module in pypi distribution. + "test_reloader_live" # OSError: [Errno 98] error while attempting to bind on address ('127.0.0.1', 42104) ]; __darwinAllowLocalNetworking = true; + pythonImportsCheck = [ "sanic" ]; + meta = with lib; { description = "A microframework based on uvloop, httptools, and learnings of flask"; homepage = "http://github.com/channelcat/sanic/"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sentry-sdk/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sentry-sdk/default.nix index 6b49d6db49..ba5b37c8d9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sentry-sdk/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sentry-sdk/default.nix @@ -29,11 +29,11 @@ buildPythonPackage rec { pname = "sentry-sdk"; - version = "0.19.5"; + version = "1.0.0"; src = fetchPypi { inherit pname version; - sha256 = "0grba3rpgg20sqhrh8mxcjwmwgbwrybrxymavh7xsad59570jykk"; + sha256 = "71de00c9711926816f750bc0f57ef2abbcb1bfbdf5378c601df7ec978f44857a"; }; checkInputs = [ blinker botocore chalice django flask tornado bottle rq falcon sqlalchemy werkzeug trytond 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 9cbbf8c2dd..0679b25ad4 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 @@ -33,6 +33,12 @@ buildPythonPackage rec { sha256 = "ad62bfd31e677d39984449d9c68e233da2776b80894a988a2421aad412e4c44f"; }; + postPatch = '' + substituteInPlace setup.py \ + --replace "'pyOpenSSL>=16.2.0,<20.0.0'," "'pyOpenSSL'," \ + --replace 'pytz<2021.0' 'pytz' + ''; + propagatedBuildInputs = [ azure-storage-blob asn1crypto @@ -55,11 +61,6 @@ buildPythonPackage rec { urllib3 ]; - postPatch = '' - substituteInPlace setup.py \ - --replace "'pyOpenSSL>=16.2.0,<20.0.0'," "'pyOpenSSL'," - ''; - # tests require encrypted secrets, see # https://github.com/snowflakedb/snowflake-connector-python/tree/master/.github/workflows/parameters doCheck = false; 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 bccca3ee6b..9ec17443dd 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 @@ -27,5 +27,6 @@ buildPythonPackage rec { description = "Snowflake SQLAlchemy Dialect"; homepage = "https://www.snowflake.net/"; license = licenses.asl20; + maintainers = [ ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/update-dotdee/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/update-dotdee/default.nix index ec9dbd947c..1532fca78c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/update-dotdee/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/update-dotdee/default.nix @@ -2,13 +2,13 @@ buildPythonPackage rec { pname = "update-dotdee"; - version = "5.0"; + version = "6.0"; src = fetchFromGitHub { owner = "xolox"; repo = "python-update-dotdee"; rev = version; - sha256 = "1h3m593nwzx6vwa24k0wizb7la49yhqxwn73ipclxgxxi4dfdj01"; + sha256 = "sha256-2k7FdgWM0ESHQb2za87yhXGaR/rbMYLVcv10QexUH1A="; }; propagatedBuildInputs = [ executor naturalsort ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/vcrpy/3.nix b/third_party/nixpkgs/pkgs/development/python-modules/vcrpy/3.nix new file mode 100644 index 0000000000..ddd4015aad --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/vcrpy/3.nix @@ -0,0 +1,48 @@ +{ buildPythonPackage +, lib +, six +, fetchPypi +, pyyaml +, mock +, contextlib2 +, wrapt +, pytest +, pytest-httpbin +, yarl +, pythonOlder +, pythonAtLeast +}: + +buildPythonPackage rec { + pname = "vcrpy"; + version = "3.0.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "21168d5ae14263a833d4b71acfd8278d8841114f24be1b4ab4a5719d0c7f07bc"; + }; + + checkInputs = [ + pytest + pytest-httpbin + ]; + + propagatedBuildInputs = [ + pyyaml + wrapt + six + ] + ++ lib.optionals (pythonOlder "3.3") [ contextlib2 mock ] + ++ lib.optionals (pythonAtLeast "3.4") [ yarl ]; + + checkPhase = '' + py.test --ignore=tests/integration -k "not TestVCRConnection" + ''; + + meta = with lib; { + description = "Automatically mock your HTTP interactions to simplify and speed up testing"; + homepage = "https://github.com/kevin1024/vcrpy"; + license = licenses.mit; + }; +} + diff --git a/third_party/nixpkgs/pkgs/development/python-modules/vcrpy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/vcrpy/default.nix index e67bbc59e9..7766e75ba0 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/vcrpy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/vcrpy/default.nix @@ -1,5 +1,6 @@ { buildPythonPackage , lib +, isPy27 , six , fetchPypi , pyyaml @@ -17,6 +18,8 @@ buildPythonPackage rec { pname = "vcrpy"; version = "4.1.1"; + disabled = isPy27; + src = fetchPypi { inherit pname version; sha256 = "57095bf22fc0a2d99ee9674cdafebed0f3ba763018582450706f7d3a74fff599"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/watchdog/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/watchdog/default.nix index 31f41c5009..ef80dedeb9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/watchdog/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/watchdog/default.nix @@ -1,13 +1,14 @@ -{ lib, stdenv +{ lib +, stdenv , buildPythonPackage , fetchPypi , fetchpatch , argh , pathtools , pyyaml -, pkgs , pytest-cov , pytestCheckHook +, CoreServices }: buildPythonPackage rec { @@ -27,8 +28,7 @@ buildPythonPackage rec { }) ]; - buildInputs = lib.optionals stdenv.isDarwin - [ pkgs.darwin.apple_sdk.frameworks.CoreServices ]; + buildInputs = lib.optionals stdenv.isDarwin [ CoreServices ]; propagatedBuildInputs = [ argh @@ -48,6 +48,7 @@ buildPythonPackage rec { homepage = "https://github.com/gorakhargosh/watchdog"; license = licenses.asl20; maintainers = with maintainers; [ goibhniu ]; + # error: use of undeclared identifier 'kFSEventStreamEventFlagItemCloned' + broken = stdenv.isDarwin; }; - } 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 13545c0430..84fbacca26 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/yamllint/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/yamllint/default.nix @@ -1,26 +1,42 @@ -{ lib, buildPythonPackage, fetchPypi -, nose, pyyaml, pathspec }: +{ lib +, buildPythonPackage +, fetchPypi +, pathspec +, pytestCheckHook +, pythonOlder +, pyyaml +}: buildPythonPackage rec { pname = "yamllint"; version = "1.25.0"; + disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; sha256 = "b1549cbe5b47b6ba67bdeea31720f5c51431a4d0c076c1557952d841f7223519"; }; - checkInputs = [ nose ]; + propagatedBuildInputs = [ + pyyaml + pathspec + ]; - propagatedBuildInputs = [ pyyaml pathspec ]; + checkInputs = [ + pytestCheckHook + ]; - # Two test failures - doCheck = false; + disabledTests = [ + # Test failure could be related to https://github.com/adrienverge/yamllint/issues/334 + "test_find_files_recursively" + ]; + + pythonImportsCheck = [ "yamllint" ]; meta = with lib; { description = "A linter for YAML files"; homepage = "https://github.com/adrienverge/yamllint"; - license = licenses.gpl3; + license = licenses.gpl3Plus; maintainers = with maintainers; [ jonringer mikefaille ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/tools/analysis/nix-linter/default.nix b/third_party/nixpkgs/pkgs/development/tools/analysis/nix-linter/default.nix index 138933ebb5..dea2fd895f 100644 --- a/third_party/nixpkgs/pkgs/development/tools/analysis/nix-linter/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/analysis/nix-linter/default.nix @@ -1,7 +1,6 @@ { lib , mkDerivation , fetchFromGitHub -, fetchpatch , fixplate , tasty , tasty-hunit @@ -37,13 +36,10 @@ mkDerivation rec { executableHaskellDepends = [ streamly mtl path pretty-terminal text base aeson cmdargs containers hnix bytestring path-io ]; testHaskellDepends = [ tasty tasty-hunit tasty-th ]; - patches = [ - # raise upper bound on hnix https://github.com/Synthetica9/nix-linter/pull/46 - (fetchpatch { - url = "https://github.com/Synthetica9/nix-linter/commit/b406024e525977b3c69d78d6a94a683e2ded121f.patch"; - sha256 = "0viwbprslcmy70bxy3v27did79nqhlc0jcx4kp0lycswaccvnp1j"; - }) - ]; + # Relax upper bound on hnix https://github.com/Synthetica9/nix-linter/pull/46 + postPatch = '' + substituteInPlace nix-linter.cabal --replace "hnix >=0.8 && < 0.11" "hnix >=0.8" + ''; description = "Linter for Nix(pkgs), based on hnix"; homepage = "https://github.com/Synthetica9/nix-linter"; diff --git a/third_party/nixpkgs/pkgs/development/tools/analysis/tfsec/default.nix b/third_party/nixpkgs/pkgs/development/tools/analysis/tfsec/default.nix index 1c26f64b21..f5450be16b 100644 --- a/third_party/nixpkgs/pkgs/development/tools/analysis/tfsec/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/analysis/tfsec/default.nix @@ -2,13 +2,13 @@ buildGoPackage rec { pname = "tfsec"; - version = "0.38.4"; + version = "0.39.5"; src = fetchFromGitHub { owner = "tfsec"; repo = pname; rev = "v${version}"; - sha256 = "sha256-BWWW54AXj/aV+Yar0EVZPl9fN2l29SgzpRDin1Y76BA="; + sha256 = "sha256-RDvwZyltPD21CQwZISOrLPVgQeRmPQc6/yssptS4XMw="; }; goPackagePath = "github.com/tfsec/tfsec"; diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/bear/default.nix b/third_party/nixpkgs/pkgs/development/tools/build-managers/bear/default.nix index 74b1f70402..e7b0c1d105 100644 --- a/third_party/nixpkgs/pkgs/development/tools/build-managers/bear/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/bear/default.nix @@ -12,17 +12,19 @@ , c-ares , abseil-cpp , zlib +, sqlite +, re2 }: stdenv.mkDerivation rec { pname = "bear"; - version = "3.0.3"; + version = "3.0.9"; src = fetchFromGitHub { owner = "rizsotto"; repo = pname; rev = version; - sha256 = "1abx5h6xy0h3mz29ial5si8smkmjzla050d130pcc6dzr4ic642w"; + sha256 = "xac8PYo3qYjtQbDy8piOz5BQQpcVlAvMCv1qHrVZmPQ="; }; nativeBuildInputs = [ cmake pkg-config ]; @@ -38,6 +40,8 @@ stdenv.mkDerivation rec { c-ares abseil-cpp zlib + sqlite + re2 ]; patches = [ @@ -56,5 +60,7 @@ stdenv.mkDerivation rec { license = licenses.gpl3Plus; platforms = platforms.unix; maintainers = [ maintainers.babariviere ]; + # ld: symbol(s) not found for architecture x86_64 + broken = stdenv.isDarwin; }; } diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/bear/no-double-relative.patch b/third_party/nixpkgs/pkgs/development/tools/build-managers/bear/no-double-relative.patch index 0184bdfd6b..f4d247fa57 100644 --- a/third_party/nixpkgs/pkgs/development/tools/build-managers/bear/no-double-relative.patch +++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/bear/no-double-relative.patch @@ -1,5 +1,5 @@ diff --git a/source/config.h.in b/source/config.h.in -index 2ca8853..2564c63 100644 +index 728c234..a3e76c6 100644 --- a/source/config.h.in +++ b/source/config.h.in @@ -65,6 +65,6 @@ constexpr char VERSION[] = "@CMAKE_PROJECT_VERSION@"; @@ -7,8 +7,8 @@ index 2ca8853..2564c63 100644 constexpr char CITNAMES_DEFAULT_PATH[] = "@ROOT_INSTALL_PREFIX@/@CMAKE_INSTALL_BINDIR@/citnames"; constexpr char INTERCEPT_DEFAULT_PATH[] = "@ROOT_INSTALL_PREFIX@/@CMAKE_INSTALL_BINDIR@/intercept"; -constexpr char LIBRARY_DEFAULT_PATH[] = "@ROOT_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBEXECDIR@/@CMAKE_SHARED_LIBRARY_PREFIX@exec@CMAKE_SHARED_LIBRARY_SUFFIX@"; --constexpr char EXECUTOR_DEFAULT_PATH[] = "@ROOT_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBEXECDIR@/er"; --constexpr char WRAPPER_DEFAULT_PATH[] = "@ROOT_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBEXECDIR@/wrapper.d"; +-constexpr char WRAPPER_DEFAULT_PATH[] = "@ROOT_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBEXECDIR@/wrapper"; +-constexpr char WRAPPER_DIR_DEFAULT_PATH[] = "@ROOT_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBEXECDIR@/wrapper.d"; +constexpr char LIBRARY_DEFAULT_PATH[] = "@CMAKE_INSTALL_LIBEXECDIR@/@CMAKE_SHARED_LIBRARY_PREFIX@exec@CMAKE_SHARED_LIBRARY_SUFFIX@"; -+constexpr char EXECUTOR_DEFAULT_PATH[] = "@CMAKE_INSTALL_LIBEXECDIR@/er"; -+constexpr char WRAPPER_DEFAULT_PATH[] = "@CMAKE_INSTALL_LIBEXECDIR@/wrapper.d"; ++constexpr char WRAPPER_DEFAULT_PATH[] = "@CMAKE_INSTALL_LIBEXECDIR@/wrapper"; ++constexpr char WRAPPER_DIR_DEFAULT_PATH[] = "@CMAKE_INSTALL_LIBEXECDIR@/wrapper.d"; diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/sbt/default.nix b/third_party/nixpkgs/pkgs/development/tools/build-managers/sbt/default.nix index 09c1485e81..62d704fccd 100644 --- a/third_party/nixpkgs/pkgs/development/tools/build-managers/sbt/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/sbt/default.nix @@ -8,12 +8,12 @@ stdenv.mkDerivation rec { pname = "sbt"; - version = "1.4.8"; + version = "1.4.9"; src = fetchurl { url = "https://github.com/sbt/sbt/releases/download/v${version}/sbt-${version}.tgz"; - sha256 = "sha256-WXItvaPW0dfsfcPiHWGi6AAjAwpCQ4I+7q3XftnFo50="; + sha256 = "sha256-lUaBGfdkFJk2czCmCkuKYhHm6n+L3n1kfGexndj9224="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/tools/continuous-integration/jenkins/default.nix b/third_party/nixpkgs/pkgs/development/tools/continuous-integration/jenkins/default.nix index 6f11ee9e87..9807866f1b 100644 --- a/third_party/nixpkgs/pkgs/development/tools/continuous-integration/jenkins/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/continuous-integration/jenkins/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "jenkins"; - version = "2.263.4"; + version = "2.277.1"; src = fetchurl { url = "http://mirrors.jenkins.io/war-stable/${version}/jenkins.war"; - sha256 = "1disj0a0qh7gzjqm6bjb7dx0v74k74hkyvxpg12ahdj2g04p8jhx"; + sha256 = "0lficvngxzl7q088n3ssnnhjicd0xxr0k3n0inz7pvjj27dl35rr"; }; buildCommand = '' diff --git a/third_party/nixpkgs/pkgs/development/tools/database/timescaledb-tune/default.nix b/third_party/nixpkgs/pkgs/development/tools/database/timescaledb-tune/default.nix index 34d5d12607..e4132dd734 100644 --- a/third_party/nixpkgs/pkgs/development/tools/database/timescaledb-tune/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/database/timescaledb-tune/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "timescaledb-tune"; - version = "0.10.0"; + version = "0.11.0"; src = fetchFromGitHub { owner = "timescale"; repo = pname; rev = "v${version}"; - sha256 = "0vrbbswmg6z3n012mqd1jasqk01navypzv5m00r6c9bxj72hgcxl"; + sha256 = "sha256-orCnw+NM9jTrg0oeHg0CQvIXzbSkeCwwDUI1t/+k31o="; }; - vendorSha256 = "0hbpprbxs19fcar7xcy42kn9yfzhal2zsv5pml9ghiv2s61yns4z"; + vendorSha256 = "sha256-n2jrg9FiR/gSrbds/QVV8Duf7BTEs36yYi4F3Ve+d0E="; meta = with lib; { description = "A tool for tuning your TimescaleDB for better performance"; diff --git a/third_party/nixpkgs/pkgs/development/tools/ginkgo/default.nix b/third_party/nixpkgs/pkgs/development/tools/ginkgo/default.nix index c6ed583ce8..fbbb773519 100644 --- a/third_party/nixpkgs/pkgs/development/tools/ginkgo/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/ginkgo/default.nix @@ -2,15 +2,15 @@ buildGoModule rec { pname = "ginkgo"; - version = "1.15.0"; + version = "1.15.1"; src = fetchFromGitHub { owner = "onsi"; repo = "ginkgo"; rev = "v${version}"; - sha256 = "sha256-NvScoKnLr0herVrjEnij45yN0MxC/MoRJJHcy59rOuA="; + sha256 = "sha256-w2eP8mDGHHZGYQUU7lOe7gp3tdr9VO/NP5fFBWOWt/A="; }; - vendorSha256 = "sha256-xBa2n2BV+aXPCZ3G+rFIqHtjcXfs1rDjKbmRzjaDSb8="; + vendorSha256 = "sha256-fB9/cf2VOMXWLHnnHJZDmOutIUvPleWBGCirJrypCts="; doCheck = false; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/tools/glpaper/default.nix b/third_party/nixpkgs/pkgs/development/tools/glpaper/default.nix index 6b7b13437c..f6465d53ca 100644 --- a/third_party/nixpkgs/pkgs/development/tools/glpaper/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/glpaper/default.nix @@ -1,12 +1,14 @@ -{ lib, stdenv, fetchhg, meson, ninja, pkg-config, wlroots, wayland, wayland-protocols +{ lib, stdenv, fetchFromSourcehut, meson, ninja, pkg-config, wlroots, wayland, wayland-protocols , libX11, libGL }: -stdenv.mkDerivation { - name = "glpaper"; +stdenv.mkDerivation rec { + pname = "glpaper"; version = "unstable-2020-10-11"; - src = fetchhg { - url = "https://hg.sr.ht/~scoopta/glpaper"; + src = fetchFromSourcehut { + owner = "~scoopta"; + repo = pname; + vc = "hg"; rev = "9e7ec7cd270af330039c395345c7d23c04682267"; sha256 = "sha256-yBHRg6eg+PK/ixuM0MBty3RJY9qcemr3Dt+8SAitqnk="; }; 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 c196f167ce..e6d34ba413 100644 --- a/third_party/nixpkgs/pkgs/development/tools/go-task/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/go-task/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "go-task"; - version = "2.8.1"; + version = "3.2.2"; src = fetchFromGitHub { owner = pname; repo = "task"; rev = "v${version}"; - sha256 = "1yf5s22q4hsxvgzrj4k6gbbq0whl5b9j12mbwimxaf53q535wy4q"; + sha256 = "0x94z023rsl7h9prw0i4zkwb5xf2frjz8f15mmcknw48r9ymw598"; }; - vendorSha256 = null; + vendorSha256 = "05sh4jbva23ggg2viknl49bwgkhf8dfvsv3rqkl4wwi9ag64qgha"; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/development/tools/go-tools/default.nix b/third_party/nixpkgs/pkgs/development/tools/go-tools/default.nix index 8e58a81130..2bf5093e5e 100644 --- a/third_party/nixpkgs/pkgs/development/tools/go-tools/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/go-tools/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "go-tools"; - version = "2020.2.2"; + version = "2020.2.3"; src = fetchFromGitHub { owner = "dominikh"; repo = "go-tools"; rev = version; - sha256 = "1vk9c4hsv8i3zhkyrsd0cb5mscxl35ws5bykpp5h6g366rpl0dy1"; + sha256 = "17li8jbw3cpn59kpcl3j3r2an4wkx3fc81xn0j4xgbjpkxh9493n"; }; vendorSha256 = "081p008sb3lkc8j6sa6n42qi04za4a631kihrd4ca6aigwkgl3ak"; diff --git a/third_party/nixpkgs/pkgs/development/tools/gops/default.nix b/third_party/nixpkgs/pkgs/development/tools/gops/default.nix index 0f0230049c..ff9b2064ce 100644 --- a/third_party/nixpkgs/pkgs/development/tools/gops/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/gops/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "gops"; - version = "0.3.16"; + version = "0.3.17"; src = fetchFromGitHub { owner = "google"; repo = "gops"; rev = "v${version}"; - sha256 = "1ksypkja5smxvrhgcjk0w18ws97crx6bx5sj20sh8352xx0nm6mp"; + sha256 = "1l0k1v2wwwdrwwznrdq2ivbrl5z3hxa89xm89jlaglkd7jjg74zk"; }; vendorSha256 = null; diff --git a/third_party/nixpkgs/pkgs/development/tools/hcloud/default.nix b/third_party/nixpkgs/pkgs/development/tools/hcloud/default.nix index 3e6ef4d4d3..2ad3bcbf9a 100644 --- a/third_party/nixpkgs/pkgs/development/tools/hcloud/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/hcloud/default.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "hcloud"; - version = "1.20.0"; + version = "1.21.0"; src = fetchFromGitHub { owner = "hetznercloud"; repo = "cli"; rev = "v${version}"; - sha256 = "0sjshcppcfdfz29nsrzvrciypcb4r7fbl2sqhlkcq948b7k3jk8b"; + sha256 = "sha256-zXlsvuc778z1sxnv02mFJXQzkEEft0BdubWecvcytYg="; }; nativeBuildInputs = [ installShellFiles ]; - vendorSha256 = "0q6jm2ghwrbjxn76i8wz72xjdmwfvl5dn8n4zilyjjx9vvllwdjw"; + vendorSha256 = "sha256-QdTD6xeVNswaaMms82rFYb5jLDhxL+wQgaLVXqROSFs="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/development/tools/kustomize/default.nix b/third_party/nixpkgs/pkgs/development/tools/kustomize/default.nix index f658995fe9..b5b0c8b81b 100644 --- a/third_party/nixpkgs/pkgs/development/tools/kustomize/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/kustomize/default.nix @@ -2,9 +2,9 @@ buildGoModule rec { pname = "kustomize"; - version = "3.10.0"; - # rev is the 3.9.3 commit, mainly for kustomize version command output - rev = "602ad8aa98e2e17f6c9119e027a09757e63c8bec"; + version = "4.0.5"; + # 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 '' @@ -17,13 +17,16 @@ buildGoModule rec { owner = "kubernetes-sigs"; repo = pname; rev = "kustomize/v${version}"; - sha256 = "1qr0mi83df8d9qd2svyr1h26pg97qi67nnygrkydnp8an28k48hi"; + sha256 = "sha256-rv65sDr6V6hEYgIRxS1OSu9txmW75F7/YGAy/zRXGyY="; }; + # TODO: Remove once https://github.com/kubernetes-sigs/kustomize/pull/3708 got merged. + doCheck = false; + # avoid finding test and development commands sourceRoot = "source/kustomize"; - vendorSha256 = "0p2j8mm7jpladpm6v3451g38n5bax0g368dk5h5r5gmkr6srxdy4"; + vendorSha256 = "sha256-lLUi0vD7uyfDR4HjDiosoTU0NbfQTY7ewZGm38ZT9nU="; meta = with lib; { description = "Customization of kubernetes YAML configurations"; 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 c22f839321..e8e84a7f51 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/circleci-cli/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/circleci-cli/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "circleci-cli"; - version = "0.1.15085"; + version = "0.1.15108"; src = fetchFromGitHub { owner = "CircleCI-Public"; repo = pname; rev = "v${version}"; - sha256 = "sha256-KcC9KfAeUM3pMSNThL+w/kzpQYzcMYV6YoNEN4q6duA="; + sha256 = "sha256-r0GSv9JaQQkVLYDh51Rz6OIDTqV75RIT+NIWAFXWcV8="; }; vendorSha256 = "sha256-j7VP/QKKMdmWQ60BYpChG4syDlll7CY4rb4wfb4+Z1s="; diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/hydra/common.nix b/third_party/nixpkgs/pkgs/development/tools/misc/hydra/common.nix index c253bda36b..c557f9600c 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/hydra/common.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/hydra/common.nix @@ -5,7 +5,7 @@ , docbook_xsl, openssh, gnused, coreutils, findutils, gzip, lzma, gnutar , rpm, dpkg, cdrkit, pixz, lib, boost, autoreconfHook, src ? null, version ? null , migration ? false, patches ? [] -, tests ? {} +, tests ? {}, mdbook }: with stdenv; @@ -92,7 +92,7 @@ in stdenv.mkDerivation rec { gzip bzip2 lzma gnutar unzip git top-git mercurial /*darcs*/ gnused breezy ] ++ lib.optionals stdenv.isLinux [ rpm dpkg cdrkit ] ); - nativeBuildInputs = [ autoreconfHook pkg-config ]; + nativeBuildInputs = [ autoreconfHook pkg-config mdbook ]; configureFlags = [ "--with-docbook-xsl=${docbook_xsl}/xml/xsl/docbook" ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/hydra/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/hydra/default.nix index 1636ad6dd7..a49f223131 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/hydra/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/hydra/default.nix @@ -2,16 +2,13 @@ { hydra-unstable = callPackage ./common.nix { - version = "2020-10-20"; + version = "2021-03-10"; src = fetchFromGitHub { owner = "NixOS"; repo = "hydra"; - rev = "79d34ed7c93af2daf32cf44ee0e3e0768f13f97c"; - sha256 = "1lql899430137l6ghnhyz0ivkayy83fdr087ck2wq3gf1jv8pccj"; + rev = "930f05c38eeac63ad6c3e3250de2667e2df2e96e"; + sha256 = "06s2lg119p96i1j4rdbg3z097n25bgvq8ljdn4vcwcw3yz0lnswm"; }; - patches = [ - ./hydra-nix-receiveContents.patch - ]; nix = nixFlakes; tests = { diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/hydra/hydra-nix-receiveContents.patch b/third_party/nixpkgs/pkgs/development/tools/misc/hydra/hydra-nix-receiveContents.patch deleted file mode 100644 index 61957e2190..0000000000 --- a/third_party/nixpkgs/pkgs/development/tools/misc/hydra/hydra-nix-receiveContents.patch +++ /dev/null @@ -1,18 +0,0 @@ -Update for https://github.com/NixOS/nix/commit/faa31f40 - ---- a/src/hydra-queue-runner/nar-extractor.cc -+++ b/src/hydra-queue-runner/nar-extractor.cc -@@ -48,9 +48,9 @@ -- void receiveContents(unsigned char * data, size_t len) override -+ void receiveContents(std::string_view data) override - { - assert(expectedSize); - assert(curMember); - assert(hashSink); -- *curMember->fileSize += len; -- (*hashSink)(data, len); -+ *curMember->fileSize += data.size(); -+ (*hashSink)(data); - if (curMember->contents) { -- curMember->contents->append((char *) data, len); -+ curMember->contents->append(data); diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/openocd/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/openocd/default.nix index bf50a380d1..7b3a16fb75 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/openocd/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/openocd/default.nix @@ -1,7 +1,6 @@ { stdenv , lib -, fetchgit -, autoreconfHook +, fetchurl , pkg-config , hidapi , libftdi1 @@ -10,16 +9,13 @@ stdenv.mkDerivation rec { pname = "openocd"; - version = "0.11.0-rc1"; - - src = fetchgit { - url = "https://git.code.sf.net/p/openocd/code"; - rev = "v${version}"; - sha256 = "15g8qalyxhdp0imfrg8mxwnp0nimd836fc5laaavajw49gcm65m4"; - fetchSubmodules = true; + version = "0.11.0"; + src = fetchurl { + url = "mirror://sourceforge/project/${pname}/${pname}/${version}/${pname}-${version}.tar.bz2"; + sha256 = "0z8y7mmv0mhn2l5gs3vz6l7cnwak7agklyc7ml33f7gz99rwx8s3"; }; - nativeBuildInputs = [ autoreconfHook pkg-config ]; + nativeBuildInputs = [ pkg-config ]; buildInputs = [ hidapi libftdi1 libusb1 ]; @@ -64,7 +60,7 @@ stdenv.mkDerivation rec { ''; homepage = "https://openocd.sourceforge.net/"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ bjornfor ]; + maintainers = with maintainers; [ bjornfor prusnak ]; platforms = platforms.unix; }; } diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/rman/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/rman/default.nix index 1f7de915c9..bf71b619e5 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/rman/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/rman/default.nix @@ -10,7 +10,8 @@ stdenv.mkDerivation { postPatch = '' substituteInPlace Makefile \ - --replace ginstall install + --replace ginstall install \ + --replace gcc '${stdenv.cc.targetPrefix}cc' ''; makeFlags = [ "BINDIR=$(out)/bin" "MANDIR=$(out)/share/man" ]; @@ -27,6 +28,6 @@ stdenv.mkDerivation { meta = { description = "Parse formatted man pages and man page source from most flavors of UNIX and converts them to HTML, ASCII, TkMan, DocBook, and other formats"; license = "artistic"; - platforms = lib.platforms.linux; + platforms = lib.platforms.all; }; } diff --git a/third_party/nixpkgs/pkgs/development/tools/ocaml/dune/2.nix b/third_party/nixpkgs/pkgs/development/tools/ocaml/dune/2.nix index f2fe3693ed..50c1ba4075 100644 --- a/third_party/nixpkgs/pkgs/development/tools/ocaml/dune/2.nix +++ b/third_party/nixpkgs/pkgs/development/tools/ocaml/dune/2.nix @@ -6,11 +6,11 @@ else stdenv.mkDerivation rec { pname = "dune"; - version = "2.8.2"; + version = "2.8.4"; src = fetchurl { url = "https://github.com/ocaml/dune/releases/download/${version}/dune-${version}.tbz"; - sha256 = "07mf6pnmv1a6wh4la45zf6cn6qy2vcmz4xgx0djj75kw1wiyii72"; + sha256 = "1b78f8gk53m68i9igvfpylmvi55h4qqfwymknz1vval4flbj0r2f"; }; buildInputs = [ ocaml findlib ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/open-policy-agent/default.nix b/third_party/nixpkgs/pkgs/development/tools/open-policy-agent/default.nix index 96cae21a5b..8491abac19 100644 --- a/third_party/nixpkgs/pkgs/development/tools/open-policy-agent/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/open-policy-agent/default.nix @@ -2,23 +2,30 @@ buildGoModule rec { pname = "open-policy-agent"; - version = "0.26.0"; + version = "0.27.0"; src = fetchFromGitHub { owner = "open-policy-agent"; repo = "opa"; rev = "v${version}"; - sha256 = "sha256-bkWfRmcUPNYeUucrbh9xAqmLg7RxEEQGa2DQdN2S6Po="; + sha256 = "sha256-WMCd7+SUpKagoutBqI98KnoOd/UwJqFrSh0RAJQvuSo="; }; vendorSha256 = null; subPackages = [ "." ]; - buildFlagsArray = [ - "-ldflags=" - "-X github.com/open-policy-agent/opa/version.Version=${version}" - ]; + preBuild = '' + buildFlagsArray+=("-ldflags" "-s -w -X github.com/open-policy-agent/opa/version.Version=${version}") + ''; + + doInstallCheck = true; + installCheckPhase = '' + runHook preInstallCheck + $out/bin/opa --help + $out/bin/opa version | grep "Version: ${version}" + runHook postInstallCheck + ''; meta = with lib; { description = "General-purpose policy engine"; @@ -30,6 +37,6 @@ buildGoModule rec { ''; homepage = "https://www.openpolicyagent.org"; license = licenses.asl20; - maintainers = with maintainers; [ lewo ]; + maintainers = with maintainers; [ lewo jk ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/jikespg/default.nix b/third_party/nixpkgs/pkgs/development/tools/parsing/jikespg/default.nix index 34e6288668..8179855e6e 100644 --- a/third_party/nixpkgs/pkgs/development/tools/parsing/jikespg/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/parsing/jikespg/default.nix @@ -1,25 +1,28 @@ {lib, stdenv, fetchurl}: stdenv.mkDerivation rec { - name = "jikespg-1.3"; + pname = "jikespg"; + version = "1.3"; src = fetchurl { - url = "mirror://sourceforge/jikes/${name}.tar.gz"; + url = "mirror://sourceforge/jikes/${pname}-${version}.tar.gz"; sha256 = "083ibfxaiw1abxmv1crccx1g6sixkbyhxn2hsrlf6fwii08s6rgw"; }; + postPatch = '' + substituteInPlace Makefile --replace "gcc" "${stdenv.cc.targetPrefix}cc" + ''; + sourceRoot = "jikespg/src"; - installPhase = - '' - mkdir -p $out/bin - cp jikespg $out/bin - ''; + installPhase = '' + install -Dm755 -t $out/bin jikespg + ''; meta = with lib; { homepage = "http://jikes.sourceforge.net/"; description = "The Jikes Parser Generator"; - platforms = platforms.linux; + platforms = platforms.all; license = licenses.ipl10; maintainers = with maintainers; [ pSub ]; }; diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/bindgen/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/bindgen/default.nix index f379e58ba1..962e8c562c 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/bindgen/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/bindgen/default.nix @@ -5,7 +5,7 @@ rustPlatform.buildRustPackage rec { pname = "rust-bindgen"; - version = "0.55.1"; + version = "0.57.0"; RUSTFLAGS = "--cap-lints warn"; # probably OK to remove after update @@ -13,10 +13,10 @@ rustPlatform.buildRustPackage rec { owner = "rust-lang"; repo = pname; rev = "v${version}"; - sha256 = "0cbc78zrhda4adza88g05sy04chixqay2ylgdjgmf13h607hp3kn"; + sha256 = "sha256-0d8+Rkb4h1DoFUQ7u2/kPR/fUUz0YvI+hNT4iXL3mxY="; }; - cargoSha256 = "1dv1ywdy701bnc2jv5jq0hnpal1snlizaj9w6k1wxyrp9szjd48w"; + cargoSha256 = "sha256-cUDOi3QwjEJaBXGSQZQ76gZ702QLNok8fr6U2q+tVao="; #for substituteAll libclang = llvmPackages.libclang.lib; diff --git a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-make/default.nix b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-make/default.nix index 8e1c032cda..fd99521628 100644 --- a/third_party/nixpkgs/pkgs/development/tools/rust/cargo-make/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/rust/cargo-make/default.nix @@ -4,11 +4,11 @@ rustPlatform.buildRustPackage rec { pname = "cargo-make"; - version = "0.32.12"; + version = "0.32.14"; src = fetchCrate { inherit pname version; - sha256 = "sha256-AaoLT5M1ut2Hlgw91On8AHRN/rrufbAp4I7bcCeG3cA="; + sha256 = "sha256-Q7gEjtStb4WUSyJv9KSu7Q61tH0O2qnNn3eyH77pI9g="; }; nativeBuildInputs = [ pkg-config ]; @@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security SystemConfiguration ]; - cargoSha256 = "sha256-r64Y8TxYmzxuZOTncHUYm+KmKlbK+KnHCHyNups5kRw="; + cargoSha256 = "sha256-DB4ywbbHE9wfvywvYnjD9OzDikmUR34RVdPOQYrst74="; # Some tests fail because they need network access. # However, Travis ensures a proper build. diff --git a/third_party/nixpkgs/pkgs/development/tools/wrangler/default.nix b/third_party/nixpkgs/pkgs/development/tools/wrangler/default.nix index f867fd836a..f43a0a369d 100644 --- a/third_party/nixpkgs/pkgs/development/tools/wrangler/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/wrangler/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, rustPlatform, pkg-config, openssl, curl, Security, CoreServices, CoreFoundation, perl }: +{ lib, stdenv, fetchFromGitHub, rustPlatform, pkg-config, openssl, curl, Security, CoreServices, CoreFoundation }: rustPlatform.buildRustPackage rec { pname = "wrangler"; @@ -13,12 +13,13 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "0w845virvw7mvibc76ar2hbffhfzj2v8v1xkrsssrgzyaryb48jk"; - nativeBuildInputs = [ perl ] - ++ lib.optionals stdenv.isLinux [ pkg-config ]; + nativeBuildInputs = [ pkg-config ]; - buildInputs = lib.optionals stdenv.isLinux [ openssl ] + buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ curl CoreFoundation CoreServices Security ]; + OPENSSL_NO_VENDOR = 1; + # tries to use "/homeless-shelter" and fails doCheck = false; diff --git a/third_party/nixpkgs/pkgs/development/web/cypress/default.nix b/third_party/nixpkgs/pkgs/development/web/cypress/default.nix index dae3243e1e..2d04fc51c8 100644 --- a/third_party/nixpkgs/pkgs/development/web/cypress/default.nix +++ b/third_party/nixpkgs/pkgs/development/web/cypress/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "cypress"; - version = "6.5.0"; + version = "6.6.0"; src = fetchzip { url = "https://cdn.cypress.io/desktop/${version}/linux-x64/cypress.zip"; - sha256 = "b4LOgNCu7zBlhpiiNFkNH/7mAYnm+OAEdxNMX2/h+3o="; + sha256 = "13zw9gyaqna9d82mwrglab4dfx5y9faqf36d6xplq0z6vnzig1rg"; }; # don't remove runtime deps diff --git a/third_party/nixpkgs/pkgs/games/among-sus/default.nix b/third_party/nixpkgs/pkgs/games/among-sus/default.nix index 1ec0a42ea1..454c7d181f 100644 --- a/third_party/nixpkgs/pkgs/games/among-sus/default.nix +++ b/third_party/nixpkgs/pkgs/games/among-sus/default.nix @@ -1,11 +1,12 @@ -{ lib, stdenv, fetchgit, port ? "1234" }: +{ lib, stdenv, fetchFromSourcehut, port ? "1234" }: stdenv.mkDerivation { pname = "among-sus-unstable"; version = "2020-10-29"; - src = fetchgit { - url = "https://git.sr.ht/~martijnbraam/among-sus"; + src = fetchFromSourcehut { + owner = "~martijnbraam"; + repo = "among-sus"; rev = "1f4c8d800d025d36ac66826937161be3252fbc57"; sha256 = "19jq7ygh9l11dl1h6702bg57m04y35nqd6yqx1rgp1kxwhp45xyh"; }; diff --git a/third_party/nixpkgs/pkgs/games/boohu/default.nix b/third_party/nixpkgs/pkgs/games/boohu/default.nix index 8318935364..6b3c0e04f9 100644 --- a/third_party/nixpkgs/pkgs/games/boohu/default.nix +++ b/third_party/nixpkgs/pkgs/games/boohu/default.nix @@ -27,6 +27,6 @@ buildGoPackage rec { homepage = "https://download.tuxfamily.org/boohu/index.html"; license = licenses.isc; platforms = platforms.unix; - maintainers = with maintainers; [freepotion]; + maintainers = with maintainers; []; }; } diff --git a/third_party/nixpkgs/pkgs/games/bzflag/default.nix b/third_party/nixpkgs/pkgs/games/bzflag/default.nix index dfddc2e859..35a481fb2f 100644 --- a/third_party/nixpkgs/pkgs/games/bzflag/default.nix +++ b/third_party/nixpkgs/pkgs/games/bzflag/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "bzflag"; - version = "2.4.20"; + version = "2.4.22"; src = fetchurl { url = "https://download.bzflag.org/${pname}/source/${version}/${pname}-${version}.tar.bz2"; - sha256 = "16brxqmfiyz4j4lb8ihzjcbwqmpsms6vm3ijbp34lnw0blbwdjb2"; + sha256 = "sha256-nmRlMwK2V72LX5b+EVCp/4Ch1Tptfoo1E4xrGwIAak0="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/games/eidolon/default.nix b/third_party/nixpkgs/pkgs/games/eidolon/default.nix index dcb72d53b3..7112c6bf49 100644 --- a/third_party/nixpkgs/pkgs/games/eidolon/default.nix +++ b/third_party/nixpkgs/pkgs/games/eidolon/default.nix @@ -1,11 +1,12 @@ -{ lib, fetchgit, rustPlatform, pkg-config, openssl }: +{ lib, fetchFromSourcehut, rustPlatform, pkg-config, openssl }: rustPlatform.buildRustPackage rec { pname = "eidolon"; version = "1.4.6"; - src = fetchgit { - url = "https://git.sr.ht/~nicohman/eidolon"; + src = fetchFromSourcehut { + owner = "~nicohman"; + repo = pname; rev = version; sha256 = "1yn3k569pxzw43mmsk97088xpkdc714rks3ncchbb6ccx25kgxrr"; }; diff --git a/third_party/nixpkgs/pkgs/games/harmonist/default.nix b/third_party/nixpkgs/pkgs/games/harmonist/default.nix index 4609f7d732..ae7d6644ce 100644 --- a/third_party/nixpkgs/pkgs/games/harmonist/default.nix +++ b/third_party/nixpkgs/pkgs/games/harmonist/default.nix @@ -3,13 +3,13 @@ buildGoPackage rec { pname = "harmonist"; - version = "0.3.0"; + version = "0.4.1"; goPackagePath = "git.tuxfamily.org/harmonist/harmonist.git"; src = fetchurl { url = "https://download.tuxfamily.org/harmonist/releases/${pname}-${version}.tar.gz"; - sha256 = "16bh4zzq7szwcw19n34bslkf81fz3i0p4zqkd8gdi5ixkbm998lm"; + sha256 = "19abqmzz9nnlnizkskvlkcpahk8lzrl57mgg6dfxn25l55vfznws"; }; goDeps = ./deps.nix; @@ -29,6 +29,6 @@ buildGoPackage rec { homepage = "https://harmonist.tuxfamily.org/"; license = licenses.isc; platforms = platforms.unix; - maintainers = with maintainers; [freepotion]; + maintainers = with maintainers; []; }; } diff --git a/third_party/nixpkgs/pkgs/games/harmonist/deps.nix b/third_party/nixpkgs/pkgs/games/harmonist/deps.nix index 6829082362..8823ada42d 100644 --- a/third_party/nixpkgs/pkgs/games/harmonist/deps.nix +++ b/third_party/nixpkgs/pkgs/games/harmonist/deps.nix @@ -1,20 +1,92 @@ [ - { - goPackagePath = "github.com/nsf/termbox-go"; - fetch = { - type = "git"; - url = "https://github.com/nsf/termbox-go"; - rev = "93860e16131719fa9722e7c448dbf8c0e3210a0d"; - sha256 = "03hz060cy8qrl4kgr80pbq6xvr38z4c6ghr3y81i8g854rvp6426"; - }; - } { goPackagePath = "github.com/mattn/go-runewidth"; fetch = { type = "git"; url = "https://github.com/mattn/go-runewidth"; - rev = "18c3d09a134a52720932bbaa92c798a0ab111004"; - sha256 = "1snr8mk63vz2h44knq26dm81p83887v7kb09iywqmx0nqzngih66"; + rev = "59616a248b91ae20bf3eb93636a24c87d9ce6cea"; + sha256 = "0jh9552ppqvkdfni7x623n0x5mbiaqqhjhmr0zkh28x56k4ysii4"; + }; + } + { + goPackagePath = "github.com/anaseto/gruid"; + fetch = { + type = "git"; + url = "https://github.com/anaseto/gruid"; + rev = "976b3db42d20169cf44eca1406b3cff104a80979"; + sha256 = "0rvsavkvg2hziwdh8sjk3n5v92m5mfjb8v9m7ch22maxfwq5kv6y"; + }; + } + { + goPackagePath = "github.com/anaseto/gruid-tcell"; + fetch = { + type = "git"; + url = "https://github.com/anaseto/gruid-tcell"; + rev = "4878126bb96fa0e529ec22c700d03b030e5c3bf7"; + sha256 = "0spm9gqsdan1mvbpypywid00vvl92rii8akhmjdm8l1r9qk7a3i4"; + }; + } + { + goPackagePath = "github.com/gdamore/tcell"; + fetch = { + type = "git"; + url = "https://github.com/gdamore/tcell"; + rev = "f4d402906fa3d330545365abbf970c048e677b35"; + sha256 = "1wcbm5vxrh5s8g4mas32y3n0pjvfmngmc2yrxg1yn4333mh9mgf3"; + }; + } + { + goPackagePath = "github.com/lucasb-eyer/go-colorful"; + fetch = { + type = "git"; + url = "https://github.com/lucasb-eyer/go-colorful"; + rev = "4d8f45c41ac988423342507a1fb6050239b5a742"; + sha256 = "1p2rl5353fi4p3l0bz3dg0lifhxqj8hjyh1b6z1cn286qxwnnnm8"; + }; + } + { + goPackagePath = "github.com/gdamore/encoding"; + fetch = { + type = "git"; + url = "https://github.com/gdamore/encoding"; + rev = "6289cdc94c00ac4aa177771c5fce7af2f96b626d"; + sha256 = "1vmm5zll92i2fm4ajqx0gyx0p9j36496x5nabi3y0x7h0inv0pk9"; + }; + } + { + goPackagePath = "github.com/rivo/uniseg"; + fetch = { + type = "git"; + url = "https://github.com/rivo/uniseg"; + rev = "75711fccf6a3e85bc74c241e2dddd06a9bc9e53d"; + sha256 = "0j7h22vfmjj562vr8gpsyrkrwp1pq9ayh5fylv24skxb467g9f0q"; + }; + } + { + goPackagePath = "golang.org/x/term/"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/term"; + rev = "6a3ed077a48de71621ad530f9078fffa0bc0ce32"; + sha256 = "0xni8n3q2r9f6fk223b2c1702fvqmgz7vk6738asri3fwby583q5"; + }; + } + { + goPackagePath = "golang.org/x/text/"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/text"; + rev = "e3aa4adf54f644ca0cb35f1f1fb19b239c40ef04"; + sha256 = "03q5kjmp4sfp5yzwb76lyf8cs9qca26vlwry5qgqf8w03rq700hf"; + }; + } + { + goPackagePath = "golang.org/x/sys/"; + fetch = { + type = "git"; + url = "https://go.googlesource.com/sys"; + rev = "88b6017d06564827ae436c619d52116f470a3611"; + sha256 = "14n7b6833lhxjzsgvi14c6c8nfiqqb4r71wvv4z5ksyssi95i3r7"; }; } ] diff --git a/third_party/nixpkgs/pkgs/games/maelstrom/default.nix b/third_party/nixpkgs/pkgs/games/maelstrom/default.nix new file mode 100644 index 0000000000..5f78e34eda --- /dev/null +++ b/third_party/nixpkgs/pkgs/games/maelstrom/default.nix @@ -0,0 +1,39 @@ +{ lib, stdenv, fetchurl, makeDesktopItem, SDL2, SDL2_net }: + +stdenv.mkDerivation rec { + pname = "maelstrom"; + version = "3.0.7"; + + src = fetchurl { + url = "http://www.libsdl.org/projects/Maelstrom/src/Maelstrom-${version}.tar.gz"; + sha256 = "0dm0m5wd7amrsa8wnrblkv34sq4v4lglc2wfx8klfkdhyhi06s4k"; + }; + + # this fixes a typedef compilation error with gcc-3.x + patches = [ ./fix-compilation.patch ]; + + buildInputs = [ SDL2 SDL2_net ]; + + postInstall = '' + mkdir -p $out/bin + ln -s $out/games/Maelstrom/Maelstrom $out/bin/maelstrom + ''; + + desktopItems = [ + (makeDesktopItem { + name = "maelstrom"; + exec = "maelstrom"; + desktopName = "Maelstrom"; + genericName = "Maelstrom"; + comment = "An arcade-style game resembling Asteroids"; + categories = "Game;"; + }) + ]; + + meta = with lib; { + description = "An arcade-style game resembling Asteroids"; + license = licenses.gpl2Plus; + platforms = platforms.all; + maintainers = with maintainers; [ tmountain ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/games/maelstrom/fix-compilation.patch b/third_party/nixpkgs/pkgs/games/maelstrom/fix-compilation.patch new file mode 100644 index 0000000000..3fa8980c5e --- /dev/null +++ b/third_party/nixpkgs/pkgs/games/maelstrom/fix-compilation.patch @@ -0,0 +1,42 @@ +diff -Naur Maelstrom-3.0.7/buttonlist.h Maelstrom-3.0.7-patched/buttonlist.h +--- Maelstrom-3.0.7/buttonlist.h 2000-01-25 11:41:32.000000000 -0500 ++++ Maelstrom-3.0.7-patched/buttonlist.h 2021-02-22 08:34:01.000000000 -0500 +@@ -16,7 +16,7 @@ + + void Add_Button(Uint16 x, Uint16 y, Uint16 width, Uint16 height, + void (*callback)(void)) { +- struct button *belem; ++ button *belem; + + for ( belem=&button_list; belem->next; belem=belem->next ); + belem->next = new button; +@@ -30,7 +30,7 @@ + } + + void Activate_Button(Uint16 x, Uint16 y) { +- struct button *belem; ++ button *belem; + + for ( belem=button_list.next; belem; belem=belem->next ) { + if ( (x >= belem->x1) && (x <= belem->x2) && +@@ -42,7 +42,7 @@ + } + + void Delete_Buttons(void) { +- struct button *belem, *btemp; ++ button *belem, *btemp; + + for ( belem=button_list.next; belem; ) { + btemp = belem; +diff -Naur Maelstrom-3.0.7/main.cpp Maelstrom-3.0.7-patched/main.cpp +--- Maelstrom-3.0.7/main.cpp 2021-02-04 11:50:27.000000000 -0500 ++++ Maelstrom-3.0.7-patched/main.cpp 2021-02-22 08:34:34.000000000 -0500 +@@ -153,7 +153,7 @@ + error("or\n"); + error("Usage: %s \n\n", progname); + error("Where can be any of:\n\n" +-" -fullscreen # Run Maelstrom in full-screen mode\n" ++" -windowed # Run Maelstrom in windowed mode\n" + " -gamma [0-8] # Set the gamma correction\n" + " -volume [0-8] # Set the sound volume\n" + " -netscores # Use the world-wide network score server\n" diff --git a/third_party/nixpkgs/pkgs/games/tintin/default.nix b/third_party/nixpkgs/pkgs/games/tintin/default.nix index 80f9ffa8f4..29c41d2d78 100644 --- a/third_party/nixpkgs/pkgs/games/tintin/default.nix +++ b/third_party/nixpkgs/pkgs/games/tintin/default.nix @@ -6,11 +6,11 @@ assert tlsSupport -> gnutls != null; stdenv.mkDerivation rec { - name = "tintin-2.02.03"; + name = "tintin-2.02.05"; src = fetchurl { url = "mirror://sourceforge/tintin/${name}.tar.gz"; - sha256 = "0ybgy8j8i36d7f892x539vl6fl5zvvfyy5ffc98550vjr6qqhk74"; + sha256 = "sha256-Y6cAUhItJNade8ASOVdF8aBBLf/UVqjoqrhXBNRL1aE="; }; nativeBuildInputs = lib.optional tlsSupport gnutls.dev; diff --git a/third_party/nixpkgs/pkgs/games/xcowsay/default.nix b/third_party/nixpkgs/pkgs/games/xcowsay/default.nix index 0a6371801b..89ca50b3a3 100644 --- a/third_party/nixpkgs/pkgs/games/xcowsay/default.nix +++ b/third_party/nixpkgs/pkgs/games/xcowsay/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "xcowsay"; - version = "1.5"; + version = "1.5.1"; src = fetchurl { url = "http://www.nickg.me.uk/files/xcowsay-${version}.tar.gz"; - sha256 = "0pyaa062z1ag26dhkm1yzp2hivnlmhlpqn5xg7mx9r1m652mm91y"; + sha256 = "sha256-wypsfAp634wbaAI+fxzmr3J5AmvQzChVi/wp/BPxiA0="; }; buildInputs = [ @@ -32,9 +32,8 @@ stdenv.mkDerivation rec { meta = with lib; { homepage = "http://www.doof.me.uk/xcowsay"; - description = - "A program based on cowsay that displays a cute cow and message on your desktop"; - license = licenses.gpl3; + description = "Tool to display a cute cow and messages"; + license = licenses.gpl3Plus; maintainers = with maintainers; [ das_j ]; }; } diff --git a/third_party/nixpkgs/pkgs/misc/emulators/libdsk/default.nix b/third_party/nixpkgs/pkgs/misc/emulators/libdsk/default.nix index 7bc23130b7..9ad2027548 100644 --- a/third_party/nixpkgs/pkgs/misc/emulators/libdsk/default.nix +++ b/third_party/nixpkgs/pkgs/misc/emulators/libdsk/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "libdsk"; - version = "1.5.14"; + version = "1.5.15"; src = fetchurl { url = "https://www.seasip.info/Unix/LibDsk/${pname}-${version}.tar.gz"; - sha256 = "sha256-fQc6QAj160OskhAo1zQsQKiLgDgZRInU/derP2pEw54="; + sha256 = "sha256-7VjVgGRy3+SE+9mdPpBKiNzv1tg2akXpkHfv2dVoODs="; }; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/misc/tmux-plugins/default.nix b/third_party/nixpkgs/pkgs/misc/tmux-plugins/default.nix index 333830f014..8cb02185f1 100644 --- a/third_party/nixpkgs/pkgs/misc/tmux-plugins/default.nix +++ b/third_party/nixpkgs/pkgs/misc/tmux-plugins/default.nix @@ -1,7 +1,6 @@ { lib , fetchFromGitHub , pkgs -, reattach-to-user-namespace , stdenv }: @@ -10,10 +9,10 @@ let addRtp = path: rtpFilePath: attrs: derivation: derivation // { rtp = "${derivation}/${path}/${rtpFilePath}"; } // { - overrideAttrs = f: mkDerivation (attrs // f attrs); + overrideAttrs = f: mkTmuxPlugin (attrs // f attrs); }; - mkDerivation = a@{ + mkTmuxPlugin = a@{ pluginName, rtpFilePath ? (builtins.replaceStrings ["-"] ["_"] pluginName) + ".tmux", namePrefix ? "tmuxplugin-", @@ -50,10 +49,7 @@ let })); in rec { - - inherit mkDerivation; - - battery = mkDerivation { + battery = mkTmuxPlugin { pluginName = "battery"; version = "unstable-2019-07-04"; src = fetchFromGitHub { @@ -64,7 +60,7 @@ in rec { }; }; - continuum = mkDerivation { + continuum = mkTmuxPlugin { pluginName = "continuum"; version = "unstable-2020-10-16"; src = fetchFromGitHub { @@ -94,7 +90,7 @@ in rec { }; }; - copycat = mkDerivation { + copycat = mkTmuxPlugin { pluginName = "copycat"; version = "unstable-2020-01-09"; src = fetchFromGitHub { @@ -105,7 +101,7 @@ in rec { }; }; - cpu = mkDerivation { + cpu = mkTmuxPlugin { pluginName = "cpu"; version = "unstable-2020-07-25"; src = fetchFromGitHub { @@ -116,7 +112,7 @@ in rec { }; }; - ctrlw = mkDerivation rec { + ctrlw = mkTmuxPlugin rec { pluginName = "ctrlw"; version = "0.1.1"; src = fetchFromGitHub { @@ -127,7 +123,7 @@ in rec { }; }; - dracula = mkDerivation rec { + dracula = mkTmuxPlugin rec { pluginName = "dracula"; version = "unstable-2021-02-18"; src = fetchFromGitHub { @@ -145,7 +141,7 @@ in rec { }; }; - fingers = mkDerivation rec { + fingers = mkTmuxPlugin rec { pluginName = "fingers"; rtpFilePath = "tmux-fingers.tmux"; version = "1.0.1"; @@ -159,7 +155,7 @@ in rec { dependencies = [ pkgs.gawk ]; }; - fpp = mkDerivation { + fpp = mkTmuxPlugin { pluginName = "fpp"; version = "unstable-2016-03-08"; src = fetchFromGitHub { @@ -174,7 +170,7 @@ in rec { dependencies = [ pkgs.fpp ]; }; - fzf-tmux-url = mkDerivation { + fzf-tmux-url = mkTmuxPlugin { pluginName = "fzf-tmux-url"; rtpFilePath = "fzf-url.tmux"; version = "unstable-2019-12-02"; @@ -186,7 +182,7 @@ in rec { }; }; - gruvbox = mkDerivation { + gruvbox = mkTmuxPlugin { pluginName = "gruvbox"; rtpFilePath = "gruvbox-tpm.tmux"; version = "unstable-2019-05-05"; @@ -198,7 +194,7 @@ in rec { }; }; - jump = mkDerivation { + jump = mkTmuxPlugin { pluginName = "jump"; version = "2020-06-26"; rtpFilePath = "tmux-jump.tmux"; @@ -222,7 +218,7 @@ in rec { }; }; - logging = mkDerivation { + logging = mkTmuxPlugin { pluginName = "logging"; version = "unstable-2019-04-19"; src = fetchFromGitHub { @@ -233,7 +229,7 @@ in rec { }; }; - net-speed = mkDerivation { + net-speed = mkTmuxPlugin { pluginName = "net-speed"; version = "unstable-2018-12-02"; src = fetchFromGitHub { @@ -244,7 +240,7 @@ in rec { }; }; - nord = mkDerivation rec { + nord = mkTmuxPlugin rec { pluginName = "nord"; version = "0.3.0"; src = pkgs.fetchFromGitHub { @@ -255,7 +251,7 @@ in rec { }; }; - maildir-counter = mkDerivation { + maildir-counter = mkTmuxPlugin { pluginName = "maildir-counter"; version = "unstable-2016-11-25"; src = fetchFromGitHub { @@ -266,7 +262,7 @@ in rec { }; }; - online-status = mkDerivation { + online-status = mkTmuxPlugin { pluginName = "online-status"; version = "unstable-2018-11-30"; src = fetchFromGitHub { @@ -277,7 +273,7 @@ in rec { }; }; - open = mkDerivation { + open = mkTmuxPlugin { pluginName = "open"; version = "unstable-2019-12-02"; src = fetchFromGitHub { @@ -288,7 +284,7 @@ in rec { }; }; - onedark-theme = mkDerivation { + onedark-theme = mkTmuxPlugin { pluginName = "onedark-theme"; rtpFilePath = "tmux-onedark-theme.tmux"; version = "unstable-2020-06-07"; @@ -300,7 +296,7 @@ in rec { }; }; - pain-control = mkDerivation { + pain-control = mkTmuxPlugin { pluginName = "pain-control"; version = "unstable-2020-02-18"; src = fetchFromGitHub { @@ -311,7 +307,7 @@ in rec { }; }; - plumb = mkDerivation rec { + plumb = mkTmuxPlugin rec { pluginName = "plumb"; version = "0.1.1"; src = fetchFromGitHub { @@ -325,7 +321,7 @@ in rec { ''; }; - power-theme = mkDerivation { + power-theme = mkTmuxPlugin { pluginName = "power"; rtpFilePath = "tmux-power.tmux"; version = "unstable-2020-11-18"; @@ -337,7 +333,7 @@ in rec { }; }; - prefix-highlight = mkDerivation { + prefix-highlight = mkTmuxPlugin { pluginName = "prefix-highlight"; version = "unstable-2020-03-26"; src = fetchFromGitHub { @@ -348,7 +344,7 @@ in rec { }; }; - resurrect = mkDerivation { + resurrect = mkTmuxPlugin { pluginName = "resurrect"; version = "unstable-2020-09-18"; src = fetchFromGitHub { @@ -385,7 +381,7 @@ in rec { }; }; - sensible = mkDerivation { + sensible = mkTmuxPlugin { pluginName = "sensible"; version = "unstable-2017-09-05"; src = fetchFromGitHub { @@ -394,12 +390,12 @@ in rec { rev = "e91b178ff832b7bcbbf4d99d9f467f63fd1b76b5"; sha256 = "1z8dfbwblrbmb8sgb0k8h1q0dvfdz7gw57las8nwd5gj6ss1jyvx"; }; - postInstall = lib.optionalString pkgs.stdenv.isDarwin '' - sed -e 's:reattach-to-user-namespace:${reattach-to-user-namespace}/bin/reattach-to-user-namespace:g' -i $target/sensible.tmux + postInstall = lib.optionalString stdenv.isDarwin '' + sed -e 's:reattach-to-user-namespace:${pkgs.reattach-to-user-namespace}/bin/reattach-to-user-namespace:g' -i $target/sensible.tmux ''; }; - sessionist = mkDerivation { + sessionist = mkTmuxPlugin { pluginName = "sessionist"; version = "unstable-2017-12-03"; src = fetchFromGitHub { @@ -410,7 +406,7 @@ in rec { }; }; - sidebar = mkDerivation { + sidebar = mkTmuxPlugin { pluginName = "sidebar"; version = "unstable-2018-11-30"; src = fetchFromGitHub { @@ -421,7 +417,7 @@ in rec { }; }; - sysstat = mkDerivation { + sysstat = mkTmuxPlugin { pluginName = "sysstat"; version = "unstable-2017-12-12"; src = fetchFromGitHub { @@ -432,7 +428,7 @@ in rec { }; }; - tilish = mkDerivation { + tilish = mkTmuxPlugin { pluginName = "tilish"; version = "2020-08-12"; src = fetchFromGitHub { @@ -451,7 +447,7 @@ in rec { }; }; - tmux-colors-solarized = mkDerivation { + tmux-colors-solarized = mkTmuxPlugin { pluginName = "tmuxcolors"; version = "unstable-2019-07-14"; src = fetchFromGitHub { @@ -462,7 +458,7 @@ in rec { }; }; - tmux-fzf = mkDerivation { + tmux-fzf = mkTmuxPlugin { pluginName = "tmux-fzf"; rtpFilePath = "main.tmux"; version = "unstable-2020-12-07"; @@ -498,7 +494,7 @@ in rec { }; }; - urlview = mkDerivation { + urlview = mkTmuxPlugin { pluginName = "urlview"; version = "unstable-2016-01-06"; src = fetchFromGitHub { @@ -513,7 +509,7 @@ in rec { dependencies = [ pkgs.urlview ]; }; - vim-tmux-focus-events = mkDerivation { + vim-tmux-focus-events = mkTmuxPlugin { pluginName = "vim-tmux-focus-events"; version = "unstable-2020-10-05"; src = fetchFromGitHub { @@ -532,7 +528,7 @@ in rec { }; }; - vim-tmux-navigator = mkDerivation { + vim-tmux-navigator = mkTmuxPlugin { pluginName = "vim-tmux-navigator"; rtpFilePath = "vim-tmux-navigator.tmux"; version = "unstable-2019-12-10"; @@ -544,7 +540,7 @@ in rec { }; }; - yank = mkDerivation { + yank = mkTmuxPlugin { pluginName = "yank"; version = "unstable-2019-12-02"; src = fetchFromGitHub { @@ -554,5 +550,4 @@ in rec { sha256 = "1zg9k8yk1iw01vl8m44w4sv20lln4l0lq9dafc09lxmgxm9dllj4"; }; }; - } diff --git a/third_party/nixpkgs/pkgs/misc/vim-plugins/generated.nix b/third_party/nixpkgs/pkgs/misc/vim-plugins/generated.nix index 8ac029250e..da4f37d28a 100644 --- a/third_party/nixpkgs/pkgs/misc/vim-plugins/generated.nix +++ b/third_party/nixpkgs/pkgs/misc/vim-plugins/generated.nix @@ -65,12 +65,12 @@ let ale = buildVimPluginFrom2Nix { pname = "ale"; - version = "2021-03-04"; + version = "2021-03-07"; src = fetchFromGitHub { owner = "dense-analysis"; repo = "ale"; - rev = "8c5081f6316183c97298ec4a819fd94c2a2a9516"; - sha256 = "1k1d19w9avvxk6ccgdj2sricr3c3crvlwdfj0g7ybgh8nyn2isvs"; + rev = "c21d6afd2fb799013e3894d393bf976d9da31e65"; + sha256 = "1f4s6zq0270mpczwz7chi763rxnm2qk3gjfylwmr8r2ny6f5is1w"; }; meta.homepage = "https://github.com/dense-analysis/ale/"; }; @@ -209,12 +209,12 @@ let auto-session = buildVimPluginFrom2Nix { pname = "auto-session"; - version = "2021-02-05"; + version = "2021-03-08"; src = fetchFromGitHub { owner = "rmagatti"; repo = "auto-session"; - rev = "691155697a809af8797c1b935aa4e73187516d42"; - sha256 = "199rcp3wcqg40a6lsrk83lv2kxgmnbapd5zw16jcxg4svy30dhfg"; + rev = "2bb1fcd8828df1de5c79821b6b01ba929af355f0"; + sha256 = "0xlzq51izzbhsl3jlqj3f719ixcqi7r7y8m8n6291yp1xpmidfwm"; }; meta.homepage = "https://github.com/rmagatti/auto-session/"; }; @@ -257,12 +257,12 @@ let barbar-nvim = buildVimPluginFrom2Nix { pname = "barbar-nvim"; - version = "2021-02-18"; + version = "2021-03-07"; src = fetchFromGitHub { owner = "romgrk"; repo = "barbar.nvim"; - rev = "42d7112d78839ef9bd2b283ec0d9d82134e94b4f"; - sha256 = "0i2vx60h27sal1crl8di4rq6dp4c8zjarknjl9z09l1s798l5i62"; + rev = "85432f426b7473bb7a4de9f698f91848737b0fd8"; + sha256 = "16ql06swg4flr933bp2qm8g5iy2sjgh650k18pzghc0qc9k517xd"; }; meta.homepage = "https://github.com/romgrk/barbar.nvim/"; }; @@ -389,12 +389,12 @@ let chadtree = buildVimPluginFrom2Nix { pname = "chadtree"; - version = "2021-03-05"; + version = "2021-03-10"; src = fetchFromGitHub { owner = "ms-jpq"; repo = "chadtree"; - rev = "4608bbe255e66f463cf08de888e470cb00966f8d"; - sha256 = "06rkj244frd2a7w0x0dp4nnzn8sdnbyww1jwn9xlypfcn67gg0nn"; + rev = "36bc8699c7fe94d8c184bc2d17382752557bd22e"; + sha256 = "0swcw4cfhshfb6rmq93r5lmr338gn0ci7wmhabvmpxzhwwm28xvr"; }; meta.homepage = "https://github.com/ms-jpq/chadtree/"; }; @@ -509,12 +509,12 @@ let coc-lua = buildVimPluginFrom2Nix { pname = "coc-lua"; - version = "2021-03-05"; + version = "2021-03-10"; src = fetchFromGitHub { owner = "josa42"; repo = "coc-lua"; - rev = "9454f352914475f3595efad08bb1524cf8812853"; - sha256 = "0j3h8jyn2gbyyk7vpbjprg4kpk77j85npb0m090z0iqhlvcdrhh1"; + rev = "946e8393cd9189f97a50084c2a040966dce0f0cb"; + sha256 = "0d74lk85hkjb0w4fzvsp4gljl224ci749g2l25a1kd6kihyf7f82"; }; meta.homepage = "https://github.com/josa42/coc-lua/"; }; @@ -545,12 +545,12 @@ let coc-nvim = buildVimPluginFrom2Nix { pname = "coc-nvim"; - version = "2021-03-03"; + version = "2021-03-09"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc.nvim"; - rev = "71b5766a7cc28daef89fac7db99340cd532035b3"; - sha256 = "035fhkf6n4iyi01jc84a8bsaapz5dd3m49cbilxag2wr85gc4b9p"; + rev = "ab4f3f5797754334def047466a998b92f3076db9"; + sha256 = "1wr0v1kgv9km5rfc9g49897043gk3hraf07z8i937144z34qasf1"; }; meta.homepage = "https://github.com/neoclide/coc.nvim/"; }; @@ -738,12 +738,12 @@ let Coqtail = buildVimPluginFrom2Nix { pname = "Coqtail"; - version = "2021-03-04"; + version = "2021-03-09"; src = fetchFromGitHub { owner = "whonore"; repo = "Coqtail"; - rev = "5e78fa379d6c1a604834e89eff31c9a28123c6d9"; - sha256 = "1phkq68hv6pi1z637in8hl5m5xzaw7ybmqyvljy8rly89w9gis5w"; + rev = "3b61d0755a4523a131096c97fb016b102e7b1672"; + sha256 = "1df1zq117vf6w7d9y0l9cdicsw1qw3d497xnckk3c0r0kv8w6hkc"; }; meta.homepage = "https://github.com/whonore/Coqtail/"; }; @@ -846,24 +846,24 @@ let dart-vim-plugin = buildVimPluginFrom2Nix { pname = "dart-vim-plugin"; - version = "2020-11-10"; + version = "2021-03-09"; src = fetchFromGitHub { owner = "dart-lang"; repo = "dart-vim-plugin"; - rev = "8ff9e1abd264f16fd1d192024348f6c63b514a0d"; - sha256 = "15rkgh68j9agbj4144a0jis7qpcfjfspp6598laqjz1qzrx82pmf"; + rev = "a2821046c45d25258aeddd4d64d607070b93dd88"; + sha256 = "0wpsv0qz5dyp484ilvlkmd8jlb6b9s0p96lsw103jpj1dlf2n7la"; }; meta.homepage = "https://github.com/dart-lang/dart-vim-plugin/"; }; dashboard-nvim = buildVimPluginFrom2Nix { pname = "dashboard-nvim"; - version = "2021-03-03"; + version = "2021-03-10"; src = fetchFromGitHub { owner = "glepnir"; repo = "dashboard-nvim"; - rev = "dbcee4399394e56e4bbae5039af78408b2a35334"; - sha256 = "1p6ckanaqxgag1l1kmpiwq2fxygfp6rghbf4a3mx5ldh17lhnii8"; + rev = "6849ecf77a6075e55946c642f07a562fcdcdd579"; + sha256 = "0pyvscibc7ydn294kffwp80gfwk5rk4v63haih79c7acq52xmm0l"; }; meta.homepage = "https://github.com/glepnir/dashboard-nvim/"; }; @@ -882,24 +882,24 @@ let defx-icons = buildVimPluginFrom2Nix { pname = "defx-icons"; - version = "2020-08-09"; + version = "2021-03-07"; src = fetchFromGitHub { owner = "kristijanhusak"; repo = "defx-icons"; - rev = "3259550f918b2cfb9794b62e7bb94b863f75f489"; - sha256 = "1a65p99f9f1idzkxl4fd1klxidf40lvs79bym1fydv1zw34x8qzv"; + rev = "563bc2d07d6c369a293ea8cb2fad8afd38bf4a02"; + sha256 = "0gp65vf7lb00k4pk9iyr2zm6q3lfz16ad70hh3ldnj2azdfz539m"; }; meta.homepage = "https://github.com/kristijanhusak/defx-icons/"; }; defx-nvim = buildVimPluginFrom2Nix { pname = "defx-nvim"; - version = "2021-02-28"; + version = "2021-03-09"; src = fetchFromGitHub { owner = "Shougo"; repo = "defx.nvim"; - rev = "f4e082b3e4a62ca2cd5dfe041288f4acf3b2031f"; - sha256 = "1lm4x0skg9mm776bm7s34sjmxjjvcsy7gjn95qhplg7r6799xsn0"; + rev = "fc76104d2b7204c016bd8e1750a06150800c4735"; + sha256 = "1ch1g39r2iyd8ma11kfi6fqy0cp0ybqv0laqs1pxphlw2z575jrj"; }; meta.homepage = "https://github.com/Shougo/defx.nvim/"; }; @@ -1184,12 +1184,12 @@ let deoplete-nvim = buildVimPluginFrom2Nix { pname = "deoplete-nvim"; - version = "2021-03-01"; + version = "2021-03-10"; src = fetchFromGitHub { owner = "Shougo"; repo = "deoplete.nvim"; - rev = "a4683be7c58c346458e2cdb1f8b244e14fe35a8e"; - sha256 = "0ph4mj4s2gklr8rz8ny80i91r7fcivh9kb5q0y20c19mmyjsvifm"; + rev = "aa32b3d2e8f4240c7908f098f89359d20063c691"; + sha256 = "1048kb3sxmsbd9xk4s1nxvhgkrfixvpragbj6sm00sy4hx5qfq4j"; }; meta.homepage = "https://github.com/Shougo/deoplete.nvim/"; }; @@ -1256,12 +1256,12 @@ let dracula-vim = buildVimPluginFrom2Nix { pname = "dracula-vim"; - version = "2021-03-05"; + version = "2021-03-08"; src = fetchFromGitHub { owner = "dracula"; repo = "vim"; - rev = "32f0a489d1f47405f3327d0686f8d96da216cead"; - sha256 = "1czs335wdjs8vfx3ydy92m145wibp6jy47fia5p5mhrp6zncibqq"; + rev = "561c21a96249e7411b409817c00d472a26337b8d"; + sha256 = "0nb1s9c6av6jkvc3gc239llzsa34n50nfqf6swvvbazn7j29sz7c"; }; meta.homepage = "https://github.com/dracula/vim/"; }; @@ -1315,6 +1315,18 @@ let meta.homepage = "https://github.com/dmix/elvish.vim/"; }; + embark-vim = buildVimPluginFrom2Nix { + pname = "embark-vim"; + version = "2021-02-23"; + src = fetchFromGitHub { + owner = "embark-theme"; + repo = "vim"; + rev = "d9ea898794c486e2517823f24b9577ce4c488364"; + sha256 = "0l1f9pl8nh8lkswwrsw13s8d10ccq0c1jfd3bpszsxc6ryjm0wqw"; + }; + meta.homepage = "https://github.com/embark-theme/vim/"; + }; + emmet-vim = buildVimPluginFrom2Nix { pname = "emmet-vim"; version = "2020-10-21"; @@ -1523,24 +1535,24 @@ let fzf-vim = buildVimPluginFrom2Nix { pname = "fzf-vim"; - version = "2021-02-02"; + version = "2021-03-06"; src = fetchFromGitHub { owner = "junegunn"; repo = "fzf.vim"; - rev = "02a192ea0bed22a015e005b281e55e0da2a8e496"; - sha256 = "0znlzjni031vagj83d60nararb67cli5fpp2lc37k9p8xnff1mjv"; + rev = "711fb41e39e2ad3abec1ec9720782acbac6fb6b4"; + sha256 = "1jfjj20arsikk8alaa7jrp7aakkpakpnjbkk4ri0s95f8ix09wcm"; }; meta.homepage = "https://github.com/junegunn/fzf.vim/"; }; galaxyline-nvim = buildVimPluginFrom2Nix { pname = "galaxyline-nvim"; - version = "2021-03-05"; + version = "2021-03-10"; src = fetchFromGitHub { owner = "glepnir"; repo = "galaxyline.nvim"; - rev = "dd1cd3098f95423fa744be5d65b61132caae51b5"; - sha256 = "12k25aq9giivfh2nw086ha8jq77bd5d5v9mmqsxjb15bp6b2mbc5"; + rev = "a6c2cbc2218cb2e59fd3353fb827da82b84a248a"; + sha256 = "1vj4f61x5p1zg8cr4a7a90xij810v6zkbzdwpkbksfmyrxfkvqs8"; }; meta.homepage = "https://github.com/glepnir/galaxyline.nvim/"; }; @@ -1619,12 +1631,12 @@ let gitsigns-nvim = buildVimPluginFrom2Nix { pname = "gitsigns-nvim"; - version = "2021-03-04"; + version = "2021-03-10"; src = fetchFromGitHub { owner = "lewis6991"; repo = "gitsigns.nvim"; - rev = "d54291e425d324db56a4b0990c73a0facb9ae877"; - sha256 = "1zwnsblklw9a9khr6xpwsfn115synrzg1b92pvzsh5p53ydaqaj2"; + rev = "6f282d9e99e04780d645e0133c4376486bd16c23"; + sha256 = "0jy682lmafxpippsrd63r46dda5a96vrd1filj1b5xqniqwk4mrz"; }; meta.homepage = "https://github.com/lewis6991/gitsigns.nvim/"; }; @@ -1787,12 +1799,12 @@ let hop-nvim = buildVimPluginFrom2Nix { pname = "hop-nvim"; - version = "2021-03-03"; + version = "2021-03-06"; src = fetchFromGitHub { owner = "phaazon"; repo = "hop.nvim"; - rev = "114354c337dc0f492b014853f8972fa42ca4c379"; - sha256 = "0laxlhzv70zln8wsxdcgimbc3zg4dpyixik7qa44lw4g8szmpyxc"; + rev = "b3224bc6231a6a3543390cdfab4e4226dbfe40a7"; + sha256 = "165csrpk2mq685i13kyf7w935al1qwgqd2myyn2gnznbfpbnlcw1"; }; meta.homepage = "https://github.com/phaazon/hop.nvim/"; }; @@ -1895,12 +1907,12 @@ let indent-blankline-nvim = buildVimPluginFrom2Nix { pname = "indent-blankline-nvim"; - version = "2021-01-22"; + version = "2021-03-06"; src = fetchFromGitHub { owner = "lukas-reineke"; repo = "indent-blankline.nvim"; - rev = "207e001be64b39b72f8661e4a723d5bab698b5cd"; - sha256 = "0vnnfm319y3n0vvwbwls40fb6s73rqc8yyi31g0f0hdwd6ahsafm"; + rev = "47691a67b690ad6ebd9df67574691822d226a5b6"; + sha256 = "0lkw6mslkd0gax0s280icpa5saq3320kkkmjih04mmnnf1vnwq6a"; }; meta.homepage = "https://github.com/lukas-reineke/indent-blankline.nvim/"; }; @@ -2052,12 +2064,12 @@ let kotlin-vim = buildVimPluginFrom2Nix { pname = "kotlin-vim"; - version = "2021-02-17"; + version = "2021-03-08"; src = fetchFromGitHub { owner = "udalov"; repo = "kotlin-vim"; - rev = "7f967873c8a3e566bdf10715569319a632f3de93"; - sha256 = "1db6i2w93pfgw1nkhgw9m75crbx62rh5cvw7pbjs69xmbfd2zlld"; + rev = "4188c157147fa1f3104edac7f52b41c8f18c6d8b"; + sha256 = "18kb56lwn3xl0xq4h34hr3z3ja1phbjpaxk6281d38wkj8randk8"; }; meta.homepage = "https://github.com/udalov/kotlin-vim/"; }; @@ -2184,24 +2196,24 @@ let lh-brackets = buildVimPluginFrom2Nix { pname = "lh-brackets"; - version = "2021-01-15"; + version = "2021-03-09"; src = fetchFromGitHub { owner = "LucHermitte"; repo = "lh-brackets"; - rev = "7e0e38857de5558de04c251cf6ddc350724562d9"; - sha256 = "105dgm80946jvx9qxs10vscgrplwpg89nwd6cmpm47wzj8999r8b"; + rev = "73efae0e97b8c661bf36d3637c3ba1ee02b4fe07"; + sha256 = "122jhh3vkapxz42sa6l9sdxcdl4fzq4xfrjmaak815nvf3bg249a"; }; meta.homepage = "https://github.com/LucHermitte/lh-brackets/"; }; lh-vim-lib = buildVimPluginFrom2Nix { pname = "lh-vim-lib"; - version = "2021-02-23"; + version = "2021-03-10"; src = fetchFromGitHub { owner = "LucHermitte"; repo = "lh-vim-lib"; - rev = "7afb5525addfab7c177c2912a7aa98053c79e495"; - sha256 = "18jwc65q0k1q7nd2w31gi476cg4h7bfrr7z39is3s3qw0z2nprp9"; + rev = "0618a099fa7895c5d25b80cc1bea948ebdc64a96"; + sha256 = "1k2kz3475f15n1y7dkac45fw4mbr33fgbf2j7vmlshb4796j5fw3"; }; meta.homepage = "https://github.com/LucHermitte/lh-vim-lib/"; }; @@ -2304,24 +2316,24 @@ let lspsaga-nvim = buildVimPluginFrom2Nix { pname = "lspsaga-nvim"; - version = "2021-03-05"; + version = "2021-03-10"; src = fetchFromGitHub { owner = "glepnir"; repo = "lspsaga.nvim"; - rev = "afbe401bf8e8b02e4b61459d012bf2c1c70b7cf0"; - sha256 = "03hbh3y5ya0v2qgc5mhs0v7vwn2z56c8srg3arfqaphhr18da7s7"; + rev = "80c29017e9897280273473956009cc641a0b3709"; + sha256 = "1n08g56qiqq150hkihbwdnij5p1gipfddxh49vh8gs6jq7xk2vc5"; }; meta.homepage = "https://github.com/glepnir/lspsaga.nvim/"; }; lualine-nvim = buildVimPluginFrom2Nix { pname = "lualine-nvim"; - version = "2021-03-02"; + version = "2021-03-06"; src = fetchFromGitHub { owner = "hoob3rt"; repo = "lualine.nvim"; - rev = "9c9212c5b63675b43459e29858d3e0a64bce9507"; - sha256 = "07nz7wj8vr9dckbfx3dymjv9yq1q3wyy7mcj8lvlg1d9g28snnd1"; + rev = "332f488e2499d0f7a09276adcdd50995b348f7de"; + sha256 = "184csjlaizgd1fi7f3w6j67qvy1cg9sqiy5zjd1qy010bfl1cl46"; }; meta.homepage = "https://github.com/hoob3rt/lualine.nvim/"; }; @@ -2748,12 +2760,12 @@ let neosnippet-snippets = buildVimPluginFrom2Nix { pname = "neosnippet-snippets"; - version = "2021-01-20"; + version = "2021-03-08"; src = fetchFromGitHub { owner = "Shougo"; repo = "neosnippet-snippets"; - rev = "b10b14873fc0fd46a7daab251e83eaad6c17e1e3"; - sha256 = "1y5bp92dvz356nzl14bcqhdvfwc59ckc45nw0m4lh43q2h0lvdg1"; + rev = "97ce53528ded53cc2355acb64d285a6291cca099"; + sha256 = "0kms714cgryajrjmw0fpxv8k5xdrs6jz68jqd5hj4cs8rj72vpjk"; }; meta.homepage = "https://github.com/Shougo/neosnippet-snippets/"; }; @@ -2928,12 +2940,12 @@ let nvcode-color-schemes-vim = buildVimPluginFrom2Nix { pname = "nvcode-color-schemes-vim"; - version = "2021-02-26"; + version = "2021-03-10"; src = fetchFromGitHub { owner = "ChristianChiarulli"; repo = "nvcode-color-schemes.vim"; - rev = "536f99f6c5aa27f3362be6c7bc61e5251c9bdbcc"; - sha256 = "1n0xrzvplsrrc17jyqnyapwx2vj7b39d2ma0pd40qjf97rsvv4a4"; + rev = "497d8f8ddc4e7ed339c8afbbfe80fb6a57743297"; + sha256 = "012vnr7s7y3vv3n3fk10yxm7khwxnn7mjrkiixhrjq3lp4cai7xi"; }; meta.homepage = "https://github.com/ChristianChiarulli/nvcode-color-schemes.vim/"; }; @@ -2950,16 +2962,28 @@ let meta.homepage = "https://github.com/nathunsmitty/nvim-ale-diagnostic/"; }; - nvim-autopairs= buildVimPluginFrom2Nix { + nvim-autopairs = buildVimPluginFrom2Nix { pname = "nvim-autopairs"; - version = "2021-02-25"; + version = "2021-02-08"; src = fetchFromGitHub { owner = "windwp"; repo = "nvim-autopairs"; rev = "1596756a90114cbe25d0f383825a1ae2145b459b"; sha256 = "1c0h0082lkngn0ly4qpla98xgg71ax5r26v4q4h3gc77jf6mlqrd"; }; - meta.homepage = "https://github.com/windwp/nvim-autopairs"; + meta.homepage = "https://github.com/windwp/nvim-autopairs/"; + }; + + nvim-bqf = buildVimPluginFrom2Nix { + pname = "nvim-bqf"; + version = "2021-03-08"; + src = fetchFromGitHub { + owner = "kevinhwang91"; + repo = "nvim-bqf"; + rev = "0e772b3ffb16ad1b712fe72c95b3b2bddc2c7ade"; + sha256 = "051nly6h78cmx79nppxi86jchdjn90l3q96fx4g99pkgivsbswad"; + }; + meta.homepage = "https://github.com/kevinhwang91/nvim-bqf/"; }; nvim-cm-racer = buildVimPluginFrom2Nix { @@ -2974,26 +2998,14 @@ let meta.homepage = "https://github.com/roxma/nvim-cm-racer/"; }; - nvim-bqf = buildVimPluginFrom2Nix { - pname = "nvim-bqf"; - version = "2021-02-25"; - src = fetchFromGitHub { - owner = "kevinhwang91"; - repo = "nvim-bqf"; - rev = "4a424267e110e9637b84096a7080aa280c56be31"; - sha256 = "034x827nka73znvnbm5slnypw1az9s7xlrpkv5ia6hi7pcapjyfn"; - }; - meta.homepage = "https://github.com/kevinhwang91/nvim-bqf"; - }; - nvim-compe = buildVimPluginFrom2Nix { pname = "nvim-compe"; - version = "2021-03-05"; + version = "2021-03-09"; src = fetchFromGitHub { owner = "hrsh7th"; repo = "nvim-compe"; - rev = "c2dcc0d7469da71728a5443c053cd51a32c600fa"; - sha256 = "049ngs57xn19yv6p0xbz69riykxdv9mas5aj8ivdph67kwi5c7ym"; + rev = "25170751944b64bb7b65af1e35772361485bc936"; + sha256 = "0vaw5g4iflc0k1xy51rhgn1kb4qzxdd92r5nhnwvbc3fr6xkn464"; }; meta.homepage = "https://github.com/hrsh7th/nvim-compe/"; }; @@ -3036,24 +3048,24 @@ let nvim-gdb = buildVimPluginFrom2Nix { pname = "nvim-gdb"; - version = "2021-02-25"; + version = "2021-03-07"; src = fetchFromGitHub { owner = "sakhnik"; repo = "nvim-gdb"; - rev = "5a95e50556deebf45d771abc58c7cd440fd6390a"; - sha256 = "187yxnjxb9pp98yzvkpssmdcfqwvggzg5fpc20jwa7fvq8cdl0a0"; + rev = "07aa4b435a832b122154a157ab6892ac4efb81fb"; + sha256 = "05cgypswm7qdl26jd6nfqahk2bmqvp482k9zjbk0an12kbzlsrz0"; }; meta.homepage = "https://github.com/sakhnik/nvim-gdb/"; }; nvim-highlite = buildVimPluginFrom2Nix { pname = "nvim-highlite"; - version = "2021-03-03"; + version = "2021-03-08"; src = fetchFromGitHub { owner = "Iron-E"; repo = "nvim-highlite"; - rev = "5567fddecd08115857ef9fa49d1341ea6acf8620"; - sha256 = "02wgywj3sm4pc65qchdv3b217wrrrg11l5k60vrilqdk2spc4xvp"; + rev = "5f189ece5e071f4133ce756bec0ab7da1f6eece6"; + sha256 = "1s59fr7ppw37c98skrlbbcw583dhrqwjwd2nwjhmhhc884r88d5x"; }; meta.homepage = "https://github.com/Iron-E/nvim-highlite/"; }; @@ -3084,12 +3096,12 @@ let nvim-jdtls = buildVimPluginFrom2Nix { pname = "nvim-jdtls"; - version = "2021-03-02"; + version = "2021-03-05"; src = fetchFromGitHub { owner = "mfussenegger"; repo = "nvim-jdtls"; - rev = "58e7ee50b847956e31b4e293efc24fe86eb1e193"; - sha256 = "063vgba5bqgji416bmp4vzy4pfsmvn3gjflinkyv05vcs76vy82w"; + rev = "8ff60d5e91fe2a4c1dedc6685ef7722e8e7bce78"; + sha256 = "1gaw6pcvgw31dkdpni708l3kcyw3fv3fk05fn3cgs0sdn4xzmnkj"; }; meta.homepage = "https://github.com/mfussenegger/nvim-jdtls/"; }; @@ -3108,12 +3120,12 @@ let nvim-lspconfig = buildVimPluginFrom2Nix { pname = "nvim-lspconfig"; - version = "2021-03-05"; + version = "2021-03-10"; src = fetchFromGitHub { owner = "neovim"; repo = "nvim-lspconfig"; - rev = "100a8bbfa621db3d373dc41b6f593719b53f860c"; - sha256 = "1p781j10mhyv8vgi9chkv36kxhy09hpnlk0iam915fhpm050q887"; + rev = "11a581d1860a7ad2b6c1ee1e0ebbb000e81b9950"; + sha256 = "0khbp05sgz07sazgkmv4pwrnnisswkagx4gwkw9slawm4qb1k93j"; }; meta.homepage = "https://github.com/neovim/nvim-lspconfig/"; }; @@ -3132,24 +3144,24 @@ let nvim-peekup = buildVimPluginFrom2Nix { pname = "nvim-peekup"; - version = "2021-03-03"; + version = "2021-03-06"; src = fetchFromGitHub { owner = "gennaro-tedesco"; repo = "nvim-peekup"; - rev = "4da5cd216643ec15164237cdbab4884604053b46"; - sha256 = "0q5j3d4bdapb9m5h5ijkxh05q4fsc2inbskq2rhmannlq94myljb"; + rev = "b88638d1067364965c214860cc2e5048caa617f7"; + sha256 = "17hc37f7gm1wbrj6mzq3walb1a5km901viq0nx8n93r957sj98dd"; }; meta.homepage = "https://github.com/gennaro-tedesco/nvim-peekup/"; }; nvim-scrollview = buildVimPluginFrom2Nix { pname = "nvim-scrollview"; - version = "2021-03-05"; + version = "2021-03-09"; src = fetchFromGitHub { owner = "dstein64"; repo = "nvim-scrollview"; - rev = "33e5262777b26e1e81a887d1a85fb0d2037c8249"; - sha256 = "0agk44v8l91cmaczrraylkb8k69s1c05cz0yj9ipn06l0dmj2rlh"; + rev = "16c7c64872d4e6634cd5cf2d7db63474b2e8beda"; + sha256 = "15ig6x9xdl4gz9yvnhhxic106h03xxm95sd6kgmjpdpvibnv448n"; }; meta.homepage = "https://github.com/dstein64/nvim-scrollview/"; }; @@ -3168,36 +3180,36 @@ let nvim-tree-lua = buildVimPluginFrom2Nix { pname = "nvim-tree-lua"; - version = "2021-02-26"; + version = "2021-03-09"; src = fetchFromGitHub { owner = "kyazdani42"; repo = "nvim-tree.lua"; - rev = "1984c125100247f79e1aaa4de335032ea6092d63"; - sha256 = "081vcbasmhki7hshfaimbv1wgim15h6vagcxc4fkjgbmpl621s49"; + rev = "31ef294d05e1feeb5eb9e8ff3895d09cc93d95e4"; + sha256 = "0vcgvwcibqq5j59nw09z2mc0gb79nyhiwnxny81h0m56mn2v9a6r"; }; meta.homepage = "https://github.com/kyazdani42/nvim-tree.lua/"; }; nvim-treesitter = buildVimPluginFrom2Nix { pname = "nvim-treesitter"; - version = "2021-03-04"; + version = "2021-03-10"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter"; - rev = "2f60b43c0f003f549f845ac1578878c69514929b"; - sha256 = "1q7q5rd7cyjk7s83w5vnfin76dv52ggjn3q2ja15zayi758bg78k"; + rev = "3b8c2ea492917fcb3c0e88ad6682dbd355cc0644"; + sha256 = "083ysgl1xwlfm2ri54m4qr17rvm6a5al95ybzzff6av699v632rb"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/"; }; nvim-treesitter-context = buildVimPluginFrom2Nix { pname = "nvim-treesitter-context"; - version = "2021-02-16"; + version = "2021-03-10"; src = fetchFromGitHub { owner = "romgrk"; repo = "nvim-treesitter-context"; - rev = "0dda360a8f841550ca565564c5a409746353e94e"; - sha256 = "058hfybqhcwvmhjm7k9iww2baz2fpww7nq6m9xngj3wdwfkylcfy"; + rev = "ff4955b250eebc320d32d6459297117004c68d3e"; + sha256 = "0qmhk6mdx00cf0vnz57n512ddifh08js7paxg9qsha374xqwq715"; }; meta.homepage = "https://github.com/romgrk/nvim-treesitter-context/"; }; @@ -3360,12 +3372,12 @@ let packer-nvim = buildVimPluginFrom2Nix { pname = "packer-nvim"; - version = "2021-03-04"; + version = "2021-03-08"; src = fetchFromGitHub { owner = "wbthomason"; repo = "packer.nvim"; - rev = "3c7bdd7afb0a0149fdf3e77ec8d6dd93b3159d52"; - sha256 = "1dxx0mjyms5h2a5g6abbmjvq00sn25q1xw4r4fa7l8sifsa9i7r4"; + rev = "6a169bec7d15d24c1d680fb75aa24a2921829442"; + sha256 = "01z192y61vls455hjp6im87mzbngyhpn78mpf80c445anpwpb0xf"; }; meta.homepage = "https://github.com/wbthomason/packer.nvim/"; }; @@ -3456,12 +3468,12 @@ let plenary-nvim = buildVimPluginFrom2Nix { pname = "plenary-nvim"; - version = "2021-03-05"; + version = "2021-03-10"; src = fetchFromGitHub { owner = "nvim-lua"; repo = "plenary.nvim"; - rev = "41b4f834c4cc22ff283f381fd3fe3e00ead3099d"; - sha256 = "0vd4haaj2agsy3592j6kp72azpjj3lm51gahq2s7d4a63cr93xl8"; + rev = "8f2babdd1bb76c2df0a1ef307bb9fe8477d13727"; + sha256 = "14c57pxhq4da8svi11rbzsg3rygcnly7cwjzzhpg2a9id1xxsppq"; }; meta.homepage = "https://github.com/nvim-lua/plenary.nvim/"; }; @@ -3493,12 +3505,12 @@ let popup-nvim = buildVimPluginFrom2Nix { pname = "popup-nvim"; - version = "2020-12-12"; + version = "2021-03-10"; src = fetchFromGitHub { owner = "nvim-lua"; repo = "popup.nvim"; - rev = "6f8f4cf35278956de1095b0d10701c6b579a2a57"; - sha256 = "0mvcms1ica4kpl5na0cppk0advyq96707zj394wvlnnq18dnsj4z"; + rev = "bc98ca6df9179452c368f0d7bac821a8fd4c01ac"; + sha256 = "0j1gkaba6z5vb922j47i7sq0d1zwkr5581w0nxd8c31klghg3kyn"; }; meta.homepage = "https://github.com/nvim-lua/popup.nvim/"; }; @@ -4239,12 +4251,12 @@ let telescope-nvim = buildVimPluginFrom2Nix { pname = "telescope-nvim"; - version = "2021-03-05"; + version = "2021-03-10"; src = fetchFromGitHub { owner = "nvim-telescope"; repo = "telescope.nvim"; - rev = "6e941e0ecec1ab6a1b4ce40c693ef1272c505abb"; - sha256 = "1dd7al3zh02fdjsnvxcbqxw9q27x57fl5krcdwn5yifadwmbrdml"; + rev = "add7ee394350f268684cff03d844f32f255fec47"; + sha256 = "0rfrgfx9xm02cy4dy40n4j90561ymw1pyqzzw4fawpajm3hmxcfv"; }; meta.homepage = "https://github.com/nvim-telescope/telescope.nvim/"; }; @@ -4359,7 +4371,7 @@ let }; tremor-vim = buildVimPluginFrom2Nix { - pname = "tremor-nvim"; + pname = "tremor-vim"; version = "2020-11-19"; src = fetchFromGitHub { owner = "tremor-rs"; @@ -4367,7 +4379,7 @@ let rev = "17e53c33f3b0e825330580034ca60172b8ddaadc"; sha256 = "1gy67qjv0iwqza0yx9y8p5yzn5fszrp7szg1527h0ki3q69cfqki"; }; - meta.homepage = "https://github.com/tremor-rs/tremor-vim"; + meta.homepage = "https://github.com/tremor-rs/tremor-vim/"; }; tslime-vim = buildVimPluginFrom2Nix { @@ -4502,18 +4514,6 @@ let meta.homepage = "https://github.com/vhda/verilog_systemverilog.vim/"; }; - embark-vim = buildVimPluginFrom2Nix { - pname = "embark-vim"; - version = "2021-02-23"; - src = fetchFromGitHub { - owner = "embark-theme"; - repo = "vim"; - rev = "d9ea898794c486e2517823f24b9577ce4c488364"; - sha256 = "0l1f9pl8nh8lkswwrsw13s8d10ccq0c1jfd3bpszsxc6ryjm0wqw"; - }; - meta.homepage = "https://github.com/embark-theme/vim/"; - }; - vim-abolish = buildVimPluginFrom2Nix { pname = "vim-abolish"; version = "2020-10-30"; @@ -4768,12 +4768,12 @@ let vim-airline = buildVimPluginFrom2Nix { pname = "vim-airline"; - version = "2021-03-02"; + version = "2021-03-09"; src = fetchFromGitHub { owner = "vim-airline"; repo = "vim-airline"; - rev = "df956aa08b8bdb176d7127cc4940aea123ec4ffc"; - sha256 = "1wk9df1c80198xpp6zd2yxh3j216w573lv5ssfq6ck26jy7p4q44"; + rev = "09dbd09ed3b6318ca4c3cda8f61f02f1bc8ce783"; + sha256 = "0hi4yvd5b8il63a42kk10hxc8ixb1khf8h8q601qipkvgla8mpiy"; }; meta.homepage = "https://github.com/vim-airline/vim-airline/"; }; @@ -4924,12 +4924,12 @@ let vim-beancount = buildVimPluginFrom2Nix { pname = "vim-beancount"; - version = "2020-08-06"; + version = "2021-03-07"; src = fetchFromGitHub { owner = "nathangrigg"; repo = "vim-beancount"; - rev = "6d762beaa526d4e56280619aa62b1013b50457b7"; - sha256 = "0r4ziynmil432k1xjglqjx0bh5069aav3k9r58ksqg716w4zvzys"; + rev = "30b55500094325af9e9498b72e75c8c1090df436"; + sha256 = "0bh7q7s3zb2yrnck3zx1cx0kv8lm8zp4p5fwj6kv35y27v109pfm"; }; meta.homepage = "https://github.com/nathangrigg/vim-beancount/"; }; @@ -5044,12 +5044,12 @@ let vim-clap = buildVimPluginFrom2Nix { pname = "vim-clap"; - version = "2021-03-05"; + version = "2021-03-10"; src = fetchFromGitHub { owner = "liuchengxu"; repo = "vim-clap"; - rev = "791e2e7cffc6db2858dc6099af109e3b6e9d7f19"; - sha256 = "1d5z4s3llkz324ij9cz7sxhzn0a5bjgdvxg0wnd8v9d1vc7hjpp3"; + rev = "c558950fa5e1aaa9fe4652b37380fffb762fdd09"; + sha256 = "0z0k1596a2wj1ynr4jbh0s53drrkmx1r4ff0ji7scx1jihxpfjqp"; }; meta.homepage = "https://github.com/liuchengxu/vim-clap/"; }; @@ -5284,12 +5284,12 @@ let vim-dadbod = buildVimPluginFrom2Nix { pname = "vim-dadbod"; - version = "2021-02-26"; + version = "2021-03-10"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-dadbod"; - rev = "28c3b294c9f1d88078eeebfa62a8533e6ea97f87"; - sha256 = "0myj7ng62sjxhrq0lfk142dzr637rfl0ll6khrd0a3hrwxjjnb2x"; + rev = "c1f00249cb47dae2457ae8b748284620b622e642"; + sha256 = "0s4srsnxqw0g5k75cqcy709x7jqipsfsvhsic2cj0b0y8m49wqzz"; }; meta.homepage = "https://github.com/tpope/vim-dadbod/"; }; @@ -5500,12 +5500,12 @@ let vim-endwise = buildVimPluginFrom2Nix { pname = "vim-endwise"; - version = "2020-04-19"; + version = "2021-03-06"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-endwise"; - rev = "97180a73ad26e1dcc1eebe8de201f7189eb08344"; - sha256 = "1f9nwp9qiip4alkpacwaq2nzsrx80a4cdwyrvajs6lrk48dv4hbw"; + rev = "4289889a2622f9bc7c594a6dd79763781f63dfb5"; + sha256 = "0sixr3rpcgqbaiyk7w6ghcrvllh35cb3gq9isdlwkww3dz4jyyxc"; }; meta.homepage = "https://github.com/tpope/vim-endwise/"; }; @@ -5680,12 +5680,12 @@ let vim-floaterm = buildVimPluginFrom2Nix { pname = "vim-floaterm"; - version = "2021-03-05"; + version = "2021-03-07"; src = fetchFromGitHub { owner = "voldikss"; repo = "vim-floaterm"; - rev = "a4c834bc8ed2e7e2ef3f02de2d3055007e464956"; - sha256 = "0lhfdnsqys0091k85nkd1g68xgv09m6jymv8ikax0xfar1zmymx3"; + rev = "7b0eb92e72a6d6aef3c31faa868e2d2a4af81951"; + sha256 = "08sf9idvrjqf6bvi5p98w8fj2r7c1czkvsyfjch77bwr20gdf2wy"; }; meta.homepage = "https://github.com/voldikss/vim-floaterm/"; }; @@ -5728,12 +5728,12 @@ let vim-fugitive = buildVimPluginFrom2Nix { pname = "vim-fugitive"; - version = "2021-03-01"; + version = "2021-03-10"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-fugitive"; - rev = "9cba97f4db4e0af4275f802c2de977f553d26ec6"; - sha256 = "182z25fv3lqhsh926p24fq1lwldbdq8bqbmivpv4ylq2c5b6xisz"; + rev = "753318ef83b685f32c6bda5ae5b65b7b239a29a7"; + sha256 = "0g3l1hb4nqwaz5hhagr6hy4nwv1n1qcwbak27s5sx9fbnsp6npaa"; }; meta.homepage = "https://github.com/tpope/vim-fugitive/"; }; @@ -5848,12 +5848,12 @@ let vim-go = buildVimPluginFrom2Nix { pname = "vim-go"; - version = "2021-02-20"; + version = "2021-03-10"; src = fetchFromGitHub { owner = "fatih"; repo = "vim-go"; - rev = "755b498c7604e7aee4d001d2a78c2d1e079eb8d5"; - sha256 = "048xqia30alvcshvmbqlqvvslk19zvqmsdy50ww8rzz9yzhff5bw"; + rev = "95c79dcdcbc7e8e9165fa7f4a6bf17c08a6bab05"; + sha256 = "0110jifwa485l42cjjf3bbrwiahwm1ddijh4jlybchghrx2b64r2"; }; meta.homepage = "https://github.com/fatih/vim-go/"; }; @@ -6233,12 +6233,12 @@ let vim-javascript = buildVimPluginFrom2Nix { pname = "vim-javascript"; - version = "2020-05-11"; + version = "2021-03-09"; src = fetchFromGitHub { owner = "pangloss"; repo = "vim-javascript"; - rev = "3c90d0cc37bb8b78422f647e62587f498a5dd7bd"; - sha256 = "16s3s883azfmwkr6hhnh8m7ibk6jm3vnvpmsagangxn0mz6ky533"; + rev = "c7593e69bf64c3157b50cd0aea257c5abb8ae6a0"; + sha256 = "11792qbl0080s8kxprfzc0xnb3abw1zsvb4vq2fc61q50afn775j"; }; meta.homepage = "https://github.com/pangloss/vim-javascript/"; }; @@ -6426,12 +6426,12 @@ let vim-ledger = buildVimPluginFrom2Nix { pname = "vim-ledger"; - version = "2021-03-05"; + version = "2021-03-06"; src = fetchFromGitHub { owner = "ledger"; repo = "vim-ledger"; - rev = "0dc9c746ef2459964bab31ccca4225320fe0d687"; - sha256 = "1fkbi0yw62ga0fmyi40gz173ydydlp0xkbxl0c8l40d68yx0ckvh"; + rev = "96ec5f9a14211c3b1b2e4632c07df3a5fb68ef3b"; + sha256 = "0kawxaxahg7sdpkyp65k7gy6hqbfcs1hy8w8rzvi2h9kw4y8xkr7"; }; meta.homepage = "https://github.com/ledger/vim-ledger/"; }; @@ -6510,12 +6510,12 @@ let vim-lsp = buildVimPluginFrom2Nix { pname = "vim-lsp"; - version = "2021-03-03"; + version = "2021-03-06"; src = fetchFromGitHub { owner = "prabirshrestha"; repo = "vim-lsp"; - rev = "fea03524cb89385dc8997867a8588135bbd454ca"; - sha256 = "1p8ahb8wl6prs7jdbjchk9w3h3yfz9mnklr4k5j360nwdj7mvbm8"; + rev = "eb237a2cedf2c69a44543d2ffaee25470c53e29b"; + sha256 = "1aldjq32cpbd2gkxqvf6gqskyr4br9835vsap4sgjc2fgigmiyla"; }; meta.homepage = "https://github.com/prabirshrestha/vim-lsp/"; }; @@ -6991,12 +6991,12 @@ let vim-pandoc-syntax = buildVimPluginFrom2Nix { pname = "vim-pandoc-syntax"; - version = "2021-03-02"; + version = "2021-03-10"; src = fetchFromGitHub { owner = "vim-pandoc"; repo = "vim-pandoc-syntax"; - rev = "76812f583d7fbec2ef0257424ec1f43fd32473fb"; - sha256 = "0dfhn03nirz2iccpsi9g3rdw3vg1pm0hv75swv5dwhshjzw8rw70"; + rev = "aba6b5596cf0e879a83a2aa5edc93e5e5753bea8"; + sha256 = "0hgzmfcyl3qhdmyyxdaynlm7psk164v8xg5j1kvdaxxgj4lwbnig"; }; meta.homepage = "https://github.com/vim-pandoc/vim-pandoc-syntax/"; }; @@ -7447,12 +7447,12 @@ let vim-scriptease = buildVimPluginFrom2Nix { pname = "vim-scriptease"; - version = "2020-01-05"; + version = "2021-03-08"; src = fetchFromGitHub { owner = "tpope"; repo = "vim-scriptease"; - rev = "86f49aca266e4b17420bcadd29009997d15668d8"; - sha256 = "0kcv5q4qahqd316h5k81xnf8skn71126x4lw2i6wa2m2653d0k5c"; + rev = "9450c4ea654649b6199750edc9f3f84637268d7b"; + sha256 = "0nkxcykn63187jwzw0anl3chzhm31yzgmkhqra0c9071jzi149xg"; }; meta.homepage = "https://github.com/tpope/vim-scriptease/"; }; @@ -7471,12 +7471,12 @@ let vim-sexp = buildVimPluginFrom2Nix { pname = "vim-sexp"; - version = "2017-05-15"; + version = "2021-03-08"; src = fetchFromGitHub { owner = "guns"; repo = "vim-sexp"; - rev = "12292941903d9ac8151513189d2007e1ccfc95f0"; - sha256 = "1mfqbmrbqgnsc34pmcsrc0c5zvgxhhnw4hx4g5wbssfk1ddyx6y0"; + rev = "14464d4580af43424ed8f2614d94e62bfa40bb4d"; + sha256 = "139krxpjhbyypbl6v2jik1rms2fxl3dkqrl4rb7sms6c3p5764qx"; }; meta.homepage = "https://github.com/guns/vim-sexp/"; }; @@ -7519,12 +7519,12 @@ let vim-signify = buildVimPluginFrom2Nix { pname = "vim-signify"; - version = "2021-01-28"; + version = "2021-03-07"; src = fetchFromGitHub { owner = "mhinz"; repo = "vim-signify"; - rev = "b2a0450e23c63b75bbeabf4f0c28f9b4b2480689"; - sha256 = "0fj9dwvkpg69v6ps56hrm0k2y4f9rvnj7hwic6ysxfx96wngfzcm"; + rev = "2542b6459085f3d1e361e8b5bf406dec6448487e"; + sha256 = "1m7m1fwn4bpbqfji7fvvgx00fxz1hy5nvfajbpj4vpgaxzqwsf8k"; }; meta.homepage = "https://github.com/mhinz/vim-signify/"; }; @@ -7627,12 +7627,12 @@ let vim-snippets = buildVimPluginFrom2Nix { pname = "vim-snippets"; - version = "2021-02-25"; + version = "2021-03-09"; src = fetchFromGitHub { owner = "honza"; repo = "vim-snippets"; - rev = "24a9bf959211bb0ba9ada17d6425ff167adf7bd9"; - sha256 = "0jwjhpw1g0hy935vzslbhcw9n5sfbpcc7hs1bvvvir05619hr21y"; + rev = "d30f65105e1f73c63c92c22c4afbad51539f5744"; + sha256 = "05qbrdipxpzj7v0n4q3bj8p2sgl28jm952hy7gs76ma3p3g7mnrq"; }; meta.homepage = "https://github.com/honza/vim-snippets/"; }; @@ -7651,12 +7651,12 @@ let vim-sort-motion = buildVimPluginFrom2Nix { pname = "vim-sort-motion"; - version = "2018-07-15"; + version = "2021-03-07"; src = fetchFromGitHub { owner = "christoomey"; repo = "vim-sort-motion"; - rev = "49dfcabeee2bf3a85a6cc0774b35f687b6c9d0e5"; - sha256 = "02v12iqy3gjhvh5aza6b6b3pfv2qkyyw83bxqjgbjj002f71ydkb"; + rev = "c8782be8f7da414c6442b3ba4b6abb0345d392d9"; + sha256 = "1vq2jrn75g3gd8vfgbnkn0w2qc4gbnrn2lg0wmzsvvxdvj8m9lii"; }; meta.homepage = "https://github.com/christoomey/vim-sort-motion/"; }; @@ -7831,12 +7831,12 @@ let vim-terraform = buildVimPluginFrom2Nix { pname = "vim-terraform"; - version = "2020-12-10"; + version = "2021-03-07"; src = fetchFromGitHub { owner = "hashivim"; repo = "vim-terraform"; - rev = "aa7877acb5dd81bed70c1188667b76cfde5b67bf"; - sha256 = "0ibks0ykybiardppad9psjh2qmh29s9mbjf2d4jg8hbx59kvj32g"; + rev = "e62cac4d3186209a510f51becd768ee414b2be76"; + sha256 = "1c93kvlrgzp5fw5rgv053sin0f2f2chydxbvrkprpz71qmxqmq05"; }; meta.homepage = "https://github.com/hashivim/vim-terraform/"; }; @@ -8024,12 +8024,12 @@ let vim-tpipeline = buildVimPluginFrom2Nix { pname = "vim-tpipeline"; - version = "2021-03-04"; + version = "2021-03-09"; src = fetchFromGitHub { owner = "vimpostor"; repo = "vim-tpipeline"; - rev = "e47a0cc3eaedb4072c564d616001dc61ae403ab6"; - sha256 = "1kjp6rx7k1svr90s56z8xqs4j1hii7y48acmdcl6lmhyxp5jindk"; + rev = "3f6ed5af76d45cf3d0e7f87cd927866f3640aa22"; + sha256 = "04m652dfwgr52ic2f206s0mq8z10dnaxb90xcywrfjgkdcjd6d10"; }; meta.homepage = "https://github.com/vimpostor/vim-tpipeline/"; }; @@ -8445,24 +8445,24 @@ let vimtex = buildVimPluginFrom2Nix { pname = "vimtex"; - version = "2021-03-05"; + version = "2021-03-09"; src = fetchFromGitHub { owner = "lervag"; repo = "vimtex"; - rev = "f64e85873dbe654937a9ce50c987440c5a53975b"; - sha256 = "1nnj5qgb9hnkrp7hj0hiiacckak97mrygsv4j44rxqgdibwszi9h"; + rev = "3af88f325e4784bd209df490dbf648a942326d57"; + sha256 = "0zqp4zvl8xqa0lsj6lwc4wlg0n3wknhfn1g1j2gbncgyiw38ax2l"; }; meta.homepage = "https://github.com/lervag/vimtex/"; }; vimux = buildVimPluginFrom2Nix { pname = "vimux"; - version = "2021-02-23"; + version = "2021-03-09"; src = fetchFromGitHub { owner = "preservim"; repo = "vimux"; - rev = "5b1791673c1a089a78be16187f7532f95e50580b"; - sha256 = "17m7hh02q9myfpa8z1scnakcl25fasnns1gxgfpx544rky5pd3mc"; + rev = "29d46f6bc158c28b85ae540dc29459ff41211233"; + sha256 = "1yd9pmyzqyk7mcsa9gkvsz6i9g6zkm63mm9h26713simy1idl536"; }; meta.homepage = "https://github.com/preservim/vimux/"; }; @@ -8493,12 +8493,12 @@ let vista-vim = buildVimPluginFrom2Nix { pname = "vista-vim"; - version = "2021-02-26"; + version = "2021-03-08"; src = fetchFromGitHub { owner = "liuchengxu"; repo = "vista.vim"; - rev = "9c97b935cb941a9fddcbbdc0eaf3e5e190f4847e"; - sha256 = "10jsqi5jipvaa8dbckrjacqz32iy0i9mx1a4m3jk3gainx9a9xmq"; + rev = "954754c830d2ca7da3157cdea029c8d50021d0bc"; + sha256 = "1cw79hzkisii0g2n457wbzha65wbpp00x3yrb8rb3d5299bz0z72"; }; meta.homepage = "https://github.com/liuchengxu/vista.vim/"; }; @@ -8675,24 +8675,24 @@ let zephyr-nvim = buildVimPluginFrom2Nix { pname = "zephyr-nvim"; - version = "2021-03-05"; + version = "2021-03-06"; src = fetchFromGitHub { owner = "glepnir"; repo = "zephyr-nvim"; - rev = "18d39cb21e00e0cd6b24a39f0c012c288d624246"; - sha256 = "12m0i9ma0lmy5vmc9b7ksijnn8lr5a4jkwgnfch496cyakpipvd9"; + rev = "a9b4a655b61aeb02229d54ff7cd22395a02a9ee7"; + sha256 = "1dxr4p1ikmqacjb0x9p0ndlcdg812yzqmk56c79dgllf0cr0l7hg"; }; meta.homepage = "https://github.com/glepnir/zephyr-nvim/"; }; zig-vim = buildVimPluginFrom2Nix { pname = "zig-vim"; - version = "2021-02-23"; + version = "2021-03-08"; src = fetchFromGitHub { owner = "ziglang"; repo = "zig.vim"; - rev = "fcafb4b64ffe6d308f5e312ddd1672e69e09fb1c"; - sha256 = "0bsz046sbf5g6lkgcjyllc8knbiqdcglpkf1wbzn7zi7whdhjxdx"; + rev = "ead21935391bb1f3906c7358af7ebe5572592cfd"; + sha256 = "1qcd7w5hadf6h4lxrvj8xjl729csy0bc0dch39xy4j6iph9w8jpq"; }; meta.homepage = "https://github.com/ziglang/zig.vim/"; }; diff --git a/third_party/nixpkgs/pkgs/misc/vim-plugins/overrides.nix b/third_party/nixpkgs/pkgs/misc/vim-plugins/overrides.nix index 6ae6a42fac..1ee9198748 100644 --- a/third_party/nixpkgs/pkgs/misc/vim-plugins/overrides.nix +++ b/third_party/nixpkgs/pkgs/misc/vim-plugins/overrides.nix @@ -91,9 +91,11 @@ self: super: { # plugin, since part of the fzf vim plugin is included in the main fzf # program. fzfWrapper = buildVimPluginFrom2Nix { + inherit (fzf) src version; pname = "fzf"; - version = fzf.version; - src = fzf.src; + postInstall = '' + ln -s ${fzf}/bin/fzf $target/bin/fzf + ''; }; skim = buildVimPluginFrom2Nix { @@ -656,7 +658,7 @@ self: super: { }); lf-vim = super.lf-vim.overrideAttrs (old: { - dependencies = with super; [ vim-bbye ]; + dependencies = with super; [ vim-floaterm ]; }); vim-stylish-haskell = super.vim-stylish-haskell.overrideAttrs (old: { @@ -729,7 +731,7 @@ self: super: { libiconv ]; - cargoSha256 = "042dbg80mx0khm8xahm4l490s7bfbav362r0mz5bfhq4fy2s9nsi"; + cargoSha256 = "F+kIVnO7MBuaYRa2MPsD3eQ2d5W5VxHhxHKeo/ic6TE="; }; in '' 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 a1d970c26a..2076e24423 100644 --- a/third_party/nixpkgs/pkgs/misc/vim-plugins/vim-plugin-names +++ b/third_party/nixpkgs/pkgs/misc/vim-plugins/vim-plugin-names @@ -627,7 +627,7 @@ tpope/vim-tbone tpope/vim-unimpaired tpope/vim-vinegar travitch/hasksyn -tremor-rs/tremor-vim +tremor-rs/tremor-vim@main triglav/vim-visual-increment troydm/zoomwintab.vim twerth/ir_black diff --git a/third_party/nixpkgs/pkgs/misc/vscode-extensions/terraform/default.nix b/third_party/nixpkgs/pkgs/misc/vscode-extensions/terraform/default.nix index 39dd6f90b8..7e7d0c618b 100644 --- a/third_party/nixpkgs/pkgs/misc/vscode-extensions/terraform/default.nix +++ b/third_party/nixpkgs/pkgs/misc/vscode-extensions/terraform/default.nix @@ -3,13 +3,13 @@ vscode-utils.buildVscodeMarketplaceExtension rec { mktplcRef = { name = "terraform"; publisher = "hashicorp"; - version = "2.7.0"; + version = "2.8.1"; }; vsix = fetchurl { name = "${mktplcRef.publisher}-${mktplcRef.name}.zip"; url = "https://github.com/hashicorp/vscode-terraform/releases/download/v${mktplcRef.version}/terraform-${mktplcRef.version}.vsix"; - sha256 = "0lpsng7rd88ppjybmypzw42czr6swwin5cyl78v36z3wjwqx26xp"; + sha256 = "1pdpl8diqybqf68jvfk4kq9wg4k6c38811mh8iq12j4ba31cig9s"; }; patches = [ ./fix-terraform-ls.patch ]; diff --git a/third_party/nixpkgs/pkgs/misc/vscode-extensions/terraform/fix-terraform-ls.patch b/third_party/nixpkgs/pkgs/misc/vscode-extensions/terraform/fix-terraform-ls.patch index 3d5cc51fe2..9c076d06df 100644 --- a/third_party/nixpkgs/pkgs/misc/vscode-extensions/terraform/fix-terraform-ls.patch +++ b/third_party/nixpkgs/pkgs/misc/vscode-extensions/terraform/fix-terraform-ls.patch @@ -1,18 +1,17 @@ diff --git a/out/extension.js b/out/extension.js -index 375048c..fa5eff0 100644 +index 4a2c6a9..158fe28 100644 --- a/out/extension.js +++ b/out/extension.js -@@ -209,20 +209,7 @@ function pathToBinary() { +@@ -215,19 +215,7 @@ function pathToBinary() { if (!_pathToBinaryPromise) { let command = vscodeUtils_1.config('terraform').get('languageServer.pathToBinary'); if (!command) { // Skip install/upgrade if user has set custom binary path - const installDir = `${extensionPath}/lsp`; -- const installer = new languageServerInstaller_1.LanguageServerInstaller(); +- const installer = new languageServerInstaller_1.LanguageServerInstaller(reporter); - try { - yield installer.install(installDir); - } - catch (err) { -- vscode.window.showErrorMessage(err); - reporter.sendTelemetryException(err); - throw err; - } @@ -22,5 +21,5 @@ index 375048c..fa5eff0 100644 - command = `${installDir}/terraform-ls`; + command = 'TERRAFORM-LS-PATH'; } - _pathToBinaryPromise = Promise.resolve(command); - } + else { + reporter.sendTelemetryEvent('usePathToBinary'); diff --git a/third_party/nixpkgs/pkgs/os-specific/darwin/m-cli/default.nix b/third_party/nixpkgs/pkgs/os-specific/darwin/m-cli/default.nix index b69849d824..f19f5a0275 100644 --- a/third_party/nixpkgs/pkgs/os-specific/darwin/m-cli/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/darwin/m-cli/default.nix @@ -40,6 +40,6 @@ stdenv.mkDerivation rec { license = licenses.mit; platforms = platforms.darwin; - maintainers = with maintainers; [ yurrriq ]; + maintainers = with maintainers; []; }; } diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/firmware/system76-firmware/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/firmware/system76-firmware/default.nix index 84d9dd4f33..a5722d59c2 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/firmware/system76-firmware/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/firmware/system76-firmware/default.nix @@ -2,13 +2,13 @@ rustPlatform.buildRustPackage rec { pname = "system76-firmware"; # Check Makefile when updating, make sure postInstall matches make install - version = "1.0.20"; + version = "1.0.24"; src = fetchFromGitHub { owner = "pop-os"; repo = pname; rev = version; - sha256 = "0yjv3a8r01ks91gc33rdwqmw52cqqwhq9f3rvw2xv3h8cqa5hfz0"; + sha256 = "sha256-Poe18HKEQusvN3WF4ZAV1WCvU8/3HKpHEqDsfDO62V0="; }; nativeBuildInputs = [ pkg-config makeWrapper ]; @@ -17,7 +17,7 @@ rustPlatform.buildRustPackage rec { cargoBuildFlags = [ "--workspace" ]; - cargoSha256 = "1ivn3i6kpnswiipqw5s67p6gsz3y6an0ahf6vwz7dlw2xaha0xbx"; + cargoSha256 = "sha256-sKC0jfpy7mxGwO+mKU3W5e9HsJx+HQNzqq78YViNJcs="; # Purposefully don't install systemd unit file, that's for NixOS postInstall = '' diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/common-config.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/common-config.nix index 5e749ed3fc..4fef56077c 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/common-config.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/common-config.nix @@ -772,6 +772,8 @@ let MLX4_EN_VXLAN = whenOlder "4.8" yes; MLX5_CORE_EN = option yes; + NVME_MULTIPATH = whenAtLeast "4.15" yes; + PSI = whenAtLeast "4.20" yes; MODVERSIONS = whenOlder "4.9" yes; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/hardened/patches.json b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/hardened/patches.json index ef32e46583..c7d9376f1b 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/hardened/patches.json +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/hardened/patches.json @@ -1,26 +1,26 @@ { "4.14": { "extra": "-hardened1", - "name": "linux-hardened-4.14.222-hardened1.patch", - "sha256": "1p692sn0d6cwmilgpi8chs99m0c36pd2rphrljz7b8ywc394jxsb", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.222-hardened1/linux-hardened-4.14.222-hardened1.patch" + "name": "linux-hardened-4.14.224-hardened1.patch", + "sha256": "017bczkz0njj5icr3xzw8ai7kgyg919k8jnj3iq8d865db4n9nid", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.224-hardened1/linux-hardened-4.14.224-hardened1.patch" }, "4.19": { "extra": "-hardened1", - "name": "linux-hardened-4.19.177-hardened1.patch", - "sha256": "1l9qic5ggak9qa04bhxrwsrdi6ih9a8dvnzv0l2dfrp7f5z4zmj9", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.177-hardened1/linux-hardened-4.19.177-hardened1.patch" + "name": "linux-hardened-4.19.179-hardened1.patch", + "sha256": "1j6gvwjkigv47rc5wcc3cng0n1k1wfw27i34lb5zzlxzkjwbs1rx", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.179-hardened1/linux-hardened-4.19.179-hardened1.patch" }, "5.10": { "extra": "-hardened1", - "name": "linux-hardened-5.10.18-hardened1.patch", - "sha256": "19z1dlwqfwaxi72yr6yh9dzqqrk1v3za3i6qz95xyz5afwn8vp33", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.18-hardened1/linux-hardened-5.10.18-hardened1.patch" + "name": "linux-hardened-5.10.22-hardened1.patch", + "sha256": "0ja7pcc999p6vy16gn4syb4vq7rlqckfrf5z2b4a7rzdzxcm6ji8", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.22-hardened1/linux-hardened-5.10.22-hardened1.patch" }, "5.4": { "extra": "-hardened1", - "name": "linux-hardened-5.4.100-hardened1.patch", - "sha256": "0wr6lgb1xkj11y08y0v58ipkwifs56vy4bd3h70i52b7vhqwsb19", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.100-hardened1/linux-hardened-5.4.100-hardened1.patch" + "name": "linux-hardened-5.4.104-hardened1.patch", + "sha256": "0dk0s23vr9vdh8aa7g3f6ygvqry4rw057i18sfnfsr18r7xslhna", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.104-hardened1/linux-hardened-5.4.104-hardened1.patch" } } diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.14.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.14.nix index 3716ee9eb6..92a28f9c46 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.14.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.14.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "4.14.222"; + version = "4.14.224"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0i67va37ca3avalgh2ab797c6w2v0h41y1mh4fql73lz7nq84h3k"; + sha256 = "1x8wyj28zcx6nn3mkfvs7aywrq1rd8xam5f3r02mynb09kn5hdnq"; }; } // (args.argsOverride or {})) diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.19.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.19.nix index e4b81530e9..342bb6990b 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.19.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.19.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "4.19.177"; + version = "4.19.179"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0z9m081jg84mzp639ifx3321bpysfs3rpcrsx9mwdsh19rwv63mc"; + sha256 = "14iy4i6xm2mva359dyrx6s1djpw7rxvnkydcbm6lnfvn7sik37a9"; }; } // (args.argsOverride or {})) diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.4.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.4.nix index f066bf3ad1..e96de093c0 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.4.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.4.nix @@ -1,11 +1,11 @@ { buildPackages, fetchurl, perl, buildLinux, ... } @ args: buildLinux (args // rec { - version = "4.4.258"; + version = "4.4.260"; extraMeta.branch = "4.4"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0rb6sww4yd2m4a4v12klx29nyxb66f55ziv8xcihgf2iw4d62h8c"; + sha256 = "1vl8zhlkhqbw2xqvkqhw1z75mrzk5lsdcj8bd2k2fw7cbwa00ln6"; }; } // (args.argsOverride or {})) diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.9.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.9.nix index bdd84a83f2..4136c4f634 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.9.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.9.nix @@ -1,11 +1,11 @@ { buildPackages, fetchurl, perl, buildLinux, ... } @ args: buildLinux (args // rec { - version = "4.9.258"; + version = "4.9.260"; extraMeta.branch = "4.9"; src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1kf8wlcf8gkpnglx1ggn1c3xfz4yx9995yb919mvin7nd7hghy6l"; + sha256 = "1xcgqvk1g3l9bidpx377rbbwzvyxb0sbkszlk722bj7vk6c4asmq"; }; } // (args.argsOverride or {})) diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.10.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.10.nix index 0ee5cad28f..bdecf6a9bb 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.10.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.10.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.10.18"; + version = "5.10.22"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "04dnkg5j73f6cd8ws1prrrjx37srz7rm66bj6slmnfzp3cmyxh9v"; + sha256 = "1pv3661d1gvkdl2jg6wx95lr5lcp6q77jrmx0m4a6z6n6asicnr4"; }; } // (args.argsOverride or {})) diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.11.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.11.nix index 6c595d75c8..1a7bbd1288 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.11.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.11.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.11.2"; + version = "5.11.5"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "186ha9fsk2qvrjkq7yvpmml938byz92m8ykcvbw4w9pmp8y5njlh"; + sha256 = "0srxpl44px1fr7y6nl8pq61vmbkkdbsmxy5k7wvqka33gdhy8212"; }; } // (args.argsOverride or {})) diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.4.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.4.nix index 31e84a37d5..16ac3baa65 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.4.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.4.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.4.100"; + version = "5.4.104"; # modDirVersion needs to be x.y.z, will automatically add .0 if needed modDirVersion = if (modDirVersionArg == null) then concatStringsSep "." (take 3 (splitVersion "${version}.0")) else modDirVersionArg; @@ -13,6 +13,6 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "02i47fmx2jbnjr3sd1bvldf9vc712528phpnybsbq8h8lqd6hpbr"; + sha256 = "1p8459plp3a6xw7cib34p7bddjs0dlv2m34dy4z6bbsvgfg51m74"; }; } // (args.argsOverride or {})) diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-libre.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-libre.nix index 25c8ee3a65..08898bb0a2 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-libre.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-libre.nix @@ -1,8 +1,8 @@ { stdenv, lib, fetchsvn, linux , scripts ? fetchsvn { url = "https://www.fsfla.org/svn/fsfla/software/linux-libre/releases/branches/"; - rev = "17873"; - sha256 = "1r1c8wagbq3cgxys7ylvsg6bnxiky66xgx9l0282zsmnn3gh83l7"; + rev = "17920"; + sha256 = "0qmhabh4922lpiimrh9smi1q0w8giw3qqxpyzzy2bmr2037011k0"; } , ... }: diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-rt-5.10.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-rt-5.10.nix index 4fb6c3e916..0f017bb4b2 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-rt-5.10.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-rt-5.10.nix @@ -6,7 +6,7 @@ , ... } @ args: let - version = "5.10.17-rt32"; # updated by ./update-rt.sh + version = "5.10.21-rt34"; # updated by ./update-rt.sh branch = lib.versions.majorMinor version; kversion = builtins.elemAt (lib.splitString "-" version) 0; in buildLinux (args // { @@ -18,14 +18,14 @@ in buildLinux (args // { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${kversion}.tar.xz"; - sha256 = "05289lr531piv1ncisbazfk0lj0q7gxflqkb0bn4c95vx0y64kp8"; + sha256 = "1bz2gmyvpl4vsk0r6fsnh451fzvvfbv63rw8ia75gfv52vzyczwy"; }; kernelPatches = let rt-patch = { name = "rt"; patch = fetchurl { url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz"; - sha256 = "1mffl1pvi7ijc3xws32bk8grs27ka2bd9bwl6h99vjn3dnkmkrfr"; + sha256 = "12c2qpifcgij7hilhd7xrnqaz04gqf41m93pmlm8cv4nxz58cy36"; }; }; in [ rt-patch ] ++ lib.remove rt-patch kernelPatches; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-rt-5.11.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-rt-5.11.nix index e56d2319a9..d9ebedf680 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-rt-5.11.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-rt-5.11.nix @@ -6,7 +6,7 @@ , ... } @ args: let - version = "5.11.2-rt9"; # updated by ./update-rt.sh + version = "5.11.4-rt11"; # updated by ./update-rt.sh branch = lib.versions.majorMinor version; kversion = builtins.elemAt (lib.splitString "-" version) 0; in buildLinux (args // { @@ -18,14 +18,14 @@ in buildLinux (args // { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${kversion}.tar.xz"; - sha256 = "186ha9fsk2qvrjkq7yvpmml938byz92m8ykcvbw4w9pmp8y5njlh"; + sha256 = "1i8dfw83ndaylwji7lazfckk113plvnz7kh1yppbfg35r6przrc8"; }; kernelPatches = let rt-patch = { name = "rt"; patch = fetchurl { url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz"; - sha256 = "0707rjai04x12llvs004800pkb0axf0d1sssahf3xhgrbalg94y1"; + sha256 = "1az6cn9jj3bnjgwzzrjy1adnrnn06p2vzsnc1iib4xhs0sfr27hc"; }; }; in [ rt-patch ] ++ lib.remove rt-patch kernelPatches; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-rt-5.4.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-rt-5.4.nix index 6fbfa23e73..6f9b1eaa31 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-rt-5.4.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-rt-5.4.nix @@ -6,7 +6,7 @@ , ... } @ args: let - version = "5.4.93-rt51"; # updated by ./update-rt.sh + version = "5.4.102-rt53"; # updated by ./update-rt.sh branch = lib.versions.majorMinor version; kversion = builtins.elemAt (lib.splitString "-" version) 0; in buildLinux (args // { @@ -14,14 +14,14 @@ in buildLinux (args // { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${kversion}.tar.xz"; - sha256 = "08nmwd13z10866pc16fqbj41krnvk6hxkl4nmhdkpk346r04jx6k"; + sha256 = "1vcscg7cn8qycay913nbc1xl1691anhvakkxwx54s0pnqghpqsgx"; }; kernelPatches = let rt-patch = { name = "rt"; patch = fetchurl { url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz"; - sha256 = "1ffipbnzv8rnmawjlglm667jq67asdr1mwrfhsmwkvlmivm9k4x1"; + sha256 = "0d1653cd5dcv4p13mxmva3jz5mp1phvmibfabhha0wsiqkabvx80"; }; }; in [ rt-patch ] ++ lib.remove rt-patch kernelPatches; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/rdma-core/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/rdma-core/default.nix index ad9deeb7a8..b76b13c8c0 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/rdma-core/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/rdma-core/default.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, cmake, pkg-config, docutils -, pandoc, ethtool, iproute, libnl, udev, python, perl +, pandoc, ethtool, iproute, libnl, udev, python3, perl , makeWrapper } : @@ -18,7 +18,7 @@ in stdenv.mkDerivation { }; nativeBuildInputs = [ cmake pkg-config pandoc docutils makeWrapper ]; - buildInputs = [ libnl ethtool iproute udev python perl ]; + buildInputs = [ libnl ethtool iproute udev python3 perl ]; cmakeFlags = [ "-DCMAKE_INSTALL_RUNDIR=/run" diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/uclibc/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/uclibc/default.nix index 7508e1faf1..8dc0d4613f 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/uclibc/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/uclibc/default.nix @@ -48,7 +48,7 @@ let UCLIBC_HAS_FPU n ''; - version = "1.0.34"; + version = "1.0.37"; in stdenv.mkDerivation { @@ -58,7 +58,7 @@ stdenv.mkDerivation { src = fetchurl { url = "https://downloads.uclibc-ng.org/releases/${version}/uClibc-ng-${version}.tar.bz2"; # from "${url}.sha256"; - sha256 = "025z0072inw1ibnrlwckslp9iayl9c35ysf0h7jjrxlzslzp4yjg"; + sha256 = "sha256-wThkkRBA42CskGC8kUlgmxk88Qy2Z8qRfLqD6kP8JY0="; }; # 'ftw' needed to build acl, a coreutils dependency diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/zfs/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/zfs/default.nix index c8ff738cd6..15c8df3cb1 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/zfs/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/zfs/default.nix @@ -200,9 +200,9 @@ in { kernelCompatible = kernel.kernelAtLeast "3.10" && kernel.kernelOlder "5.12"; # this package should point to the latest release. - version = "2.0.3"; + version = "2.0.4"; - sha256 = "sha256-bai7SwJNOsrACcrUxZ4339REhbBPOWyYikHzgHfbONs="; + sha256 = "sha256-ySTt0K3Lc0Le35XTwjiM5l+nIf9co7wBn+Oma1r8YHo="; }; zfsUnstable = common { @@ -210,9 +210,9 @@ in { kernelCompatible = kernel.kernelAtLeast "3.10" && kernel.kernelOlder "5.12"; # this package should point to a version / git revision compatible with the latest kernel release - version = "2.0.3"; + version = "2.0.4"; - sha256 = "sha256-bai7SwJNOsrACcrUxZ4339REhbBPOWyYikHzgHfbONs="; + sha256 = "sha256-ySTt0K3Lc0Le35XTwjiM5l+nIf9co7wBn+Oma1r8YHo="; isUnstable = true; }; diff --git a/third_party/nixpkgs/pkgs/os-specific/windows/mcfgthreads/default.nix b/third_party/nixpkgs/pkgs/os-specific/windows/mcfgthreads/default.nix index 6c4cd17102..122848a4e6 100644 --- a/third_party/nixpkgs/pkgs/os-specific/windows/mcfgthreads/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/windows/mcfgthreads/default.nix @@ -18,6 +18,10 @@ stdenv.mkDerivation { rm -r "$sourceRoot/debug" "$sourceRoot/release" ''; + postPatch = '' + substituteInPlace Makefile.am --replace '-Werror' "" + ''; + nativeBuildInputs = [ autoreconfHook ]; diff --git a/third_party/nixpkgs/pkgs/servers/apache-kafka/default.nix b/third_party/nixpkgs/pkgs/servers/apache-kafka/default.nix index 4bd50653d5..935db27044 100644 --- a/third_party/nixpkgs/pkgs/servers/apache-kafka/default.nix +++ b/third_party/nixpkgs/pkgs/servers/apache-kafka/default.nix @@ -1,21 +1,29 @@ -{ lib, stdenv, fetchurl, jre8, makeWrapper, bash, coreutils, gnugrep, gnused, ps, +{ lib, stdenv, fetchurl, jdk8_headless, jdk11_headless, makeWrapper, bash, coreutils, gnugrep, gnused, ps, majorVersion ? "1.0" }: let + jre8 = jdk8_headless; + jre11 = jdk11_headless; versionMap = { "2.4" = { kafkaVersion = "2.4.1"; scalaVersion = "2.12"; sha256 = "0ahsprmpjz026mhbr79187wfdrxcg352iipyfqfrx68q878wnxr1"; + jre = jre8; }; "2.5" = { - kafkaVersion = "2.5.0"; + kafkaVersion = "2.5.1"; + scalaVersion = "2.12"; + sha256 = "1wn4iszrm2rvsfyyr515zx79k5m86davjkcwcwpxcgc4k3q0z7lv"; + jre = jre8; + }; + "2.6" = { + kafkaVersion = "2.6.1"; scalaVersion = "2.13"; - sha256 = "0w3g7ii8x63m2blv2a8c491d0diczpliaqm9f7w5yn98hikh0aqi"; + sha256 = "1a2kd4r6f8z7qf886nnq9f350sblzzdi230j2hll7x156888573y"; + jre = jre11; }; }; - - jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 in with versionMap.${majorVersion}; @@ -63,5 +71,5 @@ stdenv.mkDerivation rec { maintainers = [ maintainers.ragge ]; platforms = platforms.unix; }; - + passthru = { inherit jre; }; } diff --git a/third_party/nixpkgs/pkgs/servers/computing/slurm/default.nix b/third_party/nixpkgs/pkgs/servers/computing/slurm/default.nix index d9b237a606..c28a6acf2b 100644 --- a/third_party/nixpkgs/pkgs/servers/computing/slurm/default.nix +++ b/third_party/nixpkgs/pkgs/servers/computing/slurm/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { pname = "slurm"; - version = "20.11.3.1"; + version = "20.11.4.1"; # N.B. We use github release tags instead of https://www.schedmd.com/downloads.php # because the latter does not keep older releases. @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { repo = "slurm"; # The release tags use - instead of . rev = "${pname}-${builtins.replaceStrings ["."] ["-"] version}"; - sha256 = "1601h7gid7fyvgmvrmz0h0xkxd7whp06rmj03822bv1szqr20xyy"; + sha256 = "sha256-rJCIV+dQaC6kCenp4fyPUYBztOlleZtNzCaaKkDHafg="; }; outputs = [ "out" "dev" ]; 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 899a0731c6..347dd2137c 100644 --- a/third_party/nixpkgs/pkgs/servers/home-assistant/component-packages.nix +++ b/third_party/nixpkgs/pkgs/servers/home-assistant/component-packages.nix @@ -2,7 +2,7 @@ # Do not edit! { - version = "2021.3.2"; + version = "2021.3.3"; components = { "abode" = ps: with ps; [ abodepy ]; "accuweather" = ps: with ps; [ accuweather ]; @@ -609,7 +609,7 @@ "otp" = ps: with ps; [ pyotp ]; "ovo_energy" = ps: with ps; [ ]; # missing inputs: ovoenergy "owntracks" = ps: with ps; [ pynacl aiohttp-cors hass-nabucasa paho-mqtt ]; - "ozw" = ps: with ps; [ aiohttp-cors homeassistant-pyozw paho-mqtt pydispatcher python-openzwave-mqtt ]; + "ozw" = ps: with ps; [ aiohttp-cors paho-mqtt python-openzwave-mqtt ]; "panasonic_bluray" = ps: with ps; [ ]; # missing inputs: panacotta "panasonic_viera" = ps: with ps; [ ]; # missing inputs: panasonic_viera "pandora" = ps: with ps; [ pexpect ]; diff --git a/third_party/nixpkgs/pkgs/servers/home-assistant/default.nix b/third_party/nixpkgs/pkgs/servers/home-assistant/default.nix index 329bbac4fb..34a8f7f6c0 100644 --- a/third_party/nixpkgs/pkgs/servers/home-assistant/default.nix +++ b/third_party/nixpkgs/pkgs/servers/home-assistant/default.nix @@ -66,7 +66,7 @@ let extraBuildInputs = extraPackages py.pkgs; # Don't forget to run parse-requirements.py after updating - hassVersion = "2021.3.2"; + hassVersion = "2021.3.3"; in with py.pkgs; buildPythonApplication rec { pname = "homeassistant"; @@ -85,7 +85,7 @@ in with py.pkgs; buildPythonApplication rec { owner = "home-assistant"; repo = "core"; rev = version; - sha256 = "09z2sds9my4vq0vmryjpzi7fv787zjfikfkd711d34c140bgcjch"; + sha256 = "0kfvjpzz6ynw8bwd91nm0aiw1pkrmaydwf1r93dnwi8rmzq10zpb"; }; # leave this in, so users don't have to constantly update their downstream patch handling diff --git a/third_party/nixpkgs/pkgs/servers/home-assistant/frontend.nix b/third_party/nixpkgs/pkgs/servers/home-assistant/frontend.nix index 6a4f4420ff..6db728e9c8 100644 --- a/third_party/nixpkgs/pkgs/servers/home-assistant/frontend.nix +++ b/third_party/nixpkgs/pkgs/servers/home-assistant/frontend.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { # the frontend version corresponding to a specific home-assistant version can be found here # https://github.com/home-assistant/home-assistant/blob/master/homeassistant/components/frontend/manifest.json pname = "home-assistant-frontend"; - version = "20210302.5"; + version = "20210302.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-+SKXLOuvMYfNyR++uQMMY4M5deRgm2w3AhMM/DP470k="; + sha256 = "sha256-h3jCqfAPg+z6vsdLm5Pdr+7PCEWW58GCG9viIz3Mi64="; }; # there is nothing to strip in this package diff --git a/third_party/nixpkgs/pkgs/servers/http/unit/default.nix b/third_party/nixpkgs/pkgs/servers/http/unit/default.nix index 8170ae79c3..e6863479f5 100644 --- a/third_party/nixpkgs/pkgs/servers/http/unit/default.nix +++ b/third_party/nixpkgs/pkgs/servers/http/unit/default.nix @@ -30,14 +30,14 @@ let php74-unit = php74.override phpConfig; in stdenv.mkDerivation rec { - version = "1.21.0"; + version = "1.22.0"; pname = "unit"; src = fetchFromGitHub { owner = "nginx"; repo = pname; rev = version; - sha256 = "1jczdxixxyj16w10pkcplchbqvx3m32nkmcl0hqap5ffqj08mmf7"; + sha256 = "sha256-M5Q8sxI1nZi8+ixO1PHuQpQ81EwyLAsnBI5PTtm+bKA="; }; nativeBuildInputs = [ which ]; diff --git a/third_party/nixpkgs/pkgs/servers/jackett/default.nix b/third_party/nixpkgs/pkgs/servers/jackett/default.nix index c95de149b5..c5d1f6c058 100644 --- a/third_party/nixpkgs/pkgs/servers/jackett/default.nix +++ b/third_party/nixpkgs/pkgs/servers/jackett/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "jackett"; - version = "0.17.617"; + version = "0.17.668"; src = fetchurl { url = "https://github.com/Jackett/Jackett/releases/download/v${version}/Jackett.Binaries.Mono.tar.gz"; - sha256 = "sha256-rNCtoiv48fzKH5CAzTZJjAjv6Z37BfVVNqsfpRVfY1M="; + sha256 = "sha256-+cvUpWVpXEkW+d92aIOli+pNi+ZDHEbxDDQ67O6kOVA="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/servers/klipper/default.nix b/third_party/nixpkgs/pkgs/servers/klipper/default.nix index 23b44be031..63ad531bbe 100644 --- a/third_party/nixpkgs/pkgs/servers/klipper/default.nix +++ b/third_party/nixpkgs/pkgs/servers/klipper/default.nix @@ -12,9 +12,15 @@ stdenv.mkDerivation rec { owner = "KevinOConnor"; repo = "klipper"; rev = "ef4d9c3abd30ae8a485020fd9ff2fb4529a143b3"; - sha256 = "puAkSGL0DD0JUWejPdzr7zKIW2UP2soBBtgm2msUKzA="; + sha256 = "sha256-puAkSGL0DD0JUWejPdzr7zKIW2UP2soBBtgm2msUKzA="; }; + # We have no LTO on i686 since commit 22284b0 + postPatch = lib.optional stdenv.isi686 '' + substituteInPlace chelper/__init__.py \ + --replace "-flto -fwhole-program " "" + ''; + sourceRoot = "source/klippy"; # there is currently an attempt at moving it to Python 3, but it will remain diff --git a/third_party/nixpkgs/pkgs/servers/matrix-synapse/default.nix b/third_party/nixpkgs/pkgs/servers/matrix-synapse/default.nix index 29f2bad76e..a9954b4a14 100644 --- a/third_party/nixpkgs/pkgs/servers/matrix-synapse/default.nix +++ b/third_party/nixpkgs/pkgs/servers/matrix-synapse/default.nix @@ -12,11 +12,11 @@ let in buildPythonApplication rec { pname = "matrix-synapse"; - version = "1.28.0"; + version = "1.29.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-KWEpgizOdil7dXIxug7xT3dEYEHi/IEPX/6aT7qW6C8="; + sha256 = "sha256-BySztUwVqyaL0AvmJMWEbjVqf981ABKMAU9f9C/0wkU="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/servers/mattermost/matterircd.nix b/third_party/nixpkgs/pkgs/servers/mattermost/matterircd.nix index fd950cb635..af2f9e6af1 100644 --- a/third_party/nixpkgs/pkgs/servers/mattermost/matterircd.nix +++ b/third_party/nixpkgs/pkgs/servers/mattermost/matterircd.nix @@ -2,13 +2,13 @@ buildGoPackage rec { pname = "matterircd"; - version = "0.22.0"; + version = "0.23.1"; src = fetchFromGitHub { owner = "42wim"; repo = "matterircd"; rev = "v${version}"; - sha256 = "sha256-0HeqKnFOrXcoXKEkWxNfoRv77As86aLUAgH/+ZUymAs="; + sha256 = "sha256-1oItl0mLyAFah9qaaYl+IAT/H4X+GW82GBHYuLWacVI="; }; goPackagePath = "github.com/42wim/matterircd"; diff --git a/third_party/nixpkgs/pkgs/servers/minio/default.nix b/third_party/nixpkgs/pkgs/servers/minio/default.nix index 044e9fa050..0758a863fc 100644 --- a/third_party/nixpkgs/pkgs/servers/minio/default.nix +++ b/third_party/nixpkgs/pkgs/servers/minio/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "minio"; - version = "2021-03-01T04-20-55Z"; + version = "2021-03-10T05-11-33Z"; src = fetchFromGitHub { owner = "minio"; repo = "minio"; rev = "RELEASE.${version}"; - sha256 = "sha256-VTmnpZzidongzv6BzPY01qggai0w+ztGL3grDv6VGD4="; + sha256 = "sha256-YwlVZE7TO9qr/8lwLXdZqjxy4NGxTkmLyKFDVlTZPqQ="; }; - vendorSha256 = "sha256-m2Nv3OcPq/qc+4Cu/JUut59fZTDZwJn9gyG4jQ5n6Pg="; + vendorSha256 = "sha256-E+j+ysBKKSyTITmJwHieBcpXdF3+rtt4YS7OVPMC6vI="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/grafana-image-renderer/default.nix b/third_party/nixpkgs/pkgs/servers/monitoring/grafana-image-renderer/default.nix index d2bf5040b0..8d4d37304f 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/grafana-image-renderer/default.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/grafana-image-renderer/default.nix @@ -9,14 +9,14 @@ # * Update `version`+`hash` and rebuild. mkYarnPackage rec { - name = "grafana-image-renderer-unstable"; - version = "2020-12-01"; + name = "grafana-image-renderer"; + version = "2.0.1"; src = fetchFromGitHub { owner = "grafana"; repo = "grafana-image-renderer"; - rev = "ce1f81438e5f69c7fd7c73ce08bab624c4c92e25"; - sha256 = "sha256-1Ke1KLLNZ1dkLH0BWB60r2c45RBbndd0eepjc0nlHVk="; + rev = "v${version}"; + sha256 = "sha256-3zvtlBjg+Yv5XDWdIN9HHLf+/Gv06ctbBaFhCgHeAMU="; }; buildPhase = '' diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/grafana-image-renderer/package.json b/third_party/nixpkgs/pkgs/servers/monitoring/grafana-image-renderer/package.json index b835205f82..6da9178aa8 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/grafana-image-renderer/package.json +++ b/third_party/nixpkgs/pkgs/servers/monitoring/grafana-image-renderer/package.json @@ -8,11 +8,11 @@ "url": "http://github.com/grafana/grafana-image-renderer.git" }, "scripts": { - "tslint": "tslint -c tslint.json --project tsconfig.json", + "eslint": "eslint -c eslint.json", "typecheck": "tsc --noEmit", "prettier:check": "prettier --list-different \"**/*.ts\"", "prettier:write": "prettier --list-different \"**/*.ts\" --write", - "precommit": "npm run tslint & npm run typecheck", + "precommit": "npm run eslint & npm run typecheck", "watch": "tsc-watch --onSuccess \"node build/app.js server --config=dev.json\"", "build": "tsc", "start": "node build/app.js --config=dev.json" @@ -21,6 +21,7 @@ "@grpc/grpc-js": "^1.0", "@grpc/proto-loader": "^0.5.4", "@hapi/boom": "^9.1.0", + "eslint": "^7.13.0", "express": "^4.16.3", "express-prom-bundle": "^5.1.5", "google-protobuf": "3.5.0", @@ -42,7 +43,6 @@ "pkg": "4.4.8", "prettier": "^1.19.1", "tsc-watch": "^4.2.3", - "tslint": "^6.1.1", "typescript": "^3.8.3" }, "husky": { diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/grafana-image-renderer/yarn.lock b/third_party/nixpkgs/pkgs/servers/monitoring/grafana-image-renderer/yarn.lock index eaf8c1abb4..ca08234354 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/grafana-image-renderer/yarn.lock +++ b/third_party/nixpkgs/pkgs/servers/monitoring/grafana-image-renderer/yarn.lock @@ -3,19 +3,24 @@ "@babel/code-frame@^7.0.0": - version "7.8.3" - resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.8.3.tgz#33e25903d7481181534e12ec0a25f16b6fcf419e" - integrity sha512-a9gxpmdXtZEInkCSHUJDLHZVBgb1QS0jhss4cPP93EW7s+uC5bikET2twEF3KV+7rDblJcmNvTR7VJejqd2C2g== + 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.8.3" + "@babel/highlight" "^7.10.4" -"@babel/highlight@^7.8.3": - version "7.8.3" - resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.8.3.tgz#28f173d04223eaaa59bc1d439a3836e6d1265797" - integrity sha512-PX4y5xQUvy0fnEVHrYOarRPXVWafSjTW9T0Hab8gVIawpl2Sj0ORyrygANq+KjcNlSSTw0YCLSNA8OyZ1I4yEg== +"@babel/helper-validator-identifier@^7.10.4": + version "7.12.11" + resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.12.11.tgz#c9a1f021917dcb5ccf0d4e453e399022981fc9ed" + integrity sha512-np/lG3uARFybkoHokJUmf1QfEvRVCPbmQeUQpKow5cQ3xWrV9i3rUHodKDJPQfTVX61qKi+UdYk8kik84n7XOw== + +"@babel/highlight@^7.10.4": + version "7.10.4" + resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.10.4.tgz#7d1bdfd65753538fabe6c38596cdb76d9ac60143" + integrity sha512-i6rgnR/YgPEQzZZnbTHHuZdlE8qyoBNalD6F+q4vAFlcMEcqmkoG+mPqJYJCo63qPf74+Y1UZsl3l6f7/RIkmA== dependencies: + "@babel/helper-validator-identifier" "^7.10.4" chalk "^2.0.0" - esutils "^2.0.2" js-tokens "^4.0.0" "@babel/parser@^7.9.4": @@ -30,6 +35,22 @@ dependencies: regenerator-runtime "^0.13.4" +"@eslint/eslintrc@^0.3.0": + version "0.3.0" + resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-0.3.0.tgz#d736d6963d7003b6514e6324bec9c602ac340318" + integrity sha512-1JTKgrOKAHVivSvOYw+sJOunkBjUOvjqWk1DPja7ZFhIS2mX/4EgTT8M7eTK9jrKhL/FvXXEbQwIs3pg1xp3dg== + dependencies: + ajv "^6.12.4" + debug "^4.1.1" + espree "^7.3.0" + globals "^12.1.0" + ignore "^4.0.6" + import-fresh "^3.2.1" + js-yaml "^3.13.1" + lodash "^4.17.20" + minimatch "^3.0.4" + strip-json-comments "^3.1.1" + "@grpc/grpc-js@^1.0": version "1.0.3" resolved "https://registry.yarnpkg.com/@grpc/grpc-js/-/grpc-js-1.0.3.tgz#7fa2ba293ccc1e91b24074c2628c8c68336e18c4" @@ -146,11 +167,6 @@ "@types/connect" "*" "@types/node" "*" -"@types/color-name@^1.1.1": - version "1.1.1" - resolved "https://registry.yarnpkg.com/@types/color-name/-/color-name-1.1.1.tgz#1c1261bbeaa10a8055bbc5d8ab84b7b2afc846a0" - integrity sha512-rr+OQyAjxze7GgWrSaJwydHStIhHq2lvY3BOC2Mj7KnzI7XK0Uw1TOOdI9lDoajEbSWLiYgoo4f1R51erQfhPQ== - "@types/connect@*": version "3.4.33" resolved "https://registry.yarnpkg.com/@types/connect/-/connect-3.4.33.tgz#31610c901eca573b8713c3330abc6e6b9f588546" @@ -240,6 +256,16 @@ accepts@~1.3.7: mime-types "~2.1.24" negotiator "0.6.2" +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@^7.4.0: + version "7.4.1" + resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.4.1.tgz#feaed255973d2e77555b83dbc08851a6c63520fa" + integrity sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A== + agent-base@^4.3.0: version "4.3.0" resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-4.3.0.tgz#8165f01c436009bccad0b1d122f05ed770efc6ee" @@ -255,6 +281,16 @@ aggregate-error@^3.0.0: clean-stack "^2.0.0" indent-string "^4.0.0" +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@^6.5.5: version "6.11.0" resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.11.0.tgz#c3607cbc8ae392d8a5a536f25b21f8e5f3f87fe9" @@ -265,6 +301,21 @@ ajv@^6.5.5: json-schema-traverse "^0.4.1" uri-js "^4.2.2" +ajv@^7.0.2: + version "7.0.3" + resolved "https://registry.yarnpkg.com/ajv/-/ajv-7.0.3.tgz#13ae747eff125cafb230ac504b2406cf371eece2" + integrity sha512-R50QRlXSxqXcQP5SvKUrw8VZeypvo12i2IX0EeR5PiZ7bEKeHWgzgo264LDadUsCU42lTJVhFikTqJwNeH34gQ== + 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@^3.0.0: version "3.2.0" resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-3.2.0.tgz#8780b98ff9dbf5638152d1f1fe5c1d7b4442976b" @@ -280,6 +331,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" @@ -292,12 +348,11 @@ ansi-styles@^3.2.1: dependencies: color-convert "^1.9.0" -ansi-styles@^4.1.0: - version "4.2.1" - resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.2.1.tgz#90ae75c424d008d2624c5bf29ead3177ebfcf359" - integrity sha512-9VGjrMsG1vePxcSweQsN20KY/c4zN0h9fLjqAbwbPfahM3t+NL+M9HC8xeXG2I8pX5NoamTGNuomEUFI7fcUjA== +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: - "@types/color-name" "^1.1.1" color-convert "^2.0.1" any-observable@^0.3.0: @@ -339,6 +394,11 @@ assert-plus@1.0.0, assert-plus@^1.0.0: resolved "https://registry.yarnpkg.com/assert-plus/-/assert-plus-1.0.0.tgz#f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525" integrity sha1-8S4PPF13sLHN2RRpQuTpbB5N1SU= +astral-regex@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/astral-regex/-/astral-regex-2.0.0.tgz#483143c567aeed4785759c0865786dc77d7d2e31" + integrity sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ== + async-limiter@~1.0.0: version "1.0.1" resolved "https://registry.yarnpkg.com/async-limiter/-/async-limiter-1.0.1.tgz#dd379e94f0db8310b08291f9d64c3209766617fd" @@ -426,11 +486,6 @@ 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== -builtin-modules@^1.1.1: - version "1.1.1" - resolved "https://registry.yarnpkg.com/builtin-modules/-/builtin-modules-1.1.1.tgz#270f076c5a72c02f5b65a47df94c5fe3a278892f" - integrity sha1-Jw8HbFpywC9bZaR9+Uxf46J4iS8= - byline@^5.0.0: version "5.0.0" resolved "https://registry.yarnpkg.com/byline/-/byline-5.0.0.tgz#741c5216468eadc457b03410118ad77de8c1ddb1" @@ -460,6 +515,11 @@ callsites@^2.0.0: resolved "https://registry.yarnpkg.com/callsites/-/callsites-2.0.0.tgz#06eb84f00eea413da86affefacbffb36093b3c50" integrity sha1-BuuE8A7qQT2oav/vrL/7Ngk7PFA= +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== + caseless@~0.12.0: version "0.12.0" resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc" @@ -476,7 +536,7 @@ chalk@^1.0.0, chalk@^1.1.3: strip-ansi "^3.0.0" supports-color "^2.0.0" -chalk@^2.0.0, chalk@^2.3.0, chalk@^2.4.1, chalk@^2.4.2: +chalk@^2.0.0, chalk@^2.4.1, chalk@^2.4.2: version "2.4.2" resolved "https://registry.yarnpkg.com/chalk/-/chalk-2.4.2.tgz#cd42541677a54333cf541a49108c1432b44c9424" integrity sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ== @@ -493,6 +553,14 @@ chalk@^3.0.0: ansi-styles "^4.1.0" supports-color "^7.1.0" +chalk@^4.0.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.0.tgz#4e14870a618d9e2edd97dd8345fd9d9dc315646a" + integrity sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A== + dependencies: + ansi-styles "^4.1.0" + supports-color "^7.1.0" + ci-info@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-2.0.0.tgz#67a9e964be31a51e15e5010d58e6f12834002f46" @@ -588,7 +656,7 @@ combined-stream@^1.0.6, combined-stream@~1.0.6: dependencies: delayed-stream "~1.0.0" -commander@^2.12.1, commander@^2.20.0: +commander@^2.20.0: version "2.20.3" resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33" integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ== @@ -674,6 +742,15 @@ cross-spawn@^7.0.0: shebang-command "^2.0.0" which "^2.0.1" +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" + dashdash@^1.12.0: version "1.14.1" resolved "https://registry.yarnpkg.com/dashdash/-/dashdash-1.14.1.tgz#853cfa0f7cbe2fed5de20326b8dd581035f6e2f0" @@ -700,7 +777,14 @@ debug@^3.1.0: dependencies: ms "^2.1.1" -debug@^4.1.0, debug@^4.1.1: +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" + +debug@^4.1.0: version "4.1.1" resolved "https://registry.yarnpkg.com/debug/-/debug-4.1.1.tgz#3b72260255109c6b589cee050f1d516139664791" integrity sha512-pYAIzeRo8J6KPEaJ0VWOh5Pzkbw/RetuzehGM7QRRX5he4fPHx2rdKMB256ehJCkX+XRQm16eZLqLNS8RSZXZw== @@ -712,7 +796,7 @@ dedent@^0.7.0: resolved "https://registry.yarnpkg.com/dedent/-/dedent-0.7.0.tgz#2495ddbaf6eb874abb0e1be9df22d2e5a544326c" integrity sha1-JJXduvbrh0q7Dhvp3yLS5aVEMmw= -deep-is@~0.1.3: +deep-is@^0.1.3, 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= @@ -755,11 +839,6 @@ diagnostics@^1.1.1: enabled "1.0.x" kuler "1.0.x" -diff@^4.0.1: - version "4.0.2" - resolved "https://registry.yarnpkg.com/diff/-/diff-4.0.2.tgz#60f3aecb89d5fae520c11aa19efc2bb982aade7d" - integrity sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A== - dir-glob@^3.0.1: version "3.0.1" resolved "https://registry.yarnpkg.com/dir-glob/-/dir-glob-3.0.1.tgz#56dbf73d992a4a93ba1584f4534063fd2e41717f" @@ -767,6 +846,13 @@ dir-glob@^3.0.1: dependencies: path-type "^4.0.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" + duplexer@~0.1.1: version "0.1.1" resolved "https://registry.yarnpkg.com/duplexer/-/duplexer-0.1.1.tgz#ace6ff808c1ce66b57d1ebf97977acb02334cfc1" @@ -790,6 +876,11 @@ elegant-spinner@^1.0.1: resolved "https://registry.yarnpkg.com/elegant-spinner/-/elegant-spinner-1.0.1.tgz#db043521c95d7e303fd8f345bedc3349cfb0729e" integrity sha1-2wQ1IcldfjA/2PNFvtwzSc+wcp4= +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== + enabled@1.0.x: version "1.0.2" resolved "https://registry.yarnpkg.com/enabled/-/enabled-1.0.2.tgz#965f6513d2c2d1c5f4652b64a2e3396467fc2f93" @@ -809,6 +900,13 @@ end-of-stream@^1.1.0: dependencies: once "^1.4.0" +enquirer@^2.3.5: + version "2.3.6" + resolved "https://registry.yarnpkg.com/enquirer/-/enquirer-2.3.6.tgz#2a7fe5dd634a1e4125a975ec994ff5456dc3734d" + integrity sha512-yjNnPr315/FjS4zIsUxYguYUPP2e1NK4d7E7ZOLiyYCcbFBiTMyID+2wvm2w6+pZ/odMA7cRkjhsPbltwBOrLg== + dependencies: + ansi-colors "^4.1.1" + env-variable@0.0.x: version "0.0.5" resolved "https://registry.yarnpkg.com/env-variable/-/env-variable-0.0.5.tgz#913dd830bef11e96a039c038d4130604eba37f88" @@ -855,16 +953,112 @@ escodegen@^1.14.1: optionalDependencies: source-map "~0.6.1" +eslint-scope@^5.1.1: + version "5.1.1" + resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-5.1.1.tgz#e786e59a66cb92b3f6c1fb0d508aab174848f48c" + integrity sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw== + dependencies: + esrecurse "^4.3.0" + estraverse "^4.1.1" + +eslint-utils@^2.1.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-2.1.0.tgz#d2de5e03424e707dc10c74068ddedae708741b27" + integrity sha512-w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg== + dependencies: + eslint-visitor-keys "^1.1.0" + +eslint-visitor-keys@^1.1.0, eslint-visitor-keys@^1.3.0: + version "1.3.0" + resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz#30ebd1ef7c2fdff01c3a4f151044af25fab0523e" + integrity sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ== + +eslint-visitor-keys@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-2.0.0.tgz#21fdc8fbcd9c795cc0321f0563702095751511a8" + integrity sha512-QudtT6av5WXels9WjIM7qz1XD1cWGvX4gGXvp/zBn9nXG02D0utdU3Em2m/QjTnrsk6bBjmCygl3rmj118msQQ== + +eslint@^7.13.0: + version "7.18.0" + resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.18.0.tgz#7fdcd2f3715a41fe6295a16234bd69aed2c75e67" + integrity sha512-fbgTiE8BfUJZuBeq2Yi7J3RB3WGUQ9PNuNbmgi6jt9Iv8qrkxfy19Ds3OpL1Pm7zg3BtTVhvcUZbIRQ0wmSjAQ== + dependencies: + "@babel/code-frame" "^7.0.0" + "@eslint/eslintrc" "^0.3.0" + ajv "^6.10.0" + chalk "^4.0.0" + cross-spawn "^7.0.2" + debug "^4.0.1" + doctrine "^3.0.0" + enquirer "^2.3.5" + eslint-scope "^5.1.1" + eslint-utils "^2.1.0" + eslint-visitor-keys "^2.0.0" + espree "^7.3.1" + esquery "^1.2.0" + esutils "^2.0.2" + file-entry-cache "^6.0.0" + functional-red-black-tree "^1.0.1" + glob-parent "^5.0.0" + globals "^12.1.0" + ignore "^4.0.6" + import-fresh "^3.0.0" + imurmurhash "^0.1.4" + is-glob "^4.0.0" + js-yaml "^3.13.1" + json-stable-stringify-without-jsonify "^1.0.1" + levn "^0.4.1" + lodash "^4.17.20" + minimatch "^3.0.4" + natural-compare "^1.4.0" + optionator "^0.9.1" + progress "^2.0.0" + regexpp "^3.1.0" + semver "^7.2.1" + strip-ansi "^6.0.0" + strip-json-comments "^3.1.0" + table "^6.0.4" + text-table "^0.2.0" + v8-compile-cache "^2.0.3" + +espree@^7.3.0, espree@^7.3.1: + version "7.3.1" + resolved "https://registry.yarnpkg.com/espree/-/espree-7.3.1.tgz#f2df330b752c6f55019f8bd89b7660039c1bbbb6" + integrity sha512-v3JCNCE64umkFpmkFGqzVKsOT0tN1Zr+ueqLZfpV1Ob8e+CEgPWa+OxCoGH3tnhimMKIaBm4m/vaRpJ/krRz2g== + dependencies: + acorn "^7.4.0" + acorn-jsx "^5.3.1" + eslint-visitor-keys "^1.3.0" + esprima@^4.0.0, esprima@^4.0.1: version "4.0.1" resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71" integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A== -estraverse@^4.2.0: +esquery@^1.2.0: + version "1.3.1" + resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.3.1.tgz#b78b5828aa8e214e29fb74c4d5b752e1c033da57" + integrity sha512-olpvt9QG0vniUBZspVRN6lwB7hOZoTRtT+jzR+tS4ffYx2mzbw+z0XCOk44aaLYKApNX5nMm+E+P6o25ip/DHQ== + 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, estraverse@^4.2.0: 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" @@ -991,9 +1185,9 @@ extsprintf@^1.2.0: integrity sha1-4mifjzVvrWLMplo6kcXfX5VRaS8= fast-deep-equal@^3.1.1: - version "3.1.1" - resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.1.tgz#545145077c501491e33b15ec408c294376e94ae4" - integrity sha512-8UEa58QDLauDNfpbrX55Q9jrGHThw2ZMdOky5Gl1CDtVeJDPVrG4Jxx1N8jw2gkWaff5UUuX1KJd+9zGe2B+ZA== + version "3.1.3" + resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525" + integrity sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q== fast-glob@^3.0.3: version "3.1.1" @@ -1023,7 +1217,7 @@ fast-json-stable-stringify@^2.0.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: +fast-levenshtein@^2.0.6, fast-levenshtein@~2.0.6: version "2.0.6" resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917" integrity sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc= @@ -1067,6 +1261,13 @@ figures@^2.0.0: dependencies: escape-string-regexp "^1.0.5" +file-entry-cache@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-6.0.0.tgz#7921a89c391c6d93efec2169ac6bf300c527ea0a" + integrity sha512-fqoO76jZ3ZnYrXLDRxBR1YvOvc0k844kcOg40bgsPrE25LAb/PDqTY+ho64Xh2c8ZXgIKldchCFHczG2UVRcWA== + dependencies: + flat-cache "^3.0.4" + fill-range@^7.0.1: version "7.0.1" resolved "https://registry.yarnpkg.com/fill-range/-/fill-range-7.0.1.tgz#1919a6a7c75fe38b2c7c77e5198535da9acdda40" @@ -1095,6 +1296,19 @@ find-up@^4.0.0: locate-path "^5.0.0" path-exists "^4.0.0" +flat-cache@^3.0.4: + version "3.0.4" + resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-3.0.4.tgz#61b0338302b2fe9f957dcc32fc2a87f1c3048b11" + integrity sha512-dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg== + dependencies: + flatted "^3.1.0" + rimraf "^3.0.2" + +flatted@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.1.0.tgz#a5d06b4a8b01e3a63771daa5cb7a1903e2e57067" + integrity sha512-tW+UkmtNg/jv9CSofAKvgVcO7c2URjhTdW1ZTkcAritblu8tajiYy7YisnIflEwtKssCtOxpnBRoCB7iap0/TA== + forever-agent@~0.6.1: version "0.6.1" resolved "https://registry.yarnpkg.com/forever-agent/-/forever-agent-0.6.1.tgz#fbc71f0c41adeb37f96c577ad1ed42d8fdacca91" @@ -1146,6 +1360,11 @@ fs.realpath@^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= + get-own-enumerable-property-symbols@^3.0.0: version "3.0.2" resolved "https://registry.yarnpkg.com/get-own-enumerable-property-symbols/-/get-own-enumerable-property-symbols-3.0.2.tgz#b5fde77f22cbe35f390b4e089922c50bce6ef664" @@ -1177,6 +1396,13 @@ getpass@^0.1.1: dependencies: assert-plus "^1.0.0" +glob-parent@^5.0.0: + version "5.1.1" + resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.1.tgz#b6c1ef417c4e5663ea498f1c45afac6916bbc229" + integrity sha512-FnI+VGOpnlGHWZxthPGR+QhR78fuiK0sNLkHQv+bL9fQi57lNNdquIbna/WrfROrolq8GK5Ek6BiMwqL/voRYQ== + dependencies: + is-glob "^4.0.1" + glob-parent@^5.1.0: version "5.1.0" resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.0.tgz#5f4c1d1e748d30cd73ad2944b3577a81b081e8c2" @@ -1184,7 +1410,7 @@ glob-parent@^5.1.0: dependencies: is-glob "^4.0.1" -glob@^7.1.1, glob@^7.1.3: +glob@^7.1.3: version "7.1.6" resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.6.tgz#141f33b81a7c2492e125594307480c46679278a6" integrity sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA== @@ -1196,6 +1422,13 @@ glob@^7.1.1, glob@^7.1.3: once "^1.3.0" path-is-absolute "^1.0.0" +globals@^12.1.0: + version "12.4.0" + resolved "https://registry.yarnpkg.com/globals/-/globals-12.4.0.tgz#a18813576a41b00a24a97e7f815918c2e19925f8" + integrity sha512-BWICuzzDvDoH54NHKCseDanAhE3CeDorgDL5MT6LMXXj2WCnd9UC2szdk4AWLfjdgNBCXLUanXYcpBBKOSWGwg== + dependencies: + type-fest "^0.8.1" + globby@^10.0.1: version "10.0.2" resolved "https://registry.yarnpkg.com/globby/-/globby-10.0.2.tgz#277593e745acaa4646c3ab411289ec47a0392543" @@ -1335,6 +1568,11 @@ iconv-lite@0.4.24: dependencies: safer-buffer ">= 2.1.2 < 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== + ignore@^5.1.1, ignore@^5.1.4: version "5.1.4" resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.1.4.tgz#84b7b3dbe64552b6ef0eca99f6743dbec6d97adf" @@ -1348,6 +1586,14 @@ import-fresh@^2.0.0: caller-path "^2.0.0" resolve-from "^3.0.0" +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" @@ -1426,7 +1672,12 @@ 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-glob@^4.0.1: +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== @@ -1506,9 +1757,9 @@ js-tokens@^4.0.0: integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ== js-yaml@^3.13.1: - version "3.13.1" - resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.13.1.tgz#aff151b30bfdfa8e49e05da22e7415e9dfa37847" - integrity sha512-YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw== + 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" @@ -1528,11 +1779,21 @@ json-schema-traverse@^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-schema@0.2.3: version "0.2.3" resolved "https://registry.yarnpkg.com/json-schema/-/json-schema-0.2.3.tgz#b480c892e59a2f05954ce727bd3f2a4e882f9e13" integrity sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM= +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= + json-stringify-safe@~5.0.1: version "5.0.1" resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb" @@ -1562,6 +1823,14 @@ kuler@1.0.x: dependencies: colornames "^1.1.1" +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" + levn@~0.3.0: version "0.3.0" resolved "https://registry.yarnpkg.com/levn/-/levn-0.3.0.tgz#3b09924edf9f083c0490fdd4c0bc4421e04764ee" @@ -1651,7 +1920,12 @@ lodash.camelcase@^4.3.0: resolved "https://registry.yarnpkg.com/lodash.camelcase/-/lodash.camelcase-4.3.0.tgz#b28aa6288a2b9fc651035c7711f65ab6190331a6" integrity sha1-soqmKIorn8ZRA1x3EfZathkDMaY= -lodash@^4.17.14, lodash@^4.17.19: +lodash@^4.17.14, lodash@^4.17.20: + version "4.17.20" + resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.20.tgz#b44a9b6297bcb698f1c51a3545a2b3b368d59c52" + integrity sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA== + +lodash@^4.17.19: version "4.17.19" resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.19.tgz#e48ddedbe30b3321783c5b4301fbd353bc1e4a4b" integrity sha512-JNvd8XER9GQX0v2qJgsaN/mzFCNA5BRe/j8JN9d+tWyGLSodKQHKFicdwNYzWwI3wjRnaKPsGj1XkBjx/F96DQ== @@ -1703,6 +1977,13 @@ lru-cache@^4.0.1: pseudomap "^1.0.2" yallist "^2.1.2" +lru-cache@^6.0.0: + version "6.0.0" + resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-6.0.0.tgz#6d6fe6570ebd96aaf90fcad1dafa3b2566db3a94" + integrity sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA== + dependencies: + yallist "^4.0.0" + map-stream@~0.1.0: version "0.1.0" resolved "https://registry.yarnpkg.com/map-stream/-/map-stream-0.1.0.tgz#e56aa94c4c8055a16404a0674b78f215f7c8e194" @@ -1790,14 +2071,14 @@ minimist@^1.2.0, minimist@^1.2.5: resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602" integrity sha512-FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw== -mkdirp@0.5.1, mkdirp@^0.5.1: +mkdirp@0.5.1: version "0.5.1" resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.1.tgz#30057438eac6cf7f8c4767f38648d6697d75c903" integrity sha1-MAV0OOrGz3+MR2fzhkjWaX11yQM= dependencies: minimist "0.0.8" -mkdirp@^0.5.3: +mkdirp@^0.5.1: version "0.5.5" resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.5.tgz#d91cefd62d1436ca0f41620e251288d420099def" integrity sha512-NKmAlESf6jMGym1++R0Ra7wvhV+wFW63FaSOFPwRahvea0gMUcGUhVeAg/0BC0wiv9ih5NYPB1Wn1UEI1/L+xQ== @@ -1825,11 +2106,16 @@ ms@2.1.1: resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.1.tgz#30a5864eb3ebb0a66f2ebe6d727af06a09d86e0a" integrity sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg== -ms@^2.1.1: +ms@2.1.2: version "2.1.2" resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.2.tgz#d09d1f357b443f493382a8eb3ccd183872ae6009" integrity sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w== +ms@^2.1.1: + version "2.1.3" + resolved "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz#574c8138ce1d2b5861f0b44579dbadd60c6615b2" + integrity sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA== + multistream@^2.1.1: version "2.1.1" resolved "https://registry.yarnpkg.com/multistream/-/multistream-2.1.1.tgz#629d3a29bd76623489980d04519a2c365948148c" @@ -1847,6 +2133,11 @@ mz@^2.7.0: object-assign "^4.0.1" thenify-all "^1.0.0" +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= + negotiator@0.6.2: version "0.6.2" resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.2.tgz#feacf7ccf525a77ae9634436a64883ffeca346fb" @@ -1961,6 +2252,18 @@ optionator@^0.8.1: type-check "~0.3.2" word-wrap "~1.2.3" +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" + os-tmpdir@^1.0.1: version "1.0.2" resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274" @@ -2012,6 +2315,13 @@ p-try@^2.0.0: resolved "https://registry.yarnpkg.com/p-try/-/p-try-2.2.0.tgz#cb2868540e313d61de58fafbe35ce9004d5540e6" integrity sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ== +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" + parse-json@^4.0.0: version "4.0.0" resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-4.0.0.tgz#be35f5425be1f7f6c747184f98a788cb99477ee0" @@ -2147,6 +2457,11 @@ please-upgrade-node@^3.1.1, please-upgrade-node@^3.2.0: dependencies: semver-compare "^1.0.0" +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== + prelude-ls@~1.1.2: version "1.1.2" resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.1.2.tgz#21932a549f5e52ffd9a827f570e04be62a97da54" @@ -2162,7 +2477,7 @@ 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.1, progress@^2.0.3: +progress@^2.0.0, progress@^2.0.1, progress@^2.0.3: version "2.0.3" resolved "https://registry.yarnpkg.com/progress/-/progress-2.0.3.tgz#7e8cf8d8f5b8f239c1bc68beb4eb78567d572ef8" integrity sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA== @@ -2319,6 +2634,11 @@ regenerator-runtime@^0.13.4: resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.5.tgz#d878a1d094b4306d10b9096484b33ebd55e26697" integrity sha512-ZS5w8CpKFinUzOwW3c83oPeVXoNsrLsaCoLtJvAClH135j/R77RuymhiSErhm2lKcwSCIpmvIWSbDkIfAqKQlA== +regexpp@^3.1.0: + version "3.1.0" + resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-3.1.0.tgz#206d0ad0a5648cffbdb8ae46438f3dc51c9f78e2" + integrity sha512-ZOIzd8yVsQQA7j8GCSlPGXwg5PfmA1mrq0JP4nGhh54LaKN3xdai/vHUDu74pKwV8OxseMS65u2NImosQcSD0Q== + request-progress@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/request-progress/-/request-progress-3.0.0.tgz#4ca754081c7fec63f505e4faa825aa06cd669dbe" @@ -2352,12 +2672,22 @@ request@^2.88.0: tunnel-agent "^0.6.0" uuid "^3.3.2" +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@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-3.0.0.tgz#b22c7af7d9d6881bc8b6e653335eebcb0a188748" integrity sha1-six699nWiBvItuZTM17rywoYh0g= -resolve@^1.10.0, resolve@^1.3.2: +resolve-from@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/resolve-from/-/resolve-from-4.0.0.tgz#4abcd852ad32dd7baabfe9b40e00a36db5f392e6" + integrity sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g== + +resolve@^1.10.0: version "1.14.2" resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.14.2.tgz#dbf31d0fa98b1f29aa5169783b9c290cb865fea2" integrity sha512-EjlOBLBO1kxsUxsKjLt7TAECyKW6fOh1VRkykQkKGzcBbjjPIxBqGh0jf7GJ3k/f5mxMqW3htMD3WdTUVtW8HQ== @@ -2398,6 +2728,13 @@ rimraf@^3.0.0: dependencies: glob "^7.1.3" +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-node@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/run-node/-/run-node-1.0.0.tgz#46b50b946a2aa2d4947ae1d886e9856fd9cabe5e" @@ -2435,7 +2772,7 @@ semver-compare@^1.0.0: resolved "https://registry.yarnpkg.com/semver-compare/-/semver-compare-1.0.0.tgz#0dee216a1c941ab37e9efb1788f6afc5ff5537fc" integrity sha1-De4hahyUGrN+nvsXiPavxf9VN/w= -"semver@2 || 3 || 4 || 5", semver@^5.3.0, semver@^5.5.0: +"semver@2 || 3 || 4 || 5", semver@^5.5.0: version "5.7.1" resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7" integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ== @@ -2445,6 +2782,13 @@ semver@^6.2.0, semver@^6.3.0: resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.0.tgz#ee0a64c8af5e8ceea67687b133761e1becbd1d3d" integrity sha512-b39TBaTSfV6yBrapU89p5fKekE2m/NwnDocOVruQFS1/veMgdzuPcnOM34M6CwxW8jH/lxEa5rBoDeUwu5HHTw== +semver@^7.2.1: + version "7.3.4" + resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.4.tgz#27aaa7d2e4ca76452f98d3add093a72c943edc97" + integrity sha512-tCfb2WLjqFAtXn4KEdxIhalnRtoKFN7nAwj0B3ZXCbQloV2tq5eDbcTmT68JJD3nRJq24/XgxtQKFIpQdtvmVw== + dependencies: + lru-cache "^6.0.0" + send@0.17.1: version "0.17.1" resolved "https://registry.yarnpkg.com/send/-/send-0.17.1.tgz#c1d8b059f7900f7466dd4938bdc44e11ddb376c8" @@ -2525,6 +2869,15 @@ slice-ansi@0.0.4: resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-0.0.4.tgz#edbf8903f66f7ce2f8eafd6ceed65e264c831b35" integrity sha1-7b+JA/ZvfOL46v1s7tZeJkyDGzU= +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@~0.6.1: version "0.6.1" resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.6.1.tgz#74722af32e9614e9c287a8d0bbde48b5e2f1a263" @@ -2634,6 +2987,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.0" + resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.0.tgz#952182c46cc7b2c313d1596e623992bd163b72b5" + integrity sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg== + 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.3.0" resolved "https://registry.yarnpkg.com/string_decoder/-/string_decoder-1.3.0.tgz#42f114594a46cf1a8e30b0a84f56c78c3edac21e" @@ -2671,6 +3033,13 @@ 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-eof@^1.0.0: version "1.0.0" resolved "https://registry.yarnpkg.com/strip-eof/-/strip-eof-1.0.0.tgz#bb43ff5598a6eb05d89b59fcd129c983313606bf" @@ -2681,6 +3050,11 @@ strip-final-newline@^2.0.0: resolved "https://registry.yarnpkg.com/strip-final-newline/-/strip-final-newline-2.0.0.tgz#89b852fb2fcbe936f6f4b3187afb0a12c1ab58ad" integrity sha512-BrpvfNAE3dcvq7ll3xVumzjKjZQ5tI1sEUIKr3Uoks0XUl45St3FlatVqef9prk4jRDzhW6WZg+3bk93y6pLjA== +strip-json-comments@^3.1.0, strip-json-comments@^3.1.1: + version "3.1.1" + resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.1.1.tgz#31f1281b3832630434831c310c01cccda8cbe006" + integrity sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig== + supports-color@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-2.0.0.tgz#535d045ce6b6363fa40117084629995e9df324c7" @@ -2694,9 +3068,9 @@ supports-color@^5.3.0: has-flag "^3.0.0" supports-color@^7.1.0: - version "7.1.0" - resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-7.1.0.tgz#68e32591df73e25ad1c4b49108a2ec507962bfd1" - integrity sha512-oRSIpR8pxT1Wr2FquTNnGet79b3BWljqOuoW/h4oBhxJ/HUbX5nX6JSruTkvXDCFMwDPvsaTTbvMLKZWSy0R5g== + 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" @@ -2705,6 +3079,16 @@ symbol-observable@^1.1.0: resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-1.2.0.tgz#c22688aed4eab3cdc2dfeacbb561660560a00804" integrity sha512-e900nM8RRtGhlV36KGEU9k65K3mPb1WV70OdjfxlG2EAuM1noi/E/BaW/uMhL7bPEssK8QV57vN3esixjUvcXQ== +table@^6.0.4: + version "6.0.7" + resolved "https://registry.yarnpkg.com/table/-/table-6.0.7.tgz#e45897ffbcc1bcf9e8a87bf420f2c9e5a7a52a34" + integrity sha512-rxZevLGTUzWna/qBLObOe16kB2RTnnbhciwgPbMMlazz1yZGVEgnZK762xyVdVznhqxrfCeBMmMkgOOaPwjH7g== + dependencies: + ajv "^7.0.2" + lodash "^4.17.20" + slice-ansi "^4.0.0" + string-width "^4.2.0" + tdigest@^0.1.1: version "0.1.1" resolved "https://registry.yarnpkg.com/tdigest/-/tdigest-0.1.1.tgz#2e3cb2c39ea449e55d1e6cd91117accca4588021" @@ -2717,6 +3101,11 @@ text-hex@1.0.x: resolved "https://registry.yarnpkg.com/text-hex/-/text-hex-1.0.0.tgz#69dc9c1b17446ee79a92bf5b884bb4b9127506f5" integrity sha512-uuVGNWzgJ4yhRaNSiubPY7OjISw4sw4E5Uv0wbjp+OzcbmVU/rsT8ujgcXJhn9ypzsgr5vlzpPqP+MBBKcGvbg== +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= + thenify-all@^1.0.0: version "1.6.0" resolved "https://registry.yarnpkg.com/thenify-all/-/thenify-all-1.6.0.tgz#1a1918d402d8fc3f98fbf234db0bcc8cc10e9726" @@ -2777,42 +3166,11 @@ tsc-watch@^4.2.3: string-argv "^0.1.1" strip-ansi "^4.0.0" -tslib@^1.10.0: - version "1.11.1" - resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.11.1.tgz#eb15d128827fbee2841549e171f45ed338ac7e35" - integrity sha512-aZW88SY8kQbU7gpV19lN24LtXh/yD4ZZg6qieAJDDg+YBsJcSmLGK9QpnUjAKVG/xefmvJGd1WUmfpT/g6AJGA== - -tslib@^1.8.1, tslib@^1.9.0: +tslib@^1.9.0: version "1.10.0" resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.10.0.tgz#c3c19f95973fb0a62973fb09d90d961ee43e5c8a" integrity sha512-qOebF53frne81cf0S9B41ByenJ3/IuH8yJKngAX35CmiZySA0khhkovshKK+jGCaMnVomla7gVlIcc3EvKPbTQ== -tslint@^6.1.1: - version "6.1.1" - resolved "https://registry.yarnpkg.com/tslint/-/tslint-6.1.1.tgz#ac03fbd17f85bfefaae348b353b25a88efe10cde" - integrity sha512-kd6AQ/IgPRpLn6g5TozqzPdGNZ0q0jtXW4//hRcj10qLYBaa3mTUU2y2MCG+RXZm8Zx+KZi0eA+YCrMyNlF4UA== - dependencies: - "@babel/code-frame" "^7.0.0" - builtin-modules "^1.1.1" - chalk "^2.3.0" - commander "^2.12.1" - diff "^4.0.1" - glob "^7.1.1" - js-yaml "^3.13.1" - minimatch "^3.0.4" - mkdirp "^0.5.3" - resolve "^1.3.2" - semver "^5.3.0" - tslib "^1.10.0" - tsutils "^2.29.0" - -tsutils@^2.29.0: - version "2.29.0" - resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-2.29.0.tgz#32b488501467acbedd4b85498673a0812aca0b99" - integrity sha512-g5JVHCIJwzfISaXpXE1qvNalca5Jwob6FjI4AoPlqMusJ6ftFE7IkkFoMhVLRgK+4Kx3gkzb8UZK5t5yTTvEmA== - dependencies: - tslib "^1.8.1" - tunnel-agent@^0.6.0: version "0.6.0" resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.6.0.tgz#27a5dea06b36b04a0a9966774b290868f0fc40fd" @@ -2825,6 +3183,13 @@ tweetnacl@^0.14.3, tweetnacl@~0.14.0: resolved "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-0.14.5.tgz#5ae68177f192d4456269d108afa93ff8743f4f64" integrity sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q= +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-check@~0.3.2: version "0.3.2" resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.3.2.tgz#5884cab512cf1d355e3fb784f30804b2b520db72" @@ -2837,6 +3202,11 @@ type-fest@^0.6.0: resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.6.0.tgz#8d2a2370d3df886eb5c90ada1c5bf6188acf838b" integrity sha512-q+MB8nYR1KDLrgr4G5yemftpMC7/QLqVndBmEEdqzmNj5dcFOO4Oo8qlwZE3ULT3+Zim1F8Kq4cBnikNhlCMlg== +type-fest@^0.8.1: + version "0.8.1" + resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.8.1.tgz#09e249ebde851d3b1e48d27c105444667f17b83d" + integrity sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA== + type-is@~1.6.17, type-is@~1.6.18: version "1.6.18" resolved "https://registry.yarnpkg.com/type-is/-/type-is-1.6.18.tgz#4e552cd05df09467dcbc4ef739de89f2cf37c131" @@ -2894,9 +3264,9 @@ unpipe@1.0.0, unpipe@~1.0.0: integrity sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw= uri-js@^4.2.2: - version "4.2.2" - resolved "https://registry.yarnpkg.com/uri-js/-/uri-js-4.2.2.tgz#94c540e1ff772956e2299507c010aea6c8838eb0" - integrity sha512-KY9Frmirql91X2Qgjry0Wd4Y+YTdrdZheS8TFwvkbLWf/G5KNJDCh6pKL5OZctEW4+0Baa5idK2ZQuELRwPznQ== + 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" @@ -2920,6 +3290,11 @@ uuid@^3.3.2: resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.4.0.tgz#b23e4358afa8a202fe7a100af1f5f883f02007ee" integrity sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A== +v8-compile-cache@^2.0.3: + version "2.2.0" + resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.2.0.tgz#9471efa3ef9128d2f7c6a7ca39c4dd6b5055b132" + integrity sha512-gTpR5XQNKFwOd4clxfnhaqvfqMpqEwr4tOtCyz4MtYZX2JYhfr1JvBFKdS+7K/9rfpZR3VLX+YWBbKoxCgS43Q== + validate-npm-package-license@^3.0.1: version "3.0.4" resolved "https://registry.yarnpkg.com/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz#fc91f6b9c7ba15c857f4cb2c5defeec39d4f410a" @@ -2979,7 +3354,7 @@ winston@^3.2.1: triple-beam "^1.3.0" winston-transport "^4.3.0" -word-wrap@~1.2.3: +word-wrap@^1.2.3, 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== @@ -3009,6 +3384,11 @@ yallist@^2.1.2: resolved "https://registry.yarnpkg.com/yallist/-/yallist-2.1.2.tgz#1c11f9218f076089a47dd512f93c6699a6a81d52" integrity sha1-HBH5IY8HYImkfdUS+TxmmaaoHVI= +yallist@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72" + integrity sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A== + yauzl@2.4.1: version "2.4.1" resolved "https://registry.yarnpkg.com/yauzl/-/yauzl-2.4.1.tgz#9528f442dab1b2284e58b4379bb194e22e0c4005" diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/grafana-image-renderer/yarn.nix b/third_party/nixpkgs/pkgs/servers/monitoring/grafana-image-renderer/yarn.nix index 3d11945721..8b4c1ec31e 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/grafana-image-renderer/yarn.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/grafana-image-renderer/yarn.nix @@ -2,19 +2,27 @@ offline_cache = linkFarm "offline" packages; packages = [ { - name = "_babel_code_frame___code_frame_7.8.3.tgz"; + name = "_babel_code_frame___code_frame_7.12.11.tgz"; path = fetchurl { - name = "_babel_code_frame___code_frame_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.8.3.tgz"; - sha1 = "33e25903d7481181534e12ec0a25f16b6fcf419e"; + 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_highlight___highlight_7.8.3.tgz"; + name = "_babel_helper_validator_identifier___helper_validator_identifier_7.12.11.tgz"; path = fetchurl { - name = "_babel_highlight___highlight_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.8.3.tgz"; - sha1 = "28f173d04223eaaa59bc1d439a3836e6d1265797"; + name = "_babel_helper_validator_identifier___helper_validator_identifier_7.12.11.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.12.11.tgz"; + sha1 = "c9a1f021917dcb5ccf0d4e453e399022981fc9ed"; + }; + } + { + name = "_babel_highlight___highlight_7.10.4.tgz"; + path = fetchurl { + name = "_babel_highlight___highlight_7.10.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.10.4.tgz"; + sha1 = "7d1bdfd65753538fabe6c38596cdb76d9ac60143"; }; } { @@ -33,6 +41,14 @@ sha1 = "a9102eb5cadedf3f31d08a9ecf294af7827ea29f"; }; } + { + name = "_eslint_eslintrc___eslintrc_0.3.0.tgz"; + path = fetchurl { + name = "_eslint_eslintrc___eslintrc_0.3.0.tgz"; + url = "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-0.3.0.tgz"; + sha1 = "d736d6963d7003b6514e6324bec9c602ac340318"; + }; + } { name = "_grpc_grpc_js___grpc_js_1.0.3.tgz"; path = fetchurl { @@ -185,14 +201,6 @@ sha1 = "18fcf61768fb5c30ccc508c21d6fd2e8b3bf7897"; }; } - { - name = "_types_color_name___color_name_1.1.1.tgz"; - path = fetchurl { - name = "_types_color_name___color_name_1.1.1.tgz"; - url = "https://registry.yarnpkg.com/@types/color-name/-/color-name-1.1.1.tgz"; - sha1 = "1c1261bbeaa10a8055bbc5d8ab84b7b2afc846a0"; - }; - } { name = "_types_connect___connect_3.4.33.tgz"; path = fetchurl { @@ -305,6 +313,22 @@ sha1 = "531bc726517a3b2b41f850021c6cc15eaab507cd"; }; } + { + 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_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 = "agent_base___agent_base_4.3.0.tgz"; path = fetchurl { @@ -321,6 +345,14 @@ sha1 = "db2fe7246e536f40d9b5442a39e117d7dd6a24e0"; }; } + { + 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_6.11.0.tgz"; path = fetchurl { @@ -329,6 +361,22 @@ sha1 = "c3607cbc8ae392d8a5a536f25b21f8e5f3f87fe9"; }; } + { + name = "ajv___ajv_7.0.3.tgz"; + path = fetchurl { + name = "ajv___ajv_7.0.3.tgz"; + url = "https://registry.yarnpkg.com/ajv/-/ajv-7.0.3.tgz"; + sha1 = "13ae747eff125cafb230ac504b2406cf371eece2"; + }; + } + { + 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_3.2.0.tgz"; path = fetchurl { @@ -353,6 +401,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 { @@ -370,11 +426,11 @@ }; } { - name = "ansi_styles___ansi_styles_4.2.1.tgz"; + name = "ansi_styles___ansi_styles_4.3.0.tgz"; path = fetchurl { - name = "ansi_styles___ansi_styles_4.2.1.tgz"; - url = "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.2.1.tgz"; - sha1 = "90ae75c424d008d2624c5bf29ead3177ebfcf359"; + name = "ansi_styles___ansi_styles_4.3.0.tgz"; + url = "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-4.3.0.tgz"; + sha1 = "edd803628ae71c04c85ae7a0906edad34b648937"; }; } { @@ -433,6 +489,14 @@ sha1 = "f12e0f3c5d77b0b1cdd9146942e4e96c1e4dd525"; }; } + { + 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_limiter___async_limiter_1.0.1.tgz"; path = fetchurl { @@ -537,14 +601,6 @@ sha1 = "32713bc028f75c02fdb710d7c7bcec1f2c6070ef"; }; } - { - name = "builtin_modules___builtin_modules_1.1.1.tgz"; - path = fetchurl { - name = "builtin_modules___builtin_modules_1.1.1.tgz"; - url = "https://registry.yarnpkg.com/builtin-modules/-/builtin-modules-1.1.1.tgz"; - sha1 = "270f076c5a72c02f5b65a47df94c5fe3a278892f"; - }; - } { name = "byline___byline_5.0.0.tgz"; path = fetchurl { @@ -585,6 +641,14 @@ sha1 = "06eb84f00eea413da86affefacbffb36093b3c50"; }; } + { + name = "callsites___callsites_3.1.0.tgz"; + path = fetchurl { + name = "callsites___callsites_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/callsites/-/callsites-3.1.0.tgz"; + sha1 = "b3630abd8943432f54b3f0519238e33cd7df2f73"; + }; + } { name = "caseless___caseless_0.12.0.tgz"; path = fetchurl { @@ -617,6 +681,14 @@ sha1 = "3f73c2bf526591f574cc492c51e2456349f844e4"; }; } + { + name = "chalk___chalk_4.1.0.tgz"; + path = fetchurl { + name = "chalk___chalk_4.1.0.tgz"; + url = "https://registry.yarnpkg.com/chalk/-/chalk-4.1.0.tgz"; + sha1 = "4e14870a618d9e2edd97dd8345fd9d9dc315646a"; + }; + } { name = "ci_info___ci_info_2.0.0.tgz"; path = fetchurl { @@ -833,6 +905,14 @@ sha1 = "0ab56286e0f7c24e153d04cc2aa027e43a9a5d14"; }; } + { + 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 = "dashdash___dashdash_1.14.1.tgz"; path = fetchurl { @@ -865,6 +945,14 @@ sha1 = "e83d17de16d8a7efb7717edbe5fb10135eee629b"; }; } + { + 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 = "debug___debug_4.1.1.tgz"; path = fetchurl { @@ -929,14 +1017,6 @@ sha1 = "cab6ac33df70c9d9a727490ae43ac995a769b22a"; }; } - { - name = "diff___diff_4.0.2.tgz"; - path = fetchurl { - name = "diff___diff_4.0.2.tgz"; - url = "https://registry.yarnpkg.com/diff/-/diff-4.0.2.tgz"; - sha1 = "60f3aecb89d5fae520c11aa19efc2bb982aade7d"; - }; - } { name = "dir_glob___dir_glob_3.0.1.tgz"; path = fetchurl { @@ -945,6 +1025,14 @@ sha1 = "56dbf73d992a4a93ba1584f4534063fd2e41717f"; }; } + { + 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 = "duplexer___duplexer_0.1.1.tgz"; path = fetchurl { @@ -977,6 +1065,14 @@ sha1 = "db043521c95d7e303fd8f345bedc3349cfb0729e"; }; } + { + 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 = "enabled___enabled_1.0.2.tgz"; path = fetchurl { @@ -1001,6 +1097,14 @@ sha1 = "5ae64a5f45057baf3626ec14da0ca5e4b2431eb0"; }; } + { + 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 = "env_variable___env_variable_0.0.5.tgz"; path = fetchurl { @@ -1057,6 +1161,54 @@ sha1 = "ba01d0c8278b5e95a9a45350142026659027a457"; }; } + { + 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.0.0.tgz"; + path = fetchurl { + name = "eslint_visitor_keys___eslint_visitor_keys_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-2.0.0.tgz"; + sha1 = "21fdc8fbcd9c795cc0321f0563702095751511a8"; + }; + } + { + name = "eslint___eslint_7.18.0.tgz"; + path = fetchurl { + name = "eslint___eslint_7.18.0.tgz"; + url = "https://registry.yarnpkg.com/eslint/-/eslint-7.18.0.tgz"; + sha1 = "7fdcd2f3715a41fe6295a16234bd69aed2c75e67"; + }; + } + { + 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 { @@ -1065,6 +1217,22 @@ sha1 = "13b04cdb3e6c5d19df91ab6987a8695619b0aa71"; }; } + { + name = "esquery___esquery_1.3.1.tgz"; + path = fetchurl { + name = "esquery___esquery_1.3.1.tgz"; + url = "https://registry.yarnpkg.com/esquery/-/esquery-1.3.1.tgz"; + sha1 = "b78b5828aa8e214e29fb74c4d5b752e1c033da57"; + }; + } + { + 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 { @@ -1073,6 +1241,14 @@ 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 { @@ -1170,11 +1346,11 @@ }; } { - name = "fast_deep_equal___fast_deep_equal_3.1.1.tgz"; + name = "fast_deep_equal___fast_deep_equal_3.1.3.tgz"; path = fetchurl { - name = "fast_deep_equal___fast_deep_equal_3.1.1.tgz"; - url = "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.1.tgz"; - sha1 = "545145077c501491e33b15ec408c294376e94ae4"; + 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"; }; } { @@ -1257,6 +1433,14 @@ sha1 = "3ab1a2d2a62c8bfb431a0c94cb797a2fce27c962"; }; } + { + name = "file_entry_cache___file_entry_cache_6.0.0.tgz"; + path = fetchurl { + name = "file_entry_cache___file_entry_cache_6.0.0.tgz"; + url = "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-6.0.0.tgz"; + sha1 = "7921a89c391c6d93efec2169ac6bf300c527ea0a"; + }; + } { name = "fill_range___fill_range_7.0.1.tgz"; path = fetchurl { @@ -1281,6 +1465,22 @@ sha1 = "97afe7d6cdc0bc5928584b7c8d7b16e8a9aa5d19"; }; } + { + 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.0.tgz"; + path = fetchurl { + name = "flatted___flatted_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/flatted/-/flatted-3.1.0.tgz"; + sha1 = "a5d06b4a8b01e3a63771daa5cb7a1903e2e57067"; + }; + } { name = "forever_agent___forever_agent_0.6.1.tgz"; path = fetchurl { @@ -1345,6 +1545,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 = "get_own_enumerable_property_symbols___get_own_enumerable_property_symbols_3.0.2.tgz"; path = fetchurl { @@ -1385,6 +1593,14 @@ sha1 = "5eff8e3e684d569ae4cb2b1282604e8ba62149fa"; }; } + { + name = "glob_parent___glob_parent_5.1.1.tgz"; + path = fetchurl { + name = "glob_parent___glob_parent_5.1.1.tgz"; + url = "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.1.tgz"; + sha1 = "b6c1ef417c4e5663ea498f1c45afac6916bbc229"; + }; + } { name = "glob_parent___glob_parent_5.1.0.tgz"; path = fetchurl { @@ -1401,6 +1617,14 @@ sha1 = "141f33b81a7c2492e125594307480c46679278a6"; }; } + { + name = "globals___globals_12.4.0.tgz"; + path = fetchurl { + name = "globals___globals_12.4.0.tgz"; + url = "https://registry.yarnpkg.com/globals/-/globals-12.4.0.tgz"; + sha1 = "a18813576a41b00a24a97e7f815918c2e19925f8"; + }; + } { name = "globby___globby_10.0.2.tgz"; path = fetchurl { @@ -1537,6 +1761,14 @@ sha1 = "2022b4b25fbddc21d2f524974a474aafe733908b"; }; } + { + 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 = "ignore___ignore_5.1.4.tgz"; path = fetchurl { @@ -1553,6 +1785,14 @@ sha1 = "d81355c15612d386c61f9ddd3922d4304822a546"; }; } + { + 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 { @@ -1665,6 +1905,14 @@ 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 { @@ -1786,11 +2034,11 @@ }; } { - name = "js_yaml___js_yaml_3.13.1.tgz"; + name = "js_yaml___js_yaml_3.14.1.tgz"; path = fetchurl { - name = "js_yaml___js_yaml_3.13.1.tgz"; - url = "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.13.1.tgz"; - sha1 = "aff151b30bfdfa8e49e05da22e7415e9dfa37847"; + name = "js_yaml___js_yaml_3.14.1.tgz"; + url = "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.14.1.tgz"; + sha1 = "dae812fdb3825fa306609a8717383c50c36a0537"; }; } { @@ -1817,6 +2065,14 @@ 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_schema___json_schema_0.2.3.tgz"; path = fetchurl { @@ -1825,6 +2081,14 @@ sha1 = "b480c892e59a2f05954ce727bd3f2a4e882f9e13"; }; } + { + 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 = "json_stringify_safe___json_stringify_safe_5.0.1.tgz"; path = fetchurl { @@ -1857,6 +2121,14 @@ sha1 = "ef7c784f36c9fb6e16dd3150d152677b2b0228a6"; }; } + { + 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 = "levn___levn_0.3.0.tgz"; path = fetchurl { @@ -1929,6 +2201,14 @@ sha1 = "b28aa6288a2b9fc651035c7711f65ab6190331a6"; }; } + { + name = "lodash___lodash_4.17.20.tgz"; + path = fetchurl { + name = "lodash___lodash_4.17.20.tgz"; + url = "https://registry.yarnpkg.com/lodash/-/lodash-4.17.20.tgz"; + sha1 = "b44a9b6297bcb698f1c51a3545a2b3b368d59c52"; + }; + } { name = "lodash___lodash_4.17.19.tgz"; path = fetchurl { @@ -1985,6 +2265,14 @@ sha1 = "8bbe50ea85bed59bc9e33dcab8235ee9bcf443cd"; }; } + { + 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"; + }; + } { name = "map_stream___map_stream_0.1.0.tgz"; path = fetchurl { @@ -2161,6 +2449,14 @@ sha1 = "d09d1f357b443f493382a8eb3ccd183872ae6009"; }; } + { + name = "ms___ms_2.1.3.tgz"; + path = fetchurl { + name = "ms___ms_2.1.3.tgz"; + url = "https://registry.yarnpkg.com/ms/-/ms-2.1.3.tgz"; + sha1 = "574c8138ce1d2b5861f0b44579dbadd60c6615b2"; + }; + } { name = "multistream___multistream_2.1.1.tgz"; path = fetchurl { @@ -2177,6 +2473,14 @@ sha1 = "95008057a56cafadc2bc63dde7f9ff6955948e32"; }; } + { + name = "natural_compare___natural_compare_1.4.0.tgz"; + path = fetchurl { + name = "natural_compare___natural_compare_1.4.0.tgz"; + url = "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz"; + sha1 = "4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7"; + }; + } { name = "negotiator___negotiator_0.6.2.tgz"; path = fetchurl { @@ -2321,6 +2625,14 @@ sha1 = "84fa1d036fe9d3c7e21d99884b601167ec8fb495"; }; } + { + 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 = "os_tmpdir___os_tmpdir_1.0.2.tgz"; path = fetchurl { @@ -2393,6 +2705,14 @@ sha1 = "cb2868540e313d61de58fafbe35ce9004d5540e6"; }; } + { + 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 = "parse_json___parse_json_4.0.0.tgz"; path = fetchurl { @@ -2545,6 +2865,14 @@ sha1 = "aeddd3f994c933e4ad98b99d9a556efa0e2fe942"; }; } + { + 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 = "prelude_ls___prelude_ls_1.1.2.tgz"; path = fetchurl { @@ -2729,6 +3057,14 @@ sha1 = "d878a1d094b4306d10b9096484b33ebd55e26697"; }; } + { + name = "regexpp___regexpp_3.1.0.tgz"; + path = fetchurl { + name = "regexpp___regexpp_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/regexpp/-/regexpp-3.1.0.tgz"; + sha1 = "206d0ad0a5648cffbdb8ae46438f3dc51c9f78e2"; + }; + } { name = "request_progress___request_progress_3.0.0.tgz"; path = fetchurl { @@ -2745,6 +3081,14 @@ sha1 = "d73c918731cb5a87da047e207234146f664d12b3"; }; } + { + 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_3.0.0.tgz"; path = fetchurl { @@ -2753,6 +3097,14 @@ sha1 = "b22c7af7d9d6881bc8b6e653335eebcb0a188748"; }; } + { + 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 = "resolve___resolve_1.14.2.tgz"; path = fetchurl { @@ -2801,6 +3153,14 @@ sha1 = "614176d4b3010b75e5c390eb0ee96f6dc0cebb9b"; }; } + { + 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_node___run_node_1.0.0.tgz"; path = fetchurl { @@ -2873,6 +3233,14 @@ sha1 = "ee0a64c8af5e8ceea67687b133761e1becbd1d3d"; }; } + { + name = "semver___semver_7.3.4.tgz"; + path = fetchurl { + name = "semver___semver_7.3.4.tgz"; + url = "https://registry.yarnpkg.com/semver/-/semver-7.3.4.tgz"; + sha1 = "27aaa7d2e4ca76452f98d3add093a72c943edc97"; + }; + } { name = "send___send_0.17.1.tgz"; path = fetchurl { @@ -2961,6 +3329,14 @@ sha1 = "edbf8903f66f7ce2f8eafd6ceed65e264c831b35"; }; } + { + 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___source_map_0.6.1.tgz"; path = fetchurl { @@ -3089,6 +3465,14 @@ sha1 = "ab93f27a8dc13d28cac815c462143a6d9012ae9e"; }; } + { + name = "string_width___string_width_4.2.0.tgz"; + path = fetchurl { + name = "string_width___string_width_4.2.0.tgz"; + url = "https://registry.yarnpkg.com/string-width/-/string-width-4.2.0.tgz"; + sha1 = "952182c46cc7b2c313d1596e623992bd163b72b5"; + }; + } { name = "string_decoder___string_decoder_1.3.0.tgz"; path = fetchurl { @@ -3129,6 +3513,14 @@ 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_eof___strip_eof_1.0.0.tgz"; path = fetchurl { @@ -3145,6 +3537,14 @@ sha1 = "89b852fb2fcbe936f6f4b3187afb0a12c1ab58ad"; }; } + { + 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 { @@ -3162,11 +3562,11 @@ }; } { - name = "supports_color___supports_color_7.1.0.tgz"; + name = "supports_color___supports_color_7.2.0.tgz"; path = fetchurl { - name = "supports_color___supports_color_7.1.0.tgz"; - url = "https://registry.yarnpkg.com/supports-color/-/supports-color-7.1.0.tgz"; - sha1 = "68e32591df73e25ad1c4b49108a2ec507962bfd1"; + name = "supports_color___supports_color_7.2.0.tgz"; + url = "https://registry.yarnpkg.com/supports-color/-/supports-color-7.2.0.tgz"; + sha1 = "1b7dcdcb32b8138801b3e478ba6a51caa89648da"; }; } { @@ -3177,6 +3577,14 @@ sha1 = "c22688aed4eab3cdc2dfeacbb561660560a00804"; }; } + { + name = "table___table_6.0.7.tgz"; + path = fetchurl { + name = "table___table_6.0.7.tgz"; + url = "https://registry.yarnpkg.com/table/-/table-6.0.7.tgz"; + sha1 = "e45897ffbcc1bcf9e8a87bf420f2c9e5a7a52a34"; + }; + } { name = "tdigest___tdigest_0.1.1.tgz"; path = fetchurl { @@ -3193,6 +3601,14 @@ sha1 = "69dc9c1b17446ee79a92bf5b884bb4b9127506f5"; }; } + { + 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 = "thenify_all___thenify_all_1.6.0.tgz"; path = fetchurl { @@ -3265,14 +3681,6 @@ sha1 = "630aaf1ed8bbfb6fbcbddb9bef96054bed217c4b"; }; } - { - name = "tslib___tslib_1.11.1.tgz"; - path = fetchurl { - name = "tslib___tslib_1.11.1.tgz"; - url = "https://registry.yarnpkg.com/tslib/-/tslib-1.11.1.tgz"; - sha1 = "eb15d128827fbee2841549e171f45ed338ac7e35"; - }; - } { name = "tslib___tslib_1.10.0.tgz"; path = fetchurl { @@ -3281,22 +3689,6 @@ sha1 = "c3c19f95973fb0a62973fb09d90d961ee43e5c8a"; }; } - { - name = "tslint___tslint_6.1.1.tgz"; - path = fetchurl { - name = "tslint___tslint_6.1.1.tgz"; - url = "https://registry.yarnpkg.com/tslint/-/tslint-6.1.1.tgz"; - sha1 = "ac03fbd17f85bfefaae348b353b25a88efe10cde"; - }; - } - { - name = "tsutils___tsutils_2.29.0.tgz"; - path = fetchurl { - name = "tsutils___tsutils_2.29.0.tgz"; - url = "https://registry.yarnpkg.com/tsutils/-/tsutils-2.29.0.tgz"; - sha1 = "32b488501467acbedd4b85498673a0812aca0b99"; - }; - } { name = "tunnel_agent___tunnel_agent_0.6.0.tgz"; path = fetchurl { @@ -3313,6 +3705,14 @@ sha1 = "5ae68177f192d4456269d108afa93ff8743f4f64"; }; } + { + 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_check___type_check_0.3.2.tgz"; path = fetchurl { @@ -3329,6 +3729,14 @@ sha1 = "8d2a2370d3df886eb5c90ada1c5bf6188acf838b"; }; } + { + name = "type_fest___type_fest_0.8.1.tgz"; + path = fetchurl { + name = "type_fest___type_fest_0.8.1.tgz"; + url = "https://registry.yarnpkg.com/type-fest/-/type-fest-0.8.1.tgz"; + sha1 = "09e249ebde851d3b1e48d27c105444667f17b83d"; + }; + } { name = "type_is___type_is_1.6.18.tgz"; path = fetchurl { @@ -3402,11 +3810,11 @@ }; } { - name = "uri_js___uri_js_4.2.2.tgz"; + name = "uri_js___uri_js_4.4.1.tgz"; path = fetchurl { - name = "uri_js___uri_js_4.2.2.tgz"; - url = "https://registry.yarnpkg.com/uri-js/-/uri-js-4.2.2.tgz"; - sha1 = "94c540e1ff772956e2299507c010aea6c8838eb0"; + name = "uri_js___uri_js_4.4.1.tgz"; + url = "https://registry.yarnpkg.com/uri-js/-/uri-js-4.4.1.tgz"; + sha1 = "9b1a52595225859e55f669d928f88c6c57f2a77e"; }; } { @@ -3441,6 +3849,14 @@ sha1 = "b23e4358afa8a202fe7a100af1f5f883f02007ee"; }; } + { + name = "v8_compile_cache___v8_compile_cache_2.2.0.tgz"; + path = fetchurl { + name = "v8_compile_cache___v8_compile_cache_2.2.0.tgz"; + url = "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.2.0.tgz"; + sha1 = "9471efa3ef9128d2f7c6a7ca39c4dd6b5055b132"; + }; + } { name = "validate_npm_package_license___validate_npm_package_license_3.0.4.tgz"; path = fetchurl { @@ -3537,6 +3953,14 @@ sha1 = "1c11f9218f076089a47dd512f93c6699a6a81d52"; }; } + { + 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"; + }; + } { name = "yauzl___yauzl_2.4.1.tgz"; path = fetchurl { diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/grafana/default.nix b/third_party/nixpkgs/pkgs/servers/monitoring/grafana/default.nix index dc0a66524d..dc7ca728f2 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/grafana/default.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/grafana/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "grafana"; - version = "7.4.1"; + version = "7.4.3"; excludedPackages = [ "release_publisher" ]; @@ -10,15 +10,15 @@ buildGoModule rec { rev = "v${version}"; owner = "grafana"; repo = "grafana"; - sha256 = "11gvw8kdz7238jcaiyqk6i0ciy6plixljpzdajlabywgr9jam32g"; + sha256 = "sha256-FPQa6q1ks9Lpod5sI29YBnGZvVRU12hTiw6GR85/mEs="; }; srcStatic = fetchurl { url = "https://dl.grafana.com/oss/release/grafana-${version}.linux-amd64.tar.gz"; - sha256 = "1266vj8saf4nh5h6cz8axkk58g1mwgvc9c6caphj71dhvr3snw6i"; + sha256 = "sha256-idbG+K9NVnNhEB0f7DfP7iaEnHMf59ieQtYnmT6CvVM="; }; - vendorSha256 = "0ig0f9pa3l0nj2fs8yz8h42y1j07xi9imk7kzmla6vav6s889grc"; + vendorSha256 = "sha256-LL+EkDZbbaNo/fPMGlPsB8jgBYHoe6SdkBbQoW5y4EU="; postPatch = '' substituteInPlace pkg/cmd/grafana-server/main.go \ diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/artifactory-exporter.nix b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/artifactory-exporter.nix new file mode 100644 index 0000000000..3aa1e18a9f --- /dev/null +++ b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/artifactory-exporter.nix @@ -0,0 +1,36 @@ +{ lib, buildGoModule, fetchFromGitHub, nixosTests }: + +buildGoModule rec { + pname = "artifactory_exporter"; + version = "1.9.0"; + rev = "v${version}"; + + src = fetchFromGitHub { + owner = "peimanja"; + repo = pname; + rev = rev; + sha256 = "1zmkajg48i40jm624p2h03bwg7w28682yfcgk42ig3d50p8xwqc3"; + }; + + vendorSha256 = "1594bpfwhbjgayf4aacs7rfjxm4cnqz8iak8kpm1xzsm1cx1il17"; + + 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 + ''; + + passthru.tests = { inherit (nixosTests.prometheus-exporters) artifactory; }; + + meta = with lib; { + description = "JFrog Artifactory Prometheus Exporter"; + homepage = "https://github.com/peimanja/artifactory_exporter"; + license = licenses.asl20; + maintainers = with maintainers; [ lbpdt ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/knot-exporter.nix b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/knot-exporter.nix new file mode 100644 index 0000000000..9d99685b56 --- /dev/null +++ b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/knot-exporter.nix @@ -0,0 +1,39 @@ +{ stdenv, fetchFromGitHub, lib, python3, nixosTests }: + +stdenv.mkDerivation rec { + pname = "knot-exporter"; + version = "unstable-2020-01-30"; + + src = fetchFromGitHub { + owner = "ghedo"; + repo = "knot_exporter"; + rev = "21dd46b401e0c1aea0b173e19462cdf89e1f444e"; + sha256 = "sha256-4au4lpaq3jcqC2JXdCcf8h+YN8Nmm4eE0kZwA+1rWlc="; + }; + + dontBuild = true; + + nativeBuildInputs = [ python3.pkgs.wrapPython ]; + buildInputs = [ python3 ]; + + installPhase = '' + runHook preInstall + + install -Dm0755 knot_exporter $out/bin/knot_exporter + patchShebangs $out/bin + buildPythonPath ${python3.pkgs.prometheus_client} + patchPythonScript $out/bin/knot_exporter + + runHook postInstall + ''; + + passthru.tests = { inherit (nixosTests.prometheus-exporters) knot; }; + + meta = with lib; { + homepage = "https://github.com/ghedo/knot_exporter"; + description = " Prometheus exporter for Knot DNS"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ ma27 ]; + platforms = platforms.linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/promscale.nix b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/promscale.nix index 965b33aa33..98ad9cd622 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/promscale.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/promscale.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "promscale"; - version = "0.2.0"; + version = "0.2.1"; src = fetchFromGitHub { owner = "timescale"; repo = pname; rev = version; - sha256 = "sha256-rXOAAd08NTWFRGnJoAY9xllw6dAA7Xu3qcImIVq9ewE="; + sha256 = "sha256-f/fpCyAw9BQ6ccEZm/xsTCjINjFtX3Q6SmPuJNVSJVI="; }; vendorSha256 = "sha256-/woSbtrOI3BVBhh+A2kO1CB1BLzBciwOqvSbGkFeMEU="; diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/systemd-exporter.nix b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/systemd-exporter.nix new file mode 100644 index 0000000000..96029c99d8 --- /dev/null +++ b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/systemd-exporter.nix @@ -0,0 +1,25 @@ +{ lib, buildGoModule, fetchFromGitHub, nixosTests }: + +buildGoModule rec { + pname = "systemd_exporter"; + version = "0.4.0"; + + vendorSha256 = "sha256-bYoB0r+d0j3esi/kK2a7/Duup9cf4M3WJjiBNs2+bj8="; + + src = fetchFromGitHub { + owner = "povilasv"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-JDfRHczFnTP9sxA7polUE9qzJhSPIiAU58GBNDYkX4c="; + }; + + passthru.tests = { inherit (nixosTests.prometheus-exporters) systemd; }; + + meta = with lib; { + description = "Exporter for systemd unit metrics"; + homepage = "https://github.com/povilasv/systemd_exporter"; + license = licenses.asl20; + maintainers = with maintainers; [ chkno ]; + platforms = platforms.unix; + }; +} diff --git a/third_party/nixpkgs/pkgs/servers/nosql/redis/default.nix b/third_party/nixpkgs/pkgs/servers/nosql/redis/default.nix index e35aac3be1..b9809a9a10 100644 --- a/third_party/nixpkgs/pkgs/servers/nosql/redis/default.nix +++ b/third_party/nixpkgs/pkgs/servers/nosql/redis/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "redis"; - version = "6.2.0"; + version = "6.2.1"; src = fetchurl { url = "https://download.redis.io/releases/${pname}-${version}.tar.gz"; - sha256 = "1jnv6acjlljvrlxmz0mqarsx1fl5vwss24l8zy5dcawnbp129mk7"; + sha256 = "sha256-zSIlBQEsziCyVoL8qTHsk70hrpLLSr/nQs97dqqQdSA="; }; # Cross-compiling fixes diff --git a/third_party/nixpkgs/pkgs/servers/ser2net/default.nix b/third_party/nixpkgs/pkgs/servers/ser2net/default.nix index a751e0872e..ce14e5d896 100644 --- a/third_party/nixpkgs/pkgs/servers/ser2net/default.nix +++ b/third_party/nixpkgs/pkgs/servers/ser2net/default.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "ser2net"; - version = "4.3.2"; + version = "4.3.3"; src = fetchFromGitHub { owner = "cminyard"; repo = pname; rev = "v${version}"; - sha256 = "sha256-fA4rtFZ2lhGAwY3KUl/Jk8gjueI761J1QRdivMtbqX4="; + sha256 = "sha256-p8iQifCf/IXXPdbjB3pgcw8FgkqRLShHSSeTzJ83Ecg="; }; passthru = { diff --git a/third_party/nixpkgs/pkgs/servers/sql/dolt/default.nix b/third_party/nixpkgs/pkgs/servers/sql/dolt/default.nix index ce57219468..7d9009f8c6 100644 --- a/third_party/nixpkgs/pkgs/servers/sql/dolt/default.nix +++ b/third_party/nixpkgs/pkgs/servers/sql/dolt/default.nix @@ -2,18 +2,18 @@ buildGoModule rec { pname = "dolt"; - version = "0.23.9"; + version = "0.24.1"; src = fetchFromGitHub { owner = "liquidata-inc"; repo = "dolt"; rev = "v${version}"; - sha256 = "sha256-fVU3eOhog34fLnfNQ6mWB7yUEkinm74SgpxYXB9MV/g="; + sha256 = "sha256-z2F6ru2LNATiI4rSImbvwgxqKxuj8kwzjhwSbsPDBEs="; }; modRoot = "./go"; subPackages = [ "cmd/dolt" "cmd/git-dolt" "cmd/git-dolt-smudge" ]; - vendorSha256 = "sha256-Poumvh7DccY8qCZ5ehFFaqEsL945BxNXFfevJvRawUA="; + vendorSha256 = "sha256-JO2hGrKbt+5Eh7v7LCZrPBK84Q9gjquchlZ5MfMY3uY="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/repmgr.nix b/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/repmgr.nix index ceb9cc9d8a..6510719193 100644 --- a/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/repmgr.nix +++ b/third_party/nixpkgs/pkgs/servers/sql/postgresql/ext/repmgr.nix @@ -8,13 +8,13 @@ stdenv.mkDerivation rec { pname = "repmgr"; - version = "5.1.0"; + version = "5.2.1"; src = fetchFromGitHub { owner = "2ndQuadrant"; repo = "repmgr"; rev = "v${version}"; - sha256 = "1igcy98ggwyx8zg4g4kz7xb32b7vc3h668r5wbfk4w49x9v97f4m"; + sha256 = "sha256-hIhVjSSJAgH/eXiuz0xlTFgp9q+Y41ICeCrRFGss3mk="; }; nativeBuildInputs = [ flex ]; diff --git a/third_party/nixpkgs/pkgs/servers/squid/default.nix b/third_party/nixpkgs/pkgs/servers/squid/default.nix index 59da5a80a3..5c980f7e40 100644 --- a/third_party/nixpkgs/pkgs/servers/squid/default.nix +++ b/third_party/nixpkgs/pkgs/servers/squid/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "squid"; - version = "4.13"; + version = "4.14"; src = fetchurl { url = "http://www.squid-cache.org/Versions/v4/${pname}-${version}.tar.xz"; - sha256 = "1q1ywpic6s7dfjj3cwzcfgscc4zq0aih462gyas7j1z683ss14b8"; + sha256 = "sha256-8Ql9qmQ0iXwVm8EAl4tRNHwDOQQWEIRdCvoSgVFyn/w="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/servers/trezord/default.nix b/third_party/nixpkgs/pkgs/servers/trezord/default.nix index d0c674c151..d4f9beecfb 100644 --- a/third_party/nixpkgs/pkgs/servers/trezord/default.nix +++ b/third_party/nixpkgs/pkgs/servers/trezord/default.nix @@ -11,16 +11,16 @@ buildGoModule rec { version = "2.0.30"; src = fetchFromGitHub { - owner = "trezor"; - repo = "trezord-go"; - rev = "v${version}"; + owner = "trezor"; + repo = "trezord-go"; + rev = "v${version}"; sha256 = "1hzvk0wfgg7b4wpqjk3738yqxlv3pj5i7zxwm0jady2h97hmrqrr"; }; vendorSha256 = "0wb959xzyvr5zzjvkfqc422frmf97q5nr460f02wwx0pj6ch0y61"; propagatedBuildInputs = lib.optionals stdenv.isLinux [ trezor-udev-rules ] - ++ lib.optionals stdenv.isDarwin [ AppKit ]; + ++ lib.optionals stdenv.isDarwin [ AppKit ]; meta = with lib; { description = "Trezor Communication Daemon aka Trezor Bridge"; diff --git a/third_party/nixpkgs/pkgs/servers/web-apps/whitebophir/default.nix b/third_party/nixpkgs/pkgs/servers/web-apps/whitebophir/default.nix index a1d8e9c006..7373724a01 100644 --- a/third_party/nixpkgs/pkgs/servers/web-apps/whitebophir/default.nix +++ b/third_party/nixpkgs/pkgs/servers/web-apps/whitebophir/default.nix @@ -1,7 +1,6 @@ { stdenv , pkgs , lib -, fetchurl , nodejs , runtimeShell }: @@ -28,7 +27,7 @@ let meta = with lib; { description = "Online collaborative whiteboard that is simple, free, easy to use and to deploy"; - license = licenses.agpl3; + license = licenses.agpl3Plus; homepage = "https://github.com/lovasoa/whitebophir"; maintainers = with maintainers; [ iblech ]; platforms = platforms.unix; diff --git a/third_party/nixpkgs/pkgs/servers/web-apps/whitebophir/node-packages-generated.nix b/third_party/nixpkgs/pkgs/servers/web-apps/whitebophir/node-packages-generated.nix index 17f170c4af..cdbb8c4a34 100644 --- a/third_party/nixpkgs/pkgs/servers/web-apps/whitebophir/node-packages-generated.nix +++ b/third_party/nixpkgs/pkgs/servers/web-apps/whitebophir/node-packages-generated.nix @@ -103,13 +103,13 @@ let sha512 = "OIobPtY5vtwe5IM0B0J3KmewYB/NTcbgiW9yRdWzMA1TeFSd8LfuficICYuzUZt25Kh/eIw4g37ArhS1WH/6Iw=="; }; }; - "@juggle/resize-observer-3.2.0" = { + "@juggle/resize-observer-3.3.0" = { name = "_at_juggle_slash_resize-observer"; packageName = "@juggle/resize-observer"; - version = "3.2.0"; + version = "3.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/@juggle/resize-observer/-/resize-observer-3.2.0.tgz"; - sha512 = "fsLxt0CHx2HCV9EL8lDoVkwHffsA0snUpddYjdLyXcG5E41xaamn9ZyQqOE9TUJdrRlH8/hjIf+UdOdDeKCUgg=="; + url = "https://registry.npmjs.org/@juggle/resize-observer/-/resize-observer-3.3.0.tgz"; + sha512 = "P1v2nvK7z2gOLVM/bveIRLG9L99uEahTGgTltyF03zixZAjI9YmKLj5Z9MpS9wBIUt5WDoQORT2lXvLOIF89iA=="; }; }; "@types/component-emitter-1.2.10" = { @@ -130,22 +130,22 @@ let sha512 = "y7mImlc/rNkvCRmg8gC3/lj87S7pTUIJ6QGjwHR9WQJcFs+ZMTOaoPrkdFA/YdbuqVEmEbb5RdhVxMkAcgOnpg=="; }; }; - "@types/cors-2.8.9" = { + "@types/cors-2.8.10" = { name = "_at_types_slash_cors"; packageName = "@types/cors"; - version = "2.8.9"; + version = "2.8.10"; src = fetchurl { - url = "https://registry.npmjs.org/@types/cors/-/cors-2.8.9.tgz"; - sha512 = "zurD1ibz21BRlAOIKP8yhrxlqKx6L9VCwkB5kMiP6nZAhoF5MvC7qS1qPA7nRcr1GJolfkQC7/EAL4hdYejLtg=="; + url = "https://registry.npmjs.org/@types/cors/-/cors-2.8.10.tgz"; + sha512 = "C7srjHiVG3Ey1nR6d511dtDkCEjxuN9W1HWAEjGq8kpcwmNM6JJkpC0xvabM7BXTG2wDq8Eu33iH9aQKa7IvLQ=="; }; }; - "@types/node-14.14.22" = { + "@types/node-14.14.31" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "14.14.22"; + version = "14.14.31"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-14.14.22.tgz"; - sha512 = "g+f/qj/cNcqKkc3tFqlXOYjrmZA+jNBiDzbP3kH+B+otKFqAdPgVTGP1IeKRdMml/aE69as5S4FqtxAbl+LaMw=="; + url = "https://registry.npmjs.org/@types/node/-/node-14.14.31.tgz"; + sha512 = "vFHy/ezP5qI0rFgJ7aQnjDXwAMrG0KqqIH7tQG5PPv3BWBayOPIQNBjVc/P6hhdZfMx51REc6tfDNXHUio893g=="; }; }; "@webcomponents/template-1.4.4" = { @@ -202,6 +202,15 @@ let sha1 = "0cd90a561093f35d0a99256c22b7069433fad117"; }; }; + "async-mutex-0.3.1" = { + name = "async-mutex"; + packageName = "async-mutex"; + version = "0.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/async-mutex/-/async-mutex-0.3.1.tgz"; + sha512 = "vRfQwcqBnJTLzVQo72Sf7KIUbcSUP5hNchx6udI1U6LuPQpfePgdjJzlCe76yFZ8pxlLjn9lwcl/Ya0TSOv0Tw=="; + }; + }; "audio-context-polyfill-1.0.0" = { name = "audio-context-polyfill"; packageName = "audio-context-polyfill"; @@ -535,22 +544,22 @@ let sha512 = "LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA=="; }; }; - "graceful-fs-4.2.4" = { + "graceful-fs-4.2.6" = { name = "graceful-fs"; packageName = "graceful-fs"; - version = "4.2.4"; + version = "4.2.6"; src = fetchurl { - url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.4.tgz"; - sha512 = "WjKPNJF79dtJAVniUlGGWHYGz2jWxT6VhN/4m1NdkbZ2nOsEF+cI1Edgql5zCRhs/VsQYRvrXctxktVXZUkixw=="; + url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.6.tgz"; + sha512 = "nTnJ528pbqxYanhpDYsi4Rd8MAeaBA67+RZ10CM1m3bTAVFEDcd5AuA4a6W5YkGZ1iNXHzZz8T6TBKLeBuNriQ=="; }; }; - "handlebars-4.7.6" = { + "handlebars-4.7.7" = { name = "handlebars"; packageName = "handlebars"; - version = "4.7.6"; + version = "4.7.7"; src = fetchurl { - url = "https://registry.npmjs.org/handlebars/-/handlebars-4.7.6.tgz"; - sha512 = "1f2BACcBfiwAfStCKZNrUCgqNZkGsAT7UM3kkYtXuLo0KnaVfjKOyf7PRzB6++aK9STyT1Pd2ZCPe3EGOXleXA=="; + url = "https://registry.npmjs.org/handlebars/-/handlebars-4.7.7.tgz"; + sha512 = "aAcXm5OAfE/8IXkcZvCepKU3VzW1/39Fb5ZuqMtgI/hT8X2YgoMvBY5dLhq/cpOvw7Lk1nK/UF71aLG/ZnVYRA=="; }; }; "html5shiv-3.7.3" = { @@ -706,22 +715,22 @@ let sha512 = "x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg=="; }; }; - "mime-db-1.45.0" = { + "mime-db-1.46.0" = { name = "mime-db"; packageName = "mime-db"; - version = "1.45.0"; + version = "1.46.0"; src = fetchurl { - url = "https://registry.npmjs.org/mime-db/-/mime-db-1.45.0.tgz"; - sha512 = "CkqLUxUk15hofLoLyljJSrukZi8mAtgd+yE5uO4tqRZsdsAJKv0O+rFMhVDRJgozy+yG6md5KwuXhD4ocIoP+w=="; + url = "https://registry.npmjs.org/mime-db/-/mime-db-1.46.0.tgz"; + sha512 = "svXaP8UQRZ5K7or+ZmfNhg2xX3yKDMUzqadsSqi4NCH/KomcH75MAMYAGVlvXn4+b/xOPhS3I2uHKRUzvjY7BQ=="; }; }; - "mime-types-2.1.28" = { + "mime-types-2.1.29" = { name = "mime-types"; packageName = "mime-types"; - version = "2.1.28"; + version = "2.1.29"; src = fetchurl { - url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.28.tgz"; - sha512 = "0TO2yJ5YHYr7M2zzT7gDU1tbwHxEUWBCLt0lscSNpcdAfFyJOVEpRYNS7EXVcTLNj/25QO8gulHC5JtTzSE2UQ=="; + url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.29.tgz"; + sha512 = "Y/jMt/S5sR9OaqteJtslsFZKWOIIqMACsJSiHghlCAyhf7jfVYjKBmLiX8OgpWeW+fjJ2b+Az69aPFPkUOY6xQ=="; }; }; "minimatch-3.0.4" = { @@ -751,13 +760,13 @@ let sha512 = "vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw=="; }; }; - "mnemonist-0.38.1" = { + "mnemonist-0.38.3" = { name = "mnemonist"; packageName = "mnemonist"; - version = "0.38.1"; + version = "0.38.3"; src = fetchurl { - url = "https://registry.npmjs.org/mnemonist/-/mnemonist-0.38.1.tgz"; - sha512 = "I674bCCj9p87Re+gv15ynDrP14XjcmLR7tBO22l3UoxQLniyIXdD9vid2sSxYkyOr0fZwJTA+dXRvrwANgdnyg=="; + url = "https://registry.npmjs.org/mnemonist/-/mnemonist-0.38.3.tgz"; + sha512 = "2K9QYubXx/NAjv4VLq1d1Ly8pWNC5L3BrixtdkyTegXWJIqY+zLNDhhX/A+ZwWt70tB1S8H4BE8FLYEFyNoOBw=="; }; }; "ms-2.0.0" = { @@ -1012,13 +1021,13 @@ let sha512 = "JvdAWfbXeIGaZ9cILp38HntZSFSo3mWg6xGcJJsd+d4aRMOqauag1C63dJfDw7OaMYwEbHMOxEZ1lqVRYP2OAw=="; }; }; - "socket.io-3.1.0" = { + "socket.io-3.1.2" = { name = "socket.io"; packageName = "socket.io"; - version = "3.1.0"; + version = "3.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/socket.io/-/socket.io-3.1.0.tgz"; - sha512 = "Aqg2dlRh6xSJvRYK31ksG65q4kmBOqU4g+1ukhPcoT6wNGYoIwSYPlCPuRwOO9pgLUajojGFztl6+V2opmKcww=="; + url = "https://registry.npmjs.org/socket.io/-/socket.io-3.1.2.tgz"; + sha512 = "JubKZnTQ4Z8G4IZWtaAZSiRP3I/inpy8c/Bsx2jrwGrTbKeVU5xd6qkKMHpChYeM3dWZSO0QACiGK+obhBNwYw=="; }; }; "socket.io-adapter-2.1.0" = { @@ -1147,13 +1156,13 @@ let sha1 = "29c5733148057bb4e1f75df35b7a9cb72e6a59dd"; }; }; - "uglify-js-3.12.6" = { + "uglify-js-3.13.0" = { name = "uglify-js"; packageName = "uglify-js"; - version = "3.12.6"; + version = "3.13.0"; src = fetchurl { - url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.12.6.tgz"; - sha512 = "aqWHe3DfQmZUDGWBbabZ2eQnJlQd1fKlMUu7gV+MiTuDzdgDw31bI3wA2jLLsV/hNcDP26IfyEgSVoft5+0SVw=="; + url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.13.0.tgz"; + sha512 = "TWYSWa9T2pPN4DIJYbU9oAjQx+5qdV5RUDxwARg8fmJZrD/V27Zj0JngW5xg1DFz42G0uDYl2XhzF6alSzD62w=="; }; }; "uglify-to-browserify-1.0.2" = { @@ -1210,22 +1219,22 @@ let sha512 = "TOMFWtQdxzjWp8qx4DAraTWTsdhxVSiWa6NkPFSaPtZ1diKUxTn4yTix73A1euG1WbSOMMPcY51cnjTIHrGtDA=="; }; }; - "whatwg-fetch-3.5.0" = { + "whatwg-fetch-3.6.2" = { name = "whatwg-fetch"; packageName = "whatwg-fetch"; - version = "3.5.0"; + version = "3.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-3.5.0.tgz"; - sha512 = "jXkLtsR42xhXg7akoDKvKWE40eJeI+2KZqcp2h3NsOrRnDvtWX36KcKl30dy+hxECivdk2BVUHVNrPtoMBUx6A=="; + url = "https://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-3.6.2.tgz"; + sha512 = "bJlen0FcuU/0EMLrdbJ7zOnW6ITZLrZMIarMUVmdKtsGvZna8vxKYaexICWPfZ8qwf9fzNq+UEIZrnSaApt6RA=="; }; }; - "wicg-inert-3.1.0" = { + "wicg-inert-3.1.1" = { name = "wicg-inert"; packageName = "wicg-inert"; - version = "3.1.0"; + version = "3.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/wicg-inert/-/wicg-inert-3.1.0.tgz"; - sha512 = "P0ZiWaN9SxOkJbYtF/PIwmIRO8UTqTJtyl33QTQlHfAb6h15T0Dp5m7WTJ8N6UWIoj+KU5M0a8EtfRZLlHiP0Q=="; + url = "https://registry.npmjs.org/wicg-inert/-/wicg-inert-3.1.1.tgz"; + sha512 = "PhBaNh8ur9Xm4Ggy4umelwNIP6pPP1bv3EaWaKqfb/QNme2rdLjm7wIInvV4WhxVHhzA4Spgw9qNSqWtB/ca2A=="; }; }; "window-size-0.1.0" = { @@ -1264,13 +1273,13 @@ let sha1 = "b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"; }; }; - "ws-7.4.2" = { + "ws-7.4.3" = { name = "ws"; packageName = "ws"; - version = "7.4.2"; + version = "7.4.3"; src = fetchurl { - url = "https://registry.npmjs.org/ws/-/ws-7.4.2.tgz"; - sha512 = "T4tewALS3+qsrpGI/8dqNMLIVdq/g/85U98HPMa6F0m6xTbvhXU6RCQLqPH3+SlomNV/LdY6RXEbBpMH6EOJnA=="; + url = "https://registry.npmjs.org/ws/-/ws-7.4.3.tgz"; + sha512 = "hr6vCR76GsossIRsr8OLR9acVVm1jyfEWvhbNjtgPOrfvAlKzvyeg/P6r8RuDjRyrcQoPQT7K0DGEPc7Ae6jzA=="; }; }; "yaku-1.0.1" = { @@ -1303,14 +1312,14 @@ let }; in { - "whitebophir-git+https://github.com/lovasoa/whitebophir.git#v1.7.0" = nodeEnv.buildNodePackage { + "whitebophir-git+https://github.com/lovasoa/whitebophir.git#v1.9.1" = nodeEnv.buildNodePackage { name = "whitebophir"; packageName = "whitebophir"; - version = "1.7.0"; + version = "1.9.1"; src = fetchgit { url = "https://github.com/lovasoa/whitebophir.git"; - rev = "3bf594334e683c63229ac9b6b3a607fdad43c8e1"; - sha256 = "7d6d7baddc759d75b586131c436be3ea16b63889f916996e866f2e9aca7cfe50"; + rev = "626397d43f14c3579d6434ac76fc373b994f1741"; + sha256 = "3c3d74b7c011e1d0f2781210de996fc0ecc35b29b93c74a27eb436902d0489fe"; }; dependencies = [ sources."@financial-times/polyfill-useragent-normaliser-1.9.0" @@ -1324,17 +1333,18 @@ in sources."@formatjs/intl-numberformat-6.1.3" sources."@formatjs/intl-pluralrules-4.0.5" sources."@formatjs/intl-relativetimeformat-8.0.3" - sources."@juggle/resize-observer-3.2.0" + sources."@juggle/resize-observer-3.3.0" sources."@types/component-emitter-1.2.10" sources."@types/cookie-0.4.0" - sources."@types/cors-2.8.9" - sources."@types/node-14.14.22" + sources."@types/cors-2.8.10" + sources."@types/node-14.14.31" sources."@webcomponents/template-1.4.4" sources."Base64-1.1.0" sources."abort-controller-3.0.0" sources."accept-language-parser-1.5.0" sources."accepts-1.3.7" sources."align-text-0.1.4" + sources."async-mutex-0.3.1" sources."audio-context-polyfill-1.0.0" sources."balanced-match-1.0.0" sources."base64-arraybuffer-0.1.4" @@ -1379,8 +1389,8 @@ in sources."from2-string-1.1.0" sources."fs.realpath-1.0.0" sources."glob-7.1.6" - sources."graceful-fs-4.2.4" - sources."handlebars-4.7.6" + sources."graceful-fs-4.2.6" + sources."handlebars-4.7.7" sources."html5shiv-3.7.3" sources."http-errors-1.7.3" sources."inflight-1.0.6" @@ -1398,12 +1408,12 @@ in sources."lru-cache-6.0.0" sources."merge2-1.4.1" sources."mime-1.6.0" - sources."mime-db-1.45.0" - sources."mime-types-2.1.28" + sources."mime-db-1.46.0" + sources."mime-types-2.1.29" sources."minimatch-3.0.4" sources."minimist-1.2.5" sources."mkdirp-1.0.4" - sources."mnemonist-0.38.1" + sources."mnemonist-0.38.3" sources."ms-2.1.3" sources."mutationobserver-shim-0.3.7" sources."negotiator-0.6.2" @@ -1443,7 +1453,7 @@ in }) sources."serve-static-1.14.1" sources."setprototypeof-1.1.1" - (sources."socket.io-3.1.0" // { + (sources."socket.io-3.1.2" // { dependencies = [ sources."debug-4.3.2" sources."ms-2.1.2" @@ -1466,19 +1476,19 @@ in sources."toidentifier-1.0.0" sources."toposort-2.0.2" sources."tslib-2.1.0" - sources."uglify-js-3.12.6" + sources."uglify-js-3.13.0" sources."uglify-to-browserify-1.0.2" sources."unorm-1.6.0" sources."usertiming-0.1.8" sources."util-deprecate-1.0.2" sources."vary-1.1.2" sources."web-animations-js-2.3.2" - sources."whatwg-fetch-3.5.0" - sources."wicg-inert-3.1.0" + sources."whatwg-fetch-3.6.2" + sources."wicg-inert-3.1.1" sources."window-size-0.1.0" sources."wordwrap-1.0.0" sources."wrappy-1.0.2" - sources."ws-7.4.2" + sources."ws-7.4.3" sources."yaku-1.0.1" sources."yallist-4.0.0" sources."yargs-3.10.0" diff --git a/third_party/nixpkgs/pkgs/servers/web-apps/whitebophir/node-packages.json b/third_party/nixpkgs/pkgs/servers/web-apps/whitebophir/node-packages.json index 44977342cc..7ba8afd151 100644 --- a/third_party/nixpkgs/pkgs/servers/web-apps/whitebophir/node-packages.json +++ b/third_party/nixpkgs/pkgs/servers/web-apps/whitebophir/node-packages.json @@ -1,3 +1,3 @@ [ - { "whitebophir": "git+https://github.com/lovasoa/whitebophir.git#v1.7.0" } + { "whitebophir": "git+https://github.com/lovasoa/whitebophir.git#v1.9.1" } ] diff --git a/third_party/nixpkgs/pkgs/shells/fish/plugins/clownfish.nix b/third_party/nixpkgs/pkgs/shells/fish/plugins/clownfish.nix new file mode 100644 index 0000000000..cd5c997d31 --- /dev/null +++ b/third_party/nixpkgs/pkgs/shells/fish/plugins/clownfish.nix @@ -0,0 +1,20 @@ +{ lib, buildFishPlugin, fetchFromGitHub }: + +buildFishPlugin { + pname = "clownfish"; + version = "unstable-2021-01-17"; + + src = fetchFromGitHub { + owner = "IlanCosman"; + repo = "clownfish"; + rev = "a0db28d8280d05561b8f48c0465480725feeca4c"; + sha256 = "04xvikyrdm6yxh588vbpwvm04fas76pa7sigsaqrip7yh021xxab"; + }; + + meta = with lib; { + description = "Fish function to mock the behaviour of commands"; + homepage = "https://github.com/IlanCosman/clownfish"; + license = licenses.mit; + maintainers = with maintainers; [ pacien ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/shells/fish/plugins/default.nix b/third_party/nixpkgs/pkgs/shells/fish/plugins/default.nix index e543d49516..50b8eb4d98 100644 --- a/third_party/nixpkgs/pkgs/shells/fish/plugins/default.nix +++ b/third_party/nixpkgs/pkgs/shells/fish/plugins/default.nix @@ -4,10 +4,17 @@ lib.makeScope newScope (self: with self; { buildFishPlugin = callPackage ./build-fish-plugin.nix { }; + clownfish = callPackage ./clownfish.nix { }; + + # Fishtape 2.x and 3.x aren't compatible, + # but both versions are used in the tests of different other plugins. fishtape = callPackage ./fishtape.nix { }; + fishtape_3 = callPackage ./fishtape_3.nix { }; foreign-env = callPackage ./foreign-env { }; + fzf-fish = callPackage ./fzf-fish.nix { }; + pure = callPackage ./pure.nix { }; }) diff --git a/third_party/nixpkgs/pkgs/shells/fish/plugins/fishtape_3.nix b/third_party/nixpkgs/pkgs/shells/fish/plugins/fishtape_3.nix new file mode 100644 index 0000000000..893e6d65ff --- /dev/null +++ b/third_party/nixpkgs/pkgs/shells/fish/plugins/fishtape_3.nix @@ -0,0 +1,25 @@ +{ lib, buildFishPlugin, fetchFromGitHub }: + +buildFishPlugin rec { + pname = "fishtape"; + version = "3.0.1"; + + src = fetchFromGitHub { + owner = "jorgebucaran"; + repo = "fishtape"; + rev = version; + sha256 = "072a3qbk1lpxw53bxp91drsffylx8fbywhss3x0jbnayn9m8i7aa"; + }; + + checkFunctionDirs = [ "./functions" ]; # fishtape is introspective + checkPhase = '' + fishtape tests/*.fish + ''; + + meta = with lib; { + description = "100% pure-Fish test runner"; + homepage = "https://github.com/jorgebucaran/fishtape"; + license = licenses.mit; + maintainers = with maintainers; [ pacien ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/shells/fish/plugins/fzf-fish.nix b/third_party/nixpkgs/pkgs/shells/fish/plugins/fzf-fish.nix new file mode 100644 index 0000000000..51e7dcc096 --- /dev/null +++ b/third_party/nixpkgs/pkgs/shells/fish/plugins/fzf-fish.nix @@ -0,0 +1,34 @@ +{ lib, buildFishPlugin, fetchFromGitHub, fzf, clownfish, fishtape_3 }: + +buildFishPlugin rec { + pname = "fzf.fish"; + version = "5.6"; + + src = fetchFromGitHub { + owner = "PatrickF1"; + repo = "fzf.fish"; + rev = "v${version}"; + sha256 = "1b280n8bh00n4vkm19zrn84km52296ljlm1zhz95jgaiwymf2x73"; + }; + + checkInputs = [ fzf ]; + checkPlugins = [ clownfish fishtape_3 ]; + checkFunctionDirs = [ "./functions" ]; + checkPhase = '' + # Disable git tests which inspect the project's git repo, which isn't + # possible since we strip the impure .git from our build input + rm -r tests/*git* + + # Disable tests that are failing, probably because of our wrappers + rm -r tests/search_shell_variables + + fishtape tests/*/*.fish + ''; + + meta = with lib; { + description = "Augment your fish command line with fzf key bindings"; + homepage = "https://github.com/PatrickF1/fzf.fish"; + license = licenses.mit; + maintainers = with maintainers; [ pacien ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/shells/zsh/oh-my-zsh/default.nix b/third_party/nixpkgs/pkgs/shells/zsh/oh-my-zsh/default.nix index 6960b3212b..1c191b567d 100644 --- a/third_party/nixpkgs/pkgs/shells/zsh/oh-my-zsh/default.nix +++ b/third_party/nixpkgs/pkgs/shells/zsh/oh-my-zsh/default.nix @@ -119,6 +119,6 @@ stdenv.mkDerivation rec { homepage = "https://ohmyz.sh/"; license = licenses.mit; platforms = platforms.all; - maintainers = with maintainers; [ scolobb nequissimus ]; + maintainers = with maintainers; [ nequissimus ]; }; } diff --git a/third_party/nixpkgs/pkgs/tools/X11/autocutsel/default.nix b/third_party/nixpkgs/pkgs/tools/X11/autocutsel/default.nix index ef03130a2d..4e6f40707a 100644 --- a/third_party/nixpkgs/pkgs/tools/X11/autocutsel/default.nix +++ b/third_party/nixpkgs/pkgs/tools/X11/autocutsel/default.nix @@ -1,12 +1,12 @@ {lib, stdenv, fetchurl, libX11, libXaw}: stdenv.mkDerivation rec { - version = "0.10.0"; + version = "0.10.1"; pname = "autocutsel"; src = fetchurl { url = "https://github.com/sigmike/autocutsel/releases/download/${version}/${pname}-${version}.tar.gz"; - sha256 = "0gsys2dzh4az51ndcsabhlbbrjn2nm75lnjr45kg6r8sm8q66dx2"; + sha256 = "sha256-8X4G1C90lENtSyb0vgtrDaOUgcBADJZ3jkuQW2NB6xc="; }; buildInputs = [ libX11 libXaw ]; diff --git a/third_party/nixpkgs/pkgs/tools/admin/awscli/default.nix b/third_party/nixpkgs/pkgs/tools/admin/awscli/default.nix index ce3dbcc74b..c5e792d6bc 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/awscli/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/awscli/default.nix @@ -28,11 +28,11 @@ let in with py.pkgs; buildPythonApplication rec { pname = "awscli"; - version = "1.19.22"; # N.B: if you change this, change botocore and boto3 to a matching version too + version = "1.19.25"; # N.B: if you change this, change botocore and boto3 to a matching version too src = fetchPypi { inherit pname version; - sha256 = "sha256-yu2IltNbOLB44M+0u5lTjHHllDndBHp4rNfMwFOKMgw="; + sha256 = "sha256-YL5MnlN+DODGgpi2qtpr6wwC0nuebl/VoBzXRk4l4R8="; }; # https://github.com/aws/aws-cli/issues/4837 diff --git a/third_party/nixpkgs/pkgs/tools/audio/abcmidi/default.nix b/third_party/nixpkgs/pkgs/tools/audio/abcmidi/default.nix index df4211ad03..3937a6d65e 100644 --- a/third_party/nixpkgs/pkgs/tools/audio/abcmidi/default.nix +++ b/third_party/nixpkgs/pkgs/tools/audio/abcmidi/default.nix @@ -2,16 +2,13 @@ stdenv.mkDerivation rec { pname = "abcMIDI"; - version = "2021.02.21"; + version = "2021.03.10"; src = fetchzip { url = "https://ifdo.ca/~seymour/runabc/${pname}-${version}.zip"; - sha256 = "10fa2g8vsz0y7kb0wxnz857r2gd9b0b278j0a5ipjaa7cjd0gi1b"; + sha256 = "1g4a5b17jbra1c59fpsv1d1jrdsjwg5mw54qilrm12nw7yh9lihf"; }; - # There is also a file called "makefile" which seems to be preferred by the standard build phase - makefile = "Makefile"; - meta = with lib; { homepage = "http://abc.sourceforge.net/abcMIDI/"; downloadPage = "https://ifdo.ca/~seymour/runabc/top.html"; diff --git a/third_party/nixpkgs/pkgs/tools/audio/beets/default.nix b/third_party/nixpkgs/pkgs/tools/audio/beets/default.nix index 61340938f5..a3eedf3ea4 100644 --- a/third_party/nixpkgs/pkgs/tools/audio/beets/default.nix +++ b/third_party/nixpkgs/pkgs/tools/audio/beets/default.nix @@ -21,6 +21,7 @@ , enableKodiupdate ? true , enableLastfm ? true , enableLoadext ? true +, enableLyrics ? true , enableMpd ? true , enablePlaylist ? true , enableReplaygain ? true @@ -59,6 +60,7 @@ let lastgenre = enableLastfm; lastimport = enableLastfm; loadext = enableLoadext; + lyrics = enableLyrics; mpdstats = enableMpd; mpdupdate = enableMpd; playlist = enablePlaylist; @@ -73,7 +75,7 @@ let pluginsWithoutDeps = [ "bench" "bpd" "bpm" "bucket" "cue" "duplicates" "edit" "embedart" "export" "filefilter" "fish" "freedesktop" "fromfilename" "ftintitle" "fuzzy" - "hook" "ihate" "importadded" "importfeeds" "info" "inline" "ipfs" "lyrics" + "hook" "ihate" "importadded" "importfeeds" "info" "inline" "ipfs" "mbcollection" "mbsubmit" "mbsync" "metasync" "missing" "parentwork" "permissions" "play" "plexupdate" "random" "rewrite" "scrub" "smartplaylist" "spotify" "the" "types" "unimported" "zero" @@ -130,6 +132,8 @@ in pythonPackages.buildPythonApplication rec { ] ++ lib.optional enableAbsubmit essentia-extractor ++ lib.optional enableAcoustid pythonPackages.pyacoustid ++ lib.optional enableBeatport pythonPackages.requests_oauthlib + ++ lib.optional enableConvert ffmpeg + ++ lib.optional enableDiscogs pythonPackages.discogs_client ++ lib.optional (enableFetchart || enableDeezer || enableEmbyupdate @@ -139,10 +143,9 @@ in pythonPackages.buildPythonApplication rec { || enableSubsonicplaylist || enableSubsonicupdate || enableAcousticbrainz) pythonPackages.requests - ++ lib.optional enableConvert ffmpeg - ++ lib.optional enableDiscogs pythonPackages.discogs_client ++ lib.optional enableKeyfinder keyfinder-cli ++ lib.optional enableLastfm pythonPackages.pylast + ++ lib.optional enableLyrics pythonPackages.beautifulsoup4 ++ lib.optional enableMpd pythonPackages.mpd2 ++ lib.optional enableSonosUpdate pythonPackages.soco ++ lib.optional enableThumbnails pythonPackages.pyxdg diff --git a/third_party/nixpkgs/pkgs/tools/audio/yabridge/default.nix b/third_party/nixpkgs/pkgs/tools/audio/yabridge/default.nix index 034e73207e..d2a14aae33 100644 --- a/third_party/nixpkgs/pkgs/tools/audio/yabridge/default.nix +++ b/third_party/nixpkgs/pkgs/tools/audio/yabridge/default.nix @@ -56,14 +56,14 @@ let }; in stdenv.mkDerivation rec { pname = "yabridge"; - version = "3.0.1"; + version = "3.0.2"; - # NOTE: Also update yabridgectl's cargoSha256 when this is updated + # NOTE: Also update yabridgectl's cargoHash when this is updated src = fetchFromGitHub { owner = "robbert-vdh"; repo = pname; rev = version; - hash = "sha256-BT8Qj8WvyRlBwSuIIlfWVhlG3RSv2sFnSskCcjPF/N0="; + hash = "sha256-3uZCYGqo9acpANy5tQl3U0LK6wuOzjQpfjHDvaPSGlI="; }; # Unpack subproject sources diff --git a/third_party/nixpkgs/pkgs/tools/audio/yabridgectl/default.nix b/third_party/nixpkgs/pkgs/tools/audio/yabridgectl/default.nix index 6a77b502ae..5c7f3a628f 100644 --- a/third_party/nixpkgs/pkgs/tools/audio/yabridgectl/default.nix +++ b/third_party/nixpkgs/pkgs/tools/audio/yabridgectl/default.nix @@ -6,12 +6,12 @@ rustPlatform.buildRustPackage rec { src = yabridge.src; sourceRoot = "source/tools/yabridgectl"; - cargoHash = "sha256-YSK1DWv9kb6kFUJ4UEhh6psKsVqwpFJjvjJgj2e4BAc="; + cargoHash = "sha256-mSp/IH7ZB7YSOBCFwNtHLYDz7CvWo2sO9VuPdqpl/u0="; patches = [ # By default, yabridgectl locates libyabridge.so by using - # hard-coded distro-specific lib paths. This patch replaces those - # hard coded paths with lib paths from NIX_PROFILE. + # hard coded distro specific lib paths. This patch replaces those + # hard coded paths with lib paths from NIX_PROFILES. ./libyabridge-from-nix-profiles.patch ]; diff --git a/third_party/nixpkgs/pkgs/tools/backup/borgmatic/default.nix b/third_party/nixpkgs/pkgs/tools/backup/borgmatic/default.nix new file mode 100644 index 0000000000..4913ca29cb --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/backup/borgmatic/default.nix @@ -0,0 +1,50 @@ +{ borgbackup, coreutils, lib, python3Packages, systemd }: + +python3Packages.buildPythonApplication rec { + pname = "borgmatic"; + version = "1.5.12"; + + src = python3Packages.fetchPypi { + inherit pname version; + sha256 = "sha256-XLbBJvNRmH8W9SnOjF7zUbazRYFCMW6SEO2wKN/2VTY="; + }; + + checkInputs = with python3Packages; [ flexmock pytestCheckHook pytest-cov ]; + + # - test_borgmatic_version_matches_news_version + # The file NEWS not available on the pypi source, and this test is useless + # - test_collect_configuration_run_summary_logs_outputs_merged_json_results + # Upstream fixed in the next version, see + # https://github.com/witten/borgmatic/commit/ea6cd53067435365a96786b006aec391714501c4 + disabledTests = [ + "test_borgmatic_version_matches_news_version" + "test_collect_configuration_run_summary_logs_outputs_merged_json_results" + ]; + + propagatedBuildInputs = with python3Packages; [ + borgbackup + colorama + pykwalify + ruamel_yaml + requests + setuptools + ]; + + postInstall = '' + mkdir -p $out/lib/systemd/system + cp sample/systemd/borgmatic.timer $out/lib/systemd/system/ + substitute sample/systemd/borgmatic.service \ + $out/lib/systemd/system/borgmatic.service \ + --replace /root/.local/bin/borgmatic $out/bin/borgmatic \ + --replace systemd-inhibit ${systemd}/bin/systemd-inhibit \ + --replace sleep ${coreutils}/bin/sleep + ''; + + meta = with lib; { + description = "Simple, configuration-driven backup software for servers and workstations"; + homepage = "https://torsion.org/borgmatic/"; + license = licenses.gpl3Plus; + platforms = platforms.linux; + maintainers = with maintainers; [ imlonghao ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/mtdutils/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/mtdutils/default.nix index d753e7c520..cb40e72c30 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/mtdutils/default.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/mtdutils/default.nix @@ -2,29 +2,28 @@ stdenv.mkDerivation rec { pname = "mtd-utils"; - version = "2.1.1"; + version = "2.1.2"; src = fetchurl { url = "ftp://ftp.infradead.org/pub/${pname}/${pname}-${version}.tar.bz2"; - sha256 = "1lijl89l7hljx8xx70vrz9srd3h41v5gh4b0lvqnlv831yvyh5cd"; + sha256 = "sha256-itTF80cW1AZGqihySi9WFtMlpvEZJU+RTiaXbx926dY="; }; nativeBuildInputs = [ autoreconfHook pkg-config ] ++ lib.optional doCheck cmocka; buildInputs = [ acl libuuid lzo zlib zstd ]; - configureFlags = [ - (lib.enableFeature doCheck "unit-tests") - (lib.enableFeature doCheck "tests") + configureFlags = with lib; [ + (enableFeature doCheck "unit-tests") + (enableFeature doCheck "tests") ]; - enableParallelBuilding = true; doCheck = stdenv.hostPlatform == stdenv.buildPlatform; - meta = { + meta = with lib; { description = "Tools for MTD filesystems"; - license = lib.licenses.gpl2Plus; + license = licenses.gpl2Plus; homepage = "http://www.linux-mtd.infradead.org/"; - maintainers = with lib.maintainers; [ viric ]; - platforms = with lib.platforms; linux; + maintainers = with maintainers; [ viric superherointj ]; + platforms = with platforms; linux; }; } diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/unionfs-fuse/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/unionfs-fuse/default.nix index 77f45d06c9..6af582d91a 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/unionfs-fuse/default.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/unionfs-fuse/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, fuse }: +{ lib, stdenv, fetchFromGitHub, cmake, fuse, osxfuse }: stdenv.mkDerivation rec { pname = "unionfs-fuse"; @@ -11,16 +11,23 @@ stdenv.mkDerivation rec { sha256 = "0bwx70x834qgqh53vqp18bhbxbsny80hz922rbgj8k9wj7cbfilm"; }; - patches = - [ # Prevent the unionfs daemon from being killed during - # shutdown. See - # http://www.freedesktop.org/wiki/Software/systemd/RootStorageDaemons/ - # for details. - ./prevent-kill-on-shutdown.patch - ]; + patches = [ + # Prevent the unionfs daemon from being killed during + # shutdown. See + # http://www.freedesktop.org/wiki/Software/systemd/RootStorageDaemons/ + # for details. + ./prevent-kill-on-shutdown.patch + ]; + + postPatch = lib.optionalString stdenv.isDarwin '' + substituteInPlace CMakeLists.txt \ + --replace '/usr/local/include/osxfuse/fuse' '${osxfuse}/include/osxfuse/fuse' + substituteInPlace src/CMakeLists.txt \ + --replace 'target_link_libraries(unionfs fuse pthread)' 'target_link_libraries(unionfs osxfuse pthread)' + ''; nativeBuildInputs = [ cmake ]; - buildInputs = [ fuse ]; + buildInputs = [ (if stdenv.isDarwin then osxfuse else fuse) ]; # Put the unionfs mount helper in place as mount.unionfs-fuse. This makes it # possible to do: @@ -28,7 +35,7 @@ stdenv.mkDerivation rec { # # This must be done in preConfigure because the build process removes # helper from the source directory during the build. - preConfigure = '' + preConfigure = lib.optionalString (!stdenv.isDarwin) '' mkdir -p $out/sbin cp -a mount.unionfs $out/sbin/mount.unionfs-fuse substituteInPlace $out/sbin/mount.unionfs-fuse --replace mount.fuse ${fuse}/sbin/mount.fuse @@ -39,7 +46,7 @@ stdenv.mkDerivation rec { description = "FUSE UnionFS implementation"; homepage = "https://github.com/rpodgorny/unionfs-fuse"; license = licenses.bsd3; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = with maintainers; [ orivej ]; }; } diff --git a/third_party/nixpkgs/pkgs/tools/misc/cutecom/default.nix b/third_party/nixpkgs/pkgs/tools/misc/cutecom/default.nix index e109b12f28..b3d412b8fd 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/cutecom/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/cutecom/default.nix @@ -11,14 +11,17 @@ mkDerivation rec { sha256 = "X8jeESt+x5PxK3rTNC1h1Tpvue2WH09QRnG2g1eMoEE="; }; - preConfigure = '' - substituteInPlace CMakeLists.txt \ - --replace "#find_package(Serialport REQUIRED)" "find_package(Qt5SerialPort REQUIRED)" - ''; - buildInputs = [ qtbase qtserialport ]; nativeBuildInputs = [ cmake ]; + postInstall = '' + cd .. + mkdir -p "$out"/share/{applications,icons/hicolor/scalable/apps,man/man1} + cp cutecom.desktop "$out/share/applications" + cp images/cutecom.svg "$out/share/icons/hicolor/scalable/apps" + cp cutecom.1 "$out/share/man/man1" + ''; + meta = with lib; { description = "A graphical serial terminal"; homepage = "https://gitlab.com/cutecom/cutecom/"; diff --git a/third_party/nixpkgs/pkgs/tools/misc/fselect/default.nix b/third_party/nixpkgs/pkgs/tools/misc/fselect/default.nix index 963063710a..2350fd6afe 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/fselect/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/fselect/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchFromGitHub, rustPlatform, installShellFiles }: +{ lib, stdenv, fetchFromGitHub, rustPlatform, installShellFiles, libiconv }: rustPlatform.buildRustPackage rec { pname = "fselect"; @@ -14,6 +14,7 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "sha256-vVIanMkc0sPzu0L48oOh8wEEUOckR/AYkz81u4OR+fE="; nativeBuildInputs = [ installShellFiles ]; + buildInputs = lib.optional stdenv.isDarwin libiconv; postInstall = '' installManPage docs/fselect.1 diff --git a/third_party/nixpkgs/pkgs/tools/misc/goreleaser/default.nix b/third_party/nixpkgs/pkgs/tools/misc/goreleaser/default.nix index f3dd909d22..b164c8c0ae 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/goreleaser/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/goreleaser/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "goreleaser"; - version = "0.158.0"; + version = "0.159.0"; src = fetchFromGitHub { owner = "goreleaser"; repo = pname; rev = "v${version}"; - sha256 = "sha256-ewwJHn55zzry2hhMNuRUlGwC995r0ooPJGqKYaCh4WE="; + sha256 = "sha256-02uM37tulJ78IwOAqXm5Ym30kHVepnMBVg+eTMj34qQ="; }; - vendorSha256 = "sha256-awgkYMidTDcUjQt7hA5cSiwSAsNo5iUqKcG4+2lCXIM="; + vendorSha256 = "sha256-whcHI/qkNBPYcR5WLWQCPdHiwYdLEOgorbAKTTYIWDk="; buildFlagsArray = [ "-ldflags=" diff --git a/third_party/nixpkgs/pkgs/tools/misc/lorri/default.nix b/third_party/nixpkgs/pkgs/tools/misc/lorri/default.nix index a705543793..9635b6b423 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/lorri/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/lorri/default.nix @@ -12,10 +12,10 @@ let # Run `eval $(nix-build -A lorri.updater)` after updating the revision! - version = "1.3"; - gitRev = "a26745e404c3a201fe98af4c000bb27f910542b1"; - sha256 = "0gfkqvla2cphyhnl5xw19yf1v4pvwsvphr019y5r914cwqwnkb92"; - cargoSha256 = "1a1alhpivlmxy8iv0ki7s0b8hf3hadashf81rzn207wn3yihsnaf"; + version = "1.3.1"; + gitRev = "df83b9b175fecc8ec8b02096c5cfe2db3d00b92e"; + sha256 = "1df6p0b482vhymw3z7gimc441jr7aix9lhdbcm5wjvw9f276016f"; + cargoSha256 = "1f9b2h3zakw7qmlnc4rqhxnw80sl5h4mj8cghr82iacxwqz499ql"; in (rustPlatform.buildRustPackage rec { pname = "lorri"; diff --git a/third_party/nixpkgs/pkgs/tools/misc/mongodb-compass/default.nix b/third_party/nixpkgs/pkgs/tools/misc/mongodb-compass/default.nix index 9d2e64d6b7..8ede051048 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/mongodb-compass/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/mongodb-compass/default.nix @@ -3,7 +3,7 @@ , gnome2, gdk-pixbuf, gtk3, pango, libnotify, libsecret, libuuid, libxcb, nspr, nss, systemd, xorg, wrapGAppsHook }: let - version = "1.24.6"; + version = "1.25.0"; rpath = lib.makeLibraryPath [ alsaLib @@ -49,7 +49,7 @@ let if stdenv.hostPlatform.system == "x86_64-linux" then fetchurl { url = "https://downloads.mongodb.com/compass/mongodb-compass_${version}_amd64.deb"; - sha256 = "sha256-GTMJ3Mu0vym2u4uZcq5LnbOod1yanCWHbGLXjVq30Hc="; + sha256 = "sha256-998/voQ04fLj3KZCy6BueUoI1v++4BoGRTGJT7Nsv40="; } else throw "MongoDB compass is not supported on ${stdenv.hostPlatform.system}"; diff --git a/third_party/nixpkgs/pkgs/tools/misc/tmuxp/default.nix b/third_party/nixpkgs/pkgs/tools/misc/tmuxp/default.nix index 57d320fd79..9e97f0d892 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/tmuxp/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/tmuxp/default.nix @@ -4,11 +4,11 @@ with python.pkgs; buildPythonApplication rec { pname = "tmuxp"; - version = "1.7.0"; + version = "1.7.2"; src = fetchPypi { inherit pname version; - sha256 = "e5135d07a8944170e39ea8b96b09123c54648cca94537b4953d8f15e5a537da2"; + sha256 = "14296b62db260420d4600dcd805408ea908b3a78d4ea0a6a403d092fdbf6d075"; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/tools/misc/tremor-rs/default.nix b/third_party/nixpkgs/pkgs/tools/misc/tremor-rs/default.nix index 0db042120c..fb1268acc6 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/tremor-rs/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/tremor-rs/default.nix @@ -33,8 +33,7 @@ rustPlatform.buildRustPackage rec { cargoBuildFlags = [ "--all" ]; meta = with lib; { - description = - "Early stage event processing system for unstructured data with rich support for structural pattern matching, filtering and transformation"; + description = "Early stage event processing system for unstructured data with rich support for structural pattern matching, filtering and transformation"; homepage = "https://www.tremor.rs/"; license = licenses.asl20; platforms = [ "x86_64-linux" ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/uutils-coreutils/default.nix b/third_party/nixpkgs/pkgs/tools/misc/uutils-coreutils/default.nix index 44871b07a8..fd195ab184 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/uutils-coreutils/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/uutils-coreutils/default.nix @@ -1,21 +1,22 @@ { stdenv, fetchFromGitHub, rustPlatform, cargo, cmake, sphinx, lib, prefix ? "uutils-" , Security }: + rustPlatform.buildRustPackage rec { pname = "uutils-coreutils"; - version = "0.0.3"; + version = "0.0.4"; src = fetchFromGitHub { owner = "uutils"; repo = "coreutils"; rev = version; - sha256 = "QWiEHk8aciiwQeyNgrr0M0c1EeAgE3gSqw0ly/YTwTQ="; + sha256 = "sha256-z5lDKJpFxXDCQq+0Da/63GGoUXacy5TSn+1gJiMvicc="; }; # too many impure/platform-dependent tests doCheck = false; - cargoSha256 = "m2a7WNkF5TxjJlytjdoQ/JZIF9gp9qBkH+UU/NVRJzA="; + cargoSha256 = "sha256-x/nn2JNe8x+I0G2Vbr2PZAHCghwLBDhKAhkHPQFeL0M="; makeFlags = [ "CARGO=${cargo}/bin/cargo" "PREFIX=$(out)" "PROFILE=release" "INSTALLDIR_MAN=$(out)/share/man/man1" ] diff --git a/third_party/nixpkgs/pkgs/tools/misc/ytfzf/default.nix b/third_party/nixpkgs/pkgs/tools/misc/ytfzf/default.nix index bf64e858d2..9feecb5891 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/ytfzf/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/ytfzf/default.nix @@ -12,26 +12,21 @@ stdenv.mkDerivation rec { pname = "ytfzf"; - version = "1.0.0"; + version = "1.0.1"; src = fetchFromGitHub { owner = "pystardust"; repo = "ytfzf"; rev = "v${version}"; - sha256 = "09znixn8mpkxipv2x3nrfxr2i8g7y58v25qssqf092j9lh85sf9h"; + sha256 = "1i9ya38zcaj1vkfgy1n4gp5vqb59zlrd609pdmz4jqinrb0c5fgv"; }; nativeBuildInputs = [ makeWrapper ]; - makeFlags = [ "PREFIX=${placeholder "out"}" ]; + makeFlags = [ "PREFIX=${placeholder "out"}/bin" ]; dontBuild = true; - # remove after next update - preInstall = '' - mkdir -p "$out/bin" - ''; - postInstall = '' wrapProgram "$out/bin/ytfzf" --prefix PATH : ${lib.makeBinPath [ curl dmenu fzf jq mpv youtube-dl diff --git a/third_party/nixpkgs/pkgs/tools/networking/clash/default.nix b/third_party/nixpkgs/pkgs/tools/networking/clash/default.nix index 2091a4aa54..ede7dce272 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/clash/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/clash/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "clash"; - version = "1.4.1"; + version = "1.4.2"; src = fetchFromGitHub { owner = "Dreamacro"; repo = pname; rev = "v${version}"; - sha256 = "sha256-T6oBdhBX850GXb19MTOFVo9LRfOgCyMW3GIljMMeGmg="; + sha256 = "sha256-ObnlcKTuO/yFNMXLwGvRTLnz18bNquq6dye2qpL7+VM="; }; - vendorSha256 = "sha256-HqlHUVWwvO15nitpwIh/u0GfF8wqJqkviyxOp7QHYz8="; + vendorSha256 = "sha256-6ZQMDXc2NFs6l/DWPPCFJ+c40764hXzFTdi1Pxk1fnU="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/tools/networking/croc/default.nix b/third_party/nixpkgs/pkgs/tools/networking/croc/default.nix index 79f78c8fff..b2710a2c33 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/croc/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/croc/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "croc"; - version = "8.6.8"; + version = "8.6.10"; src = fetchFromGitHub { owner = "schollz"; repo = pname; rev = "v${version}"; - sha256 = "sha256-ierNKZ14F3EKtQRdOd7D4jhaA7M6zwnFVSk6aUh4VPc="; + sha256 = "sha256-/JS173hIW3doDCP/5v8dUSEW44pyq6VdF17Za6JWtys="; }; - vendorSha256 = "sha256-F/Vxl9Z5LgAmnRt/FOdW9eVN7IVb1ZEKiYOSpT9+L0E="; + vendorSha256 = "sha256-5UaOFTm72RG/xsShliU32Vp6qNANDyAotbaRYyan87U="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/tools/networking/dnsproxy/default.nix b/third_party/nixpkgs/pkgs/tools/networking/dnsproxy/default.nix index 53104ef1a4..8cf669494d 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/dnsproxy/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/dnsproxy/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "dnsproxy"; - version = "0.35.2"; + version = "0.35.5"; src = fetchFromGitHub { owner = "AdguardTeam"; repo = pname; rev = "v${version}"; - sha256 = "sha256-XOTHvI80WMn5j52+N/bR/NfaPX9v6cRB2VCVWJ6fJw8="; + sha256 = "sha256-DScN/swigecdhucxhfP1mNr2mDX6HbY2dktkN8BxBjI="; }; vendorSha256 = null; diff --git a/third_party/nixpkgs/pkgs/tools/networking/gping/default.nix b/third_party/nixpkgs/pkgs/tools/networking/gping/default.nix index 329302ae35..33ea36da38 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/gping/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/gping/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "gping"; - version = "1.2.0-post"; + version = "1.2.1"; src = fetchFromGitHub { owner = "orf"; repo = "gping"; rev = "v${version}"; - sha256 = "0h4cd36lrhr64p3m2l7yvkq22h8fzzm3g61m39d303s1viibm6dg"; + sha256 = "sha256-lApm1JLXNjDKLj6zj25OaZDVp7lLW3qyrDsvJrudl8I="; }; - cargoSha256 = "0aadalgs5p7wqbbkidm49ccfl716xairb4pirrgm3749zdg55bi9"; + cargoSha256 = "sha256-2PxhtAqROgufVGGH7VtEJJU6Sa2OrGbbMVRUWYbAD0Q="; meta = with lib; { description = "Ping, but with a graph"; diff --git a/third_party/nixpkgs/pkgs/tools/networking/kea/default.nix b/third_party/nixpkgs/pkgs/tools/networking/kea/default.nix index 064aa162fb..ba1be39aeb 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/kea/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/kea/default.nix @@ -12,11 +12,11 @@ stdenv.mkDerivation rec { pname = "kea"; - version = "1.9.3"; + version = "1.9.5"; src = fetchurl { url = "https://ftp.isc.org/isc/${pname}/${version}/${pname}-${version}.tar.gz"; - sha256 = "sha256-gEuEbqvy/YpXfNkeNcaobI5gH2AvlL6E/lm2HfPATZ8="; + sha256 = "sha256-MkoG9IhkW+5YfkmkXUkbUl9TQXxWshnxyzdGH979nZE="; }; patches = [ ./dont-create-var.patch ]; diff --git a/third_party/nixpkgs/pkgs/tools/networking/minio-client/default.nix b/third_party/nixpkgs/pkgs/tools/networking/minio-client/default.nix index a6c50e4620..bdec1b2b4a 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/minio-client/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/minio-client/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "minio-client"; - version = "2021-02-19T05-34-40Z"; + version = "2021-03-10T05-59-20Z"; src = fetchFromGitHub { owner = "minio"; repo = "mc"; rev = "RELEASE.${version}"; - sha256 = "sha256-tkNGWX0QyMlMw+wB8wkYuGfveln6NUoIBLPscRHnQT4="; + sha256 = "sha256-IoCM2FA6oNiNT6zWspMEqgq4hZ8tAQVEAqouRlBe/ts="; }; - vendorSha256 = "sha256-6l8VcHTSZBbFe96rzumMCPIVFVxUMIWoqiBGMtrx75U="; + vendorSha256 = "sha256-aoRdtv/Q7vjn0M7iSYAuyu/3pEH30x6D39xTHqQPvuo="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/tools/networking/privoxy/default.nix b/third_party/nixpkgs/pkgs/tools/networking/privoxy/default.nix index 85a8cd5d76..9fce8d7a5f 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/privoxy/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/privoxy/default.nix @@ -1,4 +1,9 @@ -{ lib, stdenv, fetchurl, autoreconfHook, zlib, pcre, w3m, man }: +{ lib, stdenv +, nixosTests +, fetchurl, autoreconfHook +, zlib, pcre, w3m, man +, mbedtls, brotli +}: stdenv.mkDerivation rec { @@ -13,18 +18,28 @@ stdenv.mkDerivation rec { hardeningEnable = [ "pie" ]; nativeBuildInputs = [ autoreconfHook w3m man ]; - buildInputs = [ zlib pcre ]; + buildInputs = [ zlib pcre mbedtls brotli ]; - makeFlags = [ "STRIP="]; + makeFlags = [ "STRIP=" ]; + configureFlags = [ + "--with-mbedtls" + "--with-brotli" + "--enable-external-filters" + "--enable-compression" + ]; postInstall = '' - rm -rf $out/var + rm -r $out/var ''; + passthru.tests.privoxy = nixosTests.privoxy; + meta = with lib; { homepage = "https://www.privoxy.org/"; description = "Non-caching web proxy with advanced filtering capabilities"; - license = licenses.gpl2Plus; + # When linked with mbedtls, the license becomes GPLv3 (or later), otherwise + # GPLv2 (or later). See https://www.privoxy.org/user-manual/copyright.html + license = licenses.gpl3Plus; platforms = platforms.all; maintainers = [ maintainers.phreedom ]; }; diff --git a/third_party/nixpkgs/pkgs/tools/networking/ripmime/default.nix b/third_party/nixpkgs/pkgs/tools/networking/ripmime/default.nix index d40c1d10aa..0dfeb900c9 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/ripmime/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/ripmime/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl }: +{ lib, stdenv, fetchurl, libiconv }: stdenv.mkDerivation rec { pname = "ripmime"; @@ -8,6 +8,7 @@ stdenv.mkDerivation rec { sha256 = "0sj06ibmlzy34n8v0mnlq2gwidy7n2aqcwgjh0xssz3vi941aqc9"; }; + buildInputs = [ libiconv ]; preInstall = '' sed -i Makefile -e "s@LOCATION=.*@LOCATION=$out@" -e "s@man/man1@share/&@" mkdir -p "$out/bin" "$out/share/man/man1" @@ -19,7 +20,7 @@ stdenv.mkDerivation rec { description = "Attachment extractor for MIME messages"; maintainers = with maintainers; [ raskin ]; homepage = "http://www.pldaniels.com/ripmime/"; - platforms = platforms.linux; + platforms = platforms.all; }; passthru = { diff --git a/third_party/nixpkgs/pkgs/tools/networking/wget/default.nix b/third_party/nixpkgs/pkgs/tools/networking/wget/default.nix index 3ac71ca37e..3427cd186c 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/wget/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/wget/default.nix @@ -6,11 +6,11 @@ stdenv.mkDerivation rec { pname = "wget"; - version = "1.20.3"; + version = "1.21.1"; src = fetchurl { url = "mirror://gnu/wget/${pname}-${version}.tar.lz"; - sha256 = "1frajd86ds8vz2hprq30wq8ya89z9dcxnwm8nwk12bbc47l7qq39"; + sha256 = "sha256-25u+U0fm+qBvx4gF7rgIsmiXlFXq2QA6YIVpydT8kK0="; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/tools/networking/whois/default.nix b/third_party/nixpkgs/pkgs/tools/networking/whois/default.nix index f8613beb93..55a356e329 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/whois/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/whois/default.nix @@ -1,14 +1,14 @@ { lib, stdenv, fetchFromGitHub, perl, gettext, pkg-config, libidn2, libiconv }: stdenv.mkDerivation rec { - version = "5.5.6"; + version = "5.5.8"; pname = "whois"; src = fetchFromGitHub { owner = "rfc1036"; repo = "whois"; rev = "v${version}"; - sha256 = "0iqbn2ky9j7qdpv5hycy56knnfhl8nz4l4905rnr0p703lvxxx8d"; + sha256 = "sha256-WSAqJMVeHkcqzcgwvFKKBXJiIfKXBQr2mjioG7CgkIo="; }; nativeBuildInputs = [ perl gettext pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/tools/package-management/nix/default.nix b/third_party/nixpkgs/pkgs/tools/package-management/nix/default.nix index 9ab08007ec..9c0beb224d 100644 --- a/third_party/nixpkgs/pkgs/tools/package-management/nix/default.nix +++ b/third_party/nixpkgs/pkgs/tools/package-management/nix/default.nix @@ -13,7 +13,7 @@ common = , bash, coreutils, gzip, gnutar , pkg-config, boehmgc, perlPackages, libsodium, brotli, boost, editline, nlohmann_json , autoreconfHook, autoconf-archive, bison, flex - , jq, libarchive + , jq, libarchive, libcpuid , lowdown, mdbook # Used by tests , gmock @@ -55,7 +55,7 @@ common = ] ++ lib.optionals stdenv.isDarwin [ Security ] ++ lib.optional (stdenv.isLinux || stdenv.isDarwin) libsodium - ++ lib.optionals is24 [ libarchive gmock lowdown ] + ++ lib.optionals is24 [ libarchive gmock lowdown libcpuid ] ++ lib.optional withLibseccomp libseccomp ++ lib.optional withAWS ((aws-sdk-cpp.override { @@ -212,28 +212,15 @@ in rec { nixUnstable = lib.lowPrio (callPackage common rec { name = "nix-2.4${suffix}"; - suffix = "pre20201205_a5d85d0"; + suffix = "pre20210308_1c0e3e4"; src = fetchFromGitHub { owner = "NixOS"; repo = "nix"; - rev = "a5d85d07faa94cf3518e98273be4bee3d495f06a"; - sha256 = "0g9jjhh0vs4hjrff5yx88x6sh7rk87ngvni3gnyxajqia957dipg"; + rev = "1c0e3e453d41b869e4ac7e25dc1c00c349a7c411"; + sha256 = "17killwp42d25f17yq2jida64j7d0ipz6zish78iqi450yrd9wrd"; }; - patches = [ - (fetchpatch { # Fix build on gcc10 - url = "https://github.com/NixOS/nix/commit/d4870462f8f539adeaa6dca476aff6f1f31e1981.patch"; - sha256 = "mTvLvuxb2QVybRDgntKMq+b6da/s3YgM/ll2rWBeY/Y="; - }) - # Fix the ETag bug. PR merged. Remove when updating to >= 20210125 - # https://github.com/NixOS/nixpkgs/pull/109309#issuecomment-768331750 - (fetchpatch { - url = "https://github.com/NixOS/nix/commit/c5b42c5a42138329c6d02da0d8a53cb59c6077f4.patch"; - sha256 = "sha256-d4RNOKMxa4NMbFgYcqWRv2ByHt8F/XUWV+6P9qHz7S4="; - }) - ]; - inherit storeDir stateDir confDir boehmgc; }); diff --git a/third_party/nixpkgs/pkgs/tools/security/bundler-audit/Gemfile.lock b/third_party/nixpkgs/pkgs/tools/security/bundler-audit/Gemfile.lock index f130b57912..c0610480c7 100644 --- a/third_party/nixpkgs/pkgs/tools/security/bundler-audit/Gemfile.lock +++ b/third_party/nixpkgs/pkgs/tools/security/bundler-audit/Gemfile.lock @@ -1,10 +1,10 @@ GEM remote: https://rubygems.org/ specs: - bundler-audit (0.7.0.1) + bundler-audit (0.8.0) bundler (>= 1.2.0, < 3) - thor (>= 0.18, < 2) - thor (1.0.1) + thor (~> 1.0) + thor (1.1.0) PLATFORMS ruby diff --git a/third_party/nixpkgs/pkgs/tools/security/bundler-audit/gemset.nix b/third_party/nixpkgs/pkgs/tools/security/bundler-audit/gemset.nix index c543920549..ff4d6da806 100644 --- a/third_party/nixpkgs/pkgs/tools/security/bundler-audit/gemset.nix +++ b/third_party/nixpkgs/pkgs/tools/security/bundler-audit/gemset.nix @@ -5,19 +5,19 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "04l9rs56rlvihbr2ybkrigjajgd3swa98lxvmdl8iylj1g5m7n0j"; + sha256 = "00l8rs7cna0j3yh4s9sza0r88x7kjc7j4gp9yl378422k7i0r73v"; type = "gem"; }; - version = "0.7.0.1"; + version = "0.8.0"; }; thor = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1xbhkmyhlxwzshaqa7swy2bx6vd64mm0wrr8g3jywvxy7hg0cwkm"; + sha256 = "18yhlvmfya23cs3pvhr1qy38y41b6mhr5q9vwv5lrgk16wmf3jna"; type = "gem"; }; - version = "1.0.1"; + version = "1.1.0"; }; } diff --git a/third_party/nixpkgs/pkgs/tools/security/gitleaks/default.nix b/third_party/nixpkgs/pkgs/tools/security/gitleaks/default.nix index 66d4c23def..9e34b07121 100644 --- a/third_party/nixpkgs/pkgs/tools/security/gitleaks/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/gitleaks/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "gitleaks"; - version = "7.2.2"; + version = "7.3.0"; src = fetchFromGitHub { owner = "zricethezav"; repo = pname; rev = "v${version}"; - sha256 = "sha256-G/7Ezyfp9vkG1QHTG9Xg6mZ3qhQpx952i7rsSr3fFwY="; + sha256 = "sha256-IJaumIFuIhrvXZ45uz8RUxAuprnWdv2lNzxNUascvVc="; }; - vendorSha256 = "0kk8ci7vprqw4v7cigspshfd13k2wyy4pdkxf11pqc2fz8j07kh9"; + vendorSha256 = "sha256-Cc4DJPpOMHxDcH22S7znYo7QHNRXv8jOJhznu09kaE4="; preBuild = '' buildFlagsArray+=("-ldflags" "-s -w -X github.com/zricethezav/gitleaks/v${lib.versions.major version}/version.Version=${version}") diff --git a/third_party/nixpkgs/pkgs/tools/security/hashcat-utils/default.nix b/third_party/nixpkgs/pkgs/tools/security/hashcat-utils/default.nix index 8b91a53db0..ccd6230b06 100644 --- a/third_party/nixpkgs/pkgs/tools/security/hashcat-utils/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/hashcat-utils/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { description = "Small utilities that are useful in advanced password cracking"; homepage = "https://github.com/hashcat/hashcat-utils"; license = licenses.mit; - platforms = platforms.linux; + platforms = platforms.unix; maintainers = with maintainers; [ fadenb ]; }; } diff --git a/third_party/nixpkgs/pkgs/tools/security/hcxtools/default.nix b/third_party/nixpkgs/pkgs/tools/security/hcxtools/default.nix index 20e28fa125..9478844055 100644 --- a/third_party/nixpkgs/pkgs/tools/security/hcxtools/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/hcxtools/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "hcxtools"; - version = "6.1.5"; + version = "6.1.6"; src = fetchFromGitHub { owner = "ZerBea"; repo = pname; rev = version; - sha256 = "1xvr89r6287788bx5qbw9sr8jvmajps0rpc7fvh9bfzb6zw2rq6w"; + sha256 = "sha256-x6sVFjM2GMGqpoAW7CtCLUoEAYLgulaUKXequQ7DmGQ="; }; nativeBuildInputs = [ pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/tools/security/prs/default.nix b/third_party/nixpkgs/pkgs/tools/security/prs/default.nix index 197a2ba8b9..cf83a135f7 100644 --- a/third_party/nixpkgs/pkgs/tools/security/prs/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/prs/default.nix @@ -12,16 +12,16 @@ rustPlatform.buildRustPackage rec { pname = "prs"; - version = "0.2.2"; + version = "0.2.3"; src = fetchFromGitLab { owner = "timvisee"; repo = "prs"; rev = "v${version}"; - sha256 = "05l9zaaadv2a7ngwkxggp5vrjlnpvf2wr4ijhprx3jkw8b2cxii7"; + sha256 = "sha256-aulrMXKKCFo8nU6mEplcpaGGMfLr03FCgIF6rg6LqGg="; }; - cargoSha256 = "0fjkvr5mdqiy70qx4liwnh78y6mqdv6vbg3nayinh2h34p0z609y"; + cargoSha256 = "sha256-996iwBOp5F9q9/yptTHtsLj6wlY5HEpp8CWTbpBWPuA="; postPatch = '' # The GPGME backend is recommended diff --git a/third_party/nixpkgs/pkgs/tools/security/rbw/bump-security-framework-crate.patch b/third_party/nixpkgs/pkgs/tools/security/rbw/bump-security-framework-crate.patch new file mode 100644 index 0000000000..9074dd925b --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/security/rbw/bump-security-framework-crate.patch @@ -0,0 +1,19 @@ +Bump security-framework from 2.1.1 to 2.1.2 + +security-framework=2.1.1 doesn't build on Darwin 10.12. +https://github.com/kornelski/rust-security-framework/issues/124 + +--- i/Cargo.lock ++++ w/Cargo.lock +@@ -1361,9 +1361,9 @@ checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" + + [[package]] + name = "security-framework" +-version = "2.1.1" ++version = "2.1.2" + source = "registry+https://github.com/rust-lang/crates.io-index" +-checksum = "2dfd318104249865096c8da1dfabf09ddbb6d0330ea176812a62ec75e40c4166" ++checksum = "d493c5f39e02dfb062cd8f33301f90f9b13b650e8c1b1d0fd75c19dd64bff69d" + dependencies = [ + "bitflags", + "core-foundation", diff --git a/third_party/nixpkgs/pkgs/tools/security/rbw/default.nix b/third_party/nixpkgs/pkgs/tools/security/rbw/default.nix index 17c29c27cb..c1f99719d7 100644 --- a/third_party/nixpkgs/pkgs/tools/security/rbw/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/rbw/default.nix @@ -2,11 +2,11 @@ , stdenv , rustPlatform , fetchCrate -, pinentry , openssl , pkg-config , makeWrapper , Security +, libiconv # rbw-fzf , withFzf ? false, fzf, perl @@ -20,27 +20,26 @@ rustPlatform.buildRustPackage rec { pname = "rbw"; - version = "1.0.0"; # do not upgrate 1.1.0 yet, because it doesn't build on Darwin + version = "1.1.2"; src = fetchCrate { inherit version; crateName = pname; - sha256 = "0yqn65izcwbh7g085hwq4wrg9y9jlz1xbrq69b6ypqxi9abqnp6q"; + sha256 = "1xihjx4f8kgyablxsy8vgn4w6i92p2xm5ncacdk39npa5g8wadlx"; }; - cargoSha256 = "0x00clixdbpqif2wzhj3f4k9kpza623xs8a05wq4g15227kz7mlm"; + cargoSha256 = "0fvs06wd05a90dggi7n46d5gl9flnciqzg9j3ijmz3z5bb6aky1b"; + + cargoPatches = [ ./bump-security-framework-crate.patch ]; nativeBuildInputs = [ pkg-config makeWrapper ]; - buildInputs = lib.optionals stdenv.isDarwin [ Security ]; + buildInputs = lib.optionals stdenv.isDarwin [ Security libiconv ]; - postPatch = '' - substituteInPlace src/pinentry.rs \ - --replace 'Command::new("pinentry")' 'Command::new("${pinentry}/${pinentry.binaryPath or "bin/pinentry"}")' - '' + lib.optionalString withFzf '' + postPatch = lib.optionalString withFzf '' patchShebangs bin/rbw-fzf substituteInPlace bin/rbw-fzf \ --replace fzf ${fzf}/bin/fzf \ diff --git a/third_party/nixpkgs/pkgs/tools/security/theharvester/default.nix b/third_party/nixpkgs/pkgs/tools/security/theharvester/default.nix index 7a03649859..02e83296c6 100644 --- a/third_party/nixpkgs/pkgs/tools/security/theharvester/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/theharvester/default.nix @@ -5,13 +5,13 @@ python3.pkgs.buildPythonApplication rec { pname = "theHarvester"; - version = "3.2.2"; + version = "3.2.3"; src = fetchFromGitHub { owner = "laramies"; repo = pname; - rev = "V${version}"; - sha256 = "0lxzxfa9wbzim50d2jmd27i57szd0grm1dfayhnym86jn01qpvn3"; + rev = version; + sha256 = "02jhk34znpvq522pqr3x4c0rljw37x62znwycijf1zx81dpbn4rm"; }; propagatedBuildInputs = with python3.pkgs; [ diff --git a/third_party/nixpkgs/pkgs/tools/security/uddup/default.nix b/third_party/nixpkgs/pkgs/tools/security/uddup/default.nix new file mode 100644 index 0000000000..60c3609738 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/security/uddup/default.nix @@ -0,0 +1,35 @@ +{ lib +, buildPythonApplication +, colorama +, fetchFromGitHub +, pytestCheckHook +}: + +buildPythonApplication rec { + pname = "uddup"; + version = "0.9.3"; + + src = fetchFromGitHub { + owner = "rotemreiss"; + repo = pname; + rev = "v${version}"; + sha256 = "1f5dm3772hiik9irnyvbs7wygcafbwi7czw3b47cwhb90b8fi5hg"; + }; + + propagatedBuildInputs = [ + colorama + ]; + + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ "uddup" ]; + + meta = with lib; { + description = "Tool for de-duplication URLs"; + homepage = "https://github.com/rotemreiss/uddup"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/security/wipe/default.nix b/third_party/nixpkgs/pkgs/tools/security/wipe/default.nix index 2c3c9376f6..5b0f079e5a 100644 --- a/third_party/nixpkgs/pkgs/tools/security/wipe/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/wipe/default.nix @@ -15,7 +15,7 @@ stdenv.mkDerivation rec { description = "Secure file wiping utility"; homepage = "http://wipe.sourceforge.net/"; license = licenses.gpl2; - platforms = platforms.linux; + platforms = platforms.all; maintainers = [ maintainers.abbradar ]; }; } diff --git a/third_party/nixpkgs/pkgs/tools/system/bfs/default.nix b/third_party/nixpkgs/pkgs/tools/system/bfs/default.nix index 7ea7430e95..8ee30317be 100644 --- a/third_party/nixpkgs/pkgs/tools/system/bfs/default.nix +++ b/third_party/nixpkgs/pkgs/tools/system/bfs/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "bfs"; - version = "2.1"; + version = "2.2"; src = fetchFromGitHub { repo = "bfs"; owner = "tavianator"; rev = version; - sha256 = "1iricyigm0rsc8fr91vk3krvyafbnp0y3ww1rjv94l6jbdl7rrlb"; + sha256 = "sha256-YxQBKXjYITVy8c6DJ3GwDR0ESgzghqJCcj1GEv8Lp2Q="; }; buildInputs = lib.optionals stdenv.isLinux [ libcap acl ]; diff --git a/third_party/nixpkgs/pkgs/tools/system/gdu/default.nix b/third_party/nixpkgs/pkgs/tools/system/gdu/default.nix index c6f4d5dc58..46ba57cea1 100644 --- a/third_party/nixpkgs/pkgs/tools/system/gdu/default.nix +++ b/third_party/nixpkgs/pkgs/tools/system/gdu/default.nix @@ -7,13 +7,13 @@ buildGoModule rec { pname = "gdu"; - version = "4.7.0"; + version = "4.8.0"; src = fetchFromGitHub { owner = "dundee"; repo = pname; rev = "v${version}"; - sha256 = "sha256-HIVLerSx0XLMvRRJUUGT1M50DbSsFNutOSM5HTTV9mc="; + sha256 = "sha256-3u3tsUwxj7lzqoydycIoYSd7ifb9pLlehDA3NwvzPOo="; }; vendorSha256 = "sha256-QiO5p0x8kmIN6f0uYS0IR2MlWtRYTHeZpW6Nmupjias="; diff --git a/third_party/nixpkgs/pkgs/tools/system/stress-ng/default.nix b/third_party/nixpkgs/pkgs/tools/system/stress-ng/default.nix index 6eae792fa4..2e1c4e3a1f 100644 --- a/third_party/nixpkgs/pkgs/tools/system/stress-ng/default.nix +++ b/third_party/nixpkgs/pkgs/tools/system/stress-ng/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "stress-ng"; - version = "0.11.19"; + version = "0.12.04"; src = fetchurl { url = "https://kernel.ubuntu.com/~cking/tarballs/${pname}/${pname}-${version}.tar.xz"; - sha256 = "0s08qahjc68h5qhnahmb9z19l51p5sw2pmzrlknq1j5900zpa2x5"; + sha256 = "sha256-tONL2o207TfjO3qGG8Bq13y70jTWMjbaLLWPAuPzIY4="; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/tools/system/thermald/default.nix b/third_party/nixpkgs/pkgs/tools/system/thermald/default.nix index fb622d7ff4..5e42a79183 100644 --- a/third_party/nixpkgs/pkgs/tools/system/thermald/default.nix +++ b/third_party/nixpkgs/pkgs/tools/system/thermald/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation rec { pname = "thermald"; - version = "2.4.1"; + version = "2.4.3"; outputs = [ "out" "devdoc" ]; @@ -26,7 +26,7 @@ stdenv.mkDerivation rec { owner = "intel"; repo = "thermal_daemon"; rev = "v${version}"; - sha256 = "0rlac7v1b59m7gh767hkd8a0r4p001nd24786fnmryygbxynd2s6"; + sha256 = "sha256-CPrk2r3C4WG+y3KzWf6xWhfNdDgEigki62iAXu+DccU="; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/tools/system/uptimed/default.nix b/third_party/nixpkgs/pkgs/tools/system/uptimed/default.nix index 0e427a66b2..5d0d49f198 100644 --- a/third_party/nixpkgs/pkgs/tools/system/uptimed/default.nix +++ b/third_party/nixpkgs/pkgs/tools/system/uptimed/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "uptimed"; - version = "0.4.2"; + version = "0.4.3"; src = fetchFromGitHub { - sha256 = "0wnnpjfxnycigqj6hag0n6p5piss8cv40y9jda72d9s4df5n91z8"; + sha256 = "sha256-X/LnH+EWjXlw8RktfL4ckAUmP2DPV1qlb6Ii4N985cU="; rev = "v${version}"; repo = "uptimed"; owner = "rpodgorny"; @@ -23,8 +23,8 @@ stdenv.mkDerivation rec { which can also easily be used to show your records on a web page. ''; homepage = "https://github.com/rpodgorny/uptimed/"; - license = licenses.gpl2; + license = with licenses; [ gpl2Only lgpl21Plus ]; + maintainers = with maintainers; [ ]; platforms = platforms.linux; }; - } diff --git a/third_party/nixpkgs/pkgs/tools/text/fst/0001-cargo-lockfile.patch b/third_party/nixpkgs/pkgs/tools/text/fst/0001-cargo-lockfile.patch new file mode 100644 index 0000000000..c8c56ffdb6 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/text/fst/0001-cargo-lockfile.patch @@ -0,0 +1,935 @@ +From 84797e8fb8ead8822ebfd251b47c72433555860e Mon Sep 17 00:00:00 2001 +From: "Robert T. McGibbon" +Date: Fri, 5 Mar 2021 16:59:41 -0500 +Subject: [PATCH 1/1] Create cargo lock file for 0.4.5 + +--- + Cargo.lock | 916 +++++++++++++++++++++++++++++++++++++++++++++++++++++ + 1 file changed, 916 insertions(+) + create mode 100644 Cargo.lock + +diff --git a/Cargo.lock b/Cargo.lock +new file mode 100644 +index 0000000..136677d +--- /dev/null ++++ b/Cargo.lock +@@ -0,0 +1,916 @@ ++# This file is automatically @generated by Cargo. ++# It is not intended for manual editing. ++[[package]] ++name = "anyhow" ++version = "1.0.38" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "afddf7f520a80dbf76e6f50a35bca42a2331ef227a28b3b6dc5c2e2338d114b1" ++ ++[[package]] ++name = "atty" ++version = "0.2.14" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" ++dependencies = [ ++ "hermit-abi", ++ "libc", ++ "winapi", ++] ++ ++[[package]] ++name = "autocfg" ++version = "1.0.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a" ++ ++[[package]] ++name = "bit-set" ++version = "0.5.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "6e11e16035ea35e4e5997b393eacbf6f63983188f7a2ad25bfb13465f5ad59de" ++dependencies = [ ++ "bit-vec", ++] ++ ++[[package]] ++name = "bit-vec" ++version = "0.6.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "349f9b6a179ed607305526ca489b34ad0a41aed5f7980fa90eb03160b69598fb" ++ ++[[package]] ++name = "bitflags" ++version = "1.2.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" ++ ++[[package]] ++name = "bstr" ++version = "0.2.15" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "a40b47ad93e1a5404e6c18dec46b628214fee441c70f4ab5d6942142cc268a3d" ++dependencies = [ ++ "lazy_static", ++ "memchr", ++ "regex-automata", ++ "serde", ++] ++ ++[[package]] ++name = "bumpalo" ++version = "3.6.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "63396b8a4b9de3f4fdfb320ab6080762242f66a8ef174c49d8e19b674db4cdbe" ++ ++[[package]] ++name = "byteorder" ++version = "1.4.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ae44d1a3d5a19df61dd0c8beb138458ac2a53a7ac09eba97d55592540004306b" ++ ++[[package]] ++name = "cast" ++version = "0.2.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "4b9434b9a5aa1450faa3f9cb14ea0e8c53bb5d2b3c1bfd1ab4fc03e9f33fbfb0" ++dependencies = [ ++ "rustc_version", ++] ++ ++[[package]] ++name = "cfg-if" ++version = "0.1.10" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" ++ ++[[package]] ++name = "cfg-if" ++version = "1.0.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" ++ ++[[package]] ++name = "clap" ++version = "2.33.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "37e58ac78573c40708d45522f0d80fa2f01cc4f9b4e2bf749807255454312002" ++dependencies = [ ++ "bitflags", ++ "textwrap", ++ "unicode-width", ++] ++ ++[[package]] ++name = "criterion" ++version = "0.3.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ab327ed7354547cc2ef43cbe20ef68b988e70b4b593cbd66a2a61733123a3d23" ++dependencies = [ ++ "atty", ++ "cast", ++ "clap", ++ "criterion-plot", ++ "csv", ++ "itertools 0.10.0", ++ "lazy_static", ++ "num-traits", ++ "oorandom", ++ "plotters", ++ "rayon", ++ "regex", ++ "serde", ++ "serde_cbor", ++ "serde_derive", ++ "serde_json", ++ "tinytemplate", ++ "walkdir", ++] ++ ++[[package]] ++name = "criterion-plot" ++version = "0.4.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "e022feadec601fba1649cfa83586381a4ad31c6bf3a9ab7d408118b05dd9889d" ++dependencies = [ ++ "cast", ++ "itertools 0.9.0", ++] ++ ++[[package]] ++name = "crossbeam-channel" ++version = "0.4.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b153fe7cbef478c567df0f972e02e6d736db11affe43dfc9c56a9374d1adfb87" ++dependencies = [ ++ "crossbeam-utils 0.7.2", ++ "maybe-uninit", ++] ++ ++[[package]] ++name = "crossbeam-channel" ++version = "0.5.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "dca26ee1f8d361640700bde38b2c37d8c22b3ce2d360e1fc1c74ea4b0aa7d775" ++dependencies = [ ++ "cfg-if 1.0.0", ++ "crossbeam-utils 0.8.3", ++] ++ ++[[package]] ++name = "crossbeam-deque" ++version = "0.8.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "94af6efb46fef72616855b036a624cf27ba656ffc9be1b9a3c931cfc7749a9a9" ++dependencies = [ ++ "cfg-if 1.0.0", ++ "crossbeam-epoch", ++ "crossbeam-utils 0.8.3", ++] ++ ++[[package]] ++name = "crossbeam-epoch" ++version = "0.9.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "2584f639eb95fea8c798496315b297cf81b9b58b6d30ab066a75455333cf4b12" ++dependencies = [ ++ "cfg-if 1.0.0", ++ "crossbeam-utils 0.8.3", ++ "lazy_static", ++ "memoffset", ++ "scopeguard", ++] ++ ++[[package]] ++name = "crossbeam-utils" ++version = "0.7.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "c3c7c73a2d1e9fc0886a08b93e98eb643461230d5f1925e4036204d5f2e261a8" ++dependencies = [ ++ "autocfg", ++ "cfg-if 0.1.10", ++ "lazy_static", ++] ++ ++[[package]] ++name = "crossbeam-utils" ++version = "0.8.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "e7e9d99fa91428effe99c5c6d4634cdeba32b8cf784fc428a2a687f61a952c49" ++dependencies = [ ++ "autocfg", ++ "cfg-if 1.0.0", ++ "lazy_static", ++] ++ ++[[package]] ++name = "csv" ++version = "1.1.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f9d58633299b24b515ac72a3f869f8b91306a3cec616a602843a383acd6f9e97" ++dependencies = [ ++ "bstr", ++ "csv-core", ++ "itoa", ++ "ryu", ++ "serde", ++] ++ ++[[package]] ++name = "csv-core" ++version = "0.1.10" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "2b2466559f260f48ad25fe6317b3c8dac77b5bdb5763ac7d9d6103530663bc90" ++dependencies = [ ++ "memchr", ++] ++ ++[[package]] ++name = "doc-comment" ++version = "0.3.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "fea41bba32d969b513997752735605054bc0dfa92b4c56bf1189f2e174be7a10" ++ ++[[package]] ++name = "either" ++version = "1.6.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "e78d4f1cc4ae33bbfc157ed5d5a5ef3bc29227303d595861deb238fcec4e9457" ++ ++[[package]] ++name = "fnv" ++version = "1.0.7" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" ++ ++[[package]] ++name = "fst" ++version = "0.4.5" ++dependencies = [ ++ "doc-comment", ++ "fnv", ++ "memmap", ++ "quickcheck", ++ "rand 0.7.3", ++ "utf8-ranges", ++] ++ ++[[package]] ++name = "fst" ++version = "0.4.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d79238883cf0307100b90aba4a755d8051a3182305dfe7f649a1e9dc0517006f" ++dependencies = [ ++ "utf8-ranges", ++] ++ ++[[package]] ++name = "fst-bench" ++version = "0.0.1" ++dependencies = [ ++ "criterion", ++ "fnv", ++ "fst 0.4.5", ++] ++ ++[[package]] ++name = "fst-bin" ++version = "0.4.1" ++dependencies = [ ++ "anyhow", ++ "bit-set", ++ "bstr", ++ "clap", ++ "crossbeam-channel 0.4.4", ++ "csv", ++ "fst 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "memmap", ++ "num_cpus", ++ "regex-automata", ++ "serde", ++ "tempfile", ++] ++ ++[[package]] ++name = "getrandom" ++version = "0.1.16" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce" ++dependencies = [ ++ "cfg-if 1.0.0", ++ "libc", ++ "wasi 0.9.0+wasi-snapshot-preview1", ++] ++ ++[[package]] ++name = "getrandom" ++version = "0.2.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "c9495705279e7140bf035dde1f6e750c162df8b625267cd52cc44e0b156732c8" ++dependencies = [ ++ "cfg-if 1.0.0", ++ "libc", ++ "wasi 0.10.2+wasi-snapshot-preview1", ++] ++ ++[[package]] ++name = "half" ++version = "1.7.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "62aca2aba2d62b4a7f5b33f3712cb1b0692779a56fb510499d5c0aa594daeaf3" ++ ++[[package]] ++name = "hermit-abi" ++version = "0.1.18" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "322f4de77956e22ed0e5032c359a0f1273f1f7f0d79bfa3b8ffbc730d7fbcc5c" ++dependencies = [ ++ "libc", ++] ++ ++[[package]] ++name = "itertools" ++version = "0.9.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "284f18f85651fe11e8a991b2adb42cb078325c996ed026d994719efcfca1d54b" ++dependencies = [ ++ "either", ++] ++ ++[[package]] ++name = "itertools" ++version = "0.10.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "37d572918e350e82412fe766d24b15e6682fb2ed2bbe018280caa810397cb319" ++dependencies = [ ++ "either", ++] ++ ++[[package]] ++name = "itoa" ++version = "0.4.7" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "dd25036021b0de88a0aff6b850051563c6516d0bf53f8638938edbb9de732736" ++ ++[[package]] ++name = "js-sys" ++version = "0.3.48" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "dc9f84f9b115ce7843d60706df1422a916680bfdfcbdb0447c5614ff9d7e4d78" ++dependencies = [ ++ "wasm-bindgen", ++] ++ ++[[package]] ++name = "lazy_static" ++version = "1.4.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" ++ ++[[package]] ++name = "libc" ++version = "0.2.88" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "03b07a082330a35e43f63177cc01689da34fbffa0105e1246cf0311472cac73a" ++ ++[[package]] ++name = "log" ++version = "0.4.14" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "51b9bbe6c47d51fc3e1a9b945965946b4c44142ab8792c50835a980d362c2710" ++dependencies = [ ++ "cfg-if 1.0.0", ++] ++ ++[[package]] ++name = "maybe-uninit" ++version = "2.0.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "60302e4db3a61da70c0cb7991976248362f30319e88850c487b9b95bbf059e00" ++ ++[[package]] ++name = "memchr" ++version = "2.3.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "0ee1c47aaa256ecabcaea351eae4a9b01ef39ed810004e298d2511ed284b1525" ++ ++[[package]] ++name = "memmap" ++version = "0.7.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "6585fd95e7bb50d6cc31e20d4cf9afb4e2ba16c5846fc76793f11218da9c475b" ++dependencies = [ ++ "libc", ++ "winapi", ++] ++ ++[[package]] ++name = "memoffset" ++version = "0.6.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "157b4208e3059a8f9e78d559edc658e13df41410cb3ae03979c83130067fdd87" ++dependencies = [ ++ "autocfg", ++] ++ ++[[package]] ++name = "num-traits" ++version = "0.2.14" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "9a64b1ec5cda2586e284722486d802acf1f7dbdc623e2bfc57e65ca1cd099290" ++dependencies = [ ++ "autocfg", ++] ++ ++[[package]] ++name = "num_cpus" ++version = "1.13.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "05499f3756671c15885fee9034446956fff3f243d6077b91e5767df161f766b3" ++dependencies = [ ++ "hermit-abi", ++ "libc", ++] ++ ++[[package]] ++name = "oorandom" ++version = "11.1.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "0ab1bc2a289d34bd04a330323ac98a1b4bc82c9d9fcb1e66b63caa84da26b575" ++ ++[[package]] ++name = "plotters" ++version = "0.3.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "45ca0ae5f169d0917a7c7f5a9c1a3d3d9598f18f529dd2b8373ed988efea307a" ++dependencies = [ ++ "num-traits", ++ "plotters-backend", ++ "plotters-svg", ++ "wasm-bindgen", ++ "web-sys", ++] ++ ++[[package]] ++name = "plotters-backend" ++version = "0.3.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b07fffcddc1cb3a1de753caa4e4df03b79922ba43cf882acc1bdd7e8df9f4590" ++ ++[[package]] ++name = "plotters-svg" ++version = "0.3.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b38a02e23bd9604b842a812063aec4ef702b57989c37b655254bb61c471ad211" ++dependencies = [ ++ "plotters-backend", ++] ++ ++[[package]] ++name = "ppv-lite86" ++version = "0.2.10" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ac74c624d6b2d21f425f752262f42188365d7b8ff1aff74c82e45136510a4857" ++ ++[[package]] ++name = "proc-macro2" ++version = "1.0.24" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "1e0704ee1a7e00d7bb417d0770ea303c1bccbabf0ef1667dae92b5967f5f8a71" ++dependencies = [ ++ "unicode-xid", ++] ++ ++[[package]] ++name = "quickcheck" ++version = "0.9.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "a44883e74aa97ad63db83c4bf8ca490f02b2fc02f92575e720c8551e843c945f" ++dependencies = [ ++ "rand 0.7.3", ++ "rand_core 0.5.1", ++] ++ ++[[package]] ++name = "quote" ++version = "1.0.9" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "c3d0b9745dc2debf507c8422de05d7226cc1f0644216dfdfead988f9b1ab32a7" ++dependencies = [ ++ "proc-macro2", ++] ++ ++[[package]] ++name = "rand" ++version = "0.7.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03" ++dependencies = [ ++ "getrandom 0.1.16", ++ "libc", ++ "rand_chacha 0.2.2", ++ "rand_core 0.5.1", ++ "rand_hc 0.2.0", ++] ++ ++[[package]] ++name = "rand" ++version = "0.8.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "0ef9e7e66b4468674bfcb0c81af8b7fa0bb154fa9f28eb840da5c447baeb8d7e" ++dependencies = [ ++ "libc", ++ "rand_chacha 0.3.0", ++ "rand_core 0.6.2", ++ "rand_hc 0.3.0", ++] ++ ++[[package]] ++name = "rand_chacha" ++version = "0.2.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402" ++dependencies = [ ++ "ppv-lite86", ++ "rand_core 0.5.1", ++] ++ ++[[package]] ++name = "rand_chacha" ++version = "0.3.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "e12735cf05c9e10bf21534da50a147b924d555dc7a547c42e6bb2d5b6017ae0d" ++dependencies = [ ++ "ppv-lite86", ++ "rand_core 0.6.2", ++] ++ ++[[package]] ++name = "rand_core" ++version = "0.5.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19" ++dependencies = [ ++ "getrandom 0.1.16", ++] ++ ++[[package]] ++name = "rand_core" ++version = "0.6.2" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "34cf66eb183df1c5876e2dcf6b13d57340741e8dc255b48e40a26de954d06ae7" ++dependencies = [ ++ "getrandom 0.2.2", ++] ++ ++[[package]] ++name = "rand_hc" ++version = "0.2.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c" ++dependencies = [ ++ "rand_core 0.5.1", ++] ++ ++[[package]] ++name = "rand_hc" ++version = "0.3.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "3190ef7066a446f2e7f42e239d161e905420ccab01eb967c9eb27d21b2322a73" ++dependencies = [ ++ "rand_core 0.6.2", ++] ++ ++[[package]] ++name = "rayon" ++version = "1.5.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "8b0d8e0819fadc20c74ea8373106ead0600e3a67ef1fe8da56e39b9ae7275674" ++dependencies = [ ++ "autocfg", ++ "crossbeam-deque", ++ "either", ++ "rayon-core", ++] ++ ++[[package]] ++name = "rayon-core" ++version = "1.9.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "9ab346ac5921dc62ffa9f89b7a773907511cdfa5490c572ae9be1be33e8afa4a" ++dependencies = [ ++ "crossbeam-channel 0.5.0", ++ "crossbeam-deque", ++ "crossbeam-utils 0.8.3", ++ "lazy_static", ++ "num_cpus", ++] ++ ++[[package]] ++name = "redox_syscall" ++version = "0.2.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "94341e4e44e24f6b591b59e47a8a027df12e008d73fd5672dbea9cc22f4507d9" ++dependencies = [ ++ "bitflags", ++] ++ ++[[package]] ++name = "regex" ++version = "1.4.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d9251239e129e16308e70d853559389de218ac275b515068abc96829d05b948a" ++dependencies = [ ++ "regex-syntax", ++] ++ ++[[package]] ++name = "regex-automata" ++version = "0.1.9" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ae1ded71d66a4a97f5e961fd0cb25a5f366a42a41570d16a763a69c092c26ae4" ++dependencies = [ ++ "byteorder", ++ "fst 0.4.5 (registry+https://github.com/rust-lang/crates.io-index)", ++ "regex-syntax", ++] ++ ++[[package]] ++name = "regex-syntax" ++version = "0.6.22" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b5eb417147ba9860a96cfe72a0b93bf88fee1744b5636ec99ab20c1aa9376581" ++ ++[[package]] ++name = "remove_dir_all" ++version = "0.5.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "3acd125665422973a33ac9d3dd2df85edad0f4ae9b00dafb1a05e43a9f5ef8e7" ++dependencies = [ ++ "winapi", ++] ++ ++[[package]] ++name = "rustc_version" ++version = "0.2.3" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a" ++dependencies = [ ++ "semver", ++] ++ ++[[package]] ++name = "ryu" ++version = "1.0.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "71d301d4193d031abdd79ff7e3dd721168a9572ef3fe51a1517aba235bd8f86e" ++ ++[[package]] ++name = "same-file" ++version = "1.0.6" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502" ++dependencies = [ ++ "winapi-util", ++] ++ ++[[package]] ++name = "scopeguard" ++version = "1.1.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" ++ ++[[package]] ++name = "semver" ++version = "0.9.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403" ++dependencies = [ ++ "semver-parser", ++] ++ ++[[package]] ++name = "semver-parser" ++version = "0.7.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" ++ ++[[package]] ++name = "serde" ++version = "1.0.123" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "92d5161132722baa40d802cc70b15262b98258453e85e5d1d365c757c73869ae" ++dependencies = [ ++ "serde_derive", ++] ++ ++[[package]] ++name = "serde_cbor" ++version = "0.11.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "1e18acfa2f90e8b735b2836ab8d538de304cbb6729a7360729ea5a895d15a622" ++dependencies = [ ++ "half", ++ "serde", ++] ++ ++[[package]] ++name = "serde_derive" ++version = "1.0.123" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "9391c295d64fc0abb2c556bad848f33cb8296276b1ad2677d1ae1ace4f258f31" ++dependencies = [ ++ "proc-macro2", ++ "quote", ++ "syn", ++] ++ ++[[package]] ++name = "serde_json" ++version = "1.0.64" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "799e97dc9fdae36a5c8b8f2cae9ce2ee9fdce2058c57a93e6099d919fd982f79" ++dependencies = [ ++ "itoa", ++ "ryu", ++ "serde", ++] ++ ++[[package]] ++name = "syn" ++version = "1.0.61" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ed22b90a0e734a23a7610f4283ac9e5acfb96cbb30dfefa540d66f866f1c09c5" ++dependencies = [ ++ "proc-macro2", ++ "quote", ++ "unicode-xid", ++] ++ ++[[package]] ++name = "tempfile" ++version = "3.2.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "dac1c663cfc93810f88aed9b8941d48cabf856a1b111c29a40439018d870eb22" ++dependencies = [ ++ "cfg-if 1.0.0", ++ "libc", ++ "rand 0.8.3", ++ "redox_syscall", ++ "remove_dir_all", ++ "winapi", ++] ++ ++[[package]] ++name = "textwrap" ++version = "0.11.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060" ++dependencies = [ ++ "unicode-width", ++] ++ ++[[package]] ++name = "tinytemplate" ++version = "1.2.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "be4d6b5f19ff7664e8c98d03e2139cb510db9b0a60b55f8e8709b689d939b6bc" ++dependencies = [ ++ "serde", ++ "serde_json", ++] ++ ++[[package]] ++name = "unicode-width" ++version = "0.1.8" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "9337591893a19b88d8d87f2cec1e73fad5cdfd10e5a6f349f498ad6ea2ffb1e3" ++ ++[[package]] ++name = "unicode-xid" ++version = "0.2.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "f7fe0bb3479651439c9112f72b6c505038574c9fbb575ed1bf3b797fa39dd564" ++ ++[[package]] ++name = "utf8-ranges" ++version = "1.0.4" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "b4ae116fef2b7fea257ed6440d3cfcff7f190865f170cdad00bb6465bf18ecba" ++ ++[[package]] ++name = "walkdir" ++version = "2.3.1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "777182bc735b6424e1a57516d35ed72cb8019d85c8c9bf536dccb3445c1a2f7d" ++dependencies = [ ++ "same-file", ++ "winapi", ++ "winapi-util", ++] ++ ++[[package]] ++name = "wasi" ++version = "0.9.0+wasi-snapshot-preview1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" ++ ++[[package]] ++name = "wasi" ++version = "0.10.2+wasi-snapshot-preview1" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "fd6fbd9a79829dd1ad0cc20627bf1ed606756a7f77edff7b66b7064f9cb327c6" ++ ++[[package]] ++name = "wasm-bindgen" ++version = "0.2.71" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "7ee1280240b7c461d6a0071313e08f34a60b0365f14260362e5a2b17d1d31aa7" ++dependencies = [ ++ "cfg-if 1.0.0", ++ "wasm-bindgen-macro", ++] ++ ++[[package]] ++name = "wasm-bindgen-backend" ++version = "0.2.71" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "5b7d8b6942b8bb3a9b0e73fc79b98095a27de6fa247615e59d096754a3bc2aa8" ++dependencies = [ ++ "bumpalo", ++ "lazy_static", ++ "log", ++ "proc-macro2", ++ "quote", ++ "syn", ++ "wasm-bindgen-shared", ++] ++ ++[[package]] ++name = "wasm-bindgen-macro" ++version = "0.2.71" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "e5ac38da8ef716661f0f36c0d8320b89028efe10c7c0afde65baffb496ce0d3b" ++dependencies = [ ++ "quote", ++ "wasm-bindgen-macro-support", ++] ++ ++[[package]] ++name = "wasm-bindgen-macro-support" ++version = "0.2.71" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "cc053ec74d454df287b9374ee8abb36ffd5acb95ba87da3ba5b7d3fe20eb401e" ++dependencies = [ ++ "proc-macro2", ++ "quote", ++ "syn", ++ "wasm-bindgen-backend", ++ "wasm-bindgen-shared", ++] ++ ++[[package]] ++name = "wasm-bindgen-shared" ++version = "0.2.71" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "7d6f8ec44822dd71f5f221a5847fb34acd9060535c1211b70a05844c0f6383b1" ++ ++[[package]] ++name = "web-sys" ++version = "0.3.48" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ec600b26223b2948cedfde2a0aa6756dcf1fef616f43d7b3097aaf53a6c4d92b" ++dependencies = [ ++ "js-sys", ++ "wasm-bindgen", ++] ++ ++[[package]] ++name = "winapi" ++version = "0.3.9" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" ++dependencies = [ ++ "winapi-i686-pc-windows-gnu", ++ "winapi-x86_64-pc-windows-gnu", ++] ++ ++[[package]] ++name = "winapi-i686-pc-windows-gnu" ++version = "0.4.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" ++ ++[[package]] ++name = "winapi-util" ++version = "0.1.5" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" ++dependencies = [ ++ "winapi", ++] ++ ++[[package]] ++name = "winapi-x86_64-pc-windows-gnu" ++version = "0.4.0" ++source = "registry+https://github.com/rust-lang/crates.io-index" ++checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" +-- +2.29.2 + diff --git a/third_party/nixpkgs/pkgs/tools/text/fst/default.nix b/third_party/nixpkgs/pkgs/tools/text/fst/default.nix new file mode 100644 index 0000000000..738fd69dc6 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/text/fst/default.nix @@ -0,0 +1,45 @@ +{ lib +, stdenv +, fetchFromGitHub +, rustPlatform +, libiconv +}: + +rustPlatform.buildRustPackage rec { + pname = "fst"; + version = "0.4.5"; + + src = fetchFromGitHub { + owner = "BurntSushi"; + repo = pname; + rev = version; + sha256 = "01qdj7zzgwb1zqcznfmnks3dnl6hnf8ib0sm0sgimsbcvajmhab3"; + }; + + cargoPatches = [ + # Add Cargo.lock lockfile, which upstream does not include + ./0001-cargo-lockfile.patch + ]; + + cargoBuildFlags = [ "--workspace" ]; + cargoSha256 = "0svn2gzipslz939396rcydqx3i1x07l7acas7fhql12n59n2yrxw"; + + buildInputs = lib.optionals stdenv.isDarwin [ libiconv ]; + + doInstallCheck = true; + installCheckPhase = '' + csv="$(mktemp)" + fst="$(mktemp)" + printf "abc,1\nabcd,1" > "$csv" + $out/bin/fst map "$csv" "$fst" --force + $out/bin/fst fuzzy "$fst" 'abc' + $out/bin/fst --help > /dev/null + ''; + + meta = with lib; { + description = "Represent large sets and maps compactly with finite state transducers"; + homepage = "https://github.com/BurntSushi/fst"; + license = with licenses; [ unlicense /* or */ mit ]; + maintainers = with maintainers; [ rmcgibbo ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/text/shfmt/default.nix b/third_party/nixpkgs/pkgs/tools/text/shfmt/default.nix index 85600ff54c..c6ab5ff9c7 100644 --- a/third_party/nixpkgs/pkgs/tools/text/shfmt/default.nix +++ b/third_party/nixpkgs/pkgs/tools/text/shfmt/default.nix @@ -32,6 +32,6 @@ buildGoModule rec { You can feed it standard input, any number of files or any number of directories to recurse into. ''; license = licenses.bsd3; - maintainers = with maintainers; [ zowoq ]; + maintainers = with maintainers; [ zowoq SuperSandro2000 ]; }; } diff --git a/third_party/nixpkgs/pkgs/tools/text/tab/default.nix b/third_party/nixpkgs/pkgs/tools/text/tab/default.nix index a0539d4d37..096e0b04c6 100644 --- a/third_party/nixpkgs/pkgs/tools/text/tab/default.nix +++ b/third_party/nixpkgs/pkgs/tools/text/tab/default.nix @@ -1,14 +1,14 @@ { lib, stdenv, fetchFromBitbucket, python3 }: stdenv.mkDerivation rec { - version = "7.2"; + version = "8.0"; pname = "tab"; src = fetchFromBitbucket { owner = "tkatchev"; repo = pname; rev = version; - sha256 = "1bm15lw0vp901dj2vsqx6yixmn7ls3brrzh1w6zgd1ksjzlm5aax"; + sha256 = "sha256-RcDvghTiqIdH79khwDIo8PhvmcObmix8WBrHToLwcw4="; }; checkInputs = [ python3 ]; diff --git a/third_party/nixpkgs/pkgs/tools/typesetting/tectonic/default.nix b/third_party/nixpkgs/pkgs/tools/typesetting/tectonic/default.nix index 75874d21e8..1145fabf48 100644 --- a/third_party/nixpkgs/pkgs/tools/typesetting/tectonic/default.nix +++ b/third_party/nixpkgs/pkgs/tools/typesetting/tectonic/default.nix @@ -3,16 +3,16 @@ rustPlatform.buildRustPackage rec { pname = "tectonic"; - version = "0.4.0"; + version = "0.4.1"; src = fetchFromGitHub { owner = "tectonic-typesetting"; repo = "tectonic"; rev = "tectonic@${version}"; - sha256 = "1p93428ln3sfsflc7spjpfcgy81c4z5y0xhwv5mkgzf55g8nrin1"; + sha256 = "sha256-XQ3KRM12X80JPFMnQs//8ZJEv+AV1sr3BH0Nw/PH0HQ="; }; - cargoSha256 = "0jzngl1iwrq20cx3l0mwdrrddvyw977rwb75nz1k4hkxjnicc1ga"; + cargoSha256 = "sha256-YOg4W933qUBcvo2y3nmvEWqxTfqWKDi3GCoTJWLnXxk="; nativeBuildInputs = [ pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/top-level/aliases.nix b/third_party/nixpkgs/pkgs/top-level/aliases.nix index da00ed76ca..6036e42168 100644 --- a/third_party/nixpkgs/pkgs/top-level/aliases.nix +++ b/third_party/nixpkgs/pkgs/top-level/aliases.nix @@ -564,6 +564,7 @@ mapAliases ({ qr-filetransfer = throw ''"qr-filetransfer" has been renamed to "qrcp"''; # added 2020-12-02 quake3game = ioquake3; # added 2016-01-14 qvim = throw "qvim has been removed."; # added 2020-08-31 + qweechat = throw "qweechat has been removed because it was broken"; # added 2021-03-08 qwt6 = libsForQt5.qwt; # added 2015-12-19 qtcurve = libsForQt5.qtcurve; # added 2020-11-07 qtpfsgui = throw "qtpfsgui is now luminanceHDR"; # added 2019-06-26 diff --git a/third_party/nixpkgs/pkgs/top-level/all-packages.nix b/third_party/nixpkgs/pkgs/top-level/all-packages.nix index a47a94c08e..72fdc8cbbc 100644 --- a/third_party/nixpkgs/pkgs/top-level/all-packages.nix +++ b/third_party/nixpkgs/pkgs/top-level/all-packages.nix @@ -482,6 +482,8 @@ in fetchFromSavannah = callPackage ../build-support/fetchsavannah {}; + fetchFromSourcehut = callPackage ../build-support/fetchsourcehut { }; + fetchFromGitLab = callPackage ../build-support/fetchgitlab {}; fetchFromGitiles = callPackage ../build-support/fetchgitiles {}; @@ -509,6 +511,8 @@ in madonctl = callPackage ../applications/misc/madonctl { }; + maelstrom = callPackage ../games/maelstrom { }; + copyDesktopItems = makeSetupHook { } ../build-support/setup-hooks/copy-desktop-items.sh; makeDesktopItem = callPackage ../build-support/make-desktopitem { }; @@ -1733,6 +1737,8 @@ in borgbackup = callPackage ../tools/backup/borg { }; + borgmatic = callPackage ../tools/backup/borgmatic { }; + boringtun = callPackage ../tools/networking/boringtun { }; # Upstream recommends qt5.12 and it doesn't build with qt5.15 @@ -2349,6 +2355,8 @@ in fsmon = callPackage ../tools/misc/fsmon { }; + fst = callPackage ../tools/text/fst { }; + fsql = callPackage ../tools/misc/fsql { }; fop = callPackage ../tools/typesetting/fop { @@ -11859,9 +11867,10 @@ in apacheAnt_1_9 = callPackage ../development/tools/build-managers/apache-ant/1.9.nix { }; ant = apacheAnt; - apacheKafka = apacheKafka_2_5; + apacheKafka = apacheKafka_2_6; apacheKafka_2_4 = callPackage ../servers/apache-kafka { majorVersion = "2.4"; }; apacheKafka_2_5 = callPackage ../servers/apache-kafka { majorVersion = "2.5"; }; + apacheKafka_2_6 = callPackage ../servers/apache-kafka { majorVersion = "2.6"; }; kt = callPackage ../tools/misc/kt {}; @@ -12771,9 +12780,7 @@ in opengrok = callPackage ../development/tools/misc/opengrok { }; - openocd = callPackage ../development/tools/misc/openocd { - autoreconfHook = buildPackages.autoreconfHook269; - }; + openocd = callPackage ../development/tools/misc/openocd { }; oprofile = callPackage ../development/tools/profiling/oprofile { libiberty_static = libiberty.override { staticBuild = true; }; @@ -13128,6 +13135,8 @@ in inherit (darwin.apple_sdk.frameworks) CoreFoundation; }; + uddup = python3Packages.callPackage ../tools/security/uddup { }; + udis86 = callPackage ../development/tools/udis86 { }; uefi-firmware-parser = callPackage ../development/tools/analysis/uefi-firmware-parser { }; @@ -15330,6 +15339,11 @@ in librime = callPackage ../development/libraries/librime {}; + librsb = callPackage ../development/libraries/librsb { + # Taken from https://build.opensuse.org/package/view_file/science/librsb/librsb.spec + memHierarchy = "L3:16/64/8192K,L2:16/64/2048K,L1:8/64/16K"; + }; + librtprocess = callPackage ../development/libraries/librtprocess { }; libsamplerate = callPackage ../development/libraries/libsamplerate { @@ -18566,6 +18580,7 @@ in }; prometheus-alertmanager = callPackage ../servers/monitoring/prometheus/alertmanager.nix { }; prometheus-apcupsd-exporter = callPackage ../servers/monitoring/prometheus/apcupsd-exporter.nix { }; + prometheus-artifactory-exporter = callPackage ../servers/monitoring/prometheus/artifactory-exporter.nix { }; prometheus-aws-s3-exporter = callPackage ../servers/monitoring/prometheus/aws-s3-exporter.nix { }; prometheus-bind-exporter = callPackage ../servers/monitoring/prometheus/bind-exporter.nix { }; prometheus-bird-exporter = callPackage ../servers/monitoring/prometheus/bird-exporter.nix { }; @@ -18581,6 +18596,7 @@ in prometheus-haproxy-exporter = callPackage ../servers/monitoring/prometheus/haproxy-exporter.nix { }; prometheus-json-exporter = callPackage ../servers/monitoring/prometheus/json-exporter.nix { }; prometheus-keylight-exporter = callPackage ../servers/monitoring/prometheus/keylight-exporter.nix { }; + prometheus-knot-exporter = callPackage ../servers/monitoring/prometheus/knot-exporter.nix { }; prometheus-lnd-exporter = callPackage ../servers/monitoring/prometheus/lnd-exporter.nix { }; prometheus-mail-exporter = callPackage ../servers/monitoring/prometheus/mail-exporter.nix { }; prometheus-mesos-exporter = callPackage ../servers/monitoring/prometheus/mesos-exporter.nix { }; @@ -18603,6 +18619,7 @@ in prometheus-smokeping-prober = callPackage ../servers/monitoring/prometheus/smokeping-prober.nix { }; prometheus-snmp-exporter = callPackage ../servers/monitoring/prometheus/snmp-exporter.nix { }; prometheus-sql-exporter = callPackage ../servers/monitoring/prometheus/sql-exporter.nix { }; + prometheus-systemd-exporter = callPackage ../servers/monitoring/prometheus/systemd-exporter.nix { }; prometheus-tor-exporter = callPackage ../servers/monitoring/prometheus/tor-exporter.nix { }; prometheus-statsd-exporter = callPackage ../servers/monitoring/prometheus/statsd-exporter.nix { }; prometheus-surfboard-exporter = callPackage ../servers/monitoring/prometheus/surfboard-exporter.nix { }; @@ -23254,6 +23271,8 @@ in # Impressive, formerly known as "KeyJNote". impressive = callPackage ../applications/office/impressive { }; + index-fm = libsForQt5.callPackage ../applications/misc/index-fm { }; + inkcut = libsForQt5.callPackage ../applications/misc/inkcut { }; inkscape = callPackage ../applications/graphics/inkscape { @@ -27303,8 +27322,6 @@ in pysolfc = python3Packages.callPackage ../games/pysolfc { }; - qweechat = callPackage ../applications/networking/irc/qweechat { }; - qqwing = callPackage ../games/qqwing { }; quake3wrapper = callPackage ../games/quake3/wrapper { }; @@ -27430,6 +27447,8 @@ in soldat-unstable = callPackage ../games/soldat-unstable { }; + sollya = callPackage ../development/interpreters/sollya { }; + # You still can override by passing more arguments. space-orbit = callPackage ../games/space-orbit { }; diff --git a/third_party/nixpkgs/pkgs/top-level/ocaml-packages.nix b/third_party/nixpkgs/pkgs/top-level/ocaml-packages.nix index f31125ef82..3c8c500d8b 100644 --- a/third_party/nixpkgs/pkgs/top-level/ocaml-packages.nix +++ b/third_party/nixpkgs/pkgs/top-level/ocaml-packages.nix @@ -1001,6 +1001,10 @@ let ppx_cstruct = callPackage ../development/ocaml-modules/cstruct/ppx.nix { }; + ppx_cstubs = callPackage ../development/ocaml-modules/ppx_cstubs { + ppxlib = ppxlib.override { version = "0.22.0"; }; + }; + ppx_derivers = callPackage ../development/ocaml-modules/ppx_derivers {}; ppx_deriving = callPackage ../development/ocaml-modules/ppx_deriving {}; diff --git a/third_party/nixpkgs/pkgs/top-level/octave-packages.nix b/third_party/nixpkgs/pkgs/top-level/octave-packages.nix index 6278a7042e..115b38095e 100644 --- a/third_party/nixpkgs/pkgs/top-level/octave-packages.nix +++ b/third_party/nixpkgs/pkgs/top-level/octave-packages.nix @@ -179,11 +179,7 @@ makeScope newScope (self: sockets = callPackage ../development/octave-modules/sockets { }; - sparsersb = callPackage ../development/octave-modules/sparsersb { - librsb = null; - # TODO: Package the librsb library to build this package. - # http://librsb.sourceforge.net/ - }; + sparsersb = callPackage ../development/octave-modules/sparsersb { }; stk = callPackage ../development/octave-modules/stk { }; diff --git a/third_party/nixpkgs/pkgs/top-level/python-packages.nix b/third_party/nixpkgs/pkgs/top-level/python-packages.nix index 7799b6356b..5b991da11f 100644 --- a/third_party/nixpkgs/pkgs/top-level/python-packages.nix +++ b/third_party/nixpkgs/pkgs/top-level/python-packages.nix @@ -386,15 +386,21 @@ in { ansiwrap = callPackage ../development/python-modules/ansiwrap { }; - antlr4-python2-runtime = callPackage ../development/python-modules/antlr4-python2-runtime { antlr4 = pkgs.antlr4; }; + antlr4-python2-runtime = callPackage ../development/python-modules/antlr4-python2-runtime { + inherit (pkgs) antlr4; + }; - antlr4-python3-runtime = callPackage ../development/python-modules/antlr4-python3-runtime { antlr4 = pkgs.antlr4; }; + antlr4-python3-runtime = callPackage ../development/python-modules/antlr4-python3-runtime { + inherit (pkgs) antlr4; + }; anyio = callPackage ../development/python-modules/anyio { }; anyjson = callPackage ../development/python-modules/anyjson { }; - anytree = callPackage ../development/python-modules/anytree { inherit (pkgs) graphviz; }; + anytree = callPackage ../development/python-modules/anytree { + inherit (pkgs) graphviz; + }; apache-airflow = callPackage ../development/python-modules/apache-airflow { }; @@ -432,9 +438,13 @@ in { area = callPackage ../development/python-modules/area { }; - arelle = callPackage ../development/python-modules/arelle { gui = true; }; + arelle = callPackage ../development/python-modules/arelle { + gui = true; + }; - arelle-headless = callPackage ../development/python-modules/arelle { gui = false; }; + arelle-headless = callPackage ../development/python-modules/arelle { + gui = false; + }; aresponses = callPackage ../development/python-modules/aresponses { }; @@ -446,7 +456,7 @@ in { args = callPackage ../development/python-modules/args { }; - aria2p = callPackage ../development/python-modules/aria2p { inherit (pkgs) aria2; }; + aria2p = callPackage ../development/python-modules/aria2p { }; arrayqueues = callPackage ../development/python-modules/arrayqueues { }; @@ -558,7 +568,9 @@ in { audiotools = callPackage ../development/python-modules/audiotools { }; - augeas = callPackage ../development/python-modules/augeas { inherit (pkgs) augeas; }; + augeas = callPackage ../development/python-modules/augeas { + inherit (pkgs) augeas; + }; auroranoaa = callPackage ../development/python-modules/auroranoaa { }; @@ -730,8 +742,7 @@ in { azure-mgmt-iothub = callPackage ../development/python-modules/azure-mgmt-iothub { }; - azure-mgmt-iothubprovisioningservices = - callPackage ../development/python-modules/azure-mgmt-iothubprovisioningservices { }; + azure-mgmt-iothubprovisioningservices = callPackage ../development/python-modules/azure-mgmt-iothubprovisioningservices { }; azure-mgmt-keyvault = callPackage ../development/python-modules/azure-mgmt-keyvault { }; @@ -873,8 +884,7 @@ in { backports-shutil-which = callPackage ../development/python-modules/backports-shutil-which { }; - backports_ssl_match_hostname = - if !(pythonOlder "3.5") then null else callPackage ../development/python-modules/backports_ssl_match_hostname { }; + backports_ssl_match_hostname = callPackage ../development/python-modules/backports_ssl_match_hostname { }; backports_tempfile = callPackage ../development/python-modules/backports_tempfile { }; @@ -886,7 +896,9 @@ in { bandit = callPackage ../development/python-modules/bandit { }; - bap = callPackage ../development/python-modules/bap { inherit (pkgs.ocaml-ng.ocamlPackages) bap; }; + bap = callPackage ../development/python-modules/bap { + inherit (pkgs.ocaml-ng.ocamlPackages) bap; + }; baron = callPackage ../development/python-modules/baron { }; @@ -898,11 +910,11 @@ in { basemap = callPackage ../development/python-modules/basemap { }; - bash_kernel = callPackage ../development/python-modules/bash_kernel { inherit (pkgs) bash; }; + bash_kernel = callPackage ../development/python-modules/bash_kernel { }; bashlex = callPackage ../development/python-modules/bashlex { }; - basiciw = callPackage ../development/python-modules/basiciw { inherit (pkgs) gcc wirelesstools; }; + basiciw = callPackage ../development/python-modules/basiciw { }; batchgenerators = callPackage ../development/python-modules/batchgenerators { }; @@ -1118,8 +1130,7 @@ in { buildbot-ui = self.buildbot.withPlugins (with self.buildbot-plugins; [ www ]); - buildbot-full = self.buildbot.withPlugins - (with self.buildbot-plugins; [ www console-view waterfall-view grid-view wsgi-dashboards ]); + buildbot-full = self.buildbot.withPlugins (with self.buildbot-plugins; [ www console-view waterfall-view grid-view wsgi-dashboards ]); buildbot-pkg = callPackage ../development/python-modules/buildbot/pkg.nix { }; @@ -1133,7 +1144,7 @@ in { bunch = callPackage ../development/python-modules/bunch { }; - bx-python = callPackage ../development/python-modules/bx-python { inherit (pkgs) zlib; }; + bx-python = callPackage ../development/python-modules/bx-python { }; bwapy = callPackage ../development/python-modules/bwapy { }; @@ -1180,7 +1191,9 @@ in { canopen = callPackage ../development/python-modules/canopen { }; - capstone = callPackage ../development/python-modules/capstone { inherit (pkgs) capstone; }; + capstone = callPackage ../development/python-modules/capstone { + inherit (pkgs) capstone; + }; capturer = callPackage ../development/python-modules/capturer { }; @@ -1260,7 +1273,9 @@ in { chai = callPackage ../development/python-modules/chai { }; - chainer = callPackage ../development/python-modules/chainer { cudaSupport = pkgs.config.cudaSupport or false; }; + chainer = callPackage ../development/python-modules/chainer { + cudaSupport = pkgs.config.cudaSupport or false; + }; chainmap = callPackage ../development/python-modules/chainmap { }; @@ -1462,7 +1477,10 @@ in { constantly = callPackage ../development/python-modules/constantly { }; - construct = callPackage ../development/python-modules/construct { }; + construct = if isPy27 then + callPackage ../development/python-modules/construct/2.10.54.nix { } + else + callPackage ../development/python-modules/construct { }; consul = callPackage ../development/python-modules/consul { }; @@ -1472,7 +1490,10 @@ in { contextvars = callPackage ../development/python-modules/contextvars { }; - convertdate = callPackage ../development/python-modules/convertdate { }; + convertdate = if isPy27 then + callPackage ../development/python-modules/convertdate/2.2.x.nix { } + else + callPackage ../development/python-modules/convertdate { }; cookiecutter = callPackage ../development/python-modules/cookiecutter { }; @@ -1618,9 +1639,7 @@ in { dask-gateway = callPackage ../development/python-modules/dask-gateway { }; - dask-gateway-server = callPackage ../development/python-modules/dask-gateway-server { - inherit (pkgs) go; - }; + dask-gateway-server = callPackage ../development/python-modules/dask-gateway-server { }; dask-glm = callPackage ../development/python-modules/dask-glm { }; @@ -1638,9 +1657,7 @@ in { databricks-cli = callPackage ../development/python-modules/databricks-cli { }; - databricks-connect = callPackage ../development/python-modules/databricks-connect { - inherit (pkgs) jdk; - }; + databricks-connect = callPackage ../development/python-modules/databricks-connect { }; dataclasses = callPackage ../development/python-modules/dataclasses { }; @@ -1662,11 +1679,12 @@ in { datashape = callPackage ../development/python-modules/datashape { }; - datatable = callPackage ../development/python-modules/datatable { - inherit (pkgs.llvmPackages) libcxx; - }; + datatable = callPackage ../development/python-modules/datatable { }; - dateparser = callPackage ../development/python-modules/dateparser { }; + dateparser = if isPy27 then + callPackage ../development/python-modules/dateparser/0.x.nix { } + else + callPackage ../development/python-modules/dateparser { }; datrie = callPackage ../development/python-modules/datrie { }; @@ -2016,9 +2034,7 @@ in { ds-store = callPackage ../development/python-modules/ds-store { }; - ds4drv = callPackage ../development/python-modules/ds4drv { - inherit (pkgs) bluez; - }; + ds4drv = callPackage ../development/python-modules/ds4drv { }; dtopt = callPackage ../development/python-modules/dtopt { }; @@ -2047,10 +2063,7 @@ in { EasyProcess = callPackage ../development/python-modules/easyprocess { }; - easysnmp = callPackage ../development/python-modules/easysnmp { - openssl = pkgs.openssl; - net-snmp = pkgs.net-snmp; - }; + easysnmp = callPackage ../development/python-modules/easysnmp { }; easy-thumbnails = callPackage ../development/python-modules/easy-thumbnails { }; @@ -2085,7 +2098,7 @@ in { elasticsearch-dsl = callPackage ../development/python-modules/elasticsearch-dsl { }; - elasticsearchdsl = self.elasticsearch-dsl; # alias + elasticsearchdsl = self.elasticsearch-dsl; elementpath = callPackage ../development/python-modules/elementpath { }; @@ -2299,9 +2312,7 @@ in { fints = callPackage ../development/python-modules/fints { }; - fiona = callPackage ../development/python-modules/fiona { - gdal_2 = pkgs.gdal_2; - }; + fiona = callPackage ../development/python-modules/fiona { }; fipy = callPackage ../development/python-modules/fipy { }; @@ -2808,6 +2819,7 @@ in { gorilla = callPackage ../development/python-modules/gorilla { }; gpapi = callPackage ../development/python-modules/gpapi { }; + gplaycli = callPackage ../development/python-modules/gplaycli { }; gpgme = toPythonModule (pkgs.gpgme.override { @@ -2817,7 +2829,9 @@ in { gphoto2 = callPackage ../development/python-modules/gphoto2 { }; - gprof2dot = callPackage ../development/python-modules/gprof2dot { inherit (pkgs) graphviz; }; + gprof2dot = callPackage ../development/python-modules/gprof2dot { + inherit (pkgs) graphviz; + }; gps3 = callPackage ../development/python-modules/gps3 { }; @@ -2859,7 +2873,9 @@ in { graphtage = callPackage ../development/python-modules/graphtage { }; - graphviz = callPackage ../development/python-modules/graphviz { inherit (pkgs) graphviz; }; + graphviz = callPackage ../development/python-modules/graphviz { + inherit (pkgs) graphviz; + }; grappelli_safe = callPackage ../development/python-modules/grappelli_safe { }; @@ -2897,7 +2913,10 @@ in { gspread = callPackage ../development/python-modules/gspread { }; - gssapi = callPackage ../development/python-modules/gssapi { inherit (pkgs) darwin krb5Full; }; + gssapi = callPackage ../development/python-modules/gssapi { + inherit (pkgs) krb5Full; + inherit (pkgs.darwin.apple_sdk.frameworks) GSS; + }; gst-python = callPackage ../development/python-modules/gst-python { inherit (pkgs) meson; @@ -2924,7 +2943,9 @@ in { guppy3 = callPackage ../development/python-modules/guppy3 { }; gurobipy = if stdenv.hostPlatform.system == "x86_64-darwin" then - callPackage ../development/python-modules/gurobipy/darwin.nix { inherit (pkgs.darwin) cctools insert_dylib; } + callPackage ../development/python-modules/gurobipy/darwin.nix { + inherit (pkgs.darwin) cctools insert_dylib; + } else if stdenv.hostPlatform.system == "x86_64-linux" then callPackage ../development/python-modules/gurobipy/linux.nix { } else @@ -2947,13 +2968,17 @@ in { h2 = callPackage ../development/python-modules/h2 { }; - h3 = callPackage ../development/python-modules/h3 { inherit (pkgs) h3; }; + h3 = callPackage ../development/python-modules/h3 { + inherit (pkgs) h3; + }; h5netcdf = callPackage ../development/python-modules/h5netcdf { }; - h5py = callPackage ../development/python-modules/h5py { hdf5 = pkgs.hdf5; }; + h5py = callPackage ../development/python-modules/h5py { }; - h5py-mpi = self.h5py.override { hdf5 = pkgs.hdf5-mpi; }; + h5py-mpi = self.h5py.override { + hdf5 = pkgs.hdf5-mpi; + }; habanero = callPackage ../development/python-modules/habanero { }; @@ -2991,7 +3016,9 @@ in { helper = callPackage ../development/python-modules/helper { }; - hepmc3 = toPythonModule (pkgs.hepmc3.override { inherit python; }); + hepmc3 = toPythonModule (pkgs.hepmc3.override { + inherit python; + }); hetzner = callPackage ../development/python-modules/hetzner { }; @@ -3007,7 +3034,9 @@ in { hickle = callPackage ../development/python-modules/hickle { }; - hidapi = callPackage ../development/python-modules/hidapi { inherit (pkgs) udev libusb1; }; + hidapi = callPackage ../development/python-modules/hidapi { + inherit (pkgs) udev libusb1; + }; hieroglyph = callPackage ../development/python-modules/hieroglyph { }; @@ -3035,7 +3064,9 @@ in { homeassistant-pyozw = callPackage ../development/python-modules/homeassistant-pyozw { }; - hoomd-blue = toPythonModule (callPackage ../development/python-modules/hoomd-blue { inherit python; }); + hoomd-blue = toPythonModule (callPackage ../development/python-modules/hoomd-blue { + inherit python; + }); hopcroftkarp = callPackage ../development/python-modules/hopcroftkarp { }; @@ -3127,16 +3158,14 @@ in { hyperopt = callPackage ../development/python-modules/hyperopt { }; - hypothesis_4 = callPackage ../development/python-modules/hypothesis/2.nix - { }; # File name is called 2.nix because this one will need to remain for Python 2. + # File name is called 2.nix because this one will need to remain for Python 2. + hypothesis_4 = callPackage ../development/python-modules/hypothesis/2.nix { }; hypothesis-auto = callPackage ../development/python-modules/hypothesis-auto { }; hypothesis = if isPy3k then callPackage ../development/python-modules/hypothesis { } else self.hypothesis_4; - hypothesmith = callPackage ../development/python-modules/hypothesmith { - libcst = self.libcst.override { doCheck = false; }; - }; + hypothesmith = callPackage ../development/python-modules/hypothesmith { }; hyppo = callPackage ../development/python-modules/hyppo { }; @@ -3417,13 +3446,17 @@ in { josepy = callPackage ../development/python-modules/josepy { }; - journalwatch = callPackage ../tools/system/journalwatch { inherit (self) systemd pytest; }; + journalwatch = callPackage ../tools/system/journalwatch { + inherit (self) systemd pytest; + }; jpylyzer = callPackage ../development/python-modules/jpylyzer { }; JPype1 = callPackage ../development/python-modules/JPype1 { }; - jq = callPackage ../development/python-modules/jq { inherit (pkgs) jq; }; + jq = callPackage ../development/python-modules/jq { + inherit (pkgs) jq; + }; jsbeautifier = callPackage ../development/python-modules/jsbeautifier { }; @@ -3507,8 +3540,7 @@ in { jupyterhub-ldapauthenticator = callPackage ../development/python-modules/jupyterhub-ldapauthenticator { }; - jupyterhub-systemdspawner = - callPackage ../development/python-modules/jupyterhub-systemdspawner { inherit (pkgs) bash; }; + jupyterhub-systemdspawner = callPackage ../development/python-modules/jupyterhub-systemdspawner { }; jupyterhub-tmpauthenticator = callPackage ../development/python-modules/jupyterhub-tmpauthenticator { }; @@ -3522,7 +3554,9 @@ in { jupyterlab_server = callPackage ../development/python-modules/jupyterlab_server { }; - jupyter-repo2docker = callPackage ../development/python-modules/jupyter-repo2docker { pkgs-docker = pkgs.docker; }; + jupyter-repo2docker = callPackage ../development/python-modules/jupyter-repo2docker { + pkgs-docker = pkgs.docker; + }; jupyter-sphinx = callPackage ../development/python-modules/jupyter-sphinx { }; @@ -3532,7 +3566,9 @@ in { jwcrypto = callPackage ../development/python-modules/jwcrypto { }; - k5test = callPackage ../development/python-modules/k5test { inherit (pkgs) krb5Full findutils which; }; + k5test = callPackage ../development/python-modules/k5test { + inherit (pkgs) krb5Full findutils which; + }; kaa-base = callPackage ../development/python-modules/kaa-base { }; @@ -3566,7 +3602,9 @@ in { keras-preprocessing = callPackage ../development/python-modules/keras-preprocessing { }; - kerberos = callPackage ../development/python-modules/kerberos { inherit (pkgs) kerberos; }; + kerberos = callPackage ../development/python-modules/kerberos { + inherit (pkgs) kerberos; + }; keyring = if isPy3k then callPackage ../development/python-modules/keyring { } @@ -3577,9 +3615,13 @@ in { keystone-engine = callPackage ../development/python-modules/keystone-engine { }; - keyutils = callPackage ../development/python-modules/keyutils { inherit (pkgs) keyutils; }; + keyutils = callPackage ../development/python-modules/keyutils { + inherit (pkgs) keyutils; + }; - kicad = disabledIf isPy27 (toPythonModule (pkgs.kicad.override { python3 = python; }).src); + kicad = disabledIf isPy27 (toPythonModule (pkgs.kicad.override { + python3 = python; + }).src); kinparse = callPackage ../development/python-modules/kinparse { }; @@ -3623,7 +3665,7 @@ in { labgrid = callPackage ../development/python-modules/labgrid { }; - lammps-cython = callPackage ../development/python-modules/lammps-cython { mpi = pkgs.mpi; }; + lammps-cython = callPackage ../development/python-modules/lammps-cython { }; langcodes = callPackage ../development/python-modules/langcodes { }; @@ -3689,11 +3731,17 @@ in { libais = callPackage ../development/python-modules/libais { }; - libarchive-c = callPackage ../development/python-modules/libarchive-c { inherit (pkgs) libarchive; }; + libarchive-c = callPackage ../development/python-modules/libarchive-c { + inherit (pkgs) libarchive; + }; - libarcus = callPackage ../development/python-modules/libarcus { inherit (pkgs) protobuf; }; + libarcus = callPackage ../development/python-modules/libarcus { + inherit (pkgs) protobuf; + }; - libasyncns = callPackage ../development/python-modules/libasyncns { inherit (pkgs) libasyncns; }; + libasyncns = callPackage ../development/python-modules/libasyncns { + inherit (pkgs) libasyncns; + }; libcloud = if isPy27 then callPackage ../development/python-modules/libcloud/2.nix { } @@ -3741,7 +3789,9 @@ in { libmr = callPackage ../development/python-modules/libmr { }; - libnacl = callPackage ../development/python-modules/libnacl { inherit (pkgs) libsodium; }; + libnacl = callPackage ../development/python-modules/libnacl { + inherit (pkgs) libsodium; + }; libnl-python = disabledIf isPy3k (toPythonModule (pkgs.libnl.override { pythonSupport = true; @@ -3771,7 +3821,9 @@ in { librouteros = callPackage ../development/python-modules/librouteros { }; - libsass = (callPackage ../development/python-modules/libsass { inherit (pkgs) libsass; }); + libsass = (callPackage ../development/python-modules/libsass { + inherit (pkgs) libsass; + }); libsavitar = callPackage ../development/python-modules/libsavitar { }; @@ -3861,7 +3913,9 @@ in { liquidctl = callPackage ../development/python-modules/liquidctl { }; - lirc = disabledIf isPy27 (toPythonModule (pkgs.lirc.override { python3 = python; })); + lirc = disabledIf isPy27 (toPythonModule (pkgs.lirc.override { + python3 = python; + })); littleutils = callPackage ../development/python-modules/littleutils { }; @@ -3933,7 +3987,9 @@ in { lxc = callPackage ../development/python-modules/lxc { }; - lxml = callPackage ../development/python-modules/lxml { inherit (pkgs) libxml2 libxslt zlib; }; + lxml = callPackage ../development/python-modules/lxml { + inherit (pkgs) libxml2 libxslt zlib; + }; lyricwikia = callPackage ../development/python-modules/lyricwikia { }; @@ -4001,7 +4057,9 @@ in { manuel = callPackage ../development/python-modules/manuel { }; - manticore = callPackage ../development/python-modules/manticore { inherit (pkgs) z3; }; + manticore = callPackage ../development/python-modules/manticore { + inherit (pkgs) z3; + }; mapbox = callPackage ../development/python-modules/mapbox { }; @@ -4011,7 +4069,9 @@ in { marionette-harness = callPackage ../development/python-modules/marionette-harness { }; - marisa = callPackage ../development/python-modules/marisa { marisa = pkgs.marisa; }; + marisa = callPackage ../development/python-modules/marisa { + inherit (pkgs) marisa; + }; marisa-trie = callPackage ../development/python-modules/marisa-trie { }; @@ -4101,7 +4161,9 @@ in { memory_profiler = callPackage ../development/python-modules/memory_profiler { }; - mercurial = disabledIf (!isPy3k) (toPythonModule (pkgs.mercurial.override { python3Packages = self; })); + mercurial = disabledIf (!isPy3k) (toPythonModule (pkgs.mercurial.override { + python3Packages = self; + })); mergedeep = callPackage ../development/python-modules/mergedeep { }; @@ -4144,7 +4206,9 @@ in { minimock = callPackage ../development/python-modules/minimock { }; - mininet-python = (toPythonModule (pkgs.mininet.override { inherit python; })).py; + mininet-python = (toPythonModule (pkgs.mininet.override { + inherit python; + })).py; minio = callPackage ../development/python-modules/minio { }; @@ -4199,8 +4263,8 @@ in { mohawk = callPackage ../development/python-modules/mohawk { }; - moinmoin = callPackage ../development/python-modules/moinmoin - { }; # Needed here because moinmoin is loaded as a Python library. + # Needed here because moinmoin is loaded as a Python library. + moinmoin = callPackage ../development/python-modules/moinmoin { }; mongodict = callPackage ../development/python-modules/mongodict { }; @@ -4268,13 +4332,15 @@ in { mpd = callPackage ../development/python-modules/mpd { }; - mpi4py = callPackage ../development/python-modules/mpi4py { mpi = pkgs.mpi; }; + mpi4py = callPackage ../development/python-modules/mpi4py { }; mplleaflet = callPackage ../development/python-modules/mplleaflet { }; mpmath = callPackage ../development/python-modules/mpmath { }; - mpv = callPackage ../development/python-modules/mpv { mpv = pkgs.mpv; }; + mpv = callPackage ../development/python-modules/mpv { + inherit (pkgs) mpv; + }; mpyq = callPackage ../development/python-modules/mpyq { }; @@ -4377,7 +4443,9 @@ in { nanoleaf = callPackage ../development/python-modules/nanoleaf { }; - nanomsg-python = callPackage ../development/python-modules/nanomsg-python { inherit (pkgs) nanomsg; }; + nanomsg-python = callPackage ../development/python-modules/nanomsg-python { + inherit (pkgs) nanomsg; + }; nanotime = callPackage ../development/python-modules/nanotime { }; @@ -4467,16 +4535,20 @@ in { nipy = callPackage ../development/python-modules/nipy { }; - nipype = callPackage ../development/python-modules/nipype { inherit (pkgs) which; }; + nipype = callPackage ../development/python-modules/nipype { + inherit (pkgs) which; + }; nitime = callPackage ../development/python-modules/nitime { }; nitpick = callPackage ../applications/version-management/nitpick { }; - nix-kernel = callPackage ../development/python-modules/nix-kernel { inherit (pkgs) nix; }; + nix-kernel = callPackage ../development/python-modules/nix-kernel { + inherit (pkgs) nix; + }; - nixpart0 = callPackage ../tools/filesystems/nixpart/0.4 - { }; # This is used for NixOps to make sure we won't break it with the next major version of nixpart. + # This is used for NixOps to make sure we won't break it with the next major version of nixpart. + nixpart0 = callPackage ../tools/filesystems/nixpart/0.4 { }; nixpart = callPackage ../tools/filesystems/nixpart { }; @@ -4549,8 +4621,13 @@ in { notify-py = callPackage ../development/python-modules/notify-py { }; - notmuch = callPackage ../development/python-modules/notmuch { inherit (pkgs) notmuch; }; - notmuch2 = callPackage ../development/python-modules/notmuch/2.nix { inherit (pkgs) notmuch; }; + notmuch = callPackage ../development/python-modules/notmuch { + inherit (pkgs) notmuch; + }; + + notmuch2 = callPackage ../development/python-modules/notmuch/2.nix { + inherit (pkgs) notmuch; + }; nototools = callPackage ../data/fonts/noto-fonts/tools.nix { }; @@ -4570,7 +4647,7 @@ in { numba = callPackage ../development/python-modules/numba { }; - numcodecs = callPackage ../development/python-modules/numcodecs { inherit (pkgs) gcc8; }; + numcodecs = callPackage ../development/python-modules/numcodecs { }; numericalunits = callPackage ../development/python-modules/numericalunits { }; @@ -4612,7 +4689,10 @@ in { obfsproxy = callPackage ../development/python-modules/obfsproxy { }; - objgraph = callPackage ../development/python-modules/objgraph { graphvizPkg = pkgs.graphviz; }; + objgraph = callPackage ../development/python-modules/objgraph { + # requires both the graphviz package and python package + graphvizPkgs = pkgs.graphviz; + }; od = callPackage ../development/python-modules/od { }; @@ -4884,7 +4964,9 @@ in { pefile = callPackage ../development/python-modules/pefile { }; - pelican = callPackage ../development/python-modules/pelican { inherit (pkgs) glibcLocales git; }; + pelican = callPackage ../development/python-modules/pelican { + inherit (pkgs) glibcLocales git; + }; pendulum = callPackage ../development/python-modules/pendulum { }; @@ -4917,6 +4999,7 @@ in { pexpect = callPackage ../development/python-modules/pexpect { }; pg8000 = callPackage ../development/python-modules/pg8000 { }; + pg8000_1_12 = callPackage ../development/python-modules/pg8000/1_12.nix { }; pgcli = callPackage ../development/tools/database/pgcli { }; @@ -4993,7 +5076,7 @@ in { pip-tools = callPackage ../development/python-modules/pip-tools { git = pkgs.gitMinimal; - glibcLocales = pkgs.glibcLocales; + inherit (pkgs) glibcLocales; }; pipx = callPackage ../development/python-modules/pipx { }; @@ -5175,6 +5258,7 @@ in { prison = callPackage ../development/python-modules/prison { }; privacyidea = callPackage ../development/python-modules/privacyidea { }; + privacyidea-ldap-proxy = callPackage ../development/python-modules/privacyidea/ldap-proxy.nix { }; proboscis = callPackage ../development/python-modules/proboscis { }; @@ -5214,9 +5298,9 @@ in { protobuf = callPackage ../development/python-modules/protobuf { disabled = isPyPy; - doCheck = - !isPy3k; # If a protobuf upgrade causes many Python packages to fail, please pin it here to the previous version. - protobuf = pkgs.protobuf; + # If a protobuf upgrade causes many Python packages to fail, please pin it here to the previous version. + doCheck = !isPy3k; + inherit (pkgs) protobuf; }; protobuf3-to-dict = callPackage ../development/python-modules/protobuf3-to-dict { }; @@ -5241,7 +5325,7 @@ in { ptest = callPackage ../development/python-modules/ptest { }; - ptpython = callPackage ../development/python-modules/ptpython { prompt_toolkit = self.prompt_toolkit; }; + ptpython = callPackage ../development/python-modules/ptpython { }; ptyprocess = callPackage ../development/python-modules/ptyprocess { }; @@ -5281,7 +5365,9 @@ in { Pweave = callPackage ../development/python-modules/pweave { }; - pwntools = callPackage ../development/python-modules/pwntools { debugger = pkgs.gdb; }; + pwntools = callPackage ../development/python-modules/pwntools { + debugger = pkgs.gdb; + }; pxml = callPackage ../development/python-modules/pxml { }; @@ -5492,7 +5578,9 @@ in { pydocumentdb = callPackage ../development/python-modules/pydocumentdb { }; - pydot = callPackage ../development/python-modules/pydot { inherit (pkgs) graphviz; }; + pydot = callPackage ../development/python-modules/pydot { + inherit (pkgs) graphviz; + }; pydrive = callPackage ../development/python-modules/pydrive { }; @@ -5514,7 +5602,9 @@ in { pyemd = callPackage ../development/python-modules/pyemd { }; - pyenchant = callPackage ../development/python-modules/pyenchant { enchant2 = pkgs.enchant2; }; + pyenchant = callPackage ../development/python-modules/pyenchant { + inherit (pkgs) enchant2; + }; pyepsg = callPackage ../development/python-modules/pyepsg { }; @@ -5616,9 +5706,13 @@ in { pygobject2 = callPackage ../development/python-modules/pygobject { }; pygobject3 = if isPy3k then - callPackage ../development/python-modules/pygobject/3.nix { inherit (pkgs) meson; } + callPackage ../development/python-modules/pygobject/3.nix { + inherit (pkgs) meson; + } else - callPackage ../development/python-modules/pygobject/3.36.nix { inherit (pkgs) meson; }; + callPackage ../development/python-modules/pygobject/3.36.nix { + inherit (pkgs) meson; + }; pygogo = callPackage ../development/python-modules/pygogo { }; @@ -5626,7 +5720,7 @@ in { pygraphviz = callPackage ../development/python-modules/pygraphviz { inherit (pkgs) graphviz; - }; # not the python package + }; pygreat = callPackage ../development/python-modules/pygreat { }; @@ -5687,7 +5781,9 @@ in { pykdl = callPackage ../development/python-modules/pykdl { }; - pykdtree = callPackage ../development/python-modules/pykdtree { inherit (pkgs.llvmPackages) openmp; }; + pykdtree = callPackage ../development/python-modules/pykdtree { + inherit (pkgs.llvmPackages) openmp; + }; pykeepass = callPackage ../development/python-modules/pykeepass { }; @@ -5722,7 +5818,9 @@ in { pylibconfig2 = callPackage ../development/python-modules/pylibconfig2 { }; - pylibftdi = callPackage ../development/python-modules/pylibftdi { inherit (pkgs) libusb1; }; + pylibftdi = callPackage ../development/python-modules/pylibftdi { + inherit (pkgs) libusb1; + }; pylibgen = throw "pylibgen is unmaintained upstreamed, and removed from nixpkgs"; # added 2020-06-20 @@ -5967,20 +6065,28 @@ in { pyqt4 = callPackage ../development/python-modules/pyqt/4.x.nix { }; - pyqt5 = pkgs.libsForQt5.callPackage ../development/python-modules/pyqt/5.x.nix { pythonPackages = self; }; + pyqt5 = pkgs.libsForQt5.callPackage ../development/python-modules/pyqt/5.x.nix { + pythonPackages = self; + }; - pyqt5_with_qtmultimedia = self.pyqt5.override { withMultimedia = true; }; + pyqt5_with_qtmultimedia = self.pyqt5.override { + withMultimedia = true; + }; /* `pyqt5_with_qtwebkit` should not be used by python libraries in pkgs/development/python-modules/*. Putting this attribute in `propagatedBuildInputs` may cause collisions. */ - pyqt5_with_qtwebkit = self.pyqt5.override { withWebKit = true; }; + pyqt5_with_qtwebkit = self.pyqt5.override { + withWebKit = true; + }; pyqtgraph = callPackage ../development/python-modules/pyqtgraph { }; - pyqtwebengine = pkgs.libsForQt5.callPackage ../development/python-modules/pyqtwebengine { pythonPackages = self; }; + pyqtwebengine = pkgs.libsForQt5.callPackage ../development/python-modules/pyqtwebengine { + pythonPackages = self; + }; pyquery = callPackage ../development/python-modules/pyquery { }; @@ -6059,11 +6165,15 @@ in { pysam = callPackage ../development/python-modules/pysam { }; - pysaml2 = callPackage ../development/python-modules/pysaml2 { inherit (pkgs) xmlsec; }; + pysaml2 = callPackage ../development/python-modules/pysaml2 { + inherit (pkgs) xmlsec; + }; pysc2 = callPackage ../development/python-modules/pysc2 { }; - pyscard = callPackage ../development/python-modules/pyscard { inherit (pkgs.darwin.apple_sdk.frameworks) PCSC; }; + pyscard = callPackage ../development/python-modules/pyscard { + inherit (pkgs.darwin.apple_sdk.frameworks) PCSC; + }; pyschedule = callPackage ../development/python-modules/pyschedule { }; @@ -6091,14 +6201,21 @@ in { pyshp = callPackage ../development/python-modules/pyshp { }; - pyside2-tools = - toPythonModule (callPackage ../development/python-modules/pyside2-tools { inherit (pkgs) cmake qt5; }); + pyside2-tools = toPythonModule (callPackage ../development/python-modules/pyside2-tools { + inherit (pkgs) cmake qt5; + }); - pyside2 = toPythonModule (callPackage ../development/python-modules/pyside2 { inherit (pkgs) cmake ninja qt5; }); + pyside2 = toPythonModule (callPackage ../development/python-modules/pyside2 { + inherit (pkgs) cmake ninja qt5; + }); - pyside = callPackage ../development/python-modules/pyside { inherit (pkgs) mesa; }; + pyside = callPackage ../development/python-modules/pyside { + inherit (pkgs) mesa; + }; - pysideShiboken = callPackage ../development/python-modules/pyside/shiboken.nix { inherit (pkgs) libxml2 libxslt; }; + pysideShiboken = callPackage ../development/python-modules/pyside/shiboken.nix { + inherit (pkgs) libxml2 libxslt; + }; pysideTools = callPackage ../development/python-modules/pyside/tools.nix { }; @@ -6106,7 +6223,9 @@ in { pysingleton = callPackage ../development/python-modules/pysingleton { }; - pyslurm = callPackage ../development/python-modules/pyslurm { slurm = pkgs.slurm; }; + pyslurm = callPackage ../development/python-modules/pyslurm { + inherit (pkgs) slurm; + }; pysma = callPackage ../development/python-modules/pysma { }; @@ -6172,7 +6291,9 @@ in { pystache = callPackage ../development/python-modules/pystache { }; - pystemd = callPackage ../development/python-modules/pystemd { systemd = pkgs.systemd; }; + pystemd = callPackage ../development/python-modules/pystemd { + inherit (pkgs) systemd; + }; PyStemmer = callPackage ../development/python-modules/pystemmer { }; @@ -6210,18 +6331,27 @@ in { pytest = if isPy3k then self.pytest_6 else self.pytest_4; pytest_4 = callPackage - ../development/python-modules/pytest/4.nix { # hypothesis tests require pytest that causes dependency cycle - hypothesis = self.hypothesis.override { doCheck = false; }; + ../development/python-modules/pytest/4.nix { + # hypothesis tests require pytest that causes dependency cycle + hypothesis = self.hypothesis.override { + doCheck = false; + }; }; pytest_5 = callPackage - ../development/python-modules/pytest/5.nix { # hypothesis tests require pytest that causes dependency cycle - hypothesis = self.hypothesis.override { doCheck = false; }; + ../development/python-modules/pytest/5.nix { + # hypothesis tests require pytest that causes dependency cycle + hypothesis = self.hypothesis.override { + doCheck = false; + }; }; pytest_6 = - callPackage ../development/python-modules/pytest { # hypothesis tests require pytest that causes dependency cycle - hypothesis = self.hypothesis.override { doCheck = false; }; + callPackage ../development/python-modules/pytest { + # hypothesis tests require pytest that causes dependency cycle + hypothesis = self.hypothesis.override { + doCheck = false; + }; }; pytest-aiohttp = callPackage ../development/python-modules/pytest-aiohttp { }; @@ -6358,7 +6488,9 @@ in { pytest-runner = self.pytestrunner; # added 2021-01-04 pytestrunner = callPackage ../development/python-modules/pytestrunner { }; - pytest-sanic = callPackage ../development/python-modules/pytest-sanic { }; + pytest-sanic = callPackage ../development/python-modules/pytest-sanic { + sanic = self.sanic.override { doCheck = false; }; + }; pytest-server-fixtures = callPackage ../development/python-modules/pytest-server-fixtures { }; @@ -6512,7 +6644,9 @@ in { python-lzf = callPackage ../development/python-modules/python-lzf { }; - python-lzo = callPackage ../development/python-modules/python-lzo { inherit (pkgs) lzo; }; + python-lzo = callPackage ../development/python-modules/python-lzo { + inherit (pkgs) lzo; + }; python_magic = callPackage ../development/python-modules/python-magic { }; @@ -6596,7 +6730,9 @@ in { inherit (pkgs) snap7; }; - python-snappy = callPackage ../development/python-modules/python-snappy { inherit (pkgs) snappy; }; + python-snappy = callPackage ../development/python-modules/python-snappy { + inherit (pkgs) snappy; + }; python-socketio = callPackage ../development/python-modules/python-socketio { }; @@ -6654,7 +6790,9 @@ in { pytools = callPackage ../development/python-modules/pytools { }; - pytorch = callPackage ../development/python-modules/pytorch { cudaSupport = pkgs.config.cudaSupport or false; }; + pytorch = callPackage ../development/python-modules/pytorch { + cudaSupport = pkgs.config.cudaSupport or false; + }; pytorch-bin = callPackage ../development/python-modules/pytorch/bin.nix { }; @@ -6662,9 +6800,13 @@ in { pytorch-metric-learning = callPackage ../development/python-modules/pytorch-metric-learning { }; - pytorchWithCuda = self.pytorch.override { cudaSupport = true; }; + pytorchWithCuda = self.pytorch.override { + cudaSupport = true; + }; - pytorchWithoutCuda = self.pytorch.override { cudaSupport = false; }; + pytorchWithoutCuda = self.pytorch.override { + cudaSupport = false; + }; pytrafikverket = callPackage ../development/python-modules/pytrafikverket { }; @@ -6691,7 +6833,9 @@ in { }); }; - pyudev = callPackage ../development/python-modules/pyudev { inherit (pkgs) systemd; }; + pyudev = callPackage ../development/python-modules/pyudev { + inherit (pkgs) systemd; + }; pyunbound = callPackage ../tools/networking/unbound/python.nix { }; @@ -6701,7 +6845,9 @@ in { pyupgrade = callPackage ../development/python-modules/pyupgrade { }; - pyusb = callPackage ../development/python-modules/pyusb { libusb1 = pkgs.libusb1; }; + pyusb = callPackage ../development/python-modules/pyusb { + inherit (pkgs) libusb1; + }; pyutil = callPackage ../development/python-modules/pyutil { }; @@ -6745,8 +6891,9 @@ in { pywavelets = callPackage ../development/python-modules/pywavelets { }; - # We need "normal" libxml2 and not the python package by the same name. - pywbem = callPackage ../development/python-modules/pywbem { libxml2 = pkgs.libxml2; }; + pywbem = callPackage ../development/python-modules/pywbem { + inherit (pkgs) libxml2; + }; PyWebDAV = callPackage ../development/python-modules/pywebdav { }; @@ -6827,7 +6974,9 @@ in { qscintilla-qt4 = callPackage ../development/python-modules/qscintilla { }; - qscintilla-qt5 = pkgs.libsForQt5.callPackage ../development/python-modules/qscintilla-qt5 { pythonPackages = self; }; + qscintilla-qt5 = pkgs.libsForQt5.callPackage ../development/python-modules/qscintilla-qt5 { + pythonPackages = self; + }; qscintilla = self.qscintilla-qt4; @@ -6843,8 +6992,8 @@ in { quandl = callPackage ../development/python-modules/quandl { }; - Quandl = - callPackage ../development/python-modules/quandl { }; # alias for an older package which did not support Python 3 + # TODO: rename this + Quandl = callPackage ../development/python-modules/quandl { }; # alias for an older package which did not support Python 3 quantities = callPackage ../development/python-modules/quantities { }; @@ -6874,9 +7023,13 @@ in { random2 = callPackage ../development/python-modules/random2 { }; - rarfile = callPackage ../development/python-modules/rarfile { inherit (pkgs) libarchive; }; + rarfile = callPackage ../development/python-modules/rarfile { + inherit (pkgs) libarchive; + }; - rasterio = callPackage ../development/python-modules/rasterio { gdal = pkgs.gdal_2; }; # gdal 3.0 not supported yet + rasterio = callPackage ../development/python-modules/rasterio { + gdal = pkgs.gdal_2; + }; ratelimit = callPackage ../development/python-modules/ratelimit { }; @@ -7026,7 +7179,9 @@ in { rising = callPackage ../development/python-modules/rising { }; - rivet = disabledIf (!isPy3k) (toPythonModule (pkgs.rivet.override { python3 = python; })); + rivet = disabledIf (!isPy3k) (toPythonModule (pkgs.rivet.override { + python3 = python; + })); rjsmin = callPackage ../development/python-modules/rjsmin { }; @@ -7088,7 +7243,9 @@ in { rply = callPackage ../development/python-modules/rply { }; - rpm = disabledIf (!isPy3k) (toPythonModule (pkgs.rpm.override { inherit python; })); + rpm = disabledIf (!isPy3k) (toPythonModule (pkgs.rpm.override { + inherit python; + })); rpmfluff = callPackage ../development/python-modules/rpmfluff { }; @@ -7108,7 +7265,9 @@ in { rtmidi-python = callPackage ../development/python-modules/rtmidi-python { }; - Rtree = callPackage ../development/python-modules/Rtree { inherit (pkgs) libspatialindex; }; + Rtree = callPackage ../development/python-modules/Rtree { + inherit (pkgs) libspatialindex; + }; rtslib = callPackage ../development/python-modules/rtslib { }; @@ -7274,7 +7433,9 @@ in { seccomp = callPackage ../development/python-modules/seccomp { }; - secp256k1 = callPackage ../development/python-modules/secp256k1 { inherit (pkgs) secp256k1; }; + secp256k1 = callPackage ../development/python-modules/secp256k1 { + inherit (pkgs) secp256k1; + }; secretstorage = if isPy3k then callPackage ../development/python-modules/secretstorage { } @@ -7303,7 +7464,9 @@ in { sendgrid = callPackage ../development/python-modules/sendgrid { }; - sentencepiece = callPackage ../development/python-modules/sentencepiece { inherit (pkgs) sentencepiece; }; + sentencepiece = callPackage ../development/python-modules/sentencepiece { + inherit (pkgs) sentencepiece; + }; sentinel = callPackage ../development/python-modules/sentinel { }; @@ -7365,8 +7528,9 @@ in { shellingham = callPackage ../development/python-modules/shellingham { }; - shiboken2 = - toPythonModule (callPackage ../development/python-modules/shiboken2 { inherit (pkgs) cmake llvmPackages qt5; }); + shiboken2 = toPythonModule (callPackage ../development/python-modules/shiboken2 { + inherit (pkgs) cmake llvmPackages qt5; + }); shippai = callPackage ../development/python-modules/shippai { }; @@ -7456,7 +7620,9 @@ in { slither-analyzer = callPackage ../development/python-modules/slither-analyzer { }; - slixmpp = callPackage ../development/python-modules/slixmpp { inherit (pkgs) gnupg; }; + slixmpp = callPackage ../development/python-modules/slixmpp { + inherit (pkgs) gnupg; + }; slob = callPackage ../development/python-modules/slob { }; @@ -7480,7 +7646,9 @@ in { smpplib = callPackage ../development/python-modules/smpplib { }; - snack = toPythonModule (pkgs.newt.override { inherit (self) python; }); + snack = toPythonModule (pkgs.newt.override { + inherit (self) python; + }); snakebite = callPackage ../development/python-modules/snakebite { }; @@ -7599,8 +7767,9 @@ in { sphinxcontrib-openapi = callPackage ../development/python-modules/sphinxcontrib-openapi { }; - sphinxcontrib_plantuml = - callPackage ../development/python-modules/sphinxcontrib_plantuml { inherit (pkgs) plantuml; }; + sphinxcontrib_plantuml = callPackage ../development/python-modules/sphinxcontrib_plantuml { + inherit (pkgs) plantuml; + }; sphinxcontrib-qthelp = callPackage ../development/python-modules/sphinxcontrib-qthelp { }; @@ -7643,9 +7812,11 @@ in { spotipy = callPackage ../development/python-modules/spotipy { }; spyder = callPackage ../development/python-modules/spyder { }; + spyder_3 = callPackage ../development/python-modules/spyder/3.nix { }; spyder-kernels = callPackage ../development/python-modules/spyder-kernels { }; + spyder-kernels_0_5 = callPackage ../development/python-modules/spyder-kernels/0.x.nix { }; sqlalchemy = callPackage ../development/python-modules/sqlalchemy { }; @@ -7667,6 +7838,7 @@ in { sqlitedict = callPackage ../development/python-modules/sqlitedict { }; sqlite-fts4 = callPackage ../development/python-modules/sqlite-fts4 { }; + sqlite-utils = callPackage ../development/python-modules/sqlite-utils { }; sqlmap = callPackage ../development/python-modules/sqlmap { }; @@ -7767,7 +7939,9 @@ in { subprocess32 = callPackage ../development/python-modules/subprocess32 { }; - subunit = callPackage ../development/python-modules/subunit { inherit (pkgs) subunit cppunit check; }; + subunit = callPackage ../development/python-modules/subunit { + inherit (pkgs) subunit cppunit check; + }; suds = callPackage ../development/python-modules/suds { }; @@ -7818,16 +7992,18 @@ in { else callPackage ../development/python-modules/sympy/1_5.nix { }; - systemd = callPackage ../development/python-modules/systemd { inherit (pkgs) systemd; }; + systemd = callPackage ../development/python-modules/systemd { + inherit (pkgs) systemd; + }; sysv_ipc = callPackage ../development/python-modules/sysv_ipc { }; tableaudocumentapi = callPackage ../development/python-modules/tableaudocumentapi { }; tables = if isPy3k then - callPackage ../development/python-modules/tables { hdf5 = pkgs.hdf5.override { zlib = pkgs.zlib; }; } + callPackage ../development/python-modules/tables { } else - callPackage ../development/python-modules/tables/3.5.nix { hdf5 = pkgs.hdf5.override { zlib = pkgs.zlib; }; }; + callPackage ../development/python-modules/tables/3.5.nix { }; tablib = callPackage ../development/python-modules/tablib { }; @@ -7906,9 +8082,13 @@ in { tensorflow-tensorboard = self.tensorflow-tensorboard_2; - tensorflowWithCuda = self.tensorflow.override { cudaSupport = true; }; + tensorflowWithCuda = self.tensorflow.override { + cudaSupport = true; + }; - tensorflowWithoutCuda = self.tensorflow.override { cudaSupport = false; }; + tensorflowWithoutCuda = self.tensorflow.override { + cudaSupport = false; + }; tensorly = callPackage ../development/python-modules/tensorly { }; @@ -7993,14 +8173,16 @@ in { thumborPexif = callPackage ../development/python-modules/thumborpexif { }; tkinter = let - py = python.override{x11Support=true;}; + py = python.override { x11Support=true; }; in callPackage ../development/python-modules/tkinter { py = py; }; tidylib = callPackage ../development/python-modules/pytidylib { }; tifffile = callPackage ../development/python-modules/tifffile { }; - tiledb = callPackage ../development/python-modules/tiledb { inherit (pkgs) tiledb; }; + tiledb = callPackage ../development/python-modules/tiledb { + inherit (pkgs) tiledb; + }; tilestache = callPackage ../development/python-modules/tilestache { }; @@ -8078,7 +8260,9 @@ in { # Used by streamlit, graphite_beacon, 2021-01-29 tornado_5 = callPackage ../development/python-modules/tornado/5.nix { }; - towncrier = callPackage ../development/python-modules/towncrier { inherit (pkgs) git; }; + towncrier = callPackage ../development/python-modules/towncrier { + inherit (pkgs) git; + }; tox = callPackage ../development/python-modules/tox { }; @@ -8231,7 +8415,9 @@ in { uarray = callPackage ../development/python-modules/uarray { }; - ueberzug = callPackage ../development/python-modules/ueberzug { inherit (pkgs.xorg) libX11 libXext; }; + ueberzug = callPackage ../development/python-modules/ueberzug { + inherit (pkgs.xorg) libX11 libXext; + }; ufonormalizer = callPackage ../development/python-modules/ufonormalizer { }; @@ -8354,7 +8540,10 @@ in { varint = callPackage ../development/python-modules/varint { }; - vcrpy = callPackage ../development/python-modules/vcrpy { }; + vcrpy = if isPy27 then + callPackage ../development/python-modules/vcrpy/3.nix { } + else + callPackage ../development/python-modules/vcrpy { }; vcver = callPackage ../development/python-modules/vcver { }; @@ -8470,7 +8659,9 @@ in { wasmer = callPackage ../development/python-modules/wasmer { }; - watchdog = callPackage ../development/python-modules/watchdog { }; + watchdog = callPackage ../development/python-modules/watchdog { + inherit (pkgs.darwin.apple_sdk.frameworks) CoreServices; + }; waterfurnace = callPackage ../development/python-modules/waterfurnace { }; @@ -8610,7 +8801,9 @@ in { x256 = callPackage ../development/python-modules/x256 { }; - xapian = callPackage ../development/python-modules/xapian { xapian = pkgs.xapian; }; + xapian = callPackage ../development/python-modules/xapian { + inherit (pkgs) xapian; + }; xapp = callPackage ../development/python-modules/xapp { inherit (pkgs) gtk3 gobject-introspection polkit; @@ -8635,7 +8828,9 @@ in { xenomapper = disabledIf (!isPy3k) (callPackage ../applications/science/biology/xenomapper { }); - xgboost = callPackage ../development/python-modules/xgboost { xgboost = pkgs.xgboost; }; + xgboost = callPackage ../development/python-modules/xgboost { + inherit (pkgs) xgboost; + }; xhtml2pdf = callPackage ../development/python-modules/xhtml2pdf { }; @@ -8685,7 +8880,9 @@ in { xstatic-pygments = callPackage ../development/python-modules/xstatic-pygments { }; - xvfbwrapper = callPackage ../development/python-modules/xvfbwrapper { inherit (pkgs.xorg) xorgserver; }; + xvfbwrapper = callPackage ../development/python-modules/xvfbwrapper { + inherit (pkgs.xorg) xorgserver; + }; xxhash = callPackage ../development/python-modules/xxhash { }; @@ -8744,7 +8941,9 @@ in { z3c-checkversions = callPackage ../development/python-modules/z3c-checkversions { }; - z3 = (toPythonModule (pkgs.z3.override { inherit python; })).python; + z3 = (toPythonModule (pkgs.z3.override { + inherit python; + })).python; zake = callPackage ../development/python-modules/zake { }; @@ -8770,7 +8969,9 @@ in { zeep = callPackage ../development/python-modules/zeep { }; - zeitgeist = (toPythonModule (pkgs.zeitgeist.override { python3 = python; })).py; + zeitgeist = (toPythonModule (pkgs.zeitgeist.override { + python3 = python; + })).py; zerobin = callPackage ../development/python-modules/zerobin { }; @@ -8863,10 +9064,11 @@ in { zstandard = callPackage ../development/python-modules/zstandard { }; - zstd = callPackage ../development/python-modules/zstd { inherit (pkgs) zstd; }; + zstd = callPackage ../development/python-modules/zstd { + inherit (pkgs) zstd; + }; zulip = callPackage ../development/python-modules/zulip { }; zxcvbn = callPackage ../development/python-modules/zxcvbn { }; - } diff --git a/third_party/nixpkgs/pkgs/top-level/qt5-packages.nix b/third_party/nixpkgs/pkgs/top-level/qt5-packages.nix index 336f58adf1..656a8a5c0f 100644 --- a/third_party/nixpkgs/pkgs/top-level/qt5-packages.nix +++ b/third_party/nixpkgs/pkgs/top-level/qt5-packages.nix @@ -115,6 +115,8 @@ in (kdeFrameworks // plasma5 // plasma5.thirdParty // kdeApplications // qt5 // kpmcore = callPackage ../development/libraries/kpmcore { }; + mauikit = callPackage ../development/libraries/mauikit { }; + mlt = callPackage ../development/libraries/mlt/qt-5.nix { }; openbr = callPackage ../development/libraries/openbr { };