From eefb417d1450200dcfabb543d973cb05cae7d6c1 Mon Sep 17 00:00:00 2001 From: Default email Date: Fri, 6 Nov 2020 01:33:48 +0100 Subject: [PATCH] Project import generated by Copybara. GitOrigin-RevId: a52e974cff8fb80c427e0d55c01b3b8c770ccec4 --- third_party/nixpkgs/.github/CODEOWNERS | 10 + third_party/nixpkgs/README.md | 2 +- .../doc/languages-frameworks/index.xml | 1 + .../nixpkgs/doc/languages-frameworks/java.xml | 18 +- .../doc/languages-frameworks/maven.section.md | 354 + .../doc/languages-frameworks/rust.section.md | 46 +- third_party/nixpkgs/doc/stdenv/stdenv.xml | 7 +- .../nixpkgs/maintainers/maintainer-list.nix | 42 + .../manual/administration/service-mgmt.xml | 98 +- .../doc/manual/release-notes/rl-2103.xml | 29 +- .../installer/tools/nixos-generate-config.pl | 5 + .../nixpkgs/nixos/modules/misc/ids.nix | 8 +- .../nixpkgs/nixos/modules/module-list.nix | 6 +- .../modules/services/databases/riak-cs.nix | 202 - .../modules/services/databases/stanchion.nix | 194 - .../modules/services/hardware/bluetooth.nix | 2 + .../modules/services/logging/promtail.nix | 95 + .../nixos/modules/services/mail/freepops.nix | 89 - .../monitoring/prometheus/exporters.nix | 9 + .../monitoring/prometheus/exporters/sql.nix | 104 + .../services/network-filesystems/ipfs.nix | 17 +- .../modules/services/networking/dhcpcd.nix | 5 + .../modules/services/networking/nar-serve.nix | 55 + .../services/networking/ntp/chrony.nix | 4 +- .../modules/services/networking/stunnel.nix | 9 +- .../modules/services/networking/tailscale.nix | 26 +- .../modules/services/torrent/transmission.nix | 2 + .../services/video/epgstation/generate | 31 - .../services/video/epgstation/streaming.json | 130 +- .../modules/services/web-apps/keycloak.nix | 692 ++ .../modules/services/web-apps/keycloak.xml | 205 + .../nixos/modules/system/boot/kernel.nix | 2 +- .../nixos/modules/system/boot/resolved.nix | 2 +- .../nixos/modules/virtualisation/ec2-amis.nix | 36 +- .../nixpkgs/nixos/release-combined.nix | 2 - third_party/nixpkgs/nixos/tests/all-tests.nix | 6 + third_party/nixpkgs/nixos/tests/ammonite.nix | 2 +- .../tests/initrd-network-ssh/default.nix | 4 + third_party/nixpkgs/nixos/tests/keycloak.nix | 144 + third_party/nixpkgs/nixos/tests/loki.nix | 31 +- third_party/nixpkgs/nixos/tests/nar-serve.nix | 48 + third_party/nixpkgs/nixos/tests/oh-my-zsh.nix | 18 + .../nixos/tests/prometheus-exporters.nix | 44 + third_party/nixpkgs/nixos/tests/sbt.nix | 18 + third_party/nixpkgs/nixos/tests/scala.nix | 33 + .../applications/audio/ardour/default.nix | 18 +- .../applications/audio/ft2-clone/default.nix | 4 +- .../pkgs/applications/audio/mamba/default.nix | 4 +- .../pkgs/applications/audio/ncmpc/default.nix | 4 +- .../applications/audio/ncpamixer/default.nix | 4 +- .../applications/audio/padthv1/default.nix | 4 +- .../audio/pianobooster/default.nix | 4 +- .../applications/audio/picard/default.nix | 4 +- .../applications/audio/plexamp/default.nix | 4 +- .../applications/audio/ptcollab/default.nix | 34 + .../audio/pulseaudio-ctl/default.nix | 4 +- .../audio/pulseeffects/default.nix | 4 +- .../pkgs/applications/blockchains/btc1.nix | 41 - .../blockchains/polkadot/default.nix | 8 +- .../substrate-wasm-builder-runner.patch | 25 - .../editors/nano/nanorc/default.nix | 43 +- .../editors/neovim/gnvim/wrapper.nix | 4 +- .../applications/editors/neovim/utils.nix | 7 +- .../applications/editors/neovim/wrapper.nix | 1 - .../applications/editors/quilter/default.nix | 4 +- .../editors/textadept/{ => 10}/default.nix | 0 .../editors/textadept/{ => 10}/deps.nix | 0 .../editors/textadept/11/default.nix | 53 + .../editors/textadept/11/deps.nix | 50 + .../pkgs/applications/editors/vim/macvim.nix | 13 + .../applications/editors/vscode/vscode.nix | 6 +- .../applications/editors/vscode/vscodium.nix | 6 +- .../graphics/gimp/plugins/default.nix | 16 - .../applications/graphics/krita/default.nix | 4 +- .../graphics/photoflare/default.nix | 31 + .../applications/graphics/yed/default.nix | 15 +- .../applications/misc/archiver/default.nix | 6 +- .../pkgs/applications/misc/charm/default.nix | 6 +- .../pkgs/applications/misc/dasel/default.nix | 30 + .../applications/misc/dbeaver/default.nix | 4 +- .../misc/elf-dissector/default.nix | 26 + .../pkgs/applications/misc/gpxsee/default.nix | 9 +- .../applications/misc/haxor-news/default.nix | 40 +- .../pkgs/applications/misc/hugo/default.nix | 6 +- .../applications/misc/krename/default.nix | 4 +- .../pkgs/applications/misc/kupfer/default.nix | 10 +- .../applications/misc/megasync/default.nix | 36 +- .../misc/mysql-workbench/default.nix | 8 +- .../applications/misc/obsidian/default.nix | 4 +- .../misc/pass-secret-service/default.nix | 61 + .../misc/pdfsam-basic/default.nix | 4 +- .../pkgs/applications/misc/tiv/default.nix | 27 + .../applications/networking/Sylk/default.nix | 4 +- .../networking/browsers/chromium/common.nix | 7 +- .../networking/browsers/chromium/default.nix | 15 +- .../networking/browsers/chromium/update.py | 30 +- .../browsers/chromium/upstream-info.json | 42 +- .../networking/browsers/firefox/common.nix | 6 +- .../tor-browser-bundle-bin/default.nix | 1 + .../browsers/ungoogled-chromium/browser.nix | 13 +- .../browsers/ungoogled-chromium/common.nix | 128 +- .../browsers/ungoogled-chromium/default.nix | 28 +- .../patches/dont-use-ANGLE-by-default.patch | 26 - .../enable-vdpau-support-for-nvidia.patch | 65 - .../enable-video-acceleration-on-linux.patch | 48 - .../patches/nix_plugin_paths_68.patch | 61 - .../patches/remove-webp-include-69.patch | 11 - .../ungoogled-chromium/ungoogled-src.nix | 6 +- .../ungoogled-chromium/upstream-info.json | 18 +- .../networking/cluster/kube3d/default.nix | 18 +- .../networking/cluster/sonobuoy/default.nix | 2 +- .../networking/cluster/starboard/default.nix | 8 +- .../cluster/terraform-providers/default.nix | 2 + .../terraform-providers/hcloud/default.nix | 32 + .../terraform-providers/linuxbox/default.nix | 26 + .../terraform-providers/providers.json | 49 +- .../instant-messengers/mcabber/default.nix | 4 +- .../signal-desktop/default.nix | 4 +- .../instant-messengers/slack/default.nix | 19 +- .../instant-messengers/slack/update.sh | 41 + .../instant-messengers/teams/default.nix | 2 +- .../telegram/tdesktop/default.nix | 4 +- .../wire-desktop/default.nix | 8 +- .../networking/ipfs-migrator/default.nix | 4 +- .../mailreaders/bubblemail/default.nix | 76 + .../thunderbird-bin/release_sources.nix | 530 +- .../mailreaders/thunderbird/default.nix | 5 +- .../networking/nextcloud-client/default.nix | 4 +- .../networking/nextdns/default.nix | 4 +- .../networking/remote/waypipe/default.nix | 7 +- .../networking/seaweedfs/default.nix | 24 + .../networking/sync/backintime/common.nix | 32 +- .../networking/sync/backintime/qt.nix | 26 + .../networking/sync/backintime/qt4.nix | 28 - .../networking/syncplay/default.nix | 4 +- .../networking/syncthing/default.nix | 6 +- .../applications/office/todoman/default.nix | 49 +- .../applications/radio/limesuite/default.nix | 4 +- .../science/biology/picard-tools/default.nix | 4 +- .../science/biology/plink/default.nix | 25 - .../science/chemistry/marvin/default.nix | 4 +- .../science/electronics/kicad/base.nix | 11 - .../science/electronics/kicad/default.nix | 3 +- .../science/electronics/kicad/update.sh | 6 +- .../science/electronics/kicad/versions.nix | 40 +- .../science/logic/lean/default.nix | 10 +- .../git-and-tools/default.nix | 2 + .../git-and-tools/git-absorb/default.nix | 10 +- .../git-and-tools/git-chglog/default.nix | 22 + .../git-and-tools/git-machete/default.nix | 4 +- .../git-and-tools/git/default.nix | 4 +- .../version-management/git-lfs/default.nix | 4 +- .../applications/video/dvb-apps/default.nix | 24 - .../applications/video/epgstation/default.nix | 143 +- .../applications/video/epgstation/generate.sh | 34 - .../video/epgstation/package.json | 106 +- .../applications/video/epgstation/update.nix | 66 + .../applications/video/k9copy/default.nix | 63 - .../pkgs/applications/video/k9copy/gcc6.patch | 26 - .../applications/video/shotcut/default.nix | 10 +- .../virtualization/crun/default.nix | 4 +- .../avoid-static-libtirpc-build.patch | 21 + .../virtualization/nvidia-docker/libnvc.nix | 54 +- .../virtualization/singularity/default.nix | 4 +- .../window-managers/i3/default.nix | 4 +- .../window-managers/i3/status-rust.nix | 23 +- .../window-managers/icewm/default.nix | 4 +- .../pkgs/build-support/docker/default.nix | 4 +- .../install-shell-files/default.nix | 12 +- .../setup-hooks/install-shell-files.sh | 127 +- .../pkgs/data/fonts/fraunces/default.nix | 25 + .../nixpkgs/pkgs/data/fonts/iosevka/bin.nix | 18 +- .../pkgs/data/fonts/iosevka/default.nix | 42 +- .../pkgs/data/fonts/iosevka/package.json | 28 - .../iosevka/{update.sh => update-bin.sh} | 10 +- .../pkgs/data/fonts/iosevka/update-default.sh | 21 + .../pkgs/data/fonts/ttf-tw-moe/default.nix | 27 + .../data/icons/numix-cursor-theme/default.nix | 11 +- .../icons/numix-icon-theme-circle/default.nix | 4 +- .../icons/numix-icon-theme-square/default.nix | 4 +- .../pkgs/data/misc/hackage/default.nix | 4 +- .../nixpkgs/pkgs/data/misc/tzdata/default.nix | 6 +- .../pkgs/data/themes/canta/default.nix | 2 +- .../extensions/battery-status/default.nix | 30 - .../extensions/material-shell/default.nix | 4 +- .../desktops/lxde/core/lxtask/default.nix | 4 +- .../pkgs/desktops/plasma-5/kdecoration.nix | 4 - .../pkgs/desktops/plasma-5/kwin/default.nix | 7 +- .../pkgs/development/compilers/gcc/builder.sh | 7 +- .../pkgs/development/compilers/ghc/8.10.1.nix | 1 + .../compilers/ghc/8.10.2-binary.nix | 75 +- .../pkgs/development/compilers/ghc/8.10.2.nix | 9 +- .../pkgs/development/compilers/ghc/8.6.5.nix | 1 + .../pkgs/development/compilers/ghc/8.8.2.nix | 1 + .../pkgs/development/compilers/ghc/8.8.3.nix | 1 + .../pkgs/development/compilers/ghc/8.8.4.nix | 7 +- .../pkgs/development/compilers/ghc/9.0.1.nix | 1 + .../compilers/ghcjs-ng/default.nix | 2 + .../development/compilers/gleam/default.nix | 6 +- .../pkgs/development/compilers/go/1.14.nix | 4 +- .../pkgs/development/compilers/go/1.15.nix | 4 +- .../pkgs/development/compilers/go/1.4.nix | 11 +- .../compilers/graalvm/community-edition.nix | 167 + .../development/compilers/halide/default.nix | 50 +- .../development/compilers/halide/nix.patch | 56 - .../development/compilers/ldc/default.nix | 5 +- .../development/compilers/ldc/generic.nix | 8 +- .../development/compilers/llvm/11/llvm.nix | 2 +- .../compilers/llvm/rocm/default.nix | 4 +- .../development/compilers/llvm/rocm/lld.nix | 4 + .../pkgs/development/compilers/mono/6.nix | 4 +- .../development/compilers/mono/generic.nix | 4 +- .../pkgs/development/compilers/openjdk/11.nix | 6 +- .../pkgs/development/compilers/openjdk/8.nix | 36 +- .../development/compilers/openjdk/default.nix | 4 + .../development/compilers/openjdk/jre.nix | 19 + .../compilers/owl-lisp/default.nix | 4 +- .../purescript/psc-package/default.nix | 10 +- .../pkgs/development/compilers/rust/1_45.nix | 1 + .../compilers/rust/{1_46.nix => 1_47.nix} | 21 +- .../development/compilers/rust/binary.nix | 12 +- .../compilers/rust/print-hashes.sh | 1 + .../pkgs/development/compilers/scala/2.10.nix | 43 - .../pkgs/development/compilers/scala/2.11.nix | 48 - .../pkgs/development/compilers/scala/2.12.nix | 47 - .../pkgs/development/compilers/scala/2.13.nix | 47 - .../pkgs/development/compilers/scala/2.x.nix | 117 + .../development/compilers/solc/default.nix | 19 +- .../compilers/spasm-ng/default.nix | 32 + .../go-modules/generic/default.nix | 8 +- .../haskell-modules/configuration-common.nix | 61 +- .../configuration-hackage2nix.yaml | 49 +- .../haskell-modules/hackage-packages.nix | 2246 ++++- .../haskell-modules/make-package-set.nix | 165 +- .../interpreters/clojure/babashka.nix | 12 +- .../pkgs/development/interpreters/php/7.3.nix | 20 + .../pkgs/development/interpreters/php/7.4.nix | 17 + .../php/{default.nix => generic.nix} | 36 +- .../interpreters/racket/default.nix | 6 +- .../interpreters/racket/minimal.nix | 2 +- .../interpreters/ruby/rubygems/default.nix | 4 +- .../interpreters/spidermonkey/78.nix | 22 +- .../development/libraries/amdvlk/default.nix | 4 +- .../development/libraries/enchant/2.x.nix | 4 +- .../development/libraries/expat/default.nix | 12 +- .../libraries/freetype/default.nix | 4 +- .../gamin/abstract-socket-namespace.patch | 73 + .../development/libraries/gamin/default.nix | 10 +- .../pkgs/development/libraries/gtk/2.x.nix | 5 +- .../libraries/harfbuzz/default.nix | 4 +- .../libraries/intel-media-driver/default.nix | 4 +- .../libraries/java/lombok/default.nix | 4 +- .../libraries/jbig2dec/default.nix | 6 +- .../development/libraries/kdsoap/default.nix | 4 +- .../libraries/libfilezilla/default.nix | 4 +- .../libraries/libfprint/default.nix | 4 +- ...LOC-and-_REALLOC-and-check-for-them-.patch | 31 + .../libraries/libgpiod/default.nix | 10 +- .../development/libraries/libical/default.nix | 2 +- .../libraries/libinput/default.nix | 15 +- .../development/libraries/libjcat/default.nix | 4 +- .../development/libraries/libmwaw/default.nix | 8 +- .../libraries/libqalculate/default.nix | 4 +- .../development/libraries/libsolv/default.nix | 4 +- .../development/libraries/libvirt/5.9.0.nix | 4 +- ...019-9325.CVE-2019-9371.CVE-2019-9433.patch | 211 - .../development/libraries/libvpx/default.nix | 22 +- .../development/libraries/libwebp/default.nix | 15 +- .../development/libraries/linbox/default.nix | 17 +- .../linbox/patches/linbox-pr256-part2.patch | 13 + .../development/libraries/mesa/default.nix | 7 +- ...include-dri-driver-path-in-cache-key.patch | 29 +- .../link-radv-with-ld_args_build_id.patch | 25 - .../libraries/mesa/missing-includes.patch | 12 - .../development/libraries/olm/default.nix | 4 +- .../development/libraries/openssl/default.nix | 4 +- .../development/libraries/osip/default.nix | 4 +- .../development/libraries/p11-kit/default.nix | 7 + .../libraries/pipewire/default.nix | 11 +- .../development/libraries/precice/default.nix | 4 +- .../development/libraries/pugixml/default.nix | 31 +- .../libraries/qrupdate/default.nix | 45 +- .../development/libraries/rocclr/default.nix | 7 +- .../libraries/rocm-comgr/default.nix | 4 +- .../libraries/rocm-device-libs/default.nix | 4 +- .../libraries/rocm-opencl-runtime/default.nix | 4 +- .../libraries/rocm-runtime/default.nix | 6 +- .../libraries/rocm-thunk/default.nix | 4 +- .../libraries/science/math/petsc/default.nix | 4 +- .../development/libraries/soil/default.nix | 45 +- .../development/libraries/waffle/default.nix | 54 + .../pkgs/development/libraries/zeromq/4.x.nix | 10 +- .../node-packages/node-packages.json | 3 +- .../node-packages/node-packages.nix | 7775 ++++++++++------- .../ocaml-modules/apron/default.nix | 17 +- .../asn1-combinators/default.nix | 6 +- .../ocaml-modules/cryptokit/default.nix | 40 +- .../development/ocaml-modules/gsl/default.nix | 11 +- .../ocaml-modules/janestreet/default.nix | 8 - .../email-message-angstrom-0.14.patch | 22 - .../ocaml-modules/mirage-channel/default.nix | 28 + .../ocaml-modules/mirage-console/default.nix | 24 + .../ocaml-modules/mirage-crypto/default.nix | 4 +- .../ocaml-modules/mirage-logs/default.nix | 28 + .../ocaml-modules/owl-base/default.nix | 16 +- .../development/ocaml-modules/tls/default.nix | 4 +- .../development/php-packages/composer/2.0.nix | 4 +- .../php-packages/event/default.nix | 4 +- .../php-packages/php-cs-fixer/default.nix | 4 +- .../php-packages/phpstan/default.nix | 4 +- .../php-packages/psalm/default.nix | 4 +- .../python-modules/aioresponses/default.nix | 4 +- .../python-modules/arrow/default.nix | 4 +- .../python-modules/authlib/default.nix | 4 +- .../azure-appconfiguration/default.nix | 4 +- .../python-modules/azure-core/default.nix | 4 +- .../azure-datalake-store/default.nix | 4 +- .../python-modules/azure-identity/default.nix | 4 +- .../azure-mgmt-billing/default.nix | 6 +- .../azure-mgmt-cognitiveservices/default.nix | 4 +- .../azure-mgmt-containerservice/default.nix | 4 +- .../azure-mgmt-core/default.nix | 4 +- .../azure-mgmt-datafactory/default.nix | 4 +- .../azure-mgmt-hdinsight/default.nix | 4 +- .../azure-mgmt-media/default.nix | 4 +- .../azure-mgmt-search/default.nix | 4 +- .../azure-mgmt-security/default.nix | 4 +- .../azure-mgmt-servicebus/default.nix | 4 +- .../python-modules/azure-mgmt-sql/default.nix | 4 +- .../azure-servicefabric/default.nix | 4 +- .../azure-synapse-artifacts/default.nix | 31 + .../python-modules/batchspawner/default.nix | 2 +- .../python-modules/bitarray/default.nix | 4 +- .../python-modules/blis/default.nix | 4 +- .../python-modules/breathe/default.nix | 4 +- .../python-modules/btchip/default.nix | 4 +- .../python-modules/caldav/default.nix | 4 +- .../python-modules/cbor2/default.nix | 4 +- .../python-modules/credstash/default.nix | 6 +- .../python-modules/crytic-compile/default.nix | 26 + .../python-modules/cssselect2/default.nix | 4 +- .../python-modules/cupy/default.nix | 5 +- .../python-modules/distro/default.nix | 2 +- .../django_modelcluster/default.nix | 4 +- .../python-modules/dockerspawner/default.nix | 2 +- .../python-modules/dotnetcore2/default.nix | 59 - .../python-modules/dotnetcore2/runtime.patch | 22 - .../python-modules/elementpath/default.nix | 4 +- .../python-modules/exifread/default.nix | 4 +- .../python-modules/flask-compress/default.nix | 4 +- .../google-cloud-iam/default.nix | 22 + .../google_api_core/default.nix | 36 +- .../python-modules/google_auth/default.nix | 35 +- .../google_cloud_automl/default.nix | 38 +- .../google_cloud_bigquery/default.nix | 52 +- .../google_cloud_container/default.nix | 23 +- .../google_cloud_core/default.nix | 24 +- .../google_cloud_error_reporting/default.nix | 28 +- .../google_cloud_kms/default.nix | 28 +- .../google_cloud_logging/default.nix | 32 +- .../google_cloud_pubsub/default.nix | 34 +- .../google_cloud_resource_manager/default.nix | 27 +- .../google_cloud_runtimeconfig/default.nix | 26 +- .../google_cloud_spanner/default.nix | 33 +- .../google_cloud_storage/default.nix | 37 +- .../google_cloud_testutils/default.nix | 32 +- .../google_cloud_texttospeech/default.nix | 22 +- .../google_cloud_translate/default.nix | 37 +- .../default.nix | 19 +- .../python-modules/gym/default.nix | 2 +- .../development/python-modules/jq/default.nix | 4 +- .../python-modules/kaitaistruct/default.nix | 4 +- .../python-modules/libtmux/default.nix | 4 +- .../python-modules/msgpack-numpy/default.nix | 4 +- .../python-modules/nix-kernel/default.nix | 3 + .../python-modules/numpy-stl/default.nix | 4 +- .../python-modules/nvchecker/default.nix | 4 +- .../python-modules/objgraph/default.nix | 4 +- .../pandas-datareader/default.nix | 34 + .../python-modules/papis/default.nix | 4 +- .../python-modules/param/default.nix | 4 +- .../python-modules/pex/default.nix | 4 +- .../python-modules/poetry/default.nix | 4 +- .../python-modules/proto-plus/default.nix | 4 +- .../python-modules/pushbullet/default.nix | 4 +- .../python-modules/pyairvisual/default.nix | 49 +- .../python-modules/pyatmo/default.nix | 17 +- .../python-modules/pycairo/default.nix | 24 +- .../python-modules/pyelftools/default.nix | 2 +- .../python-modules/pypass/default.nix | 84 + .../pypass/mark-executables.patch | 255 + .../python-modules/pyphen/default.nix | 4 +- .../python-modules/pytest/default.nix | 4 +- .../python-modules/python-sql/default.nix | 4 +- .../python-modules/pyzmq/default.nix | 37 +- .../development/python-modules/rq/default.nix | 4 +- .../setuptools-rust/default.nix | 7 +- .../development/python-modules/sh/default.nix | 4 +- .../slither-analyzer/default.nix | 6 +- .../python-modules/smugline/default.nix | 40 - .../python-modules/smugpy/default.nix | 21 - .../python-modules/sqlite-utils/default.nix | 42 + .../python-modules/thinc/default.nix | 4 +- .../python-modules/user-agents/default.nix | 4 +- .../python-modules/wled/default.nix | 2 +- .../development/tools/ammonite/default.nix | 40 +- .../build-managers/apache-ant/default.nix | 4 +- .../tools/build-managers/cmake/default.nix | 19 +- .../tools/build-managers/gn/default.nix | 2 +- ...boost-Do-not-add-system-paths-on-nix.patch | 40 + .../tools/build-managers/meson/default.nix | 5 + .../tools/build-managers/msbuild/default.nix | 2 +- .../build-managers/rocm-cmake/default.nix | 4 +- .../tools/build-managers/sbt/default.nix | 38 +- .../tools/build-managers/tup/default.nix | 16 +- .../development/tools/buildpack/default.nix | 4 +- .../development/tools/clj-kondo/default.nix | 6 +- .../jenkins/default.nix | 48 +- .../continuous-integration/jenkins/update.sh | 22 - .../development/tools/coursier/default.nix | 57 +- .../development/tools/github/bump/default.nix | 29 + .../tools/misc/blackfire/default.nix | 4 +- .../tools/misc/blackfire/php-probe.nix | 4 +- .../tools/operator-sdk/default.nix | 6 +- .../tools/parsing/antlr/{4.7.nix => 4.8.nix} | 6 +- .../pkgs/development/tools/rufo/Gemfile | 3 + .../pkgs/development/tools/rufo/Gemfile.lock | 13 + .../pkgs/development/tools/rufo/default.nix | 16 + .../pkgs/development/tools/rufo/gemset.nix | 12 + .../tools/rust/cargo-make/default.nix | 6 +- .../development/tools/vagrant/default.nix | 4 +- .../pkgs/development/tools/vagrant/gemset.nix | 106 +- .../tools/vagrant/gemset_libvirt.nix | 73 +- .../development/tools/wally-cli/default.nix | 4 +- .../pkgs/development/web/deno/default.nix | 6 +- .../pkgs/development/web/nodejs/v15.nix | 4 +- .../pkgs/games/minecraft-server/default.nix | 6 +- .../nixpkgs/pkgs/games/openxray/default.nix | 4 +- .../nixpkgs/pkgs/games/osu-lazer/default.nix | 4 +- .../nixpkgs/pkgs/games/osu-lazer/deps.nix | 8 +- .../nixpkgs/pkgs/games/scummvm/default.nix | 4 +- .../pkgs/misc/emulators/mgba/default.nix | 4 +- ...2364-Fix-missing-echogs-dependencies.patch | 835 -- .../nixpkgs/pkgs/misc/ghostscript/default.nix | 24 +- .../pkgs/misc/vim-plugins/generated.nix | 158 +- .../pkgs/misc/vim-plugins/vim-plugin-names | 4 +- .../os-specific/linux/apparmor/default.nix | 13 +- .../os-specific/linux/i2c-tools/default.nix | 4 +- .../os-specific/linux/iproute/default.nix | 8 +- .../pkgs/os-specific/linux/ipset/default.nix | 4 +- .../linux/kernel/hardened/patches.json | 30 +- .../os-specific/linux/kernel/linux-4.14.nix | 4 +- .../os-specific/linux/kernel/linux-4.19.nix | 4 +- .../os-specific/linux/kernel/linux-5.4.nix | 4 +- .../os-specific/linux/kernel/linux-5.8.nix | 4 +- .../os-specific/linux/kernel/linux-5.9.nix | 4 +- .../os-specific/linux/kernel/linux-rt-5.4.nix | 6 +- .../linux/kernel/linux-testing.nix | 4 +- .../os-specific/linux/kernel/linux-zen.nix | 8 +- .../pkgs/os-specific/linux/libcap/default.nix | 5 +- .../pkgs/os-specific/linux/lxcfs/default.nix | 4 +- .../linux/nvidia-x11/persistenced.nix | 10 +- .../os-specific/linux/open-iscsi/default.nix | 8 + .../os-specific/linux/pam_gnupg/default.nix | 4 +- .../os-specific/linux/pam_mount/default.nix | 47 +- .../linux/pam_mount/support_luks2.patch | 47 + .../pkgs/os-specific/linux/r8168/default.nix | 8 +- .../os-specific/linux/systemd/default.nix | 106 +- .../pkgs/os-specific/linux/zfs/default.nix | 4 +- .../nixpkgs/pkgs/servers/dns/nsd/default.nix | 4 +- .../home-assistant/component-packages.nix | 2 +- .../pkgs/servers/home-assistant/default.nix | 9 +- .../nixpkgs/pkgs/servers/keycloak/default.nix | 51 +- .../nixpkgs/pkgs/servers/lidarr/default.nix | 4 +- .../pkgs/servers/mail/freepops/default.nix | 29 - .../pkgs/servers/memcached/default.nix | 4 +- .../servers/monitoring/kapacitor/default.nix | 4 +- .../pkgs/servers/monitoring/munin/default.nix | 4 +- .../servers/monitoring/prometheus/default.nix | 4 +- .../monitoring/prometheus/sql-exporter.nix | 23 + .../monitoring/prometheus/webui-package.json | 28 +- .../monitoring/prometheus/webui-yarndeps.nix | 3312 +++---- .../nixpkgs/pkgs/servers/mpd/default.nix | 4 +- .../pkgs/servers/mqtt/mosquitto/default.nix | 4 +- .../pkgs/servers/nextcloud/default.nix | 8 +- .../pkgs/servers/nosql/riak-cs/2.1.1.nix | 70 - .../pkgs/servers/nosql/riak-cs/stanchion.nix | 65 - .../servers/rtsp-simple-server/default.nix | 35 + .../pkgs/servers/sql/patroni/default.nix | 2 +- .../pkgs/servers/sql/postgresql/default.nix | 4 +- .../patches/stabilize-timetz-dst.patch | 117 + .../pkgs/servers/tailscale/default.nix | 11 +- .../pkgs/servers/tracing/tempo/default.nix | 26 + .../nixpkgs/pkgs/servers/unifi/default.nix | 4 +- .../nixpkgs/pkgs/servers/x11/xorg/default.nix | 40 +- .../pkgs/servers/x11/xorg/overrides.nix | 7 - .../pkgs/servers/x11/xorg/tarballs.list | 12 +- .../pkgs/servers/zoneminder/default.nix | 6 +- .../shells/bash/bash-completion/default.nix | 4 +- .../pkgs/shells/liquidprompt/default.nix | 4 +- .../nixpkgs/pkgs/shells/mksh/default.nix | 4 +- .../pkgs/shells/zsh/oh-my-zsh/default.nix | 45 +- .../pkgs/shells/zsh/oh-my-zsh/update.sh | 19 - .../nixpkgs/pkgs/stdenv/darwin/default.nix | 5 +- .../pkgs/stdenv/generic/check-meta.nix | 19 +- third_party/nixpkgs/pkgs/test/default.nix | 2 + .../pkgs/test/install-shell-files/default.nix | 125 + .../pkgs/tools/X11/find-cursor/default.nix | 26 + .../pkgs/tools/admin/azure-cli/default.nix | 10 +- .../tools/admin/azure-cli/python-packages.nix | 45 +- .../pkgs/tools/admin/procs/default.nix | 6 +- .../nixpkgs/pkgs/tools/admin/salt/default.nix | 4 +- .../pkgs/tools/backup/kopia/default.nix | 6 - .../pkgs/tools/compression/brotli/default.nix | 13 +- .../ceph/ceph-glibc-2-32-sigdescr_np.patch | 63 + .../pkgs/tools/filesystems/ceph/default.nix | 1 + .../pkgs/tools/filesystems/mtools/default.nix | 4 +- .../pkgs/tools/graphics/piglit/default.nix | 77 + .../pkgs/tools/misc/as-tree/cargo-lock.patch | 13 + .../pkgs/tools/misc/as-tree/default.nix | 27 + .../pkgs/tools/misc/cloud-utils/default.nix | 4 +- ...id-false-positive-in-date-debug-test.patch | 52 - .../coreutils-8.31-android-cross.patch | 51 - .../coreutils/coreutils-8.31-musl-cross.patch | 1153 --- .../pkgs/tools/misc/coreutils/default.nix | 13 +- .../coreutils/sys-getdents-undeclared.patch | 100 + .../nixpkgs/pkgs/tools/misc/fzf/default.nix | 4 +- .../pkgs/tools/misc/mbuffer/default.nix | 4 +- .../pkgs/tools/misc/mstflint/default.nix | 1 + .../pkgs/tools/misc/onefetch/default.nix | 8 +- .../pkgs/tools/misc/parallel/default.nix | 4 +- .../misc/phoronix-test-suite/default.nix | 4 +- .../nixpkgs/pkgs/tools/misc/pspg/default.nix | 4 +- .../pkgs/tools/networking/curl/default.nix | 4 +- .../pkgs/tools/networking/curlie/default.nix | 6 +- .../tools/networking/dropbear/default.nix | 4 +- .../pkgs/tools/networking/i2pd/default.nix | 4 +- .../pkgs/tools/networking/lldpd/default.nix | 4 +- .../pkgs/tools/networking/oneshot/default.nix | 4 +- .../networking/shadowsocks-rust/default.nix | 6 +- .../tools/networking/slirp4netns/default.nix | 4 +- .../pkgs/tools/networking/unbound/default.nix | 4 +- .../pkgs/tools/nix/nar-serve/default.nix | 31 + .../package-management/nixops/default.nix | 9 +- .../package-management/nixops/generic.nix | 3 +- .../package-management/packagekit/qt.nix | 4 +- .../tools/security/1password-gui/default.nix | 4 +- .../tools/security/bitwarden_rs/default.nix | 6 +- .../tools/security/bitwarden_rs/vault.nix | 4 +- .../pkgs/tools/system/hostctl/default.nix | 36 + .../pkgs/tools/system/memtester/default.nix | 4 +- .../nixpkgs/pkgs/tools/system/mlc/default.nix | 30 + .../pkgs/tools/system/monit/default.nix | 4 +- .../pkgs/tools/system/rocm-smi/default.nix | 4 +- .../pdf2htmlEX/add-glib-cmake.patch | 17 - .../tools/typesetting/pdf2htmlEX/default.nix | 48 - .../pkgs/tools/video/flvtool2/default.nix | 17 - .../nixpkgs/pkgs/top-level/aliases.nix | 8 + .../nixpkgs/pkgs/top-level/all-packages.nix | 193 +- .../pkgs/top-level/haskell-packages.nix | 26 +- .../nixpkgs/pkgs/top-level/ocaml-packages.nix | 6 + .../pkgs/top-level/python-packages.nix | 20 +- .../nixpkgs/pkgs/top-level/release.nix | 2 +- 563 files changed, 16580 insertions(+), 11943 deletions(-) create mode 100644 third_party/nixpkgs/doc/languages-frameworks/maven.section.md delete mode 100644 third_party/nixpkgs/nixos/modules/services/databases/riak-cs.nix delete mode 100644 third_party/nixpkgs/nixos/modules/services/databases/stanchion.nix create mode 100644 third_party/nixpkgs/nixos/modules/services/logging/promtail.nix delete mode 100644 third_party/nixpkgs/nixos/modules/services/mail/freepops.nix create mode 100644 third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/sql.nix create mode 100644 third_party/nixpkgs/nixos/modules/services/networking/nar-serve.nix delete mode 100755 third_party/nixpkgs/nixos/modules/services/video/epgstation/generate create mode 100644 third_party/nixpkgs/nixos/modules/services/web-apps/keycloak.nix create mode 100644 third_party/nixpkgs/nixos/modules/services/web-apps/keycloak.xml create mode 100644 third_party/nixpkgs/nixos/tests/keycloak.nix create mode 100644 third_party/nixpkgs/nixos/tests/nar-serve.nix create mode 100644 third_party/nixpkgs/nixos/tests/oh-my-zsh.nix create mode 100644 third_party/nixpkgs/nixos/tests/sbt.nix create mode 100644 third_party/nixpkgs/nixos/tests/scala.nix create mode 100644 third_party/nixpkgs/pkgs/applications/audio/ptcollab/default.nix delete mode 100644 third_party/nixpkgs/pkgs/applications/blockchains/btc1.nix delete mode 100644 third_party/nixpkgs/pkgs/applications/blockchains/polkadot/substrate-wasm-builder-runner.patch rename third_party/nixpkgs/pkgs/applications/editors/textadept/{ => 10}/default.nix (100%) rename third_party/nixpkgs/pkgs/applications/editors/textadept/{ => 10}/deps.nix (100%) create mode 100644 third_party/nixpkgs/pkgs/applications/editors/textadept/11/default.nix create mode 100644 third_party/nixpkgs/pkgs/applications/editors/textadept/11/deps.nix create mode 100644 third_party/nixpkgs/pkgs/applications/graphics/photoflare/default.nix create mode 100644 third_party/nixpkgs/pkgs/applications/misc/dasel/default.nix create mode 100644 third_party/nixpkgs/pkgs/applications/misc/elf-dissector/default.nix create mode 100644 third_party/nixpkgs/pkgs/applications/misc/pass-secret-service/default.nix create mode 100644 third_party/nixpkgs/pkgs/applications/misc/tiv/default.nix delete mode 100644 third_party/nixpkgs/pkgs/applications/networking/browsers/ungoogled-chromium/patches/dont-use-ANGLE-by-default.patch delete mode 100644 third_party/nixpkgs/pkgs/applications/networking/browsers/ungoogled-chromium/patches/enable-vdpau-support-for-nvidia.patch delete mode 100644 third_party/nixpkgs/pkgs/applications/networking/browsers/ungoogled-chromium/patches/enable-video-acceleration-on-linux.patch delete mode 100644 third_party/nixpkgs/pkgs/applications/networking/browsers/ungoogled-chromium/patches/nix_plugin_paths_68.patch delete mode 100644 third_party/nixpkgs/pkgs/applications/networking/browsers/ungoogled-chromium/patches/remove-webp-include-69.patch create mode 100644 third_party/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/hcloud/default.nix create mode 100644 third_party/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/linuxbox/default.nix create mode 100755 third_party/nixpkgs/pkgs/applications/networking/instant-messengers/slack/update.sh create mode 100644 third_party/nixpkgs/pkgs/applications/networking/mailreaders/bubblemail/default.nix create mode 100644 third_party/nixpkgs/pkgs/applications/networking/seaweedfs/default.nix create mode 100644 third_party/nixpkgs/pkgs/applications/networking/sync/backintime/qt.nix delete mode 100644 third_party/nixpkgs/pkgs/applications/networking/sync/backintime/qt4.nix delete mode 100644 third_party/nixpkgs/pkgs/applications/science/biology/plink/default.nix create mode 100644 third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/git-chglog/default.nix delete mode 100644 third_party/nixpkgs/pkgs/applications/video/dvb-apps/default.nix delete mode 100755 third_party/nixpkgs/pkgs/applications/video/epgstation/generate.sh create mode 100644 third_party/nixpkgs/pkgs/applications/video/epgstation/update.nix delete mode 100644 third_party/nixpkgs/pkgs/applications/video/k9copy/default.nix delete mode 100644 third_party/nixpkgs/pkgs/applications/video/k9copy/gcc6.patch create mode 100644 third_party/nixpkgs/pkgs/applications/virtualization/nvidia-docker/avoid-static-libtirpc-build.patch create mode 100644 third_party/nixpkgs/pkgs/data/fonts/fraunces/default.nix delete mode 100644 third_party/nixpkgs/pkgs/data/fonts/iosevka/package.json rename third_party/nixpkgs/pkgs/data/fonts/iosevka/{update.sh => update-bin.sh} (70%) create mode 100755 third_party/nixpkgs/pkgs/data/fonts/iosevka/update-default.sh create mode 100644 third_party/nixpkgs/pkgs/data/fonts/ttf-tw-moe/default.nix delete mode 100644 third_party/nixpkgs/pkgs/desktops/gnome-3/extensions/battery-status/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/compilers/graalvm/community-edition.nix delete mode 100644 third_party/nixpkgs/pkgs/development/compilers/halide/nix.patch create mode 100644 third_party/nixpkgs/pkgs/development/compilers/openjdk/jre.nix rename third_party/nixpkgs/pkgs/development/compilers/rust/{1_46.nix => 1_47.nix} (55%) delete mode 100644 third_party/nixpkgs/pkgs/development/compilers/scala/2.10.nix delete mode 100644 third_party/nixpkgs/pkgs/development/compilers/scala/2.11.nix delete mode 100644 third_party/nixpkgs/pkgs/development/compilers/scala/2.12.nix delete mode 100644 third_party/nixpkgs/pkgs/development/compilers/scala/2.13.nix create mode 100644 third_party/nixpkgs/pkgs/development/compilers/scala/2.x.nix create mode 100644 third_party/nixpkgs/pkgs/development/compilers/spasm-ng/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/interpreters/php/7.3.nix create mode 100644 third_party/nixpkgs/pkgs/development/interpreters/php/7.4.nix rename third_party/nixpkgs/pkgs/development/interpreters/php/{default.nix => generic.nix} (89%) create mode 100644 third_party/nixpkgs/pkgs/development/libraries/gamin/abstract-socket-namespace.patch create mode 100644 third_party/nixpkgs/pkgs/development/libraries/libgpiod/0001-Drop-AC_FUNC_MALLOC-and-_REALLOC-and-check-for-them-.patch delete mode 100644 third_party/nixpkgs/pkgs/development/libraries/libvpx/CVE-2019-9232.CVE-2019-9325.CVE-2019-9371.CVE-2019-9433.patch create mode 100644 third_party/nixpkgs/pkgs/development/libraries/linbox/patches/linbox-pr256-part2.patch delete mode 100644 third_party/nixpkgs/pkgs/development/libraries/mesa/link-radv-with-ld_args_build_id.patch create mode 100644 third_party/nixpkgs/pkgs/development/libraries/waffle/default.nix delete mode 100644 third_party/nixpkgs/pkgs/development/ocaml-modules/janestreet/email-message-angstrom-0.14.patch create mode 100644 third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-channel/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-console/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-logs/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/azure-synapse-artifacts/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/crytic-compile/default.nix delete mode 100644 third_party/nixpkgs/pkgs/development/python-modules/dotnetcore2/default.nix delete mode 100644 third_party/nixpkgs/pkgs/development/python-modules/dotnetcore2/runtime.patch create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/google-cloud-iam/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/pandas-datareader/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/pypass/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/pypass/mark-executables.patch delete mode 100644 third_party/nixpkgs/pkgs/development/python-modules/smugline/default.nix delete mode 100644 third_party/nixpkgs/pkgs/development/python-modules/smugpy/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/python-modules/sqlite-utils/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/tools/build-managers/meson/boost-Do-not-add-system-paths-on-nix.patch delete mode 100755 third_party/nixpkgs/pkgs/development/tools/continuous-integration/jenkins/update.sh create mode 100644 third_party/nixpkgs/pkgs/development/tools/github/bump/default.nix rename third_party/nixpkgs/pkgs/development/tools/parsing/antlr/{4.7.nix => 4.8.nix} (93%) create mode 100644 third_party/nixpkgs/pkgs/development/tools/rufo/Gemfile create mode 100644 third_party/nixpkgs/pkgs/development/tools/rufo/Gemfile.lock create mode 100644 third_party/nixpkgs/pkgs/development/tools/rufo/default.nix create mode 100644 third_party/nixpkgs/pkgs/development/tools/rufo/gemset.nix delete mode 100644 third_party/nixpkgs/pkgs/misc/ghostscript/0001-Bug-702364-Fix-missing-echogs-dependencies.patch create mode 100644 third_party/nixpkgs/pkgs/os-specific/linux/pam_mount/support_luks2.patch delete mode 100644 third_party/nixpkgs/pkgs/servers/mail/freepops/default.nix create mode 100644 third_party/nixpkgs/pkgs/servers/monitoring/prometheus/sql-exporter.nix delete mode 100644 third_party/nixpkgs/pkgs/servers/nosql/riak-cs/2.1.1.nix delete mode 100644 third_party/nixpkgs/pkgs/servers/nosql/riak-cs/stanchion.nix create mode 100644 third_party/nixpkgs/pkgs/servers/rtsp-simple-server/default.nix create mode 100644 third_party/nixpkgs/pkgs/servers/sql/postgresql/patches/stabilize-timetz-dst.patch create mode 100644 third_party/nixpkgs/pkgs/servers/tracing/tempo/default.nix delete mode 100755 third_party/nixpkgs/pkgs/shells/zsh/oh-my-zsh/update.sh create mode 100644 third_party/nixpkgs/pkgs/test/install-shell-files/default.nix create mode 100644 third_party/nixpkgs/pkgs/tools/X11/find-cursor/default.nix create mode 100644 third_party/nixpkgs/pkgs/tools/filesystems/ceph/ceph-glibc-2-32-sigdescr_np.patch create mode 100644 third_party/nixpkgs/pkgs/tools/graphics/piglit/default.nix create mode 100644 third_party/nixpkgs/pkgs/tools/misc/as-tree/cargo-lock.patch create mode 100644 third_party/nixpkgs/pkgs/tools/misc/as-tree/default.nix delete mode 100644 third_party/nixpkgs/pkgs/tools/misc/coreutils/avoid-false-positive-in-date-debug-test.patch delete mode 100644 third_party/nixpkgs/pkgs/tools/misc/coreutils/coreutils-8.31-android-cross.patch delete mode 100644 third_party/nixpkgs/pkgs/tools/misc/coreutils/coreutils-8.31-musl-cross.patch create mode 100644 third_party/nixpkgs/pkgs/tools/misc/coreutils/sys-getdents-undeclared.patch create mode 100644 third_party/nixpkgs/pkgs/tools/nix/nar-serve/default.nix create mode 100644 third_party/nixpkgs/pkgs/tools/system/hostctl/default.nix create mode 100644 third_party/nixpkgs/pkgs/tools/system/mlc/default.nix delete mode 100644 third_party/nixpkgs/pkgs/tools/typesetting/pdf2htmlEX/add-glib-cmake.patch delete mode 100644 third_party/nixpkgs/pkgs/tools/typesetting/pdf2htmlEX/default.nix delete mode 100644 third_party/nixpkgs/pkgs/tools/video/flvtool2/default.nix diff --git a/third_party/nixpkgs/.github/CODEOWNERS b/third_party/nixpkgs/.github/CODEOWNERS index 7d6d7205a1..500d63b8cb 100644 --- a/third_party/nixpkgs/.github/CODEOWNERS +++ b/third_party/nixpkgs/.github/CODEOWNERS @@ -176,6 +176,10 @@ /pkgs/applications/editors/emacs @adisbladis /pkgs/top-level/emacs-packages.nix @adisbladis +# Neovim +/pkgs/applications/editors/neovim @jonringer +/pkgs/applications/editors/neovim @teto + # VimPlugins /pkgs/misc/vim-plugins @jonringer @softinio @@ -202,6 +206,12 @@ /nixos/tests/cri-o.nix @NixOS/podman @zowoq /nixos/tests/podman.nix @NixOS/podman @zowoq +# Docker tools +/pkgs/build-support/docker @roberth +/nixos/tests/docker-tools-overlay.nix @roberth +/nixos/tests/docker-tools.nix @roberth +/doc/builders/images/dockertools.xml @roberth + # Blockchains /pkgs/applications/blockchains @mmahut diff --git a/third_party/nixpkgs/README.md b/third_party/nixpkgs/README.md index 70d50e5efc..16cfeabfa7 100644 --- a/third_party/nixpkgs/README.md +++ b/third_party/nixpkgs/README.md @@ -8,7 +8,7 @@

[Nixpkgs](https://github.com/nixos/nixpkgs) is a collection of over -40,000 software packages that can be installed with the +60,000 software packages that can be installed with the [Nix](https://nixos.org/nix/) package manager. It also implements [NixOS](https://nixos.org/nixos/), a purely-functional Linux distribution. diff --git a/third_party/nixpkgs/doc/languages-frameworks/index.xml b/third_party/nixpkgs/doc/languages-frameworks/index.xml index 728a38c264..3366108cd9 100644 --- a/third_party/nixpkgs/doc/languages-frameworks/index.xml +++ b/third_party/nixpkgs/doc/languages-frameworks/index.xml @@ -19,6 +19,7 @@ + diff --git a/third_party/nixpkgs/doc/languages-frameworks/java.xml b/third_party/nixpkgs/doc/languages-frameworks/java.xml index bf0fc48839..881d492b5b 100644 --- a/third_party/nixpkgs/doc/languages-frameworks/java.xml +++ b/third_party/nixpkgs/doc/languages-frameworks/java.xml @@ -32,7 +32,7 @@ nativeBuildInputs = [ jdk ]; - If your Java package provides a program, you need to generate a wrapper script to run it using the OpenJRE. You can use makeWrapper for this: + If your Java package provides a program, you need to generate a wrapper script to run it using a JRE. You can use makeWrapper for this: nativeBuildInputs = [ makeWrapper ]; @@ -43,7 +43,21 @@ installPhase = --add-flags "-cp $out/share/java/foo.jar org.foo.Main" ''; - Note the use of jre, which is the part of the OpenJDK package that contains the Java Runtime Environment. By using ${jre}/bin/java instead of ${jdk}/bin/java, you prevent your package from depending on the JDK at runtime. +Since the introduction of the Java Platform Module System in Java 9, Java distributions typically no longer ship with a general-purpose JRE: instead, they allow generating a JRE with only the modules required for your application(s). Because we can't predict what modules will be needed on a general-purpose system, the default jre package is the full JDK. When building a minimal system/image, you can override the modules parameter on jre_minimal to build a JRE with only the modules relevant for you: + +let + my_jre = pkgs.jre_minimal.override { + modules = [ + # The modules used by 'something' and 'other' combined: + "java.base" + "java.logging" + ]; + }; + something = (pkgs.something.override { jre = my_jre; }); + other = (pkgs.other.override { jre = my_jre; }); +in + ... + diff --git a/third_party/nixpkgs/doc/languages-frameworks/maven.section.md b/third_party/nixpkgs/doc/languages-frameworks/maven.section.md new file mode 100644 index 0000000000..fe183e7ba3 --- /dev/null +++ b/third_party/nixpkgs/doc/languages-frameworks/maven.section.md @@ -0,0 +1,354 @@ +--- +title: Maven +author: Farid Zakaria +date: 2020-10-15 +--- + +# Maven + +Maven is a well-known build tool for the Java ecosystem however it has some challenges when integrating into the Nix build system. + +The following provides a list of common patterns with how to package a Maven project (or any JVM language that can export to Maven) as a Nix package. + +For the purposes of this example let's consider a very basic Maven project with the following `pom.xml` with a single dependency on [emoji-java](https://github.com/vdurmont/emoji-java). + +```xml + + + 4.0.0 + io.github.fzakaria + maven-demo + 1.0 + jar + NixOS Maven Demo + + + + com.vdurmont + emoji-java + 5.1.1 + + + +``` + +Our main class file will be very simple: + +```java +import com.vdurmont.emoji.EmojiParser; + +public class Main { + public static void main(String[] args) { + String str = "NixOS :grinning: is super cool :smiley:!"; + String result = EmojiParser.parseToUnicode(str); + System.out.println(result); + } +} +``` + +You find this demo project at https://github.com/fzakaria/nixos-maven-example + +## Solving for dependencies + +### buildMaven with NixOS/mvn2nix-maven-plugin + +> ⚠️ Although `buildMaven` is the "blessed" way within nixpkgs, as of 2020, it hasn't seen much activity in quite a while. + +`buildMaven` is an alternative method that tries to follow similar patterns of other programming languages by generating a lock file. It relies on the maven plugin [mvn2nix-maven-plugin](https://github.com/NixOS/mvn2nix-maven-plugin). + +First you generate a `project-info.json` file using the maven plugin. + +> This should be executed in the project's source repository or be told which `pom.xml` to execute with. + +```bash +# run this step within the project's source repository +❯ mvn org.nixos.mvn2nix:mvn2nix-maven-plugin:mvn2nix + +❯ cat project-info.json | jq | head +{ + "project": { + "artifactId": "maven-demo", + "groupId": "org.nixos", + "version": "1.0", + "classifier": "", + "extension": "jar", + "dependencies": [ + { + "artifactId": "maven-resources-plugin", +``` + +This file is then given to the `buildMaven` function, and it returns 2 attributes. + +**`repo`**: + A Maven repository that is a symlink farm of all the dependencies found in the `project-info.json` + + +**`build`**: + A simple derivation that runs through `mvn compile` & `mvn package` to build the JAR. You may use this as inspiration for more complicated derivations. + +Here is an [example](https://github.com/fzakaria/nixos-maven-example/blob/main/build-maven-repository.nix) of building the Maven repository +```nix +{ pkgs ? import { } }: +with pkgs; +(buildMaven ./project-info.json).repo +``` + +The benefit over the _double invocation_ as we will see below, is that the _/nix/store_ entry is a _linkFarm_ of every package, so that changes to your dependency set doesn't involve downloading everything from scratch. + +```bash +❯ tree $(nix-build --no-out-link build-maven-repository.nix) | head +/nix/store/g87va52nkc8jzbmi1aqdcf2f109r4dvn-maven-repository +├── antlr +│   └── antlr +│   └── 2.7.2 +│   ├── antlr-2.7.2.jar -> /nix/store/d027c8f2cnmj5yrynpbq2s6wmc9cb559-antlr-2.7.2.jar +│   └── antlr-2.7.2.pom -> /nix/store/mv42fc5gizl8h5g5vpywz1nfiynmzgp2-antlr-2.7.2.pom +├── avalon-framework +│   └── avalon-framework +│   └── 4.1.3 +│   ├── avalon-framework-4.1.3.jar -> /nix/store/iv5fp3955w3nq28ff9xfz86wvxbiw6n9-avalon-framework-4.1.3.jar +``` +### Double Invocation + +> ⚠️ This pattern is the simplest but may cause unnecessary rebuilds due to the output hash changing. + +The double invocation is a _simple_ way to get around the problem that `nix-build` may be sandboxed and have no Internet connectivity. + +It treats the entire Maven repository as a single source to be downloaded, relying on Maven's dependency resolution to satisfy the output hash. This is similar to fetchers like `fetchgit`, except it has to run a Maven build to determine what to download. + +The first step will be to build the Maven project as a fixed-output derivation in order to collect the Maven repository -- below is an [example](https://github.com/fzakaria/nixos-maven-example/blob/main/double-invocation-repository.nix). + +> Traditionally the Maven repository is at `~/.m2/repository`. We will override this to be the `$out` directory. + +```nix +{ stdenv, maven }: +stdenv.mkDerivation { + name = "maven-repository"; + buildInputs = [ maven ]; + src = ./.; # or fetchFromGitHub, cleanSourceWith, etc + buildPhase = '' + mvn package -Dmaven.repo.local=$out + ''; + + # keep only *.{pom,jar,sha1,nbm} and delete all ephemeral files with lastModified timestamps inside + installPhase = '' + find $out -type f \ + -name \*.lastUpdated -or \ + -name resolver-status.properties -or \ + -name _remote.repositories \ + -delete + ''; + + # don't do any fixup + dontFixup = true; + outputHashAlgo = "sha256"; + outputHashMode = "recursive"; + # replace this with the correct SHA256 + outputHash = stdenv.lib.fakeSha256; +} +``` + +The build will fail, and tell you the expected `outputHash` to place. When you've set the hash, the build will return with a `/nix/store` entry whose contents are the full Maven repository. + +> Some additional files are deleted that would cause the output hash to change potentially on subsequent runs. + +```bash +❯ tree $(nix-build --no-out-link double-invocation-repository.nix) | head +/nix/store/8kicxzp98j68xyi9gl6jda67hp3c54fq-maven-repository +├── backport-util-concurrent +│   └── backport-util-concurrent +│   └── 3.1 +│   ├── backport-util-concurrent-3.1.pom +│   └── backport-util-concurrent-3.1.pom.sha1 +├── classworlds +│   └── classworlds +│   ├── 1.1 +│   │   ├── classworlds-1.1.jar +``` + +If your package uses _SNAPSHOT_ dependencies or _version ranges_; there is a strong likelihood that over-time your output hash will change since the resolved dependencies may change. Hence this method is less recommended then using `buildMaven`. + +## Building a JAR + +Regardless of which strategy is chosen above, the step to build the derivation is the same. + +```nix +{ stdenv, lib, maven, callPackage }: +# pick a repository derivation, here we will use buildMaven +let repository = callPackage ./build-maven-repository.nix { }; +in stdenv.mkDerivation rec { + pname = "maven-demo"; + version = "1.0"; + + src = builtins.fetchTarball "https://github.com/fzakaria/nixos-maven-example/archive/main.tar.gz"; + buildInputs = [ maven ]; + + buildPhase = '' + echo "Using repository ${repository}" + mvn --offline -Dmaven.repo.local=${repository} package; + ''; + + installPhase = '' + install -Dm644 target/${pname}-${version}.jar $out/share/java + ''; +} +``` + +> We place the library in `$out/share/java` since JDK package has a _stdenv setup hook_ that adds any JARs in the `share/java` directories of the build inputs to the CLASSPATH environment. + +```bash +❯ tree $(nix-build --no-out-link build-jar.nix) +/nix/store/7jw3xdfagkc2vw8wrsdv68qpsnrxgvky-maven-demo-1.0 +└── share + └── java + └── maven-demo-1.0.jar + +2 directories, 1 file +``` + +## Runnable JAR + +The previous example builds a `jar` file but that's not a file one can run. + +You need to use it with `java -jar $out/share/java/output.jar` and make sure to provide the required dependencies on the classpath. + +The following explains how to use `makeWrapper` in order to make the derivation produce an executable that will run the JAR file you created. + +We will use the same repository we built above (either _double invocation_ or _buildMaven_) to setup a CLASSPATH for our JAR. + +The following two methods are more suited to Nix then building an [UberJar](https://imagej.net/Uber-JAR) which may be the more traditional approach. + +### CLASSPATH + +> This is ideal if you are providing a derivation for _nixpkgs_ and don't want to patch the project's `pom.xml`. + +We will read the Maven repository and flatten it to a single list. This list will then be concatenated with the _CLASSPATH_ separator to create the full classpath. + +We make sure to provide this classpath to the `makeWrapper`. + +```nix +{ stdenv, lib, maven, callPackage, makeWrapper, jre }: +let + repository = callPackage ./build-maven-repository.nix { }; +in stdenv.mkDerivation rec { + pname = "maven-demo"; + version = "1.0"; + + src = builtins.fetchTarball + "https://github.com/fzakaria/nixos-maven-example/archive/main.tar.gz"; + buildInputs = [ maven makeWrapper ]; + + buildPhase = '' + echo "Using repository ${repository}" + mvn --offline -Dmaven.repo.local=${repository} package; + ''; + + installPhase = '' + mkdir -p $out/bin + + classpath=$(find ${repository} -name "*.jar" -printf ':%h/%f'); + install -Dm644 target/${pname}-${version}.jar $out/share/java + # create a wrapper that will automatically set the classpath + # this should be the paths from the dependency derivation + makeWrapper ${jre}/bin/java $out/bin/${pname} \ + --add-flags "-classpath $out/share/java/${pname}-${version}.jar:''${classpath#:}" \ + --add-flags "Main" + ''; +} +``` + +### MANIFEST file via Maven Plugin + +> This is ideal if you are the project owner and want to change your `pom.xml` to set the CLASSPATH within it. + +Augment the `pom.xml` to create a JAR with the following manifest: +```xml + + + + maven-jar-plugin + + + + true + ../../repository/ + repository + Main + + + . + + + + + + +``` + +The above plugin instructs the JAR to look for the necessary dependencies in the `lib/` relative folder. The layout of the folder is also in the _maven repository_ style. + +```bash +❯ unzip -q -c $(nix-build --no-out-link runnable-jar.nix)/share/java/maven-demo-1.0.jar META-INF/MANIFEST.MF + +Manifest-Version: 1.0 +Archiver-Version: Plexus Archiver +Built-By: nixbld +Class-Path: . ../../repository/com/vdurmont/emoji-java/5.1.1/emoji-jav + a-5.1.1.jar ../../repository/org/json/json/20170516/json-20170516.jar +Created-By: Apache Maven 3.6.3 +Build-Jdk: 1.8.0_265 +Main-Class: Main +``` + +We will modify the derivation above to add a symlink to our repository so that it's accessible to our JAR during the `installPhase`. + +```nix +{ stdenv, lib, maven, callPackage, makeWrapper, jre }: +# pick a repository derivation, here we will use buildMaven +let repository = callPackage ./build-maven-repository.nix { }; +in stdenv.mkDerivation rec { + pname = "maven-demo"; + version = "1.0"; + + src = builtins.fetchTarball + "https://github.com/fzakaria/nixos-maven-example/archive/main.tar.gz"; + buildInputs = [ maven makeWrapper ]; + + buildPhase = '' + echo "Using repository ${repository}" + mvn --offline -Dmaven.repo.local=${repository} package; + ''; + + installPhase = '' + mkdir -p $out/bin + + # create a symbolic link for the repository directory + ln -s ${repository} $out/repository + + install -Dm644 target/${pname}-${version}.jar $out/share/java + # create a wrapper that will automatically set the classpath + # this should be the paths from the dependency derivation + makeWrapper ${jre}/bin/java $out/bin/${pname} \ + --add-flags "-jar $out/share/java/${pname}-${version}.jar" + ''; +} +``` + +> Our script produces a dependency on `jre` rather than `jdk` to restrict the runtime closure necessary to run the application. + +This will give you an executable shell-script that launches your JAR with all the dependencies available. + +```bash +❯ tree $(nix-build --no-out-link runnable-jar.nix) +/nix/store/8d4c3ibw8ynsn01ibhyqmc1zhzz75s26-maven-demo-1.0 +├── bin +│   └── maven-demo +├── repository -> /nix/store/g87va52nkc8jzbmi1aqdcf2f109r4dvn-maven-repository +└── share + └── java + └── maven-demo-1.0.jar + +❯ $(nix-build --no-out-link --option tarball-ttl 1 runnable-jar.nix)/bin/maven-demo +NixOS 😀 is super cool 😃! +``` diff --git a/third_party/nixpkgs/doc/languages-frameworks/rust.section.md b/third_party/nixpkgs/doc/languages-frameworks/rust.section.md index 0e1d59e1a9..400f39c345 100644 --- a/third_party/nixpkgs/doc/languages-frameworks/rust.section.md +++ b/third_party/nixpkgs/doc/languages-frameworks/rust.section.md @@ -16,9 +16,9 @@ cargo into the `environment.systemPackages` or bring them into scope with `nix-shell -p rustc cargo`. -For daily builds (beta and nightly) use either rustup from -nixpkgs or use the [Rust nightlies -overlay](#using-the-rust-nightlies-overlay). +For other versions such as daily builds (beta and nightly), +use either `rustup` from nixpkgs (which will manage the rust installation in your home directory), +or use Mozilla's [Rust nightlies overlay](#using-the-rust-nightlies-overlay). ## Compiling Rust applications with Cargo @@ -478,8 +478,15 @@ Mozilla provides an overlay for nixpkgs to bring a nightly version of Rust into This overlay can _also_ be used to install recent unstable or stable versions of Rust, if desired. -To use this overlay, clone -[nixpkgs-mozilla](https://github.com/mozilla/nixpkgs-mozilla), +### Rust overlay installation + +You can use this overlay by either changing your local nixpkgs configuration, +or by adding the overlay declaratively in a nix expression, e.g. in `configuration.nix`. +For more information see [#sec-overlays-install](the manual on installing overlays). + +#### Imperative rust overlay installation + +Clone [nixpkgs-mozilla](https://github.com/mozilla/nixpkgs-mozilla), and create a symbolic link to the file [rust-overlay.nix](https://github.com/mozilla/nixpkgs-mozilla/blob/master/rust-overlay.nix) in the `~/.config/nixpkgs/overlays` directory. @@ -488,7 +495,34 @@ in the `~/.config/nixpkgs/overlays` directory. $ mkdir -p ~/.config/nixpkgs/overlays $ ln -s $(pwd)/nixpkgs-mozilla/rust-overlay.nix ~/.config/nixpkgs/overlays/rust-overlay.nix -The latest version can be installed with the following command: +### Declarative rust overlay installation + +Add the following to your `configuration.nix`, `home-configuration.nix`, `shell.nix`, or similar: + +``` + nixpkgs = { + overlays = [ + (import (builtins.fetchTarball https://github.com/mozilla/nixpkgs-mozilla/archive/master.tar.gz)) + # Further overlays go here + ]; + }; +``` + +Note that this will fetch the latest overlay version when rebuilding your system. + +### Rust overlay usage + +The overlay contains attribute sets corresponding to different versions of the rust toolchain, such as: + +* `latest.rustChannels.stable` +* `latest.rustChannels.nightly` +* a function `rustChannelOf`, called as `(rustChannelOf { date = "2018-04-11"; channel = "nightly"; })`, or... +* `(nixpkgs.rustChannelOf { rustToolchain = ./rust-toolchain; })` if you have a local `rust-toolchain` file (see https://github.com/mozilla/nixpkgs-mozilla#using-in-nix-expressions for an example) + +Each of these contain packages such as `rust`, which contains your usual rust development tools with the respective toolchain chosen. +For example, you might want to add `latest.rustChannels.stable.rust` to the list of packages in your configuration. + +Imperatively, the latest stable version can be installed with the following command: $ nix-env -Ai nixos.latest.rustChannels.stable.rust diff --git a/third_party/nixpkgs/doc/stdenv/stdenv.xml b/third_party/nixpkgs/doc/stdenv/stdenv.xml index 4c069b57ed..46ee97927e 100644 --- a/third_party/nixpkgs/doc/stdenv/stdenv.xml +++ b/third_party/nixpkgs/doc/stdenv/stdenv.xml @@ -2070,7 +2070,7 @@ nativeBuildInputs = [ breakpointHook ]; The installManPage function takes one or more paths to manpages to install. The manpages must have a section suffix, and may optionally be compressed (with .gz suffix). This function will place them into the correct directory. - The installShellCompletion function takes one or more paths to shell completion files. By default it will autodetect the shell type from the completion file extension, but you may also specify it by passing one of --bash, --fish, or --zsh. These flags apply to all paths listed after them (up until another shell flag is given). Each path may also have a custom installation name provided by providing a flag --name NAME before the path. If this flag is not provided, zsh completions will be renamed automatically such that foobar.zsh becomes _foobar. + The installShellCompletion function takes one or more paths to shell completion files. By default it will autodetect the shell type from the completion file extension, but you may also specify it by passing one of --bash, --fish, or --zsh. These flags apply to all paths listed after them (up until another shell flag is given). Each path may also have a custom installation name provided by providing a flag --name NAME before the path. If this flag is not provided, zsh completions will be renamed automatically such that foobar.zsh becomes _foobar. A root name may be provided for all paths using the flag --cmd NAME; this synthesizes the appropriate name depending on the shell (e.g. --cmd foo will synthesize the name foo.bash for bash and _foo for zsh). The path may also be a fifo or named fd (such as produced by <(cmd)), in which case the shell and name must be provided. nativeBuildInputs = [ installShellFiles ]; postInstall = '' @@ -2081,6 +2081,11 @@ postInstall = '' installShellCompletion --zsh --name _foobar share/completions.zsh # implicit behavior installShellCompletion share/completions/foobar.{bash,fish,zsh} + # using named fd + installShellCompletion --cmd foobar \ + --bash <($out/bin/foobar --bash-completion) \ + --fish <($out/bin/foobar --fish-completion) \ + --zsh <($out/bin/foobar --zsh-completion) ''; diff --git a/third_party/nixpkgs/maintainers/maintainer-list.nix b/third_party/nixpkgs/maintainers/maintainer-list.nix index bacd3dab9a..94588050cc 100644 --- a/third_party/nixpkgs/maintainers/maintainer-list.nix +++ b/third_party/nixpkgs/maintainers/maintainer-list.nix @@ -4007,6 +4007,12 @@ githubId = 2502736; name = "James Hillyerd"; }; + jiehong = { + email = "nixos@majiehong.com"; + github = "Jiehong"; + githubId = 1061229; + name = "Jiehong Ma"; + }; jirkamarsik = { email = "jiri.marsik89@gmail.com"; github = "jirkamarsik"; @@ -4278,6 +4284,12 @@ githubId = 16374374; name = "Joshua Campbell"; }; + jshholland = { + email = "josh@inv.alid.pw"; + github = "jshholland"; + githubId = 107689; + name = "Josh Holland"; + }; jtcoolen = { email = "jtcoolen@pm.me"; name = "Julien Coolen"; @@ -4816,6 +4828,12 @@ githubId = 20250323; name = "Lucio Delelis"; }; + ldenefle = { + email = "ldenefle@gmail.com"; + github = "ldenefle"; + githubId = 20558127; + name = "Lucas Denefle"; + }; ldesgoui = { email = "ldesgoui@gmail.com"; github = "ldesgoui"; @@ -5268,6 +5286,12 @@ githubId = 1238350; name = "Matthias Herrmann"; }; + majesticmullet = { + email = "hoccthomas@gmail.com.au"; + github = "MajesticMullet"; + githubId = 31056089; + name = "Tom Ho"; + }; makefu = { email = "makefu@syntax-fehler.de"; github = "makefu"; @@ -5520,6 +5544,12 @@ fingerprint = "D709 03C8 0BE9 ACDC 14F0 3BFB 77BF E531 397E DE94"; }]; }; + meatcar = { + email = "nixpkgs@denys.me"; + github = "meatcar"; + githubId = 191622; + name = "Denys Pavlov"; + }; meditans = { email = "meditans@gmail.com"; github = "meditans"; @@ -6439,6 +6469,12 @@ githubId = 167209; name = "Masanori Ogino"; }; + omgbebebe = { + email = "omgbebebe@gmail.com"; + github = "omgbebebe"; + githubId = 588167; + name = "Sergey Bubnov"; + }; omnipotententity = { email = "omnipotententity@gmail.com"; github = "omnipotententity"; @@ -7065,6 +7101,12 @@ fingerprint = "7573 56D7 79BB B888 773E 415E 736C CDF9 EF51 BD97"; }]; }; + r-burns = { + email = "rtburns@protonmail.com"; + github = "r-burns"; + githubId = 52847440; + name = "Ryan Burns"; + }; raboof = { email = "arnout@bzzt.net"; github = "raboof"; diff --git a/third_party/nixpkgs/nixos/doc/manual/administration/service-mgmt.xml b/third_party/nixpkgs/nixos/doc/manual/administration/service-mgmt.xml index 1c5d48a5bc..863b0d47f6 100644 --- a/third_party/nixpkgs/nixos/doc/manual/administration/service-mgmt.xml +++ b/third_party/nixpkgs/nixos/doc/manual/administration/service-mgmt.xml @@ -6,7 +6,7 @@ Service Management In NixOS, all system services are started and monitored using the systemd - program. Systemd is the “init” process of the system (i.e. PID 1), the + program. systemd is the “init” process of the system (i.e. PID 1), the parent of all other processes. It manages a set of so-called “units”, which can be things like system services (programs), but also mount points, swap files, devices, targets (groups of units) and more. Units can have @@ -16,10 +16,17 @@ dependencies of this unit cause all system services to be started, file systems to be mounted, swap files to be activated, and so on. - - The command systemctl is the main way to interact with - systemd. Without any arguments, it shows the status of - active units: +
+ Interacting with a running systemd + + The command systemctl is the main way to interact with + systemd. The following paragraphs demonstrate ways to + interact with any OS running systemd as init system. NixOS is of no + exception. The next section + explains NixOS specific things worth knowing. + + + Without any arguments, systmctl the status of active units: $ systemctl -.mount loaded active mounted / @@ -28,10 +35,10 @@ sshd.service loaded active running SSH Daemon graphical.target loaded active active Graphical Interface ... - - - You can ask for detailed status information about a unit, for instance, the - PostgreSQL database service: + + + You can ask for detailed status information about a unit, for instance, the + PostgreSQL database service: $ systemctl status postgresql.service postgresql.service - PostgreSQL Server @@ -62,11 +69,72 @@ Jan 07 15:55:57 hagbard systemd[1]: Started PostgreSQL Server. # systemctl start postgresql.service # systemctl restart postgresql.service - These operations are synchronous: they wait until the service has finished - starting or stopping (or has failed). Starting a unit will cause the - dependencies of that unit to be started as well (if necessary). - - + - cgroup resource management --> +
+
+ systemd in NixOS + + Packages in Nixpkgs sometimes provide systemd units with them, usually in + e.g #pkg-out#/lib/systemd/. Putting such a package in + environment.systemPackages doesn't make the service + available to users or the system. + + + In order to enable a systemd system service with + provided upstream package, use (e.g): + + = [ pkgs.packagekit ]; + + + + Usually NixOS modules written by the community do the above, plus take care of + other details. If a module was written for a service you are interested in, + you'd probably need only to use + services.#name#.enable = true;. These services are defined + in Nixpkgs' + + nixos/modules/ directory . In case the service is + simple enough, the above method should work, and start the service on boot. + + + User systemd services on the other hand, should be + treated differently. Given a package that has a systemd unit file at + #pkg-out#/lib/systemd/user/, using + will make you able to start the service via + systemctl --user start, but it won't start automatically on login. + + However, You can imperatively enable it by adding the package's attribute to + + systemd.packages and then do this (e.g): + +$ mkdir -p ~/.config/systemd/user/default.target.wants +$ ln -s /run/current-system/sw/lib/systemd/user/syncthing.service ~/.config/systemd/user/default.target.wants/ +$ systemctl --user daemon-reload +$ systemctl --user enable syncthing.service + + If you are interested in a timer file, use timers.target.wants + instead of default.target.wants in the 1st and 2nd command. + + + Using systemctl --user enable syncthing.service instead of + the above, will work, but it'll use the absolute path of + syncthing.service for the symlink, and this path is in + /nix/store/.../lib/systemd/user/. Hence + garbage collection will remove that file + and you will wind up with a broken symlink in your systemd configuration, which + in turn will not make the service / timer start on login. + +
+ diff --git a/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-2103.xml b/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-2103.xml index 85eedfe0ec..7fd7ff5c2a 100644 --- a/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-2103.xml +++ b/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-2103.xml @@ -39,7 +39,19 @@ - + + Keycloak, + an open source identity and access management server with + support for OpenID Connect, + OAUTH 2.0 and + SAML + 2.0. + + + See the Keycloak + section of the NixOS manual for more information. + @@ -109,6 +121,21 @@ /var/lib/powerdns to /run/pdns. + + + btc1 has been abandoned upstream, and removed. + + + + + riak-cs package removed along with services.riak-cs module. + + + + + stanchion package removed along with services.stanchion module. + + diff --git a/third_party/nixpkgs/nixos/modules/installer/tools/nixos-generate-config.pl b/third_party/nixpkgs/nixos/modules/installer/tools/nixos-generate-config.pl index 44f4c44a56..6e3ddb875e 100644 --- a/third_party/nixpkgs/nixos/modules/installer/tools/nixos-generate-config.pl +++ b/third_party/nixpkgs/nixos/modules/installer/tools/nixos-generate-config.pl @@ -183,6 +183,11 @@ sub pciCheck { push @imports, "(modulesPath + \"/hardware/network/broadcom-43xx.nix\")"; } + # In case this is a virtio scsi device, we need to explicitly make this available. + if ($vendor eq "0x1af4" && $device eq "0x1004") { + push @initrdAvailableKernelModules, "virtio_scsi"; + } + # Can't rely on $module here, since the module may not be loaded # due to missing firmware. Ideally we would check modules.pcimap # here. diff --git a/third_party/nixpkgs/nixos/modules/misc/ids.nix b/third_party/nixpkgs/nixos/modules/misc/ids.nix index 4e0f8ba718..bafa222504 100644 --- a/third_party/nixpkgs/nixos/modules/misc/ids.nix +++ b/third_party/nixpkgs/nixos/modules/misc/ids.nix @@ -290,8 +290,8 @@ in hound = 259; leaps = 260; ipfs = 261; - stanchion = 262; - riak-cs = 263; + # stanchion = 262; # unused, removed 2020-10-14 + # riak-cs = 263; # unused, removed 2020-10-14 infinoted = 264; sickbeard = 265; headphones = 266; @@ -593,8 +593,8 @@ in hound = 259; leaps = 260; ipfs = 261; - stanchion = 262; - riak-cs = 263; + # stanchion = 262; # unused, removed 2020-10-14 + # riak-cs = 263; # unused, removed 2020-10-14 infinoted = 264; sickbeard = 265; headphones = 266; diff --git a/third_party/nixpkgs/nixos/modules/module-list.nix b/third_party/nixpkgs/nixos/modules/module-list.nix index aa3b71a612..6ac12e4e13 100644 --- a/third_party/nixpkgs/nixos/modules/module-list.nix +++ b/third_party/nixpkgs/nixos/modules/module-list.nix @@ -296,8 +296,6 @@ ./services/databases/postgresql.nix ./services/databases/redis.nix ./services/databases/riak.nix - ./services/databases/riak-cs.nix - ./services/databases/stanchion.nix ./services/databases/victoriametrics.nix ./services/databases/virtuoso.nix ./services/desktops/accountsservice.nix @@ -394,6 +392,7 @@ ./services/logging/logcheck.nix ./services/logging/logrotate.nix ./services/logging/logstash.nix + ./services/logging/promtail.nix ./services/logging/rsyslogd.nix ./services/logging/syslog-ng.nix ./services/logging/syslogd.nix @@ -403,7 +402,6 @@ ./services/mail/dovecot.nix ./services/mail/dspam.nix ./services/mail/exim.nix - ./services/mail/freepops.nix ./services/mail/mail.nix ./services/mail/mailcatcher.nix ./services/mail/mailhog.nix @@ -682,6 +680,7 @@ ./services/networking/murmur.nix ./services/networking/mxisd.nix ./services/networking/namecoind.nix + ./services/networking/nar-serve.nix ./services/networking/nat.nix ./services/networking/ndppd.nix ./services/networking/networkmanager.nix @@ -865,6 +864,7 @@ ./services/web-apps/ihatemoney ./services/web-apps/jirafeau.nix ./services/web-apps/jitsi-meet.nix + ./services/web-apps/keycloak.nix ./services/web-apps/limesurvey.nix ./services/web-apps/mattermost.nix ./services/web-apps/mediawiki.nix diff --git a/third_party/nixpkgs/nixos/modules/services/databases/riak-cs.nix b/third_party/nixpkgs/nixos/modules/services/databases/riak-cs.nix deleted file mode 100644 index fa6ac88633..0000000000 --- a/third_party/nixpkgs/nixos/modules/services/databases/riak-cs.nix +++ /dev/null @@ -1,202 +0,0 @@ -{ config, lib, pkgs, ... }: - -with lib; - -let - - cfg = config.services.riak-cs; - -in - -{ - - ###### interface - - options = { - - services.riak-cs = { - - enable = mkEnableOption "riak-cs"; - - package = mkOption { - type = types.package; - default = pkgs.riak-cs; - defaultText = "pkgs.riak-cs"; - example = literalExample "pkgs.riak-cs"; - description = '' - Riak package to use. - ''; - }; - - nodeName = mkOption { - type = types.str; - default = "riak-cs@127.0.0.1"; - description = '' - Name of the Erlang node. - ''; - }; - - anonymousUserCreation = mkOption { - type = types.bool; - default = false; - description = '' - Anonymous user creation. - ''; - }; - - riakHost = mkOption { - type = types.str; - default = "127.0.0.1:8087"; - description = '' - Name of riak hosting service. - ''; - }; - - listener = mkOption { - type = types.str; - default = "127.0.0.1:8080"; - description = '' - Name of Riak CS listening service. - ''; - }; - - stanchionHost = mkOption { - type = types.str; - default = "127.0.0.1:8085"; - description = '' - Name of stanchion hosting service. - ''; - }; - - stanchionSsl = mkOption { - type = types.bool; - default = true; - description = '' - Tell stanchion to use SSL. - ''; - }; - - distributedCookie = mkOption { - type = types.str; - default = "riak"; - description = '' - Cookie for distributed node communication. All nodes in the - same cluster should use the same cookie or they will not be able to - communicate. - ''; - }; - - dataDir = mkOption { - type = types.path; - default = "/var/db/riak-cs"; - description = '' - Data directory for Riak CS. - ''; - }; - - logDir = mkOption { - type = types.path; - default = "/var/log/riak-cs"; - description = '' - Log directory for Riak CS. - ''; - }; - - extraConfig = mkOption { - type = types.lines; - default = ""; - description = '' - Additional text to be appended to riak-cs.conf. - ''; - }; - - extraAdvancedConfig = mkOption { - type = types.lines; - default = ""; - description = '' - Additional text to be appended to advanced.config. - ''; - }; - }; - - }; - - ###### implementation - - config = mkIf cfg.enable { - - environment.systemPackages = [ cfg.package ]; - environment.etc."riak-cs/riak-cs.conf".text = '' - nodename = ${cfg.nodeName} - distributed_cookie = ${cfg.distributedCookie} - - platform_log_dir = ${cfg.logDir} - - riak_host = ${cfg.riakHost} - listener = ${cfg.listener} - stanchion_host = ${cfg.stanchionHost} - - anonymous_user_creation = ${if cfg.anonymousUserCreation then "on" else "off"} - - ${cfg.extraConfig} - ''; - - environment.etc."riak-cs/advanced.config".text = '' - ${cfg.extraAdvancedConfig} - ''; - - users.users.riak-cs = { - name = "riak-cs"; - uid = config.ids.uids.riak-cs; - group = "riak"; - description = "Riak CS server user"; - }; - - systemd.services.riak-cs = { - description = "Riak CS Server"; - - wantedBy = [ "multi-user.target" ]; - after = [ "network.target" ]; - - path = [ - pkgs.utillinux # for `logger` - pkgs.bash - ]; - - environment.HOME = "${cfg.dataDir}"; - environment.RIAK_CS_DATA_DIR = "${cfg.dataDir}"; - environment.RIAK_CS_LOG_DIR = "${cfg.logDir}"; - environment.RIAK_CS_ETC_DIR = "/etc/riak"; - - preStart = '' - if ! test -e ${cfg.logDir}; then - mkdir -m 0755 -p ${cfg.logDir} - chown -R riak-cs ${cfg.logDir} - fi - - if ! test -e ${cfg.dataDir}; then - mkdir -m 0700 -p ${cfg.dataDir} - chown -R riak-cs ${cfg.dataDir} - fi - ''; - - serviceConfig = { - ExecStart = "${cfg.package}/bin/riak-cs console"; - ExecStop = "${cfg.package}/bin/riak-cs stop"; - StandardInput = "tty"; - User = "riak-cs"; - Group = "riak-cs"; - PermissionsStartOnly = true; - # Give Riak a decent amount of time to clean up. - TimeoutStopSec = 120; - LimitNOFILE = 65536; - }; - - unitConfig.RequiresMountsFor = [ - "${cfg.dataDir}" - "${cfg.logDir}" - "/etc/riak" - ]; - }; - }; -} diff --git a/third_party/nixpkgs/nixos/modules/services/databases/stanchion.nix b/third_party/nixpkgs/nixos/modules/services/databases/stanchion.nix deleted file mode 100644 index 97e55bc70c..0000000000 --- a/third_party/nixpkgs/nixos/modules/services/databases/stanchion.nix +++ /dev/null @@ -1,194 +0,0 @@ -{ config, lib, pkgs, ... }: - -with lib; - -let - - cfg = config.services.stanchion; - -in - -{ - - ###### interface - - options = { - - services.stanchion = { - - enable = mkEnableOption "stanchion"; - - package = mkOption { - type = types.package; - default = pkgs.stanchion; - defaultText = "pkgs.stanchion"; - example = literalExample "pkgs.stanchion"; - description = '' - Stanchion package to use. - ''; - }; - - nodeName = mkOption { - type = types.str; - default = "stanchion@127.0.0.1"; - description = '' - Name of the Erlang node. - ''; - }; - - adminKey = mkOption { - type = types.str; - default = ""; - description = '' - Name of admin user. - ''; - }; - - adminSecret = mkOption { - type = types.str; - default = ""; - description = '' - Name of admin secret - ''; - }; - - riakHost = mkOption { - type = types.str; - default = "127.0.0.1:8087"; - description = '' - Name of riak hosting service. - ''; - }; - - listener = mkOption { - type = types.str; - default = "127.0.0.1:8085"; - description = '' - Name of Riak CS listening service. - ''; - }; - - stanchionHost = mkOption { - type = types.str; - default = "127.0.0.1:8085"; - description = '' - Name of stanchion hosting service. - ''; - }; - - distributedCookie = mkOption { - type = types.str; - default = "riak"; - description = '' - Cookie for distributed node communication. All nodes in the - same cluster should use the same cookie or they will not be able to - communicate. - ''; - }; - - dataDir = mkOption { - type = types.path; - default = "/var/db/stanchion"; - description = '' - Data directory for Stanchion. - ''; - }; - - logDir = mkOption { - type = types.path; - default = "/var/log/stanchion"; - description = '' - Log directory for Stanchion. - ''; - }; - - extraConfig = mkOption { - type = types.lines; - default = ""; - description = '' - Additional text to be appended to stanchion.conf. - ''; - }; - }; - }; - - ###### implementation - - config = mkIf cfg.enable { - - environment.systemPackages = [ cfg.package ]; - - environment.etc."stanchion/advanced.config".text = '' - [{stanchion, []}]. - ''; - - environment.etc."stanchion/stanchion.conf".text = '' - listener = ${cfg.listener} - - riak_host = ${cfg.riakHost} - - ${optionalString (cfg.adminKey == "") "#"} admin.key=${optionalString (cfg.adminKey != "") cfg.adminKey} - ${optionalString (cfg.adminSecret == "") "#"} admin.secret=${optionalString (cfg.adminSecret != "") cfg.adminSecret} - - platform_bin_dir = ${pkgs.stanchion}/bin - platform_data_dir = ${cfg.dataDir} - platform_etc_dir = /etc/stanchion - platform_lib_dir = ${pkgs.stanchion}/lib - platform_log_dir = ${cfg.logDir} - - nodename = ${cfg.nodeName} - - distributed_cookie = ${cfg.distributedCookie} - - ${cfg.extraConfig} - ''; - - users.users.stanchion = { - name = "stanchion"; - uid = config.ids.uids.stanchion; - group = "stanchion"; - description = "Stanchion server user"; - }; - - users.groups.stanchion.gid = config.ids.gids.stanchion; - - systemd.tmpfiles.rules = [ - "d '${cfg.logDir}' - stanchion stanchion --" - "d '${cfg.dataDir}' 0700 stanchion stanchion --" - ]; - - systemd.services.stanchion = { - description = "Stanchion Server"; - - wantedBy = [ "multi-user.target" ]; - after = [ "network.target" ]; - - path = [ - pkgs.utillinux # for `logger` - pkgs.bash - ]; - - environment.HOME = "${cfg.dataDir}"; - environment.STANCHION_DATA_DIR = "${cfg.dataDir}"; - environment.STANCHION_LOG_DIR = "${cfg.logDir}"; - environment.STANCHION_ETC_DIR = "/etc/stanchion"; - - serviceConfig = { - ExecStart = "${cfg.package}/bin/stanchion console"; - ExecStop = "${cfg.package}/bin/stanchion stop"; - StandardInput = "tty"; - User = "stanchion"; - Group = "stanchion"; - # Give Stanchion a decent amount of time to clean up. - TimeoutStopSec = 120; - LimitNOFILE = 65536; - }; - - unitConfig.RequiresMountsFor = [ - "${cfg.dataDir}" - "${cfg.logDir}" - "/etc/stanchion" - ]; - }; - }; -} diff --git a/third_party/nixpkgs/nixos/modules/services/hardware/bluetooth.nix b/third_party/nixpkgs/nixos/modules/services/hardware/bluetooth.nix index dfa39e7f60..230492c6b0 100644 --- a/third_party/nixpkgs/nixos/modules/services/hardware/bluetooth.nix +++ b/third_party/nixpkgs/nixos/modules/services/hardware/bluetooth.nix @@ -87,6 +87,8 @@ in { bluetooth = { wantedBy = [ "bluetooth.target" ]; aliases = [ "dbus-org.bluez.service" ]; + # restarting can leave people without a mouse/keyboard + unitConfig.X-RestartIfChanged = false; }; }; diff --git a/third_party/nixpkgs/nixos/modules/services/logging/promtail.nix b/third_party/nixpkgs/nixos/modules/services/logging/promtail.nix new file mode 100644 index 0000000000..834bb99bb1 --- /dev/null +++ b/third_party/nixpkgs/nixos/modules/services/logging/promtail.nix @@ -0,0 +1,95 @@ +{ config, lib, pkgs, ... }: with lib; +let + cfg = config.services.promtail; + + prettyJSON = conf: pkgs.runCommandLocal "promtail-config.json" {} '' + echo '${builtins.toJSON conf}' | ${pkgs.buildPackages.jq}/bin/jq 'del(._module)' > $out + ''; + +in { + options.services.promtail = with types; { + enable = mkEnableOption "the Promtail ingresser"; + + configuration = mkOption { + type = with lib.types; let + valueType = nullOr (oneOf [ + bool + int + float + str + (lazyAttrsOf valueType) + (listOf valueType) + ]) // { + description = "JSON value"; + emptyValue.value = {}; + deprecationMessage = null; + }; + in valueType; + description = '' + Specify the configuration for Promtail in Nix. + ''; + }; + + extraFlags = mkOption { + type = listOf str; + default = []; + example = [ "--server.http-listen-port=3101" ]; + description = '' + Specify a list of additional command line flags, + which get escaped and are then passed to Loki. + ''; + }; + }; + + config = mkIf cfg.enable { + services.promtail.configuration.positions.filename = mkDefault "/var/cache/promtail/positions.yaml"; + + systemd.services.promtail = { + description = "Promtail log ingress"; + wantedBy = [ "multi-user.target" ]; + stopIfChanged = false; + + serviceConfig = { + Restart = "on-failure"; + + ExecStart = "${pkgs.grafana-loki}/bin/promtail -config.file=${prettyJSON cfg.configuration} ${escapeShellArgs cfg.extraFlags}"; + + ProtectSystem = "strict"; + ProtectHome = true; + PrivateTmp = true; + PrivateDevices = true; + ProtectKernelTunables = true; + ProtectControlGroups = true; + RestrictSUIDSGID = true; + PrivateMounts = true; + CacheDirectory = "promtail"; + + User = "promtail"; + Group = "promtail"; + + CapabilityBoundingSet = ""; + NoNewPrivileges = true; + + ProtectKernelModules = true; + SystemCallArchitectures = "native"; + ProtectKernelLogs = true; + ProtectClock = true; + + LockPersonality = true; + ProtectHostname = true; + RestrictRealtime = true; + MemoryDenyWriteExecute = true; + PrivateUsers = true; + } // (optionalAttrs (!pkgs.stdenv.isAarch64) { # FIXME: figure out why this breaks on aarch64 + SystemCallFilter = "@system-service"; + }); + }; + + users.groups.promtail = {}; + users.users.promtail = { + description = "Promtail service user"; + isSystemUser = true; + group = "promtail"; + }; + }; +} diff --git a/third_party/nixpkgs/nixos/modules/services/mail/freepops.nix b/third_party/nixpkgs/nixos/modules/services/mail/freepops.nix deleted file mode 100644 index 5b729ca50a..0000000000 --- a/third_party/nixpkgs/nixos/modules/services/mail/freepops.nix +++ /dev/null @@ -1,89 +0,0 @@ -{ config, lib, pkgs, ... }: - -with lib; - -let - cfg = config.services.mail.freepopsd; -in - -{ - options = { - services.mail.freepopsd = { - enable = mkOption { - default = false; - type = with types; bool; - description = '' - Enables Freepops, a POP3 webmail wrapper. - ''; - }; - - port = mkOption { - default = 2000; - type = with types; uniq int; - description = '' - Port on which the pop server will listen. - ''; - }; - - threads = mkOption { - default = 5; - type = with types; uniq int; - description = '' - Max simultaneous connections. - ''; - }; - - bind = mkOption { - default = "0.0.0.0"; - type = types.str; - description = '' - Bind over an IPv4 address instead of any. - ''; - }; - - logFile = mkOption { - default = "/var/log/freepopsd"; - example = "syslog"; - type = types.str; - description = '' - Filename of the log file or syslog to rely on the logging daemon. - ''; - }; - - suid = { - user = mkOption { - default = "nobody"; - type = types.str; - description = '' - User name under which freepopsd will be after binding the port. - ''; - }; - - group = mkOption { - default = "nogroup"; - type = types.str; - description = '' - Group under which freepopsd will be after binding the port. - ''; - }; - }; - - }; - }; - - config = mkIf cfg.enable { - systemd.services.freepopsd = { - description = "Freepopsd (webmail over POP3)"; - after = [ "network.target" ]; - wantedBy = [ "multi-user.target" ]; - script = '' - ${pkgs.freepops}/bin/freepopsd \ - -p ${toString cfg.port} \ - -t ${toString cfg.threads} \ - -b ${cfg.bind} \ - -vv -l ${cfg.logFile} \ - -s ${cfg.suid.user}.${cfg.suid.group} - ''; - }; - }; -} 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 a4aa470f5b..995afca96f 100644 --- a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters.nix +++ b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters.nix @@ -45,6 +45,7 @@ let "rspamd" "rtl_433" "snmp" + "sql" "surfboard" "tor" "unifi" @@ -218,6 +219,14 @@ in Please specify either 'services.prometheus.exporters.mail.configuration' or 'services.prometheus.exporters.mail.configFile'. ''; + } { + assertion = cfg.sql.enable -> ( + (cfg.sql.configFile == null) != (cfg.sql.configuration == null) + ); + message = '' + Please specify either 'services.prometheus.exporters.sql.configuration' or + 'services.prometheus.exporters.sql.configFile' + ''; } ]; }] ++ [(mkIf config.services.minio.enable { services.prometheus.exporters.minio.minioAddress = mkDefault "http://localhost:9000"; diff --git a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/sql.nix b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/sql.nix new file mode 100644 index 0000000000..d9be724ebc --- /dev/null +++ b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/sql.nix @@ -0,0 +1,104 @@ +{ config, lib, pkgs, options }: +with lib; +let + cfg = config.services.prometheus.exporters.sql; + cfgOptions = { + options = with types; { + jobs = mkOption { + type = attrsOf (submodule jobOptions); + default = { }; + description = "An attrset of metrics scraping jobs to run."; + }; + }; + }; + jobOptions = { + options = with types; { + interval = mkOption { + type = str; + description = '' + How often to run this job, specified in + Go duration format. + ''; + }; + connections = mkOption { + type = listOf str; + description = "A list of connection strings of the SQL servers to scrape metrics from"; + }; + startupSql = mkOption { + type = listOf str; + default = []; + description = "A list of SQL statements to execute once after making a connection."; + }; + queries = mkOption { + type = attrsOf (submodule queryOptions); + description = "SQL queries to run."; + }; + }; + }; + queryOptions = { + options = with types; { + help = mkOption { + type = nullOr str; + default = null; + description = "A human-readable description of this metric."; + }; + labels = mkOption { + type = listOf str; + default = [ ]; + description = "A set of columns that will be used as Prometheus labels."; + }; + query = mkOption { + type = str; + description = "The SQL query to run."; + }; + values = mkOption { + type = listOf str; + description = "A set of columns that will be used as values of this metric."; + }; + }; + }; + + configFile = + if cfg.configFile != null + then cfg.configFile + else + let + nameInline = mapAttrsToList (k: v: v // { name = k; }); + renameStartupSql = j: removeAttrs (j // { startup_sql = j.startupSql; }) [ "startupSql" ]; + configuration = { + jobs = map renameStartupSql + (nameInline (mapAttrs (k: v: (v // { queries = nameInline v.queries; })) cfg.configuration.jobs)); + }; + in + builtins.toFile "config.yaml" (builtins.toJSON configuration); +in +{ + extraOpts = { + configFile = mkOption { + type = with types; nullOr path; + default = null; + description = '' + Path to configuration file. + ''; + }; + configuration = mkOption { + type = with types; nullOr (submodule cfgOptions); + default = null; + description = '' + Exporter configuration as nix attribute set. Mutually exclusive with 'configFile' option. + ''; + }; + }; + + port = 9237; + serviceOpts = { + serviceConfig = { + ExecStart = '' + ${pkgs.prometheus-sql-exporter}/bin/sql_exporter \ + -web.listen-address ${cfg.listenAddress}:${toString cfg.port} \ + -config.file ${configFile} \ + ${concatStringsSep " \\\n " cfg.extraFlags} + ''; + }; + }; +} diff --git a/third_party/nixpkgs/nixos/modules/services/network-filesystems/ipfs.nix b/third_party/nixpkgs/nixos/modules/services/network-filesystems/ipfs.nix index f298f831fa..2082d51316 100644 --- a/third_party/nixpkgs/nixos/modules/services/network-filesystems/ipfs.nix +++ b/third_party/nixpkgs/nixos/modules/services/network-filesystems/ipfs.nix @@ -44,6 +44,13 @@ in { enable = mkEnableOption "Interplanetary File System (WARNING: may cause severe network degredation)"; + package = mkOption { + type = types.package; + default = pkgs.ipfs; + defaultText = "pkgs.ipfs"; + description = "Which IPFS package to use."; + }; + user = mkOption { type = types.str; default = "ipfs"; @@ -176,7 +183,7 @@ in { ###### implementation config = mkIf cfg.enable { - environment.systemPackages = [ pkgs.ipfs ]; + environment.systemPackages = [ cfg.package ]; environment.variables.IPFS_PATH = cfg.dataDir; programs.fuse = mkIf cfg.autoMount { @@ -207,14 +214,14 @@ in { "d '${cfg.ipnsMountDir}' - ${cfg.user} ${cfg.group} - -" ]; - systemd.packages = [ pkgs.ipfs ]; + systemd.packages = [ cfg.package ]; systemd.services.ipfs-init = { description = "IPFS Initializer"; environment.IPFS_PATH = cfg.dataDir; - path = [ pkgs.ipfs ]; + path = [ cfg.package ]; script = '' if [[ ! -f ${cfg.dataDir}/config ]]; then @@ -239,7 +246,7 @@ in { }; systemd.services.ipfs = { - path = [ "/run/wrappers" pkgs.ipfs ]; + path = [ "/run/wrappers" cfg.package ]; environment.IPFS_PATH = cfg.dataDir; wants = [ "ipfs-init.service" ]; @@ -267,7 +274,7 @@ in { cfg.extraConfig)) ); serviceConfig = { - ExecStart = ["" "${pkgs.ipfs}/bin/ipfs daemon ${ipfsFlags}"]; + ExecStart = ["" "${cfg.package}/bin/ipfs daemon ${ipfsFlags}"]; User = cfg.user; Group = cfg.group; } // optionalAttrs (cfg.serviceFdlimit != null) { LimitNOFILE = cfg.serviceFdlimit; }; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/dhcpcd.nix b/third_party/nixpkgs/nixos/modules/services/networking/dhcpcd.nix index 0507b739d4..d10bffd914 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/dhcpcd.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/dhcpcd.nix @@ -69,6 +69,11 @@ let if-carrier-up = ""; }.${cfg.wait}} + ${optionalString (config.networking.enableIPv6 == false) '' + # Don't solicit or accept IPv6 Router Advertisements and DHCPv6 if disabled IPv6 + noipv6 + ''} + ${cfg.extraConfig} ''; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/nar-serve.nix b/third_party/nixpkgs/nixos/modules/services/networking/nar-serve.nix new file mode 100644 index 0000000000..ddd42fa010 --- /dev/null +++ b/third_party/nixpkgs/nixos/modules/services/networking/nar-serve.nix @@ -0,0 +1,55 @@ +{ config, pkgs, lib, ... }: + +with lib; +let + cfg = config.services.nar-serve; +in +{ + meta = { + maintainers = [ maintainers.rizary ]; + }; + options = { + services.nar-serve = { + enable = mkEnableOption "Serve NAR file contents via HTTP"; + + port = mkOption { + type = types.int; + default = 8383; + description = '' + Port number where nar-serve will listen on. + ''; + }; + + cacheURL = mkOption { + type = types.str; + default = "https://cache.nixos.org/"; + description = '' + Binary cache URL to connect to. + + The URL format is compatible with the nix remote url style, such as: + - http://, https:// for binary caches via HTTP or HTTPS + - s3:// for binary caches stored in Amazon S3 + - gs:// for binary caches stored in Google Cloud Storage + ''; + }; + }; + }; + + config = mkIf cfg.enable { + systemd.services.nar-serve = { + description = "NAR server"; + after = [ "network.target" ]; + wantedBy = [ "multi-user.target" ]; + + environment.PORT = toString cfg.port; + environment.NAR_CACHE_URL = cfg.cacheURL; + + serviceConfig = { + Restart = "always"; + RestartSec = "5s"; + ExecStart = "${pkgs.nar-serve}/bin/nar-serve"; + DynamicUser = true; + }; + }; + }; +} diff --git a/third_party/nixpkgs/nixos/modules/services/networking/ntp/chrony.nix b/third_party/nixpkgs/nixos/modules/services/networking/ntp/chrony.nix index 78de50583f..e6fa48daf4 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/ntp/chrony.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/ntp/chrony.nix @@ -6,6 +6,7 @@ let cfg = config.services.chrony; stateDir = "/var/lib/chrony"; + driftFile = "${stateDir}/chrony.drift"; keyFile = "${stateDir}/chrony.keys"; configFile = pkgs.writeText "chrony.conf" '' @@ -16,7 +17,7 @@ let "initstepslew ${toString cfg.initstepslew.threshold} ${concatStringsSep " " cfg.servers}" } - driftfile ${stateDir}/chrony.drift + driftfile ${driftFile} keyfile ${keyFile} ${optionalString (!config.time.hardwareClockInLocalTime) "rtconutc"} @@ -95,6 +96,7 @@ in systemd.tmpfiles.rules = [ "d ${stateDir} 0755 chrony chrony - -" + "f ${driftFile} 0640 chrony chrony -" "f ${keyFile} 0640 chrony chrony -" ]; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/stunnel.nix b/third_party/nixpkgs/nixos/modules/services/networking/stunnel.nix index ab51bba2f6..fe1616f411 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/stunnel.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/stunnel.nix @@ -16,8 +16,12 @@ let serverConfig = { options = { accept = mkOption { - type = types.int; - description = "On which port stunnel should listen for incoming TLS connections."; + type = types.either types.str types.int; + description = '' + On which [host:]port stunnel should listen for incoming TLS connections. + Note that unlike other softwares stunnel ipv6 address need no brackets, + so to listen on all IPv6 addresses on port 1234 one would use ':::1234'. + ''; }; connect = mkOption { @@ -129,7 +133,6 @@ in type = with types; attrsOf (submodule serverConfig); example = { fancyWebserver = { - enable = true; accept = 443; connect = 8080; cert = "/path/to/pem/file"; diff --git a/third_party/nixpkgs/nixos/modules/services/networking/tailscale.nix b/third_party/nixpkgs/nixos/modules/services/networking/tailscale.nix index 4419c8a060..d6684d69e6 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/tailscale.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/tailscale.nix @@ -18,30 +18,10 @@ in { config = mkIf cfg.enable { environment.systemPackages = [ pkgs.tailscale ]; # for the CLI - systemd.services.tailscale = { - description = "Tailscale client daemon"; - - after = [ "network-pre.target" ]; - wants = [ "network-pre.target" ]; + systemd.packages = [ pkgs.tailscale ]; + systemd.services.tailscaled = { wantedBy = [ "multi-user.target" ]; - - startLimitIntervalSec = 0; - - serviceConfig = { - ExecStart = - "${pkgs.tailscale}/bin/tailscaled --port ${toString cfg.port}"; - - RuntimeDirectory = "tailscale"; - RuntimeDirectoryMode = 755; - - StateDirectory = "tailscale"; - StateDirectoryMode = 750; - - CacheDirectory = "tailscale"; - CacheDirectoryMode = 750; - - Restart = "on-failure"; - }; + serviceConfig.Environment = "PORT=${toString cfg.port}"; }; }; } diff --git a/third_party/nixpkgs/nixos/modules/services/torrent/transmission.nix b/third_party/nixpkgs/nixos/modules/services/torrent/transmission.nix index aeb58a7194..717c18d367 100644 --- a/third_party/nixpkgs/nixos/modules/services/torrent/transmission.nix +++ b/third_party/nixpkgs/nixos/modules/services/torrent/transmission.nix @@ -236,6 +236,7 @@ in # an AppArmor profile is provided to get a confinement based upon paths and rights. builtins.storeDir "/etc" + "/run" ] ++ optional (cfg.settings.script-torrent-done-enabled && cfg.settings.script-torrent-done-filename != "") @@ -408,6 +409,7 @@ in #r @{PROC}/@{pid}/environ, r @{PROC}/@{pid}/mounts, rwk /tmp/tr_session_id_*, + r /run/systemd/resolve/stub-resolv.conf, r ${pkgs.openssl.out}/etc/**, r ${config.systemd.services.transmission.environment.CURL_CA_BUNDLE}, diff --git a/third_party/nixpkgs/nixos/modules/services/video/epgstation/generate b/third_party/nixpkgs/nixos/modules/services/video/epgstation/generate deleted file mode 100755 index 2940768b6d..0000000000 --- a/third_party/nixpkgs/nixos/modules/services/video/epgstation/generate +++ /dev/null @@ -1,31 +0,0 @@ -#!/usr/bin/env -S nix-build --no-out-link - -# Script to generate default streaming configurations for EPGStation. There's -# no need to run this script directly since generate.sh in the EPGStation -# package directory would run this script for you. -# -# Usage: ./generate | xargs cat > streaming.json - -{ pkgs ? (import ../../../../.. {}) }: - -let - sampleConfigPath = "${pkgs.epgstation.src}/config/config.sample.json"; - sampleConfig = builtins.fromJSON (builtins.readFile sampleConfigPath); - streamingConfig = { - inherit (sampleConfig) - mpegTsStreaming - mpegTsViewer - liveHLS - liveMP4 - liveWebM - recordedDownloader - recordedStreaming - recordedViewer - recordedHLS; - }; -in -pkgs.runCommand "streaming.json" { nativeBuildInputs = [ pkgs.jq ]; } '' - jq . <<<'${builtins.toJSON streamingConfig}' > $out -'' - -# vim:set ft=nix: diff --git a/third_party/nixpkgs/nixos/modules/services/video/epgstation/streaming.json b/third_party/nixpkgs/nixos/modules/services/video/epgstation/streaming.json index 37957f6cb6..8eb99cf855 100644 --- a/third_party/nixpkgs/nixos/modules/services/video/epgstation/streaming.json +++ b/third_party/nixpkgs/nixos/modules/services/video/epgstation/streaming.json @@ -1,119 +1,119 @@ { "liveHLS": [ { - "cmd": "%FFMPEG% -re -dual_mono_mode main -i pipe:0 -sn -threads 0 -map 0 -ignore_unknown -max_muxing_queue_size 1024 -f hls -hls_time 3 -hls_list_size 17 -hls_allow_cache 1 -hls_segment_filename %streamFileDir%/stream%streamNum%-%09d.ts -c:a aac -ar 48000 -b:a 192k -ac 2 -c:v libx264 -vf yadif,scale=-2:720 -b:v 3000k -preset veryfast -flags +loop-global_header %OUTPUT%", - "name": "720p" + "name": "720p", + "cmd": "%FFMPEG% -re -dual_mono_mode main -i pipe:0 -sn -threads 0 -map 0 -ignore_unknown -max_muxing_queue_size 1024 -f hls -hls_time 3 -hls_list_size 17 -hls_allow_cache 1 -hls_segment_filename %streamFileDir%/stream%streamNum%-%09d.ts -c:a aac -ar 48000 -b:a 192k -ac 2 -c:v libx264 -vf yadif,scale=-2:720 -b:v 3000k -preset veryfast -flags +loop-global_header %OUTPUT%" }, { - "cmd": "%FFMPEG% -re -dual_mono_mode main -i pipe:0 -sn -threads 0 -map 0 -ignore_unknown -max_muxing_queue_size 1024 -f hls -hls_time 3 -hls_list_size 17 -hls_allow_cache 1 -hls_segment_filename %streamFileDir%/stream%streamNum%-%09d.ts -c:a aac -ar 48000 -b:a 128k -ac 2 -c:v libx264 -vf yadif,scale=-2:480 -b:v 1500k -preset veryfast -flags +loop-global_header %OUTPUT%", - "name": "480p" + "name": "480p", + "cmd": "%FFMPEG% -re -dual_mono_mode main -i pipe:0 -sn -threads 0 -map 0 -ignore_unknown -max_muxing_queue_size 1024 -f hls -hls_time 3 -hls_list_size 17 -hls_allow_cache 1 -hls_segment_filename %streamFileDir%/stream%streamNum%-%09d.ts -c:a aac -ar 48000 -b:a 128k -ac 2 -c:v libx264 -vf yadif,scale=-2:480 -b:v 1500k -preset veryfast -flags +loop-global_header %OUTPUT%" }, { - "cmd": "%FFMPEG% -re -dual_mono_mode main -i pipe:0 -sn -threads 0 -map 0 -ignore_unknown -max_muxing_queue_size 1024 -f hls -hls_time 3 -hls_list_size 17 -hls_allow_cache 1 -hls_segment_filename %streamFileDir%/stream%streamNum%-%09d.ts -c:a aac -ar 48000 -b:a 48k -ac 2 -c:v libx264 -vf yadif,scale=-2:180 -b:v 100k -preset veryfast -maxrate 110k -bufsize 1000k -flags +loop-global_header %OUTPUT%", - "name": "180p" + "name": "180p", + "cmd": "%FFMPEG% -re -dual_mono_mode main -i pipe:0 -sn -threads 0 -map 0 -ignore_unknown -max_muxing_queue_size 1024 -f hls -hls_time 3 -hls_list_size 17 -hls_allow_cache 1 -hls_segment_filename %streamFileDir%/stream%streamNum%-%09d.ts -c:a aac -ar 48000 -b:a 48k -ac 2 -c:v libx264 -vf yadif,scale=-2:180 -b:v 100k -preset veryfast -maxrate 110k -bufsize 1000k -flags +loop-global_header %OUTPUT%" } ], "liveMP4": [ { - "cmd": "%FFMPEG% -re -dual_mono_mode main -i pipe:0 -sn -threads 0 -c:a aac -ar 48000 -b:a 192k -ac 2 -c:v libx264 -vf yadif,scale=-2:720 -b:v 3000k -profile:v baseline -preset veryfast -tune fastdecode,zerolatency -movflags frag_keyframe+empty_moov+faststart+default_base_moof -y -f mp4 pipe:1", - "name": "720p" + "name": "720p", + "cmd": "%FFMPEG% -re -dual_mono_mode main -i pipe:0 -sn -threads 0 -c:a aac -ar 48000 -b:a 192k -ac 2 -c:v libx264 -vf yadif,scale=-2:720 -b:v 3000k -profile:v baseline -preset veryfast -tune fastdecode,zerolatency -movflags frag_keyframe+empty_moov+faststart+default_base_moof -y -f mp4 pipe:1" }, { - "cmd": "%FFMPEG% -re -dual_mono_mode main -i pipe:0 -sn -threads 0 -c:a aac -ar 48000 -b:a 128k -ac 2 -c:v libx264 -vf yadif,scale=-2:480 -b:v 1500k -profile:v baseline -preset veryfast -tune fastdecode,zerolatency -movflags frag_keyframe+empty_moov+faststart+default_base_moof -y -f mp4 pipe:1", - "name": "480p" + "name": "480p", + "cmd": "%FFMPEG% -re -dual_mono_mode main -i pipe:0 -sn -threads 0 -c:a aac -ar 48000 -b:a 128k -ac 2 -c:v libx264 -vf yadif,scale=-2:480 -b:v 1500k -profile:v baseline -preset veryfast -tune fastdecode,zerolatency -movflags frag_keyframe+empty_moov+faststart+default_base_moof -y -f mp4 pipe:1" } ], "liveWebM": [ { - "cmd": "%FFMPEG% -re -dual_mono_mode main -i pipe:0 -sn -threads 3 -c:a libvorbis -ar 48000 -b:a 192k -ac 2 -c:v libvpx-vp9 -vf yadif,scale=-2:720 -b:v 3000k -deadline realtime -speed 4 -cpu-used -8 -y -f webm pipe:1", - "name": "720p" + "name": "720p", + "cmd": "%FFMPEG% -re -dual_mono_mode main -i pipe:0 -sn -threads 3 -c:a libvorbis -ar 48000 -b:a 192k -ac 2 -c:v libvpx-vp9 -vf yadif,scale=-2:720 -b:v 3000k -deadline realtime -speed 4 -cpu-used -8 -y -f webm pipe:1" }, { - "cmd": "%FFMPEG% -re -dual_mono_mode main -i pipe:0 -sn -threads 2 -c:a libvorbis -ar 48000 -b:a 128k -ac 2 -c:v libvpx-vp9 -vf yadif,scale=-2:480 -b:v 1500k -deadline realtime -speed 4 -cpu-used -8 -y -f webm pipe:1", - "name": "480p" + "name": "480p", + "cmd": "%FFMPEG% -re -dual_mono_mode main -i pipe:0 -sn -threads 2 -c:a libvorbis -ar 48000 -b:a 128k -ac 2 -c:v libvpx-vp9 -vf yadif,scale=-2:480 -b:v 1500k -deadline realtime -speed 4 -cpu-used -8 -y -f webm pipe:1" } ], "mpegTsStreaming": [ { - "cmd": "%FFMPEG% -re -dual_mono_mode main -i pipe:0 -sn -threads 0 -c:a aac -ar 48000 -b:a 192k -ac 2 -c:v libx264 -vf yadif,scale=-2:720 -b:v 3000k -preset veryfast -y -f mpegts pipe:1", - "name": "720p" + "name": "720p", + "cmd": "%FFMPEG% -re -dual_mono_mode main -i pipe:0 -sn -threads 0 -c:a aac -ar 48000 -b:a 192k -ac 2 -c:v libx264 -vf yadif,scale=-2:720 -b:v 3000k -preset veryfast -y -f mpegts pipe:1" }, { - "cmd": "%FFMPEG% -re -dual_mono_mode main -i pipe:0 -sn -threads 0 -c:a aac -ar 48000 -b:a 128k -ac 2 -c:v libx264 -vf yadif,scale=-2:480 -b:v 1500k -preset veryfast -y -f mpegts pipe:1", - "name": "480p" + "name": "480p", + "cmd": "%FFMPEG% -re -dual_mono_mode main -i pipe:0 -sn -threads 0 -c:a aac -ar 48000 -b:a 128k -ac 2 -c:v libx264 -vf yadif,scale=-2:480 -b:v 1500k -preset veryfast -y -f mpegts pipe:1" }, { "name": "Original" } ], "mpegTsViewer": { - "android": "intent://ADDRESS#Intent;package=com.mxtech.videoplayer.ad;type=video;scheme=http;end", - "ios": "vlc-x-callback://x-callback-url/stream?url=http://ADDRESS" + "ios": "vlc-x-callback://x-callback-url/stream?url=http://ADDRESS", + "android": "intent://ADDRESS#Intent;package=com.mxtech.videoplayer.ad;type=video;scheme=http;end" }, "recordedDownloader": { - "android": "intent://ADDRESS#Intent;package=com.dv.adm;type=video;scheme=http;end", - "ios": "vlc-x-callback://x-callback-url/download?url=http://ADDRESS&filename=FILENAME" + "ios": "vlc-x-callback://x-callback-url/download?url=http://ADDRESS&filename=FILENAME", + "android": "intent://ADDRESS#Intent;package=com.dv.adm;type=video;scheme=http;end" }, - "recordedHLS": [ - { - "cmd": "%FFMPEG% -dual_mono_mode main -i %INPUT% -sn -threads 0 -map 0 -ignore_unknown -max_muxing_queue_size 1024 -f hls -hls_time 3 -hls_list_size 0 -hls_allow_cache 1 -hls_segment_filename %streamFileDir%/stream%streamNum%-%09d.ts -c:a aac -ar 48000 -b:a 192k -ac 2 -c:v libx264 -vf yadif,scale=-2:720 -b:v 3000k -preset veryfast -flags +loop-global_header %OUTPUT%", - "name": "720p" - }, - { - "cmd": "%FFMPEG% -dual_mono_mode main -i %INPUT% -sn -threads 0 -map 0 -ignore_unknown -max_muxing_queue_size 1024 -f hls -hls_time 3 -hls_list_size 0 -hls_allow_cache 1 -hls_segment_filename %streamFileDir%/stream%streamNum%-%09d.ts -c:a aac -ar 48000 -b:a 128k -ac 2 -c:v libx264 -vf yadif,scale=-2:480 -b:v 1500k -preset veryfast -flags +loop-global_header %OUTPUT%", - "name": "480p" - }, - { - "cmd": "%FFMPEG% -dual_mono_mode main -i %INPUT% -sn -map 0 -ignore_unknown -max_muxing_queue_size 1024 -f hls -hls_time 3 -hls_list_size 0 -hls_allow_cache 1 -hls_segment_type fmp4 -hls_fmp4_init_filename stream%streamNum%-init.mp4 -hls_segment_filename stream%streamNum%-%09d.m4s -c:a aac -ar 48000 -b:a 128k -ac 2 -c:v libx265 -vf yadif,scale=-2:480 -b:v 350k -preset veryfast -tag:v hvc1 %OUTPUT%", - "name": "480p(h265)" - } - ], "recordedStreaming": { - "mp4": [ + "webm": [ { - "ab": "192k", - "cmd": "%FFMPEG% -dual_mono_mode main %RE% -i pipe:0 -sn -threads 0 -c:a aac -ar 48000 -ac 2 -c:v libx264 -vf yadif,scale=-2:720 %VB% %VBUFFER% %AB% %ABUFFER% -profile:v baseline -preset veryfast -tune fastdecode,zerolatency -movflags frag_keyframe+empty_moov+faststart+default_base_moof -y -f mp4 pipe:1", "name": "720p", - "vb": "3000k" + "cmd": "%FFMPEG% -dual_mono_mode main %RE% -i pipe:0 -sn -threads 3 -c:a libvorbis -ar 48000 -ac 2 -c:v libvpx-vp9 -vf yadif,scale=-2:720 %VB% %VBUFFER% %AB% %ABUFFER% -deadline realtime -speed 4 -cpu-used -8 -y -f webm pipe:1", + "vb": "3000k", + "ab": "192k" }, { - "ab": "128k", - "cmd": "%FFMPEG% -dual_mono_mode main %RE% -i pipe:0 -sn -threads 0 -c:a aac -ar 48000 -ac 2 -c:v libx264 -vf yadif,scale=-2:360 %VB% %VBUFFER% %AB% %ABUFFER% -profile:v baseline -preset veryfast -tune fastdecode,zerolatency -movflags frag_keyframe+empty_moov+faststart+default_base_moof -y -f mp4 pipe:1", "name": "360p", - "vb": "1500k" + "cmd": "%FFMPEG% -dual_mono_mode main %RE% -i pipe:0 -sn -threads 2 -c:a libvorbis -ar 48000 -ac 2 -c:v libvpx-vp9 -vf yadif,scale=-2:360 %VB% %VBUFFER% %AB% %ABUFFER% -deadline realtime -speed 4 -cpu-used -8 -y -f webm pipe:1", + "vb": "1500k", + "ab": "128k" + } + ], + "mp4": [ + { + "name": "720p", + "cmd": "%FFMPEG% -dual_mono_mode main %RE% -i pipe:0 -sn -threads 0 -c:a aac -ar 48000 -ac 2 -c:v libx264 -vf yadif,scale=-2:720 %VB% %VBUFFER% %AB% %ABUFFER% -profile:v baseline -preset veryfast -tune fastdecode,zerolatency -movflags frag_keyframe+empty_moov+faststart+default_base_moof -y -f mp4 pipe:1", + "vb": "3000k", + "ab": "192k" + }, + { + "name": "360p", + "cmd": "%FFMPEG% -dual_mono_mode main %RE% -i pipe:0 -sn -threads 0 -c:a aac -ar 48000 -ac 2 -c:v libx264 -vf yadif,scale=-2:360 %VB% %VBUFFER% %AB% %ABUFFER% -profile:v baseline -preset veryfast -tune fastdecode,zerolatency -movflags frag_keyframe+empty_moov+faststart+default_base_moof -y -f mp4 pipe:1", + "vb": "1500k", + "ab": "128k" } ], "mpegTs": [ { - "ab": "192k", - "cmd": "%FFMPEG% -dual_mono_mode main %RE% -i pipe:0 -sn -threads 0 -c:a aac -ar 48000 -ac 2 -c:v libx264 -vf yadif,scale=-2:720 %VB% %VBUFFER% %AB% %ABUFFER% -profile:v baseline -preset veryfast -tune fastdecode,zerolatency -y -f mpegts pipe:1", "name": "720p (H.264)", - "vb": "3000k" + "cmd": "%FFMPEG% -dual_mono_mode main %RE% -i pipe:0 -sn -threads 0 -c:a aac -ar 48000 -ac 2 -c:v libx264 -vf yadif,scale=-2:720 %VB% %VBUFFER% %AB% %ABUFFER% -profile:v baseline -preset veryfast -tune fastdecode,zerolatency -y -f mpegts pipe:1", + "vb": "3000k", + "ab": "192k" }, { - "ab": "128k", - "cmd": "%FFMPEG% -dual_mono_mode main %RE% -i pipe:0 -sn -threads 0 -c:a aac -ar 48000 -ac 2 -c:v libx264 -vf yadif,scale=-2:360 %VB% %VBUFFER% %AB% %ABUFFER% -profile:v baseline -preset veryfast -tune fastdecode,zerolatency -y -f mpegts pipe:1", "name": "360p (H.264)", - "vb": "1500k" - } - ], - "webm": [ - { - "ab": "192k", - "cmd": "%FFMPEG% -dual_mono_mode main %RE% -i pipe:0 -sn -threads 3 -c:a libvorbis -ar 48000 -ac 2 -c:v libvpx-vp9 -vf yadif,scale=-2:720 %VB% %VBUFFER% %AB% %ABUFFER% -deadline realtime -speed 4 -cpu-used -8 -y -f webm pipe:1", - "name": "720p", - "vb": "3000k" - }, - { - "ab": "128k", - "cmd": "%FFMPEG% -dual_mono_mode main %RE% -i pipe:0 -sn -threads 2 -c:a libvorbis -ar 48000 -ac 2 -c:v libvpx-vp9 -vf yadif,scale=-2:360 %VB% %VBUFFER% %AB% %ABUFFER% -deadline realtime -speed 4 -cpu-used -8 -y -f webm pipe:1", - "name": "360p", - "vb": "1500k" + "cmd": "%FFMPEG% -dual_mono_mode main %RE% -i pipe:0 -sn -threads 0 -c:a aac -ar 48000 -ac 2 -c:v libx264 -vf yadif,scale=-2:360 %VB% %VBUFFER% %AB% %ABUFFER% -profile:v baseline -preset veryfast -tune fastdecode,zerolatency -y -f mpegts pipe:1", + "vb": "1500k", + "ab": "128k" } ] }, + "recordedHLS": [ + { + "name": "720p", + "cmd": "%FFMPEG% -dual_mono_mode main -i %INPUT% -sn -threads 0 -map 0 -ignore_unknown -max_muxing_queue_size 1024 -f hls -hls_time 3 -hls_list_size 0 -hls_allow_cache 1 -hls_segment_filename %streamFileDir%/stream%streamNum%-%09d.ts -c:a aac -ar 48000 -b:a 192k -ac 2 -c:v libx264 -vf yadif,scale=-2:720 -b:v 3000k -preset veryfast -flags +loop-global_header %OUTPUT%" + }, + { + "name": "480p", + "cmd": "%FFMPEG% -dual_mono_mode main -i %INPUT% -sn -threads 0 -map 0 -ignore_unknown -max_muxing_queue_size 1024 -f hls -hls_time 3 -hls_list_size 0 -hls_allow_cache 1 -hls_segment_filename %streamFileDir%/stream%streamNum%-%09d.ts -c:a aac -ar 48000 -b:a 128k -ac 2 -c:v libx264 -vf yadif,scale=-2:480 -b:v 1500k -preset veryfast -flags +loop-global_header %OUTPUT%" + }, + { + "name": "480p(h265)", + "cmd": "%FFMPEG% -dual_mono_mode main -i %INPUT% -sn -map 0 -ignore_unknown -max_muxing_queue_size 1024 -f hls -hls_time 3 -hls_list_size 0 -hls_allow_cache 1 -hls_segment_type fmp4 -hls_fmp4_init_filename stream%streamNum%-init.mp4 -hls_segment_filename stream%streamNum%-%09d.m4s -c:a aac -ar 48000 -b:a 128k -ac 2 -c:v libx265 -vf yadif,scale=-2:480 -b:v 350k -preset veryfast -tag:v hvc1 %OUTPUT%" + } + ], "recordedViewer": { - "android": "intent://ADDRESS#Intent;package=com.mxtech.videoplayer.ad;type=video;scheme=http;end", - "ios": "infuse://x-callback-url/play?url=http://ADDRESS" + "ios": "infuse://x-callback-url/play?url=http://ADDRESS", + "android": "intent://ADDRESS#Intent;package=com.mxtech.videoplayer.ad;type=video;scheme=http;end" } } diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/keycloak.nix b/third_party/nixpkgs/nixos/modules/services/web-apps/keycloak.nix new file mode 100644 index 0000000000..bbb0c8d048 --- /dev/null +++ b/third_party/nixpkgs/nixos/modules/services/web-apps/keycloak.nix @@ -0,0 +1,692 @@ +{ config, pkgs, lib, ... }: + +let + cfg = config.services.keycloak; +in +{ + options.services.keycloak = { + + enable = lib.mkOption { + type = lib.types.bool; + default = false; + example = true; + description = '' + Whether to enable the Keycloak identity and access management + server. + ''; + }; + + bindAddress = lib.mkOption { + type = lib.types.str; + default = "\${jboss.bind.address:0.0.0.0}"; + example = "127.0.0.1"; + description = '' + On which address Keycloak should accept new connections. + + A special syntax can be used to allow command line Java system + properties to override the value: ''${property.name:value} + ''; + }; + + httpPort = lib.mkOption { + type = lib.types.str; + default = "\${jboss.http.port:80}"; + example = "8080"; + description = '' + On which port Keycloak should listen for new HTTP connections. + + A special syntax can be used to allow command line Java system + properties to override the value: ''${property.name:value} + ''; + }; + + httpsPort = lib.mkOption { + type = lib.types.str; + default = "\${jboss.https.port:443}"; + example = "8443"; + description = '' + On which port Keycloak should listen for new HTTPS connections. + + A special syntax can be used to allow command line Java system + properties to override the value: ''${property.name:value} + ''; + }; + + frontendUrl = lib.mkOption { + type = lib.types.str; + example = "keycloak.example.com/auth"; + description = '' + The public URL used as base for all frontend requests. Should + normally include a trailing /auth. + + See the + Hostname section of the Keycloak server installation + manual for more information. + ''; + }; + + forceBackendUrlToFrontendUrl = lib.mkOption { + type = lib.types.bool; + default = false; + example = true; + description = '' + Whether Keycloak should force all requests to go through the + frontend URL configured in . By default, + Keycloak allows backend requests to instead use its local + hostname or IP address and may also advertise it to clients + through its OpenID Connect Discovery endpoint. + + See the + Hostname section of the Keycloak server installation + manual for more information. + ''; + }; + + certificatePrivateKeyBundle = lib.mkOption { + type = lib.types.nullOr lib.types.path; + default = null; + example = "/run/keys/ssl_cert"; + description = '' + The path to a PEM formatted bundle of the private key and + certificate to use for TLS connections. + + This should be a string, not a Nix path, since Nix paths are + copied into the world-readable Nix store. + ''; + }; + + databaseType = lib.mkOption { + type = lib.types.enum [ "mysql" "postgresql" ]; + default = "postgresql"; + example = "mysql"; + description = '' + The type of database Keycloak should connect to. + ''; + }; + + databaseHost = lib.mkOption { + type = lib.types.str; + default = "localhost"; + description = '' + Hostname of the database to connect to. + ''; + }; + + databasePort = + let + dbPorts = { + postgresql = 5432; + mysql = 3306; + }; + in + lib.mkOption { + type = lib.types.port; + default = dbPorts.${cfg.databaseType}; + description = '' + Port of the database to connect to. + ''; + }; + + databaseUseSSL = lib.mkOption { + type = lib.types.bool; + default = cfg.databaseHost != "localhost"; + description = '' + Whether the database connection should be secured by SSL / + TLS. + ''; + }; + + databaseCaCert = lib.mkOption { + type = lib.types.nullOr lib.types.path; + default = null; + description = '' + The SSL / TLS CA certificate that verifies the identity of the + database server. + + Required when PostgreSQL is used and SSL is turned on. + + For MySQL, if left at null, the default + Java keystore is used, which should suffice if the server + certificate is issued by an official CA. + ''; + }; + + databaseCreateLocally = lib.mkOption { + type = lib.types.bool; + default = true; + description = '' + Whether a database should be automatically created on the + local host. Set this to false if you plan on provisioning a + local database yourself. This has no effect if + services.keycloak.databaseHost is customized. + ''; + }; + + databaseUsername = lib.mkOption { + type = lib.types.str; + default = "keycloak"; + description = '' + Username to use when connecting to an external or manually + provisioned database; has no effect when a local database is + automatically provisioned. + ''; + }; + + databasePasswordFile = lib.mkOption { + type = lib.types.path; + example = "/run/keys/db_password"; + description = '' + File containing the database password. + + This should be a string, not a Nix path, since Nix paths are + copied into the world-readable Nix store. + ''; + }; + + package = lib.mkOption { + type = lib.types.package; + default = pkgs.keycloak; + description = '' + Keycloak package to use. + ''; + }; + + initialAdminPassword = lib.mkOption { + type = lib.types.str; + default = "changeme"; + description = '' + Initial password set for the admin + user. The password is not stored safely and should be changed + immediately in the admin panel. + ''; + }; + + extraConfig = lib.mkOption { + type = lib.types.attrs; + default = { }; + example = lib.literalExample '' + { + "subsystem=keycloak-server" = { + "spi=hostname" = { + "provider=default" = null; + "provider=fixed" = { + enabled = true; + properties.hostname = "keycloak.example.com"; + }; + default-provider = "fixed"; + }; + }; + } + ''; + description = '' + Additional Keycloak configuration options to set in + standalone.xml. + + Options are expressed as a Nix attribute set which matches the + structure of the jboss-cli configuration. The configuration is + effectively overlayed on top of the default configuration + shipped with Keycloak. To remove existing nodes and undefine + attributes from the default configuration, set them to + null. + + The example configuration does the equivalent of the following + script, which removes the hostname provider + default, adds the deprecated hostname + provider fixed and defines it the default: + + + /subsystem=keycloak-server/spi=hostname/provider=default:remove() + /subsystem=keycloak-server/spi=hostname/provider=fixed:add(enabled = true, properties = { hostname = "keycloak.example.com" }) + /subsystem=keycloak-server/spi=hostname:write-attribute(name=default-provider, value="fixed") + + + You can discover available options by using the jboss-cli.sh + program and by referring to the Keycloak + Server Installation and Configuration Guide. + ''; + }; + + }; + + config = + let + # We only want to create a database if we're actually going to connect to it. + databaseActuallyCreateLocally = cfg.databaseCreateLocally && cfg.databaseHost == "localhost"; + createLocalPostgreSQL = databaseActuallyCreateLocally && cfg.databaseType == "postgresql"; + createLocalMySQL = databaseActuallyCreateLocally && cfg.databaseType == "mysql"; + + mySqlCaKeystore = pkgs.runCommandNoCC "mysql-ca-keystore" {} '' + ${pkgs.jre}/bin/keytool -importcert -trustcacerts -alias MySQLCACert -file ${cfg.databaseCaCert} -keystore $out -storepass notsosecretpassword -noprompt + ''; + + keycloakConfig' = builtins.foldl' lib.recursiveUpdate { + "interface=public".inet-address = cfg.bindAddress; + "socket-binding-group=standard-sockets"."socket-binding=http".port = cfg.httpPort; + "subsystem=keycloak-server"."spi=hostname" = { + "provider=default" = { + enabled = true; + properties = { + inherit (cfg) frontendUrl forceBackendUrlToFrontendUrl; + }; + }; + }; + "subsystem=datasources"."data-source=KeycloakDS" = { + max-pool-size = "20"; + user-name = if databaseActuallyCreateLocally then "keycloak" else cfg.databaseUsername; + password = "@db-password@"; + }; + } [ + (lib.optionalAttrs (cfg.databaseType == "postgresql") { + "subsystem=datasources" = { + "jdbc-driver=postgresql" = { + driver-module-name = "org.postgresql"; + driver-name = "postgresql"; + driver-xa-datasource-class-name = "org.postgresql.xa.PGXADataSource"; + }; + "data-source=KeycloakDS" = { + connection-url = "jdbc:postgresql://${cfg.databaseHost}:${builtins.toString cfg.databasePort}/keycloak"; + driver-name = "postgresql"; + "connection-properties=ssl".value = lib.boolToString cfg.databaseUseSSL; + } // (lib.optionalAttrs (cfg.databaseCaCert != null) { + "connection-properties=sslrootcert".value = cfg.databaseCaCert; + "connection-properties=sslmode".value = "verify-ca"; + }); + }; + }) + (lib.optionalAttrs (cfg.databaseType == "mysql") { + "subsystem=datasources" = { + "jdbc-driver=mysql" = { + driver-module-name = "com.mysql"; + driver-name = "mysql"; + driver-class-name = "com.mysql.jdbc.Driver"; + }; + "data-source=KeycloakDS" = { + connection-url = "jdbc:mysql://${cfg.databaseHost}:${builtins.toString cfg.databasePort}/keycloak"; + driver-name = "mysql"; + "connection-properties=useSSL".value = lib.boolToString cfg.databaseUseSSL; + "connection-properties=requireSSL".value = lib.boolToString cfg.databaseUseSSL; + "connection-properties=verifyServerCertificate".value = lib.boolToString cfg.databaseUseSSL; + "connection-properties=characterEncoding".value = "UTF-8"; + valid-connection-checker-class-name = "org.jboss.jca.adapters.jdbc.extensions.mysql.MySQLValidConnectionChecker"; + validate-on-match = true; + exception-sorter-class-name = "org.jboss.jca.adapters.jdbc.extensions.mysql.MySQLExceptionSorter"; + } // (lib.optionalAttrs (cfg.databaseCaCert != null) { + "connection-properties=trustCertificateKeyStoreUrl".value = "file:${mySqlCaKeystore}"; + "connection-properties=trustCertificateKeyStorePassword".value = "notsosecretpassword"; + }); + }; + }) + (lib.optionalAttrs (cfg.certificatePrivateKeyBundle != null) { + "socket-binding-group=standard-sockets"."socket-binding=https".port = cfg.httpsPort; + "core-service=management"."security-realm=UndertowRealm"."server-identity=ssl" = { + keystore-path = "/run/keycloak/ssl/certificate_private_key_bundle.p12"; + keystore-password = "notsosecretpassword"; + }; + "subsystem=undertow"."server=default-server"."https-listener=https".security-realm = "UndertowRealm"; + }) + cfg.extraConfig + ]; + + + /* Produces a JBoss CLI script that creates paths and sets + attributes matching those described by `attrs`. When the + script is run, the existing settings are effectively overlayed + by those from `attrs`. Existing attributes can be unset by + defining them `null`. + + JBoss paths and attributes / maps are distinguished by their + name, where paths follow a `key=value` scheme. + + Example: + mkJbossScript { + "subsystem=keycloak-server"."spi=hostname" = { + "provider=fixed" = null; + "provider=default" = { + enabled = true; + properties = { + inherit frontendUrl; + forceBackendUrlToFrontendUrl = false; + }; + }; + }; + } + => '' + if (outcome != success) of /:read-resource() + /:add() + end-if + if (outcome != success) of /subsystem=keycloak-server:read-resource() + /subsystem=keycloak-server:add() + end-if + if (outcome != success) of /subsystem=keycloak-server/spi=hostname:read-resource() + /subsystem=keycloak-server/spi=hostname:add() + end-if + if (outcome != success) of /subsystem=keycloak-server/spi=hostname/provider=default:read-resource() + /subsystem=keycloak-server/spi=hostname/provider=default:add(enabled = true, properties = { forceBackendUrlToFrontendUrl = false, frontendUrl = "https://keycloak.example.com/auth" }) + end-if + if (result != true) of /subsystem=keycloak-server/spi=hostname/provider=default:read-attribute(name="enabled") + /subsystem=keycloak-server/spi=hostname/provider=default:write-attribute(name=enabled, value=true) + end-if + if (result != false) of /subsystem=keycloak-server/spi=hostname/provider=default:read-attribute(name="properties.forceBackendUrlToFrontendUrl") + /subsystem=keycloak-server/spi=hostname/provider=default:write-attribute(name=properties.forceBackendUrlToFrontendUrl, value=false) + end-if + if (result != "https://keycloak.example.com/auth") of /subsystem=keycloak-server/spi=hostname/provider=default:read-attribute(name="properties.frontendUrl") + /subsystem=keycloak-server/spi=hostname/provider=default:write-attribute(name=properties.frontendUrl, value="https://keycloak.example.com/auth") + end-if + if (outcome != success) of /subsystem=keycloak-server/spi=hostname/provider=fixed:read-resource() + /subsystem=keycloak-server/spi=hostname/provider=fixed:remove() + end-if + '' + */ + mkJbossScript = attrs: + let + /* From a JBoss path and an attrset, produces a JBoss CLI + snippet that writes the corresponding attributes starting + at `path`. Recurses down into subattrsets as necessary, + producing the variable name from its full path in the + attrset. + + Example: + writeAttributes "/subsystem=keycloak-server/spi=hostname/provider=default" { + enabled = true; + properties = { + forceBackendUrlToFrontendUrl = false; + frontendUrl = "https://keycloak.example.com/auth"; + }; + } + => '' + if (result != true) of /subsystem=keycloak-server/spi=hostname/provider=default:read-attribute(name="enabled") + /subsystem=keycloak-server/spi=hostname/provider=default:write-attribute(name=enabled, value=true) + end-if + if (result != false) of /subsystem=keycloak-server/spi=hostname/provider=default:read-attribute(name="properties.forceBackendUrlToFrontendUrl") + /subsystem=keycloak-server/spi=hostname/provider=default:write-attribute(name=properties.forceBackendUrlToFrontendUrl, value=false) + end-if + if (result != "https://keycloak.example.com/auth") of /subsystem=keycloak-server/spi=hostname/provider=default:read-attribute(name="properties.frontendUrl") + /subsystem=keycloak-server/spi=hostname/provider=default:write-attribute(name=properties.frontendUrl, value="https://keycloak.example.com/auth") + end-if + '' + */ + writeAttributes = path: set: + let + # JBoss expressions like `${var}` need to be prefixed + # with `expression` to evaluate. + prefixExpression = string: + let + match = (builtins.match ''"\$\{.*}"'' string); + in + if match != null then + "expression " + string + else + string; + + writeAttribute = attribute: value: + let + type = builtins.typeOf value; + in + if type == "set" then + let + names = builtins.attrNames value; + in + builtins.foldl' (text: name: text + (writeAttribute "${attribute}.${name}" value.${name})) "" names + else if value == null then '' + if (outcome == success) of ${path}:read-attribute(name="${attribute}") + ${path}:undefine-attribute(name="${attribute}") + end-if + '' + else if builtins.elem type [ "string" "path" "bool" ] then + let + value' = if type == "bool" then lib.boolToString value else ''"${value}"''; + in '' + if (result != ${prefixExpression value'}) of ${path}:read-attribute(name="${attribute}") + ${path}:write-attribute(name=${attribute}, value=${value'}) + end-if + '' + else throw "Unsupported type '${type}' for path '${path}'!"; + in + lib.concatStrings + (lib.mapAttrsToList + (attribute: value: (writeAttribute attribute value)) + set); + + + /* Produces an argument list for the JBoss `add()` function, + which adds a JBoss path and takes as its arguments the + required subpaths and attributes. + + Example: + makeArgList { + enabled = true; + properties = { + forceBackendUrlToFrontendUrl = false; + frontendUrl = "https://keycloak.example.com/auth"; + }; + } + => '' + enabled = true, properties = { forceBackendUrlToFrontendUrl = false, frontendUrl = "https://keycloak.example.com/auth" } + '' + */ + makeArgList = set: + let + makeArg = attribute: value: + let + type = builtins.typeOf value; + in + if type == "set" then + "${attribute} = { " + (makeArgList value) + " }" + else if builtins.elem type [ "string" "path" "bool" ] then + "${attribute} = ${if type == "bool" then lib.boolToString value else ''"${value}"''}" + else if value == null then + "" + else + throw "Unsupported type '${type}' for attribute '${attribute}'!"; + in + lib.concatStringsSep ", " (lib.mapAttrsToList makeArg set); + + + /* Recurses into the `attrs` attrset, beginning at the path + resolved from `state.path ++ node`; if `node` is `null`, + starts from `state.path`. Only subattrsets that are JBoss + paths, i.e. follows the `key=value` format, are recursed + into - the rest are considered JBoss attributes / maps. + */ + recurse = state: node: + let + path = state.path ++ (lib.optional (node != null) node); + isPath = name: + let + value = lib.getAttrFromPath (path ++ [ name ]) attrs; + in + if (builtins.match ".*([=]).*" name) == [ "=" ] then + if builtins.isAttrs value || value == null then + true + else + throw "Parsing path '${lib.concatStringsSep "." (path ++ [ name ])}' failed: JBoss attributes cannot contain '='!" + else + false; + jbossPath = "/" + (lib.concatStringsSep "/" path); + nodeValue = lib.getAttrFromPath path attrs; + children = if !builtins.isAttrs nodeValue then {} else nodeValue; + subPaths = builtins.filter isPath (builtins.attrNames children); + jbossAttrs = lib.filterAttrs (name: _: !(isPath name)) children; + in + state // { + text = state.text + ( + if nodeValue != null then '' + if (outcome != success) of ${jbossPath}:read-resource() + ${jbossPath}:add(${makeArgList jbossAttrs}) + end-if + '' + (writeAttributes jbossPath jbossAttrs) + else '' + if (outcome == success) of ${jbossPath}:read-resource() + ${jbossPath}:remove() + end-if + '') + (builtins.foldl' recurse { text = ""; inherit path; } subPaths).text; + }; + in + (recurse { text = ""; path = []; } null).text; + + + jbossCliScript = pkgs.writeText "jboss-cli-script" (mkJbossScript keycloakConfig'); + + keycloakConfig = pkgs.runCommandNoCC "keycloak-config" {} '' + export JBOSS_BASE_DIR="$(pwd -P)"; + export JBOSS_MODULEPATH="${cfg.package}/modules"; + export JBOSS_LOG_DIR="$JBOSS_BASE_DIR/log"; + + cp -r ${cfg.package}/standalone/configuration . + chmod -R u+rwX ./configuration + + mkdir -p {deployments,ssl} + + "${cfg.package}/bin/standalone.sh"& + + attempt=1 + max_attempts=30 + while ! ${cfg.package}/bin/jboss-cli.sh --connect ':read-attribute(name=server-state)'; do + if [[ "$attempt" == "$max_attempts" ]]; then + echo "ERROR: Could not connect to Keycloak after $attempt attempts! Failing.." >&2 + exit 1 + fi + echo "Keycloak not fully started yet, retrying.. ($attempt/$max_attempts)" + sleep 1 + (( attempt++ )) + done + + ${cfg.package}/bin/jboss-cli.sh --connect --file=${jbossCliScript} --echo-command + + cp configuration/standalone.xml $out + ''; + in + lib.mkIf cfg.enable { + + assertions = [ + { + assertion = (cfg.databaseUseSSL && cfg.databaseType == "postgresql") -> (cfg.databaseCaCert != null); + message = ''A CA certificate must be specified (in 'services.keycloak.databaseCaCert') when PostgreSQL is used with SSL''; + } + ]; + + environment.systemPackages = [ cfg.package ]; + + systemd.services.keycloakPostgreSQLInit = lib.mkIf createLocalPostgreSQL { + after = [ "postgresql.service" ]; + before = [ "keycloak.service" ]; + bindsTo = [ "postgresql.service" ]; + serviceConfig = { + Type = "oneshot"; + RemainAfterExit = true; + User = "postgres"; + Group = "postgres"; + }; + script = '' + set -eu + + PSQL=${config.services.postgresql.package}/bin/psql + + db_password="$(<'${cfg.databasePasswordFile}')" + $PSQL -tAc "SELECT 1 FROM pg_roles WHERE rolname='keycloak'" | grep -q 1 || $PSQL -tAc "CREATE ROLE keycloak WITH LOGIN PASSWORD '$db_password' CREATEDB" + $PSQL -tAc "SELECT 1 FROM pg_database WHERE datname = 'keycloak'" | grep -q 1 || $PSQL -tAc 'CREATE DATABASE "keycloak" OWNER "keycloak"' + ''; + }; + + systemd.services.keycloakMySQLInit = lib.mkIf createLocalMySQL { + after = [ "mysql.service" ]; + before = [ "keycloak.service" ]; + bindsTo = [ "mysql.service" ]; + serviceConfig = { + Type = "oneshot"; + RemainAfterExit = true; + User = config.services.mysql.user; + Group = config.services.mysql.group; + }; + script = '' + set -eu + + db_password="$(<'${cfg.databasePasswordFile}')" + ( echo "CREATE USER IF NOT EXISTS 'keycloak'@'localhost' IDENTIFIED BY '$db_password';" + echo "CREATE DATABASE keycloak CHARACTER SET utf8 COLLATE utf8_unicode_ci;" + echo "GRANT ALL PRIVILEGES ON keycloak.* TO 'keycloak'@'localhost';" + ) | ${config.services.mysql.package}/bin/mysql -N + ''; + }; + + systemd.services.keycloak = + let + databaseServices = + if createLocalPostgreSQL then [ + "keycloakPostgreSQLInit.service" "postgresql.service" + ] + else if createLocalMySQL then [ + "keycloakMySQLInit.service" "mysql.service" + ] + else [ ]; + in { + after = databaseServices; + bindsTo = databaseServices; + wantedBy = [ "multi-user.target" ]; + environment = { + JBOSS_LOG_DIR = "/var/log/keycloak"; + JBOSS_BASE_DIR = "/run/keycloak"; + JBOSS_MODULEPATH = "${cfg.package}/modules"; + }; + serviceConfig = { + ExecStartPre = let + startPreFullPrivileges = '' + set -eu + + install -T -m 0400 -o keycloak -g keycloak '${cfg.databasePasswordFile}' /run/keycloak/secrets/db_password + '' + lib.optionalString (cfg.certificatePrivateKeyBundle != null) '' + install -T -m 0400 -o keycloak -g keycloak '${cfg.certificatePrivateKeyBundle}' /run/keycloak/secrets/ssl_cert_pk_bundle + ''; + startPre = '' + set -eu + + install -m 0600 ${cfg.package}/standalone/configuration/*.properties /run/keycloak/configuration + install -T -m 0600 ${keycloakConfig} /run/keycloak/configuration/standalone.xml + + db_password="$( allcerts.pem + ${pkgs.openssl}/bin/openssl pkcs12 -export -in /run/keycloak/secrets/ssl_cert_pk_bundle -chain \ + -name "${cfg.frontendUrl}" -out certificate_private_key_bundle.p12 \ + -CAfile allcerts.pem -passout pass:notsosecretpassword + popd + ''; + in [ + "+${pkgs.writeShellScript "keycloak-start-pre-full-privileges" startPreFullPrivileges}" + "${pkgs.writeShellScript "keycloak-start-pre" startPre}" + ]; + ExecStart = "${cfg.package}/bin/standalone.sh"; + User = "keycloak"; + Group = "keycloak"; + DynamicUser = true; + RuntimeDirectory = map (p: "keycloak/" + p) [ + "secrets" + "configuration" + "deployments" + "data" + "ssl" + "log" + "tmp" + ]; + RuntimeDirectoryMode = 0700; + LogsDirectory = "keycloak"; + AmbientCapabilities = "CAP_NET_BIND_SERVICE"; + }; + }; + + services.postgresql.enable = lib.mkDefault createLocalPostgreSQL; + services.mysql.enable = lib.mkDefault createLocalMySQL; + services.mysql.package = lib.mkIf createLocalMySQL pkgs.mysql; + }; + + meta.doc = ./keycloak.xml; +} diff --git a/third_party/nixpkgs/nixos/modules/services/web-apps/keycloak.xml b/third_party/nixpkgs/nixos/modules/services/web-apps/keycloak.xml new file mode 100644 index 0000000000..ca5e223eee --- /dev/null +++ b/third_party/nixpkgs/nixos/modules/services/web-apps/keycloak.xml @@ -0,0 +1,205 @@ + + Keycloak + + Keycloak is an + open source identity and access management server with support for + OpenID + Connect, OAUTH + 2.0 and SAML + 2.0. + +
+ Administration + + An administrative user with the username + admin is automatically created in the + master realm. Its initial password can be + configured by setting + and defaults to changeme. The password is + not stored safely and should be changed immediately in the + admin panel. + + + + Refer to the Admin + Console section of the Keycloak Server Administration Guide for + information on how to administer your + Keycloak instance. + +
+ +
+ Database access + + Keycloak can be used with either + PostgreSQL or + MySQL. Which one is used can be + configured in . The selected + database will automatically be enabled and a database and role + created unless is changed from + its default of localhost or is set + to false. + + + + External database access can also be configured by setting + , , and as + appropriate. Note that you need to manually create a database + called keycloak and allow the configured + database user full access to it. + + + + + must be set to the path to a file containing the password used + to log in to the database. If + and + are kept at their defaults, the database role + keycloak with that password is provisioned + on the local database instance. + + + + + The path should be provided as a string, not a Nix path, since Nix + paths are copied into the world readable Nix store. + + +
+ +
+ Frontend URL + + The frontend URL is used as base for all frontend requests and + must be configured through . + It should normally include a trailing /auth + (the default web context). + + + + + determines whether Keycloak should force all requests to go + through the frontend URL. By default, + Keycloak allows backend requests to + instead use its local hostname or IP address and may also + advertise it to clients through its OpenID Connect Discovery + endpoint. + + + + See the Hostname + section of the Keycloak Server Installation and Configuration + Guide for more information. + +
+ +
+ Setting up TLS/SSL + + By default, Keycloak won't accept + unsecured HTTP connections originating from outside its local + network. + + + + For HTTPS support, a TLS certificate and private key is + required. They should be PEM + formatted and concatenated into a single file. The path + to this file should be configured in + . + + + + + The path should be provided as a string, not a Nix path, + since Nix paths are copied into the world readable Nix store. + + +
+ +
+ Additional configuration + + Additional Keycloak configuration options, for which no + explicit NixOS options are provided, + can be set in . + + + + Options are expressed as a Nix attribute set which matches the + structure of the jboss-cli configuration. The configuration is + effectively overlayed on top of the default configuration + shipped with Keycloak. To remove existing nodes and undefine + attributes from the default configuration, set them to + null. + + + For example, the following script, which removes the hostname + provider default, adds the deprecated + hostname provider fixed and defines it the + default: + + +/subsystem=keycloak-server/spi=hostname/provider=default:remove() +/subsystem=keycloak-server/spi=hostname/provider=fixed:add(enabled = true, properties = { hostname = "keycloak.example.com" }) +/subsystem=keycloak-server/spi=hostname:write-attribute(name=default-provider, value="fixed") + + + would be expressed as + + +services.keycloak.extraConfig = { + "subsystem=keycloak-server" = { + "spi=hostname" = { + "provider=default" = null; + "provider=fixed" = { + enabled = true; + properties.hostname = "keycloak.example.com"; + }; + default-provider = "fixed"; + }; + }; +}; + + + + You can discover available options by using the jboss-cli.sh + program and by referring to the Keycloak + Server Installation and Configuration Guide. + +
+ +
+ Example configuration + + A basic configuration with some custom settings could look like this: + +services.keycloak = { + enable = true; + initialAdminPassword = "e6Wcm0RrtegMEHl"; # change on first login + frontendUrl = "https://keycloak.example.com/auth"; + forceBackendUrlToFrontendUrl = true; + certificatePrivateKeyBundle = "/run/keys/ssl_cert"; + databasePasswordFile = "/run/keys/db_password"; +}; + + + +
+ diff --git a/third_party/nixpkgs/nixos/modules/system/boot/kernel.nix b/third_party/nixpkgs/nixos/modules/system/boot/kernel.nix index 43871f439f..ed7226331d 100644 --- a/third_party/nixpkgs/nixos/modules/system/boot/kernel.nix +++ b/third_party/nixpkgs/nixos/modules/system/boot/kernel.nix @@ -227,7 +227,7 @@ in "xhci_pci" "usbhid" "hid_generic" "hid_lenovo" "hid_apple" "hid_roccat" - "hid_logitech_hidpp" "hid_logitech_dj" + "hid_logitech_hidpp" "hid_logitech_dj" "hid_microsoft" ] ++ optionals (pkgs.stdenv.isi686 || pkgs.stdenv.isx86_64) [ # Misc. x86 keyboard stuff. diff --git a/third_party/nixpkgs/nixos/modules/system/boot/resolved.nix b/third_party/nixpkgs/nixos/modules/system/boot/resolved.nix index b024f9cf5e..84bc9b7807 100644 --- a/third_party/nixpkgs/nixos/modules/system/boot/resolved.nix +++ b/third_party/nixpkgs/nixos/modules/system/boot/resolved.nix @@ -136,7 +136,7 @@ in } ]; - users.users.resolved.group = "systemd-resolve"; + users.users.systemd-resolve.group = "systemd-resolve"; # add resolve to nss hosts database if enabled and nscd enabled # system.nssModules is configured in nixos/modules/system/boot/systemd.nix diff --git a/third_party/nixpkgs/nixos/modules/virtualisation/ec2-amis.nix b/third_party/nixpkgs/nixos/modules/virtualisation/ec2-amis.nix index 4d9c391e04..3da63078a2 100644 --- a/third_party/nixpkgs/nixos/modules/virtualisation/ec2-amis.nix +++ b/third_party/nixpkgs/nixos/modules/virtualisation/ec2-amis.nix @@ -329,24 +329,24 @@ let self = { "20.03".ap-east-1.hvm-ebs = "ami-0d18fdd309cdefa86"; "20.03".sa-east-1.hvm-ebs = "ami-09859378158ae971d"; - # 20.09.1465.9a0b14b097d - "20.09".eu-west-1.hvm-ebs = "ami-0d90f16418e3c364c"; - "20.09".eu-west-2.hvm-ebs = "ami-0635ec0780ea57cfe"; - "20.09".eu-west-3.hvm-ebs = "ami-0714e94352f2eabb9"; - "20.09".eu-central-1.hvm-ebs = "ami-0979d39762a4d2a02"; - "20.09".eu-north-1.hvm-ebs = "ami-0b14e273185c66e9b"; - "20.09".us-east-1.hvm-ebs = "ami-0f8b063ac3f2d9645"; - "20.09".us-east-2.hvm-ebs = "ami-0959202a0393fdd0c"; - "20.09".us-west-1.hvm-ebs = "ami-096d50833b785478b"; - "20.09".us-west-2.hvm-ebs = "ami-0fc31031df0df6104"; - "20.09".ca-central-1.hvm-ebs = "ami-0787786a38cde3905"; - "20.09".ap-southeast-1.hvm-ebs = "ami-0b3f693d3a2a0b9ae"; - "20.09".ap-southeast-2.hvm-ebs = "ami-02471872bc876b610"; - "20.09".ap-northeast-1.hvm-ebs = "ami-06505fd2bf44a59a7"; - "20.09".ap-northeast-2.hvm-ebs = "ami-0754b4c014eea1e8a"; - "20.09".ap-south-1.hvm-ebs = "ami-05100e32242ae65a6"; - "20.09".ap-east-1.hvm-ebs = "ami-045288859a39de009"; - "20.09".sa-east-1.hvm-ebs = "ami-0a937748db48fb00d"; + # 20.09.1632.a6a3a368dda + "20.09".eu-west-1.hvm-ebs = "ami-01a79d5ce435f4db3"; + "20.09".eu-west-2.hvm-ebs = "ami-0cbe14f32904e6331"; + "20.09".eu-west-3.hvm-ebs = "ami-07f493412d6213de6"; + "20.09".eu-central-1.hvm-ebs = "ami-01d4a0c2248cbfe38"; + "20.09".eu-north-1.hvm-ebs = "ami-0003f54dd99d68e0f"; + "20.09".us-east-1.hvm-ebs = "ami-068a62d478710462d"; + "20.09".us-east-2.hvm-ebs = "ami-01ac677ff61399caa"; + "20.09".us-west-1.hvm-ebs = "ami-04befdb203b4b17f6"; + "20.09".us-west-2.hvm-ebs = "ami-0fb7bd4a43261c6b2"; + "20.09".ca-central-1.hvm-ebs = "ami-06d5ee429f153f856"; + "20.09".ap-southeast-1.hvm-ebs = "ami-0db0304e23c535b2a"; + "20.09".ap-southeast-2.hvm-ebs = "ami-045983c4db7e36447"; + "20.09".ap-northeast-1.hvm-ebs = "ami-0beb18d632cf64e5a"; + "20.09".ap-northeast-2.hvm-ebs = "ami-0dd0316af578862db"; + "20.09".ap-south-1.hvm-ebs = "ami-008d15ced81c88aed"; + "20.09".ap-east-1.hvm-ebs = "ami-071f49713f86ea965"; + "20.09".sa-east-1.hvm-ebs = "ami-05ded1ae35209b5a8"; latest = self."20.09"; }; in self diff --git a/third_party/nixpkgs/nixos/release-combined.nix b/third_party/nixpkgs/nixos/release-combined.nix index 945ba90e34..384ae5765b 100644 --- a/third_party/nixpkgs/nixos/release-combined.nix +++ b/third_party/nixpkgs/nixos/release-combined.nix @@ -71,7 +71,6 @@ in rec { (onFullSupported "nixos.tests.fontconfig-default-fonts") (onFullSupported "nixos.tests.gnome3") (onFullSupported "nixos.tests.gnome3-xorg") - (onFullSupported "nixos.tests.hardened") (onSystems ["x86_64-linux"] "nixos.tests.hibernate") (onFullSupported "nixos.tests.i3wm") (onSystems ["x86_64-linux"] "nixos.tests.installer.btrfsSimple") @@ -93,7 +92,6 @@ in rec { (onFullSupported "nixos.tests.keymap.dvp") (onFullSupported "nixos.tests.keymap.neo") (onFullSupported "nixos.tests.keymap.qwertz") - (onFullSupported "nixos.tests.latestKernel.hardened") (onFullSupported "nixos.tests.latestKernel.login") (onFullSupported "nixos.tests.lightdm") (onFullSupported "nixos.tests.login") diff --git a/third_party/nixpkgs/nixos/tests/all-tests.nix b/third_party/nixpkgs/nixos/tests/all-tests.nix index 4e4d8b5e68..7d582aa592 100644 --- a/third_party/nixpkgs/nixos/tests/all-tests.nix +++ b/third_party/nixpkgs/nixos/tests/all-tests.nix @@ -24,6 +24,7 @@ in _3proxy = handleTest ./3proxy.nix {}; acme = handleTest ./acme.nix {}; agda = handleTest ./agda.nix {}; + ammonite = handleTest ./ammonite.nix {}; atd = handleTest ./atd.nix {}; avahi = handleTest ./avahi.nix {}; avahi-with-resolved = handleTest ./avahi.nix { networkd = true; }; @@ -175,6 +176,7 @@ in kernel-latest = handleTest ./kernel-latest.nix {}; kernel-lts = handleTest ./kernel-lts.nix {}; kernel-testing = handleTest ./kernel-testing.nix {}; + keycloak = discoverTests (import ./keycloak.nix); keymap = handleTest ./keymap.nix {}; knot = handleTest ./knot.nix {}; krb5 = discoverTests (import ./krb5 {}); @@ -223,6 +225,7 @@ in mysql-backup = handleTest ./mysql/mysql-backup.nix {}; mysql-replication = handleTest ./mysql/mysql-replication.nix {}; nagios = handleTest ./nagios.nix {}; + nar-serve = handleTest ./nar-serve.nix {}; nat.firewall = handleTest ./nat.nix { withFirewall = true; }; nat.firewall-conntrack = handleTest ./nat.nix { withFirewall = true; withConntrackHelpers = true; }; nat.standalone = handleTest ./nat.nix { withFirewall = false; }; @@ -253,6 +256,7 @@ in novacomd = handleTestOn ["x86_64-linux"] ./novacomd.nix {}; nsd = handleTest ./nsd.nix {}; nzbget = handleTest ./nzbget.nix {}; + oh-my-zsh = handleTest ./oh-my-zsh.nix {}; openarena = handleTest ./openarena.nix {}; openldap = handleTest ./openldap.nix {}; opensmtpd = handleTest ./opensmtpd.nix {}; @@ -310,6 +314,8 @@ in rxe = handleTest ./rxe.nix {}; samba = handleTest ./samba.nix {}; sanoid = handleTest ./sanoid.nix {}; + sbt = handleTest ./sbt.nix {}; + scala = handleTest ./scala.nix {}; sddm = handleTest ./sddm.nix {}; service-runner = handleTest ./service-runner.nix {}; shadowsocks = handleTest ./shadowsocks {}; diff --git a/third_party/nixpkgs/nixos/tests/ammonite.nix b/third_party/nixpkgs/nixos/tests/ammonite.nix index 1955e42be5..e9f06358e1 100644 --- a/third_party/nixpkgs/nixos/tests/ammonite.nix +++ b/third_party/nixpkgs/nixos/tests/ammonite.nix @@ -8,7 +8,7 @@ import ./make-test-python.nix ({ pkgs, ...} : { amm = { pkgs, ... }: { - environment.systemPackages = [ pkgs.ammonite ]; + environment.systemPackages = [ (pkgs.ammonite.override { jre = pkgs.jre8; }) ]; }; }; diff --git a/third_party/nixpkgs/nixos/tests/initrd-network-ssh/default.nix b/third_party/nixpkgs/nixos/tests/initrd-network-ssh/default.nix index 017de68820..0ad0563b0c 100644 --- a/third_party/nixpkgs/nixos/tests/initrd-network-ssh/default.nix +++ b/third_party/nixpkgs/nixos/tests/initrd-network-ssh/default.nix @@ -22,6 +22,10 @@ import ../make-test-python.nix ({ lib, ... }: hostKeys = [ ./ssh_host_ed25519_key ]; }; }; + boot.initrd.extraUtilsCommands = '' + mkdir -p $out/secrets/etc/ssh + cat "${./ssh_host_ed25519_key}" > $out/secrets/etc/ssh/sh_host_ed25519_key + ''; boot.initrd.preLVMCommands = '' while true; do if [ -f fnord ]; then diff --git a/third_party/nixpkgs/nixos/tests/keycloak.nix b/third_party/nixpkgs/nixos/tests/keycloak.nix new file mode 100644 index 0000000000..f448a0f709 --- /dev/null +++ b/third_party/nixpkgs/nixos/tests/keycloak.nix @@ -0,0 +1,144 @@ +# This tests Keycloak: it starts the service, creates a realm with an +# OIDC client and a user, and simulates the user logging in to the +# client using their Keycloak login. + +let + frontendUrl = "http://keycloak/auth"; + initialAdminPassword = "h4IhoJFnt2iQIR9"; + + keycloakTest = import ./make-test-python.nix ( + { pkgs, databaseType, ... }: + { + name = "keycloak"; + meta = with pkgs.stdenv.lib.maintainers; { + maintainers = [ talyz ]; + }; + + nodes = { + keycloak = { ... }: { + virtualisation.memorySize = 1024; + services.keycloak = { + enable = true; + inherit frontendUrl databaseType initialAdminPassword; + databasePasswordFile = pkgs.writeText "dbPassword" "wzf6vOCbPp6cqTH"; + }; + environment.systemPackages = with pkgs; [ + xmlstarlet + libtidy + jq + ]; + }; + }; + + testScript = + let + client = { + clientId = "test-client"; + name = "test-client"; + redirectUris = [ "urn:ietf:wg:oauth:2.0:oob" ]; + }; + + user = { + firstName = "Chuck"; + lastName = "Testa"; + username = "chuck.testa"; + email = "chuck.testa@example.com"; + }; + + password = "password1234"; + + realm = { + enabled = true; + realm = "test-realm"; + clients = [ client ]; + users = [( + user // { + enabled = true; + credentials = [{ + type = "password"; + temporary = false; + value = password; + }]; + } + )]; + }; + + realmDataJson = pkgs.writeText "realm-data.json" (builtins.toJSON realm); + + jqCheckUserinfo = pkgs.writeText "check-userinfo.jq" '' + if { + "firstName": .given_name, + "lastName": .family_name, + "username": .preferred_username, + "email": .email + } != ${builtins.toJSON user} then + error("Wrong user info!") + else + empty + end + ''; + in '' + keycloak.start() + keycloak.wait_for_unit("keycloak.service") + keycloak.wait_until_succeeds("curl -sSf ${frontendUrl}") + + + ### Realm Setup ### + + # Get an admin interface access token + keycloak.succeed( + "curl -sSf -d 'client_id=admin-cli' -d 'username=admin' -d 'password=${initialAdminPassword}' -d 'grant_type=password' '${frontendUrl}/realms/master/protocol/openid-connect/token' | jq -r '\"Authorization: bearer \" + .access_token' >admin_auth_header" + ) + + # Publish the realm, including a test OIDC client and user + keycloak.succeed( + "curl -sSf -H @admin_auth_header -X POST -H 'Content-Type: application/json' -d @${realmDataJson} '${frontendUrl}/admin/realms/'" + ) + + # Generate and save the client secret. To do this we need + # Keycloak's internal id for the client. + keycloak.succeed( + "curl -sSf -H @admin_auth_header '${frontendUrl}/admin/realms/${realm.realm}/clients?clientId=${client.name}' | jq -r '.[].id' >client_id", + "curl -sSf -H @admin_auth_header -X POST '${frontendUrl}/admin/realms/${realm.realm}/clients/'$(client_secret", + ) + + + ### Authentication Testing ### + + # Start the login process by sending an initial request to the + # OIDC authentication endpoint, saving the returned page. Tidy + # up the HTML (XmlStarlet is picky) and extract the login form + # post url. + keycloak.succeed( + "curl -sSf -c cookie '${frontendUrl}/realms/${realm.realm}/protocol/openid-connect/auth?client_id=${client.name}&redirect_uri=urn%3Aietf%3Awg%3Aoauth%3A2.0%3Aoob&scope=openid+email&response_type=code&response_mode=query&nonce=qw4o89g3qqm' >login_form", + "tidy -q -m login_form || true", + "xml sel -T -t -m \"_:html/_:body/_:div/_:div/_:div/_:div/_:div/_:div/_:form[@id='kc-form-login']\" -v @action login_form >form_post_url", + ) + + # Post the login form and save the response. Once again tidy up + # the HTML, then extract the authorization code. + keycloak.succeed( + "curl -sSf -L -b cookie -d 'username=${user.username}' -d 'password=${password}' -d 'credentialId=' \"$(auth_code_html", + "tidy -q -m auth_code_html || true", + "xml sel -T -t -m \"_:html/_:body/_:div/_:div/_:div/_:div/_:div/_:input[@id='code']\" -v @value auth_code_html >auth_code", + ) + + # Exchange the authorization code for an access token. + keycloak.succeed( + "curl -sSf -d grant_type=authorization_code -d code=$(auth_header" + ) + + # Use the access token on the OIDC userinfo endpoint and check + # that the returned user info matches what we initialized the + # realm with. + keycloak.succeed( + "curl -sSf -H @auth_header '${frontendUrl}/realms/${realm.realm}/protocol/openid-connect/userinfo' | jq -f ${jqCheckUserinfo}" + ) + ''; + } + ); +in +{ + postgres = keycloakTest { databaseType = "postgresql"; }; + mysql = keycloakTest { databaseType = "mysql"; }; +} diff --git a/third_party/nixpkgs/nixos/tests/loki.nix b/third_party/nixpkgs/nixos/tests/loki.nix index dbf1e8a650..eaee717cf8 100644 --- a/third_party/nixpkgs/nixos/tests/loki.nix +++ b/third_party/nixpkgs/nixos/tests/loki.nix @@ -12,15 +12,28 @@ import ./make-test-python.nix ({ lib, pkgs, ... }: enable = true; configFile = "${pkgs.grafana-loki.src}/cmd/loki/loki-local-config.yaml"; }; - systemd.services.promtail = { - description = "Promtail service for Loki test"; - wantedBy = [ "multi-user.target" ]; - - serviceConfig = { - ExecStart = '' - ${pkgs.grafana-loki}/bin/promtail --config.file ${pkgs.grafana-loki.src}/cmd/promtail/promtail-local-config.yaml - ''; - DynamicUser = true; + services.promtail = { + enable = true; + configuration = { + server = { + http_listen_port = 9080; + grpc_listen_port = 0; + }; + clients = [ { url = "http://localhost:3100/loki/api/v1/push"; } ]; + scrape_configs = [ + { + job_name = "system"; + static_configs = [ + { + targets = [ "localhost" ]; + labels = { + job = "varlogs"; + __path__ = "/var/log/*log"; + }; + } + ]; + } + ]; }; }; }; diff --git a/third_party/nixpkgs/nixos/tests/nar-serve.nix b/third_party/nixpkgs/nixos/tests/nar-serve.nix new file mode 100644 index 0000000000..9ee738ffb1 --- /dev/null +++ b/third_party/nixpkgs/nixos/tests/nar-serve.nix @@ -0,0 +1,48 @@ +import ./make-test-python.nix ( + { pkgs, lib, ... }: + { + name = "nar-serve"; + meta.maintainers = [ lib.maintainers.rizary ]; + nodes = + { + server = { pkgs, ... }: { + services.nginx = { + enable = true; + virtualHosts.default.root = "/var/www"; + }; + services.nar-serve = { + enable = true; + # Connect to the localhost nginx instead of the default + # https://cache.nixos.org + cacheURL = "http://localhost/"; + }; + environment.systemPackages = [ + pkgs.hello + pkgs.curl + ]; + + networking.firewall.allowedTCPPorts = [ 8383 ]; + + # virtualisation.diskSize = 2 * 1024; + }; + }; + testScript = '' + start_all() + + # Create a fake cache with Nginx service the static files + server.succeed( + "nix copy --to file:///var/www ${pkgs.hello}" + ) + server.wait_for_unit("nginx.service") + server.wait_for_open_port(80) + + # Check that nar-serve can return the content of the derivation + drvName = os.path.basename("${pkgs.hello}") + drvHash = drvName.split("-")[0] + server.wait_for_unit("nar-serve.service") + server.succeed( + "curl -o hello -f http://localhost:8383/nix/store/{}/bin/hello".format(drvHash) + ) + ''; + } +) diff --git a/third_party/nixpkgs/nixos/tests/oh-my-zsh.nix b/third_party/nixpkgs/nixos/tests/oh-my-zsh.nix new file mode 100644 index 0000000000..57a073b086 --- /dev/null +++ b/third_party/nixpkgs/nixos/tests/oh-my-zsh.nix @@ -0,0 +1,18 @@ +import ./make-test-python.nix ({ pkgs, ... }: { + name = "oh-my-zsh"; + + machine = { pkgs, ... }: + + { + programs.zsh = { + enable = true; + ohMyZsh.enable = true; + }; + }; + + testScript = '' + start_all() + machine.succeed("touch ~/.zshrc") + machine.succeed("zsh -c 'source /etc/zshrc && echo $ZSH | grep oh-my-zsh-${pkgs.oh-my-zsh.version}'") + ''; +}) diff --git a/third_party/nixpkgs/nixos/tests/prometheus-exporters.nix b/third_party/nixpkgs/nixos/tests/prometheus-exporters.nix index 2553f5dcf7..0b9957404f 100644 --- a/third_party/nixpkgs/nixos/tests/prometheus-exporters.nix +++ b/third_party/nixpkgs/nixos/tests/prometheus-exporters.nix @@ -609,6 +609,50 @@ let ''; }; + sql = { + exporterConfig = { + configuration.jobs.points = { + interval = "1m"; + connections = [ + "postgres://prometheus-sql-exporter@/data?host=/run/postgresql&sslmode=disable" + ]; + queries = { + points = { + labels = [ "name" ]; + help = "Amount of points accumulated per person"; + values = [ "amount" ]; + query = "SELECT SUM(amount) as amount, name FROM points GROUP BY name"; + }; + }; + }; + enable = true; + user = "prometheus-sql-exporter"; + }; + metricProvider = { + services.postgresql = { + enable = true; + initialScript = builtins.toFile "init.sql" '' + CREATE DATABASE data; + \c data; + CREATE TABLE points (amount INT, name TEXT); + INSERT INTO points(amount, name) VALUES (1, 'jack'); + INSERT INTO points(amount, name) VALUES (2, 'jill'); + INSERT INTO points(amount, name) VALUES (3, 'jack'); + + CREATE USER "prometheus-sql-exporter"; + GRANT ALL PRIVILEGES ON DATABASE data TO "prometheus-sql-exporter"; + GRANT SELECT ON points TO "prometheus-sql-exporter"; + ''; + }; + systemd.services.prometheus-sql-exporter.after = [ "postgresql.service" ]; + }; + exporterTest = '' + wait_for_unit("prometheus-sql-exporter.service") + wait_for_open_port(9237) + succeed("curl http://localhost:9237/metrics | grep -c 'sql_points{' | grep -q 2") + ''; + }; + surfboard = { exporterConfig = { enable = true; diff --git a/third_party/nixpkgs/nixos/tests/sbt.nix b/third_party/nixpkgs/nixos/tests/sbt.nix new file mode 100644 index 0000000000..004d9c2e14 --- /dev/null +++ b/third_party/nixpkgs/nixos/tests/sbt.nix @@ -0,0 +1,18 @@ +import ./make-test-python.nix ({ pkgs, ...} : { + name = "sbt"; + meta = with pkgs.stdenv.lib.maintainers; { + maintainers = [ nequissimus ]; + }; + + machine = { pkgs, ... }: + { + environment.systemPackages = [ pkgs.sbt ]; + }; + + testScript = + '' + machine.succeed( + "(sbt --offline --version 2>&1 || true) | grep 'getting org.scala-sbt sbt ${pkgs.sbt.version} (this may take some time)'" + ) + ''; +}) diff --git a/third_party/nixpkgs/nixos/tests/scala.nix b/third_party/nixpkgs/nixos/tests/scala.nix new file mode 100644 index 0000000000..f99d9e563f --- /dev/null +++ b/third_party/nixpkgs/nixos/tests/scala.nix @@ -0,0 +1,33 @@ +{ system ? builtins.currentSystem, + config ? {}, + pkgs ? import ../.. { inherit system config; } +}: + +with pkgs.lib; + +let + common = name: package: (import ./make-test-python.nix ({ + inherit name; + meta = with pkgs.stdenv.lib.maintainers; { + maintainers = [ nequissimus ]; + }; + + nodes = { + scala = { ... }: { + environment.systemPackages = [ package ]; + }; + }; + + testScript = '' + start_all() + + scala.succeed("scalac -version 2>&1 | grep '^Scala compiler version ${package.version}'") + ''; + }) { inherit system; }); + +in with pkgs; { + scala_2_10 = common "scala_2_10" scala_2_10; + scala_2_11 = common "scala_2_11" scala_2_11; + scala_2_12 = common "scala_2_12" scala_2_12; + scala_2_13 = common "scala_2_13" scala_2_13; +} diff --git a/third_party/nixpkgs/pkgs/applications/audio/ardour/default.nix b/third_party/nixpkgs/pkgs/applications/audio/ardour/default.nix index 0c38057d56..49579e3329 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/ardour/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/ardour/default.nix @@ -12,17 +12,14 @@ , fftw , fftwSinglePrec , flac -, fluidsynth , glibc , glibmm , graphviz , gtkmm2 -, hidapi , itstool , libarchive , libjack2 , liblo -, libltc , libogg , libpulseaudio , librdf_raptor @@ -42,11 +39,11 @@ , perl , pkg-config , python3 -, qm-dsp , readline , rubberband , serd , sord +, soundtouch , sratom , suil , taglib @@ -55,13 +52,13 @@ }: stdenv.mkDerivation rec { pname = "ardour"; - version = "6.2"; + version = "6.3"; # don't fetch releases from the GitHub mirror, they are broken src = fetchgit { url = "git://git.ardour.org/ardour/ardour.git"; rev = version; - sha256 = "17jxbqavricy01x4ymq6d302djsqfnv84m7dm4fd8cpka0dqjp1y"; + sha256 = "050p1adgyirr790a3xp878pq3axqwzcmrk3drgm9z6v753h0xhcd"; }; patches = [ @@ -91,15 +88,12 @@ stdenv.mkDerivation rec { fftw fftwSinglePrec flac - fluidsynth glibmm gtkmm2 - hidapi itstool libarchive libjack2 liblo - libltc libogg libpulseaudio librdf_raptor @@ -118,11 +112,11 @@ stdenv.mkDerivation rec { pango perl python3 - qm-dsp readline rubberband serd sord + soundtouch sratom suil taglib @@ -136,11 +130,11 @@ stdenv.mkDerivation rec { "--no-phone-home" "--optimize" "--ptformat" - "--qm-dsp-include=${qm-dsp}/include/qm-dsp" "--run-tests" "--test" - "--use-external-libs" ]; + # removed because it fixes https://tracker.ardour.org/view.php?id=8161 and https://tracker.ardour.org/view.php?id=8437 + # "--use-external-libs" # Ardour's wscript requires git revision and date to be available. # Since they are not, let's generate the file manually. diff --git a/third_party/nixpkgs/pkgs/applications/audio/ft2-clone/default.nix b/third_party/nixpkgs/pkgs/applications/audio/ft2-clone/default.nix index 4eae53e054..20618e3c5d 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/ft2-clone/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/ft2-clone/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "ft2-clone"; - version = "1.36"; + version = "1.37"; src = fetchFromGitHub { owner = "8bitbubsy"; repo = "ft2-clone"; rev = "v${version}"; - sha256 = "0hsgzh7s2qgl8ah8hzmhfl74v5y8wc7f6z8ly9026h5r6pb09id0"; + sha256 = "1lhpzd46mpr3bq13qhd0bq724db5fhc8jplfb684c2q7sc4v92nk"; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/applications/audio/mamba/default.nix b/third_party/nixpkgs/pkgs/applications/audio/mamba/default.nix index 23a94668de..b8c5fe13a3 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/mamba/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/mamba/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "mamba"; - version = "1.6"; + version = "1.7"; src = fetchFromGitHub { owner = "brummer10"; repo = "Mamba"; rev = "v${version}"; - sha256 = "02w47347cbfqxybh908ww5ifd9jcns8v0msycq59y9q7x0a2h6fh"; + sha256 = "1i78snpyxap2r4899967nyfr8hg20k45nsbshs9h6hdxbfwhikbc"; fetchSubmodules = true; }; diff --git a/third_party/nixpkgs/pkgs/applications/audio/ncmpc/default.nix b/third_party/nixpkgs/pkgs/applications/audio/ncmpc/default.nix index ca61aa0cd6..97aa06453e 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/ncmpc/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/ncmpc/default.nix @@ -10,13 +10,13 @@ assert pcreSupport -> pcre != null; stdenv.mkDerivation rec { pname = "ncmpc"; - version = "0.39"; + version = "0.42"; src = fetchFromGitHub { owner = "MusicPlayerDaemon"; repo = "ncmpc"; rev = "v${version}"; - sha256 = "08xrcinfm1a7hjycf8la7gnsxbp3six70ks987dr7j42kd42irfq"; + sha256 = "1c21sbdm6pp3kwhnzc7c6ksna7madvsmfa7j91as2g8485symqv2"; }; buildInputs = [ glib ncurses mpd_clientlib boost ] diff --git a/third_party/nixpkgs/pkgs/applications/audio/ncpamixer/default.nix b/third_party/nixpkgs/pkgs/applications/audio/ncpamixer/default.nix index 32d8df2f04..89a0da5e0d 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/ncpamixer/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/ncpamixer/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "ncpamixer"; - version = "1.3.3"; + version = "1.3.3.1"; src = fetchFromGitHub { owner = "fulhax"; repo = "ncpamixer"; rev = version; - sha256 = "19pxfvfhhrbfk1wz5awx60y51jccrgrcvlq7lb622sw2z0wzw4ac"; + sha256 = "1v3bz0vpgh18257hdnz3yvbnl51779g1h5b265zgc21ks7m1jw5z"; }; buildInputs = [ ncurses libpulseaudio ]; diff --git a/third_party/nixpkgs/pkgs/applications/audio/padthv1/default.nix b/third_party/nixpkgs/pkgs/applications/audio/padthv1/default.nix index 29ef027f2f..e321119d83 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/padthv1/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/padthv1/default.nix @@ -2,11 +2,11 @@ mkDerivation rec { pname = "padthv1"; - version = "0.9.17"; + version = "0.9.18"; src = fetchurl { url = "mirror://sourceforge/padthv1/${pname}-${version}.tar.gz"; - sha256 = "098fk8fwcgssnfr1gilqg8g17zvch62lrn3rqsswpzbr3an5adb3"; + sha256 = "1karrprb3ijrbiwpr43rl3nxnzc33lnmwrd1832psgr3flnr9fp5"; }; buildInputs = [ libjack2 alsaLib libsndfile liblo lv2 qt5.qtbase qt5.qttools fftwFloat ]; diff --git a/third_party/nixpkgs/pkgs/applications/audio/pianobooster/default.nix b/third_party/nixpkgs/pkgs/applications/audio/pianobooster/default.nix index 4832fce1e9..b92808775c 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/pianobooster/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/pianobooster/default.nix @@ -1,5 +1,5 @@ { stdenv, fetchFromGitHub, cmake, pkg-config, qttools -, alsaLib, ftgl, libGLU, libjack2, qtbase, rtmidi +, alsaLib, ftgl, libGLU, libjack2, qtbase, rtmidi, wrapQtAppsHook }: stdenv.mkDerivation rec { @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { sha256 = "03xcdnlpsij22ca3i6xj19yqzn3q2ch0d32r73v0c96nm04gvhjj"; }; - nativeBuildInputs = [ cmake pkg-config qttools ]; + nativeBuildInputs = [ cmake pkg-config qttools wrapQtAppsHook ]; buildInputs = [ alsaLib ftgl libGLU libjack2 qtbase rtmidi ]; diff --git a/third_party/nixpkgs/pkgs/applications/audio/picard/default.nix b/third_party/nixpkgs/pkgs/applications/audio/picard/default.nix index cf8523b4ef..2cb4ff0980 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/picard/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/picard/default.nix @@ -12,13 +12,13 @@ let ; in pythonPackages.buildPythonApplication rec { pname = "picard"; - version = "2.5"; + version = "2.5.1"; src = fetchFromGitHub { owner = "metabrainz"; repo = pname; rev = "release-${version}"; - sha256 = "02px6r086pyhpf6wia876c73bgr4xa4pyx2yykv6j74zyp5wig3z"; + sha256 = "13q926iqwdba6ds5s3ir57c9bkg8gcv6dhqvhmg00fnzkq9xqk3d"; }; nativeBuildInputs = [ gettext qt5.wrapQtAppsHook qt5.qtbase ] diff --git a/third_party/nixpkgs/pkgs/applications/audio/plexamp/default.nix b/third_party/nixpkgs/pkgs/applications/audio/plexamp/default.nix index 2773824523..2c33584e36 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.2.0"; + version = "3.3.1"; name = "${pname}-${version}"; src = fetchurl { url = "https://plexamp.plex.tv/plexamp.plex.tv/desktop/Plexamp-${version}.AppImage"; - sha256 = "R1BhobnwoU7oJ7bNes8kH2neXqHlMPbRCNjcHyzUPqo="; name="${pname}-${version}.AppImage"; + sha256 = "6/asP8VR+rJ52lKKds46gSw1or9suUEmyR75pjdWHIQ="; }; appimageContents = appimageTools.extractType2 { diff --git a/third_party/nixpkgs/pkgs/applications/audio/ptcollab/default.nix b/third_party/nixpkgs/pkgs/applications/audio/ptcollab/default.nix new file mode 100644 index 0000000000..85890d8e83 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/audio/ptcollab/default.nix @@ -0,0 +1,34 @@ +{ mkDerivation +, stdenv +, fetchFromGitHub +, qmake +, qtbase +, qtmultimedia +, libvorbis +}: + +mkDerivation rec { + pname = "ptcollab"; + version = "0.3.4.1"; + + src = fetchFromGitHub { + owner = "yuxshao"; + repo = "ptcollab"; + rev = "v${version}"; + sha256 = "0rjyhxfad864w84n0bxyhc1jjxhzwwdx26r6psba2582g90cv024"; + }; + + nativeBuildInputs = [ qmake ]; + + buildInputs = [ qtbase qtmultimedia libvorbis ]; + + meta = with stdenv.lib; { + description = "Experimental pxtone editor where you can collaborate with friends"; + homepage = "https://yuxshao.github.io/ptcollab/"; + license = licenses.mit; + maintainers = with maintainers; [ OPNA2608 ]; + platforms = platforms.all; + # Requires Qt5.15 + broken = stdenv.hostPlatform.isDarwin; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/audio/pulseaudio-ctl/default.nix b/third_party/nixpkgs/pkgs/applications/audio/pulseaudio-ctl/default.nix index 6cabdc6534..6a19d959a2 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/pulseaudio-ctl/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/pulseaudio-ctl/default.nix @@ -7,13 +7,13 @@ let in stdenv.mkDerivation rec { name = "${pname}-${version}"; - version = "1.67"; + version = "1.68"; src = fetchFromGitHub { owner = "graysky2"; repo = pname; rev = "v${version}"; - sha256 = "1mf5r7x6aiqmx9mz7gpckrqvvzxnr5gs2q1k4m42rjk6ldkpdb46"; + sha256 = "0wrzfanwy18wyawpg8rfvfgjh3lwngqwmfpi4ww3530rfmi84cf0"; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/applications/audio/pulseeffects/default.nix b/third_party/nixpkgs/pkgs/applications/audio/pulseeffects/default.nix index a7b97e9daa..427d29768d 100644 --- a/third_party/nixpkgs/pkgs/applications/audio/pulseeffects/default.nix +++ b/third_party/nixpkgs/pkgs/applications/audio/pulseeffects/default.nix @@ -44,13 +44,13 @@ let ]; in stdenv.mkDerivation rec { pname = "pulseeffects"; - version = "4.8.1"; + version = "4.8.2"; src = fetchFromGitHub { owner = "wwmm"; repo = "pulseeffects"; rev = "v${version}"; - sha256 = "17yfs3ja7vflywhxbn3n3r8n6hl829x257kzplg2vpppppg6ylj6"; + sha256 = "19h47mrxjm6x83pqcxfsshf48kd1babfk0kwdy1c7fjri7kj0g0s"; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/btc1.nix b/third_party/nixpkgs/pkgs/applications/blockchains/btc1.nix deleted file mode 100644 index 3442c9ba80..0000000000 --- a/third_party/nixpkgs/pkgs/applications/blockchains/btc1.nix +++ /dev/null @@ -1,41 +0,0 @@ -{ stdenv, fetchurl, pkgconfig, autoreconfHook, hexdump, openssl, db48 -, boost, zlib, miniupnpc, qt4, protobuf, qrencode, libevent -, AppKit -, withGui ? !stdenv.isDarwin -}: - -with stdenv.lib; -stdenv.mkDerivation rec { - name = "bit1" + (toString (optional (!withGui) "d")) + "-" + version; - version = "1.15.1"; - - src = fetchurl { - url = "https://github.com/btc1/bitcoin/archive/v${version}.tar.gz"; - sha256 = "0v0g2wb4nsnhddxzb63vj2bc1mgyj05vqm5imicjfz8prvgc0si8"; - }; - - nativeBuildInputs = [ pkgconfig autoreconfHook hexdump ]; - buildInputs = [ openssl db48 boost zlib miniupnpc protobuf libevent ] - ++ optionals withGui [ qt4 qrencode ] - ++ optional stdenv.isDarwin AppKit; - - configureFlags = [ "--with-boost-libdir=${boost.out}/lib" ] - ++ optionals withGui [ "--with-gui=qt4" ]; - - meta = { - description = "Peer-to-peer electronic cash system (btc1 client)"; - longDescription= '' - Bitcoin is a free open source peer-to-peer electronic cash system that is - completely decentralized, without the need for a central server or trusted - parties. Users hold the crypto keys to their own money and transact directly - with each other, with the help of a P2P network to check for double-spending. - - btc1 is an implementation of a Bitcoin full node with segwit2x hard fork - support. - ''; - homepage = "https://github.com/btc1/bitcoin"; - license = licenses.mit; - maintainers = with maintainers; [ sorpaas ]; - platforms = platforms.unix; - }; -} diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/polkadot/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/polkadot/default.nix index 45cecf7e9f..1938254455 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/polkadot/default.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/polkadot/default.nix @@ -7,18 +7,16 @@ }: rustPlatform.buildRustPackage rec { pname = "polkadot"; - version = "0.8.25"; + version = "0.8.26"; src = fetchFromGitHub { owner = "paritytech"; repo = "polkadot"; rev = "v${version}"; - sha256 = "1jdklmysr25rlwgx7pz0jw66j1w60h98kqghzjhr90zhynzh39lz"; + sha256 = "1bvma6k3gsjqh8w76k4kf52sjg8wxn1b7a409kmnmmvmd9j6z5ia"; }; - cargoSha256 = "08yfafrspkd1g1mhlfwngbknkxjkyymbcga8n2rdsk7mz0hm0vgy"; - - cargoPatches = [ ./substrate-wasm-builder-runner.patch ]; + cargoSha256 = "0pacmmvvjgzmaxgg47qbfhqwl02jxj3i6vnmkjbj9npzqfmqf72d"; nativeBuildInputs = [ clang ]; diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/polkadot/substrate-wasm-builder-runner.patch b/third_party/nixpkgs/pkgs/applications/blockchains/polkadot/substrate-wasm-builder-runner.patch deleted file mode 100644 index 7d84965dce..0000000000 --- a/third_party/nixpkgs/pkgs/applications/blockchains/polkadot/substrate-wasm-builder-runner.patch +++ /dev/null @@ -1,25 +0,0 @@ -diff --git a/Cargo.lock b/Cargo.lock -index 5e7c4a14..bb67aada 100644 ---- a/Cargo.lock -+++ b/Cargo.lock -@@ -8642,8 +8642,7 @@ dependencies = [ - [[package]] - name = "substrate-wasm-builder-runner" - version = "1.0.6" --source = "registry+https://github.com/rust-lang/crates.io-index" --checksum = "d2a965994514ab35d3893e9260245f2947fd1981cdd4fffd2c6e6d1a9ce02e6a" -+source = "git+https://github.com/paritytech/substrate#647ad15565d7c35ecf00b73b12cccad9858780b9" - - [[package]] - name = "subtle" -diff --git a/Cargo.toml b/Cargo.toml -index 78047a1a..2d571f8e 100644 ---- a/Cargo.toml -+++ b/Cargo.toml -@@ -112,3 +112,6 @@ polkadot = { path = "/usr/bin/polkadot" } - - [package.metadata.rpm.files] - "../scripts/packaging/polkadot.service" = { path = "/usr/lib/systemd/system/polkadot.service", mode = "644" } -+ -+[patch.crates-io] -+substrate-wasm-builder-runner = { git = "https://github.com/paritytech/substrate", branch = "master" } diff --git a/third_party/nixpkgs/pkgs/applications/editors/nano/nanorc/default.nix b/third_party/nixpkgs/pkgs/applications/editors/nano/nanorc/default.nix index 4d4b093233..54442fc21f 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/nano/nanorc/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/nano/nanorc/default.nix @@ -1,14 +1,17 @@ -{ stdenv, fetchFromGitHub }: +{ stdenv, fetchFromGitHub, writeScript, nixosTests, common-updater-scripts +, coreutils, git, gnused, nix, nixfmt }: -stdenv.mkDerivation { +let + owner = "scopatz"; + repo = "nanorc"; +in stdenv.mkDerivation rec { pname = "nanorc"; - version = "2020-01-25"; + version = "2020-10-10"; src = fetchFromGitHub { - owner = "scopatz"; - repo = "nanorc"; - rev = "2020.1.25"; - sha256 = "1y8jk3jsl4bd6r4hzmxzcf77hv8bwm0318yv7y2npkkd3a060z8d"; + inherit owner repo; + rev = builtins.replaceStrings [ "-" ] [ "." ] version; + sha256 = "3B2nNFYkwYHCX6pQz/hMO/rnVqlCiw1BSNmGmJ6KCqE="; }; dontBuild = true; @@ -19,6 +22,32 @@ stdenv.mkDerivation { install *.nanorc $out/share/ ''; + passthru.updateScript = writeScript "update.sh" '' + #!${stdenv.shell} + set -o errexit + PATH=${ + stdenv.lib.makeBinPath [ + common-updater-scripts + coreutils + git + gnused + nix + nixfmt + ] + } + oldVersion="$(nix-instantiate --eval -E "with import ./. {}; lib.getVersion ${pname}" | tr -d '"' | sed 's|\\.|-|g')" + latestTag="$(git -c 'versionsort.suffix=-' ls-remote --exit-code --refs --sort='version:refname' --tags git@github.com:${owner}/${repo} '*.*.*' | tail --lines=1 | cut --delimiter='/' --fields=3)" + if [ "$oldVersion" != "$latestTag" ]; then + nixpkgs="$(git rev-parse --show-toplevel)" + default_nix="$nixpkgs/pkgs/applications/editors/nano/nanorc/default.nix" + newTag=$(echo $latestTag | sed 's|\.|-|g') + update-source-version ${pname} "$newTag" --version-key=version --print-changes + nixfmt "$default_nix" + else + echo "${pname} is already up-to-date" + fi + ''; + meta = { description = "Improved Nano Syntax Highlighting Files"; homepage = "https://github.com/scopatz/nanorc"; diff --git a/third_party/nixpkgs/pkgs/applications/editors/neovim/gnvim/wrapper.nix b/third_party/nixpkgs/pkgs/applications/editors/neovim/gnvim/wrapper.nix index e16fe8a8ad..bb9930b6c7 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/neovim/gnvim/wrapper.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/neovim/gnvim/wrapper.nix @@ -23,9 +23,7 @@ stdenv.mkDerivation { cp -r '${gnvim-unwrapped}/share/applications' "$out/share/applications" # Sed needs a writable directory to do inplace modifications chmod u+rw "$out/share/applications" - for file in $out/share/applications/*.desktop; do - sed -e "s|Exec=.\\+gnvim\\>|Exec=$out/bin/gnvim|" -i "$file" - done + sed -e "s|Exec=.\\+gnvim\\>|Exec=gnvim|" -i $out/share/applications/*.desktop ''; preferLocalBuild = true; diff --git a/third_party/nixpkgs/pkgs/applications/editors/neovim/utils.nix b/third_party/nixpkgs/pkgs/applications/editors/neovim/utils.nix index 906a726924..d992ccd3f6 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/neovim/utils.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/neovim/utils.nix @@ -35,7 +35,7 @@ let # for forward compability, when adding new environments, haskell etc. , ... - }: + }@args: let rubyEnv = bundlerEnv { name = "neovim-ruby-env"; @@ -99,7 +99,7 @@ let manifestRc = vimUtils.vimrcContent (configure // { customRC = ""; }); neovimRcContent = vimUtils.vimrcContent configure; in - { + args // { wrapperArgs = makeWrapperArgs; inherit neovimRcContent; inherit manifestRc; @@ -142,8 +142,7 @@ let extraPythonPackages = compatFun extraPythonPackages; inherit withPython3; extraPython3Packages = compatFun extraPython3Packages; - inherit withNodeJs withRuby; - + inherit withNodeJs withRuby viAlias vimAlias; inherit configure; }; in diff --git a/third_party/nixpkgs/pkgs/applications/editors/neovim/wrapper.nix b/third_party/nixpkgs/pkgs/applications/editors/neovim/wrapper.nix index 71bc38eadc..111e84e634 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/neovim/wrapper.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/neovim/wrapper.nix @@ -43,7 +43,6 @@ let postBuild = lib.optionalString stdenv.isLinux '' rm $out/share/applications/nvim.desktop substitute ${neovim}/share/applications/nvim.desktop $out/share/applications/nvim.desktop \ - --replace 'TryExec=nvim' "TryExec=$out/bin/nvim" \ --replace 'Name=Neovim' 'Name=WrappedNeovim' '' + optionalString withPython2 '' diff --git a/third_party/nixpkgs/pkgs/applications/editors/quilter/default.nix b/third_party/nixpkgs/pkgs/applications/editors/quilter/default.nix index 4d1cf5dafb..b69d20850a 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/quilter/default.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/quilter/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "quilter"; - version = "2.5.0"; + version = "2.5.1"; src = fetchFromGitHub { owner = "lainsce"; repo = pname; rev = version; - sha256 = "0622mh46z3fi6zvipmgj8k4d4gj1c2781l10frk7wqq1sysjrxps"; + sha256 = "0ya1iwzfzvrci083zyrjj6ac4ys25j90slpk8yydw9n99kb750rk"; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/editors/textadept/default.nix b/third_party/nixpkgs/pkgs/applications/editors/textadept/10/default.nix similarity index 100% rename from third_party/nixpkgs/pkgs/applications/editors/textadept/default.nix rename to third_party/nixpkgs/pkgs/applications/editors/textadept/10/default.nix diff --git a/third_party/nixpkgs/pkgs/applications/editors/textadept/deps.nix b/third_party/nixpkgs/pkgs/applications/editors/textadept/10/deps.nix similarity index 100% rename from third_party/nixpkgs/pkgs/applications/editors/textadept/deps.nix rename to third_party/nixpkgs/pkgs/applications/editors/textadept/10/deps.nix diff --git a/third_party/nixpkgs/pkgs/applications/editors/textadept/11/default.nix b/third_party/nixpkgs/pkgs/applications/editors/textadept/11/default.nix new file mode 100644 index 0000000000..487f1b3767 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/editors/textadept/11/default.nix @@ -0,0 +1,53 @@ +{ lib, stdenv, fetchhg, fetchFromGitHub, fetchurl, gtk2, glib, pkgconfig, unzip, ncurses, zip }: + +stdenv.mkDerivation rec { + version = "11.0_beta"; + pname = "textadept11"; + + nativeBuildInputs = [ pkgconfig ]; + buildInputs = [ + gtk2 ncurses glib unzip zip + ]; + + src = fetchFromGitHub { + name = "textadept11"; + owner = "orbitalquark"; + repo = "textadept"; + rev = "8da5f6b4a13f14b9dd3cb9dc23ad4f7bf41e91c1"; + sha256 = "0v11v3x8g6v696m3l1bm52zy2g9xzz7hlmn912sn30nhcag3raxs"; + }; + + preConfigure = + lib.concatStringsSep "\n" (lib.mapAttrsToList (name: params: + "ln -s ${fetchurl params} $PWD/src/${name}" + ) (import ./deps.nix)) + '' + + cd src + make deps + ''; + + postBuild = '' + make curses + ''; + + preInstall = '' + mkdir -p $out/share/applications + mkdir -p $out/share/pixmaps + ''; + + postInstall = '' + make curses install PREFIX=$out MAKECMDGOALS=curses + ''; + + makeFlags = [ + "PREFIX=$(out) WGET=true PIXMAPS_DIR=$(out)/share/pixmaps" + ]; + + meta = with stdenv.lib; { + description = "An extensible text editor based on Scintilla with Lua scripting. Version 11_beta"; + homepage = "http://foicica.com/textadept"; + license = licenses.mit; + maintainers = with maintainers; [ raskin mirrexagon ]; + platforms = platforms.linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/editors/textadept/11/deps.nix b/third_party/nixpkgs/pkgs/applications/editors/textadept/11/deps.nix new file mode 100644 index 0000000000..2ab72574bb --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/editors/textadept/11/deps.nix @@ -0,0 +1,50 @@ +{ + "scintilla445.tgz" = { + url = "https://www.scintilla.org/scintilla445.tgz"; + sha256 = "1v1kyxj7rv5rxadbg8gl8wh1jafpy7zj0wr6dcyxq9209dl6h8ag"; + }; + "9e2ffa159299899c9345aea15c17ba1941953871.zip" = { + url = "https://github.com/orbitalquark/scinterm/archive/9e2ffa159299899c9345aea15c17ba1941953871.zip"; + sha256 = "12h7prgp689w45p4scxd8vvsyw8fkv27g6gvgis55xr44daa6122"; + }; + "scintillua_4.4.5-1.zip" = { + url = "https://github.com/orbitalquark/scintillua/archive/scintillua_4.4.5-1.zip"; + sha256 = "095wpbid2kvr5xgkhd5bd4sd7ljgk6gd9palrjkmdcwfgsf1lp04"; + }; + "lua-5.3.5.tar.gz" = { + url = "http://www.lua.org/ftp/lua-5.3.5.tar.gz"; + sha256 = "1b2qn2rv96nmbm6zab4l877bd4zq7wpwm8drwjiy2ih4jqzysbhc"; + }; + "lpeg-1.0.2.tar.gz" = { + url = "http://www.inf.puc-rio.br/~roberto/lpeg/lpeg-1.0.2.tar.gz"; + sha256 = "1zjzl7acvcdavmcg5l7wi12jd4rh95q9pl5aiww7hv0v0mv6bmj8"; + }; + "v1_7_0_2.zip" = { + url = "https://github.com/keplerproject/luafilesystem/archive/v1_7_0_2.zip"; + sha256 = "0y44ymc7higz5dd2w3c6ib7mwmpr6yvszcl7lm12nf8x3y4snx4i"; + }; + "64587546482a1a6324706d75c80b77d2f87118a4.zip" = { + url = "https://github.com/orbitalquark/gtdialog/archive/64587546482a1a6324706d75c80b77d2f87118a4.zip"; + sha256 = "10mglbnn8r1cakqn9h285pwfnh7kfa98v7j8qh83c24n66blyfh9"; + }; + "cdk-5.0-20150928.tgz" = { + url = "http://invisible-mirror.net/archives/cdk/cdk-5.0-20150928.tgz"; + sha256 = "0j74l874y33i26y5kjg3pf1vswyjif8k93pqhi0iqykpbxfsg382"; + }; + "libtermkey-0.20.tar.gz" = { + url = "http://www.leonerd.org.uk/code/libtermkey/libtermkey-0.20.tar.gz"; + sha256 = "1xfj6lchhfljmbcl6dz8dpakppyy13nbl4ykxiv5x4dr9b4qf3bc"; + }; + "pdcurs39.zip" = { + url = "https://github.com/wmcbrine/PDCurses/archive/3.9.zip"; + sha256 = "0ydsa15d6fgk15zcavbxsi4vj3knlr2495dc5v4f5xzvv2qwlb2w"; + }; + "bombay.zip" = { + url = "http://foicica.com/hg/bombay/archive/b25520cc76bb.zip"; + sha256 = "07spq7jmkfyq20gv67yffara3ln3ns2xi0k02m2mxdms3xm1q36h"; + }; + "cloc-1.60.pl" = { + url = "http://prdownloads.sourceforge.net/cloc/cloc-1.60.pl"; + sha256 = "0p504bi19va3dh274v7lb7giqrydwa5yyry60f7jpz84y6z71a2a"; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/editors/vim/macvim.nix b/third_party/nixpkgs/pkgs/applications/editors/vim/macvim.nix index ef6c6a1440..d2cc14c30c 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/vim/macvim.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/vim/macvim.nix @@ -94,6 +94,19 @@ stdenv.mkDerivation { + '' unset LD '' + # When building with nix-daemon, we need to pass -derivedDataPath or else it tries to use + # a folder rooted in /var/empty and fails. Unfortunately we can't just pass -derivedDataPath + # by itself as this flag requires the use of -scheme or -xctestrun (not sure why), but MacVim + # by default just runs `xcodebuild -project src/MacVim/MacVim.xcodeproj`, relying on the default + # behavior to build the first target in the project. Experimentally, there seems to be a scheme + # called MacVim, so we'll explicitly select that. We also need to specify the configuration too + # as the scheme seems to have the wrong default. + + '' + configureFlagsArray+=( + XCODEFLAGS="-scheme MacVim -derivedDataPath $NIX_BUILD_TOP/derivedData" + --with-xcodecfg="Release" + ) + '' ; # Because we're building with system clang, this means we're building against Xcode's SDK and diff --git a/third_party/nixpkgs/pkgs/applications/editors/vscode/vscode.nix b/third_party/nixpkgs/pkgs/applications/editors/vscode/vscode.nix index 528a0496d9..ce6122bddc 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/vscode/vscode.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/vscode/vscode.nix @@ -11,8 +11,8 @@ let archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz"; sha256 = { - x86_64-linux = "0mpb4641icr3z89y2rlh5anli40p1f48sl5xagr7h3nb5c84k10x"; - x86_64-darwin = "1azmc79zf72007qc1xndp9wdkd078mvqgv35hf231q7kdi6wzxcp"; + x86_64-linux = "18fx2nsgn09l2gzgr1abi0cp4g8z2v9177sdl2rqr0yvmwk5i3p0"; + x86_64-darwin = "14qdfz8q1dz0skkcgpamksgdvgsid2mcm9h09cvkh4z3v458100r"; }.${system}; in callPackage ./generic.nix rec { @@ -21,7 +21,7 @@ in # Please backport all compatible updates to the stable release. # This is important for the extension ecosystem. - version = "1.50.1"; + version = "1.51.0"; pname = "vscode"; executableName = "code" + lib.optionalString isInsiders "-insiders"; diff --git a/third_party/nixpkgs/pkgs/applications/editors/vscode/vscodium.nix b/third_party/nixpkgs/pkgs/applications/editors/vscode/vscodium.nix index 650e88a260..6cfcb491af 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/vscode/vscodium.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/vscode/vscodium.nix @@ -11,8 +11,8 @@ let archive_fmt = if system == "x86_64-darwin" then "zip" else "tar.gz"; sha256 = { - x86_64-linux = "1sarih1yah69ympp12bmgyb0y9ybrxasppb47l58w05iz1wpn6v0"; - x86_64-darwin = "1pj041kccj2i77v223i86xxqj9bg88k0sfbshm7qiynwyj9p05ji"; + x86_64-linux = "0qims8qypx6aackw1b47pb7hkf0lffh94c69bm5rld2swzczcfnj"; + x86_64-darwin = "1i96qhynjl1ihycq25xjakqlyvszindg5g8kgyhd6ab0q0zhmxqy"; }.${system}; sourceRoot = { @@ -27,7 +27,7 @@ in # Please backport all compatible updates to the stable release. # This is important for the extension ecosystem. - version = "1.50.1"; + version = "1.51.0"; pname = "vscodium"; executableName = "codium"; diff --git a/third_party/nixpkgs/pkgs/applications/graphics/gimp/plugins/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/gimp/plugins/default.nix index 0b5e6a7f37..97c0429a99 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/gimp/plugins/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/gimp/plugins/default.nix @@ -85,22 +85,6 @@ stdenv.lib.makeScope pkgs.newScope (self: with self; { }; }; - focusblur = pluginDerivation rec { - /* menu: - Blur/Focus Blur - */ - name = "focusblur-3.2.6"; - buildInputs = with pkgs; [ fftwSinglePrec ]; - patches = [ ./patches/focusblur-glib.patch ]; - postInstall = "fail"; - installPhase = "installPlugins src/focusblur"; - src = fetchurl { - url = "http://registry.gimp.org/files/${name}.tar.bz2"; - sha256 = "1gqf3hchz7n7v5kpqkhqh8kwnxbsvlb5cr2w2n7ngrvl56f5xs1h"; - }; - meta.broken = true; - }; - resynthesizer = pluginDerivation rec { /* menu: Edit/Fill with pattern seamless... diff --git a/third_party/nixpkgs/pkgs/applications/graphics/krita/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/krita/default.nix index 6ffe7f3c4f..9bb78d1999 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/krita/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/krita/default.nix @@ -10,11 +10,11 @@ mkDerivation rec { pname = "krita"; - version = "4.4.0"; + version = "4.4.1"; src = fetchurl { url = "https://download.kde.org/stable/${pname}/${version}/${pname}-${version}.tar.xz"; - sha256 = "0ydmxql8iym62q0nqwn9mnb94jz1nh84i6bni0mgzwjk8p4zfzw3"; + sha256 = "1bmmfvmawnlihbqkksdrwxfkaip4nfsi97w83fmvkyxl4jk715vr"; }; # *somtimes* fails with can't find ui_manager.h, also see https://github.com/NixOS/nixpkgs/issues/35359 diff --git a/third_party/nixpkgs/pkgs/applications/graphics/photoflare/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/photoflare/default.nix new file mode 100644 index 0000000000..43b12c40d9 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/graphics/photoflare/default.nix @@ -0,0 +1,31 @@ +{ mkDerivation, stdenv, graphicsmagick, fetchFromGitHub, qmake, qtbase, qttools +}: + +mkDerivation rec { + pname = "photoflare"; + version = "1.6.5"; + + src = fetchFromGitHub { + owner = "PhotoFlare"; + repo = "photoflare"; + rev = "v${version}"; + sha256 = "0a394324h7ds567z3i3pw6kkii78n4qwdn129kgkkm996yh03q89"; + }; + + nativeBuildInputs = [ qmake qttools ]; + buildInputs = [ qtbase graphicsmagick ]; + + qmakeFlags = [ "PREFIX=${placeholder "out"}" ]; + + NIX_CFLAGS_COMPILE = "-I${graphicsmagick}/include/GraphicsMagick"; + + enableParallelBuilding = true; + + meta = with stdenv.lib; { + description = "A cross-platform image editor with a powerful features and a very friendly graphical user interface"; + homepage = "https://photoflare.io"; + maintainers = [ maintainers.omgbebebe ]; + license = licenses.gpl3; + platforms = platforms.linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/graphics/yed/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/yed/default.nix index f92e910eac..7eb0851834 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/yed/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/yed/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchzip, makeWrapper, unzip, jre }: +{ stdenv, fetchzip, makeWrapper, unzip, jre, wrapGAppsHook }: stdenv.mkDerivation rec { pname = "yEd"; @@ -9,16 +9,25 @@ stdenv.mkDerivation rec { sha256 = "0sd73s700f3gqq5zq1psrqjg6ff2gv49f8vd37v6bv65vdxqxryq"; }; - nativeBuildInputs = [ makeWrapper unzip ]; + nativeBuildInputs = [ makeWrapper unzip wrapGAppsHook ]; + # For wrapGAppsHook setup hook + buildInputs = [ jre.gtk3 ]; - installPhase = '' + dontConfigure = true; + dontBuild = true; + dontInstall = true; + + preFixup = '' mkdir -p $out/yed cp -r * $out/yed mkdir -p $out/bin + makeWrapperArgs+=("''${gappsWrapperArgs[@]}") makeWrapper ${jre}/bin/java $out/bin/yed \ + ''${makeWrapperArgs[@]} \ --add-flags "-jar $out/yed/yed.jar --" ''; + dontWrapGApps = true; meta = with stdenv.lib; { license = licenses.unfree; diff --git a/third_party/nixpkgs/pkgs/applications/misc/archiver/default.nix b/third_party/nixpkgs/pkgs/applications/misc/archiver/default.nix index aec0b9d511..1691ab0736 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/archiver/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/archiver/default.nix @@ -5,16 +5,16 @@ buildGoModule rec { pname = "archiver"; - version = "3.4.0"; + version = "3.5.0"; src = fetchFromGitHub { owner = "mholt"; repo = pname; rev = "v${version}"; - sha256 = "16jawybywqfkp68035bnf206a2w4khjw239saa429a21lxrfyk4a"; + sha256 = "0fdkqfs87svpijccz8m11gvby8pvmznq6fs9k94vbzak0kxhw1wg"; }; - vendorSha256 = "0m89ibj3dm58j49d99dhkn0ryivnianxz7lkpkvhs0cdbzzc02az"; + vendorSha256 = "0avnskay23mpl3qkyf1h75rr7szpsxis2bj5pplhwf8q8q0212xf"; buildFlagsArray = [ "-ldflags=-s -w -X main.version=${version} -X main.commit=${src.rev} -X main.date=unknown" ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/charm/default.nix b/third_party/nixpkgs/pkgs/applications/misc/charm/default.nix index 98e04e81c1..0799226866 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/charm/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/charm/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "charm"; - version = "0.8.3"; + version = "0.8.4"; src = fetchFromGitHub { owner = "charmbracelet"; repo = "charm"; rev = "v${version}"; - sha256 = "1nbix7fi6g9jadak5zyx7fdz7d6367aly6fnrs0v98zsl1kxyvx3"; + sha256 = "0wsh83kchqakvx7kgs2s31rzsvnfr47jk6pbmqzjv1kqmnlhc3rh"; }; - vendorSha256 = "0lhml6m0j9ksn09j7z4d9pix5aszhndpyqajycwj3apvi3ic90il"; + vendorSha256 = "1lg4bbdzgnw50v6m6p7clibwm8m82kdr1jizgbmhfmzy15d5sfll"; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/applications/misc/dasel/default.nix b/third_party/nixpkgs/pkgs/applications/misc/dasel/default.nix new file mode 100644 index 0000000000..0e5c33c00b --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/misc/dasel/default.nix @@ -0,0 +1,30 @@ +{ stdenv +, buildGoModule +, fetchFromGitHub +}: + +buildGoModule rec { + pname = "dasel"; + version = "1.2.0"; + + src = fetchFromGitHub { + owner = "TomWright"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-Un9tqODwiWsaw66t2m8NyaDF0+hq/e0tmRFi3/T4LMI="; + }; + + vendorSha256 = "sha256:1552k85z4s6gv7sss7dccv3h8x22j2sr12icp6s7s0a3i4iwyksw"; + + meta = with stdenv.lib; { + description = "Query and update data structures from the command line"; + longDescription = '' + Dasel (short for data-selector) allows you to query and modify data structures using selector strings. + Comparable to jq / yq, but supports JSON, YAML, TOML and XML with zero runtime dependencies. + ''; + homepage = "https://github.com/TomWright/dasel"; + license = licenses.mit; + platforms = platforms.unix; + maintainers = with maintainers; [ _0x4A6F ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/misc/dbeaver/default.nix b/third_party/nixpkgs/pkgs/applications/misc/dbeaver/default.nix index 547a605668..1a7f240ffd 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/dbeaver/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/dbeaver/default.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { pname = "dbeaver-ce"; - version = "7.2.3"; + version = "7.2.4"; desktopItem = makeDesktopItem { name = "dbeaver"; @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "https://dbeaver.io/files/${version}/dbeaver-ce-${version}-linux.gtk.x86_64.tar.gz"; - sha256 = "sha256-XYAe+e9zK/fvxBJ2Caz9/95++JzIQykXj8953IocDZU="; + sha256 = "sha256-RsXLznTz/U23e77xzyINi8HVuGqR4TrPaf+w++zPOH4="; }; installPhase = '' diff --git a/third_party/nixpkgs/pkgs/applications/misc/elf-dissector/default.nix b/third_party/nixpkgs/pkgs/applications/misc/elf-dissector/default.nix new file mode 100644 index 0000000000..36ceb49d5c --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/misc/elf-dissector/default.nix @@ -0,0 +1,26 @@ +{ mkDerivation, fetchgit, lib, cmake, extra-cmake-modules, kitemmodels +, libiberty, libelf, libdwarf, libopcodes }: + +mkDerivation rec { + pname = "elf-dissector"; + version = "unstable-2020-11-14"; + + src = fetchgit { + url = "https://invent.kde.org/sdk/elf-dissector.git"; + rev = "d1700e76e3f60aff0a2a9fb63bc001251d2be522"; + sha256 = "1h1xr3ag1sbf005drcx8g8dc5mk7fb2ybs73swrld7clcawhxnk8"; + }; + + nativeBuildInputs = [ cmake extra-cmake-modules ]; + + buildInputs = [ kitemmodels libiberty libelf libdwarf libopcodes ]; + + enableParallelBuilding = true; + + meta = with lib; { + homepage = "https://invent.kde.org/sdk/elf-dissector"; + description = "Tools for inspecting, analyzing and optimizing ELF files"; + license = licenses.gpl2; + maintainers = with maintainers; [ ehmry ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/misc/gpxsee/default.nix b/third_party/nixpkgs/pkgs/applications/misc/gpxsee/default.nix index 5b34007ec4..1bfe642752 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/gpxsee/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/gpxsee/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "gpxsee"; - version = "7.33"; + version = "7.35"; src = fetchFromGitHub { owner = "tumic0"; repo = "GPXSee"; rev = version; - sha256 = "1k4zl7knlpwxrpqk1axkmy8x12915z15h3q2sjnx3jcnx6qw73ja"; + sha256 = "1schmymcsd8s0r26qwyx56z107ql8pgrk1pnqy19mc7fyirdwmp5"; }; patches = (substituteAll { @@ -29,15 +29,14 @@ mkDerivation rec { wrapQtApp $out/Applications/GPXSee.app/Contents/MacOS/GPXSee ''; - enableParallelBuilding = true; - meta = with stdenv.lib; { - homepage = "https://www.gpxsee.org/"; description = "GPS log file viewer and analyzer"; longDescription = '' GPXSee is a Qt-based GPS log file viewer and analyzer that supports all common GPS log file formats. ''; + homepage = "https://www.gpxsee.org/"; + changelog = "https://build.opensuse.org/package/view_file/home:tumic:GPXSee/gpxsee/gpxsee.changes"; license = licenses.gpl3; maintainers = with maintainers; [ womfoo sikmir ]; platforms = with platforms; linux ++ darwin; diff --git a/third_party/nixpkgs/pkgs/applications/misc/haxor-news/default.nix b/third_party/nixpkgs/pkgs/applications/misc/haxor-news/default.nix index 98f84ca68b..41aa71cb82 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/haxor-news/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/haxor-news/default.nix @@ -1,20 +1,35 @@ -{ stdenv, python, fetchpatch }: +{ stdenv, fetchFromGitHub, python3, fetchpatch }: -with python.pkgs; + +let + py = python3.override { + packageOverrides = self: super: { + self = py; + + # not compatible with prompt_toolkit >=2.0 + prompt_toolkit = super.prompt_toolkit.overridePythonAttrs (oldAttrs: rec { + name = "${oldAttrs.pname}-${version}"; + version = "1.0.18"; + src = oldAttrs.src.override { + inherit version; + sha256 = "09h1153wgr5x2ny7ds0w2m81n3bb9j8hjb8sjfnrg506r01clkyx"; + }; + }); + }; + }; +in +with py.pkgs; buildPythonApplication rec { pname = "haxor-news"; - version = "0.4.3"; + version = "unstable-2020-10-20"; - src = fetchPypi { - inherit pname version; - sha256 = "5b9af8338a0f8b95a8133b66ef106553823813ac171c0aefa3f3f2dbeb4d7f88"; - }; - - # allow newer click version - patches = fetchpatch { - url = "${meta.homepage}/commit/5b0d3ef1775756ca15b6d83fba1fb751846b5427.patch"; - sha256 = "1551knh2f7yarqzcpip16ijmbx8kzdna8cihxlxx49ww55f5sg67"; + # haven't done a stable release in 3+ years, but actively developed + src = fetchFromGitHub { + owner = "donnemartin"; + repo = pname; + rev = "811a5804c09406465b2b02eab638c08bf5c4fa7f"; + sha256 = "1g3dfsyk4727d9jh9w6j5r51ag07851cls7v7a7hmdvdixpvbzp6"; }; propagatedBuildInputs = [ @@ -26,6 +41,7 @@ buildPythonApplication rec { six ]; + # will fail without pre-seeded config files doCheck = false; checkInputs = [ mock ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/hugo/default.nix b/third_party/nixpkgs/pkgs/applications/misc/hugo/default.nix index 4b2a4c4645..58f0bc8978 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/hugo/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/hugo/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "hugo"; - version = "0.77.0"; + version = "0.78.0"; src = fetchFromGitHub { owner = "gohugoio"; repo = pname; rev = "v${version}"; - sha256 = "1vjqddcbk8afqkjzrj9wwvz697bxhv9vz0rk2vj2ji6lz1slhc56"; + sha256 = "0la1c6yj9dq9rqxk6m8n8l4cabgzlk0r3was8mvgd80g3x3zn55v"; }; - vendorSha256 = "03xv188jw5scqd6a8xd2s13vkn721d37bgs6a6rik7pgqmjh46c6"; + vendorSha256 = "09fvvs85rvvh0z4px2bj5908xf1mrcslkzsz09p0gy5i3zaqfnp9"; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/applications/misc/krename/default.nix b/third_party/nixpkgs/pkgs/applications/misc/krename/default.nix index 578c56a748..c1e031b727 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/krename/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/krename/default.nix @@ -7,14 +7,14 @@ let pname = "krename"; - version = "5.0.0"; + version = "5.0.1"; in mkDerivation rec { name = "${pname}-${version}"; src = fetchurl { url = "mirror://kde/stable/${pname}/${version}/src/${name}.tar.xz"; - sha256 = "136j1dkqrhv458rjh5v3vzjhvq6dhz7k79zk6mmx8zvqacc7cq8a"; + sha256 = "0zbadxjp13jqxgb58wslhm0wy2lhpdq1bgbvyhyn21mssfppib6a"; }; buildInputs = [ taglib exiv2 podofo ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/kupfer/default.nix b/third_party/nixpkgs/pkgs/applications/misc/kupfer/default.nix index c7f5499010..f2744bf23e 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/kupfer/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/kupfer/default.nix @@ -16,6 +16,8 @@ buildPythonApplication rec { pname = "kupfer"; version = "319"; + format = "other"; + src = fetchurl { url = "https://github.com/kupferlauncher/kupfer/releases/download/v${version}/kupfer-v${version}.tar.xz"; sha256 = "0c9xjx13r8ckfr4az116bhxsd3pk78v04c3lz6lqhraak0rp4d92"; @@ -33,13 +35,9 @@ buildPythonApplication rec { # see https://github.com/NixOS/nixpkgs/issues/56943 for details strictDeps = false; - postInstall = let - pythonPath = (stdenv.lib.concatMapStringsSep ":" - (m: "${m}/lib/${python.libPrefix}/site-packages") - propagatedBuildInputs); - in '' + postInstall = '' gappsWrapperArgs+=( - "--prefix" "PYTHONPATH" : "${pythonPath}" + "--prefix" "PYTHONPATH" : "${makePythonPath propagatedBuildInputs}" "--set" "PYTHONNOUSERSITE" "1" ) ''; diff --git a/third_party/nixpkgs/pkgs/applications/misc/megasync/default.nix b/third_party/nixpkgs/pkgs/applications/misc/megasync/default.nix index d5da4c7d77..3b25d7e606 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/megasync/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/megasync/default.nix @@ -1,17 +1,40 @@ -{ stdenv, autoconf, automake, c-ares, cryptopp, curl, doxygen, fetchFromGitHub -, fetchpatch, ffmpeg_3, libmediainfo, libraw, libsodium, libtool, libuv, libzen -, lsb-release, mkDerivation, pkgconfig, qtbase, qttools, sqlite, swig, unzip -, wget }: +{ stdenv +, autoconf +, automake +, c-ares +, cryptopp +, curl +, doxygen +, fetchFromGitHub +, fetchpatch +, ffmpeg_3 +, libmediainfo +, libraw +, libsodium +, libtool +, libuv +, libzen +, lsb-release +, mkDerivation +, pkgconfig +, qtbase +, qttools +, qtx11extras +, sqlite +, swig +, unzip +, wget +}: mkDerivation rec { pname = "megasync"; - version = "4.3.1.0"; + version = "4.3.5.0"; src = fetchFromGitHub { owner = "meganz"; repo = "MEGAsync"; rev = "v${version}_Linux"; - sha256 = "0b68wpif8a0wf1vfn1nr19dmz8f31dprb27jpldxrxhyfslc43yj"; + sha256 = "0rr1jjy0n5bj1lh6xi3nbbcikvq69j3r9qnajp4mhywr5izpccvs"; fetchSubmodules = true; }; @@ -29,6 +52,7 @@ mkDerivation rec { libuv libzen qtbase + qtx11extras sqlite unzip wget diff --git a/third_party/nixpkgs/pkgs/applications/misc/mysql-workbench/default.nix b/third_party/nixpkgs/pkgs/applications/misc/mysql-workbench/default.nix index 63d7077d32..71adcdc075 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/mysql-workbench/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/mysql-workbench/default.nix @@ -9,7 +9,7 @@ , gtkmm3 , pcre , swig -, antlr4_7 +, antlr4_8 , sudo , mysql , libxml2 @@ -80,7 +80,7 @@ in stdenv.mkDerivation rec { # have it look for 4.7.2 instead of 4.7.1 preConfigure = '' substituteInPlace CMakeLists.txt \ - --replace "antlr-4.7.1-complete.jar" "antlr-4.7.2-complete.jar" + --replace "antlr-4.7.1-complete.jar" "antlr-4.8-complete.jar" ''; nativeBuildInputs = [ @@ -96,7 +96,7 @@ in stdenv.mkDerivation rec { gtk3 gtkmm3 libX11 - antlr4_7.runtime.cpp + antlr4_8.runtime.cpp python2 mysql libxml2 @@ -141,7 +141,7 @@ in stdenv.mkDerivation rec { cmakeFlags = [ "-DMySQL_CONFIG_PATH=${mysql}/bin/mysql_config" "-DIODBC_CONFIG_PATH=${libiodbc}/bin/iodbc-config" - "-DWITH_ANTLR_JAR=${antlr4_7.jarLocation}" + "-DWITH_ANTLR_JAR=${antlr4_8.jarLocation}" # mysql-workbench 8.0.21 depends on libmysqlconnectorcpp 1.1.8. # Newer versions of connector still provide the legacy library when enabled # but the headers are in a different location. diff --git a/third_party/nixpkgs/pkgs/applications/misc/obsidian/default.nix b/third_party/nixpkgs/pkgs/applications/misc/obsidian/default.nix index 8d6669917e..58ea50c3ed 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.9.4"; + version = "0.9.6"; src = fetchurl { url = "https://github.com/obsidianmd/obsidian-releases/releases/download/v${version}/obsidian-${version}.asar.gz"; - sha256 = "0qahgm9gf4sap28wy7cxbf41h8zldplbwxnv8shyajbkxn108g5p"; + sha256 = "1n8qc8ssv93xcal9fgbwvkvahzwyn6367v8gbxgc3036l66mira7"; }; nativeBuildInputs = [ makeWrapper graphicsmagick ]; diff --git a/third_party/nixpkgs/pkgs/applications/misc/pass-secret-service/default.nix b/third_party/nixpkgs/pkgs/applications/misc/pass-secret-service/default.nix new file mode 100644 index 0000000000..678bc06f80 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/misc/pass-secret-service/default.nix @@ -0,0 +1,61 @@ +{ stdenv, fetchFromGitHub, python3, dbus, gnupg }: + +python3.pkgs.buildPythonApplication rec { + pname = "pass-secret-service"; + # PyPI has old alpha version. Since then the project has switched from using a + # seemingly abandoned D-Bus package pydbus and started using maintained + # dbus-next. So let's use latest from GitHub. + version = "unstable-2020-04-12"; + + src = fetchFromGitHub { + owner = "mdellweg"; + repo = "pass_secret_service"; + rev = "f6fbca6ac3ccd16bfec407d845ed9257adf74dfa"; + sha256 = "0rm4pbx1fiwds1v7f99khhh7x3inv9yniclwd95mrbgljk3cc6a4"; + }; + + + # Need to specify session.conf file for tests because it won't be found under + # /etc/ in check phase. + postPatch = '' + substituteInPlace Makefile \ + --replace \ + "dbus-run-session" \ + "dbus-run-session --config-file=${dbus}/share/dbus-1/session.conf" + ''; + + propagatedBuildInputs = with python3.pkgs; [ + click + cryptography + dbus-next + decorator + pypass + secretstorage + ]; + + checkInputs = + let + ps = python3.pkgs; + in + [ + dbus + gnupg + ps.pytest + ps.pytest-asyncio + ps.pypass + ]; + + checkPhase = '' + runHook preCheck + make test + runHook postCheck + ''; + + meta = { + description = "Libsecret D-Bus API with pass as the backend"; + homepage = "https://github.com/mdellweg/pass_secret_service/"; + license = stdenv.lib.licenses.gpl3Only; + platforms = stdenv.lib.platforms.all; + maintainers = with stdenv.lib.maintainers; [ jluttine ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/misc/pdfsam-basic/default.nix b/third_party/nixpkgs/pkgs/applications/misc/pdfsam-basic/default.nix index a6dd86393f..d8e55e113b 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/pdfsam-basic/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/pdfsam-basic/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "pdfsam-basic"; - version = "4.1.4"; + version = "4.2.0"; src = fetchurl { url = "https://github.com/torakiki/pdfsam/releases/download/v${version}/pdfsam_${version}-1_amd64.deb"; - sha256 = "1gw3cmc8c1xxc55bm71v1dz9x9560lbhx9nkwprarhxlmn0m0zzp"; + sha256 = "0dhwaadk2qw7avpfnw0mgqv3yhjsm4qm88yyy4w24a3cqzrvb56g"; }; unpackPhase = '' diff --git a/third_party/nixpkgs/pkgs/applications/misc/tiv/default.nix b/third_party/nixpkgs/pkgs/applications/misc/tiv/default.nix new file mode 100644 index 0000000000..3790a9fdd0 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/misc/tiv/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchFromGitHub, imagemagick }: + +stdenv.mkDerivation rec { + pname = "tiv"; + version = "1.1.0"; + + src = fetchFromGitHub { + owner = "stefanhaustein"; + repo = "TerminalImageViewer"; + rev = "v${version}"; + sha256 = "17zqbwj2imk6ygyc142mw6v4fh7h4rd5vzn5wxr9gs0g8qdc6ixn"; + }; + + buildInputs = [ imagemagick ]; + + makeFlags = [ "prefix=$(out)" ]; + + preConfigure = "cd src/main/cpp"; + + meta = with stdenv.lib; { + homepage = "https://github.com/stefanhaustein/TerminalImageViewer"; + description = "Small C++ program to display images in a (modern) terminal using RGB ANSI codes and unicode block graphics characters"; + license = licenses.asl20; + maintainers = with maintainers; [ magnetophon ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/networking/Sylk/default.nix b/third_party/nixpkgs/pkgs/applications/networking/Sylk/default.nix index 164e2b1ea7..3ba91b6abc 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/Sylk/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/Sylk/default.nix @@ -2,7 +2,7 @@ let pname = "Sylk"; - version = "2.9.1"; + version = "2.9.2"; in appimageTools.wrapType2 rec { @@ -10,7 +10,7 @@ appimageTools.wrapType2 rec { src = fetchurl { url = "http://download.ag-projects.com/Sylk/Sylk-${version}-x86_64.AppImage"; - hash = "sha256-Y1FR1tYZTxhMFn6NL578otitmOsngMJBPK/9cpCqE/Q="; + hash = "sha256-pfzTeKxY2fs98mgvhzaI/uBbYYkxfnQ+6jQ+gTSeEkA="; }; profile = '' 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 60aca90a95..76f53dcecc 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/common.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/common.nix @@ -316,7 +316,12 @@ let patchelf --set-rpath "${libGL}/lib:$origRpath" "$chromiumBinary" ''; - passthru.updateScript = ./update.py; + passthru = { + updateScript = ./update.py; + chromiumDeps = { + gn = gnChromium; + }; + }; }; # Remove some extraAttrs we supplied to the base attributes already. 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 f83cb1d209..0f64b85957 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/default.nix @@ -35,26 +35,15 @@ let mkChromiumDerivation = callPackage ./common.nix ({ inherit channel gnome gnomeSupport gnomeKeyringSupport proprietaryCodecs cupsSupport pulseSupport useOzone; - # TODO: Remove after we can update gn for the stable channel (backward incompatible changes): gnChromium = gn.overrideAttrs (oldAttrs: { - version = "2020-07-20"; + inherit (upstream-info.deps.gn) version; src = fetchgit { - url = "https://gn.googlesource.com/gn"; - rev = "3028c6a426a4aaf6da91c4ebafe716ae370225fe"; - sha256 = "0h3wf4152zdvrbb0jbj49q6814lfl3rcy5mj8b2pl9s0ahvkbc6q"; + inherit (upstream-info.deps.gn) url rev sha256; }; }); } // lib.optionalAttrs (lib.versionAtLeast upstream-info.version "87") { useOzone = true; # YAY: https://chromium-review.googlesource.com/c/chromium/src/+/2382834 \o/ useVaapi = !stdenv.isAarch64; # TODO: Might be best to not set use_vaapi anymore (default is fine) - gnChromium = gn.overrideAttrs (oldAttrs: { - version = "2020-08-17"; - src = fetchgit { - url = "https://gn.googlesource.com/gn"; - rev = "6f13aaac55a977e1948910942675c69f2b4f7a94"; - sha256 = "01hpma1sllpdx09mvr4d6073sg6zmk6iv44kd3r28khymcj4s251"; - }; - }); }); browser = callPackage ./browser.nix { inherit channel enableWideVine; }; diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/update.py b/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/update.py index bfc7f0d247..b404ca555b 100755 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/update.py +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/update.py @@ -1,13 +1,15 @@ #! /usr/bin/env nix-shell -#! nix-shell -i python -p python3 nix +#! nix-shell -i python -p python3 nix nix-prefetch-git import csv import json +import re import subprocess import sys from codecs import iterdecode from collections import OrderedDict +from datetime import datetime from os.path import abspath, dirname from urllib.request import urlopen @@ -26,6 +28,30 @@ def nix_prefetch_url(url, algo='sha256'): out = subprocess.check_output(['nix-prefetch-url', '--type', algo, url]) return out.decode('utf-8').rstrip() +def nix_prefetch_git(url, rev): + print(f'nix-prefetch-git {url} {rev}') + out = subprocess.check_output(['nix-prefetch-git', '--quiet', '--url', url, '--rev', rev]) + return json.loads(out) + +def get_file_revision(revision, file_path): + url = f'https://raw.githubusercontent.com/chromium/chromium/{revision}/{file_path}' + with urlopen(url) as http_response: + return http_response.read() + +def get_channel_dependencies(channel): + deps = get_file_revision(channel['version'], 'DEPS') + gn_pattern = b"'gn_version': 'git_revision:([0-9a-f]{40})'" + gn_commit = re.search(gn_pattern, deps).group(1).decode() + gn = nix_prefetch_git('https://gn.googlesource.com/gn', gn_commit) + return { + 'gn': { + 'version': datetime.fromisoformat(gn['date']).date().isoformat(), + 'url': gn['url'], + 'rev': gn['rev'], + 'sha256': gn['sha256'] + } + } + channels = {} last_channels = load_json(JSON_PATH) @@ -58,6 +84,8 @@ with urlopen(HISTORY_URL) as resp: # the next one. continue + channel['deps'] = get_channel_dependencies(channel) + channels[channel_name] = channel with open(JSON_PATH, 'w') as out: 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 5fded39c74..565f884c51 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -1,17 +1,41 @@ { "stable": { - "version": "86.0.4240.111", - "sha256": "05y7lwr89awkhvgmwkx3br9j4ap2aypg2wsc0nz8mi7kxc1dnyzj", - "sha256bin64": "10aqiiydw4i3jxnw8xxdgkgcqbfqc67n1fbrg40y54kg0v5dz8l6" + "version": "86.0.4240.183", + "sha256": "1g39i82js7fm4fqb8i66d6xs0kzqjxzi4vzvvwz5y9rkbikcc4ma", + "sha256bin64": "1r0dxqsx6j19hgwr3v2sdlb2vd7gb961c4wba4ymd8wy8j8pzly9", + "deps": { + "gn": { + "version": "2020-08-07", + "url": "https://gn.googlesource.com/gn", + "rev": "e327ffdc503815916db2543ec000226a8df45163", + "sha256": "0kvlfj3www84zp1vmxh76x8fdjm9hyk8lkh2vdsidafpmm75fphr" + } + } }, "beta": { - "version": "87.0.4280.27", - "sha256": "0w0asxj7jlsw69cssfia8km4q9cx1c2mliks2rmhf4jk0hsghasm", - "sha256bin64": "1lsx4mhy8nachfb8c9f3mrx5nqw2bi046dqirb4lnv7y80jjjs1k" + "version": "87.0.4280.40", + "sha256": "07xh76fl257np68way6i5rf64qbvirkfddy7m5gvqb0fzcqd7dp3", + "sha256bin64": "1b2z0aqlh28pqrk6dmabxp1d4mvp9iyfmi4kqmns4cdpg0qgaf41", + "deps": { + "gn": { + "version": "2020-09-09", + "url": "https://gn.googlesource.com/gn", + "rev": "e002e68a48d1c82648eadde2f6aafa20d08c36f2", + "sha256": "0x4c7amxwzxs39grqs3dnnz0531mpf1p75niq7zhinyfqm86i4dk" + } + } }, "dev": { - "version": "88.0.4298.4", - "sha256": "0ka11gmpkyrmifajaxm66c16hrj3xakdvhjqg04slyp2sv0nlhrl", - "sha256bin64": "0768y31jqbl1znp7yp6mvl5j12xl1nwjkh2l8zdga81q0wz52hh6" + "version": "88.0.4300.0", + "sha256": "00cfs2rp4h8ybn2snr1d8ygg635hx7q5gv2aqriy1j6f8a1pgh1b", + "sha256bin64": "110r1m14h91212nx6pfhn8wkics7wlwx1608l5cqsxxcpvpzl3pv", + "deps": { + "gn": { + "version": "2020-09-09", + "url": "https://gn.googlesource.com/gn", + "rev": "e002e68a48d1c82648eadde2f6aafa20d08c36f2", + "sha256": "0x4c7amxwzxs39grqs3dnnz0531mpf1p75niq7zhinyfqm86i4dk" + } + } } } diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/common.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/common.nix index 03cf35e1a6..a98891df4d 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/common.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/firefox/common.nix @@ -9,7 +9,7 @@ , hunspell, libXdamage, libevent, libstartup_notification , libvpx_1_8 , icu67, libpng, jemalloc, glib -, autoconf213, which, gnused, cargo, rustc +, autoconf213, which, gnused, rustPackages, rustPackages_1_45 , rust-cbindgen, nodejs, nasm, fetchpatch , gnum4 , debugBuild ? false @@ -102,6 +102,10 @@ let buildStdenv = if ltoSupport then overrideCC stdenv llvmPackages.lldClang else stdenv; + + # 78 ESR won't build with rustc 1.47 + inherit (if lib.versionAtLeast ffversion "82" then rustPackages else rustPackages_1_45) + rustc cargo; in buildStdenv.mkDerivation ({ diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix index d362e4c9b2..842ce9ba9a 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix @@ -409,5 +409,6 @@ stdenv.mkDerivation rec { # the compound is "libre" in a strict sense (some components place certain # restrictions on redistribution), it's free enough for our purposes. license = licenses.free; + broken = true; }; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/ungoogled-chromium/browser.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/ungoogled-chromium/browser.nix index f87acc8722..c5cbee1965 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/ungoogled-chromium/browser.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/ungoogled-chromium/browser.nix @@ -13,7 +13,7 @@ mkChromiumDerivation (base: rec { installPhase = '' mkdir -p "$libExecPath" - cp -v "$buildPath/"*.pak "$buildPath/"*.bin "$libExecPath/" + cp -v "$buildPath/"*.so "$buildPath/"*.pak "$buildPath/"*.bin "$libExecPath/" cp -v "$buildPath/icudtl.dat" "$libExecPath/" cp -vLR "$buildPath/locales" "$buildPath/resources" "$libExecPath/" cp -v "$buildPath/chrome" "$libExecPath/$packageName" @@ -78,17 +78,10 @@ mkChromiumDerivation (base: rec { ''; homepage = "https://github.com/Eloston/ungoogled-chromium"; maintainers = with maintainers; [ squalus ]; - # Overview of the maintainer roles: - # nixos-unstable: - # - TODO: Need a new maintainer for x86_64 [0] - # - @thefloweringash: aarch64 - # - @primeos: Provisional maintainer (x86_64) - # Stable channel: - # - TODO (need someone to test backports [0]) - # [0]: https://github.com/NixOS/nixpkgs/issues/78450 license = if enableWideVine then licenses.unfree else licenses.bsd3; platforms = platforms.linux; hydraPlatforms = if channel == "stable" then ["aarch64-linux" "x86_64-linux"] else []; - timeout = 172800; # 48 hours + timeout = 172800; # 48 hours (increased from the Hydra default of 10h) + broken = channel == "dev"; # Blocked on https://bugs.chromium.org/p/chromium/issues/detail?id=1141896 }; }) diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/ungoogled-chromium/common.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/ungoogled-chromium/common.nix index 3df8fb3afd..de409f8037 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/ungoogled-chromium/common.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/ungoogled-chromium/common.nix @@ -5,7 +5,7 @@ , libevent, expat, libjpeg, snappy , libpng, libcap , xdg_utils, yasm, nasm, minizip, libwebp -, libusb1, pciutils, nss, re2, zlib +, libusb1, pciutils, nss, re2 , python2Packages, perl, pkgconfig , nspr, systemd, kerberos @@ -13,10 +13,9 @@ , bison, gperf , glib, gtk3, dbus-glib , glibc -, xorg , libXScrnSaver, libXcursor, libXtst, libGLU, libGL , protobuf, speechd, libXdamage, cups -, ffmpeg_3, libxslt, libxml2, at-spi2-core +, ffmpeg, libxslt, libxml2, at-spi2-core , jre8 , pipewire_0_2 @@ -49,8 +48,6 @@ buildFun: with stdenv.lib; -# see http://www.linuxfromscratch.org/blfs/view/cvs/xsoft/chromium.html - let jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 @@ -66,7 +63,7 @@ let mkGnFlags = let # Serialize Nix types into GN types according to this document: - # https://chromium.googlesource.com/chromium/src/+/master/tools/gn/docs/language.md + # https://source.chromium.org/gn/gn/+/master:docs/language.md mkGnString = value: "\"${escape ["\"" "$" "\\"] value}\""; sanitize = value: if value == true then "true" @@ -78,14 +75,17 @@ let toFlag = key: value: "${key}=${sanitize value}"; in attrs: concatStringsSep " " (attrValues (mapAttrs toFlag attrs)); + # https://source.chromium.org/chromium/chromium/src/+/master:build/linux/unbundle/replace_gn_files.py gnSystemLibraries = [ - "flac" "libwebp" "libxslt" "opus" "snappy" "libpng" - # "zlib" # version 77 reports unresolved dependency on //third_party/zlib:zlib_config - # "libjpeg" # fails with multiple undefined references to chromium_jpeg_* - # "re2" # fails with linker errors - # "ffmpeg" # https://crbug.com/731766 - # "harfbuzz-ng" # in versions over 63 harfbuzz and freetype are being built together - # so we can't build with one from system and other from source + "ffmpeg" + "flac" + "libjpeg" + "libpng" + "libwebp" + "libxslt" + "opus" + "snappy" + "zlib" ]; opusWithCustomModes = libopus.override { @@ -97,11 +97,9 @@ let libevent expat libjpeg snappy libpng libcap xdg_utils minizip libwebp - libusb1 re2 zlib - ffmpeg_3 libxslt libxml2 + libusb1 re2 + ffmpeg libxslt libxml2 nasm - # harfbuzz # in versions over 63 harfbuzz and freetype are being built together - # so we can't build with one from system and other from source ]; # build paths and release info @@ -135,10 +133,10 @@ let }; nativeBuildInputs = [ + llvmPackages.lldClang.bintools ninja which python2Packages.python perl pkgconfig python2Packages.ply python2Packages.jinja2 nodejs gnutar python2Packages.setuptools - (xorg.xcbproto.override { python = python2Packages.python; }) ]; buildInputs = defaultDependencies ++ [ @@ -157,34 +155,35 @@ let ++ optional pulseSupport libpulseaudio ++ optionals useOzone [ libdrm wayland mesa_drivers libxkbcommon ]; - patches = optionals (versionRange "68" "86") [ - ./patches/nix_plugin_paths_68.patch - ] ++ [ - ./patches/remove-webp-include-69.patch - ./patches/no-build-timestamps.patch - ./patches/widevine-79.patch - ./patches/dont-use-ANGLE-by-default.patch - # Unfortunately, chromium regularly breaks on major updates and - # then needs various patches backported in order to be compiled with GCC. - # Good sources for such patches and other hints: - # - https://gitweb.gentoo.org/repo/gentoo.git/plain/www-client/chromium/ - # - https://git.archlinux.org/svntogit/packages.git/tree/trunk?h=packages/chromium - # - https://github.com/chromium/chromium/search?q=GCC&s=committer-date&type=Commits - # - # ++ optionals (channel == "dev") [ ( githubPatch "" "0000000000000000000000000000000000000000000000000000000000000000" ) ] + patches = [ + ./patches/no-build-timestamps.patch # Optional patch to use SOURCE_DATE_EPOCH in compute_build_timestamp.py (should be upstreamed) + ./patches/widevine-79.patch # For bundling Widevine (DRM), might be replaceable via bundle_widevine_cdm=true in gnFlags # ++ optional (versionRange "68" "72") ( githubPatch "" "0000000000000000000000000000000000000000000000000000000000000000" ) - ] ++ optionals (useVaapi && versionRange "68" "86") [ # Improvements for the VA-API build: - ./patches/enable-vdpau-support-for-nvidia.patch # https://aur.archlinux.org/cgit/aur.git/tree/vdpau-support.patch?h=chromium-vaapi - ./patches/enable-video-acceleration-on-linux.patch # Can be controlled at runtime (i.e. without rebuilding Chromium) + ] ++ optionals (useVaapi && versionRange "86" "87") [ + # Check for enable-accelerated-video-decode on Linux: + (githubPatch "54deb9811ca9bd2327def5c05ba6987b8c7a0897" "11jvxjlkzz1hm0pvfyr88j7z3zbwzplyl5idkx92l2lzv4459c8d") ]; - postPatch = optionalString (!versionRange "0" "86") '' + postPatch = '' + # remove unused third-party + for lib in ${toString gnSystemLibraries}; do + if [ -d "third_party/$lib" ]; then + find "third_party/$lib" -type f \ + \! -path "third_party/$lib/chromium/*" \ + \! -path "third_party/$lib/google/*" \ + \! -path "third_party/harfbuzz-ng/utils/hb_scoped.h" \ + \! -regex '.*\.\(gn\|gni\|isolate\)' \ + -delete + fi + done + # Required for patchShebangs (unsupported interpreter directive, basename: invalid option -- '*', etc.): - substituteInPlace native_client/SConstruct \ - --replace "#! -*- python -*-" "" - substituteInPlace third_party/harfbuzz-ng/src/src/update-unicode-tables.make \ - --replace "/usr/bin/env -S make -f" "/usr/bin/make -f" - '' + '' + substituteInPlace native_client/SConstruct --replace "#! -*- python -*-" "" + if [ -e third_party/harfbuzz-ng/src/src/update-unicode-tables.make ]; then + substituteInPlace third_party/harfbuzz-ng/src/src/update-unicode-tables.make \ + --replace "/usr/bin/env -S make -f" "/usr/bin/make -f" + fi + # We want to be able to specify where the sandbox is via CHROME_DEVEL_SANDBOX substituteInPlace sandbox/linux/suid/client/setuid_sandbox_host.cc \ --replace \ @@ -202,11 +201,6 @@ let '/usr/share/locale/' \ '${glibc}/share/locale/' - substituteInPlace ui/gfx/x/BUILD.gn \ - --replace \ - '/usr/share/xcb' \ - '${xorg.xcbproto}/share/xcb/' - sed -i -e 's@"\(#!\)\?.*xdg-@"\1${xdg_utils}/bin/xdg-@' \ chrome/browser/shell_integration_linux.cc @@ -216,42 +210,20 @@ let sed -i -e '/libpci_loader.*Load/s!"\(libpci\.so\)!"${pciutils}/lib/\1!' \ gpu/config/gpu_info_collector_linux.cc - sed -i -re 's/([^:])\<(isnan *\()/\1std::\2/g' \ - chrome/browser/ui/webui/engagement/site_engagement_ui.cc - - sed -i -e '/#include/ { - i #include - :l; n; bl - }' gpu/config/gpu_control_list.cc - # Allow to put extensions into the system-path. sed -i -e 's,/usr,/run/current-system/sw,' chrome/common/chrome_paths.cc patchShebangs . # use our own nodejs mkdir -p third_party/node/linux/node-linux-x64/bin - ln -s $(which node) third_party/node/linux/node-linux-x64/bin/node + ln -s "$(command -v node)" third_party/node/linux/node-linux-x64/bin/node + + # Allow building against system libraries in official builds + sed -i 's/OFFICIAL_BUILD/GOOGLE_CHROME_BUILD/' tools/generate_shim_headers/generate_shim_headers.py - # remove unused third-party - # in third_party/crashpad third_party/zlib contains just a header-adapter - for lib in ${toString gnSystemLibraries}; do - find -type f -path "*third_party/$lib/*" \ - \! -path "*third_party/crashpad/crashpad/third_party/zlib/*" \ - \! -path "*third_party/$lib/chromium/*" \ - \! -path "*third_party/$lib/google/*" \ - \! -path "*base/third_party/icu/*" \ - \! -path "*base/third_party/libevent/*" \ - \! -regex '.*\.\(gn\|gni\|isolate\|py\)' \ - -delete - done '' + optionalString stdenv.isAarch64 '' substituteInPlace build/toolchain/linux/BUILD.gn \ --replace 'toolprefix = "aarch64-linux-gnu-"' 'toolprefix = ""' - '' + optionalString stdenv.cc.isClang '' - mkdir -p third_party/llvm-build/Release+Asserts/bin - ln -s ${stdenv.cc}/bin/clang third_party/llvm-build/Release+Asserts/bin/clang - ln -s ${stdenv.cc}/bin/clang++ third_party/llvm-build/Release+Asserts/bin/clang++ - ln -s ${llvmPackages.llvm}/bin/llvm-ar third_party/llvm-build/Release+Asserts/bin/llvm-ar '' + optionalString ungoogled '' ${ungoogler}/utils/prune_binaries.py . ${ungoogler}/pruning.list || echo "some errors" ${ungoogler}/utils/patches.py . ${ungoogler}/patches @@ -259,9 +231,9 @@ let ''; gnFlags = mkGnFlags ({ - use_lld = false; - use_gold = true; - gold_path = "${stdenv.cc}/bin"; + custom_toolchain = "//build/toolchain/linux/unbundle:default"; + host_toolchain = "//build/toolchain/linux/unbundle:default"; + is_official_build = true; is_debug = false; proprietary_codecs = false; @@ -283,6 +255,7 @@ let is_clang = stdenv.cc.isClang; clang_use_chrome_plugins = false; blink_symbol_level = 0; + symbol_level = 0; fieldtrial_testing_like_official_build = true; # Google API keys, see: @@ -336,8 +309,7 @@ let # This is to ensure expansion of $out. libExecPath="${libExecPath}" - python build/linux/unbundle/replace_gn_files.py \ - --system-libraries ${toString gnSystemLibraries} + python build/linux/unbundle/replace_gn_files.py --system-libraries ${toString gnSystemLibraries} ${gnChromium}/bin/gn gen --args=${escapeShellArg gnFlags} out/Release | tee gn-gen-outputs.txt # Fail if `gn gen` contains a WARNING. diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/ungoogled-chromium/default.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/ungoogled-chromium/default.nix index 7c581ee633..3cd0ec34db 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/ungoogled-chromium/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/ungoogled-chromium/default.nix @@ -1,5 +1,5 @@ { newScope, config, stdenv, fetchurl, makeWrapper -, llvmPackages_10, llvmPackages_11, ed, gnugrep, coreutils, xdg_utils +, llvmPackages_11, ed, gnugrep, coreutils, xdg_utils , glib, gtk3, gnome3, gsettings-desktop-schemas, gn, fetchgit , libva ? null , pipewire_0_2 @@ -14,8 +14,7 @@ , proprietaryCodecs ? true , enablePepperFlash ? false , enableWideVine ? false -, useVaapi ? false # Deprecated, use enableVaapi instead! -, enableVaapi ? false # Disabled by default due to unofficial support and issues on radeon +, enableVaapi ? false # Disabled by default due to unofficial support , ungoogled ? true , useOzone ? false , cupsSupport ? true @@ -24,7 +23,7 @@ }: let - llvmPackages = llvmPackages_10; + llvmPackages = llvmPackages_11; stdenv = llvmPackages.stdenv; callPackage = newScope chromium; @@ -39,16 +38,6 @@ let cupsSupport pulseSupport useOzone; inherit ungoogled; # TODO: Remove after we can update gn for the stable channel (backward incompatible changes): - gnChromium = gn.overrideAttrs (oldAttrs: { - version = "2020-05-19"; - src = fetchgit { - url = "https://gn.googlesource.com/gn"; - rev = "d0a6f072070988e7b038496c4e7d6c562b649732"; - sha256 = "0197msabskgfbxvhzq73gc3wlr3n9cr4bzrhy5z5irbvy05lxk17"; - }; - }); - } // lib.optionalAttrs (lib.versionAtLeast upstream-info.version "86") { - llvmPackages = llvmPackages_11; gnChromium = gn.overrideAttrs (oldAttrs: { version = "2020-07-20"; src = fetchgit { @@ -58,8 +47,8 @@ let }; }); } // lib.optionalAttrs (lib.versionAtLeast upstream-info.version "87") { - llvmPackages = llvmPackages_11; useOzone = true; # YAY: https://chromium-review.googlesource.com/c/chromium/src/+/2382834 \o/ + useVaapi = !stdenv.isAarch64; # TODO: Might be best to not set use_vaapi anymore (default is fine) gnChromium = gn.overrideAttrs (oldAttrs: { version = "2020-08-17"; src = fetchgit { @@ -162,13 +151,6 @@ let '' else browser; - optionalVaapiFlags = if useVaapi # TODO: Remove after 20.09: - then throw '' - Chromium's useVaapi was replaced by enableVaapi and you don't need to pass - "--ignore-gpu-blacklist" anymore (also no rebuilds are required anymore). - '' else lib.optionalString - (!enableVaapi) - "--add-flags --disable-accelerated-video-decode --add-flags --disable-accelerated-video-encode"; in stdenv.mkDerivation { name = "ungoogled-chromium${suffix}-${version}"; inherit version; @@ -195,7 +177,7 @@ in stdenv.mkDerivation { eval makeWrapper "${browserBinary}" "$out/bin/chromium" \ --add-flags ${escapeShellArg (escapeShellArg commandLineArgs)} \ - ${optionalVaapiFlags} \ + ${lib.optionalString enableVaapi "--add-flags --enable-accelerated-video-decode"} \ ${concatMapStringsSep " " getWrapperFlags chromium.plugins.enabled} ed -v -s "$out/bin/chromium" << EOF diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/ungoogled-chromium/patches/dont-use-ANGLE-by-default.patch b/third_party/nixpkgs/pkgs/applications/networking/browsers/ungoogled-chromium/patches/dont-use-ANGLE-by-default.patch deleted file mode 100644 index 9f14a304eb..0000000000 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/ungoogled-chromium/patches/dont-use-ANGLE-by-default.patch +++ /dev/null @@ -1,26 +0,0 @@ -A field trial currently enables the passthrough command decoder, which causes -gl_factory.cc to try kGLImplementationEGLANGLE first, which causes Chromium to fail -to load libGLESv2.so on NixOS. It somehow does not try kGLImplementationDesktopGL, -and so there is no GL support at all. - -Revert to using the validating command decoder, which prevents gl_factory.cc -from touching allowed_impls, allowing it to successfully use kGLImplementationDesktopGL. - -diff --git a/ui/gl/gl_utils.cc b/ui/gl/gl_utils.cc -index 697cbed5fe2d..8419bdb21a2f 100644 ---- a/ui/gl/gl_utils.cc -+++ b/ui/gl/gl_utils.cc -@@ -71,9 +71,10 @@ bool UsePassthroughCommandDecoder(const base::CommandLine* command_line) { - } else if (switch_value == kCmdDecoderValidatingName) { - return false; - } else { -- // Unrecognized or missing switch, use the default. -- return base::FeatureList::IsEnabled( -- features::kDefaultPassthroughCommandDecoder); -+ // Ignore the field trial that enables it; disable it until -+ // gl_factory.cc kGLImplementationEGLANGLE issues are sorted -+ // out on NixOS. -+ return false; - } - } - } diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/ungoogled-chromium/patches/enable-vdpau-support-for-nvidia.patch b/third_party/nixpkgs/pkgs/applications/networking/browsers/ungoogled-chromium/patches/enable-vdpau-support-for-nvidia.patch deleted file mode 100644 index 8d879de7bf..0000000000 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/ungoogled-chromium/patches/enable-vdpau-support-for-nvidia.patch +++ /dev/null @@ -1,65 +0,0 @@ ---- a/media/gpu/vaapi/vaapi_video_decode_accelerator.cc -+++ b/media/gpu/vaapi/vaapi_video_decode_accelerator.cc -@@ -641,6 +641,7 @@ void VaapiVideoDecodeAccelerator::AssignPictureBuffers( - // |vpp_vaapi_wrapper_| for VaapiPicture to DownloadFromSurface() the VA's - // internal decoded frame. - if (buffer_allocation_mode_ != BufferAllocationMode::kNone && -+ buffer_allocation_mode_ != BufferAllocationMode::kWrapVdpau && - !vpp_vaapi_wrapper_) { - vpp_vaapi_wrapper_ = VaapiWrapper::Create( - VaapiWrapper::kVideoProcess, VAProfileNone, -@@ -665,7 +666,8 @@ void VaapiVideoDecodeAccelerator::AssignPictureBuffers( - PictureBuffer buffer = buffers[i]; - buffer.set_size(requested_pic_size_); - std::unique_ptr picture = vaapi_picture_factory_->Create( -- (buffer_allocation_mode_ == BufferAllocationMode::kNone) -+ ((buffer_allocation_mode_ == BufferAllocationMode::kNone) || -+ (buffer_allocation_mode_ == BufferAllocationMode::kWrapVdpau)) - ? vaapi_wrapper_ - : vpp_vaapi_wrapper_, - make_context_current_cb_, bind_image_cb_, buffer); -@@ -1093,6 +1095,12 @@ VaapiVideoDecodeAccelerator::GetSupportedProfiles() { - - VaapiVideoDecodeAccelerator::BufferAllocationMode - VaapiVideoDecodeAccelerator::DecideBufferAllocationMode() { -+ // NVIDIA blobs use VDPAU -+ if (VaapiWrapper::GetImplementationType() == VAImplementation::kNVIDIAVDPAU) { -+ LOG(INFO) << "VA-API driver on VDPAU backend"; -+ return BufferAllocationMode::kWrapVdpau; -+ } -+ - // TODO(crbug.com/912295): Enable a better BufferAllocationMode for IMPORT - // |output_mode_| as well. - if (output_mode_ == VideoDecodeAccelerator::Config::OutputMode::IMPORT) ---- a/media/gpu/vaapi/vaapi_video_decode_accelerator.h -+++ b/media/gpu/vaapi/vaapi_video_decode_accelerator.h -@@ -204,6 +204,7 @@ class MEDIA_GPU_EXPORT VaapiVideoDecodeAccelerator - // Using |client_|s provided PictureBuffers and as many internally - // allocated. - kNormal, -+ kWrapVdpau, - }; - - // Decides the concrete buffer allocation mode, depending on the hardware ---- a/media/gpu/vaapi/vaapi_wrapper.cc -+++ b/media/gpu/vaapi/vaapi_wrapper.cc -@@ -131,6 +131,9 @@ media::VAImplementation VendorStringToImplementationType( - } else if (base::StartsWith(va_vendor_string, "Intel iHD driver", - base::CompareCase::SENSITIVE)) { - return media::VAImplementation::kIntelIHD; -+ } else if (base::StartsWith(va_vendor_string, "Splitted-Desktop Systems VDPAU", -+ base::CompareCase::SENSITIVE)) { -+ return media::VAImplementation::kNVIDIAVDPAU; - } - return media::VAImplementation::kOther; - } ---- a/media/gpu/vaapi/vaapi_wrapper.h -+++ b/media/gpu/vaapi/vaapi_wrapper.h -@@ -79,6 +79,7 @@ enum class VAImplementation { - kIntelIHD, - kOther, - kInvalid, -+ kNVIDIAVDPAU, - }; - - // This class handles VA-API calls and ensures proper locking of VA-API calls diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/ungoogled-chromium/patches/enable-video-acceleration-on-linux.patch b/third_party/nixpkgs/pkgs/applications/networking/browsers/ungoogled-chromium/patches/enable-video-acceleration-on-linux.patch deleted file mode 100644 index bd278633f6..0000000000 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/ungoogled-chromium/patches/enable-video-acceleration-on-linux.patch +++ /dev/null @@ -1,48 +0,0 @@ -From b2144fd28e09cd52e7a88a62a9d9b54cf9922f9f Mon Sep 17 00:00:00 2001 -From: Michael Weiss -Date: Tue, 14 Apr 2020 14:16:10 +0200 -Subject: [PATCH] Enable accelerated video decode on Linux - -This will enable accelerated video decode on Linux by default (i.e. -without "--ignore-gpu-blacklist"), but on NixOS we'll provide -"--disable-accelerated-video-decode" and -"--disable-accelerated-video-encode" by default to avoid regressions -(e.g. VA-API doesn't work properly for some radeon drivers). - -Video acceleration can then be enabled via: -chromium.override { enableVaapi = true; } -without rebuilding Chromium. ---- - gpu/config/software_rendering_list.json | 16 ---------------- - 1 file changed, 16 deletions(-) - -diff --git a/gpu/config/software_rendering_list.json b/gpu/config/software_rendering_list.json -index 22712bdbf38f..a06dd19a50e4 100644 ---- a/gpu/config/software_rendering_list.json -+++ b/gpu/config/software_rendering_list.json -@@ -336,22 +336,6 @@ - ] - }, - { -- "id": 48, -- "description": "Accelerated video decode is unavailable on Linux", -- "cr_bugs": [137247, 1032907], -- "os": { -- "type": "linux" -- }, -- "exceptions": [ -- { -- "machine_model_name": ["Chromecast"] -- } -- ], -- "features": [ -- "accelerated_video_decode" -- ] -- }, -- { - "id": 50, - "description": "Disable VMware software renderer on older Mesa", - "cr_bugs": [145531, 332596, 571899, 629434], --- -2.11.0 - diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/ungoogled-chromium/patches/nix_plugin_paths_68.patch b/third_party/nixpkgs/pkgs/applications/networking/browsers/ungoogled-chromium/patches/nix_plugin_paths_68.patch deleted file mode 100644 index da6a4c92b4..0000000000 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/ungoogled-chromium/patches/nix_plugin_paths_68.patch +++ /dev/null @@ -1,61 +0,0 @@ -diff --git a/chrome/common/chrome_paths.cc b/chrome/common/chrome_paths.cc -index f4e119d..d9775bd 100644 ---- a/chrome/common/chrome_paths.cc -+++ b/chrome/common/chrome_paths.cc -@@ -68,21 +68,14 @@ static base::LazyInstance - g_invalid_specified_user_data_dir = LAZY_INSTANCE_INITIALIZER; - - // Gets the path for internal plugins. --bool GetInternalPluginsDirectory(base::FilePath* result) { --#if defined(OS_MACOSX) -- // If called from Chrome, get internal plugins from a subdirectory of the -- // framework. -- if (base::mac::AmIBundled()) { -- *result = chrome::GetFrameworkBundlePath(); -- DCHECK(!result->empty()); -- *result = result->Append("Internet Plug-Ins"); -- return true; -- } -- // In tests, just look in the module directory (below). --#endif -- -- // The rest of the world expects plugins in the module directory. -- return base::PathService::Get(base::DIR_MODULE, result); -+bool GetInternalPluginsDirectory(base::FilePath* result, -+ const std::string& ident) { -+ std::string full_env = std::string("NIX_CHROMIUM_PLUGIN_PATH_") + ident; -+ const char* value = getenv(full_env.c_str()); -+ if (value == NULL) -+ return base::PathService::Get(base::DIR_MODULE, result); -+ else -+ *result = base::FilePath(value); - } - - // Gets the path for bundled implementations of components. Note that these -@@ -272,7 +265,7 @@ bool PathProvider(int key, base::FilePath* result) { - create_dir = true; - break; - case chrome::DIR_INTERNAL_PLUGINS: -- if (!GetInternalPluginsDirectory(&cur)) -+ if (!GetInternalPluginsDirectory(&cur, "ALL")) - return false; - break; - case chrome::DIR_COMPONENTS: -@@ -280,7 +273,7 @@ bool PathProvider(int key, base::FilePath* result) { - return false; - break; - case chrome::DIR_PEPPER_FLASH_PLUGIN: -- if (!GetInternalPluginsDirectory(&cur)) -+ if (!GetInternalPluginsDirectory(&cur, "PEPPERFLASH")) - return false; - cur = cur.Append(kPepperFlashBaseDirectory); - break; -@@ -358,7 +351,7 @@ bool PathProvider(int key, base::FilePath* result) { - cur = cur.DirName(); - } - #else -- if (!GetInternalPluginsDirectory(&cur)) -+ if (!GetInternalPluginsDirectory(&cur, "PNACL")) - return false; - #endif - cur = cur.Append(FILE_PATH_LITERAL("pnacl")); diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/ungoogled-chromium/patches/remove-webp-include-69.patch b/third_party/nixpkgs/pkgs/applications/networking/browsers/ungoogled-chromium/patches/remove-webp-include-69.patch deleted file mode 100644 index 07572cf7ee..0000000000 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/ungoogled-chromium/patches/remove-webp-include-69.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/third_party/blink/renderer/platform/image-encoders/image_encoder.cc -+++ b/third_party/blink/renderer/platform/image-encoders/image_encoder.cc -@@ -13,7 +13,7 @@ - - #include "jpeglib.h" // for JPEG_MAX_DIMENSION - --#include "third_party/libwebp/src/webp/encode.h" // for WEBP_MAX_DIMENSION -+#define WEBP_MAX_DIMENSION 16383 - - namespace blink { - diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/ungoogled-chromium/ungoogled-src.nix b/third_party/nixpkgs/pkgs/applications/networking/browsers/ungoogled-chromium/ungoogled-src.nix index 73f4e4c9e8..abcb2ce391 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/ungoogled-chromium/ungoogled-src.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/ungoogled-chromium/ungoogled-src.nix @@ -1,6 +1,6 @@ { - "85.0.4183.102" = { - rev = "85.0.4183.102-1"; - sha256 = "1mdx4a5zcs3an9yx1jxx4amq8p9rcj0hv76r8y7nz6cpsfgd9n3y"; + "86.0.4240.111" = { + rev = "86.0.4240.111-1"; + sha256 = "0fkk0lxbvik8q8d5njxmwiam64qz5g74hlb56w24nh5mh1jm59a8"; }; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/browsers/ungoogled-chromium/upstream-info.json b/third_party/nixpkgs/pkgs/applications/networking/browsers/ungoogled-chromium/upstream-info.json index dae7f741b3..5fded39c74 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/browsers/ungoogled-chromium/upstream-info.json +++ b/third_party/nixpkgs/pkgs/applications/networking/browsers/ungoogled-chromium/upstream-info.json @@ -1,17 +1,17 @@ { "stable": { - "version": "85.0.4183.102", - "sha256": "032yh1mfwins7a62zw8kwwq8xw1n52a0a93lqz7qlyjaf9sd8s4a", - "sha256bin64": "1i8xaxxnmg80vsia8hxnq58qi9k5nnbrl80d6d23g9lb7dbc9cpm" + "version": "86.0.4240.111", + "sha256": "05y7lwr89awkhvgmwkx3br9j4ap2aypg2wsc0nz8mi7kxc1dnyzj", + "sha256bin64": "10aqiiydw4i3jxnw8xxdgkgcqbfqc67n1fbrg40y54kg0v5dz8l6" }, "beta": { - "version": "86.0.4240.30", - "sha256": "1isj0zngb72k1hhn3h0s8mccg1cdmppz1mjmg19f2h306farzmzl", - "sha256bin64": "10d8im2adqqnkd6265gngv6xlm5qsz6r13z6cbbchsss0ssr8fxa" + "version": "87.0.4280.27", + "sha256": "0w0asxj7jlsw69cssfia8km4q9cx1c2mliks2rmhf4jk0hsghasm", + "sha256bin64": "1lsx4mhy8nachfb8c9f3mrx5nqw2bi046dqirb4lnv7y80jjjs1k" }, "dev": { - "version": "87.0.4252.0", - "sha256": "1lxlsdni63zh79hxvpwgmnfn67kgfzhz3yg9bkxghqchqykkz92y", - "sha256bin64": "130hf7b35wcxpw05ddbqq89x10c0kays1vb9qg6xhq3zx2mk6ijw" + "version": "88.0.4298.4", + "sha256": "0ka11gmpkyrmifajaxm66c16hrj3xakdvhjqg04slyp2sv0nlhrl", + "sha256bin64": "0768y31jqbl1znp7yp6mvl5j12xl1nwjkh2l8zdga81q0wz52hh6" } } 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 bb3b7aedd8..0f39fc5281 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/kube3d/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/kube3d/default.nix @@ -2,8 +2,8 @@ buildGoModule rec { pname = "kube3d"; - version = "3.0.2"; - k3sVersion = "1.18.6-k3s1"; + version = "3.1.5"; + k3sVersion = "1.18.9-k3s1"; excludedPackages = ''tools''; @@ -11,7 +11,7 @@ buildGoModule rec { owner = "rancher"; repo = "k3d"; rev = "v${version}"; - sha256 = "182n4kggwr6z75vsagfd0rl89ixcw5h13whf56jh4cd38dj8is5l"; + sha256 = "0aspkar9im323d8117k48fvh1yylyspi2p2l2f5rdg1ilpa6hm53"; }; buildFlagsArray = '' @@ -22,11 +22,13 @@ buildGoModule rec { ''; nativeBuildInputs = [ installShellFiles ]; + + # TODO: Move to enhanced installShellCompletion when in master: PR #83630 postInstall = '' - for shell in bash zsh; do - $out/bin/k3d completion $shell > k3d.$shell - installShellCompletion k3d.$shell - done + $out/bin/k3d completion bash > k3d.bash + $out/bin/k3d completion fish > k3d.fish + $out/bin/k3d completion zsh > _k3d + installShellCompletion k3d.{bash,fish} --zsh _k3d ''; vendorSha256 = null; @@ -38,6 +40,6 @@ buildGoModule rec { description = "A helper to run k3s (Lightweight Kubernetes. 5 less than k8s) in a docker container"; license = licenses.mit; platforms = platforms.linux; - maintainers = with maintainers; [ kuznero jlesquembre ngerstle ]; + maintainers = with maintainers; [ kuznero jlesquembre ngerstle jk ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/sonobuoy/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/sonobuoy/default.nix index c111f7eccf..be5cb51d45 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/sonobuoy/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/sonobuoy/default.nix @@ -13,7 +13,7 @@ buildGoModule rec { let t = goPackagePath; in '' -ldflags= - -s -X ${t}/pkg/buildinfo.Version=${version} + -s -X ${t}/pkg/buildinfo.Version=v${version} -X ${t}/pkg/buildinfo.GitSHA=${rev} -X ${t}/pkg/buildDate=unknown ''; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/starboard/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/starboard/default.nix index 20861769d8..bc42bf1366 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/starboard/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/starboard/default.nix @@ -2,16 +2,18 @@ buildGoModule rec { pname = "starboard"; - version = "0.5.0"; + version = "0.6.0"; src = fetchFromGitHub { owner = "aquasecurity"; repo = pname; rev = "v${version}"; - sha256 = "12vfxnny3giirdf1xhacy24dvy5zm7iil6h019s0l63876vingnc"; + sha256 = "00d3cnd3n6laa6rphw5w9xk8slpp4a603vzhixzg01sghq26gy22"; }; - vendorSha256 = "0hj7h58j0v98plrqfldq59d084j76aiy82mfm8zi0vcqg6gxf4pb"; + vendorSha256 = "0y816r75rp1a4rp7j0a8wzrfi2mdf4ji1vz2vaj5s7x9ik6rc13r"; + + subPackages = [ "cmd/starboard" ]; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/default.nix index a75500c8eb..ebe787a251 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/default.nix @@ -164,8 +164,10 @@ let cloudfoundry = callPackage ./cloudfoundry {}; elasticsearch = callPackage ./elasticsearch {}; gandi = callPackage ./gandi {}; + hcloud = callPackage ./hcloud {}; keycloak = callPackage ./keycloak {}; libvirt = callPackage ./libvirt {}; + linuxbox = callPackage ./linuxbox {}; lxd = callPackage ./lxd {}; shell = callPackage ./shell {}; vpsadmin = callPackage ./vpsadmin {}; diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/hcloud/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/hcloud/default.nix new file mode 100644 index 0000000000..89a22c718e --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/hcloud/default.nix @@ -0,0 +1,32 @@ +{ stdenv, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "terraform-provider-hcloud"; + version = "1.22.0"; + + src = fetchFromGitHub { + owner = "hetznercloud"; + repo = pname; + rev = "v${version}"; + sha256 = "1h4kplrmpsbwa0nq3zyqa0cnvhv1s5avdrjyf1k1f2z6b6h4gynf"; + }; + + vendorSha256 = "070p34g0ca55rmfdwf1l53yr8vyhmm5sb8hm8q036n066yp03yfs"; + + # Spends an awful time in other test folders, apparently tries to reach + # opencensus and fails. + checkPhase = '' + pushd hcloud + go test -v + popd + ''; + + postInstall = "mv $out/bin/terraform-provider-hcloud{,_v${version}}"; + + meta = with stdenv.lib; { + homepage = "https://github.com/cloudfoundry-community/terraform-provider-cloudfoundry"; + description = "Terraform provider for cloudfoundry"; + license = licenses.mpl20; + maintainers = with maintainers; [ ris ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/linuxbox/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/linuxbox/default.nix new file mode 100644 index 0000000000..60cd7f2d76 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/linuxbox/default.nix @@ -0,0 +1,26 @@ +{ stdenv, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + pname = "terraform-provider-linuxbox"; + version = "0.3.11"; + + src = fetchFromGitHub { + owner = "numtide"; + repo = pname; + rev = "v${version}"; + sha256 = "1sxb2iv4dl0rw3v1r7k5dfkyh14nmp19cprqafhb7ncarmvawq39"; + }; + + vendorSha256 = "16hp0pv1qpvr34ac1syjci39csvyj3c748inllypjwx76q6rwp7k"; + + postInstall = "mv $out/bin/terraform-provider-linuxbox{,_v${version}}"; + + passthru.provider-source-address = "registry.terraform.io/numtide/linuxbox"; + + meta = with stdenv.lib; { + homepage = "https://github.com/numtide/terraform-provider-linuxbox"; + description = "Basic building block for Seed DevOps"; + license = licenses.bsd3; + maintainers = with maintainers; [ zimbatm ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/providers.json b/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/providers.json index 29bbac6f70..83843a82a6 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -33,9 +33,9 @@ "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/archive", "repo": "terraform-provider-archive", - "rev": "v1.3.0", - "sha256": "1hwg8ai4bvsmgnl669608lr4v940xnyig1xshps490f47c8hqy6y", - "version": "1.3.0" + "rev": "v2.0.0", + "sha256": "1d5n379zyjp2srg43g78a8h33qwcpkfkj7c35idvbyydi35vzlpl", + "version": "2.0.0" }, "arukas": { "owner": "terraform-providers", @@ -293,9 +293,9 @@ "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/external", "repo": "terraform-provider-external", - "rev": "v1.2.0", - "sha256": "1kx28bffhd1pg3m0cbldclc8l9zic16mqrk7gybcls9vyds5gbvc", - "version": "1.2.0" + "rev": "v2.0.0", + "sha256": "16wciz08gicicsirij2ql0gy8dg0372jjsqmaigkl2n07mqz2b6a", + "version": "2.0.0" }, "fastly": { "owner": "terraform-providers", @@ -367,13 +367,6 @@ "sha256": "00l3cwvyyjk0n3j535qfj3bsf1s5l07786gnxycj0f8vz3a06bcq", "version": "1.6.0" }, - "hcloud": { - "owner": "terraform-providers", - "repo": "terraform-provider-hcloud", - "rev": "v1.16.0", - "sha256": "09v2bg4ffyh4ibz449dygxgd7mvjgh4b2r242l3cwi7pzn66imrz", - "version": "1.16.0" - }, "hedvig": { "owner": "terraform-providers", "repo": "terraform-provider-hedvig", @@ -513,9 +506,9 @@ "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/local", "repo": "terraform-provider-local", - "rev": "v1.4.0", - "sha256": "1k1kbdn99ypn1pi6vqbs1l9a8vvf4vs32wl8waa16i26514sz1wk", - "version": "1.4.0" + "rev": "v2.0.0", + "sha256": "0c1mk63lh3qmj8pl80lyvvsgyg4gg7673abr8cfxrj45635h74z5", + "version": "2.0.0" }, "logentries": { "owner": "terraform-providers", @@ -619,9 +612,9 @@ "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/null", "repo": "terraform-provider-null", - "rev": "v2.1.2", - "sha256": "0di1hxmd3s80sz8hl5q2i425by8fbk15f0r4jmnm6vra0cq89jw2", - "version": "2.1.2" + "rev": "v3.0.0", + "sha256": "0r1kvsc96922i85hdvf1pk8aicxjr6bc69gc63qi21hrl0jpvr7r", + "version": "3.0.0" }, "nutanix": { "owner": "terraform-providers", @@ -789,9 +782,9 @@ "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/random", "repo": "terraform-provider-random", - "rev": "v2.2.1", - "sha256": "1qklsxj443vsj61lwl7qf7xwgnllwcvb2yk6s0kn9g3iq63pcv30", - "version": "2.2.1" + "rev": "v3.0.0", + "sha256": "00dkpcri9ckp0kxwgh3p8175cyd44m8z13cb013pm4mrr61n4wq9", + "version": "3.0.0" }, "rightscale": { "owner": "terraform-providers", @@ -909,9 +902,9 @@ "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/template", "repo": "terraform-provider-template", - "rev": "v2.1.2", - "sha256": "18w1mmma81m9j7yf6q500w8v9ss28w6sw2ynssl99pyw2gwmd04q", - "version": "2.1.2" + "rev": "v2.2.0", + "sha256": "12pn1i06jz4xl50md94yfdggg3pg5bv1viwf35izizm5rnyksyv2", + "version": "2.2.0" }, "tencentcloud": { "owner": "terraform-providers", @@ -946,9 +939,9 @@ "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/tls", "repo": "terraform-provider-tls", - "rev": "v2.1.1", - "sha256": "1qsx540pjcq4ra034q2dwnw5nmzab5h1c3vm20ppg5dkhhyiizq8", - "version": "2.1.1" + "rev": "v3.0.0", + "sha256": "1p9d5wrr4xwf2i930zlcarm1zl8ysj3nyc6rrbhpxk04kr6ap0wz", + "version": "3.0.0" }, "triton": { "owner": "terraform-providers", diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/mcabber/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/mcabber/default.nix index 98b326820b..23db7d1ce2 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/mcabber/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/mcabber/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "mcabber"; - version = "1.1.0"; + version = "1.1.2"; src = fetchurl { url = "https://mcabber.com/files/mcabber-${version}.tar.bz2"; - sha256 = "1ggh865p1rf10ffsnf4g6qv9i8bls36dxdb1nzs5r9vdqci2rz04"; + sha256 = "0q1i5acyghsmzas88qswvki8kkk2nfpr8zapgnxbcd3lwcxl38f4"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix index 5603ff13b1..9656db0bd8 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/signal-desktop/default.nix @@ -25,7 +25,7 @@ let else ""); in stdenv.mkDerivation rec { pname = "signal-desktop"; - version = "1.37.2"; # Please backport all updates to the stable channel. + version = "1.37.3"; # Please backport all updates to the stable channel. # All releases have a limited lifetime and "expire" 90 days after the release. # When releases "expire" the application becomes unusable until an update is # applied. The expiration date for the current release can be extracted with: @@ -35,7 +35,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_${version}_amd64.deb"; - sha256 = "0n4g2fh1ibw6fl5vbnnchx2vafasqrq8rl9w0ch7lai665zkxsk3"; + sha256 = "0gyg67qhrqqn1676m7ki8h9akhn29fh1sxmj0kw5j7dx4cyc4mid"; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/slack/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/slack/default.nix index bd41fc562b..d27bd6a521 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/slack/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/slack/default.nix @@ -39,9 +39,16 @@ let throwSystem = throw "Unsupported system: ${system}"; pname = "slack"; + + x86_64-darwin-version = "4.10.3"; + x86_64-darwin-sha256 = "0r77l57vr603xamich4h4gbdd5vdcj0sjs6yjpymfx9s0f98v8bb"; + + x86_64-linux-version = "4.10.3"; + x86_64-linux-sha256 = "1gnjj2iyk8cwjajg8h9qpmzx10j4qjxjzciq8csg45qfzwkr3drf"; + version = { - x86_64-darwin = "4.10.3"; - x86_64-linux = "4.10.3"; + x86_64-darwin = x86_64-darwin-version; + x86_64-linux = x86_64-linux-version; }.${system} or throwSystem; src = let @@ -49,11 +56,11 @@ let in { x86_64-darwin = fetchurl { url = "${base}/releases/macos/${version}/prod/x64/Slack-${version}-macOS.dmg"; - sha256 = "0r77l57vr603xamich4h4gbdd5vdcj0sjs6yjpymfx9s0f98v8bb"; + sha256 = x86_64-darwin-sha256; }; x86_64-linux = fetchurl { url = "${base}/linux_releases/slack-desktop-${version}-amd64.deb"; - sha256 = "1gnjj2iyk8cwjajg8h9qpmzx10j4qjxjzciq8csg45qfzwkr3drf"; + sha256 = x86_64-linux-sha256; }; }.${system} or throwSystem; @@ -68,6 +75,8 @@ let linux = stdenv.mkDerivation rec { inherit pname version src meta; + passthru.updateScript = ./update.sh; + rpath = stdenv.lib.makeLibraryPath [ alsaLib at-spi2-atk @@ -152,6 +161,8 @@ let darwin = stdenv.mkDerivation { inherit pname version src meta; + passthru.updateScript = ./update.sh; + nativeBuildInputs = [ undmg ]; sourceRoot = "Slack.app"; diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/slack/update.sh b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/slack/update.sh new file mode 100755 index 0000000000..adef444110 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/slack/update.sh @@ -0,0 +1,41 @@ +#!/usr/bin/env nix-shell +#! nix-shell -i bash -p curl gnused + +set -eou pipefail + +latest_linux_version=$(curl --silent https://slack.com/downloads/linux | sed -n 's/.*Version \([0-9\.]\+\).*/\1/p') +latest_mac_version=$(curl --silent https://slack.com/downloads/mac | sed -n 's/.*Version \([0-9\.]\+\).*/\1/p') + +# Double check that the latest mac and linux versions are in sync. +if [[ "$latest_linux_version" != "$latest_mac_version" ]]; then + echo "the latest linux ($latest_linux_version) and mac ($latest_mac_version) versions are not the same" + exit 1 +fi + +nixpkgs="$(git rev-parse --show-toplevel)" +slack_nix="$nixpkgs/pkgs/applications/networking/instant-messengers/slack/default.nix" +nixpkgs_linux_version=$(cat "$slack_nix" | sed -n 's/.*x86_64-linux-version = \"\([0-9\.]\+\)\";.*/\1/p') +nixpkgs_mac_version=$(cat "$slack_nix" | sed -n 's/.*x86_64-darwin-version = \"\([0-9\.]\+\)\";.*/\1/p') + +if [[ "$nixpkgs_linux_version" == "$latest_linux_version" && "$nixpkgs_mac_version" == "$latest_mac_version" ]]; then + echo "nixpkgs versions are all up to date!" + exit 0 +fi + +linux_url="https://downloads.slack-edge.com/linux_releases/slack-desktop-${latest_linux_version}-amd64.deb" +mac_url="https://downloads.slack-edge.com/releases/macos/${latest_mac_version}/prod/x64/Slack-${latest_mac_version}-macOS.dmg" +linux_sha256=$(nix-prefetch-url ${linux_url}) +mac_sha256=$(nix-prefetch-url ${mac_url}) + +sed -i "s/x86_64-linux-version = \".*\"/x86_64-linux-version = \"${latest_linux_version}\"/" "$slack_nix" +sed -i "s/x86_64-darwin-version = \".*\"/x86_64-darwin-version = \"${latest_mac_version}\"/" "$slack_nix" +sed -i "s/x86_64-linux-sha256 = \".*\"/x86_64-linux-sha256 = \"${linux_sha256}\"/" "$slack_nix" +sed -i "s/x86_64-darwin-sha256 = \".*\"/x86_64-darwin-sha256 = \"${mac_sha256}\"/" "$slack_nix" + +if ! nix-build -A slack "$nixpkgs"; then + echo "The updated slack failed to build." + exit 1 +fi + +echo "Successfully updated" +echo "slack: $nixpkgs_linux_version -> $latest_linux_version" diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/teams/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/teams/default.nix index f1a2c137ad..bf864eb414 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/teams/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/teams/default.nix @@ -47,7 +47,7 @@ stdenv.mkDerivation rec { mv share $out/share substituteInPlace $out/share/applications/teams.desktop \ - --replace /usr/bin/ $out/bin/ + --replace /usr/bin/ "" ln -s $out/opt/teams/teams $out/bin/ diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix index a754e544bc..3bd8ac58e8 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/telegram/tdesktop/default.nix @@ -22,12 +22,12 @@ let in mkDerivation rec { pname = "telegram-desktop"; - version = "2.4.6"; + version = "2.4.7"; # Telegram-Desktop with submodules src = fetchurl { url = "https://github.com/telegramdesktop/tdesktop/releases/download/v${version}/tdesktop-${version}-full.tar.gz"; - sha256 = "190k9ik678br5k892gj26bx4rbj5rn5ks4qgf2nrlgww0z59fvrc"; + sha256 = "1j2v29952l0am357pqvvgzm2zghmwhlr833kgp85hssxpr9xy4vv"; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix index 44aa3a6ac6..b198b954bd 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/wire-desktop/default.nix @@ -22,13 +22,13 @@ let pname = "wire-desktop"; version = { - x86_64-darwin = "3.20.3912"; - x86_64-linux = "3.20.2934"; + x86_64-darwin = "3.21.3959"; + x86_64-linux = "3.21.2936"; }.${system} or throwSystem; sha256 = { - x86_64-darwin = "1crkdqzq3iccxbrqlrar4ai43qzjsgd4hvcajgzmz2y33f30xgqr"; - x86_64-linux = "0z6vrhzrhrrnl3swjbxrbl1dhk2fx86s45n2z2in2shdlv08dcx7"; + x86_64-darwin = "0fgzzqf1wnkjbcr0j0vjn6sggkz0z1kx6w4gi7gk4c4markdicm1"; + x86_64-linux = "033804nkz1fdmq3p8iplrlx708x1fjlr09bmrpy36lqg5h7m3yd6"; }.${system} or throwSystem; meta = with stdenv.lib; { diff --git a/third_party/nixpkgs/pkgs/applications/networking/ipfs-migrator/default.nix b/third_party/nixpkgs/pkgs/applications/networking/ipfs-migrator/default.nix index 4b1d1213b0..d2339fbe89 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/ipfs-migrator/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/ipfs-migrator/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "ipfs-migrator"; - version = "1.6.3"; + version = "1.6.4"; src = fetchFromGitHub { owner = "ipfs"; repo = "fs-repo-migrations"; rev = "v${version}"; - sha256 = "13ah5jk8n3wznvag6dda1ssgpqsdr9pdgvqm9gcsb7zzls89j9x5"; + sha256 = "004qqcwcw55q13r3sr273dfa5zgxc275pcgqwihzbikl3i168d9f"; }; vendorSha256 = null; diff --git a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/bubblemail/default.nix b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/bubblemail/default.nix new file mode 100644 index 0000000000..d415eb4e51 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/bubblemail/default.nix @@ -0,0 +1,76 @@ +{ lib +, fetchFromGitLab +, gettext +, gtk3 +, python3Packages +, gdk-pixbuf +, libnotify +, gst_all_1 +, libsecret +, wrapGAppsHook +, gsettings-desktop-schemas +, gnome-online-accounts +, glib +, gobject-introspection +, folks +}: + +python3Packages.buildPythonApplication rec { + pname = "bubblemail"; + version = "1.3"; + + src = fetchFromGitLab { + domain = "framagit.org"; + owner = "razer"; + repo = "bubblemail"; + rev = "v${version}"; + sha256 = "FEIdEoZBlM28F5kSMoln7KACwetb8hp+qix1P+DIE8k="; + }; + + buildInputs = [ + gtk3 + gdk-pixbuf + glib + libnotify + gst_all_1.gstreamer + gst_all_1.gst-plugins-base + gst_all_1.gst-plugins-good + gst_all_1.gst-plugins-bad + libsecret + gnome-online-accounts + folks + ]; + + nativeBuildInputs = [ + gettext + wrapGAppsHook + python3Packages.pillow + # For setup-hook + gobject-introspection + ]; + + propagatedBuildInputs = with python3Packages; [ + gsettings-desktop-schemas + pygobject3 + dbus-python + pyxdg + ]; + + # See https://nixos.org/nixpkgs/manual/#ssec-gnome-common-issues-double-wrapped + dontWrapGApps = true; + + # https://github.com/NixOS/nixpkgs/issues/56943 + strictDeps = false; + + preFixup = '' + makeWrapperArgs+=("''${gappsWrapperArgs[@]}") + ''; + + meta = with lib; { + description = "An extensible mail notification service."; + homepage = "http://bubblemail.free.fr/"; + license = licenses.gpl2Plus; + platforms = platforms.linux; + maintainers = with maintainers; [ doronbehar ]; + }; +} 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 3ffd171295..ca2b8a7734 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.4.0"; + version = "78.4.1"; sources = [ - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-x86_64/af/thunderbird-78.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/af/thunderbird-78.4.1.tar.bz2"; locale = "af"; arch = "linux-x86_64"; - sha256 = "589fe4c9a7ceffb4d027f493e0b074647bb958a62046deef5b8268fd43e6aae9"; + sha256 = "36268a7fe6ec5a0ea0243f83ffbd73204d5c4ef257b0c8857a50428304b2d4c2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-x86_64/ar/thunderbird-78.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/ar/thunderbird-78.4.1.tar.bz2"; locale = "ar"; arch = "linux-x86_64"; - sha256 = "b94d46899a7458f9c94849db71975e0028004bf93d5b0695a454fbac24a41ec6"; + sha256 = "831e70f807f05ce2f82bb11db35d05ed80dac53ad00c12ff6e191a627d0d42d0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-x86_64/ast/thunderbird-78.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/ast/thunderbird-78.4.1.tar.bz2"; locale = "ast"; arch = "linux-x86_64"; - sha256 = "c6057f5e2937a05f84decc3c2f26de4555314c627210a961882773b2c745ddbf"; + sha256 = "e6efde72ce7aeeda5f7c6d7cc0f3a08265c44546a0f8fc84a2adbc11cc038601"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-x86_64/be/thunderbird-78.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/be/thunderbird-78.4.1.tar.bz2"; locale = "be"; arch = "linux-x86_64"; - sha256 = "94d7bd38e35745f4829abe6cf3ada8e947a2df881dcb1e5f6ef823bbd6e0aa75"; + sha256 = "07fe33390caf37a96c000e0f5435d07711f7a95dbe04f85a222b17ae5a13f1bc"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-x86_64/bg/thunderbird-78.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/bg/thunderbird-78.4.1.tar.bz2"; locale = "bg"; arch = "linux-x86_64"; - sha256 = "d482c6a6873ddb34dc49002b8ecac94e82579fde7d24514500f2de28fc777e18"; + sha256 = "d460e201cbe4a1d6548a52121a33c2aaa7cbbf0e126fa1c4e8a431423424fb9e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-x86_64/br/thunderbird-78.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/br/thunderbird-78.4.1.tar.bz2"; locale = "br"; arch = "linux-x86_64"; - sha256 = "18fc5e174942874ecc41838451aec780485a263584121decfb9f9607ee35322c"; + sha256 = "9e85928f1145391d9c3f238612b93e6344a2ad5e6179bf09502b1b69c8ad1b03"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-x86_64/ca/thunderbird-78.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/ca/thunderbird-78.4.1.tar.bz2"; locale = "ca"; arch = "linux-x86_64"; - sha256 = "269762ee175f69ecc9ffdeab2ad66788d24d2b9ba1e8d05f74ff222848077735"; + sha256 = "1516236c252f22933adf23bfe93d73fa272a4574deb674aef6e1f35006a6cc50"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-x86_64/cak/thunderbird-78.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/cak/thunderbird-78.4.1.tar.bz2"; locale = "cak"; arch = "linux-x86_64"; - sha256 = "735baa9541d1dfad828db27a2cba54caa681973f792c0712300e4f952803dbfb"; + sha256 = "c46508321d32c468d067d86c04973ca345b09b0e983954eaa123d02778d61fbd"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-x86_64/cs/thunderbird-78.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/cs/thunderbird-78.4.1.tar.bz2"; locale = "cs"; arch = "linux-x86_64"; - sha256 = "04763e1461106c76b51c31522de9bd6376d531c9f93e79d4a4c00d5bacb9de29"; + sha256 = "227209429c07238f38d334e5ac8a5fd895a4c87f51b21b4376df89c50bb6a789"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-x86_64/cy/thunderbird-78.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/cy/thunderbird-78.4.1.tar.bz2"; locale = "cy"; arch = "linux-x86_64"; - sha256 = "974885f8e17be1b744f65c0e392747921508d7e0f286ab9fa20580cc205a56ee"; + sha256 = "b272926205e5470df8aec8b22d6733e4f47993e76123fe81d4be26ad5a153062"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-x86_64/da/thunderbird-78.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/da/thunderbird-78.4.1.tar.bz2"; locale = "da"; arch = "linux-x86_64"; - sha256 = "f0e13b8952478b5ebc46552405421b796d645fbb0a16aa759a045b48fd43739d"; + sha256 = "13f9fe10c84d2b8d8d0215cb58a9852486741f5bc8c6979f0a701bef14a70f4f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-x86_64/de/thunderbird-78.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/de/thunderbird-78.4.1.tar.bz2"; locale = "de"; arch = "linux-x86_64"; - sha256 = "735eb8e1d318e09d9dca6560074960cf9ce2fcd5a720754608886f6e51e87266"; + sha256 = "590f9a5a975544d2effedda942e3989a13be23b95f4e6707f9905fed3fc08214"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-x86_64/dsb/thunderbird-78.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/dsb/thunderbird-78.4.1.tar.bz2"; locale = "dsb"; arch = "linux-x86_64"; - sha256 = "b1b5fad405049cc62784dbb6e938cce6492df3b620c25a0987a594a88d0caaa1"; + sha256 = "5b572c847f9ec76b25c225652c23ecf8c56523ffc3071b437310f0d8f9049b05"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-x86_64/el/thunderbird-78.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/el/thunderbird-78.4.1.tar.bz2"; locale = "el"; arch = "linux-x86_64"; - sha256 = "1bb01c5fa05d3dae7d1216a0b3e01354655e96f728f63b8213d1ac4ca08e5b8e"; + sha256 = "7cad76ea5a07dce6bdd3db78485f83a998ff27037f8ca68f8617659a06910a05"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-x86_64/en-CA/thunderbird-78.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/en-CA/thunderbird-78.4.1.tar.bz2"; locale = "en-CA"; arch = "linux-x86_64"; - sha256 = "cc7280af5ca21c82ae8e4fbcceac117b1b3c2a2e95db418cd60322161eeaa0ba"; + sha256 = "f261b38fbc8d83c20be63015a444644a95f7d8b6584fcfc193145abcc69a4164"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-x86_64/en-GB/thunderbird-78.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/en-GB/thunderbird-78.4.1.tar.bz2"; locale = "en-GB"; arch = "linux-x86_64"; - sha256 = "6bf5112867c3493df18880858e483b684946b657bd10960f55a0e55bc364d8a5"; + sha256 = "5c0c364b1408182c0cbae1c2d05041781e2e4f3a17fb1735d61196c9b647dba4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-x86_64/en-US/thunderbird-78.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/en-US/thunderbird-78.4.1.tar.bz2"; locale = "en-US"; arch = "linux-x86_64"; - sha256 = "24780daa2b17799f263a6c16b770b0e6710d14f7f1f502f4868fe48d81ca8e48"; + sha256 = "a152c3b8c6ad4ba3a92a8a1f909b99599d8c3ded62b57e9721fb333b47f6509d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-x86_64/es-AR/thunderbird-78.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/es-AR/thunderbird-78.4.1.tar.bz2"; locale = "es-AR"; arch = "linux-x86_64"; - sha256 = "ac6e82b950f6cd0d7a964815c58a28f602580813ce29cb33bfcde36205d06def"; + sha256 = "dc06a64e0b20dd174d6158e5d2f393bf6a6907f8f515120220bb2a8480f58d1c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-x86_64/es-ES/thunderbird-78.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/es-ES/thunderbird-78.4.1.tar.bz2"; locale = "es-ES"; arch = "linux-x86_64"; - sha256 = "67a03e3c7b00d5e0953ae9eae031ddb42337e23ff9e65ed7c0b759e1c2fa4426"; + sha256 = "7d3b7ff0ffb9b19f10bd7c2cffb5dbff8216c65c01fd4032ba5b7924c73ce343"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-x86_64/et/thunderbird-78.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/et/thunderbird-78.4.1.tar.bz2"; locale = "et"; arch = "linux-x86_64"; - sha256 = "fe5af4823e15422da39c49c3fed60fe460ad23b7c78f6b4fc85ce247a09cd0a8"; + sha256 = "a9a8e610bc1c696137ee650fa11f2cbf8dece4ba32d1f0961ae697f6433cf1b2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-x86_64/eu/thunderbird-78.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/eu/thunderbird-78.4.1.tar.bz2"; locale = "eu"; arch = "linux-x86_64"; - sha256 = "94699170301daed68a6d8554816c37cc8c51d72fbd1642cc5a066ae4d5a394b2"; + sha256 = "6835e8459b4191cd4bb5ae8011d032d475631e7a532450b98f0b087ed0a80fb6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-x86_64/fa/thunderbird-78.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/fa/thunderbird-78.4.1.tar.bz2"; locale = "fa"; arch = "linux-x86_64"; - sha256 = "fd22c75cb11bf3fe1a3d2faec1cb7a2332131ac62324bffdd51cc8f03e95a372"; + sha256 = "7cfd8681a7ed38364a823881fbb42af8cf33d17bf911e9f5b97dd18102b412f5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-x86_64/fi/thunderbird-78.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/fi/thunderbird-78.4.1.tar.bz2"; locale = "fi"; arch = "linux-x86_64"; - sha256 = "df3632903e77b9eb5fda1ff1d8a155b1f3c4861a8821efeb1fef4d39878a9349"; + sha256 = "8c84662afb60e3dc94eace5a493f7feef6598b78613fe99f195408e4ee2b0a11"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-x86_64/fr/thunderbird-78.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/fr/thunderbird-78.4.1.tar.bz2"; locale = "fr"; arch = "linux-x86_64"; - sha256 = "5100b9facddae8451550fa0a65b9bd345066e7e465916ed3728b40cc9ac06e65"; + sha256 = "24449816c690757b05d1913ff1fa12eed47f316ac13c76a195ae0628c6950da0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-x86_64/fy-NL/thunderbird-78.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/fy-NL/thunderbird-78.4.1.tar.bz2"; locale = "fy-NL"; arch = "linux-x86_64"; - sha256 = "40c7fe9bea5b5edc5a3e62f7d1cf18ae036544c0172954440d036086f90ee119"; + sha256 = "9a0334f032333eda16cdabd5dffb05f5a22edb1dcf4bcd0b47495defd0d9f3dc"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-x86_64/ga-IE/thunderbird-78.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/ga-IE/thunderbird-78.4.1.tar.bz2"; locale = "ga-IE"; arch = "linux-x86_64"; - sha256 = "4ec2f91ba73d3a7ab99d69af2a7d99cfb2280c3872fd4dcd7436ae9362586d06"; + sha256 = "33e5a54e2259984ff29d3394fe936b5af8830e489e0775ff36eace4c6b3dc145"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-x86_64/gd/thunderbird-78.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/gd/thunderbird-78.4.1.tar.bz2"; locale = "gd"; arch = "linux-x86_64"; - sha256 = "f6d168939a0157c2d450c43d818005e3b9a59e8caad5796492e8078947234b29"; + sha256 = "b91c4b3aafa2166cd27c52977711c55aa425f68c5f7cca64be1dd07fd533bc05"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-x86_64/gl/thunderbird-78.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/gl/thunderbird-78.4.1.tar.bz2"; locale = "gl"; arch = "linux-x86_64"; - sha256 = "2fb6b4995f722e82503bf88fbb3b5275faa4d392bfa5832735ac1d40bbe3ee38"; + sha256 = "d1c03b3b92bef4f3c94518981cf99840944c8a36aab7b2cfe3f72f1f0e57e045"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-x86_64/he/thunderbird-78.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/he/thunderbird-78.4.1.tar.bz2"; locale = "he"; arch = "linux-x86_64"; - sha256 = "70f0bf4db60ad4f1656f0aca1575fadce3a697634f60353bc3d63e3336225d2f"; + sha256 = "7fdaf0e83eeb39b66a6d1c2600f2c6f1b69ec4f67dd7b33a39132e838a699f06"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-x86_64/hr/thunderbird-78.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/hr/thunderbird-78.4.1.tar.bz2"; locale = "hr"; arch = "linux-x86_64"; - sha256 = "d37ac64cd63a4cd66fff1bd30ee3643be75cb977581f2182a95c27a16607f3a0"; + sha256 = "4ba99eaa25964bde6108eeab702b096ba50b45d8db7e36f3203b0a71cc1e30cf"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-x86_64/hsb/thunderbird-78.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/hsb/thunderbird-78.4.1.tar.bz2"; locale = "hsb"; arch = "linux-x86_64"; - sha256 = "85e823db225258e9f74e04c61faa89e7c9553445900083f22b7aceb22ef3d901"; + sha256 = "187a5f2b2e1b16fad948356f31b2ac903fe318432d9a3f105055c23d1225d11b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-x86_64/hu/thunderbird-78.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/hu/thunderbird-78.4.1.tar.bz2"; locale = "hu"; arch = "linux-x86_64"; - sha256 = "da897b48a2e4a5a3734016ef18c503864792d5c0943bcb2644c272c1a7c63f16"; + sha256 = "8f6b79692143e6e27cc844985366004d06c8e55184a73477fd20020575947ad8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-x86_64/hy-AM/thunderbird-78.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/hy-AM/thunderbird-78.4.1.tar.bz2"; locale = "hy-AM"; arch = "linux-x86_64"; - sha256 = "dbe1276b14b5864be5fc2de3708ea320d2dcc80eb654e9bad56950f818903484"; + sha256 = "4066683e4a635b163b9b14e1921d834b37a95cee8dd04fc6885094c5e0394dee"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-x86_64/id/thunderbird-78.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/id/thunderbird-78.4.1.tar.bz2"; locale = "id"; arch = "linux-x86_64"; - sha256 = "86c7be9b6385ef437323069a7e2497b3a18a552af9d9c4523789be4ee2e07b22"; + sha256 = "1fed6d3a9a11d303db2f2c6f7a92639b92ca144ce3b45eed4607696ea4617511"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-x86_64/is/thunderbird-78.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/is/thunderbird-78.4.1.tar.bz2"; locale = "is"; arch = "linux-x86_64"; - sha256 = "8e062c75b579d52d1a887d2165bcd3eb1d0c4e435dffc05d0d76d4404dd061eb"; + sha256 = "a627c95d2284b4e828a466865aa19262aa84a1a2267235c3f62d13c52081c580"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-x86_64/it/thunderbird-78.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/it/thunderbird-78.4.1.tar.bz2"; locale = "it"; arch = "linux-x86_64"; - sha256 = "932de1926441066a472d5e68b933fd4035f2e858fdabd4b9d4e71ee6e64202a3"; + sha256 = "6b01e88da702deee95a3a6d526e563e854be7ae13414fed3a2c9cc427e906ffa"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-x86_64/ja/thunderbird-78.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/ja/thunderbird-78.4.1.tar.bz2"; locale = "ja"; arch = "linux-x86_64"; - sha256 = "2bacdb192fda85f10f747a8c8a2ef3bc60345075c1ba33947594fcc66eb35e5a"; + sha256 = "3b63cf4c45945f4a40159a417ed217b77128905de82812fe2165c0c5f66410a7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-x86_64/ka/thunderbird-78.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/ka/thunderbird-78.4.1.tar.bz2"; locale = "ka"; arch = "linux-x86_64"; - sha256 = "110d71951f0f3235ab63c02e8d979b2777de4abd4906409b96107fac1f6d7466"; + sha256 = "c9d11ae298691f2e302078f865b047b1c2b568ae763495fbfe2f2d4f04a9ef6a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-x86_64/kab/thunderbird-78.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/kab/thunderbird-78.4.1.tar.bz2"; locale = "kab"; arch = "linux-x86_64"; - sha256 = "f765a32900f0100f03aac4cdce7f33abb44e53911011cef6f6db8f9dddd11124"; + sha256 = "b6367ccb74b2ced8708ca9f4c2c06aeaaf4f3bcba0b2b2fdf2c552aa10fcfc03"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-x86_64/kk/thunderbird-78.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/kk/thunderbird-78.4.1.tar.bz2"; locale = "kk"; arch = "linux-x86_64"; - sha256 = "9af2ab317e0736e0dbab419f5061a6a5c83e521d15f38911455a2d57f6bae945"; + sha256 = "99ece9975a3981fa33887d3b5d60cd6874e1dab7c51d830dc0d13c28c103ca79"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-x86_64/ko/thunderbird-78.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/ko/thunderbird-78.4.1.tar.bz2"; locale = "ko"; arch = "linux-x86_64"; - sha256 = "06669829857f1c49acf7a58f6a7f0e5a4d8e4ce93703cde0d36525f5bb9697cb"; + sha256 = "d81c844cbd490e5eeeb2739a9b040062baf3bbdf13ddfbceb59b5630019b935d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-x86_64/lt/thunderbird-78.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/lt/thunderbird-78.4.1.tar.bz2"; locale = "lt"; arch = "linux-x86_64"; - sha256 = "f85e547d17b6bae2597d4b780b14f9076d70dc7c63ae85427b54c01f0c559b72"; + sha256 = "56b5813a5b0debfe90fa2a20fb9a13ea210e2eed37f180f3e23e851f871241e2"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-x86_64/ms/thunderbird-78.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/ms/thunderbird-78.4.1.tar.bz2"; locale = "ms"; arch = "linux-x86_64"; - sha256 = "e21639c89686480be875a0514c1b1d99fefca6b79da80a5406f37a63e316348d"; + sha256 = "8dc3f341a69b9ef458c1203ff15779beecf3db2dede1cd8740ee19a9552f22f3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-x86_64/nb-NO/thunderbird-78.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/nb-NO/thunderbird-78.4.1.tar.bz2"; locale = "nb-NO"; arch = "linux-x86_64"; - sha256 = "652d43cabbab6ab158b3d3ab70cf83d8ed3ae3524232aa340d17c248dc5fa869"; + sha256 = "0fe431d3773de39431cd777cf301d2c3d8074dd41596bf6a6f1bef96870413b4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-x86_64/nl/thunderbird-78.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/nl/thunderbird-78.4.1.tar.bz2"; locale = "nl"; arch = "linux-x86_64"; - sha256 = "2c5f173545ef0ddd0c93c921931850e9a7f457575188a91d243245236fe09384"; + sha256 = "4127bdb6338210d9928fc84838a57cfb731aa3254aa5427471deca00bb12beca"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-x86_64/nn-NO/thunderbird-78.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/nn-NO/thunderbird-78.4.1.tar.bz2"; locale = "nn-NO"; arch = "linux-x86_64"; - sha256 = "f89082f26cb871befb4f8c82c31a9d1cdd5587d20ad3a9a1e78515f947ce4271"; + sha256 = "cf0c6d67115ee36b80010d93d50991a544af332ca19f1ed1199f49c7dd125049"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-x86_64/pa-IN/thunderbird-78.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/pa-IN/thunderbird-78.4.1.tar.bz2"; locale = "pa-IN"; arch = "linux-x86_64"; - sha256 = "75d7f3bbe88ef2bab33e62834a765f814f75a28e2277afef2517a91be98201ba"; + sha256 = "283c2be7f9bc0aa3d505f1838f1c03721a4b956870ac2b1e762b966e87767ce0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-x86_64/pl/thunderbird-78.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/pl/thunderbird-78.4.1.tar.bz2"; locale = "pl"; arch = "linux-x86_64"; - sha256 = "c016668ef5f80043eb3e3eff6c8d2327adc3ed86375e81318fb8a4a9fc4689bb"; + sha256 = "4c07e4500ad4c0d698942e3c47ced3bbd6142e4a70292629ebbe53ef5f1816f9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-x86_64/pt-BR/thunderbird-78.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/pt-BR/thunderbird-78.4.1.tar.bz2"; locale = "pt-BR"; arch = "linux-x86_64"; - sha256 = "637a97f3b584e315ebec350a08fa54d17cde8825385736a2bc4ca1937dd552f3"; + sha256 = "c6ace3452d1720681e668da50d16811286c1e73021bd06ab9b538c6f6fc5fda6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-x86_64/pt-PT/thunderbird-78.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/pt-PT/thunderbird-78.4.1.tar.bz2"; locale = "pt-PT"; arch = "linux-x86_64"; - sha256 = "9719af4fc96ecc0e01f8ad4829f8a94004cdeb518d10f12deb41073f6b0d6f32"; + sha256 = "b9ab4d38b271e2987b5e425a277042dc149794cf461283114553133e7fed5f06"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-x86_64/rm/thunderbird-78.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/rm/thunderbird-78.4.1.tar.bz2"; locale = "rm"; arch = "linux-x86_64"; - sha256 = "d3467e689f512a3032f9dd8b022af58bf7d61dcdcb1c69317629f0c0b37aa2d4"; + sha256 = "50fc69135b789b2bb5d8008292d3fc25f1a0a30bba35c6e24ddfeabe55231407"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-x86_64/ro/thunderbird-78.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/ro/thunderbird-78.4.1.tar.bz2"; locale = "ro"; arch = "linux-x86_64"; - sha256 = "25985053e562792ffdc5757f201d6171cd7f30199eae7ae2f50cf39b5090feeb"; + sha256 = "1e050b33a942dc815e739c57944a0d705982e18e74637172b0366a9b06916f7b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-x86_64/ru/thunderbird-78.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/ru/thunderbird-78.4.1.tar.bz2"; locale = "ru"; arch = "linux-x86_64"; - sha256 = "2c0769be95e0a21471197a1f1b979bd36b9793f4242f7ac329c7fe0fe88fc5a3"; + sha256 = "c295bda57db84e07f28affa4201c4f612478efce733cb9c69962f6d7a797218b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-x86_64/si/thunderbird-78.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/si/thunderbird-78.4.1.tar.bz2"; locale = "si"; arch = "linux-x86_64"; - sha256 = "2a6d7e47e92166ac1636495e5cbd1849285576cdd812d650767130730002aa6c"; + sha256 = "63dc83cfab8be94893ca6a0d60e448d14db1afcae55192149a882456dca77e9a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-x86_64/sk/thunderbird-78.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/sk/thunderbird-78.4.1.tar.bz2"; locale = "sk"; arch = "linux-x86_64"; - sha256 = "5d0de7356dd46a9ac1cb98254167fa7be34b6897e5ea69ca093e71a850d53363"; + sha256 = "5ab5ea76649582ddf10fa77bbb95040d157883e0905df72f5bc0ae79167d97be"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-x86_64/sl/thunderbird-78.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/sl/thunderbird-78.4.1.tar.bz2"; locale = "sl"; arch = "linux-x86_64"; - sha256 = "8c7e69e7fbe49ba34277e8cb7cbf45eeade086eb460a92e243698824cdf3d5ce"; + sha256 = "da3f8a30797386bc7c9ba135ba360cee01143bc76a2315e7a2223bab90e2283e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-x86_64/sq/thunderbird-78.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/sq/thunderbird-78.4.1.tar.bz2"; locale = "sq"; arch = "linux-x86_64"; - sha256 = "95cfe7b956bb590c790c156f22ac3c5cdc1dd3e4d7b64422583597fc9ccd8c28"; + sha256 = "f2f9639c4b4dc4bfba476aa92814fee65ecd3fca27652177614d1107e4200246"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-x86_64/sr/thunderbird-78.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/sr/thunderbird-78.4.1.tar.bz2"; locale = "sr"; arch = "linux-x86_64"; - sha256 = "82573f011da92f7d93d6cf0a700c9eae31a46c6d09671afa63afa533f063e5bd"; + sha256 = "3bcad0c845e4481a22c1b330b6cd94c3c6fc46c33597ce5af0594368579a8260"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-x86_64/sv-SE/thunderbird-78.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/sv-SE/thunderbird-78.4.1.tar.bz2"; locale = "sv-SE"; arch = "linux-x86_64"; - sha256 = "5fda7b6e8095bc456e684887a82cb2adcc14fdfdd9f14731f2bdf2789eac4930"; + sha256 = "9b09d4ab71000429c5015dd8a0642cfe0eeeaa785d2cac6e876b1cd6aadaeb44"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-x86_64/th/thunderbird-78.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/th/thunderbird-78.4.1.tar.bz2"; locale = "th"; arch = "linux-x86_64"; - sha256 = "0e33b43cb7fdb2ae4c30480e264e00651181f2034af42d7a3ac2bfb57c148896"; + sha256 = "b33e42f0271ee84a581a737513197d5f036695706b19697a53000834c199c75f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-x86_64/tr/thunderbird-78.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/tr/thunderbird-78.4.1.tar.bz2"; locale = "tr"; arch = "linux-x86_64"; - sha256 = "05019602190a28ecefbdc5100b40409d3d6288f076d589136724d07e111bf324"; + sha256 = "f419ed9f0f06575da2f89486d830ab7fd2b439dcfcac92f1b31c573901e7b9ea"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-x86_64/uk/thunderbird-78.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/uk/thunderbird-78.4.1.tar.bz2"; locale = "uk"; arch = "linux-x86_64"; - sha256 = "2940500895c734857b258550b85f846e9eb5be68b6faaf808ed7a9867c423d14"; + sha256 = "bcecec66a6ef8b928da2aa5d52d89f4f1587d4e45bf0e836b71912b0e5a43f7c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-x86_64/uz/thunderbird-78.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/uz/thunderbird-78.4.1.tar.bz2"; locale = "uz"; arch = "linux-x86_64"; - sha256 = "de82b265c6e19495abc70c36f377cef705137f352da0aa7d01aa874e2a9f1f70"; + sha256 = "2b33f40b9da386e61f3bdcacd9c16fc06dac18d2b36865292700744dfbe2da25"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-x86_64/vi/thunderbird-78.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/vi/thunderbird-78.4.1.tar.bz2"; locale = "vi"; arch = "linux-x86_64"; - sha256 = "cf02606c0eff0b941c1c2ef654e250d5d6a8cb7deda752468e779af1b616c0e1"; + sha256 = "b5d005c45221c41e1e81234b755f6a9d380220cc03f43012c40440a0378c19e0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-x86_64/zh-CN/thunderbird-78.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/zh-CN/thunderbird-78.4.1.tar.bz2"; locale = "zh-CN"; arch = "linux-x86_64"; - sha256 = "54a1a869a746ff3af8d5ec27b11f1d3a0efeb49480043fbf776e9646b5be944d"; + sha256 = "c08765cc8562cce08b4cda04123cd8672f5abb130b597f36f4c143d74b09b9b3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-x86_64/zh-TW/thunderbird-78.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-x86_64/zh-TW/thunderbird-78.4.1.tar.bz2"; locale = "zh-TW"; arch = "linux-x86_64"; - sha256 = "0c9530adcb5029ae570a8d25d790f243c0a3d6ad7701ed071fad326d3718bea3"; + sha256 = "56f84ea43a5288a6cd34f8de5f69dde05737474f11c70d638981ef2ff4ea5bfa"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-i686/af/thunderbird-78.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/af/thunderbird-78.4.1.tar.bz2"; locale = "af"; arch = "linux-i686"; - sha256 = "29b39333cfd9919830cecf1b0043faf4dd829c36554fdcbcff6a8dbf11882060"; + sha256 = "95384cf3d0ab6ad8d3bb133e8ff7c1881523c0f7be840c5ab6016325ebc7f9ff"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-i686/ar/thunderbird-78.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/ar/thunderbird-78.4.1.tar.bz2"; locale = "ar"; arch = "linux-i686"; - sha256 = "49896345d391f22f262592e055b2bc5fc1852d5fe1f9812392ef09b9f329afee"; + sha256 = "c2cf87579a092bec69042b35743574872b8b791d54628c35c28d44c1dc605b6b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-i686/ast/thunderbird-78.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/ast/thunderbird-78.4.1.tar.bz2"; locale = "ast"; arch = "linux-i686"; - sha256 = "71a952590eec188661f8cf95f62efb2c9f2465aadec361c990bb62481938b128"; + sha256 = "127ce24b2c06606e9567e2106ba5cb9628d8bda10620b01cbfe60bc287977c94"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-i686/be/thunderbird-78.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/be/thunderbird-78.4.1.tar.bz2"; locale = "be"; arch = "linux-i686"; - sha256 = "d99a81043f6c158376c960d0dbd60f6d2e73ee1e6a015aee55ff42786e58fc21"; + sha256 = "e8acd7cc25f91af91caee7487598cf1f60512864cf1fee714d2289a65f0cc195"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-i686/bg/thunderbird-78.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/bg/thunderbird-78.4.1.tar.bz2"; locale = "bg"; arch = "linux-i686"; - sha256 = "1226b669b2b2e7c890a1de0a628e663069c2279369587a8b819756584be2ba0d"; + sha256 = "461e4ec0b0f3dcb78426a99f0b8dc32b14dbc561b89e8d422433f5360425448d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-i686/br/thunderbird-78.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/br/thunderbird-78.4.1.tar.bz2"; locale = "br"; arch = "linux-i686"; - sha256 = "2f656a4269f37dd8513cf2f0b799d97225ffe55b00e778dbeedac66bf7b00d47"; + sha256 = "ba3902a457d0570d3eeaa63cc83a67e35532e547127b71f38781158bc3cc5e60"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-i686/ca/thunderbird-78.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/ca/thunderbird-78.4.1.tar.bz2"; locale = "ca"; arch = "linux-i686"; - sha256 = "34dcc816776f2da32bf7412a802a8d3d7a0b31afcfb1811c617f1295ced05adc"; + sha256 = "609de3623c6f4075bedee741533843f6f9fd1afc5933fe3a8709f5c16c7d7bc5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-i686/cak/thunderbird-78.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/cak/thunderbird-78.4.1.tar.bz2"; locale = "cak"; arch = "linux-i686"; - sha256 = "f9fb448edc5238b69fe3c08c665a30320e5662c1df78101ba4807d371a6a15d4"; + sha256 = "4a5aa707eca53cf5490189a09d222abaa8290ea3366d4bf081273c23e89b3fc0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-i686/cs/thunderbird-78.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/cs/thunderbird-78.4.1.tar.bz2"; locale = "cs"; arch = "linux-i686"; - sha256 = "156c36781f43fbaa3eb5d1d32ca7d6b3c9573261757dc9c78e8cf0be24a6c717"; + sha256 = "0450c73284b274af21f3f0c4c21842e11fa2a86fcb38f96332c1ca8984149c62"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-i686/cy/thunderbird-78.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/cy/thunderbird-78.4.1.tar.bz2"; locale = "cy"; arch = "linux-i686"; - sha256 = "0e48e453cddf00929e189546f0dd478e273dcd8bc891fe875f553825f0b4fcc4"; + sha256 = "5686316ec53a76dab272934dbd274a47802c5c31f2ae8719bcf85c22e12cc3f7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-i686/da/thunderbird-78.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/da/thunderbird-78.4.1.tar.bz2"; locale = "da"; arch = "linux-i686"; - sha256 = "e614911f79a2a86055e6914aa0f4922979eebe4229b26b18f6ff31cc6bb49c89"; + sha256 = "2025f5946989905fd197fe5bf6c51160e7c9d281d6cfd220ea3ee0393cc54ca0"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-i686/de/thunderbird-78.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/de/thunderbird-78.4.1.tar.bz2"; locale = "de"; arch = "linux-i686"; - sha256 = "a8c916da07945657672b5b71a722485fa7117dd912896bc9eec8b9b82dfcc48b"; + sha256 = "906e8a5de0aa12b496f4d4447df25432b11c88d79b7ab4a55291a9d65434aa03"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-i686/dsb/thunderbird-78.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/dsb/thunderbird-78.4.1.tar.bz2"; locale = "dsb"; arch = "linux-i686"; - sha256 = "0b3ac7ec984e26b66cd3c5df733c3cac6b83f4388cd65344dc40310651798c05"; + sha256 = "d6bfb2b790d8391344916515d1cc6ca2eb68a3e58934cacba14e77788aec6b09"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-i686/el/thunderbird-78.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/el/thunderbird-78.4.1.tar.bz2"; locale = "el"; arch = "linux-i686"; - sha256 = "dbfd90c1810dcad51bda6a7d2de6a132f428a5c6151c107cd09a98a48b2ce98d"; + sha256 = "5f96345a945697326b24fcd73a96fa2f49edb66b02f4c23b6d392fad87935e08"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-i686/en-CA/thunderbird-78.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/en-CA/thunderbird-78.4.1.tar.bz2"; locale = "en-CA"; arch = "linux-i686"; - sha256 = "3ccd8193d486596ebd70e3e1803563a3a8d59ca25c29eeaaeab78ab78cb0e72c"; + sha256 = "b57e44fd16e33b178778a60f0bd47519585a3e648b3b621f1fd693836c5fb598"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-i686/en-GB/thunderbird-78.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/en-GB/thunderbird-78.4.1.tar.bz2"; locale = "en-GB"; arch = "linux-i686"; - sha256 = "6d74ef15e0196a2b07302f40bc3992acc8ffc94ff7d90433a00d766a0840226a"; + sha256 = "6f656dcbd7aaab5995beb11a9847e32f8820199272e2f9ce27583cd3d7e50a76"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-i686/en-US/thunderbird-78.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/en-US/thunderbird-78.4.1.tar.bz2"; locale = "en-US"; arch = "linux-i686"; - sha256 = "718e57f9b1d7f1ca5c52dfa8aa109f8cdda279cfb6dea649add651b6637fc6bc"; + sha256 = "8c6bccc757df947bed74a3f7448a3885932a4f6c21d24ab6b5c7a94ab83ebae5"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-i686/es-AR/thunderbird-78.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/es-AR/thunderbird-78.4.1.tar.bz2"; locale = "es-AR"; arch = "linux-i686"; - sha256 = "26dea055b9c6ea2b8f7e15b0c93cd3d880c83bd1c9f23f8d572a92659740986a"; + sha256 = "55bbc629ceadf359e0ad05e763a31479f6c57c38f372e55812b028681a5ff32a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-i686/es-ES/thunderbird-78.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/es-ES/thunderbird-78.4.1.tar.bz2"; locale = "es-ES"; arch = "linux-i686"; - sha256 = "90d115cb34ae852332e5bd792067c66f1bad920721da68f59b38a2a86a8a0105"; + sha256 = "bf30dd8882b2b35bfaa62a6c4b40a823333476128a6d5dd3e3d2c8eb16303b9a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-i686/et/thunderbird-78.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/et/thunderbird-78.4.1.tar.bz2"; locale = "et"; arch = "linux-i686"; - sha256 = "a82aed816b1ea065e21120a8e6e0345c477b90f9c672c04cee9d15ffed85ef28"; + sha256 = "5b977eab7f203e230d6a03b36afebdb32c481f1eb8129e454977791469ed5651"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-i686/eu/thunderbird-78.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/eu/thunderbird-78.4.1.tar.bz2"; locale = "eu"; arch = "linux-i686"; - sha256 = "7f1bf5742159e15fd566827db713421778262377a8da9ac269fc6af635f1b20b"; + sha256 = "f2d606a6f825640c0f344cf470d87a1dea5fc6ff538239ce25c3d7c9fc76237d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-i686/fa/thunderbird-78.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/fa/thunderbird-78.4.1.tar.bz2"; locale = "fa"; arch = "linux-i686"; - sha256 = "25d97499486a7c3d38c4686f7ff5daf930694f6614d3d556af85c3cb99193403"; + sha256 = "95d0d3d1b456c035cc6ed09df970e9e772a71af3703f05e9388e844d7f80edab"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-i686/fi/thunderbird-78.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/fi/thunderbird-78.4.1.tar.bz2"; locale = "fi"; arch = "linux-i686"; - sha256 = "5531179571b0306ae2c1d5f4af40047ea9a5fdf65137bc7c255ee7f5dae2bab6"; + sha256 = "e0be2532774bbe017a6091d7e1ec79901f692c39e04e01fe4094f7c8179fbaf4"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-i686/fr/thunderbird-78.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/fr/thunderbird-78.4.1.tar.bz2"; locale = "fr"; arch = "linux-i686"; - sha256 = "12e33246e17aebac0547801d5d4e23db0523ff260b5345b8f0a19fc5cf44f2b5"; + sha256 = "48cc16a61958160f369b32e8a0dcd2979ee65e18efe3d1dd3a4af1109842718b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-i686/fy-NL/thunderbird-78.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/fy-NL/thunderbird-78.4.1.tar.bz2"; locale = "fy-NL"; arch = "linux-i686"; - sha256 = "50c6dff9614b113ea57d4c75dd0768a8524743a7b9f462f84f27f10daadbc1f5"; + sha256 = "386d0a2ed01b158f0fe18eb6820ff9a17fbbea61241eaf873782271ac84eb103"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-i686/ga-IE/thunderbird-78.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/ga-IE/thunderbird-78.4.1.tar.bz2"; locale = "ga-IE"; arch = "linux-i686"; - sha256 = "6c6229aa064098560b13369a0d11133156d47193a8f8b2fdc241fbcba3cb3f9c"; + sha256 = "c0c15410e6812e8652181ab347b3fe60fdce3b5b9958d54ef3f96ecc46a4d344"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-i686/gd/thunderbird-78.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/gd/thunderbird-78.4.1.tar.bz2"; locale = "gd"; arch = "linux-i686"; - sha256 = "6e5f686d98b02bc97e14f5788eac7b93e5e2652e9feaab0906cb026a883b1485"; + sha256 = "3989f0c0f87ebfca3e4cfad0ac9ca2964791ab8f1163f1bec340444ae4a72a7b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-i686/gl/thunderbird-78.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/gl/thunderbird-78.4.1.tar.bz2"; locale = "gl"; arch = "linux-i686"; - sha256 = "2ccde2411bb2c3e4b492b4cacbe8d756dc22c2164fbe7364bc2381c1ff582f75"; + sha256 = "eb1b58c93e492a79f92660909e671ee7ec504701b8e074d3dc6f3d3fe3619660"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-i686/he/thunderbird-78.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/he/thunderbird-78.4.1.tar.bz2"; locale = "he"; arch = "linux-i686"; - sha256 = "30fe226741e47f86f07c5acbb8fe3d2aa2fb7102fb4743189f12612c817415c1"; + sha256 = "f584e117ba4fbfbb7d2c28b68377a88aad87929657141adac5ce960bcf5f4fa3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-i686/hr/thunderbird-78.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/hr/thunderbird-78.4.1.tar.bz2"; locale = "hr"; arch = "linux-i686"; - sha256 = "4230396816f72ce2784bab21fa2fe731ea378f1ceeace609e0423e2b5e7ea83e"; + sha256 = "633eab2f8ac99426dd85b614f04d96509125f0799c187305b7678496d9ceff0f"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-i686/hsb/thunderbird-78.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/hsb/thunderbird-78.4.1.tar.bz2"; locale = "hsb"; arch = "linux-i686"; - sha256 = "155a4e98c597f7876ab44276ab8814ab185a5a59e1fdb743260bef2f78b27e4a"; + sha256 = "80e4b98bbc9874de9b4c8e35633f6eea7b5707cfc4943df7264cf0bbfba49d99"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-i686/hu/thunderbird-78.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/hu/thunderbird-78.4.1.tar.bz2"; locale = "hu"; arch = "linux-i686"; - sha256 = "bb0b46dc74b926e9d13c4bd8b0371d730ce03aeffa5c41689eeb797ae1ce4382"; + sha256 = "5a9339a876a7e0dced6769a99a948329f6eaa400acb6920a24d06695120f682a"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-i686/hy-AM/thunderbird-78.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/hy-AM/thunderbird-78.4.1.tar.bz2"; locale = "hy-AM"; arch = "linux-i686"; - sha256 = "7ee0ee79ac2143fe3ce8930c3916f201910d6d7a40437fdc49a8c617d49871d8"; + sha256 = "286542d67a76a6e8f0c34e7aca9c23c8922bf85f8be77c913285e208f8b195a7"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-i686/id/thunderbird-78.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/id/thunderbird-78.4.1.tar.bz2"; locale = "id"; arch = "linux-i686"; - sha256 = "e1a4072dfdccfdf35401e9a58e77cbff2277703ff2c78a52fc0df801bca8f91a"; + sha256 = "930cbbe1520c544a25cfbdf8d10b4e6ae19a812c8a20ce51053ba0d5fc2b4b24"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-i686/is/thunderbird-78.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/is/thunderbird-78.4.1.tar.bz2"; locale = "is"; arch = "linux-i686"; - sha256 = "d4d63add23724c58fd92d992165748f7002540f73df591914540f6361dc0089b"; + sha256 = "7fca3c4c9d3a309ec182d1486438973741fe2f1e39afd3ccb769256657db20a6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-i686/it/thunderbird-78.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/it/thunderbird-78.4.1.tar.bz2"; locale = "it"; arch = "linux-i686"; - sha256 = "28ec9beacfb8b27b80e1f1deba83d81324a2d3baa0d9572a41a94f920c8c60aa"; + sha256 = "3b44f63975cfe7460f3eadd9f71f13db9ded5d9e5622ec322f556692f979434b"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-i686/ja/thunderbird-78.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/ja/thunderbird-78.4.1.tar.bz2"; locale = "ja"; arch = "linux-i686"; - sha256 = "ad1f9e091cfd66683964f8d683653b3134068174daf24fe061aad00d0c864176"; + sha256 = "1284e52cda834b1ef9b5ac6a1dc29858f6e1519d0fd47d330744c0d294338650"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-i686/ka/thunderbird-78.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/ka/thunderbird-78.4.1.tar.bz2"; locale = "ka"; arch = "linux-i686"; - sha256 = "9074e7b2eb10943f6b87e79be9ec9ae706eeb4300c85ffe456bb34f11798b81a"; + sha256 = "b12a79e20fce3db2541dcde61e04206e82530d1d79b58637bfcede87294fd801"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-i686/kab/thunderbird-78.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/kab/thunderbird-78.4.1.tar.bz2"; locale = "kab"; arch = "linux-i686"; - sha256 = "7b7d17a26dc9914d46de8959c08d56ed92b263d3eae383ca71d45a1b37a9650f"; + sha256 = "9766eab276e77b0e33ad7ecbf8f26b84aa2a079a4fc9e4dfc992c41074513e40"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-i686/kk/thunderbird-78.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/kk/thunderbird-78.4.1.tar.bz2"; locale = "kk"; arch = "linux-i686"; - sha256 = "b38db92efa1b4bc1067eeee7eaf7307d6e86e6c6d3f4dd1b81496768c981d5af"; + sha256 = "aec202db7c28ae69c9f7684a2e4f30a16ab29ec983aacb32bbe4b5bd31b76e94"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-i686/ko/thunderbird-78.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/ko/thunderbird-78.4.1.tar.bz2"; locale = "ko"; arch = "linux-i686"; - sha256 = "951a2e6e2cae525618646f8f054d127b32a535028930eeb3be7dfd2720c4ccea"; + sha256 = "b0e553c14925413461a87f1d81591bfa4e2ce2c5ad87e8ec609fef76ba4f17d8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-i686/lt/thunderbird-78.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/lt/thunderbird-78.4.1.tar.bz2"; locale = "lt"; arch = "linux-i686"; - sha256 = "5e76866c25f63aa283e54c871e1014a10e4ecdb8182ca6bc3ac1d16a344ae8f8"; + sha256 = "6036247e3025c2b513762577e7de1d1eda050572f674c31391e583ccd16e80f8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-i686/ms/thunderbird-78.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/ms/thunderbird-78.4.1.tar.bz2"; locale = "ms"; arch = "linux-i686"; - sha256 = "74e28f4ed81a233bd8aa721515667b31e83f7a6d6bad0aaef421f1f1e4b0c4c9"; + sha256 = "0852cb745130e22af327e2ce39249751ed482c8216c18f4545bd294f4afb4e29"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-i686/nb-NO/thunderbird-78.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/nb-NO/thunderbird-78.4.1.tar.bz2"; locale = "nb-NO"; arch = "linux-i686"; - sha256 = "4cfa6097b0879de04314773d96d3e03aee3b7e1680e97cee3dbb6fca9e4010ca"; + sha256 = "eebec58d3a20956894711266715ce5a4afcfd44b5eb7b334dc0c22068fbb10a6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-i686/nl/thunderbird-78.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/nl/thunderbird-78.4.1.tar.bz2"; locale = "nl"; arch = "linux-i686"; - sha256 = "e097065367e8bcaa331803c779ff71e43dfa7dcc5b516fd5d73f60b1c614c7a0"; + sha256 = "0c6d35960d89681087bcfbf403ff727f53ba2e67de9c69d04f96b68447b616d8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-i686/nn-NO/thunderbird-78.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/nn-NO/thunderbird-78.4.1.tar.bz2"; locale = "nn-NO"; arch = "linux-i686"; - sha256 = "e3bc6a3754f13db3dc5f70c3fd9b70b4250be494a47c7d20546dccb57b914ae5"; + sha256 = "b761b921ba2e604dcde7ac0e03a83ef29a3311309cb95bc39801b8bcfd80ef98"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-i686/pa-IN/thunderbird-78.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/pa-IN/thunderbird-78.4.1.tar.bz2"; locale = "pa-IN"; arch = "linux-i686"; - sha256 = "80a785335bd49d5d0e8c669a7d548c0e077c413c184eb50133aaf5790fe1148a"; + sha256 = "fa350ad64a3ff760a6e2cc6ac6b6ad1d6b9ad300b6c3420477148152bc207499"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-i686/pl/thunderbird-78.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/pl/thunderbird-78.4.1.tar.bz2"; locale = "pl"; arch = "linux-i686"; - sha256 = "bc20f221babef7c3a3992d57ab5a3afcad12faa0263ff8978c96a1267af54c28"; + sha256 = "8b187d44bc1364dc76258ff3452610483b2ab3d060c9de43e47c25fd3103c5d9"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-i686/pt-BR/thunderbird-78.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/pt-BR/thunderbird-78.4.1.tar.bz2"; locale = "pt-BR"; arch = "linux-i686"; - sha256 = "6dd040a2046c418d51bd7103d93a50b58e3345de5ed0c8917c0a8a8c7bf87c7c"; + sha256 = "1ff199f91e49d72bd9821bfe3e2d33cb4a750a6c46aaf16a80554c195694ed43"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-i686/pt-PT/thunderbird-78.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/pt-PT/thunderbird-78.4.1.tar.bz2"; locale = "pt-PT"; arch = "linux-i686"; - sha256 = "45f67266e6af96dccae07d6db4f5d62c3d6d26e1a76e4951f08591c664122359"; + sha256 = "098043202612b362a16353c84a5b9e662331c2311679357592b5a77a6690b68d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-i686/rm/thunderbird-78.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/rm/thunderbird-78.4.1.tar.bz2"; locale = "rm"; arch = "linux-i686"; - sha256 = "1d53a7290332375212c0d58af23265d59502bce1a6a4629b56bc86d048be65a9"; + sha256 = "ab9bb22e53da48744885634a14886ddb23dd5ccab376e5323824daa3f22ae0cf"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-i686/ro/thunderbird-78.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/ro/thunderbird-78.4.1.tar.bz2"; locale = "ro"; arch = "linux-i686"; - sha256 = "de3e5496ce5b8c4dff6fcbcf2b8a47b0c81d026fb5334e2668b8f9fc293c5216"; + sha256 = "fb3e61830c5693c7f3b84eb4e3c60ff97324c5654352008aabbe9f16ea40cb0e"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-i686/ru/thunderbird-78.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/ru/thunderbird-78.4.1.tar.bz2"; locale = "ru"; arch = "linux-i686"; - sha256 = "838b9a02684541ef7df67a23b9966282ff9d8b12b64dfcbcfea8e8381b24951a"; + sha256 = "f9fceef81a605ebc66fd90e2759205c4eb7160095312579eb7543b4293dd7a7d"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-i686/si/thunderbird-78.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/si/thunderbird-78.4.1.tar.bz2"; locale = "si"; arch = "linux-i686"; - sha256 = "202f815bdf7538d50f4770e601d10c8a1ffddb042a3c7dfd1a1b65e9b5dc5ec6"; + sha256 = "0903c3d1bf790c5c10167839e3bc60d80a23e4230895703f7c931856cb617038"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-i686/sk/thunderbird-78.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/sk/thunderbird-78.4.1.tar.bz2"; locale = "sk"; arch = "linux-i686"; - sha256 = "44c5aa3723919798493e7f43c927ac48891eecf94a69c79b86be107984e9e068"; + sha256 = "2018e5685fbcb5c2cc8925be39b04f6d98347cb59446af62846378818d6435f6"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-i686/sl/thunderbird-78.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/sl/thunderbird-78.4.1.tar.bz2"; locale = "sl"; arch = "linux-i686"; - sha256 = "2d5125d9625f916788265db46ee1fb47ace3b6099dae26ecb734aecf36160949"; + sha256 = "d20b13b5caa2f5c9c431f3e69095f094800fa520b3a5a57c27a4c9c565961fb8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-i686/sq/thunderbird-78.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/sq/thunderbird-78.4.1.tar.bz2"; locale = "sq"; arch = "linux-i686"; - sha256 = "2aa337b0fd8ccfe86feadef605ca863499f21c3ca7f194121064fc060d5a3de7"; + sha256 = "164041c3958f57f90d17fe1457205a420f326c17e88da0197732435cf6a5dfca"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-i686/sr/thunderbird-78.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/sr/thunderbird-78.4.1.tar.bz2"; locale = "sr"; arch = "linux-i686"; - sha256 = "fe690670c6702ed63684eac68a3f3f29f12bd27af7d34c63af768e0362a1eb11"; + sha256 = "8ffcd2dea1b4980519220a27346b5c0fa955b89580836c38711c21c8eb7d26c8"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-i686/sv-SE/thunderbird-78.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/sv-SE/thunderbird-78.4.1.tar.bz2"; locale = "sv-SE"; arch = "linux-i686"; - sha256 = "74525ce44ca330e8fd29785842992c62cf3b5494675ec9a8148ea14d945fcaae"; + sha256 = "83536011e7bfe2e7a0a760ed879e041b4caa3ee27e95829331faefd29e8deebb"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-i686/th/thunderbird-78.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/th/thunderbird-78.4.1.tar.bz2"; locale = "th"; arch = "linux-i686"; - sha256 = "0503e2ed79dae95302bf2d9d8055589ed1ca511c16c35a9b84445548a7a306d4"; + sha256 = "13be237b698dc9b468af7a2b8ff062118421a7b798771f1db4f82bcb1098f83c"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-i686/tr/thunderbird-78.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/tr/thunderbird-78.4.1.tar.bz2"; locale = "tr"; arch = "linux-i686"; - sha256 = "c4b14f4f22549c66f5f445a2ad5826d0e90332c9d76783851078625245625bbb"; + sha256 = "c70d085f6ceed58e7ea55ab01d121627a55df2f5e961ef160f4965db941660b3"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-i686/uk/thunderbird-78.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/uk/thunderbird-78.4.1.tar.bz2"; locale = "uk"; arch = "linux-i686"; - sha256 = "cf06114027f9bf14ef506fe37e6a7ef6a1cbdb201cde061a754c82d9b3ef0c39"; + sha256 = "c1b7b0efe7af03a488c80020247e2d8038d6dffa313188083bb75c1bc09c35fc"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-i686/uz/thunderbird-78.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/uz/thunderbird-78.4.1.tar.bz2"; locale = "uz"; arch = "linux-i686"; - sha256 = "c805d88694b105412f05dd840e038edfef90b4a48b5a79b0bac5b5575d50a14a"; + sha256 = "f4b8d20603c5e1dcc72760623803fc4cb34fffffd7b394c1998b860b5e3bc129"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-i686/vi/thunderbird-78.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/vi/thunderbird-78.4.1.tar.bz2"; locale = "vi"; arch = "linux-i686"; - sha256 = "ca30574d981964eed7c3a100dd76f90c518a24d7dcde74f0790ede4a0a8d3285"; + sha256 = "6d9d7885ba742ae28766ed98e64aa59892ffb51ad67eb9bc47d5a3974b8a7f50"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-i686/zh-CN/thunderbird-78.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/zh-CN/thunderbird-78.4.1.tar.bz2"; locale = "zh-CN"; arch = "linux-i686"; - sha256 = "6cb1566d330e36b03e86bcfe96ad887fee511ba314167d235facba6c47871688"; + sha256 = "e47c2e9b66c99c8ba02c60f739d31ea2d679cdc4d6f1f407257ef3372cabf364"; } - { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.0/linux-i686/zh-TW/thunderbird-78.4.0.tar.bz2"; + { url = "http://archive.mozilla.org/pub/thunderbird/releases/78.4.1/linux-i686/zh-TW/thunderbird-78.4.1.tar.bz2"; locale = "zh-TW"; arch = "linux-i686"; - sha256 = "7af0d92565a54bef6c962dd8b9b100198e2cac8d47ede749bade87c30d5ee37b"; + sha256 = "1cbab249ae670a204e464a9082365967a74ce2533bdab60682c14fe65dafba16"; } ]; } 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 7494c11380..dd339ef1c1 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/thunderbird/default.nix @@ -70,13 +70,13 @@ assert waylandSupport -> gtk3Support == true; stdenv.mkDerivation rec { pname = "thunderbird"; - version = "78.4.0"; + version = "78.4.1"; src = fetchurl { url = "mirror://mozilla/thunderbird/releases/${version}/source/thunderbird-${version}.source.tar.xz"; sha512 = - "04b6n3gsan0a5abh371ws3c3rry4dcb3c6rbqmcxkzrdjg2xr5vn6xhlg3dgl3l01p0hp1xqpckj8g5yb2dq2x07xgg1hnyhs9aadh5"; + "2mbb139xdi69bnvvg7zabwbw181xnz7y154viynmkwyh4iww0hcsvr88q246gnif8a7jns3pi4qgqxgzflyl6mzpsvfdrbjs5hylanx"; }; nativeBuildInputs = [ @@ -332,5 +332,6 @@ stdenv.mkDerivation rec { ]; platforms = platforms.linux; license = licenses.mpl20; + timeout = 28800; # eight hours }; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/nextcloud-client/default.nix b/third_party/nixpkgs/pkgs/applications/networking/nextcloud-client/default.nix index ed670be08a..64bcf5f683 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/nextcloud-client/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/nextcloud-client/default.nix @@ -19,13 +19,13 @@ mkDerivation rec { pname = "nextcloud-client"; - version = "3.0.2"; + version = "3.0.3"; src = fetchFromGitHub { owner = "nextcloud"; repo = "desktop"; rev = "v${version}"; - sha256 = "ROzaiRa9Odq4lXuHL7nbE0S49d0wxmDgm01qI1WM+WM="; + sha256 = "0idh8i71jivdjjs2y62l22yl3qxwgcr0hf53dad587bzgkkkr223"; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/applications/networking/nextdns/default.nix b/third_party/nixpkgs/pkgs/applications/networking/nextdns/default.nix index 8cdacf6d83..16f1d7ebd1 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/nextdns/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/nextdns/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "nextdns"; - version = "1.8.3"; + version = "1.8.8"; src = fetchFromGitHub { owner = "nextdns"; repo = "nextdns"; rev = "v${version}"; - sha256 = "1bl6ky258hnai4v7d0gskn6nf5sdsc3xlwl959iwzqhpp0j3q9xg"; + sha256 = "17grlia9vxjly7hnwdgw8xfrynibj9h839kxs3wbdgp86b4lf5xf"; }; vendorSha256 = "09whpzsn16znyrknfm5zlhla253r69j6d751czza4c83m4r36swj"; diff --git a/third_party/nixpkgs/pkgs/applications/networking/remote/waypipe/default.nix b/third_party/nixpkgs/pkgs/applications/networking/remote/waypipe/default.nix index 0393a5bdeb..2c91d6496a 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/remote/waypipe/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/remote/waypipe/default.nix @@ -1,19 +1,19 @@ { stdenv, fetchFromGitLab , meson, ninja, pkg-config, scdoc -, wayland, wayland-protocols, openssh +, openssh , mesa, lz4, zstd, ffmpeg, libva }: stdenv.mkDerivation rec { pname = "waypipe-unstable"; - version = "0.7.0"; + version = "0.7.1"; src = fetchFromGitLab { domain = "gitlab.freedesktop.org"; owner = "mstoeckl"; repo = "waypipe"; rev = "v${version}"; - sha256 = "0bkmibask7gfnwkn3fg3l6zaabp95n1zsdnz3dwng8j80a0kakyy"; + sha256 = "00skyxmbssfxksb8wlqdr8gajpysadirjcn230fd5gaf5msvllx7"; }; postPatch = '' @@ -24,7 +24,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ meson ninja pkg-config scdoc ]; buildInputs = [ - wayland wayland-protocols # Optional dependencies: mesa lz4 zstd ffmpeg libva ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/seaweedfs/default.nix b/third_party/nixpkgs/pkgs/applications/networking/seaweedfs/default.nix new file mode 100644 index 0000000000..be58375586 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/networking/seaweedfs/default.nix @@ -0,0 +1,24 @@ +{ lib, fetchFromGitHub, buildGoModule }: + +buildGoModule rec { + pname = "seaweedfs"; + version = "2.07"; + + src = fetchFromGitHub { + owner = "chrislusf"; + repo = "seaweedfs"; + rev = version; + sha256 = "0yrfpj4ph9f321vqfn1zadv44pqa3ivjq9rx6gsz9hlv50gfaqn1"; + }; + + vendorSha256 = "1ysqagi4y25bi84h5fhkdimnsigy43klf6hrcqn7q75382fb4bzn"; + + subPackages = [ "weed" ]; + + meta = with lib; { + description = "Simple and highly scalable distributed file system"; + homepage = "https://github.com/chrislusf/seaweedfs"; + maintainers = [ maintainers.raboof ]; + license = licenses.asl20; + }; +} diff --git a/third_party/nixpkgs/pkgs/applications/networking/sync/backintime/common.nix b/third_party/nixpkgs/pkgs/applications/networking/sync/backintime/common.nix index 6244cd661d..73b40ea111 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/sync/backintime/common.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/sync/backintime/common.nix @@ -1,34 +1,40 @@ -{stdenv, fetchFromGitHub, makeWrapper, gettext, python3Packages, rsync, cron, openssh, sshfs-fuse, encfs }: +{stdenv, lib, fetchFromGitHub, makeWrapper, gettext, +python3, rsync, cron, openssh, sshfs-fuse, encfs }: let - inherit (python3Packages) python dbus-python keyring; -in stdenv.mkDerivation rec { - version = "1.1.24"; + python' = python3.withPackages (ps: with ps; [ dbus-python keyring ]); + apps = lib.makeBinPath [ openssh python' cron rsync sshfs-fuse encfs ]; +in stdenv.mkDerivation rec { pname = "backintime-common"; + version = "1.2.1"; src = fetchFromGitHub { owner = "bit-team"; repo = "backintime"; rev = "v${version}"; - sha256 = "0g6gabnr60ns8854hijdddbanks7319q4n3fj5l6rc4xsq0qck18"; + sha256 = "mBjheLY7DHs995heZmxVnDdvABkAROCjRJ4a/uJmJcg="; }; - buildInputs = [ makeWrapper gettext python dbus-python keyring openssh cron rsync sshfs-fuse encfs ]; + nativeBuildInputs = [ makeWrapper gettext ]; + buildInputs = [ python' ]; installFlags = [ "DEST=$(out)" ]; - preConfigure = "cd common"; + preConfigure = '' + cd common + substituteInPlace configure \ + --replace "/.." "" \ + --replace "share/backintime" "${python'.sitePackages}/backintime" + substituteInPlace "backintime" \ + --replace "share" "${python'.sitePackages}" + ''; dontAddPrefix = true; - preFixup = - '' - substituteInPlace "$out/bin/backintime" \ - --replace "=\"/usr/share" "=\"$prefix/share" + preFixup = '' wrapProgram "$out/bin/backintime" \ - --prefix PYTHONPATH : "$PYTHONPATH" \ - --prefix PATH : "$prefix/bin:$PATH" + --prefix PATH : ${apps} ''; meta = { diff --git a/third_party/nixpkgs/pkgs/applications/networking/sync/backintime/qt.nix b/third_party/nixpkgs/pkgs/applications/networking/sync/backintime/qt.nix new file mode 100644 index 0000000000..a48d6d8804 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/networking/sync/backintime/qt.nix @@ -0,0 +1,26 @@ +{ mkDerivation, backintime-common, python3 }: + +let + python' = python3.withPackages (ps: with ps; [ pyqt5 backintime-common ]); +in +mkDerivation { + inherit (backintime-common) + version src installFlags meta dontAddPrefix nativeBuildInputs; + + pname = "backintime-qt"; + + buildInputs = [ python' backintime-common ]; + + preConfigure = '' + cd qt + substituteInPlace configure \ + --replace '"/../etc' '"/etc' + substituteInPlace qttools.py \ + --replace "__file__, os.pardir, os.pardir" '"${backintime-common}/${python'.sitePackages}/backintime"' + ''; + + preFixup = '' + wrapQtApp "$out/bin/backintime-qt" \ + --prefix PATH : "${backintime-common}/bin:$PATH" + ''; +} diff --git a/third_party/nixpkgs/pkgs/applications/networking/sync/backintime/qt4.nix b/third_party/nixpkgs/pkgs/applications/networking/sync/backintime/qt4.nix deleted file mode 100644 index b72ddc8bae..0000000000 --- a/third_party/nixpkgs/pkgs/applications/networking/sync/backintime/qt4.nix +++ /dev/null @@ -1,28 +0,0 @@ -{stdenv, makeWrapper, gettext, backintime-common, python3, python3Packages }: - -stdenv.mkDerivation { - inherit (backintime-common) version src installFlags; - - pname = "backintime-qt4"; - - buildInputs = [ makeWrapper gettext python3 python3Packages.pyqt4 backintime-common python3 ]; - - preConfigure = "cd qt4"; - configureFlags = [ ]; - - dontAddPrefix = true; - - preFixup = - '' - substituteInPlace "$out/bin/backintime-qt4" \ - --replace "=\"/usr/share" "=\"$prefix/share" - - wrapProgram "$out/bin/backintime-qt4" \ - --prefix PYTHONPATH : "${backintime-common}/share/backintime/common:$PYTHONPATH" \ - --prefix PATH : "${backintime-common}/bin:$PATH" - ''; - - meta = with stdenv.lib; { - broken = true; - }; -} diff --git a/third_party/nixpkgs/pkgs/applications/networking/syncplay/default.nix b/third_party/nixpkgs/pkgs/applications/networking/syncplay/default.nix index ac242eb9dc..da4551d7f5 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/syncplay/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/syncplay/default.nix @@ -2,7 +2,7 @@ buildPythonApplication rec { pname = "syncplay"; - version = "1.6.5"; + version = "1.6.6"; format = "other"; @@ -10,7 +10,7 @@ buildPythonApplication rec { owner = "Syncplay"; repo = "syncplay"; rev = "v${version}"; - sha256 = "107dgsrjv95ww6gj77q89dirl604b2ljlpjg79gffm9c4gkmjj2m"; + sha256 = "1wkxdp7dv5y1100awy949higvs5035ylfyl83qrp4lnimy3imw09"; }; propagatedBuildInputs = [ pyside2 shiboken2 twisted certifi ] ++ twisted.extras.tls; diff --git a/third_party/nixpkgs/pkgs/applications/networking/syncthing/default.nix b/third_party/nixpkgs/pkgs/applications/networking/syncthing/default.nix index 6dd71ed4b4..febb1e6998 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/syncthing/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/syncthing/default.nix @@ -3,17 +3,17 @@ let common = { stname, target, postInstall ? "" }: buildGoModule rec { - version = "1.10.0"; + version = "1.11.1"; name = "${stname}-${version}"; src = fetchFromGitHub { owner = "syncthing"; repo = "syncthing"; rev = "v${version}"; - sha256 = "0wi8k248qr80vscb5qwh2ygiyy2am9hh6a8c1il1h2702ch2cd45"; + sha256 = "0x5a24r74i9am6a8k32qkb2vck28d2jiy4yhpb4g774m4krjqxd2"; }; - vendorSha256 = "0as1kn7bpgp5b82pf1bgr23az1qq8x85zr2zwgqsx57yjbc18658"; + vendorSha256 = "0ap287996ix119hkdyssn2q2bqjbgdshi9a67hf8msfp7k9warm7"; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/applications/office/todoman/default.nix b/third_party/nixpkgs/pkgs/applications/office/todoman/default.nix index 092a776ae6..3eb7f4f57d 100644 --- a/third_party/nixpkgs/pkgs/applications/office/todoman/default.nix +++ b/third_party/nixpkgs/pkgs/applications/office/todoman/default.nix @@ -1,4 +1,9 @@ -{ stdenv, python3, glibcLocales, installShellFiles, jq }: +{ stdenv +, python3 +, glibcLocales +, installShellFiles +, jq +}: let inherit (python3.pkgs) buildPythonApplication fetchPypi; @@ -12,22 +17,36 @@ buildPythonApplication rec { sha256 = "1aq7f63bhs9dnwzp15nfr07f2ki6s3lnqfap3b09rhchn6lfznwb"; }; - LOCALE_ARCHIVE = stdenv.lib.optionalString stdenv.isLinux - "${glibcLocales}/lib/locale/locale-archive"; - LANG = "en_US.UTF-8"; - LC_TYPE = "en_US.UTF-8"; + nativeBuildInputs = [ + installShellFiles + ]; + propagatedBuildInputs = with python3.pkgs; [ + atomicwrites + click + click-log + click-repl + configobj + humanize + icalendar + parsedatetime + python-dateutil + pyxdg + tabulate + urwid + ]; - nativeBuildInputs = [ installShellFiles ]; - buildInputs = [ glibcLocales ]; - propagatedBuildInputs = with python3.pkgs; - [ atomicwrites click click-log click-repl configobj humanize icalendar parsedatetime - python-dateutil pyxdg tabulate urwid ]; + checkInputs = with python3.pkgs; [ + flake8 + flake8-import-order + freezegun + hypothesis + pytest + pytestrunner + pytestcov + glibcLocales + ]; - checkInputs = with python3.pkgs; - [ flake8 flake8-import-order freezegun hypothesis pytest pytestrunner pytestcov ]; - - makeWrapperArgs = [ "--set LOCALE_ARCHIVE ${glibcLocales}/lib/locale/locale-archive" - "--set CHARSET en_us.UTF-8" ]; + LC_ALL = "en_US.UTF-8"; postInstall = '' installShellCompletion --bash contrib/completion/bash/_todo diff --git a/third_party/nixpkgs/pkgs/applications/radio/limesuite/default.nix b/third_party/nixpkgs/pkgs/applications/radio/limesuite/default.nix index 013b4978b5..25f49c3a2d 100644 --- a/third_party/nixpkgs/pkgs/applications/radio/limesuite/default.nix +++ b/third_party/nixpkgs/pkgs/applications/radio/limesuite/default.nix @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "limesuite"; - version = "20.07.2"; + version = "20.10.0"; src = fetchFromGitHub { owner = "myriadrf"; repo = "LimeSuite"; rev = "v${version}"; - sha256 = "0v0w0f5ff1gwpfy13x1q1jsx9xfg4s3ccg05ikpnkzj4yg6sjps1"; + sha256 = "04wzfhzqmxjsa6bgcr4zd518fln9rbwnbabf48kha84d70vzkdlx"; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/picard-tools/default.nix b/third_party/nixpkgs/pkgs/applications/science/biology/picard-tools/default.nix index d496e78748..0353f2e7ce 100644 --- a/third_party/nixpkgs/pkgs/applications/science/biology/picard-tools/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/biology/picard-tools/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "picard-tools"; - version = "2.23.4"; + version = "2.23.8"; src = fetchurl { url = "https://github.com/broadinstitute/picard/releases/download/${version}/picard.jar"; - sha256 = "0xg4nbx02a2kckr6p8pqjpv5rmp95bkmglgm1bma6f77s7hkab7q"; + sha256 = "0aflbsxzc2pcp195bbgwk6zqabq0pszc41s1pw17khn8ywl2jjr2"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/applications/science/biology/plink/default.nix b/third_party/nixpkgs/pkgs/applications/science/biology/plink/default.nix deleted file mode 100644 index 009e12aa02..0000000000 --- a/third_party/nixpkgs/pkgs/applications/science/biology/plink/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ stdenv, fetchurl, zlib, unzip }: - -stdenv.mkDerivation { - name = "plink-1.07"; - - src = fetchurl { - url = "http://pngu.mgh.harvard.edu/~purcell/plink/dist/plink-1.07-src.zip"; - sha256 = "4af56348443d0c6a1db64950a071b1fcb49cc74154875a7b43cccb4b6a7f482b"; - }; - - buildInputs = [ zlib unzip ] ; - - installPhase = '' - mkdir -p $out/bin - cp plink $out/bin - ''; - - meta = { - description = "Whole genome association toolkit"; - homepage = "http://pngu.mgh.harvard.edu/~purcell/plink/"; - license = stdenv.lib.licenses.gpl2; - platforms = stdenv.lib.platforms.all; - broken = true; - }; -} diff --git a/third_party/nixpkgs/pkgs/applications/science/chemistry/marvin/default.nix b/third_party/nixpkgs/pkgs/applications/science/chemistry/marvin/default.nix index e8cd077afd..84a1034849 100644 --- a/third_party/nixpkgs/pkgs/applications/science/chemistry/marvin/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/chemistry/marvin/default.nix @@ -4,12 +4,12 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "marvin"; - version = "20.17.0"; + version = "20.19.0"; src = fetchurl { name = "marvin-${version}.deb"; url = "http://dl.chemaxon.com/marvin/${version}/marvin_linux_${versions.majorMinor version}.deb"; - sha256 = "0ip6ma9ivk5b74s9najn2rrkiha7hya1rjhgyrc71kwsj5gqgli0"; + sha256 = "0b9a0yl3mxfb2dfdkgs2wphhxsgwixqk6nl2hsn1ly3gz53cws1q"; }; nativeBuildInputs = [ dpkg makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/applications/science/electronics/kicad/base.nix b/third_party/nixpkgs/pkgs/applications/science/electronics/kicad/base.nix index 3d83e90510..7f11f483a9 100644 --- a/third_party/nixpkgs/pkgs/applications/science/electronics/kicad/base.nix +++ b/third_party/nixpkgs/pkgs/applications/science/electronics/kicad/base.nix @@ -55,17 +55,6 @@ stdenv.mkDerivation rec { src = kicadSrc; - # quick fix for #72248 - # should be removed if a a more permanent fix is published - patches = [ - ( - fetchpatch { - url = "https://github.com/johnbeard/kicad/commit/dfb1318a3989e3d6f9f2ac33c924ca5030ea273b.patch"; - sha256 = "00ifd3fas8lid8svzh1w67xc8kyx89qidp7gm633r014j3kjkgcd"; - } - ) - ]; - # tagged releases don't have "unknown" # kicad nightlies use git describe --dirty # nix removes .git, so its approximated here diff --git a/third_party/nixpkgs/pkgs/applications/science/electronics/kicad/default.nix b/third_party/nixpkgs/pkgs/applications/science/electronics/kicad/default.nix index 7290503311..48a5779d20 100644 --- a/third_party/nixpkgs/pkgs/applications/science/electronics/kicad/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/electronics/kicad/default.nix @@ -212,11 +212,10 @@ stdenv.mkDerivation rec { # why does $makeWrapperArgs have to be added explicitly? # $out and $program_PYTHONPATH don't exist when makeWrapperArgs gets set? - # kicad-ogltest's source seems to indicate that crashing is expected behaviour... installPhase = let tools = [ "kicad" "pcbnew" "eeschema" "gerbview" "pcb_calculator" "pl_editor" "bitmap2component" ]; - utils = [ "dxf2idf" "idf2vrml" "idfcyl" "idfrect" "kicad2step" "kicad-ogltest" ]; + utils = [ "dxf2idf" "idf2vrml" "idfcyl" "idfrect" "kicad2step" ]; in (concatStringsSep "\n" (flatten [ diff --git a/third_party/nixpkgs/pkgs/applications/science/electronics/kicad/update.sh b/third_party/nixpkgs/pkgs/applications/science/electronics/kicad/update.sh index 8c154c302c..cfd78323b7 100755 --- a/third_party/nixpkgs/pkgs/applications/science/electronics/kicad/update.sh +++ b/third_party/nixpkgs/pkgs/applications/science/electronics/kicad/update.sh @@ -110,7 +110,7 @@ for version in "${all_versions[@]}"; do echo "Checking src" >&2 src_rev="$(${get_rev} "${gitlab}"/code/kicad.git "${version}" | cut -f1)" has_rev="$(grep -sm 1 "\"${pname}\"" -A 4 "${file}" | grep -sm 1 "${src_rev}" || true)" - has_hash="$(grep -sm 1 "\"${pname}\"" -A 5 "${file}" | grep -sm 1 "sha256")" + has_hash="$(grep -sm 1 "\"${pname}\"" -A 5 "${file}" | grep -sm 1 "sha256" || true)" if [[ -n ${has_rev} && -n ${has_hash} && -z ${clean} ]]; then echo "Reusing old ${pname}.src.sha256, already latest .rev" >&2 grep -sm 1 "\"${pname}\"" -A 5 "${file}" | grep -sm 1 "rev" -A 1 @@ -130,7 +130,7 @@ for version in "${all_versions[@]}"; do echo "Checking i18n" >&2 i18n_rev="$(${get_rev} "${i18n}" "${version}" | cut -f1)" has_rev="$(grep -sm 1 "\"${pname}\"" -A 11 "${file}" | grep -sm 1 "${i18n_rev}" || true)" - has_hash="$(grep -sm 1 "\"${pname}\"" -A 12 "${file}" | grep -sm 1 "i18n.sha256")" + has_hash="$(grep -sm 1 "\"${pname}\"" -A 12 "${file}" | grep -sm 1 "i18n.sha256" || true)" if [[ -n ${has_rev} && -n ${has_hash} && -z ${clean} ]]; then echo "Reusing old kicad-i18n-${today}.src.sha256, already latest .rev" >&2 grep -sm 1 "\"${pname}\"" -A 12 "${file}" | grep -sm 1 "i18n" -A 1 @@ -146,7 +146,7 @@ for version in "${all_versions[@]}"; do url="${gitlab}/libraries/kicad-${lib}.git" lib_rev="$(${get_rev} "${url}" "${version}" | cut -f1 | head -n1)" has_rev="$(grep -sm 1 "\"${pname}\"" -A 19 "${file}" | grep -sm 1 "${lib_rev}" || true)" - has_hash="$(grep -sm 1 "\"${pname}\"" -A 20 "${file}" | grep -sm 1 "${lib}.sha256")" + has_hash="$(grep -sm 1 "\"${pname}\"" -A 20 "${file}" | grep -sm 1 "${lib}.sha256" || true)" if [[ -n ${has_rev} && -n ${has_hash} && -z ${clean} ]]; then echo "Reusing old kicad-${lib}-${today}.src.sha256, already latest .rev" >&2 grep -sm 1 "\"${pname}\"" -A 20 "${file}" | grep -sm 1 "${lib}" -A 1 diff --git a/third_party/nixpkgs/pkgs/applications/science/electronics/kicad/versions.nix b/third_party/nixpkgs/pkgs/applications/science/electronics/kicad/versions.nix index 1afb33b6fb..beadd1724e 100644 --- a/third_party/nixpkgs/pkgs/applications/science/electronics/kicad/versions.nix +++ b/third_party/nixpkgs/pkgs/applications/science/electronics/kicad/versions.nix @@ -3,41 +3,41 @@ { "kicad" = { kicadVersion = { - version = "5.1.6"; + version = "5.1.8"; src = { - rev = "c6e7f7de7df655fd59b57823499efc443009de6b"; - sha256 = "1pa3z0h0679jmgxlzc833h6q85b5paxdp69kf2h93vkaryj58622"; + rev = "db9833491010954bc27fac92c83d2864bd95c23c"; + sha256 = "08ni9j2lw2hjc1csk6rkydcxwdal6da17ch60zkjij5vfsif2hix"; }; }; libVersion = { - version = "5.1.6"; + version = "5.1.8"; libSources = { - i18n.rev = "5ad171ce5c8d90f4740517c2adecb310d8be51bd"; - i18n.sha256 = "0qryi8xjm23ka363zfl7bbga0v5c31fr3d4nyxp3m168vkv9zhha"; - symbols.rev = "5150eaa2a7d15cfc6bb1459c527c4ebaa66d7708"; - symbols.sha256 = "12w3rdy085drlikkpb27n9ni7cyg9l0pqy7hnr86cxjcw3l5wcx6"; - templates.rev = "9213d439f757e6049b7e54f3ea08272a0d0f44a9"; - templates.sha256 = "1hppcsrkn4dk6ggby6ckh0q65qxkywrbyxa4lwpaf7pxjyv498xg"; - footprints.rev = "a61b4e49762fb355f654e65a1c7db1aaf7bb2332"; - footprints.sha256 = "1kmf91a5mmvj9izrv40mkaw1w36yjgn8daczd9rq2wlmd0rdp1zx"; - packages3d.rev = "150ff1caf0b01dc04c84f4f966f4f88fedfa8f8c"; - packages3d.sha256 = "0b9jglf77fy0n0r8xs4yqkv6zvipyfvp0z5dnqlzp32csy5aqpi1"; + i18n.rev = "78adcd19e7ed53f4889d6db65a33dd8ec2d323e9"; + i18n.sha256 = "0x0w2m6d3xfm22y4anp5j2j67iwzby149ynj6qjlw2kcsi8kwk1j"; + symbols.rev = "bf475af94877e8fd9cf80e667578ff61835e02bb"; + symbols.sha256 = "1ii3r813653ng2ycggnknqx4g3ja7dbm4qyxrf9aq48ws0xkvhx3"; + templates.rev = "1ccbaf3704e8ff4030d0915f71e051af621ef7d7"; + templates.sha256 = "1a8xfcbdbb4ylrb5m7n2jjk9kwvgmlx1pmnn2cwj327a2b3m4jjs"; + footprints.rev = "302ac78bac21825532f970fb92714fa5973ad79b"; + footprints.sha256 = "0gyqxryda273hjn2rv8dha461j9bjh054y5dlpiw1wiha65lrf9i"; + packages3d.rev = "7abe02f30fd79b8f4f66c01589861df7f8f72f04"; + packages3d.sha256 = "1szcin52fcsyb55bj7xq7lz6ig187dpz3lk7blwab7b9c4dn3c3y"; }; }; }; "kicad-unstable" = { kicadVersion = { - version = "2020-10-09"; + version = "2020-11-07"; src = { - rev = "560428a70f0196fb4ade620042c5ddefc1685ebe"; - sha256 = "0rzn83bpl06v1d49lcvwfg93nirn684bqqq536zxhmjm0ayx29ka"; + rev = "9454f9df9245aea037d1ad5baf050c2d9101159c"; + sha256 = "03bd0dk234ihqnwrv4n40gi856xcjqgxplfwjzlwcq521gwykv30"; }; }; libVersion = { - version = "2020-10-09"; + version = "2020-11-07"; libSources = { - i18n.rev = "d24af2da8cab4ce1081c401909a4a880514e5549"; - i18n.sha256 = "0r0sv52k84sw4jxf10lrmzwmn58d2fv5h57fdrspnmvnh10q63xf"; + i18n.rev = "e89d9a89bec59199c1ade56ee2556591412ab7b0"; + i18n.sha256 = "04zaqyhj3qr4ymyd3k5vjpcna64j8klpsygcgjcv29s3rdi8glfl"; symbols.rev = "9c50f4333bafc5a1abf7786436db5ffb6a66758d"; symbols.sha256 = "06ic59svz0256isy93863i5ay4k8wshvp1kspnqrc776wmq03l3k"; templates.rev = "41eae4ccd3ac02fdb969e3aa272c07ab51dcf5af"; diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/lean/default.nix b/third_party/nixpkgs/pkgs/applications/science/logic/lean/default.nix index eae2e384df..749220382c 100644 --- a/third_party/nixpkgs/pkgs/applications/science/logic/lean/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/logic/lean/default.nix @@ -15,9 +15,13 @@ stdenv.mkDerivation rec { buildInputs = [ gmp ]; enableParallelBuilding = true; - preConfigure = '' - cd src - ''; + cmakeDir = "../src"; + + # Running the tests is required to build the *.olean files for the core + # library. + doCheck = true; + + postPatch = "patchShebangs ."; postInstall = stdenv.lib.optionalString stdenv.isDarwin '' substituteInPlace $out/bin/leanpkg \ diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/default.nix index bb317b83c8..114e8fe012 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/default.nix @@ -74,6 +74,8 @@ let # support for bugzilla git-bz = callPackage ./git-bz { }; + git-chglog = callPackage ./git-chglog { }; + git-cinnabar = callPackage ./git-cinnabar { }; git-codeowners = callPackage ./git-codeowners { }; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/git-absorb/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/git-absorb/default.nix index 46a6f81741..d8e34f5700 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/git-absorb/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/git-absorb/default.nix @@ -2,23 +2,27 @@ rustPlatform.buildRustPackage rec { pname = "git-absorb"; - version = "0.6.5"; + version = "0.6.6"; src = fetchFromGitHub { owner = "tummychow"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "12ih0gm07ddi86jy612f029nzav345v57pjajyy9lw017g6n6mjb"; + sha256 = "04v10bn24acify34vh5ayymsr1flcyb05f3az9k1s2m6nlxy5gb9"; }; nativeBuildInputs = [ installShellFiles ]; buildInputs = stdenv.lib.optionals stdenv.isDarwin [ libiconv Security ]; - cargoSha256 = "0x2zcw0bpwqimvbb5xj8xawvl4jcvk5lj0y2mm5ncbdapzyqdsb2"; + cargoSha256 = "0h0vlz4qd8i9bf1mgjr618zbdwfp6bmy7ql9a1xzjmfdpkl3cgk9"; postInstall = '' installManPage Documentation/git-absorb.1 + for shell in bash zsh fish; do + $out/bin/git-absorb --gen-completions $shell > git-absorb.$shell + installShellCompletion git-absorb.$shell + done ''; meta = with stdenv.lib; { diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/git-chglog/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/git-chglog/default.nix new file mode 100644 index 0000000000..05d5dfe960 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/git-chglog/default.nix @@ -0,0 +1,22 @@ +{ lib, buildGoPackage, fetchFromGitHub }: + +buildGoPackage rec { + pname = "git-chglog"; + version = "0.9.1"; + + goPackagePath = "github.com/git-chglog/git-chglog"; + + src = fetchFromGitHub { + owner = "git-chglog"; + repo = "git-chglog"; + rev = version; + sha256 = "08x7w1jlvxxvwnz6pvkjmfd3nqayd8n15r9jbqi2amrp31z0gq0p"; + }; + + meta = with lib; { + description = "CHANGELOG generator implemented in Go (Golang)"; + license = licenses.mit; + maintainers = with maintainers; [ ldenefle ]; + }; +} + diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/git-machete/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/git-machete/default.nix index cbb6940353..dac3c54a16 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/git-machete/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/git-machete/default.nix @@ -4,11 +4,11 @@ buildPythonApplication rec { pname = "git-machete"; - version = "2.15.6"; + version = "2.15.7"; src = fetchPypi { inherit pname version; - sha256 = "0ajb3m3i3pfc5v3gshglk7qphk1rpniwx8q8isgx1a6cyarzr9bd"; + sha256 = "0djbl4s9i7bs7kkldr7453yayi38s8mx0i41mkd0j2cvv5r9himr"; }; nativeBuildInputs = [ installShellFiles pbr ]; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/git/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/git/default.nix index 7e40366142..49dc7866db 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/git/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/git-and-tools/git/default.nix @@ -22,7 +22,7 @@ assert sendEmailSupport -> perlSupport; assert svnSupport -> perlSupport; let - version = "2.28.0"; + version = "2.29.0"; svn = subversionClient.override { perlBindings = perlSupport; }; gitwebPerlLibs = with perlPackages; [ CGI HTMLParser CGIFast FCGI FCGIProcManager HTMLTagCloud ]; @@ -34,7 +34,7 @@ stdenv.mkDerivation { src = fetchurl { url = "https://www.kernel.org/pub/software/scm/git/git-${version}.tar.xz"; - sha256 = "17a311vzimqn1glc9d7x82rhb1mb81m5rr4g8xji8idaafid39fz"; + sha256 = "KEMtmVJXxGJv4PsgkfWI327tmOlXFBnnLIO8Izcua4k="; }; outputs = [ "out" ] ++ stdenv.lib.optional withManual "doc"; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/git-lfs/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/git-lfs/default.nix index 2df8b335bd..bd6c5f5cc6 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/git-lfs/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/git-lfs/default.nix @@ -2,13 +2,13 @@ buildGoPackage rec { pname = "git-lfs"; - version = "2.12.0"; + version = "2.12.1"; src = fetchFromGitHub { rev = "v${version}"; owner = "git-lfs"; repo = "git-lfs"; - sha256 = "0pyvlcy6jxh0vzpsmywlbzwwdyj3jkcclnqb6sg786mmwrnqzj88"; + sha256 = "1x8s1w8yqhj5nm20knr2gkb59rwzx220nf099lgd62cajzsdpjx5"; }; goPackagePath = "github.com/git-lfs/git-lfs"; diff --git a/third_party/nixpkgs/pkgs/applications/video/dvb-apps/default.nix b/third_party/nixpkgs/pkgs/applications/video/dvb-apps/default.nix deleted file mode 100644 index 8fa88e3244..0000000000 --- a/third_party/nixpkgs/pkgs/applications/video/dvb-apps/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ stdenv, fetchurl, perl }: - -stdenv.mkDerivation { - name = "dvb-apps-7f68f9c8d311"; - - src = fetchurl { - url = "https://linuxtv.org/hg/dvb-apps/archive/7f68f9c8d311.tar.gz"; - sha256 = "0a6c5jjq6ad98bj0r954l3n7zjb2syw9m19jksg06z4zg1z8yg82"; - }; - - buildInputs = [ perl ]; - - dontConfigure = true; # skip configure - - installPhase = "make prefix=$out install"; - - meta = { - description = "Linux DVB API applications and utilities"; - homepage = "https://linuxtv.org/"; - platforms = stdenv.lib.platforms.linux; - license = stdenv.lib.licenses.gpl2; - broken = true; # 2018-04-10 - }; -} diff --git a/third_party/nixpkgs/pkgs/applications/video/epgstation/default.nix b/third_party/nixpkgs/pkgs/applications/video/epgstation/default.nix index e57f46c8c6..62aa54ca78 100644 --- a/third_party/nixpkgs/pkgs/applications/video/epgstation/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/epgstation/default.nix @@ -1,6 +1,27 @@ -{ stdenv, fetchFromGitHub, makeWrapper, bash, nodejs, nodePackages, gzip }: +{ stdenv +, fetchFromGitHub +, common-updater-scripts +, genericUpdater +, writers +, makeWrapper +, bash +, nodejs +, nodePackages +, gzip +, jq +}: let + # NOTE: use updateScript to bump the package version + pname = "EPGStation"; + version = "1.7.5"; + src = fetchFromGitHub { + owner = "l3tnun"; + repo = "EPGStation"; + rev = "v${version}"; + sha256 = "06yaf5yb5rp3q0kdhw33df7px7vyfby885ckb6bdzw3wnams5d8m"; + }; + workaround-opencollective-buildfailures = stdenv.mkDerivation { # FIXME: This should be removed when a complete fix is available # https://github.com/svanderburg/node2nix/issues/145 @@ -12,67 +33,73 @@ let chmod +x $out/bin/opencollective-postinstall ''; }; -in -nodePackages.epgstation.override (drv: { - src = fetchFromGitHub { - owner = "l3tnun"; - repo = "EPGStation"; - rev = "v${drv.version}"; # version specified in ./generate.sh - sha256 = "15z1kdbamj97frp3dfnbm0h8krihmv2xdab4id0rxin29ibrw1k2"; - }; - buildInputs = [ bash ]; - nativeBuildInputs = [ - workaround-opencollective-buildfailures - makeWrapper - nodePackages.node-pre-gyp - ]; + pkg = nodePackages.epgstation.override (drv: { + inherit src; - preRebuild = '' - # Fix for not being able to connect to mysql using domain sockets. - patch -p1 ${./use-mysql-over-domain-socket.patch} - ''; + buildInputs = [ bash ]; + nativeBuildInputs = [ + workaround-opencollective-buildfailures + makeWrapper + nodePackages.node-pre-gyp + ]; - postInstall = let - runtimeDeps = [ nodejs bash ]; - in - '' - mkdir -p $out/{bin,libexec,share/doc/epgstation,share/man/man1} + preRebuild = '' + # Fix for not being able to connect to mysql using domain sockets. + patch -p1 ${./use-mysql-over-domain-socket.patch} + ''; - pushd $out/lib/node_modules/EPGStation + postInstall = let + runtimeDeps = [ nodejs bash ]; + in + '' + mkdir -p $out/{bin,libexec,share/doc/epgstation,share/man/man1} - npm run build - npm prune --production + pushd $out/lib/node_modules/EPGStation - mv config/{enc.sh,enc.js} $out/libexec - mv LICENSE Readme.md $out/share/doc/epgstation - mv doc/* $out/share/doc/epgstation - sed 's/@DESCRIPTION@/${drv.meta.description}/g' ${./epgstation.1} \ - | ${gzip}/bin/gzip > $out/share/man/man1/epgstation.1.gz - rm -rf doc + npm run build + npm prune --production - # just log to stdout and let journald do its job - rm -rf logs + mv config/{enc.sh,enc.js} $out/libexec + mv LICENSE Readme.md $out/share/doc/epgstation + mv doc/* $out/share/doc/epgstation + sed 's/@DESCRIPTION@/${drv.meta.description}/g' ${./epgstation.1} \ + | ${gzip}/bin/gzip > $out/share/man/man1/epgstation.1.gz + rm -rf doc - # Replace the existing configuration and runtime state directories with - # symlinks. Without this, they would all be non-writable because they reside - # in the Nix store. Note that the source path won't be accessible at build - # time. - rm -r config data recorded thumbnail - ln -sfT /etc/epgstation config - ln -sfT /var/lib/epgstation data - ln -sfT /var/lib/epgstation/recorded recorded - ln -sfT /var/lib/epgstation/thumbnail thumbnail + # just log to stdout and let journald do its job + rm -rf logs - makeWrapper ${nodejs}/bin/npm $out/bin/epgstation \ - --run "cd $out/lib/node_modules/EPGStation" \ - --prefix PATH : ${stdenv.lib.makeBinPath runtimeDeps} + # Replace the existing configuration and runtime state directories with + # symlinks. Without this, they would all be non-writable because they + # reside in the Nix store. Note that the source path won't be accessible + # at build time. + rm -r config data recorded thumbnail + ln -sfT /etc/epgstation config + ln -sfT /var/lib/epgstation data + ln -sfT /var/lib/epgstation/recorded recorded + ln -sfT /var/lib/epgstation/thumbnail thumbnail - popd - ''; + makeWrapper ${nodejs}/bin/npm $out/bin/epgstation \ + --run "cd $out/lib/node_modules/EPGStation" \ + --prefix PATH : ${stdenv.lib.makeBinPath runtimeDeps} - meta = with stdenv.lib; drv.meta // { - maintainers = with maintainers; [ midchildan ]; + popd + ''; + + # NOTE: this may take a while since it has to update all packages in + # nixpkgs.nodePackages + passthru.updateScript = import ./update.nix { + inherit (stdenv) lib; + inherit (src.meta) homepage; + inherit + pname + version + common-updater-scripts + genericUpdater + writers + jq; + }; # nodePackages.epgstation is a stub package to fetch npm dependencies and # is marked as broken to prevent users from installing it directly. This @@ -80,6 +107,16 @@ nodePackages.epgstation.override (drv: { # nixpkgs while still allowing us to heavily customize the build. It also # allows us to provide devDependencies for the epgstation build process # without doing the same for all the other node packages. - broken = false; + meta = drv.meta // { broken = false; }; + }); +in +pkg // { + name = "${pname}-${version}"; + + meta = with stdenv.lib; pkg.meta // { + maintainers = with maintainers; [ midchildan ]; + + # NOTE: updateScript relies on this being correct + position = toString ./default.nix + ":1"; }; -}) +} diff --git a/third_party/nixpkgs/pkgs/applications/video/epgstation/generate.sh b/third_party/nixpkgs/pkgs/applications/video/epgstation/generate.sh deleted file mode 100755 index d193a01506..0000000000 --- a/third_party/nixpkgs/pkgs/applications/video/epgstation/generate.sh +++ /dev/null @@ -1,34 +0,0 @@ -#!/usr/bin/env bash - -# Script to generate the Nix package definition for EPGStation. Run this script -# when bumping the package version. - -VERSION="1.7.4" -URL="https://raw.githubusercontent.com/l3tnun/EPGStation/v$VERSION/package.json" -JQ_BIN="$(nix-build ../../../.. --no-out-link -A jq)/bin/jq" - -set -eu -o pipefail -cd "$(dirname "${BASH_SOURCE[0]}")" - -main() { - # update package.json - curl -sSfL "$URL" \ - | jq '. + {"dependencies": (.devDependencies + .dependencies)} | del(.devDependencies)' \ - > package.json - - # regenerate node packages to update the actual Nix package - pushd ../../../development/node-packages \ - && ./generate.sh - popd - - # generate default streaming settings for EPGStation - pushd ../../../../nixos/modules/services/video/epgstation \ - && cat "$(./generate)" > streaming.json - popd -} - -jq() { - "$JQ_BIN" "$@" -} - -main "@" diff --git a/third_party/nixpkgs/pkgs/applications/video/epgstation/package.json b/third_party/nixpkgs/pkgs/applications/video/epgstation/package.json index 96525ec809..53b1ebca2d 100644 --- a/third_party/nixpkgs/pkgs/applications/video/epgstation/package.json +++ b/third_party/nixpkgs/pkgs/applications/video/epgstation/package.json @@ -1,23 +1,7 @@ { "name": "EPGStation", - "version": "1.7.4", + "version": "1.7.5", "description": "DTV Software in Japan.", - "main": "dist/server/index.js", - "scripts": { - "start": "node dist/server/index.js", - "dev-start": "node dist/server/index.js --env development", - "clean": "gulp clean", - "build": "gulp build --max_old_space_size=768 --env production", - "dev-build": "gulp build --max_old_space_size=512 --env development", - "test": "echo \"Error: no test specified\" && exit 1", - "task": "gulp --max_old_space_size=512", - "install-win-service": "winser -i -a", - "uninstall-win-service": "winser -r -x", - "backup": "node dist/server/DBTools.js -m backup -o", - "restore": "node dist/server/DBTools.js -m restore -o", - "move-log": "node dist/server/LogFileMoveTools.js", - "convert-str": "node dist/server/ConvertDBStrTools.js" - }, "repository": { "type": "git", "url": "https://github.com/l3tnun/EPGStation.git" @@ -32,23 +16,53 @@ "node": "^10.x.x < 11 || ^12.14.0 < 13 || ^14.5.0 < 15" }, "dependencies": { + "aribts": "^2.1.12", + "b24.js": "1.0.3", + "basic-auth": "2.0.1", + "body-parser": "1.19.0", + "chart.js": "2.9.3", + "css-ripple-effect": "1.0.5", + "diskusage": "1.1.3", + "express": "4.17.1", + "express-openapi": "7.0.1", + "fs-extra": "9.0.1", + "hls-b24.js": "0.12.3", + "js-yaml": "3.14.0", + "lodash": "4.17.20", + "log4js": "6.3.0", + "material-design-icons": "3.0.1", + "material-design-lite": "1.3.0", + "minimist": "1.2.5", + "mirakurun": "3.3.1", + "mithril": "2.0.4", + "mkdirp": "1.0.4", + "multer": "1.4.2", + "mysql": "2.18.1", + "openapi-types": "7.0.1", + "pg": "8.3.3", + "request": "2.88.2", + "socket.io": "2.3.0", + "socket.io-client": "2.3.0", + "sqlite3": "5.0.0", + "swagger-ui-dist": "3.34.0", + "url-join": "4.0.1", "@types/basic-auth": "1.1.3", "@types/body-parser": "1.19.0", - "@types/chart.js": "2.9.23", - "@types/express": "4.17.7", - "@types/hls.js": "0.13.0", + "@types/chart.js": "2.9.24", + "@types/express": "4.17.8", + "@types/hls.js": "0.13.1", "@types/js-yaml": "3.12.5", - "@types/lodash": "4.14.158", + "@types/lodash": "4.14.161", "@types/material-design-lite": "1.1.16", "@types/minimist": "1.2.0", "@types/mithril": "2.0.3", "@types/mkdirp": "1.0.1", - "@types/multer": "1.4.3", + "@types/multer": "1.4.4", "@types/mysql": "2.15.15", - "@types/node": "14.0.26", - "@types/pg": "7.14.4", + "@types/node": "14.11.1", + "@types/pg": "7.14.5", "@types/request": "2.48.5", - "@types/socket.io": "2.1.10", + "@types/socket.io": "2.1.11", "@types/socket.io-client": "1.4.33", "@types/sqlite3": "3.1.6", "@types/url-join": "4.0.0", @@ -61,41 +75,11 @@ "gulp-sourcemaps": "2.6.5", "gulp-tslint": "8.1.4", "gulp-typescript": "5.0.1", - "terser-webpack-plugin": "3.0.7", - "ts-loader": "8.0.1", - "tslint": "6.1.2", - "typescript": "3.9.7", - "webpack": "4.44.0", - "webpack-stream": "5.2.1", - "aribts": "^2.1.12", - "b24.js": "1.0.3", - "basic-auth": "2.0.1", - "body-parser": "1.19.0", - "chart.js": "2.9.3", - "css-ripple-effect": "1.0.5", - "diskusage": "1.1.3", - "express": "4.17.1", - "express-openapi": "7.0.0", - "fs-extra": "9.0.1", - "hls-b24.js": "0.12.3", - "js-yaml": "3.14.0", - "lodash": "4.17.19", - "log4js": "6.3.0", - "material-design-icons": "3.0.1", - "material-design-lite": "1.3.0", - "minimist": "1.2.5", - "mirakurun": "3.2.0", - "mithril": "2.0.4", - "mkdirp": "1.0.4", - "multer": "1.4.2", - "mysql": "2.18.1", - "openapi-types": "7.0.0", - "pg": "8.3.0", - "request": "2.88.2", - "socket.io": "2.3.0", - "socket.io-client": "2.3.0", - "sqlite3": "5.0.0", - "swagger-ui-dist": "3.30.2", - "url-join": "4.0.1" + "terser-webpack-plugin": "4.2.2", + "ts-loader": "8.0.4", + "tslint": "6.1.3", + "typescript": "4.0.3", + "webpack": "4.44.2", + "webpack-stream": "6.1.0" } } diff --git a/third_party/nixpkgs/pkgs/applications/video/epgstation/update.nix b/third_party/nixpkgs/pkgs/applications/video/epgstation/update.nix new file mode 100644 index 0000000000..9faa83c64f --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/video/epgstation/update.nix @@ -0,0 +1,66 @@ +{ pname +, version +, homepage +, lib +, common-updater-scripts +, genericUpdater +, writers +, jq +}: + +let + updater = genericUpdater { + inherit pname version; + attrPath = lib.toLower pname; + rev-prefix = "v"; + versionLister = "${common-updater-scripts}/bin/list-git-tags ${homepage}"; + }; + updateScript = builtins.elemAt updater 0; + updateArgs = map (lib.escapeShellArg) (builtins.tail updater); +in writers.writeBash "update-epgstation" '' + set -euxo pipefail + + # bump the version + ${updateScript} ${lib.concatStringsSep " " updateArgs} + + cd "${toString ./.}" + + # Get the path to the latest source. Note that we can't just pass the value + # of epgstation.src directly because it'd be evaluated before we can run + # updateScript. + SRC="$(nix-build ../../../.. --no-out-link -A epgstation.src)" + if [[ "${version}" == "$(${jq}/bin/jq -r .version "$SRC/package.json")" ]]; then + echo "[INFO] Already using the latest version of ${pname}" >&2 + exit + fi + + # Regenerate package.json from the latest source. + ${jq}/bin/jq '. + { + dependencies: (.dependencies + .devDependencies), + } | del(.devDependencies, .main, .scripts)' \ + "$SRC/package.json" \ + > package.json + + # Regenerate node packages to update the pre-overriden epgstation derivation. + # This must come *after* package.json has been regenerated. + pushd ../../../development/node-packages + ./generate.sh + popd + + # Generate default streaming settings for the nixos module. + pushd ../../../../nixos/modules/services/video/epgstation + ${jq}/bin/jq ' + { liveHLS + , liveMP4 + , liveWebM + , mpegTsStreaming + , mpegTsViewer + , recordedDownloader + , recordedStreaming + , recordedHLS + , recordedViewer + }' \ + "$SRC/config/config.sample.json" \ + > streaming.json + popd +'' diff --git a/third_party/nixpkgs/pkgs/applications/video/k9copy/default.nix b/third_party/nixpkgs/pkgs/applications/video/k9copy/default.nix deleted file mode 100644 index 317505185d..0000000000 --- a/third_party/nixpkgs/pkgs/applications/video/k9copy/default.nix +++ /dev/null @@ -1,63 +0,0 @@ -{ stdenv, fetchurl -, cmake -, dvdauthor, xineLib, libmpeg2, libav, libdvdread, libdvdnav, dvdplusrwtools -, phonon, qtx11extras -, extra-cmake-modules, kio, kiconthemes, ki18n, kdesu, kdoctools, solid -}: - -stdenv.mkDerivation rec { - version = "3.0.3"; - pname = "k9copy"; - - src = fetchurl { - url = "mirror://sourceforge/k9copy-reloaded/${pname}-${version}.tar.gz"; - sha256 = "0dp06rwihks50c57bbv04d6bj2qc88isl91971r4lii2xp0qn7sg"; - }; - - patches = [ - ./gcc6.patch - ]; - - cmakeFlags = [ - "-DQT5_BUILD=ON" - "-DCMAKE_MINIMUM_REQUIRED_VERSION=3.0" - ]; - - # Hack to disable documentation - preConfigure = '' - substituteInPlace ./CMakeLists.txt \ - --replace "add_subdirectory(doc)" "" - ''; - - buildInputs = [ - cmake - dvdauthor - xineLib - libmpeg2 - libav - libdvdread - libdvdnav - dvdplusrwtools - #automoc4 - phonon - extra-cmake-modules - kio - solid - qtx11extras - kiconthemes - ki18n - kdesu - ]; - nativeBuildInputs = [ kdoctools ]; - - meta = { - description = "DVD backup and DVD authoring program"; - homepage = "http://k9copy-reloaded.sourceforge.net/"; - license = stdenv.lib.licenses.gpl2; - maintainers = with stdenv.lib.maintainers; [ flosse ]; - platforms = stdenv.lib.platforms.unix; - # TODO: The software is deprecated and the build is broken, see: - # https://github.com/NixOS/nixpkgs/pull/63260#issuecomment-503506487 - broken = true; - }; -} diff --git a/third_party/nixpkgs/pkgs/applications/video/k9copy/gcc6.patch b/third_party/nixpkgs/pkgs/applications/video/k9copy/gcc6.patch deleted file mode 100644 index d0c9c2a803..0000000000 --- a/third_party/nixpkgs/pkgs/applications/video/k9copy/gcc6.patch +++ /dev/null @@ -1,26 +0,0 @@ -diff --git c/src/backup/k9dvdbackup.cpp i/src/backup/k9dvdbackup.cpp -index f5e4859..82fa392 100755 ---- c/src/backup/k9dvdbackup.cpp -+++ i/src/backup/k9dvdbackup.cpp -@@ -907,7 +907,7 @@ k9Vobu * k9DVDBackup::remapOffset(uint32_t _sector,uint32_t *_offset,int _dir) { - - - if ((vobu1 !=NULL) && (vobu2!=NULL)) { -- *_offset = abs(vobu1->newSector - vobu2->newSector) | maskOffset1 ; -+ *_offset = (vobu1->newSector - vobu2->newSector) | maskOffset1 ; - *_offset |= maskOffset2; - return vobu2; - } -diff --git c/src/backup/k9execcopy.cpp i/src/backup/k9execcopy.cpp -index d59222c..35de923 100644 ---- c/src/backup/k9execcopy.cpp -+++ i/src/backup/k9execcopy.cpp -@@ -306,7 +306,7 @@ void k9ExecCopy::createMkv(k9DVDTitle *_title,const QString &_filename,QMultiMap - - #if QT_VERSION >= 0x050000 - m_progressDialog=new QProgressDialog(k9Dialogs::getMainWidget() ); -- m_progressDialog->setCancelButton(false); -+ m_progressDialog->setCancelButton(0); - - #else - m_progressDialog=new KProgressDialog(k9Dialogs::getMainWidget() ); diff --git a/third_party/nixpkgs/pkgs/applications/video/shotcut/default.nix b/third_party/nixpkgs/pkgs/applications/video/shotcut/default.nix index f1d77fb7d1..188d49a791 100644 --- a/third_party/nixpkgs/pkgs/applications/video/shotcut/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/shotcut/default.nix @@ -9,13 +9,13 @@ assert stdenv.lib.versionAtLeast mlt.version "6.22.1"; mkDerivation rec { pname = "shotcut"; - version = "20.09.13"; + version = "20.10.31"; src = fetchFromGitHub { owner = "mltframework"; repo = "shotcut"; rev = "v${version}"; - sha256 = "1q7ba6j3b2yzn3y5z9s5ldh15wrvhi6vymhwm910nqa5379dcc21"; + sha256 = "16ypq1v396pibhh33nm78p6hr5fz3h74l0ykg9f72b8whw23jyz6"; }; enableParallelBuilding = true; @@ -27,7 +27,11 @@ mkDerivation rec { ]; NIX_CFLAGS_COMPILE = "-I${libmlt}/include/mlt++ -I${libmlt}/include/mlt"; - qmakeFlags = [ "QMAKE_LRELEASE=${stdenv.lib.getDev qttools}/bin/lrelease" "SHOTCUT_VERSION=${version}" ]; + qmakeFlags = [ + "QMAKE_LRELEASE=${stdenv.lib.getDev qttools}/bin/lrelease" + "SHOTCUT_VERSION=${version}" + "DEFINES+=SHOTCUT_NOUPGRADE" + ]; prePatch = '' sed 's_shotcutPath, "qmelt"_"${mlt}/bin/melt"_' -i src/jobs/meltjob.cpp diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/crun/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/crun/default.nix index e52401ba35..62e5843d24 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/crun/default.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/crun/default.nix @@ -35,13 +35,13 @@ let in stdenv.mkDerivation rec { pname = "crun"; - version = "0.15"; + version = "0.15.1"; src = fetchFromGitHub { owner = "containers"; repo = pname; rev = version; - sha256 = "0cqzk2lm1w0g2v6qhiliq565cf4p7hzh839jb01p3i5cr9kx11kc"; + sha256 = "0qy4159wirkwzb48kp1jsnimlr1fyvxvv02j6mdbhjdhkwjic8v4"; fetchSubmodules = true; }; diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/nvidia-docker/avoid-static-libtirpc-build.patch b/third_party/nixpkgs/pkgs/applications/virtualization/nvidia-docker/avoid-static-libtirpc-build.patch new file mode 100644 index 0000000000..d3f207de00 --- /dev/null +++ b/third_party/nixpkgs/pkgs/applications/virtualization/nvidia-docker/avoid-static-libtirpc-build.patch @@ -0,0 +1,21 @@ +diff --git a/Makefile b/Makefile +index 0070ada..802cef0 100644 +--- a/Makefile ++++ b/Makefile +@@ -202,7 +202,7 @@ $(BIN_NAME): $(BIN_OBJS) + ##### Public rules ##### + + all: CPPFLAGS += -DNDEBUG +-all: shared static tools ++all: shared tools + + # Run with ASAN_OPTIONS="protect_shadow_gap=0" to avoid CUDA OOM errors + debug: CFLAGS += -pedantic -fsanitize=undefined -fno-omit-frame-pointer -fno-common -fsanitize=address +@@ -232,7 +232,6 @@ install: all + # Install header files + $(INSTALL) -m 644 $(LIB_INCS) $(DESTDIR)$(includedir) + # Install library files +- $(INSTALL) -m 644 $(LIB_STATIC) $(DESTDIR)$(libdir) + $(INSTALL) -m 755 $(LIB_SHARED) $(DESTDIR)$(libdir) + $(LN) -sf $(LIB_SONAME) $(DESTDIR)$(libdir)/$(LIB_SYMLINK) + $(LDCONFIG) -n $(DESTDIR)$(libdir) diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/nvidia-docker/libnvc.nix b/third_party/nixpkgs/pkgs/applications/virtualization/nvidia-docker/libnvc.nix index 5b97d7fffa..6079f215ec 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/nvidia-docker/libnvc.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/nvidia-docker/libnvc.nix @@ -1,17 +1,23 @@ -{ stdenv, lib, fetchFromGitHub, pkgconfig, libelf, libcap, libseccomp }: - -with lib; let - +{ stdenv +, lib +, fetchFromGitHub +, pkgconfig +, libelf +, libcap +, libseccomp +, rpcsvc-proto +, libtirpc +}: +let modp-ver = "396.51"; - nvidia-modprobe = fetchFromGitHub { owner = "NVIDIA"; repo = "nvidia-modprobe"; rev = modp-ver; sha256 = "1fw2qwc84k64agw6fx2v0mjf88aggph9c6qhs4cv7l3gmflv8qbk"; }; - -in stdenv.mkDerivation rec { +in +stdenv.mkDerivation rec { pname = "libnvidia-container"; version = "1.0.6"; @@ -22,19 +28,32 @@ in stdenv.mkDerivation rec { sha256 = "1pnpc9knwh8d1zqb28zc3spkjc00w0z10vd3jna8ksvpl35jl7w3"; }; - # locations of nvidia-driver libraries are not resolved via ldconfig which - # doesn't get used on NixOS. Additional support binaries like nvidia-smi are - # not resolved via the environment PATH but via the derivation output path. - patches = [ ./libnvc-ldconfig-and-path-fixes.patch ]; + patches = [ + # locations of nvidia-driver libraries are not resolved via ldconfig which + # doesn't get used on NixOS. Additional support binaries like nvidia-smi + # are not resolved via the environment PATH but via the derivation output + # path. + ./libnvc-ldconfig-and-path-fixes.patch + + # the libnvidia-container Makefile wants to build and install static + # libtirpc libraries; this patch prevents that from happening + ./avoid-static-libtirpc-build.patch + ]; makeFlags = [ "WITH_LIBELF=yes" "prefix=$(out)" + # we can't use the WITH_TIRPC=yes flag that exists in the Makefile for the + # same reason we patch out the static library use of libtirpc so we set the + # define in CFLAGS + "CFLAGS=-DWITH_TIRPC" ]; postPatch = '' - sed -i 's/^REVISION :=.*/REVISION = ${src.rev}/' mk/common.mk - sed -i 's/^COMPILER :=.*/COMPILER = $(CC)/' mk/common.mk + sed -i \ + -e 's/^REVISION :=.*/REVISION = ${src.rev}/' \ + -e 's/^COMPILER :=.*/COMPILER = $(CC)/' \ + mk/common.mk mkdir -p deps/src/nvidia-modprobe-${modp-ver} cp -r ${nvidia-modprobe}/* deps/src/nvidia-modprobe-${modp-ver} @@ -42,11 +61,14 @@ in stdenv.mkDerivation rec { touch deps/src/nvidia-modprobe-${modp-ver}/.download_stamp ''; - nativeBuildInputs = [ pkgconfig ]; + NIX_CFLAGS_COMPILE = [ "-I${libtirpc.dev}/include/tirpc" ]; + NIX_LDFLAGS = [ "-L${libtirpc.dev}/lib" "-ltirpc" ]; - buildInputs = [ libelf libcap libseccomp ]; + nativeBuildInputs = [ pkgconfig rpcsvc-proto ]; - meta = { + buildInputs = [ libelf libcap libseccomp libtirpc ]; + + meta = with lib; { homepage = "https://github.com/NVIDIA/libnvidia-container"; description = "NVIDIA container runtime library"; license = licenses.bsd3; diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/singularity/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/singularity/default.nix index 2f2d66f3b2..a6d6cf7604 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/singularity/default.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/singularity/default.nix @@ -18,11 +18,11 @@ with lib; buildGoPackage rec { pname = "singularity"; - version = "3.6.3"; + version = "3.6.4"; src = fetchurl { url = "https://github.com/hpcng/singularity/releases/download/v${version}/singularity-${version}.tar.gz"; - sha256 = "1zd29s8lggv4x5xracgzywayg1skl9qc2bqh1zdxh1wrg9sqbadi"; + sha256 = "17z7v7pjq1ibl64ir4h183sp58v2x7iv6dn6imnnhkdvss0kl8vi"; }; goPackagePath = "github.com/sylabs/singularity"; diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/i3/default.nix b/third_party/nixpkgs/pkgs/applications/window-managers/i3/default.nix index b37a83648a..2ea2c8ac77 100644 --- a/third_party/nixpkgs/pkgs/applications/window-managers/i3/default.nix +++ b/third_party/nixpkgs/pkgs/applications/window-managers/i3/default.nix @@ -5,11 +5,11 @@ stdenv.mkDerivation rec { pname = "i3"; - version = "4.18.2"; + version = "4.18.3"; src = fetchurl { url = "https://i3wm.org/downloads/${pname}-${version}.tar.bz2"; - sha256 = "030jym6b8b07yf4y6pb806hg8k77zsprv569gy0r72rh5zb1g1mj"; + sha256 = "03dijnwv2n8ak9jq59fhq0rc80m5wjc9d54fslqaivnnz81pkbjk"; }; nativeBuildInputs = [ which pkgconfig makeWrapper installShellFiles ]; diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/i3/status-rust.nix b/third_party/nixpkgs/pkgs/applications/window-managers/i3/status-rust.nix index f6acf5698f..a1900deb22 100644 --- a/third_party/nixpkgs/pkgs/applications/window-managers/i3/status-rust.nix +++ b/third_party/nixpkgs/pkgs/applications/window-managers/i3/status-rust.nix @@ -1,4 +1,13 @@ -{ stdenv, rustPlatform, fetchFromGitHub, pkgconfig, dbus, libpulseaudio }: +{ stdenv +, rustPlatform +, fetchFromGitHub +, pkgconfig +, makeWrapper +, dbus +, libpulseaudio +, notmuch +, ethtool +}: rustPlatform.buildRustPackage rec { pname = "i3status-rust"; @@ -13,9 +22,17 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "1dcfclk8lbqvq2hywr80jm63p1i1kz3893zq99ipgryia46vd397"; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig makeWrapper ]; - buildInputs = [ dbus libpulseaudio ]; + buildInputs = [ dbus libpulseaudio notmuch ]; + + cargoBuildFlags = [ + "--features=notmuch" + ]; + + postFixup = '' + wrapProgram $out/bin/i3status-rs --prefix PATH : "${ethtool}/bin" + ''; # Currently no tests are implemented, so we avoid building the package twice doCheck = false; diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/icewm/default.nix b/third_party/nixpkgs/pkgs/applications/window-managers/icewm/default.nix index f361b27fdf..3e3065301d 100644 --- a/third_party/nixpkgs/pkgs/applications/window-managers/icewm/default.nix +++ b/third_party/nixpkgs/pkgs/applications/window-managers/icewm/default.nix @@ -9,13 +9,13 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "icewm"; - version = "1.8.3"; + version = "1.9.0"; src = fetchFromGitHub { owner = "bbidulock"; repo = pname; rev = version; - sha256 = "sha256-cTJQlUaGvbJmu1xYwFp5GPrM5NjfKBzaMc+l7FeMUP8="; + sha256 = "08prc9ip96bxbmkkab0ymma9yisgs5yzymg4gjcvr945bj4q7crb"; }; nativeBuildInputs = [ cmake pkgconfig perl asciidoc ]; diff --git a/third_party/nixpkgs/pkgs/build-support/docker/default.nix b/third_party/nixpkgs/pkgs/build-support/docker/default.nix index 35382662cf..ba76ce2b81 100644 --- a/third_party/nixpkgs/pkgs/build-support/docker/default.nix +++ b/third_party/nixpkgs/pkgs/build-support/docker/default.nix @@ -340,7 +340,7 @@ rec { # Tar up the layer and throw it into 'layer.tar'. echo "Packing layer..." mkdir $out - tarhash=$(tar -C layer --hard-dereference --sort=name --mtime="@$SOURCE_DATE_EPOCH" --owner=${toString uid} --group=${toString gid} -cf - . | tee $out/layer.tar | tarsum) + tarhash=$(tar -C layer --hard-dereference --sort=name --mtime="@$SOURCE_DATE_EPOCH" --owner=${toString uid} --group=${toString gid} -cf - . | tee -p $out/layer.tar | tarsum) # Add a 'checksum' field to the JSON, with the value set to the # checksum of the tarball. @@ -425,7 +425,7 @@ rec { echo "Packing layer..." mkdir -p $out tarhash=$(tar -C layer --hard-dereference --sort=name --mtime="@$SOURCE_DATE_EPOCH" -cf - . | - tee $out/layer.tar | + tee -p $out/layer.tar | ${tarsum}/bin/tarsum) cat ${baseJson} | jshon -s "$tarhash" -i checksum > $out/json diff --git a/third_party/nixpkgs/pkgs/build-support/install-shell-files/default.nix b/third_party/nixpkgs/pkgs/build-support/install-shell-files/default.nix index e1f2e24dd8..d50661ddc6 100644 --- a/third_party/nixpkgs/pkgs/build-support/install-shell-files/default.nix +++ b/third_party/nixpkgs/pkgs/build-support/install-shell-files/default.nix @@ -1,4 +1,12 @@ -{ makeSetupHook }: +{ makeSetupHook, tests }: # See the header comment in ../setup-hooks/install-shell-files.sh for example usage. -makeSetupHook { name = "install-shell-files"; } ../setup-hooks/install-shell-files.sh +let + setupHook = makeSetupHook { name = "install-shell-files"; } ../setup-hooks/install-shell-files.sh; +in + +setupHook.overrideAttrs (oldAttrs: { + passthru = (oldAttrs.passthru or {}) // { + tests = tests.install-shell-files; + }; +}) diff --git a/third_party/nixpkgs/pkgs/build-support/setup-hooks/install-shell-files.sh b/third_party/nixpkgs/pkgs/build-support/setup-hooks/install-shell-files.sh index e0ea1f7f30..194b408b10 100644 --- a/third_party/nixpkgs/pkgs/build-support/setup-hooks/install-shell-files.sh +++ b/third_party/nixpkgs/pkgs/build-support/setup-hooks/install-shell-files.sh @@ -1,4 +1,4 @@ -#!/bin/bash +# shellcheck shell=bash # Setup hook for the `installShellFiles` package. # # Example usage in a derivation: @@ -19,8 +19,8 @@ # installManPage [...] # # Each argument is checked for its man section suffix and installed into the appropriate -# share/man/ directory. The function returns an error if any paths don't have the man section -# suffix (with optional .gz compression). +# share/man/man/ directory. The function returns an error if any paths don't have the man +# section suffix (with optional .gz compression). installManPage() { local path for path in "$@"; do @@ -49,7 +49,7 @@ installManPage() { done } -# installShellCompletion [--bash|--fish|--zsh] ([--name ] )... +# installShellCompletion [--cmd ] ([--bash|--fish|--zsh] [--name ] )... # # Each path is installed into the appropriate directory for shell completions for the given shell. # If one of `--bash`, `--fish`, or `--zsh` is given the path is assumed to belong to that shell. @@ -61,9 +61,20 @@ installManPage() { # If the shell completion needs to be renamed before installing the optional `--name ` flag # may be given. Any name provided with this flag only applies to the next path. # +# If all shell completions need to be renamed before installing the optional `--cmd ` flag +# may be given. This will synthesize a name for each file, unless overridden with an explicit +# `--name` flag. For example, `--cmd foobar` will synthesize the name `_foobar` for zsh and +# `foobar.bash` for bash. +# # For zsh completions, if the `--name` flag is not given, the path will be automatically renamed # such that `foobar.zsh` becomes `_foobar`. # +# A path may be a named fd, such as produced by the bash construct `<(cmd)`. When using a named fd, +# the shell type flag must be provided, and either the `--name` or `--cmd` flag must be provided. +# This might look something like: +# +# installShellCompletion --zsh --name _foobar <($out/bin/foobar --zsh-completion) +# # This command accepts multiple shell flags in conjunction with multiple paths if you wish to # install them all in one command: # @@ -76,9 +87,16 @@ installManPage() { # installShellCompletion --fish --name foobar.fish share/completions.fish # installShellCompletion --zsh --name _foobar share/completions.zsh # +# Or to use shell newline escaping to split a single invocation across multiple lines: +# +# installShellCompletion --cmd foobar \ +# --bash <($out/bin/foobar --bash-completion) \ +# --fish <($out/bin/foobar --fish-completion) \ +# --zsh <($out/bin/foobar --zsh-completion) +# # If any argument is `--` the remaining arguments will be treated as paths. installShellCompletion() { - local shell='' name='' retval=0 parseArgs=1 arg + local shell='' name='' cmdname='' retval=0 parseArgs=1 arg while { arg=$1; shift; }; do # Parse arguments if (( parseArgs )); then @@ -97,6 +115,17 @@ installShellCompletion() { # treat `--name=foo` the same as `--name foo` name=${arg#--name=} continue;; + --cmd) + cmdname=$1 + shift || { + echo 'installShellCompletion: error: --cmd flag expected an argument' >&2 + return 1 + } + continue;; + --cmd=*) + # treat `--cmd=foo` the same as `--cmd foo` + cmdname=${arg#--cmd=} + continue;; --?*) echo "installShellCompletion: warning: unknown flag ${arg%%=*}" >&2 retval=2 @@ -110,39 +139,67 @@ installShellCompletion() { if (( "${NIX_DEBUG:-0}" >= 1 )); then echo "installShellCompletion: installing $arg${name:+ as $name}" fi - # if we get here, this is a path - # Identify shell - local basename - basename=$(stripHash "$arg") + # if we get here, this is a path or named pipe + # Identify shell and output name local curShell=$shell - if [[ -z "$curShell" ]]; then - # auto-detect the shell - case "$basename" in - ?*.bash) curShell=bash;; - ?*.fish) curShell=fish;; - ?*.zsh) curShell=zsh;; - *) - if [[ "$basename" = _* && "$basename" != *.* ]]; then - # probably zsh - echo "installShellCompletion: warning: assuming path \`$arg' is zsh; please specify with --zsh" >&2 - curShell=zsh - else - echo "installShellCompletion: warning: unknown shell for path: $arg" >&2 - retval=2 - continue - fi;; - esac + local outName='' + if [[ -z "$arg" ]]; then + echo "installShellCompletion: error: empty path is not allowed" >&2 + return 1 + elif [[ -p "$arg" ]]; then + # this is a named fd or fifo + if [[ -z "$curShell" ]]; then + echo "installShellCompletion: error: named pipe requires one of --bash, --fish, or --zsh" >&2 + return 1 + elif [[ -z "$name" && -z "$cmdname" ]]; then + echo "installShellCompletion: error: named pipe requires one of --cmd or --name" >&2 + return 1 + fi + else + # this is a path + local argbase + argbase=$(stripHash "$arg") + if [[ -z "$curShell" ]]; then + # auto-detect the shell + case "$argbase" in + ?*.bash) curShell=bash;; + ?*.fish) curShell=fish;; + ?*.zsh) curShell=zsh;; + *) + if [[ "$argbase" = _* && "$argbase" != *.* ]]; then + # probably zsh + echo "installShellCompletion: warning: assuming path \`$arg' is zsh; please specify with --zsh" >&2 + curShell=zsh + else + echo "installShellCompletion: warning: unknown shell for path: $arg" >&2 + retval=2 + continue + fi;; + esac + fi + outName=$argbase fi # Identify output path - local outName sharePath - outName=${name:-$basename} + if [[ -n "$name" ]]; then + outName=$name + elif [[ -n "$cmdname" ]]; then + case "$curShell" in + bash|fish) outName=$cmdname.$curShell;; + zsh) outName=_$cmdname;; + *) + # Our list of shells is out of sync with the flags we accept or extensions we detect. + echo 'installShellCompletion: internal error' >&2 + return 1;; + esac + fi + local sharePath case "$curShell" in bash) sharePath=bash-completion/completions;; fish) sharePath=fish/vendor_completions.d;; zsh) sharePath=zsh/site-functions # only apply automatic renaming if we didn't have a manual rename - if test -z "$name"; then + if [[ -z "$name" && -z "$cmdname" ]]; then # convert a name like `foo.zsh` into `_foo` outName=${outName%.zsh} outName=_${outName#_} @@ -153,8 +210,16 @@ installShellCompletion() { return 1;; esac # Install file - install -Dm644 -T "$arg" "${!outputBin:?}/share/$sharePath/$outName" || return - # Clear the name, it only applies to one path + local outDir="${!outputBin:?}/share/$sharePath" + local outPath="$outDir/$outName" + if [[ -p "$arg" ]]; then + # install handles named pipes on NixOS but not on macOS + mkdir -p "$outDir" \ + && cat "$arg" > "$outPath" + else + install -Dm644 -T "$arg" "$outPath" + fi || return + # Clear the per-path flags name= done if [[ -n "$name" ]]; then diff --git a/third_party/nixpkgs/pkgs/data/fonts/fraunces/default.nix b/third_party/nixpkgs/pkgs/data/fonts/fraunces/default.nix new file mode 100644 index 0000000000..d5879d6c2b --- /dev/null +++ b/third_party/nixpkgs/pkgs/data/fonts/fraunces/default.nix @@ -0,0 +1,25 @@ +{ lib, fetchzip }: +let + version = "1.000"; +in +fetchzip { + name = "fraunces-${version}"; + + url = "https://github.com/undercasetype/Fraunces/releases/download/${version}/UnderCaseType_Fraunces_${version}.zip"; + + sha256 = "0qgl140qkn9p87x7pk60fd3lj206y5h0fq2xkcj2qiv3sxbqxwqb"; + + postFetch = '' + mkdir -p $out/share/fonts/ + unzip -j $downloadedFile \*.otf -d $out/share/fonts/opentype + unzip -j $downloadedFile \*.ttf -d $out/share/fonts/truetype + ''; + + meta = with lib; { + description = "A display, “Old Style” soft-serif typeface inspired by early 20th century typefaces"; + homepage = "https://github.com/undercasetype/Fraunces"; + license = licenses.ofl; + maintainers = [ maintainers.marsam ]; + platforms = platforms.all; + }; +} diff --git a/third_party/nixpkgs/pkgs/data/fonts/iosevka/bin.nix b/third_party/nixpkgs/pkgs/data/fonts/iosevka/bin.nix index c3e77c1051..8188c569ff 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/iosevka/bin.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/iosevka/bin.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchurl, unzip +{ stdenv, lib, fetchurl, iosevka, unzip , variant ? "" }: @@ -29,17 +29,11 @@ in stdenv.mkDerivation rec { unzip -d $out/share/fonts/truetype $src ''; - meta = with lib; { - homepage = "https://be5invis.github.io/Iosevka/"; - downloadPage = "https://github.com/be5invis/Iosevka/releases"; - description = '' - Slender monospace sans-serif and slab-serif typeface inspired by Pragmata - Pro, M+ and PF DIN Mono, designed to be the ideal font for programming. - ''; - license = licenses.ofl; - platforms = platforms.all; - maintainers = [ maintainers.cstrahan ]; + meta = iosevka.meta // { + maintainers = with lib.maintainers; [ + cstrahan + ]; }; - passthru.updateScript = ./update.sh; + passthru.updateScript = ./update-bin.sh; } diff --git a/third_party/nixpkgs/pkgs/data/fonts/iosevka/default.nix b/third_party/nixpkgs/pkgs/data/fonts/iosevka/default.nix index 5167c494fa..3d35079610 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/iosevka/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/iosevka/default.nix @@ -1,5 +1,5 @@ { stdenv, lib, pkgs, fetchFromGitHub, nodejs, nodePackages, remarshal -, ttfautohint-nox, otfcc +, ttfautohint-nox # Custom font set options. # See https://github.com/be5invis/Iosevka#build-your-own-style @@ -27,23 +27,30 @@ assert (privateBuildPlan != null) -> set != null; +let + # We don't know the attribute name for the Iosevka package as it + # changes not when our update script is run (which in turn updates + # node-packages.json, but when node-packages/generate.sh is run + # (which updates node-packages.nix). + # + # Doing it this way ensures that the package can always be built, + # although possibly an older version than ioseva-bin. + nodeIosevka = ( + lib.findSingle + (drv: drv ? packageName && drv.packageName == "iosevka") + (throw "no 'iosevka' package found in nodePackages") + (throw "multiple 'iosevka' packages found in nodePackages") + (lib.attrValues nodePackages) + ).override (drv: { dontNpmInstall = true; }); +in stdenv.mkDerivation rec { pname = if set != null then "iosevka-${set}" else "iosevka"; - - version = "3.2.2"; - - src = fetchFromGitHub { - owner = "be5invis"; - repo = "Iosevka"; - rev = "v${version}"; - sha256 = "1wbnp6gr3ywvspwk6i0jn68zwjmsd38arn4n2dkh7mdkrmvah81k"; - }; + inherit (nodeIosevka) version src; nativeBuildInputs = [ nodejs - nodePackages."iosevka-build-deps-../../data/fonts/iosevka" + nodeIosevka remarshal - otfcc ttfautohint-nox ]; @@ -61,9 +68,7 @@ stdenv.mkDerivation rec { echo -e "\n" >> parameters.toml cat "$extraParametersPath" >> parameters.toml ''} - ln -s ${ - nodePackages."iosevka-build-deps-../../data/fonts/iosevka" - }/lib/node_modules/iosevka-build-deps/node_modules . + ln -s ${nodeIosevka}/lib/node_modules/iosevka/node_modules . runHook postConfigure ''; @@ -74,13 +79,19 @@ stdenv.mkDerivation rec { ''; installPhase = '' + runHook preInstall fontdir="$out/share/fonts/truetype" install -d "$fontdir" install "dist/$pname/ttf"/* "$fontdir" + runHook postInstall ''; enableParallelBuilding = true; + passthru = { + updateScript = ./update-default.sh; + }; + meta = with stdenv.lib; { homepage = "https://be5invis.github.io/Iosevka"; downloadPage = "https://github.com/be5invis/Iosevka/releases"; @@ -96,6 +107,7 @@ stdenv.mkDerivation rec { ttuegel babariviere rileyinman + AluisioASG ]; }; } diff --git a/third_party/nixpkgs/pkgs/data/fonts/iosevka/package.json b/third_party/nixpkgs/pkgs/data/fonts/iosevka/package.json deleted file mode 100644 index bc77296088..0000000000 --- a/third_party/nixpkgs/pkgs/data/fonts/iosevka/package.json +++ /dev/null @@ -1,28 +0,0 @@ -{ - "name": "iosevka-build-deps", - "version": "3.2.2", - "scripts": { - "build": "verda -f verdafile.js" - }, - "dependencies": { - "@iarna/toml": "^2.2.5", - "cldr": "^5.5.4", - "ejs": "^3.1.3", - "fs-extra": "^9.0.0", - "object-assign": "^4.1.1", - "otfcc-ttcize": "^0.10.2", - "patel": "^0.33.1", - "prettier": "^2.0.5", - "semver": "^7.1.3", - "spiro": "^2.0.0", - "stylus": "^0.54.7", - "topsort": "^0.0.2", - "ttf2woff": "^2.0.1", - "ttf2woff2": "^3.0.0", - "typo-geom": "^0.8.0", - "unicode-13.0.0": "^0.8.0", - "unorm": "^1.6.0", - "verda": "^1.0.1", - "which": "^2.0.2" - } -} diff --git a/third_party/nixpkgs/pkgs/data/fonts/iosevka/update.sh b/third_party/nixpkgs/pkgs/data/fonts/iosevka/update-bin.sh similarity index 70% rename from third_party/nixpkgs/pkgs/data/fonts/iosevka/update.sh rename to third_party/nixpkgs/pkgs/data/fonts/iosevka/update-bin.sh index df78c62a6c..a402f152d8 100755 --- a/third_party/nixpkgs/pkgs/data/fonts/iosevka/update.sh +++ b/third_party/nixpkgs/pkgs/data/fonts/iosevka/update-bin.sh @@ -1,11 +1,12 @@ #! /usr/bin/env nix-shell #! nix-shell -i bash -p curl jq -set -e +set -euo pipefail +cd "$(dirname "${BASH_SOURCE[0]}")" release=$(curl -s https://api.github.com/repos/be5invis/Iosevka/releases/latest) -oldVersion=$(nix-instantiate --eval -E 'with import ./. {}; lib.getVersion iosevka-bin' | tr -d '"') +oldVersion=$(nix-instantiate --eval -E 'with import ../../../.. {}; lib.getVersion iosevka-bin' | tr -d '"') version=$(echo "$release" | jq -r .tag_name | tr -d v) if test "$oldVersion" = "$version"; then @@ -13,8 +14,7 @@ if test "$oldVersion" = "$version"; then exit 0 fi -file=$(nix-instantiate --eval -A iosevka-bin.meta.position | sed -r 's/^"(.*):[0-9]+"$/\1/') -sed -i "s/$oldVersion/$version/" "$file" +sed -i "s/$oldVersion/$version/" bin.nix { echo '# This file was autogenerated. DO NOT EDIT!' @@ -25,4 +25,4 @@ sed -i "s/$oldVersion/$version/" "$file" $(nix-prefetch-url "https://github.com/be5invis/Iosevka/releases/download/v$version/$asset") done echo '}' -} >$(dirname "$file")/variants.nix +} >variants.nix diff --git a/third_party/nixpkgs/pkgs/data/fonts/iosevka/update-default.sh b/third_party/nixpkgs/pkgs/data/fonts/iosevka/update-default.sh new file mode 100755 index 0000000000..208ea6101a --- /dev/null +++ b/third_party/nixpkgs/pkgs/data/fonts/iosevka/update-default.sh @@ -0,0 +1,21 @@ +#!/usr/bin/env nix-shell +#!nix-shell -i bash -p common-updater-scripts coreutils gawk replace +set -euo pipefail +cd "$(dirname "${BASH_SOURCE[0]}")" + +nixpkgs=../../../.. +repo=https://github.com/be5invis/Iosevka + +# Discover the latest version. +current_version=$(nix-instantiate "$nixpkgs" --eval --strict -A iosevka.version | tr -d '"') +new_version=$(list-git-tags "$repo" | sort --reverse --version-sort | awk 'match($0, /^v([0-9.]+)$/, m) { print m[1]; exit; }') +if [[ "$new_version" == "$current_version" ]]; then + echo "iosevka: no update found" + exit +fi + +# Update the source package in nodePackages. +current_source="$repo/archive/v$current_version.tar.gz" +new_source="$repo/archive/v$new_version.tar.gz" +replace-literal -ef "$current_source" "$new_source" ../../../development/node-packages/node-packages.json +echo "iosevka: $current_version -> $new_version (after nodePackages update)" diff --git a/third_party/nixpkgs/pkgs/data/fonts/ttf-tw-moe/default.nix b/third_party/nixpkgs/pkgs/data/fonts/ttf-tw-moe/default.nix new file mode 100644 index 0000000000..aeda5cd695 --- /dev/null +++ b/third_party/nixpkgs/pkgs/data/fonts/ttf-tw-moe/default.nix @@ -0,0 +1,27 @@ +{ stdenv, fetchzip }: + +fetchzip { + name = "ttf-tw-moe"; + + url = "https://github.com/Jiehong/TW-fonts/archive/b30ae75e9dc299afd61e31cfd43f7a0a157dfb1f.zip"; + + postFetch = '' + mkdir -p $out/share/fonts + unzip -j $downloadedFile TW-fonts-b30ae75e9dc299afd61e31cfd43f7a0a157dfb1f/\*.ttf -d $out/share/fonts/truetype + ''; + + sha256 = "0khgxih9z6pqf7pdp21xjp24wb9ygsrdcmzpjb7vr9x8n78i1fbs"; + + meta = with stdenv.lib; { + homepage = "http://www.moe.gov.tw/"; + description = "Set of KAI and SONG fonts from the Ministry of Education of Taiwan"; + longDescription = '' + Installs 2 TTF fonts: MOESongUN and TW-MOE-Std-Kai. + Both are provided by the Ministry of Education of Taiwan; each character's shape + closely follows the official recommendation, and can be used as for teaching purposes. + ''; + license = licenses.cc-by-nd-30; + maintainers = [ maintainers.jiehong ]; + platforms = platforms.all; + }; +} diff --git a/third_party/nixpkgs/pkgs/data/icons/numix-cursor-theme/default.nix b/third_party/nixpkgs/pkgs/data/icons/numix-cursor-theme/default.nix index d0411a8c56..7ff3c4ca23 100644 --- a/third_party/nixpkgs/pkgs/data/icons/numix-cursor-theme/default.nix +++ b/third_party/nixpkgs/pkgs/data/icons/numix-cursor-theme/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, inkscape, xcursorgen }: +{ stdenv, fetchFromGitHub, fetchpatch, inkscape, xcursorgen }: stdenv.mkDerivation rec { version = "1.1"; @@ -14,6 +14,15 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ inkscape xcursorgen ]; + patches = [ + # Remove when https://github.com/numixproject/numix-cursor-theme/pull/7 is merged + (fetchpatch { + url = "https://github.com/stephaneyfx/numix-cursor-theme/commit/3b647bf768cebb8f127b88e3786f6a9640460197.patch"; + sha256 = "174kmhlvv76wwvndkys78aqc32051sqg3wzc0xg6b7by4agrbg76"; + name = "support-inkscape-1-in-numix-cursor-theme.patch"; + }) + ]; + buildPhase = '' patchShebangs . HOME=$TMP ./build.sh diff --git a/third_party/nixpkgs/pkgs/data/icons/numix-icon-theme-circle/default.nix b/third_party/nixpkgs/pkgs/data/icons/numix-icon-theme-circle/default.nix index f43ca473f0..ef06c2e253 100644 --- a/third_party/nixpkgs/pkgs/data/icons/numix-icon-theme-circle/default.nix +++ b/third_party/nixpkgs/pkgs/data/icons/numix-icon-theme-circle/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "numix-icon-theme-circle"; - version = "20.07.11"; + version = "20.09.19"; src = fetchFromGitHub { owner = "numixproject"; repo = pname; rev = version; - sha256 = "0vj3d3wb12ksnkm99s32k7nrf9m5j83zzvkd0rwk8l0b30df975j"; + sha256 = "1rqlq5ssxqj0nc0i8av7zprj94km5645xzqi5j5i0sxd3jbmyfjx"; }; nativeBuildInputs = [ gtk3 ]; diff --git a/third_party/nixpkgs/pkgs/data/icons/numix-icon-theme-square/default.nix b/third_party/nixpkgs/pkgs/data/icons/numix-icon-theme-square/default.nix index 51a2100d3a..b0b4e20073 100644 --- a/third_party/nixpkgs/pkgs/data/icons/numix-icon-theme-square/default.nix +++ b/third_party/nixpkgs/pkgs/data/icons/numix-icon-theme-square/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "numix-icon-theme-square"; - version = "20.07.11"; + version = "20.09.19"; src = fetchFromGitHub { owner = "numixproject"; repo = pname; rev = version; - sha256 = "07jy8l2r6grn7pabn3dnkc8j7xdykl7k57br30c6v61ss8paf2rw"; + sha256 = "0afraarfcd66mpidmn0l90wif8kmwzdj3s09g704kwszyijxs80z"; }; nativeBuildInputs = [ gtk3 ]; diff --git a/third_party/nixpkgs/pkgs/data/misc/hackage/default.nix b/third_party/nixpkgs/pkgs/data/misc/hackage/default.nix index c9950d9fcd..3c9a531ab6 100644 --- a/third_party/nixpkgs/pkgs/data/misc/hackage/default.nix +++ b/third_party/nixpkgs/pkgs/data/misc/hackage/default.nix @@ -1,6 +1,6 @@ { fetchurl }: fetchurl { - url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/197a82b352062bfeeefd4b62bfec19dd51a3728d.tar.gz"; - sha256 = "11c9a67j421vf6a7vvh280gsmssf49rxqnamdp1n9iljkhlfh5z1"; + url = "https://github.com/commercialhaskell/all-cabal-hashes/archive/59ba02b3424684458764210fa9e32ca08e516db2.tar.gz"; + sha256 = "0m4scz6b7xg7kisy6zlnw258pkfksmzzppw9gp0g6rdl0cxly239"; } diff --git a/third_party/nixpkgs/pkgs/data/misc/tzdata/default.nix b/third_party/nixpkgs/pkgs/data/misc/tzdata/default.nix index 367ee06390..dc80580ff5 100644 --- a/third_party/nixpkgs/pkgs/data/misc/tzdata/default.nix +++ b/third_party/nixpkgs/pkgs/data/misc/tzdata/default.nix @@ -2,16 +2,16 @@ stdenv.mkDerivation rec { pname = "tzdata"; - version = "2019c"; + version = "2020c"; srcs = [ (fetchurl { url = "https://data.iana.org/time-zones/releases/tzdata${version}.tar.gz"; - sha256 = "0z7w1yv37cfk8yhix2cillam091vgp1j4g8fv84261q9mdnq1ivr"; + sha256 = "1nab36g5ibs88wg2mzpzygi1wh5gh2al1qjvbk8sb90sbw8ar43q"; }) (fetchurl { url = "https://data.iana.org/time-zones/releases/tzcode${version}.tar.gz"; - sha256 = "1m3y2rnf1nggxxhxplab5zdd5whvar3ijyrv7lifvm82irkd7szn"; + sha256 = "1r5zrk1k3jhhilkhrx82fd19rvysji8jk05gq5v0rndmyx07zacs"; }) ]; diff --git a/third_party/nixpkgs/pkgs/data/themes/canta/default.nix b/third_party/nixpkgs/pkgs/data/themes/canta/default.nix index 8534fe7a50..c6a6678b98 100644 --- a/third_party/nixpkgs/pkgs/data/themes/canta/default.nix +++ b/third_party/nixpkgs/pkgs/data/themes/canta/default.nix @@ -58,7 +58,7 @@ stdenv.mkDerivation rec { description = "Flat Design theme for GTK based desktop environments"; homepage = "https://github.com/vinceliuice/Canta-theme"; license = licenses.gpl2; - platforms = platforms.unix; + platforms = platforms.linux; # numix-icon-theme-circle unavailable in darwin maintainers = [ maintainers.romildo ]; }; } diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/extensions/battery-status/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome-3/extensions/battery-status/default.nix deleted file mode 100644 index c6518201da..0000000000 --- a/third_party/nixpkgs/pkgs/desktops/gnome-3/extensions/battery-status/default.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ stdenv, fetchFromGitHub }: - -stdenv.mkDerivation rec { - pname = "gnome-shell-extension-battery-status"; - version = "6"; - - src = fetchFromGitHub { - owner = "milliburn"; - repo = "gnome-shell-extension-battery_status"; - rev = "v${version}"; - sha256 = "1w83h863mzffjnmk322xq90qf3y9dzay1w9yw5r0qnbsq1ljl8p4"; - }; - - uuid = "battery_status@milliburn.github.com"; - - installPhase = '' - runHook preInstall - mkdir -p $out/share/gnome-shell/extensions - cp -r ${uuid} $out/share/gnome-shell/extensions/ - runHook postInstall - ''; - - meta = with stdenv.lib; { - description = "Configurable lightweight battery charge indicator and autohider"; - license = licenses.gpl2; - broken = true; # not compatable with latest GNOME - maintainers = with maintainers; [ jonafato ]; - homepage = "https://github.com/milliburn/gnome-shell-extension-battery_status"; - }; -} diff --git a/third_party/nixpkgs/pkgs/desktops/gnome-3/extensions/material-shell/default.nix b/third_party/nixpkgs/pkgs/desktops/gnome-3/extensions/material-shell/default.nix index 87869f27d4..7b5156997b 100644 --- a/third_party/nixpkgs/pkgs/desktops/gnome-3/extensions/material-shell/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/gnome-3/extensions/material-shell/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "gnome-shell-extension-material-shell"; - version = "8"; + version = "9"; src = fetchFromGitHub { owner = "material-shell"; repo = "material-shell"; rev = version; - sha256 = "08zc6xl2b7k7l5l6afr40ii3gnxxbysan3cqv2s9g614rbsmc62r"; + sha256 = "154ids72hkkvibqpq3522wf6h9qw7zkjnf8dgz50vxbkiiy015xn"; }; # This package has a Makefile, but it's used for building a zip for diff --git a/third_party/nixpkgs/pkgs/desktops/lxde/core/lxtask/default.nix b/third_party/nixpkgs/pkgs/desktops/lxde/core/lxtask/default.nix index 2bb281494b..a1525ec8b7 100644 --- a/third_party/nixpkgs/pkgs/desktops/lxde/core/lxtask/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/lxde/core/lxtask/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "lxtask"; - version = "0.1.9"; + version = "0.1.10"; src = fetchurl { url = "mirror://sourceforge/lxde/${pname}-${version}.tar.xz"; - sha256 = "0cv4hx5dg01hbyi5p10pl78n0a40xajpq4wx9c7886pkmpq8isj1"; + sha256 = "0b2fxg8jjjpk219gh7qa18g45365598nd2bq7rrq0bdvqjdxy5i2"; }; nativeBuildInputs = [ pkgconfig intltool ]; diff --git a/third_party/nixpkgs/pkgs/desktops/plasma-5/kdecoration.nix b/third_party/nixpkgs/pkgs/desktops/plasma-5/kdecoration.nix index 3f2e9be462..569da3c703 100644 --- a/third_party/nixpkgs/pkgs/desktops/plasma-5/kdecoration.nix +++ b/third_party/nixpkgs/pkgs/desktops/plasma-5/kdecoration.nix @@ -2,11 +2,7 @@ mkDerivation { name = "kdecoration"; - meta = { - broken = builtins.compareVersions qtbase.version "5.12.0" < 0; - }; nativeBuildInputs = [ extra-cmake-modules ]; buildInputs = [ qtbase ki18n ]; outputs = [ "out" "dev" ]; - broken = true; } diff --git a/third_party/nixpkgs/pkgs/desktops/plasma-5/kwin/default.nix b/third_party/nixpkgs/pkgs/desktops/plasma-5/kwin/default.nix index 78b6909f04..e2fb0877ec 100644 --- a/third_party/nixpkgs/pkgs/desktops/plasma-5/kwin/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/plasma-5/kwin/default.nix @@ -1,5 +1,5 @@ { - mkDerivation, lib, + mkDerivation, lib, fetchpatch, extra-cmake-modules, kdoctools, epoxy,libICE, libSM, libinput, libxkbcommon, udev, wayland, xcb-util-cursor, @@ -37,6 +37,11 @@ mkDerivation { patches = [ ./0001-follow-symlinks.patch ./0002-xwayland.patch + (fetchpatch { # included in >= 5.18.6 + name = "EGL_TEXTURE_Y_XUXV_WL.diff"; + url = "https://github.com/KDE/kwin/commit/2c76cc478.diff"; + sha256 = "1ywaky05h5j1x758q3yhp3ap45ispffghyxynqz5lybl5n6yyxhy"; + }) ]; CXXFLAGS = [ ''-DNIXPKGS_XWAYLAND=\"${lib.getBin xwayland}/bin/Xwayland\"'' diff --git a/third_party/nixpkgs/pkgs/development/compilers/gcc/builder.sh b/third_party/nixpkgs/pkgs/development/compilers/gcc/builder.sh index 2204744a4b..e1c4768413 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/gcc/builder.sh +++ b/third_party/nixpkgs/pkgs/development/compilers/gcc/builder.sh @@ -287,7 +287,12 @@ postInstall() { done # Two identical man pages are shipped (moving and compressing is done later) - ln -sf gcc.1 "$out"/share/man/man1/g++.1 + for i in "$out"/share/man/man1/*g++.1; do + if test -e "$i"; then + man_prefix=`echo "$i" | sed "s,.*/\(.*\)g++.1,\1,"` + ln -sf "$man_prefix"gcc.1 "$i" + fi + done } genericBuild diff --git a/third_party/nixpkgs/pkgs/development/compilers/ghc/8.10.1.nix b/third_party/nixpkgs/pkgs/development/compilers/ghc/8.10.1.nix index d3835d01e5..42eb994b8f 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/ghc/8.10.1.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/ghc/8.10.1.nix @@ -246,6 +246,7 @@ stdenv.mkDerivation (rec { homepage = "http://haskell.org/ghc"; description = "The Glasgow Haskell Compiler"; maintainers = with stdenv.lib.maintainers; [ marcweber andres peti ]; + timeout = 24 * 3600; inherit (ghc.meta) license platforms; }; diff --git a/third_party/nixpkgs/pkgs/development/compilers/ghc/8.10.2-binary.nix b/third_party/nixpkgs/pkgs/development/compilers/ghc/8.10.2-binary.nix index baa1d879b5..cc9491ede2 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/ghc/8.10.2-binary.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/ghc/8.10.2-binary.nix @@ -2,6 +2,14 @@ , fetchurl, perl, gcc , ncurses6, gmp, glibc, libiconv, numactl , llvmPackages + + # minimal = true; will remove files that aren't strictly necessary for + # regular builds and GHC bootstrapping. + # This is "useful" for staying within hydra's output limits for at least the + # aarch64-linux architecture. + # Examples of unnecessary files are the bundled documentation and files that + # are only needed for profiling builds. +, minimal ? false }: # Prebuilt only does native @@ -82,7 +90,6 @@ stdenv.mkDerivation rec { patchShebangs ghc-${version}/utils/ patchShebangs ghc-${version}/configure '' + - # We have to patch the GMP paths for the integer-gmp package. '' find . -name integer-gmp.buildinfo \ @@ -91,6 +98,12 @@ stdenv.mkDerivation rec { find . -name base.buildinfo \ -exec sed -i "s@extra-lib-dirs: @extra-lib-dirs: ${libiconv}/lib@" {} \; '' + + # aarch64 does HAVE_NUMA so -lnuma requires it in library-dirs in rts/package.conf.in + # FFI_LIB_DIR is a good indication of places it must be needed. + stdenv.lib.optionalString stdenv.hostPlatform.isAarch64 '' + find . -name package.conf.in \ + -exec sed -i "s@FFI_LIB_DIR@FFI_LIB_DIR ${numactl.out}/lib@g" {} \; + '' + # Rename needed libraries and binaries, fix interpreter stdenv.lib.optionalString stdenv.isLinux '' find . -type f -perm -0100 -exec patchelf \ @@ -128,14 +141,35 @@ stdenv.mkDerivation rec { # On Linux, use patchelf to modify the executables so that they can # find editline/gmp. - postFixup = stdenv.lib.optionalString stdenv.isLinux '' - for p in $(find "$out" -type f -executable); do - if isELF "$p"; then - echo "Patchelfing $p" - patchelf --set-rpath "${libPath}:$(patchelf --print-rpath $p)" $p - fi - done - '' + stdenv.lib.optionalString stdenv.isDarwin '' + postFixup = stdenv.lib.optionalString stdenv.isLinux + (if stdenv.hostPlatform.isAarch64 then + # Keep rpath as small as possible on aarch64 for patchelf#244. All Elfs + # are 2 directories deep from $out/lib, so pooling symlinks there makes + # a short rpath. + '' + (cd $out/lib; ln -s ${ncurses6.out}/lib/libtinfo.so.6) + (cd $out/lib; ln -s ${gmp.out}/lib/libgmp.so.10) + (cd $out/lib; ln -s ${numactl.out}/lib/libnuma.so.1) + for p in $(find "$out/lib" -type f -name "*\.so*"); do + (cd $out/lib; ln -s $p) + done + + for p in $(find "$out/lib" -type f -executable); do + if isELF "$p"; then + echo "Patchelfing $p" + patchelf --set-rpath "\$ORIGIN:\$ORIGIN/../.." $p + fi + done + '' + else + '' + for p in $(find "$out" -type f -executable); do + if isELF "$p"; then + echo "Patchelfing $p" + patchelf --set-rpath "${libPath}:$(patchelf --print-rpath $p)" $p + fi + done + '') + stdenv.lib.optionalString stdenv.isDarwin '' # not enough room in the object files for the full path to libiconv :( for exe in $(find "$out" -type f -executable); do isScript $exe && continue @@ -146,6 +180,13 @@ stdenv.mkDerivation rec { for file in $(find "$out" -name setup-config); do substituteInPlace $file --replace /usr/bin/ranlib "$(type -P ranlib)" done + '' + + stdenv.lib.optionalString minimal '' + # Remove profiling objects + find $out -type f -name '*.p_o' -delete + rm $out/lib/ghc-*/bin/ghc-iserv-prof + # Remove docs + rm -r $out/share/{doc,man} ''; doInstallCheck = true; @@ -169,6 +210,18 @@ stdenv.mkDerivation rec { enableShared = true; }; - meta.license = stdenv.lib.licenses.bsd3; - meta.platforms = ["x86_64-linux" "armv7l-linux" "aarch64-linux" "i686-linux" "x86_64-darwin"]; + meta = let + platforms = ["x86_64-linux" "armv7l-linux" "aarch64-linux" "i686-linux" "x86_64-darwin"]; + in { + homepage = "http://haskell.org/ghc"; + description = "The Glasgow Haskell Compiler"; + license = stdenv.lib.licenses.bsd3; + + # The minimal variation can not be distributed because it removes the + # documentation, including licensing information that is required for + # distribution. + inherit platforms; + hydraPlatforms = stdenv.lib.optionals (!minimal) platforms; + maintainers = with stdenv.lib.maintainers; [ lostnet ]; + }; } diff --git a/third_party/nixpkgs/pkgs/development/compilers/ghc/8.10.2.nix b/third_party/nixpkgs/pkgs/development/compilers/ghc/8.10.2.nix index f3d64ced81..41aa5e16ba 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/ghc/8.10.2.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/ghc/8.10.2.nix @@ -107,9 +107,9 @@ stdenv.mkDerivation (rec { outputs = [ "out" "doc" ]; - # https://gitlab.haskell.org/ghc/ghc/-/issues/18549 - patches = [ - ./issue-18549.patch + # https://gitlab.haskell.org/ghc/ghc/-/issues/18549 + patches = [ + ./issue-18549.patch ]; postPatch = "patchShebangs ."; @@ -190,7 +190,7 @@ stdenv.mkDerivation (rec { strictDeps = true; # Don’t add -liconv to LDFLAGS automatically so that GHC will add it itself. - dontAddExtraLibs = true; + dontAddExtraLibs = true; nativeBuildInputs = [ perl autoconf automake m4 python3 sphinx @@ -242,6 +242,7 @@ stdenv.mkDerivation (rec { homepage = "http://haskell.org/ghc"; description = "The Glasgow Haskell Compiler"; maintainers = with stdenv.lib.maintainers; [ marcweber andres peti ]; + timeout = 24 * 3600; inherit (ghc.meta) license platforms; }; diff --git a/third_party/nixpkgs/pkgs/development/compilers/ghc/8.6.5.nix b/third_party/nixpkgs/pkgs/development/compilers/ghc/8.6.5.nix index a5d2bb5c88..3d660dd952 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/ghc/8.6.5.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/ghc/8.6.5.nix @@ -256,6 +256,7 @@ stdenv.mkDerivation (rec { homepage = "http://haskell.org/ghc"; description = "The Glasgow Haskell Compiler"; maintainers = with stdenv.lib.maintainers; [ marcweber andres peti ]; + timeout = 24 * 3600; inherit (ghc.meta) license platforms; }; diff --git a/third_party/nixpkgs/pkgs/development/compilers/ghc/8.8.2.nix b/third_party/nixpkgs/pkgs/development/compilers/ghc/8.8.2.nix index 371a369496..fbb75637df 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/ghc/8.8.2.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/ghc/8.8.2.nix @@ -241,6 +241,7 @@ stdenv.mkDerivation (rec { homepage = "http://haskell.org/ghc"; description = "The Glasgow Haskell Compiler"; maintainers = with stdenv.lib.maintainers; [ marcweber andres peti ]; + timeout = 24 * 3600; inherit (ghc.meta) license platforms; }; diff --git a/third_party/nixpkgs/pkgs/development/compilers/ghc/8.8.3.nix b/third_party/nixpkgs/pkgs/development/compilers/ghc/8.8.3.nix index e26eacca20..538655a0d0 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/ghc/8.8.3.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/ghc/8.8.3.nix @@ -246,6 +246,7 @@ stdenv.mkDerivation (rec { homepage = "http://haskell.org/ghc"; description = "The Glasgow Haskell Compiler"; maintainers = with stdenv.lib.maintainers; [ marcweber andres peti ]; + timeout = 24 * 3600; inherit (ghc.meta) license platforms; }; diff --git a/third_party/nixpkgs/pkgs/development/compilers/ghc/8.8.4.nix b/third_party/nixpkgs/pkgs/development/compilers/ghc/8.8.4.nix index 22a9e6e25f..e69766bccd 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/ghc/8.8.4.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/ghc/8.8.4.nix @@ -119,7 +119,11 @@ stdenv.mkDerivation (rec { postPatch = "patchShebangs ."; # GHC is a bit confused on its cross terminology. - preConfigure = '' + preConfigure = stdenv.lib.optionalString stdenv.isAarch64 '' + # Aarch64 allow backward bootstrapping since earlier versions are unstable. + find . -name \*\.cabal\* -exec sed -i -e 's/\(base.*\)4.14/\14.16/' {} \; \ + -exec sed -i -e 's/\(prim.*\)0.6/\10.8/' {} \; + '' + '' for env in $(env | grep '^TARGET_' | sed -E 's|\+?=.*||'); do export "''${env#TARGET_}=''${!env}" done @@ -246,6 +250,7 @@ stdenv.mkDerivation (rec { homepage = "http://haskell.org/ghc"; description = "The Glasgow Haskell Compiler"; maintainers = with stdenv.lib.maintainers; [ marcweber andres peti ]; + timeout = 24 * 3600; inherit (ghc.meta) license platforms; }; diff --git a/third_party/nixpkgs/pkgs/development/compilers/ghc/9.0.1.nix b/third_party/nixpkgs/pkgs/development/compilers/ghc/9.0.1.nix index 23daee56a7..bdb1a7555c 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/ghc/9.0.1.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/ghc/9.0.1.nix @@ -237,6 +237,7 @@ stdenv.mkDerivation (rec { homepage = "http://haskell.org/ghc"; description = "The Glasgow Haskell Compiler"; maintainers = with stdenv.lib.maintainers; [ marcweber andres peti ]; + timeout = 24 * 3600; inherit (ghc.meta) license platforms; }; diff --git a/third_party/nixpkgs/pkgs/development/compilers/ghcjs-ng/default.nix b/third_party/nixpkgs/pkgs/development/compilers/ghcjs-ng/default.nix index 7b6fbc460a..c6c81491fe 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/ghcjs-ng/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/ghcjs-ng/default.nix @@ -104,4 +104,6 @@ in stdenv.mkDerivation { meta.platforms = passthru.bootPkgs.ghc.meta.platforms; meta.maintainers = [lib.maintainers.elvishjerricco]; + meta.hydraPlatforms = []; + meta.broken = true; # https://hydra.nixos.org/build/129701778 } diff --git a/third_party/nixpkgs/pkgs/development/compilers/gleam/default.nix b/third_party/nixpkgs/pkgs/development/compilers/gleam/default.nix index a40065fe57..00f1247f5d 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/gleam/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/gleam/default.nix @@ -2,13 +2,13 @@ rustPlatform.buildRustPackage rec { pname = "gleam"; - version = "0.11.2"; + version = "0.12.0"; src = fetchFromGitHub { owner = "gleam-lang"; repo = pname; rev = "v${version}"; - sha256 = "1g8yfp1xpkv1lqz8azam40cvrs5cggxlyrb72h8k88br75qmi6hj"; + sha256 = "1hlbskpfqdh5avmqnry69s7x0wj6l6yaqkayx7lj6z99p58p9zrz"; }; nativeBuildInputs = [ pkg-config ]; @@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl ] ++ stdenv.lib.optionals stdenv.isDarwin [ Security ]; - cargoSha256 = "1gfr6c4i5kx8x3q23s4b4n25z2k6xkxpk12acr4ry97pyj2lr5wq"; + cargoSha256 = "1djznh7v6ha4ks8l8arwwn301qclmb7iih774q5y7sbzqrv7sw0q"; meta = with stdenv.lib; { description = "A statically typed language for the Erlang VM"; diff --git a/third_party/nixpkgs/pkgs/development/compilers/go/1.14.nix b/third_party/nixpkgs/pkgs/development/compilers/go/1.14.nix index e9adb0522c..67f9184d8d 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/go/1.14.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/go/1.14.nix @@ -36,11 +36,11 @@ in stdenv.mkDerivation rec { pname = "go"; - version = "1.14.10"; + version = "1.14.11"; src = fetchurl { url = "https://dl.google.com/go/go${version}.src.tar.gz"; - sha256 = "0rfnjl582cm5klv8c2qyyvn26807zn89m5mk282gkc7awfkrjxmk"; + sha256 = "05hgnyda5bpm29gnx1956syq54jmpk4k9cf976vypw8ckg9g6w8q"; }; # perl is used for testing go vet diff --git a/third_party/nixpkgs/pkgs/development/compilers/go/1.15.nix b/third_party/nixpkgs/pkgs/development/compilers/go/1.15.nix index 8e692dca1e..61531fb62b 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/go/1.15.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/go/1.15.nix @@ -36,11 +36,11 @@ in stdenv.mkDerivation rec { pname = "go"; - version = "1.15.3"; + version = "1.15.4"; src = fetchurl { url = "https://dl.google.com/go/go${version}.src.tar.gz"; - sha256 = "1228nv4vyzbqv768dl0bimsic47x9yyqld61qbgqqk75f0jn0sl9"; + sha256 = "0rr3gp99bmdzg381x5fdwa15brllihn57175l0c82sqqljlscg86"; }; # perl is used for testing go vet diff --git a/third_party/nixpkgs/pkgs/development/compilers/go/1.4.nix b/third_party/nixpkgs/pkgs/development/compilers/go/1.4.nix index af125d60ed..efea9d0eb8 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/go/1.4.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/go/1.4.nix @@ -43,6 +43,8 @@ stdenv.mkDerivation rec { cd go patchShebangs ./ # replace /bin/bash + # Disable timezone tests (these fail when `tzdata` is updated) + rm src/time/{example,format}_test.go # Disabling the 'os/http/net' tests (they want files not available in # chroot builds) rm src/net/{multicast_test.go,parse_test.go,port_test.go} @@ -56,8 +58,6 @@ stdenv.mkDerivation rec { sed -i '/TestDialTimeout/areturn' src/net/dial_test.go # Disable the hostname test sed -i '/TestHostname/areturn' src/os/os_test.go - # ParseInLocation fails the test - sed -i '/TestParseInSydney/areturn' src/time/format_test.go sed -i 's,/etc/protocols,${iana-etc}/etc/protocols,' src/net/lookup_unix.go '' + lib.optionalString stdenv.isLinux '' @@ -119,13 +119,6 @@ stdenv.mkDerivation rec { patches = [ ./remove-tools-1.4.patch ./creds-test-1.4.patch - - # This test checks for the wrong thing with recent tzdata. It's been fixed in master but the patch - # actually works on old versions too. - (fetchpatch { - url = "https://github.com/golang/go/commit/91563ced5897faf729a34be7081568efcfedda31.patch"; - sha256 = "1ny5l3f8a9dpjjrnjnsplb66308a0x13sa0wwr4j6yrkc8j4qxqi"; - }) ]; GOOS = if stdenv.isDarwin then "darwin" else "linux"; diff --git a/third_party/nixpkgs/pkgs/development/compilers/graalvm/community-edition.nix b/third_party/nixpkgs/pkgs/development/compilers/graalvm/community-edition.nix new file mode 100644 index 0000000000..71f3b1560c --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/graalvm/community-edition.nix @@ -0,0 +1,167 @@ +{ stdenv, fetchurl, perl, unzip, glibc, zlib, setJavaClassPath }: + +let + common = javaVersion: + let + graalvmXXX-ce = stdenv.mkDerivation rec { + pname = "graalvm${javaVersion}-ce"; + version = "20.2.0"; + srcs = [ + (fetchurl { + sha256 = { "8" = "1s64zkkrns1ykh6dwpjrqy0hs9m1bb08cf7ss7msx33h9ivir5b0"; + "11" = "0aaf0sjsnlckhgsh3j4lph0shahw6slf4yndqcm2swc8i1dlpdsx"; + }.${javaVersion}; + url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-${version}/graalvm-ce-java${javaVersion}-linux-amd64-${version}.tar.gz"; + }) + (fetchurl { + sha256 = { "8" = "1cisyyzab4pdvzavnivhy9w6dwn36ybaxw40w767m142fbi06m3b"; + "11" = "0p4j6mxajmb0xl41c79154pk4vb8bffgg1nmwislahqjky9jkd4j"; + }.${javaVersion}; + url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-${version}/native-image-installable-svm-java${javaVersion}-linux-amd64-${version}.jar"; + }) + (fetchurl { + sha256 = { "8" = "0rwwvk1mkfnl0b50xg7kh6015kjmsw2ra0ckrzmabl88z4bnzh2y"; + "11" = "0lc9as2a00j74lp7jby4p10vn5bbkiydzvzk28zfcbsp28p4wvwn"; + }.${javaVersion}; + url = "https://github.com/oracle/truffleruby/releases/download/vm-${version}/ruby-installable-svm-java${javaVersion}-linux-amd64-${version}.jar"; + }) + (fetchurl { + sha256 = { "8" = "0mj8p72qgvvrwpsbk0bsqldynlz1wq07icf951wq5xdbr0whj1gz"; + "11" = "1lkszqn4islsza011iabayv6riym0dwnkv83pkmk06b230qjfhzb"; + }.${javaVersion}; + url = "https://github.com/graalvm/graalpython/releases/download/vm-${version}/python-installable-svm-java${javaVersion}-linux-amd64-${version}.jar"; + }) + (fetchurl { + sha256 = { "8" = "1br7camk7y8ych43ws57096100f9kzjvqznh2flmws78ipcrrb66"; + "11" = "10swxspjvzh0j82lbpy38dckk69lw1pawqkhnj1hxd05ls36fwq5"; + }.${javaVersion}; + url = "https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-${version}/wasm-installable-svm-java${javaVersion}-linux-amd64-${version}.jar"; + }) + ]; + nativeBuildInputs = [ unzip perl ]; + unpackPhase = '' + unpack_jar() { + jar=$1 + unzip -o $jar -d $out + perl -ne 'use File::Path qw(make_path); + use File::Basename qw(dirname); + if (/^(.+) = (.+)$/) { + make_path dirname("$ENV{out}/$1"); + system "ln -s $2 $ENV{out}/$1"; + }' $out/META-INF/symlinks + perl -ne 'if (/^(.+) = ([r-])([w-])([x-])([r-])([w-])([x-])([r-])([w-])([x-])$/) { + my $mode = ($2 eq 'r' ? 0400 : 0) + ($3 eq 'w' ? 0200 : 0) + ($4 eq 'x' ? 0100 : 0) + + ($5 eq 'r' ? 0040 : 0) + ($6 eq 'w' ? 0020 : 0) + ($7 eq 'x' ? 0010 : 0) + + ($8 eq 'r' ? 0004 : 0) + ($9 eq 'w' ? 0002 : 0) + ($10 eq 'x' ? 0001 : 0); + chmod $mode, "$ENV{out}/$1"; + }' $out/META-INF/permissions + rm -rf $out/META-INF + } + + mkdir -p $out + arr=($srcs) + tar xf ''${arr[0]} -C $out --strip-components=1 + unpack_jar ''${arr[1]} + unpack_jar ''${arr[2]} + unpack_jar ''${arr[3]} + unpack_jar ''${arr[4]} + ''; + + installPhase = { + "8" = '' + # BUG workaround http://mail.openjdk.java.net/pipermail/graal-dev/2017-December/005141.html + substituteInPlace $out/jre/lib/security/java.security \ + --replace file:/dev/random file:/dev/./urandom \ + --replace NativePRNGBlocking SHA1PRNG + + # provide libraries needed for static compilation + for f in ${glibc}/lib/* ${glibc.static}/lib/* ${zlib.static}/lib/*; do + ln -s $f $out/jre/lib/svm/clibraries/linux-amd64/$(basename $f) + done + + # allow using external truffle-api.jar and languages not included in the distrubution + rm $out/jre/lib/jvmci/parentClassLoader.classpath + ''; + "11" = '' + # BUG workaround http://mail.openjdk.java.net/pipermail/graal-dev/2017-December/005141.html + substituteInPlace $out/conf/security/java.security \ + --replace file:/dev/random file:/dev/./urandom \ + --replace NativePRNGBlocking SHA1PRNG + + # provide libraries needed for static compilation + for f in ${glibc}/lib/* ${glibc.static}/lib/* ${zlib.static}/lib/*; do + ln -s $f $out/lib/svm/clibraries/linux-amd64/$(basename $f) + done + ''; + }.${javaVersion}; + + dontStrip = true; + + # copy-paste openjdk's preFixup + preFixup = '' + # Set JAVA_HOME automatically. + mkdir -p $out/nix-support + cat < $out/nix-support/setup-hook + if [ -z "\''${JAVA_HOME-}" ]; then export JAVA_HOME=$out; fi + EOF + ''; + + postFixup = '' + rpath="${ { "8" = "$out/jre/lib/amd64/jli:$out/jre/lib/amd64/server:$out/jre/lib/amd64"; + "11" = "$out/lib/jli:$out/lib/server:$out/lib"; + }.${javaVersion} + }:${ + stdenv.lib.makeLibraryPath [ + stdenv.cc.cc.lib # libstdc++.so.6 + zlib # libz.so.1 + ]}" + + for f in $(find $out -type f -perm -0100); do + patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "$f" || true + patchelf --set-rpath "$rpath" "$f" || true + + if ldd "$f" | fgrep 'not found'; then echo "in file $f"; fi + done + ''; + + propagatedBuildInputs = [ setJavaClassPath zlib ]; # $out/bin/native-image needs zlib to build native executables + + doInstallCheck = true; + installCheckPhase = '' + echo ${stdenv.lib.escapeShellArg '' + public class HelloWorld { + public static void main(String[] args) { + System.out.println("Hello World"); + } + } + ''} > HelloWorld.java + $out/bin/javac HelloWorld.java + + # run on JVM with Graal Compiler + $out/bin/java -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI -XX:+UseJVMCICompiler HelloWorld | fgrep 'Hello World' + + # Ahead-Of-Time compilation + $out/bin/native-image --no-server HelloWorld + ./helloworld | fgrep 'Hello World' + + # Ahead-Of-Time compilation with --static + $out/bin/native-image --no-server --static HelloWorld + ./helloworld | fgrep 'Hello World' + ''; + + passthru.home = graalvmXXX-ce; + + meta = with stdenv.lib; { + homepage = "https://www.graalvm.org/"; + description = "High-Performance Polyglot VM"; + license = with licenses; [ upl gpl2Classpath bsd3 ]; + maintainers = with maintainers; [ bandresen volth hlolli glittershark ]; + platforms = [ "x86_64-linux" ]; + }; + }; + in + graalvmXXX-ce; +in { + graalvm8-ce = common "8"; + graalvm11-ce = common "11"; +} diff --git a/third_party/nixpkgs/pkgs/development/compilers/halide/default.nix b/third_party/nixpkgs/pkgs/development/compilers/halide/default.nix index 356ebe2317..1ff821edf8 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/halide/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/halide/default.nix @@ -1,42 +1,43 @@ -{ llvmPackages, lib, fetchFromGitHub, cmake -, libpng, libjpeg, mesa, eigen -, openblas, blas, lapack +{ llvmPackages +, lib +, fetchFromGitHub +, cmake +, libpng +, libjpeg +, mesa +, eigen +, openblas +, blas +, lapack }: assert blas.implementation == "openblas" && lapack.implementation == "openblas"; -let - version = "2019_08_27"; - -in llvmPackages.stdenv.mkDerivation { - - name = "halide-${builtins.replaceStrings ["_"] ["."] version}"; +llvmPackages.stdenv.mkDerivation rec { + pname = "halide"; + version = "10.0.0"; src = fetchFromGitHub { owner = "halide"; repo = "Halide"; - rev = "release_${version}"; - sha256 = "09xf8v9zyxx2fn6s1yzjkyzcf9zyzrg3x5vivgd2ljzbfhm8wh7n"; + rev = "v${version}"; + sha256 = "0il71rppjp76m7zd420siidvhs76sqiq26h60ywk812sj9mmgxj6"; }; - patches = [ ./nix.patch ]; - # clang fails to compile intermediate code because # of unused "--gcc-toolchain" option postPatch = '' sed -i "s/-Werror//" src/CMakeLists.txt ''; - cmakeFlags = [ "-DWARNINGS_AS_ERRORS=OFF" ]; + cmakeFlags = [ "-DWARNINGS_AS_ERRORS=OFF" "-DWITH_PYTHON_BINDINGS=OFF" ]; # To handle the lack of 'local' RPATH; required, as they call one of # their built binaries requiring their libs, in the build process. preBuild = '' - export LD_LIBRARY_PATH="$(pwd)/lib''${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH" + export LD_LIBRARY_PATH="$(pwd)/src''${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH" ''; - enableParallelBuilding = true; - # Note: only openblas and not atlas part of this Nix expression # see pkgs/development/libraries/science/math/liblapack/3.5.0.nix # to get a hint howto setup atlas instead of openblas @@ -44,24 +45,11 @@ in llvmPackages.stdenv.mkDerivation { nativeBuildInputs = [ cmake ]; - # No install target for cmake available. - # Calling install target in Makefile causes complete rebuild - # and the library rpath is broken, because libncursesw.so.6 is missing. - # Another way is using "make halide_archive", but the tarball is not easy - # to disassemble. - installPhase = '' - find - mkdir -p "$out/lib" "$out/bin" - cp bin/HalideTrace* "$out/bin" - cp lib/libHalide.so "$out/lib" - cp -r include "$out" - ''; - meta = with lib; { description = "C++ based language for image processing and computational photography"; homepage = "https://halide-lang.org"; license = licenses.mit; - platforms = [ "i686-linux" "x86_64-linux" ]; + platforms = [ "i686-linux" "x86_64-linux" "aarch64-linux" ]; maintainers = [ maintainers.ck3d ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/compilers/halide/nix.patch b/third_party/nixpkgs/pkgs/development/compilers/halide/nix.patch deleted file mode 100644 index fb9bbf1a4c..0000000000 --- a/third_party/nixpkgs/pkgs/development/compilers/halide/nix.patch +++ /dev/null @@ -1,56 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 4ba384324..7e23038f7 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -75,10 +75,10 @@ set(CMAKE_RUNTIME_OUTPUT_DIRECTORY "${CMAKE_BINARY_DIR}/bin") - - set(LLVM_VERSION "${LLVM_VERSION_MAJOR}${LLVM_VERSION_MINOR}") - --file(TO_NATIVE_PATH "${LLVM_TOOLS_BINARY_DIR}/llvm-as${CMAKE_EXECUTABLE_SUFFIX}" LLVM_AS) --file(TO_NATIVE_PATH "${LLVM_TOOLS_BINARY_DIR}/llvm-nm${CMAKE_EXECUTABLE_SUFFIX}" LLVM_NM) --file(TO_NATIVE_PATH "${LLVM_TOOLS_BINARY_DIR}/clang${CMAKE_EXECUTABLE_SUFFIX}" CLANG) --file(TO_NATIVE_PATH "${LLVM_TOOLS_BINARY_DIR}/llvm-config${CMAKE_EXECUTABLE_SUFFIX}" LLVM_CONFIG) -+find_program(LLVM_AS llvm-as HINTS ${LLVM_TOOLS_BINARY_DIR}) -+find_program(LLVM_NM llvm-nm HINTS ${LLVM_TOOLS_BINARY_DIR}) -+find_program(CLANG clang HINTS ${LLVM_TOOLS_BINARY_DIR}) -+find_program(LLVM_CONFIG llvm-config HINTS ${LLVM_TOOLS_BINARY_DIR}) - - # LLVM doesn't appear to expose --system-libs via its CMake interface, - # so we must shell out to llvm-config to find this info -diff --git a/apps/linear_algebra/CMakeLists.txt b/apps/linear_algebra/CMakeLists.txt -index 132c80e6a..36ce865f2 100644 ---- a/apps/linear_algebra/CMakeLists.txt -+++ b/apps/linear_algebra/CMakeLists.txt -@@ -26,7 +26,7 @@ if (CBLAS_FOUND) - # Atlas requires also linking against its provided libcblas for cblas symbols - set(ATLAS_EXTRA_LIBS cblas) # XXX fragile - set(OpenBLAS_EXTRA_LIBS) -- set(BLAS_VENDORS OpenBLAS ATLAS) -+ set(BLAS_VENDORS OpenBLAS) - - # TODO - # there are more vendors we could add here that support the cblas interface -@@ -41,6 +41,7 @@ if (CBLAS_FOUND) - message(STATUS " ${BLAS_VENDOR}: Missing") - else() - message(STATUS " ${BLAS_VENDOR}: Found") -+ set(BLAS_LIBRARIES "${BLAS_LIBRARIES}" CACHE FILEPATH "BLAS library to use") - list(APPEND BLAS_VENDORS ${NAME}) - endif() - endforeach() -diff --git a/apps/linear_algebra/tests/CMakeLists.txt b/apps/linear_algebra/tests/CMakeLists.txt -index cc02eb0a4..c20419a0d 100644 ---- a/apps/linear_algebra/tests/CMakeLists.txt -+++ b/apps/linear_algebra/tests/CMakeLists.txt -@@ -19,7 +19,7 @@ target_compile_options(test_halide_blas PRIVATE -Wno-unused-variable) - target_link_libraries(test_halide_blas - PRIVATE - halide_blas -- cblas # XXX fragile -+ ${BLAS_LIBRARIES} - ${HALIDE_COMPILER_LIB} - ) - --- -2.23.0 - diff --git a/third_party/nixpkgs/pkgs/development/compilers/ldc/default.nix b/third_party/nixpkgs/pkgs/development/compilers/ldc/default.nix index 5a4baabcf8..e0a689c7fa 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/ldc/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/ldc/default.nix @@ -1,5 +1,4 @@ import ./generic.nix { - version = "1.20.1"; - ldcSha256 = "1bqsgab22v02pc3c9gcyf15y7aimadv24d68icaw5lpgnvzxy89b"; + version = "1.24.0"; + ldcSha256 = "0g5svf55i0kq55q49awmwqj9qi1n907cyrn1vjdjgs8nx6nn35gx"; } - diff --git a/third_party/nixpkgs/pkgs/development/compilers/ldc/generic.nix b/third_party/nixpkgs/pkgs/development/compilers/ldc/generic.nix index c93d423945..214d64cfa7 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/ldc/generic.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/ldc/generic.nix @@ -1,5 +1,5 @@ { version, ldcSha256 }: -{ stdenv, fetchurl, cmake, ninja, llvm_5, llvm_8, curl, tzdata +{ stdenv, fetchurl, cmake, ninja, llvm_11, curl, tzdata , libconfig, lit, gdb, unzip, darwin, bash , callPackage, makeWrapper, runCommand, targetPackages , ldcBootstrap ? callPackage ./bootstrap.nix { } @@ -56,16 +56,12 @@ stdenv.mkDerivation rec { ''; nativeBuildInputs = [ - cmake ninja makeWrapper unzip ldcBootstrap lit lit.python + cmake ldcBootstrap lit lit.python llvm_11 makeWrapper ninja unzip ] ++ stdenv.lib.optionals stdenv.hostPlatform.isDarwin [ darwin.apple_sdk.frameworks.Foundation - # https://github.com/NixOS/nixpkgs/issues/57120 - # https://github.com/NixOS/nixpkgs/pull/59197#issuecomment-481972515 - llvm_5 ] ++ stdenv.lib.optionals (!stdenv.hostPlatform.isDarwin) [ - llvm_8 # https://github.com/NixOS/nixpkgs/pull/36378#issuecomment-385034818 gdb ]; diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/11/llvm.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/11/llvm.nix index 3f37cac078..c2b70a149b 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/11/llvm.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/11/llvm.nix @@ -163,7 +163,7 @@ in stdenv.mkDerivation (rec { description = "Collection of modular and reusable compiler and toolchain technologies"; homepage = "https://llvm.org/"; license = stdenv.lib.licenses.ncsa; - maintainers = with stdenv.lib.maintainers; [ lovek323 raskin dtzWill ]; + maintainers = with stdenv.lib.maintainers; [ lovek323 raskin dtzWill primeos ]; platforms = stdenv.lib.platforms.all; }; } // stdenv.lib.optionalAttrs enableManpages { diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/rocm/default.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/rocm/default.nix index 3e2c3cec0c..aae6f16828 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/rocm/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/rocm/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchFromGitHub, callPackage, wrapCCWith }: let - version = "3.8.0"; + version = "3.9.0"; src = fetchFromGitHub { owner = "RadeonOpenCompute"; repo = "llvm-project"; rev = "rocm-${version}"; - sha256 = "19771lxqbm7yhsy06s4bk7amiryrfdbc0jawribw063l7n599xs6"; + sha256 = "01ljx6mhix3z2pgddgn0ymhrsbigs1nqlz3kkwkr6p2igprrly9f"; }; in rec { clang = wrapCCWith rec { diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/rocm/lld.nix b/third_party/nixpkgs/pkgs/development/compilers/llvm/rocm/lld.nix index 052bfd1c62..34a094bf37 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/rocm/lld.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/rocm/lld.nix @@ -21,6 +21,10 @@ stdenv.mkDerivation rec { postInstall = '' moveToOutput include "$dev" moveToOutput lib "$dev" + + # Fix lld binary path for CMake. + substituteInPlace "$dev/lib/cmake/lld/LLDTargets-release.cmake" \ + --replace "\''${_IMPORT_PREFIX}/bin/lld" "$out/bin/lld" ''; meta = with stdenv.lib; { diff --git a/third_party/nixpkgs/pkgs/development/compilers/mono/6.nix b/third_party/nixpkgs/pkgs/development/compilers/mono/6.nix index 0157fa7b7f..04028648a2 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/mono/6.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/mono/6.nix @@ -2,8 +2,8 @@ callPackage ./generic.nix ({ inherit Foundation libobjc; - version = "6.0.0.313"; + version = "6.12.0.90"; srcArchiveSuffix = "tar.xz"; - sha256 = "0l0cd6q5xh1vdm6zr78rkfqdsmrgzanjgpxvgig0pyd3glfyjim9"; + sha256 = "1b6d0926rd0nkmsppwjgmwsxx1479jjvr1gm7zwk64siml15rpji"; enableParallelBuilding = true; }) diff --git a/third_party/nixpkgs/pkgs/development/compilers/mono/generic.nix b/third_party/nixpkgs/pkgs/development/compilers/mono/generic.nix index c510f37266..ca3b314780 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/mono/generic.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/mono/generic.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, bison, pkgconfig, glib, gettext, perl, libgdiplus, libX11, callPackage, ncurses, zlib, withLLVM ? false, cacert, Foundation, libobjc, python, version, sha256, autoconf, libtool, automake, cmake, which +{ stdenv, fetchurl, bison, pkgconfig, glib, gettext, perl, libgdiplus, libX11, callPackage, ncurses, zlib, withLLVM ? false, cacert, Foundation, libobjc, python3, version, sha256, autoconf, libtool, automake, cmake, which , gnumake42 , enableParallelBuilding ? true , srcArchiveSuffix ? "tar.bz2" @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ gnumake42 ]; buildInputs = - [ bison pkgconfig glib gettext perl libgdiplus libX11 ncurses zlib python autoconf libtool automake cmake which + [ bison pkgconfig glib gettext perl libgdiplus libX11 ncurses zlib python3 autoconf libtool automake cmake which ] ++ (stdenv.lib.optionals stdenv.isDarwin [ Foundation libobjc ]); diff --git a/third_party/nixpkgs/pkgs/development/compilers/openjdk/11.nix b/third_party/nixpkgs/pkgs/development/compilers/openjdk/11.nix index 30b56ecba1..92320f5eac 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/openjdk/11.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/openjdk/11.nix @@ -11,8 +11,8 @@ let major = "11"; minor = "0"; - update = "8"; - build = "10"; + update = "9"; + build = "11"; openjdk = stdenv.mkDerivation rec { pname = "openjdk" + lib.optionalString headless "-headless"; @@ -20,7 +20,7 @@ let src = fetchurl { url = "http://hg.openjdk.java.net/jdk-updates/jdk${major}u/archive/jdk-${version}.tar.gz"; - sha256 = "1sdncn1bk4h8xxfnmrl1125maqy6mc0v0y1dyifwsa04wasj9hbz"; + sha256 = "fc2ee2ee5822f2440e66114c8fa76888fea7ddd351282940c222d34b5f871858"; }; nativeBuildInputs = [ pkgconfig autoconf ]; diff --git a/third_party/nixpkgs/pkgs/development/compilers/openjdk/8.nix b/third_party/nixpkgs/pkgs/development/compilers/openjdk/8.nix index bcd3524bb8..a51b765fb6 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/openjdk/8.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/openjdk/8.nix @@ -19,8 +19,8 @@ let aarch64-linux = "aarch64"; }.${stdenv.system} or (throw "Unsupported platform"); - update = "265"; - build = if stdenv.isAarch64 then "b01" else "ga"; + update = "272"; + build = if stdenv.isAarch64 then "b10" else "b10"; baseurl = if stdenv.isAarch64 then "https://hg.openjdk.java.net/aarch64-port/jdk8u-shenandoah" else "https://hg.openjdk.java.net/jdk8u/jdk8u"; repover = lib.optionalString stdenv.isAarch64 "aarch64-shenandoah-" @@ -29,50 +29,50 @@ let jdk8 = fetchurl { name = "jdk8-${repover}.tar.gz"; url = "${baseurl}/archive/${repover}.tar.gz"; - sha256 = if stdenv.isAarch64 then "1a2adw51af064rzlngsdlhs9gl47h3lv6dzvr8swqgl2n93nlbxa" - else "02j1nbf3rxl581fqzc6i3ri6wwxx1dhkmj5klkh5xlp8dkhclr30"; + sha256 = if stdenv.isAarch64 then "db98897d6fddce85996a9b0daf4352abce4578be0b51eada41702ee1469dd415" + else "8f0e8324d3500432e8ed642b4cc7dff90a617dbb2a18a94c07c1020d32f93b7a"; }; langtools = fetchurl { name = "langtools-${repover}.tar.gz"; url = "${baseurl}/langtools/archive/${repover}.tar.gz"; - sha256 = if stdenv.isAarch64 then "0hfrbz7421s2barfrfp0fvmh45iksw2zx1z4ykjg3giv8zbmswfm" - else "1r2adp7sn3y45rb5h059qygz18bgmkqr2g2jc9mpzskl5vwsqiw4"; + sha256 = if stdenv.isAarch64 then "6544c1cc455844bbbb3d2914ffc716b1cee7f19e6aa223764d41a7cddc41322c" + else "632417b0b067c929eda6958341352e29c5810056a5fec138641eb3503f9635b7"; }; hotspot = fetchurl { name = "hotspot-${repover}.tar.gz"; url = "${baseurl}/hotspot/archive/${repover}.tar.gz"; - sha256 = if stdenv.isAarch64 then "0g5h74snfl2dj2xwlvb5hgfbqmnbhxax68axadz11mq7r2bhd0lk" - else "10xj8qr499r6nla74bjh4dmq7pkj63iircijk1wyv9xz5v777pcc"; + sha256 = if stdenv.isAarch64 then "37abb89e66641607dc6f372946bfc6bd413f23fec0b9c3baf75f41ce517e21d8" + else "2142f3b769800a955613b51ffe192551bab1db95b0c219900cf34febc6f20245"; }; corba = fetchurl { name = "corba-${repover}.tar.gz"; url = "${baseurl}/corba/archive/${repover}.tar.gz"; - sha256 = if stdenv.isAarch64 then "0wfqrpr5m4gnavgsl6zcy2l3c7sgn3yl7yhp2crh9icp44ld2cj9" - else "0lk4jimrafgphffsj5yyyhl6pib0y5xxqcr09bgr2w8sjkp4s04s"; + sha256 = if stdenv.isAarch64 then "5da82f7b4aceff32e02d2f559033e3b62b9509d79f1a6891af871502e1d125b1" + else "320098d64c843c1ff2ae62579817f9fb4a81772bc0313a543ce68976ad7a6d98"; }; jdk = fetchurl { name = "jdk-${repover}.tar.gz"; url = "${baseurl}/jdk/archive/${repover}.tar.gz"; - sha256 = if stdenv.isAarch64 then "0ss49bv2dzb9vkabpv1ag04wli5722p0a8gqkzqmzw4nj67snfqw" - else "0anbp4vq8bzhqsqxlgjd0dx0irf57x4i5ddbpljl36vy2pi9xsm7"; + sha256 = if stdenv.isAarch64 then "ee613296d823605dcd1a0fe2f89b4c7393bdb8ae5f2659f48f5cbc0012bb1a47" + else "957c24fc58ac723c8cd808ab60c77d7853710148944c8b9a59f470c4c809e1a0"; }; jaxws = fetchurl { name = "jaxws-${repover}.tar.gz"; url = "${baseurl}/jaxws/archive/${repover}.tar.gz"; - sha256 = if stdenv.isAarch64 then "1nwn6mz38app6pk5f1x3vya1x9qfckyl7z6bi62k6mj2c72ikfh5" - else "113d5nx2mp30m6xy2m2wh0nixk45q8abimlszkiq09w1w1ckzpba"; + sha256 = if stdenv.isAarch64 then "7c426b85f0d378125fa46e6d1b25ddc27ad29d93514d38c5935c84fc540b26ce" + else "4efb0ee143dfe86c8ee06db2429fb81a0c8c65af9ea8fc18daa05148c8a1162f"; }; jaxp = fetchurl { name = "jaxp-${repover}.tar.gz"; url = "${baseurl}/jaxp/archive/${repover}.tar.gz"; - sha256 = if stdenv.isAarch64 then "1rhgbwvp7xls7r3f5jm69dw7x521vamchv917dwiz1byvm2bwn7s" - else "0nvqidjssmamcrchq15cg3lfv5v3cnrw05a4h20xmhlpgb9im0vj"; + sha256 = if stdenv.isAarch64 then "928e363877afa7e0ad0c350bb18be6ab056b23708c0624a0bd7f01c4106c2a14" + else "25a651c670d5b036042f7244617a3eb11fec80c07745c1c8181a1cdebeda3d8e"; }; nashorn = fetchurl { name = "nashorn-${repover}.tar.gz"; url = "${baseurl}/nashorn/archive/${repover}.tar.gz"; - sha256 = if stdenv.isAarch64 then "14gp8q6jw1hq2wlmcalfwn1kgmnq5w9svqnbjww20f25phxkicij" - else "0fm9ldps7ayk7r3wjqiyxp1s6hvi242kl7f92ydkmlxqyfajx60a"; + sha256 = if stdenv.isAarch64 then "f060e08c5924457d4f5047c02ad6a987bdbdcd1cea53d2208322073ba4f398c3" + else "a28b41d86f0c87ceacd2b686dd31c9bf391d851b1b5187a49ef5e565fc2cbc84"; }; openjdk8 = stdenv.mkDerivation { pname = "openjdk" + lib.optionalString headless "-headless"; diff --git a/third_party/nixpkgs/pkgs/development/compilers/openjdk/default.nix b/third_party/nixpkgs/pkgs/development/compilers/openjdk/default.nix index 3dd74f73a7..fa96f7b3b0 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/openjdk/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/openjdk/default.nix @@ -31,6 +31,10 @@ let gtk3 gnome_vfs GConf glib ]; + passthru = { + inherit gtk3; + }; + patches = [ ./fix-java-home-jdk10.patch ./read-truststore-from-env-jdk10.patch diff --git a/third_party/nixpkgs/pkgs/development/compilers/openjdk/jre.nix b/third_party/nixpkgs/pkgs/development/compilers/openjdk/jre.nix new file mode 100644 index 0000000000..817cdf9c26 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/openjdk/jre.nix @@ -0,0 +1,19 @@ +{ jdk +, runCommand +, patchelf +, lib +, modules ? [ "java.base" ] +}: + +let + jre = runCommand "${jdk.name}-jre" { + nativeBuildInputs = [ patchelf ]; + buildInputs = [ jdk ]; + passthru = { + home = "${jre}"; + }; + } '' + jlink --module-path ${jdk}/lib/openjdk/jmods --add-modules ${lib.concatStringsSep "," modules} --output $out + patchelf --shrink-rpath $out/bin/* $out/lib/jexec $out/lib/jspawnhelper $out/lib/*.so $out/lib/*/*.so + ''; +in jre diff --git a/third_party/nixpkgs/pkgs/development/compilers/owl-lisp/default.nix b/third_party/nixpkgs/pkgs/development/compilers/owl-lisp/default.nix index 80ea9eb4c0..93713af99b 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/owl-lisp/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/owl-lisp/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "owl-lisp"; - version = "0.1.19"; + version = "0.1.23"; src = fetchFromGitLab { owner = "owl-lisp"; repo = "owl"; rev = "v${version}"; - sha256 = "1bgjd2gkr5risfcc401rlr5fc82gwm4r2gpp9gzkg9h64acivkjx"; + sha256 = "1indcbicqcdlk9sinkdyhk50fi1b4cb7yrr14vr874gjzmwr2l3i"; }; nativeBuildInputs = [ which ]; diff --git a/third_party/nixpkgs/pkgs/development/compilers/purescript/psc-package/default.nix b/third_party/nixpkgs/pkgs/development/compilers/purescript/psc-package/default.nix index 0bebd5d2f5..88f7adce5a 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/purescript/psc-package/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/purescript/psc-package/default.nix @@ -44,12 +44,10 @@ stdenv.mkDerivation rec { '' + '' chmod u-w $PSC_PACKAGE - $PSC_PACKAGE --bash-completion-script $PSC_PACKAGE > psc-package.bash - $PSC_PACKAGE --fish-completion-script $PSC_PACKAGE > psc-package.fish - $PSC_PACKAGE --zsh-completion-script $PSC_PACKAGE > _psc-package - installShellCompletion \ - psc-package.{bash,fish} \ - --zsh _psc-package + installShellCompletion --cmd psc-package \ + --bash <($PSC_PACKAGE --bash-completion-script $PSC_PACKAGE) \ + --fish <($PSC_PACKAGE --fish-completion-script $PSC_PACKAGE) \ + --zsh <($PSC_PACKAGE --zsh-completion-script $PSC_PACKAGE) ''; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/compilers/rust/1_45.nix b/third_party/nixpkgs/pkgs/development/compilers/rust/1_45.nix index 94c70880db..2b3de4dd38 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/rust/1_45.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/rust/1_45.nix @@ -32,6 +32,7 @@ import ./default.nix { armv7-unknown-linux-gnueabihf = "d44294732cf268ea84908f1135f574ab9489132a332eaa9d5bda547374b15d54"; aarch64-unknown-linux-gnu = "a2d74ebeec0b6778026b6c37814cdc91d14db3b0d8b6d69d036216f4d9cf7e49"; x86_64-apple-darwin = "a5464e7bcbce9647607904a4afa8362382f1fc55d39e7bbaf4483ac00eb5d56a"; + powerpc64le-unknown-linux-gnu = "22deeca259459db31065af7c862fcab7fbfb623200520c65002ed2ba93d87ad2"; }; selectRustPackage = pkgs: pkgs.rust_1_45; diff --git a/third_party/nixpkgs/pkgs/development/compilers/rust/1_46.nix b/third_party/nixpkgs/pkgs/development/compilers/rust/1_47.nix similarity index 55% rename from third_party/nixpkgs/pkgs/development/compilers/rust/1_46.nix rename to third_party/nixpkgs/pkgs/development/compilers/rust/1_47.nix index c999b346ee..8298a5d956 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/rust/1_46.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/rust/1_47.nix @@ -19,24 +19,25 @@ } @ args: import ./default.nix { - rustcVersion = "1.46.0"; - rustcSha256 = "0a17jby2pd050s24cy4dfc0gzvgcl585v3vvyfilniyvjrqknsid"; + rustcVersion = "1.47.0"; + rustcSha256 = "sha256-MYXfBkxHR/LIubuMRGjt1Y/0rW0HiAyHmsGxc7do2B0="; # Note: the version MUST be one version prior to the version we're # building - bootstrapVersion = "1.45.2"; + bootstrapVersion = "1.46.0"; # fetch hashes by running `print-hashes.sh 1.45.2` bootstrapHashes = { - i686-unknown-linux-gnu = "5b2050dde23152750de89f7e59acaab6bf088d0beb5854c69c9a545fd254b936"; - x86_64-unknown-linux-gnu = "860feed955726a4d96ffe40758a110053326b9ae11c9e1ee059e9c6222f25643"; - arm-unknown-linux-gnueabihf = "ddb5f59bbdef84e0b7c83049461e003ed031dd881a4622365c3d475102535c60"; - armv7-unknown-linux-gnueabihf = "7a556581f87602705f9c89b04cce621cfbba9050b6fbe478166e91d164567531"; - aarch64-unknown-linux-gnu = "151fad66442d28a4e4786753d1afb559c4a3d359081c64769273a31c2f0f4d30"; - x86_64-apple-darwin = "6e8067624ede10aa23081d62e0086c6f42f7228cc0d00fb5ff24d4dac65249d6"; + i686-unknown-linux-gnu = "6ebd7e04dc18a36d08b9731cdb42d5caf8460e1eb41b75f3a8596c39f5e71206"; + x86_64-unknown-linux-gnu = "e3b98bc3440fe92817881933f9564389eccb396f5f431f33d48b979fa2fbdcf5"; + arm-unknown-linux-gnueabihf = "bb8af68565321f54608e918597083eb016ed0f9f4f3cc23f7cc5f467b934ce7f"; + armv7-unknown-linux-gnueabihf = "7c0640879d7f2c38db60352e3c0f09e3fc6fa3bac6ca8f22cbccb1eb5e950121"; + aarch64-unknown-linux-gnu = "f0c6d630f3dedb3db69d69ed9f833aa6b472363096f5164f1068c7001ca42aeb"; + x86_64-apple-darwin = "82d61582a3772932432a99789c3b3bd4abe6baca339e355048ca9efb9ea5b4db"; + powerpc64le-unknown-linux-gnu = "89e2f4761d257f017a4b6aa427f36ac0603195546fa2cfded8c899789832941c"; }; - selectRustPackage = pkgs: pkgs.rust_1_46; + selectRustPackage = pkgs: pkgs.rust_1_47; rustcPatches = [ ]; diff --git a/third_party/nixpkgs/pkgs/development/compilers/rust/binary.nix b/third_party/nixpkgs/pkgs/development/compilers/rust/binary.nix index 9ae7e51e5f..b84e390e0b 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/rust/binary.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/rust/binary.nix @@ -1,4 +1,4 @@ -{ stdenv, makeWrapper, bash, curl, darwin +{ stdenv, makeWrapper, bash, curl, darwin, zlib , version , src , platform @@ -42,17 +42,23 @@ rec { ./install.sh --prefix=$out \ --components=${installComponents} - ${optionalString (stdenv.isLinux && bootstrapping) '' + ${optionalString (stdenv.isLinux && bootstrapping) ('' patchelf \ --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ "$out/bin/rustc" + '' + optionalString (stdenv.lib.versionAtLeast version "1.46") + # rustc bootstrap needs libz starting from 1.46 + '' + ln -s ${zlib}/lib/libz.so.1 $out/lib/libz.so.1 + ln -s ${zlib}/lib/libz.so $out/lib/libz.so + '' + '' patchelf \ --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ "$out/bin/rustdoc" patchelf \ --set-interpreter $(cat $NIX_CC/nix-support/dynamic-linker) \ "$out/bin/cargo" - ''} + '')} # Do NOT, I repeat, DO NOT use `wrapProgram` on $out/bin/rustc # (or similar) here. It causes strange effects where rustc loads diff --git a/third_party/nixpkgs/pkgs/development/compilers/rust/print-hashes.sh b/third_party/nixpkgs/pkgs/development/compilers/rust/print-hashes.sh index 957011fad3..9180ccb67d 100755 --- a/third_party/nixpkgs/pkgs/development/compilers/rust/print-hashes.sh +++ b/third_party/nixpkgs/pkgs/development/compilers/rust/print-hashes.sh @@ -14,6 +14,7 @@ PLATFORMS=( armv7-unknown-linux-gnueabihf aarch64-unknown-linux-gnu x86_64-apple-darwin + powerpc64le-unknown-linux-gnu ) BASEURL=https://static.rust-lang.org/dist VERSION=${1:-} diff --git a/third_party/nixpkgs/pkgs/development/compilers/scala/2.10.nix b/third_party/nixpkgs/pkgs/development/compilers/scala/2.10.nix deleted file mode 100644 index d41442afaf..0000000000 --- a/third_party/nixpkgs/pkgs/development/compilers/scala/2.10.nix +++ /dev/null @@ -1,43 +0,0 @@ -{ stdenv, fetchurl, makeWrapper, jre, gnugrep, coreutils }: - -stdenv.mkDerivation rec { - name = "scala-2.10.7"; - - src = fetchurl { - url = "https://www.scala-lang.org/files/archive/${name}.tgz"; - sha256 = "04gi55lzgrhsb78qw8jmnccqim92rw6898knw0a7gfzn2sci30wj"; - }; - - propagatedBuildInputs = [ jre ] ; - buildInputs = [ makeWrapper ] ; - - installPhase = '' - mkdir -p $out - rm bin/*.bat - mv * $out - - for p in $(ls $out/bin/) ; do - wrapProgram $out/bin/$p \ - --prefix PATH ":" ${coreutils}/bin \ - --prefix PATH ":" ${gnugrep}/bin \ - --prefix PATH ":" ${jre}/bin \ - --set JAVA_HOME ${jre} - done - ''; - - meta = { - description = "A general purpose programming language"; - longDescription = '' - Scala is a general purpose programming language designed to express - common programming patterns in a concise, elegant, and type-safe way. - It smoothly integrates features of object-oriented and functional - languages, enabling Java and other programmers to be more productive. - Code sizes are typically reduced by a factor of two to three when - compared to an equivalent Java application. - ''; - homepage = "https://www.scala-lang.org/"; - license = stdenv.lib.licenses.bsd3; - platforms = stdenv.lib.platforms.all; - branch = "2.10"; - }; -} diff --git a/third_party/nixpkgs/pkgs/development/compilers/scala/2.11.nix b/third_party/nixpkgs/pkgs/development/compilers/scala/2.11.nix deleted file mode 100644 index d8fcd3f9a8..0000000000 --- a/third_party/nixpkgs/pkgs/development/compilers/scala/2.11.nix +++ /dev/null @@ -1,48 +0,0 @@ -{ stdenv, fetchurl, makeWrapper, jre, gnugrep, coreutils }: - -stdenv.mkDerivation rec { - name = "scala-2.11.12"; - - src = fetchurl { - url = "https://www.scala-lang.org/files/archive/${name}.tgz"; - sha256 = "1a4nc4qp9dm4rps47j92hlmxxqskv67qbdmjqc5zd94wd4rps7di"; - }; - - propagatedBuildInputs = [ jre ] ; - buildInputs = [ makeWrapper ] ; - - installPhase = '' - mkdir -p $out - rm "bin/"*.bat - mv * $out - - # put docs in correct subdirectory - mkdir -p $out/share/doc - mv $out/doc $out/share/doc/${name} - mv $out/man $out/share/man - - for p in $(ls $out/bin/) ; do - wrapProgram $out/bin/$p \ - --prefix PATH ":" ${coreutils}/bin \ - --prefix PATH ":" ${gnugrep}/bin \ - --prefix PATH ":" ${jre}/bin \ - --set JAVA_HOME ${jre} - done - ''; - - meta = { - description = "General purpose programming language"; - longDescription = '' - Scala is a general purpose programming language designed to express - common programming patterns in a concise, elegant, and type-safe way. - It smoothly integrates features of object-oriented and functional - languages, enabling Java and other programmers to be more productive. - Code sizes are typically reduced by a factor of two to three when - compared to an equivalent Java application. - ''; - homepage = "https://www.scala-lang.org/"; - license = stdenv.lib.licenses.bsd3; - platforms = stdenv.lib.platforms.all; - branch = "2.11"; - }; -} diff --git a/third_party/nixpkgs/pkgs/development/compilers/scala/2.12.nix b/third_party/nixpkgs/pkgs/development/compilers/scala/2.12.nix deleted file mode 100644 index 1a7c5677de..0000000000 --- a/third_party/nixpkgs/pkgs/development/compilers/scala/2.12.nix +++ /dev/null @@ -1,47 +0,0 @@ -{ stdenv, fetchurl, makeWrapper, jre, gnugrep, coreutils }: - -stdenv.mkDerivation rec { - name = "scala-2.12.12"; - - src = fetchurl { - url = "https://www.scala-lang.org/files/archive/${name}.tgz"; - sha256 = "0avyaa7y8w7494339krcpqhc2p8y5pjk4pz7mqmzdzwy7hgws81m"; - }; - - propagatedBuildInputs = [ jre ] ; - buildInputs = [ makeWrapper ] ; - - installPhase = '' - mkdir -p $out - rm "bin/"*.bat - mv * $out - - # put docs in correct subdirectory - mkdir -p $out/share/doc - mv $out/doc $out/share/doc/scala - mv $out/{LICENSE,NOTICE} $out/share/doc/scala - - for p in $(ls $out/bin/) ; do - wrapProgram $out/bin/$p \ - --prefix PATH ":" ${coreutils}/bin \ - --prefix PATH ":" ${gnugrep}/bin \ - --prefix PATH ":" ${jre}/bin \ - --set JAVA_HOME ${jre} - done - ''; - - meta = { - description = "General purpose programming language"; - longDescription = '' - Scala is a general purpose programming language designed to express - common programming patterns in a concise, elegant, and type-safe way. - It smoothly integrates features of object-oriented and functional - languages, enabling Java and other programmers to be more productive. - Code sizes are typically reduced by a factor of two to three when - compared to an equivalent Java application. - ''; - homepage = "https://www.scala-lang.org/"; - license = stdenv.lib.licenses.bsd3; - platforms = stdenv.lib.platforms.all; - }; -} diff --git a/third_party/nixpkgs/pkgs/development/compilers/scala/2.13.nix b/third_party/nixpkgs/pkgs/development/compilers/scala/2.13.nix deleted file mode 100644 index 75996c382a..0000000000 --- a/third_party/nixpkgs/pkgs/development/compilers/scala/2.13.nix +++ /dev/null @@ -1,47 +0,0 @@ -{ stdenv, fetchurl, makeWrapper, jre, gnugrep, coreutils }: - -stdenv.mkDerivation rec { - name = "scala-2.13.3"; - - src = fetchurl { - url = "https://www.scala-lang.org/files/archive/${name}.tgz"; - sha256 = "0zv9w9f6g2cfydsvp8mqcfgv2v3487xp4ca1qndg6v7jrhdp7wy9"; - }; - - propagatedBuildInputs = [ jre ] ; - buildInputs = [ makeWrapper ] ; - - installPhase = '' - mkdir -p $out - rm "bin/"*.bat - mv * $out - - # put docs in correct subdirectory - mkdir -p $out/share/doc - mv $out/doc $out/share/doc/scala - mv $out/{LICENSE,NOTICE} $out/share/doc/scala - - for p in $(ls $out/bin/) ; do - wrapProgram $out/bin/$p \ - --prefix PATH ":" ${coreutils}/bin \ - --prefix PATH ":" ${gnugrep}/bin \ - --prefix PATH ":" ${jre}/bin \ - --set JAVA_HOME ${jre} - done - ''; - - meta = { - description = "General purpose programming language"; - longDescription = '' - Scala is a general purpose programming language designed to express - common programming patterns in a concise, elegant, and type-safe way. - It smoothly integrates features of object-oriented and functional - languages, enabling Java and other programmers to be more productive. - Code sizes are typically reduced by a factor of two to three when - compared to an equivalent Java application. - ''; - homepage = "https://www.scala-lang.org/"; - license = stdenv.lib.licenses.bsd3; - platforms = stdenv.lib.platforms.all; - }; -} diff --git a/third_party/nixpkgs/pkgs/development/compilers/scala/2.x.nix b/third_party/nixpkgs/pkgs/development/compilers/scala/2.x.nix new file mode 100644 index 0000000000..02b9b99d84 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/scala/2.x.nix @@ -0,0 +1,117 @@ +{ stdenv, lib, fetchurl, makeWrapper, jre, gnugrep, coreutils, nixosTests +, writeScript, common-updater-scripts, git, gnused, nix, nixfmt }: + +with lib; + +let + repo = "git@github.com:scala/scala.git"; + + common = { version, sha256, test, pname }: + stdenv.mkDerivation rec { + inherit version; + + name = "scala-${version}"; + + src = fetchurl { + inherit sha256; + url = "https://www.scala-lang.org/files/archive/scala-${version}.tgz"; + }; + + propagatedBuildInputs = [ jre ]; + buildInputs = [ makeWrapper ]; + + installPhase = '' + mkdir -p $out + rm bin/*.bat + mv * $out + + # put docs in correct subdirectory + mkdir -p $out/share/doc + mv $out/doc $out/share/doc/${name} + mv $out/man $out/share/man + + for p in $(ls $out/bin/) ; do + wrapProgram $out/bin/$p \ + --prefix PATH ":" ${coreutils}/bin \ + --prefix PATH ":" ${gnugrep}/bin \ + --prefix PATH ":" ${jre}/bin \ + --set JAVA_HOME ${jre} + done + ''; + + passthru = { + tests = [ test ]; + + updateScript = writeScript "update.sh" '' + #!${stdenv.shell} + set -o errexit + PATH=${ + stdenv.lib.makeBinPath [ + common-updater-scripts + coreutils + git + gnused + nix + nixfmt + ] + } + versionSelect='v${versions.major version}.${versions.minor version}.*' + oldVersion="$(nix-instantiate --eval -E "with import ./. {}; lib.getVersion ${pname}" | tr -d '"')" + latestTag="$(git -c 'versionsort.suffix=-' ls-remote --exit-code --refs --sort='version:refname' --tags ${repo} "$versionSelect" | tail --lines=1 | cut --delimiter='/' --fields=3 | sed 's|^v||g')" + if [ "$oldVersion" != "$latestTag" ]; then + nixpkgs="$(git rev-parse --show-toplevel)" + default_nix="$nixpkgs/pkgs/development/compilers/scala/2.x.nix" + update-source-version ${pname} "$latestTag" --version-key=version --print-changes + nixfmt "$default_nix" + else + echo "${pname} is already up-to-date" + fi + ''; + }; + + meta = { + description = "A general purpose programming language"; + longDescription = '' + Scala is a general purpose programming language designed to express + common programming patterns in a concise, elegant, and type-safe way. + It smoothly integrates features of object-oriented and functional + languages, enabling Java and other programmers to be more productive. + Code sizes are typically reduced by a factor of two to three when + compared to an equivalent Java application. + ''; + homepage = "https://www.scala-lang.org/"; + license = licenses.bsd3; + platforms = platforms.all; + branch = versions.majorMinor version; + maintainers = [ maintainers.nequissimus ]; + }; + }; +in { + scala_2_10 = common { + version = "2.10.7"; + sha256 = "koMRmRb2u3cU4HaihAzPItWIGbNVIo7RWRrm92kp8RE="; + test = { inherit (nixosTests) scala_2_10; }; + pname = "scala_2_10"; + }; + + scala_2_11 = common { + version = "2.11.12"; + sha256 = "sR19M2mcpPYLw7K2hY/ZU+PeK4UiyUP0zaS2dDFhlqg="; + test = { inherit (nixosTests) scala_2_11; }; + pname = "scala_2_11"; + }; + + scala_2_12 = common { + version = "2.12.12"; + sha256 = "NSDNHzye//YrrudfMuUtHl3BIL4szzQGSeRw5I9Sfis="; + test = { inherit (nixosTests) scala_2_12; }; + pname = "scala_2_12"; + }; + + scala_2_13 = common { + version = "2.13.3"; + sha256 = "yfNzG8zybPOaxUExcvtBZGyxn2O4ort1846JZ1ziaX8="; + test = { inherit (nixosTests) scala_2_13; }; + pname = "scala_2_13"; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/compilers/solc/default.nix b/third_party/nixpkgs/pkgs/development/compilers/solc/default.nix index ac4bc32486..0f0af33e70 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/solc/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/solc/default.nix @@ -1,32 +1,37 @@ -{ stdenv, fetchzip, boost, cmake, ncurses, python3, coreutils +{ gccStdenv, fetchzip, boost, cmake, ncurses, python3, coreutils , z3Support ? true, z3 ? null, cvc4Support ? true, cvc4 ? null , cln ? null, gmp ? null }: +# compiling source/libsmtutil/CVC4Interface.cpp breaks on clang on Darwin, +# general commandline tests fail at abiencoderv2_no_warning/ on clang on NixOS +let stdenv = gccStdenv; in + assert z3Support -> z3 != null && stdenv.lib.versionAtLeast z3.version "4.6.0"; assert cvc4Support -> cvc4 != null && cln != null && gmp != null; let - jsoncppURL = "https://github.com/open-source-parsers/jsoncpp/archive/1.9.2.tar.gz"; + jsoncppVersion = "1.9.4"; + jsoncppUrl = "https://github.com/open-source-parsers/jsoncpp/archive/${jsoncppVersion}.tar.gz"; jsoncpp = fetchzip { - url = jsoncppURL; - sha256 = "037d1b1qdmn3rksmn1j71j26bv4hkjv7sn7da261k853xb5899sg"; + url = jsoncppUrl; + sha256 = "0qnx5y6c90fphl9mj9d20j2dfgy6s5yr5l0xnzid0vh71zrp6jwv"; }; in stdenv.mkDerivation rec { pname = "solc"; - version = "0.6.8"; + version = "0.7.4"; # upstream suggests avoid using archive generated by github src = fetchzip { url = "https://github.com/ethereum/solidity/releases/download/v${version}/solidity_${version}.tar.gz"; - sha256 = "1nxds6c10hjqjjk893qw2yljws57li0xigbf3ih85y8y6d587ph0"; + sha256 = "02261l54jdbvxk612z7zsyvmchy1rx4lf27b3f616sd7r56krpkg"; }; postPatch = '' substituteInPlace cmake/jsoncpp.cmake \ - --replace "${jsoncppURL}" ${jsoncpp} + --replace "${jsoncppUrl}" ${jsoncpp} ''; cmakeFlags = [ diff --git a/third_party/nixpkgs/pkgs/development/compilers/spasm-ng/default.nix b/third_party/nixpkgs/pkgs/development/compilers/spasm-ng/default.nix new file mode 100644 index 0000000000..8eb0ddb59e --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/compilers/spasm-ng/default.nix @@ -0,0 +1,32 @@ +{ stdenv, fetchFromGitHub, gcc, gmp, openssl, zlib }: + +stdenv.mkDerivation rec { + pname = "spasm-ng"; + + version = "unstable-2020-08-03"; + + src = fetchFromGitHub { + owner = "alberthdev"; + repo = "spasm-ng"; + rev = "221898beff2442f459b80ab89c8e1035db97868e"; + sha256 = "0xspxmp2fir604b4xsk4hi1gjv61rnq2ypppr7cj981jlhicmvjj"; + }; + + nativeBuildInputs = [ gcc ]; + + buildInputs = [ gmp openssl zlib ]; + + enableParallelBuilding = true; + + installPhase = '' + install -Dm755 spasm -t $out/bin + ''; + + meta = with stdenv.lib; { + homepage = "https://github.com/alberthdev/spasm-ng"; + description = "Z80 assembler with extra features to support development for TI calculators"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ siraben ]; + platforms = platforms.unix; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/go-modules/generic/default.nix b/third_party/nixpkgs/pkgs/development/go-modules/generic/default.nix index 1549c83234..7180ab7bf9 100644 --- a/third_party/nixpkgs/pkgs/development/go-modules/generic/default.nix +++ b/third_party/nixpkgs/pkgs/development/go-modules/generic/default.nix @@ -136,10 +136,10 @@ let export GOSUMDB=off export GOPROXY=off cd "$modRoot" - if [ -n "${go-modules}" ]; then - rm -rf vendor - ln -s ${go-modules} vendor - fi + '' + lib.optionalString (go-modules != "") '' + rm -rf vendor + cp -r --reflink=auto ${go-modules} vendor + '' + '' runHook postConfigure ''; diff --git a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-common.nix b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-common.nix index ce30937639..ff3a7be3b1 100644 --- a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-common.nix +++ b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-common.nix @@ -69,7 +69,7 @@ self: super: { name = "git-annex-${super.git-annex.version}-src"; url = "git://git-annex.branchable.com/"; rev = "refs/tags/" + super.git-annex.version; - sha256 = "05yvl09ksyvzykibs95996rni9x6w03yfqyv2fadd73z1m6lq5bf"; + sha256 = "1g5ba1lv0v4zjk5ghdp78wxgszspfda1lrl734fi7hyavqrfjxkz"; }; }).override { dbus = if pkgs.stdenv.isLinux then self.dbus else null; @@ -922,8 +922,9 @@ self: super: { # This package refers to the wrong library (itself in fact!) vulkan = super.vulkan.override { vulkan = pkgs.vulkan-loader; }; - # Compiles some C++ source which requires these headers + # Compiles some C or C++ source which requires these headers VulkanMemoryAllocator = addExtraLibrary super.VulkanMemoryAllocator pkgs.vulkan-headers; + vulkan-utils = addExtraLibrary super.vulkan-utils pkgs.vulkan-headers; # https://github.com/dmwit/encoding/pull/3 encoding = doJailbreak (appendPatch super.encoding ./patches/encoding-Cabal-2.0.patch); @@ -1172,9 +1173,6 @@ self: super: { # 2020-06-22: NOTE: > 0.4.0 => rm Jailbreak: https://github.com/serokell/nixfmt/issues/71 nixfmt = doJailbreak super.nixfmt; - # 2020-06-22: NOTE: QuickCheck upstreamed https://github.com/phadej/binary-instances/issues/7 - binary-instances = dontCheck super.binary-instances; - # The test suite depends on an impure cabal-install installation in # $HOME, which we don't have in our build sandbox. cabal-install-parsers = dontCheck super.cabal-install-parsers; @@ -1254,41 +1252,8 @@ self: super: { x509-validation = dontCheck super.x509-validation; tls = dontCheck super.tls; - patch = appendPatches super.patch [ - # Upstream PR: https://github.com/reflex-frp/patch/pull/20 - # Makes tests work with hlint 3 - (pkgs.fetchpatch { - url = "https://github.com/reflex-frp/patch/commit/3ed23a4e4049ee17e64a1a5bbebf1990cdbe033a.patch"; - sha256 ="1hfa980wln8kzbqw1lr8ddszgcibw25xf12ki2jb9xkl464aynzf"; - }) - # Upstream PR: https://github.com/reflex-frp/patch/pull/17 - # Bumps version dependencies - (pkgs.fetchpatch { - url = "https://github.com/reflex-frp/patch/commit/a191ed9ded708ed7ff0cf53ad6dafaf54db5b95a.patch"; - sha256 ="1x9w5fimhk3a0l2aa5z91nqaa6s2irz1775iidd0191m6w25vszp"; - }) - ]; - - reflex = appendPatches super.reflex [ - # Upstream PR: https://github.com/reflex-frp/reflex/pull/434 - # Bump version bounds - (pkgs.fetchpatch { - url = "https://github.com/reflex-frp/reflex/commit/e6104bdfd7f664f524b6765275490722e376df4d.patch"; - sha256 ="1awp5p4640cnhfd50dplsvp0kzy6h8r0hpbw1s40blni74r3dhzr"; - }) - # Upstream PR: https://github.com/reflex-frp/reflex/pull/436 - # Fix build with newest dependent-map version - (pkgs.fetchpatch { - url = "https://github.com/reflex-frp/reflex/commit/dc3bf44d822d70594e3c474fe3869261776c3554.patch"; - sha256 ="0rbjfj9b8p6zkvd5j4pak5kpgard6cyfvzk750s4xwpc1v84iiqd"; - }) - # Upstream PR: https://github.com/reflex-frp/reflex/pull/437 - # Fix tests with newer dep versions - (pkgs.fetchpatch { - url = "https://github.com/reflex-frp/reflex/commit/87c74a1b9d9098eae8a56148c59ed4963a5232c2.patch"; - sha256 ="0qhjjgd6n4fms1hpbblny78c95bfh74izhx9dvrdlnhz6q7xlm9q"; - }) - ]; + # Allow building with recent versions of hlint. + patch = doJailbreak super.patch; # Tests disabled and broken override needed because of missing lib chrome-test-utils: https://github.com/reflex-frp/reflex-dom/issues/392 # Tests disabled because of very old dep: https://github.com/reflex-frp/reflex-dom/issues/393 @@ -1351,7 +1316,7 @@ self: super: { # 2020-08-14: gi-pango from stackage is to old for the C libs it links against in nixpkgs. # That's why we need to bump a ton of dependency versions to unbreak them. gi-pango = assert super.gi-pango.version == "1.0.22"; self.gi-pango_1_0_23; - haskell-gi-base = assert super.haskell-gi-base.version == "0.23.0"; addBuildDepends (self.haskell-gi-base_0_24_3) [ pkgs.gobject-introspection ]; + haskell-gi-base = assert super.haskell-gi-base.version == "0.23.0"; addBuildDepends (self.haskell-gi-base_0_24_4) [ pkgs.gobject-introspection ]; haskell-gi = assert super.haskell-gi.version == "0.23.1"; self.haskell-gi_0_24_5; gi-cairo = assert super.gi-cairo.version == "1.0.23"; self.gi-cairo_1_0_24; gi-glib = assert super.gi-glib.version == "2.0.23"; self.gi-glib_2_0_24; @@ -1381,13 +1346,6 @@ self: super: { sha256 = "1c5ck2ibag2gcyag6rjivmlwdlp5k0dmr8nhk7wlkzq2vh7zgw63"; }); - # Version bumps have not been merged by upstream yet. - # https://github.com/obsidiansystems/dependent-sum-aeson-orphans/pull/5 - dependent-sum-aeson-orphans = appendPatch super.dependent-sum-aeson-orphans (pkgs.fetchpatch { - url = "https://github.com/obsidiansystems/dependent-sum-aeson-orphans/commit/5a369e433ad7e3eef54c7c3725d34270f6aa48cc.patch"; - sha256 = "1lzrcicvdg77hd8j2fg37z19amp5yna5xmw1fc06zi0j95csll4r"; - }); - # Tests are broken because of missing files in hackage tarball. # https://github.com/jgm/commonmark-hs/issues/55 commonmark-extensions = dontCheck super.commonmark-extensions; @@ -1467,7 +1425,7 @@ self: super: { skylighting-core = doDistribute super.skylighting-core_0_10_0_3; hslua = doDistribute self.hslua_1_1_2; jira-wiki-markup = doDistribute self.jira-wiki-markup_1_3_2; - pandoc = doDistribute self.pandoc_2_11_0_4; + pandoc = doDistribute self.pandoc_2_11_1; # jailbreaking pandoc-citeproc because it has not bumped upper bound on pandoc pandoc-citeproc = doJailbreak (doDistribute self.pandoc-citeproc_0_17_0_2); pandoc-types = doDistribute self.pandoc-types_1_22; @@ -1475,7 +1433,6 @@ self: super: { # The test suite attempts to read `/etc/resolv.conf`, which doesn't work in the sandbox. domain-auth = dontCheck super.domain-auth; - # INSERT NEW OVERRIDES ABOVE THIS LINE # stack-2.5.1 needs a more current version of pantry to compile pantry = self.pantry_0_5_1_3; @@ -1483,7 +1440,9 @@ self: super: { # Too tight version bounds, see https://github.com/haskell-hvr/microaeson/pull/4 microaeson = doJailbreak super.microaeson; - # haskell-language-server needs a more current version of pantry to compile + autoapply = super.autoapply.override { th-desugar = self.th-desugar_1_11; }; + + # INSERT NEW OVERRIDES ABOVE THIS LINE } // (let inherit (self) hls-ghcide hls-brittany; hlsScopeOverride = self: super: { diff --git a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix.yaml b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix.yaml index 3a31056fd1..4328d6a758 100644 --- a/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix.yaml +++ b/third_party/nixpkgs/pkgs/development/haskell-modules/configuration-hackage2nix.yaml @@ -2738,6 +2738,8 @@ unsupported-platforms: sdl2-mixer: [ x86_64-darwin ] sdl2-ttf: [ x86_64-darwin ] tokyotyrant-haskell: [ x86_64-darwin ] + vulkan: [ i686-linux, armv7l-linux ] + VulkanMemoryAllocator: [ i686-linux, armv7l-linux ] Win32-console: [ i686-linux, x86_64-linux, x86_64-darwin ] Win32-dhcp-server: [ i686-linux, x86_64-linux, x86_64-darwin ] Win32-errors: [ i686-linux, x86_64-linux, x86_64-darwin ] @@ -2892,6 +2894,7 @@ broken-packages: - accentuateus - access-time - access-token-provider + - achille - acid-state-dist - acid-state-tls - ACME @@ -3121,6 +3124,8 @@ broken-packages: - armor - arpa - arpack + - array-builder + - array-chunks - array-forth - array-list - array-primops @@ -3205,7 +3210,6 @@ broken-packages: - authenticate-ldap - authinfo-hs - authoring - - autoapply - AutoForms - autom - automata @@ -3456,6 +3460,7 @@ broken-packages: - bitcoin-hs - bitcoin-rpc - bitcoin-script + - bitcoin-scripting - bitcoin-tx - bitcoind-regtest - bitcoind-rpc @@ -3601,7 +3606,11 @@ broken-packages: - byline - bytable - bytearray-parsing + - bytebuild + - bytehash - bytelog + - byteslice + - bytesmith - bytestring-arbitrary - bytestring-builder-varword - bytestring-class @@ -3995,6 +4004,7 @@ broken-packages: - compdata-dags - compdata-param - compdoc + - compdoc-dhall-decoder - competition - compilation - complexity @@ -4101,7 +4111,9 @@ broken-packages: - context-free-grammar - context-stack - ContextAlgebra + - contiguous - contiguous-checked + - contiguous-fft - continue - continuum - continuum-client @@ -4535,6 +4547,7 @@ broken-packages: - discord-gateway - discord-haskell - discord-hs + - discord-register - discord-rest - discord-types - discordian-calendar @@ -4600,6 +4613,9 @@ broken-packages: - doi - DOM - dom-lt + - domain + - domain-core + - domain-optics - domplate - dot-linker - dotfs @@ -4799,6 +4815,7 @@ broken-packages: - eros - eros-client - eros-http + - error-codes - error-context - error-continuations - error-list @@ -4856,7 +4873,6 @@ broken-packages: - every-bit-counts - ewe - exact-cover - - exact-real - exact-real-positional - except-exceptions - exception-monads-fd @@ -5262,6 +5278,8 @@ broken-packages: - garepinoh - gargoyle - gargoyle-postgresql + - gargoyle-postgresql-connect + - gargoyle-postgresql-nix - gas - gbu - gc-monitoring-wai @@ -5415,7 +5433,6 @@ broken-packages: - git-fmt - git-gpush - git-jump - - git-mediate - git-monitor - git-object - git-remote-ipfs @@ -5518,6 +5535,7 @@ broken-packages: - GoogleSB - GoogleTranslate - gopherbot + - gopro-plus - gore-and-ash - gore-and-ash-actor - gore-and-ash-async @@ -6158,6 +6176,7 @@ broken-packages: - hevolisa - hevolisa-dph - hex + - hex-text - HExcel - hexchat - hexif @@ -6928,6 +6947,7 @@ broken-packages: - iostring - iothread - iotransaction + - ip - ip2location - ip2proxy - ipatch @@ -7589,6 +7609,7 @@ broken-packages: - lxd-client - lye - Lykah + - lz4-bytes - lz4-conduit - lz4-frame-conduit - lzma-enumerator @@ -7611,6 +7632,7 @@ broken-packages: - maclight - macos-corelibs - macosx-make-standalone + - macrm - madlang - mage - magic-tyfams @@ -7826,6 +7848,7 @@ broken-packages: - mltool - mm2 - mmsyn4 + - mmsyn7h - mmtf - mmtl - mmtl-base @@ -7928,8 +7951,10 @@ broken-packages: - morfette - morfeusz - morley + - morloc - morpheus-graphql-cli - morpheus-graphql-client + - morpheus-graphql-subscriptions - morphisms-functors - morphisms-functors-inventory - morphisms-objects @@ -8380,7 +8405,6 @@ broken-packages: - optparse-applicative-simple - optparse-enum - optparse-helper - - orbits - orc - orchestrate - OrchestrateDB @@ -8733,6 +8757,7 @@ broken-packages: - pointless-haskell - pointless-lenses - pointless-rewrite + - poke - pokemon-go-protobuf-types - poker-eval - pokitdok @@ -8751,6 +8776,7 @@ broken-packages: - polysemy-kvstore-jsonfile - polysemy-methodology - polysemy-optics + - polysemy-path - polysemy-RandomFu - polysemy-resume - polysemy-test @@ -8781,6 +8807,7 @@ broken-packages: - poseidon - poseidon-postgis - posix-acl + - posix-api - posix-realtime - posix-waitpid - posplyu @@ -8859,10 +8886,15 @@ broken-packages: - primal - primal-memory - primes-type + - primitive-atomic + - primitive-containers + - primitive-extras - primitive-indexed - primitive-maybe - primitive-simd + - primitive-sort - primitive-stablename + - primitive-unlifted - PrimitiveArray-Pretty - primula-board - primula-bot @@ -9188,6 +9220,7 @@ broken-packages: - reflex-dom-svg - reflex-dynamic-containers - reflex-fsnotify + - reflex-gadt-api - reflex-ghci - reflex-gloss - reflex-gloss-scene @@ -9416,6 +9449,7 @@ broken-packages: - ruin - ruler - ruler-core + - run-st - rungekutta - runhs - runmany @@ -9857,6 +9891,7 @@ broken-packages: - sme - smerdyakov - smiles + - smith - smith-cli - smith-client - Smooth @@ -10121,6 +10156,7 @@ broken-packages: - stm-chunked-queues - stm-containers - stm-firehose + - stm-hamt - stm-promise - stm-stats - stm-supply @@ -10331,6 +10367,7 @@ broken-packages: - tart - task - task-distribution + - taskell - TaskMonad - tasty-auto - tasty-bdd @@ -10458,6 +10495,7 @@ broken-packages: - th-instances - th-kinds - th-kinds-fork + - th-lego - th-pprint - th-sccs - th-tc @@ -10746,6 +10784,7 @@ broken-packages: - typescript-docs - typograffiti - tyro + - tz - u2f - uber - uberlast @@ -10988,7 +11027,6 @@ broken-packages: - vty-menu - vty-ui - vty-ui-extras - - vulkan-utils - waargonaut - wacom-daemon - waddle @@ -11290,6 +11328,7 @@ broken-packages: - yaml-rpc - yaml-rpc-scotty - yaml-rpc-snap + - yaml-unscrambler - YamlReference - Yampa - yampa-canvas diff --git a/third_party/nixpkgs/pkgs/development/haskell-modules/hackage-packages.nix b/third_party/nixpkgs/pkgs/development/haskell-modules/hackage-packages.nix index 6169d134dd..6ad8267d44 100644 --- a/third_party/nixpkgs/pkgs/development/haskell-modules/hackage-packages.nix +++ b/third_party/nixpkgs/pkgs/development/haskell-modules/hackage-packages.nix @@ -3387,15 +3387,15 @@ self: { broken = true; }) {}; - "Color_0_2_0" = callPackage + "Color_0_3_0" = callPackage ({ mkDerivation, base, colour, criterion, data-default-class , deepseq, doctest, hspec, HUnit, JuicyPixels, massiv, massiv-test , QuickCheck, random, vector }: mkDerivation { pname = "Color"; - version = "0.2.0"; - sha256 = "1w7d1wjssldybbg46s4hc83f96n49v53wyq0sc1q8mkvqdl35vsh"; + version = "0.3.0"; + sha256 = "18aissrpllxll01k203i2agfff89ffah465zvb0yx0lvs8jh2xr7"; libraryHaskellDepends = [ base data-default-class deepseq vector ]; testHaskellDepends = [ base colour doctest hspec HUnit JuicyPixels massiv massiv-test @@ -6928,8 +6928,8 @@ self: { ({ mkDerivation, async, base, containers, GLFW-b, GPipe, stm }: mkDerivation { pname = "GPipe-GLFW"; - version = "1.4.1.3"; - sha256 = "0czrq3zhcxfl9pzypmxpxgn11faqb0kw05m5k3apr4b88prbj1ij"; + version = "1.4.1.4"; + sha256 = "13qbiy2gv682xyj0dpy336zbg4224a1sgzqq9kq1v6f8pwavw6bk"; enableSeparateDataOutput = true; libraryHaskellDepends = [ async base containers GLFW-b GPipe stm ]; description = "GLFW OpenGL context creation for GPipe"; @@ -8071,8 +8071,8 @@ self: { }: mkDerivation { pname = "HDBC-postgresql"; - version = "2.3.2.8"; - sha256 = "0c76di7a134xhw5pmzdjasgyqxj6gkjkj45mr4mwfrchgdg4cvil"; + version = "2.4.0.0"; + sha256 = "1zmilqvlp170nb7zakbhdpihykkq95s7nb7la2sdas1fv69mhnx3"; isLibrary = true; isExecutable = true; setupHaskellDepends = [ base Cabal ]; @@ -9537,6 +9537,19 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "HUnit_1_6_1_0" = callPackage + ({ mkDerivation, base, call-stack, deepseq, filepath }: + mkDerivation { + pname = "HUnit"; + version = "1.6.1.0"; + sha256 = "1rpi52rnjpyv379rm6n3s706z6mv114aychf03dq456wfa4b7123"; + libraryHaskellDepends = [ base call-stack deepseq ]; + testHaskellDepends = [ base call-stack deepseq filepath ]; + description = "A unit testing framework for Haskell"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "HUnit-Diff" = callPackage ({ mkDerivation, ansi-terminal, base, Diff, groom, HUnit }: mkDerivation { @@ -10848,6 +10861,21 @@ self: { license = stdenv.lib.licenses.publicDomain; }) {inherit (pkgs) openssl;}; + "HsOpenSSL_0_11_5_1" = callPackage + ({ mkDerivation, base, bytestring, Cabal, network, openssl, time }: + mkDerivation { + pname = "HsOpenSSL"; + version = "0.11.5.1"; + sha256 = "1np4yyiq4935p1vbf89m0ifkilzc6vzab9i8x7c21y9s7rsv4rj9"; + setupHaskellDepends = [ base Cabal ]; + libraryHaskellDepends = [ base bytestring network time ]; + librarySystemDepends = [ openssl ]; + testHaskellDepends = [ base bytestring ]; + description = "Partial OpenSSL binding for Haskell"; + license = stdenv.lib.licenses.publicDomain; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) openssl;}; + "HsOpenSSL-x509-system" = callPackage ({ mkDerivation, base, bytestring, HsOpenSSL, unix }: mkDerivation { @@ -20739,13 +20767,14 @@ self: { ({ mkDerivation, base, bytestring, transformers, vector, vulkan }: mkDerivation { pname = "VulkanMemoryAllocator"; - version = "0.3.7"; - sha256 = "1y2dmk60dvk8d9n16in98cmin5ckvdx3knwlfzcs0jl6vyh8n51n"; + version = "0.3.7.1"; + sha256 = "18al9vr5zy8smn090dd7fwnm4pqcsxld97azrxni7xsqdb22kja8"; libraryHaskellDepends = [ base bytestring transformers vector vulkan ]; description = "Bindings to the VulkanMemoryAllocator library"; license = stdenv.lib.licenses.bsd3; + platforms = [ "x86_64-darwin" "x86_64-linux" ]; }) {}; "WAVE" = callPackage @@ -21104,12 +21133,12 @@ self: { platforms = stdenv.lib.platforms.none; }) {}; - "Win32_2_10_0_0" = callPackage + "Win32_2_10_1_0" = callPackage ({ mkDerivation }: mkDerivation { pname = "Win32"; - version = "2.10.0.0"; - sha256 = "09g61dgw3xvg066qdydw7nxn8vk1nxxwzi1wwr19rkaxhz43149n"; + version = "2.10.1.0"; + sha256 = "1il70gh3ysmp4pnhk7dxcbd0c0mh5ay33b9ijmmj0ikmbw0nfpbv"; description = "A binding to Windows Win32 API"; license = stdenv.lib.licenses.bsd3; platforms = stdenv.lib.platforms.none; @@ -22975,6 +23004,8 @@ self: { ]; description = "A library for building static site generators"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "acid-state" = callPackage @@ -25537,6 +25568,21 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "agda2lagda" = callPackage + ({ mkDerivation, base, directory, filepath, optparse-applicative }: + mkDerivation { + pname = "agda2lagda"; + version = "0.2020.11.1"; + sha256 = "0yl44jdczy9306b5ifd8iwchr8izna8sd5v2h2qm9ns909wcs1l8"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + base directory filepath optparse-applicative + ]; + description = "Translate .agda files into .lagda.tex files."; + license = stdenv.lib.licenses.publicDomain; + }) {}; + "agentx" = callPackage ({ mkDerivation, base, binary, bitwise, bytestring, containers , data-default, Diff, fclabels, mtl, network, pipes @@ -32898,6 +32944,8 @@ self: { testHaskellDepends = [ base tasty tasty-hunit ]; description = "Builders for arrays"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "array-chunks" = callPackage @@ -32915,6 +32963,8 @@ self: { ]; description = "Lists of chunks"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "array-forth" = callPackage @@ -35361,6 +35411,8 @@ self: { pname = "aura"; version = "3.2.2"; sha256 = "07ska8w2k3sl084aadjclw8v0ykrp8hiwhim5zd6wd7q95njyk2f"; + revision = "1"; + editedCabalFile = "033ycqm18zqq69yam189whpcbnajanj2yp8na8ad344ghcn1gs5l"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -35526,8 +35578,6 @@ self: { testHaskellDepends = [ base doctest ]; description = "Template Haskell to automatically pass values to functions"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "autoexporter" = callPackage @@ -37967,17 +38017,15 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "base16-bytestring_1_0_0_0" = callPackage + "base16-bytestring_1_0_1_0" = callPackage ({ mkDerivation, base, bytestring, criterion, deepseq, HUnit , QuickCheck, test-framework, test-framework-hunit , test-framework-quickcheck2 }: mkDerivation { pname = "base16-bytestring"; - version = "1.0.0.0"; - sha256 = "12bnl2fs0h4hcjpr69xqqngjh0117dlvkv56lxski6g6fnbwps2r"; - revision = "2"; - editedCabalFile = "16nmmf3mmkdrssx6i77drh7ac7r6cfb1dnbna62z32h11yyyk49j"; + version = "1.0.1.0"; + sha256 = "1ynnplw8iz3v5ld0xxgpxgasb0hg62x62wxxf5lx6lxyb15hmiy0"; libraryHaskellDepends = [ base bytestring ]; testHaskellDepends = [ base bytestring HUnit QuickCheck test-framework @@ -40453,10 +40501,8 @@ self: { }: mkDerivation { pname = "binary-instances"; - version = "1.0.0.1"; - sha256 = "0f8ilzpwj7gbyvlswlkd48dzpj9m13ipinw55lvjag0ir52idk9a"; - revision = "1"; - editedCabalFile = "19xmaj5vlabsifkdk1kpxp4nadfml7a51w316sd4fxd69ncvwd72"; + version = "1.0.1"; + sha256 = "0whqjziwqrqslf6byliry84pg47z7vc6yjligpzb8gb5db2gw1h0"; libraryHaskellDepends = [ aeson base binary binary-orphans case-insensitive hashable scientific tagged text text-binary time-compat unordered-containers @@ -42524,6 +42570,29 @@ self: { broken = true; }) {}; + "bitcoin-scripting" = callPackage + ({ mkDerivation, attoparsec, base, base16-bytestring, bytestring + , cereal, containers, haskoin-core, tasty, tasty-hunit + , tasty-quickcheck, text, transformers + }: + mkDerivation { + pname = "bitcoin-scripting"; + version = "0.1.0"; + sha256 = "1hd45rr4mq7dizdw7d1wkypr15azaaqc4fy6rkr9gim93jzc8707"; + libraryHaskellDepends = [ + attoparsec base base16-bytestring bytestring cereal containers + haskoin-core text transformers + ]; + testHaskellDepends = [ + base base16-bytestring bytestring cereal haskoin-core tasty + tasty-hunit tasty-quickcheck text + ]; + description = "Resources for working with miniscript, and script descriptors"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "bitcoin-tx" = callPackage ({ mkDerivation, base, binary, bitcoin-script, bitcoin-types , bytestring, cryptohash, hexstring, hspec, lens @@ -42566,44 +42635,51 @@ self: { }) {}; "bitcoind-regtest" = callPackage - ({ mkDerivation, base, bitcoind-rpc, cereal, containers - , haskoin-core, http-client, process, servant, servant-client - , tasty, tasty-hunit, temporary, text + ({ mkDerivation, base, bitcoind-rpc, bytestring, cereal, containers + , haskoin-core, http-client, optparse-applicative, process, servant + , servant-client, tasty, tasty-hunit, temporary, text }: mkDerivation { pname = "bitcoind-regtest"; - version = "0.1.0.0"; - sha256 = "078834ndl253d1s6f68a8cq1dc0hq3r3ic4a90wbr4msw9zn626q"; + version = "0.2.0.0"; + sha256 = "06sk8kb3vjf7a2k7rhqpc7j1lbqd69xyhb25dc8bk7110m5l38cf"; + isLibrary = true; + isExecutable = true; libraryHaskellDepends = [ base bitcoind-rpc cereal containers haskoin-core http-client process servant servant-client temporary text ]; + executableHaskellDepends = [ + base bitcoind-rpc bytestring cereal haskoin-core http-client + optparse-applicative process servant servant-client temporary text + ]; testHaskellDepends = [ base bitcoind-rpc cereal haskoin-core http-client process servant servant-client tasty tasty-hunit temporary text ]; description = "A library for working with bitcoin-core regtest networks"; - license = stdenv.lib.licenses.isc; + license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; }) {}; "bitcoind-rpc" = callPackage - ({ mkDerivation, aeson, base, bytestring, cereal, haskoin-core + ({ mkDerivation, aeson, base, base16-bytestring + , bitcoin-compact-filters, bytestring, cereal, haskoin-core , http-client, scientific, servant, servant-client , servant-jsonrpc-client, text, time, transformers }: mkDerivation { pname = "bitcoind-rpc"; - version = "0.1.0.0"; - sha256 = "1a3p49lzzsqd9m7ivisxksb6c7yc0dg5rps6ym85s4aasr1ln1j8"; + version = "0.2.0.0"; + sha256 = "0y5y5bdbhc1kcdk2nwjv2x5nz9vg5j38mc3l9pjyizz1s5yzn9rc"; libraryHaskellDepends = [ - aeson base bytestring cereal haskoin-core http-client scientific - servant servant-client servant-jsonrpc-client text time - transformers + aeson base base16-bytestring bitcoin-compact-filters bytestring + cereal haskoin-core http-client scientific servant servant-client + servant-jsonrpc-client text time transformers ]; description = "A streamlined interface to bitcoin core using Haskoin types and Servant"; - license = stdenv.lib.licenses.isc; + license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; }) {}; @@ -43269,14 +43345,14 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "blanks_0_4_2" = callPackage + "blanks_0_5_0" = callPackage ({ mkDerivation, adjunctions, base, containers, deepseq , distributive, megaparsec, mtl, tasty, tasty-hunit, text }: mkDerivation { pname = "blanks"; - version = "0.4.2"; - sha256 = "0dbp923x0zy94kc61j2szmib299y99v208fqs5wir3lzyd55gdsc"; + version = "0.5.0"; + sha256 = "1a38cwk65zkzhq8yc95v4kamyp9k1y1vnfii84yqzvrrlbfzxbqf"; libraryHaskellDepends = [ adjunctions base containers deepseq distributive mtl ]; @@ -47143,8 +47219,8 @@ self: { }: mkDerivation { pname = "bytebuild"; - version = "0.3.6.0"; - sha256 = "15nk9r9mx798kmjl04qf01il1csfjyi3jx44yhi4hmgl66p9fdx3"; + version = "0.3.7.0"; + sha256 = "1vckm98sarxzqh6ib89y5kzhbf1yxc9wgrbpwbsrh0dv5gi3pclj"; libraryHaskellDepends = [ base byteslice bytestring integer-logarithms natural-arithmetic primitive primitive-offset primitive-unlifted run-st text-short @@ -47161,6 +47237,8 @@ self: { ]; description = "Serialize to a small byte arrays"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "bytedump" = callPackage @@ -47201,6 +47279,8 @@ self: { ]; description = "Universal hashing of bytes"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "bytelog" = callPackage @@ -47287,6 +47367,8 @@ self: { benchmarkHaskellDepends = [ base gauge primitive ]; description = "Slicing managed and unmanaged memory"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "bytesmith" = callPackage @@ -47311,6 +47393,8 @@ self: { ]; description = "Nonresumable byte parser"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "bytestring_0_11_0_0" = callPackage @@ -49629,8 +49713,8 @@ self: { }: mkDerivation { pname = "cachix"; - version = "0.3.8"; - sha256 = "0n05ys0jz6if3k121hr5znzbbd0v6xmckhh4vyya90r3kvgp1526"; + version = "0.5.0"; + sha256 = "05z5gnj5fkl0pqhinlvnq9zf51v5xhc6lhgnm061aj89rclhm6bg"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -49658,25 +49742,22 @@ self: { ({ mkDerivation, aeson, base, base16-bytestring, bytestring , conduit, cookie, cryptonite, deepseq, exceptions, hspec , hspec-discover, http-api-data, http-media, jose, lens, memory - , protolude, resourcet, servant, servant-auth, servant-auth-server - , servant-auth-swagger, servant-client, servant-swagger - , servant-swagger-ui-core, string-conv, swagger2, text - , transformers + , nix-narinfo, protolude, resourcet, servant, servant-auth + , servant-auth-server, servant-auth-swagger, servant-client + , servant-swagger, servant-swagger-ui-core, string-conv, swagger2 + , text, time, transformers }: mkDerivation { pname = "cachix-api"; - version = "0.4.0"; - sha256 = "14hwn9nrnaypwzgy70l4kcscq7fcw1z5rs3a46cm2v5qqj72r2jx"; - isLibrary = true; - isExecutable = true; + version = "0.5.0"; + sha256 = "14b4vg6wv7kzxkfbh64ml2wvm9w8fyv2k2sm7ncaa0pp0f26pswy"; libraryHaskellDepends = [ aeson base base16-bytestring bytestring conduit cookie cryptonite deepseq exceptions http-api-data http-media jose lens memory - protolude resourcet servant servant-auth servant-auth-server - servant-auth-swagger servant-client servant-swagger string-conv - swagger2 text transformers + nix-narinfo protolude resourcet servant servant-auth + servant-auth-server servant-client string-conv swagger2 text time + transformers ]; - executableHaskellDepends = [ aeson base protolude ]; testHaskellDepends = [ aeson base base16-bytestring bytestring conduit cookie cryptonite hspec http-api-data http-media lens memory protolude servant @@ -54658,8 +54739,8 @@ self: { }: mkDerivation { pname = "citeproc"; - version = "0.1.0.3"; - sha256 = "10zkkn00b2rm1lfnwdpmbxp82vmzbh69ivsda40kh0x2d8r1rzxp"; + version = "0.1.1.1"; + sha256 = "1w6ivzkwjpgaqd8nnb73krp2xwnkli5ggd0nmw3llxfzcvpg0mxz"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -57217,8 +57298,8 @@ self: { }: mkDerivation { pname = "cobot-io"; - version = "0.1.3.8"; - sha256 = "1x3ikycb9v9hmn1j57sddnr50kb3kvnch6w09fsyqzzmbnfc6nys"; + version = "0.1.3.10"; + sha256 = "0fdx96f9kn09nwpcdqpys3rvxlwrvynba5ipb509vriny96p7vrr"; libraryHaskellDepends = [ array attoparsec base binary bytestring containers data-msgpack deepseq http-conduit hyraxAbif lens linear mtl split text vector @@ -58678,8 +58759,8 @@ self: { }: mkDerivation { pname = "commonmark"; - version = "0.1.0.2"; - sha256 = "00rqy02pn4gg0wpwvxyqxvzqg75lvb1qawn4m8rnjq6v43c4g23l"; + version = "0.1.1.2"; + sha256 = "13gk08gigih75zq7kwc101yxmxvj3hvfyi67ap13nrabv70l6zjm"; libraryHaskellDepends = [ base bytestring containers parsec text transformers ]; @@ -58720,8 +58801,8 @@ self: { }: mkDerivation { pname = "commonmark-extensions"; - version = "0.2.0.1"; - sha256 = "08i6167d78b5wf6aqsrjz2sb1qaanwrjzhpfg1jn4grd9g8i2ql6"; + version = "0.2.0.4"; + sha256 = "166ywkh6vyyrrwq7ww68pwzdkwmhi23hjvw28769m010ksimz2wh"; libraryHaskellDepends = [ base bytestring commonmark containers emojis parsec text transformers @@ -59183,8 +59264,8 @@ self: { }: mkDerivation { pname = "compdoc"; - version = "0.1.0.0"; - sha256 = "0m7xrl1ki3agp69yczgy396xlb84kggslmqnjglziyg6sziv58ak"; + version = "0.2.0.0"; + sha256 = "0cdgyvbx2xf7dgvg0h6k980yfh9vj7yg5vsg08i7cb8iik2w0k0m"; libraryHaskellDepends = [ aeson base composite-aeson composite-aeson-throw composite-base pandoc pandoc-throw path rio vinyl @@ -59195,6 +59276,26 @@ self: { broken = true; }) {}; + "compdoc-dhall-decoder" = callPackage + ({ mkDerivation, base, compdoc, composite-aeson, composite-base + , dhall, either, pandoc, text + }: + mkDerivation { + pname = "compdoc-dhall-decoder"; + version = "0.2.0.0"; + sha256 = "0iygbgcqcs3ixdnphhrp57s1ihpwnf9q59z7r74qqj7qx1yjrxig"; + revision = "1"; + editedCabalFile = "1g15qxkxfipvf6al3k8bdcvvcl1vyhjhg3r1w2z2g91ngz0b5y18"; + libraryHaskellDepends = [ + base compdoc composite-aeson composite-base dhall either pandoc + text + ]; + description = "Allows you to write FromDhall instances for Compdoc"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "compendium-client" = callPackage ({ mkDerivation, aeson, base, http-client, language-protobuf , megaparsec, servant, servant-client, text @@ -62661,6 +62762,8 @@ self: { ]; description = "Unified interface for primitive arrays"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "contiguous-checked" = callPackage @@ -62685,6 +62788,8 @@ self: { libraryHaskellDepends = [ base contiguous primitive semirings ]; description = "dft of contiguous memory structures"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "continue" = callPackage @@ -63559,6 +63664,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "core-data_0_2_1_9" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, core-text + , hashable, prettyprinter, scientific, text, unordered-containers + , vector + }: + mkDerivation { + pname = "core-data"; + version = "0.2.1.9"; + sha256 = "098bxx2g4mh3agpx7bccxhq8lpxjgl7a017vzp3ab65ni8126b1r"; + libraryHaskellDepends = [ + aeson base bytestring containers core-text hashable prettyprinter + scientific text unordered-containers vector + ]; + description = "Convenience wrappers around common data structures and encodings"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "core-haskell" = callPackage ({ mkDerivation, base, haskeline, haskell-src-exts, hint }: mkDerivation { @@ -63597,6 +63720,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "core-program_0_2_6_0" = callPackage + ({ mkDerivation, async, base, bytestring, chronologique, core-data + , core-text, directory, exceptions, filepath, fsnotify, hashable + , hourglass, mtl, prettyprinter, safe-exceptions, stm + , template-haskell, terminal-size, text, text-short, transformers + , unix + }: + mkDerivation { + pname = "core-program"; + version = "0.2.6.0"; + sha256 = "1qyl7kcdqxfl2inx66n7pa1z2pqjxrz1bpg3jjknjj0kpw9rlhf3"; + libraryHaskellDepends = [ + async base bytestring chronologique core-data core-text directory + exceptions filepath fsnotify hashable hourglass mtl prettyprinter + safe-exceptions stm template-haskell terminal-size text text-short + transformers unix + ]; + description = "Opinionated Haskell Interoperability"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "core-text" = callPackage ({ mkDerivation, base, bytestring, deepseq, fingertree, hashable , prettyprinter, prettyprinter-ansi-terminal, template-haskell @@ -63614,6 +63759,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "core-text_0_3_0_0" = callPackage + ({ mkDerivation, ansi-terminal, base, bytestring, colour, deepseq + , fingertree, hashable, prettyprinter, template-haskell, text + , text-short + }: + mkDerivation { + pname = "core-text"; + version = "0.3.0.0"; + sha256 = "103fd1bbhkh1l9di0f88yxl9mdaxjh31pgg49bk6yhx9cmdhgn1x"; + libraryHaskellDepends = [ + ansi-terminal base bytestring colour deepseq fingertree hashable + prettyprinter template-haskell text text-short + ]; + description = "A rope type based on a finger tree over UTF-8 fragments"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "corebot-bliki" = callPackage ({ mkDerivation, aeson, base, blaze-builder, bytestring, containers , directory, filepath, filestore, http-types, monads-tf, pandoc @@ -64787,15 +64950,16 @@ self: { "crdt-event-fold" = callPackage ({ mkDerivation, base, binary, containers, data-default-class - , data-dword + , data-dword, hspec }: mkDerivation { pname = "crdt-event-fold"; - version = "1.0.0.2"; - sha256 = "0bhfbzxb7s49x6nk1gg1n5nf26h8xqgy41ln7d5j59zp0lri5c04"; + version = "1.1.0.0"; + sha256 = "084vbx98b8ca5q2p6icbz0hv0hh4djk8iain7vv60w18453pz8fc"; libraryHaskellDepends = [ base binary containers data-default-class data-dword ]; + testHaskellDepends = [ base hspec ]; description = "Garbage collected event folding CRDT"; license = stdenv.lib.licenses.mit; }) {}; @@ -67319,8 +67483,8 @@ self: { }: mkDerivation { pname = "cut-the-crap"; - version = "2.2.0"; - sha256 = "19i1wmh9163fb8wggnla4c8r51j71wiwyzhhh3mznckhaws40fqa"; + version = "2.3.1"; + sha256 = "1q7jp39xyhximpb9k4yw2baccpgixgsdcrrlx1a0s84nxv8d0hl6"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -69812,8 +69976,8 @@ self: { pname = "data-tree-print"; version = "0.1.0.2"; sha256 = "00jh37anim8qsn553467gmfhajcz1c61zrgh1ypkqsll0gc29vy3"; - revision = "1"; - editedCabalFile = "1r6dnvc7d50q5p9fdqqwfvi7kwn7r89319plj7v284sjai9b6ld4"; + revision = "2"; + editedCabalFile = "00qpzhm3lndhpql8aj93aj6r3x9n0gw3nx6n0q60xxrd6agyjifq"; libraryHaskellDepends = [ base pretty syb ]; description = "Print Data instances as a nested tree"; license = stdenv.lib.licenses.bsd3; @@ -72250,15 +72414,15 @@ self: { "dependent-sum-aeson-orphans" = callPackage ({ mkDerivation, aeson, base, constraints, constraints-extras - , dependent-map, dependent-sum + , dependent-map, dependent-sum, some }: mkDerivation { pname = "dependent-sum-aeson-orphans"; - version = "0.2.1.0"; - sha256 = "04flfszrn4ah9vrm6hyp2pk0sbldcjp0jjibdny7lxdmv0fskzj5"; + version = "0.3.0.0"; + sha256 = "1wpjrynv9zva3hw1wgmqd5pmhhpa491yh85p1dnbpkj7h0g1pl1a"; libraryHaskellDepends = [ aeson base constraints constraints-extras dependent-map - dependent-sum + dependent-sum some ]; description = "JSON instances for DSum, DMap, and Some"; license = stdenv.lib.licenses.bsd3; @@ -75857,6 +76021,39 @@ self: { broken = true; }) {}; + "discord-register" = callPackage + ({ mkDerivation, base, calamity, dhall, di, di-polysemy + , generic-lens, hspec, hspec-megaparsec, megaparsec, polysemy + , polysemy-plugin, text, text-show, unboxing-vector + , unordered-containers, vector + }: + mkDerivation { + pname = "discord-register"; + version = "0.0.1"; + sha256 = "1crwbdkyg6k4777lcc7yi5n47xpsnvl3s1652n896k1hck7ckrr8"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base calamity dhall di di-polysemy generic-lens hspec + hspec-megaparsec megaparsec polysemy polysemy-plugin text text-show + unboxing-vector unordered-containers vector + ]; + executableHaskellDepends = [ + base calamity dhall di di-polysemy generic-lens hspec + hspec-megaparsec megaparsec polysemy polysemy-plugin text text-show + unboxing-vector unordered-containers vector + ]; + testHaskellDepends = [ + base calamity dhall di di-polysemy generic-lens hspec + hspec-megaparsec megaparsec polysemy polysemy-plugin text text-show + unboxing-vector unordered-containers vector + ]; + description = "Discord verification bot"; + license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "discord-rest" = callPackage ({ mkDerivation, aeson, base, bytestring, comonad, data-default , discord-types, hashable, hslogger, http-client, mtl, req, stm @@ -78196,6 +78393,32 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "domain" = callPackage + ({ mkDerivation, attoparsec, base, bytestring, domain-core, foldl + , hashable, parser-combinators, QuickCheck, quickcheck-instances + , rerebase, tasty, tasty-hunit, tasty-quickcheck, template-haskell + , template-haskell-compat-v0208, text, th-lego, th-orphans + , yaml-unscrambler + }: + mkDerivation { + pname = "domain"; + version = "0.1"; + sha256 = "1lr97k14wc35myckknsv3vyximqfv5vq04f5kpd8167lk3vjahm2"; + libraryHaskellDepends = [ + attoparsec base bytestring domain-core foldl hashable + parser-combinators template-haskell template-haskell-compat-v0208 + text th-lego yaml-unscrambler + ]; + testHaskellDepends = [ + base domain-core QuickCheck quickcheck-instances rerebase tasty + tasty-hunit tasty-quickcheck template-haskell text th-orphans + ]; + description = "Codegen helping you define domain models"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "domain-auth" = callPackage ({ mkDerivation, asn1-encoding, asn1-types, attoparsec, base , bytestring, containers, cryptonite, dns, doctest, iproute, memory @@ -78214,6 +78437,44 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "domain-core" = callPackage + ({ mkDerivation, base, template-haskell + , template-haskell-compat-v0208, text, th-lego, th-lift-instances + }: + mkDerivation { + pname = "domain-core"; + version = "0.1"; + sha256 = "1qxscw4rcbnak9mp21455gzjdnjj6cqisdhq63gdibhrazfsjvd3"; + libraryHaskellDepends = [ + base template-haskell template-haskell-compat-v0208 text th-lego + th-lift-instances + ]; + description = "Low-level API of \"domain\""; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + + "domain-optics" = callPackage + ({ mkDerivation, base, domain, domain-core, optics, optics-core + , rerebase, template-haskell, template-haskell-compat-v0208, text + , th-lego, unordered-containers + }: + mkDerivation { + pname = "domain-optics"; + version = "0.1"; + sha256 = "0nivzn3nw30n1wb0i2j9qzxfmqcyknc187z3rkfyz5a5y7iq7x4m"; + libraryHaskellDepends = [ + base domain-core optics-core template-haskell + template-haskell-compat-v0208 text th-lego unordered-containers + ]; + testHaskellDepends = [ domain optics rerebase ]; + description = "Integration of domain with optics"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "dominion" = callPackage ({ mkDerivation, base, containers, hspec, lens, mtl, random }: mkDerivation { @@ -81336,15 +81597,15 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "egison-pattern-src_0_2_1_1" = callPackage + "egison-pattern-src_0_2_1_2" = callPackage ({ mkDerivation, base, containers, free, megaparsec, mtl , parser-combinators, prettyprinter, recursion-schemes, tasty , tasty-discover, tasty-hunit, text }: mkDerivation { pname = "egison-pattern-src"; - version = "0.2.1.1"; - sha256 = "0zpaxkskpdhq5nm1h6fh1klww4cslz96a3w4fhlaz0v0wdbkbrfs"; + version = "0.2.1.2"; + sha256 = "14g13m9c4353j8hir5inqhfzwapkxdkbvkzfbrrgca6hyj7mn1vf"; libraryHaskellDepends = [ base containers free megaparsec mtl parser-combinators prettyprinter recursion-schemes text @@ -81364,8 +81625,8 @@ self: { }: mkDerivation { pname = "egison-pattern-src-haskell-mode"; - version = "0.2.1.1"; - sha256 = "0k21fi28imqnn2rp5182mjxnrahssbdxay3pzhzj5yyfjp8qymwp"; + version = "0.2.1.2"; + sha256 = "1v76k77p8d86sp8lpd9h7gqdd9srbbiq8sd3bvvdvn7sj44gzw9m"; libraryHaskellDepends = [ base egison-pattern-src haskell-src-exts mtl text ]; @@ -81399,6 +81660,29 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "egison-pattern-src-th-mode_0_2_1_2" = callPackage + ({ mkDerivation, base, egison-pattern-src, haskell-src-exts + , haskell-src-meta, mtl, pretty, tasty, tasty-discover, tasty-hunit + , template-haskell, text + }: + mkDerivation { + pname = "egison-pattern-src-th-mode"; + version = "0.2.1.2"; + sha256 = "0zm3ds6vcxhahcwwryhk8f65141f0bnzj6mxy681npzwzgvljiyd"; + libraryHaskellDepends = [ + base egison-pattern-src haskell-src-exts haskell-src-meta mtl + pretty template-haskell text + ]; + testHaskellDepends = [ + base egison-pattern-src haskell-src-exts mtl tasty tasty-hunit + template-haskell text + ]; + testToolDepends = [ tasty-discover ]; + description = "Parser and pretty printer for Egison pattern expressions to use with TH"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "egison-quote" = callPackage ({ mkDerivation, base, egison, mtl, parsec, template-haskell }: mkDerivation { @@ -84257,6 +84541,8 @@ self: { testHaskellDepends = [ base ]; description = "Error code functions"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "error-context" = callPackage @@ -84702,7 +84988,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "esqueleto_3_4_0_0" = callPackage + "esqueleto_3_4_0_1" = callPackage ({ mkDerivation, aeson, attoparsec, base, blaze-html, bytestring , conduit, containers, exceptions, hspec, monad-logger, mtl, mysql , mysql-simple, persistent, persistent-mysql, persistent-postgresql @@ -84712,8 +84998,8 @@ self: { }: mkDerivation { pname = "esqueleto"; - version = "3.4.0.0"; - sha256 = "0a4wrkcwlzgw0mds1pnxspv6ddzy9mz0md0qdx0x9s51z9ldswaj"; + version = "3.4.0.1"; + sha256 = "1vq8yfrixgqps8g6wvfgr9n42zmwj1jybiq3sbrgfj318n6dm5mc"; libraryHaskellDepends = [ aeson attoparsec base blaze-html bytestring conduit containers monad-logger persistent resourcet tagged text time transformers @@ -86069,8 +86355,8 @@ self: { }: mkDerivation { pname = "exact-real"; - version = "0.12.4"; - sha256 = "09i0pi141cmqc09mxgsmdk7n3a0rcmjc7w2j4a0ckf0i41vb9yni"; + version = "0.12.4.1"; + sha256 = "194qx4dq8c9w1nbr4vyalmvp0m1a0q1pxjckg59m7c3fsz9r88jg"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ base integer-gmp random ]; testHaskellDepends = [ @@ -86080,8 +86366,6 @@ self: { benchmarkHaskellDepends = [ base criterion ]; description = "Exact real arithmetic"; license = stdenv.lib.licenses.mit; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "exact-real-positional" = callPackage @@ -92911,7 +93195,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "foldl_1_4_9" = callPackage + "foldl_1_4_10" = callPackage ({ mkDerivation, base, bytestring, comonad, containers , contravariant, criterion, doctest, hashable, mwc-random , primitive, profunctors, semigroupoids, text, transformers @@ -92919,10 +93203,8 @@ self: { }: mkDerivation { pname = "foldl"; - version = "1.4.9"; - sha256 = "06cl9nyamzrmk894zm5na5hkbvnfyla1yvs2dk2ydms5m0v7z1na"; - revision = "1"; - editedCabalFile = "1fp5fym1620zcp570naa3wqhs4x3l9qgdxk77ddmijm9q3j0vqmm"; + version = "1.4.10"; + sha256 = "1fl1vahga6dv21nkgjd265nlhmgqzr8sa0fb5dfqzk34fb01vvvq"; libraryHaskellDepends = [ base bytestring comonad containers contravariant hashable mwc-random primitive profunctors semigroupoids text transformers @@ -97209,14 +97491,14 @@ self: { "gargoyle" = callPackage ({ mkDerivation, base, directory, filelock, filepath, network - , process + , process, unix }: mkDerivation { pname = "gargoyle"; - version = "0.1"; - sha256 = "1yjvn1bfjnr8prs6inz5nhmywszwp8f38iz6v6i3lfazcck8qb43"; + version = "0.1.1.0"; + sha256 = "1rjkz0v8jmzxxh41fs777fyhdp7lizwngg33886awmg08hdk24rq"; libraryHaskellDepends = [ - base directory filelock filepath network process + base directory filelock filepath network process unix ]; description = "Automatically spin up and spin down local daemons"; license = stdenv.lib.licenses.bsd3; @@ -97225,17 +97507,18 @@ self: { }) {}; "gargoyle-postgresql" = callPackage - ({ mkDerivation, base, bytestring, directory, gargoyle, process - , stringsearch, text, unix + ({ mkDerivation, base, bytestring, directory, gargoyle + , posix-escape, process, stringsearch, text, unix }: mkDerivation { pname = "gargoyle-postgresql"; - version = "0.1"; - sha256 = "13s2r5kxqkpq4g13dpqig7y2ya0n19xw5ng1sw093kp2kmfjs4h4"; + version = "0.2.0.1"; + sha256 = "1k12cfrz58hmdrjnrxyb3dixj8yfz41xpq0dqgvxzwlrd3d4nb9g"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - base bytestring directory gargoyle process stringsearch text unix + base bytestring directory gargoyle posix-escape process + stringsearch text unix ]; executableHaskellDepends = [ base bytestring gargoyle process text unix @@ -97246,6 +97529,49 @@ self: { broken = true; }) {}; + "gargoyle-postgresql-connect" = callPackage + ({ mkDerivation, base, bytestring, directory, gargoyle + , gargoyle-postgresql, gargoyle-postgresql-nix, postgresql-simple + , resource-pool + }: + mkDerivation { + pname = "gargoyle-postgresql-connect"; + version = "0.1.0.0"; + sha256 = "00gfs33hcmjla7h32hiazjpsdcszvig7fajhsx48yr8jq9srkm3d"; + revision = "2"; + editedCabalFile = "052glxfxsd9wvdyqxdj49vp1b1vvqr77zrdv85r3iqm7mvf16gmk"; + libraryHaskellDepends = [ + base bytestring directory gargoyle gargoyle-postgresql + gargoyle-postgresql-nix postgresql-simple resource-pool + ]; + description = "Connect to gargoyle-managed postgresql instances"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + + "gargoyle-postgresql-nix" = callPackage + ({ mkDerivation, base, bytestring, gargoyle, gargoyle-postgresql + , which + }: + mkDerivation { + pname = "gargoyle-postgresql-nix"; + version = "0.3.0.0"; + sha256 = "1cjh9hqk4ba1bz29b4vj0h249vpfpdgn8zsznqcr7b58czd8cf4y"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base bytestring gargoyle gargoyle-postgresql which + ]; + executableHaskellDepends = [ + base gargoyle gargoyle-postgresql which + ]; + description = "Manage PostgreSQL servers with gargoyle and nix"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "garlic-bread" = callPackage ({ mkDerivation, base, hspec, mtl, transformers }: mkDerivation { @@ -98122,7 +98448,7 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "generic-data_0_9_1_0" = callPackage + "generic-data_0_9_2_0" = callPackage ({ mkDerivation, ap-normalize, base, base-orphans, Cabal , cabal-doctest, contravariant, criterion, deepseq, doctest , generic-lens, ghc-boot-th, inspection-testing, one-liner @@ -98131,8 +98457,8 @@ self: { }: mkDerivation { pname = "generic-data"; - version = "0.9.1.0"; - sha256 = "0p58z70wp3vapxrwg7hkr5n6px7hws9398v9shc08c2aigq36kqa"; + version = "0.9.2.0"; + sha256 = "00zwfr21kmgcdjfjvacn4pvs5i8bl6xbbzw95746g67ap5nz624d"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ ap-normalize base base-orphans contravariant ghc-boot-th @@ -98255,13 +98581,13 @@ self: { }) {}; "generic-functor" = callPackage - ({ mkDerivation, base }: + ({ mkDerivation, ap-normalize, base, transformers }: mkDerivation { pname = "generic-functor"; - version = "0.1.0.0"; - sha256 = "02anlx3l0zn4hx9pckpdpp93yp1xyqcafpy6rk7s1zpv7nqk12z2"; - libraryHaskellDepends = [ base ]; - testHaskellDepends = [ base ]; + version = "0.2.0.0"; + sha256 = "0zrjsn78ip9kigqgw5cxzm9d7pqf1svdzrc3rm041889ca0szwjv"; + libraryHaskellDepends = [ ap-normalize base ]; + testHaskellDepends = [ base transformers ]; description = "Deriving generalized functors with GHC.Generics"; license = stdenv.lib.licenses.mit; }) {}; @@ -103355,8 +103681,8 @@ self: { }: mkDerivation { pname = "git-annex"; - version = "8.20201007"; - sha256 = "0v11yc4kkxnzvwqry277dpjwlavinrjiagfw0ayhrfwd703j1y8a"; + version = "8.20201103"; + sha256 = "1z9ikpsz3by48yfw87qav5dy7j4k9ky4a7nqnasl15kdm3lav9pl"; configureFlags = [ "-fassistant" "-f-benchmark" "-fdbus" "-f-debuglocks" "-fmagicmime" "-fnetworkbsd" "-fpairing" "-fproduction" "-fs3" "-ftorrentparser" @@ -103642,8 +103968,6 @@ self: { ]; description = "Tool to help resolving git conflicts"; license = stdenv.lib.licenses.gpl2; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "git-monitor" = callPackage @@ -108184,8 +108508,8 @@ self: { }: mkDerivation { pname = "goldplate"; - version = "0.1.1"; - sha256 = "0qjqx3yxlyfdj6glych7vwrrh47nrp6xi0vncga2a94hb5sljzzl"; + version = "0.1.2"; + sha256 = "1qbh23sqx0jvwrmhb88683z3rx31jy99xh8h24iqv1ykmjvmqwvf"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -108569,15 +108893,16 @@ self: { "gopro-plus" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, exceptions - , filepath, generic-deriving, HUnit, lens, lens-aeson, mtl, random + , filepath, generic-deriving, generic-random, HUnit, lens + , lens-aeson, mtl, QuickCheck, quickcheck-instances, random , raw-strings-qq, retry, tasty, tasty-hunit, tasty-quickcheck, text , time, transformers, unix, unliftio, unordered-containers, vector , wreq }: mkDerivation { pname = "gopro-plus"; - version = "0.4.1.1"; - sha256 = "1vcy9r4jnnrfc6xp34b4w5z4xgxhcnsv5sy26iazw6g07mg1v73p"; + version = "0.4.1.3"; + sha256 = "1924d0qymm18zy5pw04irf1nmwdbkbscxcvw4cmjqm9xj7cnyja0"; libraryHaskellDepends = [ aeson base bytestring containers exceptions filepath generic-deriving lens lens-aeson mtl random retry text time @@ -108585,12 +108910,15 @@ self: { ]; testHaskellDepends = [ aeson base bytestring containers exceptions filepath - generic-deriving HUnit lens lens-aeson mtl random raw-strings-qq - retry tasty tasty-hunit tasty-quickcheck text time transformers - unix unliftio unordered-containers vector wreq + generic-deriving generic-random HUnit lens lens-aeson mtl + QuickCheck quickcheck-instances random raw-strings-qq retry tasty + tasty-hunit tasty-quickcheck text time transformers unix unliftio + unordered-containers vector wreq ]; description = "GoPro Plus Client API"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "gore-and-ash" = callPackage @@ -112065,6 +112393,55 @@ self: { broken = true; }) {}; + "hOpenPGP_2_9_5" = callPackage + ({ mkDerivation, aeson, asn1-encoding, attoparsec, base + , base16-bytestring, bifunctors, binary, binary-conduit, bytestring + , bz2, conduit, conduit-extra, containers, criterion + , crypto-cipher-types, cryptonite, errors, hashable + , incremental-parser, ixset-typed, lens, memory, monad-loops + , nettle, network, network-uri, openpgp-asciiarmor, prettyprinter + , QuickCheck, quickcheck-instances, resourcet, split, tasty + , tasty-hunit, tasty-quickcheck, text, time, time-locale-compat + , transformers, unliftio-core, unordered-containers, zlib + }: + mkDerivation { + pname = "hOpenPGP"; + version = "2.9.5"; + sha256 = "1wzvlk7my7a8rwmsw1glw2dlph3b2hwyz2jkcjr0hd1jj8ywksnx"; + libraryHaskellDepends = [ + aeson asn1-encoding attoparsec base base16-bytestring bifunctors + binary binary-conduit bytestring bz2 conduit conduit-extra + containers crypto-cipher-types cryptonite errors hashable + incremental-parser ixset-typed lens memory monad-loops nettle + network-uri openpgp-asciiarmor prettyprinter resourcet split text + time time-locale-compat transformers unliftio-core + unordered-containers zlib + ]; + testHaskellDepends = [ + aeson asn1-encoding attoparsec base base16-bytestring bifunctors + binary binary-conduit bytestring bz2 conduit conduit-extra + containers crypto-cipher-types cryptonite errors hashable + incremental-parser ixset-typed lens memory monad-loops nettle + network network-uri prettyprinter QuickCheck quickcheck-instances + resourcet split tasty tasty-hunit tasty-quickcheck text time + time-locale-compat transformers unliftio-core unordered-containers + zlib + ]; + benchmarkHaskellDepends = [ + aeson base base16-bytestring bifunctors binary binary-conduit + bytestring bz2 conduit conduit-extra containers criterion + crypto-cipher-types cryptonite errors hashable incremental-parser + ixset-typed lens memory monad-loops nettle network network-uri + openpgp-asciiarmor prettyprinter resourcet split text time + time-locale-compat transformers unliftio-core unordered-containers + zlib + ]; + description = "native Haskell implementation of OpenPGP (RFC4880)"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "hPDB" = callPackage ({ mkDerivation, base, bytestring, containers, deepseq, directory , ghc-prim, iterable, linear, mmap, mtl, Octree, parallel @@ -112992,10 +113369,8 @@ self: { }: mkDerivation { pname = "hackage-security-HTTP"; - version = "0.1.1"; - sha256 = "0chkrn4d33qjh50fpbkrkqj6jsxd5y5c2mrgqgwsdx3x08kaq8nd"; - revision = "3"; - editedCabalFile = "1nsvfqg2k1yj8pvbfx1083m29v1c9kcb9h389r380ga1b32v89nl"; + version = "0.1.1.1"; + sha256 = "14hp7gssf80b9937j7m56w8sxrv3hrzjf2s9kgfk76v6llgx79k2"; libraryHaskellDepends = [ base bytestring hackage-security HTTP mtl network network-uri zlib ]; @@ -114488,15 +114863,15 @@ self: { }) {}; "hakyll-typescript" = callPackage - ({ mkDerivation, base, bytestring, directory, hakyll, hjsmin, tasty - , tasty-hunit, typed-process + ({ mkDerivation, base, bytestring, directory, hakyll + , hakyll-process, hjsmin, tasty, tasty-hunit }: mkDerivation { pname = "hakyll-typescript"; - version = "0.0.1.0"; - sha256 = "1vhkhbmy0pflcnzfhb9gck436rr5wr6hfpcb3sz8r27l1fml26ji"; + version = "0.0.2.0"; + sha256 = "03vxfv693grnyrkr3qz9vxh97dmaw1qqnb4hrfi8hpkqb094yw5d"; libraryHaskellDepends = [ - base bytestring hakyll hjsmin typed-process + base bytestring hakyll hakyll-process hjsmin ]; testHaskellDepends = [ base directory hakyll tasty tasty-hunit ]; description = "Typescript and javascript hakyll compilers"; @@ -117963,12 +118338,12 @@ self: { license = stdenv.lib.licenses.lgpl21; }) {inherit (pkgs) glib;}; - "haskell-gi-base_0_24_3" = callPackage + "haskell-gi-base_0_24_4" = callPackage ({ mkDerivation, base, bytestring, containers, glib, text }: mkDerivation { pname = "haskell-gi-base"; - version = "0.24.3"; - sha256 = "007qy63s9d6rdhybnd7cfb5jsx0kzg7lbgximxkh5rd66bjbk9pc"; + version = "0.24.4"; + sha256 = "1xdl2pfpk30h4649avh0ms6gq9dij3yxpfxn6kwxyjcsxdggzmdg"; libraryHaskellDepends = [ base bytestring containers text ]; libraryPkgconfigDepends = [ glib ]; description = "Foundation for libraries generated by haskell-gi"; @@ -120266,7 +120641,7 @@ self: { license = stdenv.lib.licenses.publicDomain; }) {}; - "haskoin-core_0_17_0" = callPackage + "haskoin-core_0_17_1" = callPackage ({ mkDerivation, aeson, array, base, base16-bytestring, bytestring , cereal, conduit, containers, cryptonite, deepseq, entropy , hashable, hspec, hspec-discover, HUnit, lens, lens-aeson, memory @@ -120276,8 +120651,8 @@ self: { }: mkDerivation { pname = "haskoin-core"; - version = "0.17.0"; - sha256 = "0zsi5390ig611clahj3p2l3h3w7b3lzl3dfiqliihanivlnrmkag"; + version = "0.17.1"; + sha256 = "07w2ddgrq3s4xhhhh616a65zm3xnlmcfk7wzdj6dr26h0frpz6zi"; libraryHaskellDepends = [ aeson array base base16-bytestring bytestring cereal conduit containers cryptonite deepseq entropy hashable hspec memory mtl @@ -123417,8 +123792,8 @@ self: { }: mkDerivation { pname = "hdocs"; - version = "0.5.4.0"; - sha256 = "1qj7kcpfwpsgzbmhiix22n66173kgxqgf3fb6mc2ybdc4zmkfa29"; + version = "0.5.5.0"; + sha256 = "1bwwvqlxpjh77fi443ay269i8n9cxzdv7nspql6lrks9wh8jf8cf"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -125388,32 +125763,32 @@ self: { "hevm" = callPackage ({ mkDerivation, abstract-par, aeson, ansi-wl-pprint, async, base - , base16-bytestring, binary, brick, bytestring, cborg, cereal - , containers, cryptonite, data-dword, deepseq, directory, ff, fgl - , filepath, free, haskeline, here, HUnit, lens, lens-aeson - , megaparsec, memory, monad-par, mtl, multiset, operational - , optparse-generic, process, QuickCheck, quickcheck-text - , regex-tdfa, restless-git, rosezipper, s-cargot, sbv, scientific - , secp256k1, semver-range, tasty, tasty-hunit, tasty-quickcheck - , temporary, text, text-format, time, transformers, tree-view - , unordered-containers, vector, vty, witherable, wreq + , base16-bytestring, binary, brick, bytestring, cereal, containers + , cryptonite, data-dword, deepseq, directory, ff, fgl, filepath + , free, haskeline, here, HUnit, lens, lens-aeson, megaparsec + , memory, monad-par, mtl, multiset, operational, optparse-generic + , process, QuickCheck, quickcheck-text, regex-tdfa, restless-git + , rosezipper, s-cargot, sbv, scientific, secp256k1, semver-range + , tasty, tasty-hunit, tasty-quickcheck, temporary, text + , text-format, time, transformers, tree-view, unordered-containers + , vector, vty, witherable, wreq }: mkDerivation { pname = "hevm"; - version = "0.41.0"; - sha256 = "13qf0bh47dppqbxv1g07411c1lfmfxl0pm2s3xkwdf7kr219l0hw"; + version = "0.42.0"; + sha256 = "0p736bxsg91l7n82xad52j5gqvyx6ik7hbmlnnz5bsrnsm05maxz"; isLibrary = true; isExecutable = true; enableSeparateDataOutput = true; libraryHaskellDepends = [ abstract-par aeson ansi-wl-pprint base base16-bytestring binary - brick bytestring cborg cereal containers cryptonite data-dword - deepseq directory fgl filepath free haskeline lens lens-aeson - megaparsec memory monad-par mtl multiset operational - optparse-generic process QuickCheck quickcheck-text regex-tdfa - restless-git rosezipper s-cargot sbv scientific semver-range - temporary text text-format time transformers tree-view - unordered-containers vector vty witherable wreq + brick bytestring cereal containers cryptonite data-dword deepseq + directory fgl filepath free haskeline lens lens-aeson megaparsec + memory monad-par mtl multiset operational optparse-generic process + QuickCheck quickcheck-text regex-tdfa restless-git rosezipper + s-cargot sbv scientific semver-range temporary text text-format + time transformers tree-view unordered-containers vector vty + witherable wreq ]; librarySystemDepends = [ ff secp256k1 ]; executableHaskellDepends = [ @@ -125497,6 +125872,8 @@ self: { testHaskellDepends = [ base doctest ]; description = "ByteString-Text hexidecimal conversions"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "hexchat" = callPackage @@ -127537,6 +127914,21 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "hinotify_0_4_1" = callPackage + ({ mkDerivation, async, base, bytestring, containers, directory + , unix + }: + mkDerivation { + pname = "hinotify"; + version = "0.4.1"; + sha256 = "06pqfikfa61i45g92b65br83kplwmizqkm42yp8d0ddgmq0b21qk"; + libraryHaskellDepends = [ async base bytestring containers unix ]; + testHaskellDepends = [ base bytestring directory unix ]; + description = "Haskell binding to inotify"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "hinotify-bytestring" = callPackage ({ mkDerivation, base, bytestring, containers, directory , posix-paths, unix, utf8-string @@ -129884,8 +130276,8 @@ self: { }: mkDerivation { pname = "hnix"; - version = "0.10.1"; - sha256 = "19a5pa1ji4hjr3vjvbkjmhnysnd8jcpkzlj9f2qw67h5iagysccy"; + version = "0.11.0"; + sha256 = "01m23sn3r2pr6ldblk4m41y082jc0lrgpfzbx63sx168ldhwxar3"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -131246,6 +131638,39 @@ self: { broken = true; }) {}; + "hopenpgp-tools_0_23_3" = callPackage + ({ mkDerivation, aeson, alex, array, base, base16-bytestring + , binary, binary-conduit, bytestring, conduit, conduit-extra + , containers, cryptonite, directory, errors, fgl, graphviz, happy + , hOpenPGP, http-client, http-client-tls, http-types, ixset-typed + , lens, memory, monad-loops, mtl, openpgp-asciiarmor + , optparse-applicative, prettyprinter, prettyprinter-ansi-terminal + , prettyprinter-convert-ansi-wl-pprint, resourcet, text, time + , time-locale-compat, transformers, unordered-containers, vector + , yaml + }: + mkDerivation { + pname = "hopenpgp-tools"; + version = "0.23.3"; + sha256 = "1h6hg05i7vm0cnhn3sifmmv01hjxy0w030j4m3fig3ic57658q2p"; + isLibrary = false; + isExecutable = true; + executableHaskellDepends = [ + aeson array base base16-bytestring binary binary-conduit bytestring + conduit conduit-extra containers cryptonite directory errors fgl + graphviz hOpenPGP http-client http-client-tls http-types + ixset-typed lens memory monad-loops mtl openpgp-asciiarmor + optparse-applicative prettyprinter prettyprinter-ansi-terminal + prettyprinter-convert-ansi-wl-pprint resourcet text time + time-locale-compat transformers unordered-containers vector yaml + ]; + executableToolDepends = [ alex happy ]; + description = "hOpenPGP-based command-line tools"; + license = stdenv.lib.licenses.agpl3Plus; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "hopenssl" = callPackage ({ mkDerivation, base, bytestring, HUnit, openssl }: mkDerivation { @@ -132501,8 +132926,10 @@ self: { }: mkDerivation { pname = "hprotoc"; - version = "2.4.13"; - sha256 = "0z88kiirwpnzw6hxg99kg42j2hkf002vcsmbcm7nqdfqajrggiy0"; + version = "2.4.17"; + sha256 = "1r7zr4sbg6355zavbzjixvfv10aglz1zs9ajnznpjhnj6lfisf32"; + revision = "2"; + editedCabalFile = "0hxhvjk3mswx712viv7krcgiynxq4bjs71vbk2pgm2d50i5qr8mr"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -134851,30 +135278,31 @@ self: { ({ mkDerivation, aeson, aeson-pretty, array, async, attoparsec , base, bytestring, Cabal, containers, cpphs, data-default, deepseq , direct-sqlite, directory, exceptions, filepath, fsnotify, ghc - , ghc-boot, ghc-paths, haddock-api, haddock-library, haskell-names - , haskell-src-exts, hdocs, hformat, hlint, hspec, http-client, lens - , lens-aeson, lifted-base, mmorph, monad-control, monad-loops, mtl - , network, network-uri, optparse-applicative, process - , regex-pcre-builtin, scientific, simple-log, sqlite-simple, stm - , syb, template-haskell, text, text-region, time, transformers - , transformers-base, uniplate, unix, unordered-containers, vector + , ghc-boot, ghc-lib-parser, ghc-paths, haddock-api, haddock-library + , haskell-names, haskell-src-exts, hdocs, hformat, hlint, hspec + , http-client, lens, lens-aeson, lifted-base, mmorph, monad-control + , monad-loops, mtl, network, network-uri, optparse-applicative + , process, regex-pcre-builtin, scientific, simple-log + , sqlite-simple, stm, syb, template-haskell, text, text-region + , time, transformers, transformers-base, uniplate, unix + , unordered-containers, vector }: mkDerivation { pname = "hsdev"; - version = "0.3.3.8"; - sha256 = "01dagwpg70h9af5kzr2f19qsvy4h5cx5rjdrcq0r36fbmdkbza2z"; + version = "0.3.4.0"; + sha256 = "1qp1rsqxnv842kamhcf9hylj7ja1hwxni4m29d7pqfwbqsfwf55h"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ aeson aeson-pretty array async attoparsec base bytestring Cabal containers cpphs data-default deepseq direct-sqlite directory - exceptions filepath fsnotify ghc ghc-boot ghc-paths haddock-api - haddock-library haskell-names haskell-src-exts hdocs hformat hlint - http-client lens lifted-base mmorph monad-control monad-loops mtl - network network-uri optparse-applicative process regex-pcre-builtin - scientific simple-log sqlite-simple stm syb template-haskell text - text-region time transformers transformers-base uniplate unix - unordered-containers vector + exceptions filepath fsnotify ghc ghc-boot ghc-lib-parser ghc-paths + haddock-api haddock-library haskell-names haskell-src-exts hdocs + hformat hlint http-client lens lifted-base mmorph monad-control + monad-loops mtl network network-uri optparse-applicative process + regex-pcre-builtin scientific simple-log sqlite-simple stm syb + template-haskell text text-region time transformers + transformers-base uniplate unix unordered-containers vector ]; executableHaskellDepends = [ aeson aeson-pretty base bytestring containers deepseq directory @@ -134996,6 +135424,20 @@ self: { maintainers = with stdenv.lib.maintainers; [ peti ]; }) {}; + "hsemail_2_2_1" = callPackage + ({ mkDerivation, base, hspec, parsec, time, time-compat }: + mkDerivation { + pname = "hsemail"; + version = "2.2.1"; + sha256 = "108xjspr7apx248gvv7w1hh2pqnb7qg699a8l8f8z64cv6s9ksmm"; + libraryHaskellDepends = [ base parsec time time-compat ]; + testHaskellDepends = [ base hspec parsec time ]; + description = "Parsec parsers for the Internet Message format (e-mail)"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + maintainers = with stdenv.lib.maintainers; [ peti ]; + }) {}; + "hsemail-ns" = callPackage ({ mkDerivation, base, doctest, hspec, mtl, old-time, parsec }: mkDerivation { @@ -139491,6 +139933,26 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "http-rfc7807" = callPackage + ({ mkDerivation, aeson, base, call-stack, hspec-expectations-json + , http-media, http-types, servant, servant-server, tasty + , tasty-hunit, text + }: + mkDerivation { + pname = "http-rfc7807"; + version = "0.1.0.0"; + sha256 = "1wysqi3rfyg1fb7p9plb6ihcqzvyb2cqhsfx46ciwgym9nxg8lr4"; + libraryHaskellDepends = [ + aeson base http-media http-types servant servant-server text + ]; + testHaskellDepends = [ + aeson base call-stack hspec-expectations-json tasty tasty-hunit + text + ]; + description = "RFC7807 style response messages"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "http-server" = callPackage ({ mkDerivation, base, HTTP, mime, network, network-uri, text, unix , url, utf8-string @@ -139661,10 +140123,8 @@ self: { }: mkDerivation { pname = "http2-client"; - version = "0.9.0.0"; - sha256 = "1z46an4sign2ashjsj2y07vkf73i2wzx5x10qsdaf4av5ib8ykxq"; - revision = "1"; - editedCabalFile = "00fg9a62qkjwp7rb38j7z7yy6dk3mkh6mgwspd79v2ycmn4mr25q"; + version = "0.10.0.0"; + sha256 = "0kv4qa9cbwwj6b62manzpl1sk4jnsb5vx2y73w49drlfkrw1vpgy"; libraryHaskellDepends = [ async base bytestring containers deepseq http2 lifted-async lifted-base mtl network stm time tls transformers-base @@ -146616,6 +147076,25 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "integer-logarithms_1_0_3_1" = callPackage + ({ mkDerivation, array, base, ghc-prim, integer-gmp, QuickCheck + , smallcheck, tasty, tasty-hunit, tasty-quickcheck + , tasty-smallcheck + }: + mkDerivation { + pname = "integer-logarithms"; + version = "1.0.3.1"; + sha256 = "0zzapclfabc76g8jzsbsqwdllx2zn0gp4raq076ib6v0mfgry2lv"; + libraryHaskellDepends = [ array base ghc-prim integer-gmp ]; + testHaskellDepends = [ + base QuickCheck smallcheck tasty tasty-hunit tasty-quickcheck + tasty-smallcheck + ]; + description = "Integer logarithms"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "integer-pure" = callPackage ({ mkDerivation }: mkDerivation { @@ -147865,6 +148344,8 @@ self: { ]; description = "Library for IP and MAC addresses"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "ip-quoter" = callPackage @@ -154889,8 +155370,8 @@ self: { }: mkDerivation { pname = "kubernetes-client"; - version = "0.3.0.0"; - sha256 = "1wpcamcvyphs2y370qzn5fmc18zyn8nb0099si12n9xgk5zdmcrq"; + version = "0.3.1.0"; + sha256 = "1ys3b143wckkgc7wjwfilkvr35j7as775p2d2riqkjpfi88kh301"; libraryHaskellDepends = [ aeson attoparsec base base64-bytestring bytestring connection containers data-default-class either filepath hoauth2 http-client @@ -154924,8 +155405,8 @@ self: { }: mkDerivation { pname = "kubernetes-client-core"; - version = "0.3.0.0"; - sha256 = "0ifn69iqxwxkl4y2qlz5d25fbyqb2pks0cd064j54hc0fjwlxlzk"; + version = "0.3.1.0"; + sha256 = "0rb5iyln1grpdg36hf2655sm3chrw4cddbmfhxjpispybr1ypl9c"; libraryHaskellDepends = [ aeson base base64-bytestring bytestring case-insensitive containers deepseq exceptions http-api-data http-client http-client-tls @@ -159565,10 +160046,8 @@ self: { }: mkDerivation { pname = "lentil"; - version = "1.3.2.0"; - sha256 = "134f9ijnd1dw2l9k5m1ay643pc4jqmq5kx17cnijb7ff93442s0n"; - revision = "2"; - editedCabalFile = "0xijjp1ysybbd9n3f5vcaph1qdad5v9ynp0jia5aaizr34lwx94z"; + version = "1.4.0.0"; + sha256 = "1f5jcprb2l65nyysxgdkhd9vsg1ixn8qfpjgmgvi8cqm0zp28zw7"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ @@ -159641,22 +160120,28 @@ self: { }) {}; "less-arbitrary" = callPackage - ({ mkDerivation, base, containers, generic-arbitrary, hashable, mtl - , QuickCheck, quickcheck-classes, quickcheck-instances, random - , scientific, text, transformers, unordered-containers, vector + ({ mkDerivation, base, containers, email-validate + , generic-arbitrary, genvalidity, genvalidity-hspec + , genvalidity-property, hashable, hspec, mtl, QuickCheck + , quickcheck-classes, quickcheck-instances, random, scientific + , text, time, transformers, unordered-containers, validity, vector }: mkDerivation { pname = "less-arbitrary"; - version = "0.1.0.1"; - sha256 = "1hbiwyk49qqqdfglydywj02ycymdb486nv5cp8710gfwh75i29xw"; + version = "0.1.0.2"; + sha256 = "0xqhlk4qqykb173pm6akd7jvygm5ya3qqw3xc649aiq053ralvif"; libraryHaskellDepends = [ - base containers generic-arbitrary hashable mtl QuickCheck random - scientific text transformers unordered-containers vector + base containers email-validate generic-arbitrary genvalidity + genvalidity-hspec genvalidity-property hashable hspec mtl + QuickCheck random scientific text time transformers + unordered-containers validity vector ]; testHaskellDepends = [ - base containers generic-arbitrary hashable mtl QuickCheck - quickcheck-classes quickcheck-instances random scientific text - transformers unordered-containers vector + base containers email-validate generic-arbitrary genvalidity + genvalidity-hspec genvalidity-property hashable hspec mtl + QuickCheck quickcheck-classes quickcheck-instances random + scientific text time transformers unordered-containers validity + vector ]; description = "Linear time testing with variant of Arbitrary class that always terminates"; license = stdenv.lib.licenses.bsd3; @@ -164050,6 +164535,19 @@ self: { license = stdenv.lib.licenses.asl20; }) {}; + "loc_0_1_3_10" = callPackage + ({ mkDerivation, base, containers, doctest, hedgehog }: + mkDerivation { + pname = "loc"; + version = "0.1.3.10"; + sha256 = "0vl0pyimcm7jp4lgdmsqgcg9shqfrj60lz4psjkdfdcm3vkdqnkw"; + libraryHaskellDepends = [ base containers ]; + testHaskellDepends = [ base containers doctest hedgehog ]; + description = "Types representing line and column positions and ranges in text files"; + license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "loc-test" = callPackage ({ mkDerivation, base, containers, hedgehog, loc }: mkDerivation { @@ -165695,6 +166193,8 @@ self: { pname = "lsp"; version = "1.0.0.0"; sha256 = "05m9kxcf7g2xb4bhbn08bfbf09b8vvvw3nvpcfldpx180yz3n02r"; + revision = "1"; + editedCabalFile = "1pgxvwfn7avkpdl6f3p7rqaivdz438yqkzsz0rp1y0s80mymvz1i"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -165777,8 +166277,8 @@ self: { }: mkDerivation { pname = "lsp-types"; - version = "1.0.0.0"; - sha256 = "1cf07hdzgh5inskabdyli3zg95grc3qlw9d5xiqf1hwlspsyxis9"; + version = "1.0.0.1"; + sha256 = "1yrm42qsbqk94ql0khifcpvicy9lbvwwrvnr41lplbb1vhqvqc27"; libraryHaskellDepends = [ aeson base binary bytestring containers data-default deepseq dependent-sum-template directory filepath hashable hslogger lens @@ -166481,6 +166981,8 @@ self: { ]; description = "Bindings to LZ4"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "lz4-conduit" = callPackage @@ -167116,6 +167618,32 @@ self: { broken = true; }) {}; + "macrm" = callPackage + ({ mkDerivation, base, bytestring, cmdargs, cond, directory + , exceptions, filepath, githash, hspec, inline-c, main-tester + , MissingH, process, text, time, unix, uuid + }: + mkDerivation { + pname = "macrm"; + version = "1.0.0.5"; + sha256 = "0j1lcg5igypppj7c5plxifyvcl065j0mqhkdyb8nkpgjp95f7r0n"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base cmdargs cond directory exceptions githash inline-c MissingH + process text time unix + ]; + executableHaskellDepends = [ base ]; + testHaskellDepends = [ + base bytestring directory filepath hspec main-tester MissingH + process unix uuid + ]; + description = "Alternative rm command for macOS that remove files/dirs to the system trash"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "mad-props" = callPackage ({ mkDerivation, base, containers, lens, logict, MonadRandom, mtl , psqueues, random, random-shuffle, raw-strings-qq, transformers @@ -168867,6 +169395,30 @@ self: { broken = true; }) {}; + "massiv_0_5_5_0" = callPackage + ({ mkDerivation, base, bytestring, data-default-class, deepseq + , doctest, exceptions, mersenne-random-pure64, primitive + , QuickCheck, random, scheduler, splitmix, template-haskell + , unliftio-core, vector + }: + mkDerivation { + pname = "massiv"; + version = "0.5.5.0"; + sha256 = "1nlx8lakwnpplmgiiv692jbs03b52wqvclfyvaxcaf8yqdjms3r9"; + libraryHaskellDepends = [ + base bytestring data-default-class deepseq exceptions primitive + scheduler unliftio-core vector + ]; + testHaskellDepends = [ + base doctest mersenne-random-pure64 QuickCheck random splitmix + template-haskell + ]; + description = "Massiv (Массив) is an Array Library"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "massiv-io" = callPackage ({ mkDerivation, base, bytestring, Cabal, cabal-doctest, Color , data-default-class, deepseq, doctest, exceptions, filepath, hspec @@ -168894,7 +169446,7 @@ self: { broken = true; }) {}; - "massiv-io_0_3_0_1" = callPackage + "massiv-io_0_4_0_0" = callPackage ({ mkDerivation, base, bytestring, Color, data-default-class , deepseq, doctest, exceptions, filepath, hspec, JuicyPixels , massiv, massiv-test, netpbm, QuickCheck, random, template-haskell @@ -168902,8 +169454,8 @@ self: { }: mkDerivation { pname = "massiv-io"; - version = "0.3.0.1"; - sha256 = "0r0nkgpdkjwsdxcfys3idk1m7q0paz5c3gx1sx7xwsj7c5gyp5gs"; + version = "0.4.0.0"; + sha256 = "18q09pz563jp8lmnvmcynmhrk6pmqxr8whlcp6f9kilkzy7hzy9k"; libraryHaskellDepends = [ base bytestring Color data-default-class deepseq exceptions filepath JuicyPixels massiv netpbm unliftio vector @@ -170273,6 +170825,8 @@ self: { pname = "medea"; version = "1.2.0"; sha256 = "019jfz29gz3d06b5yi7fygqa79lp6c6vbzxcb5ka7d8w0zv7w60v"; + revision = "1"; + editedCabalFile = "1zkwy3p9q3rd4qcnmgr67xi3fv9frw35rsqpwh5l1mfvv772qap9"; libraryHaskellDepends = [ aeson algebraic-graphs base bytestring containers deepseq free hashable megaparsec microlens-ghc mtl nonempty-containers @@ -173576,20 +174130,20 @@ self: { "miv" = callPackage ({ mkDerivation, aeson, async, base, concurrent-output, directory - , filepath, ghc-prim, hashable, hspec, monad-parallel, process - , SafeSemaphore, text, time, unix-compat, unordered-containers - , xdg-basedir, yaml + , filepath, filepattern, ghc-prim, hashable, hspec, monad-parallel + , process, SafeSemaphore, text, time, unix-compat + , unordered-containers, xdg-basedir, yaml }: mkDerivation { pname = "miv"; - version = "0.4.3"; - sha256 = "0i2ikjr36qdr2i92bapx2p4lq4jvfmzh12b2nslhqq4xnf2fs2ib"; + version = "0.4.4"; + sha256 = "0is2ckkglh9wnhwnvyhhjy7as67mk7bs4az98q32nk3hx0yj9nq8"; isLibrary = false; isExecutable = true; executableHaskellDepends = [ - aeson async base concurrent-output directory filepath ghc-prim - hashable monad-parallel process SafeSemaphore text time unix-compat - unordered-containers xdg-basedir yaml + aeson async base concurrent-output directory filepath filepattern + ghc-prim hashable monad-parallel process SafeSemaphore text time + unix-compat unordered-containers xdg-basedir yaml ]; testHaskellDepends = [ aeson base directory ghc-prim hashable hspec monad-parallel process @@ -173970,6 +174524,8 @@ self: { ]; description = "Produces a sound recording specified by the Ukrainian text"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "mmsyn7l" = callPackage @@ -176532,8 +177088,8 @@ self: { pname = "monoidal-containers"; version = "0.6.0.1"; sha256 = "1j5mfs0ysvwk3jsmq4hlj4l3kasfc28lk1b3xaymf9dw48ac5j82"; - revision = "1"; - editedCabalFile = "06agyfnhr4cr42m4zj7xwl5an3skbjvba53a5i6sl9890gx7mml3"; + revision = "2"; + editedCabalFile = "1b98zf8c2mz7qrp24pyq6wqx5ljlckc7hyk62kiyj23svq7sxpzz"; libraryHaskellDepends = [ aeson base containers deepseq hashable lens newtype semialign semigroups these unordered-containers @@ -176885,6 +177441,46 @@ self: { license = stdenv.lib.licenses.agpl3Plus; }) {}; + "morloc" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers, directory + , docopt, extra, filepath, haskell-src-meta, megaparsec, mtl + , parsec, partial-order, pretty-simple, prettyprinter + , prettyprinter-ansi-terminal, process, QuickCheck, raw-strings-qq + , safe, scientific, tasty, tasty-golden, tasty-hunit + , tasty-quickcheck, template-haskell, text, unordered-containers + , yaml + }: + mkDerivation { + pname = "morloc"; + version = "0.33.0"; + sha256 = "089p6hajqlzsgpgmn1s467c4m9d3d0h507vml6vvxlhlph1gda76"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bytestring containers directory extra filepath + haskell-src-meta megaparsec mtl parsec partial-order pretty-simple + prettyprinter prettyprinter-ansi-terminal process raw-strings-qq + safe scientific template-haskell text unordered-containers yaml + ]; + executableHaskellDepends = [ + aeson base bytestring containers directory docopt extra filepath + haskell-src-meta megaparsec mtl parsec partial-order pretty-simple + prettyprinter prettyprinter-ansi-terminal process raw-strings-qq + safe scientific template-haskell text unordered-containers yaml + ]; + testHaskellDepends = [ + aeson base bytestring containers directory extra filepath + haskell-src-meta megaparsec mtl parsec partial-order pretty-simple + prettyprinter prettyprinter-ansi-terminal process QuickCheck + raw-strings-qq safe scientific tasty tasty-golden tasty-hunit + tasty-quickcheck template-haskell text unordered-containers yaml + ]; + description = "A multi-lingual, typed, workflow language"; + license = stdenv.lib.licenses.gpl3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "morph" = callPackage ({ mkDerivation, aeson, base, bytestring, directory, filepath , optparse-applicative, postgresql-simple, text, yaml @@ -176929,26 +177525,25 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "morpheus-graphql_0_15_1" = callPackage - ({ mkDerivation, aeson, base, bytestring, containers, megaparsec - , morpheus-graphql-core, mtl, scientific, tasty, tasty-hunit - , template-haskell, text, transformers, unliftio-core - , unordered-containers, uuid, vector, websockets + "morpheus-graphql_0_16_0" = callPackage + ({ mkDerivation, aeson, base, bytestring, containers + , morpheus-graphql-core, morpheus-graphql-subscriptions, mtl + , relude, tasty, tasty-hunit, template-haskell, text, transformers + , unordered-containers, vector }: mkDerivation { pname = "morpheus-graphql"; - version = "0.15.1"; - sha256 = "1vk1rzrham61pnn5c77rvrn0zb02hc1birxdnyz80sjdap5fk8in"; + version = "0.16.0"; + sha256 = "18sayr7avxdavppzj8nh3fli0cdryl4yyrzw8d38qk0p8hw84wgc"; enableSeparateDataOutput = true; libraryHaskellDepends = [ - aeson base bytestring containers megaparsec morpheus-graphql-core - mtl scientific template-haskell text transformers unliftio-core - unordered-containers uuid vector websockets + aeson base bytestring containers morpheus-graphql-core mtl relude + template-haskell text transformers unordered-containers vector ]; testHaskellDepends = [ - aeson base bytestring containers megaparsec morpheus-graphql-core - mtl scientific tasty tasty-hunit template-haskell text transformers - unliftio-core unordered-containers uuid vector websockets + aeson base bytestring containers morpheus-graphql-core + morpheus-graphql-subscriptions mtl relude tasty tasty-hunit + template-haskell text transformers unordered-containers vector ]; description = "Morpheus GraphQL"; license = stdenv.lib.licenses.mit; @@ -176979,21 +177574,22 @@ self: { "morpheus-graphql-client" = callPackage ({ mkDerivation, aeson, base, bytestring, directory - , morpheus-graphql-core, mtl, tasty, tasty-hunit, template-haskell - , text, transformers, unordered-containers + , morpheus-graphql-core, mtl, relude, tasty, tasty-hunit + , template-haskell, text, transformers, unordered-containers }: mkDerivation { pname = "morpheus-graphql-client"; - version = "0.15.1"; - sha256 = "1gmyil518qjn5l30kljrm52fznkib1d1qyxnjhyb535jc9f44zhz"; + version = "0.16.0"; + sha256 = "1apm35yy1f1hkqihk4ilzzlg1p4fk13i7zmd7fkcd33aiajzw5mh"; enableSeparateDataOutput = true; libraryHaskellDepends = [ - aeson base bytestring morpheus-graphql-core mtl template-haskell - text transformers unordered-containers + aeson base bytestring morpheus-graphql-core mtl relude + template-haskell text transformers unordered-containers ]; testHaskellDepends = [ - aeson base bytestring directory morpheus-graphql-core mtl tasty - tasty-hunit template-haskell text transformers unordered-containers + aeson base bytestring directory morpheus-graphql-core mtl relude + tasty tasty-hunit template-haskell text transformers + unordered-containers ]; description = "Morpheus GraphQL Client"; license = stdenv.lib.licenses.mit; @@ -177025,32 +177621,57 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "morpheus-graphql-core_0_15_1" = callPackage + "morpheus-graphql-core_0_16_0" = callPackage ({ mkDerivation, aeson, base, bytestring, directory, hashable - , megaparsec, mtl, scientific, tasty, tasty-hunit, template-haskell - , text, th-lift-instances, transformers, unordered-containers - , vector + , megaparsec, mtl, relude, scientific, tasty, tasty-hunit + , template-haskell, text, th-lift-instances, transformers + , unordered-containers, vector }: mkDerivation { pname = "morpheus-graphql-core"; - version = "0.15.1"; - sha256 = "0nakm33ybrj8y3ci0a4697dvz8q38z17vr2mkcbm7h14h06kg8wr"; + version = "0.16.0"; + sha256 = "0c5gbqrxgib2irysmvl35j7ccz5fi1aqb3p3fyxkvcw44nnmkl5g"; enableSeparateDataOutput = true; libraryHaskellDepends = [ - aeson base bytestring hashable megaparsec mtl scientific + aeson base bytestring hashable megaparsec mtl relude scientific template-haskell text th-lift-instances transformers unordered-containers vector ]; testHaskellDepends = [ - aeson base bytestring directory hashable megaparsec mtl scientific - tasty tasty-hunit template-haskell text th-lift-instances - transformers unordered-containers vector + aeson base bytestring directory hashable megaparsec mtl relude + scientific tasty tasty-hunit template-haskell text + th-lift-instances transformers unordered-containers vector ]; description = "Morpheus GraphQL Core"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "morpheus-graphql-subscriptions" = callPackage + ({ mkDerivation, aeson, base, bytestring, directory + , morpheus-graphql-core, mtl, relude, tasty, tasty-hunit, text + , transformers, unliftio-core, unordered-containers, uuid + , websockets + }: + mkDerivation { + pname = "morpheus-graphql-subscriptions"; + version = "0.16.0"; + sha256 = "1bilw276nlzx9fqcc6g5cmnf4jws17v7djz1m8n184a1skxbd02l"; + libraryHaskellDepends = [ + aeson base bytestring morpheus-graphql-core mtl relude text + transformers unliftio-core unordered-containers uuid websockets + ]; + testHaskellDepends = [ + aeson base bytestring directory morpheus-graphql-core mtl relude + tasty tasty-hunit text transformers unliftio-core + unordered-containers uuid websockets + ]; + description = "Morpheus GraphQL Subscriptions"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "morphisms" = callPackage ({ mkDerivation }: mkDerivation { @@ -180573,8 +181194,8 @@ self: { }: mkDerivation { pname = "mysql-haskell"; - version = "0.8.4.2"; - sha256 = "1lg9w9kwjnrx948r24flw0yjwxc8f93ygg45dl2djk4kfxdfnlaz"; + version = "0.8.4.3"; + sha256 = "1gjq8spl6s05kcckw78d1wi2k8blr25mbvicd1kwr653lj2d3w74"; libraryHaskellDepends = [ base binary binary-ieee754 binary-parsers blaze-textual bytestring bytestring-lexing cryptonite io-streams memory monad-loops network @@ -180612,8 +181233,8 @@ self: { }: mkDerivation { pname = "mysql-haskell-openssl"; - version = "0.8.3.0"; - sha256 = "0pm5vd2gpb1x68n2i5brvspngfplp283jlw9a351z2yrnpwmwd24"; + version = "0.8.3.1"; + sha256 = "1fq1990423is1zmyd3qa6dxyyj5ackrgsr9i3wvzkw3xys472j2w"; libraryHaskellDepends = [ base binary HsOpenSSL mysql-haskell tcp-streams tcp-streams-openssl wire-streams @@ -190452,8 +191073,8 @@ self: { ({ mkDerivation, base, mtl }: mkDerivation { pname = "optparse-declarative"; - version = "0.3.1"; - sha256 = "1s3bkkn5a8bgkbqdsf5ir18r0j0r2r0agz04q2ccafd26d8xdx2s"; + version = "0.4.1"; + sha256 = "0paa7r64y0nb9yv3x387pdid68lnc1gn2m28kcli55dvh1x4wwxr"; libraryHaskellDepends = [ base mtl ]; description = "Declarative command line option parser"; license = stdenv.lib.licenses.mit; @@ -190582,8 +191203,6 @@ self: { ]; description = "Types and functions for Kepler orbits"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "orc" = callPackage @@ -191088,6 +191707,34 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "ormolu_0_1_3_1" = callPackage + ({ mkDerivation, base, bytestring, containers, dlist, exceptions + , filepath, ghc-lib-parser, gitrev, hspec, hspec-discover, mtl + , optparse-applicative, path, path-io, syb, text + }: + mkDerivation { + pname = "ormolu"; + version = "0.1.3.1"; + sha256 = "1qad2s270rhgm2chhrmjd5zsv6bqykba978vn0hakm29mgck2zgw"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + base bytestring containers dlist exceptions ghc-lib-parser mtl syb + text + ]; + executableHaskellDepends = [ + base ghc-lib-parser gitrev optparse-applicative text + ]; + testHaskellDepends = [ + base containers filepath hspec path path-io text + ]; + testToolDepends = [ hspec-discover ]; + description = "A formatter for Haskell source code"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "orthotope" = callPackage ({ mkDerivation, base, deepseq, dlist, HUnit, pretty, QuickCheck , test-framework, test-framework-hunit, test-framework-quickcheck2 @@ -192091,7 +192738,7 @@ self: { maintainers = with stdenv.lib.maintainers; [ peti ]; }) {}; - "pandoc_2_11_0_4" = callPackage + "pandoc_2_11_1" = callPackage ({ mkDerivation, aeson, aeson-pretty, attoparsec, base , base64-bytestring, binary, blaze-html, blaze-markup, bytestring , case-insensitive, citeproc, commonmark, commonmark-extensions @@ -192110,8 +192757,8 @@ self: { }: mkDerivation { pname = "pandoc"; - version = "2.11.0.4"; - sha256 = "18nqdhvk0rgrzmbhab9vb05g8w9hvwx0ncf5cqp5ijxycilcskb8"; + version = "2.11.1"; + sha256 = "0gvpal4v92x8vscmm5h3jjlx9q03a4qbz0zwcbw24y02xmaz09d8"; configureFlags = [ "-fhttps" "-f-trypandoc" ]; isLibrary = true; isExecutable = true; @@ -192292,6 +192939,17 @@ self: { broken = true; }) {}; + "pandoc-dhall-decoder" = callPackage + ({ mkDerivation, base, dhall, either, pandoc, text }: + mkDerivation { + pname = "pandoc-dhall-decoder"; + version = "0.1.0.1"; + sha256 = "032fx8fy134hysg10y5c57c7jkvq8lkc0q2r8ylc54qbfmvqd820"; + libraryHaskellDepends = [ base dhall either pandoc text ]; + description = "Decodes pandoc to dhall"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "pandoc-emphasize-code" = callPackage ({ mkDerivation, base, filepath, hashable, lucid, mtl, pandoc-types , process, semigroups, tasty, tasty-discover, tasty-hspec @@ -194932,15 +195590,15 @@ self: { }: mkDerivation { pname = "patch"; - version = "0.0.3.1"; - sha256 = "1dkms6ngr01d4gvyjbl6z30b6qz4cnxnh0y7advrc9fib0237gnl"; + version = "0.0.3.2"; + sha256 = "1b819d1iramxb0sf0zm4ry8mrd74y35iffbb6qys3a2xq1d382xa"; libraryHaskellDepends = [ base constraints-extras containers dependent-map dependent-sum lens monoidal-containers semialign semigroupoids these transformers witherable ]; testHaskellDepends = [ base directory filemanip filepath hlint ]; - description = "Infrastructure for writing patches which act on other types"; + description = "Data structures for describing changes to other data structures"; license = stdenv.lib.licenses.bsd3; }) {}; @@ -197017,6 +197675,34 @@ self: { maintainers = with stdenv.lib.maintainers; [ psibi ]; }) {}; + "persistent_2_11_0_1" = callPackage + ({ mkDerivation, aeson, attoparsec, base, base64-bytestring + , blaze-html, bytestring, conduit, containers, fast-logger, hspec + , http-api-data, monad-logger, mtl, path-pieces, resource-pool + , resourcet, scientific, silently, text, time, transformers + , unliftio, unliftio-core, unordered-containers, vector + }: + mkDerivation { + pname = "persistent"; + version = "2.11.0.1"; + sha256 = "0nmgjk5jpsh7dxwyghvmnislxj8m77sdp9hg6anh7ba94xs7wcjv"; + libraryHaskellDepends = [ + aeson attoparsec base base64-bytestring blaze-html bytestring + conduit containers fast-logger http-api-data monad-logger mtl + path-pieces resource-pool resourcet scientific silently text time + transformers unliftio unliftio-core unordered-containers vector + ]; + testHaskellDepends = [ + aeson attoparsec base base64-bytestring blaze-html bytestring + containers hspec http-api-data path-pieces scientific text time + transformers unordered-containers vector + ]; + description = "Type-safe, multi-backend data serialization"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + maintainers = with stdenv.lib.maintainers; [ psibi ]; + }) {}; + "persistent-audit" = callPackage ({ mkDerivation, aeson, attoparsec, base, bytestring , getopt-generics, hashable, hspec, mongoDB, persistent @@ -197229,10 +197915,8 @@ self: { }: mkDerivation { pname = "persistent-mongoDB"; - version = "2.10.0.1"; - sha256 = "194cxlxyaxwzgm7a7q8530bh842s5s1vmq33pclldp78nfy1dczm"; - revision = "1"; - editedCabalFile = "084gdbb25qn2cw0qz20hksr9ypf401iwwx2kysibi0y4zxvpcy2z"; + version = "2.11.0.0"; + sha256 = "19szqr1f028hqhzigvb7sa6r2vm8q9pi5fhvx483ag0agcypmhhb"; libraryHaskellDepends = [ aeson base bson bytestring cereal conduit http-api-data mongoDB network path-pieces persistent resource-pool resourcet text time @@ -197276,6 +197960,33 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "persistent-mysql_2_10_3" = callPackage + ({ mkDerivation, aeson, base, blaze-builder, bytestring, conduit + , containers, fast-logger, hspec, HUnit, monad-logger, mysql + , mysql-simple, persistent, persistent-qq, persistent-template + , persistent-test, QuickCheck, quickcheck-instances, resource-pool + , resourcet, text, time, transformers, unliftio-core + }: + mkDerivation { + pname = "persistent-mysql"; + version = "2.10.3"; + sha256 = "1da2vbkz55lngpi5ggndnnxv8gm9ckcv3gd3y8z47yh129b04csk"; + libraryHaskellDepends = [ + aeson base blaze-builder bytestring conduit containers monad-logger + mysql mysql-simple persistent resource-pool resourcet text + transformers unliftio-core + ]; + testHaskellDepends = [ + base bytestring containers fast-logger hspec HUnit monad-logger + mysql persistent persistent-qq persistent-template persistent-test + QuickCheck quickcheck-instances resourcet text time transformers + unliftio-core + ]; + description = "Backend for the persistent library using MySQL database server"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "persistent-mysql-haskell" = callPackage ({ mkDerivation, aeson, base, bytestring, conduit, containers , fast-logger, hspec, HUnit, io-streams, monad-logger @@ -197375,6 +198086,8 @@ self: { pname = "persistent-postgresql"; version = "2.10.1.2"; sha256 = "1q7n0h16argvpw2y3f8mxzmvy24q6if46ab9nvybviki283zbvlb"; + revision = "1"; + editedCabalFile = "0vzm2d9smg9zvskaz3dv7c90d14pb0as7qpnsnvswhh8vn0862g3"; libraryHaskellDepends = [ aeson base blaze-builder bytestring conduit containers monad-logger persistent postgresql-libpq postgresql-simple resource-pool @@ -197391,6 +198104,37 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "persistent-postgresql_2_11_0_0" = callPackage + ({ mkDerivation, aeson, attoparsec, base, blaze-builder, bytestring + , conduit, containers, fast-logger, hspec, hspec-expectations + , HUnit, monad-logger, mtl, persistent, persistent-qq + , persistent-template, persistent-test, postgresql-libpq + , postgresql-simple, QuickCheck, quickcheck-instances + , resource-pool, resourcet, string-conversions, text, time + , transformers, unliftio-core, unordered-containers, vector + }: + mkDerivation { + pname = "persistent-postgresql"; + version = "2.11.0.0"; + sha256 = "12h72dj6zmk8m45m62syc3inwvqgb03whymi7wds0aklzn4j83b4"; + libraryHaskellDepends = [ + aeson attoparsec base blaze-builder bytestring conduit containers + monad-logger mtl persistent postgresql-libpq postgresql-simple + resource-pool resourcet string-conversions text time transformers + unliftio-core + ]; + testHaskellDepends = [ + aeson base bytestring containers fast-logger hspec + hspec-expectations HUnit monad-logger persistent persistent-qq + persistent-template persistent-test QuickCheck quickcheck-instances + resourcet text time transformers unliftio-core unordered-containers + vector + ]; + description = "Backend for the persistent library using postgresql"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "persistent-protobuf" = callPackage ({ mkDerivation, base, bytestring, persistent, protocol-buffers , protocol-buffers-descriptor, template-haskell, text @@ -197570,6 +198314,8 @@ self: { pname = "persistent-sqlite"; version = "2.10.6.2"; sha256 = "0l6287ni2ksi8l8kv6gbsyjxhjpcqn6a1gw577ii7fixbyvbpbnf"; + revision = "1"; + editedCabalFile = "1kg5cikbw7mpdzwc1f1kfxwjq7q2raqdxsdq5rb65rk87wl3fih5"; configureFlags = [ "-fsystemlib" ]; isLibrary = true; isExecutable = true; @@ -197590,6 +198336,39 @@ self: { maintainers = with stdenv.lib.maintainers; [ psibi ]; }) {inherit (pkgs) sqlite;}; + "persistent-sqlite_2_11_0_0" = callPackage + ({ mkDerivation, aeson, base, bytestring, conduit, containers + , exceptions, fast-logger, hspec, HUnit, microlens-th, monad-logger + , persistent, persistent-template, persistent-test, QuickCheck + , resource-pool, resourcet, sqlite, system-fileio, system-filepath + , temporary, text, time, transformers, unliftio-core + , unordered-containers + }: + mkDerivation { + pname = "persistent-sqlite"; + version = "2.11.0.0"; + sha256 = "1kfijsn00brqm42ypaa66bmwq41r9n6h66r6jmgldhzpcbv46sfv"; + configureFlags = [ "-fsystemlib" ]; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson base bytestring conduit containers microlens-th monad-logger + persistent resource-pool resourcet text time transformers + unliftio-core unordered-containers + ]; + librarySystemDepends = [ sqlite ]; + testHaskellDepends = [ + base bytestring containers exceptions fast-logger hspec HUnit + monad-logger persistent persistent-template persistent-test + QuickCheck resourcet system-fileio system-filepath temporary text + time transformers unliftio-core + ]; + description = "Backend for the persistent library using sqlite3"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + maintainers = with stdenv.lib.maintainers; [ psibi ]; + }) {inherit (pkgs) sqlite;}; + "persistent-template" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, criterion , deepseq, deepseq-generics, file-embed, hspec, http-api-data @@ -197601,8 +198380,8 @@ self: { pname = "persistent-template"; version = "2.8.2.3"; sha256 = "1y96aj5i3c1j2ls6980l8lfjj9b3vfmp3766xk5af1870vj1s1lf"; - revision = "1"; - editedCabalFile = "0ilgcn3k72b2zm53yy4na4y0f8xfrlw6s5w3xhhavg6blyw971j7"; + revision = "2"; + editedCabalFile = "0n0zr4fxzrgdbgl26mikfl9hyn0269isblrr9rj3i045p96a0y5s"; libraryHaskellDepends = [ aeson base bytestring containers http-api-data monad-control monad-logger path-pieces persistent template-haskell text @@ -197620,7 +198399,7 @@ self: { maintainers = with stdenv.lib.maintainers; [ psibi ]; }) {}; - "persistent-template_2_9" = callPackage + "persistent-template_2_9_1_0" = callPackage ({ mkDerivation, aeson, base, bytestring, containers, criterion , deepseq, deepseq-generics, file-embed, hspec, http-api-data , monad-control, monad-logger, path-pieces, persistent, QuickCheck @@ -197629,8 +198408,8 @@ self: { }: mkDerivation { pname = "persistent-template"; - version = "2.9"; - sha256 = "181ag017wj41pzlc954mcx7s7v1dnqgjnry03hly8zln4iii63yw"; + version = "2.9.1.0"; + sha256 = "19ilgz8r6p5wy111rb4v0d6cnrj8jfiv2pnzdynpxd9ay66vgbca"; libraryHaskellDepends = [ aeson base bytestring containers http-api-data monad-control monad-logger path-pieces persistent template-haskell text @@ -197694,7 +198473,7 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "persistent-test_2_0_3_3" = callPackage + "persistent-test_2_0_3_5" = callPackage ({ mkDerivation, aeson, base, blaze-html, bytestring, conduit , containers, exceptions, hspec, hspec-expectations, HUnit , monad-control, monad-logger, mtl, path-pieces, persistent @@ -197704,8 +198483,8 @@ self: { }: mkDerivation { pname = "persistent-test"; - version = "2.0.3.3"; - sha256 = "0ry6inln7grmcj58k3sfjid24069n4kmph6sikvm352b9ffw6h5x"; + version = "2.0.3.5"; + sha256 = "16m3nlmpwxibfhgrfl3xqh3a518bkrd7qaa8hklfq2qwlvjbb31v"; libraryHaskellDepends = [ aeson base blaze-html bytestring conduit containers exceptions hspec hspec-expectations HUnit monad-control monad-logger mtl @@ -198345,13 +199124,58 @@ self: { ({ mkDerivation, base, subG, vector }: mkDerivation { pname = "phonetic-languages-common"; - version = "0.1.0.0"; - sha256 = "12al80szl9mxapwq6b0kp6bnhnwqxjqzyf72ycxvpx1xlppsfza9"; + version = "0.1.1.0"; + sha256 = "08i9g7yaiwryy9ndd0adbl3cskqva71mi45x55knc6r9wdhnprph"; libraryHaskellDepends = [ base subG vector ]; description = "A generalization of the uniqueness-periods-vector-common package"; license = stdenv.lib.licenses.mit; }) {}; + "phonetic-languages-examples" = callPackage + ({ mkDerivation, base, parallel, phonetic-languages-common + , phonetic-languages-general, phonetic-languages-plus + , phonetic-languages-properties, phonetic-languages-ukrainian + , phonetic-languages-vector, print-info, subG + , ukrainian-phonetics-basic, uniqueness-periods-vector-filters + , uniqueness-periods-vector-stats, vector + }: + mkDerivation { + pname = "phonetic-languages-examples"; + version = "0.1.1.0"; + sha256 = "1i95kglsif5zd5k7yri69mwh8n3a63cqwh3kvn91qpyxqf8zgdzz"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base phonetic-languages-common phonetic-languages-properties + phonetic-languages-vector vector + ]; + executableHaskellDepends = [ + base parallel phonetic-languages-common phonetic-languages-general + phonetic-languages-plus phonetic-languages-properties + phonetic-languages-ukrainian phonetic-languages-vector print-info + subG ukrainian-phonetics-basic uniqueness-periods-vector-filters + uniqueness-periods-vector-stats vector + ]; + description = "A generalization of the uniqueness-periods-vector-examples functionality"; + license = stdenv.lib.licenses.mit; + }) {}; + + "phonetic-languages-general" = callPackage + ({ mkDerivation, base, phonetic-languages-common + , phonetic-languages-plus, print-info, subG, vector + }: + mkDerivation { + pname = "phonetic-languages-general"; + version = "0.1.0.0"; + sha256 = "1vv1n58npgwy1shp7xhm48fdqm9a8kqb3lbqkl0sn7qwkph5x53k"; + libraryHaskellDepends = [ + base phonetic-languages-common phonetic-languages-plus print-info + subG vector + ]; + description = "A generalization of the uniqueness-periods-vector-general functionality"; + license = stdenv.lib.licenses.mit; + }) {}; + "phonetic-languages-plus" = callPackage ({ mkDerivation, base, bytestring, lists-flines, parallel , uniqueness-periods-vector-stats @@ -198371,6 +199195,23 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "phonetic-languages-properties" = callPackage + ({ mkDerivation, base, phonetic-languages-common + , phonetic-languages-rhythmicity, phonetic-languages-vector + , ukrainian-phonetics-basic, vector + }: + mkDerivation { + pname = "phonetic-languages-properties"; + version = "0.1.1.0"; + sha256 = "1c312i66rpwxfk34rpzh8ai3m4lbxwj4ayqh1vzbj17mciachaqf"; + libraryHaskellDepends = [ + base phonetic-languages-common phonetic-languages-rhythmicity + phonetic-languages-vector ukrainian-phonetics-basic vector + ]; + description = "A generalization of the uniqueness-periods-vector-properties package"; + license = stdenv.lib.licenses.mit; + }) {}; + "phonetic-languages-rhythmicity" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -201601,6 +202442,39 @@ self: { broken = true; }) {}; + "poke" = callPackage + ({ mkDerivation, base, calamity, dhall, di, di-polysemy + , generic-lens, hspec, hspec-megaparsec, megaparsec, polysemy + , polysemy-plugin, text, text-show, unboxing-vector + , unordered-containers, vector + }: + mkDerivation { + pname = "poke"; + version = "0.0.0.1"; + sha256 = "0y63j8pv482f92nmk2x7f8kfkvrqbq9bz2vi9br6hpk4612vas4c"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + base calamity dhall di di-polysemy generic-lens hspec + hspec-megaparsec megaparsec polysemy polysemy-plugin text text-show + unboxing-vector unordered-containers vector + ]; + executableHaskellDepends = [ + base calamity dhall di di-polysemy generic-lens hspec + hspec-megaparsec megaparsec polysemy polysemy-plugin text text-show + unboxing-vector unordered-containers vector + ]; + testHaskellDepends = [ + base calamity dhall di di-polysemy generic-lens hspec + hspec-megaparsec megaparsec polysemy polysemy-plugin text text-show + unboxing-vector unordered-containers vector + ]; + description = "Discord verification bot"; + license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "pokemon-go-protobuf-types" = callPackage ({ mkDerivation, base, bytestring, containers, data-default-class , lens-family, proto-lens, text @@ -202012,6 +202886,40 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "polysemy_1_4_0_0" = callPackage + ({ mkDerivation, async, base, Cabal, cabal-doctest, containers + , criterion, doctest, first-class-families, free, freer-simple + , hspec, hspec-discover, inspection-testing, mtl, QuickCheck, stm + , syb, template-haskell, th-abstraction, transformers, type-errors + , type-errors-pretty, unagi-chan + }: + mkDerivation { + pname = "polysemy"; + version = "1.4.0.0"; + sha256 = "1zbfx3l390kqxq45lb1wms72cxckwh3sl7vk52q68d0l7j5cvn8n"; + setupHaskellDepends = [ base Cabal cabal-doctest ]; + libraryHaskellDepends = [ + async base containers first-class-families mtl QuickCheck stm syb + template-haskell th-abstraction transformers type-errors + type-errors-pretty unagi-chan + ]; + testHaskellDepends = [ + async base containers doctest first-class-families hspec + inspection-testing mtl QuickCheck stm syb template-haskell + th-abstraction transformers type-errors type-errors-pretty + unagi-chan + ]; + testToolDepends = [ hspec-discover ]; + benchmarkHaskellDepends = [ + async base containers criterion first-class-families free + freer-simple mtl QuickCheck stm syb template-haskell th-abstraction + transformers type-errors type-errors-pretty unagi-chan + ]; + description = "Higher-order, low-boilerplate free monads"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "polysemy-RandomFu" = callPackage ({ mkDerivation, base, hspec, hspec-discover, polysemy , polysemy-plugin, polysemy-zoo, random-fu, random-source, text @@ -202064,13 +202972,30 @@ self: { pname = "polysemy-extra"; version = "0.1.0.0"; sha256 = "1y5k935jh6dfs87kdih1ibb61ljkp39wyrkg1n2zss020cdhbi7g"; + revision = "1"; + editedCabalFile = "0nh9laqwr40dhkh0806v748zqg61agmv3ih4fyidzr9h30lcl0q8"; libraryHaskellDepends = [ base containers polysemy polysemy-zoo ]; - description = "Run a KVStore as a filesystem in polysemy"; + description = "Extra transformations functions for polysemy"; license = stdenv.lib.licenses.mit; hydraPlatforms = stdenv.lib.platforms.none; broken = true; }) {}; + "polysemy-fs" = callPackage + ({ mkDerivation, base, bytestring, path, polysemy, rio, temporary + , text, unliftio-path + }: + mkDerivation { + pname = "polysemy-fs"; + version = "0.1.0.0"; + sha256 = "16lf6a5ypf5injdl8aljrnrdrfz21b0rhcmypx5ngvw1k2mgh6zl"; + libraryHaskellDepends = [ + base bytestring path polysemy rio temporary text unliftio-path + ]; + description = "Low level filesystem operations for polysemy"; + license = stdenv.lib.licenses.bsd3; + }) {}; + "polysemy-fskvstore" = callPackage ({ mkDerivation, base, bytestring, path, polysemy, polysemy-zoo , rio, unliftio-path @@ -202141,13 +203066,15 @@ self: { }) {}; "polysemy-methodology" = callPackage - ({ mkDerivation, base, polysemy, polysemy-plugin, polysemy-zoo }: + ({ mkDerivation, base, co-log-polysemy, polysemy, polysemy-plugin + , polysemy-zoo + }: mkDerivation { pname = "polysemy-methodology"; - version = "0.1.2.1"; - sha256 = "0is4jnmfn2gx78ijxwvhm8qwk2gqz31hh9pg5r8y43hyx7im40ay"; + version = "0.1.5.0"; + sha256 = "1gi2rjf1vgcamjyqqi4wnasv9i5yaazlh14hbjspvsyv8h2zyl4i"; libraryHaskellDepends = [ - base polysemy polysemy-plugin polysemy-zoo + base co-log-polysemy polysemy polysemy-plugin polysemy-zoo ]; description = "Domain modelling algebra for polysemy"; license = stdenv.lib.licenses.mit; @@ -202168,6 +203095,23 @@ self: { broken = true; }) {}; + "polysemy-path" = callPackage + ({ mkDerivation, base, path, polysemy, polysemy-plugin + , polysemy-zoo + }: + mkDerivation { + pname = "polysemy-path"; + version = "0.0.1.0"; + sha256 = "12iw6qq1pigvvb0bnbkxz7gdmr4z609vqdsn5sxzh5va02dn1r57"; + libraryHaskellDepends = [ + base path polysemy polysemy-plugin polysemy-zoo + ]; + description = "Polysemy versions of Path functions"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "polysemy-plugin" = callPackage ({ mkDerivation, base, Cabal, cabal-doctest, containers, doctest , ghc, ghc-tcplugins-extra, hspec, hspec-discover @@ -202176,8 +203120,8 @@ self: { }: mkDerivation { pname = "polysemy-plugin"; - version = "0.2.5.1"; - sha256 = "14iz5p5g57ki9lbjyy8i3lx7xk2qmrc8dqkd94jrbilsvn4m5gf3"; + version = "0.2.5.2"; + sha256 = "13qfbgwn187vgdqs2rkl5lhcfbaw992qnlpz90pr9nw64k2ylcmp"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ base containers ghc ghc-tcplugins-extra polysemy syb transformers @@ -202268,8 +203212,8 @@ self: { }: mkDerivation { pname = "polysemy-video"; - version = "0.1.1.0"; - sha256 = "1f8fzhxjg3cpqb8sdrdl8mx9dwas5l32aw98s5m2p4xv1amnjl39"; + version = "0.1.2.0"; + sha256 = "1q6acrcxin32ykhzrmd562xb45d972c37sqydh9mz1xp49764fy9"; libraryHaskellDepends = [ base formatting path path-utils polysemy text turtle ]; @@ -203101,6 +204045,8 @@ self: { ]; description = "posix bindings"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {inherit (pkgs) systemd;}; "posix-error-codes" = callPackage @@ -203547,6 +204493,21 @@ self: { license = stdenv.lib.licenses.bsd3; }) {inherit (pkgs) postgresql;}; + "postgresql-libpq_0_9_4_3" = callPackage + ({ mkDerivation, base, bytestring, Cabal, postgresql, unix }: + mkDerivation { + pname = "postgresql-libpq"; + version = "0.9.4.3"; + sha256 = "1gfnhc5pibn7zmifdf2g0c112xrpzsk756ln2kjzqljkspf4dqp3"; + setupHaskellDepends = [ base Cabal ]; + libraryHaskellDepends = [ base bytestring unix ]; + librarySystemDepends = [ postgresql ]; + testHaskellDepends = [ base bytestring ]; + description = "low-level binding to libpq"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) postgresql;}; + "postgresql-libpq-notify" = callPackage ({ mkDerivation, async, base, hspec, postgres-options , postgresql-libpq, stm, text, tmp-postgres @@ -204904,28 +205865,26 @@ self: { ({ mkDerivation, aeson, aeson-pretty, base, binary, bytestring , comonad, constraints, containers, deepseq, directory, doctest , hashable, lens, lens-action, pcre-heavy, pcre-light - , pretty-terminal, QuickCheck, random, safe, stm - , string-conversions, tasty, tasty-hunit, tasty-quickcheck - , template-haskell, text, th-lift, these, time + , pretty-terminal, QuickCheck, safe, stm, string-conversions, tasty + , tasty-hunit, tasty-quickcheck, template-haskell, text, th-lift + , th-lift-instances, these, time }: mkDerivation { pname = "predicate-typed"; - version = "0.7.4.0"; - sha256 = "04vxyw4bgzbkk56dw7p8b4x12m4wymxwh83537hvphdv9qj71ph9"; - revision = "1"; - editedCabalFile = "064zfd03nw1bd0p8vwymk0kscbpvxrgzbwmqys3ys1rqzjpnfdrp"; + version = "0.7.4.2"; + sha256 = "0n1r8ysjyc61pr107y5kkarc30crjzps865kx9k25kjcmk5ynlgz"; libraryHaskellDepends = [ aeson aeson-pretty base binary bytestring comonad constraints containers deepseq directory hashable lens lens-action pcre-heavy - pcre-light pretty-terminal QuickCheck random safe - string-conversions template-haskell text th-lift these time + pcre-light pretty-terminal QuickCheck safe string-conversions + template-haskell text th-lift th-lift-instances these time ]; testHaskellDepends = [ aeson aeson-pretty base binary bytestring comonad constraints containers deepseq directory doctest hashable lens lens-action - pcre-heavy pcre-light pretty-terminal QuickCheck random safe stm + pcre-heavy pcre-light pretty-terminal QuickCheck safe stm string-conversions tasty tasty-hunit tasty-quickcheck - template-haskell text th-lift these time + template-haskell text th-lift th-lift-instances these time ]; description = "Predicates, Refinement types and Dsl"; license = stdenv.lib.licenses.bsd3; @@ -206150,6 +207109,8 @@ self: { testHaskellDepends = [ base primitive primitive-unlifted ]; description = "Wrappers for primops around atomic operations"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "primitive-checked" = callPackage @@ -206186,6 +207147,8 @@ self: { ]; description = "containers backed by arrays"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "primitive-convenience" = callPackage @@ -206219,6 +207182,8 @@ self: { ]; description = "Extras for the \"primitive\" library"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "primitive-foreign" = callPackage @@ -206311,6 +207276,8 @@ self: { benchmarkHaskellDepends = [ base gauge ghc-prim primitive random ]; description = "Sort primitive arrays"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "primitive-stablename" = callPackage @@ -206339,15 +207306,24 @@ self: { }) {}; "primitive-unlifted" = callPackage - ({ mkDerivation, base, bytestring, primitive, stm, text-short }: + ({ mkDerivation, array, base, bytestring, primitive, QuickCheck + , quickcheck-classes-base, stm, tasty, tasty-quickcheck, text-short + }: mkDerivation { pname = "primitive-unlifted"; - version = "0.1.3.0"; - sha256 = "1q7scarsdv51x74g6ahvc5znk9h628s984a7bawig0lnx67wzwih"; - libraryHaskellDepends = [ base bytestring primitive text-short ]; - testHaskellDepends = [ base primitive stm ]; + version = "1.0.0.0"; + sha256 = "07b53730nxzqyhac71xxijg598304ppb7wa8lfhw1glicj9h0wad"; + libraryHaskellDepends = [ + array base bytestring primitive text-short + ]; + testHaskellDepends = [ + base primitive QuickCheck quickcheck-classes-base stm tasty + tasty-quickcheck + ]; description = "Primitive GHC types with unlifted types inside"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "primula-board" = callPackage @@ -207595,16 +208571,16 @@ self: { }) {}; "prolude" = callPackage - ({ mkDerivation, aeson, base, bytestring, containers, mongoDB - , safe-exceptions, scientific, text, time, vector + ({ mkDerivation, aeson, base, bytestring, cassava, containers + , mongoDB, safe-exceptions, scientific, text, time, vector }: mkDerivation { pname = "prolude"; - version = "0.0.0.4"; - sha256 = "147kn423jxc4rcb4vbsj7av8pxdz8lgcgblbmrvq821h26vgc1ai"; + version = "0.0.0.6"; + sha256 = "1f3apqs82lv7fq69mjqycs8ynj3hhprg1rrclvs3yix2lc3465vf"; libraryHaskellDepends = [ - aeson base bytestring containers mongoDB safe-exceptions scientific - text time vector + aeson base bytestring cassava containers mongoDB safe-exceptions + scientific text time vector ]; description = "ITProTV's custom prelude"; license = stdenv.lib.licenses.mit; @@ -208421,8 +209397,8 @@ self: { }: mkDerivation { pname = "protocol-buffers"; - version = "2.4.13"; - sha256 = "0xwfb2bkh4nd34s24q786ph4zyrnnl3bcry2kqx3sw20yk3zfdsc"; + version = "2.4.17"; + sha256 = "027y1xfk93119d6xfzj0a9n77bdqzkxfp05hz9bn0hyf33lb4jzb"; libraryHaskellDepends = [ aeson array base base16-bytestring binary bytestring containers directory filepath mtl parsec syb text utf8-string vector @@ -208437,8 +209413,10 @@ self: { ({ mkDerivation, base, bytestring, containers, protocol-buffers }: mkDerivation { pname = "protocol-buffers-descriptor"; - version = "2.4.13"; - sha256 = "1c3aiysjlk7r02l5902iq020iasiswk9c1mvf4f9h1yijba4x4fp"; + version = "2.4.17"; + sha256 = "1dir8v79hzc8smlf405a8m3y5jhjqiphj2jm6rbshd1vg6l3vjia"; + revision = "1"; + editedCabalFile = "0zin8qqvb1hg5kq2s17rkik55pjnws556xflg76x1xrqkyivhqlg"; enableSeparateDataOutput = true; libraryHaskellDepends = [ base bytestring containers protocol-buffers @@ -211229,7 +212207,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "quickcheck-instances_0_3_24" = callPackage + "quickcheck-instances_0_3_25" = callPackage ({ mkDerivation, array, base, bytestring, case-insensitive , containers, data-fix, hashable, integer-logarithms, old-time , QuickCheck, scientific, splitmix, strict, tagged, text, these @@ -211238,8 +212216,8 @@ self: { }: mkDerivation { pname = "quickcheck-instances"; - version = "0.3.24"; - sha256 = "0jvb3d43hc1sa8aal1gjpwmrh65mswi72yssb98bj5hca4z8grk5"; + version = "0.3.25"; + sha256 = "08lp5fwmhj1ld9zmhxv6aiqc7668nlkz0ckykgp57bv0i6sh4n7q"; libraryHaskellDepends = [ array base bytestring case-insensitive containers data-fix hashable integer-logarithms old-time QuickCheck scientific splitmix strict @@ -215367,8 +216345,8 @@ self: { ({ mkDerivation, base, composition-prelude }: mkDerivation { pname = "recursion"; - version = "2.2.4.2"; - sha256 = "15ahlgm0dilapk0y5jhwdvrims7nyzdsbdccq4x9jj0ddsszqr02"; + version = "2.2.4.3"; + sha256 = "0k5as7i7xyas6qhpr7wpnnf0rc93nsh4s9gsxdsk72xkwd86chkj"; libraryHaskellDepends = [ base composition-prelude ]; description = "A recursion schemes library for Haskell"; license = stdenv.lib.licenses.bsd3; @@ -215590,8 +216568,8 @@ self: { }: mkDerivation { pname = "redis-io"; - version = "1.0.0"; - sha256 = "119qga77xv0kq6cppgz6ry3f1ql4slswqwqg7qyiyg639sli9nfp"; + version = "1.1.0"; + sha256 = "0q2gr8sbxxpfx2qn9qmyxiwjj4nx32zmx4lv7g2vfmkj329crrdd"; libraryHaskellDepends = [ attoparsec auto-update base bytestring containers exceptions iproute monad-control mtl network operational redis-resp @@ -216065,7 +217043,7 @@ self: { , constraints-extras, containers, criterion, data-default, deepseq , dependent-map, dependent-sum, directory, exception-transformers , filemanip, filepath, haskell-src-exts, haskell-src-meta, hlint - , hspec, lens, loch-th, MemoTrie, monad-control + , hspec, lens, loch-th, MemoTrie, mmorph, monad-control , monoidal-containers, mtl, patch, prim-uniq, primitive, process , proctest, profunctors, random, ref-tf, reflection, semialign , semigroupoids, split, stm, syb, template-haskell, text, these @@ -216073,15 +217051,16 @@ self: { }: mkDerivation { pname = "reflex"; - version = "0.7.1.0"; - sha256 = "0qxxhgkh3cv3fzxd9pgy78kxhi9b4q72jcq4n002h9qh8i6wwp7a"; + version = "0.8.0.0"; + sha256 = "14pw033ljs6x5bi5657cm5lpwwj6gkfgskbv5lpdi2hp7svzayql"; libraryHaskellDepends = [ base bifunctors comonad constraints-extras containers data-default dependent-map dependent-sum exception-transformers haskell-src-exts - haskell-src-meta lens MemoTrie monad-control monoidal-containers - mtl patch prim-uniq primitive profunctors random ref-tf reflection - semialign semigroupoids stm syb template-haskell these time - transformers unbounded-delays witherable + haskell-src-meta lens MemoTrie mmorph monad-control + monoidal-containers mtl patch prim-uniq primitive profunctors + random ref-tf reflection semialign semigroupoids stm syb + template-haskell these time transformers unbounded-delays + witherable ]; testHaskellDepends = [ base bifunctors constraints constraints-extras containers deepseq @@ -216192,8 +217171,8 @@ self: { }: mkDerivation { pname = "reflex-dom"; - version = "0.6.0.0"; - sha256 = "1iimsk89akb7v2i1k1gaa6a6bhdyf2rsggac9k1xizxkylara5k4"; + version = "0.6.1.0"; + sha256 = "190g56y16xvj508qdp3znlbbv4gb3ska38jbjpblvq8cz2d4nkdc"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -216256,8 +217235,8 @@ self: { }: mkDerivation { pname = "reflex-dom-core"; - version = "0.6.0.0"; - sha256 = "0819858z5p6847ac1rb1hsfr5ikn7x5xii8vgqbih4fg39mqfy14"; + version = "0.6.1.0"; + sha256 = "072bkjjmz6mjw42gchlbswhjhr9xs0vaybf6mvdycs618lb1zhf0"; libraryHaskellDepends = [ aeson base bifunctors bimap blaze-builder bytestring case-insensitive constraints containers contravariant data-default @@ -216342,8 +217321,8 @@ self: { }: mkDerivation { pname = "reflex-dom-retractable"; - version = "0.1.3.0"; - sha256 = "0l2nz78cjx0p03h0h9pflhfd59p2j4drsglsm9yxys0zglbxnqwl"; + version = "0.1.6.0"; + sha256 = "0xmxbyf72jnlyyr1iqgms43has4z3qv7ini5jrn1xkyhjmdanrcw"; libraryHaskellDepends = [ base containers jsaddle mtl ref-tf reflex reflex-dom ]; @@ -216400,27 +217379,53 @@ self: { }: mkDerivation { pname = "reflex-fsnotify"; - version = "0.2.1.1"; - sha256 = "0r7fv01dgg5l45yspgj3n2gh6yq0qkjv19hj9vq6284x04vldnqj"; + version = "0.2.1.2"; + sha256 = "1g5zm12ypqr0agrgmbyglhh5f9p933hba2dismbyywsgdmn1i9bl"; libraryHaskellDepends = [ base containers directory filepath fsnotify reflex ]; - description = "reflex-frp interface for watching files"; + description = "Reflex FRP interface for watching files"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + + "reflex-gadt-api" = callPackage + ({ mkDerivation, aeson, aeson-gadt-th, base, bytestring + , constraints, constraints-extras, containers, data-default + , dependent-sum, jsaddle, reflex, reflex-dom-core, text, time + }: + mkDerivation { + pname = "reflex-gadt-api"; + version = "0.2.0.1"; + sha256 = "0lyzabjyx1fyxrkxpmzhwhkpph9358hw7bpnmsppvwsdaq3m1yqq"; + isLibrary = true; + isExecutable = true; + libraryHaskellDepends = [ + aeson aeson-gadt-th base bytestring constraints constraints-extras + containers data-default dependent-sum jsaddle reflex + reflex-dom-core text time + ]; + executableHaskellDepends = [ + aeson aeson-gadt-th base constraints-extras reflex-dom-core text + time + ]; + description = "Interact with a GADT API in your reflex-dom application"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; }) {}; "reflex-ghci" = callPackage - ({ mkDerivation, base, bytestring, dependent-sum, directory - , filepath, fsnotify, mtl, optparse-applicative, primitive, process - , ref-tf, reflex, reflex-fsnotify, reflex-process, reflex-vty - , regex-tdfa, temporary, text, unix, vty + ({ mkDerivation, base, bytestring, directory, filepath, fsnotify + , optparse-applicative, process, reflex, reflex-fsnotify + , reflex-process, reflex-vty, regex-tdfa, temporary, text, unix + , vty }: mkDerivation { pname = "reflex-ghci"; - version = "0.1.4.1"; - sha256 = "0505glpxc6yf7nwkgz9l2m8diqm39sal7vg9h1g8f8i3x6ab1rw3"; + version = "0.1.5.1"; + sha256 = "1m4sphj2qhj9ckjxjy6m4yzb2d6lq68a0fynv5q9ibc6550bm1sx"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -216432,8 +217437,7 @@ self: { text vty ]; testHaskellDepends = [ - base bytestring dependent-sum directory mtl primitive process - ref-tf reflex reflex-process reflex-vty temporary text + base directory process reflex reflex-process temporary ]; description = "A GHCi widget library for use in reflex applications"; license = stdenv.lib.licenses.bsd3; @@ -216547,8 +217551,8 @@ self: { }: mkDerivation { pname = "reflex-process"; - version = "0.3.0.0"; - sha256 = "1hfzp0hnqhpdcri6qqqbndl3nlf028hn78kmdc6h1mzwx5va7rh5"; + version = "0.3.1.0"; + sha256 = "1z86h7wkzg69d6kw0y37pzr4ldpg9qkl8wx5mw7r1h82isb9wgbl"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -216561,7 +217565,7 @@ self: { async base bytestring containers dependent-sum hspec mtl primitive process ref-tf reflex unix ]; - description = "reflex-frp interface for running shell commands"; + description = "Reflex FRP interface for running system processes"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; @@ -216635,8 +217639,10 @@ self: { }: mkDerivation { pname = "reflex-vty"; - version = "0.1.4.0"; - sha256 = "0z4yca6hh5rwgybsf6ssklhvpl34ikvi9j6wq99df5y0hpy9185f"; + version = "0.1.4.1"; + sha256 = "0hv2h1pzz808bg2bvignb3d2wma1aw96zdf545f9p01vjr1b656a"; + revision = "1"; + editedCabalFile = "0gpfbpzcg516kghsgwc4gnbp217p6phw9bh1qhlkzd0ji35gdibm"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -216647,7 +217653,7 @@ self: { executableHaskellDepends = [ base containers reflex text time transformers vty ]; - description = "Reflex FRP host and widgets for vty applications"; + description = "Reflex FRP host and widgets for VTY applications"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; broken = true; @@ -217696,6 +218702,35 @@ self: { broken = true; }) {}; + "registry_0_2_0_1" = callPackage + ({ mkDerivation, async, base, bytestring, containers, directory + , exceptions, generic-lens, hashable, hedgehog, io-memoize, mmorph + , MonadRandom, mtl, multimap, protolude, random, resourcet + , semigroupoids, semigroups, tasty, tasty-discover, tasty-hedgehog + , tasty-th, template-haskell, text, transformers-base, universum + }: + mkDerivation { + pname = "registry"; + version = "0.2.0.1"; + sha256 = "0vpgjxm5mx11vnfhnvlzlawaqwa0a99iyimpd333ibz0psw10wka"; + libraryHaskellDepends = [ + base containers exceptions hashable mmorph mtl protolude resourcet + semigroupoids semigroups template-haskell text transformers-base + ]; + testHaskellDepends = [ + async base bytestring containers directory exceptions generic-lens + hashable hedgehog io-memoize mmorph MonadRandom mtl multimap + protolude random resourcet semigroupoids semigroups tasty + tasty-discover tasty-hedgehog tasty-th template-haskell text + transformers-base universum + ]; + testToolDepends = [ tasty-discover ]; + description = "data structure for assembling components"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "registry-hedgehog" = callPackage ({ mkDerivation, base, containers, generic-lens, hedgehog, mmorph , multimap, protolude, registry, tasty, tasty-discover @@ -223195,6 +224230,8 @@ self: { libraryHaskellDepends = [ base primitive primitive-unlifted ]; description = "runST without boxing penalty"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "rungekutta" = callPackage @@ -225347,6 +226384,28 @@ self: { broken = true; }) {}; + "scheduler_1_5_0" = callPackage + ({ mkDerivation, atomic-primops, base, deepseq, doctest, exceptions + , genvalidity-hspec, hspec, mwc-random, primitive, pvar, QuickCheck + , template-haskell, unliftio, unliftio-core, vector + }: + mkDerivation { + pname = "scheduler"; + version = "1.5.0"; + sha256 = "19sgc3ydbjjlgd6jh9pqfxv3gq1mbgaicshf7kbj5yf5cnimq5vp"; + libraryHaskellDepends = [ + atomic-primops base deepseq exceptions primitive pvar unliftio-core + ]; + testHaskellDepends = [ + base deepseq doctest genvalidity-hspec hspec mwc-random QuickCheck + template-haskell unliftio vector + ]; + description = "Work stealing scheduler"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "schedyield" = callPackage ({ mkDerivation, base }: mkDerivation { @@ -226520,6 +227579,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {inherit (pkgs) SDL2;}; + "sdl2_2_5_3_0" = callPackage + ({ mkDerivation, base, bytestring, deepseq, exceptions, linear + , SDL2, StateVar, text, transformers, vector, weigh + }: + mkDerivation { + pname = "sdl2"; + version = "2.5.3.0"; + sha256 = "08l24cb92spnx3bn26bj0z2cszpsawhaa9vvhblvsr3d6z76065q"; + isLibrary = true; + isExecutable = true; + enableSeparateDataOutput = true; + libraryHaskellDepends = [ + base bytestring exceptions linear StateVar text transformers vector + ]; + librarySystemDepends = [ SDL2 ]; + libraryPkgconfigDepends = [ SDL2 ]; + testHaskellDepends = [ base deepseq linear vector weigh ]; + description = "Both high- and low-level bindings to the SDL library (version 2.0.6+)."; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {inherit (pkgs) SDL2;}; + "sdl2-cairo" = callPackage ({ mkDerivation, base, cairo, linear, sdl2 }: mkDerivation { @@ -227733,6 +228814,24 @@ self: { hydraPlatforms = stdenv.lib.platforms.none; }) {}; + "semver_0_4_0_1" = callPackage + ({ mkDerivation, attoparsec, base, criterion, deepseq, hashable + , tasty, tasty-hunit, text + }: + mkDerivation { + pname = "semver"; + version = "0.4.0.1"; + sha256 = "0hgn3wd1wv3y1723kvd9clj72z65f6m28yf75mxl1zjfd0kf6ivw"; + revision = "1"; + editedCabalFile = "13c692s2fbn6xygw70aglj84a8hq549gcj1p40g11j77w68p9xx4"; + libraryHaskellDepends = [ attoparsec base deepseq hashable text ]; + testHaskellDepends = [ base tasty tasty-hunit text ]; + benchmarkHaskellDepends = [ base criterion text ]; + description = "Representation, manipulation, and de/serialisation of Semantic Versions"; + license = stdenv.lib.licenses.mpl20; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "semver-range" = callPackage ({ mkDerivation, base, classy-prelude, hspec, parsec, QuickCheck , text, unordered-containers @@ -228524,22 +229623,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "servant_0_18" = callPackage + "servant_0_18_1" = callPackage ({ mkDerivation, aeson, attoparsec, base, base-compat, bifunctors , bytestring, case-insensitive, deepseq, hspec, hspec-discover , http-api-data, http-media, http-types, mmorph, mtl, network-uri - , QuickCheck, quickcheck-instances, singleton-bool + , QuickCheck, quickcheck-instances, singleton-bool, sop-core , string-conversions, tagged, text, transformers, vault }: mkDerivation { pname = "servant"; - version = "0.18"; - sha256 = "1dcb92q8w2fim087plspf1hs2gq2hdfiaggp71jqbljhnznlf5vj"; + version = "0.18.1"; + sha256 = "15brknvia5kd1fiyxlqghhhnajwrgai9yspkg5nd0v2k1g9dllky"; libraryHaskellDepends = [ aeson attoparsec base base-compat bifunctors bytestring case-insensitive deepseq http-api-data http-media http-types mmorph - mtl network-uri QuickCheck singleton-bool string-conversions tagged - text transformers vault + mtl network-uri QuickCheck singleton-bool sop-core + string-conversions tagged text transformers vault ]; testHaskellDepends = [ aeson base base-compat bytestring hspec http-media mtl QuickCheck @@ -229026,6 +230125,21 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "servant-blaze_0_9_1" = callPackage + ({ mkDerivation, base, blaze-html, http-media, servant + , servant-server, wai, warp + }: + mkDerivation { + pname = "servant-blaze"; + version = "0.9.1"; + sha256 = "08fvy904mz5xjqda702kq4ch25m3nda1yhpp4g7i62j0jmxs2ji6"; + libraryHaskellDepends = [ base blaze-html http-media servant ]; + testHaskellDepends = [ base blaze-html servant-server wai warp ]; + description = "Blaze-html support for servant"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "servant-cassava" = callPackage ({ mkDerivation, base, base-compat, bytestring, cassava, http-media , servant, servant-server, vector, wai, warp @@ -229149,19 +230263,21 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "servant-client_0_18" = callPackage + "servant-client_0_18_1" = callPackage ({ mkDerivation, aeson, base, base-compat, bytestring, containers , deepseq, entropy, exceptions, hspec, hspec-discover , http-api-data, http-client, http-media, http-types, HUnit , kan-extensions, markdown-unlit, monad-control, mtl, network , QuickCheck, semigroupoids, servant, servant-client-core - , servant-server, stm, tdigest, text, time, transformers + , servant-server, sop-core, stm, tdigest, text, time, transformers , transformers-base, transformers-compat, wai, warp }: mkDerivation { pname = "servant-client"; - version = "0.18"; - sha256 = "17m0cakf4apdrpq7wic9mbxcn2hd9cwh9xrcbxshabfffgkq791i"; + version = "0.18.1"; + sha256 = "0pv9xj5a6caqxsnlnv4ijzavgmsgi0n3zri4h84mrjki2h2z1837"; + revision = "1"; + editedCabalFile = "1d2f8l2zs2gy880g3i9l3jwjrxygb705qz1f81ral7ik56465m83"; libraryHaskellDepends = [ base base-compat bytestring containers deepseq exceptions http-client http-media http-types kan-extensions monad-control mtl @@ -229171,8 +230287,8 @@ self: { testHaskellDepends = [ aeson base base-compat bytestring entropy hspec http-api-data http-client http-types HUnit kan-extensions markdown-unlit mtl - network QuickCheck servant servant-client-core servant-server stm - tdigest text transformers transformers-compat wai warp + network QuickCheck servant servant-client-core servant-server + sop-core stm tdigest text transformers transformers-compat wai warp ]; testToolDepends = [ hspec-discover markdown-unlit ]; description = "Automatic derivation of querying functions for servant"; @@ -229203,20 +230319,22 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "servant-client-core_0_18" = callPackage + "servant-client-core_0_18_1" = callPackage ({ mkDerivation, aeson, base, base-compat, base64-bytestring , bytestring, containers, deepseq, exceptions, free, hspec , hspec-discover, http-media, http-types, network-uri, QuickCheck - , safe, servant, template-haskell, text, transformers + , safe, servant, sop-core, template-haskell, text, transformers }: mkDerivation { pname = "servant-client-core"; - version = "0.18"; - sha256 = "198kixjiy34z05vavs18wb2kp62pk5bzr5cl7dvhkl73alvj3rhn"; + version = "0.18.1"; + sha256 = "1pp4r8l1130ph680kcw7zpk1p76z88ip21cf4dghckmj0lflyw9h"; + revision = "1"; + editedCabalFile = "04lk4zwx5g652krn561fd02wbrsg9jrj93hw7gv6z2xay8dr05m1"; libraryHaskellDepends = [ aeson base base-compat base64-bytestring bytestring containers deepseq exceptions free http-media http-types network-uri safe - servant template-haskell text transformers + servant sop-core template-haskell text transformers ]; testHaskellDepends = [ base base-compat deepseq hspec QuickCheck ]; testToolDepends = [ hspec-discover ]; @@ -229401,7 +230519,7 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "servant-docs_0_11_6" = callPackage + "servant-docs_0_11_7" = callPackage ({ mkDerivation, aeson, aeson-pretty, base, base-compat, bytestring , case-insensitive, hashable, http-media, http-types, lens, servant , string-conversions, tasty, tasty-golden, tasty-hunit, text @@ -229409,8 +230527,8 @@ self: { }: mkDerivation { pname = "servant-docs"; - version = "0.11.6"; - sha256 = "07qabs5xi6dw8anmrnl2135fps901k4y1s2xywgdxhqyg01rljhq"; + version = "0.11.7"; + sha256 = "01m8ixxs310mcmnd1c5na2ycbnc9xwizdnzzcjdbli5r1mngpgc8"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -229831,8 +230949,10 @@ self: { }: mkDerivation { pname = "servant-http-streams"; - version = "0.18"; - sha256 = "1krpmmzjc1vagcy8rdgcl3zm8zlfjf8ikicaqrqp6d95f8bz4kaz"; + version = "0.18.1"; + sha256 = "05ji6zg6v8cysfbh0850cmwrian0n2clvqn3b348cz3qms0ijrpg"; + revision = "1"; + editedCabalFile = "0xpscs5y480n19n3i4sn7xmb6kra7cyjxq64ic18cpqijv1jwlm1"; libraryHaskellDepends = [ base base-compat bytestring case-insensitive containers deepseq exceptions http-common http-media http-streams http-types @@ -230170,8 +231290,10 @@ self: { }: mkDerivation { pname = "servant-multipart"; - version = "0.11.6"; - sha256 = "0yzr5hv2ki9ig4g6735bjnzv6mkpgj5l68g9hlvp9g9i0ryxqahn"; + version = "0.12"; + sha256 = "1hs1h66zjhknfnz1bdi5c0d2sfb20fc7x9adbc87gq168k8riqvl"; + revision = "1"; + editedCabalFile = "0pc254b458v4k5xw729fvw3q3klwpkai2mmp455dw2i7g02dv0da"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -230256,8 +231378,8 @@ self: { }: mkDerivation { pname = "servant-openapi3"; - version = "2.0.0.1"; - sha256 = "14vxvvnzjk7w7lzivmjh5ib7byqqywrhr72rx0nafzq2vsw1wzng"; + version = "2.0.1.0"; + sha256 = "14mfa7l3rqjmqp89x9gny5sy3c1w41czkyx7qp1d8dz1y4qi4ipf"; setupHaskellDepends = [ base Cabal cabal-doctest ]; libraryHaskellDepends = [ aeson aeson-pretty base base-compat bytestring hspec http-media @@ -230785,26 +231907,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; - "servant-server_0_18" = callPackage + "servant-server_0_18_1" = callPackage ({ mkDerivation, aeson, base, base-compat, base64-bytestring , bytestring, containers, directory, exceptions, filepath, hspec , hspec-discover, hspec-wai, http-api-data, http-media, http-types , monad-control, mtl, network, network-uri, QuickCheck, resourcet - , safe, servant, should-not-typecheck, string-conversions, tagged - , temporary, text, transformers, transformers-base + , safe, servant, should-not-typecheck, sop-core, string-conversions + , tagged, temporary, text, transformers, transformers-base , transformers-compat, wai, wai-app-static, wai-extra, warp, word8 }: mkDerivation { pname = "servant-server"; - version = "0.18"; - sha256 = "0knbzr6ls9p2wjn3kfggy99gxavl817xw48m53plhf2r4s4vjrw8"; + version = "0.18.1"; + sha256 = "1azyaprki2mxqxb67h792qrjzxy8cy9m9f7zxg22g60l3j197df5"; + revision = "1"; + editedCabalFile = "1z136vqfbxliq141y4i6m9d3bif4k0ay34xximlnnfxjazx4r0ph"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base base-compat base64-bytestring bytestring containers exceptions filepath http-api-data http-media http-types monad-control mtl - network network-uri resourcet servant string-conversions tagged - text transformers transformers-base wai wai-app-static word8 + network network-uri resourcet servant sop-core string-conversions + tagged text transformers transformers-base wai wai-app-static word8 ]; executableHaskellDepends = [ aeson base base-compat servant text wai warp @@ -231160,6 +232284,23 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "servant-swagger-ui_0_3_4_3_36_1" = callPackage + ({ mkDerivation, base, bytestring, file-embed-lzma, servant + , servant-server, servant-swagger-ui-core, swagger2, text + }: + mkDerivation { + pname = "servant-swagger-ui"; + version = "0.3.4.3.36.1"; + sha256 = "0j66ci53mlv1v57xg0hx6sm876i7yj99v573zizgb497c747dy8n"; + libraryHaskellDepends = [ + base bytestring file-embed-lzma servant servant-server + servant-swagger-ui-core swagger2 text + ]; + description = "Servant swagger ui"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "servant-swagger-ui-core" = callPackage ({ mkDerivation, base, blaze-markup, bytestring, http-media , servant, servant-blaze, servant-server, swagger2, text @@ -231169,8 +232310,8 @@ self: { pname = "servant-swagger-ui-core"; version = "0.3.3"; sha256 = "0gpdjnclbjjr6gwc0gyx1d4w06cjf6z5b2ngjfcgbn885wqllwh3"; - revision = "3"; - editedCabalFile = "0yx3q7y533v61ca4bm4wi8h7chbghj2rz92b330a544w7ac8il0p"; + revision = "4"; + editedCabalFile = "1kj72caf8skcl25bfw4nh7kj7hh33wd55sggsd474di57wi9j2c4"; libraryHaskellDepends = [ base blaze-markup bytestring http-media servant servant-blaze servant-server swagger2 text transformers transformers-compat @@ -231188,8 +232329,8 @@ self: { pname = "servant-swagger-ui-jensoleg"; version = "0.3.3"; sha256 = "02zwymqxq54xwc8wmzhbcfgx9plvk0n4kp1907sbl98mhh2frwrw"; - revision = "3"; - editedCabalFile = "08fwi8zq3clski4bac2p2ahqf4475xwzba31jw4f4lcr01rickqk"; + revision = "4"; + editedCabalFile = "19h7n1g847ly7addv03vzy5915n48xa0y7l88dzamy6ly1jrmdg2"; libraryHaskellDepends = [ base bytestring file-embed-lzma servant servant-server servant-swagger-ui-core swagger2 text @@ -231206,8 +232347,8 @@ self: { pname = "servant-swagger-ui-redoc"; version = "0.3.3.1.22.3"; sha256 = "0bzkrh1hf29vfa1r1sgifb9j2zcg6i43fal4abbx4lcqvf155pzv"; - revision = "2"; - editedCabalFile = "195vfc3871l1clk85kzxjvz1zr986lbvgy26fazfkfsn032s74c6"; + revision = "3"; + editedCabalFile = "1csz8gzmrrjbjvr6kx4vmyp419i5vbzk84a01vh5zr6ncrpx5nf3"; libraryHaskellDepends = [ base bytestring file-embed-lzma servant servant-server servant-swagger-ui-core swagger2 text @@ -232859,12 +234000,12 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "shake-plus_0_3_3_0" = callPackage + "shake-plus_0_3_3_1" = callPackage ({ mkDerivation, base, extra, path, rio, shake }: mkDerivation { pname = "shake-plus"; - version = "0.3.3.0"; - sha256 = "13a5n6gh1msrygi671lk5y83shcd75yz64x3r2smxif5hsfazwqv"; + version = "0.3.3.1"; + sha256 = "09zinaphlmdshny3hiyibbqqkfflj2rkxh8zkpnnk5dvf2qb15p5"; libraryHaskellDepends = [ base extra path rio shake ]; description = "Re-export of Shake using well-typed paths and ReaderT"; license = stdenv.lib.licenses.mit; @@ -232894,35 +234035,44 @@ self: { "shakebook" = callPackage ({ mkDerivation, aeson, aeson-better-errors, aeson-with, base - , binary, binary-instances, comonad, comonad-extras - , composite-aeson, composite-base, doctemplates, feed, free - , hashable-time, http-conduit, ixset-typed, ixset-typed-conversions - , lens, lens-aeson, lucid, lucid-cdn, mtl, mustache, pandoc - , pandoc-types, path, path-extensions, rio, shake-plus - , shake-plus-extended, sitemap-gen, slick, split, tasty - , tasty-golden, text-time, vinyl, zipper-extra + , binary-instances, comonad, comonad-extras, compdoc + , composite-aeson, composite-aeson-cofree-list + , composite-aeson-path, composite-aeson-throw + , composite-aeson-writeonly, composite-base, composite-binary + , composite-hashable, composite-tuple, composite-xstep + , doctemplates, feed, free, hashable-time, ixset-typed + , ixset-typed-conversions, lens, lens-aeson, lucid, lucid-cdn, mtl + , pandoc, pandoc-throw, pandoc-types, path, path-extensions + , path-utils, rio, shake-plus, shake-plus-extended, sitemap-gen + , skylighting, split, stache, tasty, tasty-golden, vinyl + , zipper-extra }: mkDerivation { pname = "shakebook"; - version = "0.11.0.0"; - sha256 = "0h6pq3y7ll5l83a682mwk60zipsm91w0srgrigdgi7l4wdhn7qzb"; + version = "0.13.1.0"; + sha256 = "1c2qklpjyszc3rfqm7p73bkb4ma43lwvsc9h8p8dyc5s1dxv8d4f"; libraryHaskellDepends = [ - aeson aeson-better-errors aeson-with base binary binary-instances - comonad comonad-extras composite-aeson composite-base doctemplates - feed free hashable-time http-conduit ixset-typed - ixset-typed-conversions lens lens-aeson lucid lucid-cdn mtl - mustache pandoc pandoc-types path path-extensions rio shake-plus - shake-plus-extended sitemap-gen slick split text-time vinyl - zipper-extra + aeson aeson-better-errors aeson-with base binary-instances comonad + comonad-extras compdoc composite-aeson composite-aeson-cofree-list + composite-aeson-path composite-aeson-throw + composite-aeson-writeonly composite-base composite-binary + composite-hashable composite-tuple composite-xstep doctemplates + feed free hashable-time ixset-typed ixset-typed-conversions lens + lens-aeson lucid lucid-cdn mtl pandoc pandoc-throw pandoc-types + path path-extensions path-utils rio shake-plus shake-plus-extended + sitemap-gen skylighting stache vinyl zipper-extra ]; testHaskellDepends = [ - aeson aeson-better-errors aeson-with base binary binary-instances - comonad comonad-extras composite-aeson composite-base doctemplates - feed free hashable-time http-conduit ixset-typed - ixset-typed-conversions lens lens-aeson lucid lucid-cdn mtl - mustache pandoc pandoc-types path path-extensions rio shake-plus - shake-plus-extended sitemap-gen slick split tasty tasty-golden - text-time vinyl zipper-extra + aeson aeson-better-errors aeson-with base binary-instances comonad + comonad-extras compdoc composite-aeson composite-aeson-cofree-list + composite-aeson-path composite-aeson-throw + composite-aeson-writeonly composite-base composite-binary + composite-hashable composite-tuple composite-xstep doctemplates + feed free hashable-time ixset-typed ixset-typed-conversions lens + lens-aeson lucid lucid-cdn mtl pandoc pandoc-throw pandoc-types + path path-extensions path-utils rio shake-plus shake-plus-extended + sitemap-gen skylighting split stache tasty tasty-golden vinyl + zipper-extra ]; description = "Shake-based technical documentation generator; HTML & PDF"; license = stdenv.lib.licenses.mit; @@ -237492,6 +238642,8 @@ self: { libraryHaskellDepends = [ base bytesmith primitive ]; description = "Parse arrays of tokens"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "smith-cli" = callPackage @@ -244745,6 +245897,8 @@ self: { ]; description = "STM-specialised Hash Array Mapped Trie"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "stm-incremental" = callPackage @@ -252015,6 +253169,8 @@ self: { testToolDepends = [ tasty-discover ]; description = "A command-line kanban board/task manager"; license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "taskpool" = callPackage @@ -252819,8 +253975,8 @@ self: { pname = "tasty-travis"; version = "0.2.0.2"; sha256 = "0g1qwmr11rgpvm964367mskgrjzbi34lbxzf9c0knx5ij9565gfg"; - revision = "4"; - editedCabalFile = "10kvalx02kyx2dx6shw00s689hb1qgllpagwy6nxvah6cky438ks"; + revision = "5"; + editedCabalFile = "1m1npkvi3g1i7vn7aiq2558l3hbv2w6nz1ix9mv1djn6ccjlh1gk"; libraryHaskellDepends = [ base tasty ]; testHaskellDepends = [ base tasty tasty-hunit ]; description = "Fancy Travis CI output for tasty tests"; @@ -256797,8 +257953,8 @@ self: { }: mkDerivation { pname = "th-lego"; - version = "0.2.2"; - sha256 = "0z9bpycyayvjr01pl704yhmchdfiyfi58drkq9ccxahgrwa0gpfc"; + version = "0.2.3"; + sha256 = "1c2q1gz04072kh2dxs22hqvcjkfq66ylixl0631wnlmvivbm2ahz"; libraryHaskellDepends = [ base template-haskell template-haskell-compat-v0208 text ]; @@ -256808,6 +257964,8 @@ self: { ]; description = "Template Haskell construction utilities"; license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "th-lift" = callPackage @@ -258282,6 +259440,24 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "time-compat_1_9_4" = callPackage + ({ mkDerivation, base, base-compat, base-orphans, deepseq, HUnit + , QuickCheck, tagged, tasty, tasty-hunit, tasty-quickcheck, time + }: + mkDerivation { + pname = "time-compat"; + version = "1.9.4"; + sha256 = "0fpk2bpxfyzwd24lk06k3cpra713hrpva5ylnwa28zq34azy1snz"; + libraryHaskellDepends = [ base base-orphans deepseq time ]; + testHaskellDepends = [ + base base-compat deepseq HUnit QuickCheck tagged tasty tasty-hunit + tasty-quickcheck time + ]; + description = "Compatibility package for time"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "time-extras" = callPackage ({ mkDerivation, base, time }: mkDerivation { @@ -260207,12 +261383,25 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "tonalude_0_1_1_1" = callPackage + ({ mkDerivation, base, bytestring, doctest, Glob, rio, unliftio }: + mkDerivation { + pname = "tonalude"; + version = "0.1.1.1"; + sha256 = "19pl0l0nz3nywhf31190qld7crbzry241h5dw0234w5qyiwf5h0h"; + libraryHaskellDepends = [ base bytestring rio unliftio ]; + testHaskellDepends = [ base bytestring doctest Glob rio unliftio ]; + description = "A standard library for Tonatona framework"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "tonaparser" = callPackage ({ mkDerivation, base, doctest, envy, Glob, rio, say, tonatona }: mkDerivation { pname = "tonaparser"; - version = "0.1.0.0"; - sha256 = "0v9qfc13lyjclk7pqsld1lzzbdhimz7gziix7w2x6v2rr2nia8j0"; + version = "0.1.0.1"; + sha256 = "1hhg8iil1gradmr2nr6rms5y8f1478splfw6q8n8548zgaqlrzig"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ base envy rio say ]; @@ -260225,8 +261414,8 @@ self: { ({ mkDerivation, base, doctest, Glob, rio, tonaparser }: mkDerivation { pname = "tonatona"; - version = "0.1.1.0"; - sha256 = "17hd93m2i79pb39z00x0sdvhfds3b5fgyhld8pr64rlnr9wm039l"; + version = "0.1.2.1"; + sha256 = "0995j5z87s5bq7ax3byhqrzq794fra5khswf1vj5ppymj6sgq9pf"; libraryHaskellDepends = [ base rio tonaparser ]; testHaskellDepends = [ base doctest Glob rio tonaparser ]; description = "meta application framework"; @@ -260261,8 +261450,8 @@ self: { ({ mkDerivation, base, doctest, Glob, rio, tonaparser, tonatona }: mkDerivation { pname = "tonatona-logger"; - version = "0.2.0.0"; - sha256 = "14pirmflhyfmw6y7j1af7ryh8iq30prx7xsdjwmliacszhsqvvfa"; + version = "0.2.0.2"; + sha256 = "047mhgzkk1jkyblbmh41ha56fifgsfccq6jzq3s0y6fx4sgc95nn"; libraryHaskellDepends = [ base rio tonaparser tonatona ]; testHaskellDepends = [ base doctest Glob rio tonaparser tonatona ]; description = "tonatona plugin for logging"; @@ -260275,8 +261464,8 @@ self: { }: mkDerivation { pname = "tonatona-persistent-postgresql"; - version = "0.1.0.1"; - sha256 = "1fxf3h024bl02aldcwc9mhjish9l2y57ir9shra6liddk6065g5n"; + version = "0.1.0.2"; + sha256 = "1lib6akp6xnq7iqjgyxgd14l9mgswx8y61v0qpdj8q13xxs5m1si"; libraryHaskellDepends = [ base monad-logger persistent persistent-postgresql resource-pool rio tonaparser tonatona @@ -260297,8 +261486,8 @@ self: { }: mkDerivation { pname = "tonatona-persistent-sqlite"; - version = "0.1.0.1"; - sha256 = "0a0jgi01pdirr7ay2ah3cvf3nv2pnmvxag34zif04vc6sbs8pryb"; + version = "0.1.0.2"; + sha256 = "185bkhikkhk7m8l96rapcy6nwccw3js7kpnif7dlrniv0ckjdwzg"; libraryHaskellDepends = [ base monad-logger persistent persistent-sqlite resource-pool rio tonaparser tonatona @@ -260318,8 +261507,8 @@ self: { }: mkDerivation { pname = "tonatona-servant"; - version = "0.1.0.3"; - sha256 = "1v414apf2znvwm6vdph6wr0slhd5ki2nc666frhc8blmwj3whqrr"; + version = "0.1.0.4"; + sha256 = "0zldxq7qygswa0pyxb82p1bbwap6lfr18dw2802ailv5y6gxsjg0"; libraryHaskellDepends = [ base data-default exceptions http-types monad-logger rio servant servant-server tonaparser tonatona tonatona-logger wai wai-extra @@ -263038,6 +264227,23 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "ttc_0_3_0_0" = callPackage + ({ mkDerivation, base, bytestring, tasty, tasty-hunit + , template-haskell, text + }: + mkDerivation { + pname = "ttc"; + version = "0.3.0.0"; + sha256 = "0k23fsp9fji17341iag3rv79lsxj7x26chhijl8lh3jraqvj9y4p"; + libraryHaskellDepends = [ base bytestring template-haskell text ]; + testHaskellDepends = [ + base bytestring tasty tasty-hunit template-haskell text + ]; + description = "Textual Type Classes"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "ttl-hashtables" = callPackage ({ mkDerivation, base, clock, containers, data-default, failable , hashable, hashtables, hspec, mtl, transformers @@ -264780,6 +265986,28 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "type-of-html_1_6_0_0" = callPackage + ({ mkDerivation, base, blaze-html, bytestring, containers + , criterion, deepseq, double-conversion, ghc, ghc-paths, ghc-prim + , hspec, QuickCheck, random, text, weigh + }: + mkDerivation { + pname = "type-of-html"; + version = "1.6.0.0"; + sha256 = "1blwdwr0ryq3as7dc1wh9ixxy81q600hmm5d4bw768a5kbjc1sj6"; + libraryHaskellDepends = [ + base bytestring containers double-conversion ghc-prim text + ]; + testHaskellDepends = [ base bytestring hspec QuickCheck ]; + benchmarkHaskellDepends = [ + base blaze-html bytestring criterion deepseq ghc ghc-paths random + text weigh + ]; + description = "High performance type driven html generation"; + license = stdenv.lib.licenses.bsd3; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "type-of-html-static" = callPackage ({ mkDerivation, base, template-haskell, type-of-html }: mkDerivation { @@ -265610,6 +266838,8 @@ self: { preConfigure = "export TZDIR=${pkgs.tzdata}/share/zoneinfo"; description = "Efficient time zone handling"; license = stdenv.lib.licenses.asl20; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; }) {}; "tzdata" = callPackage @@ -266081,8 +267311,8 @@ self: { ({ mkDerivation, base, bytestring, mmsyn2, mmsyn5, vector }: mkDerivation { pname = "ukrainian-phonetics-basic"; - version = "0.1.7.0"; - sha256 = "0rjyy6yxwd799svqd34wjjz5wvxzlkr7bl65s1wmvdfbs9dvfk95"; + version = "0.1.10.0"; + sha256 = "14rc2jx621brka5sgxa8m5s38bqyzqdc1jw808zw6mll4hg6scvx"; libraryHaskellDepends = [ base bytestring mmsyn2 mmsyn5 vector ]; description = "A library to work with the basic Ukrainian phonetics and syllable segmentation"; license = stdenv.lib.licenses.mit; @@ -266213,8 +267443,8 @@ self: { }: mkDerivation { pname = "unbeliever"; - version = "0.10.0.7"; - sha256 = "17yjw8lgwm93hhf4rk0npj35h77jfig3ziampdmg5cjhyy2h4sd7"; + version = "0.10.0.8"; + sha256 = "062xr66i96kwvbwf4pr51ybiavy6wbijzz7zy0si18g13x00x54c"; libraryHaskellDepends = [ base core-data core-program core-text ]; testHaskellDepends = [ base bytestring core-data core-program core-text fingertree @@ -268466,21 +269696,31 @@ self: { }) {}; "update-nix-fetchgit" = callPackage - ({ mkDerivation, aeson, async, base, bytestring, errors, hnix - , prettyprinter, process, text, time, transformers, uniplate - , utf8-string + ({ mkDerivation, aeson, async, base, bytestring, data-fix + , directory, filepath, github-rest, hnix, monad-validate, mtl + , optparse-applicative, optparse-generic, process, regex-tdfa, say + , syb, tasty, tasty-discover, tasty-golden, template-haskell + , temporary, text, time, utf8-string, vector }: mkDerivation { pname = "update-nix-fetchgit"; - version = "0.1.2.0"; - sha256 = "0i2dmz95l8nnjqys2vjyjww47rnlny6wpwpj8k5kjl0fbz4h001d"; + version = "0.2.3"; + sha256 = "1fmpmwg31gnablwp22a90l7q5hj6xxd57cxf3zbp3mv1xabd341k"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ - aeson async base bytestring errors hnix prettyprinter process text - time transformers uniplate utf8-string + aeson async base bytestring data-fix github-rest hnix + monad-validate mtl process regex-tdfa syb template-haskell text + time utf8-string vector ]; - executableHaskellDepends = [ base text ]; + executableHaskellDepends = [ + base optparse-applicative optparse-generic regex-tdfa say text + ]; + testHaskellDepends = [ + base directory filepath process tasty tasty-discover tasty-golden + temporary text + ]; + testToolDepends = [ tasty-discover ]; description = "A program to update fetchgit values in Nix expressions"; license = stdenv.lib.licenses.bsd3; maintainers = with stdenv.lib.maintainers; [ sorki ]; @@ -270196,8 +271436,8 @@ self: { pname = "validated-literals"; version = "0.3.0"; sha256 = "1k77jp19kl7h4v9hl2jhsmbq8dhzl8z9sgkw1jxx1rblm3fszjx1"; - revision = "3"; - editedCabalFile = "0m7iggm5676nayzkj0ip866qg8d4ld6gv38krl02z020m96zax5b"; + revision = "4"; + editedCabalFile = "16fwvivw1barrgkw7cl2hfgksfhambfmhrwibhi6n8096sj79h0j"; libraryHaskellDepends = [ base template-haskell ]; testHaskellDepends = [ base bytestring deepseq tasty tasty-hunit tasty-travis @@ -270281,18 +271521,19 @@ self: { }) {}; "validationt" = callPackage - ({ mkDerivation, aeson, base, containers, exceptions, lens + ({ mkDerivation, aeson, base, containers, doctest, exceptions, lens , monad-control, mtl, QuickCheck, text, transformers - , transformers-base, transformers-lift, vector + , transformers-base, vector }: mkDerivation { pname = "validationt"; - version = "0.2.1.0"; - sha256 = "0b91rn6fvdc9cypaljhm4q8gn4fivyszk00h47qvvs4by8rx5q58"; + version = "0.3.0"; + sha256 = "14kvkiawsychqq55nm0afpfwxjvxh9izbr35zgp3wg2j0zqzkhnz"; libraryHaskellDepends = [ aeson base containers exceptions lens monad-control mtl QuickCheck - text transformers transformers-base transformers-lift vector + text transformers transformers-base vector ]; + testHaskellDepends = [ base doctest ]; description = "Straightforward validation monad"; license = stdenv.lib.licenses.bsd3; hydraPlatforms = stdenv.lib.platforms.none; @@ -272920,12 +274161,13 @@ self: { ({ mkDerivation, base, bytestring, transformers, vector, vulkan }: mkDerivation { pname = "vulkan"; - version = "3.6.11"; - sha256 = "065l0nk4w3if01aavfzgnalpp39xz1j8xw022l9w9pmdmb2y0fjm"; + version = "3.6.12"; + sha256 = "1ysqa9vps8jkrcapbrans3k4aljw3wysqlq5z9qds29zrhki4dd0"; libraryHaskellDepends = [ base bytestring transformers vector ]; librarySystemDepends = [ vulkan ]; description = "Bindings to the Vulkan graphics API"; license = stdenv.lib.licenses.bsd3; + platforms = [ "x86_64-darwin" "x86_64-linux" ]; }) {vulkan = null;}; "vulkan-api" = callPackage @@ -272945,16 +274187,14 @@ self: { }: mkDerivation { pname = "vulkan-utils"; - version = "0.1.2"; - sha256 = "1him27687nbqc5mv56gf8nr9hg4wpx702sijrci0ls7mpjz9qlxp"; + version = "0.1.2.1"; + sha256 = "1ixjw397aqw04p2gy1d1pg9c3rdww2czakqg21ihg7ldi894n8pa"; libraryHaskellDepends = [ base bytestring extra file-embed filepath template-haskell temporary typed-process vulkan ]; description = "Utils for the vulkan package"; license = stdenv.lib.licenses.bsd3; - hydraPlatforms = stdenv.lib.platforms.none; - broken = true; }) {}; "waargonaut" = callPackage @@ -273365,7 +274605,7 @@ self: { license = stdenv.lib.licenses.mit; }) {}; - "wai-extra_3_1_1" = callPackage + "wai-extra_3_1_2" = callPackage ({ mkDerivation, aeson, ansi-terminal, base, base64-bytestring , bytestring, call-stack, case-insensitive, containers, cookie , data-default-class, deepseq, directory, fast-logger, hspec @@ -273375,8 +274615,8 @@ self: { }: mkDerivation { pname = "wai-extra"; - version = "3.1.1"; - sha256 = "0x3lixv64j9s6zp9ghl53dj5lgw25mpl65v1cwjfs8kbk44nvbsk"; + version = "3.1.2"; + sha256 = "03aszasb9508jy7dpazay89cy1zs4p5g0n08zjhsl8c47rap16ks"; isLibrary = true; isExecutable = true; libraryHaskellDepends = [ @@ -273679,15 +274919,16 @@ self: { }) {}; "wai-log" = callPackage - ({ mkDerivation, aeson, base, http-types, log-base - , string-conversions, text, time, wai + ({ mkDerivation, aeson, base, bytestring, http-types, log-base + , string-conversions, text, time, uuid, wai }: mkDerivation { pname = "wai-log"; - version = "0.2.0.0"; - sha256 = "02lsvkh7mkqd6p69qffrl62pdxzn5h1a4wnqflb3sycifi8dmj9b"; + version = "0.3.0.0"; + sha256 = "0mgby05lq9j31ssyk2yp6mghqwgpffkki7pygday1lmg130n8n74"; libraryHaskellDepends = [ - aeson base http-types log-base string-conversions text time wai + aeson base bytestring http-types log-base string-conversions text + time uuid wai ]; description = "A logging middleware for WAI applications"; license = stdenv.lib.licenses.bsd3; @@ -274477,8 +275718,8 @@ self: { }: mkDerivation { pname = "wai-predicates"; - version = "0.10.0"; - sha256 = "1hnpzf7zwizx67ql4fwpqj7xlgkn6c2ms8w4kjapmgxv8z8zdcxp"; + version = "1.0.0"; + sha256 = "0m6aqpafc7rgcp81g0kilshz9bxsp4vxllrya2wjccan3n5pajji"; libraryHaskellDepends = [ attoparsec base bytestring bytestring-conversion case-insensitive cookie http-types singletons text transformers vault vector wai @@ -282461,6 +283702,34 @@ self: { license = stdenv.lib.licenses.bsd3; }) {}; + "yaml-unscrambler" = callPackage + ({ mkDerivation, acc, attoparsec, attoparsec-data, attoparsec-time + , base, base64, bytestring, conduit, containers, foldl, hashable + , libyaml, mtl, neat-interpolation, QuickCheck + , quickcheck-instances, rerebase, scientific, selective, tasty + , tasty-hunit, tasty-quickcheck, text, text-builder, time + , transformers, unordered-containers, uuid, vector, yaml + }: + mkDerivation { + pname = "yaml-unscrambler"; + version = "0.1.0.1"; + sha256 = "05z892g8c9alwmjwjm1405s43s8cdbj42ymqc9jlb27qc8ikc4n7"; + libraryHaskellDepends = [ + acc attoparsec attoparsec-data attoparsec-time base base64 + bytestring conduit containers foldl hashable libyaml mtl scientific + selective text text-builder time transformers unordered-containers + uuid vector yaml + ]; + testHaskellDepends = [ + foldl neat-interpolation QuickCheck quickcheck-instances rerebase + tasty tasty-hunit tasty-quickcheck + ]; + description = "Flexible declarative YAML parsing toolkit"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + broken = true; + }) {}; + "yaml2owl" = callPackage ({ mkDerivation, base, containers, directory, filepath, network , network-uri, swish, text, xml, yaml @@ -283277,6 +284546,35 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "yesod-auth_1_6_10_1" = callPackage + ({ mkDerivation, aeson, authenticate, base, base16-bytestring + , base64-bytestring, binary, blaze-builder, blaze-html + , blaze-markup, bytestring, conduit, conduit-extra, containers + , cryptonite, data-default, email-validate, file-embed, http-client + , http-client-tls, http-conduit, http-types, memory, network-uri + , nonce, persistent, random, safe, shakespeare, template-haskell + , text, time, transformers, unliftio, unliftio-core + , unordered-containers, wai, yesod-core, yesod-form + , yesod-persistent + }: + mkDerivation { + pname = "yesod-auth"; + version = "1.6.10.1"; + sha256 = "12bnadmf3afbkni3k8gc1srv2makssy62zciygg4dh8q7rr2pw2s"; + libraryHaskellDepends = [ + aeson authenticate base base16-bytestring base64-bytestring binary + blaze-builder blaze-html blaze-markup bytestring conduit + conduit-extra containers cryptonite data-default email-validate + file-embed http-client http-client-tls http-conduit http-types + memory network-uri nonce persistent random safe shakespeare + template-haskell text time transformers unliftio unliftio-core + unordered-containers wai yesod-core yesod-form yesod-persistent + ]; + description = "Authentication for Yesod"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "yesod-auth-account" = callPackage ({ mkDerivation, base, blaze-html, bytestring, hspec, monad-logger , mtl, nonce, persistent, persistent-sqlite, pwstore-fast @@ -283590,8 +284888,8 @@ self: { }: mkDerivation { pname = "yesod-auth-oauth"; - version = "1.6.0.1"; - sha256 = "0b9sp2rbj8yd343whcgg1ph4ybfk136d0ln09q7z56xqxn4brl3s"; + version = "1.6.0.2"; + sha256 = "1rr21vclcvy4lrv6r3v6f6sslmwg49jr7jiad63snn81nz854da1"; libraryHaskellDepends = [ authenticate-oauth base bytestring text unliftio yesod-auth yesod-core yesod-form @@ -284629,6 +285927,28 @@ self: { license = stdenv.lib.licenses.mit; }) {}; + "yesod-persistent_1_6_0_5" = callPackage + ({ mkDerivation, base, blaze-builder, conduit, hspec, persistent + , persistent-sqlite, persistent-template, resource-pool, resourcet + , text, transformers, wai-extra, yesod-core + }: + mkDerivation { + pname = "yesod-persistent"; + version = "1.6.0.5"; + sha256 = "0chvpzhfj0l1lacwslizhawsc9ns307q0wc6mcalz6gv7cm7mfi3"; + libraryHaskellDepends = [ + base blaze-builder conduit persistent persistent-template + resource-pool resourcet transformers yesod-core + ]; + testHaskellDepends = [ + base blaze-builder conduit hspec persistent persistent-sqlite text + wai-extra yesod-core + ]; + description = "Some helpers for using Persistent from Yesod"; + license = stdenv.lib.licenses.mit; + hydraPlatforms = stdenv.lib.platforms.none; + }) {}; + "yesod-platform" = callPackage ({ mkDerivation, ansi-terminal, ansi-wl-pprint, asn1-encoding , asn1-parse, asn1-types, attoparsec-conduit, authenticate diff --git a/third_party/nixpkgs/pkgs/development/haskell-modules/make-package-set.nix b/third_party/nixpkgs/pkgs/development/haskell-modules/make-package-set.nix index 1418cfef05..ac65fad352 100644 --- a/third_party/nixpkgs/pkgs/development/haskell-modules/make-package-set.nix +++ b/third_party/nixpkgs/pkgs/development/haskell-modules/make-package-set.nix @@ -258,6 +258,7 @@ in package-set { inherit pkgs stdenv callPackage; } self // { # packages themselves. Using nix-shell on this derivation will # give you an environment suitable for developing the listed # packages with an incremental tool like cabal-install. + # # In addition to the "packages" arg and "withHoogle" arg, anything that # can be passed into stdenv.mkDerivation can be included in the input attrset # @@ -274,7 +275,7 @@ in package-set { inherit pkgs stdenv callPackage; } self // { # (import ./.).shellFor { # packages = p: [p.frontend p.backend p.common]; # withHoogle = true; - # buildInputs = [ pkgs.python ]; + # buildInputs = [ pkgs.python pkgs.cabal-install ]; # } # # -- cabal.project @@ -285,38 +286,150 @@ in package-set { inherit pkgs stdenv callPackage; } self // { # # bash$ nix-shell --run "cabal new-build all" # bash$ nix-shell --run "python" - shellFor = { packages, withHoogle ? false, ... } @ args: + shellFor = + { # Packages to create this development shell for. These are usually + # your local packages. + packages + , # Whether or not to generate a Hoogle database for all the + # dependencies. + withHoogle ? false + , # Whether or not to include benchmark dependencies of your local + # packages. You should set this to true if you have benchmarks defined + # in your local packages that you want to be able to run with cabal benchmark + doBenchmark ? false + , ... + } @ args: let - combinedPackageFor = packages: - let - selected = packages self; + # A list of the packages we want to build a development shell for. + # This is a list of Haskell package derivations. + selected = packages self; - pname = if pkgs.lib.length selected == 1 - then (pkgs.lib.head selected).name - else "packages"; + # This is a list of attribute sets, where each attribute set + # corresponds to the build inputs of one of the packages input to shellFor. + # + # Each attribute has keys like buildDepends, executableHaskellDepends, + # testPkgconfigDepends, etc. The values for the keys of the attribute + # set are lists of dependencies. + # + # Example: + # cabalDepsForSelected + # => [ + # # This may be the attribute set corresponding to the `backend` + # # package in the example above. + # { buildDepends = [ gcc ... ]; + # libraryHaskellDepends = [ lens conduit ... ]; + # ... + # } + # # This may be the attribute set corresponding to the `common` + # # package in the example above. + # { testHaskellDepends = [ tasty hspec ... ]; + # libraryHaskellDepends = [ lens aeson ]; + # benchmarkHaskellDepends = [ criterion ... ]; + # ... + # } + # ... + # ] + cabalDepsForSelected = map (p: p.getCabalDeps) selected; - # If `packages = [ a b ]` and `a` depends on `b`, don't build `b`, - # because cabal will end up ignoring that built version, assuming - # new-style commands. - combinedPackages = pkgs.lib.filter - (input: pkgs.lib.all (p: input.outPath or null != p.outPath) selected); + # A predicate that takes a derivation as input, and tests whether it is + # the same as any of the `selected` packages. + # + # Returns true if the input derivation is not in the list of `selected` + # packages. + # + # isNotSelected :: Derivation -> Bool + # + # Example: + # + # isNotSelected common [ frontend backend common ] + # => false + # + # isNotSelected lens [ frontend backend common ] + # => true + isNotSelected = input: pkgs.lib.all (p: input.outPath or null != p.outPath) selected; - # Returns an attrset containing a combined list packages' inputs for each - # stage of the build process - packageInputs = pkgs.lib.zipAttrsWith - (_: pkgs.lib.concatMap combinedPackages) - (map (p: p.getCabalDeps) selected); + # A function that takes a list of list of derivations, filters out all + # the `selected` packages from each list, and concats the results. + # + # zipperCombinedPkgs :: [[Derivation]] -> [Derivation] + # + # Example: + # zipperCombinedPkgs [ [ lens conduit ] [ aeson frontend ] ] + # => [ lens conduit aeson ] + # + # Note: The reason this isn't just the function `pkgs.lib.concat` is + # that we need to be careful to remove dependencies that are in the + # `selected` packages. + # + # For instance, in the above example, if `common` is a dependency of + # `backend`, then zipperCombinedPkgs needs to be careful to filter out + # `common`, because cabal will end up ignoring that built version, + # assuming new-style commands. + zipperCombinedPkgs = vals: + pkgs.lib.concatMap + (drvList: pkgs.lib.filter isNotSelected drvList) + vals; - genericBuilderArgs = { - inherit pname; - version = "0"; - license = null; - } // packageInputs; + # Zip `cabalDepsForSelected` into a single attribute list, combining + # the derivations in all the individual attributes. + # + # Example: + # packageInputs + # => # Assuming the value of cabalDepsForSelected is the same as + # # the example in cabalDepsForSelected: + # { buildDepends = [ gcc ... ]; + # libraryHaskellDepends = [ lens conduit aeson ... ]; + # testHaskellDepends = [ tasty hspec ... ]; + # benchmarkHaskellDepends = [ criterion ... ]; + # ... + # } + # + # See the Note in `zipperCombinedPkgs` for what gets filtered out from + # each of these dependency lists. + packageInputs = + pkgs.lib.zipAttrsWith (_name: zipperCombinedPkgs) cabalDepsForSelected; - in self.mkDerivation genericBuilderArgs; + # A attribute set to pass to `haskellPackages.mkDerivation`. + # + # The important thing to note here is that all the fields from + # packageInputs are set correctly. + genericBuilderArgs = { + pname = + if pkgs.lib.length selected == 1 + then (pkgs.lib.head selected).name + else "packages"; + version = "0"; + license = null; + } + // packageInputs + // pkgs.lib.optionalAttrs doBenchmark { + # `doBenchmark` needs to explicitly be set here because haskellPackages.mkDerivation defaults it to `false`. If the user wants benchmark dependencies included in their development shell, it has to be explicitly enabled here. + doBenchmark = true; + }; - mkDerivationArgs = builtins.removeAttrs args [ "packages" "withHoogle" ]; - in ((combinedPackageFor packages).envFunc { inherit withHoogle; }).overrideAttrs (old: mkDerivationArgs // { + # This is a pseudo Haskell package derivation that contains all the + # dependencies for the packages in `selected`. + # + # This is a derivation created with `haskellPackages.mkDerivation`. + # + # pkgWithCombinedDeps :: HaskellDerivation + pkgWithCombinedDeps = self.mkDerivation genericBuilderArgs; + + # The derivation returned from `envFunc` for `pkgWithCombinedDeps`. + # + # This is a derivation that can be run with `nix-shell`. It provides a + # GHC with a package database with all the dependencies of our + # `selected` packages. + # + # This is a derivation created with `stdenv.mkDerivation` (not + # `haskellPackages.mkDerivation`). + # + # pkgWithCombinedDepsDevDrv :: Derivation + pkgWithCombinedDepsDevDrv = pkgWithCombinedDeps.envFunc { inherit withHoogle; }; + + mkDerivationArgs = builtins.removeAttrs args [ "packages" "withHoogle" "doBenchmark" ]; + + in pkgWithCombinedDepsDevDrv.overrideAttrs (old: mkDerivationArgs // { nativeBuildInputs = old.nativeBuildInputs ++ mkDerivationArgs.nativeBuildInputs or []; buildInputs = old.buildInputs ++ mkDerivationArgs.buildInputs or []; }); diff --git a/third_party/nixpkgs/pkgs/development/interpreters/clojure/babashka.nix b/third_party/nixpkgs/pkgs/development/interpreters/clojure/babashka.nix index c023aa65fd..a6beaf1a57 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/clojure/babashka.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/clojure/babashka.nix @@ -1,25 +1,25 @@ -{ stdenv, fetchurl, graalvm8, glibcLocales }: +{ stdenv, fetchurl, graalvm11-ce, glibcLocales }: with stdenv.lib; stdenv.mkDerivation rec { pname = "babashka"; - version = "0.0.97"; + version = "0.2.3"; reflectionJson = fetchurl { name = "reflection.json"; url = "https://github.com/borkdude/${pname}/releases/download/v${version}/${pname}-${version}-reflection.json"; - sha256 = "1gd9ih9l02n1j9qkbxb36d3cb5sddwvxiw8kkicgc4xig77lsa7z"; + sha256 = "0lbdh3v3g3j00bn99bjhjj3gk1q9ks2alpvl9bxc00xpyw86f7z8"; }; src = fetchurl { url = "https://github.com/borkdude/${pname}/releases/download/v${version}/${pname}-${version}-standalone.jar"; - sha256 = "08py6bawfrhg90fbcnv2mq4c91g5wa1q2q6zdjy2i1b9q4x1654r"; + sha256 = "0vh6k3dkzyk346jjzg6n4mdi65iybrmhb3js9lm73yc3ay2c5dyi"; }; dontUnpack = true; LC_ALL = "en_US.UTF-8"; - nativeBuildInputs = [ graalvm8 glibcLocales ]; + nativeBuildInputs = [ graalvm11-ce glibcLocales ]; buildPhase = '' native-image \ @@ -78,7 +78,7 @@ stdenv.mkDerivation rec { ''; homepage = "https://github.com/borkdude/babashka"; license = licenses.epl10; - platforms = graalvm8.meta.platforms; + platforms = graalvm11-ce.meta.platforms; maintainers = with maintainers; [ bandresen bhougland DerGuteMoritz jlesquembre ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/interpreters/php/7.3.nix b/third_party/nixpkgs/pkgs/development/interpreters/php/7.3.nix new file mode 100644 index 0000000000..832a8323d5 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/interpreters/php/7.3.nix @@ -0,0 +1,20 @@ +{ callPackage, lib, stdenv, nixosTests, ... }@_args: + +let + generic = (import ./generic.nix) _args; + + base = callPackage generic (_args // { + version = "7.3.24"; + sha256 = "1655rj4w63n5fkvdj3kz9f5jfyjgvzw8a6j8zkzgic1p42xszdsm"; + + # https://bugs.php.net/bug.php?id=76826 + extraPatches = lib.optional stdenv.isDarwin ./php73-darwin-isfinite.patch; + }); + +in base.withExtensions ({ all, ... }: with all; ([ + bcmath calendar curl ctype dom exif fileinfo filter ftp gd + gettext gmp hash iconv intl json ldap mbstring mysqli mysqlnd + opcache openssl pcntl pdo pdo_mysql pdo_odbc pdo_pgsql pdo_sqlite + pgsql posix readline session simplexml sockets soap sodium sqlite3 + tokenizer xmlreader xmlwriter zip zlib +] ++ lib.optionals (!stdenv.isDarwin) [ imap ])) diff --git a/third_party/nixpkgs/pkgs/development/interpreters/php/7.4.nix b/third_party/nixpkgs/pkgs/development/interpreters/php/7.4.nix new file mode 100644 index 0000000000..571c7af8fc --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/interpreters/php/7.4.nix @@ -0,0 +1,17 @@ +{ callPackage, lib, stdenv, nixosTests, ... }@_args: + +let + generic = (import ./generic.nix) _args; + + base = callPackage generic (_args // { + version = "7.4.12"; + sha256 = "0rwrl7xgfq2bbgmy34klgfsqa7v935074ibanmic9pwy4g676vvf"; + }); + +in base.withExtensions ({ all, ... }: with all; ([ + bcmath calendar curl ctype dom exif fileinfo filter ftp gd + gettext gmp iconv intl json ldap mbstring mysqli mysqlnd opcache + openssl pcntl pdo pdo_mysql pdo_odbc pdo_pgsql pdo_sqlite pgsql + posix readline session simplexml sockets soap sodium sqlite3 + tokenizer xmlreader xmlwriter zip zlib +] ++ lib.optionals (!stdenv.isDarwin) [ imap ])) diff --git a/third_party/nixpkgs/pkgs/development/interpreters/php/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/php/generic.nix similarity index 89% rename from third_party/nixpkgs/pkgs/development/interpreters/php/default.nix rename to third_party/nixpkgs/pkgs/development/interpreters/php/generic.nix index dd296eb10d..ef50eacc5f 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/php/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/php/generic.nix @@ -1,7 +1,7 @@ # We have tests for PCRE and PHP-FPM in nixos/tests/php/ or # both in the same attribute named nixosTests.php -{ callPackage, lib, stdenv, nixosTests }@_args: +{ callPackage, lib, stdenv, nixosTests, ... }: let generic = @@ -29,7 +29,7 @@ let , embedSupport ? false , ipv6Support ? true , systemdSupport ? stdenv.isLinux - , valgrindSupport ? true + , valgrindSupport ? !stdenv.isDarwin , ztsSupport ? apxs2Support }@args: let @@ -271,34 +271,4 @@ let outputsToInstall = [ "out" "dev" ]; }; }; - - php73base = callPackage generic (_args // { - version = "7.3.23"; - sha256 = "0k600imsxm3r3qdv20ryqhvfmnkmjhvm2hcnqr180l058snncrpx"; - - # https://bugs.php.net/bug.php?id=76826 - extraPatches = lib.optional stdenv.isDarwin ./php73-darwin-isfinite.patch; - }); - - php74base = callPackage generic (_args // { - version = "7.4.11"; - sha256 = "1idq2sk3x6msy8l2g42jv3y87h1fgb1aybxw7wpjkliv4iaz422l"; - }); - - defaultPhpExtensions = { all, ... }: with all; ([ - bcmath calendar curl ctype dom exif fileinfo filter ftp gd - gettext gmp iconv intl json ldap mbstring mysqli mysqlnd opcache - openssl pcntl pdo pdo_mysql pdo_odbc pdo_pgsql pdo_sqlite pgsql - posix readline session simplexml sockets soap sodium sqlite3 - tokenizer xmlreader xmlwriter zip zlib - ] ++ lib.optionals (!stdenv.isDarwin) [ imap ]); - - defaultPhpExtensionsWithHash = { all, ... }: - (defaultPhpExtensions { inherit all; }) ++ [ all.hash ]; - - php74 = php74base.withExtensions defaultPhpExtensions; - php73 = php73base.withExtensions defaultPhpExtensionsWithHash; - -in { - inherit php73 php74; -} +in generic diff --git a/third_party/nixpkgs/pkgs/development/interpreters/racket/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/racket/default.nix index b62df6e837..6de4ab6da3 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/racket/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/racket/default.nix @@ -46,7 +46,7 @@ in stdenv.mkDerivation rec { pname = "racket"; - version = "7.8"; # always change at once with ./minimal.nix + version = "7.9"; # always change at once with ./minimal.nix src = (stdenv.lib.makeOverridable ({ name, sha256 }: fetchurl { @@ -55,7 +55,7 @@ stdenv.mkDerivation rec { } )) { name = "${pname}-${version}"; - sha256 = "19z3dayybcra277s4gk2mppalwawd93f2b16xyrb6d7rbbfz7j9j"; + sha256 = "18pz6gjzqy6a62xkcmjanhr7kgxpvpmc0blrk4igz8ldcybz44if"; }; FONTCONFIG_FILE = fontsConf; @@ -72,7 +72,7 @@ stdenv.mkDerivation rec { preConfigure = '' unset AR - for f in src/lt/configure src/cs/c/configure src/racket/src/string.c; do + for f in src/lt/configure src/cs/c/configure src/bc/src/string.c; do substituteInPlace "$f" --replace /usr/bin/uname ${coreutils}/bin/uname done mkdir src/build diff --git a/third_party/nixpkgs/pkgs/development/interpreters/racket/minimal.nix b/third_party/nixpkgs/pkgs/development/interpreters/racket/minimal.nix index abff21c798..656546dcb6 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/racket/minimal.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/racket/minimal.nix @@ -5,7 +5,7 @@ racket.overrideAttrs (oldAttrs: rec { name = "racket-minimal-${oldAttrs.version}"; src = oldAttrs.src.override { inherit name; - sha256 = "0bbglf9vfacpm2hn3lskhvc8cpg6z088fbnzpqsn17z8qdk8yvb3"; + sha256 = "0xvnd7afx058sg7j51bmbikqgn4sl0246nkhr8zlqcrbr3nqi6p4"; }; meta = oldAttrs.meta // { diff --git a/third_party/nixpkgs/pkgs/development/interpreters/ruby/rubygems/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/ruby/rubygems/default.nix index 0bbcadba3f..8263a987d6 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/ruby/rubygems/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/ruby/rubygems/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { name = "rubygems"; - version = "3.1.2"; + version = "3.1.3"; src = fetchurl { url = "https://rubygems.org/rubygems/rubygems-${version}.tgz"; - sha256 = "0h7ij4jpj8rgnpkl63cwh2lnav73pw5wpfqra3va7077lsyadlgd"; + sha256 = "181wjclxnq5lrwnr53famy9pg8911hi9w2v0vy7dqgjqnc4iy1hp"; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/development/interpreters/spidermonkey/78.nix b/third_party/nixpkgs/pkgs/development/interpreters/spidermonkey/78.nix index 84897ee846..a3d7242f45 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/spidermonkey/78.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/spidermonkey/78.nix @@ -21,11 +21,11 @@ stdenv.mkDerivation rec { pname = "spidermonkey"; - version = "78.1.0"; + version = "78.4.0"; src = fetchurl { url = "mirror://mozilla/firefox/releases/${version}esr/source/firefox-${version}esr.source.tar.xz"; - sha256 = "18k47dl9hbnpqw69csxjar5dhwa7r8k7j9kvcfgmwb1iv6ba601n"; + sha256 = "1z3hj45bnd12z3g6ajv9qrgclca7fymi1sxj9l9nh9q6y6xz0g4f"; }; outputs = [ "out" "dev" ]; @@ -52,18 +52,6 @@ stdenv.mkDerivation rec { zlib ]; - patches = [ - # https://mail.gnome.org/archives/distributor-list/2020-August/msg00000.html - (fetchpatch { - url = "https://github.com/ptomato/mozjs/commit/b2974f8a6558d2dc4517b49ee313a9900a853285.patch"; - sha256 = "1bl5mbx7gmad6fmpc427263i1ychi2linpg69kxlr2w91r5m6ji3"; - }) - (fetchpatch { - url = "https://github.com/ptomato/mozjs/commit/e5a2eb99f653ae03c67e536df1d55d265a0a1605.patch"; - sha256 = "0xhy63nw2byibmjc41yh6dwpg282nylganrs5aprn9pbqbcpsvif"; - }) - ]; - preConfigure = '' export CXXFLAGS="-fpermissive" export LIBXUL_DIST=$out @@ -101,9 +89,9 @@ stdenv.mkDerivation rec { # Remove unnecessary static lib preFixup = '' - moveToOutput bin/js60-config "$dev" + moveToOutput bin/js78-config "$dev" rm $out/lib/libjs_static.ajs - ln -s $out/bin/js60 $out/bin/js + ln -s $out/bin/js78 $out/bin/js ''; enableParallelBuilding = true; @@ -112,7 +100,7 @@ stdenv.mkDerivation rec { description = "Mozilla's JavaScript engine written in C/C++"; homepage = "https://developer.mozilla.org/en/SpiderMonkey"; license = licenses.gpl2; # TODO: MPL/GPL/LGPL tri-license. - maintainers = [ maintainers.abbradar ]; + maintainers = with maintainers; [ abbradar lostnet ]; platforms = platforms.linux; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/amdvlk/default.nix b/third_party/nixpkgs/pkgs/development/libraries/amdvlk/default.nix index fdbff329c1..033780b8ef 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/amdvlk/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/amdvlk/default.nix @@ -21,13 +21,13 @@ let in stdenv.mkDerivation rec { pname = "amdvlk"; - version = "2020.Q4.2"; + version = "2020.Q4.3"; src = fetchRepoProject { name = "${pname}-src"; manifest = "https://github.com/GPUOpen-Drivers/AMDVLK.git"; rev = "refs/tags/v-${version}"; - sha256 = "qqP95+K8G9Z3Da1pUT9EGAUi83IM50qI9eZxpp7Vlqg="; + sha256 = "O1+w2R9Fvoc+1vegiCkBA9pE/yi/p0aK82fY4jML/2c="; }; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/enchant/2.x.nix b/third_party/nixpkgs/pkgs/development/libraries/enchant/2.x.nix index b7b86de92c..cbc3f21732 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/enchant/2.x.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/enchant/2.x.nix @@ -10,13 +10,13 @@ stdenv.mkDerivation rec { pname = "enchant"; - version = "2.2.11"; + version = "2.2.12"; outputs = [ "out" "dev" ]; src = fetchurl { url = "https://github.com/AbiWord/${pname}/releases/download/v${version}/${pname}-${version}.tar.gz"; - sha256 = "opxXd8TkX8rCWVwVxJ1tKqQ0+l58mT3/P582e2X+Ryo="; + sha256 = "0zi20s62gax9rkhwj318kqrxa62pmks6dsdd6m9pzvhlwy5cb6vb"; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/expat/default.nix b/third_party/nixpkgs/pkgs/development/libraries/expat/default.nix index a356d7be1a..29d2c2b3ac 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/expat/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/expat/default.nix @@ -1,16 +1,18 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchurl, lib }: # Note: this package is used for bootstrapping fetchurl, and thus # cannot use fetchpatch! All mutable patches (generated by GitHub or # cgit) that are needed here should be included directly in Nixpkgs as # files. -stdenv.mkDerivation rec { - name = "expat-2.2.8"; +let + version = "2.2.10"; +in stdenv.mkDerivation rec { + name = "expat-${version}"; src = fetchurl { - url = "https://github.com/libexpat/libexpat/releases/download/R_2_2_8/${name}.tar.xz"; - sha256 = "16vpj5mk3lps3x7fr8cs03rffx3ir4jilyqw0frayn6q94daijk1"; + url = "https://github.com/libexpat/libexpat/releases/download/R_${lib.replaceStrings ["."] ["_"] version}/${name}.tar.xz"; + sha256 = "sha256-Xf5Tj4tbY/A+mO2sUg19mmpNIuSC5cltTQb8xUhcJfI="; }; outputs = [ "out" "dev" ]; # TODO: fix referrers diff --git a/third_party/nixpkgs/pkgs/development/libraries/freetype/default.nix b/third_party/nixpkgs/pkgs/development/libraries/freetype/default.nix index 24757af09e..b87e64c2af 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/freetype/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/freetype/default.nix @@ -14,7 +14,7 @@ let in stdenv.mkDerivation rec { pname = "freetype"; - version = "2.10.2"; + version = "2.10.4"; meta = with stdenv.lib; { description = "A font rendering engine"; @@ -33,7 +33,7 @@ in stdenv.mkDerivation rec { src = fetchurl { url = "mirror://savannah/${pname}/${pname}-${version}.tar.xz"; - sha256 = "12rd181yzz6952cyjqaa4253f5szam93cmhw18p33rnj4l8dchqm"; + sha256 = "112pyy215chg7f7fmp2l9374chhhpihbh8wgpj5nj6avj3c59a46"; }; propagatedBuildInputs = [ zlib bzip2 libpng ]; # needed when linking against freetype diff --git a/third_party/nixpkgs/pkgs/development/libraries/gamin/abstract-socket-namespace.patch b/third_party/nixpkgs/pkgs/development/libraries/gamin/abstract-socket-namespace.patch new file mode 100644 index 0000000000..ff16105597 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/gamin/abstract-socket-namespace.patch @@ -0,0 +1,73 @@ +From 737452159d521aef2041a2767f3ebf9f68f4b6a9 Mon Sep 17 00:00:00 2001 +From: Christian Kampka +Date: Tue, 1 Sep 2020 13:54:35 +0200 +Subject: [PATCH] Pin abstract namespace sockets to host_os + +Running programs with AC_RUN_IFELSE fails when cross-compiling. +Since abstract namespace sockets are linux feature, we can easily +assume it is available for linux and not for darwin. +--- + configure.in | 47 ++++++----------------------------------------- + 1 file changed, 6 insertions(+), 41 deletions(-) + +diff --git a/configure.in b/configure.in +index eb129db..0ed82ba 100644 +--- a/configure.in ++++ b/configure.in +@@ -387,47 +387,12 @@ fi + + #### Abstract sockets + +-AC_MSG_CHECKING(abstract socket namespace) +-AC_LANG_PUSH(C) +-AC_RUN_IFELSE([AC_LANG_PROGRAM( +-[[ +-#include +-#include +-#include +-#include +-#include +-#include +-#include +-]], +-[[ +- int listen_fd; +- struct sockaddr_un addr; +- +- listen_fd = socket (PF_UNIX, SOCK_STREAM, 0); +- +- if (listen_fd < 0) +- { +- fprintf (stderr, "socket() failed: %s\n", strerror (errno)); +- exit (1); +- } +- +- memset (&addr, '\0', sizeof (addr)); +- addr.sun_family = AF_UNIX; +- strcpy (addr.sun_path, "X/tmp/dbus-fake-socket-path-used-in-configure-test"); +- addr.sun_path[0] = '\0'; /* this is what makes it abstract */ +- +- if (bind (listen_fd, (struct sockaddr*) &addr, SUN_LEN (&addr)) < 0) +- { +- fprintf (stderr, "Abstract socket namespace bind() failed: %s\n", +- strerror (errno)); +- exit (1); +- } +- else +- exit (0); +-]])], +- [have_abstract_sockets=yes], +- [have_abstract_sockets=no]) +-AC_LANG_POP(C) ++AC_MSG_CHECKING([whether target os has abstract socket namespace]) ++if test x$target_os = xlinux-gnu ; then ++ have_abstract_sockets=yes ++else ++ have_abstract_sockets=no ++fi + AC_MSG_RESULT($have_abstract_sockets) + + if test x$enable_abstract_sockets = xyes; then +-- +2.25.4 + diff --git a/third_party/nixpkgs/pkgs/development/libraries/gamin/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gamin/default.nix index 38451571d8..89096c8874 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gamin/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gamin/default.nix @@ -1,6 +1,8 @@ -{ stdenv, fetchurl, fetchpatch, pkgconfig, glib }: +{ stdenv, fetchurl, fetchpatch, pkgconfig, glib, autoreconfHook }: -stdenv.mkDerivation (rec { +let + cross = stdenv.hostPlatform != stdenv.buildPlatform; +in stdenv.mkDerivation (rec { name = "gamin-0.1.10"; src = fetchurl { @@ -8,7 +10,7 @@ stdenv.mkDerivation (rec { sha256 = "18cr51y5qacvs2fc2p1bqv32rs8bzgs6l67zhasyl45yx055y218"; }; - nativeBuildInputs = [ pkgconfig ]; + nativeBuildInputs = [ pkgconfig autoreconfHook ]; buildInputs = [ glib ]; @@ -27,7 +29,7 @@ stdenv.mkDerivation (rec { name = "fix-pthread-mutex.patch"; url = "https://git.alpinelinux.org/aports/plain/main/gamin/fix-pthread-mutex.patch?h=3.4-stable&id=a1a836b089573752c1b0da7d144c0948b04e8ea8"; sha256 = "13igdbqsxb3sz0h417k6ifmq2n4siwqspj6slhc7fdl5wd1fxmdz"; - }); + }) ++ stdenv.lib.optional (cross) ./abstract-socket-namespace.patch ; meta = with stdenv.lib; { diff --git a/third_party/nixpkgs/pkgs/development/libraries/gtk/2.x.nix b/third_party/nixpkgs/pkgs/development/libraries/gtk/2.x.nix index e01034a3d5..d13e3636ba 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gtk/2.x.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gtk/2.x.nix @@ -19,9 +19,6 @@ in stdenv.mkDerivation rec { name = "${pname}-${version}"; - # passthru to prevent rebuild but allow pname and version - passthru = { inherit pname version; }; - src = fetchurl { url = "mirror://gnome/sources/gtk+/2.24/${pname}-${version}.tar.xz"; sha256 = "b6c8a93ddda5eabe3bfee1eb39636c9a03d2a56c7b62828b359bf197943c582e"; @@ -78,6 +75,8 @@ stdenv.mkDerivation rec { ''; passthru = { + # passthru to prevent rebuild but allow pname and version + inherit pname version; gtkExeEnvPostBuild = '' rm $out/lib/gtk-2.0/2.10.0/immodules.cache $out/bin/gtk-query-immodules-2.0 $out/lib/gtk-2.0/2.10.0/immodules/*.so > $out/lib/gtk-2.0/2.10.0/immodules.cache diff --git a/third_party/nixpkgs/pkgs/development/libraries/harfbuzz/default.nix b/third_party/nixpkgs/pkgs/development/libraries/harfbuzz/default.nix index 8110f13d14..6c5703f521 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/harfbuzz/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/harfbuzz/default.nix @@ -11,7 +11,7 @@ }: let - version = "2.7.1"; + version = "2.7.2"; inherit (stdenv.lib) optional optionals optionalString; mesonFeatureFlag = opt: b: "-D${opt}=${if b then "enabled" else "disabled"}"; @@ -24,7 +24,7 @@ stdenv.mkDerivation { owner = "harfbuzz"; repo = "harfbuzz"; rev = version; - sha256 = "172jmwp666xbs6yy1pc2495gnkz8xw11b8zkz3j19jxlvvp4mxcs"; + sha256 = "0vfyxr3lvzp80j1347nrwpr1ndv265p15rj2q8rj31lb26nyz4dm"; }; postPatch = '' 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 cb8c0a1cb1..498265a5a2 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 @@ -5,13 +5,13 @@ stdenv.mkDerivation rec { pname = "intel-media-driver"; - version = "20.3.0"; + version = "20.4.0"; src = fetchFromGitHub { owner = "intel"; repo = "media-driver"; rev = "intel-media-${version}"; - sha256 = "0dy30g32iqyygap3cm1idbhwnm1p3qvf2j2nzcr9n5im287h5gcr"; + sha256 = "0nah3h3s6hqbgz1wqp5j1grzq0q939wbh4b9d27dmb4wy6ma41sl"; }; cmakeFlags = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/java/lombok/default.nix b/third_party/nixpkgs/pkgs/development/libraries/java/lombok/default.nix index 5928d99b6c..5a12100360 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/java/lombok/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/java/lombok/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "lombok-1.18.12"; + name = "lombok-1.18.16"; src = fetchurl { url = "https://projectlombok.org/downloads/${name}.jar"; - sha256 = "01jl6i5wzjxyk36fcq6ji90x9h143gvnwhv86cbkqaxhxh41af29"; + sha256 = "1msys7xkaj0d7fi112fmb2z50mk46db58agzrrdyimggsszwn1kj"; }; buildCommand = '' diff --git a/third_party/nixpkgs/pkgs/development/libraries/jbig2dec/default.nix b/third_party/nixpkgs/pkgs/development/libraries/jbig2dec/default.nix index a6eb564239..4004c9f387 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/jbig2dec/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/jbig2dec/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "jbig2dec"; - version = "0.18"; + version = "0.19"; src = fetchurl { - url = "https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs952/${pname}-${version}.tar.gz"; - sha256 = "0pigfw2v0ppvr0lbysm69gx0zsa5q2q92yrb8af2j3im6x97f6cy"; + url = "https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs9533/${pname}-${version}.tar.gz"; + sha256 = "0dwa24kjqyg9hmm40fh048sdxfpnasz43l2rm8wlkw1qbdlpd517"; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/libraries/kdsoap/default.nix b/third_party/nixpkgs/pkgs/development/libraries/kdsoap/default.nix index dde2e5cb1a..50ba2c300b 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/kdsoap/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/kdsoap/default.nix @@ -4,7 +4,7 @@ }: let - version = "1.9.0"; + version = "1.9.1"; in mkDerivation { @@ -24,7 +24,7 @@ mkDerivation { }; src = fetchurl { url = "https://github.com/KDAB/KDSoap/releases/download/kdsoap-${version}/kdsoap-${version}.tar.gz"; - sha256 = "0a28k48cmagqxhaayyrqnxsx1zbvw4f06dgs16kl33xhbinn5fg3"; + sha256 = "09rxx7h98niawz7i94g279c2rgh7xmq1hqxwlyzwsaqsx4kfl850"; }; outputs = [ "out" "dev" ]; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libfilezilla/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libfilezilla/default.nix index 455d42e305..e5b76b1435 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libfilezilla/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libfilezilla/default.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation rec { pname = "libfilezilla"; - version = "0.24.1"; + version = "0.25.0"; src = fetchurl { url = "https://download.filezilla-project.org/${pname}/${pname}-${version}.tar.bz2"; - sha256 = "sha256-/dW07hkWr3sdQC591GfwXfdiS7ZfuVoIdaA3EuzC1v0="; + sha256 = "0akvki7n5rwmc52wss25i3h4nwl935flhjypf8dx3lvf4jszxxiv"; }; nativeBuildInputs = [ autoreconfHook pkgconfig ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libfprint/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libfprint/default.nix index 7c6168c3d3..cc4e7dfefe 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libfprint/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libfprint/default.nix @@ -16,7 +16,7 @@ stdenv.mkDerivation rec { pname = "libfprint"; - version = "1.90.2"; + version = "1.90.3"; outputs = [ "out" "devdoc" ]; src = fetchFromGitLab { @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { owner = "libfprint"; repo = pname; rev = "v${version}"; - sha256 = "0g890y49anqd7yfz86iyvywxgbfmfmj6813fy58m5n8jain7iy1b"; + sha256 = "1fs0qrfrqnvc6kcsg81l5p89n8jnsx9dr1pzxpb8ghwas8c9v52i"; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/libgpiod/0001-Drop-AC_FUNC_MALLOC-and-_REALLOC-and-check-for-them-.patch b/third_party/nixpkgs/pkgs/development/libraries/libgpiod/0001-Drop-AC_FUNC_MALLOC-and-_REALLOC-and-check-for-them-.patch new file mode 100644 index 0000000000..f2ee8e8d3d --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/libgpiod/0001-Drop-AC_FUNC_MALLOC-and-_REALLOC-and-check-for-them-.patch @@ -0,0 +1,31 @@ +From 2cc80dc06ea42087788cf27b31821ffa99a22f89 Mon Sep 17 00:00:00 2001 +From: Johannes Lode +Date: Thu, 14 Nov 2019 10:44:00 +0100 +Subject: [PATCH] Drop AC_FUNC_MALLOC and _REALLOC and check for them as + regular functions. + +While cross-compiling there occurred "undefined reference to +`rpl_malloc'", the suggested change fixes the problem. + +Tested for native X86_64 and armv7a-unknown-linux-gnueabihf. +--- + configure.ac | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) + +diff --git a/configure.ac b/configure.ac +index 008499d..b492dc4 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -81,7 +81,8 @@ AC_DEFUN([HEADER_NOT_FOUND_CXX], + + # This is always checked (library needs this) + AC_HEADER_STDC +-AC_FUNC_MALLOC ++# AC_FUNC_MALLOC -- does not work while cross-compiling ++AC_CHECK_FUNC([malloc realloc]) + AC_CHECK_FUNC([ioctl], [], [FUNC_NOT_FOUND_LIB([ioctl])]) + AC_CHECK_FUNC([asprintf], [], [FUNC_NOT_FOUND_LIB([asprintf])]) + AC_CHECK_FUNC([scandir], [], [FUNC_NOT_FOUND_LIB([scandir])]) +-- +2.25.1 + diff --git a/third_party/nixpkgs/pkgs/development/libraries/libgpiod/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libgpiod/default.nix index 68078bbc9a..23ef2c067a 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libgpiod/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libgpiod/default.nix @@ -4,13 +4,19 @@ stdenv.mkDerivation rec { pname = "libgpiod"; - version = "1.5.2"; + version = "1.6"; src = fetchurl { url = "https://git.kernel.org/pub/scm/libs/libgpiod/libgpiod.git/snapshot/libgpiod-${version}.tar.gz"; - sha256 = "1bknh7kn5gxc8xwf913lsdm9zgn1bwj42nsnp6kbkyn6ip7s6c4r"; + sha256 = "0xcwrg4p4w925lijmz4ci4500z83kj5gs1n501q4vhi54bdzn2k5"; }; + patches = [ + # cross compiling fix + # https://github.com/brgl/libgpiod/pull/45 + ./0001-Drop-AC_FUNC_MALLOC-and-_REALLOC-and-check-for-them-.patch + ]; + buildInputs = [ kmod ] ++ lib.optionals enablePython [ python3 ncurses ]; nativeBuildInputs = [ autoconf-archive diff --git a/third_party/nixpkgs/pkgs/development/libraries/libical/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libical/default.nix index c03367da97..62034a7bce 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libical/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libical/default.nix @@ -91,7 +91,7 @@ stdenv.mkDerivation rec { runHook preInstallCheck export TZDIR=${tzdata}/share/zoneinfo - ctest --output-on-failure + ctest --output-on-failure --exclude-regex 'regression|recur|timezones|libical-glib-array|libical-glib-component|libical-glib-timezone' runHook postInstallCheck ''; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libinput/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libinput/default.nix index 576a2fec92..3a65108751 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libinput/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libinput/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl, pkgconfig, meson, ninja +{ stdenv, fetchFromGitLab, pkgconfig, meson, ninja , libevdev, mtdev, udev, libwacom , documentationSupport ? false, doxygen ? null, graphviz ? null # Documentation , eventGUISupport ? false, cairo ? null, glib ? null, gtk3 ? null # GUI event viewer support @@ -27,11 +27,14 @@ in with stdenv.lib; stdenv.mkDerivation rec { pname = "libinput"; - version = "1.16.1"; + version = "1.16.2"; - src = fetchurl { - url = "https://www.freedesktop.org/software/libinput/${pname}-${version}.tar.xz"; - sha256 = "e6fRru3RUWi7IdF+nmKKocJ5V5Y6Qjo/6jk4pQF1hTk="; + src = fetchFromGitLab { + domain = "gitlab.freedesktop.org"; + owner = pname; + repo = pname; + rev = version; + sha256 = "0qii6yh3dlhgv9z970cpzbz19ii8zjvq4k7pg75sy2gmia7smwd1"; }; outputs = [ "bin" "out" "dev" ]; @@ -80,7 +83,7 @@ stdenv.mkDerivation rec { meta = { description = "Handles input devices in Wayland compositors and provides a generic X.Org input driver"; - homepage = "http://www.freedesktop.org/wiki/Software/libinput"; + homepage = "https://www.freedesktop.org/wiki/Software/libinput/"; license = licenses.mit; platforms = platforms.unix; maintainers = with maintainers; [ codyopel ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libjcat/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libjcat/default.nix index bbf0db2338..1eca110f8c 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libjcat/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libjcat/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation rec { pname = "libjcat"; - version = "0.1.3"; + version = "0.1.4"; outputs = [ "bin" "out" "dev" "devdoc" "man" "installedTests" ]; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { owner = "hughsie"; repo = "libjcat"; rev = version; - sha256 = "157bi1v9qqk45rkq7lg08l7g3bxwacl4h89vnr7msjmg0hri36kc"; + sha256 = "156sykcdzdfmd7va59qld4gyzhbf2yk1dfgifi494g6i99zyigfh"; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/libmwaw/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libmwaw/default.nix index fbba02fcd0..2ab23015af 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libmwaw/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libmwaw/default.nix @@ -3,11 +3,11 @@ let s = # Generated upstream information rec { baseName="libmwaw"; - version="0.3.16"; + version="0.3.17"; name="${baseName}-${version}"; - hash="0s0qvrmxzs8wv4304p7zx9mrasglyaszafqrfmaxwyr9lpdrwqqc"; - url="mirror://sourceforge/libmwaw/libmwaw/libmwaw-0.3.16/libmwaw-0.3.16.tar.xz"; - sha256="0s0qvrmxzs8wv4304p7zx9mrasglyaszafqrfmaxwyr9lpdrwqqc"; + hash="074ipcq9w7jbd5x316dzclddgia2ydw098ph9d7p3d713pmkf5cf"; + url="mirror://sourceforge/libmwaw/libmwaw/libmwaw-0.3.17/libmwaw-0.3.17.tar.xz"; + sha256="074ipcq9w7jbd5x316dzclddgia2ydw098ph9d7p3d713pmkf5cf"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libqalculate/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libqalculate/default.nix index 11816beee0..bc142b0a57 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libqalculate/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libqalculate/default.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "libqalculate"; - version = "3.13.0"; + version = "3.14.0"; src = fetchFromGitHub { owner = "qalculate"; repo = "libqalculate"; rev = "v${version}"; - sha256 = "0nd0hrnp0a9p7hy6l6s45kfd267r7qg91aqn8g2dyam5hngskayk"; + sha256 = "1j4sr9s7152xmci677pnz64spv8s3ia26fbp5cqx8ydv7swlivh2"; }; outputs = [ "out" "dev" "doc" ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libsolv/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libsolv/default.nix index d559efd3aa..65ab87a0cf 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libsolv/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libsolv/default.nix @@ -1,14 +1,14 @@ { stdenv, fetchFromGitHub, cmake, ninja, zlib, expat, rpm, db }: stdenv.mkDerivation rec { - version = "0.7.14"; + version = "0.7.16"; pname = "libsolv"; src = fetchFromGitHub { owner = "openSUSE"; repo = "libsolv"; rev = version; - sha256 = "10klbgknl2njbjl4k0l50ii7afwqrl1691ar4ry3snmc8chb1z7g"; + sha256 = "1arw7p83s5yq36pw94b76zfiqsh90fjjnayni54a5wgm0zvbkki8"; }; cmakeFlags = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/libvirt/5.9.0.nix b/third_party/nixpkgs/pkgs/development/libraries/libvirt/5.9.0.nix index 722c4a53b8..7a023d9489 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libvirt/5.9.0.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libvirt/5.9.0.nix @@ -36,12 +36,12 @@ in stdenv.mkDerivation rec { nativeBuildInputs = [ makeWrapper pkgconfig rpcsvc-proto ]; buildInputs = [ libxml2 gnutls perl python2 readline gettext libtasn1 libgcrypt yajl - libxslt xhtml1 perlPackages.XMLXPath curl libpcap glib libtirpc + libxslt xhtml1 perlPackages.XMLXPath curl libpcap glib ] ++ optionals (!buildFromTarball) [ libtool autoconf automake ] ++ optionals stdenv.isLinux [ libpciaccess lvm2 utillinux systemd libnl numad zfs - libapparmor libcap_ng numactl attr parted + libapparmor libcap_ng numactl attr parted libtirpc ] ++ optionals (enableXen && stdenv.isLinux && stdenv.isx86_64) [ xen ] ++ optionals enableIscsi [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/libvpx/CVE-2019-9232.CVE-2019-9325.CVE-2019-9371.CVE-2019-9433.patch b/third_party/nixpkgs/pkgs/development/libraries/libvpx/CVE-2019-9232.CVE-2019-9325.CVE-2019-9371.CVE-2019-9433.patch deleted file mode 100644 index 552c4e08d5..0000000000 --- a/third_party/nixpkgs/pkgs/development/libraries/libvpx/CVE-2019-9232.CVE-2019-9325.CVE-2019-9371.CVE-2019-9433.patch +++ /dev/null @@ -1,211 +0,0 @@ -Backports of - -From 46e17f0cb4a80b36755c84b8bf15731d3386c08f Mon Sep 17 00:00:00 2001 -From: kyslov -Date: Fri, 4 Jan 2019 17:04:09 -0800 -Subject: [PATCH] Fix OOB memory access on fuzzed data - -From 0681cff1ad36b3ef8ec242f59b5a6c4234ccfb88 Mon Sep 17 00:00:00 2001 -From: James Zern -Date: Tue, 24 Jul 2018 21:36:50 -0700 -Subject: [PATCH] vp9: fix OOB read in decoder_peek_si_internal - -From f00890eecdf8365ea125ac16769a83aa6b68792d Mon Sep 17 00:00:00 2001 -From: James Zern -Date: Tue, 11 Dec 2018 18:06:20 -0800 -Subject: [PATCH] update libwebm to libwebm-1.0.0.27-352-g6ab9fcf - -From 34d54b04e98dd0bac32e9aab0fbda0bf501bc742 Mon Sep 17 00:00:00 2001 -From: James Zern -Date: Tue, 9 Apr 2019 18:37:44 -0700 -Subject: [PATCH] update libwebm to libwebm-1.0.0.27-358-gdbf1d10 - -From 52add5896661d186dec284ed646a4b33b607d2c7 Mon Sep 17 00:00:00 2001 -From: Jerome Jiang -Date: Wed, 23 May 2018 15:43:00 -0700 -Subject: [PATCH] VP8: Fix use-after-free in postproc. - -to address CVE-2019-9232 CVE-2019-9325 CVE-2019-9371 CVE-2019-9433 - ---- libvpx-1.7.0.orig/test/decode_api_test.cc -+++ libvpx-1.7.0/test/decode_api_test.cc -@@ -138,8 +138,30 @@ TEST(DecodeAPI, Vp9InvalidDecode) { - EXPECT_EQ(VPX_CODEC_OK, vpx_codec_destroy(&dec)); - } - --TEST(DecodeAPI, Vp9PeekSI) { -+void TestPeekInfo(const uint8_t *const data, uint32_t data_sz, -+ uint32_t peek_size) { - const vpx_codec_iface_t *const codec = &vpx_codec_vp9_dx_algo; -+ // Verify behavior of vpx_codec_decode. vpx_codec_decode doesn't even get -+ // to decoder_peek_si_internal on frames of size < 8. -+ if (data_sz >= 8) { -+ vpx_codec_ctx_t dec; -+ EXPECT_EQ(VPX_CODEC_OK, vpx_codec_dec_init(&dec, codec, NULL, 0)); -+ EXPECT_EQ((data_sz < peek_size) ? VPX_CODEC_UNSUP_BITSTREAM -+ : VPX_CODEC_CORRUPT_FRAME, -+ vpx_codec_decode(&dec, data, data_sz, NULL, 0)); -+ vpx_codec_iter_t iter = NULL; -+ EXPECT_EQ(NULL, vpx_codec_get_frame(&dec, &iter)); -+ EXPECT_EQ(VPX_CODEC_OK, vpx_codec_destroy(&dec)); -+ } -+ -+ // Verify behavior of vpx_codec_peek_stream_info. -+ vpx_codec_stream_info_t si; -+ si.sz = sizeof(si); -+ EXPECT_EQ((data_sz < peek_size) ? VPX_CODEC_UNSUP_BITSTREAM : VPX_CODEC_OK, -+ vpx_codec_peek_stream_info(codec, data, data_sz, &si)); -+} -+ -+TEST(DecodeAPI, Vp9PeekStreamInfo) { - // The first 9 bytes are valid and the rest of the bytes are made up. Until - // size 10, this should return VPX_CODEC_UNSUP_BITSTREAM and after that it - // should return VPX_CODEC_CORRUPT_FRAME. -@@ -150,24 +172,18 @@ TEST(DecodeAPI, Vp9PeekSI) { - }; - - for (uint32_t data_sz = 1; data_sz <= 32; ++data_sz) { -- // Verify behavior of vpx_codec_decode. vpx_codec_decode doesn't even get -- // to decoder_peek_si_internal on frames of size < 8. -- if (data_sz >= 8) { -- vpx_codec_ctx_t dec; -- EXPECT_EQ(VPX_CODEC_OK, vpx_codec_dec_init(&dec, codec, NULL, 0)); -- EXPECT_EQ( -- (data_sz < 10) ? VPX_CODEC_UNSUP_BITSTREAM : VPX_CODEC_CORRUPT_FRAME, -- vpx_codec_decode(&dec, data, data_sz, NULL, 0)); -- vpx_codec_iter_t iter = NULL; -- EXPECT_EQ(NULL, vpx_codec_get_frame(&dec, &iter)); -- EXPECT_EQ(VPX_CODEC_OK, vpx_codec_destroy(&dec)); -- } -- -- // Verify behavior of vpx_codec_peek_stream_info. -- vpx_codec_stream_info_t si; -- si.sz = sizeof(si); -- EXPECT_EQ((data_sz < 10) ? VPX_CODEC_UNSUP_BITSTREAM : VPX_CODEC_OK, -- vpx_codec_peek_stream_info(codec, data, data_sz, &si)); -+ TestPeekInfo(data, data_sz, 10); -+ } -+} -+ -+TEST(DecodeAPI, Vp9PeekStreamInfoTruncated) { -+ // This profile 1 header requires 10.25 bytes, ensure -+ // vpx_codec_peek_stream_info doesn't over read. -+ const uint8_t profile1_data[10] = { 0xa4, 0xe9, 0x30, 0x68, 0x53, -+ 0xe9, 0x30, 0x68, 0x53, 0x04 }; -+ -+ for (uint32_t data_sz = 1; data_sz <= 10; ++data_sz) { -+ TestPeekInfo(profile1_data, data_sz, 11); - } - } - #endif // CONFIG_VP9_DECODER ---- libvpx-1.7.0.orig/third_party/libwebm/mkvparser/mkvparser.cc -+++ libvpx-1.7.0/third_party/libwebm/mkvparser/mkvparser.cc -@@ -5307,8 +5307,8 @@ long VideoTrack::Parse(Segment* pSegment - - const long long stop = pos + s.size; - -- Colour* colour = NULL; -- Projection* projection = NULL; -+ std::unique_ptr colour_ptr; -+ std::unique_ptr projection_ptr; - - while (pos < stop) { - long long id, size; -@@ -5357,11 +5357,19 @@ long VideoTrack::Parse(Segment* pSegment - if (rate <= 0) - return E_FILE_FORMAT_INVALID; - } else if (id == libwebm::kMkvColour) { -- if (!Colour::Parse(pReader, pos, size, &colour)) -+ Colour* colour = NULL; -+ if (!Colour::Parse(pReader, pos, size, &colour)) { - return E_FILE_FORMAT_INVALID; -+ } else { -+ colour_ptr.reset(colour); -+ } - } else if (id == libwebm::kMkvProjection) { -- if (!Projection::Parse(pReader, pos, size, &projection)) -+ Projection* projection = NULL; -+ if (!Projection::Parse(pReader, pos, size, &projection)) { - return E_FILE_FORMAT_INVALID; -+ } else { -+ projection_ptr.reset(projection); -+ } - } - - pos += size; // consume payload -@@ -5392,8 +5400,8 @@ long VideoTrack::Parse(Segment* pSegment - pTrack->m_display_unit = display_unit; - pTrack->m_stereo_mode = stereo_mode; - pTrack->m_rate = rate; -- pTrack->m_colour = colour; -- pTrack->m_projection = projection; -+ pTrack->m_colour = colour_ptr.release(); -+ pTrack->m_projection = projection_ptr.release(); - - pResult = pTrack; - return 0; // success ---- libvpx-1.7.0.orig/vp8/common/postproc.c -+++ libvpx-1.7.0/vp8/common/postproc.c -@@ -65,7 +65,7 @@ void vp8_deblock(VP8_COMMON *cm, YV12_BU - double level = 6.0e-05 * q * q * q - .0067 * q * q + .306 * q + .0065; - int ppl = (int)(level + .5); - -- const MODE_INFO *mode_info_context = cm->show_frame_mi; -+ const MODE_INFO *mode_info_context = cm->mi; - int mbr, mbc; - - /* The pixel thresholds are adjusted according to if or not the macroblock ---- libvpx-1.7.0.orig/vp8/decoder/dboolhuff.h -+++ libvpx-1.7.0/vp8/decoder/dboolhuff.h -@@ -76,7 +76,7 @@ static int vp8dx_decode_bool(BOOL_DECODE - } - - { -- register int shift = vp8_norm[range]; -+ const unsigned char shift = vp8_norm[(unsigned char)range]; - range <<= shift; - value <<= shift; - count -= shift; ---- libvpx-1.7.0.orig/vp9/vp9_dx_iface.c -+++ libvpx-1.7.0/vp9/vp9_dx_iface.c -@@ -97,7 +97,7 @@ static vpx_codec_err_t decoder_peek_si_i - const uint8_t *data, unsigned int data_sz, vpx_codec_stream_info_t *si, - int *is_intra_only, vpx_decrypt_cb decrypt_cb, void *decrypt_state) { - int intra_only_flag = 0; -- uint8_t clear_buffer[10]; -+ uint8_t clear_buffer[11]; - - if (data + data_sz <= data) return VPX_CODEC_INVALID_PARAM; - -@@ -158,6 +158,9 @@ static vpx_codec_err_t decoder_peek_si_i - if (profile > PROFILE_0) { - if (!parse_bitdepth_colorspace_sampling(profile, &rb)) - return VPX_CODEC_UNSUP_BITSTREAM; -+ // The colorspace info may cause vp9_read_frame_size() to need 11 -+ // bytes. -+ if (data_sz < 11) return VPX_CODEC_UNSUP_BITSTREAM; - } - rb.bit_offset += REF_FRAMES; // refresh_frame_flags - vp9_read_frame_size(&rb, (int *)&si->w, (int *)&si->h); ---- libvpx-1.7.0.orig/vpx_dsp/bitreader.h -+++ libvpx-1.7.0/vpx_dsp/bitreader.h -@@ -94,7 +94,7 @@ static INLINE int vpx_read(vpx_reader *r - } - - { -- register int shift = vpx_norm[range]; -+ const unsigned char shift = vpx_norm[(unsigned char)range]; - range <<= shift; - value <<= shift; - count -= shift; ---- libvpx-1.7.0.orig/vpx_dsp/bitreader_buffer.c -+++ libvpx-1.7.0/vpx_dsp/bitreader_buffer.c -@@ -23,7 +23,7 @@ int vpx_rb_read_bit(struct vpx_read_bit_ - rb->bit_offset = off + 1; - return bit; - } else { -- rb->error_handler(rb->error_handler_data); -+ if (rb->error_handler != NULL) rb->error_handler(rb->error_handler_data); - return 0; - } - } diff --git a/third_party/nixpkgs/pkgs/development/libraries/libvpx/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libvpx/default.nix index 007df403ff..83e60466c1 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libvpx/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libvpx/default.nix @@ -56,20 +56,16 @@ assert isCygwin -> unitTestsSupport && webmIOSupport && libyuvSupport; stdenv.mkDerivation rec { pname = "libvpx"; - version = "1.7.0"; + version = "1.9.0"; src = fetchFromGitHub { owner = "webmproject"; - repo = "libvpx"; + repo = pname; rev = "v${version}"; - sha256 = "0vvh89hvp8qg9an9vcmwb7d9k3nixhxaz6zi65qdjnd0i56kkcz6"; + sha256 = "16xv6ambc82g14h1y0q1vyy57wp6j9fbp0nk0wd5csnrw407rhry"; }; - patches = [ - ./CVE-2019-9232.CVE-2019-9325.CVE-2019-9371.CVE-2019-9433.patch - ]; - - postPatch = ''patchShebangs .''; + postPatch = "patchShebangs ."; outputs = [ "bin" "dev" "out" ]; setOutputFlags = false; @@ -135,6 +131,12 @@ stdenv.mkDerivation rec { experimentalFpMbStatsSupport || experimentalEmulateHardwareSupport) "experimental") ] ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform) [ + #"--extra-cflags=" + #"--extra-cxxflags=" + #"--prefix=" + #"--libc=" + #"--libdir=" + "--enable-external-build" # libvpx darwin targets include darwin version (ie. ARCH-darwinXX-gcc, XX being the darwin version) # See all_platforms: https://github.com/webmproject/libvpx/blob/master/configure # Darwin versions: 10.4=8, 10.5=9, 10.6=10, 10.7=11, 10.8=12, 10.9=13, 10.10=14 @@ -159,6 +161,10 @@ stdenv.mkDerivation rec { buildInputs = [ ] ++ optionals unitTestsSupport [ coreutils curl ]; + NIX_LDFLAGS = [ + "-lpthread" # fixes linker errors + ]; + enableParallelBuilding = true; postInstall = ''moveToOutput bin "$bin" ''; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libwebp/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libwebp/default.nix index d2a98c4a84..6d24ba7f2e 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libwebp/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libwebp/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchurl +{ stdenv, fetchFromGitHub, autoreconfHook, libtool , threadingSupport ? true # multi-threading , openglSupport ? false, freeglut ? null, libGL ? null, libGLU ? null # OpenGL (required for vwebp) , pngSupport ? true, libpng ? null # PNG image format @@ -27,13 +27,17 @@ in with stdenv.lib; stdenv.mkDerivation rec { pname = "libwebp"; - version = "1.0.3"; + version = "1.1.0"; - src = fetchurl { - url = "http://downloads.webmproject.org/releases/webp/${pname}-${version}.tar.gz"; - sha256 = "0kxk4sic34bln3k09mml7crvrmhj97swdk7b1ahbp5w6bj30f2p2"; + src = fetchFromGitHub { + owner = "webmproject"; + repo = pname; + rev = version; + sha256 = "1kl6qqa29ygqb2fpv140y59v539gdqx4vcf3mlaxhca2bks98qgm"; }; + prePatch = "patchShebangs ."; + configureFlags = [ (mkFlag threadingSupport "threading") (mkFlag openglSupport "gl") @@ -50,6 +54,7 @@ stdenv.mkDerivation rec { (mkFlag libwebpdecoderSupport "libwebpdecoder") ]; + nativeBuildInputs = [ autoreconfHook libtool ]; buildInputs = [ ] ++ optionals openglSupport [ freeglut libGL libGLU ] ++ optional pngSupport libpng diff --git a/third_party/nixpkgs/pkgs/development/libraries/linbox/default.nix b/third_party/nixpkgs/pkgs/development/libraries/linbox/default.nix index 09bd7e1209..4072dcd1d2 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/linbox/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/linbox/default.nix @@ -14,8 +14,7 @@ assert (!blas.isILP64) && (!lapack.isILP64); stdenv.mkDerivation rec { pname = "linbox"; - version = "1.6.3"; - + version = "1.6.3"; # TODO: Check postPatch script on update src = fetchFromGitHub { owner = "linbox-team"; @@ -36,6 +35,20 @@ stdenv.mkDerivation rec { fflas-ffpack ]; + patches = [ + # Remove inappropriate `const &` qualifiers on data members that can be + # modified via member functions. + # See also: https://github.com/linbox-team/linbox/pull/256 + ./patches/linbox-pr256-part2.patch # TODO: Remove on 1.7.0 update + ]; + + postPatch = '' + # Remove @LINBOXSAGE_LIBS@ that is actually undefined. + # See also: https://github.com/linbox-team/linbox/pull/249 + # TODO: Remove on 1.7.0 update + find . -type f -exec sed -e 's/@LINBOXSAGE_LIBS@//' -i {} \; + ''; + configureFlags = [ "--with-blas-libs=-lblas" "--disable-optimization" diff --git a/third_party/nixpkgs/pkgs/development/libraries/linbox/patches/linbox-pr256-part2.patch b/third_party/nixpkgs/pkgs/development/libraries/linbox/patches/linbox-pr256-part2.patch new file mode 100644 index 0000000000..ec8571a7d7 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/linbox/patches/linbox-pr256-part2.patch @@ -0,0 +1,13 @@ +--- a/linbox/algorithms/det-rational.h ++++ b/linbox/algorithms/det-rational.h +@@ -79,8 +79,8 @@ + struct MyRationalModularDet { + const Blackbox &A; + const MyMethod &M; +- const Integer &mul;//multiplicative prec; +- const Integer ÷ ++ Integer mul;//multiplicative prec; ++ Integer div; + + MyRationalModularDet(const Blackbox& b, const MyMethod& n, + const Integer & p1, const Integer & p2) : diff --git a/third_party/nixpkgs/pkgs/development/libraries/mesa/default.nix b/third_party/nixpkgs/pkgs/development/libraries/mesa/default.nix index aeeb0514fa..aa180b94d7 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/mesa/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/mesa/default.nix @@ -8,7 +8,7 @@ , galliumDrivers ? ["auto"] , driDrivers ? ["auto"] , vulkanDrivers ? ["auto"] -, eglPlatforms ? [ "x11" "surfaceless" ] ++ lib.optionals stdenv.isLinux [ "wayland" "drm" ] +, eglPlatforms ? [ "x11" ] ++ lib.optionals stdenv.isLinux [ "wayland" ] , OpenGL, Xplugin , withValgrind ? stdenv.hostPlatform.isLinux && !stdenv.hostPlatform.isAarch32, valgrind-light , enableGalliumNine ? stdenv.isLinux @@ -31,7 +31,7 @@ with stdenv.lib; let # Release calendar: https://www.mesa3d.org/release-calendar.html # Release frequency: https://www.mesa3d.org/releasing.html#schedule - version = "20.1.9"; + version = "20.2.1"; branch = versions.major version; in @@ -46,7 +46,7 @@ stdenv.mkDerivation { "ftp://ftp.freedesktop.org/pub/mesa/${version}/mesa-${version}.tar.xz" "ftp://ftp.freedesktop.org/pub/mesa/older-versions/${branch}.x/${version}/mesa-${version}.tar.xz" ]; - sha256 = "10kk8a8k7f4ip8yaiqdyrx162nbw8pw4h3b4hs4ha8mpd43wlldj"; + sha256 = "0ji4s1gwcvx3fbj9h0x5zbma6kw4b75vs0266zhc06r97yd6v96i"; }; prePatch = "patchShebangs ."; @@ -58,7 +58,6 @@ stdenv.mkDerivation { ./missing-includes.patch # dev_t needs sys/stat.h, time_t needs time.h, etc.-- fixes build w/musl ./opencl-install-dir.patch ./disk_cache-include-dri-driver-path-in-cache-key.patch - ./link-radv-with-ld_args_build_id.patch ] ++ lib.optionals stdenv.hostPlatform.isMusl [ # Fix `-Werror=int-conversion` pthread warnings on musl. diff --git a/third_party/nixpkgs/pkgs/development/libraries/mesa/disk_cache-include-dri-driver-path-in-cache-key.patch b/third_party/nixpkgs/pkgs/development/libraries/mesa/disk_cache-include-dri-driver-path-in-cache-key.patch index acf3d827c5..fa78f4ae73 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/mesa/disk_cache-include-dri-driver-path-in-cache-key.patch +++ b/third_party/nixpkgs/pkgs/development/libraries/mesa/disk_cache-include-dri-driver-path-in-cache-key.patch @@ -1,4 +1,4 @@ -From 46b10f2bc28fd79d561c8c49bbae3aee6a4cf0e6 Mon Sep 17 00:00:00 2001 +From 980164fd92f5c2302624cd046d30ff21e6e4ba8a Mon Sep 17 00:00:00 2001 From: David McFarland Date: Mon, 6 Aug 2018 15:52:11 -0300 Subject: [PATCH] disk_cache: include dri driver path in cache key @@ -12,10 +12,10 @@ timestamps in /nix/store are zero. 3 files changed, 15 insertions(+), 1 deletion(-) diff --git a/meson_options.txt b/meson_options.txt -index 1a2dd8ebd12..2ac741af5a6 100644 +index 2d39d13b6ad..daf06480a60 100644 --- a/meson_options.txt +++ b/meson_options.txt -@@ -348,6 +348,12 @@ option( +@@ -368,6 +368,12 @@ option( value : true, description : 'Enable direct rendering in GLX and EGL for DRI', ) @@ -26,13 +26,13 @@ index 1a2dd8ebd12..2ac741af5a6 100644 + description : 'Mesa cache key.' +) option( - 'I-love-half-baked-turnips', + 'prefer-iris', type : 'boolean', diff --git a/src/util/disk_cache.c b/src/util/disk_cache.c -index d1f14736725..2ed328f292e 100644 +index a92d621927a..3bd65c6890c 100644 --- a/src/util/disk_cache.c +++ b/src/util/disk_cache.c -@@ -402,8 +402,10 @@ disk_cache_create(const char *gpu_name, const char *driver_id, +@@ -401,8 +401,10 @@ disk_cache_create(const char *gpu_name, const char *driver_id, /* Create driver id keys */ size_t id_size = strlen(driver_id) + 1; @@ -43,7 +43,7 @@ index d1f14736725..2ed328f292e 100644 cache->driver_keys_blob_size += gpu_name_size; /* We sometimes store entire structs that contains a pointers in the cache, -@@ -424,6 +426,7 @@ disk_cache_create(const char *gpu_name, const char *driver_id, +@@ -423,6 +425,7 @@ disk_cache_create(const char *gpu_name, const char *driver_id, uint8_t *drv_key_blob = cache->driver_keys_blob; DRV_KEY_CPY(drv_key_blob, &cache_version, cv_size) DRV_KEY_CPY(drv_key_blob, driver_id, id_size) @@ -52,22 +52,23 @@ index d1f14736725..2ed328f292e 100644 DRV_KEY_CPY(drv_key_blob, &ptr_size, ptr_size_size) DRV_KEY_CPY(drv_key_blob, &driver_flags, driver_flags_size) diff --git a/src/util/meson.build b/src/util/meson.build -index 9da29cc7390..5f549bb1d99 100644 +index 0893f64793b..d46ce85a85f 100644 --- a/src/util/meson.build +++ b/src/util/meson.build -@@ -170,7 +170,12 @@ _libmesa_util = static_library( - include_directories : inc_common, +@@ -179,7 +179,12 @@ _libmesa_util = static_library( + include_directories : [inc_include, inc_src, inc_mapi, inc_mesa, inc_gallium, inc_gallium_aux], dependencies : deps_for_libmesa_util, link_with: libmesa_format, -- c_args : [c_msvc_compat_args, c_vis_args], +- c_args : [c_msvc_compat_args], + c_args : [ -+ c_msvc_compat_args, c_vis_args, ++ c_msvc_compat_args, + '-DDISK_CACHE_KEY="@0@"'.format( + get_option('disk-cache-key') + ), + ], + gnu_symbol_visibility : 'hidden', build_by_default : false ) - -- -2.25.1 +2.28.0 + diff --git a/third_party/nixpkgs/pkgs/development/libraries/mesa/link-radv-with-ld_args_build_id.patch b/third_party/nixpkgs/pkgs/development/libraries/mesa/link-radv-with-ld_args_build_id.patch deleted file mode 100644 index 0a66033239..0000000000 --- a/third_party/nixpkgs/pkgs/development/libraries/mesa/link-radv-with-ld_args_build_id.patch +++ /dev/null @@ -1,25 +0,0 @@ -From b49bcb6eece322b70fc2e8b0c8498f5a38ea7b82 Mon Sep 17 00:00:00 2001 -From: David McFarland -Date: Sun, 26 Jul 2020 17:29:49 -0300 -Subject: [PATCH] link radv with ld_args_build_id - -This is needed for radv_device_get_cache_uuid to work correctly. ---- - src/amd/vulkan/meson.build | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/amd/vulkan/meson.build b/src/amd/vulkan/meson.build -index eec026e8f60..a07a0821938 100644 ---- a/src/amd/vulkan/meson.build -+++ b/src/amd/vulkan/meson.build -@@ -183,7 +183,7 @@ libvulkan_radeon = shared_library( - ], - c_args : [c_vis_args, no_override_init_args, radv_flags], - cpp_args : [cpp_vis_args, radv_flags], -- link_args : [ld_args_bsymbolic, ld_args_gc_sections, libvulkan_radeon_ld_args], -+ link_args : [ld_args_build_id, ld_args_bsymbolic, ld_args_gc_sections, libvulkan_radeon_ld_args], - link_depends : [libvulkan_radeon_link_depends,], - install : true, - ) --- -2.28.0 diff --git a/third_party/nixpkgs/pkgs/development/libraries/mesa/missing-includes.patch b/third_party/nixpkgs/pkgs/development/libraries/mesa/missing-includes.patch index 9685a1619a..72488893c6 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/mesa/missing-includes.patch +++ b/third_party/nixpkgs/pkgs/development/libraries/mesa/missing-includes.patch @@ -9,18 +9,6 @@ #include "pipe/p_compiler.h" #include "pipe/p_state.h" ---- ./src/util/rand_xor.c.orig 2017-06-20 00:38:57.199474067 +0200 -+++ ./src/util/rand_xor.c 2017-06-20 00:40:31.351279557 +0200 -@@ -23,7 +23,9 @@ - */ - - #if defined(__linux__) -+#include - #include -+#include - #include - #include - #else --- ./src/amd/vulkan/winsys/amdgpu/radv_amdgpu_winsys.h +++ ./src/amd/vulkan/winsys/amdgpu/radv_amdgpu_winsys.h @@ -28,6 +28,8 @@ diff --git a/third_party/nixpkgs/pkgs/development/libraries/olm/default.nix b/third_party/nixpkgs/pkgs/development/libraries/olm/default.nix index 66ed41e8ea..9efe524b12 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/olm/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/olm/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "olm"; - version = "3.1.5"; + version = "3.2.1"; src = fetchurl { url = "https://matrix.org/git/olm/-/archive/${version}/${pname}-${version}.tar.gz"; - sha256 = "15l6cf029ghfk5bf8ii6nyy86gc90ji8n5hspjhj1xmzmk61xb4j"; + sha256 = "0iacbi9iibhzifh1bk6bi5xin557lvqmbf4ccsb8drj50dbxjiyr"; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/openssl/default.nix b/third_party/nixpkgs/pkgs/development/libraries/openssl/default.nix index 1fc38dd8aa..c4a9a4a018 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/openssl/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/openssl/default.nix @@ -160,8 +160,8 @@ in { }; openssl_1_1 = common { - version = "1.1.1g"; - sha256 = "0ikdcc038i7jk8h7asq5xcn8b1xc2rrbc88yfm4hqbz3y5s4gc6x"; + version = "1.1.1h"; + sha256 = "1ncmcnh5bmxkwrvm0m1q4kdcjjfpwvlyjspjhibkxc6p9dvsi72w"; patches = [ ./1.1/nix-ssl-cert-file.patch diff --git a/third_party/nixpkgs/pkgs/development/libraries/osip/default.nix b/third_party/nixpkgs/pkgs/development/libraries/osip/default.nix index 24db4c6609..ed854e8a46 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/osip/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/osip/default.nix @@ -1,9 +1,9 @@ {stdenv, fetchurl}: stdenv.mkDerivation rec { - version = "5.1.1"; + version = "5.1.2"; src = fetchurl { url = "mirror://gnu/osip/libosip2-${version}.tar.gz"; - sha256 = "0kgnxgzf968kbl6rx3hjsfb3jsg4ydgrsf35gzj319i1f8qjifv1"; + sha256 = "148j1i0zkwf09qdpk3nc5sssj1dvppw7p0n9rgrg8k56447l1h1b"; }; pname = "libosip2"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/p11-kit/default.nix b/third_party/nixpkgs/pkgs/development/libraries/p11-kit/default.nix index 46f520e41e..31a7e7e908 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/p11-kit/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/p11-kit/default.nix @@ -36,6 +36,13 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + # Tests run in fakeroot for non-root users + preCheck = '' + if [ "$(id -u)" != "0" ]; then + export FAKED_MODE=1 + fi + ''; + doCheck = !stdenv.isDarwin; installFlags = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/pipewire/default.nix b/third_party/nixpkgs/pkgs/development/libraries/pipewire/default.nix index d8a58e6a8e..858f2f94db 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/pipewire/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/pipewire/default.nix @@ -40,7 +40,7 @@ let in stdenv.mkDerivation rec { pname = "pipewire"; - version = "0.3.13"; + version = "0.3.15"; outputs = [ "out" @@ -57,7 +57,7 @@ stdenv.mkDerivation rec { owner = "pipewire"; repo = "pipewire"; rev = version; - sha256 = "19j5kmb7iaivkq2agfzncfm2qms41ckqi0ddxvhpc91ihwprdc5w"; + sha256 = "1lmsn13pbr0cigb5ri9nd3102ffbaf8nsz5c8aawf6lsz7mhkx9x"; }; patches = [ @@ -65,13 +65,6 @@ stdenv.mkDerivation rec { ./alsa-profiles-use-libdir.patch # Move installed tests into their own output. ./installed-tests-path.patch - - # TODO Remove this on next update - # Fixes rpath referencecs. - (fetchpatch { - url = "https://gitlab.freedesktop.org/pipewire/pipewire/commit/2e3556fa128b778be62a7ffad5fbe78393035825.diff"; - sha256 = "039yysb8j1aiqml54rxnaqfmzqz1b6m8sv5w3vz52grvav3kyr1l"; - }) ]; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/precice/default.nix b/third_party/nixpkgs/pkgs/development/libraries/precice/default.nix index d850142807..f0064dbd36 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/precice/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/precice/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "precice"; - version = "2.1.0"; + version = "2.1.1"; src = fetchFromGitHub { owner = "precice"; repo = pname; rev = "v${version}"; - sha256 = "1268dz39sx3gygnm7vpg59k1wdhy6rhf72i8i0kz4jckll0s9102"; + sha256 = "180db4nlir2409wzdnsc1bkyrllnki8d551qbm1rg82zkz3vdmqg"; }; cmakeFlags = [ diff --git a/third_party/nixpkgs/pkgs/development/libraries/pugixml/default.nix b/third_party/nixpkgs/pkgs/development/libraries/pugixml/default.nix index 8bd8615406..d9b04781ba 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/pugixml/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/pugixml/default.nix @@ -1,34 +1,41 @@ -{ stdenv, fetchFromGitHub, fetchpatch, cmake, shared ? false }: +{ stdenv, lib, fetchFromGitHub, cmake, check, validatePkgConfig, shared ? false }: stdenv.mkDerivation rec { pname = "pugixml"; - version = "1.9"; + version = "1.10"; src = fetchFromGitHub { owner = "zeux"; repo = "pugixml"; rev = "v${version}"; - sha256 = "0iraznwm78pyyzc9snvd3dyz8gddvmxsm1b3kpw7wixkvcawdviv"; + sha256 = "dywnLSJHeGaR3+0lTLpacWQL0rWlF8+LNCy+oCCO9C4="; }; - patches = [ - # To be removed after a version newer than 1.9 is released - (fetchpatch { - url = "https://github.com/zeux/pugixml/pull/193.patch"; - sha256 = "0s4anqlr2ppfibxyl29nrqbcprrg89k7il6303dm91s6620ydmka"; - }) + outputs = if shared then [ "out" "dev" ] else [ "out" ]; + + nativeBuildInputs = [ cmake validatePkgConfig ]; + + cmakeFlags = [ + "-DBUILD_TESTS=ON" + "-DBUILD_SHARED_LIBS=${if shared then "ON" else "OFF"}" ]; - nativeBuildInputs = [ cmake ]; + checkInputs = [ check ]; - cmakeFlags = [ "-DBUILD_SHARED_LIBS=${if shared then "ON" else "OFF"}" ]; + # Hack to be able to run the test, broken because we use + # CMAKE_SKIP_BUILD_RPATH to avoid cmake resetting rpath on install + preBuild = if stdenv.isDarwin then '' + export DYLD_LIBRARY_PATH="`pwd`''${DYLD_LIBRARY_PATH:+:}$DYLD_LIBRARY_PATH" + '' else '' + export LD_LIBRARY_PATH="`pwd`''${LD_LIBRARY_PATH:+:}$LD_LIBRARY_PATH" + ''; preConfigure = '' # Enable long long support (required for filezilla) sed -ire '/PUGIXML_HAS_LONG_LONG/ s/^\/\///' src/pugiconfig.hpp ''; - meta = with stdenv.lib; { + meta = with lib; { description = "Light-weight, simple and fast XML parser for C++ with XPath support"; homepage = "https://pugixml.org"; license = licenses.mit; diff --git a/third_party/nixpkgs/pkgs/development/libraries/qrupdate/default.nix b/third_party/nixpkgs/pkgs/development/libraries/qrupdate/default.nix index 424502dce0..90d4cb45ce 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/qrupdate/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/qrupdate/default.nix @@ -3,25 +3,35 @@ , gfortran , blas , lapack +, which }: -stdenv.mkDerivation { - name = "qrupdate-1.1.2"; + +stdenv.mkDerivation rec { + pname = "qrupdate"; + version = "1.1.2"; src = fetchurl { - url = "mirror://sourceforge/qrupdate/qrupdate-1.1.2.tar.gz"; + url = "mirror://sourceforge/qrupdate/${pname}-${version}.tar.gz"; sha256 = "024f601685phcm1pg8lhif3lpy5j9j0k6n0r46743g4fvh8wg8g2"; }; - configurePhase = - '' - export PREFIX=$out - sed -i -e 's,^BLAS=.*,BLAS=-L${blas}/lib -lblas,' \ - -e 's,^LAPACK=.*,LAPACK=-L${lapack}/lib -llapack,' \ - Makeconf - '' - + stdenv.lib.optionalString blas.isILP64 - '' - sed -i Makeconf -e '/^FFLAGS=.*/ s/$/-fdefault-integer-8/' - ''; + preBuild = + # Check that blas and lapack are compatible + assert (blas.isILP64 == lapack.isILP64); + # We don't have structuredAttrs yet implemented, and we need to use space + # seprated values in makeFlags, so only this works. + '' + makeFlagsArray+=( + "LAPACK=-L${lapack}/lib -llapack" + "BLAS=-L${blas}/lib -lblas" + "PREFIX=${placeholder "out"}" + ${stdenv.lib.optionalString blas.isILP64 + # Use their FFLAGS along with `-fdefault-integer-8`. If another + # application intends to use arpack, it should add this to it's FFLAGS as + # well. Otherwise (e.g): https://savannah.gnu.org/bugs/?50339 + "FFLAGS=-fimplicit-none -O3 -funroll-loops -fdefault-integer-8" + } + ) + ''; doCheck = true; @@ -31,12 +41,15 @@ stdenv.mkDerivation { installTargets = stdenv.lib.optionals stdenv.isDarwin [ "install-staticlib" "install-shlib" ]; - buildInputs = [ gfortran blas lapack ]; + buildInputs = [ gfortran ]; + + nativeBuildInputs = [ which ]; meta = with stdenv.lib; { description = "Library for fast updating of qr and cholesky decompositions"; homepage = "https://sourceforge.net/projects/qrupdate/"; - license = licenses.gpl3; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ doronbehar ]; platforms = platforms.unix; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/rocclr/default.nix b/third_party/nixpkgs/pkgs/development/libraries/rocclr/default.nix index 2034b658dc..9b7d80a224 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/rocclr/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/rocclr/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "rocclr"; - version = "3.8.0"; + version = "3.9.0"; src = fetchFromGitHub { owner = "ROCm-Developer-Tools"; repo = "ROCclr"; rev = "rocm-${version}"; - sha256 = "05vh70qh6jb7038b1rcmz24bg4an0nw98bv2vn3jcyygj4dr3fmf"; + sha256 = "193pd6lbnfjrmqsrlvkpadxxi908a9r0c41y8x1bkbbaviad39q0"; }; nativeBuildInputs = [ cmake rocm-cmake ]; @@ -46,7 +46,10 @@ stdenv.mkDerivation rec { ]; preFixup = '' + # Work around broken cmake files ln -s $out/include/compiler/lib/include/* $out/include + ln -s $out/include/elf/elfio $out/include/elfio + substituteInPlace $out/lib/cmake/rocclr/ROCclrConfig.cmake \ --replace "/build/source/build" "$out" ''; diff --git a/third_party/nixpkgs/pkgs/development/libraries/rocm-comgr/default.nix b/third_party/nixpkgs/pkgs/development/libraries/rocm-comgr/default.nix index 916af54349..7a122fae39 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/rocm-comgr/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/rocm-comgr/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "rocm-comgr"; - version = "3.8.0"; + version = "3.9.0"; src = fetchFromGitHub { owner = "RadeonOpenCompute"; repo = "ROCm-CompilerSupport"; rev = "rocm-${version}"; - sha256 = "05gs282kqnz7lf3b8r1908zk05dbzdx02ar2ns2900fas1l27qc1"; + sha256 = "1lwgr6x2b6jisc2nxvr9m24zrc7f2vcgrbkj9sf2blpha61xgk14"; }; sourceRoot = "source/lib/comgr"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/rocm-device-libs/default.nix b/third_party/nixpkgs/pkgs/development/libraries/rocm-device-libs/default.nix index bf302ff227..4dd96c2c7d 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/rocm-device-libs/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/rocm-device-libs/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "rocm-device-libs"; - version = "3.8.0"; + version = "3.9.0"; src = fetchFromGitHub { owner = "RadeonOpenCompute"; repo = "ROCm-Device-Libs"; rev = "rocm-${version}"; - sha256 = "0kgsp22rbg09q09n36j1vfs9v8x0liap3ycnqyn1g7dxy38kqmi4"; + sha256 = "1nil0nhlkszslgvqhim5vmcp3flfafydviq0zk7db8i6z17kq090"; }; nativeBuildInputs = [ cmake ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/rocm-opencl-runtime/default.nix b/third_party/nixpkgs/pkgs/development/libraries/rocm-opencl-runtime/default.nix index 6504ae1004..69ca18318a 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/rocm-opencl-runtime/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/rocm-opencl-runtime/default.nix @@ -21,13 +21,13 @@ stdenv.mkDerivation rec { pname = "rocm-opencl-runtime"; - version = "3.8.0"; + version = "3.9.0"; src = fetchFromGitHub { owner = "RadeonOpenCompute"; repo = "ROCm-OpenCL-Runtime"; rev = "rocm-${version}"; - sha256 = "07zc6ww92nsq1z0gcp1sfhqsk0jkrjnv9cnw5akh471f7n7jiznm"; + sha256 = "1qsgswm1wl2wknhgy6c9l6dnj0z1kwddimdzjmvjcpyxq987y2gv"; }; nativeBuildInputs = [ cmake rocm-cmake ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/rocm-runtime/default.nix b/third_party/nixpkgs/pkgs/development/libraries/rocm-runtime/default.nix index 57635a3470..d3e113b8de 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/rocm-runtime/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/rocm-runtime/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "rocm-runtime"; - version = "3.8.0"; + version = "3.9.0"; src = fetchFromGitHub { owner = "RadeonOpenCompute"; repo = "ROCR-Runtime"; rev = "rocm-${version}"; - sha256 = "1lm4cbx1d727zll85vjc1kykc72mk82nfhyyhjljv82gd4mnz00c"; + sha256 = "034qbqznfligg4lwd95zmqa7lwcda720zbfv066nqvarlcml0kr6"; }; sourceRoot = "source/src"; @@ -27,7 +27,7 @@ stdenv.mkDerivation rec { buildInputs = [ clang-unwrapped elfutils llvm ]; cmakeFlags = [ - "-DBITCODE_DIR=${rocm-device-libs}/lib" + "-DBITCODE_DIR=${rocm-device-libs}/amdgcn/bitcode" "-DCMAKE_PREFIX_PATH=${rocm-thunk}" ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/rocm-thunk/default.nix b/third_party/nixpkgs/pkgs/development/libraries/rocm-thunk/default.nix index ba780ae4bd..63e66f35f8 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/rocm-thunk/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/rocm-thunk/default.nix @@ -7,13 +7,13 @@ stdenv.mkDerivation rec { pname = "rocm-thunk"; - version = "3.8.0"; + version = "3.9.0"; src = fetchFromGitHub { owner = "RadeonOpenCompute"; repo = "ROCT-Thunk-Interface"; rev = "rocm-${version}"; - sha256 = "00xrwxndah2frdggqniz1j4s46ha3dav8qlnxm3gk9m4b80m774k"; + sha256 = "0xkp50ik7miz9whywnmiiqiamc7g8flfr9g8c02kxr0cay1in6cj"; }; preConfigure = '' diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/math/petsc/default.nix b/third_party/nixpkgs/pkgs/development/libraries/science/math/petsc/default.nix index 82a0d06357..0946f8f2f6 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/science/math/petsc/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/science/math/petsc/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "petsc"; - version = "3.13.4"; + version = "3.14.0"; src = fetchurl { url = "http://ftp.mcs.anl.gov/pub/petsc/release-snapshots/petsc-${version}.tar.gz"; - sha256 = "1n2paqw5c0ja392s1qhp7q2ypwav8s5drxxz2w5m2cn31vbspy1c"; + sha256 = "1hq3igm90bnl44vyjdbkpqmqk7496pakcswzc2vq57l8d27nhdxz"; }; nativeBuildInputs = [ blas gfortran gfortran.cc.lib lapack python ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/soil/default.nix b/third_party/nixpkgs/pkgs/development/libraries/soil/default.nix index cf0896170c..dcec1c897b 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/soil/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/soil/default.nix @@ -1,28 +1,45 @@ -{ stdenv, fetchurl, unzip, mesa, libX11, libGL }: +{ stdenv, lib +, Carbon +, fetchzip +, libGL +, libX11 +}: stdenv.mkDerivation { name = "soil"; - src = fetchurl { - url = "http://www.lonesock.net/files/soil.zip"; - sha256 = "00gpwp9dldzhsdhksjvmbhsd2ialraqbv6v6dpikdmpncj6mnc52"; + src = fetchzip { + url = "https://web.archive.org/web/20200104042737id_/http://www.lonesock.net/files/soil.zip"; + sha256 = "1c05nwbnfdgwaz8ywn7kg2xrcvrcbpdyhcfkkiiwk69zvil0pbgd"; }; - buildInputs = [ unzip mesa libGL libX11 ]; + buildInputs = if stdenv.hostPlatform.isDarwin then [ + Carbon + ] else [ + libGL + libX11 + ]; - sourceRoot = "Simple OpenGL Image Library/projects/makefile"; - preBuild = "mkdir obj"; - preInstall = "mkdir -p $out/lib $out/include"; - makeFlags = [ "LOCAL=$(out)" ]; + buildPhase = '' + cd src + $CC $NIX_CFLAGS_COMPILE -c *.c + $AR rcs libSOIL.a *.o + ''; + installPhase = '' + mkdir -p $out/lib $out/include/SOIL + cp libSOIL.a $out/lib/ + cp SOIL.h $out/include/SOIL/ + ''; - meta = { - description = "Simple OpenGL Image Library"; + meta = with lib; { + description = "Simple OpenGL Image Library"; longDescription = '' SOIL is a tiny C library used primarily for uploading textures into OpenGL. ''; - homepage = "https://www.lonesock.net/soil.html"; - license = stdenv.lib.licenses.publicDomain; - platforms = stdenv.lib.platforms.linux; + homepage = "https://www.lonesock.net/soil.html"; + license = licenses.publicDomain; + platforms = platforms.unix; + maintainers = with maintainers; [ r-burns ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/waffle/default.nix b/third_party/nixpkgs/pkgs/development/libraries/waffle/default.nix new file mode 100644 index 0000000000..66a1b7ab14 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/libraries/waffle/default.nix @@ -0,0 +1,54 @@ +{ stdenv +, fetchFromGitLab +, lib +, cmake +, libGL +, libglvnd +, makeWrapper +, pkg-config +, wayland +, libxcb +, libX11 +}: + +stdenv.mkDerivation rec { + pname = "waffle"; + version = "1.6.1"; + + src = fetchFromGitLab { + domain = "gitlab.freedesktop.org"; + owner = "mesa"; + repo = "waffle"; + rev = "v${version}"; + sha256 = "0s8gislmhccfa04zsj1yqk97lscbbnmxirr2zm4q3p8ybmpfhpqr"; + }; + + buildInputs = [ + libGL + libglvnd + libX11 + libxcb + wayland + ]; + + nativeBuildInputs = [ + cmake + makeWrapper + pkg-config + ]; + + cmakeFlags = [ "-Dplatforms=x11,wayland" ]; + + postInstall = '' + wrapProgram $out/bin/wflinfo \ + --prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [ libGL libglvnd ]} + ''; + + meta = with lib; { + description = "A cross-platform C library that allows one to defer selection of an OpenGL API and window system until runtime"; + homepage = "http://www.waffle-gl.org/"; + license = licenses.bsd2; + platforms = platforms.mesaPlatforms; + maintainers = with maintainers; [ Flakebi ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/libraries/zeromq/4.x.nix b/third_party/nixpkgs/pkgs/development/libraries/zeromq/4.x.nix index 8302ebbd1e..d5819ff7ee 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/zeromq/4.x.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/zeromq/4.x.nix @@ -1,17 +1,19 @@ -{ stdenv, fetchFromGitHub, cmake, asciidoc, enableDrafts ? false }: +{ stdenv, fetchFromGitHub, cmake, asciidoc, pkg-config, libsodium +, enableDrafts ? false }: stdenv.mkDerivation rec { pname = "zeromq"; - version = "4.3.2"; + version = "4.3.3"; src = fetchFromGitHub { owner = "zeromq"; repo = "libzmq"; rev = "v${version}"; - sha256 = "1q37z05i76ili31j6jlw8988iy6vxadlmd306f99phxfdpqa6bn9"; + sha256 = "155kb0ih0xj4jvd39bq8d04bgvhy9143r3632ks1m04455z4qdzd"; }; - nativeBuildInputs = [ cmake asciidoc ]; + nativeBuildInputs = [ cmake asciidoc pkg-config ]; + buildInputs = [ libsodium ]; enableParallelBuilding = true; diff --git a/third_party/nixpkgs/pkgs/development/node-packages/node-packages.json b/third_party/nixpkgs/pkgs/development/node-packages/node-packages.json index ff07222506..0e46f65c78 100644 --- a/third_party/nixpkgs/pkgs/development/node-packages/node-packages.json +++ b/third_party/nixpkgs/pkgs/development/node-packages/node-packages.json @@ -75,6 +75,7 @@ , "eslint_d" , "expo-cli" , {"fast-cli": "1.x"} +, "fauna-shell" , "fkill-cli" , "forever" , "fx" @@ -99,7 +100,7 @@ , "indium" , "insect" , "ionic" -, { "iosevka-build-deps": "../../data/fonts/iosevka" } +, {"iosevka": "https://github.com/be5invis/Iosevka/archive/v3.7.1.tar.gz"} , "jake" , "javascript-typescript-langserver" , "joplin" diff --git a/third_party/nixpkgs/pkgs/development/node-packages/node-packages.nix b/third_party/nixpkgs/pkgs/development/node-packages/node-packages.nix index 4c4359a178..dc15488105 100644 --- a/third_party/nixpkgs/pkgs/development/node-packages/node-packages.nix +++ b/third_party/nixpkgs/pkgs/development/node-packages/node-packages.nix @@ -22,13 +22,13 @@ let sha512 = "t4WmWoGV9gyzypwG3y3JlcK2t8fKLtvzBA7xEoFTj9SMPvOuLsf13uh4ikK0RRaaa9RPPWLgFUdOyIRaQvCpwQ=="; }; }; - "@angular-devkit/architect-0.1001.7" = { + "@angular-devkit/architect-0.1002.0" = { name = "_at_angular-devkit_slash_architect"; packageName = "@angular-devkit/architect"; - version = "0.1001.7"; + version = "0.1002.0"; src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1001.7.tgz"; - sha512 = "uFYIvMdewU44GbIyRfsUHNMLkx+C0kokpnj7eH5NbJfbyFpCfd3ijBHh+voPdPsDRWs9lLgjbxfHpswSPj4D8w=="; + url = "https://registry.npmjs.org/@angular-devkit/architect/-/architect-0.1002.0.tgz"; + sha512 = "twM8V03ujBIGVpgV1PBlSDodUdxtUb7WakutfWafAvEHUsgwzfvQz2VtKWvjNZ9AiYjnCuwkQaclqVv0VHNo9w=="; }; }; "@angular-devkit/core-10.0.7" = { @@ -40,22 +40,13 @@ let sha512 = "pXaZgsQ8LHpRx4QGAUYDE8GwBQLAtoqPh6oUCwRJwBExm5rl13OGPTBWewHiq0ysV/SnFXvOjxwAaHQvC1AgZw=="; }; }; - "@angular-devkit/core-10.1.7" = { + "@angular-devkit/core-10.2.0" = { name = "_at_angular-devkit_slash_core"; packageName = "@angular-devkit/core"; - version = "10.1.7"; + version = "10.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/core/-/core-10.1.7.tgz"; - sha512 = "RRyDkN2FByA+nlnRx/MzUMK1FXwj7+SsrzJcvZfWx4yA5rfKmJiJryXQEzL44GL1aoaXSuvOYu3H72wxZADN8Q=="; - }; - }; - "@angular-devkit/core-9.1.12" = { - name = "_at_angular-devkit_slash_core"; - packageName = "@angular-devkit/core"; - version = "9.1.12"; - src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/core/-/core-9.1.12.tgz"; - sha512 = "D/GnBeSlmdgGn7EhuE32HuPuRAjvUuxi7Q6WywBI8PSsXKAGnrypghBwMATNnOA24//CgbW2533Y9VWHaeXdeA=="; + url = "https://registry.npmjs.org/@angular-devkit/core/-/core-10.2.0.tgz"; + sha512 = "XAszFhSF3mZw1VjoOsYGbArr5NJLcStjOvcCGjBPl1UBM2AKpuCQXHxI9XJGYKL3B93Vp5G58d8qkHvamT53OA=="; }; }; "@angular-devkit/schematics-10.0.7" = { @@ -67,22 +58,13 @@ let sha512 = "eyyYPgpjtr3h7WbnNbkDubJ/p+8TgKU6abWd+NmBfTvyeHrpVFUYZabNRcdXwUDSVzfTQKdmLynIkESj/KROrg=="; }; }; - "@angular-devkit/schematics-10.1.7" = { + "@angular-devkit/schematics-10.2.0" = { name = "_at_angular-devkit_slash_schematics"; packageName = "@angular-devkit/schematics"; - version = "10.1.7"; + version = "10.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-10.1.7.tgz"; - sha512 = "nk9RXA09b+7uq59HS/gyztNzUGHH/eQAUQhWHdDYSCG6v1lhJVCKx1HgDPELVxmeq9f+HArkAW7Y7c+ccdNQ7A=="; - }; - }; - "@angular-devkit/schematics-9.1.12" = { - name = "_at_angular-devkit_slash_schematics"; - packageName = "@angular-devkit/schematics"; - version = "9.1.12"; - src = fetchurl { - url = "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-9.1.12.tgz"; - sha512 = "+GYnUzmIy1/QpYitCC8mI7jcrViGHTtOKvvDPEFjU2nggjNEQaMmsHcdIsjrqggEc23ZZyebNAIewT8CMkJyrQ=="; + url = "https://registry.npmjs.org/@angular-devkit/schematics/-/schematics-10.2.0.tgz"; + sha512 = "TQI5NnE6iM3ChF5gZQ9qb+lZgMWa7aLoF5ksOyT3zrmOuICiQYJhA6SsjV95q7J4M55qYymwBib8KTqU/xuQww=="; }; }; "@angular-devkit/schematics-cli-0.1000.7" = { @@ -319,13 +301,13 @@ let sha512 = "a9gxpmdXtZEInkCSHUJDLHZVBgb1QS0jhss4cPP93EW7s+uC5bikET2twEF3KV+7rDblJcmNvTR7VJejqd2C2g=="; }; }; - "@babel/compat-data-7.12.1" = { + "@babel/compat-data-7.12.5" = { name = "_at_babel_slash_compat-data"; packageName = "@babel/compat-data"; - version = "7.12.1"; + version = "7.12.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.12.1.tgz"; - sha512 = "725AQupWJZ8ba0jbKceeFblZTY90McUBWMwHhkFQ9q1zKPJ95GUktljFcgcsIVwRnTnRKlcYzfiNImg5G9m6ZQ=="; + url = "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.12.5.tgz"; + sha512 = "DTsS7cxrsH3by8nqQSpFSyjSfSYl57D6Cf4q8dW3LK83tBKBDCkfcay1nYkXq1nIHXnpX8WMMb/O25HOy3h1zg=="; }; }; "@babel/core-7.12.3" = { @@ -355,13 +337,13 @@ let sha512 = "DWtQ1PV3r+cLbySoHrwn9RWEgKMBLLma4OBQloPRyDYvc5msJM9kvTLo1YnlJd1P/ZuKbdli3ijr5q3FvAF3uA=="; }; }; - "@babel/generator-7.12.1" = { + "@babel/generator-7.12.5" = { name = "_at_babel_slash_generator"; packageName = "@babel/generator"; - version = "7.12.1"; + version = "7.12.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/generator/-/generator-7.12.1.tgz"; - sha512 = "DB+6rafIdc9o72Yc3/Ph5h+6hUjeOp66pF0naQBgUFFuPqzQwIlPTm3xZR7YNvduIMtkDIj2t21LSQwnbCrXvg=="; + url = "https://registry.npmjs.org/@babel/generator/-/generator-7.12.5.tgz"; + sha512 = "m16TQQJ8hPt7E+OS/XVQg/7U184MLXtvuGbCdA7na61vha+ImkyyNM/9DDA0unYCVZn3ZOhng+qz48/KBOT96A=="; }; }; "@babel/helper-annotate-as-pure-7.10.4" = { @@ -391,22 +373,22 @@ let sha512 = "5nPcIZ7+KKDxT1427oBivl9V9YTal7qk0diccnh7RrcgrT/pGFOjgGw1dgryyx1GvHEpXVfoDF6Ak3rTiWh8Rg=="; }; }; - "@babel/helper-builder-react-jsx-experimental-7.12.1" = { + "@babel/helper-builder-react-jsx-experimental-7.12.4" = { name = "_at_babel_slash_helper-builder-react-jsx-experimental"; packageName = "@babel/helper-builder-react-jsx-experimental"; - version = "7.12.1"; + version = "7.12.4"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-builder-react-jsx-experimental/-/helper-builder-react-jsx-experimental-7.12.1.tgz"; - sha512 = "82to8lR7TofZWbTd3IEZT1xNHfeU/Ef4rDm/GLXddzqDh+yQ19QuGSzqww51aNxVH8rwfRIzL0EUQsvODVhtyw=="; + url = "https://registry.npmjs.org/@babel/helper-builder-react-jsx-experimental/-/helper-builder-react-jsx-experimental-7.12.4.tgz"; + sha512 = "AjEa0jrQqNk7eDQOo0pTfUOwQBMF+xVqrausQwT9/rTKy0g04ggFNaJpaE09IQMn9yExluigWMJcj0WC7bq+Og=="; }; }; - "@babel/helper-compilation-targets-7.12.1" = { + "@babel/helper-compilation-targets-7.12.5" = { name = "_at_babel_slash_helper-compilation-targets"; packageName = "@babel/helper-compilation-targets"; - version = "7.12.1"; + version = "7.12.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.12.1.tgz"; - sha512 = "jtBEif7jsPwP27GPHs06v4WBV0KrE8a/P7n0N0sSvHn2hwUCYnolP/CLmz51IzAW4NlN+HuoBtb9QcwnRo9F/g=="; + url = "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.12.5.tgz"; + sha512 = "+qH6NrscMolUlzOYngSBMIOQpKUGPPsc61Bu5W10mg84LxZ7cmvnBHzARKbDoFxVvqqAbj6Tg6N7bSrWSPXMyw=="; }; }; "@babel/helper-create-class-features-plugin-7.12.1" = { @@ -481,13 +463,13 @@ let sha512 = "k0CIe3tXUKTRSoEx1LQEPFU9vRQfqHtl+kf8eNnDqb4AUJEy5pz6aIiog+YWtVm2jpggjS1laH68bPsR+KWWPQ=="; }; }; - "@babel/helper-module-imports-7.12.1" = { + "@babel/helper-module-imports-7.12.5" = { name = "_at_babel_slash_helper-module-imports"; packageName = "@babel/helper-module-imports"; - version = "7.12.1"; + version = "7.12.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.12.1.tgz"; - sha512 = "ZeC1TlMSvikvJNy1v/wPIazCu3NdOwgYZLIkmIyAsGhqkNpiDoQQRmaCK8YP4Pq3GPTLPV9WXaPCJKvx06JxKA=="; + url = "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.12.5.tgz"; + sha512 = "SR713Ogqg6++uexFRORf/+nPXMmWIn80TALu0uaFb+iQIUoR7bOC7zBWyzBs5b3tBBJXuyD0cRu1F15GyzjOWA=="; }; }; "@babel/helper-module-transforms-7.12.1" = { @@ -535,13 +517,13 @@ let sha512 = "9d0KQCRM8clMPcDwo8SevNs+/9a8yWVVmaE80FGJcEP8N1qToREmWEGnBn8BUlJhYRFz6fqxeRL1sl5Ogsed7A=="; }; }; - "@babel/helper-replace-supers-7.12.1" = { + "@babel/helper-replace-supers-7.12.5" = { name = "_at_babel_slash_helper-replace-supers"; packageName = "@babel/helper-replace-supers"; - version = "7.12.1"; + version = "7.12.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.12.1.tgz"; - sha512 = "zJjTvtNJnCFsCXVi5rUInstLd/EIVNmIKA1Q9ynESmMBWPWd+7sdR+G4/wdu+Mppfep0XLyG2m7EBPvjCeFyrw=="; + url = "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.12.5.tgz"; + sha512 = "5YILoed0ZyIpF4gKcpZitEnXEJ9UoDRki1Ey6xz46rxOzfNMAhVIJMoune1hmPVxh40LRv1+oafz7UsWX+vyWA=="; }; }; "@babel/helper-simple-access-7.12.1" = { @@ -598,13 +580,13 @@ let sha512 = "Cvb8IuJDln3rs6tzjW3Y8UeelAOdnpB8xtQ4sme2MSZ9wOxrbThporC0y/EtE16VAtoyEfLM404Xr1e0OOp+ow=="; }; }; - "@babel/helpers-7.12.1" = { + "@babel/helpers-7.12.5" = { name = "_at_babel_slash_helpers"; packageName = "@babel/helpers"; - version = "7.12.1"; + version = "7.12.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helpers/-/helpers-7.12.1.tgz"; - sha512 = "9JoDSBGoWtmbay98efmT2+mySkwjzeFeAL9BuWNoVQpkPFQF8SIIFUfY5os9u8wVzglzoiPRSW7cuJmBDUt43g=="; + url = "https://registry.npmjs.org/@babel/helpers/-/helpers-7.12.5.tgz"; + sha512 = "lgKGMQlKqA8meJqKsW6rUnc4MdUk35Ln0ATDqdM1a/UpARODdI4j5Y5lVfUScnSNkJcdCRAaWkspykNoFg9sJA=="; }; }; "@babel/highlight-7.10.4" = { @@ -616,13 +598,13 @@ let sha512 = "i6rgnR/YgPEQzZZnbTHHuZdlE8qyoBNalD6F+q4vAFlcMEcqmkoG+mPqJYJCo63qPf74+Y1UZsl3l6f7/RIkmA=="; }; }; - "@babel/parser-7.12.3" = { + "@babel/parser-7.12.5" = { name = "_at_babel_slash_parser"; packageName = "@babel/parser"; - version = "7.12.3"; + version = "7.12.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/parser/-/parser-7.12.3.tgz"; - sha512 = "kFsOS0IbsuhO5ojF8Hc8z/8vEIOkylVBrjiZUbLTE3XFe0Qi+uu6HjzQixkFaqr0ZPAMZcBVxEwmsnsLPZ2Xsw=="; + url = "https://registry.npmjs.org/@babel/parser/-/parser-7.12.5.tgz"; + sha512 = "FVM6RZQ0mn2KCf1VUED7KepYeUWoVShczewOCfm3nzoBybaih51h+sYVVGthW9M6lPByEPTQf+xm27PBdlpwmQ=="; }; }; "@babel/plugin-external-helpers-7.8.3" = { @@ -706,13 +688,13 @@ let sha512 = "nZY0ESiaQDI1y96+jk6VxMOaL4LPo/QDHBqL+SF3/vl6dHkTwHlOI8L4ZwuRBHgakRBw5zsVylel7QPbbGuYgg=="; }; }; - "@babel/plugin-proposal-numeric-separator-7.12.1" = { + "@babel/plugin-proposal-numeric-separator-7.12.5" = { name = "_at_babel_slash_plugin-proposal-numeric-separator"; packageName = "@babel/plugin-proposal-numeric-separator"; - version = "7.12.1"; + version = "7.12.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.12.1.tgz"; - sha512 = "MR7Ok+Af3OhNTCxYVjJZHS0t97ydnJZt/DbR4WISO39iDnhiD8XHrY12xuSJ90FFEGjir0Fzyyn7g/zY6hxbxA=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.12.5.tgz"; + sha512 = "UiAnkKuOrCyjZ3sYNHlRlfuZJbBHknMQ9VMwVeX97Ofwx7RpD6gS2HfqTCh8KNUQgcOm8IKt103oR4KIjh7Q8g=="; }; }; "@babel/plugin-proposal-object-rest-spread-7.12.1" = { @@ -1156,13 +1138,13 @@ let sha512 = "cAzB+UzBIrekfYxyLlFqf/OagTvHLcVBb5vpouzkYkBclRPraiygVnafvAoipErZLI8ANv8Ecn6E/m5qPXD26w=="; }; }; - "@babel/plugin-transform-react-jsx-7.12.1" = { + "@babel/plugin-transform-react-jsx-7.12.5" = { name = "_at_babel_slash_plugin-transform-react-jsx"; packageName = "@babel/plugin-transform-react-jsx"; - version = "7.12.1"; + version = "7.12.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.12.1.tgz"; - sha512 = "RmKejwnT0T0QzQUzcbP5p1VWlpnP8QHtdhEtLG55ZDQnJNalbF3eeDyu3dnGKvGzFIQiBzFhBYTwvv435p9Xpw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.12.5.tgz"; + sha512 = "2xkcPqqrYiOQgSlM/iwto1paPijjsDbUynN13tI6bosDz/jOW3CRzYguIE8wKX32h+msbBM22Dv5fwrFkUOZjQ=="; }; }; "@babel/plugin-transform-react-jsx-source-7.12.1" = { @@ -1345,13 +1327,13 @@ let sha512 = "TeWkU52so0mPtDcaCTxNBI/IHiz0pZgr8VEFqXFtZWpYD08ZB6FaSwVAS8MKRQAP3bYKiVjwysOJgMFY28o6Tw=="; }; }; - "@babel/runtime-7.12.1" = { + "@babel/runtime-7.12.5" = { name = "_at_babel_slash_runtime"; packageName = "@babel/runtime"; - version = "7.12.1"; + version = "7.12.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/runtime/-/runtime-7.12.1.tgz"; - sha512 = "J5AIf3vPj3UwXaAzb5j1xM4WAQDX3EMgemF8rjCP3SoW09LfRKAXQKt6CoVYl230P6iWdRcBbnLDDdnqWxZSCA=="; + url = "https://registry.npmjs.org/@babel/runtime/-/runtime-7.12.5.tgz"; + sha512 = "plcc+hbExy3McchJCEQG3knOsuh3HH+Prx1P6cLIkET/0dLuQDEnrT+s27Axgc9bqfsmNUNHfscgMUdBpC9xfg=="; }; }; "@babel/runtime-7.9.0" = { @@ -1372,13 +1354,13 @@ let sha512 = "ZCjD27cGJFUB6nmCB1Enki3r+L5kJveX9pq1SvAUKoICy6CZ9yD8xO086YXdYhvNjBdnekm4ZnaP5yC8Cs/1tA=="; }; }; - "@babel/traverse-7.12.1" = { + "@babel/traverse-7.12.5" = { name = "_at_babel_slash_traverse"; packageName = "@babel/traverse"; - version = "7.12.1"; + version = "7.12.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.12.1.tgz"; - sha512 = "MA3WPoRt1ZHo2ZmoGKNqi20YnPt0B1S0GTZEPhhd+hw2KGUzBlHuVunj6K4sNuK+reEvyiPwtp0cpaqLzJDmAw=="; + url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.12.5.tgz"; + sha512 = "xa15FbQnias7z9a62LwYAA5SZZPkHIXpd42C6uW68o8uTuua96FHZy1y61Va5P/i83FAAcMpW8+A/QayntzuqA=="; }; }; "@babel/types-7.10.4" = { @@ -1390,22 +1372,22 @@ let sha512 = "UTCFOxC3FsFHb7lkRMVvgLzaRVamXuAs2Tz4wajva4WxtVY82eZeaUBtC2Zt95FU9TiznuC0Zk35tsim8jeVpg=="; }; }; - "@babel/types-7.12.1" = { + "@babel/types-7.12.5" = { name = "_at_babel_slash_types"; packageName = "@babel/types"; - version = "7.12.1"; + version = "7.12.5"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/types/-/types-7.12.1.tgz"; - sha512 = "BzSY3NJBKM4kyatSOWh3D/JJ2O3CVzBybHWxtgxnggaxEuaSTTDqeiSb/xk9lrkw2Tbqyivw5ZU4rT+EfznQsA=="; + url = "https://registry.npmjs.org/@babel/types/-/types-7.12.5.tgz"; + sha512 = "gyTcvz7JFa4V45C0Zklv//GmFOAal5fL23OWpBLqc4nZ4Yrz67s4kCNwSK1Gu0MXGTU8mRY3zJYtacLdKXlzig=="; }; }; - "@bugsnag/browser-7.4.0" = { + "@bugsnag/browser-7.5.1" = { name = "_at_bugsnag_slash_browser"; packageName = "@bugsnag/browser"; - version = "7.4.0"; + version = "7.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/@bugsnag/browser/-/browser-7.4.0.tgz"; - sha512 = "WmBJLCFvM2dvj0ZUCCx2QO9xxKJ1V7qZC4zE3kzxBdEgG1UKmKe2MSOJv8Igr933t6gY7Wzd5e7j6EpRuyvIyg=="; + url = "https://registry.npmjs.org/@bugsnag/browser/-/browser-7.5.1.tgz"; + sha512 = "NLWgSj3elYGSkdth666UxQ6r5Y/zAMidnQZRnOW2ZsW+4W/q+hr7zoN4v5IUnZuoSTQ9QxVYY99wA4hqlDyoJg=="; }; }; "@bugsnag/core-7.3.5" = { @@ -1426,13 +1408,13 @@ let sha512 = "LOt8aaBI+KvOQGneBtpuCz3YqzyEAehd1f3nC5yr9TIYW1+IzYKa2xWS4EiMz5pPOnRPHkyyS5t/wmSmN51Gjg=="; }; }; - "@bugsnag/js-7.4.0" = { + "@bugsnag/js-7.5.1" = { name = "_at_bugsnag_slash_js"; packageName = "@bugsnag/js"; - version = "7.4.0"; + version = "7.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/@bugsnag/js/-/js-7.4.0.tgz"; - sha512 = "v+LA3d1DJf5Oxpy93K+/2TBGHNQoVldNaiN0du/9sUTuc8thkx9tgtaj/BiUWINIEX6y3j7y28cRKUhfffdsIQ=="; + url = "https://registry.npmjs.org/@bugsnag/js/-/js-7.5.1.tgz"; + sha512 = "acbq392QYjZNtUHa5tTp+MLTBhNZhI4s6EBrEFqN1TdxrVVGEFfnQqrPISfKtOJ+FW1dZEZiQ0oEGJ127htqIQ=="; }; }; "@bugsnag/node-7.3.5" = { @@ -1453,13 +1435,13 @@ let sha512 = "htzFO1Zc57S8kgdRK9mLcPVTW1BY2ijfH7Dk2CeZmspTWKdKqSo1iwmqrq2WtRjFlo8aRZYgLX0wFrDXF/9DLA=="; }; }; - "@chemzqm/neovim-5.2.6" = { + "@chemzqm/neovim-5.2.8" = { name = "_at_chemzqm_slash_neovim"; packageName = "@chemzqm/neovim"; - version = "5.2.6"; + version = "5.2.8"; src = fetchurl { - url = "https://registry.npmjs.org/@chemzqm/neovim/-/neovim-5.2.6.tgz"; - sha512 = "9R4k2fvsX79dsNjxEjJaAlhdAZKx/DBGPHOXR3TVwJhX0TFPi9fvmHqJ8YFkAOweAVTXaiOdHv/LMerSBsA5Pw=="; + url = "https://registry.npmjs.org/@chemzqm/neovim/-/neovim-5.2.8.tgz"; + sha512 = "687yDuEK7A+aZ8PcJVD7xLWkbC1WMp41FcCg1SCHuBroEGn2cbIMl7zwM7LeHsPCDMSDyWfYPMqEgUiVgGfrsQ=="; }; }; "@cliqz-oss/firefox-client-0.3.1" = { @@ -1597,6 +1579,24 @@ let sha512 = "HilPrVrCosYWqSyjfpDtaaN1kJwdlBpS+IAflP3z+e7nsEgk3JGJf1Vg0NgHJooTf5HDfXSyZqMVg+5jvXCK0g=="; }; }; + "@emmetio/abbreviation-2.0.2" = { + name = "_at_emmetio_slash_abbreviation"; + packageName = "@emmetio/abbreviation"; + version = "2.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@emmetio/abbreviation/-/abbreviation-2.0.2.tgz"; + sha512 = "kpWg6jyR1YEj/yWceruvDj/fe1BhXqA0tGH3Z2ZiPFo8SDMH4JHg6FChqon5x0CCfLf4zVswrQa0gcZ4XtdRBQ=="; + }; + }; + "@emmetio/css-abbreviation-2.1.2" = { + name = "_at_emmetio_slash_css-abbreviation"; + packageName = "@emmetio/css-abbreviation"; + version = "2.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@emmetio/css-abbreviation/-/css-abbreviation-2.1.2.tgz"; + sha512 = "CvYTzJltVpLqJaCZ1Qn97LVAKsl2Uwl2fzir1EX/WuMY3xWxgc3BWRCheL6k65km6GyDrLVl6RhrrNb/pxOiAQ=="; + }; + }; "@emmetio/extract-abbreviation-0.1.6" = { name = "_at_emmetio_slash_extract-abbreviation"; packageName = "@emmetio/extract-abbreviation"; @@ -1606,13 +1606,13 @@ let sha512 = "Ce3xE2JvTSEbASFbRbA1gAIcMcZWdS2yUYRaQbeM0nbOzaZrUYfa3ePtcriYRZOZmr+CkKA+zbjhvTpIOAYVcw=="; }; }; - "@emmetio/extract-abbreviation-0.2.0" = { - name = "_at_emmetio_slash_extract-abbreviation"; - packageName = "@emmetio/extract-abbreviation"; - version = "0.2.0"; + "@emmetio/scanner-1.0.0" = { + name = "_at_emmetio_slash_scanner"; + packageName = "@emmetio/scanner"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@emmetio/extract-abbreviation/-/extract-abbreviation-0.2.0.tgz"; - sha512 = "eWIRoybKwQ0LkZw7aSULPFS+r2kp0+HdJlnw0HaE6g3AKbMNL4Ogwm2OTA9gNWZ5zdp6daOAOHFqjDqqhE5y/g=="; + url = "https://registry.npmjs.org/@emmetio/scanner/-/scanner-1.0.0.tgz"; + sha512 = "8HqW8EVqjnCmWXVpqAOZf+EGESdkR27odcMMMGefgKXtar00SoYNSryGv//TELI4T3QFsECo78p+0lmalk/CFA=="; }; }; "@emotion/is-prop-valid-0.8.8" = { @@ -1669,6 +1669,15 @@ let sha512 = "4YVwPkANLeNtRjMekzux1ci8hIaH5eGKktGqR0d3LWsKNn5B2X/1Z6Trxy7jQXl9EBGE6Yj02O+t09FMeRllaA=="; }; }; + "@eslint/eslintrc-0.2.1" = { + name = "_at_eslint_slash_eslintrc"; + packageName = "@eslint/eslintrc"; + version = "0.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-0.2.1.tgz"; + sha512 = "XRUeBZ5zBWLYgSANMpThFddrZZkEbGHgUdt5UJjZfnlN9BGCiUBrf+nvbRupSjMvqzwnQN0qwCmOxITt1cfywA=="; + }; + }; "@evocateur/libnpmaccess-3.1.2" = { name = "_at_evocateur_slash_libnpmaccess"; packageName = "@evocateur/libnpmaccess"; @@ -1732,13 +1741,13 @@ let sha512 = "fQRc4+RG+rEw1IdjFx/5t2AvOlJT8ktv2dfObD3aW838ohZxCx1QvFUY/Gdx5JA1JY/KrHRGuEqQLH9ayiexyg=="; }; }; - "@expo/config-3.3.10" = { + "@expo/config-3.3.13" = { name = "_at_expo_slash_config"; packageName = "@expo/config"; - version = "3.3.10"; + version = "3.3.13"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/config/-/config-3.3.10.tgz"; - sha512 = "+ZBOWaIgBhrNKds93pGFQzXAHxu7uqCYyIZsg7EBKFc1gV2TRxwHUKnuespdEQANx6PrshNVzfC95Kbd4jIBPA=="; + url = "https://registry.npmjs.org/@expo/config/-/config-3.3.13.tgz"; + sha512 = "ZFkMQxtk6Zobfc+BPy60rAAuiXFd5ybV7QFF3A7tTy7e6T0/YmuiSMyTM6fqs2c0O47F8/1eoaefXWUl7ppz3w=="; }; }; "@expo/config-types-40.0.0-beta.1" = { @@ -1759,31 +1768,31 @@ let sha512 = "6n7ji1WKDCdLe2Mto4u4W72kTLhAbhXhC7ydVk1HxDYCcbewNLfgiwhchPtPGyUMnSDizVWph5aDoiKxqVHqNQ=="; }; }; - "@expo/dev-server-0.1.35" = { + "@expo/dev-server-0.1.38" = { name = "_at_expo_slash_dev-server"; packageName = "@expo/dev-server"; - version = "0.1.35"; + version = "0.1.38"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/dev-server/-/dev-server-0.1.35.tgz"; - sha512 = "QiOKOQf7IrgXjQPISO0wwncHSLwrtwGg5FC5ewfHbrJSV7KdZXNZT30uWinOVz5by5BB4z0lKXy5E8jIfonc5w=="; + url = "https://registry.npmjs.org/@expo/dev-server/-/dev-server-0.1.38.tgz"; + sha512 = "LOLqo/SpjVfYuSEOicKgCnUzIvbV0oYvXTS9Rr/LBxw3Q/Smy8p8FbYZ/7RTbSnFbCW1oZWERJ+Qe1ghWKbAEw=="; }; }; - "@expo/dev-tools-0.13.53" = { + "@expo/dev-tools-0.13.57" = { name = "_at_expo_slash_dev-tools"; packageName = "@expo/dev-tools"; - version = "0.13.53"; + version = "0.13.57"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/dev-tools/-/dev-tools-0.13.53.tgz"; - sha512 = "vDEnu4cy6pxq6ra7UsB2+Qa8s1M3eF+jUFuvlTcdqJL3tlxbh3WXn63+ZKZWv9TjUdzc0vFx50N/ywBn9S9DoQ=="; + url = "https://registry.npmjs.org/@expo/dev-tools/-/dev-tools-0.13.57.tgz"; + sha512 = "eRP49UYFVytfK7cHA6notnfmCiWvcQ2FOFJABeti2zUa3O55IDP0b/NDqdyLRDpuTxsRZl/K0MBLD5NAUsHMHQ=="; }; }; - "@expo/eas-build-job-0.1.1" = { + "@expo/eas-build-job-0.1.2" = { name = "_at_expo_slash_eas-build-job"; packageName = "@expo/eas-build-job"; - version = "0.1.1"; + version = "0.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/eas-build-job/-/eas-build-job-0.1.1.tgz"; - sha512 = "V5zrRdz6qa45Aflh84CmsEyNcNHG95O7dyzQqpzEI73phB+Jr7ffM+AP0f3+POjy6mwNXIKHgbzH8VG3excPpA=="; + url = "https://registry.npmjs.org/@expo/eas-build-job/-/eas-build-job-0.1.2.tgz"; + sha512 = "hBYVWlEWi8Iu+jWmbzKy2bMsYoWvRwY7MZ+SdKpNvAl+sMpp8rwvxRyRs7cRTa6DuiQ2sdOxqemnw9MJ6S5cRA=="; }; }; "@expo/image-utils-0.3.7" = { @@ -1804,13 +1813,13 @@ let sha512 = "i34lfcMVt5Wv2Cf5apZUj3o9JlFt8WOPSZjrECryunBQ9/BsQQYY5NHgGjhhZnnRE+6JFf0CPQTjXdoQ1w3w0w=="; }; }; - "@expo/metro-config-0.1.35" = { + "@expo/metro-config-0.1.38" = { name = "_at_expo_slash_metro-config"; packageName = "@expo/metro-config"; - version = "0.1.35"; + version = "0.1.38"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/metro-config/-/metro-config-0.1.35.tgz"; - sha512 = "aGAVNXtCMOEVVytOvE0WiuxXT491v0NV+tcZ2+WZC2DBmulor+G+n61Er+4OL0Ke7uXfMk6CLXJA76ZYkBvW/w=="; + url = "https://registry.npmjs.org/@expo/metro-config/-/metro-config-0.1.38.tgz"; + sha512 = "t7BW8cgmm7nmxiY20g1ZMKvXFyDr5Kq+9Ppnskvhg+QffXcY3db/kYSOR0QswscqF5/jBPVGjox7m4+SBKHCDg=="; }; }; "@expo/ngrok-2.4.3" = { @@ -2011,22 +2020,22 @@ let sha512 = "YaFAYYOOxImYNx9s6X3tY6fC1y6rka0KXstrs2zrS+vHyyBD8IOhNtIUvybHScM3jUL+qukgKElAb+7gzlF6Eg=="; }; }; - "@expo/webpack-config-0.12.39" = { + "@expo/webpack-config-0.12.42" = { name = "_at_expo_slash_webpack-config"; packageName = "@expo/webpack-config"; - version = "0.12.39"; + version = "0.12.42"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/webpack-config/-/webpack-config-0.12.39.tgz"; - sha512 = "I2mqVwjjXR8/DAfqzSYwwIrDfnzTEok6dqsJa3D19Du8S0sPv6MjHrbS/U+UCUnR+ccu8j8lb/ovN3RZzUIwVw=="; + url = "https://registry.npmjs.org/@expo/webpack-config/-/webpack-config-0.12.42.tgz"; + sha512 = "VqQIzFiQQQLMQISdmIqBgJHeGD9LO8eP9sI5puW6y8oEB7Cd8asU+DOC3xJVS1MrqK2usQhW5EJhi2wV7RVG8g=="; }; }; - "@expo/xdl-58.0.14" = { + "@expo/xdl-58.0.18" = { name = "_at_expo_slash_xdl"; packageName = "@expo/xdl"; - version = "58.0.14"; + version = "58.0.18"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/xdl/-/xdl-58.0.14.tgz"; - sha512 = "CCVg/+Ys8ZI42oESDD2I2KNQWw35+qjltQaY1AyVSV7ZQRbqfViy+vjpDlBuKLre+iUFmHMI5cP1HvS7dc7NPg=="; + url = "https://registry.npmjs.org/@expo/xdl/-/xdl-58.0.18.tgz"; + sha512 = "CwwLtdEIj857iXwhc10V+gjuepOQ0S21wWM0oKny0TzGSmCz8uVvTCnKK+Geem5hsqyKkCsayirUKTeZ2ToMqA=="; }; }; "@fluentui/date-time-utilities-7.9.0" = { @@ -2056,40 +2065,40 @@ let sha512 = "t3yIbbPKJubb22vQ/FIWwS9vFAzaPYzFxKWPHVWLtxs/P+5yL+LD3B16DRtYreWAdl9CZvEbos58ChLZ0KHwSQ=="; }; }; - "@fluentui/react-7.147.1" = { + "@fluentui/react-7.149.3" = { name = "_at_fluentui_slash_react"; packageName = "@fluentui/react"; - version = "7.147.1"; + version = "7.149.3"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/react/-/react-7.147.1.tgz"; - sha512 = "Zk3MygGDVEHrgKi1M12ETozWRxQ0Go8O9RP/mXqWQUHcXK++KfAO6xJZTpMKQ9o18Sb/ZQwjIrYPpYc6JwuyfA=="; + url = "https://registry.npmjs.org/@fluentui/react/-/react-7.149.3.tgz"; + sha512 = "CmeTmPcqEy+lHCKsxg2Y0QnvU1dfyh8F/3Bkt48yo+B6/eCEUUCQW+Xl3ktp3tvlijdLaskKV68L9lNh3RZP4Q=="; }; }; - "@fluentui/react-focus-7.16.13" = { + "@fluentui/react-focus-7.16.16" = { name = "_at_fluentui_slash_react-focus"; packageName = "@fluentui/react-focus"; - version = "7.16.13"; + version = "7.16.16"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/react-focus/-/react-focus-7.16.13.tgz"; - sha512 = "MWyI64GSEZigYe75aCy8VGGIr/tWwk+H8oqPxamoVOHef4kCqYm/70mhrDpBP1oAhJVmdY/Lia6dtkIz3J9wgw=="; + url = "https://registry.npmjs.org/@fluentui/react-focus/-/react-focus-7.16.16.tgz"; + sha512 = "1YtdaoFUwQWiVfBnhIcMxb0U6ZH3uyk9asfjluW9d6GsUTWczY+PNKZWukIQT1dtpr4+LcOw+F5oSTnzux/Mpg=="; }; }; - "@fluentui/react-window-provider-0.3.3" = { + "@fluentui/react-window-provider-1.0.1" = { name = "_at_fluentui_slash_react-window-provider"; packageName = "@fluentui/react-window-provider"; - version = "0.3.3"; + version = "1.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/react-window-provider/-/react-window-provider-0.3.3.tgz"; - sha512 = "MVPf2hqOQ17LAZsuvGcr3oOHksAskUm+fCYdXFhbVoAgsCDVTIuH6i8XgHFd6YjBtzjZmI4+k/3NTQfDqBX8EQ=="; + url = "https://registry.npmjs.org/@fluentui/react-window-provider/-/react-window-provider-1.0.1.tgz"; + sha512 = "5hvruDyF0uE8+6YN6Y+d2sEzexBadxUNxUjDcDreTPsmtHPwF5FPBYLhoD7T84L5U4YNvKxKh25tYJm6E0GE2w=="; }; }; - "@fluentui/theme-1.5.1" = { + "@fluentui/theme-1.5.4" = { name = "_at_fluentui_slash_theme"; packageName = "@fluentui/theme"; - version = "1.5.1"; + version = "1.5.4"; src = fetchurl { - url = "https://registry.npmjs.org/@fluentui/theme/-/theme-1.5.1.tgz"; - sha512 = "w5986/CN3hWuH44WmlQNxtndBx0khnb1xjISb/4bktRpehYxIlDBmQYRUOUYXr6zwdK7JXJaJPGjOJzSh2DCDg=="; + url = "https://registry.npmjs.org/@fluentui/theme/-/theme-1.5.4.tgz"; + sha512 = "f89jKHET6/f4Z+BzKzs1YXA3mAsBBIDSOtc5ZXfNwYcKPJ0ZqKYtplRz668LcvHdz1ysMR0XxtA0Y5eNUXyLxw=="; }; }; "@graphql-cli/common-4.1.0" = { @@ -2110,22 +2119,31 @@ let sha512 = "RNhQk0jMz6fZB4Ilu37PZj6YUQgSEZJrppXlaHpw/xYyDelcjYKZg/z9eMvYo6rxQPR2mGXjoj6by+zew1WgOw=="; }; }; - "@graphql-tools/delegate-6.2.4" = { - name = "_at_graphql-tools_slash_delegate"; - packageName = "@graphql-tools/delegate"; - version = "6.2.4"; + "@graphql-tools/batch-execute-7.0.0" = { + name = "_at_graphql-tools_slash_batch-execute"; + packageName = "@graphql-tools/batch-execute"; + version = "7.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/delegate/-/delegate-6.2.4.tgz"; - sha512 = "mXe6DfoWmq49kPcDrpKHgC2DSWcD5q0YCaHHoXYPAOlnLH8VMTY8BxcE8y/Do2eyg+GLcwAcrpffVszWMwqw0w=="; + url = "https://registry.npmjs.org/@graphql-tools/batch-execute/-/batch-execute-7.0.0.tgz"; + sha512 = "+ywPfK6N2Ddna6oOa5Qb1Mv7EA8LOwRNOAPP9dL37FEhksJM9pYqPSceUcqMqg7S9b0+Cgr78s408rgvurV3/Q=="; }; }; - "@graphql-tools/graphql-file-loader-6.2.4" = { + "@graphql-tools/delegate-7.0.3" = { + name = "_at_graphql-tools_slash_delegate"; + packageName = "@graphql-tools/delegate"; + version = "7.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@graphql-tools/delegate/-/delegate-7.0.3.tgz"; + sha512 = "BSRF/Wg9XNllWo3Kdt0QBBaFltexn3vAnTOWH1qLrNcmfQAvUMf17/TsAqH9ZLSKU1NW9XCOsd7YMHhhUuTCEg=="; + }; + }; + "@graphql-tools/graphql-file-loader-6.2.5" = { name = "_at_graphql-tools_slash_graphql-file-loader"; packageName = "@graphql-tools/graphql-file-loader"; - version = "6.2.4"; + version = "6.2.5"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/graphql-file-loader/-/graphql-file-loader-6.2.4.tgz"; - sha512 = "IcdUZoOlkCGr0KO8QCO8G031CDDv5dzHBZeN5H1gzE2AVFFwn2AexysrUXBxftm2DQIOuV+Knap7dC4Ol54kNA=="; + url = "https://registry.npmjs.org/@graphql-tools/graphql-file-loader/-/graphql-file-loader-6.2.5.tgz"; + sha512 = "vYDn71FHqwCxWgw8swoVOsD5C0xGz/Lw4zUQnPcgZfAzhAAwl6e/rVWl/HF1UNNSf5CSZu+2oidjOWCI5Wl6Gg=="; }; }; "@graphql-tools/import-6.2.4" = { @@ -2137,13 +2155,13 @@ let sha512 = "Q6fk6hbtDevoEVcgwb3WRn7XOqGY4MnX3Mvc+x8/b8k4RZ4wT+0WSLRDXGAKiVKRxGhgouU2lZVnGE/LDrGSCg=="; }; }; - "@graphql-tools/json-file-loader-6.2.4" = { + "@graphql-tools/json-file-loader-6.2.5" = { name = "_at_graphql-tools_slash_json-file-loader"; packageName = "@graphql-tools/json-file-loader"; - version = "6.2.4"; + version = "6.2.5"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/json-file-loader/-/json-file-loader-6.2.4.tgz"; - sha512 = "1iL6wwZrUt888hExlNEloSpNXuuUFYD2KV2FZ82t6yiq6bO9Iyg12SUuGd5xVXx9jUkdaHRZc0plMyuIA6gTGA=="; + url = "https://registry.npmjs.org/@graphql-tools/json-file-loader/-/json-file-loader-6.2.5.tgz"; + sha512 = "9LS7WuQdSHlRUvXD7ixt5aDpr3hWsueURHOaWe7T0xZ+KWMTw+LIRtWIliCRzbjNmZ+4ZhwHB3Vc1SO2bfYLgg=="; }; }; "@graphql-tools/load-6.2.4" = { @@ -2155,31 +2173,31 @@ let sha512 = "FlQC50VELwRxoWUbJMMMs5gG0Dl8BaQYMrXUHTsxwqR7UmksUYnysC21rdousvs6jVZ7pf4unZfZFtBjz+8Edg=="; }; }; - "@graphql-tools/merge-6.2.4" = { + "@graphql-tools/merge-6.2.5" = { name = "_at_graphql-tools_slash_merge"; packageName = "@graphql-tools/merge"; - version = "6.2.4"; + version = "6.2.5"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/merge/-/merge-6.2.4.tgz"; - sha512 = "hQbiSzCJgzUYG1Aspj5EAUY9DsbTI2OK30GLBOjUI16DWkoLVXLXy4ljQYJxq6wDc4fqixMOmvxwf8FoJ9okmw=="; + url = "https://registry.npmjs.org/@graphql-tools/merge/-/merge-6.2.5.tgz"; + sha512 = "T2UEm7L5MeS1ggbGKBkdV9kTqLqSHQM13RrjPzIAYzkFL/mK837sf+oq8h2+R8B+senuHX8akUhMTcU85kcMvw=="; }; }; - "@graphql-tools/schema-6.2.4" = { + "@graphql-tools/schema-7.0.0" = { name = "_at_graphql-tools_slash_schema"; packageName = "@graphql-tools/schema"; - version = "6.2.4"; + version = "7.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/schema/-/schema-6.2.4.tgz"; - sha512 = "rh+14lSY1q8IPbEv2J9x8UBFJ5NrDX9W5asXEUlPp+7vraLp/Tiox4GXdgyA92JhwpYco3nTf5Bo2JDMt1KnAQ=="; + url = "https://registry.npmjs.org/@graphql-tools/schema/-/schema-7.0.0.tgz"; + sha512 = "yDKgoT2+Uf3cdLYmiFB9lRIGsB6lZhILtCXHgZigYgURExrEPmfj3ZyszfEpPKYcPmKaO9FI4coDhIN0Toxl3w=="; }; }; - "@graphql-tools/url-loader-6.3.0" = { + "@graphql-tools/url-loader-6.4.0" = { name = "_at_graphql-tools_slash_url-loader"; packageName = "@graphql-tools/url-loader"; - version = "6.3.0"; + version = "6.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/url-loader/-/url-loader-6.3.0.tgz"; - sha512 = "lX6A22Rhbqj8FHmkCVSDflolOGy7UtCJGtGbfRuv8/VqD94JfJLnGVFxC1jODURFdj+yrs/97Wm/ntRcpy7nDA=="; + url = "https://registry.npmjs.org/@graphql-tools/url-loader/-/url-loader-6.4.0.tgz"; + sha512 = "M3mS/VH6vpnai3b3Fa33kYcdCgZvhFh7RqFE1R3NMfhYjphQ10EWwgf31P+VQcBNB2zz+ubxttI6UcJLiGqwuQ=="; }; }; "@graphql-tools/utils-6.2.4" = { @@ -2191,13 +2209,22 @@ let sha512 = "ybgZ9EIJE3JMOtTrTd2VcIpTXtDrn2q6eiYkeYMKRVh3K41+LZa6YnR2zKERTXqTWqhobROwLt4BZbw2O3Aeeg=="; }; }; - "@graphql-tools/wrap-6.2.4" = { + "@graphql-tools/utils-7.0.2" = { + name = "_at_graphql-tools_slash_utils"; + packageName = "@graphql-tools/utils"; + version = "7.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@graphql-tools/utils/-/utils-7.0.2.tgz"; + sha512 = "VQQ7krHeoXO0FS3qbWsb/vZb8c8oyiCYPIH4RSgeK9SKOUpatWYt3DW4jmLmyHZLVVMk0yjUbsOhKTBEMejKSA=="; + }; + }; + "@graphql-tools/wrap-7.0.1" = { name = "_at_graphql-tools_slash_wrap"; packageName = "@graphql-tools/wrap"; - version = "6.2.4"; + version = "7.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@graphql-tools/wrap/-/wrap-6.2.4.tgz"; - sha512 = "cyQgpybolF9DjL2QNOvTS1WDCT/epgYoiA8/8b3nwv5xmMBQ6/6nYnZwityCZ7njb7MMyk7HBEDNNlP9qNJDcA=="; + url = "https://registry.npmjs.org/@graphql-tools/wrap/-/wrap-7.0.1.tgz"; + sha512 = "0feqjgEJSRLm2V0kEUaV2dw7ukVPjRujYMqNdcqHsIyXmf0VO8PGF5hcva/+5U/9Yfbf3Fck+P5JTJ5MlXPlsQ=="; }; }; "@gulp-sourcemaps/identity-map-1.0.2" = { @@ -2317,6 +2344,15 @@ let sha512 = "tFJlT47db0kMqVm3H4nQYgn6Pwg10GTZHb1pwmSiv1K4ks6drQOtfEF5ZnPjkvC+y4/bUPHK+bc87QvLcL+WMw=="; }; }; + "@heroku-cli/color-1.1.14" = { + name = "_at_heroku-cli_slash_color"; + packageName = "@heroku-cli/color"; + version = "1.1.14"; + src = fetchurl { + url = "https://registry.npmjs.org/@heroku-cli/color/-/color-1.1.14.tgz"; + sha512 = "2JYy//YE2YINTe21hpdVMBNc7aYFkgDeY9JUz/BCjFZmYLn0UjGaCc4BpTcMGXNJwuqoUenw2WGOFGHsJqlIDw=="; + }; + }; "@iarna/toml-2.2.5" = { name = "_at_iarna_slash_toml"; packageName = "@iarna/toml"; @@ -2749,15 +2785,6 @@ let sha512 = "UK0Fu0eevQlpRXq5ff4o/71HJlpX9wJMddJjMYg9vUqCCl8ZnumRAljfShHFhGyO+Vc9IzN6dd8Y5JZZTp1KOw=="; }; }; - "@josh-brown/vector-3.4.0" = { - name = "_at_josh-brown_slash_vector"; - packageName = "@josh-brown/vector"; - version = "3.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@josh-brown/vector/-/vector-3.4.0.tgz"; - sha512 = "E2FcWwiAMXwr4MUv+SkxmtKsgwgaEaCNK7IlyCfQ1Rz1QzeaV36SooA8/GNkLh0WnlIda59WmDDSL7S1S73lUg=="; - }; - }; "@kwsites/file-exists-1.1.1" = { name = "_at_kwsites_slash_file-exists"; packageName = "@kwsites/file-exists"; @@ -3316,13 +3343,13 @@ let sha512 = "/NdX1Ql8hKNM0vHFJnEr/bcw6BG0ULHD3HhInpniZw5ixpl+n/QIRfMEEmLCn7acedbM1zGdZvU5ZMbn9kcF5Q=="; }; }; - "@microsoft/load-themed-styles-1.10.114" = { + "@microsoft/load-themed-styles-1.10.125" = { name = "_at_microsoft_slash_load-themed-styles"; packageName = "@microsoft/load-themed-styles"; - version = "1.10.114"; + version = "1.10.125"; src = fetchurl { - url = "https://registry.npmjs.org/@microsoft/load-themed-styles/-/load-themed-styles-1.10.114.tgz"; - sha512 = "baefCOffrEAN86rNBY5uVFt1hEH3DMhMVqeKwmbf1L0u51r0KhvMCdQVS9YRi4VHbiufiea2g7vlFf51RDatkQ=="; + url = "https://registry.npmjs.org/@microsoft/load-themed-styles/-/load-themed-styles-1.10.125.tgz"; + sha512 = "qig3jfhrlwvK0tDQc3mrEbg6hUt432FDK4y3zJH9upT068Qrk40s6J62Kv7YW+lIMfX5h/tTi5Y/RyvqwcM+Nw=="; }; }; "@mozilla/readability-0.3.0" = { @@ -3352,13 +3379,13 @@ let sha512 = "Vwhc3ObxmDZmA5hY8mfsau2rJ4vGPvzbj20QSZ2/E1GDPF61QVyjLfNHak9xmel6pW4heRt3v1fHa6np9Ehfeg=="; }; }; - "@nestjs/schematics-7.1.2" = { + "@nestjs/schematics-7.2.1" = { name = "_at_nestjs_slash_schematics"; packageName = "@nestjs/schematics"; - version = "7.1.2"; + version = "7.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/@nestjs/schematics/-/schematics-7.1.2.tgz"; - sha512 = "iUszxXz5cFEZFKKFQGyjx0+U5Emj7ix1rhXmHw1v63xhazlgTbT6XPxf247CTP0uyVkcflWkiVi+JawWWix16A=="; + url = "https://registry.npmjs.org/@nestjs/schematics/-/schematics-7.2.1.tgz"; + sha512 = "yTIwiclX65HYIeemJ/ih3SVlj3BhUHS5eeGy/6uFy1EiIujNadsgi/RZxFSwlCIDkSrGUykqoZdvzfdnsD1Itw=="; }; }; "@netflix/nerror-1.1.3" = { @@ -3370,22 +3397,22 @@ let sha512 = "b+MGNyP9/LXkapreJzNUzcvuzZslj/RGgdVVJ16P2wSlYatfLycPObImqVJSmNAdyeShvNeM/pl3sVZsObFueg=="; }; }; - "@netlify/build-5.0.2" = { + "@netlify/build-5.2.1" = { name = "_at_netlify_slash_build"; packageName = "@netlify/build"; - version = "5.0.2"; + version = "5.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/build/-/build-5.0.2.tgz"; - sha512 = "onXVJtddOP16XuqDTMhorbOObx/z4kMT7E9+h/q1+530D7PNb0ld/38je/xFNjHuysF8nFCinokQIaTt1ySpzg=="; + url = "https://registry.npmjs.org/@netlify/build/-/build-5.2.1.tgz"; + sha512 = "o08VdNJmJvsxGvFkFScpgznrk+lkG72Rv7VHW+K4WkFXsYjbcitM5zjoQizSZwxgQ8/iee9EZn+8zWwjf/K1tw=="; }; }; - "@netlify/cache-utils-1.0.4" = { + "@netlify/cache-utils-1.0.6" = { name = "_at_netlify_slash_cache-utils"; packageName = "@netlify/cache-utils"; - version = "1.0.4"; + version = "1.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/cache-utils/-/cache-utils-1.0.4.tgz"; - sha512 = "edIFfOTcJPlQSdJ5KF91ui7aHaYGzjmmdlWau1QHppym4AMajMKosWPoaOgl/SJ563oUNydYoEOP1nwP89//aw=="; + url = "https://registry.npmjs.org/@netlify/cache-utils/-/cache-utils-1.0.6.tgz"; + sha512 = "Pz/TzLZhMUACT+X7Un6jZCXgEUwLPVNbx69DQtEOMZ6hNBE1b1ErTHFbSaHA0KfDn/yqCII5vS274DERvNuRwg=="; }; }; "@netlify/config-0.11.11" = { @@ -3397,31 +3424,31 @@ let sha512 = "Z7yzbx5qCX2I5RLlNyo0MMQ6GKJc8o5Nej9yspCavjqgYlUS7VJfbeE67WNxC26FXwDUqq00zJ0MrCS0Un1YOw=="; }; }; - "@netlify/config-2.3.4" = { + "@netlify/config-2.3.6" = { name = "_at_netlify_slash_config"; packageName = "@netlify/config"; - version = "2.3.4"; + version = "2.3.6"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/config/-/config-2.3.4.tgz"; - sha512 = "toowJoJ3XE10iHxVWUTYeJL1bLx0N9mDKr2Qidk10UmqJqX8HrIb5pqxtnOxXM+ED+dcdVL++iBvMBNQVIZmmQ=="; + url = "https://registry.npmjs.org/@netlify/config/-/config-2.3.6.tgz"; + sha512 = "50cK+lEnmZdN1Es1jeiiBV8kT5tKbRK9yp4qlUo1CYp3MJxw4RY/duoYnCAy/D1wbdV5poDM5gZpHS+dxF7nmQ=="; }; }; - "@netlify/functions-utils-1.2.10" = { + "@netlify/functions-utils-1.3.2" = { name = "_at_netlify_slash_functions-utils"; packageName = "@netlify/functions-utils"; - version = "1.2.10"; + version = "1.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/functions-utils/-/functions-utils-1.2.10.tgz"; - sha512 = "dgoCm8eLz4F0Jri6sfcv8NR2F7O9SGskh9rnB5UZQ/HqMoBy1Zbab6nsQvwOYUyjRQ6VibXopT2qHNpxYKlQ/g=="; + url = "https://registry.npmjs.org/@netlify/functions-utils/-/functions-utils-1.3.2.tgz"; + sha512 = "1/Jw1p4zxORIC8Nkglzf7bQEIjuALHFfi2e8tEqQfQUZ6pbBNy8bP3pcXZKpYc+fkrYKQaaqpKrfr+GjPHnT2Q=="; }; }; - "@netlify/git-utils-1.0.4" = { + "@netlify/git-utils-1.0.6" = { name = "_at_netlify_slash_git-utils"; packageName = "@netlify/git-utils"; - version = "1.0.4"; + version = "1.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/git-utils/-/git-utils-1.0.4.tgz"; - sha512 = "ZB8X/uU3tcQdR6E2//ZLudEP8RUeRDkDX8PWg6gq6Aaisqjkaqg8OL68jYbIEyd09DrmXuM18KK3WMvYdZ7Wnw=="; + url = "https://registry.npmjs.org/@netlify/git-utils/-/git-utils-1.0.6.tgz"; + sha512 = "JpuvzCTf9QXVEgVA4mSshH6fi9Dtg0Pqe5d19yaN2f1H9DNnWro3kJUaoR68Hfo0rBls6kYwWJuNZ/csb03VuQ=="; }; }; "@netlify/open-api-0.18.1" = { @@ -3433,85 +3460,121 @@ let sha512 = "kkRCzA71HugJxmPOcWv2B4ArHhSMKjs2ArGBr10ndocVLdAHwCYoJm0X4Xt8IYaOcGD9Lm4fbLjpXDLDRGDzPw=="; }; }; - "@netlify/plugin-edge-handlers-1.8.0" = { + "@netlify/plugin-edge-handlers-1.9.0" = { name = "_at_netlify_slash_plugin-edge-handlers"; packageName = "@netlify/plugin-edge-handlers"; - version = "1.8.0"; + version = "1.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/plugin-edge-handlers/-/plugin-edge-handlers-1.8.0.tgz"; - sha512 = "eOU3P8GgRSMKXZWBxMeLZYX3UUwq/w5Hn6BiUyroJ57UkxHFzMsIcsIryt/KW5vKEiLo/pvYZyU0S4WVcbHbWA=="; + url = "https://registry.npmjs.org/@netlify/plugin-edge-handlers/-/plugin-edge-handlers-1.9.0.tgz"; + sha512 = "5JRVj9lVxG3VKI3vUk95AkS2ZatDHEcOBPZ5En4j+vKlfwQpn0oCbTbHQ5V45Zf0dKZv3rULAYZ//vHmVIH/Nw=="; }; }; - "@netlify/run-utils-1.0.3" = { + "@netlify/run-utils-1.0.5" = { name = "_at_netlify_slash_run-utils"; packageName = "@netlify/run-utils"; - version = "1.0.3"; + version = "1.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/run-utils/-/run-utils-1.0.3.tgz"; - sha512 = "o3U+F2vBuTjl84d5EgV0duImNVtPdMjh2MWs9YgI3Gy4rJLVQbQgPezlFV1PvDrgTMBG14iTTZKjaxFXpsA/sg=="; + url = "https://registry.npmjs.org/@netlify/run-utils/-/run-utils-1.0.5.tgz"; + sha512 = "Ovgkw9b7HSLsdhTBA+LNq3KY83gU9DP0xHbwDlg07zLpY3RtRN2IBy11w+nRPjQwfNT33OmuTvayH6amJDku5Q=="; }; }; - "@netlify/zip-it-and-ship-it-1.3.12" = { + "@netlify/traffic-mesh-agent-0.24.0-pre.23" = { + name = "_at_netlify_slash_traffic-mesh-agent"; + packageName = "@netlify/traffic-mesh-agent"; + version = "0.24.0-pre.23"; + src = fetchurl { + url = "https://registry.npmjs.org/@netlify/traffic-mesh-agent/-/traffic-mesh-agent-0.24.0-pre.23.tgz"; + sha512 = "uv5F3grah5C0CPGm8raASIyVDi+lYBR4os+wG0GXkUVCU2r2Pcl8MStLeN3phe1G3AjVkco5WcAKC8XfBvvqEw=="; + }; + }; + "@netlify/traffic-mesh-agent-darwin-x64-0.24.0-pre.23" = { + name = "_at_netlify_slash_traffic-mesh-agent-darwin-x64"; + packageName = "@netlify/traffic-mesh-agent-darwin-x64"; + version = "0.24.0-pre.23"; + src = fetchurl { + url = "https://registry.npmjs.org/@netlify/traffic-mesh-agent-darwin-x64/-/traffic-mesh-agent-darwin-x64-0.24.0-pre.23.tgz"; + sha512 = "XDn77F+tx+qQZ9sMwqmwRAOEm56syA7xO1rScDY4JV8oSyvwa6sfUWnFXefyxUt1uLNfIQhiKDnA4sOyCRJxDw=="; + }; + }; + "@netlify/traffic-mesh-agent-linux-x64-0.24.0-pre.23" = { + name = "_at_netlify_slash_traffic-mesh-agent-linux-x64"; + packageName = "@netlify/traffic-mesh-agent-linux-x64"; + version = "0.24.0-pre.23"; + src = fetchurl { + url = "https://registry.npmjs.org/@netlify/traffic-mesh-agent-linux-x64/-/traffic-mesh-agent-linux-x64-0.24.0-pre.23.tgz"; + sha512 = "9D2sFOcO72IBsqiHgU1Z5tQ6+lvjRBUeOc0iFKgcUPG5eJ46pgrOAD8B8tNd2FscNz2lyrJxZc1kGAOjYikzUQ=="; + }; + }; + "@netlify/traffic-mesh-agent-win32-x64-0.24.0-pre.23" = { + name = "_at_netlify_slash_traffic-mesh-agent-win32-x64"; + packageName = "@netlify/traffic-mesh-agent-win32-x64"; + version = "0.24.0-pre.23"; + src = fetchurl { + url = "https://registry.npmjs.org/@netlify/traffic-mesh-agent-win32-x64/-/traffic-mesh-agent-win32-x64-0.24.0-pre.23.tgz"; + sha512 = "kFImydqG6Er+kgG5UFjIWBp7TxFcf/eOoXSOWr6a+3kJu2iwZP2IdflyNK9EsKdW/KA+W43PXleF4VQwLm830w=="; + }; + }; + "@netlify/zip-it-and-ship-it-1.4.0" = { name = "_at_netlify_slash_zip-it-and-ship-it"; packageName = "@netlify/zip-it-and-ship-it"; - version = "1.3.12"; + version = "1.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/zip-it-and-ship-it/-/zip-it-and-ship-it-1.3.12.tgz"; - sha512 = "FQM/59HXMAKp9k4z6rXDA/FBKFSUaU3n5SFpF2/jScmpCmHBpF+pYIWZmVB4fY17cvq3KIcuSfzf9PqD1B73XQ=="; + url = "https://registry.npmjs.org/@netlify/zip-it-and-ship-it/-/zip-it-and-ship-it-1.4.0.tgz"; + sha512 = "xPJDEMkHnIoHk19enEbg4qiIwszXS8XOUi8UpD4YMA81GXGT0xi16Z17kOACipDG6Tmmy5Jl6pe3cKqQvM/WyQ=="; }; }; - "@node-red/editor-api-1.2.1" = { + "@node-red/editor-api-1.2.2" = { name = "_at_node-red_slash_editor-api"; packageName = "@node-red/editor-api"; - version = "1.2.1"; + version = "1.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/@node-red/editor-api/-/editor-api-1.2.1.tgz"; - sha512 = "Jhf56SKXafBKdnf0HIegmTC3bu23OD1NvIVfWln38DBLMnAptjGGgqEDnB/sv13MJ8CrcNgvoH3XZtQ5FvBqcw=="; + url = "https://registry.npmjs.org/@node-red/editor-api/-/editor-api-1.2.2.tgz"; + sha512 = "5bKIH2lPYiYMYLQIpBplwu4tkuFk4JI24sCOyYsPTkT1EB2zx4qxQndwc+crKjBCMbMvHdh2D3zw9mc1Av9B7g=="; }; }; - "@node-red/editor-client-1.2.1" = { + "@node-red/editor-client-1.2.2" = { name = "_at_node-red_slash_editor-client"; packageName = "@node-red/editor-client"; - version = "1.2.1"; + version = "1.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/@node-red/editor-client/-/editor-client-1.2.1.tgz"; - sha512 = "KO67cvvORLJY1eI2LqcjcZ92jKYmXmkFDcuYnItdQYu1h3g8RcIQwqqU9ZPo16QcjQLdIh1OMEOUxilY404o9w=="; + url = "https://registry.npmjs.org/@node-red/editor-client/-/editor-client-1.2.2.tgz"; + sha512 = "bkNPwzTFhe1AYVydmgqHNfhUsdHfJx261PGLOS9ZJYf9Ww2jVDKXGxHz25qd4lgeRqnUcT7b6T2bOzqVs1zMWA=="; }; }; - "@node-red/nodes-1.2.1" = { + "@node-red/nodes-1.2.2" = { name = "_at_node-red_slash_nodes"; packageName = "@node-red/nodes"; - version = "1.2.1"; + version = "1.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/@node-red/nodes/-/nodes-1.2.1.tgz"; - sha512 = "YHYuxeIiy1v5aBrmHpbiYH2763satuH6DEGYn7hpLgwR+PCcks4AaXAQFPTAwYJ+2r224m9WHkyHGgcvU59QhA=="; + url = "https://registry.npmjs.org/@node-red/nodes/-/nodes-1.2.2.tgz"; + sha512 = "cbHfjdV5QGEQtwYpqZh7ylUnI3zbXmfvcIoGRMXVyhHTgok00ltAgJtJ3PGHSSOsd/OWshPKO2OPoM0xenepTw=="; }; }; - "@node-red/registry-1.2.1" = { + "@node-red/registry-1.2.2" = { name = "_at_node-red_slash_registry"; packageName = "@node-red/registry"; - version = "1.2.1"; + version = "1.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/@node-red/registry/-/registry-1.2.1.tgz"; - sha512 = "2lm60rATnuWNgvMVh+dHS0T6xIJzwuESrMZjowhzdDr5MvUrYcqVq6NEbPWsjCaqjoQyLGJNKPcdJVySRvdvmw=="; + url = "https://registry.npmjs.org/@node-red/registry/-/registry-1.2.2.tgz"; + sha512 = "HTpv/5OmptMkXYzlGfwQZl8lb+e5ta72z0nexNgbox5nc1Cg65CaFvhwcjC9UVK7ROblwDlVnutBG03eZvyOoA=="; }; }; - "@node-red/runtime-1.2.1" = { + "@node-red/runtime-1.2.2" = { name = "_at_node-red_slash_runtime"; packageName = "@node-red/runtime"; - version = "1.2.1"; + version = "1.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/@node-red/runtime/-/runtime-1.2.1.tgz"; - sha512 = "iUJTNFIdmpJ8nh+bkd4h3eO6tS8Kmg9EiAgfWVdnRVftBc0RlYsX/d36QPGE05vq9WZlPhzjfwSUbHXkciU0bw=="; + url = "https://registry.npmjs.org/@node-red/runtime/-/runtime-1.2.2.tgz"; + sha512 = "a4dGwF4BgAYAFyKGGyeLjashn1hstl1i7g2nwGFfnI2hJvF05fzj2lGy8dWE6wYq6c2FZQv4OetAwBfN1akxsg=="; }; }; - "@node-red/util-1.2.1" = { + "@node-red/util-1.2.2" = { name = "_at_node-red_slash_util"; packageName = "@node-red/util"; - version = "1.2.1"; + version = "1.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/@node-red/util/-/util-1.2.1.tgz"; - sha512 = "BQZeeUbkleDh2KG4NMiByHS2FuJXefR9/mMXh1FrF6R1f73VjR6YSifF/knaq5ZR8HAZmFnY0ACep3pb9blUmg=="; + url = "https://registry.npmjs.org/@node-red/util/-/util-1.2.2.tgz"; + sha512 = "7rj3qb/puqcNaHIz12wtLjuJ1pHWsZzPZ+vEubs116SxAas6OVYYLuBGEPhHWeE3zg3t6Erv7wYNaDZeyUm/CQ=="; }; }; "@nodelib/fs.scandir-2.1.3" = { @@ -3595,22 +3658,22 @@ let sha512 = "pBqoKPWmuk9iaEcXlLBVRIA6I1kG9JiICU+sG0NuD6NAR461F+02elHJS4WkQxHW2W5rnsfvP/ClKwmsZ9RaaA=="; }; }; - "@npmcli/promise-spawn-1.2.0" = { + "@npmcli/promise-spawn-1.3.2" = { name = "_at_npmcli_slash_promise-spawn"; packageName = "@npmcli/promise-spawn"; - version = "1.2.0"; + version = "1.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/@npmcli/promise-spawn/-/promise-spawn-1.2.0.tgz"; - sha512 = "nFtqjVETliApiRdjbYwKwhlSHx2ZMagyj5b9YbNt0BWeeOVxJd47ZVE2u16vxDHyTOZvk+YLV7INwfAE9a2uow=="; + url = "https://registry.npmjs.org/@npmcli/promise-spawn/-/promise-spawn-1.3.2.tgz"; + sha512 = "QyAGYo/Fbj4MXeGdJcFzZ+FkDkomfRBrPM+9QYJSg+PxgAUL+LU3FneQk37rKR2/zjqkCV1BLHccX98wRXG3Sg=="; }; }; - "@npmcli/run-script-1.7.2" = { + "@npmcli/run-script-1.7.4" = { name = "_at_npmcli_slash_run-script"; packageName = "@npmcli/run-script"; - version = "1.7.2"; + version = "1.7.4"; src = fetchurl { - url = "https://registry.npmjs.org/@npmcli/run-script/-/run-script-1.7.2.tgz"; - sha512 = "EZO9uXrZrfzdIJsNi/WwrP2jt1P0lbFSxOq15ljgYn1/rr4UyQXUKBZRURioFVbUb7Z1BJDEKswnWrtRybZPzw=="; + url = "https://registry.npmjs.org/@npmcli/run-script/-/run-script-1.7.4.tgz"; + sha512 = "GAeOB6P4/aYyvEbROVHXuSGPgy4wwQN/fGfXP993o9btyuCAOaz0T2cr5Y1y4nSeaBPfhk5W/E/AfFKDt6yG7w=="; }; }; "@oclif/color-0.1.2" = { @@ -3667,6 +3730,15 @@ let sha512 = "yojzeEfmSxjjkAvMRj0KzspXlMjCfBzNRPkWw8ZwOSoNWoJn+OCS/m/S+yfV6BvAM4u2lTzX9Y5rCbrFIgkJLg=="; }; }; + "@oclif/plugin-autocomplete-0.1.5" = { + name = "_at_oclif_slash_plugin-autocomplete"; + packageName = "@oclif/plugin-autocomplete"; + version = "0.1.5"; + src = fetchurl { + url = "https://registry.npmjs.org/@oclif/plugin-autocomplete/-/plugin-autocomplete-0.1.5.tgz"; + sha512 = "Afchpdd8FNfx9GaU/1D9IzyfiXvjfGybgzQ6G4GTFvPO0/hLdkXX3YyYq+SnxE6/bCrhg4pleiB+GuJACmmkEA=="; + }; + }; "@oclif/plugin-autocomplete-0.2.0" = { name = "_at_oclif_slash_plugin-autocomplete"; packageName = "@oclif/plugin-autocomplete"; @@ -3676,6 +3748,15 @@ let sha512 = "pHbaE2PH7d9lHjCgFrrQ+ZIwvY+7OAQaGoaANqDbicBNDK/Rszt4N4oGj22dJT7sCQ8a/3Eh942rjxYIq9Mi9Q=="; }; }; + "@oclif/plugin-help-1.2.11" = { + name = "_at_oclif_slash_plugin-help"; + packageName = "@oclif/plugin-help"; + version = "1.2.11"; + src = fetchurl { + url = "https://registry.npmjs.org/@oclif/plugin-help/-/plugin-help-1.2.11.tgz"; + sha512 = "tuzhvxxRtfLnWa96klngXBi5IwHt9S/twedCbQhl9dYIKTFMHI1BcOQcPra6ylct+M+b9jhEF5sjWLv78tB6tw=="; + }; + }; "@oclif/plugin-help-2.2.3" = { name = "_at_oclif_slash_plugin-help"; packageName = "@oclif/plugin-help"; @@ -3739,22 +3820,22 @@ let sha512 = "60CHpq+eqnTxLZQ4PGHYNwUX572hgpMHGPtTWMjdTMsAvlm69lZV/4ly6O3sAYkomo4NggGcomrDpBe34rxUqw=="; }; }; - "@octokit/auth-token-2.4.2" = { + "@octokit/auth-token-2.4.3" = { name = "_at_octokit_slash_auth-token"; packageName = "@octokit/auth-token"; - version = "2.4.2"; + version = "2.4.3"; src = fetchurl { - url = "https://registry.npmjs.org/@octokit/auth-token/-/auth-token-2.4.2.tgz"; - sha512 = "jE/lE/IKIz2v1+/P0u4fJqv0kYwXOTujKemJMFr6FeopsxlIK3+wKDCJGnysg81XID5TgZQbIfuJ5J0lnTiuyQ=="; + url = "https://registry.npmjs.org/@octokit/auth-token/-/auth-token-2.4.3.tgz"; + sha512 = "fdGoOQ3kQJh+hrilc0Plg50xSfaCKOeYN9t6dpJKXN9BxhhfquL0OzoQXg3spLYymL5rm29uPeI3KEXRaZQ9zg=="; }; }; - "@octokit/endpoint-6.0.8" = { + "@octokit/endpoint-6.0.9" = { name = "_at_octokit_slash_endpoint"; packageName = "@octokit/endpoint"; - version = "6.0.8"; + version = "6.0.9"; src = fetchurl { - url = "https://registry.npmjs.org/@octokit/endpoint/-/endpoint-6.0.8.tgz"; - sha512 = "MuRrgv+bM4Q+e9uEvxAB/Kf+Sj0O2JAOBA131uo1o6lgdq1iS8ejKwtqHgdfY91V3rN9R/hdGKFiQYMzVzVBEQ=="; + url = "https://registry.npmjs.org/@octokit/endpoint/-/endpoint-6.0.9.tgz"; + sha512 = "3VPLbcCuqji4IFTclNUtGdp9v7g+nspWdiCUbK3+iPMjJCZ6LEhn1ts626bWLOn0GiDb6j+uqGvPpqLnY7pBgw=="; }; }; "@octokit/plugin-enterprise-rest-6.0.1" = { @@ -3775,13 +3856,13 @@ let sha512 = "jbsSoi5Q1pj63sC16XIUboklNw+8tL9VOnJsWycWYR78TKss5PVpIPb1TUUcMQ+bBh7cY579cVAWmf5qG+dw+Q=="; }; }; - "@octokit/plugin-request-log-1.0.0" = { + "@octokit/plugin-request-log-1.0.2" = { name = "_at_octokit_slash_plugin-request-log"; packageName = "@octokit/plugin-request-log"; - version = "1.0.0"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/@octokit/plugin-request-log/-/plugin-request-log-1.0.0.tgz"; - sha512 = "ywoxP68aOT3zHCLgWZgwUJatiENeHE7xJzYjfz8WI0goynp96wETBF+d95b8g/uL4QmS6owPVlaxiz3wyMAzcw=="; + url = "https://registry.npmjs.org/@octokit/plugin-request-log/-/plugin-request-log-1.0.2.tgz"; + sha512 = "oTJSNAmBqyDR41uSMunLQKMX0jmEXbwD1fpz8FG27lScV3RhtGfBa1/BBLym+PxcC16IBlF7KH9vP1BUYxA+Eg=="; }; }; "@octokit/plugin-rest-endpoint-methods-2.4.0" = { @@ -3793,13 +3874,13 @@ let sha512 = "EZi/AWhtkdfAYi01obpX0DF7U6b1VRr30QNQ5xSFPITMdLSfhcBqjamE3F+sKcxPbD7eZuMHu3Qkk2V+JGxBDQ=="; }; }; - "@octokit/request-5.4.9" = { + "@octokit/request-5.4.10" = { name = "_at_octokit_slash_request"; packageName = "@octokit/request"; - version = "5.4.9"; + version = "5.4.10"; src = fetchurl { - url = "https://registry.npmjs.org/@octokit/request/-/request-5.4.9.tgz"; - sha512 = "CzwVvRyimIM1h2n9pLVYfTDmX9m+KHSgCpqPsY8F1NdEK8IaWqXhSBXsdjOBFZSpEcxNEeg4p0UO9cQ8EnOCLA=="; + url = "https://registry.npmjs.org/@octokit/request/-/request-5.4.10.tgz"; + sha512 = "egA49HkqEORVGDZGav1mh+VD+7uLgOxtn5oODj6guJk0HCy+YBSYapFkSLFgeYj3Fr18ZULKGURkjyhkAChylw=="; }; }; "@octokit/request-error-1.2.1" = { @@ -3811,13 +3892,13 @@ let sha512 = "+6yDyk1EES6WK+l3viRDElw96MvwfJxCt45GvmjDUKWjYIb3PJZQkq3i46TwGwoPD4h8NmTrENmtyA1FwbmhRA=="; }; }; - "@octokit/request-error-2.0.2" = { + "@octokit/request-error-2.0.3" = { name = "_at_octokit_slash_request-error"; packageName = "@octokit/request-error"; - version = "2.0.2"; + version = "2.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/@octokit/request-error/-/request-error-2.0.2.tgz"; - sha512 = "2BrmnvVSV1MXQvEkrb9zwzP0wXFNbPJij922kYBTLIlIafukrGOb+ABBT2+c6wZiuyWDH1K1zmjGQ0toN/wMWw=="; + url = "https://registry.npmjs.org/@octokit/request-error/-/request-error-2.0.3.tgz"; + sha512 = "GgD5z8Btm301i2zfvJLk/mkhvGCdjQ7wT8xF9ov5noQY8WbKZDH9cOBqXzoeKd1mLr1xH2FwbtGso135zGBgTA=="; }; }; "@octokit/rest-16.43.2" = { @@ -3874,6 +3955,312 @@ let sha512 = "PffXX2AL8Sh0VHQ52jJC4u3T0H6wDK6N/4bg7xh4ngMYOIi13aR1kzVvX1sVDBgfGwDOkMbl4c54Xm3tlPx/+A=="; }; }; + "@ot-builder/bin-composite-types-0.10.31" = { + name = "_at_ot-builder_slash_bin-composite-types"; + packageName = "@ot-builder/bin-composite-types"; + version = "0.10.31"; + src = fetchurl { + url = "https://registry.npmjs.org/@ot-builder/bin-composite-types/-/bin-composite-types-0.10.31.tgz"; + sha512 = "SbyWNIMJZEqPdbJW6P1KaHnLTvTqinm3J9MiNmdOhrEuw1k4jLpatQCYT4jLMDHuD1bRLmzgRshcfbm5Rtb+Kg=="; + }; + }; + "@ot-builder/bin-util-0.10.31" = { + name = "_at_ot-builder_slash_bin-util"; + packageName = "@ot-builder/bin-util"; + version = "0.10.31"; + src = fetchurl { + url = "https://registry.npmjs.org/@ot-builder/bin-util/-/bin-util-0.10.31.tgz"; + sha512 = "bbYcQ582m2uNcJajhPB7St2lXvN4hekaNrMVgQREfaDmHcQycV7NaqM3Q333IYbKNSHehSLBcJ3whVyN1oAOvw=="; + }; + }; + "@ot-builder/cli-help-shower-0.10.31" = { + name = "_at_ot-builder_slash_cli-help-shower"; + packageName = "@ot-builder/cli-help-shower"; + version = "0.10.31"; + src = fetchurl { + url = "https://registry.npmjs.org/@ot-builder/cli-help-shower/-/cli-help-shower-0.10.31.tgz"; + sha512 = "96SdquA87vuHHuwPuTDKrFoKD7g89SddDsmowjdR57N+9tinbwGxNiz3jCK4DycMIebSRwWIq0ls20Veq0uT3g=="; + }; + }; + "@ot-builder/cli-proc-0.10.31" = { + name = "_at_ot-builder_slash_cli-proc"; + packageName = "@ot-builder/cli-proc"; + version = "0.10.31"; + src = fetchurl { + url = "https://registry.npmjs.org/@ot-builder/cli-proc/-/cli-proc-0.10.31.tgz"; + sha512 = "5rt5zCn681qoz8CwwB8HBrSdHv/axOtmtjOAkFuTm1HEOZeAmJt2nRVQwP+08lQLlPhZyiBM57XDqNgohGu+3A=="; + }; + }; + "@ot-builder/cli-shared-0.10.31" = { + name = "_at_ot-builder_slash_cli-shared"; + packageName = "@ot-builder/cli-shared"; + version = "0.10.31"; + src = fetchurl { + url = "https://registry.npmjs.org/@ot-builder/cli-shared/-/cli-shared-0.10.31.tgz"; + sha512 = "54dJvtBCZ2ELNI38F98blPUURwD/cu09sOC68u7WghDrkmcql9UOjCgVsujoLDS52KdpD7DzOxhTu2j6upAZ2w=="; + }; + }; + "@ot-builder/common-impl-0.10.31" = { + name = "_at_ot-builder_slash_common-impl"; + packageName = "@ot-builder/common-impl"; + version = "0.10.31"; + src = fetchurl { + url = "https://registry.npmjs.org/@ot-builder/common-impl/-/common-impl-0.10.31.tgz"; + sha512 = "9cGRXS45fPR9tau81G+zo6J8toEP9ouuE0gTTAL8ZHz84mAeUE3ybTL0pyiBO0fu01LtMgeLxl1w0rBze8T4jw=="; + }; + }; + "@ot-builder/errors-0.10.31" = { + name = "_at_ot-builder_slash_errors"; + packageName = "@ot-builder/errors"; + version = "0.10.31"; + src = fetchurl { + url = "https://registry.npmjs.org/@ot-builder/errors/-/errors-0.10.31.tgz"; + sha512 = "6UvEpFqukndJ2d9T5gvdtMUliK6H8j8g1JrLyG9WNNPMY9NZ7MAHz1vAzR3ZNN9cBZPMy/mYjUf7q1mjs8fiow=="; + }; + }; + "@ot-builder/io-bin-cff-0.10.31" = { + name = "_at_ot-builder_slash_io-bin-cff"; + packageName = "@ot-builder/io-bin-cff"; + version = "0.10.31"; + src = fetchurl { + url = "https://registry.npmjs.org/@ot-builder/io-bin-cff/-/io-bin-cff-0.10.31.tgz"; + sha512 = "ypaCkzW/hDvItKwJ6i5JVsG4YxhLP9M3CNUxSOD5FNH8Ld/AvS2Mt8i1fJdj37O2tAJgFLUj3dET0bWL8Czlvg=="; + }; + }; + "@ot-builder/io-bin-encoding-0.10.31" = { + name = "_at_ot-builder_slash_io-bin-encoding"; + packageName = "@ot-builder/io-bin-encoding"; + version = "0.10.31"; + src = fetchurl { + url = "https://registry.npmjs.org/@ot-builder/io-bin-encoding/-/io-bin-encoding-0.10.31.tgz"; + sha512 = "BsU7+eeG+G7TaE1zdmqP2QqQk97KXYpaY08eAwrZBVoOWbOKClg+GKup4+Cbcy+2ckNZtviYnty18iwzfVNXSQ=="; + }; + }; + "@ot-builder/io-bin-ext-private-0.10.31" = { + name = "_at_ot-builder_slash_io-bin-ext-private"; + packageName = "@ot-builder/io-bin-ext-private"; + version = "0.10.31"; + src = fetchurl { + url = "https://registry.npmjs.org/@ot-builder/io-bin-ext-private/-/io-bin-ext-private-0.10.31.tgz"; + sha512 = "xI/UUgCEfbulXwawyNtPpCNS2cIkDzz81sIK/u83sK7BVUIfrLQmsxX7Qfcnz3fbskbhY0oM2qIbJ5StfbOVHA=="; + }; + }; + "@ot-builder/io-bin-font-0.10.31" = { + name = "_at_ot-builder_slash_io-bin-font"; + packageName = "@ot-builder/io-bin-font"; + version = "0.10.31"; + src = fetchurl { + url = "https://registry.npmjs.org/@ot-builder/io-bin-font/-/io-bin-font-0.10.31.tgz"; + sha512 = "lcXfk5enFMKNd8tGO5aZFVWDqqaHVDl3q6nSNlcrrYGcAxvuoMfwRExgqxT7WSrEn9RNc4GueKfR3CMz0B0dtg=="; + }; + }; + "@ot-builder/io-bin-glyph-store-0.10.31" = { + name = "_at_ot-builder_slash_io-bin-glyph-store"; + packageName = "@ot-builder/io-bin-glyph-store"; + version = "0.10.31"; + src = fetchurl { + url = "https://registry.npmjs.org/@ot-builder/io-bin-glyph-store/-/io-bin-glyph-store-0.10.31.tgz"; + sha512 = "7uL/j0AE+eRE+gdUKVILmRL1lKlBofUk1WQ6JV/HMFI7WcKQNRguifXMUlKARYJLdVJE2XB85q7TejJ8ycPVSA=="; + }; + }; + "@ot-builder/io-bin-layout-0.10.31" = { + name = "_at_ot-builder_slash_io-bin-layout"; + packageName = "@ot-builder/io-bin-layout"; + version = "0.10.31"; + src = fetchurl { + url = "https://registry.npmjs.org/@ot-builder/io-bin-layout/-/io-bin-layout-0.10.31.tgz"; + sha512 = "gLrHGKulldU6G5kMlNyMAofBOz/9/Om0RBvkXvt2djp6ndVFvTXGiWqeS0SdU5CJZxAZWGvKARETWQ4d0foz2g=="; + }; + }; + "@ot-builder/io-bin-metadata-0.10.31" = { + name = "_at_ot-builder_slash_io-bin-metadata"; + packageName = "@ot-builder/io-bin-metadata"; + version = "0.10.31"; + src = fetchurl { + url = "https://registry.npmjs.org/@ot-builder/io-bin-metadata/-/io-bin-metadata-0.10.31.tgz"; + sha512 = "fYJlzf7gTGMntv+/OmIS2KlyGJuFwWQX69L1IH4swV1VJXYC9KlA4GojFyZ1oAZLWBORZ0kuUuvjD/4nox4QCA=="; + }; + }; + "@ot-builder/io-bin-metric-0.10.31" = { + name = "_at_ot-builder_slash_io-bin-metric"; + packageName = "@ot-builder/io-bin-metric"; + version = "0.10.31"; + src = fetchurl { + url = "https://registry.npmjs.org/@ot-builder/io-bin-metric/-/io-bin-metric-0.10.31.tgz"; + sha512 = "6RueaPhQ2r2dTQ4/vncM1TCYjPpJ+N5vyFT4w0SJP30C46g1kn0bryyrhdpG0jvl+pLkty7MbwKOpBxOQ0RtdA=="; + }; + }; + "@ot-builder/io-bin-name-0.10.31" = { + name = "_at_ot-builder_slash_io-bin-name"; + packageName = "@ot-builder/io-bin-name"; + version = "0.10.31"; + src = fetchurl { + url = "https://registry.npmjs.org/@ot-builder/io-bin-name/-/io-bin-name-0.10.31.tgz"; + sha512 = "x7aI+idbaNwJf2Ty9RaEOS/E0aEh33QihM2EhrcT20ui67hnx+99aAUXjVwp7puY0zXARy/u0k99r91SATrLqw=="; + }; + }; + "@ot-builder/io-bin-sfnt-0.10.31" = { + name = "_at_ot-builder_slash_io-bin-sfnt"; + packageName = "@ot-builder/io-bin-sfnt"; + version = "0.10.31"; + src = fetchurl { + url = "https://registry.npmjs.org/@ot-builder/io-bin-sfnt/-/io-bin-sfnt-0.10.31.tgz"; + sha512 = "ssmHoGAuxMe1QkS24+GlxcgjpHoxQDsBQrdTSfh4pkmRP9aSfOrMWLksBgSQCTzRmOwf3lEJH2gz2r3NbsZldw=="; + }; + }; + "@ot-builder/io-bin-ttf-0.10.31" = { + name = "_at_ot-builder_slash_io-bin-ttf"; + packageName = "@ot-builder/io-bin-ttf"; + version = "0.10.31"; + src = fetchurl { + url = "https://registry.npmjs.org/@ot-builder/io-bin-ttf/-/io-bin-ttf-0.10.31.tgz"; + sha512 = "pDWFXlUvguvygBDFpeliDMSKOg/rFprhiyCz6wPokRYwJg8fDS5EDtJOQ6p9/Y0C1V12PWA1O+fucYBfqUmSQw=="; + }; + }; + "@ot-builder/ot-0.10.31" = { + name = "_at_ot-builder_slash_ot"; + packageName = "@ot-builder/ot"; + version = "0.10.31"; + src = fetchurl { + url = "https://registry.npmjs.org/@ot-builder/ot/-/ot-0.10.31.tgz"; + sha512 = "5Cit1J+bxKOgLsB+6jey90eOXLPHiUzJbdNmHrIwUyM5C5ZRXRLg5VRnrYPYZoRCLPaVjG6AXFP+WvALdaLp8A=="; + }; + }; + "@ot-builder/ot-encoding-0.10.31" = { + name = "_at_ot-builder_slash_ot-encoding"; + packageName = "@ot-builder/ot-encoding"; + version = "0.10.31"; + src = fetchurl { + url = "https://registry.npmjs.org/@ot-builder/ot-encoding/-/ot-encoding-0.10.31.tgz"; + sha512 = "cVQZu7ZxOb/Fq2Ilh6ka7vzHXCVyZYOATFthrsV3uZFF3Iz+xefrrK0eh38UEoRopmbqMiPC9U3IHr6A86h+JA=="; + }; + }; + "@ot-builder/ot-ext-private-0.10.31" = { + name = "_at_ot-builder_slash_ot-ext-private"; + packageName = "@ot-builder/ot-ext-private"; + version = "0.10.31"; + src = fetchurl { + url = "https://registry.npmjs.org/@ot-builder/ot-ext-private/-/ot-ext-private-0.10.31.tgz"; + sha512 = "G+TV59TNTa2tKrQ2/wy55dVoOP5uSVv6LfUcM2al5aM6pAjeWMV84BtBzDWH0nPTjlovyEmmiqDoUFgrm2TqYw=="; + }; + }; + "@ot-builder/ot-glyphs-0.10.31" = { + name = "_at_ot-builder_slash_ot-glyphs"; + packageName = "@ot-builder/ot-glyphs"; + version = "0.10.31"; + src = fetchurl { + url = "https://registry.npmjs.org/@ot-builder/ot-glyphs/-/ot-glyphs-0.10.31.tgz"; + sha512 = "qY+O9RIXFalVg707swyfRK9beGDHEAKCGd74Rt9HdZIaWWPYfb+CH22zbwI+gVJEV/NRCTMGpZB1WrdLRm4q4w=="; + }; + }; + "@ot-builder/ot-layout-0.10.31" = { + name = "_at_ot-builder_slash_ot-layout"; + packageName = "@ot-builder/ot-layout"; + version = "0.10.31"; + src = fetchurl { + url = "https://registry.npmjs.org/@ot-builder/ot-layout/-/ot-layout-0.10.31.tgz"; + sha512 = "j1WZRr6V48jIvl0VROBbzI1MPNYJUbrjwwiPdzMpi/Moj/k0tMAO5d/3FKhvVMcvpgXtN/Pe2V3yxz9yXD37pw=="; + }; + }; + "@ot-builder/ot-metadata-0.10.31" = { + name = "_at_ot-builder_slash_ot-metadata"; + packageName = "@ot-builder/ot-metadata"; + version = "0.10.31"; + src = fetchurl { + url = "https://registry.npmjs.org/@ot-builder/ot-metadata/-/ot-metadata-0.10.31.tgz"; + sha512 = "H/Pdmf667+hLQkx7zpBecvwOW8VppxRSLSvKIopd0+TSdiXo9iZrmkkqnIHxA9/KPdvVLh6a/gzfxj5KwMMeDw=="; + }; + }; + "@ot-builder/ot-name-0.10.31" = { + name = "_at_ot-builder_slash_ot-name"; + packageName = "@ot-builder/ot-name"; + version = "0.10.31"; + src = fetchurl { + url = "https://registry.npmjs.org/@ot-builder/ot-name/-/ot-name-0.10.31.tgz"; + sha512 = "38oV/H2n9x9DKl44XDdMWf8fY5lsgIlykxMUXT+2XlBS0Fw1u/S4THLXGhRG8nwcM6eJRzF+diL6/yGPCtpYfQ=="; + }; + }; + "@ot-builder/ot-sfnt-0.10.31" = { + name = "_at_ot-builder_slash_ot-sfnt"; + packageName = "@ot-builder/ot-sfnt"; + version = "0.10.31"; + src = fetchurl { + url = "https://registry.npmjs.org/@ot-builder/ot-sfnt/-/ot-sfnt-0.10.31.tgz"; + sha512 = "hkTeDmNMZqeWq5OwBPy5zpy6cFecfkT/zO6ZiPyqbo8ND6Qp6WoLvkhIST6Bwesh2mApffTKyePbGnHrfWdnkw=="; + }; + }; + "@ot-builder/ot-standard-glyph-namer-0.10.31" = { + name = "_at_ot-builder_slash_ot-standard-glyph-namer"; + packageName = "@ot-builder/ot-standard-glyph-namer"; + version = "0.10.31"; + src = fetchurl { + url = "https://registry.npmjs.org/@ot-builder/ot-standard-glyph-namer/-/ot-standard-glyph-namer-0.10.31.tgz"; + sha512 = "at6KH+5XDfi+7buSy1AayHp0C8N8iEql5PO8ZeTry22uE9mI80spqBShdTbYjI4m7S4rgKxK+Mtx5+Iq1pku1Q=="; + }; + }; + "@ot-builder/prelude-0.10.31" = { + name = "_at_ot-builder_slash_prelude"; + packageName = "@ot-builder/prelude"; + version = "0.10.31"; + src = fetchurl { + url = "https://registry.npmjs.org/@ot-builder/prelude/-/prelude-0.10.31.tgz"; + sha512 = "0GhgWpPaCetCvzJfpC5o11WqEQ0O6ZE5BLyiCC1cLCd2i/4zsyOlXvAUZ2FLvvR8Oz3Q/EtF1uZ12iuIxR75Hw=="; + }; + }; + "@ot-builder/primitive-0.10.31" = { + name = "_at_ot-builder_slash_primitive"; + packageName = "@ot-builder/primitive"; + version = "0.10.31"; + src = fetchurl { + url = "https://registry.npmjs.org/@ot-builder/primitive/-/primitive-0.10.31.tgz"; + sha512 = "1woeCUkc1BxsBNVGw9ALcR4P0Lk3iTK7LkRnMM2VCP+NhoF6aYM81FK1TYMZbmf21nS6OQtyZaT/+10oaZ1Y2A=="; + }; + }; + "@ot-builder/rectify-0.10.31" = { + name = "_at_ot-builder_slash_rectify"; + packageName = "@ot-builder/rectify"; + version = "0.10.31"; + src = fetchurl { + url = "https://registry.npmjs.org/@ot-builder/rectify/-/rectify-0.10.31.tgz"; + sha512 = "QpHhRMGu0Hj1eN3nBKm2BYNHb2UOGi+2ZJP/QmH2GXMdE4LFOWmSN9Mvvubfxr23cjt3VtHK1X/5OBmhcEVfyA=="; + }; + }; + "@ot-builder/stat-glyphs-0.10.31" = { + name = "_at_ot-builder_slash_stat-glyphs"; + packageName = "@ot-builder/stat-glyphs"; + version = "0.10.31"; + src = fetchurl { + url = "https://registry.npmjs.org/@ot-builder/stat-glyphs/-/stat-glyphs-0.10.31.tgz"; + sha512 = "GxSEEaRstSZV40FkF3SDTZceZN9UboBx3f9Kx2mSW2wfmQk14cCvQszLehXJsXnZ2+h9oVgJ8fpzSU0jY5Ip8g=="; + }; + }; + "@ot-builder/trace-0.10.31" = { + name = "_at_ot-builder_slash_trace"; + packageName = "@ot-builder/trace"; + version = "0.10.31"; + src = fetchurl { + url = "https://registry.npmjs.org/@ot-builder/trace/-/trace-0.10.31.tgz"; + sha512 = "hCeRQp1FusNIU3B5gWL+0E5Ionr8RNF3nFk9wIuqYbgQqeaYpJaEcD4brlGp5BrgCqQA6n9pOTpogPMZOffdFw=="; + }; + }; + "@ot-builder/var-store-0.10.31" = { + name = "_at_ot-builder_slash_var-store"; + packageName = "@ot-builder/var-store"; + version = "0.10.31"; + src = fetchurl { + url = "https://registry.npmjs.org/@ot-builder/var-store/-/var-store-0.10.31.tgz"; + sha512 = "adpNdlPmVCrBZBbDTPITLGe/EJpdfgoZJ7vTiR6tQ0gfwkD88r/i9I/YovWYi1v0VonXEIH9IyGlH3iU13zXuw=="; + }; + }; + "@ot-builder/variance-0.10.31" = { + name = "_at_ot-builder_slash_variance"; + packageName = "@ot-builder/variance"; + version = "0.10.31"; + src = fetchurl { + url = "https://registry.npmjs.org/@ot-builder/variance/-/variance-0.10.31.tgz"; + sha512 = "3M2HFcPQs2YGsNdx5XuW+s1fwTnWYW2d/FpdLN9VtVa5THeI3GfUtWHlWgHIrYWycakM9+XPTbueQDTCEf26Cg=="; + }; + }; "@parcel/fs-1.11.0" = { name = "_at_parcel_slash_fs"; packageName = "@parcel/fs"; @@ -3973,13 +4360,13 @@ let sha512 = "uc6FmPEegAZawSHjUMFQwU7EjaDn7zy1iD/KD/wBROL9F4378OES8MKMYHoRAKT61Fk7LxVKZSDR5VespMQiqw=="; }; }; - "@prettier/plugin-pug-1.9.0" = { + "@prettier/plugin-pug-1.10.1" = { name = "_at_prettier_slash_plugin-pug"; packageName = "@prettier/plugin-pug"; - version = "1.9.0"; + version = "1.10.1"; src = fetchurl { - url = "https://registry.npmjs.org/@prettier/plugin-pug/-/plugin-pug-1.9.0.tgz"; - sha512 = "doLga3EPMPiUgO98aUWXoq8YuPLIwUWX0YbwqnSg2URQ7hKGjxlyEeVlAmrERVI3mm9zbwpEEZ02jw0ROd+5+g=="; + url = "https://registry.npmjs.org/@prettier/plugin-pug/-/plugin-pug-1.10.1.tgz"; + sha512 = "HyX0FN8pGdumKS1eiVJ8jbYh8bx2DdbvBOpuKf4+SNP1Z8OFDZorl/q4ShH7oCqMAnFj2kFCpZkuIOkD6gZv7Q=="; }; }; "@primer/octicons-11.0.0" = { @@ -4126,6 +4513,15 @@ let sha512 = "s4f489h5+EJksn4CfheLgv5PGOM0CDmK1UEBLw2t/ncWs3cW2VI7vXzndcd/WJHTv3GntJhXDcJMuL+Z2IAOgg=="; }; }; + "@redocly/react-dropdown-aria-2.0.11" = { + name = "_at_redocly_slash_react-dropdown-aria"; + packageName = "@redocly/react-dropdown-aria"; + version = "2.0.11"; + src = fetchurl { + url = "https://registry.npmjs.org/@redocly/react-dropdown-aria/-/react-dropdown-aria-2.0.11.tgz"; + sha512 = "rmuSC2JFFl4DkPDdGVrmffT9KcbG2AB5jvhxPIrOc1dO9mHRMUUftQY35KZlvWqqSSqVn+AM+J9dhiTo1ZqR8A=="; + }; + }; "@rollup/plugin-babel-5.2.1" = { name = "_at_rollup_slash_plugin-babel"; packageName = "@rollup/plugin-babel"; @@ -4216,13 +4612,13 @@ let sha512 = "c/qwwcHyafOQuVQJj0IlBjf5yYgBI7YPJ77k4fOJYesb41jio65eaJODRUmfYKhTOFBrIZ66kgvGPlNbjuoRdQ=="; }; }; - "@schematics/angular-10.1.7" = { + "@schematics/angular-10.2.0" = { name = "_at_schematics_slash_angular"; packageName = "@schematics/angular"; - version = "10.1.7"; + version = "10.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@schematics/angular/-/angular-10.1.7.tgz"; - sha512 = "jcyLWDSbpgHvB/BNVSsV4uLJpC2qRx9Z5+rcQpBB1BerqIPS/1cTQg7TViHZtcqnZqWvzHR3jfqzDUSOCZpuJQ=="; + url = "https://registry.npmjs.org/@schematics/angular/-/angular-10.2.0.tgz"; + sha512 = "rJRTTTL8CMMFb3ebCvAVHKHxuNzRqy/HtbXhJ82l5Xo/jXcm74eV2Q0RBUrNo1yBKWFIR+FIwiXLJaGcC/R9Pw=="; }; }; "@schematics/schematics-0.1000.7" = { @@ -4234,13 +4630,13 @@ let sha512 = "mucBf5EkhME9O0TvxPeiUTEuudRvEOSjhF/YFHEp/9NZB1JH9lXtBQ60IN6xtCLEbxJmAzhZSns9QPPrHaZRrw=="; }; }; - "@schematics/update-0.1001.7" = { + "@schematics/update-0.1002.0" = { name = "_at_schematics_slash_update"; packageName = "@schematics/update"; - version = "0.1001.7"; + version = "0.1002.0"; src = fetchurl { - url = "https://registry.npmjs.org/@schematics/update/-/update-0.1001.7.tgz"; - sha512 = "q7g/9YaAiqyWxYmUXiSWxB9xwc30xL5iUWY3Rp2LXSH6ihaRsLabmNr743R2YQmMj2Ss+9OhILHmj7nMmqODgw=="; + url = "https://registry.npmjs.org/@schematics/update/-/update-0.1002.0.tgz"; + sha512 = "g2bfJSAj3x/YL0GNhnHsDSQmO6DoxSnLxoFLqNN5+ukxK5jq7OZNDwMJGxZ3X6RcSMWKEkIKL/wlq9yhj2T/kw=="; }; }; "@segment/loosely-validate-event-2.0.0" = { @@ -4270,13 +4666,13 @@ let sha512 = "lOUyRopNTKJYVEU9T6stp2irwlTDsYMmUKBOUjnMcwGveuUfIJqrCOtFLtIPPj3XJlbZy5F68l4KP9rZ8Ipang=="; }; }; - "@serverless/components-3.2.4" = { + "@serverless/components-3.3.0" = { name = "_at_serverless_slash_components"; packageName = "@serverless/components"; - version = "3.2.4"; + version = "3.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/@serverless/components/-/components-3.2.4.tgz"; - sha512 = "J1iCygYu4ol9f3N1I0qkAZjCYxJ46l3bAc+MtIgWtuYc8ItmlqcoukOkTaOuUGM7I4ZoDiDBuK+Q9N8pxhokdw=="; + url = "https://registry.npmjs.org/@serverless/components/-/components-3.3.0.tgz"; + sha512 = "QEjWK9jsIXMh9j/my8HJDtS04bL0TtiLPIr50jfPMUkqnl51thZGHswNwkkuCsmnvcQhZGspD68hIqWPlQRjMw=="; }; }; "@serverless/core-1.1.2" = { @@ -4315,13 +4711,13 @@ let sha512 = "zTJBhzjWtDBogLFnzoz6NYiQ6CThsxuvHQxSbBLcNK4+VQPIkrZOxaQ+dNCNLeLN1Tb3NnZDPNGkoThvgGwq3Q=="; }; }; - "@serverless/platform-client-china-2.0.4" = { + "@serverless/platform-client-china-2.0.7" = { name = "_at_serverless_slash_platform-client-china"; packageName = "@serverless/platform-client-china"; - version = "2.0.4"; + version = "2.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/@serverless/platform-client-china/-/platform-client-china-2.0.4.tgz"; - sha512 = "RNxz22NENCiw1pGPnwYRWVhDSj/4bkLNrsdMvxfv5iao/rFzY01y5HwUjPGKSDwdRQN26d4YiV8ejhFUIV7owA=="; + url = "https://registry.npmjs.org/@serverless/platform-client-china/-/platform-client-china-2.0.7.tgz"; + sha512 = "SuHCHqwCjZXODdSlgetXFGksz+ksAWy3kbCpFhAC9nkiFSWR01CLX4a6UW+VhOeb6j6F3wbkczzqi38P17+USg=="; }; }; "@serverless/platform-sdk-2.3.2" = { @@ -4333,13 +4729,13 @@ let sha512 = "JSX0/EphGVvnb4RAgZYewtBXPuVsU2TFCuXh6EEZ4jxK3WgUwNYeYdwB8EuVLrm1/dYqu/UWUC0rPKb+ZDycJg=="; }; }; - "@serverless/template-1.1.3" = { + "@serverless/template-1.1.4" = { name = "_at_serverless_slash_template"; packageName = "@serverless/template"; - version = "1.1.3"; + version = "1.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/@serverless/template/-/template-1.1.3.tgz"; - sha512 = "hcMiX523rkp6kHeKnM1x6/dXEY+d1UFSr901yVKeeCgpFy4u33UI9vlKaPweAZCF6Ahzqywf01IsFTuBVadCrQ=="; + url = "https://registry.npmjs.org/@serverless/template/-/template-1.1.4.tgz"; + sha512 = "LYC+RmSD4ozStdCxSHInpVWP8h+0sSa0lmPGjAb1Fw4Ppk+LCJqJTrohbhHmF2ixgaIBu6ceNtVTB4qM+2NvIA=="; }; }; "@serverless/utils-1.2.0" = { @@ -4360,13 +4756,13 @@ let sha512 = "yZQT2f8LIZZlH2ibAIvK4C/Ks72Y8CIWmGz04XGCLPHa/ANA6KqlXTKV6zWg/n1PDy2yj2zgX+m509VpIZuDeQ=="; }; }; - "@serverless/utils-china-1.0.7" = { + "@serverless/utils-china-1.0.10" = { name = "_at_serverless_slash_utils-china"; packageName = "@serverless/utils-china"; - version = "1.0.7"; + version = "1.0.10"; src = fetchurl { - url = "https://registry.npmjs.org/@serverless/utils-china/-/utils-china-1.0.7.tgz"; - sha512 = "qE6vzzMbbJc7/ywIUK3ufcZhLlkmjv0yB2rQJkyPnEoauYGa+v1PiGdPOt3u7wty6duTDBUjlR7VgU5HSvTtEA=="; + url = "https://registry.npmjs.org/@serverless/utils-china/-/utils-china-1.0.10.tgz"; + sha512 = "pMl6uW672Tll5rjFAYILxu1EwxSaWBE7r/Tr38sCgDOh0t36sRXiI3oCBHIu/C0tqKFfU1s+coRZbZYKkirCiw=="; }; }; "@sindresorhus/is-0.14.0" = { @@ -4405,6 +4801,15 @@ let sha512 = "JiX9vxoKMmu8Y3Zr2RVathBL1Cdu4Nt4MuNWemt1Nc06A0RAin9c5FArkhGsyMBWfCu4zj+9b+GxtjAnE4qqLQ=="; }; }; + "@sindresorhus/is-4.0.0" = { + name = "_at_sindresorhus_slash_is"; + packageName = "@sindresorhus/is"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@sindresorhus/is/-/is-4.0.0.tgz"; + sha512 = "FyD2meJpDPjyNQejSjvnhpgI/azsQkA4lGbuu5BQZfjvJ9cbRZXzeWL2HceCekW4lixO9JPesIIQkSoLjeJHNQ=="; + }; + }; "@sindresorhus/slugify-1.1.0" = { name = "_at_sindresorhus_slash_slugify"; packageName = "@sindresorhus/slugify"; @@ -4477,6 +4882,15 @@ let sha512 = "h3MMhjVm3BuIruwpDBqnMowKOG9viwr3TJHdIxTHulWKWSsPTTW1AAP3/RaK+UBp1y/Ua9yzeHncKIrzBdT5Nw=="; }; }; + "@snyk/dep-graph-1.20.0" = { + name = "_at_snyk_slash_dep-graph"; + packageName = "@snyk/dep-graph"; + version = "1.20.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@snyk/dep-graph/-/dep-graph-1.20.0.tgz"; + sha512 = "/TOzXGh+JFgAu8pWdo1oLFKDNfFk99TnSQG2lbEu+vKLI2ZrGAk9oGO0geNogAN7Ib4EDQOEhgb7YwqwL7aA7w=="; + }; + }; "@snyk/docker-registry-v2-client-1.13.6" = { name = "_at_snyk_slash_docker-registry-v2-client"; packageName = "@snyk/docker-registry-v2-client"; @@ -4513,13 +4927,13 @@ let sha512 = "rxvSS9sz5h6fNjvUG6NhqYpUI8eok+xLTzLShfnSuDllI3JLxPMc/f7EKv5mv3GLlh1sVCCVXYeyIw3RAg5xQg=="; }; }; - "@snyk/rpm-parser-2.2.0" = { + "@snyk/rpm-parser-2.2.1" = { name = "_at_snyk_slash_rpm-parser"; packageName = "@snyk/rpm-parser"; - version = "2.2.0"; + version = "2.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/@snyk/rpm-parser/-/rpm-parser-2.2.0.tgz"; - sha512 = "aAZaMgmmXZ4hzSRwrpUA2nkAokU+R4ZmaUvVSL4lCyKvt1Bf08b6OLBhJ/z1iJHNsk9IPmzcHr56GUlJX0KeTA=="; + url = "https://registry.npmjs.org/@snyk/rpm-parser/-/rpm-parser-2.2.1.tgz"; + sha512 = "OAON0bPf3c5fgM/GK9DX0aZErB6SnuRyYlPH0rqI1TXGsKrYnVELhaE6ctNbEfPTQuY9r6q0vM+UYDaFM/YliA=="; }; }; "@snyk/snyk-cocoapods-plugin-2.5.1" = { @@ -4855,13 +5269,13 @@ let sha512 = "qZLoYeXSTgQuK1h7QQS16hqLGdmqtRmN8w/rl3Au/l5x/zkHx+a4VHrHyBsi1I1vtK2oBHxSzKIu0R5p6spdOA=="; }; }; - "@types/babel__core-7.1.10" = { + "@types/babel__core-7.1.12" = { name = "_at_types_slash_babel__core"; packageName = "@types/babel__core"; - version = "7.1.10"; + version = "7.1.12"; src = fetchurl { - url = "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.1.10.tgz"; - sha512 = "x8OM8XzITIMyiwl5Vmo2B1cR1S1Ipkyv4mdlbJjMa1lmuKvKY9FrBbEANIaMlnWn5Rf7uO+rC/VgYabNkE17Hw=="; + url = "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.1.12.tgz"; + sha512 = "wMTHiiTiBAAPebqaPiPDLFA4LYPKr6Ph0Xq/6rq1Ur3v66HXyG+clfR9CNETkD7MQS8ZHvpQOtA53DLws5WAEQ=="; }; }; "@types/babel__generator-7.6.2" = { @@ -4936,13 +5350,13 @@ let sha512 = "6ckxMjBBD8URvjB6J3NcnuAn5Pkl7t3TizAg+xdlzzQGSPSmBcXf8KoIH0ua/i+tio+ZRUHEXp0HEmvaR4kt0w=="; }; }; - "@types/chart.js-2.9.23" = { + "@types/chart.js-2.9.24" = { name = "_at_types_slash_chart.js"; packageName = "@types/chart.js"; - version = "2.9.23"; + version = "2.9.24"; src = fetchurl { - url = "https://registry.npmjs.org/@types/chart.js/-/chart.js-2.9.23.tgz"; - sha512 = "4QQNE/b+digosu3mnj4E7aNQGKnlpzXa9JvQYPtexpO7v9gnDeqwc1DxF8vLJWLDCNoO6hH0EgO8K/7PtJl8wg=="; + url = "https://registry.npmjs.org/@types/chart.js/-/chart.js-2.9.24.tgz"; + sha512 = "AQI7X+ow3SaONl44JrHoL/5B+lCsJyG31UHZ5RP98Uh15hI/zjEkDsAb4EIm4P9TGfNhZLXw/nMc5w0u10+/fQ=="; }; }; "@types/clone-2.1.0" = { @@ -4990,22 +5404,22 @@ let sha512 = "t73xJJrvdTjXrn4jLS9VSGRbz0nUY3cl2DMGDU48lKl+HR9dbbjW2A9r3g40VA++mQpy6uuHg33gy7du2BKpog=="; }; }; - "@types/cookies-0.7.4" = { + "@types/cookies-0.7.5" = { name = "_at_types_slash_cookies"; packageName = "@types/cookies"; - version = "0.7.4"; + version = "0.7.5"; src = fetchurl { - url = "https://registry.npmjs.org/@types/cookies/-/cookies-0.7.4.tgz"; - sha512 = "oTGtMzZZAVuEjTwCjIh8T8FrC8n/uwy+PG0yTvQcdZ7etoel7C7/3MSd7qrukENTgQtotG7gvBlBojuVs7X5rw=="; + url = "https://registry.npmjs.org/@types/cookies/-/cookies-0.7.5.tgz"; + sha512 = "3+TAFSm78O7/bAeYdB8FoYGntuT87vVP9JKuQRL8sRhv9313LP2SpHHL50VeFtnyjIcb3UELddMk5Yt0eOSOkg=="; }; }; - "@types/cors-2.8.7" = { + "@types/cors-2.8.8" = { name = "_at_types_slash_cors"; packageName = "@types/cors"; - version = "2.8.7"; + version = "2.8.8"; src = fetchurl { - url = "https://registry.npmjs.org/@types/cors/-/cors-2.8.7.tgz"; - sha512 = "sOdDRU3oRS7LBNTIqwDkPJyq0lpHYcbMTt0TrjzsXbk/e37hcLTH6eZX7CdbDeN0yJJvzw9hFBZkbtCSbk/jAQ=="; + url = "https://registry.npmjs.org/@types/cors/-/cors-2.8.8.tgz"; + sha512 = "fO3gf3DxU2Trcbr75O7obVndW/X5k8rJNZkLXlQWStTHhP71PkRqjwPIEI0yMnJdg9R9OasjU+Bsr+Hr1xy/0w=="; }; }; "@types/debug-0.0.30" = { @@ -5125,6 +5539,15 @@ let sha512 = "dCOT5lcmV/uC2J9k0rPafATeeyz+99xTt54ReX11/LObZgfzJqZNcW27zGhYyX+9iSEGXGt5qLPwRSvBZcLvtQ=="; }; }; + "@types/express-4.17.8" = { + name = "_at_types_slash_express"; + packageName = "@types/express"; + version = "4.17.8"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/express/-/express-4.17.8.tgz"; + sha512 = "wLhcKh3PMlyA2cNAB9sjM1BntnhPMiM0JOBwPBqttjHev2428MLEB4AYVN+d8s2iyCVZac+o41Pflm/ZH5vLXQ=="; + }; + }; "@types/express-serve-static-core-4.17.13" = { name = "_at_types_slash_express-serve-static-core"; packageName = "@types/express-serve-static-core"; @@ -5134,15 +5557,6 @@ let sha512 = "RgDi5a4nuzam073lRGKTUIaL3eF2+H7LJvJ8eUnCI0wA6SNjXc44DCmWNiTLs/AZ7QlsFWZiw/gTG3nSQGL0fA=="; }; }; - "@types/express-serve-static-core-4.17.9" = { - name = "_at_types_slash_express-serve-static-core"; - packageName = "@types/express-serve-static-core"; - version = "4.17.9"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.17.9.tgz"; - sha512 = "DG0BYg6yO+ePW+XoDENYz8zhNGC3jDDEpComMYn7WJc4mY1Us8Rw9ax2YhJXxpyk2SF47PQAoQ0YyVT1a0bEkA=="; - }; - }; "@types/fancy-log-1.3.0" = { name = "_at_types_slash_fancy-log"; packageName = "@types/fancy-log"; @@ -5206,13 +5620,13 @@ let sha512 = "AaXSrIF99SjjtPVNmCmYb388HML+PKEJb/xmj4SbL2ZO0hHuETZZzyDIKfOqaEoAHZEuX4sC+FRFrHYJoIby6A=="; }; }; - "@types/graceful-fs-4.1.3" = { + "@types/graceful-fs-4.1.4" = { name = "_at_types_slash_graceful-fs"; packageName = "@types/graceful-fs"; - version = "4.1.3"; + version = "4.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/@types/graceful-fs/-/graceful-fs-4.1.3.tgz"; - sha512 = "AiHRaEB50LQg0pZmm659vNBb9f4SJ0qrAnteuzhSeAUcJKxoYgEnprg/83kppCnc2zvtCKbdZry1a5pVY3lOTQ=="; + url = "https://registry.npmjs.org/@types/graceful-fs/-/graceful-fs-4.1.4.tgz"; + sha512 = "mWA/4zFQhfvOA8zWkXobwJvBD7vzcxgrOQ0J5CH1votGqdq9m7+FwtGaqyCZqC3NyyBkc9z4m+iry4LlqcMWJg=="; }; }; "@types/graphlib-2.1.7" = { @@ -5233,13 +5647,22 @@ let sha512 = "0TRyJD2o8vbkmJF8InppFcPVcXKk+Rvlg/xvpHBIndSJYpmDWfmtx/ZAtl4f3jR2vfarpTqYgj8MZuJssSoU7Q=="; }; }; - "@types/hls.js-0.13.0" = { + "@types/hast-2.3.1" = { + name = "_at_types_slash_hast"; + packageName = "@types/hast"; + version = "2.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/hast/-/hast-2.3.1.tgz"; + sha512 = "viwwrB+6xGzw+G1eWpF9geV3fnsDgXqHG+cqgiHrvQfDUW5hzhCyV7Sy3UJxhfRFBsgky2SSW33qi/YrIkjX5Q=="; + }; + }; + "@types/hls.js-0.13.1" = { name = "_at_types_slash_hls.js"; packageName = "@types/hls.js"; - version = "0.13.0"; + version = "0.13.1"; src = fetchurl { - url = "https://registry.npmjs.org/@types/hls.js/-/hls.js-0.13.0.tgz"; - sha512 = "zeW+kWWUvMF7x8/M1kLRCX6C41UcKyDZC/Xy6biGqLhd+rkpv2juVO+tCwPSQPQuqL1VtseoQYdONCOxUZ38Sw=="; + url = "https://registry.npmjs.org/@types/hls.js/-/hls.js-0.13.1.tgz"; + sha512 = "5sr71YcHBVHJY8DhM+L6O9WjAGS3jrie2hpBldVpd8sqvRvNTgIikTE6RxKya1ZvJCvUkZR2ewQarZaC4TRZLg=="; }; }; "@types/hosted-git-info-2.7.0" = { @@ -5332,13 +5755,13 @@ let sha512 = "P/W9yOX/3oPZSpaYOCQzGqgCQRXn0FFO/V8bWrCQs+wLmvVVxk6CRBXALEvNs9OHIatlnlFokfhuDo2ug01ciw=="; }; }; - "@types/jquery-3.5.3" = { + "@types/jquery-3.5.4" = { name = "_at_types_slash_jquery"; packageName = "@types/jquery"; - version = "3.5.3"; + version = "3.5.4"; src = fetchurl { - url = "https://registry.npmjs.org/@types/jquery/-/jquery-3.5.3.tgz"; - sha512 = "IENpHTjGksr2wQS6ZO8eMIE0tIB22Ywg+n3/yAWCa56VSZ26phcwAbFdh9+VNUWk7e83qB27QLax3Rf4G92Y9A=="; + url = "https://registry.npmjs.org/@types/jquery/-/jquery-3.5.4.tgz"; + sha512 = "//9CHhaUt/rurMJTxGI+I6DmsNHgYU6d8aSLFfO5dB7+10lwLnaWT0z5GY/yY82Q/M+B+0Qh3TixlJ8vmBeqIw=="; }; }; "@types/js-yaml-3.12.5" = { @@ -5404,13 +5827,13 @@ let sha512 = "MPtoySlAZQ37VoLaPcTHCu1RWJ4llDkULYZIzOYxlhxBqYPB0RsRlmMU0R6tahtFe27mIdkHV+551ZWV4PLmVw=="; }; }; - "@types/koa-2.11.5" = { + "@types/koa-2.11.6" = { name = "_at_types_slash_koa"; packageName = "@types/koa"; - version = "2.11.5"; + version = "2.11.6"; src = fetchurl { - url = "https://registry.npmjs.org/@types/koa/-/koa-2.11.5.tgz"; - sha512 = "egP+ceD3+v9PnFW+DLTFO8mt6wa5sDqfGOBIwOAZ61Wzsq4bGZc5kMpJgcCwq7ARGIBfHBY+KkK/1RsMftV/qQ=="; + url = "https://registry.npmjs.org/@types/koa/-/koa-2.11.6.tgz"; + sha512 = "BhyrMj06eQkk04C97fovEDQMpLpd2IxCB4ecitaXwOKGq78Wi2tooaDOWOFGajPk8IkQOAtMppApgSVkYe1F/A=="; }; }; "@types/koa-compose-3.2.5" = { @@ -5422,22 +5845,22 @@ let sha512 = "B8nG/OoE1ORZqCkBVsup/AKcvjdgoHnfi4pZMn5UwAPCbhk/96xyv284eBYW8JlQbQ7zDmnpFr68I/40mFoIBQ=="; }; }; - "@types/lodash-4.14.158" = { + "@types/lodash-4.14.161" = { name = "_at_types_slash_lodash"; packageName = "@types/lodash"; - version = "4.14.158"; + version = "4.14.161"; src = fetchurl { - url = "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.158.tgz"; - sha512 = "InCEXJNTv/59yO4VSfuvNrZHt7eeNtWQEgnieIA+mIC+MOWM9arOWG2eQ8Vhk6NbOre6/BidiXhkZYeDY9U35w=="; + url = "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.161.tgz"; + sha512 = "EP6O3Jkr7bXvZZSZYlsgt5DIjiGr0dXP1/jVEwVLTFgg0d+3lWVQkRavYVQszV7dYUwvg0B8R0MBDpcmXg7XIA=="; }; }; - "@types/lodash-4.14.162" = { + "@types/lodash-4.14.164" = { name = "_at_types_slash_lodash"; packageName = "@types/lodash"; - version = "4.14.162"; + version = "4.14.164"; src = fetchurl { - url = "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.162.tgz"; - sha512 = "alvcho1kRUnnD1Gcl4J+hK0eencvzq9rmzvFPRmP5rPHx9VVsJj6bKLTATPVf9ktgv4ujzh7T+XWKp+jhuODig=="; + url = "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.164.tgz"; + sha512 = "fXCEmONnrtbYUc5014avwBeMdhHHO8YJCkOBflUL9EoJBSKZ1dei+VO74fA7JkTHZ1GvZack2TyIw5U+1lT8jg=="; }; }; "@types/long-4.0.1" = { @@ -5521,13 +5944,13 @@ let sha512 = "ZvO2tAcjmMi8V/5Z3JsyofMe3hasRcaw88cto5etSVMwVQfeivGAlEYmaQgceUSVYFofVjT+ioHsATjdWcFt1w=="; }; }; - "@types/multer-1.4.3" = { + "@types/multer-1.4.4" = { name = "_at_types_slash_multer"; packageName = "@types/multer"; - version = "1.4.3"; + version = "1.4.4"; src = fetchurl { - url = "https://registry.npmjs.org/@types/multer/-/multer-1.4.3.tgz"; - sha512 = "tWsKbF5LYtXrJ7eOfI0aLBgEv9B7fnJe1JRXTj5+Z6EMfX0yHVsRFsNGnKyN8Bs0gtDv+JR37xAqsPnALyVTqg=="; + url = "https://registry.npmjs.org/@types/multer/-/multer-1.4.4.tgz"; + sha512 = "wdfkiKBBEMTODNbuF3J+qDDSqJxt50yB9pgDiTcFew7f97Gcc7/sM4HR66ofGgpJPOALWOqKAch4gPyqEXSkeQ=="; }; }; "@types/mysql-2.15.15" = { @@ -5539,13 +5962,13 @@ let sha512 = "1GJnq7RwuFPRicMHdT53vza5v39nep9OKIbozxNUpFXP04CydcdWrqpZQ+MlVdlLFCisWnnt09xughajjWpFsw=="; }; }; - "@types/node-10.17.40" = { + "@types/node-10.17.44" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "10.17.40"; + version = "10.17.44"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-10.17.40.tgz"; - sha512 = "3hZT2z2/531A5pc8hYhn1gU5Qb1SIRSgMLQ6zuHA5xtt16lWAxUGprtr8lJuc9zNJMXEIIBWfSnzqBP/4mglpA=="; + url = "https://registry.npmjs.org/@types/node/-/node-10.17.44.tgz"; + sha512 = "vHPAyBX1ffLcy4fQHmDyIUMUb42gHZjPHU66nhvbMzAWJqHnySGZ6STwN3rwrnSd1FHB0DI/RWgGELgKSYRDmw=="; }; }; "@types/node-12.7.12" = { @@ -5557,31 +5980,31 @@ let sha512 = "KPYGmfD0/b1eXurQ59fXD1GBzhSQfz6/lKBxkaHX9dKTzjXbK68Zt7yGUxUsCS1jeTy/8aL+d9JEr+S54mpkWQ=="; }; }; - "@types/node-13.13.26" = { + "@types/node-13.13.30" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "13.13.26"; + version = "13.13.30"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-13.13.26.tgz"; - sha512 = "+48LLqolaKj/WnIY1crfLseaGQMIDISBy3PTXVOZ7w/PBaRUv+H8t94++atzfoBAvorbUYz6Xq9vh1fHrg33ig=="; + url = "https://registry.npmjs.org/@types/node/-/node-13.13.30.tgz"; + sha512 = "HmqFpNzp3TSELxU/bUuRK+xzarVOAsR00hzcvM0TXrMlt/+wcSLa5q6YhTb6/cA6wqDCZLDcfd8fSL95x5h7AA=="; }; }; - "@types/node-14.0.26" = { + "@types/node-14.11.1" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "14.0.26"; + version = "14.11.1"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-14.0.26.tgz"; - sha512 = "W+fpe5s91FBGE0pEa0lnqGLL4USgpLgs4nokw16SrBBco/gQxuua7KnArSEOd5iaMqbbSHV10vUDkJYJJqpXKA=="; + url = "https://registry.npmjs.org/@types/node/-/node-14.11.1.tgz"; + sha512 = "oTQgnd0hblfLsJ6BvJzzSL+Inogp3lq9fGgqRkMB/ziKMgEUaFl801OncOzUmalfzt14N0oPHMK47ipl+wbTIw=="; }; }; - "@types/node-14.11.10" = { + "@types/node-14.14.6" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "14.11.10"; + version = "14.14.6"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-14.11.10.tgz"; - sha512 = "yV1nWZPlMFpoXyoknm4S56y2nlTAuFYaJuQtYRAOU7xA/FJ9RY0Xm7QOkaYMMmr8ESdHIuUb6oQgR/0+2NqlyA=="; + url = "https://registry.npmjs.org/@types/node/-/node-14.14.6.tgz"; + sha512 = "6QlRuqsQ/Ox/aJEQWBEJG7A9+u7oSYl3mem/K8IzxXG/kAGbV1YPD9Bg9Zw3vyxC/YP+zONKwy8hGkSt1jxFMw=="; }; }; "@types/node-6.14.13" = { @@ -5593,22 +6016,22 @@ let sha512 = "J1F0XJ/9zxlZel5ZlbeSuHW2OpabrUAqpFuC2sm2I3by8sERQ8+KCjNKUcq8QHuzpGMWiJpo9ZxeHrqrP2KzQw=="; }; }; - "@types/node-8.10.65" = { + "@types/node-8.10.66" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "8.10.65"; + version = "8.10.66"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-8.10.65.tgz"; - sha512 = "xdcqtQl1g3p/49kmcj7ZixPWOcNHA1tYNz+uN0PJEcgtN6zywK74aacTnd3eFGPuBpD7kK8vowmMRkUt6jHU/Q=="; + url = "https://registry.npmjs.org/@types/node/-/node-8.10.66.tgz"; + sha512 = "tktOkFUA4kXx2hhhrB8bIFb5TbwzS4uOhKEmwiD+NoiL0qtP2OQ9mFldbgD4dV1djrlBYP6eBuQZiWjuHUpqFw=="; }; }; - "@types/node-9.6.60" = { + "@types/node-9.6.61" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "9.6.60"; + version = "9.6.61"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-9.6.60.tgz"; - sha512 = "yoi9MNxtIwaN23LlUnqFiEjS13gg8tgYMCBR8AV34haAFuLswIdCpaYmOcoKLmhhOPwngbs0ZQG7I0EqWTsaRA=="; + url = "https://registry.npmjs.org/@types/node/-/node-9.6.61.tgz"; + sha512 = "/aKAdg5c8n468cYLy2eQrcR5k6chlbNwZNGUj3TboyPa2hcO2QAJcfymlqPzMiRj8B6nYKXjzQz36minFE0RwQ=="; }; }; "@types/node-fetch-2.5.7" = { @@ -5647,13 +6070,13 @@ let sha512 = "kUNnecmtkunAoQ3CnjmMkzNU/gtxG8guhi+Fk2U/kOpIKjIMKnXGp4IJCgQJrXSgMsWYimYG4TGjz/UzbGEBTw=="; }; }; - "@types/pg-7.14.4" = { + "@types/pg-7.14.5" = { name = "_at_types_slash_pg"; packageName = "@types/pg"; - version = "7.14.4"; + version = "7.14.5"; src = fetchurl { - url = "https://registry.npmjs.org/@types/pg/-/pg-7.14.4.tgz"; - sha512 = "yCKVMCcFPZSFHGg+8qjY368uf3ruyDBPjxvOU2ZcGa/vRFo5Ti5Y6z6vl+2hxtwm9VMWUGb6TWkIk3cIV8C0Cw=="; + url = "https://registry.npmjs.org/@types/pg/-/pg-7.14.5.tgz"; + sha512 = "wqTKZmqkqXd1YiVRBT2poRrMIojwEi2bKTAAjUX6nEbzr98jc3cfR/7o7ZtubhH5xT7YJ6LRdRr1GZOgs8OUjg=="; }; }; "@types/pg-types-1.11.5" = { @@ -5764,13 +6187,13 @@ let sha512 = "41qEJgBH/TWgo5NFSvBCJ1qkoi3Q6ONSF2avrHq1LVEZfYpdHmj0y9SuTK+u9ZhG1sYQKBL1AWXKyLWP4RaUoQ=="; }; }; - "@types/serve-static-1.13.5" = { + "@types/serve-static-1.13.6" = { name = "_at_types_slash_serve-static"; packageName = "@types/serve-static"; - version = "1.13.5"; + version = "1.13.6"; src = fetchurl { - url = "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.13.5.tgz"; - sha512 = "6M64P58N+OXjU432WoLLBQxbA0LRGBCRm7aAGQJ+SMC1IMl0dgRVi9EFfoDcS2a7Xogygk/eGN94CfwU9UF7UQ=="; + url = "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.13.6.tgz"; + sha512 = "nuRJmv7jW7VmCVTn+IgYDkkbbDGyIINOeu/G0d74X3lm6E5KfMeQPJhxIt1ayQeQB3cSxvYs1RA/wipYoFB4EA=="; }; }; "@types/sizzle-2.3.2" = { @@ -5782,13 +6205,13 @@ let sha512 = "7EJYyKTL7tFR8+gDbB6Wwz/arpGa0Mywk1TJbNzKzHtzbwVmY4HR9WqS5VV7dsBUKQmPNr192jHr/VpBluj/hg=="; }; }; - "@types/socket.io-2.1.10" = { + "@types/socket.io-2.1.11" = { name = "_at_types_slash_socket.io"; packageName = "@types/socket.io"; - version = "2.1.10"; + version = "2.1.11"; src = fetchurl { - url = "https://registry.npmjs.org/@types/socket.io/-/socket.io-2.1.10.tgz"; - sha512 = "1fQMaDU/x2LPljEI/QI5IKl8sBYHM/zv32YYKvNrVEor7/1+MLqMqmWt8Bb8Vpf+PlIPBiTTC0BnrRx7ju3xOw=="; + url = "https://registry.npmjs.org/@types/socket.io/-/socket.io-2.1.11.tgz"; + sha512 = "bVprmqPhJMLb9ZCm8g0Xy8kwBFRbnanOWSxzWkDkkIwxTvud5tKMfAJymXX6LQbizUKCS1yima7JM4BeLqjNqA=="; }; }; "@types/socket.io-client-1.4.33" = { @@ -5872,13 +6295,13 @@ let sha512 = "I99sngh224D0M7XgW1s120zxCt3VYQ3IQsuw3P3jbq5GG4yc79+ZjyKznyOGIQrflfylLgcfekeZW/vk0yng6A=="; }; }; - "@types/uglify-js-3.11.0" = { + "@types/uglify-js-3.11.1" = { name = "_at_types_slash_uglify-js"; packageName = "@types/uglify-js"; - version = "3.11.0"; + version = "3.11.1"; src = fetchurl { - url = "https://registry.npmjs.org/@types/uglify-js/-/uglify-js-3.11.0.tgz"; - sha512 = "I0Yd8TUELTbgRHq2K65j8rnDPAzAP+DiaF/syLem7yXwYLsHZhPd+AM2iXsWmf9P2F2NlFCgl5erZPQx9IbM9Q=="; + url = "https://registry.npmjs.org/@types/uglify-js/-/uglify-js-3.11.1.tgz"; + sha512 = "7npvPKV+jINLu1SpSYVWG8KvyJBhBa8tmzMMdDoVc2pWUYHN8KIXlPJhjJ4LT97c4dXJA2SHL/q6ADbDriZN+Q=="; }; }; "@types/unist-2.0.3" = { @@ -5935,13 +6358,13 @@ let sha512 = "2j9WVnNrr/8PLAB5csW44xzQSJwS26aOnICsP3pSGCEdsu6KYtfQ6QJsVUKHWRnm1bL7HziJsfh5fHqth87yKA=="; }; }; - "@types/webpack-4.41.22" = { + "@types/webpack-4.41.24" = { name = "_at_types_slash_webpack"; packageName = "@types/webpack"; - version = "4.41.22"; + version = "4.41.24"; src = fetchurl { - url = "https://registry.npmjs.org/@types/webpack/-/webpack-4.41.22.tgz"; - sha512 = "JQDJK6pj8OMV9gWOnN1dcLCyU9Hzs6lux0wBO4lr1+gyEhIBR9U3FMrz12t2GPkg110XAxEAw2WHF6g7nZIbRQ=="; + url = "https://registry.npmjs.org/@types/webpack/-/webpack-4.41.24.tgz"; + sha512 = "1A0MXPwZiMOD3DPMuOKUKcpkdPo8Lq33UGggZ7xio6wJ/jV1dAu5cXDrOfGDnldUroPIRLsr/DT43/GqOA4RFQ=="; }; }; "@types/webpack-sources-2.0.0" = { @@ -5962,13 +6385,13 @@ let sha512 = "f5WLMpezwVxCLm1xQe/kdPpQIOmL0TXYx2O15VYfYzc7hTIdxiOoOvez+McSIw3b7z/1zGovew9YSL7+h4h7/Q=="; }; }; - "@types/ws-7.2.7" = { + "@types/ws-7.2.9" = { name = "_at_types_slash_ws"; packageName = "@types/ws"; - version = "7.2.7"; + version = "7.2.9"; src = fetchurl { - url = "https://registry.npmjs.org/@types/ws/-/ws-7.2.7.tgz"; - sha512 = "UUFC/xxqFLP17hTva8/lVT0SybLUrfSD9c+iapKb0fEiC8uoDbA+xuZ3pAN603eW+bY8ebSMLm9jXdIPnD0ZgA=="; + url = "https://registry.npmjs.org/@types/ws/-/ws-7.2.9.tgz"; + sha512 = "gmXYAXr7G4BrRMnkGQGkGonc3ArVro9VZd//C1uns/qqsJyl2dxaJdlPMhZbcq5MTxFFC+ttFWtHSfVW5+hlRA=="; }; }; "@types/yargs-13.0.11" = { @@ -6088,22 +6511,22 @@ let sha512 = "9JgC82AaQeglebjZMgYR5wgmfUdUc+EitGUUMW8u2nDckaeimzW+VsoLV6FoimPv2id3VQzfjwBxEMVz08ameQ=="; }; }; - "@uifabric/foundation-7.9.14" = { + "@uifabric/foundation-7.9.18" = { name = "_at_uifabric_slash_foundation"; packageName = "@uifabric/foundation"; - version = "7.9.14"; + version = "7.9.18"; src = fetchurl { - url = "https://registry.npmjs.org/@uifabric/foundation/-/foundation-7.9.14.tgz"; - sha512 = "AWsSt28+mid44YPofHB8N1nm4C0QmLJ9WXFps5GyjaBHES6/4bfJ7rKzYioa5bN0TxElyK8rRHzwqKNQhWDBYA=="; + url = "https://registry.npmjs.org/@uifabric/foundation/-/foundation-7.9.18.tgz"; + sha512 = "xDDuKAyYNEppKF7lFqolUTQoIYbv70f2teLudsh0yeRDVoISNT4A87nDc/Xa4bkTwttc9Di+D1HEZWP9Wqpj1w=="; }; }; - "@uifabric/icons-7.5.12" = { + "@uifabric/icons-7.5.15" = { name = "_at_uifabric_slash_icons"; packageName = "@uifabric/icons"; - version = "7.5.12"; + version = "7.5.15"; src = fetchurl { - url = "https://registry.npmjs.org/@uifabric/icons/-/icons-7.5.12.tgz"; - sha512 = "VIqj4oMwi4HJPqH3+3RblLoYjPfYzjVyZ8Kk57dmA7tj+vbM38Zn9vObe+Xg/EVEfohD3kD0fyEqPmnEqY17Pg=="; + url = "https://registry.npmjs.org/@uifabric/icons/-/icons-7.5.15.tgz"; + sha512 = "jNrPY7lsEs7gPUXokIYFxZs4TuX5Xiivx/KtxtoZKM4cpurLJx3ddCyOMp+kNn1ljzaNKNbcJae/ONB/jMJkQA=="; }; }; "@uifabric/merge-styles-7.19.1" = { @@ -6115,13 +6538,13 @@ let sha512 = "yqUwmk62Kgu216QNPE9vOfS3h0kiSbTvoqM5QcZi+IzpqsBOlzZx3A9Er9UiDaqHRd5lsYF5pO/jeUULmBWF/A=="; }; }; - "@uifabric/react-hooks-7.13.6" = { + "@uifabric/react-hooks-7.13.9" = { name = "_at_uifabric_slash_react-hooks"; packageName = "@uifabric/react-hooks"; - version = "7.13.6"; + version = "7.13.9"; src = fetchurl { - url = "https://registry.npmjs.org/@uifabric/react-hooks/-/react-hooks-7.13.6.tgz"; - sha512 = "DvfphxrTsjo3oYioRZ0D8mXdpxWQhhIHeWk1cfdq0MVGqRyKM+cm++9pJpvItFvnTNba38jzKdggqRSUWi+clg=="; + url = "https://registry.npmjs.org/@uifabric/react-hooks/-/react-hooks-7.13.9.tgz"; + sha512 = "VtDg2b3ypYXX7MLp1STk1Fj6ZIeZktXnm0hu1Os/pGvq6xkuLRly5XP6ZSHitm8K7ZcMo48CcNL8smmiXprBQg=="; }; }; "@uifabric/set-version-7.0.23" = { @@ -6133,22 +6556,22 @@ let sha512 = "9E+YKtnH2kyMKnK9XZZsqyM8OCxEJIIfxtaThTlQpYOzrWAGJxQADFbZ7+Usi0U2xHnWNPFROjq+B9ocEzhqMA=="; }; }; - "@uifabric/styling-7.16.13" = { + "@uifabric/styling-7.16.16" = { name = "_at_uifabric_slash_styling"; packageName = "@uifabric/styling"; - version = "7.16.13"; + version = "7.16.16"; src = fetchurl { - url = "https://registry.npmjs.org/@uifabric/styling/-/styling-7.16.13.tgz"; - sha512 = "jj5FH7XuQXz8HgRhCXNApeUAynDBv2nfmTpzHawE55x7YR+oliQfsJSY8Ow4YbLAazIR5BuW1n9eKuGxxmIw1w=="; + url = "https://registry.npmjs.org/@uifabric/styling/-/styling-7.16.16.tgz"; + sha512 = "FFRXMjRPCagj+fN1o8O/FsbO7jHqVKEJyKT5j+zCwl0yBx5XqbQLcX9wzAEdBItB4anlgO7C5ZtFBUholwcCiA=="; }; }; - "@uifabric/utilities-7.32.4" = { + "@uifabric/utilities-7.33.2" = { name = "_at_uifabric_slash_utilities"; packageName = "@uifabric/utilities"; - version = "7.32.4"; + version = "7.33.2"; src = fetchurl { - url = "https://registry.npmjs.org/@uifabric/utilities/-/utilities-7.32.4.tgz"; - sha512 = "IKZc03uyfTrgcCGSPAUWfFl9CyxzpSrxrYwAuO4NgDEySdOlkYBRwsRUh6UwWfM+sJdhg7Y3nupzNU3VSC/arg=="; + url = "https://registry.npmjs.org/@uifabric/utilities/-/utilities-7.33.2.tgz"; + sha512 = "v2c3IUJdpru/hoGNOwIW549O5D4XBAc5sLpB7RREGI5ywoWuIJlNyYtBEGOwhAY62J2blj11qi86Ep+oZDM/Kw=="; }; }; "@ungap/from-entries-0.2.1" = { @@ -6169,6 +6592,15 @@ let sha512 = "sL/cEvJWAnClXw0wHk85/2L0G6Sj8UB0Ctc1TEMbKSsmpRosqhwj9gWgFRZSrBr2f9tiXISwNhCPmlfqUqyb9Q=="; }; }; + "@unicode/unicode-13.0.0-1.0.2" = { + name = "_at_unicode_slash_unicode-13.0.0"; + packageName = "@unicode/unicode-13.0.0"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@unicode/unicode-13.0.0/-/unicode-13.0.0-1.0.2.tgz"; + sha512 = "OKI6clBZqvMBlPKbH1tv3ChmkqRcyCfB6ulHqEX+9asjN5BVXs7tH7aOi+SExCNsmCVB8uJ1ZcvjuwaHsCtUeg=="; + }; + }; "@vue/cli-shared-utils-4.5.8" = { name = "_at_vue_slash_cli-shared-utils"; packageName = "@vue/cli-shared-utils"; @@ -6205,76 +6637,76 @@ let sha512 = "y3vnCLQxUgZ/entdvv6vut7uQwmIp+ichxBay4yy8TjtpBxdVH0EXAByi+6rJlO2sotlvmRdnZU7AV7tz1yLsw=="; }; }; - "@vue/compiler-core-3.0.1" = { + "@vue/compiler-core-3.0.2" = { name = "_at_vue_slash_compiler-core"; packageName = "@vue/compiler-core"; - version = "3.0.1"; + version = "3.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.0.1.tgz"; - sha512 = "BbQQj9YVNaNWEPnP4PiFKgW8QSGB3dcPSKCtekx1586m4VA1z8hHNLQnzeygtV8BM4oU6yriiWmOIYghbJHwFw=="; + url = "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.0.2.tgz"; + sha512 = "GOlEMTlC/OdzBkKaKOniYErbkjoKxkBOmulxGmMR10I2JJX6TvXd/peaO/kla2xhpliV/M6Z4TLJp0yjAvRIAw=="; }; }; - "@vue/compiler-dom-3.0.1" = { + "@vue/compiler-dom-3.0.2" = { name = "_at_vue_slash_compiler-dom"; packageName = "@vue/compiler-dom"; - version = "3.0.1"; + version = "3.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.0.1.tgz"; - sha512 = "8cjgswVU2YmV35H9ARZmSlDr1P9VZxUihRwefkrk6Vrsb7kui5C3d/WQ2/su34FSDpyMU1aacUOiL2CV/vdX6w=="; + url = "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.0.2.tgz"; + sha512 = "jvaL4QF2yXBJVD+JLbM2YA3e5fNfflJnfQ+GtfYk46ENGsEetqbkZqcX7fO+RHdG8tZBo7LCNBvgD0QLr+V4sg=="; }; }; - "@vue/compiler-sfc-3.0.1" = { + "@vue/compiler-sfc-3.0.2" = { name = "_at_vue_slash_compiler-sfc"; packageName = "@vue/compiler-sfc"; - version = "3.0.1"; + version = "3.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.0.1.tgz"; - sha512 = "VO5gJ7SyHw0hf1rkKXRlxjXI9+Q4ngcuUWYnyjOSDch7Wtt2IdOEiC82KFWIkfWMpHqA5HPzL2nDmys3y9d19w=="; + url = "https://registry.npmjs.org/@vue/compiler-sfc/-/compiler-sfc-3.0.2.tgz"; + sha512 = "viYjT5ehDSLM3v0jQ9hbTs4I5e/7lSlYsDOp7TQ1qcwHRvzoTQMTkFpY/Iae+LFKM124Ld17tBfXgfrZl9dt+g=="; }; }; - "@vue/compiler-ssr-3.0.1" = { + "@vue/compiler-ssr-3.0.2" = { name = "_at_vue_slash_compiler-ssr"; packageName = "@vue/compiler-ssr"; - version = "3.0.1"; + version = "3.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.0.1.tgz"; - sha512 = "U0Vb7BOniw9rY0/YvXNw5EuIuO0dCoZd3XhnDjAKL9A5pSBxTlx6fPJeQ53gV0XH40M5z8q4yXukFqSVTXC6hQ=="; + url = "https://registry.npmjs.org/@vue/compiler-ssr/-/compiler-ssr-3.0.2.tgz"; + sha512 = "gOgK1lf+0bFl+kQj6TU0TU1jIDFlsPRlSBZaUUA16DGeeiJrFanhsMuIs/l9U0IBFr/VJcHgzYpTXqHp95luHw=="; }; }; - "@vue/reactivity-3.0.1" = { + "@vue/reactivity-3.0.2" = { name = "_at_vue_slash_reactivity"; packageName = "@vue/reactivity"; - version = "3.0.1"; + version = "3.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/reactivity/-/reactivity-3.0.1.tgz"; - sha512 = "XWeqNTbvcAq8BmtR5M+XU6mfIhzi1NTcrQho7nI03I+Zf6QW1hHl/ri+iNfCNCasukQI/tzpkqJYPfyZxCRKyg=="; + url = "https://registry.npmjs.org/@vue/reactivity/-/reactivity-3.0.2.tgz"; + sha512 = "GdRloNcBar4yqWGXOcba1t//j/WizwfthfPUYkjcIPHjYnA/vTEQYp0C9+ZjPdinv1WRK1BSMeN/xj31kQES4A=="; }; }; - "@vue/runtime-core-3.0.1" = { + "@vue/runtime-core-3.0.2" = { name = "_at_vue_slash_runtime-core"; packageName = "@vue/runtime-core"; - version = "3.0.1"; + version = "3.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/runtime-core/-/runtime-core-3.0.1.tgz"; - sha512 = "HporlL3cbD0/79U0a7mDIMEn5XoxstVXrOx0TDTi2O2CUv6yjteUQdxhmMOa8m7pnqU4DL/ZuVntBWFaf4ccaw=="; + url = "https://registry.npmjs.org/@vue/runtime-core/-/runtime-core-3.0.2.tgz"; + sha512 = "3m/jOs2xSipEFah9FgpEzvC9nERFonVGLN06+pf8iYPIy54Nlv7D2cyrk3Lhbjz4w3PbIrkxJnoTJYvJM7HDfA=="; }; }; - "@vue/runtime-dom-3.0.1" = { + "@vue/runtime-dom-3.0.2" = { name = "_at_vue_slash_runtime-dom"; packageName = "@vue/runtime-dom"; - version = "3.0.1"; + version = "3.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/runtime-dom/-/runtime-dom-3.0.1.tgz"; - sha512 = "ijb2qTRU8OzllzYQ6BSymuu9KHFDyjzn4m6jcLGlNeazdk1/YA01lFtGkl6oAErdiWPglloUJzIz0ilv0laPwA=="; + url = "https://registry.npmjs.org/@vue/runtime-dom/-/runtime-dom-3.0.2.tgz"; + sha512 = "vqC1KK1yWthTw1FKzajT0gYQaEqAq7bpeeXQC473nllGC5YHbJhNAJLSmrDun1tjXqGF0UNCWYljYm+++BJv6w=="; }; }; - "@vue/shared-3.0.1" = { + "@vue/shared-3.0.2" = { name = "_at_vue_slash_shared"; packageName = "@vue/shared"; - version = "3.0.1"; + version = "3.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/shared/-/shared-3.0.1.tgz"; - sha512 = "/X6AUbTFCyD2BcJnBoacUct8qcv1A5uk1+N+3tbzDVuhGPRmoYrTSnNUuF53C/GIsTkChrEiXaJh2kyo/0tRvw=="; + url = "https://registry.npmjs.org/@vue/shared/-/shared-3.0.2.tgz"; + sha512 = "Zx869zlNoujFOclKIoYmkh8ES2RcS/+Jn546yOiPyZ+3+Ejivnr+fb8l+DdXUEFjo+iVDNR3KyLzg03aBFfZ4Q=="; }; }; "@webassemblyjs/ast-1.8.1" = { @@ -7177,13 +7609,13 @@ let sha1 = "f291be701a2efc567a63fc7aa6afcded31430be1"; }; }; - "addons-linter-2.7.0" = { + "addons-linter-2.9.0" = { name = "addons-linter"; packageName = "addons-linter"; - version = "2.7.0"; + version = "2.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/addons-linter/-/addons-linter-2.7.0.tgz"; - sha512 = "kH+0fAKSc461PnCyYQ0/SeKcxEQ2zxCZwG2GB6xjvfkMiMAwwic87VP62Cffc8H/zHEfYuT8uFmy42ayH5mqEQ=="; + url = "https://registry.npmjs.org/addons-linter/-/addons-linter-2.9.0.tgz"; + sha512 = "OrkDQ9S/GAJzMe+izsFMFOtRq9geFFt3O5c7Fi6pehGi7RY2PSMpPmKjMK1j/rPa9jrG0e9zocptMrOi11uvug=="; }; }; "addr-to-ip-port-1.5.1" = { @@ -7204,15 +7636,6 @@ let sha512 = "aT6camzM4xEA54YVJYSqxz1kv4IHnQZRtThJJHhUMRExaU5spC7jX5ugSwTaTgJliIgs4VhZOk7htClvQ/LmRA=="; }; }; - "adm-zip-0.4.13" = { - name = "adm-zip"; - packageName = "adm-zip"; - version = "0.4.13"; - src = fetchurl { - url = "https://registry.npmjs.org/adm-zip/-/adm-zip-0.4.13.tgz"; - sha512 = "fERNJX8sOXfel6qCBCMPvZLzENBEhZTzKqg6vrOW5pvoEaQuJhRU4ndTAh6lHOxn1I6jnz2NHra56ZODM751uw=="; - }; - }; "adm-zip-0.4.16" = { name = "adm-zip"; packageName = "adm-zip"; @@ -7294,13 +7717,13 @@ let sha512 = "TMeqbNl2fMW0nMjTEPOwe3J/PRFP4vqeoNuQMG0HlMrtm5QxKqdvAkZ1pRBQ/ulIyDD5Yq0nJ7YbdD8ey0TO3g=="; }; }; - "agent-base-6.0.1" = { + "agent-base-6.0.2" = { name = "agent-base"; packageName = "agent-base"; - version = "6.0.1"; + version = "6.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/agent-base/-/agent-base-6.0.1.tgz"; - sha512 = "01q25QQDwLSsyfhrKbn8yuur+JNw0H+0Y4JiGIKd3z9aYk/w/2kxD/Upc+t2ZBBSUNff50VjPsSW2YxM8QYKVg=="; + url = "https://registry.npmjs.org/agent-base/-/agent-base-6.0.2.tgz"; + sha512 = "RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ=="; }; }; "agentkeepalive-3.5.2" = { @@ -7402,15 +7825,6 @@ let sha512 = "eienB2c9qVQs2KWexhkrdMLVDoIQCz5KSeLxwg9Lzk4DOfBtIK9PQwwufcsn1jjGuf9WZmqPMbGxOzfcuphJCQ=="; }; }; - "ajv-6.12.5" = { - name = "ajv"; - packageName = "ajv"; - version = "6.12.5"; - src = fetchurl { - url = "https://registry.npmjs.org/ajv/-/ajv-6.12.5.tgz"; - sha512 = "lRF8RORchjpKG50/WFf8xmg7sgCLFiYNNnqdKflk63whMQcWR5ngGjiSXkL9bjxy6B2npOK2HSMN49jEBMSkag=="; - }; - }; "ajv-6.12.6" = { name = "ajv"; packageName = "ajv"; @@ -7951,13 +8365,13 @@ let sha512 = "1XoDy8kJnyWY/i/+gLTEbYLnoiVtS8y7ikBr/IfmML4Qb+CM7dEEbIUOjnY716WqmZ/UpXIxTfJsY7rMcqiCXA=="; }; }; - "apollo-cache-control-0.11.3" = { + "apollo-cache-control-0.11.4" = { name = "apollo-cache-control"; packageName = "apollo-cache-control"; - version = "0.11.3"; + version = "0.11.4"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-cache-control/-/apollo-cache-control-0.11.3.tgz"; - sha512 = "21GCeC9AIIa22uD0Vtqn/N0D5kOB4rY/Pa9aQhxVeLN+4f8Eu4nmteXhFypUD0LL1/58dmm8lS5embsfoIGjEA=="; + url = "https://registry.npmjs.org/apollo-cache-control/-/apollo-cache-control-0.11.4.tgz"; + sha512 = "FUKE8ASr8GxVq5rmky/tY8bsf++cleGT591lfLiqnPsP1fo3kAfgRfWA2QRHTCKFNlQxzUhVOEDv+PaysqiOjw=="; }; }; "apollo-cache-inmemory-1.6.6" = { @@ -8140,13 +8554,13 @@ let sha512 = "mjSFPlQxmoLArpHBeUb2Xj+2HDYeTaJqFGOqQ+I8NVJxgL9lJe84PDWcPah/yMLv3rB7QgBDSuZ0xoRFBPlySw=="; }; }; - "apollo-reporting-protobuf-0.6.0" = { + "apollo-reporting-protobuf-0.6.1" = { name = "apollo-reporting-protobuf"; packageName = "apollo-reporting-protobuf"; - version = "0.6.0"; + version = "0.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-reporting-protobuf/-/apollo-reporting-protobuf-0.6.0.tgz"; - sha512 = "AFLQIuO0QhkoCF+41Be/B/YU0C33BZ0opfyXorIjM3MNNiEDSyjZqmUozlB3LqgfhT9mn2IR5RSsA+1b4VovDQ=="; + url = "https://registry.npmjs.org/apollo-reporting-protobuf/-/apollo-reporting-protobuf-0.6.1.tgz"; + sha512 = "qr4DheFP154PGZsd93SSIS9RkqHnR5b6vT+eCloWjy3UIpY+yZ3cVLlttlIjYvOG4xTJ25XEwcHiAExatQo/7g=="; }; }; "apollo-server-caching-0.5.2" = { @@ -8158,13 +8572,13 @@ let sha512 = "HUcP3TlgRsuGgeTOn8QMbkdx0hLPXyEJehZIPrcof0ATz7j7aTPA4at7gaiFHCo8gk07DaWYGB3PFgjboXRcWQ=="; }; }; - "apollo-server-core-2.18.2" = { + "apollo-server-core-2.19.0" = { name = "apollo-server-core"; packageName = "apollo-server-core"; - version = "2.18.2"; + version = "2.19.0"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-server-core/-/apollo-server-core-2.18.2.tgz"; - sha512 = "phz57BFBukMa3Ta7ZVW7pj1pdUne9KYLbcBdEcITr+I0+nbhy+YM8gcgpOnjrokWYiEZgIe52XeM3m4BMLw5dg=="; + url = "https://registry.npmjs.org/apollo-server-core/-/apollo-server-core-2.19.0.tgz"; + sha512 = "2aMKUVPyNbomJQaG2tkpfqvp1Tfgxgkdr7nX5zHudYNSzsPrHw+CcYlCbIVFFI/mTZsjoK9czNq1qerFRxZbJw=="; }; }; "apollo-server-env-2.4.5" = { @@ -8185,40 +8599,40 @@ let sha512 = "FeGxW3Batn6sUtX3OVVUm7o56EgjxDlmgpTLNyWcLb0j6P8mw9oLNyAm3B+deHA4KNdNHO5BmHS2g1SJYjqPCQ=="; }; }; - "apollo-server-express-2.18.2" = { + "apollo-server-express-2.19.0" = { name = "apollo-server-express"; packageName = "apollo-server-express"; - version = "2.18.2"; + version = "2.19.0"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-server-express/-/apollo-server-express-2.18.2.tgz"; - sha512 = "9P5YOSE2amcNdkXqxqU3oulp+lpwoIBdwS2vOP69kl6ix+n7vEWHde4ulHwwl4xLdtZ88yyxgdKJEIkhaepiNw=="; + url = "https://registry.npmjs.org/apollo-server-express/-/apollo-server-express-2.19.0.tgz"; + sha512 = "3rgSrTme1SlLoecAYtSa8ThH6vYvz29QecgZCigq5Vdc6bFP2SZrCk0ls6BAdD8OZbVKUtizzRxd0yd/uREPAw=="; }; }; - "apollo-server-plugin-base-0.10.1" = { + "apollo-server-plugin-base-0.10.2" = { name = "apollo-server-plugin-base"; packageName = "apollo-server-plugin-base"; - version = "0.10.1"; + version = "0.10.2"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-server-plugin-base/-/apollo-server-plugin-base-0.10.1.tgz"; - sha512 = "XChCBDNyfByWqVXptsjPwrwrCj5cxMmNbchZZi8KXjtJ0hN2C/9BMNlInJd6bVGXvUbkRJYUakfKCfO5dZmwIg=="; + url = "https://registry.npmjs.org/apollo-server-plugin-base/-/apollo-server-plugin-base-0.10.2.tgz"; + sha512 = "uM5uL1lOxbXdgvt/aEIbgs40fV9xA45Y3Mmh0VtQ/ddqq0MXR5aG92nnf8rM+URarBCUfxKJKaYzJJ/CXAnEdA=="; }; }; - "apollo-server-types-0.6.0" = { + "apollo-server-types-0.6.1" = { name = "apollo-server-types"; packageName = "apollo-server-types"; - version = "0.6.0"; + version = "0.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-server-types/-/apollo-server-types-0.6.0.tgz"; - sha512 = "usqXaz81bHxD2IZvKEQNnLpSbf2Z/BmobXZAjEefJEQv1ItNn+lJNUmSSEfGejHvHlg2A7WuAJKJWyDWcJrNnA=="; + url = "https://registry.npmjs.org/apollo-server-types/-/apollo-server-types-0.6.1.tgz"; + sha512 = "IEQ37aYvMLiTUzsySVLOSuvvhxuyYdhI05f3cnH6u2aN1HgGp7vX6bg+U3Ue8wbHfdcifcGIk5UEU+Q+QO6InA=="; }; }; - "apollo-tracing-0.11.4" = { + "apollo-tracing-0.12.0" = { name = "apollo-tracing"; packageName = "apollo-tracing"; - version = "0.11.4"; + version = "0.12.0"; src = fetchurl { - url = "https://registry.npmjs.org/apollo-tracing/-/apollo-tracing-0.11.4.tgz"; - sha512 = "zBu/SwQlXfbdpcKLzWARGVjrEkIZUW3W9Mb4CCIzv07HbBQ8IQpmf9w7HIJJefC7rBiBJYg6JBGyuro3N2lxCA=="; + url = "https://registry.npmjs.org/apollo-tracing/-/apollo-tracing-0.12.0.tgz"; + sha512 = "cMUYGE6mOEwb9HDqhf4fiPEo2JMhjPIqEprAQEC57El76avRpRig5NM0bnqMZcYJZR5QmLlNcttNccOwf9WrNg=="; }; }; "apollo-upload-client-11.0.0" = { @@ -8329,13 +8743,13 @@ let sha512 = "lYe4Gx7QT+MKGbDsA+Z+he/Wtef0BiwDOlK/XkBrdfsh9J/jPPXbX0tE9x9cl27Tmu5gg3QUbUrQYa/y+KOHPQ=="; }; }; - "arch-2.1.2" = { + "arch-2.2.0" = { name = "arch"; packageName = "arch"; - version = "2.1.2"; + version = "2.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/arch/-/arch-2.1.2.tgz"; - sha512 = "NTBIIbAfkJeIletyABbVtdPgeKfDafR+1mZV/AyyfC1UkVkp9iUjV+wwmqtUgphHYajbI86jejBJp5e+jkGTiQ=="; + url = "https://registry.npmjs.org/arch/-/arch-2.2.0.tgz"; + sha512 = "Of/R0wqp83cgHozfIYLbBMnej79U/SVGOOyuB3VVFv1NRM/PSFMK12x9KVtiYzJqmnU5WR2qp0Z5rHb7sWGnFQ=="; }; }; "archive-type-4.0.0" = { @@ -9031,13 +9445,13 @@ let sha1 = "59667f41fadd4f20ccbc2bb96b8d4f7f78ec0367"; }; }; - "ast-module-types-2.6.0" = { + "ast-module-types-2.7.1" = { name = "ast-module-types"; packageName = "ast-module-types"; - version = "2.6.0"; + version = "2.7.1"; src = fetchurl { - url = "https://registry.npmjs.org/ast-module-types/-/ast-module-types-2.6.0.tgz"; - sha512 = "zXSoVaMrf2R+r+ISid5/9a8SXm1LLdkhHzh6pSRhj9jklzruOOl1hva1YmFT33wAstg/f9ZndJAlq1BSrFLSGA=="; + url = "https://registry.npmjs.org/ast-module-types/-/ast-module-types-2.7.1.tgz"; + sha512 = "Rnnx/4Dus6fn7fTqdeLEAn5vUll5w7/vts0RN608yFa6si/rDOUonlIIiwugHBFWjylHjxm9owoSZn71KwG4gw=="; }; }; "ast-types-0.12.1" = { @@ -9373,13 +9787,13 @@ let sha512 = "kNOjDqAh7px0XWNI+4QbzoiR/nTkHAWNud2uvnJquD1/x5a7EQZMJT0AczqK0Qn67oY/TTQ1LbUKajZpp3I9tQ=="; }; }; - "atomically-1.5.0" = { + "atomically-1.6.0" = { name = "atomically"; packageName = "atomically"; - version = "1.5.0"; + version = "1.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/atomically/-/atomically-1.5.0.tgz"; - sha512 = "BTkqh410x70yF7iFtJxnL7N5j6HU0JYrJpvLUbZNM4u9rvCPveqKo6nFM9aFrjAOOpzPBnxKVncJ8o/GfEx18g=="; + url = "https://registry.npmjs.org/atomically/-/atomically-1.6.0.tgz"; + sha512 = "mu394MH+yY2TSKMyH+978PcGMZ8sRNks2PuVeH6c2ED4mimR2LEE039MVcIGVhtmG54cKEMh4gKhxKL/CLaX/w=="; }; }; "attach-ware-1.1.1" = { @@ -9463,13 +9877,13 @@ let sha1 = "00f35b2d27ac91b1f0d3ef2084c98cf1d1f0adc3"; }; }; - "aws-sdk-2.773.0" = { + "aws-sdk-2.784.0" = { name = "aws-sdk"; packageName = "aws-sdk"; - version = "2.773.0"; + version = "2.784.0"; src = fetchurl { - url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.773.0.tgz"; - sha512 = "bwqEm/x3HMUd/xfcUeTjCQFi904oSNcwl2ZNz3mwAdEIqt3sQ9aE3GYoZQxKXw/XHQlF7hPiKO07GDGmS6x4AQ=="; + url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.784.0.tgz"; + sha512 = "+KBkqH7t/XE91Fqn8eyJeNIWsnhSWL8bSUqFD7TfE3FN07MTlC0nprGYp+2WfcYNz5i8Bus1vY2DHNVhtTImnw=="; }; }; "aws-sign2-0.6.0" = { @@ -9490,13 +9904,13 @@ let sha1 = "b46e890934a9591f2d2f6f86d7e6a9f1b3fe76a8"; }; }; - "aws4-1.10.1" = { + "aws4-1.11.0" = { name = "aws4"; packageName = "aws4"; - version = "1.10.1"; + version = "1.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/aws4/-/aws4-1.10.1.tgz"; - sha512 = "zg7Hz2k5lI8kb7U32998pRRFin7zJlkfezGJjUc2heaD4Pw2wObakCDVzkKztTm/Ln7eiVvYsjqak0Ed4LkMDA=="; + url = "https://registry.npmjs.org/aws4/-/aws4-1.11.0.tgz"; + sha512 = "xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA=="; }; }; "axios-0.17.1" = { @@ -10390,6 +10804,15 @@ let sha512 = "2uhEl8FdjSBUyb69qDTgOEeeqDTa+n3yMQzLW0cOzNf1Ow5bwcg3idf+qsWisIKRH8Bk8oC7UXL8irRcPA8ZEQ=="; }; }; + "bep53-range-1.0.0" = { + name = "bep53-range"; + packageName = "bep53-range"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/bep53-range/-/bep53-range-1.0.0.tgz"; + sha512 = "CNsnREjxe2/wD559wzFXMycUnbmUDA9C2Bs6Z2tm++amSma7JowAAxAnaZJMuDq3cWSx9HSIbV04H06QQ11zTA=="; + }; + }; "better-ajv-errors-0.6.7" = { name = "better-ajv-errors"; packageName = "better-ajv-errors"; @@ -10606,13 +11029,13 @@ let sha512 = "tSh9HdQgwyEAfo1jzoGEis6o/zs4CcdRTchG93XVl5jct+DCAN90M5MVUV76k2vJ9Xg3GAzLB5NLsY/vnVTh6w=="; }; }; - "bittorrent-protocol-3.1.1" = { + "bittorrent-protocol-3.1.2" = { name = "bittorrent-protocol"; packageName = "bittorrent-protocol"; - version = "3.1.1"; + version = "3.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/bittorrent-protocol/-/bittorrent-protocol-3.1.1.tgz"; - sha512 = "kthSXghQ9DRQ4Lrjr1ceyIeEMeL5x9WiaSrQyR+5Nrr3g9QY6MvDeq+KLQz17R6094iDmT/LgFbQYAPj09/oUA=="; + url = "https://registry.npmjs.org/bittorrent-protocol/-/bittorrent-protocol-3.1.2.tgz"; + sha512 = "vjKcxwQ/rDd3FeqImBZXLKk14eawf8sXVXPJd8LgrTZmpDzCn8kquhNIiYbE7M3SybAQ1r5uILJ7f2V2TlT8bQ=="; }; }; "bittorrent-tracker-7.7.0" = { @@ -10732,13 +11155,13 @@ let sha512 = "gaqbzQPqOoamawKg0LGVd7SzLgXS+JH61oWprSLH+P+abTczqJbhTR8CmJ2u9/bUYNmHTGJx/UEmn6doAvvuig=="; }; }; - "blob-to-buffer-1.2.8" = { + "blob-to-buffer-1.2.9" = { name = "blob-to-buffer"; packageName = "blob-to-buffer"; - version = "1.2.8"; + version = "1.2.9"; src = fetchurl { - url = "https://registry.npmjs.org/blob-to-buffer/-/blob-to-buffer-1.2.8.tgz"; - sha512 = "re0AIxakF504MgeMtIyJkVcZ8T5aUxtp/QmTMlmjyb3P44E1BEv5x3LATBGApWAJATyXHtkXRD+gWTmeyYLiQA=="; + url = "https://registry.npmjs.org/blob-to-buffer/-/blob-to-buffer-1.2.9.tgz"; + sha512 = "BF033y5fN6OCofD3vgHmNtwZWRcq9NLyyxyILx9hfMy1sXYy4ojFl765hJ2lP0YaN2fuxPaLO2Vzzoxy0FLFFA=="; }; }; "block-stream-0.0.9" = { @@ -10912,13 +11335,13 @@ let sha1 = "68dff5fbe60c51eb37725ea9e3ed310dcc1e776e"; }; }; - "boolean-3.0.1" = { + "boolean-3.0.2" = { name = "boolean"; packageName = "boolean"; - version = "3.0.1"; + version = "3.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/boolean/-/boolean-3.0.1.tgz"; - sha512 = "HRZPIjPcbwAVQvOTxR4YE3o8Xs98NqbbL1iEZDCz7CL8ql0Lt5iOyJFxfnAB0oFs8Oh02F/lLlg30Mexv46LjA=="; + url = "https://registry.npmjs.org/boolean/-/boolean-3.0.2.tgz"; + sha512 = "RwywHlpCRc3/Wh81MiCKun4ydaIFyW5Ea6JbL6sRCVx5q5irDw7pMXBUFYF/jArQ6YrG36q0kpovc9P/Kd3I4g=="; }; }; "boom-2.10.1" = { @@ -11326,13 +11749,13 @@ let sha512 = "TpfK0TDgv71dzuTsEAlQiHeWQ/tiPqgNZVdv046fvNtBZrjbv2O3TsWCDU0AWGJJKCF/KsjNdLzR9hXOsh/CfA=="; }; }; - "browserslist-4.14.5" = { + "browserslist-4.14.6" = { name = "browserslist"; packageName = "browserslist"; - version = "4.14.5"; + version = "4.14.6"; src = fetchurl { - url = "https://registry.npmjs.org/browserslist/-/browserslist-4.14.5.tgz"; - sha512 = "Z+vsCZIvCBvqLoYkBFTwEYH3v5MCQbsAjp50ERycpOjnPmolg1Gjy4+KaWWpm8QOJt9GHkhdqAl14NpCX73CWA=="; + url = "https://registry.npmjs.org/browserslist/-/browserslist-4.14.6.tgz"; + sha512 = "zeFYcUo85ENhc/zxHbiIp0LGzzTrE2Pv2JhxvS7kpUb9Q9D38kUX6Bie7pGutJ/5iF5rOxE7CepAuWD56xJ33A=="; }; }; "bser-2.1.1" = { @@ -11398,13 +11821,13 @@ let sha512 = "c+Ko0loDaFfuPWiL02ls9Xd3GO3cPVmUobQ6t3rXNUk304u6hGq+8N/kFi+QEIKhzK3uwolVhLzszmfLmMLnqg=="; }; }; - "buffer-5.6.0" = { + "buffer-5.7.0" = { name = "buffer"; packageName = "buffer"; - version = "5.6.0"; + version = "5.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/buffer/-/buffer-5.6.0.tgz"; - sha512 = "/gDYp/UtU0eA1ys8bOs9J6a+E/KWIY+DZ+Q2WESNUA0jFRsJOc0SNUO6xJ5SGA1xueg3NL65W6s+NY5l9cunuw=="; + url = "https://registry.npmjs.org/buffer/-/buffer-5.7.0.tgz"; + sha512 = "cd+5r1VLBwUqTrmnzW+D7ABkJUM6mr7uv1dv+6jRw4Rcl7tFIFHDqHPL98LhpGFn3dbAt3gtLxtrWp4m1kFrqg=="; }; }; "buffer-alloc-1.2.0" = { @@ -11605,13 +12028,13 @@ let sha1 = "69fdf13ad9d91222baee109945faadc431534f86"; }; }; - "bufferutil-4.0.1" = { + "bufferutil-4.0.2" = { name = "bufferutil"; packageName = "bufferutil"; - version = "4.0.1"; + version = "4.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/bufferutil/-/bufferutil-4.0.1.tgz"; - sha512 = "xowrxvpxojqkagPcWRQVXZl0YXhRhAtBEIq3VoER1NH5Mw1n1o0ojdspp+GS2J//2gCVyrzQDApQ4unGF+QOoA=="; + url = "https://registry.npmjs.org/bufferutil/-/bufferutil-4.0.2.tgz"; + sha512 = "AtnG3W6M8B2n4xDQ5R+70EXvOpnXsFYg/AK2yTZd+HQ/oxAdz+GI+DvjmhBw3L0ole+LJ0ngqY4JMbDzkfNzhA=="; }; }; "bufferview-1.0.1" = { @@ -11902,6 +12325,15 @@ let sha512 = "A+Fezp4zxnit6FanDmv9EqXNAi3vt9DWp51/71UEhXukb7QUuvtv9344h91dyAxuTLoSYJFU299qzR3tzwPAhw=="; }; }; + "call-bind-1.0.0" = { + name = "call-bind"; + packageName = "call-bind"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/call-bind/-/call-bind-1.0.0.tgz"; + sha512 = "AEXsYIyyDY3MCzbwdhzG3Jx1R0J2wetQyUynn6dYHAO+bg8l1k7jwZtRv4ryryFs7EP+NDlikJlVe59jr0cM2w=="; + }; + }; "call-me-maybe-1.0.1" = { name = "call-me-maybe"; packageName = "call-me-maybe"; @@ -12064,13 +12496,13 @@ let sha512 = "8KMDF1Vz2gzOq54ONPJS65IvTUaB1cHJ2DMM7MbPmLZljDH1qpzzLsWdiN9pHh6qvkRVDTi/07+eNGch/oLU4w=="; }; }; - "camelcase-6.1.0" = { + "camelcase-6.2.0" = { name = "camelcase"; packageName = "camelcase"; - version = "6.1.0"; + version = "6.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/camelcase/-/camelcase-6.1.0.tgz"; - sha512 = "WCMml9ivU60+8rEJgELlFp1gxFcEGxwYleE3bziHEDeqsqAWGHdimB7beBFGjLzVNgPGyDsfgXLQEYMpmIFnVQ=="; + url = "https://registry.npmjs.org/camelcase/-/camelcase-6.2.0.tgz"; + sha512 = "c7wVvbw3f37nuobQNtgsgG9POC9qMbNuMQmTCqZv23b6MIz0fcYpBiOlv9gEN/hdLdnZTDQhg6e9Dq5M1vKvfg=="; }; }; "camelcase-keys-2.1.0" = { @@ -12118,13 +12550,13 @@ let sha512 = "bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw=="; }; }; - "caniuse-lite-1.0.30001148" = { + "caniuse-lite-1.0.30001154" = { name = "caniuse-lite"; packageName = "caniuse-lite"; - version = "1.0.30001148"; + version = "1.0.30001154"; src = fetchurl { - url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001148.tgz"; - sha512 = "E66qcd0KMKZHNJQt9hiLZGE3J4zuTqE1OnU53miEVtylFbwOEmeA5OsRu90noZful+XGSQOni1aT2tiqu/9yYw=="; + url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001154.tgz"; + sha512 = "y9DvdSti8NnYB9Be92ddMZQrcOe04kcQtcxtBx4NkB04+qZ+JUWotnXBJTmxlKudhxNTQ3RRknMwNU2YQl/Org=="; }; }; "canvas-2.6.1" = { @@ -12226,13 +12658,13 @@ let sha512 = "Cg8/ZSBEa8ZVY9HspcGUYaK63d/bN7rqS3CYCzEGUxuYv6UlmcjzDUz2fCFFHyTvUW5Pk0I+3hkA3iXlIj6guA=="; }; }; - "ccount-1.0.5" = { + "ccount-1.1.0" = { name = "ccount"; packageName = "ccount"; - version = "1.0.5"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/ccount/-/ccount-1.0.5.tgz"; - sha512 = "MOli1W+nfbPLlKEhInaxhRdp7KVLFxLN5ykwzHgLsLI3H3gs5jjFAK4Eoj3OzzcxCtumDaI8onoVDeQyWaNTkw=="; + url = "https://registry.npmjs.org/ccount/-/ccount-1.1.0.tgz"; + sha512 = "vlNK021QdI7PNeiUh/lKkC/mNHHfV0m/Ad5JoI0TYtlBnJAslM/JIkm/tGC88bkLIwO6OQ5uV6ztS6kVAtCDlg=="; }; }; "center-align-0.1.3" = { @@ -12586,15 +13018,6 @@ let sha512 = "0UQ55f51JBkOFa+fvR76ywRzxiPwQS3Xe8oe5bZRphpv+dIMeerW5Zn5e4cUy4COJwVtJyU0R79RMnw+aCqmGA=="; }; }; - "child-process-promise-2.2.1" = { - name = "child-process-promise"; - packageName = "child-process-promise"; - version = "2.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/child-process-promise/-/child-process-promise-2.2.1.tgz"; - sha1 = "4730a11ef610fad450b8f223c79d31d7bdad8074"; - }; - }; "chloride-2.3.0" = { name = "chloride"; packageName = "chloride"; @@ -12712,13 +13135,13 @@ let sha512 = "uiRdh4ZZy+UTPSrAdp8hqEdVb1EllLtTHOt5TMaOjJUvi+O54/83Fc5K2ld1P+TJX+dw5B+8/sCgzI6eaur/lg=="; }; }; - "chrome-dgram-3.0.5" = { + "chrome-dgram-3.0.6" = { name = "chrome-dgram"; packageName = "chrome-dgram"; - version = "3.0.5"; + version = "3.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/chrome-dgram/-/chrome-dgram-3.0.5.tgz"; - sha512 = "RcCR5Kpn+F7VGmtL3ex78ltB+cuuSTZdGBa4j3fQwUqz/90uOKd5t+WmnJp+QNv017oaHzn5GoMv1mCoRTmehQ=="; + url = "https://registry.npmjs.org/chrome-dgram/-/chrome-dgram-3.0.6.tgz"; + sha512 = "bqBsUuaOiXiqxXt/zA/jukNJJ4oaOtc7ciwqJpZVEaaXwwxqgI2/ZdG02vXYWUhHGziDlvGMQWk0qObgJwVYKA=="; }; }; "chrome-dns-1.0.1" = { @@ -14080,15 +14503,6 @@ let sha512 = "Gar0ASD4BDyKC4hl4DwHqDrmvjoxWKZigVnAbn5H1owvm4CxCPdb0HQDehwNYMJpla5+M2tPmPARzhtYuwpHow=="; }; }; - "commander-4.1.0" = { - name = "commander"; - packageName = "commander"; - version = "4.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/commander/-/commander-4.1.0.tgz"; - sha512 = "NIQrwvv9V39FHgGFm36+U9SMQzbiHvU79k+iADraJTpmrFFfx7Ds0IvDoAdZsDrknlkRk14OYoWXb57uTh7/sw=="; - }; - }; "commander-4.1.1" = { name = "commander"; packageName = "commander"; @@ -14125,6 +14539,15 @@ let sha512 = "wl7PNrYWd2y5mp1OK/LhTlv8Ff4kQJQRXXAvF+uU/TPNiVJUxZLRYGj/B0y/lPGAVcSbJqH2Za/cvHmrPMC8mA=="; }; }; + "commander-6.2.0" = { + name = "commander"; + packageName = "commander"; + version = "6.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/commander/-/commander-6.2.0.tgz"; + sha512 = "zP4jEKbe8SHzKJYQmq8Y9gYjtO/POJLgIdKgV7B9qNmABVFVc+ctqSX6iXh4mCpJfRBOabiZ2YKPg8ciDw6C+Q=="; + }; + }; "commandpost-1.4.0" = { name = "commandpost"; packageName = "commandpost"; @@ -15611,6 +16034,15 @@ let sha512 = "Ro1yETZA813eoyUp2GDBhG2j+YggidUmzO1/v9eYBKR2EHVEniE2MI/NqpTQ954BMpTPZFsGNPm46qFB9dpaPQ=="; }; }; + "css-tree-1.0.0" = { + name = "css-tree"; + packageName = "css-tree"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/css-tree/-/css-tree-1.0.0.tgz"; + sha512 = "CdVYz/Yuqw0VdKhXPBIgi8DO3NicJVYZNWeX9XcIuSp9ZoFT5IcleVRW07O5rMjdcx1mb+MEJPknTTEW7DdsYw=="; + }; + }; "css-tree-1.0.0-alpha.37" = { name = "css-tree"; packageName = "css-tree"; @@ -15620,15 +16052,6 @@ let sha512 = "DMxWJg0rnz7UgxKT0Q1HU/L9BeJI0M6ksor0OgqOnF+aRCDWg/N2641HmVyU9KVIu0OVVWOb2IpC9A+BJRnejg=="; }; }; - "css-tree-1.0.0-alpha.39" = { - name = "css-tree"; - packageName = "css-tree"; - version = "1.0.0-alpha.39"; - src = fetchurl { - url = "https://registry.npmjs.org/css-tree/-/css-tree-1.0.0-alpha.39.tgz"; - sha512 = "7UvkEYgBAHRG9Nt980lYxjsTrCyHFN53ky3wVsDkiMdVqylqRt+Zc+jm5qw7/qyOvN2dHSYtX0e4MbCCExSvnA=="; - }; - }; "css-what-1.0.0" = { name = "css-what"; packageName = "css-what"; @@ -15746,13 +16169,13 @@ let sha1 = "178b43a44621221c27756086f531e02f42900ee8"; }; }; - "csso-4.0.3" = { + "csso-4.1.0" = { name = "csso"; packageName = "csso"; - version = "4.0.3"; + version = "4.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/csso/-/csso-4.0.3.tgz"; - sha512 = "NL3spysxUkcrOgnpsT4Xdl2aiEiBG6bXswAABQVHcMrfjjBisFOKwLDOmf4wf32aPdcJws1zds2B0Rg+jqMyHQ=="; + url = "https://registry.npmjs.org/csso/-/csso-4.1.0.tgz"; + sha512 = "h+6w/W1WqXaJA4tb1dk7r5tVbOm97MsKxzwnvOR04UQ6GILroryjMWu3pmCCtL2mLaEStQ0fZgeGiy99mo7iyg=="; }; }; "cssom-0.3.8" = { @@ -16412,13 +16835,13 @@ let sha512 = "3VmRXEtw7RZKAf+4Tv1Ym9AGeo8r8+CjDi26x+7SYQil1UqtqdaokhzoEJohqlzt0m5kacJSDhJQkG/LWhpRBw=="; }; }; - "dayjs-1.9.3" = { + "dayjs-1.9.4" = { name = "dayjs"; packageName = "dayjs"; - version = "1.9.3"; + version = "1.9.4"; src = fetchurl { - url = "https://registry.npmjs.org/dayjs/-/dayjs-1.9.3.tgz"; - sha512 = "V+1SyIvkS+HmNbN1G7A9+ERbFTV9KTXu6Oor98v2xHmzzpp52OIJhQuJSTywWuBY5pyAEmlwbCi1Me87n/SLOw=="; + url = "https://registry.npmjs.org/dayjs/-/dayjs-1.9.4.tgz"; + sha512 = "ABSF3alrldf7nM9sQ2U+Ln67NRwmzlLOqG7kK03kck0mw3wlSSEKv/XhKGGxUjQcS57QeiCyNdrFgtj9nWlrng=="; }; }; "deasync-0.1.15" = { @@ -17384,13 +17807,13 @@ let sha512 = "6SsIx+nUUbuK0EthKjv0zrdnajCCXVYGmbYYiYjFVpzcjwEs/JMDZ8tPRG29J/HhN56t3GJp2cGSWDRjjot8Pg=="; }; }; - "detective-amd-3.0.0" = { + "detective-amd-3.0.1" = { name = "detective-amd"; packageName = "detective-amd"; - version = "3.0.0"; + version = "3.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/detective-amd/-/detective-amd-3.0.0.tgz"; - sha512 = "kOpKHyabdSKF9kj7PqYHLeHPw+TJT8q2u48tZYMkIcas28el1CYeLEJ42Nm+563/Fq060T5WknfwDhdX9+kkBQ=="; + url = "https://registry.npmjs.org/detective-amd/-/detective-amd-3.0.1.tgz"; + sha512 = "vJgluSKkPyo+/McW9hzwmZwY1VPA3BS0VS1agdpPAWAhr65HwC1ox4Ig82rVfGYDYCa4GcKQON5JWBk++2Kf1Q=="; }; }; "detective-cjs-3.1.1" = { @@ -17474,13 +17897,13 @@ let sha512 = "7/nIzKdQ8y2K0imjIP7dyg2GJ2h38Ps6VOMXWZHIarNDV3p6mTXyEugKFnkmsZ2DD58JEG34ILyVb3qdOMmP9w=="; }; }; - "devtools-protocol-0.0.799653" = { + "devtools-protocol-0.0.809251" = { name = "devtools-protocol"; packageName = "devtools-protocol"; - version = "0.0.799653"; + version = "0.0.809251"; src = fetchurl { - url = "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.799653.tgz"; - sha512 = "t1CcaZbvm8pOlikqrsIM9GOa7Ipp07+4h/q9u0JXBWjPCjHdBl9KkddX87Vv9vBHoBGtwV79sYQNGnQM6iS5gg=="; + url = "https://registry.npmjs.org/devtools-protocol/-/devtools-protocol-0.0.809251.tgz"; + sha512 = "pf+2OY6ghMDPjKkzSWxHMq+McD+9Ojmq5XVRYpv/kPd9sTMQxzEt21592a31API8qRjro0iYYOc3ag46qF/1FA=="; }; }; "dezalgo-1.0.3" = { @@ -17582,13 +18005,13 @@ let sha512 = "IayShXAgj/QMXgB0IWmKx+rOPuGMhqm5w6jvFxmVenXKIzRqTAAsbBPT3kWQeGANj3jGgvcvv4yK6SxqYmikgw=="; }; }; - "diff2html-3.1.14" = { + "diff2html-3.1.15" = { name = "diff2html"; packageName = "diff2html"; - version = "3.1.14"; + version = "3.1.15"; src = fetchurl { - url = "https://registry.npmjs.org/diff2html/-/diff2html-3.1.14.tgz"; - sha512 = "Qot+l+v+aqGcuvJe1C8ZPev17deSyg+DOwICF3m8Ka/C3af1K2Wh2WENYulxv9CQyVhy2VarluR5fMfN5BEHIg=="; + url = "https://registry.npmjs.org/diff2html/-/diff2html-3.1.15.tgz"; + sha512 = "juAPno3aLDhLV6e2rPl1uQ3ZHpFT4o5Hpx5il4EH+nbdphwGgK1a7dQ/BnSXWlNPvEZ5l8lE5CTHijx5QPLzOQ=="; }; }; "diff3-0.0.3" = { @@ -18104,13 +18527,13 @@ let sha512 = "3VdM/SXBZX2omc9JF9nOPCtDaYQ67BGp5CoLpIQlO2KCAPETs8TcDHacF26jXadGbvUteZzRTeos2fhID5+ucQ=="; }; }; - "dompurify-1.0.11" = { + "dompurify-2.2.2" = { name = "dompurify"; packageName = "dompurify"; - version = "1.0.11"; + version = "2.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/dompurify/-/dompurify-1.0.11.tgz"; - sha512 = "XywCTXZtc/qCX3iprD1pIklRVk/uhl8BKpkTxr+ZyMVUzSUg7wkQXRBp/euJ5J5moa1QvfpvaPQVP71z1O59dQ=="; + url = "https://registry.npmjs.org/dompurify/-/dompurify-2.2.2.tgz"; + sha512 = "BsGR4nDLaC5CNBnyT5I+d5pOeaoWvgVeg6Gq/aqmKYWMPR07131u60I80BvExLAJ0FQEIBQ1BTicw+C5+jOyrg=="; }; }; "domutils-1.4.3" = { @@ -18581,13 +19004,13 @@ let sha512 = "dldq3ZfFtgVTJMLjOe+/3sROTzALlL9E34V4/sDtUd/KlBSS0s6U1/+WPE1B4sj9CXHJpL1M6rhNJnc9Wbal9w=="; }; }; - "electron-to-chromium-1.3.582" = { + "electron-to-chromium-1.3.587" = { name = "electron-to-chromium"; packageName = "electron-to-chromium"; - version = "1.3.582"; + version = "1.3.587"; src = fetchurl { - url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.582.tgz"; - sha512 = "0nCJ7cSqnkMC+kUuPs0YgklFHraWGl/xHqtZWWtOeVtyi+YqkoAOMGuZQad43DscXCQI/yizcTa3u6B5r+BLww=="; + url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.587.tgz"; + sha512 = "8XFNxzNj0R8HpTQslWAw6UWpGSuOKSP3srhyFHVbGUGb8vTHckZGCyWi+iQlaXJx5DNeTQTQLd6xN11WSckkmA=="; }; }; "elegant-spinner-1.0.1" = { @@ -18663,6 +19086,15 @@ let sha512 = "Bt1sBAGFHY9DKY+4/2cV6izcKJUf5T7/gkdmkxzX/qv9CcGH8xSwVRW5mtX03SWJtRTWSOpzCuWN9rBFYZepZQ=="; }; }; + "emmet-2.1.6" = { + name = "emmet"; + packageName = "emmet"; + version = "2.1.6"; + src = fetchurl { + url = "https://registry.npmjs.org/emmet/-/emmet-2.1.6.tgz"; + sha512 = "kfJMlze+k8jpX5CUx7xPYS83DxRNXuh8rQ98rQKnnf+wfo/KD+BG6pmpnEp5a7a1DWM9xmllKuOPfC7MeRmepQ=="; + }; + }; "emoji-named-characters-1.0.2" = { name = "emoji-named-characters"; packageName = "emoji-named-characters"; @@ -18942,13 +19374,13 @@ let sha512 = "3e87LvavsdxyoCfGusJnrZ5G8SLPOFeHSNpZI/ATL9a5leXo2k0w6MKnbqhdBad9qTobSfB20Ld7UmgoNbAZkQ=="; }; }; - "enhanced-resolve-5.2.0" = { + "enhanced-resolve-5.3.1" = { name = "enhanced-resolve"; packageName = "enhanced-resolve"; - version = "5.2.0"; + version = "5.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.2.0.tgz"; - sha512 = "NZlGLl8DxmZoq0uqPPtJfsCAir68uR047+Udsh1FH4+5ydGQdMurn/A430A1BtxASVmMEuS7/XiJ5OxJ9apAzQ=="; + url = "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.3.1.tgz"; + sha512 = "G1XD3MRGrGfNcf6Hg0LVZG7GIKcYkbfHa5QMxt1HDUTdYoXH0JR1xXyg+MaKLF73E9A27uWNVxvFivNRYeUB6w=="; }; }; "enquirer-2.3.6" = { @@ -19104,6 +19536,15 @@ let sha1 = "06e0116d3028f6aef4806849eb0ea6a748ae6960"; }; }; + "err-code-2.0.3" = { + name = "err-code"; + packageName = "err-code"; + version = "2.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/err-code/-/err-code-2.0.3.tgz"; + sha512 = "2bmlRpNKBxT/CRmPOlyISQpNj+qSeYvcym/uT0Jx2bMOlKLtSy1ZmLuVxSEKKyor/N5yhvp/ZiG1oE3DEYMSFA=="; + }; + }; "errlop-2.2.0" = { name = "errlop"; packageName = "errlop"; @@ -19527,22 +19968,22 @@ let sha512 = "G9+qtYVCHaDi1ZuWzBsOWo2wSwd70TXnU6UHA3cTYHp7gCTXZcpggWFoUVAMRarg68qtPoNfFbzPh+VdOgmwmw=="; }; }; - "eslint-7.9.0" = { + "eslint-7.12.1" = { name = "eslint"; packageName = "eslint"; - version = "7.9.0"; + version = "7.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/eslint/-/eslint-7.9.0.tgz"; - sha512 = "V6QyhX21+uXp4T+3nrNfI3hQNBDa/P8ga7LoQOenwrlEFXrEnUEE+ok1dMtaS3b6rmLXhT1TkTIsG75HMLbknA=="; + url = "https://registry.npmjs.org/eslint/-/eslint-7.12.1.tgz"; + sha512 = "HlMTEdr/LicJfN08LB3nM1rRYliDXOmfoO4vj39xN6BLpFzF00hbwBoqHk8UcJ2M/3nlARZWy/mslvGEuZFvsg=="; }; }; - "eslint-plugin-no-unsanitized-3.1.2" = { + "eslint-plugin-no-unsanitized-3.1.4" = { name = "eslint-plugin-no-unsanitized"; packageName = "eslint-plugin-no-unsanitized"; - version = "3.1.2"; + version = "3.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/eslint-plugin-no-unsanitized/-/eslint-plugin-no-unsanitized-3.1.2.tgz"; - sha512 = "KPShfliA3Uy9qqwQx35P1fwIOeJjZkb0FbMMUFztRYRposzaynsM8JCEb952fqkidROl1kpqY80uSvn+TcWkQQ=="; + url = "https://registry.npmjs.org/eslint-plugin-no-unsanitized/-/eslint-plugin-no-unsanitized-3.1.4.tgz"; + sha512 = "WF1+eZo2Sh+bQNjZuVNwT0dA61zuJORsLh+1Sww7+O6GOPw+WPWIIRfTWNqrmaXaDMhM4SXAqYPcNlhRMiH13g=="; }; }; "eslint-plugin-vue-6.2.2" = { @@ -20139,6 +20580,15 @@ let sha1 = "b09c2a9309bc0ef0501479472db3180f8d4c3edd"; }; }; + "execa-0.10.0" = { + name = "execa"; + packageName = "execa"; + version = "0.10.0"; + src = fetchurl { + url = "https://registry.npmjs.org/execa/-/execa-0.10.0.tgz"; + sha512 = "7XOMnz8Ynx1gGo/3hyV9loYNPWM94jG3+3T3Y8tsfSstFmETmENCMU/A/zj8Lyaj1lkgEepKepvd6240tBRvlw=="; + }; + }; "execa-0.7.0" = { name = "execa"; packageName = "execa"; @@ -20184,13 +20634,13 @@ let sha512 = "r9vdGQk4bmCuK1yKQu1KTwcT2zwfWdbdaXfCtAh+5nU/4fSX+JAb7vZGvI5naJrQlvONrEB20jeruESI69530g=="; }; }; - "execa-4.0.3" = { + "execa-4.1.0" = { name = "execa"; packageName = "execa"; - version = "4.0.3"; + version = "4.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/execa/-/execa-4.0.3.tgz"; - sha512 = "WFDXGHckXPWZX19t1kCsXzOpqX9LWYNqn4C+HqZlk/V0imTkzJZqf87ZBhvpHaftERYknpk0fjSylnXVlVgI0A=="; + url = "https://registry.npmjs.org/execa/-/execa-4.1.0.tgz"; + sha512 = "j5W0//W7f8UxAn8hXVnwG8tLwdiUy4FJLcSupCg6maBYZDpyBvTApK7KyuI4bKj8KOh1r2YH+6ucuYtJv1bTZA=="; }; }; "execall-1.0.0" = { @@ -20319,13 +20769,13 @@ let sha1 = "a793d3ac0cad4c6ab571e9968fbbab6cb2532929"; }; }; - "expo-pwa-0.0.45" = { + "expo-pwa-0.0.48" = { name = "expo-pwa"; packageName = "expo-pwa"; - version = "0.0.45"; + version = "0.0.48"; src = fetchurl { - url = "https://registry.npmjs.org/expo-pwa/-/expo-pwa-0.0.45.tgz"; - sha512 = "1q0t+5L4JEb8iCAaN0ME6/P/h83HVrOXBU8AzDRtrTXPWC0R0IvHr9cm1DCnzWTHtBcy6kA+H0rIvxledllaBQ=="; + url = "https://registry.npmjs.org/expo-pwa/-/expo-pwa-0.0.48.tgz"; + sha512 = "4KaL0+YhFxS9zrpQG/BNW+fxMldvgx9dM16b6sZ2t7eMkDlUO7Vo6B+zxeg5l/naP27CA02bMUkeEHr61Y5ojA=="; }; }; "express-2.5.11" = { @@ -20409,13 +20859,13 @@ let sha512 = "WQGmghzn+loQsIQUEnLZ0HVKCLhIBVcURvrAhyt6mOqsFsG2tBYhaNKX728EOz2aMXRhEQhkQ+RXQsIFpbS6IA=="; }; }; - "express-openapi-7.0.0" = { + "express-openapi-7.0.1" = { name = "express-openapi"; packageName = "express-openapi"; - version = "7.0.0"; + version = "7.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/express-openapi/-/express-openapi-7.0.0.tgz"; - sha512 = "ryjUF/MuYEh13jXKNOD7kw/o6n1MTywDP08n5/BqFRd9IaTX33vZEKhk9NlsvGfD63lNre/84CN0hPLvWEe7qQ=="; + url = "https://registry.npmjs.org/express-openapi/-/express-openapi-7.0.1.tgz"; + sha512 = "64YwTWpxgVGnwoLi4zvKaQ5RWIV0dkxVE4GGkBF7D89RI0/I6gTRUDL25Il4AK3cUqyLtxnX2X5BZ2YRvRx5uQ=="; }; }; "express-session-1.17.1" = { @@ -20841,6 +21291,15 @@ let sha512 = "0LkHpTLyadJavq9sRzzyqIoMZemWli77K2/MGOkafrR64B9ItrvZ9aT+jluvNDsv0YEHjSNhlMBtbokuoqii4A=="; }; }; + "fast-redact-3.0.0" = { + name = "fast-redact"; + packageName = "fast-redact"; + version = "3.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/fast-redact/-/fast-redact-3.0.0.tgz"; + sha512 = "a/S/Hp6aoIjx7EmugtzLqXmcNsyFszqbt6qQ99BdG61QjBZF6shNis0BYR6TsZOQ1twYc0FN2Xdhwwbv6+KD0w=="; + }; + }; "fast-safe-stringify-1.2.3" = { name = "fast-safe-stringify"; packageName = "fast-safe-stringify"; @@ -20904,13 +21363,13 @@ let sha512 = "483XLLxTVIwWK3QTrMGRqUfUpoOs/0hbQrl2oz4J0pAcm3A3bu84wxTFqGqkJzewCLdME38xJLJAxBABfQT8sQ=="; }; }; - "fastq-1.8.0" = { + "fastq-1.9.0" = { name = "fastq"; packageName = "fastq"; - version = "1.8.0"; + version = "1.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/fastq/-/fastq-1.8.0.tgz"; - sha512 = "SMIZoZdLh/fgofivvIkmknUXyPnvxRE3DhtZ5Me3Mrsk5gyPL42F0xr51TdRXskBxHfMp+07bcYzfsYEsSQA9Q=="; + url = "https://registry.npmjs.org/fastq/-/fastq-1.9.0.tgz"; + sha512 = "i7FVWL8HhVY+CTkwFxkN2mk3h+787ixS5S63eb78diVRc1MCssarHq3W5cj0av7YDSwmaV928RNag+U1etRQ7w=="; }; }; "fault-1.0.4" = { @@ -20922,6 +21381,15 @@ let sha512 = "CJ0HCB5tL5fYTEA7ToAq5+kTwd++Borf1/bifxd9iT70QcXr4MRrO3Llf8Ifs70q+SJcGHFtnIE/Nw6giCtECA=="; }; }; + "faunadb-3.0.1" = { + name = "faunadb"; + packageName = "faunadb"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/faunadb/-/faunadb-3.0.1.tgz"; + sha512 = "WlfPjC0V9xHs4NTunOWmYZtJfbJ45Z1VAIKKka6+mRrmijWOFQzJVDY9CqS6X9kvepM36EjmtNkIvV0OJ1wTEA=="; + }; + }; "faye-websocket-0.10.0" = { name = "faye-websocket"; packageName = "faye-websocket"; @@ -21363,13 +21831,13 @@ let sha512 = "t2GDMt3oGC/v+BMwzmllWDuJF/xcDtE5j/fCGbqDD7OLuJkj0cfh1YSA5VKPvwMeLFLNDBkwOKZ2X85jGLVftQ=="; }; }; - "find-process-1.4.3" = { + "find-process-1.4.4" = { name = "find-process"; packageName = "find-process"; - version = "1.4.3"; + version = "1.4.4"; src = fetchurl { - url = "https://registry.npmjs.org/find-process/-/find-process-1.4.3.tgz"; - sha512 = "+IA+AUsQCf3uucawyTwMWcY+2M3FXq3BRvw3S+j5Jvydjk31f/+NPWpYZOJs+JUs2GvxH4Yfr6Wham0ZtRLlPA=="; + url = "https://registry.npmjs.org/find-process/-/find-process-1.4.4.tgz"; + sha512 = "rRSuT1LE4b+BFK588D2V8/VG9liW0Ark1XJgroxZXI0LtwmQJOb490DvDYvbm+Hek9ETFzTutGfJ90gumITPhQ=="; }; }; "find-requires-1.0.0" = { @@ -21669,13 +22137,13 @@ let sha512 = "jlbUu0XkbpXeXhan5xyTqVK1jmEKNxE8hpzznI3TThHTr76GiFwK0iRzhDo4KNy+S9h/KxHaqVhTP86vA6wHCg=="; }; }; - "flow-parser-0.136.0" = { + "flow-parser-0.137.0" = { name = "flow-parser"; packageName = "flow-parser"; - version = "0.136.0"; + version = "0.137.0"; src = fetchurl { - url = "https://registry.npmjs.org/flow-parser/-/flow-parser-0.136.0.tgz"; - sha512 = "PB2vYAqmz+dRikpx8TpNgRtBsyemP+7oQa0BcPZWnGABlJlB2WgJc/Lx0HeEPOUxDO/TxBbPaIHsffEIL9M6BQ=="; + url = "https://registry.npmjs.org/flow-parser/-/flow-parser-0.137.0.tgz"; + sha512 = "i3KXJZ8lhlQI0n+BoZzIeH/rv+fNvAiu1i9/s64MklBV+HuhFbycUML7367J2eng0gapLnwvYPFNaPZys8POsA=="; }; }; "fluent-ffmpeg-2.1.2" = { @@ -21804,6 +22272,15 @@ let sha512 = "uXClqPxT4xW0lcdSBheb2ObVU+kuqUk3Jk64EwieirEXZx9XUrVwp/JuBfKAWaM4T5Td/VL7QLDWPXp/MvGm/g=="; }; }; + "fn-annotate-1.2.0" = { + name = "fn-annotate"; + packageName = "fn-annotate"; + version = "1.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/fn-annotate/-/fn-annotate-1.2.0.tgz"; + sha1 = "28da000117dea61842fe61f353f41cf4c93a7a7e"; + }; + }; "fn-name-2.0.1" = { name = "fn-name"; packageName = "fn-name"; @@ -22083,13 +22560,13 @@ let sha1 = "98c23dab1175657b8c0573e8ceccd91b0ff18c84"; }; }; - "fp-ts-2.8.4" = { + "fp-ts-2.8.5" = { name = "fp-ts"; packageName = "fp-ts"; - version = "2.8.4"; + version = "2.8.5"; src = fetchurl { - url = "https://registry.npmjs.org/fp-ts/-/fp-ts-2.8.4.tgz"; - sha512 = "J+kwce5SysU0YKuZ3aCnFk+dyezZD1mij6u26w1fCVfuLYgJR4eeXmVfJiUjthpZ+4yCRkRfcwMI5SkGw52oFA=="; + url = "https://registry.npmjs.org/fp-ts/-/fp-ts-2.8.5.tgz"; + sha512 = "g6do+Q/IQsxgsd2qU6+QnAbZaPR533seIbFyLGqWSxhNX4+F+cY37QdaYmMUOzekLOv/yg/2f15tc26tzDatgw=="; }; }; "fragment-cache-0.2.1" = { @@ -22272,6 +22749,15 @@ let sha512 = "66Pm4RYbjzdyeuqudYqhFiNBbCIuI9kgRqLPSHIlXHidW8NIQtVdkM1yeZ4lXwuhbTETv3EUGMNHAAw6hiundQ=="; }; }; + "fs-extra-6.0.1" = { + name = "fs-extra"; + packageName = "fs-extra"; + version = "6.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/fs-extra/-/fs-extra-6.0.1.tgz"; + sha512 = "GnyIkKhhzXZUWFCaJzvyDLEEgDkPfb4/TPvJCJVuS8MWZgoSsErf++QpiAlDnKFcqhRlm+tIOcencCjyJE6ZCA=="; + }; + }; "fs-extra-7.0.1" = { name = "fs-extra"; packageName = "fs-extra"; @@ -22425,6 +22911,15 @@ let sha512 = "Auw9a4AxqWpa9GUfj370BMPzzyncfBABW8Mab7BGWBYDj4Isgq+cDKtx0i6u9jcX9pQDnswsaaOTgTmA5pEjuQ=="; }; }; + "fsevents-2.2.0" = { + name = "fsevents"; + packageName = "fsevents"; + version = "2.2.0"; + src = fetchurl { + url = "https://registry.npmjs.org/fsevents/-/fsevents-2.2.0.tgz"; + sha512 = "pKnaUh2TNvk+/egJdBw1h46LwyLx8BzEq+MGCf/RMCVfEHHsGOCWG00dqk91kUPPArIIwMBg9T/virxwzP03cA=="; + }; + }; "fstream-0.1.31" = { name = "fstream"; packageName = "fstream"; @@ -22497,13 +22992,13 @@ let sha1 = "1b0ab3bd553b2a0d6399d29c0e3ea0b252078327"; }; }; - "fuse.js-6.4.1" = { + "fuse.js-6.4.3" = { name = "fuse.js"; packageName = "fuse.js"; - version = "6.4.1"; + version = "6.4.3"; src = fetchurl { - url = "https://registry.npmjs.org/fuse.js/-/fuse.js-6.4.1.tgz"; - sha512 = "+hAS7KYgLXontDh/vqffs7wIBw0ceb9Sx8ywZQhOsiQGcSO5zInGhttWOUYQYlvV/yYMJOacQ129Xs3mP3+oZQ=="; + url = "https://registry.npmjs.org/fuse.js/-/fuse.js-6.4.3.tgz"; + sha512 = "JNgngolukIrqwayWnvy6NLH63hmwKPhm63o0uyBg51jPD0j09IvAzlV1rTXfAsgxpghI7khAo6Mv+EmvjDWXig=="; }; }; "fuzzy-0.1.3" = { @@ -22650,13 +23145,13 @@ let sha512 = "KGDOARWVga7+rnB3z9Sd2Letx515owfk0hSxHGuqjANb1M+x2bGZGqHLiozPsYMdM2OubeMni/Hpwmjq6qIUhA=="; }; }; - "gensync-1.0.0-beta.1" = { + "gensync-1.0.0-beta.2" = { name = "gensync"; packageName = "gensync"; - version = "1.0.0-beta.1"; + version = "1.0.0-beta.2"; src = fetchurl { - url = "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.1.tgz"; - sha512 = "r8EC6NO1sngH/zdD9fiRDLdcgnbayXah+mLgManTaIZJqEC1MZstmnox8KpnI2/fxQwrp5OpCOYWLp4rBl4Jcg=="; + url = "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz"; + sha512 = "3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg=="; }; }; "get-amd-module-type-3.0.0" = { @@ -22713,6 +23208,15 @@ let sha1 = "ead774abee72e20409433a066366023dd6887a41"; }; }; + "get-intrinsic-1.0.1" = { + name = "get-intrinsic"; + packageName = "get-intrinsic"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.0.1.tgz"; + sha512 = "ZnWP+AmS1VUaLgTRy47+zKtjTxz+0xMpx3I52i+aalBK1QP19ggLF3Db89KJX7kjfOfP2eoa01qc++GwPgufPg=="; + }; + }; "get-own-enumerable-property-symbols-3.0.2" = { name = "get-own-enumerable-property-symbols"; packageName = "get-own-enumerable-property-symbols"; @@ -22902,13 +23406,13 @@ let sha1 = "39b91838707e2086fd1cf6ef8777d1c93e14649e"; }; }; - "getmac-5.16.0" = { + "getmac-5.17.0" = { name = "getmac"; packageName = "getmac"; - version = "5.16.0"; + version = "5.17.0"; src = fetchurl { - url = "https://registry.npmjs.org/getmac/-/getmac-5.16.0.tgz"; - sha512 = "6uY8p55XkkxO7gwLw5IKii29OLOe6qSh8zWFRXJUtf6uGwlGztUZ30xWtQgCAGhOP2aR3Rb5h+TFrG/RKIooAA=="; + url = "https://registry.npmjs.org/getmac/-/getmac-5.17.0.tgz"; + sha512 = "hupD+ZCHVFRaH1wBDPgIil6KWL5p5Z6kG71nAcafwq72QaMxw9bhR2LPBk3jlw3I2F3oELNkx6Fccwiuy5fv0w=="; }; }; "getpass-0.1.6" = { @@ -23091,13 +23595,13 @@ let sha512 = "KPoHZg8v+plarZvto4ruIzzJLFQoRx+sUs5DQSr07By9IBKguVd+e6jwrFR6/TP6xrCJlNV1tPqLO1aREc7O2g=="; }; }; - "git-url-parse-11.3.0" = { + "git-url-parse-11.4.0" = { name = "git-url-parse"; packageName = "git-url-parse"; - version = "11.3.0"; + version = "11.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/git-url-parse/-/git-url-parse-11.3.0.tgz"; - sha512 = "i3XNa8IKmqnUqWBcdWBjOcnyZYfN3C1WRvnKI6ouFWwsXCZEnlgbwbm55ZpJ3OJMhfEP/ryFhqW8bBhej3C5Ug=="; + url = "https://registry.npmjs.org/git-url-parse/-/git-url-parse-11.4.0.tgz"; + sha512 = "KlIa5jvMYLjXMQXkqpFzobsyD/V2K5DRHl5OAf+6oDFPlPLxrGDVQlIdI63c4/Kt6kai4kALENSALlzTGST3GQ=="; }; }; "gitconfiglocal-1.0.0" = { @@ -23307,15 +23811,6 @@ let sha1 = "e76989268a6c74c38908b1305b10fc0e394e9d0f"; }; }; - "global-4.4.0" = { - name = "global"; - packageName = "global"; - version = "4.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/global/-/global-4.4.0.tgz"; - sha512 = "wv/LAoHdRE3BeTGz53FAamhGlPLhlssK45usmGFThIi4XqnBmjKQ16u+RNbP7WvigRZDxUsM0J3gcQ5yicaL0w=="; - }; - }; "global-agent-2.1.12" = { name = "global-agent"; packageName = "global-agent"; @@ -23650,13 +24145,13 @@ let sha512 = "yUhpEDLeuGiGJjRSzEq3kvt4zJtAcjKmhIiwNp/eUs75tRlXfWcHo5tcBaMQtnjHWC7nQYT5HkY/l0QOQTkVww=="; }; }; - "got-11.7.0" = { + "got-11.8.0" = { name = "got"; packageName = "got"; - version = "11.7.0"; + version = "11.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/got/-/got-11.7.0.tgz"; - sha512 = "7en2XwH2MEqOsrK0xaKhbWibBoZqy+f1RSUoIeF1BLcnf+pyQdDsljWMfmOh+QKJwuvDIiKx38GtPh5wFdGGjg=="; + url = "https://registry.npmjs.org/got/-/got-11.8.0.tgz"; + sha512 = "k9noyoIIY9EejuhaBNLyZ31D5328LeqnyPNXJQb2XlJZcKakLqN5m6O/ikhq/0lw56kUYS54fVm+D1x57YC9oQ=="; }; }; "got-3.3.1" = { @@ -23812,6 +24307,15 @@ let sha512 = "GTCJtzJmkFLWRfFJuoo9RWWa/FfamUHgiFosxi/X1Ani4AVWbeyBenZTNX6dM+7WSbbFfTo/25eh0LLkwHMw2w=="; }; }; + "graphql-15.4.0" = { + name = "graphql"; + packageName = "graphql"; + version = "15.4.0"; + src = fetchurl { + url = "https://registry.npmjs.org/graphql/-/graphql-15.4.0.tgz"; + sha512 = "EB3zgGchcabbsU9cFe1j+yxdzKQKAbGUWRb13DsrsMN1yyfmmIq+2+L5MqVWcDCE4V89R5AyUOi7sMOGxdsYtA=="; + }; + }; "graphql-anywhere-4.2.7" = { name = "graphql-anywhere"; packageName = "graphql-anywhere"; @@ -23830,13 +24334,13 @@ let sha512 = "MBY0wEjvcgJtZUyoqpPvOE1e5qPI0hJaa1gKTqjonSFiCsNHX2lykNjpOPcodmAgH1V06ELxhGnm9kcVzqvi/g=="; }; }; - "graphql-extensions-0.12.5" = { + "graphql-extensions-0.12.6" = { name = "graphql-extensions"; packageName = "graphql-extensions"; - version = "0.12.5"; + version = "0.12.6"; src = fetchurl { - url = "https://registry.npmjs.org/graphql-extensions/-/graphql-extensions-0.12.5.tgz"; - sha512 = "mGyGaktGpK3TVBtM0ZoyPX6Xk0mN9GYX9DRyFzDU4k4A2w93nLX7Ebcp+9/O5nHRmgrc0WziYYSmoWq2WNIoUQ=="; + url = "https://registry.npmjs.org/graphql-extensions/-/graphql-extensions-0.12.6.tgz"; + sha512 = "EUNw+OIRXYTPxToSoJjhJvS5aGa94KkdkZnL1I9DCZT64/+rzQNeLeGj+goj2RYuYvoQe1Bmcx0CNZ1GqwBhng=="; }; }; "graphql-subscriptions-1.1.0" = { @@ -24496,13 +25000,13 @@ let sha512 = "0FfLHmfArWOizbdwjL+Rc9QIBzqP80juicNl4S4NEPq5OYWBCgYrtYDPUDoSyQQ9IQlBn9W7++fpYQNzZSq/wQ=="; }; }; - "hast-util-from-parse5-6.0.0" = { + "hast-util-from-parse5-6.0.1" = { name = "hast-util-from-parse5"; packageName = "hast-util-from-parse5"; - version = "6.0.0"; + version = "6.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/hast-util-from-parse5/-/hast-util-from-parse5-6.0.0.tgz"; - sha512 = "3ZYnfKenbbkhhNdmOQqgH10vnvPivTdsOJCri+APn0Kty+nRkDHArnaX9Hiaf8H+Ig+vkNptL+SRY/6RwWJk1Q=="; + url = "https://registry.npmjs.org/hast-util-from-parse5/-/hast-util-from-parse5-6.0.1.tgz"; + sha512 = "jeJUWiN5pSxW12Rh01smtVkZgZr33wBokLzKLwinYOUfSzm1Nl/c3GUGebDyOKjdsRgMvoVbV0VpAcpjF4NrJA=="; }; }; "hast-util-has-property-1.0.4" = { @@ -24532,13 +25036,13 @@ let sha512 = "oUmNua0bFbdrD/ELDSSEadRVtWZOf3iF6Lbv81naqsIV99RnSCieTbWuWCY8BAeEfKJTKl0gRdokv+dELutHGQ=="; }; }; - "hast-util-parse-selector-2.2.4" = { + "hast-util-parse-selector-2.2.5" = { name = "hast-util-parse-selector"; packageName = "hast-util-parse-selector"; - version = "2.2.4"; + version = "2.2.5"; src = fetchurl { - url = "https://registry.npmjs.org/hast-util-parse-selector/-/hast-util-parse-selector-2.2.4.tgz"; - sha512 = "gW3sxfynIvZApL4L07wryYF4+C9VvH3AUi7LAnVXV4MneGEgwOByXvFo18BgmTWnm7oHAe874jKbIB1YhHSIzA=="; + url = "https://registry.npmjs.org/hast-util-parse-selector/-/hast-util-parse-selector-2.2.5.tgz"; + sha512 = "7j6mrk/qqkSehsM92wQjdIgWM2/BW61u/53G6xmC8i1OmEdKLHbk419QKQUjz6LglWsfqoiHmyMRkP1BGjecNQ=="; }; }; "hast-util-phrasing-1.0.5" = { @@ -24550,13 +25054,22 @@ let sha512 = "P3uxm+8bnwcfAS/XpGie9wMmQXAQqsYhgQQKRwmWH/V6chiq0lmTy8KjQRJmYjusdMtNKGCUksdILSZy1suSpQ=="; }; }; - "hast-util-to-nlcst-1.2.7" = { + "hast-util-to-html-7.1.2" = { + name = "hast-util-to-html"; + packageName = "hast-util-to-html"; + version = "7.1.2"; + src = fetchurl { + url = "https://registry.npmjs.org/hast-util-to-html/-/hast-util-to-html-7.1.2.tgz"; + sha512 = "pu73bvORzdF6XZgwl9eID/0RjBb/jtRfoGRRSykpR1+o9rCdiAHpgkSukZsQBRlIqMg6ylAcd7F0F7myJUb09Q=="; + }; + }; + "hast-util-to-nlcst-1.2.8" = { name = "hast-util-to-nlcst"; packageName = "hast-util-to-nlcst"; - version = "1.2.7"; + version = "1.2.8"; src = fetchurl { - url = "https://registry.npmjs.org/hast-util-to-nlcst/-/hast-util-to-nlcst-1.2.7.tgz"; - sha512 = "IeHm2Ndwu9G7xtLswt51k3zpprLMckg7ahsvvJAG6hTPXfg+pwIu4FS30lrcxyWVMzNt35ZEoW78z4QCFTp0qw=="; + url = "https://registry.npmjs.org/hast-util-to-nlcst/-/hast-util-to-nlcst-1.2.8.tgz"; + sha512 = "cKMArohUvGw4fpN9PKDCIB+klMojkWzz5zNVNFRdKa0oC1MVX1TaDki1E/tb9xqS8WlUjKifIjmrNmRbEJzrJg=="; }; }; "hast-util-to-string-1.0.4" = { @@ -24577,13 +25090,13 @@ let sha512 = "I5GTdSfhYfAPNztx2xJRQpG8cuDSNt599/7YUn7Gx/WxNMsG+a835k97TDkFgk123cwjfwINaZknkKkphx/f2A=="; }; }; - "hastscript-5.1.2" = { + "hastscript-6.0.0" = { name = "hastscript"; packageName = "hastscript"; - version = "5.1.2"; + version = "6.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/hastscript/-/hastscript-5.1.2.tgz"; - sha512 = "WlztFuK+Lrvi3EggsqOkQ52rKbxkXL3RwB6t5lwoa8QLMemoWfBuL43eDrwOamJyR7uKQKdmKYaBH1NZBiIRrQ=="; + url = "https://registry.npmjs.org/hastscript/-/hastscript-6.0.0.tgz"; + sha512 = "nDM6bvd7lIqDUiYEiu5Sl/+6ReP0BMk/2f4U/Rooccxkj0P5nm+acM5PrGJ/t5I8qPGiqZSE6hVAwZEdZIvP4w=="; }; }; "hasurl-1.0.0" = { @@ -24685,6 +25198,24 @@ let sha1 = "69c1af3f02121f3d8788e02e84dc8b3905d71195"; }; }; + "heroku-cli-util-8.0.12" = { + name = "heroku-cli-util"; + packageName = "heroku-cli-util"; + version = "8.0.12"; + src = fetchurl { + url = "https://registry.npmjs.org/heroku-cli-util/-/heroku-cli-util-8.0.12.tgz"; + sha512 = "63wB17oSktlA/HzpIV/PGe8Isq5AZArT51KAW1gg54zyYRIiHOwXik93HZuuRVUaVrWvVUhItFeLgqMwAwlTsw=="; + }; + }; + "heroku-client-3.1.0" = { + name = "heroku-client"; + packageName = "heroku-client"; + version = "3.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/heroku-client/-/heroku-client-3.1.0.tgz"; + sha512 = "UfGKwUm5duzzSVI8uUXlNAE1mus6uPxmZPji4vuG1ArV5DYL1rXsZShp0OoxraWdEwYoxCUrM6KGztC68x5EZQ=="; + }; + }; "hex-color-regex-1.1.0" = { name = "hex-color-regex"; packageName = "hex-color-regex"; @@ -25054,6 +25585,15 @@ let sha512 = "4zDq1a1zhE4gQso/c5LP1OtrhYTncXNSpvJYtWJBtXAETPlMfi3IFNjGuQbYLuVY4ZR0QMqRVvo4Pdy9KLyP8Q=="; }; }; + "htmlparser2-5.0.1" = { + name = "htmlparser2"; + packageName = "htmlparser2"; + version = "5.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/htmlparser2/-/htmlparser2-5.0.1.tgz"; + sha512 = "vKZZra6CSe9qsJzh0BjBGXo8dvzNsq/oGvsjfRdOrrryfeD9UOBEEQdeoqCRmKZchF5h2zOBMQ6YuQ0uRUmdbQ=="; + }; + }; "http-auth-2.0.7" = { name = "http-auth"; packageName = "http-auth"; @@ -25586,6 +26126,15 @@ let sha512 = "4vf7I2LYV/HaWerSo3XmlMkp5eZ83i+/CDluXi/IGTs/O1sejBNhTtnxzmRZfvOUqj7lZjqHkeTvpgSFDlWZTg=="; }; }; + "ieee754-1.2.1" = { + name = "ieee754"; + packageName = "ieee754"; + version = "1.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz"; + sha512 = "dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA=="; + }; + }; "iferr-0.1.5" = { name = "iferr"; packageName = "iferr"; @@ -25703,13 +26252,13 @@ let sha1 = "0ecdad0c546332672d7b5b511b26bb18ce56e73f"; }; }; - "immediate-chunk-store-2.1.0" = { + "immediate-chunk-store-2.1.1" = { name = "immediate-chunk-store"; packageName = "immediate-chunk-store"; - version = "2.1.0"; + version = "2.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/immediate-chunk-store/-/immediate-chunk-store-2.1.0.tgz"; - sha512 = "QshP0SFpsy/bHQBjYMgzCcnLoqTj6PHFg8ZkPi2WbTw1qddNy0puuPDaFlXyrsZAdWMT3QziPDMzfj+mzCVMYg=="; + url = "https://registry.npmjs.org/immediate-chunk-store/-/immediate-chunk-store-2.1.1.tgz"; + sha512 = "y5AxkxqpPTj2dkaAEkDnrMuSX4JNicXHD6yTpLfFnflVejL6yJpzf27obrnlf2PSSQiWUf3735Y9tJEjxvqnoA=="; }; }; "immer-1.10.0" = { @@ -25721,6 +26270,15 @@ let sha512 = "O3sR1/opvCDGLEVcvrGTMtLac8GJ5IwZC4puPrLuRj3l7ICKvkmA0vGuU9OW8mV9WIBRnaxp5GJh9IEAaNOoYg=="; }; }; + "immer-7.0.14" = { + name = "immer"; + packageName = "immer"; + version = "7.0.14"; + src = fetchurl { + url = "https://registry.npmjs.org/immer/-/immer-7.0.14.tgz"; + sha512 = "BxCs6pJwhgSEUEOZjywW7OA8DXVzfHjkBelSEl0A+nEu0+zS4cFVdNOONvt55N4WOm8Pu4xqSPYxhm1Lv2iBBA=="; + }; + }; "import-cwd-3.0.0" = { name = "import-cwd"; packageName = "import-cwd"; @@ -25748,6 +26306,15 @@ let sha512 = "6e1q1cnWP2RXD9/keSkxHScg508CdXqXWgWBaETNhyuBFz+kUZlKboh+ISK+bU++DmbHimVBrOz/zzPe0sZ3sQ=="; }; }; + "import-fresh-3.2.2" = { + name = "import-fresh"; + packageName = "import-fresh"; + version = "3.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/import-fresh/-/import-fresh-3.2.2.tgz"; + sha512 = "cTPNrlvJT6twpYy+YmKUKrTSjWFs3bjYjAhCwm+z4EOCubZxAuO+hHpRN64TqjEaYSHs7tJAE0w1CKMGmsG/lw=="; + }; + }; "import-from-3.0.0" = { name = "import-from"; packageName = "import-from"; @@ -25991,13 +26558,13 @@ let sha512 = "zKSiXKhQveNteyhcj1CoOP8tqp1QuxPIPBl8Bid99DGLFqA1p87M6lNgfjJHSBoWJJlidGOv5rWjyYKEB3g2Jw=="; }; }; - "ink-3.0.7" = { + "ink-3.0.8" = { name = "ink"; packageName = "ink"; - version = "3.0.7"; + version = "3.0.8"; src = fetchurl { - url = "https://registry.npmjs.org/ink/-/ink-3.0.7.tgz"; - sha512 = "DF/Ena9E8af4+dYu4rrk60WwWB54CPL4s4OspDnBk0uZqntmNZLfc4PftreHeW3sUeQJK+2MdQvPLORro7mDQQ=="; + url = "https://registry.npmjs.org/ink/-/ink-3.0.8.tgz"; + sha512 = "ubMFylXYaG4IkXQVhPautbhV/p6Lo0GlvAMI/jh8cGJQ39yeznJbaTTJP2CqZXezA4GOHzalpwCWqux/NEY38w=="; }; }; "ink-text-input-4.0.1" = { @@ -26135,13 +26702,13 @@ let sha512 = "JG3eIAj5V9CwcGvuOmoo6LB9kbAYT8HXffUl6memuszlwDC/qvFAJw49XJ5NROSFNPxp3iQg1GqkFhaY/CR0IA=="; }; }; - "inquirer-autocomplete-prompt-1.2.0" = { + "inquirer-autocomplete-prompt-1.3.0" = { name = "inquirer-autocomplete-prompt"; packageName = "inquirer-autocomplete-prompt"; - version = "1.2.0"; + version = "1.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/inquirer-autocomplete-prompt/-/inquirer-autocomplete-prompt-1.2.0.tgz"; - sha512 = "t8A0gFq0mOKGz8wmGBPh+M/AC8KSMMcn7dnHXzLWyKvLiRYWswQ6rg7d938hoR5tVP1GpHVmHOR6YP8G5dYhhQ=="; + url = "https://registry.npmjs.org/inquirer-autocomplete-prompt/-/inquirer-autocomplete-prompt-1.3.0.tgz"; + sha512 = "zvAc+A6SZdcN+earG5SsBu1RnQdtBS4o8wZ/OqJiCfL34cfOx+twVRq7wumYix6Rkdjn1N2nVCcO3wHqKqgdGg=="; }; }; "insert-module-globals-7.2.1" = { @@ -26648,13 +27215,13 @@ let sha512 = "NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w=="; }; }; - "is-buffer-2.0.4" = { + "is-buffer-2.0.5" = { name = "is-buffer"; packageName = "is-buffer"; - version = "2.0.4"; + version = "2.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/is-buffer/-/is-buffer-2.0.4.tgz"; - sha512 = "Kq1rokWXOPXWuaMAqZiJW4XxsmD9zGx9q4aePabbn3qCRGedtH7Cm+zV8WETitMfu1wdh+Rvd6w5egwSngUX2A=="; + url = "https://registry.npmjs.org/is-buffer/-/is-buffer-2.0.5.tgz"; + sha512 = "i2R6zNFDwgEHJyQUtJEk0XFi1i0dPFn/oqjK3/vPCcDeJvW5NQ83V8QbicfF1SupOaB0h8ntgBC2YiE7dfyctQ=="; }; }; "is-callable-1.2.2" = { @@ -26711,6 +27278,15 @@ let sha1 = "cfff471aee4dd5c9e158598fbe12967b5cdad345"; }; }; + "is-core-module-2.0.0" = { + name = "is-core-module"; + packageName = "is-core-module"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/is-core-module/-/is-core-module-2.0.0.tgz"; + sha512 = "jq1AH6C8MuteOoBPwkxHafmByhL9j5q4OaPGdbuD+ZtQJVzH+i6E3BJDQcBA09k57i2Hh2yQbEG8yObZ0jdlWw=="; + }; + }; "is-data-descriptor-0.1.4" = { name = "is-data-descriptor"; packageName = "is-data-descriptor"; @@ -27701,13 +28277,13 @@ let sha1 = "4b0da1442104d1b336340e80797e865cf39f7d72"; }; }; - "is-valid-domain-0.0.16" = { + "is-valid-domain-0.0.17" = { name = "is-valid-domain"; packageName = "is-valid-domain"; - version = "0.0.16"; + version = "0.0.17"; src = fetchurl { - url = "https://registry.npmjs.org/is-valid-domain/-/is-valid-domain-0.0.16.tgz"; - sha512 = "3IUxXDOLh9HBmfyHx9ySK4ZZuN8qU2Z1GPT2jNSmY/H7p8nhEXYX36WYpAQYAulupTgA5WnSYXWiWuLYp3Fw1Q=="; + url = "https://registry.npmjs.org/is-valid-domain/-/is-valid-domain-0.0.17.tgz"; + sha512 = "w0UWEXyrgPeWWwj9FVT14y4/dSIqWgjDkzxbsGDFpT+QRbyS9HTwwNvGus2IOR/03GzCpeChzSWK9Bo9WlStDA=="; }; }; "is-valid-glob-1.0.0" = { @@ -28178,13 +28754,13 @@ let sha512 = "/dsSmUkIy5EBGfv/IjjqmFxrNAUpBERfGs1oHROyD7yxjG/w+t0GOJDX8O1k32ySmd7+a5IhnJU2qQFcJ4n1vw=="; }; }; - "jest-worker-26.5.0" = { + "jest-worker-26.6.2" = { name = "jest-worker"; packageName = "jest-worker"; - version = "26.5.0"; + version = "26.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/jest-worker/-/jest-worker-26.5.0.tgz"; - sha512 = "kTw66Dn4ZX7WpjZ7T/SUDgRhapFRKWmisVAF0Rv4Fu8SLFD7eLbqpLvbxVqYhSgaWa7I+bW7pHnbyfNsH6stug=="; + url = "https://registry.npmjs.org/jest-worker/-/jest-worker-26.6.2.tgz"; + sha512 = "KWYVV1c4i+jbMpaBC+U++4Va0cp8OisU185o73T1vo99hqi7w8tSJfUXYswwqqrjzwxa6KpRK54WhPvwf5w6PQ=="; }; }; "jetifier-1.6.6" = { @@ -28259,13 +28835,13 @@ let sha1 = "b8417b750661a392bee2c2537c68b2a9d4977cd5"; }; }; - "joplin-turndown-4.0.29" = { + "joplin-turndown-4.0.30" = { name = "joplin-turndown"; packageName = "joplin-turndown"; - version = "4.0.29"; + version = "4.0.30"; src = fetchurl { - url = "https://registry.npmjs.org/joplin-turndown/-/joplin-turndown-4.0.29.tgz"; - sha512 = "rVGu8u4TpSRETo59/jiVW9iaXnpdxxpBHjb7nyCflkDfWhg1Kska4uagBQGw7cD2yxw7mB2YUIB/fAgtlIzcDQ=="; + url = "https://registry.npmjs.org/joplin-turndown/-/joplin-turndown-4.0.30.tgz"; + sha512 = "OrGdNTsjI6/cbx/es9Hl0YI3YTql4SopduFcYCnWTZgqT0SJqILnF2JQxSNnbPnkSDIIRdNOG4+iNzlY6bS1nw=="; }; }; "joplin-turndown-plugin-gfm-1.0.12" = { @@ -28322,13 +28898,13 @@ let sha1 = "bcb4045c8dd0539c134bc1488cdd3e768a7a9e51"; }; }; - "jquery.terminal-2.18.3" = { + "jquery.terminal-2.19.2" = { name = "jquery.terminal"; packageName = "jquery.terminal"; - version = "2.18.3"; + version = "2.19.2"; src = fetchurl { - url = "https://registry.npmjs.org/jquery.terminal/-/jquery.terminal-2.18.3.tgz"; - sha512 = "zzMVGYlAC+luF7Omm9UY1/nuvp00mozSgcGImObWSS3uDRtcxnxlwxQLC8tvlTT+koyfOvCBaWgB6AD4DvWVpQ=="; + url = "https://registry.npmjs.org/jquery.terminal/-/jquery.terminal-2.19.2.tgz"; + sha512 = "oljqqqN19/tqmsSdr4exz75DlQQ35c/FhP0EkrmQUt1NCXtYGujb8G5uCATDV+EhbDpF6nleH8YsOmzpqpKT/g=="; }; }; "js-base64-2.6.4" = { @@ -28691,6 +29267,15 @@ let sha1 = "b480c892e59a2f05954ce727bd3f2a4e882f9e13"; }; }; + "json-schema-deref-sync-0.13.0" = { + name = "json-schema-deref-sync"; + packageName = "json-schema-deref-sync"; + version = "0.13.0"; + src = fetchurl { + url = "https://registry.npmjs.org/json-schema-deref-sync/-/json-schema-deref-sync-0.13.0.tgz"; + sha512 = "YBOEogm5w9Op337yb6pAT6ZXDqlxAsQCanM3grid8lMWNxRJO/zWEJi3ZzqDL8boWfwhTFym5EFrNgWwpqcBRg=="; + }; + }; "json-schema-deref-sync-0.6.0" = { name = "json-schema-deref-sync"; packageName = "json-schema-deref-sync"; @@ -28898,13 +29483,13 @@ let sha1 = "8771aae0799b64076b76640fca058f9c10e33ecb"; }; }; - "jsonfile-6.0.1" = { + "jsonfile-6.1.0" = { name = "jsonfile"; packageName = "jsonfile"; - version = "6.0.1"; + version = "6.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/jsonfile/-/jsonfile-6.0.1.tgz"; - sha512 = "jR2b5v7d2vIOust+w3wtFKZIfpC2pnRmFAhAC/BuweZFQR8qZzxH1OyrQ10HmdVYiXWkYUqPVsz91cG7EL2FBg=="; + url = "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz"; + sha512 = "5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ=="; }; }; "jsonify-0.0.0" = { @@ -29087,13 +29672,13 @@ let sha1 = "87fccfaeffc0b68cd19d55f6722943f929ea35ea"; }; }; - "just-detect-adblock-1.0.0" = { + "just-detect-adblock-1.1.0" = { name = "just-detect-adblock"; packageName = "just-detect-adblock"; - version = "1.0.0"; + version = "1.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/just-detect-adblock/-/just-detect-adblock-1.0.0.tgz"; - sha1 = "7bf8660cf15571fe7cf3b49c222e4716e1605a0c"; + url = "https://registry.npmjs.org/just-detect-adblock/-/just-detect-adblock-1.1.0.tgz"; + sha512 = "xtgnwBBZaLtKspGo6jDX/H0FDsHrn41mQVWhNHge7pZe6Nj2gU2izfC09O0rPU/i97iMcJFVjbecFiTAvmNhLQ=="; }; }; "jwa-1.4.1" = { @@ -30141,6 +30726,15 @@ let sha512 = "5lMmsPc9ZtMjBk8rJ8ADKIj6AOgYvRtAuNfboO2TVPZsmcn6gSRyijUsA8KG6DUcJ89/hyQ3cnVRyzO1hbDavw=="; }; }; + "line-column-1.0.2" = { + name = "line-column"; + packageName = "line-column"; + version = "1.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/line-column/-/line-column-1.0.2.tgz"; + sha1 = "d25af2936b6f4849172b312e4792d1d987bc34a2"; + }; + }; "line-reader-0.4.0" = { name = "line-reader"; packageName = "line-reader"; @@ -30249,13 +30843,13 @@ let sha512 = "8UyQoYmdRDy81Brz6aLAUhfZLwr5zV0L3taTQ4hju7m6biuwiWiJXjPhBJxbUQJA8PrkvJ/7Enqmwk2sM14soA=="; }; }; - "load-ip-set-2.1.0" = { + "load-ip-set-2.1.1" = { name = "load-ip-set"; packageName = "load-ip-set"; - version = "2.1.0"; + version = "2.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/load-ip-set/-/load-ip-set-2.1.0.tgz"; - sha512 = "taz7U6B+F7Zq90dfIKwqsB1CrFKelSEmMGC68OUqem8Cgd1QZygQBYb2Fk9i6muBSfH4xwF/Pjt4KKlAdOyWZw=="; + url = "https://registry.npmjs.org/load-ip-set/-/load-ip-set-2.1.1.tgz"; + sha512 = "LC7BWnATJOrKZa94qKNU8I/cWvVCgHPGSEMZ9hNCd3C5Th+XIUuU5lws6KhCK9QYeSD2xADnLUzkUbzYaRJ/lQ=="; }; }; "load-json-file-1.1.0" = { @@ -30465,15 +31059,6 @@ let sha512 = "8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A=="; }; }; - "lodash-4.17.19" = { - name = "lodash"; - packageName = "lodash"; - version = "4.17.19"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash/-/lodash-4.17.19.tgz"; - sha512 = "JNvd8XER9GQX0v2qJgsaN/mzFCNA5BRe/j8JN9d+tWyGLSodKQHKFicdwNYzWwI3wjRnaKPsGj1XkBjx/F96DQ=="; - }; - }; "lodash-4.17.20" = { name = "lodash"; packageName = "lodash"; @@ -32076,13 +32661,13 @@ let sha512 = "rlAEsgU9Bnavca2w1WJ6+6cdeHMXNyadcersyk3ZpuhgWb5HBNj8l4WwJz9PjksAhYDlpQffCVXPctOn+wCIVA=="; }; }; - "lunr-2.3.6" = { + "lunr-2.3.8" = { name = "lunr"; packageName = "lunr"; - version = "2.3.6"; + version = "2.3.8"; src = fetchurl { - url = "https://registry.npmjs.org/lunr/-/lunr-2.3.6.tgz"; - sha512 = "swStvEyDqQ85MGpABCMBclZcLI/pBIlu8FFDtmX197+oEgKloJ67QnB+Tidh0340HmLMs39c4GrkPY3cmkXp6Q=="; + url = "https://registry.npmjs.org/lunr/-/lunr-2.3.8.tgz"; + sha512 = "oxMeX/Y35PNFuZoHp+jUj5OSEmLCaIH4KTFJh7a93cHBoFmpw2IoPs22VIz7vyO2YUnx2Tn9dzIwO2P/4quIRg=="; }; }; "lynx-0.2.0" = { @@ -32193,13 +32778,22 @@ let sha1 = "79cc6d65a00bb5b7ef5c25ae60ebbb5d9a7681a8"; }; }; - "magnet-uri-5.3.0" = { + "magnet-uri-5.4.0" = { name = "magnet-uri"; packageName = "magnet-uri"; - version = "5.3.0"; + version = "5.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/magnet-uri/-/magnet-uri-5.3.0.tgz"; - sha512 = "8GuTc9mXYfaKrXz687kzx2YTEhMR/X1Qgt6tkTNwPlb2fUy3QfU+O9zuoB5DKAa/IyVdLGxe9xSFUtaA+ZG5tQ=="; + url = "https://registry.npmjs.org/magnet-uri/-/magnet-uri-5.4.0.tgz"; + sha512 = "ZpqciThlbvE6KkyT5oxAup/6CwjePw1hdtR8NU5+vq2hn9Sp5b7w3bRiJRvo9fMHUj2dWSuVCdkqt9p4ed1V9Q=="; + }; + }; + "magnet-uri-6.0.0" = { + name = "magnet-uri"; + packageName = "magnet-uri"; + version = "6.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/magnet-uri/-/magnet-uri-6.0.0.tgz"; + sha512 = "p9wst4k4u0seE7yPonAPKIUTaiC+fm706o2D8FrNoBalK5CcQdU4hB+RHQTqfIISYkFp0nZzsgyKPacPa6Yg/g=="; }; }; "make-dir-1.3.0" = { @@ -32616,15 +33210,6 @@ let sha512 = "ea2eGWOqNxPcXv8dyERdSr/6FmzvWwzjMxpfGB/sbMccXoct+xY+YukPD+QTUZwyvK7BZwcr4m21WBOW41pAkg=="; }; }; - "marked-0.6.3" = { - name = "marked"; - packageName = "marked"; - version = "0.6.3"; - src = fetchurl { - url = "https://registry.npmjs.org/marked/-/marked-0.6.3.tgz"; - sha512 = "Fqa7eq+UaxfMriqzYLayfqAE40WN03jf+zHjT18/uXNuzjq3TY0XTbrAoPeqSJrAmPz11VuUA+kBPYOhHt9oOQ=="; - }; - }; "marked-0.7.0" = { name = "marked"; packageName = "marked"; @@ -32643,13 +33228,13 @@ let sha512 = "EGwzEeCcLniFX51DhTpmTom+dSA/MG/OBUDjnWtHbEnjAH180VzUeAw+oE4+Zv+CoYBWyRlYOTR0N8SO9R1PVw=="; }; }; - "marked-1.2.0" = { + "marked-1.2.2" = { name = "marked"; packageName = "marked"; - version = "1.2.0"; + version = "1.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/marked/-/marked-1.2.0.tgz"; - sha512 = "tiRxakgbNPBr301ihe/785NntvYyhxlqcL3YaC8CaxJQh7kiaEtrN9B/eK2I2943Yjkh5gw25chYFDQhOMCwMA=="; + url = "https://registry.npmjs.org/marked/-/marked-1.2.2.tgz"; + sha512 = "5jjKHVl/FPo0Z6ocP3zYhKiJLzkwJAw4CZoLjv57FkvbUuwOX4LIBBGGcXjAY6ATcd1q9B8UTj5T9Umauj0QYQ=="; }; }; "marked-terminal-4.1.0" = { @@ -32886,13 +33471,13 @@ let sha512 = "7GlnT24gEwDrdAwEHrU4Vv5lLWrEer4KOkAiKT9nYstsTad7Oc1TwqT2zIMKRdZF7cTuaf+GA1E4Kv7jJh8mPA=="; }; }; - "mdast-util-to-nlcst-4.0.0" = { + "mdast-util-to-nlcst-4.0.1" = { name = "mdast-util-to-nlcst"; packageName = "mdast-util-to-nlcst"; - version = "4.0.0"; + version = "4.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/mdast-util-to-nlcst/-/mdast-util-to-nlcst-4.0.0.tgz"; - sha512 = "CPDf82bVAVImJTZgZ9S1yxGczDyoYi1R+edzz8EVFUPvT3RN0RZnnSnMikawLf6ukAKj6pyhsG0exSO7UEA3DA=="; + url = "https://registry.npmjs.org/mdast-util-to-nlcst/-/mdast-util-to-nlcst-4.0.1.tgz"; + sha512 = "Y4ffygj85MTt70STKnEquw6k73jYWJBaYcb4ITAKgSNokZF7fH8rEHZ1GsRY/JaxqUevMaEnsDmkVv5Z9uVRdg=="; }; }; "mdmanifest-1.0.8" = { @@ -32904,13 +33489,22 @@ let sha1 = "c04891883c28c83602e1d06b05a11037e359b4c8"; }; }; - "mdn-browser-compat-data-1.0.39" = { + "mdn-browser-compat-data-1.0.40" = { name = "mdn-browser-compat-data"; packageName = "mdn-browser-compat-data"; - version = "1.0.39"; + version = "1.0.40"; src = fetchurl { - url = "https://registry.npmjs.org/mdn-browser-compat-data/-/mdn-browser-compat-data-1.0.39.tgz"; - sha512 = "1U5Lt+pjYxJ1mosBIdK5fr3guzV4v81f8yy0rLAj/cu7ki3ciCe85LVJJ0RLK0lP6VwFtjpXSOESfwAEpz0FyQ=="; + url = "https://registry.npmjs.org/mdn-browser-compat-data/-/mdn-browser-compat-data-1.0.40.tgz"; + sha512 = "yjM/OG0krZIgi+XrhJWS3CJ9UQuGM4FfjIUIt2f65er6qczkM+WjtNEv/9ZF9DxDs/2GR3SO6hDaZLplTRrrfw=="; + }; + }; + "mdn-data-2.0.12" = { + name = "mdn-data"; + packageName = "mdn-data"; + version = "2.0.12"; + src = fetchurl { + url = "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.12.tgz"; + sha512 = "ULbAlgzVb8IqZ0Hsxm6hHSlQl3Jckst2YEQS7fODu9ilNWy2LvcoSY7TRFIktABP2mdppBioc66va90T+NUs8Q=="; }; }; "mdn-data-2.0.4" = { @@ -32922,15 +33516,6 @@ let sha512 = "iV3XNKw06j5Q7mi6h+9vbx23Tv7JkjEVgKHW4pimwyDGWm0OIQntJJ+u1C6mg6mK1EaTv42XQ7w76yuzH7M2cA=="; }; }; - "mdn-data-2.0.6" = { - name = "mdn-data"; - packageName = "mdn-data"; - version = "2.0.6"; - src = fetchurl { - url = "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.6.tgz"; - sha512 = "rQvjv71olwNHgiTbfPZFkJtjNMciWgswYeciZhtvWLO8bmX3TnhyA62I6sTWOyZssWHJJjY6/KiWwqQsWWsqOA=="; - }; - }; "mdns-js-0.5.0" = { name = "mdns-js"; packageName = "mdns-js"; @@ -32985,13 +33570,13 @@ let sha512 = "aisnrDP4GNe06UcKFnV5bfMNPBUw4jsLGaWwWfnH3v02GnBuXX2MCVn5RbrWo0j3pczUilYblq7fQ7Nw2t5XKw=="; }; }; - "mediasource-2.3.0" = { + "mediasource-2.4.0" = { name = "mediasource"; packageName = "mediasource"; - version = "2.3.0"; + version = "2.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/mediasource/-/mediasource-2.3.0.tgz"; - sha512 = "fqm86UwHvAnneIv40Uy1sDQaFtAByq/k0SQ3uCtbnEeSQNT1s5TDHCZOD1VmYCHwfY1jL2NjoZVwzZKYqy3L7A=="; + url = "https://registry.npmjs.org/mediasource/-/mediasource-2.4.0.tgz"; + sha512 = "SKUMrbFMHgiCUZFOWZcL0aiF/KgHx9SPIKzxrl6+7nMUMDK/ZnOmJdY/9wKzYeM0g3mybt3ueg+W+/mrYfmeFQ=="; }; }; "mediawiki-title-0.6.5" = { @@ -33048,13 +33633,13 @@ let sha512 = "e0WfJAMm8Gv1mP5fEq/Blzy6Lt1VbLg7gNnZmZak7nhrBTibs+c6nQ4SKs/ZyJYHS1mFgDJeopsLAv7Ow0FMFg=="; }; }; - "mem-fs-editor-7.0.1" = { + "mem-fs-editor-7.1.0" = { name = "mem-fs-editor"; packageName = "mem-fs-editor"; - version = "7.0.1"; + version = "7.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/mem-fs-editor/-/mem-fs-editor-7.0.1.tgz"; - sha512 = "eD8r4/d2ayp9HHIgBPHB6Ds0ggA8F9cf9HxcNtbqrwqJXfIDrOSMG5K4fV3+Ib3B+HIdrWqkeDDDvrO7i9EbvQ=="; + url = "https://registry.npmjs.org/mem-fs-editor/-/mem-fs-editor-7.1.0.tgz"; + sha512 = "BH6QEqCXSqGeX48V7zu+e3cMwHU7x640NB8Zk8VNvVZniz+p4FK60pMx/3yfkzo6miI6G3a8pH6z7FeuIzqrzA=="; }; }; "memfs-3.2.0" = { @@ -33165,6 +33750,15 @@ let sha512 = "HQM+cZB/kY1+jj57It22FsptJ3nuZRYxnwh3rWZEvDZO1zuzhIrX9uyFcjP9AhFQvM5WS6vZKtn3veohDH4S7w=="; }; }; + "memorystore-1.6.4" = { + name = "memorystore"; + packageName = "memorystore"; + version = "1.6.4"; + src = fetchurl { + url = "https://registry.npmjs.org/memorystore/-/memorystore-1.6.4.tgz"; + sha512 = "51j4kUedbqkWGby44hAhf5f/hj8GOvHoLX00/YHURBNxOMf5k8JbPuGfmeNpZEXhc3vrmfnFben4+rOOx3HjEQ=="; + }; + }; "memorystream-0.3.1" = { name = "memorystream"; packageName = "memorystream"; @@ -33912,13 +34506,13 @@ let sha512 = "bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg=="; }; }; - "mirakurun-3.2.0" = { + "mirakurun-3.3.1" = { name = "mirakurun"; packageName = "mirakurun"; - version = "3.2.0"; + version = "3.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/mirakurun/-/mirakurun-3.2.0.tgz"; - sha512 = "zRMza+rxE5XUgUDy8lbt1qAKA9TKcApnwmP+06chBZXinxwEiaRbto7vE8is7ky6+qCS9Q7Erf91kbhAsLwydw=="; + url = "https://registry.npmjs.org/mirakurun/-/mirakurun-3.3.1.tgz"; + sha512 = "uCsn3t7bV3jmy8mcgl19wowBq69Xz/Z/WUkazOC9PXvzzb9j5wvfr+qrwB5GtHkLBFIaBVI59HIX+JJ637jVmA=="; }; }; "mired-0.0.0" = { @@ -34047,22 +34641,31 @@ let sha1 = "ebb3a977e7af1c683ae6fda12b545a6ba6c5853d"; }; }; - "mobx-4.15.7" = { + "mobx-6.0.3" = { name = "mobx"; packageName = "mobx"; - version = "4.15.7"; + version = "6.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/mobx/-/mobx-4.15.7.tgz"; - sha512 = "X4uQvuf2zYKHVO5kRT5Utmr+J9fDnRgxWWnSqJ4oiccPTQU38YG+/O3nPmOhUy4jeHexl7XJJpWDBgEnEfp+8w=="; + url = "https://registry.npmjs.org/mobx/-/mobx-6.0.3.tgz"; + sha512 = "DBMd0NXsMn25HJMUAWBndgJ2wRjOJPbpn6wdzUvZW0PVsyTnrw028XwQfzsjnxnKG+bAXGVNb38rvd+1o0G9uQ=="; }; }; - "mobx-react-5.4.4" = { + "mobx-react-6.3.1" = { name = "mobx-react"; packageName = "mobx-react"; - version = "5.4.4"; + version = "6.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/mobx-react/-/mobx-react-5.4.4.tgz"; - sha512 = "2mTzpyEjVB/RGk2i6KbcmP4HWcAUFox5ZRCrGvSyz49w20I4C4qql63grPpYrS9E9GKwgydBHQlA4y665LuRCQ=="; + url = "https://registry.npmjs.org/mobx-react/-/mobx-react-6.3.1.tgz"; + sha512 = "IOxdJGnRSNSJrL2uGpWO5w9JH5q5HoxEqwOF4gye1gmZYdjoYkkMzSGMDnRCUpN/BNzZcFoMdHXrjvkwO7KgaQ=="; + }; + }; + "mobx-react-lite-2.2.2" = { + name = "mobx-react-lite"; + packageName = "mobx-react-lite"; + version = "2.2.2"; + src = fetchurl { + url = "https://registry.npmjs.org/mobx-react-lite/-/mobx-react-lite-2.2.2.tgz"; + sha512 = "2SlXALHIkyUPDsV4VTKVR9DW7K3Ksh1aaIv3NrNJygTbhXe2A9GrcKHZ2ovIiOp/BXilOcTYemfHHZubP431dg=="; }; }; "mocha-2.5.3" = { @@ -34083,13 +34686,13 @@ let sha512 = "O9CIypScywTVpNaRrCAgoUnJgozpIofjKUYmJhiCIJMiuYnLI6otcb1/kpW9/n/tJODHGZ7i8aLQoDVsMtOKQQ=="; }; }; - "mocha-8.2.0" = { + "mocha-8.2.1" = { name = "mocha"; packageName = "mocha"; - version = "8.2.0"; + version = "8.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/mocha/-/mocha-8.2.0.tgz"; - sha512 = "lEWEMq2LMfNJMKeuEwb5UELi+OgFDollXaytR5ggQcHpzG3NP/R7rvixAvF+9/lLsTWhWG+4yD2M70GsM06nxw=="; + url = "https://registry.npmjs.org/mocha/-/mocha-8.2.1.tgz"; + sha512 = "cuLBVfyFfFqbNR0uUKbDGXKGk+UDFe6aR4os78XIrMQpZl/nv7JYHcvP5MFIAb374b2zFXsdgEGwmzMtP0Xg8w=="; }; }; "mock-require-3.0.3" = { @@ -34119,13 +34722,13 @@ let sha512 = "A/78XjoX2EmNvppVWEhM2oGk3x4lLxnkEA4jTbaK97QKSDjkIoOsKQlfylt/d3kKKi596Qy3NP5XrXJ6fZIC9Q=="; }; }; - "module-definition-3.3.0" = { + "module-definition-3.3.1" = { name = "module-definition"; packageName = "module-definition"; - version = "3.3.0"; + version = "3.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/module-definition/-/module-definition-3.3.0.tgz"; - sha512 = "HTplA9xwDzH67XJFC1YvZMUElWJD28DV0dUq7lhTs+JKJamUOWA/CcYWSlhW5amJO66uWtY7XdltT+LfX0wIVg=="; + url = "https://registry.npmjs.org/module-definition/-/module-definition-3.3.1.tgz"; + sha512 = "kLidGPwQ2yq484nSD+D3JoJp4Etc0Ox9P0L34Pu/cU4X4HcG7k7p62XI5BBuvURWMRX3RPyuhOcBHbKus+UH4A=="; }; }; "module-deps-6.2.3" = { @@ -34560,13 +35163,13 @@ let sha512 = "xasv76hl6nr1dEy3lPvy7Ej7K/Lx3O/FCvwge8PeVJpciPPoNCbaANcNiBug3IpdvTveZUcAV0DJzdnUDMesNQ=="; }; }; - "multistream-4.0.0" = { + "multistream-4.0.1" = { name = "multistream"; packageName = "multistream"; - version = "4.0.0"; + version = "4.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/multistream/-/multistream-4.0.0.tgz"; - sha512 = "t0C8MAtH/d3Y+5nooEtUMWli92lVw9Jhx4uOhRl5GAwS5vc+YTmp/VXNJNsCBAMeEyK/6zhbk6x9JE3AiCvo4g=="; + url = "https://registry.npmjs.org/multistream/-/multistream-4.0.1.tgz"; + sha512 = "LNPIR/LD0JUw2beGlSv4sgTSnGbZp16d/PG2rnIrYjkeCaepNmBTobuiaNQATCPiYgn+BBuQTm70UlvwRfLZ3Q=="; }; }; "munin-plugin-0.0.9" = { @@ -34848,6 +35451,15 @@ let sha512 = "1qstj9z5+x491jfiC4Nelk+f8XBad7LN20PmyWINJEMRSf3wcAjAWysw1qaA8z6NSKe2sjq1hRSDpBH5paCb6A=="; }; }; + "nanoid-3.1.16" = { + name = "nanoid"; + packageName = "nanoid"; + version = "3.1.16"; + src = fetchurl { + url = "https://registry.npmjs.org/nanoid/-/nanoid-3.1.16.tgz"; + sha512 = "+AK8MN0WHji40lj8AEuwLOvLSbWYApQpre/aFJZD71r43wVRLrOYS4FmJOPQYon1TqB462RzrrxlfA74XRES8w=="; + }; + }; "nanolru-1.0.0" = { name = "nanolru"; packageName = "nanolru"; @@ -34911,13 +35523,13 @@ let sha1 = "20a318c30cb45f71fe7adfbf7b21c99c1472ef11"; }; }; - "native-request-1.0.7" = { + "native-request-1.0.8" = { name = "native-request"; packageName = "native-request"; - version = "1.0.7"; + version = "1.0.8"; src = fetchurl { - url = "https://registry.npmjs.org/native-request/-/native-request-1.0.7.tgz"; - sha512 = "9nRjinI9bmz+S7dgNtf4A70+/vPhnd+2krGpy4SUlADuOuSa24IDkNaZ+R/QT1wQ6S8jBdi6wE7fLekFZNfUpQ=="; + url = "https://registry.npmjs.org/native-request/-/native-request-1.0.8.tgz"; + sha512 = "vU2JojJVelUGp6jRcLwToPoWGxSx23z/0iX+I77J3Ht17rf2INGjrhOoQnjVo60nQd8wVsgzKkPfRXBiVdD2ag=="; }; }; "native-url-0.2.6" = { @@ -35209,13 +35821,22 @@ let sha512 = "AO81vsIO1k1sM4Zrd6Hu7regmJN1NSiAja10gc4bX3F0wd+9rQmcuHQaHVQCYIEC8iFXnE+mavh23GOt7wBgug=="; }; }; - "netlify-4.8.0" = { + "netlify-4.9.0" = { name = "netlify"; packageName = "netlify"; - version = "4.8.0"; + version = "4.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/netlify/-/netlify-4.8.0.tgz"; - sha512 = "6eaIvlTIwnh1zzFJ0RBMDAE6/GcZ3Y9JIR4cFNZdgINO+zRgWL/vNbjRs2hIerLpOS1eqt6Ye1P9RTqHEQNXUg=="; + url = "https://registry.npmjs.org/netlify/-/netlify-4.9.0.tgz"; + sha512 = "x+VqJ+yop05OUpeaT4fhz/NAvJQFjtNhW1s+/i6oP/EZS6/+B0u+qCANF8uP9u3UJcmWvlJmrRoDhj62Xvtwug=="; + }; + }; + "netlify-plugin-deploy-preview-commenting-0.0.1-alpha.16" = { + name = "netlify-plugin-deploy-preview-commenting"; + packageName = "netlify-plugin-deploy-preview-commenting"; + version = "0.0.1-alpha.16"; + src = fetchurl { + url = "https://registry.npmjs.org/netlify-plugin-deploy-preview-commenting/-/netlify-plugin-deploy-preview-commenting-0.0.1-alpha.16.tgz"; + sha512 = "5Rvi17CKgPpZTazEV2wkSj4IbS2zJpoKuytaYCyvemV/CMVeZUUPRwNPWm7+NjxObqJHgzUyi2FmWql8HfWhGA=="; }; }; "netlify-redirect-parser-2.5.0" = { @@ -35245,6 +35866,15 @@ let sha1 = "20297e89d86f6f6400f250d9f4f6b4c1945fcd35"; }; }; + "netrc-parser-3.1.6" = { + name = "netrc-parser"; + packageName = "netrc-parser"; + version = "3.1.6"; + src = fetchurl { + url = "https://registry.npmjs.org/netrc-parser/-/netrc-parser-3.1.6.tgz"; + sha512 = "lY+fmkqSwntAAjfP63jB4z5p5WbuZwyMCD3pInT7dpHU/Gc6Vv90SAC6A0aNiqaRGHiuZFBtiwu+pu8W/Eyotw=="; + }; + }; "nets-3.2.0" = { name = "nets"; packageName = "nets"; @@ -35308,13 +35938,13 @@ let sha512 = "CXdUiJembsNjuToQvxayPZF9Vqht7hewsvy2sOWafLvi2awflj9mOC6bHIg50orX8IJvWKY9wYQ/zB2kogPslQ=="; }; }; - "nextgen-events-1.3.0" = { + "nextgen-events-1.3.3" = { name = "nextgen-events"; packageName = "nextgen-events"; - version = "1.3.0"; + version = "1.3.3"; src = fetchurl { - url = "https://registry.npmjs.org/nextgen-events/-/nextgen-events-1.3.0.tgz"; - sha512 = "eBz5mrO4Hw2eenPVm0AVPHuAzg/RZetAWMI547RH8O9+a0UYhCysiZ3KoNWslnWNlHetb9kzowEshsKsmFo2YQ=="; + url = "https://registry.npmjs.org/nextgen-events/-/nextgen-events-1.3.3.tgz"; + sha512 = "5h9U7had+Q+a95Rwgu4JL6otqXs3y4474g7ruQtd8TAsoG6ycvjccnuLxhXEv32/HOKTC09K+HkbFaITIexLkg=="; }; }; "nice-try-1.0.5" = { @@ -35335,22 +35965,22 @@ let sha1 = "04b035cb530d46859d1018839a518c029133f676"; }; }; - "nlcst-is-literal-1.2.1" = { + "nlcst-is-literal-1.2.2" = { name = "nlcst-is-literal"; packageName = "nlcst-is-literal"; - version = "1.2.1"; + version = "1.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/nlcst-is-literal/-/nlcst-is-literal-1.2.1.tgz"; - sha512 = "abNv1XY7TUoyLn5kSSorMIYHfRvVfXbgftNFNvEMiQQkyKteLdjrGuDqEMMyK70sMbn7uPA6oUbRvykM6pg+pg=="; + url = "https://registry.npmjs.org/nlcst-is-literal/-/nlcst-is-literal-1.2.2.tgz"; + sha512 = "R+1OJEmRl3ZOp9d8PbiRxGpnvmpi3jU+lzSqCJoLeogdEh0FYDRH1aC223qUbaKffxNTJkEfeDOeQfziw749yA=="; }; }; - "nlcst-normalize-2.1.4" = { + "nlcst-normalize-2.1.5" = { name = "nlcst-normalize"; packageName = "nlcst-normalize"; - version = "2.1.4"; + version = "2.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/nlcst-normalize/-/nlcst-normalize-2.1.4.tgz"; - sha512 = "dWJ3XUoAoWoau24xOM59Y1FPozv7DyYWy+rdUaXj9Ow0hBCVuwqDQbXzTF7H+HskyTVpTkRPXYPu4YsMEScmRw=="; + url = "https://registry.npmjs.org/nlcst-normalize/-/nlcst-normalize-2.1.5.tgz"; + sha512 = "xSqTKv8IHIy3n/orD7wj81BZljLfbrTot0Pv64MYUnQUXfDbi1xDSpJR4qEmbFWyFoHsmivcOdgrK+o7ky3mcw=="; }; }; "nlcst-search-2.0.0" = { @@ -35633,15 +36263,6 @@ let sha512 = "CbpcIo7C3eMu3dL1c3d0xw449fHIGALIJsRP4DDPHpyiW8vcriNY7ubh9TE4zEKfSxscY7PjeFnshE7h75ynjQ=="; }; }; - "node-gyp-build-3.7.0" = { - name = "node-gyp-build"; - packageName = "node-gyp-build"; - version = "3.7.0"; - src = fetchurl { - url = "https://registry.npmjs.org/node-gyp-build/-/node-gyp-build-3.7.0.tgz"; - sha512 = "L/Eg02Epx6Si2NXmedx+Okg+4UHqmaf3TNcxd50SF9NQGcJaON3AtU++kax69XV7YWz4tUspqZSAsVofhFKG2w=="; - }; - }; "node-gyp-build-3.9.0" = { name = "node-gyp-build"; packageName = "node-gyp-build"; @@ -35669,13 +36290,13 @@ let sha512 = "MN6ZpzmfNCRM+3t57PTJHgHyw/h4OWnZ6mR8P5j/uZtqQr46RRuDE/P+g3n0YR/AiYXeWixZZzaip77gdICfRg=="; }; }; - "node-html-parser-1.3.1" = { + "node-html-parser-1.4.6" = { name = "node-html-parser"; packageName = "node-html-parser"; - version = "1.3.1"; + version = "1.4.6"; src = fetchurl { - url = "https://registry.npmjs.org/node-html-parser/-/node-html-parser-1.3.1.tgz"; - sha512 = "AwYVI6GyEKj9NGoyMfSx4j5l7Axf7obQgLWGxtasLjED6RggTTQoq5ZRzjwSUfgSZ+Mv8Nzbi3pID0gFGqNUsA=="; + url = "https://registry.npmjs.org/node-html-parser/-/node-html-parser-1.4.6.tgz"; + sha512 = "VgX2Bk8dq59yFeNC46LdA6VzRXffOPVNOMoeZquACZVwbC1VYJ3ssd5/mncTBGBrd3M+t6cMD5KQWdK/l+qPFQ=="; }; }; "node-int64-0.4.0" = { @@ -35831,13 +36452,13 @@ let sha512 = "j1g/VtSCI2tBrBnCD+u8iSo9tH0nvn70k1O1SxkHk3+qx7tHUyOKQc7wNc4rUs9J1PkGngUC3qEDd5cL7Z/klg=="; }; }; - "node-releases-1.1.63" = { + "node-releases-1.1.65" = { name = "node-releases"; packageName = "node-releases"; - version = "1.1.63"; + version = "1.1.65"; src = fetchurl { - url = "https://registry.npmjs.org/node-releases/-/node-releases-1.1.63.tgz"; - sha512 = "ukW3iCfQaoxJkSPN+iK7KznTeqDGVJatAEuXsJERYHa9tn/KaT5lBdIyxQjLEVTzSkyjJEuQ17/vaEjrOauDkg=="; + url = "https://registry.npmjs.org/node-releases/-/node-releases-1.1.65.tgz"; + sha512 = "YpzJOe2WFIW0V4ZkJQd/DGR/zdVwc/pI4Nl1CZrBO19FdRcSTmsuhdttw9rsTzzJLrNcSloLiBbEYx1C4f6gpA=="; }; }; "node-source-walk-4.2.0" = { @@ -35894,15 +36515,6 @@ let sha1 = "b040eb0923968afabf8d32fb1f17f1167fdab907"; }; }; - "node-version-1.2.0" = { - name = "node-version"; - packageName = "node-version"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/node-version/-/node-version-1.2.0.tgz"; - sha512 = "ma6oU4Sk0qOoKEAymVoTvk8EdXEobdS7m/mAGhDJ8Rouugho48crHBORAmy5BoOcv8wraPM6xumapQp5hl4iIQ=="; - }; - }; "node-wsfederation-0.1.1" = { name = "node-wsfederation"; packageName = "node-wsfederation"; @@ -36263,13 +36875,13 @@ let sha512 = "5+AZgwru5IevF5ZdnFglB5wNlHG1AOOuw28WhUq8/8emhBmLv6jX5by4WJCh7lW0uSYZYS6DXqIsyZVIXRZU9A=="; }; }; - "npm-packlist-2.1.2" = { + "npm-packlist-2.1.4" = { name = "npm-packlist"; packageName = "npm-packlist"; - version = "2.1.2"; + version = "2.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/npm-packlist/-/npm-packlist-2.1.2.tgz"; - sha512 = "eByPaP+wsKai0BJX5pmb58d3mfR0zUATcnyuvSxIudTEn+swCPFLxh7srCmqB4hr7i9V24/DPjjq5b2qUtbgXQ=="; + url = "https://registry.npmjs.org/npm-packlist/-/npm-packlist-2.1.4.tgz"; + sha512 = "Qzg2pvXC9U4I4fLnUrBmcIT4x0woLtUgxUi9eC+Zrcv1Xx5eamytGAfbDWQ67j7xOcQ2VW1I3su9smVTIdu7Hw=="; }; }; "npm-pick-manifest-3.0.2" = { @@ -36335,6 +36947,15 @@ let sha512 = "yZPNoJK9clx1jhSXU54kU6Aj1SV2p7mXUs1W/6OjQvek3wb1RrjDCrt4iY1+VX9eBQvvSGEpzNmYkRUaTL8rqg=="; }; }; + "npm-registry-fetch-9.0.0" = { + name = "npm-registry-fetch"; + packageName = "npm-registry-fetch"; + version = "9.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/npm-registry-fetch/-/npm-registry-fetch-9.0.0.tgz"; + sha512 = "PuFYYtnQ8IyVl6ib9d3PepeehcUeHN9IO5N/iCRhyg9tStQcqGQBRVHmfmMWPDERU3KwZoHFvbJ4FPXPspvzbA=="; + }; + }; "npm-run-path-2.0.2" = { name = "npm-run-path"; packageName = "npm-run-path"; @@ -36533,13 +37154,13 @@ let sha512 = "2yucenq1a9YPmeNExoUa9Qwrt9RFkjqaMAA1X+U7sbb0AqBeTIdMHky9SQQ6iN94bO5NW0W4TRYXerG+BdAvAQ=="; }; }; - "oas-validator-3.4.0" = { + "oas-validator-4.0.8" = { name = "oas-validator"; packageName = "oas-validator"; - version = "3.4.0"; + version = "4.0.8"; src = fetchurl { - url = "https://registry.npmjs.org/oas-validator/-/oas-validator-3.4.0.tgz"; - sha512 = "l/SxykuACi2U51osSsBXTxdsFc8Fw41xI7AsZkzgVgWJAzoEFaaNptt35WgY9C3757RUclsm6ye5GvSyYoozLQ=="; + url = "https://registry.npmjs.org/oas-validator/-/oas-validator-4.0.8.tgz"; + sha512 = "bIt8erTyclF7bkaySTtQ9sppqyVc+mAlPi7vPzCLVHJsL9nrivQjc/jHLX/o+eGbxHd6a6YBwuY/Vxa6wGsiuw=="; }; }; "oas-validator-5.0.3" = { @@ -36759,13 +37380,13 @@ let sha512 = "BfWfuAwuhdH1bhMG5EG90WE/eckkBhBvnke8eSEkCDXoLE9Jk5JwYGTbCx1ehGwV48HvBkn62VukPBdlMUOY9w=="; }; }; - "object-treeify-1.1.28" = { + "object-treeify-1.1.29" = { name = "object-treeify"; packageName = "object-treeify"; - version = "1.1.28"; + version = "1.1.29"; src = fetchurl { - url = "https://registry.npmjs.org/object-treeify/-/object-treeify-1.1.28.tgz"; - sha512 = "FoBGZexpq9jJr6mDgV8wv711vreKyzRcw65TKeXzHh98+TNmPZfGYznpel3WceM869WsnSCyUuK46rPUG9+Rpg=="; + url = "https://registry.npmjs.org/object-treeify/-/object-treeify-1.1.29.tgz"; + sha512 = "XnPIMyiv6fJeb/z3Bz+u43Fcw3C9fs1uoRITd8x3mau/rsSAUhx7qpIO10Q/dzJeMleJesccUSMiFx8FF+ruBA=="; }; }; "object-visit-1.0.1" = { @@ -36786,13 +37407,13 @@ let sha512 = "exHJeq6kBKj58mqGyTQ9DFvrZC/eR6OwxzoM9YRoGBqrXYonaFyGiFMuc9VZrXf7DarreEwMpurG3dd+CNyW5w=="; }; }; - "object.assign-4.1.1" = { + "object.assign-4.1.2" = { name = "object.assign"; packageName = "object.assign"; - version = "4.1.1"; + version = "4.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/object.assign/-/object.assign-4.1.1.tgz"; - sha512 = "VT/cxmx5yaoHSOTSyrCygIDFco+RsibY2NM0a4RdEeY/4KgqezwFtK1yr3U67xYhqJSlASm2pKhLVzPj2lr4bA=="; + url = "https://registry.npmjs.org/object.assign/-/object.assign-4.1.2.tgz"; + sha512 = "ixT2L5THXsApyiUPYKmW+2EHpXXe5Ii3M+f4e+aJFAHao5amFRW6J0OO6c/LU8Be47utCx2GL89hxGB6XSmKuQ=="; }; }; "object.defaults-1.1.0" = { @@ -36939,13 +37560,13 @@ let sha512 = "fZ4qZdQ2nxJvtcasX7Ghl+WlWS/d9IgnBIwFZXVNNZUmzpno91SX5bc5vuxiuKoCtK78XxGGNuSCrDC7xYB3OQ=="; }; }; - "office-ui-fabric-react-7.147.1" = { + "office-ui-fabric-react-7.149.3" = { name = "office-ui-fabric-react"; packageName = "office-ui-fabric-react"; - version = "7.147.1"; + version = "7.149.3"; src = fetchurl { - url = "https://registry.npmjs.org/office-ui-fabric-react/-/office-ui-fabric-react-7.147.1.tgz"; - sha512 = "nG3h14lvWoTqcO8wxabIDozw84vV0ZtoUvDe6g8QEKsG1oRHaDe8WhCkCy8XCPnsy7f/5aItlbum7AyZtKdgBQ=="; + url = "https://registry.npmjs.org/office-ui-fabric-react/-/office-ui-fabric-react-7.149.3.tgz"; + sha512 = "R0iqyTGX8l+cUB5h8SvhB/i5QexNhlXP8GW3j5NCb8U0ZiEuTVpxCCMDua/0Mmdj6MZmcK/hcL9gmK6ZPUe6qg=="; }; }; "omggif-1.0.10" = { @@ -37173,15 +37794,6 @@ let sha512 = "4HeyhxCvBTI5uBePsAdi55C5fmqnWZ2e2MlmvWi5KW5tdH5rxoiv/aMtbeVxKZc3eWkT1GymMnLG8XC4Rq4TDQ=="; }; }; - "open-7.2.1" = { - name = "open"; - packageName = "open"; - version = "7.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/open/-/open-7.2.1.tgz"; - sha512 = "xbYCJib4spUdmcs0g/2mK1nKo/jO2T7INClWd/beL7PFkXRWgr8B23ssDHX/USPn2M2IjDR5UdpYs6I67SnTSA=="; - }; - }; "open-7.3.0" = { name = "open"; packageName = "open"; @@ -37299,13 +37911,13 @@ let sha512 = "Fxr9YdQ6s7/SIvvM888iWnc1GUn/fFxTaMFqHkUv0/eNCYoBfOwAKj9aptaRfL+BJXlsVdXWCJd3GWkwn8sIJA=="; }; }; - "openapi-sampler-1.0.0-beta.14" = { + "openapi-sampler-1.0.0-beta.18" = { name = "openapi-sampler"; packageName = "openapi-sampler"; - version = "1.0.0-beta.14"; + version = "1.0.0-beta.18"; src = fetchurl { - url = "https://registry.npmjs.org/openapi-sampler/-/openapi-sampler-1.0.0-beta.14.tgz"; - sha512 = "NNmH9YAN5AaCE4w6MQXdCrmsOJJQTswHVSp075+h+iiG+OTonpZE8HzwocozovD2imx4lamkuxGLs4E4bO4Z+g=="; + url = "https://registry.npmjs.org/openapi-sampler/-/openapi-sampler-1.0.0-beta.18.tgz"; + sha512 = "nG/0kvvSY5FbrU5A+Dbp1xTQN++7pKIh87/atryZlxrzDuok5Y6TCbpxO1jYqpUKLycE4ReKGHCywezngG6xtQ=="; }; }; "openapi-schema-validator-3.0.3" = { @@ -37371,15 +37983,6 @@ let sha512 = "11oi4zYorsgvg5yBarZplAqbpev5HkuVNPlZaPTknPDzAynq+lnJdXAmruGWP0s+dNYZS7bjM+xrTpJw7184Fg=="; }; }; - "openapi-types-7.0.0" = { - name = "openapi-types"; - packageName = "openapi-types"; - version = "7.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/openapi-types/-/openapi-types-7.0.0.tgz"; - sha512 = "AikFLY/joHpJz+6OcyWUfXR0xjsh0jXR+oxcB1oosjH3YFZI3uPTJcmuf7koBFQyjd9GYmClmCSK8mGZ7thsOQ=="; - }; - }; "openapi-types-7.0.1" = { name = "openapi-types"; packageName = "openapi-types"; @@ -37434,6 +38037,15 @@ let sha512 = "nNnZDkUNExBwEpb7LZaeMeQgvrlO8l4bgY/LvGNZCR0xG/dGWqHqjKrAmR5GUoYo0FIz38kxasvA1aevxWs2CA=="; }; }; + "opn-3.0.3" = { + name = "opn"; + packageName = "opn"; + version = "3.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/opn/-/opn-3.0.3.tgz"; + sha1 = "b6d99e7399f78d65c3baaffef1fb288e9b85243a"; + }; + }; "opn-4.0.2" = { name = "opn"; packageName = "opn"; @@ -37614,15 +38226,6 @@ let sha512 = "eNwHudNbO1folBP3JsZ19v9azXWtQZjICdr3Q0TDPIaeBQ3mXLrh54wM+er0+hSp+dWKf+Z8KM58CYzEyIYxYg=="; }; }; - "ora-4.0.3" = { - name = "ora"; - packageName = "ora"; - version = "4.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/ora/-/ora-4.0.3.tgz"; - sha512 = "fnDebVFyz309A73cqCipVL1fBZewq4vwgSHfxh43vVy31mbyoQ8sCH3Oeaog/owYOs/lLlGVPCISQonTneg6Pg=="; - }; - }; "ora-4.0.4" = { name = "ora"; packageName = "ora"; @@ -37776,13 +38379,22 @@ let sha512 = "0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g=="; }; }; - "otfcc-ttcize-0.10.2" = { - name = "otfcc-ttcize"; - packageName = "otfcc-ttcize"; - version = "0.10.2"; + "ot-builder-0.10.31" = { + name = "ot-builder"; + packageName = "ot-builder"; + version = "0.10.31"; src = fetchurl { - url = "https://registry.npmjs.org/otfcc-ttcize/-/otfcc-ttcize-0.10.2.tgz"; - sha512 = "CLMMw6r97AvmK5nOIGpnG4xHVU40gyTzpvn55RPyxZQ3E/UMXG4HnykyTYHlVL7Y46ISr1isPiSN0CvjYpZtgg=="; + url = "https://registry.npmjs.org/ot-builder/-/ot-builder-0.10.31.tgz"; + sha512 = "Cj/EsGzPQ4h59OWJJoXi5JEj94ULlxHB0ZwLvaRt6O3kmJ6PvZdp7MyEvi6fF0/BMcjFJOMOkcggbjAOCl/E3g=="; + }; + }; + "otb-ttc-bundle-0.10.31" = { + name = "otb-ttc-bundle"; + packageName = "otb-ttc-bundle"; + version = "0.10.31"; + src = fetchurl { + url = "https://registry.npmjs.org/otb-ttc-bundle/-/otb-ttc-bundle-0.10.31.tgz"; + sha512 = "PHT2rzKRD8QkwD7CrPDuh7tmtnaAVecK6JjALw7d4CajmNBvYbFlnb7fdpF1melyizJgnhigeN3hjHllEuqdMQ=="; }; }; "p-all-2.1.0" = { @@ -38289,13 +38901,13 @@ let sha512 = "JcMmHiK6h6rcncj2HLayiyJZg28iJXJafXcmEGw2NjKH3WE8ZgSwyMZs7+f+aliPD57PDhB31IEgUtLXp0YZxA=="; }; }; - "pacote-11.1.11" = { + "pacote-11.1.12" = { name = "pacote"; packageName = "pacote"; - version = "11.1.11"; + version = "11.1.12"; src = fetchurl { - url = "https://registry.npmjs.org/pacote/-/pacote-11.1.11.tgz"; - sha512 = "r6PHtCEhkaGv+QPx1JdE/xRdkSkZUG7dE2oloNk/CGTPGNOtaJyYqZPFeN6d6UcUrTPRvZXFo3IBzJIBopPuSA=="; + url = "https://registry.npmjs.org/pacote/-/pacote-11.1.12.tgz"; + sha512 = "suazooYMzefXr3glexAX4+q+qqH3wrzchtj+EivwiCCr/tsaHe9HtdHSx3R8YPjulAhojBZ2JkAVy13QwA8Jpg=="; }; }; "pacote-9.5.12" = { @@ -38631,15 +39243,6 @@ let sha512 = "3YHlOa/JgH6Mnpr05jP9eDG254US9ek25LyIxZlDItp2iJtwyaXQb57lBYLdT3MowkUFYEV2XXNAYIPlESvJlA=="; }; }; - "parse-numeric-range-1.2.0" = { - name = "parse-numeric-range"; - packageName = "parse-numeric-range"; - version = "1.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/parse-numeric-range/-/parse-numeric-range-1.2.0.tgz"; - sha512 = "1q2tXpAOplPxcl8vrIGPWz1dJxxfmdRkCFcpxxMBerDnGuuHalOWF/xj9L8Nn5XoTUoB/6F0CeQBp2fMgkOYFg=="; - }; - }; "parse-passwd-1.0.0" = { name = "parse-passwd"; packageName = "parse-passwd"; @@ -38712,6 +39315,15 @@ let sha512 = "to8zT7+o6bVTyP35r2QgG1svuFGMFO1mE6ri1oWHgL9tlgnOtfjmfHmA3mOuP9HTIU/8OiZw0NG5zbyqVLxhvA=="; }; }; + "parse-torrent-9.0.0" = { + name = "parse-torrent"; + packageName = "parse-torrent"; + version = "9.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/parse-torrent/-/parse-torrent-9.0.0.tgz"; + sha512 = "Er+VA8XwlGbuwEwss7LYIbWZRYvttS1c+0Td6FMxZhIog/0HDlU3A3qbRfL+1aOSM+L+kGL544yRoGbpTRWPsQ=="; + }; + }; "parse-torrent-file-2.1.4" = { name = "parse-torrent-file"; packageName = "parse-torrent-file"; @@ -39378,13 +39990,13 @@ let sha1 = "6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"; }; }; - "pg-8.3.0" = { + "pg-8.3.3" = { name = "pg"; packageName = "pg"; - version = "8.3.0"; + version = "8.3.3"; src = fetchurl { - url = "https://registry.npmjs.org/pg/-/pg-8.3.0.tgz"; - sha512 = "jQPKWHWxbI09s/Z9aUvoTbvGgoj98AU7FDCcQ7kdejupn/TcNpx56v2gaOTzXkzOajmOEJEdi9eTh9cA2RVAjQ=="; + url = "https://registry.npmjs.org/pg/-/pg-8.3.3.tgz"; + sha512 = "wmUyoQM/Xzmo62wgOdQAn5tl7u+IA1ZYK7qbuppi+3E+Gj4hlUxVHjInulieWrd0SfHi/ADriTb5ILJ/lsJrSg=="; }; }; "pg-connection-string-2.4.0" = { @@ -39405,13 +40017,13 @@ let sha512 = "WCtabS6t3c8SkpDBUlb1kjOs7l66xsGdKpIPZsg4wR+B3+u9UAum2odSsF9tnvxg80h4ZxLWMy4pRjOsFIqQpw=="; }; }; - "pg-pool-3.2.1" = { + "pg-pool-3.2.2" = { name = "pg-pool"; packageName = "pg-pool"; - version = "3.2.1"; + version = "3.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/pg-pool/-/pg-pool-3.2.1.tgz"; - sha512 = "BQDPWUeKenVrMMDN9opfns/kZo4lxmSWhIqo+cSAF7+lfi9ZclQbr9vfnlNaPr8wYF3UYjm5X0yPAhbcgqNOdA=="; + url = "https://registry.npmjs.org/pg-pool/-/pg-pool-3.2.2.tgz"; + sha512 = "ORJoFxAlmmros8igi608iVEbQNNZlp89diFVx6yV5v+ehmpMY9sK6QgpmgoXbmkNaBAx8cOOZh9g80kJv1ooyA=="; }; }; "pg-protocol-1.3.0" = { @@ -39432,13 +40044,13 @@ let sha512 = "qTAAlrEsl8s4OiEQY69wDvcMIdQN6wdz5ojQiOy6YRMuynxenON0O5oCpJI6lshc6scgAY8qvJ2On/p+CXY0GA=="; }; }; - "pgpass-1.0.2" = { + "pgpass-1.0.4" = { name = "pgpass"; packageName = "pgpass"; - version = "1.0.2"; + version = "1.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/pgpass/-/pgpass-1.0.2.tgz"; - sha1 = "2a7bb41b6065b67907e91da1b07c1847c877b306"; + url = "https://registry.npmjs.org/pgpass/-/pgpass-1.0.4.tgz"; + sha512 = "YmuA56alyBq7M59vxVBfPJrGSozru8QAdoNlWuW3cz8l+UX3cWge0vTvjKhsSHSJpo3Bom8/Mm6hf0TR5GY0+w=="; }; }; "phantomjs-prebuilt-2.1.16" = { @@ -39594,6 +40206,15 @@ let sha512 = "DOgm7rn6ctBkBYemHXSLj7+j3o3U1q1FWBXbHcprur8mA93QcJSycEkEqhqKiFB9Mx/3Qld2FGr6+9yfQza0kA=="; }; }; + "pino-6.7.0" = { + name = "pino"; + packageName = "pino"; + version = "6.7.0"; + src = fetchurl { + url = "https://registry.npmjs.org/pino/-/pino-6.7.0.tgz"; + sha512 = "vPXJ4P9rWCwzlTJt+f0Ni4THc3DWyt8iDDCO4edQ8narTu6hnpzdXu8FqeSJCGndl1W6lfbYQUQihUO54y66Lw=="; + }; + }; "pino-std-serializers-2.5.0" = { name = "pino-std-serializers"; packageName = "pino-std-serializers"; @@ -40018,6 +40639,15 @@ let sha512 = "3QT8bBJeX/S5zKTTjTCIjRF3If4avAT6kqxcASlTWEtAFCb9NH0OUxNDfgZSWdP5fJnBYCMEWkIFfWeugjzYMg=="; }; }; + "postcss-8.1.1" = { + name = "postcss"; + packageName = "postcss"; + version = "8.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/postcss/-/postcss-8.1.1.tgz"; + sha512 = "9DGLSsjooH3kSNjTZUOt2eIj2ZTW0VI2PZ/3My+8TC7KIbH2OKwUlISfDsf63EP4aiRUt3XkEWMWvyJHvJelEg=="; + }; + }; "postcss-calc-7.0.5" = { name = "postcss-calc"; packageName = "postcss-calc"; @@ -40603,13 +41233,13 @@ let sha512 = "BUIorsYJTvS9UhXxPTzupIztOMVNPa/HtAm9KHni9z6qEfiJ1bpOBL5DfUOL9XAc3XkLIEzBzpph+Zbm4AdRAg=="; }; }; - "posthtml-parser-0.5.0" = { + "posthtml-parser-0.5.2" = { name = "posthtml-parser"; packageName = "posthtml-parser"; - version = "0.5.0"; + version = "0.5.2"; src = fetchurl { - url = "https://registry.npmjs.org/posthtml-parser/-/posthtml-parser-0.5.0.tgz"; - sha512 = "BsZFAqOeX9lkJJPKG2JmGgtm6t++WibU7FeS40FNNGZ1KS2szRSRQ8Wr2JLvikDgAecrQ/9V4sjugTAin2+KVw=="; + url = "https://registry.npmjs.org/posthtml-parser/-/posthtml-parser-0.5.2.tgz"; + sha512 = "rwRA0TyUTivQN6NAG8CLhi8KEdqjWQMZSAJQedxkuH1c8/hme99WDVOW+z8Ony+YLmoaH0sJRUk6RCWVFQ6Rkw=="; }; }; "posthtml-render-1.2.3" = { @@ -40747,15 +41377,6 @@ let sha1 = "994b02aa46f699c50b6257b5faaa7fe2557e62d6"; }; }; - "prettier-eslint-10.1.1" = { - name = "prettier-eslint"; - packageName = "prettier-eslint"; - version = "10.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/prettier-eslint/-/prettier-eslint-10.1.1.tgz"; - sha512 = "TtYxuFUMVxudJTSnPScaBqHZm/48ndvX3KLFzhejJYbRzRybmM9RdBfn9YzgN0itfPrYxCesIZGJqyXXZJOR2w=="; - }; - }; "prettier-eslint-11.0.0" = { name = "prettier-eslint"; packageName = "prettier-eslint"; @@ -41134,15 +41755,6 @@ let sha1 = "bbcfd248725259f2bb115a27bfa8d65dc420f931"; }; }; - "promise-polyfill-6.1.0" = { - name = "promise-polyfill"; - packageName = "promise-polyfill"; - version = "6.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/promise-polyfill/-/promise-polyfill-6.1.0.tgz"; - sha1 = "dfa96943ea9c121fca4de9b5868cb39d3472e057"; - }; - }; "promise-queue-2.2.5" = { name = "promise-queue"; packageName = "promise-queue"; @@ -41224,13 +41836,13 @@ let sha1 = "2a13fa063688a2a5983b161fff0108a07d26fc74"; }; }; - "prompts-2.3.2" = { + "prompts-2.4.0" = { name = "prompts"; packageName = "prompts"; - version = "2.3.2"; + version = "2.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/prompts/-/prompts-2.3.2.tgz"; - sha512 = "Q06uKs2CkNYVID0VqwfAl9mipo99zkBv/n2JtWY89Yxa3ZabWSrs0e2KTudKVa3peLUvYXMefDqIleLPVUBZMA=="; + url = "https://registry.npmjs.org/prompts/-/prompts-2.4.0.tgz"; + sha512 = "awZAKrk3vN6CroQukBL+R9051a4R3zCZBlJm/HBfrSZ8iTpYix3VX1vU4mveiLpiwmOJT4wokTF9m6HUk4KqWQ=="; }; }; "promzard-0.3.0" = { @@ -42178,22 +42790,22 @@ let sha512 = "XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A=="; }; }; - "pupa-2.0.1" = { + "pupa-2.1.1" = { name = "pupa"; packageName = "pupa"; - version = "2.0.1"; + version = "2.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/pupa/-/pupa-2.0.1.tgz"; - sha512 = "hEJH0s8PXLY/cdXh66tNEQGndDrIKNqNC5xmrysZy3i5C3oEoLna7YAOad+7u125+zH1HNXUmGEkrhb3c2VriA=="; + url = "https://registry.npmjs.org/pupa/-/pupa-2.1.1.tgz"; + sha512 = "l1jNAspIBSFqbT+y+5FosojNpVpF94nlI+wDUpqP9enwOTfHx9f0gh5nB96vl+6yTpsJsypeNrwfzPrKuHB41A=="; }; }; - "puppeteer-5.3.1" = { + "puppeteer-5.4.1" = { name = "puppeteer"; packageName = "puppeteer"; - version = "5.3.1"; + version = "5.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/puppeteer/-/puppeteer-5.3.1.tgz"; - sha512 = "YTM1RaBeYrj6n7IlRXRYLqJHF+GM7tasbvrNFx6w1S16G76NrPq7oYFKLDO+BQsXNtS8kW2GxWCXjIMPvfDyaQ=="; + url = "https://registry.npmjs.org/puppeteer/-/puppeteer-5.4.1.tgz"; + sha512 = "8u6r9tFm3gtMylU4uCry1W/CeAA8uczKMONvGvivkTsGqKA7iB7DWO2CBFYlB9GY6/IEoq9vkI5slJWzUBkwNw=="; }; }; "purgecss-2.3.0" = { @@ -42277,6 +42889,15 @@ let sha1 = "ffc6c28a2fc0bfb47052b47e23f4f446a5fbdb9e"; }; }; + "qrcode-terminal-0.12.0" = { + name = "qrcode-terminal"; + packageName = "qrcode-terminal"; + version = "0.12.0"; + src = fetchurl { + url = "https://registry.npmjs.org/qrcode-terminal/-/qrcode-terminal-0.12.0.tgz"; + sha512 = "EXtzRZmC+YGmGlDFbXKxQiMZNwCLEO6BANKXG4iCtSIM0yqc/pappSx3RIKr4r0uh5JsBckOXeKrB3Iz7mdQpQ=="; + }; + }; "qs-0.4.2" = { name = "qs"; packageName = "qs"; @@ -42448,13 +43069,13 @@ let sha512 = "AMD7w5hRXcFSb8s9u38acBZ+309u6GsiibP4/0YacJeaurRshogB7v/ZcVPxP5gD5+zIw6ixRHdutiYUJfwKHw=="; }; }; - "queue-microtask-1.1.4" = { + "queue-microtask-1.2.0" = { name = "queue-microtask"; packageName = "queue-microtask"; - version = "1.1.4"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.1.4.tgz"; - sha512 = "eY/4Obve9cE5FK8YvC1cJsm5cr7XvAurul8UtBDJ2PR1p5NmAwHtvAt5ftcLtwYRCUKNhxCneZZlxmUDFoSeKA=="; + url = "https://registry.npmjs.org/queue-microtask/-/queue-microtask-1.2.0.tgz"; + sha512 = "J95OVUiS4b8qqmpqhCodN8yPpHG2mpZUPQ8tDGyIY0VhM+kBHszOuvsMJVGNQ1OH2BnTFbqz45i+2jGpDw9H0w=="; }; }; "quick-format-unescaped-4.0.1" = { @@ -42619,13 +43240,13 @@ let sha1 = "4f68a1dc0ae58bd3fb95848c30324db75d64360b"; }; }; - "random-item-3.0.0" = { + "random-item-3.1.0" = { name = "random-item"; packageName = "random-item"; - version = "3.0.0"; + version = "3.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/random-item/-/random-item-3.0.0.tgz"; - sha512 = "IpO3Jk9/Dt79R7iS/Fn2d2asGXahMNnXLNRsgSmjTTtiS0tZ972BWEEm9uUgm3YAon5YFUt8126FA9wJAjmeZw=="; + url = "https://registry.npmjs.org/random-item/-/random-item-3.1.0.tgz"; + sha512 = "0DyAT8LYBNQKSkqcPjia/HNoWCZ5JWBdAQWjBQVh5DMVv3Fv7V90I8/AuUf8NW4zdFn27i9qj8Kp6wI5JsiiOA=="; }; }; "random-iterate-1.0.1" = { @@ -42799,6 +43420,15 @@ let sha512 = "C0SIXdXDSus2yqqvV7qifnb4NoWP7mEBXJq3axci301mXHCZb8Djwm4hrEZo4UeXRaEnfjH98uQ8EBppk2oNWA=="; }; }; + "re-reselect-4.0.0" = { + name = "re-reselect"; + packageName = "re-reselect"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/re-reselect/-/re-reselect-4.0.0.tgz"; + sha512 = "wuygyq8TXUlSdVXv2kigXxQNOgdb9m7LbIjwfTNGSpaY1riLd5e+VeQjlQMyUtrk0oiyhi1AqIVynworl3qxHA=="; + }; + }; "react-16.14.0" = { name = "react"; packageName = "react"; @@ -42817,13 +43447,13 @@ let sha512 = "XxTbgJnYZmxuPtY3y/UV0D8/65NKkmaia4rXzViknVnZeVlklSh8u6TnaEYPfAi/Gh1TP4mEOXHI6jQOPbeakQ=="; }; }; - "react-devtools-core-4.8.2" = { + "react-devtools-core-4.9.0" = { name = "react-devtools-core"; packageName = "react-devtools-core"; - version = "4.8.2"; + version = "4.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/react-devtools-core/-/react-devtools-core-4.8.2.tgz"; - sha512 = "3Lv3nI8FPAwKqUco35oOlgf+4j8mgYNnIcDv2QTfxEqg2G69q17ZJ8ScU9aBnymS28YC1OW+kTxLmdIQeTN8yg=="; + url = "https://registry.npmjs.org/react-devtools-core/-/react-devtools-core-4.9.0.tgz"; + sha512 = "3NyHXW1ClqxEXdHunawAytDxiIxs620oP3wB8DHsbx1fkGgqjMkwlyHVf0zmES/b4ffqzJySowRwSYds/uAHzw=="; }; }; "react-dom-16.14.0" = { @@ -42835,31 +43465,13 @@ let sha512 = "1gCeQXDLoIqMgqD3IO2Ah9bnf0w9kzhwN5q4FGnHZ67hBm9yePzB5JJAIQCc8x3pFnNlwFq4RidZggNAAkzWWw=="; }; }; - "react-dropdown-1.9.0" = { - name = "react-dropdown"; - packageName = "react-dropdown"; - version = "1.9.0"; - src = fetchurl { - url = "https://registry.npmjs.org/react-dropdown/-/react-dropdown-1.9.0.tgz"; - sha512 = "BDApCUhs0qHqnFW3b54SuqI200FOOsmiy0dejdmtdTn/MMY11jcou3CLX1oT2Qa1PdN7viTyAGT8YCpK5qb9xg=="; - }; - }; - "react-error-overlay-6.0.7" = { + "react-error-overlay-6.0.8" = { name = "react-error-overlay"; packageName = "react-error-overlay"; - version = "6.0.7"; + version = "6.0.8"; src = fetchurl { - url = "https://registry.npmjs.org/react-error-overlay/-/react-error-overlay-6.0.7.tgz"; - sha512 = "TAv1KJFh3RhqxNvhzxj6LeT5NWklP6rDr2a0jaTfsZ5wSZWHOGeqQyejUp3xxLfPt2UpyJEcVQB/zyPcmonNFA=="; - }; - }; - "react-hot-loader-4.13.0" = { - name = "react-hot-loader"; - packageName = "react-hot-loader"; - version = "4.13.0"; - src = fetchurl { - url = "https://registry.npmjs.org/react-hot-loader/-/react-hot-loader-4.13.0.tgz"; - sha512 = "JrLlvUPqh6wIkrK2hZDfOyq/Uh/WeVEr8nc7hkn2/3Ul0sx1Kr5y4kOGNacNRoj7RhwLNcQ3Udf1KJXrqc0ZtA=="; + url = "https://registry.npmjs.org/react-error-overlay/-/react-error-overlay-6.0.8.tgz"; + sha512 = "HvPuUQnLp5H7TouGq3kzBeioJmXms1wHy9EGjz2OURWBp4qZO6AfGEcnxts1D/CbwPLRAgTMPCEgYhA3sEM4vw=="; }; }; "react-is-16.13.1" = { @@ -42871,15 +43483,6 @@ let sha512 = "24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ=="; }; }; - "react-lifecycles-compat-3.0.4" = { - name = "react-lifecycles-compat"; - packageName = "react-lifecycles-compat"; - version = "3.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/react-lifecycles-compat/-/react-lifecycles-compat-3.0.4.tgz"; - sha512 = "fBASbA6LnOU9dOU2eW7aQ8xmYBSXUIWr+UmF9b1efZBazGNO+rcXT/icdKnYm2pTwcRylVUYwW7H1PHfLekVzA=="; - }; - }; "react-reconciler-0.24.0" = { name = "react-reconciler"; packageName = "react-reconciler"; @@ -43384,13 +43987,13 @@ let sha1 = "8984b5815d99cb220469c99eeeffe38913e6cc0b"; }; }; - "redoc-2.0.0-rc.8-1" = { + "redoc-2.0.0-rc.45" = { name = "redoc"; packageName = "redoc"; - version = "2.0.0-rc.8-1"; + version = "2.0.0-rc.45"; src = fetchurl { - url = "https://registry.npmjs.org/redoc/-/redoc-2.0.0-rc.8-1.tgz"; - sha512 = "/YoCdcl2QtveKz4CTXaqtOfCIaVgZZgcnfUNC5xK7xBl/LxTiNj3tUbgFmrYMLTZGzNdQ9TUJpsa7lXDKcr8Pw=="; + url = "https://registry.npmjs.org/redoc/-/redoc-2.0.0-rc.45.tgz"; + sha512 = "yOgyXFybwBItvY+y9cFEA6X0W6KDdnkdeWK8LMkTxWN4HUecRwPFYPRdzx+SvDUb8ICh4PDtfyDU3Fo1e9N8Iw=="; }; }; "reduce-component-1.0.1" = { @@ -43438,13 +44041,13 @@ let sha512 = "rQfJ025lvPjw9qyQuNPqE+cRs5qVs7BMrZwgRJnmuMcX/8r/eJE8f5/RCunJWViXKHmN5K2DFafYzglLOHE/tw=="; }; }; - "regenerate-1.4.1" = { + "regenerate-1.4.2" = { name = "regenerate"; packageName = "regenerate"; - version = "1.4.1"; + version = "1.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/regenerate/-/regenerate-1.4.1.tgz"; - sha512 = "j2+C8+NtXQgEKWk49MMP5P/u2GhnahTtVkRIHr5R5lVRlbKvmQ+oS+A5aLKWp2ma5VkT8sh6v+v4hbH0YHR66A=="; + url = "https://registry.npmjs.org/regenerate/-/regenerate-1.4.2.tgz"; + sha512 = "zrceR/XhGYU/d/opr2EKO7aRHUeiBI8qjtfHqADTwZd6Szfy16la6kqD0MIUs5z5hx6AaKa+PixpPrR289+I0A=="; }; }; "regenerate-unicode-properties-8.2.0" = { @@ -43645,6 +44248,15 @@ let sha512 = "DitR4wnEvYQEFU8pRPwldGMGW76LM29fvz8s7oTYMwZBMSqNFtBr8eAts/I55LODCQm6b4jzdgFQ+/c6v7RmdA=="; }; }; + "rehype-stringify-8.0.0" = { + name = "rehype-stringify"; + packageName = "rehype-stringify"; + version = "8.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/rehype-stringify/-/rehype-stringify-8.0.0.tgz"; + sha512 = "VkIs18G0pj2xklyllrPSvdShAV36Ff3yE5PUO9u36f6+2qJFnn22Z5gKwBOwgXviux4UC7K+/j13AnZfPICi/g=="; + }; + }; "reinterval-1.1.0" = { name = "reinterval"; packageName = "reinterval"; @@ -44077,6 +44689,15 @@ let sha1 = "5d36bb57961c673aa5b788dbc8141fdf23b44e08"; }; }; + "request-promise-4.2.6" = { + name = "request-promise"; + packageName = "request-promise"; + version = "4.2.6"; + src = fetchurl { + url = "https://registry.npmjs.org/request-promise/-/request-promise-4.2.6.tgz"; + sha512 = "HCHI3DJJUakkOr8fNoCc73E5nU5bqITjOYFMDrKHYOXWXrgD/SBaC7LjwuPymUprRyuF06UK7hd/lMHkmUXglQ=="; + }; + }; "request-promise-core-1.1.4" = { name = "request-promise-core"; packageName = "request-promise-core"; @@ -44203,6 +44824,15 @@ let sha512 = "YanoyJjykPxGHii0fZP0uUPEXpvqfBDxWV7s6GKAiiOsiqhX6vHNyW3Qzdmqp/iq/ExbhaGbVrjB4ruEVSM4GQ=="; }; }; + "reselect-4.0.0" = { + name = "reselect"; + packageName = "reselect"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/reselect/-/reselect-4.0.0.tgz"; + sha512 = "qUgANli03jjAyGlnbYVAV5vvnOmJnODyABz51RdBN7M4WaVu8mecZWgyQNkG8Yqe3KRGRt0l4K4B3XVEULC4CA=="; + }; + }; "resolve-1.17.0" = { name = "resolve"; packageName = "resolve"; @@ -44212,13 +44842,22 @@ let sha512 = "ic+7JYiV8Vi2yzQGFWOkiZD5Z9z7O2Zhm9XMaTxdJExKasieFCr+yXZ/WmXsckHiKl12ar0y6XiXDx3m4RHn1w=="; }; }; - "resolve-2.0.0-next.1" = { + "resolve-1.18.1" = { name = "resolve"; packageName = "resolve"; - version = "2.0.0-next.1"; + version = "1.18.1"; src = fetchurl { - url = "https://registry.npmjs.org/resolve/-/resolve-2.0.0-next.1.tgz"; - sha512 = "ZGTmuLZAW++TDjgslfUMRZcv7kXHv8z0zwxvuRWOPjnqc56HVsn1lVaqsWOZeQ8MwiilPVJLrcPVKG909QsAfA=="; + url = "https://registry.npmjs.org/resolve/-/resolve-1.18.1.tgz"; + sha512 = "lDfCPaMKfOJXjy0dPayzPdF1phampNWr3qFCjAu+rw/qbQmr5jWH5xN2hwh9QKfw9E5v4hwV7A+jrCmL8yjjqA=="; + }; + }; + "resolve-2.0.0-next.2" = { + name = "resolve"; + packageName = "resolve"; + version = "2.0.0-next.2"; + src = fetchurl { + url = "https://registry.npmjs.org/resolve/-/resolve-2.0.0-next.2.tgz"; + sha512 = "oHC2H45OCkhIeS45uW5zCsSinW+hgWwRtfobOhmkXiO4Q6e6fpZpBuBkZxAqTfoC1O6VIclqK6RjyeGVaxEYtA=="; }; }; "resolve-alpn-1.0.0" = { @@ -44698,13 +45337,13 @@ let sha512 = "/2HA0Ec70TvQnXdzynFffkjA6XN+1e2pEv/uKS5Ulca40g2L7KuOE3riasHoNVHOsFD5KKZgDsMk1CP3Tw9s+A=="; }; }; - "rollup-2.32.0" = { + "rollup-2.33.1" = { name = "rollup"; packageName = "rollup"; - version = "2.32.0"; + version = "2.33.1"; src = fetchurl { - url = "https://registry.npmjs.org/rollup/-/rollup-2.32.0.tgz"; - sha512 = "0FIG1jY88uhCP2yP4CfvtKEqPDRmsUwfY1kEOOM+DH/KOGATgaIFd/is1+fQOxsvh62ELzcFfKonwKWnHhrqmw=="; + url = "https://registry.npmjs.org/rollup/-/rollup-2.33.1.tgz"; + sha512 = "uY4O/IoL9oNW8MMcbA5hcOaz6tZTMIh7qJHx/tzIJm+n1wLoY38BLn6fuy7DhR57oNFLMbDQtDeJoFURt5933w=="; }; }; "rollup-plugin-babel-4.4.0" = { @@ -44887,22 +45526,22 @@ let sha512 = "tvVnVv01b8c1RrA6Ep7JkStj85Guv/YrMcwqYQnwjsAS2cTmmPGBBjAjpCW7RrSodNSoE2/qg9O4bceNvUuDgQ=="; }; }; - "run-parallel-1.1.9" = { + "run-parallel-1.1.10" = { name = "run-parallel"; packageName = "run-parallel"; - version = "1.1.9"; + version = "1.1.10"; src = fetchurl { - url = "https://registry.npmjs.org/run-parallel/-/run-parallel-1.1.9.tgz"; - sha512 = "DEqnSRTDw/Tc3FXf49zedI638Z9onwUotBMiUFKmrO2sdFKIbXamXGQ3Axd4qgphxKB4kw/qP1w5kTxnfU1B9Q=="; + url = "https://registry.npmjs.org/run-parallel/-/run-parallel-1.1.10.tgz"; + sha512 = "zb/1OuZ6flOlH6tQyMPUrE3x3Ulxjlo9WIVXR4yVYi4H9UXQaeIsPbLn2R3O3vQCnDKkAl2qHiuocKKX4Tz/Sw=="; }; }; - "run-parallel-limit-1.0.5" = { + "run-parallel-limit-1.0.6" = { name = "run-parallel-limit"; packageName = "run-parallel-limit"; - version = "1.0.5"; + version = "1.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/run-parallel-limit/-/run-parallel-limit-1.0.5.tgz"; - sha512 = "NsY+oDngvrvMxKB3G8ijBzIema6aYbQMD2bHOamvN52BysbIGTnEY2xsNyfrcr9GhY995/t/0nQN3R3oZvaDlg=="; + url = "https://registry.npmjs.org/run-parallel-limit/-/run-parallel-limit-1.0.6.tgz"; + sha512 = "yFFs4Q2kECi5mWXyyZj3UlAZ5OFq5E07opABC+EmhZdjEkrxXaUwFqOaaNF4tbayMnBxrsbujpeCYTVjGufZGQ=="; }; }; "run-queue-1.0.3" = { @@ -44914,13 +45553,13 @@ let sha1 = "e848396f057d223f24386924618e25694161ec47"; }; }; - "run-series-1.1.8" = { + "run-series-1.1.9" = { name = "run-series"; packageName = "run-series"; - version = "1.1.8"; + version = "1.1.9"; src = fetchurl { - url = "https://registry.npmjs.org/run-series/-/run-series-1.1.8.tgz"; - sha512 = "+GztYEPRpIsQoCSraWHDBs9WVy4eVME16zhOtDB4H9J4xN0XRhknnmLOl+4gRgZtu8dpp9N/utSPjKH/xmDzXg=="; + url = "https://registry.npmjs.org/run-series/-/run-series-1.1.9.tgz"; + sha512 = "Arc4hUN896vjkqCYrUXquBFtRZdv1PfLbTYP71efP6butxyQ0kWpiNJyAgsxscmQg1cqvHY32/UCBzXedTpU2g=="; }; }; "rusha-0.8.13" = { @@ -45004,15 +45643,6 @@ let sha512 = "xx2itnL5sBbqeeiVgNPVuQQ1nC8Jp2WfNJhXWHmElW9YmrpS9UVnNzhP3EH3HFqexO5Tlp8GhYY+WEcqcVMvGw=="; }; }; - "rxjs-6.5.4" = { - name = "rxjs"; - packageName = "rxjs"; - version = "6.5.4"; - src = fetchurl { - url = "https://registry.npmjs.org/rxjs/-/rxjs-6.5.4.tgz"; - sha512 = "naMQXcgEo3csAEGvw/NydRA0fuS2nDZJiw1YUWFKU7aPPAPGZEsD4Iimit96qwCieH6y614MCLYwdkrWx7z/7Q=="; - }; - }; "rxjs-6.5.5" = { name = "rxjs"; packageName = "rxjs"; @@ -45193,22 +45823,22 @@ let sha512 = "y/52Mcy7aw3gRm7IrcGDFx/bCk4AhRh2eI9luHOQM86nZsqwiRkkq2GekHXBBD+SmPidc8i2PqtYZl+pWJ8Oeg=="; }; }; - "sass-1.27.0" = { + "sass-1.28.0" = { name = "sass"; packageName = "sass"; - version = "1.27.0"; + version = "1.28.0"; src = fetchurl { - url = "https://registry.npmjs.org/sass/-/sass-1.27.0.tgz"; - sha512 = "0gcrER56OkzotK/GGwgg4fPrKuiFlPNitO7eUJ18Bs+/NBlofJfMxmxqpqJxjae9vu0Wq8TZzrSyxZal00WDig=="; + url = "https://registry.npmjs.org/sass/-/sass-1.28.0.tgz"; + sha512 = "9FWX/0wuE1KxwfiP02chZhHaPzu6adpx9+wGch7WMOuHy5npOo0UapRI3FNSHva2CczaYJu2yNUBN8cCSqHz/A=="; }; }; - "sass-formatter-0.4.15" = { + "sass-formatter-0.5.1" = { name = "sass-formatter"; packageName = "sass-formatter"; - version = "0.4.15"; + version = "0.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/sass-formatter/-/sass-formatter-0.4.15.tgz"; - sha512 = "EpjwQsya8DmefZawi1sNoCjKw6IGE4z18h9lKd0QPgoGGkis8nqK+mfCMS4B8OaEa0To//71yQyGV1OW1/t60g=="; + url = "https://registry.npmjs.org/sass-formatter/-/sass-formatter-0.5.1.tgz"; + sha512 = "hRIyMsN9eKQCx+tQec78EtbRs+Be7vamEh+B+JCdIyIc4t2Ku84FIZHC+qjeu+Q5LDtXcHoMxS61AijNA+SZvA=="; }; }; "sax-0.5.8" = { @@ -45931,13 +46561,13 @@ let sha512 = "E5LDX7Wrp85Kil5bhZv46j8jOeboKq5JMmYM3gVGdGH8xFpPWXUMsNrlODCrkoxMEeNi/XZIwuRvY4XNwYMJpw=="; }; }; - "seventh-0.7.35" = { + "seventh-0.7.36" = { name = "seventh"; packageName = "seventh"; - version = "0.7.35"; + version = "0.7.36"; src = fetchurl { - url = "https://registry.npmjs.org/seventh/-/seventh-0.7.35.tgz"; - sha512 = "8uGsybZk/XBSv7BvyjbSeK+R8vpWh2jkZJq0UIMVlJTr9CZsCLTfGWKtcBxmHzMUbzSPxa134prhvZA8GuIx/w=="; + url = "https://registry.npmjs.org/seventh/-/seventh-0.7.36.tgz"; + sha512 = "JeOf8Xybc1QeKhb0Hrj4w9WWYpmgGrjhvV48f0Ap/K2jra1TAnVYvKuJfpW01YFuRtwan6Jc3dN6t1JJrIPxcQ=="; }; }; "sha.js-2.4.11" = { @@ -46120,13 +46750,13 @@ let sha512 = "sQTKC1Re/rM6XyFM6fIAGHRPVGvyXfgzIDvzoq608vM+jeyVD0Tu1E6Np0Kc2zAIFWIj963V2800iF/9LPieQw=="; }; }; - "shortid-2.2.15" = { + "shortid-2.2.16" = { name = "shortid"; packageName = "shortid"; - version = "2.2.15"; + version = "2.2.16"; src = fetchurl { - url = "https://registry.npmjs.org/shortid/-/shortid-2.2.15.tgz"; - sha512 = "5EaCy2mx2Jgc/Fdn9uuDuNIIfWBpzY4XIlhoqtXF6qsf+/+SGZ+FxDdX/ZsMZiWupIWNqAEmiNY4RC+LSmCeOw=="; + url = "https://registry.npmjs.org/shortid/-/shortid-2.2.16.tgz"; + sha512 = "Ugt+GIZqvGXCIItnsL+lvFJOiN7RYqlGy7QE41O3YC1xbNSeDGIRO7xg2JJXIAj1cAGnOeC1r7/T9pgrtQbv4g=="; }; }; "should-13.2.3" = { @@ -46327,13 +46957,13 @@ let sha1 = "4e421f485ac7b13b08077a4476934d52c5ba3bb3"; }; }; - "simple-peer-9.7.2" = { + "simple-peer-9.8.0" = { name = "simple-peer"; packageName = "simple-peer"; - version = "9.7.2"; + version = "9.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/simple-peer/-/simple-peer-9.7.2.tgz"; - sha512 = "xeMyxa9B4V0eA6mf17fVr8nm2QhAYFu+ZZv8zkSFFTjJETGF227CshwobrIYZuspJglMD63egcevQXGOrTIsuA=="; + url = "https://registry.npmjs.org/simple-peer/-/simple-peer-9.8.0.tgz"; + sha512 = "GK1KhJvEwtZILr6zWvQR3AnBNpLrxwr6b5wcduFxOrQNGLg9Hn92eFsHD7RYPnnWsapxGXFMJcBjNuicqBDRIQ=="; }; }; "simple-plist-1.1.1" = { @@ -46561,15 +47191,6 @@ let sha1 = "56eb027d65b4d2dce6cb2e2d32c4d4afc9e1d707"; }; }; - "slug-3.5.1" = { - name = "slug"; - packageName = "slug"; - version = "3.5.1"; - src = fetchurl { - url = "https://registry.npmjs.org/slug/-/slug-3.5.1.tgz"; - sha512 = "ei0JnJzg8HKhLunZy+vpNlILRRradfaAQ+p2YEI4b4r8yX/5TlFi1JSwcYQCg7INZxdTC43BT68rHMkRxzn7Xg=="; - }; - }; "slugid-1.1.0" = { name = "slugid"; packageName = "slugid"; @@ -46579,13 +47200,13 @@ let sha1 = "e09f00899c09f5a7058edc36dd49f046fd50a82a"; }; }; - "slugify-1.4.5" = { + "slugify-1.4.6" = { name = "slugify"; packageName = "slugify"; - version = "1.4.5"; + version = "1.4.6"; src = fetchurl { - url = "https://registry.npmjs.org/slugify/-/slugify-1.4.5.tgz"; - sha512 = "WpECLAgYaxHoEAJ8Q1Lo8HOs1ngn7LN7QjXgOLbmmfkcWvosyk4ZTXkTzKyhngK640USTZUlgoQJfED1kz5fnQ=="; + url = "https://registry.npmjs.org/slugify/-/slugify-1.4.6.tgz"; + sha512 = "ZdJIgv9gdrYwhXqxsH9pv7nXxjUEyQ6nqhngRxoAAOlmMGA28FDq5O4/5US4G2/Nod7d1ovNcgURQJ7kHq50KQ=="; }; }; "smart-buffer-4.1.0" = { @@ -46723,13 +47344,13 @@ let sha512 = "/xcDy8H5wxhk+4E9e8zDDGfcNo5g+zpwy585sCDkH5KpHdZHmguPi0GmZ9ZCBTuGIodeTIqsDqkBiA1WXSH7+w=="; }; }; - "snyk-docker-plugin-4.1.1" = { + "snyk-docker-plugin-4.7.0" = { name = "snyk-docker-plugin"; packageName = "snyk-docker-plugin"; - version = "4.1.1"; + version = "4.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-docker-plugin/-/snyk-docker-plugin-4.1.1.tgz"; - sha512 = "2N8um3cU+qWAVut0Pm/jTM1Hcjyk4kQLKd5nX/Fl/DOhxi62pVpIQ6qGE2LKxYTShEpeC0YS70D9J4ke7ra8Dw=="; + url = "https://registry.npmjs.org/snyk-docker-plugin/-/snyk-docker-plugin-4.7.0.tgz"; + sha512 = "u8IFJfOBswBMGYMGalY2XrMr+uMBrNCDxRld8wNJJmGtM2yW7tQXKkCqtF266rFrYJnuqIgHHJb+NQiPBK2Ypw=="; }; }; "snyk-go-parser-1.4.1" = { @@ -46750,13 +47371,13 @@ let sha512 = "FAM56z3bl1iuxeqkCEA/jyZ2hpwkQK8xQxQbhR+QppEK5lole7w1PQyWYgZAJ9oRY/BU32zdRAJwGuZbhk7G2Q=="; }; }; - "snyk-gradle-plugin-3.10.0" = { + "snyk-gradle-plugin-3.10.1" = { name = "snyk-gradle-plugin"; packageName = "snyk-gradle-plugin"; - version = "3.10.0"; + version = "3.10.1"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-gradle-plugin/-/snyk-gradle-plugin-3.10.0.tgz"; - sha512 = "G33nwUIVALII7mHqKuIxLh1Qj2qsOFd6vbnu4d6lPISVCH9TRBTvirPaVnybWgrO2TWvzZ+jXsZHhG++8kLpXQ=="; + url = "https://registry.npmjs.org/snyk-gradle-plugin/-/snyk-gradle-plugin-3.10.1.tgz"; + sha512 = "kChphbd9OHdUadkPbYILGeNozwm1QISeEYgAX0Lfth6Gi1ViB71vAErbzzY6MnErImo8m+9rQRuWsqEFv8CvAw=="; }; }; "snyk-module-1.9.1" = { @@ -46840,6 +47461,15 @@ let sha512 = "IQcdsQBqqXVRY5DatlI7ASy4flbhtU2V7cr4P2rK9rkFnVHO6LHcitwKXVZa9ocdOmpZDzk7U6iwHJkVFcR6OA=="; }; }; + "snyk-poetry-lockfile-parser-1.1.0" = { + name = "snyk-poetry-lockfile-parser"; + packageName = "snyk-poetry-lockfile-parser"; + version = "1.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/snyk-poetry-lockfile-parser/-/snyk-poetry-lockfile-parser-1.1.0.tgz"; + sha512 = "FTMF6dVl9xOsDBcQT6k4gyoIurO7oZ2i78+rfb4X0W0XH4XYwSXeFw02vQLcWza2eNBvCcFmI0DtXRvQS880SA=="; + }; + }; "snyk-policy-1.14.1" = { name = "snyk-policy"; packageName = "snyk-policy"; @@ -46849,13 +47479,13 @@ let sha512 = "C5vSkoBYxPnaqb218sm4m6N5s1BhIXlldpIX5xRNnZ0QkDwVj3dy/PfgwxRgVQh7QFGa1ajbvKmsGmm4RRsN8g=="; }; }; - "snyk-python-plugin-1.17.1" = { + "snyk-python-plugin-1.18.0" = { name = "snyk-python-plugin"; packageName = "snyk-python-plugin"; - version = "1.17.1"; + version = "1.18.0"; src = fetchurl { - url = "https://registry.npmjs.org/snyk-python-plugin/-/snyk-python-plugin-1.17.1.tgz"; - sha512 = "KKklat9Hfbj4hw2y63LRhgmziYzmyRt+cSuzN5KDmBSAGYck0EAoPDtNpJXjrIs1kPNz28EXnE6NDnadXnOjiQ=="; + url = "https://registry.npmjs.org/snyk-python-plugin/-/snyk-python-plugin-1.18.0.tgz"; + sha512 = "vt07qsO1rHRAjO7wKwaLUJ0uZyvh6Aceafokc88N9mDyRbY2sf4ptIKEZ718wlbSQDLu17uRXiIQ+9jSWwH6Ng=="; }; }; "snyk-resolve-1.0.1" = { @@ -47029,13 +47659,13 @@ let sha512 = "o5t52PCNtVdiOvzMry7wU4aOqYWL0PeCXRWBEiJow4/i/wr+wpsJQ9awEu1EonLIqsfGd5qSgDdxEOvCdmBEpA=="; }; }; - "socks-2.4.4" = { + "socks-2.5.0" = { name = "socks"; packageName = "socks"; - version = "2.4.4"; + version = "2.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/socks/-/socks-2.4.4.tgz"; - sha512 = "7LmHN4IHj1Vpd/k8D872VGCHJ6yIVyeFkfIBExRmGPYQ/kdUkpdg9eKh9oOzYYYKQhuxavayJHTnmBG+EzluUA=="; + url = "https://registry.npmjs.org/socks/-/socks-2.5.0.tgz"; + sha512 = "00OqQHp5SCbwm9ecOMJj9aQtMSjwi1uVuGQoxnpKCS50VKZcOZ8z11CTKypmR8sEy7nZimy/qXY7rYJYbRlXmA=="; }; }; "socks-proxy-agent-4.0.2" = { @@ -48847,22 +49477,22 @@ let sha512 = "b5yrbl3BXIjHau9Prk7U0RRYcUYdN4wGSVaqoBQS50CCE3KBuYU0TYRNPFCP7aVoNMX87HKThdMRVIP3giclKg=="; }; }; - "string.prototype.trimend-1.0.1" = { + "string.prototype.trimend-1.0.2" = { name = "string.prototype.trimend"; packageName = "string.prototype.trimend"; - version = "1.0.1"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.1.tgz"; - sha512 = "LRPxFUaTtpqYsTeNKaFOw3R4bxIzWOnbQ837QfBylo8jIxtcbK/A/sMV7Q+OAV/vWo+7s25pOE10KYSjaSO06g=="; + url = "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.2.tgz"; + sha512 = "8oAG/hi14Z4nOVP0z6mdiVZ/wqjDtWSLygMigTzAb+7aPEDTleeFf+WrF+alzecxIRkckkJVn+dTlwzJXORATw=="; }; }; - "string.prototype.trimstart-1.0.1" = { + "string.prototype.trimstart-1.0.2" = { name = "string.prototype.trimstart"; packageName = "string.prototype.trimstart"; - version = "1.0.1"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.1.tgz"; - sha512 = "XxZn+QpvrBI1FOcg6dIpxUPgWCPuNXvMD72aaRaUQv1eD4e/Qy8i/hFTe0BUmD60p/QA6bh1avmuPTfNjqVWRw=="; + url = "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.2.tgz"; + sha512 = "7F6CdBTl5zyu30BJFdzSTlSlLPwODC23Od+iLoVH8X6+3fvDPPuBVVj9iaB1GOsSTSIgVfsfm27R2FGrAPznWg=="; }; }; "string2compact-1.3.0" = { @@ -49288,13 +49918,13 @@ let sha1 = "7958c793e47e32e07d2b5cafe5c0bf8e12e77902"; }; }; - "styled-components-5.2.0" = { + "styled-components-5.2.1" = { name = "styled-components"; packageName = "styled-components"; - version = "5.2.0"; + version = "5.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/styled-components/-/styled-components-5.2.0.tgz"; - sha512 = "9qE8Vgp8C5cpGAIdFaQVAl89Zgx1TDM4Yf4tlHbO9cPijtpSXTMLHy9lmP0lb+yImhgPFb1AmZ1qMUubmg3HLg=="; + url = "https://registry.npmjs.org/styled-components/-/styled-components-5.2.1.tgz"; + sha512 = "sBdgLWrCFTKtmZm/9x7jkIabjFNVzCUeKfoQsM6R3saImkUnjx0QYdLwJHBjY9ifEcmjDamJDVfknWm1yxZPxQ=="; }; }; "stylehacks-4.0.3" = { @@ -49432,13 +50062,13 @@ let sha512 = "LFLshqEwm1bXd3fEl0STYXZzEHbAz8HwsyItA8vvxhMZrIo+CpB7RrtLvor6mk+7SdfgJhmV3RdIdDIcPAJTTg=="; }; }; - "suf-regex-0.0.23" = { + "suf-regex-0.0.25" = { name = "suf-regex"; packageName = "suf-regex"; - version = "0.0.23"; + version = "0.0.25"; src = fetchurl { - url = "https://registry.npmjs.org/suf-regex/-/suf-regex-0.0.23.tgz"; - sha512 = "Rupps+hO04fiskhx5YwBaiB8Bbwsy8fsqDfT8FED6DWkumWClb3em+yukbNgmAvUIbLAm7ibJoN+2Pl4golkQw=="; + url = "https://registry.npmjs.org/suf-regex/-/suf-regex-0.0.25.tgz"; + sha512 = "0hd6oSzoeqwFgFLtXRoA6lMndzTpgPZCSU+/sCoin0HyKnqni/GX/BkUe9Qgs4uRIV1pxsZzE2pEIbaiFX61AQ=="; }; }; "sugarss-1.0.1" = { @@ -49711,31 +50341,31 @@ let sha1 = "e39fae3d581d713682491e1926cd87bf2c209bfb"; }; }; - "swagger-ui-dist-3.30.2" = { + "swagger-ui-dist-3.34.0" = { name = "swagger-ui-dist"; packageName = "swagger-ui-dist"; - version = "3.30.2"; + version = "3.34.0"; src = fetchurl { - url = "https://registry.npmjs.org/swagger-ui-dist/-/swagger-ui-dist-3.30.2.tgz"; - sha512 = "hAu/ig5N8i0trXXbrC7rwbXV4DhpEAsZhYXDs1305OjmDgjGC0thINbb0197idy3Pp+B6w7u426SUM43GAP7qw=="; + url = "https://registry.npmjs.org/swagger-ui-dist/-/swagger-ui-dist-3.34.0.tgz"; + sha512 = "xk5CMbwoQVI53rTq9o/iMojAqXP5NT4/+TMeTP4uXWDIH18pB9AXgO5Olqt0RXuf3jH032DA4DS4qzem6XdXAw=="; }; }; - "swagger-ui-dist-3.35.2" = { + "swagger-ui-dist-3.36.1" = { name = "swagger-ui-dist"; packageName = "swagger-ui-dist"; - version = "3.35.2"; + version = "3.36.1"; src = fetchurl { - url = "https://registry.npmjs.org/swagger-ui-dist/-/swagger-ui-dist-3.35.2.tgz"; - sha512 = "19oRW6ZVCTY7JnaMFnIUoxkqI+xhBOGzSFVQTMLDB9KTNASP82v/0SkNpY2T4zbjwZF2Y5bcty9E6rhLGAj0Gg=="; + url = "https://registry.npmjs.org/swagger-ui-dist/-/swagger-ui-dist-3.36.1.tgz"; + sha512 = "p7lx/OubaaCzOfSYDuMbkRvf/a+rTnQAOySN/NhL+k6D5o9WXEEeKZwj/6fRHRoLSHKZq28jc1xQcz8HuYcgwQ=="; }; }; - "swagger2openapi-5.4.0" = { + "swagger2openapi-6.2.3" = { name = "swagger2openapi"; packageName = "swagger2openapi"; - version = "5.4.0"; + version = "6.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/swagger2openapi/-/swagger2openapi-5.4.0.tgz"; - sha512 = "f5QqfXawiVijhjMtYqWZ55ESHPZFqrPC8L9idhIiuSX8O2qsa1i4MVGtCM3TQF+Smzr/6WfT/7zBuzG3aTgPAA=="; + url = "https://registry.npmjs.org/swagger2openapi/-/swagger2openapi-6.2.3.tgz"; + sha512 = "cUUktzLpK69UwpMbcTzjMw2ns9RZChfxh56AHv6+hTx3StPOX2foZjPgds3HlJcINbxosYYBn/D3cG8nwcCWwQ=="; }; }; "swagger2openapi-7.0.3" = { @@ -49819,6 +50449,15 @@ let sha512 = "9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw=="; }; }; + "sync-fetch-0.3.0" = { + name = "sync-fetch"; + packageName = "sync-fetch"; + version = "0.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/sync-fetch/-/sync-fetch-0.3.0.tgz"; + sha512 = "dJp4qg+x4JwSEW1HibAuMi0IIrBI3wuQr2GimmqB7OXR50wmwzfdusG+p39R9w3R6aFtZ2mzvxvWKQ3Bd/vx3g=="; + }; + }; "syntax-error-1.4.0" = { name = "syntax-error"; packageName = "syntax-error"; @@ -49828,13 +50467,13 @@ let sha512 = "YPPlu67mdnHGTup2A8ff7BC2Pjq0e0Yp/IyTFN03zWO0RcK07uLcbi7C2KpGR2FvWbaB0+bfE27a+sBKebSo7w=="; }; }; - "systeminformation-4.27.10" = { + "systeminformation-4.27.11" = { name = "systeminformation"; packageName = "systeminformation"; - version = "4.27.10"; + version = "4.27.11"; src = fetchurl { - url = "https://registry.npmjs.org/systeminformation/-/systeminformation-4.27.10.tgz"; - sha512 = "qXuJaa+3A1bLkFNr/rn3H9Uw8UGodSbq+1QjxDbXua9iexfw4UIdAZZTyu9kE5OkXG1Lt6u0z4aZfxYRVL68EA=="; + url = "https://registry.npmjs.org/systeminformation/-/systeminformation-4.27.11.tgz"; + sha512 = "U7bigXbOnsB8k1vNHS0Y13RCsRz5/UohiUmND+3mMUL6vfzrpbe/h4ZqewowB+B+tJNnmGFDj08Z8xGfYo45dQ=="; }; }; "syswide-cas-5.3.0" = { @@ -50189,15 +50828,6 @@ let sha512 = "s0ZZzd0BzYv5tLSptZooSjK8oj6C+c19p7Vqta9+6NPOf7r+fxq0cJe6/oN4LTC79sy5NY8ucOJNgwsKCSbfqg=="; }; }; - "temp-0.9.0" = { - name = "temp"; - packageName = "temp"; - version = "0.9.0"; - src = fetchurl { - url = "https://registry.npmjs.org/temp/-/temp-0.9.0.tgz"; - sha512 = "YfUhPQCJoNQE5N+FJQcdPz63O3x3sdT4Xju69Gj4iZe0lBKOtnAMi0SLj9xKhGkcGhsxThvTJ/usxtFPo438zQ=="; - }; - }; "temp-0.9.1" = { name = "temp"; packageName = "temp"; @@ -50207,6 +50837,15 @@ let sha512 = "WMuOgiua1xb5R56lE0eH6ivpVmg/lq2OHm4+LtT/xtEtPQ+sz6N3bBM6WZ5FvO1lO4IKIOb43qnhoc4qxP5OeA=="; }; }; + "temp-0.9.2" = { + name = "temp"; + packageName = "temp"; + version = "0.9.2"; + src = fetchurl { + url = "https://registry.npmjs.org/temp/-/temp-0.9.2.tgz"; + sha512 = "KLVd6CXeUYsqmI/LBWDLg3bFkdZPg0Xr/Gn79GUuPNiISzp6v/EKUaCOrxqeH1w/wVNmrljyDRgKxhZV9JzyJA=="; + }; + }; "temp-dir-1.0.0" = { name = "temp-dir"; packageName = "temp-dir"; @@ -50288,13 +50927,13 @@ let sha1 = "458b83887f288fc56d6fffbfad262e26638efa69"; }; }; - "term-size-2.2.0" = { + "term-size-2.2.1" = { name = "term-size"; packageName = "term-size"; - version = "2.2.0"; + version = "2.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/term-size/-/term-size-2.2.0.tgz"; - sha512 = "a6sumDlzyHVJWb8+YofY4TW112G6p2FCPEAFk+59gIYHv3XHRhm9ltVQ9kli4hNWeQBwSpe8cRN25x0ROunMOw=="; + url = "https://registry.npmjs.org/term-size/-/term-size-2.2.1.tgz"; + sha512 = "wK0Ri4fOGjv/XPy8SBHZChl8CM7uMc5VML7SqiQ0zG7+J5Vr+RMQDoHa2CNT6KHUnTGIXH34UDMkPzAUyapBZg=="; }; }; "terminal-kit-1.44.0" = { @@ -50333,13 +50972,13 @@ let sha512 = "EAPipTNeWsb/3wLPeup1tVPaXfIaU68xMnVdPafIL1TV05OhASArYyIfFvnvJCNrR2NIOvDVNNTFRa+Re2MWyw=="; }; }; - "terser-5.3.6" = { + "terser-5.3.8" = { name = "terser"; packageName = "terser"; - version = "5.3.6"; + version = "5.3.8"; src = fetchurl { - url = "https://registry.npmjs.org/terser/-/terser-5.3.6.tgz"; - sha512 = "145ap5v1HYx69HfLuwWaxTIlXyiSr+nSTb7ZWlJCgJn2JptuJRKziNa/zwFx9B1IU99Q055jHni74nLuuEC78w=="; + url = "https://registry.npmjs.org/terser/-/terser-5.3.8.tgz"; + sha512 = "zVotuHoIfnYjtlurOouTazciEfL7V38QMAOhGqpXDEg6yT13cF4+fEP9b0rrCEQTn+tT46uxgFsTZzhygk+CzQ=="; }; }; "terser-webpack-plugin-1.4.5" = { @@ -50351,15 +50990,6 @@ let sha512 = "04Rfe496lN8EYruwi6oPQkG0vo8C+HT49X687FZnpPF0qMAIHONI6HEXYPKDOE8e5HjXTyKfqRd/agHtH0kOtw=="; }; }; - "terser-webpack-plugin-3.0.7" = { - name = "terser-webpack-plugin"; - packageName = "terser-webpack-plugin"; - version = "3.0.7"; - src = fetchurl { - url = "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-3.0.7.tgz"; - sha512 = "5JqibUOctE6Ou4T00IVGYTQJBOhu24jz0PpqYeitQJJ3hlZY2ZKSwzzuqjmBH8MzbdWMgIefpmHwTkvwm6Q4CQ=="; - }; - }; "terser-webpack-plugin-3.1.0" = { name = "terser-webpack-plugin"; packageName = "terser-webpack-plugin"; @@ -50369,13 +50999,22 @@ let sha512 = "cjdZte66fYkZ65rQ2oJfrdCAkkhJA7YLYk5eGOcGCSGlq0ieZupRdjedSQXYknMPo2IveQL+tPdrxUkERENCFA=="; }; }; - "terser-webpack-plugin-5.0.0" = { + "terser-webpack-plugin-4.2.2" = { name = "terser-webpack-plugin"; packageName = "terser-webpack-plugin"; - version = "5.0.0"; + version = "4.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.0.0.tgz"; - sha512 = "rf7l5a9xamIVX3enQeTl0MY2MNeZClo5yPX/tVPy22oY0nzu0b45h7JqyFi/bygqKWtzXMnml0u12mArhQPsBQ=="; + url = "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-4.2.2.tgz"; + sha512 = "3qAQpykRTD5DReLu5/cwpsg7EZFzP3Q0Hp2XUWJUw2mpq2jfgOKTZr8IZKKnNieRVVo1UauROTdhbQJZveGKtQ=="; + }; + }; + "terser-webpack-plugin-5.0.3" = { + name = "terser-webpack-plugin"; + packageName = "terser-webpack-plugin"; + version = "5.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.0.3.tgz"; + sha512 = "zFdGk8Lh9ZJGPxxPE6jwysOlATWB8GMW8HcfGULWA/nPal+3VdATflQvSBSLQJRCmYZnfFJl6vkRTiwJGNgPiQ=="; }; }; "test-exclude-6.0.0" = { @@ -50729,13 +51368,13 @@ let sha1 = "c9c58b575be8407375cb5e2462dacee74359f41d"; }; }; - "timers-browserify-2.0.11" = { + "timers-browserify-2.0.12" = { name = "timers-browserify"; packageName = "timers-browserify"; - version = "2.0.11"; + version = "2.0.12"; src = fetchurl { - url = "https://registry.npmjs.org/timers-browserify/-/timers-browserify-2.0.11.tgz"; - sha512 = "60aV6sgJ5YEbzUdn9c8kYGIqOubPoUdqQCul3SBAsRCZ40s6Y5cMcrW4dt3/k/EsbLVJNl9n6Vz3fTc+k2GeKQ=="; + url = "https://registry.npmjs.org/timers-browserify/-/timers-browserify-2.0.12.tgz"; + sha512 = "9phl76Cqm6FhSX9Xe1ZUAMLtm1BLkKj2Qd5ApyWkXzsMRaA7dgr81kf4wJmQf/hAvg8EEyJxDo3du/0KlhPiKQ=="; }; }; "timers-ext-0.1.7" = { @@ -51197,13 +51836,13 @@ let sha512 = "605uxS6bcYxGXw9qi62XyrV6Q3xwbndjachmNxu8HWTtVPxZfEJN9fd/SZS1Q54Sn2y0TMyMxFj/cJINqGHrKw=="; }; }; - "topsort-0.0.2" = { - name = "topsort"; - packageName = "topsort"; - version = "0.0.2"; + "toposort-2.0.2" = { + name = "toposort"; + packageName = "toposort"; + version = "2.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/topsort/-/topsort-0.0.2.tgz"; - sha1 = "2e5e0ee8a1439417f101d5b9b2d035e620263321"; + url = "https://registry.npmjs.org/toposort/-/toposort-2.0.2.tgz"; + sha1 = "ae21768175d1559d48bef35420b2f4962f09c330"; }; }; "torrent-discovery-5.4.0" = { @@ -51467,13 +52106,13 @@ let sha1 = "e3646a2ea4e891312bf7eace6cfb05380bc01c21"; }; }; - "trim-trailing-lines-1.1.3" = { + "trim-trailing-lines-1.1.4" = { name = "trim-trailing-lines"; packageName = "trim-trailing-lines"; - version = "1.1.3"; + version = "1.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/trim-trailing-lines/-/trim-trailing-lines-1.1.3.tgz"; - sha512 = "4ku0mmjXifQcTVfYDfR5lpgV7zVqPg6zV9rdZmwOPqq0+Zq19xDqEgagqVbc4pOOShbncuAOIs59R3+3gcF3ZA=="; + url = "https://registry.npmjs.org/trim-trailing-lines/-/trim-trailing-lines-1.1.4.tgz"; + sha512 = "rjUWSqnfTNrjbB9NQWfPMH/xRK1deHeGsHoVfpxJ++XeYXE0d6B1En37AHfw3jtfTU7dzMzZL2jjpe8Qb5gLIQ=="; }; }; "triple-beam-1.3.0" = { @@ -51548,13 +52187,13 @@ let sha512 = "HDo5kXZCBml3EUPcc7RlZOV/JGlLHwppTLEHb3SHnr5V7NXD4klMEkrhJe5wgRbaWsSXi+Y1SIBN/K9B6zWGWQ=="; }; }; - "ts-loader-8.0.1" = { + "ts-loader-8.0.4" = { name = "ts-loader"; packageName = "ts-loader"; - version = "8.0.1"; + version = "8.0.4"; src = fetchurl { - url = "https://registry.npmjs.org/ts-loader/-/ts-loader-8.0.1.tgz"; - sha512 = "I9Nmly0ufJoZRMuAT9d5ijsC2B7oSPvUnOJt/GhgoATlPGYfa17VicDKPcqwUCrHpOkCxr/ybLYwbnS4cOxmvQ=="; + url = "https://registry.npmjs.org/ts-loader/-/ts-loader-8.0.4.tgz"; + sha512 = "5u8KF1SW8eCUb/Ff7At81e3wznPmT/27fvaGRO9CziVy+6NlPVRvrzSox4OwU0/e6OflOUB32Err4VquysCSAQ=="; }; }; "ts-log-2.2.3" = { @@ -51665,13 +52304,13 @@ let sha512 = "EcMxhzCFt8k+/UP5r8waCf/lzmeSyVlqxqMEDQE7rWYiQky8KpIBz1JAoYXfROHrPZ1XXd43q8yQnULOLiBRQg=="; }; }; - "tslint-6.1.2" = { + "tslint-6.1.3" = { name = "tslint"; packageName = "tslint"; - version = "6.1.2"; + version = "6.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/tslint/-/tslint-6.1.2.tgz"; - sha512 = "UyNrLdK3E0fQG/xWNqAFAC5ugtFyPO4JJR1KyyfQAyzR8W0fTRrC91A8Wej4BntFzcvETdCSDa/4PnNYJQLYiA=="; + url = "https://registry.npmjs.org/tslint/-/tslint-6.1.3.tgz"; + sha512 = "IbR4nkT96EQOvKE2PW/djGz8iGNeJ4rF2mBfiYaR/nvUWYKJhLwimoJKgjIFEIDibBtOevj7BqCRL4oHeWWUCg=="; }; }; "tsscmp-1.0.6" = { @@ -52079,6 +52718,15 @@ let sha512 = "tEu6DGxGgRJPb/mVPIZ48e69xCn2yRmCgYmDugAVwmJ6o+0u1RI18eO7E7WBTLYLaEVVOhwQmcdhQHweux/WPg=="; }; }; + "typescript-4.0.5" = { + name = "typescript"; + packageName = "typescript"; + version = "4.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/typescript/-/typescript-4.0.5.tgz"; + sha512 = "ywmr/VrTVCmNTJ6iV2LwIrfG1P+lv6luD8sUJs+2eI9NLGigaN+nUQc13iHqisq7bra9lnmUSYqbJvegraBOPQ=="; + }; + }; "typescript-eslint-parser-16.0.1" = { name = "typescript-eslint-parser"; packageName = "typescript-eslint-parser"; @@ -52133,13 +52781,13 @@ let sha512 = "dvdQgNDNJo+8B2uBQoqdb11eUCE1JQXhvjC/CZtgvZseVd5TYMXnq0+vuUemXbd/Se29cTaUuPX3YIc2xgbvIg=="; }; }; - "typo-geom-0.8.4" = { + "typo-geom-0.11.0" = { name = "typo-geom"; packageName = "typo-geom"; - version = "0.8.4"; + version = "0.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/typo-geom/-/typo-geom-0.8.4.tgz"; - sha512 = "n0P1RQidLnjLI2iSUDENiugkABaR+tr/kSIpl040XLKmrfsBZ/weS1OvQ9Mq98CsJlcJDemKdPqldoyYSsVgmQ=="; + url = "https://registry.npmjs.org/typo-geom/-/typo-geom-0.11.0.tgz"; + sha512 = "0f7MjfJdUOYCLfUpVegTIukkWd1nkvN6CX6oXF8hcx9Hu04qhQfTC+gOffH8bhSjsSiLhIy7aRuzgIAj4UdyyQ=="; }; }; "ua-parser-js-0.7.21" = { @@ -52187,13 +52835,13 @@ let sha512 = "G440NU6fewtnQftSgqRV1r2A5ChKbU1gqFCJ7I8S7MPpY/eZZfLGefaY6gUZYiWebMaO+txgiQ1ZyLDuNWJulg=="; }; }; - "uglify-js-3.11.3" = { + "uglify-js-3.11.5" = { name = "uglify-js"; packageName = "uglify-js"; - version = "3.11.3"; + version = "3.11.5"; src = fetchurl { - url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.11.3.tgz"; - sha512 = "wDRziHG94mNj2n3R864CvYw/+pc9y/RNImiTyrrf8BzgWn75JgFSwYvXrtZQMnMnOp/4UTrf3iCSQxSStPiByA=="; + url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.11.5.tgz"; + sha512 = "btvv/baMqe7HxP7zJSF7Uc16h1mSfuuSplT0/qdjxseesDU+yYzH33eHBH+eMdeRXwujXspaCTooWHQVVBh09w=="; }; }; "uglify-js-3.4.10" = { @@ -52457,15 +53105,6 @@ let sha512 = "Ft16BJcnapDKp0+J/rqFC3Rrk6Y/Ng4nzsC028k2jdDII/rdZ7Wd3pPT/6+vIIxRagwRc9K0IUX0Ra4fKvw+WQ=="; }; }; - "unicode-13.0.0-0.8.0" = { - name = "unicode-13.0.0"; - packageName = "unicode-13.0.0"; - version = "0.8.0"; - src = fetchurl { - url = "https://registry.npmjs.org/unicode-13.0.0/-/unicode-13.0.0-0.8.0.tgz"; - sha512 = "Ekct2eo5hBIp/29ERCj1ABIBNnrFOAisNHFv8l2KksHJg4PurIN/nGPFItaIpBJHVzlBYuJaVx/bAvmJnFFL/w=="; - }; - }; "unicode-canonical-property-names-ecmascript-1.0.4" = { name = "unicode-canonical-property-names-ecmascript"; packageName = "unicode-canonical-property-names-ecmascript"; @@ -52727,13 +53366,13 @@ let sha512 = "lWgIc3rrTMTlK1Y0hEuL+k+ApzFk78h+lsaa2gHf63Gp5Ww+mt11huDniuaoq1H+XMK2lIIjjPkncxXcDp3QDw=="; }; }; - "unist-util-find-all-after-3.0.1" = { + "unist-util-find-all-after-3.0.2" = { name = "unist-util-find-all-after"; packageName = "unist-util-find-all-after"; - version = "3.0.1"; + version = "3.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/unist-util-find-all-after/-/unist-util-find-all-after-3.0.1.tgz"; - sha512 = "0GICgc++sRJesLwEYDjFVJPJttBpVQaTNgc6Jw0Jhzvfs+jtKePEMu+uD+PqkRUrAvGQqwhpDwLGWo1PK8PDEw=="; + url = "https://registry.npmjs.org/unist-util-find-all-after/-/unist-util-find-all-after-3.0.2.tgz"; + sha512 = "xaTC/AGZ0rIM2gM28YVRAFPIZpzbpDtU3dRmp7EXlNVA8ziQc4hY3H7BHXM1J49nEmiqc3svnqMReW+PGqbZKQ=="; }; }; "unist-util-inspect-4.1.4" = { @@ -52781,13 +53420,13 @@ let sha512 = "sVZZX3+kspVNmLWBPAB6r+7D9ZgAFPNWm66f7YNb420RlQSbn+n8rG8dGZSkrER7ZIXGQYNm5pqC3v3HopH24A=="; }; }; - "unist-util-is-4.0.2" = { + "unist-util-is-4.0.3" = { name = "unist-util-is"; packageName = "unist-util-is"; - version = "4.0.2"; + version = "4.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/unist-util-is/-/unist-util-is-4.0.2.tgz"; - sha512 = "Ofx8uf6haexJwI1gxWMGg6I/dLnF2yE+KibhD3/diOqY2TinLcqHXCV6OI5gFVn3xQqDH+u0M625pfKwIwgBKQ=="; + url = "https://registry.npmjs.org/unist-util-is/-/unist-util-is-4.0.3.tgz"; + sha512 = "bTofCFVx0iQM8Jqb1TBDVRIQW03YkD3p66JOd/aCWuqzlLyUtx1ZAGw/u+Zw+SttKvSVcvTiKYbfrtLoLefykw=="; }; }; "unist-util-map-1.0.5" = { @@ -52961,6 +53600,15 @@ let sha512 = "rb6X1W158d7pRQBg5gkR8uPaSfiids68LTJQYOtEUhoJUWBdaQHsuT/EUduxXYxcrt4r5PJ4fuHW1MHT6p0qug=="; }; }; + "universalify-2.0.0" = { + name = "universalify"; + packageName = "universalify"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/universalify/-/universalify-2.0.0.tgz"; + sha512 = "hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ=="; + }; + }; "unix-crypt-td-js-1.1.4" = { name = "unix-crypt-td-js"; packageName = "unix-crypt-td-js"; @@ -53123,6 +53771,15 @@ let sha512 = "aZwGpamFO61g3OlfT7OQCHqhGnW43ieH9WZeP7QxN/G/jS4jfqUkZxoryvJgVPEcrl5NL/ggHsSmLMHuH64Lhg=="; }; }; + "upath-2.0.0" = { + name = "upath"; + packageName = "upath"; + version = "2.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/upath/-/upath-2.0.0.tgz"; + sha512 = "ghi1XxsVYPOZPDsOZrfOJIwQU5I3JVYB3Q6IbBGn1KFeOa89i0nUy5tCEkY9pVm83U83qZ1QG40RQKGknllV4w=="; + }; + }; "update-check-1.5.2" = { name = "update-check"; packageName = "update-check"; @@ -53186,6 +53843,15 @@ let sha512 = "8tqsiVrMv7aZsKNSjqA6DdBLKJpZG1hRpkj1RbOJu1PgyP69OX+EInAnP1EK/ShX5YdPFgwWdk19oquZ0HTM8g=="; }; }; + "update-notifier-5.0.1" = { + name = "update-notifier"; + packageName = "update-notifier"; + version = "5.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/update-notifier/-/update-notifier-5.0.1.tgz"; + sha512 = "BuVpRdlwxeIOvmc32AGYvO1KVdPlsmqSh8KDDBxS6kDE5VR7R8OMP1d8MdhaVBvxl4H3551k9akXr0Y1iIB2Wg=="; + }; + }; "upnp-device-client-1.0.2" = { name = "upnp-device-client"; packageName = "upnp-device-client"; @@ -53375,6 +54041,15 @@ let sha1 = "16b5cafc07dbe3676c1b1999177823d6503acb0c"; }; }; + "url-template-2.0.8" = { + name = "url-template"; + packageName = "url-template"; + version = "2.0.8"; + src = fetchurl { + url = "https://registry.npmjs.org/url-template/-/url-template-2.0.8.tgz"; + sha1 = "fc565a3cccbff7730c775f5641f9555791439f21"; + }; + }; "url-to-options-1.0.1" = { name = "url-to-options"; packageName = "url-to-options"; @@ -53429,6 +54104,16 @@ let sha1 = "9c70bfd8169bc1dcbf48604e0f04b8b49cde9e9f"; }; }; + "uslug-git+https://github.com/laurent22/uslug.git#emoji-support" = { + name = "uslug"; + packageName = "uslug"; + version = "1.0.4"; + src = fetchgit { + url = "https://github.com/laurent22/uslug.git"; + rev = "ba2834d79beb0435318709958b2f5e817d96674d"; + sha256 = "e23c172456a8fa0af48dba3f89ca0d525dd870408f7bd6ad1d776cdbe13f0489"; + }; + }; "ut_metadata-3.5.1" = { name = "ut_metadata"; packageName = "ut_metadata"; @@ -53456,13 +54141,13 @@ let sha1 = "8bb871a4741e085c70487ca7acdbd7d6d36029eb"; }; }; - "utf-8-validate-5.0.2" = { + "utf-8-validate-5.0.3" = { name = "utf-8-validate"; packageName = "utf-8-validate"; - version = "5.0.2"; + version = "5.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/utf-8-validate/-/utf-8-validate-5.0.2.tgz"; - sha512 = "SwV++i2gTD5qh2XqaPzBnNX88N6HdyhQrNNRykvcS0QKvItV9u3vPEJr+X5Hhfb1JC0r0e1alL0iB09rY8+nmw=="; + url = "https://registry.npmjs.org/utf-8-validate/-/utf-8-validate-5.0.3.tgz"; + sha512 = "jtJM6fpGv8C1SoH4PtG22pGto6x+Y8uPprW0tw3//gGFhDDTiuksgradgFN6yRayDP4SyZZa6ZMGHLIa17+M8A=="; }; }; "utf7-1.0.2" = { @@ -53717,13 +54402,13 @@ let sha512 = "FOmRr+FmWEIG8uhZv6C2bTgEVXsHk08kE7mPlrBbEe+c3r9pjceVPgupIfNIhc4yx55H69OXANrUaSuu9eInKg=="; }; }; - "v8-compile-cache-2.1.1" = { + "v8-compile-cache-2.2.0" = { name = "v8-compile-cache"; packageName = "v8-compile-cache"; - version = "2.1.1"; + version = "2.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.1.1.tgz"; - sha512 = "8OQ9CL+VWyt3JStj7HX7/ciTL2V3Rl1Wf5OL+SNTm0yK1KvtReVulksyeRnCANHHuUxHlQig+JJDlUhBt1NQDQ=="; + url = "https://registry.npmjs.org/v8-compile-cache/-/v8-compile-cache-2.2.0.tgz"; + sha512 = "gTpR5XQNKFwOd4clxfnhaqvfqMpqEwr4tOtCyz4MtYZX2JYhfr1JvBFKdS+7K/9rfpZR3VLX+YWBbKoxCgS43Q=="; }; }; "v8-debug-1.0.1" = { @@ -54230,13 +54915,13 @@ let sha512 = "/juG65kTL4Cy2su4P8HjtkTxk6VmJDiOPBufWniqQ6wknac6jNiXS9vU+hO3wgusiyqWlzTbVHi0dyJqRONg3w=="; }; }; - "verda-1.1.1" = { + "verda-1.1.2" = { name = "verda"; packageName = "verda"; - version = "1.1.1"; + version = "1.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/verda/-/verda-1.1.1.tgz"; - sha512 = "8nki9HjTh39EFuIYY2snCCdIDU0z4LmFN7tQ9oZByW2AQpPYpWDHwRqewWgUt9PVcDsXDSZbJWSuJwGnyAj8gg=="; + url = "https://registry.npmjs.org/verda/-/verda-1.1.2.tgz"; + sha512 = "c91aFgK+UQBqWoixDP8MRvyAN5hfVVaXT3nuk6uFiEb3NXu5UwtK7qCBIZP08talrYDn9ifIpcl+h0JGcH7IlQ=="; }; }; "verror-1.1.0" = { @@ -54356,13 +55041,13 @@ let sha512 = "sSFdyCP3G6Ka0CEmN83A2YCMKIieHx0EDaj5IDP4g1pa5ZJ4FJDvpO0WODLxo4LUX4oe52gmSCK7Jw4SBghqxA=="; }; }; - "vfile-location-3.1.0" = { + "vfile-location-3.2.0" = { name = "vfile-location"; packageName = "vfile-location"; - version = "3.1.0"; + version = "3.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/vfile-location/-/vfile-location-3.1.0.tgz"; - sha512 = "FCZ4AN9xMcjFIG1oGmZKo61PjwJHRVA+0/tPUP2ul4uIwjGGndIxavEMRpWn5p4xwm/ZsdXp9YNygf1ZyE4x8g=="; + url = "https://registry.npmjs.org/vfile-location/-/vfile-location-3.2.0.tgz"; + sha512 = "aLEIZKv/oxuCDZ8lkJGhuhztf/BW4M+iHdCwglA/eWc+vtuRFJj8EtgceYFX4LRjOhCAAiNHsKGssC6onJ+jbA=="; }; }; "vfile-message-1.1.1" = { @@ -54536,13 +55221,13 @@ let sha512 = "gQpnTgkubC6hQgdIcRdYGDSDc+SaujOdyesZQMv6JlfQee/9Mp0Qhnys6WxDWvQnL5WZdT7o2Ul187aSt0Rq+w=="; }; }; - "vls-0.5.4" = { + "vls-0.5.5" = { name = "vls"; packageName = "vls"; - version = "0.5.4"; + version = "0.5.5"; src = fetchurl { - url = "https://registry.npmjs.org/vls/-/vls-0.5.4.tgz"; - sha512 = "BAdsW9uYaMIEQcAK3cZsuoA+jMapOxc3RFNqiZtRDunbkv+sWrCs4xrydiPIiLHY7Pi8I/yNqBPlR/8LDlFmhA=="; + url = "https://registry.npmjs.org/vls/-/vls-0.5.5.tgz"; + sha512 = "DDfnr83S2jAXWA0TLOy3t2g+wgTzo+hUNz8aYcF4WQrCTlNVyDsZ3wtcCa5koZVYWbfDitfBAlbqkqIpjeaDng=="; }; }; "vm-browserify-1.1.2" = { @@ -54590,15 +55275,6 @@ let sha512 = "RWkO/c/A7iXhHEy3OuEqkCqavDjpD4NF2Ca8vjai+ZtEYNeHrm1ybTnBYLP4Ft1uXvvaaVtYA9HrDjD6+CUONg=="; }; }; - "vscode-css-languageservice-4.3.3" = { - name = "vscode-css-languageservice"; - packageName = "vscode-css-languageservice"; - version = "4.3.3"; - src = fetchurl { - url = "https://registry.npmjs.org/vscode-css-languageservice/-/vscode-css-languageservice-4.3.3.tgz"; - sha512 = "b2b+0oHvPmBHygDtOXX3xBvpQCa6eIQSvXnGDNSDmIC1894ZTJ2yX10vjplOO/PvV7mwhyvGPwHyY4X2HGxtKw=="; - }; - }; "vscode-css-languageservice-4.3.5" = { name = "vscode-css-languageservice"; packageName = "vscode-css-languageservice"; @@ -54635,13 +55311,13 @@ let sha512 = "X4pzcrJ8dE7M3ArFuySF5fgipKDd/EauXkiJwtjBIVRWpVNq0tF9+lNCyuC7iDUwP3Oq7ow/TGssD3GdG96Jow=="; }; }; - "vscode-emmet-helper-2.0.5" = { + "vscode-emmet-helper-2.1.1" = { name = "vscode-emmet-helper"; packageName = "vscode-emmet-helper"; - version = "2.0.5"; + version = "2.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/vscode-emmet-helper/-/vscode-emmet-helper-2.0.5.tgz"; - sha512 = "lDP+soFnJgEkUrdAWqdUYRFfXRFnmXhjzyzca+fy9vCUorr3lp32IKIys8mYwnlAUencmyXmF5JwN0VikUXj/Q=="; + url = "https://registry.npmjs.org/vscode-emmet-helper/-/vscode-emmet-helper-2.1.1.tgz"; + sha512 = "598eqXynvHDBdjgZqjTTg3XNb0SIvlVIc22/DwqxKjTKJLqe4LDCWi0H1yYBvU0Eb1FAJSh/l04InFxuI/mDVg=="; }; }; "vscode-html-languageservice-2.1.12" = { @@ -54653,13 +55329,13 @@ let sha512 = "mIb5VMXM5jI97HzCk2eadI1K//rCEZXte0wBqA7PGXsyJH4KTyJUaYk9MR+mbfpUl2vMi3HZw9GUOLGYLc6l5w=="; }; }; - "vscode-json-languageservice-3.9.1" = { + "vscode-json-languageservice-3.10.0" = { name = "vscode-json-languageservice"; packageName = "vscode-json-languageservice"; - version = "3.9.1"; + version = "3.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/vscode-json-languageservice/-/vscode-json-languageservice-3.9.1.tgz"; - sha512 = "oJkknkdCVitQ5XPSRa0weHjUxt8eSCptaL+MBQQlRsa6Nb8XnEY0S5wYnLUFHzEvKzwt01/LKk8LdOixWEXkNA=="; + url = "https://registry.npmjs.org/vscode-json-languageservice/-/vscode-json-languageservice-3.10.0.tgz"; + sha512 = "8IvuRSQnjznu+obqy6Dy4S4H68Ke7a3Kb+A0FcdctyAMAWEnrORpCpMOMqEYiPLm/OTYLVWJ7ql3qToDTozu4w=="; }; }; "vscode-jsonrpc-3.5.0" = { @@ -54923,6 +55599,15 @@ let sha512 = "s/z5ZqSe7VpoXJ6JQcvwRiPPA3nG0nAcJ/HH03zoU6QaFfnkcgPK+HshC3WKPPnC2G08xA0iRB6h7kmyBB5Adg=="; }; }; + "vscode-languageserver-types-3.16.0-next.4" = { + name = "vscode-languageserver-types"; + packageName = "vscode-languageserver-types"; + version = "3.16.0-next.4"; + src = fetchurl { + url = "https://registry.npmjs.org/vscode-languageserver-types/-/vscode-languageserver-types-3.16.0-next.4.tgz"; + sha512 = "NlKJyGcET/ZBCCLBYIPaGo2c37R03bPYeWXozUtnjyye7+9dhlbMSODyoG2INcQf8zFmB4qhm2UOJjgYEgPCNA=="; + }; + }; "vscode-languageserver-types-3.5.0" = { name = "vscode-languageserver-types"; packageName = "vscode-languageserver-types"; @@ -54968,13 +55653,13 @@ let sha512 = "u0Lw+IYlgbEJFF6/qAqG2d1jQmJl0eyAGJHoAJqr2HT4M2BNuQYSEiSE75f52pXHSJm8AlTjnLLbBFPrdz2hpA=="; }; }; - "vscode-test-1.4.0" = { + "vscode-test-1.4.1" = { name = "vscode-test"; packageName = "vscode-test"; - version = "1.4.0"; + version = "1.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/vscode-test/-/vscode-test-1.4.0.tgz"; - sha512 = "Jt7HNGvSE0+++Tvtq5wc4hiXLIr2OjDShz/gbAfM/mahQpy4rKBnmOK33D+MR67ATWviQhl+vpmU3p/qwSH/Pg=="; + url = "https://registry.npmjs.org/vscode-test/-/vscode-test-1.4.1.tgz"; + sha512 = "Ls7+JyC06cUCuomlTYk4aNJI00Rri09hgtkNl3zfQ1bj6meXglpSPpuzJ/RPNetlUHFMm4eGs0Xr/H5pFPVwfQ=="; }; }; "vscode-textbuffer-1.0.0" = { @@ -55049,13 +55734,13 @@ let sha512 = "uhmLFETqPPNyuLLbsKz6ioJ4q7AZHzD8ZVFNATNyICSZouqP2Sz0rotWQC8UNBF6VGSCs5abnKJoStA6JbCbfg=="; }; }; - "vue-3.0.1" = { + "vue-3.0.2" = { name = "vue"; packageName = "vue"; - version = "3.0.1"; + version = "3.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/vue/-/vue-3.0.1.tgz"; - sha512 = "WBTgaQMJIWQuhlzMV6C0qvVrxyQSpx3gKwflYC0sqGKEZSxMIOYRnrIlHUN4ivUVvP7mUMxcnFTt7P+akdOkQA=="; + url = "https://registry.npmjs.org/vue/-/vue-3.0.2.tgz"; + sha512 = "ciKFjutKRs+2Vbvgrist1oDd5wZQqtOel/K//ku54zLbf8tcTV+XbyAfanTHcTkML9CUj09vnC+y+5uaOz2/9g=="; }; }; "vue-cli-plugin-apollo-0.21.3" = { @@ -55202,13 +55887,13 @@ let sha512 = "aWAgTW4MoSJzZPAicljkO1hsi1oKj/RRq/OJQh2PKI2UKL04c2Bs+MBOB+BBABHTXJpf9mCwHN7ANCvYsvY2sg=="; }; }; - "watchpack-2.0.0" = { + "watchpack-2.0.1" = { name = "watchpack"; packageName = "watchpack"; - version = "2.0.0"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/watchpack/-/watchpack-2.0.0.tgz"; - sha512 = "xSdCxxYZWNk3VK13bZRYhsQpfa8Vg63zXG+3pyU8ouqSLRCv4IGXIp9Kr226q6GBkGRlZrST2wwKtjfKz2m7Cg=="; + url = "https://registry.npmjs.org/watchpack/-/watchpack-2.0.1.tgz"; + sha512 = "vO8AKGX22ZRo6PiOFM9dC0re8IcKh8Kd/aH2zeqUc6w4/jBGlTy2P7fTC6ekT0NjVeGjgU2dGC5rNstKkeLEQg=="; }; }; "watchpack-chokidar2-2.0.0" = { @@ -55337,15 +56022,6 @@ let sha512 = "GW1LjnPipFW2Y78OOab8NJlCflB7EFskMih2AHdvjbpKMeDJqEgSx24cXXXiPS65+WSwVyxtDsJH6jGX2czy+g=="; }; }; - "webpack-4.44.0" = { - name = "webpack"; - packageName = "webpack"; - version = "4.44.0"; - src = fetchurl { - url = "https://registry.npmjs.org/webpack/-/webpack-4.44.0.tgz"; - sha512 = "wAuJxK123sqAw31SpkPiPW3iKHgFUiKvO7E7UZjtdExcsRe3fgav4mvoMM7vvpjLHVoJ6a0Mtp2fzkoA13e0Zw=="; - }; - }; "webpack-4.44.1" = { name = "webpack"; packageName = "webpack"; @@ -55454,22 +56130,22 @@ let sha512 = "lgTS3Xhv1lCOKo7SA5TjKXMjpSM4sBjNV5+q2bqesbSPs5FjGmU6jjtBSkX9b4qW87vDIsCIlUPOEhbZrMdjeQ=="; }; }; - "webpack-sources-2.0.1" = { + "webpack-sources-2.2.0" = { name = "webpack-sources"; packageName = "webpack-sources"; - version = "2.0.1"; + version = "2.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/webpack-sources/-/webpack-sources-2.0.1.tgz"; - sha512 = "A9oYz7ANQBK5EN19rUXbvNgfdfZf5U2gP0769OXsj9CvYkCR6OHOsd6OKyEy4H38GGxpsQPKIL83NC64QY6Xmw=="; + url = "https://registry.npmjs.org/webpack-sources/-/webpack-sources-2.2.0.tgz"; + sha512 = "bQsA24JLwcnWGArOKUxYKhX3Mz/nK1Xf6hxullKERyktjNMC4x8koOeaDNTA2fEJ09BdWLbM/iTW0ithREUP0w=="; }; }; - "webpack-stream-5.2.1" = { + "webpack-stream-6.1.0" = { name = "webpack-stream"; packageName = "webpack-stream"; - version = "5.2.1"; + version = "6.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/webpack-stream/-/webpack-stream-5.2.1.tgz"; - sha512 = "WvyVU0K1/VB1NZ7JfsaemVdG0PXAQUqbjUNW4A58th4pULvKMQxG+y33HXTL02JvD56ko2Cub+E2NyPwrLBT/A=="; + url = "https://registry.npmjs.org/webpack-stream/-/webpack-stream-6.1.0.tgz"; + sha512 = "kFMnDzFTzyvVmn4ajaj0xEJavvYizd3I/KmQ6C5aUstcAkNwZUidxkk/uEaEPSydaAn66v8ZcP1+bhKSshNJUQ=="; }; }; "webpackbar-4.0.0" = { @@ -55517,13 +56193,13 @@ let sha512 = "OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg=="; }; }; - "webtorrent-0.108.6" = { + "webtorrent-0.110.1" = { name = "webtorrent"; packageName = "webtorrent"; - version = "0.108.6"; + version = "0.110.1"; src = fetchurl { - url = "https://registry.npmjs.org/webtorrent/-/webtorrent-0.108.6.tgz"; - sha512 = "hkwjMQTbBiwdJn3vEVjOyNwKZISp6r4GEl/J0N6Ukw2oeaETIylvAlf7G0o+a9FcFMThBIle0iCPYLTwumCOaQ=="; + url = "https://registry.npmjs.org/webtorrent/-/webtorrent-0.110.1.tgz"; + sha512 = "KLMkKbf/7G7k6ok45a/O/RGJwIyUI2I992mTp/sezY5n8P7Lh1Q00bSKI/CW4Eqile1XlQoOFMLrJLPChz/SSQ=="; }; }; "well-known-symbols-2.0.0" = { @@ -55580,15 +56256,6 @@ let sha512 = "WUu7Rg1DroM7oQvGWfOiAK21n74Gg+T4elXEQYkOhtyLeWiJFoOGLXPKI/9gzIie9CtwVLm8wtw6YJdKyxSjeg=="; }; }; - "whatwg-url-8.2.2" = { - name = "whatwg-url"; - packageName = "whatwg-url"; - version = "8.2.2"; - src = fetchurl { - url = "https://registry.npmjs.org/whatwg-url/-/whatwg-url-8.2.2.tgz"; - sha512 = "PcVnO6NiewhkmzV0qn7A+UZ9Xx4maNTI+O+TShmfE4pqjoCMwUMjkvoNhNHPTvgR7QH9Xt3R13iHuWy2sToFxQ=="; - }; - }; "whatwg-url-8.4.0" = { name = "whatwg-url"; packageName = "whatwg-url"; @@ -55877,15 +56544,6 @@ let sha1 = "64b6abf4cd01adcaefd5009393b1d8e8bec19db0"; }; }; - "winston-1.1.2" = { - name = "winston"; - packageName = "winston"; - version = "1.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/winston/-/winston-1.1.2.tgz"; - sha1 = "68edd769ff79d4f9528cf0e5d80021aade67480c"; - }; - }; "winston-2.1.1" = { name = "winston"; packageName = "winston"; @@ -56922,13 +57580,13 @@ let sha512 = "r9S/ZyXu/Xu9q1tYlpsLIsa3EeLXXk0VwlxqTcFRfg9EhMW+17kbt9G0NrgCmhGb5vT2hyhJZLfDGx+7+5Uj/w=="; }; }; - "y18n-5.0.4" = { + "y18n-5.0.5" = { name = "y18n"; packageName = "y18n"; - version = "5.0.4"; + version = "5.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/y18n/-/y18n-5.0.4.tgz"; - sha512 = "deLOfD+RvFgrpAmSZgfGdWYE+OKyHcVHaRQ7NphG/63scpRvTHHeQMAxGGvaLVGJ+HYVcCXlzcTK0ZehFf+eHQ=="; + url = "https://registry.npmjs.org/y18n/-/y18n-5.0.5.tgz"; + sha512 = "hsRUr4FFrvhhRH12wOdfs38Gy7k2FFzB9qgN9v3aLykRq0dRcdcpz5C9FxdS2NuhOrI/628b/KSTJ3rwHysYSg=="; }; }; "yaeti-0.0.6" = { @@ -57021,6 +57679,15 @@ let sha512 = "N3Tu3g4O6ZWV7W0LVsNk62DtKJDQkbnPZRDd7ntaAeEl8QkxL1vnMunI26uzDU4PwwG4tPJ8g/VRS6U+fVp/6A=="; }; }; + "yaml-language-server-parser-0.1.1" = { + name = "yaml-language-server-parser"; + packageName = "yaml-language-server-parser"; + version = "0.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/yaml-language-server-parser/-/yaml-language-server-parser-0.1.1.tgz"; + sha512 = "2PememGb1SrPqXAxXTpBD39rwYZap6CJVSvkfULNv9uwV3VHp1TfkgpsylBb+mpuuivH0JZ52lChXPvNa6yVxw=="; + }; + }; "yamljs-0.3.0" = { name = "yamljs"; packageName = "yamljs"; @@ -57486,17 +58153,17 @@ in "@angular/cli" = nodeEnv.buildNodePackage { name = "_at_angular_slash_cli"; packageName = "@angular/cli"; - version = "10.1.7"; + version = "10.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@angular/cli/-/cli-10.1.7.tgz"; - sha512 = "0tbeHnPIzSV/z+KlZT7N2J1yMnwQi4xIxvbsANrLjoAxNssse84i9BDdMZYsPoV8wbzcDhFOtt5KmfTO0GIeYQ=="; + url = "https://registry.npmjs.org/@angular/cli/-/cli-10.2.0.tgz"; + sha512 = "YBzwkFBmG6CdUJk8onsPXxHX/ByU5MERBQgYhLC873e2nZlXMUu+Ttq2Wai6apyskGvsXKxZNPOQSFZTGKXzXg=="; }; dependencies = [ - sources."@angular-devkit/architect-0.1001.7" - sources."@angular-devkit/core-10.1.7" - sources."@angular-devkit/schematics-10.1.7" - sources."@schematics/angular-10.1.7" - sources."@schematics/update-0.1001.7" + sources."@angular-devkit/architect-0.1002.0" + sources."@angular-devkit/core-10.2.0" + sources."@angular-devkit/schematics-10.2.0" + sources."@schematics/angular-10.2.0" + sources."@schematics/update-0.1002.0" sources."@yarnpkg/lockfile-1.1.0" sources."JSONStream-1.3.5" sources."agent-base-4.3.0" @@ -57512,7 +58179,7 @@ in sources."assert-plus-1.0.0" sources."asynckit-0.4.0" sources."aws-sign2-0.7.0" - sources."aws4-1.10.1" + sources."aws4-1.11.0" sources."balanced-match-1.0.0" sources."bcrypt-pbkdf-1.0.2" sources."bluebird-3.7.2" @@ -57526,6 +58193,7 @@ in sources."yallist-3.1.1" ]; }) + sources."call-bind-1.0.0" sources."caseless-0.12.0" sources."chalk-4.1.0" sources."chardet-0.7.0" @@ -57584,6 +58252,7 @@ in sources."fs.realpath-1.0.0" sources."function-bind-1.1.1" sources."genfun-5.0.0" + sources."get-intrinsic-1.0.1" sources."get-stream-4.1.0" sources."getpass-0.1.7" sources."glob-7.1.6" @@ -57619,6 +58288,7 @@ in sources."inquirer-7.3.3" sources."ip-1.1.5" sources."is-callable-1.2.2" + sources."is-core-module-2.0.0" sources."is-date-object-1.0.2" sources."is-docker-2.1.1" sources."is-fullwidth-code-point-3.0.0" @@ -57695,11 +58365,7 @@ in sources."oauth-sign-0.9.0" sources."object-inspect-1.8.0" sources."object-keys-1.1.1" - (sources."object.assign-4.1.1" // { - dependencies = [ - sources."es-abstract-1.18.0-next.1" - ]; - }) + sources."object.assign-4.1.2" sources."object.getownpropertydescriptors-2.1.0" sources."once-1.4.0" sources."onetime-5.1.2" @@ -57749,7 +58415,7 @@ in sources."uuid-3.4.0" ]; }) - sources."resolve-1.17.0" + sources."resolve-1.18.1" sources."restore-cursor-3.1.0" sources."retry-0.10.1" sources."rimraf-3.0.2" @@ -57783,8 +58449,16 @@ in sources."stream-each-1.2.3" sources."stream-shift-1.0.1" sources."string-width-4.2.0" - sources."string.prototype.trimend-1.0.1" - sources."string.prototype.trimstart-1.0.1" + (sources."string.prototype.trimend-1.0.2" // { + dependencies = [ + sources."es-abstract-1.18.0-next.1" + ]; + }) + (sources."string.prototype.trimstart-1.0.2" // { + dependencies = [ + sources."es-abstract-1.18.0-next.1" + ]; + }) (sources."string_decoder-1.1.1" // { dependencies = [ sources."safe-buffer-5.1.2" @@ -57909,7 +58583,7 @@ in sources."bops-0.0.7" sources."brace-expansion-1.1.11" sources."braces-3.0.2" - (sources."buffer-5.6.0" // { + (sources."buffer-5.7.0" // { dependencies = [ sources."base64-js-1.3.1" ]; @@ -57924,6 +58598,7 @@ in sources."pump-3.0.0" ]; }) + sources."call-bind-1.0.0" sources."camelcase-5.3.1" sources."camelcase-keys-6.2.2" sources."clean-git-ref-2.0.1" @@ -57965,8 +58640,6 @@ in ]; }) sources."end-of-stream-1.4.4" - sources."es-abstract-1.18.0-next.1" - sources."es-to-primitive-1.2.1" sources."escape-string-regexp-2.0.0" sources."esprima-4.0.1" sources."exit-on-epipe-1.0.1" @@ -57991,6 +58664,7 @@ in }) sources."fs.realpath-1.0.0" sources."function-bind-1.1.1" + sources."get-intrinsic-1.0.1" (sources."get-stream-4.1.0" // { dependencies = [ sources."pump-3.0.0" @@ -58028,22 +58702,17 @@ in sources."has-1.0.3" sources."has-symbols-1.0.1" sources."http-cache-semantics-4.1.0" - sources."ieee754-1.1.13" + sources."ieee754-1.2.1" sources."ignore-5.1.8" sources."inflight-1.0.6" sources."inherits-2.0.4" sources."is-absolute-1.0.0" sources."is-buffer-1.1.6" - sources."is-callable-1.2.2" - sources."is-date-object-1.0.2" sources."is-extglob-2.1.1" sources."is-glob-3.1.0" sources."is-negated-glob-1.0.0" - sources."is-negative-zero-2.0.0" sources."is-number-7.0.0" - sources."is-regex-1.1.1" sources."is-relative-1.0.0" - sources."is-symbol-1.0.3" sources."is-unc-path-1.0.0" sources."is-utf8-0.2.1" sources."is-valid-glob-1.0.0" @@ -58081,9 +58750,8 @@ in sources."normalize-path-2.1.1" sources."normalize-url-4.5.0" sources."now-and-later-2.0.1" - sources."object-inspect-1.8.0" sources."object-keys-1.1.1" - sources."object.assign-4.1.1" + sources."object.assign-4.1.2" sources."once-1.4.0" sources."opal-runtime-1.0.11" (sources."ordered-read-streams-1.0.1" // { @@ -58137,16 +58805,6 @@ in sources."source-map-0.6.1" sources."sprintf-js-1.0.3" sources."stream-shift-1.0.1" - (sources."string.prototype.trimend-1.0.1" // { - dependencies = [ - sources."es-abstract-1.17.7" - ]; - }) - (sources."string.prototype.trimstart-1.0.1" // { - dependencies = [ - sources."es-abstract-1.17.7" - ]; - }) sources."string_decoder-1.3.0" sources."through-2.3.8" sources."through2-4.0.2" @@ -58170,7 +58828,7 @@ in ]; }) sources."to-utf8-0.0.1" - sources."uglify-js-3.11.3" + sources."uglify-js-3.11.5" sources."unc-path-regex-0.1.2" sources."unique-stream-2.3.1" sources."universalify-0.1.2" @@ -58231,7 +58889,7 @@ in sources."async-limiter-1.0.1" sources."asynckit-0.4.0" sources."aws-sign2-0.7.0" - sources."aws4-1.10.1" + sources."aws4-1.11.0" sources."bcrypt-pbkdf-1.0.2" sources."big-integer-1.6.36" sources."browser-process-hrtime-1.0.0" @@ -58400,23 +59058,23 @@ in sources."chalk-2.4.2" ]; }) - (sources."@nestjs/schematics-7.1.2" // { + (sources."@nestjs/schematics-7.2.1" // { dependencies = [ - sources."@angular-devkit/core-9.1.12" - sources."@angular-devkit/schematics-9.1.12" - sources."ora-4.0.3" - sources."rxjs-6.5.4" + sources."@angular-devkit/core-10.2.0" + sources."@angular-devkit/schematics-10.2.0" + sources."ajv-6.12.4" + sources."rxjs-6.6.2" ]; }) sources."@schematics/schematics-0.1000.7" sources."@types/anymatch-1.3.1" sources."@types/json-schema-7.0.6" sources."@types/json5-0.0.29" - sources."@types/node-14.11.10" + sources."@types/node-14.14.6" sources."@types/parse-json-4.0.0" sources."@types/source-list-map-0.1.2" sources."@types/tapable-1.0.6" - (sources."@types/uglify-js-3.11.0" // { + (sources."@types/uglify-js-3.11.1" // { dependencies = [ sources."source-map-0.6.1" ]; @@ -58684,11 +59342,13 @@ in sources."fs-write-stream-atomic-1.0.10" sources."fs.realpath-1.0.0" sources."fsevents-2.1.3" + sources."function-bind-1.1.1" sources."get-stream-4.1.0" sources."get-value-2.0.6" sources."glob-7.1.6" sources."glob-parent-5.1.1" sources."graceful-fs-4.2.4" + sources."has-1.0.3" sources."has-flag-3.0.0" sources."has-value-1.0.0" (sources."has-values-1.0.0" // { @@ -58711,9 +59371,9 @@ in sources."hmac-drbg-1.0.1" sources."https-browserify-1.0.0" sources."iconv-lite-0.4.24" - sources."ieee754-1.1.13" + sources."ieee754-1.2.1" sources."iferr-0.1.5" - sources."import-fresh-3.2.1" + sources."import-fresh-3.2.2" sources."imurmurhash-0.1.4" sources."infer-owner-1.0.4" sources."inflight-1.0.6" @@ -58735,6 +59395,7 @@ in sources."is-arrayish-0.2.1" sources."is-binary-path-2.1.0" sources."is-buffer-1.1.6" + sources."is-core-module-2.0.0" sources."is-data-descriptor-1.0.0" sources."is-descriptor-1.0.2" sources."is-extendable-0.1.1" @@ -58755,7 +59416,11 @@ in sources."json-parse-even-better-errors-2.3.1" sources."json-schema-traverse-0.4.1" sources."json5-1.0.1" - sources."jsonfile-6.0.1" + (sources."jsonfile-6.1.0" // { + dependencies = [ + sources."universalify-2.0.0" + ]; + }) sources."kind-of-6.0.3" sources."lines-and-columns-1.1.6" sources."loader-runner-2.4.0" @@ -58919,7 +59584,7 @@ in sources."remove-trailing-separator-1.1.0" sources."repeat-element-1.1.3" sources."repeat-string-1.6.1" - sources."resolve-1.17.0" + sources."resolve-1.18.1" sources."resolve-from-4.0.0" sources."resolve-url-0.2.1" sources."restore-cursor-3.1.0" @@ -59030,7 +59695,7 @@ in }) sources."through-2.3.8" sources."through2-2.0.5" - sources."timers-browserify-2.0.11" + sources."timers-browserify-2.0.12" sources."tmp-0.0.33" sources."to-arraybuffer-1.0.1" (sources."to-object-path-0.3.0" // { @@ -59147,7 +59812,7 @@ in sources."@apollo/federation-0.20.2" (sources."@apollo/protobufjs-1.0.5" // { dependencies = [ - sources."@types/node-10.17.40" + sources."@types/node-10.17.44" ]; }) sources."@apollographql/apollo-tools-0.4.8" @@ -59157,22 +59822,22 @@ in sources."@apollographql/graphql-language-service-utils-2.0.2" sources."@apollographql/graphql-playground-html-1.6.26" sources."@babel/code-frame-7.10.4" - sources."@babel/compat-data-7.12.1" + sources."@babel/compat-data-7.12.5" (sources."@babel/core-7.12.3" // { dependencies = [ - sources."@babel/generator-7.12.1" - sources."@babel/types-7.12.1" + sources."@babel/generator-7.12.5" + sources."@babel/types-7.12.5" sources."semver-5.7.1" ]; }) (sources."@babel/generator-7.11.6" // { dependencies = [ - sources."@babel/types-7.12.1" + sources."@babel/types-7.12.5" ]; }) sources."@babel/helper-annotate-as-pure-7.10.4" sources."@babel/helper-builder-binary-assignment-operator-visitor-7.10.4" - (sources."@babel/helper-compilation-targets-7.12.1" // { + (sources."@babel/helper-compilation-targets-7.12.5" // { dependencies = [ sources."semver-5.7.1" ]; @@ -59181,12 +59846,12 @@ in sources."@babel/helper-create-regexp-features-plugin-7.12.1" (sources."@babel/helper-define-map-7.10.5" // { dependencies = [ - sources."@babel/types-7.12.1" + sources."@babel/types-7.12.5" ]; }) (sources."@babel/helper-explode-assignable-expression-7.12.1" // { dependencies = [ - sources."@babel/types-7.12.1" + sources."@babel/types-7.12.5" ]; }) sources."@babel/helper-function-name-7.10.4" @@ -59194,17 +59859,17 @@ in sources."@babel/helper-hoist-variables-7.10.4" (sources."@babel/helper-member-expression-to-functions-7.12.1" // { dependencies = [ - sources."@babel/types-7.12.1" + sources."@babel/types-7.12.5" ]; }) - (sources."@babel/helper-module-imports-7.12.1" // { + (sources."@babel/helper-module-imports-7.12.5" // { dependencies = [ - sources."@babel/types-7.12.1" + sources."@babel/types-7.12.5" ]; }) (sources."@babel/helper-module-transforms-7.12.1" // { dependencies = [ - sources."@babel/types-7.12.1" + sources."@babel/types-7.12.5" ]; }) sources."@babel/helper-optimise-call-expression-7.10.4" @@ -59212,39 +59877,39 @@ in sources."@babel/helper-regex-7.10.5" (sources."@babel/helper-remap-async-to-generator-7.12.1" // { dependencies = [ - sources."@babel/types-7.12.1" + sources."@babel/types-7.12.5" ]; }) - (sources."@babel/helper-replace-supers-7.12.1" // { + (sources."@babel/helper-replace-supers-7.12.5" // { dependencies = [ - sources."@babel/types-7.12.1" + sources."@babel/types-7.12.5" ]; }) (sources."@babel/helper-simple-access-7.12.1" // { dependencies = [ - sources."@babel/types-7.12.1" + sources."@babel/types-7.12.5" ]; }) (sources."@babel/helper-skip-transparent-expression-wrappers-7.12.1" // { dependencies = [ - sources."@babel/types-7.12.1" + sources."@babel/types-7.12.5" ]; }) (sources."@babel/helper-split-export-declaration-7.11.0" // { dependencies = [ - sources."@babel/types-7.12.1" + sources."@babel/types-7.12.5" ]; }) sources."@babel/helper-validator-identifier-7.10.4" sources."@babel/helper-validator-option-7.12.1" sources."@babel/helper-wrap-function-7.12.3" - (sources."@babel/helpers-7.12.1" // { + (sources."@babel/helpers-7.12.5" // { dependencies = [ - sources."@babel/types-7.12.1" + sources."@babel/types-7.12.5" ]; }) sources."@babel/highlight-7.10.4" - sources."@babel/parser-7.12.3" + sources."@babel/parser-7.12.5" sources."@babel/plugin-proposal-async-generator-functions-7.12.1" sources."@babel/plugin-proposal-class-properties-7.12.1" sources."@babel/plugin-proposal-dynamic-import-7.12.1" @@ -59252,7 +59917,7 @@ in sources."@babel/plugin-proposal-json-strings-7.12.1" sources."@babel/plugin-proposal-logical-assignment-operators-7.12.1" sources."@babel/plugin-proposal-nullish-coalescing-operator-7.12.1" - sources."@babel/plugin-proposal-numeric-separator-7.12.1" + sources."@babel/plugin-proposal-numeric-separator-7.12.5" sources."@babel/plugin-proposal-object-rest-spread-7.12.1" sources."@babel/plugin-proposal-optional-catch-binding-7.12.1" sources."@babel/plugin-proposal-optional-chaining-7.12.1" @@ -59308,7 +59973,7 @@ in sources."@babel/plugin-transform-unicode-regex-7.12.1" (sources."@babel/preset-env-7.12.1" // { dependencies = [ - sources."@babel/types-7.12.1" + sources."@babel/types-7.12.5" sources."semver-5.7.1" ]; }) @@ -59322,12 +59987,12 @@ in sources."semver-5.7.1" ]; }) - sources."@babel/runtime-7.12.1" + sources."@babel/runtime-7.12.5" sources."@babel/template-7.10.4" - (sources."@babel/traverse-7.12.1" // { + (sources."@babel/traverse-7.12.5" // { dependencies = [ - sources."@babel/generator-7.12.1" - sources."@babel/types-7.12.1" + sources."@babel/generator-7.12.5" + sources."@babel/types-7.12.5" ]; }) sources."@babel/types-7.10.4" @@ -59435,16 +60100,16 @@ in sources."@types/body-parser-1.19.0" sources."@types/connect-3.4.33" sources."@types/content-disposition-0.5.3" - sources."@types/cookies-0.7.4" - sources."@types/cors-2.8.7" + sources."@types/cookies-0.7.5" + sources."@types/cors-2.8.8" sources."@types/ejs-2.7.0" sources."@types/express-4.17.7" - sources."@types/express-serve-static-core-4.17.9" + sources."@types/express-serve-static-core-4.17.13" sources."@types/fs-capacitor-2.0.0" sources."@types/glob-7.1.3" (sources."@types/graphql-upload-8.0.4" // { dependencies = [ - sources."graphql-15.3.0" + sources."graphql-15.4.0" ]; }) sources."@types/http-assert-1.5.1" @@ -59458,12 +60123,12 @@ in ]; }) sources."@types/keygrip-1.0.2" - sources."@types/koa-2.11.5" + sources."@types/koa-2.11.6" sources."@types/koa-compose-3.2.5" sources."@types/long-4.0.1" sources."@types/mime-2.0.3" sources."@types/minimatch-3.0.3" - sources."@types/node-14.11.10" + sources."@types/node-14.14.6" (sources."@types/node-fetch-2.5.7" // { dependencies = [ sources."form-data-3.0.0" @@ -59472,9 +60137,9 @@ in sources."@types/normalize-package-data-2.4.0" sources."@types/qs-6.9.5" sources."@types/range-parser-1.2.3" - sources."@types/serve-static-1.13.5" + sources."@types/serve-static-1.13.6" sources."@types/through-0.0.30" - sources."@types/ws-7.2.7" + sources."@types/ws-7.2.9" sources."@types/zen-observable-0.8.1" sources."@vue/cli-shared-utils-4.5.8" (sources."@vue/cli-ui-4.5.8" // { @@ -59484,24 +60149,24 @@ in }) sources."@vue/cli-ui-addon-webpack-4.5.8" sources."@vue/cli-ui-addon-widgets-4.5.8" - (sources."@vue/compiler-core-3.0.1" // { + (sources."@vue/compiler-core-3.0.2" // { dependencies = [ - sources."@babel/types-7.12.1" + sources."@babel/types-7.12.5" sources."source-map-0.6.1" ]; }) - sources."@vue/compiler-dom-3.0.1" - (sources."@vue/compiler-sfc-3.0.1" // { + sources."@vue/compiler-dom-3.0.2" + (sources."@vue/compiler-sfc-3.0.2" // { dependencies = [ - sources."@babel/types-7.12.1" + sources."@babel/types-7.12.5" sources."source-map-0.6.1" ]; }) - sources."@vue/compiler-ssr-3.0.1" - sources."@vue/reactivity-3.0.1" - sources."@vue/runtime-core-3.0.1" - sources."@vue/runtime-dom-3.0.1" - sources."@vue/shared-3.0.1" + sources."@vue/compiler-ssr-3.0.2" + sources."@vue/reactivity-3.0.2" + sources."@vue/runtime-core-3.0.2" + sources."@vue/runtime-dom-3.0.2" + sources."@vue/shared-3.0.2" sources."@wry/context-0.4.4" sources."@wry/equality-0.1.11" sources."abbrev-1.1.1" @@ -59552,7 +60217,7 @@ in ]; }) sources."apollo-cache-1.3.5" - sources."apollo-cache-control-0.11.3" + sources."apollo-cache-control-0.11.4" sources."apollo-cache-inmemory-1.6.6" sources."apollo-client-2.6.10" (sources."apollo-codegen-core-0.38.0" // { @@ -59578,19 +60243,19 @@ in sources."apollo-link-persisted-queries-0.2.2" sources."apollo-link-state-0.4.2" sources."apollo-link-ws-1.0.20" - sources."apollo-reporting-protobuf-0.6.0" + sources."apollo-reporting-protobuf-0.6.1" sources."apollo-server-caching-0.5.2" - (sources."apollo-server-core-2.18.2" // { + (sources."apollo-server-core-2.19.0" // { dependencies = [ sources."uuid-8.3.1" ]; }) sources."apollo-server-env-2.4.5" sources."apollo-server-errors-2.4.2" - sources."apollo-server-express-2.18.2" - sources."apollo-server-plugin-base-0.10.1" - sources."apollo-server-types-0.6.0" - sources."apollo-tracing-0.11.4" + sources."apollo-server-express-2.19.0" + sources."apollo-server-plugin-base-0.10.2" + sources."apollo-server-types-0.6.1" + sources."apollo-tracing-0.12.0" sources."apollo-upload-client-11.0.0" sources."apollo-utilities-1.3.4" (sources."archive-type-4.0.0" // { @@ -59626,7 +60291,7 @@ in sources."atob-2.1.2" sources."await-to-js-2.1.1" sources."aws-sign2-0.7.0" - sources."aws4-1.10.1" + sources."aws4-1.11.0" sources."babel-core-7.0.0-bridge.0" sources."babel-plugin-dynamic-import-node-2.3.3" sources."backo2-1.0.2" @@ -59670,14 +60335,14 @@ in sources."is-fullwidth-code-point-2.0.0" sources."strip-ansi-5.2.0" sources."supports-color-7.2.0" - sources."term-size-2.2.0" + sources."term-size-2.2.1" sources."type-fest-0.8.1" ]; }) sources."brace-expansion-1.1.11" sources."braces-3.0.2" - sources."browserslist-4.14.5" - sources."buffer-5.6.0" + sources."browserslist-4.14.6" + sources."buffer-5.7.0" sources."buffer-alloc-1.2.0" sources."buffer-alloc-unsafe-1.1.0" sources."buffer-crc32-0.2.13" @@ -59697,13 +60362,14 @@ in sources."sort-keys-2.0.0" ]; }) + sources."call-bind-1.0.0" sources."call-me-maybe-1.0.1" sources."caller-callsite-2.0.0" sources."caller-path-2.0.0" sources."callsites-2.0.0" sources."camel-case-4.1.1" sources."camelcase-4.1.0" - sources."caniuse-lite-1.0.30001148" + sources."caniuse-lite-1.0.30001154" sources."capital-case-1.0.3" sources."capture-stack-trace-1.0.1" sources."cardinal-2.1.1" @@ -59911,7 +60577,7 @@ in sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" sources."ejs-2.7.4" - sources."electron-to-chromium-1.3.582" + sources."electron-to-chromium-1.3.587" sources."elegant-spinner-1.0.1" sources."emoji-regex-8.0.0" sources."emojis-list-3.0.0" @@ -59980,7 +60646,7 @@ in sources."fast-glob-3.2.4" sources."fast-json-stable-stringify-2.1.0" sources."fast-levenshtein-2.0.6" - sources."fastq-1.8.0" + sources."fastq-1.9.0" sources."fd-slicer-1.1.0" sources."figures-1.7.0" sources."file-type-8.1.0" @@ -60002,7 +60668,7 @@ in }) sources."find-up-3.0.0" sources."fkill-6.2.0" - sources."flow-parser-0.136.0" + sources."flow-parser-0.137.0" sources."for-in-1.0.2" sources."forever-agent-0.6.1" sources."form-data-2.3.3" @@ -60027,8 +60693,9 @@ in sources."generate-function-1.1.0" sources."generate-object-property-1.2.0" sources."generic-names-2.0.1" - sources."gensync-1.0.0-beta.1" + sources."gensync-1.0.0-beta.2" sources."get-caller-file-2.0.5" + sources."get-intrinsic-1.0.1" sources."get-proxy-2.1.0" sources."get-stream-4.1.0" sources."get-value-2.0.6" @@ -60096,7 +60763,7 @@ in sources."ts-invariant-0.3.3" ]; }) - sources."graphql-extensions-0.12.5" + sources."graphql-extensions-0.12.6" sources."graphql-subscriptions-1.1.0" sources."graphql-tag-2.11.0" sources."graphql-tools-4.0.8" @@ -60145,7 +60812,7 @@ in sources."iconv-lite-0.4.24" sources."icss-replace-symbols-1.1.0" sources."icss-utils-4.1.1" - sources."ieee754-1.1.13" + sources."ieee754-1.2.1" sources."ignore-5.1.8" sources."ignore-by-default-1.0.1" sources."import-fresh-2.0.0" @@ -60184,6 +60851,7 @@ in sources."is-buffer-1.1.6" sources."is-callable-1.2.2" sources."is-ci-1.2.1" + sources."is-core-module-2.0.0" sources."is-data-descriptor-1.0.0" sources."is-date-object-1.0.2" sources."is-descriptor-1.0.2" @@ -60257,7 +60925,11 @@ in sources."json-schema-traverse-0.4.1" sources."json-stringify-safe-5.0.1" sources."json5-2.1.3" - sources."jsonfile-6.0.1" + (sources."jsonfile-6.1.0" // { + dependencies = [ + sources."universalify-2.0.0" + ]; + }) sources."jsprim-1.4.1" sources."keyv-3.0.0" sources."kind-of-6.0.3" @@ -60391,7 +61063,7 @@ in sources."is-wsl-2.2.0" ]; }) - sources."node-releases-1.1.63" + sources."node-releases-1.1.65" (sources."nodemon-1.19.4" // { dependencies = [ sources."debug-3.2.6" @@ -60428,13 +61100,9 @@ in sources."object-inspect-1.8.0" sources."object-keys-1.1.1" sources."object-path-0.11.5" - sources."object-treeify-1.1.28" + sources."object-treeify-1.1.29" sources."object-visit-1.0.1" - (sources."object.assign-4.1.1" // { - dependencies = [ - sources."es-abstract-1.18.0-next.1" - ]; - }) + sources."object.assign-4.1.2" sources."object.getownpropertydescriptors-2.1.0" sources."object.pick-1.3.0" sources."on-finished-2.3.0" @@ -60576,7 +61244,7 @@ in }) sources."rechoir-0.6.2" sources."redeyed-2.1.1" - sources."regenerate-1.4.1" + sources."regenerate-1.4.2" sources."regenerate-unicode-properties-8.2.0" sources."regenerator-runtime-0.13.7" sources."regenerator-transform-0.14.5" @@ -60601,7 +61269,7 @@ in sources."request-2.88.2" sources."require-directory-2.1.1" sources."require-main-filename-2.0.0" - sources."resolve-1.17.0" + sources."resolve-1.18.1" sources."resolve-from-3.0.0" sources."resolve-url-0.2.1" sources."responselike-1.0.2" @@ -60612,7 +61280,7 @@ in sources."rimraf-3.0.2" sources."rss-parser-3.9.0" sources."run-async-2.4.1" - sources."run-parallel-1.1.9" + sources."run-parallel-1.1.10" sources."rxjs-6.6.3" sources."safe-buffer-5.2.1" sources."safe-regex-1.1.0" @@ -60650,7 +61318,7 @@ in sources."shell-quote-1.7.2" sources."shelljs-0.8.4" sources."shellwords-0.1.1" - sources."shortid-2.2.15" + sources."shortid-2.2.16" sources."signal-exit-3.0.3" sources."slash-3.0.0" sources."slice-ansi-0.0.4" @@ -60730,8 +61398,16 @@ in sources."strict-uri-encode-1.1.0" sources."string-hash-1.1.3" sources."string-width-4.2.0" - sources."string.prototype.trimend-1.0.1" - sources."string.prototype.trimstart-1.0.1" + (sources."string.prototype.trimend-1.0.2" // { + dependencies = [ + sources."es-abstract-1.18.0-next.1" + ]; + }) + (sources."string.prototype.trimstart-1.0.2" // { + dependencies = [ + sources."es-abstract-1.18.0-next.1" + ]; + }) (sources."string_decoder-1.1.1" // { dependencies = [ sources."safe-buffer-5.1.2" @@ -60917,7 +61593,7 @@ in (sources."vue-codemod-0.0.4" // { dependencies = [ sources."globby-10.0.2" - sources."vue-3.0.1" + sources."vue-3.0.2" ]; }) sources."watch-1.0.2" @@ -61102,12 +61778,12 @@ in }; dependencies = [ sources."@babel/code-frame-7.10.4" - sources."@babel/generator-7.12.1" + sources."@babel/generator-7.12.5" sources."@babel/helper-validator-identifier-7.10.4" sources."@babel/highlight-7.10.4" - sources."@babel/parser-7.12.3" + sources."@babel/parser-7.12.5" sources."@babel/template-7.10.4" - sources."@babel/types-7.12.1" + sources."@babel/types-7.12.5" sources."@webassemblyjs/ast-1.9.1" sources."@webassemblyjs/floating-point-hex-parser-1.9.1" sources."@webassemblyjs/helper-api-error-1.9.1" @@ -61192,7 +61868,7 @@ in sources."source-map-0.5.7" ]; }) - (sources."@babel/generator-7.12.1" // { + (sources."@babel/generator-7.12.5" // { dependencies = [ sources."source-map-0.5.7" ]; @@ -61200,19 +61876,19 @@ in sources."@babel/helper-function-name-7.10.4" sources."@babel/helper-get-function-arity-7.10.4" sources."@babel/helper-member-expression-to-functions-7.12.1" - sources."@babel/helper-module-imports-7.12.1" + sources."@babel/helper-module-imports-7.12.5" sources."@babel/helper-module-transforms-7.12.1" sources."@babel/helper-optimise-call-expression-7.10.4" - sources."@babel/helper-replace-supers-7.12.1" + sources."@babel/helper-replace-supers-7.12.5" sources."@babel/helper-simple-access-7.12.1" sources."@babel/helper-split-export-declaration-7.11.0" sources."@babel/helper-validator-identifier-7.10.4" - sources."@babel/helpers-7.12.1" + sources."@babel/helpers-7.12.5" sources."@babel/highlight-7.10.4" - sources."@babel/parser-7.12.3" + sources."@babel/parser-7.12.5" sources."@babel/template-7.10.4" - sources."@babel/traverse-7.12.1" - sources."@babel/types-7.12.1" + sources."@babel/traverse-7.12.5" + sources."@babel/types-7.12.5" sources."JSV-4.0.2" sources."ansi-styles-3.2.1" sources."array-unique-0.3.2" @@ -61233,7 +61909,7 @@ in sources."escape-string-regexp-1.0.5" sources."fs-extra-5.0.0" sources."function-bind-1.1.1" - sources."gensync-1.0.0-beta.1" + sources."gensync-1.0.0-beta.2" (sources."global-modules-0.2.3" // { dependencies = [ sources."is-windows-0.2.0" @@ -61253,6 +61929,7 @@ in sources."homedir-polyfill-1.0.3" sources."ini-1.3.5" sources."is-3.3.0" + sources."is-core-module-2.0.0" sources."is-windows-1.0.2" sources."isexe-2.0.0" sources."js-tokens-4.0.0" @@ -61276,7 +61953,7 @@ in sources."parse-passwd-1.0.0" sources."path-parse-1.0.6" sources."pkginfo-0.4.1" - sources."resolve-1.17.0" + sources."resolve-1.18.1" sources."safe-buffer-5.1.2" sources."sax-0.5.8" sources."semver-5.7.1" @@ -61313,7 +61990,7 @@ in dependencies = [ sources."@types/glob-7.1.3" sources."@types/minimatch-3.0.3" - sources."@types/node-14.11.10" + sources."@types/node-14.14.6" sources."balanced-match-1.0.0" sources."brace-expansion-1.1.11" sources."chromium-pickle-js-0.2.0" @@ -61362,7 +62039,7 @@ in sources."async-limiter-1.0.1" sources."asynckit-0.4.0" sources."aws-sign2-0.7.0" - sources."aws4-1.10.1" + sources."aws4-1.11.0" sources."balanced-match-1.0.0" sources."bcrypt-pbkdf-1.0.2" sources."brace-expansion-1.1.11" @@ -61531,15 +62208,18 @@ in ]; }) sources."fs.realpath-1.0.0" + sources."function-bind-1.1.1" sources."get-stdin-4.0.1" sources."glob-6.0.4" sources."graceful-fs-3.0.12" + sources."has-1.0.3" sources."hosted-git-info-2.8.8" sources."indent-string-2.1.0" sources."inflight-1.0.6" sources."inherits-2.0.4" sources."intersect-1.0.1" sources."is-arrayish-0.2.1" + sources."is-core-module-2.0.0" sources."is-finite-1.1.0" sources."is-plain-obj-1.1.0" sources."is-utf8-0.2.1" @@ -61590,7 +62270,7 @@ in sources."read-pkg-up-1.0.1" sources."redent-1.0.0" sources."repeating-2.0.1" - sources."resolve-1.17.0" + sources."resolve-1.18.1" (sources."rimraf-2.7.1" // { dependencies = [ sources."glob-7.1.6" @@ -61678,6 +62358,7 @@ in sources."buffer-xor-1.0.3" sources."builtin-status-codes-3.0.0" sources."cached-path-relative-1.0.2" + sources."call-bind-1.0.0" sources."cipher-base-1.0.4" sources."combine-source-map-0.8.0" sources."concat-map-0.0.1" @@ -61721,6 +62402,7 @@ in sources."fs.realpath-1.0.0" sources."function-bind-1.1.1" sources."get-assigned-identifiers-1.2.0" + sources."get-intrinsic-1.0.1" sources."glob-7.1.6" sources."has-1.0.3" sources."has-symbols-1.0.1" @@ -61733,7 +62415,7 @@ in sources."hmac-drbg-1.0.1" sources."htmlescape-1.1.1" sources."https-browserify-1.0.0" - sources."ieee754-1.1.13" + sources."ieee754-1.2.1" sources."inflight-1.0.6" sources."inherits-2.0.4" sources."inline-source-map-0.6.2" @@ -61741,6 +62423,7 @@ in sources."is-arguments-1.0.4" sources."is-buffer-1.1.6" sources."is-callable-1.2.2" + sources."is-core-module-2.0.0" sources."is-date-object-1.0.2" sources."is-generator-function-1.0.7" sources."is-negative-zero-2.0.0" @@ -61766,11 +62449,7 @@ in sources."object-assign-4.1.1" sources."object-inspect-1.8.0" sources."object-keys-1.1.1" - (sources."object.assign-4.1.1" // { - dependencies = [ - sources."es-abstract-1.18.0-next.1" - ]; - }) + sources."object.assign-4.1.2" sources."once-1.4.0" sources."os-browserify-0.3.0" sources."pako-1.0.11" @@ -61800,7 +62479,7 @@ in sources."string_decoder-1.1.1" ]; }) - sources."resolve-1.17.0" + sources."resolve-1.18.1" sources."ripemd160-2.0.2" sources."safe-buffer-5.2.1" sources."safer-buffer-2.1.2" @@ -61821,8 +62500,16 @@ in ]; }) sources."stream-splicer-2.0.1" - sources."string.prototype.trimend-1.0.1" - sources."string.prototype.trimstart-1.0.1" + (sources."string.prototype.trimend-1.0.2" // { + dependencies = [ + sources."es-abstract-1.18.0-next.1" + ]; + }) + (sources."string.prototype.trimstart-1.0.2" // { + dependencies = [ + sources."es-abstract-1.18.0-next.1" + ]; + }) sources."string_decoder-1.3.0" sources."subarg-1.0.0" sources."syntax-error-1.4.0" @@ -61875,7 +62562,7 @@ in sources."@protobufjs/pool-1.1.0" sources."@protobufjs/utf8-1.1.0" sources."@types/long-4.0.1" - sources."@types/node-13.13.26" + sources."@types/node-13.13.30" sources."addr-to-ip-port-1.5.1" sources."airplay-js-0.2.16" sources."ajv-6.12.6" @@ -61890,11 +62577,12 @@ in sources."assert-plus-1.0.0" sources."asynckit-0.4.0" sources."aws-sign2-0.7.0" - sources."aws4-1.10.1" + sources."aws4-1.11.0" sources."balanced-match-1.0.0" sources."base64-js-1.3.1" sources."bcrypt-pbkdf-1.0.2" sources."bencode-2.0.1" + sources."bep53-range-1.0.0" sources."bitfield-0.1.0" (sources."bittorrent-dht-6.4.2" // { dependencies = [ @@ -61906,7 +62594,7 @@ in sources."bencode-0.8.0" ]; }) - sources."blob-to-buffer-1.2.8" + sources."blob-to-buffer-1.2.9" sources."bn.js-4.11.9" sources."bncode-0.5.3" sources."brace-expansion-1.1.11" @@ -61926,7 +62614,7 @@ in }) sources."castv2-client-1.2.0" sources."chalk-1.0.0" - sources."chrome-dgram-3.0.5" + sources."chrome-dgram-3.0.6" sources."chrome-dns-1.0.1" sources."chrome-net-3.3.4" sources."chromecast-player-0.2.3" @@ -61936,7 +62624,7 @@ in sources."co-3.1.0" sources."codepage-1.4.0" sources."combined-stream-1.0.8" - sources."commander-6.1.0" + sources."commander-6.2.0" sources."compact2string-1.4.1" sources."concat-map-0.0.1" (sources."concat-stream-2.0.0" // { @@ -61991,6 +62679,7 @@ in ]; }) sources."fs.realpath-1.0.0" + sources."function-bind-1.1.1" sources."get-browser-rtc-1.0.2" sources."get-stdin-4.0.1" sources."getpass-0.1.7" @@ -61999,6 +62688,7 @@ in sources."graceful-fs-4.2.4" sources."har-schema-2.0.0" sources."har-validator-5.1.5" + sources."has-1.0.3" sources."has-ansi-1.0.3" sources."hat-0.0.3" sources."hosted-git-info-2.8.8" @@ -62014,6 +62704,7 @@ in sources."ip-set-1.0.2" sources."ipaddr.js-2.0.0" sources."is-arrayish-0.2.1" + sources."is-core-module-2.0.0" sources."is-finite-1.1.0" sources."is-typedarray-1.0.0" sources."is-utf8-0.2.1" @@ -62037,7 +62728,7 @@ in sources."long-4.0.0" sources."loud-rejection-1.6.0" sources."lru-2.0.1" - sources."magnet-uri-5.3.0" + sources."magnet-uri-5.4.0" sources."map-obj-1.0.1" (sources."mdns-js-1.0.3" // { dependencies = [ @@ -62156,11 +62847,11 @@ in sources."redent-1.0.0" sources."repeating-2.0.1" sources."request-2.88.2" - sources."resolve-1.17.0" + sources."resolve-1.18.1" sources."rimraf-2.7.1" sources."router-0.6.2" - sources."run-parallel-1.1.9" - sources."run-series-1.1.8" + sources."run-parallel-1.1.10" + sources."run-series-1.1.9" sources."rusha-0.8.13" sources."rx-2.5.3" sources."safe-buffer-5.2.1" @@ -62396,10 +63087,10 @@ in coc-css = nodeEnv.buildNodePackage { name = "coc-css"; packageName = "coc-css"; - version = "1.2.5"; + version = "1.2.6"; src = fetchurl { - url = "https://registry.npmjs.org/coc-css/-/coc-css-1.2.5.tgz"; - sha512 = "Khii6e43VV1JqSNd/UGMDmenBkFYcFKEr0WM6a8isOOWxSX8Vly/YAjVq7rbErD3mYOeJ+rxcH5/faUqIDj/9A=="; + url = "https://registry.npmjs.org/coc-css/-/coc-css-1.2.6.tgz"; + sha512 = "eVzucf/n0T9Sap+9HbKeW6XhMle1Q/2aURaE9BVTNHFW9eqFlKq72l/38NzrUYbdCpQh8foDsoKAqbFsAnBFYw=="; }; buildInputs = globalBuildInputs; meta = { @@ -62413,10 +63104,10 @@ in coc-diagnostic = nodeEnv.buildNodePackage { name = "coc-diagnostic"; packageName = "coc-diagnostic"; - version = "0.11.0"; + version = "0.12.0"; src = fetchurl { - url = "https://registry.npmjs.org/coc-diagnostic/-/coc-diagnostic-0.11.0.tgz"; - sha512 = "QdKxUVPcrX+/rkpWHjQtRePsT2tWZY586Ip7hGsn5WCP3SY/HyAfzuzk6tygC0C7VvXrV0WQd3VLIMwgpwWQnA=="; + url = "https://registry.npmjs.org/coc-diagnostic/-/coc-diagnostic-0.12.0.tgz"; + sha512 = "onUfHm8s/nisp/VtrtPwjXvljhdnYUmQwc/VmB/MsZfaJW3hDLhl4gDbBHISR+CHDHANpkItHw/dpU53V/YC6g=="; }; buildInputs = globalBuildInputs; meta = { @@ -62530,13 +63221,13 @@ in coc-html = nodeEnv.buildNodePackage { name = "coc-html"; packageName = "coc-html"; - version = "1.2.4"; + version = "1.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/coc-html/-/coc-html-1.2.4.tgz"; - sha512 = "gr0GBKeew88n8hcn4fkzIcBruhih7YAqBd7ldsYjoG2qZhjPEj/arYESFOYgooX1jYuxCpQYH526EXXzs4BGRQ=="; + url = "https://registry.npmjs.org/coc-html/-/coc-html-1.3.1.tgz"; + sha512 = "qC1BifVAAuI5cPT6fEQuP0RIjwDWqhLCH+AUJrQ7lW2IghWInjOarhj9AHWS+1cZLnsVrMMYXL6i8HZLnkRDQQ=="; }; dependencies = [ - sources."typescript-3.9.7" + sources."typescript-4.0.5" ]; buildInputs = globalBuildInputs; meta = { @@ -62568,14 +63259,14 @@ in coc-java = nodeEnv.buildNodePackage { name = "coc-java"; packageName = "coc-java"; - version = "1.4.12"; + version = "1.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/coc-java/-/coc-java-1.4.12.tgz"; - sha512 = "kKvT5ESFDOVPZ2iO4MQ2FkWj88kZqcczpQDqYD1tBgrLAGD0YnEzSzK6paI+kJYqk945X/k66Kcq5YbercvmqA=="; + url = "https://registry.npmjs.org/coc-java/-/coc-java-1.5.0.tgz"; + sha512 = "EvoHLu7a0H3NB8z3JqXUTggKNTCi28on2dsE7/EJ7AYT1i3SgPaDaU/M7lkK/mUqokbHhAKwcEZBcAr2PtRAgg=="; }; buildInputs = globalBuildInputs; meta = { - description = "Java langauage extension for coc.nvim"; + description = "Java language extension for coc.nvim"; homepage = "https://github.com/neoclide/coc-java#readme"; license = "EPL-1.0"; }; @@ -62621,10 +63312,10 @@ in coc-lists = nodeEnv.buildNodePackage { name = "coc-lists"; packageName = "coc-lists"; - version = "1.3.10"; + version = "1.3.11"; src = fetchurl { - url = "https://registry.npmjs.org/coc-lists/-/coc-lists-1.3.10.tgz"; - sha512 = "XbwltkjxhzzfN5In3w43TBKFbR1b8+3OgIldwYQOUYHlUxF1KO2mJj8ngkzKsaglIPeMYuWtWizOS02L74fKkA=="; + url = "https://registry.npmjs.org/coc-lists/-/coc-lists-1.3.11.tgz"; + sha512 = "FG0sCSIbkOe+RRikjHuDp+lFJWXyKBcDSTXDbS7T6q4dNwpkpl4+wNSkvN0tWKnXwNFd2HJt5GuFn5xj9DFK8g=="; }; buildInputs = globalBuildInputs; meta = { @@ -62645,10 +63336,10 @@ in sha512 = "KZVd2kmQjUQVLEHM9c2aXxP4AbM8sRybPtdAR6lWfIK3VGj67O2PIoG30Ro17d7BgcASVBp2Ad86azK9Op8uDw=="; }; dependencies = [ - sources."@chemzqm/neovim-5.2.6" + sources."@chemzqm/neovim-5.2.8" sources."@tootallnate/once-1.1.2" - sources."agent-base-6.0.1" - sources."arch-2.1.2" + sources."agent-base-6.0.2" + sources."arch-2.2.0" sources."async-2.6.3" sources."await-semaphore-0.1.3" sources."balanced-match-1.0.0" @@ -62660,6 +63351,7 @@ in sources."buffer-indexof-polyfill-1.0.2" sources."buffers-0.1.1" sources."bytes-3.1.0" + sources."call-bind-1.0.0" sources."chainsaw-0.1.0" sources."chownr-2.0.0" sources."clipboardy-2.3.0" @@ -62688,7 +63380,7 @@ in sources."fb-watchman-2.0.1" sources."flatted-2.0.2" sources."follow-redirects-1.13.0" - sources."fp-ts-2.8.4" + sources."fp-ts-2.8.5" sources."fs-extra-8.1.0" sources."fs-minipass-2.1.0" sources."fs.realpath-1.0.0" @@ -62699,6 +63391,7 @@ in ]; }) sources."function-bind-1.1.1" + sources."get-intrinsic-1.0.1" sources."get-stream-4.1.0" sources."glob-7.1.6" sources."graceful-fs-4.2.4" @@ -62706,7 +63399,7 @@ in sources."has-symbols-1.0.1" sources."http-proxy-agent-4.0.1" sources."https-proxy-agent-5.0.0" - sources."ieee754-1.1.13" + sources."ieee754-1.2.1" sources."inflight-1.0.6" sources."inherits-2.0.4" sources."ini-1.3.5" @@ -62754,11 +63447,7 @@ in sources."npm-run-path-2.0.2" sources."object-inspect-1.8.0" sources."object-keys-1.1.1" - (sources."object.assign-4.1.1" // { - dependencies = [ - sources."es-abstract-1.18.0-next.1" - ]; - }) + sources."object.assign-4.1.2" sources."once-1.4.0" sources."p-finally-1.0.0" sources."path-is-absolute-1.0.1" @@ -62784,8 +63473,16 @@ in sources."date-format-2.1.0" ]; }) - sources."string.prototype.trimend-1.0.1" - sources."string.prototype.trimstart-1.0.1" + (sources."string.prototype.trimend-1.0.2" // { + dependencies = [ + sources."es-abstract-1.18.0-next.1" + ]; + }) + (sources."string.prototype.trimstart-1.0.2" // { + dependencies = [ + sources."es-abstract-1.18.0-next.1" + ]; + }) sources."string_decoder-1.1.1" sources."strip-eof-1.0.0" sources."strip-json-comments-2.0.1" @@ -62835,10 +63532,10 @@ in coc-prettier = nodeEnv.buildNodePackage { name = "coc-prettier"; packageName = "coc-prettier"; - version = "1.1.17"; + version = "1.1.18"; src = fetchurl { - url = "https://registry.npmjs.org/coc-prettier/-/coc-prettier-1.1.17.tgz"; - sha512 = "KwHA9HvRs4W6OKd+aVa7/R2YzyVSogWpPUVX8wJ8vBEp5U2VHqfjwhyvN9BFEo1FEkyigXG6DI44jtq47eE5YQ=="; + url = "https://registry.npmjs.org/coc-prettier/-/coc-prettier-1.1.18.tgz"; + sha512 = "K2rny+Gy8TKZTWFpRqQ0cuH1QkrClml7cNh6A39vkQfbgmDXgaTbli/V0oWslSnVyPOtidGS3vIhZ09mukVhvw=="; }; dependencies = [ sources."@babel/code-frame-7.10.4" @@ -62915,9 +63612,9 @@ in sources."callsites-3.1.0" sources."camelcase-2.1.1" sources."camelcase-keys-2.1.0" - sources."caniuse-lite-1.0.30001148" + sources."caniuse-lite-1.0.30001154" sources."capture-stack-trace-1.0.1" - sources."ccount-1.0.5" + sources."ccount-1.1.0" sources."chalk-2.4.2" sources."character-entities-1.2.4" sources."character-entities-html4-1.1.4" @@ -63012,7 +63709,7 @@ in sources."domutils-1.7.0" sources."dot-prop-5.3.0" sources."duplexer3-0.1.4" - sources."electron-to-chromium-1.3.582" + sources."electron-to-chromium-1.3.587" sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" sources."entities-1.1.2" @@ -63133,6 +63830,7 @@ in sources."for-own-0.1.5" sources."fragment-cache-0.2.1" sources."fs.realpath-1.0.0" + sources."function-bind-1.1.1" sources."functional-red-black-tree-1.0.1" sources."get-caller-file-1.0.3" sources."get-stdin-5.0.1" @@ -63159,6 +63857,7 @@ in sources."gonzales-pe-4.3.0" sources."got-6.7.1" sources."graceful-fs-4.2.4" + sources."has-1.0.3" (sources."has-ansi-2.0.0" // { dependencies = [ sources."ansi-regex-2.1.1" @@ -63185,7 +63884,7 @@ in sources."htmlparser2-3.10.1" sources."iconv-lite-0.4.24" sources."ignore-4.0.6" - sources."import-fresh-3.2.1" + sources."import-fresh-3.2.2" sources."import-lazy-2.1.0" sources."import-local-0.1.1" sources."imurmurhash-0.1.4" @@ -63217,6 +63916,7 @@ in sources."is-arrayish-0.2.1" sources."is-buffer-1.1.6" sources."is-ci-1.2.1" + sources."is-core-module-2.0.0" (sources."is-data-descriptor-1.0.0" // { dependencies = [ sources."kind-of-6.0.3" @@ -63449,11 +64149,7 @@ in sources."prepend-http-1.0.4" sources."preserve-0.2.0" sources."prettier-2.1.2" - (sources."prettier-eslint-10.1.1" // { - dependencies = [ - sources."prettier-1.19.1" - ]; - }) + sources."prettier-eslint-11.0.0" (sources."prettier-stylelint-0.4.2" // { dependencies = [ sources."debug-3.2.6" @@ -63520,7 +64216,7 @@ in sources."require-from-string-2.0.2" sources."require-main-filename-1.0.1" sources."require-relative-0.8.7" - sources."resolve-1.17.0" + sources."resolve-1.18.1" (sources."resolve-cwd-2.0.0" // { dependencies = [ sources."resolve-from-3.0.0" @@ -63691,7 +64387,7 @@ in }) sources."trim-0.0.1" sources."trim-newlines-1.0.0" - sources."trim-trailing-lines-1.1.3" + sources."trim-trailing-lines-1.1.4" sources."trough-1.0.5" sources."tslib-1.14.1" (sources."tslint-5.20.1" // { @@ -63734,7 +64430,7 @@ in sources."use-3.1.1" sources."util-deprecate-1.0.2" sources."uuid-3.4.0" - sources."v8-compile-cache-2.1.1" + sources."v8-compile-cache-2.2.0" sources."validate-npm-package-license-3.0.4" sources."vfile-2.3.0" sources."vfile-location-2.0.6" @@ -63793,10 +64489,10 @@ in coc-python = nodeEnv.buildNodePackage { name = "coc-python"; packageName = "coc-python"; - version = "1.2.12"; + version = "1.2.13"; src = fetchurl { - url = "https://registry.npmjs.org/coc-python/-/coc-python-1.2.12.tgz"; - sha512 = "cwZ/uIJT5id6zwBE6RWC/HcGy7uw2hLjC0OyvcjFzidazH73e3fQBBoEMJNtLKgPuAJfNjo4BPu+cDsCSAkCAw=="; + url = "https://registry.npmjs.org/coc-python/-/coc-python-1.2.13.tgz"; + sha512 = "thsXkbwwJMpiGa/1GiPvFnbWtC5K8QcZvcUtoc4lU8Hf38LbywK5qRp6M7tOAabJOq5dYcIYYbPZWzGwhoZEiw=="; }; buildInputs = globalBuildInputs; meta = { @@ -63852,10 +64548,10 @@ in coc-rust-analyzer = nodeEnv.buildNodePackage { name = "coc-rust-analyzer"; packageName = "coc-rust-analyzer"; - version = "0.9.0"; + version = "0.14.0"; src = fetchurl { - url = "https://registry.npmjs.org/coc-rust-analyzer/-/coc-rust-analyzer-0.9.0.tgz"; - sha512 = "//DKmHGTR4u7tPoFBU+8apTuaXidWIJf+squdnVb/DX6J1fO9BSI6M6TBTlfY6IC1V1FOa6bUE6GNcQDyH1hYQ=="; + url = "https://registry.npmjs.org/coc-rust-analyzer/-/coc-rust-analyzer-0.14.0.tgz"; + sha512 = "2s1VTk/IgwO82Vf/YhywNUbijpdgAmUBa6+R9f8xPzl2MyYw9lKVqasxJPa3qA4CB6sqSAG5r3egP6LzqqDxbA=="; }; buildInputs = globalBuildInputs; meta = { @@ -63888,10 +64584,10 @@ in coc-snippets = nodeEnv.buildNodePackage { name = "coc-snippets"; packageName = "coc-snippets"; - version = "2.2.1"; + version = "2.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/coc-snippets/-/coc-snippets-2.2.1.tgz"; - sha512 = "iMAZLafpYJYtf+jMIoUlNqYjZkxFEflbG1aW7XiesC0c+TY8HYglN3/CnuoKu0bwWcxoktUhiRqDixuw36VRSQ=="; + url = "https://registry.npmjs.org/coc-snippets/-/coc-snippets-2.2.3.tgz"; + sha512 = "mK3oTm3gjQzV37Hq9r/bTj2N63p5tzO7IppuksQ7Yk0hURrHUzyx58PdBhfVOsD77FIo37dY1E0gOXv5t7a1dg=="; }; buildInputs = globalBuildInputs; meta = { @@ -63905,10 +64601,10 @@ in coc-solargraph = nodeEnv.buildNodePackage { name = "coc-solargraph"; packageName = "coc-solargraph"; - version = "1.1.7"; + version = "1.1.8"; src = fetchurl { - url = "https://registry.npmjs.org/coc-solargraph/-/coc-solargraph-1.1.7.tgz"; - sha512 = "+oaGgco/4VuQIAp7MqvwrMPnKXViap/W894pFodstK1FkCUpP3qc04Kt7B/8IqRTFrd5b6tAn7Nrsf5g4RffTw=="; + url = "https://registry.npmjs.org/coc-solargraph/-/coc-solargraph-1.1.8.tgz"; + sha512 = "j0/S9ycyP4cdFhTu3FGaY4t0ZSn1K5EFWi6A90nppQYPwrzSGo3tn5XDO44vaWsYhEUlQfQrXVwtFScKCdc1vg=="; }; buildInputs = globalBuildInputs; meta = { @@ -63930,27 +64626,27 @@ in dependencies = [ sources."@babel/code-frame-7.10.4" sources."@babel/core-7.12.3" - sources."@babel/generator-7.12.1" + sources."@babel/generator-7.12.5" sources."@babel/helper-function-name-7.10.4" sources."@babel/helper-get-function-arity-7.10.4" sources."@babel/helper-member-expression-to-functions-7.12.1" - sources."@babel/helper-module-imports-7.12.1" + sources."@babel/helper-module-imports-7.12.5" sources."@babel/helper-module-transforms-7.12.1" sources."@babel/helper-optimise-call-expression-7.10.4" - sources."@babel/helper-replace-supers-7.12.1" + sources."@babel/helper-replace-supers-7.12.5" sources."@babel/helper-simple-access-7.12.1" sources."@babel/helper-split-export-declaration-7.11.0" sources."@babel/helper-validator-identifier-7.10.4" - sources."@babel/helpers-7.12.1" + sources."@babel/helpers-7.12.5" (sources."@babel/highlight-7.10.4" // { dependencies = [ sources."chalk-2.4.2" ]; }) - sources."@babel/parser-7.12.3" + sources."@babel/parser-7.12.5" sources."@babel/template-7.10.4" - sources."@babel/traverse-7.12.1" - sources."@babel/types-7.12.1" + sources."@babel/traverse-7.12.5" + sources."@babel/types-7.12.5" sources."@nodelib/fs.scandir-2.1.3" sources."@nodelib/fs.stat-2.0.3" sources."@nodelib/fs.walk-1.2.4" @@ -63971,12 +64667,12 @@ in sources."balanced-match-1.0.0" sources."brace-expansion-1.1.11" sources."braces-3.0.2" - sources."browserslist-4.14.5" + sources."browserslist-4.14.6" sources."callsites-3.1.0" sources."camelcase-5.3.1" sources."camelcase-keys-6.2.2" - sources."caniuse-lite-1.0.30001148" - sources."ccount-1.0.5" + sources."caniuse-lite-1.0.30001154" + sources."ccount-1.1.0" (sources."chalk-4.1.0" // { dependencies = [ sources."ansi-styles-4.3.0" @@ -64016,7 +64712,7 @@ in sources."domelementtype-1.3.1" sources."domhandler-2.4.2" sources."domutils-1.7.0" - sources."electron-to-chromium-1.3.582" + sources."electron-to-chromium-1.3.587" sources."emoji-regex-8.0.0" sources."entities-1.1.2" sources."error-ex-1.3.2" @@ -64029,14 +64725,15 @@ in sources."fast-glob-3.2.4" sources."fast-json-stable-stringify-2.1.0" sources."fastest-levenshtein-1.0.12" - sources."fastq-1.8.0" + sources."fastq-1.9.0" sources."file-entry-cache-5.0.1" sources."fill-range-7.0.1" sources."find-up-4.1.0" sources."flat-cache-2.0.1" sources."flatted-2.0.2" sources."fs.realpath-1.0.0" - sources."gensync-1.0.0-beta.1" + sources."function-bind-1.1.1" + sources."gensync-1.0.0-beta.2" sources."get-stdin-8.0.0" sources."glob-7.1.6" sources."glob-parent-5.1.1" @@ -64047,12 +64744,13 @@ in sources."globjoin-0.1.4" sources."gonzales-pe-4.3.0" sources."hard-rejection-2.1.0" + sources."has-1.0.3" sources."has-flag-3.0.0" sources."hosted-git-info-2.8.8" sources."html-tags-3.1.0" sources."htmlparser2-3.10.1" sources."ignore-5.1.8" - (sources."import-fresh-3.2.1" // { + (sources."import-fresh-3.2.2" // { dependencies = [ sources."resolve-from-4.0.0" ]; @@ -64068,7 +64766,8 @@ in sources."is-alphanumeric-1.0.0" sources."is-alphanumerical-1.0.4" sources."is-arrayish-0.2.1" - sources."is-buffer-2.0.4" + sources."is-buffer-2.0.5" + sources."is-core-module-2.0.0" sources."is-decimal-1.0.4" sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-3.0.0" @@ -64111,7 +64810,7 @@ in }) sources."mkdirp-0.5.5" sources."ms-2.1.2" - sources."node-releases-1.1.63" + sources."node-releases-1.1.65" sources."normalize-package-data-2.5.0" sources."normalize-range-0.1.2" sources."normalize-selector-0.2.0" @@ -64169,11 +64868,11 @@ in sources."remark-stringify-8.1.1" sources."repeat-string-1.6.1" sources."replace-ext-1.0.0" - sources."resolve-1.17.0" + sources."resolve-1.18.1" sources."resolve-from-5.0.0" sources."reusify-1.0.4" sources."rimraf-2.6.3" - sources."run-parallel-1.1.9" + sources."run-parallel-1.1.10" sources."safe-buffer-5.1.2" sources."semver-5.7.1" sources."signal-exit-3.0.3" @@ -64211,25 +64910,25 @@ in sources."to-regex-range-5.0.1" sources."trim-0.0.1" sources."trim-newlines-3.0.0" - sources."trim-trailing-lines-1.1.3" + sources."trim-trailing-lines-1.1.4" sources."trough-1.0.5" sources."type-fest-0.13.1" sources."typedarray-to-buffer-3.1.5" sources."unherit-1.1.3" sources."unified-9.2.0" sources."uniq-1.0.1" - sources."unist-util-find-all-after-3.0.1" - sources."unist-util-is-4.0.2" + sources."unist-util-find-all-after-3.0.2" + sources."unist-util-is-4.0.3" sources."unist-util-remove-position-2.0.1" sources."unist-util-stringify-position-2.0.3" sources."unist-util-visit-2.0.3" sources."unist-util-visit-parents-3.1.1" sources."uri-js-4.4.0" sources."util-deprecate-1.0.2" - sources."v8-compile-cache-2.1.1" + sources."v8-compile-cache-2.2.0" sources."validate-npm-package-license-3.0.4" sources."vfile-4.2.0" - sources."vfile-location-3.1.0" + sources."vfile-location-3.2.0" sources."vfile-message-2.0.4" sources."vscode-jsonrpc-5.1.0-next.1" sources."vscode-languageserver-6.2.0-next.2" @@ -64239,7 +64938,7 @@ in ]; }) sources."vscode-languageserver-textdocument-1.0.1" - sources."vscode-languageserver-types-3.16.0-next.3" + sources."vscode-languageserver-types-3.16.0-next.4" sources."vscode-uri-2.1.2" sources."which-1.3.1" sources."wrappy-1.0.2" @@ -64301,10 +65000,13 @@ in sources."escape-string-regexp-1.0.5" sources."esprima-4.0.1" sources."fs.realpath-1.0.0" + sources."function-bind-1.1.1" sources."glob-7.1.6" + sources."has-1.0.3" sources."has-flag-3.0.0" sources."inflight-1.0.6" sources."inherits-2.0.4" + sources."is-core-module-2.0.0" sources."js-tokens-4.0.0" sources."js-yaml-3.14.0" sources."minimatch-3.0.4" @@ -64313,7 +65015,7 @@ in sources."once-1.4.0" sources."path-is-absolute-1.0.1" sources."path-parse-1.0.6" - sources."resolve-1.17.0" + sources."resolve-1.18.1" sources."semver-5.7.1" sources."sprintf-js-1.0.3" sources."supports-color-5.5.0" @@ -64369,13 +65071,13 @@ in coc-tsserver = nodeEnv.buildNodePackage { name = "coc-tsserver"; packageName = "coc-tsserver"; - version = "1.5.8"; + version = "1.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/coc-tsserver/-/coc-tsserver-1.5.8.tgz"; - sha512 = "rh1/curdq4ygQxsqPxJ7lgZR1zcEC3uWjLuDM4aiexzVAIO5QxtCFmKkfQHPzlOMHm6Gp5WvSJzgncS3Fj2Z+Q=="; + url = "https://registry.npmjs.org/coc-tsserver/-/coc-tsserver-1.6.0.tgz"; + sha512 = "mGqubDWL5kRHhcoCoAG5LyODhBEh7ORXhCTCZ1GLj7waEaHxtmFSoBlD0H4KwijvI/P+08ji/DLBfp842BPkgw=="; }; dependencies = [ - sources."typescript-4.0.3" + sources."typescript-4.0.5" ]; buildInputs = globalBuildInputs; meta = { @@ -64390,17 +65092,19 @@ in coc-vetur = nodeEnv.buildNodePackage { name = "coc-vetur"; packageName = "coc-vetur"; - version = "1.2.0"; + version = "1.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/coc-vetur/-/coc-vetur-1.2.0.tgz"; - sha512 = "JtuTM6DHU21h6j1fEeAaOtfFveLOzeqVXh9mjd53fVHws9T89wW8yV0ZsU5gz4u4g0tw7nN779sJqOEAXnmR8w=="; + url = "https://registry.npmjs.org/coc-vetur/-/coc-vetur-1.2.1.tgz"; + sha512 = "ji3UHWxiAnEwEcAxedGMxZbwKffTB+7t0zT2mKozv9wYZGgc3Rexp0Nvl3J05Cfvz+FCrSEDSaxpo+JSfdYLIQ=="; }; dependencies = [ sources."@babel/code-frame-7.10.4" sources."@babel/helper-validator-identifier-7.10.4" sources."@babel/highlight-7.10.4" - sources."@emmetio/extract-abbreviation-0.2.0" - (sources."@eslint/eslintrc-0.1.3" // { + sources."@emmetio/abbreviation-2.0.2" + sources."@emmetio/css-abbreviation-2.1.2" + sources."@emmetio/scanner-1.0.0" + (sources."@eslint/eslintrc-0.2.1" // { dependencies = [ sources."debug-4.3.0" sources."ignore-4.0.6" @@ -64415,7 +65119,7 @@ in }) sources."@nodelib/fs.stat-1.1.3" sources."@nodelib/fs.walk-1.2.4" - sources."@prettier/plugin-pug-1.9.0" + sources."@prettier/plugin-pug-1.10.1" sources."@sindresorhus/is-0.14.0" sources."@sorg/log-2.2.0" sources."@starptech/expression-parser-0.10.0" @@ -64442,7 +65146,7 @@ in sources."@types/json-schema-7.0.6" sources."@types/minimatch-3.0.3" sources."@types/minimist-1.2.0" - sources."@types/node-14.11.10" + sources."@types/node-14.14.6" sources."@types/normalize-package-data-2.4.0" sources."@types/unist-2.0.3" sources."@types/vfile-3.0.2" @@ -64540,7 +65244,7 @@ in sources."callsites-3.1.0" sources."camelcase-4.1.0" sources."camelcase-keys-4.2.0" - sources."ccount-1.0.5" + sources."ccount-1.1.0" sources."chalk-2.4.2" sources."character-entities-1.2.4" sources."character-entities-html4-1.1.4" @@ -64671,12 +65375,13 @@ in sources."duplexer3-0.1.4" sources."editorconfig-0.15.3" sources."element-helper-json-2.0.6" + sources."emmet-2.1.6" sources."emoji-regex-7.0.3" sources."end-of-stream-1.4.4" sources."enquirer-2.3.6" sources."error-ex-1.3.2" sources."escape-string-regexp-1.0.5" - (sources."eslint-7.11.0" // { + (sources."eslint-7.12.1" // { dependencies = [ sources."ansi-regex-5.0.0" sources."ansi-styles-4.3.0" @@ -64774,7 +65479,7 @@ in }) sources."fast-json-stable-stringify-2.1.0" sources."fast-levenshtein-2.0.6" - sources."fastq-1.8.0" + sources."fastq-1.9.0" sources."fault-1.0.4" sources."figures-3.2.0" sources."file-entry-cache-5.0.1" @@ -64791,7 +65496,7 @@ in sources."format-0.2.2" sources."fragment-cache-0.2.1" sources."fs.realpath-1.0.0" - sources."fsevents-2.1.3" + sources."fsevents-2.2.0" sources."function-bind-1.1.1" sources."functional-red-black-tree-1.0.1" sources."get-caller-file-1.0.3" @@ -64835,7 +65540,7 @@ in sources."hast-util-has-property-1.0.4" sources."hast-util-is-body-ok-link-1.0.4" sources."hast-util-is-element-1.1.0" - sources."hast-util-parse-selector-2.2.4" + sources."hast-util-parse-selector-2.2.5" sources."hast-util-to-string-1.0.4" sources."hast-util-whitespace-1.0.4" sources."hosted-git-info-2.8.8" @@ -64844,7 +65549,7 @@ in sources."http-cache-semantics-4.1.0" sources."iconv-lite-0.4.24" sources."ignore-3.3.10" - (sources."import-fresh-3.2.1" // { + (sources."import-fresh-3.2.2" // { dependencies = [ sources."resolve-from-4.0.0" ]; @@ -64876,8 +65581,9 @@ in sources."is-alphanumerical-1.0.4" sources."is-arrayish-0.2.1" sources."is-binary-path-2.1.0" - sources."is-buffer-2.0.4" + sources."is-buffer-2.0.5" sources."is-ci-2.0.0" + sources."is-core-module-2.0.0" sources."is-data-descriptor-1.0.0" sources."is-decimal-1.0.4" sources."is-descriptor-1.0.2" @@ -65149,7 +65855,7 @@ in sources."require-directory-2.1.1" sources."require-main-filename-1.0.1" sources."require-relative-0.8.7" - sources."resolve-1.17.0" + sources."resolve-1.18.1" sources."resolve-from-5.0.0" sources."resolve-url-0.2.1" sources."responselike-1.0.2" @@ -65158,13 +65864,13 @@ in sources."reusify-1.0.4" sources."rimraf-2.6.3" sources."run-async-2.4.1" - sources."run-parallel-1.1.9" + sources."run-parallel-1.1.10" sources."rxjs-6.6.3" sources."s.color-0.0.13" sources."safe-buffer-5.1.2" sources."safe-regex-1.1.0" sources."safer-buffer-2.1.2" - sources."sass-formatter-0.4.15" + sources."sass-formatter-0.5.1" sources."sax-1.2.4" sources."semver-5.7.1" sources."semver-diff-2.1.0" @@ -65291,7 +65997,7 @@ in sources."stylus-supremacy-2.14.5" sources."suf-cli-0.1.3" sources."suf-node-1.2.1" - sources."suf-regex-0.0.23" + sources."suf-regex-0.0.25" sources."supports-color-5.5.0" sources."symbol-0.2.3" (sources."table-5.4.6" // { @@ -65317,7 +66023,7 @@ in sources."to-vfile-6.1.0" sources."trim-0.0.1" sources."trim-newlines-2.0.0" - sources."trim-trailing-lines-1.1.3" + sources."trim-trailing-lines-1.1.4" sources."trough-1.0.5" sources."tslib-1.14.1" (sources."tslint-5.20.1" // { @@ -65329,7 +66035,7 @@ in sources."type-check-0.4.0" sources."type-fest-0.3.1" sources."typedarray-0.0.6" - sources."typescript-4.0.3" + sources."typescript-4.0.5" sources."unherit-1.1.3" (sources."unified-7.1.0" // { dependencies = [ @@ -65383,7 +66089,7 @@ in sources."use-3.1.1" sources."user-home-2.0.0" sources."util-deprecate-1.0.2" - sources."v8-compile-cache-2.1.1" + sources."v8-compile-cache-2.2.0" sources."validate-npm-package-license-3.0.4" sources."vfile-4.2.0" sources."vfile-location-2.0.6" @@ -65400,13 +66106,13 @@ in }) sources."vfile-sort-2.2.2" sources."vfile-statistics-1.1.4" - sources."vls-0.5.4" - (sources."vscode-css-languageservice-4.3.3" // { + sources."vls-0.5.5" + (sources."vscode-css-languageservice-4.3.5" // { dependencies = [ sources."vscode-languageserver-types-3.16.0-next.2" ]; }) - (sources."vscode-emmet-helper-2.0.5" // { + (sources."vscode-emmet-helper-2.1.1" // { dependencies = [ sources."vscode-languageserver-types-3.15.1" ]; @@ -65416,7 +66122,7 @@ in sources."vscode-languageserver-protocol-3.16.0-next.7" sources."vscode-languageserver-textdocument-1.0.1" sources."vscode-languageserver-types-3.16.0-next.3" - sources."vscode-nls-4.1.2" + sources."vscode-nls-5.0.0" sources."vscode-uri-2.1.2" sources."vscode-web-custom-data-0.3.1" (sources."vue-eslint-parser-7.1.1" // { @@ -65524,7 +66230,7 @@ in sources."prettier-2.0.5" sources."request-light-0.2.5" sources."sprintf-js-1.0.3" - (sources."vscode-json-languageservice-3.9.1" // { + (sources."vscode-json-languageservice-3.10.0" // { dependencies = [ sources."vscode-languageserver-types-3.16.0-next.2" sources."vscode-nls-5.0.0" @@ -65643,41 +66349,39 @@ in configurable-http-proxy = nodeEnv.buildNodePackage { name = "configurable-http-proxy"; packageName = "configurable-http-proxy"; - version = "4.2.1"; + version = "4.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/configurable-http-proxy/-/configurable-http-proxy-4.2.1.tgz"; - sha512 = "43JESj3abbSnIu1B3pdyTxX2pfMT+wUgVSuCRItBq9HHops0anoxWOnbV1vRk6myeuHElB41wX4Q6QF+d/r8PQ=="; + url = "https://registry.npmjs.org/configurable-http-proxy/-/configurable-http-proxy-4.2.2.tgz"; + sha512 = "sG/P4fxVzz7lTzKjIg1MmnNF5ChW1+zk/LpLxdNgCHlgAMlQTAC12UqBtkFrczGQ6SapsvB3x4VbKLjdrcrjhA=="; }; dependencies = [ - sources."async-2.6.3" + sources."@dabh/diagnostics-2.0.2" + sources."async-3.2.0" sources."color-3.0.0" sources."color-convert-1.9.3" sources."color-name-1.1.3" sources."color-string-1.5.4" - sources."colornames-1.1.1" sources."colors-1.4.0" sources."colorspace-1.1.2" - sources."commander-4.1.1" + sources."commander-6.1.0" sources."core-util-is-1.0.2" - sources."diagnostics-1.1.1" - sources."enabled-1.0.2" - sources."env-variable-0.0.6" + sources."enabled-2.0.0" sources."eventemitter3-4.0.7" sources."fast-safe-stringify-2.0.7" sources."fecha-4.2.0" + sources."fn.name-1.1.0" sources."follow-redirects-1.13.0" sources."http-proxy-1.18.1" sources."inherits-2.0.4" sources."is-arrayish-0.3.2" - sources."is-stream-1.1.0" + sources."is-stream-2.0.0" sources."isarray-1.0.0" - sources."kuler-1.0.1" - sources."lodash-4.17.20" + sources."kuler-2.0.0" sources."logform-2.2.0" sources."lynx-0.2.0" sources."mersenne-0.0.4" sources."ms-2.1.2" - sources."one-time-0.0.4" + sources."one-time-1.0.0" sources."process-nextick-args-2.0.1" sources."readable-stream-3.6.0" sources."requires-port-1.0.0" @@ -65690,7 +66394,7 @@ in sources."text-hex-1.0.0" sources."triple-beam-1.3.0" sources."util-deprecate-1.0.2" - sources."winston-3.2.1" + sources."winston-3.3.3" (sources."winston-transport-4.4.0" // { dependencies = [ sources."readable-stream-2.3.7" @@ -65745,7 +66449,7 @@ in sources."asynckit-0.4.0" sources."at-least-node-1.0.0" sources."aws-sign2-0.7.0" - sources."aws4-1.10.1" + sources."aws4-1.11.0" sources."balanced-match-1.0.0" sources."base64-js-1.3.1" sources."bcrypt-pbkdf-1.0.2" @@ -65854,7 +66558,7 @@ in sources."escape-html-1.0.3" sources."escape-string-regexp-1.0.5" sources."etag-1.8.1" - sources."execa-4.0.3" + sources."execa-4.1.0" sources."express-4.17.1" sources."extend-3.0.2" (sources."external-editor-3.1.0" // { @@ -65867,7 +66571,7 @@ in sources."fast-glob-3.2.4" sources."fast-json-parse-1.0.3" sources."fast-json-stable-stringify-2.1.0" - sources."fastq-1.8.0" + sources."fastq-1.9.0" sources."figures-2.0.0" sources."fill-range-7.0.1" sources."finalhandler-1.1.2" @@ -65878,6 +66582,7 @@ in sources."fresh-0.5.2" sources."fs-extra-9.0.1" sources."fs.realpath-1.0.0" + sources."function-bind-1.1.1" sources."get-stream-5.2.0" sources."getpass-0.1.7" sources."glob-7.1.6" @@ -65892,6 +66597,7 @@ in sources."graceful-fs-4.2.4" sources."har-schema-2.0.0" sources."har-validator-5.1.5" + sources."has-1.0.3" sources."has-flag-4.0.0" sources."has-yarn-2.1.0" sources."hosted-git-info-3.0.7" @@ -65905,7 +66611,7 @@ in sources."human-signals-1.1.1" sources."iconv-lite-0.4.24" sources."ignore-5.1.8" - sources."import-fresh-3.2.1" + sources."import-fresh-3.2.2" sources."import-lazy-2.1.0" sources."imurmurhash-0.1.4" sources."inflight-1.0.6" @@ -65942,6 +66648,7 @@ in sources."ip-regex-2.1.0" sources."ipaddr.js-1.9.1" sources."is-ci-2.0.0" + sources."is-core-module-2.0.0" sources."is-docker-2.1.1" sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-2.0.0" @@ -65964,7 +66671,11 @@ in sources."json-schema-0.2.3" sources."json-schema-traverse-0.4.1" sources."json-stringify-safe-5.0.1" - sources."jsonfile-6.0.1" + (sources."jsonfile-6.1.0" // { + dependencies = [ + sources."universalify-2.0.0" + ]; + }) (sources."jsprim-1.4.1" // { dependencies = [ sources."extsprintf-1.3.0" @@ -66058,7 +66769,7 @@ in sources."psl-1.8.0" sources."pump-3.0.0" sources."punycode-2.1.1" - sources."pupa-2.0.1" + sources."pupa-2.1.1" sources."q-1.5.1" sources."qs-6.7.0" sources."range-parser-1.2.1" @@ -66079,7 +66790,7 @@ in sources."tough-cookie-2.5.0" ]; }) - sources."resolve-1.17.0" + sources."resolve-1.18.1" sources."resolve-from-4.0.0" sources."responselike-1.0.2" (sources."restore-cursor-2.0.0" // { @@ -66091,7 +66802,7 @@ in sources."reusify-1.0.4" sources."rimraf-3.0.2" sources."run-async-2.4.1" - sources."run-parallel-1.1.9" + sources."run-parallel-1.1.10" sources."rxjs-6.6.3" sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" @@ -66135,8 +66846,8 @@ in sources."strip-final-newline-2.0.0" sources."strip-json-comments-2.0.1" sources."supports-color-7.2.0" - sources."systeminformation-4.27.10" - sources."term-size-2.2.0" + sources."systeminformation-4.27.11" + sources."term-size-2.2.1" sources."through-2.3.8" sources."tmp-0.2.1" sources."to-readable-stream-1.0.0" @@ -66222,7 +66933,7 @@ in sources."@types/glob-7.1.3" sources."@types/minimatch-3.0.3" sources."@types/minimist-1.2.0" - sources."@types/node-14.11.10" + sources."@types/node-14.14.6" sources."@types/normalize-package-data-2.4.0" sources."aggregate-error-3.1.0" sources."ansi-styles-3.2.1" @@ -66329,6 +67040,7 @@ in sources."for-in-1.0.2" sources."fragment-cache-0.2.1" sources."fs.realpath-1.0.0" + sources."function-bind-1.1.1" sources."get-value-2.0.6" sources."glob-7.1.6" (sources."glob-parent-3.1.0" // { @@ -66340,6 +67052,7 @@ in sources."globby-9.2.0" sources."graceful-fs-4.2.4" sources."hard-rejection-2.1.0" + sources."has-1.0.3" sources."has-flag-3.0.0" (sources."has-glob-1.0.0" // { dependencies = [ @@ -66360,6 +67073,7 @@ in sources."is-accessor-descriptor-1.0.0" sources."is-arrayish-0.2.1" sources."is-buffer-1.1.6" + sources."is-core-module-2.0.0" sources."is-data-descriptor-1.0.0" sources."is-descriptor-1.0.2" sources."is-extendable-0.1.1" @@ -66469,7 +67183,7 @@ in sources."regex-not-1.0.2" sources."repeat-element-1.1.3" sources."repeat-string-1.6.1" - sources."resolve-1.17.0" + sources."resolve-1.18.1" sources."resolve-url-0.2.1" sources."ret-0.1.15" sources."safe-regex-1.1.0" @@ -66590,7 +67304,7 @@ in sources."@cycle/run-3.4.0" sources."@cycle/time-0.10.1" sources."@types/cookiejar-2.1.2" - sources."@types/node-14.11.10" + sources."@types/node-14.14.6" sources."@types/superagent-3.8.2" sources."ansi-escapes-3.2.0" sources."ansi-regex-2.1.1" @@ -66734,34 +67448,35 @@ in create-react-app = nodeEnv.buildNodePackage { name = "create-react-app"; packageName = "create-react-app"; - version = "3.4.1"; + version = "4.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/create-react-app/-/create-react-app-3.4.1.tgz"; - sha512 = "i0Zxiqj8Q2tMJkMousrZdB/vlvtoAZyN49bgAfM4yHhWQUzrpM1rZU7TX1Rg5bbDQ1R8Gk/usNnpkDzEHJdVXg=="; + url = "https://registry.npmjs.org/create-react-app/-/create-react-app-4.0.0.tgz"; + sha512 = "TonJ7eOtCbqURfE8VaHKXHPvsFMNrya+0XZMvpGAiQ8Snlig70BfZi0CUr0MNM8WQxap1xe3GivtKOBwuQsRCg=="; }; dependencies = [ sources."ansi-escapes-4.3.1" sources."ansi-regex-5.0.0" sources."ansi-styles-4.3.0" + sources."at-least-node-1.0.0" sources."balanced-match-1.0.0" sources."block-stream-0.0.9" sources."brace-expansion-1.1.11" sources."buffer-from-0.1.2" sources."builtins-1.0.3" - sources."chalk-3.0.0" + sources."chalk-4.1.0" sources."chardet-0.7.0" sources."cli-cursor-3.1.0" - sources."cli-width-2.2.1" + sources."cli-width-3.0.0" sources."color-convert-2.0.1" sources."color-name-1.1.4" - sources."commander-4.1.0" + sources."commander-4.1.1" sources."concat-map-0.0.1" sources."core-util-is-1.0.2" - sources."cross-spawn-7.0.1" + sources."cross-spawn-7.0.3" sources."debug-2.6.9" sources."duplexer2-0.0.2" sources."emoji-regex-8.0.0" - sources."envinfo-7.5.0" + sources."envinfo-7.7.3" sources."escape-string-regexp-1.0.5" (sources."external-editor-3.1.0" // { dependencies = [ @@ -66769,7 +67484,7 @@ in ]; }) sources."figures-3.2.0" - sources."fs-extra-8.1.0" + sources."fs-extra-9.0.1" sources."fs.realpath-1.0.0" sources."fstream-1.0.12" sources."fstream-ignore-1.0.5" @@ -66780,20 +67495,15 @@ in sources."iconv-lite-0.4.24" sources."inflight-1.0.6" sources."inherits-2.0.4" - (sources."inquirer-7.0.4" // { - dependencies = [ - sources."ansi-styles-3.2.1" - sources."chalk-2.4.2" - sources."color-convert-1.9.3" - sources."color-name-1.1.3" - sources."has-flag-3.0.0" - sources."supports-color-5.5.0" - ]; - }) + sources."inquirer-7.3.3" sources."is-fullwidth-code-point-3.0.0" sources."isarray-0.0.1" sources."isexe-2.0.0" - sources."jsonfile-4.0.0" + (sources."jsonfile-6.1.0" // { + dependencies = [ + sources."universalify-2.0.0" + ]; + }) sources."lodash-4.17.20" sources."mimic-fn-2.1.0" sources."minimatch-3.0.4" @@ -66814,21 +67524,13 @@ in sources."rxjs-6.6.3" sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" - sources."semver-6.3.0" + sources."semver-7.3.2" sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" sources."signal-exit-3.0.3" - (sources."string-width-4.2.0" // { - dependencies = [ - sources."strip-ansi-6.0.0" - ]; - }) + sources."string-width-4.2.0" sources."string_decoder-0.10.31" - (sources."strip-ansi-5.2.0" // { - dependencies = [ - sources."ansi-regex-4.1.0" - ]; - }) + sources."strip-ansi-6.0.0" sources."supports-color-7.2.0" sources."tar-2.2.2" (sources."tar-pack-3.4.1" // { @@ -66844,11 +67546,15 @@ in sources."readable-stream-1.0.34" ]; }) - sources."tmp-0.1.0" + (sources."tmp-0.2.1" // { + dependencies = [ + sources."rimraf-3.0.2" + ]; + }) sources."tslib-1.14.1" sources."type-fest-0.11.0" sources."uid-number-0.0.6" - sources."universalify-0.1.2" + sources."universalify-1.0.0" sources."util-deprecate-1.0.2" sources."validate-npm-package-name-3.0.0" sources."which-2.0.2" @@ -66942,7 +67648,7 @@ in sources."atob-2.1.2" sources."atomic-batcher-1.0.2" sources."aws-sign2-0.7.0" - sources."aws4-1.10.1" + sources."aws4-1.11.0" sources."balanced-match-1.0.0" (sources."base-0.11.2" // { dependencies = [ @@ -66984,7 +67690,7 @@ in sources."capture-stack-trace-1.0.1" sources."caseless-0.12.0" sources."chalk-2.4.2" - sources."chrome-dgram-3.0.5" + sources."chrome-dgram-3.0.6" sources."chrome-dns-1.0.1" sources."chrome-net-3.3.4" sources."ci-info-1.6.0" @@ -67359,7 +68065,7 @@ in sources."ret-0.1.15" sources."revalidator-0.1.8" sources."rimraf-2.7.1" - sources."run-series-1.1.8" + sources."run-series-1.1.9" sources."rusha-0.8.13" sources."safe-buffer-5.2.1" sources."safe-regex-1.1.0" @@ -67605,7 +68311,7 @@ in sources."del-6.0.0" sources."dir-glob-3.0.1" sources."fast-glob-3.2.4" - sources."fastq-1.8.0" + sources."fastq-1.9.0" sources."fill-range-7.0.1" sources."find-up-4.1.0" sources."fs.realpath-1.0.0" @@ -67639,7 +68345,7 @@ in sources."picomatch-2.2.2" sources."reusify-1.0.4" sources."rimraf-3.0.2" - sources."run-parallel-1.1.9" + sources."run-parallel-1.1.10" sources."rxjs-6.6.3" sources."slash-3.0.0" sources."temp-dir-2.0.0" @@ -67700,10 +68406,10 @@ in elasticdump = nodeEnv.buildNodePackage { name = "elasticdump"; packageName = "elasticdump"; - version = "6.33.4"; + version = "6.34.0"; src = fetchurl { - url = "https://registry.npmjs.org/elasticdump/-/elasticdump-6.33.4.tgz"; - sha512 = "DrZNU3pm9PCWpP8yOut7XP0UTpu+bIzfvR4FCFbefN/kI87e9BNQ44rcZIf6R3B9KhVzKhByCw7mzkTwk+oy7g=="; + url = "https://registry.npmjs.org/elasticdump/-/elasticdump-6.34.0.tgz"; + sha512 = "YpMFwMv6BhUg4xC1eJRkBzqonsOFf/gsSjOP3Dr6S89USW3DNrY4UTZn0D7rrfpCkSZPDDcEwqy5rpcfSNYN9Q=="; }; dependencies = [ sources."JSONStream-1.3.5" @@ -67712,9 +68418,9 @@ in sources."assert-plus-1.0.0" sources."async-2.6.3" sources."asynckit-0.4.0" - sources."aws-sdk-2.773.0" + sources."aws-sdk-2.784.0" sources."aws-sign2-0.7.0" - sources."aws4-1.10.1" + sources."aws4-1.11.0" sources."base64-js-1.3.1" sources."bcrypt-pbkdf-1.0.2" sources."big.js-5.2.2" @@ -67857,40 +68563,40 @@ in dependencies = [ sources."@babel/code-frame-7.10.4" sources."@babel/core-7.12.3" - sources."@babel/generator-7.12.1" + sources."@babel/generator-7.12.5" sources."@babel/helper-annotate-as-pure-7.10.4" sources."@babel/helper-builder-react-jsx-7.10.4" - sources."@babel/helper-builder-react-jsx-experimental-7.12.1" + sources."@babel/helper-builder-react-jsx-experimental-7.12.4" sources."@babel/helper-function-name-7.10.4" sources."@babel/helper-get-function-arity-7.10.4" sources."@babel/helper-member-expression-to-functions-7.12.1" - sources."@babel/helper-module-imports-7.12.1" + sources."@babel/helper-module-imports-7.12.5" sources."@babel/helper-module-transforms-7.12.1" sources."@babel/helper-optimise-call-expression-7.10.4" sources."@babel/helper-plugin-utils-7.10.4" - sources."@babel/helper-replace-supers-7.12.1" + sources."@babel/helper-replace-supers-7.12.5" sources."@babel/helper-simple-access-7.12.1" sources."@babel/helper-split-export-declaration-7.11.0" sources."@babel/helper-validator-identifier-7.10.4" - sources."@babel/helpers-7.12.1" + sources."@babel/helpers-7.12.5" sources."@babel/highlight-7.10.4" - sources."@babel/parser-7.12.3" + sources."@babel/parser-7.12.5" sources."@babel/plugin-proposal-object-rest-spread-7.12.1" sources."@babel/plugin-syntax-jsx-7.12.1" sources."@babel/plugin-syntax-object-rest-spread-7.8.3" sources."@babel/plugin-transform-destructuring-7.12.1" sources."@babel/plugin-transform-parameters-7.12.1" - sources."@babel/plugin-transform-react-jsx-7.12.1" + sources."@babel/plugin-transform-react-jsx-7.12.5" sources."@babel/template-7.10.4" - sources."@babel/traverse-7.12.1" - sources."@babel/types-7.12.1" - sources."@sindresorhus/is-3.1.2" + sources."@babel/traverse-7.12.5" + sources."@babel/types-7.12.5" + sources."@sindresorhus/is-4.0.0" sources."@szmarczak/http-timer-4.0.5" sources."@types/cacheable-request-6.0.1" sources."@types/http-cache-semantics-4.0.0" sources."@types/keyv-3.1.1" sources."@types/minimist-1.2.0" - sources."@types/node-14.11.10" + sources."@types/node-14.14.6" sources."@types/normalize-package-data-2.4.0" sources."@types/responselike-1.0.0" sources."@types/yoga-layout-1.9.2" @@ -67902,10 +68608,10 @@ in }) sources."ansi-regex-5.0.0" sources."ansi-styles-3.2.1" - sources."arch-2.1.2" + sources."arch-2.2.0" sources."arrify-1.0.1" sources."astral-regex-2.0.0" - sources."atomically-1.5.0" + sources."atomically-1.6.0" sources."auto-bind-4.0.0" sources."balanced-match-1.0.0" sources."brace-expansion-1.1.11" @@ -67971,12 +68677,14 @@ in sources."find-cache-dir-3.3.1" sources."find-up-3.0.0" sources."fs.realpath-1.0.0" - sources."gensync-1.0.0-beta.1" + sources."function-bind-1.1.1" + sources."gensync-1.0.0-beta.2" sources."get-stream-4.1.0" sources."glob-7.1.6" sources."globals-11.12.0" - sources."got-11.7.0" + sources."got-11.8.0" sources."hard-rejection-2.1.0" + sources."has-1.0.3" sources."has-flag-3.0.0" sources."hosted-git-info-2.8.8" sources."http-cache-semantics-4.1.0" @@ -67985,7 +68693,7 @@ in sources."indent-string-4.0.0" sources."inflight-1.0.6" sources."inherits-2.0.4" - (sources."ink-3.0.7" // { + (sources."ink-3.0.8" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.0" @@ -68008,6 +68716,7 @@ in }) sources."is-arrayish-0.2.1" sources."is-ci-2.0.0" + sources."is-core-module-2.0.0" sources."is-docker-2.1.1" sources."is-fullwidth-code-point-3.0.0" sources."is-obj-2.0.0" @@ -68086,7 +68795,7 @@ in sources."punycode-2.1.1" sources."quick-lru-5.1.1" sources."react-16.14.0" - sources."react-devtools-core-4.8.2" + sources."react-devtools-core-4.9.0" sources."react-is-16.13.1" sources."react-reconciler-0.24.0" (sources."read-pkg-5.2.0" // { @@ -68104,7 +68813,7 @@ in ]; }) sources."redent-3.0.0" - sources."resolve-1.17.0" + sources."resolve-1.18.1" sources."resolve-alpn-1.0.0" sources."resolve-from-3.0.0" sources."responselike-2.0.0" @@ -68197,23 +68906,28 @@ in "epgstation-../../applications/video/epgstation" = nodeEnv.buildNodePackage { name = "EPGStation"; packageName = "EPGStation"; - version = "1.7.4"; + version = "1.7.5"; src = ../../applications/video/epgstation; dependencies = [ sources."@babel/code-frame-7.10.4" sources."@babel/helper-validator-identifier-7.10.4" - sources."@babel/highlight-7.10.4" + (sources."@babel/highlight-7.10.4" // { + dependencies = [ + sources."ansi-styles-3.2.1" + sources."chalk-2.4.2" + sources."supports-color-5.5.0" + ]; + }) sources."@fluentui/date-time-utilities-7.9.0" sources."@fluentui/dom-utilities-1.1.1" sources."@fluentui/keyboard-key-0.2.12" - sources."@fluentui/react-7.147.1" - sources."@fluentui/react-focus-7.16.13" - sources."@fluentui/react-window-provider-0.3.3" - sources."@fluentui/theme-1.5.1" + sources."@fluentui/react-7.149.3" + sources."@fluentui/react-focus-7.16.16" + sources."@fluentui/react-window-provider-1.0.1" + sources."@fluentui/theme-1.5.4" (sources."@gulp-sourcemaps/identity-map-1.0.2" // { dependencies = [ sources."normalize-path-2.1.1" - sources."source-map-0.6.1" ]; }) (sources."@gulp-sourcemaps/map-sources-1.0.0" // { @@ -68221,7 +68935,7 @@ in sources."normalize-path-2.1.1" ]; }) - sources."@microsoft/load-themed-styles-1.10.114" + sources."@microsoft/load-themed-styles-1.10.125" sources."@nodelib/fs.scandir-2.1.3" sources."@nodelib/fs.stat-2.0.3" sources."@nodelib/fs.walk-1.2.4" @@ -68231,44 +68945,48 @@ in sources."@types/basic-auth-1.1.3" sources."@types/body-parser-1.19.0" sources."@types/caseless-0.12.2" - sources."@types/chart.js-2.9.23" + sources."@types/chart.js-2.9.24" sources."@types/connect-3.4.33" sources."@types/engine.io-3.1.4" - sources."@types/express-4.17.7" + sources."@types/express-4.17.8" sources."@types/express-serve-static-core-4.17.13" sources."@types/fancy-log-1.3.0" sources."@types/glob-7.1.3" - sources."@types/hls.js-0.13.0" + sources."@types/hls.js-0.13.1" sources."@types/js-yaml-3.12.5" sources."@types/json-schema-7.0.6" - sources."@types/lodash-4.14.158" + sources."@types/lodash-4.14.161" sources."@types/material-design-lite-1.1.16" sources."@types/mime-2.0.3" sources."@types/minimatch-3.0.3" sources."@types/minimist-1.2.0" sources."@types/mithril-2.0.3" sources."@types/mkdirp-1.0.1" - sources."@types/multer-1.4.3" + sources."@types/multer-1.4.4" sources."@types/mysql-2.15.15" - sources."@types/node-14.0.26" - sources."@types/pg-7.14.4" + sources."@types/node-14.11.1" + sources."@types/pg-7.14.5" sources."@types/pg-types-1.11.5" sources."@types/qs-6.9.5" sources."@types/range-parser-1.2.3" - sources."@types/request-2.48.5" - sources."@types/serve-static-1.13.5" - sources."@types/socket.io-2.1.10" + (sources."@types/request-2.48.5" // { + dependencies = [ + sources."form-data-2.5.1" + ]; + }) + sources."@types/serve-static-1.13.6" + sources."@types/socket.io-2.1.11" sources."@types/socket.io-client-1.4.33" sources."@types/sqlite3-3.1.6" sources."@types/tough-cookie-4.0.0" sources."@types/url-join-4.0.0" - sources."@uifabric/foundation-7.9.14" - sources."@uifabric/icons-7.5.12" + sources."@uifabric/foundation-7.9.18" + sources."@uifabric/icons-7.5.15" sources."@uifabric/merge-styles-7.19.1" - sources."@uifabric/react-hooks-7.13.6" + sources."@uifabric/react-hooks-7.13.9" sources."@uifabric/set-version-7.0.23" - sources."@uifabric/styling-7.16.13" - sources."@uifabric/utilities-7.32.4" + sources."@uifabric/styling-7.16.16" + sources."@uifabric/utilities-7.33.2" sources."@webassemblyjs/ast-1.9.0" sources."@webassemblyjs/floating-point-hex-parser-1.9.0" sources."@webassemblyjs/helper-api-error-1.9.0" @@ -68303,7 +69021,7 @@ in sources."ansi-gray-0.1.1" sources."ansi-red-0.1.1" sources."ansi-regex-2.1.1" - sources."ansi-styles-3.2.1" + sources."ansi-styles-2.2.1" sources."ansi-wrap-0.1.0" (sources."anymatch-2.0.0" // { dependencies = [ @@ -68331,7 +69049,13 @@ in sources."append-field-1.0.0" sources."aproba-1.2.0" sources."archy-1.0.0" - sources."are-we-there-yet-1.1.5" + (sources."are-we-there-yet-1.1.5" // { + dependencies = [ + sources."isarray-1.0.0" + sources."readable-stream-2.3.7" + sources."string_decoder-1.1.1" + ]; + }) sources."argparse-1.0.10" sources."aribts-2.1.12" sources."arr-diff-4.0.0" @@ -68382,7 +69106,7 @@ in sources."at-least-node-1.0.0" sources."atob-2.1.2" sources."aws-sign2-0.7.0" - sources."aws4-1.10.1" + sources."aws4-1.11.0" sources."b24.js-1.0.3" sources."babel-polyfill-6.23.0" (sources."babel-runtime-6.26.0" // { @@ -68426,12 +69150,12 @@ in }) (sources."browserify-sign-4.2.1" // { dependencies = [ - sources."readable-stream-3.6.0" + sources."inherits-2.0.4" sources."safe-buffer-5.2.1" ]; }) sources."browserify-zlib-0.2.0" - sources."buffer-4.9.2" + sources."buffer-5.7.0" sources."buffer-equal-1.0.0" sources."buffer-from-1.1.1" sources."buffer-writer-2.0.0" @@ -68440,7 +69164,6 @@ in sources."builtin-status-codes-3.0.0" (sources."busboy-0.2.14" // { dependencies = [ - sources."isarray-0.0.1" sources."readable-stream-1.1.14" sources."string_decoder-0.10.31" ]; @@ -68448,7 +69171,14 @@ in sources."bytes-3.1.0" (sources."cacache-15.0.5" // { dependencies = [ + sources."chownr-2.0.0" + sources."fs-minipass-2.1.0" + sources."minipass-3.1.3" + sources."minizlib-2.1.2" sources."p-map-4.0.0" + sources."rimraf-3.0.2" + sources."tar-6.0.5" + sources."yallist-4.0.0" ]; }) sources."cache-base-1.0.1" @@ -68456,13 +69186,13 @@ in dependencies = [ sources."get-stream-5.2.0" sources."lowercase-keys-2.0.0" - sources."pump-3.0.0" ]; }) + sources."call-bind-1.0.0" sources."callsite-1.0.0" sources."camelcase-3.0.0" sources."caseless-0.12.0" - sources."chalk-2.4.2" + sources."chalk-1.1.3" sources."chardet-0.4.2" sources."chart.js-2.9.3" sources."chartjs-color-2.4.1" @@ -68482,7 +69212,7 @@ in sources."to-regex-range-2.1.1" ]; }) - sources."chownr-2.0.0" + sources."chownr-1.1.4" sources."chrome-trace-event-1.0.2" sources."cipher-base-1.0.4" (sources."class-utils-0.3.6" // { @@ -68502,20 +69232,27 @@ in sources."kind-of-5.1.0" ]; }) - (sources."clean-css-4.2.3" // { - dependencies = [ - sources."source-map-0.6.1" - ]; - }) + sources."clean-css-4.2.3" sources."clean-stack-2.2.0" sources."cli-cursor-2.1.0" sources."cli-width-2.2.1" - sources."cliui-3.2.0" + (sources."cliui-3.2.0" // { + dependencies = [ + sources."is-fullwidth-code-point-1.0.0" + sources."string-width-1.0.2" + ]; + }) sources."clone-2.1.2" sources."clone-buffer-1.0.0" sources."clone-response-1.0.2" sources."clone-stats-1.0.0" - sources."cloneable-readable-1.1.3" + (sources."cloneable-readable-1.1.3" // { + dependencies = [ + sources."isarray-1.0.0" + sources."readable-stream-2.3.7" + sources."string_decoder-1.1.1" + ]; + }) sources."code-point-at-1.1.0" sources."collection-map-1.0.0" sources."collection-visit-1.0.0" @@ -68527,15 +69264,17 @@ in sources."commander-2.20.3" sources."commondir-1.0.1" sources."component-bind-1.0.0" - sources."component-emitter-1.3.0" + sources."component-emitter-1.2.1" sources."component-inherit-0.0.3" sources."concat-map-0.0.1" - sources."concat-stream-1.6.2" - (sources."concat-with-sourcemaps-1.1.0" // { + (sources."concat-stream-1.6.2" // { dependencies = [ - sources."source-map-0.6.1" + sources."isarray-1.0.0" + sources."readable-stream-2.3.7" + sources."string_decoder-1.1.1" ]; }) + sources."concat-with-sourcemaps-1.1.0" sources."console-browserify-1.2.0" sources."console-control-strings-1.1.0" sources."constants-browserify-1.0.0" @@ -68547,18 +69286,13 @@ in (sources."copy-concurrently-1.0.5" // { dependencies = [ sources."mkdirp-0.5.5" - sources."rimraf-2.7.1" ]; }) sources."copy-descriptor-0.1.1" sources."copy-props-2.0.4" sources."core-js-2.6.11" sources."core-util-is-1.0.2" - (sources."crc-3.8.0" // { - dependencies = [ - sources."buffer-5.6.0" - ]; - }) + sources."crc-3.8.0" (sources."create-ecdh-4.0.4" // { dependencies = [ sources."bn.js-4.11.9" @@ -68567,11 +69301,7 @@ in sources."create-hash-1.2.0" sources."create-hmac-1.1.7" sources."crypto-browserify-3.12.0" - (sources."css-2.2.4" // { - dependencies = [ - sources."source-map-0.6.1" - ]; - }) + sources."css-2.2.4" sources."css-ripple-effect-1.0.5" sources."cyclist-1.0.1" sources."d-1.0.1" @@ -68597,7 +69327,11 @@ in sources."defer-to-connect-1.1.3" sources."define-properties-1.1.3" sources."define-property-2.0.2" - sources."del-5.1.0" + (sources."del-5.1.0" // { + dependencies = [ + sources."rimraf-3.0.2" + ]; + }) sources."delayed-stream-1.0.0" sources."delegates-1.0.0" sources."depd-1.1.2" @@ -68608,7 +69342,6 @@ in sources."detect-newline-2.1.0" (sources."dicer-0.2.5" // { dependencies = [ - sources."isarray-0.0.1" sources."readable-stream-1.1.14" sources."string_decoder-0.10.31" ]; @@ -68625,7 +69358,13 @@ in sources."domain-browser-1.2.0" sources."dotenv-8.2.0" sources."duplexer3-0.1.4" - sources."duplexify-3.7.1" + (sources."duplexify-3.7.1" // { + dependencies = [ + sources."isarray-1.0.0" + sources."readable-stream-2.3.7" + sources."string_decoder-1.1.1" + ]; + }) sources."each-props-1.3.2" sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" @@ -68651,6 +69390,7 @@ in }) (sources."engine.io-client-3.4.4" // { dependencies = [ + sources."component-emitter-1.3.0" sources."debug-3.1.0" sources."parseqs-0.0.6" sources."parseuri-0.0.6" @@ -68661,8 +69401,6 @@ in sources."enhanced-resolve-4.3.0" sources."errno-0.1.7" sources."error-ex-1.3.2" - sources."es-abstract-1.18.0-next.1" - sources."es-to-primitive-1.2.1" sources."es5-ext-0.10.53" sources."es6-iterator-2.0.3" sources."es6-promise-4.2.8" @@ -68704,7 +69442,7 @@ in sources."expand-tilde-2.0.2" sources."express-4.17.1" sources."express-normalize-query-params-middleware-0.5.1" - sources."express-openapi-7.0.0" + sources."express-openapi-7.0.1" (sources."ext-1.4.0" // { dependencies = [ sources."type-2.1.0" @@ -68729,7 +69467,7 @@ in sources."fast-glob-3.2.4" sources."fast-json-stable-stringify-2.1.0" sources."fast-levenshtein-1.1.4" - sources."fastq-1.8.0" + sources."fastq-1.9.0" sources."figgy-pudding-3.5.2" sources."figures-2.0.0" sources."file-uri-to-path-1.0.0" @@ -68751,36 +69489,55 @@ in sources."fined-1.2.0" sources."flagged-respawn-1.0.1" sources."flatted-2.0.2" - sources."flush-write-stream-1.1.1" + (sources."flush-write-stream-1.1.1" // { + dependencies = [ + sources."isarray-1.0.0" + sources."readable-stream-2.3.7" + sources."string_decoder-1.1.1" + ]; + }) sources."for-in-1.0.2" sources."for-own-1.0.0" sources."forever-agent-0.6.1" - sources."form-data-2.5.1" + sources."form-data-2.3.3" sources."forwarded-0.1.2" sources."fragment-cache-0.2.1" sources."fresh-0.5.2" - sources."from2-2.3.0" + (sources."from2-2.3.0" // { + dependencies = [ + sources."isarray-1.0.0" + sources."readable-stream-2.3.7" + sources."string_decoder-1.1.1" + ]; + }) sources."fs-extra-9.0.1" - sources."fs-minipass-2.1.0" + sources."fs-minipass-1.2.7" sources."fs-mkdirp-stream-1.0.0" sources."fs-routes-7.0.1" - sources."fs-write-stream-atomic-1.0.10" + (sources."fs-write-stream-atomic-1.0.10" // { + dependencies = [ + sources."isarray-1.0.0" + sources."readable-stream-2.3.7" + sources."string_decoder-1.1.1" + ]; + }) sources."fs.realpath-1.0.0" sources."fsevents-1.2.13" (sources."fstream-1.0.12" // { dependencies = [ sources."mkdirp-0.5.5" - sources."rimraf-2.7.1" ]; }) sources."function-bind-1.1.1" - sources."gauge-2.7.4" - sources."get-caller-file-1.0.3" - (sources."get-stream-4.1.0" // { + (sources."gauge-2.7.4" // { dependencies = [ - sources."pump-3.0.0" + sources."is-fullwidth-code-point-1.0.0" + sources."string-width-1.0.2" ]; }) + sources."get-caller-file-1.0.3" + sources."get-intrinsic-1.0.1" + sources."get-stream-4.1.0" sources."get-value-2.0.6" sources."getpass-0.1.7" sources."glob-7.1.6" @@ -68789,6 +69546,9 @@ in dependencies = [ sources."glob-parent-3.1.0" sources."is-glob-3.1.0" + sources."isarray-1.0.0" + sources."readable-stream-2.3.7" + sources."string_decoder-1.1.1" ]; }) sources."glob-watcher-5.0.5" @@ -68809,31 +69569,28 @@ in (sources."gulp-dart-sass-1.0.2" // { dependencies = [ sources."ansi-regex-3.0.0" + sources."ansi-styles-3.2.1" + sources."chalk-2.4.2" sources."strip-ansi-4.0.0" + sources."supports-color-5.5.0" ]; }) (sources."gulp-plumber-1.2.1" // { dependencies = [ - sources."ansi-styles-2.2.1" sources."arr-diff-1.1.0" sources."arr-union-2.1.0" sources."array-slice-0.2.3" - sources."chalk-1.1.3" sources."extend-shallow-1.1.4" sources."kind-of-1.1.0" sources."plugin-error-0.1.2" - sources."supports-color-2.0.0" - ]; - }) - (sources."gulp-sourcemaps-2.6.5" // { - dependencies = [ - sources."source-map-0.6.1" ]; }) + sources."gulp-sourcemaps-2.6.5" sources."gulp-tslint-8.1.4" (sources."gulp-typescript-5.0.1" // { dependencies = [ sources."ansi-colors-3.2.4" + sources."inherits-2.0.4" sources."source-map-0.7.3" sources."through2-3.0.2" ]; @@ -68865,7 +69622,7 @@ in }) (sources."hash-base-3.1.0" // { dependencies = [ - sources."readable-stream-3.6.0" + sources."inherits-2.0.4" sources."safe-buffer-5.2.1" ]; }) @@ -68879,15 +69636,11 @@ in sources."homedir-polyfill-1.0.3" sources."hosted-git-info-2.8.8" sources."http-cache-semantics-4.1.0" - (sources."http-errors-1.7.2" // { - dependencies = [ - sources."inherits-2.0.3" - ]; - }) + sources."http-errors-1.7.2" sources."http-signature-1.2.0" sources."https-browserify-1.0.0" sources."iconv-lite-0.4.24" - sources."ieee754-1.1.13" + sources."ieee754-1.2.1" sources."iferr-0.1.5" sources."ignore-5.1.8" sources."ignore-walk-3.0.3" @@ -68896,22 +69649,9 @@ in sources."indexof-0.0.1" sources."infer-owner-1.0.4" sources."inflight-1.0.6" - sources."inherits-2.0.4" + sources."inherits-2.0.3" sources."ini-1.3.5" - (sources."inquirer-3.0.6" // { - dependencies = [ - sources."ansi-regex-3.0.0" - sources."ansi-styles-2.2.1" - sources."chalk-1.1.3" - sources."is-fullwidth-code-point-2.0.0" - (sources."string-width-2.1.1" // { - dependencies = [ - sources."strip-ansi-4.0.0" - ]; - }) - sources."supports-color-2.0.0" - ]; - }) + sources."inquirer-3.0.6" sources."interpret-1.4.0" sources."invert-kv-1.0.0" sources."ip-1.1.5" @@ -68921,37 +69661,33 @@ in sources."is-arrayish-0.2.1" sources."is-binary-path-1.0.1" sources."is-buffer-1.1.6" - sources."is-callable-1.2.2" + sources."is-core-module-2.0.0" sources."is-data-descriptor-1.0.0" - sources."is-date-object-1.0.2" sources."is-descriptor-1.0.2" sources."is-dir-1.0.0" sources."is-extendable-0.1.1" sources."is-extglob-2.1.1" - sources."is-fullwidth-code-point-1.0.0" + sources."is-fullwidth-code-point-2.0.0" sources."is-glob-4.0.1" sources."is-negated-glob-1.0.0" - sources."is-negative-zero-2.0.0" sources."is-number-7.0.0" sources."is-path-cwd-2.2.0" sources."is-path-inside-3.0.2" sources."is-plain-object-2.0.4" sources."is-promise-2.2.2" - sources."is-regex-1.1.1" sources."is-relative-1.0.0" sources."is-stream-1.1.0" - sources."is-symbol-1.0.3" sources."is-typedarray-1.0.0" sources."is-unc-path-1.0.0" sources."is-utf8-0.2.1" sources."is-valid-glob-1.0.0" sources."is-windows-1.0.2" sources."is-wsl-1.1.0" - sources."isarray-1.0.0" + sources."isarray-0.0.1" sources."isexe-2.0.0" sources."isobject-3.0.1" sources."isstream-0.1.2" - (sources."jest-worker-26.5.0" // { + (sources."jest-worker-26.6.2" // { dependencies = [ sources."has-flag-4.0.0" sources."supports-color-7.2.0" @@ -68967,14 +69703,24 @@ in sources."json-stable-stringify-without-jsonify-1.0.1" sources."json-stringify-safe-5.0.1" sources."json5-1.0.1" - sources."jsonfile-6.0.1" + (sources."jsonfile-6.1.0" // { + dependencies = [ + sources."universalify-2.0.0" + ]; + }) sources."jsprim-1.4.1" sources."just-debounce-1.0.0" sources."keyv-3.1.0" sources."kind-of-6.0.3" sources."last-run-1.1.1" sources."latest-version-5.1.0" - sources."lazystream-1.0.0" + (sources."lazystream-1.0.0" // { + dependencies = [ + sources."isarray-1.0.0" + sources."readable-stream-2.3.7" + sources."string_decoder-1.1.1" + ]; + }) sources."lcid-1.0.0" sources."lead-1.0.0" sources."liftoff-3.1.0" @@ -68982,7 +69728,7 @@ in sources."loader-runner-2.4.0" sources."loader-utils-1.4.0" sources."locate-path-5.0.0" - sources."lodash-4.17.19" + sources."lodash-4.17.20" sources."lodash.clone-4.5.0" sources."lodash.clonedeep-4.5.0" sources."lodash.merge-4.6.2" @@ -68995,7 +69741,11 @@ in }) sources."loose-envify-1.4.0" sources."lowercase-keys-1.0.1" - sources."lru-cache-6.0.0" + (sources."lru-cache-6.0.0" // { + dependencies = [ + sources."yallist-4.0.0" + ]; + }) sources."lru-queue-0.1.0" (sources."make-dir-3.1.0" // { dependencies = [ @@ -69024,7 +69774,13 @@ in sources."md5.js-1.3.5" sources."media-typer-0.3.0" sources."memoizee-0.4.14" - sources."memory-fs-0.5.0" + (sources."memory-fs-0.5.0" // { + dependencies = [ + sources."isarray-1.0.0" + sources."readable-stream-2.3.7" + sources."string_decoder-1.1.1" + ]; + }) sources."merge-descriptors-1.0.1" sources."merge-stream-2.0.0" sources."merge2-1.4.1" @@ -69044,12 +69800,27 @@ in sources."minimalistic-crypto-utils-1.0.1" sources."minimatch-3.0.4" sources."minimist-1.2.5" - sources."minipass-3.1.3" - sources."minipass-collect-1.0.2" - sources."minipass-flush-1.0.5" - sources."minipass-pipeline-1.2.4" - sources."minizlib-2.1.2" - (sources."mirakurun-3.2.0" // { + sources."minipass-2.9.0" + (sources."minipass-collect-1.0.2" // { + dependencies = [ + sources."minipass-3.1.3" + sources."yallist-4.0.0" + ]; + }) + (sources."minipass-flush-1.0.5" // { + dependencies = [ + sources."minipass-3.1.3" + sources."yallist-4.0.0" + ]; + }) + (sources."minipass-pipeline-1.2.4" // { + dependencies = [ + sources."minipass-3.1.3" + sources."yallist-4.0.0" + ]; + }) + sources."minizlib-1.3.3" + (sources."mirakurun-3.3.1" // { dependencies = [ sources."aribts-1.3.5" sources."eventemitter3-4.0.7" @@ -69072,16 +69843,9 @@ in ]; }) sources."openapi-types-1.3.5" - sources."readable-stream-3.6.0" - sources."semver-7.3.2" - sources."stream-http-3.1.1" - ]; - }) - (sources."mississippi-3.0.0" // { - dependencies = [ - sources."pump-3.0.0" ]; }) + sources."mississippi-3.0.0" sources."mithril-2.0.4" (sources."mixin-deep-1.3.2" // { dependencies = [ @@ -69098,7 +69862,6 @@ in (sources."move-concurrently-1.0.1" // { dependencies = [ sources."mkdirp-0.5.5" - sources."rimraf-2.7.1" ]; }) sources."ms-2.0.0" @@ -69110,7 +69873,13 @@ in sources."munin-plugin-0.0.9" sources."mute-stdout-1.0.1" sources."mute-stream-0.0.7" - sources."mysql-2.18.1" + (sources."mysql-2.18.1" // { + dependencies = [ + sources."isarray-1.0.0" + sources."readable-stream-2.3.7" + sources."string_decoder-1.1.1" + ]; + }) sources."nan-2.14.2" sources."nanomatch-1.2.13" (sources."needle-2.5.2" // { @@ -69128,30 +69897,35 @@ in dependencies = [ sources."mkdirp-0.5.5" sources."nopt-3.0.6" - sources."rimraf-2.7.1" sources."semver-5.3.0" sources."tar-2.2.2" ]; }) (sources."node-libs-browser-2.2.1" // { dependencies = [ + sources."buffer-4.9.2" + sources."isarray-1.0.0" sources."punycode-1.4.1" + (sources."readable-stream-2.3.7" // { + dependencies = [ + sources."string_decoder-1.1.1" + ]; + }) + sources."stream-http-2.8.3" ]; }) (sources."node-pre-gyp-0.11.0" // { dependencies = [ - sources."chownr-1.1.4" - sources."fs-minipass-1.2.7" - sources."minipass-2.9.0" - sources."minizlib-1.3.3" sources."mkdirp-0.5.5" - sources."rimraf-2.7.1" - sources."tar-4.4.13" - sources."yallist-3.1.1" + sources."semver-5.7.1" ]; }) sources."nopt-4.0.3" - sources."normalize-package-data-2.5.0" + (sources."normalize-package-data-2.5.0" // { + dependencies = [ + sources."semver-5.7.1" + ]; + }) sources."normalize-path-3.0.0" sources."normalize-url-4.5.0" sources."now-and-later-2.0.1" @@ -69176,71 +69950,41 @@ in sources."kind-of-3.2.2" ]; }) - sources."object-inspect-1.8.0" sources."object-keys-1.1.1" sources."object-visit-1.0.1" - sources."object.assign-4.1.1" + sources."object.assign-4.1.2" sources."object.defaults-1.1.0" sources."object.map-1.0.1" sources."object.pick-1.3.0" sources."object.reduce-1.0.1" - sources."office-ui-fabric-react-7.147.1" + sources."office-ui-fabric-react-7.149.3" sources."on-finished-2.3.0" sources."on-headers-1.0.2" sources."once-1.4.0" sources."onetime-2.0.1" - (sources."openapi-default-setter-7.0.1" // { - dependencies = [ - sources."openapi-types-7.0.1" - ]; - }) - (sources."openapi-framework-7.0.2" // { - dependencies = [ - sources."openapi-types-7.0.1" - ]; - }) - (sources."openapi-jsonschema-parameters-7.0.2" // { - dependencies = [ - sources."openapi-types-7.0.1" - ]; - }) - (sources."openapi-request-coercer-7.0.1" // { - dependencies = [ - sources."openapi-types-7.0.1" - ]; - }) - (sources."openapi-request-validator-7.0.2" // { - dependencies = [ - sources."openapi-types-7.0.1" - ]; - }) - (sources."openapi-response-validator-7.0.1" // { - dependencies = [ - sources."openapi-types-7.0.1" - ]; - }) - (sources."openapi-schema-validator-7.0.1" // { - dependencies = [ - sources."openapi-types-7.0.1" - ]; - }) - (sources."openapi-security-handler-7.0.1" // { - dependencies = [ - sources."openapi-types-7.0.1" - ]; - }) - sources."openapi-types-7.0.0" + sources."openapi-default-setter-7.0.1" + sources."openapi-framework-7.0.2" + sources."openapi-jsonschema-parameters-7.0.2" + sources."openapi-request-coercer-7.0.1" + sources."openapi-request-validator-7.0.2" + sources."openapi-response-validator-7.0.1" + sources."openapi-schema-validator-7.0.1" + sources."openapi-security-handler-7.0.1" + sources."openapi-types-7.0.1" (sources."opencollective-1.0.3" // { dependencies = [ - sources."ansi-styles-2.2.1" - sources."chalk-1.1.3" sources."minimist-1.2.0" - sources."supports-color-2.0.0" ]; }) sources."opencollective-postinstall-2.0.3" sources."opn-4.0.2" - sources."ordered-read-streams-1.0.1" + (sources."ordered-read-streams-1.0.1" // { + dependencies = [ + sources."isarray-1.0.0" + sources."readable-stream-2.3.7" + sources."string_decoder-1.1.1" + ]; + }) sources."os-browserify-0.3.0" sources."os-homedir-1.0.2" sources."os-locale-1.4.0" @@ -69262,7 +70006,13 @@ in }) sources."packet-reader-1.0.0" sources."pako-1.0.11" - sources."parallel-transform-1.2.0" + (sources."parallel-transform-1.2.0" // { + dependencies = [ + sources."isarray-1.0.0" + sources."readable-stream-2.3.7" + sources."string_decoder-1.1.1" + ]; + }) sources."parse-asn1-5.1.6" sources."parse-filepath-1.0.2" sources."parse-json-2.2.0" @@ -69283,17 +70033,17 @@ in sources."path-type-4.0.0" sources."pbkdf2-3.1.1" sources."performance-now-2.1.0" - (sources."pg-8.3.0" // { + (sources."pg-8.3.3" // { dependencies = [ sources."semver-4.3.2" ]; }) sources."pg-connection-string-2.4.0" sources."pg-int8-1.0.1" - sources."pg-pool-3.2.1" + sources."pg-pool-3.2.2" sources."pg-protocol-1.3.0" sources."pg-types-2.2.0" - sources."pgpass-1.0.2" + sources."pgpass-1.0.4" sources."picomatch-2.2.2" sources."pify-2.3.0" sources."pinkie-2.0.4" @@ -69325,8 +70075,12 @@ in sources."bn.js-4.11.9" ]; }) - sources."pump-2.0.1" - sources."pumpify-1.5.1" + sources."pump-3.0.0" + (sources."pumpify-1.5.1" // { + dependencies = [ + sources."pump-2.0.1" + ]; + }) sources."punycode-2.1.1" sources."qs-6.7.0" sources."querystring-0.2.0" @@ -69345,15 +70099,18 @@ in ]; }) sources."read-pkg-up-1.0.1" - sources."readable-stream-2.3.7" + sources."readable-stream-3.6.0" (sources."readdirp-2.2.1" // { dependencies = [ sources."braces-2.3.2" sources."extend-shallow-2.0.1" sources."fill-range-4.0.0" sources."is-number-3.0.0" + sources."isarray-1.0.0" sources."kind-of-3.2.2" sources."micromatch-3.1.10" + sources."readable-stream-2.3.7" + sources."string_decoder-1.1.1" sources."to-regex-range-2.1.1" ]; }) @@ -69371,13 +70128,12 @@ in sources."replace-homedir-1.0.0" (sources."request-2.88.2" // { dependencies = [ - sources."form-data-2.3.3" sources."qs-6.5.2" ]; }) sources."require-directory-2.1.1" sources."require-main-filename-1.0.1" - sources."resolve-1.17.0" + sources."resolve-1.18.1" sources."resolve-dir-1.0.1" sources."resolve-options-1.1.0" sources."resolve-url-0.2.1" @@ -69386,27 +70142,27 @@ in sources."ret-0.1.15" sources."reusify-1.0.4" sources."rfdc-1.1.4" - sources."rimraf-3.0.2" + sources."rimraf-2.7.1" sources."ripemd160-2.0.2" sources."run-async-2.4.1" - sources."run-parallel-1.1.9" + sources."run-parallel-1.1.10" sources."run-queue-1.0.3" sources."rx-4.1.0" sources."safe-buffer-5.1.2" sources."safe-regex-1.1.0" sources."safer-buffer-2.1.2" - sources."sass-1.27.0" + sources."sass-1.28.0" sources."sax-1.2.4" sources."scheduler-0.19.1" sources."schema-utils-2.7.1" - sources."semver-5.7.1" + sources."semver-7.3.2" sources."semver-greatest-satisfied-range-1.1.0" (sources."send-0.17.1" // { dependencies = [ sources."ms-2.1.1" ]; }) - sources."serialize-javascript-4.0.0" + sources."serialize-javascript-5.0.1" sources."serve-static-1.14.1" sources."set-blocking-2.0.0" (sources."set-value-2.0.1" // { @@ -69436,6 +70192,7 @@ in }) sources."is-descriptor-0.1.6" sources."kind-of-5.1.0" + sources."source-map-0.5.7" ]; }) (sources."snapdragon-node-2.1.1" // { @@ -69458,7 +70215,6 @@ in (sources."socket.io-client-2.3.0" // { dependencies = [ sources."base64-arraybuffer-0.1.5" - sources."component-emitter-1.2.1" sources."debug-4.1.1" sources."isarray-2.0.1" sources."ms-2.1.2" @@ -69473,33 +70229,33 @@ in }) (sources."socket.io-parser-3.4.1" // { dependencies = [ - sources."component-emitter-1.2.1" sources."debug-4.1.1" sources."isarray-2.0.1" sources."ms-2.1.2" ]; }) sources."source-list-map-2.0.1" - sources."source-map-0.5.7" + sources."source-map-0.6.1" sources."source-map-resolve-0.5.3" - (sources."source-map-support-0.5.19" // { - dependencies = [ - sources."source-map-0.6.1" - ]; - }) + sources."source-map-support-0.5.19" sources."source-map-url-0.4.0" sources."sparkles-1.0.1" sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" sources."spdx-license-ids-3.0.6" - sources."split-1.0.1" sources."split-string-3.1.0" + sources."split2-3.2.2" sources."sprintf-js-1.0.3" sources."sqlite3-5.0.0" sources."sqlstring-2.3.1" sources."sshpk-1.16.1" - sources."ssri-8.0.0" + (sources."ssri-8.0.0" // { + dependencies = [ + sources."minipass-3.1.3" + sources."yallist-4.0.0" + ]; + }) sources."stack-trace-0.0.10" (sources."static-extend-0.1.2" // { dependencies = [ @@ -69519,10 +70275,20 @@ in ]; }) sources."statuses-1.5.0" - sources."stream-browserify-2.0.2" + (sources."stream-browserify-2.0.2" // { + dependencies = [ + sources."isarray-1.0.0" + sources."readable-stream-2.3.7" + sources."string_decoder-1.1.1" + ]; + }) sources."stream-each-1.2.3" sources."stream-exhaust-1.0.2" - sources."stream-http-2.8.3" + (sources."stream-http-3.1.1" // { + dependencies = [ + sources."inherits-2.0.4" + ]; + }) sources."stream-shift-1.0.1" (sources."streamroller-2.2.4" // { dependencies = [ @@ -69535,44 +70301,49 @@ in ]; }) sources."streamsearch-0.1.2" - sources."string-width-1.0.2" - (sources."string.prototype.trimend-1.0.1" // { + (sources."string-width-2.1.1" // { dependencies = [ - sources."es-abstract-1.17.7" + sources."ansi-regex-3.0.0" + sources."strip-ansi-4.0.0" ]; }) - (sources."string.prototype.trimstart-1.0.1" // { + (sources."string_decoder-1.3.0" // { dependencies = [ - sources."es-abstract-1.17.7" + sources."safe-buffer-5.2.1" ]; }) - sources."string_decoder-1.1.1" sources."strip-ansi-3.0.1" sources."strip-bom-2.0.0" sources."strip-bom-string-1.0.0" sources."strip-json-comments-2.0.1" - sources."supports-color-5.5.0" + sources."supports-color-2.0.0" sources."sver-compat-1.5.0" sources."swagger-schema-official-2.0.0-bab6bed" - sources."swagger-ui-dist-3.30.2" + sources."swagger-ui-dist-3.34.0" sources."tail-2.0.4" sources."tapable-1.1.3" - sources."tar-6.0.5" - (sources."terser-4.8.0" // { + (sources."tar-4.4.13" // { dependencies = [ - sources."source-map-0.6.1" + sources."mkdirp-0.5.5" ]; }) - (sources."terser-webpack-plugin-3.0.7" // { + (sources."terser-5.3.8" // { dependencies = [ - sources."source-map-0.6.1" + sources."source-map-0.7.3" ]; }) + sources."terser-webpack-plugin-4.2.2" sources."through-2.3.8" - sources."through2-2.0.5" + (sources."through2-2.0.5" // { + dependencies = [ + sources."isarray-1.0.0" + sources."readable-stream-2.3.7" + sources."string_decoder-1.1.1" + ]; + }) sources."through2-filter-3.0.0" sources."time-stamp-1.1.0" - sources."timers-browserify-2.0.11" + sources."timers-browserify-2.0.12" sources."timers-ext-0.1.7" sources."tmp-0.0.33" sources."to-absolute-glob-2.0.2" @@ -69589,16 +70360,23 @@ in sources."to-through-2.0.0" sources."toidentifier-1.0.0" sources."tough-cookie-2.5.0" - (sources."ts-loader-8.0.1" // { + (sources."ts-loader-8.0.4" // { dependencies = [ + sources."ansi-styles-3.2.1" + sources."chalk-2.4.2" sources."semver-6.3.0" + sources."supports-color-5.5.0" ]; }) sources."ts-log-2.2.3" sources."tslib-1.14.1" - (sources."tslint-6.1.2" // { + (sources."tslint-6.1.3" // { dependencies = [ + sources."ansi-styles-3.2.1" + sources."chalk-2.4.2" sources."mkdirp-0.5.5" + sources."semver-5.7.1" + sources."supports-color-5.5.0" ]; }) sources."tsutils-2.29.0" @@ -69608,7 +70386,7 @@ in sources."type-1.2.0" sources."type-is-1.6.18" sources."typedarray-0.0.6" - sources."typescript-3.9.7" + sources."typescript-4.0.3" sources."unc-path-regex-0.1.2" sources."undertaker-1.3.0" sources."undertaker-registry-1.0.1" @@ -69626,6 +70404,7 @@ in ]; }) sources."has-values-0.1.4" + sources."isarray-1.0.0" ]; }) sources."upath-1.2.0" @@ -69640,11 +70419,7 @@ in sources."url-parse-lax-3.0.0" sources."url-toolkit-2.2.1" sources."use-3.1.1" - (sources."util-0.11.1" // { - dependencies = [ - sources."inherits-2.0.3" - ]; - }) + sources."util-0.11.1" sources."util-deprecate-1.0.2" sources."utils-merge-1.0.1" sources."uuid-3.4.0" @@ -69654,13 +70429,23 @@ in sources."vary-1.1.2" sources."verror-1.10.0" sources."vinyl-2.2.1" - sources."vinyl-fs-3.0.3" + (sources."vinyl-fs-3.0.3" // { + dependencies = [ + sources."isarray-1.0.0" + sources."readable-stream-2.3.7" + sources."string_decoder-1.1.1" + ]; + }) (sources."vinyl-sourcemap-1.1.0" // { dependencies = [ sources."normalize-path-2.1.1" ]; }) - sources."vinyl-sourcemaps-apply-0.2.1" + (sources."vinyl-sourcemaps-apply-0.2.1" // { + dependencies = [ + sources."source-map-0.5.7" + ]; + }) sources."vm-browserify-1.1.2" (sources."watchpack-1.7.4" // { dependencies = [ @@ -69673,17 +70458,17 @@ in ]; }) sources."watchpack-chokidar2-2.0.0" - (sources."webpack-4.44.0" // { + (sources."webpack-4.44.2" // { dependencies = [ sources."acorn-6.4.2" sources."braces-2.3.2" sources."cacache-12.0.4" - sources."chownr-1.1.4" sources."extend-shallow-2.0.1" sources."fill-range-4.0.0" sources."find-cache-dir-2.1.0" sources."find-up-3.0.0" sources."is-number-3.0.0" + sources."isarray-1.0.0" sources."kind-of-3.2.2" sources."locate-path-3.0.0" sources."lru-cache-5.1.1" @@ -69696,38 +70481,47 @@ in sources."path-exists-3.0.0" sources."pify-4.0.1" sources."pkg-dir-3.0.0" - sources."rimraf-2.7.1" + sources."readable-stream-2.3.7" sources."schema-utils-1.0.0" - sources."source-map-0.6.1" + sources."semver-5.7.1" + sources."serialize-javascript-4.0.0" sources."ssri-6.0.1" + sources."string_decoder-1.1.1" + sources."terser-4.8.0" sources."terser-webpack-plugin-1.4.5" sources."to-regex-range-2.1.1" sources."y18n-4.0.0" - sources."yallist-3.1.1" ]; }) - (sources."webpack-sources-1.4.3" // { + sources."webpack-sources-1.4.3" + (sources."webpack-stream-6.1.0" // { dependencies = [ - sources."source-map-0.6.1" - ]; - }) - (sources."webpack-stream-5.2.1" // { - dependencies = [ - sources."memory-fs-0.4.1" + sources."has-flag-4.0.0" + sources."supports-color-7.2.0" ]; }) sources."which-1.3.1" sources."which-module-1.0.0" sources."wide-align-1.1.3" sources."worker-farm-1.7.0" - sources."wrap-ansi-2.1.0" + (sources."wrap-ansi-2.1.0" // { + dependencies = [ + sources."is-fullwidth-code-point-1.0.0" + sources."string-width-1.0.2" + ]; + }) sources."wrappy-1.0.2" sources."ws-7.3.1" sources."xmlhttprequest-ssl-1.5.5" sources."xtend-4.0.2" sources."y18n-3.2.1" - sources."yallist-4.0.0" - sources."yargs-7.1.1" + sources."yallist-3.1.1" + (sources."yargs-7.1.1" // { + dependencies = [ + sources."is-fullwidth-code-point-1.0.0" + sources."string-width-1.0.2" + ]; + }) sources."yargs-parser-5.0.0-security.0" sources."yeast-0.1.2" ]; @@ -69762,10 +70556,10 @@ in eslint = nodeEnv.buildNodePackage { name = "eslint"; packageName = "eslint"; - version = "7.11.0"; + version = "7.12.1"; src = fetchurl { - url = "https://registry.npmjs.org/eslint/-/eslint-7.11.0.tgz"; - sha512 = "G9+qtYVCHaDi1ZuWzBsOWo2wSwd70TXnU6UHA3cTYHp7gCTXZcpggWFoUVAMRarg68qtPoNfFbzPh+VdOgmwmw=="; + url = "https://registry.npmjs.org/eslint/-/eslint-7.12.1.tgz"; + sha512 = "HlMTEdr/LicJfN08LB3nM1rRYliDXOmfoO4vj39xN6BLpFzF00hbwBoqHk8UcJ2M/3nlARZWy/mslvGEuZFvsg=="; }; dependencies = [ sources."@babel/code-frame-7.10.4" @@ -69775,7 +70569,7 @@ in sources."chalk-2.4.2" ]; }) - sources."@eslint/eslintrc-0.1.3" + sources."@eslint/eslintrc-0.2.1" sources."acorn-7.4.1" sources."acorn-jsx-5.3.1" sources."ajv-6.12.6" @@ -69844,7 +70638,7 @@ in sources."globals-12.4.0" sources."has-flag-3.0.0" sources."ignore-4.0.6" - sources."import-fresh-3.2.1" + sources."import-fresh-3.2.2" sources."imurmurhash-0.1.4" sources."inflight-1.0.6" sources."inherits-2.0.4" @@ -69893,7 +70687,7 @@ in sources."type-check-0.4.0" sources."type-fest-0.8.1" sources."uri-js-4.4.0" - sources."v8-compile-cache-2.1.1" + sources."v8-compile-cache-2.2.0" sources."which-2.0.2" sources."word-wrap-1.2.3" sources."wrappy-1.0.2" @@ -69925,7 +70719,7 @@ in sources."chalk-2.4.2" ]; }) - sources."@eslint/eslintrc-0.1.3" + sources."@eslint/eslintrc-0.2.1" sources."acorn-7.4.1" sources."acorn-jsx-5.3.1" sources."ajv-6.12.6" @@ -69957,7 +70751,7 @@ in sources."emoji-regex-7.0.3" sources."enquirer-2.3.6" sources."escape-string-regexp-1.0.5" - sources."eslint-7.11.0" + sources."eslint-7.12.1" sources."eslint-scope-5.1.1" (sources."eslint-utils-2.1.0" // { dependencies = [ @@ -69996,7 +70790,7 @@ in sources."globals-12.4.0" sources."has-flag-3.0.0" sources."ignore-4.0.6" - sources."import-fresh-3.2.1" + sources."import-fresh-3.2.2" sources."imurmurhash-0.1.4" sources."inflight-1.0.6" sources."inherits-2.0.4" @@ -70046,7 +70840,7 @@ in sources."type-check-0.4.0" sources."type-fest-0.8.1" sources."uri-js-4.4.0" - sources."v8-compile-cache-2.1.1" + sources."v8-compile-cache-2.2.0" sources."which-2.0.2" sources."word-wrap-1.2.3" sources."wrappy-1.0.2" @@ -70065,21 +70859,21 @@ in expo-cli = nodeEnv.buildNodePackage { name = "expo-cli"; packageName = "expo-cli"; - version = "3.28.0"; + version = "3.28.4"; src = fetchurl { - url = "https://registry.npmjs.org/expo-cli/-/expo-cli-3.28.0.tgz"; - sha512 = "1fz44bGoM3jfit1gPYW1JuShX2DQva6SHZT1Rnx06UOeWJeofHO0ki/4J3InI8tob+XnktXo3cYW0HEXpJwVGg=="; + url = "https://registry.npmjs.org/expo-cli/-/expo-cli-3.28.4.tgz"; + sha512 = "nVk7Tc8I3hzhKnZwIOWh08Qq8VDZqYLA81Zrdu7HeIfJYAzppgYPB6tiZFouWwZl9/twf2JSYAUZmLwVhLK61A=="; }; dependencies = [ sources."@babel/code-frame-7.10.4" - sources."@babel/compat-data-7.12.1" + sources."@babel/compat-data-7.12.5" sources."@babel/core-7.9.0" - sources."@babel/generator-7.12.1" + sources."@babel/generator-7.12.5" sources."@babel/helper-annotate-as-pure-7.10.4" sources."@babel/helper-builder-binary-assignment-operator-visitor-7.10.4" sources."@babel/helper-builder-react-jsx-7.10.4" - sources."@babel/helper-builder-react-jsx-experimental-7.12.1" - sources."@babel/helper-compilation-targets-7.12.1" + sources."@babel/helper-builder-react-jsx-experimental-7.12.4" + sources."@babel/helper-compilation-targets-7.12.5" sources."@babel/helper-create-class-features-plugin-7.12.1" sources."@babel/helper-create-regexp-features-plugin-7.12.1" (sources."@babel/helper-define-map-7.10.5" // { @@ -70092,7 +70886,7 @@ in sources."@babel/helper-get-function-arity-7.10.4" sources."@babel/helper-hoist-variables-7.10.4" sources."@babel/helper-member-expression-to-functions-7.12.1" - sources."@babel/helper-module-imports-7.12.1" + sources."@babel/helper-module-imports-7.12.5" (sources."@babel/helper-module-transforms-7.12.1" // { dependencies = [ sources."lodash-4.17.20" @@ -70106,20 +70900,20 @@ in ]; }) sources."@babel/helper-remap-async-to-generator-7.12.1" - sources."@babel/helper-replace-supers-7.12.1" + sources."@babel/helper-replace-supers-7.12.5" sources."@babel/helper-simple-access-7.12.1" sources."@babel/helper-skip-transparent-expression-wrappers-7.12.1" sources."@babel/helper-split-export-declaration-7.11.0" sources."@babel/helper-validator-identifier-7.10.4" sources."@babel/helper-validator-option-7.12.1" sources."@babel/helper-wrap-function-7.12.3" - sources."@babel/helpers-7.12.1" + sources."@babel/helpers-7.12.5" (sources."@babel/highlight-7.10.4" // { dependencies = [ sources."chalk-2.4.2" ]; }) - sources."@babel/parser-7.12.3" + sources."@babel/parser-7.12.5" sources."@babel/plugin-proposal-async-generator-functions-7.12.1" sources."@babel/plugin-proposal-class-properties-7.12.1" sources."@babel/plugin-proposal-dynamic-import-7.12.1" @@ -70128,7 +70922,7 @@ in sources."@babel/plugin-proposal-json-strings-7.12.1" sources."@babel/plugin-proposal-logical-assignment-operators-7.12.1" sources."@babel/plugin-proposal-nullish-coalescing-operator-7.12.1" - sources."@babel/plugin-proposal-numeric-separator-7.12.1" + sources."@babel/plugin-proposal-numeric-separator-7.12.5" sources."@babel/plugin-proposal-object-rest-spread-7.12.1" sources."@babel/plugin-proposal-optional-catch-binding-7.12.1" sources."@babel/plugin-proposal-optional-chaining-7.12.1" @@ -70176,7 +70970,7 @@ in sources."@babel/plugin-transform-parameters-7.12.1" sources."@babel/plugin-transform-property-literals-7.12.1" sources."@babel/plugin-transform-react-display-name-7.12.1" - sources."@babel/plugin-transform-react-jsx-7.12.1" + sources."@babel/plugin-transform-react-jsx-7.12.5" sources."@babel/plugin-transform-react-jsx-source-7.12.1" sources."@babel/plugin-transform-regenerator-7.12.1" sources."@babel/plugin-transform-reserved-words-7.12.1" @@ -70196,14 +70990,14 @@ in sources."@babel/preset-env-7.12.1" sources."@babel/preset-modules-0.1.4" sources."@babel/preset-typescript-7.12.1" - sources."@babel/runtime-7.12.1" + sources."@babel/runtime-7.12.5" sources."@babel/template-7.10.4" - (sources."@babel/traverse-7.12.1" // { + (sources."@babel/traverse-7.12.5" // { dependencies = [ sources."lodash-4.17.20" ]; }) - (sources."@babel/types-7.12.1" // { + (sources."@babel/types-7.12.5" // { dependencies = [ sources."lodash-4.17.20" ]; @@ -70214,9 +71008,10 @@ in sources."uuid-3.4.0" ]; }) - (sources."@expo/config-3.3.10" // { + (sources."@expo/config-3.3.13" // { dependencies = [ sources."semver-7.3.2" + sources."slash-3.0.0" sources."uuid-3.4.0" sources."xcode-2.1.0" ]; @@ -70228,7 +71023,7 @@ in sources."pngjs-5.0.0" ]; }) - (sources."@expo/dev-server-0.1.35" // { + (sources."@expo/dev-server-0.1.38" // { dependencies = [ sources."body-parser-1.19.0" sources."bytes-3.1.0" @@ -70242,13 +71037,15 @@ in sources."serialize-error-6.0.0" sources."setprototypeof-1.1.1" sources."statuses-1.5.0" + sources."type-fest-0.12.0" ]; }) - sources."@expo/dev-tools-0.13.53" - sources."@expo/eas-build-job-0.1.1" + sources."@expo/dev-tools-0.13.57" + sources."@expo/eas-build-job-0.1.2" (sources."@expo/image-utils-0.3.7" // { dependencies = [ sources."semver-6.1.1" + sources."tempy-0.3.0" ]; }) (sources."@expo/json-file-8.2.24" // { @@ -70256,7 +71053,7 @@ in sources."json5-1.0.1" ]; }) - sources."@expo/metro-config-0.1.35" + sources."@expo/metro-config-0.1.38" (sources."@expo/ngrok-2.4.3" // { dependencies = [ sources."uuid-3.4.0" @@ -70304,14 +71101,14 @@ in sources."@expo/spawn-async-1.5.0" sources."@expo/traveling-fastlane-darwin-1.15.1" sources."@expo/traveling-fastlane-linux-1.15.1" - (sources."@expo/webpack-config-0.12.39" // { + (sources."@expo/webpack-config-0.12.42" // { dependencies = [ sources."@babel/runtime-7.9.0" sources."is-wsl-2.2.0" sources."react-refresh-0.8.3" ]; }) - (sources."@expo/xdl-58.0.14" // { + (sources."@expo/xdl-58.0.18" // { dependencies = [ sources."chownr-1.1.4" sources."es6-error-4.1.1" @@ -70424,8 +71221,8 @@ in ]; }) sources."@npmcli/node-gyp-1.0.1" - sources."@npmcli/promise-spawn-1.2.0" - sources."@npmcli/run-script-1.7.2" + sources."@npmcli/promise-spawn-1.3.2" + sources."@npmcli/run-script-1.7.4" sources."@pmmmwh/react-refresh-webpack-plugin-0.3.3" sources."@react-native-community/cli-debugger-ui-4.9.0" (sources."@react-native-community/cli-platform-android-4.13.0" // { @@ -70486,10 +71283,10 @@ in sources."@types/istanbul-reports-1.1.2" sources."@types/json-schema-7.0.6" sources."@types/keyv-3.1.1" - sources."@types/lodash-4.14.162" + sources."@types/lodash-4.14.164" sources."@types/minimatch-3.0.3" sources."@types/mkdirp-0.5.2" - sources."@types/node-9.6.60" + sources."@types/node-9.6.61" sources."@types/q-1.5.4" sources."@types/responselike-1.0.0" sources."@types/retry-0.12.0" @@ -70498,12 +71295,12 @@ in sources."@types/tapable-1.0.6" sources."@types/text-table-0.2.1" sources."@types/tmp-0.0.33" - (sources."@types/uglify-js-3.11.0" // { + (sources."@types/uglify-js-3.11.1" // { dependencies = [ sources."source-map-0.6.1" ]; }) - (sources."@types/webpack-4.41.22" // { + (sources."@types/webpack-4.41.24" // { dependencies = [ sources."source-map-0.6.1" ]; @@ -70540,7 +71337,7 @@ in sources."accepts-1.3.7" sources."acorn-6.4.2" sources."address-1.1.2" - sources."agent-base-6.0.1" + sources."agent-base-6.0.2" sources."agentkeepalive-4.1.3" sources."aggregate-error-3.1.0" sources."ajv-6.12.6" @@ -70581,7 +71378,7 @@ in sources."apollo-utilities-1.3.4" sources."application-config-path-0.1.0" sources."aproba-1.2.0" - sources."arch-2.1.2" + sources."arch-2.2.0" sources."are-we-there-yet-1.1.5" sources."argparse-1.0.10" sources."arr-diff-4.0.0" @@ -70623,12 +71420,12 @@ in ]; }) sources."aws-sign2-0.7.0" - sources."aws4-1.10.1" + sources."aws4-1.11.0" (sources."axios-0.19.0" // { dependencies = [ sources."debug-3.1.0" sources."follow-redirects-1.5.10" - sources."is-buffer-2.0.4" + sources."is-buffer-2.0.5" sources."ms-2.0.0" ]; }) @@ -70715,8 +71512,8 @@ in ]; }) sources."browserify-zlib-0.2.0" - sources."browserslist-4.14.5" - sources."buffer-5.6.0" + sources."browserslist-4.14.6" + sources."buffer-5.7.0" sources."buffer-equal-0.0.1" sources."buffer-from-1.1.1" sources."buffer-indexof-1.1.1" @@ -70741,6 +71538,7 @@ in sources."normalize-url-4.5.0" ]; }) + sources."call-bind-1.0.0" sources."call-me-maybe-1.0.1" sources."caller-callsite-2.0.0" sources."caller-path-2.0.0" @@ -70753,7 +71551,7 @@ in }) sources."camelcase-5.3.1" sources."caniuse-api-3.0.0" - sources."caniuse-lite-1.0.30001148" + sources."caniuse-lite-1.0.30001154" sources."capture-stack-trace-1.0.1" sources."caseless-0.12.0" (sources."chalk-4.1.0" // { @@ -70807,7 +71605,7 @@ in ]; }) sources."cliui-6.0.0" - sources."clone-1.0.4" + sources."clone-2.1.2" sources."clone-response-1.0.2" sources."co-4.6.0" (sources."coa-2.0.2" // { @@ -70928,17 +71726,18 @@ in sources."cssnano-util-get-match-4.0.0" sources."cssnano-util-raw-cache-4.0.1" sources."cssnano-util-same-parent-4.0.1" - (sources."csso-4.0.3" // { + (sources."csso-4.1.0" // { dependencies = [ - sources."css-tree-1.0.0-alpha.39" - sources."mdn-data-2.0.6" + sources."css-tree-1.0.0" + sources."mdn-data-2.0.12" sources."source-map-0.6.1" ]; }) sources."cyclist-1.0.1" + sources."dag-map-1.0.2" sources."dashdash-1.14.1" sources."dateformat-3.0.3" - sources."dayjs-1.9.3" + sources."dayjs-1.9.4" sources."debug-4.3.0" sources."debuglog-1.0.1" sources."decache-4.4.0" @@ -70950,7 +71749,11 @@ in sources."deep-scope-analyser-1.7.0" sources."deepmerge-1.5.2" sources."default-gateway-4.2.0" - sources."defaults-1.0.3" + (sources."defaults-1.0.3" // { + dependencies = [ + sources."clone-1.0.4" + ]; + }) sources."defer-to-connect-1.1.3" sources."define-properties-1.1.3" sources."define-property-2.0.2" @@ -70977,7 +71780,7 @@ in (sources."devcert-1.1.3" // { dependencies = [ sources."@types/glob-5.0.36" - sources."@types/node-8.10.65" + sources."@types/node-8.10.66" sources."debug-3.2.6" sources."rimraf-2.7.1" sources."sudo-prompt-8.2.5" @@ -71007,7 +71810,7 @@ in sources."duplexify-3.7.1" sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.3.582" + sources."electron-to-chromium-1.3.587" (sources."elliptic-6.5.3" // { dependencies = [ sources."bn.js-4.11.9" @@ -71090,7 +71893,7 @@ in sources."ms-2.0.0" ]; }) - (sources."expo-pwa-0.0.45" // { + (sources."expo-pwa-0.0.48" // { dependencies = [ sources."commander-2.20.0" ]; @@ -71118,7 +71921,7 @@ in sources."fast-deep-equal-3.1.3" sources."fast-glob-3.2.4" sources."fast-json-stable-stringify-2.1.0" - sources."fastq-1.8.0" + sources."fastq-1.9.0" sources."faye-websocket-0.10.0" sources."figgy-pudding-3.5.2" sources."figures-3.2.0" @@ -71170,7 +71973,11 @@ in sources."from2-2.3.0" (sources."fs-extra-9.0.0" // { dependencies = [ - sources."jsonfile-6.0.1" + (sources."jsonfile-6.1.0" // { + dependencies = [ + sources."universalify-2.0.0" + ]; + }) sources."universalify-1.0.0" ]; }) @@ -71191,8 +71998,9 @@ in sources."strip-ansi-3.0.1" ]; }) - sources."gensync-1.0.0-beta.1" + sources."gensync-1.0.0-beta.2" sources."get-caller-file-2.0.5" + sources."get-intrinsic-1.0.1" sources."get-own-enumerable-property-symbols-3.0.2" sources."get-port-3.2.0" sources."get-stream-4.1.0" @@ -71211,9 +72019,9 @@ in sources."pify-2.3.0" ]; }) - (sources."got-11.7.0" // { + (sources."got-11.8.0" // { dependencies = [ - sources."@sindresorhus/is-3.1.2" + sources."@sindresorhus/is-4.0.0" sources."@szmarczak/http-timer-4.0.5" sources."cacheable-request-7.0.1" sources."decompress-response-6.0.0" @@ -71326,7 +72134,7 @@ in sources."iconv-lite-0.4.23" sources."icss-utils-4.1.1" sources."idx-2.4.0" - sources."ieee754-1.1.13" + sources."ieee754-1.2.1" sources."iferr-0.1.5" sources."ignore-5.1.8" sources."ignore-walk-3.0.3" @@ -71369,6 +72177,7 @@ in sources."is-buffer-1.1.6" sources."is-callable-1.2.2" sources."is-color-stop-1.1.0" + sources."is-core-module-2.0.0" sources."is-data-descriptor-1.0.0" sources."is-date-object-1.0.2" sources."is-descriptor-1.0.2" @@ -71379,6 +72188,12 @@ in sources."is-fullwidth-code-point-2.0.0" sources."is-function-1.0.2" sources."is-glob-4.0.1" + (sources."is-invalid-path-0.1.0" // { + dependencies = [ + sources."is-extglob-1.0.0" + sources."is-glob-2.0.1" + ]; + }) sources."is-lambda-1.0.1" sources."is-map-2.0.1" sources."is-negative-zero-2.0.0" @@ -71419,6 +72234,7 @@ in ]; }) sources."is-typedarray-1.0.0" + sources."is-valid-path-0.1.1" sources."is-weakmap-2.0.1" sources."is-weakset-2.0.1" sources."is-windows-1.0.2" @@ -71429,7 +72245,7 @@ in sources."isobject-3.0.1" sources."isstream-0.1.2" sources."iterall-1.2.2" - (sources."jest-worker-26.5.0" // { + (sources."jest-worker-26.6.2" // { dependencies = [ sources."has-flag-4.0.0" sources."supports-color-7.2.0" @@ -71448,6 +72264,11 @@ in sources."json-parse-better-errors-1.0.2" sources."json-parse-even-better-errors-2.3.1" sources."json-schema-0.2.3" + (sources."json-schema-deref-sync-0.13.0" // { + dependencies = [ + sources."md5-2.2.1" + ]; + }) sources."json-schema-traverse-0.4.1" sources."json-stable-stringify-1.0.1" sources."json-stringify-safe-5.0.1" @@ -71523,6 +72344,7 @@ in sources."md5hex-1.0.0" sources."mdn-data-2.0.4" sources."media-typer-0.3.0" + sources."memory-cache-0.2.0" sources."memory-fs-0.4.1" sources."merge-descriptors-1.0.1" sources."merge-stream-2.0.0" @@ -71632,7 +72454,7 @@ in sources."which-2.0.2" ]; }) - sources."node-html-parser-1.3.1" + sources."node-html-parser-1.4.6" (sources."node-libs-browser-2.2.1" // { dependencies = [ sources."buffer-4.9.2" @@ -71641,7 +72463,7 @@ in sources."punycode-1.4.1" ]; }) - sources."node-releases-1.1.63" + sources."node-releases-1.1.65" sources."nopt-5.0.0" sources."normalize-path-3.0.0" sources."normalize-url-3.3.0" @@ -71657,7 +72479,7 @@ in sources."hosted-git-info-2.8.8" ]; }) - sources."npm-packlist-2.1.2" + sources."npm-packlist-2.1.4" (sources."npm-pick-manifest-6.1.0" // { dependencies = [ sources."npm-package-arg-8.1.0" @@ -71695,7 +72517,7 @@ in sources."object-is-1.1.3" sources."object-keys-1.1.1" sources."object-visit-1.0.1" - sources."object.assign-4.1.1" + sources."object.assign-4.1.2" (sources."object.entries-1.1.2" // { dependencies = [ sources."es-abstract-1.17.7" @@ -71736,7 +72558,6 @@ in (sources."p-any-2.1.0" // { dependencies = [ sources."p-cancelable-2.0.0" - sources."type-fest-0.3.1" ]; }) sources."p-cancelable-1.1.0" @@ -71762,11 +72583,12 @@ in sources."url-parse-lax-3.0.0" ]; }) - (sources."pacote-11.1.11" // { + (sources."pacote-11.1.12" // { dependencies = [ sources."minipass-3.1.3" sources."mkdirp-1.0.4" sources."npm-package-arg-8.1.0" + sources."npm-registry-fetch-9.0.0" sources."rimraf-3.0.2" sources."semver-7.3.2" ]; @@ -71990,7 +72812,7 @@ in sources."retry-0.10.1" ]; }) - sources."prompts-2.3.2" + sources."prompts-2.4.0" sources."proxy-addr-2.0.6" sources."prr-1.0.1" sources."psl-1.8.0" @@ -72077,7 +72899,7 @@ in sources."which-2.0.2" ]; }) - sources."react-error-overlay-6.0.7" + sources."react-error-overlay-6.0.8" sources."react-is-16.13.1" sources."react-refresh-0.4.3" sources."read-chunk-3.2.0" @@ -72091,7 +72913,7 @@ in sources."readdir-scoped-modules-1.1.0" sources."readdirp-3.5.0" sources."recursive-readdir-2.2.2" - sources."regenerate-1.4.1" + sources."regenerate-1.4.2" sources."regenerate-unicode-properties-8.2.0" sources."regenerator-runtime-0.13.7" sources."regenerator-transform-0.14.5" @@ -72144,7 +72966,7 @@ in sources."require-from-string-2.0.2" sources."require-main-filename-2.0.0" sources."requires-port-1.0.0" - sources."resolve-1.17.0" + sources."resolve-1.18.1" sources."resolve-alpn-1.0.0" (sources."resolve-cwd-2.0.0" // { dependencies = [ @@ -72168,7 +72990,7 @@ in sources."ripemd160-2.0.2" sources."router-ips-1.0.0" sources."run-async-2.4.1" - sources."run-parallel-1.1.9" + sources."run-parallel-1.1.10" sources."run-queue-1.0.3" (sources."rxjs-5.5.12" // { dependencies = [ @@ -72232,7 +73054,7 @@ in sources."uuid-2.0.3" ]; }) - sources."slugify-1.4.5" + sources."slugify-1.4.6" sources."smart-buffer-4.1.0" (sources."snapdragon-0.8.2" // { dependencies = [ @@ -72275,7 +73097,7 @@ in sources."faye-websocket-0.11.3" ]; }) - sources."socks-2.4.4" + sources."socks-2.5.0" sources."socks-proxy-agent-5.0.0" sources."source-list-map-2.0.1" sources."source-map-0.5.7" @@ -72335,16 +73157,8 @@ in sources."is-fullwidth-code-point-3.0.0" ]; }) - (sources."string.prototype.trimend-1.0.1" // { - dependencies = [ - sources."es-abstract-1.17.7" - ]; - }) - (sources."string.prototype.trimstart-1.0.1" // { - dependencies = [ - sources."es-abstract-1.17.7" - ]; - }) + sources."string.prototype.trimend-1.0.2" + sources."string.prototype.trimstart-1.0.2" sources."string_decoder-1.1.1" (sources."stringify-object-3.3.0" // { dependencies = [ @@ -72401,12 +73215,23 @@ in ]; }) sources."temp-dir-1.0.0" - (sources."tempy-0.3.0" // { + (sources."tempy-0.7.1" // { dependencies = [ - sources."type-fest-0.3.1" + sources."array-union-2.1.0" + sources."crypto-random-string-2.0.0" + sources."del-6.0.0" + sources."globby-11.0.1" + sources."is-path-inside-3.0.2" + sources."is-stream-2.0.0" + sources."p-map-4.0.0" + sources."rimraf-3.0.2" + sources."slash-3.0.0" + sources."temp-dir-2.0.0" + sources."type-fest-0.16.0" + sources."unique-string-2.0.0" ]; }) - sources."term-size-2.2.0" + sources."term-size-2.2.1" sources."terminal-link-2.1.1" (sources."terser-4.8.0" // { dependencies = [ @@ -72432,7 +73257,7 @@ in sources."through2-2.0.5" sources."thunky-1.1.0" sources."timed-out-4.0.1" - sources."timers-browserify-2.0.11" + sources."timers-browserify-2.0.12" sources."timm-1.7.1" sources."timsort-0.3.0" sources."tinycolor2-1.4.2" @@ -72450,6 +73275,7 @@ in sources."toidentifier-1.0.0" sources."topo-2.0.2" sources."tough-cookie-2.5.0" + sources."traverse-0.6.6" sources."tree-kill-1.2.2" sources."ts-invariant-0.4.4" sources."ts-pnp-1.2.0" @@ -72457,7 +73283,7 @@ in sources."tty-browserify-0.0.0" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" - sources."type-fest-0.12.0" + sources."type-fest-0.3.1" sources."type-is-1.6.18" sources."typedarray-0.0.6" sources."ultron-1.1.1" @@ -72519,6 +73345,7 @@ in sources."utila-0.4.0" sources."utils-merge-1.0.1" sources."uuid-8.3.1" + sources."valid-url-1.0.9" sources."validate-npm-package-name-3.0.0" sources."validator-10.5.0" sources."vary-1.1.2" @@ -72802,7 +73629,7 @@ in sources."assert-plus-1.0.0" sources."asynckit-0.4.0" sources."aws-sign2-0.7.0" - sources."aws4-1.10.1" + sources."aws4-1.11.0" sources."bcrypt-pbkdf-1.0.2" sources."buffer-crc32-0.2.13" sources."buffer-from-1.1.1" @@ -72838,11 +73665,13 @@ in sources."forever-agent-0.6.1" sources."form-data-2.3.3" sources."fs-extra-1.0.0" + sources."function-bind-1.1.1" sources."get-stdin-4.0.1" sources."getpass-0.1.7" sources."graceful-fs-4.2.4" sources."har-schema-2.0.0" sources."har-validator-5.1.5" + sources."has-1.0.3" sources."has-ansi-2.0.0" sources."has-flag-3.0.0" sources."hasha-2.2.0" @@ -72851,6 +73680,7 @@ in sources."indent-string-2.1.0" sources."inherits-2.0.4" sources."is-arrayish-0.2.1" + sources."is-core-module-2.0.0" sources."is-finite-1.1.0" sources."is-stream-1.1.0" sources."is-typedarray-1.0.0" @@ -72924,7 +73754,7 @@ in sources."repeating-2.0.1" sources."request-2.88.2" sources."request-progress-2.0.1" - sources."resolve-1.17.0" + sources."resolve-1.18.1" sources."restore-cursor-1.0.1" sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" @@ -72966,6 +73796,573 @@ in bypassCache = true; reconstructLock = true; }; + fauna-shell = nodeEnv.buildNodePackage { + name = "fauna-shell"; + packageName = "fauna-shell"; + version = "0.11.5"; + src = fetchurl { + url = "https://registry.npmjs.org/fauna-shell/-/fauna-shell-0.11.5.tgz"; + sha512 = "0/PujreRi2BsZoyvp5N48xaMWLow2GsNz7AY7bdW+0/DAj6F++7kQY7OotmiPlVX2idYL9QJswAcgy1ksRtF9A=="; + }; + dependencies = [ + (sources."@heroku-cli/color-1.1.14" // { + dependencies = [ + sources."ansi-regex-4.1.0" + sources."ansi-styles-3.2.1" + sources."color-convert-1.9.3" + sources."color-name-1.1.3" + sources."strip-ansi-5.2.0" + ]; + }) + sources."@mrmlnc/readdir-enhanced-2.2.1" + sources."@nodelib/fs.scandir-2.1.3" + sources."@nodelib/fs.stat-2.0.3" + sources."@nodelib/fs.walk-1.2.4" + (sources."@oclif/command-1.8.0" // { + dependencies = [ + sources."@oclif/plugin-help-3.2.0" + sources."ansi-regex-3.0.0" + sources."ansi-styles-3.2.1" + sources."color-convert-1.9.3" + sources."color-name-1.1.3" + sources."is-fullwidth-code-point-2.0.0" + sources."string-width-2.1.1" + sources."strip-ansi-4.0.0" + sources."wrap-ansi-4.0.0" + ]; + }) + (sources."@oclif/config-1.17.0" // { + dependencies = [ + sources."globby-11.0.1" + sources."tslib-2.0.3" + ]; + }) + sources."@oclif/errors-1.3.3" + sources."@oclif/linewrap-1.0.0" + sources."@oclif/parser-3.8.5" + (sources."@oclif/plugin-autocomplete-0.1.5" // { + dependencies = [ + sources."debug-3.2.6" + sources."fs-extra-6.0.1" + sources."jsonfile-4.0.0" + sources."universalify-0.1.2" + ]; + }) + (sources."@oclif/plugin-help-1.2.11" // { + dependencies = [ + sources."ansi-regex-3.0.0" + sources."indent-string-3.2.0" + sources."is-fullwidth-code-point-2.0.0" + sources."string-width-2.1.1" + sources."strip-ansi-4.0.0" + sources."widest-line-2.0.1" + sources."wrap-ansi-3.0.1" + ]; + }) + sources."@oclif/screen-1.0.4" + sources."@sindresorhus/is-0.7.0" + sources."ajv-6.12.6" + sources."ansi-escapes-3.2.0" + sources."ansi-regex-5.0.0" + sources."ansi-styles-4.3.0" + sources."ansicolors-0.3.2" + sources."arr-diff-4.0.0" + sources."arr-flatten-1.1.0" + sources."arr-union-3.1.0" + sources."array-union-2.1.0" + sources."array-uniq-1.0.3" + sources."array-unique-0.3.2" + sources."arrify-1.0.1" + sources."asn1-0.2.4" + sources."assert-plus-1.0.0" + sources."assign-symbols-1.0.0" + sources."asynckit-0.4.0" + sources."at-least-node-1.0.0" + sources."atob-2.1.2" + sources."aws-sign2-0.7.0" + sources."aws4-1.11.0" + sources."balanced-match-1.0.0" + (sources."base-0.11.2" // { + dependencies = [ + sources."define-property-1.0.0" + ]; + }) + sources."base64-js-1.3.1" + sources."bcrypt-pbkdf-1.0.2" + sources."bluebird-3.7.2" + sources."brace-expansion-1.1.11" + sources."braces-3.0.2" + sources."btoa-lite-1.0.0" + sources."cache-base-1.0.1" + (sources."cacheable-request-2.1.4" // { + dependencies = [ + sources."lowercase-keys-1.0.0" + ]; + }) + sources."call-me-maybe-1.0.1" + sources."cardinal-2.1.1" + sources."caseless-0.12.0" + (sources."chalk-2.4.2" // { + dependencies = [ + sources."ansi-styles-3.2.1" + sources."color-convert-1.9.3" + sources."color-name-1.1.3" + sources."escape-string-regexp-1.0.5" + ]; + }) + (sources."class-utils-0.3.6" // { + dependencies = [ + sources."define-property-0.2.5" + (sources."is-accessor-descriptor-0.1.6" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + (sources."is-data-descriptor-0.1.4" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."is-descriptor-0.1.6" + sources."kind-of-5.1.0" + ]; + }) + sources."clean-stack-3.0.0" + sources."cli-table-0.3.1" + (sources."cli-ux-4.9.3" // { + dependencies = [ + sources."ansi-regex-4.1.0" + sources."ansi-styles-3.2.1" + sources."clean-stack-2.2.0" + sources."color-convert-1.9.3" + sources."color-name-1.1.3" + sources."fs-extra-7.0.1" + sources."indent-string-3.2.0" + sources."is-wsl-1.1.0" + sources."jsonfile-4.0.0" + sources."semver-5.7.1" + sources."strip-ansi-5.2.0" + sources."universalify-0.1.2" + ]; + }) + sources."clone-response-1.0.2" + sources."co-4.6.0" + sources."collection-visit-1.0.0" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" + sources."colors-1.0.3" + sources."combined-stream-1.0.8" + sources."component-emitter-1.3.0" + sources."concat-map-0.0.1" + sources."copy-descriptor-0.1.1" + sources."core-util-is-1.0.2" + sources."cross-fetch-3.0.6" + (sources."cross-spawn-6.0.5" // { + dependencies = [ + sources."semver-5.7.1" + ]; + }) + sources."dashdash-1.14.1" + sources."debug-4.3.0" + sources."decode-uri-component-0.2.0" + sources."decompress-response-3.3.0" + sources."deep-is-0.1.3" + sources."define-property-2.0.2" + sources."delayed-stream-1.0.0" + sources."dir-glob-3.0.1" + sources."dotenv-8.2.0" + sources."duplexer3-0.1.4" + sources."ecc-jsbn-0.1.2" + sources."emoji-regex-8.0.0" + sources."escape-string-regexp-4.0.0" + sources."escodegen-1.14.3" + sources."esprima-4.0.1" + sources."estraverse-4.3.0" + sources."esutils-2.0.3" + sources."execa-0.10.0" + (sources."expand-brackets-2.1.4" // { + dependencies = [ + sources."debug-2.6.9" + sources."define-property-0.2.5" + sources."extend-shallow-2.0.1" + (sources."is-accessor-descriptor-0.1.6" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + (sources."is-data-descriptor-0.1.4" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."is-descriptor-0.1.6" + sources."kind-of-5.1.0" + sources."ms-2.0.0" + ]; + }) + sources."extend-3.0.2" + (sources."extend-shallow-3.0.2" // { + dependencies = [ + sources."is-extendable-1.0.1" + ]; + }) + (sources."extglob-2.0.4" // { + dependencies = [ + sources."define-property-1.0.0" + sources."extend-shallow-2.0.1" + ]; + }) + sources."extract-stack-1.0.0" + sources."extsprintf-1.3.0" + sources."fast-deep-equal-3.1.3" + sources."fast-glob-3.2.4" + sources."fast-json-stable-stringify-2.1.0" + sources."fast-levenshtein-2.0.6" + sources."fastq-1.9.0" + sources."faunadb-3.0.1" + sources."fill-range-7.0.1" + sources."fn-annotate-1.2.0" + sources."for-in-1.0.2" + sources."forever-agent-0.6.1" + sources."form-data-2.3.3" + sources."fragment-cache-0.2.1" + sources."from2-2.3.0" + sources."fs-extra-9.0.1" + sources."fs.realpath-1.0.0" + sources."get-stream-3.0.0" + sources."get-value-2.0.6" + sources."getpass-0.1.7" + sources."glob-7.1.6" + sources."glob-parent-5.1.1" + sources."glob-to-regexp-0.3.0" + (sources."globby-8.0.2" // { + dependencies = [ + sources."@nodelib/fs.stat-1.1.3" + sources."array-union-1.0.2" + (sources."braces-2.3.2" // { + dependencies = [ + sources."extend-shallow-2.0.1" + ]; + }) + sources."dir-glob-2.0.0" + sources."fast-glob-2.2.7" + (sources."fill-range-4.0.0" // { + dependencies = [ + sources."extend-shallow-2.0.1" + ]; + }) + sources."glob-parent-3.1.0" + sources."ignore-3.3.10" + sources."is-glob-3.1.0" + (sources."is-number-3.0.0" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."micromatch-3.1.10" + sources."path-type-3.0.0" + sources."slash-1.0.0" + sources."to-regex-range-2.1.1" + ]; + }) + sources."got-8.3.2" + sources."graceful-fs-4.2.4" + sources."har-schema-2.0.0" + sources."har-validator-5.1.5" + sources."has-flag-3.0.0" + sources."has-symbol-support-x-1.4.2" + sources."has-to-string-tag-x-1.4.1" + sources."has-value-1.0.0" + (sources."has-values-1.0.0" // { + dependencies = [ + (sources."is-number-3.0.0" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."kind-of-4.0.0" + ]; + }) + (sources."heroku-cli-util-8.0.12" // { + dependencies = [ + sources."ansi-regex-3.0.0" + sources."ansi-styles-3.2.1" + sources."color-convert-1.9.3" + sources."color-name-1.1.3" + sources."strip-ansi-4.0.0" + ]; + }) + sources."heroku-client-3.1.0" + sources."http-cache-semantics-3.8.1" + sources."http-signature-1.2.0" + sources."hyperlinker-1.0.0" + sources."ignore-5.1.8" + sources."indent-string-4.0.0" + sources."inflight-1.0.6" + sources."inherits-2.0.4" + sources."ini-1.3.5" + sources."into-stream-3.1.0" + sources."is-accessor-descriptor-1.0.0" + sources."is-buffer-1.1.6" + sources."is-data-descriptor-1.0.0" + sources."is-descriptor-1.0.2" + sources."is-docker-2.1.1" + sources."is-extendable-0.1.1" + sources."is-extglob-2.1.1" + sources."is-fullwidth-code-point-3.0.0" + sources."is-glob-4.0.1" + sources."is-number-7.0.0" + sources."is-object-1.0.1" + sources."is-plain-obj-1.1.0" + sources."is-plain-object-2.0.4" + sources."is-retry-allowed-1.2.0" + sources."is-stream-1.1.0" + sources."is-typedarray-1.0.0" + sources."is-windows-1.0.2" + sources."is-wsl-2.2.0" + sources."isarray-1.0.0" + sources."isexe-2.0.0" + sources."isobject-3.0.1" + sources."isstream-0.1.2" + sources."isurl-1.0.0" + sources."jsbn-0.1.1" + sources."json-buffer-3.0.0" + sources."json-schema-0.2.3" + sources."json-schema-traverse-0.4.1" + sources."json-stringify-safe-5.0.1" + (sources."jsonfile-6.1.0" // { + dependencies = [ + sources."universalify-2.0.0" + ]; + }) + sources."jsprim-1.4.1" + sources."keyv-3.0.0" + sources."kind-of-6.0.3" + sources."levn-0.3.0" + sources."lodash-4.17.20" + sources."lodash._reinterpolate-3.0.0" + sources."lodash.template-4.5.0" + sources."lodash.templatesettings-4.2.0" + sources."lowercase-keys-1.0.1" + sources."map-cache-0.2.2" + sources."map-visit-1.0.0" + sources."merge2-1.4.1" + sources."micromatch-4.0.2" + sources."mime-db-1.44.0" + sources."mime-types-2.1.27" + sources."mimic-response-1.0.1" + sources."minimatch-3.0.4" + (sources."mixin-deep-1.3.2" // { + dependencies = [ + sources."is-extendable-1.0.1" + ]; + }) + sources."moment-2.29.1" + sources."ms-2.1.2" + sources."nanomatch-1.2.13" + (sources."netrc-parser-3.1.6" // { + dependencies = [ + sources."debug-3.2.6" + ]; + }) + sources."nice-try-1.0.5" + sources."node-fetch-2.6.1" + sources."normalize-url-2.0.1" + sources."npm-run-path-2.0.2" + sources."oauth-sign-0.9.0" + sources."object-assign-4.1.1" + (sources."object-copy-0.1.0" // { + dependencies = [ + sources."define-property-0.2.5" + sources."is-accessor-descriptor-0.1.6" + sources."is-data-descriptor-0.1.4" + (sources."is-descriptor-0.1.6" // { + dependencies = [ + sources."kind-of-5.1.0" + ]; + }) + sources."kind-of-3.2.2" + ]; + }) + sources."object-visit-1.0.1" + sources."object.pick-1.3.0" + sources."once-1.4.0" + sources."opn-3.0.3" + sources."optionator-0.8.3" + sources."p-cancelable-0.4.1" + sources."p-finally-1.0.0" + sources."p-is-promise-1.1.0" + sources."p-timeout-2.0.1" + sources."pascalcase-0.1.1" + sources."password-prompt-1.1.2" + sources."path-dirname-1.0.2" + sources."path-is-absolute-1.0.1" + sources."path-key-2.0.1" + sources."path-type-4.0.0" + sources."performance-now-2.1.0" + sources."picomatch-2.2.2" + sources."pify-3.0.0" + sources."posix-character-classes-0.1.1" + sources."prelude-ls-1.1.2" + sources."prepend-http-2.0.0" + sources."process-nextick-args-2.0.1" + sources."psl-1.8.0" + sources."punycode-2.1.1" + sources."qs-6.5.2" + sources."query-string-5.1.1" + sources."querystringify-2.2.0" + (sources."readable-stream-2.3.7" // { + dependencies = [ + sources."safe-buffer-5.1.2" + ]; + }) + sources."redeyed-2.1.1" + sources."regex-not-1.0.2" + sources."repeat-element-1.1.3" + sources."repeat-string-1.6.1" + sources."request-2.88.2" + sources."request-promise-4.2.6" + sources."request-promise-core-1.1.4" + sources."requires-port-1.0.0" + sources."resolve-url-0.2.1" + sources."responselike-1.0.2" + sources."ret-0.1.15" + sources."reusify-1.0.4" + sources."run-parallel-1.1.10" + sources."safe-buffer-5.2.1" + sources."safe-regex-1.1.0" + sources."safer-buffer-2.1.2" + sources."semver-7.3.2" + (sources."set-value-2.0.1" // { + dependencies = [ + sources."extend-shallow-2.0.1" + ]; + }) + sources."shebang-command-1.2.0" + sources."shebang-regex-1.0.0" + sources."signal-exit-3.0.3" + sources."slash-3.0.0" + (sources."snapdragon-0.8.2" // { + dependencies = [ + sources."debug-2.6.9" + sources."define-property-0.2.5" + sources."extend-shallow-2.0.1" + (sources."is-accessor-descriptor-0.1.6" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + (sources."is-data-descriptor-0.1.4" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."is-descriptor-0.1.6" + sources."kind-of-5.1.0" + sources."ms-2.0.0" + sources."source-map-0.5.7" + ]; + }) + (sources."snapdragon-node-2.1.1" // { + dependencies = [ + sources."define-property-1.0.0" + ]; + }) + (sources."snapdragon-util-3.0.1" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."sort-keys-2.0.0" + sources."source-map-0.6.1" + sources."source-map-resolve-0.5.3" + sources."source-map-url-0.4.0" + sources."split-string-3.1.0" + sources."sshpk-1.16.1" + (sources."static-extend-0.1.2" // { + dependencies = [ + sources."define-property-0.2.5" + (sources."is-accessor-descriptor-0.1.6" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + (sources."is-data-descriptor-0.1.4" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."is-descriptor-0.1.6" + sources."kind-of-5.1.0" + ]; + }) + sources."stealthy-require-1.1.1" + sources."strict-uri-encode-1.1.0" + sources."string-width-4.2.0" + (sources."string_decoder-1.1.1" // { + dependencies = [ + sources."safe-buffer-5.1.2" + ]; + }) + sources."strip-ansi-6.0.0" + sources."strip-eof-1.0.0" + sources."supports-color-5.5.0" + (sources."supports-hyperlinks-1.0.1" // { + dependencies = [ + sources."has-flag-2.0.0" + ]; + }) + sources."timed-out-4.0.1" + (sources."to-object-path-0.3.0" // { + dependencies = [ + sources."kind-of-3.2.2" + ]; + }) + sources."to-regex-3.0.2" + sources."to-regex-range-5.0.1" + sources."tough-cookie-2.5.0" + sources."treeify-1.1.0" + sources."tslib-1.14.1" + sources."tunnel-agent-0.6.0" + sources."tweetnacl-0.14.5" + sources."type-check-0.3.2" + sources."union-value-1.0.1" + sources."universalify-1.0.0" + (sources."unset-value-1.0.0" // { + dependencies = [ + (sources."has-value-0.3.1" // { + dependencies = [ + sources."isobject-2.1.0" + ]; + }) + sources."has-values-0.1.4" + ]; + }) + sources."uri-js-4.4.0" + sources."urix-0.1.0" + sources."url-parse-1.4.7" + sources."url-parse-lax-3.0.0" + sources."url-to-options-1.0.1" + sources."use-3.1.1" + sources."util-deprecate-1.0.2" + sources."uuid-3.4.0" + sources."verror-1.10.0" + sources."which-1.3.1" + sources."widest-line-3.1.0" + sources."word-wrap-1.2.3" + sources."wrap-ansi-7.0.0" + sources."wrappy-1.0.2" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "faunadb shell"; + homepage = https://github.com/fauna/fauna-shell; + license = "MPL-2.0"; + }; + production = true; + bypassCache = true; + reconstructLock = true; + }; fkill-cli = nodeEnv.buildNodePackage { name = "fkill-cli"; packageName = "fkill-cli"; @@ -73017,7 +74414,7 @@ in sources."error-ex-1.3.2" sources."esc-exit-2.0.2" sources."escape-string-regexp-1.0.5" - sources."execa-4.0.3" + sources."execa-4.1.0" sources."external-editor-3.1.0" sources."figures-3.2.0" sources."find-up-4.1.0" @@ -73026,8 +74423,10 @@ in sources."ps-list-7.2.0" ]; }) + sources."function-bind-1.1.1" sources."get-stream-5.2.0" sources."hard-rejection-2.1.0" + sources."has-1.0.3" sources."has-flag-4.0.0" sources."hosted-git-info-2.8.8" sources."human-signals-1.1.1" @@ -73038,12 +74437,13 @@ in sources."chalk-4.1.0" ]; }) - (sources."inquirer-autocomplete-prompt-1.2.0" // { + (sources."inquirer-autocomplete-prompt-1.3.0" // { dependencies = [ sources."chalk-4.1.0" ]; }) sources."is-arrayish-0.2.1" + sources."is-core-module-2.0.0" sources."is-fullwidth-code-point-3.0.0" sources."is-plain-obj-1.1.0" sources."is-stream-2.0.0" @@ -73114,7 +74514,7 @@ in ]; }) sources."redent-3.0.0" - sources."resolve-1.17.0" + sources."resolve-1.18.1" sources."restore-cursor-3.1.0" sources."run-async-2.4.1" sources."rxjs-6.6.3" @@ -73208,6 +74608,7 @@ in ]; }) sources."cache-base-1.0.1" + sources."call-bind-1.0.0" sources."caller-0.0.1" sources."camelcase-2.1.1" sources."chokidar-2.1.8" @@ -73299,6 +74700,7 @@ in sources."fs.realpath-1.0.0" sources."fsevents-1.2.13" sources."function-bind-1.1.1" + sources."get-intrinsic-1.0.1" sources."get-value-2.0.6" sources."glob-7.1.6" (sources."glob-parent-3.1.0" // { @@ -73388,7 +74790,7 @@ in sources."object-is-1.1.3" sources."object-keys-1.1.1" sources."object-visit-1.0.1" - sources."object.assign-4.1.1" + sources."object.assign-4.1.2" sources."object.pick-1.3.0" sources."once-1.4.0" sources."optimist-0.6.0" @@ -73494,16 +74896,8 @@ in }) sources."stream-combiner-0.0.4" sources."string-width-1.0.2" - (sources."string.prototype.trimend-1.0.1" // { - dependencies = [ - sources."es-abstract-1.17.7" - ]; - }) - (sources."string.prototype.trimstart-1.0.1" // { - dependencies = [ - sources."es-abstract-1.17.7" - ]; - }) + sources."string.prototype.trimend-1.0.2" + sources."string.prototype.trimstart-1.0.2" sources."string_decoder-1.1.1" sources."strip-ansi-3.0.1" sources."strip-json-comments-0.1.3" @@ -73698,7 +75092,7 @@ in sources."is-my-ip-valid-1.0.0" sources."is-my-json-valid-2.20.5" sources."is-property-1.0.2" - sources."is-valid-domain-0.0.16" + sources."is-valid-domain-0.0.17" sources."json-buffer-2.0.11" sources."jsonpointer-4.1.0" sources."kvgraph-0.1.0" @@ -73787,7 +75181,7 @@ in sources."separator-escape-0.0.0" sources."sha.js-2.4.5" sources."smart-buffer-4.1.0" - sources."socks-2.4.4" + sources."socks-2.5.0" sources."sodium-browserify-1.3.0" (sources."sodium-browserify-tweetnacl-0.2.6" // { dependencies = [ @@ -73904,7 +75298,7 @@ in sources."ansi-regex-5.0.0" sources."ansi-styles-4.3.0" sources."arrify-1.0.1" - sources."atomically-1.5.0" + sources."atomically-1.6.0" (sources."boxen-4.2.0" // { dependencies = [ sources."chalk-3.0.0" @@ -73952,13 +75346,14 @@ in sources."error-ex-1.3.2" sources."escape-goat-2.1.1" sources."escape-string-regexp-1.0.5" - sources."execa-4.0.3" + sources."execa-4.1.0" sources."external-editor-3.1.0" sources."fast-deep-equal-3.1.3" sources."fast-json-stable-stringify-2.1.0" sources."figures-3.2.0" sources."find-up-3.0.0" - sources."fuse.js-6.4.1" + sources."function-bind-1.1.1" + sources."fuse.js-6.4.3" sources."get-stream-5.2.0" sources."global-dirs-2.0.1" (sources."got-9.6.0" // { @@ -73968,6 +75363,7 @@ in }) sources."graceful-fs-4.2.4" sources."hard-rejection-2.1.0" + sources."has-1.0.3" sources."has-flag-4.0.0" sources."has-yarn-2.1.0" sources."hosted-git-info-2.8.8" @@ -73979,9 +75375,10 @@ in sources."indent-string-4.0.0" sources."ini-1.3.5" sources."inquirer-7.3.3" - sources."inquirer-autocomplete-prompt-1.2.0" + sources."inquirer-autocomplete-prompt-1.3.0" sources."is-arrayish-0.2.1" sources."is-ci-2.0.0" + sources."is-core-module-2.0.0" sources."is-fullwidth-code-point-3.0.0" sources."is-installed-globally-0.3.2" sources."is-interactive-1.0.0" @@ -74061,7 +75458,7 @@ in sources."prepend-http-2.0.0" sources."pump-3.0.0" sources."punycode-2.1.1" - sources."pupa-2.0.1" + sources."pupa-2.1.1" sources."quick-lru-4.0.1" sources."rc-1.2.8" (sources."read-pkg-5.2.0" // { @@ -74080,7 +75477,7 @@ in sources."redent-3.0.0" sources."registry-auth-token-4.2.0" sources."registry-url-5.1.0" - sources."resolve-1.17.0" + sources."resolve-1.18.1" sources."responselike-1.0.2" sources."restore-cursor-3.1.0" sources."run-async-2.4.1" @@ -74105,7 +75502,7 @@ in sources."strip-indent-3.0.0" sources."strip-json-comments-2.0.1" sources."supports-color-7.2.0" - sources."term-size-2.2.0" + sources."term-size-2.2.1" sources."through-2.3.8" sources."tmp-0.0.33" sources."to-readable-stream-1.0.0" @@ -74165,16 +75562,49 @@ in sources."@exodus/schemasafe-1.0.0-rc.3" sources."@graphql-cli/common-4.1.0" sources."@graphql-cli/init-4.1.0" - sources."@graphql-tools/delegate-6.2.4" - sources."@graphql-tools/graphql-file-loader-6.2.4" + (sources."@graphql-tools/batch-execute-7.0.0" // { + dependencies = [ + sources."@graphql-tools/utils-7.0.2" + ]; + }) + (sources."@graphql-tools/delegate-7.0.3" // { + dependencies = [ + sources."@graphql-tools/utils-7.0.2" + ]; + }) + (sources."@graphql-tools/graphql-file-loader-6.2.5" // { + dependencies = [ + sources."@graphql-tools/utils-7.0.2" + ]; + }) sources."@graphql-tools/import-6.2.4" - sources."@graphql-tools/json-file-loader-6.2.4" + (sources."@graphql-tools/json-file-loader-6.2.5" // { + dependencies = [ + sources."@graphql-tools/utils-7.0.2" + ]; + }) sources."@graphql-tools/load-6.2.4" - sources."@graphql-tools/merge-6.2.4" - sources."@graphql-tools/schema-6.2.4" - sources."@graphql-tools/url-loader-6.3.0" + (sources."@graphql-tools/merge-6.2.5" // { + dependencies = [ + sources."@graphql-tools/utils-7.0.2" + ]; + }) + (sources."@graphql-tools/schema-7.0.0" // { + dependencies = [ + sources."@graphql-tools/utils-7.0.2" + ]; + }) + (sources."@graphql-tools/url-loader-6.4.0" // { + dependencies = [ + sources."@graphql-tools/utils-7.0.2" + ]; + }) sources."@graphql-tools/utils-6.2.4" - sources."@graphql-tools/wrap-6.2.4" + (sources."@graphql-tools/wrap-7.0.1" // { + dependencies = [ + sources."@graphql-tools/utils-7.0.2" + ]; + }) sources."@kwsites/file-exists-1.1.1" sources."@kwsites/promise-deferred-1.1.1" sources."@nodelib/fs.scandir-2.1.3" @@ -74182,7 +75612,7 @@ in sources."@nodelib/fs.walk-1.2.4" sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" - sources."@types/node-14.11.10" + sources."@types/node-14.14.6" sources."@types/parse-json-4.0.0" sources."@types/websocket-1.0.1" sources."aggregate-error-3.1.0" @@ -74204,19 +75634,22 @@ in sources."at-least-node-1.0.0" sources."available-typed-arrays-1.0.2" sources."aws-sign2-0.7.0" - sources."aws4-1.10.1" + sources."aws4-1.11.0" sources."backo2-1.0.2" sources."balanced-match-1.0.0" + sources."base64-js-1.3.1" sources."bcrypt-pbkdf-1.0.2" sources."brace-expansion-1.1.11" sources."braces-3.0.2" - sources."bufferutil-4.0.1" + sources."buffer-5.7.0" + sources."bufferutil-4.0.2" (sources."cacheable-request-6.1.0" // { dependencies = [ sources."get-stream-5.2.0" sources."lowercase-keys-2.0.0" ]; }) + sources."call-bind-1.0.0" sources."call-me-maybe-1.0.1" sources."callsites-3.1.0" (sources."camel-case-4.1.1" // { @@ -74310,7 +75743,7 @@ in sources."fast-glob-3.2.4" sources."fast-json-stable-stringify-2.1.0" sources."fast-safe-stringify-2.0.7" - sources."fastq-1.8.0" + sources."fastq-1.9.0" sources."figlet-1.5.0" sources."figures-3.2.0" sources."fill-range-7.0.1" @@ -74326,6 +75759,7 @@ in sources."fullname-4.0.1" sources."function-bind-1.1.1" sources."get-caller-file-2.0.5" + sources."get-intrinsic-1.0.1" sources."get-stream-4.1.0" sources."getpass-0.1.7" sources."glob-7.1.6" @@ -74354,8 +75788,9 @@ in sources."http-signature-1.2.0" sources."http2-client-1.3.3" sources."iconv-lite-0.4.24" + sources."ieee754-1.2.1" sources."ignore-5.1.8" - (sources."import-fresh-3.2.1" // { + (sources."import-fresh-3.2.2" // { dependencies = [ sources."resolve-from-4.0.0" ]; @@ -74418,7 +75853,11 @@ in sources."json-schema-0.2.3" sources."json-schema-traverse-0.4.1" sources."json-stringify-safe-5.0.1" - sources."jsonfile-6.0.1" + (sources."jsonfile-6.1.0" // { + dependencies = [ + sources."universalify-2.0.0" + ]; + }) sources."jsonpath-plus-4.0.0" sources."jsprim-1.4.1" sources."keyv-3.1.0" @@ -74472,7 +75911,7 @@ in sources."node-emoji-1.10.0" sources."node-fetch-2.6.1" sources."node-fetch-h2-2.3.0" - sources."node-gyp-build-3.7.0" + sources."node-gyp-build-4.2.3" sources."node-readfiles-0.2.0" sources."normalize-path-2.1.1" sources."normalize-url-4.5.0" @@ -74490,7 +75929,7 @@ in sources."object-inspect-1.8.0" sources."object-is-1.1.3" sources."object-keys-1.1.1" - sources."object.assign-4.1.1" + sources."object.assign-4.1.2" sources."once-1.4.0" sources."onetime-2.0.1" sources."open-7.3.0" @@ -74565,7 +76004,7 @@ in sources."reusify-1.0.4" sources."rimraf-3.0.2" sources."run-async-2.4.1" - sources."run-parallel-1.1.9" + sources."run-parallel-1.1.10" (sources."rxjs-6.6.3" // { dependencies = [ sources."tslib-1.14.1" @@ -74596,16 +76035,8 @@ in sources."strip-ansi-6.0.0" ]; }) - (sources."string.prototype.trimend-1.0.1" // { - dependencies = [ - sources."es-abstract-1.17.7" - ]; - }) - (sources."string.prototype.trimstart-1.0.1" // { - dependencies = [ - sources."es-abstract-1.17.7" - ]; - }) + sources."string.prototype.trimend-1.0.2" + sources."string.prototype.trimstart-1.0.2" sources."strip-ansi-5.2.0" sources."strip-eof-1.0.0" sources."strip-json-comments-2.0.1" @@ -74617,6 +76048,7 @@ in ]; }) sources."symbol-observable-1.2.0" + sources."sync-fetch-0.3.0" sources."tar-6.0.5" sources."through-2.3.8" sources."tmp-0.2.1" @@ -74633,7 +76065,7 @@ in sources."unixify-1.0.0" sources."uri-js-4.4.0" sources."url-parse-lax-3.0.0" - sources."utf-8-validate-5.0.2" + sources."utf-8-validate-5.0.3" sources."uuid-3.4.0" sources."valid-url-1.0.9" sources."verror-1.10.0" @@ -74671,7 +76103,7 @@ in sources."cliui-7.0.3" sources."strip-ansi-6.0.0" sources."wrap-ansi-7.0.0" - sources."y18n-5.0.4" + sources."y18n-5.0.5" sources."yargs-parser-20.2.3" ]; }) @@ -74782,10 +76214,12 @@ in sources."for-in-1.0.2" sources."for-own-1.0.0" sources."fragment-cache-0.2.1" + sources."function-bind-1.1.1" sources."get-value-2.0.6" sources."global-modules-1.0.0" sources."global-prefix-1.0.2" sources."grunt-known-options-1.1.1" + sources."has-1.0.3" sources."has-value-1.0.0" (sources."has-values-1.0.0" // { dependencies = [ @@ -74798,6 +76232,7 @@ in sources."is-absolute-1.0.0" sources."is-accessor-descriptor-1.0.0" sources."is-buffer-1.1.6" + sources."is-core-module-2.0.0" sources."is-data-descriptor-1.0.0" sources."is-descriptor-1.0.2" sources."is-extendable-0.1.1" @@ -74860,7 +76295,7 @@ in sources."regex-not-1.0.2" sources."repeat-element-1.1.3" sources."repeat-string-1.6.1" - sources."resolve-1.17.0" + sources."resolve-1.18.1" sources."resolve-dir-1.0.1" sources."resolve-url-0.2.1" sources."ret-0.1.15" @@ -75043,7 +76478,7 @@ in sources."supports-color-7.2.0" ]; }) - sources."systeminformation-4.27.10" + sources."systeminformation-4.27.11" sources."term-canvas-0.0.5" sources."type-fest-0.11.0" sources."wordwrap-0.0.3" @@ -75127,6 +76562,7 @@ in sources."buffer-equal-1.0.0" sources."buffer-from-1.1.1" sources."cache-base-1.0.1" + sources."call-bind-1.0.0" sources."camelcase-3.0.0" sources."chokidar-2.1.8" (sources."class-utils-0.3.6" // { @@ -75179,8 +76615,6 @@ in sources."each-props-1.3.2" sources."end-of-stream-1.4.4" sources."error-ex-1.3.2" - sources."es-abstract-1.18.0-next.1" - sources."es-to-primitive-1.2.1" sources."es5-ext-0.10.53" sources."es6-iterator-2.0.3" sources."es6-symbol-3.1.3" @@ -75242,6 +76676,7 @@ in sources."fsevents-1.2.13" sources."function-bind-1.1.1" sources."get-caller-file-1.0.3" + sources."get-intrinsic-1.0.1" sources."get-value-2.0.6" sources."glob-7.1.6" (sources."glob-parent-3.1.0" // { @@ -75277,25 +76712,21 @@ in sources."is-arrayish-0.2.1" sources."is-binary-path-1.0.1" sources."is-buffer-1.1.6" - sources."is-callable-1.2.2" + sources."is-core-module-2.0.0" sources."is-data-descriptor-1.0.0" - sources."is-date-object-1.0.2" sources."is-descriptor-1.0.2" sources."is-extendable-0.1.1" sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-1.0.0" sources."is-glob-4.0.1" sources."is-negated-glob-1.0.0" - sources."is-negative-zero-2.0.0" (sources."is-number-3.0.0" // { dependencies = [ sources."kind-of-3.2.2" ]; }) sources."is-plain-object-2.0.4" - sources."is-regex-1.1.1" sources."is-relative-1.0.0" - sources."is-symbol-1.0.3" sources."is-unc-path-1.0.0" sources."is-utf8-0.2.1" sources."is-valid-glob-1.0.0" @@ -75350,10 +76781,9 @@ in sources."kind-of-3.2.2" ]; }) - sources."object-inspect-1.8.0" sources."object-keys-1.1.1" sources."object-visit-1.0.1" - sources."object.assign-4.1.1" + sources."object.assign-4.1.2" sources."object.defaults-1.1.0" sources."object.map-1.0.1" sources."object.pick-1.3.0" @@ -75396,7 +76826,7 @@ in sources."replace-homedir-1.0.0" sources."require-directory-2.1.1" sources."require-main-filename-1.0.1" - sources."resolve-1.17.0" + sources."resolve-1.18.1" sources."resolve-dir-1.0.1" sources."resolve-options-1.1.0" sources."resolve-url-0.2.1" @@ -75469,16 +76899,6 @@ in sources."stream-exhaust-1.0.2" sources."stream-shift-1.0.1" sources."string-width-1.0.2" - (sources."string.prototype.trimend-1.0.1" // { - dependencies = [ - sources."es-abstract-1.17.7" - ]; - }) - (sources."string.prototype.trimstart-1.0.1" // { - dependencies = [ - sources."es-abstract-1.17.7" - ]; - }) sources."string_decoder-1.1.1" sources."strip-ansi-3.0.1" sources."strip-bom-2.0.0" @@ -75580,6 +77000,7 @@ in }) sources."buffer-from-1.1.1" sources."cache-base-1.0.1" + sources."call-bind-1.0.0" sources."camelcase-3.0.0" (sources."class-utils-0.3.6" // { dependencies = [ @@ -75609,8 +77030,6 @@ in sources."detect-file-1.0.0" sources."each-props-1.3.2" sources."error-ex-1.3.2" - sources."es-abstract-1.18.0-next.1" - sources."es-to-primitive-1.2.1" sources."es5-ext-0.10.53" sources."es6-iterator-2.0.3" sources."es6-symbol-3.1.3" @@ -75657,6 +77076,7 @@ in sources."fragment-cache-0.2.1" sources."function-bind-1.1.1" sources."get-caller-file-1.0.3" + sources."get-intrinsic-1.0.1" sources."get-value-2.0.6" sources."global-modules-1.0.0" sources."global-prefix-1.0.2" @@ -75685,13 +77105,12 @@ in }) sources."is-arrayish-0.2.1" sources."is-buffer-1.1.6" - sources."is-callable-1.2.2" + sources."is-core-module-2.0.0" (sources."is-data-descriptor-1.0.0" // { dependencies = [ sources."kind-of-6.0.3" ]; }) - sources."is-date-object-1.0.2" (sources."is-descriptor-1.0.2" // { dependencies = [ sources."kind-of-6.0.3" @@ -75701,16 +77120,13 @@ in sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-1.0.0" sources."is-glob-4.0.1" - sources."is-negative-zero-2.0.0" (sources."is-number-3.0.0" // { dependencies = [ sources."kind-of-3.2.2" ]; }) sources."is-plain-object-2.0.4" - sources."is-regex-1.1.1" sources."is-relative-1.0.0" - sources."is-symbol-1.0.3" sources."is-unc-path-1.0.0" sources."is-utf8-0.2.1" sources."is-windows-1.0.2" @@ -75767,10 +77183,9 @@ in sources."kind-of-3.2.2" ]; }) - sources."object-inspect-1.8.0" sources."object-keys-1.1.1" sources."object-visit-1.0.1" - sources."object.assign-4.1.1" + sources."object.assign-4.1.2" sources."object.defaults-1.1.0" sources."object.map-1.0.1" sources."object.pick-1.3.0" @@ -75802,7 +77217,7 @@ in sources."replace-homedir-1.0.0" sources."require-directory-2.1.1" sources."require-main-filename-1.0.1" - sources."resolve-1.17.0" + sources."resolve-1.18.1" sources."resolve-dir-1.0.1" sources."resolve-url-0.2.1" sources."ret-0.1.15" @@ -75856,16 +77271,6 @@ in ]; }) sources."string-width-1.0.2" - (sources."string.prototype.trimend-1.0.1" // { - dependencies = [ - sources."es-abstract-1.17.7" - ]; - }) - (sources."string.prototype.trimstart-1.0.1" // { - dependencies = [ - sources."es-abstract-1.17.7" - ]; - }) sources."string_decoder-1.1.1" sources."strip-ansi-3.0.1" sources."strip-bom-2.0.0" @@ -75950,7 +77355,7 @@ in sources."param-case-2.1.1" sources."relateurl-0.2.7" sources."source-map-0.6.1" - sources."uglify-js-3.11.3" + sources."uglify-js-3.11.5" sources."upper-case-1.1.3" ]; buildInputs = globalBuildInputs; @@ -75979,7 +77384,7 @@ in sources."async-3.2.0" sources."asynckit-0.4.0" sources."aws-sign2-0.7.0" - sources."aws4-1.10.1" + sources."aws4-1.11.0" sources."balanced-match-1.0.0" sources."bcrypt-pbkdf-1.0.2" sources."brace-expansion-1.1.11" @@ -76175,7 +77580,7 @@ in sources."assert-plus-1.0.0" sources."asynckit-0.4.0" sources."aws-sign2-0.7.0" - sources."aws4-1.10.1" + sources."aws4-1.11.0" sources."bcrypt-pbkdf-1.0.2" sources."boolbase-1.0.0" sources."camelcase-1.2.1" @@ -76464,44 +77869,65 @@ in insect = nodeEnv.buildNodePackage { name = "insect"; packageName = "insect"; - version = "5.5.0"; + version = "5.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/insect/-/insect-5.5.0.tgz"; - sha512 = "Oac190s8AGYOYDvAP7PLNFm3gA+dtSoHl5yYGf9sgvMB+I8bRPfSNI6q4kra1QubpN5+/ARfGjGjAFUu10QsIg=="; + url = "https://registry.npmjs.org/insect/-/insect-5.6.0.tgz"; + sha512 = "56gjTrj9SMfPkbGANfqtGYeY3G5KmCkpgEYlKkmiDNG+SpQtLT9/53gt/9CbYd5iT9GgP+IvGXwDWplgCz3NnA=="; }; dependencies = [ - sources."@types/jquery-3.5.3" + sources."@types/jquery-3.5.4" sources."@types/sizzle-2.3.2" + sources."arch-2.2.0" sources."balanced-match-1.0.0" sources."brace-expansion-1.1.11" sources."clipboard-2.0.6" + sources."clipboardy-2.3.0" sources."clone-1.0.4" sources."concat-map-0.0.1" + sources."cross-spawn-6.0.5" sources."decimal.js-7.5.1" sources."defaults-1.0.3" sources."delegate-3.2.0" + sources."end-of-stream-1.4.4" + sources."execa-1.0.0" sources."fs-extra-0.24.0" sources."fs.realpath-1.0.0" + sources."get-stream-4.1.0" sources."glob-7.1.6" sources."good-listener-1.2.2" sources."graceful-fs-4.2.4" sources."historic-readline-1.0.8" sources."inflight-1.0.6" sources."inherits-2.0.4" + sources."is-docker-2.1.1" + sources."is-stream-1.1.0" + sources."is-wsl-2.2.0" + sources."isexe-2.0.0" sources."jquery-3.5.1" - sources."jquery.terminal-2.18.3" + sources."jquery.terminal-2.19.2" sources."jsonfile-2.4.0" sources."keyboardevent-key-polyfill-1.1.0" sources."line-reader-0.4.0" sources."minimatch-3.0.4" + sources."nice-try-1.0.5" + sources."npm-run-path-2.0.2" sources."once-1.4.0" sources."os-homedir-1.0.2" + sources."p-finally-1.0.0" sources."path-is-absolute-1.0.1" + sources."path-key-2.0.1" sources."prismjs-1.22.0" + sources."pump-3.0.0" sources."rimraf-2.7.1" sources."select-1.1.2" + sources."semver-5.7.1" + sources."shebang-command-1.2.0" + sources."shebang-regex-1.0.0" + sources."signal-exit-3.0.3" + sources."strip-eof-1.0.0" sources."tiny-emitter-2.1.0" sources."wcwidth-1.0.1" + sources."which-1.3.1" sources."wrappy-1.0.2" sources."xdg-basedir-2.0.0" ]; @@ -76536,7 +77962,7 @@ in sources."@ionic/utils-subprocess-1.0.13" sources."@ionic/utils-terminal-1.1.2" sources."@tootallnate/once-1.1.2" - sources."agent-base-6.0.1" + sources."agent-base-6.0.2" sources."ansi-escapes-3.2.0" sources."ansi-regex-4.1.0" sources."ansi-styles-3.2.1" @@ -76739,7 +78165,7 @@ in ]; }) sources."smart-buffer-4.1.0" - sources."socks-2.4.4" + sources."socks-2.5.0" sources."socks-proxy-agent-5.0.0" sources."source-map-0.6.1" sources."split2-3.2.2" @@ -76813,19 +78239,83 @@ in bypassCache = true; reconstructLock = true; }; - "iosevka-build-deps-../../data/fonts/iosevka" = nodeEnv.buildNodePackage { - name = "iosevka-build-deps"; - packageName = "iosevka-build-deps"; - version = "3.2.2"; - src = ../../data/fonts/iosevka; + "iosevka-https://github.com/be5invis/Iosevka/archive/v3.7.1.tar.gz" = nodeEnv.buildNodePackage { + name = "iosevka"; + packageName = "iosevka"; + version = "3.7.1"; + src = fetchurl { + name = "iosevka-3.7.1.tar.gz"; + url = https://codeload.github.com/be5invis/Iosevka/tar.gz/v3.7.1; + sha256 = "ed7aee70af326ef22458f8f7603c599fd2f5164ae8062fbd6fb7d56864d98aca"; + }; dependencies = [ sources."@iarna/toml-2.2.5" - sources."@josh-brown/vector-3.4.0" - sources."JSONStream-1.3.5" + sources."@ot-builder/bin-composite-types-0.10.31" + sources."@ot-builder/bin-util-0.10.31" + (sources."@ot-builder/cli-help-shower-0.10.31" // { + dependencies = [ + sources."ansi-styles-4.3.0" + sources."chalk-4.1.0" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" + sources."has-flag-4.0.0" + sources."supports-color-7.2.0" + ]; + }) + (sources."@ot-builder/cli-proc-0.10.31" // { + dependencies = [ + sources."ansi-styles-4.3.0" + sources."chalk-4.1.0" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" + sources."has-flag-4.0.0" + sources."supports-color-7.2.0" + ]; + }) + (sources."@ot-builder/cli-shared-0.10.31" // { + dependencies = [ + sources."ansi-styles-4.3.0" + sources."chalk-4.1.0" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" + sources."has-flag-4.0.0" + sources."supports-color-7.2.0" + ]; + }) + sources."@ot-builder/common-impl-0.10.31" + sources."@ot-builder/errors-0.10.31" + sources."@ot-builder/io-bin-cff-0.10.31" + sources."@ot-builder/io-bin-encoding-0.10.31" + sources."@ot-builder/io-bin-ext-private-0.10.31" + sources."@ot-builder/io-bin-font-0.10.31" + sources."@ot-builder/io-bin-glyph-store-0.10.31" + sources."@ot-builder/io-bin-layout-0.10.31" + sources."@ot-builder/io-bin-metadata-0.10.31" + sources."@ot-builder/io-bin-metric-0.10.31" + sources."@ot-builder/io-bin-name-0.10.31" + sources."@ot-builder/io-bin-sfnt-0.10.31" + sources."@ot-builder/io-bin-ttf-0.10.31" + sources."@ot-builder/ot-0.10.31" + sources."@ot-builder/ot-encoding-0.10.31" + sources."@ot-builder/ot-ext-private-0.10.31" + sources."@ot-builder/ot-glyphs-0.10.31" + sources."@ot-builder/ot-layout-0.10.31" + sources."@ot-builder/ot-metadata-0.10.31" + sources."@ot-builder/ot-name-0.10.31" + sources."@ot-builder/ot-sfnt-0.10.31" + sources."@ot-builder/ot-standard-glyph-namer-0.10.31" + sources."@ot-builder/prelude-0.10.31" + sources."@ot-builder/primitive-0.10.31" + sources."@ot-builder/rectify-0.10.31" + sources."@ot-builder/stat-glyphs-0.10.31" + sources."@ot-builder/trace-0.10.31" + sources."@ot-builder/var-store-0.10.31" + sources."@ot-builder/variance-0.10.31" + sources."@unicode/unicode-13.0.0-1.0.2" sources."abbrev-1.1.1" sources."ajv-6.12.6" sources."amdefine-1.0.1" - sources."ansi-regex-5.0.0" + sources."ansi-regex-2.1.1" sources."ansi-styles-3.2.1" sources."aproba-1.2.0" sources."are-we-there-yet-1.1.5" @@ -76837,23 +78327,22 @@ in sources."at-least-node-1.0.0" sources."atob-2.1.2" sources."aws-sign2-0.7.0" - sources."aws4-1.10.1" + sources."aws4-1.11.0" sources."balanced-match-1.0.0" sources."bcrypt-pbkdf-1.0.2" sources."bindings-1.5.0" sources."bluebird-3.7.2" sources."brace-expansion-1.1.11" sources."bufferstreams-2.0.1" - sources."camelcase-5.3.1" + sources."camelcase-3.0.0" sources."caseless-0.12.0" sources."chainsaw-0.0.9" sources."chalk-2.4.2" - sources."child-process-promise-2.2.1" sources."chownr-1.1.4" sources."cldr-5.7.0" sources."cli-cursor-3.1.0" sources."clipper-lib-6.4.2" - sources."cliui-6.0.0" + sources."cliui-3.2.0" sources."code-point-at-1.1.0" sources."color-convert-1.9.3" sources."color-name-1.1.3" @@ -76861,12 +78350,6 @@ in sources."concat-map-0.0.1" sources."console-control-strings-1.1.0" sources."core-util-is-1.0.2" - (sources."cross-spawn-4.0.2" // { - dependencies = [ - sources."lru-cache-4.1.5" - sources."which-1.3.1" - ]; - }) sources."css-2.2.4" sources."css-parse-2.0.0" sources."dashdash-1.14.1" @@ -76914,37 +78397,33 @@ in sources."fast-levenshtein-2.0.6" sources."file-uri-to-path-1.0.0" sources."filelist-1.0.1" - sources."find-up-4.1.0" - sources."first-chunk-stream-3.0.0" + sources."find-up-1.1.2" sources."forever-agent-0.6.1" sources."form-data-2.3.3" sources."fs-extra-9.0.1" sources."fs-minipass-1.2.7" sources."fs.realpath-1.0.0" - (sources."gauge-2.7.4" // { - dependencies = [ - sources."ansi-regex-2.1.1" - sources."is-fullwidth-code-point-1.0.0" - sources."string-width-1.0.2" - sources."strip-ansi-3.0.1" - ]; - }) - sources."get-caller-file-2.0.5" + sources."function-bind-1.1.1" + sources."gauge-2.7.4" + sources."get-caller-file-1.0.3" sources."getpass-0.1.7" sources."glob-7.1.6" sources."graceful-fs-4.2.4" sources."har-schema-2.0.0" sources."har-validator-5.1.5" + sources."has-1.0.3" sources."has-flag-3.0.0" sources."has-unicode-2.0.1" sources."hashish-0.0.4" sources."hosted-git-info-2.8.8" sources."http-signature-1.2.0" + sources."iconv-lite-0.6.2" sources."inflight-1.0.6" sources."inherits-2.0.4" sources."invert-kv-1.0.0" sources."is-arrayish-0.2.1" - sources."is-fullwidth-code-point-3.0.0" + sources."is-core-module-2.0.0" + sources."is-fullwidth-code-point-1.0.0" sources."is-typedarray-1.0.0" sources."is-utf8-0.2.1" sources."isarray-1.0.0" @@ -76955,8 +78434,11 @@ in sources."json-schema-0.2.3" sources."json-schema-traverse-0.4.1" sources."json-stringify-safe-5.0.1" - sources."jsonfile-6.0.1" - sources."jsonparse-1.3.1" + (sources."jsonfile-6.1.0" // { + dependencies = [ + sources."universalify-2.0.0" + ]; + }) sources."jsprim-1.4.1" sources."lcid-1.0.0" sources."levn-0.3.0" @@ -76970,11 +78452,7 @@ in sources."mimic-fn-2.1.0" sources."minimatch-3.0.4" sources."minimist-1.2.5" - (sources."minipass-2.9.0" // { - dependencies = [ - sources."yallist-3.1.1" - ]; - }) + sources."minipass-2.9.0" sources."minizlib-1.3.3" sources."mkdirp-1.0.4" sources."ms-2.0.0" @@ -76986,7 +78464,6 @@ in sources."which-1.3.1" ]; }) - sources."node-version-1.2.0" sources."nopt-3.0.6" (sources."normalize-package-data-2.5.0" // { dependencies = [ @@ -77004,31 +78481,25 @@ in sources."os-locale-1.4.0" sources."os-tmpdir-1.0.2" sources."osenv-0.1.5" - sources."otfcc-ttcize-0.10.2" + sources."ot-builder-0.10.31" + (sources."otb-ttc-bundle-0.10.31" // { + dependencies = [ + sources."ansi-styles-4.3.0" + sources."chalk-4.1.0" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" + sources."has-flag-4.0.0" + sources."supports-color-7.2.0" + ]; + }) sources."p-limit-2.3.0" sources."p-locate-4.1.0" sources."p-try-2.2.0" sources."pako-1.0.11" sources."parse-json-2.2.0" sources."passerror-1.1.1" - (sources."patel-0.33.1" // { - dependencies = [ - sources."ansi-regex-2.1.1" - sources."camelcase-3.0.0" - sources."cliui-3.2.0" - sources."get-caller-file-1.0.3" - sources."is-fullwidth-code-point-1.0.0" - sources."require-main-filename-1.0.1" - sources."string-width-1.0.2" - sources."strip-ansi-3.0.1" - sources."which-module-1.0.0" - sources."wrap-ansi-2.1.0" - sources."y18n-3.2.1" - sources."yargs-6.6.0" - sources."yargs-parser-4.2.1" - ]; - }) - sources."path-exists-4.0.0" + sources."patel-0.33.1" + sources."path-exists-2.1.0" sources."path-is-absolute-1.0.1" sources."path-parse-1.0.6" sources."path-type-1.1.0" @@ -77040,29 +78511,21 @@ in sources."pinkie-2.0.4" sources."pinkie-promise-2.0.1" sources."prelude-ls-1.1.2" - sources."prettier-2.1.2" sources."process-nextick-args-2.0.1" - sources."promise-polyfill-6.1.0" - sources."pseudomap-1.0.2" sources."psl-1.8.0" sources."punycode-2.1.1" sources."qs-6.5.2" sources."read-pkg-1.1.0" - (sources."read-pkg-up-1.0.1" // { - dependencies = [ - sources."find-up-1.1.2" - sources."path-exists-2.1.0" - ]; - }) + sources."read-pkg-up-1.0.1" sources."readable-stream-2.3.7" sources."request-2.88.2" sources."require-directory-2.1.1" - sources."require-main-filename-2.0.0" - sources."resolve-1.17.0" + sources."require-main-filename-1.0.1" + sources."resolve-1.18.1" sources."resolve-url-0.2.1" sources."restore-cursor-3.1.0" sources."resumer-0.0.0" - sources."rimraf-2.6.3" + sources."rimraf-2.7.1" sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" sources."sax-1.2.4" @@ -77078,17 +78541,19 @@ in sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" sources."spdx-license-ids-3.0.6" - sources."spiro-2.0.0" + (sources."spiro-2.0.0" // { + dependencies = [ + sources."tslib-1.14.1" + ]; + }) sources."split-1.0.1" sources."sprintf-js-1.0.3" sources."sshpk-1.16.1" sources."stack-trace-0.0.9" - sources."string-width-4.2.0" + sources."string-width-1.0.2" sources."string_decoder-1.1.1" - sources."strip-ansi-6.0.0" + sources."strip-ansi-3.0.1" sources."strip-bom-2.0.0" - sources."strip-bom-buf-2.0.0" - sources."strip-bom-stream-4.0.0" (sources."stylus-0.54.8" // { dependencies = [ sources."semver-6.3.0" @@ -77099,69 +78564,66 @@ in (sources."tar-4.4.13" // { dependencies = [ sources."mkdirp-0.5.5" - sources."yallist-3.1.1" ]; }) - sources."temp-0.9.1" sources."through-2.3.8" - sources."topsort-0.0.2" + sources."toposort-2.0.2" sources."tough-cookie-2.5.0" sources."traverse-0.3.9" sources."ts-process-promises-1.0.2" - sources."tslib-1.14.1" + sources."tslib-2.0.3" sources."ttf2woff-2.0.2" sources."ttf2woff2-3.0.0" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."type-check-0.3.2" - sources."typo-geom-0.8.4" - sources."unicode-13.0.0-0.8.0" + sources."typo-geom-0.11.0" sources."unicoderegexp-0.4.1" sources."universalify-1.0.0" - sources."unorm-1.6.0" sources."uri-js-4.4.0" sources."urix-0.1.0" sources."util-deprecate-1.0.2" sources."uuid-3.4.0" sources."validate-npm-package-license-3.0.4" - (sources."verda-1.1.1" // { + (sources."verda-1.1.2" // { dependencies = [ + sources."ansi-regex-5.0.0" sources."ansi-styles-4.3.0" + sources."camelcase-5.3.1" sources."chalk-4.1.0" + sources."cliui-6.0.0" sources."color-convert-2.0.1" sources."color-name-1.1.4" + sources."find-up-4.1.0" + sources."get-caller-file-2.0.5" sources."has-flag-4.0.0" + sources."is-fullwidth-code-point-3.0.0" + sources."path-exists-4.0.0" + sources."require-main-filename-2.0.0" + sources."string-width-4.2.0" + sources."strip-ansi-6.0.0" sources."supports-color-7.2.0" - sources."tslib-2.0.3" + sources."which-module-2.0.0" + sources."wrap-ansi-6.2.0" + sources."y18n-4.0.0" + sources."yargs-15.4.1" + sources."yargs-parser-18.1.3" ]; }) sources."verror-1.10.0" sources."which-2.0.2" - sources."which-module-2.0.0" - (sources."wide-align-1.1.3" // { - dependencies = [ - sources."ansi-regex-3.0.0" - sources."is-fullwidth-code-point-2.0.0" - sources."string-width-2.1.1" - sources."strip-ansi-4.0.0" - ]; - }) + sources."which-module-1.0.0" + sources."wide-align-1.1.3" sources."word-wrap-1.2.3" sources."wordwrap-0.0.3" - (sources."wrap-ansi-6.2.0" // { - dependencies = [ - sources."ansi-styles-4.3.0" - sources."color-convert-2.0.1" - sources."color-name-1.1.4" - ]; - }) + sources."wrap-ansi-2.1.0" sources."wrappy-1.0.2" sources."xmldom-0.3.0" sources."xpath-0.0.27" - sources."y18n-4.0.0" - sources."yallist-2.1.2" - sources."yargs-15.4.1" - sources."yargs-parser-18.1.3" + sources."y18n-3.2.1" + sources."yallist-3.1.1" + sources."yargs-6.6.0" + sources."yargs-parser-4.2.1" ]; buildInputs = globalBuildInputs; meta = { @@ -77292,10 +78754,10 @@ in joplin = nodeEnv.buildNodePackage { name = "joplin"; packageName = "joplin"; - version = "1.2.3"; + version = "1.3.3"; src = fetchurl { - url = "https://registry.npmjs.org/joplin/-/joplin-1.2.3.tgz"; - sha512 = "oXopPtdqjEGhjeDjhULGbgZ47+auGaZIhWwgKSnYmrw47scWgXIlNztwFaH4xyTRsm+mCJ/WwPTruloNfTMQhw=="; + url = "https://registry.npmjs.org/joplin/-/joplin-1.3.3.tgz"; + sha512 = "6QhCBf0amMaVX6u90Uy84hEdHLPthTrQIbgUBFccFpBC1bowdj85C3tSYEfrSCf72OtjwwT26OaHuRJgzCmb8A=="; }; dependencies = [ sources."@cronvel/get-pixels-3.4.0" @@ -77344,7 +78806,7 @@ in sources."async-mutex-0.1.4" sources."asynckit-0.4.0" sources."atob-2.1.2" - (sources."aws-sdk-2.773.0" // { + (sources."aws-sdk-2.784.0" // { dependencies = [ sources."sax-1.2.1" sources."uuid-3.3.2" @@ -77352,7 +78814,7 @@ in ]; }) sources."aws-sign2-0.7.0" - sources."aws4-1.10.1" + sources."aws4-1.11.0" sources."balanced-match-1.0.0" (sources."base-0.11.2" // { dependencies = [ @@ -77365,7 +78827,7 @@ in sources."bcrypt-pbkdf-1.0.2" (sources."bl-4.0.3" // { dependencies = [ - sources."buffer-5.6.0" + sources."buffer-5.7.0" ]; }) sources."brace-expansion-1.1.11" @@ -77376,6 +78838,7 @@ in }) sources."browser-process-hrtime-1.0.0" sources."buffer-4.9.2" + sources."builtin-modules-3.1.0" sources."cache-base-1.0.1" sources."camel-case-3.0.0" sources."camelcase-4.1.0" @@ -77603,6 +79066,7 @@ in ]; }) sources."image-type-3.1.0" + sources."immer-7.0.14" sources."inflight-1.0.6" sources."inherits-2.0.4" sources."ini-1.3.5" @@ -77666,7 +79130,7 @@ in sources."isobject-3.0.1" sources."isstream-0.1.2" sources."jmespath-0.15.0" - sources."joplin-turndown-4.0.29" + sources."joplin-turndown-4.0.30" sources."joplin-turndown-plugin-gfm-1.0.12" sources."jpeg-js-0.4.2" sources."js-tokens-4.0.0" @@ -77734,7 +79198,6 @@ in sources."md5-2.3.0" sources."md5-file-4.0.0" sources."mdurl-1.0.1" - sources."memory-cache-0.2.0" sources."micromatch-3.1.10" sources."mime-2.4.6" sources."mime-db-1.44.0" @@ -77755,6 +79218,7 @@ in sources."ms-2.0.0" sources."multiparty-4.2.2" sources."nan-2.14.1" + sources."nanoid-3.1.16" (sources."nanomatch-1.2.13" // { dependencies = [ sources."is-windows-1.0.2" @@ -77769,7 +79233,7 @@ in sources."ms-2.1.2" ]; }) - sources."nextgen-events-1.3.0" + sources."nextgen-events-1.3.3" sources."nice-try-1.0.5" sources."no-case-2.3.2" sources."node-abi-2.19.1" @@ -77851,6 +79315,7 @@ in sources."querystringify-2.2.0" sources."random-bytes-1.0.0" sources."rc-1.2.8" + sources."re-reselect-4.0.0" sources."read-chunk-2.1.0" sources."readable-stream-3.6.0" sources."reduce-flatten-1.0.1" @@ -77879,6 +79344,7 @@ in ]; }) sources."requires-port-1.0.0" + sources."reselect-4.0.0" sources."resolve-url-0.2.1" sources."ret-0.1.15" sources."retry-0.10.1" @@ -77898,7 +79364,7 @@ in }) sources."setimmediate-1.0.5" sources."setprototypeof-1.2.0" - sources."seventh-0.7.35" + sources."seventh-0.7.36" (sources."sharp-0.23.4" // { dependencies = [ sources."semver-6.3.0" @@ -77917,7 +79383,6 @@ in sources."is-fullwidth-code-point-2.0.0" ]; }) - sources."slug-3.5.1" (sources."snapdragon-0.8.2" // { dependencies = [ sources."define-property-0.2.5" @@ -78065,6 +79530,7 @@ in sources."union-value-1.0.1" sources."uniq-1.0.1" sources."universalify-0.1.2" + sources."unorm-1.6.0" sources."unpack-string-0.0.2" (sources."unset-value-1.0.0" // { dependencies = [ @@ -78086,6 +79552,7 @@ in sources."url-0.10.3" sources."url-parse-1.4.7" sources."use-3.1.1" + sources."uslug-git+https://github.com/laurent22/uslug.git#emoji-support" sources."util-deprecate-1.0.2" sources."uuid-3.4.0" sources."valid-url-1.0.9" @@ -78206,7 +79673,7 @@ in sha512 = "znR99e1BHeyEkSvgDDpX0sTiTu+8aQyDl9DawrkOGZTTW8hv0deIFXx87114zJ7gRaDZKVQD/4tr1ifmJp9xhQ=="; }; dependencies = [ - sources."@babel/parser-7.12.3" + sources."@babel/parser-7.12.5" sources."argparse-1.0.10" sources."bluebird-3.7.2" sources."catharsis-0.8.11" @@ -78551,7 +80018,7 @@ in sources."prepend-http-2.0.0" sources."proxy-addr-2.0.6" sources."pump-3.0.0" - sources."pupa-2.0.1" + sources."pupa-2.1.1" sources."qs-6.7.0" sources."range-parser-1.2.1" sources."raw-body-2.4.0" @@ -78589,7 +80056,7 @@ in sources."strip-ansi-5.2.0" sources."strip-json-comments-2.0.1" sources."supports-color-7.2.0" - sources."term-size-2.2.0" + sources."term-size-2.2.1" sources."to-readable-stream-1.0.0" sources."toidentifier-1.0.0" sources."type-fest-0.8.1" @@ -78873,6 +80340,7 @@ in sources."balanced-match-1.0.0" sources."brace-expansion-1.1.11" sources."buffer-equal-1.0.0" + sources."call-bind-1.0.0" sources."clone-2.1.2" sources."clone-buffer-1.0.0" sources."clone-stats-1.0.0" @@ -78883,13 +80351,12 @@ in sources."define-properties-1.1.3" sources."duplexify-3.7.1" sources."end-of-stream-1.4.4" - sources."es-abstract-1.18.0-next.1" - sources."es-to-primitive-1.2.1" sources."extend-3.0.2" sources."flush-write-stream-1.1.1" sources."fs-mkdirp-stream-1.0.0" sources."fs.realpath-1.0.0" sources."function-bind-1.1.1" + sources."get-intrinsic-1.0.1" sources."glob-7.1.6" sources."glob-parent-3.1.0" sources."glob-stream-6.1.0" @@ -78900,15 +80367,10 @@ in sources."inherits-2.0.4" sources."is-absolute-1.0.0" sources."is-buffer-1.1.6" - sources."is-callable-1.2.2" - sources."is-date-object-1.0.2" sources."is-extglob-2.1.1" sources."is-glob-3.1.0" sources."is-negated-glob-1.0.0" - sources."is-negative-zero-2.0.0" - sources."is-regex-1.1.1" sources."is-relative-1.0.0" - sources."is-symbol-1.0.3" sources."is-unc-path-1.0.0" sources."is-utf8-0.2.1" sources."is-valid-glob-1.0.0" @@ -78920,9 +80382,8 @@ in sources."minimatch-3.0.4" sources."normalize-path-2.1.1" sources."now-and-later-2.0.1" - sources."object-inspect-1.8.0" sources."object-keys-1.1.1" - sources."object.assign-4.1.1" + sources."object.assign-4.1.2" sources."once-1.4.0" sources."ordered-read-streams-1.0.1" sources."path-dirname-1.0.2" @@ -78938,16 +80399,6 @@ in sources."resolve-options-1.1.0" sources."safe-buffer-5.1.2" sources."stream-shift-1.0.1" - (sources."string.prototype.trimend-1.0.1" // { - dependencies = [ - sources."es-abstract-1.17.7" - ]; - }) - (sources."string.prototype.trimstart-1.0.1" // { - dependencies = [ - sources."es-abstract-1.17.7" - ]; - }) sources."string_decoder-1.1.1" sources."through2-2.0.5" sources."through2-filter-3.0.0" @@ -78993,7 +80444,7 @@ in sources."async-1.5.2" sources."asynckit-0.4.0" sources."aws-sign2-0.7.0" - sources."aws4-1.10.1" + sources."aws4-1.11.0" sources."balanced-match-1.0.0" sources."bcrypt-pbkdf-1.0.2" sources."boolbase-1.0.0" @@ -79336,8 +80787,8 @@ in sources."@lerna/write-log-file-3.13.0" sources."@mrmlnc/readdir-enhanced-2.2.1" sources."@nodelib/fs.stat-1.1.3" - sources."@octokit/auth-token-2.4.2" - (sources."@octokit/endpoint-6.0.8" // { + sources."@octokit/auth-token-2.4.3" + (sources."@octokit/endpoint-6.0.9" // { dependencies = [ sources."is-plain-object-5.0.0" sources."universal-user-agent-6.0.0" @@ -79349,15 +80800,15 @@ in sources."@octokit/types-2.16.2" ]; }) - sources."@octokit/plugin-request-log-1.0.0" + sources."@octokit/plugin-request-log-1.0.2" (sources."@octokit/plugin-rest-endpoint-methods-2.4.0" // { dependencies = [ sources."@octokit/types-2.16.2" ]; }) - (sources."@octokit/request-5.4.9" // { + (sources."@octokit/request-5.4.10" // { dependencies = [ - sources."@octokit/request-error-2.0.2" + sources."@octokit/request-error-2.0.3" sources."is-plain-object-5.0.0" sources."universal-user-agent-6.0.0" ]; @@ -79372,7 +80823,7 @@ in sources."@types/glob-7.1.3" sources."@types/minimatch-3.0.3" sources."@types/minimist-1.2.0" - sources."@types/node-14.11.10" + sources."@types/node-14.14.6" sources."@types/normalize-package-data-2.4.0" sources."@zkochan/cmd-shim-3.1.0" sources."JSONStream-1.3.5" @@ -79405,7 +80856,7 @@ in sources."atob-2.1.2" sources."atob-lite-2.0.0" sources."aws-sign2-0.7.0" - sources."aws4-1.10.1" + sources."aws4-1.11.0" sources."balanced-match-1.0.0" (sources."base-0.11.2" // { dependencies = [ @@ -79428,6 +80879,7 @@ in sources."byte-size-5.0.1" sources."cacache-12.0.4" sources."cache-base-1.0.1" + sources."call-bind-1.0.0" sources."call-me-maybe-1.0.1" sources."caller-callsite-2.0.0" sources."caller-path-2.0.0" @@ -79650,6 +81102,7 @@ in }) sources."genfun-5.0.0" sources."get-caller-file-2.0.5" + sources."get-intrinsic-1.0.1" (sources."get-pkg-repo-1.4.0" // { dependencies = [ sources."camelcase-2.1.1" @@ -79710,7 +81163,7 @@ in ]; }) sources."git-up-4.0.2" - sources."git-url-parse-11.3.0" + sources."git-url-parse-11.4.0" sources."gitconfiglocal-1.0.0" sources."glob-7.1.6" sources."glob-parent-5.1.1" @@ -79778,6 +81231,7 @@ in sources."is-buffer-1.1.6" sources."is-callable-1.2.2" sources."is-ci-2.0.0" + sources."is-core-module-2.0.0" sources."is-data-descriptor-1.0.0" sources."is-date-object-1.0.2" sources."is-descriptor-1.0.2" @@ -79943,11 +81397,7 @@ in sources."object-inspect-1.8.0" sources."object-keys-1.1.1" sources."object-visit-1.0.1" - (sources."object.assign-4.1.1" // { - dependencies = [ - sources."es-abstract-1.18.0-next.1" - ]; - }) + sources."object.assign-4.1.2" sources."object.getownpropertydescriptors-2.1.0" sources."object.pick-1.3.0" sources."octokit-pagination-methods-1.1.0" @@ -80035,7 +81485,7 @@ in sources."request-2.88.2" sources."require-directory-2.1.1" sources."require-main-filename-2.0.0" - sources."resolve-1.17.0" + sources."resolve-1.18.1" (sources."resolve-cwd-2.0.0" // { dependencies = [ sources."resolve-from-3.0.0" @@ -80142,8 +81592,16 @@ in sources."strip-ansi-4.0.0" ]; }) - sources."string.prototype.trimend-1.0.1" - sources."string.prototype.trimstart-1.0.1" + (sources."string.prototype.trimend-1.0.2" // { + dependencies = [ + sources."es-abstract-1.18.0-next.1" + ]; + }) + (sources."string.prototype.trimstart-1.0.2" // { + dependencies = [ + sources."es-abstract-1.18.0-next.1" + ]; + }) (sources."string_decoder-1.1.1" // { dependencies = [ sources."safe-buffer-5.1.2" @@ -80180,7 +81638,7 @@ in sources."tweetnacl-0.14.5" sources."type-fest-0.3.1" sources."typedarray-0.0.6" - sources."uglify-js-3.11.3" + sources."uglify-js-3.11.5" sources."uid-number-0.0.6" sources."umask-1.1.0" sources."union-value-1.0.1" @@ -80273,7 +81731,7 @@ in sources."image-size-0.5.5" sources."make-dir-2.1.0" sources."mime-1.6.0" - sources."native-request-1.0.7" + sources."native-request-1.0.8" sources."pify-4.0.1" sources."prr-1.0.1" sources."semver-5.7.1" @@ -80673,7 +82131,7 @@ in sources."asynckit-0.4.0" sources."atob-2.1.2" sources."aws-sign2-0.7.0" - sources."aws4-1.10.1" + sources."aws4-1.11.0" sources."backo2-1.0.2" (sources."base-0.11.2" // { dependencies = [ @@ -81165,12 +82623,12 @@ in src = ../interpreters/clojurescript/lumo; dependencies = [ sources."@babel/code-frame-7.10.4" - sources."@babel/compat-data-7.12.1" + sources."@babel/compat-data-7.12.5" sources."@babel/core-7.12.3" - sources."@babel/generator-7.12.1" + sources."@babel/generator-7.12.5" sources."@babel/helper-annotate-as-pure-7.10.4" sources."@babel/helper-builder-binary-assignment-operator-visitor-7.10.4" - sources."@babel/helper-compilation-targets-7.12.1" + sources."@babel/helper-compilation-targets-7.12.5" sources."@babel/helper-create-class-features-plugin-7.12.1" sources."@babel/helper-create-regexp-features-plugin-7.12.1" sources."@babel/helper-define-map-7.10.5" @@ -81179,26 +82637,26 @@ in sources."@babel/helper-get-function-arity-7.10.4" sources."@babel/helper-hoist-variables-7.10.4" sources."@babel/helper-member-expression-to-functions-7.12.1" - sources."@babel/helper-module-imports-7.12.1" + sources."@babel/helper-module-imports-7.12.5" sources."@babel/helper-module-transforms-7.12.1" sources."@babel/helper-optimise-call-expression-7.10.4" sources."@babel/helper-plugin-utils-7.10.4" sources."@babel/helper-regex-7.10.5" sources."@babel/helper-remap-async-to-generator-7.12.1" - sources."@babel/helper-replace-supers-7.12.1" + sources."@babel/helper-replace-supers-7.12.5" sources."@babel/helper-simple-access-7.12.1" sources."@babel/helper-skip-transparent-expression-wrappers-7.12.1" sources."@babel/helper-split-export-declaration-7.11.0" sources."@babel/helper-validator-identifier-7.10.4" sources."@babel/helper-validator-option-7.12.1" sources."@babel/helper-wrap-function-7.12.3" - sources."@babel/helpers-7.12.1" + sources."@babel/helpers-7.12.5" (sources."@babel/highlight-7.10.4" // { dependencies = [ sources."chalk-2.4.2" ]; }) - sources."@babel/parser-7.12.3" + sources."@babel/parser-7.12.5" sources."@babel/plugin-external-helpers-7.8.3" sources."@babel/plugin-proposal-async-generator-functions-7.12.1" sources."@babel/plugin-proposal-class-properties-7.12.1" @@ -81207,7 +82665,7 @@ in sources."@babel/plugin-proposal-json-strings-7.12.1" sources."@babel/plugin-proposal-logical-assignment-operators-7.12.1" sources."@babel/plugin-proposal-nullish-coalescing-operator-7.12.1" - sources."@babel/plugin-proposal-numeric-separator-7.12.1" + sources."@babel/plugin-proposal-numeric-separator-7.12.5" sources."@babel/plugin-proposal-object-rest-spread-7.12.1" sources."@babel/plugin-proposal-optional-catch-binding-7.12.1" sources."@babel/plugin-proposal-optional-chaining-7.12.1" @@ -81263,10 +82721,10 @@ in sources."@babel/preset-env-7.12.1" sources."@babel/preset-modules-0.1.4" sources."@babel/preset-stage-2-7.8.3" - sources."@babel/runtime-7.12.1" + sources."@babel/runtime-7.12.5" sources."@babel/template-7.10.4" - sources."@babel/traverse-7.12.1" - sources."@babel/types-7.12.1" + sources."@babel/traverse-7.12.5" + sources."@babel/types-7.12.5" sources."@cnakazawa/watch-1.0.4" sources."@comandeer/babel-plugin-banner-5.0.0" sources."@istanbuljs/load-nyc-config-1.1.0" @@ -81277,17 +82735,17 @@ in ]; }) sources."@jest/types-25.5.0" - sources."@types/babel__core-7.1.10" + sources."@types/babel__core-7.1.12" sources."@types/babel__generator-7.6.2" sources."@types/babel__template-7.0.3" sources."@types/babel__traverse-7.0.15" sources."@types/estree-0.0.45" - sources."@types/graceful-fs-4.1.3" + sources."@types/graceful-fs-4.1.4" sources."@types/istanbul-lib-coverage-2.0.3" sources."@types/istanbul-lib-report-3.0.0" sources."@types/istanbul-reports-1.1.2" sources."@types/json-schema-7.0.6" - sources."@types/node-14.11.10" + sources."@types/node-14.14.6" sources."@types/normalize-package-data-2.4.0" sources."@types/resolve-0.0.8" sources."@types/yargs-15.0.9" @@ -81350,7 +82808,7 @@ in sources."asynckit-0.4.0" sources."atob-2.1.2" sources."aws-sign2-0.7.0" - sources."aws4-1.10.1" + sources."aws4-1.11.0" sources."babel-core-7.0.0-bridge.0" sources."babel-eslint-10.0.3" sources."babel-helper-evaluate-path-0.5.0" @@ -81414,7 +82872,7 @@ in sources."bindings-1.5.0" (sources."bl-4.0.3" // { dependencies = [ - sources."buffer-5.6.0" + sources."buffer-5.7.0" sources."readable-stream-3.6.0" ]; }) @@ -81449,7 +82907,7 @@ in ]; }) sources."browserify-zlib-0.2.0" - sources."browserslist-4.14.5" + sources."browserslist-4.14.6" sources."bser-2.1.1" sources."buffer-5.2.1" sources."buffer-from-1.1.1" @@ -81463,8 +82921,9 @@ in }) sources."cache-base-1.0.1" sources."cached-path-relative-1.0.2" + sources."call-bind-1.0.0" sources."camelcase-5.3.1" - sources."caniuse-lite-1.0.30001148" + sources."caniuse-lite-1.0.30001154" sources."capture-exit-2.0.0" sources."caseless-0.12.0" (sources."chalk-3.0.0" // { @@ -81480,6 +82939,7 @@ in dependencies = [ sources."braces-3.0.2" sources."fill-range-7.0.1" + sources."fsevents-2.1.3" sources."is-number-7.0.0" sources."to-regex-range-5.0.1" ]; @@ -81586,7 +83046,7 @@ in sources."duplexer2-0.1.4" sources."duplexify-3.7.1" sources."ecc-jsbn-0.1.2" - sources."electron-to-chromium-1.3.582" + sources."electron-to-chromium-1.3.587" (sources."elliptic-6.5.3" // { dependencies = [ sources."bn.js-4.11.9" @@ -81602,8 +83062,6 @@ in }) sources."errno-0.1.7" sources."error-ex-1.3.2" - sources."es-abstract-1.18.0-next.1" - sources."es-to-primitive-1.2.1" sources."escalade-3.1.1" sources."escape-string-regexp-1.0.5" sources."eslint-scope-4.0.3" @@ -81687,11 +83145,12 @@ in sources."fs-constants-1.0.0" sources."fs-write-stream-atomic-1.0.10" sources."fs.realpath-1.0.0" - sources."fsevents-2.1.3" + sources."fsevents-2.2.0" sources."function-bind-1.1.1" - sources."gensync-1.0.0-beta.1" + sources."gensync-1.0.0-beta.2" sources."get-assigned-identifiers-1.2.0" sources."get-caller-file-2.0.5" + sources."get-intrinsic-1.0.1" sources."get-package-type-0.1.0" sources."get-stream-4.1.0" sources."get-value-2.0.6" @@ -81742,7 +83201,7 @@ in sources."htmlescape-1.1.1" sources."http-signature-1.2.0" sources."https-browserify-1.0.0" - sources."ieee754-1.1.13" + sources."ieee754-1.2.1" sources."iferr-0.1.5" sources."import-local-2.0.0" sources."imurmurhash-0.1.4" @@ -81757,10 +83216,9 @@ in sources."is-arrayish-0.2.1" sources."is-binary-path-2.1.0" sources."is-buffer-1.1.6" - sources."is-callable-1.2.2" sources."is-ci-2.0.0" + sources."is-core-module-2.0.0" sources."is-data-descriptor-1.0.0" - sources."is-date-object-1.0.2" sources."is-deflate-1.0.0" sources."is-descriptor-1.0.2" sources."is-extendable-0.1.1" @@ -81769,7 +83227,6 @@ in sources."is-glob-4.0.1" sources."is-gzip-1.0.0" sources."is-module-1.0.0" - sources."is-negative-zero-2.0.0" (sources."is-number-3.0.0" // { dependencies = [ sources."kind-of-3.2.2" @@ -81777,9 +83234,7 @@ in }) sources."is-plain-object-2.0.4" sources."is-reference-1.2.1" - sources."is-regex-1.1.1" sources."is-stream-1.1.0" - sources."is-symbol-1.0.3" sources."is-typedarray-1.0.0" sources."is-windows-1.0.2" sources."is-wsl-1.1.0" @@ -81891,13 +83346,13 @@ in sources."inherits-2.0.3" sources."punycode-1.4.1" sources."stream-http-2.8.3" - sources."timers-browserify-2.0.11" + sources."timers-browserify-2.0.12" sources."tty-browserify-0.0.0" sources."util-0.11.1" ]; }) sources."node-modules-regexp-1.0.0" - sources."node-releases-1.1.63" + sources."node-releases-1.1.65" sources."normalize-package-data-2.5.0" sources."normalize-path-3.0.0" sources."npm-run-path-2.0.2" @@ -81916,10 +83371,9 @@ in sources."kind-of-3.2.2" ]; }) - sources."object-inspect-1.8.0" sources."object-keys-1.1.1" sources."object-visit-1.0.1" - sources."object.assign-4.1.1" + sources."object.assign-4.1.2" sources."object.pick-1.3.0" sources."once-1.4.0" sources."os-browserify-0.3.0" @@ -81993,7 +83447,7 @@ in }) sources."readdirp-3.5.0" sources."realpath-native-2.0.0" - sources."regenerate-1.4.1" + sources."regenerate-1.4.2" sources."regenerate-unicode-properties-8.2.0" sources."regenerator-runtime-0.13.7" sources."regenerator-transform-0.14.5" @@ -82012,7 +83466,7 @@ in sources."request-2.88.2" sources."require-directory-2.1.1" sources."require-main-filename-2.0.0" - sources."resolve-1.17.0" + sources."resolve-1.18.1" (sources."resolve-cwd-2.0.0" // { dependencies = [ sources."resolve-from-3.0.0" @@ -82143,16 +83597,6 @@ in sources."stream-shift-1.0.1" sources."stream-splicer-2.0.1" sources."string-width-3.1.0" - (sources."string.prototype.trimend-1.0.1" // { - dependencies = [ - sources."es-abstract-1.17.7" - ]; - }) - (sources."string.prototype.trimstart-1.0.1" // { - dependencies = [ - sources."es-abstract-1.17.7" - ]; - }) (sources."string_decoder-1.3.0" // { dependencies = [ sources."safe-buffer-5.2.1" @@ -82237,7 +83681,7 @@ in }) sources."util-deprecate-1.0.2" sources."uuid-3.4.0" - sources."v8-compile-cache-2.1.1" + sources."v8-compile-cache-2.2.0" sources."validate-npm-package-license-3.0.4" sources."verror-1.10.0" sources."vinyl-2.2.1" @@ -82369,14 +83813,14 @@ in sources."async-3.2.0" sources."asynckit-0.4.0" sources."aws-sign2-0.7.0" - sources."aws4-1.10.1" + sources."aws4-1.11.0" sources."bcrypt-pbkdf-1.0.2" sources."caseless-0.12.0" sources."chalk-4.1.0" sources."color-convert-2.0.1" sources."color-name-1.1.4" sources."combined-stream-1.0.8" - sources."commander-6.1.0" + sources."commander-6.2.0" sources."core-util-is-1.0.2" sources."dashdash-1.14.1" sources."delayed-stream-1.0.0" @@ -82405,7 +83849,7 @@ in sources."link-check-4.5.2" sources."lodash-4.17.20" sources."markdown-link-extractor-1.2.6" - sources."marked-1.2.0" + sources."marked-1.2.2" sources."mime-db-1.44.0" sources."mime-types-2.1.27" sources."ms-2.1.2" @@ -82466,7 +83910,7 @@ in sources."assert-plus-1.0.0" sources."asynckit-0.4.0" sources."aws-sign2-0.7.0" - sources."aws4-1.10.1" + sources."aws4-1.11.0" sources."babel-code-frame-6.26.0" sources."balanced-match-1.0.0" sources."bcrypt-pbkdf-1.0.2" @@ -82555,6 +83999,7 @@ in sources."forever-agent-0.6.1" sources."form-data-2.3.3" sources."fs.realpath-1.0.0" + sources."function-bind-1.1.1" sources."generate-function-2.3.1" sources."generate-object-property-1.2.0" sources."getpass-0.1.7" @@ -82575,6 +84020,7 @@ in sources."ajv-6.12.6" ]; }) + sources."has-1.0.3" sources."has-ansi-2.0.0" sources."has-gulplog-0.1.0" sources."http-signature-1.2.0" @@ -82584,6 +84030,7 @@ in sources."inherits-2.0.4" sources."inquirer-0.12.0" sources."interpret-1.4.0" + sources."is-core-module-2.0.0" sources."is-fullwidth-code-point-1.0.0" sources."is-my-ip-valid-1.0.0" sources."is-my-json-valid-2.20.5" @@ -82660,7 +84107,7 @@ in sources."replace-ext-0.0.1" sources."request-2.88.0" sources."require-uncached-1.0.3" - sources."resolve-1.17.0" + sources."resolve-1.18.1" sources."resolve-from-1.0.1" sources."restore-cursor-1.0.1" sources."rimraf-2.6.3" @@ -82792,7 +84239,7 @@ in sha512 = "X9I7gwvqKVdqVvqi9AVfUWXnHQQYjssWJ2asKfhBDAkQn0vPagKkx6EjzKcRgyIroWGXN6ZpwkQ/gMvTPFlx7g=="; }; dependencies = [ - sources."@types/node-14.11.10" + sources."@types/node-14.14.6" sources."@types/yauzl-2.9.1" sources."agent-base-5.1.1" sources."ansi-styles-4.3.0" @@ -82800,16 +84247,16 @@ in sources."base64-js-1.3.1" sources."bl-4.0.3" sources."brace-expansion-1.1.11" - sources."buffer-5.6.0" + sources."buffer-5.7.0" sources."buffer-crc32-0.2.13" sources."chalk-4.1.0" sources."chownr-1.1.4" sources."color-convert-2.0.1" sources."color-name-1.1.4" - sources."commander-6.1.0" + sources."commander-6.2.0" sources."concat-map-0.0.1" sources."debug-4.3.0" - sources."devtools-protocol-0.0.799653" + sources."devtools-protocol-0.0.809251" sources."end-of-stream-1.4.4" sources."extract-zip-2.0.1" sources."fd-slicer-1.1.0" @@ -82820,13 +84267,14 @@ in sources."glob-7.1.6" sources."has-flag-4.0.0" sources."https-proxy-agent-4.0.0" - sources."ieee754-1.1.13" + sources."ieee754-1.2.1" sources."inflight-1.0.6" sources."inherits-2.0.4" sources."locate-path-5.0.0" sources."minimatch-3.0.4" sources."mkdirp-classic-0.5.3" sources."ms-2.1.2" + sources."node-fetch-2.6.1" sources."once-1.4.0" sources."p-limit-2.3.0" sources."p-locate-4.1.0" @@ -82838,7 +84286,7 @@ in sources."progress-2.0.3" sources."proxy-from-env-1.1.0" sources."pump-3.0.0" - sources."puppeteer-5.3.1" + sources."puppeteer-5.4.1" sources."readable-stream-3.6.0" sources."rimraf-3.0.2" sources."safe-buffer-5.2.1" @@ -82875,20 +84323,20 @@ in sources."@fluentui/date-time-utilities-7.9.0" sources."@fluentui/dom-utilities-1.1.1" sources."@fluentui/keyboard-key-0.2.12" - sources."@fluentui/react-7.147.1" - sources."@fluentui/react-focus-7.16.13" - sources."@fluentui/react-window-provider-0.3.3" - sources."@fluentui/theme-1.5.1" - sources."@microsoft/load-themed-styles-1.10.114" + sources."@fluentui/react-7.149.3" + sources."@fluentui/react-focus-7.16.16" + sources."@fluentui/react-window-provider-1.0.1" + sources."@fluentui/theme-1.5.4" + sources."@microsoft/load-themed-styles-1.10.125" sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" - sources."@uifabric/foundation-7.9.14" - sources."@uifabric/icons-7.5.12" + sources."@uifabric/foundation-7.9.18" + sources."@uifabric/icons-7.5.15" sources."@uifabric/merge-styles-7.19.1" - sources."@uifabric/react-hooks-7.13.6" + sources."@uifabric/react-hooks-7.13.9" sources."@uifabric/set-version-7.0.23" - sources."@uifabric/styling-7.16.13" - sources."@uifabric/utilities-7.32.4" + sources."@uifabric/styling-7.16.16" + sources."@uifabric/utilities-7.33.2" sources."accepts-1.3.7" sources."ajv-6.12.6" sources."ansi-escapes-1.4.0" @@ -82908,7 +84356,7 @@ in sources."basic-auth-2.0.1" sources."body-parser-1.19.0" sources."brace-expansion-1.1.11" - sources."buffer-5.6.0" + sources."buffer-5.7.0" sources."buffer-from-1.1.1" sources."builtin-status-codes-3.0.0" sources."bytes-3.1.0" @@ -82972,7 +84420,7 @@ in sources."http-cache-semantics-4.1.0" sources."http-errors-1.7.2" sources."iconv-lite-0.4.24" - sources."ieee754-1.1.13" + sources."ieee754-1.2.1" sources."inflight-1.0.6" sources."inherits-2.0.3" sources."ini-1.3.5" @@ -83014,7 +84462,7 @@ in sources."node-fetch-1.6.3" sources."normalize-url-4.5.0" sources."object-assign-4.1.1" - sources."office-ui-fabric-react-7.147.1" + sources."office-ui-fabric-react-7.149.3" sources."on-finished-2.3.0" sources."on-headers-1.0.2" sources."once-1.4.0" @@ -83113,7 +84561,7 @@ in sources."strip-json-comments-2.0.1" sources."supports-color-2.0.0" sources."swagger-schema-official-2.0.0-bab6bed" - sources."swagger-ui-dist-3.35.2" + sources."swagger-ui-dist-3.36.1" sources."tail-2.0.4" sources."through-2.3.8" sources."tmp-0.0.33" @@ -83144,10 +84592,10 @@ in mocha = nodeEnv.buildNodePackage { name = "mocha"; packageName = "mocha"; - version = "8.2.0"; + version = "8.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/mocha/-/mocha-8.2.0.tgz"; - sha512 = "lEWEMq2LMfNJMKeuEwb5UELi+OgFDollXaytR5ggQcHpzG3NP/R7rvixAvF+9/lLsTWhWG+4yD2M70GsM06nxw=="; + url = "https://registry.npmjs.org/mocha/-/mocha-8.2.1.tgz"; + sha512 = "cuLBVfyFfFqbNR0uUKbDGXKGk+UDFe6aR4os78XIrMQpZl/nv7JYHcvP5MFIAb374b2zFXsdgEGwmzMtP0Xg8w=="; }; dependencies = [ sources."@ungap/promise-all-settled-1.1.2" @@ -83258,7 +84706,7 @@ in sources."yargs-parser-13.1.2" (sources."yargs-unparser-2.0.0" // { dependencies = [ - sources."camelcase-6.1.0" + sources."camelcase-6.2.0" sources."decamelize-4.0.0" ]; }) @@ -83400,23 +84848,23 @@ in netlify-cli = nodeEnv.buildNodePackage { name = "netlify-cli"; packageName = "netlify-cli"; - version = "2.65.6"; + version = "2.67.2"; src = fetchurl { - url = "https://registry.npmjs.org/netlify-cli/-/netlify-cli-2.65.6.tgz"; - sha512 = "0e3B0qQV2JRQ7fzkyaQ8XiszK0r6DyWTuZ+7r2OdUo0pPfQ/qZowfSjt/8WcKUZjX97ITPCxtKYTBVb7GJvgZA=="; + url = "https://registry.npmjs.org/netlify-cli/-/netlify-cli-2.67.2.tgz"; + sha512 = "tCb/TqAtxrtRTzBayfRmg7Gd809ymXfg6vVrBAAXqi93ijobB6qjopIQYlq5Tgq50m5rI/EgxvLU3BCUSEq/eQ=="; }; dependencies = [ sources."@babel/code-frame-7.10.4" - sources."@babel/compat-data-7.12.1" + sources."@babel/compat-data-7.12.5" (sources."@babel/core-7.12.3" // { dependencies = [ sources."semver-5.7.1" ]; }) - sources."@babel/generator-7.12.1" + sources."@babel/generator-7.12.5" sources."@babel/helper-annotate-as-pure-7.10.4" sources."@babel/helper-builder-binary-assignment-operator-visitor-7.10.4" - (sources."@babel/helper-compilation-targets-7.12.1" // { + (sources."@babel/helper-compilation-targets-7.12.5" // { dependencies = [ sources."semver-5.7.1" ]; @@ -83429,22 +84877,22 @@ in sources."@babel/helper-get-function-arity-7.10.4" sources."@babel/helper-hoist-variables-7.10.4" sources."@babel/helper-member-expression-to-functions-7.12.1" - sources."@babel/helper-module-imports-7.12.1" + sources."@babel/helper-module-imports-7.12.5" sources."@babel/helper-module-transforms-7.12.1" sources."@babel/helper-optimise-call-expression-7.10.4" sources."@babel/helper-plugin-utils-7.10.4" sources."@babel/helper-regex-7.10.5" sources."@babel/helper-remap-async-to-generator-7.12.1" - sources."@babel/helper-replace-supers-7.12.1" + sources."@babel/helper-replace-supers-7.12.5" sources."@babel/helper-simple-access-7.12.1" sources."@babel/helper-skip-transparent-expression-wrappers-7.12.1" sources."@babel/helper-split-export-declaration-7.11.0" sources."@babel/helper-validator-identifier-7.10.4" sources."@babel/helper-validator-option-7.12.1" sources."@babel/helper-wrap-function-7.12.3" - sources."@babel/helpers-7.12.1" + sources."@babel/helpers-7.12.5" sources."@babel/highlight-7.10.4" - sources."@babel/parser-7.12.3" + sources."@babel/parser-7.12.5" sources."@babel/plugin-proposal-async-generator-functions-7.12.1" sources."@babel/plugin-proposal-class-properties-7.12.1" sources."@babel/plugin-proposal-dynamic-import-7.12.1" @@ -83452,7 +84900,7 @@ in sources."@babel/plugin-proposal-json-strings-7.12.1" sources."@babel/plugin-proposal-logical-assignment-operators-7.12.1" sources."@babel/plugin-proposal-nullish-coalescing-operator-7.12.1" - sources."@babel/plugin-proposal-numeric-separator-7.12.1" + sources."@babel/plugin-proposal-numeric-separator-7.12.5" sources."@babel/plugin-proposal-object-rest-spread-7.12.1" sources."@babel/plugin-proposal-optional-catch-binding-7.12.1" sources."@babel/plugin-proposal-optional-chaining-7.12.1" @@ -83508,33 +84956,33 @@ in ]; }) sources."@babel/preset-modules-0.1.4" - sources."@babel/runtime-7.12.1" + sources."@babel/runtime-7.12.5" sources."@babel/template-7.10.4" - sources."@babel/traverse-7.12.1" - sources."@babel/types-7.12.1" - sources."@bugsnag/browser-7.4.0" + sources."@babel/traverse-7.12.5" + sources."@babel/types-7.12.5" + sources."@bugsnag/browser-7.5.1" sources."@bugsnag/core-7.3.5" sources."@bugsnag/cuid-3.0.0" - sources."@bugsnag/js-7.4.0" + sources."@bugsnag/js-7.5.1" sources."@bugsnag/node-7.3.5" sources."@bugsnag/safe-json-stringify-6.0.0" sources."@dabh/diagnostics-2.0.2" sources."@jest/types-24.9.0" sources."@mrmlnc/readdir-enhanced-2.2.1" - (sources."@netlify/build-5.0.2" // { + (sources."@netlify/build-5.2.1" // { dependencies = [ sources."chalk-3.0.0" - sources."resolve-2.0.0-next.1" + sources."resolve-2.0.0-next.2" ]; }) - sources."@netlify/cache-utils-1.0.4" - (sources."@netlify/config-2.3.4" // { + sources."@netlify/cache-utils-1.0.6" + (sources."@netlify/config-2.3.6" // { dependencies = [ sources."chalk-3.0.0" ]; }) - sources."@netlify/functions-utils-1.2.10" - (sources."@netlify/git-utils-1.0.4" // { + sources."@netlify/functions-utils-1.3.2" + (sources."@netlify/git-utils-1.0.6" // { dependencies = [ sources."braces-3.0.2" sources."fill-range-7.0.1" @@ -83544,11 +84992,15 @@ in ]; }) sources."@netlify/open-api-0.18.1" - sources."@netlify/plugin-edge-handlers-1.8.0" - sources."@netlify/run-utils-1.0.3" - (sources."@netlify/zip-it-and-ship-it-1.3.12" // { + sources."@netlify/plugin-edge-handlers-1.9.0" + sources."@netlify/run-utils-1.0.5" + sources."@netlify/traffic-mesh-agent-0.24.0-pre.23" + sources."@netlify/traffic-mesh-agent-darwin-x64-0.24.0-pre.23" + sources."@netlify/traffic-mesh-agent-linux-x64-0.24.0-pre.23" + sources."@netlify/traffic-mesh-agent-win32-x64-0.24.0-pre.23" + (sources."@netlify/zip-it-and-ship-it-1.4.0" // { dependencies = [ - sources."resolve-2.0.0-next.1" + sources."resolve-2.0.0-next.2" ]; }) (sources."@nodelib/fs.scandir-2.1.3" // { @@ -83656,8 +85108,8 @@ in ]; }) sources."@oclif/screen-1.0.4" - sources."@octokit/auth-token-2.4.2" - (sources."@octokit/endpoint-6.0.8" // { + sources."@octokit/auth-token-2.4.3" + (sources."@octokit/endpoint-6.0.9" // { dependencies = [ sources."is-plain-object-5.0.0" sources."universal-user-agent-6.0.0" @@ -83668,15 +85120,15 @@ in sources."@octokit/types-2.16.2" ]; }) - sources."@octokit/plugin-request-log-1.0.0" + sources."@octokit/plugin-request-log-1.0.2" (sources."@octokit/plugin-rest-endpoint-methods-2.4.0" // { dependencies = [ sources."@octokit/types-2.16.2" ]; }) - (sources."@octokit/request-5.4.9" // { + (sources."@octokit/request-5.4.10" // { dependencies = [ - sources."@octokit/request-error-2.0.2" + sources."@octokit/request-error-2.0.3" sources."is-plain-object-5.0.0" sources."universal-user-agent-6.0.0" ]; @@ -83711,17 +85163,20 @@ in sources."@types/estree-0.0.39" sources."@types/glob-7.1.3" sources."@types/got-8.3.5" + sources."@types/hast-2.3.1" sources."@types/http-proxy-1.17.4" sources."@types/istanbul-lib-coverage-2.0.3" sources."@types/istanbul-lib-report-3.0.0" sources."@types/istanbul-reports-1.1.2" sources."@types/minimatch-3.0.3" sources."@types/mkdirp-0.5.2" - sources."@types/node-14.11.10" + sources."@types/node-14.14.6" sources."@types/node-fetch-2.5.7" sources."@types/normalize-package-data-2.4.0" + sources."@types/parse5-5.0.3" sources."@types/resolve-1.17.1" sources."@types/semver-5.5.0" + sources."@types/unist-2.0.3" sources."@types/yargs-13.0.11" sources."@types/yargs-parser-15.0.0" sources."@typescript-eslint/typescript-estree-2.34.0" @@ -83732,7 +85187,7 @@ in ]; }) sources."accepts-1.3.7" - sources."agent-base-6.0.1" + sources."agent-base-6.0.2" sources."aggregate-error-3.1.0" (sources."ansi-align-3.0.0" // { dependencies = [ @@ -83780,20 +85235,22 @@ in ]; }) sources."assign-symbols-1.0.0" - sources."ast-module-types-2.6.0" + sources."ast-module-types-2.7.1" sources."async-3.2.0" sources."asynckit-0.4.0" sources."at-least-node-1.0.0" sources."atob-2.1.2" sources."atob-lite-2.0.0" - (sources."aws-sdk-2.773.0" // { + (sources."aws-sdk-2.784.0" // { dependencies = [ sources."buffer-4.9.2" + sources."ieee754-1.1.13" sources."uuid-3.3.2" ]; }) sources."babel-plugin-dynamic-import-node-2.3.3" sources."backoff-2.5.0" + sources."bail-1.0.5" sources."balanced-match-1.0.0" (sources."base-0.11.2" // { dependencies = [ @@ -83843,9 +85300,9 @@ in sources."readable-stream-3.6.0" ]; }) - sources."browserslist-4.14.5" + sources."browserslist-4.14.6" sources."btoa-lite-1.0.0" - sources."buffer-5.6.0" + sources."buffer-5.7.0" sources."buffer-alloc-1.2.0" sources."buffer-alloc-unsafe-1.1.0" sources."buffer-crc32-0.2.13" @@ -83864,11 +85321,13 @@ in ]; }) sources."cachedir-2.3.0" + sources."call-bind-1.0.0" sources."call-me-maybe-1.0.1" sources."camelcase-5.3.1" - sources."caniuse-lite-1.0.30001148" + sources."caniuse-lite-1.0.30001154" sources."cardinal-2.1.1" sources."caw-2.0.1" + sources."ccount-1.1.0" (sources."chalk-2.4.2" // { dependencies = [ sources."ansi-styles-3.2.1" @@ -83877,6 +85336,8 @@ in sources."supports-color-5.5.0" ]; }) + sources."character-entities-html4-1.1.4" + sources."character-entities-legacy-1.1.4" sources."chardet-0.7.0" (sources."chokidar-3.4.3" // { dependencies = [ @@ -83935,6 +85396,7 @@ in sources."colors-1.4.0" sources."colorspace-1.1.2" sources."combined-stream-1.0.8" + sources."comma-separated-tokens-1.0.8" sources."commander-2.20.3" sources."common-path-prefix-2.0.0" sources."commondir-1.0.1" @@ -84027,7 +85489,6 @@ in sources."bl-1.2.3" sources."file-type-5.2.0" sources."tar-stream-1.6.2" - sources."xtend-4.0.2" ]; }) (sources."decompress-tarbz2-4.1.1" // { @@ -84069,7 +85530,7 @@ in sources."deprecation-2.3.1" sources."des.js-1.0.1" sources."destroy-1.0.4" - sources."detective-amd-3.0.0" + sources."detective-amd-3.0.1" sources."detective-cjs-3.1.1" sources."detective-es6-2.2.0" sources."detective-less-1.0.2" @@ -84112,7 +85573,7 @@ in }) sources."duplexer3-0.1.4" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.3.582" + sources."electron-to-chromium-1.3.587" sources."elf-tools-1.1.2" (sources."elliptic-6.5.3" // { dependencies = [ @@ -84127,7 +85588,7 @@ in sources."errno-0.1.7" sources."error-ex-1.3.2" sources."error-stack-parser-2.0.6" - sources."es-abstract-1.18.0-next.1" + sources."es-abstract-1.17.7" sources."es-to-primitive-1.2.1" sources."escalade-3.1.1" sources."escape-goat-2.1.1" @@ -84187,6 +85648,7 @@ in sources."express-logging-1.1.1" sources."ext-list-2.2.2" sources."ext-name-5.0.0" + sources."extend-3.0.2" (sources."extend-shallow-3.0.2" // { dependencies = [ sources."is-extendable-1.0.1" @@ -84210,7 +85672,7 @@ in sources."fast-levenshtein-2.0.6" sources."fast-safe-stringify-2.0.7" sources."fast-stringify-1.1.2" - sources."fastq-1.8.0" + sources."fastq-1.9.0" sources."fd-slicer-1.1.0" sources."fecha-4.2.0" (sources."figures-3.2.0" // { @@ -84264,9 +85726,10 @@ in sources."string_decoder-0.10.31" ]; }) - sources."gensync-1.0.0-beta.1" + sources."gensync-1.0.0-beta.2" sources."get-amd-module-type-3.0.0" sources."get-caller-file-2.0.5" + sources."get-intrinsic-1.0.1" sources."get-port-5.1.1" sources."get-proxy-2.1.0" sources."get-stream-5.2.0" @@ -84345,8 +85808,15 @@ in sources."is-stream-2.0.0" ]; }) + sources."hast-util-from-parse5-6.0.1" + sources."hast-util-is-element-1.1.0" + sources."hast-util-parse-selector-2.2.5" + sources."hast-util-to-html-7.1.2" + sources."hast-util-whitespace-1.0.4" + sources."hastscript-6.0.0" sources."hmac-drbg-1.0.1" sources."hosted-git-info-2.8.8" + sources."html-void-elements-1.0.5" sources."http-cache-semantics-4.1.0" (sources."http-call-5.3.0" // { dependencies = [ @@ -84374,7 +85844,7 @@ in sources."hyperlinker-1.0.0" sources."iconv-lite-0.4.24" sources."idb-wrapper-1.7.2" - sources."ieee754-1.1.13" + sources."ieee754-1.2.1" sources."ignore-4.0.6" sources."import-lazy-2.1.0" sources."imurmurhash-0.1.4" @@ -84402,7 +85872,7 @@ in }) ]; }) - (sources."inquirer-autocomplete-prompt-1.2.0" // { + (sources."inquirer-autocomplete-prompt-1.3.0" // { dependencies = [ sources."ansi-escapes-4.3.1" sources."chalk-4.1.0" @@ -84418,6 +85888,7 @@ in sources."is-buffer-1.1.6" sources."is-callable-1.2.2" sources."is-ci-2.0.0" + sources."is-core-module-2.0.0" sources."is-data-descriptor-1.0.0" sources."is-date-object-1.0.2" sources."is-descriptor-1.0.2" @@ -84465,7 +85936,7 @@ in }) sources."jest-get-type-24.9.0" sources."jest-validate-24.9.0" - sources."jest-worker-26.5.0" + sources."jest-worker-26.6.2" sources."jmespath-0.15.0" sources."js-string-escape-1.0.1" sources."js-tokens-4.0.0" @@ -84475,7 +85946,11 @@ in sources."json-parse-better-errors-1.0.2" sources."json-parse-even-better-errors-2.3.1" sources."json5-2.1.3" - sources."jsonfile-6.0.1" + (sources."jsonfile-6.1.0" // { + dependencies = [ + sources."universalify-2.0.0" + ]; + }) sources."junk-3.1.0" sources."jwt-decode-3.0.0" sources."keep-func-props-3.0.1" @@ -84484,7 +85959,7 @@ in sources."kuler-2.0.0" (sources."lambda-local-1.7.4" // { dependencies = [ - sources."commander-6.1.0" + sources."commander-6.2.0" ]; }) sources."latest-version-5.1.0" @@ -84496,7 +85971,11 @@ in sources."string_decoder-0.10.31" ]; }) - sources."level-filesystem-1.2.0" + (sources."level-filesystem-1.2.0" // { + dependencies = [ + sources."xtend-2.2.0" + ]; + }) sources."level-fix-range-2.0.0" sources."level-hooks-4.5.0" (sources."level-js-2.2.4" // { @@ -84623,7 +86102,7 @@ in ]; }) sources."mkdirp-0.5.5" - sources."module-definition-3.3.0" + sources."module-definition-3.3.1" sources."moize-5.4.7" (sources."move-file-1.2.0" // { dependencies = [ @@ -84648,11 +86127,12 @@ in sources."natural-orderby-2.0.3" sources."negotiator-0.6.2" sources."nested-error-stacks-2.1.0" - (sources."netlify-4.8.0" // { + (sources."netlify-4.9.0" // { dependencies = [ sources."qs-6.9.4" ]; }) + sources."netlify-plugin-deploy-preview-commenting-0.0.1-alpha.16" (sources."netlify-redirect-parser-2.5.0" // { dependencies = [ sources."@netlify/config-0.11.11" @@ -84662,7 +86142,7 @@ in sources."netlify-redirector-0.2.0" sources."nice-try-1.0.5" sources."node-fetch-2.6.1" - sources."node-releases-1.1.63" + sources."node-releases-1.1.65" sources."node-source-walk-4.2.0" sources."noop2-2.0.0" (sources."normalize-package-data-2.5.0" // { @@ -84694,14 +86174,10 @@ in }) sources."object-inspect-1.8.0" sources."object-keys-1.1.1" - sources."object-treeify-1.1.28" + sources."object-treeify-1.1.29" sources."object-visit-1.0.1" - sources."object.assign-4.1.1" - (sources."object.getownpropertydescriptors-2.1.0" // { - dependencies = [ - sources."es-abstract-1.17.7" - ]; - }) + sources."object.assign-4.1.2" + sources."object.getownpropertydescriptors-2.1.0" sources."object.pick-1.3.0" sources."octal-1.0.0" sources."octokit-pagination-methods-1.1.0" @@ -84760,10 +86236,12 @@ in }) sources."parallel-transform-1.2.0" sources."parse-asn1-5.1.6" + sources."parse-github-repo-url-1.4.1" sources."parse-github-url-1.0.2" sources."parse-gitignore-1.0.1" sources."parse-json-5.1.0" sources."parse-ms-2.1.0" + sources."parse5-6.0.1" sources."parseurl-1.3.3" sources."pascalcase-0.1.1" sources."password-prompt-1.1.2" @@ -84803,6 +86281,7 @@ in sources."prettyjson-1.2.1" sources."process-es6-0.11.6" sources."process-nextick-args-2.0.1" + sources."property-information-5.6.0" sources."proto-list-1.2.4" sources."proxy-addr-2.0.6" sources."prr-1.0.1" @@ -84813,12 +86292,12 @@ in }) sources."pump-3.0.0" sources."punycode-1.3.2" - sources."pupa-2.0.1" + sources."pupa-2.1.1" sources."qs-6.7.0" sources."query-string-5.1.1" sources."querystring-0.2.0" sources."random-bytes-1.0.0" - sources."random-item-3.0.0" + sources."random-item-3.1.0" sources."randombytes-2.1.0" sources."randomfill-1.0.4" sources."range-parser-1.2.1" @@ -84842,7 +86321,7 @@ in }) sources."readdirp-3.5.0" sources."redeyed-2.1.1" - sources."regenerate-1.4.1" + sources."regenerate-1.4.2" sources."regenerate-unicode-properties-8.2.0" sources."regenerator-runtime-0.13.7" sources."regenerator-transform-0.14.5" @@ -84856,14 +86335,17 @@ in sources."jsesc-0.5.0" ]; }) + sources."rehype-parse-7.0.1" + sources."rehype-stringify-8.0.0" sources."remove-trailing-separator-1.1.0" sources."repeat-element-1.1.3" sources."repeat-string-1.6.1" + sources."replace-ext-1.0.0" sources."require-directory-2.1.1" sources."require-main-filename-2.0.0" sources."require-package-name-2.0.1" sources."requires-port-1.0.0" - sources."resolve-1.17.0" + sources."resolve-1.18.1" sources."resolve-url-0.2.1" sources."responselike-1.0.2" (sources."restore-cursor-2.0.0" // { @@ -84876,11 +86358,11 @@ in sources."reusify-1.0.4" sources."rimraf-3.0.2" sources."ripemd160-2.0.2" - sources."rollup-2.32.0" + sources."rollup-2.33.1" sources."rollup-plugin-node-builtins-2.1.2" sources."rollup-plugin-terser-7.0.2" sources."run-async-2.4.1" - sources."run-parallel-1.1.9" + sources."run-parallel-1.1.10" sources."rxjs-6.6.3" sources."safe-buffer-5.2.1" sources."safe-join-0.1.3" @@ -84968,6 +86450,7 @@ in }) sources."source-map-url-0.4.0" sources."sourcemap-codec-1.4.8" + sources."space-separated-tokens-1.1.5" sources."spdx-correct-3.1.1" sources."spdx-exceptions-2.3.0" sources."spdx-expression-parse-3.0.1" @@ -85010,14 +86493,14 @@ in sources."strict-uri-encode-1.1.0" sources."string-range-1.2.2" sources."string-width-4.2.0" - (sources."string.prototype.trimend-1.0.1" // { + (sources."string.prototype.trimend-1.0.2" // { dependencies = [ - sources."es-abstract-1.17.7" + sources."es-abstract-1.18.0-next.1" ]; }) - (sources."string.prototype.trimstart-1.0.1" // { + (sources."string.prototype.trimstart-1.0.2" // { dependencies = [ - sources."es-abstract-1.17.7" + sources."es-abstract-1.18.0-next.1" ]; }) (sources."string_decoder-1.1.1" // { @@ -85025,6 +86508,7 @@ in sources."safe-buffer-5.1.2" ]; }) + sources."stringify-entities-3.1.0" (sources."strip-ansi-6.0.0" // { dependencies = [ sources."ansi-regex-5.0.0" @@ -85066,29 +86550,17 @@ in sources."unique-string-1.0.0" ]; }) - sources."term-size-2.2.0" - (sources."terser-5.3.6" // { + sources."term-size-2.2.1" + (sources."terser-5.3.8" // { dependencies = [ sources."source-map-0.7.3" ]; }) sources."text-hex-1.0.0" sources."through-2.3.8" - (sources."through2-2.0.5" // { - dependencies = [ - sources."xtend-4.0.2" - ]; - }) - (sources."through2-filter-3.0.0" // { - dependencies = [ - sources."xtend-4.0.2" - ]; - }) - (sources."through2-map-3.0.0" // { - dependencies = [ - sources."xtend-4.0.2" - ]; - }) + sources."through2-2.0.5" + sources."through2-filter-3.0.0" + sources."through2-map-3.0.0" sources."time-zone-1.0.0" sources."timed-out-4.0.1" sources."tmp-0.2.1" @@ -85113,6 +86585,7 @@ in ]; }) sources."triple-beam-1.3.0" + sources."trough-1.0.5" sources."tslib-1.14.1" sources."tsutils-3.17.1" sources."tunnel-agent-0.6.0" @@ -85128,9 +86601,18 @@ in sources."unicode-match-property-ecmascript-1.0.4" sources."unicode-match-property-value-ecmascript-1.2.0" sources."unicode-property-aliases-ecmascript-1.1.0" + (sources."unified-9.2.0" // { + dependencies = [ + sources."is-buffer-2.0.5" + ]; + }) sources."union-value-1.0.1" sources."uniq-1.0.1" sources."unique-string-2.0.0" + sources."unist-util-is-4.0.3" + sources."unist-util-stringify-position-2.0.3" + sources."unist-util-visit-2.0.3" + sources."unist-util-visit-parents-3.1.1" sources."universal-user-agent-4.0.1" sources."universalify-1.0.0" (sources."unixify-1.0.0" // { @@ -85160,22 +86642,26 @@ in sources."url-to-options-1.0.1" sources."use-3.1.1" sources."util-deprecate-1.0.2" - (sources."util.promisify-1.0.1" // { - dependencies = [ - sources."es-abstract-1.17.7" - ]; - }) + sources."util.promisify-1.0.1" sources."utils-merge-1.0.1" sources."uuid-8.3.1" sources."validate-npm-package-license-3.0.4" sources."validate-npm-package-name-3.0.0" sources."vary-1.1.2" + (sources."vfile-4.2.0" // { + dependencies = [ + sources."is-buffer-2.0.5" + ]; + }) + sources."vfile-location-3.2.0" + sources."vfile-message-2.0.4" (sources."wait-port-0.2.9" // { dependencies = [ sources."commander-3.0.2" ]; }) sources."wcwidth-1.0.1" + sources."web-namespaces-1.1.4" sources."well-known-symbols-2.0.0" sources."which-2.0.2" sources."which-module-2.0.0" @@ -85204,7 +86690,7 @@ in sources."xdg-basedir-4.0.0" sources."xml2js-0.4.19" sources."xmlbuilder-9.0.7" - sources."xtend-2.2.0" + sources."xtend-4.0.2" sources."y18n-4.0.0" sources."yargs-15.4.1" sources."yargs-parser-18.1.3" @@ -85266,7 +86752,7 @@ in sources."assert-plus-1.0.0" sources."asynckit-0.4.0" sources."aws-sign2-0.7.0" - sources."aws4-1.10.1" + sources."aws4-1.11.0" sources."balanced-match-1.0.0" sources."bcrypt-pbkdf-1.0.2" sources."brace-expansion-1.1.11" @@ -85404,7 +86890,7 @@ in sources."async-0.9.2" sources."asynckit-0.4.0" sources."aws-sign2-0.6.0" - sources."aws4-1.10.1" + sources."aws4-1.11.0" sources."balanced-match-1.0.0" sources."base64-js-0.0.8" sources."bcrypt-pbkdf-1.0.2" @@ -85465,6 +86951,7 @@ in sources."fs.realpath-1.0.0" sources."fstream-1.0.12" sources."fstream-ignore-1.0.5" + sources."function-bind-1.1.1" sources."gauge-2.7.4" sources."get-stdin-4.0.1" (sources."getpass-0.1.7" // { @@ -85476,6 +86963,7 @@ in sources."graceful-fs-4.2.4" sources."har-schema-1.0.5" sources."har-validator-4.2.1" + sources."has-1.0.3" sources."has-unicode-2.0.1" sources."hawk-3.1.3" sources."headless-0.1.7" @@ -85491,6 +86979,7 @@ in sources."invert-kv-1.0.0" sources."ipaddr.js-1.9.1" sources."is-arrayish-0.2.1" + sources."is-core-module-2.0.0" sources."is-finite-1.1.0" sources."is-fullwidth-code-point-1.0.0" sources."is-typedarray-1.0.0" @@ -85575,7 +87064,7 @@ in sources."qs-6.4.0" ]; }) - sources."resolve-1.17.0" + sources."resolve-1.18.1" sources."rimraf-2.2.8" sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" @@ -85679,10 +87168,10 @@ in node-pre-gyp = nodeEnv.buildNodePackage { name = "node-pre-gyp"; packageName = "node-pre-gyp"; - version = "0.15.0"; + version = "0.16.0"; src = fetchurl { - url = "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.15.0.tgz"; - sha512 = "7QcZa8/fpaU/BKenjcaeFF9hLz2+7S9AqyXFhlH/rilsQ/hPZKK32RtR5EQHJElgu+q5RfbJ34KriI79UWaorA=="; + url = "https://registry.npmjs.org/node-pre-gyp/-/node-pre-gyp-0.16.0.tgz"; + sha512 = "4efGA+X/YXAHLi1hN8KaPrILULaUn2nWecFrn1k2I+99HpoyvcOGEbtcOxpDiUwPF2ZANMJDh32qwOUPenuR1g=="; }; dependencies = [ sources."abbrev-1.1.1" @@ -85764,16 +87253,16 @@ in node-red = nodeEnv.buildNodePackage { name = "node-red"; packageName = "node-red"; - version = "1.2.1"; + version = "1.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/node-red/-/node-red-1.2.1.tgz"; - sha512 = "ZgxnaEMp2bJbsludpt3elaw/5yMznqjYklZE7eBwGErbNUVT3SmiSd0wNBO5j1QPiaqtGdSzqT2e45qzDzyiOg=="; + url = "https://registry.npmjs.org/node-red/-/node-red-1.2.2.tgz"; + sha512 = "/cGajoUjpCgP1Plqjtvupm8gE+19Vzm/z31M25f50XIuLpy3wieTki+e2oIPPyuzTD7Gz04JMySbcB8tx0voNA=="; }; dependencies = [ - sources."@babel/runtime-7.12.1" - sources."@node-red/editor-api-1.2.1" - sources."@node-red/editor-client-1.2.1" - (sources."@node-red/nodes-1.2.1" // { + sources."@babel/runtime-7.12.5" + sources."@node-red/editor-api-1.2.2" + sources."@node-red/editor-client-1.2.2" + (sources."@node-red/nodes-1.2.2" // { dependencies = [ sources."cookie-0.4.1" sources."http-errors-1.7.3" @@ -85787,12 +87276,12 @@ in }) ]; }) - sources."@node-red/registry-1.2.1" - sources."@node-red/runtime-1.2.1" - sources."@node-red/util-1.2.1" + sources."@node-red/registry-1.2.2" + sources."@node-red/runtime-1.2.2" + sources."@node-red/util-1.2.2" sources."abbrev-1.1.1" sources."accepts-1.3.7" - (sources."agent-base-6.0.1" // { + (sources."agent-base-6.0.2" // { dependencies = [ sources."debug-4.3.0" sources."ms-2.1.2" @@ -85819,7 +87308,7 @@ in sources."async-mutex-0.2.4" sources."asynckit-0.4.0" sources."aws-sign2-0.7.0" - sources."aws4-1.10.1" + sources."aws4-1.11.0" sources."axios-0.19.2" sources."balanced-match-1.0.0" sources."base64-js-1.3.1" @@ -85854,7 +87343,7 @@ in sources."body-parser-1.19.0" sources."boolbase-1.0.0" sources."brace-expansion-1.1.11" - sources."buffer-5.6.0" + sources."buffer-5.7.0" sources."buffer-from-1.1.1" sources."busboy-0.2.14" sources."bytes-3.1.0" @@ -86000,7 +87489,7 @@ in }) sources."i18next-15.1.2" sources."iconv-lite-0.4.24" - sources."ieee754-1.1.13" + sources."ieee754-1.2.1" sources."ignore-walk-3.0.3" sources."inflight-1.0.6" sources."inherits-2.0.3" @@ -86287,7 +87776,7 @@ in sources."assert-plus-1.0.0" sources."asynckit-0.4.0" sources."aws-sign2-0.7.0" - sources."aws4-1.10.1" + sources."aws4-1.11.0" sources."balanced-match-1.0.0" sources."base64-js-1.3.1" sources."bcrypt-pbkdf-1.0.2" @@ -86328,18 +87817,21 @@ in ]; }) sources."fs.realpath-1.0.0" + sources."function-bind-1.1.1" sources."gauge-2.7.4" sources."getpass-0.1.7" sources."glob-7.1.6" sources."graceful-fs-4.2.4" sources."har-schema-2.0.0" sources."har-validator-5.1.5" + sources."has-1.0.3" sources."has-unicode-2.0.1" sources."hosted-git-info-2.8.8" sources."http-signature-1.2.0" sources."inflight-1.0.6" sources."inherits-2.0.4" sources."ini-1.3.5" + sources."is-core-module-2.0.0" sources."is-fullwidth-code-point-1.0.0" sources."is-typedarray-1.0.0" sources."isarray-1.0.0" @@ -86404,7 +87896,7 @@ in ]; }) sources."request-2.88.2" - sources."resolve-1.17.0" + sources."resolve-1.18.1" sources."retry-0.10.1" sources."rimraf-2.6.3" sources."safe-buffer-5.2.1" @@ -86432,7 +87924,7 @@ in sources."mkdirp-1.0.4" ]; }) - sources."temp-0.9.1" + sources."temp-0.9.2" sources."tough-cookie-2.5.0" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" @@ -86462,10 +87954,10 @@ in nodemon = nodeEnv.buildNodePackage { name = "nodemon"; packageName = "nodemon"; - version = "2.0.5"; + version = "2.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/nodemon/-/nodemon-2.0.5.tgz"; - sha512 = "6/jqtZvJdk092pVnD2AIH19KQ9GQZAKOZVy/yT1ueL6aoV+Ix7a1lVZStXzvEh0fP4zE41DDWlkVoHjR6WlozA=="; + url = "https://registry.npmjs.org/nodemon/-/nodemon-2.0.6.tgz"; + sha512 = "4I3YDSKXg6ltYpcnZeHompqac4E6JeAMpGm8tJnB9Y3T0ehasLa4139dJOcCrB93HHrUMsCrKtoAlXTqT5n4AQ=="; }; dependencies = [ sources."@sindresorhus/is-0.14.0" @@ -86568,7 +88060,7 @@ in sources."prepend-http-2.0.0" sources."pstree.remy-1.1.8" sources."pump-3.0.0" - sources."pupa-2.0.1" + sources."pupa-2.1.1" sources."rc-1.2.8" sources."readdirp-3.5.0" sources."registry-auth-token-4.2.0" @@ -86592,7 +88084,7 @@ in sources."strip-ansi-5.2.0" sources."strip-json-comments-2.0.1" sources."supports-color-5.5.0" - sources."term-size-2.2.0" + sources."term-size-2.2.1" sources."to-readable-stream-1.0.0" sources."to-regex-range-5.0.1" sources."touch-3.1.0" @@ -86643,10 +88135,10 @@ in npm-check-updates = nodeEnv.buildNodePackage { name = "npm-check-updates"; packageName = "npm-check-updates"; - version = "9.1.0"; + version = "9.2.4"; src = fetchurl { - url = "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-9.1.0.tgz"; - sha512 = "sx/hbKWAMPgflMffQLZXYt9uZeOK7Rnd6DLoL+8n2Sxe5yn5MMD4kXtkH5NXqJ3OxVA4JgnVbL7rvXhJKGMZrg=="; + url = "https://registry.npmjs.org/npm-check-updates/-/npm-check-updates-9.2.4.tgz"; + sha512 = "YXEIqKXzxOhtPWg670+JAp/jPtjfTdaBJVGSlWL3eHbUDY4O80ELQNGO/qDy8oxh3pOrxSdII7vNglDf4FDw4w=="; }; dependencies = [ sources."@npmcli/ci-detect-1.3.0" @@ -86654,13 +88146,13 @@ in sources."@npmcli/installed-package-contents-1.0.5" sources."@npmcli/move-file-1.0.1" sources."@npmcli/node-gyp-1.0.1" - sources."@npmcli/promise-spawn-1.2.0" - sources."@npmcli/run-script-1.7.2" + sources."@npmcli/promise-spawn-1.3.2" + sources."@npmcli/run-script-1.7.4" sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" sources."@tootallnate/once-1.1.2" sources."abbrev-1.1.1" - sources."agent-base-6.0.1" + sources."agent-base-6.0.2" sources."agentkeepalive-4.1.3" sources."aggregate-error-3.1.0" sources."ajv-6.12.6" @@ -86682,7 +88174,7 @@ in sources."assert-plus-1.0.0" sources."asynckit-0.4.0" sources."aws-sign2-0.7.0" - sources."aws4-1.10.1" + sources."aws4-1.11.0" sources."balanced-match-1.0.0" sources."bcrypt-pbkdf-1.0.2" (sources."boxen-4.2.0" // { @@ -86719,7 +88211,7 @@ in sources."color-name-1.1.4" sources."colors-1.0.3" sources."combined-stream-1.0.8" - sources."commander-6.1.0" + sources."commander-6.2.0" sources."concat-map-0.0.1" sources."configstore-5.0.1" sources."console-control-strings-1.1.0" @@ -86853,9 +88345,9 @@ in sources."npm-install-checks-4.0.0" sources."npm-normalize-package-bin-1.0.1" sources."npm-package-arg-8.1.0" - sources."npm-packlist-2.1.2" + sources."npm-packlist-2.1.4" sources."npm-pick-manifest-6.1.0" - sources."npm-registry-fetch-8.1.5" + sources."npm-registry-fetch-9.0.0" sources."npmlog-4.1.2" sources."number-is-nan-1.0.1" sources."oauth-sign-0.9.0" @@ -86871,7 +88363,7 @@ in sources."semver-6.3.0" ]; }) - sources."pacote-11.1.11" + sources."pacote-11.1.12" sources."parse-github-url-1.0.2" sources."path-exists-4.0.0" sources."path-is-absolute-1.0.1" @@ -86881,11 +88373,11 @@ in sources."progress-2.0.3" sources."promise-inflight-1.0.1" sources."promise-retry-1.1.1" - sources."prompts-2.3.2" + sources."prompts-2.4.0" sources."psl-1.8.0" sources."pump-3.0.0" sources."punycode-2.1.1" - sources."pupa-2.0.1" + sources."pupa-2.1.1" sources."qs-6.5.2" sources."rc-1.2.8" sources."rc-config-loader-3.0.0" @@ -86913,7 +88405,7 @@ in sources."signal-exit-3.0.3" sources."sisteransi-1.0.5" sources."smart-buffer-4.1.0" - sources."socks-2.4.4" + sources."socks-2.5.0" sources."socks-proxy-agent-5.0.0" sources."spawn-please-0.4.1" sources."sprintf-js-1.0.3" @@ -86925,7 +88417,7 @@ in sources."strip-json-comments-2.0.1" sources."supports-color-7.2.0" sources."tar-6.0.5" - sources."term-size-2.2.0" + sources."term-size-2.2.1" sources."to-readable-stream-1.0.0" sources."tough-cookie-2.5.0" sources."tunnel-agent-0.6.0" @@ -86935,7 +88427,7 @@ in sources."unique-filename-1.1.1" sources."unique-slug-2.0.2" sources."unique-string-2.0.0" - sources."update-notifier-5.0.0" + sources."update-notifier-5.0.1" sources."uri-js-4.4.0" sources."url-parse-lax-3.0.0" sources."util-deprecate-1.0.2" @@ -86988,7 +88480,7 @@ in sources."assert-plus-1.0.0" sources."asynckit-0.4.0" sources."aws-sign2-0.7.0" - sources."aws4-1.10.1" + sources."aws4-1.11.0" sources."balanced-match-1.0.0" sources."bcrypt-pbkdf-1.0.2" sources."block-stream-0.0.9" @@ -87193,14 +88685,14 @@ in }; dependencies = [ sources."@babel/code-frame-7.10.4" - sources."@babel/compat-data-7.12.1" + sources."@babel/compat-data-7.12.5" (sources."@babel/core-7.12.3" // { dependencies = [ sources."json5-2.1.3" sources."source-map-0.5.7" ]; }) - (sources."@babel/generator-7.12.1" // { + (sources."@babel/generator-7.12.5" // { dependencies = [ sources."source-map-0.5.7" ]; @@ -87208,8 +88700,8 @@ in sources."@babel/helper-annotate-as-pure-7.10.4" sources."@babel/helper-builder-binary-assignment-operator-visitor-7.10.4" sources."@babel/helper-builder-react-jsx-7.10.4" - sources."@babel/helper-builder-react-jsx-experimental-7.12.1" - sources."@babel/helper-compilation-targets-7.12.1" + sources."@babel/helper-builder-react-jsx-experimental-7.12.4" + sources."@babel/helper-compilation-targets-7.12.5" sources."@babel/helper-create-class-features-plugin-7.12.1" sources."@babel/helper-create-regexp-features-plugin-7.12.1" sources."@babel/helper-define-map-7.10.5" @@ -87218,22 +88710,22 @@ in sources."@babel/helper-get-function-arity-7.10.4" sources."@babel/helper-hoist-variables-7.10.4" sources."@babel/helper-member-expression-to-functions-7.12.1" - sources."@babel/helper-module-imports-7.12.1" + sources."@babel/helper-module-imports-7.12.5" sources."@babel/helper-module-transforms-7.12.1" sources."@babel/helper-optimise-call-expression-7.10.4" sources."@babel/helper-plugin-utils-7.10.4" sources."@babel/helper-regex-7.10.5" sources."@babel/helper-remap-async-to-generator-7.12.1" - sources."@babel/helper-replace-supers-7.12.1" + sources."@babel/helper-replace-supers-7.12.5" sources."@babel/helper-simple-access-7.12.1" sources."@babel/helper-skip-transparent-expression-wrappers-7.12.1" sources."@babel/helper-split-export-declaration-7.11.0" sources."@babel/helper-validator-identifier-7.10.4" sources."@babel/helper-validator-option-7.12.1" sources."@babel/helper-wrap-function-7.12.3" - sources."@babel/helpers-7.12.1" + sources."@babel/helpers-7.12.5" sources."@babel/highlight-7.10.4" - sources."@babel/parser-7.12.3" + sources."@babel/parser-7.12.5" sources."@babel/plugin-proposal-async-generator-functions-7.12.1" sources."@babel/plugin-proposal-class-properties-7.12.1" sources."@babel/plugin-proposal-dynamic-import-7.12.1" @@ -87241,7 +88733,7 @@ in sources."@babel/plugin-proposal-json-strings-7.12.1" sources."@babel/plugin-proposal-logical-assignment-operators-7.12.1" sources."@babel/plugin-proposal-nullish-coalescing-operator-7.12.1" - sources."@babel/plugin-proposal-numeric-separator-7.12.1" + sources."@babel/plugin-proposal-numeric-separator-7.12.5" sources."@babel/plugin-proposal-object-rest-spread-7.12.1" sources."@babel/plugin-proposal-optional-catch-binding-7.12.1" sources."@babel/plugin-proposal-optional-chaining-7.12.1" @@ -87285,7 +88777,7 @@ in sources."@babel/plugin-transform-object-super-7.12.1" sources."@babel/plugin-transform-parameters-7.12.1" sources."@babel/plugin-transform-property-literals-7.12.1" - sources."@babel/plugin-transform-react-jsx-7.12.1" + sources."@babel/plugin-transform-react-jsx-7.12.5" sources."@babel/plugin-transform-regenerator-7.12.1" sources."@babel/plugin-transform-reserved-words-7.12.1" sources."@babel/plugin-transform-shorthand-properties-7.12.1" @@ -87297,10 +88789,10 @@ in sources."@babel/plugin-transform-unicode-regex-7.12.1" sources."@babel/preset-env-7.12.1" sources."@babel/preset-modules-0.1.4" - sources."@babel/runtime-7.12.1" + sources."@babel/runtime-7.12.5" sources."@babel/template-7.10.4" - sources."@babel/traverse-7.12.1" - sources."@babel/types-7.12.1" + sources."@babel/traverse-7.12.5" + sources."@babel/types-7.12.5" sources."@iarna/toml-2.2.5" sources."@mrmlnc/readdir-enhanced-2.2.1" sources."@nodelib/fs.stat-1.1.3" @@ -87353,7 +88845,7 @@ in sources."asynckit-0.4.0" sources."atob-2.1.2" sources."aws-sign2-0.7.0" - sources."aws4-1.10.1" + sources."aws4-1.11.0" sources."babel-plugin-dynamic-import-node-2.3.3" (sources."babel-runtime-6.26.0" // { dependencies = [ @@ -87402,7 +88894,7 @@ in sources."pako-1.0.11" ]; }) - sources."browserslist-4.14.5" + sources."browserslist-4.14.6" (sources."buffer-4.9.2" // { dependencies = [ sources."isarray-1.0.0" @@ -87413,12 +88905,13 @@ in sources."buffer-xor-1.0.3" sources."builtin-status-codes-3.0.0" sources."cache-base-1.0.1" + sources."call-bind-1.0.0" sources."call-me-maybe-1.0.1" sources."caller-callsite-2.0.0" sources."caller-path-2.0.0" sources."callsites-2.0.0" sources."caniuse-api-3.0.0" - sources."caniuse-lite-1.0.30001148" + sources."caniuse-lite-1.0.30001154" sources."caseless-0.12.0" sources."chalk-2.4.2" sources."chokidar-2.1.8" @@ -87490,10 +88983,10 @@ in sources."cssnano-util-get-match-4.0.0" sources."cssnano-util-raw-cache-4.0.1" sources."cssnano-util-same-parent-4.0.1" - (sources."csso-4.0.3" // { + (sources."csso-4.1.0" // { dependencies = [ - sources."css-tree-1.0.0-alpha.39" - sources."mdn-data-2.0.6" + sources."css-tree-1.0.0" + sources."mdn-data-2.0.12" ]; }) sources."cssom-0.3.8" @@ -87544,7 +89037,11 @@ in sources."domain-browser-1.2.0" sources."domelementtype-1.3.1" sources."domexception-1.0.1" - sources."domhandler-2.4.2" + (sources."domhandler-3.3.0" // { + dependencies = [ + sources."domelementtype-2.0.2" + ]; + }) sources."domutils-1.7.0" sources."dot-prop-5.3.0" sources."dotenv-5.0.1" @@ -87552,7 +89049,7 @@ in sources."duplexer2-0.1.4" sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.3.582" + sources."electron-to-chromium-1.3.587" (sources."elliptic-6.5.3" // { dependencies = [ sources."bn.js-4.11.9" @@ -87562,7 +89059,11 @@ in sources."entities-1.1.2" sources."envinfo-7.7.3" sources."error-ex-1.3.2" - sources."es-abstract-1.18.0-next.1" + (sources."es-abstract-1.17.7" // { + dependencies = [ + sources."object-inspect-1.8.0" + ]; + }) sources."es-to-primitive-1.2.1" sources."escalade-3.1.1" sources."escape-html-1.0.3" @@ -87606,7 +89107,8 @@ in sources."fs.realpath-1.0.0" sources."fsevents-1.2.13" sources."function-bind-1.1.1" - sources."gensync-1.0.0-beta.1" + sources."gensync-1.0.0-beta.2" + sources."get-intrinsic-1.0.1" sources."get-port-3.2.0" sources."get-value-2.0.6" sources."getpass-0.1.7" @@ -87653,13 +89155,16 @@ in (sources."htmlnano-0.2.7" // { dependencies = [ sources."posthtml-0.13.4" - sources."posthtml-parser-0.5.0" + sources."posthtml-parser-0.5.2" sources."terser-4.8.0" ]; }) - (sources."htmlparser2-3.10.1" // { + (sources."htmlparser2-5.0.1" // { dependencies = [ - sources."readable-stream-3.6.0" + sources."dom-serializer-1.1.0" + sources."domelementtype-2.0.2" + sources."domutils-2.4.2" + sources."entities-2.1.0" ]; }) sources."http-errors-1.7.3" @@ -87667,7 +89172,7 @@ in sources."https-browserify-1.0.0" sources."iconv-lite-0.4.24" sources."icss-replace-symbols-1.1.0" - sources."ieee754-1.1.13" + sources."ieee754-1.2.1" sources."import-fresh-2.0.0" sources."indexes-of-1.0.1" sources."inflight-1.0.6" @@ -87683,6 +89188,7 @@ in sources."is-buffer-1.1.6" sources."is-callable-1.2.2" sources."is-color-stop-1.1.0" + sources."is-core-module-2.0.0" (sources."is-data-descriptor-1.0.0" // { dependencies = [ sources."kind-of-6.0.3" @@ -87801,7 +89307,7 @@ in sources."punycode-1.4.1" ]; }) - sources."node-releases-1.1.63" + sources."node-releases-1.1.65" sources."normalize-path-3.0.0" sources."normalize-url-3.3.0" sources."nth-check-1.0.2" @@ -87809,21 +89315,13 @@ in sources."oauth-sign-0.9.0" sources."object-assign-4.1.1" sources."object-copy-0.1.0" - sources."object-inspect-1.8.0" + sources."object-inspect-1.4.1" sources."object-keys-1.1.1" sources."object-visit-1.0.1" - sources."object.assign-4.1.1" - (sources."object.getownpropertydescriptors-2.1.0" // { - dependencies = [ - sources."es-abstract-1.17.7" - ]; - }) + sources."object.assign-4.1.2" + sources."object.getownpropertydescriptors-2.1.0" sources."object.pick-1.3.0" - (sources."object.values-1.1.1" // { - dependencies = [ - sources."es-abstract-1.17.7" - ]; - }) + sources."object.values-1.1.1" sources."on-finished-2.3.0" sources."once-1.4.0" sources."onetime-2.0.1" @@ -87914,7 +89412,13 @@ in sources."postcss-unique-selectors-4.0.1" sources."postcss-value-parser-3.3.1" sources."posthtml-0.11.6" - sources."posthtml-parser-0.4.2" + (sources."posthtml-parser-0.4.2" // { + dependencies = [ + sources."domhandler-2.4.2" + sources."htmlparser2-3.10.1" + sources."readable-stream-3.6.0" + ]; + }) sources."posthtml-render-1.2.3" sources."prelude-ls-1.1.2" sources."process-0.11.10" @@ -87947,7 +89451,7 @@ in ]; }) sources."readdirp-2.2.1" - sources."regenerate-1.4.1" + sources."regenerate-1.4.2" sources."regenerate-unicode-properties-8.2.0" sources."regenerator-runtime-0.13.7" sources."regenerator-transform-0.14.5" @@ -87971,7 +89475,7 @@ in sources."request-2.88.2" sources."request-promise-core-1.1.4" sources."request-promise-native-1.0.9" - sources."resolve-1.17.0" + sources."resolve-1.18.1" sources."resolve-from-3.0.0" sources."resolve-url-0.2.1" sources."restore-cursor-2.0.0" @@ -88044,23 +89548,21 @@ in ]; }) sources."static-extend-0.1.2" - (sources."static-module-2.2.5" // { - dependencies = [ - sources."object-inspect-1.4.1" - ]; - }) + sources."static-module-2.2.5" sources."statuses-1.5.0" sources."stealthy-require-1.1.1" sources."stream-browserify-2.0.2" sources."stream-http-2.8.3" - (sources."string.prototype.trimend-1.0.1" // { + (sources."string.prototype.trimend-1.0.2" // { dependencies = [ - sources."es-abstract-1.17.7" + sources."es-abstract-1.18.0-next.1" + sources."object-inspect-1.8.0" ]; }) - (sources."string.prototype.trimstart-1.0.1" // { + (sources."string.prototype.trimstart-1.0.2" // { dependencies = [ - sources."es-abstract-1.17.7" + sources."es-abstract-1.18.0-next.1" + sources."object-inspect-1.8.0" ]; }) sources."string_decoder-1.1.1" @@ -88075,7 +89577,7 @@ in sources."symbol-tree-3.2.4" sources."terser-3.17.0" sources."through2-2.0.5" - sources."timers-browserify-2.0.11" + sources."timers-browserify-2.0.12" sources."timsort-0.3.0" sources."tiny-inflate-1.0.3" sources."to-arraybuffer-1.0.1" @@ -88138,13 +89640,9 @@ in ]; }) sources."util-deprecate-1.0.2" - (sources."util.promisify-1.0.1" // { - dependencies = [ - sources."es-abstract-1.17.7" - ]; - }) + sources."util.promisify-1.0.1" sources."uuid-3.4.0" - sources."v8-compile-cache-2.1.1" + sources."v8-compile-cache-2.2.0" sources."vendors-1.0.4" sources."verror-1.10.0" sources."vlq-0.2.3" @@ -88199,7 +89697,7 @@ in sources."async-0.9.2" sources."asynckit-0.4.0" sources."aws-sign2-0.7.0" - sources."aws4-1.10.1" + sources."aws4-1.11.0" sources."babybird-0.0.1" sources."balanced-match-1.0.0" sources."bcrypt-pbkdf-1.0.2" @@ -88217,6 +89715,7 @@ in sources."bunyan-syslog-udp-0.2.0" sources."busboy-0.3.1" sources."bytes-3.0.0" + sources."call-bind-1.0.0" sources."camelcase-5.3.1" sources."caseless-0.12.0" sources."clarinet-0.11.0" @@ -88253,8 +89752,6 @@ in sources."encodeurl-1.0.2" sources."entities-1.1.2" sources."errno-0.1.7" - sources."es-abstract-1.18.0-next.1" - sources."es-to-primitive-1.2.1" sources."escape-html-1.0.3" sources."esprima-4.0.1" sources."etag-1.8.1" @@ -88281,6 +89778,7 @@ in sources."gelf-stream-1.1.1" sources."gelfling-0.3.1" sources."get-caller-file-2.0.5" + sources."get-intrinsic-1.0.1" sources."getpass-0.1.7" sources."glob-7.1.6" sources."graceful-fs-4.2.4" @@ -88299,12 +89797,7 @@ in sources."inherits-2.0.3" sources."ipaddr.js-1.9.1" sources."is-arguments-1.0.4" - sources."is-callable-1.2.2" - sources."is-date-object-1.0.2" sources."is-fullwidth-code-point-2.0.0" - sources."is-negative-zero-2.0.0" - sources."is-regex-1.1.1" - sources."is-symbol-1.0.3" sources."is-typedarray-1.0.0" sources."isarray-1.0.0" sources."isstream-0.1.2" @@ -88346,9 +89839,8 @@ in sources."negotiator-git+https://github.com/arlolra/negotiator.git#full-parse-access" sources."neo-async-2.6.2" sources."oauth-sign-0.9.0" - sources."object-inspect-1.8.0" sources."object-keys-1.1.1" - sources."object.assign-4.1.1" + sources."object.assign-4.1.2" sources."on-finished-2.3.0" sources."on-headers-1.0.2" sources."once-1.4.0" @@ -88419,16 +89911,6 @@ in sources."statuses-1.5.0" sources."streamsearch-0.1.2" sources."string-width-3.1.0" - (sources."string.prototype.trimend-1.0.1" // { - dependencies = [ - sources."es-abstract-1.17.7" - ]; - }) - (sources."string.prototype.trimstart-1.0.1" // { - dependencies = [ - sources."es-abstract-1.17.7" - ]; - }) sources."string_decoder-1.1.1" sources."strip-ansi-5.2.0" sources."toidentifier-1.0.0" @@ -88436,7 +89918,7 @@ in sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."type-is-1.6.18" - sources."uglify-js-3.11.3" + sources."uglify-js-3.11.5" sources."unix-dgram-2.0.4" sources."unpipe-1.0.0" sources."uri-js-4.4.0" @@ -88763,6 +90245,7 @@ in sources."balanced-match-1.0.0" sources."base64-js-0.0.8" sources."bencode-2.0.1" + sources."bep53-range-1.0.0" sources."big-integer-1.6.48" sources."bitfield-0.1.0" (sources."bittorrent-dht-6.4.2" // { @@ -88775,7 +90258,7 @@ in sources."bencode-0.8.0" ]; }) - sources."blob-to-buffer-1.2.8" + sources."blob-to-buffer-1.2.9" sources."bn.js-4.11.9" sources."bncode-0.5.3" sources."bonjour-3.5.0" @@ -88789,11 +90272,12 @@ in sources."buffer-fill-1.0.0" sources."buffer-from-1.1.1" sources."buffer-indexof-1.1.1" + sources."call-bind-1.0.0" sources."camelcase-2.1.1" sources."camelcase-keys-2.1.0" sources."chalk-1.1.3" sources."chardet-0.4.2" - sources."chrome-dgram-3.0.5" + sources."chrome-dgram-3.0.6" sources."chrome-dns-1.0.1" sources."chrome-net-3.3.4" sources."cli-cursor-2.1.0" @@ -88837,6 +90321,7 @@ in sources."fs.realpath-1.0.0" sources."function-bind-1.1.1" sources."get-browser-rtc-1.0.2" + sources."get-intrinsic-1.0.1" sources."get-stdin-4.0.1" sources."glob-7.1.6" sources."graceful-fs-4.2.4" @@ -88872,6 +90357,7 @@ in sources."is-arguments-1.0.4" sources."is-arrayish-0.2.1" sources."is-callable-1.2.2" + sources."is-core-module-2.0.0" sources."is-date-object-1.0.2" sources."is-finite-1.1.0" sources."is-fullwidth-code-point-1.0.0" @@ -88892,7 +90378,7 @@ in sources."lodash-3.10.1" sources."loud-rejection-1.6.0" sources."lru-2.0.1" - sources."magnet-uri-5.3.0" + sources."magnet-uri-5.4.0" sources."map-obj-1.0.1" sources."meow-3.7.0" sources."mime-2.4.6" @@ -88915,7 +90401,7 @@ in sources."object-inspect-1.8.0" sources."object-is-1.1.3" sources."object-keys-1.1.1" - sources."object.assign-4.1.1" + sources."object.assign-4.1.2" sources."once-1.4.0" sources."onetime-2.0.1" sources."open-0.0.5" @@ -88973,13 +90459,13 @@ in ]; }) sources."repeating-2.0.1" - sources."resolve-1.17.0" + sources."resolve-1.18.1" sources."restore-cursor-2.0.0" sources."reverse-http-1.3.0" sources."rimraf-2.7.1" sources."run-async-2.4.1" - sources."run-parallel-1.1.9" - sources."run-series-1.1.8" + sources."run-parallel-1.1.10" + sources."run-series-1.1.9" sources."rusha-0.8.13" sources."rxjs-5.5.12" sources."safe-buffer-5.1.2" @@ -89005,16 +90491,8 @@ in sources."speedometer-0.1.4" sources."stream-buffers-2.2.0" sources."string-width-1.0.2" - (sources."string.prototype.trimend-1.0.1" // { - dependencies = [ - sources."es-abstract-1.17.7" - ]; - }) - (sources."string.prototype.trimstart-1.0.1" // { - dependencies = [ - sources."es-abstract-1.17.7" - ]; - }) + sources."string.prototype.trimend-1.0.2" + sources."string.prototype.trimstart-1.0.2" (sources."string2compact-1.3.0" // { dependencies = [ sources."ipaddr.js-1.9.1" @@ -89098,7 +90576,7 @@ in sources."async-limiter-1.0.1" sources."asynckit-0.4.0" sources."aws-sign2-0.7.0" - sources."aws4-1.10.1" + sources."aws4-1.11.0" sources."backo2-1.0.2" sources."balanced-match-1.0.0" sources."base64-arraybuffer-0.1.4" @@ -89123,7 +90601,7 @@ in sources."bncode-0.5.3" sources."body-parser-1.19.0" sources."brace-expansion-1.1.11" - sources."buffer-5.6.0" + sources."buffer-5.7.0" sources."buffer-alloc-1.2.0" sources."buffer-alloc-unsafe-1.1.0" sources."buffer-crc32-0.2.13" @@ -89134,7 +90612,7 @@ in sources."bytes-3.1.0" sources."callsite-1.0.0" sources."caseless-0.12.0" - sources."chrome-dgram-3.0.5" + sources."chrome-dgram-3.0.6" sources."chrome-dns-1.0.1" sources."chrome-net-3.3.4" sources."combined-stream-1.0.8" @@ -89226,7 +90704,7 @@ in }) sources."http-signature-1.2.0" sources."iconv-lite-0.4.24" - sources."ieee754-1.1.13" + sources."ieee754-1.2.1" sources."immediate-chunk-store-1.0.8" sources."indexof-0.0.1" sources."inflight-1.0.6" @@ -89342,8 +90820,8 @@ in ]; }) sources."rimraf-2.7.1" - sources."run-parallel-1.1.9" - sources."run-series-1.1.8" + sources."run-parallel-1.1.10" + sources."run-series-1.1.9" sources."rusha-0.8.13" sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" @@ -89587,6 +91065,7 @@ in sources."readable-stream-1.1.14" ]; }) + sources."function-bind-1.1.1" (sources."get-uri-2.0.4" // { dependencies = [ sources."debug-2.6.9" @@ -89595,6 +91074,7 @@ in }) sources."glob-7.1.6" sources."glob-parent-5.1.1" + sources."has-1.0.3" sources."has-flag-4.0.0" sources."http-errors-1.7.3" (sources."http-proxy-agent-2.1.0" // { @@ -89613,6 +91093,7 @@ in sources."inherits-2.0.4" sources."ip-1.1.5" sources."is-binary-path-2.1.0" + sources."is-core-module-2.0.0" sources."is-extglob-2.1.1" sources."is-glob-4.0.1" sources."is-number-7.0.0" @@ -89677,8 +91158,8 @@ in }) sources."readdirp-3.5.0" sources."require-in-the-middle-5.0.3" - sources."resolve-1.17.0" - sources."run-series-1.1.8" + sources."resolve-1.18.1" + sources."run-series-1.1.9" sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" sources."sax-1.2.4" @@ -89699,7 +91180,7 @@ in sources."statuses-1.5.0" sources."string_decoder-0.10.31" sources."supports-color-7.2.0" - sources."systeminformation-4.27.10" + sources."systeminformation-4.27.11" sources."thunkify-2.1.2" sources."to-regex-range-5.0.1" sources."toidentifier-1.0.0" @@ -89734,10 +91215,10 @@ in pnpm = nodeEnv.buildNodePackage { name = "pnpm"; packageName = "pnpm"; - version = "5.9.3"; + version = "5.10.4"; src = fetchurl { - url = "https://registry.npmjs.org/pnpm/-/pnpm-5.9.3.tgz"; - sha512 = "MyN/jR/WfM7SPnnrkaEoQ2+cOhoSAnhzJ2sDOF7yZKyjh0sYuvGcijeZYbyWJ0r5C0vtBPV5SRtiLaHvwYWZBg=="; + url = "https://registry.npmjs.org/pnpm/-/pnpm-5.10.4.tgz"; + sha512 = "HWtg7vrXpNNCeroOc0IhsoNdwPmga/N7Nci/Mc9SadHrkMXPNpkFXCHT3g9e4HqtGlbDX2K30WKvYQu2umdM+w=="; }; buildInputs = globalBuildInputs; meta = { @@ -89752,10 +91233,10 @@ in postcss-cli = nodeEnv.buildNodePackage { name = "postcss-cli"; packageName = "postcss-cli"; - version = "8.1.0"; + version = "8.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/postcss-cli/-/postcss-cli-8.1.0.tgz"; - sha512 = "FYuV5zyYX53X5RywInxjWLqHZ4oCBC3nDwrHYU3Z75mFqUo5IHfbeY593heWSagG90nPnXq3tXCck8+2CUl8EA=="; + url = "https://registry.npmjs.org/postcss-cli/-/postcss-cli-8.2.0.tgz"; + sha512 = "N7tgPpB/2yXk/04irc/RiImCkftVw42STaploQBeOT1xvrIkyG+YW+TsHAJ57xWwL+b0AjXnqs5/RL/1XIh2Lw=="; }; dependencies = [ sources."@babel/code-frame-7.10.4" @@ -89796,7 +91277,7 @@ in sources."escalade-3.1.1" sources."escape-string-regexp-1.0.5" sources."fast-glob-3.2.4" - sources."fastq-1.8.0" + sources."fastq-1.9.0" sources."fill-range-7.0.1" sources."fs-extra-9.0.1" sources."fsevents-2.1.3" @@ -89808,7 +91289,7 @@ in sources."has-flag-4.0.0" sources."ignore-5.1.8" sources."import-cwd-3.0.0" - sources."import-fresh-3.2.1" + sources."import-fresh-3.2.2" (sources."import-from-3.0.0" // { dependencies = [ sources."resolve-from-5.0.0" @@ -89822,7 +91303,11 @@ in sources."is-number-7.0.0" sources."js-tokens-4.0.0" sources."json-parse-even-better-errors-2.3.1" - sources."jsonfile-6.0.1" + (sources."jsonfile-6.1.0" // { + dependencies = [ + sources."universalify-2.0.0" + ]; + }) sources."lines-and-columns-1.1.6" sources."lodash.difference-4.5.0" sources."lodash.forown-4.4.0" @@ -89846,7 +91331,7 @@ in sources."require-directory-2.1.1" sources."resolve-from-4.0.0" sources."reusify-1.0.4" - sources."run-parallel-1.1.9" + sources."run-parallel-1.1.10" sources."slash-3.0.0" sources."string-width-4.2.0" sources."strip-ansi-6.0.0" @@ -89854,7 +91339,7 @@ in sources."to-regex-range-5.0.1" sources."universalify-1.0.0" sources."wrap-ansi-7.0.0" - sources."y18n-5.0.4" + sources."y18n-5.0.5" sources."yaml-1.10.0" sources."yargs-16.1.0" sources."yargs-parser-20.2.3" @@ -90047,7 +91532,7 @@ in sources."hmac-drbg-1.0.1" sources."htmlescape-1.1.1" sources."https-browserify-1.0.0" - sources."ieee754-1.1.13" + sources."ieee754-1.2.1" sources."inflight-1.0.6" sources."inherits-2.0.4" sources."inline-source-map-0.6.2" @@ -90057,6 +91542,7 @@ in ]; }) sources."is-buffer-1.1.6" + sources."is-core-module-2.0.0" sources."isarray-1.0.0" sources."isexe-2.0.0" sources."json-stable-stringify-0.0.1" @@ -90127,7 +91613,7 @@ in sources."string_decoder-1.1.1" ]; }) - sources."resolve-1.17.0" + sources."resolve-1.18.1" sources."rimraf-2.7.1" sources."ripemd160-2.0.2" sources."safe-buffer-5.2.1" @@ -90152,7 +91638,7 @@ in sources."string_decoder-1.3.0" sources."subarg-1.0.0" sources."syntax-error-1.4.0" - (sources."temp-0.9.1" // { + (sources."temp-0.9.2" // { dependencies = [ sources."rimraf-2.6.3" ]; @@ -90261,10 +91747,10 @@ in pyright = nodeEnv.buildNodePackage { name = "pyright"; packageName = "pyright"; - version = "1.1.79"; + version = "1.1.83"; src = fetchurl { - url = "https://registry.npmjs.org/pyright/-/pyright-1.1.79.tgz"; - sha512 = "WriY7VGjg9CzhxMUfDf8bIBRfXWeVj/kgiAAJ783wiQuUwy5IwMlZgR4ZyAGYBztMH+uRdiG4HCgt30ELYeeNg=="; + url = "https://registry.npmjs.org/pyright/-/pyright-1.1.83.tgz"; + sha512 = "uwaqJsuGxtY94lA8PL3Akp1xkUqUYWEFDLrIdW3FQY6JgFngkAZ51rPyUsuXQjoObm056OZ68wtzUMhDX5P5UA=="; }; buildInputs = globalBuildInputs; meta = { @@ -90292,6 +91778,7 @@ in sources."available-typed-arrays-1.0.2" sources."balanced-match-1.0.0" sources."brace-expansion-1.1.11" + sources."call-bind-1.0.0" sources."chalk-1.1.3" sources."colors-0.6.2" sources."concat-map-0.0.1" @@ -90310,6 +91797,7 @@ in sources."foreach-2.0.5" sources."fs.realpath-1.0.0" sources."function-bind-1.1.1" + sources."get-intrinsic-1.0.1" sources."glob-7.1.6" sources."has-1.0.3" sources."has-ansi-2.0.0" @@ -90346,7 +91834,7 @@ in sources."object-inspect-1.8.0" sources."object-is-1.1.3" sources."object-keys-1.1.1" - sources."object.assign-4.1.1" + sources."object.assign-4.1.2" sources."once-1.4.0" sources."path-is-absolute-1.0.1" sources."pkginfo-0.4.1" @@ -90362,16 +91850,8 @@ in sources."semver-5.7.1" sources."side-channel-1.0.3" sources."stack-trace-0.0.10" - (sources."string.prototype.trimend-1.0.1" // { - dependencies = [ - sources."es-abstract-1.17.7" - ]; - }) - (sources."string.prototype.trimstart-1.0.1" // { - dependencies = [ - sources."es-abstract-1.17.7" - ]; - }) + sources."string.prototype.trimend-1.0.2" + sources."string.prototype.trimstart-1.0.2" sources."strip-ansi-3.0.1" sources."supports-color-2.0.0" sources."utile-0.2.1" @@ -90472,7 +91952,7 @@ in sources."assert-plus-1.0.0" sources."asynckit-0.4.0" sources."aws-sign2-0.7.0" - sources."aws4-1.10.1" + sources."aws4-1.11.0" sources."bcrypt-pbkdf-1.0.2" sources."browser-process-hrtime-1.0.0" sources."caseless-0.12.0" @@ -90587,14 +92067,14 @@ in redoc-cli = nodeEnv.buildNodePackage { name = "redoc-cli"; packageName = "redoc-cli"; - version = "0.9.12"; + version = "0.9.13"; src = fetchurl { - url = "https://registry.npmjs.org/redoc-cli/-/redoc-cli-0.9.12.tgz"; - sha512 = "9Ap7WfEsYtAoVZNyA8lryWAsU2Wq0lHXaNiFgdVZb4zltHNTYEqKmRi06WhileeuqVTNkd1CF2S5CCS5Xg9+aQ=="; + url = "https://registry.npmjs.org/redoc-cli/-/redoc-cli-0.9.13.tgz"; + sha512 = "6zNhK7KiiYPGaMIFISsIkgAJaXTY0n8hY3xGAeQuS52GRm/DR5bA1Jna52GUzWM/LXgyp6HSBvYucd+wmOQYCQ=="; }; dependencies = [ sources."@babel/code-frame-7.10.4" - (sources."@babel/generator-7.12.1" // { + (sources."@babel/generator-7.12.5" // { dependencies = [ sources."source-map-0.5.7" ]; @@ -90602,22 +92082,24 @@ in sources."@babel/helper-annotate-as-pure-7.10.4" sources."@babel/helper-function-name-7.10.4" sources."@babel/helper-get-function-arity-7.10.4" - sources."@babel/helper-module-imports-7.12.1" + sources."@babel/helper-module-imports-7.12.5" sources."@babel/helper-split-export-declaration-7.11.0" sources."@babel/helper-validator-identifier-7.10.4" sources."@babel/highlight-7.10.4" - sources."@babel/parser-7.12.3" - sources."@babel/runtime-7.12.1" + sources."@babel/parser-7.12.5" + sources."@babel/runtime-7.12.5" sources."@babel/template-7.10.4" - sources."@babel/traverse-7.12.1" - sources."@babel/types-7.12.1" + sources."@babel/traverse-7.12.5" + sources."@babel/types-7.12.5" sources."@emotion/is-prop-valid-0.8.8" sources."@emotion/memoize-0.7.4" sources."@emotion/stylis-0.8.5" sources."@emotion/unitless-0.7.5" sources."@exodus/schemasafe-1.0.0-rc.3" + sources."@redocly/react-dropdown-aria-2.0.11" + sources."@types/node-13.13.30" sources."ajv-5.5.2" - sources."ansi-regex-3.0.0" + sources."ansi-regex-5.0.0" sources."ansi-styles-3.2.1" sources."anymatch-3.1.1" sources."argparse-1.0.10" @@ -90635,7 +92117,6 @@ in sources."babel-plugin-syntax-jsx-6.18.0" sources."base64-js-1.3.1" sources."better-ajv-errors-0.6.7" - sources."big.js-5.2.2" sources."binary-extensions-2.1.0" sources."bn.js-5.1.3" sources."braces-3.0.2" @@ -90670,11 +92151,10 @@ in sources."cipher-base-1.0.4" sources."classnames-2.2.6" sources."clipboard-2.0.6" - sources."cliui-4.1.0" + sources."cliui-6.0.0" sources."clsx-1.1.1" sources."co-4.6.0" sources."code-error-fragment-0.0.230" - sources."code-point-at-1.1.0" sources."color-convert-1.9.3" sources."color-name-1.1.3" sources."console-browserify-1.2.0" @@ -90688,7 +92168,6 @@ in }) sources."create-hash-1.2.0" sources."create-hmac-1.1.7" - sources."cross-spawn-6.0.5" sources."crypto-browserify-3.12.0" sources."css-color-keywords-1.0.0" sources."css-to-react-native-3.0.0" @@ -90702,37 +92181,30 @@ in sources."bn.js-4.11.9" ]; }) - sources."dom-walk-0.1.2" sources."domain-browser-1.2.0" - sources."dompurify-1.0.11" + sources."dompurify-2.2.2" (sources."elliptic-6.5.3" // { dependencies = [ sources."bn.js-4.11.9" ]; }) sources."emoji-regex-8.0.0" - sources."emojis-list-3.0.0" - sources."end-of-stream-1.4.4" sources."es6-promise-3.3.1" sources."escape-string-regexp-1.0.5" sources."esprima-4.0.1" - sources."eventemitter3-3.1.2" + sources."eventemitter3-4.0.7" sources."events-3.2.0" sources."evp_bytestokey-1.0.3" - sources."execa-1.0.0" sources."fast-deep-equal-1.1.0" sources."fast-json-stable-stringify-2.1.0" - sources."fast-levenshtein-2.0.6" sources."fast-safe-stringify-2.0.7" sources."fill-range-7.0.1" - sources."find-up-3.0.0" + sources."find-up-4.1.0" sources."foreach-2.0.5" sources."format-util-1.0.5" sources."fsevents-2.1.3" - sources."get-caller-file-1.0.3" - sources."get-stream-4.1.0" + sources."get-caller-file-2.0.5" sources."glob-parent-5.1.1" - sources."global-4.4.0" sources."globals-11.12.0" sources."good-listener-1.2.2" sources."grapheme-splitter-1.0.4" @@ -90753,17 +92225,14 @@ in sources."hoist-non-react-statics-3.3.2" sources."http2-client-1.3.3" sources."https-browserify-1.0.0" - sources."ieee754-1.1.13" + sources."ieee754-1.2.1" sources."inherits-2.0.1" - sources."invert-kv-2.0.0" sources."is-binary-path-2.1.0" sources."is-extglob-2.1.1" - sources."is-fullwidth-code-point-1.0.0" + sources."is-fullwidth-code-point-3.0.0" sources."is-glob-4.0.1" sources."is-number-7.0.0" - sources."is-stream-1.1.0" sources."isarray-2.0.5" - sources."isexe-2.0.0" sources."js-tokens-4.0.0" sources."js-yaml-3.14.0" sources."jsesc-2.5.2" @@ -90771,65 +92240,50 @@ in sources."json-schema-ref-parser-6.1.0" sources."json-schema-traverse-0.3.1" sources."json-to-ast-2.1.0" - sources."json5-1.0.1" sources."jsonpointer-4.1.0" - sources."lcid-2.0.0" sources."leven-3.1.0" - sources."loader-utils-1.4.0" - sources."locate-path-3.0.0" + sources."locate-path-5.0.0" sources."lodash-4.17.20" sources."loose-envify-1.4.0" - sources."lunr-2.3.6" - sources."map-age-cleaner-0.1.3" + sources."lunr-2.3.8" sources."mark.js-8.11.1" - sources."marked-0.6.3" + sources."marked-0.7.0" sources."md5.js-1.3.5" - sources."mem-4.3.0" sources."memoize-one-5.1.1" (sources."miller-rabin-4.0.1" // { dependencies = [ sources."bn.js-4.11.9" ]; }) - sources."mimic-fn-2.1.0" - sources."min-document-2.19.0" sources."minimalistic-assert-1.0.1" sources."minimalistic-crypto-utils-1.0.1" sources."minimist-1.2.5" sources."mkdirp-1.0.4" - sources."mobx-4.15.7" - sources."mobx-react-5.4.4" + sources."mobx-6.0.3" + sources."mobx-react-6.3.1" + sources."mobx-react-lite-2.2.2" sources."ms-2.1.2" sources."neo-async-2.6.2" - sources."nice-try-1.0.5" sources."node-fetch-h2-2.3.0" sources."node-libs-browser-2.2.1" sources."node-readfiles-0.2.0" sources."normalize-path-3.0.0" - sources."npm-run-path-2.0.2" - sources."number-is-nan-1.0.1" sources."oas-kit-common-1.0.8" sources."oas-linter-3.2.1" sources."oas-resolver-2.5.2" sources."oas-schema-walker-1.1.5" - sources."oas-validator-3.4.0" + sources."oas-validator-4.0.8" sources."object-assign-4.1.1" - sources."once-1.4.0" sources."ono-4.0.11" - sources."openapi-sampler-1.0.0-beta.14" + sources."openapi-sampler-1.0.0-beta.18" sources."os-browserify-0.3.0" - sources."os-locale-3.1.0" - sources."p-defer-1.0.0" - sources."p-finally-1.0.0" - sources."p-is-promise-2.1.0" sources."p-limit-2.3.0" - sources."p-locate-3.0.0" + sources."p-locate-4.1.0" sources."p-try-2.2.0" sources."pako-1.0.11" sources."parse-asn1-5.1.6" sources."path-browserify-0.0.1" - sources."path-exists-3.0.0" - sources."path-key-2.0.1" + sources."path-exists-4.0.0" sources."pbkdf2-3.1.1" sources."perfect-scrollbar-1.5.0" sources."picomatch-2.2.2" @@ -90844,7 +92298,6 @@ in sources."bn.js-4.11.9" ]; }) - sources."pump-3.0.0" sources."punycode-1.4.1" sources."querystring-0.2.0" sources."querystring-es3-0.2.1" @@ -90852,14 +92305,7 @@ in sources."randomfill-1.0.4" sources."react-16.14.0" sources."react-dom-16.14.0" - sources."react-dropdown-1.9.0" - (sources."react-hot-loader-4.13.0" // { - dependencies = [ - sources."source-map-0.7.3" - ]; - }) sources."react-is-16.13.1" - sources."react-lifecycles-compat-3.0.4" sources."react-tabs-3.1.1" (sources."readable-stream-2.3.7" // { dependencies = [ @@ -90870,68 +92316,52 @@ in ]; }) sources."readdirp-3.5.0" - (sources."redoc-2.0.0-rc.8-1" // { - dependencies = [ - sources."tslib-1.14.1" - ]; - }) + sources."redoc-2.0.0-rc.45" sources."reftools-1.1.6" sources."regenerator-runtime-0.13.7" sources."require-directory-2.1.1" - sources."require-main-filename-1.0.1" + sources."require-main-filename-2.0.0" sources."ripemd160-2.0.2" sources."safe-buffer-5.2.1" sources."safer-buffer-2.1.2" sources."scheduler-0.19.1" sources."select-1.1.2" - sources."semver-5.7.1" sources."set-blocking-2.0.0" sources."setimmediate-1.0.5" sources."sha.js-2.4.11" sources."shallowequal-1.1.0" - sources."shebang-command-1.2.0" - sources."shebang-regex-1.0.0" sources."should-13.2.3" sources."should-equal-2.0.0" sources."should-format-3.0.3" sources."should-type-1.4.0" sources."should-type-adaptors-1.1.0" sources."should-util-1.0.1" - sources."signal-exit-3.0.3" - sources."slugify-1.4.5" + sources."slugify-1.4.6" sources."source-map-0.6.1" sources."sprintf-js-1.0.3" sources."stickyfill-1.1.1" sources."stream-browserify-2.0.2" sources."stream-http-2.8.3" - (sources."string-width-2.1.1" // { - dependencies = [ - sources."is-fullwidth-code-point-2.0.0" - ]; - }) + sources."string-width-4.2.0" sources."string_decoder-1.3.0" - sources."strip-ansi-4.0.0" - sources."strip-eof-1.0.0" - sources."styled-components-5.2.0" + sources."strip-ansi-6.0.0" + sources."styled-components-5.2.1" sources."supports-color-5.5.0" - (sources."swagger2openapi-5.4.0" // { - dependencies = [ - sources."yargs-12.0.5" - ]; - }) - sources."timers-browserify-2.0.11" + sources."swagger2openapi-6.2.3" + sources."timers-browserify-2.0.12" sources."tiny-emitter-2.1.0" sources."to-arraybuffer-1.0.1" sources."to-fast-properties-2.0.0" sources."to-regex-range-5.0.1" sources."tslib-2.0.3" sources."tty-browserify-0.0.0" - sources."uglify-js-3.11.3" + sources."uglify-js-3.11.5" (sources."url-0.11.0" // { dependencies = [ sources."punycode-1.3.2" ]; }) + sources."url-template-2.0.8" (sources."util-0.11.1" // { dependencies = [ sources."inherits-2.0.3" @@ -90939,41 +92369,20 @@ in }) sources."util-deprecate-1.0.2" sources."vm-browserify-1.1.2" - sources."which-1.3.1" sources."which-module-2.0.0" sources."wordwrap-1.0.0" - (sources."wrap-ansi-2.1.0" // { + (sources."wrap-ansi-6.2.0" // { dependencies = [ - sources."ansi-regex-2.1.1" - sources."string-width-1.0.2" - sources."strip-ansi-3.0.1" + sources."ansi-styles-4.3.0" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" ]; }) - sources."wrappy-1.0.2" sources."xtend-4.0.2" sources."y18n-4.0.0" sources."yaml-1.10.0" - (sources."yargs-15.4.1" // { - dependencies = [ - sources."ansi-regex-5.0.0" - sources."ansi-styles-4.3.0" - sources."cliui-6.0.0" - sources."color-convert-2.0.1" - sources."color-name-1.1.4" - sources."find-up-4.1.0" - sources."get-caller-file-2.0.5" - sources."is-fullwidth-code-point-3.0.0" - sources."locate-path-5.0.0" - sources."p-locate-4.1.0" - sources."path-exists-4.0.0" - sources."require-main-filename-2.0.0" - sources."string-width-4.2.0" - sources."strip-ansi-6.0.0" - sources."wrap-ansi-6.2.0" - sources."yargs-parser-18.1.3" - ]; - }) - sources."yargs-parser-11.1.1" + sources."yargs-15.4.1" + sources."yargs-parser-18.1.3" ]; buildInputs = globalBuildInputs; meta = { @@ -91006,10 +92415,10 @@ in rollup = nodeEnv.buildNodePackage { name = "rollup"; packageName = "rollup"; - version = "2.32.0"; + version = "2.33.1"; src = fetchurl { - url = "https://registry.npmjs.org/rollup/-/rollup-2.32.0.tgz"; - sha512 = "0FIG1jY88uhCP2yP4CfvtKEqPDRmsUwfY1kEOOM+DH/KOGATgaIFd/is1+fQOxsvh62ELzcFfKonwKWnHhrqmw=="; + url = "https://registry.npmjs.org/rollup/-/rollup-2.33.1.tgz"; + sha512 = "uY4O/IoL9oNW8MMcbA5hcOaz6tZTMIh7qJHx/tzIJm+n1wLoY38BLn6fuy7DhR57oNFLMbDQtDeJoFURt5933w=="; }; dependencies = [ sources."fsevents-2.1.3" @@ -91037,7 +92446,7 @@ in sources."chalk-2.4.2" ]; }) - sources."@eslint/eslintrc-0.1.3" + sources."@eslint/eslintrc-0.2.1" sources."@rollup/plugin-commonjs-13.0.2" sources."@rollup/plugin-node-resolve-8.4.0" sources."@rollup/pluginutils-3.1.0" @@ -91139,7 +92548,7 @@ in sources."es6-promise-4.2.8" sources."es6-promisify-5.0.0" sources."escape-string-regexp-1.0.5" - (sources."eslint-7.11.0" // { + (sources."eslint-7.12.1" // { dependencies = [ sources."eslint-visitor-keys-2.0.0" sources."semver-7.3.2" @@ -91176,12 +92585,14 @@ in sources."form-data-3.0.0" sources."fs.realpath-1.0.0" sources."fsevents-2.1.3" + sources."function-bind-1.1.1" sources."functional-red-black-tree-1.0.1" sources."get-caller-file-2.0.5" sources."glob-7.1.6" sources."glob-parent-5.1.1" sources."globals-12.4.0" sources."growl-1.10.5" + sources."has-1.0.3" sources."has-flag-3.0.0" sources."he-1.2.0" sources."htmlparser2-3.10.1" @@ -91197,11 +92608,12 @@ in ]; }) sources."ignore-4.0.6" - sources."import-fresh-3.2.1" + sources."import-fresh-3.2.2" sources."imurmurhash-0.1.4" sources."inflight-1.0.6" sources."inherits-2.0.4" sources."is-binary-path-2.1.0" + sources."is-core-module-2.0.0" sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-2.0.0" sources."is-glob-4.0.1" @@ -91234,7 +92646,7 @@ in sources."minimatch-3.0.4" sources."minimist-1.2.5" sources."mkdirp-0.5.5" - (sources."mocha-8.2.0" // { + (sources."mocha-8.2.1" // { dependencies = [ sources."debug-4.2.0" sources."escape-string-regexp-4.0.0" @@ -91282,10 +92694,10 @@ in sources."regexpp-3.1.0" sources."require-directory-2.1.1" sources."require-main-filename-2.0.0" - sources."resolve-1.17.0" + sources."resolve-1.18.1" sources."resolve-from-4.0.0" sources."rimraf-2.6.3" - sources."rollup-2.32.0" + sources."rollup-2.33.1" sources."safe-buffer-5.2.1" sources."semver-6.3.0" sources."serialize-javascript-5.0.1" @@ -91327,11 +92739,11 @@ in sources."uri-js-4.4.0" sources."url-join-1.1.0" sources."util-deprecate-1.0.2" - sources."v8-compile-cache-2.1.1" + sources."v8-compile-cache-2.2.0" (sources."vsce-1.81.1" // { dependencies = [ sources."chalk-2.4.2" - sources."commander-6.1.0" + sources."commander-6.2.0" sources."semver-5.7.1" ]; }) @@ -91339,7 +92751,7 @@ in sources."vscode-languageclient-7.0.0-next.9" sources."vscode-languageserver-protocol-3.16.0-next.7" sources."vscode-languageserver-types-3.16.0-next.3" - sources."vscode-test-1.4.0" + sources."vscode-test-1.4.1" sources."which-2.0.2" sources."which-module-2.0.0" (sources."wide-align-1.1.3" // { @@ -91373,7 +92785,7 @@ in sources."yargs-parser-13.1.2" (sources."yargs-unparser-2.0.0" // { dependencies = [ - sources."camelcase-6.1.0" + sources."camelcase-6.2.0" sources."decamelize-4.0.0" ]; }) @@ -91402,7 +92814,7 @@ in sources."asynckit-0.4.0" sources."aws-sdk-1.18.0" sources."aws-sign2-0.7.0" - sources."aws4-1.10.1" + sources."aws4-1.11.0" sources."bcrypt-pbkdf-1.0.2" sources."buffer-crc32-0.2.1" sources."bytes-0.2.1" @@ -91522,10 +92934,10 @@ in sass = nodeEnv.buildNodePackage { name = "sass"; packageName = "sass"; - version = "1.27.0"; + version = "1.28.0"; src = fetchurl { - url = "https://registry.npmjs.org/sass/-/sass-1.27.0.tgz"; - sha512 = "0gcrER56OkzotK/GGwgg4fPrKuiFlPNitO7eUJ18Bs+/NBlofJfMxmxqpqJxjae9vu0Wq8TZzrSyxZal00WDig=="; + url = "https://registry.npmjs.org/sass/-/sass-1.28.0.tgz"; + sha512 = "9FWX/0wuE1KxwfiP02chZhHaPzu6adpx9+wGch7WMOuHy5npOo0UapRI3FNSHva2CczaYJu2yNUBN8cCSqHz/A=="; }; dependencies = [ sources."anymatch-3.1.1" @@ -91587,7 +92999,7 @@ in sources."ansi-align-2.0.0" sources."ansi-regex-3.0.0" sources."ansi-styles-3.2.1" - sources."arch-2.1.2" + sources."arch-2.2.0" sources."arg-2.0.0" sources."balanced-match-1.0.0" sources."boxen-1.3.0" @@ -91681,10 +93093,10 @@ in serverless = nodeEnv.buildNodePackage { name = "serverless"; packageName = "serverless"; - version = "2.8.0"; + version = "2.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/serverless/-/serverless-2.8.0.tgz"; - sha512 = "5yG+t5SHX4vxMmllLEj6DPkP0QTuMwmYfQw7mqq8H2WPr6MOUTuksskgNhljpgEASLAeZa5HdaRQq+s+/pq17w=="; + url = "https://registry.npmjs.org/serverless/-/serverless-2.10.0.tgz"; + sha512 = "5q/8gJvOh3ssqskIw/UNLyXWWLEfJtvRiPK7qnOS71uvjz19mtL+a3XrowMNe/KINRXzzMWBGpGNwzcLEAhcZQ=="; }; dependencies = [ sources."2-thenable-1.0.0" @@ -91716,23 +93128,10 @@ in ]; }) sources."@serverless/component-metrics-1.0.8" - (sources."@serverless/components-3.2.4" // { + (sources."@serverless/components-3.3.0" // { dependencies = [ - sources."@sindresorhus/is-3.1.2" - sources."@szmarczak/http-timer-4.0.5" sources."ansi-regex-5.0.0" - sources."cacheable-request-7.0.1" - sources."decompress-response-6.0.0" - sources."defer-to-connect-2.0.0" - sources."get-stream-5.2.0" - sources."got-11.7.0" - sources."json-buffer-3.0.1" - sources."keyv-4.0.3" - sources."lowercase-keys-2.0.0" - sources."mimic-response-3.1.0" - sources."p-cancelable-2.0.0" sources."ramda-0.27.1" - sources."responselike-2.0.0" sources."strip-ansi-6.0.0" ]; }) @@ -91745,7 +93144,7 @@ in sources."@serverless/enterprise-plugin-4.1.1" sources."@serverless/event-mocks-1.1.1" sources."@serverless/platform-client-3.1.2" - sources."@serverless/platform-client-china-2.0.4" + sources."@serverless/platform-client-china-2.0.7" (sources."@serverless/platform-sdk-2.3.2" // { dependencies = [ sources."chalk-2.4.2" @@ -91758,13 +93157,13 @@ in sources."ws-6.2.1" ]; }) - sources."@serverless/template-1.1.3" + sources."@serverless/template-1.1.4" (sources."@serverless/utils-2.0.0" // { dependencies = [ sources."write-file-atomic-3.0.3" ]; }) - sources."@serverless/utils-china-1.0.7" + sources."@serverless/utils-china-1.0.10" sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" sources."@tencent-sdk/capi-1.1.5" @@ -91772,9 +93171,9 @@ in sources."@types/caseless-0.12.2" sources."@types/http-cache-semantics-4.0.0" sources."@types/keyv-3.1.1" - sources."@types/lodash-4.14.162" + sources."@types/lodash-4.14.164" sources."@types/long-4.0.1" - sources."@types/node-14.11.10" + sources."@types/node-14.14.6" sources."@types/request-2.48.5" sources."@types/request-promise-native-1.0.17" sources."@types/responselike-1.0.0" @@ -91831,14 +93230,15 @@ in sources."async-limiter-1.0.1" sources."asynckit-0.4.0" sources."at-least-node-1.0.0" - (sources."aws-sdk-2.773.0" // { + (sources."aws-sdk-2.784.0" // { dependencies = [ sources."buffer-4.9.2" + sources."ieee754-1.1.13" sources."uuid-3.3.2" ]; }) sources."aws-sign2-0.7.0" - sources."aws4-1.10.1" + sources."aws4-1.11.0" sources."axios-0.19.2" sources."backo2-1.0.2" sources."balanced-match-1.0.0" @@ -91881,7 +93281,7 @@ in }) sources."brace-expansion-1.1.11" sources."braces-3.0.2" - sources."buffer-5.6.0" + sources."buffer-5.7.0" sources."buffer-alloc-1.2.0" sources."buffer-alloc-unsafe-1.1.0" sources."buffer-crc32-0.2.13" @@ -91963,7 +93363,7 @@ in ]; }) sources."dashdash-1.14.1" - sources."dayjs-1.9.3" + sources."dayjs-1.9.4" sources."debug-3.1.0" sources."decode-uri-component-0.2.0" sources."decompress-4.2.1" @@ -92061,7 +93461,7 @@ in sources."fast-json-stable-stringify-2.1.0" sources."fast-safe-stringify-2.0.7" sources."fastest-levenshtein-1.0.12" - sources."fastq-1.8.0" + sources."fastq-1.9.0" sources."fd-slicer-1.1.0" sources."fecha-4.2.0" sources."figures-3.2.0" @@ -92071,10 +93471,11 @@ in sources."filenamify-3.0.0" sources."filesize-6.1.0" sources."fill-range-7.0.1" - (sources."find-process-1.4.3" // { + (sources."find-process-1.4.4" // { dependencies = [ - sources."chalk-2.4.2" - sources."debug-2.6.9" + sources."commander-5.1.0" + sources."debug-4.3.0" + sources."ms-2.1.2" ]; }) sources."find-requires-1.0.0" @@ -92093,10 +93494,15 @@ in sources."fs-constants-1.0.0" (sources."fs-extra-9.0.1" // { dependencies = [ - sources."jsonfile-6.0.1" + (sources."jsonfile-6.1.0" // { + dependencies = [ + sources."universalify-2.0.0" + ]; + }) sources."universalify-1.0.0" ]; }) + sources."fs-minipass-2.1.0" sources."fs.realpath-1.0.0" sources."fs2-0.3.8" sources."fsevents-2.1.3" @@ -92113,7 +93519,22 @@ in sources."glob-7.1.6" sources."glob-parent-5.1.1" sources."globby-11.0.1" - sources."got-9.6.0" + (sources."got-11.8.0" // { + dependencies = [ + sources."@sindresorhus/is-4.0.0" + sources."@szmarczak/http-timer-4.0.5" + sources."cacheable-request-7.0.1" + sources."decompress-response-6.0.0" + sources."defer-to-connect-2.0.0" + sources."get-stream-5.2.0" + sources."json-buffer-3.0.1" + sources."keyv-4.0.3" + sources."lowercase-keys-2.0.0" + sources."mimic-response-3.1.0" + sources."p-cancelable-2.0.0" + sources."responselike-2.0.0" + ]; + }) sources."graceful-fs-4.2.4" sources."graphlib-2.1.8" sources."har-schema-2.0.0" @@ -92133,13 +93554,13 @@ in sources."http2-wrapper-1.0.0-beta.5.2" (sources."https-proxy-agent-5.0.0" // { dependencies = [ - sources."agent-base-6.0.1" + sources."agent-base-6.0.2" sources."debug-4.3.0" sources."ms-2.1.2" ]; }) sources."iconv-lite-0.4.24" - sources."ieee754-1.1.13" + sources."ieee754-1.2.1" sources."ignore-5.1.8" sources."immediate-3.0.6" sources."imurmurhash-0.1.4" @@ -92155,7 +93576,7 @@ in sources."strip-ansi-6.0.0" ]; }) - sources."inquirer-autocomplete-prompt-1.2.0" + sources."inquirer-autocomplete-prompt-1.3.0" sources."into-stream-3.1.0" sources."is-arrayish-0.3.2" sources."is-binary-path-2.1.0" @@ -92251,6 +93672,8 @@ in sources."mimic-response-1.0.1" sources."minimatch-3.0.4" sources."minimist-1.2.5" + sources."minipass-3.1.3" + sources."minizlib-2.1.2" sources."mkdirp-0.5.5" sources."moment-2.29.1" sources."ms-2.0.0" @@ -92299,6 +93722,7 @@ in sources."p-try-2.2.0" (sources."package-json-6.5.0" // { dependencies = [ + sources."got-9.6.0" sources."semver-6.3.0" ]; }) @@ -92326,13 +93750,14 @@ in sources."promise-queue-2.2.5" (sources."protobufjs-6.10.1" // { dependencies = [ - sources."@types/node-13.13.26" + sources."@types/node-13.13.30" sources."long-4.0.0" ]; }) sources."psl-1.8.0" sources."pump-3.0.0" sources."punycode-2.1.1" + sources."qrcode-terminal-0.12.0" sources."qs-6.5.2" sources."query-string-5.1.1" sources."querystring-0.2.0" @@ -92360,7 +93785,7 @@ in sources."retry-0.10.1" sources."reusify-1.0.4" sources."run-async-2.4.1" - sources."run-parallel-1.1.9" + sources."run-parallel-1.1.10" sources."rxjs-6.6.3" sources."safe-buffer-5.2.1" sources."safer-buffer-2.1.2" @@ -92371,7 +93796,7 @@ in sources."set-immediate-shim-1.0.1" sources."shebang-command-1.2.0" sources."shebang-regex-1.0.0" - sources."shortid-2.2.15" + sources."shortid-2.2.16" sources."signal-exit-3.0.3" sources."simple-concat-1.0.1" sources."simple-get-2.8.1" @@ -92443,6 +93868,12 @@ in sources."untildify-3.0.3" ]; }) + (sources."tar-6.0.5" // { + dependencies = [ + sources."chownr-2.0.0" + sources."mkdirp-1.0.4" + ]; + }) (sources."tar-fs-1.16.3" // { dependencies = [ sources."pump-1.0.3" @@ -92456,7 +93887,7 @@ in sources."string_decoder-1.1.1" ]; }) - sources."term-size-2.2.0" + sources."term-size-2.2.1" sources."text-hex-1.0.0" sources."through-2.3.8" sources."timed-out-4.0.1" @@ -92517,6 +93948,7 @@ in sources."xmlbuilder-9.0.7" sources."xmlhttprequest-ssl-1.5.5" sources."xtend-4.0.2" + sources."yallist-4.0.0" sources."yaml-ast-parser-0.0.43" sources."yamljs-0.3.0" sources."yargs-parser-20.2.3" @@ -92554,7 +93986,7 @@ in sources."assert-plus-1.0.0" sources."asynckit-0.4.0" sources."aws-sign2-0.7.0" - sources."aws4-1.10.1" + sources."aws4-1.11.0" sources."base64-arraybuffer-0.1.2" sources."base64id-0.1.0" sources."bcrypt-nodejs-0.0.3" @@ -93161,10 +94593,10 @@ in snyk = nodeEnv.buildNodePackage { name = "snyk"; packageName = "snyk"; - version = "1.415.0"; + version = "1.424.1"; src = fetchurl { - url = "https://registry.npmjs.org/snyk/-/snyk-1.415.0.tgz"; - sha512 = "zpqUIizBSYTaZA1DvPf2xIOQSmutVDNxOkSM4CQkqk9xHf2W6ltq8NcxErVXUGYmsUmGfrNe0LIBaKP9lzyMbQ=="; + url = "https://registry.npmjs.org/snyk/-/snyk-1.424.1.tgz"; + sha512 = "jPfGpI/cCPc1xn335GP7fVVHkqw/ss3W8ie9p+KM748QgZkc5JMuUJKc9lB1y+5+H7wpCnt4wuO1jKkFBpwSUQ=="; }; dependencies = [ sources."@sindresorhus/is-2.1.1" @@ -93175,7 +94607,7 @@ in sources."@snyk/docker-registry-v2-client-1.13.6" sources."@snyk/gemfile-1.2.0" sources."@snyk/java-call-graph-builder-1.16.0" - sources."@snyk/rpm-parser-2.2.0" + sources."@snyk/rpm-parser-2.2.1" (sources."@snyk/snyk-cocoapods-plugin-2.5.1" // { dependencies = [ sources."tslib-2.0.3" @@ -93194,7 +94626,7 @@ in sources."@types/http-cache-semantics-4.0.0" sources."@types/js-yaml-3.12.5" sources."@types/keyv-3.1.1" - sources."@types/node-14.11.10" + sources."@types/node-14.14.6" sources."@types/responselike-1.0.0" sources."@types/semver-5.5.0" sources."@yarnpkg/lockfile-1.1.0" @@ -93244,8 +94676,9 @@ in ]; }) sources."brace-expansion-1.1.11" + sources."braces-3.0.2" sources."browserify-zlib-0.1.4" - sources."buffer-5.6.0" + sources."buffer-5.7.0" sources."buffer-from-1.1.1" sources."bytes-3.1.0" sources."cacheable-lookup-5.0.3" @@ -93334,6 +94767,7 @@ in sources."fast-levenshtein-2.0.6" sources."figures-3.2.0" sources."file-uri-to-path-1.0.0" + sources."fill-range-7.0.1" sources."fs-constants-1.0.0" sources."fs.realpath-1.0.0" (sources."ftp-0.3.10" // { @@ -93377,7 +94811,7 @@ in ]; }) sources."iconv-lite-0.4.24" - sources."ieee754-1.1.13" + sources."ieee754-1.2.1" sources."immediate-3.0.6" sources."import-lazy-2.1.0" sources."imurmurhash-0.1.4" @@ -93405,6 +94839,7 @@ in sources."is-gzip-1.0.0" sources."is-installed-globally-0.3.2" sources."is-npm-4.0.0" + sources."is-number-7.0.0" sources."is-obj-2.0.0" sources."is-path-inside-3.0.2" sources."is-stream-1.1.0" @@ -93445,6 +94880,7 @@ in sources."lru-cache-5.1.1" sources."macos-release-2.4.1" sources."make-dir-3.1.0" + sources."micromatch-4.0.2" sources."mimic-fn-2.1.0" sources."mimic-response-1.0.1" sources."minimatch-3.0.4" @@ -93501,6 +94937,7 @@ in sources."path-is-absolute-1.0.1" sources."path-key-2.0.1" sources."peek-stream-1.1.3" + sources."picomatch-2.2.2" sources."prelude-ls-1.1.2" sources."prepend-http-2.0.0" sources."process-nextick-args-2.0.1" @@ -93515,7 +94952,7 @@ in sources."pump-2.0.1" ]; }) - sources."pupa-2.0.1" + sources."pupa-2.1.1" sources."quick-lru-5.1.1" sources."raw-body-2.4.1" sources."rc-1.2.8" @@ -93557,7 +94994,7 @@ in sources."tslib-2.0.3" ]; }) - (sources."snyk-docker-plugin-4.1.1" // { + (sources."snyk-docker-plugin-4.7.0" // { dependencies = [ sources."rimraf-3.0.2" sources."snyk-nodejs-lockfile-parser-1.30.0" @@ -93572,7 +95009,7 @@ in sources."tmp-0.2.1" ]; }) - (sources."snyk-gradle-plugin-3.10.0" // { + (sources."snyk-gradle-plugin-3.10.1" // { dependencies = [ (sources."@snyk/cli-interface-2.9.1" // { dependencies = [ @@ -93612,6 +95049,16 @@ in sources."tslib-1.11.1" ]; }) + (sources."snyk-poetry-lockfile-parser-1.1.0" // { + dependencies = [ + (sources."@snyk/dep-graph-1.20.0" // { + dependencies = [ + sources."tslib-1.14.1" + ]; + }) + sources."tslib-2.0.3" + ]; + }) (sources."snyk-policy-1.14.1" // { dependencies = [ sources."@types/node-6.14.13" @@ -93623,7 +95070,7 @@ in }) ]; }) - sources."snyk-python-plugin-1.17.1" + sources."snyk-python-plugin-1.18.0" (sources."snyk-resolve-1.0.1" // { dependencies = [ sources."debug-3.2.6" @@ -93695,13 +95142,14 @@ in sources."temp-dir-1.0.0" ]; }) - sources."term-size-2.2.0" + sources."term-size-2.2.1" sources."then-fs-2.0.0" sources."through-2.3.8" sources."through2-2.0.5" sources."thunkify-2.1.2" sources."tmp-0.0.33" sources."to-readable-stream-1.0.0" + sources."to-regex-range-5.0.1" sources."toidentifier-1.0.0" sources."toml-3.0.0" sources."tree-kill-1.2.2" @@ -93894,10 +95342,12 @@ in sources."escape-string-regexp-1.0.5" sources."execa-0.7.0" sources."find-up-2.1.0" + sources."function-bind-1.1.1" sources."get-stream-3.0.0" sources."global-dirs-0.1.1" sources."got-6.7.1" sources."graceful-fs-4.2.4" + sources."has-1.0.3" sources."has-flag-3.0.0" sources."hosted-git-info-2.8.8" sources."http-proxy-agent-2.1.0" @@ -93908,6 +95358,7 @@ in sources."ini-1.3.5" sources."is-arrayish-0.2.1" sources."is-ci-1.2.1" + sources."is-core-module-2.0.0" sources."is-fullwidth-code-point-2.0.0" sources."is-installed-globally-0.1.0" sources."is-npm-1.0.0" @@ -93964,7 +95415,7 @@ in sources."redent-2.0.0" sources."registry-auth-token-3.4.0" sources."registry-url-3.1.0" - sources."resolve-1.17.0" + sources."resolve-1.18.1" sources."restore-cursor-2.0.0" sources."round-to-3.0.0" sources."safe-buffer-5.2.1" @@ -94069,15 +95520,16 @@ in sources."brace-expansion-1.1.11" sources."braces-1.8.5" sources."broadcast-stream-0.2.2" - sources."buffer-5.6.0" + sources."buffer-5.7.0" sources."buffer-from-1.1.1" (sources."cache-base-1.0.1" // { dependencies = [ sources."isobject-3.0.1" ]; }) + sources."call-bind-1.0.0" sources."camelcase-2.1.1" - sources."ccount-1.0.5" + sources."ccount-1.1.0" sources."chalk-1.1.3" sources."character-entities-1.2.4" sources."character-entities-html4-1.1.4" @@ -94233,6 +95685,7 @@ in sources."fs.realpath-1.0.0" sources."fsevents-1.2.13" sources."function-bind-1.1.1" + sources."get-intrinsic-1.0.1" sources."get-value-2.0.6" sources."glob-6.0.4" sources."glob-base-0.3.0" @@ -94264,7 +95717,7 @@ in sources."heap-0.2.6" sources."hoox-0.0.1" sources."idb-kv-store-4.5.0" - sources."ieee754-1.1.13" + sources."ieee754-1.2.1" sources."immediate-3.2.3" sources."increment-buffer-1.0.1" sources."inflight-1.0.6" @@ -94328,7 +95781,7 @@ in ]; }) sources."is-typedarray-1.0.0" - sources."is-valid-domain-0.0.16" + sources."is-valid-domain-0.0.17" sources."is-weakmap-2.0.1" sources."is-weakset-2.0.1" sources."is-windows-1.0.2" @@ -94443,7 +95896,7 @@ in sources."isobject-3.0.1" ]; }) - sources."object.assign-4.1.1" + sources."object.assign-4.1.2" sources."object.omit-2.0.1" (sources."object.pick-1.3.0" // { dependencies = [ @@ -94675,7 +96128,7 @@ in ]; }) sources."snapdragon-util-3.0.1" - sources."socks-2.4.4" + sources."socks-2.5.0" sources."sodium-browserify-1.3.0" (sources."sodium-browserify-tweetnacl-0.2.6" // { dependencies = [ @@ -94763,16 +96216,8 @@ in }) sources."string-width-1.0.2" sources."string.prototype.trim-1.2.2" - (sources."string.prototype.trimend-1.0.1" // { - dependencies = [ - sources."es-abstract-1.17.7" - ]; - }) - (sources."string.prototype.trimstart-1.0.1" // { - dependencies = [ - sources."es-abstract-1.17.7" - ]; - }) + sources."string.prototype.trimend-1.0.2" + sources."string.prototype.trimstart-1.0.2" sources."string_decoder-1.1.1" sources."stringify-entities-1.3.2" sources."strip-ansi-3.0.1" @@ -94800,7 +96245,7 @@ in sources."to-vfile-1.0.0" sources."trim-0.0.1" sources."trim-lines-1.1.3" - sources."trim-trailing-lines-1.1.3" + sources."trim-trailing-lines-1.1.4" sources."tweetnacl-0.14.5" sources."tweetnacl-auth-0.3.1" sources."typedarray-0.0.6" @@ -94947,13 +96392,13 @@ in sources."async-1.5.2" sources."async-limiter-1.0.1" sources."asynckit-0.4.0" - (sources."aws-sdk-2.773.0" // { + (sources."aws-sdk-2.784.0" // { dependencies = [ sources."uuid-3.3.2" ]; }) sources."aws-sign2-0.6.0" - sources."aws4-1.10.1" + sources."aws4-1.11.0" sources."babel-runtime-6.26.0" sources."babel-types-6.26.0" sources."babylon-6.18.0" @@ -95142,6 +96587,7 @@ in sources."forwarded-0.1.2" sources."fresh-0.5.2" sources."fs.realpath-1.0.0" + sources."function-bind-1.1.1" sources."generate-function-2.3.1" sources."generate-object-property-1.2.0" sources."get-caller-file-1.0.3" @@ -95161,6 +96607,7 @@ in sources."graphlib-2.1.8" sources."har-schema-2.0.0" sources."har-validator-2.0.6" + sources."has-1.0.3" sources."has-ansi-2.0.0" (sources."has-binary2-1.0.3" // { dependencies = [ @@ -95200,6 +96647,7 @@ in sources."ipaddr.js-1.9.1" sources."is-arrayish-0.2.1" sources."is-buffer-1.1.6" + sources."is-core-module-2.0.0" (sources."is-expression-3.0.0" // { dependencies = [ sources."acorn-4.0.13" @@ -95440,7 +96888,7 @@ in sources."require-directory-2.1.1" sources."require-main-filename-1.0.1" sources."requires-port-1.0.0" - sources."resolve-1.17.0" + sources."resolve-1.18.1" sources."ret-0.2.2" sources."rethinkdb-2.4.2" sources."retry-0.9.0" @@ -95731,6 +97179,7 @@ in sources."ansi-styles-3.2.1" sources."argparse-1.0.10" sources."boolbase-1.0.0" + sources."call-bind-1.0.0" sources."chalk-2.4.2" sources."coa-2.0.2" sources."color-convert-1.9.3" @@ -95739,10 +97188,10 @@ in sources."css-select-base-adapter-0.1.1" sources."css-tree-1.0.0-alpha.37" sources."css-what-3.4.2" - (sources."csso-4.0.3" // { + (sources."csso-4.1.0" // { dependencies = [ - sources."css-tree-1.0.0-alpha.39" - sources."mdn-data-2.0.6" + sources."css-tree-1.0.0" + sources."mdn-data-2.0.12" ]; }) sources."define-properties-1.1.3" @@ -95759,6 +97208,7 @@ in sources."escape-string-regexp-1.0.5" sources."esprima-4.0.1" sources."function-bind-1.1.1" + sources."get-intrinsic-1.0.1" sources."has-1.0.3" sources."has-flag-3.0.0" sources."has-symbols-1.0.1" @@ -95774,11 +97224,7 @@ in sources."nth-check-1.0.2" sources."object-inspect-1.8.0" sources."object-keys-1.1.1" - (sources."object.assign-4.1.1" // { - dependencies = [ - sources."es-abstract-1.18.0-next.1" - ]; - }) + sources."object.assign-4.1.2" sources."object.getownpropertydescriptors-2.1.0" sources."object.values-1.1.1" sources."q-1.5.1" @@ -95786,8 +97232,16 @@ in sources."source-map-0.6.1" sources."sprintf-js-1.0.3" sources."stable-0.1.8" - sources."string.prototype.trimend-1.0.1" - sources."string.prototype.trimstart-1.0.1" + (sources."string.prototype.trimend-1.0.2" // { + dependencies = [ + sources."es-abstract-1.18.0-next.1" + ]; + }) + (sources."string.prototype.trimstart-1.0.2" // { + dependencies = [ + sources."es-abstract-1.18.0-next.1" + ]; + }) sources."supports-color-5.5.0" sources."unquote-1.1.1" sources."util.promisify-1.0.1" @@ -96374,7 +97828,7 @@ in sources."truncate-utf8-bytes-1.0.2" sources."type-is-1.6.18" sources."typedarray-0.0.6" - sources."uglify-js-3.11.3" + sources."uglify-js-3.11.5" sources."undefsafe-2.0.3" (sources."union-value-1.0.1" // { dependencies = [ @@ -96450,7 +97904,7 @@ in sources."async-limiter-1.0.1" sources."asynckit-0.4.0" sources."aws-sign2-0.7.0" - sources."aws4-1.10.1" + sources."aws4-1.11.0" (sources."bcrypt-pbkdf-1.0.2" // { dependencies = [ sources."tweetnacl-0.14.5" @@ -96638,6 +98092,7 @@ in sources."boundary-1.0.1" sources."brace-expansion-1.1.11" sources."buffer-from-1.1.1" + sources."call-bind-1.0.0" (sources."chalk-1.1.3" // { dependencies = [ sources."strip-ansi-3.0.1" @@ -96674,6 +98129,7 @@ in sources."format-0.2.2" sources."fs.realpath-1.0.0" sources."function-bind-1.1.1" + sources."get-intrinsic-1.0.1" sources."get-stdin-5.0.1" sources."glob-7.1.6" sources."graceful-fs-4.2.4" @@ -96689,6 +98145,7 @@ in sources."is-arrayish-0.2.1" sources."is-buffer-1.1.6" sources."is-callable-1.2.2" + sources."is-core-module-2.0.0" sources."is-date-object-1.0.2" sources."is-decimal-1.0.4" sources."is-file-1.0.0" @@ -96724,7 +98181,7 @@ in sources."object-inspect-1.8.0" sources."object-is-1.1.3" sources."object-keys-1.1.1" - sources."object.assign-4.1.1" + sources."object.assign-4.1.2" sources."once-1.4.0" sources."optionator-0.8.3" sources."p-limit-1.3.0" @@ -96766,7 +98223,7 @@ in sources."repeat-string-1.6.1" sources."replace-ext-1.0.0" sources."require-from-string-2.0.2" - sources."resolve-1.17.0" + sources."resolve-1.18.1" sources."rimraf-2.6.3" sources."safe-buffer-5.1.2" sources."semver-5.7.1" @@ -96782,16 +98239,8 @@ in sources."strip-ansi-3.0.1" ]; }) - (sources."string.prototype.trimend-1.0.1" // { - dependencies = [ - sources."es-abstract-1.17.7" - ]; - }) - (sources."string.prototype.trimstart-1.0.1" // { - dependencies = [ - sources."es-abstract-1.17.7" - ]; - }) + sources."string.prototype.trimend-1.0.2" + sources."string.prototype.trimstart-1.0.2" sources."string_decoder-1.1.1" (sources."strip-ansi-6.0.0" // { dependencies = [ @@ -96812,7 +98261,7 @@ in sources."text-table-0.2.0" sources."traverse-0.6.6" sources."trim-0.0.1" - sources."trim-trailing-lines-1.1.3" + sources."trim-trailing-lines-1.1.4" sources."trough-1.0.5" sources."try-resolve-1.0.1" sources."type-check-0.3.2" @@ -96878,10 +98327,12 @@ in sha1 = "8d49dd02b3a7a88d7e6b32817f9e202c5c6596b9"; }; dependencies = [ + sources."call-bind-1.0.0" sources."define-properties-1.1.3" sources."es-abstract-1.17.7" sources."es-to-primitive-1.2.1" sources."function-bind-1.1.1" + sources."get-intrinsic-1.0.1" sources."has-1.0.3" sources."has-symbols-1.0.1" sources."is-callable-1.2.2" @@ -96892,14 +98343,18 @@ in sources."match-index-1.0.3" sources."object-inspect-1.8.0" sources."object-keys-1.1.1" - (sources."object.assign-4.1.1" // { + sources."object.assign-4.1.2" + sources."regexp.prototype.flags-1.3.0" + (sources."string.prototype.trimend-1.0.2" // { + dependencies = [ + sources."es-abstract-1.18.0-next.1" + ]; + }) + (sources."string.prototype.trimstart-1.0.2" // { dependencies = [ sources."es-abstract-1.18.0-next.1" ]; }) - sources."regexp.prototype.flags-1.3.0" - sources."string.prototype.trimend-1.0.1" - sources."string.prototype.trimstart-1.0.1" ]; buildInputs = globalBuildInputs; meta = { @@ -96927,6 +98382,7 @@ in sources."@szmarczak/http-timer-1.1.2" sources."@textlint/ast-node-types-4.3.4" sources."@textlint/types-1.4.5" + sources."@types/hast-2.3.1" sources."@types/minimist-1.2.0" sources."@types/normalize-package-data-2.4.0" sources."@types/parse5-5.0.3" @@ -96968,7 +98424,7 @@ in }) sources."camelcase-5.3.1" sources."camelcase-keys-6.2.2" - sources."ccount-1.0.5" + sources."ccount-1.1.0" sources."chalk-2.4.2" sources."character-entities-1.2.4" sources."character-entities-html4-1.1.4" @@ -97020,6 +98476,7 @@ in sources."format-0.2.2" sources."from-0.1.7" sources."fs.realpath-1.0.0" + sources."function-bind-1.1.1" (sources."get-stream-4.1.0" // { dependencies = [ sources."pump-3.0.0" @@ -97032,19 +98489,20 @@ in sources."got-9.6.0" sources."graceful-fs-4.2.4" sources."hard-rejection-2.1.0" + sources."has-1.0.3" sources."has-flag-3.0.0" sources."has-yarn-2.1.0" sources."hast-util-embedded-1.0.5" - sources."hast-util-from-parse5-6.0.0" + sources."hast-util-from-parse5-6.0.1" sources."hast-util-has-property-1.0.4" sources."hast-util-is-body-ok-link-1.0.4" sources."hast-util-is-element-1.1.0" - sources."hast-util-parse-selector-2.2.4" + sources."hast-util-parse-selector-2.2.5" sources."hast-util-phrasing-1.0.5" - sources."hast-util-to-nlcst-1.2.7" + sources."hast-util-to-nlcst-1.2.8" sources."hast-util-to-string-1.0.4" sources."hast-util-whitespace-1.0.4" - sources."hastscript-5.1.2" + sources."hastscript-6.0.0" sources."hosted-git-info-2.8.8" sources."http-cache-semantics-4.1.0" sources."ignore-5.1.8" @@ -97058,8 +98516,9 @@ in sources."is-alphanumeric-1.0.0" sources."is-alphanumerical-1.0.4" sources."is-arrayish-0.2.1" - sources."is-buffer-2.0.4" + sources."is-buffer-2.0.5" sources."is-ci-2.0.0" + sources."is-core-module-2.0.0" sources."is-decimal-1.0.4" sources."is-empty-1.2.0" sources."is-fullwidth-code-point-2.0.0" @@ -97108,11 +98567,7 @@ in sources."markdown-table-2.0.0" sources."mdast-comment-marker-1.1.2" sources."mdast-util-compact-2.0.1" - (sources."mdast-util-to-nlcst-4.0.0" // { - dependencies = [ - sources."vfile-location-3.1.0" - ]; - }) + sources."mdast-util-to-nlcst-4.0.1" sources."meow-7.1.1" sources."mimic-response-1.0.1" sources."min-indent-1.0.1" @@ -97120,8 +98575,8 @@ in sources."minimist-1.2.5" sources."minimist-options-4.1.0" sources."ms-2.1.2" - sources."nlcst-is-literal-1.2.1" - sources."nlcst-normalize-2.1.4" + sources."nlcst-is-literal-1.2.2" + sources."nlcst-normalize-2.1.5" sources."nlcst-search-2.0.0" sources."nlcst-to-string-2.0.4" sources."normalize-package-data-2.5.0" @@ -97152,7 +98607,7 @@ in sources."property-information-5.6.0" sources."pump-1.0.3" sources."pump-chain-1.0.0" - sources."pupa-2.0.1" + sources."pupa-2.1.1" sources."quick-lru-4.0.1" sources."quotation-1.1.3" sources."rc-1.2.8" @@ -97175,16 +98630,12 @@ in sources."remark-frontmatter-2.0.0" sources."remark-mdx-2.0.0-next.8" sources."remark-message-control-6.0.0" - (sources."remark-parse-8.0.3" // { - dependencies = [ - sources."vfile-location-3.1.0" - ]; - }) + sources."remark-parse-8.0.3" sources."remark-retext-4.0.0" sources."remark-stringify-8.1.1" sources."repeat-string-1.6.1" sources."replace-ext-1.0.0" - sources."resolve-1.17.0" + sources."resolve-1.18.1" sources."resolve-from-5.0.0" sources."responselike-1.0.2" sources."retext-english-3.0.4" @@ -97238,7 +98689,7 @@ in sources."strip-json-comments-2.0.1" sources."structured-source-3.0.2" sources."supports-color-5.5.0" - sources."term-size-2.2.0" + sources."term-size-2.2.1" (sources."textlint-rule-helper-2.1.1" // { dependencies = [ sources."unist-util-is-3.0.0" @@ -97257,7 +98708,7 @@ in sources."to-vfile-6.1.0" sources."trim-0.0.1" sources."trim-newlines-3.0.0" - sources."trim-trailing-lines-1.1.3" + sources."trim-trailing-lines-1.1.4" sources."trough-1.0.5" sources."type-fest-0.13.1" sources."typedarray-0.0.6" @@ -97274,14 +98725,10 @@ in sources."is-plain-obj-2.1.0" ]; }) - (sources."unified-message-control-3.0.1" // { - dependencies = [ - sources."vfile-location-3.1.0" - ]; - }) + sources."unified-message-control-3.0.1" sources."unique-string-2.0.0" sources."unist-util-inspect-5.0.1" - sources."unist-util-is-4.0.2" + sources."unist-util-is-4.0.3" sources."unist-util-modify-children-2.0.0" sources."unist-util-position-3.1.0" sources."unist-util-remove-position-2.0.1" @@ -97304,7 +98751,7 @@ in sources."validate-npm-package-license-3.0.4" sources."vfile-4.2.0" sources."vfile-find-up-5.0.1" - sources."vfile-location-2.0.6" + sources."vfile-location-3.2.0" sources."vfile-message-2.0.4" (sources."vfile-reporter-6.0.1" // { dependencies = [ @@ -97465,11 +98912,13 @@ in sources."@textlint/types-1.4.5" sources."boundary-1.0.1" sources."buffer-from-1.1.1" + sources."call-bind-1.0.0" sources."concat-stream-2.0.0" sources."define-properties-1.1.3" sources."es-abstract-1.17.7" sources."es-to-primitive-1.2.1" sources."function-bind-1.1.1" + sources."get-intrinsic-1.0.1" sources."has-1.0.3" sources."has-symbols-1.0.1" sources."inherits-2.0.4" @@ -97481,17 +98930,21 @@ in sources."object-assign-4.1.1" sources."object-inspect-1.8.0" sources."object-keys-1.1.1" - (sources."object.assign-4.1.1" // { - dependencies = [ - sources."es-abstract-1.18.0-next.1" - ]; - }) + sources."object.assign-4.1.2" sources."object.values-1.1.1" sources."readable-stream-3.6.0" sources."safe-buffer-5.2.1" sources."sentence-splitter-3.2.0" - sources."string.prototype.trimend-1.0.1" - sources."string.prototype.trimstart-1.0.1" + (sources."string.prototype.trimend-1.0.2" // { + dependencies = [ + sources."es-abstract-1.18.0-next.1" + ]; + }) + (sources."string.prototype.trimstart-1.0.2" // { + dependencies = [ + sources."es-abstract-1.18.0-next.1" + ]; + }) sources."string_decoder-1.3.0" sources."structured-source-3.0.2" sources."textlint-rule-helper-2.1.1" @@ -97521,6 +98974,7 @@ in }; dependencies = [ sources."array.prototype.find-2.1.1" + sources."call-bind-1.0.0" sources."check-ends-with-period-1.0.1" sources."define-properties-1.1.3" sources."emoji-regex-6.5.1" @@ -97528,6 +98982,7 @@ in sources."es-abstract-1.17.7" sources."es-to-primitive-1.2.1" sources."function-bind-1.1.1" + sources."get-intrinsic-1.0.1" sources."has-1.0.3" sources."has-symbols-1.0.1" sources."is-callable-1.2.2" @@ -97537,13 +98992,17 @@ in sources."is-symbol-1.0.3" sources."object-inspect-1.8.0" sources."object-keys-1.1.1" - (sources."object.assign-4.1.1" // { + sources."object.assign-4.1.2" + (sources."string.prototype.trimend-1.0.2" // { + dependencies = [ + sources."es-abstract-1.18.0-next.1" + ]; + }) + (sources."string.prototype.trimstart-1.0.2" // { dependencies = [ sources."es-abstract-1.18.0-next.1" ]; }) - sources."string.prototype.trimend-1.0.1" - sources."string.prototype.trimstart-1.0.1" ]; buildInputs = globalBuildInputs; meta = { @@ -97625,10 +99084,12 @@ in }; dependencies = [ sources."array-includes-3.1.1" + sources."call-bind-1.0.0" sources."define-properties-1.1.3" sources."es-abstract-1.17.7" sources."es-to-primitive-1.2.1" sources."function-bind-1.1.1" + sources."get-intrinsic-1.0.1" sources."has-1.0.3" sources."has-symbols-1.0.1" sources."is-callable-1.2.2" @@ -97640,13 +99101,17 @@ in sources."is-symbol-1.0.3" sources."object-inspect-1.8.0" sources."object-keys-1.1.1" - (sources."object.assign-4.1.1" // { + sources."object.assign-4.1.2" + (sources."string.prototype.trimend-1.0.2" // { + dependencies = [ + sources."es-abstract-1.18.0-next.1" + ]; + }) + (sources."string.prototype.trimstart-1.0.2" // { dependencies = [ sources."es-abstract-1.18.0-next.1" ]; }) - sources."string.prototype.trimend-1.0.1" - sources."string.prototype.trimstart-1.0.1" ]; buildInputs = globalBuildInputs; meta = { @@ -97671,33 +99136,17 @@ in sources."@textlint/types-1.4.5" sources."adverb-where-0.0.9" sources."boundary-1.0.1" + sources."call-bind-1.0.0" sources."define-properties-1.1.3" sources."e-prime-0.10.4" - sources."es-abstract-1.18.0-next.1" - sources."es-to-primitive-1.2.1" sources."function-bind-1.1.1" + sources."get-intrinsic-1.0.1" sources."has-1.0.3" sources."has-symbols-1.0.1" - sources."is-callable-1.2.2" - sources."is-date-object-1.0.2" - sources."is-negative-zero-2.0.0" - sources."is-regex-1.1.1" - sources."is-symbol-1.0.3" sources."no-cliches-0.1.1" - sources."object-inspect-1.8.0" sources."object-keys-1.1.1" - sources."object.assign-4.1.1" + sources."object.assign-4.1.2" sources."passive-voice-0.1.0" - (sources."string.prototype.trimend-1.0.1" // { - dependencies = [ - sources."es-abstract-1.17.7" - ]; - }) - (sources."string.prototype.trimstart-1.0.1" // { - dependencies = [ - sources."es-abstract-1.17.7" - ]; - }) sources."structured-source-3.0.2" sources."textlint-rule-helper-2.1.1" sources."too-wordy-0.1.6" @@ -97733,13 +99182,13 @@ in sources."@types/debug-4.1.5" sources."@types/http-cache-semantics-4.0.0" sources."@types/keyv-3.1.1" - sources."@types/node-14.11.10" + sources."@types/node-14.14.6" sources."@types/responselike-1.0.0" sources."abbrev-1.1.1" sources."abstract-logging-2.0.1" sources."accepts-1.3.7" sources."after-0.8.2" - (sources."agent-base-6.0.1" // { + (sources."agent-base-6.0.2" // { dependencies = [ sources."debug-4.3.0" sources."ms-2.1.2" @@ -97765,7 +99214,7 @@ in sources."async-limiter-1.0.1" sources."asynckit-0.4.0" sources."aws-sign2-0.7.0" - sources."aws4-1.10.1" + sources."aws4-1.11.0" sources."backo2-1.0.2" sources."backoff-2.5.0" sources."balanced-match-1.0.0" @@ -97911,7 +99360,7 @@ in ]; }) sources."iconv-lite-0.4.24" - sources."ieee754-1.1.13" + sources."ieee754-1.2.1" sources."ignore-walk-3.0.3" sources."indexof-0.0.1" sources."inflight-1.0.6" @@ -98167,10 +99616,10 @@ in three = nodeEnv.buildNodePackage { name = "three"; packageName = "three"; - version = "0.121.1"; + version = "0.122.0"; src = fetchurl { - url = "https://registry.npmjs.org/three/-/three-0.121.1.tgz"; - sha512 = "+rYhNpW5W1aBdLkPQDld/GA4Sj/uOKJJKVpCAZUbpk/HZEiYRUlPt8+s+9nmxRglWmRHdBa3ERvUwqg4nmoA5w=="; + url = "https://registry.npmjs.org/three/-/three-0.122.0.tgz"; + sha512 = "bgYMo0WdaQhf7DhLE8OSNN/rVFO5J4K1A2VeeKqoV4MjjuHjfCP6xLpg8Xedhns7NlEnN3sZ6VJROq19Qyl6Sg=="; }; buildInputs = globalBuildInputs; meta = { @@ -98203,13 +99652,12 @@ in titanium = nodeEnv.buildNodePackage { name = "titanium"; packageName = "titanium"; - version = "5.2.5"; + version = "5.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/titanium/-/titanium-5.2.5.tgz"; - sha512 = "P2+0coxeYre+1Lf/k2t61W1UwcNhupQy5s5UcpDkbGiRg7EDoYVnkix1H08yg+mfKh14Jm9+6QDDKpEWM+arZQ=="; + url = "https://registry.npmjs.org/titanium/-/titanium-5.3.0.tgz"; + sha512 = "j+Bk1jWH4Ki/7hfizhG6MvaZMEeHNdaJnzjC50CUJThfDkxr8nN1rn7smaX9Wg5W1iiBeBQyJreTExZloTRCJw=="; }; dependencies = [ - sources."adm-zip-0.4.13" sources."ajv-6.12.6" sources."asn1-0.2.4" sources."assert-plus-1.0.0" @@ -98217,13 +99665,13 @@ in sources."asynckit-0.4.0" sources."at-least-node-1.0.0" sources."aws-sign2-0.7.0" - sources."aws4-1.10.1" + sources."aws4-1.11.0" sources."balanced-match-1.0.0" sources."bcrypt-pbkdf-1.0.2" sources."brace-expansion-1.1.11" sources."buffer-crc32-0.2.13" sources."caseless-0.12.0" - sources."colors-1.3.3" + sources."colors-1.4.0" sources."combined-stream-1.0.8" sources."concat-map-0.0.1" sources."core-util-is-1.0.2" @@ -98261,18 +99709,20 @@ in sources."json-schema-0.2.3" sources."json-schema-traverse-0.4.1" sources."json-stringify-safe-5.0.1" - sources."jsonfile-6.0.1" + (sources."jsonfile-6.1.0" // { + dependencies = [ + sources."universalify-2.0.0" + ]; + }) sources."jsprim-1.4.1" sources."keypress-0.2.1" sources."lodash-4.17.20" sources."mime-db-1.44.0" sources."mime-types-2.1.27" sources."minimatch-3.0.4" - sources."moment-2.29.1" (sources."node-appc-1.1.2" // { dependencies = [ sources."async-3.2.0" - sources."colors-1.4.0" ]; }) sources."oauth-sign-0.9.0" @@ -98280,11 +99730,10 @@ in sources."path-is-absolute-1.0.1" sources."pend-1.2.0" sources."performance-now-2.1.0" - sources."pkginfo-0.3.1" sources."psl-1.8.0" sources."punycode-2.1.1" sources."qs-6.5.2" - (sources."request-2.88.0" // { + (sources."request-2.88.2" // { dependencies = [ sources."uuid-3.4.0" ]; @@ -98296,19 +99745,15 @@ in sources."sprintf-0.1.5" sources."sshpk-1.16.1" sources."stack-trace-0.0.10" - sources."temp-0.9.0" - (sources."tough-cookie-2.4.3" // { - dependencies = [ - sources."punycode-1.4.1" - ]; - }) + sources."temp-0.9.1" + sources."tough-cookie-2.5.0" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."universalify-1.0.0" sources."uri-js-4.4.0" sources."uuid-8.3.1" sources."verror-1.10.0" - (sources."winston-1.1.2" // { + (sources."winston-2.4.5" // { dependencies = [ sources."async-1.0.0" sources."colors-1.0.3" @@ -98601,10 +100046,10 @@ in typescript = nodeEnv.buildNodePackage { name = "typescript"; packageName = "typescript"; - version = "4.0.3"; + version = "4.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/typescript/-/typescript-4.0.3.tgz"; - sha512 = "tEu6DGxGgRJPb/mVPIZ48e69xCn2yRmCgYmDugAVwmJ6o+0u1RI18eO7E7WBTLYLaEVVOhwQmcdhQHweux/WPg=="; + url = "https://registry.npmjs.org/typescript/-/typescript-4.0.5.tgz"; + sha512 = "ywmr/VrTVCmNTJ6iV2LwIrfG1P+lv6luD8sUJs+2eI9NLGigaN+nUQc13iHqisq7bra9lnmUSYqbJvegraBOPQ=="; }; buildInputs = globalBuildInputs; meta = { @@ -98655,10 +100100,10 @@ in uglify-js = nodeEnv.buildNodePackage { name = "uglify-js"; packageName = "uglify-js"; - version = "3.11.3"; + version = "3.11.5"; src = fetchurl { - url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.11.3.tgz"; - sha512 = "wDRziHG94mNj2n3R864CvYw/+pc9y/RNImiTyrrf8BzgWn75JgFSwYvXrtZQMnMnOp/4UTrf3iCSQxSStPiByA=="; + url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.11.5.tgz"; + sha512 = "btvv/baMqe7HxP7zJSF7Uc16h1mSfuuSplT0/qdjxseesDU+yYzH33eHBH+eMdeRXwujXspaCTooWHQVVBh09w=="; }; buildInputs = globalBuildInputs; meta = { @@ -98691,17 +100136,17 @@ in ungit = nodeEnv.buildNodePackage { name = "ungit"; packageName = "ungit"; - version = "1.5.11"; + version = "1.5.13"; src = fetchurl { - url = "https://registry.npmjs.org/ungit/-/ungit-1.5.11.tgz"; - sha512 = "oCpdK5T7N2skQCfZ7i/PEjuB3kRqQYYA/PXyN63jsoo0Vh6iSo/3w4GOt3e8s5XXw8YzuMlExKd1fsDXiUF47g=="; + url = "https://registry.npmjs.org/ungit/-/ungit-1.5.13.tgz"; + sha512 = "m+NczxQwrfo5Jle+QvgToZZAmgoiJoKGc0UT0e9YHQx288DBfNnrDUpaNBZB+L6i0NMqkp8c/CHAFaVpJS0v7Q=="; }; dependencies = [ sources."@dabh/diagnostics-2.0.2" sources."@primer/octicons-11.0.0" sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" - sources."@types/node-14.11.10" + sources."@types/node-14.14.6" sources."abbrev-1.1.1" sources."accepts-1.3.7" sources."after-0.8.2" @@ -98761,7 +100206,7 @@ in sources."depd-1.1.2" sources."destroy-1.0.4" sources."diff-4.0.2" - sources."diff2html-3.1.14" + sources."diff2html-3.1.15" sources."dnd-page-scroll-0.0.4" sources."duplexer3-0.1.4" sources."ee-first-1.1.1" @@ -98806,7 +100251,7 @@ in sources."fs.realpath-1.0.0" sources."get-caller-file-2.0.5" sources."get-stream-4.1.0" - sources."getmac-5.16.0" + sources."getmac-5.17.0" sources."glob-7.1.6" sources."got-9.6.0" sources."has-binary2-1.0.3" @@ -98835,7 +100280,7 @@ in sources."jquery-3.5.1" sources."jquery-ui-1.12.1" sources."json-buffer-3.0.0" - sources."just-detect-adblock-1.0.0" + sources."just-detect-adblock-1.1.0" sources."keyv-3.1.0" sources."knockout-3.5.1" sources."kuler-2.0.0" @@ -98850,9 +100295,10 @@ in sources."lowercase-keys-1.0.1" sources."lru-cache-4.1.5" sources."media-typer-0.3.0" - (sources."memorystore-1.6.2" // { + (sources."memorystore-1.6.4" // { dependencies = [ - sources."debug-3.1.0" + sources."debug-4.3.0" + sources."ms-2.1.2" ]; }) sources."merge-descriptors-1.0.1" @@ -98864,7 +100310,7 @@ in sources."minimatch-3.0.4" sources."minimist-1.2.5" sources."mkdirp-1.0.4" - sources."moment-2.28.0" + sources."moment-2.29.1" sources."ms-2.0.0" sources."negotiator-0.6.2" sources."node-cache-5.1.2" @@ -98877,7 +100323,7 @@ in sources."on-headers-1.0.2" sources."once-1.4.0" sources."one-time-1.0.0" - sources."open-7.2.1" + sources."open-7.3.0" sources."p-cancelable-1.1.0" (sources."package-json-6.5.0" // { dependencies = [ @@ -98960,8 +100406,9 @@ in }) sources."strip-ansi-6.0.0" sources."strip-json-comments-2.0.1" - (sources."temp-0.9.1" // { + (sources."temp-0.9.2" // { dependencies = [ + sources."mkdirp-0.5.5" sources."rimraf-2.6.3" ]; }) @@ -98989,9 +100436,9 @@ in sources."wrappy-1.0.2" sources."ws-7.3.1" sources."xmlhttprequest-ssl-1.5.5" - sources."y18n-5.0.4" + sources."y18n-5.0.5" sources."yallist-2.1.2" - sources."yargs-16.0.3" + sources."yargs-16.1.0" sources."yargs-parser-20.2.3" sources."yeast-0.1.2" ]; @@ -99066,15 +100513,18 @@ in sources."escalade-3.1.1" sources."fs-minipass-1.2.7" sources."fs.realpath-1.0.0" + sources."function-bind-1.1.1" sources."gauge-2.7.4" sources."get-caller-file-2.0.5" sources."glob-7.1.6" + sources."has-1.0.3" sources."has-unicode-2.0.1" sources."iconv-lite-0.4.24" sources."ignore-walk-3.0.3" sources."inflight-1.0.6" sources."inherits-2.0.4" sources."ini-1.3.5" + sources."is-core-module-2.0.0" sources."is-fullwidth-code-point-1.0.0" sources."isarray-1.0.0" sources."mimic-response-2.1.0" @@ -99105,7 +100555,7 @@ in sources."rc-1.2.8" sources."readable-stream-2.3.7" sources."require-directory-2.1.1" - sources."resolve-1.17.0" + sources."resolve-1.18.1" sources."rimraf-2.7.1" sources."rw-1.3.3" sources."safe-buffer-5.1.2" @@ -99163,7 +100613,7 @@ in ]; }) sources."wrappy-1.0.2" - sources."y18n-5.0.4" + sources."y18n-5.0.5" sources."yallist-3.1.1" (sources."yargs-16.1.0" // { dependencies = [ @@ -99218,7 +100668,7 @@ in sources."vega-expression-3.0.0" sources."vega-util-1.16.0" sources."wrap-ansi-7.0.0" - sources."y18n-5.0.4" + sources."y18n-5.0.5" sources."yargs-16.0.3" sources."yargs-parser-20.2.3" ]; @@ -99338,7 +100788,7 @@ in sources."vscode-nls-4.1.2" ]; }) - (sources."vscode-json-languageservice-3.9.1" // { + (sources."vscode-json-languageservice-3.10.0" // { dependencies = [ sources."jsonc-parser-2.3.1" sources."vscode-nls-5.0.0" @@ -99375,7 +100825,7 @@ in dependencies = [ sources."@types/json5-0.0.30" sources."@types/mocha-7.0.2" - sources."@types/node-8.10.65" + sources."@types/node-8.10.66" sources."@types/vscode-1.50.0" sources."@types/yauzl-2.9.1" sources."@webassemblyjs/ast-1.9.0" @@ -99475,6 +100925,7 @@ in ]; }) sources."cache-base-1.0.1" + sources."call-bind-1.0.0" sources."camelcase-5.3.1" (sources."chalk-2.4.2" // { dependencies = [ @@ -99514,7 +100965,7 @@ in sources."collection-visit-1.0.0" sources."color-convert-1.9.3" sources."color-name-1.1.3" - sources."commander-6.1.0" + sources."commander-6.2.0" sources."commondir-1.0.1" sources."component-emitter-1.3.0" sources."concat-map-0.0.1" @@ -99581,8 +101032,7 @@ in sources."errno-0.1.7" (sources."es-abstract-1.17.7" // { dependencies = [ - sources."es-abstract-1.18.0-next.1" - sources."object.assign-4.1.1" + sources."object.assign-4.1.2" ]; }) sources."es-to-primitive-1.2.1" @@ -99672,6 +101122,7 @@ in sources."fsevents-2.1.3" sources."function-bind-1.1.1" sources."get-caller-file-2.0.5" + sources."get-intrinsic-1.0.1" sources."get-value-2.0.6" sources."glob-7.1.3" sources."glob-parent-5.1.1" @@ -99717,7 +101168,7 @@ in ]; }) sources."https-browserify-1.0.0" - sources."ieee754-1.1.13" + sources."ieee754-1.2.1" sources."iferr-0.1.5" sources."import-local-2.0.0" sources."imurmurhash-0.1.4" @@ -99728,7 +101179,7 @@ in sources."interpret-1.4.0" sources."is-accessor-descriptor-1.0.0" sources."is-binary-path-2.1.0" - sources."is-buffer-2.0.4" + sources."is-buffer-2.0.5" sources."is-callable-1.2.2" sources."is-data-descriptor-1.0.0" sources."is-date-object-1.0.2" @@ -100012,8 +101463,18 @@ in sources."stream-shift-1.0.1" sources."string-argv-0.3.1" sources."string-width-2.1.1" - sources."string.prototype.trimend-1.0.1" - sources."string.prototype.trimstart-1.0.1" + (sources."string.prototype.trimend-1.0.2" // { + dependencies = [ + sources."es-abstract-1.18.0-next.1" + sources."object.assign-4.1.2" + ]; + }) + (sources."string.prototype.trimstart-1.0.2" // { + dependencies = [ + sources."es-abstract-1.18.0-next.1" + sources."object.assign-4.1.2" + ]; + }) sources."string_decoder-0.10.31" sources."strip-ansi-4.0.0" sources."strip-json-comments-2.0.1" @@ -100032,7 +101493,7 @@ in sources."string_decoder-1.1.1" ]; }) - sources."timers-browserify-2.0.11" + sources."timers-browserify-2.0.12" sources."tmp-0.0.29" sources."to-arraybuffer-1.0.1" (sources."to-object-path-0.3.0" // { @@ -100086,7 +101547,7 @@ in ]; }) sources."util-deprecate-1.0.2" - sources."v8-compile-cache-2.1.1" + sources."v8-compile-cache-2.2.0" sources."vm-browserify-1.1.2" sources."vsce-1.81.1" sources."vscode-debugadapter-testsupport-1.42.0" @@ -100213,14 +101674,14 @@ in sources."async-2.6.3" sources."asynckit-0.4.0" sources."aws-sign2-0.7.0" - sources."aws4-1.10.1" + sources."aws4-1.11.0" sources."balanced-match-1.0.0" sources."base64-js-1.3.1" sources."bcrypt-pbkdf-1.0.2" sources."bl-1.2.3" sources."bluebird-3.7.2" sources."brace-expansion-1.1.11" - sources."buffer-5.6.0" + sources."buffer-5.7.0" sources."buffer-alloc-1.2.0" sources."buffer-alloc-unsafe-1.1.0" sources."buffer-crc32-0.2.13" @@ -100311,7 +101772,7 @@ in sources."has-to-string-tag-x-1.4.1" sources."http-signature-1.2.0" sources."iconv-lite-0.4.24" - sources."ieee754-1.1.13" + sources."ieee754-1.2.1" sources."inflight-1.0.6" sources."inherits-2.0.4" sources."ini-1.3.5" @@ -100440,7 +101901,7 @@ in sources."tslib-1.14.1" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" - sources."uglify-js-3.11.3" + sources."uglify-js-3.11.5" sources."uid-0.0.2" sources."unbzip2-stream-1.4.3" sources."unyield-0.0.1" @@ -100499,7 +101960,7 @@ in sources."@starptech/rehype-webparser-0.10.0" sources."@starptech/webparser-0.10.0" sources."@szmarczak/http-timer-1.1.2" - sources."@types/node-14.11.10" + sources."@types/node-14.14.6" sources."@types/unist-2.0.3" sources."@types/vfile-3.0.2" sources."@types/vfile-message-2.0.0" @@ -100586,7 +102047,7 @@ in sources."callsites-3.1.0" sources."camelcase-4.1.0" sources."camelcase-keys-4.2.0" - sources."ccount-1.0.5" + sources."ccount-1.1.0" sources."chalk-2.4.2" sources."character-entities-1.2.4" sources."character-entities-html4-1.1.4" @@ -100774,7 +102235,7 @@ in sources."format-0.2.2" sources."fragment-cache-0.2.1" sources."fs.realpath-1.0.0" - sources."fsevents-2.1.3" + sources."fsevents-2.2.0" sources."function-bind-1.1.1" sources."functional-red-black-tree-1.0.1" sources."get-caller-file-1.0.3" @@ -100816,7 +102277,7 @@ in sources."hast-util-has-property-1.0.4" sources."hast-util-is-body-ok-link-1.0.4" sources."hast-util-is-element-1.1.0" - sources."hast-util-parse-selector-2.2.4" + sources."hast-util-parse-selector-2.2.5" sources."hast-util-to-string-1.0.4" sources."hast-util-whitespace-1.0.4" sources."hosted-git-info-2.8.8" @@ -100825,7 +102286,7 @@ in sources."http-cache-semantics-4.1.0" sources."iconv-lite-0.4.24" sources."ignore-3.3.10" - (sources."import-fresh-3.2.1" // { + (sources."import-fresh-3.2.2" // { dependencies = [ sources."resolve-from-4.0.0" ]; @@ -100848,8 +102309,9 @@ in sources."is-alphanumerical-1.0.4" sources."is-arrayish-0.2.1" sources."is-binary-path-2.1.0" - sources."is-buffer-2.0.4" + sources."is-buffer-2.0.5" sources."is-ci-2.0.0" + sources."is-core-module-2.0.0" sources."is-data-descriptor-1.0.0" sources."is-decimal-1.0.4" sources."is-descriptor-1.0.2" @@ -101118,7 +102580,7 @@ in sources."resolve-from-1.0.1" ]; }) - sources."resolve-1.17.0" + sources."resolve-1.18.1" sources."resolve-from-5.0.0" sources."resolve-url-0.2.1" sources."responselike-1.0.2" @@ -101281,7 +102743,7 @@ in sources."to-vfile-6.1.0" sources."trim-0.0.1" sources."trim-newlines-2.0.0" - sources."trim-trailing-lines-1.1.3" + sources."trim-trailing-lines-1.1.4" sources."trough-1.0.5" sources."tslib-1.14.1" sources."tslint-5.20.1" @@ -101428,10 +102890,10 @@ in web-ext = nodeEnv.buildNodePackage { name = "web-ext"; packageName = "web-ext"; - version = "5.2.0"; + version = "5.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/web-ext/-/web-ext-5.2.0.tgz"; - sha512 = "o/s206JW2U/vXHTe/XeBnsUQhIcuphsSVNVrJU+MoMFq8JlU9vI1VdS2RCW+u5NuqAsMvTyV+pA+4hLGB9CGCw=="; + url = "https://registry.npmjs.org/web-ext/-/web-ext-5.3.0.tgz"; + sha512 = "LlOmVSddfBVHd9Liv3SL1Cvftr+YS6GNiKVIugDotUm3jVT9otHsw1SrCi11MGaGBw4g0s8ndjcbuttr1ZQjwg=="; }; dependencies = [ sources."@babel/code-frame-7.10.4" @@ -101462,13 +102924,13 @@ in sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" sources."@types/minimatch-3.0.3" - sources."@types/node-14.11.10" + sources."@types/node-14.14.6" sources."JSONSelect-0.2.1" sources."acorn-7.4.1" sources."acorn-jsx-5.3.1" - sources."addons-linter-2.7.0" + sources."addons-linter-2.9.0" sources."adm-zip-0.4.16" - sources."ajv-6.12.5" + sources."ajv-6.12.6" sources."ajv-merge-patch-4.1.0" sources."ansi-align-3.0.0" sources."ansi-colors-4.1.1" @@ -101510,11 +102972,12 @@ in sources."atob-2.1.2" sources."atomic-sleep-1.0.0" sources."aws-sign2-0.7.0" - sources."aws4-1.10.1" + sources."aws4-1.11.0" sources."balanced-match-1.0.0" (sources."base-0.11.2" // { dependencies = [ sources."define-property-1.0.0" + sources."isobject-3.0.1" ]; }) sources."base64-js-1.3.1" @@ -101537,17 +103000,22 @@ in }) sources."brace-expansion-1.1.11" sources."braces-3.0.2" - sources."buffer-5.6.0" + sources."buffer-5.7.0" sources."buffer-crc32-0.2.13" sources."buffer-equal-constant-time-1.0.1" sources."buffer-from-1.1.1" sources."bunyan-1.8.14" - sources."cache-base-1.0.1" + (sources."cache-base-1.0.1" // { + dependencies = [ + sources."isobject-3.0.1" + ]; + }) (sources."cacheable-request-6.1.0" // { dependencies = [ sources."lowercase-keys-2.0.0" ]; }) + sources."call-bind-1.0.0" sources."callsites-3.1.0" sources."camelcase-6.0.0" sources."caseless-0.12.0" @@ -101575,6 +103043,7 @@ in ]; }) sources."is-descriptor-0.1.6" + sources."isobject-3.0.1" sources."kind-of-5.1.0" ]; }) @@ -101593,6 +103062,7 @@ in sources."collection-visit-1.0.0" sources."color-convert-2.0.1" sources."color-name-1.1.4" + sources."colorette-1.2.1" sources."colors-0.5.1" sources."columnify-1.5.4" sources."combined-stream-1.0.8" @@ -101632,11 +103102,16 @@ in sources."defaults-1.0.3" sources."defer-to-connect-1.1.3" sources."define-properties-1.1.3" - sources."define-property-2.0.2" + (sources."define-property-2.0.2" // { + dependencies = [ + sources."isobject-3.0.1" + ]; + }) sources."delayed-stream-1.0.0" (sources."dispensary-0.57.0" // { dependencies = [ sources."async-3.2.0" + sources."pino-6.6.1" ]; }) sources."doctrine-3.0.0" @@ -101661,16 +103136,15 @@ in sources."es6-promisify-6.1.1" sources."escape-goat-2.1.1" sources."escape-string-regexp-1.0.5" - (sources."eslint-7.9.0" // { + (sources."eslint-7.11.0" // { dependencies = [ sources."ansi-regex-5.0.0" sources."debug-4.3.0" - sources."eslint-visitor-keys-1.3.0" sources."ms-2.1.2" sources."strip-ansi-6.0.0" ]; }) - sources."eslint-plugin-no-unsanitized-3.1.2" + sources."eslint-plugin-no-unsanitized-3.1.4" sources."eslint-scope-5.1.1" (sources."eslint-utils-2.1.0" // { dependencies = [ @@ -101697,7 +103171,7 @@ in sources."estraverse-4.3.0" sources."esutils-2.0.3" sources."event-to-promise-0.8.0" - sources."execa-4.0.3" + sources."execa-4.1.0" (sources."expand-brackets-2.1.4" // { dependencies = [ sources."define-property-0.2.5" @@ -101762,7 +103236,11 @@ in sources."fs-constants-1.0.0" (sources."fs-extra-9.0.1" // { dependencies = [ - sources."jsonfile-6.0.1" + (sources."jsonfile-6.1.0" // { + dependencies = [ + sources."universalify-2.0.0" + ]; + }) sources."universalify-1.0.0" ]; }) @@ -101778,6 +103256,7 @@ in ]; }) sources."get-caller-file-2.0.5" + sources."get-intrinsic-1.0.1" sources."get-stream-5.2.0" sources."get-value-2.0.6" sources."getpass-0.1.7" @@ -101798,7 +103277,11 @@ in sources."has-1.0.3" sources."has-flag-4.0.0" sources."has-symbols-1.0.1" - sources."has-value-1.0.0" + (sources."has-value-1.0.0" // { + dependencies = [ + sources."isobject-3.0.1" + ]; + }) (sources."has-values-1.0.0" // { dependencies = [ (sources."is-number-3.0.0" // { @@ -101814,7 +103297,7 @@ in sources."http-cache-semantics-4.1.0" sources."http-signature-1.2.0" sources."human-signals-1.1.1" - sources."ieee754-1.1.13" + sources."ieee754-1.2.1" sources."ignore-4.0.6" sources."import-fresh-3.2.1" sources."import-lazy-2.1.0" @@ -101846,7 +103329,11 @@ in sources."is-number-7.0.0" sources."is-obj-2.0.0" sources."is-path-inside-3.0.2" - sources."is-plain-object-2.0.4" + (sources."is-plain-object-2.0.4" // { + dependencies = [ + sources."isobject-3.0.1" + ]; + }) sources."is-regex-1.1.1" sources."is-relative-0.1.3" sources."is-stream-2.0.0" @@ -101858,7 +103345,7 @@ in sources."is-yarn-global-0.3.0" sources."isarray-1.0.0" sources."isexe-2.0.0" - sources."isobject-3.0.1" + sources."isobject-2.1.0" sources."isstream-0.1.2" sources."jed-1.1.1" sources."jetpack-id-1.0.0" @@ -101898,6 +103385,7 @@ in sources."lcid-3.1.1" sources."levn-0.4.1" sources."lighthouse-logger-1.2.0" + sources."line-column-1.0.2" sources."lines-and-columns-1.1.6" sources."locate-path-5.0.0" sources."lodash-4.17.20" @@ -101923,7 +103411,7 @@ in sources."map-cache-0.2.2" sources."map-visit-1.0.0" sources."marky-1.2.1" - sources."mdn-browser-compat-data-1.0.39" + sources."mdn-browser-compat-data-1.0.40" sources."mem-5.1.1" sources."merge-stream-2.0.0" (sources."micromatch-3.1.10" // { @@ -101943,6 +103431,7 @@ in sources."kind-of-3.2.2" ]; }) + sources."isobject-3.0.1" sources."to-regex-range-2.1.1" ]; }) @@ -101970,6 +103459,7 @@ in }) sources."mz-2.7.0" sources."nan-2.14.2" + sources."nanoid-3.1.16" sources."nanomatch-1.2.13" sources."natural-compare-1.4.0" sources."natural-compare-lite-1.4.0" @@ -102004,9 +103494,17 @@ in sources."object-inspect-1.8.0" sources."object-is-1.1.3" sources."object-keys-1.1.1" - sources."object-visit-1.0.1" - sources."object.assign-4.1.1" - sources."object.pick-1.3.0" + (sources."object-visit-1.0.1" // { + dependencies = [ + sources."isobject-3.0.1" + ]; + }) + sources."object.assign-4.1.2" + (sources."object.pick-1.3.0" // { + dependencies = [ + sources."isobject-3.0.1" + ]; + }) sources."once-1.4.0" sources."onetime-5.1.2" sources."open-7.3.0" @@ -102036,23 +103534,14 @@ in sources."pend-1.2.0" sources."performance-now-2.1.0" sources."picomatch-2.2.2" - sources."pino-6.6.1" - sources."pino-std-serializers-2.5.0" - sources."posix-character-classes-0.1.1" - (sources."postcss-7.0.35" // { + (sources."pino-6.7.0" // { dependencies = [ - sources."ansi-styles-3.2.1" - (sources."chalk-2.4.2" // { - dependencies = [ - sources."supports-color-5.5.0" - ]; - }) - sources."color-convert-1.9.3" - sources."color-name-1.1.3" - sources."has-flag-3.0.0" - sources."supports-color-6.1.0" + sources."fast-redact-3.0.0" ]; }) + sources."pino-std-serializers-2.5.0" + sources."posix-character-classes-0.1.1" + sources."postcss-8.1.1" sources."prelude-ls-1.2.1" sources."prepend-http-2.0.0" sources."probe-image-size-5.0.0" @@ -102061,7 +103550,7 @@ in sources."psl-1.8.0" sources."pump-3.0.0" sources."punycode-2.1.1" - sources."pupa-2.0.1" + sources."pupa-2.1.1" sources."qs-6.5.2" sources."quick-format-unescaped-4.0.1" (sources."rc-1.2.8" // { @@ -102160,6 +103649,7 @@ in (sources."snapdragon-node-2.1.1" // { dependencies = [ sources."define-property-1.0.0" + sources."isobject-3.0.1" ]; }) (sources."snapdragon-util-3.0.1" // { @@ -102203,16 +103693,8 @@ in sources."strip-ansi-5.2.0" ]; }) - (sources."string.prototype.trimend-1.0.1" // { - dependencies = [ - sources."es-abstract-1.17.7" - ]; - }) - (sources."string.prototype.trimstart-1.0.1" // { - dependencies = [ - sources."es-abstract-1.17.7" - ]; - }) + sources."string.prototype.trimend-1.0.2" + sources."string.prototype.trimstart-1.0.2" sources."string_decoder-1.3.0" sources."strip-ansi-3.0.1" sources."strip-bom-4.0.0" @@ -102227,7 +103709,7 @@ in sources."supports-color-7.2.0" sources."table-5.4.6" sources."tar-stream-2.1.4" - sources."term-size-2.2.0" + sources."term-size-2.2.1" sources."text-table-0.2.0" sources."thenify-3.3.1" sources."thenify-all-1.6.0" @@ -102267,9 +103749,10 @@ in ]; }) sources."has-values-0.1.4" + sources."isobject-3.0.1" ]; }) - sources."upath-1.2.0" + sources."upath-2.0.0" sources."update-notifier-5.0.0" sources."uri-js-4.4.0" sources."urix-0.1.0" @@ -102277,7 +103760,7 @@ in sources."use-3.1.1" sources."util-deprecate-1.0.2" sources."uuid-3.4.0" - sources."v8-compile-cache-2.1.1" + sources."v8-compile-cache-2.2.0" sources."verror-1.10.0" sources."watchpack-1.7.4" (sources."watchpack-chokidar2-2.0.0" // { @@ -102293,6 +103776,7 @@ in sources."is-binary-path-1.0.1" sources."is-glob-3.1.0" sources."is-number-3.0.0" + sources."isobject-3.0.1" sources."kind-of-3.2.2" sources."normalize-path-2.1.1" sources."readable-stream-2.3.7" @@ -102300,11 +103784,12 @@ in sources."safe-buffer-5.1.2" sources."string_decoder-1.1.1" sources."to-regex-range-2.1.1" + sources."upath-1.2.0" ]; }) sources."wcwidth-1.0.1" sources."webidl-conversions-6.1.0" - sources."whatwg-url-8.2.2" + sources."whatwg-url-8.4.0" sources."when-3.7.7" sources."which-2.0.2" sources."which-module-2.0.0" @@ -102377,17 +103862,17 @@ in webpack = nodeEnv.buildNodePackage { name = "webpack"; packageName = "webpack"; - version = "5.1.3"; + version = "5.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/webpack/-/webpack-5.1.3.tgz"; - sha512 = "bNBF5EOpt5a6NeCBFu0+8KJtG61cVmOb2b/a5tPNRLz3OWgDpHMbmnDkaSm3nf/UQ6ufw4PWYGVsVOAi8UfL2A=="; + url = "https://registry.npmjs.org/webpack/-/webpack-5.4.0.tgz"; + sha512 = "udpYTyqz8toTTdaOsL2QKPLeZLt2IEm9qY7yTXuFEQhKu5bk0yQD9BtAdVQksmz4jFbbWOiWmm3NHarO0zr/ng=="; }; dependencies = [ sources."@types/eslint-7.2.4" sources."@types/eslint-scope-3.7.0" sources."@types/estree-0.0.45" sources."@types/json-schema-7.0.6" - sources."@types/node-14.11.10" + sources."@types/node-14.14.6" sources."@webassemblyjs/ast-1.9.0" sources."@webassemblyjs/floating-point-hex-parser-1.9.0" sources."@webassemblyjs/helper-api-error-1.9.0" @@ -102411,13 +103896,13 @@ in sources."acorn-8.0.4" sources."ajv-6.12.6" sources."ajv-keywords-3.5.2" - sources."browserslist-4.14.5" + sources."browserslist-4.14.6" sources."buffer-from-1.1.1" - sources."caniuse-lite-1.0.30001148" + sources."caniuse-lite-1.0.30001154" sources."chrome-trace-event-1.0.2" sources."commander-2.20.3" - sources."electron-to-chromium-1.3.582" - sources."enhanced-resolve-5.2.0" + sources."electron-to-chromium-1.3.587" + sources."enhanced-resolve-5.3.1" sources."escalade-3.1.1" sources."eslint-scope-5.1.1" (sources."esrecurse-4.3.0" // { @@ -102433,7 +103918,7 @@ in sources."glob-to-regexp-0.4.1" sources."graceful-fs-4.2.4" sources."has-flag-4.0.0" - sources."jest-worker-26.5.0" + sources."jest-worker-26.6.2" sources."json-parse-better-errors-1.0.2" sources."json-schema-traverse-0.4.1" sources."loader-runner-4.1.0" @@ -102442,7 +103927,7 @@ in sources."mime-db-1.44.0" sources."mime-types-2.1.27" sources."neo-async-2.6.2" - sources."node-releases-1.1.63" + sources."node-releases-1.1.65" sources."p-limit-2.3.0" sources."p-locate-4.1.0" sources."p-try-2.2.0" @@ -102458,20 +103943,20 @@ in sources."source-map-support-0.5.19" sources."supports-color-7.2.0" sources."tapable-2.0.0" - (sources."terser-5.3.6" // { + (sources."terser-5.3.8" // { dependencies = [ sources."source-map-0.7.3" ]; }) - (sources."terser-webpack-plugin-5.0.0" // { + (sources."terser-webpack-plugin-5.0.3" // { dependencies = [ sources."p-limit-3.0.2" ]; }) sources."tslib-1.14.1" sources."uri-js-4.4.0" - sources."watchpack-2.0.0" - sources."webpack-sources-2.0.1" + sources."watchpack-2.0.1" + sources."webpack-sources-2.2.0" ]; buildInputs = globalBuildInputs; meta = { @@ -102503,20 +103988,23 @@ in sources."color-name-1.1.3" sources."colorette-1.2.1" sources."command-line-usage-6.1.0" - sources."commander-6.1.0" + sources."commander-6.2.0" sources."cross-spawn-7.0.3" sources."deep-extend-0.6.0" sources."end-of-stream-1.4.4" sources."enquirer-2.3.6" sources."envinfo-7.7.3" sources."escape-string-regexp-1.0.5" - sources."execa-4.0.3" + sources."execa-4.1.0" sources."find-up-4.1.0" + sources."function-bind-1.1.1" sources."get-stream-5.2.0" + sources."has-1.0.3" sources."has-flag-3.0.0" sources."human-signals-1.1.1" sources."import-local-3.0.2" sources."interpret-2.2.0" + sources."is-core-module-2.0.0" sources."is-stream-2.0.0" sources."isexe-2.0.0" sources."locate-path-5.0.0" @@ -102536,7 +104024,7 @@ in sources."pump-3.0.0" sources."rechoir-0.7.0" sources."reduce-flatten-2.0.0" - sources."resolve-1.17.0" + sources."resolve-1.18.1" sources."resolve-cwd-3.0.0" sources."resolve-from-5.0.0" sources."shebang-command-2.0.0" @@ -102547,7 +104035,7 @@ in sources."table-layout-1.0.1" sources."type-fest-0.11.0" sources."typical-5.2.0" - sources."v8-compile-cache-2.1.1" + sources."v8-compile-cache-2.2.0" sources."webpack-merge-4.2.2" sources."which-2.0.2" sources."wordwrapjs-4.0.0" @@ -102574,7 +104062,7 @@ in dependencies = [ sources."@types/glob-7.1.3" sources."@types/minimatch-3.0.3" - sources."@types/node-14.11.10" + sources."@types/node-14.14.6" sources."accepts-1.3.7" sources."ajv-6.12.6" sources."ajv-errors-1.0.1" @@ -102626,6 +104114,7 @@ in sources."buffer-indexof-1.1.1" sources."bytes-3.0.0" sources."cache-base-1.0.1" + sources."call-bind-1.0.0" sources."camelcase-5.3.1" sources."chokidar-2.1.8" (sources."class-utils-0.3.6" // { @@ -102769,6 +104258,7 @@ in sources."fsevents-1.2.13" sources."function-bind-1.1.1" sources."get-caller-file-2.0.5" + sources."get-intrinsic-1.0.1" sources."get-stream-4.1.0" sources."get-value-2.0.6" sources."glob-7.1.6" @@ -102892,7 +104382,7 @@ in sources."object-is-1.1.3" sources."object-keys-1.1.1" sources."object-visit-1.0.1" - sources."object.assign-4.1.1" + sources."object.assign-4.1.2" sources."object.pick-1.3.0" sources."obuf-1.1.2" sources."on-finished-2.3.0" @@ -103072,16 +104562,8 @@ in sources."strip-ansi-5.2.0" ]; }) - (sources."string.prototype.trimend-1.0.1" // { - dependencies = [ - sources."es-abstract-1.17.7" - ]; - }) - (sources."string.prototype.trimstart-1.0.1" // { - dependencies = [ - sources."es-abstract-1.17.7" - ]; - }) + sources."string.prototype.trimend-1.0.2" + sources."string.prototype.trimstart-1.0.2" (sources."string_decoder-1.1.1" // { dependencies = [ sources."safe-buffer-5.1.2" @@ -103166,10 +104648,10 @@ in copy-webpack-plugin = nodeEnv.buildNodePackage { name = "copy-webpack-plugin"; packageName = "copy-webpack-plugin"; - version = "6.2.1"; + version = "6.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/copy-webpack-plugin/-/copy-webpack-plugin-6.2.1.tgz"; - sha512 = "VH2ZTMIBsx4p++Lmpg77adZ0KUyM5gFR/9cuTrbneNnJlcQXUFvsNariPqq2dq2kV3F2skHiDGPQCyKWy1+U0Q=="; + url = "https://registry.npmjs.org/copy-webpack-plugin/-/copy-webpack-plugin-6.3.0.tgz"; + sha512 = "kQ2cGGQLO6Ov2fe7rEGVxObI17dPeFkv8bRGnUAGZehOcrrObyAR9yWYlFGlJsyWM4EeuC/ytQNQkXxjYotMzg=="; }; dependencies = [ sources."@nodelib/fs.scandir-2.1.3" @@ -103195,7 +104677,7 @@ in sources."fast-deep-equal-3.1.3" sources."fast-glob-3.2.4" sources."fast-json-stable-stringify-2.1.0" - sources."fastq-1.8.0" + sources."fastq-1.9.0" sources."fill-range-7.0.1" sources."find-cache-dir-3.3.1" sources."find-up-4.1.0" @@ -103249,7 +104731,7 @@ in sources."randombytes-2.1.0" sources."reusify-1.0.4" sources."rimraf-3.0.2" - sources."run-parallel-1.1.9" + sources."run-parallel-1.1.10" sources."safe-buffer-5.2.1" sources."schema-utils-3.0.0" sources."semver-6.3.0" @@ -103297,11 +104779,12 @@ in sources."@protobufjs/pool-1.1.0" sources."@protobufjs/utf8-1.1.0" sources."@types/long-4.0.1" - sources."@types/node-13.13.26" + sources."@types/node-13.13.30" sources."addr-to-ip-port-1.5.1" sources."airplay-js-0.3.0" sources."balanced-match-1.0.0" sources."bencode-2.0.1" + sources."bep53-range-1.0.0" sources."binary-search-1.3.6" sources."bitfield-3.0.0" (sources."bittorrent-dht-10.0.0" // { @@ -103311,7 +104794,7 @@ in ]; }) sources."bittorrent-peerid-1.3.3" - (sources."bittorrent-protocol-3.1.1" // { + (sources."bittorrent-protocol-3.1.2" // { dependencies = [ sources."debug-4.3.0" sources."ms-2.1.2" @@ -103326,7 +104809,7 @@ in sources."simple-get-4.0.0" ]; }) - sources."blob-to-buffer-1.2.8" + sources."blob-to-buffer-1.2.9" sources."block-stream2-2.0.0" sources."bn.js-5.1.3" sources."brace-expansion-1.1.11" @@ -103336,7 +104819,7 @@ in sources."buffer-fill-1.0.0" sources."buffer-from-1.1.1" sources."buffer-indexof-1.1.1" - sources."bufferutil-4.0.1" + sources."bufferutil-4.0.2" (sources."castv2-0.1.10" // { dependencies = [ sources."debug-4.3.0" @@ -103345,7 +104828,7 @@ in }) sources."castv2-client-1.2.0" sources."charset-1.0.1" - sources."chrome-dgram-3.0.5" + sources."chrome-dgram-3.0.6" sources."chrome-dns-1.0.1" sources."chrome-net-3.3.4" (sources."chromecasts-1.9.1" // { @@ -103380,6 +104863,7 @@ in sources."ee-first-1.1.1" sources."elementtree-0.1.7" sources."end-of-stream-1.4.1" + sources."err-code-2.0.3" sources."escape-html-1.0.3" sources."executable-4.1.1" sources."filestream-5.0.0" @@ -103396,7 +104880,7 @@ in sources."he-1.2.0" sources."http-node-git://github.com/feross/http-node#webtorrent" sources."http-parser-js-0.4.13" - sources."immediate-chunk-store-2.1.0" + sources."immediate-chunk-store-2.1.1" sources."inflight-1.0.6" sources."inherits-2.0.4" sources."ip-1.1.5" @@ -103413,19 +104897,19 @@ in sources."k-rpc-5.1.0" sources."k-rpc-socket-1.11.1" sources."last-one-wins-1.0.4" - (sources."load-ip-set-2.1.0" // { + (sources."load-ip-set-2.1.1" // { dependencies = [ - sources."decompress-response-4.2.1" - sources."mimic-response-2.1.0" - sources."simple-get-3.1.0" + sources."decompress-response-6.0.0" + sources."mimic-response-3.1.0" + sources."simple-get-4.0.0" ]; }) sources."long-4.0.0" sources."lru-3.1.0" - sources."magnet-uri-5.3.0" + sources."magnet-uri-5.4.0" sources."mdns-js-0.5.0" sources."mdns-js-packet-0.2.0" - sources."mediasource-2.3.0" + sources."mediasource-2.4.0" sources."memory-chunk-store-1.3.0" sources."mime-2.4.6" sources."mimic-response-1.0.1" @@ -103441,18 +104925,18 @@ in sources."thunky-1.1.0" ]; }) - sources."multistream-4.0.0" + sources."multistream-4.0.1" + sources."napi-macros-2.0.0" sources."netmask-1.0.6" sources."network-address-1.1.2" sources."next-event-1.0.0" - sources."node-gyp-build-3.7.0" + sources."node-gyp-build-4.2.3" sources."node-ssdp-2.9.1" sources."nodebmc-0.0.7" sources."on-finished-2.3.0" sources."once-1.4.0" sources."open-7.3.0" sources."package-json-versionify-1.0.4" - sources."parse-numeric-range-1.2.0" (sources."parse-torrent-7.1.3" // { dependencies = [ sources."decompress-response-4.2.1" @@ -103473,7 +104957,7 @@ in sources."protobufjs-6.10.1" sources."pump-3.0.0" sources."qap-3.3.1" - sources."queue-microtask-1.1.4" + sources."queue-microtask-1.2.0" sources."random-access-file-2.1.4" sources."random-access-storage-1.4.1" sources."random-iterate-1.0.1" @@ -103489,16 +104973,16 @@ in ]; }) sources."rimraf-3.0.2" - sources."run-parallel-1.1.9" - sources."run-parallel-limit-1.0.5" - sources."run-series-1.1.8" + sources."run-parallel-1.1.10" + sources."run-parallel-limit-1.0.6" + sources."run-series-1.1.9" sources."rusha-0.8.13" sources."safe-buffer-5.2.1" sources."sax-1.1.4" sources."semver-5.1.1" sources."simple-concat-1.0.1" sources."simple-get-2.8.1" - (sources."simple-peer-9.7.2" // { + (sources."simple-peer-9.8.0" // { dependencies = [ sources."debug-4.3.0" sources."ms-2.1.2" @@ -103525,6 +105009,7 @@ in sources."thirty-two-1.0.2" sources."through-2.3.8" sources."thunky-0.1.0" + sources."timeout-refresh-1.0.3" sources."to-arraybuffer-1.0.1" (sources."torrent-discovery-9.3.0" // { dependencies = [ @@ -103537,6 +105022,7 @@ in sources."typedarray-to-buffer-3.1.5" sources."uint64be-2.0.2" sources."unordered-array-remove-1.0.2" + sources."unordered-set-2.0.1" sources."upnp-device-client-1.0.2" sources."upnp-mediarenderer-client-1.4.0" sources."url-join-4.0.1" @@ -103547,17 +105033,21 @@ in ]; }) sources."ut_pex-2.0.1" - sources."utf-8-validate-5.0.2" + sources."utf-8-validate-5.0.3" sources."util-deprecate-1.0.2" + sources."utp-native-2.2.1" sources."videostream-3.2.1" sources."vlc-command-1.2.0" - (sources."webtorrent-0.108.6" // { + (sources."webtorrent-0.110.1" // { dependencies = [ sources."debug-4.3.0" - sources."decompress-response-4.2.1" - sources."mimic-response-2.1.0" + sources."decompress-response-6.0.0" + sources."get-stdin-8.0.0" + sources."magnet-uri-6.0.0" + sources."mimic-response-3.1.0" sources."ms-2.1.2" - sources."simple-get-3.1.0" + sources."parse-torrent-9.0.0" + sources."simple-get-4.0.0" ]; }) sources."winreg-1.2.4" @@ -103625,10 +105115,10 @@ in yaml-language-server = nodeEnv.buildNodePackage { name = "yaml-language-server"; packageName = "yaml-language-server"; - version = "0.11.1"; + version = "0.12.0"; src = fetchurl { - url = "https://registry.npmjs.org/yaml-language-server/-/yaml-language-server-0.11.1.tgz"; - sha512 = "N3Tu3g4O6ZWV7W0LVsNk62DtKJDQkbnPZRDd7ntaAeEl8QkxL1vnMunI26uzDU4PwwG4tPJ8g/VRS6U+fVp/6A=="; + url = "https://registry.npmjs.org/yaml-language-server/-/yaml-language-server-0.12.0.tgz"; + sha512 = "EAr9fJi05wVWsFVgc4s0AI74nT6D2oN7xcy7W+7JCkvirbm0L7aPDRAjSz6z/dXVyYyFlEAgRWVThXzqguFyTw=="; }; dependencies = [ sources."agent-base-4.3.0" @@ -103642,10 +105132,9 @@ in sources."js-yaml-3.14.0" sources."jsonc-parser-2.3.1" sources."ms-2.0.0" - sources."prettier-2.0.5" sources."request-light-0.2.5" sources."sprintf-js-1.0.3" - (sources."vscode-json-languageservice-3.9.1" // { + (sources."vscode-json-languageservice-3.10.0" // { dependencies = [ sources."vscode-languageserver-types-3.16.0-next.2" sources."vscode-nls-5.0.0" @@ -103666,12 +105155,11 @@ in sources."vscode-languageserver-types-3.15.1" sources."vscode-nls-4.1.2" sources."vscode-uri-2.1.2" - sources."yaml-ast-parser-custom-tags-0.0.43" + sources."yaml-language-server-parser-0.1.1" ]; buildInputs = globalBuildInputs; meta = { description = "YAML language server"; - homepage = "https://github.com/redhat-developer/yaml-language-server#readme"; license = "MIT"; }; production = true; @@ -103708,13 +105196,13 @@ in sources."@babel/code-frame-7.10.4" sources."@babel/helper-validator-identifier-7.10.4" sources."@babel/highlight-7.10.4" - sources."@babel/runtime-7.12.1" + sources."@babel/runtime-7.12.5" sources."@mrmlnc/readdir-enhanced-2.2.1" sources."@nodelib/fs.stat-1.1.3" sources."@sindresorhus/is-0.7.0" sources."@types/glob-7.1.3" sources."@types/minimatch-3.0.3" - sources."@types/node-14.11.10" + sources."@types/node-14.14.6" sources."@types/normalize-package-data-2.4.0" sources."JSONStream-1.3.5" sources."aggregate-error-3.1.0" @@ -103742,10 +105230,10 @@ in sources."asynckit-0.4.0" sources."atob-2.1.2" sources."aws-sign2-0.7.0" - sources."aws4-1.10.1" + sources."aws4-1.11.0" (sources."axios-0.18.1" // { dependencies = [ - sources."is-buffer-2.0.4" + sources."is-buffer-2.0.5" ]; }) sources."balanced-match-1.0.0" @@ -103762,7 +105250,7 @@ in }) sources."bin-version-check-3.0.0" sources."binaryextensions-2.3.0" - sources."boolean-3.0.1" + sources."boolean-3.0.2" (sources."boxen-1.3.0" // { dependencies = [ sources."camelcase-4.1.0" @@ -103944,6 +105432,7 @@ in sources."from2-2.3.0" sources."fs.realpath-1.0.0" sources."fullname-4.0.1" + sources."function-bind-1.1.1" sources."gauge-1.2.7" sources."get-stdin-4.0.1" sources."get-stream-4.1.0" @@ -103984,6 +105473,7 @@ in sources."grouped-queue-1.1.0" sources."har-schema-2.0.0" sources."har-validator-5.1.5" + sources."has-1.0.3" (sources."has-ansi-2.0.0" // { dependencies = [ sources."ansi-regex-2.1.1" @@ -104025,6 +105515,7 @@ in sources."is-arrayish-0.2.1" sources."is-buffer-1.1.6" sources."is-ci-1.2.1" + sources."is-core-module-2.0.0" sources."is-data-descriptor-1.0.0" sources."is-descriptor-1.0.2" sources."is-docker-1.1.0" @@ -104303,7 +105794,7 @@ in sources."tough-cookie-2.5.0" ]; }) - sources."resolve-1.17.0" + sources."resolve-1.18.1" sources."resolve-url-0.2.1" sources."responselike-1.0.2" sources."restore-cursor-2.0.0" @@ -104559,7 +106050,7 @@ in sources."color-name-1.1.4" sources."cross-spawn-7.0.3" sources."debug-3.2.6" - sources."execa-4.0.3" + sources."execa-4.1.0" sources."figures-3.2.0" sources."get-stream-5.2.0" sources."has-flag-4.0.0" @@ -104610,7 +106101,7 @@ in sources."semver-6.3.0" ]; }) - (sources."mem-fs-editor-7.0.1" // { + (sources."mem-fs-editor-7.1.0" // { dependencies = [ sources."rimraf-3.0.2" ]; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/apron/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/apron/default.nix index 0da1ab74e1..79c4d8a500 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/apron/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/apron/default.nix @@ -13,8 +13,21 @@ stdenv.mkDerivation rec { buildInputs = [ perl gmp mpfr ppl ocaml findlib camlidl ]; propagatedBuildInputs = [ mlgmpidl ]; - prefixKey = "-prefix "; - preBuild = "mkdir -p $out/lib/ocaml/${ocaml.version}/site-lib/stublibs"; + outputs = [ "out" "bin" "dev" ]; + + configurePhase = '' + runHook preConfigure + ./configure -prefix $out + mkdir -p $out/lib/ocaml/${ocaml.version}/site-lib/stublibs + runHook postConfigure + ''; + + postInstall = '' + mkdir -p $dev/lib + mv $out/lib/ocaml $dev/lib/ + mkdir -p $bin + mv $out/bin $bin/ + ''; meta = { license = stdenv.lib.licenses.lgpl21; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/asn1-combinators/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/asn1-combinators/default.nix index 556c749011..ddc181a499 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/asn1-combinators/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/asn1-combinators/default.nix @@ -6,11 +6,13 @@ buildDunePackage rec { minimumOCamlVersion = "4.05"; pname = "asn1-combinators"; - version = "0.2.3"; + version = "0.2.4"; + + useDune2 = true; src = fetchurl { url = "https://github.com/mirleft/ocaml-asn1-combinators/releases/download/v${version}/asn1-combinators-v${version}.tbz"; - sha256 = "1z73hc17f5m2i4bfxw0g94fsri67f8vha812mm8klz4ggs8y7d6r"; + sha256 = "09rn5wwqhwg7x51b9ycl15s7007hgha6lwaz2bpw85fr70jq3i9r"; }; propagatedBuildInputs = [ cstruct zarith bigarray-compat stdlib-shims ptime ]; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/cryptokit/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/cryptokit/default.nix index 69f8445e21..272ff72d8c 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/cryptokit/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/cryptokit/default.nix @@ -1,43 +1,29 @@ -{ stdenv, fetchurl, zlib, ocaml, findlib, ocamlbuild, zarith, ncurses }: +{ lib, buildDunePackage, fetchurl, zlib, dune-configurator, zarith, ncurses }: -assert stdenv.lib.versionAtLeast ocaml.version "3.12"; - -let param = - if stdenv.lib.versionAtLeast ocaml.version "4.02" - then { - version = "1.14"; - url = "https://github.com/xavierleroy/cryptokit/archive/release114.tar.gz"; - sha256 = "0wkh72idkb7dahiwyl94hhbq27cc7x9fnmxkpnbqli6wi8wd7d05"; - inherit zarith; - } else { - version = "1.10"; - url = "http://forge.ocamlcore.org/frs/download.php/1493/cryptokit-1.10.tar.gz"; - sha256 = "1k2f2ixm7jcsgrzn9lz1hm9qqgq71lk9lxy3v3cwsd8xdrj3jrnv"; - zarith = null; - }; -in - -stdenv.mkDerivation { +buildDunePackage { pname = "cryptokit"; - inherit (param) version; + version = "1.16.1"; + + useDune2 = true; src = fetchurl { - inherit (param) url sha256; + url = "https://github.com/xavierleroy/cryptokit/archive/release1161.tar.gz"; + sha256 = "0kzqkk451m69nqi5qiwak0rd0rp5vzi613gcngsiig7dyxwka61c"; }; - buildInputs = [ ocaml findlib ocamlbuild ncurses ]; - propagatedBuildInputs = [ param.zarith zlib ]; + dontConfigure = true; - buildFlags = [ "setup.data" "build" ]; + buildInputs = [ dune-configurator ncurses ]; + propagatedBuildInputs = [ zarith zlib ]; - preBuild = "mkdir -p $out/lib/ocaml/${ocaml.version}/site-lib/stublibs"; + doCheck = true; meta = { homepage = "http://pauillac.inria.fr/~xleroy/software.html"; description = "A library of cryptographic primitives for OCaml"; - platforms = ocaml.meta.platforms or []; + license = lib.licenses.lgpl2Only; maintainers = [ - stdenv.lib.maintainers.maggesi + lib.maintainers.maggesi ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/gsl/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/gsl/default.nix index c292c3d6ab..aebdf4adb2 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/gsl/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/gsl/default.nix @@ -1,6 +1,4 @@ -{ lib, fetchurl, buildDunePackage, pkg-config, gsl -, dune-configurator -}: +{ stdenv, fetchurl, buildDunePackage, pkg-config, gsl, darwin, dune-configurator }: buildDunePackage rec { pname = "gsl"; @@ -14,11 +12,12 @@ buildDunePackage rec { }; buildInputs = [ dune-configurator gsl pkg-config ]; + propagatedBuildInputs = stdenv.lib.optionals stdenv.isDarwin [ darwin.apple_sdk.frameworks.Accelerate ]; - meta = { + meta = with stdenv.lib; { homepage = "https://mmottl.github.io/gsl-ocaml/"; description = "OCaml bindings to the GNU Scientific Library"; - license = lib.licenses.gpl3Plus; - maintainers = [ lib.maintainers.vbgl ]; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ vbgl ]; }; } 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 837504f9a7..25b498bb7d 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/janestreet/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/janestreet/default.nix @@ -529,14 +529,6 @@ rec { meta.description = "Writing Emacs plugin in OCaml"; }; - email_message = janePackage { - pname = "email_message"; - hash = "131jd72k4s8cdbgg6gyg7w5v8mphdlvdx4fgvh8d9a1m7kkvbxfg"; - propagatedBuildInputs = [ async angstrom core_extended cryptokit magic-mime ounit ]; - patches = [ ./email-message-angstrom-0.14.patch ]; - meta.description = "E-mail message parser"; - }; - incremental_kernel = janePackage { version = "0.11.1"; pname = "incremental_kernel"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/janestreet/email-message-angstrom-0.14.patch b/third_party/nixpkgs/pkgs/development/ocaml-modules/janestreet/email-message-angstrom-0.14.patch deleted file mode 100644 index 624a3e5334..0000000000 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/janestreet/email-message-angstrom-0.14.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/email_address/src/email_address.ml b/email_address/src/email_address.ml -index 7470273..d070465 100644 ---- a/email_address/src/email_address.ml -+++ b/email_address/src/email_address.ml -@@ -38,7 +38,7 @@ module Stable = struct - let of_string ?default_domain input_str = - let open Core_kernel in - let open! Int.Replace_polymorphic_compare in -- match Angstrom.parse_string Email_address_parser_stable_v1.email_only input_str with -+ match Angstrom.parse_string ~consume:Prefix Email_address_parser_stable_v1.email_only input_str with - | Error error -> - Or_error.error_s [%message - "Failed to parse email address" -@@ -104,7 +104,7 @@ module T = Stable.V1.With_comparator - include T - - let list_of_string ?default_domain input_str = -- match Angstrom.parse_string Email_address_parser_stable_v1.email_list_only input_str with -+ match Angstrom.parse_string ~consume:Prefix Email_address_parser_stable_v1.email_list_only input_str with - | Error error -> - Or_error.error_s [%message - "Failed to parse email address(es)" diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-channel/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-channel/default.nix new file mode 100644 index 0000000000..5b639e6fdd --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-channel/default.nix @@ -0,0 +1,28 @@ +{ lib, fetchurl, buildDunePackage +, cstruct, logs, lwt, mirage-flow +, alcotest, mirage-flow-combinators +}: + +buildDunePackage rec { + pname = "mirage-channel"; + version = "4.0.1"; + + useDune2 = true; + + src = fetchurl { + url = "https://github.com/mirage/mirage-channel/releases/download/v${version}/mirage-channel-v${version}.tbz"; + sha256 = "0wmb2zhiyp8n78xgcspcsyd19bhcml3kyli2caw3778wc1gyvfpc"; + }; + + propagatedBuildInputs = [ cstruct logs lwt mirage-flow ]; + + doCheck = true; + checkInputs = [ alcotest mirage-flow-combinators ]; + + meta = { + description = "Buffered channels for MirageOS FLOW types"; + license = lib.licenses.isc; + maintainers = [ lib.maintainers.vbgl ]; + homepage = "https://github.com/mirage/mirage-channel"; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-console/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-console/default.nix new file mode 100644 index 0000000000..ccde5c5f2a --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-console/default.nix @@ -0,0 +1,24 @@ +{ lib, fetchurl, buildDunePackage +, lwt, mirage-device, mirage-flow +}: + +buildDunePackage rec { + pname = "mirage-console"; + version = "3.0.2"; + + useDune2 = true; + + src = fetchurl { + url = "https://github.com/mirage/mirage-console/releases/download/v${version}/mirage-console-v${version}.tbz"; + sha256 = "1fygk7pvlmwx6vd0h4cv9935xxhi64k2dgym41wf6qfkxgpp31lm"; + }; + + propagatedBuildInputs = [ lwt mirage-device mirage-flow ]; + + meta = { + description = "Implementations of Mirage console devices"; + homepage = "https://github.com/mirage/mirage-console"; + license = lib.licenses.isc; + maintainers = [ lib.maintainers.vbgl ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-crypto/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-crypto/default.nix index 66da69fee2..f963e8e15d 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-crypto/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-crypto/default.nix @@ -4,11 +4,11 @@ buildDunePackage rec { minimumOCamlVersion = "4.08"; pname = "mirage-crypto"; - version = "0.8.6"; + version = "0.8.7"; src = fetchurl { url = "https://github.com/mirage/mirage-crypto/releases/download/v${version}/mirage-crypto-v${version}.tbz"; - sha256 = "1fghg89lpm1iks6nk1jhqcimpvb52jih0ys9bxbn2f343l0njbkq"; + sha256 = "1gx86h6kk39zq3kvl854jc2ap2755paalp1f7iv8r9js2xnbxfxy"; }; useDune2 = true; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-logs/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-logs/default.nix new file mode 100644 index 0000000000..2a7670ce37 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/mirage-logs/default.nix @@ -0,0 +1,28 @@ +{ lib, fetchurl, buildDunePackage +, logs, lwt, mirage-clock, mirage-profile, ptime +, alcotest +}: + +buildDunePackage rec { + pname = "mirage-logs"; + version = "1.2.0"; + + useDune2 = true; + + src = fetchurl { + url = "https://github.com/mirage/mirage-logs/releases/download/v${version}/mirage-logs-v${version}.tbz"; + sha256 = "0h0amzjxy067jljscib7fvw5q8k0adqa8m86affha9hq5jsh07a1"; + }; + + propagatedBuildInputs = [ logs lwt mirage-clock mirage-profile ptime ]; + + doCheck = true; + checkInputs = [ alcotest ]; + + meta = { + description = "A reporter for the Logs library that writes log messages to stderr, using a Mirage `CLOCK` to add timestamps"; + homepage = "https://github.com/mirage/mirage-logs"; + license = lib.licenses.isc; + maintainers = [ lib.maintainers.vbgl ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/owl-base/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/owl-base/default.nix index 3e1eb09faa..7a454e9ef4 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/owl-base/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/owl-base/default.nix @@ -1,23 +1,19 @@ -{ stdenv, buildDunePackage, fetchFromGitHub, stdlib-shims }: +{ lib, buildDunePackage, fetchurl }: buildDunePackage rec { pname = "owl-base"; - version = "0.9.0"; + version = "0.10.0"; useDune2 = true; - src = fetchFromGitHub { - owner = "owlbarn"; - repo = "owl"; - rev = version; - sha256 = "0xxchsymmdbwszs6barqq8x4vqz5hbap64yxq82c2la9sdxgk0vv"; + src = fetchurl { + url = "https://github.com/owlbarn/owl/releases/download/${version}/owl-${version}.tbz"; + sha256 = "148ny2cdzga1l36kcibvlz5xlyi5zvkywifxaqn8lf79n1swmlzf"; }; - propagatedBuildInputs = [ stdlib-shims ]; - minimumOCamlVersion = "4.10"; - meta = with stdenv.lib; { + meta = with lib; { description = "Numerical computing library for Ocaml"; homepage = "https://ocaml.xyz"; changelog = "https://github.com/owlbarn/owl/releases"; diff --git a/third_party/nixpkgs/pkgs/development/ocaml-modules/tls/default.nix b/third_party/nixpkgs/pkgs/development/ocaml-modules/tls/default.nix index b52561d760..375c2de27e 100644 --- a/third_party/nixpkgs/pkgs/development/ocaml-modules/tls/default.nix +++ b/third_party/nixpkgs/pkgs/development/ocaml-modules/tls/default.nix @@ -6,12 +6,12 @@ buildDunePackage rec { minimumOCamlVersion = "4.08"; - version = "0.12.5"; + version = "0.12.6"; pname = "tls"; src = fetchurl { url = "https://github.com/mirleft/ocaml-tls/releases/download/v${version}/tls-v${version}.tbz"; - sha256 = "1zsh3fx8l3d9lc9w516apzabqsix2ss8nv6kbbzjmp2d4hwh818b"; + sha256 = "14b2289nhb65qm8wrw51y8qgz5ysn8hcbrj5plznd1pdzl46zxc9"; }; useDune2 = true; diff --git a/third_party/nixpkgs/pkgs/development/php-packages/composer/2.0.nix b/third_party/nixpkgs/pkgs/development/php-packages/composer/2.0.nix index 8321681de5..858884628d 100644 --- a/third_party/nixpkgs/pkgs/development/php-packages/composer/2.0.nix +++ b/third_party/nixpkgs/pkgs/development/php-packages/composer/2.0.nix @@ -1,14 +1,14 @@ { mkDerivation, fetchurl, pkgs, lib, php }: let pname = "composer"; - version = "2.0.0"; + version = "2.0.4"; in mkDerivation { inherit pname version; src = fetchurl { url = "https://getcomposer.org/download/${version}/composer.phar"; - sha256 = "11fjplbrscnw0fs5hmw4bmszg5a87ig189175407i1ip5fm5g5hk"; + sha256 = "03bnaifywh8pmpzl0b8r3rm3radj0rz176vzkz327j99fi3vrcn3"; }; dontUnpack = true; diff --git a/third_party/nixpkgs/pkgs/development/php-packages/event/default.nix b/third_party/nixpkgs/pkgs/development/php-packages/event/default.nix index 47b99234fa..56bc4209c6 100644 --- a/third_party/nixpkgs/pkgs/development/php-packages/event/default.nix +++ b/third_party/nixpkgs/pkgs/development/php-packages/event/default.nix @@ -2,8 +2,8 @@ buildPecl { pname = "event"; - version = "2.5.7"; - sha256 = "0jkzcm5mmbg101jc7p3aws9qb6l6xbxkfff82mrf7s5fn7xd44im"; + version = "3.0.0"; + sha256 = "1k35qwcf4qz8617b4riy7bp0vna1j3ds0k9j52hlm7qrhww2yxqn"; configureFlags = [ "--with-event-libevent-dir=${pkgs.libevent.dev}" diff --git a/third_party/nixpkgs/pkgs/development/php-packages/php-cs-fixer/default.nix b/third_party/nixpkgs/pkgs/development/php-packages/php-cs-fixer/default.nix index 48d45cc4ea..de8e17f8f2 100644 --- a/third_party/nixpkgs/pkgs/development/php-packages/php-cs-fixer/default.nix +++ b/third_party/nixpkgs/pkgs/development/php-packages/php-cs-fixer/default.nix @@ -1,14 +1,14 @@ { mkDerivation, fetchurl, pkgs, lib, php }: let pname = "php-cs-fixer"; - version = "2.16.4"; + version = "2.16.7"; in mkDerivation { inherit pname version; src = fetchurl { url = "https://github.com/FriendsOfPHP/PHP-CS-Fixer/releases/download/v${version}/php-cs-fixer.phar"; - sha256 = "05rdvypxc86hjs8b7id2csa7g1rf7dk2swzfvd5768abdgfasvr8"; + sha256 = "1azivqvgqy224g2ch9v9qgi31w4ml7fph3bsk8c304yvbvvfv5nh"; }; phases = [ "installPhase" ]; diff --git a/third_party/nixpkgs/pkgs/development/php-packages/phpstan/default.nix b/third_party/nixpkgs/pkgs/development/php-packages/phpstan/default.nix index ef17aa9f98..ddc8516742 100644 --- a/third_party/nixpkgs/pkgs/development/php-packages/phpstan/default.nix +++ b/third_party/nixpkgs/pkgs/development/php-packages/phpstan/default.nix @@ -1,14 +1,14 @@ { mkDerivation, fetchurl, pkgs, lib, php }: let pname = "phpstan"; - version = "0.12.51"; + version = "0.12.52"; in mkDerivation { inherit pname version; src = pkgs.fetchurl { url = "https://github.com/phpstan/phpstan/releases/download/${version}/phpstan.phar"; - sha256 = "0pfy14c0r64hdzlq5x1w225za2566s8vhh4hnfasmfh52s7v77p4"; + sha256 = "0zhbpcja7fyhqi2p8mky7v3dv50dgi4yxpj2hvmxs61kp9irf0nb"; }; phases = [ "installPhase" ]; diff --git a/third_party/nixpkgs/pkgs/development/php-packages/psalm/default.nix b/third_party/nixpkgs/pkgs/development/php-packages/psalm/default.nix index d36640e109..07a9392b25 100644 --- a/third_party/nixpkgs/pkgs/development/php-packages/psalm/default.nix +++ b/third_party/nixpkgs/pkgs/development/php-packages/psalm/default.nix @@ -1,14 +1,14 @@ { mkDerivation, fetchurl, pkgs, lib, php }: let pname = "psalm"; - version = "3.11.2"; + version = "4.1.0"; in mkDerivation { inherit pname version; src = fetchurl { url = "https://github.com/vimeo/psalm/releases/download/${version}/psalm.phar"; - sha256 = "1ani0907whqy2ycr01sjlvrmwps4dg5igim8z1qyv8grhwvw6gb0"; + sha256 = "1mpbw9q0fgh6vdfwsm222fz1vi9jrw6l5k1mz4gyv5kxvbyzmn4c"; }; phases = [ "installPhase" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/aioresponses/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/aioresponses/default.nix index 7b12cefc8c..6a0d69371a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/aioresponses/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/aioresponses/default.nix @@ -11,12 +11,12 @@ buildPythonPackage rec { pname = "aioresponses"; - version = "0.6.4"; + version = "0.7.1"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "4397ca736238a1ada8c7f47e557dda05e9ecfdd467b9f6b83871efd365af7e9f"; + sha256 = "f65bba2be1e9a4997ee166bc0161a50be0fef7350ad09e6afdb2adccf74dfefe"; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/arrow/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/arrow/default.nix index bc3de37526..7dbe3b98fc 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/arrow/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/arrow/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "arrow"; - version = "0.15.8"; + version = "0.17.0"; src = fetchPypi { inherit pname version; - sha256 = "edc31dc051db12c95da9bac0271cd1027b8e36912daf6d4580af53b23e62721a"; + sha256 = "ff08d10cda1d36c68657d6ad20d74fbea493d980f8b2d45344e00d6ed2bf6ed4"; }; propagatedBuildInputs = [ python-dateutil ] diff --git a/third_party/nixpkgs/pkgs/development/python-modules/authlib/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/authlib/default.nix index 94fc7215c3..e3d8c99e0e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/authlib/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/authlib/default.nix @@ -8,14 +8,14 @@ }: buildPythonPackage rec { - version = "0.15.1"; + version = "0.15.2"; pname = "authlib"; src = fetchFromGitHub { owner = "lepture"; repo = "authlib"; rev = "v${version}"; - sha256 = "0jh4kdi5spzhmgvq3ffz2q467hjycz3wg97f7n53rffiwd86jrh5"; + sha256 = "0jsqh2nirx3xifsakqdpd3wpdig6czavv3yj4lyqz3wh9xjpvswg"; }; propagatedBuildInputs = [ cryptography requests ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-appconfiguration/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-appconfiguration/default.nix index bea5fc4adc..5626b33462 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-appconfiguration/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-appconfiguration/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "azure-appconfiguration"; - version = "1.1.0"; + version = "1.1.1"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "0mv053vl88nzpv701gnjdmbylc8qm0kkq87264rfhvrx3ydymf97"; + sha256 = "b83cd2cb63d93225de84e27abbfc059212f8de27766f4c58dd3abb839dff0be4"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-core/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-core/default.nix index dfe3468594..16fc468d04 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-core/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-core/default.nix @@ -14,14 +14,14 @@ }: buildPythonPackage rec { - version = "1.8.1"; + version = "1.8.2"; pname = "azure-core"; disabled = isPy27; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "7efbeac3a6dfb634cb5323bc04e18ab609aeab6b03610808091aa0517373d626"; + sha256 = "621b53271f7988b766f8a7d7f7a2c44241e3d2c1d8db13e68089d6da6241748e"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-datalake-store/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-datalake-store/default.nix index fc9b98eae0..d7164affd9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-datalake-store/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-datalake-store/default.nix @@ -11,11 +11,11 @@ buildPythonPackage rec { pname = "azure-datalake-store"; - version = "0.0.50"; + version = "0.0.51"; src = fetchPypi { inherit pname version; - sha256 = "9b9b58dcf1d0d0e5aa499d5cb49dcf8f5432ca467a747b39167bb70ef901dbc2"; + sha256 = "b871ebb3bcfd292e8a062dbbaacbc132793d98f1b60f549a8c3b672619603fc1"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-identity/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-identity/default.nix index f607ab7a09..4cea19742b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-identity/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-identity/default.nix @@ -17,13 +17,13 @@ buildPythonPackage rec { pname = "azure-identity"; - version = "1.4.0"; + version = "1.4.1"; disabled = isPy38; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "820e1f3e21f90d36063239c6cb7ca9a6bb644cb120a6b1ead3081cafdf6ceaf8"; + sha256 = "7b071089faf0789059ac24052e311e2b096a002c173d42b96896db09c6e2ba5d"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-billing/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-billing/default.nix index 6e9656950d..9aeaf50ce4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-billing/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-billing/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "azure-mgmt-billing"; - version = "0.2.0"; #pypi's 0.2.0 doesn't build ootb + version = "1.0.0"; #pypi's 0.2.0 doesn't build ootb src = fetchPypi { inherit pname version; - sha256 = "1li2bcdwdapwwx7xbvgfsq51f2mrwm0qyzih8cjhszcah2rkpxw5"; + sha256 = "8b55064546c8e94839d9f8c98e9ea4b021004b3804e192bf39fa65b603536ad0"; extension = "zip"; }; @@ -25,7 +25,7 @@ buildPythonPackage rec { ]; preBuild = '' - rm azure_bdist_wheel.py + rm -rf azure_bdist_wheel.py substituteInPlace setup.cfg \ --replace "azure-namespace-package = azure-mgmt-nspkg" "" ''; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-cognitiveservices/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-cognitiveservices/default.nix index 98ca58e434..f6ee7fce52 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-cognitiveservices/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-cognitiveservices/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "azure-mgmt-cognitiveservices"; - version = "6.2.0"; + version = "6.3.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "93503507ba87c18fe24cd3dfcd54e6e69a4daf7636f38b7537e09cee9a4c13ce"; + sha256 = "1d029d5140152a36cc32f340e09f2b185ede2f54e577a44f3821878efb823415"; }; propagatedBuildInputs = [ 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 d500ba0df8..9bc7207e1e 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 @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "azure-mgmt-containerservice"; - version = "9.4.0"; + version = "10.0.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "d90684106c70779450b82067be4d3e449c799ca1f47d941e45f6d2b5c016dac9"; + sha256 = "9b44b2d0b281fc1999324a715fb5cf4f47d392a35bc0a01f24bb8dbc4c123acd"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-core/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-core/default.nix index 17e7796b98..e7e8c91acc 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-core/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-core/default.nix @@ -7,13 +7,13 @@ }: buildPythonPackage rec { - version = "1.2.0"; + version = "1.2.1"; pname = "azure-mgmt-core"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "8fe3b59446438f27e34f7b24ea692a982034d9e734617ca1320eedeee1939998"; + sha256 = "a3906fa77edfedfcc3229dc3b69489d5ed63b107c7eacbc50092e6cbfbfd83f0"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-datafactory/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-datafactory/default.nix index e164dbd8f9..2601f829d9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-datafactory/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-datafactory/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "azure-mgmt-datafactory"; - version = "0.13.0"; + version = "0.14.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "3eabe34f49587840617747511a0aa25d08b0c1619677a1fdda24ce9e6b0f2c74"; + sha256 = "47bb23fa6cc28f3f15dd7a404b7f9d7af469adf78f79a11eb01ff75ca10a75ba"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-hdinsight/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-hdinsight/default.nix index b6f0dadf22..08b9e73e66 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-hdinsight/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-hdinsight/default.nix @@ -5,13 +5,13 @@ }: buildPythonPackage rec { - version = "1.7.0"; + version = "2.0.0"; pname = "azure-mgmt-hdinsight"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "9d1120bd9760687d87594ec5ce9257b7335504afbe55b3cda79462c1e07a095b"; + sha256 = "fd47029f2423e45ec4d311f651dc972043b98e960f186f5c6508c6fdf6eb2fe8"; extension = "zip"; }; 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 018d7140a3..75d1159857 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 = "2.2.0"; + version = "3.0.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "0adeee9e654a9011f5107def06fea6838864a3514a1e5a9ed495f3a56a687cc7"; + sha256 = "8944775725c5253614d257576d841ee68afa34f570b05c0924a7f73f1db28a24"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-search/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-search/default.nix index 936a1b4269..6f0fd6f3b3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-search/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-search/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "azure-mgmt-search"; - version = "2.1.0"; + version = "3.0.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "0085c7qi9z1ayxd8683ck79nfnldkrwl481hzav84flyg8d0m94j"; + sha256 = "d4c78b14b48edd2e27e2068c9a448acfc84a18595be77fe483afe7bb447e1eb6"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-security/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-security/default.nix index 90a64ff098..5c437e472d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-security/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-security/default.nix @@ -5,13 +5,13 @@ }: buildPythonPackage rec { - version = "0.4.1"; + version = "0.5.0"; pname = "azure-mgmt-security"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "08gf401d40bd1kn9wmpxcjxqdh84cd9hxm8rdjd0918483sqs71r"; + sha256 = "c0d232cdb5ad74f4590db2e44df74c0872fcb9fded7f03c7b57188a63b54ecfa"; extension = "zip"; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-servicebus/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-servicebus/default.nix index 72c363b3e6..e192a8f9d3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-servicebus/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-servicebus/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "azure-mgmt-servicebus"; - version = "0.6.0"; + version = "1.0.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "f20920b8fb119ef4abeda4d2dac765a4fc48cd0bcf30c27f8c4cc6d890bc08b1"; + sha256 = "bb37d97eb3798740a0bc1bfa37b04946a193a6d1a3b0849fdc5e1dc2a9f25d81"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-sql/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-sql/default.nix index dd80641a48..36432ccbc8 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-sql/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-mgmt-sql/default.nix @@ -10,12 +10,12 @@ buildPythonPackage rec { pname = "azure-mgmt-sql"; - version = "0.22.0"; + version = "0.23.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "01c82a1559f49e5f51021b8fbd35e738e08cbede1f39cf00da8085c853575f39"; + sha256 = "acf7d4c83fb43152a809e3894528e561e601be543250c2824cc615cc88a70855"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/azure-servicefabric/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/azure-servicefabric/default.nix index ad89f23c3c..f34d3d62ba 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/azure-servicefabric/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-servicefabric/default.nix @@ -7,12 +7,12 @@ buildPythonPackage rec { pname = "azure-servicefabric"; - version = "7.1.0.45"; + version = "7.2.0.46"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "8dd0eb419ca62f2436c31982f6d236868f15f65bb062c4e5a98e50b16298dcda"; + sha256 = "c15fd5e8fe33a12295435f16e007edcfd8f660547795742f9b74ef8fb3a431ba"; }; propagatedBuildInputs = [ 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 new file mode 100644 index 0000000000..85ec70f704 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/azure-synapse-artifacts/default.nix @@ -0,0 +1,31 @@ +{ lib, buildPythonPackage, fetchPypi +, azure-common +, azure-core +, msrest +}: + +buildPythonPackage rec { + pname = "azure-synapse-artifacts"; + version = "0.3.0"; + + src = fetchPypi { + inherit pname version; + extension = "zip"; + sha256 = "0p43zmw96fh3wp75phf3fcqdfb36adqvxfc945yfda6fi555nw1a"; + }; + + propagatedBuildInputs = [ + azure-common + azure-core + msrest + ]; + + pythonImportsCheck = [ "azure.synapse.artifacts" ]; + + meta = with lib; { + description = "CHANGE"; + homepage = "https://github.com/CHANGE/azure-synapse-artifacts/"; + license = licenses.mit; + maintainers = with maintainers; [ jonringer ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/batchspawner/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/batchspawner/default.nix index ebf24fb9d7..29109a2e09 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/batchspawner/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/batchspawner/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { # tests require a job scheduler e.g. slurm, pbs, etc. doCheck = false; - pythonImportCheck = [ "batchspawner" ]; + pythonImportsCheck = [ "batchspawner" ]; meta = with lib; { description = "A spawner for Jupyterhub to spawn notebooks using batch resource managers"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/bitarray/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/bitarray/default.nix index 1e995af392..fe4e442e30 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/bitarray/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/bitarray/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "bitarray"; - version = "1.5.3"; + version = "1.6.0"; src = fetchPypi { inherit pname version; - sha256 = "567631fc922b1c2c528c376795f18dcc0604d18702e0b8b50e8e35f0474214a5"; + sha256 = "ba157ddebddc723fe021fc80595b3c70924d69ee58286b62bfca21da48edfc9d"; }; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/blis/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/blis/default.nix index 5d4b9bcb5e..1d6d7806b9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/blis/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/blis/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "blis"; - version = "0.7.1"; + version = "0.7.2"; src = fetchPypi { inherit pname version; - sha256 = "014771a0f753a64ef5610c5b3d4a090b263073bdd59b8ad0d872ce1e06e7315a"; + sha256 = "c14fb9ec3f5ed7c4940c132c7691469ac5d3e302891d95e935623bf1d4e17fbb"; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/breathe/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/breathe/default.nix index fe7a2a713c..9c8440b9f7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/breathe/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/breathe/default.nix @@ -1,13 +1,13 @@ { lib, fetchPypi, buildPythonPackage, docutils, six, sphinx, isPy3k, isPy27 }: buildPythonPackage rec { - version = "4.22.1"; + version = "4.23.0"; pname = "breathe"; disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "6e4b66e61876dac90e78b335788a38eaa3625ed9c70d0add261f98ddd128d36a"; + sha256 = "c28e251ad8a42e4d3dd6c0861a66128b400131614b36f19df505ea34c934f801"; }; propagatedBuildInputs = [ docutils six sphinx ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/btchip/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/btchip/default.nix index 7370d3db7d..c84ee0f0be 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/btchip/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/btchip/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "btchip-python"; - version = "0.1.30"; + version = "0.1.31"; src = fetchPypi { inherit pname version; - sha256 = "1mraf2lmh70b038k934adxi7d40431j7yq93my3aws99f5xccsb8"; + sha256 = "4167f3c6ea832dd189d447d0d7a8c2a968027671ae6f43c680192f2b72c39b2c"; }; propagatedBuildInputs = [ hidapi pyscard ecdsa ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/caldav/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/caldav/default.nix index 57dffe89fc..3888bb7ec6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/caldav/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/caldav/default.nix @@ -15,13 +15,13 @@ buildPythonPackage rec { pname = "caldav"; - version = "0.7.0"; + version = "0.7.1"; src = fetchFromGitHub { owner = "python-caldav"; repo = pname; rev = "v${version}"; - sha256 = "0m64maiqp3k8fsgkkvdx1dlfhkc70pqig4dclq6w8ajz82czrq83"; + sha256 = "1shfj67kq6qzd0ngyfk09hpzfggybcfxv5s7hqs87nq9l51bssv8"; }; nativeBuildInputs = lib.optionals (pythonOlder "3.5") [ mock ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cbor2/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cbor2/default.nix index 4ee4b8ecb6..08503297d1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cbor2/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cbor2/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "cbor2"; - version = "5.1.2"; + version = "5.2.0"; src = fetchPypi { inherit pname version; - sha256 = "91759bd0ee5ef0d4fa24144dfa551670730baeca8cf2fff1cc59f734ecd21de6"; + sha256 = "a33aa2e5534fd74401ac95686886e655e3b2ce6383b3f958199b6e70a87c94bf"; }; nativeBuildInputs = [ setuptools_scm ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/credstash/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/credstash/default.nix index 1abd3f4ed2..1f9b4b28f2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/credstash/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/credstash/default.nix @@ -1,6 +1,4 @@ -{ stdenv, buildPythonPackage, fetchPypi, cryptography, boto3, pyyaml, docutils, nose -, fetchpatch -}: +{ stdenv, buildPythonPackage, fetchPypi, cryptography, boto3, pyyaml, docutils, pytest, fetchpatch }: buildPythonPackage rec { pname = "credstash"; @@ -25,7 +23,7 @@ buildPythonPackage rec { # file ensures that Python imports the module from site-packages library. postInstall = "rm $out/bin/credstash.py"; - nativeBuildInputs = [ nose ]; + nativeBuildInputs = [ pytest ]; propagatedBuildInputs = [ cryptography boto3 pyyaml docutils ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/crytic-compile/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/crytic-compile/default.nix new file mode 100644 index 0000000000..e6f82c6d8a --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/crytic-compile/default.nix @@ -0,0 +1,26 @@ +{ lib, buildPythonPackage, fetchFromGitHub, pythonOlder, pysha3 }: + +buildPythonPackage rec { + pname = "crytic-compile"; + version = "0.1.9"; + + disabled = pythonOlder "3.6"; + + src = fetchFromGitHub { + owner = "crytic"; + repo = "crytic-compile"; + rev = version; + sha256 = "01mis7bqsh0l5vjl6jwibzy99djza35fxmywy56q8k4jbxwmdcna"; + }; + + propagatedBuildInputs = [ pysha3 ]; + + doCheck = false; + + meta = with lib; { + description = "Abstraction layer for smart contract build systems"; + homepage = "https://github.com/crytic/crytic-compile"; + license = licenses.agpl3; + maintainers = with maintainers; [ SuperSandro2000 ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cssselect2/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cssselect2/default.nix index 5eb65ce2fc..eadc3eb32b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cssselect2/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cssselect2/default.nix @@ -12,12 +12,12 @@ buildPythonPackage rec { pname = "cssselect2"; - version = "0.3.0"; + version = "0.4.1"; disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "5c2716f06b5de93f701d5755a9666f2ee22cbcd8b4da8adddfc30095ffea3abc"; + sha256 = "93fbb9af860e95dd40bf18c3b2b6ed99189a07c0f29ba76f9c5be71344664ec8"; }; propagatedBuildInputs = [ tinycss2 ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cupy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cupy/default.nix index 2bbd20a16d..5c9a5b76d1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cupy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cupy/default.nix @@ -6,11 +6,12 @@ buildPythonPackage rec { pname = "cupy"; - version = "7.7.0"; + version = "8.1.0"; + disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "b4032adf839f63bab7fc9f3e7066ef86abe0928e834aa5d132e4e7ce907951ed"; + sha256 = "4dfa4a0cd0a752d980347c816cab2169f0938c1d37275311810396dcf3c27912"; }; checkInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/distro/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/distro/default.nix index cee4e6deb3..baaf54dd06 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/distro/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/distro/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { # tests are very targeted at individual linux distributions doCheck = false; - pythonImportcheck = [ "distro" ]; + pythonImportsCheck = [ "distro" ]; meta = with stdenv.lib; { homepage = "https://github.com/nir0s/distro"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/django_modelcluster/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/django_modelcluster/default.nix index 4ded69bc32..e41b455cd4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/django_modelcluster/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/django_modelcluster/default.nix @@ -8,11 +8,11 @@ buildPythonPackage rec { pname = "django-modelcluster"; - version = "5.0.2"; + version = "5.1"; src = fetchPypi { inherit pname version; - sha256 = "c7a42cf9b93d1161a10bf59919f7ee52d996a523a4134b2a136f6fe1eba7a2fa"; + sha256 = "783d177f7bf5c8f30fe365c347b9a032920de371fe1c63d955d7b283684d4c08"; }; disabled = pythonOlder "3.5"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dockerspawner/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dockerspawner/default.nix index 6dba529ef9..192fb94bd4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/dockerspawner/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/dockerspawner/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { # tests require docker doCheck = false; - pythonImportCheck = [ "dockerspawner" ]; + pythonImportsCheck = [ "dockerspawner" ]; meta = with lib; { description = "Dockerspawner: A custom spawner for Jupyterhub"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dotnetcore2/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/dotnetcore2/default.nix deleted file mode 100644 index 7cc069707a..0000000000 --- a/third_party/nixpkgs/pkgs/development/python-modules/dotnetcore2/default.nix +++ /dev/null @@ -1,59 +0,0 @@ -{ stdenv, lib, buildPythonPackage, fetchPypi, python, isPy27 -, dotnet-sdk -, substituteAll -, distro -, unzip -}: - -buildPythonPackage rec { - pname = "dotnetcore2"; - version = "2.1.14"; - format = "wheel"; - disabled = isPy27; - - src = fetchPypi { - inherit pname version format; - python = "py3"; - platform = "manylinux1_x86_64"; - sha256 = "0dxp9a73ncjylc09bjwq81fgj5ysk1yi27l8ka5f98121k1kmn6q"; - }; - - nativeBuildInputs = [ unzip ]; - - propagatedBuildInputs = [ distro ]; - - # needed to apply patches - prePatch = '' - unzip dist/dotnet* - ''; - - patches = [ - ( substituteAll { - src = ./runtime.patch; - dotnet = dotnet-sdk; - } - ) - ]; - - # remove bin, which has a broken dotnetcore installation - installPhase = '' - rm -rf dotnetcore2/bin - mkdir -p $out/${python.sitePackages}/ - cp -r dotnetcore2 $out/${python.sitePackages}/ - ''; - - # no tests, ensure it's one useful function works - checkPhase = '' - rm -r dotnetcore2 # avoid importing local directory - export PYTHONPATH=$out/${python.sitePackages}:$PYTHONPATH - ${python.interpreter} -c 'from dotnetcore2 import runtime; print(runtime.get_runtime_path()); runtime.ensure_dependencies()' - ''; - - meta = with lib; { - description = "DotNet Core runtime"; - homepage = "https://github.com/dotnet/core"; - license = licenses.mit; - platforms = [ "x86_64-linux" ]; - maintainers = with maintainers; [ jonringer ]; - }; -} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/dotnetcore2/runtime.patch b/third_party/nixpkgs/pkgs/development/python-modules/dotnetcore2/runtime.patch deleted file mode 100644 index 28cf10e21d..0000000000 --- a/third_party/nixpkgs/pkgs/development/python-modules/dotnetcore2/runtime.patch +++ /dev/null @@ -1,22 +0,0 @@ -diff --git a/dotnetcore2/runtime.py b/dotnetcore2/runtime.py -index 475e2b4..5b578ec 100644 ---- a/dotnetcore2/runtime.py -+++ b/dotnetcore2/runtime.py -@@ -41,6 +41,7 @@ def _get_bin_folder() -> str: - - - def get_runtime_path(): -+ return "@dotnet@/dotnet" - search_string = os.path.join(_get_bin_folder(), 'dotnet*') - matches = [f for f in glob.glob(search_string, recursive=True)] - return matches[0] -@@ -96,8 +97,7 @@ class _FileLock(): - - - def ensure_dependencies() -> Optional[str]: -- if dist is None: -- return None -+ return None - - bin_folder = _get_bin_folder() - deps_path = os.path.join(bin_folder, 'deps') 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 53324f94c8..9b9597c98b 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.0.3"; + version = "2.0.4"; pname = "elementpath"; disabled = isPy27; # uses incompatible class syntax @@ -9,7 +9,7 @@ buildPythonPackage rec { owner = "sissaschool"; repo = "elementpath"; rev = "v${version}"; - sha256 = "16gs5glnlr4i41xbmd30x62zj85apmf69m9akvfnka0gkjlzv8in"; + sha256 = "0812il5xn7cq0qa0vmkszrvprakfpyxmilk7s918l9kavdy4al8x"; }; # avoid circular dependency with xmlschema which directly depends on this diff --git a/third_party/nixpkgs/pkgs/development/python-modules/exifread/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/exifread/default.nix index f626550558..3c7b814a3c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/exifread/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/exifread/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "ExifRead"; - version = "2.3.1"; + version = "2.3.2"; src = fetchPypi { inherit pname version; - sha256 = "269ff3a8eab8e082734a076182cce6fb126116619c0b7c2009bea34502cca213"; + sha256 = "a0f74af5040168d3883bbc980efe26d06c89f026dc86ba28eb34107662d51766"; }; meta = with stdenv.lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/flask-compress/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/flask-compress/default.nix index cf9abdc596..fe55705bb5 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/flask-compress/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/flask-compress/default.nix @@ -3,12 +3,12 @@ }: buildPythonPackage rec { - version = "1.5.0"; + version = "1.8.0"; pname = "Flask-Compress"; src = fetchPypi { inherit pname version; - sha256 = "f367b2b46003dd62be34f7fb1379938032656dca56377a9bc90e7188e4289a7c"; + sha256 = "c132590e7c948877a96d675c13cbfa64edec0faafa2381678dea6f36aa49a552"; }; propagatedBuildInputs = [ flask brotli ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-iam/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-iam/default.nix new file mode 100644 index 0000000000..9d61206293 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/google-cloud-iam/default.nix @@ -0,0 +1,22 @@ +{ lib, buildPythonPackage, fetchPypi, pytestCheckHook, pythonOlder +, google_api_core, libcst, mock, proto-plus, pytest-asyncio }: + +buildPythonPackage rec { + pname = "google-cloud-iam"; + version = "2.0.0"; + + src = fetchPypi { + inherit pname version; + sha256 = "1zxsx5avs8njiyw32zvsx2yblmmiwxy771x334hbgmy0aqms4lak"; + }; + + propagatedBuildInputs = [ google_api_core libcst proto-plus ]; + checkInputs = [ mock pytestCheckHook pytest-asyncio ]; + + meta = with lib; { + description = "Google Cloud IAM API client library"; + homepage = "https://github.com/googleapis/python-iam"; + license = licenses.asl20; + maintainers = with maintainers; [ austinbutler ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google_api_core/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google_api_core/default.nix index a72f68c19f..40c8001008 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google_api_core/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google_api_core/default.nix @@ -1,32 +1,27 @@ -{ lib, buildPythonPackage, fetchPypi, pythonOlder, isPy27 -, google_auth, protobuf, googleapis_common_protos, requests, setuptools, grpcio -, mock -}: +{ lib, buildPythonPackage, fetchPypi, pythonOlder, google_auth, protobuf +, googleapis_common_protos, requests, grpcio, mock, pytest, pytest-asyncio, pytestCheckHook }: buildPythonPackage rec { pname = "google-api-core"; - version = "1.22.1"; - disabled = isPy27; # google namespace no longer works on python2 + version = "1.22.4"; + disabled = pythonOlder "3.5"; src = fetchPypi { inherit pname version; - sha256 = "35cba563034d668ae90ffe1f03193a84e745b38f09592f60258358b5e5ee6238"; + sha256 = "06pck3hwl1pks26q843hv6pxchby9viab05mxf72k7ksab17m7aa"; }; - propagatedBuildInputs = [ - googleapis_common_protos protobuf - google_auth requests setuptools grpcio - ]; + propagatedBuildInputs = + [ googleapis_common_protos protobuf google_auth requests grpcio ]; - # requires nox - doCheck = false; - checkInputs = [ mock ]; + checkInputs = [ google_auth mock protobuf pytest-asyncio pytestCheckHook ]; - pythonImportsCheck = [ - "google.auth" - "google.protobuf" - "google.api" - ]; + # prevent google directory from shadowing google imports + preCheck = '' + rm -r google + ''; + + pythonImportsCheck = [ "google.auth" "google.protobuf" "google.api" ]; meta = with lib; { description = "Core Library for Google Client Libraries"; @@ -35,7 +30,8 @@ buildPythonPackage rec { helpers used by all Google API clients. ''; homepage = "https://github.com/googleapis/python-api-core"; - changelog = "https://github.com/googleapis/python-api-core/blob/v${version}/CHANGELOG.md"; + changelog = + "https://github.com/googleapis/python-api-core/blob/v${version}/CHANGELOG.md"; license = licenses.asl20; maintainers = with maintainers; [ ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google_auth/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google_auth/default.nix index 59ed94d348..3f201aee23 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google_auth/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google_auth/default.nix @@ -1,29 +1,19 @@ -{ stdenv, buildPythonPackage, fetchpatch, fetchPypi -, cachetools -, flask -, freezegun -, mock -, oauth2client -, pyasn1-modules -, pytest -, pytest-localserver -, requests -, responses -, rsa -, setuptools -, six -, urllib3 -}: +{ stdenv, buildPythonPackage, fetchpatch, fetchPypi, pythonOlder +, pytestCheckHook, cachetools, flask, freezegun, mock, oauth2client +, pyasn1-modules, pytest, pytest-localserver, requests, responses, rsa +, setuptools, six, urllib3 }: buildPythonPackage rec { pname = "google-auth"; - version = "1.20.1"; + version = "1.22.1"; src = fetchPypi { inherit pname version; - sha256 = "2f34dd810090d0d4c9d5787c4ad7b4413d1fbfb941e13682c7a2298d3b6cdcc8"; + sha256 = "1fs448jcx2cbpk0nq3picndfryjsakmd9allggvh7mrqjiw723ww"; }; + disabled = pythonOlder "3.5"; + propagatedBuildInputs = [ six pyasn1-modules cachetools rsa setuptools ]; checkInputs = [ @@ -31,17 +21,13 @@ buildPythonPackage rec { freezegun mock oauth2client - pytest + pytestCheckHook pytest-localserver requests responses urllib3 ]; - checkPhase = '' - py.test - ''; - meta = with stdenv.lib; { description = "Google Auth Python Library"; longDescription = '' @@ -49,7 +35,8 @@ buildPythonPackage rec { authentication mechanisms to access Google APIs. ''; homepage = "https://github.com/googleapis/google-auth-library-python"; - changelog = "https://github.com/googleapis/google-auth-library-python/blob/v${version}/CHANGELOG.md"; + changelog = + "https://github.com/googleapis/google-auth-library-python/blob/v${version}/CHANGELOG.md"; # Documentation: https://googleapis.dev/python/google-auth/latest/index.html license = licenses.asl20; maintainers = with maintainers; [ ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google_cloud_automl/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google_cloud_automl/default.nix index 43ffdc7a70..8ed42aeed2 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google_cloud_automl/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google_cloud_automl/default.nix @@ -1,34 +1,38 @@ -{ stdenv -, buildPythonPackage -, fetchPypi -, enum34 -, google_api_core -, google_cloud_storage -, pandas -, pytest -, mock -}: +{ stdenv, buildPythonPackage, fetchPypi, pythonOlder, pytestCheckHook, libcst +, google_api_core, google_cloud_storage, google_cloud_testutils, pandas +, proto-plus, pytest-asyncio, mock }: buildPythonPackage rec { pname = "google-cloud-automl"; - version = "1.0.1"; + version = "2.0.0"; src = fetchPypi { inherit pname version; - sha256 = "f08abe78d37fb94a3748aa43e66dae2bad52f991cc7740501a341bc6f6387fd5"; + sha256 = "16hr1i2771z4yh19xg6kk037h9cv5j64q5bxb9nmkvj12hdwbwgv"; }; - checkInputs = [ pandas pytest mock google_cloud_storage ]; - propagatedBuildInputs = [ enum34 google_api_core ]; + disabled = pythonOlder "3.6"; + + checkInputs = [ + google_cloud_storage + google_cloud_testutils + mock + pandas + pytest-asyncio + pytestCheckHook + ]; + propagatedBuildInputs = [ google_api_core libcst proto-plus ]; # ignore tests which need credentials - checkPhase = '' - pytest tests/unit -k 'not upload and not prediction_client_client_info' + disabledTests = [ "test_prediction_client_client_info" ]; + preCheck = '' + rm -r google + rm tests/system/gapic/v1beta1/test_system_tables_client_v1.py ''; meta = with stdenv.lib; { description = "Cloud AutoML API client library"; - homepage = "https://github.com/GoogleCloudPlatform/google-cloud-python"; + homepage = "https://github.com/googleapis/python-automl"; license = licenses.asl20; maintainers = [ maintainers.costrouc ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google_cloud_bigquery/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google_cloud_bigquery/default.nix index b812028591..356850876a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google_cloud_bigquery/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google_cloud_bigquery/default.nix @@ -1,42 +1,46 @@ -{ stdenv -, buildPythonPackage -, fetchPypi -, freezegun -, google_resumable_media -, google_api_core -, google_cloud_core -, pandas -, pyarrow -, pytest -, mock -, ipython -}: +{ stdenv, buildPythonPackage, fetchPypi, pytestCheckHook, pythonOlder, freezegun +, google_api_core, google_cloud_core, google_cloud_testutils +, google_resumable_media, grpcio, ipython, mock, pandas, proto-plus, pyarrow }: buildPythonPackage rec { pname = "google-cloud-bigquery"; - version = "1.26.1"; + version = "2.1.0"; src = fetchPypi { inherit pname version; - sha256 = "51c29b95d460486d9e0210f63e8193691cd08480b69775270e84dd3db87c1bf2"; + sha256 = "0x5g6n151rcdgq4s80f71zpsl7bsvyyrs07l58psdpyd3kwf4sbk"; }; - checkInputs = [ pytest mock ipython freezegun ]; - propagatedBuildInputs = [ google_resumable_media google_api_core google_cloud_core pandas pyarrow ]; + disabled = pythonOlder "3.6"; - # prevent local directory from shadowing google imports - # call_api_applying_custom_retry_on_timeout requires credentials + checkInputs = + [ freezegun google_cloud_testutils ipython mock pytestCheckHook ]; + propagatedBuildInputs = [ + google_resumable_media + google_api_core + google_cloud_core + pandas + proto-plus + pyarrow + ]; + + # prevent google directory from shadowing google imports # test_magics requires modifying sys.path - checkPhase = '' + preCheck = '' rm -r google - pytest tests/unit \ - -k 'not call_api_applying_custom_retry_on_timeout' \ - --ignore=tests/unit/test_magics.py + rm tests/unit/test_magics.py ''; + # call_api_applying_custom_retry_on_timeout requires credentials + # to_dataframe_timestamp_out_of_pyarrow_bounds has inconsistent results + disabledTests = [ + "call_api_applying_custom_retry_on_timeout" + "to_dataframe_timestamp_out_of_pyarrow_bounds" + ]; + meta = with stdenv.lib; { description = "Google BigQuery API client library"; - homepage = "https://github.com/GoogleCloudPlatform/google-cloud-python"; + homepage = "https://pypi.org/project/google-cloud-bigquery"; license = licenses.asl20; maintainers = [ maintainers.costrouc ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google_cloud_container/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google_cloud_container/default.nix index ec41592b48..e155a545a1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google_cloud_container/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google_cloud_container/default.nix @@ -1,23 +1,20 @@ -{ stdenv -, buildPythonPackage -, fetchPypi -, google_api_core -, grpc_google_iam_v1 -, pytest -, mock -}: +{ stdenv, buildPythonPackage, fetchPypi, pythonOlder, google_api_core +, grpc_google_iam_v1, libcst, mock, proto-plus, pytest, pytest-asyncio }: buildPythonPackage rec { pname = "google-cloud-container"; - version = "2.0.1"; + version = "2.1.0"; src = fetchPypi { inherit pname version; - sha256 = "6f714e3d427e2b36d1365fc400f4d379972529fb40f798d9c0e06c7c3418fc89"; + sha256 = "07rcq4c49zfaacyn5df62bs7qjf5hpmdm9mpb6nx510lylq0507x"; }; - checkInputs = [ pytest mock ]; - propagatedBuildInputs = [ google_api_core grpc_google_iam_v1 ]; + disabled = pythonOlder "3.6"; + + checkInputs = [ mock pytest pytest-asyncio ]; + propagatedBuildInputs = + [ google_api_core grpc_google_iam_v1 libcst proto-plus ]; checkPhase = '' pytest tests/unit @@ -25,7 +22,7 @@ buildPythonPackage rec { meta = with stdenv.lib; { description = "Google Container Engine API client library"; - homepage = "https://github.com/GoogleCloudPlatform/google-cloud-python"; + homepage = "https://github.com/googleapis/python-container"; license = licenses.asl20; maintainers = [ maintainers.costrouc ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google_cloud_core/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google_cloud_core/default.nix index f277711e8f..88bc24d493 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google_cloud_core/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google_cloud_core/default.nix @@ -1,26 +1,30 @@ -{ stdenv, buildPythonPackage, fetchPypi, python -, google_api_core, grpcio, pytest, mock, setuptools }: +{ stdenv, buildPythonPackage, fetchPypi, pythonOlder, pytestCheckHook, python +, google_api_core, grpcio, mock }: buildPythonPackage rec { pname = "google-cloud-core"; - version = "1.4.1"; + version = "1.4.3"; src = fetchPypi { inherit pname version; - sha256 = "613e56f164b6bee487dd34f606083a0130f66f42f7b10f99730afdf1630df507"; + sha256 = "103bgv9d6fw01vbbdx0qxa5gqdzxqmiwlpdvibmqxkhb3c6bgbr1"; }; - propagatedBuildInputs = [ google_api_core grpcio setuptools ]; - checkInputs = [ pytest mock ]; + disabled = pythonOlder "3.5"; - checkPhase = '' - cd tests - ${python.interpreter} -m unittest discover + propagatedBuildInputs = [ google_api_core grpcio ]; + checkInputs = [ google_api_core mock pytestCheckHook ]; + + pythonImportsCheck = [ "google.cloud" ]; + + # prevent google directory from shadowing google imports + preCheck = '' + rm -r google ''; meta = with stdenv.lib; { description = "API Client library for Google Cloud: Core Helpers"; - homepage = "https://github.com/GoogleCloudPlatform/google-cloud-python"; + homepage = "https://github.com/googleapis/python-cloud-core"; license = licenses.asl20; maintainers = with maintainers; [ ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google_cloud_error_reporting/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google_cloud_error_reporting/default.nix index 72502a4f4a..350bbaea11 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google_cloud_error_reporting/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google_cloud_error_reporting/default.nix @@ -1,31 +1,31 @@ -{ stdenv -, buildPythonPackage -, fetchPypi -, google_cloud_logging -, pytest -, mock -}: +{ stdenv, buildPythonPackage, fetchPypi, pytestCheckHook, pythonOlder +, google_cloud_logging, google_cloud_testutils, libcst, mock, proto-plus +, pytest-asyncio }: buildPythonPackage rec { pname = "google-cloud-error-reporting"; - version = "0.34.0"; + version = "1.0.0"; src = fetchPypi { inherit pname version; - sha256 = "34edd11601b17c87a89c2e1cefdc27d975e1e9243a88ba3c0c48bfe6a05c404f"; + sha256 = "1y5vkkg1cmzshj5j68zk1876857z8a7sjm0wqhf4rzgqgkr2kcdd"; }; - checkInputs = [ pytest mock ]; - propagatedBuildInputs = [ google_cloud_logging ]; + disabled = pythonOlder "3.6"; - checkPhase = '' + checkInputs = [ google_cloud_testutils mock pytestCheckHook pytest-asyncio ]; + propagatedBuildInputs = [ google_cloud_logging libcst proto-plus ]; + + # Disable tests that require credentials + disabledTests = [ "test_report_error_event" "test_report_exception" ]; + # prevent google directory from shadowing google imports + preCheck = '' rm -r google - pytest tests/unit ''; meta = with stdenv.lib; { description = "Stackdriver Error Reporting API client library"; - homepage = "https://github.com/GoogleCloudPlatform/google-cloud-python"; + homepage = "https://github.com/googleapis/python-error-reporting"; license = licenses.asl20; maintainers = [ maintainers.costrouc ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google_cloud_kms/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google_cloud_kms/default.nix index 79fe4bcc80..a4d2439fb4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google_cloud_kms/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google_cloud_kms/default.nix @@ -1,32 +1,28 @@ -{ stdenv -, buildPythonPackage -, fetchPypi -, enum34 -, grpc_google_iam_v1 -, google_api_core -, pytest -, mock +{ stdenv, buildPythonPackage, fetchPypi, pytestCheckHook, pythonOlder +, grpc_google_iam_v1, google_api_core, libcst, mock, proto-plus, pytest-asyncio }: buildPythonPackage rec { pname = "google-cloud-kms"; - version = "2.0.1"; + version = "2.2.0"; src = fetchPypi { inherit pname version; - sha256 = "c590a8ab12a3f776ab35e570d21c0881f9d73c444bd509e54321a4c715233372"; + sha256 = "0f3k2ixp1zsgydpvkj75bs2mb805389snyw30hn41c38qq5ksdga"; }; - checkInputs = [ pytest mock ]; - propagatedBuildInputs = [ enum34 grpc_google_iam_v1 google_api_core ]; + disabled = pythonOlder "3.6"; - checkPhase = '' - pytest tests/unit - ''; + checkInputs = [ mock pytestCheckHook pytest-asyncio ]; + propagatedBuildInputs = + [ grpc_google_iam_v1 google_api_core libcst proto-plus ]; + + # Disable tests that need credentials + disabledTests = [ "test_list_global_key_rings" ]; meta = with stdenv.lib; { description = "Cloud Key Management Service (KMS) API API client library"; - homepage = "https://github.com/GoogleCloudPlatform/google-cloud-python"; + homepage = "https://github.com/googleapis/python-kms"; license = licenses.asl20; maintainers = [ maintainers.costrouc ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google_cloud_logging/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google_cloud_logging/default.nix index 6aeef14b69..ef155a18a1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google_cloud_logging/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google_cloud_logging/default.nix @@ -1,14 +1,6 @@ -{ stdenv -, buildPythonPackage -, fetchPypi -, google_api_core -, google_cloud_core -, pytest -, mock -, webapp2 -, django -, flask -}: +{ stdenv, buildPythonPackage, fetchPypi, pytestCheckHook, pythonOlder, django +, flask, google_api_core, google_cloud_core, google_cloud_testutils, mock +, webapp2 }: buildPythonPackage rec { pname = "google-cloud-logging"; @@ -19,17 +11,27 @@ buildPythonPackage rec { sha256 = "cb0d4af9d684eb8a416f14c39d9fa6314be3adf41db2dd8ee8e30db9e8853d90"; }; - checkInputs = [ pytest mock webapp2 django flask ]; + disabled = pythonOlder "3.5"; + + checkInputs = + [ django flask google_cloud_testutils mock pytestCheckHook webapp2 ]; propagatedBuildInputs = [ google_api_core google_cloud_core ]; - checkPhase = '' + # api_url test broken, fix not yet released + # https://github.com/googleapis/python-logging/pull/66 + disabledTests = + [ "test_build_api_url_w_custom_endpoint" "test_write_log_entries" ]; + + # prevent google directory from shadowing google imports + # remove system integration tests + preCheck = '' rm -r google - pytest tests/unit + rm tests/system/test_system.py ''; meta = with stdenv.lib; { description = "Stackdriver Logging API client library"; - homepage = "https://github.com/GoogleCloudPlatform/google-cloud-python"; + homepage = "https://github.com/googleapis/python-logging"; license = licenses.asl20; maintainers = [ maintainers.costrouc ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google_cloud_pubsub/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google_cloud_pubsub/default.nix index 56a9569284..4af622dc66 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google_cloud_pubsub/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google_cloud_pubsub/default.nix @@ -1,36 +1,34 @@ -{ stdenv -, buildPythonPackage -, fetchPypi -, enum34 -, grpc_google_iam_v1 -, google_api_core -, pytest -, mock -}: +{ stdenv, buildPythonPackage, fetchPypi, pythonOlder, pytestCheckHook +, google_api_core, google_cloud_testutils, grpc_google_iam_v1, libcst, mock +, proto-plus, pytest-asyncio }: buildPythonPackage rec { pname = "google-cloud-pubsub"; - version = "1.7.0"; + version = "2.1.0"; src = fetchPypi { inherit pname version; - sha256 = "c8d098ebd208d00c8f3bb55eefecd8553e7391d59700426a97d35125f0dcb248"; + sha256 = "0358g5q4igq1pgy8dznbbkc6y7zf36y4m81hhh8hvzzhaa37vc22"; }; - checkInputs = [ pytest mock ]; - propagatedBuildInputs = [ enum34 grpc_google_iam_v1 google_api_core ]; + disabled = pythonOlder "3.6"; - # tests don't clean up file descriptors correctly - doCheck = false; - checkPhase = '' - pytest tests/unit + checkInputs = [ google_cloud_testutils mock pytestCheckHook pytest-asyncio ]; + propagatedBuildInputs = + [ grpc_google_iam_v1 google_api_core libcst proto-plus ]; + + # prevent google directory from shadowing google imports + # Tests in pubsub_v1 attempt to contact pubsub.googleapis.com + preCheck = '' + rm -r google + rm -r tests/unit/pubsub_v1 ''; pythonImportsCheck = [ "google.cloud.pubsub" ]; meta = with stdenv.lib; { description = "Google Cloud Pub/Sub API client library"; - homepage = "https://github.com/GoogleCloudPlatform/google-cloud-python"; + homepage = "https://pypi.org/project/google-cloud-pubsub"; license = licenses.asl20; maintainers = [ maintainers.costrouc ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google_cloud_resource_manager/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google_cloud_resource_manager/default.nix index 84fac88bcf..a4b310797a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google_cloud_resource_manager/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google_cloud_resource_manager/default.nix @@ -1,11 +1,5 @@ -{ stdenv -, buildPythonPackage -, fetchPypi -, google_cloud_core -, google_api_core -, pytest -, mock -}: +{ stdenv, buildPythonPackage, fetchPypi, pytestCheckHook, pythonOlder +, google_cloud_core, google_api_core, mock, pytest }: buildPythonPackage rec { pname = "google-cloud-resource-manager"; @@ -16,17 +10,24 @@ buildPythonPackage rec { sha256 = "de7eba5235df61deee2291a2fe70b904154df613a334109488afdea7a4c0011f"; }; - checkInputs = [ pytest mock ]; - propagatedBuildInputs = [ google_cloud_core google_api_core ]; + disabled = pythonOlder "3.5"; - checkPhase = '' + checkInputs = [ mock pytestCheckHook ]; + propagatedBuildInputs = [ google_api_core google_cloud_core ]; + + # api_url test broken, fix not yet released + # https://github.com/googleapis/python-resource-manager/pull/31 + disabledTests = + [ "api_url_no_extra_query_param" "api_url_w_custom_endpoint" ]; + + # prevent google directory from shadowing google imports + preCheck = '' rm -r google - pytest tests/unit ''; meta = with stdenv.lib; { description = "Google Cloud Resource Manager API client library"; - homepage = "https://github.com/GoogleCloudPlatform/google-cloud-python"; + homepage = "https://github.com/googleapis/python-resource-manager"; license = licenses.asl20; maintainers = [ maintainers.costrouc ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google_cloud_runtimeconfig/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google_cloud_runtimeconfig/default.nix index 08e2c38ea1..80bdcd1b83 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google_cloud_runtimeconfig/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google_cloud_runtimeconfig/default.nix @@ -1,11 +1,5 @@ -{ stdenv -, buildPythonPackage -, fetchPypi -, google_api_core -, google_cloud_core -, pytest -, mock -}: +{ stdenv, buildPythonPackage, fetchPypi, pytestCheckHook, pythonOlder +, google_api_core, google_cloud_core, mock }: buildPythonPackage rec { pname = "google-cloud-runtimeconfig"; @@ -16,18 +10,24 @@ buildPythonPackage rec { sha256 = "3d125c01817d5bef2b644095b044d22b03b9d8d4591088cadd8e97851f7a150a"; }; - checkInputs = [ pytest mock ]; + disabled = pythonOlder "3.5"; + + checkInputs = [ mock pytestCheckHook ]; propagatedBuildInputs = [ google_api_core google_cloud_core ]; - # ignore tests which require credentials or network - checkPhase = '' + # api_url test broken, fix not yet released + # https://github.com/googleapis/python-resource-manager/pull/31 + # Client tests require credentials + disabledTests = [ "build_api_url_w_custom_endpoint" "client_options" ]; + + # prevent google directory from shadowing google imports + preCheck = '' rm -r google - pytest tests/unit -k 'not client and not extra_headers' ''; meta = with stdenv.lib; { description = "Google Cloud RuntimeConfig API client library"; - homepage = "https://github.com/GoogleCloudPlatform/google-cloud-python"; + homepage = "https://pypi.org/project/google-cloud-runtimeconfig"; license = licenses.asl20; maintainers = [ maintainers.costrouc ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google_cloud_spanner/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google_cloud_spanner/default.nix index ce03add44e..4e86908b42 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google_cloud_spanner/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google_cloud_spanner/default.nix @@ -1,35 +1,32 @@ -{ stdenv -, buildPythonPackage -, fetchPypi -, grpc_google_iam_v1 -, grpcio-gcp -, google_api_core -, google_cloud_core -, pytest -, mock -}: +{ stdenv, buildPythonPackage, fetchPypi, pytestCheckHook, pythonOlder +, grpc_google_iam_v1, grpcio-gcp, google_api_core, google_cloud_core +, google_cloud_testutils, mock, pytest }: buildPythonPackage rec { pname = "google-cloud-spanner"; - version = "1.17.1"; + version = "1.19.1"; src = fetchPypi { inherit pname version; - sha256 = "3240a04eaa6496e9d8bf4929f4ff04de1652621fd49555eb83b743c48ed9ca04"; + sha256 = "0b9ifh9i4hkcs19b4l6v8j8v93yd8p3j19qrrjvvf5a44bc7bhsh"; }; - checkInputs = [ pytest mock ]; - propagatedBuildInputs = [ grpcio-gcp grpc_google_iam_v1 google_api_core google_cloud_core ]; + disabled = pythonOlder "3.5"; - # avoid importing local package - checkPhase = '' + checkInputs = [ google_cloud_testutils mock pytestCheckHook ]; + propagatedBuildInputs = + [ grpcio-gcp grpc_google_iam_v1 google_api_core google_cloud_core ]; + + # prevent google directory from shadowing google imports + # remove tests that require credentials + preCheck = '' rm -r google - pytest tests/unit + rm tests/system/test_system.py ''; meta = with stdenv.lib; { description = "Cloud Spanner API client library"; - homepage = "https://github.com/GoogleCloudPlatform/google-cloud-python"; + homepage = "https://pypi.org/project/google-cloud-spanner"; license = licenses.asl20; maintainers = [ maintainers.costrouc ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google_cloud_storage/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google_cloud_storage/default.nix index 7a92e73104..bcb8b604e4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google_cloud_storage/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google_cloud_storage/default.nix @@ -1,13 +1,7 @@ -{ lib -, buildPythonPackage -, fetchPypi -, google_resumable_media -, google_api_core -, google_cloud_core -, pytest -, mock -, setuptools -}: +{ lib, buildPythonPackage, fetchPypi, pytestCheckHook, pythonOlder +, google_api_core, google_auth, google-cloud-iam, google_cloud_core +, google_cloud_kms, google_cloud_testutils, google_resumable_media, mock +, requests }: buildPythonPackage rec { pname = "google-cloud-storage"; @@ -18,27 +12,36 @@ buildPythonPackage rec { sha256 = "da12b7bd79bbe978a7945a44b600604fbc10ece2935d31f243e751f99135e34f"; }; + disabled = pythonOlder "3.5"; + propagatedBuildInputs = [ google_api_core + google_auth google_cloud_core google_resumable_media - setuptools + requests ]; checkInputs = [ + google-cloud-iam + google_cloud_kms + google_cloud_testutils mock - pytest + pytestCheckHook ]; - # remove directory from interferring with importing modules - # ignore tests which require credentials - checkPhase = '' + # disable tests which require credentials + disabledTests = [ "create" "get" "post" "test_build_api_url" ]; + + # prevent google directory from shadowing google imports + # remove tests which require credentials + preCheck = '' rm -r google - pytest tests/unit -k 'not (create or get or post)' + rm tests/system/test_system.py tests/unit/test_client.py ''; meta = with lib; { description = "Google Cloud Storage API client library"; - homepage = "https://github.com/GoogleCloudPlatform/google-cloud-python"; + homepage = "https://github.com/googleapis/python-storage"; license = licenses.asl20; maintainers = with maintainers; [ costrouc ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google_cloud_testutils/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google_cloud_testutils/default.nix index 90e4683f7b..dfd6354dcc 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google_cloud_testutils/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google_cloud_testutils/default.nix @@ -1,34 +1,22 @@ -{ stdenv -, buildPythonPackage -, fetchFromGitHub -, six -, google_auth -}: +{ stdenv, buildPythonPackage, fetchPypi, google_auth, pytest, six }: -buildPythonPackage { +buildPythonPackage rec { pname = "google-cloud-testutils"; - version = "unstable-36ffa923c7037e8b4fdcaa76272cb6267e908a9d"; + version = "0.1.0"; - # google-cloud-testutils is not "really" - # released as a python package - # but it is required for google-cloud-* tests - # so why not package it as a module - src = fetchFromGitHub { - owner = "googleapis"; - repo = "google-cloud-python"; - rev = "36ffa923c7037e8b4fdcaa76272cb6267e908a9d"; - sha256 = "1fvcnssmpgf4lfr7l9h7cz984rbc5mfr1j1br12japcib5biwzjy"; + src = fetchPypi { + inherit pname version; + sha256 = "1bn1pz00lxym3vkl6l45b3nydpmfdvmylwggh2lspldrxwx39a0k"; }; - propagatedBuildInputs = [ six google_auth ]; + propagatedBuildInputs = [ google_auth six ]; - postPatch = '' - cd test_utils - ''; + # There are no tests + doCheck = false; meta = with stdenv.lib; { description = "System test utilities for google-cloud-python"; - homepage = "https://github.com/GoogleCloudPlatform/google-cloud-python"; + homepage = "https://github.com/googleapis/python-test-utils"; license = licenses.asl20; maintainers = [ maintainers.costrouc ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google_cloud_texttospeech/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google_cloud_texttospeech/default.nix index 3a052c73cd..32e8fa223a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google_cloud_texttospeech/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google_cloud_texttospeech/default.nix @@ -1,10 +1,5 @@ -{ stdenv -, buildPythonPackage -, fetchPypi -, google_api_core -, pytest -, mock -}: +{ stdenv, buildPythonPackage, fetchPypi, pytestCheckHook, pythonOlder +, google_api_core, libcst, mock, proto-plus, pytest-asyncio, }: buildPythonPackage rec { pname = "google-cloud-texttospeech"; @@ -15,16 +10,17 @@ buildPythonPackage rec { sha256 = "cbbd397e72b6189668134f3c8e8c303198188334a4e6a5f77cc90c3220772f9e"; }; - checkInputs = [ pytest mock ]; - propagatedBuildInputs = [ google_api_core ]; + disabled = pythonOlder "3.5"; - checkPhase = '' - pytest tests/unit - ''; + checkInputs = [ mock pytest-asyncio pytestCheckHook ]; + propagatedBuildInputs = [ google_api_core libcst proto-plus ]; + + # Disable tests that require credentials + disabledTests = ["test_synthesize_speech" "test_list_voices"]; meta = with stdenv.lib; { description = "Google Cloud Text-to-Speech API client library"; - homepage = "https://github.com/GoogleCloudPlatform/google-cloud-python"; + homepage = "https://github.com/googleapis/python-texttospeech"; license = licenses.asl20; maintainers = [ maintainers.costrouc ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google_cloud_translate/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google_cloud_translate/default.nix index f25f4badc8..60f9e3e11a 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google_cloud_translate/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google_cloud_translate/default.nix @@ -1,12 +1,6 @@ -{ stdenv -, buildPythonPackage -, fetchPypi -, google_api_core -, google_cloud_core -, grpcio -, pytest -, mock -}: +{ stdenv, buildPythonPackage, fetchPypi, pytestCheckHook, pythonOlder +, google_api_core, google_cloud_core, google_cloud_testutils, grpcio, libcst +, mock, proto-plus, pytest-asyncio }: buildPythonPackage rec { pname = "google-cloud-translate"; @@ -17,18 +11,29 @@ buildPythonPackage rec { sha256 = "ecdea3e176e80f606d08c4c7fd5acea6b3dd960f4b2e9a65951aaf800350a759"; }; - # google_cloud_core[grpc] -> grpcio - propagatedBuildInputs = [ google_api_core google_cloud_core grpcio ]; + disabled = pythonOlder "3.6"; - checkInputs = [ pytest mock ]; - checkPhase = '' - cd tests # prevent local google/__init__.py from getting loaded - pytest unit -k 'not extra_headers' + # google_cloud_core[grpc] -> grpcio + propagatedBuildInputs = + [ google_api_core google_cloud_core grpcio libcst proto-plus ]; + + checkInputs = [ google_cloud_testutils mock pytest-asyncio pytestCheckHook ]; + + # test_http.py broken, fix not yet released + # https://github.com/googleapis/python-translate/pull/69 + disabledTests = [ + "test_build_api_url_w_extra_query_params" + "test_build_api_url_no_extra_query_params" + "test_build_api_url_w_custom_endpoint" + ]; + + preCheck = '' + rm -r google ''; meta = with stdenv.lib; { description = "Google Cloud Translation API client library"; - homepage = "https://github.com/GoogleCloudPlatform/google-cloud-python"; + homepage = "https://github.com/googleapis/python-translate"; license = licenses.asl20; maintainers = [ maintainers.costrouc ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/google_cloud_websecurityscanner/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/google_cloud_websecurityscanner/default.nix index a43f7fd5f9..356759f9bc 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/google_cloud_websecurityscanner/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/google_cloud_websecurityscanner/default.nix @@ -1,10 +1,5 @@ -{ stdenv -, buildPythonPackage -, fetchPypi -, google_api_core -, pytest -, mock -}: +{ stdenv, buildPythonPackage, fetchPypi, pytestCheckHook, pythonOlder +, google_api_core, libcst, mock, proto-plus, pytest-asyncio }: buildPythonPackage rec { pname = "google-cloud-websecurityscanner"; @@ -15,16 +10,14 @@ buildPythonPackage rec { sha256 = "1de60f880487b898b499345f46f7acf38651f5356ebca8673116003a57f25393"; }; - checkInputs = [ pytest mock ]; - propagatedBuildInputs = [ google_api_core ]; + disabled = pythonOlder "3.6"; - checkPhase = '' - pytest tests/unit - ''; + checkInputs = [ mock pytest-asyncio pytestCheckHook ]; + propagatedBuildInputs = [ google_api_core libcst proto-plus ]; meta = with stdenv.lib; { description = "Google Cloud Web Security Scanner API client library"; - homepage = "https://github.com/GoogleCloudPlatform/google-cloud-python"; + homepage = "https://github.com/googleapis/python-websecurityscanner"; license = licenses.asl20; maintainers = [ maintainers.costrouc ]; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/gym/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/gym/default.nix index 482b2c64aa..547f79a7b1 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/gym/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/gym/default.nix @@ -26,7 +26,7 @@ buildPythonPackage rec { # The test needs MuJoCo that is not free library. doCheck = false; - pythonImportCheck = [ "gym" ]; + pythonImportsCheck = [ "gym" ]; meta = with lib; { description = "A toolkit by OpenAI for developing and comparing your reinforcement learning agents"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/jq/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/jq/default.nix index 72776a0371..3d4097b071 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/jq/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/jq/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "jq"; - version = "1.0.2"; + version = "1.1.1"; src = fetchPypi { inherit pname version; - sha256 = "9fe6ce07bc8d209c385d8ba132a2971c69aef015103c46bea87a73a16c5ec147"; + sha256 = "62d649c4f6f26ed91810c8db075f5fe05319c3dc99dbebcd2d31b0b697a4592e"; }; patches = [ ./jq-py-setup.patch ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/kaitaistruct/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/kaitaistruct/default.nix index a1e795421b..6189206327 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/kaitaistruct/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/kaitaistruct/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "kaitaistruct"; - version = "0.8"; + version = "0.9"; src = fetchPypi { inherit pname version; - sha256 = "d1d17c7f6839b3d28fc22b21295f787974786c2201e8788975e72e2a1d109ff5"; + sha256 = "3d5845817ec8a4d5504379cc11bd570b038850ee49c4580bc0998c8fb1d327ad"; }; meta = with stdenv.lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/libtmux/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/libtmux/default.nix index 605cbe0402..9df5cffec9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/libtmux/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/libtmux/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "libtmux"; - version = "0.8.3"; + version = "0.8.5"; src = fetchPypi { inherit pname version; - sha256 = "a4c7379604ccdc684aa865723211184709f9a2b45511772989b5f26ad156650e"; + sha256 = "1d35b9f8451944d31c5ed22ed9e6c8e18034adcc75718fcc5b27fbd9621543e1"; }; checkInputs = [ pytest ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/msgpack-numpy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/msgpack-numpy/default.nix index d380f18f77..ad612550d7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/msgpack-numpy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/msgpack-numpy/default.nix @@ -9,11 +9,11 @@ buildPythonPackage rec { pname = "msgpack-numpy"; - version = "0.4.6.1"; + version = "0.4.7.1"; src = fetchPypi { inherit pname version; - sha256 = "9f9b57abb2b155c2d3e411c2dd5b98f14998bd053a20c6ed0ab64a6ceb8ad51d"; + sha256 = "7eaf51acf82d7c467d21aa71df94e1c051b2055e54b755442051b474fa7cf5e1"; }; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/nix-kernel/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/nix-kernel/default.nix index 81057308e6..5758e60fa3 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/nix-kernel/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/nix-kernel/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonPackage , fetchFromGitHub +, isPy3k , pexpect , notebook , nix @@ -10,6 +11,8 @@ buildPythonPackage rec { pname = "nix-kernel"; version = "unstable-2020-04-26"; + disabled = !isPy3k; + src = fetchFromGitHub { owner = "GTrunSec"; repo = "nix-kernel"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/numpy-stl/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/numpy-stl/default.nix index b862319d94..2207d4244e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/numpy-stl/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/numpy-stl/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "numpy-stl"; - version = "2.11.2"; + version = "2.12.0"; src = fetchPypi { inherit pname version; - sha256 = "1dil1rklb41m3v6a0i93ymimv453whsg1m9z6g0z17jbg7gmc98r"; + sha256 = "10912d7749ab02b0ee2ee61fc04c38fa211fc9d00a9b73a7d1c2465c53c1abf5"; }; checkInputs = [ pytest pytestrunner ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/nvchecker/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/nvchecker/default.nix index c85e45a239..b675fa6f06 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/nvchecker/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/nvchecker/default.nix @@ -19,14 +19,14 @@ buildPythonPackage rec { pname = "nvchecker"; - version = "2.1"; + version = "2.2"; # Tests not included in PyPI tarball src = fetchFromGitHub { owner = "lilydjwg"; repo = pname; rev = "v${version}"; - sha256 = "0zf9vhf8ka0v1mf1xhbvkc2nr54m0rkiw1i68ps4sgx2mdj6qrfk"; + sha256 = "0b17pikqyxcsid69lwnjl44n8z46ydjmxxdnbzasfdl7r83l7ijr"; }; nativeBuildInputs = [ installShellFiles docutils ]; 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 860f8c0051..79c448b5cc 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/objgraph/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/objgraph/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "objgraph"; - version = "3.4.1"; + version = "3.5.0"; src = fetchPypi { inherit pname version; - sha256 = "bf29512d7f8b457b53fa0722ea59f516abb8abc59b78f97f0ef81394a0c615a7"; + sha256 = "4752ca5bcc0e0512e41b8cc4d2780ac2fd3b3eabd03b7e950a5594c06203dfc4"; }; # Tests fail with PyPy. diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pandas-datareader/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pandas-datareader/default.nix new file mode 100644 index 0000000000..92adfb9d3f --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/pandas-datareader/default.nix @@ -0,0 +1,34 @@ +{ stdenv +, buildPythonPackage +, fetchPypi +, pytestCheckHook +, isPy27 +, pandas +, lxml +, requests +}: + +buildPythonPackage rec { + pname = "pandas-datareader"; + version = "0.9.0"; + disabled = isPy27; + + src = fetchPypi { + inherit pname version; + sha256 = "b2cbc1e16a6ab9ff1ed167ae2ea92839beab9a20823bd00bdfb78155fa04f891"; + }; + + # Tests are trying to load data over the network + doCheck = false; + pythonImportsCheck = [ "pandas_datareader" ]; + + propagatedBuildInputs = [ pandas lxml requests ]; + + meta = with stdenv.lib; { + description = "Up to date remote data access for pandas, works for multiple versions of pandas"; + homepage = "https://github.com/pydata/pandas-datareader"; + license= licenses.bsd3; + maintainers = with maintainers; [ evax ]; + platforms = platforms.unix; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/papis/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/papis/default.nix index a97c075d30..93eafff6c9 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/papis/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/papis/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "papis"; - version = "0.10"; + version = "0.11.1"; disabled = !isPy3k; # Missing tests on Pypi @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "papis"; repo = pname; rev = "v${version}"; - sha256 = "0fmrvxs6ixfwjlp96b69db7fpvyqfy2n3c23kdz8yr0vhnp82l93"; + sha256 = "0bbkjyw1fsvvp0380l404h2lys8ib4xqga5s6401k1y1hld28nl6"; }; propagatedBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/param/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/param/default.nix index 096bb2cfb9..9f6d78a8ec 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/param/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/param/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "param"; - version = "1.9.3"; + version = "1.10.0"; src = fetchPypi { inherit pname version; - sha256 = "10crjlsn5vx03xwlnhga9faqq2rlw0qwabi45vnvhmz22qbd8w43"; + sha256 = "a284c1b42aff6367e8eea2f649d4f3f70a9f16c6f17d8ad672a31ff36089f995"; }; checkInputs = [ flake8 nose ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pex/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pex/default.nix index 9eb7226330..78bb61d03c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pex/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pex/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "pex"; - version = "2.1.15"; + version = "2.1.20"; src = fetchPypi { inherit pname version; - sha256 = "e1092ae52cfdef41c22d98fa98f9225ac21936a7d096131777ca3a7940fe1b2d"; + sha256 = "2f1cf9721aa5fce93b034d2a18922d34d6f5fb81236ab3a955706226b15658fd"; }; nativeBuildInputs = [ setuptools ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/poetry/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/poetry/default.nix index 8000c667e6..bad38ea582 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/poetry/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/poetry/default.nix @@ -24,7 +24,7 @@ buildPythonPackage rec { pname = "poetry"; - version = "1.1.1"; + version = "1.1.4"; format = "pyproject"; disabled = isPy27; @@ -32,7 +32,7 @@ buildPythonPackage rec { owner = "python-poetry"; repo = pname; rev = version; - sha256 = "1j3ij8qsd709p7ww5r4759f2xnk2s7g40kzm9vx99l98zw890g05"; + sha256 = "0lx3qpz5dad0is7ki5a4vxphvc8cm8fnv4bmrx226a6nvvaj6ahs"; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/proto-plus/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/proto-plus/default.nix index d542d6f647..4a36b62529 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/proto-plus/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/proto-plus/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "proto-plus"; - version = "1.10.1"; + version = "1.11.0"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "0n8ia51jg2dkab2sf0qnh39bssqhz65ybcqr78f3zzf7ja923lkr"; + sha256 = "416a0f13987789333cd8760a0ee998f8eccd6d7165ee9f283d64ca2de3e8774d"; }; propagatedBuildInputs = [ protobuf ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pushbullet/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pushbullet/default.nix index b9c2a84728..68c9d9180d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pushbullet/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pushbullet/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "pushbullet.py"; - version = "0.11.0"; + version = "0.12.0"; src = fetchPypi { inherit pname version; - sha256 = "aa9dc7bb46e083e3497d46241154f12944a8f540e29d150330ca94db0b453b8d"; + sha256 = "917883e1af4a0c979ce46076b391e0243eb8fe0a81c086544bcfa10f53e5ae64"; }; propagatedBuildInputs = [ requests websocket_client python_magic ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyairvisual/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyairvisual/default.nix index 58eb5f7028..084852fa53 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyairvisual/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyairvisual/default.nix @@ -1,29 +1,54 @@ -{ lib, buildPythonPackage, isPy3k, fetchFromGitHub, requests -, requests-mock, pytest +{ lib +, buildPythonPackage +, pythonOlder +, fetchFromGitHub +, poetry +, aiohttp +, numpy +, pysmb +, aresponses +, asynctest +, pytest-aiohttp +, pytest-asyncio +, pytestCheckHook }: buildPythonPackage rec { pname = "pyairvisual"; - version = "1.0.0"; + version = "5.0.4"; + format = "pyproject"; + + disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "bachya"; repo = pname; - rev = "v${version}"; - sha256 = "0ng6k07n91k5l68zk3hl4fywb33admp84wqdm20qmmw9yc9c64fd"; + rev = version; + sha256 = "0z769xrb6w6bhqcq02sjryl1qyvk9dc1xfn06fc3mdqnrbr0xxj3"; }; - checkInputs = [ pytest requests-mock ]; - propagatedBuildInputs = [ requests ]; + nativeBuildInputs = [ poetry ]; - checkPhase = '' - py.test tests - ''; + propagatedBuildInputs = [ + aiohttp + numpy + pysmb + ]; - disabled = !isPy3k; + checkInputs = [ + aresponses + asynctest + pytest-aiohttp + pytest-asyncio + pytestCheckHook + ]; + + pytestFlagsArray = [ + "tests" + ]; meta = with lib; { - description = "A thin Python wrapper for the AirVisual API"; + description = "A simple, clean, well-tested Python library for interacting with AirVisual©"; license = licenses.mit; homepage = "https://github.com/bachya/pyairvisual"; }; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyatmo/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyatmo/default.nix index b0e8ac5d25..971b43147c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyatmo/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyatmo/default.nix @@ -12,17 +12,26 @@ buildPythonPackage rec { pname = "pyatmo"; - version = "4.1.0"; - disabled = pythonOlder "3.5"; # uses type hints + version = "4.2.0"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "jabesq"; repo = "netatmo-api-python"; rev = "v${version}"; - sha256 = "0x3xq6ni9rl5k3vi0ydqafdzvza785ycnlgyikgqbkppbh3j33ig"; + sha256 = "0b2k1814zg3994k60xdw5gpsl8k1wy9zndd0b1p4dfb5qkx9f8kp"; }; - propagatedBuildInputs = [ oauthlib requests requests_oauthlib ]; + postPatch = '' + substituteInPlace setup.cfg \ + --replace "oauthlib==3.1.0" "oauthlib" + ''; + + propagatedBuildInputs = [ + oauthlib + requests + requests_oauthlib + ]; checkInputs = [ freezegun diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pycairo/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pycairo/default.nix index d61279e38d..24e0f9792d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pycairo/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pycairo/default.nix @@ -1,4 +1,13 @@ -{ lib, fetchFromGitHub, meson, ninja, buildPythonPackage, pytest, pkgconfig, cairo, xlibsWrapper, isPy3k }: +{ lib +, fetchFromGitHub +, meson +, ninja +, buildPythonPackage +, pytestCheckHook +, pkg-config +, cairo +, isPy3k +}: buildPythonPackage rec { pname = "pycairo"; @@ -16,22 +25,25 @@ buildPythonPackage rec { nativeBuildInputs = [ meson ninja - pkgconfig + pkg-config ]; buildInputs = [ cairo - xlibsWrapper ]; - checkInputs = [ pytest ]; + checkInputs = [ + pytestCheckHook + ]; - mesonFlags = [ "-Dpython=${if isPy3k then "python3" else "python"}" ]; + mesonFlags = [ + "-Dpython=${if isPy3k then "python3" else "python"}" + ]; meta = with lib; { description = "Python 2/3 bindings for cairo"; homepage = "https://pycairo.readthedocs.io/"; - license = with licenses; [ lgpl2 mpl11 ]; + license = with licenses; [ lgpl21Only mpl11 ]; platforms = lib.platforms.linux ++ lib.platforms.darwin; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyelftools/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyelftools/default.nix index 08fba705aa..51e1886f1d 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyelftools/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyelftools/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { sha256 = "sha256-O7l1kj0k8bOSOtZJVzS674oVnM+X3oP00Ybs0qjb64Q="; }; - doCheck = stdenv.is64bit; + doCheck = stdenv.is64bit && !stdenv.isDarwin; checkPhase = '' patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" test/external_tools/readelf diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pypass/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pypass/default.nix new file mode 100644 index 0000000000..2458a29ac3 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/pypass/default.nix @@ -0,0 +1,84 @@ +{ buildPythonPackage +, click +, colorama +, enum34 +, fetchPypi +, git +, gnugrep +, gnupg +, nose +, pbr +, pexpect +, pythonAtLeast +, pythonOlder +, stdenv +, substituteAll +, tree +, xclip +}: + +# NOTE: pypass can also be used as an application, but probably the most +# important usecase is as a library. So, let's use buildPythonPackage and +# support any Python version instead of defining it as an application with +# buildPythonApplication. +buildPythonPackage rec { + pname = "pypass"; + version = "0.2.1"; + + src = fetchPypi { + inherit pname version; + sha256 = "1nm4mj7pd7gz4ghic6b3wrnd1b59hd1f0axavdabfl79wy511l7r"; + }; + + # Set absolute nix store paths to the executables that pypass uses + patches = [ + (substituteAll { + src = ./mark-executables.patch; + git_exec = "${git}/bin/git"; + grep_exec = "${gnugrep}/bin/grep"; + gpg_exec = "${gnupg}/bin/gpg2"; + tree_exec = "${tree}/bin/tree"; + xclip_exec = "${xclip}/bin/xclip"; + }) + ]; + + # Remove enum34 requirement if Python >= 3.4 + postPatch = stdenv.lib.optionalString (pythonAtLeast "3.4") '' + substituteInPlace requirements.txt --replace "enum34" "" + ''; + + nativeBuildInputs = [ pbr ]; + + propagatedBuildInputs = [ + click + colorama + pexpect + ] ++ stdenv.lib.optional (pythonOlder "3.4") enum34; + + checkInputs = [ nose ]; + + # Configuration so that the tests work + preCheck = '' + HOME=$TEMP ${git}/bin/git config --global user.email "nix-builder@nixos.org" + HOME=$TEMP ${git}/bin/git config --global user.name "Nix Builder" + HOME=$TEMP ${git}/bin/git config --global pull.ff only + HOME=$TEMP make setup_gpg + ''; + + # Run tests but exclude the test that uses clipboard as I wasn't able to make + # it work - probably the X clipboard just doesn't work in the build + # environment.. + checkPhase = '' + runHook preCheck + HOME=$TEMP GNUPGHOME=pypass/tests/gnupg nosetests -v --exclude=test_show_clip . + runHook postCheck + ''; + + meta = { + description = "Password manager pass in Python"; + homepage = "https://github.com/aviau/python-pass"; + license = stdenv.lib.licenses.gpl3Plus; + platforms = stdenv.lib.platforms.all; + maintainers = with stdenv.lib.maintainers; [ jluttine ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pypass/mark-executables.patch b/third_party/nixpkgs/pkgs/development/python-modules/pypass/mark-executables.patch new file mode 100644 index 0000000000..9bde97c511 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/pypass/mark-executables.patch @@ -0,0 +1,255 @@ +diff --git a/Makefile b/Makefile +index 1ef67c8..d49031a 100644 +--- a/Makefile ++++ b/Makefile +@@ -16,5 +16,5 @@ test: kill build + setup_gpg: pypass/tests/gnupg + pypass/tests/gnupg: pypass/tests/test_key_sec.asc pypass/tests/test_ownertrust.txt + mkdir -m 700 -p pypass/tests/gnupg +- GNUPGHOME=pypass/tests/gnupg gpg --allow-secret-key-import --import pypass/tests/test_key_sec.asc +- GNUPGHOME=pypass/tests/gnupg gpg --import-ownertrust pypass/tests/test_ownertrust.txt ++ GNUPGHOME=pypass/tests/gnupg @gpg_exec@ --allow-secret-key-import --import pypass/tests/test_key_sec.asc ++ GNUPGHOME=pypass/tests/gnupg @gpg_exec@ --import-ownertrust pypass/tests/test_ownertrust.txt +diff --git a/pypass/command.py b/pypass/command.py +index 4616a5f..a72cf5d 100644 +--- a/pypass/command.py ++++ b/pypass/command.py +@@ -173,7 +173,7 @@ def show(config, path, clip): + if clip: + xclip = subprocess.Popen( + [ +- 'xclip', ++ '@xclip_exec@', + '-selection', 'clipboard' + ], + stdin=subprocess.PIPE +@@ -206,7 +206,7 @@ def connect(config, path): + def ls(config, subfolder): + tree = subprocess.Popen( + [ +- 'tree', ++ '@tree_exec@', + '-C', + '-l', + '--noreport', +@@ -239,7 +239,7 @@ def find(config, search_terms): + + tree = subprocess.Popen( + [ +- 'tree', ++ '@tree_exec@', + '-C', + '-l', + '--noreport', +@@ -273,7 +273,7 @@ def grep(config, search_string): + config['password_store'].get_decrypted_password(password) + + grep = subprocess.Popen( +- ['grep', '-e', search_string], ++ ['@grep_exec@', '-e', search_string], + stdout=subprocess.PIPE, + stdin=subprocess.PIPE + ) +@@ -397,7 +397,7 @@ def git(config, commands): + else: + subprocess.call( + [ +- 'git', ++ '@git_exec@', + '--git-dir=%s' % config['password_store'].git_dir, + '--work-tree=%s' % config['password_store'].path, + ] + command_list, +diff --git a/pypass/passwordstore.py b/pypass/passwordstore.py +index 9de0376..8cf20a4 100644 +--- a/pypass/passwordstore.py ++++ b/pypass/passwordstore.py +@@ -26,18 +26,7 @@ import re + from .entry_type import EntryType + + # Find the right gpg binary +-if subprocess.call( +- ['which', 'gpg2'], +- stdout=subprocess.PIPE, +- stderr=subprocess.PIPE) == 0: +- GPG_BIN = 'gpg2' +-elif subprocess.call( +- ['which', 'gpg'], +- stdout=subprocess.PIPE, +- stderr=subprocess.PIPE) == 0: +- GPG_BIN = 'gpg' +-else: +- raise Exception("Could not find GPG") ++GPG_BIN = '@gpg_exec@' + + + class PasswordStore(object): +@@ -215,7 +204,7 @@ class PasswordStore(object): + # Init git repo + subprocess.call( + [ +- "git", ++ "@git_exec@", + "--git-dir=%s" % git_dir, + "--work-tree=%s" % git_work_tree, + "init", path +@@ -226,7 +215,7 @@ class PasswordStore(object): + # Add remote repo + subprocess.call( + [ +- "git", ++ "@git_exec@", + "--git-dir=%s" % git_dir, + "--work-tree=%s" % git_work_tree, + "remote", +@@ -241,7 +230,7 @@ class PasswordStore(object): + # TODO: add parameters for remote and branch ? + subprocess.call( + [ +- "git", ++ "@git_exec@", + "--git-dir=%s" % git_dir, + "--work-tree=%s" % git_work_tree, + "pull", +@@ -272,7 +261,7 @@ class PasswordStore(object): + + subprocess.call( + [ +- 'git', ++ '@git_exec@', + "--git-dir=%s" % self.git_dir, + "--work-tree=%s" % self.path, + 'init', +@@ -298,7 +287,7 @@ class PasswordStore(object): + + subprocess.call( + [ +- 'git', ++ '@git_exec@', + "--git-dir=%s" % self.git_dir, + "--work-tree=%s" % self.path, + 'config', +@@ -311,7 +300,7 @@ class PasswordStore(object): + + subprocess.call( + [ +- 'git', ++ '@git_exec@', + "--git-dir=%s" % self.git_dir, + "--work-tree=%s" % self.path, + 'config', +@@ -326,7 +315,7 @@ class PasswordStore(object): + + subprocess.call( + [ +- 'git', ++ '@git_exec@', + "--git-dir=%s" % self.git_dir, + "--work-tree=%s" % self.path, + 'add', +@@ -338,7 +327,7 @@ class PasswordStore(object): + if message: + subprocess.call( + [ +- 'git', ++ '@git_exec@', + "--git-dir=%s" % self.git_dir, + "--work-tree=%s" % self.path, + 'commit', +@@ -350,7 +339,7 @@ class PasswordStore(object): + else: + subprocess.call( + [ +- 'git', ++ '@git_exec@', + "--git-dir=%s" % self.git_dir, + "--work-tree=%s" % self.path, + 'commit' +diff --git a/pypass/tests/test_command.py b/pypass/tests/test_command.py +index 4966b34..960a8ed 100644 +--- a/pypass/tests/test_command.py ++++ b/pypass/tests/test_command.py +@@ -127,7 +127,7 @@ class TestCommand(unittest.TestCase): + + # Check if the password is in the clipoard + xclip = subprocess.Popen( +- ['xclip', '-o', '-selection', 'clipboard'], ++ ['@xclip_exec@', '-o', '-selection', 'clipboard'], + stdout=subprocess.PIPE) + xclip.wait() + self.assertEqual(xclip.stdout.read().decode('utf8'), 'clipme999') +@@ -301,7 +301,7 @@ class TestCommand(unittest.TestCase): + # git init should set diff.gpg.binary to True + diff_gpg_binary = subprocess.Popen( + [ +- 'git', ++ '@git_exec@', + '--git-dir=%s' % os.path.join(self.dir, '.git'), + '--work-tree=%s' % self.dir, + 'config', +@@ -317,7 +317,7 @@ class TestCommand(unittest.TestCase): + # git init should set diff.gpg.textconv to 'gpg -d' + gpg = subprocess.Popen( + [ +- 'git', ++ '@git_exec@', + '--git-dir=%s' % os.path.join(self.dir, '.git'), + '--work-tree=%s' % self.dir, + 'config', +@@ -337,7 +337,7 @@ class TestCommand(unittest.TestCase): + + subprocess.Popen( + [ +- 'git', ++ '@git_exec@', + '--git-dir=%s' % origin_git_dir, + '--work-tree=%s' % origin_dir, + 'init', +@@ -350,7 +350,7 @@ class TestCommand(unittest.TestCase): + + subprocess.call( + [ +- 'git', ++ '@git_exec@', + '--git-dir=%s' % origin_git_dir, + '--work-tree=%s' % origin_dir, + 'add', 'test_git_init_clone.gpg', +@@ -359,7 +359,7 @@ class TestCommand(unittest.TestCase): + + subprocess.call( + [ +- 'git', ++ '@git_exec@', + '--git-dir=%s' % origin_git_dir, + '--work-tree=%s' % origin_dir, + 'commit', +diff --git a/pypass/tests/test_passwordstore.py b/pypass/tests/test_passwordstore.py +index 6decc5f..ceb5181 100644 +--- a/pypass/tests/test_passwordstore.py ++++ b/pypass/tests/test_passwordstore.py +@@ -171,7 +171,7 @@ class TestPasswordStore(unittest.TestCase): + + subprocess.Popen( + [ +- 'git', ++ '@git_exec@', + '--git-dir=%s' % os.path.join(origin_dir, '.git'), + '--work-tree=%s' % origin_dir, + 'init', +@@ -184,7 +184,7 @@ class TestPasswordStore(unittest.TestCase): + + subprocess.Popen( + [ +- 'git', ++ '@git_exec@', + '--git-dir=%s' % os.path.join(origin_dir, '.git'), + '--work-tree=%s' % origin_dir, + 'add', 'test_git_init_clone.gpg', +@@ -193,7 +193,7 @@ class TestPasswordStore(unittest.TestCase): + + subprocess.Popen( + [ +- 'git', ++ '@git_exec@', + '--git-dir=%s' % os.path.join(origin_dir, '.git'), + '--work-tree=%s' % origin_dir, + 'commit', diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyphen/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyphen/default.nix index 7a182b6be4..b5018e40d7 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyphen/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyphen/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "Pyphen"; - version = "0.9.5"; + version = "0.10.0"; src = fetchPypi { inherit pname version; - sha256 = "3b633a50873156d777e1f1075ba4d8e96a6ad0a3ca42aa3ea9a6259f93f18921"; + sha256 = "719b21dfb4b04fbc11cc0f6112418535fe35474021120cccfffc43a25fe63128"; }; meta = with stdenv.lib; { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pytest/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pytest/default.nix index 29def3082a..9328221887 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pytest/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pytest/default.nix @@ -21,14 +21,14 @@ }: buildPythonPackage rec { - version = "6.1.1"; + version = "6.1.2"; pname = "pytest"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "8f593023c1a0f916110285b6efd7f99db07d59546e3d8c36fc60e2ab05d3be92"; + sha256 = "c0a7e94a8cdbc5422a51ccdad8e6f1024795939cc89159a0ae7f0b316ad3823e"; }; checkInputs = [ hypothesis pygments ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-sql/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-sql/default.nix index b6a4893437..90dc5835e4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-sql/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-sql/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "python-sql"; - version = "1.1.0"; + version = "1.2.1"; src = fetchPypi { inherit pname version; - sha256 = "0f0g10y0whvax8yv0rfs7b4yd68lbxbss1za0mvbvr65b8r3pdxz"; + sha256 = "306999bd311fbf50804d76f346655af0a6ff18881ce46c1329256fee40f492c0"; }; meta = { diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyzmq/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyzmq/default.nix index f23d86eb4b..2d17e6a76e 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyzmq/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyzmq/default.nix @@ -1,6 +1,6 @@ { buildPythonPackage , fetchPypi -, pytest +, pytestCheckHook , tornado , zeromq , py @@ -16,23 +16,30 @@ buildPythonPackage rec { sha256 = "296540a065c8c21b26d63e3cea2d1d57902373b16e4256afe46422691903a438"; }; - checkInputs = [ pytest tornado ]; + checkInputs = [ + pytestCheckHook + tornado + ]; buildInputs = [ zeromq ]; propagatedBuildInputs = [ py ]; - # test_socket.py seems to be hanging - # others fail - # for test_monitor: https://github.com/zeromq/pyzmq/issues/1272 - checkPhase = '' - py.test $out/${python.sitePackages}/zmq/ -k "not test_socket \ - and not test_current \ - and not test_instance \ - and not test_callable_check \ - and not test_on_recv_basic \ - and not test_on_recv_wake \ - and not test_monitor \ - and not test_cython" - ''; + # failing tests + disabledTests = [ + "test_socket" # hangs + "test_current" + "test_instance" + "test_callable_check" + "test_on_recv_basic" + "test_on_recv_wake" + "test_monitor" # https://github.com/zeromq/pyzmq/issues/1272 + "test_cython" + "test_asyncio" # hangs + "test_mockable" # fails + ]; + + pytestFlagsArray = [ + "$out/${python.sitePackages}/zmq/tests/" # Folder with tests + ]; # Some of the tests use localhost networking. __darwinAllowLocalNetworking = true; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/rq/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/rq/default.nix index 66ca024b2b..c788d41641 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/rq/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/rq/default.nix @@ -2,14 +2,14 @@ buildPythonPackage rec { pname = "rq"; - version = "1.5.1"; + version = "1.5.2"; disabled = isPy27; src = fetchFromGitHub { owner = "rq"; repo = "rq"; rev = "v${version}"; - sha256 = "0i7yyw828wdvl7ap4gb7jhm4p94502is3xxrgrdgwwp0l1rac004"; + sha256 = "0ikqmpq0g1qiqwd7ar1286l4hqjb6aj2wr844gihhb8ijzwhp8va"; }; # test require a running redis rerver, which is something we can't do yet diff --git a/third_party/nixpkgs/pkgs/development/python-modules/setuptools-rust/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/setuptools-rust/default.nix index a00ea9e818..b04fa39149 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/setuptools-rust/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/setuptools-rust/default.nix @@ -1,6 +1,7 @@ { stdenv , buildPythonPackage , fetchPypi +, isPy27 , semantic-version , setuptools , setuptools_scm @@ -9,11 +10,13 @@ buildPythonPackage rec { pname = "setuptools-rust"; - version = "0.11.3"; + version = "0.11.4"; + + disabled = isPy27; src = fetchPypi { inherit pname version; - sha256 = "1p21sw77197m7pciy8g25bwwaakq1675h0x1lis9sypzr46p2s11"; + sha256 = "9714fcb94c78e6ab1864ddac7750049e105fd4f7c52103aecf40d408e94a722f"; }; nativeBuildInputs = [ setuptools_scm ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sh/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sh/default.nix index 3ef3393363..964512460b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/sh/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/sh/default.nix @@ -2,11 +2,11 @@ buildPythonPackage rec { pname = "sh"; - version = "1.14.0"; + version = "1.14.1"; src = fetchPypi { inherit pname version; - sha256 = "05c7e520cdf70f70a7228a03b589da9f96c6e0d06fc487ab21fc62b26a592e59"; + sha256 = "39aa9af22f6558a0c5d132881cf43e34828ca03e4ae11114852ca6a55c7c1d8e"; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/slither-analyzer/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/slither-analyzer/default.nix index d4f332b447..001c5f57f4 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/slither-analyzer/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/slither-analyzer/default.nix @@ -1,7 +1,5 @@ { lib, buildPythonPackage, fetchPypi, makeWrapper, pythonOlder -, prettytable -, setuptools -, solc +, crytic-compile, prettytable, setuptools, solc }: buildPythonPackage rec { @@ -19,7 +17,7 @@ buildPythonPackage rec { }; nativeBuildInputs = [ makeWrapper ]; - propagatedBuildInputs = [ prettytable setuptools ]; + propagatedBuildInputs = [ crytic-compile prettytable setuptools ]; postFixup = '' wrapProgram $out/bin/slither \ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/smugline/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/smugline/default.nix deleted file mode 100644 index d779a79ed2..0000000000 --- a/third_party/nixpkgs/pkgs/development/python-modules/smugline/default.nix +++ /dev/null @@ -1,40 +0,0 @@ -{ stdenv -, fetchFromGitHub -, docopt -, requests -, smugpy -, python -, pkgs -}: - -stdenv.mkDerivation rec { - pname = "smugline"; - version = "20160106"; - - src = fetchFromGitHub { - owner = "gingerlime"; - repo = pname; - rev = "134554c574c2d282112ba60165a8c5ffe0f16fd4"; - sha256 = "00n012ijkdrx8wsl8x3ghdcxcdp29s4kwr3yxvlyj79g5yhfvaj6"; - }; - - phases = [ "unpackPhase" "installPhase" ]; - - buildInputs = [ python pkgs.makeWrapper ]; - propagatedBuildInputs = [ docopt requests smugpy ]; - - installPhase = '' - mkdir -p $out/bin $out/libexec - cp smugline.py $out/libexec - makeWrapper ${python.interpreter} $out/bin/smugline \ - --add-flags "$out/libexec/smugline.py" \ - --prefix PYTHONPATH : "$PYTHONPATH" - ''; - - meta = with stdenv.lib; { - homepage = "https://github.com/gingerlime/smugline"; - description = "A simple command line tool for smugmug "; - license = licenses.mit; - }; - -} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/smugpy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/smugpy/default.nix deleted file mode 100644 index 43ac45b123..0000000000 --- a/third_party/nixpkgs/pkgs/development/python-modules/smugpy/default.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ stdenv, buildPythonPackage, fetchFromGitHub }: - -buildPythonPackage rec { - pname = "smugpy"; - version = "20131218"; - - src = fetchFromGitHub { - owner = "chrishoffman"; - repo = pname; - rev = "f698d6749ce446e3d6c7d925b2cd1cd5b3d695ea"; - sha256 = "029x6hm1744iznv4sw8sfyl974wmx1sqnr1k5dvzzwpk3ja49a1y"; - }; - - meta = with stdenv.lib; { - description = "Python library for the SmugMug API"; - license = with licenses; [ mit ]; - homepage = "https://github.com/chrishoffman/smugpy"; - }; - - doCheck = false; # Tries to login to Smugmug… -} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/sqlite-utils/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/sqlite-utils/default.nix new file mode 100644 index 0000000000..9fc4c328b2 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/python-modules/sqlite-utils/default.nix @@ -0,0 +1,42 @@ +{ lib +, buildPythonPackage +, fetchPypi +, isPy3k +, click +, click-default-group +, tabulate +, pytestCheckHook +, pytestrunner +, black +}: + +buildPythonPackage rec { + pname = "sqlite-utils"; + version = "2.22"; + disabled = !isPy3k; + + src = fetchPypi { + inherit pname version; + sha256 = "0g8zzp4qw6miijirykjcd78ib027k7dmg6lb9m4xysvah5jh8vfv"; + }; + + propagatedBuildInputs = [ + click + click-default-group + tabulate + ]; + + checkInputs = [ + pytestCheckHook + pytestrunner + black + ]; + + meta = with lib; { + description = "Python CLI utility and library for manipulating SQLite databases"; + homepage = "https://github.com/simonw/sqlite-utils"; + license = licenses.asl20; + maintainers = [ maintainers.meatcar ]; + }; + +} diff --git a/third_party/nixpkgs/pkgs/development/python-modules/thinc/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/thinc/default.nix index 9272e25a1b..5ac55f5f57 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/thinc/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/thinc/default.nix @@ -23,11 +23,11 @@ buildPythonPackage rec { pname = "thinc"; - version = "7.4.1"; + version = "7.4.2"; src = fetchPypi { inherit pname version; - sha256 = "17lampllwq50yjl2djs9bs5rp29xw55gqj762npqi3cvvj2glf81"; + sha256 = "772f1a27b9b31e51003d1d2a7476cc49cc81044dd87088112237f93bd2091f0b"; }; buildInputs = lib.optionals stdenv.isDarwin (with darwin.apple_sdk.frameworks; [ diff --git a/third_party/nixpkgs/pkgs/development/python-modules/user-agents/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/user-agents/default.nix index 80985eed48..5fb926607b 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/user-agents/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/user-agents/default.nix @@ -2,14 +2,14 @@ buildPythonPackage rec { pname = "user-agents"; - version = "2.1.0"; + version = "2.2.0"; # PyPI is missing devices.json src = fetchFromGitHub { owner = "selwin"; repo = "python-user-agents"; rev = "v${version}"; - sha256 = "04bndajsfnpymxfiggnj7g38cmlvca3ry5k2611x8ibp38x53yhc"; + sha256 = "0pcbjqj21c2ixhl414bh2h8khi8y1igzfpkyqwan1pakix0lq45a"; }; propagatedBuildInputs = [ ua-parser ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/wled/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/wled/default.nix index 329cdd5b61..92dbc210c6 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/wled/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/wled/default.nix @@ -36,7 +36,7 @@ buildPythonPackage rec { pytestCheckHook ]; - pythonImportCheck = [ "wled" ]; + pythonImportsCheck = [ "wled" ]; meta = with lib; { description = "Asynchronous Python client for WLED"; diff --git a/third_party/nixpkgs/pkgs/development/tools/ammonite/default.nix b/third_party/nixpkgs/pkgs/development/tools/ammonite/default.nix index 82e38e2a25..c3a578f18b 100644 --- a/third_party/nixpkgs/pkgs/development/tools/ammonite/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/ammonite/default.nix @@ -1,8 +1,11 @@ -{ stdenv, fetchurl, jre, disableRemoteLogging ? true }: +{ stdenv, fetchurl, jre, nixosTests, writeScript, common-updater-scripts, git +, nixfmt, nix, coreutils, gnused, disableRemoteLogging ? true }: with stdenv.lib; let + repo = "git@github.com:lihaoyi/Ammonite.git"; + common = { scalaVersion, sha256 }: stdenv.mkDerivation rec { pname = "ammonite"; @@ -24,6 +27,37 @@ let sed -i '1i #!/bin/sh' $out/bin/amm ''; + passthru = { + tests = { inherit (nixosTests) ammonite; }; + + updateScript = writeScript "update.sh" '' + #!${stdenv.shell} + set -o errexit + PATH=${ + stdenv.lib.makeBinPath [ + common-updater-scripts + coreutils + git + gnused + nix + nixfmt + ] + } + oldVersion="$(nix-instantiate --eval -E "with import ./. {}; lib.getVersion ${pname}" | tr -d '"')" + latestTag="$(git -c 'versionsort.suffix=-' ls-remote --exit-code --refs --sort='version:refname' --tags ${repo} '*.*.*' | tail --lines=1 | cut --delimiter='/' --fields=3)" + if [ "$oldVersion" != "$latestTag" ]; then + nixpkgs="$(git rev-parse --show-toplevel)" + default_nix="$nixpkgs/pkgs/development/tools/ammonite/default.nix" + update-source-version ${pname}_2_12 "$latestTag" --version-key=version --print-changes + sed -i "s|$latestTag|$oldVersion|g" "$default_nix" + update-source-version ${pname}_2_13 "$latestTag" --version-key=version --print-changes + nixfmt "$default_nix" + else + echo "${pname} is already up-to-date" + fi + ''; + }; + meta = { description = "Improved Scala REPL"; longDescription = '' @@ -41,10 +75,10 @@ let in { ammonite_2_12 = common { scalaVersion = "2.12"; - sha256 = "0nclfqwy3jfn1680z1hd0zzmc0b79wpvx6gn1jnm19aq7qcvh5zp"; + sha256 = "9xe4GT5YpVCtDPaZvi9PZwFW/wcNhg+QCdbJ4Tl2lFk="; }; ammonite_2_13 = common { scalaVersion = "2.13"; - sha256 = "104bnahn382sb6vwjvchsg0jrnkkwjn08rfh0g5ra7lwhgcj2719"; + sha256 = "KRwh2YOcHpXLA9BlBKzkc9oswdOQbcm3WVqgYaGyi4A="; }; } diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/apache-ant/default.nix b/third_party/nixpkgs/pkgs/development/tools/build-managers/apache-ant/default.nix index b0411090fb..caa9bc3b9e 100644 --- a/third_party/nixpkgs/pkgs/development/tools/build-managers/apache-ant/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/apache-ant/default.nix @@ -1,6 +1,6 @@ { fetchurl, stdenv, coreutils, makeWrapper }: -let version = "1.10.8"; in +let version = "1.10.9"; in stdenv.mkDerivation { pname = "ant"; @@ -10,7 +10,7 @@ stdenv.mkDerivation { src = fetchurl { url = "mirror://apache/ant/binaries/apache-ant-${version}-bin.tar.bz2"; - sha256 = "0zh94csb2hl6ir2ccn18ps506mjgh3mffnrb8wpsmp1x5fcykha5"; + sha256 = "1ab8ybczvk12501dnj450a3d4v43ca0pjhk33s175hax46s58z47"; }; contrib = fetchurl { diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/cmake/default.nix b/third_party/nixpkgs/pkgs/development/tools/build-managers/cmake/default.nix index 559a4c191b..010f1d9c6c 100644 --- a/third_party/nixpkgs/pkgs/development/tools/build-managers/cmake/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/cmake/default.nix @@ -5,6 +5,7 @@ , ps , isBootstrap ? false , useSharedLibraries ? (!isBootstrap && !stdenv.isCygwin) +, useOpenSSL ? !isBootstrap, openssl , useNcurses ? false, ncurses , useQt4 ? false, qt4 , withQt5 ? false, qtbase @@ -44,15 +45,17 @@ stdenv.mkDerivation rec { setupHook = ./setup-hook.sh; - buildInputs = - [ setupHook pkgconfig ] + depsBuildBuild = [ buildPackages.stdenv.cc ]; + + nativeBuildInputs = [ setupHook pkgconfig ]; + + buildInputs = [] ++ lib.optionals useSharedLibraries [ bzip2 curl expat libarchive xz zlib libuv rhash ] + ++ lib.optional useOpenSSL openssl ++ lib.optional useNcurses ncurses ++ lib.optional useQt4 qt4 ++ lib.optional withQt5 qtbase; - depsBuildBuild = [ buildPackages.stdenv.cc ]; - propagatedBuildInputs = lib.optional stdenv.isDarwin ps; preConfigure = '' @@ -91,13 +94,15 @@ stdenv.mkDerivation rec { "-DCMAKE_AR=${lib.getBin stdenv.cc.bintools.bintools}/bin/${stdenv.cc.targetPrefix}ar" "-DCMAKE_RANLIB=${lib.getBin stdenv.cc.bintools.bintools}/bin/${stdenv.cc.targetPrefix}ranlib" "-DCMAKE_STRIP=${lib.getBin stdenv.cc.bintools.bintools}/bin/${stdenv.cc.targetPrefix}strip" - ] + + "-DCMAKE_USE_OPENSSL=${if useOpenSSL then "ON" else "OFF"}" # Avoid depending on frameworks. - ++ lib.optional (!useNcurses) "-DBUILD_CursesDialog=OFF"; + "-DBUILD_CursesDialog=${if useNcurses then "ON" else "OFF"}" + ]; # make install attempts to use the just-built cmake preInstall = lib.optional (stdenv.hostPlatform != stdenv.buildPlatform) '' - sed -i 's|bin/cmake|${buildPackages.cmake}/bin/cmake|g' Makefile + sed -i 's|bin/cmake|${buildPackages.cmakeMinimal}/bin/cmake|g' Makefile ''; dontUseCmakeConfigure = true; diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/gn/default.nix b/third_party/nixpkgs/pkgs/development/tools/build-managers/gn/default.nix index 599e10af1a..3c0abb3ede 100644 --- a/third_party/nixpkgs/pkgs/development/tools/build-managers/gn/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/gn/default.nix @@ -59,6 +59,6 @@ in stdenv.mkDerivation { homepage = "https://gn.googlesource.com/gn"; license = licenses.bsd3; platforms = platforms.unix; - maintainers = with maintainers; [ stesie matthewbauer ]; + maintainers = with maintainers; [ stesie matthewbauer primeos ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/meson/boost-Do-not-add-system-paths-on-nix.patch b/third_party/nixpkgs/pkgs/development/tools/build-managers/meson/boost-Do-not-add-system-paths-on-nix.patch new file mode 100644 index 0000000000..5b9020b3d5 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/meson/boost-Do-not-add-system-paths-on-nix.patch @@ -0,0 +1,40 @@ +From 536108b10271f2f42d41c7d9ddb4ce2ea1851f4f Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?Niklas=20Hamb=C3=BCchen?= +Date: Sat, 17 Oct 2020 19:27:08 +0200 +Subject: [PATCH] boost: Do not add system paths on nix + +--- + mesonbuild/dependencies/boost.py | 17 +---------------- + 1 file changed, 1 insertion(+), 16 deletions(-) + +diff --git a/mesonbuild/dependencies/boost.py b/mesonbuild/dependencies/boost.py +index 907c0c275..ecaf11b18 100644 +--- a/mesonbuild/dependencies/boost.py ++++ b/mesonbuild/dependencies/boost.py +@@ -643,22 +643,7 @@ class BoostDependency(ExternalDependency): + roots += [x for x in candidates if x.name.lower().startswith('boost') and x.is_dir()] + else: + tmp = [] # type: T.List[Path] +- +- # Homebrew +- brew_boost = Path('/usr/local/Cellar/boost') +- if brew_boost.is_dir(): +- tmp += [x for x in brew_boost.iterdir()] +- +- # Add some default system paths +- tmp += [Path('/opt/local')] +- tmp += [Path('/usr/local/opt/boost')] +- tmp += [Path('/usr/local')] +- tmp += [Path('/usr')] +- +- # Cleanup paths +- tmp = [x for x in tmp if x.is_dir()] +- tmp = [x.resolve() for x in tmp] +- roots += tmp ++ # Do not add any non-explicit paths on nix + + return roots + +-- +2.25.4 + diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/meson/default.nix b/third_party/nixpkgs/pkgs/development/tools/build-managers/meson/default.nix index 8421fb7d70..1b9c3ef647 100644 --- a/third_party/nixpkgs/pkgs/development/tools/build-managers/meson/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/meson/default.nix @@ -52,6 +52,11 @@ python3.pkgs.buildPythonApplication rec { # cut-in-half-by-\0 store path references. # Let’s just clear the whole rpath and hope for the best. ./clear-old-rpath.patch + + # Patch out default boost search paths to avoid impure builds on + # unsandboxed non-NixOS builds, see: + # https://github.com/NixOS/nixpkgs/issues/86131#issuecomment-711051774 + ./boost-Do-not-add-system-paths-on-nix.patch ]; setupHook = ./setup-hook.sh; diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/msbuild/default.nix b/third_party/nixpkgs/pkgs/development/tools/build-managers/msbuild/default.nix index aea215cc92..1b805df95a 100644 --- a/third_party/nixpkgs/pkgs/development/tools/build-managers/msbuild/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/msbuild/default.nix @@ -52,7 +52,7 @@ stdenv.mkDerivation rec { nuget sources Add -Name nixos -Source $(pwd)/nixos # license check is case sensitive - mv LICENSE license + mv LICENSE license.bak && mv license.bak license mkdir -p artifacts unzip ${xplat} -d artifacts diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/rocm-cmake/default.nix b/third_party/nixpkgs/pkgs/development/tools/build-managers/rocm-cmake/default.nix index ae2e63e040..77a424ae16 100644 --- a/third_party/nixpkgs/pkgs/development/tools/build-managers/rocm-cmake/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/rocm-cmake/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "rocm-cmake"; - version = "3.8.0"; + version = "3.9.0"; src = fetchFromGitHub { owner = "RadeonOpenCompute"; repo = "rocm-cmake"; rev = "rocm-${version}"; - sha256 = "1x1mj1acarhin319zycms8sqm9ylw2mcdbkpqjlb8yfsgiaa99ja"; + sha256 = "13j7gmcy1j6qsydgccmgiacg6sj38l5mlwn4ck8qizl0cpc14gfm"; }; nativeBuildInputs = [ cmake ]; 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 2ff15d6887..dbace29d7e 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 @@ -1,13 +1,14 @@ -{ stdenv, fetchurl, jre, autoPatchelfHook, zlib }: +{ stdenv, fetchurl, jre, autoPatchelfHook, zlib, writeScript +, common-updater-scripts, git, nixfmt, nix, coreutils, gnused, nixosTests }: stdenv.mkDerivation rec { pname = "sbt"; - version = "1.4.0"; + version = "1.4.2"; src = fetchurl { url = "https://github.com/sbt/sbt/releases/download/v${version}/sbt-${version}.tgz"; - sha256 = "1mgfs732w1c1p7dna7h47x8h073lvjs224fqlpkkvq10153mnxxl"; + sha256 = "1dw4l91sw4ybqxjid1hsb6r33ka5bl85rfdrbsr9m5vxl82a3mmc"; }; patchPhase = '' @@ -34,4 +35,35 @@ stdenv.mkDerivation rec { maintainers = with maintainers; [ nequissimus ]; platforms = platforms.unix; }; + + passthru = { + tests = { inherit (nixosTests) sbt; }; + + updateScript = writeScript "update.sh" '' + #!${stdenv.shell} + set -o errexit + PATH=${ + stdenv.lib.makeBinPath [ + common-updater-scripts + git + nixfmt + nix + coreutils + gnused + ] + } + + oldVersion="$(nix-instantiate --eval -E "with import ./. {}; lib.getVersion sbt" | tr -d '"')" + latestTag="$(git -c 'versionsort.suffix=-' ls-remote --exit-code --refs --sort='version:refname' --tags git@github.com:sbt/sbt.git '*.*.*' | tail --lines=1 | cut --delimiter='/' --fields=3 | sed 's|^v||g')" + + if [ ! "$oldVersion" = "$latestTag" ]; then + update-source-version sbt "$latestTag" --version-key=version --print-changes + nixpkgs="$(git rev-parse --show-toplevel)" + default_nix="$nixpkgs/pkgs/development/tools/build-managers/sbt/default.nix" + nixfmt "$default_nix" + else + echo "sbt is already up-to-date" + fi + ''; + }; } diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/tup/default.nix b/third_party/nixpkgs/pkgs/development/tools/build-managers/tup/default.nix index 80ee38105c..628e0c4797 100644 --- a/third_party/nixpkgs/pkgs/development/tools/build-managers/tup/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/tup/default.nix @@ -1,18 +1,19 @@ -{ stdenv, fetchFromGitHub, fuse, pkgconfig, pcre }: +{ stdenv, fetchFromGitHub, fuse3, pkgconfig, pcre }: stdenv.mkDerivation rec { pname = "tup"; - version = "0.7.9"; + version = "0.7.10"; + outputs = [ "bin" "man" "out" ]; src = fetchFromGitHub { owner = "gittup"; repo = "tup"; rev = "v${version}"; - sha256 = "1b9rllwfdmjvfmwvzqfbqfi1flf4y9zzjmyp0dizq23gpkvhi42f"; + sha256 = "1qd07h4wi0743l7z2vybfvhwp61g2p2pc5qhl40672ryl24nvd1d"; }; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ fuse pcre ]; + buildInputs = [ fuse3 pcre ]; configurePhase = '' sed -i 's/`git describe`/v${version}/g' src/tup/link.sh @@ -30,11 +31,8 @@ stdenv.mkDerivation rec { ''; installPhase = '' - mkdir -p $out/bin - cp tup $out/bin/ - - mkdir -p $out/share/man/man1 - cp tup.1 $out/share/man/man1/ + install -D tup -t $bin/bin/ + install -D tup.1 -t $man/share/man/man1/ ''; setupHook = ./setup-hook.sh; diff --git a/third_party/nixpkgs/pkgs/development/tools/buildpack/default.nix b/third_party/nixpkgs/pkgs/development/tools/buildpack/default.nix index 1d8e53ba52..8845e39f1d 100644 --- a/third_party/nixpkgs/pkgs/development/tools/buildpack/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/buildpack/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "pack"; - version = "0.13.0"; + version = "0.14.2"; src = fetchFromGitHub { owner = "buildpacks"; repo = pname; rev = "v${version}"; - sha256 = "0h7lgsg5d74pfa15kx0y3ngnvmz64znqk2k73iyjya9pi9h8hh88"; + sha256 = "0m2hcd7fdvlqy8yp3pa2ccpk9wbnknjh2f8qic31v9yh3zm8aga7"; }; vendorSha256 = "1c38g169kq9kv6x0x1rlg39ywbc1q66fndby0v85b3ri3xb52869"; diff --git a/third_party/nixpkgs/pkgs/development/tools/clj-kondo/default.nix b/third_party/nixpkgs/pkgs/development/tools/clj-kondo/default.nix index f64041d1be..92596a068f 100644 --- a/third_party/nixpkgs/pkgs/development/tools/clj-kondo/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/clj-kondo/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, graalvm8, fetchurl }: +{ stdenv, lib, graalvm8-ce, fetchurl }: stdenv.mkDerivation rec { pname = "clj-kondo"; @@ -17,7 +17,7 @@ stdenv.mkDerivation rec { dontUnpack = true; - buildInputs = [ graalvm8 ]; + buildInputs = [ graalvm8-ce ]; buildPhase = '' native-image \ @@ -45,7 +45,7 @@ stdenv.mkDerivation rec { description = "A linter for Clojure code that sparks joy"; homepage = "https://github.com/borkdude/clj-kondo"; license = licenses.epl10; - platforms = graalvm8.meta.platforms; + platforms = graalvm8-ce.meta.platforms; maintainers = with maintainers; [ jlesquembre bandresen ]; }; } 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 d9eb540c3f..b4cc2843c3 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 @@ -1,12 +1,13 @@ -{ stdenv, fetchurl }: +{ stdenv, fetchurl, common-updater-scripts, coreutils, git, gnused, nix, nixfmt +, writeScript, nixosTests, jq, cacert, curl }: stdenv.mkDerivation rec { pname = "jenkins"; - version = "2.249.2"; + version = "2.249.3"; src = fetchurl { url = "http://mirrors.jenkins.io/war-stable/${version}/jenkins.war"; - sha256 = "08m5z4ik96gnhw92hjzch7rpvrs0dipi9fps4rihwwzg5k26rc0v"; + sha256 = "00lpqkkz7k0m2czz1sg54gb90sljc14i5a2kpikrkiw8aqfz3s4d"; }; buildCommand = '' @@ -14,11 +15,50 @@ stdenv.mkDerivation rec { cp "$src" "$out/webapps/jenkins.war" ''; + passthru = { + tests = { inherit (nixosTests) jenkins; }; + + updateScript = writeScript "update.sh" '' + #!${stdenv.shell} + set -o errexit + PATH=${ + stdenv.lib.makeBinPath [ + cacert + common-updater-scripts + coreutils + curl + git + gnused + jq + nix + nixfmt + ] + } + + core_json="$(curl -s --fail --location https://updates.jenkins.io/stable/update-center.actual.json | jq .core)" + oldVersion=$(nix-instantiate --eval -E "with import ./. {}; lib.getVersion jenkins" | tr -d '"') + + version="$(jq -r .version <<<$core_json)" + sha256="$(jq -r .sha256 <<<$core_json)" + hash="$(nix-hash --type sha256 --to-base32 "$sha256")" + url="$(jq -r .url <<<$core_json)" + + if [ ! "$oldVersion" = "$version" ]; then + update-source-version jenkins "$version" "$hash" "$url" + nixpkgs="$(git rev-parse --show-toplevel)" + default_nix="$nixpkgs/pkgs/development/tools/continuous-integration/jenkins/default.nix" + nixfmt "$default_nix" + else + echo "jenkins is already up-to-date" + fi + ''; + }; + meta = with stdenv.lib; { description = "An extendable open source continuous integration server"; homepage = "https://jenkins-ci.org"; license = licenses.mit; platforms = platforms.all; - maintainers = with maintainers; [ coconnor fpletz earldouglas ]; + maintainers = with maintainers; [ coconnor fpletz earldouglas nequissimus ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/tools/continuous-integration/jenkins/update.sh b/third_party/nixpkgs/pkgs/development/tools/continuous-integration/jenkins/update.sh deleted file mode 100755 index 4f2f6527ec..0000000000 --- a/third_party/nixpkgs/pkgs/development/tools/continuous-integration/jenkins/update.sh +++ /dev/null @@ -1,22 +0,0 @@ -#!/usr/bin/env nix-shell -#!nix-shell -i bash -p curl common-updater-scripts jq - -set -eu -o pipefail - -core_json="$(curl -s --fail --location https://updates.jenkins.io/stable/update-center.actual.json | jq .core)" -oldVersion=$(nix-instantiate --eval -E "with import ./. {}; lib.getVersion jenkins" | tr -d '"') - -version="$(jq -r .version <<<$core_json)" -sha256="$(jq -r .sha256 <<<$core_json)" -hash="$(nix-hash --type sha256 --to-base32 "$sha256")" -url="$(jq -r .url <<<$core_json)" - -if [ ! "${oldVersion}" = "${version}" ]; then - update-source-version jenkins "$version" "$hash" "$url" - nixpkgs="$(git rev-parse --show-toplevel)" - default_nix="$nixpkgs/pkgs/development/tools/continuous-integration/jenkins/default.nix" - git add "${default_nix}" - git commit -m "jenkins: ${oldVersion} -> ${version}" -else - echo "jenkins is already up-to-date" -fi diff --git a/third_party/nixpkgs/pkgs/development/tools/coursier/default.nix b/third_party/nixpkgs/pkgs/development/tools/coursier/default.nix index ac2338b4c1..662cea9558 100644 --- a/third_party/nixpkgs/pkgs/development/tools/coursier/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/coursier/default.nix @@ -1,18 +1,25 @@ -{ stdenv, fetchurl, makeWrapper, jre }: +{ stdenv, fetchurl, makeWrapper, jre, writeScript, common-updater-scripts +, coreutils, git, gnused, nix, nixfmt }: let - zshCompletion = version: fetchurl { - url = "https://raw.githubusercontent.com/coursier/coursier/v${version}/modules/cli/src/main/resources/completions/zsh"; + version = "2.0.6"; + + zshCompletion = fetchurl { + url = + "https://raw.githubusercontent.com/coursier/coursier/v${version}/modules/cli/src/main/resources/completions/zsh"; sha256 = "0afxzrk9w1qinfsz55jjrxydw0fcv6p722g1q955dl7f6xbab1jh"; }; -in -stdenv.mkDerivation rec { + + repo = "git@github.com:coursier/coursier.git"; +in stdenv.mkDerivation rec { + inherit version; + pname = "coursier"; - version = "2.0.5"; src = fetchurl { - url = "https://github.com/coursier/coursier/releases/download/v${version}/coursier"; - sha256 = "1j614pw8i2mfgrv3jb5q3ifrxkrb7apj13zdrbnvnh4bzwlg5jb2"; + url = + "https://github.com/coursier/coursier/releases/download/v${version}/coursier"; + sha256 = "MnKCEFY62LH18rqDa9zvn+f0Zd0hnsPcB7coQuI64H0="; }; nativeBuildInputs = [ makeWrapper ]; @@ -23,12 +30,42 @@ stdenv.mkDerivation rec { wrapProgram $out/bin/coursier --prefix PATH ":" ${jre}/bin # copy zsh completion - install -Dm755 ${zshCompletion version} $out/share/zsh/site-functions/_coursier + install -Dm755 ${zshCompletion} $out/share/zsh/site-functions/_coursier + ''; + + passthru.updateScript = writeScript "update.sh" '' + #!${stdenv.shell} + set -o errexit + PATH=${ + stdenv.lib.makeBinPath [ + common-updater-scripts + coreutils + git + gnused + nix + nixfmt + ] + } + oldVersion="$(nix-instantiate --eval -E "with import ./. {}; lib.getVersion ${pname}" | tr -d '"')" + latestTag="$(git -c 'versionsort.suffix=-' ls-remote --exit-code --refs --sort='version:refname' --tags ${repo} 'v*.*.*' | tail --lines=1 | cut --delimiter='/' --fields=3 | sed 's|^v||g')" + if [ "$oldVersion" != "$latestTag" ]; then + nixpkgs="$(git rev-parse --show-toplevel)" + default_nix="$nixpkgs/pkgs/development/tools/coursier/default.nix" + update-source-version ${pname} "$latestTag" --version-key=version --print-changes + url="${builtins.head zshCompletion.urls}" + completion_url=$(echo $url | sed "s|$oldVersion|$latestTag|g") + completion_sha256="$(nix-prefetch-url --type sha256 $completion_url)" + sed -i "s|${zshCompletion.outputHash}|$completion_sha256|g" "$default_nix" + nixfmt "$default_nix" + else + echo "${pname} is already up-to-date" + fi ''; meta = with stdenv.lib; { homepage = "https://get-coursier.io/"; - description = "A Scala library to fetch dependencies from Maven / Ivy repositories"; + description = + "A Scala library to fetch dependencies from Maven / Ivy repositories"; license = licenses.asl20; maintainers = with maintainers; [ adelbertc nequissimus ]; }; diff --git a/third_party/nixpkgs/pkgs/development/tools/github/bump/default.nix b/third_party/nixpkgs/pkgs/development/tools/github/bump/default.nix new file mode 100644 index 0000000000..791b8b7aa9 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/github/bump/default.nix @@ -0,0 +1,29 @@ +{ buildGoModule, fetchFromGitHub, lib }: + +buildGoModule rec { + pname = "bump"; + version = "0.2.2"; + + src = fetchFromGitHub { + owner = "mroth"; + repo = pname; + rev = "v${version}"; + sha256 = "0092jn7nxnr64fyb2yy9amrd8gl7q9p70a2yq9jrgr1pyrlrazbq"; + }; + + vendorSha256 = "0w5sqg1ii4vp7iijs6ffbskkj2xqggbr40j6wxrjrbjr1qisl8r1"; + + doCheck = false; + + buildFlagsArray = [ + "-ldflags=-X main.buildVersion=${version} -X main.buildCommit=${version} -X main.buildDate=1970-01-01" + ]; + + meta = with lib; { + license = licenses.mit; + homepage = "https://github.com/mroth/bump"; + description = "CLI tool to draft a GitHub Release for the next semantic version"; + maintainers = with maintainers; [ doronbehar ]; + }; +} + diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/blackfire/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/blackfire/default.nix index 08496d9f52..27e043a9ac 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/blackfire/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/blackfire/default.nix @@ -11,11 +11,11 @@ stdenv.mkDerivation rec { pname = "blackfire-agent"; - version = "1.44.1"; + version = "1.44.2"; src = fetchurl { url = "https://packages.blackfire.io/debian/pool/any/main/b/blackfire-php/blackfire-agent_${version}_amd64.deb"; - sha256 = "1p00flipm5x6r36gblfrfrd14byipilybrhfzv8rzpahz2b7r5hb"; + sha256 = "1bam4sb0yhxciykph7wn41zs8fa7c9iwnbihd5kza0cylbb7fbkb"; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/blackfire/php-probe.nix b/third_party/nixpkgs/pkgs/development/tools/misc/blackfire/php-probe.nix index 5de2a05349..a14f5b0edb 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/blackfire/php-probe.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/blackfire/php-probe.nix @@ -17,11 +17,11 @@ let }.${lib.versions.majorMinor php.version} or (throw "Unsupported PHP version."); in stdenv.mkDerivation rec { pname = "php-blackfire"; - version = "1.41.0"; + version = "1.43.0"; src = fetchurl { url = "https://packages.blackfire.io/debian/pool/any/main/b/blackfire-php/blackfire-php_${version}_amd64.deb"; - sha256 = "0vbl48bccswk9ygb4sshn24cl33fk0xg8d1bcg7ihvdc45any9ww"; + sha256 = "1038qbpqkamd51ip25z6fbbz69faggahhdw75lnsd8prrwjcpli7"; }; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/tools/operator-sdk/default.nix b/third_party/nixpkgs/pkgs/development/tools/operator-sdk/default.nix index c803207f88..e22aaf6ed6 100644 --- a/third_party/nixpkgs/pkgs/development/tools/operator-sdk/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/operator-sdk/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "operator-sdk"; - version = "1.0.1"; + version = "1.1.0"; src = fetchFromGitHub { owner = "operator-framework"; repo = pname; rev = "v${version}"; - sha256 = "1p2ra7mqn7crip6sjgq2j49782ncvs4qahjwg6jk5rdvvi4hbyc7"; + sha256 = "11xlay3sk5nr9pfbqifcrfi5h81qnhs3hg5b75zgqysgr4d2m987"; }; - vendorSha256 = "0zy540cbfm1kfc5sp802a9a5l2gkpgqprn8mlh9zg4d4shni61wa"; + vendorSha256 = "1bbj23rwghqfw9vsgj9i9zrxvl480adsmjg1zb06cdhh5j1hl0vy"; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/antlr/4.7.nix b/third_party/nixpkgs/pkgs/development/tools/parsing/antlr/4.8.nix similarity index 93% rename from third_party/nixpkgs/pkgs/development/tools/parsing/antlr/4.7.nix rename to third_party/nixpkgs/pkgs/development/tools/parsing/antlr/4.8.nix index 23267bf243..1c88c82e16 100644 --- a/third_party/nixpkgs/pkgs/development/tools/parsing/antlr/4.7.nix +++ b/third_party/nixpkgs/pkgs/development/tools/parsing/antlr/4.8.nix @@ -2,12 +2,12 @@ , fetchFromGitHub, cmake, ninja, pkgconfig, libuuid, darwin }: let - version = "4.7.2"; + version = "4.8"; source = fetchFromGitHub { owner = "antlr"; repo = "antlr4"; rev = version; - sha256 = "1pl0zs6c6wx9nmq30s7ccpc3dl72az55i8vfp574fw9sywmvxmlj"; + sha256 = "1qal3add26qxskm85nk7r758arladn5rcyjinmhlhznmpbbv9j8m"; }; runtime = { @@ -41,7 +41,7 @@ let src = fetchurl { url ="https://www.antlr.org/download/antlr-${version}-complete.jar"; - sha256 = "1d40nfkq3ws8g4ksx4gj6l6m2l9j4b605q6sf68z5vvmg5nkhlk8"; + sha256 = "0nms976cnqyr1ndng3haxkmknpdq6xli4cpf4x4al0yr21l9v93k"; }; dontUnpack = true; diff --git a/third_party/nixpkgs/pkgs/development/tools/rufo/Gemfile b/third_party/nixpkgs/pkgs/development/tools/rufo/Gemfile new file mode 100644 index 0000000000..5db4a68b13 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/rufo/Gemfile @@ -0,0 +1,3 @@ +source 'https://rubygems.org' + +gem 'rufo' diff --git a/third_party/nixpkgs/pkgs/development/tools/rufo/Gemfile.lock b/third_party/nixpkgs/pkgs/development/tools/rufo/Gemfile.lock new file mode 100644 index 0000000000..f63ff520e6 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/rufo/Gemfile.lock @@ -0,0 +1,13 @@ +GEM + remote: https://rubygems.org/ + specs: + rufo (0.12.0) + +PLATFORMS + ruby + +DEPENDENCIES + rufo + +BUNDLED WITH + 2.1.4 diff --git a/third_party/nixpkgs/pkgs/development/tools/rufo/default.nix b/third_party/nixpkgs/pkgs/development/tools/rufo/default.nix new file mode 100644 index 0000000000..d64173700e --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/rufo/default.nix @@ -0,0 +1,16 @@ +{ bundlerApp, bundlerUpdateScript, lib }: + +bundlerApp { + pname = "rufo"; + gemdir = ./.; + exes = [ "rufo" ]; + + passthru.updateScript = bundlerUpdateScript "rufo"; + + meta = with lib; { + description = "Ruby formatter"; + homepage = "https://github.com/ruby-formatter/rufo"; + license = licenses.mit; + maintainers = with maintainers; [ andersk ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/tools/rufo/gemset.nix b/third_party/nixpkgs/pkgs/development/tools/rufo/gemset.nix new file mode 100644 index 0000000000..cd5c2c462a --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/rufo/gemset.nix @@ -0,0 +1,12 @@ +{ + rufo = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0nwasskcm0nrf7f52019x4fvxa5zckj4fcvf4cdl0qflrcwb1l9f"; + type = "gem"; + }; + version = "0.12.0"; + }; +} \ No newline at end of file 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 4d1c851198..4249e55247 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.7"; + version = "0.32.8"; src = fetchCrate { inherit pname version; - sha256 = "0x8alv0jdk7xl63b2m4696w2hwqnbwxfqz6f3gisljll42xp6n2z"; + sha256 = "sha256-TwutU4RjiYtxc2vT67Bgqe/WRHi5aXwgzvZu7Wk4Cao="; }; nativeBuildInputs = [ pkg-config ]; @@ -16,7 +16,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl ] ++ stdenv.lib.optionals stdenv.isDarwin [ Security SystemConfiguration ]; - cargoSha256 = "1y2izxlc1nz3kqzrnhh9ir8j1gwvpj4cma2iqd65s9cf7xpkr6cx"; + cargoSha256 = "sha256-HzRriPVaMn6qDu6h/NQjILglO4/0//8J1orV4Uz+XEI="; # Some tests fail because they need network access. # However, Travis ensures a proper build. diff --git a/third_party/nixpkgs/pkgs/development/tools/vagrant/default.nix b/third_party/nixpkgs/pkgs/development/tools/vagrant/default.nix index 4e2930f97a..24f93f55ef 100644 --- a/third_party/nixpkgs/pkgs/development/tools/vagrant/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/vagrant/default.nix @@ -5,9 +5,9 @@ let # NOTE: bumping the version and updating the hash is insufficient; # you must use bundix to generate a new gemset.nix in the Vagrant source. - version = "2.2.10"; + version = "2.2.11"; url = "https://github.com/hashicorp/vagrant/archive/v${version}.tar.gz"; - sha256 = "07wlj4m79m9li3za1jkk4imdhqwpca86qz3c0h706s0w8cmv4bbj"; + sha256 = "sha256-KDQDEMebqQYgsBroHmQrm/OJWTES9C9eGl0dDHTBpIc="; deps = bundlerEnv rec { name = "${pname}-${version}"; diff --git a/third_party/nixpkgs/pkgs/development/tools/vagrant/gemset.nix b/third_party/nixpkgs/pkgs/development/tools/vagrant/gemset.nix index 3c22b74efe..f1b9fa1197 100644 --- a/third_party/nixpkgs/pkgs/development/tools/vagrant/gemset.nix +++ b/third_party/nixpkgs/pkgs/development/tools/vagrant/gemset.nix @@ -39,17 +39,6 @@ }; version = "1.1.7"; }; - domain_name = { - dependencies = ["unf"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0lcqjsmixjp52bnlgzh4lg9ppsk52x9hpwdjd53k8jnbah2602h0"; - type = "gem"; - }; - version = "0.5.20190701"; - }; ed25519 = { groups = ["default"]; platforms = []; @@ -70,15 +59,15 @@ }; version = "1.9.0"; }; - erubis = { + excon = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1fj827xqjs91yqsydf0zmfyw9p4l2jz5yikg3mppz6d7fi8kyrb3"; + sha256 = "1hi89v53pm2abfv9j8lgqdd7hgkr7fr0gwrczr940iwbb3xv7rrs"; type = "gem"; }; - version = "2.7.0"; + version = "0.78.0"; }; ffi = { groups = ["default"]; @@ -122,17 +111,6 @@ }; version = "0.1.5"; }; - http-cookie = { - dependencies = ["domain_name"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "004cgs4xg5n6byjs7qld0xhsjq3n6ydfh897myr2mibvh6fjc49g"; - type = "gem"; - }; - version = "1.0.3"; - }; httpclient = { groups = ["default"]; platforms = []; @@ -196,16 +174,6 @@ }; version = "2.3.0"; }; - mime = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0nskys7brz2bylhxiknl0z9i19w3wb1knf0h93in6mjq70jdw5cr"; - type = "gem"; - }; - version = "0.4.4"; - }; mime-types = { dependencies = ["mime-types-data"]; groups = ["default"]; @@ -222,10 +190,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1z75svngyhsglx0y2f9rnil2j08f9ab54b3l95bpgz67zq2if753"; + sha256 = "0ipjyfwn9nlvpcl8knq3jk4g5f12cflwdbaiqxcq1s7vwfwfxcag"; type = "gem"; }; - version = "3.2020.0512"; + version = "3.2020.1104"; }; multi_json = { groups = ["default"]; @@ -264,20 +232,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0jp3jgcn8cij407xx9ldb5h9c6jv13jc4cf6kk2idclz43ww21c9"; + sha256 = "1hlyp6z3ffwdcnzq9khrkz6waxggn4hnzsczbp3mz61lhx4qiri3"; type = "gem"; }; - version = "6.1.0"; - }; - netrc = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0gzfmcywp1da8nzfqsql2zqi648mfnx6qwkig3cv36n9m0yy676y"; - type = "gem"; - }; - version = "0.11.0"; + version = "6.2.0.rc1"; }; nori = { groups = ["default"]; @@ -321,17 +279,6 @@ }; version = "0.2.5"; }; - rest-client = { - dependencies = ["http-cookie" "mime-types" "netrc"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "1hzcs2r7b5bjkf2x2z3n8z6082maz0j8vqjiciwgg3hzb63f958j"; - type = "gem"; - }; - version = "2.0.2"; - }; ruby_dep = { groups = ["default"]; platforms = []; @@ -362,37 +309,16 @@ }; version = "2.3.0"; }; - unf = { - dependencies = ["unf_ext"]; - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0bh2cf73i2ffh4fcpdn9ir4mhq8zi50ik0zqa1braahzadx536a9"; - type = "gem"; - }; - version = "0.1.4"; - }; - unf_ext = { - groups = ["default"]; - platforms = []; - source = { - remotes = ["https://rubygems.org"]; - sha256 = "0wc47r23h063l8ysws8sy24gzh74mks81cak3lkzlrw4qkqb3sg4"; - type = "gem"; - }; - version = "0.0.7.7"; - }; vagrant_cloud = { - dependencies = ["rest-client"]; + dependencies = ["excon" "log4r"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "16jpnq4xa7gavm024wk1rgmkfb850g89rv56f26dkh0rdhbqiqvs"; + sha256 = "0b3b9ybd6mskfz2vffb6li2y6njdc9xqhik9c4mvzq9dchxpbxlj"; type = "gem"; }; - version = "2.0.3"; + version = "3.0.2"; }; wdm = { groups = ["default"]; @@ -410,10 +336,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "13c0vf32vinkp3ia86rvq779dacl37v4v2814v4g9qrk3liv0dym"; + sha256 = "0k9i86v805gpya3pyqahjykljbdwpjsrk7hsdqrl05j2rpidvk4v"; type = "gem"; }; - version = "2.3.4"; + version = "2.3.5"; }; winrm-elevated = { dependencies = ["erubi" "winrm" "winrm-fs"]; @@ -421,10 +347,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1yawwrs3pnvbbm9xn0nbzvyl92kgf1jr439qfbqx0mb8zzkyi2dv"; + sha256 = "0savhyfry7ii9axcmprvbzhrz4sd9byd8wifn74bd7y78asrbpdq"; type = "gem"; }; - version = "1.2.1"; + version = "1.2.2"; }; winrm-fs = { dependencies = ["erubi" "logging" "rubyzip" "winrm"]; @@ -432,9 +358,9 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "093f698l9b9cx6vcqwjc9hi5hbd86ynp1g5c7g9k18y6h7fxjk43"; + sha256 = "0gb91k6s1yjqw387x4w1nkpnxblq3pjdqckayl0qvz5n3ygdsb0d"; type = "gem"; }; - version = "1.3.4"; + version = "1.3.5"; }; } \ No newline at end of file diff --git a/third_party/nixpkgs/pkgs/development/tools/vagrant/gemset_libvirt.nix b/third_party/nixpkgs/pkgs/development/tools/vagrant/gemset_libvirt.nix index 2631833dc0..df6b6c4049 100644 --- a/third_party/nixpkgs/pkgs/development/tools/vagrant/gemset_libvirt.nix +++ b/third_party/nixpkgs/pkgs/development/tools/vagrant/gemset_libvirt.nix @@ -1,24 +1,34 @@ { + builder = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "045wzckxpwcqzrjr353cxnyaxgf0qg22jh00dcx7z38cys5g1jlr"; + type = "gem"; + }; + version = "3.2.4"; + }; excon = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "15l9w0938c19nxmrp09n75qpmm64k12xj69h47yvxzcxcpbgnkb2"; + sha256 = "1hi89v53pm2abfv9j8lgqdd7hgkr7fr0gwrczr940iwbb3xv7rrs"; type = "gem"; }; - version = "0.62.0"; + version = "0.78.0"; }; fog-core = { - dependencies = ["builder" "excon" "formatador"]; + dependencies = ["builder" "excon" "formatador" "mime-types"]; groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ac25s2wv7m6av7h7vjzd2bg3srhnn5yrz3lq1xpimhnfmp82sw6"; + sha256 = "0bwqm9n69y5y0a5iickr358z7w4hml3flqwfz8b7cnj1ldabhnjn"; type = "gem"; }; - version = "1.43.0"; + version = "2.2.3"; }; fog-json = { dependencies = ["fog-core" "multi_json"]; @@ -37,10 +47,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0gk16gsjd51x71wla7h5jqr6x5ywpwz5l8jdv76f9mr6fp1j2bkf"; + sha256 = "0by97bx0szdz47kdy0fqvx6j2kzy5yhrwbvvsfbh27dm9c0vfwgr"; type = "gem"; }; - version = "0.5.0"; + version = "0.7.0"; }; fog-xml = { dependencies = ["fog-core" "nokogiri"]; @@ -68,20 +78,51 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "01v6jjpvh3gnq6sgllpfqahlgxzj50ailwhj9b3cd20hi2dx0vxp"; + sha256 = "158fawfwmv2sq4whqqaksfykkiad2xxrrj0nmpnc6vnlzi1bp7iz"; type = "gem"; }; - version = "2.1.0"; + version = "2.3.1"; + }; + mime-types = { + dependencies = ["mime-types-data"]; + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "1zj12l9qk62anvk9bjvandpa6vy4xslil15wl6wlivyf51z773vh"; + type = "gem"; + }; + version = "3.3.1"; + }; + mime-types-data = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0ipjyfwn9nlvpcl8knq3jk4g5f12cflwdbaiqxcq1s7vwfwfxcag"; + type = "gem"; + }; + version = "3.2020.1104"; }; mini_portile2 = { groups = ["default"]; platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "13d32jjadpjj6d2wdhkfpsmy68zjx90p49bgf8f7nkpz86r1fr11"; + sha256 = "15zplpfw3knqifj9bpf604rb3wc1vhq6363pd6lvhayng8wql5vy"; type = "gem"; }; - version = "2.3.0"; + version = "2.4.0"; + }; + multi_json = { + groups = ["default"]; + platforms = []; + source = { + remotes = ["https://rubygems.org"]; + sha256 = "0pb1g1y3dsiahavspyzkdy39j4q377009f6ix0bh1ag4nqw43l0z"; + type = "gem"; + }; + version = "1.15.0"; }; nokogiri = { dependencies = ["mini_portile2"]; @@ -89,10 +130,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0byyxrazkfm29ypcx5q4syrv126nvjnf7z6bqi01sqkv4llsi4qz"; + sha256 = "0xmf60nj5kg9vaj5bysy308687sgmkasgx06vbbnf94p52ih7si2"; type = "gem"; }; - version = "1.8.5"; + version = "1.10.10"; }; ruby-libvirt = { groups = ["default"]; @@ -110,9 +151,9 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1wm5yvml3sxdzpnlp4q6yhy695syy8byd1g7cxll4pmj1kwlknym"; + sha256 = "1b1m8fg1rin6ps15ykqhwz6qm7isadb83r22b733dkw2gvvj91jv"; type = "gem"; }; - version = "0.0.45"; + version = "0.2.1"; }; -} +} \ No newline at end of file diff --git a/third_party/nixpkgs/pkgs/development/tools/wally-cli/default.nix b/third_party/nixpkgs/pkgs/development/tools/wally-cli/default.nix index d9abe6163a..ffa6664685 100644 --- a/third_party/nixpkgs/pkgs/development/tools/wally-cli/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/wally-cli/default.nix @@ -27,8 +27,8 @@ buildGoModule rec { meta = with lib; { description = "A tool to flash firmware to mechanical keyboards"; homepage = "https://ergodox-ez.com/pages/wally-planck"; - platforms = platforms.linux; + platforms = with platforms; linux ++ darwin; license = licenses.mit; - maintainers = [ maintainers.spacekookie ]; + maintainers = with maintainers; [ spacekookie r-burns ]; }; } diff --git a/third_party/nixpkgs/pkgs/development/web/deno/default.nix b/third_party/nixpkgs/pkgs/development/web/deno/default.nix index b932e1b550..0c60821102 100644 --- a/third_party/nixpkgs/pkgs/development/web/deno/default.nix +++ b/third_party/nixpkgs/pkgs/development/web/deno/default.nix @@ -18,16 +18,16 @@ let in rustPlatform.buildRustPackage rec { pname = "deno"; - version = "1.5.0"; + version = "1.5.1"; src = fetchFromGitHub { owner = "denoland"; repo = pname; rev = "v${version}"; - sha256 = "1kl3s5kv3wwh4br6zf0f56bffzjwhgzga93zg39mqry8jvwxp6dx"; + sha256 = "19ki9qyg9q26jq4jkcf8b6xhy4g4cn30zqccgl3324mnijhl33jk"; fetchSubmodules = true; }; - cargoSha256 = "1m3wd2gjy2b8a3x9wm49n9z02165afv4c3n13pnqsxcqmd9a764f"; + cargoSha256 = "1q3gmilphkbh54y7m711ccr1gr5slk2nn91qq61rmmphyylwkgv2"; # Install completions post-install nativeBuildInputs = [ installShellFiles ]; diff --git a/third_party/nixpkgs/pkgs/development/web/nodejs/v15.nix b/third_party/nixpkgs/pkgs/development/web/nodejs/v15.nix index f115e42d0d..23a14dc834 100644 --- a/third_party/nixpkgs/pkgs/development/web/nodejs/v15.nix +++ b/third_party/nixpkgs/pkgs/development/web/nodejs/v15.nix @@ -8,6 +8,6 @@ let in buildNodejs { inherit enableNpm; - version = "15.0.1"; - sha256 = "03xxnl7q96fmm7lalliwb9kmllz52jqrcsqn9cx9pzhwd1x97l5q"; + version = "15.1.0"; + sha256 = "1fd0ck6nlmp937j00y17q2k9xszzwf4s383p1z4v4qzj0qzxflvk"; } diff --git a/third_party/nixpkgs/pkgs/games/minecraft-server/default.nix b/third_party/nixpkgs/pkgs/games/minecraft-server/default.nix index 7216a42b00..5cf39ec35b 100644 --- a/third_party/nixpkgs/pkgs/games/minecraft-server/default.nix +++ b/third_party/nixpkgs/pkgs/games/minecraft-server/default.nix @@ -1,12 +1,12 @@ { stdenv, fetchurl, jre_headless }: stdenv.mkDerivation { pname = "minecraft-server"; - version = "1.16.3"; + version = "1.16.4"; src = fetchurl { - url = "https://launcher.mojang.com/v1/objects/f02f4473dbf152c23d7d484952121db0b36698cb/server.jar"; + url = "https://launcher.mojang.com/v1/objects/35139deedbd5182953cf1caa23835da59ca3d7cd/server.jar"; # sha1 because that comes from mojang via api - sha1 = "f02f4473dbf152c23d7d484952121db0b36698cb"; + sha1 = "35139deedbd5182953cf1caa23835da59ca3d7cd"; }; preferLocalBuild = true; diff --git a/third_party/nixpkgs/pkgs/games/openxray/default.nix b/third_party/nixpkgs/pkgs/games/openxray/default.nix index 394edcf195..13bc046e86 100644 --- a/third_party/nixpkgs/pkgs/games/openxray/default.nix +++ b/third_party/nixpkgs/pkgs/games/openxray/default.nix @@ -3,13 +3,13 @@ , pcre, makeWrapper }: let - version = "730-july-preview"; + version = "784-october-preview"; src = fetchFromGitHub { owner = "OpenXRay"; repo = "xray-16"; rev = version; - sha256 = "1nish3sbpk0hsag7r4nyx8j6pl9mlgx58v8dhzg2vwj2q32isyb2"; + sha256 = "0q0h70gbpscdvn45wpxicljj4ji3cd2maijd5b7jhr1695h61q5y"; fetchSubmodules = true; }; diff --git a/third_party/nixpkgs/pkgs/games/osu-lazer/default.nix b/third_party/nixpkgs/pkgs/games/osu-lazer/default.nix index 4cde785bb6..9cd6475d12 100644 --- a/third_party/nixpkgs/pkgs/games/osu-lazer/default.nix +++ b/third_party/nixpkgs/pkgs/games/osu-lazer/default.nix @@ -13,13 +13,13 @@ let in stdenv.mkDerivation rec { pname = "osu-lazer"; - version = "2020.925.0"; + version = "2020.1017.0"; src = fetchFromGitHub { owner = "ppy"; repo = "osu"; rev = version; - sha256 = "0838i3pdc1c44jm7mp86kvw5164w8f3faci73bzkq84g20ixwj2g"; + sha256 = "0sz3l8cxi9vlryjd7cb86dh3gcanim2pvhag3cg5sslqzrrinp2v"; }; patches = [ ./bypass-tamper-detection.patch ]; diff --git a/third_party/nixpkgs/pkgs/games/osu-lazer/deps.nix b/third_party/nixpkgs/pkgs/games/osu-lazer/deps.nix index 6660034e62..eb9fa617d5 100644 --- a/third_party/nixpkgs/pkgs/games/osu-lazer/deps.nix +++ b/third_party/nixpkgs/pkgs/games/osu-lazer/deps.nix @@ -586,8 +586,8 @@ }) (fetchNuGet { name = "ppy.osu.Framework"; - version = "2020.925.0"; - sha256 = "1244fxm7x4rqi43kp6l98bsbjc2yvv7dmpbajdr9fapqm37fdbdj"; + version = "2020.1009.0"; + sha256 = "0mqx9wjp639k56f0cjlrk67mq7c4h4vlglvss93dnvbb20ljn54r"; }) (fetchNuGet { name = "ppy.osu.Framework.NativeLibs"; @@ -596,8 +596,8 @@ }) (fetchNuGet { name = "ppy.osu.Game.Resources"; - version = "2020.904.0"; - sha256 = "0n0alpyxpf65mmnqidh044sh4nibsfj0m5n8hfmpjwq11wnpmbih"; + version = "2020.1016.0"; + sha256 = "1zsqmmlxbb2ncrlvha33cz0inbd6ijbcvxn0y0cysfkg7zb9iisy"; }) (fetchNuGet { name = "ppy.osuTK.NS20"; diff --git a/third_party/nixpkgs/pkgs/games/scummvm/default.nix b/third_party/nixpkgs/pkgs/games/scummvm/default.nix index e6efbc6203..02df60c829 100644 --- a/third_party/nixpkgs/pkgs/games/scummvm/default.nix +++ b/third_party/nixpkgs/pkgs/games/scummvm/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "scummvm"; - version = "2.1.2"; + version = "2.2.0"; src = fetchurl { url = "http://scummvm.org/frs/scummvm/${version}/${pname}-${version}.tar.xz"; - sha256 = "1c4fz1nfg0nqnqx9iipayhzcsiqdmfxm2i95nw9dbhshhsdnrhf4"; + sha256 = "FGllflk72Ky8+sC4ObCG9kDr8SBjPpPxFsq2UrWyc4c="; }; nativeBuildInputs = [ nasm ]; diff --git a/third_party/nixpkgs/pkgs/misc/emulators/mgba/default.nix b/third_party/nixpkgs/pkgs/misc/emulators/mgba/default.nix index 73845581b1..9efe47cc25 100644 --- a/third_party/nixpkgs/pkgs/misc/emulators/mgba/default.nix +++ b/third_party/nixpkgs/pkgs/misc/emulators/mgba/default.nix @@ -15,13 +15,13 @@ let }; in stdenv.mkDerivation rec { pname = "mgba"; - version = "0.8.3"; + version = "0.8.4"; src = fetchFromGitHub { owner = "mgba-emu"; repo = "mgba"; rev = version; - sha256 = "0rwlfjdr0rzbq4kaplvwsgyb8xq6nrzxss2c8xrgw9hqw3ymx4s3"; + sha256 = "0nqj4bnn5c2z1bq4bnbw1wznc0wpmq4sy3w8pipd6n6620b9m4qq"; }; enableParallelBuilding = true; diff --git a/third_party/nixpkgs/pkgs/misc/ghostscript/0001-Bug-702364-Fix-missing-echogs-dependencies.patch b/third_party/nixpkgs/pkgs/misc/ghostscript/0001-Bug-702364-Fix-missing-echogs-dependencies.patch deleted file mode 100644 index dd31260302..0000000000 --- a/third_party/nixpkgs/pkgs/misc/ghostscript/0001-Bug-702364-Fix-missing-echogs-dependencies.patch +++ /dev/null @@ -1,835 +0,0 @@ ---- a/contrib/contrib.mak 2020-03-19 09:21:42.000000000 +0100 -+++ b/contrib/contrib.mak 2020-05-14 13:41:03.202258445 +0200 -@@ -22,6 +22,10 @@ - CONTRIB_MAK=$(CONTRIBDIR)$(D)contrib.mak $(TOP_MAKEFILES) - CONTRIBSRC=$(CONTRIBDIR)$(D) - -+# Almost all device drivers depend on the following: -+CONTDEVH=$(gserrors_h) $(gx_h) $(gxdevice_h) -+CONTDEV=$(AK) $(ECHOGS_XE) $(GDEVH) -+ - ###### --------------------------- Catalog -------------------------- ###### - - # The following drivers are user-contributed, and maintained (if at all) by -@@ -185,19 +189,19 @@ - $(DEVCC) $(DEVO_)gdevbjca.$(OBJ) $(C_) $(CONTRIBSRC)gdevbjca.c - - $(DD)bjcmono.dev : $(bjc_) $(DD)page.dev \ -- $(CONTRIB_MAK) $(MAKEDIRS) -+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) - $(SETPDEV) $(DD)bjcmono $(bjc_) - - $(DD)bjcgray.dev : $(bjc_) $(DD)page.dev \ -- $(CONTRIB_MAK) $(MAKEDIRS) -+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) - $(SETPDEV) $(DD)bjcgray $(bjc_) - - $(DD)bjccmyk.dev : $(bjc_) $(DD)page.dev \ -- $(CONTRIB_MAK) $(MAKEDIRS) -+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) - $(SETPDEV) $(DD)bjccmyk $(bjc_) - - $(DD)bjccolor.dev : $(bjc_) $(DD)page.dev \ -- $(CONTRIB_MAK) $(MAKEDIRS) -+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) - $(SETPDEV) $(DD)bjccolor $(bjc_) - - -@@ -208,25 +212,25 @@ - # Author: Uli Wortmann (uliw@erdw.ethz.ch), Martin Gerbershagen (ger@ulm.temic.de) - # Printer: HP 670 - $(DD)cdj670.dev : $(cdeskjet8_) $(DD)page.dev \ -- $(CONTRIB_MAK) $(MAKEDIRS) -+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) - $(SETPDEV2) $(DD)cdj670 $(cdeskjet8_) - - # Author: Uli Wortmann (uliw@erdw.ethz.ch) - # Printer: HP 850 - $(DD)cdj850.dev : $(cdeskjet8_) $(DD)page.dev \ -- $(CONTRIB_MAK) $(MAKEDIRS) -+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) - $(SETPDEV2) $(DD)cdj850 $(cdeskjet8_) - - # Author: Uli Wortmann (uliw@erdw.ethz.ch), Martin Gerbershagen (ger@ulm.temic.de) - # Printer: HP 890 - $(DD)cdj890.dev : $(cdeskjet8_) $(DD)page.dev \ -- $(CONTRIB_MAK) $(MAKEDIRS) -+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) - $(SETPDEV2) $(DD)cdj890 $(cdeskjet8_) - - # Author: Uli Wortmann (uliw@erdw.ethz.ch), Martin Gerbershagen (ger@ulm.temic.de) - # Printer: HP 1600 - $(DD)cdj1600.dev : $(cdeskjet8_) $(DD)page.dev \ -- $(CONTRIB_MAK) $(MAKEDIRS) -+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) - $(SETPDEV2) $(DD)cdj1600 $(cdeskjet8_) - - $(DEVOBJ)gdevcd8.$(OBJ) : $(CONTRIBSRC)gdevcd8.c $(PDEVH) $(math__h)\ -@@ -244,7 +248,8 @@ - - # Author: Matthew Gelhaus (mgelhaus@proaxis.com) - # Printer: HP 880c --$(DD)cdj880.dev : $(cdeskjet8_) $(DD)page.dev -+$(DD)cdj880.dev : $(cdeskjet8_) $(DD)page.dev $(CONTDEV) \ -+ $(CONTRIB_MAK) $(MAKEDIRS) - $(SETPDEV2) $(DD)cdj880 $(cdeskjet8_) - - -@@ -255,7 +260,7 @@ - # Author: Rene Harsch (rene@harsch.net) - # Printer: HP 970Cxi - $(DD)cdj970.dev : $(cdeskjet9_) $(DD)page.dev \ -- $(CONTRIB_MAK) $(MAKEDIRS) -+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) - $(SETPDEV2) $(DD)cdj970 $(cdeskjet9_) - - $(DEVOBJ)gdevdj9.$(OBJ) : $(CONTRIBSRC)gdevdj9.c $(PDEVH) $(math__h) $(string__h)\ -@@ -268,7 +273,7 @@ - ### NOTE: Same as chp2200 (some PJL and CRD changes). - - $(DD)cdnj500.dev : $(cdeskjet8_) $(DD)page.dev \ -- $(CONTRIB_MAK) $(MAKEDIRS) -+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) - $(SETPDEV2) $(DD)cdnj500 $(cdeskjet8_) - - -@@ -277,7 +282,7 @@ - ### NOTE: Depends on the presence of the cdj850 section. - - $(DD)chp2200.dev : $(cdeskjet8_) $(DD)page.dev \ -- $(CONTRIB_MAK) $(MAKEDIRS) -+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) - $(SETPDEV2) $(DD)chp2200 $(cdeskjet8_) - - -@@ -288,11 +293,11 @@ - GDIMONO=$(DEVOBJ)gdevgdi.$(OBJ) $(HPPCL) - - $(DD)gdi.dev : $(GDIMONO) $(DD)page.dev \ -- $(CONTRIB_MAK) $(MAKEDIRS) -+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) - $(SETPDEV) $(DD)gdi $(GDIMONO) - - $(DD)samsunggdi.dev : $(GDIMONO) $(DD)page.dev \ -- $(CONTRIB_MAK) $(MAKEDIRS) -+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) - $(SETPDEV) $(DD)samsunggdi $(GDIMONO) - - $(DEVOBJ)gdevgdi.$(OBJ) : $(CONTRIBSRC)gdevgdi.c $(PDEVH) $(gdevpcl_h) \ -@@ -306,17 +311,17 @@ - - hl1250_=$(DEVOBJ)gdevhl12.$(OBJ) $(HPDLJM) - $(DD)hl1250.dev : $(hl1250_) $(DD)page.dev \ -- $(CONTRIB_MAK) $(MAKEDIRS) -+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) - $(SETPDEV) $(DD)hl1250 $(hl1250_) - - $(DD)hl1240.dev : $(hl1250_) $(DD)page.dev \ -- $(CONTRIB_MAK) $(MAKEDIRS) -+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) - $(SETPDEV) $(DD)hl1240 $(hl1250_) - - # Author: Marek Michalkiewicz - # Printer: Brother HL-1250 (may work with some other models too) - $(DEVOBJ)gdevhl12.$(OBJ) : $(CONTRIBSRC)gdevhl12.c $(PDEVH) $(gdevdljm_h) \ -- $(CONTRIB_MAK) $(MAKEDIRS) -+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) - $(DEVCC) $(DEVO_)gdevhl12.$(OBJ) $(C_) $(CONTRIBSRC)gdevhl12.c - - -@@ -327,37 +332,37 @@ - # Author: Ulrich Mueller (ulm@vsnhd1.cern.ch) - # Printer: DEC LN03 - $(DD)ln03.dev : $(ln03_) $(DD)page.dev \ -- $(CONTRIB_MAK) $(MAKEDIRS) -+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) - $(SETPDEV) $(DD)ln03 $(ln03_) - - # Author: Nick Brown (nick.brown@coe.int) - # Printer: DEClaser 2100 - $(DD)dl2100.dev : $(ln03_) $(DD)page.dev \ -- $(CONTRIB_MAK) $(MAKEDIRS) -+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) - $(SETPDEV) $(DD)dl2100 $(ln03_) - - # Author: Ian MacPhedran (macphed@dvinci.USask.CA) - # Printer: DEC LA50 - $(DD)la50.dev : $(ln03_) $(DD)page.dev \ -- $(CONTRIB_MAK) $(MAKEDIRS) -+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) - $(SETPDEV) $(DD)la50 $(ln03_) - - # Author: Bruce Lowekamp (lowekamp@csugrad.cs.vt.edu) - # Printer: DEC LA70 - $(DD)la70.dev : $(ln03_) $(DD)page.dev \ -- $(CONTRIB_MAK) $(MAKEDIRS) -+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) - $(SETPDEV) $(DD)la70 $(ln03_) - - # Author: Ian MacPhedran (macphed@dvinci.USask.CA) - # Printer: DEC LA75 - $(DD)la75.dev : $(ln03_) $(DD)page.dev \ -- $(CONTRIB_MAK) $(MAKEDIRS) -+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) - $(SETPDEV) $(DD)la75 $(ln03_) - - # Author: Andre' Beck (Andre_Beck@IRS.Inf.TU-Dresden.de) - # Printer: DEC LA75plus - $(DD)la75plus.dev : $(ln03_) $(DD)page.dev \ -- $(CONTRIB_MAK) $(MAKEDIRS) -+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) - $(SETPDEV) $(DD)la75plus $(ln03_) - - $(DEVOBJ)gdevln03.$(OBJ) : $(CONTRIBSRC)gdevln03.c $(PDEVH) \ -@@ -380,233 +385,233 @@ - $(DEVCC) -DA4 $(DEVO_)gdevescv.$(OBJ) $(C_) $(escv_opts) $(ESCV_SRC)gdevescv.c - - $(DD)alc1900.dev : $(escv_) $(DD)page.dev \ -- $(CONTRIB_MAK) $(MAKEDIRS) -+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) - $(SETPDEV) $(DD)alc1900 $(escv_) - - $(DD)alc2000.dev : $(escv_) $(DD)page.dev \ -- $(CONTRIB_MAK) $(MAKEDIRS) -+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) - $(SETPDEV) $(DD)alc2000 $(escv_) - - $(DD)alc4000.dev : $(escv_) $(DD)page.dev \ -- $(CONTRIB_MAK) $(MAKEDIRS) -+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) - $(SETPDEV) $(DD)alc4000 $(escv_) - - $(DD)alc4100.dev : $(escv_) $(DD)page.dev \ -- $(CONTRIB_MAK) $(MAKEDIRS) -+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) - $(SETPDEV) $(DD)alc4100 $(escv_) - - $(DD)alc8500.dev : $(escv_) $(DD)page.dev \ -- $(CONTRIB_MAK) $(MAKEDIRS) -+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) - $(SETPDEV) $(DD)alc8500 $(escv_) - - $(DD)alc8600.dev : $(escv_) $(DD)page.dev \ -- $(CONTRIB_MAK) $(MAKEDIRS) -+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) - $(SETPDEV) $(DD)alc8600 $(escv_) - - $(DD)alc9100.dev : $(escv_) $(DD)page.dev \ -- $(CONTRIB_MAK) $(MAKEDIRS) -+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) - $(SETPDEV) $(DD)alc9100 $(escv_) - - $(DD)lp3000c.dev : $(escv_) $(DD)page.dev \ -- $(CONTRIB_MAK) $(MAKEDIRS) -+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) - $(SETPDEV) $(DD)lp3000c $(escv_) - - $(DD)lp8000c.dev : $(escv_) $(DD)page.dev \ -- $(CONTRIB_MAK) $(MAKEDIRS) -+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) - $(SETPDEV) $(DD)lp8000c $(escv_) - - $(DD)lp8200c.dev : $(escv_) $(DD)page.dev \ -- $(CONTRIB_MAK) $(MAKEDIRS) -+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) - $(SETPDEV) $(DD)lp8200c $(escv_) - - $(DD)lp8300c.dev : $(escv_) $(DD)page.dev \ -- $(CONTRIB_MAK) $(MAKEDIRS) -+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) - $(SETPDEV) $(DD)lp8300c $(escv_) - - $(DD)lp8500c.dev : $(escv_) $(DD)page.dev \ -- $(CONTRIB_MAK) $(MAKEDIRS) -+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) - $(SETPDEV) $(DD)lp8500c $(escv_) - - $(DD)lp8800c.dev : $(escv_) $(DD)page.dev \ -- $(CONTRIB_MAK) $(MAKEDIRS) -+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) - $(SETPDEV) $(DD)lp8800c $(escv_) - - $(DD)lp9000c.dev : $(escv_) $(DD)page.dev \ -- $(CONTRIB_MAK) $(MAKEDIRS) -+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) - $(SETPDEV) $(DD)lp9000c $(escv_) - - $(DD)lp9200c.dev : $(escv_) $(DD)page.dev \ -- $(CONTRIB_MAK) $(MAKEDIRS) -+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) - $(SETPDEV) $(DD)lp9200c $(escv_) - - $(DD)lp9500c.dev : $(escv_) $(DD)page.dev \ -- $(CONTRIB_MAK) $(MAKEDIRS) -+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) - $(SETPDEV) $(DD)lp9500c $(escv_) - - $(DD)lp9800c.dev : $(escv_) $(DD)page.dev \ -- $(CONTRIB_MAK) $(MAKEDIRS) -+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) - $(SETPDEV) $(DD)lp9800c $(escv_) - - $(DD)lps6500.dev : $(escv_) $(DD)page.dev \ -- $(CONTRIB_MAK) $(MAKEDIRS) -+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) - $(SETPDEV) $(DD)lps6500 $(escv_) - - $(DD)epl2050.dev : $(escv_) $(DD)page.dev \ -- $(CONTRIB_MAK) $(MAKEDIRS) -+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) - $(SETPDEV) $(DD)epl2050 $(escv_) - - $(DD)epl2050p.dev : $(escv_) $(DD)page.dev \ -- $(CONTRIB_MAK) $(MAKEDIRS) -+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) - $(SETPDEV) $(DD)epl2050p $(escv_) - - $(DD)epl2120.dev : $(escv_) $(DD)page.dev \ -- $(CONTRIB_MAK) $(MAKEDIRS) -+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) - $(SETPDEV) $(DD)epl2120 $(escv_) - - $(DD)epl2500.dev : $(escv_) $(DD)page.dev \ -- $(CONTRIB_MAK) $(MAKEDIRS) -+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) - $(SETPDEV) $(DD)epl2500 $(escv_) - - $(DD)epl2750.dev : $(escv_) $(DD)page.dev \ -- $(CONTRIB_MAK) $(MAKEDIRS) -+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) - $(SETPDEV) $(DD)epl2750 $(escv_) - - $(DD)epl5800.dev : $(escv_) $(DD)page.dev \ -- $(CONTRIB_MAK) $(MAKEDIRS) -+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) - $(SETPDEV) $(DD)epl5800 $(escv_) - - $(DD)epl5900.dev : $(escv_) $(DD)page.dev \ -- $(CONTRIB_MAK) $(MAKEDIRS) -+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) - $(SETPDEV) $(DD)epl5900 $(escv_) - - $(DD)epl6100.dev : $(escv_) $(DD)page.dev \ -- $(CONTRIB_MAK) $(MAKEDIRS) -+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) - $(SETPDEV) $(DD)epl6100 $(escv_) - - $(DD)epl6200.dev : $(escv_) $(DD)page.dev \ -- $(CONTRIB_MAK) $(MAKEDIRS) -+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) - $(SETPDEV) $(DD)epl6200 $(escv_) - - $(DD)lp1800.dev : $(escv_) $(DD)page.dev \ -- $(CONTRIB_MAK) $(MAKEDIRS) -+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) - $(SETPDEV) $(DD)lp1800 $(escv_) - - $(DD)lp1900.dev : $(escv_) $(DD)page.dev \ -- $(CONTRIB_MAK) $(MAKEDIRS) -+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) - $(SETPDEV) $(DD)lp1900 $(escv_) - - $(DD)lp2200.dev : $(escv_) $(DD)page.dev \ -- $(CONTRIB_MAK) $(MAKEDIRS) -+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) - $(SETPDEV) $(DD)lp2200 $(escv_) - - $(DD)lp2400.dev : $(escv_) $(DD)page.dev \ -- $(CONTRIB_MAK) $(MAKEDIRS) -+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) - $(SETPDEV) $(DD)lp2400 $(escv_) - - $(DD)lp2500.dev : $(escv_) $(DD)page.dev \ -- $(CONTRIB_MAK) $(MAKEDIRS) -+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) - $(SETPDEV) $(DD)lp2500 $(escv_) - - $(DD)lp7500.dev : $(escv_) $(DD)page.dev \ -- $(CONTRIB_MAK) $(MAKEDIRS) -+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) - $(SETPDEV) $(DD)lp7500 $(escv_) - - $(DD)lp7700.dev : $(escv_) $(DD)page.dev \ -- $(CONTRIB_MAK) $(MAKEDIRS) -+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) - $(SETPDEV) $(DD)lp7700 $(escv_) - - $(DD)lp7900.dev : $(escv_) $(DD)page.dev \ -- $(CONTRIB_MAK) $(MAKEDIRS) -+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) - $(SETPDEV) $(DD)lp7900 $(escv_) - - $(DD)lp8100.dev : $(escv_) $(DD)page.dev \ -- $(CONTRIB_MAK) $(MAKEDIRS) -+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) - $(SETPDEV) $(DD)lp8100 $(escv_) - - $(DD)lp8300f.dev : $(escv_) $(DD)page.dev \ -- $(CONTRIB_MAK) $(MAKEDIRS) -+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) - $(SETPDEV) $(DD)lp8300f $(escv_) - - $(DD)lp8400f.dev : $(escv_) $(DD)page.dev \ -- $(CONTRIB_MAK) $(MAKEDIRS) -+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) - $(SETPDEV) $(DD)lp8400f $(escv_) - - $(DD)lp8600.dev : $(escv_) $(DD)page.dev \ -- $(CONTRIB_MAK) $(MAKEDIRS) -+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) - $(SETPDEV) $(DD)lp8600 $(escv_) - - $(DD)lp8600f.dev : $(escv_) $(DD)page.dev \ -- $(CONTRIB_MAK) $(MAKEDIRS) -+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) - $(SETPDEV) $(DD)lp8600f $(escv_) - - $(DD)lp8700.dev : $(escv_) $(DD)page.dev \ -- $(CONTRIB_MAK) $(MAKEDIRS) -+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) - $(SETPDEV) $(DD)lp8700 $(escv_) - - $(DD)lp8900.dev : $(escv_) $(DD)page.dev \ -- $(CONTRIB_MAK) $(MAKEDIRS) -+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) - $(SETPDEV) $(DD)lp8900 $(escv_) - - $(DD)lp9000b.dev : $(escv_) $(DD)page.dev \ -- $(CONTRIB_MAK) $(MAKEDIRS) -+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) - $(SETPDEV) $(DD)lp9000b $(escv_) - - $(DD)lp9100.dev : $(escv_) $(DD)page.dev \ -- $(CONTRIB_MAK) $(MAKEDIRS) -+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) - $(SETPDEV) $(DD)lp9100 $(escv_) - - $(DD)lp9200b.dev : $(escv_) $(DD)page.dev \ -- $(CONTRIB_MAK) $(MAKEDIRS) -+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) - $(SETPDEV) $(DD)lp9200b $(escv_) - - $(DD)lp9300.dev : $(escv_) $(DD)page.dev \ -- $(CONTRIB_MAK) $(MAKEDIRS) -+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) - $(SETPDEV) $(DD)lp9300 $(escv_) - - $(DD)lp9400.dev : $(escv_) $(DD)page.dev \ -- $(CONTRIB_MAK) $(MAKEDIRS) -+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) - $(SETPDEV) $(DD)lp9400 $(escv_) - - $(DD)lp9600.dev : $(escv_) $(DD)page.dev \ -- $(CONTRIB_MAK) $(MAKEDIRS) -+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) - $(SETPDEV) $(DD)lp9600 $(escv_) - - $(DD)lp9600s.dev : $(escv_) $(DD)page.dev \ -- $(CONTRIB_MAK) $(MAKEDIRS) -+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) - $(SETPDEV) $(DD)lp9600s $(escv_) - - $(DD)lps4500.dev : $(escv_) $(DD)page.dev \ -- $(CONTRIB_MAK) $(MAKEDIRS) -+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) - $(SETPDEV) $(DD)lps4500 $(escv_) - - $(DD)eplcolor.dev: $(escv_) $(DD)page.dev \ -- $(CONTRIB_MAK) $(MAKEDIRS) -+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) - $(SETPDEV) $(DD)eplcolor $(escv_) - - $(DD)eplmono.dev: $(escv_) $(DD)page.dev \ -- $(CONTRIB_MAK) $(MAKEDIRS) -+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) - $(SETPDEV) $(DD)eplmono $(escv_) - - # ------ The Lexmark 5700 and 7000 devices ------ # - - lex7000_=$(DEVOBJ)gdevlx7.$(OBJ) - $(DD)lex7000.dev : $(lex7000_) $(DD)page.dev \ -- $(CONTRIB_MAK) $(MAKEDIRS) -+ $(CONTDEV) $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) - $(SETPDEV) $(DD)lex7000 $(lex7000_) - - lex5700_=$(DEVOBJ)gdevlx7.$(OBJ) - $(DD)lex5700.dev : $(lex5700_) $(DD)page.dev \ -- $(CONTRIB_MAK) $(MAKEDIRS) -+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) - $(SETPDEV) $(DD)lex5700 $(lex5700_) - - lex3200_=$(DEVOBJ)gdevlx7.$(OBJ) - $(DD)lex3200.dev : $(lex3200_) $(DD)page.dev \ -- $(CONTRIB_MAK) $(MAKEDIRS) -+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) - $(SETPDEV) $(DD)lex3200 $(lex3200_) - - lex2050_=$(DEVOBJ)gdevlx7.$(OBJ) - $(DD)lex2050.dev : $(lex2050_) $(DD)page.dev \ -- $(CONTRIB_MAK) $(MAKEDIRS) -+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) - $(SETPDEV) $(DD)lex2050 $(lex2050_) - - $(DEVOBJ)gdevlx7.$(OBJ) : $(CONTRIBSRC)gdevlx7.c $(PDEVH) \ -@@ -623,7 +628,7 @@ - $(DEVCC) $(DEVO_)gdevlx32.$(OBJ) $(C_) $(CONTRIBSRC)gdevlx32.c - - $(DD)lxm3200.dev : $(lxm3200_) $(DD)page.dev \ -- $(CONTRIB_MAK) $(MAKEDIRS) -+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) - $(SETPDEV) $(DD)lxm3200 $(lxm3200_) - - -@@ -649,13 +654,13 @@ - $(DEVCC) $(DEVO_)gdevlips.$(OBJ) $(LIPS_OPT) $(C_) $(LIPS_SRC)gdevlips.c - - $(DD)lips4.dev : $(lipsr_) $(DD)page.dev \ -- $(CONTRIB_MAK) $(MAKEDIRS) -+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) - $(SETPDEV) $(DD)lips4 $(lipsr_) - - lipsv_=$(DEVOBJ)gdevl4v.$(OBJ) $(DEVOBJ)gdevlips.$(OBJ) - - $(DD)lips4v.dev : $(ECHOGS_XE) $(lipsv_) $(DD)vector.dev \ -- $(CONTRIB_MAK) $(MAKEDIRS) -+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) - $(SETDEV) $(DD)lips4v $(lipsv_) - $(ADDMOD) $(DD)lips4v -include $(GLD)vector - -@@ -668,11 +673,11 @@ - ### --------------- Some extra devices: lips2p, bjc880j ---------------- ### - - $(DD)lips2p.dev : $(lipsr_) $(DD)page.dev \ -- $(CONTRIB_MAK) $(MAKEDIRS) -+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) - $(SETPDEV) $(DD)lips2p $(lipsr_) - - $(DD)bjc880j.dev : $(lipsr_) $(DD)page.dev \ -- $(CONTRIB_MAK) $(MAKEDIRS) -+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) - $(SETPDEV) $(DD)bjc880j $(lipsr_) - - -@@ -681,15 +686,15 @@ - md2k_=$(DEVOBJ)gdevmd2k.$(OBJ) - - $(DD)md2k.dev : $(md2k_) $(DD)page.dev \ -- $(CONTRIB_MAK) $(MAKEDIRS) -+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) - $(SETPDEV) $(DD)md2k $(md2k_) - - $(DD)md5k.dev : $(md2k_) $(DD)page.dev \ -- $(CONTRIB_MAK) $(MAKEDIRS) -+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) - $(SETPDEV) $(DD)md5k $(md2k_) - - $(DEVOBJ)gdevmd2k.$(OBJ) : $(CONTRIBSRC)gdevmd2k.c $(PDEVH) $(gsparam_h) \ -- $(CONTRIB_MAK) $(MAKEDIRS) -+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) - $(DEVCC) $(DEVO_)gdevmd2k.$(OBJ) $(C_) $(CONTRIBSRC)gdevmd2k.c - - -@@ -697,7 +702,7 @@ - - oki4w_=$(DEVOBJ)gdevop4w.$(OBJ) - $(DD)oki4w.dev : $(oki4w_) $(DD)page.dev \ -- $(CONTRIB_MAK) $(MAKEDIRS) -+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) - $(SETPDEV) $(DD)oki4w $(oki4w_) - - # Author: Ivan Schreter (ivan@shadow.sk) -@@ -720,11 +725,11 @@ - $(DEVCC) $(DEVO_)gdevopvp.$(OBJ) $(OPVP_OPT) $(C_) $(OPVP_SRC)gdevopvp.c - - $(DD)opvp.dev : $(opvp_) $(DD)page.dev \ -- $(CONTRIB_MAK) $(MAKEDIRS) -+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) - $(SETPDEV) $(DD)opvp $(opvp_) - - $(DD)oprp.dev : $(opvp_) $(DD)page.dev \ -- $(CONTRIB_MAK) $(MAKEDIRS) -+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) - $(SETPDEV) $(DD)oprp $(opvp_) - - -@@ -901,78 +906,78 @@ - - # The generic pcl3 device with selectable subdevices - $(DD)pcl3.dev : $(pcl3_) $(DD)page.dev \ -- $(CONTRIB_MAK) $(MAKEDIRS) -+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) - $(SETPDEV) $(DD)pcl3 $(pcl3_) - - # Fixed devices for specific printers - $(DD)hpdjplus.dev : $(pcl3_) $(DD)page.dev \ -- $(CONTRIB_MAK) $(MAKEDIRS) -+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) - $(SETPDEV) $(DD)hpdjplus $(pcl3_) - $(DD)hpdjportable.dev : $(pcl3_) $(DD)page.dev \ -- $(CONTRIB_MAK) $(MAKEDIRS) -+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) - $(SETPDEV) $(DD)hpdjportable $(pcl3_) - $(DD)hpdj310.dev : $(pcl3_) $(DD)page.dev \ -- $(CONTRIB_MAK) $(MAKEDIRS) -+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) - $(SETPDEV) $(DD)hpdj310 $(pcl3_) - $(DD)hpdj320.dev : $(pcl3_) $(DD)page.dev \ -- $(CONTRIB_MAK) $(MAKEDIRS) -+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) - $(SETPDEV) $(DD)hpdj320 $(pcl3_) - $(DD)hpdj340.dev : $(pcl3_) $(DD)page.dev \ -- $(CONTRIB_MAK) $(MAKEDIRS) -+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) - $(SETPDEV) $(DD)hpdj340 $(pcl3_) - $(DD)hpdj400.dev : $(pcl3_) $(DD)page.dev \ -- $(CONTRIB_MAK) $(MAKEDIRS) -+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) - $(SETPDEV) $(DD)hpdj400 $(pcl3_) - $(DD)hpdj500.dev : $(pcl3_) $(DD)page.dev \ -- $(CONTRIB_MAK) $(MAKEDIRS) -+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) - $(SETPDEV) $(DD)hpdj500 $(pcl3_) - $(DD)hpdj500c.dev : $(pcl3_) $(DD)page.dev \ -- $(CONTRIB_MAK) $(MAKEDIRS) -+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) - $(SETPDEV) $(DD)hpdj500c $(pcl3_) - $(DD)hpdj510.dev : $(pcl3_) $(DD)page.dev \ -- $(CONTRIB_MAK) $(MAKEDIRS) -+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) - $(SETPDEV) $(DD)hpdj510 $(pcl3_) - $(DD)hpdj520.dev : $(pcl3_) $(DD)page.dev \ -- $(CONTRIB_MAK) $(MAKEDIRS) -+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) - $(SETPDEV) $(DD)hpdj520 $(pcl3_) - $(DD)hpdj540.dev : $(pcl3_) $(DD)page.dev \ -- $(CONTRIB_MAK) $(MAKEDIRS) -+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) - $(SETPDEV) $(DD)hpdj540 $(pcl3_) - $(DD)hpdj550c.dev : $(pcl3_) $(DD)page.dev \ -- $(CONTRIB_MAK) $(MAKEDIRS) -+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) - $(SETPDEV) $(DD)hpdj550c $(pcl3_) - $(DD)hpdj560c.dev : $(pcl3_) $(DD)page.dev \ -- $(CONTRIB_MAK) $(MAKEDIRS) -+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) - $(SETPDEV) $(DD)hpdj560c $(pcl3_) - $(DD)hpdj600.dev : $(pcl3_) $(DD)page.dev \ -- $(CONTRIB_MAK) $(MAKEDIRS) -+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) - $(SETPDEV) $(DD)hpdj600 $(pcl3_) - $(DD)hpdj660c.dev : $(pcl3_) $(DD)page.dev \ -- $(CONTRIB_MAK) $(MAKEDIRS) -+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) - $(SETPDEV) $(DD)hpdj660c $(pcl3_) - $(DD)hpdj670c.dev : $(pcl3_) $(DD)page.dev \ -- $(CONTRIB_MAK) $(MAKEDIRS) -+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) - $(SETPDEV) $(DD)hpdj670c $(pcl3_) - $(DD)hpdj680c.dev : $(pcl3_) $(DD)page.dev \ -- $(CONTRIB_MAK) $(MAKEDIRS) -+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) - $(SETPDEV) $(DD)hpdj680c $(pcl3_) - $(DD)hpdj690c.dev : $(pcl3_) $(DD)page.dev \ -- $(CONTRIB_MAK) $(MAKEDIRS) -+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) - $(SETPDEV) $(DD)hpdj690c $(pcl3_) - $(DD)hpdj850c.dev : $(pcl3_) $(DD)page.dev \ -- $(CONTRIB_MAK) $(MAKEDIRS) -+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) - $(SETPDEV) $(DD)hpdj850c $(pcl3_) - $(DD)hpdj855c.dev : $(pcl3_) $(DD)page.dev \ -- $(CONTRIB_MAK) $(MAKEDIRS) -+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) - $(SETPDEV) $(DD)hpdj855c $(pcl3_) - $(DD)hpdj870c.dev : $(pcl3_) $(DD)page.dev \ -- $(CONTRIB_MAK) $(MAKEDIRS) -+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) - $(SETPDEV) $(DD)hpdj870c $(pcl3_) - $(DD)hpdj890c.dev : $(pcl3_) $(DD)page.dev \ -- $(CONTRIB_MAK) $(MAKEDIRS) -+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) - $(SETPDEV) $(DD)hpdj890c $(pcl3_) - $(DD)hpdj1120c.dev : $(pcl3_) $(DD)page.dev \ -- $(CONTRIB_MAK) $(MAKEDIRS) -+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) - $(SETPDEV) $(DD)hpdj1120c $(pcl3_) - - #------------------------------------------------------------------------------ -@@ -1009,7 +1014,7 @@ - - xes_=$(DEVOBJ)gdevxes.$(OBJ) - $(DD)xes.dev : $(xes_) $(DD)page.dev \ -- $(CONTRIB_MAK) $(MAKEDIRS) -+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) - $(SETPDEV) $(DD)xes $(xes_) - - # Author: Peter Flass (flass@lbdrscs.bitnet) -@@ -1029,16 +1034,16 @@ - - pr201_=$(DEVOBJ)gdevp201.$(OBJ) $(DEVOBJ)gdevprn.$(OBJ) - --$(DD)pr201.dev : $(pr201_) $(CONTRIB_MAK) $(MAKEDIRS) -+$(DD)pr201.dev : $(pr201_) $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) - $(SETPDEV) $(DD)pr201 $(pr201_) - --$(DD)pr150.dev : $(pr201_) $(CONTRIB_MAK) $(MAKEDIRS) -+$(DD)pr150.dev : $(pr201_) $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) - $(SETPDEV) $(DD)pr150 $(pr201_) - --$(DD)pr1000.dev : $(pr201_) $(CONTRIB_MAK) $(MAKEDIRS) -+$(DD)pr1000.dev : $(pr201_) $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) - $(SETPDEV) $(DD)pr1000 $(pr201_) - --$(DD)pr1000_4.dev : $(pr201_) $(CONTRIB_MAK) $(MAKEDIRS) -+$(DD)pr1000_4.dev : $(pr201_) $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) - $(SETPDEV) $(DD)pr1000_4 $(pr201_) - - $(DEVOBJ)gdevp201.$(OBJ) : $(JAPSRC)gdevp201.c $(PDEVH) \ -@@ -1049,7 +1054,7 @@ - - jj100_=$(DEVOBJ)gdevj100.$(OBJ) $(DEVOBJ)gdevprn.$(OBJ) - --$(DD)jj100.dev : $(jj100_) $(CONTRIB_MAK) $(MAKEDIRS) -+$(DD)jj100.dev : $(jj100_) $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) - $(SETPDEV) $(DD)jj100 $(jj100_) - - $(DEVOBJ)gdevj100.$(OBJ) : $(JAPSRC)gdevj100.c $(PDEVH) \ -@@ -1061,11 +1066,11 @@ - bj10v_=$(DEVOBJ)gdev10v.$(OBJ) $(DEVOBJ)gdevprn.$(OBJ) - - $(DD)bj10v.dev : $(bj10v_) \ -- $(CONTRIB_MAK) $(MAKEDIRS) -+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) - $(SETPDEV) $(DD)bj10v $(bj10v_) - - $(DD)bj10vh.dev : $(bj10v_) \ -- $(CONTRIB_MAK) $(MAKEDIRS) -+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) - $(SETPDEV) $(DD)bj10vh $(bj10v_) - - # Uncomment the following line if you are using MS-DOS on PC9801 series. -@@ -1080,7 +1085,7 @@ - dmprt_=$(DEVOBJ)gdevdmpr.$(OBJ) $(DEVOBJ)dviprlib.$(OBJ) $(DEVOBJ)gdevprn.$(OBJ) - - $(DD)dmprt.dev : $(dmprt_) $(DD)page.dev \ -- $(CONTRIB_MAK) $(MAKEDIRS) -+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) - $(SETDEV) $(DD)dmprt $(dmprt_) - $(ADDMOD) $(DD)dmprt -ps dmp_init - -@@ -1110,19 +1115,19 @@ - $(DEVCC) -DA4 $(DEVO_)gdevmjc.$(OBJ) $(C_) $(JAPSRC)gdevmjc.c - - $(DD)mj700v2c.dev : $(mj700v2c_) $(DD)page.dev \ -- $(CONTRIB_MAK) $(MAKEDIRS) -+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) - $(SETPDEV) $(DD)mj700v2c $(mj700v2c_) - - $(DD)mj500c.dev : $(mj700v2c_) $(DD)page.dev \ -- $(CONTRIB_MAK) $(MAKEDIRS) -+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) - $(SETPDEV) $(DD)mj500c $(mj700v2c_) - - $(DD)mj6000c.dev : $(mj700v2c_) $(DD)page.dev \ -- $(CONTRIB_MAK) $(MAKEDIRS) -+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) - $(SETPDEV) $(DD)mj6000c $(mj700v2c_) - - $(DD)mj8000c.dev : $(mj700v2c_) $(DD)page.dev \ -- $(CONTRIB_MAK) $(MAKEDIRS) -+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) - $(SETPDEV) $(DD)mj8000c $(mj700v2c_) - - ### ----------------- The Fujitsu FMPR printer device ----------------- ### -@@ -1130,7 +1135,7 @@ - fmpr_=$(DEVOBJ)gdevfmpr.$(OBJ) $(DEVOBJ)gdevprn.$(OBJ) - - $(DD)fmpr.dev : $(fmpr_) $(DD)page.dev \ -- $(CONTRIB_MAK) $(MAKEDIRS) -+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) - $(SETPDEV) $(DD)fmpr $(fmpr_) - - $(DEVOBJ)gdevfmpr.$(OBJ) : $(JAPSRC)gdevfmpr.c $(PDEVH) \ -@@ -1142,7 +1147,7 @@ - fmlbp_=$(DEVOBJ)gdevfmlbp.$(OBJ) $(DEVOBJ)gdevprn.$(OBJ) - - $(DD)fmlbp.dev : $(fmlbp_) $(DD)page.dev \ -- $(CONTRIB_MAK) $(MAKEDIRS) -+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) - $(SETPDEV) $(DD)fmlbp $(fmlbp_) - - $(DEVOBJ)gdevfmlbp.$(OBJ) : $(JAPSRC)gdevfmlbp.c $(PDEVH) \ -@@ -1159,7 +1164,7 @@ - ml6_=$(DEVOBJ)gdevml6.$(OBJ) $(DEVOBJ)gdevprn.$(OBJ) - - $(DD)ml600.dev : $(ml6_) $(DD)page.dev \ -- $(CONTRIB_MAK) $(MAKEDIRS) -+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) - $(SETPDEV) $(DD)ml600 $(ml6_) - - $(DEVOBJ)gdevml6.$(OBJ) : $(JAPSRC)gdevml6.c $(PDEVH) \ -@@ -1172,11 +1177,11 @@ - lbp3x0_=$(DEVOBJ)gdevlbp3.$(OBJ) - - $(DD)lbp310.dev :$(lbp3x0_) $(DD)page.dev \ -- $(CONTRIB_MAK) $(MAKEDIRS) -+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) - $(SETPDEV) $(DD)lbp310 $(lbp3x0_) - - $(DD)lbp320.dev :$(lbp3x0_) $(DD)page.dev \ -- $(CONTRIB_MAK) $(MAKEDIRS) -+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) - $(SETPDEV) $(DD)lbp320 $(lbp3x0_) - - $(DEVOBJ)gdevlbp3.$(OBJ) : $(JAPSRC)gdevlbp3.c $(PDEVH) -@@ -1191,7 +1196,7 @@ - $(DEVCC) -DA4 $(DEVO_)gdevnpdl.$(OBJ) $(LIPS_OPT) $(C_) $(JAPSRC)gdevnpdl.c - - $(DD)npdl.dev : $(npdl_) $(DD)page.dev \ -- $(CONTRIB_MAK) $(MAKEDIRS) -+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) - $(SETPDEV) $(DD)npdl $(npdl_) - - ### ------- EPSON ESC/Page printer device ----------------- ### -@@ -1203,11 +1208,11 @@ - $(DEVCC) -DA4 $(DEVO_)gdevespg.$(OBJ) $(LIPS_OPT) $(C_) $(JAPSRC)gdevespg.c - - $(DD)escpage.dev : $(escpage_) $(DD)page.dev \ -- $(CONTRIB_MAK) $(MAKEDIRS) -+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) - $(SETPDEV) $(DD)escpage $(escpage_) - - $(DD)lp2000.dev : $(escpage_) $(DD)page.dev \ -- $(CONTRIB_MAK) $(MAKEDIRS) -+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) - $(SETPDEV) $(DD)lp2000 $(escpage_) - - ### --- The RICOH RPDL language printer device ------ ### -@@ -1218,7 +1223,7 @@ - $(DEVCC) $(DEVO_)gdevrpdl.$(OBJ) $(LIPS_OPT) $(C_) $(JAPSRC)gdevrpdl.c - - $(DD)rpdl.dev : $(rpdl_) $(DD)page.dev \ -- $(CONTRIB_MAK) $(MAKEDIRS) -+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) - $(SETPDEV) $(DD)rpdl $(rpdl_) - - ### ---------- RICOH RPDL IV(600dpi) printer devices ---------- ### -@@ -1240,15 +1245,15 @@ - alps_=$(DEVOBJ)gdevalps.$(OBJ) - - $(DD)md50Mono.dev : $(alps_) $(DD)page.dev \ -- $(CONTRIB_MAK) $(MAKEDIRS) -+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) - $(SETPDEV) $(DD)md50Mono $(alps_) - - $(DD)md50Eco.dev : $(alps_) $(DD)page.dev \ -- $(CONTRIB_MAK) $(MAKEDIRS) -+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) - $(SETPDEV) $(DD)md50Eco $(alps_) - - $(DD)md1xMono.dev : $(alps_) $(DD)page.dev \ -- $(CONTRIB_MAK) $(MAKEDIRS) -+ $(CONTDEV) $(CONTRIB_MAK) $(MAKEDIRS) - $(SETPDEV) $(DD)md1xMono $(alps_) - - $(DEVOBJ)gdevalps.$(OBJ) : $(JAPSRC)gdevalps.c $(PDEVH) \ diff --git a/third_party/nixpkgs/pkgs/misc/ghostscript/default.nix b/third_party/nixpkgs/pkgs/misc/ghostscript/default.nix index d3d06d98cb..5a7762640f 100644 --- a/third_party/nixpkgs/pkgs/misc/ghostscript/default.nix +++ b/third_party/nixpkgs/pkgs/misc/ghostscript/default.nix @@ -1,4 +1,4 @@ -{ config, stdenv, lib, fetchurl, pkgconfig, zlib, expat, openssl, autoconf +{ config, stdenv, lib, fetchurl, pkg-config, zlib, expat, openssl, autoconf , libjpeg, libpng, libtiff, freetype, fontconfig, libpaper, jbig2dec , libiconv, ijs, lcms2, fetchpatch , cupsSupport ? config.ghostscript.cups or (!stdenv.isDarwin), cups ? null @@ -9,10 +9,6 @@ assert x11Support -> xlibsWrapper != null; assert cupsSupport -> cups != null; let - version = "9.${ver_min}"; - ver_min = "52"; - sha512 = "1ksm3v4nw8acc4j817n44l1c65ijk0mr3mp4kryy17jz41bmzzql5d8vr40h59n9dmf8b2wmnbq45bj3an1zrpfagavlf0i9s436jjc"; - fonts = stdenv.mkDerivation { name = "ghostscript-fonts"; @@ -37,31 +33,27 @@ let in stdenv.mkDerivation rec { pname = "ghostscript"; - inherit version; + version = "9.53.3"; src = fetchurl { - url = "https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs9${ver_min}/${pname}-${version}.tar.xz"; - inherit sha512; + url = "https://github.com/ArtifexSoftware/ghostpdl-downloads/releases/download/gs9${lib.versions.minor version}${lib.versions.patch version}/${pname}-${version}.tar.xz"; + sha512 = "2vif3vgxa5wma16yxvhhkymk4p309y5204yykarq94r5rk890556d2lj5w7acnaa2ymkym6y0zd4vq9sy9ca2346igg2c6dxqkjr0zb"; }; patches = [ (fetchpatch { - name = "CVE-2020-15900.patch"; - url = "https://github.com/ArtifexSoftware/ghostpdl/commit/5d499272b95a6b890a1397e11d20937de000d31b.patch"; - sha256 = "1nnnrn8q33x7nc8227ygc60f3mj4bjzrhj40sxp6dah58rb5x5jz"; + url = "https://github.com/ArtifexSoftware/ghostpdl/commit/41ef9a0bc36b9db7115fbe9623f989bfb47bbade.patch"; + sha256 = "1qpc6q1fpxshqc0mqgg36kng47kgljk50bmr8p7wn21jgfkh7m8w"; }) ./urw-font-files.patch ./doc-no-ref.diff - # rebased version of upstream http://git.ghostscript.com/?p=ghostpdl.git;a=patch;h=1b4c3669a20c, - # Remove on update to version > 9.52 - ./0001-Bug-702364-Fix-missing-echogs-dependencies.patch ]; outputs = [ "out" "man" "doc" ]; enableParallelBuilding = true; - nativeBuildInputs = [ pkgconfig autoconf ]; + nativeBuildInputs = [ pkg-config autoconf ]; buildInputs = [ zlib expat openssl libjpeg libpng libtiff freetype fontconfig libpaper jbig2dec @@ -115,8 +107,6 @@ stdenv.mkDerivation rec { install_name_tool -change libgs.dylib.${version} $out/lib/libgs.dylib.${version} $out/bin/gs ''; - passthru = { inherit version; }; - meta = { homepage = "https://www.ghostscript.com/"; description = "PostScript interpreter (mainline version)"; diff --git a/third_party/nixpkgs/pkgs/misc/vim-plugins/generated.nix b/third_party/nixpkgs/pkgs/misc/vim-plugins/generated.nix index 80f27fd87a..87ce6f2dad 100644 --- a/third_party/nixpkgs/pkgs/misc/vim-plugins/generated.nix +++ b/third_party/nixpkgs/pkgs/misc/vim-plugins/generated.nix @@ -219,6 +219,18 @@ let meta.homepage = "https://github.com/ayu-theme/ayu-vim/"; }; + barbar-nvim = buildVimPluginFrom2Nix { + pname = "barbar-nvim"; + version = "2020-11-06"; + src = fetchFromGitHub { + owner = "romgrk"; + repo = "barbar.nvim"; + rev = "92e70f9e369d106476de283354bc30e37a94e864"; + sha256 = "17az4flcsry4f2p4xnmgw0ymbbybcfycajm25g6r692hcbgkg5dx"; + }; + meta.homepage = "https://github.com/romgrk/barbar.nvim/"; + }; + base16-vim = buildVimPluginFrom2Nix { pname = "base16-vim"; version = "2019-06-07"; @@ -389,12 +401,12 @@ let coc-explorer = buildVimPluginFrom2Nix { pname = "coc-explorer"; - version = "2020-11-01"; + version = "2020-11-02"; src = fetchFromGitHub { owner = "weirongxu"; repo = "coc-explorer"; - rev = "eb10e21721ee527d86cbc4422d4cdc5d53ea65fd"; - sha256 = "10qgca7hncxmlmbcd0d9rmkdjd22qp88llz0dlsgm6ckng46nbpn"; + rev = "3530aaf09473366e3d21811a708d9cde7e1f4a02"; + sha256 = "1qksmhgn71rax5gz5zjxp80wx3xabgv9k8y9pbldr19r777gb14r"; }; meta.homepage = "https://github.com/weirongxu/coc-explorer/"; }; @@ -413,12 +425,12 @@ let coc-markdownlint = buildVimPluginFrom2Nix { pname = "coc-markdownlint"; - version = "2020-10-27"; + version = "2020-11-02"; src = fetchFromGitHub { owner = "fannheyward"; repo = "coc-markdownlint"; - rev = "abdd6450aee119750ddb4dff4a7ab82355a89418"; - sha256 = "1p0wafvn8xzi4bm9bn2fnp8kavw8s6hchpz81ms9770jrx02z5xi"; + rev = "56af4992a9f48a5ae210a0bf346e00a08075908a"; + sha256 = "0gjfs3mrxv88z8fvm4rc51hw8kghami80pbvz7jcz0bf9bfwgdaw"; }; meta.homepage = "https://github.com/fannheyward/coc-markdownlint/"; }; @@ -461,12 +473,12 @@ let coc-nvim = buildVimPluginFrom2Nix { pname = "coc-nvim"; - version = "2020-11-01"; + version = "2020-11-02"; src = fetchFromGitHub { owner = "neoclide"; repo = "coc.nvim"; - rev = "2adc879786ca65c3fdc3dd94743acbbed3f54465"; - sha256 = "1j4kjxflm0ldaa0pgjm081x95hqxhhanv45mwwnmcg2lkpd6lnq5"; + rev = "0cbd225b922c3702e4828608bab1c6bf699a3eeb"; + sha256 = "05r8nfbf702bsrzpps2gj04d62kjaa9h6h116c0ql0iwi2zi0kmi"; }; meta.homepage = "https://github.com/neoclide/coc.nvim/"; }; @@ -738,12 +750,12 @@ let defx-nvim = buildVimPluginFrom2Nix { pname = "defx-nvim"; - version = "2020-10-28"; + version = "2020-11-02"; src = fetchFromGitHub { owner = "Shougo"; repo = "defx.nvim"; - rev = "152c61f409d6a58b4c10bbd70b51bedd3db11a3c"; - sha256 = "02izychnj48gb108a4npk8v1nfhw99x5368jv2yqrxaixqmykkrs"; + rev = "042c40816befafa2348d2268274a88d767850ba8"; + sha256 = "1az0hwpvbrrwc0zd5ckap3vq2bk59br841dlhvcq1hpwgh431p0h"; }; meta.homepage = "https://github.com/Shougo/defx.nvim/"; }; @@ -1100,12 +1112,12 @@ let dracula-vim = buildVimPluginFrom2Nix { pname = "dracula-vim"; - version = "2020-10-19"; + version = "2020-11-02"; src = fetchFromGitHub { owner = "dracula"; repo = "vim"; - rev = "80d2667818492e2e7630894f2b3eb7fdae1e240f"; - sha256 = "1bq52larf3bbhrrzqg2gx737zc1xrg8qa916ny2qh9w7lsjjwf4h"; + rev = "261765405c07bfbf808c69cb6126e0e5a7c6ea4f"; + sha256 = "03abvp7fhssgynm5405bx6qdnbv4j4hrwwz6npqnb5ajqwl6y4cm"; }; meta.homepage = "https://github.com/dracula/vim/"; }; @@ -1271,12 +1283,12 @@ let float-preview-nvim = buildVimPluginFrom2Nix { pname = "float-preview-nvim"; - version = "2020-04-19"; + version = "2020-11-03"; src = fetchFromGitHub { owner = "ncm2"; repo = "float-preview.nvim"; - rev = "3c2e230a3fe34b3a5fb74519797c29daa5a6a69a"; - sha256 = "1i5wj1hqimzrw3bwsf76w8l8yp654pdn8f61kp0v98xdgkab007d"; + rev = "f9ed1c701d5ea41222509fc822cbdc5613b14b2d"; + sha256 = "0r1pj80mnsr269d7mnxfagdp988gn3gnf5fix55z4qwim9cakrl8"; }; meta.homepage = "https://github.com/ncm2/float-preview.nvim/"; }; @@ -1331,12 +1343,12 @@ let fzf-vim = buildVimPluginFrom2Nix { pname = "fzf-vim"; - version = "2020-10-30"; + version = "2020-11-03"; src = fetchFromGitHub { owner = "junegunn"; repo = "fzf.vim"; - rev = "bd3a021ec11617c56e6aa95578fee619445b029d"; - sha256 = "1jd0bs7v28za6sba6f2i49mvjcnicid25ab3jljcax18c4kd6dl1"; + rev = "61c4b6d1ed30287edcbfd3dbaed4e43b5c251c93"; + sha256 = "09fx5bg9kaw2zv98vvvx5pix0b0dn06kxk3mq9khiak2liyq96lv"; }; meta.homepage = "https://github.com/junegunn/fzf.vim/"; }; @@ -1776,12 +1788,12 @@ let kotlin-vim = buildVimPluginFrom2Nix { pname = "kotlin-vim"; - version = "2020-08-11"; + version = "2020-11-02"; src = fetchFromGitHub { owner = "udalov"; repo = "kotlin-vim"; - rev = "26970168ca88c62b271fbc0a275dbe31cda94bd6"; - sha256 = "0mvwz8gwv619b4l7g3mafvd6q4khl0xis0a8v300d8i3pjhx4i40"; + rev = "f338707b2aa658aef4c0d98fd9748240859cf2a9"; + sha256 = "0wm9bkykvm89f966a8wxm5vvg9kjayy5iziahnch35hrmscs5x4b"; }; meta.homepage = "https://github.com/udalov/kotlin-vim/"; }; @@ -1810,6 +1822,18 @@ let meta.homepage = "https://github.com/autozimu/LanguageClient-neovim/"; }; + LanguageTool-nvim = buildVimPluginFrom2Nix { + pname = "LanguageTool-nvim"; + version = "2020-10-19"; + src = fetchFromGitHub { + owner = "vigoux"; + repo = "LanguageTool.nvim"; + rev = "809e7d77fec834597f495fec737c59292a10025b"; + sha256 = "1g12dz85xq8qd92dgna0a3w6zgxa74njlvmvly4k20610r63bzrn"; + }; + meta.homepage = "https://github.com/vigoux/LanguageTool.nvim/"; + }; + last256 = buildVimPluginFrom2Nix { pname = "last256"; version = "2017-06-10"; @@ -2292,12 +2316,12 @@ let neoformat = buildVimPluginFrom2Nix { pname = "neoformat"; - version = "2020-10-27"; + version = "2020-11-02"; src = fetchFromGitHub { owner = "sbdchd"; repo = "neoformat"; - rev = "2033ca4fa0a820658f07e6a2ffcfb0434d5be071"; - sha256 = "0mz237rbymlq6ksmyakc6mqvskic72fgaw88jywg3cmnjjskqvi2"; + rev = "2132bc678f5389593cea1b82ec1ea630cde0041a"; + sha256 = "0h4ymq4jgxw48s2ccvsj5612pmb8vdsqq2hgx877rjji1chxk432"; }; meta.homepage = "https://github.com/sbdchd/neoformat/"; }; @@ -2460,14 +2484,14 @@ let neuron-vim = buildVimPluginFrom2Nix { pname = "neuron-vim"; - version = "2020-08-07"; + version = "2020-10-29"; src = fetchFromGitHub { - owner = "ihsanturk"; + owner = "fiatjaf"; repo = "neuron.vim"; - rev = "07521a3ef2940bd726e7b4d50b82e46898e686cc"; - sha256 = "0myadiy6y2p73lhdzk2w55whg4i5rs004jaw1m21cz0dk8k8ibn2"; + rev = "2b4321bf12a4d0b589cd8c26aabb7e31311dab26"; + sha256 = "0h8m72n4jdl9fa308wrchckn6xsbs3b5w8b0714qf9rdpg8jzwa6"; }; - meta.homepage = "https://github.com/ihsanturk/neuron.vim/"; + meta.homepage = "https://github.com/fiatjaf/neuron.vim/"; }; nim-vim = buildVimPluginFrom2Nix { @@ -2580,12 +2604,12 @@ let nvim-treesitter = buildVimPluginFrom2Nix { pname = "nvim-treesitter"; - version = "2020-10-31"; + version = "2020-11-03"; src = fetchFromGitHub { owner = "nvim-treesitter"; repo = "nvim-treesitter"; - rev = "9327b113c2360d503ab183718c57e3e1b0819887"; - sha256 = "1xgw0464563rc6wnjhf9m2f25wii80d78laa8ifjbjivrv4b0y1k"; + rev = "f999dc41131c3c69f2411af13597932c042e8e5a"; + sha256 = "0zn8lf290cm2pwjd4iawjrlbpcxqrgqj2agarvsqrlmdxhgq7a77"; }; meta.homepage = "https://github.com/nvim-treesitter/nvim-treesitter/"; }; @@ -3337,12 +3361,12 @@ let tagbar = buildVimPluginFrom2Nix { pname = "tagbar"; - version = "2020-10-30"; + version = "2020-11-03"; src = fetchFromGitHub { owner = "preservim"; repo = "tagbar"; - rev = "99c22f1bb209e3393053a4dfb38039534b6b8a8d"; - sha256 = "1bj7qi36yakxqds43fqp2876za4aq3bbb9444yvna2l0n504iy9j"; + rev = "53c8e196764ec74353c0e9c758daa108b9fe4c38"; + sha256 = "07ayc60w86w4mnm49jh4h89pwz5ry2a5vagy8xsv5hy1r6wqirpy"; }; meta.homepage = "https://github.com/preservim/tagbar/"; }; @@ -3385,12 +3409,12 @@ let telescope-nvim = buildVimPluginFrom2Nix { pname = "telescope-nvim"; - version = "2020-11-01"; + version = "2020-11-03"; src = fetchFromGitHub { owner = "nvim-lua"; repo = "telescope.nvim"; - rev = "54ef9d90d5a032906bfb007113930dac0f665f72"; - sha256 = "0zh6dpxfibm0clafs2zsnb4ffmh3438qiccc60md2s7hwhzynvyq"; + rev = "1f3110bf54877b975956e42911e05d517d8f4993"; + sha256 = "1172fj2vzf9p86pvl9b297xp9qmikwmcj7j3qv3dgk3rdh4f66mg"; }; meta.homepage = "https://github.com/nvim-lua/telescope.nvim/"; }; @@ -4106,12 +4130,12 @@ let vim-clap = buildVimPluginFrom2Nix { pname = "vim-clap"; - version = "2020-10-31"; + version = "2020-11-03"; src = fetchFromGitHub { owner = "liuchengxu"; repo = "vim-clap"; - rev = "f7f800f59bb1e199993c5554f014c7e8e2685165"; - sha256 = "1ka6q9fqzhjxzi0n803mk9f6rwnlbrjsjzjq52b8dghc9n0359a1"; + rev = "d7bbe7529680662025f633954501a537ba226942"; + sha256 = "042qzd3dg3y5m1sggsxhzhz2i4mnlv8sii817xx6vfif49pg7b0r"; }; meta.homepage = "https://github.com/liuchengxu/vim-clap/"; }; @@ -4382,12 +4406,12 @@ let vim-dirdiff = buildVimPluginFrom2Nix { pname = "vim-dirdiff"; - version = "2020-10-12"; + version = "2020-11-03"; src = fetchFromGitHub { owner = "will133"; repo = "vim-dirdiff"; - rev = "6e4b04c252be6537b888e88e5bef959308a7c993"; - sha256 = "0n5g78021xzswfnghhzfgv5acaqv6s9k10d8kp84b846bjxc5hb7"; + rev = "0191693f0d3dfc624c61ac95ec951183a50b3b32"; + sha256 = "0har8iri09nkjsvag4wgsynb9fxan2g8nlvlvd5zsalbnmlmdh9j"; }; meta.homepage = "https://github.com/will133/vim-dirdiff/"; }; @@ -5955,12 +5979,12 @@ let vim-plug = buildVimPluginFrom2Nix { pname = "vim-plug"; - version = "2020-10-22"; + version = "2020-11-03"; src = fetchFromGitHub { owner = "junegunn"; repo = "vim-plug"; - rev = "ab940f624ae1df24605a8ff1bf427de7a76e5911"; - sha256 = "0v985v9a7kspchfvr2lvj5jqnlkg05agyay0wn0c6mg5bf2mw8q1"; + rev = "2f4e28161e114cc4b34a9b8ff0f51f4906f37b0b"; + sha256 = "1wfcyrjqqngnf4l9afc0342avkys8ipfrna7zlgiypwji926y2k7"; }; meta.homepage = "https://github.com/junegunn/vim-plug/"; }; @@ -5979,12 +6003,12 @@ let vim-polyglot = buildVimPluginFrom2Nix { pname = "vim-polyglot"; - version = "2020-10-27"; + version = "2020-11-02"; src = fetchFromGitHub { owner = "sheerun"; repo = "vim-polyglot"; - rev = "05e21a9e252b283b2d71568ad3b671d7f28fe0bc"; - sha256 = "039wha51p2zwnjyjm0qxca63dgrp54l43ba74639gf0hp5h2wvfa"; + rev = "cd768124020d3c565f1d400ea0537949351b26a2"; + sha256 = "1wa8wk60vs9d3qflq4m49h15bwv86gwl2hqbcbfbqdq57y3l3r87"; }; meta.homepage = "https://github.com/sheerun/vim-polyglot/"; }; @@ -6031,8 +6055,8 @@ let src = fetchFromGitHub { owner = "dhruvasagar"; repo = "vim-prosession"; - rev = "1be0c069a2b362369913ffaeed5293ffe1932ef6"; - sha256 = "0hqfwlkz64kkh8w6w5k7gw2i0x7spddbgixjcrp1lr6n6bslkj2d"; + rev = "ad008dbdcd04ee1758f4475263c2a37789d32702"; + sha256 = "14fcvghqbv7mx2yi112vc9cq69mw98fgv0vc8x256v639bj1y5g9"; }; meta.homepage = "https://github.com/dhruvasagar/vim-prosession/"; }; @@ -6099,12 +6123,12 @@ let vim-qml = buildVimPluginFrom2Nix { pname = "vim-qml"; - version = "2020-10-24"; + version = "2020-11-03"; src = fetchFromGitHub { owner = "peterhoeg"; repo = "vim-qml"; - rev = "77853c3ff98a868dcbbdfa4eb8f0e659b57993ff"; - sha256 = "14v90gchmpl1nkiic3f3kiz8akbw2wmpish794xakvz63iys703y"; + rev = "50d2e737094c146195171b7d52e522384f15afe8"; + sha256 = "1iz2l51c15ijkpzyk5qwmd8y0yy2z8f1jwxcwk16h63g4nmfm1zr"; }; meta.homepage = "https://github.com/peterhoeg/vim-qml/"; }; @@ -6447,12 +6471,12 @@ let vim-snippets = buildVimPluginFrom2Nix { pname = "vim-snippets"; - version = "2020-10-29"; + version = "2020-11-02"; src = fetchFromGitHub { owner = "honza"; repo = "vim-snippets"; - rev = "0161732b61a60a8dc8dd80db7ff678197fc2c2aa"; - sha256 = "1hyinjg9x80i6zpmf1l6lwnv58amkd5bw26w27xakd74c4am2603"; + rev = "0f3d4d187c842419fe6e131fe20f5f3336418a62"; + sha256 = "09phzarfakz5mv3jshsab60iiq8byv6xggb0qiasafvxfrcx8c2s"; }; meta.homepage = "https://github.com/honza/vim-snippets/"; }; @@ -6988,12 +7012,12 @@ let vim-wakatime = buildVimPluginFrom2Nix { pname = "vim-wakatime"; - version = "2020-02-12"; + version = "2020-11-02"; src = fetchFromGitHub { owner = "wakatime"; repo = "vim-wakatime"; - rev = "dd74c71cd2ea23b4a6cba4b05c873983c16e297c"; - sha256 = "1dc04vmpv62x2rfnfad2y60l5xzpw0167pbii9kss6n6ra81gayr"; + rev = "c725124ae8885ca6da4fe5cd03bda4bd77dc3fd1"; + sha256 = "1mvvqbjszp6mc0rq6m1nj7cyy44z4xf2h4lc561wkfblhhk9j4i6"; }; meta.homepage = "https://github.com/wakatime/vim-wakatime/"; }; @@ -7192,12 +7216,12 @@ let vimsence = buildVimPluginFrom2Nix { pname = "vimsence"; - version = "2020-06-30"; + version = "2020-11-02"; src = fetchFromGitHub { owner = "hugolgst"; repo = "vimsence"; - rev = "d6bb167499b8e43e889b305c8670b2445f505ced"; - sha256 = "0f6jzkfjcvaln61jbva2laws8aqhs5vk4314z900d3hb7rfclrfy"; + rev = "433875b4a994582a28795f8944af10d935b64322"; + sha256 = "117yxp3bzhrdi03r2d2zr1r2702czkxamdvgcxr62gysdgbz5i9z"; }; meta.homepage = "https://github.com/hugolgst/vimsence/"; }; 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 8af0e8cb1b..4a50581cec 100644 --- a/third_party/nixpkgs/pkgs/misc/vim-plugins/vim-plugin-names +++ b/third_party/nixpkgs/pkgs/misc/vim-plugins/vim-plugin-names @@ -109,6 +109,7 @@ fatih/vim-go fcpg/vim-osc52 FelikZ/ctrlp-py-matcher fenetikm/falcon +fiatjaf/neuron.vim fisadev/vim-isort flazz/vim-colorschemes floobits/floobits-neovim @@ -159,7 +160,6 @@ iamcco/coc-vimlsp ianks/vim-tsx idanarye/vim-merginal idris-hackers/idris-vim -ihsanturk/neuron.vim Inazuma110/deoplete-greek inkarkat/vim-SyntaxRange int3/vim-extradite @@ -429,6 +429,7 @@ rhysd/vim-operator-surround rodjek/vim-puppet romainl/vim-cool roman/golden-ratio +romgrk/barbar.nvim ron89/thesaurus_query.vim roxma/nvim-cm-racer roxma/nvim-completion-manager @@ -553,6 +554,7 @@ unblevable/quick-scope urbit/hoon.vim Valodim/deoplete-notmuch vhda/verilog_systemverilog.vim +vigoux/LanguageTool.nvim vim-airline/vim-airline vim-airline/vim-airline-themes vim-pandoc/vim-pandoc diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/apparmor/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/apparmor/default.nix index 0e10add556..64fa92be86 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/apparmor/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/apparmor/default.nix @@ -14,7 +14,7 @@ let apparmor-series = "2.13"; - apparmor-patchver = "4"; + apparmor-patchver = "5"; apparmor-version = apparmor-series + "." + apparmor-patchver; apparmor-meta = component: with stdenv.lib; { @@ -27,19 +27,10 @@ let apparmor-sources = fetchurl { url = "https://launchpad.net/apparmor/${apparmor-series}/${apparmor-version}/+download/apparmor-${apparmor-version}.tar.gz"; - sha256 = "03nislxccnbxld89giak2s8xa4mdbwscfxbdwhmw5qpvgz08dgwh"; - }; - - # See This and the - # accompanying application in prePatchCommon should be removed in 2.13.5 - gnumake43Patch = fetchpatch { - url = "https://gitlab.com/apparmor/apparmor/-/merge_requests/465.patch"; - name = "2-23-fix-build-with-make-4.3.patch"; - sha256 = "0xw028iqp69j9mxv0kbwraplgkj5i5djdlgf0anpkc5cdbsf96r9"; + sha256 = "05x7r99k00r97v1cq2f711lv6yqzhbl8zp1i1c7kxra4v0a2lzk3"; }; prePatchCommon = '' - patch -p1 < ${gnumake43Patch} chmod a+x ./common/list_capabilities.sh ./common/list_af_names.sh patchShebangs ./common/list_capabilities.sh ./common/list_af_names.sh substituteInPlace ./common/Make.rules --replace "/usr/bin/pod2man" "${buildPackages.perl}/bin/pod2man" diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/i2c-tools/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/i2c-tools/default.nix index 3a00dbefa6..d1dc94290f 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/i2c-tools/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/i2c-tools/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "i2c-tools"; - version = "4.1"; + version = "4.2"; src = fetchurl { url = "https://www.kernel.org/pub/software/utils/i2c-tools/${pname}-${version}.tar.xz"; - sha256 = "1m97hpwqfaqjl9xvr4pvz2vdrsdvxbcn0nnx8pamnyc3s7pikcjp"; + sha256 = "1mmc1n8awl3winyrp1rcxg94vjsx9dc1y7gj7y88blc2f2ydmwip"; }; buildInputs = [ perl ]; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/iproute/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/iproute/default.nix index a9fcf455ee..b3de7ceeda 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/iproute/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/iproute/default.nix @@ -5,19 +5,19 @@ stdenv.mkDerivation rec { pname = "iproute2"; - version = "5.8.0"; + version = "5.9.0"; src = fetchurl { url = "mirror://kernel/linux/utils/net/${pname}/${pname}-${version}.tar.xz"; - sha256 = "0vk4vickrpahdhl3zazr2qn2bf99v5549ncirjpwiy4h0a4izkfg"; + sha256 = "1kys6dmhrl43iaq95n5sh02p39d7bq8i5y672qrzgwnwpjaaqpd2"; }; preConfigure = '' # Don't try to create /var/lib/arpd: sed -e '/ARPDDIR/d' -i Makefile - # TODO: Drop temporary version fix for 5.8 (53159d81) once 5.9 is out: + # TODO: Drop temporary version fix for 5.9 once 5.10 is out: substituteInPlace include/version.h \ - --replace "v5.7.0-77-gb687d1067169" "5.8.0" + --replace "5.8.0" "${version}" ''; outputs = [ "out" "dev" ]; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/ipset/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/ipset/default.nix index 2c433ba8c2..dada5c35f7 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/ipset/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/ipset/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "ipset"; - version = "7.6"; + version = "7.7"; src = fetchurl { url = "http://ipset.netfilter.org/${pname}-${version}.tar.bz2"; - sha256 = "1ny2spcm6bmpj8vnazssg99k59impr7n84jzkdmdjly1m7548z8f"; + sha256 = "0ckc678l1431mb0q5ilfgy0ajjwi8n135c72h606imm43dc0v9a5"; }; nativeBuildInputs = [ pkgconfig ]; 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 ff410b2ab2..f97474556c 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,27 +1,27 @@ { "4.14": { - "name": "linux-hardened-4.14.202.a.patch", - "sha256": "0ns5yq087m7i7ciq2b4skxclnlym0zm5v0vjqvzi9r375fd0gm9s", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.202.a/linux-hardened-4.14.202.a.patch" + "name": "linux-hardened-4.14.204.a.patch", + "sha256": "1vwja9mqycw3322p8a896l9mkxvzym6r9q17zfgwpqi3kvr9k74h", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.204.a/linux-hardened-4.14.204.a.patch" }, "4.19": { - "name": "linux-hardened-4.19.152.a.patch", - "sha256": "0zc36yklzjb3sqd61m12c1988mazkrv242wbk7cn0a2b5sw7a373", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.152.a/linux-hardened-4.19.152.a.patch" + "name": "linux-hardened-4.19.155.a.patch", + "sha256": "0jrvd9yws7cym08j28r7wv3i83zlk5z0vl0l1mibak04h43mibgf", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.155.a/linux-hardened-4.19.155.a.patch" }, "5.4": { - "name": "linux-hardened-5.4.72.a.patch", - "sha256": "1w4sfkx4qj9vx47z06bkf4biaiz58z2qp536g7dss26zdbx1im26", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.72.a/linux-hardened-5.4.72.a.patch" + "name": "linux-hardened-5.4.75.a.patch", + "sha256": "169m2a3wm5lsyzp7cp8nvxarhgcnan41ap7k5r7jx7x1frx2vzxm", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.75.a/linux-hardened-5.4.75.a.patch" }, "5.8": { - "name": "linux-hardened-5.8.16.a.patch", - "sha256": "0b7bfzknz2am9pfypazqzky9bcd6659sakcdx2a7p1i3bj6zxnn1", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.8.16.a/linux-hardened-5.8.16.a.patch" + "name": "linux-hardened-5.8.18.a.patch", + "sha256": "1r2n74nbyi3dp5zql9sk504xkpil6ylbyd99zqqva4nd3qg17c99", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.8.18.a/linux-hardened-5.8.18.a.patch" }, "5.9": { - "name": "linux-hardened-5.9.1.a.patch", - "sha256": "07897dgkldm2dxsriapjlg9b118sd32qmd1z8xja01xcgd3r6vp7", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.9.1.a/linux-hardened-5.9.1.a.patch" + "name": "linux-hardened-5.9.6.a.patch", + "sha256": "1h25jkbp0yz2jfmbnwrldd1rcpag8mbf8dv6kc79j7qg1agafxkn", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.9.6.a/linux-hardened-5.9.6.a.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 a28531ee40..dedd3485c2 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 stdenv.lib; buildLinux (args // rec { - version = "4.14.203"; + version = "4.14.204"; # 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 = "0c9r1s83mrn9lzgrr4wzvk4d72q70sbgf7lql6z9ivkf12v3p5mc"; + sha256 = "1ncacsy2g80zigfx8nmr1f7v50s1y9ys1xy9jgizrnvmxjcji0wy"; }; } // (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 7a63297578..dcde8fceba 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 stdenv.lib; buildLinux (args // rec { - version = "4.19.154"; + version = "4.19.155"; # 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 = "0ik6anz6ly0dl0lp8m5mighlvzkifnk2kljwajxa56vbhj691339"; + sha256 = "1lj81aadyskmxs3j4s923nhnk69dfj2kiwm0nxabbcjw83sliinb"; }; } // (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 ad3334d7c9..9db1ada350 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 stdenv.lib; buildLinux (args // rec { - version = "5.4.73"; + version = "5.4.75"; # 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 = "1cknwnzpimjfacjbb39ay9j4lv3767j2858xz9yvwsvj7d04nhjs"; + sha256 = "0w0lpiy56zqdm2vpx9ckxakna334n88pnqbv52zyfcslxgb6yinj"; }; } // (args.argsOverride or {})) diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.8.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.8.nix index ee58f02db8..dd11359dbf 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.8.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.8.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "5.8.17"; + version = "5.8.18"; # 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 = "00rwvsrmklvkzch8bl6z29vch4dyvzxrs97pr1qd13afw7y6912n"; + sha256 = "0d2mm16mjyl2d734ak0lj8vd76h3r0san7l7g2zczd5pjkva7d2a"; }; } // (args.argsOverride or {})) diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.9.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.9.nix index 05c594f7ef..59f18baa8c 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.9.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.9.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "5.9.2"; + version = "5.9.6"; # 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 = "0dh2ciyrm2ac7r4pybxa1cq3pfw3z3ilj50gdaa0clm9j7nyrx2i"; + sha256 = "0w2kcng09nzk09dwkx4azdfgnwzbd2mz8lyl4j69bwx837z85hbc"; }; } // (args.argsOverride or {})) 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 b1f40ac1c9..3ea7d62059 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.70-rt40"; # updated by ./update-rt.sh + version = "5.4.74-rt41"; # 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 = "01shqhibrxirl9bik8jwiag70n9n0l7782xh73gkb8jvbh4dicy0"; + sha256 = "1drs2pngr5w3rmpydljirmibp30qb4hdrhqsi92knshlw6nz817c"; }; kernelPatches = let rt-patch = { name = "rt"; patch = fetchurl { url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz"; - sha256 = "19px04cmv1v65ad7dr3y0bjr9xviawhb26iijvnxiwyjvm0054kw"; + sha256 = "0ap5zvdx6zxwqh2cy67rha4zgz3k8vqzd2vhll1mx81d10fmvmp8"; }; }; in [ rt-patch ] ++ lib.remove rt-patch kernelPatches; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-testing.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-testing.nix index 29f1aad2e4..7931c5a053 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-testing.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-testing.nix @@ -3,7 +3,7 @@ with stdenv.lib; buildLinux (args // rec { - version = "5.10-rc1"; + version = "5.10-rc2"; extraMeta.branch = "5.10"; # modDirVersion needs to be x.y.z, will always add .0 @@ -11,7 +11,7 @@ buildLinux (args // rec { src = fetchurl { url = "https://git.kernel.org/torvalds/t/linux-${version}.tar.gz"; - sha256 = "1s4ywf93xrlkjjq3c4142qhmsvx3kl0xwkbc09ss6gln8lwqnga8"; + sha256 = "1qh353xd48mbvavpw61r2lz1cn8007yyc2xqiacbn8xsj7xdlxkj"; }; # Should the testing kernels ever be built on Hydra? diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-zen.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-zen.nix index f4b0f3870f..9ee6dad768 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-zen.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-zen.nix @@ -1,7 +1,7 @@ { stdenv, fetchFromGitHub, buildLinux, ... } @ args: let - version = "5.8.13"; + version = "5.9.3"; in buildLinux (args // { @@ -13,12 +13,12 @@ buildLinux (args // { owner = "zen-kernel"; repo = "zen-kernel"; rev = "v${version}-zen1"; - sha256 = "161bvrmic7gspkgkv0pqssk6dzv95vkxld69rir968khwlnpsnim"; + sha256 = "0004fp3qnz2dpahnxkbc02yyijyqiavqmacyng1fi5wrw5kl2aj3"; }; extraMeta = { - branch = "5.8/master"; - maintainers = with stdenv.lib.maintainers; [ atemu ]; + branch = "5.9/master"; + maintainers = with stdenv.lib.maintainers; [ atemu andresilva ]; }; } // (args.argsOverride or {})) diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/libcap/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/libcap/default.nix index 174f1be99d..7931e35a84 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/libcap/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/libcap/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "libcap"; - version = "2.27"; + version = "2.44"; src = fetchurl { url = "mirror://kernel/linux/libs/security/linux-privs/libcap2/${pname}-${version}.tar.xz"; - sha256 = "0sj8kidl7qgf2qwxcbw1vadnlb30y4zvjzxswsmfdghq04npkhfs"; + sha256 = "1qf80lifygbnxwvqjf8jz5j24n6fqqx4ixnkbf76xs2vrmcq664j"; }; outputs = [ "out" "dev" "lib" "man" "doc" "pam" ]; @@ -54,6 +54,7 @@ stdenv.mkDerivation rec { meta = { description = "Library for working with POSIX capabilities"; + homepage = "https://sites.google.com/site/fullycapable"; platforms = stdenv.lib.platforms.linux; license = stdenv.lib.licenses.bsd3; }; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/lxcfs/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/lxcfs/default.nix index bcc8614bc6..0067f0881a 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/lxcfs/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/lxcfs/default.nix @@ -5,13 +5,13 @@ with stdenv.lib; stdenv.mkDerivation rec { pname = "lxcfs"; - version = "4.0.5"; + version = "4.0.6"; src = fetchFromGitHub { owner = "lxc"; repo = "lxcfs"; rev = "lxcfs-${version}"; - sha256 = "12mk9hgqzzh1874389lrpvldlp87qxxa1sxzk5zr0d0n1857am5y"; + sha256 = "1fp2q4y3ql4xd2lp4bpcl8s6xryr5xbb56da9d20w2cdr2d0lwyv"; }; nativeBuildInputs = [ pkgconfig help2man autoreconfHook ]; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/nvidia-x11/persistenced.nix b/third_party/nixpkgs/pkgs/os-specific/linux/nvidia-x11/persistenced.nix index ff2792ac31..5979f7e9a2 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/nvidia-x11/persistenced.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/nvidia-x11/persistenced.nix @@ -1,6 +1,10 @@ nvidia_x11: sha256: -{ stdenv, fetchFromGitHub, m4 }: +{ stdenv +, fetchFromGitHub +, m4 +, libtirpc +}: stdenv.mkDerivation rec { pname = "nvidia-persistenced"; @@ -14,6 +18,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ m4 ]; + buildInputs = [ libtirpc ]; installFlags = [ "PREFIX=$(out)" ]; @@ -27,6 +32,9 @@ stdenv.mkDerivation rec { $out/bin/nvidia-persistenced ''; + NIX_CFLAGS_COMPILE = [ "-I${libtirpc.dev}/include/tirpc" ]; + NIX_LDFLAGS = [ "-ltirpc" ]; + meta = with stdenv.lib; { homepage = "https://www.nvidia.com/object/unix.html"; description = "Settings application for NVIDIA graphics cards"; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/open-iscsi/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/open-iscsi/default.nix index 01bbd9a9cc..6314dcea62 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/open-iscsi/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/open-iscsi/default.nix @@ -25,8 +25,16 @@ stdenv.mkDerivation rec { sed -i 's|/usr|/|' Makefile ''; + installFlags = [ + "install" + "install_systemd" + ]; + postInstall = '' cp usr/iscsistart $out/sbin/ + for f in $out/lib/systemd/system/*; do + substituteInPlace $f --replace /sbin $out/bin + done $out/sbin/iscsistart -v ''; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/pam_gnupg/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/pam_gnupg/default.nix index 84135f2492..50373fe746 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/pam_gnupg/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/pam_gnupg/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "pam_gnupg"; - version = "0.1"; + version = "0.2"; src = fetchFromGitHub { owner = "cruegge"; repo = "pam-gnupg"; rev = "v${version}"; - sha256 = "0b70mazyvcbg6xyqllm62rwhbz0y94pcy202db1qyy4w8466bhsw"; + sha256 = "1d8046clv7r3bl77dbpza4f1zlkjffvdczbb5bci3prz7dyfrwsz"; }; configureFlags = [ diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/pam_mount/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/pam_mount/default.nix index 18bc84effa..3e026be6ab 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/pam_mount/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/pam_mount/default.nix @@ -1,37 +1,48 @@ -{ stdenv, fetchurl, autoconf, automake, pkgconfig, libtool, pam, libHX, libxml2, pcre, perl, openssl, cryptsetup, utillinux }: +{ stdenv, fetchurl, autoreconfHook, pkgconfig, libtool, pam, libHX, libxml2, pcre, perl, openssl, cryptsetup, utillinux }: stdenv.mkDerivation rec { - name = "pam_mount-2.16"; + pname = "pam_mount"; + version = "2.16"; src = fetchurl { - url = "mirror://sourceforge/pam-mount/pam_mount/2.16/${name}.tar.xz"; + url = "mirror://sourceforge/pam-mount/pam_mount/${version}/${pname}-${version}.tar.xz"; sha256 = "1rvi4irb7ylsbhvx1cr6islm2xxw1a4b19q6z4a9864ndkm0f0mf"; }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ autoconf automake libtool pam libHX utillinux libxml2 pcre perl openssl cryptsetup ]; + patches = [ + ./insert_utillinux_path_hooks.patch + ./support_luks2.patch + ]; - patches = [ ./insert_utillinux_path_hooks.patch ]; + postPatch = '' + substituteInPlace src/mtcrypt.c \ + --replace @@NIX_UTILLINUX@@ ${utillinux}/bin + ''; - preConfigure = '' - substituteInPlace src/mtcrypt.c --replace @@NIX_UTILLINUX@@ ${utillinux}/bin - sh autogen.sh --prefix=$out - ''; + nativeBuildInputs = [ autoreconfHook libtool pkgconfig ]; - makeFlags = [ "DESTDIR=$(out)" ]; + buildInputs = [ pam libHX utillinux libxml2 pcre perl openssl cryptsetup ]; + + enableParallelBuilding = true; + + configureFlags = [ + "--prefix=${placeholder "out"}" + "--localstatedir=${placeholder "out"}/var" + "--sbindir=${placeholder "out"}/bin" + "--sysconfdir=${placeholder "out"}/etc" + "--with-slibdir=${placeholder "out"}/lib" + "--with-ssbindir=${placeholder "out"}/bin" + ]; - # Probably a hack, but using DESTDIR and PREFIX makes everything work! postInstall = '' - mkdir -p $out - cp -r $out/$out/* $out - rm -r $out/nix - ''; + rm -r $out/var + ''; meta = with stdenv.lib; { - homepage = "http://pam-mount.sourceforge.net/"; description = "PAM module to mount volumes for a user session"; - maintainers = [ maintainers.tstrobel ]; + homepage = "https://pam-mount.sourceforge.net/"; license = with licenses; [ gpl2 gpl3 lgpl21 lgpl3 ]; + maintainers = with maintainers; [ tstrobel ]; platforms = platforms.linux; }; } diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/pam_mount/support_luks2.patch b/third_party/nixpkgs/pkgs/os-specific/linux/pam_mount/support_luks2.patch new file mode 100644 index 0000000000..0b8557f1ba --- /dev/null +++ b/third_party/nixpkgs/pkgs/os-specific/linux/pam_mount/support_luks2.patch @@ -0,0 +1,47 @@ +commit d4434c05e7c0cf05d87089404cfa2deedc60811a +Author: Ingo Franzki +Date: Mon Oct 29 16:47:40 2018 +0100 + + crypto: Add support for LUKS2 + + Cryptsetup version 2.0 added support for LUKS2. + This patch adds support for mounting LUKS2 volumes with + pam_mount. + + Signed-off-by: Ingo Franzki + +diff --git a/src/crypto-dmc.c b/src/crypto-dmc.c +index d0ab6ca..abd0358 100644 +--- a/src/crypto-dmc.c ++++ b/src/crypto-dmc.c +@@ -21,6 +21,12 @@ + #include "libcryptmount.h" + #include "pam_mount.h" + ++#ifndef CRYPT_LUKS ++ #define CRYPT_LUKS NULL /* Passing NULL to crypt_load will ++ default to LUKS(1) on older ++ libcryptsetup versions. */ ++#endif ++ + /** + * dmc_is_luks - check if @path points to a LUKS volume (cf. normal dm-crypt) + * @path: path to the crypto container +@@ -48,7 +54,7 @@ EXPORT_SYMBOL int ehd_is_luks(const char *path, bool blkdev) + + ret = crypt_init(&cd, device); + if (ret == 0) { +- ret = crypt_load(cd, CRYPT_LUKS1, NULL); ++ ret = crypt_load(cd, CRYPT_LUKS, NULL); + if (ret == -EINVAL) + ret = false; + else if (ret == 0) +@@ -106,7 +112,7 @@ static bool dmc_run(const struct ehd_mount_request *req, + #endif + } + +- ret = crypt_load(cd, CRYPT_LUKS1, NULL); ++ ret = crypt_load(cd, CRYPT_LUKS, NULL); + if (ret == 0) { + ret = crypt_activate_by_passphrase(cd, mt->crypto_name, + CRYPT_ANY_SLOT, req->key_data, req->key_size, flags); diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/r8168/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/r8168/default.nix index b3d8965704..91e15db2ee 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/r8168/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/r8168/default.nix @@ -6,7 +6,7 @@ let modDestDir = "$out/lib/modules/${kernel.modDirVersion}/kernel/drivers/net/wi in stdenv.mkDerivation rec { name = "r8168-${kernel.version}-${version}"; # on update please verify that the source matches the realtek version - version = "8.047.04"; + version = "8.048.03"; # This is a mirror. The original website[1] doesn't allow non-interactive # downloads, instead emailing you a download link. @@ -17,7 +17,7 @@ in stdenv.mkDerivation rec { owner = "mtorromeo"; repo = "r8168"; rev = version; - sha256 = "1rni8jimwdhyx75603mdcylrdxgfwfpyprf1lf5x5cli2i4bbijg"; + sha256 = "1l8llpcnapcaafxp7wlyny2ywh7k6q5zygwwjl9h0l6p04cghss4"; }; hardeningDisable = [ "pic" ]; @@ -29,8 +29,8 @@ in stdenv.mkDerivation rec { # based on the ArchLinux pkgbuild: https://git.archlinux.org/svntogit/community.git/tree/trunk/PKGBUILD?h=packages/r8168 preBuild = '' makeFlagsArray+=("-C${kernel.dev}/lib/modules/${kernel.modDirVersion}/build") - makeFlagsArray+=("SUBDIRS=$PWD/src") - makeFlagsArray+=("EXTRA_CFLAGS=-DCONFIG_R8168_NAPI -DCONFIG_R8168_VLAN") + makeFlagsArray+=("M=$PWD/src") + makeFlagsArray+=("EXTRA_CFLAGS=-DCONFIG_R8168_NAPI -DCONFIG_R8168_VLAN -DCONFIG_ASPM -DENABLE_S5WOL -DENABLE_EEE") makeFlagsArray+=("modules") ''; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/systemd/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/systemd/default.nix index cef9d96ae6..da99280f63 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/systemd/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/systemd/default.nix @@ -1,27 +1,61 @@ -{ stdenv, lib, fetchFromGitHub, pkgconfig, intltool, gperf, libcap -, curl, kmod, gnupg, gnutar, xz, pam, acl, libuuid, m4, e2fsprogs, utillinux, libffi -, glib, kbd, libxslt, coreutils, libgcrypt, libgpgerror, libidn2, libapparmor -, audit, lz4, bzip2, pcre2 -, linuxHeaders ? stdenv.cc.libc.linuxHeaders -, iptables, gnu-efi, bashInteractive -, gettext, docbook_xsl, docbook_xml_dtd_42, docbook_xml_dtd_45 -, ninja, meson, python3Packages, glibcLocales -, patchelf -, substituteAll -, getent -, cryptsetup, lvm2 +{ stdenv, lib, fetchFromGitHub , buildPackages -, perl +, ninja, meson, m4, pkgconfig, coreutils, gperf, getent +, patchelf, perl, glibcLocales, glib, substituteAll +, gettext, python3Packages + +# Mandatory dependencies +, libcap +, utillinux +, kbd +, kmod + +# Optional dependencies +, pam, cryptsetup, lvm2, audit, acl +, lz4, libgcrypt, libgpgerror, libidn2 +, curl, gnutar, gnupg, zlib +, xz, libuuid, libffi +, libapparmor, intltool +, bzip2, pcre2, e2fsprogs +, linuxHeaders ? stdenv.cc.libc.linuxHeaders +, gnu-efi +, iptables , withSelinux ? false, libselinux , withLibseccomp ? lib.any (lib.meta.platformMatch stdenv.hostPlatform) libseccomp.meta.platforms, libseccomp , withKexectools ? lib.any (lib.meta.platformMatch stdenv.hostPlatform) kexectools.meta.platforms, kexectools +, bashInteractive + +, withResolved ? true +, withLogind ? true +, withHostnamed ? true +, withLocaled ? true +, withNetworkd ? true +, withTimedated ? true +, withTimesyncd ? true +, withHwdb ? true +, withEfi ? stdenv.hostPlatform.isEfi +, withImportd ? true +, withCryptsetup ? true + +# name argument +, pname ? "systemd" + + +, libxslt, docbook_xsl, docbook_xml_dtd_42, docbook_xml_dtd_45 }: +assert withResolved -> (libgcrypt != null && libgpgerror != null); +assert withImportd -> + ( curl.dev != null && zlib != null && xz != null && libgcrypt != null + && gnutar != null && gnupg != null); + +assert withCryptsetup -> + ( cryptsetup != null ); + let version = "246.6"; in stdenv.mkDerivation { - inherit version; - pname = "systemd"; + inherit version pname; # We use systemd/systemd-stable for src, and ship NixOS-specific patches inside nixpkgs directly # This has proven to be less error-prone than the previous systemd fork. @@ -71,13 +105,17 @@ in stdenv.mkDerivation { outputs = [ "out" "man" "dev" ]; nativeBuildInputs = - [ pkgconfig intltool gperf libxslt gettext docbook_xsl docbook_xml_dtd_42 docbook_xml_dtd_45 + [ pkgconfig gperf ninja meson coreutils # meson calls date, stat etc. glibcLocales patchelf getent m4 perl # to patch the libsystemd.so and remove dependencies on aarch64 + intltool + gettext + + libxslt docbook_xsl docbook_xml_dtd_42 docbook_xml_dtd_45 (buildPackages.python3Packages.python.withPackages ( ps: with ps; [ python3Packages.lxml ])) ]; buildInputs = @@ -86,9 +124,10 @@ in stdenv.mkDerivation { pcre2 ] ++ stdenv.lib.optional withKexectools kexectools ++ stdenv.lib.optional withLibseccomp libseccomp ++ - [ libffi audit lz4 bzip2 libapparmor - iptables gnu-efi - ] ++ stdenv.lib.optional withSelinux libselinux; + [ libffi audit lz4 bzip2 libapparmor iptables ] ++ + stdenv.lib.optional withEfi gnu-efi ++ + stdenv.lib.optional withSelinux libselinux ++ + stdenv.lib.optional withCryptsetup cryptsetup.dev; #dontAddPrefix = true; @@ -106,19 +145,23 @@ in stdenv.mkDerivation { "-Ddebug-shell=${bashInteractive}/bin/bash" # while we do not run tests we should also not build them. Removes about 600 targets "-Dtests=false" - "-Dimportd=true" + "-Dimportd=${stdenv.lib.boolToString withImportd}" "-Dlz4=true" "-Dhomed=false" - "-Dhostnamed=true" - "-Dnetworkd=true" + "-Dlogind=${stdenv.lib.boolToString withLogind}" + "-Dlocaled=${stdenv.lib.boolToString withLocaled}" + "-Dhostnamed=${stdenv.lib.boolToString withHostnamed}" + "-Dnetworkd=${stdenv.lib.boolToString withNetworkd}" + "-Dcryptsetup=${stdenv.lib.boolToString withCryptsetup}" "-Dportabled=false" + "-Dhwdb=${stdenv.lib.boolToString withHwdb}" "-Dremote=false" "-Dsysusers=false" - "-Dtimedated=true" - "-Dtimesyncd=true" + "-Dtimedated=${stdenv.lib.boolToString withTimedated}" + "-Dtimesyncd=${stdenv.lib.boolToString withTimesyncd}" "-Dfirstboot=false" "-Dlocaled=true" - "-Dresolve=true" + "-Dresolve=${stdenv.lib.boolToString withResolved}" "-Dsplit-usr=false" "-Dlibcurl=true" "-Dlibidn=false" @@ -141,11 +184,6 @@ in stdenv.mkDerivation { "-Dsystem-gid-max=999" # "-Dtime-epoch=1" - (if !stdenv.hostPlatform.isEfi then "-Dgnu-efi=false" else "-Dgnu-efi=true") - "-Defi-libdir=${toString gnu-efi}/lib" - "-Defi-includedir=${toString gnu-efi}/include/efi" - "-Defi-ldsdir=${toString gnu-efi}/lib" - "-Dsysvinit-path=" "-Dsysvrcnd-path=" @@ -161,6 +199,12 @@ in stdenv.mkDerivation { # Upstream defaulted to disable manpages since they optimize for the much # more frequent development builds "-Dman=true" + + "-Dgnu-efi=${stdenv.lib.boolToString (withEfi && gnu-efi != null)}" + ] ++ stdenv.lib.optionals (withEfi && gnu-efi != null) [ + "-Defi-libdir=${toString gnu-efi}/lib" + "-Defi-includedir=${toString gnu-efi}/include/efi" + "-Defi-ldsdir=${toString gnu-efi}/lib" ]; preConfigure = '' @@ -284,6 +328,6 @@ in stdenv.mkDerivation { license = licenses.lgpl21Plus; platforms = platforms.linux; priority = 10; - maintainers = with maintainers; [ andir eelco flokli ]; + maintainers = with maintainers; [ andir eelco flokli kloenk ]; }; } 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 c6bd7ad933..bb4a2dcf97 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/zfs/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/zfs/default.nix @@ -202,9 +202,9 @@ in { # incompatibleKernelVersion = "4.19"; # this package should point to a version / git revision compatible with the latest kernel release - version = "2.0.0-rc4"; + version = "2.0.0-rc5"; - sha256 = "12ydycmmzqm70p6hgmmg7q93j8n1xlkk3j56vvqh1zmazr3sr6r0"; + sha256 = "0vnldx95c36yy18v1hfr8r4cmmh3hw4n6pwz30drkwgywakjwnsd"; isUnstable = true; }; } diff --git a/third_party/nixpkgs/pkgs/servers/dns/nsd/default.nix b/third_party/nixpkgs/pkgs/servers/dns/nsd/default.nix index 2dfdf108c4..35f76943e1 100644 --- a/third_party/nixpkgs/pkgs/servers/dns/nsd/default.nix +++ b/third_party/nixpkgs/pkgs/servers/dns/nsd/default.nix @@ -16,11 +16,11 @@ stdenv.mkDerivation rec { pname = "nsd"; - version = "4.3.2"; + version = "4.3.3"; src = fetchurl { url = "https://www.nlnetlabs.nl/downloads/${pname}/${pname}-${version}.tar.gz"; - sha256 = "0ac3mbn5z4nc18782m9aswdpi2m9f4665vidw0ciyigdh0pywp2v"; + sha256 = "0lgdiqnkfvy245h6kkiqic586qjwmg51lsfs86vlc0kwjwddiijz"; }; prePatch = '' 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 140d684168..8f6f555474 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 = "0.117.2"; + version = "0.117.4"; components = { "abode" = ps: with ps; [ abodepy ]; "accuweather" = ps: with ps; [ accuweather ]; diff --git a/third_party/nixpkgs/pkgs/servers/home-assistant/default.nix b/third_party/nixpkgs/pkgs/servers/home-assistant/default.nix index 9302a38f79..995d0bd0ed 100644 --- a/third_party/nixpkgs/pkgs/servers/home-assistant/default.nix +++ b/third_party/nixpkgs/pkgs/servers/home-assistant/default.nix @@ -67,7 +67,7 @@ let extraBuildInputs = extraPackages py.pkgs; # Don't forget to run parse-requirements.py after updating - hassVersion = "0.117.2"; + hassVersion = "0.117.4"; in with py.pkgs; buildPythonApplication rec { pname = "homeassistant"; @@ -83,13 +83,16 @@ in with py.pkgs; buildPythonApplication rec { owner = "home-assistant"; repo = "core"; rev = version; - sha256 = "1mpvskr0zjvl065ldw05kc0x5yvibwfm2nmv478wznw3vwmbqrzn"; + sha256 = "0f5a5y6d9wxdfd5l526dz34xz2n1a6ia7vdcr7sqf2qp51brpw52"; }; + # leave this in, so users don't have to constantly update their downstream patch handling + patches = []; + postPatch = '' substituteInPlace setup.py \ --replace "bcrypt==3.1.7" "bcrypt>=3.1.7" \ - --replace "cryptography==3.2.0" "cryptography" \ + --replace "cryptography==3.2" "cryptography" \ --replace "ruamel.yaml==0.15.100" "ruamel.yaml>=0.15.100" substituteInPlace tests/test_config.py --replace '"/usr"' '"/build/media"' ''; diff --git a/third_party/nixpkgs/pkgs/servers/keycloak/default.nix b/third_party/nixpkgs/pkgs/servers/keycloak/default.nix index 614eb2a467..6340f734d0 100644 --- a/third_party/nixpkgs/pkgs/servers/keycloak/default.nix +++ b/third_party/nixpkgs/pkgs/servers/keycloak/default.nix @@ -1,12 +1,28 @@ -{ stdenv, fetchzip, makeWrapper, jre }: +{ stdenv, lib, fetchzip, makeWrapper, jre, writeText, nixosTests +, postgresql_jdbc ? null, mysql_jdbc ? null +}: +let + mkModuleXml = name: jarFile: writeText "module.xml" '' + + + + + + + + + + + ''; +in stdenv.mkDerivation rec { pname = "keycloak"; - version = "11.0.2"; + version = "11.0.3"; src = fetchzip { url = "https://downloads.jboss.org/keycloak/${version}/keycloak-${version}.zip"; - sha256 = "0ayg6cl6mff64qs36djnfs3is4x0pzhk7zwb27cbln77q3icc0j0"; + sha256 = "15fw49rhnjky108hh71dkdlafd0ajr1n13vhivqcw6c18zvyan35"; }; nativeBuildInputs = [ makeWrapper ]; @@ -16,20 +32,37 @@ stdenv.mkDerivation rec { cp -r * $out rm -rf $out/bin/*.{ps1,bat} - rm -rf $out/bin/add-user-keycloak.sh - rm -rf $out/bin/jconsole.sh - chmod +x $out/bin/standalone.sh - wrapProgram $out/bin/standalone.sh \ - --prefix PATH ":" ${jre}/bin ; + module_path=$out/modules/system/layers/keycloak + if ! [[ -d $module_path ]]; then + echo "The module path $module_path not found!" + exit 1 + fi + + ${lib.optionalString (postgresql_jdbc != null) '' + mkdir -p $module_path/org/postgresql/main + ln -s ${postgresql_jdbc}/share/java/postgresql-jdbc.jar $module_path/org/postgresql/main/ + ln -s ${mkModuleXml "org.postgresql" "postgresql-jdbc.jar"} $module_path/org/postgresql/main/module.xml + ''} + ${lib.optionalString (mysql_jdbc != null) '' + mkdir -p $module_path/com/mysql/main + ln -s ${mysql_jdbc}/share/java/mysql-connector-java.jar $module_path/com/mysql/main/ + ln -s ${mkModuleXml "com.mysql" "mysql-connector-java.jar"} $module_path/com/mysql/main/module.xml + ''} + + wrapProgram $out/bin/standalone.sh --set JAVA_HOME ${jre} + wrapProgram $out/bin/add-user-keycloak.sh --set JAVA_HOME ${jre} + wrapProgram $out/bin/jboss-cli.sh --set JAVA_HOME ${jre} ''; + passthru.tests = nixosTests.keycloak; + meta = with stdenv.lib; { homepage = "https://www.keycloak.org/"; description = "Identity and access management for modern applications and services"; license = licenses.asl20; platforms = jre.meta.platforms; - maintainers = [ maintainers.ngerstle ]; + maintainers = with maintainers; [ ngerstle talyz ]; }; } diff --git a/third_party/nixpkgs/pkgs/servers/lidarr/default.nix b/third_party/nixpkgs/pkgs/servers/lidarr/default.nix index 915e4233eb..8074329aa1 100644 --- a/third_party/nixpkgs/pkgs/servers/lidarr/default.nix +++ b/third_party/nixpkgs/pkgs/servers/lidarr/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "lidarr"; - version = "0.7.1.1381"; + version = "0.7.2.1878"; src = fetchurl { url = "https://github.com/lidarr/Lidarr/releases/download/v${version}/Lidarr.master.${version}.linux.tar.gz"; - sha256 = "1vk1rlsb48ckdc4421a2qs0v5gy7kc4fad24dm3k14znh7llwypr"; + sha256 = "0kv0x3vvv4rp3i5k5985zp95mm8ca7gpm7kr82l11v3hm3n6yvqn"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/servers/mail/freepops/default.nix b/third_party/nixpkgs/pkgs/servers/mail/freepops/default.nix deleted file mode 100644 index 5f027c89af..0000000000 --- a/third_party/nixpkgs/pkgs/servers/mail/freepops/default.nix +++ /dev/null @@ -1,29 +0,0 @@ -{stdenv, fetchurl, pkgconfig, openssl, lua5, curl, readline, bison, expat}: - -stdenv.mkDerivation { - name = "freepops-0.2.9"; - src = fetchurl { - url = "mirror://sourceforge/freepops/0.2.9/freepops-0.2.9.tar.gz"; - sha256 = "3a065e30cafed03d9b6fdb28251ae5bf0d8aeb62181746154beecd25dc0c9cae"; - }; - nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ openssl lua5 curl readline bison expat]; - configurePhase = - '' - export WHERE=$prefix/ - export LOCALEDIR=$prefix/share/locale/ - ./configure.sh linux - ''; - - meta = { - description = "An extensible pop3 server"; - longDescription = '' - FreePOPs is an extensible pop3 server. Its main purpose is to provide - a pop3 interface to a webmail. - ''; - homepage = "http://www.freepops.org/"; - platforms = with stdenv.lib.platforms; linux; - maintainers = with stdenv.lib.maintainers; [ pierron ]; - broken = true; - }; -} diff --git a/third_party/nixpkgs/pkgs/servers/memcached/default.nix b/third_party/nixpkgs/pkgs/servers/memcached/default.nix index b6c6031f15..182ca6bcd9 100644 --- a/third_party/nixpkgs/pkgs/servers/memcached/default.nix +++ b/third_party/nixpkgs/pkgs/servers/memcached/default.nix @@ -1,12 +1,12 @@ {stdenv, fetchurl, cyrus_sasl, libevent, nixosTests }: stdenv.mkDerivation rec { - version = "1.6.6"; + version = "1.6.8"; pname = "memcached"; src = fetchurl { url = "https://memcached.org/files/${pname}-${version}.tar.gz"; - sha256 = "1xrj7vy05nc6bky4wnrmrbxfibvk5vq4dp2fwk4jk4amzbn0x3wh"; + sha256 = "0fbrrn7mkhv5xci4cffxxb8qzr9c0n3y58jymq2aqlpzyq8klfz2"; }; configureFlags = [ diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/kapacitor/default.nix b/third_party/nixpkgs/pkgs/servers/monitoring/kapacitor/default.nix index 0a15daf71c..2435d570cb 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/kapacitor/default.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/kapacitor/default.nix @@ -2,7 +2,7 @@ buildGoPackage rec { pname = "kapacitor"; - version = "1.5.6"; + version = "1.5.7"; goPackagePath = "github.com/influxdata/kapacitor"; @@ -10,7 +10,7 @@ buildGoPackage rec { owner = "influxdata"; repo = "kapacitor"; rev = "v${version}"; - sha256 = "1jb04lnxjrms7x5nlrsd1s465rramm9z4zkqpfw1vfdsqa2dd8rc"; + sha256 = "0lzx25d4y5d8rsddgnypfskcxa5qlwc294sdzmn8dlq995yphpac"; }; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/munin/default.nix b/third_party/nixpkgs/pkgs/servers/monitoring/munin/default.nix index 435e613a98..cfc66a9a76 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/munin/default.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/munin/default.nix @@ -3,14 +3,14 @@ }: stdenv.mkDerivation rec { - version = "2.0.64"; + version = "2.0.65"; pname = "munin"; src = fetchFromGitHub { owner = "munin-monitoring"; repo = "munin"; rev = version; - sha256 = "00gvvy7s2h1kxdxss7n63ir87fn66kq48lp94ackdyj49526maz4"; + sha256 = "0gz9kp1x39xpklq77xpm8kldsc4w87732if90w5p9pw0ip4cn6df"; }; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/default.nix b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/default.nix index 7e729cd366..445872bbe5 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/default.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/default.nix @@ -1,13 +1,13 @@ { lib, go, buildGoPackage, fetchFromGitHub, mkYarnPackage, nixosTests }: let - version = "2.20.1"; + version = "2.22.1"; src = fetchFromGitHub { rev = "v${version}"; owner = "prometheus"; repo = "prometheus"; - sha256 = "0svhx08pbz55nhn6g9pn79zbhyvr394k5w3ny1mq3wp382h62r5j"; + sha256 = "0wilx675b0a8ww7bj36hzcaip0zqzndkzan04rjsjigz5bw6kba0"; }; webui = mkYarnPackage { diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/sql-exporter.nix b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/sql-exporter.nix new file mode 100644 index 0000000000..c689cc1ed7 --- /dev/null +++ b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/sql-exporter.nix @@ -0,0 +1,23 @@ +{ stdenv, buildGoModule, fetchFromGitHub, nixosTests }: + +buildGoModule rec { + pname = "sql_exporter"; + version = "0.3.0"; + + vendorSha256 = null; + + src = fetchFromGitHub { + owner = "justwatchcom"; + repo = "sql_exporter"; + rev = "v${version}"; + sha256 = "125brlxgwhkn3z5v0522gpm0sk6v905ghh05c4c3wf1hlm7bhnrc"; + }; + + meta = with stdenv.lib; { + description = "Flexible SQL exporter for Prometheus"; + homepage = "https://github.com/justwatchcom/sql_exporter"; + license = licenses.mit; + maintainers = with maintainers; [ justinas ]; + platforms = platforms.unix; + }; +} diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/webui-package.json b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/webui-package.json index 09ebefa011..3c4c3eb856 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/webui-package.json +++ b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/webui-package.json @@ -8,33 +8,33 @@ "@fortawesome/react-fontawesome": "^0.1.4", "@reach/router": "^1.2.1", "@testing-library/react-hooks": "^3.1.1", - "@types/jest": "^24.0.20", - "@types/jquery": "^3.3.29", + "@types/jest": "^26.0.10", + "@types/jquery": "^3.5.1", "@types/node": "^12.11.1", "@types/reach__router": "^1.2.6", "@types/react": "^16.8.2", "@types/react-copy-to-clipboard": "^4.3.0", "@types/react-dom": "^16.8.0", - "@types/react-resize-detector": "^4.0.2", + "@types/react-resize-detector": "^4.2.0", "@types/sanitize-html": "^1.20.2", "bootstrap": "^4.2.1", "css.escape": "^1.5.1", - "downshift": "^3.2.2", + "downshift": "^3.4.8", "enzyme-to-json": "^3.4.3", "fuzzy": "^0.1.3", "i": "^0.3.6", - "jest-fetch-mock": "^2.1.2", - "jquery": "^3.5", + "jest-fetch-mock": "^3.0.3", + "jquery": "^3.5.1", "jquery.flot.tooltip": "^0.9.0", - "jsdom": "^15.2.0", + "jsdom": "^16.4.0", "moment": "^2.24.0", "moment-timezone": "^0.5.23", "popper.js": "^1.14.3", "react": "^16.7.0", "react-copy-to-clipboard": "^5.0.1", "react-dom": "^16.7.0", - "react-resize-detector": "^4.2.1", - "react-scripts": "3.4.0", + "react-resize-detector": "^5.0.7", + "react-scripts": "3.4.3", "react-test-renderer": "^16.9.0", "reactstrap": "^8.0.1", "sanitize-html": "^1.20.1", @@ -68,7 +68,7 @@ "@types/flot": "0.0.31", "@types/moment-timezone": "^0.5.10", "@types/reactstrap": "^8.0.5", - "@types/sinon": "^7.5.0", + "@types/sinon": "^9.0.4", "@typescript-eslint/eslint-plugin": "2.x", "@typescript-eslint/parser": "2.x", "enzyme": "^3.10.0", @@ -76,15 +76,15 @@ "eslint": "6.x", "eslint-config-prettier": "^6.4.0", "eslint-config-react-app": "^5.0.2", - "eslint-plugin-flowtype": "3.x", + "eslint-plugin-flowtype": "4.x", "eslint-plugin-import": "2.x", "eslint-plugin-jsx-a11y": "6.x", "eslint-plugin-prettier": "^3.1.1", "eslint-plugin-react": "7.x", - "eslint-plugin-react-hooks": "1.x", - "jest-fetch-mock": "^2.1.2", + "eslint-plugin-react-hooks": "2.x", + "jest-fetch-mock": "^3.0.3", "prettier": "^1.18.2", - "sinon": "^7.5.0" + "sinon": "^9.0.3" }, "proxy": "http://localhost:9090", "jest": { diff --git a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/webui-yarndeps.nix b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/webui-yarndeps.nix index 8b7d346e56..56f9ec7227 100644 --- a/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/webui-yarndeps.nix +++ b/third_party/nixpkgs/pkgs/servers/monitoring/prometheus/webui-yarndeps.nix @@ -10,19 +10,19 @@ }; } { - name = "_babel_compat_data___compat_data_7.9.0.tgz"; + name = "_babel_code_frame___code_frame_7.10.4.tgz"; path = fetchurl { - name = "_babel_compat_data___compat_data_7.9.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.9.0.tgz"; - sha1 = "04815556fc90b0c174abd2c0c1bb966faa036a6c"; + name = "_babel_code_frame___code_frame_7.10.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.10.4.tgz"; + sha1 = "168da1a36e90da68ae8d49c0f1b48c7c6249213a"; }; } { - name = "_babel_core___core_7.8.4.tgz"; + name = "_babel_compat_data___compat_data_7.11.0.tgz"; path = fetchurl { - name = "_babel_core___core_7.8.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/core/-/core-7.8.4.tgz"; - sha1 = "d496799e5c12195b3602d0fddd77294e3e38e80e"; + name = "_babel_compat_data___compat_data_7.11.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.11.0.tgz"; + sha1 = "e9f73efe09af1355b723a7f39b11bad637d7c99c"; }; } { @@ -34,259 +34,251 @@ }; } { - name = "_babel_generator___generator_7.9.0.tgz"; + name = "_babel_core___core_7.11.6.tgz"; path = fetchurl { - name = "_babel_generator___generator_7.9.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/generator/-/generator-7.9.0.tgz"; - sha1 = "0f67adea4ec39dad6e63345f70eec33014d78c89"; + name = "_babel_core___core_7.11.6.tgz"; + url = "https://registry.yarnpkg.com/@babel/core/-/core-7.11.6.tgz"; + sha1 = "3a9455dc7387ff1bac45770650bc13ba04a15651"; }; } { - name = "_babel_generator___generator_7.9.4.tgz"; + name = "_babel_generator___generator_7.11.6.tgz"; path = fetchurl { - name = "_babel_generator___generator_7.9.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/generator/-/generator-7.9.4.tgz"; - sha1 = "12441e90c3b3c4159cdecf312075bf1a8ce2dbce"; + name = "_babel_generator___generator_7.11.6.tgz"; + url = "https://registry.yarnpkg.com/@babel/generator/-/generator-7.11.6.tgz"; + sha1 = "b868900f81b163b4d464ea24545c61cbac4dc620"; }; } { - name = "_babel_helper_annotate_as_pure___helper_annotate_as_pure_7.8.3.tgz"; + name = "_babel_helper_annotate_as_pure___helper_annotate_as_pure_7.10.4.tgz"; path = fetchurl { - name = "_babel_helper_annotate_as_pure___helper_annotate_as_pure_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.8.3.tgz"; - sha1 = "60bc0bc657f63a0924ff9a4b4a0b24a13cf4deee"; + name = "_babel_helper_annotate_as_pure___helper_annotate_as_pure_7.10.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.10.4.tgz"; + sha1 = "5bf0d495a3f757ac3bda48b5bf3b3ba309c72ba3"; }; } { - name = "_babel_helper_builder_binary_assignment_operator_visitor___helper_builder_binary_assignment_operator_visitor_7.8.3.tgz"; + name = "_babel_helper_builder_binary_assignment_operator_visitor___helper_builder_binary_assignment_operator_visitor_7.10.4.tgz"; path = fetchurl { - name = "_babel_helper_builder_binary_assignment_operator_visitor___helper_builder_binary_assignment_operator_visitor_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.8.3.tgz"; - sha1 = "c84097a427a061ac56a1c30ebf54b7b22d241503"; + name = "_babel_helper_builder_binary_assignment_operator_visitor___helper_builder_binary_assignment_operator_visitor_7.10.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.10.4.tgz"; + sha1 = "bb0b75f31bf98cbf9ff143c1ae578b87274ae1a3"; }; } { - name = "_babel_helper_builder_react_jsx_experimental___helper_builder_react_jsx_experimental_7.9.0.tgz"; + name = "_babel_helper_builder_react_jsx_experimental___helper_builder_react_jsx_experimental_7.11.5.tgz"; path = fetchurl { - name = "_babel_helper_builder_react_jsx_experimental___helper_builder_react_jsx_experimental_7.9.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-builder-react-jsx-experimental/-/helper-builder-react-jsx-experimental-7.9.0.tgz"; - sha1 = "066d80262ade488f9c1b1823ce5db88a4cedaa43"; + name = "_babel_helper_builder_react_jsx_experimental___helper_builder_react_jsx_experimental_7.11.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-builder-react-jsx-experimental/-/helper-builder-react-jsx-experimental-7.11.5.tgz"; + sha1 = "4ea43dd63857b0a35cd1f1b161dc29b43414e79f"; }; } { - name = "_babel_helper_builder_react_jsx___helper_builder_react_jsx_7.9.0.tgz"; + name = "_babel_helper_builder_react_jsx___helper_builder_react_jsx_7.10.4.tgz"; path = fetchurl { - name = "_babel_helper_builder_react_jsx___helper_builder_react_jsx_7.9.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-builder-react-jsx/-/helper-builder-react-jsx-7.9.0.tgz"; - sha1 = "16bf391990b57732700a3278d4d9a81231ea8d32"; + name = "_babel_helper_builder_react_jsx___helper_builder_react_jsx_7.10.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-builder-react-jsx/-/helper-builder-react-jsx-7.10.4.tgz"; + sha1 = "8095cddbff858e6fa9c326daee54a2f2732c1d5d"; }; } { - name = "_babel_helper_call_delegate___helper_call_delegate_7.8.7.tgz"; + name = "_babel_helper_compilation_targets___helper_compilation_targets_7.10.4.tgz"; path = fetchurl { - name = "_babel_helper_call_delegate___helper_call_delegate_7.8.7.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-call-delegate/-/helper-call-delegate-7.8.7.tgz"; - sha1 = "28a279c2e6c622a6233da548127f980751324cab"; + name = "_babel_helper_compilation_targets___helper_compilation_targets_7.10.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.10.4.tgz"; + sha1 = "804ae8e3f04376607cc791b9d47d540276332bd2"; }; } { - name = "_babel_helper_compilation_targets___helper_compilation_targets_7.8.7.tgz"; + name = "_babel_helper_create_class_features_plugin___helper_create_class_features_plugin_7.10.5.tgz"; path = fetchurl { - name = "_babel_helper_compilation_targets___helper_compilation_targets_7.8.7.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.8.7.tgz"; - sha1 = "dac1eea159c0e4bd46e309b5a1b04a66b53c1dde"; + name = "_babel_helper_create_class_features_plugin___helper_create_class_features_plugin_7.10.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.10.5.tgz"; + sha1 = "9f61446ba80e8240b0a5c85c6fdac8459d6f259d"; }; } { - name = "_babel_helper_create_class_features_plugin___helper_create_class_features_plugin_7.8.6.tgz"; + name = "_babel_helper_create_regexp_features_plugin___helper_create_regexp_features_plugin_7.10.4.tgz"; path = fetchurl { - name = "_babel_helper_create_class_features_plugin___helper_create_class_features_plugin_7.8.6.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.8.6.tgz"; - sha1 = "243a5b46e2f8f0f674dc1387631eb6b28b851de0"; + name = "_babel_helper_create_regexp_features_plugin___helper_create_regexp_features_plugin_7.10.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.10.4.tgz"; + sha1 = "fdd60d88524659a0b6959c0579925e425714f3b8"; }; } { - name = "_babel_helper_create_regexp_features_plugin___helper_create_regexp_features_plugin_7.8.8.tgz"; + name = "_babel_helper_define_map___helper_define_map_7.10.5.tgz"; path = fetchurl { - name = "_babel_helper_create_regexp_features_plugin___helper_create_regexp_features_plugin_7.8.8.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.8.8.tgz"; - sha1 = "5d84180b588f560b7864efaeea89243e58312087"; + name = "_babel_helper_define_map___helper_define_map_7.10.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-define-map/-/helper-define-map-7.10.5.tgz"; + sha1 = "b53c10db78a640800152692b13393147acb9bb30"; }; } { - name = "_babel_helper_define_map___helper_define_map_7.8.3.tgz"; + name = "_babel_helper_explode_assignable_expression___helper_explode_assignable_expression_7.11.4.tgz"; path = fetchurl { - name = "_babel_helper_define_map___helper_define_map_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-define-map/-/helper-define-map-7.8.3.tgz"; - sha1 = "a0655cad5451c3760b726eba875f1cd8faa02c15"; + name = "_babel_helper_explode_assignable_expression___helper_explode_assignable_expression_7.11.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.11.4.tgz"; + sha1 = "2d8e3470252cc17aba917ede7803d4a7a276a41b"; }; } { - name = "_babel_helper_explode_assignable_expression___helper_explode_assignable_expression_7.8.3.tgz"; + name = "_babel_helper_function_name___helper_function_name_7.10.4.tgz"; path = fetchurl { - name = "_babel_helper_explode_assignable_expression___helper_explode_assignable_expression_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.8.3.tgz"; - sha1 = "a728dc5b4e89e30fc2dfc7d04fa28a930653f982"; + name = "_babel_helper_function_name___helper_function_name_7.10.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.10.4.tgz"; + sha1 = "d2d3b20c59ad8c47112fa7d2a94bc09d5ef82f1a"; }; } { - name = "_babel_helper_function_name___helper_function_name_7.8.3.tgz"; + name = "_babel_helper_get_function_arity___helper_get_function_arity_7.10.4.tgz"; path = fetchurl { - name = "_babel_helper_function_name___helper_function_name_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.8.3.tgz"; - sha1 = "eeeb665a01b1f11068e9fb86ad56a1cb1a824cca"; + name = "_babel_helper_get_function_arity___helper_get_function_arity_7.10.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.10.4.tgz"; + sha1 = "98c1cbea0e2332f33f9a4661b8ce1505b2c19ba2"; }; } { - name = "_babel_helper_get_function_arity___helper_get_function_arity_7.8.3.tgz"; + name = "_babel_helper_hoist_variables___helper_hoist_variables_7.10.4.tgz"; path = fetchurl { - name = "_babel_helper_get_function_arity___helper_get_function_arity_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.8.3.tgz"; - sha1 = "b894b947bd004381ce63ea1db9f08547e920abd5"; + name = "_babel_helper_hoist_variables___helper_hoist_variables_7.10.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.10.4.tgz"; + sha1 = "d49b001d1d5a68ca5e6604dda01a6297f7c9381e"; }; } { - name = "_babel_helper_hoist_variables___helper_hoist_variables_7.8.3.tgz"; + name = "_babel_helper_member_expression_to_functions___helper_member_expression_to_functions_7.11.0.tgz"; path = fetchurl { - name = "_babel_helper_hoist_variables___helper_hoist_variables_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.8.3.tgz"; - sha1 = "1dbe9b6b55d78c9b4183fc8cdc6e30ceb83b7134"; + name = "_babel_helper_member_expression_to_functions___helper_member_expression_to_functions_7.11.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.11.0.tgz"; + sha1 = "ae69c83d84ee82f4b42f96e2a09410935a8f26df"; }; } { - name = "_babel_helper_member_expression_to_functions___helper_member_expression_to_functions_7.8.3.tgz"; + name = "_babel_helper_module_imports___helper_module_imports_7.10.4.tgz"; path = fetchurl { - name = "_babel_helper_member_expression_to_functions___helper_member_expression_to_functions_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.8.3.tgz"; - sha1 = "659b710498ea6c1d9907e0c73f206eee7dadc24c"; + name = "_babel_helper_module_imports___helper_module_imports_7.10.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.10.4.tgz"; + sha1 = "4c5c54be04bd31670a7382797d75b9fa2e5b5620"; }; } { - name = "_babel_helper_module_imports___helper_module_imports_7.8.3.tgz"; + name = "_babel_helper_module_transforms___helper_module_transforms_7.11.0.tgz"; path = fetchurl { - name = "_babel_helper_module_imports___helper_module_imports_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.8.3.tgz"; - sha1 = "7fe39589b39c016331b6b8c3f441e8f0b1419498"; + name = "_babel_helper_module_transforms___helper_module_transforms_7.11.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.11.0.tgz"; + sha1 = "b16f250229e47211abdd84b34b64737c2ab2d359"; }; } { - name = "_babel_helper_module_transforms___helper_module_transforms_7.9.0.tgz"; + name = "_babel_helper_optimise_call_expression___helper_optimise_call_expression_7.10.4.tgz"; path = fetchurl { - name = "_babel_helper_module_transforms___helper_module_transforms_7.9.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.9.0.tgz"; - sha1 = "43b34dfe15961918707d247327431388e9fe96e5"; + name = "_babel_helper_optimise_call_expression___helper_optimise_call_expression_7.10.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.10.4.tgz"; + sha1 = "50dc96413d594f995a77905905b05893cd779673"; }; } { - name = "_babel_helper_optimise_call_expression___helper_optimise_call_expression_7.8.3.tgz"; + name = "_babel_helper_plugin_utils___helper_plugin_utils_7.10.4.tgz"; path = fetchurl { - name = "_babel_helper_optimise_call_expression___helper_optimise_call_expression_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.8.3.tgz"; - sha1 = "7ed071813d09c75298ef4f208956006b6111ecb9"; + name = "_babel_helper_plugin_utils___helper_plugin_utils_7.10.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.10.4.tgz"; + sha1 = "2f75a831269d4f677de49986dff59927533cf375"; }; } { - name = "_babel_helper_plugin_utils___helper_plugin_utils_7.8.3.tgz"; + name = "_babel_helper_regex___helper_regex_7.10.5.tgz"; path = fetchurl { - name = "_babel_helper_plugin_utils___helper_plugin_utils_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.8.3.tgz"; - sha1 = "9ea293be19babc0f52ff8ca88b34c3611b208670"; + name = "_babel_helper_regex___helper_regex_7.10.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-regex/-/helper-regex-7.10.5.tgz"; + sha1 = "32dfbb79899073c415557053a19bd055aae50ae0"; }; } { - name = "_babel_helper_regex___helper_regex_7.8.3.tgz"; + name = "_babel_helper_remap_async_to_generator___helper_remap_async_to_generator_7.11.4.tgz"; path = fetchurl { - name = "_babel_helper_regex___helper_regex_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-regex/-/helper-regex-7.8.3.tgz"; - sha1 = "139772607d51b93f23effe72105b319d2a4c6965"; + name = "_babel_helper_remap_async_to_generator___helper_remap_async_to_generator_7.11.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.11.4.tgz"; + sha1 = "4474ea9f7438f18575e30b0cac784045b402a12d"; }; } { - name = "_babel_helper_remap_async_to_generator___helper_remap_async_to_generator_7.8.3.tgz"; + name = "_babel_helper_replace_supers___helper_replace_supers_7.10.4.tgz"; path = fetchurl { - name = "_babel_helper_remap_async_to_generator___helper_remap_async_to_generator_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.8.3.tgz"; - sha1 = "273c600d8b9bf5006142c1e35887d555c12edd86"; + name = "_babel_helper_replace_supers___helper_replace_supers_7.10.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.10.4.tgz"; + sha1 = "d585cd9388ea06e6031e4cd44b6713cbead9e6cf"; }; } { - name = "_babel_helper_replace_supers___helper_replace_supers_7.8.6.tgz"; + name = "_babel_helper_simple_access___helper_simple_access_7.10.4.tgz"; path = fetchurl { - name = "_babel_helper_replace_supers___helper_replace_supers_7.8.6.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.8.6.tgz"; - sha1 = "5ada744fd5ad73203bf1d67459a27dcba67effc8"; + name = "_babel_helper_simple_access___helper_simple_access_7.10.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.10.4.tgz"; + sha1 = "0f5ccda2945277a2a7a2d3a821e15395edcf3461"; }; } { - name = "_babel_helper_simple_access___helper_simple_access_7.8.3.tgz"; + name = "_babel_helper_skip_transparent_expression_wrappers___helper_skip_transparent_expression_wrappers_7.11.0.tgz"; path = fetchurl { - name = "_babel_helper_simple_access___helper_simple_access_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.8.3.tgz"; - sha1 = "7f8109928b4dab4654076986af575231deb639ae"; + name = "_babel_helper_skip_transparent_expression_wrappers___helper_skip_transparent_expression_wrappers_7.11.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.11.0.tgz"; + sha1 = "eec162f112c2f58d3af0af125e3bb57665146729"; }; } { - name = "_babel_helper_split_export_declaration___helper_split_export_declaration_7.8.3.tgz"; + name = "_babel_helper_split_export_declaration___helper_split_export_declaration_7.11.0.tgz"; path = fetchurl { - name = "_babel_helper_split_export_declaration___helper_split_export_declaration_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.8.3.tgz"; - sha1 = "31a9f30070f91368a7182cf05f831781065fc7a9"; + name = "_babel_helper_split_export_declaration___helper_split_export_declaration_7.11.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.11.0.tgz"; + sha1 = "f8a491244acf6a676158ac42072911ba83ad099f"; }; } { - name = "_babel_helper_validator_identifier___helper_validator_identifier_7.9.0.tgz"; + name = "_babel_helper_validator_identifier___helper_validator_identifier_7.10.4.tgz"; path = fetchurl { - name = "_babel_helper_validator_identifier___helper_validator_identifier_7.9.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.9.0.tgz"; - sha1 = "ad53562a7fc29b3b9a91bbf7d10397fd146346ed"; + name = "_babel_helper_validator_identifier___helper_validator_identifier_7.10.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.10.4.tgz"; + sha1 = "a78c7a7251e01f616512d31b10adcf52ada5e0d2"; }; } { - name = "_babel_helper_wrap_function___helper_wrap_function_7.8.3.tgz"; + name = "_babel_helper_wrap_function___helper_wrap_function_7.10.4.tgz"; path = fetchurl { - name = "_babel_helper_wrap_function___helper_wrap_function_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.8.3.tgz"; - sha1 = "9dbdb2bb55ef14aaa01fe8c99b629bd5352d8610"; + name = "_babel_helper_wrap_function___helper_wrap_function_7.10.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.10.4.tgz"; + sha1 = "8a6f701eab0ff39f765b5a1cfef409990e624b87"; }; } { - name = "_babel_helpers___helpers_7.9.2.tgz"; + name = "_babel_helpers___helpers_7.10.4.tgz"; path = fetchurl { - name = "_babel_helpers___helpers_7.9.2.tgz"; - url = "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.9.2.tgz"; - sha1 = "b42a81a811f1e7313b88cba8adc66b3d9ae6c09f"; + name = "_babel_helpers___helpers_7.10.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.10.4.tgz"; + sha1 = "2abeb0d721aff7c0a97376b9e1f6f65d7a475044"; }; } { - name = "_babel_highlight___highlight_7.9.0.tgz"; + name = "_babel_highlight___highlight_7.10.4.tgz"; path = fetchurl { - name = "_babel_highlight___highlight_7.9.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.9.0.tgz"; - sha1 = "4e9b45ccb82b79607271b2979ad82c7b68163079"; + name = "_babel_highlight___highlight_7.10.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.10.4.tgz"; + sha1 = "7d1bdfd65753538fabe6c38596cdb76d9ac60143"; }; } { - name = "_babel_parser___parser_7.9.4.tgz"; + name = "_babel_parser___parser_7.11.5.tgz"; path = fetchurl { - name = "_babel_parser___parser_7.9.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/parser/-/parser-7.9.4.tgz"; - sha1 = "68a35e6b0319bbc014465be43828300113f2f2e8"; + name = "_babel_parser___parser_7.11.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/parser/-/parser-7.11.5.tgz"; + sha1 = "c7ff6303df71080ec7a4f5b8c003c58f1cf51037"; }; } { - name = "_babel_parser___parser_7.9.2.tgz"; + name = "_babel_plugin_proposal_async_generator_functions___plugin_proposal_async_generator_functions_7.10.5.tgz"; path = fetchurl { - name = "_babel_parser___parser_7.9.2.tgz"; - url = "https://registry.yarnpkg.com/@babel/parser/-/parser-7.9.2.tgz"; - sha1 = "4e767f424b479c514077544484d1f9bdba7f1158"; - }; - } - { - name = "_babel_plugin_proposal_async_generator_functions___plugin_proposal_async_generator_functions_7.8.3.tgz"; - path = fetchurl { - name = "_babel_plugin_proposal_async_generator_functions___plugin_proposal_async_generator_functions_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.8.3.tgz"; - sha1 = "bad329c670b382589721b27540c7d288601c6e6f"; + name = "_babel_plugin_proposal_async_generator_functions___plugin_proposal_async_generator_functions_7.10.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.10.5.tgz"; + sha1 = "3491cabf2f7c179ab820606cec27fed15e0e8558"; }; } { @@ -297,6 +289,14 @@ sha1 = "5e06654af5cd04b608915aada9b2a6788004464e"; }; } + { + name = "_babel_plugin_proposal_class_properties___plugin_proposal_class_properties_7.10.4.tgz"; + path = fetchurl { + name = "_babel_plugin_proposal_class_properties___plugin_proposal_class_properties_7.10.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.10.4.tgz"; + sha1 = "a33bf632da390a59c7a8c570045d1115cd778807"; + }; + } { name = "_babel_plugin_proposal_decorators___plugin_proposal_decorators_7.8.3.tgz"; path = fetchurl { @@ -306,19 +306,35 @@ }; } { - name = "_babel_plugin_proposal_dynamic_import___plugin_proposal_dynamic_import_7.8.3.tgz"; + name = "_babel_plugin_proposal_dynamic_import___plugin_proposal_dynamic_import_7.10.4.tgz"; path = fetchurl { - name = "_babel_plugin_proposal_dynamic_import___plugin_proposal_dynamic_import_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.8.3.tgz"; - sha1 = "38c4fe555744826e97e2ae930b0fb4cc07e66054"; + name = "_babel_plugin_proposal_dynamic_import___plugin_proposal_dynamic_import_7.10.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.10.4.tgz"; + sha1 = "ba57a26cb98b37741e9d5bca1b8b0ddf8291f17e"; }; } { - name = "_babel_plugin_proposal_json_strings___plugin_proposal_json_strings_7.8.3.tgz"; + name = "_babel_plugin_proposal_export_namespace_from___plugin_proposal_export_namespace_from_7.10.4.tgz"; path = fetchurl { - name = "_babel_plugin_proposal_json_strings___plugin_proposal_json_strings_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.8.3.tgz"; - sha1 = "da5216b238a98b58a1e05d6852104b10f9a70d6b"; + name = "_babel_plugin_proposal_export_namespace_from___plugin_proposal_export_namespace_from_7.10.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.10.4.tgz"; + sha1 = "570d883b91031637b3e2958eea3c438e62c05f54"; + }; + } + { + name = "_babel_plugin_proposal_json_strings___plugin_proposal_json_strings_7.10.4.tgz"; + path = fetchurl { + name = "_babel_plugin_proposal_json_strings___plugin_proposal_json_strings_7.10.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.10.4.tgz"; + sha1 = "593e59c63528160233bd321b1aebe0820c2341db"; + }; + } + { + name = "_babel_plugin_proposal_logical_assignment_operators___plugin_proposal_logical_assignment_operators_7.11.0.tgz"; + path = fetchurl { + name = "_babel_plugin_proposal_logical_assignment_operators___plugin_proposal_logical_assignment_operators_7.11.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.11.0.tgz"; + sha1 = "9f80e482c03083c87125dee10026b58527ea20c8"; }; } { @@ -329,6 +345,14 @@ sha1 = "e4572253fdeed65cddeecfdab3f928afeb2fd5d2"; }; } + { + name = "_babel_plugin_proposal_nullish_coalescing_operator___plugin_proposal_nullish_coalescing_operator_7.10.4.tgz"; + path = fetchurl { + name = "_babel_plugin_proposal_nullish_coalescing_operator___plugin_proposal_nullish_coalescing_operator_7.10.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.10.4.tgz"; + sha1 = "02a7e961fc32e6d5b2db0649e01bf80ddee7e04a"; + }; + } { name = "_babel_plugin_proposal_numeric_separator___plugin_proposal_numeric_separator_7.8.3.tgz"; path = fetchurl { @@ -338,19 +362,27 @@ }; } { - name = "_babel_plugin_proposal_object_rest_spread___plugin_proposal_object_rest_spread_7.9.0.tgz"; + name = "_babel_plugin_proposal_numeric_separator___plugin_proposal_numeric_separator_7.10.4.tgz"; path = fetchurl { - name = "_babel_plugin_proposal_object_rest_spread___plugin_proposal_object_rest_spread_7.9.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.9.0.tgz"; - sha1 = "a28993699fc13df165995362693962ba6b061d6f"; + name = "_babel_plugin_proposal_numeric_separator___plugin_proposal_numeric_separator_7.10.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.10.4.tgz"; + sha1 = "ce1590ff0a65ad12970a609d78855e9a4c1aef06"; }; } { - name = "_babel_plugin_proposal_optional_catch_binding___plugin_proposal_optional_catch_binding_7.8.3.tgz"; + name = "_babel_plugin_proposal_object_rest_spread___plugin_proposal_object_rest_spread_7.11.0.tgz"; path = fetchurl { - name = "_babel_plugin_proposal_optional_catch_binding___plugin_proposal_optional_catch_binding_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.8.3.tgz"; - sha1 = "9dee96ab1650eed88646ae9734ca167ac4a9c5c9"; + name = "_babel_plugin_proposal_object_rest_spread___plugin_proposal_object_rest_spread_7.11.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.11.0.tgz"; + sha1 = "bd81f95a1f746760ea43b6c2d3d62b11790ad0af"; + }; + } + { + name = "_babel_plugin_proposal_optional_catch_binding___plugin_proposal_optional_catch_binding_7.10.4.tgz"; + path = fetchurl { + name = "_babel_plugin_proposal_optional_catch_binding___plugin_proposal_optional_catch_binding_7.10.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.10.4.tgz"; + sha1 = "31c938309d24a78a49d68fdabffaa863758554dd"; }; } { @@ -362,11 +394,27 @@ }; } { - name = "_babel_plugin_proposal_unicode_property_regex___plugin_proposal_unicode_property_regex_7.8.8.tgz"; + name = "_babel_plugin_proposal_optional_chaining___plugin_proposal_optional_chaining_7.11.0.tgz"; path = fetchurl { - name = "_babel_plugin_proposal_unicode_property_regex___plugin_proposal_unicode_property_regex_7.8.8.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.8.8.tgz"; - sha1 = "ee3a95e90cdc04fe8cd92ec3279fa017d68a0d1d"; + name = "_babel_plugin_proposal_optional_chaining___plugin_proposal_optional_chaining_7.11.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.11.0.tgz"; + sha1 = "de5866d0646f6afdaab8a566382fe3a221755076"; + }; + } + { + name = "_babel_plugin_proposal_private_methods___plugin_proposal_private_methods_7.10.4.tgz"; + path = fetchurl { + name = "_babel_plugin_proposal_private_methods___plugin_proposal_private_methods_7.10.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.10.4.tgz"; + sha1 = "b160d972b8fdba5c7d111a145fc8c421fc2a6909"; + }; + } + { + name = "_babel_plugin_proposal_unicode_property_regex___plugin_proposal_unicode_property_regex_7.10.4.tgz"; + path = fetchurl { + name = "_babel_plugin_proposal_unicode_property_regex___plugin_proposal_unicode_property_regex_7.10.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.10.4.tgz"; + sha1 = "4483cda53041ce3413b7fe2f00022665ddfaa75d"; }; } { @@ -378,11 +426,19 @@ }; } { - name = "_babel_plugin_syntax_decorators___plugin_syntax_decorators_7.8.3.tgz"; + name = "_babel_plugin_syntax_class_properties___plugin_syntax_class_properties_7.10.4.tgz"; path = fetchurl { - name = "_babel_plugin_syntax_decorators___plugin_syntax_decorators_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-syntax-decorators/-/plugin-syntax-decorators-7.8.3.tgz"; - sha1 = "8d2c15a9f1af624b0025f961682a9d53d3001bda"; + name = "_babel_plugin_syntax_class_properties___plugin_syntax_class_properties_7.10.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-syntax-class-properties/-/plugin-syntax-class-properties-7.10.4.tgz"; + sha1 = "6644e6a0baa55a61f9e3231f6c9eeb6ee46c124c"; + }; + } + { + name = "_babel_plugin_syntax_decorators___plugin_syntax_decorators_7.10.4.tgz"; + path = fetchurl { + name = "_babel_plugin_syntax_decorators___plugin_syntax_decorators_7.10.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-syntax-decorators/-/plugin-syntax-decorators-7.10.4.tgz"; + sha1 = "6853085b2c429f9d322d02f5a635018cdeb2360c"; }; } { @@ -394,11 +450,19 @@ }; } { - name = "_babel_plugin_syntax_flow___plugin_syntax_flow_7.8.3.tgz"; + name = "_babel_plugin_syntax_export_namespace_from___plugin_syntax_export_namespace_from_7.8.3.tgz"; path = fetchurl { - name = "_babel_plugin_syntax_flow___plugin_syntax_flow_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-syntax-flow/-/plugin-syntax-flow-7.8.3.tgz"; - sha1 = "f2c883bd61a6316f2c89380ae5122f923ba4527f"; + name = "_babel_plugin_syntax_export_namespace_from___plugin_syntax_export_namespace_from_7.8.3.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-syntax-export-namespace-from/-/plugin-syntax-export-namespace-from-7.8.3.tgz"; + sha1 = "028964a9ba80dbc094c915c487ad7c4e7a66465a"; + }; + } + { + name = "_babel_plugin_syntax_flow___plugin_syntax_flow_7.10.4.tgz"; + path = fetchurl { + name = "_babel_plugin_syntax_flow___plugin_syntax_flow_7.10.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-syntax-flow/-/plugin-syntax-flow-7.10.4.tgz"; + sha1 = "53351dd7ae01995e567d04ce42af1a6e0ba846a6"; }; } { @@ -410,11 +474,19 @@ }; } { - name = "_babel_plugin_syntax_jsx___plugin_syntax_jsx_7.8.3.tgz"; + name = "_babel_plugin_syntax_jsx___plugin_syntax_jsx_7.10.4.tgz"; path = fetchurl { - name = "_babel_plugin_syntax_jsx___plugin_syntax_jsx_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.8.3.tgz"; - sha1 = "521b06c83c40480f1e58b4fd33b92eceb1d6ea94"; + name = "_babel_plugin_syntax_jsx___plugin_syntax_jsx_7.10.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-syntax-jsx/-/plugin-syntax-jsx-7.10.4.tgz"; + sha1 = "39abaae3cbf710c4373d8429484e6ba21340166c"; + }; + } + { + name = "_babel_plugin_syntax_logical_assignment_operators___plugin_syntax_logical_assignment_operators_7.10.4.tgz"; + path = fetchurl { + name = "_babel_plugin_syntax_logical_assignment_operators___plugin_syntax_logical_assignment_operators_7.10.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-syntax-logical-assignment-operators/-/plugin-syntax-logical-assignment-operators-7.10.4.tgz"; + sha1 = "ca91ef46303530448b906652bac2e9fe9941f699"; }; } { @@ -426,11 +498,11 @@ }; } { - name = "_babel_plugin_syntax_numeric_separator___plugin_syntax_numeric_separator_7.8.3.tgz"; + name = "_babel_plugin_syntax_numeric_separator___plugin_syntax_numeric_separator_7.10.4.tgz"; path = fetchurl { - name = "_babel_plugin_syntax_numeric_separator___plugin_syntax_numeric_separator_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.8.3.tgz"; - sha1 = "0e3fb63e09bea1b11e96467271c8308007e7c41f"; + name = "_babel_plugin_syntax_numeric_separator___plugin_syntax_numeric_separator_7.10.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-syntax-numeric-separator/-/plugin-syntax-numeric-separator-7.10.4.tgz"; + sha1 = "b9b070b3e33570cd9fd07ba7fa91c0dd37b9af97"; }; } { @@ -458,99 +530,99 @@ }; } { - name = "_babel_plugin_syntax_top_level_await___plugin_syntax_top_level_await_7.8.3.tgz"; + name = "_babel_plugin_syntax_top_level_await___plugin_syntax_top_level_await_7.10.4.tgz"; path = fetchurl { - name = "_babel_plugin_syntax_top_level_await___plugin_syntax_top_level_await_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.8.3.tgz"; - sha1 = "3acdece695e6b13aaf57fc291d1a800950c71391"; + name = "_babel_plugin_syntax_top_level_await___plugin_syntax_top_level_await_7.10.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.10.4.tgz"; + sha1 = "4bbeb8917b54fcf768364e0a81f560e33a3ef57d"; }; } { - name = "_babel_plugin_syntax_typescript___plugin_syntax_typescript_7.8.3.tgz"; + name = "_babel_plugin_syntax_typescript___plugin_syntax_typescript_7.10.4.tgz"; path = fetchurl { - name = "_babel_plugin_syntax_typescript___plugin_syntax_typescript_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.8.3.tgz"; - sha1 = "c1f659dda97711a569cef75275f7e15dcaa6cabc"; + name = "_babel_plugin_syntax_typescript___plugin_syntax_typescript_7.10.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.10.4.tgz"; + sha1 = "2f55e770d3501e83af217d782cb7517d7bb34d25"; }; } { - name = "_babel_plugin_transform_arrow_functions___plugin_transform_arrow_functions_7.8.3.tgz"; + name = "_babel_plugin_transform_arrow_functions___plugin_transform_arrow_functions_7.10.4.tgz"; path = fetchurl { - name = "_babel_plugin_transform_arrow_functions___plugin_transform_arrow_functions_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.8.3.tgz"; - sha1 = "82776c2ed0cd9e1a49956daeb896024c9473b8b6"; + name = "_babel_plugin_transform_arrow_functions___plugin_transform_arrow_functions_7.10.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.10.4.tgz"; + sha1 = "e22960d77e697c74f41c501d44d73dbf8a6a64cd"; }; } { - name = "_babel_plugin_transform_async_to_generator___plugin_transform_async_to_generator_7.8.3.tgz"; + name = "_babel_plugin_transform_async_to_generator___plugin_transform_async_to_generator_7.10.4.tgz"; path = fetchurl { - name = "_babel_plugin_transform_async_to_generator___plugin_transform_async_to_generator_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.8.3.tgz"; - sha1 = "4308fad0d9409d71eafb9b1a6ee35f9d64b64086"; + name = "_babel_plugin_transform_async_to_generator___plugin_transform_async_to_generator_7.10.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.10.4.tgz"; + sha1 = "41a5017e49eb6f3cda9392a51eef29405b245a37"; }; } { - name = "_babel_plugin_transform_block_scoped_functions___plugin_transform_block_scoped_functions_7.8.3.tgz"; + name = "_babel_plugin_transform_block_scoped_functions___plugin_transform_block_scoped_functions_7.10.4.tgz"; path = fetchurl { - name = "_babel_plugin_transform_block_scoped_functions___plugin_transform_block_scoped_functions_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.8.3.tgz"; - sha1 = "437eec5b799b5852072084b3ae5ef66e8349e8a3"; + name = "_babel_plugin_transform_block_scoped_functions___plugin_transform_block_scoped_functions_7.10.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.10.4.tgz"; + sha1 = "1afa595744f75e43a91af73b0d998ecfe4ebc2e8"; }; } { - name = "_babel_plugin_transform_block_scoping___plugin_transform_block_scoping_7.8.3.tgz"; + name = "_babel_plugin_transform_block_scoping___plugin_transform_block_scoping_7.11.1.tgz"; path = fetchurl { - name = "_babel_plugin_transform_block_scoping___plugin_transform_block_scoping_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.8.3.tgz"; - sha1 = "97d35dab66857a437c166358b91d09050c868f3a"; + name = "_babel_plugin_transform_block_scoping___plugin_transform_block_scoping_7.11.1.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.11.1.tgz"; + sha1 = "5b7efe98852bef8d652c0b28144cd93a9e4b5215"; }; } { - name = "_babel_plugin_transform_classes___plugin_transform_classes_7.9.2.tgz"; + name = "_babel_plugin_transform_classes___plugin_transform_classes_7.10.4.tgz"; path = fetchurl { - name = "_babel_plugin_transform_classes___plugin_transform_classes_7.9.2.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.9.2.tgz"; - sha1 = "8603fc3cc449e31fdbdbc257f67717536a11af8d"; + name = "_babel_plugin_transform_classes___plugin_transform_classes_7.10.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.10.4.tgz"; + sha1 = "405136af2b3e218bc4a1926228bc917ab1a0adc7"; }; } { - name = "_babel_plugin_transform_computed_properties___plugin_transform_computed_properties_7.8.3.tgz"; + name = "_babel_plugin_transform_computed_properties___plugin_transform_computed_properties_7.10.4.tgz"; path = fetchurl { - name = "_babel_plugin_transform_computed_properties___plugin_transform_computed_properties_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.8.3.tgz"; - sha1 = "96d0d28b7f7ce4eb5b120bb2e0e943343c86f81b"; + name = "_babel_plugin_transform_computed_properties___plugin_transform_computed_properties_7.10.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.10.4.tgz"; + sha1 = "9ded83a816e82ded28d52d4b4ecbdd810cdfc0eb"; }; } { - name = "_babel_plugin_transform_destructuring___plugin_transform_destructuring_7.8.8.tgz"; + name = "_babel_plugin_transform_destructuring___plugin_transform_destructuring_7.10.4.tgz"; path = fetchurl { - name = "_babel_plugin_transform_destructuring___plugin_transform_destructuring_7.8.8.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.8.8.tgz"; - sha1 = "fadb2bc8e90ccaf5658de6f8d4d22ff6272a2f4b"; + name = "_babel_plugin_transform_destructuring___plugin_transform_destructuring_7.10.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.10.4.tgz"; + sha1 = "70ddd2b3d1bea83d01509e9bb25ddb3a74fc85e5"; }; } { - name = "_babel_plugin_transform_dotall_regex___plugin_transform_dotall_regex_7.8.3.tgz"; + name = "_babel_plugin_transform_dotall_regex___plugin_transform_dotall_regex_7.10.4.tgz"; path = fetchurl { - name = "_babel_plugin_transform_dotall_regex___plugin_transform_dotall_regex_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.8.3.tgz"; - sha1 = "c3c6ec5ee6125c6993c5cbca20dc8621a9ea7a6e"; + name = "_babel_plugin_transform_dotall_regex___plugin_transform_dotall_regex_7.10.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.10.4.tgz"; + sha1 = "469c2062105c1eb6a040eaf4fac4b488078395ee"; }; } { - name = "_babel_plugin_transform_duplicate_keys___plugin_transform_duplicate_keys_7.8.3.tgz"; + name = "_babel_plugin_transform_duplicate_keys___plugin_transform_duplicate_keys_7.10.4.tgz"; path = fetchurl { - name = "_babel_plugin_transform_duplicate_keys___plugin_transform_duplicate_keys_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.8.3.tgz"; - sha1 = "8d12df309aa537f272899c565ea1768e286e21f1"; + name = "_babel_plugin_transform_duplicate_keys___plugin_transform_duplicate_keys_7.10.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.10.4.tgz"; + sha1 = "697e50c9fee14380fe843d1f306b295617431e47"; }; } { - name = "_babel_plugin_transform_exponentiation_operator___plugin_transform_exponentiation_operator_7.8.3.tgz"; + name = "_babel_plugin_transform_exponentiation_operator___plugin_transform_exponentiation_operator_7.10.4.tgz"; path = fetchurl { - name = "_babel_plugin_transform_exponentiation_operator___plugin_transform_exponentiation_operator_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.8.3.tgz"; - sha1 = "581a6d7f56970e06bf51560cd64f5e947b70d7b7"; + name = "_babel_plugin_transform_exponentiation_operator___plugin_transform_exponentiation_operator_7.10.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.10.4.tgz"; + sha1 = "5ae338c57f8cf4001bdb35607ae66b92d665af2e"; }; } { @@ -562,115 +634,115 @@ }; } { - name = "_babel_plugin_transform_for_of___plugin_transform_for_of_7.9.0.tgz"; + name = "_babel_plugin_transform_for_of___plugin_transform_for_of_7.10.4.tgz"; path = fetchurl { - name = "_babel_plugin_transform_for_of___plugin_transform_for_of_7.9.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.9.0.tgz"; - sha1 = "0f260e27d3e29cd1bb3128da5e76c761aa6c108e"; + name = "_babel_plugin_transform_for_of___plugin_transform_for_of_7.10.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.10.4.tgz"; + sha1 = "c08892e8819d3a5db29031b115af511dbbfebae9"; }; } { - name = "_babel_plugin_transform_function_name___plugin_transform_function_name_7.8.3.tgz"; + name = "_babel_plugin_transform_function_name___plugin_transform_function_name_7.10.4.tgz"; path = fetchurl { - name = "_babel_plugin_transform_function_name___plugin_transform_function_name_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.8.3.tgz"; - sha1 = "279373cb27322aaad67c2683e776dfc47196ed8b"; + name = "_babel_plugin_transform_function_name___plugin_transform_function_name_7.10.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.10.4.tgz"; + sha1 = "6a467880e0fc9638514ba369111811ddbe2644b7"; }; } { - name = "_babel_plugin_transform_literals___plugin_transform_literals_7.8.3.tgz"; + name = "_babel_plugin_transform_literals___plugin_transform_literals_7.10.4.tgz"; path = fetchurl { - name = "_babel_plugin_transform_literals___plugin_transform_literals_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.8.3.tgz"; - sha1 = "aef239823d91994ec7b68e55193525d76dbd5dc1"; + name = "_babel_plugin_transform_literals___plugin_transform_literals_7.10.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.10.4.tgz"; + sha1 = "9f42ba0841100a135f22712d0e391c462f571f3c"; }; } { - name = "_babel_plugin_transform_member_expression_literals___plugin_transform_member_expression_literals_7.8.3.tgz"; + name = "_babel_plugin_transform_member_expression_literals___plugin_transform_member_expression_literals_7.10.4.tgz"; path = fetchurl { - name = "_babel_plugin_transform_member_expression_literals___plugin_transform_member_expression_literals_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.8.3.tgz"; - sha1 = "963fed4b620ac7cbf6029c755424029fa3a40410"; + name = "_babel_plugin_transform_member_expression_literals___plugin_transform_member_expression_literals_7.10.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.10.4.tgz"; + sha1 = "b1ec44fcf195afcb8db2c62cd8e551c881baf8b7"; }; } { - name = "_babel_plugin_transform_modules_amd___plugin_transform_modules_amd_7.9.0.tgz"; + name = "_babel_plugin_transform_modules_amd___plugin_transform_modules_amd_7.10.5.tgz"; path = fetchurl { - name = "_babel_plugin_transform_modules_amd___plugin_transform_modules_amd_7.9.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.9.0.tgz"; - sha1 = "19755ee721912cf5bb04c07d50280af3484efef4"; + name = "_babel_plugin_transform_modules_amd___plugin_transform_modules_amd_7.10.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.10.5.tgz"; + sha1 = "1b9cddaf05d9e88b3aad339cb3e445c4f020a9b1"; }; } { - name = "_babel_plugin_transform_modules_commonjs___plugin_transform_modules_commonjs_7.9.0.tgz"; + name = "_babel_plugin_transform_modules_commonjs___plugin_transform_modules_commonjs_7.10.4.tgz"; path = fetchurl { - name = "_babel_plugin_transform_modules_commonjs___plugin_transform_modules_commonjs_7.9.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.9.0.tgz"; - sha1 = "e3e72f4cbc9b4a260e30be0ea59bdf5a39748940"; + name = "_babel_plugin_transform_modules_commonjs___plugin_transform_modules_commonjs_7.10.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.10.4.tgz"; + sha1 = "66667c3eeda1ebf7896d41f1f16b17105a2fbca0"; }; } { - name = "_babel_plugin_transform_modules_systemjs___plugin_transform_modules_systemjs_7.9.0.tgz"; + name = "_babel_plugin_transform_modules_systemjs___plugin_transform_modules_systemjs_7.10.5.tgz"; path = fetchurl { - name = "_babel_plugin_transform_modules_systemjs___plugin_transform_modules_systemjs_7.9.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.9.0.tgz"; - sha1 = "e9fd46a296fc91e009b64e07ddaa86d6f0edeb90"; + name = "_babel_plugin_transform_modules_systemjs___plugin_transform_modules_systemjs_7.10.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.10.5.tgz"; + sha1 = "6270099c854066681bae9e05f87e1b9cadbe8c85"; }; } { - name = "_babel_plugin_transform_modules_umd___plugin_transform_modules_umd_7.9.0.tgz"; + name = "_babel_plugin_transform_modules_umd___plugin_transform_modules_umd_7.10.4.tgz"; path = fetchurl { - name = "_babel_plugin_transform_modules_umd___plugin_transform_modules_umd_7.9.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.9.0.tgz"; - sha1 = "e909acae276fec280f9b821a5f38e1f08b480697"; + name = "_babel_plugin_transform_modules_umd___plugin_transform_modules_umd_7.10.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.10.4.tgz"; + sha1 = "9a8481fe81b824654b3a0b65da3df89f3d21839e"; }; } { - name = "_babel_plugin_transform_named_capturing_groups_regex___plugin_transform_named_capturing_groups_regex_7.8.3.tgz"; + name = "_babel_plugin_transform_named_capturing_groups_regex___plugin_transform_named_capturing_groups_regex_7.10.4.tgz"; path = fetchurl { - name = "_babel_plugin_transform_named_capturing_groups_regex___plugin_transform_named_capturing_groups_regex_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.8.3.tgz"; - sha1 = "a2a72bffa202ac0e2d0506afd0939c5ecbc48c6c"; + name = "_babel_plugin_transform_named_capturing_groups_regex___plugin_transform_named_capturing_groups_regex_7.10.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.10.4.tgz"; + sha1 = "78b4d978810b6f3bcf03f9e318f2fc0ed41aecb6"; }; } { - name = "_babel_plugin_transform_new_target___plugin_transform_new_target_7.8.3.tgz"; + name = "_babel_plugin_transform_new_target___plugin_transform_new_target_7.10.4.tgz"; path = fetchurl { - name = "_babel_plugin_transform_new_target___plugin_transform_new_target_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.8.3.tgz"; - sha1 = "60cc2ae66d85c95ab540eb34babb6434d4c70c43"; + name = "_babel_plugin_transform_new_target___plugin_transform_new_target_7.10.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.10.4.tgz"; + sha1 = "9097d753cb7b024cb7381a3b2e52e9513a9c6888"; }; } { - name = "_babel_plugin_transform_object_super___plugin_transform_object_super_7.8.3.tgz"; + name = "_babel_plugin_transform_object_super___plugin_transform_object_super_7.10.4.tgz"; path = fetchurl { - name = "_babel_plugin_transform_object_super___plugin_transform_object_super_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.8.3.tgz"; - sha1 = "ebb6a1e7a86ffa96858bd6ac0102d65944261725"; + name = "_babel_plugin_transform_object_super___plugin_transform_object_super_7.10.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.10.4.tgz"; + sha1 = "d7146c4d139433e7a6526f888c667e314a093894"; }; } { - name = "_babel_plugin_transform_parameters___plugin_transform_parameters_7.8.8.tgz"; + name = "_babel_plugin_transform_parameters___plugin_transform_parameters_7.10.5.tgz"; path = fetchurl { - name = "_babel_plugin_transform_parameters___plugin_transform_parameters_7.8.8.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.8.8.tgz"; - sha1 = "0381de466c85d5404565243660c4496459525daf"; + name = "_babel_plugin_transform_parameters___plugin_transform_parameters_7.10.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.10.5.tgz"; + sha1 = "59d339d58d0b1950435f4043e74e2510005e2c4a"; }; } { - name = "_babel_plugin_transform_property_literals___plugin_transform_property_literals_7.8.3.tgz"; + name = "_babel_plugin_transform_property_literals___plugin_transform_property_literals_7.10.4.tgz"; path = fetchurl { - name = "_babel_plugin_transform_property_literals___plugin_transform_property_literals_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.8.3.tgz"; - sha1 = "33194300d8539c1ed28c62ad5087ba3807b98263"; + name = "_babel_plugin_transform_property_literals___plugin_transform_property_literals_7.10.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.10.4.tgz"; + sha1 = "f6fe54b6590352298785b83edd815d214c42e3c0"; }; } { - name = "_babel_plugin_transform_react_constant_elements___plugin_transform_react_constant_elements_7.9.0.tgz"; + name = "_babel_plugin_transform_react_constant_elements___plugin_transform_react_constant_elements_7.10.4.tgz"; path = fetchurl { - name = "_babel_plugin_transform_react_constant_elements___plugin_transform_react_constant_elements_7.9.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-react-constant-elements/-/plugin-transform-react-constant-elements-7.9.0.tgz"; - sha1 = "a75abc936a3819edec42d3386d9f1c93f28d9d9e"; + name = "_babel_plugin_transform_react_constant_elements___plugin_transform_react_constant_elements_7.10.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-react-constant-elements/-/plugin-transform-react-constant-elements-7.10.4.tgz"; + sha1 = "0f485260bf1c29012bb973e7e404749eaac12c9e"; }; } { @@ -682,51 +754,67 @@ }; } { - name = "_babel_plugin_transform_react_jsx_development___plugin_transform_react_jsx_development_7.9.0.tgz"; + name = "_babel_plugin_transform_react_display_name___plugin_transform_react_display_name_7.10.4.tgz"; path = fetchurl { - name = "_babel_plugin_transform_react_jsx_development___plugin_transform_react_jsx_development_7.9.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-development/-/plugin-transform-react-jsx-development-7.9.0.tgz"; - sha1 = "3c2a130727caf00c2a293f0aed24520825dbf754"; + name = "_babel_plugin_transform_react_display_name___plugin_transform_react_display_name_7.10.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-react-display-name/-/plugin-transform-react-display-name-7.10.4.tgz"; + sha1 = "b5795f4e3e3140419c3611b7a2a3832b9aef328d"; }; } { - name = "_babel_plugin_transform_react_jsx_self___plugin_transform_react_jsx_self_7.9.0.tgz"; + name = "_babel_plugin_transform_react_jsx_development___plugin_transform_react_jsx_development_7.11.5.tgz"; path = fetchurl { - name = "_babel_plugin_transform_react_jsx_self___plugin_transform_react_jsx_self_7.9.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-self/-/plugin-transform-react-jsx-self-7.9.0.tgz"; - sha1 = "f4f26a325820205239bb915bad8e06fcadabb49b"; + name = "_babel_plugin_transform_react_jsx_development___plugin_transform_react_jsx_development_7.11.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-development/-/plugin-transform-react-jsx-development-7.11.5.tgz"; + sha1 = "e1439e6a57ee3d43e9f54ace363fb29cefe5d7b6"; }; } { - name = "_babel_plugin_transform_react_jsx_source___plugin_transform_react_jsx_source_7.9.0.tgz"; + name = "_babel_plugin_transform_react_jsx_self___plugin_transform_react_jsx_self_7.10.4.tgz"; path = fetchurl { - name = "_babel_plugin_transform_react_jsx_source___plugin_transform_react_jsx_source_7.9.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-source/-/plugin-transform-react-jsx-source-7.9.0.tgz"; - sha1 = "89ef93025240dd5d17d3122294a093e5e0183de0"; + name = "_babel_plugin_transform_react_jsx_self___plugin_transform_react_jsx_self_7.10.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-self/-/plugin-transform-react-jsx-self-7.10.4.tgz"; + sha1 = "cd301a5fed8988c182ed0b9d55e9bd6db0bd9369"; }; } { - name = "_babel_plugin_transform_react_jsx___plugin_transform_react_jsx_7.9.1.tgz"; + name = "_babel_plugin_transform_react_jsx_source___plugin_transform_react_jsx_source_7.10.5.tgz"; path = fetchurl { - name = "_babel_plugin_transform_react_jsx___plugin_transform_react_jsx_7.9.1.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.9.1.tgz"; - sha1 = "d03af29396a6dc51bfa24eefd8005a9fd381152a"; + name = "_babel_plugin_transform_react_jsx_source___plugin_transform_react_jsx_source_7.10.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx-source/-/plugin-transform-react-jsx-source-7.10.5.tgz"; + sha1 = "34f1779117520a779c054f2cdd9680435b9222b4"; }; } { - name = "_babel_plugin_transform_regenerator___plugin_transform_regenerator_7.8.7.tgz"; + name = "_babel_plugin_transform_react_jsx___plugin_transform_react_jsx_7.10.4.tgz"; path = fetchurl { - name = "_babel_plugin_transform_regenerator___plugin_transform_regenerator_7.8.7.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.8.7.tgz"; - sha1 = "5e46a0dca2bee1ad8285eb0527e6abc9c37672f8"; + name = "_babel_plugin_transform_react_jsx___plugin_transform_react_jsx_7.10.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-react-jsx/-/plugin-transform-react-jsx-7.10.4.tgz"; + sha1 = "673c9f913948764a4421683b2bef2936968fddf2"; }; } { - name = "_babel_plugin_transform_reserved_words___plugin_transform_reserved_words_7.8.3.tgz"; + name = "_babel_plugin_transform_react_pure_annotations___plugin_transform_react_pure_annotations_7.10.4.tgz"; path = fetchurl { - name = "_babel_plugin_transform_reserved_words___plugin_transform_reserved_words_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.8.3.tgz"; - sha1 = "9a0635ac4e665d29b162837dd3cc50745dfdf1f5"; + name = "_babel_plugin_transform_react_pure_annotations___plugin_transform_react_pure_annotations_7.10.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-react-pure-annotations/-/plugin-transform-react-pure-annotations-7.10.4.tgz"; + sha1 = "3eefbb73db94afbc075f097523e445354a1c6501"; + }; + } + { + name = "_babel_plugin_transform_regenerator___plugin_transform_regenerator_7.10.4.tgz"; + path = fetchurl { + name = "_babel_plugin_transform_regenerator___plugin_transform_regenerator_7.10.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.10.4.tgz"; + sha1 = "2015e59d839074e76838de2159db421966fd8b63"; + }; + } + { + name = "_babel_plugin_transform_reserved_words___plugin_transform_reserved_words_7.10.4.tgz"; + path = fetchurl { + name = "_babel_plugin_transform_reserved_words___plugin_transform_reserved_words_7.10.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.10.4.tgz"; + sha1 = "8f2682bcdcef9ed327e1b0861585d7013f8a54dd"; }; } { @@ -738,59 +826,67 @@ }; } { - name = "_babel_plugin_transform_shorthand_properties___plugin_transform_shorthand_properties_7.8.3.tgz"; + name = "_babel_plugin_transform_shorthand_properties___plugin_transform_shorthand_properties_7.10.4.tgz"; path = fetchurl { - name = "_babel_plugin_transform_shorthand_properties___plugin_transform_shorthand_properties_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.8.3.tgz"; - sha1 = "28545216e023a832d4d3a1185ed492bcfeac08c8"; + name = "_babel_plugin_transform_shorthand_properties___plugin_transform_shorthand_properties_7.10.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.10.4.tgz"; + sha1 = "9fd25ec5cdd555bb7f473e5e6ee1c971eede4dd6"; }; } { - name = "_babel_plugin_transform_spread___plugin_transform_spread_7.8.3.tgz"; + name = "_babel_plugin_transform_spread___plugin_transform_spread_7.11.0.tgz"; path = fetchurl { - name = "_babel_plugin_transform_spread___plugin_transform_spread_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.8.3.tgz"; - sha1 = "9c8ffe8170fdfb88b114ecb920b82fb6e95fe5e8"; + name = "_babel_plugin_transform_spread___plugin_transform_spread_7.11.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.11.0.tgz"; + sha1 = "fa84d300f5e4f57752fe41a6d1b3c554f13f17cc"; }; } { - name = "_babel_plugin_transform_sticky_regex___plugin_transform_sticky_regex_7.8.3.tgz"; + name = "_babel_plugin_transform_sticky_regex___plugin_transform_sticky_regex_7.10.4.tgz"; path = fetchurl { - name = "_babel_plugin_transform_sticky_regex___plugin_transform_sticky_regex_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.8.3.tgz"; - sha1 = "be7a1290f81dae767475452199e1f76d6175b100"; + name = "_babel_plugin_transform_sticky_regex___plugin_transform_sticky_regex_7.10.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.10.4.tgz"; + sha1 = "8f3889ee8657581130a29d9cc91d7c73b7c4a28d"; }; } { - name = "_babel_plugin_transform_template_literals___plugin_transform_template_literals_7.8.3.tgz"; + name = "_babel_plugin_transform_template_literals___plugin_transform_template_literals_7.10.5.tgz"; path = fetchurl { - name = "_babel_plugin_transform_template_literals___plugin_transform_template_literals_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.8.3.tgz"; - sha1 = "7bfa4732b455ea6a43130adc0ba767ec0e402a80"; + name = "_babel_plugin_transform_template_literals___plugin_transform_template_literals_7.10.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.10.5.tgz"; + sha1 = "78bc5d626a6642db3312d9d0f001f5e7639fde8c"; }; } { - name = "_babel_plugin_transform_typeof_symbol___plugin_transform_typeof_symbol_7.8.4.tgz"; + name = "_babel_plugin_transform_typeof_symbol___plugin_transform_typeof_symbol_7.10.4.tgz"; path = fetchurl { - name = "_babel_plugin_transform_typeof_symbol___plugin_transform_typeof_symbol_7.8.4.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.8.4.tgz"; - sha1 = "ede4062315ce0aaf8a657a920858f1a2f35fc412"; + name = "_babel_plugin_transform_typeof_symbol___plugin_transform_typeof_symbol_7.10.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.10.4.tgz"; + sha1 = "9509f1a7eec31c4edbffe137c16cc33ff0bc5bfc"; }; } { - name = "_babel_plugin_transform_typescript___plugin_transform_typescript_7.9.0.tgz"; + name = "_babel_plugin_transform_typescript___plugin_transform_typescript_7.11.0.tgz"; path = fetchurl { - name = "_babel_plugin_transform_typescript___plugin_transform_typescript_7.9.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.9.0.tgz"; - sha1 = "8b52649c81cb7dee117f760952ab46675a258836"; + name = "_babel_plugin_transform_typescript___plugin_transform_typescript_7.11.0.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.11.0.tgz"; + sha1 = "2b4879676af37342ebb278216dd090ac67f13abb"; }; } { - name = "_babel_plugin_transform_unicode_regex___plugin_transform_unicode_regex_7.8.3.tgz"; + name = "_babel_plugin_transform_unicode_escapes___plugin_transform_unicode_escapes_7.10.4.tgz"; path = fetchurl { - name = "_babel_plugin_transform_unicode_regex___plugin_transform_unicode_regex_7.8.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.8.3.tgz"; - sha1 = "0cef36e3ba73e5c57273effb182f46b91a1ecaad"; + name = "_babel_plugin_transform_unicode_escapes___plugin_transform_unicode_escapes_7.10.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.10.4.tgz"; + sha1 = "feae523391c7651ddac115dae0a9d06857892007"; + }; + } + { + name = "_babel_plugin_transform_unicode_regex___plugin_transform_unicode_regex_7.10.4.tgz"; + path = fetchurl { + name = "_babel_plugin_transform_unicode_regex___plugin_transform_unicode_regex_7.10.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.10.4.tgz"; + sha1 = "e56d71f9282fac6db09c82742055576d5e6d80a8"; }; } { @@ -802,11 +898,19 @@ }; } { - name = "_babel_preset_modules___preset_modules_0.1.3.tgz"; + name = "_babel_preset_env___preset_env_7.11.5.tgz"; path = fetchurl { - name = "_babel_preset_modules___preset_modules_0.1.3.tgz"; - url = "https://registry.yarnpkg.com/@babel/preset-modules/-/preset-modules-0.1.3.tgz"; - sha1 = "13242b53b5ef8c883c3cf7dddd55b36ce80fbc72"; + name = "_babel_preset_env___preset_env_7.11.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.11.5.tgz"; + sha1 = "18cb4b9379e3e92ffea92c07471a99a2914e4272"; + }; + } + { + name = "_babel_preset_modules___preset_modules_0.1.4.tgz"; + path = fetchurl { + name = "_babel_preset_modules___preset_modules_0.1.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/preset-modules/-/preset-modules-0.1.4.tgz"; + sha1 = "362f2b68c662842970fdb5e254ffc8fc1c2e415e"; }; } { @@ -817,6 +921,14 @@ sha1 = "b346403c36d58c3bb544148272a0cefd9c28677a"; }; } + { + name = "_babel_preset_react___preset_react_7.10.4.tgz"; + path = fetchurl { + name = "_babel_preset_react___preset_react_7.10.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/preset-react/-/preset-react-7.10.4.tgz"; + sha1 = "92e8a66d816f9911d11d4cc935be67adfc82dbcf"; + }; + } { name = "_babel_preset_typescript___preset_typescript_7.9.0.tgz"; path = fetchurl { @@ -826,11 +938,11 @@ }; } { - name = "_babel_runtime_corejs3___runtime_corejs3_7.9.2.tgz"; + name = "_babel_runtime_corejs3___runtime_corejs3_7.11.2.tgz"; path = fetchurl { - name = "_babel_runtime_corejs3___runtime_corejs3_7.9.2.tgz"; - url = "https://registry.yarnpkg.com/@babel/runtime-corejs3/-/runtime-corejs3-7.9.2.tgz"; - sha1 = "26fe4aa77e9f1ecef9b776559bbb8e84d34284b7"; + name = "_babel_runtime_corejs3___runtime_corejs3_7.11.2.tgz"; + url = "https://registry.yarnpkg.com/@babel/runtime-corejs3/-/runtime-corejs3-7.11.2.tgz"; + sha1 = "02c3029743150188edeb66541195f54600278419"; }; } { @@ -842,35 +954,35 @@ }; } { - name = "_babel_runtime___runtime_7.9.2.tgz"; + name = "_babel_runtime___runtime_7.11.2.tgz"; path = fetchurl { - name = "_babel_runtime___runtime_7.9.2.tgz"; - url = "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.9.2.tgz"; - sha1 = "d90df0583a3a252f09aaa619665367bae518db06"; + name = "_babel_runtime___runtime_7.11.2.tgz"; + url = "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.11.2.tgz"; + sha1 = "f549c13c754cc40b87644b9fa9f09a6a95fe0736"; }; } { - name = "_babel_template___template_7.8.6.tgz"; + name = "_babel_template___template_7.10.4.tgz"; path = fetchurl { - name = "_babel_template___template_7.8.6.tgz"; - url = "https://registry.yarnpkg.com/@babel/template/-/template-7.8.6.tgz"; - sha1 = "86b22af15f828dfb086474f964dcc3e39c43ce2b"; + name = "_babel_template___template_7.10.4.tgz"; + url = "https://registry.yarnpkg.com/@babel/template/-/template-7.10.4.tgz"; + sha1 = "3251996c4200ebc71d1a8fc405fba940f36ba278"; }; } { - name = "_babel_traverse___traverse_7.9.0.tgz"; + name = "_babel_traverse___traverse_7.11.5.tgz"; path = fetchurl { - name = "_babel_traverse___traverse_7.9.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.9.0.tgz"; - sha1 = "d3882c2830e513f4fe4cec9fe76ea1cc78747892"; + name = "_babel_traverse___traverse_7.11.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.11.5.tgz"; + sha1 = "be777b93b518eb6d76ee2e1ea1d143daa11e61c3"; }; } { - name = "_babel_types___types_7.9.0.tgz"; + name = "_babel_types___types_7.11.5.tgz"; path = fetchurl { - name = "_babel_types___types_7.9.0.tgz"; - url = "https://registry.yarnpkg.com/@babel/types/-/types-7.9.0.tgz"; - sha1 = "00b064c3df83ad32b2dbf5ff07312b15c7f1efb5"; + name = "_babel_types___types_7.11.5.tgz"; + url = "https://registry.yarnpkg.com/@babel/types/-/types-7.11.5.tgz"; + sha1 = "d9de577d01252d77c6800cee039ee64faf75662d"; }; } { @@ -898,35 +1010,35 @@ }; } { - name = "_fortawesome_fontawesome_common_types___fontawesome_common_types_0.2.27.tgz"; + name = "_fortawesome_fontawesome_common_types___fontawesome_common_types_0.2.32.tgz"; path = fetchurl { - name = "_fortawesome_fontawesome_common_types___fontawesome_common_types_0.2.27.tgz"; - url = "https://registry.yarnpkg.com/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-0.2.27.tgz"; - sha1 = "19706345859fc46adf3684ed01d11b40903b87e9"; + name = "_fortawesome_fontawesome_common_types___fontawesome_common_types_0.2.32.tgz"; + url = "https://registry.yarnpkg.com/@fortawesome/fontawesome-common-types/-/fontawesome-common-types-0.2.32.tgz"; + sha1 = "3436795d5684f22742989bfa08f46f50f516f259"; }; } { - name = "_fortawesome_fontawesome_svg_core___fontawesome_svg_core_1.2.27.tgz"; + name = "_fortawesome_fontawesome_svg_core___fontawesome_svg_core_1.2.32.tgz"; path = fetchurl { - name = "_fortawesome_fontawesome_svg_core___fontawesome_svg_core_1.2.27.tgz"; - url = "https://registry.yarnpkg.com/@fortawesome/fontawesome-svg-core/-/fontawesome-svg-core-1.2.27.tgz"; - sha1 = "e4db8e3be81a40988213507c3e3d0c158a6641a3"; + name = "_fortawesome_fontawesome_svg_core___fontawesome_svg_core_1.2.32.tgz"; + url = "https://registry.yarnpkg.com/@fortawesome/fontawesome-svg-core/-/fontawesome-svg-core-1.2.32.tgz"; + sha1 = "da092bfc7266aa274be8604de610d7115f9ba6cf"; }; } { - name = "_fortawesome_free_solid_svg_icons___free_solid_svg_icons_5.12.1.tgz"; + name = "_fortawesome_free_solid_svg_icons___free_solid_svg_icons_5.15.1.tgz"; path = fetchurl { - name = "_fortawesome_free_solid_svg_icons___free_solid_svg_icons_5.12.1.tgz"; - url = "https://registry.yarnpkg.com/@fortawesome/free-solid-svg-icons/-/free-solid-svg-icons-5.12.1.tgz"; - sha1 = "76b6f958a3471821ff146f8f955e6d7cfe87147c"; + name = "_fortawesome_free_solid_svg_icons___free_solid_svg_icons_5.15.1.tgz"; + url = "https://registry.yarnpkg.com/@fortawesome/free-solid-svg-icons/-/free-solid-svg-icons-5.15.1.tgz"; + sha1 = "e1432676ddd43108b41197fee9f86d910ad458ef"; }; } { - name = "_fortawesome_react_fontawesome___react_fontawesome_0.1.9.tgz"; + name = "_fortawesome_react_fontawesome___react_fontawesome_0.1.11.tgz"; path = fetchurl { - name = "_fortawesome_react_fontawesome___react_fontawesome_0.1.9.tgz"; - url = "https://registry.yarnpkg.com/@fortawesome/react-fontawesome/-/react-fontawesome-0.1.9.tgz"; - sha1 = "c865b9286c707407effcec99958043711367cd02"; + name = "_fortawesome_react_fontawesome___react_fontawesome_0.1.11.tgz"; + url = "https://registry.yarnpkg.com/@fortawesome/react-fontawesome/-/react-fontawesome-0.1.11.tgz"; + sha1 = "c1a95a2bdb6a18fa97b355a563832e248bf6ef4a"; }; } { @@ -1049,6 +1161,14 @@ sha1 = "63cb26cb7500d069e5a389441a7c6ab5e909fc59"; }; } + { + name = "_jest_types___types_25.5.0.tgz"; + path = fetchurl { + name = "_jest_types___types_25.5.0.tgz"; + url = "https://registry.yarnpkg.com/@jest/types/-/types-25.5.0.tgz"; + sha1 = "4d6a4793f7b9599fc3680877b856a97dbccf2a9d"; + }; + } { name = "_mrmlnc_readdir_enhanced___readdir_enhanced_2.2.1.tgz"; path = fetchurl { @@ -1066,35 +1186,43 @@ }; } { - name = "_reach_router___router_1.3.3.tgz"; + name = "_reach_router___router_1.3.4.tgz"; path = fetchurl { - name = "_reach_router___router_1.3.3.tgz"; - url = "https://registry.yarnpkg.com/@reach/router/-/router-1.3.3.tgz"; - sha1 = "58162860dce6c9449d49be86b0561b5ef46d80db"; + name = "_reach_router___router_1.3.4.tgz"; + url = "https://registry.yarnpkg.com/@reach/router/-/router-1.3.4.tgz"; + sha1 = "d2574b19370a70c80480ed91f3da840136d10f8c"; }; } { - name = "_sinonjs_commons___commons_1.7.1.tgz"; + name = "_sinonjs_commons___commons_1.8.1.tgz"; path = fetchurl { - name = "_sinonjs_commons___commons_1.7.1.tgz"; - url = "https://registry.yarnpkg.com/@sinonjs/commons/-/commons-1.7.1.tgz"; - sha1 = "da5fd19a5f71177a53778073978873964f49acf1"; + name = "_sinonjs_commons___commons_1.8.1.tgz"; + url = "https://registry.yarnpkg.com/@sinonjs/commons/-/commons-1.8.1.tgz"; + sha1 = "e7df00f98a203324f6dc7cc606cad9d4a8ab2217"; }; } { - name = "_sinonjs_formatio___formatio_3.2.2.tgz"; + name = "_sinonjs_fake_timers___fake_timers_6.0.1.tgz"; path = fetchurl { - name = "_sinonjs_formatio___formatio_3.2.2.tgz"; - url = "https://registry.yarnpkg.com/@sinonjs/formatio/-/formatio-3.2.2.tgz"; - sha1 = "771c60dfa75ea7f2d68e3b94c7e888a78781372c"; + name = "_sinonjs_fake_timers___fake_timers_6.0.1.tgz"; + url = "https://registry.yarnpkg.com/@sinonjs/fake-timers/-/fake-timers-6.0.1.tgz"; + sha1 = "293674fccb3262ac782c7aadfdeca86b10c75c40"; }; } { - name = "_sinonjs_samsam___samsam_3.3.3.tgz"; + name = "_sinonjs_formatio___formatio_5.0.1.tgz"; path = fetchurl { - name = "_sinonjs_samsam___samsam_3.3.3.tgz"; - url = "https://registry.yarnpkg.com/@sinonjs/samsam/-/samsam-3.3.3.tgz"; - sha1 = "46682efd9967b259b81136b9f120fd54585feb4a"; + name = "_sinonjs_formatio___formatio_5.0.1.tgz"; + url = "https://registry.yarnpkg.com/@sinonjs/formatio/-/formatio-5.0.1.tgz"; + sha1 = "f13e713cb3313b1ab965901b01b0828ea6b77089"; + }; + } + { + name = "_sinonjs_samsam___samsam_5.2.0.tgz"; + path = fetchurl { + name = "_sinonjs_samsam___samsam_5.2.0.tgz"; + url = "https://registry.yarnpkg.com/@sinonjs/samsam/-/samsam-5.2.0.tgz"; + sha1 = "fcff83ab86f83b5498f4a967869c079408d9b5eb"; }; } { @@ -1218,75 +1346,51 @@ }; } { - name = "_testing_library_react_hooks___react_hooks_3.2.1.tgz"; + name = "_testing_library_react_hooks___react_hooks_3.4.2.tgz"; path = fetchurl { - name = "_testing_library_react_hooks___react_hooks_3.2.1.tgz"; - url = "https://registry.yarnpkg.com/@testing-library/react-hooks/-/react-hooks-3.2.1.tgz"; - sha1 = "19b6caa048ef15faa69d439c469033873ea01294"; + name = "_testing_library_react_hooks___react_hooks_3.4.2.tgz"; + url = "https://registry.yarnpkg.com/@testing-library/react-hooks/-/react-hooks-3.4.2.tgz"; + sha1 = "8deb94f7684e0d896edd84a4c90e5b79a0810bc2"; }; } { - name = "_types_babel__core___babel__core_7.1.6.tgz"; + name = "_types_babel__core___babel__core_7.1.10.tgz"; path = fetchurl { - name = "_types_babel__core___babel__core_7.1.6.tgz"; - url = "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.1.6.tgz"; - sha1 = "16ff42a5ae203c9af1c6e190ed1f30f83207b610"; + name = "_types_babel__core___babel__core_7.1.10.tgz"; + url = "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.1.10.tgz"; + sha1 = "ca58fc195dd9734e77e57c6f2df565623636ab40"; }; } { - name = "_types_babel__generator___babel__generator_7.6.1.tgz"; + name = "_types_babel__generator___babel__generator_7.6.2.tgz"; path = fetchurl { - name = "_types_babel__generator___babel__generator_7.6.1.tgz"; - url = "https://registry.yarnpkg.com/@types/babel__generator/-/babel__generator-7.6.1.tgz"; - sha1 = "4901767b397e8711aeb99df8d396d7ba7b7f0e04"; + name = "_types_babel__generator___babel__generator_7.6.2.tgz"; + url = "https://registry.yarnpkg.com/@types/babel__generator/-/babel__generator-7.6.2.tgz"; + sha1 = "f3d71178e187858f7c45e30380f8f1b7415a12d8"; }; } { - name = "_types_babel__template___babel__template_7.0.2.tgz"; + name = "_types_babel__template___babel__template_7.0.3.tgz"; path = fetchurl { - name = "_types_babel__template___babel__template_7.0.2.tgz"; - url = "https://registry.yarnpkg.com/@types/babel__template/-/babel__template-7.0.2.tgz"; - sha1 = "4ff63d6b52eddac1de7b975a5223ed32ecea9307"; + name = "_types_babel__template___babel__template_7.0.3.tgz"; + url = "https://registry.yarnpkg.com/@types/babel__template/-/babel__template-7.0.3.tgz"; + sha1 = "b8aaeba0a45caca7b56a5de9459872dde3727214"; }; } { - name = "_types_babel__traverse___babel__traverse_7.0.9.tgz"; + name = "_types_babel__traverse___babel__traverse_7.0.15.tgz"; path = fetchurl { - name = "_types_babel__traverse___babel__traverse_7.0.9.tgz"; - url = "https://registry.yarnpkg.com/@types/babel__traverse/-/babel__traverse-7.0.9.tgz"; - sha1 = "be82fab304b141c3eee81a4ce3b034d0eba1590a"; + name = "_types_babel__traverse___babel__traverse_7.0.15.tgz"; + url = "https://registry.yarnpkg.com/@types/babel__traverse/-/babel__traverse-7.0.15.tgz"; + sha1 = "db9e4238931eb69ef8aab0ad6523d4d4caa39d03"; }; } { - name = "_types_cheerio___cheerio_0.22.17.tgz"; + name = "_types_cheerio___cheerio_0.22.22.tgz"; path = fetchurl { - name = "_types_cheerio___cheerio_0.22.17.tgz"; - url = "https://registry.yarnpkg.com/@types/cheerio/-/cheerio-0.22.17.tgz"; - sha1 = "e54f71c3135f71ebc16c8dc62edad533872c9e72"; - }; - } - { - 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_domhandler___domhandler_2.4.1.tgz"; - path = fetchurl { - name = "_types_domhandler___domhandler_2.4.1.tgz"; - url = "https://registry.yarnpkg.com/@types/domhandler/-/domhandler-2.4.1.tgz"; - sha1 = "7b3b347f7762180fbcb1ece1ce3dd0ebbb8c64cf"; - }; - } - { - name = "_types_domutils___domutils_1.7.2.tgz"; - path = fetchurl { - name = "_types_domutils___domutils_1.7.2.tgz"; - url = "https://registry.yarnpkg.com/@types/domutils/-/domutils-1.7.2.tgz"; - sha1 = "89422e579c165994ad5c09ce90325da596cc105d"; + name = "_types_cheerio___cheerio_0.22.22.tgz"; + url = "https://registry.yarnpkg.com/@types/cheerio/-/cheerio-0.22.22.tgz"; + sha1 = "ae71cf4ca59b8bbaf34c99af7a5d6c8894988f5f"; }; } { @@ -1298,11 +1402,11 @@ }; } { - name = "_types_enzyme___enzyme_3.10.5.tgz"; + name = "_types_enzyme___enzyme_3.10.7.tgz"; path = fetchurl { - name = "_types_enzyme___enzyme_3.10.5.tgz"; - url = "https://registry.yarnpkg.com/@types/enzyme/-/enzyme-3.10.5.tgz"; - sha1 = "fe7eeba3550369eed20e7fb565bfb74eec44f1f0"; + name = "_types_enzyme___enzyme_3.10.7.tgz"; + url = "https://registry.yarnpkg.com/@types/enzyme/-/enzyme-3.10.7.tgz"; + sha1 = "ebdf3b972d293095e09af479e36c772025285e3a"; }; } { @@ -1313,14 +1417,6 @@ sha1 = "1ee30d79544ca84d68d4b3cdb0af4f205663dd2d"; }; } - { - name = "_types_events___events_3.0.0.tgz"; - path = fetchurl { - name = "_types_events___events_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/@types/events/-/events-3.0.0.tgz"; - sha1 = "2862f3f58a9a7f7c3e78d79f130dd4d71c25c2a7"; - }; - } { name = "_types_flot___flot_0.0.31.tgz"; path = fetchurl { @@ -1330,35 +1426,27 @@ }; } { - name = "_types_glob___glob_7.1.1.tgz"; + name = "_types_glob___glob_7.1.3.tgz"; path = fetchurl { - name = "_types_glob___glob_7.1.1.tgz"; - url = "https://registry.yarnpkg.com/@types/glob/-/glob-7.1.1.tgz"; - sha1 = "aa59a1c6e3fbc421e07ccd31a944c30eba521575"; + name = "_types_glob___glob_7.1.3.tgz"; + url = "https://registry.yarnpkg.com/@types/glob/-/glob-7.1.3.tgz"; + sha1 = "e6ba80f36b7daad2c685acd9266382e68985c183"; }; } { - name = "_types_history___history_4.7.5.tgz"; + name = "_types_history___history_4.7.8.tgz"; path = fetchurl { - name = "_types_history___history_4.7.5.tgz"; - url = "https://registry.yarnpkg.com/@types/history/-/history-4.7.5.tgz"; - sha1 = "527d20ef68571a4af02ed74350164e7a67544860"; + name = "_types_history___history_4.7.8.tgz"; + url = "https://registry.yarnpkg.com/@types/history/-/history-4.7.8.tgz"; + sha1 = "49348387983075705fe8f4e02fb67f7daaec4934"; }; } { - name = "_types_htmlparser2___htmlparser2_3.10.1.tgz"; + name = "_types_istanbul_lib_coverage___istanbul_lib_coverage_2.0.3.tgz"; path = fetchurl { - name = "_types_htmlparser2___htmlparser2_3.10.1.tgz"; - url = "https://registry.yarnpkg.com/@types/htmlparser2/-/htmlparser2-3.10.1.tgz"; - sha1 = "1e65ba81401d53f425c1e2ba5a3d05c90ab742c7"; - }; - } - { - name = "_types_istanbul_lib_coverage___istanbul_lib_coverage_2.0.1.tgz"; - path = fetchurl { - name = "_types_istanbul_lib_coverage___istanbul_lib_coverage_2.0.1.tgz"; - url = "https://registry.yarnpkg.com/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.1.tgz"; - sha1 = "42995b446db9a48a11a07ec083499a860e9138ff"; + name = "_types_istanbul_lib_coverage___istanbul_lib_coverage_2.0.3.tgz"; + url = "https://registry.yarnpkg.com/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.3.tgz"; + sha1 = "4ba8ddb720221f432e443bd5f9117fd22cfd4762"; }; } { @@ -1370,35 +1458,43 @@ }; } { - name = "_types_istanbul_reports___istanbul_reports_1.1.1.tgz"; + name = "_types_istanbul_reports___istanbul_reports_1.1.2.tgz"; path = fetchurl { - name = "_types_istanbul_reports___istanbul_reports_1.1.1.tgz"; - url = "https://registry.yarnpkg.com/@types/istanbul-reports/-/istanbul-reports-1.1.1.tgz"; - sha1 = "7a8cbf6a406f36c8add871625b278eaf0b0d255a"; + name = "_types_istanbul_reports___istanbul_reports_1.1.2.tgz"; + url = "https://registry.yarnpkg.com/@types/istanbul-reports/-/istanbul-reports-1.1.2.tgz"; + sha1 = "e875cc689e47bce549ec81f3df5e6f6f11cfaeb2"; }; } { - name = "_types_jest___jest_24.9.1.tgz"; + name = "_types_jest___jest_26.0.14.tgz"; path = fetchurl { - name = "_types_jest___jest_24.9.1.tgz"; - url = "https://registry.yarnpkg.com/@types/jest/-/jest-24.9.1.tgz"; - sha1 = "02baf9573c78f1b9974a5f36778b366aa77bd534"; + name = "_types_jest___jest_26.0.14.tgz"; + url = "https://registry.yarnpkg.com/@types/jest/-/jest-26.0.14.tgz"; + sha1 = "078695f8f65cb55c5a98450d65083b2b73e5a3f3"; }; } { - name = "_types_jquery___jquery_3.3.33.tgz"; + name = "_types_jquery___jquery_3.5.2.tgz"; path = fetchurl { - name = "_types_jquery___jquery_3.3.33.tgz"; - url = "https://registry.yarnpkg.com/@types/jquery/-/jquery-3.3.33.tgz"; - sha1 = "61d9cbd4004ffcdf6cf7e34720a87a5625a7d8e9"; + name = "_types_jquery___jquery_3.5.2.tgz"; + url = "https://registry.yarnpkg.com/@types/jquery/-/jquery-3.5.2.tgz"; + sha1 = "e17c1756ecf7bbb431766c6761674a5d1de16579"; }; } { - name = "_types_json_schema___json_schema_7.0.4.tgz"; + name = "_types_json_schema___json_schema_7.0.6.tgz"; path = fetchurl { - name = "_types_json_schema___json_schema_7.0.4.tgz"; - url = "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.4.tgz"; - sha1 = "38fd73ddfd9b55abb1e1b2ed578cb55bd7b7d339"; + name = "_types_json_schema___json_schema_7.0.6.tgz"; + url = "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.6.tgz"; + sha1 = "f4c7ec43e81b319a9815115031709f26987891f0"; + }; + } + { + name = "_types_json5___json5_0.0.29.tgz"; + path = fetchurl { + name = "_types_json5___json5_0.0.29.tgz"; + url = "https://registry.yarnpkg.com/@types/json5/-/json5-0.0.29.tgz"; + sha1 = "ee28707ae94e11d2b827bcbe5270bcea7f3e71ee"; }; } { @@ -1410,27 +1506,27 @@ }; } { - name = "_types_moment_timezone___moment_timezone_0.5.12.tgz"; + name = "_types_moment_timezone___moment_timezone_0.5.30.tgz"; path = fetchurl { - name = "_types_moment_timezone___moment_timezone_0.5.12.tgz"; - url = "https://registry.yarnpkg.com/@types/moment-timezone/-/moment-timezone-0.5.12.tgz"; - sha1 = "0fb680c03db194fe8ff4551eaeb1eec8d3d80e9f"; + name = "_types_moment_timezone___moment_timezone_0.5.30.tgz"; + url = "https://registry.yarnpkg.com/@types/moment-timezone/-/moment-timezone-0.5.30.tgz"; + sha1 = "340ed45fe3e715f4a011f5cfceb7cb52aad46fc7"; }; } { - name = "_types_node___node_13.9.2.tgz"; + name = "_types_node___node_14.11.5.tgz"; path = fetchurl { - name = "_types_node___node_13.9.2.tgz"; - url = "https://registry.yarnpkg.com/@types/node/-/node-13.9.2.tgz"; - sha1 = "ace1880c03594cc3e80206d96847157d8e7fa349"; + name = "_types_node___node_14.11.5.tgz"; + url = "https://registry.yarnpkg.com/@types/node/-/node-14.11.5.tgz"; + sha1 = "fecad41c041cae7f2404ad4b2d0742fdb628b305"; }; } { - name = "_types_node___node_12.12.30.tgz"; + name = "_types_node___node_12.12.64.tgz"; path = fetchurl { - name = "_types_node___node_12.12.30.tgz"; - url = "https://registry.yarnpkg.com/@types/node/-/node-12.12.30.tgz"; - sha1 = "3501e6f09b954de9c404671cefdbcc5d9d7c45f6"; + name = "_types_node___node_12.12.64.tgz"; + url = "https://registry.yarnpkg.com/@types/node/-/node-12.12.64.tgz"; + sha1 = "e3b336dc4c6ba52c6b59e3bd69a100347c20b1c0"; }; } { @@ -1450,19 +1546,19 @@ }; } { - name = "_types_q___q_1.5.2.tgz"; + name = "_types_q___q_1.5.4.tgz"; path = fetchurl { - name = "_types_q___q_1.5.2.tgz"; - url = "https://registry.yarnpkg.com/@types/q/-/q-1.5.2.tgz"; - sha1 = "690a1475b84f2a884fd07cd797c00f5f31356ea8"; + name = "_types_q___q_1.5.4.tgz"; + url = "https://registry.yarnpkg.com/@types/q/-/q-1.5.4.tgz"; + sha1 = "15925414e0ad2cd765bfef58842f7e26a7accb24"; }; } { - name = "_types_reach__router___reach__router_1.3.1.tgz"; + name = "_types_reach__router___reach__router_1.3.6.tgz"; path = fetchurl { - name = "_types_reach__router___reach__router_1.3.1.tgz"; - url = "https://registry.yarnpkg.com/@types/reach__router/-/reach__router-1.3.1.tgz"; - sha1 = "ca8b431acb12bb897d2b806f6fdd815f056d6d02"; + name = "_types_reach__router___reach__router_1.3.6.tgz"; + url = "https://registry.yarnpkg.com/@types/reach__router/-/reach__router-1.3.6.tgz"; + sha1 = "413417ce74caab331c70ce6a03a4c825188e4709"; }; } { @@ -1474,11 +1570,11 @@ }; } { - name = "_types_react_dom___react_dom_16.9.5.tgz"; + name = "_types_react_dom___react_dom_16.9.8.tgz"; path = fetchurl { - name = "_types_react_dom___react_dom_16.9.5.tgz"; - url = "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-16.9.5.tgz"; - sha1 = "5de610b04a35d07ffd8f44edad93a71032d9aaa7"; + name = "_types_react_dom___react_dom_16.9.8.tgz"; + url = "https://registry.yarnpkg.com/@types/react-dom/-/react-dom-16.9.8.tgz"; + sha1 = "fe4c1e11dfc67155733dfa6aa65108b4971cb423"; }; } { @@ -1490,43 +1586,51 @@ }; } { - name = "_types_react_test_renderer___react_test_renderer_16.9.2.tgz"; + name = "_types_react_test_renderer___react_test_renderer_16.9.3.tgz"; path = fetchurl { - name = "_types_react_test_renderer___react_test_renderer_16.9.2.tgz"; - url = "https://registry.yarnpkg.com/@types/react-test-renderer/-/react-test-renderer-16.9.2.tgz"; - sha1 = "e1c408831e8183e5ad748fdece02214a7c2ab6c5"; + name = "_types_react_test_renderer___react_test_renderer_16.9.3.tgz"; + url = "https://registry.yarnpkg.com/@types/react-test-renderer/-/react-test-renderer-16.9.3.tgz"; + sha1 = "96bab1860904366f4e848b739ba0e2f67bcae87e"; }; } { - name = "_types_react___react_16.9.25.tgz"; + name = "_types_react___react_16.9.51.tgz"; path = fetchurl { - name = "_types_react___react_16.9.25.tgz"; - url = "https://registry.yarnpkg.com/@types/react/-/react-16.9.25.tgz"; - sha1 = "6ae2159b40138c792058a23c3c04fd3db49e929e"; + name = "_types_react___react_16.9.51.tgz"; + url = "https://registry.yarnpkg.com/@types/react/-/react-16.9.51.tgz"; + sha1 = "f8aa51ffa9996f1387f63686696d9b59713d2b60"; }; } { - name = "_types_reactstrap___reactstrap_8.4.2.tgz"; + name = "_types_reactstrap___reactstrap_8.5.1.tgz"; path = fetchurl { - name = "_types_reactstrap___reactstrap_8.4.2.tgz"; - url = "https://registry.yarnpkg.com/@types/reactstrap/-/reactstrap-8.4.2.tgz"; - sha1 = "e7066d0e67e2924dab0a52c6aedcf922f2be53b6"; + name = "_types_reactstrap___reactstrap_8.5.1.tgz"; + url = "https://registry.yarnpkg.com/@types/reactstrap/-/reactstrap-8.5.1.tgz"; + sha1 = "bd01ed7b14b9aeb476c0b8e195443dda98ac6156"; }; } { - name = "_types_sanitize_html___sanitize_html_1.22.0.tgz"; + name = "_types_sanitize_html___sanitize_html_1.27.0.tgz"; path = fetchurl { - name = "_types_sanitize_html___sanitize_html_1.22.0.tgz"; - url = "https://registry.yarnpkg.com/@types/sanitize-html/-/sanitize-html-1.22.0.tgz"; - sha1 = "9bf3a13aeab6e38d130d8ba34bb443956b75bc3d"; + name = "_types_sanitize_html___sanitize_html_1.27.0.tgz"; + url = "https://registry.yarnpkg.com/@types/sanitize-html/-/sanitize-html-1.27.0.tgz"; + sha1 = "77702dc856f16efecc005014c1d2e45b1f2cbc56"; }; } { - name = "_types_sinon___sinon_7.5.2.tgz"; + name = "_types_sinon___sinon_9.0.8.tgz"; path = fetchurl { - name = "_types_sinon___sinon_7.5.2.tgz"; - url = "https://registry.yarnpkg.com/@types/sinon/-/sinon-7.5.2.tgz"; - sha1 = "5e2f1d120f07b9cda07e5dedd4f3bf8888fccdb9"; + name = "_types_sinon___sinon_9.0.8.tgz"; + url = "https://registry.yarnpkg.com/@types/sinon/-/sinon-9.0.8.tgz"; + sha1 = "1ed0038d356784f75b086104ef83bfd4130bb81b"; + }; + } + { + name = "_types_sinonjs__fake_timers___sinonjs__fake_timers_6.0.2.tgz"; + path = fetchurl { + name = "_types_sinonjs__fake_timers___sinonjs__fake_timers_6.0.2.tgz"; + url = "https://registry.yarnpkg.com/@types/sinonjs__fake-timers/-/sinonjs__fake-timers-6.0.2.tgz"; + sha1 = "3a84cf5ec3249439015e14049bd3161419bf9eae"; }; } { @@ -1546,11 +1650,11 @@ }; } { - name = "_types_testing_library__react_hooks___testing_library__react_hooks_3.2.0.tgz"; + name = "_types_testing_library__react_hooks___testing_library__react_hooks_3.4.1.tgz"; path = fetchurl { - name = "_types_testing_library__react_hooks___testing_library__react_hooks_3.2.0.tgz"; - url = "https://registry.yarnpkg.com/@types/testing-library__react-hooks/-/testing-library__react-hooks-3.2.0.tgz"; - sha1 = "52f3a109bef06080e3b1e3ae7ea1c014ce859897"; + name = "_types_testing_library__react_hooks___testing_library__react_hooks_3.4.1.tgz"; + url = "https://registry.yarnpkg.com/@types/testing-library__react-hooks/-/testing-library__react-hooks-3.4.1.tgz"; + sha1 = "b8d7311c6c1f7db3103e94095fe901f8fef6e433"; }; } { @@ -1562,43 +1666,51 @@ }; } { - name = "_types_yargs___yargs_13.0.8.tgz"; + name = "_types_yargs___yargs_13.0.11.tgz"; path = fetchurl { - name = "_types_yargs___yargs_13.0.8.tgz"; - url = "https://registry.yarnpkg.com/@types/yargs/-/yargs-13.0.8.tgz"; - sha1 = "a38c22def2f1c2068f8971acb3ea734eb3c64a99"; + name = "_types_yargs___yargs_13.0.11.tgz"; + url = "https://registry.yarnpkg.com/@types/yargs/-/yargs-13.0.11.tgz"; + sha1 = "def2f0c93e4bdf2c61d7e34899b17e34be28d3b1"; }; } { - name = "_typescript_eslint_eslint_plugin___eslint_plugin_2.24.0.tgz"; + name = "_types_yargs___yargs_15.0.7.tgz"; path = fetchurl { - name = "_typescript_eslint_eslint_plugin___eslint_plugin_2.24.0.tgz"; - url = "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-2.24.0.tgz"; - sha1 = "a86cf618c965a462cddf3601f594544b134d6d68"; + name = "_types_yargs___yargs_15.0.7.tgz"; + url = "https://registry.yarnpkg.com/@types/yargs/-/yargs-15.0.7.tgz"; + sha1 = "dad50a7a234a35ef9460737a56024287a3de1d2b"; }; } { - name = "_typescript_eslint_experimental_utils___experimental_utils_2.24.0.tgz"; + name = "_typescript_eslint_eslint_plugin___eslint_plugin_2.34.0.tgz"; path = fetchurl { - name = "_typescript_eslint_experimental_utils___experimental_utils_2.24.0.tgz"; - url = "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-2.24.0.tgz"; - sha1 = "a5cb2ed89fedf8b59638dc83484eb0c8c35e1143"; + name = "_typescript_eslint_eslint_plugin___eslint_plugin_2.34.0.tgz"; + url = "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-2.34.0.tgz"; + sha1 = "6f8ce8a46c7dea4a6f1d171d2bb8fbae6dac2be9"; }; } { - name = "_typescript_eslint_parser___parser_2.24.0.tgz"; + name = "_typescript_eslint_experimental_utils___experimental_utils_2.34.0.tgz"; path = fetchurl { - name = "_typescript_eslint_parser___parser_2.24.0.tgz"; - url = "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-2.24.0.tgz"; - sha1 = "2cf0eae6e6dd44d162486ad949c126b887f11eb8"; + name = "_typescript_eslint_experimental_utils___experimental_utils_2.34.0.tgz"; + url = "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-2.34.0.tgz"; + sha1 = "d3524b644cdb40eebceca67f8cf3e4cc9c8f980f"; }; } { - name = "_typescript_eslint_typescript_estree___typescript_estree_2.24.0.tgz"; + name = "_typescript_eslint_parser___parser_2.34.0.tgz"; path = fetchurl { - name = "_typescript_eslint_typescript_estree___typescript_estree_2.24.0.tgz"; - url = "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-2.24.0.tgz"; - sha1 = "38bbc8bb479790d2f324797ffbcdb346d897c62a"; + name = "_typescript_eslint_parser___parser_2.34.0.tgz"; + url = "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-2.34.0.tgz"; + sha1 = "50252630ca319685420e9a39ca05fe185a256bc8"; + }; + } + { + name = "_typescript_eslint_typescript_estree___typescript_estree_2.34.0.tgz"; + path = fetchurl { + name = "_typescript_eslint_typescript_estree___typescript_estree_2.34.0.tgz"; + url = "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-2.34.0.tgz"; + sha1 = "14aeb6353b39ef0732cc7f1b8285294937cf37d5"; }; } { @@ -1762,11 +1874,11 @@ }; } { - name = "abab___abab_2.0.3.tgz"; + name = "abab___abab_2.0.5.tgz"; path = fetchurl { - name = "abab___abab_2.0.3.tgz"; - url = "https://registry.yarnpkg.com/abab/-/abab-2.0.3.tgz"; - sha1 = "623e2075e02eb2d3f2475e49f99c91846467907a"; + name = "abab___abab_2.0.5.tgz"; + url = "https://registry.yarnpkg.com/abab/-/abab-2.0.5.tgz"; + sha1 = "c0b678fb32d60fc1219c784d6a826fe385aeb79a"; }; } { @@ -1786,11 +1898,19 @@ }; } { - name = "acorn_jsx___acorn_jsx_5.2.0.tgz"; + name = "acorn_globals___acorn_globals_6.0.0.tgz"; path = fetchurl { - name = "acorn_jsx___acorn_jsx_5.2.0.tgz"; - url = "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.2.0.tgz"; - sha1 = "4c66069173d6fdd68ed85239fc256226182b2ebe"; + name = "acorn_globals___acorn_globals_6.0.0.tgz"; + url = "https://registry.yarnpkg.com/acorn-globals/-/acorn-globals-6.0.0.tgz"; + sha1 = "46cdd39f0f8ff08a876619b55f5ac8a6dc770b45"; + }; + } + { + 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"; }; } { @@ -1801,6 +1921,14 @@ sha1 = "123cb8f3b84c2171f1f7fb252615b1c78a6b1a8c"; }; } + { + name = "acorn_walk___acorn_walk_7.2.0.tgz"; + path = fetchurl { + name = "acorn_walk___acorn_walk_7.2.0.tgz"; + url = "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-7.2.0.tgz"; + sha1 = "0de889a601203909b0fbe07b8938dc21d2e967bc"; + }; + } { name = "acorn___acorn_5.7.4.tgz"; path = fetchurl { @@ -1810,19 +1938,19 @@ }; } { - name = "acorn___acorn_6.4.1.tgz"; + name = "acorn___acorn_6.4.2.tgz"; path = fetchurl { - name = "acorn___acorn_6.4.1.tgz"; - url = "https://registry.yarnpkg.com/acorn/-/acorn-6.4.1.tgz"; - sha1 = "531e58ba3f51b9dacb9a6646ca4debf5b14ca474"; + name = "acorn___acorn_6.4.2.tgz"; + url = "https://registry.yarnpkg.com/acorn/-/acorn-6.4.2.tgz"; + sha1 = "35866fd710528e92de10cf06016498e47e39e1e6"; }; } { - name = "acorn___acorn_7.1.1.tgz"; + name = "acorn___acorn_7.4.1.tgz"; path = fetchurl { - name = "acorn___acorn_7.1.1.tgz"; - url = "https://registry.yarnpkg.com/acorn/-/acorn-7.1.1.tgz"; - sha1 = "e35668de0b402f359de515c5482a1ab9f89a69bf"; + name = "acorn___acorn_7.4.1.tgz"; + url = "https://registry.yarnpkg.com/acorn/-/acorn-7.4.1.tgz"; + sha1 = "feaed255973d2e77555b83dbc08851a6c63520fa"; }; } { @@ -1842,19 +1970,19 @@ }; } { - name = "aggregate_error___aggregate_error_3.0.1.tgz"; + name = "aggregate_error___aggregate_error_3.1.0.tgz"; path = fetchurl { - name = "aggregate_error___aggregate_error_3.0.1.tgz"; - url = "https://registry.yarnpkg.com/aggregate-error/-/aggregate-error-3.0.1.tgz"; - sha1 = "db2fe7246e536f40d9b5442a39e117d7dd6a24e0"; + name = "aggregate_error___aggregate_error_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/aggregate-error/-/aggregate-error-3.1.0.tgz"; + sha1 = "92670ff50f5359bdb7a3e0d40d0ec30c5737687a"; }; } { - name = "airbnb_prop_types___airbnb_prop_types_2.15.0.tgz"; + name = "airbnb_prop_types___airbnb_prop_types_2.16.0.tgz"; path = fetchurl { - name = "airbnb_prop_types___airbnb_prop_types_2.15.0.tgz"; - url = "https://registry.yarnpkg.com/airbnb-prop-types/-/airbnb-prop-types-2.15.0.tgz"; - sha1 = "5287820043af1eb469f5b0af0d6f70da6c52aaef"; + name = "airbnb_prop_types___airbnb_prop_types_2.16.0.tgz"; + url = "https://registry.yarnpkg.com/airbnb-prop-types/-/airbnb-prop-types-2.16.0.tgz"; + sha1 = "b96274cefa1abb14f623f804173ee97c13971dc2"; }; } { @@ -1866,19 +1994,19 @@ }; } { - name = "ajv_keywords___ajv_keywords_3.4.1.tgz"; + name = "ajv_keywords___ajv_keywords_3.5.2.tgz"; path = fetchurl { - name = "ajv_keywords___ajv_keywords_3.4.1.tgz"; - url = "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.4.1.tgz"; - sha1 = "ef916e271c64ac12171fd8384eaae6b2345854da"; + name = "ajv_keywords___ajv_keywords_3.5.2.tgz"; + url = "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.5.2.tgz"; + sha1 = "31f29da5ab6e00d1c2d329acf7b5929614d5014d"; }; } { - name = "ajv___ajv_6.12.0.tgz"; + name = "ajv___ajv_6.12.5.tgz"; path = fetchurl { - name = "ajv___ajv_6.12.0.tgz"; - url = "https://registry.yarnpkg.com/ajv/-/ajv-6.12.0.tgz"; - sha1 = "06d60b96d87b8454a5adaba86e7854da629db4b7"; + name = "ajv___ajv_6.12.5.tgz"; + url = "https://registry.yarnpkg.com/ajv/-/ajv-6.12.5.tgz"; + sha1 = "19b0e8bae8f476e5ba666300387775fb1a00a4da"; }; } { @@ -1970,11 +2098,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"; }; } { @@ -2017,6 +2145,14 @@ sha1 = "65b3fcc1ca1155a8c9ae64d6eee297f15d5133cc"; }; } + { + name = "aria_query___aria_query_4.2.2.tgz"; + path = fetchurl { + name = "aria_query___aria_query_4.2.2.tgz"; + url = "https://registry.yarnpkg.com/aria-query/-/aria-query-4.2.2.tgz"; + sha1 = "0d2ca6c9aceb56b8977e9fed6aed7e15bbd2f83b"; + }; + } { name = "arity_n___arity_n_1.0.4.tgz"; path = fetchurl { @@ -2081,14 +2217,6 @@ sha1 = "24ef80a28c1a893617e2149b0c6d0d788293b099"; }; } - { - name = "array_from___array_from_2.1.1.tgz"; - path = fetchurl { - name = "array_from___array_from_2.1.1.tgz"; - url = "https://registry.yarnpkg.com/array-from/-/array-from-2.1.1.tgz"; - sha1 = "cfe9d8c26628b9dc5aecc62a9f5d8f1f352c1195"; - }; - } { name = "array_includes___array_includes_3.1.1.tgz"; path = fetchurl { @@ -2137,6 +2265,14 @@ sha1 = "0de82b426b0318dbfdb940089e38b043d37f6c7b"; }; } + { + name = "array.prototype.flatmap___array.prototype.flatmap_1.2.3.tgz"; + path = fetchurl { + name = "array.prototype.flatmap___array.prototype.flatmap_1.2.3.tgz"; + url = "https://registry.yarnpkg.com/array.prototype.flatmap/-/array.prototype.flatmap-1.2.3.tgz"; + sha1 = "1c13f84a178566042dd63de4414440db9222e443"; + }; + } { name = "arrify___arrify_1.0.1.tgz"; path = fetchurl { @@ -2154,11 +2290,11 @@ }; } { - name = "asn1.js___asn1.js_4.10.1.tgz"; + name = "asn1.js___asn1.js_5.4.1.tgz"; path = fetchurl { - name = "asn1.js___asn1.js_4.10.1.tgz"; - url = "https://registry.yarnpkg.com/asn1.js/-/asn1.js-4.10.1.tgz"; - sha1 = "b9c2bf5805f1e64aadeed6df3a2bfafb5a73f5a0"; + name = "asn1.js___asn1.js_5.4.1.tgz"; + url = "https://registry.yarnpkg.com/asn1.js/-/asn1.js-5.4.1.tgz"; + sha1 = "11a980b84ebb91781ce35b0fdc2ee294e3783f07"; }; } { @@ -2258,11 +2394,11 @@ }; } { - name = "autoprefixer___autoprefixer_9.7.4.tgz"; + name = "autoprefixer___autoprefixer_9.8.6.tgz"; path = fetchurl { - name = "autoprefixer___autoprefixer_9.7.4.tgz"; - url = "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-9.7.4.tgz"; - sha1 = "f8bf3e06707d047f0641d87aee8cfb174b2a5378"; + name = "autoprefixer___autoprefixer_9.8.6.tgz"; + url = "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-9.8.6.tgz"; + sha1 = "3b73594ca1bf9266320c5acf1588d74dea74210f"; }; } { @@ -2274,19 +2410,27 @@ }; } { - name = "aws4___aws4_1.9.1.tgz"; + name = "aws4___aws4_1.10.1.tgz"; path = fetchurl { - name = "aws4___aws4_1.9.1.tgz"; - url = "https://registry.yarnpkg.com/aws4/-/aws4-1.9.1.tgz"; - sha1 = "7e33d8f7d449b3f673cd72deb9abdc552dbe528e"; + name = "aws4___aws4_1.10.1.tgz"; + url = "https://registry.yarnpkg.com/aws4/-/aws4-1.10.1.tgz"; + sha1 = "e1e82e4f3e999e2cfd61b161280d16a111f86428"; }; } { - name = "axobject_query___axobject_query_2.1.2.tgz"; + name = "axe_core___axe_core_3.5.5.tgz"; path = fetchurl { - name = "axobject_query___axobject_query_2.1.2.tgz"; - url = "https://registry.yarnpkg.com/axobject-query/-/axobject-query-2.1.2.tgz"; - sha1 = "2bdffc0371e643e5f03ba99065d5179b9ca79799"; + name = "axe_core___axe_core_3.5.5.tgz"; + url = "https://registry.yarnpkg.com/axe-core/-/axe-core-3.5.5.tgz"; + sha1 = "84315073b53fa3c0c51676c588d59da09a192227"; + }; + } + { + name = "axobject_query___axobject_query_2.2.0.tgz"; + path = fetchurl { + name = "axobject_query___axobject_query_2.2.0.tgz"; + url = "https://registry.yarnpkg.com/axobject-query/-/axobject-query-2.2.0.tgz"; + sha1 = "943d47e10c0b704aa42275e20edf3722648989be"; }; } { @@ -2298,11 +2442,11 @@ }; } { - name = "babel_eslint___babel_eslint_10.0.3.tgz"; + name = "babel_eslint___babel_eslint_10.1.0.tgz"; path = fetchurl { - name = "babel_eslint___babel_eslint_10.0.3.tgz"; - url = "https://registry.yarnpkg.com/babel-eslint/-/babel-eslint-10.0.3.tgz"; - sha1 = "81a2c669be0f205e19462fed2482d33e4687a88a"; + name = "babel_eslint___babel_eslint_10.1.0.tgz"; + url = "https://registry.yarnpkg.com/babel-eslint/-/babel-eslint-10.1.0.tgz"; + sha1 = "6968e568a910b78fb3779cdd8b6ac2f479943232"; }; } { @@ -2322,19 +2466,19 @@ }; } { - name = "babel_loader___babel_loader_8.0.6.tgz"; + name = "babel_loader___babel_loader_8.1.0.tgz"; path = fetchurl { - name = "babel_loader___babel_loader_8.0.6.tgz"; - url = "https://registry.yarnpkg.com/babel-loader/-/babel-loader-8.0.6.tgz"; - sha1 = "e33bdb6f362b03f4bb141a0c21ab87c501b70dfb"; + name = "babel_loader___babel_loader_8.1.0.tgz"; + url = "https://registry.yarnpkg.com/babel-loader/-/babel-loader-8.1.0.tgz"; + sha1 = "c611d5112bd5209abe8b9fa84c3e4da25275f1c3"; }; } { - name = "babel_plugin_dynamic_import_node___babel_plugin_dynamic_import_node_2.3.0.tgz"; + name = "babel_plugin_dynamic_import_node___babel_plugin_dynamic_import_node_2.3.3.tgz"; path = fetchurl { - name = "babel_plugin_dynamic_import_node___babel_plugin_dynamic_import_node_2.3.0.tgz"; - url = "https://registry.yarnpkg.com/babel-plugin-dynamic-import-node/-/babel-plugin-dynamic-import-node-2.3.0.tgz"; - sha1 = "f00f507bdaa3c3e3ff6e7e5e98d90a7acab96f7f"; + name = "babel_plugin_dynamic_import_node___babel_plugin_dynamic_import_node_2.3.3.tgz"; + url = "https://registry.yarnpkg.com/babel-plugin-dynamic-import-node/-/babel-plugin-dynamic-import-node-2.3.3.tgz"; + sha1 = "84fda19c976ec5c6defef57f9427b3def66e17a3"; }; } { @@ -2482,11 +2626,11 @@ }; } { - name = "binary_extensions___binary_extensions_2.0.0.tgz"; + name = "binary_extensions___binary_extensions_2.1.0.tgz"; path = fetchurl { - name = "binary_extensions___binary_extensions_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-2.0.0.tgz"; - sha1 = "23c0df14f6a88077f5f986c0d167ec03c3d5537c"; + name = "binary_extensions___binary_extensions_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/binary-extensions/-/binary-extensions-2.1.0.tgz"; + sha1 = "30fa40c9e7fe07dbc895678cd287024dea241dd9"; }; } { @@ -2506,11 +2650,19 @@ }; } { - name = "bn.js___bn.js_4.11.8.tgz"; + name = "bn.js___bn.js_4.11.9.tgz"; path = fetchurl { - name = "bn.js___bn.js_4.11.8.tgz"; - url = "https://registry.yarnpkg.com/bn.js/-/bn.js-4.11.8.tgz"; - sha1 = "2cde09eb5ee341f484746bb0309b3253b1b1442f"; + name = "bn.js___bn.js_4.11.9.tgz"; + url = "https://registry.yarnpkg.com/bn.js/-/bn.js-4.11.9.tgz"; + sha1 = "26d556829458f9d1e81fc48952493d0ba3507828"; + }; + } + { + name = "bn.js___bn.js_5.1.3.tgz"; + path = fetchurl { + name = "bn.js___bn.js_5.1.3.tgz"; + url = "https://registry.yarnpkg.com/bn.js/-/bn.js-5.1.3.tgz"; + sha1 = "beca005408f642ebebea80b042b4d18d2ac0ee6b"; }; } { @@ -2538,11 +2690,11 @@ }; } { - name = "bootstrap___bootstrap_4.4.1.tgz"; + name = "bootstrap___bootstrap_4.5.2.tgz"; path = fetchurl { - name = "bootstrap___bootstrap_4.4.1.tgz"; - url = "https://registry.yarnpkg.com/bootstrap/-/bootstrap-4.4.1.tgz"; - sha1 = "8582960eea0c5cd2bede84d8b0baf3789c3e8b01"; + name = "bootstrap___bootstrap_4.5.2.tgz"; + url = "https://registry.yarnpkg.com/bootstrap/-/bootstrap-4.5.2.tgz"; + sha1 = "a85c4eda59155f0d71186b6e6ad9b875813779ab"; }; } { @@ -2626,11 +2778,11 @@ }; } { - name = "browserify_sign___browserify_sign_4.0.4.tgz"; + name = "browserify_sign___browserify_sign_4.2.1.tgz"; path = fetchurl { - name = "browserify_sign___browserify_sign_4.0.4.tgz"; - url = "https://registry.yarnpkg.com/browserify-sign/-/browserify-sign-4.0.4.tgz"; - sha1 = "aa4eb68e5d7b658baa6bf6a57e630cbd7a93d298"; + name = "browserify_sign___browserify_sign_4.2.1.tgz"; + url = "https://registry.yarnpkg.com/browserify-sign/-/browserify-sign-4.2.1.tgz"; + sha1 = "eaf4add46dd54be3bb3b36c0cf15abbeba7956c3"; }; } { @@ -2649,6 +2801,14 @@ sha1 = "f179737913eaf0d2b98e4926ac1ca6a15cbcc6a9"; }; } + { + name = "browserslist___browserslist_4.14.5.tgz"; + path = fetchurl { + name = "browserslist___browserslist_4.14.5.tgz"; + url = "https://registry.yarnpkg.com/browserslist/-/browserslist-4.14.5.tgz"; + sha1 = "1c751461a102ddc60e40993639b709be7f2c4015"; + }; + } { name = "bser___bser_2.1.1.tgz"; path = fetchurl { @@ -2714,11 +2874,11 @@ }; } { - name = "cacache___cacache_12.0.3.tgz"; + name = "cacache___cacache_12.0.4.tgz"; path = fetchurl { - name = "cacache___cacache_12.0.3.tgz"; - url = "https://registry.yarnpkg.com/cacache/-/cacache-12.0.3.tgz"; - sha1 = "be99abba4e1bf5df461cd5a2c1071fc432573390"; + name = "cacache___cacache_12.0.4.tgz"; + url = "https://registry.yarnpkg.com/cacache/-/cacache-12.0.4.tgz"; + sha1 = "668bcbd105aeb5f1d92fe25570ec9525c8faa40c"; }; } { @@ -2810,11 +2970,11 @@ }; } { - name = "caniuse_lite___caniuse_lite_1.0.30001035.tgz"; + name = "caniuse_lite___caniuse_lite_1.0.30001146.tgz"; path = fetchurl { - name = "caniuse_lite___caniuse_lite_1.0.30001035.tgz"; - url = "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001035.tgz"; - sha1 = "2bb53b8aa4716b2ed08e088d4dc816a5fe089a1e"; + name = "caniuse_lite___caniuse_lite_1.0.30001146.tgz"; + url = "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001146.tgz"; + sha1 = "c61fcb1474520c1462913689201fb292ba6f447c"; }; } { @@ -2865,6 +3025,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 = "chardet___chardet_0.7.0.tgz"; path = fetchurl { @@ -2890,11 +3058,11 @@ }; } { - name = "chokidar___chokidar_3.3.1.tgz"; + name = "chokidar___chokidar_3.4.2.tgz"; path = fetchurl { - name = "chokidar___chokidar_3.3.1.tgz"; - url = "https://registry.yarnpkg.com/chokidar/-/chokidar-3.3.1.tgz"; - sha1 = "c84e5b3d18d9a4d77558fef466b1bf16bbeb3450"; + name = "chokidar___chokidar_3.4.2.tgz"; + url = "https://registry.yarnpkg.com/chokidar/-/chokidar-3.4.2.tgz"; + sha1 = "38dc8e658dec3809741eb3ef7bb0a47fe424232d"; }; } { @@ -2970,19 +3138,19 @@ }; } { - name = "cli_width___cli_width_2.2.0.tgz"; + name = "cli_width___cli_width_2.2.1.tgz"; path = fetchurl { - name = "cli_width___cli_width_2.2.0.tgz"; - url = "https://registry.yarnpkg.com/cli-width/-/cli-width-2.2.0.tgz"; - sha1 = "ff19ede8a9a5e579324147b0c11f0fbcbabed639"; + name = "cli_width___cli_width_2.2.1.tgz"; + url = "https://registry.yarnpkg.com/cli-width/-/cli-width-2.2.1.tgz"; + sha1 = "b0433d0b4e9c847ef18868a4ef16fd5fc8271c48"; }; } { - name = "cliui___cliui_4.1.0.tgz"; + name = "cli_width___cli_width_3.0.0.tgz"; path = fetchurl { - name = "cliui___cliui_4.1.0.tgz"; - url = "https://registry.yarnpkg.com/cliui/-/cliui-4.1.0.tgz"; - sha1 = "348422dbe82d800b3022eef4f6ac10bf2e4d1b49"; + name = "cli_width___cli_width_3.0.0.tgz"; + url = "https://registry.yarnpkg.com/cli-width/-/cli-width-3.0.0.tgz"; + sha1 = "a2f48437a2caa9a22436e794bf071ec9e61cedf6"; }; } { @@ -3025,14 +3193,6 @@ sha1 = "43f6c21151b4ef2bf57187db0d73de229e3e7ec3"; }; } - { - name = "code_point_at___code_point_at_1.1.0.tgz"; - path = fetchurl { - name = "code_point_at___code_point_at_1.1.0.tgz"; - url = "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz"; - sha1 = "0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77"; - }; - } { name = "collection_visit___collection_visit_1.0.0.tgz"; path = fetchurl { @@ -3089,6 +3249,14 @@ sha1 = "68148e7f85d41ad7649c5fa8c8106f098d229e10"; }; } + { + name = "colorette___colorette_1.2.1.tgz"; + path = fetchurl { + name = "colorette___colorette_1.2.1.tgz"; + url = "https://registry.yarnpkg.com/colorette/-/colorette-1.2.1.tgz"; + sha1 = "4d0b921325c14faf92633086a536db6e89564b1b"; + }; + } { name = "combined_stream___combined_stream_1.0.8.tgz"; path = fetchurl { @@ -3162,11 +3330,11 @@ }; } { - name = "compute_scroll_into_view___compute_scroll_into_view_1.0.13.tgz"; + name = "compute_scroll_into_view___compute_scroll_into_view_1.0.16.tgz"; path = fetchurl { - name = "compute_scroll_into_view___compute_scroll_into_view_1.0.13.tgz"; - url = "https://registry.yarnpkg.com/compute-scroll-into-view/-/compute-scroll-into-view-1.0.13.tgz"; - sha1 = "be1b1663b0e3f56cd5f7713082549f562a3477e2"; + name = "compute_scroll_into_view___compute_scroll_into_view_1.0.16.tgz"; + url = "https://registry.yarnpkg.com/compute-scroll-into-view/-/compute-scroll-into-view-1.0.16.tgz"; + sha1 = "5b7bf4f7127ea2c19b750353d7ce6776a90ee088"; }; } { @@ -3298,19 +3466,19 @@ }; } { - name = "core_js_compat___core_js_compat_3.6.4.tgz"; + name = "core_js_compat___core_js_compat_3.6.5.tgz"; path = fetchurl { - name = "core_js_compat___core_js_compat_3.6.4.tgz"; - url = "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.6.4.tgz"; - sha1 = "938476569ebb6cda80d339bcf199fae4f16fff17"; + name = "core_js_compat___core_js_compat_3.6.5.tgz"; + url = "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.6.5.tgz"; + sha1 = "2a51d9a4e25dfd6e690251aa81f99e3c05481f1c"; }; } { - name = "core_js_pure___core_js_pure_3.6.4.tgz"; + name = "core_js_pure___core_js_pure_3.6.5.tgz"; path = fetchurl { - name = "core_js_pure___core_js_pure_3.6.4.tgz"; - url = "https://registry.yarnpkg.com/core-js-pure/-/core-js-pure-3.6.4.tgz"; - sha1 = "4bf1ba866e25814f149d4e9aaa08c36173506e3a"; + name = "core_js_pure___core_js_pure_3.6.5.tgz"; + url = "https://registry.yarnpkg.com/core-js-pure/-/core-js-pure-3.6.5.tgz"; + sha1 = "c79e75f5e38dbc85a662d91eea52b8256d53b813"; }; } { @@ -3322,11 +3490,11 @@ }; } { - name = "core_js___core_js_3.6.4.tgz"; + name = "core_js___core_js_3.6.5.tgz"; path = fetchurl { - name = "core_js___core_js_3.6.4.tgz"; - url = "https://registry.yarnpkg.com/core-js/-/core-js-3.6.4.tgz"; - sha1 = "440a83536b458114b9cb2ac1580ba377dc470647"; + name = "core_js___core_js_3.6.5.tgz"; + url = "https://registry.yarnpkg.com/core-js/-/core-js-3.6.5.tgz"; + sha1 = "7395dc273af37fb2e50e9bd3d9fe841285231d1a"; }; } { @@ -3354,11 +3522,11 @@ }; } { - name = "create_ecdh___create_ecdh_4.0.3.tgz"; + name = "create_ecdh___create_ecdh_4.0.4.tgz"; path = fetchurl { - name = "create_ecdh___create_ecdh_4.0.3.tgz"; - url = "https://registry.yarnpkg.com/create-ecdh/-/create-ecdh-4.0.3.tgz"; - sha1 = "c9111b6f33045c4697f144787f9254cdc77c45ff"; + name = "create_ecdh___create_ecdh_4.0.4.tgz"; + url = "https://registry.yarnpkg.com/create-ecdh/-/create-ecdh-4.0.4.tgz"; + sha1 = "d6e7f4bffa66736085a0762fd3a632684dabcc4e"; }; } { @@ -3386,11 +3554,11 @@ }; } { - name = "cross_fetch___cross_fetch_2.2.3.tgz"; + name = "cross_fetch___cross_fetch_3.0.6.tgz"; path = fetchurl { - name = "cross_fetch___cross_fetch_2.2.3.tgz"; - url = "https://registry.yarnpkg.com/cross-fetch/-/cross-fetch-2.2.3.tgz"; - sha1 = "e8a0b3c54598136e037f8650f8e823ccdfac198e"; + name = "cross_fetch___cross_fetch_3.0.6.tgz"; + url = "https://registry.yarnpkg.com/cross-fetch/-/cross-fetch-3.0.6.tgz"; + sha1 = "3a4040bc8941e653e0e9cf17f29ebcd177d3365c"; }; } { @@ -3497,6 +3665,14 @@ sha1 = "98bebd62c4c1d9f960ec340cf9f7522e30709a22"; }; } + { + name = "css_tree___css_tree_1.0.0_alpha.39.tgz"; + path = fetchurl { + name = "css_tree___css_tree_1.0.0_alpha.39.tgz"; + url = "https://registry.yarnpkg.com/css-tree/-/css-tree-1.0.0-alpha.39.tgz"; + sha1 = "2bff3ffe1bb3f776cf7eefd91ee5cba77a149eeb"; + }; + } { name = "css_what___css_what_2.1.3.tgz"; path = fetchurl { @@ -3506,11 +3682,11 @@ }; } { - name = "css_what___css_what_3.2.1.tgz"; + name = "css_what___css_what_3.4.1.tgz"; path = fetchurl { - name = "css_what___css_what_3.2.1.tgz"; - url = "https://registry.yarnpkg.com/css-what/-/css-what-3.2.1.tgz"; - sha1 = "f4a8f12421064621b456755e34a03a2c22df5da1"; + name = "css_what___css_what_3.4.1.tgz"; + url = "https://registry.yarnpkg.com/css-what/-/css-what-3.4.1.tgz"; + sha1 = "81cb70b609e4b1351b1e54cbc90fd9c54af86e2e"; }; } { @@ -3602,11 +3778,11 @@ }; } { - name = "csso___csso_4.0.2.tgz"; + name = "csso___csso_4.0.3.tgz"; path = fetchurl { - name = "csso___csso_4.0.2.tgz"; - url = "https://registry.yarnpkg.com/csso/-/csso-4.0.2.tgz"; - sha1 = "e5f81ab3a56b8eefb7f0092ce7279329f454de3d"; + name = "csso___csso_4.0.3.tgz"; + url = "https://registry.yarnpkg.com/csso/-/csso-4.0.3.tgz"; + sha1 = "0d9985dc852c7cc2b2cacfbbe1079014d1a8e903"; }; } { @@ -3634,19 +3810,19 @@ }; } { - name = "cssstyle___cssstyle_2.2.0.tgz"; + name = "cssstyle___cssstyle_2.3.0.tgz"; path = fetchurl { - name = "cssstyle___cssstyle_2.2.0.tgz"; - url = "https://registry.yarnpkg.com/cssstyle/-/cssstyle-2.2.0.tgz"; - sha1 = "e4c44debccd6b7911ed617a4395e5754bba59992"; + name = "cssstyle___cssstyle_2.3.0.tgz"; + url = "https://registry.yarnpkg.com/cssstyle/-/cssstyle-2.3.0.tgz"; + sha1 = "ff665a0ddbdc31864b09647f34163443d90b0852"; }; } { - name = "csstype___csstype_2.6.9.tgz"; + name = "csstype___csstype_3.0.3.tgz"; path = fetchurl { - name = "csstype___csstype_2.6.9.tgz"; - url = "https://registry.yarnpkg.com/csstype/-/csstype-2.6.9.tgz"; - sha1 = "05141d0cd557a56b8891394c1911c40c8a98d098"; + name = "csstype___csstype_3.0.3.tgz"; + url = "https://registry.yarnpkg.com/csstype/-/csstype-3.0.3.tgz"; + sha1 = "2b410bbeba38ba9633353aff34b05d9755d065f8"; }; } { @@ -3689,6 +3865,14 @@ sha1 = "15ee0582baa5e22bb59c77140da8f9c76963bbfe"; }; } + { + name = "data_urls___data_urls_2.0.0.tgz"; + path = fetchurl { + name = "data_urls___data_urls_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/data-urls/-/data-urls-2.0.0.tgz"; + sha1 = "156485a72963a970f5d5821aaf642bef2bf2db9b"; + }; + } { name = "debug___debug_2.6.9.tgz"; path = fetchurl { @@ -3706,11 +3890,11 @@ }; } { - name = "debug___debug_4.1.1.tgz"; + name = "debug___debug_4.2.0.tgz"; path = fetchurl { - name = "debug___debug_4.1.1.tgz"; - url = "https://registry.yarnpkg.com/debug/-/debug-4.1.1.tgz"; - sha1 = "3b72260255109c6b589cee050f1d516139664791"; + name = "debug___debug_4.2.0.tgz"; + url = "https://registry.yarnpkg.com/debug/-/debug-4.2.0.tgz"; + sha1 = "7f150f93920e94c58f5574c2fd01a3110effe7f1"; }; } { @@ -3721,6 +3905,14 @@ sha1 = "f6534d15148269b20352e7bee26f501f9a191290"; }; } + { + name = "decimal.js___decimal.js_10.2.1.tgz"; + path = fetchurl { + name = "decimal.js___decimal.js_10.2.1.tgz"; + url = "https://registry.yarnpkg.com/decimal.js/-/decimal.js-10.2.1.tgz"; + sha1 = "238ae7b0f0c793d3e3cea410108b35a2c01426a3"; + }; + } { name = "decode_uri_component___decode_uri_component_0.2.0.tgz"; path = fetchurl { @@ -3858,11 +4050,19 @@ }; } { - name = "diff___diff_3.5.0.tgz"; + name = "diff_sequences___diff_sequences_25.2.6.tgz"; path = fetchurl { - name = "diff___diff_3.5.0.tgz"; - url = "https://registry.yarnpkg.com/diff/-/diff-3.5.0.tgz"; - sha1 = "800c0dd1e0a8bfbc95835c202ad220fe317e5a12"; + name = "diff_sequences___diff_sequences_25.2.6.tgz"; + url = "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-25.2.6.tgz"; + sha1 = "5f467c00edd35352b7bca46d7927d60e687a76dd"; + }; + } + { + 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"; }; } { @@ -3961,6 +4161,14 @@ sha1 = "1afb81f533717175d478655debc5e332d9f9bb51"; }; } + { + name = "dom_serializer___dom_serializer_1.1.0.tgz"; + path = fetchurl { + name = "dom_serializer___dom_serializer_1.1.0.tgz"; + url = "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-1.1.0.tgz"; + sha1 = "5f7c828f1bfc44887dc2a315ab5c45691d544b58"; + }; + } { name = "dom_serializer___dom_serializer_0.1.1.tgz"; path = fetchurl { @@ -3986,11 +4194,11 @@ }; } { - name = "domelementtype___domelementtype_2.0.1.tgz"; + name = "domelementtype___domelementtype_2.0.2.tgz"; path = fetchurl { - name = "domelementtype___domelementtype_2.0.1.tgz"; - url = "https://registry.yarnpkg.com/domelementtype/-/domelementtype-2.0.1.tgz"; - sha1 = "1f8bdfe91f5a78063274e803b4bdcedf6e94f94d"; + name = "domelementtype___domelementtype_2.0.2.tgz"; + url = "https://registry.yarnpkg.com/domelementtype/-/domelementtype-2.0.2.tgz"; + sha1 = "f3b6e549201e46f588b59463dd77187131fe6971"; }; } { @@ -4001,6 +4209,14 @@ sha1 = "937442644ca6a31261ef36e3ec677fe805582c90"; }; } + { + name = "domexception___domexception_2.0.1.tgz"; + path = fetchurl { + name = "domexception___domexception_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/domexception/-/domexception-2.0.1.tgz"; + sha1 = "fb44aefba793e1574b0af6aed2801d057529f304"; + }; + } { name = "domhandler___domhandler_2.4.2.tgz"; path = fetchurl { @@ -4010,11 +4226,11 @@ }; } { - name = "domhandler___domhandler_3.0.0.tgz"; + name = "domhandler___domhandler_3.3.0.tgz"; path = fetchurl { - name = "domhandler___domhandler_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/domhandler/-/domhandler-3.0.0.tgz"; - sha1 = "51cd13efca31da95bbb0c5bee3a48300e333b3e9"; + name = "domhandler___domhandler_3.3.0.tgz"; + url = "https://registry.yarnpkg.com/domhandler/-/domhandler-3.3.0.tgz"; + sha1 = "6db7ea46e4617eb15cf875df68b2b8524ce0037a"; }; } { @@ -4034,11 +4250,11 @@ }; } { - name = "domutils___domutils_2.0.0.tgz"; + name = "domutils___domutils_2.4.2.tgz"; path = fetchurl { - name = "domutils___domutils_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/domutils/-/domutils-2.0.0.tgz"; - sha1 = "15b8278e37bfa8468d157478c58c367718133c08"; + name = "domutils___domutils_2.4.2.tgz"; + url = "https://registry.yarnpkg.com/domutils/-/domutils-2.4.2.tgz"; + sha1 = "7ee5be261944e1ad487d9aa0616720010123922b"; }; } { @@ -4050,11 +4266,11 @@ }; } { - name = "dot_prop___dot_prop_5.2.0.tgz"; + name = "dot_prop___dot_prop_5.3.0.tgz"; path = fetchurl { - name = "dot_prop___dot_prop_5.2.0.tgz"; - url = "https://registry.yarnpkg.com/dot-prop/-/dot-prop-5.2.0.tgz"; - sha1 = "c34ecc29556dc45f1f4c22697b6f4904e0cc4fcb"; + name = "dot_prop___dot_prop_5.3.0.tgz"; + url = "https://registry.yarnpkg.com/dot-prop/-/dot-prop-5.3.0.tgz"; + sha1 = "90ccce708cd9cd82cc4dc8c3ddd9abdd55b20e88"; }; } { @@ -4082,11 +4298,11 @@ }; } { - name = "duplexer___duplexer_0.1.1.tgz"; + name = "duplexer___duplexer_0.1.2.tgz"; path = fetchurl { - name = "duplexer___duplexer_0.1.1.tgz"; - url = "https://registry.yarnpkg.com/duplexer/-/duplexer-0.1.1.tgz"; - sha1 = "ace6ff808c1ce66b57d1ebf97977acb02334cfc1"; + name = "duplexer___duplexer_0.1.2.tgz"; + url = "https://registry.yarnpkg.com/duplexer/-/duplexer-0.1.2.tgz"; + sha1 = "3abe43aef3835f8ae077d136ddce0f276b0400e6"; }; } { @@ -4114,11 +4330,11 @@ }; } { - name = "electron_to_chromium___electron_to_chromium_1.3.380.tgz"; + name = "electron_to_chromium___electron_to_chromium_1.3.578.tgz"; path = fetchurl { - name = "electron_to_chromium___electron_to_chromium_1.3.380.tgz"; - url = "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.380.tgz"; - sha1 = "1e1f07091b42b54bccd0ad6d3a14f2b73b60dc9d"; + name = "electron_to_chromium___electron_to_chromium_1.3.578.tgz"; + url = "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.578.tgz"; + sha1 = "e6671936f4571a874eb26e2e833aa0b2c0b776e0"; }; } { @@ -4145,6 +4361,14 @@ sha1 = "e818fd69ce5ccfcb404594f842963bf53164cc37"; }; } + { + name = "emoji_regex___emoji_regex_9.0.0.tgz"; + path = fetchurl { + name = "emoji_regex___emoji_regex_9.0.0.tgz"; + url = "https://registry.yarnpkg.com/emoji-regex/-/emoji-regex-9.0.0.tgz"; + sha1 = "48a2309cc8a1d2e9d23bc6a67c39b63032e76ea4"; + }; + } { name = "emojis_list___emojis_list_2.1.0.tgz"; path = fetchurl { @@ -4178,11 +4402,11 @@ }; } { - name = "enhanced_resolve___enhanced_resolve_4.1.1.tgz"; + name = "enhanced_resolve___enhanced_resolve_4.3.0.tgz"; path = fetchurl { - name = "enhanced_resolve___enhanced_resolve_4.1.1.tgz"; - url = "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-4.1.1.tgz"; - sha1 = "2937e2b8066cd0fe7ce0990a98f0d71a35189f66"; + name = "enhanced_resolve___enhanced_resolve_4.3.0.tgz"; + url = "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-4.3.0.tgz"; + sha1 = "3b806f3bfafc1ec7de69551ef93cca46c1704126"; }; } { @@ -4194,43 +4418,43 @@ }; } { - name = "entities___entities_2.0.0.tgz"; + name = "entities___entities_2.0.3.tgz"; path = fetchurl { - name = "entities___entities_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/entities/-/entities-2.0.0.tgz"; - sha1 = "68d6084cab1b079767540d80e56a39b423e4abf4"; + name = "entities___entities_2.0.3.tgz"; + url = "https://registry.yarnpkg.com/entities/-/entities-2.0.3.tgz"; + sha1 = "5c487e5742ab93c15abb5da22759b8590ec03b7f"; }; } { - name = "enzyme_adapter_react_16___enzyme_adapter_react_16_1.15.2.tgz"; + name = "enzyme_adapter_react_16___enzyme_adapter_react_16_1.15.5.tgz"; path = fetchurl { - name = "enzyme_adapter_react_16___enzyme_adapter_react_16_1.15.2.tgz"; - url = "https://registry.yarnpkg.com/enzyme-adapter-react-16/-/enzyme-adapter-react-16-1.15.2.tgz"; - sha1 = "b16db2f0ea424d58a808f9df86ab6212895a4501"; + name = "enzyme_adapter_react_16___enzyme_adapter_react_16_1.15.5.tgz"; + url = "https://registry.yarnpkg.com/enzyme-adapter-react-16/-/enzyme-adapter-react-16-1.15.5.tgz"; + sha1 = "7a6f0093d3edd2f7025b36e7fbf290695473ee04"; }; } { - name = "enzyme_adapter_utils___enzyme_adapter_utils_1.13.0.tgz"; + name = "enzyme_adapter_utils___enzyme_adapter_utils_1.13.1.tgz"; path = fetchurl { - name = "enzyme_adapter_utils___enzyme_adapter_utils_1.13.0.tgz"; - url = "https://registry.yarnpkg.com/enzyme-adapter-utils/-/enzyme-adapter-utils-1.13.0.tgz"; - sha1 = "01c885dde2114b4690bf741f8dc94cee3060eb78"; + name = "enzyme_adapter_utils___enzyme_adapter_utils_1.13.1.tgz"; + url = "https://registry.yarnpkg.com/enzyme-adapter-utils/-/enzyme-adapter-utils-1.13.1.tgz"; + sha1 = "59c1b734b0927543e3d8dc477299ec957feb312d"; }; } { - name = "enzyme_shallow_equal___enzyme_shallow_equal_1.0.1.tgz"; + name = "enzyme_shallow_equal___enzyme_shallow_equal_1.0.4.tgz"; path = fetchurl { - name = "enzyme_shallow_equal___enzyme_shallow_equal_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/enzyme-shallow-equal/-/enzyme-shallow-equal-1.0.1.tgz"; - sha1 = "7afe03db3801c9b76de8440694096412a8d9d49e"; + name = "enzyme_shallow_equal___enzyme_shallow_equal_1.0.4.tgz"; + url = "https://registry.yarnpkg.com/enzyme-shallow-equal/-/enzyme-shallow-equal-1.0.4.tgz"; + sha1 = "b9256cb25a5f430f9bfe073a84808c1d74fced2e"; }; } { - name = "enzyme_to_json___enzyme_to_json_3.4.4.tgz"; + name = "enzyme_to_json___enzyme_to_json_3.6.1.tgz"; path = fetchurl { - name = "enzyme_to_json___enzyme_to_json_3.4.4.tgz"; - url = "https://registry.yarnpkg.com/enzyme-to-json/-/enzyme-to-json-3.4.4.tgz"; - sha1 = "b30726c59091d273521b6568c859e8831e94d00e"; + name = "enzyme_to_json___enzyme_to_json_3.6.1.tgz"; + url = "https://registry.yarnpkg.com/enzyme-to-json/-/enzyme-to-json-3.6.1.tgz"; + sha1 = "d60740950bc7ca6384dfe6fe405494ec5df996bc"; }; } { @@ -4258,11 +4482,19 @@ }; } { - name = "es_abstract___es_abstract_1.17.4.tgz"; + name = "es_abstract___es_abstract_1.17.7.tgz"; path = fetchurl { - name = "es_abstract___es_abstract_1.17.4.tgz"; - url = "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.17.4.tgz"; - sha1 = "e3aedf19706b20e7c2594c35fc0d57605a79e184"; + name = "es_abstract___es_abstract_1.17.7.tgz"; + url = "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.17.7.tgz"; + sha1 = "a4de61b2f66989fc7421676c1cb9787573ace54c"; + }; + } + { + name = "es_abstract___es_abstract_1.18.0_next.1.tgz"; + path = fetchurl { + name = "es_abstract___es_abstract_1.18.0_next.1.tgz"; + url = "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.18.0-next.1.tgz"; + sha1 = "6e3a0a4bda717e5023ab3b8e90bec36108d22c68"; }; } { @@ -4297,6 +4529,14 @@ sha1 = "bad5d3c1bcdac28269f4cb331e431c78ac705d18"; }; } + { + name = "escalade___escalade_3.1.0.tgz"; + path = fetchurl { + name = "escalade___escalade_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/escalade/-/escalade-3.1.0.tgz"; + sha1 = "e8e2d7c7a8b76f6ee64c2181d6b8151441602d4e"; + }; + } { name = "escape_html___escape_html_1.0.3.tgz"; path = fetchurl { @@ -4322,19 +4562,19 @@ }; } { - name = "escodegen___escodegen_1.14.1.tgz"; + name = "escodegen___escodegen_1.14.3.tgz"; path = fetchurl { - name = "escodegen___escodegen_1.14.1.tgz"; - url = "https://registry.yarnpkg.com/escodegen/-/escodegen-1.14.1.tgz"; - sha1 = "ba01d0c8278b5e95a9a45350142026659027a457"; + name = "escodegen___escodegen_1.14.3.tgz"; + url = "https://registry.yarnpkg.com/escodegen/-/escodegen-1.14.3.tgz"; + sha1 = "4e7b81fba61581dc97582ed78cab7f0e8d63f503"; }; } { - name = "eslint_config_prettier___eslint_config_prettier_6.10.0.tgz"; + name = "eslint_config_prettier___eslint_config_prettier_6.12.0.tgz"; path = fetchurl { - name = "eslint_config_prettier___eslint_config_prettier_6.10.0.tgz"; - url = "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-6.10.0.tgz"; - sha1 = "7b15e303bf9c956875c948f6b21500e48ded6a7f"; + name = "eslint_config_prettier___eslint_config_prettier_6.12.0.tgz"; + url = "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-6.12.0.tgz"; + sha1 = "9eb2bccff727db1c52104f0b49e87ea46605a0d2"; }; } { @@ -4346,11 +4586,11 @@ }; } { - name = "eslint_import_resolver_node___eslint_import_resolver_node_0.3.3.tgz"; + name = "eslint_import_resolver_node___eslint_import_resolver_node_0.3.4.tgz"; path = fetchurl { - name = "eslint_import_resolver_node___eslint_import_resolver_node_0.3.3.tgz"; - url = "https://registry.yarnpkg.com/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.3.tgz"; - sha1 = "dbaa52b6b2816b50bc6711af75422de808e98404"; + name = "eslint_import_resolver_node___eslint_import_resolver_node_0.3.4.tgz"; + url = "https://registry.yarnpkg.com/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.4.tgz"; + sha1 = "85ffa81942c25012d8231096ddf679c03042c717"; }; } { @@ -4362,19 +4602,11 @@ }; } { - name = "eslint_module_utils___eslint_module_utils_2.5.2.tgz"; + name = "eslint_module_utils___eslint_module_utils_2.6.0.tgz"; path = fetchurl { - name = "eslint_module_utils___eslint_module_utils_2.5.2.tgz"; - url = "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.5.2.tgz"; - sha1 = "7878f7504824e1b857dd2505b59a8e5eda26a708"; - }; - } - { - name = "eslint_plugin_flowtype___eslint_plugin_flowtype_3.13.0.tgz"; - path = fetchurl { - name = "eslint_plugin_flowtype___eslint_plugin_flowtype_3.13.0.tgz"; - url = "https://registry.yarnpkg.com/eslint-plugin-flowtype/-/eslint-plugin-flowtype-3.13.0.tgz"; - sha1 = "e241ebd39c0ce519345a3f074ec1ebde4cf80f2c"; + name = "eslint_module_utils___eslint_module_utils_2.6.0.tgz"; + url = "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.6.0.tgz"; + sha1 = "579ebd094f56af7797d19c9866c9c9486629bfa6"; }; } { @@ -4386,11 +4618,11 @@ }; } { - name = "eslint_plugin_import___eslint_plugin_import_2.20.0.tgz"; + name = "eslint_plugin_flowtype___eslint_plugin_flowtype_4.7.0.tgz"; path = fetchurl { - name = "eslint_plugin_import___eslint_plugin_import_2.20.0.tgz"; - url = "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.20.0.tgz"; - sha1 = "d749a7263fb6c29980def8e960d380a6aa6aecaa"; + name = "eslint_plugin_flowtype___eslint_plugin_flowtype_4.7.0.tgz"; + url = "https://registry.yarnpkg.com/eslint-plugin-flowtype/-/eslint-plugin-flowtype-4.7.0.tgz"; + sha1 = "903a6ea3eb5cbf4c7ba7fa73cc43fc39ab7e4a70"; }; } { @@ -4401,6 +4633,14 @@ sha1 = "802423196dcb11d9ce8435a5fc02a6d3b46939b3"; }; } + { + name = "eslint_plugin_import___eslint_plugin_import_2.22.1.tgz"; + path = fetchurl { + name = "eslint_plugin_import___eslint_plugin_import_2.22.1.tgz"; + url = "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.22.1.tgz"; + sha1 = "0896c7e6a0cf44109a2d97b95903c2bb689d7702"; + }; + } { name = "eslint_plugin_jsx_a11y___eslint_plugin_jsx_a11y_6.2.3.tgz"; path = fetchurl { @@ -4410,11 +4650,27 @@ }; } { - name = "eslint_plugin_prettier___eslint_plugin_prettier_3.1.2.tgz"; + name = "eslint_plugin_jsx_a11y___eslint_plugin_jsx_a11y_6.3.1.tgz"; path = fetchurl { - name = "eslint_plugin_prettier___eslint_plugin_prettier_3.1.2.tgz"; - url = "https://registry.yarnpkg.com/eslint-plugin-prettier/-/eslint-plugin-prettier-3.1.2.tgz"; - sha1 = "432e5a667666ab84ce72f945c72f77d996a5c9ba"; + name = "eslint_plugin_jsx_a11y___eslint_plugin_jsx_a11y_6.3.1.tgz"; + url = "https://registry.yarnpkg.com/eslint-plugin-jsx-a11y/-/eslint-plugin-jsx-a11y-6.3.1.tgz"; + sha1 = "99ef7e97f567cc6a5b8dd5ab95a94a67058a2660"; + }; + } + { + name = "eslint_plugin_prettier___eslint_plugin_prettier_3.1.4.tgz"; + path = fetchurl { + name = "eslint_plugin_prettier___eslint_plugin_prettier_3.1.4.tgz"; + url = "https://registry.yarnpkg.com/eslint-plugin-prettier/-/eslint-plugin-prettier-3.1.4.tgz"; + sha1 = "168ab43154e2ea57db992a2cd097c828171f75c2"; + }; + } + { + name = "eslint_plugin_react_hooks___eslint_plugin_react_hooks_2.5.1.tgz"; + path = fetchurl { + name = "eslint_plugin_react_hooks___eslint_plugin_react_hooks_2.5.1.tgz"; + url = "https://registry.yarnpkg.com/eslint-plugin-react-hooks/-/eslint-plugin-react-hooks-2.5.1.tgz"; + sha1 = "4ef5930592588ce171abeb26f400c7fbcbc23cd0"; }; } { @@ -4425,14 +4681,6 @@ sha1 = "6210b6d5a37205f0b92858f895a4e827020a7d04"; }; } - { - name = "eslint_plugin_react___eslint_plugin_react_7.18.0.tgz"; - path = fetchurl { - name = "eslint_plugin_react___eslint_plugin_react_7.18.0.tgz"; - url = "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.18.0.tgz"; - sha1 = "2317831284d005b30aff8afb7c4e906f13fa8e7e"; - }; - } { name = "eslint_plugin_react___eslint_plugin_react_7.19.0.tgz"; path = fetchurl { @@ -4441,6 +4689,14 @@ sha1 = "6d08f9673628aa69c5559d33489e855d83551666"; }; } + { + name = "eslint_plugin_react___eslint_plugin_react_7.21.3.tgz"; + path = fetchurl { + name = "eslint_plugin_react___eslint_plugin_react_7.21.3.tgz"; + url = "https://registry.yarnpkg.com/eslint-plugin-react/-/eslint-plugin-react-7.21.3.tgz"; + sha1 = "71655d2af5155b19285ec929dd2cdc67a4470b52"; + }; + } { name = "eslint_scope___eslint_scope_4.0.3.tgz"; path = fetchurl { @@ -4450,11 +4706,11 @@ }; } { - name = "eslint_scope___eslint_scope_5.0.0.tgz"; + name = "eslint_scope___eslint_scope_5.1.1.tgz"; path = fetchurl { - name = "eslint_scope___eslint_scope_5.0.0.tgz"; - url = "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-5.0.0.tgz"; - sha1 = "e87c8887c73e8d1ec84f1ca591645c358bfc8fb9"; + name = "eslint_scope___eslint_scope_5.1.1.tgz"; + url = "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-5.1.1.tgz"; + sha1 = "e786e59a66cb92b3f6c1fb0d508aab174848f48c"; }; } { @@ -4466,11 +4722,19 @@ }; } { - name = "eslint_visitor_keys___eslint_visitor_keys_1.1.0.tgz"; + name = "eslint_utils___eslint_utils_2.1.0.tgz"; path = fetchurl { - name = "eslint_visitor_keys___eslint_visitor_keys_1.1.0.tgz"; - url = "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.1.0.tgz"; - sha1 = "e2a82cea84ff246ad6fb57f9bde5b46621459ec2"; + 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"; }; } { @@ -4498,19 +4762,19 @@ }; } { - name = "esquery___esquery_1.1.0.tgz"; + name = "esquery___esquery_1.3.1.tgz"; path = fetchurl { - name = "esquery___esquery_1.1.0.tgz"; - url = "https://registry.yarnpkg.com/esquery/-/esquery-1.1.0.tgz"; - sha1 = "c5c0b66f383e7656404f86b31334d72524eddb48"; + name = "esquery___esquery_1.3.1.tgz"; + url = "https://registry.yarnpkg.com/esquery/-/esquery-1.3.1.tgz"; + sha1 = "b78b5828aa8e214e29fb74c4d5b752e1c033da57"; }; } { - name = "esrecurse___esrecurse_4.2.1.tgz"; + name = "esrecurse___esrecurse_4.3.0.tgz"; path = fetchurl { - name = "esrecurse___esrecurse_4.2.1.tgz"; - url = "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.2.1.tgz"; - sha1 = "007a3b9fdbc2b3bb87e4879ea19c92fdbd3942cf"; + name = "esrecurse___esrecurse_4.3.0.tgz"; + url = "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.3.0.tgz"; + sha1 = "7ad7964d679abb28bee72cec63758b1c5d2c9921"; }; } { @@ -4521,6 +4785,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 { @@ -4538,19 +4810,19 @@ }; } { - name = "eventemitter3___eventemitter3_4.0.0.tgz"; + name = "eventemitter3___eventemitter3_4.0.7.tgz"; path = fetchurl { - name = "eventemitter3___eventemitter3_4.0.0.tgz"; - url = "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-4.0.0.tgz"; - sha1 = "d65176163887ee59f386d64c82610b696a4a74eb"; + name = "eventemitter3___eventemitter3_4.0.7.tgz"; + url = "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-4.0.7.tgz"; + sha1 = "2de9b68f6528d5644ef5c59526a1b4a07306169f"; }; } { - name = "events___events_3.1.0.tgz"; + name = "events___events_3.2.0.tgz"; path = fetchurl { - name = "events___events_3.1.0.tgz"; - url = "https://registry.yarnpkg.com/events/-/events-3.1.0.tgz"; - sha1 = "84279af1b34cb75aa88bf5ff291f6d0bd9b31a59"; + name = "events___events_3.2.0.tgz"; + url = "https://registry.yarnpkg.com/events/-/events-3.2.0.tgz"; + sha1 = "93b87c18f8efcd4202a461aec4dfc0556b639379"; }; } { @@ -4682,11 +4954,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"; }; } { @@ -4746,11 +5018,11 @@ }; } { - name = "figgy_pudding___figgy_pudding_3.5.1.tgz"; + name = "figgy_pudding___figgy_pudding_3.5.2.tgz"; path = fetchurl { - name = "figgy_pudding___figgy_pudding_3.5.1.tgz"; - url = "https://registry.yarnpkg.com/figgy-pudding/-/figgy-pudding-3.5.1.tgz"; - sha1 = "862470112901c727a0e495a80744bd5baa1d6790"; + name = "figgy_pudding___figgy_pudding_3.5.2.tgz"; + url = "https://registry.yarnpkg.com/figgy-pudding/-/figgy-pudding-3.5.2.tgz"; + sha1 = "b4eee8148abb01dcf1d1ac34367d59e12fa61d6e"; }; } { @@ -4882,11 +5154,11 @@ }; } { - name = "flatted___flatted_2.0.1.tgz"; + name = "flatted___flatted_2.0.2.tgz"; path = fetchurl { - name = "flatted___flatted_2.0.1.tgz"; - url = "https://registry.yarnpkg.com/flatted/-/flatted-2.0.1.tgz"; - sha1 = "69e57caa8f0eacbc281d2e2cb458d46fdb449e08"; + name = "flatted___flatted_2.0.2.tgz"; + url = "https://registry.yarnpkg.com/flatted/-/flatted-2.0.2.tgz"; + sha1 = "4575b21e2bcee7434aa9be662f4b7b5f9c2b5138"; }; } { @@ -4906,11 +5178,11 @@ }; } { - name = "follow_redirects___follow_redirects_1.10.0.tgz"; + name = "follow_redirects___follow_redirects_1.13.0.tgz"; path = fetchurl { - name = "follow_redirects___follow_redirects_1.10.0.tgz"; - url = "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.10.0.tgz"; - sha1 = "01f5263aee921c6a54fb91667f08f4155ce169eb"; + name = "follow_redirects___follow_redirects_1.13.0.tgz"; + url = "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.13.0.tgz"; + sha1 = "b42e8d93a2a7eea5ed88633676d6597bc8e384db"; }; } { @@ -5050,11 +5322,19 @@ }; } { - name = "fsevents___fsevents_1.2.12.tgz"; + name = "fsevents___fsevents_1.2.13.tgz"; path = fetchurl { - name = "fsevents___fsevents_1.2.12.tgz"; - url = "https://registry.yarnpkg.com/fsevents/-/fsevents-1.2.12.tgz"; - sha1 = "db7e0d8ec3b0b45724fd4d83d43554a8f1f0de5c"; + name = "fsevents___fsevents_1.2.13.tgz"; + url = "https://registry.yarnpkg.com/fsevents/-/fsevents-1.2.13.tgz"; + sha1 = "f325cb0455592428bcf11b383370ef70e3bfcc38"; + }; + } + { + name = "fsevents___fsevents_2.1.3.tgz"; + path = fetchurl { + name = "fsevents___fsevents_2.1.3.tgz"; + url = "https://registry.yarnpkg.com/fsevents/-/fsevents-2.1.3.tgz"; + sha1 = "fb738703ae8d2f9fe900c33836ddebee8b97f23e"; }; } { @@ -5105,14 +5385,6 @@ sha1 = "58f4361ff987e5ff6e1e7a210827aa371eaac269"; }; } - { - name = "get_caller_file___get_caller_file_1.0.3.tgz"; - path = fetchurl { - name = "get_caller_file___get_caller_file_1.0.3.tgz"; - url = "https://registry.yarnpkg.com/get-caller-file/-/get-caller-file-1.0.3.tgz"; - sha1 = "f978fa4c90d1dfe7ff2d6beda2a515e713bdcf4a"; - }; - } { name = "get_caller_file___get_caller_file_2.0.5.tgz"; path = fetchurl { @@ -5170,11 +5442,11 @@ }; } { - name = "glob_parent___glob_parent_5.1.0.tgz"; + name = "glob_parent___glob_parent_5.1.1.tgz"; path = fetchurl { - name = "glob_parent___glob_parent_5.1.0.tgz"; - url = "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.0.tgz"; - sha1 = "5f4c1d1e748d30cd73ad2944b3577a81b081e8c2"; + name = "glob_parent___glob_parent_5.1.1.tgz"; + url = "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.1.tgz"; + sha1 = "b6c1ef417c4e5663ea498f1c45afac6916bbc229"; }; } { @@ -5242,11 +5514,11 @@ }; } { - name = "graceful_fs___graceful_fs_4.2.3.tgz"; + name = "graceful_fs___graceful_fs_4.2.4.tgz"; path = fetchurl { - name = "graceful_fs___graceful_fs_4.2.3.tgz"; - url = "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.3.tgz"; - sha1 = "4a12ff1b60376ef09862c2093edd908328be8423"; + name = "graceful_fs___graceful_fs_4.2.4.tgz"; + url = "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.4.tgz"; + sha1 = "2256bde14d3632958c465ebc96dc467ca07a29fb"; }; } { @@ -5274,11 +5546,11 @@ }; } { - name = "handle_thing___handle_thing_2.0.0.tgz"; + name = "handle_thing___handle_thing_2.0.1.tgz"; path = fetchurl { - name = "handle_thing___handle_thing_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/handle-thing/-/handle-thing-2.0.0.tgz"; - sha1 = "0e039695ff50c93fc288557d696f3c1dc6776754"; + name = "handle_thing___handle_thing_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/handle-thing/-/handle-thing-2.0.1.tgz"; + sha1 = "857f79ce359580c340d43081cc648970d0bb234e"; }; } { @@ -5290,11 +5562,11 @@ }; } { - name = "har_validator___har_validator_5.1.3.tgz"; + name = "har_validator___har_validator_5.1.5.tgz"; path = fetchurl { - name = "har_validator___har_validator_5.1.3.tgz"; - url = "https://registry.yarnpkg.com/har-validator/-/har-validator-5.1.3.tgz"; - sha1 = "1ef89ebd3e4996557675eed9893110dc350fa080"; + name = "har_validator___har_validator_5.1.5.tgz"; + url = "https://registry.yarnpkg.com/har-validator/-/har-validator-5.1.5.tgz"; + sha1 = "1f0803b9f8cb20c0fa13822df1ecddb36bde1efd"; }; } { @@ -5378,11 +5650,11 @@ }; } { - name = "hash_base___hash_base_3.0.4.tgz"; + name = "hash_base___hash_base_3.1.0.tgz"; path = fetchurl { - name = "hash_base___hash_base_3.0.4.tgz"; - url = "https://registry.yarnpkg.com/hash-base/-/hash-base-3.0.4.tgz"; - sha1 = "5fc8686847ecd73499403319a6b0a3f3f6ae4918"; + name = "hash_base___hash_base_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/hash-base/-/hash-base-3.1.0.tgz"; + sha1 = "55c381d9e06e1d2997a883b4a3fddfe7f0d3af33"; }; } { @@ -5474,27 +5746,35 @@ }; } { - name = "html_entities___html_entities_1.2.1.tgz"; + name = "html_encoding_sniffer___html_encoding_sniffer_2.0.1.tgz"; path = fetchurl { - name = "html_entities___html_entities_1.2.1.tgz"; - url = "https://registry.yarnpkg.com/html-entities/-/html-entities-1.2.1.tgz"; - sha1 = "0df29351f0721163515dfb9e5543e5f6eed5162f"; + name = "html_encoding_sniffer___html_encoding_sniffer_2.0.1.tgz"; + url = "https://registry.yarnpkg.com/html-encoding-sniffer/-/html-encoding-sniffer-2.0.1.tgz"; + sha1 = "42a6dc4fd33f00281176e8b23759ca4e4fa185f3"; }; } { - name = "html_escaper___html_escaper_2.0.1.tgz"; + name = "html_entities___html_entities_1.3.1.tgz"; path = fetchurl { - name = "html_escaper___html_escaper_2.0.1.tgz"; - url = "https://registry.yarnpkg.com/html-escaper/-/html-escaper-2.0.1.tgz"; - sha1 = "beed86b5d2b921e92533aa11bce6d8e3b583dee7"; + name = "html_entities___html_entities_1.3.1.tgz"; + url = "https://registry.yarnpkg.com/html-entities/-/html-entities-1.3.1.tgz"; + sha1 = "fb9a1a4b5b14c5daba82d3e34c6ae4fe701a0e44"; }; } { - name = "html_minifier_terser___html_minifier_terser_5.0.4.tgz"; + name = "html_escaper___html_escaper_2.0.2.tgz"; path = fetchurl { - name = "html_minifier_terser___html_minifier_terser_5.0.4.tgz"; - url = "https://registry.yarnpkg.com/html-minifier-terser/-/html-minifier-terser-5.0.4.tgz"; - sha1 = "e8cc02748acb983bd7912ea9660bd31c0702ec32"; + name = "html_escaper___html_escaper_2.0.2.tgz"; + url = "https://registry.yarnpkg.com/html-escaper/-/html-escaper-2.0.2.tgz"; + sha1 = "dfd60027da36a36dfcbe236262c00a5822681453"; + }; + } + { + name = "html_minifier_terser___html_minifier_terser_5.1.1.tgz"; + path = fetchurl { + name = "html_minifier_terser___html_minifier_terser_5.1.1.tgz"; + url = "https://registry.yarnpkg.com/html-minifier-terser/-/html-minifier-terser-5.1.1.tgz"; + sha1 = "922e96f1f3bb60832c2634b79884096389b1f054"; }; } { @@ -5554,11 +5834,11 @@ }; } { - name = "http_parser_js___http_parser_js_0.4.10.tgz"; + name = "http_parser_js___http_parser_js_0.5.2.tgz"; path = fetchurl { - name = "http_parser_js___http_parser_js_0.4.10.tgz"; - url = "https://registry.yarnpkg.com/http-parser-js/-/http-parser-js-0.4.10.tgz"; - sha1 = "92c9c1374c35085f75db359ec56cc257cbb93fa4"; + name = "http_parser_js___http_parser_js_0.5.2.tgz"; + url = "https://registry.yarnpkg.com/http-parser-js/-/http-parser-js-0.5.2.tgz"; + sha1 = "da2e31d237b393aae72ace43882dd7e270a8ff77"; }; } { @@ -5570,11 +5850,11 @@ }; } { - name = "http_proxy___http_proxy_1.18.0.tgz"; + name = "http_proxy___http_proxy_1.18.1.tgz"; path = fetchurl { - name = "http_proxy___http_proxy_1.18.0.tgz"; - url = "https://registry.yarnpkg.com/http-proxy/-/http-proxy-1.18.0.tgz"; - sha1 = "dbe55f63e75a347db7f3d99974f2692a314a6a3a"; + name = "http_proxy___http_proxy_1.18.1.tgz"; + url = "https://registry.yarnpkg.com/http-proxy/-/http-proxy-1.18.1.tgz"; + sha1 = "401541f0534884bbf95260334e72f88ee3976549"; }; } { @@ -5786,11 +6066,11 @@ }; } { - name = "inquirer___inquirer_7.1.0.tgz"; + name = "inquirer___inquirer_7.3.3.tgz"; path = fetchurl { - name = "inquirer___inquirer_7.1.0.tgz"; - url = "https://registry.yarnpkg.com/inquirer/-/inquirer-7.1.0.tgz"; - sha1 = "1298a01859883e17c7264b82870ae1034f92dd29"; + name = "inquirer___inquirer_7.3.3.tgz"; + url = "https://registry.yarnpkg.com/inquirer/-/inquirer-7.3.3.tgz"; + sha1 = "04d176b2af04afc157a83fd7c100e98ee0aad003"; }; } { @@ -5817,14 +6097,6 @@ sha1 = "610f3c92c9359ce1db616e538008d23ff35158e6"; }; } - { - name = "invert_kv___invert_kv_2.0.0.tgz"; - path = fetchurl { - name = "invert_kv___invert_kv_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/invert-kv/-/invert-kv-2.0.0.tgz"; - sha1 = "7393f5afa59ec9ff5f67a27620d11c226e3eec02"; - }; - } { name = "ip_regex___ip_regex_2.1.0.tgz"; path = fetchurl { @@ -5938,11 +6210,11 @@ }; } { - name = "is_callable___is_callable_1.1.5.tgz"; + name = "is_callable___is_callable_1.2.2.tgz"; path = fetchurl { - name = "is_callable___is_callable_1.1.5.tgz"; - url = "https://registry.yarnpkg.com/is-callable/-/is-callable-1.1.5.tgz"; - sha1 = "f7e46b596890456db74e7f6e976cb3273d06faab"; + name = "is_callable___is_callable_1.2.2.tgz"; + url = "https://registry.yarnpkg.com/is-callable/-/is-callable-1.2.2.tgz"; + sha1 = "c7c6715cd22d4ddb48d3e19970223aceabb080d9"; }; } { @@ -6010,11 +6282,11 @@ }; } { - name = "is_docker___is_docker_2.0.0.tgz"; + name = "is_docker___is_docker_2.1.1.tgz"; path = fetchurl { - name = "is_docker___is_docker_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/is-docker/-/is-docker-2.0.0.tgz"; - sha1 = "2cb0df0e75e2d064fe1864c37cdeacb7b2dcf25b"; + name = "is_docker___is_docker_2.1.1.tgz"; + url = "https://registry.yarnpkg.com/is-docker/-/is-docker-2.1.1.tgz"; + sha1 = "4125a88e44e450d384e09047ede71adc2d144156"; }; } { @@ -6041,14 +6313,6 @@ sha1 = "a88c02535791f02ed37c76a1b9ea9773c833f8c2"; }; } - { - name = "is_fullwidth_code_point___is_fullwidth_code_point_1.0.0.tgz"; - path = fetchurl { - name = "is_fullwidth_code_point___is_fullwidth_code_point_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz"; - sha1 = "ef9e31386f031a7f0d643af82fde50c457ef00cb"; - }; - } { name = "is_fullwidth_code_point___is_fullwidth_code_point_2.0.0.tgz"; path = fetchurl { @@ -6089,6 +6353,14 @@ sha1 = "7567dbe9f2f5e2467bc77ab83c4a29482407a5dc"; }; } + { + name = "is_negative_zero___is_negative_zero_2.0.0.tgz"; + path = fetchurl { + name = "is_negative_zero___is_negative_zero_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/is-negative-zero/-/is-negative-zero-2.0.0.tgz"; + sha1 = "9553b121b0fac28869da9ed459e20c7543788461"; + }; + } { name = "is_number_object___is_number_object_1.0.4.tgz"; path = fetchurl { @@ -6170,19 +6442,19 @@ }; } { - name = "is_promise___is_promise_2.1.0.tgz"; + name = "is_potential_custom_element_name___is_potential_custom_element_name_1.0.0.tgz"; path = fetchurl { - name = "is_promise___is_promise_2.1.0.tgz"; - url = "https://registry.yarnpkg.com/is-promise/-/is-promise-2.1.0.tgz"; - sha1 = "79a2a9ece7f096e80f36d2b2f3bc16c1ff4bf3fa"; + name = "is_potential_custom_element_name___is_potential_custom_element_name_1.0.0.tgz"; + url = "https://registry.yarnpkg.com/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.0.tgz"; + sha1 = "0c52e54bcca391bb2c494b21e8626d7336c6e397"; }; } { - name = "is_regex___is_regex_1.0.5.tgz"; + name = "is_regex___is_regex_1.1.1.tgz"; path = fetchurl { - name = "is_regex___is_regex_1.0.5.tgz"; - url = "https://registry.yarnpkg.com/is-regex/-/is-regex-1.0.5.tgz"; - sha1 = "39d589a358bf18967f726967120b8fc1aed74eae"; + name = "is_regex___is_regex_1.1.1.tgz"; + url = "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.1.tgz"; + sha1 = "c6f98aacc546f6cec5468a07b7b153ab564a57b9"; }; } { @@ -6274,11 +6546,11 @@ }; } { - name = "is_wsl___is_wsl_2.1.1.tgz"; + name = "is_wsl___is_wsl_2.2.0.tgz"; path = fetchurl { - name = "is_wsl___is_wsl_2.1.1.tgz"; - url = "https://registry.yarnpkg.com/is-wsl/-/is-wsl-2.1.1.tgz"; - sha1 = "4a1c152d429df3d441669498e2486d3596ebaf1d"; + name = "is_wsl___is_wsl_2.2.0.tgz"; + url = "https://registry.yarnpkg.com/is-wsl/-/is-wsl-2.2.0.tgz"; + sha1 = "74a4c76e77ca9fd3f932f290c17ea326cd157271"; }; } { @@ -6401,6 +6673,14 @@ sha1 = "931b7d0d5778a1baf7452cb816e325e3724055da"; }; } + { + name = "jest_diff___jest_diff_25.5.0.tgz"; + path = fetchurl { + name = "jest_diff___jest_diff_25.5.0.tgz"; + url = "https://registry.yarnpkg.com/jest-diff/-/jest-diff-25.5.0.tgz"; + sha1 = "1dd26ed64f96667c068cef026b677dfa01afcfa9"; + }; + } { name = "jest_docblock___jest_docblock_24.9.0.tgz"; path = fetchurl { @@ -6442,11 +6722,11 @@ }; } { - name = "jest_fetch_mock___jest_fetch_mock_2.1.2.tgz"; + name = "jest_fetch_mock___jest_fetch_mock_3.0.3.tgz"; path = fetchurl { - name = "jest_fetch_mock___jest_fetch_mock_2.1.2.tgz"; - url = "https://registry.yarnpkg.com/jest-fetch-mock/-/jest-fetch-mock-2.1.2.tgz"; - sha1 = "1260b347918e3931c4ec743ceaf60433da661bd0"; + name = "jest_fetch_mock___jest_fetch_mock_3.0.3.tgz"; + url = "https://registry.yarnpkg.com/jest-fetch-mock/-/jest-fetch-mock-3.0.3.tgz"; + sha1 = "31749c456ae27b8919d69824f1c2bd85fe0a1f3b"; }; } { @@ -6457,6 +6737,14 @@ sha1 = "1684a0c8a50f2e4901b6644ae861f579eed2ef0e"; }; } + { + name = "jest_get_type___jest_get_type_25.2.6.tgz"; + path = fetchurl { + name = "jest_get_type___jest_get_type_25.2.6.tgz"; + url = "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-25.2.6.tgz"; + sha1 = "0b0a32fab8908b44d508be81681487dbabb8d877"; + }; + } { name = "jest_haste_map___jest_haste_map_24.9.0.tgz"; path = fetchurl { @@ -6506,11 +6794,11 @@ }; } { - name = "jest_pnp_resolver___jest_pnp_resolver_1.2.1.tgz"; + name = "jest_pnp_resolver___jest_pnp_resolver_1.2.2.tgz"; path = fetchurl { - name = "jest_pnp_resolver___jest_pnp_resolver_1.2.1.tgz"; - url = "https://registry.yarnpkg.com/jest-pnp-resolver/-/jest-pnp-resolver-1.2.1.tgz"; - sha1 = "ecdae604c077a7fbc70defb6d517c3c1c898923a"; + name = "jest_pnp_resolver___jest_pnp_resolver_1.2.2.tgz"; + url = "https://registry.yarnpkg.com/jest-pnp-resolver/-/jest-pnp-resolver-1.2.2.tgz"; + sha1 = "b704ac0ae028a89108a4d040b3f919dfddc8e33c"; }; } { @@ -6610,11 +6898,11 @@ }; } { - name = "jest_worker___jest_worker_25.1.0.tgz"; + name = "jest_worker___jest_worker_25.5.0.tgz"; path = fetchurl { - name = "jest_worker___jest_worker_25.1.0.tgz"; - url = "https://registry.yarnpkg.com/jest-worker/-/jest-worker-25.1.0.tgz"; - sha1 = "75d038bad6fdf58eba0d2ec1835856c497e3907a"; + name = "jest_worker___jest_worker_25.5.0.tgz"; + url = "https://registry.yarnpkg.com/jest-worker/-/jest-worker-25.5.0.tgz"; + sha1 = "2611d071b79cea0f43ee57a3d118593ac1547db1"; }; } { @@ -6658,11 +6946,11 @@ }; } { - name = "js_yaml___js_yaml_3.13.1.tgz"; + name = "js_yaml___js_yaml_3.14.0.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.0.tgz"; + url = "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.14.0.tgz"; + sha1 = "a7a34170f26a21bb162424d8adacb4113a69e482"; }; } { @@ -6690,11 +6978,11 @@ }; } { - name = "jsdom___jsdom_15.2.1.tgz"; + name = "jsdom___jsdom_16.4.0.tgz"; path = fetchurl { - name = "jsdom___jsdom_15.2.1.tgz"; - url = "https://registry.yarnpkg.com/jsdom/-/jsdom-15.2.1.tgz"; - sha1 = "d2feb1aef7183f86be521b8c6833ff5296d07ec5"; + name = "jsdom___jsdom_16.4.0.tgz"; + url = "https://registry.yarnpkg.com/jsdom/-/jsdom-16.4.0.tgz"; + sha1 = "36005bde2d136f73eee1a830c6d45e55408edddb"; }; } { @@ -6721,6 +7009,14 @@ sha1 = "bb867cfb3450e69107c131d1c514bab3dc8bcaa9"; }; } + { + name = "json_parse_even_better_errors___json_parse_even_better_errors_2.3.1.tgz"; + path = fetchurl { + name = "json_parse_even_better_errors___json_parse_even_better_errors_2.3.1.tgz"; + url = "https://registry.yarnpkg.com/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz"; + sha1 = "7c47805a94319928e05777405dc12e1f7a4ee02d"; + }; + } { name = "json_schema_traverse___json_schema_traverse_0.4.1.tgz"; path = fetchurl { @@ -6778,11 +7074,11 @@ }; } { - name = "json5___json5_2.1.2.tgz"; + name = "json5___json5_2.1.3.tgz"; path = fetchurl { - name = "json5___json5_2.1.2.tgz"; - url = "https://registry.yarnpkg.com/json5/-/json5-2.1.2.tgz"; - sha1 = "43ef1f0af9835dd624751a6b7fa48874fb2d608e"; + name = "json5___json5_2.1.3.tgz"; + url = "https://registry.yarnpkg.com/json5/-/json5-2.1.3.tgz"; + sha1 = "c9b0f7fa9233bfe5807fe66fcf3a5617ed597d43"; }; } { @@ -6810,19 +7106,19 @@ }; } { - name = "jsx_ast_utils___jsx_ast_utils_2.2.3.tgz"; + name = "jsx_ast_utils___jsx_ast_utils_2.4.1.tgz"; path = fetchurl { - name = "jsx_ast_utils___jsx_ast_utils_2.2.3.tgz"; - url = "https://registry.yarnpkg.com/jsx-ast-utils/-/jsx-ast-utils-2.2.3.tgz"; - sha1 = "8a9364e402448a3ce7f14d357738310d9248054f"; + name = "jsx_ast_utils___jsx_ast_utils_2.4.1.tgz"; + url = "https://registry.yarnpkg.com/jsx-ast-utils/-/jsx-ast-utils-2.4.1.tgz"; + sha1 = "1114a4c1209481db06c690c2b4f488cc665f657e"; }; } { - name = "just_extend___just_extend_4.1.0.tgz"; + name = "just_extend___just_extend_4.1.1.tgz"; path = fetchurl { - name = "just_extend___just_extend_4.1.0.tgz"; - url = "https://registry.yarnpkg.com/just-extend/-/just-extend-4.1.0.tgz"; - sha1 = "7278a4027d889601640ee0ce0e5a00b992467da4"; + name = "just_extend___just_extend_4.1.1.tgz"; + url = "https://registry.yarnpkg.com/just-extend/-/just-extend-4.1.1.tgz"; + sha1 = "158f1fdb01f128c411dc8b286a7b4837b3545282"; }; } { @@ -6881,6 +7177,22 @@ sha1 = "a79c9ecc86ee1ce3fa6206d1216c501f147fc07e"; }; } + { + name = "language_subtag_registry___language_subtag_registry_0.3.20.tgz"; + path = fetchurl { + name = "language_subtag_registry___language_subtag_registry_0.3.20.tgz"; + url = "https://registry.yarnpkg.com/language-subtag-registry/-/language-subtag-registry-0.3.20.tgz"; + sha1 = "a00a37121894f224f763268e431c55556b0c0755"; + }; + } + { + name = "language_tags___language_tags_1.0.5.tgz"; + path = fetchurl { + name = "language_tags___language_tags_1.0.5.tgz"; + url = "https://registry.yarnpkg.com/language-tags/-/language-tags-1.0.5.tgz"; + sha1 = "d321dbc4da30ba8bf3024e040fa5c14661f9193a"; + }; + } { name = "last_call_webpack_plugin___last_call_webpack_plugin_3.0.0.tgz"; path = fetchurl { @@ -6905,14 +7217,6 @@ sha1 = "a1d78fc3a50474cb80845d3b3b6e1da49a446e8e"; }; } - { - name = "lcid___lcid_2.0.0.tgz"; - path = fetchurl { - name = "lcid___lcid_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/lcid/-/lcid-2.0.0.tgz"; - sha1 = "6ef5d2df60e52f82eb228a4c373e8d1f397253cf"; - }; - } { name = "left_pad___left_pad_1.3.0.tgz"; path = fetchurl { @@ -7025,14 +7329,6 @@ sha1 = "1afba396afd676a6d42504d0a67a3a7eb9f62aa0"; }; } - { - name = "lodash_es___lodash_es_4.17.15.tgz"; - path = fetchurl { - name = "lodash_es___lodash_es_4.17.15.tgz"; - url = "https://registry.yarnpkg.com/lodash-es/-/lodash-es-4.17.15.tgz"; - sha1 = "21bd96839354412f23d7a10340e5eac6ee455d78"; - }; - } { name = "lodash._reinterpolate___lodash._reinterpolate_3.0.0.tgz"; path = fetchurl { @@ -7041,14 +7337,6 @@ sha1 = "0ccf2d89166af03b3663c796538b75ac6e114d9d"; }; } - { - name = "lodash.clonedeep___lodash.clonedeep_4.5.0.tgz"; - path = fetchurl { - name = "lodash.clonedeep___lodash.clonedeep_4.5.0.tgz"; - url = "https://registry.yarnpkg.com/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz"; - sha1 = "e23f3f9c4f8fbdde872529c1071857a086e5ccef"; - }; - } { name = "lodash.escape___lodash.escape_4.0.1.tgz"; path = fetchurl { @@ -7057,14 +7345,6 @@ sha1 = "c9044690c21e04294beaa517712fded1fa88de98"; }; } - { - name = "lodash.escaperegexp___lodash.escaperegexp_4.1.2.tgz"; - path = fetchurl { - name = "lodash.escaperegexp___lodash.escaperegexp_4.1.2.tgz"; - url = "https://registry.yarnpkg.com/lodash.escaperegexp/-/lodash.escaperegexp-4.1.2.tgz"; - sha1 = "64762c48618082518ac3df4ccf5d5886dae20347"; - }; - } { name = "lodash.flattendeep___lodash.flattendeep_4.4.0.tgz"; path = fetchurl { @@ -7073,6 +7353,14 @@ sha1 = "fb030917f86a3134e5bc9bec0d69e0013ddfedb2"; }; } + { + name = "lodash.get___lodash.get_4.4.2.tgz"; + path = fetchurl { + name = "lodash.get___lodash.get_4.4.2.tgz"; + url = "https://registry.yarnpkg.com/lodash.get/-/lodash.get-4.4.2.tgz"; + sha1 = "2d177f652fa31e939b4438d5341499dfa3825e99"; + }; + } { name = "lodash.isequal___lodash.isequal_4.5.0.tgz"; path = fetchurl { @@ -7081,22 +7369,6 @@ sha1 = "415c4478f2bcc30120c22ce10ed3226f7d3e18e0"; }; } - { - name = "lodash.isplainobject___lodash.isplainobject_4.0.6.tgz"; - path = fetchurl { - name = "lodash.isplainobject___lodash.isplainobject_4.0.6.tgz"; - url = "https://registry.yarnpkg.com/lodash.isplainobject/-/lodash.isplainobject-4.0.6.tgz"; - sha1 = "7c526a52d89b45c45cc690b88163be0497f550cb"; - }; - } - { - name = "lodash.isstring___lodash.isstring_4.0.1.tgz"; - path = fetchurl { - name = "lodash.isstring___lodash.isstring_4.0.1.tgz"; - url = "https://registry.yarnpkg.com/lodash.isstring/-/lodash.isstring-4.0.1.tgz"; - sha1 = "d527dfb5456eca7cc9bb95d5daeaf88ba54a5451"; - }; - } { name = "lodash.memoize___lodash.memoize_4.1.2.tgz"; path = fetchurl { @@ -7105,14 +7377,6 @@ sha1 = "bcc6c49a42a2840ed997f323eada5ecd182e0bfe"; }; } - { - name = "lodash.mergewith___lodash.mergewith_4.6.2.tgz"; - path = fetchurl { - name = "lodash.mergewith___lodash.mergewith_4.6.2.tgz"; - url = "https://registry.yarnpkg.com/lodash.mergewith/-/lodash.mergewith-4.6.2.tgz"; - sha1 = "617121f89ac55f59047c7aec1ccd6654c6590f55"; - }; - } { name = "lodash.sortby___lodash.sortby_4.7.0.tgz"; path = fetchurl { @@ -7146,35 +7410,19 @@ }; } { - name = "lodash___lodash_4.17.15.tgz"; + name = "lodash___lodash_4.17.20.tgz"; path = fetchurl { - name = "lodash___lodash_4.17.15.tgz"; - url = "https://registry.yarnpkg.com/lodash/-/lodash-4.17.15.tgz"; - sha1 = "b447f6670a0455bbfeedd11392eff330ea097548"; + name = "lodash___lodash_4.17.20.tgz"; + url = "https://registry.yarnpkg.com/lodash/-/lodash-4.17.20.tgz"; + sha1 = "b44a9b6297bcb698f1c51a3545a2b3b368d59c52"; }; } { - name = "loglevel___loglevel_1.6.7.tgz"; + name = "loglevel___loglevel_1.7.0.tgz"; path = fetchurl { - name = "loglevel___loglevel_1.6.7.tgz"; - url = "https://registry.yarnpkg.com/loglevel/-/loglevel-1.6.7.tgz"; - sha1 = "b3e034233188c68b889f5b862415306f565e2c56"; - }; - } - { - name = "lolex___lolex_4.2.0.tgz"; - path = fetchurl { - name = "lolex___lolex_4.2.0.tgz"; - url = "https://registry.yarnpkg.com/lolex/-/lolex-4.2.0.tgz"; - sha1 = "ddbd7f6213ca1ea5826901ab1222b65d714b3cd7"; - }; - } - { - name = "lolex___lolex_5.1.2.tgz"; - path = fetchurl { - name = "lolex___lolex_5.1.2.tgz"; - url = "https://registry.yarnpkg.com/lolex/-/lolex-5.1.2.tgz"; - sha1 = "953694d098ce7c07bc5ed6d0e42bc6c0c6d5a367"; + name = "loglevel___loglevel_1.7.0.tgz"; + url = "https://registry.yarnpkg.com/loglevel/-/loglevel-1.7.0.tgz"; + sha1 = "728166855a740d59d38db01cf46f042caa041bb0"; }; } { @@ -7210,11 +7458,11 @@ }; } { - name = "make_dir___make_dir_3.0.2.tgz"; + name = "make_dir___make_dir_3.1.0.tgz"; path = fetchurl { - name = "make_dir___make_dir_3.0.2.tgz"; - url = "https://registry.yarnpkg.com/make-dir/-/make-dir-3.0.2.tgz"; - sha1 = "04a1acbf22221e1d6ef43559f43e05a90dbb4392"; + name = "make_dir___make_dir_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/make-dir/-/make-dir-3.1.0.tgz"; + sha1 = "415e967046b3a7f1d185277d84aa58203726a13f"; }; } { @@ -7233,14 +7481,6 @@ sha1 = "ad2c9576197c9f1abf308d0787865bd975a3f3e4"; }; } - { - name = "map_age_cleaner___map_age_cleaner_0.1.3.tgz"; - path = fetchurl { - name = "map_age_cleaner___map_age_cleaner_0.1.3.tgz"; - url = "https://registry.yarnpkg.com/map-age-cleaner/-/map-age-cleaner-0.1.3.tgz"; - sha1 = "7d583a7306434c055fe474b0f45078e6e1b4b92a"; - }; - } { name = "map_cache___map_cache_0.2.2.tgz"; path = fetchurl { @@ -7273,6 +7513,14 @@ sha1 = "699b3c38ac6f1d728091a64650b65d388502fd5b"; }; } + { + name = "mdn_data___mdn_data_2.0.6.tgz"; + path = fetchurl { + name = "mdn_data___mdn_data_2.0.6.tgz"; + url = "https://registry.yarnpkg.com/mdn-data/-/mdn-data-2.0.6.tgz"; + sha1 = "852dc60fcaa5daa2e8cf6c9189c440ed3e042978"; + }; + } { name = "media_typer___media_typer_0.3.0.tgz"; path = fetchurl { @@ -7281,14 +7529,6 @@ sha1 = "8710d7af0aa626f8fffa1ce00168545263255748"; }; } - { - name = "mem___mem_4.3.0.tgz"; - path = fetchurl { - name = "mem___mem_4.3.0.tgz"; - url = "https://registry.yarnpkg.com/mem/-/mem-4.3.0.tgz"; - sha1 = "461af497bc4ae09608cdb2e60eefb69bff744178"; - }; - } { name = "memory_fs___memory_fs_0.4.1.tgz"; path = fetchurl { @@ -7330,11 +7570,11 @@ }; } { - name = "merge2___merge2_1.3.0.tgz"; + name = "merge2___merge2_1.4.1.tgz"; path = fetchurl { - name = "merge2___merge2_1.3.0.tgz"; - url = "https://registry.yarnpkg.com/merge2/-/merge2-1.3.0.tgz"; - sha1 = "5b366ee83b2f1582c48f87e47cf1a9352103ca81"; + name = "merge2___merge2_1.4.1.tgz"; + url = "https://registry.yarnpkg.com/merge2/-/merge2-1.4.1.tgz"; + sha1 = "4368892f885e907455a6fd7dc55c0c9d404990ae"; }; } { @@ -7370,19 +7610,27 @@ }; } { - name = "mime_db___mime_db_1.43.0.tgz"; + name = "mime_db___mime_db_1.44.0.tgz"; path = fetchurl { - name = "mime_db___mime_db_1.43.0.tgz"; - url = "https://registry.yarnpkg.com/mime-db/-/mime-db-1.43.0.tgz"; - sha1 = "0a12e0502650e473d735535050e7c8f4eb4fae58"; + name = "mime_db___mime_db_1.44.0.tgz"; + url = "https://registry.yarnpkg.com/mime-db/-/mime-db-1.44.0.tgz"; + sha1 = "fa11c5eb0aca1334b4233cb4d52f10c5a6272f92"; }; } { - name = "mime_types___mime_types_2.1.26.tgz"; + name = "mime_db___mime_db_1.45.0.tgz"; path = fetchurl { - name = "mime_types___mime_types_2.1.26.tgz"; - url = "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.26.tgz"; - sha1 = "9c921fc09b7e149a65dfdc0da4d20997200b0a06"; + name = "mime_db___mime_db_1.45.0.tgz"; + url = "https://registry.yarnpkg.com/mime-db/-/mime-db-1.45.0.tgz"; + sha1 = "cceeda21ccd7c3a745eba2decd55d4b73e7879ea"; + }; + } + { + name = "mime_types___mime_types_2.1.27.tgz"; + path = fetchurl { + name = "mime_types___mime_types_2.1.27.tgz"; + url = "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.27.tgz"; + sha1 = "47949f98e279ea53119f5722e0f34e529bec009f"; }; } { @@ -7394,11 +7642,11 @@ }; } { - name = "mime___mime_2.4.4.tgz"; + name = "mime___mime_2.4.6.tgz"; path = fetchurl { - name = "mime___mime_2.4.4.tgz"; - url = "https://registry.yarnpkg.com/mime/-/mime-2.4.4.tgz"; - sha1 = "bd7b91135fc6b01cde3e9bae33d659b63d8857e5"; + name = "mime___mime_2.4.6.tgz"; + url = "https://registry.yarnpkg.com/mime/-/mime-2.4.6.tgz"; + sha1 = "e5b407c90db442f2beb5b162373d07b69affa4d1"; }; } { @@ -7466,19 +7714,19 @@ }; } { - name = "minipass_pipeline___minipass_pipeline_1.2.2.tgz"; + name = "minipass_pipeline___minipass_pipeline_1.2.4.tgz"; path = fetchurl { - name = "minipass_pipeline___minipass_pipeline_1.2.2.tgz"; - url = "https://registry.yarnpkg.com/minipass-pipeline/-/minipass-pipeline-1.2.2.tgz"; - sha1 = "3dcb6bb4a546e32969c7ad710f2c79a86abba93a"; + name = "minipass_pipeline___minipass_pipeline_1.2.4.tgz"; + url = "https://registry.yarnpkg.com/minipass-pipeline/-/minipass-pipeline-1.2.4.tgz"; + sha1 = "68472f79711c084657c067c5c6ad93cddea8214c"; }; } { - name = "minipass___minipass_3.1.1.tgz"; + name = "minipass___minipass_3.1.3.tgz"; path = fetchurl { - name = "minipass___minipass_3.1.1.tgz"; - url = "https://registry.yarnpkg.com/minipass/-/minipass-3.1.1.tgz"; - sha1 = "7607ce778472a185ad6d89082aa2070f79cedcd5"; + name = "minipass___minipass_3.1.3.tgz"; + url = "https://registry.yarnpkg.com/minipass/-/minipass-3.1.3.tgz"; + sha1 = "7d42ff1f39635482e15f9cdb53184deebd5815fd"; }; } { @@ -7506,11 +7754,19 @@ }; } { - name = "mkdirp___mkdirp_0.5.3.tgz"; + name = "mkdirp___mkdirp_0.5.5.tgz"; path = fetchurl { - name = "mkdirp___mkdirp_0.5.3.tgz"; - url = "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.3.tgz"; - sha1 = "5a514b7179259287952881e94410ec5465659f8c"; + name = "mkdirp___mkdirp_0.5.5.tgz"; + url = "https://registry.yarnpkg.com/mkdirp/-/mkdirp-0.5.5.tgz"; + sha1 = "d91cefd62d1436ca0f41620e251288d420099def"; + }; + } + { + name = "moment_timezone___moment_timezone_0.5.31.tgz"; + path = fetchurl { + name = "moment_timezone___moment_timezone_0.5.31.tgz"; + url = "https://registry.yarnpkg.com/moment-timezone/-/moment-timezone-0.5.31.tgz"; + sha1 = "9c40d8c5026f0c7ab46eda3d63e49c155148de05"; }; } { @@ -7522,19 +7778,11 @@ }; } { - name = "moment_timezone___moment_timezone_0.5.28.tgz"; + name = "moment___moment_2.29.1.tgz"; path = fetchurl { - name = "moment_timezone___moment_timezone_0.5.28.tgz"; - url = "https://registry.yarnpkg.com/moment-timezone/-/moment-timezone-0.5.28.tgz"; - sha1 = "f093d789d091ed7b055d82aa81a82467f72e4338"; - }; - } - { - name = "moment___moment_2.24.0.tgz"; - path = fetchurl { - name = "moment___moment_2.24.0.tgz"; - url = "https://registry.yarnpkg.com/moment/-/moment-2.24.0.tgz"; - sha1 = "0d055d53f5052aa653c9f6eb68bb5d12bf5c2b5b"; + name = "moment___moment_2.29.1.tgz"; + url = "https://registry.yarnpkg.com/moment/-/moment-2.29.1.tgz"; + sha1 = "b2be769fa31940be9eeea6469c075e35006fa3d3"; }; } { @@ -7602,11 +7850,11 @@ }; } { - name = "nan___nan_2.14.0.tgz"; + name = "nan___nan_2.14.1.tgz"; path = fetchurl { - name = "nan___nan_2.14.0.tgz"; - url = "https://registry.yarnpkg.com/nan/-/nan-2.14.0.tgz"; - sha1 = "7818f722027b2459a86f0295d434d1fc2336c52c"; + name = "nan___nan_2.14.1.tgz"; + url = "https://registry.yarnpkg.com/nan/-/nan-2.14.1.tgz"; + sha1 = "d7be34dfa3105b91494c3147089315eff8874b01"; }; } { @@ -7626,11 +7874,11 @@ }; } { - name = "nearley___nearley_2.19.1.tgz"; + name = "nearley___nearley_2.19.7.tgz"; path = fetchurl { - name = "nearley___nearley_2.19.1.tgz"; - url = "https://registry.yarnpkg.com/nearley/-/nearley-2.19.1.tgz"; - sha1 = "4af4006e16645ff800e9f993c3af039857d9dbdc"; + name = "nearley___nearley_2.19.7.tgz"; + url = "https://registry.yarnpkg.com/nearley/-/nearley-2.19.7.tgz"; + sha1 = "eafbe3e2d8ccfe70adaa5c026ab1f9709c116218"; }; } { @@ -7642,11 +7890,11 @@ }; } { - name = "neo_async___neo_async_2.6.1.tgz"; + name = "neo_async___neo_async_2.6.2.tgz"; path = fetchurl { - name = "neo_async___neo_async_2.6.1.tgz"; - url = "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.1.tgz"; - sha1 = "ac27ada66167fa8849a6addd837f6b189ad2081c"; + name = "neo_async___neo_async_2.6.2.tgz"; + url = "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.2.tgz"; + sha1 = "b4aafb93e3aeb2d8174ca53cf163ab7d7308305f"; }; } { @@ -7666,11 +7914,11 @@ }; } { - name = "nise___nise_1.5.3.tgz"; + name = "nise___nise_4.0.4.tgz"; path = fetchurl { - name = "nise___nise_1.5.3.tgz"; - url = "https://registry.yarnpkg.com/nise/-/nise-1.5.3.tgz"; - sha1 = "9d2cfe37d44f57317766c6e9408a359c5d3ac1f7"; + name = "nise___nise_4.0.4.tgz"; + url = "https://registry.yarnpkg.com/nise/-/nise-4.0.4.tgz"; + sha1 = "d73dea3e5731e6561992b8f570be9e363c4512dd"; }; } { @@ -7682,19 +7930,19 @@ }; } { - name = "node_fetch___node_fetch_2.1.2.tgz"; + name = "node_fetch___node_fetch_2.6.1.tgz"; path = fetchurl { - name = "node_fetch___node_fetch_2.1.2.tgz"; - url = "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.1.2.tgz"; - sha1 = "ab884e8e7e57e38a944753cec706f788d1768bb5"; + name = "node_fetch___node_fetch_2.6.1.tgz"; + url = "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.1.tgz"; + sha1 = "045bd323631f76ed2e2b55573394416b639a0052"; }; } { - name = "node_forge___node_forge_0.9.0.tgz"; + name = "node_forge___node_forge_0.10.0.tgz"; path = fetchurl { - name = "node_forge___node_forge_0.9.0.tgz"; - url = "https://registry.yarnpkg.com/node-forge/-/node-forge-0.9.0.tgz"; - sha1 = "d624050edbb44874adca12bb9a52ec63cb782579"; + name = "node_forge___node_forge_0.10.0.tgz"; + url = "https://registry.yarnpkg.com/node-forge/-/node-forge-0.10.0.tgz"; + sha1 = "32dea2afb3e9926f02ee5ce8794902691a676bf3"; }; } { @@ -7730,11 +7978,11 @@ }; } { - name = "node_releases___node_releases_1.1.52.tgz"; + name = "node_releases___node_releases_1.1.61.tgz"; path = fetchurl { - name = "node_releases___node_releases_1.1.52.tgz"; - url = "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.52.tgz"; - sha1 = "bcffee3e0a758e92e44ecfaecd0a47554b0bcba9"; + name = "node_releases___node_releases_1.1.61.tgz"; + url = "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.61.tgz"; + sha1 = "707b0fca9ce4e11783612ba4a2fcba09047af16e"; }; } { @@ -7809,14 +8057,6 @@ sha1 = "6f682b6a027a4e9ddfa4564cd2589d1d4e669ede"; }; } - { - name = "number_is_nan___number_is_nan_1.0.1.tgz"; - path = fetchurl { - name = "number_is_nan___number_is_nan_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz"; - sha1 = "097b602b53422a522c1afb8790318336941a011d"; - }; - } { name = "nwsapi___nwsapi_2.2.0.tgz"; path = fetchurl { @@ -7858,19 +8098,19 @@ }; } { - name = "object_inspect___object_inspect_1.7.0.tgz"; + name = "object_inspect___object_inspect_1.8.0.tgz"; path = fetchurl { - name = "object_inspect___object_inspect_1.7.0.tgz"; - url = "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.7.0.tgz"; - sha1 = "f4f6bd181ad77f006b5ece60bd0b6f398ff74a67"; + name = "object_inspect___object_inspect_1.8.0.tgz"; + url = "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.8.0.tgz"; + sha1 = "df807e5ecf53a609cc6bfe93eac3cc7be5b3a9d0"; }; } { - name = "object_is___object_is_1.0.2.tgz"; + name = "object_is___object_is_1.1.3.tgz"; path = fetchurl { - name = "object_is___object_is_1.0.2.tgz"; - url = "https://registry.yarnpkg.com/object-is/-/object-is-1.0.2.tgz"; - sha1 = "6b80eb84fe451498f65007982f035a5b445edec4"; + name = "object_is___object_is_1.1.3.tgz"; + url = "https://registry.yarnpkg.com/object-is/-/object-is-1.1.3.tgz"; + sha1 = "2e3b9e65560137455ee3bd62aec4d90a2ea1cc81"; }; } { @@ -7898,19 +8138,19 @@ }; } { - name = "object.assign___object.assign_4.1.0.tgz"; + name = "object.assign___object.assign_4.1.1.tgz"; path = fetchurl { - name = "object.assign___object.assign_4.1.0.tgz"; - url = "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.0.tgz"; - sha1 = "968bf1100d7956bb3ca086f006f846b3bc4008da"; + name = "object.assign___object.assign_4.1.1.tgz"; + url = "https://registry.yarnpkg.com/object.assign/-/object.assign-4.1.1.tgz"; + sha1 = "303867a666cdd41936ecdedfb1f8f3e32a478cdd"; }; } { - name = "object.entries___object.entries_1.1.1.tgz"; + name = "object.entries___object.entries_1.1.2.tgz"; path = fetchurl { - name = "object.entries___object.entries_1.1.1.tgz"; - url = "https://registry.yarnpkg.com/object.entries/-/object.entries-1.1.1.tgz"; - sha1 = "ee1cf04153de02bb093fec33683900f57ce5399b"; + name = "object.entries___object.entries_1.1.2.tgz"; + url = "https://registry.yarnpkg.com/object.entries/-/object.entries-1.1.2.tgz"; + sha1 = "bc73f00acb6b6bb16c203434b10f9a7e797d3add"; }; } { @@ -7978,19 +8218,19 @@ }; } { - name = "onetime___onetime_5.1.0.tgz"; + name = "onetime___onetime_5.1.2.tgz"; path = fetchurl { - name = "onetime___onetime_5.1.0.tgz"; - url = "https://registry.yarnpkg.com/onetime/-/onetime-5.1.0.tgz"; - sha1 = "fff0f3c91617fe62bb50189636e99ac8a6df7be5"; + name = "onetime___onetime_5.1.2.tgz"; + url = "https://registry.yarnpkg.com/onetime/-/onetime-5.1.2.tgz"; + sha1 = "d0e96ebb56b07476df1dd9c4806e5237985ca45e"; }; } { - name = "open___open_7.0.3.tgz"; + name = "open___open_7.3.0.tgz"; path = fetchurl { - name = "open___open_7.0.3.tgz"; - url = "https://registry.yarnpkg.com/open/-/open-7.0.3.tgz"; - sha1 = "db551a1af9c7ab4c7af664139930826138531c48"; + name = "open___open_7.3.0.tgz"; + url = "https://registry.yarnpkg.com/open/-/open-7.3.0.tgz"; + sha1 = "45461fdee46444f3645b6e14eb3ca94b82e1be69"; }; } { @@ -8033,14 +8273,6 @@ sha1 = "854373c7f5c2315914fc9bfc6bd8238fdda1ec27"; }; } - { - name = "os_locale___os_locale_3.1.0.tgz"; - path = fetchurl { - name = "os_locale___os_locale_3.1.0.tgz"; - url = "https://registry.yarnpkg.com/os-locale/-/os-locale-3.1.0.tgz"; - sha1 = "a802a6ee17f24c10483ab9935719cef4ed16bf1a"; - }; - } { name = "os_tmpdir___os_tmpdir_1.0.2.tgz"; path = fetchurl { @@ -8049,14 +8281,6 @@ sha1 = "bbe67406c79aa85c5cfec766fe5734555dfa1274"; }; } - { - name = "p_defer___p_defer_1.0.0.tgz"; - path = fetchurl { - name = "p_defer___p_defer_1.0.0.tgz"; - url = "https://registry.yarnpkg.com/p-defer/-/p-defer-1.0.0.tgz"; - sha1 = "9f6eb182f6c9aa8cd743004a7d4f96b196b0fb0c"; - }; - } { name = "p_each_series___p_each_series_1.0.0.tgz"; path = fetchurl { @@ -8073,14 +8297,6 @@ sha1 = "3fbcfb15b899a44123b34b6dcc18b724336a2cae"; }; } - { - name = "p_is_promise___p_is_promise_2.1.0.tgz"; - path = fetchurl { - name = "p_is_promise___p_is_promise_2.1.0.tgz"; - url = "https://registry.yarnpkg.com/p-is-promise/-/p-is-promise-2.1.0.tgz"; - sha1 = "918cebaea248a62cf7ffab8e3bca8c5f882fc42e"; - }; - } { name = "p_limit___p_limit_1.3.0.tgz"; path = fetchurl { @@ -8090,11 +8306,11 @@ }; } { - name = "p_limit___p_limit_2.2.2.tgz"; + name = "p_limit___p_limit_2.3.0.tgz"; path = fetchurl { - name = "p_limit___p_limit_2.2.2.tgz"; - url = "https://registry.yarnpkg.com/p-limit/-/p-limit-2.2.2.tgz"; - sha1 = "61279b67721f5287aa1c13a9a7fbbc48c9291b1e"; + name = "p_limit___p_limit_2.3.0.tgz"; + url = "https://registry.yarnpkg.com/p-limit/-/p-limit-2.3.0.tgz"; + sha1 = "3dd33c647a214fdfffd835933eb086da0dc21db1"; }; } { @@ -8202,11 +8418,11 @@ }; } { - name = "parse_asn1___parse_asn1_5.1.5.tgz"; + name = "parse_asn1___parse_asn1_5.1.6.tgz"; path = fetchurl { - name = "parse_asn1___parse_asn1_5.1.5.tgz"; - url = "https://registry.yarnpkg.com/parse-asn1/-/parse-asn1-5.1.5.tgz"; - sha1 = "003271343da58dc94cace494faef3d2147ecea0e"; + name = "parse_asn1___parse_asn1_5.1.6.tgz"; + url = "https://registry.yarnpkg.com/parse-asn1/-/parse-asn1-5.1.6.tgz"; + sha1 = "385080a3ec13cb62a62d39409cb3e88844cdaed4"; }; } { @@ -8226,11 +8442,19 @@ }; } { - name = "parse_json___parse_json_5.0.0.tgz"; + name = "parse_json___parse_json_5.1.0.tgz"; path = fetchurl { - name = "parse_json___parse_json_5.0.0.tgz"; - url = "https://registry.yarnpkg.com/parse-json/-/parse-json-5.0.0.tgz"; - sha1 = "73e5114c986d143efa3712d4ea24db9a4266f60f"; + name = "parse_json___parse_json_5.1.0.tgz"; + url = "https://registry.yarnpkg.com/parse-json/-/parse-json-5.1.0.tgz"; + sha1 = "f96088cdf24a8faa9aea9a009f2d9d942c999646"; + }; + } + { + name = "parse_srcset___parse_srcset_1.0.2.tgz"; + path = fetchurl { + name = "parse_srcset___parse_srcset_1.0.2.tgz"; + url = "https://registry.yarnpkg.com/parse-srcset/-/parse-srcset-1.0.2.tgz"; + sha1 = "f2bd221f6cc970a938d88556abc589caaaa2bde1"; }; } { @@ -8249,6 +8473,14 @@ sha1 = "c59341c9723f414c452975564c7c00a68d58acd2"; }; } + { + name = "parse5___parse5_5.1.1.tgz"; + path = fetchurl { + name = "parse5___parse5_5.1.1.tgz"; + url = "https://registry.yarnpkg.com/parse5/-/parse5-5.1.1.tgz"; + sha1 = "f68e4e5ba1852ac2cadc00f4555fff6c2abb6178"; + }; + } { name = "parse5___parse5_3.0.3.tgz"; path = fetchurl { @@ -8402,11 +8634,11 @@ }; } { - name = "pbkdf2___pbkdf2_3.0.17.tgz"; + name = "pbkdf2___pbkdf2_3.1.1.tgz"; path = fetchurl { - name = "pbkdf2___pbkdf2_3.0.17.tgz"; - url = "https://registry.yarnpkg.com/pbkdf2/-/pbkdf2-3.0.17.tgz"; - sha1 = "976c206530617b14ebb32114239f7b09336e93a6"; + name = "pbkdf2___pbkdf2_3.1.1.tgz"; + url = "https://registry.yarnpkg.com/pbkdf2/-/pbkdf2-3.1.1.tgz"; + sha1 = "cb8724b0fada984596856d1a6ebafd3584654b94"; }; } { @@ -8522,11 +8754,11 @@ }; } { - name = "pnp_webpack_plugin___pnp_webpack_plugin_1.6.0.tgz"; + name = "pnp_webpack_plugin___pnp_webpack_plugin_1.6.4.tgz"; path = fetchurl { - name = "pnp_webpack_plugin___pnp_webpack_plugin_1.6.0.tgz"; - url = "https://registry.yarnpkg.com/pnp-webpack-plugin/-/pnp-webpack-plugin-1.6.0.tgz"; - sha1 = "d5c068013a2fdc82224ca50ed179c8fba9036a8e"; + name = "pnp_webpack_plugin___pnp_webpack_plugin_1.6.4.tgz"; + url = "https://registry.yarnpkg.com/pnp-webpack-plugin/-/pnp-webpack-plugin-1.6.4.tgz"; + sha1 = "c9711ac4dc48a685dabafc86f8b6dd9f8df84149"; }; } { @@ -8538,11 +8770,11 @@ }; } { - name = "portfinder___portfinder_1.0.25.tgz"; + name = "portfinder___portfinder_1.0.28.tgz"; path = fetchurl { - name = "portfinder___portfinder_1.0.25.tgz"; - url = "https://registry.yarnpkg.com/portfinder/-/portfinder-1.0.25.tgz"; - sha1 = "254fd337ffba869f4b9d37edc298059cb4d35eca"; + name = "portfinder___portfinder_1.0.28.tgz"; + url = "https://registry.yarnpkg.com/portfinder/-/portfinder-1.0.28.tgz"; + sha1 = "67c4622852bd5374dd1dd900f779f53462fac778"; }; } { @@ -8570,11 +8802,11 @@ }; } { - name = "postcss_calc___postcss_calc_7.0.2.tgz"; + name = "postcss_calc___postcss_calc_7.0.5.tgz"; path = fetchurl { - name = "postcss_calc___postcss_calc_7.0.2.tgz"; - url = "https://registry.yarnpkg.com/postcss-calc/-/postcss-calc-7.0.2.tgz"; - sha1 = "504efcd008ca0273120568b0792b16cdcde8aac1"; + name = "postcss_calc___postcss_calc_7.0.5.tgz"; + url = "https://registry.yarnpkg.com/postcss-calc/-/postcss-calc-7.0.5.tgz"; + sha1 = "f8a6e99f12e619c2ebc23cf6c486fdc15860933e"; }; } { @@ -8778,11 +9010,11 @@ }; } { - name = "postcss_load_config___postcss_load_config_2.1.0.tgz"; + name = "postcss_load_config___postcss_load_config_2.1.2.tgz"; path = fetchurl { - name = "postcss_load_config___postcss_load_config_2.1.0.tgz"; - url = "https://registry.yarnpkg.com/postcss-load-config/-/postcss-load-config-2.1.0.tgz"; - sha1 = "c84d692b7bb7b41ddced94ee62e8ab31b417b003"; + name = "postcss_load_config___postcss_load_config_2.1.2.tgz"; + url = "https://registry.yarnpkg.com/postcss-load-config/-/postcss-load-config-2.1.2.tgz"; + sha1 = "c5ea504f2c4aef33c7359a34de3573772ad7502a"; }; } { @@ -8866,11 +9098,11 @@ }; } { - name = "postcss_modules_local_by_default___postcss_modules_local_by_default_3.0.2.tgz"; + name = "postcss_modules_local_by_default___postcss_modules_local_by_default_3.0.3.tgz"; path = fetchurl { - name = "postcss_modules_local_by_default___postcss_modules_local_by_default_3.0.2.tgz"; - url = "https://registry.yarnpkg.com/postcss-modules-local-by-default/-/postcss-modules-local-by-default-3.0.2.tgz"; - sha1 = "e8a6561be914aaf3c052876377524ca90dbb7915"; + name = "postcss_modules_local_by_default___postcss_modules_local_by_default_3.0.3.tgz"; + url = "https://registry.yarnpkg.com/postcss-modules-local-by-default/-/postcss-modules-local-by-default-3.0.3.tgz"; + sha1 = "bb14e0cc78279d504dbdcbfd7e0ca28993ffbbb0"; }; } { @@ -9090,11 +9322,11 @@ }; } { - name = "postcss_selector_parser___postcss_selector_parser_6.0.2.tgz"; + name = "postcss_selector_parser___postcss_selector_parser_6.0.4.tgz"; path = fetchurl { - name = "postcss_selector_parser___postcss_selector_parser_6.0.2.tgz"; - url = "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.2.tgz"; - sha1 = "934cf799d016c83411859e09dcecade01286ec5c"; + name = "postcss_selector_parser___postcss_selector_parser_6.0.4.tgz"; + url = "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.4.tgz"; + sha1 = "56075a1380a04604c38b063ea7767a129af5c2b3"; }; } { @@ -9122,11 +9354,11 @@ }; } { - name = "postcss_value_parser___postcss_value_parser_4.0.3.tgz"; + name = "postcss_value_parser___postcss_value_parser_4.1.0.tgz"; path = fetchurl { - name = "postcss_value_parser___postcss_value_parser_4.0.3.tgz"; - url = "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-4.0.3.tgz"; - sha1 = "651ff4593aa9eda8d5d0d66593a2417aeaeb325d"; + name = "postcss_value_parser___postcss_value_parser_4.1.0.tgz"; + url = "https://registry.yarnpkg.com/postcss-value-parser/-/postcss-value-parser-4.1.0.tgz"; + sha1 = "443f6a20ced6481a2bda4fa8532a6e55d789a2cb"; }; } { @@ -9146,11 +9378,11 @@ }; } { - name = "postcss___postcss_7.0.27.tgz"; + name = "postcss___postcss_7.0.35.tgz"; path = fetchurl { - name = "postcss___postcss_7.0.27.tgz"; - url = "https://registry.yarnpkg.com/postcss/-/postcss-7.0.27.tgz"; - sha1 = "cc67cdc6b0daa375105b7c424a85567345fc54d9"; + name = "postcss___postcss_7.0.35.tgz"; + url = "https://registry.yarnpkg.com/postcss/-/postcss-7.0.35.tgz"; + sha1 = "d2be00b998f7f211d8a276974079f2e92b970e24"; }; } { @@ -9186,11 +9418,11 @@ }; } { - name = "pretty_bytes___pretty_bytes_5.3.0.tgz"; + name = "pretty_bytes___pretty_bytes_5.4.1.tgz"; path = fetchurl { - name = "pretty_bytes___pretty_bytes_5.3.0.tgz"; - url = "https://registry.yarnpkg.com/pretty-bytes/-/pretty-bytes-5.3.0.tgz"; - sha1 = "f2849e27db79fb4d6cfe24764fc4134f165989f2"; + name = "pretty_bytes___pretty_bytes_5.4.1.tgz"; + url = "https://registry.yarnpkg.com/pretty-bytes/-/pretty-bytes-5.4.1.tgz"; + sha1 = "cd89f79bbcef21e3d21eb0da68ffe93f803e884b"; }; } { @@ -9210,11 +9442,11 @@ }; } { - name = "private___private_0.1.8.tgz"; + name = "pretty_format___pretty_format_25.5.0.tgz"; path = fetchurl { - name = "private___private_0.1.8.tgz"; - url = "https://registry.yarnpkg.com/private/-/private-0.1.8.tgz"; - sha1 = "2381edb3689f7a53d653190060fcf822d2f368ff"; + name = "pretty_format___pretty_format_25.5.0.tgz"; + url = "https://registry.yarnpkg.com/pretty-format/-/pretty-format-25.5.0.tgz"; + sha1 = "7873c1d774f682c34b8d48b6743a2bf2ac55791a"; }; } { @@ -9250,11 +9482,11 @@ }; } { - name = "promise_polyfill___promise_polyfill_7.1.2.tgz"; + name = "promise_polyfill___promise_polyfill_8.1.3.tgz"; path = fetchurl { - name = "promise_polyfill___promise_polyfill_7.1.2.tgz"; - url = "https://registry.yarnpkg.com/promise-polyfill/-/promise-polyfill-7.1.2.tgz"; - sha1 = "ab05301d8c28536301622d69227632269a70ca3b"; + name = "promise_polyfill___promise_polyfill_8.1.3.tgz"; + url = "https://registry.yarnpkg.com/promise-polyfill/-/promise-polyfill-8.1.3.tgz"; + sha1 = "8c99b3cf53f3a91c68226ffde7bde81d7f904116"; }; } { @@ -9306,11 +9538,11 @@ }; } { - name = "psl___psl_1.7.0.tgz"; + name = "psl___psl_1.8.0.tgz"; path = fetchurl { - name = "psl___psl_1.7.0.tgz"; - url = "https://registry.yarnpkg.com/psl/-/psl-1.7.0.tgz"; - sha1 = "f1c4c47a8ef97167dea5d6bbf4816d736e884a3c"; + name = "psl___psl_1.8.0.tgz"; + url = "https://registry.yarnpkg.com/psl/-/psl-1.8.0.tgz"; + sha1 = "9326f8bcfb013adcc005fdff056acce020e51c24"; }; } { @@ -9418,11 +9650,11 @@ }; } { - name = "querystringify___querystringify_2.1.1.tgz"; + name = "querystringify___querystringify_2.2.0.tgz"; path = fetchurl { - name = "querystringify___querystringify_2.1.1.tgz"; - url = "https://registry.yarnpkg.com/querystringify/-/querystringify-2.1.1.tgz"; - sha1 = "60e5a5fd64a7f8bfa4d2ab2ed6fdf4c85bad154e"; + name = "querystringify___querystringify_2.2.0.tgz"; + url = "https://registry.yarnpkg.com/querystringify/-/querystringify-2.2.0.tgz"; + sha1 = "3345941b4153cb9d082d8eee4cda2016a9aef7f6"; }; } { @@ -9554,19 +9786,19 @@ }; } { - name = "react_resize_detector___react_resize_detector_4.2.1.tgz"; + name = "react_resize_detector___react_resize_detector_5.2.0.tgz"; path = fetchurl { - name = "react_resize_detector___react_resize_detector_4.2.1.tgz"; - url = "https://registry.yarnpkg.com/react-resize-detector/-/react-resize-detector-4.2.1.tgz"; - sha1 = "8982b74c3e1cf949afaa3c41050458c87b033982"; + name = "react_resize_detector___react_resize_detector_5.2.0.tgz"; + url = "https://registry.yarnpkg.com/react-resize-detector/-/react-resize-detector-5.2.0.tgz"; + sha1 = "992083834432308c551a8251a2c52306d9d16718"; }; } { - name = "react_scripts___react_scripts_3.4.0.tgz"; + name = "react_scripts___react_scripts_3.4.3.tgz"; path = fetchurl { - name = "react_scripts___react_scripts_3.4.0.tgz"; - url = "https://registry.yarnpkg.com/react-scripts/-/react-scripts-3.4.0.tgz"; - sha1 = "f413680f0b5b937c8879ba1ffdae9b8c5b364bf5"; + name = "react_scripts___react_scripts_3.4.3.tgz"; + url = "https://registry.yarnpkg.com/react-scripts/-/react-scripts-3.4.3.tgz"; + sha1 = "21de5eb93de41ee92cd0b85b0e1298d0bb2e6c51"; }; } { @@ -9594,11 +9826,11 @@ }; } { - name = "reactstrap___reactstrap_8.4.1.tgz"; + name = "reactstrap___reactstrap_8.6.0.tgz"; path = fetchurl { - name = "reactstrap___reactstrap_8.4.1.tgz"; - url = "https://registry.yarnpkg.com/reactstrap/-/reactstrap-8.4.1.tgz"; - sha1 = "c7f63b9057f58b52833061711ebe235b9ec4e3e5"; + name = "reactstrap___reactstrap_8.6.0.tgz"; + url = "https://registry.yarnpkg.com/reactstrap/-/reactstrap-8.6.0.tgz"; + sha1 = "baee0d12990c9fef3c82199fb05e84d9f0af1a26"; }; } { @@ -9658,11 +9890,11 @@ }; } { - name = "readdirp___readdirp_3.3.0.tgz"; + name = "readdirp___readdirp_3.4.0.tgz"; path = fetchurl { - name = "readdirp___readdirp_3.3.0.tgz"; - url = "https://registry.yarnpkg.com/readdirp/-/readdirp-3.3.0.tgz"; - sha1 = "984458d13a1e42e2e9f5841b129e162f369aff17"; + name = "readdirp___readdirp_3.4.0.tgz"; + url = "https://registry.yarnpkg.com/readdirp/-/readdirp-3.4.0.tgz"; + sha1 = "9fdccdf9e9155805449221ac645e8303ab5b9ada"; }; } { @@ -9698,11 +9930,11 @@ }; } { - name = "regenerate___regenerate_1.4.0.tgz"; + name = "regenerate___regenerate_1.4.1.tgz"; path = fetchurl { - name = "regenerate___regenerate_1.4.0.tgz"; - url = "https://registry.yarnpkg.com/regenerate/-/regenerate-1.4.0.tgz"; - sha1 = "4a856ec4b56e4077c557589cae85e7a4c8869a11"; + name = "regenerate___regenerate_1.4.1.tgz"; + url = "https://registry.yarnpkg.com/regenerate/-/regenerate-1.4.1.tgz"; + sha1 = "cad92ad8e6b591773485fbe05a485caf4f457e6f"; }; } { @@ -9714,19 +9946,19 @@ }; } { - name = "regenerator_runtime___regenerator_runtime_0.13.5.tgz"; + name = "regenerator_runtime___regenerator_runtime_0.13.7.tgz"; path = fetchurl { - name = "regenerator_runtime___regenerator_runtime_0.13.5.tgz"; - url = "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.5.tgz"; - sha1 = "d878a1d094b4306d10b9096484b33ebd55e26697"; + name = "regenerator_runtime___regenerator_runtime_0.13.7.tgz"; + url = "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.7.tgz"; + sha1 = "cac2dacc8a1ea675feaabaeb8ae833898ae46f55"; }; } { - name = "regenerator_transform___regenerator_transform_0.14.4.tgz"; + name = "regenerator_transform___regenerator_transform_0.14.5.tgz"; path = fetchurl { - name = "regenerator_transform___regenerator_transform_0.14.4.tgz"; - url = "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.14.4.tgz"; - sha1 = "5266857896518d1616a78a0479337a30ea974cc7"; + name = "regenerator_transform___regenerator_transform_0.14.5.tgz"; + url = "https://registry.yarnpkg.com/regenerator-transform/-/regenerator-transform-0.14.5.tgz"; + sha1 = "c98da154683671c9c4dcb16ece736517e1b7feb4"; }; } { @@ -9762,27 +9994,27 @@ }; } { - name = "regexpp___regexpp_3.0.0.tgz"; + name = "regexpp___regexpp_3.1.0.tgz"; path = fetchurl { - name = "regexpp___regexpp_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/regexpp/-/regexpp-3.0.0.tgz"; - sha1 = "dd63982ee3300e67b41c1956f850aa680d9d330e"; + name = "regexpp___regexpp_3.1.0.tgz"; + url = "https://registry.yarnpkg.com/regexpp/-/regexpp-3.1.0.tgz"; + sha1 = "206d0ad0a5648cffbdb8ae46438f3dc51c9f78e2"; }; } { - name = "regexpu_core___regexpu_core_4.7.0.tgz"; + name = "regexpu_core___regexpu_core_4.7.1.tgz"; path = fetchurl { - name = "regexpu_core___regexpu_core_4.7.0.tgz"; - url = "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-4.7.0.tgz"; - sha1 = "fcbf458c50431b0bb7b45d6967b8192d91f3d938"; + name = "regexpu_core___regexpu_core_4.7.1.tgz"; + url = "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-4.7.1.tgz"; + sha1 = "2dea5a9a07233298fbf0db91fa9abc4c6e0f8ad6"; }; } { - name = "regjsgen___regjsgen_0.5.1.tgz"; + name = "regjsgen___regjsgen_0.5.2.tgz"; path = fetchurl { - name = "regjsgen___regjsgen_0.5.1.tgz"; - url = "https://registry.yarnpkg.com/regjsgen/-/regjsgen-0.5.1.tgz"; - sha1 = "48f0bf1a5ea205196929c0d9798b42d1ed98443c"; + name = "regjsgen___regjsgen_0.5.2.tgz"; + url = "https://registry.yarnpkg.com/regjsgen/-/regjsgen-0.5.2.tgz"; + sha1 = "92ff295fb1deecbf6ecdab2543d207e91aa33733"; }; } { @@ -9834,19 +10066,19 @@ }; } { - name = "request_promise_core___request_promise_core_1.1.3.tgz"; + name = "request_promise_core___request_promise_core_1.1.4.tgz"; path = fetchurl { - name = "request_promise_core___request_promise_core_1.1.3.tgz"; - url = "https://registry.yarnpkg.com/request-promise-core/-/request-promise-core-1.1.3.tgz"; - sha1 = "e9a3c081b51380dfea677336061fea879a829ee9"; + name = "request_promise_core___request_promise_core_1.1.4.tgz"; + url = "https://registry.yarnpkg.com/request-promise-core/-/request-promise-core-1.1.4.tgz"; + sha1 = "3eedd4223208d419867b78ce815167d10593a22f"; }; } { - name = "request_promise_native___request_promise_native_1.0.8.tgz"; + name = "request_promise_native___request_promise_native_1.0.9.tgz"; path = fetchurl { - name = "request_promise_native___request_promise_native_1.0.8.tgz"; - url = "https://registry.yarnpkg.com/request-promise-native/-/request-promise-native-1.0.8.tgz"; - sha1 = "a455b960b826e44e2bf8999af64dff2bfe58cb36"; + name = "request_promise_native___request_promise_native_1.0.9.tgz"; + url = "https://registry.yarnpkg.com/request-promise-native/-/request-promise-native-1.0.9.tgz"; + sha1 = "e407120526a5efdc9a39b28a5679bf47b9d9dc28"; }; } { @@ -9865,14 +10097,6 @@ sha1 = "8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"; }; } - { - name = "require_main_filename___require_main_filename_1.0.1.tgz"; - path = fetchurl { - name = "require_main_filename___require_main_filename_1.0.1.tgz"; - url = "https://registry.yarnpkg.com/require-main-filename/-/require-main-filename-1.0.1.tgz"; - sha1 = "97f717b69d48784f5f526a6c5aa8ffdda055a4d1"; - }; - } { name = "require_main_filename___require_main_filename_2.0.0.tgz"; path = fetchurl { @@ -9954,11 +10178,11 @@ }; } { - name = "resolve___resolve_1.15.1.tgz"; + name = "resolve___resolve_1.17.0.tgz"; path = fetchurl { - name = "resolve___resolve_1.15.1.tgz"; - url = "https://registry.yarnpkg.com/resolve/-/resolve-1.15.1.tgz"; - sha1 = "27bdcdeffeaf2d6244b95bb0f9f4b4653451f3e8"; + name = "resolve___resolve_1.17.0.tgz"; + url = "https://registry.yarnpkg.com/resolve/-/resolve-1.17.0.tgz"; + sha1 = "b25941b54968231cc2d1bb76a79cb7f2c0bf8444"; }; } { @@ -10058,11 +10282,11 @@ }; } { - name = "run_async___run_async_2.4.0.tgz"; + name = "run_async___run_async_2.4.1.tgz"; path = fetchurl { - name = "run_async___run_async_2.4.0.tgz"; - url = "https://registry.yarnpkg.com/run-async/-/run-async-2.4.0.tgz"; - sha1 = "e59054a5b86876cfae07f431d18cbaddc594f1e8"; + name = "run_async___run_async_2.4.1.tgz"; + url = "https://registry.yarnpkg.com/run-async/-/run-async-2.4.1.tgz"; + sha1 = "8440eccf99ea3e70bd409d49aab88e10c189a455"; }; } { @@ -10074,11 +10298,11 @@ }; } { - name = "rxjs___rxjs_6.5.4.tgz"; + name = "rxjs___rxjs_6.6.3.tgz"; path = fetchurl { - name = "rxjs___rxjs_6.5.4.tgz"; - url = "https://registry.yarnpkg.com/rxjs/-/rxjs-6.5.4.tgz"; - sha1 = "e0777fe0d184cec7872df147f303572d414e211c"; + name = "rxjs___rxjs_6.6.3.tgz"; + url = "https://registry.yarnpkg.com/rxjs/-/rxjs-6.6.3.tgz"; + sha1 = "8ca84635c4daa900c0d3967a6ee7ac60271ee552"; }; } { @@ -10090,11 +10314,11 @@ }; } { - name = "safe_buffer___safe_buffer_5.2.0.tgz"; + name = "safe_buffer___safe_buffer_5.2.1.tgz"; path = fetchurl { - name = "safe_buffer___safe_buffer_5.2.0.tgz"; - url = "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.0.tgz"; - sha1 = "b74daec49b1148f88c64b68d49b1e815c1f2f519"; + name = "safe_buffer___safe_buffer_5.2.1.tgz"; + url = "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz"; + sha1 = "1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6"; }; } { @@ -10122,11 +10346,11 @@ }; } { - name = "sanitize_html___sanitize_html_1.22.1.tgz"; + name = "sanitize_html___sanitize_html_1.27.5.tgz"; path = fetchurl { - name = "sanitize_html___sanitize_html_1.22.1.tgz"; - url = "https://registry.yarnpkg.com/sanitize-html/-/sanitize-html-1.22.1.tgz"; - sha1 = "5b36c92ab27917ddd2775396815c2bc1a6268310"; + name = "sanitize_html___sanitize_html_1.27.5.tgz"; + url = "https://registry.yarnpkg.com/sanitize-html/-/sanitize-html-1.27.5.tgz"; + sha1 = "6c8149462adb23e360e1bb71cc0bae7f08c823c7"; }; } { @@ -10161,6 +10385,14 @@ sha1 = "d59d1fd332ec92ad98a2e0b2ee644702384b1c5b"; }; } + { + name = "saxes___saxes_5.0.1.tgz"; + path = fetchurl { + name = "saxes___saxes_5.0.1.tgz"; + url = "https://registry.yarnpkg.com/saxes/-/saxes-5.0.1.tgz"; + sha1 = "eebab953fa3b7608dbe94e5dadb15c888fa6696d"; + }; + } { name = "scheduler___scheduler_0.19.1.tgz"; path = fetchurl { @@ -10178,11 +10410,11 @@ }; } { - name = "schema_utils___schema_utils_2.6.5.tgz"; + name = "schema_utils___schema_utils_2.7.1.tgz"; path = fetchurl { - name = "schema_utils___schema_utils_2.6.5.tgz"; - url = "https://registry.yarnpkg.com/schema-utils/-/schema-utils-2.6.5.tgz"; - sha1 = "c758f0a7e624263073d396e29cd40aa101152d8a"; + name = "schema_utils___schema_utils_2.7.1.tgz"; + url = "https://registry.yarnpkg.com/schema-utils/-/schema-utils-2.7.1.tgz"; + sha1 = "1ca4f32d1b24c590c203b8e7a50bf0ea4cd394d7"; }; } { @@ -10194,11 +10426,11 @@ }; } { - name = "selfsigned___selfsigned_1.10.7.tgz"; + name = "selfsigned___selfsigned_1.10.8.tgz"; path = fetchurl { - name = "selfsigned___selfsigned_1.10.7.tgz"; - url = "https://registry.yarnpkg.com/selfsigned/-/selfsigned-1.10.7.tgz"; - sha1 = "da5819fd049d5574f28e88a9bcc6dbc6e6f3906b"; + name = "selfsigned___selfsigned_1.10.8.tgz"; + url = "https://registry.yarnpkg.com/selfsigned/-/selfsigned-1.10.8.tgz"; + sha1 = "0d17208b7d12c33f8eac85c41835f27fc3d81a30"; }; } { @@ -10225,6 +10457,14 @@ sha1 = "5f3ca35761e47e05b206c6daff2cf814f0316b8e"; }; } + { + name = "semver___semver_7.3.2.tgz"; + path = fetchurl { + name = "semver___semver_7.3.2.tgz"; + url = "https://registry.yarnpkg.com/semver/-/semver-7.3.2.tgz"; + sha1 = "604962b052b81ed0786aae84389ffba70ffd3938"; + }; + } { name = "send___send_0.17.1.tgz"; path = fetchurl { @@ -10234,11 +10474,11 @@ }; } { - name = "serialize_javascript___serialize_javascript_2.1.2.tgz"; + name = "serialize_javascript___serialize_javascript_4.0.0.tgz"; path = fetchurl { - name = "serialize_javascript___serialize_javascript_2.1.2.tgz"; - url = "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-2.1.2.tgz"; - sha1 = "ecec53b0e0317bdc95ef76ab7074b7384785fa61"; + name = "serialize_javascript___serialize_javascript_4.0.0.tgz"; + url = "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-4.0.0.tgz"; + sha1 = "b525e1238489a5ecfc42afacc3fe99e666f4b1aa"; }; } { @@ -10370,19 +10610,19 @@ }; } { - name = "side_channel___side_channel_1.0.2.tgz"; + name = "side_channel___side_channel_1.0.3.tgz"; path = fetchurl { - name = "side_channel___side_channel_1.0.2.tgz"; - url = "https://registry.yarnpkg.com/side-channel/-/side-channel-1.0.2.tgz"; - sha1 = "df5d1abadb4e4bf4af1cd8852bf132d2f7876947"; + name = "side_channel___side_channel_1.0.3.tgz"; + url = "https://registry.yarnpkg.com/side-channel/-/side-channel-1.0.3.tgz"; + sha1 = "cdc46b057550bbab63706210838df5d4c19519c3"; }; } { - name = "signal_exit___signal_exit_3.0.2.tgz"; + name = "signal_exit___signal_exit_3.0.3.tgz"; path = fetchurl { - name = "signal_exit___signal_exit_3.0.2.tgz"; - url = "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.2.tgz"; - sha1 = "b5fdc08f1287ea1178628e415e25132b73646c6d"; + name = "signal_exit___signal_exit_3.0.3.tgz"; + url = "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.3.tgz"; + sha1 = "a1410c2edd8f077b08b4e253c8eacfcaf057461c"; }; } { @@ -10394,11 +10634,11 @@ }; } { - name = "sinon___sinon_7.5.0.tgz"; + name = "sinon___sinon_9.2.0.tgz"; path = fetchurl { - name = "sinon___sinon_7.5.0.tgz"; - url = "https://registry.yarnpkg.com/sinon/-/sinon-7.5.0.tgz"; - sha1 = "e9488ea466070ea908fd44a3d6478fd4923c67ec"; + name = "sinon___sinon_9.2.0.tgz"; + url = "https://registry.yarnpkg.com/sinon/-/sinon-9.2.0.tgz"; + sha1 = "1d333967e30023609f7347351ebc0dc964c0f3c9"; }; } { @@ -10474,11 +10714,11 @@ }; } { - name = "sockjs___sockjs_0.3.19.tgz"; + name = "sockjs___sockjs_0.3.20.tgz"; path = fetchurl { - name = "sockjs___sockjs_0.3.19.tgz"; - url = "https://registry.yarnpkg.com/sockjs/-/sockjs-0.3.19.tgz"; - sha1 = "d976bbe800af7bd20ae08598d582393508993c0d"; + name = "sockjs___sockjs_0.3.20.tgz"; + url = "https://registry.yarnpkg.com/sockjs/-/sockjs-0.3.20.tgz"; + sha1 = "b26a283ec562ef8b2687b44033a4eeceac75d855"; }; } { @@ -10506,11 +10746,11 @@ }; } { - name = "source_map_support___source_map_support_0.5.16.tgz"; + name = "source_map_support___source_map_support_0.5.19.tgz"; path = fetchurl { - name = "source_map_support___source_map_support_0.5.16.tgz"; - url = "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.16.tgz"; - sha1 = "0ae069e7fe3ba7538c64c98515e35339eac5a042"; + name = "source_map_support___source_map_support_0.5.19.tgz"; + url = "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.19.tgz"; + sha1 = "a98b62f86dcaf4f67399648c085291ab9e8fed61"; }; } { @@ -10538,35 +10778,35 @@ }; } { - name = "spdx_correct___spdx_correct_3.1.0.tgz"; + name = "spdx_correct___spdx_correct_3.1.1.tgz"; path = fetchurl { - name = "spdx_correct___spdx_correct_3.1.0.tgz"; - url = "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-3.1.0.tgz"; - sha1 = "fb83e504445268f154b074e218c87c003cd31df4"; + name = "spdx_correct___spdx_correct_3.1.1.tgz"; + url = "https://registry.yarnpkg.com/spdx-correct/-/spdx-correct-3.1.1.tgz"; + sha1 = "dece81ac9c1e6713e5f7d1b6f17d468fa53d89a9"; }; } { - name = "spdx_exceptions___spdx_exceptions_2.2.0.tgz"; + name = "spdx_exceptions___spdx_exceptions_2.3.0.tgz"; path = fetchurl { - name = "spdx_exceptions___spdx_exceptions_2.2.0.tgz"; - url = "https://registry.yarnpkg.com/spdx-exceptions/-/spdx-exceptions-2.2.0.tgz"; - sha1 = "2ea450aee74f2a89bfb94519c07fcd6f41322977"; + name = "spdx_exceptions___spdx_exceptions_2.3.0.tgz"; + url = "https://registry.yarnpkg.com/spdx-exceptions/-/spdx-exceptions-2.3.0.tgz"; + sha1 = "3f28ce1a77a00372683eade4a433183527a2163d"; }; } { - name = "spdx_expression_parse___spdx_expression_parse_3.0.0.tgz"; + name = "spdx_expression_parse___spdx_expression_parse_3.0.1.tgz"; path = fetchurl { - name = "spdx_expression_parse___spdx_expression_parse_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/spdx-expression-parse/-/spdx-expression-parse-3.0.0.tgz"; - sha1 = "99e119b7a5da00e05491c9fa338b7904823b41d0"; + name = "spdx_expression_parse___spdx_expression_parse_3.0.1.tgz"; + url = "https://registry.yarnpkg.com/spdx-expression-parse/-/spdx-expression-parse-3.0.1.tgz"; + sha1 = "cf70f50482eefdc98e3ce0a6833e4a53ceeba679"; }; } { - name = "spdx_license_ids___spdx_license_ids_3.0.5.tgz"; + name = "spdx_license_ids___spdx_license_ids_3.0.6.tgz"; path = fetchurl { - name = "spdx_license_ids___spdx_license_ids_3.0.5.tgz"; - url = "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.5.tgz"; - sha1 = "3694b5804567a458d3c8045842a6358632f62654"; + name = "spdx_license_ids___spdx_license_ids_3.0.6.tgz"; + url = "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.6.tgz"; + sha1 = "c80757383c28abf7296744998cbc106ae8b854ce"; }; } { @@ -10578,11 +10818,11 @@ }; } { - name = "spdy___spdy_4.0.1.tgz"; + name = "spdy___spdy_4.0.2.tgz"; path = fetchurl { - name = "spdy___spdy_4.0.1.tgz"; - url = "https://registry.yarnpkg.com/spdy/-/spdy-4.0.1.tgz"; - sha1 = "6f12ed1c5db7ea4f24ebb8b89ba58c87c08257f2"; + name = "spdy___spdy_4.0.2.tgz"; + url = "https://registry.yarnpkg.com/spdy/-/spdy-4.0.2.tgz"; + sha1 = "b74f466203a3eda452c02492b91fb9e84a27677b"; }; } { @@ -10601,14 +10841,6 @@ sha1 = "04e6926f662895354f3dd015203633b857297e2c"; }; } - { - name = "srcset___srcset_2.0.1.tgz"; - path = fetchurl { - name = "srcset___srcset_2.0.1.tgz"; - url = "https://registry.yarnpkg.com/srcset/-/srcset-2.0.1.tgz"; - sha1 = "8f842d357487eb797f413d9c309de7a5149df5ac"; - }; - } { name = "sshpk___sshpk_1.16.1.tgz"; path = fetchurl { @@ -10729,22 +10961,6 @@ sha1 = "107ef8c23456e187a8abd4a61162ff4ac6e25837"; }; } - { - name = "string_width___string_width_1.0.2.tgz"; - path = fetchurl { - name = "string_width___string_width_1.0.2.tgz"; - url = "https://registry.yarnpkg.com/string-width/-/string-width-1.0.2.tgz"; - sha1 = "118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3"; - }; - } - { - name = "string_width___string_width_2.1.1.tgz"; - path = fetchurl { - name = "string_width___string_width_2.1.1.tgz"; - url = "https://registry.yarnpkg.com/string-width/-/string-width-2.1.1.tgz"; - sha1 = "ab93f27a8dc13d28cac815c462143a6d9012ae9e"; - }; - } { name = "string_width___string_width_3.1.0.tgz"; path = fetchurl { @@ -10770,27 +10986,27 @@ }; } { - name = "string.prototype.trim___string.prototype.trim_1.2.1.tgz"; + name = "string.prototype.trim___string.prototype.trim_1.2.2.tgz"; path = fetchurl { - name = "string.prototype.trim___string.prototype.trim_1.2.1.tgz"; - url = "https://registry.yarnpkg.com/string.prototype.trim/-/string.prototype.trim-1.2.1.tgz"; - sha1 = "141233dff32c82bfad80684d7e5f0869ee0fb782"; + name = "string.prototype.trim___string.prototype.trim_1.2.2.tgz"; + url = "https://registry.yarnpkg.com/string.prototype.trim/-/string.prototype.trim-1.2.2.tgz"; + sha1 = "f538d0bacd98fc4297f0bef645226d5aaebf59f3"; }; } { - name = "string.prototype.trimleft___string.prototype.trimleft_2.1.1.tgz"; + name = "string.prototype.trimend___string.prototype.trimend_1.0.1.tgz"; path = fetchurl { - name = "string.prototype.trimleft___string.prototype.trimleft_2.1.1.tgz"; - url = "https://registry.yarnpkg.com/string.prototype.trimleft/-/string.prototype.trimleft-2.1.1.tgz"; - sha1 = "9bdb8ac6abd6d602b17a4ed321870d2f8dcefc74"; + name = "string.prototype.trimend___string.prototype.trimend_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.1.tgz"; + sha1 = "85812a6b847ac002270f5808146064c995fb6913"; }; } { - name = "string.prototype.trimright___string.prototype.trimright_2.1.1.tgz"; + name = "string.prototype.trimstart___string.prototype.trimstart_1.0.1.tgz"; path = fetchurl { - name = "string.prototype.trimright___string.prototype.trimright_2.1.1.tgz"; - url = "https://registry.yarnpkg.com/string.prototype.trimright/-/string.prototype.trimright-2.1.1.tgz"; - sha1 = "440314b15996c866ce8a0341894d45186200c5d9"; + name = "string.prototype.trimstart___string.prototype.trimstart_1.0.1.tgz"; + url = "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.1.tgz"; + sha1 = "14af6d9f34b053f7cfc89b72f8f2ee14b9039a54"; }; } { @@ -10874,11 +11090,11 @@ }; } { - name = "strip_json_comments___strip_json_comments_3.0.1.tgz"; + name = "strip_json_comments___strip_json_comments_3.1.1.tgz"; path = fetchurl { - name = "strip_json_comments___strip_json_comments_3.0.1.tgz"; - url = "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.0.1.tgz"; - sha1 = "85713975a91fb87bf1b305cca77395e40d2a64a7"; + 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"; }; } { @@ -10922,11 +11138,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"; }; } { @@ -10986,27 +11202,27 @@ }; } { - name = "terser_webpack_plugin___terser_webpack_plugin_2.3.4.tgz"; + name = "terser_webpack_plugin___terser_webpack_plugin_2.3.8.tgz"; path = fetchurl { - name = "terser_webpack_plugin___terser_webpack_plugin_2.3.4.tgz"; - url = "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-2.3.4.tgz"; - sha1 = "ac045703bd8da0936ce910d8fb6350d0e1dee5fe"; + name = "terser_webpack_plugin___terser_webpack_plugin_2.3.8.tgz"; + url = "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-2.3.8.tgz"; + sha1 = "894764a19b0743f2f704e7c2a848c5283a696724"; }; } { - name = "terser_webpack_plugin___terser_webpack_plugin_1.4.3.tgz"; + name = "terser_webpack_plugin___terser_webpack_plugin_1.4.5.tgz"; path = fetchurl { - name = "terser_webpack_plugin___terser_webpack_plugin_1.4.3.tgz"; - url = "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-1.4.3.tgz"; - sha1 = "5ecaf2dbdc5fb99745fd06791f46fc9ddb1c9a7c"; + name = "terser_webpack_plugin___terser_webpack_plugin_1.4.5.tgz"; + url = "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-1.4.5.tgz"; + sha1 = "a217aefaea330e734ffacb6120ec1fa312d6040b"; }; } { - name = "terser___terser_4.6.7.tgz"; + name = "terser___terser_4.8.0.tgz"; path = fetchurl { - name = "terser___terser_4.6.7.tgz"; - url = "https://registry.yarnpkg.com/terser/-/terser-4.6.7.tgz"; - sha1 = "478d7f9394ec1907f0e488c5f6a6a9a2bad55e72"; + name = "terser___terser_4.8.0.tgz"; + url = "https://registry.yarnpkg.com/terser/-/terser-4.8.0.tgz"; + sha1 = "63056343d7c70bb29f3af665865a46fe03a0df17"; }; } { @@ -11178,11 +11394,19 @@ }; } { - name = "ts_pnp___ts_pnp_1.1.5.tgz"; + name = "tr46___tr46_2.0.2.tgz"; path = fetchurl { - name = "ts_pnp___ts_pnp_1.1.5.tgz"; - url = "https://registry.yarnpkg.com/ts-pnp/-/ts-pnp-1.1.5.tgz"; - sha1 = "840e0739c89fce5f3abd9037bb091dbff16d9dec"; + name = "tr46___tr46_2.0.2.tgz"; + url = "https://registry.yarnpkg.com/tr46/-/tr46-2.0.2.tgz"; + sha1 = "03273586def1595ae08fedb38d7733cee91d2479"; + }; + } + { + name = "ts_pnp___ts_pnp_1.1.6.tgz"; + path = fetchurl { + name = "ts_pnp___ts_pnp_1.1.6.tgz"; + url = "https://registry.yarnpkg.com/ts-pnp/-/ts-pnp-1.1.6.tgz"; + sha1 = "389a24396d425a0d3162e96d2b4638900fdc289a"; }; } { @@ -11194,11 +11418,19 @@ }; } { - name = "tslib___tslib_1.11.1.tgz"; + name = "tsconfig_paths___tsconfig_paths_3.9.0.tgz"; path = fetchurl { - name = "tslib___tslib_1.11.1.tgz"; - url = "https://registry.yarnpkg.com/tslib/-/tslib-1.11.1.tgz"; - sha1 = "eb15d128827fbee2841549e171f45ed338ac7e35"; + name = "tsconfig_paths___tsconfig_paths_3.9.0.tgz"; + url = "https://registry.yarnpkg.com/tsconfig-paths/-/tsconfig-paths-3.9.0.tgz"; + sha1 = "098547a6c4448807e8fcb8eae081064ee9a3c90b"; + }; + } + { + name = "tslib___tslib_1.14.0.tgz"; + path = fetchurl { + name = "tslib___tslib_1.14.0.tgz"; + url = "https://registry.yarnpkg.com/tslib/-/tslib-1.14.0.tgz"; + sha1 = "d624983f3e2c5e0b55307c3dd6c86acd737622c6"; }; } { @@ -11282,11 +11514,11 @@ }; } { - name = "type___type_2.0.0.tgz"; + name = "type___type_2.1.0.tgz"; path = fetchurl { - name = "type___type_2.0.0.tgz"; - url = "https://registry.yarnpkg.com/type/-/type-2.0.0.tgz"; - sha1 = "5f16ff6ef2eb44f260494dae271033b29c09a9c3"; + name = "type___type_2.1.0.tgz"; + url = "https://registry.yarnpkg.com/type/-/type-2.1.0.tgz"; + sha1 = "9bdc22c648cf8cf86dd23d32336a41cfb6475e3f"; }; } { @@ -11306,11 +11538,11 @@ }; } { - name = "typescript___typescript_3.8.3.tgz"; + name = "typescript___typescript_3.9.7.tgz"; path = fetchurl { - name = "typescript___typescript_3.8.3.tgz"; - url = "https://registry.yarnpkg.com/typescript/-/typescript-3.8.3.tgz"; - sha1 = "409eb8544ea0335711205869ec458ab109ee1061"; + name = "typescript___typescript_3.9.7.tgz"; + url = "https://registry.yarnpkg.com/typescript/-/typescript-3.9.7.tgz"; + sha1 = "98d600a5ebdc38f40cb277522f12dc800e9e25fa"; }; } { @@ -11426,11 +11658,11 @@ }; } { - name = "uri_js___uri_js_4.2.2.tgz"; + name = "uri_js___uri_js_4.4.0.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.0.tgz"; + url = "https://registry.yarnpkg.com/uri-js/-/uri-js-4.4.0.tgz"; + sha1 = "aa714261de793e8a82347a7bcc9ce74e86f28602"; }; } { @@ -11538,11 +11770,11 @@ }; } { - name = "v8_compile_cache___v8_compile_cache_2.1.0.tgz"; + name = "v8_compile_cache___v8_compile_cache_2.1.1.tgz"; path = fetchurl { - name = "v8_compile_cache___v8_compile_cache_2.1.0.tgz"; - url = "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.1.0.tgz"; - sha1 = "e14de37b31a6d194f5690d67efc4e7f6fc6ab30e"; + name = "v8_compile_cache___v8_compile_cache_2.1.1.tgz"; + url = "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.1.1.tgz"; + sha1 = "54bc3cdd43317bca91e35dcaf305b1a7237de745"; }; } { @@ -11601,6 +11833,14 @@ sha1 = "30485ca7d70a6fd052420a3d12fd90e6339ce794"; }; } + { + name = "w3c_xmlserializer___w3c_xmlserializer_2.0.0.tgz"; + path = fetchurl { + name = "w3c_xmlserializer___w3c_xmlserializer_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/w3c-xmlserializer/-/w3c-xmlserializer-2.0.0.tgz"; + sha1 = "3e7104a05b75146cc60f564380b7f683acf1020a"; + }; + } { name = "walker___walker_1.0.7.tgz"; path = fetchurl { @@ -11618,11 +11858,19 @@ }; } { - name = "watchpack___watchpack_1.6.0.tgz"; + name = "watchpack_chokidar2___watchpack_chokidar2_2.0.0.tgz"; path = fetchurl { - name = "watchpack___watchpack_1.6.0.tgz"; - url = "https://registry.yarnpkg.com/watchpack/-/watchpack-1.6.0.tgz"; - sha1 = "4bc12c2ebe8aa277a71f1d3f14d685c7b446cd00"; + name = "watchpack_chokidar2___watchpack_chokidar2_2.0.0.tgz"; + url = "https://registry.yarnpkg.com/watchpack-chokidar2/-/watchpack-chokidar2-2.0.0.tgz"; + sha1 = "9948a1866cbbd6cb824dea13a7ed691f6c8ddff0"; + }; + } + { + name = "watchpack___watchpack_1.7.4.tgz"; + path = fetchurl { + name = "watchpack___watchpack_1.7.4.tgz"; + url = "https://registry.yarnpkg.com/watchpack/-/watchpack-1.7.4.tgz"; + sha1 = "6e9da53b3c80bb2d6508188f5b200410866cd30b"; }; } { @@ -11641,6 +11889,22 @@ sha1 = "a855980b1f0b6b359ba1d5d9fb39ae941faa63ad"; }; } + { + name = "webidl_conversions___webidl_conversions_5.0.0.tgz"; + path = fetchurl { + name = "webidl_conversions___webidl_conversions_5.0.0.tgz"; + url = "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-5.0.0.tgz"; + sha1 = "ae59c8a00b121543a2acc65c0434f57b0fc11aff"; + }; + } + { + name = "webidl_conversions___webidl_conversions_6.1.0.tgz"; + path = fetchurl { + name = "webidl_conversions___webidl_conversions_6.1.0.tgz"; + url = "https://registry.yarnpkg.com/webidl-conversions/-/webidl-conversions-6.1.0.tgz"; + sha1 = "9111b4d7ea80acd40f5270d666621afa78b69514"; + }; + } { name = "webpack_dev_middleware___webpack_dev_middleware_3.7.2.tgz"; path = fetchurl { @@ -11650,11 +11914,11 @@ }; } { - name = "webpack_dev_server___webpack_dev_server_3.10.2.tgz"; + name = "webpack_dev_server___webpack_dev_server_3.11.0.tgz"; path = fetchurl { - name = "webpack_dev_server___webpack_dev_server_3.10.2.tgz"; - url = "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-3.10.2.tgz"; - sha1 = "3403287d674c7407aab6d9b3f72259ecd0aa0874"; + name = "webpack_dev_server___webpack_dev_server_3.11.0.tgz"; + url = "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-3.11.0.tgz"; + sha1 = "8f154a3bce1bcfd1cc618ef4e703278855e7ff8c"; }; } { @@ -11682,19 +11946,27 @@ }; } { - name = "webpack___webpack_4.41.5.tgz"; + name = "webpack___webpack_4.42.0.tgz"; path = fetchurl { - name = "webpack___webpack_4.41.5.tgz"; - url = "https://registry.yarnpkg.com/webpack/-/webpack-4.41.5.tgz"; - sha1 = "3210f1886bce5310e62bb97204d18c263341b77c"; + name = "webpack___webpack_4.42.0.tgz"; + url = "https://registry.yarnpkg.com/webpack/-/webpack-4.42.0.tgz"; + sha1 = "b901635dd6179391d90740a63c93f76f39883eb8"; }; } { - name = "websocket_driver___websocket_driver_0.7.3.tgz"; + name = "websocket_driver___websocket_driver_0.6.5.tgz"; path = fetchurl { - name = "websocket_driver___websocket_driver_0.7.3.tgz"; - url = "https://registry.yarnpkg.com/websocket-driver/-/websocket-driver-0.7.3.tgz"; - sha1 = "a2d4e0d4f4f116f1e6297eba58b05d430100e9f9"; + name = "websocket_driver___websocket_driver_0.6.5.tgz"; + url = "https://registry.yarnpkg.com/websocket-driver/-/websocket-driver-0.6.5.tgz"; + sha1 = "5cb2556ceb85f4373c6d8238aa691c8454e13a36"; + }; + } + { + name = "websocket_driver___websocket_driver_0.7.4.tgz"; + path = fetchurl { + name = "websocket_driver___websocket_driver_0.7.4.tgz"; + url = "https://registry.yarnpkg.com/websocket-driver/-/websocket-driver-0.7.4.tgz"; + sha1 = "89ad5295bbf64b480abcba31e4953aca706f5760"; }; } { @@ -11714,19 +11986,11 @@ }; } { - name = "whatwg_fetch___whatwg_fetch_2.0.4.tgz"; + name = "whatwg_fetch___whatwg_fetch_3.4.1.tgz"; path = fetchurl { - name = "whatwg_fetch___whatwg_fetch_2.0.4.tgz"; - url = "https://registry.yarnpkg.com/whatwg-fetch/-/whatwg-fetch-2.0.4.tgz"; - sha1 = "dde6a5df315f9d39991aa17621853d720b85566f"; - }; - } - { - name = "whatwg_fetch___whatwg_fetch_3.0.0.tgz"; - path = fetchurl { - name = "whatwg_fetch___whatwg_fetch_3.0.0.tgz"; - url = "https://registry.yarnpkg.com/whatwg-fetch/-/whatwg-fetch-3.0.0.tgz"; - sha1 = "fc804e458cc460009b1a2b966bc8817d2578aefb"; + name = "whatwg_fetch___whatwg_fetch_3.4.1.tgz"; + url = "https://registry.yarnpkg.com/whatwg-fetch/-/whatwg-fetch-3.4.1.tgz"; + sha1 = "e5f871572d6879663fa5674c8f833f15a8425ab3"; }; } { @@ -11753,6 +12017,14 @@ sha1 = "c2c492f1eca612988efd3d2266be1b9fc6170d06"; }; } + { + name = "whatwg_url___whatwg_url_8.3.0.tgz"; + path = fetchurl { + name = "whatwg_url___whatwg_url_8.3.0.tgz"; + url = "https://registry.yarnpkg.com/whatwg-url/-/whatwg-url-8.3.0.tgz"; + sha1 = "d1e11e565334486cdb280d3101b9c3fd1c867582"; + }; + } { name = "which_module___which_module_2.0.0.tgz"; path = fetchurl { @@ -11929,14 +12201,6 @@ sha1 = "cb565bd6d7071a8f16660686051e969ad32f54d5"; }; } - { - name = "wrap_ansi___wrap_ansi_2.1.0.tgz"; - path = fetchurl { - name = "wrap_ansi___wrap_ansi_2.1.0.tgz"; - url = "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-2.1.0.tgz"; - sha1 = "d8fc3d284dd05794fe84973caecdd1cf824fdd85"; - }; - } { name = "wrap_ansi___wrap_ansi_5.1.0.tgz"; path = fetchurl { @@ -11986,11 +12250,11 @@ }; } { - name = "ws___ws_7.2.3.tgz"; + name = "ws___ws_7.3.1.tgz"; path = fetchurl { - name = "ws___ws_7.2.3.tgz"; - url = "https://registry.yarnpkg.com/ws/-/ws-7.2.3.tgz"; - sha1 = "a5411e1fb04d5ed0efee76d26d5c46d830c39b46"; + name = "ws___ws_7.3.1.tgz"; + url = "https://registry.yarnpkg.com/ws/-/ws-7.3.1.tgz"; + sha1 = "d0547bf67f7ce4f12a72dfe31262c68d7dc551c8"; }; } { @@ -12050,19 +12314,11 @@ }; } { - name = "yaml___yaml_1.8.3.tgz"; + name = "yaml___yaml_1.10.0.tgz"; path = fetchurl { - name = "yaml___yaml_1.8.3.tgz"; - url = "https://registry.yarnpkg.com/yaml/-/yaml-1.8.3.tgz"; - sha1 = "2f420fca58b68ce3a332d0ca64be1d191dd3f87a"; - }; - } - { - name = "yargs_parser___yargs_parser_11.1.1.tgz"; - path = fetchurl { - name = "yargs_parser___yargs_parser_11.1.1.tgz"; - url = "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-11.1.1.tgz"; - sha1 = "879a0865973bca9f6bab5cbdf3b1c67ec7d3bcf4"; + name = "yaml___yaml_1.10.0.tgz"; + url = "https://registry.yarnpkg.com/yaml/-/yaml-1.10.0.tgz"; + sha1 = "3b593add944876077d4d683fee01081bd9fff31e"; }; } { @@ -12073,14 +12329,6 @@ sha1 = "130f09702ebaeef2650d54ce6e3e5706f7a4fb38"; }; } - { - name = "yargs___yargs_12.0.5.tgz"; - path = fetchurl { - name = "yargs___yargs_12.0.5.tgz"; - url = "https://registry.yarnpkg.com/yargs/-/yargs-12.0.5.tgz"; - sha1 = "05f5997b609647b64f66b81e3b4b10a368e7ad13"; - }; - } { name = "yargs___yargs_13.3.2.tgz"; path = fetchurl { diff --git a/third_party/nixpkgs/pkgs/servers/mpd/default.nix b/third_party/nixpkgs/pkgs/servers/mpd/default.nix index d994ba99df..c025da8752 100644 --- a/third_party/nixpkgs/pkgs/servers/mpd/default.nix +++ b/third_party/nixpkgs/pkgs/servers/mpd/default.nix @@ -115,13 +115,13 @@ let in stdenv.mkDerivation rec { pname = "mpd"; - version = "0.22.1"; + version = "0.22.2"; src = fetchFromGitHub { owner = "MusicPlayerDaemon"; repo = "MPD"; rev = "v${version}"; - sha256 = "16cdmr5w1ikz4ih1nwxnynfdf8qiz4k8bak1sazkkhyavzl3jrl4"; + sha256 = "1pg3h3bvrsp24pv53yvwl5kr4m2csaxffdbrj5rm3b7w6pbqpfix"; }; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/servers/mqtt/mosquitto/default.nix b/third_party/nixpkgs/pkgs/servers/mqtt/mosquitto/default.nix index b2c52d77df..e956e3b7cf 100644 --- a/third_party/nixpkgs/pkgs/servers/mqtt/mosquitto/default.nix +++ b/third_party/nixpkgs/pkgs/servers/mqtt/mosquitto/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "mosquitto"; - version = "1.6.11"; + version = "1.6.12"; src = fetchFromGitHub { owner = "eclipse"; repo = "mosquitto"; rev = "v${version}"; - sha256 = "05mwghfmp459f7c0yph0xp1a5k6c0wghxzqm0n8jw7yfj7qixv88"; + sha256 = "0y9jna2p7wg57vv2g6ls1dj6w89vaw828y9z1wb3vwz1yhvs35s8"; }; postPatch = '' diff --git a/third_party/nixpkgs/pkgs/servers/nextcloud/default.nix b/third_party/nixpkgs/pkgs/servers/nextcloud/default.nix index a072536dbf..6b1e7de832 100644 --- a/third_party/nixpkgs/pkgs/servers/nextcloud/default.nix +++ b/third_party/nixpkgs/pkgs/servers/nextcloud/default.nix @@ -40,14 +40,14 @@ in { ''; nextcloud18 = generic { - version = "18.0.9"; - sha256 = "0rigg5pv2vnxgmjznlvxfc41s00raxa8jhib5vsznhj55qn99jm1"; + version = "18.0.10"; + sha256 = "0kv9mdn36shr98kh27969b8xs7pgczbyjklrfskxy9mph7bbzir6"; insecure = true; }; nextcloud19 = generic { - version = "19.0.3"; - sha256 = "0sc9cnsdh8kj60h7i3knh40ngdz1w1wmdqw2v2axfkmax22kjl7w"; + version = "19.0.4"; + sha256 = "0y5fccn61qf9fxjjpqdvhmxr9w5n4dgl1d7wcl2dzjv4bmqi2ms6"; }; nextcloud20 = generic { diff --git a/third_party/nixpkgs/pkgs/servers/nosql/riak-cs/2.1.1.nix b/third_party/nixpkgs/pkgs/servers/nosql/riak-cs/2.1.1.nix deleted file mode 100644 index 4ebcbafde5..0000000000 --- a/third_party/nixpkgs/pkgs/servers/nosql/riak-cs/2.1.1.nix +++ /dev/null @@ -1,70 +0,0 @@ -{ stdenv, lib, fetchurl, unzip, erlang, git, wget, which, pam -, Carbon ? null, Cocoa ? null }: - -stdenv.mkDerivation { - name = "riak_cs-2.1.1"; - - buildInputs = [ - which unzip erlang git wget - ] ++ lib.optionals stdenv.isDarwin [ Carbon Cocoa ] - ++ lib.optional stdenv.isLinux [ pam ]; - - src = fetchurl { - url = "https://s3.amazonaws.com/downloads.basho.com/riak-cs/2.1/2.1.1/riak-cs-2.1.1.tar.gz"; - sha256 = "115cac127aac6d759c1b429a52e0d18e491c0719a6530b1b88aa52c4efdbedd5"; - }; - - - postPatch = '' - sed -i deps/node_package/priv/base/env.sh \ - -e 's@{{platform_data_dir}}@''${RIAK_DATA_DIR:-/var/db/riak-cs}@' \ - -e 's@^RUNNER_SCRIPT_DIR=.*@RUNNER_SCRIPT_DIR='$out'/bin@' \ - -e 's@^RUNNER_BASE_DIR=.*@RUNNER_BASE_DIR='$out'@' \ - -e 's@^RUNNER_ETC_DIR=.*@RUNNER_ETC_DIR=''${RIAK_ETC_DIR:-/etc/riak-cs}@' \ - -e 's@^RUNNER_LOG_DIR=.*@RUNNER_LOG_DIR=''${RIAK_LOG_DIR:-/var/log}@' - - sed -i ./Makefile \ - -e 's@rel: deps compile@rel: deps compile-src@' - ''; - - preBuild = '' - patchShebangs . - ''; - - buildPhase = '' - runHook preBuild - - make locked-deps - make rel - - runHook postBuild - ''; - - doCheck = false; - - installPhase = '' - runHook preInstall - - mkdir $out - mv rel/riak-cs/etc rel/riak-cs/riak-etc - mkdir -p rel/riak-cs/etc - mv rel/riak-cs/riak-etc rel/riak-cs/etc/riak-cs - mv rel/riak-cs/* $out - - for prog in $out/bin/*; do - substituteInPlace $prog \ - --replace '. "`cd \`dirname $0\` && /bin/pwd`/../lib/env.sh"' \ - ". $out/lib/env.sh" - done - - runHook postInstall - ''; - - meta = with lib; { - description = "Dynamo inspired NoSQL DB by Basho with S3 compatibility"; - platforms = [ "x86_64-linux" "x86_64-darwin" ]; - license = licenses.asl20; - maintainers = with maintainers; [ mdaiter ]; - knownVulnerabilities = [ "CVE-2017-3163 - see https://github.com/NixOS/nixpkgs/issues/33876" ]; - }; -} diff --git a/third_party/nixpkgs/pkgs/servers/nosql/riak-cs/stanchion.nix b/third_party/nixpkgs/pkgs/servers/nosql/riak-cs/stanchion.nix deleted file mode 100644 index 5fe4ce45f8..0000000000 --- a/third_party/nixpkgs/pkgs/servers/nosql/riak-cs/stanchion.nix +++ /dev/null @@ -1,65 +0,0 @@ -{ stdenv, lib, fetchurl, unzip, erlang, git, wget, which, pam -, Carbon ? null, Cocoa ? null }: - -stdenv.mkDerivation { - name = "stanchion-2.1.1"; - - buildInputs = [ - which unzip erlang git wget - ] ++ lib.optionals stdenv.isDarwin [ Carbon Cocoa ] - ++ lib.optional stdenv.isLinux [ pam ]; - - src = fetchurl { - url = "https://s3.amazonaws.com/downloads.basho.com/stanchion/2.1/2.1.1/stanchion-2.1.1.tar.gz"; - sha256 = "1443arwgg7qvlx3msyg99qvvhck7qxphdjslcp494i60fhr2g8ja"; - }; - - - postPatch = '' - sed -i deps/node_package/priv/base/env.sh \ - -e 's@{{platform_data_dir}}@''${RIAK_DATA_DIR:-/var/db/stanchion}@' \ - -e 's@^RUNNER_SCRIPT_DIR=.*@RUNNER_SCRIPT_DIR='$out'/bin@' \ - -e 's@^RUNNER_BASE_DIR=.*@RUNNER_BASE_DIR='$out'@' \ - -e 's@^RUNNER_ETC_DIR=.*@RUNNER_ETC_DIR=''${RIAK_ETC_DIR:-/etc/stanchion}@' \ - -e 's@^RUNNER_LOG_DIR=.*@RUNNER_LOG_DIR=''${RIAK_LOG_DIR:-/var/log}@' - ''; - - preBuild = '' - patchShebangs . - ''; - - buildPhase = '' - runHook preBuild - - make rel - - runHook postBuild - ''; - - doCheck = false; - - installPhase = '' - runHook preInstall - - mkdir $out - mv rel/stanchion/etc rel/stanchion/riak-etc - mkdir -p rel/stanchion/etc - mv rel/stanchion/riak-etc rel/stanchion/etc/stanchion - mv rel/stanchion/* $out - - for prog in $out/bin/*; do - substituteInPlace $prog \ - --replace '. "`cd \`dirname $0\` && /bin/pwd`/../lib/env.sh"' \ - ". $out/lib/env.sh" - done - - runHook postInstall - ''; - - meta = with lib; { - maintainers = with maintainers; [ mdaiter ]; - description = "Manager for Riak CS"; - platforms = [ "x86_64-linux" "x86_64-darwin" ]; - license = licenses.asl20; - }; -} diff --git a/third_party/nixpkgs/pkgs/servers/rtsp-simple-server/default.nix b/third_party/nixpkgs/pkgs/servers/rtsp-simple-server/default.nix new file mode 100644 index 0000000000..72cebb95b6 --- /dev/null +++ b/third_party/nixpkgs/pkgs/servers/rtsp-simple-server/default.nix @@ -0,0 +1,35 @@ +{ stdenv +, fetchFromGitHub +, buildGoModule +}: + +buildGoModule rec { + pname = "rtsp-simple-server"; + version = "0.10.0"; + + src = fetchFromGitHub { + owner = "aler9"; + repo = pname; + rev = "v${version}"; + sha256 = "rnUmPyT9jAqm7Vf2TokgRGPTn7rTBUvrpJU21IopFsM="; + }; + + vendorSha256 = "jAWDz/TclfCKQR/Gh99zSiGAsraciNU+yzFe5DGTeQI="; + + # Tests need docker + doCheck = false; + + buildFlagsArray = [ + "-ldflags=-X main.Version=${version}" + ]; + + meta = with stdenv.lib; { + description = + "Ready-to-use RTSP server and RTSP proxy that allows to read and publish video and audio streams" + ; + inherit (src.meta) homepage; + license = licenses.mit; + maintainers = with maintainers; [ doronbehar ]; + }; + +} diff --git a/third_party/nixpkgs/pkgs/servers/sql/patroni/default.nix b/third_party/nixpkgs/pkgs/servers/sql/patroni/default.nix index 1634b0b5b7..bd06aa2ff7 100644 --- a/third_party/nixpkgs/pkgs/servers/sql/patroni/default.nix +++ b/third_party/nixpkgs/pkgs/servers/sql/patroni/default.nix @@ -39,7 +39,7 @@ pythonPackages.buildPythonApplication rec { checkInputs = with pythonPackages; [ flake8 mock - pytest + pytestCheckHook pytestcov requests ]; diff --git a/third_party/nixpkgs/pkgs/servers/sql/postgresql/default.nix b/third_party/nixpkgs/pkgs/servers/sql/postgresql/default.nix index bc1108ad33..31c60303c0 100644 --- a/third_party/nixpkgs/pkgs/servers/sql/postgresql/default.nix +++ b/third_party/nixpkgs/pkgs/servers/sql/postgresql/default.nix @@ -64,7 +64,9 @@ let (if atLeast "9.6" then ./patches/hardcode-pgxs-path-96.patch else ./patches/hardcode-pgxs-path.patch) ./patches/specify_pkglibdir_at_runtime.patch ./patches/findstring.patch - ] ++ lib.optional stdenv.isLinux (if atLeast "13" then ./patches/socketdir-in-run-13.patch else ./patches/socketdir-in-run.patch); + ] + ++ lib.optional (atLeast "10") ./patches/stabilize-timetz-dst.patch + ++ lib.optional stdenv.isLinux (if atLeast "13" then ./patches/socketdir-in-run-13.patch else ./patches/socketdir-in-run.patch); installTargets = [ "install-world" ]; diff --git a/third_party/nixpkgs/pkgs/servers/sql/postgresql/patches/stabilize-timetz-dst.patch b/third_party/nixpkgs/pkgs/servers/sql/postgresql/patches/stabilize-timetz-dst.patch new file mode 100644 index 0000000000..b6c633cb73 --- /dev/null +++ b/third_party/nixpkgs/pkgs/servers/sql/postgresql/patches/stabilize-timetz-dst.patch @@ -0,0 +1,117 @@ +From 4a071afbd056282746a5bc9362e87f579a56402d Mon Sep 17 00:00:00 2001 +From: Tom Lane +Date: Thu, 29 Oct 2020 15:28:14 -0400 +Subject: [PATCH 1/1] Stabilize timetz test across DST transitions. + +The timetz test cases I added in commit a9632830b were unintentionally +sensitive to whether or not DST is active in the PST8PDT time zone. +Thus, they'll start failing this coming weekend, as reported by +Bernhard M. Wiedemann in bug #16689. Fortunately, DST-awareness is +not significant to the purpose of these test cases, so we can just +force them all to PDT (DST hours) to preserve stability of the +results. + +Back-patch to v10, as the prior patch was. + +Discussion: https://postgr.es/m/16689-57701daa23b377bf@postgresql.org +Git viewer: https://git.postgresql.org/gitweb/?p=postgresql.git;a=commitdiff;h=4a071afbd056282746a5bc9362e87f579a56402d;hp=f90149e6285aaae6b48559afce1bd638ee26c33e +--- + src/test/regress/expected/timetz.out | 32 ++++++++++++++-------------- + src/test/regress/sql/timetz.sql | 16 +++++++------- + 2 files changed, 24 insertions(+), 24 deletions(-) + +diff --git a/src/test/regress/expected/timetz.out b/src/test/regress/expected/timetz.out +index 038bb5fa09..1ab5ed5105 100644 +--- a/src/test/regress/expected/timetz.out ++++ b/src/test/regress/expected/timetz.out +@@ -91,45 +91,45 @@ SELECT f1 AS "Ten" FROM TIMETZ_TBL WHERE f1 >= '00:00-07'; + (12 rows) + + -- Check edge cases +-SELECT '23:59:59.999999'::timetz; ++SELECT '23:59:59.999999 PDT'::timetz; + timetz + -------------------- + 23:59:59.999999-07 + (1 row) + +-SELECT '23:59:59.9999999'::timetz; -- rounds up ++SELECT '23:59:59.9999999 PDT'::timetz; -- rounds up + timetz + ------------- + 24:00:00-07 + (1 row) + +-SELECT '23:59:60'::timetz; -- rounds up ++SELECT '23:59:60 PDT'::timetz; -- rounds up + timetz + ------------- + 24:00:00-07 + (1 row) + +-SELECT '24:00:00'::timetz; -- allowed ++SELECT '24:00:00 PDT'::timetz; -- allowed + timetz + ------------- + 24:00:00-07 + (1 row) + +-SELECT '24:00:00.01'::timetz; -- not allowed +-ERROR: date/time field value out of range: "24:00:00.01" +-LINE 1: SELECT '24:00:00.01'::timetz; ++SELECT '24:00:00.01 PDT'::timetz; -- not allowed ++ERROR: date/time field value out of range: "24:00:00.01 PDT" ++LINE 1: SELECT '24:00:00.01 PDT'::timetz; + ^ +-SELECT '23:59:60.01'::timetz; -- not allowed +-ERROR: date/time field value out of range: "23:59:60.01" +-LINE 1: SELECT '23:59:60.01'::timetz; ++SELECT '23:59:60.01 PDT'::timetz; -- not allowed ++ERROR: date/time field value out of range: "23:59:60.01 PDT" ++LINE 1: SELECT '23:59:60.01 PDT'::timetz; + ^ +-SELECT '24:01:00'::timetz; -- not allowed +-ERROR: date/time field value out of range: "24:01:00" +-LINE 1: SELECT '24:01:00'::timetz; ++SELECT '24:01:00 PDT'::timetz; -- not allowed ++ERROR: date/time field value out of range: "24:01:00 PDT" ++LINE 1: SELECT '24:01:00 PDT'::timetz; + ^ +-SELECT '25:00:00'::timetz; -- not allowed +-ERROR: date/time field value out of range: "25:00:00" +-LINE 1: SELECT '25:00:00'::timetz; ++SELECT '25:00:00 PDT'::timetz; -- not allowed ++ERROR: date/time field value out of range: "25:00:00 PDT" ++LINE 1: SELECT '25:00:00 PDT'::timetz; + ^ + -- + -- TIME simple math +diff --git a/src/test/regress/sql/timetz.sql b/src/test/regress/sql/timetz.sql +index b699e4b03c..ce763d89e8 100644 +--- a/src/test/regress/sql/timetz.sql ++++ b/src/test/regress/sql/timetz.sql +@@ -36,14 +36,14 @@ SELECT f1 AS "None" FROM TIMETZ_TBL WHERE f1 < '00:00-07'; + SELECT f1 AS "Ten" FROM TIMETZ_TBL WHERE f1 >= '00:00-07'; + + -- Check edge cases +-SELECT '23:59:59.999999'::timetz; +-SELECT '23:59:59.9999999'::timetz; -- rounds up +-SELECT '23:59:60'::timetz; -- rounds up +-SELECT '24:00:00'::timetz; -- allowed +-SELECT '24:00:00.01'::timetz; -- not allowed +-SELECT '23:59:60.01'::timetz; -- not allowed +-SELECT '24:01:00'::timetz; -- not allowed +-SELECT '25:00:00'::timetz; -- not allowed ++SELECT '23:59:59.999999 PDT'::timetz; ++SELECT '23:59:59.9999999 PDT'::timetz; -- rounds up ++SELECT '23:59:60 PDT'::timetz; -- rounds up ++SELECT '24:00:00 PDT'::timetz; -- allowed ++SELECT '24:00:00.01 PDT'::timetz; -- not allowed ++SELECT '23:59:60.01 PDT'::timetz; -- not allowed ++SELECT '24:01:00 PDT'::timetz; -- not allowed ++SELECT '25:00:00 PDT'::timetz; -- not allowed + + -- + -- TIME simple math +-- +2.20.1 diff --git a/third_party/nixpkgs/pkgs/servers/tailscale/default.nix b/third_party/nixpkgs/pkgs/servers/tailscale/default.nix index 2e14b0fe7f..4c36d865da 100644 --- a/third_party/nixpkgs/pkgs/servers/tailscale/default.nix +++ b/third_party/nixpkgs/pkgs/servers/tailscale/default.nix @@ -2,20 +2,21 @@ buildGoModule rec { pname = "tailscale"; - version = "1.0.5"; + version = "1.2.1"; + tagHash = "614f6730fe7f46bc6e2128b9efd33bee92f3ff93"; # from `git rev-parse v1.2.1` src = fetchFromGitHub { owner = "tailscale"; repo = "tailscale"; rev = "v${version}"; - sha256 = "0ib2s694kf5iz5hvrlzfs80z0931dhva7yir80crq0pji9y4rp7b"; + sha256 = "1xkzh9b67fgp7flfvjja6328254j8gmlzmpnmb69klj3km5v6qmy"; }; nativeBuildInputs = [ makeWrapper ]; CGO_ENABLED = 0; - vendorSha256 = "0l9lzwwvshg9a2kmmq1cvvlaxncbas78a9hjhvjjar89rjr2k2sv"; + vendorSha256 = "01g3jkgl3jrygd154gmjm3dq13nkppd993iym7assdz8mr3rq31s"; doCheck = false; @@ -24,7 +25,7 @@ buildGoModule rec { preBuild = '' export buildFlagsArray=( -tags="xversion" - -ldflags="-X tailscale.com/version.LONG=${version} -X tailscale.com/version.SHORT=${version}" + -ldflags="-X tailscale.com/version.Long=${version} -X tailscale.com/version.Short=${version} -X tailscale.com/version.GitCommit=${tagHash}" ) ''; @@ -32,6 +33,8 @@ buildGoModule rec { wrapProgram $out/bin/tailscaled --prefix PATH : ${ lib.makeBinPath [ iproute iptables ] } + sed -i -e "s#/usr/sbin#$out/bin#" -e "/^EnvironmentFile/d" ./cmd/tailscaled/tailscaled.service + install -D -m0444 -t $out/lib/systemd/system ./cmd/tailscaled/tailscaled.service ''; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/servers/tracing/tempo/default.nix b/third_party/nixpkgs/pkgs/servers/tracing/tempo/default.nix new file mode 100644 index 0000000000..c97f8344c9 --- /dev/null +++ b/third_party/nixpkgs/pkgs/servers/tracing/tempo/default.nix @@ -0,0 +1,26 @@ +{ lib, buildGoModule, fetchFromGitHub }: + +buildGoModule rec { + version = "0.2.0"; + pname = "tempo"; + + src = fetchFromGitHub { + rev = "v${version}"; + owner = "grafana"; + repo = "tempo"; + sha256 = "061l72il8arxa53zfbasiwyjdxc4bf498glxrdj5ijcwgvx14275"; + }; + + vendorSha256 = null; + + # tests use docker + doCheck = false; + + meta = with lib; { + description = "A high volume, minimal dependency trace storage"; + license = licenses.asl20; + homepage = "https://grafana.com/oss/tempo/"; + maintainers = with maintainers; [ willibutz ]; + platforms = platforms.linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/servers/unifi/default.nix b/third_party/nixpkgs/pkgs/servers/unifi/default.nix index bce539ec0f..3cdd331f3b 100644 --- a/third_party/nixpkgs/pkgs/servers/unifi/default.nix +++ b/third_party/nixpkgs/pkgs/servers/unifi/default.nix @@ -54,7 +54,7 @@ in { }; unifiBeta = generic { - version = "6.0.23"; - sha256 = "sha256-t/s0UEk0CgnAeydtLWTgpZjnAJqnyfyESNNVe1d5PHo="; + version = "6.0.28"; + sha256 = "14q8r4mcqx0v3sh8zwqg4cc3iszqn5201q5r4c20cwqdd4ivf97q"; }; } diff --git a/third_party/nixpkgs/pkgs/servers/x11/xorg/default.nix b/third_party/nixpkgs/pkgs/servers/x11/xorg/default.nix index efc2cb2acb..263ae99333 100644 --- a/third_party/nixpkgs/pkgs/servers/x11/xorg/default.nix +++ b/third_party/nixpkgs/pkgs/servers/x11/xorg/default.nix @@ -703,11 +703,11 @@ lib.makeScope newScope (self: with self; { }) {}; libX11 = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libxcb, xtrans }: stdenv.mkDerivation { - name = "libX11-1.6.8"; + name = "libX11-1.6.12"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/lib/libX11-1.6.8.tar.bz2"; - sha256 = "1mbkwhhprhf49s2iwx7kiliprsdvd690zk44x3h53ql9q52si2dj"; + url = "mirror://xorg/individual/lib/libX11-1.6.12.tar.bz2"; + sha256 = "1ivfzl1qwk8zh7gc0m5vb58gdxz11jwg7w3d356w16j1d5s2427i"; }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; @@ -1054,11 +1054,11 @@ lib.makeScope newScope (self: with self; { }) {}; libXvMC = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libX11, libXext, libXv }: stdenv.mkDerivation { - name = "libXvMC-1.0.11"; + name = "libXvMC-1.0.12"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/lib/libXvMC-1.0.11.tar.bz2"; - sha256 = "0bb2c996p0smp2lwckffcfh4701bzv7266xh230ag0x68ka38bja"; + url = "mirror://xorg/individual/lib/libXvMC-1.0.12.tar.bz2"; + sha256 = "1kbdjsvkm5l7axv7g477qj18sab2wnqhliy6197syzizgfbsfgbb"; }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; @@ -1158,11 +1158,11 @@ lib.makeScope newScope (self: with self; { }) {}; libxcb = callPackage ({ stdenv, pkgconfig, fetchurl, libxslt, libpthreadstubs, libXau, xcbproto, libXdmcp, python }: stdenv.mkDerivation { - name = "libxcb-1.13.1"; + name = "libxcb-1.14"; builder = ./builder.sh; src = fetchurl { - url = "https://xcb.freedesktop.org/dist/libxcb-1.13.1.tar.bz2"; - sha256 = "1i27lvrcsygims1pddpl5c4qqs6z715lm12ax0n3vx0igapvg7x8"; + url = "mirror://xorg/individual/lib/libxcb-1.14.tar.xz"; + sha256 = "0d2chjgyn5lr9sfhacfvqgnj9l9faz11vn322a06jd6lk3dxcpm5"; }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig python ]; @@ -1431,11 +1431,11 @@ lib.makeScope newScope (self: with self; { }) {}; xcbproto = callPackage ({ stdenv, pkgconfig, fetchurl, python }: stdenv.mkDerivation { - name = "xcb-proto-1.13"; + name = "xcb-proto-1.14.1"; builder = ./builder.sh; src = fetchurl { - url = "https://xcb.freedesktop.org/dist/xcb-proto-1.13.tar.bz2"; - sha256 = "1qdxw9syhbvswiqj5dvj278lrmfhs81apzmvx6205s4vcqg7563v"; + url = "mirror://xorg/individual/proto/xcb-proto-1.14.1.tar.xz"; + sha256 = "1hzwazgyywd9mz4mjj1yv8ski27qqx7ypmyr27m39hrajyddsjph"; }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig python ]; @@ -1717,11 +1717,11 @@ lib.makeScope newScope (self: with self; { }) {}; xf86inputlibinput = callPackage ({ stdenv, pkgconfig, fetchurl, xorgproto, libinput, xorgserver }: stdenv.mkDerivation { - name = "xf86-input-libinput-0.28.2"; + name = "xf86-input-libinput-0.30.0"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/driver/xf86-input-libinput-0.28.2.tar.bz2"; - sha256 = "0818vr0yhk9j1y1wcbxzcd458vrvp06rrhi8k43bhqkb5jb4dcxq"; + url = "mirror://xorg/individual/driver/xf86-input-libinput-0.30.0.tar.bz2"; + sha256 = "1h4np66p87jf0c85ig524w8f5rbhl5gx8fww1qg0c55f87yzkizr"; }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; @@ -1963,7 +1963,7 @@ lib.makeScope newScope (self: with self; { meta.platforms = stdenv.lib.platforms.unix; }) {}; - xf86videointel = callPackage ({ stdenv, pkgconfig, fetchurl, cairo, xorgproto, libdrm, libpng, udev, libpciaccess, libX11, xcbutil, libxcb, libXcursor, libXdamage, libXext, libXfixes, xorgserver, libXrandr, libXrender, libxshmfence, libXtst, libXvMC }: stdenv.mkDerivation { + xf86videointel = callPackage ({ stdenv, pkgconfig, fetchurl, cairo, xorgproto, libdrm, libpng, udev, libpciaccess, libX11, xcbutil, libxcb, libXcursor, libXdamage, libXext, libXfixes, xorgserver, libXrandr, libXrender, libxshmfence, libXtst, libXvMC, libXv }: stdenv.mkDerivation { name = "xf86-video-intel-2.99.917"; builder = ./builder.sh; src = fetchurl { @@ -1972,7 +1972,7 @@ lib.makeScope newScope (self: with self; { }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; - buildInputs = [ cairo xorgproto libdrm libpng udev libpciaccess libX11 xcbutil libxcb libXcursor libXdamage libXext libXfixes xorgserver libXrandr libXrender libxshmfence libXtst libXvMC ]; + buildInputs = [ cairo xorgproto libdrm libpng udev libpciaccess libX11 xcbutil libxcb libXcursor libXdamage libXext libXfixes xorgserver libXrandr libXrender libxshmfence libXtst libXvMC libXv ]; meta.platforms = stdenv.lib.platforms.unix; }) {}; @@ -2679,11 +2679,11 @@ lib.makeScope newScope (self: with self; { }) {}; xorgproto = callPackage ({ stdenv, pkgconfig, fetchurl, libXt }: stdenv.mkDerivation { - name = "xorgproto-2019.1"; + name = "xorgproto-2020.1"; builder = ./builder.sh; src = fetchurl { - url = "mirror://xorg/individual/proto/xorgproto-2019.1.tar.bz2"; - sha256 = "16yll1kaffnslik5sizlw3qrigj1gpsgfgyq6903g3mwdixamnm6"; + url = "mirror://xorg/individual/proto/xorgproto-2020.1.tar.bz2"; + sha256 = "1llrnrkq6iprgiqakmwlv89745s9h02xsiaq0xn3fnh377qm78al"; }; hardeningDisable = [ "bindnow" "relro" ]; nativeBuildInputs = [ pkgconfig ]; diff --git a/third_party/nixpkgs/pkgs/servers/x11/xorg/overrides.nix b/third_party/nixpkgs/pkgs/servers/x11/xorg/overrides.nix index 80ea5553ad..e6047458cf 100644 --- a/third_party/nixpkgs/pkgs/servers/x11/xorg/overrides.nix +++ b/third_party/nixpkgs/pkgs/servers/x11/xorg/overrides.nix @@ -82,13 +82,6 @@ self: super: libX11 = super.libX11.overrideAttrs (attrs: { outputs = [ "out" "dev" "man" ]; - patches = [ - # Fixes an issue that happens when cross-compiling for us. - (fetchpatch { - url = "https://cgit.freedesktop.org/xorg/lib/libX11/patch/?id=0327c427d62f671eced067c6d9b69f4e216a8cac"; - sha256 = "11k2mx56hjgw886zf1cdf2nhv7052d5rggimfshg6lq20i38vpza"; - }) - ]; configureFlags = attrs.configureFlags or [] ++ malloc0ReturnsNullCrossFlag; depsBuildBuild = [ buildPackages.stdenv.cc ]; diff --git a/third_party/nixpkgs/pkgs/servers/x11/xorg/tarballs.list b/third_party/nixpkgs/pkgs/servers/x11/xorg/tarballs.list index ecc477980b..cd29460488 100644 --- a/third_party/nixpkgs/pkgs/servers/x11/xorg/tarballs.list +++ b/third_party/nixpkgs/pkgs/servers/x11/xorg/tarballs.list @@ -1,7 +1,5 @@ https://invisible-mirror.net/archives/luit/luit-20190106.tgz https://xcb.freedesktop.org/dist/libpthread-stubs-0.4.tar.bz2 -https://xcb.freedesktop.org/dist/libxcb-1.13.1.tar.bz2 -https://xcb.freedesktop.org/dist/xcb-proto-1.13.tar.bz2 https://xcb.freedesktop.org/dist/xcb-util-0.4.0.tar.bz2 https://xcb.freedesktop.org/dist/xcb-util-cursor-0.1.3.tar.bz2 https://xcb.freedesktop.org/dist/xcb-util-errors-1.0.tar.bz2 @@ -83,7 +81,7 @@ mirror://xorg/individual/doc/xorg-sgml-doctools-1.11.tar.bz2 mirror://xorg/individual/driver/xf86-input-evdev-2.10.6.tar.bz2 mirror://xorg/individual/driver/xf86-input-joystick-1.6.3.tar.bz2 mirror://xorg/individual/driver/xf86-input-keyboard-1.9.0.tar.bz2 -mirror://xorg/individual/driver/xf86-input-libinput-0.28.2.tar.bz2 +mirror://xorg/individual/driver/xf86-input-libinput-0.30.0.tar.bz2 mirror://xorg/individual/driver/xf86-input-mouse-1.9.3.tar.bz2 mirror://xorg/individual/driver/xf86-input-synaptics-1.9.1.tar.bz2 mirror://xorg/individual/driver/xf86-input-vmmouse-13.1.0.tar.bz2 @@ -177,10 +175,11 @@ mirror://xorg/individual/lib/libICE-1.0.10.tar.bz2 mirror://xorg/individual/lib/libpciaccess-0.16.tar.bz2 mirror://xorg/individual/lib/libSM-1.2.3.tar.bz2 mirror://xorg/individual/lib/libWindowsWM-1.0.1.tar.bz2 -mirror://xorg/individual/lib/libX11-1.6.8.tar.bz2 +mirror://xorg/individual/lib/libX11-1.6.12.tar.bz2 mirror://xorg/individual/lib/libXau-1.0.9.tar.bz2 mirror://xorg/individual/lib/libXaw-1.0.13.tar.bz2 mirror://xorg/individual/lib/libXaw3d-1.6.3.tar.bz2 +mirror://xorg/individual/lib/libxcb-1.14.tar.xz mirror://xorg/individual/lib/libXcomposite-0.4.5.tar.bz2 mirror://xorg/individual/lib/libXcursor-1.2.0.tar.bz2 mirror://xorg/individual/lib/libXdamage-1.1.5.tar.bz2 @@ -206,12 +205,13 @@ mirror://xorg/individual/lib/libXTrap-1.0.1.tar.bz2 mirror://xorg/individual/lib/libXt-1.2.0.tar.bz2 mirror://xorg/individual/lib/libXtst-1.2.3.tar.bz2 mirror://xorg/individual/lib/libXv-1.0.11.tar.bz2 -mirror://xorg/individual/lib/libXvMC-1.0.11.tar.bz2 +mirror://xorg/individual/lib/libXvMC-1.0.12.tar.bz2 mirror://xorg/individual/lib/libXxf86dga-1.1.5.tar.bz2 mirror://xorg/individual/lib/libXxf86misc-1.0.4.tar.bz2 mirror://xorg/individual/lib/libXxf86vm-1.1.4.tar.bz2 mirror://xorg/individual/lib/xtrans-1.4.0.tar.bz2 -mirror://xorg/individual/proto/xorgproto-2019.1.tar.bz2 +mirror://xorg/individual/proto/xcb-proto-1.14.1.tar.xz +mirror://xorg/individual/proto/xorgproto-2020.1.tar.bz2 mirror://xorg/individual/util/gccmakedep-1.0.3.tar.bz2 mirror://xorg/individual/util/imake-1.0.8.tar.bz2 mirror://xorg/individual/util/lndir-1.0.3.tar.bz2 diff --git a/third_party/nixpkgs/pkgs/servers/zoneminder/default.nix b/third_party/nixpkgs/pkgs/servers/zoneminder/default.nix index 935993b781..0bdaede49a 100644 --- a/third_party/nixpkgs/pkgs/servers/zoneminder/default.nix +++ b/third_party/nixpkgs/pkgs/servers/zoneminder/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, fetchFromGitHub, fetchurl, substituteAll, cmake, makeWrapper, pkgconfig +{ stdenv, lib, fetchFromGitHub, fetchurl, fetchpatch, substituteAll, cmake, makeWrapper, pkgconfig , curl, ffmpeg_3, glib, libjpeg, libselinux, libsepol, mp4v2, libmysqlclient, mysql, pcre, perl, perlPackages , polkit, utillinuxMinimal, x264, zlib , coreutils, procps, psmisc, nixosTests }: @@ -78,13 +78,13 @@ let in stdenv.mkDerivation rec { pname = "zoneminder"; - version = "1.34.16"; + version = "1.34.22"; src = fetchFromGitHub { owner = "ZoneMinder"; repo = "zoneminder"; rev = version; - sha256 = "azQbm8EkbypBf2NjplDVCb6duEC476hhKDA0EGqxxWE="; + sha256 = "1144j9crm0q5pwxnkmy3ahw1vbkddpbk2ys2m2pxxxiqifdhll83"; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/shells/bash/bash-completion/default.nix b/third_party/nixpkgs/pkgs/shells/bash/bash-completion/default.nix index eeb175a5e7..5fda570481 100644 --- a/third_party/nixpkgs/pkgs/shells/bash/bash-completion/default.nix +++ b/third_party/nixpkgs/pkgs/shells/bash/bash-completion/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "bash-completion"; - version = "2.10"; + version = "2.11"; src = fetchFromGitHub { owner = "scop"; repo = "bash-completion"; rev = version; - sha256 = "047yjryy9d6hp18wkigbfrw9r0sm31inlsp8l28fhxg8ii032sgq"; + sha256 = "0m3brd5jx7w07h8vxvvcmbyrlnadrx6hra3cvx6grzv6rin89liv"; }; nativeBuildInputs = [ autoreconfHook ]; diff --git a/third_party/nixpkgs/pkgs/shells/liquidprompt/default.nix b/third_party/nixpkgs/pkgs/shells/liquidprompt/default.nix index 783c07d160..9893624eaf 100644 --- a/third_party/nixpkgs/pkgs/shells/liquidprompt/default.nix +++ b/third_party/nixpkgs/pkgs/shells/liquidprompt/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "liquidprompt"; - version = "1.12.0"; + version = "1.12.1"; src = fetchFromGitHub { owner = "nojhan"; repo = pname; rev = "v${version}"; - sha256 = "0ibp1bz9s4bp3y5anivg5gp31q78024w39v7hbfw05qy25ax5h60"; + sha256 = "0vlwwkdbkxjsjcfmcspmq3f163kf0x4mwa8svxkzgnn2g4kl41ja"; }; installPhase = '' diff --git a/third_party/nixpkgs/pkgs/shells/mksh/default.nix b/third_party/nixpkgs/pkgs/shells/mksh/default.nix index 7abf75c70f..c19406e5f5 100644 --- a/third_party/nixpkgs/pkgs/shells/mksh/default.nix +++ b/third_party/nixpkgs/pkgs/shells/mksh/default.nix @@ -2,14 +2,14 @@ stdenv.mkDerivation rec { pname = "mksh"; - version = "59b"; + version = "59c"; src = fetchurl { urls = [ "https://www.mirbsd.org/MirOS/dist/mir/mksh/mksh-R${version}.tgz" "http://pub.allbsd.org/MirOS/dist/mir/mksh/mksh-R${version}.tgz" ]; - sha256 = "1rp0farbylypyiaald2hw5avg5w3m8x7cjnxxyyihzvfb2lx2zlh"; + sha256 = "01n5ggw33bw4jv4d3148wlw9n4aj7vdn3ffnc66c9w9pldjidbkp"; }; dontConfigure = true; diff --git a/third_party/nixpkgs/pkgs/shells/zsh/oh-my-zsh/default.nix b/third_party/nixpkgs/pkgs/shells/zsh/oh-my-zsh/default.nix index e7433e2de0..7c402b4733 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 @@ -1,18 +1,19 @@ # This script was inspired by the ArchLinux User Repository package: # # https://aur.archlinux.org/cgit/aur.git/tree/PKGBUILD?h=oh-my-zsh-git -{ stdenv, fetchFromGitHub }: +{ stdenv, fetchFromGitHub, nixosTests, writeScript, common-updater-scripts, git +, nix, nixfmt, jq, coreutils, gnused, curl, cacert }: stdenv.mkDerivation rec { - version = "2020-10-29"; + version = "2020-11-04"; pname = "oh-my-zsh"; - rev = "852a44094a3bb4df39f8f778bc7ada2ddda09727"; + rev = "3e6ee85a161c8089955c19364728e167025a911d"; src = fetchFromGitHub { inherit rev; owner = "ohmyzsh"; repo = "ohmyzsh"; - sha256 = "0021rayw5wiwgjfwy7d6g577xidws58vk7y9xxhidnmk9sr4vri7"; + sha256 = "/8ySf5ulSx2HtPG/tzPzOI1ljksxF+hGwjXFhGIseBk="; }; installPhase = '' @@ -65,6 +66,42 @@ stdenv.mkDerivation rec { EOF ''; + passthru = { + tests = { inherit (nixosTests) oh-my-zsh; }; + + updateScript = writeScript "update.sh" '' + #!${stdenv.shell} + set -o errexit + PATH=${ + stdenv.lib.makeBinPath [ + common-updater-scripts + curl + cacert + git + nixfmt + nix + jq + coreutils + gnused + ] + } + + oldVersion="$(nix-instantiate --eval -E "with import ./. {}; lib.getVersion oh-my-zsh" | tr -d '"')" + latestSha="$(curl -L -s https://api.github.com/repos/ohmyzsh/ohmyzsh/commits\?sha\=master\&since\=$oldVersion | jq -r '.[0].sha')" + + if [ ! "null" = "$latestSha" ]; then + nixpkgs="$(git rev-parse --show-toplevel)" + default_nix="$nixpkgs/pkgs/shells/zsh/oh-my-zsh/default.nix" + latestDate="$(curl -L -s https://api.github.com/repos/ohmyzsh/ohmyzsh/commits/$latestSha | jq '.commit.author.date' | sed 's|"\(.*\)T.*|\1|g')" + update-source-version oh-my-zsh "$latestSha" --version-key=rev + update-source-version oh-my-zsh "$latestDate" --ignore-same-hash + nixfmt "$default_nix" + else + echo "${pname} is already up-to-date" + fi + ''; + }; + meta = with stdenv.lib; { description = "A framework for managing your zsh configuration"; longDescription = '' diff --git a/third_party/nixpkgs/pkgs/shells/zsh/oh-my-zsh/update.sh b/third_party/nixpkgs/pkgs/shells/zsh/oh-my-zsh/update.sh deleted file mode 100755 index 738c081073..0000000000 --- a/third_party/nixpkgs/pkgs/shells/zsh/oh-my-zsh/update.sh +++ /dev/null @@ -1,19 +0,0 @@ -#!/usr/bin/env nix-shell -#!nix-shell -i bash -p curl common-updater-scripts jq - -set -eu -o pipefail - -oldVersion="$(nix-instantiate --eval -E "with import ./. {}; lib.getVersion oh-my-zsh" | tr -d '"')" -latestSha="$(curl -L -s https://api.github.com/repos/ohmyzsh/ohmyzsh/commits\?sha\=master\&since\=${oldVersion} | jq -r '.[0].sha')" - -if [ ! "null" = "${latestSha}" ]; then - latestDate="$(curl -L -s https://api.github.com/repos/ohmyzsh/ohmyzsh/commits/${latestSha} | jq '.commit.author.date' | sed 's|"\(.*\)T.*|\1|g')" - update-source-version oh-my-zsh "${latestSha}" --version-key=rev - update-source-version oh-my-zsh "${latestDate}" --ignore-same-hash - nixpkgs="$(git rev-parse --show-toplevel)" - default_nix="$nixpkgs/pkgs/shells/zsh/oh-my-zsh/default.nix" - git add "${default_nix}" - git commit -m "oh-my-zsh: ${oldVersion} -> ${latestDate}" -else - echo "oh-my-zsh is already up-to-date" -fi diff --git a/third_party/nixpkgs/pkgs/stdenv/darwin/default.nix b/third_party/nixpkgs/pkgs/stdenv/darwin/default.nix index a040e6ab24..58da8b71b6 100644 --- a/third_party/nixpkgs/pkgs/stdenv/darwin/default.nix +++ b/third_party/nixpkgs/pkgs/stdenv/darwin/default.nix @@ -190,10 +190,7 @@ in rec { stage1 = prevStage: let persistent = self: super: with prevStage; { - cmake = super.cmake.override { - isBootstrap = true; - useSharedLibraries = false; - }; + cmake = super.cmakeMinimal; python3 = super.python3Minimal; diff --git a/third_party/nixpkgs/pkgs/stdenv/generic/check-meta.nix b/third_party/nixpkgs/pkgs/stdenv/generic/check-meta.nix index c06f17b6fc..b93ea558ea 100644 --- a/third_party/nixpkgs/pkgs/stdenv/generic/check-meta.nix +++ b/third_party/nixpkgs/pkgs/stdenv/generic/check-meta.nix @@ -88,13 +88,28 @@ let broken-outputs = remediateOutputsToInstall; unknown-meta = x: ""; }; + remediation_env_var = allow_attr: { + Unfree = "NIXPKGS_ALLOW_UNFREE"; + Broken = "NIXPKGS_ALLOW_BROKEN"; + UnsupportedSystem = "NIXPKGS_ALLOW_UNSUPPORTED_SYSTEM"; + }.${allow_attr}; + remediation_phrase = allow_attr: { + Unfree = "unfree packages"; + Broken = "broken packages"; + UnsupportedSystem = "packages that are unsupported for this system"; + }.${allow_attr}; remediate_whitelist = allow_attr: attrs: '' - a) For `nixos-rebuild` you can set + a) To temporarily allow ${remediation_phrase allow_attr}, you can use an environment variable + for a single invocation of the nix tools. + + $ export ${remediation_env_var allow_attr}=1 + + b) For `nixos-rebuild` you can set { nixpkgs.config.allow${allow_attr} = true; } in configuration.nix to override this. - b) For `nix-env`, `nix-build`, `nix-shell` or any other Nix command you can add + c) For `nix-env`, `nix-build`, `nix-shell` or any other Nix command you can add { allow${allow_attr} = true; } to ~/.config/nixpkgs/config.nix. ''; diff --git a/third_party/nixpkgs/pkgs/test/default.nix b/third_party/nixpkgs/pkgs/test/default.nix index 85142090dd..d9befb9350 100644 --- a/third_party/nixpkgs/pkgs/test/default.nix +++ b/third_party/nixpkgs/pkgs/test/default.nix @@ -27,6 +27,8 @@ with pkgs; cc-multilib-gcc = callPackage ./cc-wrapper/multilib.nix { stdenv = gccMultiStdenv; }; cc-multilib-clang = callPackage ./cc-wrapper/multilib.nix { stdenv = clangMultiStdenv; }; + install-shell-files = callPackage ./install-shell-files {}; + kernel-config = callPackage ./kernel.nix {}; ld-library-path = callPackage ./ld-library-path {}; diff --git a/third_party/nixpkgs/pkgs/test/install-shell-files/default.nix b/third_party/nixpkgs/pkgs/test/install-shell-files/default.nix new file mode 100644 index 0000000000..e3729c7d25 --- /dev/null +++ b/third_party/nixpkgs/pkgs/test/install-shell-files/default.nix @@ -0,0 +1,125 @@ +{ stdenv, runCommandLocal, recurseIntoAttrs, installShellFiles }: + +let + runTest = name: env: buildCommand: + runCommandLocal "install-shell-files--${name}" ({ + nativeBuildInputs = [ installShellFiles ]; + meta.platforms = stdenv.lib.platforms.all; + } // env) buildCommand; +in + +recurseIntoAttrs { + # installManPage + + install-manpage = runTest "install-manpage" {} '' + mkdir -p doc + echo foo > doc/foo.1 + echo bar > doc/bar.2.gz + echo baz > doc/baz.3 + + installManPage doc/* + + cmp doc/foo.1 $out/share/man/man1/foo.1 + cmp doc/bar.2.gz $out/share/man/man2/bar.2.gz + cmp doc/baz.3 $out/share/man/man3/baz.3 + ''; + install-manpage-outputs = runTest "install-manpage-outputs" { + outputs = [ "out" "man" "devman" ]; + } '' + mkdir -p doc + echo foo > doc/foo.1 + echo bar > doc/bar.3 + + installManPage doc/* + + # assert they didn't go into $out + [[ ! -f $out/share/man/man1/foo.1 && ! -f $out/share/man/man3/bar.3 ]] + + # foo.1 alone went into man + cmp doc/foo.1 ''${!outputMan:?}/share/man/man1/foo.1 + [[ ! -f ''${!outputMan:?}/share/man/man3/bar.3 ]] + + # bar.3 alone went into devman + cmp doc/bar.3 ''${!outputDevman:?}/share/man/man3/bar.3 + [[ ! -f ''${!outputDevman:?}/share/man/man1/foo.1 ]] + + touch $out + ''; + + # installShellCompletion + + install-completion = runTest "install-completion" {} '' + echo foo > foo + echo bar > bar + echo baz > baz + echo qux > qux.zsh + echo quux > quux + + installShellCompletion --bash foo bar --zsh baz qux.zsh --fish quux + + cmp foo $out/share/bash-completion/completions/foo + cmp bar $out/share/bash-completion/completions/bar + cmp baz $out/share/zsh/site-functions/_baz + cmp qux.zsh $out/share/zsh/site-functions/_qux + cmp quux $out/share/fish/vendor_completions.d/quux + ''; + install-completion-output = runTest "install-completion-output" { + outputs = [ "out" "bin" ]; + } '' + echo foo > foo + + installShellCompletion --bash foo + + # assert it didn't go into $out + [[ ! -f $out/share/bash-completion/completions/foo ]] + + cmp foo ''${!outputBin:?}/share/bash-completion/completions/foo + + touch $out + ''; + install-completion-name = runTest "install-completion-name" {} '' + echo foo > foo + echo bar > bar + echo baz > baz + + installShellCompletion --bash --name foobar.bash foo --zsh --name _foobar bar --fish baz + + cmp foo $out/share/bash-completion/completions/foobar.bash + cmp bar $out/share/zsh/site-functions/_foobar + cmp baz $out/share/fish/vendor_completions.d/baz + ''; + install-completion-inference = runTest "install-completion-inference" {} '' + echo foo > foo.bash + echo bar > bar.zsh + echo baz > baz.fish + + installShellCompletion foo.bash bar.zsh baz.fish + + cmp foo.bash $out/share/bash-completion/completions/foo.bash + cmp bar.zsh $out/share/zsh/site-functions/_bar + cmp baz.fish $out/share/fish/vendor_completions.d/baz.fish + ''; + install-completion-cmd = runTest "install-completion-cmd" {} '' + echo foo > foo.bash + echo bar > bar.zsh + echo baz > baz.fish + echo qux > qux.fish + + installShellCompletion --cmd foobar --bash foo.bash --zsh bar.zsh --fish baz.fish --name qux qux.fish + + cmp foo.bash $out/share/bash-completion/completions/foobar.bash + cmp bar.zsh $out/share/zsh/site-functions/_foobar + cmp baz.fish $out/share/fish/vendor_completions.d/foobar.fish + cmp qux.fish $out/share/fish/vendor_completions.d/qux + ''; + install-completion-fifo = runTest "install-completion-fifo" {} '' + installShellCompletion \ + --bash --name foo.bash <(echo foo) \ + --zsh --name _foo <(echo bar) \ + --fish --name foo.fish <(echo baz) + + [[ $(<$out/share/bash-completion/completions/foo.bash) == foo ]] || { echo "foo.bash comparison failed"; exit 1; } + [[ $(<$out/share/zsh/site-functions/_foo) == bar ]] || { echo "_foo comparison failed"; exit 1; } + [[ $(<$out/share/fish/vendor_completions.d/foo.fish) == baz ]] || { echo "foo.fish comparison failed"; exit 1; } + ''; +} diff --git a/third_party/nixpkgs/pkgs/tools/X11/find-cursor/default.nix b/third_party/nixpkgs/pkgs/tools/X11/find-cursor/default.nix new file mode 100644 index 0000000000..13f2745778 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/X11/find-cursor/default.nix @@ -0,0 +1,26 @@ +{ stdenv, fetchFromGitHub, libX11, libXdamage, libXrender, libXcomposite, libXext, installShellFiles, git }: + +stdenv.mkDerivation rec { + pname = "find-cursor"; + version = "1.6"; + + src = fetchFromGitHub { + owner = "arp242"; + repo = "find-cursor"; + rev = "v${version}"; + sha256 = "13lpcxklv9ayqapyk9pmwxkinhxah5hkr6n0jc2m5hm68nh220w1"; + }; + + nativeBuildInputs = [ installShellFiles git ]; + buildInputs = [ libX11 libXdamage libXrender libXcomposite libXext ]; + preInstall = "mkdir -p $out/share/man/man1"; + installFlags = "PREFIX=${placeholder "out"}"; + + meta = with stdenv.lib; { + description = "Simple XLib program to highlight the cursor position"; + homepage = "https://github.com/arp242/find-cursor"; + license = licenses.mit; + platforms = platforms.linux; + maintainers = [ maintainers.yanganto ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/admin/azure-cli/default.nix b/third_party/nixpkgs/pkgs/tools/admin/azure-cli/default.nix index 8a9101cedd..5f636dcf74 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/azure-cli/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/azure-cli/default.nix @@ -1,12 +1,12 @@ { stdenv, lib, python, fetchFromGitHub, installShellFiles }: let - version = "2.12.1"; + version = "2.14.0"; src = fetchFromGitHub { owner = "Azure"; repo = "azure-cli"; rev = "azure-cli-${version}"; - sha256 = "14m2zjgaszrki34kva23vdsl0nxxifz8r9i54ld3idi8hj3nx0q3"; + sha256 = "0rihxkdckfkqzrr3jc8jpdpjg3pgz5jymyz19lpva8qqln7cmzpy"; }; # put packages that needs to be overriden in the py package scope @@ -23,6 +23,7 @@ py.pkgs.toPythonApplication (py.pkgs.buildAzureCliPackage { substituteInPlace setup.py \ --replace "javaproperties==0.5.1" "javaproperties" \ --replace "pytz==2019.1" "pytz" \ + --replace "antlr4-python3-runtime~=4.7.2" "antlr4-python3-runtime~=4.7" \ --replace "mock~=4.0" "mock" # remove namespace hacks @@ -113,6 +114,7 @@ py.pkgs.toPythonApplication (py.pkgs.buildAzureCliPackage { azure-multiapi-storage azure-storage-blob azure-synapse-accesscontrol + azure-synapse-artifacts azure-synapse-spark colorama cryptography @@ -164,9 +166,7 @@ py.pkgs.toPythonApplication (py.pkgs.buildAzureCliPackage { # almost the entire test suite requires an azure account setup and networking # ensure that the azure namespaces are setup correctly and that azure.cli can be accessed checkPhase = '' - cd azure # avoid finding local copy - ${py.interpreter} -c 'import azure.cli.core; assert "${version}" == azure.cli.core.__version__' - HOME=$TMPDIR ${py.interpreter} -m azure.cli --help + HOME=$TMPDIR $out/bin/az --help > /dev/null ''; # ensure these namespaces are able to be accessed diff --git a/third_party/nixpkgs/pkgs/tools/admin/azure-cli/python-packages.nix b/third_party/nixpkgs/pkgs/tools/admin/azure-cli/python-packages.nix index ca094137d7..ce3b3f657b 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/azure-cli/python-packages.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/azure-cli/python-packages.nix @@ -128,11 +128,14 @@ let azure-mgmt-batch = overrideAzureMgmtPackage super.azure-mgmt-batch "9.0.0" "zip" "1zn3yqwvm2f3sy8v0xvj4yb7m8kxxm1wpcaccxp91b0zzbn7wh83"; + azure-mgmt-billing = overrideAzureMgmtPackage super.azure-mgmt-billing "0.2.0" "zip" + "1li2bcdwdapwwx7xbvgfsq51f2mrwm0qyzih8cjhszcah2rkpxw5"; + azure-mgmt-policyinsights = overrideAzureMgmtPackage super.azure-mgmt-policyinsights "0.5.0" "zip" "1wxh7mgrknnhqyafdd7sbwx8plx0zga2af21vs6yhxy48lw9w8pd"; - azure-mgmt-rdbms = overrideAzureMgmtPackage super.azure-mgmt-rdbms "3.0.0rc1" "zip" - "0afg5vmyiwqna9rnal9ir2vyg2mykllsf313gd3kn99jl21bgns1"; + azure-mgmt-rdbms = overrideAzureMgmtPackage super.azure-mgmt-rdbms "3.1.0rc1" "zip" + "0jg242pjbxvcqskgrmw0q17mhafkip1d8p40hls0w0wn77cnic65"; azure-mgmt-recoveryservices = overrideAzureMgmtPackage super.azure-mgmt-recoveryservices "0.4.0" "zip" "0v0ycyjnnx09jqf958hj2q6zfpsn80bxxm98jf59y8rj09v99rz1"; @@ -146,11 +149,11 @@ let azure-mgmt-appconfiguration = overrideAzureMgmtPackage super.azure-mgmt-appconfiguration "0.6.0" "zip" "0pvc8f3g12q7als0pgy26kqi2i9grykwrjyiv2vijci9wxn22vpy"; - azure-mgmt-cognitiveservices = overrideAzureMgmtPackage super.azure-mgmt-cognitiveservices "6.2.0" "zip" - "1khk9jdfx7706xsqpwrnfsplv6p6wracvpyk9ki8zhc7p83kal4k"; + azure-mgmt-cognitiveservices = overrideAzureMgmtPackage super.azure-mgmt-cognitiveservices "6.3.0" "zip" + "059lhbxqx1r1717s8xz5ahpxwphq5fgy0h7k6b63cahm818rs0hx"; - azure-mgmt-compute = overrideAzureMgmtPackage super.azure-mgmt-compute "13.0.0" "zip" - "17ik8lfd74ki57rml2piswcanzbladsqy0s2m9jmvwpdrfpincvz"; + azure-mgmt-compute = overrideAzureMgmtPackage super.azure-mgmt-compute "14.0.0" "zip" + "0bvqv56plcgmnfyj0apphlbsn2vfm1a22idvy8y5npbfjz4zwja9"; azure-mgmt-consumption = overrideAzureMgmtPackage super.azure-mgmt-consumption "2.0.0" "zip" "12ai4qps73ivawh0yzvgb148ksx02r30pqlvfihx497j62gsi1cs"; @@ -206,8 +209,8 @@ let azure-mgmt-msi = overrideAzureMgmtPackage super.azure-mgmt-msi "0.2.0" "zip" "0rvik03njz940x2hvqg6iiq8k0d88gyygsr86w8s0sa12sdbq8l6"; - azure-mgmt-web = overrideAzureMgmtPackage super.azure-mgmt-web "0.47.0" "zip" - "1s6c477q2kpyiqkisw6l70ydyjkv3ay6zjjj4jl4ipv05a7356kq"; + azure-mgmt-web = overrideAzureMgmtPackage super.azure-mgmt-web "0.48.0" "zip" + "1v41k9rsflbm9g06mhi6jsygv9542da53qwjpjkp532jawxrw3ys"; azure-mgmt-redhatopenshift = overrideAzureMgmtPackage super.azure-mgmt-redhatopenshift "0.1.0" "zip" "1g65lbia1i1jw6qkyjz2ldyl3p90rbr78l8kfryg70sj7z3gnnjn"; @@ -218,6 +221,9 @@ let azure-mgmt-reservations = overrideAzureMgmtPackage super.azure-mgmt-reservations "0.6.0" "zip" "16ycni3cjl9c0mv419gy5rgbrlg8zp0vnr6aj8z8p2ypdw6sgac3"; + azure-mgmt-search = overrideAzureMgmtPackage super.azure-mgmt-search "2.0.0" "zip" + "14v8ja8har2xrb00v98610pqvakcdvnzw8hkd6wbr1np3f3dxi8f"; + azure-mgmt-security = overrideAzureMgmtPackage super.azure-mgmt-security "0.4.1" "zip" "08gf401d40bd1kn9wmpxcjxqdh84cd9hxm8rdjd0918483sqs71r"; @@ -248,8 +254,8 @@ let azure-mgmt-cdn = overrideAzureMgmtPackage super.azure-mgmt-cdn "5.0.0" "zip" "0y1bq6lirwx4n8zydi49jx72xfc7dppzhy82x22sx98id8lxgcwm"; - azure-mgmt-containerregistry = overrideAzureMgmtPackage super.azure-mgmt-containerregistry "3.0.0rc14" "zip" - "0w9hnxvk5pcsa21g3xrr089rfwgldghrbj8akzvh0gchqlzfjg6j"; + azure-mgmt-containerregistry = overrideAzureMgmtPackage super.azure-mgmt-containerregistry "3.0.0rc15" "zip" + "1fnmdl3m7kdn6c2ws5vrm7nwadcbq9mgc6g5bg4s1a4xjb23q6vb"; azure-mgmt-monitor = overrideAzureMgmtPackage super.azure-mgmt-monitor "0.11.0" "zip" "05jhn66d4sl1qi6w34rqd8wl500jndismiwhdmzzmprdvn1zxqf6"; @@ -266,14 +272,17 @@ let azure-mgmt-storage = overrideAzureMgmtPackage super.azure-mgmt-storage "11.2.0" "zip" "0a05djzgwnd9lwj5mazmjfv91k72v9scf612kf6vkjjq7jzkr3pw"; + azure-mgmt-servicebus = overrideAzureMgmtPackage super.azure-mgmt-servicebus "0.6.0" "zip" + "1c88pj8diijciizw4c6g1g6liz54cp3xmlm4xnmz97hizfw202gj"; + azure-mgmt-servicefabric = overrideAzureMgmtPackage super.azure-mgmt-servicefabric "0.5.0" "zip" "0x6wxb9zrvcayg3yw0nm99p10vvgc0x3zwk9amzs5m682r2z4wap"; azure-mgmt-hdinsight = overrideAzureMgmtPackage super.azure-mgmt-hdinsight "1.7.0" "zip" - "004q3d2kj1i1cx3sad1544n3pkindfm255sw19gdlhbw61wn5l5a"; + "0nq9gbhc2qlllz6v6mdymw25acxpay9cxiafb63pss30jyyj04cx"; - azure-multiapi-storage = overrideAzureMgmtPackage super.azure-multiapi-storage "0.4.1" "zip" - "0h7bzaqwyl3j9xqzjbnwxp59kmg6shxk76pml9kvvqbwsq9w6fx3"; + azure-multiapi-storage = overrideAzureMgmtPackage super.azure-multiapi-storage "0.5.2" "tar.gz" + "09y075mc7kig4dlb0xdvdvl9xbr931bi7kv60xaqnf31pf4pb7gf"; azure-graphrbac = super.azure-graphrbac.overrideAttrs(oldAttrs: rec { version = "0.60.0"; @@ -304,6 +313,16 @@ let }; }); + azure-synapse-artifacts = super.azure-synapse-artifacts.overrideAttrs(oldAttrs: rec { + version = "0.3.0"; + src = super.fetchPypi { + inherit (oldAttrs) pname; + inherit version; + sha256 = "0p43zmw96fh3wp75phf3fcqdfb36adqvxfc945yfda6fi555nw1a"; + extension = "zip"; + }; + }); + azure-synapse-accesscontrol = super.azure-synapse-accesscontrol.overrideAttrs(oldAttrs: rec { version = "0.2.0"; src = super.fetchPypi { diff --git a/third_party/nixpkgs/pkgs/tools/admin/procs/default.nix b/third_party/nixpkgs/pkgs/tools/admin/procs/default.nix index 54bdf238e3..528a4467bb 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/procs/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/procs/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "procs"; - version = "0.10.4"; + version = "0.10.5"; src = fetchFromGitHub { owner = "dalance"; repo = pname; rev = "v${version}"; - sha256 = "1a28kkxcrdfmrq2mmsfkdxfp3msklwga5nbfhjb7a7s64xh8jmjv"; + sha256 = "0w6a8pfk5s30yi5038kdqh4dncx2pskm7a23z66c4xj3842ci79c"; }; - cargoSha256 = "1xlxjr0pkwlzm7f5xlrsf76in28r9jj41n6gn44vxqbh4x161gs1"; + cargoSha256 = "07fwznx2czk1ibb77xcfhma9dpqps0m7rsmbb90gah6f32gah617"; buildInputs = stdenv.lib.optional stdenv.isDarwin Security; diff --git a/third_party/nixpkgs/pkgs/tools/admin/salt/default.nix b/third_party/nixpkgs/pkgs/tools/admin/salt/default.nix index 3796ec31d6..b66911c932 100644 --- a/third_party/nixpkgs/pkgs/tools/admin/salt/default.nix +++ b/third_party/nixpkgs/pkgs/tools/admin/salt/default.nix @@ -7,11 +7,11 @@ }: python3.pkgs.buildPythonApplication rec { pname = "salt"; - version = "3002"; + version = "3002.1"; src = python3.pkgs.fetchPypi { inherit pname version; - sha256 = "tiLJ3p/eVx25a/1lmhg76lU90m5xyshWWTh+k3IhquY="; + sha256 = "0pp7qcfwsvg4419hzfka1180pw3saa9mrhl0z9951zn9fw2nllsc"; }; propagatedBuildInputs = with python3.pkgs; [ diff --git a/third_party/nixpkgs/pkgs/tools/backup/kopia/default.nix b/third_party/nixpkgs/pkgs/tools/backup/kopia/default.nix index 47d9dc1b37..bcf51372f6 100644 --- a/third_party/nixpkgs/pkgs/tools/backup/kopia/default.nix +++ b/third_party/nixpkgs/pkgs/tools/backup/kopia/default.nix @@ -24,12 +24,6 @@ buildGoModule rec { ''; postConfigure = '' - # make 'vendor' writable - cp -L -r vendor tmp-vendor - rm -rf vendor - chmod -R u+w tmp-vendor - mv tmp-vendor vendor - # speakeasy hardcodes /bin/stty https://github.com/bgentry/speakeasy/issues/22 substituteInPlace vendor/github.com/bgentry/speakeasy/speakeasy_unix.go \ --replace "/bin/stty" "${coreutils}/bin/stty" diff --git a/third_party/nixpkgs/pkgs/tools/compression/brotli/default.nix b/third_party/nixpkgs/pkgs/tools/compression/brotli/default.nix index bf20e0119e..fd4872cf84 100644 --- a/third_party/nixpkgs/pkgs/tools/compression/brotli/default.nix +++ b/third_party/nixpkgs/pkgs/tools/compression/brotli/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "brotli"; - version = "1.0.7"; + version = "1.0.9"; src = fetchFromGitHub { owner = "google"; repo = "brotli"; rev = "v" + version; - sha256 = "1811b55wdfg4kbsjcgh1kc938g118jpvif97ilgrmbls25dfpvvw"; + sha256 = "z6Dhrabav1MDQ4rAcXaDv0aN+qOoh9cvoXZqEWBB13c="; }; nativeBuildInputs = [ cmake ]; @@ -32,7 +32,14 @@ stdenv.mkDerivation rec { # This breaks on Darwin because our cmake hook tries to make a build folder # and the wonderful bazel BUILD file is already there (yay case-insensitivity?) - prePatch = "rm BUILD"; + prePatch = '' + rm BUILD + + # Upstream fixed this reference to runtime-path after the release + # and with this references g++ complains about invalid option -R + sed -i 's/ -R''${libdir}//' scripts/libbrotli*.pc.in + cat scripts/libbrotli*.pc.in + ''; # Don't bother with "man" output for now, # it currently only makes the manpages hard to use. diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/ceph/ceph-glibc-2-32-sigdescr_np.patch b/third_party/nixpkgs/pkgs/tools/filesystems/ceph/ceph-glibc-2-32-sigdescr_np.patch new file mode 100644 index 0000000000..f78c7af9e3 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/filesystems/ceph/ceph-glibc-2-32-sigdescr_np.patch @@ -0,0 +1,63 @@ +From b9b6faf66ae67648626470cb4fc3f0850ac4d842 Mon Sep 17 00:00:00 2001 +From: David Disseldorp +Date: Tue, 1 Sep 2020 13:49:21 +0200 +Subject: [PATCH] cmake: detect and use sigdescr_np() if available + +sys_siglist is deprecated with glibc 2.32. A new thread-safe and +async-signal safe sigdescr_np() function is provided, so use it if +available. + +Fixes: https://tracker.ceph.com/issues/47187 +Signed-off-by: David Disseldorp +--- + cmake/modules/CephChecks.cmake | 1 + + src/global/signal_handler.h | 8 +++++--- + src/include/config-h.in.cmake | 3 +++ + 3 files changed, 9 insertions(+), 3 deletions(-) + +diff --git a/cmake/modules/CephChecks.cmake b/cmake/modules/CephChecks.cmake +index 23687283a7c6..ca86dcbc73de 100644 +--- a/cmake/modules/CephChecks.cmake ++++ b/cmake/modules/CephChecks.cmake +@@ -24,6 +24,7 @@ check_function_exists(strerror_r HAVE_Strerror_R) + check_function_exists(name_to_handle_at HAVE_NAME_TO_HANDLE_AT) + check_function_exists(pipe2 HAVE_PIPE2) + check_function_exists(accept4 HAVE_ACCEPT4) ++check_function_exists(sigdescr_np HAVE_SIGDESCR_NP) + + include(CMakePushCheckState) + cmake_push_check_state(RESET) +diff --git a/src/global/signal_handler.h b/src/global/signal_handler.h +index 476724201aa9..c101b2e28733 100644 +--- a/src/global/signal_handler.h ++++ b/src/global/signal_handler.h +@@ -20,10 +20,12 @@ + + typedef void (*signal_handler_t)(int); + +-#ifndef HAVE_REENTRANT_STRSIGNAL +-# define sig_str(signum) sys_siglist[signum] +-#else ++#ifdef HAVE_SIGDESCR_NP ++# define sig_str(signum) sigdescr_np(signum) ++#elif HAVE_REENTRANT_STRSIGNAL + # define sig_str(signum) strsignal(signum) ++#else ++# define sig_str(signum) sys_siglist[signum] + #endif + + void install_sighandler(int signum, signal_handler_t handler, int flags); +diff --git a/src/include/config-h.in.cmake b/src/include/config-h.in.cmake +index 1ea3703f620c..59bd4273511a 100644 +--- a/src/include/config-h.in.cmake ++++ b/src/include/config-h.in.cmake +@@ -220,6 +220,9 @@ + /* Define to 1 if you have sched.h. */ + #cmakedefine HAVE_SCHED 1 + ++/* Define to 1 if you have sigdescr_np. */ ++#cmakedefine HAVE_SIGDESCR_NP 1 ++ + /* Support SSE (Streaming SIMD Extensions) instructions */ + #cmakedefine HAVE_SSE + diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/ceph/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/ceph/default.nix index 9b9fe9a5aa..b221025f85 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/ceph/default.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/ceph/default.nix @@ -133,6 +133,7 @@ in rec { patches = [ ./0000-fix-SPDK-build-env.patch + ./ceph-glibc-2-32-sigdescr_np.patch ]; nativeBuildInputs = [ diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/mtools/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/mtools/default.nix index 58bd9340c5..5ebf82ea91 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/mtools/default.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/mtools/default.nix @@ -1,11 +1,11 @@ { stdenv, fetchurl }: stdenv.mkDerivation rec { - name = "mtools-4.0.24"; + name = "mtools-4.0.25"; src = fetchurl { url = "mirror://gnu/mtools/${name}.tar.bz2"; - sha256 = "1f9g7g8zspp8nvg1nz869il9pvxpdpchqd0vxfc89y8rjbda5x14"; + sha256 = "059cirrarizvcxv8zyp6ykaz45rymljpgdkdjc9kvadp7gn1w5px"; }; patches = stdenv.lib.optional stdenv.isDarwin ./UNUSED-darwin.patch; diff --git a/third_party/nixpkgs/pkgs/tools/graphics/piglit/default.nix b/third_party/nixpkgs/pkgs/tools/graphics/piglit/default.nix new file mode 100644 index 0000000000..e2c2b6e6e9 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/graphics/piglit/default.nix @@ -0,0 +1,77 @@ +{ stdenv +, fetchFromGitLab +, lib +, cmake +, freeglut +, libGL +, libGLU +, libglvnd +, makeWrapper +, ninja +, pkg-config +, python3 +, waffle +, wayland +, libX11 +, libXrender +, libxcb +, libxkbcommon +}: + +stdenv.mkDerivation rec { + pname = "piglit"; + version = "unstable-2020-10-23"; + + src = fetchFromGitLab { + domain = "gitlab.freedesktop.org"; + owner = "mesa"; + repo = "piglit"; + rev = "59e695c16fdcdd4ea4f16365f0e397a93cef7b80"; + sha256 = "kx0+2Sdvdc3SbpAIl2OuGCWCpaLJC/7cXG+ZLvf92g8="; + }; + + buildInputs = [ + freeglut + libGL + libGLU + libglvnd + libX11 + libXrender + libxcb + libxkbcommon + (python3.withPackages (ps: with ps; [ + Mako + numpy + ])) + waffle + wayland + ]; + + nativeBuildInputs = [ + cmake + makeWrapper + ninja + pkg-config + ]; + + # Find data dir: piglit searches for the data directory in some places, however as it is wrapped, + # it search in ../lib/.piglit-wrapped, we just replace the script name with "piglit" again. + prePatch = '' + substituteInPlace piglit \ + --replace 'script_basename_noext = os.path.splitext(os.path.basename(__file__))[0]' 'script_basename_noext = "piglit"' + ''; + + postInstall = '' + wrapProgram $out/bin/piglit \ + --prefix LD_LIBRARY_PATH : ${stdenv.lib.makeLibraryPath [ libGL libglvnd ]} \ + --prefix PATH : "${waffle}/bin" + ''; + + meta = with lib; { + description = "An OpenGL test suite, and test-suite runner"; + homepage = "https://gitlab.freedesktop.org/mesa/piglit"; + license = licenses.free; # custom license. See COPYING in the source repo. + platforms = platforms.mesaPlatforms; + maintainers = with maintainers; [ Flakebi ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/misc/as-tree/cargo-lock.patch b/third_party/nixpkgs/pkgs/tools/misc/as-tree/cargo-lock.patch new file mode 100644 index 0000000000..f7a06c050d --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/misc/as-tree/cargo-lock.patch @@ -0,0 +1,13 @@ +diff --git a/Cargo.lock b/Cargo.lock +index 991ecd8..9e94574 100644 +--- a/Cargo.lock ++++ b/Cargo.lock +@@ -11,7 +11,7 @@ dependencies = [ + + [[package]] + name = "as-tree" +-version = "0.11.1" ++version = "0.12.0" + dependencies = [ + "ansi_term", + "atty", diff --git a/third_party/nixpkgs/pkgs/tools/misc/as-tree/default.nix b/third_party/nixpkgs/pkgs/tools/misc/as-tree/default.nix new file mode 100644 index 0000000000..7cc97fd79e --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/misc/as-tree/default.nix @@ -0,0 +1,27 @@ +{ lib, fetchFromGitHub, rustPlatform }: + +rustPlatform.buildRustPackage rec { + pname = "as-tree"; + version = "0.12.0"; + + src = fetchFromGitHub { + owner = "jez"; + repo = pname; + rev = version; + sha256 = "0c0g32pkyhyvqpgvzlw9244c80npq6s8mxy3may7q4qyd7hi3dz5"; + }; + + cargoSha256 = "0yhd9svdxg7akv61msn7rf3rfblb7kxnyn955dfdwyxbxq48qwpr"; + # the upstream 0.12.0 release didn't update the Cargo.lock file properly + # they have updated their release script, so this patch can be removed + # when the next version is released. + cargoPatches = [ ./cargo-lock.patch ]; + + meta = with lib; { + description = "Print a list of paths as a tree of paths"; + homepage = "https://github.com/jez/as-tree"; + license = with licenses; [ blueOak100 ]; + maintainers = with maintainers; [ jshholland ]; + platforms = platforms.all; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/misc/cloud-utils/default.nix b/third_party/nixpkgs/pkgs/tools/misc/cloud-utils/default.nix index afae939ef3..bd6d59c8a0 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/cloud-utils/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/cloud-utils/default.nix @@ -17,10 +17,10 @@ in stdenv.mkDerivation rec { # $ nix-build nixos/release-combined.nix -A nixos.tests.ec2-nixops # growpart is needed in initrd in nixos/system/boot/grow-partition.nix pname = "cloud-utils"; - version = "0.31"; + version = "0.32"; src = fetchurl { url = "https://launchpad.net/cloud-utils/trunk/${version}/+download/cloud-utils-${version}.tar.gz"; - sha256 = "07fl3dlqwdzw4xx7mcxhpkks6dnmaxha80zgs9f6wmibgzni8z0r"; + sha256 = "0xxdi55lzw7j91zfajw7jhd2ilsqj2dy04i9brlk8j3pvb5ma8hk"; }; nativeBuildInputs = [ makeWrapper ]; buildInputs = [ python3 ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/coreutils/avoid-false-positive-in-date-debug-test.patch b/third_party/nixpkgs/pkgs/tools/misc/coreutils/avoid-false-positive-in-date-debug-test.patch deleted file mode 100644 index ae1a02d4d2..0000000000 --- a/third_party/nixpkgs/pkgs/tools/misc/coreutils/avoid-false-positive-in-date-debug-test.patch +++ /dev/null @@ -1,52 +0,0 @@ -From 0251229bfd9617e8a35cf9dd7d338d63fff74a0c Mon Sep 17 00:00:00 2001 -From: Assaf Gordon -Date: Mon, 13 May 2019 16:37:40 -0600 -Subject: [PATCH] tests: avoid false-positive in date-debug test -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -When debugging an invalid date due to DST switching, the intermediate -'normalized time' should not be checked - its value can differ between -systems (e.g. glibc vs musl). - -Reported by Niklas Hambüchen in -https://lists.gnu.org/r/coreutils/2019-05/msg00031.html -Analyzed by Rich Felker in -https://lists.gnu.org/r/coreutils/2019-05/msg00039.html - -* tests/misc/date-debug.sh: Replace the exact normalized time -with 'XX:XX:XX' so different values would not trigger test failure. ---- - tests/misc/date-debug.sh | 11 +++++++++-- - 1 file changed, 9 insertions(+), 2 deletions(-) - -diff --git a/tests/misc/date-debug.sh b/tests/misc/date-debug.sh -index aa47f1abb..2ce6f4ce8 100755 ---- a/tests/misc/date-debug.sh -+++ b/tests/misc/date-debug.sh -@@ -71,7 +71,7 @@ date: input timezone: TZ="America/Edmonton" in date string - date: using specified time as starting value: '02:30:00' - date: error: invalid date/time value: - date: user provided time: '(Y-M-D) 2006-04-02 02:30:00' --date: normalized time: '(Y-M-D) 2006-04-02 03:30:00' -+date: normalized time: '(Y-M-D) 2006-04-02 XX:XX:XX' - date: -- - date: possible reasons: - date: non-existing due to daylight-saving time; -@@ -81,7 +81,14 @@ date: invalid date 'TZ="America/Edmonton" 2006-04-02 02:30:00' - EOF - - # date should return 1 (error) for invalid date --returns_ 1 date --debug -d "$in2" >out2 2>&1 || fail=1 -+returns_ 1 date --debug -d "$in2" >out2-t 2>&1 || fail=1 -+ -+# The output line of "normalized time" can differ between systems -+# (e.g. glibc vs musl) and should not be checked. -+# See: https://lists.gnu.org/archive/html/coreutils/2019-05/msg00039.html -+sed '/normalized time:/s/ [0-9][0-9]:[0-9][0-9]:[0-9][0-9]/ XX:XX:XX/' \ -+ out2-t > out2 || framework_failure_ -+ - compare exp2 out2 || fail=1 - - ## diff --git a/third_party/nixpkgs/pkgs/tools/misc/coreutils/coreutils-8.31-android-cross.patch b/third_party/nixpkgs/pkgs/tools/misc/coreutils/coreutils-8.31-android-cross.patch deleted file mode 100644 index 97d95d1c5b..0000000000 --- a/third_party/nixpkgs/pkgs/tools/misc/coreutils/coreutils-8.31-android-cross.patch +++ /dev/null @@ -1,51 +0,0 @@ -From 3bd82a82cf4ba693d2c31c7b95aaec4e56dc92a4 Mon Sep 17 00:00:00 2001 -From: Paul Eggert -Date: Mon, 11 Mar 2019 16:40:29 -0700 -Subject: [PATCH 1/1] strtod: fix clash with strtold - -Problem reported for RHEL 5 by Jesse Caldwell (Bug#34817). -* lib/strtod.c (compute_minus_zero, minus_zero): -Simplify by remving the macro / external variable, -and having just a function. User changed. This avoids -the need for an external variable that might clash. ---- - ChangeLog | 9 +++++++++ - lib/strtod.c | 11 +++++------ - 2 files changed, 14 insertions(+), 6 deletions(-) - -diff --git a/lib/strtod.c b/lib/strtod.c -index b9eaa51..69b1564 100644 ---- a/lib/strtod.c -+++ b/lib/strtod.c -@@ -294,16 +294,15 @@ parse_number (const char *nptr, - ICC 10.0 has a bug when optimizing the expression -zero. - The expression -MIN * MIN does not work when cross-compiling - to PowerPC on Mac OS X 10.5. */ --#if defined __hpux || defined __sgi || defined __ICC - static DOUBLE --compute_minus_zero (void) -+minus_zero (void) - { -+#if defined __hpux || defined __sgi || defined __ICC - return -MIN * MIN; --} --# define minus_zero compute_minus_zero () - #else --DOUBLE minus_zero = -0.0; -+ return -0.0; - #endif -+} - - /* Convert NPTR to a DOUBLE. If ENDPTR is not NULL, a pointer to the - character after the last one used in the number is put in *ENDPTR. */ -@@ -479,6 +478,6 @@ STRTOD (const char *nptr, char **endptr) - /* Special case -0.0, since at least ICC miscompiles negation. We - can't use copysign(), as that drags in -lm on some platforms. */ - if (!num && negative) -- return minus_zero; -+ return minus_zero (); - return negative ? -num : num; - } --- -1.9.1 - diff --git a/third_party/nixpkgs/pkgs/tools/misc/coreutils/coreutils-8.31-musl-cross.patch b/third_party/nixpkgs/pkgs/tools/misc/coreutils/coreutils-8.31-musl-cross.patch deleted file mode 100644 index 02b0b85db3..0000000000 --- a/third_party/nixpkgs/pkgs/tools/misc/coreutils/coreutils-8.31-musl-cross.patch +++ /dev/null @@ -1,1153 +0,0 @@ -From 453ff940449bbbde9ec00f0bbf82a359c5598fc7 Mon Sep 17 00:00:00 2001 -From: Bruno Haible -Date: Sat, 23 Mar 2019 23:00:52 +0100 -Subject: [PATCH 1/1] Support cross-compilation to musl libc. - -Reported by Necktwi Ozfguah . - -* m4/calloc.m4 (_AC_FUNC_CALLOC_IF): Add cross-compilation guesses for -musl libc. -* m4/canonicalize.m4 (gl_FUNC_REALPATH_WORKS): Likewise. -* m4/chown.m4 (gl_FUNC_CHOWN): Likewise. -* m4/d-ino.m4 (gl_CHECK_TYPE_STRUCT_DIRENT_D_INO): Likewise. -* m4/fdopendir.m4 (gl_FUNC_FDOPENDIR): Likewise. -* m4/fnmatch.m4 (gl_FUNC_FNMATCH_POSIX): Likewise. -* m4/fpurge.m4 (gl_FUNC_FPURGE): Likewise. -* m4/getcwd.m4 (gl_FUNC_GETCWD_NULL): Likewise. -* m4/getcwd-abort-bug.m4 (gl_FUNC_GETCWD_ABORT_BUG): Likewise. -* m4/getdelim.m4 (gl_FUNC_GETDELIM): Likewise. -* m4/getgroups.m4 (AC_FUNC_GETGROUPS, gl_FUNC_GETGROUPS): Likewise. -* m4/getline.m4 (gl_FUNC_GETLINE): Likewise. -* m4/gettimeofday.m4 (gl_FUNC_GETTIMEOFDAY_CLOBBER): Likewise. -* m4/hypot.m4 (gl_FUNC_HYPOT): Likewise. // removed -* m4/hypotf.m4 (gl_FUNC_HYPOTF): Likewise. // removed -* m4/hypotl.m4 (gl_FUNC_HYPOTL): Likewise. // removed -* m4/iconv_open-utf.m4 (gl_FUNC_ICONV_OPEN_UTF_SUPPORT): Likewise. // removed -* m4/link-follow.m4 (gl_FUNC_LINK_FOLLOWS_SYMLINK): Likewise. -* m4/log.m4 (gl_FUNC_LOG): Likewise. // removed -* m4/logf.m4 (gl_FUNC_LOGF): Likewise. // removed -* m4/logl.m4 (gl_FUNC_LOGL_WORKS): Likewise. // removed -* m4/log10.m4 (gl_FUNC_LOG10): Likewise. // removed -* m4/log10f.m4 (gl_FUNC_LOG10F): Likewise. // removed -* m4/log10l.m4 (gl_FUNC_LOG10L): Likewise. // removed -* m4/log1p.m4 (gl_FUNC_LOG1P): Likewise. // removed -* m4/log1pf.m4 (gl_FUNC_LOG1PF): Likewise. // removed -* m4/log1pl.m4 (gl_FUNC_LOG1PL): Likewise. // removed -* m4/log2.m4 (gl_FUNC_LOG2): Likewise. // removed -* m4/log2f.m4 (gl_FUNC_LOG2F): Likewise. // removed -* m4/malloc.m4 (_AC_FUNC_MALLOC_IF): Likewise. -* m4/mkdir.m4 (gl_FUNC_MKDIR): Likewise. -* m4/mkstemp.m4 (gl_FUNC_MKSTEMP): Likewise. -* m4/modf.m4 (gl_FUNC_MODF): Likewise. // removed -* m4/modff.m4 (gl_FUNC_MODFF): Likewise. // removed -* m4/modfl.m4 (gl_FUNC_MODFL): Likewise. // removed -* m4/perror.m4 (gl_FUNC_PERROR): Likewise. -* m4/printf.m4 (gl_PRINTF_SIZES_C99, gl_PRINTF_INFINITE, -gl_PRINTF_INFINITE_LONG_DOUBLE, gl_PRINTF_DIRECTIVE_A, -gl_PRINTF_DIRECTIVE_F, gl_PRINTF_FLAG_ZERO, gl_SNPRINTF_TRUNCATION_C99, -gl_SNPRINTF_RETVAL_C99, gl_SNPRINTF_DIRECTIVE_N, -gl_VSNPRINTF_ZEROSIZE_C99): Likewise. -* m4/ptsname.m4 (gl_FUNC_PTSNAME): Likewise. // removed -* m4/putenv.m4 (gl_FUNC_PUTENV): Likewise. -* m4/realloc.m4 (_AC_FUNC_REALLOC_IF): Likewise. -* m4/remainder.m4 (gl_FUNC_REMAINDER): Likewise. // removed -* m4/remainderf.m4 (gl_FUNC_REMAINDERF): Likewise. // removed -* m4/remainderl.m4 (gl_FUNC_REMAINDERL): Likewise. // removed -* m4/rintl.m4 (gl_FUNC_RINTL): Likewise. // removed -* m4/round.m4 (gl_FUNC_ROUND): Likewise. // removed -* m4/roundf.m4 (gl_FUNC_ROUNDF): Likewise. // removed -* m4/roundl.m4 (gl_FUNC_ROUNDL): Likewise. // removed -* m4/setenv.m4 (gl_FUNC_SETENV): Likewise. -* m4/signbit.m4 (gl_SIGNBIT): Likewise. -* m4/sleep.m4 (gl_FUNC_SLEEP): Likewise. -* m4/stpncpy.m4 (gl_FUNC_STPNCPY): Likewise. -* m4/strerror.m4 (gl_FUNC_STRERROR, gl_FUNC_STRERROR_0): Likewise. -* m4/strtod.m4 (gl_FUNC_STRTOD): Likewise. -* m4/strtold.m4 (gl_FUNC_STRTOLD): Likewise. -* m4/trunc.m4 (gl_FUNC_TRUNC): Likewise. // removed -* m4/truncf.m4 (gl_FUNC_TRUNCF): Likewise. // removed -* m4/truncl.m4 (gl_FUNC_TRUNCL): Likewise. // removed -* m4/tzset.m4 (gl_FUNC_TZSET_CLOBBER): Likewise. -* m4/ungetc.m4 (gl_FUNC_UNGETC_WORKS): Likewise. -* m4/usleep.m4 (gl_FUNC_USLEEP): Likewise. -* m4/utimes.m4 (gl_FUNC_UTIMES): Likewise. -* m4/wcwidth.m4 (gl_FUNC_WCWIDTH): Likewise. ---- - m4/calloc.m4 | 4 ++- - m4/canonicalize.m4 | 4 ++- - m4/chown.m4 | 22 +++++++------ - m4/d-ino.m4 | 16 +++++----- - m4/fdopendir.m4 | 12 ++++--- - m4/fnmatch.m4 | 18 ++++++++--- - m4/fpurge.m4 | 24 +++++++++----- - m4/getcwd-abort-bug.m4 | 11 +++++-- - m4/getcwd.m4 | 4 ++- - m4/getdelim.m4 | 40 ++++++++++++++---------- - m4/getgroups.m4 | 6 +++- - m4/getline.m4 | 38 +++++++++++++--------- - m4/gettimeofday.m4 | 4 ++- - m4/link-follow.m4 | 4 ++- - m4/malloc.m4 | 4 +-- - m4/mkdir.m4 | 4 ++- - m4/mkstemp.m4 | 4 ++- - m4/perror.m4 | 12 ++++--- - m4/printf.m4 | 22 ++++++++++++- - m4/putenv.m4 | 4 ++- - m4/realloc.m4 | 4 +-- - m4/setenv.m4 | 4 ++- - m4/signbit.m4 | 6 +++- - m4/sleep.m4 | 4 ++- - m4/stpncpy.m4 | 14 +++++++-- - m4/strerror.m4 | 6 +++- - m4/strtod.m4 | 10 +++--- - m4/strtold.m4 | 9 ++++-- - m4/tzset.m4 | 4 ++- - m4/ungetc.m4 | 18 ++++++----- - m4/usleep.m4 | 4 ++- - m4/utimes.m4 | 10 +++--- - m4/wcwidth.m4 | 12 ++++--- - 76 files changed, 461 insertions(+), 157 deletions(-) - -diff --git a/m4/calloc.m4 b/m4/calloc.m4 -index 012a5bf..d76535d 100644 ---- a/m4/calloc.m4 -+++ b/m4/calloc.m4 -@@ -1,4 +1,4 @@ --# calloc.m4 serial 18 -+# calloc.m4 serial 19 - - # Copyright (C) 2004-2019 Free Software Foundation, Inc. - # This file is free software; the Free Software Foundation -@@ -40,6 +40,8 @@ AC_DEFUN([_AC_FUNC_CALLOC_IF], - [case "$host_os" in - # Guess yes on glibc systems. - *-gnu* | gnu*) ac_cv_func_calloc_0_nonnull="guessing yes" ;; -+ # Guess yes on musl systems. -+ *-musl*) ac_cv_func_calloc_0_nonnull="guessing yes" ;; - # Guess yes on native Windows. - mingw*) ac_cv_func_calloc_0_nonnull="guessing yes" ;; - # If we don't know, assume the worst. -diff --git a/m4/canonicalize.m4 b/m4/canonicalize.m4 -index 5b6e25d..b61747b 100644 ---- a/m4/canonicalize.m4 -+++ b/m4/canonicalize.m4 -@@ -1,4 +1,4 @@ --# canonicalize.m4 serial 29 -+# canonicalize.m4 serial 30 - - dnl Copyright (C) 2003-2007, 2009-2019 Free Software Foundation, Inc. - -@@ -113,6 +113,8 @@ AC_DEFUN([gl_FUNC_REALPATH_WORKS], - [case "$host_os" in - # Guess yes on glibc systems. - *-gnu* | gnu*) gl_cv_func_realpath_works="guessing yes" ;; -+ # Guess yes on musl systems. -+ *-musl*) gl_cv_func_realpath_works="guessing yes" ;; - # Guess no on native Windows. - mingw*) gl_cv_func_realpath_works="guessing no" ;; - # If we don't know, assume the worst. -diff --git a/m4/chown.m4 b/m4/chown.m4 -index ecfc0c0..b798325 100644 ---- a/m4/chown.m4 -+++ b/m4/chown.m4 -@@ -1,4 +1,4 @@ --# serial 30 -+# serial 32 - # Determine whether we need the chown wrapper. - - dnl Copyright (C) 1997-2001, 2003-2005, 2007, 2009-2019 Free Software -@@ -109,10 +109,12 @@ AC_DEFUN_ONCE([gl_FUNC_CHOWN], - [gl_cv_func_chown_slash_works=yes], - [gl_cv_func_chown_slash_works=no], - [case "$host_os" in -- # Guess yes on glibc systems. -- *-gnu*) gl_cv_func_chown_slash_works="guessing yes" ;; -- # If we don't know, assume the worst. -- *) gl_cv_func_chown_slash_works="guessing no" ;; -+ # Guess yes on glibc systems. -+ *-gnu*) gl_cv_func_chown_slash_works="guessing yes" ;; -+ # Guess yes on musl systems. -+ *-musl*) gl_cv_func_chown_slash_works="guessing yes" ;; -+ # If we don't know, assume the worst. -+ *) gl_cv_func_chown_slash_works="guessing no" ;; - esac - ]) - rm -f conftest.link conftest.file]) -@@ -145,10 +147,12 @@ AC_DEFUN_ONCE([gl_FUNC_CHOWN], - [gl_cv_func_chown_ctime_works=yes], - [gl_cv_func_chown_ctime_works=no], - [case "$host_os" in -- # Guess yes on glibc systems. -- *-gnu*) gl_cv_func_chown_ctime_works="guessing yes" ;; -- # If we don't know, assume the worst. -- *) gl_cv_func_chown_ctime_works="guessing no" ;; -+ # Guess yes on glibc systems. -+ *-gnu*) gl_cv_func_chown_ctime_works="guessing yes" ;; -+ # Guess yes on musl systems. -+ *-musl*) gl_cv_func_chown_ctime_works="guessing yes" ;; -+ # If we don't know, assume the worst. -+ *) gl_cv_func_chown_ctime_works="guessing no" ;; - esac - ]) - rm -f conftest.file]) -diff --git a/m4/d-ino.m4 b/m4/d-ino.m4 -index f1420cc..87dcacc 100644 ---- a/m4/d-ino.m4 -+++ b/m4/d-ino.m4 -@@ -1,4 +1,4 @@ --# serial 18 -+# serial 19 - - dnl From Jim Meyering. - dnl -@@ -40,12 +40,14 @@ AC_DEFUN([gl_CHECK_TYPE_STRUCT_DIRENT_D_INO], - [gl_cv_struct_dirent_d_ino=yes], - [gl_cv_struct_dirent_d_ino=no], - [case "$host_os" in -- # Guess yes on glibc systems with Linux kernel. -- linux*-gnu*) gl_cv_struct_dirent_d_ino="guessing yes" ;; -- # Guess no on native Windows. -- mingw*) gl_cv_struct_dirent_d_ino="guessing no" ;; -- # If we don't know, assume the worst. -- *) gl_cv_struct_dirent_d_ino="guessing no" ;; -+ # Guess yes on glibc systems with Linux kernel. -+ linux*-gnu*) gl_cv_struct_dirent_d_ino="guessing yes" ;; -+ # Guess yes on musl systems with Linux kernel. -+ linux*-musl*) gl_cv_struct_dirent_d_ino="guessing yes" ;; -+ # Guess no on native Windows. -+ mingw*) gl_cv_struct_dirent_d_ino="guessing no" ;; -+ # If we don't know, assume the worst. -+ *) gl_cv_struct_dirent_d_ino="guessing no" ;; - esac - ])]) - case "$gl_cv_struct_dirent_d_ino" in -diff --git a/m4/fdopendir.m4 b/m4/fdopendir.m4 -index 0490551..b2b3b03 100644 ---- a/m4/fdopendir.m4 -+++ b/m4/fdopendir.m4 -@@ -1,4 +1,4 @@ --# serial 10 -+# serial 11 - # See if we need to provide fdopendir. - - dnl Copyright (C) 2009-2019 Free Software Foundation, Inc. -@@ -45,10 +45,12 @@ DIR *fdopendir (int); - [gl_cv_func_fdopendir_works=yes], - [gl_cv_func_fdopendir_works=no], - [case "$host_os" in -- # Guess yes on glibc systems. -- *-gnu*) gl_cv_func_fdopendir_works="guessing yes" ;; -- # If we don't know, assume the worst. -- *) gl_cv_func_fdopendir_works="guessing no" ;; -+ # Guess yes on glibc systems. -+ *-gnu*) gl_cv_func_fdopendir_works="guessing yes" ;; -+ # Guess yes on musl systems. -+ *-musl*) gl_cv_func_fdopendir_works="guessing yes" ;; -+ # If we don't know, assume the worst. -+ *) gl_cv_func_fdopendir_works="guessing no" ;; - esac - ])]) - case "$gl_cv_func_fdopendir_works" in -diff --git a/m4/fnmatch.m4 b/m4/fnmatch.m4 -index c264ca7..75ba55b 100644 ---- a/m4/fnmatch.m4 -+++ b/m4/fnmatch.m4 -@@ -1,4 +1,4 @@ --# Check for fnmatch - serial 13. -*- coding: utf-8 -*- -+# Check for fnmatch - serial 14. -*- coding: utf-8 -*- - - # Copyright (C) 2000-2007, 2009-2019 Free Software Foundation, Inc. - # This file is free software; the Free Software Foundation -@@ -14,6 +14,7 @@ AC_DEFUN([gl_FUNC_FNMATCH_POSIX], - m4_divert_text([DEFAULTS], [gl_fnmatch_required=POSIX]) - - AC_REQUIRE([gl_FNMATCH_H]) -+ AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles - gl_fnmatch_required_lowercase=` - echo $gl_fnmatch_required | LC_ALL=C tr '[[A-Z]]' '[[a-z]]' - ` -@@ -117,12 +118,19 @@ AC_DEFUN([gl_FUNC_FNMATCH_POSIX], - ]])], - [eval "$gl_fnmatch_cache_var=yes"], - [eval "$gl_fnmatch_cache_var=no"], -- [eval "$gl_fnmatch_cache_var=\"guessing no\""]) -+ [case "$host_os" in -+ # Guess yes on musl systems. -+ *-musl*) eval "$gl_fnmatch_cache_var=\"guessing yes\"" ;; -+ # Guess no otherwise, even on glibc systems. -+ *) eval "$gl_fnmatch_cache_var=\"guessing no\"" ;; -+ esac -+ ]) - ]) - eval "gl_fnmatch_result=\"\$$gl_fnmatch_cache_var\"" -- if test "$gl_fnmatch_result" != yes; then -- REPLACE_FNMATCH=1 -- fi -+ case "$gl_fnmatch_result" in -+ *yes) ;; -+ *) REPLACE_FNMATCH=1 ;; -+ esac - fi - if test $HAVE_FNMATCH = 0 || test $REPLACE_FNMATCH = 1; then - gl_REPLACE_FNMATCH_H -diff --git a/m4/fpurge.m4 b/m4/fpurge.m4 -index cb21f56..6c5b3e9 100644 ---- a/m4/fpurge.m4 -+++ b/m4/fpurge.m4 -@@ -1,4 +1,4 @@ --# fpurge.m4 serial 8 -+# fpurge.m4 serial 9 - dnl Copyright (C) 2007, 2009-2019 Free Software Foundation, Inc. - dnl This file is free software; the Free Software Foundation - dnl gives unlimited permission to copy and/or distribute it, -@@ -7,12 +7,13 @@ dnl with or without modifications, as long as this notice is preserved. - AC_DEFUN([gl_FUNC_FPURGE], - [ - AC_REQUIRE([gl_STDIO_H_DEFAULTS]) -+ AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles - AC_CHECK_FUNCS_ONCE([fpurge]) - AC_CHECK_FUNCS_ONCE([__fpurge]) - AC_CHECK_DECLS([fpurge], , , [[#include ]]) - if test "x$ac_cv_func_fpurge" = xyes; then - HAVE_FPURGE=1 -- # Detect BSD bug. Only cygwin 1.7 is known to be immune. -+ # Detect BSD bug. Only cygwin 1.7 and musl are known to be immune. - AC_CACHE_CHECK([whether fpurge works], [gl_cv_func_fpurge_works], - [AC_RUN_IFELSE( - [AC_LANG_PROGRAM( -@@ -48,11 +49,20 @@ AC_DEFUN([gl_FUNC_FPURGE], - return 13; - return 0; - ])], -- [gl_cv_func_fpurge_works=yes], [gl_cv_func_fpurge_works=no], -- [gl_cv_func_fpurge_works='guessing no'])]) -- if test "x$gl_cv_func_fpurge_works" != xyes; then -- REPLACE_FPURGE=1 -- fi -+ [gl_cv_func_fpurge_works=yes], -+ [gl_cv_func_fpurge_works=no], -+ [case "$host_os" in -+ # Guess yes on musl systems. -+ *-musl*) gl_cv_func_fpurge_works="guessing yes" ;; -+ # Guess no otherwise. -+ *) gl_cv_func_fpurge_works="guessing no" ;; -+ esac -+ ]) -+ ]) -+ case "$gl_cv_func_fpurge_works" in -+ *yes) ;; -+ *) REPLACE_FPURGE=1 ;; -+ esac - else - HAVE_FPURGE=0 - fi -diff --git a/m4/getcwd-abort-bug.m4 b/m4/getcwd-abort-bug.m4 -index f0f24a5..7227f08 100644 ---- a/m4/getcwd-abort-bug.m4 -+++ b/m4/getcwd-abort-bug.m4 -@@ -1,4 +1,4 @@ --# serial 9 -+# serial 11 - # Determine whether getcwd aborts when the length of the working directory - # name is unusually large. Any length between 4k and 16k trigger the bug - # when using glibc-2.4.90-9 or older. -@@ -13,6 +13,7 @@ - # gl_FUNC_GETCWD_ABORT_BUG([ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]]) - AC_DEFUN([gl_FUNC_GETCWD_ABORT_BUG], - [ -+ AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles - AC_CHECK_DECLS_ONCE([getcwd]) - AC_CHECK_HEADERS_ONCE([unistd.h]) - AC_REQUIRE([gl_PATHMAX_SNIPPET_PREREQ]) -@@ -142,7 +143,13 @@ main () - else - gl_cv_func_getcwd_abort_bug=no - fi], -- [gl_cv_func_getcwd_abort_bug=yes]) -+ [case "$host_os" in -+ # Guess no on musl systems. -+ *-musl*) gl_cv_func_getcwd_abort_bug="guessing no" ;; -+ # Guess yes otherwise, even on glibc systems. -+ *) gl_cv_func_getcwd_abort_bug="guessing yes" -+ esac -+ ]) - ]) - AS_IF([test $gl_cv_func_getcwd_abort_bug = yes], [$1], [$2]) - ]) -diff --git a/m4/getcwd.m4 b/m4/getcwd.m4 -index 4929b51..625171a 100644 ---- a/m4/getcwd.m4 -+++ b/m4/getcwd.m4 -@@ -6,7 +6,7 @@ - # with or without modifications, as long as this notice is preserved. - - # Written by Paul Eggert. --# serial 16 -+# serial 17 - - AC_DEFUN([gl_FUNC_GETCWD_NULL], - [ -@@ -50,6 +50,8 @@ AC_DEFUN([gl_FUNC_GETCWD_NULL], - [[case "$host_os" in - # Guess yes on glibc systems. - *-gnu* | gnu*) gl_cv_func_getcwd_null="guessing yes";; -+ # Guess yes on musl systems. -+ *-musl*) gl_cv_func_getcwd_null="guessing yes";; - # Guess yes on Cygwin. - cygwin*) gl_cv_func_getcwd_null="guessing yes";; - # If we don't know, assume the worst. -diff --git a/m4/getdelim.m4 b/m4/getdelim.m4 -index bf17c57..e77c379 100644 ---- a/m4/getdelim.m4 -+++ b/m4/getdelim.m4 -@@ -1,4 +1,4 @@ --# getdelim.m4 serial 12 -+# getdelim.m4 serial 13 - - dnl Copyright (C) 2005-2007, 2009-2019 Free Software Foundation, Inc. - dnl -@@ -11,6 +11,7 @@ AC_PREREQ([2.59]) - AC_DEFUN([gl_FUNC_GETDELIM], - [ - AC_REQUIRE([gl_STDIO_H_DEFAULTS]) -+ AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles - - dnl Persuade glibc to declare getdelim(). - AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS]) -@@ -21,9 +22,10 @@ AC_DEFUN([gl_FUNC_GETDELIM], - if test $ac_cv_func_getdelim = yes; then - HAVE_GETDELIM=1 - dnl Found it in some library. Verify that it works. -- AC_CACHE_CHECK([for working getdelim function], [gl_cv_func_working_getdelim], -- [echo fooNbarN | tr -d '\012' | tr N '\012' > conftest.data -- AC_RUN_IFELSE([AC_LANG_SOURCE([[ -+ AC_CACHE_CHECK([for working getdelim function], -+ [gl_cv_func_working_getdelim], -+ [echo fooNbarN | tr -d '\012' | tr N '\012' > conftest.data -+ AC_RUN_IFELSE([AC_LANG_SOURCE([[ - # include - # include - # include -@@ -53,25 +55,31 @@ AC_DEFUN([gl_FUNC_GETDELIM], - fclose (in); - return 0; - } -- ]])], [gl_cv_func_working_getdelim=yes] dnl The library version works. -- , [gl_cv_func_working_getdelim=no] dnl The library version does NOT work. -- , dnl We're cross compiling. Assume it works on glibc2 systems. -- [AC_EGREP_CPP([Lucky GNU user], -- [ -+ ]])], -+ [gl_cv_func_working_getdelim=yes], -+ [gl_cv_func_working_getdelim=no], -+ [dnl We're cross compiling. -+ dnl Guess it works on glibc2 systems and musl systems. -+ AC_EGREP_CPP([Lucky GNU user], -+ [ - #include - #ifdef __GNU_LIBRARY__ - #if (__GLIBC__ >= 2) && !defined __UCLIBC__ - Lucky GNU user - #endif - #endif -- ], -- [gl_cv_func_working_getdelim="guessing yes"], -- [gl_cv_func_working_getdelim="guessing no"])] -- )]) -+ ], -+ [gl_cv_func_working_getdelim="guessing yes"], -+ [case "$host_os" in -+ *-musl*) gl_cv_func_working_getdelim="guessing yes" ;; -+ *) gl_cv_func_working_getdelim="guessing no" ;; -+ esac -+ ]) -+ ]) -+ ]) - case "$gl_cv_func_working_getdelim" in -- *no) -- REPLACE_GETDELIM=1 -- ;; -+ *yes) ;; -+ *) REPLACE_GETDELIM=1 ;; - esac - else - HAVE_GETDELIM=0 -diff --git a/m4/getgroups.m4 b/m4/getgroups.m4 -index 2ce986e..c93447b 100644 ---- a/m4/getgroups.m4 -+++ b/m4/getgroups.m4 -@@ -1,4 +1,4 @@ --# serial 21 -+# serial 22 - - dnl From Jim Meyering. - dnl A wrapper around AC_FUNC_GETGROUPS. -@@ -42,6 +42,8 @@ AC_DEFUN([AC_FUNC_GETGROUPS], - [case "$host_os" in # (( - # Guess yes on glibc systems. - *-gnu* | gnu*) ac_cv_func_getgroups_works="guessing yes" ;; -+ # Guess yes on musl systems. -+ *-musl*) ac_cv_func_getgroups_works="guessing yes" ;; - # If we don't know, assume the worst. - *) ac_cv_func_getgroups_works="guessing no" ;; - esac -@@ -95,6 +97,8 @@ AC_DEFUN([gl_FUNC_GETGROUPS], - [case "$host_os" in - # Guess yes on glibc systems. - *-gnu* | gnu*) gl_cv_func_getgroups_works="guessing yes" ;; -+ # Guess yes on musl systems. -+ *-musl*) gl_cv_func_getgroups_works="guessing yes" ;; - # If we don't know, assume the worst. - *) gl_cv_func_getgroups_works="guessing no" ;; - esac -diff --git a/m4/getline.m4 b/m4/getline.m4 -index 5b2ead2..32f771c 100644 ---- a/m4/getline.m4 -+++ b/m4/getline.m4 -@@ -1,4 +1,4 @@ --# getline.m4 serial 28 -+# getline.m4 serial 29 - - dnl Copyright (C) 1998-2003, 2005-2007, 2009-2019 Free Software Foundation, - dnl Inc. -@@ -16,6 +16,7 @@ dnl to do with the function we need. - AC_DEFUN([gl_FUNC_GETLINE], - [ - AC_REQUIRE([gl_STDIO_H_DEFAULTS]) -+ AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles - - dnl Persuade glibc to declare getline(). - AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS]) -@@ -28,9 +29,10 @@ AC_DEFUN([gl_FUNC_GETLINE], - gl_getline_needs_run_time_check=yes], - [am_cv_func_working_getline=no]) - if test $gl_getline_needs_run_time_check = yes; then -- AC_CACHE_CHECK([for working getline function], [am_cv_func_working_getline], -- [echo fooNbarN | tr -d '\012' | tr N '\012' > conftest.data -- AC_RUN_IFELSE([AC_LANG_SOURCE([[ -+ AC_CACHE_CHECK([for working getline function], -+ [am_cv_func_working_getline], -+ [echo fooNbarN | tr -d '\012' | tr N '\012' > conftest.data -+ AC_RUN_IFELSE([AC_LANG_SOURCE([[ - # include - # include - # include -@@ -61,21 +63,28 @@ AC_DEFUN([gl_FUNC_GETLINE], - fclose (in); - return 0; - } -- ]])], [am_cv_func_working_getline=yes] dnl The library version works. -- , [am_cv_func_working_getline=no] dnl The library version does NOT work. -- , dnl We're cross compiling. Assume it works on glibc2 systems. -- [AC_EGREP_CPP([Lucky GNU user], -- [ -+ ]])], -+ [am_cv_func_working_getline=yes], -+ [am_cv_func_working_getline=no], -+ [dnl We're cross compiling. -+ dnl Guess it works on glibc2 systems and musl systems. -+ AC_EGREP_CPP([Lucky GNU user], -+ [ - #include - #ifdef __GNU_LIBRARY__ - #if (__GLIBC__ >= 2) && !defined __UCLIBC__ - Lucky GNU user - #endif - #endif -- ], -- [am_cv_func_working_getline="guessing yes"], -- [am_cv_func_working_getline="guessing no"])] -- )]) -+ ], -+ [am_cv_func_working_getline="guessing yes"], -+ [case "$host_os" in -+ *-musl*) am_cv_func_working_getline="guessing yes" ;; -+ *) am_cv_func_working_getline="guessing no" ;; -+ esac -+ ]) -+ ]) -+ ]) - fi - - if test $ac_cv_have_decl_getline = no; then -@@ -83,7 +92,8 @@ AC_DEFUN([gl_FUNC_GETLINE], - fi - - case "$am_cv_func_working_getline" in -- *no) -+ *yes) ;; -+ *) - dnl Set REPLACE_GETLINE always: Even if we have not found the broken - dnl getline function among $LIBS, it may exist in libinet and the - dnl executable may be linked with -linet. -diff --git a/m4/gettimeofday.m4 b/m4/gettimeofday.m4 -index d29b4bf..5e2ef6f 100644 ---- a/m4/gettimeofday.m4 -+++ b/m4/gettimeofday.m4 -@@ -1,4 +1,4 @@ --# serial 25 -+# serial 26 - - # Copyright (C) 2001-2003, 2005, 2007, 2009-2019 Free Software Foundation, Inc. - # This file is free software; the Free Software Foundation -@@ -105,6 +105,8 @@ AC_DEFUN([gl_FUNC_GETTIMEOFDAY_CLOBBER], - case "$host_os" in - # Guess all is fine on glibc systems. - *-gnu* | gnu*) gl_cv_func_gettimeofday_clobber="guessing no" ;; -+ # Guess all is fine on musl systems. -+ *-musl*) gl_cv_func_gettimeofday_clobber="guessing no" ;; - # Guess no on native Windows. - mingw*) gl_cv_func_gettimeofday_clobber="guessing no" ;; - # If we don't know, assume the worst. -diff --git a/m4/link-follow.m4 b/m4/link-follow.m4 -index cbd2dca..8ac7301 100644 ---- a/m4/link-follow.m4 -+++ b/m4/link-follow.m4 -@@ -1,4 +1,4 @@ --# serial 20 -+# serial 21 - dnl Run a program to determine whether link(2) follows symlinks. - dnl Set LINK_FOLLOWS_SYMLINKS accordingly. - -@@ -88,6 +88,8 @@ AC_DEFUN([gl_FUNC_LINK_FOLLOWS_SYMLINK], - case "$host_os" in - # On glibc/Linux we know the result. - linux*-gnu* | gnu*) gl_cv_func_link_follows_symlink="guessing no" ;; -+ # On musl/Linux we know the result. -+ linux*-musl*) gl_cv_func_link_follows_symlink="guessing no" ;; - # Otherwise, we don't know. - *) gl_cv_func_link_follows_symlink=unknown ;; - esac -diff --git a/m4/malloc.m4 b/m4/malloc.m4 -index b9b8d4b..c469c45 100644 ---- a/m4/malloc.m4 -+++ b/m4/malloc.m4 -@@ -1,4 +1,4 @@ --# malloc.m4 serial 17 -+# malloc.m4 serial 19 - dnl Copyright (C) 2007, 2009-2019 Free Software Foundation, Inc. - dnl This file is free software; the Free Software Foundation - dnl gives unlimited permission to copy and/or distribute it, -@@ -32,7 +32,7 @@ AC_DEFUN([_AC_FUNC_MALLOC_IF], - [ac_cv_func_malloc_0_nonnull=no], - [case "$host_os" in - # Guess yes on platforms where we know the result. -- *-gnu* | gnu* | freebsd* | netbsd* | openbsd* \ -+ *-gnu* | gnu* | *-musl* | freebsd* | netbsd* | openbsd* \ - | hpux* | solaris* | cygwin* | mingw*) - ac_cv_func_malloc_0_nonnull="guessing yes" ;; - # If we don't know, assume the worst. -diff --git a/m4/mkdir.m4 b/m4/mkdir.m4 -index 4cd9590..366a3cd 100644 ---- a/m4/mkdir.m4 -+++ b/m4/mkdir.m4 -@@ -1,4 +1,4 @@ --# serial 14 -+# serial 15 - - # Copyright (C) 2001, 2003-2004, 2006, 2008-2019 Free Software Foundation, Inc. - # This file is free software; the Free Software Foundation -@@ -62,6 +62,8 @@ AC_DEFUN([gl_FUNC_MKDIR], - [case "$host_os" in - # Guess yes on glibc systems. - *-gnu* | gnu*) gl_cv_func_mkdir_trailing_dot_works="guessing yes" ;; -+ # Guess yes on musl systems. -+ *-musl*) gl_cv_func_mkdir_trailing_dot_works="guessing yes" ;; - # Guess no on native Windows. - mingw*) gl_cv_func_mkdir_trailing_dot_works="guessing no" ;; - # If we don't know, assume the worst. -diff --git a/m4/mkstemp.m4 b/m4/mkstemp.m4 -index ae24c3b..1b15c2e 100644 ---- a/m4/mkstemp.m4 -+++ b/m4/mkstemp.m4 -@@ -1,4 +1,4 @@ --#serial 25 -+#serial 26 - - # Copyright (C) 2001, 2003-2007, 2009-2019 Free Software Foundation, Inc. - # This file is free software; the Free Software Foundation -@@ -59,6 +59,8 @@ AC_DEFUN([gl_FUNC_MKSTEMP], - [case "$host_os" in - # Guess yes on glibc systems. - *-gnu* | gnu*) gl_cv_func_working_mkstemp="guessing yes" ;; -+ # Guess yes on musl systems. -+ *-musl*) gl_cv_func_working_mkstemp="guessing yes" ;; - # Guess no on native Windows. - mingw*) gl_cv_func_working_mkstemp="guessing no" ;; - # If we don't know, assume the worst. -diff --git a/m4/perror.m4 b/m4/perror.m4 -index 335be72..08e2db1 100644 ---- a/m4/perror.m4 -+++ b/m4/perror.m4 -@@ -1,4 +1,4 @@ --# perror.m4 serial 7 -+# perror.m4 serial 8 - dnl Copyright (C) 2008-2019 Free Software Foundation, Inc. - dnl This file is free software; the Free Software Foundation - dnl gives unlimited permission to copy and/or distribute it, -@@ -48,10 +48,12 @@ AC_DEFUN([gl_FUNC_PERROR], - rm -rf conftest.txt1 conftest.txt2], - [gl_cv_func_perror_works=no], - [case "$host_os" in -- # Guess yes on native Windows. -- mingw*) gl_cv_func_perror_works="guessing yes" ;; -- # Otherwise guess no. -- *) gl_cv_func_perror_works="guessing no" ;; -+ # Guess yes on musl systems. -+ *-musl*) gl_cv_func_perror_works="guessing yes" ;; -+ # Guess yes on native Windows. -+ mingw*) gl_cv_func_perror_works="guessing yes" ;; -+ # Otherwise guess no. -+ *) gl_cv_func_perror_works="guessing no" ;; - esac - ]) - ]) -diff --git a/m4/printf.m4 b/m4/printf.m4 -index cbf6ae4..6d2280e 100644 ---- a/m4/printf.m4 -+++ b/m4/printf.m4 -@@ -1,4 +1,4 @@ --# printf.m4 serial 60 -+# printf.m4 serial 61 - dnl Copyright (C) 2003, 2007-2019 Free Software Foundation, Inc. - dnl This file is free software; the Free Software Foundation - dnl gives unlimited permission to copy and/or distribute it, -@@ -62,6 +62,8 @@ int main () - changequote(,)dnl - # Guess yes on glibc systems. - *-gnu* | gnu*) gl_cv_func_printf_sizes_c99="guessing yes";; -+ # Guess yes on musl systems. -+ *-musl*) gl_cv_func_printf_sizes_c99="guessing yes";; - # Guess yes on FreeBSD >= 5. - freebsd[1-4].*) gl_cv_func_printf_sizes_c99="guessing no";; - freebsd* | kfreebsd*) gl_cv_func_printf_sizes_c99="guessing yes";; -@@ -240,6 +242,8 @@ int main () - changequote(,)dnl - # Guess yes on glibc systems. - *-gnu* | gnu*) gl_cv_func_printf_infinite="guessing yes";; -+ # Guess yes on musl systems. -+ *-musl*) gl_cv_func_printf_infinite="guessing yes";; - # Guess yes on FreeBSD >= 6. - freebsd[1-5].*) gl_cv_func_printf_infinite="guessing no";; - freebsd* | kfreebsd*) gl_cv_func_printf_infinite="guessing yes";; -@@ -457,6 +461,8 @@ int main () - changequote(,)dnl - # Guess yes on glibc systems. - *-gnu* | gnu*) gl_cv_func_printf_infinite_long_double="guessing yes";; -+ # Guess yes on musl systems. -+ *-musl*) gl_cv_func_printf_infinite_long_double="guessing yes";; - # Guess yes on FreeBSD >= 6. - freebsd[1-5].*) gl_cv_func_printf_infinite_long_double="guessing no";; - freebsd* | kfreebsd*) gl_cv_func_printf_infinite_long_double="guessing yes";; -@@ -575,6 +581,8 @@ int main () - [gl_cv_func_printf_directive_a="guessing yes"], - [gl_cv_func_printf_directive_a="guessing no"]) - ;; -+ # Guess yes on musl systems. -+ *-musl*) gl_cv_func_printf_directive_a="guessing yes";; - # Guess no on Android. - linux*-android*) gl_cv_func_printf_directive_a="guessing no";; - # Guess no on native Windows. -@@ -625,6 +633,8 @@ int main () - changequote(,)dnl - # Guess yes on glibc systems. - *-gnu* | gnu*) gl_cv_func_printf_directive_f="guessing yes";; -+ # Guess yes on musl systems. -+ *-musl*) gl_cv_func_printf_directive_f="guessing yes";; - # Guess yes on FreeBSD >= 6. - freebsd[1-5].*) gl_cv_func_printf_directive_f="guessing no";; - freebsd* | kfreebsd*) gl_cv_func_printf_directive_f="guessing yes";; -@@ -960,6 +970,8 @@ changequote(,)dnl - case "$host_os" in - # Guess yes on glibc systems. - *-gnu* | gnu*) gl_cv_func_printf_flag_zero="guessing yes";; -+ # Guess yes on musl systems. -+ *-musl*) gl_cv_func_printf_flag_zero="guessing yes";; - # Guess yes on BeOS. - beos*) gl_cv_func_printf_flag_zero="guessing yes";; - # Guess no on Android. -@@ -1206,6 +1218,8 @@ changequote(,)dnl - case "$host_os" in - # Guess yes on glibc systems. - *-gnu* | gnu*) gl_cv_func_snprintf_truncation_c99="guessing yes";; -+ # Guess yes on musl systems. -+ *-musl*) gl_cv_func_snprintf_truncation_c99="guessing yes";; - # Guess yes on FreeBSD >= 5. - freebsd[1-4].*) gl_cv_func_snprintf_truncation_c99="guessing no";; - freebsd* | kfreebsd*) gl_cv_func_snprintf_truncation_c99="guessing yes";; -@@ -1308,6 +1322,8 @@ int main () - changequote(,)dnl - # Guess yes on glibc systems. - *-gnu* | gnu*) gl_cv_func_snprintf_retval_c99="guessing yes";; -+ # Guess yes on musl systems. -+ *-musl*) gl_cv_func_snprintf_retval_c99="guessing yes";; - # Guess yes on FreeBSD >= 5. - freebsd[1-4].*) gl_cv_func_snprintf_retval_c99="guessing no";; - freebsd* | kfreebsd*) gl_cv_func_snprintf_retval_c99="guessing yes";; -@@ -1400,6 +1416,8 @@ changequote(,)dnl - case "$host_os" in - # Guess yes on glibc systems. - *-gnu* | gnu*) gl_cv_func_snprintf_directive_n="guessing yes";; -+ # Guess yes on musl systems. -+ *-musl*) gl_cv_func_snprintf_directive_n="guessing yes";; - # Guess yes on FreeBSD >= 5. - freebsd[1-4].*) gl_cv_func_snprintf_directive_n="guessing no";; - freebsd* | kfreebsd*) gl_cv_func_snprintf_directive_n="guessing yes";; -@@ -1554,6 +1572,8 @@ changequote(,)dnl - case "$host_os" in - # Guess yes on glibc systems. - *-gnu* | gnu*) gl_cv_func_vsnprintf_zerosize_c99="guessing yes";; -+ # Guess yes on musl systems. -+ *-musl*) gl_cv_func_vsnprintf_zerosize_c99="guessing yes";; - # Guess yes on FreeBSD >= 5. - freebsd[1-4].*) gl_cv_func_vsnprintf_zerosize_c99="guessing no";; - freebsd* | kfreebsd*) gl_cv_func_vsnprintf_zerosize_c99="guessing yes";; -diff --git a/m4/putenv.m4 b/m4/putenv.m4 -index f8960f6..342ba26 100644 ---- a/m4/putenv.m4 -+++ b/m4/putenv.m4 -@@ -1,4 +1,4 @@ --# putenv.m4 serial 22 -+# putenv.m4 serial 23 - dnl Copyright (C) 2002-2019 Free Software Foundation, Inc. - dnl This file is free software; the Free Software Foundation - dnl gives unlimited permission to copy and/or distribute it, -@@ -36,6 +36,8 @@ AC_DEFUN([gl_FUNC_PUTENV], - [case "$host_os" in - # Guess yes on glibc systems. - *-gnu* | gnu*) gl_cv_func_svid_putenv="guessing yes" ;; -+ # Guess yes on musl systems. -+ *-musl*) gl_cv_func_svid_putenv="guessing yes" ;; - # Guess no on native Windows. - mingw*) gl_cv_func_svid_putenv="guessing no" ;; - # If we don't know, assume the worst. -diff --git a/m4/realloc.m4 b/m4/realloc.m4 -index f9f15ad..93066e8 100644 ---- a/m4/realloc.m4 -+++ b/m4/realloc.m4 -@@ -1,4 +1,4 @@ --# realloc.m4 serial 15 -+# realloc.m4 serial 17 - dnl Copyright (C) 2007, 2009-2019 Free Software Foundation, Inc. - dnl This file is free software; the Free Software Foundation - dnl gives unlimited permission to copy and/or distribute it, -@@ -32,7 +32,7 @@ AC_DEFUN([_AC_FUNC_REALLOC_IF], - [ac_cv_func_realloc_0_nonnull=no], - [case "$host_os" in - # Guess yes on platforms where we know the result. -- *-gnu* | gnu* | freebsd* | netbsd* | openbsd* \ -+ *-gnu* | gnu* | *-musl* | freebsd* | netbsd* | openbsd* \ - | hpux* | solaris* | cygwin* | mingw*) - ac_cv_func_realloc_0_nonnull="guessing yes" ;; - # If we don't know, assume the worst. -diff --git a/m4/setenv.m4 b/m4/setenv.m4 -index 6101274..a8f83d6 100644 ---- a/m4/setenv.m4 -+++ b/m4/setenv.m4 -@@ -1,4 +1,4 @@ --# setenv.m4 serial 27 -+# setenv.m4 serial 28 - dnl Copyright (C) 2001-2004, 2006-2019 Free Software Foundation, Inc. - dnl This file is free software; the Free Software Foundation - dnl gives unlimited permission to copy and/or distribute it, -@@ -37,6 +37,8 @@ AC_DEFUN([gl_FUNC_SETENV], - [case "$host_os" in - # Guess yes on glibc systems. - *-gnu* | gnu*) gl_cv_func_setenv_works="guessing yes" ;; -+ # Guess yes on musl systems. -+ *-musl*) gl_cv_func_setenv_works="guessing yes" ;; - # If we don't know, assume the worst. - *) gl_cv_func_setenv_works="guessing no" ;; - esac -diff --git a/m4/signbit.m4 b/m4/signbit.m4 -index bf5bce5..f7f2f3d 100644 ---- a/m4/signbit.m4 -+++ b/m4/signbit.m4 -@@ -1,4 +1,4 @@ --# signbit.m4 serial 16 -+# signbit.m4 serial 17 - dnl Copyright (C) 2007-2019 Free Software Foundation, Inc. - dnl This file is free software; the Free Software Foundation - dnl gives unlimited permission to copy and/or distribute it, -@@ -31,6 +31,8 @@ AC_DEFUN([gl_SIGNBIT], - [case "$host_os" in - # Guess yes on glibc systems. - *-gnu* | gnu*) gl_cv_func_signbit="guessing yes" ;; -+ # Guess yes on musl systems. -+ *-musl*) gl_cv_func_signbit="guessing yes" ;; - # Guess yes on native Windows. - mingw*) gl_cv_func_signbit="guessing yes" ;; - # If we don't know, assume the worst. -@@ -62,6 +64,8 @@ AC_DEFUN([gl_SIGNBIT], - [case "$host_os" in - # Guess yes on glibc systems. - *-gnu* | gnu*) gl_cv_func_signbit_gcc="guessing yes" ;; -+ # Guess yes on musl systems. -+ *-musl*) gl_cv_func_signbit_gcc="guessing yes" ;; - # Guess yes on mingw, no on MSVC. - mingw*) if test -n "$GCC"; then - gl_cv_func_signbit_gcc="guessing yes" -diff --git a/m4/sleep.m4 b/m4/sleep.m4 -index 5f71cc7..7bab467 100644 ---- a/m4/sleep.m4 -+++ b/m4/sleep.m4 -@@ -1,4 +1,4 @@ --# sleep.m4 serial 9 -+# sleep.m4 serial 10 - dnl Copyright (C) 2007-2019 Free Software Foundation, Inc. - dnl This file is free software; the Free Software Foundation - dnl gives unlimited permission to copy and/or distribute it, -@@ -48,6 +48,8 @@ handle_alarm (int sig) - [case "$host_os" in - # Guess yes on glibc systems. - *-gnu* | gnu*) gl_cv_func_sleep_works="guessing yes" ;; -+ # Guess yes on musl systems. -+ *-musl*) gl_cv_func_sleep_works="guessing yes" ;; - # Guess no on native Windows. - mingw*) gl_cv_func_sleep_works="guessing no" ;; - # If we don't know, assume the worst. -diff --git a/m4/stpncpy.m4 b/m4/stpncpy.m4 -index 83425dd..f8e1a7c 100644 ---- a/m4/stpncpy.m4 -+++ b/m4/stpncpy.m4 -@@ -1,4 +1,4 @@ --# stpncpy.m4 serial 16 -+# stpncpy.m4 serial 17 - dnl Copyright (C) 2002-2003, 2005-2007, 2009-2019 Free Software Foundation, - dnl Inc. - dnl This file is free software; the Free Software Foundation -@@ -7,6 +7,8 @@ dnl with or without modifications, as long as this notice is preserved. - - AC_DEFUN([gl_FUNC_STPNCPY], - [ -+ AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles -+ - dnl Persuade glibc to declare stpncpy(). - AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS]) - -@@ -69,12 +71,18 @@ int main () - ]])], - [gl_cv_func_stpncpy=yes], - [gl_cv_func_stpncpy=no], -- [AC_EGREP_CPP([Thanks for using GNU], [ -+ [dnl Guess yes on glibc systems and musl systems. -+ AC_EGREP_CPP([Thanks for using GNU], [ - #include - #ifdef __GNU_LIBRARY__ - Thanks for using GNU - #endif --], [gl_cv_func_stpncpy="guessing yes"], [gl_cv_func_stpncpy="guessing no"]) -+], [gl_cv_func_stpncpy="guessing yes"], -+ [case "$host_os" in -+ *-musl*) gl_cv_func_stpncpy="guessing yes" ;; -+ *) gl_cv_func_stpncpy="guessing no" ;; -+ esac -+ ]) - ]) - ]) - case "$gl_cv_func_stpncpy" in -diff --git a/m4/strerror.m4 b/m4/strerror.m4 -index b452f7f..2c90f31 100644 ---- a/m4/strerror.m4 -+++ b/m4/strerror.m4 -@@ -1,4 +1,4 @@ --# strerror.m4 serial 19 -+# strerror.m4 serial 20 - dnl Copyright (C) 2002, 2007-2019 Free Software Foundation, Inc. - dnl This file is free software; the Free Software Foundation - dnl gives unlimited permission to copy and/or distribute it, -@@ -26,6 +26,8 @@ AC_DEFUN([gl_FUNC_STRERROR], - [case "$host_os" in - # Guess yes on glibc systems. - *-gnu* | gnu*) gl_cv_func_working_strerror="guessing yes" ;; -+ # Guess yes on musl systems. -+ *-musl*) gl_cv_func_working_strerror="guessing yes" ;; - # If we don't know, assume the worst. - *) gl_cv_func_working_strerror="guessing no" ;; - esac -@@ -80,6 +82,8 @@ AC_DEFUN([gl_FUNC_STRERROR_0], - [case "$host_os" in - # Guess yes on glibc systems. - *-gnu* | gnu*) gl_cv_func_strerror_0_works="guessing yes" ;; -+ # Guess yes on musl systems. -+ *-musl*) gl_cv_func_strerror_0_works="guessing yes" ;; - # Guess yes on native Windows. - mingw*) gl_cv_func_strerror_0_works="guessing yes" ;; - # If we don't know, assume the worst. -diff --git a/m4/strtod.m4 b/m4/strtod.m4 -index 9912217..d68ab75 100644 ---- a/m4/strtod.m4 -+++ b/m4/strtod.m4 -@@ -1,4 +1,4 @@ --# strtod.m4 serial 24 -+# strtod.m4 serial 25 - dnl Copyright (C) 2002-2003, 2006-2019 Free Software Foundation, Inc. - dnl This file is free software; the Free Software Foundation - dnl gives unlimited permission to copy and/or distribute it, -@@ -115,9 +115,11 @@ numeric_equal (double x, double y) - ], - [gl_cv_func_strtod_works="guessing yes"], - [case "$host_os" in -- # Guess yes on native Windows. -- mingw*) gl_cv_func_strtod_works="guessing yes" ;; -- *) gl_cv_func_strtod_works="guessing no" ;; -+ # Guess yes on musl systems. -+ *-musl*) gl_cv_func_strtod_works="guessing yes" ;; -+ # Guess yes on native Windows. -+ mingw*) gl_cv_func_strtod_works="guessing yes" ;; -+ *) gl_cv_func_strtod_works="guessing no" ;; - esac - ]) - ]) -diff --git a/m4/strtold.m4 b/m4/strtold.m4 -index 16b4eda..17125fe 100644 ---- a/m4/strtold.m4 -+++ b/m4/strtold.m4 -@@ -1,4 +1,4 @@ --# strtold.m4 serial 2 -+# strtold.m4 serial 4 - dnl Copyright (C) 2002-2003, 2006-2019 Free Software Foundation, Inc. - dnl This file is free software; the Free Software Foundation - dnl gives unlimited permission to copy and/or distribute it, -@@ -98,7 +98,12 @@ numeric_equal (long double x, long double y) - #endif - ], - [gl_cv_func_strtold_works="guessing yes"], -- [gl_cv_func_strtod_works="guessing no"]) -+ [case "$host_os" in -+ # Guess yes on musl systems. -+ *-musl*) gl_cv_func_strtold_works="guessing yes" ;; -+ *) gl_cv_func_strtold_works="guessing no" ;; -+ esac -+ ]) - ]) - ]) - case "$gl_cv_func_strtold_works" in -diff --git a/m4/tzset.m4 b/m4/tzset.m4 -index 1278801..afdfa8e 100644 ---- a/m4/tzset.m4 -+++ b/m4/tzset.m4 -@@ -1,4 +1,4 @@ --# serial 11 -+# serial 12 - - # Copyright (C) 2003, 2007, 2009-2019 Free Software Foundation, Inc. - # This file is free software; the Free Software Foundation -@@ -70,6 +70,8 @@ main () - [case "$host_os" in - # Guess all is fine on glibc systems. - *-gnu* | gnu*) gl_cv_func_tzset_clobber="guessing no" ;; -+ # Guess all is fine on musl systems. -+ *-musl*) gl_cv_func_tzset_clobber="guessing no" ;; - # Guess no on native Windows. - mingw*) gl_cv_func_tzset_clobber="guessing no" ;; - # If we don't know, assume the worst. -diff --git a/m4/ungetc.m4 b/m4/ungetc.m4 -index ab8757b..08baf33 100644 ---- a/m4/ungetc.m4 -+++ b/m4/ungetc.m4 -@@ -1,4 +1,4 @@ --# ungetc.m4 serial 6 -+# ungetc.m4 serial 7 - dnl Copyright (C) 2009-2019 Free Software Foundation, Inc. - dnl This file is free software; the Free Software Foundation - dnl gives unlimited permission to copy and/or distribute it, -@@ -41,12 +41,16 @@ AC_DEFUN_ONCE([gl_FUNC_UNGETC_WORKS], - remove ("conftest.tmp");])], - [gl_cv_func_ungetc_works=yes], [gl_cv_func_ungetc_works=no], - [case "$host_os" in -- # Guess yes on glibc and bionic systems. -- *-gnu* | gnu* | *-android*) gl_cv_func_ungetc_works="guessing yes" ;; -- # Guess yes on native Windows. -- mingw*) gl_cv_func_ungetc_works="guessing yes" ;; -- # If we don't know, assume the worst. -- *) gl_cv_func_ungetc_works="guessing no" ;; -+ # Guess yes on glibc systems. -+ *-gnu* | gnu*) gl_cv_func_ungetc_works="guessing yes" ;; -+ # Guess yes on musl systems. -+ *-musl*) gl_cv_func_ungetc_works="guessing yes" ;; -+ # Guess yes on bionic systems. -+ *-android*) gl_cv_func_ungetc_works="guessing yes" ;; -+ # Guess yes on native Windows. -+ mingw*) gl_cv_func_ungetc_works="guessing yes" ;; -+ # If we don't know, assume the worst. -+ *) gl_cv_func_ungetc_works="guessing no" ;; - esac - ]) - ]) -diff --git a/m4/usleep.m4 b/m4/usleep.m4 -index 59605a8..4a6bff0 100644 ---- a/m4/usleep.m4 -+++ b/m4/usleep.m4 -@@ -1,4 +1,4 @@ --# usleep.m4 serial 5 -+# usleep.m4 serial 6 - dnl Copyright (C) 2009-2019 Free Software Foundation, Inc. - dnl This file is free software; the Free Software Foundation - dnl gives unlimited permission to copy and/or distribute it, -@@ -31,6 +31,8 @@ AC_DEFUN([gl_FUNC_USLEEP], - [case "$host_os" in - # Guess yes on glibc systems. - *-gnu* | gnu*) gl_cv_func_usleep_works="guessing yes" ;; -+ # Guess yes on musl systems. -+ *-musl*) gl_cv_func_usleep_works="guessing yes" ;; - # Guess no on native Windows. - mingw*) gl_cv_func_usleep_works="guessing no" ;; - # If we don't know, assume the worst. -diff --git a/m4/utimes.m4 b/m4/utimes.m4 -index 7209b6d..5806d8f 100644 ---- a/m4/utimes.m4 -+++ b/m4/utimes.m4 -@@ -1,5 +1,5 @@ - # Detect some bugs in glibc's implementation of utimes. --# serial 5 -+# serial 6 - - dnl Copyright (C) 2003-2005, 2009-2019 Free Software Foundation, Inc. - dnl This file is free software; the Free Software Foundation -@@ -143,9 +143,11 @@ main () - [gl_cv_func_working_utimes=yes], - [gl_cv_func_working_utimes=no], - [case "$host_os" in -- # Guess no on native Windows. -- mingw*) gl_cv_func_working_utimes="guessing no" ;; -- *) gl_cv_func_working_utimes="guessing no" ;; -+ # Guess yes on musl systems. -+ *-musl*) gl_cv_func_working_utimes="guessing yes" ;; -+ # Guess no on native Windows. -+ mingw*) gl_cv_func_working_utimes="guessing no" ;; -+ *) gl_cv_func_working_utimes="guessing no" ;; - esac - ]) - ]) -diff --git a/m4/wcwidth.m4 b/m4/wcwidth.m4 -index baa2002..3952fd2 100644 ---- a/m4/wcwidth.m4 -+++ b/m4/wcwidth.m4 -@@ -1,4 +1,4 @@ --# wcwidth.m4 serial 27 -+# wcwidth.m4 serial 28 - dnl Copyright (C) 2006-2019 Free Software Foundation, Inc. - dnl This file is free software; the Free Software Foundation - dnl gives unlimited permission to copy and/or distribute it, -@@ -98,9 +98,13 @@ int main () - [ - changequote(,)dnl - case "$host_os" in -- # Guess yes on glibc and AIX 7 systems. -- *-gnu* | gnu* | aix[7-9]*) gl_cv_func_wcwidth_works="guessing yes";; -- *) gl_cv_func_wcwidth_works="guessing no";; -+ # Guess yes on glibc systems. -+ *-gnu* | gnu*) gl_cv_func_wcwidth_works="guessing yes";; -+ # Guess yes on musl systems. -+ *-musl*) gl_cv_func_wcwidth_works="guessing yes";; -+ # Guess yes on AIX 7 systems. -+ aix[7-9]*) gl_cv_func_wcwidth_works="guessing yes";; -+ *) gl_cv_func_wcwidth_works="guessing no";; - esac - changequote([,])dnl - ]) --- -1.9.1 - - diff --git a/third_party/nixpkgs/pkgs/tools/misc/coreutils/default.nix b/third_party/nixpkgs/pkgs/tools/misc/coreutils/default.nix index 50d3a2437d..e3e2e167e3 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/coreutils/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/coreutils/default.nix @@ -22,21 +22,16 @@ with lib; stdenv.mkDerivation (rec { pname = "coreutils"; - version = "8.31"; + version = "8.32"; src = fetchurl { url = "mirror://gnu/${pname}/${pname}-${version}.tar.xz"; - sha256 = "1zg9m79x1i2nifj4kb0waf9x3i5h6ydkypkjnbsb9rnwis8rqypz"; + sha256 = "sha256-RFjY3nhJ30TMqxXhaxVIsoUiTbul8I+sBwwcDgvMTPo="; }; patches = optional stdenv.hostPlatform.isCygwin ./coreutils-8.23-4.cygwin.patch - # Fix failing test with musl. See https://lists.gnu.org/r/coreutils/2019-05/msg00031.html - # To be removed in coreutils-8.32. - ++ optional stdenv.hostPlatform.isMusl ./avoid-false-positive-in-date-debug-test.patch - # Fix compilation in musl-cross environments. To be removed in coreutils-8.32. - ++ optional stdenv.hostPlatform.isMusl ./coreutils-8.31-musl-cross.patch - # Fix compilation in android-cross environments. To be removed in coreutils-8.32. - ++ [ ./coreutils-8.31-android-cross.patch ]; + # included on coreutils master; TODO: apply unconditionally, I guess + ++ optional stdenv.hostPlatform.isAarch64 ./sys-getdents-undeclared.patch; postPatch = '' # The test tends to fail on btrfs,f2fs and maybe other unusual filesystems. diff --git a/third_party/nixpkgs/pkgs/tools/misc/coreutils/sys-getdents-undeclared.patch b/third_party/nixpkgs/pkgs/tools/misc/coreutils/sys-getdents-undeclared.patch new file mode 100644 index 0000000000..0af5de6841 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/misc/coreutils/sys-getdents-undeclared.patch @@ -0,0 +1,100 @@ +From 10fcb97bd728f09d4a027eddf8ad2900f0819b0a Mon Sep 17 00:00:00 2001 +From: Paul Eggert +Date: Thu, 5 Mar 2020 17:25:29 -0800 +Subject: ls: restore 8.31 behavior on removed directories + +* NEWS: Mention this. +* src/ls.c: Do not include +(print_dir): Don't worry about whether the directory is removed. +* tests/ls/removed-directory.sh: Adjust to match new (i.e., old) +behavior. +--- + NEWS (removed diff in nixpkgs)| 6 ++++++ + src/ls.c | 22 ---------------------- + tests/ls/removed-directory.sh | 10 ++-------- + 3 files changed, 8 insertions(+), 30 deletions(-) + +diff --git a/src/ls.c b/src/ls.c +index 24b983287..4acf5f44d 100644 +--- a/src/ls.c ++++ b/src/ls.c +@@ -49,10 +49,6 @@ + # include + #endif + +-#ifdef __linux__ +-# include +-#endif +- + #include + #include + #include +@@ -2896,7 +2892,6 @@ print_dir (char const *name, char const *realname, bool command_line_arg) + struct dirent *next; + uintmax_t total_blocks = 0; + static bool first = true; +- bool found_any_entries = false; + + errno = 0; + dirp = opendir (name); +@@ -2972,7 +2967,6 @@ print_dir (char const *name, char const *realname, bool command_line_arg) + next = readdir (dirp); + if (next) + { +- found_any_entries = true; + if (! file_ignored (next->d_name)) + { + enum filetype type = unknown; +@@ -3018,22 +3012,6 @@ print_dir (char const *name, char const *realname, bool command_line_arg) + if (errno != EOVERFLOW) + break; + } +-#ifdef __linux__ +- else if (! found_any_entries) +- { +- /* If readdir finds no directory entries at all, not even "." or +- "..", then double check that the directory exists. */ +- if (syscall (SYS_getdents, dirfd (dirp), NULL, 0) == -1 +- && errno != EINVAL) +- { +- /* We exclude EINVAL as that pertains to buffer handling, +- and we've passed NULL as the buffer for simplicity. +- ENOENT is returned if appropriate before buffer handling. */ +- file_failure (command_line_arg, _("reading directory %s"), name); +- } +- break; +- } +-#endif + else + break; + +diff --git a/tests/ls/removed-directory.sh b/tests/ls/removed-directory.sh +index e8c835dab..fe8f929a1 100755 +--- a/tests/ls/removed-directory.sh ++++ b/tests/ls/removed-directory.sh +@@ -26,20 +26,14 @@ case $host_triplet in + *) skip_ 'non linux kernel' ;; + esac + +-LS_FAILURE=2 +- +-cat <<\EOF >exp-err || framework_failure_ +-ls: reading directory '.': No such file or directory +-EOF +- + cwd=$(pwd) + mkdir d || framework_failure_ + cd d || framework_failure_ + rmdir ../d || framework_failure_ + +-returns_ $LS_FAILURE ls >../out 2>../err || fail=1 ++ls >../out 2>../err || fail=1 + cd "$cwd" || framework_failure_ + compare /dev/null out || fail=1 +-compare exp-err err || fail=1 ++compare /dev/null err || fail=1 + + Exit $fail +-- +cgit v1.2.1 + diff --git a/third_party/nixpkgs/pkgs/tools/misc/fzf/default.nix b/third_party/nixpkgs/pkgs/tools/misc/fzf/default.nix index 6bd7f1ac3e..fd9cea21a9 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/fzf/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/fzf/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "fzf"; - version = "0.24.1"; + version = "0.24.2"; src = fetchFromGitHub { owner = "junegunn"; repo = pname; rev = version; - sha256 = "03f9fdqicw1a2hcjiasya0dq72jvdz6fqw7dfig4kv5l14pwf3v9"; + sha256 = "1s9ynpd158cddzppphqksml5v1csyi55ji0az8kz2p10iz89v1ry"; }; vendorSha256 = "0dd0qm1fxp3jnlrhfaas8fw87cj7rygaac35a9nk3xh2xsk7q35p"; diff --git a/third_party/nixpkgs/pkgs/tools/misc/mbuffer/default.nix b/third_party/nixpkgs/pkgs/tools/misc/mbuffer/default.nix index d86f824b87..4007a3f773 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/mbuffer/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/mbuffer/default.nix @@ -3,12 +3,12 @@ } : stdenv.mkDerivation rec { - version = "20200505"; + version = "20200929"; pname = "mbuffer"; src = fetchurl { url = "http://www.maier-komor.de/software/mbuffer/mbuffer-${version}.tgz"; - sha256 = "02qzy3appah0llg6aa71isl2a5nc93bkzy5r4d682lcy2j1n216c"; + sha256 = "1s6lxbqba2hwnvrdrwk0fpnff62gv0ynah4ql0c9y14s9v0y79jk"; }; buildInputs = [ openssl ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/mstflint/default.nix b/third_party/nixpkgs/pkgs/tools/misc/mstflint/default.nix index 20d7110944..be3993d81e 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/mstflint/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/mstflint/default.nix @@ -19,6 +19,7 @@ stdenv.mkDerivation rec { dontDisableStatic = true; # the build fails without this. should probably be reported upstream meta = with stdenv.lib; { + description = "Open source version of Mellanox Firmware Tools (MFT)"; homepage = "https://github.com/Mellanox/mstflint"; license = with licenses; [ gpl2 bsd2 ]; platforms = platforms.linux; diff --git a/third_party/nixpkgs/pkgs/tools/misc/onefetch/default.nix b/third_party/nixpkgs/pkgs/tools/misc/onefetch/default.nix index 426c5f2120..61f6fdde5d 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/onefetch/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/onefetch/default.nix @@ -3,16 +3,16 @@ rustPlatform.buildRustPackage rec { pname = "onefetch"; - version = "2.5.0"; + version = "2.6.0"; src = fetchFromGitHub { owner = "o2sh"; repo = pname; rev = "v${version}"; - sha256 = "sha256-F1NbzcMoct0mjWKY2itz4cBqVToY7HpoaRzk3l683fY="; + sha256 = "sha256-KdPr/6wGyoHhEwfPektL+B1khyoRfxDHI4aFcKNU0TM="; }; - cargoSha256 = "sha256-eBY+34VEPEAv5bqerxR3i7cJrVb1GtvmWyrM7uuef2E="; + cargoSha256 = "sha256-MLlGz7Sid0G52//XekqkZgzLqFL7xoUwT6OvpaF4jm0="; buildInputs = with stdenv; lib.optionals isDarwin [ CoreFoundation libiconv libresolv Security ]; @@ -21,6 +21,6 @@ rustPlatform.buildRustPackage rec { description = "Git repository summary on your terminal"; homepage = "https://github.com/o2sh/onefetch"; license = licenses.mit; - maintainers = with maintainers; [ filalex77 ]; + maintainers = with maintainers; [ filalex77 kloenk ]; }; } diff --git a/third_party/nixpkgs/pkgs/tools/misc/parallel/default.nix b/third_party/nixpkgs/pkgs/tools/misc/parallel/default.nix index 2f3ca5afd5..45439afe3d 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/parallel/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/parallel/default.nix @@ -1,11 +1,11 @@ { fetchurl, stdenv, perl, makeWrapper, procps, coreutils }: stdenv.mkDerivation rec { - name = "parallel-20200822"; + name = "parallel-20200922"; src = fetchurl { url = "mirror://gnu/parallel/${name}.tar.bz2"; - sha256 = "02dy46g6f05p7s2qs8h6yg20p1zl3flxxf77n5jw74l3h1m24m4n"; + sha256 = "0wj19kwjk0hwm8bk9yfcf3rpr0314lmjy5xxlvvdqnbbc4ml2418"; }; patches = [ diff --git a/third_party/nixpkgs/pkgs/tools/misc/phoronix-test-suite/default.nix b/third_party/nixpkgs/pkgs/tools/misc/phoronix-test-suite/default.nix index bea73610dd..520794c565 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/phoronix-test-suite/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/phoronix-test-suite/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "phoronix-test-suite"; - version = "9.8.0"; + version = "10.0.1"; src = fetchurl { url = "https://phoronix-test-suite.com/releases/${pname}-${version}.tar.gz"; - sha256 = "05q01cr4a2mmyski50pqna9sgw2jy93fgfpjwkhbkc09na6400sq"; + sha256 = "09wrrcxfvh7pwv0jqpyzjsr0rd7askfr0s2xr1wv9v40znxmsmzz"; }; buildInputs = [ php ]; diff --git a/third_party/nixpkgs/pkgs/tools/misc/pspg/default.nix b/third_party/nixpkgs/pkgs/tools/misc/pspg/default.nix index 4af7a0009a..a2048132e0 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/pspg/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/pspg/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "pspg"; - version = "3.1.3"; + version = "3.1.5"; src = fetchFromGitHub { owner = "okbob"; repo = pname; rev = version; - sha256 = "16pajhzr4aahyhdzkp9g3ld2insnlk2z2w2pfab8bghw4f69j5xf"; + sha256 = "000h4yiaym7i5bcm268rvsjbs2brz2is9lhm6vm3dx0q7k1pcx45"; }; nativeBuildInputs = [ pkgconfig ]; diff --git a/third_party/nixpkgs/pkgs/tools/networking/curl/default.nix b/third_party/nixpkgs/pkgs/tools/networking/curl/default.nix index 8e151bc2ea..c466a48434 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/curl/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/curl/default.nix @@ -34,14 +34,14 @@ assert gssSupport -> libkrb5 != null; stdenv.mkDerivation rec { pname = "curl"; - version = "7.72.0"; + version = "7.73.0"; src = fetchurl { urls = [ "https://curl.haxx.se/download/${pname}-${version}.tar.bz2" "https://github.com/curl/curl/releases/download/${lib.replaceStrings ["."] ["_"] pname}-${version}/${pname}-${version}.tar.bz2" ]; - sha256 = "1vq3ay87vayfrv67l7s7h79nm7gwdqhidki0brv5jahhch49g4dd"; + sha256 = "sha256-zzT+Cwe4APHAGkmabosq9Uj20OBE3KSinYikvuFG0TE="; }; outputs = [ "bin" "dev" "out" "man" "devdoc" ]; diff --git a/third_party/nixpkgs/pkgs/tools/networking/curlie/default.nix b/third_party/nixpkgs/pkgs/tools/networking/curlie/default.nix index 542bb888bf..9ae9644eb9 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/curlie/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/curlie/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "curlie"; - version = "1.5.4"; + version = "1.6.0"; src= fetchFromGitHub { owner = "rs"; repo = pname; rev = "v${version}"; - sha256 = "0z92gz39m0gk8j7l2nwa5vrfr3mq160vr1b15sy13jwi1zspc7hx"; + sha256 = "sha256-rrwdqaKrC37BaI9RuTTv6EiOZ3ztgd7nGuplmeW02h8="; }; - vendorSha256 = "1qnl15b9cs6xi8z368a9n34v3wr2adwp376cjzhyllni7sf6v1mm"; + vendorSha256 = "sha256-tYZtnD7RUurhl8yccXlTIvOxybBJITM+it1ollYJ1OI="; doCheck = false; diff --git a/third_party/nixpkgs/pkgs/tools/networking/dropbear/default.nix b/third_party/nixpkgs/pkgs/tools/networking/dropbear/default.nix index b80eba3f6c..8821730291 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/dropbear/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/dropbear/default.nix @@ -4,11 +4,11 @@ }: stdenv.mkDerivation rec { - name = "dropbear-2020.80"; + name = "dropbear-2020.81"; src = fetchurl { url = "https://matt.ucc.asn.au/dropbear/releases/${name}.tar.bz2"; - sha256 = "0jbrbpdzyv11x5rkljdimzq9p6a7da5siw9k405ibnpjj4dr89yr"; + sha256 = "0fy5ma4cfc2pk25mcccc67b2mf1rnb2c06ilb7ddnxbpnc85s8s8"; }; dontDisableStatic = enableStatic; diff --git a/third_party/nixpkgs/pkgs/tools/networking/i2pd/default.nix b/third_party/nixpkgs/pkgs/tools/networking/i2pd/default.nix index 08c40a4ac8..1439b62bc9 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/i2pd/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/i2pd/default.nix @@ -9,13 +9,13 @@ assert upnpSupport -> miniupnpc != null; stdenv.mkDerivation rec { pname = "i2pd"; - version = "2.33.0"; + version = "2.34.0"; src = fetchFromGitHub { owner = "PurpleI2P"; repo = pname; rev = version; - sha256 = "1zsp4pml5pq8p1ipvarnlcfwcscch13iz1gzza5qm0yl01dl9qpk"; + sha256 = "0ibk222fwgjaxrmhrk5avcmmbj52ibcsydm2m02xnlpr8kcqsjnc"; }; buildInputs = with stdenv.lib; [ boost zlib openssl ] diff --git a/third_party/nixpkgs/pkgs/tools/networking/lldpd/default.nix b/third_party/nixpkgs/pkgs/tools/networking/lldpd/default.nix index 8462d907a1..5d7c648b22 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/lldpd/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/lldpd/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "lldpd"; - version = "1.0.5"; + version = "1.0.6"; src = fetchurl { url = "https://media.luffy.cx/files/lldpd/${pname}-${version}.tar.gz"; - sha256 = "16fbqrs3l976gdslx647nds8x7sz4h5h3h4l4yxzrayvyh9b5lrd"; + sha256 = "1v5fd8vwxracvzvgrsswvhppwyx5c4srj89g1cnvy73w831mpq95"; }; configureFlags = [ diff --git a/third_party/nixpkgs/pkgs/tools/networking/oneshot/default.nix b/third_party/nixpkgs/pkgs/tools/networking/oneshot/default.nix index f02370ab69..0f886fda03 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/oneshot/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/oneshot/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "oneshot"; - version = "1.2.0"; + version = "1.3.1"; src = fetchFromGitHub { owner = "raphaelreyna"; repo = "oneshot"; rev = "v${version}"; - sha256 = "11xmvqj7md970rjhkg1zj2w6yqpw6cj83aw37a82sfdn90kyhg9d"; + sha256 = "047mncv9abs4xj7bh9lhc3wan37cldjjyrpkis7pvx6zhzml74kf"; }; vendorSha256 = "1cxr96yrrmz37r542mc5376jll9lqjqm18k8761h9jqfbzmh9rkp"; diff --git a/third_party/nixpkgs/pkgs/tools/networking/shadowsocks-rust/default.nix b/third_party/nixpkgs/pkgs/tools/networking/shadowsocks-rust/default.nix index 9726cde61e..ed793a50cb 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/shadowsocks-rust/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/shadowsocks-rust/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "shadowsocks-rust"; - version = "1.8.18"; + version = "1.8.23"; src = fetchFromGitHub { rev = "v${version}"; owner = "shadowsocks"; repo = pname; - sha256 = "1kxf0qcyg5mhddrzwv0hd1fy901wl0ydmxi6b1k2217xmgiyi2s6"; + sha256 = "1ylasv33478cgwmr8wrd4705azfzrw495w629ncynamv7z17w3k3"; }; - cargoSha256 = "0vmd4sjagyhrc7q7fszwcjh4nhhmhckmx48i1h2xhr68bwncmyif"; + cargoSha256 = "060k2dil38bx4zb5nnkr3mj6aayginbhr3aqjv0h071q0vlvp05p"; SODIUM_USE_PKG_CONFIG = 1; diff --git a/third_party/nixpkgs/pkgs/tools/networking/slirp4netns/default.nix b/third_party/nixpkgs/pkgs/tools/networking/slirp4netns/default.nix index 60cb341325..39b361bd30 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/slirp4netns/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/slirp4netns/default.nix @@ -11,13 +11,13 @@ stdenv.mkDerivation rec { pname = "slirp4netns"; - version = "1.1.4"; + version = "1.1.6"; src = fetchFromGitHub { owner = "rootless-containers"; repo = "slirp4netns"; rev = "v${version}"; - sha256 = "13hlljkqss9abjpwaa5gcn6qnax0ws03zzh45c4rv1if7rwk6nbl"; + sha256 = "1nspvzcpwmaipdq49jm7z3ymdg95zqgcyv1cjfs1zb950knrrggr"; }; nativeBuildInputs = [ autoreconfHook pkg-config ]; diff --git a/third_party/nixpkgs/pkgs/tools/networking/unbound/default.nix b/third_party/nixpkgs/pkgs/tools/networking/unbound/default.nix index 9b33d53e54..d2fa0deca0 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/unbound/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/unbound/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "unbound"; - version = "1.11.0"; + version = "1.12.0"; src = fetchurl { url = "https://unbound.net/downloads/${pname}-${version}.tar.gz"; - sha256 = "1xqywn2qdmjjq0csrqxh9p2rnizdrr1f99zdx87z7f3fyyc0fbwz"; + sha256 = "0daqxzvknvcz7sgag3wcrxhp4a39ik93lsrfpwcl9whjg2lm74jv"; }; outputs = [ "out" "lib" "man" ]; # "dev" would only split ~20 kB diff --git a/third_party/nixpkgs/pkgs/tools/nix/nar-serve/default.nix b/third_party/nixpkgs/pkgs/tools/nix/nar-serve/default.nix new file mode 100644 index 0000000000..89a38b40a1 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/nix/nar-serve/default.nix @@ -0,0 +1,31 @@ +{ buildGoModule +, fetchFromGitHub +, lib +, stdenv +}: +let + pname = "nar-serve"; + version = "0.3.0"; + +in +buildGoModule rec { + inherit pname version; + + src = fetchFromGitHub { + owner = "numtide"; + repo = "nar-serve"; + rev = "v${version}"; + sha256 = "000xxrar5ngrqqfi7ynx84i6wi27mirgm26brhyg0y4pygc9ykhz"; + }; + + vendorSha256 = "0qkzbr85wkx3r7qgnzg9pdl7vsli10bzcdbj2gqd1kdzwb8khszs"; + + doCheck = false; + + meta = with stdenv.lib; { + description = "Serve NAR file contents via HTTP"; + homepage = "https://github.com/numtide/nar-serve"; + license = licenses.mit; + maintainers = with maintainers; [ rizary ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/package-management/nixops/default.nix b/third_party/nixpkgs/pkgs/tools/package-management/nixops/default.nix index c761a3a477..96e6ec3f55 100644 --- a/third_party/nixpkgs/pkgs/tools/package-management/nixops/default.nix +++ b/third_party/nixpkgs/pkgs/tools/package-management/nixops/default.nix @@ -1,4 +1,4 @@ -{ callPackage, fetchurl }: +{ callPackage, fetchurl, fetchpatch }: callPackage ./generic.nix (rec { version = "1.7"; @@ -6,4 +6,11 @@ callPackage ./generic.nix (rec { url = "https://nixos.org/releases/nixops/nixops-${version}/nixops-${version}.tar.bz2"; sha256 = "091c0b5bca57d4aa20be20e826ec161efe3aec9c788fbbcf3806a734a517f0f3"; }; + patches = [ + # follow redirect in nixos-infect. Remove with the next release. + (fetchpatch { + url = "https://github.com/NixOS/nixops/commit/fb6d4665e8efd858a215bbaaf079ec3f5ebc49b8.patch"; + sha256 = "1hbhykl811zsqlaj3y5m9d8lfsal6ps6n5p16ah6lqy2s18ap9d0"; + }) + ]; }) diff --git a/third_party/nixpkgs/pkgs/tools/package-management/nixops/generic.nix b/third_party/nixpkgs/pkgs/tools/package-management/nixops/generic.nix index 59d139d288..564256de35 100644 --- a/third_party/nixpkgs/pkgs/tools/package-management/nixops/generic.nix +++ b/third_party/nixpkgs/pkgs/tools/package-management/nixops/generic.nix @@ -2,11 +2,12 @@ # version args , src, version , meta ? {} +, patches ? null }: python2Packages.buildPythonApplication { name = "nixops-${version}"; - inherit version src; + inherit version src patches; buildInputs = [ libxslt ]; diff --git a/third_party/nixpkgs/pkgs/tools/package-management/packagekit/qt.nix b/third_party/nixpkgs/pkgs/tools/package-management/packagekit/qt.nix index 987c834f50..2a1ebada00 100644 --- a/third_party/nixpkgs/pkgs/tools/package-management/packagekit/qt.nix +++ b/third_party/nixpkgs/pkgs/tools/package-management/packagekit/qt.nix @@ -3,13 +3,13 @@ stdenv.mkDerivation rec { pname = "packagekit-qt"; - version = "1.0.1"; + version = "1.0.2"; src = fetchFromGitHub { owner = "hughsie"; repo = "PackageKit-Qt"; rev = "v${version}"; - sha256 = "1ls6mn9abpwzw5wjgmslc5h9happj3516y1q67imppczk8g9h2yk"; + sha256 = "1d20r503msw1vix3nb6a8bmdqld7fj8k9jk33bkqsc610a2zsms6"; }; buildInputs = [ packagekit ]; diff --git a/third_party/nixpkgs/pkgs/tools/security/1password-gui/default.nix b/third_party/nixpkgs/pkgs/tools/security/1password-gui/default.nix index b9e668aaa4..0a76a04196 100644 --- a/third_party/nixpkgs/pkgs/tools/security/1password-gui/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/1password-gui/default.nix @@ -13,11 +13,11 @@ in stdenv.mkDerivation rec { pname = "1password"; - version = "0.9.1"; + version = "0.9.2-1"; src = fetchurl { url = "https://onepassword.s3.amazonaws.com/linux/appimage/${pname}-${version}.AppImage"; - sha256 = "04hv7hw4s3f65kf3ggh9l0nrx25k5yj2kqv83nl7pvam5lvnv8sz"; + sha256 = "19m8qfhmdzgz76xba9wi5cb12jqwr17afqzajvgq681i52fij0lr"; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/third_party/nixpkgs/pkgs/tools/security/bitwarden_rs/default.nix b/third_party/nixpkgs/pkgs/tools/security/bitwarden_rs/default.nix index c2bb832418..57e865ef59 100644 --- a/third_party/nixpkgs/pkgs/tools/security/bitwarden_rs/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/bitwarden_rs/default.nix @@ -8,13 +8,13 @@ let in rustPlatform.buildRustPackage rec { pname = "bitwarden_rs"; - version = "1.16.3"; + version = "1.17.0"; src = fetchFromGitHub { owner = "dani-garcia"; repo = pname; rev = version; - sha256 = "1scy8abzy6j1jsms84cg2nqkn1zsxr5mjikp2xh0yl0ckkk13ffn"; + sha256 = "0hi29vy23a5r23pgzdssd2gvim8vw2vmykck5cl5phq11a3az31p"; }; nativeBuildInputs = [ pkgconfig ]; @@ -25,7 +25,7 @@ in rustPlatform.buildRustPackage rec { RUSTC_BOOTSTRAP = 1; - cargoSha256 = "112mvgq581cms0war5dbni7f7yryjr5agryzn5qx835qkznzar8s"; + cargoSha256 = "0hv3k5l85nz4syzamranhi237fiwkjnda8v5ssnm2nsmcm7ih9k8"; cargoBuildFlags = [ featuresFlag ]; checkPhase = '' diff --git a/third_party/nixpkgs/pkgs/tools/security/bitwarden_rs/vault.nix b/third_party/nixpkgs/pkgs/tools/security/bitwarden_rs/vault.nix index 8efa1e4bfd..786ff57845 100644 --- a/third_party/nixpkgs/pkgs/tools/security/bitwarden_rs/vault.nix +++ b/third_party/nixpkgs/pkgs/tools/security/bitwarden_rs/vault.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "bitwarden_rs-vault"; - version = "2.16.0b"; + version = "2.16.1"; src = fetchurl { url = "https://github.com/dani-garcia/bw_web_builds/releases/download/v${version}/bw_web_v${version}.tar.gz"; - sha256 = "1p10a5rp2ymx675sbigwrkkfjvpk1lz3d43l2p2i1vbw153py3p1"; + sha256 = "1c4fcf8jzgd6636wv903r5msc9z5l56l2i4k93kvb2zvg7qj014w"; }; buildCommand = '' diff --git a/third_party/nixpkgs/pkgs/tools/system/hostctl/default.nix b/third_party/nixpkgs/pkgs/tools/system/hostctl/default.nix new file mode 100644 index 0000000000..6f557e05cd --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/system/hostctl/default.nix @@ -0,0 +1,36 @@ +{ buildGoModule, fetchFromGitHub, lib, installShellFiles }: + +buildGoModule rec { + pname = "hostctl"; + version = "1.0.14"; + + src = fetchFromGitHub { + owner = "guumaster"; + repo = pname; + rev = "v${version}"; + sha256 = "02bjii97l4fy43v2rb93m9b0ad8y6mjvbvp4sz6a5n0w9dm1z1q9"; + }; + + vendorSha256 = "1lqk3cda0frqp2vwkqa4b3xkdw814wgkbr7g9r2mwxn85fpdcq5c"; + + buildFlagsArray = [ "-ldflags=-s -w -X github.com/guumaster/hostctl/cmd/hostctl/actions.version=${version}" ]; + + nativeBuildInputs = [ installShellFiles ]; + postInstall = '' + installShellCompletion --cmd hostctl \ + --bash <($out/bin/hostctl completion bash) \ + --zsh <($out/bin/hostctl completion zsh) + ''; + + meta = with lib; { + description = "Your dev tool to manage /etc/hosts like a pro!"; + longDescription = '' + This tool gives you more control over the use of your hosts file. + You can have multiple profiles and switch them on/off as you need. + ''; + homepage = "https://guumaster.github.io/hostctl/"; + license = licenses.mit; + maintainers = with maintainers; [ blaggacao ]; + }; +} + diff --git a/third_party/nixpkgs/pkgs/tools/system/memtester/default.nix b/third_party/nixpkgs/pkgs/tools/system/memtester/default.nix index 7b065c6cfa..870d7e0dd1 100644 --- a/third_party/nixpkgs/pkgs/tools/system/memtester/default.nix +++ b/third_party/nixpkgs/pkgs/tools/system/memtester/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "memtester"; - version = "4.3.0"; + version = "4.5.0"; preConfigure = '' echo "$CC" > conf-cc @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { src = fetchurl { url = "http://pyropus.ca/software/memtester/old-versions/memtester-${version}.tar.gz"; - sha256 = "127xymmyzb9r6dxqrwd69v7gf8csv8kv7fjvagbglf3wfgyy5pzr"; + sha256 = "0dxfwayns3hjjplkxkpkm1409lmjlpi4chcrahcvdbnl0q6jpmcf"; }; installFlags = [ "INSTALLPATH=$(out)" ]; diff --git a/third_party/nixpkgs/pkgs/tools/system/mlc/default.nix b/third_party/nixpkgs/pkgs/tools/system/mlc/default.nix new file mode 100644 index 0000000000..d055c98e04 --- /dev/null +++ b/third_party/nixpkgs/pkgs/tools/system/mlc/default.nix @@ -0,0 +1,30 @@ +{ stdenv, fetchurl, patchelf }: +stdenv.mkDerivation rec { + pname = "mlc"; + version = "3.9"; + + src = fetchurl { + url = "https://software.intel.com/content/dam/develop/external/us/en/protected/mlc_v${version}.tgz"; + sha256 = "1x7abm9hbv9hkqa3cgxz6l04m3ycyl40i4zgx1w819pc10n6dhdb"; + }; + + sourceRoot = "Linux"; + + installPhase = '' + install -Dm755 mlc $out/bin/mlc + ''; + + nativeBuildInputs = [ patchelf ]; + + fixupPhase = '' + patchelf --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" $out/bin/mlc + ''; + + meta = with stdenv.lib; { + homepage = "https://software.intel.com/content/www/us/en/develop/articles/intelr-memory-latency-checker.html"; + description = "Intel Memory Latency Checker"; + license = licenses.unfree; + maintainers = with maintainers; [ basvandijk ]; + platforms = with platforms; linux; + }; +} diff --git a/third_party/nixpkgs/pkgs/tools/system/monit/default.nix b/third_party/nixpkgs/pkgs/tools/system/monit/default.nix index 8be921b385..3349749d62 100644 --- a/third_party/nixpkgs/pkgs/tools/system/monit/default.nix +++ b/third_party/nixpkgs/pkgs/tools/system/monit/default.nix @@ -6,11 +6,11 @@ }: stdenv.mkDerivation rec { - name = "monit-5.27.0"; + name = "monit-5.27.1"; src = fetchurl { url = "${meta.homepage}dist/${name}.tar.gz"; - sha256 = "197w59wkg6izlj6p7xbx0n6ksvm6pym9pzh24nakl6agcbpxxh6q"; + sha256 = "0lgdhif6x11fcpli0qn138rpdvrfnwmkzsy4lc9pas45c78hhx7m"; }; nativeBuildInputs = [ bison flex ]; diff --git a/third_party/nixpkgs/pkgs/tools/system/rocm-smi/default.nix b/third_party/nixpkgs/pkgs/tools/system/rocm-smi/default.nix index 69f5237731..1ef25fd082 100644 --- a/third_party/nixpkgs/pkgs/tools/system/rocm-smi/default.nix +++ b/third_party/nixpkgs/pkgs/tools/system/rocm-smi/default.nix @@ -2,13 +2,13 @@ buildPythonApplication rec { pname = "rocm-smi"; - version = "3.8.0"; + version = "3.9.0"; src = fetchFromGitHub { owner = "RadeonOpenCompute"; repo = "ROC-smi"; rev = "rocm-${version}"; - sha256 = "00g9cbni73x9da05lx7hiffp303mdkj1wpxiavfylr4q4z84yhrz"; + sha256 = "190x31s7mjpyp7hr6cgdnvn2s20qj3sqcxywycjm2i9ar429l2ni"; }; format = "other"; diff --git a/third_party/nixpkgs/pkgs/tools/typesetting/pdf2htmlEX/add-glib-cmake.patch b/third_party/nixpkgs/pkgs/tools/typesetting/pdf2htmlEX/add-glib-cmake.patch deleted file mode 100644 index 8e1d9dfc19..0000000000 --- a/third_party/nixpkgs/pkgs/tools/typesetting/pdf2htmlEX/add-glib-cmake.patch +++ /dev/null @@ -1,17 +0,0 @@ -diff --git a/CMakeLists.txt b/CMakeLists.txt -index 3fdabb0..378621a 100644 ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -59,6 +59,12 @@ include_directories(${FONTFORGE_INCLUDE_DIRS}) - link_directories(${FONTFORGE_LIBRARY_DIRS}) - set(PDF2HTMLEX_LIBS ${PDF2HTMLEX_LIBS} ${FONTFORGE_LIBRARIES}) - -+# add glib dependency -+pkg_check_modules(GLIB REQUIRED glib-2.0) -+include_directories(${GLIB_INCLUDE_DIRS}) -+link_directories(${GLIB_INCLUDE_DIRS}) -+set(PDF2HTMLEX_LIBS ${PDF2HTMLEX_LIBS} ${GLIB_LIBRARIES}) -+ - # debug build flags (overwrite default cmake debug flags) - set(CMAKE_C_FLAGS_DEBUG "-ggdb -pg") - set(CMAKE_CXX_FLAGS_DEBUG "-ggdb -pg") diff --git a/third_party/nixpkgs/pkgs/tools/typesetting/pdf2htmlEX/default.nix b/third_party/nixpkgs/pkgs/tools/typesetting/pdf2htmlEX/default.nix deleted file mode 100644 index dee6ec3c6f..0000000000 --- a/third_party/nixpkgs/pkgs/tools/typesetting/pdf2htmlEX/default.nix +++ /dev/null @@ -1,48 +0,0 @@ -{ stdenv, fetchFromGitHub, cmake, pkgconfig -, poppler, xorg, pcre, python, glib, fontforge, cairo, pango, openjdk8 - -}: - -stdenv.mkDerivation { - name = "pdf2htmlEX-0.14.6"; - - src = fetchFromGitHub { - repo = "pdf2htmlEX"; - owner = "coolwanglu"; - rev = "v0.14.6"; - sha256 = "1nh0ab8f11fsyi4ldknlkmdzcfvm1dfh8b9bmprjgq6q0vjj7f78"; - }; - - patches = [ ./add-glib-cmake.patch ]; - - cmakeFlags = [ "-DENABLE_SVG=ON" ]; - - enableParallelBuilding = true; - - nativeBuildInputs = [ - cmake - pkgconfig - ]; - - buildInputs = [ - xorg.libpthreadstubs - xorg.libXdmcp - pcre - python - glib - cairo - pango - poppler - fontforge - openjdk8 - ]; - - meta = with stdenv.lib; { - description = "Render PDF files to beautiful HTML"; - homepage = "https://github.com/coolwanglu/pdf2htmlEX"; - license = licenses.gpl3Plus; - maintainers = [ maintainers.taktoa ]; - platforms = with platforms; linux; - broken = true; # 2018-09-08 - }; -} diff --git a/third_party/nixpkgs/pkgs/tools/video/flvtool2/default.nix b/third_party/nixpkgs/pkgs/tools/video/flvtool2/default.nix deleted file mode 100644 index 9a1f9f1210..0000000000 --- a/third_party/nixpkgs/pkgs/tools/video/flvtool2/default.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ lib, buildRubyGem, ruby }: - -buildRubyGem rec { - inherit ruby; - name = "${gemName}-${version}"; - gemName = "flvtool2"; - version = "1.0.6"; - source.sha256 = "0xsla1061pi4ryh3jbvwsbs8qchprchbqjy7652g2g64v37i74qj"; - - meta = { - broken = true; # depends on ruby 2.2 - homepage = "https://github.com/unnu/flvtool2"; - description = "A tool to manipulate Macromedia Flash Video files"; - platforms = ruby.meta.platforms; - license = lib.licenses.bsd3; - }; -} diff --git a/third_party/nixpkgs/pkgs/top-level/aliases.nix b/third_party/nixpkgs/pkgs/top-level/aliases.nix index 8311d1fdeb..41024876d5 100644 --- a/third_party/nixpkgs/pkgs/top-level/aliases.nix +++ b/third_party/nixpkgs/pkgs/top-level/aliases.nix @@ -65,6 +65,7 @@ mapAliases ({ bittorrentSync = throw "bittorrentSync has been deprecated by resilio-sync."; # added 2019-06-03 bittorrentSync14 = throw "bittorrentSync14 has been deprecated by resilio-sync."; # added 2019-06-03 bittorrentSync20 = throw "bittorrentSync20 has been deprecated by resilio-sync."; # added 2019-06-03 + btc1 = throw "btc1 has been removed, it was abandoned by upstream"; # added 2020-11-03 buildPerlPackage = perlPackages.buildPerlPackage; # added 2018-10-12 buildGo112Package = throw "buildGo112Package has been removed"; # added 2020-04-26 buildGo112Module = throw "buildGo112Module has been removed"; # added 2020-04-26 @@ -120,6 +121,7 @@ mapAliases ({ double_conversion = double-conversion; # 2017-11-22 docker_compose = docker-compose; # 2018-11-10 draftsight = throw "draftsight has been removed, no longer available as freeware"; # added 2020-08-14 + dvb_apps = throw "dvb_apps has been removed."; # added 2020-11-03 dwarf_fortress = dwarf-fortress; # added 2016-01-23 emacsPackagesGen = emacsPackagesFor; # added 2018-08-18 emacsPackagesNgGen = emacsPackagesFor; # added 2018-08-18 @@ -141,6 +143,7 @@ mapAliases ({ firestr = throw "firestr has been removed."; # added 2019-12-08 flameGraph = flamegraph; # added 2018-04-25 + flvtool2 = throw "flvtool2 has been removed."; # added 2020-11-03 foldingathome = fahclient; # added 2020-09-03 font-awesome-ttf = font-awesome; # 2018-02-25 # 2019-10-31 @@ -223,6 +226,7 @@ mapAliases ({ joseki = apache-jena-fuseki; # added 2016-02-28 json_glib = json-glib; # added 2018-02-25 kdecoration-viewer = throw "kdecoration-viewer has been removed from nixpkgs, as there is no upstream activity"; # 2020-06-16 + k9copy = throw "k9copy has been removed from nixpkgs, as there is no upstream activity"; # 2020-11-06 julia_07 = throw "julia_07 is deprecated in favor of julia_10 LTS"; # added 2020-09-15 julia_11 = throw "julia_11 is deprecated in favor of latest Julia version"; # added 2020-09-15 kdeconnect = kdeApplications.kdeconnect-kde; # added 2020-10-28 @@ -366,6 +370,7 @@ mapAliases ({ parity = openethereum; # added 2020-08-01 parquet-cpp = arrow-cpp; # added 2018-09-08 pass-otp = pass.withExtensions (ext: [ext.pass-otp]); # added 2018-05-04 + pdf2htmlEx = throw "pdf2htmlEx has been removed from nixpkgs, as it was unmaintained"; # added 2020-11-03 perlXMLParser = perlPackages.XMLParser; # added 2018-10-12 perlArchiveCpio = perlPackages.ArchiveCpio; # added 2018-10-12 pgp-tools = signing-party; # added 2017-03-26 @@ -484,6 +489,7 @@ mapAliases ({ gtk-recordmydesktop = throw "gtk-recordmydesktop has been removed from nixpkgs, as it's unmaintained and uses deprecated libraries"; # added 2019-12-10 qt-recordmydesktop = throw "qt-recordmydesktop has been removed from nixpkgs, as it's abandoned and uses deprecated libraries"; # added 2019-12-10 rfkill = throw "rfkill has been removed, as it's included in util-linux"; # added 2020-08-23 + riak-cs = throw "riak-cs is not maintained anymore"; # added 2020-10-14 rkt = throw "rkt was archived by upstream"; # added 2020-05-16 ruby_2_0_0 = throw "ruby_2_0_0 was deprecated on 2018-02-13: use a newer version of ruby"; ruby_2_1_0 = throw "ruby_2_1_0 was deprecated on 2018-02-13: use a newer version of ruby"; @@ -536,6 +542,7 @@ mapAliases ({ slurm-llnl-full = slurm-full; # renamed July 2017 slurm-full = slurm; # added 2018-05-1 smbclient = samba; # added 2018-04-25 + smugline = throw "smugline has been removed from nixpkgs, as it's unmaintained and depends on deprecated libraries."; # added 2020-11-04 slim = throw "slim has been removed. Please use a different display-manager"; # added 2019-11-11 slimThemes = throw "slimThemes has been removed because slim has been also"; # added 2019-11-11 sundials_3 = throw "sundials_3 was removed in 2020-02. outdated and no longer needed"; @@ -575,6 +582,7 @@ mapAliases ({ sqliteInteractive = sqlite-interactive; # added 2014-12-06 squid4 = squid; # added 2019-08-22 sshfsFuse = sshfs-fuse; # added 2016-09 + stanchion = throw "Stanchion was part of riak-cs which is not maintained anymore"; # added 2020-10-14 surf-webkit2 = surf; # added 2017-04-02 sup = throw "sup was deprecated on 2019-09-10: abandoned by upstream"; swfdec = throw "swfdec has been removed as broken and unmaintained."; # added 2020-08-23 diff --git a/third_party/nixpkgs/pkgs/top-level/all-packages.nix b/third_party/nixpkgs/pkgs/top-level/all-packages.nix index 6269c16b5c..a0c9b4641b 100644 --- a/third_party/nixpkgs/pkgs/top-level/all-packages.nix +++ b/third_party/nixpkgs/pkgs/top-level/all-packages.nix @@ -321,6 +321,8 @@ in fetchMavenArtifact = callPackage ../build-support/fetchmavenartifact { }; + find-cursor = callPackage ../tools/X11/find-cursor { }; + prefer-remote-fetch = import ../build-support/prefer-remote-fetch; global-platform-pro = callPackage ../development/tools/global-platform-pro/default.nix { }; @@ -1214,6 +1216,8 @@ in hime = callPackage ../tools/inputmethods/hime {}; + hostctl = callPackage ../tools/system/hostctl { }; + hpe-ltfs = callPackage ../tools/backup/hpe-ltfs { }; http2tcp = callPackage ../tools/networking/http2tcp { }; @@ -1334,6 +1338,8 @@ in }; aria = aria2; + as-tree = callPackage ../tools/misc/as-tree { }; + asmfmt = callPackage ../development/tools/asmfmt { }; aspcud = callPackage ../tools/misc/aspcud { }; @@ -1852,6 +1858,8 @@ in dapr-cli = callPackage ../development/tools/dapr/cli {}; + dasel = callPackage ../applications/misc/dasel { }; + dasher = callPackage ../applications/accessibility/dasher { }; datamash = callPackage ../tools/misc/datamash { }; @@ -2339,7 +2347,7 @@ in medusa = callPackage ../tools/security/medusa { }; - megasync = libsForQt514.callPackage ../applications/misc/megasync { }; + megasync = libsForQt515.callPackage ../applications/misc/megasync { }; megacmd = callPackage ../applications/misc/megacmd { }; @@ -2465,6 +2473,8 @@ in photon = callPackage ../tools/networking/photon { }; + piglit = callPackage ../tools/graphics/piglit { }; + playerctl = callPackage ../tools/audio/playerctl { }; ps_mem = callPackage ../tools/system/ps_mem { }; @@ -3887,8 +3897,6 @@ in flips = callPackage ../tools/compression/flips { }; - flvtool2 = callPackage ../tools/video/flvtool2 { }; - fmbt = callPackage ../development/tools/fmbt { python = python2; }; @@ -4496,7 +4504,9 @@ in halibut = callPackage ../tools/typesetting/halibut { }; - halide = callPackage ../development/compilers/halide { }; + halide = callPackage ../development/compilers/halide { + llvmPackages = llvmPackages_9; + }; ham = pkgs.perlPackages.ham; @@ -4943,6 +4953,8 @@ in kexpand = callPackage ../development/tools/kexpand { }; + kent = callPackage ../applications/science/biology/kent { }; + keybase = callPackage ../tools/security/keybase { # Reasoning for the inherited apple_sdk.frameworks: # 1. specific compiler errors about: AVFoundation, AudioToolbox, MediaToolbox @@ -5481,6 +5493,7 @@ in mailnagWithPlugins = mailnag.withPlugins( builtins.attrValues mailnag.availablePlugins ); + bubblemail = callPackage ../applications/networking/mailreaders/bubblemail { }; mailsend = callPackage ../tools/networking/mailsend { }; @@ -6333,8 +6346,6 @@ in pdf2djvu = callPackage ../tools/typesetting/pdf2djvu { }; - pdf2htmlEX = callPackage ../tools/typesetting/pdf2htmlEX { }; - pdf2odt = callPackage ../tools/typesetting/pdf2odt { }; pdf-redact-tools = callPackage ../tools/graphics/pdfredacttools { }; @@ -7031,6 +7042,8 @@ in skim = callPackage ../tools/misc/skim { }; + seaweedfs = callPackage ../applications/networking/seaweedfs { }; + sec = callPackage ../tools/admin/sec { }; seccure = callPackage ../tools/security/seccure { }; @@ -7187,8 +7200,6 @@ in smu = callPackage ../tools/text/smu { }; - smugline = python3Packages.smugline; - sn0int = callPackage ../tools/security/sn0int { }; snabb = callPackage ../tools/networking/snabb { } ; @@ -7509,7 +7520,9 @@ in texstudio = libsForQt5.callPackage ../applications/editors/texstudio { }; - textadept = callPackage ../applications/editors/textadept { }; + textadept = callPackage ../applications/editors/textadept/10 { }; + + textadept11 = callPackage ../applications/editors/textadept/11 { }; texworks = libsForQt514.callPackage ../applications/editors/texworks { }; @@ -7567,6 +7580,8 @@ in tio = callPackage ../tools/misc/tio { }; + tiv = callPackage ../applications/misc/tiv { }; + tldr = callPackage ../tools/misc/tldr { }; tldr-hs = haskellPackages.tldr; @@ -8456,9 +8471,7 @@ in zssh = callPackage ../tools/networking/zssh { }; zstd = callPackage ../tools/compression/zstd { - cmake = buildPackages.cmake.override { - libarchive = buildPackages.libarchive.override { zstd = null; }; - }; + cmake = buildPackages.cmakeMinimal; }; zsync = callPackage ../tools/compression/zsync { }; @@ -9386,10 +9399,19 @@ in /* default JDK */ jdk = jdk14; - # jdk14 lacks a jre output. See https://github.com/NixOS/nixpkgs/issues/79490 + + # Since the introduction of the Java Platform Module System in Java 9, Java + # no longer ships a separate JRE package. + # + # If you are building a 'minimal' system/image, you are encouraged to use + # 'jre_minimal' to build a bespoke JRE containing only the modules you need. + # + # For a general-purpose system, 'jre' defaults to the full JDK: jre = jdk14; jre_headless = jdk14_headless; + jre_minimal = callPackage ../development/compilers/openjdk/jre.nix { }; + openjdk = openjdk14; openjdk_headless = openjdk14_headless; @@ -9401,6 +9423,10 @@ in inherit (darwin) libiconv libobjc libresolv; }) mx jvmci8 graalvm8; + inherit (callPackages ../development/compilers/graalvm/community-edition.nix { }) + graalvm8-ce + graalvm11-ce; + inherit (callPackages ../development/compilers/graalvm/enterprise-edition.nix { }) graalvm8-ee graalvm11-ee; @@ -9786,15 +9812,15 @@ in inherit (darwin.apple_sdk.frameworks) CoreFoundation Security; llvmPackages = if stdenv.cc.isClang then llvmPackages_5 else llvmPackages_10; }; - rust_1_46 = callPackage ../development/compilers/rust/1_46.nix { + rust_1_47 = callPackage ../development/compilers/rust/1_47.nix { inherit (darwin.apple_sdk.frameworks) CoreFoundation Security; - llvmPackages = if stdenv.cc.isClang then llvmPackages_5 else llvmPackages_10; + llvmPackages = if stdenv.cc.isClang then llvmPackages_5 else llvmPackages_11; }; - rust = rust_1_46; + rust = rust_1_47; rustPackages_1_45 = rust_1_45.packages.stable; - rustPackages_1_46 = rust_1_46.packages.stable; - rustPackages = rustPackages_1_46; + rustPackages_1_47 = rust_1_47.packages.stable; + rustPackages = rustPackages_1_47; inherit (rustPackages) cargo clippy rustc rustPlatform; @@ -9917,10 +9943,12 @@ in sbcl_2_0_9 = callPackage ../development/compilers/sbcl/2.0.9.nix {}; sbcl = callPackage ../development/compilers/sbcl {}; - scala_2_10 = callPackage ../development/compilers/scala/2.10.nix { }; - scala_2_11 = callPackage ../development/compilers/scala/2.11.nix { }; - scala_2_12 = callPackage ../development/compilers/scala/2.12.nix { jre = jre8; }; - scala_2_13 = callPackage ../development/compilers/scala/2.13.nix { jre = jre8; }; + inherit (callPackage ../development/compilers/scala/2.x.nix { jre = jre8; }) + scala_2_10 + scala_2_11 + scala_2_12 + scala_2_13; + scala = scala_2_13; metal = callPackage ../development/libraries/metal { }; @@ -9948,6 +9976,8 @@ in souffle = callPackage ../development/compilers/souffle { }; + spasm-ng = callPackage ../development/compilers/spasm-ng { }; + spirv-llvm-translator = callPackage ../development/compilers/spirv-llvm-translator { }; sqldeveloper = callPackage ../development/tools/database/sqldeveloper { @@ -10295,19 +10325,28 @@ in pachyderm = callPackage ../applications/networking/cluster/pachyderm { }; - php = php74; + # PHP interpreters, packages and extensions. + # + # Set default PHP interpreter, extensions and packages + php = php74; + phpExtensions = php74Extensions; phpPackages = php74Packages; - php73Packages = recurseIntoAttrs php73.packages; + + # Import PHP74 interpreter, extensions and packages + php74 = callPackage ../development/interpreters/php/7.4.nix { + stdenv = if stdenv.cc.isClang then llvmPackages_6.stdenv else stdenv; + }; + php74Extensions = recurseIntoAttrs php74.extensions; php74Packages = recurseIntoAttrs php74.packages; - phpExtensions = php74Extensions; - php73Extensions = recurseIntoAttrs php73.extensions; - php74Extensions = recurseIntoAttrs php74.extensions; - - inherit (callPackage ../development/interpreters/php { + # Import PHP73 interpreter, extensions and packages + php73 = callPackage ../development/interpreters/php/7.3.nix { stdenv = if stdenv.cc.isClang then llvmPackages_6.stdenv else stdenv; - }) php74 php73; + }; + php73Extensions = recurseIntoAttrs php73.extensions; + php73Packages = recurseIntoAttrs php73.packages; + picoc = callPackage ../development/interpreters/picoc {}; @@ -10682,10 +10721,11 @@ in }; antlr3 = antlr3_5; - antlr4_7 = callPackage ../development/tools/parsing/antlr/4.7.nix { + antlr4_8 = callPackage ../development/tools/parsing/antlr/4.8.nix { jre = jre8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 }; - antlr4 = antlr4_7; + + antlr4 = antlr4_8; apacheAnt = callPackage ../development/tools/build-managers/apache-ant { }; apacheAnt_1_9 = callPackage ../development/tools/build-managers/apache-ant/1.9.nix { }; @@ -10867,6 +10907,8 @@ in buildkite-cli = callPackage ../development/tools/continuous-integration/buildkite-cli { }; + bump = callPackage ../development/tools/github/bump { }; + libbpf = callPackage ../os-specific/linux/libbpf { }; bpftool = callPackage ../os-specific/linux/bpftool { }; @@ -10970,6 +11012,10 @@ in cmake = libsForQt5.callPackage ../development/tools/build-managers/cmake { }; + cmakeMinimal = libsForQt5.callPackage ../development/tools/build-managers/cmake { + isBootstrap = true; + }; + cmakeCurses = cmake.override { useNcurses = true; }; cmakeWithGui = cmakeCurses.override { withQt5 = true; }; @@ -11696,6 +11742,8 @@ in rr = callPackage ../development/tools/analysis/rr { }; rr-unstable = callPackage ../development/tools/analysis/rr/unstable.nix { }; # This is a temporary attribute, please see the corresponding file for details. + rufo = callPackage ../development/tools/rufo { }; + samurai = callPackage ../development/tools/build-managers/samurai { }; saleae-logic = callPackage ../development/tools/misc/saleae-logic { }; @@ -11795,6 +11843,8 @@ in sqlitebrowser = libsForQt5.callPackage ../development/tools/database/sqlitebrowser { }; + sqlite-utils = with python3Packages; toPythonApplication sqlite-utils; + sqlite-web = callPackage ../development/tools/database/sqlite-web { }; sqlmap = with python3Packages; toPythonApplication sqlmap; @@ -14647,6 +14697,8 @@ in withGUI = false; }; + mlc = callPackage ../tools/system/mlc { }; + mlt = callPackage ../development/libraries/mlt { }; mlv-app = libsForQt5.callPackage ../applications/video/mlv-app { }; @@ -15658,7 +15710,9 @@ in sofia_sip = callPackage ../development/libraries/sofia-sip { }; - soil = callPackage ../development/libraries/soil { }; + soil = callPackage ../development/libraries/soil { + inherit (darwin.apple_sdk.frameworks) Carbon; + }; sonic = callPackage ../development/libraries/sonic { }; @@ -16045,6 +16099,8 @@ in stdenv = gcc6Stdenv; # upstream code incompatible with gcc7 }; + waffle = callPackage ../development/libraries/waffle { }; + wally-cli = callPackage ../development/tools/wally-cli { }; wavpack = callPackage ../development/libraries/wavpack { }; @@ -16674,8 +16730,6 @@ in frab = callPackage ../servers/web-apps/frab { }; - freepops = callPackage ../servers/mail/freepops { }; - freeradius = callPackage ../servers/freeradius { }; freeswitch = callPackage ../servers/sip/freeswitch { @@ -17046,16 +17100,6 @@ in erlang = erlang_basho_R16B02; }; - riak-cs = callPackage ../servers/nosql/riak-cs/2.1.1.nix { - inherit (darwin.apple_sdk.frameworks) Carbon Cocoa; - erlang = erlang_basho_R16B02; - }; - - stanchion = callPackage ../servers/nosql/riak-cs/stanchion.nix { - inherit (darwin.apple_sdk.frameworks) Carbon Cocoa; - erlang = erlang_basho_R16B02; - }; - influxdb = callPackage ../servers/nosql/influxdb { }; mysql57 = callPackage ../servers/sql/mysql/5.7.x.nix { @@ -17203,6 +17247,7 @@ in prometheus-rabbitmq-exporter = callPackage ../servers/monitoring/prometheus/rabbitmq-exporter.nix { }; prometheus-rtl_433-exporter = callPackage ../servers/monitoring/prometheus/rtl_433-exporter.nix { }; prometheus-snmp-exporter = callPackage ../servers/monitoring/prometheus/snmp-exporter.nix { }; + prometheus-sql-exporter = callPackage ../servers/monitoring/prometheus/sql-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 { }; @@ -18440,7 +18485,7 @@ in # udev is the same package as systemd which depends on cryptsetup # which depends on lvm2 again. But we only need the libudev part # which does not depend on cryptsetup. - udev = udev.override { cryptsetup = null; }; + udev = systemdMinimal; }; lvm2_dmeventd = callPackage ../os-specific/linux/lvm2 { enableDmeventd = true; @@ -18707,6 +18752,8 @@ in roccat-tools = callPackage ../os-specific/linux/roccat-tools { }; + rtsp-simple-server = callPackage ../servers/rtsp-simple-server { }; + rtkit = callPackage ../os-specific/linux/rtkit { }; rt5677-firmware = callPackage ../os-specific/linux/firmware/rt5677 { }; @@ -18791,8 +18838,23 @@ in bzip2 = null; }; }; + systemdMinimal = systemd.override { + pname = "systemd-minimal"; + withResolved = false; + withLogind = false; + withHostnamed = false; + withLocaled = false; + withTimedated = false; + withHwdb = false; + withEfi = false; + withImportd = false; + withCryptsetup = false; + cryptsetup = null; + lvm2 = null; + }; - udev = systemd; # TODO: move to aliases.nix + + udev = systemd; # TODO: change to systemdMinimal systemd-wait = callPackage ../os-specific/linux/systemd-wait { }; @@ -19183,6 +19245,8 @@ in font-awesome_5 = (callPackage ../data/fonts/font-awesome-5 { }).v5; font-awesome = font-awesome_5; + fraunces = callPackage ../data/fonts/fraunces { }; + freefont_ttf = callPackage ../data/fonts/freefont-ttf { }; freepats = callPackage ../data/misc/freepats { }; @@ -19699,6 +19763,8 @@ in ttf-envy-code-r = callPackage ../data/fonts/ttf-envy-code-r {}; + ttf-tw-moe = callPackage ../data/fonts/ttf-tw-moe { }; + twemoji-color-font = callPackage ../data/fonts/twemoji-color-font { inherit (nodePackages) svgo; }; @@ -19967,6 +20033,8 @@ in milkytracker = callPackage ../applications/audio/milkytracker { }; + ptcollab = libsForQt5.callPackage ../applications/audio/ptcollab { }; + schismtracker = callPackage ../applications/audio/schismtracker { }; jnetmap = callPackage ../applications/networking/jnetmap {}; @@ -20011,9 +20079,9 @@ in backintime-common = callPackage ../applications/networking/sync/backintime/common.nix { }; - backintime-qt4 = callPackage ../applications/networking/sync/backintime/qt4.nix { }; + backintime-qt = libsForQt5.callPackage ../applications/networking/sync/backintime/qt.nix { }; - backintime = backintime-qt4; + backintime = backintime-qt; balsa = callPackage ../applications/networking/mailreaders/balsa { }; @@ -20494,8 +20562,6 @@ in denemo = callPackage ../applications/audio/denemo { }; - dvb_apps = callPackage ../applications/video/dvb-apps { }; - dvdauthor = callPackage ../applications/video/dvdauthor { }; dvdbackup = callPackage ../applications/video/dvdbackup { }; @@ -20551,6 +20617,8 @@ in elementary-planner = callPackage ../applications/office/elementary-planner { }; + elf-dissector = libsForQt5.callPackage ../applications/misc/elf-dissector { }; + elinks = callPackage ../applications/networking/browsers/elinks { }; elvis = callPackage ../applications/editors/elvis { }; @@ -21419,6 +21487,8 @@ in musikcube = callPackage ../applications/audio/musikcube {}; + pass-secret-service = callPackage ../applications/misc/pass-secret-service { }; + pinboard = with python3Packages; toPythonApplication pinboard; pinboard-notes-backup = haskell.lib.overrideCabal @@ -21729,8 +21799,6 @@ in k3s = callPackage ../applications/networking/cluster/k3s {}; - k9copy = libsForQt514.callPackage ../applications/video/k9copy {}; - kail = callPackage ../tools/networking/kail { }; kanboard = callPackage ../applications/misc/kanboard { }; @@ -22855,6 +22923,8 @@ in photoqt = libsForQt5.callPackage ../applications/graphics/photoqt { }; + photoflare = libsForQt5.callPackage ../applications/graphics/photoflare { }; + photoflow = callPackage ../applications/graphics/photoflow { }; phototonic = libsForQt5.callPackage ../applications/graphics/phototonic { }; @@ -23736,6 +23806,8 @@ in teleprompter = callPackage ../applications/misc/teleprompter {}; + tempo = callPackage ../servers/tracing/tempo {}; + tendermint = callPackage ../tools/networking/tendermint { }; termdown = python3Packages.callPackage ../applications/misc/termdown { }; @@ -23762,7 +23834,9 @@ in thunderbird = thunderbird-78; thunderbird-78 = callPackage ../applications/networking/mailreaders/thunderbird { - inherit (rustPackages) cargo rustc; + # Using older Rust for workaround: + # https://bugzilla.mozilla.org/show_bug.cgi?id=1663715 + inherit (rustPackages_1_45) cargo rustc; libpng = libpng_apng; icu = icu67; libvpx = libvpx_1_8; @@ -24784,12 +24858,6 @@ in bitcoin-gold = libsForQt514.callPackage ../applications/blockchains/bitcoin-gold.nix { boost = boost165; withGui = true; }; bitcoind-gold = callPackage ../applications/blockchains/bitcoin-gold.nix { boost = boost165; withGui = false; }; - btc1 = callPackage ../applications/blockchains/btc1.nix { - inherit (darwin.apple_sdk.frameworks) AppKit; - boost = boost165; - }; - btc1d = btc1.override { withGui = false; }; - btcpayserver = callPackage ../applications/blockchains/btcpayserver { }; cryptop = python3.pkgs.callPackage ../applications/blockchains/cryptop { }; @@ -25875,7 +25943,6 @@ in gnomeExtensions = recurseIntoAttrs { appindicator = callPackage ../desktops/gnome-3/extensions/appindicator { }; arc-menu = callPackage ../desktops/gnome-3/extensions/arc-menu { }; - battery-status = callPackage ../desktops/gnome-3/extensions/battery-status { }; caffeine = callPackage ../desktops/gnome-3/extensions/caffeine { }; clipboard-indicator = callPackage ../desktops/gnome-3/extensions/clipboard-indicator { }; dash-to-dock = callPackage ../desktops/gnome-3/extensions/dash-to-dock { }; @@ -26163,8 +26230,6 @@ in platypus = callPackage ../applications/science/biology/platypus { }; - plink = callPackage ../applications/science/biology/plink { }; - plink-ng = callPackage ../applications/science/biology/plink-ng { }; prodigal = callPackage ../applications/science/biology/prodigal { }; @@ -27276,6 +27341,8 @@ in mynewt-newt = callPackage ../tools/package-management/mynewt-newt { }; + nar-serve = callPackage ../tools/nix/nar-serve { }; + inherit (callPackage ../tools/package-management/nix { storeDir = config.nix.storeDir or "/nix/store"; stateDir = config.nix.stateDir or "/nix/var"; diff --git a/third_party/nixpkgs/pkgs/top-level/haskell-packages.nix b/third_party/nixpkgs/pkgs/top-level/haskell-packages.nix index 693f8fe827..e613b931d6 100644 --- a/third_party/nixpkgs/pkgs/top-level/haskell-packages.nix +++ b/third_party/nixpkgs/pkgs/top-level/haskell-packages.nix @@ -1,4 +1,4 @@ -{ buildPackages, pkgs, newScope }: +{ buildPackages, pkgs, newScope, stdenv }: let # These are attributes in compiler and packages that don't support integer-simple. @@ -6,6 +6,7 @@ let "ghc822Binary" "ghc865Binary" "ghc8102Binary" + "ghc8102BinaryMinimal" "ghcjs" "ghcjs86" "integer-simple" @@ -54,6 +55,11 @@ in { llvmPackages = pkgs.llvmPackages_9; }; + ghc8102BinaryMinimal = callPackage ../development/compilers/ghc/8.10.2-binary.nix { + llvmPackages = pkgs.llvmPackages_9; + minimal = true; + }; + ghc865 = callPackage ../development/compilers/ghc/8.6.5.nix { bootPkgs = packages.ghc822Binary; inherit (buildPackages.python3Packages) sphinx; @@ -73,7 +79,11 @@ in { llvmPackages = pkgs.llvmPackages_7; }; ghc884 = callPackage ../development/compilers/ghc/8.8.4.nix { - bootPkgs = packages.ghc865Binary; + # aarch64 ghc865Binary gets SEGVs due to haskell#15449 or similar + bootPkgs = if stdenv.isAarch64 then + packages.ghc8102BinaryMinimal + else + packages.ghc865Binary; inherit (buildPackages.python3Packages) sphinx; buildLlvmPackages = buildPackages.llvmPackages_7; llvmPackages = pkgs.llvmPackages_7; @@ -85,7 +95,11 @@ in { llvmPackages = pkgs.llvmPackages_9; }; ghc8102 = callPackage ../development/compilers/ghc/8.10.2.nix { - bootPkgs = packages.ghc865Binary; + # aarch64 ghc865Binary gets SEGVs due to haskell#15449 or similar + bootPkgs = if stdenv.isAarch64 then + packages.ghc8102BinaryMinimal + else + packages.ghc865Binary; inherit (buildPackages.python3Packages) sphinx; buildLlvmPackages = buildPackages.llvmPackages_9; llvmPackages = pkgs.llvmPackages_9; @@ -156,6 +170,12 @@ in { compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.10.x.nix { }; packageSetConfig = bootstrapPackageSet; }; + ghc8102BinaryMinimal = callPackage ../development/haskell-modules { + buildHaskellPackages = bh.packages.ghc8102BinaryMinimal; + ghc = bh.compiler.ghc8102BinaryMinimal; + compilerConfig = callPackage ../development/haskell-modules/configuration-ghc-8.10.x.nix { }; + packageSetConfig = bootstrapPackageSet; + }; ghc865 = callPackage ../development/haskell-modules { buildHaskellPackages = bh.packages.ghc865; ghc = bh.compiler.ghc865; diff --git a/third_party/nixpkgs/pkgs/top-level/ocaml-packages.nix b/third_party/nixpkgs/pkgs/top-level/ocaml-packages.nix index b623d65bb8..1cdcb31c97 100644 --- a/third_party/nixpkgs/pkgs/top-level/ocaml-packages.nix +++ b/third_party/nixpkgs/pkgs/top-level/ocaml-packages.nix @@ -543,10 +543,14 @@ let mirage-bootvar-unix = callPackage ../development/ocaml-modules/mirage-bootvar-unix { }; + mirage-channel = callPackage ../development/ocaml-modules/mirage-channel { }; + mirage-clock = callPackage ../development/ocaml-modules/mirage-clock { }; mirage-clock-unix = callPackage ../development/ocaml-modules/mirage-clock/unix.nix { }; + mirage-console = callPackage ../development/ocaml-modules/mirage-console { }; + mirage-crypto = callPackage ../development/ocaml-modules/mirage-crypto { }; mirage-crypto-pk = callPackage ../development/ocaml-modules/mirage-crypto/pk.nix { }; @@ -567,6 +571,8 @@ let mirage-kv = callPackage ../development/ocaml-modules/mirage-kv { }; + mirage-logs = callPackage ../development/ocaml-modules/mirage-logs { }; + mirage-net = callPackage ../development/ocaml-modules/mirage-net { }; mirage-profile = callPackage ../development/ocaml-modules/mirage-profile { }; diff --git a/third_party/nixpkgs/pkgs/top-level/python-packages.nix b/third_party/nixpkgs/pkgs/top-level/python-packages.nix index 701d756e38..81f5767df7 100644 --- a/third_party/nixpkgs/pkgs/top-level/python-packages.nix +++ b/third_party/nixpkgs/pkgs/top-level/python-packages.nix @@ -737,6 +737,8 @@ in { azure-synapse-accesscontrol = callPackage ../development/python-modules/azure-synapse-accesscontrol { }; + azure-synapse-artifacts = callPackage ../development/python-modules/azure-synapse-artifacts { }; + azure-synapse-spark = callPackage ../development/python-modules/azure-synapse-spark { }; b2sdk = callPackage ../development/python-modules/b2sdk { }; @@ -1377,6 +1379,8 @@ in { else callPackage ../development/python-modules/cryptography/vectors.nix { }; + crytic-compile = callPackage ../development/python-modules/crytic-compile { }; + csscompressor = callPackage ../development/python-modules/csscompressor { }; cssmin = callPackage ../development/python-modules/cssmin { }; @@ -1807,8 +1811,6 @@ in { dot2tex = callPackage ../development/python-modules/dot2tex { inherit (pkgs) graphviz; }; - dotnetcore2 = callPackage ../development/python-modules/dotnetcore2 { inherit (pkgs) substituteAll dotnet-sdk; }; - dparse = callPackage ../development/python-modules/dparse { }; dpath = callPackage ../development/python-modules/dpath { }; @@ -2468,6 +2470,8 @@ in { google_cloud_firestore = callPackage ../development/python-modules/google_cloud_firestore { }; + google-cloud-iam = callPackage ../development/python-modules/google-cloud-iam { }; + google_cloud_iot = callPackage ../development/python-modules/google_cloud_iot { }; google_cloud_kms = callPackage ../development/python-modules/google_cloud_kms { }; @@ -4304,6 +4308,8 @@ in { else callPackage ../development/python-modules/pandas/2.nix { }; + pandas-datareader = callPackage ../development/python-modules/pandas-datareader { }; + pandoc-attributes = callPackage ../development/python-modules/pandoc-attributes { }; pandocfilters = callPackage ../development/python-modules/pandocfilters { }; @@ -4844,7 +4850,7 @@ in { pybullet = callPackage ../development/python-modules/pybullet { }; - pycairo = callPackage ../development/python-modules/pycairo { inherit (pkgs) meson pkgconfig; }; + pycairo = callPackage ../development/python-modules/pycairo { inherit (pkgs) meson pkg-config; }; pycallgraph = callPackage ../development/python-modules/pycallgraph { }; @@ -5285,6 +5291,8 @@ in { pyparted = callPackage ../development/python-modules/pyparted { }; + pypass = callPackage ../development/python-modules/pypass { }; + pypblib = callPackage ../development/python-modules/pypblib { }; pypcap = callPackage ../development/python-modules/pypcap { }; @@ -6650,10 +6658,6 @@ in { smpplib = callPackage ../development/python-modules/smpplib { }; - smugline = callPackage ../development/python-modules/smugline { }; - - smugpy = callPackage ../development/python-modules/smugpy { }; - snack = toPythonModule (pkgs.newt.override { inherit (self) python; }); snakebite = callPackage ../development/python-modules/snakebite { }; @@ -6830,6 +6834,8 @@ in { sqlitedict = callPackage ../development/python-modules/sqlitedict { }; + sqlite-utils = callPackage ../development/python-modules/sqlite-utils { }; + sqlmap = callPackage ../development/python-modules/sqlmap { }; sqlobject = callPackage ../development/python-modules/sqlobject { }; diff --git a/third_party/nixpkgs/pkgs/top-level/release.nix b/third_party/nixpkgs/pkgs/top-level/release.nix index eacd2f5904..5fc6e91b31 100644 --- a/third_party/nixpkgs/pkgs/top-level/release.nix +++ b/third_party/nixpkgs/pkgs/top-level/release.nix @@ -30,7 +30,7 @@ let jobs = { tarball = import ./make-tarball.nix { inherit pkgs nixpkgs officialRelease; }; - #metrics = import ./metrics.nix { inherit pkgs nixpkgs; }; + metrics = import ./metrics.nix { inherit pkgs nixpkgs; }; manual = import ../../doc { inherit pkgs nixpkgs; }; lib-tests = import ../../lib/tests/release.nix { inherit pkgs; };