From d87170d3f2f1ab1684afe0c43575fafbb72467d2 Mon Sep 17 00:00:00 2001 From: Default email Date: Sun, 18 Jul 2021 23:22:44 +0200 Subject: [PATCH] Project import generated by Copybara. GitOrigin-RevId: 967d40bec14be87262b21ab901dbace23b7365db --- third_party/nixpkgs/lib/types.nix | 12 +- .../nixpkgs/maintainers/maintainer-list.nix | 6 + .../from_md/release-notes/rl-2111.section.xml | 9 +- .../manual/release-notes/rl-2111.section.md | 4 +- .../nixpkgs/nixos/modules/misc/ids.nix | 2 +- .../nixpkgs/nixos/modules/module-list.nix | 1 + .../monitoring/prometheus/exporters.nix | 2 +- .../monitoring/prometheus/exporters/kea.nix | 1 + .../modules/services/monitoring/telegraf.nix | 11 +- .../nixos/modules/services/networking/kea.nix | 361 ++++ .../modules/services/networking/nix-serve.nix | 8 +- third_party/nixpkgs/nixos/tests/all-tests.nix | 2 + third_party/nixpkgs/nixos/tests/kea.nix | 73 + third_party/nixpkgs/nixos/tests/nix-serve.nix | 22 + .../nixos/tests/prometheus-exporters.nix | 47 +- .../blockchains/ethabi/default.nix | 1 - .../ledger-live-desktop/default.nix | 4 +- .../blockchains/nano-wallet/default.nix | 1 - .../applications/editors/vscode/vscode.nix | 2 +- .../applications/graphics/qiv/default.nix | 1 - .../graphics/xfractint/default.nix | 1 - .../applications/misc/diffpdf/default.nix | 1 - .../applications/misc/gcalcli/default.nix | 1 - .../applications/misc/getxbook/default.nix | 1 - .../pkgs/applications/misc/gummi/default.nix | 1 - .../misc/thinking-rock/default.nix | 7 +- .../applications/misc/tpmmanager/default.nix | 1 - .../pkgs/applications/misc/vifm/default.nix | 1 - .../applications/misc/visidata/default.nix | 1 - .../browsers/chromium/upstream-info.json | 10 +- .../networking/cluster/nomad/generic.nix | 2 +- .../networking/cluster/terraform/default.nix | 1 + .../instant-messengers/baresip/default.nix | 1 - .../deltachat-electron/default.nix | 4 +- .../instant-messengers/mirage/default.nix | 1 - .../instant-messengers/oysttyer/default.nix | 1 - .../instant-messengers/quaternion/default.nix | 1 - .../instant-messengers/tensor/default.nix | 1 - .../mailreaders/mailcheck/default.nix | 2 - .../science/geometry/tetgen/default.nix | 1 - .../science/logic/potassco/clingcon.nix | 1 - .../science/logic/potassco/clingo.nix | 1 - .../science/logic/satallax/default.nix | 1 - .../applications/science/logic/z3/tptp.nix | 1 - .../science/math/gfan/default.nix | 1 - .../science/math/nauty/default.nix | 1 - .../science/math/pcalc/default.nix | 24 +- .../science/math/polymake/default.nix | 1 - .../science/math/ratpoints/default.nix | 1 - .../applications/science/misc/golly/beta.nix | 1 - .../science/misc/golly/default.nix | 1 - .../science/programming/fdr/default.nix | 2 +- .../version-management/mercurial/default.nix | 1 - .../monotone-viz/default.nix | 1 - .../version-management/nbstripout/default.nix | 1 - .../kodi-packages/pvr-hdhomerun/default.nix | 4 +- .../pkgs/applications/video/vdr/plugins.nix | 22 +- .../virtualization/docker-compose/default.nix | 4 +- ...ore-maybe-uninitialized-when-O3-is-i.patch | 45 - .../looking-glass-client/default.nix | 52 +- .../virtualization/qemu/default.nix | 10 + .../window-managers/wmii-hg/default.nix | 1 - .../build-support/rust/import-cargo-lock.nix | 18 +- .../pkgs/data/fonts/noto-fonts/default.nix | 1 - .../pkgs/data/fonts/unscii/default.nix | 1 - .../nixpkgs/pkgs/data/misc/scowl/default.nix | 1 - .../pkgs/data/misc/xorg-rgb/default.nix | 1 - .../nixpkgs/pkgs/data/themes/yaru/default.nix | 2 +- .../lxde/core/lxappearance/default.nix | 2 + .../development/compilers/abcl/default.nix | 1 - .../development/compilers/clasp/default.nix | 1 - .../pkgs/development/compilers/dmd/binary.nix | 1 - .../development/compilers/fpc/default.nix | 1 - .../pkgs/development/compilers/ldc/binary.nix | 1 - .../compiler-rt/X86-support-extension.patch | 4 +- .../development/compilers/obliv-c/default.nix | 1 - .../development/compilers/sbcl/common.nix | 1 - .../development/compilers/solc/default.nix | 1 - .../development/compilers/vala/default.nix | 2 +- .../interpreters/clojure/clooj.nix | 8 +- .../development/interpreters/eff/default.nix | 7 +- .../interpreters/gnu-apl/default.nix | 1 - .../development/interpreters/pyrex/0.9.5.nix | 6 +- .../development/interpreters/pyrex/0.9.6.nix | 6 +- .../development/libraries/afflib/default.nix | 1 - .../libraries/audio/libgme/default.nix | 7 +- .../libraries/avro-c++/default.nix | 6 +- .../development/libraries/avro-c/default.nix | 6 +- .../libraries/bctoolbox/default.nix | 1 - .../development/libraries/bearssl/default.nix | 11 +- .../development/libraries/botan/generic.nix | 1 - .../development/libraries/cddlib/default.nix | 1 - .../libraries/classads/default.nix | 6 +- .../development/libraries/clfft/default.nix | 7 +- .../development/libraries/csfml/default.nix | 8 +- .../development/libraries/eclib/default.nix | 1 - .../development/libraries/exiv2/default.nix | 3 + .../libraries/fflas-ffpack/default.nix | 1 - .../development/libraries/flint/default.nix | 1 - .../development/libraries/fox/fox-1.6.nix | 6 +- .../development/libraries/fplll/20160331.nix | 1 - .../libraries/freeglut/default.nix | 5 +- .../libraries/freenect/default.nix | 1 - .../pkgs/development/libraries/givaro/3.7.nix | 1 - .../pkgs/development/libraries/givaro/3.nix | 1 - .../development/libraries/givaro/default.nix | 1 - .../libraries/globalarrays/default.nix | 7 +- .../development/libraries/gloox/default.nix | 7 +- .../development/libraries/goocanvas/2.x.nix | 6 +- .../libraries/highfive/default.nix | 1 - .../libraries/http-parser/default.nix | 6 +- .../development/libraries/iml/default.nix | 1 - .../libraries/java/rhino/default.nix | 7 +- .../development/libraries/jsoncpp/default.nix | 1 - .../development/libraries/kdsoap/default.nix | 8 +- .../development/libraries/libb64/default.nix | 1 - .../libraries/libbladeRF/default.nix | 8 +- .../development/libraries/libcec/default.nix | 6 +- .../development/libraries/libcec/platform.nix | 6 +- .../development/libraries/libdynd/default.nix | 5 +- .../development/libraries/libewf/default.nix | 1 - .../libraries/libixp-hg/default.nix | 1 - .../development/libraries/libjson/default.nix | 7 +- .../libraries/libmodplug/default.nix | 6 +- .../development/libraries/libmpc/default.nix | 7 +- .../development/libraries/libofa/default.nix | 7 +- .../development/libraries/libopus/default.nix | 7 +- .../libraries/libopusenc/default.nix | 7 +- .../libraries/libossp-uuid/default.nix | 6 +- .../development/libraries/libpar2/default.nix | 4 +- .../development/libraries/libre/default.nix | 1 - .../libraries/libspatialindex/default.nix | 6 +- .../development/libraries/libxc/default.nix | 7 +- .../libraries/libxklavier/default.nix | 5 +- .../development/libraries/libxsmm/default.nix | 6 +- .../development/libraries/libzmf/default.nix | 1 - .../development/libraries/linbox/default.nix | 1 - .../development/libraries/mdds/default.nix | 1 - .../development/libraries/mpfi/default.nix | 1 - .../development/libraries/mpir/default.nix | 1 - .../test-message-with-annotations/default.nix | 4 +- .../test-message-with-options/default.nix | 4 +- .../development/libraries/ndpi/default.nix | 6 +- .../libraries/nix-plugins/default.nix | 6 +- .../pkgs/development/libraries/nss/3.53.nix | 7 +- .../development/libraries/ntrack/default.nix | 6 +- .../libraries/opencore-amr/default.nix | 7 +- .../libraries/openwsman/default.nix | 1 - .../development/libraries/osip/default.nix | 1 - .../development/libraries/phash/default.nix | 1 - .../development/libraries/pmix/default.nix | 7 +- .../libraries/safefile/default.nix | 1 - .../libraries/sblim-sfcc/default.nix | 1 - .../science/math/liblapack/default.nix | 4 +- .../libraries/science/math/lrs/default.nix | 1 - .../development/libraries/sfml/default.nix | 8 +- .../development/libraries/spandsp/default.nix | 1 - .../startup-notification/default.nix | 7 +- .../development/libraries/tachyon/default.nix | 1 - .../development/libraries/uthash/default.nix | 7 +- .../libraries/volume-key/default.nix | 6 +- .../libraries/wxwidgets/2.9/default.nix | 7 +- .../development/libraries/xmlsec/default.nix | 7 +- .../development/node-packages/default.nix | 46 +- .../development/node-packages/node-env.nix | 10 +- .../node-packages/node-packages.json | 1 + .../node-packages/node-packages.nix | 1804 +++++++++-------- .../package-tests/autoprefixer.nix | 25 + .../package-tests/postcss-cli.nix | 45 + .../python-modules/cherrypy/default.nix | 2 +- .../python-modules/docker/default.nix | 4 +- .../python-modules/editables/default.nix | 9 +- .../python-modules/flask-restx/default.nix | 2 +- .../development/python-modules/h2/default.nix | 2 +- .../python-modules/python-wifi/default.nix | 1 - .../python-modules/pyvicare/default.nix | 30 +- .../ruby-modules/bundix/default.nix | 1 - .../tools/analysis/rizin/default.nix | 1 - .../tools/build-managers/apache-ant/1.9.nix | 8 +- .../build-managers/apache-ant/default.nix | 8 +- .../build-managers/gnumake/4.2/default.nix | 7 +- .../tools/build-managers/gnumake/default.nix | 7 +- .../tools/build-managers/rebar/default.nix | 8 +- .../drone-cli/default.nix | 5 +- .../tools/database/squirrel-sql/default.nix | 6 +- .../pkgs/development/tools/flyway/default.nix | 71 +- .../tools/java/fastjar/default.nix | 45 +- .../pkgs/development/tools/jq/default.nix | 1 - .../development/tools/minizinc/default.nix | 7 +- .../pkgs/development/tools/minizinc/ide.nix | 7 +- .../tools/misc/dfu-programmer/default.nix | 5 +- .../tools/misc/luarocks/default.nix | 1 - .../tools/misc/nixbang/default.nix | 5 +- .../tools/misc/prelink/default.nix | 7 +- .../pkgs/development/tools/mold/default.nix | 39 + .../tools/ocaml/obuild/default.nix | 6 +- .../tools/ocaml/ocamlbuild/default.nix | 7 +- .../tools/parsing/bisonc++/default.nix | 1 - .../development/tools/spirv-tools/default.nix | 7 +- .../nixpkgs/pkgs/games/fairymax/default.nix | 1 - .../pkgs/games/fish-fillets-ng/default.nix | 1 - .../nixpkgs/pkgs/games/xsok/default.nix | 1 - .../pkgs/misc/apulse/pressureaudio.nix | 3 +- .../emulators/fs-uae-launcher/default.nix | 28 + .../screensavers/xscreensaver/default.nix | 1 - .../pkgs/misc/vim-plugins/generated.nix | 12 + .../pkgs/misc/vim-plugins/overrides.nix | 4 + .../pkgs/misc/vim-plugins/vim-plugin-names | 1 + .../pkgs/os-specific/linux/atop/default.nix | 1 - .../pkgs/os-specific/linux/ell/default.nix | 2 +- .../linux/iio-sensor-proxy/default.nix | 1 - .../os-specific/linux/iptables/default.nix | 1 - .../pkgs/os-specific/linux/iwd/default.nix | 2 +- .../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.10.nix | 4 +- .../os-specific/linux/kernel/linux-5.12.nix | 4 +- .../os-specific/linux/kernel/linux-5.4.nix | 4 +- .../os-specific/linux/kernel/linux-lqx.nix | 4 +- .../linux/kernel/linux-rt-5.10.nix | 4 +- .../pkgs/os-specific/linux/libnl/default.nix | 1 - .../pkgs/servers/ftp/bftpd/default.nix | 1 - .../servers/http/nix-binary-cache/default.nix | 1 - .../pkgs/servers/nosql/neo4j/default.nix | 8 +- third_party/nixpkgs/pkgs/servers/plex/raw.nix | 1 + .../pkgs/shells/zsh/antigen/default.nix | 2 +- .../shells/zsh/zsh-command-time/default.nix | 2 +- .../pkgs/tools/archivers/zpaq/default.nix | 1 - .../pkgs/tools/backup/btrbk/default.nix | 1 - .../pkgs/tools/compression/lrzip/default.nix | 1 - .../tools/compression/mozlz4a/default.nix | 1 - .../pkgs/tools/compression/pixz/default.nix | 1 - .../tools/filesystems/fatsort/default.nix | 1 - .../tools/filesystems/fuse-7z-ng/default.nix | 1 - .../pkgs/tools/filesystems/jmtpfs/default.nix | 5 +- .../filesystems/reiser4progs/default.nix | 3 +- .../filesystems/reiserfsprogs/default.nix | 3 +- .../tools/filesystems/smbnetfs/default.nix | 1 - .../tools/filesystems/yandex-disk/default.nix | 6 +- .../tools/filesystems/zfstools/default.nix | 3 +- .../inputmethods/skk/skk-dicts/default.nix | 3 +- .../nixpkgs/pkgs/tools/misc/dust/default.nix | 1 + .../pkgs/tools/misc/man-db/default.nix | 1 + .../pkgs/tools/misc/zsh-autoenv/default.nix | 2 +- .../pkgs/tools/networking/getmail/default.nix | 1 - .../pkgs/tools/networking/kea/default.nix | 12 +- .../pkgs/tools/networking/wavemon/default.nix | 1 - .../package-management/nix-serve/default.nix | 12 +- .../pkgs/tools/security/aws-okta/default.nix | 1 - .../pkgs/tools/security/sshuttle/default.nix | 15 +- .../tools/security/sudolikeaboss/default.nix | 1 - .../tools/system/smartmontools/default.nix | 1 + .../nixpkgs/pkgs/top-level/all-packages.nix | 12 +- 254 files changed, 2068 insertions(+), 1583 deletions(-) create mode 100644 third_party/nixpkgs/nixos/modules/services/networking/kea.nix create mode 100644 third_party/nixpkgs/nixos/tests/kea.nix create mode 100644 third_party/nixpkgs/nixos/tests/nix-serve.nix delete mode 100644 third_party/nixpkgs/pkgs/applications/virtualization/looking-glass-client/0001-client-all-fix-more-maybe-uninitialized-when-O3-is-i.patch create mode 100644 third_party/nixpkgs/pkgs/development/node-packages/package-tests/autoprefixer.nix create mode 100644 third_party/nixpkgs/pkgs/development/node-packages/package-tests/postcss-cli.nix create mode 100644 third_party/nixpkgs/pkgs/development/tools/mold/default.nix create mode 100644 third_party/nixpkgs/pkgs/misc/emulators/fs-uae-launcher/default.nix diff --git a/third_party/nixpkgs/lib/types.nix b/third_party/nixpkgs/lib/types.nix index f47a1f92de..c35f055e17 100644 --- a/third_party/nixpkgs/lib/types.nix +++ b/third_party/nixpkgs/lib/types.nix @@ -581,7 +581,17 @@ rec { in mkOptionType rec { name = "enum"; - description = "one of ${concatMapStringsSep ", " show values}"; + description = + # Length 0 or 1 enums may occur in a design pattern with type merging + # where an "interface" module declares an empty enum and other modules + # provide implementations, each extending the enum with their own + # identifier. + if values == [] then + "impossible (empty enum)" + else if builtins.length values == 1 then + "value ${show (builtins.head values)} (singular enum)" + else + "one of ${concatMapStringsSep ", " show values}"; check = flip elem values; merge = mergeEqualOption; functor = (defaultFunctor name) // { payload = values; binOp = a: b: unique (a ++ b); }; diff --git a/third_party/nixpkgs/maintainers/maintainer-list.nix b/third_party/nixpkgs/maintainers/maintainer-list.nix index 939d6121ee..9ba85483cc 100644 --- a/third_party/nixpkgs/maintainers/maintainer-list.nix +++ b/third_party/nixpkgs/maintainers/maintainer-list.nix @@ -7614,6 +7614,12 @@ fingerprint = "B956 C6A4 22AF 86A0 8F77 A8CA DE3B ADFE CD31 A89D"; }]; }; + nitsky = { + name = "nitsky"; + email = "492793+nitsky@users.noreply.github.com"; + github = "nitsky"; + githubId = 492793; + }; nkpvk = { email = "niko.pavlinek@gmail.com"; github = "nkpvk"; diff --git a/third_party/nixpkgs/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml b/third_party/nixpkgs/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml index fcaac9e8be..0d3c3f2a0d 100644 --- a/third_party/nixpkgs/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml +++ b/third_party/nixpkgs/nixos/doc/manual/from_md/release-notes/rl-2111.section.xml @@ -7,7 +7,7 @@ - Support is planned until the end of April 2022, handing over to + Support is planned until the end of June 2022, handing over to 22.05. @@ -47,6 +47,13 @@ services.geoipupdate. + + + Kea, ISCs + 2nd generation DHCP and DDNS server suite. Available at + services.kea. + + sourcehut, a diff --git a/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-2111.section.md b/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-2111.section.md index 030f1d2181..1d037e2c5c 100644 --- a/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-2111.section.md +++ b/third_party/nixpkgs/nixos/doc/manual/release-notes/rl-2111.section.md @@ -2,7 +2,7 @@ In addition to numerous new and upgraded packages, this release has the following highlights: -- Support is planned until the end of April 2022, handing over to 22.05. +- Support is planned until the end of June 2022, handing over to 22.05. ## Highlights {#sec-release-21.11-highlights} @@ -15,6 +15,8 @@ In addition to numerous new and upgraded packages, this release has the followin - [geoipupdate](https://github.com/maxmind/geoipupdate), a GeoIP database updater from MaxMind. Available as [services.geoipupdate](options.html#opt-services.geoipupdate.enable). +- [Kea](https://www.isc.org/kea/), ISCs 2nd generation DHCP and DDNS server suite. Available at [services.kea](options.html#opt-services.kea). + - [sourcehut](https://sr.ht), a collection of tools useful for software development. Available as [services.sourcehut](options.html#opt-services.sourcehut.enable). - [ucarp](https://download.pureftpd.org/pub/ucarp/README), an userspace implementation of the Common Address Redundancy Protocol (CARP). Available as [networking.ucarp](options.html#opt-networking.ucarp.enable). diff --git a/third_party/nixpkgs/nixos/modules/misc/ids.nix b/third_party/nixpkgs/nixos/modules/misc/ids.nix index 2cbbbc522e..858c7ee53d 100644 --- a/third_party/nixpkgs/nixos/modules/misc/ids.nix +++ b/third_party/nixpkgs/nixos/modules/misc/ids.nix @@ -229,7 +229,7 @@ in grafana = 196; skydns = 197; # ripple-rest = 198; # unused, removed 2017-08-12 - nix-serve = 199; + # nix-serve = 199; # unused, removed 2020-12-12 tvheadend = 200; uwsgi = 201; gitit = 202; diff --git a/third_party/nixpkgs/nixos/modules/module-list.nix b/third_party/nixpkgs/nixos/modules/module-list.nix index 3474c6e99d..ad1bccd542 100644 --- a/third_party/nixpkgs/nixos/modules/module-list.nix +++ b/third_party/nixpkgs/nixos/modules/module-list.nix @@ -727,6 +727,7 @@ ./services/networking/iwd.nix ./services/networking/jicofo.nix ./services/networking/jitsi-videobridge.nix + ./services/networking/kea.nix ./services/networking/keepalived/default.nix ./services/networking/keybase.nix ./services/networking/kippo.nix 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 46015c9ec1..6bd075697f 100644 --- a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters.nix +++ b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters.nix @@ -180,7 +180,7 @@ let serviceConfig.PrivateTmp = mkDefault true; serviceConfig.WorkingDirectory = mkDefault /tmp; serviceConfig.DynamicUser = mkDefault enableDynamicUser; - serviceConfig.User = conf.user; + serviceConfig.User = mkDefault conf.user; serviceConfig.Group = conf.group; } serviceOpts ]); }; diff --git a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/kea.nix b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/kea.nix index b6cd89c386..9677281f87 100644 --- a/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/kea.nix +++ b/third_party/nixpkgs/nixos/modules/services/monitoring/prometheus/exporters/kea.nix @@ -26,6 +26,7 @@ in { }; serviceOpts = { serviceConfig = { + User = "kea"; ExecStart = '' ${pkgs.prometheus-kea-exporter}/bin/kea-exporter \ --address ${cfg.listenAddress} \ diff --git a/third_party/nixpkgs/nixos/modules/services/monitoring/telegraf.nix b/third_party/nixpkgs/nixos/modules/services/monitoring/telegraf.nix index bc30ca3b77..4046260c16 100644 --- a/third_party/nixpkgs/nixos/modules/services/monitoring/telegraf.nix +++ b/third_party/nixpkgs/nixos/modules/services/monitoring/telegraf.nix @@ -25,10 +25,9 @@ in { default = []; example = "/run/keys/telegraf.env"; description = '' - File to load as environment file. Environment variables - from this file will be interpolated into the config file - using envsubst with this syntax: - $ENVIRONMENT ''${VARIABLE} + File to load as environment file. Environment variables from this file + will be interpolated into the config file using envsubst with this + syntax: $ENVIRONMENT or ''${VARIABLE}. This is useful to avoid putting secrets into the nix store. ''; }; @@ -73,6 +72,7 @@ in { ExecReload="${pkgs.coreutils}/bin/kill -HUP $MAINPID"; RuntimeDirectory = "telegraf"; User = "telegraf"; + Group = "telegraf"; Restart = "on-failure"; # for ping probes AmbientCapabilities = [ "CAP_NET_RAW" ]; @@ -81,7 +81,10 @@ in { users.users.telegraf = { uid = config.ids.uids.telegraf; + group = "telegraf"; description = "telegraf daemon user"; }; + + users.groups.telegraf = {}; }; } diff --git a/third_party/nixpkgs/nixos/modules/services/networking/kea.nix b/third_party/nixpkgs/nixos/modules/services/networking/kea.nix new file mode 100644 index 0000000000..72773b83a4 --- /dev/null +++ b/third_party/nixpkgs/nixos/modules/services/networking/kea.nix @@ -0,0 +1,361 @@ +{ config +, lib +, pkgs +, ... +}: + +with lib; + +let + cfg = config.services.kea; + + format = pkgs.formats.json {}; + + ctrlAgentConfig = format.generate "kea-ctrl-agent.conf" { + Control-agent = cfg.ctrl-agent.settings; + }; + dhcp4Config = format.generate "kea-dhcp4.conf" { + Dhcp4 = cfg.dhcp4.settings; + }; + dhcp6Config = format.generate "kea-dhcp6.conf" { + Dhcp6 = cfg.dhcp6.settings; + }; + dhcpDdnsConfig = format.generate "kea-dhcp-ddns.conf" { + DhcpDdns = cfg.dhcp-ddns.settings; + }; + + package = pkgs.kea; +in +{ + options.services.kea = with types; { + ctrl-agent = mkOption { + description = '' + Kea Control Agent configuration + ''; + default = {}; + type = submodule { + options = { + enable = mkEnableOption "Kea Control Agent"; + + extraArgs = mkOption { + type = listOf str; + default = []; + description = '' + List of additonal arguments to pass to the daemon. + ''; + }; + + settings = mkOption { + type = format.type; + default = null; + description = '' + Kea Control Agent configuration as an attribute set, see . + ''; + }; + }; + }; + }; + + dhcp4 = mkOption { + description = '' + DHCP4 Server configuration + ''; + default = {}; + type = submodule { + options = { + enable = mkEnableOption "Kea DHCP4 server"; + + extraArgs = mkOption { + type = listOf str; + default = []; + description = '' + List of additonal arguments to pass to the daemon. + ''; + }; + + settings = mkOption { + type = format.type; + default = null; + example = { + valid-lifetime = 4000; + renew-timer = 1000; + rebind-timer = 2000; + interfaces-config = { + interfaces = [ + "eth0" + ]; + }; + lease-database = { + type = "memfile"; + persist = true; + name = "/var/lib/kea/dhcp4.leases"; + }; + subnet4 = [ { + subnet = "192.0.2.0/24"; + pools = [ { + pool = "192.0.2.100 - 192.0.2.240"; + } ]; + } ]; + }; + description = '' + Kea DHCP4 configuration as an attribute set, see . + ''; + }; + }; + }; + }; + + dhcp6 = mkOption { + description = '' + DHCP6 Server configuration + ''; + default = {}; + type = submodule { + options = { + enable = mkEnableOption "Kea DHCP6 server"; + + extraArgs = mkOption { + type = listOf str; + default = []; + description = '' + List of additonal arguments to pass to the daemon. + ''; + }; + + settings = mkOption { + type = format.type; + default = null; + example = { + valid-lifetime = 4000; + renew-timer = 1000; + rebind-timer = 2000; + preferred-lifetime = 3000; + interfaces-config = { + interfaces = [ + "eth0" + ]; + }; + lease-database = { + type = "memfile"; + persist = true; + name = "/var/lib/kea/dhcp6.leases"; + }; + subnet6 = [ { + subnet = "2001:db8:1::/64"; + pools = [ { + pool = "2001:db8:1::1-2001:db8:1::ffff"; + } ]; + } ]; + }; + description = '' + Kea DHCP6 configuration as an attribute set, see . + ''; + }; + }; + }; + }; + + dhcp-ddns = mkOption { + description = '' + Kea DHCP-DDNS configuration + ''; + default = {}; + type = submodule { + options = { + enable = mkEnableOption "Kea DDNS server"; + + extraArgs = mkOption { + type = listOf str; + default = []; + description = '' + List of additonal arguments to pass to the daemon. + ''; + }; + + settings = mkOption { + type = format.type; + default = null; + example = { + ip-address = "127.0.0.1"; + port = 53001; + dns-server-timeout = 100; + ncr-protocol = "UDP"; + ncr-format = "JSON"; + tsig-keys = [ ]; + forward-ddns = { + ddns-domains = [ ]; + }; + reverse-ddns = { + ddns-domains = [ ]; + }; + }; + description = '' + Kea DHCP-DDNS configuration as an attribute set, see . + ''; + }; + }; + }; + }; + }; + + config = let + commonServiceConfig = { + ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; + DynamicUser = true; + User = "kea"; + ConfigurationDirectory = "kea"; + RuntimeDirectory = "kea"; + StateDirectory = "kea"; + UMask = "0077"; + }; + in mkIf (cfg.ctrl-agent.enable || cfg.dhcp4.enable || cfg.dhcp6.enable || cfg.dhcp-ddns.enable) (mkMerge [ + { + environment.systemPackages = [ package ]; + } + + (mkIf cfg.ctrl-agent.enable { + + environment.etc."kea/ctrl-agent.conf".source = ctrlAgentConfig; + + systemd.services.kea-ctrl-agent = { + description = "Kea Control Agent"; + documentation = [ + "man:kea-ctrl-agent(8)" + "https://kea.readthedocs.io/en/kea-${package.version}/arm/agent.html" + ]; + + after = [ + "network-online.target" + "time-sync.target" + ]; + wantedBy = [ + "kea-dhcp4-server.service" + "kea-dhcp6-server.service" + "kea-dhcp-ddns-server.service" + ]; + + environment = { + KEA_PIDFILE_DIR = "/run/kea"; + }; + + serviceConfig = { + ExecStart = "${package}/bin/kea-ctrl-agent -c /etc/kea/ctrl-agent.conf ${lib.escapeShellArgs cfg.dhcp4.extraArgs}"; + KillMode = "process"; + Restart = "on-failure"; + } // commonServiceConfig; + }; + }) + + (mkIf cfg.dhcp4.enable { + + environment.etc."kea/dhcp4-server.conf".source = dhcp4Config; + + systemd.services.kea-dhcp4-server = { + description = "Kea DHCP4 Server"; + documentation = [ + "man:kea-dhcp4(8)" + "https://kea.readthedocs.io/en/kea-${package.version}/arm/dhcp4-srv.html" + ]; + + after = [ + "network-online.target" + "time-sync.target" + ]; + wantedBy = [ + "multi-user.target" + ]; + + environment = { + KEA_PIDFILE_DIR = "/run/kea"; + }; + + serviceConfig = { + ExecStart = "${package}/bin/kea-dhcp4 -c /etc/kea/dhcp4-server.conf ${lib.escapeShellArgs cfg.dhcp4.extraArgs}"; + # Kea does not request capabilities by itself + AmbientCapabilities = [ + "CAP_NET_BIND_SERVICE" + "CAP_NET_RAW" + ]; + CapabilityBoundingSet = [ + "CAP_NET_BIND_SERVICE" + "CAP_NET_RAW" + ]; + } // commonServiceConfig; + }; + }) + + (mkIf cfg.dhcp6.enable { + + environment.etc."kea/dhcp6-server.conf".source = dhcp6Config; + + systemd.services.kea-dhcp6-server = { + description = "Kea DHCP6 Server"; + documentation = [ + "man:kea-dhcp6(8)" + "https://kea.readthedocs.io/en/kea-${package.version}/arm/dhcp6-srv.html" + ]; + + after = [ + "network-online.target" + "time-sync.target" + ]; + wantedBy = [ + "multi-user.target" + ]; + + environment = { + KEA_PIDFILE_DIR = "/run/kea"; + }; + + serviceConfig = { + ExecStart = "${package}/bin/kea-dhcp6 -c /etc/kea/dhcp6-server.conf ${lib.escapeShellArgs cfg.dhcp6.extraArgs}"; + # Kea does not request capabilities by itself + AmbientCapabilities = [ + "CAP_NET_BIND_SERVICE" + ]; + CapabilityBoundingSet = [ + "CAP_NET_BIND_SERVICE" + ]; + } // commonServiceConfig; + }; + }) + + (mkIf cfg.dhcp-ddns.enable { + + environment.etc."kea/dhcp-ddns.conf".source = dhcpDdnsConfig; + + systemd.services.kea-dhcp-ddns-server = { + description = "Kea DHCP-DDNS Server"; + documentation = [ + "man:kea-dhcp-ddns(8)" + "https://kea.readthedocs.io/en/kea-${package.version}/arm/ddns.html" + ]; + + after = [ + "network-online.target" + "time-sync.target" + ]; + wantedBy = [ + "multi-user.target" + ]; + + environment = { + KEA_PIDFILE_DIR = "/run/kea"; + }; + + serviceConfig = { + ExecStart = "${package}/bin/kea-dhcp-ddns -c /etc/kea/dhcp-ddns.conf ${lib.escapeShellArgs cfg.dhcp-ddns.extraArgs}"; + AmbientCapabilites = [ + "CAP_NET_BIND_SERVICE" + ]; + CapabilityBoundingSet = [ + "CAP_NET_BIND_SERVICE" + ]; + } // commonServiceConfig; + }; + }) + + ]); + + meta.maintainers = with maintainers; [ hexa ]; +} diff --git a/third_party/nixpkgs/nixos/modules/services/networking/nix-serve.nix b/third_party/nixpkgs/nixos/modules/services/networking/nix-serve.nix index b17f35c769..7fc145f230 100644 --- a/third_party/nixpkgs/nixos/modules/services/networking/nix-serve.nix +++ b/third_party/nixpkgs/nixos/modules/services/networking/nix-serve.nix @@ -69,13 +69,9 @@ in ExecStart = "${pkgs.nix-serve}/bin/nix-serve " + "--listen ${cfg.bindAddress}:${toString cfg.port} ${cfg.extraParams}"; User = "nix-serve"; - Group = "nogroup"; + Group = "nix-serve"; + DynamicUser = true; }; }; - - users.users.nix-serve = { - description = "Nix-serve user"; - uid = config.ids.uids.nix-serve; - }; }; } diff --git a/third_party/nixpkgs/nixos/tests/all-tests.nix b/third_party/nixpkgs/nixos/tests/all-tests.nix index 76e5077f42..fd502a473b 100644 --- a/third_party/nixpkgs/nixos/tests/all-tests.nix +++ b/third_party/nixpkgs/nixos/tests/all-tests.nix @@ -203,6 +203,7 @@ in k3s = handleTest ./k3s.nix {}; kafka = handleTest ./kafka.nix {}; kbd-setfont-decompress = handleTest ./kbd-setfont-decompress.nix {}; + kea = handleTest ./kea.nix {}; keepalived = handleTest ./keepalived.nix {}; keepassxc = handleTest ./keepassxc.nix {}; kerberos = handleTest ./kerberos/default.nix {}; @@ -295,6 +296,7 @@ in nginx-sandbox = handleTestOn ["x86_64-linux"] ./nginx-sandbox.nix {}; nginx-sso = handleTest ./nginx-sso.nix {}; nginx-variants = handleTest ./nginx-variants.nix {}; + nix-serve = handleTest ./nix-ssh-serve.nix {}; nix-ssh-serve = handleTest ./nix-ssh-serve.nix {}; nixos-generate-config = handleTest ./nixos-generate-config.nix {}; nomad = handleTest ./nomad.nix {}; diff --git a/third_party/nixpkgs/nixos/tests/kea.nix b/third_party/nixpkgs/nixos/tests/kea.nix new file mode 100644 index 0000000000..6b34589310 --- /dev/null +++ b/third_party/nixpkgs/nixos/tests/kea.nix @@ -0,0 +1,73 @@ +import ./make-test-python.nix ({ pkgs, lib, ...}: { + meta.maintainers = with lib.maintainers; [ hexa ]; + + nodes = { + router = { config, pkgs, ... }: { + virtualisation.vlans = [ 1 ]; + + networking = { + useNetworkd = true; + useDHCP = false; + firewall.allowedUDPPorts = [ 67 ]; + }; + + systemd.network = { + networks = { + "01-eth1" = { + name = "eth1"; + networkConfig = { + Address = "10.0.0.1/30"; + }; + }; + }; + }; + + services.kea.dhcp4 = { + enable = true; + settings = { + valid-lifetime = 3600; + renew-timer = 900; + rebind-timer = 1800; + + lease-database = { + type = "memfile"; + persist = true; + name = "/var/lib/kea/dhcp4.leases"; + }; + + interfaces-config = { + dhcp-socket-type = "raw"; + interfaces = [ + "eth1" + ]; + }; + + subnet4 = [ { + subnet = "10.0.0.0/30"; + pools = [ { + pool = "10.0.0.2 - 10.0.0.2"; + } ]; + } ]; + }; + }; + }; + + client = { config, pkgs, ... }: { + virtualisation.vlans = [ 1 ]; + systemd.services.systemd-networkd.environment.SYSTEMD_LOG_LEVEL = "debug"; + networking = { + useNetworkd = true; + useDHCP = false; + firewall.enable = false; + interfaces.eth1.useDHCP = true; + }; + }; + }; + testScript = { ... }: '' + start_all() + router.wait_for_unit("kea-dhcp4-server.service") + client.wait_for_unit("systemd-networkd-wait-online.service") + client.wait_until_succeeds("ping -c 5 10.0.0.1") + router.wait_until_succeeds("ping -c 5 10.0.0.2") + ''; +}) diff --git a/third_party/nixpkgs/nixos/tests/nix-serve.nix b/third_party/nixpkgs/nixos/tests/nix-serve.nix new file mode 100644 index 0000000000..ab82f4be43 --- /dev/null +++ b/third_party/nixpkgs/nixos/tests/nix-serve.nix @@ -0,0 +1,22 @@ +import ./make-test-python.nix ({ pkgs, ... }: +{ + name = "nix-serve"; + machine = { pkgs, ... }: { + services.nix-serve.enable = true; + environment.systemPackages = [ + pkgs.hello + ]; + }; + testScript = let + pkgHash = builtins.head ( + builtins.match "${builtins.storeDir}/([^-]+).+" (toString pkgs.hello) + ); + in '' + start_all() + machine.wait_for_unit("nix-serve.service") + machine.wait_for_open_port(5000) + machine.succeed( + "curl --fail -g http://0.0.0.0:5000/nar/${pkgHash}.nar -o /tmp/hello.nar" + ) + ''; +}) diff --git a/third_party/nixpkgs/nixos/tests/prometheus-exporters.nix b/third_party/nixpkgs/nixos/tests/prometheus-exporters.nix index a33aca29fd..e8bc6339ec 100644 --- a/third_party/nixpkgs/nixos/tests/prometheus-exporters.nix +++ b/third_party/nixpkgs/nixos/tests/prometheus-exporters.nix @@ -326,49 +326,36 @@ let ''; }; - kea = { + kea = let + controlSocketPath = "/run/kea/dhcp6.sock"; + in + { exporterConfig = { enable = true; controlSocketPaths = [ - "/run/kea/kea-dhcp6.sock" + controlSocketPath ]; }; metricProvider = { - users.users.kea = { - isSystemUser = true; - }; - users.groups.kea = {}; + systemd.services.prometheus-kea-exporter.after = [ "kea-dhcp6-server.service" ]; - systemd.services.prometheus-kea-exporter.after = [ "kea-dhcp6.service" ]; - - systemd.services.kea-dhcp6 = let - configFile = pkgs.writeText "kea-dhcp6.conf" (builtins.toJSON { - Dhcp6 = { - "control-socket" = { - "socket-type" = "unix"; - "socket-name" = "/run/kea/kea-dhcp6.sock"; + services.kea = { + enable = true; + dhcp6 = { + enable = true; + settings = { + control-socket = { + socket-type = "unix"; + socket-name = controlSocketPath; }; }; - }); - in - { - after = [ "network.target" ]; - wantedBy = [ "multi-user.target" ]; - - serviceConfig = { - DynamicUser = false; - User = "kea"; - Group = "kea"; - ExecStart = "${pkgs.kea}/bin/kea-dhcp6 -c ${configFile}"; - StateDirectory = "kea"; - RuntimeDirectory = "kea"; - UMask = "0007"; }; }; }; + exporterTest = '' - wait_for_unit("kea-dhcp6.service") - wait_for_file("/run/kea/kea-dhcp6.sock") + wait_for_unit("kea-dhcp6-server.service") + wait_for_file("${controlSocketPath}") wait_for_unit("prometheus-kea-exporter.service") wait_for_open_port(9547) succeed( diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/ethabi/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/ethabi/default.nix index e2598ba22d..49f34a68bb 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/ethabi/default.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/ethabi/default.nix @@ -22,6 +22,5 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/rust-ethereum/ethabi"; maintainers = [ maintainers.dbrock ]; license = licenses.asl20; - inherit version; }; } diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/ledger-live-desktop/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/ledger-live-desktop/default.nix index 0692f40e35..1c6c41a0e7 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/ledger-live-desktop/default.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/ledger-live-desktop/default.nix @@ -2,12 +2,12 @@ let pname = "ledger-live-desktop"; - version = "2.29.0"; + version = "2.30.0"; name = "${pname}-${version}"; src = fetchurl { url = "https://github.com/LedgerHQ/${pname}/releases/download/v${version}/${pname}-${version}-linux-x86_64.AppImage"; - sha256 = "1y4xvnwh2mqbc39pmnpgjg8mlx208s2pipm7dazq4bgmay7k9zh0"; + sha256 = "0xh28m3slzg6bp0fm183m62ydzqkvj384j4dwsfalgz4ndwvy595"; }; appimageContents = appimageTools.extractType2 { diff --git a/third_party/nixpkgs/pkgs/applications/blockchains/nano-wallet/default.nix b/third_party/nixpkgs/pkgs/applications/blockchains/nano-wallet/default.nix index 0e39587fab..8e8d3da92b 100644 --- a/third_party/nixpkgs/pkgs/applications/blockchains/nano-wallet/default.nix +++ b/third_party/nixpkgs/pkgs/applications/blockchains/nano-wallet/default.nix @@ -45,7 +45,6 @@ stdenv.mkDerivation rec { ''; meta = { - inherit version; description = "Wallet for Nano cryptocurrency"; homepage = "https://nano.org/en/wallet/"; license = lib.licenses.bsd2; diff --git a/third_party/nixpkgs/pkgs/applications/editors/vscode/vscode.nix b/third_party/nixpkgs/pkgs/applications/editors/vscode/vscode.nix index dc22a92238..23af04462b 100644 --- a/third_party/nixpkgs/pkgs/applications/editors/vscode/vscode.nix +++ b/third_party/nixpkgs/pkgs/applications/editors/vscode/vscode.nix @@ -58,7 +58,7 @@ in homepage = "https://code.visualstudio.com/"; downloadPage = "https://code.visualstudio.com/Updates"; license = licenses.unfree; - maintainers = with maintainers; [ eadwu synthetica ]; + maintainers = with maintainers; [ eadwu synthetica maxeaubrey ]; platforms = [ "x86_64-linux" "x86_64-darwin" "aarch64-darwin" "aarch64-linux" "armv7l-linux" ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/graphics/qiv/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/qiv/default.nix index acd9c576f7..0075abc0f6 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/qiv/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/qiv/default.nix @@ -21,7 +21,6 @@ stdenv.mkDerivation (rec { meta = with lib; { description = "Quick image viewer"; homepage = "http://spiegl.de/qiv/"; - inherit version; license = licenses.gpl2; platforms = platforms.linux; }; diff --git a/third_party/nixpkgs/pkgs/applications/graphics/xfractint/default.nix b/third_party/nixpkgs/pkgs/applications/graphics/xfractint/default.nix index cca061ed2a..c43127bfa9 100644 --- a/third_party/nixpkgs/pkgs/applications/graphics/xfractint/default.nix +++ b/third_party/nixpkgs/pkgs/applications/graphics/xfractint/default.nix @@ -17,7 +17,6 @@ stdenv.mkDerivation rec { makeFlags = ["PREFIX=$(out)"]; meta = { - inherit version; description = ""; # Code cannot be used in commercial programs # Looks like the definition hinges on the price, not license diff --git a/third_party/nixpkgs/pkgs/applications/misc/diffpdf/default.nix b/third_party/nixpkgs/pkgs/applications/misc/diffpdf/default.nix index 30715dd51f..0eb432bc73 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/diffpdf/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/diffpdf/default.nix @@ -54,6 +54,5 @@ mkDerivation rec { license = lib.licenses.gpl2Plus; maintainers = with lib.maintainers; [ tstrobel ]; platforms = with lib.platforms; linux; - inherit version; }; } diff --git a/third_party/nixpkgs/pkgs/applications/misc/gcalcli/default.nix b/third_party/nixpkgs/pkgs/applications/misc/gcalcli/default.nix index 23e42539d7..90b4883ec2 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/gcalcli/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/gcalcli/default.nix @@ -33,6 +33,5 @@ buildPythonApplication rec { homepage = "https://github.com/insanum/gcalcli"; license = licenses.mit; maintainers = with maintainers; [ nocoolnametom ]; - inherit version; }; } diff --git a/third_party/nixpkgs/pkgs/applications/misc/getxbook/default.nix b/third_party/nixpkgs/pkgs/applications/misc/getxbook/default.nix index 15b7c37244..6ac5f2327f 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/getxbook/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/getxbook/default.nix @@ -27,6 +27,5 @@ stdenv.mkDerivation rec { license = licenses.isc; maintainers = with maintainers; [ obadz ]; platforms = platforms.all; - inherit version; }; } diff --git a/third_party/nixpkgs/pkgs/applications/misc/gummi/default.nix b/third_party/nixpkgs/pkgs/applications/misc/gummi/default.nix index a98017f095..8943fc17de 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/gummi/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/gummi/default.nix @@ -32,6 +32,5 @@ stdenv.mkDerivation rec { license = lib.licenses.mit; maintainers = with lib.maintainers; [ flokli ]; platforms = with lib.platforms; linux; - inherit version; }; } diff --git a/third_party/nixpkgs/pkgs/applications/misc/thinking-rock/default.nix b/third_party/nixpkgs/pkgs/applications/misc/thinking-rock/default.nix index 3bf3dda7ca..a26d3cc2eb 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/thinking-rock/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/thinking-rock/default.nix @@ -1,10 +1,11 @@ { lib, stdenv, fetchurl, runtimeShell }: -stdenv.mkDerivation { - name = "thinkingrock-binary-2.2.1"; +stdenv.mkDerivation rec { + pname = "thinkingrock-binary"; + version = "2.2.1"; src = fetchurl { - url = "mirror://sourceforge/thinkingrock/ThinkingRock/TR%202.2.1/tr-2.2.1.tar.gz"; + url = "mirror://sourceforge/thinkingrock/ThinkingRock/TR%20${version}/tr-${version}.tar.gz"; sha256 = "0hnwvvyc8miiz8w2g4iy7s4rgfy0kfbncgbgfzpsq6nrzq334kgm"; }; diff --git a/third_party/nixpkgs/pkgs/applications/misc/tpmmanager/default.nix b/third_party/nixpkgs/pkgs/applications/misc/tpmmanager/default.nix index 37d44d8bf1..b2839a97ef 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/tpmmanager/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/tpmmanager/default.nix @@ -36,6 +36,5 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl2; maintainers = with lib.maintainers; [ tstrobel ]; platforms = with lib.platforms; linux; - inherit version; }; } diff --git a/third_party/nixpkgs/pkgs/applications/misc/vifm/default.nix b/third_party/nixpkgs/pkgs/applications/misc/vifm/default.nix index 7bc4bd1ff7..531c108cdb 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/vifm/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/vifm/default.nix @@ -38,7 +38,6 @@ in stdenv.mkDerivation rec { license = licenses.gpl2; downloadPage = "https://vifm.info/downloads.shtml"; homepage = "https://vifm.info/"; - inherit version; updateWalker = true; changelog = "https://github.com/vifm/vifm/blob/v${version}/ChangeLog"; }; diff --git a/third_party/nixpkgs/pkgs/applications/misc/visidata/default.nix b/third_party/nixpkgs/pkgs/applications/misc/visidata/default.nix index 71907fc80b..11216b1d88 100644 --- a/third_party/nixpkgs/pkgs/applications/misc/visidata/default.nix +++ b/third_party/nixpkgs/pkgs/applications/misc/visidata/default.nix @@ -86,7 +86,6 @@ buildPythonApplication rec { ''; meta = { - inherit version; description = "Interactive terminal multitool for tabular data"; license = lib.licenses.gpl3; maintainers = [ lib.maintainers.raskin ]; 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 6860612b88..d7b14cb4ba 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 @@ -44,9 +44,9 @@ } }, "ungoogled-chromium": { - "version": "91.0.4472.114", - "sha256": "0wbyiwbdazgjjgj9vs56x26q3g9r80a57gfl0f2rfl1j7xwgxiy1", - "sha256bin64": "00ac1dyqxpxy1j11jvc5j35bgc629n2f2pll3912gzih4ir0vrys", + "version": "91.0.4472.164", + "sha256": "1g96hk72ds2b0aymgw7yjr0akgx7mkp17i99nk511ncnmni6zrc4", + "sha256bin64": "1j6p2gqlikaibcwa40k46dsm9jlrpbj21lv1snnjw8apjnjfd2wr", "deps": { "gn": { "version": "2021-04-06", @@ -55,8 +55,8 @@ "sha256": "199xkks67qrn0xa5fhp24waq2vk8qb78a96cb3kdd8v1hgacgb8x" }, "ungoogled-patches": { - "rev": "91.0.4472.114-1", - "sha256": "1xb5g3hybaiwn3y1zw1fxd3g0zwmvplrs06sdqnxzsr1qm8b874h" + "rev": "91.0.4472.164-1", + "sha256": "1vlirqrsliyl1dvm511p5axzvhvqil1m1jlk5zngvl9zfbdjw910" } } } diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/nomad/generic.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/nomad/generic.nix index dc22ab41d8..f4ddc038d2 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/nomad/generic.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/nomad/generic.nix @@ -53,6 +53,6 @@ buildGoPackage rec { description = "A Distributed, Highly Available, Datacenter-Aware Scheduler"; platforms = platforms.unix; license = licenses.mpl20; - maintainers = with maintainers; [ rushmorem pradeepchhetri endocrimes ]; + maintainers = with maintainers; [ rushmorem pradeepchhetri endocrimes maxeaubrey ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform/default.nix b/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform/default.nix index e4a8c0c0ab..c255ccd1ef 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/cluster/terraform/default.nix @@ -62,6 +62,7 @@ let marsam timstott zimbatm + maxeaubrey ]; }; } // attrs'); diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/baresip/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/baresip/default.nix index 03f0bf6381..122433d197 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/baresip/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/baresip/default.nix @@ -45,7 +45,6 @@ stdenv.mkDerivation rec { platforms = with lib.platforms; linux; maintainers = with lib.maintainers; [raskin]; license = lib.licenses.bsd3; - inherit version; downloadPage = "http://www.creytiv.com/pub/"; updateWalker = true; downloadURLRegexp = "/baresip-.*[.]tar[.].*"; diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/deltachat-electron/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/deltachat-electron/default.nix index 0134fac0e2..ee43e4475d 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/deltachat-electron/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/deltachat-electron/default.nix @@ -2,12 +2,12 @@ let pname = "deltachat-electron"; - version = "1.15.5"; + version = "1.20.3"; name = "${pname}-${version}"; src = fetchurl { url = "https://download.delta.chat/desktop/v${version}/DeltaChat-${version}.AppImage"; - sha256 = "sha256-BTGwgC0zSr1tq/X4v/fS/12E7/mGVYQ0m+Bt6o7VL4o="; + sha256 = "sha256-u0YjaXb+6BOBWaZANPcaxp7maqlBWAtecSsCGbr67dk="; }; appimageContents = appimageTools.extract { inherit name src; }; diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/mirage/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/mirage/default.nix index 42ea1c52fa..db30ede8a1 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/mirage/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/mirage/default.nix @@ -54,6 +54,5 @@ mkDerivation rec { maintainers = with maintainers; [ colemickens ]; broken = stdenv.isDarwin; inherit (qtbase.meta) platforms; - inherit version; }; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/oysttyer/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/oysttyer/default.nix index e3595e07a7..33f3b90873 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/oysttyer/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/oysttyer/default.nix @@ -33,7 +33,6 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - inherit version; description = "Perl Console Twitter Client"; homepage = "http://oysttyer.github.io/"; maintainers = with maintainers; [ woffs ]; diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/quaternion/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/quaternion/default.nix index f918cbdc2b..31b37fc2df 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/quaternion/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/quaternion/default.nix @@ -42,6 +42,5 @@ mkDerivation rec { license = licenses.gpl3; maintainers = with maintainers; [ peterhoeg ]; inherit (qtbase.meta) platforms; - inherit version; }; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/tensor/default.nix b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/tensor/default.nix index 3969627a67..5bbdc6460c 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/tensor/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/instant-messengers/tensor/default.nix @@ -60,6 +60,5 @@ mkDerivation rec { license = licenses.gpl3; maintainers = with maintainers; [ peterhoeg ]; inherit (qtbase.meta) platforms; - inherit version; }; } diff --git a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/mailcheck/default.nix b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/mailcheck/default.nix index d66dcbf47c..e9e5fb5f70 100644 --- a/third_party/nixpkgs/pkgs/applications/networking/mailreaders/mailcheck/default.nix +++ b/third_party/nixpkgs/pkgs/applications/networking/mailreaders/mailcheck/default.nix @@ -17,8 +17,6 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl2; maintainers = with lib.maintainers; [ kovirobi ]; platforms = lib.platforms.linux; - inherit version; - longDescription = '' A simple command line tool to check for new mail in local mbox and maildir and remote POP3 and IMAP mailboxes. diff --git a/third_party/nixpkgs/pkgs/applications/science/geometry/tetgen/default.nix b/third_party/nixpkgs/pkgs/applications/science/geometry/tetgen/default.nix index 75eaa089ec..1e3c96ae8c 100644 --- a/third_party/nixpkgs/pkgs/applications/science/geometry/tetgen/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/geometry/tetgen/default.nix @@ -16,7 +16,6 @@ stdenv.mkDerivation { ''; meta = { - inherit version; description = "Quality Tetrahedral Mesh Generator and 3D Delaunay Triangulator"; homepage = "http://tetgen.org/"; license = lib.licenses.agpl3Plus; diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/potassco/clingcon.nix b/third_party/nixpkgs/pkgs/applications/science/logic/potassco/clingcon.nix index 4d64a813e6..0f3218b767 100644 --- a/third_party/nixpkgs/pkgs/applications/science/logic/potassco/clingcon.nix +++ b/third_party/nixpkgs/pkgs/applications/science/logic/potassco/clingcon.nix @@ -32,7 +32,6 @@ stdenv.mkDerivation rec { ]; meta = { - inherit version; description = "Extension of clingo to handle constraints over integers"; license = lib.licenses.gpl3; # for now GPL3, next version MIT! platforms = lib.platforms.unix; diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/potassco/clingo.nix b/third_party/nixpkgs/pkgs/applications/science/logic/potassco/clingo.nix index 091b098fa3..2e907a2d3a 100644 --- a/third_party/nixpkgs/pkgs/applications/science/logic/potassco/clingo.nix +++ b/third_party/nixpkgs/pkgs/applications/science/logic/potassco/clingo.nix @@ -14,7 +14,6 @@ stdenv.mkDerivation rec { cmakeFlags = [ "-DCLINGO_BUILD_WITH_PYTHON=OFF" ]; meta = { - inherit version; description = "ASP system to ground and solve logic programs"; license = lib.licenses.mit; maintainers = [lib.maintainers.raskin]; diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/satallax/default.nix b/third_party/nixpkgs/pkgs/applications/science/logic/satallax/default.nix index 8c88f47327..9bfad1fa01 100644 --- a/third_party/nixpkgs/pkgs/applications/science/logic/satallax/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/logic/satallax/default.nix @@ -60,7 +60,6 @@ stdenv.mkDerivation rec { ''; meta = { - inherit version; description = "Automated theorem prover for higher-order logic"; license = lib.licenses.mit ; maintainers = [lib.maintainers.raskin]; diff --git a/third_party/nixpkgs/pkgs/applications/science/logic/z3/tptp.nix b/third_party/nixpkgs/pkgs/applications/science/logic/z3/tptp.nix index bb912742b7..23136ddf7a 100644 --- a/third_party/nixpkgs/pkgs/applications/science/logic/z3/tptp.nix +++ b/third_party/nixpkgs/pkgs/applications/science/logic/z3/tptp.nix @@ -23,7 +23,6 @@ stdenv.mkDerivation rec { ''; meta = { - inherit version; inherit (z3.meta) license homepage platforms; description = "TPTP wrapper for Z3 prover"; maintainers = [lib.maintainers.raskin]; diff --git a/third_party/nixpkgs/pkgs/applications/science/math/gfan/default.nix b/third_party/nixpkgs/pkgs/applications/science/math/gfan/default.nix index 1a2835932c..11a42d1cfd 100644 --- a/third_party/nixpkgs/pkgs/applications/science/math/gfan/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/math/gfan/default.nix @@ -21,7 +21,6 @@ stdenv.mkDerivation rec { buildInputs = [ gmp mpir cddlib ]; meta = { - inherit version; description = "A software package for computing Gröbner fans and tropical varieties"; license = lib.licenses.gpl2 ; maintainers = [lib.maintainers.raskin]; diff --git a/third_party/nixpkgs/pkgs/applications/science/math/nauty/default.nix b/third_party/nixpkgs/pkgs/applications/science/math/nauty/default.nix index 05a7d874d9..a941a63345 100644 --- a/third_party/nixpkgs/pkgs/applications/science/math/nauty/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/math/nauty/default.nix @@ -30,7 +30,6 @@ stdenv.mkDerivation rec { ''; checkTarget = "checks"; meta = with lib; { - inherit version; description = "Programs for computing automorphism groups of graphs and digraphs"; license = licenses.asl20; maintainers = teams.sage.members; diff --git a/third_party/nixpkgs/pkgs/applications/science/math/pcalc/default.nix b/third_party/nixpkgs/pkgs/applications/science/math/pcalc/default.nix index 1ee45ca266..cbf07135de 100644 --- a/third_party/nixpkgs/pkgs/applications/science/math/pcalc/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/math/pcalc/default.nix @@ -1,26 +1,26 @@ -{ lib, stdenv, fetchgit, bison, flex }: - -with lib; +{ lib, stdenv, fetchFromGitHub, bison, flex }: stdenv.mkDerivation rec { pname = "pcalc"; - version = "20141224"; + version = "20181202"; - src = fetchgit { - url = "git://git.code.sf.net/p/pcalc/code"; - rev = "181d60d3c880da4344fef7138065943eb3b9255f"; - sha256 = "1hd5bh20j5xzvv6qa0fmzmv0h8sf38r7zgi7y0b6nk17pjq33v90"; + src = fetchFromGitHub { + owner = "vapier"; + repo = "pcalc"; + rev = "d93be9e19ecc0b2674cf00ec91cbb79d32ccb01d"; + sha256 = "sha256-m4xdsEJGKxLgp/d5ipxQ+cKG3z7rlvpPL6hELnDu6Hk="; }; makeFlags = [ "DESTDIR= BINDIR=$(out)/bin" ]; - buildInputs = [ bison flex ]; + nativeBuildInputs = [ bison flex ]; - meta = { - homepage = "http://pcalc.sourceforge.net/"; + enableParallelBuilding = true; + + meta = with lib; { + homepage = "https://vapier.github.io/pcalc/"; description = "Programmer's calculator"; license = licenses.gpl2; maintainers = with lib.maintainers; [ ftrvxmtrx ]; platforms = lib.platforms.linux; - inherit version; }; } diff --git a/third_party/nixpkgs/pkgs/applications/science/math/polymake/default.nix b/third_party/nixpkgs/pkgs/applications/science/math/polymake/default.nix index 552881c5f1..b1abb31c76 100644 --- a/third_party/nixpkgs/pkgs/applications/science/math/polymake/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/math/polymake/default.nix @@ -37,7 +37,6 @@ stdenv.mkDerivation rec { ''; meta = { - inherit version; description = "Software for research in polyhedral geometry"; license = lib.licenses.gpl2 ; maintainers = [lib.maintainers.raskin]; diff --git a/third_party/nixpkgs/pkgs/applications/science/math/ratpoints/default.nix b/third_party/nixpkgs/pkgs/applications/science/math/ratpoints/default.nix index 14330b0f19..ec5d9ef366 100644 --- a/third_party/nixpkgs/pkgs/applications/science/math/ratpoints/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/math/ratpoints/default.nix @@ -26,7 +26,6 @@ stdenv.mkDerivation rec { preInstall = ''mkdir -p "$out"/{bin,share,lib,include}''; meta = { - inherit version; description = "A program to find rational points on hyperelliptic curves"; license = lib.licenses.gpl2Plus; maintainers = [lib.maintainers.raskin]; diff --git a/third_party/nixpkgs/pkgs/applications/science/misc/golly/beta.nix b/third_party/nixpkgs/pkgs/applications/science/misc/golly/beta.nix index 7741f7ba65..9846be8a43 100644 --- a/third_party/nixpkgs/pkgs/applications/science/misc/golly/beta.nix +++ b/third_party/nixpkgs/pkgs/applications/science/misc/golly/beta.nix @@ -41,7 +41,6 @@ stdenv.mkDerivation rec { ''; meta = { - inherit version; description = "Cellular automata simulation program"; license = lib.licenses.gpl2; maintainers = [lib.maintainers.raskin]; diff --git a/third_party/nixpkgs/pkgs/applications/science/misc/golly/default.nix b/third_party/nixpkgs/pkgs/applications/science/misc/golly/default.nix index be61ec86b3..724a1008c1 100644 --- a/third_party/nixpkgs/pkgs/applications/science/misc/golly/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/misc/golly/default.nix @@ -29,7 +29,6 @@ stdenv.mkDerivation rec { ''; meta = { - inherit version; description = "Cellular automata simulation program"; license = lib.licenses.gpl2; maintainers = [lib.maintainers.raskin]; diff --git a/third_party/nixpkgs/pkgs/applications/science/programming/fdr/default.nix b/third_party/nixpkgs/pkgs/applications/science/programming/fdr/default.nix index 62e4c6876f..bc67c30aa6 100644 --- a/third_party/nixpkgs/pkgs/applications/science/programming/fdr/default.nix +++ b/third_party/nixpkgs/pkgs/applications/science/programming/fdr/default.nix @@ -18,7 +18,7 @@ stdenv.mkDerivation { zlib ]; - phases = [ "unpackPhase" "installPhase" ]; + dontConfigure = true; installPhase = '' mkdir -p "$out" diff --git a/third_party/nixpkgs/pkgs/applications/version-management/mercurial/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/mercurial/default.nix index 3394d44a4b..128b70c38e 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/mercurial/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/mercurial/default.nix @@ -90,7 +90,6 @@ let passthru.tests = {}; meta = with lib; { - inherit version; description = "A fast, lightweight SCM system for very large distributed projects"; homepage = "https://www.mercurial-scm.org"; downloadPage = "https://www.mercurial-scm.org/release/"; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/monotone-viz/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/monotone-viz/default.nix index cfde0721ba..3c92a93851 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/monotone-viz/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/monotone-viz/default.nix @@ -46,7 +46,6 @@ stdenv.mkDerivation rec { ''; meta = { - inherit version; description = "Monotone ancestry visualiser"; license = lib.licenses.gpl2Plus ; maintainers = [lib.maintainers.raskin]; diff --git a/third_party/nixpkgs/pkgs/applications/version-management/nbstripout/default.nix b/third_party/nixpkgs/pkgs/applications/version-management/nbstripout/default.nix index 3bea6d8933..06a4b2c98a 100644 --- a/third_party/nixpkgs/pkgs/applications/version-management/nbstripout/default.nix +++ b/third_party/nixpkgs/pkgs/applications/version-management/nbstripout/default.nix @@ -29,7 +29,6 @@ buildPythonApplication rec { ''; meta = { - inherit version; description = "Strip output from Jupyter and IPython notebooks"; homepage = "https://github.com/kynan/nbstripout"; license = lib.licenses.mit; diff --git a/third_party/nixpkgs/pkgs/applications/video/kodi-packages/pvr-hdhomerun/default.nix b/third_party/nixpkgs/pkgs/applications/video/kodi-packages/pvr-hdhomerun/default.nix index ba1a0241ff..7cdc5a0c63 100644 --- a/third_party/nixpkgs/pkgs/applications/video/kodi-packages/pvr-hdhomerun/default.nix +++ b/third_party/nixpkgs/pkgs/applications/video/kodi-packages/pvr-hdhomerun/default.nix @@ -2,13 +2,13 @@ buildKodiBinaryAddon rec { pname = "pvr-hdhomerun"; namespace = "pvr.hdhomerun"; - version = "7.1.0"; + version = "7.1.1"; src = fetchFromGitHub { owner = "kodi-pvr"; repo = "pvr.hdhomerun"; rev = "${version}-${rel}"; - sha256 = "0gbwjssnd319csq2kwlyjj1rskg19m1dxac5dl2dymvx5hn3zrgm"; + sha256 = "sha256-mQeeeCOxhUTiUcOJ1OiIiJ+7envAIGO67Bp4EAf4sIE="; }; extraBuildInputs = [ jsoncpp libhdhomerun ]; diff --git a/third_party/nixpkgs/pkgs/applications/video/vdr/plugins.nix b/third_party/nixpkgs/pkgs/applications/video/vdr/plugins.nix index cb2338c0e1..2e79cb25c4 100644 --- a/third_party/nixpkgs/pkgs/applications/video/vdr/plugins.nix +++ b/third_party/nixpkgs/pkgs/applications/video/vdr/plugins.nix @@ -23,13 +23,13 @@ in { ] mkPlugin); femon = stdenv.mkDerivation rec { - - name = "vdr-femon-2.4.0"; + pname = "vdr-femon"; + version = "2.4.0"; buildInputs = [ vdr ]; src = fetchurl { - url = "http://www.saunalahti.fi/~rahrenbe/vdr/femon/files/${name}.tgz"; + url = "http://www.saunalahti.fi/~rahrenbe/vdr/femon/files/${pname}-${version}.tgz"; sha256 = "1hra1xslj8s68zbyr8zdqp8yap0aj1p6rxyc6cwy1j122kwcnapp"; }; @@ -48,7 +48,6 @@ in { }; vaapidevice = stdenv.mkDerivation { - pname = "vdr-vaapidevice"; version = "20190525"; @@ -84,7 +83,8 @@ in { markad = stdenv.mkDerivation rec { - name = "vdr-markad-2017-03-13"; + pname = "vdr-markad"; + version = "unstable-2017-03-13"; src = fetchgit { url = "git://projects.vdr-developer.org/vdr-plugin-markad.git"; @@ -176,18 +176,16 @@ in { }; - vnsiserver = let - name = "vnsiserver"; + vnsiserver = stdenv.mkDerivation rec { + pname = "vdr-vnsiserver"; version = "1.8.0"; - in stdenv.mkDerivation { - name = "vdr-${name}-${version}"; buildInputs = [ vdr ]; installFlags = [ "DESTDIR=$(out)" ]; src = fetchFromGitHub { - repo = "vdr-plugin-${name}"; + repo = "vdr-plugin-vnsiserver"; owner = "FernetMenta"; rev = "v${version}"; sha256 = "0n7idpxqx7ayd63scl6xwdx828ik4kb2mwz0c30cfjnmnxxd45lw"; @@ -204,7 +202,8 @@ in { }; text2skin = stdenv.mkDerivation { - name = "vdr-text2skin-1.3.4-20170702"; + pname = "vdr-text2skin"; + version = "1.3.4-20170702"; src = fetchgit { url = "git://projects.vdr-developer.org/vdr-plugin-text2skin.git"; @@ -308,7 +307,6 @@ in { in stdenv.mkDerivation rec { pname = "vdr-fritzbox"; - version = "1.5.3"; src = fetchFromGitHub { diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/docker-compose/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/docker-compose/default.nix index cc89368067..fd67aa554f 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/docker-compose/default.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/docker-compose/default.nix @@ -8,12 +8,12 @@ }: buildPythonApplication rec { - version = "1.28.6"; + version = "1.29.2"; pname = "docker-compose"; src = fetchPypi { inherit pname version; - sha256 = "1d44906f7ab738ba2d1785130ed31b16111eee6dc5a1dbd7252091dae48c5281"; + sha256 = "sha256-TIzZ0h0jdBJ5PRi9MxEASe6a+Nqz/iwhO70HM5WbCbc="; }; # lots of networking and other fails diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/looking-glass-client/0001-client-all-fix-more-maybe-uninitialized-when-O3-is-i.patch b/third_party/nixpkgs/pkgs/applications/virtualization/looking-glass-client/0001-client-all-fix-more-maybe-uninitialized-when-O3-is-i.patch deleted file mode 100644 index 82ce050b58..0000000000 --- a/third_party/nixpkgs/pkgs/applications/virtualization/looking-glass-client/0001-client-all-fix-more-maybe-uninitialized-when-O3-is-i.patch +++ /dev/null @@ -1,45 +0,0 @@ -From 95a7293b30ff7b89d615daea00269ed32f4b70a2 Mon Sep 17 00:00:00 2001 -From: Geoffrey McRae -Date: Tue, 23 Feb 2021 20:25:30 +1100 -Subject: [PATCH] [client] all: fix more `maybe-uninitialized` when `-O3` is in - use - -Closes #475 ---- - client/renderers/EGL/egl.c | 3 ++- - client/src/main.c | 5 +++-- - 2 files changed, 5 insertions(+), 3 deletions(-) - -diff --git a/client/renderers/EGL/egl.c b/client/renderers/EGL/egl.c -index b7a5644..72ce50d 100644 ---- a/client/renderers/EGL/egl.c -+++ b/client/renderers/EGL/egl.c -@@ -271,7 +271,8 @@ static void egl_calc_mouse_size(struct Inst * this) - if (!this->formatValid) - return; - -- int w, h; -+ int w = 0, h = 0; -+ - switch(this->format.rotate) - { - case LG_ROTATE_0: -diff --git a/client/src/main.c b/client/src/main.c -index f05e929..f5d6fad 100644 ---- a/client/src/main.c -+++ b/client/src/main.c -@@ -186,8 +186,9 @@ static void updatePositionInfo(void) - if (!g_state.haveSrcSize) - goto done; - -- float srcW; -- float srcH; -+ float srcW = 0.0f; -+ float srcH = 0.0f; -+ - switch(params.winRotate) - { - case LG_ROTATE_0: --- -2.30.1 - diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/looking-glass-client/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/looking-glass-client/default.nix index 345018bbe4..0d158cc3f9 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/looking-glass-client/default.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/looking-glass-client/default.nix @@ -1,40 +1,54 @@ -{ lib, stdenv, fetchFromGitHub, cmake, pkg-config, SDL2, SDL2_ttf, spice-protocol -, fontconfig, libX11, freefont_ttf, nettle, libpthreadstubs, libXau, libXdmcp -, libXi, libXext, wayland, wayland-protocols, libffi, libGLU, libXScrnSaver -, expat, libbfd + +{ stdenv, lib, fetchFromGitHub, fetchpatch, makeDesktopItem, cmake, pkg-config +, SDL, SDL2_ttf, freefont_ttf, spice-protocol, nettle, libbfd, fontconfig +, libXi, libXScrnSaver, libXinerama +, wayland, wayland-protocols }: +let + desktopItem = makeDesktopItem { + name = "looking-glass-client"; + desktopName = "Looking Glass Client"; + type = "Application"; + exec = "looking-glass-client"; + icon = "lg-logo"; + terminal = true; + }; +in stdenv.mkDerivation rec { pname = "looking-glass-client"; - version = "B3"; + version = "B4"; src = fetchFromGitHub { owner = "gnif"; repo = "LookingGlass"; rev = version; - sha256 = "1vmabjzn85p0brdian9lbpjq39agzn8k0limn8zjm713lh3n3c0f"; + sha256 = "0fwmz0l1dcfwklgvxmv0galgj2q3nss90kc3jwgf6n80x27rsnhf"; fetchSubmodules = true; }; nativeBuildInputs = [ cmake pkg-config ]; buildInputs = [ - SDL2 SDL2_ttf spice-protocol fontconfig libX11 freefont_ttf nettle - libpthreadstubs libXau libXdmcp libXi libXext wayland wayland-protocols - libffi libGLU libXScrnSaver expat libbfd + SDL SDL2_ttf freefont_ttf spice-protocol + libbfd nettle fontconfig + libXi libXScrnSaver libXinerama + wayland wayland-protocols ]; - patches = [ - # error: ‘h’ may be used uninitialized in this function [-Werror=maybe-uninitialized] - # Fixed upstream in master in 8771103abbfd04da9787dea760405364af0d82de, but not in B3. - # Including our own patch here since upstream commit patch doesnt apply cleanly on B3 - ./0001-client-all-fix-more-maybe-uninitialized-when-O3-is-i.patch - ]; - patchFlags = "-p2"; - - sourceRoot = "source/client"; NIX_CFLAGS_COMPILE = "-mavx"; # Fix some sort of AVX compiler problem. + postUnpack = '' + echo $version > source/VERSION + export sourceRoot="source/client" + ''; + + postInstall = '' + mkdir -p $out/share/pixmaps + ln -s ${desktopItem}/share/applications $out/share/ + cp $src/resources/lg-logo.png $out/share/pixmaps + ''; + meta = with lib; { description = "A KVM Frame Relay (KVMFR) implementation"; longDescription = '' @@ -46,7 +60,7 @@ stdenv.mkDerivation rec { ''; homepage = "https://looking-glass.io/"; license = licenses.gpl2Plus; - maintainers = with maintainers; [ alexbakker ]; + maintainers = with maintainers; [ alexbakker babbaj ]; platforms = [ "x86_64-linux" ]; }; } diff --git a/third_party/nixpkgs/pkgs/applications/virtualization/qemu/default.nix b/third_party/nixpkgs/pkgs/applications/virtualization/qemu/default.nix index 7fd01a8ffa..3c9e7ae8c5 100644 --- a/third_party/nixpkgs/pkgs/applications/virtualization/qemu/default.nix +++ b/third_party/nixpkgs/pkgs/applications/virtualization/qemu/default.nix @@ -86,6 +86,16 @@ stdenv.mkDerivation rec { patches = [ ./fix-qemu-ga.patch ./9p-ignore-noatime.patch + (fetchpatch { + name = "CVE-2021-3545.patch"; + url = "https://gitlab.com/qemu-project/qemu/-/commit/121841b25d72d13f8cad554363138c360f1250ea.patch"; + sha256 = "13dgfd8dmxcalh2nvb68iv0kyv4xxrvpdqdxf1h3bjr4451glag1"; + }) + (fetchpatch { + name = "CVE-2021-3546.patch"; + url = "https://gitlab.com/qemu-project/qemu/-/commit/9f22893adcb02580aee5968f32baa2cd109b3ec2.patch"; + sha256 = "1vkhm9vl671y4cra60b6704339qk1h5dyyb3dfvmvpsvfyh2pm7n"; + }) ] ++ optional nixosTestRunner ./force-uid0-on-9p.patch ++ optionals stdenv.hostPlatform.isMusl [ (fetchpatch { diff --git a/third_party/nixpkgs/pkgs/applications/window-managers/wmii-hg/default.nix b/third_party/nixpkgs/pkgs/applications/window-managers/wmii-hg/default.nix index 0acad8edbe..d0c35ab7cb 100644 --- a/third_party/nixpkgs/pkgs/applications/window-managers/wmii-hg/default.nix +++ b/third_party/nixpkgs/pkgs/applications/window-managers/wmii-hg/default.nix @@ -41,7 +41,6 @@ stdenv.mkDerivation rec { description = "A small window manager controlled by a 9P filesystem"; maintainers = with lib.maintainers; [ kovirobi ]; license = lib.licenses.mit; - inherit version; platforms = with lib.platforms; linux; }; } diff --git a/third_party/nixpkgs/pkgs/build-support/rust/import-cargo-lock.nix b/third_party/nixpkgs/pkgs/build-support/rust/import-cargo-lock.nix index 244572f79e..83f4e0df4f 100644 --- a/third_party/nixpkgs/pkgs/build-support/rust/import-cargo-lock.nix +++ b/third_party/nixpkgs/pkgs/build-support/rust/import-cargo-lock.nix @@ -63,11 +63,19 @@ let # We can't use the existing fetchCrate function, since it uses a # recursive hash of the unpacked crate. - fetchCrate = pkg: fetchurl { - name = "crate-${pkg.name}-${pkg.version}.tar.gz"; - url = "https://crates.io/api/v1/crates/${pkg.name}/${pkg.version}/download"; - sha256 = pkg.checksum; - }; + fetchCrate = pkg: + assert lib.assertMsg (pkg ? checksum) '' + Package ${pkg.name} does not have a checksum. + Please note that the Cargo.lock format where checksums used to be listed + under [metadata] is not supported. + If that is the case, running `cargo update` with a recent toolchain will + automatically update the format along with the crate's depenendencies. + ''; + fetchurl { + name = "crate-${pkg.name}-${pkg.version}.tar.gz"; + url = "https://crates.io/api/v1/crates/${pkg.name}/${pkg.version}/download"; + sha256 = pkg.checksum; + }; # Fetch and unpack a crate. mkCrate = pkg: diff --git a/third_party/nixpkgs/pkgs/data/fonts/noto-fonts/default.nix b/third_party/nixpkgs/pkgs/data/fonts/noto-fonts/default.nix index 530cfca742..70e43efdb7 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/noto-fonts/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/noto-fonts/default.nix @@ -154,7 +154,6 @@ in ''; meta = with lib; { - inherit version; description = "Color and Black-and-White emoji fonts"; homepage = "https://github.com/googlefonts/noto-emoji"; license = with licenses; [ ofl asl20 ]; diff --git a/third_party/nixpkgs/pkgs/data/fonts/unscii/default.nix b/third_party/nixpkgs/pkgs/data/fonts/unscii/default.nix index 6fdeadf377..5b4d2cb740 100644 --- a/third_party/nixpkgs/pkgs/data/fonts/unscii/default.nix +++ b/third_party/nixpkgs/pkgs/data/fonts/unscii/default.nix @@ -61,7 +61,6 @@ stdenv.mkDerivation rec { outputs = [ "out" "extra" ]; meta = { - inherit version; description = "Bitmapped character-art-friendly Unicode fonts"; # Basically GPL2+ with font exception — because of the Unifont-augmented # version. The reduced version is public domain. diff --git a/third_party/nixpkgs/pkgs/data/misc/scowl/default.nix b/third_party/nixpkgs/pkgs/data/misc/scowl/default.nix index a4d91eeb03..15c2699d8b 100644 --- a/third_party/nixpkgs/pkgs/data/misc/scowl/default.nix +++ b/third_party/nixpkgs/pkgs/data/misc/scowl/default.nix @@ -102,7 +102,6 @@ stdenv.mkDerivation rec { ''; meta = { - inherit version; description = "Spell checker oriented word lists"; license = lib.licenses.mit; maintainers = [lib.maintainers.raskin]; diff --git a/third_party/nixpkgs/pkgs/data/misc/xorg-rgb/default.nix b/third_party/nixpkgs/pkgs/data/misc/xorg-rgb/default.nix index 24689d571d..056c56b411 100644 --- a/third_party/nixpkgs/pkgs/data/misc/xorg-rgb/default.nix +++ b/third_party/nixpkgs/pkgs/data/misc/xorg-rgb/default.nix @@ -11,7 +11,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [pkg-config]; buildInputs = [xorgproto]; meta = { - inherit version; description = "X11 colorname to RGB mapping database"; license = lib.licenses.mit; maintainers = [lib.maintainers.raskin]; diff --git a/third_party/nixpkgs/pkgs/data/themes/yaru/default.nix b/third_party/nixpkgs/pkgs/data/themes/yaru/default.nix index b37a921bba..40cfaee17d 100644 --- a/third_party/nixpkgs/pkgs/data/themes/yaru/default.nix +++ b/third_party/nixpkgs/pkgs/data/themes/yaru/default.nix @@ -42,6 +42,6 @@ stdenv.mkDerivation rec { homepage = "https://github.com/ubuntu/yaru"; license = with licenses; [ cc-by-sa-40 gpl3Plus lgpl21Only lgpl3Only ]; platforms = platforms.linux; - maintainers = with maintainers; [ fortuneteller2k ]; + maintainers = with maintainers; [ fortuneteller2k maxeaubrey ]; }; } diff --git a/third_party/nixpkgs/pkgs/desktops/lxde/core/lxappearance/default.nix b/third_party/nixpkgs/pkgs/desktops/lxde/core/lxappearance/default.nix index 21d8245533..97b434c9f6 100644 --- a/third_party/nixpkgs/pkgs/desktops/lxde/core/lxappearance/default.nix +++ b/third_party/nixpkgs/pkgs/desktops/lxde/core/lxappearance/default.nix @@ -5,6 +5,7 @@ , libX11 , gtk2 , gtk3 +, wrapGAppsHook , withGtk3 ? true }: @@ -20,6 +21,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config intltool + wrapGAppsHook ]; buildInputs = [ diff --git a/third_party/nixpkgs/pkgs/development/compilers/abcl/default.nix b/third_party/nixpkgs/pkgs/development/compilers/abcl/default.nix index fff88eddd1..f3a3541e7c 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/abcl/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/abcl/default.nix @@ -29,7 +29,6 @@ stdenv.mkDerivation rec { ''; buildInputs = [jre ant jdk jre]; meta = { - inherit version; description = "A JVM-based Common Lisp implementation"; license = lib.licenses.gpl3 ; maintainers = [lib.maintainers.raskin]; diff --git a/third_party/nixpkgs/pkgs/development/compilers/clasp/default.nix b/third_party/nixpkgs/pkgs/development/compilers/clasp/default.nix index 31a669c313..3aa7063f55 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/clasp/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/clasp/default.nix @@ -118,7 +118,6 @@ stdenv.mkDerivation rec { CLASP_SRC_DONTTOUCH = "true"; meta = { - inherit version; description = "A Common Lisp implementation based on LLVM with C++ integration"; license = lib.licenses.lgpl21Plus ; maintainers = [lib.maintainers.raskin]; diff --git a/third_party/nixpkgs/pkgs/development/compilers/dmd/binary.nix b/third_party/nixpkgs/pkgs/development/compilers/dmd/binary.nix index de0964155f..f47e447334 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/dmd/binary.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/dmd/binary.nix @@ -43,7 +43,6 @@ in stdenv.mkDerivation { ''; meta = with lib; { - inherit version; description = "Digital Mars D Compiler Package"; # As of 2.075 all sources and binaries use the boost license license = licenses.boost; diff --git a/third_party/nixpkgs/pkgs/development/compilers/fpc/default.nix b/third_party/nixpkgs/pkgs/development/compilers/fpc/default.nix index 5c82938665..4721cac278 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/fpc/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/fpc/default.nix @@ -46,6 +46,5 @@ stdenv.mkDerivation rec { maintainers = [ maintainers.raskin ]; license = with licenses; [ gpl2 lgpl2 ]; platforms = platforms.linux; - inherit version; }; } diff --git a/third_party/nixpkgs/pkgs/development/compilers/ldc/binary.nix b/third_party/nixpkgs/pkgs/development/compilers/ldc/binary.nix index 3a07009296..7b43a2c2e8 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/ldc/binary.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/ldc/binary.nix @@ -32,7 +32,6 @@ in stdenv.mkDerivation { ''; meta = with lib; { - inherit version; description = "The LLVM-based D Compiler"; homepage = "https://github.com/ldc-developers/ldc"; # from https://github.com/ldc-developers/ldc/blob/master/LICENSE diff --git a/third_party/nixpkgs/pkgs/development/compilers/llvm/12/compiler-rt/X86-support-extension.patch b/third_party/nixpkgs/pkgs/development/compilers/llvm/12/compiler-rt/X86-support-extension.patch index f6f9336ad5..66742e5b14 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/llvm/12/compiler-rt/X86-support-extension.patch +++ b/third_party/nixpkgs/pkgs/development/compilers/llvm/12/compiler-rt/X86-support-extension.patch @@ -2,9 +2,7 @@ diff --git a/lib/builtins/CMakeLists.txt b/lib/builtins/CMakeLists.txt index 3a66dd9c3fb..7efc85d9f9f 100644 --- a/lib/builtins/CMakeLists.txt +++ b/lib/builtins/CMakeLists.txt -@@ -301,6 +301,10 @@ if (NOT MSVC) - i386/umoddi3.S - ) +@@ -345,4 +345,8 @@ if (NOT MSVC) + set(i486_SOURCES ${i386_SOURCES}) + set(i586_SOURCES ${i386_SOURCES}) diff --git a/third_party/nixpkgs/pkgs/development/compilers/obliv-c/default.nix b/third_party/nixpkgs/pkgs/development/compilers/obliv-c/default.nix index 8a647a31c7..b7ec54ace7 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/obliv-c/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/obliv-c/default.nix @@ -33,7 +33,6 @@ stdenv.mkDerivation rec { ''; meta = { - inherit version; description = "A GCC wrapper that makes it easy to embed secure computation protocols inside regular C programs"; license = lib.licenses.bsd3; maintainers = [lib.maintainers.raskin]; diff --git a/third_party/nixpkgs/pkgs/development/compilers/sbcl/common.nix b/third_party/nixpkgs/pkgs/development/compilers/sbcl/common.nix index b020eeafc5..eb3f6aba20 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/sbcl/common.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/sbcl/common.nix @@ -110,7 +110,6 @@ stdenv.mkDerivation rec { ''); meta = sbclBootstrap.meta // { - inherit version; updateWalker = true; }; } diff --git a/third_party/nixpkgs/pkgs/development/compilers/solc/default.nix b/third_party/nixpkgs/pkgs/development/compilers/solc/default.nix index c01cc761e8..eea60786f4 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/solc/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/solc/default.nix @@ -99,7 +99,6 @@ let homepage = "https://github.com/ethereum/solidity"; license = licenses.gpl3; maintainers = with maintainers; [ dbrock akru lionello sifmelcara ]; - inherit version; }; }; in diff --git a/third_party/nixpkgs/pkgs/development/compilers/vala/default.nix b/third_party/nixpkgs/pkgs/development/compilers/vala/default.nix index 69d5789bfb..e3a005564d 100644 --- a/third_party/nixpkgs/pkgs/development/compilers/vala/default.nix +++ b/third_party/nixpkgs/pkgs/development/compilers/vala/default.nix @@ -100,7 +100,7 @@ let homepage = "https://wiki.gnome.org/Projects/Vala"; license = licenses.lgpl21Plus; platforms = platforms.unix; - maintainers = with maintainers; [ antono jtojnar peterhoeg ]; + maintainers = with maintainers; [ antono jtojnar peterhoeg maxeaubrey ]; }; }); diff --git a/third_party/nixpkgs/pkgs/development/interpreters/clojure/clooj.nix b/third_party/nixpkgs/pkgs/development/interpreters/clojure/clooj.nix index 810d783d4f..42d6d67ee1 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/clojure/clooj.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/clojure/clooj.nix @@ -1,14 +1,12 @@ { lib, stdenv, fetchurl, jre, makeWrapper }: -let version = "0.4.4"; in - -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "clooj"; - inherit version; + version = "0.4.4"; jar = fetchurl { # mirrored as original mediafire.com source does not work without user interaction - url = "https://archive.org/download/clooj-0.4.4-standalone/clooj-0.4.4-standalone.jar"; + url = "https://archive.org/download/clooj-${version}-standalone/clooj-${version}-standalone.jar"; sha256 = "0hbc29bg2a86rm3sx9kvj7h7db9j0kbnrb706wsfiyk3zi3bavnd"; }; diff --git a/third_party/nixpkgs/pkgs/development/interpreters/eff/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/eff/default.nix index 8dba500c15..cddb773ec1 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/eff/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/eff/default.nix @@ -1,11 +1,8 @@ { lib, stdenv, fetchFromGitHub, which, ocamlPackages }: -let version = "5.0"; in - -stdenv.mkDerivation { - +stdenv.mkDerivation rec { pname = "eff"; - inherit version; + version = "5.0"; src = fetchFromGitHub { owner = "matijapretnar"; diff --git a/third_party/nixpkgs/pkgs/development/interpreters/gnu-apl/default.nix b/third_party/nixpkgs/pkgs/development/interpreters/gnu-apl/default.nix index 108da08b80..0f666dd9af 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/gnu-apl/default.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/gnu-apl/default.nix @@ -36,7 +36,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3Plus; maintainers = [ maintainers.kovirobi ]; platforms = with platforms; linux ++ darwin; - inherit version; mainProgram = "apl"; longDescription = '' diff --git a/third_party/nixpkgs/pkgs/development/interpreters/pyrex/0.9.5.nix b/third_party/nixpkgs/pkgs/development/interpreters/pyrex/0.9.5.nix index a9c71c6fcf..3fb909b0bb 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/pyrex/0.9.5.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/pyrex/0.9.5.nix @@ -1,10 +1,8 @@ { lib, fetchurl, python2Packages }: -let version = "0.9.5.1.1"; in - -python2Packages.buildPythonPackage { +python2Packages.buildPythonPackage rec { pname = "pyrex"; - inherit version; + version = "0.9.5.1.1"; src = fetchurl { url = "https://www.cosc.canterbury.ac.nz/greg.ewing/python/Pyrex/oldtar/Pyrex-${version}.tar.gz"; diff --git a/third_party/nixpkgs/pkgs/development/interpreters/pyrex/0.9.6.nix b/third_party/nixpkgs/pkgs/development/interpreters/pyrex/0.9.6.nix index 12429c05fe..e9d8d30970 100644 --- a/third_party/nixpkgs/pkgs/development/interpreters/pyrex/0.9.6.nix +++ b/third_party/nixpkgs/pkgs/development/interpreters/pyrex/0.9.6.nix @@ -1,10 +1,8 @@ { lib, fetchurl, python2Packages }: -let version = "0.9.6.4"; in - -python2Packages.buildPythonPackage { +python2Packages.buildPythonPackage rec { pname = "pyrex"; - inherit version; + version = "0.9.6.4"; src = fetchurl { url = "https://www.cosc.canterbury.ac.nz/greg.ewing/python/Pyrex/oldtar/Pyrex-${version}.tar.gz"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/afflib/default.nix b/third_party/nixpkgs/pkgs/development/libraries/afflib/default.nix index 94970c5a30..cb0c8025dd 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/afflib/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/afflib/default.nix @@ -24,7 +24,6 @@ stdenv.mkDerivation rec { platforms = lib.platforms.unix; license = lib.licenses.bsdOriginal; maintainers = [ lib.maintainers.raskin ]; - inherit version; downloadPage = "https://github.com/sshock/AFFLIBv3/tags"; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/audio/libgme/default.nix b/third_party/nixpkgs/pkgs/development/libraries/audio/libgme/default.nix index 927bd00656..2761eaf375 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/audio/libgme/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/audio/libgme/default.nix @@ -1,9 +1,8 @@ { lib, stdenv, fetchFromBitbucket, cmake, removeReferencesTo }: -let - version = "0.6.3"; -in stdenv.mkDerivation { + +stdenv.mkDerivation rec { pname = "libgme"; - inherit version; + version = "0.6.3"; meta = with lib; { description = "A collection of video game music chip emulators"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/avro-c++/default.nix b/third_party/nixpkgs/pkgs/development/libraries/avro-c++/default.nix index 15e2516c1b..ad373300e0 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/avro-c++/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/avro-c++/default.nix @@ -1,10 +1,8 @@ { lib, stdenv, fetchurl, cmake, boost, python2}: -let version = "1.8.2"; in - -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "avro-c++"; - inherit version; + version = "1.8.2"; src = fetchurl { url = "mirror://apache/avro/avro-${version}/cpp/avro-cpp-${version}.tar.gz"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/avro-c/default.nix b/third_party/nixpkgs/pkgs/development/libraries/avro-c/default.nix index 95e3053b53..ee43daf2d0 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/avro-c/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/avro-c/default.nix @@ -1,10 +1,8 @@ { lib, stdenv, cmake, fetchurl, pkg-config, jansson, zlib }: -let - version = "1.10.2"; -in stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "avro-c"; - inherit version; + version = "1.10.2"; src = fetchurl { url = "mirror://apache/avro/avro-${version}/c/avro-c-${version}.tar.gz"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/bctoolbox/default.nix b/third_party/nixpkgs/pkgs/development/libraries/bctoolbox/default.nix index 9cdede7852..1a42211b93 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/bctoolbox/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/bctoolbox/default.nix @@ -27,7 +27,6 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = [ "-Wno-error=stringop-truncation" ]; meta = with lib; { - inherit version; description = "Utilities library for Linphone"; homepage = "https://gitlab.linphone.org/BC/public/bctoolbox"; license = licenses.gpl3Plus; diff --git a/third_party/nixpkgs/pkgs/development/libraries/bearssl/default.nix b/third_party/nixpkgs/pkgs/development/libraries/bearssl/default.nix index de9c182df1..36873f03f7 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/bearssl/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/bearssl/default.nix @@ -1,17 +1,12 @@ { lib, stdenv, fetchurl }: -let - version = "0.6"; - sha256 = "057zhgy9w4y8z2996r0pq5k2k39lpvmmvz4df8db8qa9f6hvn1b7"; - -in -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "bearssl"; - inherit version; + version = "0.6"; src = fetchurl { url = "https://www.bearssl.org/bearssl-${version}.tar.gz"; - inherit sha256; + sha256 = "057zhgy9w4y8z2996r0pq5k2k39lpvmmvz4df8db8qa9f6hvn1b7"; }; outputs = [ "bin" "lib" "dev" "out" ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/botan/generic.nix b/third_party/nixpkgs/pkgs/development/libraries/botan/generic.nix index 2fc5abc292..3313b8c4fc 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/botan/generic.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/botan/generic.nix @@ -45,7 +45,6 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - inherit version; description = "Cryptographic algorithms library"; maintainers = with maintainers; [ raskin ]; platforms = platforms.unix; diff --git a/third_party/nixpkgs/pkgs/development/libraries/cddlib/default.nix b/third_party/nixpkgs/pkgs/development/libraries/cddlib/default.nix index 9ff54f8ebf..e0d6149362 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/cddlib/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/cddlib/default.nix @@ -23,7 +23,6 @@ stdenv.mkDerivation rec { # Requested here: https://github.com/cddlib/cddlib/issues/25 doCheck = true; meta = with lib; { - inherit version; description = "An implementation of the Double Description Method for generating all vertices of a convex polyhedron"; license = licenses.gpl2Plus; maintainers = teams.sage.members; diff --git a/third_party/nixpkgs/pkgs/development/libraries/classads/default.nix b/third_party/nixpkgs/pkgs/development/libraries/classads/default.nix index ba8961c8f6..991fb2b41d 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/classads/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/classads/default.nix @@ -1,10 +1,8 @@ { lib, stdenv, fetchurl, pcre }: -let version = "1.0.10"; in - -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "classads"; - inherit version; + version = "1.0.10"; src = fetchurl { url = "ftp://ftp.cs.wisc.edu/condor/classad/c++/classads-${version}.tar.gz"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/clfft/default.nix b/third_party/nixpkgs/pkgs/development/libraries/clfft/default.nix index 91267208d2..db18bce72b 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/clfft/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/clfft/default.nix @@ -1,10 +1,8 @@ { lib, stdenv, fetchFromGitHub, cmake, fftw, fftwFloat, boost166, opencl-clhpp, ocl-icd }: -let - version = "2.12.2"; -in stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "clfft"; - inherit version; + version = "2.12.2"; src = fetchFromGitHub { owner = "clMathLibraries"; @@ -29,6 +27,5 @@ in stdenv.mkDerivation { homepage = "http://clmathlibraries.github.io/clFFT/"; platforms = [ "i686-linux" "x86_64-linux" ]; maintainers = with maintainers; [ chessai ]; - inherit version; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/csfml/default.nix b/third_party/nixpkgs/pkgs/development/libraries/csfml/default.nix index 78d8bce40a..cfc41b9271 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/csfml/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/csfml/default.nix @@ -1,12 +1,8 @@ { lib, stdenv, fetchFromGitHub, cmake, sfml }: -let - version = "2.5"; -in - -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "csfml"; - inherit version; + version = "2.5"; src = fetchFromGitHub { owner = "SFML"; repo = "CSFML"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/eclib/default.nix b/third_party/nixpkgs/pkgs/development/libraries/eclib/default.nix index 740b0d81ca..74a6f21992 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/eclib/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/eclib/default.nix @@ -43,7 +43,6 @@ stdenv.mkDerivation rec { ]; doCheck = true; meta = with lib; { - inherit version; description = "Elliptic curve tools"; homepage = "https://github.com/JohnCremona/eclib"; license = licenses.gpl2Plus; diff --git a/third_party/nixpkgs/pkgs/development/libraries/exiv2/default.nix b/third_party/nixpkgs/pkgs/development/libraries/exiv2/default.nix index 2a394f8279..930bfc99f2 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/exiv2/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/exiv2/default.nix @@ -10,6 +10,7 @@ , doxygen , graphviz , libxslt +, libiconv }: stdenv.mkDerivation rec { @@ -33,6 +34,8 @@ stdenv.mkDerivation rec { libxslt ]; + buildInputs = lib.optional stdenv.isDarwin libiconv; + propagatedBuildInputs = [ expat zlib diff --git a/third_party/nixpkgs/pkgs/development/libraries/fflas-ffpack/default.nix b/third_party/nixpkgs/pkgs/development/libraries/fflas-ffpack/default.nix index fd7d89a883..ca2f3b0e38 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/fflas-ffpack/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/fflas-ffpack/default.nix @@ -49,7 +49,6 @@ stdenv.mkDerivation rec { doCheck = true; meta = with lib; { - inherit version; description = "Finite Field Linear Algebra Subroutines"; license = licenses.lgpl21Plus; maintainers = teams.sage.members; diff --git a/third_party/nixpkgs/pkgs/development/libraries/flint/default.nix b/third_party/nixpkgs/pkgs/development/libraries/flint/default.nix index 4754281670..7f814461f2 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/flint/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/flint/default.nix @@ -41,7 +41,6 @@ stdenv.mkDerivation rec { doCheck = true; meta = { - inherit version; description = "Fast Library for Number Theory"; license = lib.licenses.gpl2Plus; maintainers = lib.teams.sage.members; diff --git a/third_party/nixpkgs/pkgs/development/libraries/fox/fox-1.6.nix b/third_party/nixpkgs/pkgs/development/libraries/fox/fox-1.6.nix index 50f9e688cb..028ab6a753 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/fox/fox-1.6.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/fox/fox-1.6.nix @@ -2,13 +2,9 @@ , libXrandr, libGLU, libGL, libXft, libXfixes, xinput , CoreServices }: -let - version = "1.6.57"; -in - stdenv.mkDerivation rec { pname = "fox"; - inherit version; + version = "1.6.57"; src = fetchurl { url = "ftp://ftp.fox-toolkit.org/pub/${pname}-${version}.tar.gz"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/fplll/20160331.nix b/third_party/nixpkgs/pkgs/development/libraries/fplll/20160331.nix index 374aec5904..6bb9570d99 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/fplll/20160331.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/fplll/20160331.nix @@ -13,7 +13,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [autoconf automake libtool gettext autoreconfHook]; buildInputs = [gmp mpfr]; meta = { - inherit version; description = "Lattice algorithms using floating-point arithmetic"; license = lib.licenses.lgpl21Plus; maintainers = [lib.maintainers.raskin]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/freeglut/default.nix b/third_party/nixpkgs/pkgs/development/libraries/freeglut/default.nix index 83e3eebdcc..ecdc1c19ff 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/freeglut/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/freeglut/default.nix @@ -1,9 +1,8 @@ { lib, stdenv, fetchurl, libXi, libXrandr, libXxf86vm, libGL, libGLU, xlibsWrapper, cmake }: -let version = "3.2.1"; -in stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "freeglut"; - inherit version; + version = "3.2.1"; src = fetchurl { url = "mirror://sourceforge/freeglut/freeglut-${version}.tar.gz"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/freenect/default.nix b/third_party/nixpkgs/pkgs/development/libraries/freenect/default.nix index e13302319a..0e96a346f4 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/freenect/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/freenect/default.nix @@ -20,7 +20,6 @@ stdenv.mkDerivation rec { meta = { description = "Drivers and libraries for the Xbox Kinect device on Windows, Linux, and macOS"; - inherit version; homepage = "http://openkinect.org"; license = with lib.licenses; [ gpl2 asl20 ]; maintainers = with lib.maintainers; [ bennofs ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/givaro/3.7.nix b/third_party/nixpkgs/pkgs/development/libraries/givaro/3.7.nix index dfd6b6b476..a9b6325c3d 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/givaro/3.7.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/givaro/3.7.nix @@ -9,7 +9,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook ]; buildInputs = [autoconf automake libtool gmpxx]; meta = { - inherit version; description = "A C++ library for arithmetic and algebraic computations"; license = lib.licenses.cecill-b; maintainers = [lib.maintainers.raskin]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/givaro/3.nix b/third_party/nixpkgs/pkgs/development/libraries/givaro/3.nix index 9d216b9d8e..1bfe7682ff 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/givaro/3.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/givaro/3.nix @@ -9,7 +9,6 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ autoreconfHook ]; buildInputs = [autoconf automake libtool gmpxx]; meta = { - inherit version; description = "A C++ library for arithmetic and algebraic computations"; license = lib.licenses.cecill-b; maintainers = [lib.maintainers.raskin]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/givaro/default.nix b/third_party/nixpkgs/pkgs/development/libraries/givaro/default.nix index f6d6ddab4d..29674118df 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/givaro/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/givaro/default.nix @@ -36,7 +36,6 @@ stdenv.mkDerivation rec { doCheck = false; meta = { - inherit version; description = "A C++ library for arithmetic and algebraic computations"; license = lib.licenses.cecill-b; maintainers = [lib.maintainers.raskin]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/globalarrays/default.nix b/third_party/nixpkgs/pkgs/development/libraries/globalarrays/default.nix index 1f70946cbc..8b01f9f681 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/globalarrays/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/globalarrays/default.nix @@ -2,12 +2,9 @@ , blas, gfortran, openssh, mpi } : -let - version = "5.8"; - -in stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "globalarrays"; - inherit version; + version = "5.8"; src = fetchFromGitHub { owner = "GlobalArrays"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/gloox/default.nix b/third_party/nixpkgs/pkgs/development/libraries/gloox/default.nix index b01d858cfb..82429add26 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/gloox/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/gloox/default.nix @@ -10,12 +10,9 @@ assert idnSupport -> libidn != null; with lib; -let - version = "1.0.24"; -in -stdenv.mkDerivation { +stdenv.mkDerivation rec{ pname = "gloox"; - inherit version; + version = "1.0.24"; src = fetchurl { url = "https://camaya.net/download/gloox-${version}.tar.bz2"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/goocanvas/2.x.nix b/third_party/nixpkgs/pkgs/development/libraries/goocanvas/2.x.nix index c4df9f1f0f..4194064a5a 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/goocanvas/2.x.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/goocanvas/2.x.nix @@ -1,10 +1,8 @@ { lib, stdenv, fetchurl, pkg-config, gettext, gtk-doc, gobject-introspection, python2, gtk3, cairo, glib }: -let - version = "2.0.4"; -in stdenv.mkDerivation rec { +stdenv.mkDerivation rec { pname = "goocanvas"; - inherit version; + version = "2.0.4"; outputs = [ "out" "dev" "devdoc" ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/highfive/default.nix b/third_party/nixpkgs/pkgs/development/libraries/highfive/default.nix index a9db80468e..015147d70b 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/highfive/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/highfive/default.nix @@ -39,7 +39,6 @@ stdenv.mkDerivation rec { ++ (lib.optionals mpiSupport [ "-DHIGHFIVE_PARALLEL_HDF5=ON" ]); meta = with lib; { - inherit version; description = "Header-only C++ HDF5 interface"; license = licenses.boost; homepage = "https://bluebrain.github.io/HighFive/"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/http-parser/default.nix b/third_party/nixpkgs/pkgs/development/libraries/http-parser/default.nix index 9d1d23ede8..36ca0b0ca0 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/http-parser/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/http-parser/default.nix @@ -1,10 +1,8 @@ { lib, stdenv, fetchFromGitHub }: -let - version = "2.9.4"; -in stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "http-parser"; - inherit version; + version = "2.9.4"; src = fetchFromGitHub { owner = "nodejs"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/iml/default.nix b/third_party/nixpkgs/pkgs/development/libraries/iml/default.nix index 09ae213eb5..474605fe76 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/iml/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/iml/default.nix @@ -19,7 +19,6 @@ stdenv.mkDerivation rec { "--with-cblas=-lblas" ]; meta = { - inherit version; description = "Algorithms for computing exact solutions to dense systems of linear equations over the integers"; license = lib.licenses.gpl2Plus; maintainers = [lib.maintainers.raskin]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/java/rhino/default.nix b/third_party/nixpkgs/pkgs/development/libraries/java/rhino/default.nix index bc50f02065..e674252086 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/java/rhino/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/java/rhino/default.nix @@ -1,17 +1,14 @@ { fetchurl, lib, stdenv, unzip, ant, javac, jvm }: let - version = "1.7R2"; - xbeans = fetchurl { url = "http://archive.apache.org/dist/xmlbeans/binaries/xmlbeans-2.2.0.zip"; sha256 = "1pb08d9j81d0wz5wj31idz198iwhqb7mch872n08jh1354rjlqwk"; }; in - -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "rhino"; - inherit version; + version = "1.7R2"; src = fetchurl { url = "mirror://mozilla/js/rhino1_7R2.zip"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/jsoncpp/default.nix b/third_party/nixpkgs/pkgs/development/libraries/jsoncpp/default.nix index f41bf0f0c8..6c162c381a 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/jsoncpp/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/jsoncpp/default.nix @@ -48,7 +48,6 @@ stdenv.mkDerivation rec { ]; meta = with lib; { - inherit version; homepage = "https://github.com/open-source-parsers/jsoncpp"; description = "A C++ library for interacting with JSON"; maintainers = with maintainers; [ ttuegel cpages ]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/kdsoap/default.nix b/third_party/nixpkgs/pkgs/development/libraries/kdsoap/default.nix index 93aa169737..a4dd9cbaa4 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/kdsoap/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/kdsoap/default.nix @@ -3,13 +3,9 @@ , qtbase }: -let - version = "1.10.0"; -in - -mkDerivation { +mkDerivation rec { pname = "kdsoap"; - inherit version; + version = "1.10.0"; meta = { description = "A Qt-based client-side and server-side SOAP component"; longDescription = '' diff --git a/third_party/nixpkgs/pkgs/development/libraries/libb64/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libb64/default.nix index 41d07d58cb..d1f942a349 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libb64/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libb64/default.nix @@ -19,7 +19,6 @@ stdenv.mkDerivation rec { ''; meta = { - inherit version; description = "ANSI C routines for fast base64 encoding/decoding"; license = lib.licenses.publicDomain; platforms = lib.platforms.unix; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libbladeRF/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libbladeRF/default.nix index f9bac3835d..e8b550e06c 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libbladeRF/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libbladeRF/default.nix @@ -1,6 +1,5 @@ { stdenv, lib, fetchFromGitHub, fetchpatch, pkg-config, cmake, git, doxygen, help2man, ncurses, tecla , libusb1, udev }: - let # fetch submodule noos = fetchFromGitHub { @@ -9,12 +8,9 @@ let rev = "0bba46e6f6f75785a65d425ece37d0a04daf6157"; sha256 = "0is79dhsyp9xmlnfdr1i5s1c22ipjafk9d35jpn5dynpvj86m99c"; }; - - version = "2.2.1"; - -in stdenv.mkDerivation { +in stdenv.mkDerivation rec { pname = "libbladeRF"; - inherit version; + version = "2.2.1"; src = fetchFromGitHub { owner = "Nuand"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libcec/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libcec/default.nix index cb494f69fd..b0de959234 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libcec/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libcec/default.nix @@ -1,10 +1,8 @@ { lib, stdenv, fetchurl, cmake, pkg-config, udev, libcec_platform, libraspberrypi ? null }: -let version = "6.0.2"; in - -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "libcec"; - inherit version; + version = "6.0.2"; src = fetchurl { url = "https://github.com/Pulse-Eight/libcec/archive/libcec-${version}.tar.gz"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libcec/platform.nix b/third_party/nixpkgs/pkgs/development/libraries/libcec/platform.nix index 61eccf1f40..45c34b53cd 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libcec/platform.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libcec/platform.nix @@ -1,10 +1,8 @@ { lib, stdenv, fetchurl, cmake }: -let version = "2.1.0.1"; in - -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "p8-platform"; - inherit version; + version = "2.1.0.1"; src = fetchurl { url = "https://github.com/Pulse-Eight/platform/archive/p8-platform-${version}.tar.gz"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libdynd/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libdynd/default.nix index 4f1fd3904d..b418279e47 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libdynd/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libdynd/default.nix @@ -1,9 +1,8 @@ { lib, stdenv, fetchFromGitHub, cmake }: -let version = "0.7.2"; in -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "libdynd"; - inherit version; + version = "0.7.2"; src = fetchFromGitHub { owner = "libdynd"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libewf/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libewf/default.nix index 01c10dab60..5d86dd1224 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libewf/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libewf/default.nix @@ -18,6 +18,5 @@ stdenv.mkDerivation rec { license = lib.licenses.lgpl3; maintainers = [ lib.maintainers.raskin ] ; platforms = lib.platforms.unix; - inherit version; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/libixp-hg/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libixp-hg/default.nix index 77df340a55..0aeef61dae 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libixp-hg/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libixp-hg/default.nix @@ -22,7 +22,6 @@ stdenv.mkDerivation rec { description = "Portable, simple C-language 9P client and server libary"; maintainers = with lib.maintainers; [ kovirobi ]; license = lib.licenses.mit; - inherit version; platforms = with lib.platforms; unix; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/libjson/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libjson/default.nix index 16a69f6da6..9106c19747 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libjson/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libjson/default.nix @@ -1,9 +1,8 @@ { lib, stdenv, fetchurl, unzip }: -let - version = "7.6.1"; -in stdenv.mkDerivation { + +stdenv.mkDerivation rec { pname = "libjson"; - inherit version; + version = "7.6.1"; src = fetchurl { url = "mirror://sourceforge/libjson/libjson_${version}.zip"; sha256 = "0xkk5qc7kjcdwz9l04kmiz1nhmi7iszl3k165phf53h3a4wpl9h7"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libmodplug/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libmodplug/default.nix index 790674f164..3f4f89c0a2 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libmodplug/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libmodplug/default.nix @@ -1,10 +1,8 @@ { lib, stdenv, fetchurl, file }: -let - version = "0.8.9.0"; -in stdenv.mkDerivation rec { +stdenv.mkDerivation rec { pname = "libmodplug"; - inherit version; + version = "0.8.9.0"; preConfigure = '' substituteInPlace configure \ diff --git a/third_party/nixpkgs/pkgs/development/libraries/libmpc/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libmpc/default.nix index bd28f490ec..2dede1f976 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libmpc/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libmpc/default.nix @@ -7,12 +7,9 @@ # cgit) that are needed here should be included directly in Nixpkgs as # files. -let - version = "1.2.1"; -in -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "libmpc"; - inherit version; # to avoid clash with the MPD client + version = "1.2.1"; # to avoid clash with the MPD client src = fetchurl { url = "mirror://gnu/mpc/mpc-${version}.tar.gz"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libofa/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libofa/default.nix index c78aa3f617..a64afbb930 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libofa/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libofa/default.nix @@ -1,12 +1,9 @@ { lib, stdenv, fetchurl, expat, curl, fftw }: -let - version = "0.9.3"; - deb_patch = "5"; -in stdenv.mkDerivation rec { pname = "libofa"; - inherit version; + version = "0.9.3"; + deb_patch = "5"; src = fetchurl { url = "https://storage.googleapis.com/google-code-archive-downloads/v2/code.google.com/musicip-libofa/${pname}-${version}.tar.gz"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libopus/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libopus/default.nix index 8172bd38e1..6776f5ae39 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libopus/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libopus/default.nix @@ -1,12 +1,9 @@ { lib, stdenv, fetchurl , fixedPoint ? false, withCustomModes ? true }: -let - version = "1.3.1"; -in -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "libopus"; - inherit version; + version = "1.3.1"; src = fetchurl { url = "https://archive.mozilla.org/pub/opus/opus-${version}.tar.gz"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libopusenc/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libopusenc/default.nix index c2d77185e6..3cb14a2ea9 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libopusenc/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libopusenc/default.nix @@ -1,11 +1,8 @@ { lib, stdenv, fetchurl, pkg-config, libopus }: -let - version = "0.2.1"; -in -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "libopusenc"; - inherit version; + version = "0.2.1"; src = fetchurl { url = "https://archive.mozilla.org/pub/opus/libopusenc-${version}.tar.gz"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libossp-uuid/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libossp-uuid/default.nix index 824dac3a2f..a283df1bba 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libossp-uuid/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libossp-uuid/default.nix @@ -1,10 +1,8 @@ {lib, stdenv, fetchurl}: -let version = "1.6.2"; in - -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "libossp-uuid"; - inherit version; + version = "1.6.2"; src = fetchurl { url = "ftp://ftp.ossp.org/pkg/lib/uuid/uuid-${version}.tar.gz"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libpar2/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libpar2/default.nix index 625e780d19..0130af6645 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libpar2/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libpar2/default.nix @@ -1,10 +1,8 @@ { lib, stdenv, fetchurl, pkg-config, libsigcxx }: -let version = "0.4"; in - stdenv.mkDerivation rec { pname = "libpar2"; - inherit version; + version = "0.4"; src = fetchurl { url = "https://launchpad.net/libpar2/trunk/${version}/+download/${pname}-${version}.tar.gz"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libre/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libre/default.nix index e960fe8f4b..7c91950a4c 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libre/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libre/default.nix @@ -17,7 +17,6 @@ stdenv.mkDerivation rec { platforms = with lib.platforms; linux; maintainers = with lib.maintainers; [raskin]; license = lib.licenses.bsd3; - inherit version; downloadPage = "http://www.creytiv.com/pub/"; updateWalker = true; downloadURLRegexp = "/re-.*[.]tar[.].*"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libspatialindex/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libspatialindex/default.nix index 4c778fbd69..2081650f90 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libspatialindex/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libspatialindex/default.nix @@ -1,10 +1,8 @@ { lib, stdenv, fetchurl }: -let version = "1.8.5"; in - -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "libspatialindex"; - inherit version; + version = "1.8.5"; src = fetchurl { url = "https://download.osgeo.org/libspatialindex/spatialindex-src-${version}.tar.gz"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libxc/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libxc/default.nix index 95ce240622..0680e4b832 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libxc/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libxc/default.nix @@ -1,11 +1,8 @@ { lib, stdenv, fetchFromGitLab, cmake, gfortran, perl }: -let - version = "5.1.5"; - -in stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "libxc"; - inherit version; + version = "5.1.5"; src = fetchFromGitLab { owner = "libxc"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libxklavier/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libxklavier/default.nix index 60b52152f6..acf82886d4 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libxklavier/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libxklavier/default.nix @@ -1,12 +1,9 @@ { lib, stdenv, fetchgit, autoreconfHook, pkg-config, gtk-doc, xkeyboard_config, libxml2, xorg, docbook_xsl , glib, isocodes, gobject-introspection }: -let - version = "5.4"; -in stdenv.mkDerivation rec { pname = "libxklavier"; - inherit version; + version = "5.4"; src = fetchgit { url = "git://anongit.freedesktop.org/git/libxklavier"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libxsmm/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libxsmm/default.nix index a2b4800ec4..21052df863 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libxsmm/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libxsmm/default.nix @@ -4,11 +4,9 @@ , enableStatic ? stdenv.hostPlatform.isStatic }: -let - version = "1.16.1"; -in stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "libxsmm"; - inherit version; + version = "1.16.1"; src = fetchFromGitHub { owner = "hfp"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/libzmf/default.nix b/third_party/nixpkgs/pkgs/development/libraries/libzmf/default.nix index f71b6d0c0b..7965c934df 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/libzmf/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/libzmf/default.nix @@ -14,7 +14,6 @@ stdenv.mkDerivation rec { configureFlags = [ "--disable-werror" ]; meta = { - inherit version; description = "A library that parses the file format of Zoner Callisto/Draw documents"; license = lib.licenses.mpl20; maintainers = [lib.maintainers.raskin]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/linbox/default.nix b/third_party/nixpkgs/pkgs/development/libraries/linbox/default.nix index 8a21bd3bcd..821edd3336 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/linbox/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/linbox/default.nix @@ -71,7 +71,6 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with lib; { - inherit version; description = "C++ library for exact, high-performance linear algebra"; license = licenses.lgpl21Plus; maintainers = teams.sage.members; diff --git a/third_party/nixpkgs/pkgs/development/libraries/mdds/default.nix b/third_party/nixpkgs/pkgs/development/libraries/mdds/default.nix index 0fc7496329..89fbdd9f21 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/mdds/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/mdds/default.nix @@ -19,7 +19,6 @@ stdenv.mkDerivation rec { checkInputs = [ boost ]; meta = with lib; { - inherit version; homepage = "https://gitlab.com/mdds/mdds"; description = "A collection of multi-dimensional data structure and indexing algorithm"; platforms = platforms.all; diff --git a/third_party/nixpkgs/pkgs/development/libraries/mpfi/default.nix b/third_party/nixpkgs/pkgs/development/libraries/mpfi/default.nix index 5ff0dcd29e..152c35e6e6 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/mpfi/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/mpfi/default.nix @@ -16,7 +16,6 @@ stdenv.mkDerivation rec { buildInputs = [ mpfr ]; meta = { - inherit version; description = "A multiple precision interval arithmetic library based on MPFR"; homepage = "https://gforge.inria.fr/projects/mpfi/"; license = lib.licenses.lgpl21Plus; diff --git a/third_party/nixpkgs/pkgs/development/libraries/mpir/default.nix b/third_party/nixpkgs/pkgs/development/libraries/mpir/default.nix index 36505b4a66..b8ee4fb4e7 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/mpir/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/mpir/default.nix @@ -15,7 +15,6 @@ stdenv.mkDerivation rec { ++ lib.optionals stdenv.isLinux [ "--enable-fat" ]; meta = { - inherit version; description = "A highly optimised library for bignum arithmetic forked from GMP"; license = lib.licenses.lgpl3Plus; maintainers = [lib.maintainers.raskin]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/nanopb/test-message-with-annotations/default.nix b/third_party/nixpkgs/pkgs/development/libraries/nanopb/test-message-with-annotations/default.nix index 618d7c521c..cda58608d6 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/nanopb/test-message-with-annotations/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/nanopb/test-message-with-annotations/default.nix @@ -16,8 +16,8 @@ stdenv.mkDerivation { ${protobuf}/bin/protoc --proto_path=. --proto_path=${nanopb}/share/nanopb/generator/proto --plugin=protoc-gen-nanopb=${nanopb}/bin/protoc-gen-nanopb --nanopb_out=$out withannotations.proto ''; - docheck = true; - checkphase = '' + doCheck = true; + checkPhase = '' grep -q WithAnnotations $out/withannotations.pb.c || (echo "error: WithAnnotations not found in $out/withannotations.pb.c"; exit 1) grep -q WithAnnotations $out/withannotations.pb.h || (echo "error: WithAnnotations not found in $out/withannotations.pb.h"; exit 1) grep -q "pb_byte_t uuid\[16\]" $out/withannotations.pb.h || (echo "error: uuid is not of type pb_byte_t and of size 16 in $out/withannotations.pb.h"; exit 1) diff --git a/third_party/nixpkgs/pkgs/development/libraries/nanopb/test-message-with-options/default.nix b/third_party/nixpkgs/pkgs/development/libraries/nanopb/test-message-with-options/default.nix index c15b51f719..352ae80150 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/nanopb/test-message-with-options/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/nanopb/test-message-with-options/default.nix @@ -16,8 +16,8 @@ stdenv.mkDerivation { ${protobuf}/bin/protoc --plugin=protoc-gen-nanopb=${nanopb}/bin/protoc-gen-nanopb --nanopb_out=$out withoptions.proto ''; - docheck = true; - checkphase = '' + doCheck = true; + checkPhase = '' grep -q WithOptions $out/withoptions.pb.c || (echo "error: WithOptions not found in $out/withoptions.pb.c"; exit 1) grep -q WithOptions $out/withoptions.pb.h || (echo "error: WithOptions not found in $out/withoptions.pb.h"; exit 1) grep -q "pb_byte_t uuid\[16\]" $out/withoptions.pb.h || (echo "error: uuid is not of type pb_byte_t and of size 16 in $out/withoptions.pb.h"; exit 1) diff --git a/third_party/nixpkgs/pkgs/development/libraries/ndpi/default.nix b/third_party/nixpkgs/pkgs/development/libraries/ndpi/default.nix index c3df23052e..4048f28e5d 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/ndpi/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/ndpi/default.nix @@ -1,11 +1,9 @@ { lib, stdenv, fetchFromGitHub, which, autoconf, automake, libtool, libpcap , pkg-config }: -let version = "3.4"; in - -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "ndpi"; - inherit version; + version = "3.4"; src = fetchFromGitHub { owner = "ntop"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/nix-plugins/default.nix b/third_party/nixpkgs/pkgs/development/libraries/nix-plugins/default.nix index 915e733473..a4c18e9f04 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/nix-plugins/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/nix-plugins/default.nix @@ -1,8 +1,8 @@ { lib, stdenv, fetchFromGitHub, nix, cmake, pkg-config, boost }: -let version = "6.0.0"; in -stdenv.mkDerivation { + +stdenv.mkDerivation rec { pname = "nix-plugins"; - inherit version; + version = "6.0.0"; src = fetchFromGitHub { owner = "shlevy"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/nss/3.53.nix b/third_party/nixpkgs/pkgs/development/libraries/nss/3.53.nix index 9f281743f6..5d44a4d246 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/nss/3.53.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/nss/3.53.nix @@ -9,15 +9,12 @@ let url = "http://dev.gentoo.org/~polynomial-c/mozilla/nss-3.15.4-pem-support-20140109.patch.xz"; sha256 = "10ibz6y0hknac15zr6dw4gv9nb5r5z9ym6gq18j3xqx7v7n3vpdw"; }; - version = "3.53.1"; - underscoreVersion = builtins.replaceStrings ["."] ["_"] version; - in stdenv.mkDerivation rec { pname = "nss"; - inherit version; + version = "3.53.1"; src = fetchurl { - url = "mirror://mozilla/security/nss/releases/NSS_${underscoreVersion}_RTM/src/${pname}-${version}.tar.gz"; + url = "mirror://mozilla/security/nss/releases/NSS_${lib.replaceStrings ["."] ["_"] version}_RTM/src/${pname}-${version}.tar.gz"; sha256 = "05jk65x3zy6q8lx2djj8ik7kg741n88iy4n3bblw89cv0xkxxk1d"; }; diff --git a/third_party/nixpkgs/pkgs/development/libraries/ntrack/default.nix b/third_party/nixpkgs/pkgs/development/libraries/ntrack/default.nix index cb9f9ff575..eef6bbdd58 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/ntrack/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/ntrack/default.nix @@ -1,12 +1,8 @@ { lib, stdenv, fetchurl, qt4, pkg-config, libnl, python }: -let - version = "016"; -in - stdenv.mkDerivation rec { pname = "ntrack"; - inherit version; + version = "016"; src = fetchurl { url = "https://launchpad.net/ntrack/main/${version}/+download/${pname}-${version}.tar.gz"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/opencore-amr/default.nix b/third_party/nixpkgs/pkgs/development/libraries/opencore-amr/default.nix index d1348d96e3..26b2715658 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/opencore-amr/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/opencore-amr/default.nix @@ -1,11 +1,8 @@ { lib, stdenv, fetchurl }: -let - version = "0.1.5"; -in -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "opencore-amr"; - inherit version; + version = "0.1.5"; src = fetchurl { url = "https://vorboss.dl.sourceforge.net/project/opencore-amr/opencore-amr/opencore-amr-${version}.tar.gz"; sha256 = "0hfk9khz3by0119h3jdwgdfd7jgkdbzxnmh1wssvylgnsnwnq01c"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/openwsman/default.nix b/third_party/nixpkgs/pkgs/development/libraries/openwsman/default.nix index 05f1ef65a3..9276ccac6f 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/openwsman/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/openwsman/default.nix @@ -35,6 +35,5 @@ stdenv.mkDerivation rec { license = licenses.bsd3; maintainers = with maintainers; [ deepfire ]; platforms = platforms.linux; # PAM is not available on Darwin - inherit version; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/osip/default.nix b/third_party/nixpkgs/pkgs/development/libraries/osip/default.nix index b7cfc5da9d..b0603cc454 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/osip/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/osip/default.nix @@ -13,6 +13,5 @@ stdenv.mkDerivation rec { description = "The GNU oSIP library, an implementation of the Session Initiation Protocol (SIP)"; maintainers = with lib.maintainers; [ raskin ]; platforms = lib.platforms.all; - inherit version; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/phash/default.nix b/third_party/nixpkgs/pkgs/development/libraries/phash/default.nix index 250089c30b..8d3f3e9870 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/phash/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/phash/default.nix @@ -25,7 +25,6 @@ stdenv.mkDerivation rec { }; meta = with lib; { - inherit version; description = "Compute the perceptual hash of an image"; license = licenses.gpl3; maintainers = [maintainers.imalsogreg]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/pmix/default.nix b/third_party/nixpkgs/pkgs/development/libraries/pmix/default.nix index b7adc3d2a4..7791973bb1 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/pmix/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/pmix/default.nix @@ -2,12 +2,9 @@ , libtool, flex, libevent, hwloc, munge, zlib, pandoc } : -let - version = "3.2.3"; - -in stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "pmix"; - inherit version; + version = "3.2.3"; src = fetchFromGitHub { repo = "openpmix"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/safefile/default.nix b/third_party/nixpkgs/pkgs/development/libraries/safefile/default.nix index 293a13dbdd..2865ab0631 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/safefile/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/safefile/default.nix @@ -17,7 +17,6 @@ stdenv.mkDerivation rec { }; meta = { - inherit version; description = "File open routines to safely open a file when in the presence of an attack"; license = lib.licenses.asl20 ; maintainers = [lib.maintainers.raskin]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/sblim-sfcc/default.nix b/third_party/nixpkgs/pkgs/development/libraries/sblim-sfcc/default.nix index c871f18e69..351eb5c154 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/sblim-sfcc/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/sblim-sfcc/default.nix @@ -23,6 +23,5 @@ stdenv.mkDerivation rec { license = licenses.cpl10; maintainers = with maintainers; [ deepfire ]; platforms = platforms.unix; - inherit version; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/math/liblapack/default.nix b/third_party/nixpkgs/pkgs/development/libraries/science/math/liblapack/default.nix index 66f343d491..79e494a053 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/science/math/liblapack/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/science/math/liblapack/default.nix @@ -7,12 +7,11 @@ }: let inherit (lib) optional; - version = "3.9.1"; in stdenv.mkDerivation rec { pname = "liblapack"; - inherit version; + version = "3.9.1"; src = fetchFromGitHub { owner = "Reference-LAPACK"; @@ -57,7 +56,6 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - inherit version; description = "Linear Algebra PACKage"; homepage = "http://www.netlib.org/lapack/"; license = licenses.bsd3; diff --git a/third_party/nixpkgs/pkgs/development/libraries/science/math/lrs/default.nix b/third_party/nixpkgs/pkgs/development/libraries/science/math/lrs/default.nix index f7f981e223..063fead116 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/science/math/lrs/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/science/math/lrs/default.nix @@ -16,7 +16,6 @@ stdenv.mkDerivation rec { ''; meta = { - inherit version; description = "Implementation of the reverse search algorithm for vertex enumeration/convex hull problems"; license = lib.licenses.gpl2 ; maintainers = [lib.maintainers.raskin]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/sfml/default.nix b/third_party/nixpkgs/pkgs/development/libraries/sfml/default.nix index c9a326afa7..7ed5070ebb 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/sfml/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/sfml/default.nix @@ -3,13 +3,9 @@ , IOKit, Foundation, AppKit, OpenAL }: -let - version = "2.5.1"; -in - -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "sfml"; - inherit version; + version = "2.5.1"; src = fetchzip { url = "https://github.com/SFML/SFML/archive/${version}.tar.gz"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/spandsp/default.nix b/third_party/nixpkgs/pkgs/development/libraries/spandsp/default.nix index 85a3059f27..240c865343 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/spandsp/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/spandsp/default.nix @@ -17,7 +17,6 @@ stdenv.mkDerivation rec { maintainers = with lib.maintainers; [raskin]; license = lib.licenses.gpl2; downloadPage = "http://www.soft-switch.org/downloads/spandsp/"; - inherit version; updateWalker = true; }; } diff --git a/third_party/nixpkgs/pkgs/development/libraries/startup-notification/default.nix b/third_party/nixpkgs/pkgs/development/libraries/startup-notification/default.nix index f334bb2f35..cef23779c7 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/startup-notification/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/startup-notification/default.nix @@ -1,11 +1,8 @@ {lib, stdenv, fetchurl, libX11, libxcb, pkg-config, xcbutil}: -let - version = "0.12"; -in -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "libstartup-notification"; - inherit version; + version = "0.12"; src = fetchurl { url = "https://www.freedesktop.org/software/startup-notification/releases/startup-notification-${version}.tar.gz"; sha256 = "3c391f7e930c583095045cd2d10eb73a64f085c7fde9d260f2652c7cb3cfbe4a"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/tachyon/default.nix b/third_party/nixpkgs/pkgs/development/libraries/tachyon/default.nix index 5994aeb0a5..fa6ca01418 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/tachyon/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/tachyon/default.nix @@ -72,7 +72,6 @@ stdenv.mkDerivation rec { cp -r scenes "$out/share/tachyon/scenes" ''; meta = { - inherit version; description = "A Parallel / Multiprocessor Ray Tracing System"; license = lib.licenses.bsd3; maintainers = [lib.maintainers.raskin]; diff --git a/third_party/nixpkgs/pkgs/development/libraries/uthash/default.nix b/third_party/nixpkgs/pkgs/development/libraries/uthash/default.nix index 7ddae062f7..97c6d10191 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/uthash/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/uthash/default.nix @@ -1,11 +1,8 @@ { lib, stdenv, fetchurl, perl }: -let - version = "2.1.0"; -in -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "uthash"; - inherit version; + version = "2.1.0"; src = fetchurl { url = "https://github.com/troydhanson/uthash/archive/v${version}.tar.gz"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/volume-key/default.nix b/third_party/nixpkgs/pkgs/development/libraries/volume-key/default.nix index 567a5e3e25..ce2f7c20d3 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/volume-key/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/volume-key/default.nix @@ -4,11 +4,9 @@ , buildPackages }: -let - version = "0.3.11"; -in stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "volume_key"; - inherit version; + version = "0.3.11"; src = fetchgit { url = "https://pagure.io/volume_key.git"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/wxwidgets/2.9/default.nix b/third_party/nixpkgs/pkgs/development/libraries/wxwidgets/2.9/default.nix index 77e0e20eaf..5674f076be 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/wxwidgets/2.9/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/wxwidgets/2.9/default.nix @@ -11,12 +11,9 @@ assert withMesa -> libGLU != null && libGL != null; with lib; -let - version = "2.9.4"; -in -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "wxwidgets"; - inherit version; + version = "2.9.4"; src = fetchurl { url = "mirror://sourceforge/wxwindows/wxWidgets-${version}.tar.bz2"; diff --git a/third_party/nixpkgs/pkgs/development/libraries/xmlsec/default.nix b/third_party/nixpkgs/pkgs/development/libraries/xmlsec/default.nix index 8bf9876095..71a1076466 100644 --- a/third_party/nixpkgs/pkgs/development/libraries/xmlsec/default.nix +++ b/third_party/nixpkgs/pkgs/development/libraries/xmlsec/default.nix @@ -4,12 +4,9 @@ , openssl, nss_3_53, lib, runCommandCC, writeText }: lib.fix (self: -let - version = "1.2.31"; -in -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "xmlsec"; - inherit version; + version = "1.2.31"; src = fetchurl { url = "https://www.aleksey.com/xmlsec/download/xmlsec1-${version}.tar.gz"; diff --git a/third_party/nixpkgs/pkgs/development/node-packages/default.nix b/third_party/nixpkgs/pkgs/development/node-packages/default.nix index daa97bfddd..498f41bc1b 100644 --- a/third_party/nixpkgs/pkgs/development/node-packages/default.nix +++ b/third_party/nixpkgs/pkgs/development/node-packages/default.nix @@ -1,4 +1,4 @@ -{ pkgs, nodejs, stdenv, fetchFromGitHub }: +{ pkgs, nodejs, stdenv, applyPatches, fetchFromGitHub, fetchpatch }: let since = (version: pkgs.lib.versionAtLeast nodejs.version version); @@ -14,6 +14,17 @@ let ''; }; + autoprefixer = super.autoprefixer.override { + nativeBuildInputs = [ pkgs.makeWrapper ]; + postInstall = '' + wrapProgram "$out/bin/autoprefixer" \ + --prefix NODE_PATH : ${self.postcss}/lib/node_modules + ''; + passthru.tests = { + simple-execution = pkgs.callPackage ./package-tests/autoprefixer.nix { inherit (self) autoprefixer; }; + }; + }; + aws-azure-login = super.aws-azure-login.override { meta.platforms = pkgs.lib.platforms.linux; nativeBuildInputs = [ pkgs.makeWrapper ]; @@ -191,6 +202,31 @@ let node2nix = super.node2nix.override { buildInputs = [ pkgs.makeWrapper ]; + # We need to apply a patch to the source, but buildNodePackage doesn't allow patches. + # So we pin the patched commit instead. The commit actually contains two other newer commits + # since the last (1.9.0) release, but actually this is a good thing since one of them is a + # Hydra-specific fix. + src = applyPatches { + src = fetchFromGitHub { + owner = "svanderburg"; + repo = "node2nix"; + rev = "node2nix-1.9.0"; + sha256 = "0l4wp1131nhl9c14cn8bwawb8f77h1nfbnswgi5lp5m3kzkb27jn"; + }; + + patches = [ + # remove node_ name prefix + (fetchpatch { + url = "https://github.com/svanderburg/node2nix/commit/b54d45207427ff46e90f16f2f32771fdc8bff5a4.patch"; + sha256 = "03cg2xwryvdlvg299dg91qxicrw2r43grja80an9zkb875ps8jxh"; + }) + # set meta platform + (fetchpatch { + url = "https://github.com/svanderburg/node2nix/commit/58736093161f2d237c17e75a96529b018cd0ac64.patch"; + sha256 = "1c91qfqa6p4hzyafv5pq6rpgnny2805n007b1443gbqwrz5awz6n"; + }) + ]; + }; postInstall = '' wrapProgram "$out/bin/node2nix" --prefix PATH : ${pkgs.lib.makeBinPath [ pkgs.nix ]} ''; @@ -237,8 +273,14 @@ let nativeBuildInputs = [ pkgs.makeWrapper ]; postInstall = '' wrapProgram "$out/bin/postcss" \ - --prefix NODE_PATH : ${self.postcss}/lib/node_modules + --prefix NODE_PATH : ${self.postcss}/lib/node_modules \ + --prefix NODE_PATH : ${self.autoprefixer}/lib/node_modules ''; + passthru.tests = { + simple-execution = pkgs.callPackage ./package-tests/postcss-cli.nix { + inherit (self) postcss-cli; + }; + }; meta.mainProgram = "postcss"; }; diff --git a/third_party/nixpkgs/pkgs/development/node-packages/node-env.nix b/third_party/nixpkgs/pkgs/development/node-packages/node-env.nix index c2b723195b..21089c4d54 100644 --- a/third_party/nixpkgs/pkgs/development/node-packages/node-env.nix +++ b/third_party/nixpkgs/pkgs/development/node-packages/node-env.nix @@ -391,13 +391,14 @@ let , dontStrip ? true , unpackPhase ? "true" , buildPhase ? "true" + , meta ? {} , ... }@args: let - extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" "dontStrip" "dontNpmInstall" "preRebuild" "unpackPhase" "buildPhase" ]; + extraArgs = removeAttrs args [ "name" "dependencies" "buildInputs" "dontStrip" "dontNpmInstall" "preRebuild" "unpackPhase" "buildPhase" "meta" ]; in stdenv.mkDerivation ({ - name = "node_${name}-${version}"; + name = "${name}-${version}"; buildInputs = [ tarWrapper python nodejs ] ++ lib.optional (stdenv.isLinux) utillinux ++ lib.optional (stdenv.isDarwin) libtool @@ -446,6 +447,11 @@ let # Run post install hook, if provided runHook postInstall ''; + + meta = { + # default to Node.js' platforms + platforms = nodejs.meta.platforms; + } // meta; } // extraArgs); # Builds a node environment (a node_modules folder and a set of binaries) 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 d8136523f9..f529212b08 100644 --- a/third_party/nixpkgs/pkgs/development/node-packages/node-packages.json +++ b/third_party/nixpkgs/pkgs/development/node-packages/node-packages.json @@ -13,6 +13,7 @@ , "@webassemblyjs/wast-refmt" , "alloy" , "asar" +, "autoprefixer" , "aws-azure-login" , "balanceofsatoshis" , "bash-language-server" 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 8c71d806d0..3abbf3d0ab 100644 --- a/third_party/nixpkgs/pkgs/development/node-packages/node-packages.nix +++ b/third_party/nixpkgs/pkgs/development/node-packages/node-packages.nix @@ -2047,6 +2047,15 @@ let sha512 = "8nmGq/4ycLpIwzvhI4tNDmQztZ8sp+hI7cyG8i1nQDhkAbRzHpXPidRAHlNvCZQpJTKw5ItIpMw9RSToGF00mg=="; }; }; + "@eslint/eslintrc-0.4.3" = { + name = "_at_eslint_slash_eslintrc"; + packageName = "@eslint/eslintrc"; + version = "0.4.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-0.4.3.tgz"; + sha512 = "J6KFFz5QCYUJq3pf0mjEcCJVERbzv71PUIDczuh9JkwGEzced6CO5ADLHB1rbf/+oPBtoPfMYNOpGDzCANlbXw=="; + }; + }; "@exodus/schemasafe-1.0.0-rc.3" = { name = "_at_exodus_slash_schemasafe"; packageName = "@exodus/schemasafe"; @@ -2074,49 +2083,49 @@ let sha512 = "Ydf4LidRB/EBI+YrB+cVLqIseiRfjUI/AeHBgjGMtq3GroraDu81OV7zqophRgupngoL3iS3JUMDMnxO7g39qA=="; }; }; - "@expo/config-5.0.3" = { + "@expo/config-5.0.5" = { name = "_at_expo_slash_config"; packageName = "@expo/config"; - version = "5.0.3"; + version = "5.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/config/-/config-5.0.3.tgz"; - sha512 = "FMv2Jk/v3QZXaNN/mGKqj3wLvsbAa1RjtSTNhJ7QxMiSLl6vlmfMutmKyBiuzk2KDCbELR65JkDf15m4sAZCGg=="; + url = "https://registry.npmjs.org/@expo/config/-/config-5.0.5.tgz"; + sha512 = "r3/Y6mFhOmGqEfhhkUncP6/Qg8Aexg1G66TzDzd97iNezCY2LP9c2hwyN7SwhBv5l1YBNc2zeT556xXe0v4Qgw=="; }; }; - "@expo/config-plugins-3.0.3" = { + "@expo/config-plugins-3.0.5" = { name = "_at_expo_slash_config-plugins"; packageName = "@expo/config-plugins"; - version = "3.0.3"; + version = "3.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/config-plugins/-/config-plugins-3.0.3.tgz"; - sha512 = "+DWHd/2L3O+njVercxGSzcBUXMm5CSzdvIK+7dU+FRhoiF57y2NzBhfNQcReYx/EY1coBrYOsMtENPhV1tWoWQ=="; + url = "https://registry.npmjs.org/@expo/config-plugins/-/config-plugins-3.0.5.tgz"; + sha512 = "hHKr6i201QG16ms93XiXwcI1IhDYhITCRt7hWNO1UPxt2Cm7yDOG2YoGkauP0V/nAN3TEocDYbCrltGFBdoCTg=="; }; }; - "@expo/config-types-41.0.0" = { + "@expo/config-types-42.0.0" = { name = "_at_expo_slash_config-types"; packageName = "@expo/config-types"; - version = "41.0.0"; + version = "42.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/config-types/-/config-types-41.0.0.tgz"; - sha512 = "Ax0pHuY5OQaSrzplOkT9DdpdmNzaVDnq9VySb4Ujq7UJ4U4jriLy8u93W98zunOXpcu0iiKubPsqD6lCiq0pig=="; + url = "https://registry.npmjs.org/@expo/config-types/-/config-types-42.0.0.tgz"; + sha512 = "Rj02OMZke2MrGa/1Y/EScmR7VuWbDEHPJyvfFyyLbadUt+Yv6isCdeFzDt71I7gJlPR9T4fzixeYLrtXXOTq0w=="; }; }; - "@expo/dev-server-0.1.78" = { + "@expo/dev-server-0.1.80" = { name = "_at_expo_slash_dev-server"; packageName = "@expo/dev-server"; - version = "0.1.78"; + version = "0.1.80"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/dev-server/-/dev-server-0.1.78.tgz"; - sha512 = "GfJOvZPW5ezJifsXfxz9Lz7z9+r2UaEUlnsM0wt1EFSfHxDE1w90lkwldJws8D1PsfYxUx2WiV7GJGxi5jqSmw=="; + url = "https://registry.npmjs.org/@expo/dev-server/-/dev-server-0.1.80.tgz"; + sha512 = "+5HaLrd0QM8/CpqDhK9qDghZl1DkdqGz0QnSkPZDexnfZjTrEjPX8aXd0H5mv67W9ev1eUtoiABY6iU0wZ7czg=="; }; }; - "@expo/dev-tools-0.13.108" = { + "@expo/dev-tools-0.13.110" = { name = "_at_expo_slash_dev-tools"; packageName = "@expo/dev-tools"; - version = "0.13.108"; + version = "0.13.110"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/dev-tools/-/dev-tools-0.13.108.tgz"; - sha512 = "qrof+JzotgF2qHcwebeLxT7Qae2dMohdrGr3Lc0gAeaiVXTJmDc9qU+8dYpmszFTMLDMO6QiTXIF+JbCZjgCMg=="; + url = "https://registry.npmjs.org/@expo/dev-tools/-/dev-tools-0.13.110.tgz"; + sha512 = "heG6yXLwN87o0jMn90xstsl5GULNABtDx03/jPS6sy3Yqgf6SiqZpwXCWp+kZgSi+fWFE6TRAsk91eWhLRHjug=="; }; }; "@expo/devcert-1.0.0" = { @@ -2128,49 +2137,49 @@ let sha512 = "cahGyQCmpZmHpn2U04NR9KwsOIZy7Rhsw8Fg4q+A6563lIJxbkrgPnxq/O3NQAh3ohEvOXOOnoFx0b4yycCkpQ=="; }; }; - "@expo/image-utils-0.3.14" = { + "@expo/image-utils-0.3.15" = { name = "_at_expo_slash_image-utils"; packageName = "@expo/image-utils"; - version = "0.3.14"; + version = "0.3.15"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/image-utils/-/image-utils-0.3.14.tgz"; - sha512 = "n+JkLZ71CWuNKLVVsPTzMGRwmbeKiVQw/2b99Ro7znCKzJy3tyE5T2C6WBvYh/5h/hjg8TqEODjXXWucRIzMXA=="; + url = "https://registry.npmjs.org/@expo/image-utils/-/image-utils-0.3.15.tgz"; + sha512 = "uLJMNZ6ux5nBpLxxP1tUtFjpPG6stv0IGEBug6nVZfwQgR/BAsEao+RqZFqrcKhiXw2rIwhKhkspfWU5G6e1dw=="; }; }; - "@expo/json-file-8.2.30" = { + "@expo/json-file-8.2.31" = { name = "_at_expo_slash_json-file"; packageName = "@expo/json-file"; - version = "8.2.30"; + version = "8.2.31"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/json-file/-/json-file-8.2.30.tgz"; - sha512 = "vrgGyPEXBoFI5NY70IegusCSoSVIFV3T3ry4tjJg1MFQKTUlR7E0r+8g8XR6qC705rc2PawaZQjqXMAVtV6s2A=="; + url = "https://registry.npmjs.org/@expo/json-file/-/json-file-8.2.31.tgz"; + sha512 = "GvbL1tQnM3kGOM9hG+lwGbPJ/1tX+Sb8ZkqRrJlRpWGRa4DwnpLvIZHlWMb1ug/ye1QC7+RK/KwRZ7xcAXergA=="; }; }; - "@expo/metro-config-0.1.78" = { + "@expo/metro-config-0.1.80" = { name = "_at_expo_slash_metro-config"; packageName = "@expo/metro-config"; - version = "0.1.78"; + version = "0.1.80"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/metro-config/-/metro-config-0.1.78.tgz"; - sha512 = "DupLWdi1YaZoqMlF/jGca8COeaIMfs4LWHwAfgLKhMfZN7VXXg97njvmx/wg5S70n8vRu2XQmbNryKuD97jEFA=="; + url = "https://registry.npmjs.org/@expo/metro-config/-/metro-config-0.1.80.tgz"; + sha512 = "A2jFV4XWNaT/LR7oKkLMFbCNTpI7JWCbns1mmhjA3zKf8k03Kj2mLEoJMI17JtLtz0WuH9hvqr5OuaK7jlmegQ=="; }; }; - "@expo/osascript-2.0.28" = { + "@expo/osascript-2.0.29" = { name = "_at_expo_slash_osascript"; packageName = "@expo/osascript"; - version = "2.0.28"; + version = "2.0.29"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/osascript/-/osascript-2.0.28.tgz"; - sha512 = "+0R/+DK/kTjFmkFShPlwowO3Ro0X0nQ3F7uRaOsXomZVjvrjSaOQOlFYRDr0Ci3pbEWS8MGUhlC7GXlba4VsTw=="; + url = "https://registry.npmjs.org/@expo/osascript/-/osascript-2.0.29.tgz"; + sha512 = "R0DtZY0NOGCwd+JHS/OO6I/Jkg7acpHAqFFDuwCPfEPgL9HJPr1fKc1rTuMYE7+der5/Pe1EXlo1/c3GFYlHxw=="; }; }; - "@expo/package-manager-0.0.43" = { + "@expo/package-manager-0.0.44" = { name = "_at_expo_slash_package-manager"; packageName = "@expo/package-manager"; - version = "0.0.43"; + version = "0.0.44"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/package-manager/-/package-manager-0.0.43.tgz"; - sha512 = "Keguxd7fH1JbFd/4fU3PuN3h4usZ3NyRFXgi7ZjAYul8uKt+/XB2HBvliukdThGJKhypMeVWcNYWuLCUm74B1Q=="; + url = "https://registry.npmjs.org/@expo/package-manager/-/package-manager-0.0.44.tgz"; + sha512 = "Yw8gHc1+kt64VXcUtrZ3w6ljy7Xxb5P0YY5acZiAaW6cdeOYtkeCtYcKrCAWlQaGdg8mYOWtfPEF1Ydy8IOjpg=="; }; }; "@expo/plist-0.0.13" = { @@ -2182,13 +2191,13 @@ let sha512 = "zGPSq9OrCn7lWvwLLHLpHUUq2E40KptUFXn53xyZXPViI0k9lbApcR9KlonQZ95C+ELsf0BQ3gRficwK92Ivcw=="; }; }; - "@expo/prebuild-config-2.0.3" = { + "@expo/prebuild-config-2.0.5" = { name = "_at_expo_slash_prebuild-config"; packageName = "@expo/prebuild-config"; - version = "2.0.3"; + version = "2.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/prebuild-config/-/prebuild-config-2.0.3.tgz"; - sha512 = "ruZHhdEB0nv7mHwssUFXeYeGQ8Atfeben0CdO461cmjQ/CwxmlusrkFdGfMucj5CocR9WujBr/nIMvfm4FIDIA=="; + url = "https://registry.npmjs.org/@expo/prebuild-config/-/prebuild-config-2.0.5.tgz"; + sha512 = "TTqKtfnavnlNSMKsdAVfR8bNOYQrR2WM6QpyOISgT9Cuu11ykxMbrmFEGazvIIGmYJhh6f9+CVwoqoZbf9hH7Q=="; }; }; "@expo/results-1.0.0" = { @@ -2200,13 +2209,22 @@ let sha512 = "qECzzXX5oJot3m2Gu9pfRDz50USdBieQVwYAzeAtQRUTD3PVeTK1tlRUoDcrK8PSruDLuVYdKkLebX4w/o55VA=="; }; }; - "@expo/schemer-1.3.29" = { + "@expo/schemer-1.3.30" = { name = "_at_expo_slash_schemer"; packageName = "@expo/schemer"; - version = "1.3.29"; + version = "1.3.30"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/schemer/-/schemer-1.3.29.tgz"; - sha512 = "7Ch3c39xZunAo/yv8lj62pc9m5jmKKeyCrz7wKe4p3dETvcvLpqaaxl8ylWm//Nok27D290y1q/pE5i12KA+Pg=="; + url = "https://registry.npmjs.org/@expo/schemer/-/schemer-1.3.30.tgz"; + sha512 = "RYg6eiz2i3ETGlydUejszHoKkj9OaCedp3eVVr3065DY2MYTPoPwyfapU8CBljIJBeKpW9tc/Yvr9ZJbXibkVg=="; + }; + }; + "@expo/sdk-runtime-versions-1.0.0" = { + name = "_at_expo_slash_sdk-runtime-versions"; + packageName = "@expo/sdk-runtime-versions"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@expo/sdk-runtime-versions/-/sdk-runtime-versions-1.0.0.tgz"; + sha512 = "Doz2bfiPndXYFPMRwPyGa1k5QaKDVpY806UJj570epIiMzWaYyCtobasyfC++qfIXVb5Ocy7r3tP9d62hAQ7IQ=="; }; }; "@expo/simple-spinner-1.0.2" = { @@ -2227,13 +2245,13 @@ let sha512 = "LB7jWkqrHo+5fJHNrLAFdimuSXQ2MQ4lA7SQW5bf/HbsXuV2VrT/jN/M8f/KoWt0uJMGN4k/j7Opx4AvOOxSew=="; }; }; - "@expo/webpack-config-0.12.82" = { + "@expo/webpack-config-0.13.1" = { name = "_at_expo_slash_webpack-config"; packageName = "@expo/webpack-config"; - version = "0.12.82"; + version = "0.13.1"; src = fetchurl { - url = "https://registry.npmjs.org/@expo/webpack-config/-/webpack-config-0.12.82.tgz"; - sha512 = "fQ8efRIbPYOF5ZtofXyxkUPwk8J/k0sPUSCXS/a9ZCYBIWiLbFeKpJTDiZCraZ7lzZQIVwllpNi+LjcqpzEjfA=="; + url = "https://registry.npmjs.org/@expo/webpack-config/-/webpack-config-0.13.1.tgz"; + sha512 = "OaTtB5nQp4Vqxx+ORDIn7ROL4yEqQBFYPp3TnPVKi9AxOOxqjatxvcIUreDJlb2r9G+Eeub9dW0DSF6ETtBnGg=="; }; }; "@expo/xcpretty-3.1.4" = { @@ -2713,15 +2731,6 @@ let sha512 = "QD1PhQk+s31P1ixsX0H0Suoupp3VMXzIVMSwobR3F3MSUO2YCV0B7xqLcUw/Bh8yuvd3LhpyqLQWTNcRmp6IdQ=="; }; }; - "@hapi/address-4.1.0" = { - name = "_at_hapi_slash_address"; - packageName = "@hapi/address"; - version = "4.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@hapi/address/-/address-4.1.0.tgz"; - sha512 = "SkszZf13HVgGmChdHo/PxchnSaCJ6cetVqLzyciudzZRT0jcOouIF/Q93mgjw8cce+D+4F4C1Z/WrfFN+O3VHQ=="; - }; - }; "@hapi/bourne-1.3.2" = { name = "_at_hapi_slash_bourne"; packageName = "@hapi/bourne"; @@ -2731,13 +2740,13 @@ let sha512 = "1dVNHT76Uu5N3eJNTYcvxee+jzX4Z9lfciqRRHCU27ihbUcYi+iSc2iml5Ke1LXe1SyJCLA0+14Jh4tXJgOppA=="; }; }; - "@hapi/formula-2.0.0" = { + "@hapi/formula-1.2.0" = { name = "_at_hapi_slash_formula"; packageName = "@hapi/formula"; - version = "2.0.0"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/@hapi/formula/-/formula-2.0.0.tgz"; - sha512 = "V87P8fv7PI0LH7LiVi8Lkf3x+KCO7pQozXRssAHNXXL9L1K+uyu4XypLXwxqVDKgyQai6qj3/KteNlrqDx4W5A=="; + url = "https://registry.npmjs.org/@hapi/formula/-/formula-1.2.0.tgz"; + sha512 = "UFbtbGPjstz0eWHb+ga/GM3Z9EzqKXFWIbSOFURU0A/Gku0Bky4bCk9/h//K2Xr3IrCfjFNhMm4jyZ5dbCewGA=="; }; }; "@hapi/hoek-8.5.1" = { @@ -2767,22 +2776,22 @@ let sha512 = "entf8ZMOK8sc+8YfeOlM8pCfg3b5+WZIKBfUaaJT8UsjAAPjartzxIYm3TIbjvA4u+u++KbcXD38k682nVHDAQ=="; }; }; - "@hapi/joi-17.1.1" = { + "@hapi/joi-16.1.8" = { name = "_at_hapi_slash_joi"; packageName = "@hapi/joi"; - version = "17.1.1"; + version = "16.1.8"; src = fetchurl { - url = "https://registry.npmjs.org/@hapi/joi/-/joi-17.1.1.tgz"; - sha512 = "p4DKeZAoeZW4g3u7ZeRo+vCDuSDgSvtsB/NpfjXEHTUjSeINAi/RrVOWiVQ1isaoLzMvFEhe8n5065mQq1AdQg=="; + url = "https://registry.npmjs.org/@hapi/joi/-/joi-16.1.8.tgz"; + sha512 = "wAsVvTPe+FwSrsAurNt5vkg3zo+TblvC5Bb1zMVK6SJzZqw9UrJnexxR+76cpePmtUZKHAPxcQ2Bf7oVHyahhg=="; }; }; - "@hapi/pinpoint-2.0.0" = { + "@hapi/pinpoint-1.0.2" = { name = "_at_hapi_slash_pinpoint"; packageName = "@hapi/pinpoint"; - version = "2.0.0"; + version = "1.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/@hapi/pinpoint/-/pinpoint-2.0.0.tgz"; - sha512 = "vzXR5MY7n4XeIvLpfl3HtE3coZYO4raKXW766R6DZw/6aLqR26iuZ109K7a0NtF2Db0jxqh7xz2AxkUwpUFybw=="; + url = "https://registry.npmjs.org/@hapi/pinpoint/-/pinpoint-1.0.2.tgz"; + sha512 = "dtXC/WkZBfC5vxscazuiJ6iq4j9oNx1SHknmIr8hofarpKUZKmlUVYVIhNVzIEgK5Wrc4GMHL5lZtt1uS2flmQ=="; }; }; "@hapi/topo-3.1.6" = { @@ -3064,6 +3073,15 @@ let sha512 = "OXD0RgQ86Tu3MazKo8bnrkDRaDXXMGUqd+kTtLtK1Zb7CRzQcaSRPPPV37SvYTdevXEBVxe0HXylEjs8ibkmCw=="; }; }; + "@jest/types-26.6.2" = { + name = "_at_jest_slash_types"; + packageName = "@jest/types"; + version = "26.6.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@jest/types/-/types-26.6.2.tgz"; + sha512 = "fC6QCp7Sc5sX6g8Tvbmj4XUTbyrik0akgRy03yjXbQaBWWNWGE7SGtJk98m0N8nzegD/7SggrUlivxo5ax4KWQ=="; + }; + }; "@jimp/bmp-0.12.1" = { name = "_at_jimp_slash_bmp"; packageName = "@jimp/bmp"; @@ -3451,13 +3469,13 @@ let sha512 = "GaHYm+c0O9MjZRu0ongGBRbinu8gVAMd2UZjji6jVmqKtZluZnptXGWhz1E8j8D2HJ3f/yMxKAUC0b+57wncIw=="; }; }; - "@leichtgewicht/ip-codec-2.0.2" = { + "@leichtgewicht/ip-codec-2.0.3" = { name = "_at_leichtgewicht_slash_ip-codec"; packageName = "@leichtgewicht/ip-codec"; - version = "2.0.2"; + version = "2.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/@leichtgewicht/ip-codec/-/ip-codec-2.0.2.tgz"; - sha512 = "PjsLKLzJ0jWM1iM4xdYkrMyonAHP4kHGiXm81FRNfcnjToQA9UOknwZE28bxq0AGmEAMVBPSuuHurzla2wyYyA=="; + url = "https://registry.npmjs.org/@leichtgewicht/ip-codec/-/ip-codec-2.0.3.tgz"; + sha512 = "nkalE/f1RvRGChwBnEIoBfSEYOXnCRdleKuv6+lePbMDrMZXeDQnqak5XDOeBgrPPyPfAdcCu/B5z+v3VhplGg=="; }; }; "@lerna/add-4.0.0" = { @@ -4126,13 +4144,13 @@ let sha512 = "mlRYq9FSsOd4m+3wZWatemn3hGFZPWNJ4JQOdrir4rrMK2PyIk26idKBoUWrqF3HJJHl+5GpRU+M0wEruJwecg=="; }; }; - "@nestjs/schematics-8.0.1" = { + "@nestjs/schematics-8.0.2" = { name = "_at_nestjs_slash_schematics"; packageName = "@nestjs/schematics"; - version = "8.0.1"; + version = "8.0.2"; src = fetchurl { - url = "https://registry.npmjs.org/@nestjs/schematics/-/schematics-8.0.1.tgz"; - sha512 = "rD/eqpguJpjOVI4uK1MOpqC1vPz+XvC/xT1IYiWDFU9rdJMVhHC5maTKVs/RjkwYRmPzNRTWAoMV3yOD/jC+gw=="; + url = "https://registry.npmjs.org/@nestjs/schematics/-/schematics-8.0.2.tgz"; + sha512 = "iWtpXfn1Zh4Vm37BzY8OSJ60Y9TqNOjk8J+KLIwcql9EuP+0C/C4WUn+vIQMfmnut3MxRmAYFE2B/LFYrjGC5Q=="; }; }; "@netflix/nerror-1.1.3" = { @@ -4225,13 +4243,13 @@ let sha512 = "shUFM+l1ALeGCgy4Lag2wQzOD3zcHW0+HFdWXCRsvtjHdNwTMBnbYg7ztnWurwgMthwiQ1jiTmWr8hFrui7Vng=="; }; }; - "@netlify/plugins-list-2.19.2" = { + "@netlify/plugins-list-2.19.3" = { name = "_at_netlify_slash_plugins-list"; packageName = "@netlify/plugins-list"; - version = "2.19.2"; + version = "2.19.3"; src = fetchurl { - url = "https://registry.npmjs.org/@netlify/plugins-list/-/plugins-list-2.19.2.tgz"; - sha512 = "b1HONWSfqmkSExpelWjonK1plrKwoYxITXFZ0GnS8v3Ek+C8md+e4CvXVBnTCKEpqgERaiG6LQA9H8Tkm6nk5g=="; + url = "https://registry.npmjs.org/@netlify/plugins-list/-/plugins-list-2.19.3.tgz"; + sha512 = "Z2RNrNhO7fsNFmpUQ+eNawgtfHwbGH/4Hji2g+GCRYL7W60kgK5rsWxveky1Nrye45I2OQn/4ZGapKqB1IqTaw=="; }; }; "@netlify/routing-local-proxy-0.30.2" = { @@ -4747,310 +4765,310 @@ let sha512 = "t4fKikazahwNKmwD+CE/icHyuZldWvNMupJhjxdk9T/KxHFx3zCGjHT3MKavwYP6abzgAAm5WwzD1oHlmj7dyg=="; }; }; - "@ot-builder/bin-composite-types-1.0.10" = { + "@ot-builder/bin-composite-types-1.0.11" = { name = "_at_ot-builder_slash_bin-composite-types"; packageName = "@ot-builder/bin-composite-types"; - version = "1.0.10"; + version = "1.0.11"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/bin-composite-types/-/bin-composite-types-1.0.10.tgz"; - sha512 = "kDjxW+Lu3Gvzelw97S9NgjDH0g56w39fH3dJwH6mSg0RPeVpxWf4ZH1jZRxlRFLhCFCIW+RuDzdNc1PRXkfBTg=="; + url = "https://registry.npmjs.org/@ot-builder/bin-composite-types/-/bin-composite-types-1.0.11.tgz"; + sha512 = "EZaye0ulSh5+SVBSz8loz+EOT+wEhrn5hqL3mGYMVMIXHf/JNexwB1n/uffbENfmRQcFLp+GRlVhsEyw+k2HdA=="; }; }; - "@ot-builder/bin-util-1.0.10" = { + "@ot-builder/bin-util-1.0.11" = { name = "_at_ot-builder_slash_bin-util"; packageName = "@ot-builder/bin-util"; - version = "1.0.10"; + version = "1.0.11"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/bin-util/-/bin-util-1.0.10.tgz"; - sha512 = "hr3/6pGrZMBijEjPorRTBlu04sTcC0SzKYDQij5VhpDyIDyijiaEEVMjOyPqx/5Ty+vQRi+Ouclc0iADahY7Iw=="; + url = "https://registry.npmjs.org/@ot-builder/bin-util/-/bin-util-1.0.11.tgz"; + sha512 = "pH7MhJDe3WjlkPsbnUz+nLJedIpDhwqgCPKUDmyLeVaS+JD/+gRERRWDPycywzOwusHlHD6GBMDT68Phy9BuCw=="; }; }; - "@ot-builder/cli-help-shower-1.0.10" = { + "@ot-builder/cli-help-shower-1.0.11" = { name = "_at_ot-builder_slash_cli-help-shower"; packageName = "@ot-builder/cli-help-shower"; - version = "1.0.10"; + version = "1.0.11"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/cli-help-shower/-/cli-help-shower-1.0.10.tgz"; - sha512 = "3V/hx6UH/jKwyemYTmebFg7X23tP7r7WoLE8YnsxHPCd6OtoziTJ7QOTHWXjXZZRZOL542rPsGgGqk+5LND+2w=="; + url = "https://registry.npmjs.org/@ot-builder/cli-help-shower/-/cli-help-shower-1.0.11.tgz"; + sha512 = "vGn9lGxBBknfGLYQ97fUd6fujTkv8IcOUJtsAG6VlMeu4BdMUNsSeAWX7nA/ZWrKPblBSV9E/H8TbiLwLcOWwg=="; }; }; - "@ot-builder/cli-proc-1.0.10" = { + "@ot-builder/cli-proc-1.0.11" = { name = "_at_ot-builder_slash_cli-proc"; packageName = "@ot-builder/cli-proc"; - version = "1.0.10"; + version = "1.0.11"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/cli-proc/-/cli-proc-1.0.10.tgz"; - sha512 = "3bbWGzeD68FfEkRSWwnsYMnVR8G9a8mC2a53z9oo12EOgVD4QHbdg0fSMs3YZiXVELrbJnixgwd5CNxakKAIFw=="; + url = "https://registry.npmjs.org/@ot-builder/cli-proc/-/cli-proc-1.0.11.tgz"; + sha512 = "icbfgW3eXE7G7sK6MxIzyUkeCoJxW3UCVXCyhQKgs7MVgQo/xEl6Mj04YE2fz62L+IsTccEdvMIFJXWUPjw44g=="; }; }; - "@ot-builder/cli-shared-1.0.10" = { + "@ot-builder/cli-shared-1.0.11" = { name = "_at_ot-builder_slash_cli-shared"; packageName = "@ot-builder/cli-shared"; - version = "1.0.10"; + version = "1.0.11"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/cli-shared/-/cli-shared-1.0.10.tgz"; - sha512 = "MD2MAr8A4kuE9hIwOSXxxVf4Zq4ZaE0KTLRT9n7Pk4d4vxB2lgneAZdB/I8tpJ0eBqui4vYeFggm4kJOgEd4JQ=="; + url = "https://registry.npmjs.org/@ot-builder/cli-shared/-/cli-shared-1.0.11.tgz"; + sha512 = "PBdRmB3Mp5mHCxd889UJHq0eJwHUJiiSMY+M9VXfxgu4WxbA0NUY5IpiEs69RnfJhiSUjvdkiaWH5xJzB9+mdA=="; }; }; - "@ot-builder/common-impl-1.0.10" = { + "@ot-builder/common-impl-1.0.11" = { name = "_at_ot-builder_slash_common-impl"; packageName = "@ot-builder/common-impl"; - version = "1.0.10"; + version = "1.0.11"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/common-impl/-/common-impl-1.0.10.tgz"; - sha512 = "gtStJv1GGuG/P0JPfphzpjpWiVZMhiodgSThwBJQYvJqjY/xeNmr7i/yo2C2FcTJv8rQxaVt2mCSZKGpnUI74Q=="; + url = "https://registry.npmjs.org/@ot-builder/common-impl/-/common-impl-1.0.11.tgz"; + sha512 = "7FCjFJb32++fIlPpXzzuNZB7TtrwkYKB32VOBlVz/u/wGAI3DcQEeG4jqAIF9XOUb9jtISQUcEUj7YHDYdOKWQ=="; }; }; - "@ot-builder/errors-1.0.10" = { + "@ot-builder/errors-1.0.11" = { name = "_at_ot-builder_slash_errors"; packageName = "@ot-builder/errors"; - version = "1.0.10"; + version = "1.0.11"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/errors/-/errors-1.0.10.tgz"; - sha512 = "jrII0X2C+z/gTBxrN309ob65FsPNtm93nsWBaLYvP4Bc6dG49naFuhAKP4VIeom+TFrioKm4T/GW/lUc1Sn0oA=="; + url = "https://registry.npmjs.org/@ot-builder/errors/-/errors-1.0.11.tgz"; + sha512 = "hNMMJRVYNLgue0tYY2FKEk1RZmUKm4eY3CzoBOkhCNG7FAS1M2m2MGeE/TNaxxlJz3VTEiSXl1uMaFKXQLgrWw=="; }; }; - "@ot-builder/io-bin-cff-1.0.10" = { + "@ot-builder/io-bin-cff-1.0.11" = { name = "_at_ot-builder_slash_io-bin-cff"; packageName = "@ot-builder/io-bin-cff"; - version = "1.0.10"; + version = "1.0.11"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-cff/-/io-bin-cff-1.0.10.tgz"; - sha512 = "zEHyCo6qL70JpTRwB1Z2n49gzx9/YouZn8uc/6UBvOB1SBUp3kypAYwpS3zYzPOWyJRPQGfJMIHtSCmqmXqSIg=="; + url = "https://registry.npmjs.org/@ot-builder/io-bin-cff/-/io-bin-cff-1.0.11.tgz"; + sha512 = "gcD/FhE6s6Xk2AIurJh8cXjwdB7N1hLhQFf8YkOGgZ4jX1lpSmm9Dx7GrwYx9iii7LodXBDVS5AJh4N+hpaESw=="; }; }; - "@ot-builder/io-bin-encoding-1.0.10" = { + "@ot-builder/io-bin-encoding-1.0.11" = { name = "_at_ot-builder_slash_io-bin-encoding"; packageName = "@ot-builder/io-bin-encoding"; - version = "1.0.10"; + version = "1.0.11"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-encoding/-/io-bin-encoding-1.0.10.tgz"; - sha512 = "py4vmJF6eDbjhOanIG71OJ0BV+vdAr+HTYcY/s5kMNIvkLsS54ob3Z2W0KA05bnt9GuhAa22s3juVsFi61OrAg=="; + url = "https://registry.npmjs.org/@ot-builder/io-bin-encoding/-/io-bin-encoding-1.0.11.tgz"; + sha512 = "5ytVt41rCuyDKi6XCrKOIaW88xf8b3gTKzjSvTRvYcsK/0uqJocpdbB7OIGU2TqpUNVuEs3IktDpMBiUrcFjuw=="; }; }; - "@ot-builder/io-bin-ext-private-1.0.10" = { + "@ot-builder/io-bin-ext-private-1.0.11" = { name = "_at_ot-builder_slash_io-bin-ext-private"; packageName = "@ot-builder/io-bin-ext-private"; - version = "1.0.10"; + version = "1.0.11"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-ext-private/-/io-bin-ext-private-1.0.10.tgz"; - sha512 = "iUQSRQIhiq2+jT/n/58vT5bm33dKBfMnoJZXm8B3jHPq4bo42jPI+8qUTZtlUQ9DlDvvbZh2nJp1Ooeg+3ZwXg=="; + url = "https://registry.npmjs.org/@ot-builder/io-bin-ext-private/-/io-bin-ext-private-1.0.11.tgz"; + sha512 = "BwG9QBsPebZR1ycakpAYHc1zuCpKcpDr9pxp6D7kNSZAaZsosVinqI1cW0h/AbK99TYblI1MN4+FA2c4DJxWAg=="; }; }; - "@ot-builder/io-bin-font-1.0.10" = { + "@ot-builder/io-bin-font-1.0.11" = { name = "_at_ot-builder_slash_io-bin-font"; packageName = "@ot-builder/io-bin-font"; - version = "1.0.10"; + version = "1.0.11"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-font/-/io-bin-font-1.0.10.tgz"; - sha512 = "sui/frjfKCh8+G7T2PxRc7BTwnYLZrCj4nW4lt8gMjsRNbik7Tw7nGO3R0egLdD01G5k6mu1TUl1NhjRaLjihg=="; + url = "https://registry.npmjs.org/@ot-builder/io-bin-font/-/io-bin-font-1.0.11.tgz"; + sha512 = "xtGq9iU48CUAB/xm+a9wsvWKd2K4K637SqRjc9y0jou0h9TZ3g9fDF6RRCva1VJkAPHT4gJes6wALMuoLb9lfg=="; }; }; - "@ot-builder/io-bin-glyph-store-1.0.10" = { + "@ot-builder/io-bin-glyph-store-1.0.11" = { name = "_at_ot-builder_slash_io-bin-glyph-store"; packageName = "@ot-builder/io-bin-glyph-store"; - version = "1.0.10"; + version = "1.0.11"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-glyph-store/-/io-bin-glyph-store-1.0.10.tgz"; - sha512 = "hw7eUoml6PKYin0BRAudASjVvlAngeaDAfdQqL68aamZ9lLzwPx5bZ9wEEfqm3oIcRXOQw6q+UvdxJ5WQ7feAA=="; + url = "https://registry.npmjs.org/@ot-builder/io-bin-glyph-store/-/io-bin-glyph-store-1.0.11.tgz"; + sha512 = "ipBYDaX7jsLiaJgpbyrTxeLqCB55KZ3UumVfxxTt8AUEKT1m6PUnG9BvaLBzvZxyjBF0sfiJDVQaS+mznbVj0Q=="; }; }; - "@ot-builder/io-bin-layout-1.0.10" = { + "@ot-builder/io-bin-layout-1.0.11" = { name = "_at_ot-builder_slash_io-bin-layout"; packageName = "@ot-builder/io-bin-layout"; - version = "1.0.10"; + version = "1.0.11"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-layout/-/io-bin-layout-1.0.10.tgz"; - sha512 = "EDtmQIgIFaVO8moA8cSaN86bgR9So56O6xC8SsrzyX6PvWO+KQmXMAiSkXFFv6Tb6MrauBEZEsv45K4sRoDG6g=="; + url = "https://registry.npmjs.org/@ot-builder/io-bin-layout/-/io-bin-layout-1.0.11.tgz"; + sha512 = "5oquyNtdX/hRmtnmcgvdy0rxFiC1sqjRIi+6ycPNtMvJx9Z7z5USplveTf14W53Iyr/qGBsbk0QfNmv++fWEiQ=="; }; }; - "@ot-builder/io-bin-metadata-1.0.10" = { + "@ot-builder/io-bin-metadata-1.0.11" = { name = "_at_ot-builder_slash_io-bin-metadata"; packageName = "@ot-builder/io-bin-metadata"; - version = "1.0.10"; + version = "1.0.11"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-metadata/-/io-bin-metadata-1.0.10.tgz"; - sha512 = "jOqwS7l/W4arpp2FJfwjeIRTPsEU5eB8lTzRycxDTDxV7hZj9ZphrnuxVITIjlOmTB15LF6whBCtP6Hfa/L3qQ=="; + url = "https://registry.npmjs.org/@ot-builder/io-bin-metadata/-/io-bin-metadata-1.0.11.tgz"; + sha512 = "JdUp6qrHAfaa8UsCOKnWRveUiQGqa7QYQaPNLKaOVKvzo6jdIKB5uELX+GOc6qQU5ktGIjRuCbKWq2jZxcZToQ=="; }; }; - "@ot-builder/io-bin-metric-1.0.10" = { + "@ot-builder/io-bin-metric-1.0.11" = { name = "_at_ot-builder_slash_io-bin-metric"; packageName = "@ot-builder/io-bin-metric"; - version = "1.0.10"; + version = "1.0.11"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-metric/-/io-bin-metric-1.0.10.tgz"; - sha512 = "shTvXxon2iG+vlOYxSeJNn15aGOMaf7po7iakvnVIN77Jrl2tqO6h9ssKVeP6osD9R3PrljSVEDwTkK5AahhqQ=="; + url = "https://registry.npmjs.org/@ot-builder/io-bin-metric/-/io-bin-metric-1.0.11.tgz"; + sha512 = "5mjN6J6hOO7TDUazjI8Hl0eCkogLsod0N1u38UAVL4JmDAVEY6NCwYXVe0TDoNBRG17jfoOW+/xoz40uCI37AA=="; }; }; - "@ot-builder/io-bin-name-1.0.10" = { + "@ot-builder/io-bin-name-1.0.11" = { name = "_at_ot-builder_slash_io-bin-name"; packageName = "@ot-builder/io-bin-name"; - version = "1.0.10"; + version = "1.0.11"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-name/-/io-bin-name-1.0.10.tgz"; - sha512 = "B0Q2JuBirG35g0DrKPyzRz3JAFefbW2QQrp5fo8eyXjFhxB6Q+65V9bvqCieGi85phnS8eBAMsslIbRjaVYojA=="; + url = "https://registry.npmjs.org/@ot-builder/io-bin-name/-/io-bin-name-1.0.11.tgz"; + sha512 = "SjeUgpDTPIqGo/lA7ACvk/L2SAIzzMfKs4WV+QYRh6hzN9IRfhoj2OYepxXpvInOiNj9FHqTzEnYz5l7mskqmw=="; }; }; - "@ot-builder/io-bin-sfnt-1.0.10" = { + "@ot-builder/io-bin-sfnt-1.0.11" = { name = "_at_ot-builder_slash_io-bin-sfnt"; packageName = "@ot-builder/io-bin-sfnt"; - version = "1.0.10"; + version = "1.0.11"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-sfnt/-/io-bin-sfnt-1.0.10.tgz"; - sha512 = "yIQSbNyHp9G42JDzF9JKB0os69rhvtnvKPS+PVW45e2KvMBySnWtUx6QS9icFv9+qaHEFCIxik0xyDcoGt+fXw=="; + url = "https://registry.npmjs.org/@ot-builder/io-bin-sfnt/-/io-bin-sfnt-1.0.11.tgz"; + sha512 = "/AhSr/xsXEDY8mCVO+yJTmOKwaUjVuhKtJ9kZrJymV8I7xm1gJjdH+JdTPtikhm36Mc9WWC+KY/2zot+pN2PtQ=="; }; }; - "@ot-builder/io-bin-ttf-1.0.10" = { + "@ot-builder/io-bin-ttf-1.0.11" = { name = "_at_ot-builder_slash_io-bin-ttf"; packageName = "@ot-builder/io-bin-ttf"; - version = "1.0.10"; + version = "1.0.11"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/io-bin-ttf/-/io-bin-ttf-1.0.10.tgz"; - sha512 = "Z7SzRmk/j4hkUYQ8yN5iQgokpQ5/lVVxfAjC2G/q+5ZNfnMq1gyIIcY8IWVc0/YWOn3++qxbNr8eFk2v/+YJJA=="; + url = "https://registry.npmjs.org/@ot-builder/io-bin-ttf/-/io-bin-ttf-1.0.11.tgz"; + sha512 = "euZnFeumI9V21VmezT7yVNFYm2HuBJhWhy9JE8V9aaoIo2Qj5lVpMu+3WAuhCDp1qk2fs+o5JlI83lXrdWeWmQ=="; }; }; - "@ot-builder/ot-1.0.10" = { + "@ot-builder/ot-1.0.11" = { name = "_at_ot-builder_slash_ot"; packageName = "@ot-builder/ot"; - version = "1.0.10"; + version = "1.0.11"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/ot/-/ot-1.0.10.tgz"; - sha512 = "YPi9qrkYyfVPFbTPz7ZWMORZGXWpWpyDIlkPLp1wiSNfwEQWN908yU+NfxBZDY5C0BzxdDU0lSnCXTKSfS2KyA=="; + url = "https://registry.npmjs.org/@ot-builder/ot/-/ot-1.0.11.tgz"; + sha512 = "TARoyL9D+i6gEzIijuh2C4MG4rNjY+Jkk1L5yMM/cVnzhLTy4PY+bTkszf2GJgcNi8iH8+XL213oHUOcEN8gWg=="; }; }; - "@ot-builder/ot-encoding-1.0.10" = { + "@ot-builder/ot-encoding-1.0.11" = { name = "_at_ot-builder_slash_ot-encoding"; packageName = "@ot-builder/ot-encoding"; - version = "1.0.10"; + version = "1.0.11"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/ot-encoding/-/ot-encoding-1.0.10.tgz"; - sha512 = "YvH9Uq6xs06gGPnoBDwkhPdOaGTKvh4Dzmefu6yBTsdzD8FylQ6AqFgpSd1oRf9HS73Jjf8eQ0N21MvAsYweFQ=="; + url = "https://registry.npmjs.org/@ot-builder/ot-encoding/-/ot-encoding-1.0.11.tgz"; + sha512 = "Z6ZIuIq+R9E+2HpvrBsXVXTkjJLWWyJgBssTl1n5DRF8nIWIwmKufoCjMXHMtCCMHMK8jlDCCv8U3AAhPjvAZQ=="; }; }; - "@ot-builder/ot-ext-private-1.0.10" = { + "@ot-builder/ot-ext-private-1.0.11" = { name = "_at_ot-builder_slash_ot-ext-private"; packageName = "@ot-builder/ot-ext-private"; - version = "1.0.10"; + version = "1.0.11"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/ot-ext-private/-/ot-ext-private-1.0.10.tgz"; - sha512 = "rN5PYFzdITRVKMq/Ob5R/ehYjhfehTc84qQO8ZqAW/Er2EB0P5Zw3STK/ZDiCwOPnUSVlLl84D0u+R0dI77Acg=="; + url = "https://registry.npmjs.org/@ot-builder/ot-ext-private/-/ot-ext-private-1.0.11.tgz"; + sha512 = "7dOIKMYaAEgYj6FtKCxWFqctNhT05zAaCVRRh6QVfOrQf7cldxmIVHW76aHa27eHTWPdtXWBxtb3eA0BVbEzHA=="; }; }; - "@ot-builder/ot-glyphs-1.0.10" = { + "@ot-builder/ot-glyphs-1.0.11" = { name = "_at_ot-builder_slash_ot-glyphs"; packageName = "@ot-builder/ot-glyphs"; - version = "1.0.10"; + version = "1.0.11"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/ot-glyphs/-/ot-glyphs-1.0.10.tgz"; - sha512 = "89yFC/xjI9Ha3knR75GazNZAczn+9OXtL0kY9t6tiHTGPjMci2Y5zlp4HilwXW5SGQoD1o8cPK0A8BCrNgXyBw=="; + url = "https://registry.npmjs.org/@ot-builder/ot-glyphs/-/ot-glyphs-1.0.11.tgz"; + sha512 = "NuhRdeS6vJnV6HVUEUMKDrNxW1PHYS2IWRsz+Dtr2ffrQ/GXtX857MXeZPd8cTrH+i0arfQeIUJPY0ZRmvXlJA=="; }; }; - "@ot-builder/ot-layout-1.0.10" = { + "@ot-builder/ot-layout-1.0.11" = { name = "_at_ot-builder_slash_ot-layout"; packageName = "@ot-builder/ot-layout"; - version = "1.0.10"; + version = "1.0.11"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/ot-layout/-/ot-layout-1.0.10.tgz"; - sha512 = "Scc/bBwUk+3xbB3xaspxTq8goiWBBmFiD2DOlf23XLe6rSVkZ5+mbWybQhfUtzIhzQjfBooWutuKG/w7mbAC8w=="; + url = "https://registry.npmjs.org/@ot-builder/ot-layout/-/ot-layout-1.0.11.tgz"; + sha512 = "x2K3Nnv5WVyOZ6b23p0fOPB5oMqNuj8UyNZ7OCpgZTMTFEXjrIvnkuWpjnYRd6JfWXAYF0vfZdBMHd7F0l+Y4A=="; }; }; - "@ot-builder/ot-metadata-1.0.10" = { + "@ot-builder/ot-metadata-1.0.11" = { name = "_at_ot-builder_slash_ot-metadata"; packageName = "@ot-builder/ot-metadata"; - version = "1.0.10"; + version = "1.0.11"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/ot-metadata/-/ot-metadata-1.0.10.tgz"; - sha512 = "TDctk+kMgMD/+z9UNFcSyQfMlWCXrOmeNb8OHnBbovnonKALW0fSFeImirKH1UR6E3lPeGGhT4kMNdxAEZanYg=="; + url = "https://registry.npmjs.org/@ot-builder/ot-metadata/-/ot-metadata-1.0.11.tgz"; + sha512 = "yInNtU6UkmzXIGJYARl5VZcA63UOLP3xc6o0APkHwVQNN53e5nN35GFwaDbeaWYYe0uRq/7/bDzeVsqr2GaV0Q=="; }; }; - "@ot-builder/ot-name-1.0.10" = { + "@ot-builder/ot-name-1.0.11" = { name = "_at_ot-builder_slash_ot-name"; packageName = "@ot-builder/ot-name"; - version = "1.0.10"; + version = "1.0.11"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/ot-name/-/ot-name-1.0.10.tgz"; - sha512 = "L5IAWUkF7ZXsBDxXhr0cznc6XyZh8XJ+lJyWJBh7oqBnnwXYX1HFdBVImc4j+8A0c3nTwXtkep0De1al8etkhw=="; + url = "https://registry.npmjs.org/@ot-builder/ot-name/-/ot-name-1.0.11.tgz"; + sha512 = "opSvFhUgrveV+cpOhKFnD/nrfNj3pbW6Z1mem1Rz/oWnrkx73g8kgDyip+8acW5h3iulYHGWL3XsKVOm4UpKug=="; }; }; - "@ot-builder/ot-sfnt-1.0.10" = { + "@ot-builder/ot-sfnt-1.0.11" = { name = "_at_ot-builder_slash_ot-sfnt"; packageName = "@ot-builder/ot-sfnt"; - version = "1.0.10"; + version = "1.0.11"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/ot-sfnt/-/ot-sfnt-1.0.10.tgz"; - sha512 = "ny6E7Ii7tsRLqiPHahPmCgt5hp2B4qe6MTyowY/TRbJmXcIfzXPggh1t4GUqyn8jC97H5HFcZNrx7FNnqQDi9A=="; + url = "https://registry.npmjs.org/@ot-builder/ot-sfnt/-/ot-sfnt-1.0.11.tgz"; + sha512 = "w254e5eLINkwS00N0UY4UMTK4UCHN7/Oh8p7/e7INw6EaCR7Gg1j7VKnbU6Fldg2leHDQ939tkGSNIU6uHisKg=="; }; }; - "@ot-builder/ot-standard-glyph-namer-1.0.10" = { + "@ot-builder/ot-standard-glyph-namer-1.0.11" = { name = "_at_ot-builder_slash_ot-standard-glyph-namer"; packageName = "@ot-builder/ot-standard-glyph-namer"; - version = "1.0.10"; + version = "1.0.11"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/ot-standard-glyph-namer/-/ot-standard-glyph-namer-1.0.10.tgz"; - sha512 = "GtpuR7BHnfTQ8YMoaC9AyQZgj0LXj82nt95rOvirWez9KEO6dHSr6z7isE+jWlnq4cz6lG37XQ9cwJDLfDC4MQ=="; + url = "https://registry.npmjs.org/@ot-builder/ot-standard-glyph-namer/-/ot-standard-glyph-namer-1.0.11.tgz"; + sha512 = "bynoGWRfxaVhqF6SjQZn7Vo+ApmMePBQn7HRwcnsS3CxxSTzP+O9Z2FtoN7/NiaQiENWrciMkTsDY2VH6iBo4A=="; }; }; - "@ot-builder/prelude-1.0.10" = { + "@ot-builder/prelude-1.0.11" = { name = "_at_ot-builder_slash_prelude"; packageName = "@ot-builder/prelude"; - version = "1.0.10"; + version = "1.0.11"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/prelude/-/prelude-1.0.10.tgz"; - sha512 = "4KtMBNsyiuCoousOs5Q8tCkM3dC4jzgRHwftadB3LeTuLPllXFO0wl38RKKkOhrbjDFu30wUvmOEt4c3+URBlw=="; + url = "https://registry.npmjs.org/@ot-builder/prelude/-/prelude-1.0.11.tgz"; + sha512 = "BM1TmmUrGsA/goZ8RIGpjvw18nRDeFEWC7wFel/i4hFQuCKbfgfKixEDJ2iKzVXm6nGUl7/7xWZ0pfu3ij6tuA=="; }; }; - "@ot-builder/primitive-1.0.10" = { + "@ot-builder/primitive-1.0.11" = { name = "_at_ot-builder_slash_primitive"; packageName = "@ot-builder/primitive"; - version = "1.0.10"; + version = "1.0.11"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/primitive/-/primitive-1.0.10.tgz"; - sha512 = "+3iORh9ukSW94NL5Tdd/GyO0FmKancRgG7C1dHYTJEfI0sTdMdOz8Eyxrx4LEFdR94NDCdQfdA4X+2VClfrxvw=="; + url = "https://registry.npmjs.org/@ot-builder/primitive/-/primitive-1.0.11.tgz"; + sha512 = "Hh6QGMC0XuAfiLWl7Q0eZSAOoEqkO6BPO9d3OFAxaNg05ekRJBzVvtB3iSEkdigbmg1aZChTy4HDFRw9D5SmGw=="; }; }; - "@ot-builder/rectify-1.0.10" = { + "@ot-builder/rectify-1.0.11" = { name = "_at_ot-builder_slash_rectify"; packageName = "@ot-builder/rectify"; - version = "1.0.10"; + version = "1.0.11"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/rectify/-/rectify-1.0.10.tgz"; - sha512 = "6wetSzyXEFmOPttyfCE/5NqGw/NTVnqL9BTLnh8CcLxS5A4HsF41vjSuyXNjdBfpNPf34aLH4fdr408TuSobiA=="; + url = "https://registry.npmjs.org/@ot-builder/rectify/-/rectify-1.0.11.tgz"; + sha512 = "B3hzfmONslDbTtFqX+tKff6zlrDMVD1B0yyC44Sm8iP6OFt1HgPwNKyVUntEs3Wzod9SCCN/hOcRFAeaXTM5RA=="; }; }; - "@ot-builder/stat-glyphs-1.0.10" = { + "@ot-builder/stat-glyphs-1.0.11" = { name = "_at_ot-builder_slash_stat-glyphs"; packageName = "@ot-builder/stat-glyphs"; - version = "1.0.10"; + version = "1.0.11"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/stat-glyphs/-/stat-glyphs-1.0.10.tgz"; - sha512 = "dGIeJ2QI6dLrw/KzchzQasJmswMJyoGNDOVGPZhl1VWnjcFsxYwMZ1o14ds6GYSqU9laQKTM7V+FVY5hJdbY3w=="; + url = "https://registry.npmjs.org/@ot-builder/stat-glyphs/-/stat-glyphs-1.0.11.tgz"; + sha512 = "ldzOx2QtDKsqdQolgCM6cCRzCcdS/B46a4Emu3vuMRs2M0yNAoy4EzVkX6h0nEnTBcgq2NKFFL4BxWIG4la1ZQ=="; }; }; - "@ot-builder/trace-1.0.10" = { + "@ot-builder/trace-1.0.11" = { name = "_at_ot-builder_slash_trace"; packageName = "@ot-builder/trace"; - version = "1.0.10"; + version = "1.0.11"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/trace/-/trace-1.0.10.tgz"; - sha512 = "Vwj1JF8M4Z58uFm8m4rXlfB4h8Vbd1Z0zzLGBX6WKWoMl9psCafMOy1vnGHQOjaKxjRw/O/X8qo87alqiHxBEg=="; + url = "https://registry.npmjs.org/@ot-builder/trace/-/trace-1.0.11.tgz"; + sha512 = "feOrmdS9Tc0+lnXHtPsq2QfMpI4zQqsIOEBYzzGGK4UPrdwO1a7DhBLgOEJt1C8o7d+2QeLE8KJnB4NGgx6kHQ=="; }; }; - "@ot-builder/var-store-1.0.10" = { + "@ot-builder/var-store-1.0.11" = { name = "_at_ot-builder_slash_var-store"; packageName = "@ot-builder/var-store"; - version = "1.0.10"; + version = "1.0.11"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/var-store/-/var-store-1.0.10.tgz"; - sha512 = "TE1j/Ecrt3aFBl3/LpqazEXCJmrFgx0hZ5EXPkQUSI346F7DaZQR7qZv8D45C4tbjkiUkWrOwe4ZISVwTPiHsA=="; + url = "https://registry.npmjs.org/@ot-builder/var-store/-/var-store-1.0.11.tgz"; + sha512 = "kg1T34FaRepMJ7vgatiVSjScH1H9c2H87vPauNR6lft8oeMORUuowJyFIzeckfaKcUFm/0uip6H5zj8Bypu9Wg=="; }; }; - "@ot-builder/variance-1.0.10" = { + "@ot-builder/variance-1.0.11" = { name = "_at_ot-builder_slash_variance"; packageName = "@ot-builder/variance"; - version = "1.0.10"; + version = "1.0.11"; src = fetchurl { - url = "https://registry.npmjs.org/@ot-builder/variance/-/variance-1.0.10.tgz"; - sha512 = "f1q+fONxy+daHWZMxpkXMGmCJt8NPYnfbsS/Rvf5Z2rCa6iOLGhWgXPyBnOmJMBwI+Kxf96K8+x7Ld//L9WOmg=="; + url = "https://registry.npmjs.org/@ot-builder/variance/-/variance-1.0.11.tgz"; + sha512 = "p1VXo+2ZZl5SDMWPLTzz2rtIlfY3G3RgPDAdG4dwWPjH9PLtZlrWDLQR9SGmisAe3p1NIUQh82TD6X2a9XMnXA=="; }; }; "@parcel/fs-1.11.0" = { @@ -5260,31 +5278,31 @@ let sha512 = "+mtn9wjlB9NN2CNnnC/BRYtwdKBfSyyasPYraNAyvaV1occr/5NnB4CVzjEZipNHwYebQwcndGUmpFzxAUoqSA=="; }; }; - "@react-native-community/cli-debugger-ui-4.13.1" = { + "@react-native-community/cli-debugger-ui-5.0.1" = { name = "_at_react-native-community_slash_cli-debugger-ui"; packageName = "@react-native-community/cli-debugger-ui"; - version = "4.13.1"; + version = "5.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@react-native-community/cli-debugger-ui/-/cli-debugger-ui-4.13.1.tgz"; - sha512 = "UFnkg5RTq3s2X15fSkrWY9+5BKOFjihNSnJjTV2H5PtTUFbd55qnxxPw8CxSfK0bXb1IrSvCESprk2LEpqr5cg=="; + url = "https://registry.npmjs.org/@react-native-community/cli-debugger-ui/-/cli-debugger-ui-5.0.1.tgz"; + sha512 = "5gGKaaXYOVE423BUqxIfvfAVSj5Cg1cU/TpGbeg/iqpy2CfqyWqJB3tTuVUbOOiOvR5wbU8tti6pIi1pchJ+oA=="; }; }; - "@react-native-community/cli-server-api-4.9.0" = { + "@react-native-community/cli-server-api-5.0.1" = { name = "_at_react-native-community_slash_cli-server-api"; packageName = "@react-native-community/cli-server-api"; - version = "4.9.0"; + version = "5.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@react-native-community/cli-server-api/-/cli-server-api-4.9.0.tgz"; - sha512 = "lKBIXJjFLyu4+6Vhhj/QzD41aQGkVi8xWLqTYCgi26d61kjLuuZs0Xer02DPJK3+YADKExVdWrJzVHfJ7zYlTA=="; + url = "https://registry.npmjs.org/@react-native-community/cli-server-api/-/cli-server-api-5.0.1.tgz"; + sha512 = "OOxL+y9AOZayQzmSW+h5T54wQe+QBc/f67Y9QlWzzJhkKJdYx+S4VOooHoD5PFJzGbYaxhu2YF17p517pcEIIA=="; }; }; - "@react-native-community/cli-tools-4.13.0" = { + "@react-native-community/cli-tools-5.0.1" = { name = "_at_react-native-community_slash_cli-tools"; packageName = "@react-native-community/cli-tools"; - version = "4.13.0"; + version = "5.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/@react-native-community/cli-tools/-/cli-tools-4.13.0.tgz"; - sha512 = "s4f489h5+EJksn4CfheLgv5PGOM0CDmK1UEBLw2t/ncWs3cW2VI7vXzndcd/WJHTv3GntJhXDcJMuL+Z2IAOgg=="; + url = "https://registry.npmjs.org/@react-native-community/cli-tools/-/cli-tools-5.0.1.tgz"; + sha512 = "XOX5w98oSE8+KnkMZZPMRT7I5TaP8fLbDl0tCu40S7Epz+Zz924n80fmdu6nUDIfPT1nV6yH1hmHmWAWTDOR+Q=="; }; }; "@redocly/ajv-8.6.2" = { @@ -5368,6 +5386,15 @@ let sha512 = "yc2n43jcqVyGE2sqV5/YCmocy9ArjVAP/BeXyTtADTBBX6V0e5UMqwO8CdQ0kzjb6zu5P1qMzsScCMRvE9OlVg=="; }; }; + "@rollup/plugin-replace-2.4.2" = { + name = "_at_rollup_slash_plugin-replace"; + packageName = "@rollup/plugin-replace"; + version = "2.4.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@rollup/plugin-replace/-/plugin-replace-2.4.2.tgz"; + sha512 = "IGcu+cydlUMZ5En85jxHH4qj2hta/11BHq95iHEyb2sbgiN0eCdzvUcHw5gt9pBL5lTi4JDYJ1acCoMGpTvEZg=="; + }; + }; "@rollup/pluginutils-3.1.0" = { name = "_at_rollup_slash_pluginutils"; packageName = "@rollup/pluginutils"; @@ -5476,13 +5503,13 @@ let sha512 = "YAV5V/y+XIOfd+HEVeXfPWZb8C6QLruFk9tBivoX2roQLWVq145s4uxf8D0QioCueuRzkukHUS4JIj+KVoS34A=="; }; }; - "@serverless/platform-client-4.2.4" = { + "@serverless/platform-client-4.2.5" = { name = "_at_serverless_slash_platform-client"; packageName = "@serverless/platform-client"; - version = "4.2.4"; + version = "4.2.5"; src = fetchurl { - url = "https://registry.npmjs.org/@serverless/platform-client/-/platform-client-4.2.4.tgz"; - sha512 = "DMq4GfckQ+Us64NQZJOtdtKHA3PQU5FZNXwi7QdV5QaVw3PtLjLN65FD7t8PcZ9YmCwL7QOsrCfT5oPJBblBNg=="; + url = "https://registry.npmjs.org/@serverless/platform-client/-/platform-client-4.2.5.tgz"; + sha512 = "PqQptakqHs6DHVY3fCqyMqdaFSKgehvUGrobWBUhcsmovnGY1Fzw9s3uqnqt2jmaCICNzPn/hPN+P+JbsG7itA=="; }; }; "@serverless/platform-client-china-2.2.0" = { @@ -5521,13 +5548,13 @@ let sha512 = "cl5uPaGg72z0sCUpF0zsOhwYYUV72Gxc1FwFfxltO8hSvMeFDvwD7JrNE4kHcIcKRjwPGbSH0fdVPUpErZ8Mog=="; }; }; - "@serverless/utils-5.3.0" = { + "@serverless/utils-5.4.0" = { name = "_at_serverless_slash_utils"; packageName = "@serverless/utils"; - version = "5.3.0"; + version = "5.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/@serverless/utils/-/utils-5.3.0.tgz"; - sha512 = "cUt1ZYXZ/6Khe/foCucqraRpaTtejc4mICWVjQynwaPaK86/3g4Afu4pV1kEumnbet7N0PLbi+SKr8SHTf6tNQ=="; + url = "https://registry.npmjs.org/@serverless/utils/-/utils-5.4.0.tgz"; + sha512 = "abEYhQ8Bgh48w/8uzvv8hlfOXsbkvTns3vuMU4THpb0nhbhqL7Y4AWf6z4wJFxcMd0yffkgUQWwSzYHwGJp3kA=="; }; }; "@serverless/utils-china-1.1.4" = { @@ -5998,6 +6025,15 @@ let sha512 = "2kGbqUVJUGE8dM+bMzXG/PYUWKkjLIkRLWNh39OaADkiabDRdw8ATFCgbMz5xdIcvwspPAluSL7uY+ZiTWdWmQ=="; }; }; + "@surma/rollup-plugin-off-main-thread-1.4.2" = { + name = "_at_surma_slash_rollup-plugin-off-main-thread"; + packageName = "@surma/rollup-plugin-off-main-thread"; + version = "1.4.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@surma/rollup-plugin-off-main-thread/-/rollup-plugin-off-main-thread-1.4.2.tgz"; + sha512 = "yBMPqmd1yEJo/280PAMkychuaALyQ9Lkb5q1ck3mjJrFuEobIfhnQ4J3mbvBoISmR3SWMWV+cGB/I0lCQee79A=="; + }; + }; "@szmarczak/http-timer-1.1.2" = { name = "_at_szmarczak_slash_http-timer"; packageName = "@szmarczak/http-timer"; @@ -6808,6 +6844,15 @@ let sha512 = "P/W9yOX/3oPZSpaYOCQzGqgCQRXn0FFO/V8bWrCQs+wLmvVVxk6CRBXALEvNs9OHIatlnlFokfhuDo2ug01ciw=="; }; }; + "@types/istanbul-reports-3.0.1" = { + name = "_at_types_slash_istanbul-reports"; + packageName = "@types/istanbul-reports"; + version = "3.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/istanbul-reports/-/istanbul-reports-3.0.1.tgz"; + sha512 = "c3mAZEuK0lvBp8tmuL74XRKn1+y2dcwOUpH7x4WrF6gk1GIgiluDRgMYQtw2OFcBvAJWlt6ASU3tSqxp0Uu0Aw=="; + }; + }; "@types/jquery-3.5.6" = { name = "_at_types_slash_jquery"; packageName = "@types/jquery"; @@ -6961,13 +7006,13 @@ let sha512 = "559S2XW9YMwHznROJ4WFhZJOerJPuxLfqOX+LIKukyLo2NbVgpULwXUsrBlCwhZ4+ACHgVAE23CC3RS52lFxwA=="; }; }; - "@types/mdast-3.0.4" = { + "@types/mdast-3.0.7" = { name = "_at_types_slash_mdast"; packageName = "@types/mdast"; - version = "3.0.4"; + version = "3.0.7"; src = fetchurl { - url = "https://registry.npmjs.org/@types/mdast/-/mdast-3.0.4.tgz"; - sha512 = "gIdhbLDFlspL53xzol2hVzrXAbzt71erJHoOwQZWssjaiouOotf03lNtMmFm9VfFkvnLWccSVjUAZGQ5Kqw+jA=="; + url = "https://registry.npmjs.org/@types/mdast/-/mdast-3.0.7.tgz"; + sha512 = "YwR7OK8aPmaBvMMUi+pZXBNoW2unbVbfok4YRqGMJBe1dpDlzpRkJrYEYmvjxgs5JhuQmKfDexrN98u941Zasg=="; }; }; "@types/mime-1.3.2" = { @@ -7141,24 +7186,6 @@ let sha512 = "7EIraBEyRHEe7CH+Fm1XvgqU6uwZN8Q7jppJGcqjROMT29qhAuuOxYB1uEY5UMYQKEmA5D+5tBnhdaPXSsLONA=="; }; }; - "@types/node-16.0.0" = { - name = "_at_types_slash_node"; - packageName = "@types/node"; - version = "16.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-16.0.0.tgz"; - sha512 = "TmCW5HoZ2o2/z2EYi109jLqIaPIi9y/lc2LmDCWzuCi35bcaQ+OtUh6nwBiFK7SOu25FAU5+YKdqFZUwtqGSdg=="; - }; - }; - "@types/node-16.0.1" = { - name = "_at_types_slash_node"; - packageName = "@types/node"; - version = "16.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-16.0.1.tgz"; - sha512 = "hBOx4SUlEPKwRi6PrXuTGw1z6lz0fjsibcWCM378YxsSu/6+C30L6CR49zIBKHiwNWCYIcOLjg4OHKZaFeLAug=="; - }; - }; "@types/node-16.3.2" = { name = "_at_types_slash_node"; packageName = "@types/node"; @@ -7168,6 +7195,15 @@ let sha512 = "jJs9ErFLP403I+hMLGnqDRWT0RYKSvArxuBVh2veudHV7ifEC1WAmjJADacZ7mRbA2nWgHtn8xyECMAot0SkAw=="; }; }; + "@types/node-16.3.3" = { + name = "_at_types_slash_node"; + packageName = "@types/node"; + version = "16.3.3"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/node/-/node-16.3.3.tgz"; + sha512 = "8h7k1YgQKxKXWckzFCMfsIwn0Y61UK6tlD6y2lOb3hTOIMlK3t9/QwHOhc81TwU+RMf0As5fj7NPjroERCnejQ=="; + }; + }; "@types/node-6.14.13" = { name = "_at_types_slash_node"; packageName = "@types/node"; @@ -7915,31 +7951,31 @@ let sha512 = "B6PedV/H2kcGEAgnqncwjHe3E8fqUNXCLv1BsrNwkHHWQJXkDN7dFeuEB4oaucBOVbjhH7KGLJ6JAiXPE3S7xA=="; }; }; - "@vue/compiler-core-3.1.4" = { + "@vue/compiler-core-3.1.5" = { name = "_at_vue_slash_compiler-core"; packageName = "@vue/compiler-core"; - version = "3.1.4"; + version = "3.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.1.4.tgz"; - sha512 = "TnUz+1z0y74O/A4YKAbzsdUfamyHV73MihrEfvettWpm9bQKVoZd1nEmR1cGN9LsXWlwAvVQBetBlWdOjmQO5Q=="; + url = "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.1.5.tgz"; + sha512 = "TXBhFinoBaXKDykJzY26UEuQU1K07FOp/0Ie+OXySqqk0bS0ZO7Xvl7UmiTUPYcLrWbxWBR7Bs/y55AI0MNc2Q=="; }; }; - "@vue/compiler-dom-3.1.4" = { + "@vue/compiler-dom-3.1.5" = { name = "_at_vue_slash_compiler-dom"; packageName = "@vue/compiler-dom"; - version = "3.1.4"; + version = "3.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.1.4.tgz"; - sha512 = "3tG2ScHkghhUBuFwl9KgyZhrS8CPFZsO7hUDekJgIp5b1OMkROr4AvxHu6rRMl4WkyvYkvidFNBS2VfOnwa6Kw=="; + url = "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.1.5.tgz"; + sha512 = "ZsL3jqJ52OjGU/YiT/9XiuZAmWClKInZM2aFJh9gnsAPqOrj2JIELMbkIFpVKR/CrVO/f2VxfPiiQdQTr65jcQ=="; }; }; - "@vue/shared-3.1.4" = { + "@vue/shared-3.1.5" = { name = "_at_vue_slash_shared"; packageName = "@vue/shared"; - version = "3.1.4"; + version = "3.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/@vue/shared/-/shared-3.1.4.tgz"; - sha512 = "6O45kZAmkLvzGLToBxEz4lR2W6kXohCtebV2UxjH9GXjd8X9AhEn68FN9eNanFtWNzvgw1hqd6HkPRVQalqf7Q=="; + url = "https://registry.npmjs.org/@vue/shared/-/shared-3.1.5.tgz"; + sha512 = "oJ4F3TnvpXaQwZJNF3ZK+kLPHKarDmJjJ6jyzVNDKH9md1dptjC7lWR//jrGuLdek/U6iltWxqAnYOu8gCiOvA=="; }; }; "@webassemblyjs/ast-1.11.1" = { @@ -9175,13 +9211,13 @@ let sha512 = "cnUG4NSBiM4YFBxgZIj/In3/6KX+rQ2l2YPRVcvAMQGWEPKuXoPIhxzwqh31jA3IPbI4qEOp/5ILI4ynioXsGQ=="; }; }; - "ajv-8.6.1" = { + "ajv-8.6.2" = { name = "ajv"; packageName = "ajv"; - version = "8.6.1"; + version = "8.6.2"; src = fetchurl { - url = "https://registry.npmjs.org/ajv/-/ajv-8.6.1.tgz"; - sha512 = "42VLtQUOLefAvKFAQIxIZDaThq6om/PrfP0CYk3/vn+y4BMNkKnbli8ON2QCiHov4KkzOSJ/xSoBJdayiiYvVQ=="; + url = "https://registry.npmjs.org/ajv/-/ajv-8.6.2.tgz"; + sha512 = "9807RlWAgT564wT+DjeyU5OFMPjmzxVobvDFmNAhY+5zD6A2ly3jDp6sgnfyDtlIQ+7H97oc/DGCzzfu9rjw9w=="; }; }; "ajv-errors-1.0.1" = { @@ -11191,22 +11227,13 @@ let sha512 = "tbMZ/Y2rRo6R6TTBODJXTiil+MXaoT6Qzotws3yvI1IWGpYxKo7N/3L06XB8ul8tCG0TigxIOY70SMICM70Ppg=="; }; }; - "aws-sdk-2.946.0" = { + "aws-sdk-2.948.0" = { name = "aws-sdk"; packageName = "aws-sdk"; - version = "2.946.0"; + version = "2.948.0"; src = fetchurl { - url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.946.0.tgz"; - sha512 = "d0fbVNHdpoeszGUcxOV8m+/kLNxUfKP5QsGwaRjcQfvEokFmvdKsvw87LhepFOa00NaI4J3jt8AbsX4mvmcChg=="; - }; - }; - "aws-sdk-2.947.0" = { - name = "aws-sdk"; - packageName = "aws-sdk"; - version = "2.947.0"; - src = fetchurl { - url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.947.0.tgz"; - sha512 = "m58mW/0Yg2RnRCJSzWZS8JUMhoBQ4trjKf+uJ3bD24jeV+Nf6iIHQ1s4ogP2O2XXUreSRsJNe8l0cOPSOM37Lg=="; + url = "https://registry.npmjs.org/aws-sdk/-/aws-sdk-2.948.0.tgz"; + sha512 = "UJaCwccNaNNFtbhlvg+BmcaVWNI7RPonZA16nca0s3O+UnHm5y5H/nN6XpuJp+NUrxrLgTFaztPvjmBp5q6p+g=="; }; }; "aws-sign2-0.6.0" = { @@ -11326,15 +11353,6 @@ let sha512 = "ifWaTHQ0ce+448CYop8AdrQiBsGrnC+bMgfyKFdi6EsPLTAWG+QfyDeM6OH+FmWnKvEq5NnBMLvlBUPKQZoDSg=="; }; }; - "babel-extract-comments-1.0.0" = { - name = "babel-extract-comments"; - packageName = "babel-extract-comments"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/babel-extract-comments/-/babel-extract-comments-1.0.0.tgz"; - sha512 = "qWWzi4TlddohA91bFwgt6zO/J0X+io7Qp184Fw0m2JYRSTZnJbFR8+07KmzudHCZgOiKRCrjhylwv9Xd8gfhVQ=="; - }; - }; "babel-helper-evaluate-path-0.5.0" = { name = "babel-helper-evaluate-path"; packageName = "babel-helper-evaluate-path"; @@ -11614,15 +11632,6 @@ let sha1 = "0af32a9a6e13ca7a3fd5069e62d7b0f58d0d8946"; }; }; - "babel-plugin-syntax-object-rest-spread-6.13.0" = { - name = "babel-plugin-syntax-object-rest-spread"; - packageName = "babel-plugin-syntax-object-rest-spread"; - version = "6.13.0"; - src = fetchurl { - url = "https://registry.npmjs.org/babel-plugin-syntax-object-rest-spread/-/babel-plugin-syntax-object-rest-spread-6.13.0.tgz"; - sha1 = "fd6536f2bce13836ffa3a5458c4903a597bb3bf5"; - }; - }; "babel-plugin-syntax-trailing-function-commas-7.0.0-beta.0" = { name = "babel-plugin-syntax-trailing-function-commas"; packageName = "babel-plugin-syntax-trailing-function-commas"; @@ -11677,15 +11686,6 @@ let sha1 = "acbb3e56a3555dd23928e4b582d285162dd2b198"; }; }; - "babel-plugin-transform-object-rest-spread-6.26.0" = { - name = "babel-plugin-transform-object-rest-spread"; - packageName = "babel-plugin-transform-object-rest-spread"; - version = "6.26.0"; - src = fetchurl { - url = "https://registry.npmjs.org/babel-plugin-transform-object-rest-spread/-/babel-plugin-transform-object-rest-spread-6.26.0.tgz"; - sha1 = "0f36692d50fef6b7e2d4b3ac1478137a963b7b06"; - }; - }; "babel-plugin-transform-property-literals-6.9.4" = { name = "babel-plugin-transform-property-literals"; packageName = "babel-plugin-transform-property-literals"; @@ -16420,13 +16420,13 @@ let sha512 = "vXTJhHebByxZn3lDvDJYw4lR5+uB3vuoHsuYA5AKuxRVn5wzzIfQKGLBmgdVRHKTJYeK5rvJcHnrd0Li49CFpg=="; }; }; - "color-3.1.3" = { + "color-3.2.0" = { name = "color"; packageName = "color"; - version = "3.1.3"; + version = "3.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/color/-/color-3.1.3.tgz"; - sha512 = "xgXAcTHa2HeFCGLE9Xs/R82hujGtu9Jd9x4NW3T34+OMs7VoPsjwzRczKHvTAHeJwWFwX5j15+MgAppE8ztObQ=="; + url = "https://registry.npmjs.org/color/-/color-3.2.0.tgz"; + sha512 = "4ximSqKXLTQmYLJuvrRHtpOqniR+ASoaVK+Rxdy6ZpfsLvUqtIM7oGGgopRG+O4p9NRv/AfuVD3jsvdxyXqozQ=="; }; }; "color-convert-1.9.3" = { @@ -16465,13 +16465,13 @@ let sha512 = "dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="; }; }; - "color-string-1.5.5" = { + "color-string-1.6.0" = { name = "color-string"; packageName = "color-string"; - version = "1.5.5"; + version = "1.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/color-string/-/color-string-1.5.5.tgz"; - sha512 = "jgIoum0OfQfq9Whcfc2z/VhCNcmQjWbey6qBX0vqt7YICflUmBCh9E9CiQD5GSJ+Uehixm3NUwHVhqUAWRivZg=="; + url = "https://registry.npmjs.org/color-string/-/color-string-1.6.0.tgz"; + sha512 = "c/hGS+kRWJutUBEngKKmk4iH3sD59MBkoxVapS/0wgpCz2u7XsNloxknyvBhzwEs1IbV36D9PwqLPJ2DTu3vMA=="; }; }; "color-support-1.1.3" = { @@ -17447,13 +17447,13 @@ let sha1 = "0e790b3abfef90f6ecb77ae8585db9099caf7578"; }; }; - "contentful-management-7.29.0" = { + "contentful-management-7.30.0" = { name = "contentful-management"; packageName = "contentful-management"; - version = "7.29.0"; + version = "7.30.0"; src = fetchurl { - url = "https://registry.npmjs.org/contentful-management/-/contentful-management-7.29.0.tgz"; - sha512 = "Wdyh+uaocvR2cim3NGEA43gX5Nw/rGTijE56zgjK2UFy0lg5Vm6p3wYetVTPO5cyTvnEWeoOIk9zJHUPaJtfCg=="; + url = "https://registry.npmjs.org/contentful-management/-/contentful-management-7.30.0.tgz"; + sha512 = "2aAIqLrxxCJt2bWg1LN+wxjYaevAHTsfZGkIPA5QRKK11WhpffrUMkTthbED6UWaY58BAM0TYXT3Z0s7nFu5zg=="; }; }; "contentful-sdk-core-6.8.0" = { @@ -22037,13 +22037,13 @@ let sha512 = "1sQ1DRtQGpglFhc3urD4olMJzt/wxlbnAAsf+WY2xHf5c50ZovivZvCXSpVgTOP9f4TzOMvelWyspyfhxQKHzQ=="; }; }; - "electron-to-chromium-1.3.776" = { + "electron-to-chromium-1.3.779" = { name = "electron-to-chromium"; packageName = "electron-to-chromium"; - version = "1.3.776"; + version = "1.3.779"; src = fetchurl { - url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.776.tgz"; - sha512 = "V0w7eFSBoFPpdw4xexjVPZ770UDZIevSwkkj4W97XbE3IsCsTRFpa7/yXGZ88EOQAUEA09JMMsWK0xsw0kRAYw=="; + url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.3.779.tgz"; + sha512 = "nreave0y/1Qhmo8XtO6C/LpawNyC6U26+q7d814/e+tIqUK073pM+4xW7WUXyqCRa5K4wdxHmNMBAi8ap9nEew=="; }; }; "electrum-client-git://github.com/janoside/electrum-client" = { @@ -23083,6 +23083,15 @@ let sha512 = "VLqz80i3as3NdloY44BQSJpFw534L9Oh+6zJOUaViV4JPd+DaHwutqP7tcpkW3YiXbK6s05RZl7yl7cQn+lijg=="; }; }; + "eslint-7.31.0" = { + name = "eslint"; + packageName = "eslint"; + version = "7.31.0"; + src = fetchurl { + url = "https://registry.npmjs.org/eslint/-/eslint-7.31.0.tgz"; + sha512 = "vafgJpSh2ia8tnTkNUkwxGmnumgckLh5aAbLa1xRmIn9+owi8qBNGKL+B881kNKNTy7FFqTEkpNkUvmw0n6PkA=="; + }; + }; "eslint-config-prettier-8.3.0" = { name = "eslint-config-prettier"; packageName = "eslint-config-prettier"; @@ -23875,15 +23884,6 @@ let sha512 = "0FU2hZ5Hh6iQnarpRtQurM/aAvp3RIbfvgLHrcqJYzhXyV2KFruhuChf9NC6waAhiUR7FFtlugkI4p7f2Fqlow=="; }; }; - "executable-4.1.1" = { - name = "executable"; - packageName = "executable"; - version = "4.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/executable/-/executable-4.1.1.tgz"; - sha512 = "8iA79xD3uAch729dUG8xaaBBFGaEa0wdD2VkYLFHwlqosEj/jT66AzcreRDSgV7ehnNLBW2WR5jIXwGKjVdTLg=="; - }; - }; "exegesis-2.5.7" = { name = "exegesis"; packageName = "exegesis"; @@ -24001,13 +24001,13 @@ let sha1 = "a793d3ac0cad4c6ab571e9968fbbab6cb2532929"; }; }; - "expo-pwa-0.0.88" = { + "expo-pwa-0.0.90" = { name = "expo-pwa"; packageName = "expo-pwa"; - version = "0.0.88"; + version = "0.0.90"; src = fetchurl { - url = "https://registry.npmjs.org/expo-pwa/-/expo-pwa-0.0.88.tgz"; - sha512 = "lQuJKKv7P8RLovMoLd+cdTtny2ePIAmBahK1btjYkoOzzpZ+JlTkU/BumddlUajkow/jNpQKTr3XdZE5KgNFSw=="; + url = "https://registry.npmjs.org/expo-pwa/-/expo-pwa-0.0.90.tgz"; + sha512 = "0uVXBgpe4Vt3xBKgAu7mmT+TMxiRJHXtMcP7FhaAPv1LkCxDrtMuK+SYERRJlTYRLX/qA2yDIWix3ySzvpWWzA=="; }; }; "express-2.5.11" = { @@ -25630,13 +25630,13 @@ let sha512 = "jlbUu0XkbpXeXhan5xyTqVK1jmEKNxE8hpzznI3TThHTr76GiFwK0iRzhDo4KNy+S9h/KxHaqVhTP86vA6wHCg=="; }; }; - "flow-parser-0.155.0" = { + "flow-parser-0.155.1" = { name = "flow-parser"; packageName = "flow-parser"; - version = "0.155.0"; + version = "0.155.1"; src = fetchurl { - url = "https://registry.npmjs.org/flow-parser/-/flow-parser-0.155.0.tgz"; - sha512 = "DegBwxIjw8ZmgLO9Qae/uSDWlioenV7mbfMoPem97y1OZVxlTAXNVHt5JthwrGLwk4kpmHQ3VRcp1Jxj84NcWw=="; + url = "https://registry.npmjs.org/flow-parser/-/flow-parser-0.155.1.tgz"; + sha512 = "EU55hHBilG20Qu80tMYrVjEIqB3FcXPPJwndNcf6UryvhiF74dQ2FX8zPV1LIpuvkW3P13wgZlsnG94oRihgpw=="; }; }; "fluent-ffmpeg-2.1.2" = { @@ -26080,6 +26080,15 @@ let sha512 = "X2KfTIV0cxIk3d7/2Pvp/pxL/xr2MV1WooyEzKtTWYSc1+52VF4YzjBTXqeOlSiZsPCxIBpDGfT9Dyo7WEY0DQ=="; }; }; + "fraction.js-4.1.1" = { + name = "fraction.js"; + packageName = "fraction.js"; + version = "4.1.1"; + src = fetchurl { + url = "https://registry.npmjs.org/fraction.js/-/fraction.js-4.1.1.tgz"; + sha512 = "MHOhvvxHTfRFpF1geTK9czMIZ6xclsEor2wkIGYYq+PxcQqT7vStJqjhe6S1TenZrMZzo+wlqOufBDVepUEgPg=="; + }; + }; "fragment-cache-0.2.1" = { name = "fragment-cache"; packageName = "fragment-cache"; @@ -27764,13 +27773,13 @@ let sha512 = "Vric7QFWxzHFxITZ10bmlG1H/5rhODb7hJuWyKWMD8GflpQzRmbMVqkFp3fKvN+U9tPwZItGVhkiOR+84PX3ew=="; }; }; - "google-gax-2.18.0" = { + "google-gax-2.19.0" = { name = "google-gax"; packageName = "google-gax"; - version = "2.18.0"; + version = "2.19.0"; src = fetchurl { - url = "https://registry.npmjs.org/google-gax/-/google-gax-2.18.0.tgz"; - sha512 = "PosKicp9XjnMIBMFOWkUfmVVEY6T9EdEs4t24Z3s7t/NOiL7zQAHBuIdCZ5/voxPiZr4SbyCOHF59/KqDjS70A=="; + url = "https://registry.npmjs.org/google-gax/-/google-gax-2.19.0.tgz"; + sha512 = "2a6WY+p6YMVMmwXmkRqiLreXx67xHDZhkmflcL8aDUkl1csx9ywxEI01veoDXy6T1l0JJD6zLbl5TIbWimmXrw=="; }; }; "google-p12-pem-3.1.0" = { @@ -29069,15 +29078,6 @@ let sha1 = "20bb7403d3cea398e91dc4710a8ff1b8274a25ed"; }; }; - "hoek-4.2.1" = { - name = "hoek"; - packageName = "hoek"; - version = "4.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/hoek/-/hoek-4.2.1.tgz"; - sha512 = "QLg82fGkfnJ/4iy1xZ81/9SIJiq1NGFUMGs6ParyjBZr6jW2Ufj/snDqTHixNlHdPNwN2RLVD0Pi3igeK9+JfA=="; - }; - }; "hogan.js-3.0.2" = { name = "hogan.js"; packageName = "hogan.js"; @@ -33066,15 +33066,6 @@ let sha1 = "06d4912255093419477d425633606e0e90782967"; }; }; - "joi-11.4.0" = { - name = "joi"; - packageName = "joi"; - version = "11.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/joi/-/joi-11.4.0.tgz"; - sha512 = "O7Uw+w/zEWgbL6OcHbyACKSj0PkQeUgmehdoXVSxt92QFCq4+1390Rwh5moI2K/OgC7D8RHRZqHZxT2husMJHA=="; - }; - }; "joi-17.4.1" = { name = "joi"; packageName = "joi"; @@ -35164,22 +35155,13 @@ let sha512 = "tq7AAMpjQ9sl58pW/qis/vOBzN7MCQ4F4n+ox4VQhyv1qVA+P2LgJq36I1Y6b4RX68+hK48u1eHDzSt527fEXA=="; }; }; - "lightning-3.3.13" = { + "lightning-3.3.16" = { name = "lightning"; packageName = "lightning"; - version = "3.3.13"; + version = "3.3.16"; src = fetchurl { - url = "https://registry.npmjs.org/lightning/-/lightning-3.3.13.tgz"; - sha512 = "sb2ll58VifSr82EBzppKO7H6Vwix/xiAJNmzWEym/mRApe9D2/eW/Fy8anpjICefPFmMRV1lovPUFHw+wuxF2Q=="; - }; - }; - "lightning-3.3.15" = { - name = "lightning"; - packageName = "lightning"; - version = "3.3.15"; - src = fetchurl { - url = "https://registry.npmjs.org/lightning/-/lightning-3.3.15.tgz"; - sha512 = "blbivgD+cHlwUbwMQmY9CVDaRAPCxrk8AKl/zr4F+P7Qqky4iKgm/aHmJ/4eGKa3caGftU3fR1q9pJh/mbRO2g=="; + url = "https://registry.npmjs.org/lightning/-/lightning-3.3.16.tgz"; + sha512 = "5rltlQighO0X6IjTbdsabtfT3ZY3kE6MZN6jmK4wz6Jt3eikxMbmzVBC5/UeyMb/3Fad3iHJIneXuhu76/eY/A=="; }; }; "lightning-3.3.9" = { @@ -35353,22 +35335,13 @@ let sha512 = "1SU0eG9/LDy6k3UGXaahmoe1wOahAJkaidWpLX5Nmlfq72I0arad420smma5ZGXAW4wNlGR/gx68KZzzYI5D4A=="; }; }; - "ln-service-51.8.6" = { + "ln-service-51.9.0" = { name = "ln-service"; packageName = "ln-service"; - version = "51.8.6"; + version = "51.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/ln-service/-/ln-service-51.8.6.tgz"; - sha512 = "r6beG0PFkK+yhbOQjvTAPf5XDNbzPZr8CE0W1k56T8Jg8mjmHrJCSOb0Tl646xgQgzFaIWe+MRdSButS5xvHAQ=="; - }; - }; - "ln-service-51.8.8" = { - name = "ln-service"; - packageName = "ln-service"; - version = "51.8.8"; - src = fetchurl { - url = "https://registry.npmjs.org/ln-service/-/ln-service-51.8.8.tgz"; - sha512 = "q3Aljr743seIqtaS5N7UUaFbHGhSQXsOs1zCuAWt6sFTq6A8BLJAjYbzHje9bwPEaiwIDOFeqKjCVp4IjE1Arw=="; + url = "https://registry.npmjs.org/ln-service/-/ln-service-51.9.0.tgz"; + sha512 = "4lbC1QZ/a4BuvO/0wd8DxRr5DxdYGugENoDo9X8xnUts9tGmYLb7g5yEXuk/Ff2LPTVUlK5imAsduobUVXOzlA=="; }; }; "ln-sync-0.4.6" = { @@ -35380,13 +35353,13 @@ let sha512 = "FMfcEISlboFVz+wLTAJ+FnEIQkoMR7IHcUg4l5JNwsU/UOijM1vTQDFhHVqg5fEQAFboZe3lNd7Rh1uxxqs47Q=="; }; }; - "ln-telegram-3.2.8" = { + "ln-telegram-3.2.9" = { name = "ln-telegram"; packageName = "ln-telegram"; - version = "3.2.8"; + version = "3.2.9"; src = fetchurl { - url = "https://registry.npmjs.org/ln-telegram/-/ln-telegram-3.2.8.tgz"; - sha512 = "3UpC8pChcDWv4sGBQoEulPUcj3DULCMKG0TTYHxkFOh/n3qSkn0jLJLUQLiOJQW55Co6KAANcmRrF2rLHuisRg=="; + url = "https://registry.npmjs.org/ln-telegram/-/ln-telegram-3.2.9.tgz"; + sha512 = "pjAkD1VLGLvwu1Dso3HvQDcK25L/slRX8nB7hTDDEznn+rRzxBJd1sXuNaFovwJHughvK3ZxUxAHC0BfzIatEw=="; }; }; "load-bmfont-1.4.1" = { @@ -37432,13 +37405,13 @@ let sha512 = "zTU3DaZaF3Rt9rhN3uBMGQD3dD2/vFQqnvZCDv4dl5iOzq2IZQqTxu90r4E5J+nP70J3ilqVCrbho2eWaeW8Ow=="; }; }; - "luxon-1.27.0" = { + "luxon-2.0.1" = { name = "luxon"; packageName = "luxon"; - version = "1.27.0"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/luxon/-/luxon-1.27.0.tgz"; - sha512 = "VKsFsPggTA0DvnxtJdiExAucKdAnwbCCNlMM5ENvHlxubqWd0xhZcdb4XgZ7QFNhaRhilXCFxHuoObP5BNA4PA=="; + url = "https://registry.npmjs.org/luxon/-/luxon-2.0.1.tgz"; + sha512 = "8Eawf81c9ZlQj62W3eq4mp+C7SAIAnmaS7ZuEAiX503YMcn+0C1JnMQRtfaQj6B5qTZLgHv0F4H5WabBCvi1fw=="; }; }; "lzma-native-6.0.1" = { @@ -41366,6 +41339,15 @@ let sha512 = "oUqnng1vhKLaA4GR+OzVbLuZZ7OOguKCtMHxHMiyP8+9mXidKfoCyc030LbAyNI3xcgCHHyitK3Q8wP+w6DwVQ=="; }; }; + "nocache-2.1.0" = { + name = "nocache"; + packageName = "nocache"; + version = "2.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/nocache/-/nocache-2.1.0.tgz"; + sha512 = "0L9FvHG3nfnnmaEQPjT9xhfN4ISk0A8/2j4M37Np4mcDesJjHgEUfgPhdCyZuFI954tjokaIj/A3NdpFNdEh4Q=="; + }; + }; "node-abi-2.30.0" = { name = "node-abi"; packageName = "node-abi"; @@ -43870,22 +43852,22 @@ let sha512 = "0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g=="; }; }; - "ot-builder-1.0.10" = { + "ot-builder-1.0.11" = { name = "ot-builder"; packageName = "ot-builder"; - version = "1.0.10"; + version = "1.0.11"; src = fetchurl { - url = "https://registry.npmjs.org/ot-builder/-/ot-builder-1.0.10.tgz"; - sha512 = "2zstOuPOmZi2lHwBU79Qa0Y5nwlsMhXvnSnsSMW0l4tTSpIVVe+UjlKlOyvTNA8sMw/rK2/53nTj8k9R78dl3A=="; + url = "https://registry.npmjs.org/ot-builder/-/ot-builder-1.0.11.tgz"; + sha512 = "bexZrUc8L6R5N47kgD52vMP6mU4y+09VTc2ZqZD/0uktzY4ksXCEjLcRkHe9uEocmq2jtuPFtpoSTaO9mTxrhA=="; }; }; - "otb-ttc-bundle-1.0.10" = { + "otb-ttc-bundle-1.0.11" = { name = "otb-ttc-bundle"; packageName = "otb-ttc-bundle"; - version = "1.0.10"; + version = "1.0.11"; src = fetchurl { - url = "https://registry.npmjs.org/otb-ttc-bundle/-/otb-ttc-bundle-1.0.10.tgz"; - sha512 = "t1RLC1ppX0CqI6WQ3/MfLnPsyzFqYo9MdZ6mWdSFxSlKHkJGWa+x0rMSTfCwiv9tGBPGusvN007A8855ZD4A5w=="; + url = "https://registry.npmjs.org/otb-ttc-bundle/-/otb-ttc-bundle-1.0.11.tgz"; + sha512 = "Wx/WXWyvWnlyTBBZBxOJsEWbBxf8MdOXNmggISi+0l4o63jobEe3ZB5oCOMbNyJPynqv+JyyrroVDTOuzP3HAQ=="; }; }; "ow-0.21.0" = { @@ -45382,13 +45364,13 @@ let sha512 = "8L6zlp+F4InnoFv0jjGdar948yEzP30bE96f6RHnECaUsU9BWRiTBhkAuhIobG4Lrr8CBscUcar7UWe0Bm1lqA=="; }; }; - "patrisika-scopes-0.11.1" = { + "patrisika-scopes-0.12.0" = { name = "patrisika-scopes"; packageName = "patrisika-scopes"; - version = "0.11.1"; + version = "0.12.0"; src = fetchurl { - url = "https://registry.npmjs.org/patrisika-scopes/-/patrisika-scopes-0.11.1.tgz"; - sha512 = "UCIBMx1nzNaR5CcDoQ9/jtY5RlJqf2CrJYHiMZJhi15NPvsPKRfJT/DPZMkhCunexOKmH03EDZYZU1hGn7mL0w=="; + url = "https://registry.npmjs.org/patrisika-scopes/-/patrisika-scopes-0.12.0.tgz"; + sha512 = "rj428KYq5leS75PCDl6iyl91n6/d63yw1ikHYwd1z9UXwWk11Vj2gpTu0CxjLZJJOiFNA01LiX+WMpC5icCKng=="; }; }; "pause-0.0.1" = { @@ -45418,13 +45400,13 @@ let sha512 = "iuh7L6jA7JEGu2WxDwtQP1ddOpaJNC4KlDEFfdQajSGgGPNi4OyDc2R7QnbY2bR9QjBVGwgvTdNJZoE7RaxUMA=="; }; }; - "peek-readable-3.1.4" = { + "peek-readable-4.0.0" = { name = "peek-readable"; packageName = "peek-readable"; - version = "3.1.4"; + version = "4.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/peek-readable/-/peek-readable-3.1.4.tgz"; - sha512 = "DX7ec7frSMtCWw+zMd27f66hcxIz/w9LQTY2RflB4WNHCVPAye1pJiP2t3gvaaOhu7IOhtPbHw8MemMj+F5lrg=="; + url = "https://registry.npmjs.org/peek-readable/-/peek-readable-4.0.0.tgz"; + sha512 = "kLbU4cz6h86poGVBKgAVMpFmD47nX04fPPQNKnv9fuj+IJZYkEBjsYAVu5nDbZWx0ZsWwWlMzeG90zQa5KLBaA=="; }; }; "peek-stream-1.1.3" = { @@ -47147,6 +47129,15 @@ let sha512 = "kbo/kq2LQ/A/is0PQwsEHM7Ca6//bGPPvU6UnsdDRSKTWxT/ru/xb88v4BJf6a69H+uTytOEsTusT9ksd/1iWQ=="; }; }; + "pretty-format-26.6.2" = { + name = "pretty-format"; + packageName = "pretty-format"; + version = "26.6.2"; + src = fetchurl { + url = "https://registry.npmjs.org/pretty-format/-/pretty-format-26.6.2.tgz"; + sha512 = "7AeGuCYNGmycyQbCqd/3PWH4eOoX/OiCa0uphp57NVTeAGdJGaAliecxwBDHYQCIvrW7aDBZCYeNTP/WX69mkg=="; + }; + }; "pretty-hash-1.0.1" = { name = "pretty-hash"; packageName = "pretty-hash"; @@ -48830,13 +48821,13 @@ let sha1 = "15931d3cd967ade52206f523aa7331aef7d43af7"; }; }; - "pyright-1.1.156" = { + "pyright-1.1.157" = { name = "pyright"; packageName = "pyright"; - version = "1.1.156"; + version = "1.1.157"; src = fetchurl { - url = "https://registry.npmjs.org/pyright/-/pyright-1.1.156.tgz"; - sha512 = "TIe7mK/BUTmdTBpmEYYT5XuRp8qwaFUxF2782HTTTe3hT2UU8UUN0wtIqwHpgFJZksIbahx4UeJyTaOi4ssq6A=="; + url = "https://registry.npmjs.org/pyright/-/pyright-1.1.157.tgz"; + sha512 = "slTex47hQKuyoi579Zk7lEhVH+4Dmn+eZ3gP1JGcFBcbcmDwd9ZI1ESww3jY3YoOYdNbYTafxBNuh3RHGkGiMA=="; }; }; "q-0.9.7" = { @@ -49613,13 +49604,13 @@ let sha512 = "dx0LvIGHcOPtKbeiSUM4jqpBl3TcY7CDjZdfOIcKeznE7BWr9dg0iPG90G5yfVQ+p/rGNMXdbfStvzQZEVEi4A=="; }; }; - "react-devtools-core-4.13.5" = { + "react-devtools-core-4.14.0" = { name = "react-devtools-core"; packageName = "react-devtools-core"; - version = "4.13.5"; + version = "4.14.0"; src = fetchurl { - url = "https://registry.npmjs.org/react-devtools-core/-/react-devtools-core-4.13.5.tgz"; - sha512 = "k+P5VSKM6P22Go9IQ8dJmjj9fbztvKt1iRDI/4wS5oTvd1EnytIJMYB59wZt+D3kgp64jklNX/MRmY42xAQ08g=="; + url = "https://registry.npmjs.org/react-devtools-core/-/react-devtools-core-4.14.0.tgz"; + sha512 = "cE7tkSUkGCDxTA79pntDGJCBgzNN/XxA3kgPdXujdfSfEfVhzrItQIEsN0kCN/hJJACDvH2Q8p5+tJb/K4B3qA=="; }; }; "react-dom-16.14.0" = { @@ -49676,6 +49667,15 @@ let sha512 = "24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ=="; }; }; + "react-is-17.0.2" = { + name = "react-is"; + packageName = "react-is"; + version = "17.0.2"; + src = fetchurl { + url = "https://registry.npmjs.org/react-is/-/react-is-17.0.2.tgz"; + sha512 = "w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w=="; + }; + }; "react-lifecycles-compat-3.0.4" = { name = "react-lifecycles-compat"; packageName = "react-lifecycles-compat"; @@ -50288,13 +50288,13 @@ let sha1 = "b66d828cdcafe6b4b8a428a7def4c6bcac31c8b4"; }; }; - "redoc-2.0.0-rc.54" = { + "redoc-2.0.0-rc.55" = { name = "redoc"; packageName = "redoc"; - version = "2.0.0-rc.54"; + version = "2.0.0-rc.55"; src = fetchurl { - url = "https://registry.npmjs.org/redoc/-/redoc-2.0.0-rc.54.tgz"; - sha512 = "xwukaWdoktkDAoQuhajekdC54+/lSLwIUqJCNSTVEjeYEuZPq2tFUj9H5SBt8/YSq5UF/zOmDQrXPWMgildQpQ=="; + url = "https://registry.npmjs.org/redoc/-/redoc-2.0.0-rc.55.tgz"; + sha512 = "32sUHhc33m8zQKz2V7xREwlf05S52dDOkn7K0WMquu2GDl6ZquxmrQfqnlj0IPoVCWQPR+XosmmIJj4rZbqjeA=="; }; }; "reduce-component-1.0.1" = { @@ -53708,13 +53708,13 @@ let sha512 = "tf+h5W1IrjNm/9rKKj0JU2MDMruiopx0jjVA5zCdBtcGjfp0+c5rHw/zADLC3IeKlGHtVbHtpfzvYA0OYT+HKg=="; }; }; - "slugify-1.5.3" = { + "slugify-1.6.0" = { name = "slugify"; packageName = "slugify"; - version = "1.5.3"; + version = "1.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/slugify/-/slugify-1.5.3.tgz"; - sha512 = "/HkjRdwPY3yHJReXu38NiusZw2+LLE2SrhkWJtmlPDB1fqFSvioYj62NkPcrKiNCgRLeGcGK7QBvr1iQwybeXw=="; + url = "https://registry.npmjs.org/slugify/-/slugify-1.6.0.tgz"; + sha512 = "FkMq+MQc5hzYgM86nLuHI98Acwi3p4wX+a5BO9Hhw4JdK4L7WueIiZ4tXEobImPqBz2sVcV0+Mu3GRB30IGang=="; }; }; "smart-buffer-4.1.0" = { @@ -54527,6 +54527,15 @@ let sha512 = "CkCj6giN3S+n9qrYiBTX5gystlENnRW5jZeNLHpe6aue+SrHcG5VYwujhW9s4dY31mEGsxBDrHR6oI69fTXsaQ=="; }; }; + "source-map-0.8.0-beta.0" = { + name = "source-map"; + packageName = "source-map"; + version = "0.8.0-beta.0"; + src = fetchurl { + url = "https://registry.npmjs.org/source-map/-/source-map-0.8.0-beta.0.tgz"; + sha512 = "2ymg6oRBpebeZi9UUNsgQ89bhx01TcTkmNTGnNO88imTmbSgy4nfujrgVEFKWpMTEGA11EDkTt7mqObTPdigIA=="; + }; + }; "source-map-js-0.6.2" = { name = "source-map-js"; packageName = "source-map-js"; @@ -56462,13 +56471,13 @@ let sha1 = "e5211e9224369fbb81d633a2f00044dc8cedad92"; }; }; - "strip-comments-1.0.2" = { + "strip-comments-2.0.1" = { name = "strip-comments"; packageName = "strip-comments"; - version = "1.0.2"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/strip-comments/-/strip-comments-1.0.2.tgz"; - sha512 = "kL97alc47hoyIQSV165tTt9rG5dn4w1dNnBhOQ3bOU1Nc1hel09jnXANaHJ7vzHLd4Ju8kseDGzlev96pghLFw=="; + url = "https://registry.npmjs.org/strip-comments/-/strip-comments-2.0.1.tgz"; + sha512 = "ZprKx+bBLXv067WTCALv8SSz5l2+XhpYCsVtSqlMnkAXMWDq+/ekVbl1ghqP9rUHTzv6sm/DwCOiYutU/yp1fw=="; }; }; "strip-dirs-2.1.0" = { @@ -56615,13 +56624,13 @@ let sha1 = "0fdedc68e91addcfcb2e6be9c262581a6e8c28aa"; }; }; - "strtok3-6.1.3" = { + "strtok3-6.2.0" = { name = "strtok3"; packageName = "strtok3"; - version = "6.1.3"; + version = "6.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/strtok3/-/strtok3-6.1.3.tgz"; - sha512 = "ssWSKFOeUTurMSucgyUf+a6Z9mVTYrsYiyEK5RLnh8BM6sFrKSljVlnjZXIDxMguYfdQI+mUPFHo88FYTxq1XA=="; + url = "https://registry.npmjs.org/strtok3/-/strtok3-6.2.0.tgz"; + sha512 = "hBbPN4+f9fypbfTs0NImALgzYcb6k/blFr2mJVX6bUOmJCbXe/trDHdIC+Ir5XUXRMGFvq487ecwLitDoHVoew=="; }; }; "structured-source-3.0.2" = { @@ -57020,13 +57029,13 @@ let sha512 = "mDAmaltQl6e5zU2VEtoWEf7eLTfuOTGr9zt+BpA3AGHo8MIhKiNSPE9OLTCTOMgj0vj/uL9QBbaNmpG4G1CgIA=="; }; }; - "svelte2tsx-0.4.1" = { + "svelte2tsx-0.4.2" = { name = "svelte2tsx"; packageName = "svelte2tsx"; - version = "0.4.1"; + version = "0.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/svelte2tsx/-/svelte2tsx-0.4.1.tgz"; - sha512 = "qqXWg+wlsYXhtolKI2NGL52rK7ACejNzEKn98qcz2T6Fd1e73+YPZMw/FNeGRSZLCdNxzGf7QJDhzIiK3MXihA=="; + url = "https://registry.npmjs.org/svelte2tsx/-/svelte2tsx-0.4.2.tgz"; + sha512 = "ya93OOdT/WvHVEEvQ3u+Y4lkUqq0D+mD1szbGUWcYVOdBjJyXUF5MhKS5HEJHWQw4r+XK9UlHk52BMeXR2SI8A=="; }; }; "sver-compat-1.5.0" = { @@ -57317,13 +57326,13 @@ let sha512 = "33+lQwlLxXoxy0o9WLOgw8OjbXeS3Jv+pSl+nxKc2AOClBI28HsdRPpH0u9Xa9OVjHLT9vonnOMw1ug7YXI0dA=="; }; }; - "systeminformation-5.7.7" = { + "systeminformation-5.7.8" = { name = "systeminformation"; packageName = "systeminformation"; - version = "5.7.7"; + version = "5.7.8"; src = fetchurl { - url = "https://registry.npmjs.org/systeminformation/-/systeminformation-5.7.7.tgz"; - sha512 = "aQ7MBeVI2MKPYOi3YJAoZ45JVlRkBA7IXoqGgtVBamvtE0I6JLOyJzD/VVc9pnMXDb3yqaMwssAjhwtJax4/Rw=="; + url = "https://registry.npmjs.org/systeminformation/-/systeminformation-5.7.8.tgz"; + sha512 = "gpFGDPtOtWDxMaQ6/7oe2XM/4ErgSvev1l3sdxChnm1AqDJKzZ3cu+VK7Dq1N02pChPiNNsIbUwe6dCLixfWRg=="; }; }; "table-3.8.3" = { @@ -57768,6 +57777,15 @@ let sha512 = "WrH/pui8YCwmeiAoxV+lpRH9HpRtgBhSR2ViBPgpGb/wnYDzp21R4MN45fsCGvLROvY67o3byhJRYRONJyImVQ=="; }; }; + "tempy-0.6.0" = { + name = "tempy"; + packageName = "tempy"; + version = "0.6.0"; + src = fetchurl { + url = "https://registry.npmjs.org/tempy/-/tempy-0.6.0.tgz"; + sha512 = "G13vtMYPT/J8A4X2SjdtBTphZlrp1gKv6hZiOjw14RCWg6GbHuQBGtjlx75xLbYV/wEc0D7G5K4rxKP/cXk8Bw=="; + }; + }; "tempy-0.7.1" = { name = "tempy"; packageName = "tempy"; @@ -58803,15 +58821,6 @@ let sha512 = "EU+UA4zHc06TkVQaravNNVdqX763/ENTIOKiKlqSJ6WKCPwLxHjvY3d0uEJYaq92iojyHPwD2iaYbZKjdw3icA=="; }; }; - "topo-2.0.2" = { - name = "topo"; - packageName = "topo"; - version = "2.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/topo/-/topo-2.0.2.tgz"; - sha1 = "cd5615752539057c0dc0491a621c3bc6fbe1d182"; - }; - }; "topojson-client-3.1.0" = { name = "topojson-client"; packageName = "topojson-client"; @@ -62134,13 +62143,13 @@ let sha512 = "/juG65kTL4Cy2su4P8HjtkTxk6VmJDiOPBufWniqQ6wknac6jNiXS9vU+hO3wgusiyqWlzTbVHi0dyJqRONg3w=="; }; }; - "verda-1.2.2" = { + "verda-1.3.0" = { name = "verda"; packageName = "verda"; - version = "1.2.2"; + version = "1.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/verda/-/verda-1.2.2.tgz"; - sha512 = "qWyG2W2wgAw27sV5kVUjceb7GBwUFleVjBmH5XA4L9J8rLpB10N7uaP45ZDYGA7gRuNjo/5futihrBWbKKvJ0Q=="; + url = "https://registry.npmjs.org/verda/-/verda-1.3.0.tgz"; + sha512 = "EldyK2oyHMxIKj5aMC1R75aN1XH8vH96ga1PgkuXrK5ZhYndR4g8TvBTomXpIgGvwhICjq5LZITZ37Xz/YHxAg=="; }; }; "verror-1.1.0" = { @@ -62620,13 +62629,13 @@ let sha512 = "QW2SFk4kln5lTPQajGNuXWtmr2z9hVA6Sfi4qPFEW2vjt2XaUAp38/1OrcUQYiJXOyXntbWN2jZJaGxg+hDUxw=="; }; }; - "vscode-json-languageservice-4.1.5" = { + "vscode-json-languageservice-4.1.6" = { name = "vscode-json-languageservice"; packageName = "vscode-json-languageservice"; - version = "4.1.5"; + version = "4.1.6"; src = fetchurl { - url = "https://registry.npmjs.org/vscode-json-languageservice/-/vscode-json-languageservice-4.1.5.tgz"; - sha512 = "oRVPj2UY6BQ8PQ1LIz/FigUEZQVqsB9msNCFlxRBHE9sSEIJkCbYG6aCB2n7WR17VIisYQdO3MDheuoyI48G2w=="; + url = "https://registry.npmjs.org/vscode-json-languageservice/-/vscode-json-languageservice-4.1.6.tgz"; + sha512 = "DIKb3tcfRtb3tIE6g9SLOl5E9tNSt6kljH08Wa5RwFlVshtXGrDDzttchze4CYy9pJpE9mBtCbRHmLvY1Z1ZXA=="; }; }; "vscode-jsonrpc-3.5.0" = { @@ -62998,13 +63007,13 @@ let sha512 = "u0Lw+IYlgbEJFF6/qAqG2d1jQmJl0eyAGJHoAJqr2HT4M2BNuQYSEiSE75f52pXHSJm8AlTjnLLbBFPrdz2hpA=="; }; }; - "vscode-test-1.5.2" = { + "vscode-test-1.6.1" = { name = "vscode-test"; packageName = "vscode-test"; - version = "1.5.2"; + version = "1.6.1"; src = fetchurl { - url = "https://registry.npmjs.org/vscode-test/-/vscode-test-1.5.2.tgz"; - sha512 = "x9PVfKxF6EInH9iSFGQi0V8H5zIW1fC7RAer6yNQR6sy3WyOwlWkuT3I+wf75xW/cO53hxMi1aj/EvqQfDFOAg=="; + url = "https://registry.npmjs.org/vscode-test/-/vscode-test-1.6.1.tgz"; + sha512 = "086q88T2ca1k95mUzffvbzb7esqQNvJgiwY4h29ukPhFo8u+vXOOmelUoU5EQUHs3Of8+JuQ3oGdbVCqaxuTXA=="; }; }; "vscode-textbuffer-1.0.0" = { @@ -63430,13 +63439,13 @@ let sha512 = "ex3nB9uxNI0azzb0r3xGwi+LS5Gw1RCRSKk0kg3kq9MYdIPmLS6UI3oEtG7esBaB51t9I+5H+vHmL3htaxqMSw=="; }; }; - "webpack-5.44.0" = { + "webpack-5.45.1" = { name = "webpack"; packageName = "webpack"; - version = "5.44.0"; + version = "5.45.1"; src = fetchurl { - url = "https://registry.npmjs.org/webpack/-/webpack-5.44.0.tgz"; - sha512 = "I1S1w4QLoKmH19pX6YhYN0NiSXaWY8Ou00oA+aMcr9IUGeF5azns+IKBkfoAAG9Bu5zOIzZt/mN35OffBya8AQ=="; + url = "https://registry.npmjs.org/webpack/-/webpack-5.45.1.tgz"; + sha512 = "68VT2ZgG9EHs6h6UxfV2SEYewA9BA3SOLSnC2NEbJJiEwbAiueDL033R1xX0jzjmXvMh0oSeKnKgbO2bDXIEyQ=="; }; }; "webpack-bundle-analyzer-3.9.0" = { @@ -64159,139 +64168,157 @@ let sha512 = "mO8XtqyPvykVCsrwj5MlOVWvSnCdT+C+QVbm6blradR7JExAhbkZ7hZ9A+9NUtwzSqrlUo9a67ws0EiILrvRpw=="; }; }; - "workbox-background-sync-3.6.3" = { + "workbox-background-sync-6.1.5" = { name = "workbox-background-sync"; packageName = "workbox-background-sync"; - version = "3.6.3"; + version = "6.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/workbox-background-sync/-/workbox-background-sync-3.6.3.tgz"; - sha512 = "ypLo0B6dces4gSpaslmDg5wuoUWrHHVJfFWwl1udvSylLdXvnrfhFfriCS42SNEe5lsZtcNZF27W/SMzBlva7Q=="; + url = "https://registry.npmjs.org/workbox-background-sync/-/workbox-background-sync-6.1.5.tgz"; + sha512 = "VbUmPLsdz+sLzuNxHvMylzyRTiM4q+q7rwLBk3p2mtRL5NZozI8j/KgoGbno96vs84jx4b9zCZMEOIKEUTPf6w=="; }; }; - "workbox-broadcast-cache-update-3.6.3" = { - name = "workbox-broadcast-cache-update"; - packageName = "workbox-broadcast-cache-update"; - version = "3.6.3"; + "workbox-broadcast-update-6.1.5" = { + name = "workbox-broadcast-update"; + packageName = "workbox-broadcast-update"; + version = "6.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/workbox-broadcast-cache-update/-/workbox-broadcast-cache-update-3.6.3.tgz"; - sha512 = "pJl4lbClQcvp0SyTiEw0zLSsVYE1RDlCPtpKnpMjxFtu8lCFTAEuVyzxp9w7GF4/b3P4h5nyQ+q7V9mIR7YzGg=="; + url = "https://registry.npmjs.org/workbox-broadcast-update/-/workbox-broadcast-update-6.1.5.tgz"; + sha512 = "zGrTTs+n4wHpYtqYMqBg6kl/x5j1UrczGCQnODSHTxIDV8GXLb/GtA1BCZdysNxpMmdVSeLmTcgIYAAqWFamrA=="; }; }; - "workbox-build-3.6.3" = { + "workbox-build-6.1.5" = { name = "workbox-build"; packageName = "workbox-build"; - version = "3.6.3"; + version = "6.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/workbox-build/-/workbox-build-3.6.3.tgz"; - sha512 = "w0clZ/pVjL8VXy6GfthefxpEXs0T8uiRuopZSFVQ8ovfbH6c6kUpEh6DcYwm/Y6dyWPiCucdyAZotgjz+nRz8g=="; + url = "https://registry.npmjs.org/workbox-build/-/workbox-build-6.1.5.tgz"; + sha512 = "P+fakR5QFVqJN9l9xHVXtmafga72gh9I+jM3A9HiB/6UNRmOAejXnDgD+RMegOHgQHPwnB44TalMToFaXKWIyA=="; }; }; - "workbox-cache-expiration-3.6.3" = { - name = "workbox-cache-expiration"; - packageName = "workbox-cache-expiration"; - version = "3.6.3"; - src = fetchurl { - url = "https://registry.npmjs.org/workbox-cache-expiration/-/workbox-cache-expiration-3.6.3.tgz"; - sha512 = "+ECNph/6doYx89oopO/UolYdDmQtGUgo8KCgluwBF/RieyA1ZOFKfrSiNjztxOrGJoyBB7raTIOlEEwZ1LaHoA=="; - }; - }; - "workbox-cacheable-response-3.6.3" = { + "workbox-cacheable-response-6.1.5" = { name = "workbox-cacheable-response"; packageName = "workbox-cacheable-response"; - version = "3.6.3"; + version = "6.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/workbox-cacheable-response/-/workbox-cacheable-response-3.6.3.tgz"; - sha512 = "QpmbGA9SLcA7fklBLm06C4zFg577Dt8u3QgLM0eMnnbaVv3rhm4vbmDpBkyTqvgK/Ly8MBDQzlXDtUCswQwqqg=="; + url = "https://registry.npmjs.org/workbox-cacheable-response/-/workbox-cacheable-response-6.1.5.tgz"; + sha512 = "x8DC71lO/JCgiaJ194l9le8wc8lFPLgUpDkLhp2si7mXV6S/wZO+8Osvw1LLgYa8YYTWGbhbFhFTXIkEMknIIA=="; }; }; - "workbox-core-3.6.3" = { + "workbox-core-6.1.5" = { name = "workbox-core"; packageName = "workbox-core"; - version = "3.6.3"; + version = "6.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/workbox-core/-/workbox-core-3.6.3.tgz"; - sha512 = "cx9cx0nscPkIWs8Pt98HGrS9/aORuUcSkWjG25GqNWdvD/pSe7/5Oh3BKs0fC+rUshCiyLbxW54q0hA+GqZeSQ=="; + url = "https://registry.npmjs.org/workbox-core/-/workbox-core-6.1.5.tgz"; + sha512 = "9SOEle7YcJzg3njC0xMSmrPIiFjfsFm9WjwGd5enXmI8Lwk8wLdy63B0nzu5LXoibEmS9k+aWF8EzaKtOWjNSA=="; }; }; - "workbox-google-analytics-3.6.3" = { + "workbox-expiration-6.1.5" = { + name = "workbox-expiration"; + packageName = "workbox-expiration"; + version = "6.1.5"; + src = fetchurl { + url = "https://registry.npmjs.org/workbox-expiration/-/workbox-expiration-6.1.5.tgz"; + sha512 = "6cN+FVbh8fNq56LFKPMchGNKCJeyboHsDuGBqmhDUPvD4uDjsegQpDQzn52VaE0cpywbSIsDF/BSq9E9Yjh5oQ=="; + }; + }; + "workbox-google-analytics-6.1.5" = { name = "workbox-google-analytics"; packageName = "workbox-google-analytics"; - version = "3.6.3"; + version = "6.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/workbox-google-analytics/-/workbox-google-analytics-3.6.3.tgz"; - sha512 = "RQBUo/6SXtIaQTRFj4RQZ9e1gAl7D8oS5S+Hi173Kk70/BgJjzPwXpC5A249Jv5YfkCOLMQCeF9A27BiD0b0ig=="; + url = "https://registry.npmjs.org/workbox-google-analytics/-/workbox-google-analytics-6.1.5.tgz"; + sha512 = "LYsJ/VxTkYVLxM1uJKXZLz4cJdemidY7kPyAYtKVZ6EiDG89noASqis75/5lhqM1m3HwQfp2DtoPrelKSpSDBA=="; }; }; - "workbox-navigation-preload-3.6.3" = { + "workbox-navigation-preload-6.1.5" = { name = "workbox-navigation-preload"; packageName = "workbox-navigation-preload"; - version = "3.6.3"; + version = "6.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/workbox-navigation-preload/-/workbox-navigation-preload-3.6.3.tgz"; - sha512 = "dd26xTX16DUu0i+MhqZK/jQXgfIitu0yATM4jhRXEmpMqQ4MxEeNvl2CgjDMOHBnCVMax+CFZQWwxMx/X/PqCw=="; + url = "https://registry.npmjs.org/workbox-navigation-preload/-/workbox-navigation-preload-6.1.5.tgz"; + sha512 = "hDbNcWlffv0uvS21jCAC/mYk7NzaGRSWOQXv1p7bj2aONAX5l699D2ZK4D27G8TO0BaLHUmW/1A5CZcsvweQdg=="; }; }; - "workbox-precaching-3.6.3" = { + "workbox-precaching-6.1.5" = { name = "workbox-precaching"; packageName = "workbox-precaching"; - version = "3.6.3"; + version = "6.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/workbox-precaching/-/workbox-precaching-3.6.3.tgz"; - sha512 = "aBqT66BuMFviPTW6IpccZZHzpA8xzvZU2OM1AdhmSlYDXOJyb1+Z6blVD7z2Q8VNtV1UVwQIdImIX+hH3C3PIw=="; + url = "https://registry.npmjs.org/workbox-precaching/-/workbox-precaching-6.1.5.tgz"; + sha512 = "yhm1kb6wgi141JeM5X7z42XJxCry53tbMLB3NgrxktrZbwbrJF8JILzYy+RFKC9tHC6u2bPmL789GPLT2NCDzw=="; }; }; - "workbox-range-requests-3.6.3" = { + "workbox-range-requests-6.1.5" = { name = "workbox-range-requests"; packageName = "workbox-range-requests"; - version = "3.6.3"; + version = "6.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/workbox-range-requests/-/workbox-range-requests-3.6.3.tgz"; - sha512 = "R+yLWQy7D9aRF9yJ3QzwYnGFnGDhMUij4jVBUVtkl67oaVoP1ymZ81AfCmfZro2kpPRI+vmNMfxxW531cqdx8A=="; + url = "https://registry.npmjs.org/workbox-range-requests/-/workbox-range-requests-6.1.5.tgz"; + sha512 = "iACChSapzB0yuIum3ascP/+cfBNuZi5DRrE+u4u5mCHigPlwfSWtlaY+y8p+a8EwcDTVTZVtnrGrRnF31SiLqQ=="; }; }; - "workbox-routing-3.6.3" = { + "workbox-recipes-6.1.5" = { + name = "workbox-recipes"; + packageName = "workbox-recipes"; + version = "6.1.5"; + src = fetchurl { + url = "https://registry.npmjs.org/workbox-recipes/-/workbox-recipes-6.1.5.tgz"; + sha512 = "MD1yabHca6O/oj1hrRdfj9cRwhKA5zqIE53rWOAg/dKMMzWQsf9nyRbXRgzK3a13iQvYKuQzURU4Cx58tdnR+Q=="; + }; + }; + "workbox-routing-6.1.5" = { name = "workbox-routing"; packageName = "workbox-routing"; - version = "3.6.3"; + version = "6.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/workbox-routing/-/workbox-routing-3.6.3.tgz"; - sha512 = "bX20i95OKXXQovXhFOViOK63HYmXvsIwZXKWbSpVeKToxMrp0G/6LZXnhg82ijj/S5yhKNRf9LeGDzaqxzAwMQ=="; + url = "https://registry.npmjs.org/workbox-routing/-/workbox-routing-6.1.5.tgz"; + sha512 = "uC/Ctz+4GXGL42h1WxUNKxqKRik/38uS0NZ6VY/EHqL2F1ObLFqMHUZ4ZYvyQsKdyI82cxusvhJZHOrY0a2fIQ=="; }; }; - "workbox-strategies-3.6.3" = { + "workbox-strategies-6.1.5" = { name = "workbox-strategies"; packageName = "workbox-strategies"; - version = "3.6.3"; + version = "6.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/workbox-strategies/-/workbox-strategies-3.6.3.tgz"; - sha512 = "Pg5eulqeKet2y8j73Yw6xTgLdElktcWExGkzDVCGqfV9JCvnGuEpz5eVsCIK70+k4oJcBCin9qEg3g3CwEIH3g=="; + url = "https://registry.npmjs.org/workbox-strategies/-/workbox-strategies-6.1.5.tgz"; + sha512 = "QhiOn9KT9YGBdbfWOmJT6pXZOIAxaVrs6J6AMYzRpkUegBTEcv36+ZhE/cfHoT0u2fxVtthHnskOQ/snEzaXQw=="; }; }; - "workbox-streams-3.6.3" = { + "workbox-streams-6.1.5" = { name = "workbox-streams"; packageName = "workbox-streams"; - version = "3.6.3"; + version = "6.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/workbox-streams/-/workbox-streams-3.6.3.tgz"; - sha512 = "rqDuS4duj+3aZUYI1LsrD2t9hHOjwPqnUIfrXSOxSVjVn83W2MisDF2Bj+dFUZv4GalL9xqErcFW++9gH+Z27w=="; + url = "https://registry.npmjs.org/workbox-streams/-/workbox-streams-6.1.5.tgz"; + sha512 = "OI1kLvRHGFXV+soDvs6aEwfBwdAkvPB0mRryqdh3/K17qUj/1gRXc8QtpgU+83xqx/I/ar2bTCIj0KPzI/ChCQ=="; }; }; - "workbox-sw-3.6.3" = { + "workbox-sw-6.1.5" = { name = "workbox-sw"; packageName = "workbox-sw"; - version = "3.6.3"; + version = "6.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/workbox-sw/-/workbox-sw-3.6.3.tgz"; - sha512 = "IQOUi+RLhvYCiv80RP23KBW/NTtIvzvjex28B8NW1jOm+iV4VIu3VXKXTA6er5/wjjuhmtB28qEAUqADLAyOSg=="; + url = "https://registry.npmjs.org/workbox-sw/-/workbox-sw-6.1.5.tgz"; + sha512 = "IMDiqxYbKzPorZLGMUMacLB6r76iVQbdTzYthIZoPfy+uFURJFUtqiWQJKg1L+RMyuYXwKXTahCIGkgFs4jBeg=="; }; }; - "workbox-webpack-plugin-3.6.3" = { + "workbox-webpack-plugin-6.1.5" = { name = "workbox-webpack-plugin"; packageName = "workbox-webpack-plugin"; - version = "3.6.3"; + version = "6.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/workbox-webpack-plugin/-/workbox-webpack-plugin-3.6.3.tgz"; - sha512 = "RwmKjc7HFHUFHoOlKoZUq9349u0QN3F8W5tZZU0vc1qsBZDINWXRiIBCAKvo/Njgay5sWz7z4I2adnyTo97qIQ=="; + url = "https://registry.npmjs.org/workbox-webpack-plugin/-/workbox-webpack-plugin-6.1.5.tgz"; + sha512 = "tsgeNAYiFP4STNPDxBVT58eiU8nGUmcv7Lq9FFJkQf5MMu6tPw1OLp+KpszhbCWP+R/nEdu85Gjexs6fY647Kg=="; + }; + }; + "workbox-window-6.1.5" = { + name = "workbox-window"; + packageName = "workbox-window"; + version = "6.1.5"; + src = fetchurl { + url = "https://registry.npmjs.org/workbox-window/-/workbox-window-6.1.5.tgz"; + sha512 = "akL0X6mAegai2yypnq78RgfazeqvKbsllRtEI4dnbhPcRINEY1NmecFmsQk8SD+zWLK1gw5OdwAOX+zHSRVmeA=="; }; }; "worker-farm-1.7.0" = { @@ -64591,24 +64618,6 @@ let sha512 = "6ezXvzOZupqKj4jUqbQ9tXuJNo+BR2gU8fFRk3XCP3e0G6WT414u5ELe6Y0vtp7kmSJ3F7YWObSNr1ESsgi4vw=="; }; }; - "ws-7.5.1" = { - name = "ws"; - packageName = "ws"; - version = "7.5.1"; - src = fetchurl { - url = "https://registry.npmjs.org/ws/-/ws-7.5.1.tgz"; - sha512 = "2c6faOUH/nhoQN6abwMloF7Iyl0ZS2E9HGtsiLrWn0zOOMWlhtDmdf/uihDt6jnuCxgtwGBNy6Onsoy2s2O2Ow=="; - }; - }; - "ws-7.5.2" = { - name = "ws"; - packageName = "ws"; - version = "7.5.2"; - src = fetchurl { - url = "https://registry.npmjs.org/ws/-/ws-7.5.2.tgz"; - sha512 = "lkF7AWRicoB9mAgjeKbGqVUekLnSNO4VjKVnuPHpQeOxZOErX6BPXwJk70nFslRCEEA8EVW7ZjKwXaP9N+1sKQ=="; - }; - }; "ws-7.5.3" = { name = "ws"; packageName = "ws"; @@ -64699,13 +64708,13 @@ let sha512 = "N1XQngeqMBoj9wM4ZFadVV2MymImeiFfYD+fJrNlcVcOHsJFFQe7n3b+aBoTPwARuq2HQxukfzVpQmAk1gN4sQ=="; }; }; - "xdl-59.0.48" = { + "xdl-59.0.50" = { name = "xdl"; packageName = "xdl"; - version = "59.0.48"; + version = "59.0.50"; src = fetchurl { - url = "https://registry.npmjs.org/xdl/-/xdl-59.0.48.tgz"; - sha512 = "nh2BhZhMTZjMsfeR8HohfXMH1DbohGKuQlYWoMsMTu8WJViOvAo6LVHnBb3lt3ddVCkXxRubGh9US54hKhh+cQ=="; + url = "https://registry.npmjs.org/xdl/-/xdl-59.0.50.tgz"; + sha512 = "T1QdEP3U4m0BfeqRWPJ1J9ywlmicFTM8zBWPqP/1Xw6V/cpX2QHRfhLpl60uEiD7HsCcAPXTe1zIo8khDhFYvA=="; }; }; "xenvar-0.5.1" = { @@ -65123,13 +65132,13 @@ let sha512 = "2t7FahYnGJys6DpHLhajusId7R0Pm2yTmuL0GV9+mV0ZlaLSnb2toBmppATfg5sWIhZQGlsTLoecSzya+l4EAQ=="; }; }; - "xstate-4.22.0" = { + "xstate-4.23.0" = { name = "xstate"; packageName = "xstate"; - version = "4.22.0"; + version = "4.23.0"; src = fetchurl { - url = "https://registry.npmjs.org/xstate/-/xstate-4.22.0.tgz"; - sha512 = "WBQS/XxmjCH6789fx5JXjct2pWA0ZI0a1Kx8PJMurzgytkJH3vC2+QganHWzK38vG9PyXHefyVG54UN5q6YVSw=="; + url = "https://registry.npmjs.org/xstate/-/xstate-4.23.0.tgz"; + sha512 = "YIKb7thsDfpb6ooWJJuj+UnNZq923dG264zfpS2/vi4dkZz41ugO0ktC6QCBDeMfH8LBHhhqZ06sR4AYgWWnWg=="; }; }; "xstream-11.14.0" = { @@ -66590,8 +66599,8 @@ in sources."@hyperswarm/discovery-2.0.1" sources."@hyperswarm/hypersign-2.1.1" sources."@hyperswarm/network-2.1.0" - sources."@leichtgewicht/ip-codec-2.0.2" - sources."@types/node-16.3.2" + sources."@leichtgewicht/ip-codec-2.0.3" + sources."@types/node-16.3.3" sources."abstract-extension-3.1.1" sources."abstract-leveldown-6.2.3" sources."ansi-colors-3.2.3" @@ -67107,7 +67116,7 @@ in sources."supports-color-5.5.0" ]; }) - (sources."@nestjs/schematics-8.0.1" // { + (sources."@nestjs/schematics-8.0.2" // { dependencies = [ sources."@angular-devkit/core-12.0.5" sources."@angular-devkit/schematics-12.0.5" @@ -67121,7 +67130,7 @@ in sources."@types/eslint-scope-3.7.1" sources."@types/estree-0.0.49" sources."@types/json-schema-7.0.8" - sources."@types/node-16.3.2" + sources."@types/node-16.3.3" sources."@types/parse-json-4.0.0" sources."@webassemblyjs/ast-1.11.1" sources."@webassemblyjs/floating-point-hex-parser-1.11.1" @@ -67187,7 +67196,7 @@ in sources."cross-spawn-7.0.3" sources."deepmerge-4.2.2" sources."defaults-1.0.3" - sources."electron-to-chromium-1.3.776" + sources."electron-to-chromium-1.3.779" sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" (sources."enhanced-resolve-5.8.2" // { @@ -67596,7 +67605,7 @@ in sources."@types/long-4.0.1" sources."@types/mime-1.3.2" sources."@types/minimatch-3.0.5" - sources."@types/node-16.3.2" + sources."@types/node-16.3.3" sources."@types/normalize-package-data-2.4.1" sources."@types/qs-6.9.7" sources."@types/range-parser-1.2.4" @@ -67611,13 +67620,13 @@ in }) sources."@vue/cli-ui-addon-webpack-4.5.13" sources."@vue/cli-ui-addon-widgets-4.5.13" - (sources."@vue/compiler-core-3.1.4" // { + (sources."@vue/compiler-core-3.1.5" // { dependencies = [ sources."source-map-0.6.1" ]; }) - sources."@vue/compiler-dom-3.1.4" - sources."@vue/shared-3.1.4" + sources."@vue/compiler-dom-3.1.5" + sources."@vue/shared-3.1.5" sources."@wry/equality-0.1.11" sources."accepts-1.3.7" sources."aggregate-error-3.1.0" @@ -67867,7 +67876,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.776" + sources."electron-to-chromium-1.3.779" sources."emoji-regex-7.0.3" sources."encodeurl-1.0.2" sources."end-of-stream-1.4.4" @@ -67950,7 +67959,7 @@ in }) sources."find-up-3.0.0" sources."fkill-6.2.0" - sources."flow-parser-0.155.0" + sources."flow-parser-0.155.1" sources."for-each-0.3.3" sources."for-in-1.0.2" sources."forever-agent-0.6.1" @@ -68888,7 +68897,7 @@ in sources."convert-source-map-1.8.0" sources."debug-4.3.2" sources."ejs-3.1.6" - sources."electron-to-chromium-1.3.776" + sources."electron-to-chromium-1.3.779" sources."ensure-posix-path-1.1.1" sources."escalade-3.1.1" sources."escape-string-regexp-1.0.5" @@ -68982,7 +68991,7 @@ in dependencies = [ sources."@types/glob-7.1.4" sources."@types/minimatch-3.0.5" - sources."@types/node-16.3.2" + sources."@types/node-16.3.3" sources."balanced-match-1.0.2" sources."brace-expansion-1.1.11" sources."chromium-pickle-js-0.2.0" @@ -69007,6 +69016,35 @@ in bypassCache = true; reconstructLock = true; }; + autoprefixer = nodeEnv.buildNodePackage { + name = "autoprefixer"; + packageName = "autoprefixer"; + version = "10.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/autoprefixer/-/autoprefixer-10.3.1.tgz"; + sha512 = "L8AmtKzdiRyYg7BUXJTzigmhbQRCXFKz6SA1Lqo0+AR2FBbQ4aTAPFSDlOutnFkjhiz8my4agGXog1xlMjPJ6A=="; + }; + dependencies = [ + sources."browserslist-4.16.6" + sources."caniuse-lite-1.0.30001245" + sources."colorette-1.2.2" + sources."electron-to-chromium-1.3.779" + sources."escalade-3.1.1" + sources."fraction.js-4.1.1" + sources."node-releases-1.1.73" + sources."normalize-range-0.1.2" + sources."postcss-value-parser-4.1.0" + ]; + buildInputs = globalBuildInputs; + meta = { + description = "Parse CSS and add vendor prefixes to CSS rules using values from the Can I Use website"; + homepage = "https://github.com/postcss/autoprefixer#readme"; + license = "MIT"; + }; + production = true; + bypassCache = true; + reconstructLock = true; + }; aws-azure-login = nodeEnv.buildNodePackage { name = "aws-azure-login"; packageName = "aws-azure-login"; @@ -69017,14 +69055,14 @@ in }; dependencies = [ sources."@tootallnate/once-1.1.2" - sources."@types/node-16.3.2" + sources."@types/node-16.3.3" sources."@types/yauzl-2.9.2" sources."agent-base-6.0.2" sources."ansi-escapes-4.3.2" sources."ansi-regex-5.0.0" sources."ansi-styles-4.3.0" sources."ast-types-0.13.4" - (sources."aws-sdk-2.946.0" // { + (sources."aws-sdk-2.948.0" // { dependencies = [ sources."uuid-3.3.2" ]; @@ -69228,10 +69266,10 @@ in balanceofsatoshis = nodeEnv.buildNodePackage { name = "balanceofsatoshis"; packageName = "balanceofsatoshis"; - version = "10.6.2"; + version = "10.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/balanceofsatoshis/-/balanceofsatoshis-10.6.2.tgz"; - sha512 = "2AVJj3hY7YyOkROHZKAyfqbTawRQw+u8y/WGmERm6zu1gW/t0A7ihonchEGbEwzinszDADPzvAZvvMq1BdPe8Q=="; + url = "https://registry.npmjs.org/balanceofsatoshis/-/balanceofsatoshis-10.7.0.tgz"; + sha512 = "rJ29qKw5UMS5WM9hdur696oXNiuszSJLhYKMBQuHDuwITeuwNk9GYhXyXRVFFOKVNetjsP/HruSU6tZ3jBq4kQ=="; }; dependencies = [ sources."@alexbosworth/html2unicode-1.1.5" @@ -69244,7 +69282,7 @@ in sources."@cto.af/textdecoder-0.0.0" (sources."@grpc/grpc-js-1.3.2" // { dependencies = [ - sources."@types/node-16.3.2" + sources."@types/node-16.3.3" ]; }) sources."@grpc/proto-loader-0.6.2" @@ -69527,7 +69565,7 @@ in sources."imurmurhash-0.1.4" sources."inherits-2.0.4" sources."ini-2.0.0" - (sources."inquirer-8.1.1" // { + (sources."inquirer-8.1.2" // { dependencies = [ sources."ansi-escapes-4.3.2" sources."ansi-regex-5.0.0" @@ -69611,18 +69649,18 @@ in sources."ws-7.5.0" ]; }) - (sources."ln-service-51.8.8" // { + (sources."ln-service-51.9.0" // { dependencies = [ - sources."@grpc/grpc-js-1.3.4" + sources."@grpc/grpc-js-1.3.5" sources."@grpc/proto-loader-0.6.4" sources."@types/express-4.17.13" - sources."@types/node-16.0.1" + sources."@types/node-16.3.2" sources."@types/request-2.48.6" sources."@types/ws-7.4.6" sources."bn.js-5.2.0" sources."form-data-2.5.1" - sources."lightning-3.3.15" - sources."ws-7.5.2" + sources."lightning-3.3.16" + sources."ws-7.5.3" ]; }) (sources."ln-sync-0.4.6" // { @@ -69636,19 +69674,7 @@ in sources."lightning-3.3.12" ]; }) - (sources."ln-telegram-3.2.8" // { - dependencies = [ - sources."@grpc/grpc-js-1.3.4" - sources."@grpc/proto-loader-0.6.4" - sources."@types/node-16.0.0" - sources."@types/ws-7.4.6" - sources."bn.js-5.2.0" - sources."cbor-7.0.5" - sources."lightning-3.3.13" - sources."ln-service-51.8.6" - sources."ws-7.5.1" - ]; - }) + sources."ln-telegram-3.2.9" sources."lodash-4.17.21" sources."lodash.camelcase-4.3.0" sources."lodash.clonedeep-4.5.0" @@ -69669,7 +69695,7 @@ in sources."long-4.0.0" sources."lowercase-keys-1.0.1" sources."lru-cache-6.0.0" - sources."luxon-1.27.0" + sources."luxon-2.0.1" (sources."macaroon-3.0.4" // { dependencies = [ sources."tweetnacl-1.0.3" @@ -69771,7 +69797,7 @@ in sources."process-nextick-args-2.0.1" (sources."protobufjs-6.11.2" // { dependencies = [ - sources."@types/node-16.3.2" + sources."@types/node-16.3.3" ]; }) sources."proxy-addr-2.0.7" @@ -69805,7 +69831,7 @@ in sources."ripemd160-2.0.2" sources."run-async-2.4.1" sources."rx-4.1.0" - sources."rxjs-6.6.7" + sources."rxjs-7.2.0" sources."safe-buffer-5.2.1" sources."safe-compare-1.1.4" sources."safer-buffer-2.1.2" @@ -69846,7 +69872,7 @@ in sources."supports-color-2.0.0" (sources."table-6.7.1" // { dependencies = [ - sources."ajv-8.6.1" + sources."ajv-8.6.2" sources."ansi-regex-5.0.0" sources."is-fullwidth-code-point-3.0.0" sources."json-schema-traverse-1.0.0" @@ -69877,7 +69903,7 @@ in sources."toidentifier-1.0.0" sources."tough-cookie-3.0.1" sources."truncate-utf8-bytes-1.0.2" - sources."tslib-1.14.1" + sources."tslib-2.1.0" sources."tunnel-agent-0.6.0" sources."tweetnacl-0.14.5" sources."tweetnacl-util-0.15.1" @@ -70951,7 +70977,7 @@ in sources."@protobufjs/pool-1.1.0" sources."@protobufjs/utf8-1.1.0" sources."@types/long-4.0.1" - sources."@types/node-16.3.2" + sources."@types/node-16.3.3" sources."addr-to-ip-port-1.5.1" sources."airplay-js-0.2.16" sources."ajv-6.12.6" @@ -71791,7 +71817,7 @@ in sources."pump-3.0.0" sources."quick-lru-4.0.1" sources."react-16.14.0" - sources."react-devtools-core-4.13.5" + sources."react-devtools-core-4.14.0" sources."react-is-16.13.1" sources."react-reconciler-0.24.0" sources."readable-stream-3.6.0" @@ -72345,20 +72371,16 @@ in }; dependencies = [ sources."agent-base-4.3.0" - sources."balanced-match-1.0.2" - sources."brace-expansion-1.1.11" - sources."concat-map-0.0.1" sources."debug-3.1.0" sources."es6-promise-4.2.8" sources."es6-promisify-5.0.0" sources."http-proxy-agent-2.1.0" sources."https-proxy-agent-2.2.4" sources."jsonc-parser-3.0.0" - sources."minimatch-3.0.4" sources."ms-2.0.0" sources."request-light-0.4.0" sources."vscode-json-languageserver-1.3.4" - (sources."vscode-json-languageservice-4.1.5" // { + (sources."vscode-json-languageservice-4.1.6" // { dependencies = [ sources."vscode-nls-5.0.0" ]; @@ -72809,7 +72831,7 @@ in sources."domutils-1.7.0" sources."dot-prop-5.3.0" sources."duplexer3-0.1.4" - sources."electron-to-chromium-1.3.776" + sources."electron-to-chromium-1.3.779" sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" sources."enquirer-2.3.6" @@ -73476,7 +73498,7 @@ in sources."svg-tags-1.0.0" (sources."table-6.7.1" // { dependencies = [ - sources."ajv-8.6.1" + sources."ajv-8.6.2" sources."json-schema-traverse-1.0.0" ]; }) @@ -73614,7 +73636,7 @@ in sha512 = "lPtMmvdxFMVKm7KYKWVDmYyQo1KpG7oOwre4WlKj4+TeWxhOfkxz2q1HtsoYeideu0X9Y6GCGNlBpeZbFMhP4g=="; }; dependencies = [ - sources."pyright-1.1.156" + sources."pyright-1.1.157" ]; buildInputs = globalBuildInputs; meta = { @@ -73796,12 +73818,12 @@ in sources."@nodelib/fs.walk-1.2.8" sources."@stylelint/postcss-css-in-js-0.37.2" sources."@stylelint/postcss-markdown-0.36.2" - sources."@types/mdast-3.0.4" + sources."@types/mdast-3.0.7" sources."@types/minimist-1.2.2" sources."@types/normalize-package-data-2.4.1" sources."@types/parse-json-4.0.0" sources."@types/unist-2.0.6" - sources."ajv-8.6.1" + sources."ajv-8.6.2" sources."ansi-regex-5.0.0" sources."ansi-styles-3.2.1" sources."array-union-2.1.0" @@ -73858,7 +73880,7 @@ in sources."domelementtype-1.3.1" sources."domhandler-2.4.2" sources."domutils-1.7.0" - sources."electron-to-chromium-1.3.776" + sources."electron-to-chromium-1.3.779" sources."emoji-regex-8.0.0" sources."entities-1.1.2" sources."error-ex-1.3.2" @@ -74401,7 +74423,7 @@ in sources."supports-color-5.5.0" (sources."table-6.7.1" // { dependencies = [ - sources."ajv-8.6.1" + sources."ajv-8.6.2" sources."json-schema-traverse-1.0.0" ]; }) @@ -74646,7 +74668,7 @@ in sources."color-3.0.0" sources."color-convert-1.9.3" sources."color-name-1.1.3" - sources."color-string-1.5.5" + sources."color-string-1.6.0" sources."colors-1.4.0" sources."colorspace-1.1.2" sources."commander-7.2.0" @@ -75321,7 +75343,7 @@ in sources."@types/glob-7.1.4" sources."@types/minimatch-3.0.5" sources."@types/minimist-1.2.2" - sources."@types/node-16.3.2" + sources."@types/node-16.3.3" sources."@types/normalize-package-data-2.4.1" sources."aggregate-error-3.1.0" sources."ansi-styles-3.2.1" @@ -75692,7 +75714,7 @@ in sources."@cycle/run-3.4.0" sources."@cycle/time-0.10.1" sources."@types/cookiejar-2.1.2" - sources."@types/node-16.3.2" + sources."@types/node-16.3.3" sources."@types/superagent-3.8.2" sources."ansi-escapes-3.2.0" sources."ansi-regex-2.1.1" @@ -75987,7 +76009,7 @@ in sha512 = "I6r+8jeGKdZ5ztkxXQUu+2DmzoCkRB4KS0bPfu85u2RoK5xz0ypt3h/WP7GjRBBvhOOM7/LdYKUcOob6RKMtRQ=="; }; dependencies = [ - sources."@leichtgewicht/ip-codec-2.0.2" + sources."@leichtgewicht/ip-codec-2.0.3" sources."abstract-random-access-1.1.2" sources."ajv-6.12.6" sources."ansi-align-2.0.0" @@ -77007,7 +77029,7 @@ in sources."@types/http-cache-semantics-4.0.1" sources."@types/keyv-3.1.2" sources."@types/minimatch-3.0.5" - sources."@types/node-16.3.2" + sources."@types/node-16.3.3" sources."@types/responselike-1.0.0" sources."@types/yauzl-2.9.2" sources."abbrev-1.1.1" @@ -77639,7 +77661,7 @@ in sources."@types/http-cache-semantics-4.0.1" sources."@types/keyv-3.1.2" sources."@types/minimist-1.2.2" - sources."@types/node-16.3.2" + sources."@types/node-16.3.3" sources."@types/normalize-package-data-2.4.1" sources."@types/responselike-1.0.0" sources."@types/yoga-layout-1.9.2" @@ -77711,7 +77733,7 @@ in }) sources."defer-to-connect-2.0.1" sources."dot-prop-5.3.0" - sources."electron-to-chromium-1.3.776" + sources."electron-to-chromium-1.3.779" sources."emoji-regex-8.0.0" sources."emojilib-2.4.0" sources."end-of-stream-1.4.4" @@ -77845,7 +77867,7 @@ in sources."punycode-2.1.1" sources."quick-lru-5.1.1" sources."react-16.14.0" - sources."react-devtools-core-4.13.5" + sources."react-devtools-core-4.14.0" sources."react-is-16.13.1" sources."react-reconciler-0.24.0" (sources."read-pkg-5.2.0" // { @@ -79670,7 +79692,7 @@ in sources."escape-string-regexp-1.0.5" ]; }) - sources."@eslint/eslintrc-0.4.2" + sources."@eslint/eslintrc-0.4.3" sources."@humanwhocodes/config-array-0.5.0" sources."@humanwhocodes/object-schema-1.2.0" sources."acorn-7.4.1" @@ -79790,7 +79812,7 @@ in sources."supports-color-5.5.0" (sources."table-6.7.1" // { dependencies = [ - sources."ajv-8.6.1" + sources."ajv-8.6.2" sources."json-schema-traverse-1.0.0" ]; }) @@ -79833,7 +79855,7 @@ in sources."supports-color-5.5.0" ]; }) - sources."@eslint/eslintrc-0.4.2" + sources."@eslint/eslintrc-0.4.3" sources."@humanwhocodes/config-array-0.5.0" sources."@humanwhocodes/object-schema-1.2.0" sources."acorn-7.4.1" @@ -79955,7 +79977,7 @@ in sources."supports-color-8.1.1" (sources."table-6.7.1" // { dependencies = [ - sources."ajv-8.6.1" + sources."ajv-8.6.2" sources."json-schema-traverse-1.0.0" ]; }) @@ -79999,10 +80021,10 @@ in expo-cli = nodeEnv.buildNodePackage { name = "expo-cli"; packageName = "expo-cli"; - version = "4.7.3"; + version = "4.8.1"; src = fetchurl { - url = "https://registry.npmjs.org/expo-cli/-/expo-cli-4.7.3.tgz"; - sha512 = "IlkAgUiY7XeS2cjJnJZrp3YE+Jq/gk7AgfjatGL6kw8k0IULZJiJKDsZEv24CXHFDKo43KdDCDdDqx+R+7kF8w=="; + url = "https://registry.npmjs.org/expo-cli/-/expo-cli-4.8.1.tgz"; + sha512 = "oks/ETtrhNKvw1CjKUxQv9vQFXRPIWb+iWKT1Xmjx111cHLDTKXtmxm8hkYXSJZ8zHgqAndlUTRlTc+tDqRbuw=="; }; dependencies = [ sources."@babel/code-frame-7.14.5" @@ -80138,10 +80160,14 @@ in sources."@babel/types-7.14.5" sources."@expo/apple-utils-0.0.0-alpha.20" sources."@expo/bunyan-4.0.0" - sources."@expo/config-5.0.3" - sources."@expo/config-plugins-3.0.3" - sources."@expo/config-types-41.0.0" - (sources."@expo/dev-server-0.1.78" // { + sources."@expo/config-5.0.5" + (sources."@expo/config-plugins-3.0.5" // { + dependencies = [ + sources."semver-7.3.5" + ]; + }) + sources."@expo/config-types-42.0.0" + (sources."@expo/dev-server-0.1.80" // { dependencies = [ sources."body-parser-1.19.0" sources."bytes-3.1.0" @@ -80158,7 +80184,7 @@ in sources."temp-dir-2.0.0" ]; }) - sources."@expo/dev-tools-0.13.108" + sources."@expo/dev-tools-0.13.110" (sources."@expo/devcert-1.0.0" // { dependencies = [ sources."debug-3.2.7" @@ -80166,21 +80192,21 @@ in sources."sudo-prompt-8.2.5" ]; }) - (sources."@expo/image-utils-0.3.14" // { + (sources."@expo/image-utils-0.3.15" // { dependencies = [ sources."mime-2.5.2" sources."tempy-0.3.0" ]; }) - (sources."@expo/json-file-8.2.30" // { + (sources."@expo/json-file-8.2.31" // { dependencies = [ sources."@babel/code-frame-7.10.4" sources."json5-1.0.1" ]; }) - sources."@expo/metro-config-0.1.78" - sources."@expo/osascript-2.0.28" - (sources."@expo/package-manager-0.0.43" // { + sources."@expo/metro-config-0.1.80" + sources."@expo/osascript-2.0.29" + (sources."@expo/package-manager-0.0.44" // { dependencies = [ sources."npm-package-arg-7.0.0" sources."rimraf-3.0.2" @@ -80192,18 +80218,19 @@ in sources."xmlbuilder-14.0.0" ]; }) - sources."@expo/prebuild-config-2.0.3" + sources."@expo/prebuild-config-2.0.5" sources."@expo/results-1.0.0" - (sources."@expo/schemer-1.3.29" // { + (sources."@expo/schemer-1.3.30" // { dependencies = [ sources."ajv-5.5.2" sources."fast-deep-equal-1.1.0" sources."json-schema-traverse-0.3.1" ]; }) + sources."@expo/sdk-runtime-versions-1.0.0" sources."@expo/simple-spinner-1.0.2" sources."@expo/spawn-async-1.5.0" - (sources."@expo/webpack-config-0.12.82" // { + (sources."@expo/webpack-config-0.13.1" // { dependencies = [ sources."@babel/runtime-7.9.0" sources."react-refresh-0.8.3" @@ -80215,22 +80242,18 @@ in sources."js-yaml-4.1.0" ]; }) - sources."@hapi/address-4.1.0" - sources."@hapi/formula-2.0.0" + sources."@hapi/address-2.1.4" + sources."@hapi/formula-1.2.0" sources."@hapi/hoek-9.2.0" - sources."@hapi/joi-17.1.1" - sources."@hapi/pinpoint-2.0.0" - sources."@hapi/topo-5.1.0" - (sources."@jest/types-25.5.0" // { + (sources."@hapi/joi-16.1.8" // { dependencies = [ - sources."ansi-styles-4.3.0" - sources."chalk-3.0.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."@hapi/hoek-8.5.1" + sources."@hapi/topo-3.1.6" ]; }) + sources."@hapi/pinpoint-1.0.2" + sources."@hapi/topo-5.1.0" + sources."@jest/types-26.6.2" sources."@jimp/bmp-0.12.1" sources."@jimp/core-0.12.1" sources."@jimp/custom-0.12.1" @@ -80283,14 +80306,14 @@ in sources."@npmcli/promise-spawn-1.3.2" sources."@npmcli/run-script-1.8.5" sources."@pmmmwh/react-refresh-webpack-plugin-0.3.3" - sources."@react-native-community/cli-debugger-ui-4.13.1" - (sources."@react-native-community/cli-server-api-4.9.0" // { + sources."@react-native-community/cli-debugger-ui-5.0.1" + (sources."@react-native-community/cli-server-api-5.0.1" // { dependencies = [ sources."ultron-1.0.2" sources."ws-1.1.5" ]; }) - (sources."@react-native-community/cli-tools-4.13.0" // { + (sources."@react-native-community/cli-tools-5.0.1" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-3.0.0" @@ -80304,22 +80327,32 @@ in sources."supports-color-7.2.0" ]; }) + sources."@rollup/plugin-babel-5.3.0" + sources."@rollup/plugin-node-resolve-11.2.1" + sources."@rollup/plugin-replace-2.4.2" + sources."@rollup/pluginutils-3.1.0" sources."@segment/loosely-validate-event-2.0.0" + sources."@sideway/address-4.1.2" + sources."@sideway/formula-3.0.0" + sources."@sideway/pinpoint-2.0.0" sources."@sindresorhus/is-4.0.1" + sources."@surma/rollup-plugin-off-main-thread-1.4.2" sources."@szmarczak/http-timer-4.0.6" sources."@tootallnate/once-1.1.2" sources."@types/cacheable-request-6.0.2" + sources."@types/estree-0.0.39" sources."@types/glob-7.1.4" sources."@types/html-minifier-terser-5.1.2" sources."@types/http-cache-semantics-4.0.1" 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/istanbul-reports-3.0.1" sources."@types/json-schema-7.0.8" sources."@types/keyv-3.1.2" sources."@types/minimatch-3.0.5" sources."@types/node-9.6.61" sources."@types/q-1.5.5" + sources."@types/resolve-1.17.1" sources."@types/responselike-1.0.0" sources."@types/retry-0.12.1" sources."@types/source-list-map-0.1.2" @@ -80438,7 +80471,6 @@ in sources."aws4-1.11.0" sources."axios-0.21.1" sources."axios-retry-3.1.9" - sources."babel-extract-comments-1.0.0" (sources."babel-loader-8.1.0" // { dependencies = [ sources."json5-1.0.1" @@ -80453,16 +80485,13 @@ in }) sources."babel-plugin-polyfill-corejs3-0.2.3" sources."babel-plugin-polyfill-regenerator-0.2.2" - sources."babel-plugin-syntax-object-rest-spread-6.13.0" sources."babel-plugin-syntax-trailing-function-commas-7.0.0-beta.0" - sources."babel-plugin-transform-object-rest-spread-6.26.0" sources."babel-preset-fbjs-3.4.0" (sources."babel-runtime-6.26.0" // { dependencies = [ sources."regenerator-runtime-0.11.1" ]; }) - sources."babylon-6.18.0" sources."backo2-1.0.2" sources."balanced-match-1.0.2" (sources."base-0.11.2" // { @@ -80522,6 +80551,7 @@ in sources."buffer-from-1.1.1" sources."buffer-indexof-1.1.1" sources."buffer-xor-1.0.3" + sources."builtin-modules-3.2.0" sources."builtin-status-codes-3.0.0" sources."builtins-1.0.3" sources."bytes-3.0.0" @@ -80619,10 +80649,15 @@ in }) sources."code-point-at-1.1.0" sources."collection-visit-1.0.0" - sources."color-3.1.3" + (sources."color-3.2.0" // { + dependencies = [ + sources."color-convert-2.0.1" + sources."color-name-1.1.4" + ]; + }) sources."color-convert-1.9.3" sources."color-name-1.1.3" - sources."color-string-1.5.5" + sources."color-string-1.6.0" sources."colorette-1.2.2" sources."colors-1.4.0" sources."combined-stream-1.0.8" @@ -80815,7 +80850,8 @@ in sources."duplexify-3.7.1" sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.3.776" + sources."ejs-2.7.4" + sources."electron-to-chromium-1.3.779" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -80858,6 +80894,7 @@ in ]; }) sources."estraverse-4.3.0" + sources."estree-walker-1.0.1" sources."esutils-2.0.3" sources."etag-1.8.1" sources."eventemitter3-2.0.3" @@ -80892,7 +80929,7 @@ in sources."ms-2.0.0" ]; }) - (sources."expo-pwa-0.0.88" // { + (sources."expo-pwa-0.0.90" // { dependencies = [ sources."commander-2.20.0" ]; @@ -81044,7 +81081,6 @@ in sources."he-1.2.0" sources."hex-color-regex-1.1.0" sources."hmac-drbg-1.0.1" - sources."hoek-4.2.1" sources."hosted-git-info-3.0.8" sources."hpack.js-2.1.6" sources."hsl-regex-1.0.0" @@ -81145,6 +81181,7 @@ in ]; }) sources."is-lambda-1.0.1" + sources."is-module-1.0.0" sources."is-negative-zero-2.0.1" sources."is-number-7.0.0" sources."is-number-object-1.0.5" @@ -81194,7 +81231,6 @@ in sources."is-windows-1.0.2" sources."is-wsl-2.2.0" sources."isarray-1.0.0" - sources."isemail-3.2.0" sources."isexe-2.0.0" sources."isobject-3.0.1" sources."isstream-0.1.2" @@ -81206,7 +81242,7 @@ in ]; }) sources."jimp-0.12.1" - sources."joi-11.4.0" + sources."joi-17.4.1" sources."join-component-1.1.0" sources."jpeg-js-0.4.3" sources."js-tokens-4.0.0" @@ -81228,7 +81264,6 @@ in ]; }) sources."json-schema-traverse-0.4.1" - sources."json-stable-stringify-1.0.1" sources."json-stringify-safe-5.0.1" sources."json3-3.3.3" sources."json5-2.2.0" @@ -81253,14 +81288,12 @@ in sources."loader-utils-2.0.0" sources."locate-path-6.0.0" sources."lodash-4.17.21" - sources."lodash._reinterpolate-3.0.0" sources."lodash.assign-4.2.0" sources."lodash.debounce-4.0.8" sources."lodash.isobject-3.0.2" sources."lodash.isstring-4.0.1" sources."lodash.memoize-4.1.2" - sources."lodash.template-4.5.0" - sources."lodash.templatesettings-4.2.0" + sources."lodash.sortby-4.7.0" sources."lodash.uniq-4.5.0" (sources."log-symbols-2.2.0" // { dependencies = [ @@ -81276,6 +81309,7 @@ in }) sources."lowercase-keys-2.0.0" sources."lru-cache-6.0.0" + sources."magic-string-0.25.7" (sources."make-dir-2.1.0" // { dependencies = [ sources."semver-5.7.1" @@ -81404,6 +81438,7 @@ in sources."tslib-2.3.0" ]; }) + sources."nocache-2.1.0" sources."node-fetch-2.6.1" sources."node-forge-0.10.0" (sources."node-gyp-7.1.2" // { @@ -81745,7 +81780,7 @@ in sources."prepend-http-3.0.1" sources."pretty-bytes-5.6.0" sources."pretty-error-2.1.2" - (sources."pretty-format-25.5.0" // { + (sources."pretty-format-26.6.2" // { dependencies = [ sources."ansi-styles-4.3.0" sources."color-convert-2.0.1" @@ -81816,7 +81851,7 @@ in ]; }) sources."react-error-overlay-6.0.9" - sources."react-is-16.13.1" + sources."react-is-17.0.2" sources."react-refresh-0.4.3" sources."read-chunk-3.2.0" sources."read-last-lines-1.6.0" @@ -81889,6 +81924,19 @@ in ]; }) sources."ripemd160-2.0.2" + sources."rollup-2.53.2" + (sources."rollup-plugin-terser-7.0.2" // { + dependencies = [ + sources."commander-2.20.3" + sources."source-map-0.7.3" + (sources."source-map-support-0.5.19" // { + dependencies = [ + sources."source-map-0.6.1" + ]; + }) + sources."terser-5.7.1" + ]; + }) sources."router-ips-1.0.0" sources."run-parallel-1.2.0" sources."run-queue-1.0.3" @@ -81946,7 +81994,7 @@ in sources."uuid-2.0.3" ]; }) - sources."slugify-1.5.3" + sources."slugify-1.6.0" sources."smart-buffer-4.1.0" (sources."snapdragon-0.8.2" // { dependencies = [ @@ -81996,6 +82044,7 @@ in sources."source-map-resolve-0.5.3" sources."source-map-support-0.4.18" sources."source-map-url-0.4.1" + sources."sourcemap-codec-1.4.8" sources."spdy-4.0.2" (sources."spdy-transport-3.0.0" // { dependencies = [ @@ -82059,7 +82108,7 @@ in ]; }) sources."strip-ansi-6.0.0" - sources."strip-comments-1.0.2" + sources."strip-comments-2.0.1" sources."strip-eof-1.0.0" sources."strip-json-comments-2.0.1" sources."style-loader-1.2.1" @@ -82157,8 +82206,8 @@ in sources."to-regex-3.0.2" sources."to-regex-range-5.0.1" sources."toidentifier-1.0.0" - sources."topo-2.0.2" sources."tough-cookie-2.5.0" + sources."tr46-1.0.1" sources."traverse-0.6.6" sources."tree-kill-1.2.2" sources."ts-invariant-0.4.4" @@ -82261,6 +82310,7 @@ in }) sources."wbuf-1.7.3" sources."wcwidth-1.0.1" + sources."webidl-conversions-4.0.2" (sources."webpack-4.43.0" // { dependencies = [ sources."braces-2.3.2" @@ -82390,6 +82440,7 @@ in }) sources."websocket-driver-0.6.5" sources."websocket-extensions-0.1.4" + sources."whatwg-url-7.1.0" sources."which-1.3.1" sources."which-boxed-primitive-1.0.2" sources."which-module-2.0.0" @@ -82402,28 +82453,40 @@ in }) sources."widest-line-3.1.0" sources."with-open-file-0.1.7" - sources."workbox-background-sync-3.6.3" - sources."workbox-broadcast-cache-update-3.6.3" - (sources."workbox-build-3.6.3" // { + sources."workbox-background-sync-6.1.5" + sources."workbox-broadcast-update-6.1.5" + (sources."workbox-build-6.1.5" // { dependencies = [ - sources."fs-extra-4.0.3" - sources."jsonfile-4.0.0" - sources."pretty-bytes-4.0.2" - sources."universalify-0.1.2" + (sources."@babel/core-7.14.6" // { + dependencies = [ + sources."source-map-0.5.7" + ]; + }) + sources."crypto-random-string-2.0.0" + sources."fs-extra-9.1.0" + sources."semver-6.3.0" + sources."source-map-0.8.0-beta.0" + sources."temp-dir-2.0.0" + sources."tempy-0.6.0" + sources."type-fest-0.16.0" + sources."unique-string-2.0.0" + sources."universalify-2.0.0" ]; }) - sources."workbox-cache-expiration-3.6.3" - sources."workbox-cacheable-response-3.6.3" - sources."workbox-core-3.6.3" - sources."workbox-google-analytics-3.6.3" - sources."workbox-navigation-preload-3.6.3" - sources."workbox-precaching-3.6.3" - sources."workbox-range-requests-3.6.3" - sources."workbox-routing-3.6.3" - sources."workbox-strategies-3.6.3" - sources."workbox-streams-3.6.3" - sources."workbox-sw-3.6.3" - sources."workbox-webpack-plugin-3.6.3" + sources."workbox-cacheable-response-6.1.5" + sources."workbox-core-6.1.5" + sources."workbox-expiration-6.1.5" + sources."workbox-google-analytics-6.1.5" + sources."workbox-navigation-preload-6.1.5" + sources."workbox-precaching-6.1.5" + sources."workbox-range-requests-6.1.5" + sources."workbox-recipes-6.1.5" + sources."workbox-routing-6.1.5" + sources."workbox-strategies-6.1.5" + sources."workbox-streams-6.1.5" + sources."workbox-sw-6.1.5" + sources."workbox-webpack-plugin-6.1.5" + sources."workbox-window-6.1.5" sources."worker-farm-1.7.0" (sources."worker-loader-2.0.0" // { dependencies = [ @@ -82448,7 +82511,7 @@ in sources."uuid-7.0.3" ]; }) - (sources."xdl-59.0.48" // { + (sources."xdl-59.0.50" // { dependencies = [ sources."chownr-1.1.4" sources."fs-minipass-1.2.7" @@ -83356,7 +83419,7 @@ in sources."@types/json-schema-7.0.8" sources."@types/long-4.0.1" sources."@types/minimatch-3.0.5" - sources."@types/node-16.3.2" + sources."@types/node-16.3.3" sources."JSONStream-1.3.5" sources."abbrev-1.1.1" sources."abort-controller-3.0.0" @@ -83495,7 +83558,7 @@ in }) sources."color-convert-2.0.1" sources."color-name-1.1.4" - sources."color-string-1.5.5" + sources."color-string-1.6.0" sources."colors-1.0.3" sources."colorspace-1.1.2" sources."combined-stream-1.0.8" @@ -83705,7 +83768,7 @@ in sources."glob-slasher-1.0.1" sources."global-dirs-2.1.0" sources."google-auth-library-6.1.6" - (sources."google-gax-2.18.0" // { + (sources."google-gax-2.19.0" // { dependencies = [ sources."google-auth-library-7.3.0" ]; @@ -84462,7 +84525,7 @@ in dependencies = [ sources."@types/atob-2.1.2" sources."@types/inquirer-6.5.0" - sources."@types/node-16.3.2" + sources."@types/node-16.3.3" sources."@types/through-0.0.30" sources."ajv-6.12.6" sources."ansi-escapes-4.3.2" @@ -85247,7 +85310,7 @@ in sources."@types/istanbul-lib-report-3.0.0" sources."@types/istanbul-reports-1.1.2" sources."@types/json-patch-0.0.30" - sources."@types/node-16.3.2" + sources."@types/node-16.3.3" sources."@types/node-fetch-2.5.11" sources."@types/unist-2.0.6" sources."@types/yargs-15.0.14" @@ -85364,7 +85427,7 @@ in ]; }) sources."content-type-1.0.4" - sources."contentful-management-7.29.0" + sources."contentful-management-7.30.0" sources."contentful-sdk-core-6.8.0" sources."convert-hrtime-3.0.0" (sources."convert-source-map-1.8.0" // { @@ -85410,7 +85473,7 @@ in sources."dotenv-8.6.0" sources."duplexer3-0.1.4" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.3.776" + sources."electron-to-chromium-1.3.779" sources."emoji-regex-7.0.3" sources."encodeurl-1.0.2" sources."end-of-stream-1.4.4" @@ -85691,7 +85754,7 @@ in sources."path-key-2.0.1" sources."path-parse-1.0.7" sources."path-to-regexp-0.1.7" - sources."peek-readable-3.1.4" + sources."peek-readable-4.0.0" sources."picomatch-2.3.0" sources."pkg-dir-4.2.0" sources."prepend-http-2.0.0" @@ -85821,7 +85884,7 @@ in sources."strip-final-newline-2.0.0" sources."strip-indent-3.0.0" sources."strip-json-comments-2.0.1" - sources."strtok3-6.1.3" + sources."strtok3-6.2.0" sources."style-to-object-0.3.0" sources."supports-color-5.5.0" sources."term-size-2.2.1" @@ -85890,7 +85953,7 @@ in sources."write-file-atomic-3.0.3" sources."ws-7.5.3" sources."xdg-basedir-4.0.0" - sources."xstate-4.22.0" + sources."xstate-4.23.0" sources."xtend-4.0.2" sources."y18n-4.0.3" sources."yallist-4.0.0" @@ -86203,7 +86266,7 @@ in sources."@types/minimist-1.2.2" sources."@types/normalize-package-data-2.4.1" sources."agent-base-6.0.2" - sources."ajv-8.6.1" + sources."ajv-8.6.2" sources."ajv-formats-2.1.0" (sources."ansi-align-3.0.0" // { dependencies = [ @@ -86637,7 +86700,7 @@ in sources."@nodelib/fs.walk-1.2.8" sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" - sources."@types/node-16.3.2" + sources."@types/node-16.3.3" sources."@types/parse-json-4.0.0" sources."@types/websocket-1.0.2" sources."abort-controller-3.0.0" @@ -87382,7 +87445,7 @@ in sources."supports-color-7.2.0" ]; }) - sources."systeminformation-5.7.7" + sources."systeminformation-5.7.8" sources."term-canvas-0.0.5" sources."type-fest-0.21.3" sources."wordwrap-0.0.3" @@ -89324,9 +89387,9 @@ in dependencies = [ sources."@iarna/toml-2.2.5" sources."@msgpack/msgpack-2.7.0" - sources."@ot-builder/bin-composite-types-1.0.10" - sources."@ot-builder/bin-util-1.0.10" - (sources."@ot-builder/cli-help-shower-1.0.10" // { + sources."@ot-builder/bin-composite-types-1.0.11" + sources."@ot-builder/bin-util-1.0.11" + (sources."@ot-builder/cli-help-shower-1.0.11" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.1" @@ -89336,37 +89399,37 @@ in sources."supports-color-7.2.0" ]; }) - sources."@ot-builder/cli-proc-1.0.10" - sources."@ot-builder/cli-shared-1.0.10" - sources."@ot-builder/common-impl-1.0.10" - sources."@ot-builder/errors-1.0.10" - sources."@ot-builder/io-bin-cff-1.0.10" - sources."@ot-builder/io-bin-encoding-1.0.10" - sources."@ot-builder/io-bin-ext-private-1.0.10" - sources."@ot-builder/io-bin-font-1.0.10" - sources."@ot-builder/io-bin-glyph-store-1.0.10" - sources."@ot-builder/io-bin-layout-1.0.10" - sources."@ot-builder/io-bin-metadata-1.0.10" - sources."@ot-builder/io-bin-metric-1.0.10" - sources."@ot-builder/io-bin-name-1.0.10" - sources."@ot-builder/io-bin-sfnt-1.0.10" - sources."@ot-builder/io-bin-ttf-1.0.10" - sources."@ot-builder/ot-1.0.10" - sources."@ot-builder/ot-encoding-1.0.10" - sources."@ot-builder/ot-ext-private-1.0.10" - sources."@ot-builder/ot-glyphs-1.0.10" - sources."@ot-builder/ot-layout-1.0.10" - sources."@ot-builder/ot-metadata-1.0.10" - sources."@ot-builder/ot-name-1.0.10" - sources."@ot-builder/ot-sfnt-1.0.10" - sources."@ot-builder/ot-standard-glyph-namer-1.0.10" - sources."@ot-builder/prelude-1.0.10" - sources."@ot-builder/primitive-1.0.10" - sources."@ot-builder/rectify-1.0.10" - sources."@ot-builder/stat-glyphs-1.0.10" - sources."@ot-builder/trace-1.0.10" - sources."@ot-builder/var-store-1.0.10" - sources."@ot-builder/variance-1.0.10" + sources."@ot-builder/cli-proc-1.0.11" + sources."@ot-builder/cli-shared-1.0.11" + sources."@ot-builder/common-impl-1.0.11" + sources."@ot-builder/errors-1.0.11" + sources."@ot-builder/io-bin-cff-1.0.11" + sources."@ot-builder/io-bin-encoding-1.0.11" + sources."@ot-builder/io-bin-ext-private-1.0.11" + sources."@ot-builder/io-bin-font-1.0.11" + sources."@ot-builder/io-bin-glyph-store-1.0.11" + sources."@ot-builder/io-bin-layout-1.0.11" + sources."@ot-builder/io-bin-metadata-1.0.11" + sources."@ot-builder/io-bin-metric-1.0.11" + sources."@ot-builder/io-bin-name-1.0.11" + sources."@ot-builder/io-bin-sfnt-1.0.11" + sources."@ot-builder/io-bin-ttf-1.0.11" + sources."@ot-builder/ot-1.0.11" + sources."@ot-builder/ot-encoding-1.0.11" + sources."@ot-builder/ot-ext-private-1.0.11" + sources."@ot-builder/ot-glyphs-1.0.11" + sources."@ot-builder/ot-layout-1.0.11" + sources."@ot-builder/ot-metadata-1.0.11" + sources."@ot-builder/ot-name-1.0.11" + sources."@ot-builder/ot-sfnt-1.0.11" + sources."@ot-builder/ot-standard-glyph-namer-1.0.11" + sources."@ot-builder/prelude-1.0.11" + sources."@ot-builder/primitive-1.0.11" + sources."@ot-builder/rectify-1.0.11" + sources."@ot-builder/stat-glyphs-1.0.11" + sources."@ot-builder/trace-1.0.11" + sources."@ot-builder/var-store-1.0.11" + sources."@ot-builder/variance-1.0.11" sources."@unicode/unicode-13.0.0-1.1.0" sources."aglfn-1.0.2" sources."amdefine-1.0.1" @@ -89374,11 +89437,9 @@ in sources."ansi-styles-3.2.1" sources."argparse-2.0.1" sources."async-0.9.2" - sources."at-least-node-1.0.0" sources."atob-2.1.2" sources."balanced-match-1.0.2" sources."brace-expansion-1.1.11" - sources."camelcase-5.3.1" sources."chainsaw-0.0.9" sources."chalk-2.4.2" sources."cldr-6.1.1" @@ -89391,7 +89452,6 @@ in sources."css-2.2.4" sources."css-parse-2.0.0" sources."debug-3.1.0" - sources."decamelize-1.2.0" sources."decode-uri-component-0.2.0" sources."deep-is-0.1.3" sources."ejs-3.1.6" @@ -89427,7 +89487,6 @@ in sources."fast-deep-equal-3.1.3" sources."fast-levenshtein-2.0.6" sources."filelist-1.0.2" - sources."find-up-4.1.0" sources."fs-extra-10.0.0" sources."fs.realpath-1.0.0" sources."get-caller-file-2.0.5" @@ -89443,7 +89502,6 @@ in sources."jake-10.8.2" sources."jsonfile-6.1.0" sources."levn-0.3.0" - sources."locate-path-5.0.0" sources."lru-cache-2.5.0" sources."memoizeasync-1.1.0" sources."mimic-fn-2.1.0" @@ -89453,21 +89511,16 @@ in sources."once-1.4.0" sources."onetime-5.1.2" sources."optionator-0.8.3" - sources."ot-builder-1.0.10" - sources."otb-ttc-bundle-1.0.10" - sources."p-limit-2.3.0" - sources."p-locate-4.1.0" - sources."p-try-2.2.0" + sources."ot-builder-1.0.11" + sources."otb-ttc-bundle-1.0.11" sources."passerror-1.1.1" sources."patel-0.34.0" - sources."path-exists-4.0.0" sources."path-is-absolute-1.0.1" sources."patrisika-0.22.2" - sources."patrisika-scopes-0.11.1" + sources."patrisika-scopes-0.12.0" sources."pegjs-0.10.0" sources."prelude-ls-1.1.2" sources."require-directory-2.1.1" - sources."require-main-filename-2.0.0" sources."resolve-url-0.2.1" sources."restore-cursor-3.1.0" sources."resumer-0.0.0" @@ -89480,7 +89533,6 @@ in ]; }) sources."seq-0.3.5" - sources."set-blocking-2.0.0" sources."signal-exit-3.0.3" sources."source-map-0.6.1" sources."source-map-resolve-0.5.3" @@ -89504,25 +89556,19 @@ in sources."unicoderegexp-0.4.1" sources."universalify-2.0.0" sources."urix-0.1.0" - (sources."verda-1.2.2" // { + (sources."verda-1.3.0" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.1" - sources."cliui-6.0.0" sources."color-convert-2.0.1" sources."color-name-1.1.4" - sources."fs-extra-9.1.0" sources."has-flag-4.0.0" sources."supports-color-7.2.0" - sources."wrap-ansi-6.2.0" - sources."y18n-4.0.3" - sources."yargs-15.4.1" - sources."yargs-parser-18.1.3" + sources."yargs-17.0.1" ]; }) sources."wawoff2-2.0.0" sources."which-2.0.2" - sources."which-module-2.0.0" sources."word-wrap-1.2.3" sources."wordwrap-0.0.3" (sources."wrap-ansi-7.0.0" // { @@ -89740,7 +89786,7 @@ in sources."async-mutex-0.1.4" sources."asynckit-0.4.0" sources."atob-2.1.2" - (sources."aws-sdk-2.947.0" // { + (sources."aws-sdk-2.948.0" // { dependencies = [ sources."sax-1.2.1" sources."uuid-3.3.2" @@ -89782,7 +89828,7 @@ in sources."color-3.1.2" sources."color-convert-1.9.3" sources."color-name-1.1.3" - sources."color-string-1.5.5" + sources."color-string-1.6.0" sources."combined-stream-1.0.8" sources."command-line-usage-4.1.0" sources."commander-6.2.1" @@ -90226,7 +90272,9 @@ in sources."seventh-0.7.40" (sources."sharp-0.26.3" // { dependencies = [ - sources."color-3.1.3" + sources."color-3.2.0" + sources."color-convert-2.0.1" + sources."color-name-1.1.4" sources."decompress-response-6.0.0" sources."mimic-response-3.1.0" sources."simple-get-4.0.0" @@ -91764,7 +91812,7 @@ in sources."@types/component-emitter-1.2.10" sources."@types/cookie-0.4.1" sources."@types/cors-2.8.12" - sources."@types/node-16.3.2" + sources."@types/node-16.3.3" sources."accepts-1.3.7" sources."ansi-regex-5.0.0" sources."ansi-styles-4.3.0" @@ -94576,7 +94624,7 @@ in sources."@types/istanbul-lib-report-3.0.0" sources."@types/istanbul-reports-1.1.2" sources."@types/json-schema-7.0.8" - sources."@types/node-16.3.2" + sources."@types/node-16.3.3" sources."@types/normalize-package-data-2.4.1" sources."@types/resolve-0.0.8" sources."@types/yargs-15.0.14" @@ -94873,7 +94921,7 @@ in sources."duplexer2-0.1.4" sources."duplexify-3.7.1" sources."ecc-jsbn-0.1.2" - sources."electron-to-chromium-1.3.776" + sources."electron-to-chromium-1.3.779" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -96121,7 +96169,7 @@ in }; dependencies = [ sources."@braintree/sanitize-url-3.1.0" - sources."@types/node-16.3.2" + sources."@types/node-16.3.3" sources."@types/yauzl-2.9.2" sources."agent-base-6.0.2" sources."ansi-styles-4.3.0" @@ -96730,7 +96778,7 @@ in sources."color-3.0.0" sources."color-convert-1.9.3" sources."color-name-1.1.3" - sources."color-string-1.5.5" + sources."color-string-1.6.0" sources."colornames-1.1.1" sources."colors-1.4.0" sources."colorspace-1.1.2" @@ -96973,7 +97021,7 @@ in sources."@types/node-14.17.5" ]; }) - sources."@netlify/plugins-list-2.19.2" + sources."@netlify/plugins-list-2.19.3" sources."@netlify/routing-local-proxy-0.30.2" (sources."@netlify/run-utils-1.0.7" // { dependencies = [ @@ -97155,7 +97203,7 @@ in sources."@types/istanbul-reports-1.1.2" sources."@types/keyv-3.1.2" sources."@types/minimatch-3.0.5" - sources."@types/node-16.3.2" + sources."@types/node-16.3.3" sources."@types/node-fetch-2.5.11" sources."@types/normalize-package-data-2.4.1" sources."@types/resolve-1.17.1" @@ -97187,7 +97235,7 @@ in sources."acorn-8.4.1" sources."agent-base-6.0.2" sources."aggregate-error-3.1.0" - sources."ajv-8.6.1" + sources."ajv-8.6.2" (sources."all-node-versions-8.0.0" // { dependencies = [ sources."@jest/types-25.5.0" @@ -97395,7 +97443,7 @@ in }) sources."color-convert-2.0.1" sources."color-name-1.1.4" - sources."color-string-1.5.5" + sources."color-string-1.6.0" sources."colorette-1.2.2" sources."colors-1.4.0" sources."colorspace-1.1.2" @@ -97580,7 +97628,7 @@ in }) sources."duplexer3-0.1.4" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.3.776" + sources."electron-to-chromium-1.3.779" sources."elegant-spinner-1.0.1" sources."elf-cam-0.1.1" sources."emoji-regex-8.0.0" @@ -100153,7 +100201,7 @@ in sources."@types/http-cache-semantics-4.0.1" sources."@types/keyv-3.1.2" sources."@types/minimist-1.2.2" - sources."@types/node-16.3.2" + sources."@types/node-16.3.3" sources."@types/normalize-package-data-2.4.1" sources."@types/parse-json-4.0.0" sources."@types/responselike-1.0.0" @@ -100657,10 +100705,10 @@ in npm = nodeEnv.buildNodePackage { name = "npm"; packageName = "npm"; - version = "7.19.1"; + version = "7.20.0"; src = fetchurl { - url = "https://registry.npmjs.org/npm/-/npm-7.19.1.tgz"; - sha512 = "aN3hZzGkPzKOyhjXtOhnQTGumorFhgpOU6xfuQsF1nJKh4DhsgfOMG4s/SNx56r4xHPvM5m/sk914wzDgKba3A=="; + url = "https://registry.npmjs.org/npm/-/npm-7.20.0.tgz"; + sha512 = "59Eje4RcXP9EKYPIJvBvQGTyfEvZWaKdOx5+YZ+IJ+fqYhJJH5ng78qcdD8sFPyA1g1MFBR0DYXKfncwbxXpVA=="; }; buildInputs = globalBuildInputs; meta = { @@ -101512,10 +101560,15 @@ in sources."clone-2.1.2" sources."coa-2.0.2" sources."collection-visit-1.0.0" - sources."color-3.1.3" + (sources."color-3.2.0" // { + dependencies = [ + sources."color-convert-2.0.1" + sources."color-name-1.1.4" + ]; + }) sources."color-convert-1.9.3" sources."color-name-1.1.3" - sources."color-string-1.5.5" + sources."color-string-1.6.0" sources."colorette-1.2.2" sources."combined-stream-1.0.8" sources."command-exists-1.2.9" @@ -101639,7 +101692,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.776" + sources."electron-to-chromium-1.3.779" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -103681,7 +103734,7 @@ in sources."statuses-1.5.0" sources."string_decoder-0.10.31" sources."supports-color-7.2.0" - sources."systeminformation-5.7.7" + sources."systeminformation-5.7.8" sources."to-regex-range-5.0.1" sources."toidentifier-1.0.0" sources."tslib-2.3.0" @@ -103716,10 +103769,10 @@ in pnpm = nodeEnv.buildNodePackage { name = "pnpm"; packageName = "pnpm"; - version = "6.10.0"; + version = "6.10.2"; src = fetchurl { - url = "https://registry.npmjs.org/pnpm/-/pnpm-6.10.0.tgz"; - sha512 = "fHKtgvnp9CfT/3qijmjUCstOFSB45OAF5EoK6lJxfdpEDe9bgO4om4do8Ut3boV+atZbV6rlEk9vZOUK6BGclw=="; + url = "https://registry.npmjs.org/pnpm/-/pnpm-6.10.2.tgz"; + sha512 = "o/CAEMtqjalEJyS9MgID3iZVx46LsqZ8MlwYGmWHNHD7Q0nOqtuYj+BKmgCXRiIWANA/JuC0Y6usNKhU8P3haw=="; }; buildInputs = globalBuildInputs; meta = { @@ -104288,10 +104341,10 @@ in pyright = nodeEnv.buildNodePackage { name = "pyright"; packageName = "pyright"; - version = "1.1.156"; + version = "1.1.157"; src = fetchurl { - url = "https://registry.npmjs.org/pyright/-/pyright-1.1.156.tgz"; - sha512 = "TIe7mK/BUTmdTBpmEYYT5XuRp8qwaFUxF2782HTTTe3hT2UU8UUN0wtIqwHpgFJZksIbahx4UeJyTaOi4ssq6A=="; + url = "https://registry.npmjs.org/pyright/-/pyright-1.1.157.tgz"; + sha512 = "slTex47hQKuyoi579Zk7lEhVH+4Dmn+eZ3gP1JGcFBcbcmDwd9ZI1ESww3jY3YoOYdNbYTafxBNuh3RHGkGiMA=="; }; buildInputs = globalBuildInputs; meta = { @@ -104774,7 +104827,7 @@ in sources."@types/glob-7.1.4" sources."@types/json-schema-7.0.8" sources."@types/minimatch-3.0.5" - sources."@types/node-16.3.2" + sources."@types/node-16.3.3" sources."@types/parse-json-4.0.0" sources."@types/q-1.5.5" sources."@webassemblyjs/ast-1.9.0" @@ -105016,10 +105069,15 @@ in sources."clone-response-1.0.2" sources."coa-2.0.2" sources."collection-visit-1.0.0" - sources."color-3.1.3" + (sources."color-3.2.0" // { + dependencies = [ + sources."color-convert-2.0.1" + sources."color-name-1.1.4" + ]; + }) sources."color-convert-1.9.3" sources."color-name-1.1.3" - sources."color-string-1.5.5" + sources."color-string-1.6.0" sources."colorette-1.2.2" sources."commander-4.1.1" sources."commondir-1.0.1" @@ -105191,7 +105249,7 @@ in sources."duplexify-3.7.1" sources."ee-first-1.1.1" sources."ejs-2.7.4" - sources."electron-to-chromium-1.3.776" + sources."electron-to-chromium-1.3.779" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -106547,10 +106605,10 @@ in redoc-cli = nodeEnv.buildNodePackage { name = "redoc-cli"; packageName = "redoc-cli"; - version = "0.12.1"; + version = "0.12.2"; src = fetchurl { - url = "https://registry.npmjs.org/redoc-cli/-/redoc-cli-0.12.1.tgz"; - sha512 = "Ew8ByEayRBZgG9iLv2ZO+h3ZMz55naz1jA1CPt6Vm0xcSbVNYb7ubnbHhSvUGshc2bGu8Je74k1veFZZqXjBeQ=="; + url = "https://registry.npmjs.org/redoc-cli/-/redoc-cli-0.12.2.tgz"; + sha512 = "GyOCEr1g+U/Js7lgHj+0vH9L2uCwbc0m9CJrlb099qp6jzmxnJQ6sC85BiN9DOwr4/fsQfVhoNpWQSkkpFBo5Q=="; }; dependencies = [ sources."@babel/code-frame-7.14.5" @@ -106786,7 +106844,7 @@ in ]; }) sources."readdirp-3.6.0" - (sources."redoc-2.0.0-rc.54" // { + (sources."redoc-2.0.0-rc.55" // { dependencies = [ sources."path-browserify-1.0.1" ]; @@ -107093,7 +107151,7 @@ in sources."escape-string-regexp-1.0.5" ]; }) - (sources."@eslint/eslintrc-0.4.2" // { + (sources."@eslint/eslintrc-0.4.3" // { dependencies = [ sources."ignore-4.0.6" ]; @@ -107421,7 +107479,7 @@ in sources."supports-color-5.5.0" (sources."table-6.7.1" // { dependencies = [ - sources."ajv-8.6.1" + sources."ajv-8.6.2" sources."json-schema-traverse-1.0.0" ]; }) @@ -107460,7 +107518,7 @@ in sources."vscode-languageclient-7.1.0-next.5" sources."vscode-languageserver-protocol-3.17.0-next.6" sources."vscode-languageserver-types-3.17.0-next.2" - sources."vscode-test-1.5.2" + sources."vscode-test-1.6.1" sources."which-2.0.2" (sources."wide-align-1.1.3" // { dependencies = [ @@ -107834,7 +107892,7 @@ in }) sources."@serverless/dashboard-plugin-5.4.3" sources."@serverless/event-mocks-1.1.1" - (sources."@serverless/platform-client-4.2.4" // { + (sources."@serverless/platform-client-4.2.5" // { dependencies = [ sources."adm-zip-0.4.16" sources."js-yaml-3.14.1" @@ -107847,7 +107905,7 @@ in ]; }) sources."@serverless/template-1.1.4" - (sources."@serverless/utils-5.3.0" // { + (sources."@serverless/utils-5.4.0" // { dependencies = [ sources."get-stream-6.0.1" sources."jwt-decode-3.1.2" @@ -107865,7 +107923,7 @@ in sources."@types/keyv-3.1.2" sources."@types/lodash-4.14.171" sources."@types/long-4.0.1" - sources."@types/node-16.3.2" + sources."@types/node-16.3.3" sources."@types/request-2.48.6" sources."@types/request-promise-native-1.0.18" sources."@types/responselike-1.0.0" @@ -107926,7 +107984,7 @@ in sources."async-2.6.3" sources."asynckit-0.4.0" sources."at-least-node-1.0.0" - (sources."aws-sdk-2.947.0" // { + (sources."aws-sdk-2.948.0" // { dependencies = [ sources."buffer-4.9.2" sources."ieee754-1.1.13" @@ -108029,7 +108087,7 @@ in sources."color-3.0.0" sources."color-convert-1.9.3" sources."color-name-1.1.3" - sources."color-string-1.5.5" + sources."color-string-1.6.0" sources."colornames-1.1.1" sources."colors-1.3.3" sources."colorspace-1.1.2" @@ -108401,7 +108459,7 @@ in sources."path-loader-1.0.10" sources."path-type-4.0.0" sources."path2-0.1.0" - sources."peek-readable-3.1.4" + sources."peek-readable-4.0.0" sources."pend-1.2.0" sources."performance-now-2.1.0" sources."picomatch-2.3.0" @@ -108512,7 +108570,7 @@ in sources."strip-dirs-2.1.0" sources."strip-json-comments-2.0.1" sources."strip-outer-1.0.1" - sources."strtok3-6.1.3" + sources."strtok3-6.2.0" (sources."superagent-3.8.3" // { dependencies = [ sources."debug-3.2.7" @@ -110042,7 +110100,7 @@ in sources."@types/component-emitter-1.2.10" sources."@types/cookie-0.4.1" sources."@types/cors-2.8.12" - sources."@types/node-16.3.2" + sources."@types/node-16.3.3" sources."accepts-1.3.7" sources."base64-arraybuffer-0.1.4" sources."base64id-2.0.0" @@ -111308,7 +111366,7 @@ in sources."async-1.5.2" sources."async-limiter-1.0.1" sources."asynckit-0.4.0" - (sources."aws-sdk-2.947.0" // { + (sources."aws-sdk-2.948.0" // { dependencies = [ sources."uuid-3.3.2" ]; @@ -112122,12 +112180,12 @@ in sources."@nodelib/fs.walk-1.2.8" sources."@stylelint/postcss-css-in-js-0.37.2" sources."@stylelint/postcss-markdown-0.36.2" - sources."@types/mdast-3.0.4" + sources."@types/mdast-3.0.7" sources."@types/minimist-1.2.2" sources."@types/normalize-package-data-2.4.1" sources."@types/parse-json-4.0.0" sources."@types/unist-2.0.6" - sources."ajv-8.6.1" + sources."ajv-8.6.2" sources."ansi-regex-5.0.0" sources."ansi-styles-3.2.1" sources."array-union-2.1.0" @@ -112184,7 +112242,7 @@ in sources."domelementtype-1.3.1" sources."domhandler-2.4.2" sources."domutils-1.7.0" - sources."electron-to-chromium-1.3.776" + sources."electron-to-chromium-1.3.779" sources."emoji-regex-8.0.0" sources."entities-1.1.2" sources."error-ex-1.3.2" @@ -112417,16 +112475,16 @@ in svelte-language-server = nodeEnv.buildNodePackage { name = "svelte-language-server"; packageName = "svelte-language-server"; - version = "0.14.3"; + version = "0.14.4"; src = fetchurl { - url = "https://registry.npmjs.org/svelte-language-server/-/svelte-language-server-0.14.3.tgz"; - sha512 = "R3mcgZfBYl66aqLx33F1i2homQhsHygFcXDJ4hnEsmzWXO2y1ZVMTCgT3WoOMwcqezU6OytY88K2ny9cfEszNg=="; + url = "https://registry.npmjs.org/svelte-language-server/-/svelte-language-server-0.14.4.tgz"; + sha512 = "ldw4/YQR/gpI29Sgv+u/zkHTIMKn2ohpSvfORmDm2H85fNa/Dw8fUoqK080GbVol32sYO8ThzNKkheBjUT0mCw=="; }; dependencies = [ sources."@emmetio/abbreviation-2.2.2" sources."@emmetio/css-abbreviation-2.1.4" sources."@emmetio/scanner-1.0.0" - sources."@types/node-16.3.2" + sources."@types/node-16.3.3" sources."@types/pug-2.0.5" sources."@types/sass-1.16.1" sources."anymatch-3.1.2" @@ -112469,7 +112527,7 @@ in sources."strip-indent-3.0.0" sources."svelte-3.38.3" sources."svelte-preprocess-4.7.4" - sources."svelte2tsx-0.4.1" + sources."svelte2tsx-0.4.2" sources."to-regex-range-5.0.1" sources."tslib-2.3.0" sources."typescript-4.3.5" @@ -113493,9 +113551,9 @@ in sources."@textlint/textlint-plugin-text-12.0.2" sources."@textlint/types-12.0.2" sources."@textlint/utils-12.0.2" - sources."@types/mdast-3.0.4" + sources."@types/mdast-3.0.7" sources."@types/unist-2.0.6" - sources."ajv-8.6.1" + sources."ajv-8.6.2" sources."ansi-regex-2.1.1" sources."ansi-styles-2.2.1" sources."argparse-1.0.10" @@ -114584,7 +114642,7 @@ in sources."@types/cacheable-request-6.0.2" sources."@types/http-cache-semantics-4.0.1" sources."@types/keyv-3.1.2" - sources."@types/node-16.3.2" + sources."@types/node-16.3.3" sources."@types/responselike-1.0.0" sources."abbrev-1.1.1" sources."abstract-logging-2.0.1" @@ -114884,7 +114942,7 @@ in sources."parseurl-1.3.3" sources."path-is-absolute-1.0.1" sources."path-to-regexp-0.1.7" - sources."peek-readable-3.1.4" + sources."peek-readable-4.0.0" sources."performance-now-2.1.0" sources."pify-4.0.1" sources."precond-0.2.3" @@ -114969,7 +115027,7 @@ in sources."strip-ansi-3.0.1" sources."strip-json-comments-2.0.1" sources."strip-outer-1.0.1" - sources."strtok3-6.1.3" + sources."strtok3-6.2.0" sources."supports-color-7.2.0" sources."tar-4.4.13" sources."tlds-1.208.0" @@ -115629,7 +115687,7 @@ in sources."color-3.0.0" sources."color-convert-1.9.3" sources."color-name-1.1.3" - sources."color-string-1.5.5" + sources."color-string-1.6.0" sources."colors-1.4.0" sources."colorspace-1.1.2" sources."component-emitter-1.3.0" @@ -116129,7 +116187,7 @@ in sources."escape-string-regexp-1.0.5" ]; }) - sources."@eslint/eslintrc-0.4.2" + sources."@eslint/eslintrc-0.4.3" sources."@humanwhocodes/config-array-0.5.0" sources."@humanwhocodes/object-schema-1.2.0" sources."acorn-7.4.1" @@ -116165,7 +116223,7 @@ in sources."emoji-regex-8.0.0" sources."enquirer-2.3.6" sources."escape-string-regexp-4.0.0" - sources."eslint-7.30.0" + sources."eslint-7.31.0" sources."eslint-plugin-vue-7.13.0" sources."eslint-scope-5.1.1" (sources."eslint-utils-2.1.0" // { @@ -116263,7 +116321,7 @@ in sources."supports-color-5.5.0" (sources."table-6.7.1" // { dependencies = [ - sources."ajv-8.6.1" + sources."ajv-8.6.2" sources."json-schema-traverse-1.0.0" ]; }) @@ -116380,19 +116438,15 @@ in }; dependencies = [ sources."agent-base-4.3.0" - sources."balanced-match-1.0.2" - sources."brace-expansion-1.1.11" - sources."concat-map-0.0.1" sources."debug-3.1.0" sources."es6-promise-4.2.8" sources."es6-promisify-5.0.0" sources."http-proxy-agent-2.1.0" sources."https-proxy-agent-2.2.4" sources."jsonc-parser-3.0.0" - sources."minimatch-3.0.4" sources."ms-2.0.0" sources."request-light-0.4.0" - (sources."vscode-json-languageservice-4.1.5" // { + (sources."vscode-json-languageservice-4.1.6" // { dependencies = [ sources."vscode-nls-5.0.0" ]; @@ -116562,7 +116616,7 @@ in sources."domelementtype-2.2.0" sources."domhandler-4.2.0" sources."domutils-2.7.0" - sources."electron-to-chromium-1.3.776" + sources."electron-to-chromium-1.3.779" sources."emoji-regex-8.0.0" sources."emojis-list-3.0.0" sources."enhanced-resolve-5.8.2" @@ -116772,7 +116826,7 @@ in sources."vscode-debugadapter-testsupport-1.47.0" sources."vscode-debugprotocol-1.47.0" sources."watchpack-2.2.0" - sources."webpack-5.44.0" + sources."webpack-5.45.1" (sources."webpack-cli-4.7.2" // { dependencies = [ sources."commander-7.2.0" @@ -117129,7 +117183,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-16.3.2" + sources."@types/node-16.3.3" sources."@types/unist-2.0.6" sources."@types/vfile-3.0.2" sources."@types/vfile-message-2.0.0" @@ -118291,7 +118345,7 @@ in sources."@devicefarmer/adbkit-2.11.3" sources."@devicefarmer/adbkit-logcat-1.1.0" sources."@devicefarmer/adbkit-monkey-1.0.1" - (sources."@eslint/eslintrc-0.4.2" // { + (sources."@eslint/eslintrc-0.4.3" // { dependencies = [ sources."debug-4.3.2" sources."ms-2.1.2" @@ -118301,7 +118355,7 @@ in sources."@sindresorhus/is-0.14.0" sources."@szmarczak/http-timer-1.1.2" sources."@types/minimatch-3.0.5" - sources."@types/node-16.3.2" + sources."@types/node-16.3.3" sources."@types/yauzl-2.9.1" sources."acorn-7.4.1" sources."acorn-jsx-5.3.2" @@ -118779,7 +118833,7 @@ in sources."supports-color-7.2.0" (sources."table-6.7.1" // { dependencies = [ - sources."ajv-8.6.1" + sources."ajv-8.6.2" sources."ansi-regex-5.0.0" sources."json-schema-traverse-1.0.0" sources."strip-ansi-6.0.0" @@ -118854,17 +118908,17 @@ in webpack = nodeEnv.buildNodePackage { name = "webpack"; packageName = "webpack"; - version = "5.44.0"; + version = "5.45.1"; src = fetchurl { - url = "https://registry.npmjs.org/webpack/-/webpack-5.44.0.tgz"; - sha512 = "I1S1w4QLoKmH19pX6YhYN0NiSXaWY8Ou00oA+aMcr9IUGeF5azns+IKBkfoAAG9Bu5zOIzZt/mN35OffBya8AQ=="; + url = "https://registry.npmjs.org/webpack/-/webpack-5.45.1.tgz"; + sha512 = "68VT2ZgG9EHs6h6UxfV2SEYewA9BA3SOLSnC2NEbJJiEwbAiueDL033R1xX0jzjmXvMh0oSeKnKgbO2bDXIEyQ=="; }; dependencies = [ sources."@types/eslint-7.28.0" sources."@types/eslint-scope-3.7.1" sources."@types/estree-0.0.50" sources."@types/json-schema-7.0.8" - sources."@types/node-16.3.2" + sources."@types/node-16.3.3" sources."@webassemblyjs/ast-1.11.1" sources."@webassemblyjs/floating-point-hex-parser-1.11.1" sources."@webassemblyjs/helper-api-error-1.11.1" @@ -118891,7 +118945,7 @@ in sources."chrome-trace-event-1.0.3" sources."colorette-1.2.2" sources."commander-2.20.3" - sources."electron-to-chromium-1.3.776" + sources."electron-to-chromium-1.3.779" sources."enhanced-resolve-5.8.2" sources."es-module-lexer-0.7.1" sources."escalade-3.1.1" @@ -119029,7 +119083,7 @@ in dependencies = [ sources."@types/glob-7.1.4" sources."@types/minimatch-3.0.5" - sources."@types/node-16.3.2" + sources."@types/node-16.3.3" sources."accepts-1.3.7" sources."ajv-6.12.6" sources."ajv-errors-1.0.1" @@ -119665,13 +119719,13 @@ in webtorrent-cli = nodeEnv.buildNodePackage { name = "webtorrent-cli"; packageName = "webtorrent-cli"; - version = "3.5.0"; + version = "3.5.2"; src = fetchurl { - url = "https://registry.npmjs.org/webtorrent-cli/-/webtorrent-cli-3.5.0.tgz"; - sha512 = "buPr+byINi11QWrnhaHO4adV2pYDkn9V80dI8SbEXkbFmYoopk3NdvstQz62lnPVUbKnJSAg7Abj93fdLIIG/w=="; + url = "https://registry.npmjs.org/webtorrent-cli/-/webtorrent-cli-3.5.2.tgz"; + sha512 = "czMFGRzxT2IsgZoMkmHwGASBSx/pLGQOZV3oAD/c5qCw4+YVBMYP2/FehaQ/CF3dMKBnIH4jIevK2KT6pdRC2A=="; }; dependencies = [ - sources."@leichtgewicht/ip-codec-2.0.2" + sources."@leichtgewicht/ip-codec-2.0.3" sources."@protobufjs/aspromise-1.1.2" sources."@protobufjs/base64-1.1.2" sources."@protobufjs/codegen-2.0.4" @@ -119683,7 +119737,7 @@ in sources."@protobufjs/pool-1.1.0" sources."@protobufjs/utf8-1.1.0" sources."@types/long-4.0.1" - sources."@types/node-16.3.2" + sources."@types/node-16.3.3" sources."addr-to-ip-port-1.5.1" sources."airplay-js-0.3.0" sources."ansi-regex-5.0.0" @@ -119787,7 +119841,6 @@ in sources."err-code-3.0.1" sources."escalade-3.1.1" sources."escape-html-1.0.3" - sources."executable-4.1.1" sources."filestream-5.0.0" sources."freelist-1.0.3" (sources."fs-chunk-store-2.0.3" // { @@ -119878,7 +119931,6 @@ in }) sources."path-is-absolute-1.0.1" sources."piece-length-2.0.1" - sources."pify-2.3.0" (sources."plist-with-patches-0.5.1" // { dependencies = [ sources."xmlbuilder-0.4.3" @@ -120061,9 +120113,6 @@ in dependencies = [ sources."agent-base-4.3.0" sources."argparse-2.0.1" - sources."balanced-match-1.0.2" - sources."brace-expansion-1.1.11" - sources."concat-map-0.0.1" sources."debug-3.1.0" sources."es6-promise-4.2.8" sources."es6-promisify-5.0.0" @@ -120071,10 +120120,9 @@ in sources."https-proxy-agent-2.2.4" sources."js-yaml-4.1.0" sources."jsonc-parser-3.0.0" - sources."minimatch-3.0.4" sources."ms-2.0.0" sources."request-light-0.2.5" - (sources."vscode-json-languageservice-4.1.5" // { + (sources."vscode-json-languageservice-4.1.6" // { dependencies = [ sources."vscode-nls-5.0.0" sources."vscode-uri-3.0.2" @@ -121063,7 +121111,7 @@ in dependencies = [ sources."@types/fs-extra-9.0.12" sources."@types/minimist-1.2.2" - sources."@types/node-16.3.2" + sources."@types/node-16.3.3" sources."@types/node-fetch-2.5.11" sources."ansi-styles-4.3.0" sources."asynckit-0.4.0" diff --git a/third_party/nixpkgs/pkgs/development/node-packages/package-tests/autoprefixer.nix b/third_party/nixpkgs/pkgs/development/node-packages/package-tests/autoprefixer.nix new file mode 100644 index 0000000000..c889795a2e --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/node-packages/package-tests/autoprefixer.nix @@ -0,0 +1,25 @@ +{ runCommand, autoprefixer }: + +let + inherit (autoprefixer) packageName version; +in + +runCommand "${packageName}-tests" { meta.timeout = 60; } + '' + # get version of installed program and compare with package version + claimed_version="$(${autoprefixer}/bin/autoprefixer --version | awk '{print $2}')" + if [[ "$claimed_version" != "${version}" ]]; then + echo "Error: program version does not match package version ($claimed_version != ${version})" + exit 1 + fi + + # run dummy commands + ${autoprefixer}/bin/autoprefixer --help > /dev/null + ${autoprefixer}/bin/autoprefixer --info > /dev/null + + # Testing the actual functionality is done in the test for postcss + # because autoprefixer is a postcss plugin + + # needed for Nix to register the command as successful + touch $out + '' diff --git a/third_party/nixpkgs/pkgs/development/node-packages/package-tests/postcss-cli.nix b/third_party/nixpkgs/pkgs/development/node-packages/package-tests/postcss-cli.nix new file mode 100644 index 0000000000..521509e7f4 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/node-packages/package-tests/postcss-cli.nix @@ -0,0 +1,45 @@ +{ runCommand, postcss-cli }: + +let + inherit (postcss-cli) packageName version; +in + +runCommand "${packageName}-tests" { meta.timeout = 60; } + '' + # get version of installed program and compare with package version + claimed_version="$(${postcss-cli}/bin/postcss --version)" + if [[ "$claimed_version" != "${version}" ]]; then + echo "Error: program version does not match package version ($claimed_version != ${version})" + exit 1 + fi + + # run basic help command + ${postcss-cli}/bin/postcss --help > /dev/null + + # basic autoprefixer test + config_dir="$(mktemp -d)" + clean_up() { + rm -rf "$config_dir" + } + trap clean_up EXIT + echo " + module.exports = { + plugins: { + 'autoprefixer': { overrideBrowserslist: 'chrome 40' }, + }, + } + " > "$config_dir/postcss.config.js" + input='a{ user-select: none; }' + expected_output='a{ -webkit-user-select: none; user-select: none; }' + actual_output="$(echo $input | ${postcss-cli}/bin/postcss --no-map --config $config_dir)" + if [[ "$actual_output" != "$expected_output" ]]; then + echo "Error: autoprefixer did not output the correct CSS:" + echo "$actual_output" + echo "!=" + echo "$expected_output" + exit 1 + fi + + # needed for Nix to register the command as successful + touch $out + '' diff --git a/third_party/nixpkgs/pkgs/development/python-modules/cherrypy/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/cherrypy/default.nix index 4146a26d56..033ead0912 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/cherrypy/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/cherrypy/default.nix @@ -61,7 +61,7 @@ buildPythonPackage rec { --deselect=cherrypy/test/test_static.py::StaticTest::test_null_bytes \ --deselect=cherrypy/test/test_tools.py::ToolTests::testCombinedTools \ ${lib.optionalString stdenv.isDarwin - "--deselect=cherrypy/test/test_bus.py::BusMethodTests::test_block"} + "--deselect=cherrypy/test/test_bus.py::BusMethodTests::test_block --deselect=cherrypy/test/test_config_server.py"} ''; __darwinAllowLocalNetworking = true; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/docker/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/docker/default.nix index 5e5071e930..3c41ccd173 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/docker/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/docker/default.nix @@ -14,11 +14,11 @@ buildPythonPackage rec { pname = "docker"; - version = "4.4.4"; + version = "5.0.0"; src = fetchPypi { inherit pname version; - sha256 = "d3393c878f575d3a9ca3b94471a3c89a6d960b35feb92f033c0de36cc9d934db"; + sha256 = "sha256-PovEdTTgypMx1ywy8ogbsTuT3tC83qs8gz+3z2HAqaU="; }; nativeBuildInputs = lib.optional isPy27 mock; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/editables/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/editables/default.nix index 9a3bac5abd..ee902d772c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/editables/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/editables/default.nix @@ -20,9 +20,12 @@ buildPythonPackage rec { # Tests not included in archive. doCheck = false; - meta = { + pythonImportsCheck = [ "editables" ]; + + meta = with lib; { description = "Editable installations"; - homepage = https://github.com/pfmoore/editables; - license = lib.licenses.mit; + maintainers = with maintainers; [ ]; + homepage = "https://github.com/pfmoore/editables"; + license = licenses.mit; }; } diff --git a/third_party/nixpkgs/pkgs/development/python-modules/flask-restx/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/flask-restx/default.nix index 4d0d89d0f1..556317ed41 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/flask-restx/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/flask-restx/default.nix @@ -49,7 +49,7 @@ buildPythonPackage rec { "--deselect=tests/test_logging.py::LoggingTest::test_override_app_level" ]; - pythonImportCheck = [ "flask_restx" ]; + pythonImportsCheck = [ "flask_restx" ]; meta = with lib; { homepage = "https://flask-restx.readthedocs.io/en/${version}/"; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/h2/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/h2/default.nix index fccc164321..fcd2836214 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/h2/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/h2/default.nix @@ -39,7 +39,7 @@ buildPythonPackage rec { hypothesis ]; - pythonImportCheck = [ + pythonImportsCheck = [ "h2.connection" "h2.config" ]; diff --git a/third_party/nixpkgs/pkgs/development/python-modules/python-wifi/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/python-wifi/default.nix index 7f6eee4906..a679100d37 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/python-wifi/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/python-wifi/default.nix @@ -16,7 +16,6 @@ buildPythonPackage rec { }; meta = with lib; { - inherit version; description = "Read & write wireless card capabilities using the Linux Wireless Extensions"; homepage = "http://pythonwifi.tuxfamily.org/"; # From the README: "pythonwifi is licensed under LGPLv2+, however, the diff --git a/third_party/nixpkgs/pkgs/development/python-modules/pyvicare/default.nix b/third_party/nixpkgs/pkgs/development/python-modules/pyvicare/default.nix index 7c87431d80..274cb0379c 100644 --- a/third_party/nixpkgs/pkgs/development/python-modules/pyvicare/default.nix +++ b/third_party/nixpkgs/pkgs/development/python-modules/pyvicare/default.nix @@ -1,29 +1,43 @@ { lib , buildPythonPackage -, fetchPypi +, fetchFromGitHub , pythonOlder , requests_oauthlib , simplejson +, pkce +, pytestCheckHook }: buildPythonPackage rec { pname = "pyvicare"; - version = "0.2.5"; + version = "1.0.0"; disabled = pythonOlder "3.7"; - src = fetchPypi { - pname = "PyViCare"; - inherit version; - sha256 = "16wqqjs238ad6znlz2gjadqj8891226bd02a1106xyz6vbbk2gdk"; + src = fetchFromGitHub { + owner = "somm15"; + repo = "PyViCare"; + rev = version; + sha256 = "05dlasx18fkmh4z1w8550yrb26fmsb5bc73wr9whmkasm32gpfl1"; }; + SETUPTOOLS_SCM_PRETEND_VERSION = version; + propagatedBuildInputs = [ requests_oauthlib simplejson + pkce ]; - # The published tarball on PyPI is incomplete and there are GitHub releases - doCheck = false; + checkInputs = [ + pytestCheckHook + ]; + + postPatch = '' + substituteInPlace setup.py \ + --replace "version_config=True," 'version="${version}",' \ + --replace "'setuptools-git-versioning'" " " + ''; + pythonImportsCheck = [ "PyViCare" ]; meta = with lib; { diff --git a/third_party/nixpkgs/pkgs/development/ruby-modules/bundix/default.nix b/third_party/nixpkgs/pkgs/development/ruby-modules/bundix/default.nix index 17f5d6553f..d4cfe217b8 100644 --- a/third_party/nixpkgs/pkgs/development/ruby-modules/bundix/default.nix +++ b/third_party/nixpkgs/pkgs/development/ruby-modules/bundix/default.nix @@ -28,7 +28,6 @@ buildRubyGem rec { ''; meta = { - inherit version; description = "Creates Nix packages from Gemfiles"; longDescription = '' This is a tool that converts Gemfile.lock files to nix expressions. diff --git a/third_party/nixpkgs/pkgs/development/tools/analysis/rizin/default.nix b/third_party/nixpkgs/pkgs/development/tools/analysis/rizin/default.nix index 4e9543ef37..ff7717312f 100644 --- a/third_party/nixpkgs/pkgs/development/tools/analysis/rizin/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/analysis/rizin/default.nix @@ -77,6 +77,5 @@ stdenv.mkDerivation rec { license = lib.licenses.gpl3Plus; maintainers = with lib.maintainers; [ raskin makefu mic92 ]; platforms = with lib.platforms; linux; - inherit version; }; } diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/apache-ant/1.9.nix b/third_party/nixpkgs/pkgs/development/tools/build-managers/apache-ant/1.9.nix index 93644caa5a..80f8f1f886 100644 --- a/third_party/nixpkgs/pkgs/development/tools/build-managers/apache-ant/1.9.nix +++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/apache-ant/1.9.nix @@ -1,16 +1,14 @@ { fetchurl, lib, stdenv, coreutils, makeWrapper }: -let version = "1.9.15"; in - -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "ant"; - inherit version; + version = "1.9.16"; nativeBuildInputs = [ makeWrapper ]; src = fetchurl { url = "mirror://apache/ant/binaries/apache-ant-${version}-bin.tar.bz2"; - sha256 = "0yfx5qsvrg12lar4908ndbnlpppy7g7qk8ay41y4sz9g873v07mr"; + sha256 = "0rif9kj6njajy951w3aapk27y1mbaxb08whs126v533h96rb1kjp"; }; contrib = fetchurl { 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 d2ef8361ec..7c05fcf60a 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,16 +1,14 @@ { fetchurl, lib, stdenv, coreutils, makeWrapper }: -let version = "1.10.9"; in - -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "ant"; - inherit version; + version = "1.10.11"; nativeBuildInputs = [ makeWrapper ]; src = fetchurl { url = "mirror://apache/ant/binaries/apache-ant-${version}-bin.tar.bz2"; - sha256 = "1ab8ybczvk12501dnj450a3d4v43ca0pjhk33s175hax46s58z47"; + sha256 = "19m8xb7h6xm4jykzb79kakbx1pa4awaglw6z31pbfg8m5pmwkipz"; }; contrib = fetchurl { diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/gnumake/4.2/default.nix b/third_party/nixpkgs/pkgs/development/tools/build-managers/gnumake/4.2/default.nix index 387650e85a..5d0a912733 100644 --- a/third_party/nixpkgs/pkgs/development/tools/build-managers/gnumake/4.2/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/gnumake/4.2/default.nix @@ -2,12 +2,9 @@ assert guileSupport -> ( pkg-config != null && guile != null ); -let - version = "4.2.1"; -in -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "gnumake"; - inherit version; + version = "4.2.1"; src = fetchurl { url = "mirror://gnu/make/make-${version}.tar.bz2"; diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/gnumake/default.nix b/third_party/nixpkgs/pkgs/development/tools/build-managers/gnumake/default.nix index 8e0095bb81..b6d5d8e154 100644 --- a/third_party/nixpkgs/pkgs/development/tools/build-managers/gnumake/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/gnumake/default.nix @@ -1,11 +1,8 @@ { lib, stdenv, fetchurl, guileSupport ? false, pkg-config, guile }: -let - version = "4.3"; -in -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "gnumake"; - inherit version; + version = "4.3"; src = fetchurl { url = "mirror://gnu/make/make-${version}.tar.gz"; diff --git a/third_party/nixpkgs/pkgs/development/tools/build-managers/rebar/default.nix b/third_party/nixpkgs/pkgs/development/tools/build-managers/rebar/default.nix index 30c55dbca3..c6e74a8ebb 100644 --- a/third_party/nixpkgs/pkgs/development/tools/build-managers/rebar/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/build-managers/rebar/default.nix @@ -1,12 +1,8 @@ { lib, stdenv, fetchurl, erlang }: - -let - version = "2.6.4"; -in -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "rebar"; - inherit version; + version = "2.6.4"; src = fetchurl { url = "https://github.com/rebar/rebar/archive/${version}.tar.gz"; diff --git a/third_party/nixpkgs/pkgs/development/tools/continuous-integration/drone-cli/default.nix b/third_party/nixpkgs/pkgs/development/tools/continuous-integration/drone-cli/default.nix index 245aeeb435..4534298d39 100644 --- a/third_party/nixpkgs/pkgs/development/tools/continuous-integration/drone-cli/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/continuous-integration/drone-cli/default.nix @@ -1,8 +1,7 @@ { lib, fetchFromGitHub, buildGoModule }: -let version = "1.3.0"; -in buildGoModule rec { - inherit version; +buildGoModule rec { + version = "1.3.0"; pname = "drone-cli"; revision = "v${version}"; diff --git a/third_party/nixpkgs/pkgs/development/tools/database/squirrel-sql/default.nix b/third_party/nixpkgs/pkgs/development/tools/database/squirrel-sql/default.nix index 5aca6d55bc..4363ec4309 100644 --- a/third_party/nixpkgs/pkgs/development/tools/database/squirrel-sql/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/database/squirrel-sql/default.nix @@ -4,11 +4,9 @@ , jre , drivers ? [] }: -let - version = "4.1.0"; -in stdenv.mkDerivation rec { +stdenv.mkDerivation rec { pname = "squirrel-sql"; - inherit version; + version = "4.1.0"; src = fetchurl { url = "mirror://sourceforge/project/squirrel-sql/1-stable/${version}-plainzip/squirrelsql-${version}-standard.zip"; diff --git a/third_party/nixpkgs/pkgs/development/tools/flyway/default.nix b/third_party/nixpkgs/pkgs/development/tools/flyway/default.nix index f581806433..4679c6aa05 100644 --- a/third_party/nixpkgs/pkgs/development/tools/flyway/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/flyway/default.nix @@ -1,39 +1,36 @@ { lib, stdenv, fetchurl, jre_headless, makeWrapper }: - let - version = "7.5.4"; - in - stdenv.mkDerivation { - pname = "flyway"; - inherit version; - src = fetchurl { - url = "https://repo1.maven.org/maven2/org/flywaydb/flyway-commandline/${version}/flyway-commandline-${version}.tar.gz"; - sha256 = "sha256-WU8j1NSf2KfA/HJWFtMLOZ3t5nxW4sU713e6qEEhZ0I="; - }; - nativeBuildInputs = [ makeWrapper ]; - dontBuild = true; - dontStrip = true; - installPhase = '' - mkdir -p $out/bin $out/share/flyway - cp -r sql jars drivers conf $out/share/flyway - install -Dt $out/share/flyway/lib lib/community/*.jar lib/*.jar - makeWrapper "${jre_headless}/bin/java" $out/bin/flyway \ - --add-flags "-Djava.security.egd=file:/dev/../dev/urandom" \ - --add-flags "-classpath '$out/share/flyway/lib/*:$out/share/flyway/drivers/*'" \ - --add-flags "org.flywaydb.commandline.Main" \ - --add-flags "-jarDirs='$out/share/flyway/jars'" - ''; - meta = with lib; { - description = "Evolve your Database Schema easily and reliably across all your instances"; - longDescription = '' - The Flyway command-line tool is a standalone Flyway distribution. - It is primarily meant for users who wish to migrate their database from the command-line - without having to integrate Flyway into their applications nor having to install a build tool. +stdenv.mkDerivation rec{ + pname = "flyway"; + version = "7.5.4"; + src = fetchurl { + url = "https://repo1.maven.org/maven2/org/flywaydb/flyway-commandline/${version}/flyway-commandline-${version}.tar.gz"; + sha256 = "sha256-WU8j1NSf2KfA/HJWFtMLOZ3t5nxW4sU713e6qEEhZ0I="; + }; + nativeBuildInputs = [ makeWrapper ]; + dontBuild = true; + dontStrip = true; + installPhase = '' + mkdir -p $out/bin $out/share/flyway + cp -r sql jars drivers conf $out/share/flyway + install -Dt $out/share/flyway/lib lib/community/*.jar lib/*.jar + makeWrapper "${jre_headless}/bin/java" $out/bin/flyway \ + --add-flags "-Djava.security.egd=file:/dev/../dev/urandom" \ + --add-flags "-classpath '$out/share/flyway/lib/*:$out/share/flyway/drivers/*'" \ + --add-flags "org.flywaydb.commandline.Main" \ + --add-flags "-jarDirs='$out/share/flyway/jars'" + ''; + meta = with lib; { + description = "Evolve your Database Schema easily and reliably across all your instances"; + longDescription = '' + The Flyway command-line tool is a standalone Flyway distribution. + It is primarily meant for users who wish to migrate their database from the command-line + without having to integrate Flyway into their applications nor having to install a build tool. - This package is only the Community Edition of the Flyway command-line tool. - ''; - homepage = "https://flywaydb.org/"; - license = licenses.asl20; - platforms = platforms.unix; - maintainers = [ maintainers.cmcdragonkai ]; - }; - } + This package is only the Community Edition of the Flyway command-line tool. + ''; + homepage = "https://flywaydb.org/"; + license = licenses.asl20; + platforms = platforms.unix; + maintainers = [ maintainers.cmcdragonkai ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/tools/java/fastjar/default.nix b/third_party/nixpkgs/pkgs/development/tools/java/fastjar/default.nix index 52211e302d..c81df42edb 100644 --- a/third_party/nixpkgs/pkgs/development/tools/java/fastjar/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/java/fastjar/default.nix @@ -1,32 +1,31 @@ { fetchurl, lib, stdenv, zlib }: -let version = "0.98"; in - stdenv.mkDerivation { - pname = "fastjar"; - inherit version; +stdenv.mkDerivation rec { + pname = "fastjar"; + version = "0.98"; - src = fetchurl { - url = "https://download.savannah.gnu.org/releases/fastjar/fastjar-${version}.tar.gz"; - sha256 = "0iginbz2m15hcsa3x4y7v3mhk54gr1r7m3ghx0pg4n46vv2snmpi"; - }; + src = fetchurl { + url = "https://download.savannah.gnu.org/releases/fastjar/fastjar-${version}.tar.gz"; + sha256 = "0iginbz2m15hcsa3x4y7v3mhk54gr1r7m3ghx0pg4n46vv2snmpi"; + }; - buildInputs = [ zlib ]; + buildInputs = [ zlib ]; - doCheck = true; + doCheck = true; - meta = { - description = "Fast Java archiver written in C"; + meta = { + description = "Fast Java archiver written in C"; - longDescription = '' - Fastjar is a version of Sun's `jar' utility, written entirely in C, and - therefore quite a bit faster. Fastjar can be up to 100x faster than - the stock `jar' program running without a JIT. - ''; + longDescription = '' + Fastjar is a version of Sun's `jar' utility, written entirely in C, and + therefore quite a bit faster. Fastjar can be up to 100x faster than + the stock `jar' program running without a JIT. + ''; - homepage = "https://savannah.nongnu.org/projects/fastjar/"; + homepage = "https://savannah.nongnu.org/projects/fastjar/"; - license = lib.licenses.gpl2Plus; - platforms = lib.platforms.linux; - maintainers = [ ]; - }; - } + license = lib.licenses.gpl2Plus; + platforms = lib.platforms.linux; + maintainers = [ ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/tools/jq/default.nix b/third_party/nixpkgs/pkgs/development/tools/jq/default.nix index 39819db47d..feeb22e1d4 100644 --- a/third_party/nixpkgs/pkgs/development/tools/jq/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/jq/default.nix @@ -66,6 +66,5 @@ stdenv.mkDerivation rec { platforms = with platforms; linux ++ darwin; downloadPage = "http://stedolan.github.io/jq/download/"; updateWalker = true; - inherit version; }; } diff --git a/third_party/nixpkgs/pkgs/development/tools/minizinc/default.nix b/third_party/nixpkgs/pkgs/development/tools/minizinc/default.nix index c1e0a356df..06a6bd3dfd 100644 --- a/third_party/nixpkgs/pkgs/development/tools/minizinc/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/minizinc/default.nix @@ -1,10 +1,7 @@ { lib, stdenv, fetchFromGitHub, cmake, flex, bison }: -let - version = "2.5.5"; -in -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "minizinc"; - inherit version; + version = "2.5.5"; nativeBuildInputs = [ cmake flex bison ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/minizinc/ide.nix b/third_party/nixpkgs/pkgs/development/tools/minizinc/ide.nix index a1ce9d0a69..ef7dcb3532 100644 --- a/third_party/nixpkgs/pkgs/development/tools/minizinc/ide.nix +++ b/third_party/nixpkgs/pkgs/development/tools/minizinc/ide.nix @@ -1,10 +1,7 @@ { lib, mkDerivation, fetchFromGitHub, qtbase, qtwebengine, qtwebkit, qmake, minizinc }: -let - version = "2.5.3"; -in -mkDerivation { +mkDerivation rec { pname = "minizinc-ide"; - inherit version; + version = "2.5.3"; nativeBuildInputs = [ qmake ]; buildInputs = [ qtbase qtwebengine qtwebkit ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/dfu-programmer/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/dfu-programmer/default.nix index f0a3a9b760..062f68c834 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/dfu-programmer/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/dfu-programmer/default.nix @@ -1,10 +1,7 @@ { lib, stdenv, fetchurl, libusb-compat-0_1 }: -let - version = "0.7.2"; -in stdenv.mkDerivation rec { pname = "dfu-programmer"; - inherit version; + version = "0.7.2"; buildInputs = [ libusb-compat-0_1 ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/luarocks/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/luarocks/default.nix index d4f2ec4ded..f3ec4b4d7a 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/luarocks/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/luarocks/default.nix @@ -68,7 +68,6 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - inherit version; description = "A package manager for Lua"; license = licenses.mit ; maintainers = with maintainers; [raskin teto]; diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/nixbang/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/nixbang/default.nix index 468623241b..bcddf4479e 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/nixbang/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/nixbang/default.nix @@ -1,9 +1,8 @@ { lib, pythonPackages, fetchFromGitHub }: -let version = "0.1.2"; in -pythonPackages.buildPythonApplication { +pythonPackages.buildPythonApplication rec { pname = "nixbang"; - inherit version; + version = "0.1.2"; namePrefix = ""; src = fetchFromGitHub { diff --git a/third_party/nixpkgs/pkgs/development/tools/misc/prelink/default.nix b/third_party/nixpkgs/pkgs/development/tools/misc/prelink/default.nix index 63fc7c8e64..2fbee4ca5f 100644 --- a/third_party/nixpkgs/pkgs/development/tools/misc/prelink/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/misc/prelink/default.nix @@ -1,11 +1,8 @@ { lib, stdenv, fetchurl, libelf }: -let - version = "20130503"; -in -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "prelink"; - inherit version; + version = "20130503"; buildInputs = [ libelf stdenv.cc.libc (lib.getOutput "static" stdenv.cc.libc) diff --git a/third_party/nixpkgs/pkgs/development/tools/mold/default.nix b/third_party/nixpkgs/pkgs/development/tools/mold/default.nix new file mode 100644 index 0000000000..ee661e6220 --- /dev/null +++ b/third_party/nixpkgs/pkgs/development/tools/mold/default.nix @@ -0,0 +1,39 @@ +{ stdenv +, fetchFromGitHub +, lib +, autoPatchelfHook +, cmake +, tbb +, llvmPackages_latest +, xxHash +, zlib +, openssl +}: + +stdenv.mkDerivation rec { + pname = "mold"; + version = "0.9.2"; + + src = fetchFromGitHub { + owner = "rui314"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-2LXOPirhjAifKYPgngUJwEdGrKMYsRySr5TL2x2p8J0="; + }; + + buildInputs = [ tbb zlib openssl ]; + nativeBuildInputs = [ autoPatchelfHook cmake xxHash ]; + + dontUseCmakeConfigure = true; + EXTRA_LDFLAGS = "-fuse-ld=${llvmPackages_latest.lld}/bin/ld.lld"; + LTO = 1; + makeFlags = [ "PREFIX=${placeholder "out"}" ]; + + meta = with lib; { + description = "A high performance drop-in replacement for existing unix linkers"; + homepage = "https://github.com/rui314/mold"; + license = lib.licenses.agpl3Plus; + maintainers = with maintainers; [ nitsky ]; + broken = stdenv.isAarch64; + }; +} diff --git a/third_party/nixpkgs/pkgs/development/tools/ocaml/obuild/default.nix b/third_party/nixpkgs/pkgs/development/tools/ocaml/obuild/default.nix index e31334000d..a380dbff81 100644 --- a/third_party/nixpkgs/pkgs/development/tools/ocaml/obuild/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/ocaml/obuild/default.nix @@ -1,10 +1,8 @@ { lib, stdenv, fetchzip, ocaml }: -let version = "0.1.10"; in - -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "obuild"; - inherit version; + version = "0.1.10"; src = fetchzip { url = "https://github.com/ocaml-obuild/obuild/archive/obuild-v${version}.tar.gz"; diff --git a/third_party/nixpkgs/pkgs/development/tools/ocaml/ocamlbuild/default.nix b/third_party/nixpkgs/pkgs/development/tools/ocaml/ocamlbuild/default.nix index c74794b35c..926838ede5 100644 --- a/third_party/nixpkgs/pkgs/development/tools/ocaml/ocamlbuild/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/ocaml/ocamlbuild/default.nix @@ -1,10 +1,7 @@ { lib, stdenv, fetchFromGitHub, ocaml, findlib }: -let - version = "0.14.0"; -in -stdenv.mkDerivation { +stdenv.mkDerivation rec { name = "ocamlbuild-${version}"; - inherit version; + version = "0.14.0"; src = fetchFromGitHub { owner = "ocaml"; diff --git a/third_party/nixpkgs/pkgs/development/tools/parsing/bisonc++/default.nix b/third_party/nixpkgs/pkgs/development/tools/parsing/bisonc++/default.nix index 5710500a18..5a38c6679e 100644 --- a/third_party/nixpkgs/pkgs/development/tools/parsing/bisonc++/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/parsing/bisonc++/default.nix @@ -46,7 +46,6 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - inherit version; description = "A parser generator like bison, but it generates C++ code"; license = licenses.gpl2Plus; maintainers = with maintainers; [ raskin ]; diff --git a/third_party/nixpkgs/pkgs/development/tools/spirv-tools/default.nix b/third_party/nixpkgs/pkgs/development/tools/spirv-tools/default.nix index 57f04b00c0..2cf3a2c801 100644 --- a/third_party/nixpkgs/pkgs/development/tools/spirv-tools/default.nix +++ b/third_party/nixpkgs/pkgs/development/tools/spirv-tools/default.nix @@ -1,12 +1,9 @@ { lib, stdenv, fetchFromGitHub, cmake, python3, spirv-headers }: -let - # Update spirv-headers rev in lockstep according to DEPs file - version = "2020.2"; -in stdenv.mkDerivation rec { pname = "spirv-tools"; - inherit version; + # Update spirv-headers rev in lockstep according to DEPs file + version = "2020.2"; src = fetchFromGitHub { owner = "KhronosGroup"; diff --git a/third_party/nixpkgs/pkgs/games/fairymax/default.nix b/third_party/nixpkgs/pkgs/games/fairymax/default.nix index d743395045..49a91e7a64 100644 --- a/third_party/nixpkgs/pkgs/games/fairymax/default.nix +++ b/third_party/nixpkgs/pkgs/games/fairymax/default.nix @@ -23,7 +23,6 @@ stdenv.mkDerivation rec { cp fmax.ini "$out/share/fairymax" ''; meta = { - inherit version; description = "A small chess engine supporting fairy pieces"; longDescription = '' A version of micro-Max that reads the piece description diff --git a/third_party/nixpkgs/pkgs/games/fish-fillets-ng/default.nix b/third_party/nixpkgs/pkgs/games/fish-fillets-ng/default.nix index aa93633906..5ddad7fda4 100644 --- a/third_party/nixpkgs/pkgs/games/fish-fillets-ng/default.nix +++ b/third_party/nixpkgs/pkgs/games/fish-fillets-ng/default.nix @@ -32,7 +32,6 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - inherit version; description = "A puzzle game"; license = licenses.gpl2Plus; maintainers = with maintainers; [ raskin ]; diff --git a/third_party/nixpkgs/pkgs/games/xsok/default.nix b/third_party/nixpkgs/pkgs/games/xsok/default.nix index ddc43518de..bb749b57d0 100644 --- a/third_party/nixpkgs/pkgs/games/xsok/default.nix +++ b/third_party/nixpkgs/pkgs/games/xsok/default.nix @@ -37,7 +37,6 @@ stdenv.mkDerivation rec { ''; meta = { - inherit version; description = "A generic Sokoban game for X11"; license = lib.licenses.gpl2Plus; maintainers = [lib.maintainers.raskin]; diff --git a/third_party/nixpkgs/pkgs/misc/apulse/pressureaudio.nix b/third_party/nixpkgs/pkgs/misc/apulse/pressureaudio.nix index c69fcbc601..f0b39afb98 100644 --- a/third_party/nixpkgs/pkgs/misc/apulse/pressureaudio.nix +++ b/third_party/nixpkgs/pkgs/misc/apulse/pressureaudio.nix @@ -1,7 +1,8 @@ { stdenv, apulse, libpulseaudio, pkg-config, intltool, autoreconfHook }: stdenv.mkDerivation { - name = "libpressureaudio-${apulse.version}"; + pname = "libpressureaudio"; + version = apulse.version; src = libpulseaudio.src; diff --git a/third_party/nixpkgs/pkgs/misc/emulators/fs-uae-launcher/default.nix b/third_party/nixpkgs/pkgs/misc/emulators/fs-uae-launcher/default.nix new file mode 100644 index 0000000000..9416e92e2b --- /dev/null +++ b/third_party/nixpkgs/pkgs/misc/emulators/fs-uae-launcher/default.nix @@ -0,0 +1,28 @@ +{ stdenv, lib, fetchurl, makeWrapper, python3, gettext +, pyqt5, setuptools, requests +}: + +stdenv.mkDerivation rec { + pname = "fs-uae-launcher"; + version = "3.0.5"; + + src = fetchurl { + url = "https://fs-uae.net/stable/${version}/${pname}-${version}.tar.gz"; + sha256 = "1dknra4ngz7bpppwqghmza1q68pn1yaw54p9ba0f42zwp427ly97"; + }; + + makeFlags = [ "prefix=$(out)" ]; + nativeBuildInputs = [ makeWrapper python3 gettext ]; + buildInputs = [ pyqt5 setuptools requests ]; + postInstall = '' + wrapProgram $out/bin/fs-uae-launcher --set PYTHONPATH "$PYTHONPATH" + ''; + + meta = { + description = "Graphical front-end for the FS-UAE emulator"; + license = lib.licenses.gpl2Plus; + homepage = "https://fs-uae.net"; + maintainers = with lib; [ maintainers.sander ]; + platforms = [ "i686-linux" "x86_64-linux" ]; + }; +} diff --git a/third_party/nixpkgs/pkgs/misc/screensavers/xscreensaver/default.nix b/third_party/nixpkgs/pkgs/misc/screensavers/xscreensaver/default.nix index de230aafd7..6b90d6f58e 100644 --- a/third_party/nixpkgs/pkgs/misc/screensavers/xscreensaver/default.nix +++ b/third_party/nixpkgs/pkgs/misc/screensavers/xscreensaver/default.nix @@ -52,7 +52,6 @@ stdenv.mkDerivation rec { license = lib.licenses.mit; maintainers = with lib.maintainers; [ raskin ]; platforms = lib.platforms.unix; # Once had cygwin problems - inherit version; downloadPage = "https://www.jwz.org/xscreensaver/download.html"; updateWalker = true; }; diff --git a/third_party/nixpkgs/pkgs/misc/vim-plugins/generated.nix b/third_party/nixpkgs/pkgs/misc/vim-plugins/generated.nix index d6465324bd..a38ed64540 100644 --- a/third_party/nixpkgs/pkgs/misc/vim-plugins/generated.nix +++ b/third_party/nixpkgs/pkgs/misc/vim-plugins/generated.nix @@ -3442,6 +3442,18 @@ final: prev: meta.homepage = "https://github.com/jlesquembre/nterm.nvim/"; }; + null-ls-nvim = buildVimPluginFrom2Nix { + pname = "null-ls-nvim"; + version = "2021-07-14"; + src = fetchFromGitHub { + owner = "jose-elias-alvarez"; + repo = "null-ls.nvim"; + rev = "56d4b76203d2b442353e25c247f49fa5ca70f42e"; + sha256 = "0kmgln5ra2lpdvj9866a11l9h04zc1dmvxcw8gbra6f72ars3jwr"; + }; + meta.homepage = "https://github.com/jose-elias-alvarez/null-ls.nvim/"; + }; + numb-nvim = buildVimPluginFrom2Nix { pname = "numb-nvim"; version = "2021-07-12"; diff --git a/third_party/nixpkgs/pkgs/misc/vim-plugins/overrides.nix b/third_party/nixpkgs/pkgs/misc/vim-plugins/overrides.nix index 0cf3222c9f..8ee937359c 100644 --- a/third_party/nixpkgs/pkgs/misc/vim-plugins/overrides.nix +++ b/third_party/nixpkgs/pkgs/misc/vim-plugins/overrides.nix @@ -399,6 +399,10 @@ self: super: { dependencies = with self; [ plenary-nvim ]; }); + null-ls-nvim = super.null-ls-nvim.overrideAttrs (old: { + path = "null-ls.nvim"; + }); + nvim-lsputils = super.nvim-lsputils.overrideAttrs (old: { dependencies = with self; [ popfix ]; }); 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 8aaa0c8f31..c639dcc4d1 100644 --- a/third_party/nixpkgs/pkgs/misc/vim-plugins/vim-plugin-names +++ b/third_party/nixpkgs/pkgs/misc/vim-plugins/vim-plugin-names @@ -258,6 +258,7 @@ jonsmithers/vim-html-template-literals joonty/vim-xdebug josa42/coc-lua josa42/vim-lightline-coc +jose-elias-alvarez/null-ls.nvim@main joshdick/onedark.vim@main jpalardy/vim-slime@main jparise/vim-graphql diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/atop/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/atop/default.nix index 50a3e3e631..b082c594ac 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/atop/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/atop/default.nix @@ -74,7 +74,6 @@ stdenv.mkDerivation rec { longDescription = '' Atop is an ASCII full-screen performance monitor that is capable of reporting the activity of all processes (even if processes have finished during the interval), daily logging of system and process activity for long-term analysis, highlighting overloaded system resources by using colors, etc. At regular intervals, it shows system-level activity related to the CPU, memory, swap, disks and network layers, and for every active process it shows the CPU utilization, memory growth, disk utilization, priority, username, state, and exit code. ''; - inherit version; license = licenses.gpl2Plus; downloadPage = "http://atoptool.nl/downloadatop.php"; }; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/ell/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/ell/default.nix index 60e597685e..a43b9eff3c 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/ell/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/ell/default.nix @@ -38,6 +38,6 @@ stdenv.mkDerivation rec { ''; license = licenses.lgpl21Plus; platforms = platforms.linux; - maintainers = with maintainers; [ mic92 dtzWill ]; + maintainers = with maintainers; [ mic92 dtzWill maxeaubrey ]; }; } diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/iio-sensor-proxy/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/iio-sensor-proxy/default.nix index 5566103b2c..5f44622c51 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/iio-sensor-proxy/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/iio-sensor-proxy/default.nix @@ -47,6 +47,5 @@ stdenv.mkDerivation rec { license = licenses.gpl3 ; maintainers = with maintainers; [ peterhoeg ]; platforms = platforms.linux; - inherit version; }; } diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/iptables/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/iptables/default.nix index 797e7a5b13..912d9078c9 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/iptables/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/iptables/default.nix @@ -50,6 +50,5 @@ stdenv.mkDerivation rec { license = licenses.gpl2; downloadPage = "https://www.netfilter.org/projects/iptables/files/"; updateWalker = true; - inherit version; }; } diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/iwd/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/iwd/default.nix index 3b7cc7d3d4..e0a1a566d7 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/iwd/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/iwd/default.nix @@ -91,6 +91,6 @@ stdenv.mkDerivation rec { description = "Wireless daemon for Linux"; license = licenses.lgpl21Plus; platforms = platforms.linux; - maintainers = with maintainers; [ dtzWill fpletz ]; + maintainers = with maintainers; [ dtzWill fpletz maxeaubrey ]; }; } 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 e97d9151db..eac71ee36a 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,32 +1,32 @@ { "4.14": { "extra": "-hardened1", - "name": "linux-hardened-4.14.238-hardened1.patch", - "sha256": "13wld3dm9ymwcsk5f06l64z9q49ff7rh7dqfqxxhkngdx2i1h566", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.238-hardened1/linux-hardened-4.14.238-hardened1.patch" + "name": "linux-hardened-4.14.239-hardened1.patch", + "sha256": "1yfg6c75y1dp627qn8c4795sc9vwywc5dl95ngg8zk15n5d7j9in", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.14.239-hardened1/linux-hardened-4.14.239-hardened1.patch" }, "4.19": { "extra": "-hardened1", - "name": "linux-hardened-4.19.196-hardened1.patch", - "sha256": "1wna5j1g1703gl4xw4x5z8dmc8gjqg879zq4xnmlyc0vryqjrxyq", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.196-hardened1/linux-hardened-4.19.196-hardened1.patch" + "name": "linux-hardened-4.19.197-hardened1.patch", + "sha256": "1cbcas5kl6k8hn60p08pvw073mrv8lkrav3pc9sxvdcscdbwkkpr", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/4.19.197-hardened1/linux-hardened-4.19.197-hardened1.patch" }, "5.10": { "extra": "-hardened1", - "name": "linux-hardened-5.10.48-hardened1.patch", - "sha256": "1drfh4ljiih4y5fn2bvg15wrmz10s50q5qyhn89r63b5qkb1lp21", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.48-hardened1/linux-hardened-5.10.48-hardened1.patch" + "name": "linux-hardened-5.10.50-hardened1.patch", + "sha256": "0z57cdvyaarl5p0b6sj93pag34wvf128s30ymkc4m50a60kp7cr8", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.10.50-hardened1/linux-hardened-5.10.50-hardened1.patch" }, "5.12": { "extra": "-hardened1", - "name": "linux-hardened-5.12.15-hardened1.patch", - "sha256": "1d81z67y9659icgmkchj0y2jlcs4nh4grlzf7ppbq6vmrr92xq8x", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.12.15-hardened1/linux-hardened-5.12.15-hardened1.patch" + "name": "linux-hardened-5.12.17-hardened1.patch", + "sha256": "09vh04a1sa80shm0z5if31j5r8s4syrqv4i22q5pnnfnlzhbqk59", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.12.17-hardened1/linux-hardened-5.12.17-hardened1.patch" }, "5.4": { "extra": "-hardened1", - "name": "linux-hardened-5.4.130-hardened1.patch", - "sha256": "0d7q6pkl74hkx65p25jxjjky08zdprsfbcyik9cdlsfrbiidwn53", - "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.130-hardened1/linux-hardened-5.4.130-hardened1.patch" + "name": "linux-hardened-5.4.132-hardened1.patch", + "sha256": "0a4n8ss16qqbrbxajlad4j7nc10ipdnl70yz6ppryyw94i5lf5pb", + "url": "https://github.com/anthraxx/linux-hardened/releases/download/5.4.132-hardened1/linux-hardened-5.4.132-hardened1.patch" } } diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.14.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.14.nix index f418afc280..5b94b7ea9b 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.14.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.14.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "4.14.238"; + version = "4.14.239"; # 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,7 +13,7 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "1phjgm1fhyfpm2h9b2bngcbh91v2qrxcm7vma86q7pdqrcbh1fih"; + sha256 = "167zwm3giizv42m0xjz71xnb2swlwiaw0xw0dg8j8mb74hz1drx0"; }; kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_4_14 ]; 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 460982b6d2..3785c6b553 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.19.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-4.19.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "4.19.196"; + version = "4.19.197"; # 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,7 +13,7 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v4.x/linux-${version}.tar.xz"; - sha256 = "0liapgaczv6lq7223wnq2cbwfb6w93iw14dv1xidcb3bnakm4h5f"; + sha256 = "10kj442qaky6rpl65k5rrvd3p6mdgz4p321zvf4s312ixfdja0g6"; }; kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_4_19 ]; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.10.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.10.nix index fd29ff465f..988de97e03 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.10.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.10.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.10.48"; + version = "5.10.50"; # 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,7 +13,7 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "0pn24bkz9mkphv9f634117zam0ak6q3pbpfwv0l5kf71h0s1klfv"; + sha256 = "0dmlpy9k7am99495bxcm46i4y6g34d1fzdkzz3wgzb4mgmx35nlb"; }; kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_5_10 ]; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.12.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.12.nix index 3a482d92a4..82218dc1ce 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.12.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.12.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.12.15"; + version = "5.12.17"; # 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,7 +13,7 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "1nlgwcxfhxzf5wak8c0gamn4k8vpdllzqlpqqn5fa08cdjcymz27"; + sha256 = "1ghyqxfxslxzr7273vj2yn14pkdnkja3wk50xxhavpvf87i8c40j"; }; kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_5_12 ]; 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 0c8355d101..003f1e96e4 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.4.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-5.4.nix @@ -3,7 +3,7 @@ with lib; buildLinux (args // rec { - version = "5.4.130"; + version = "5.4.132"; # 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,7 +13,7 @@ buildLinux (args // rec { src = fetchurl { url = "mirror://kernel/linux/kernel/v5.x/linux-${version}.tar.xz"; - sha256 = "0ywwy6g0fd05fxgwsrycz2l6khjljxa3qbi6hywp3rjgmgxp2ak6"; + sha256 = "1vq0dmrn7gl2vprm08l8by5ja3xjgggrcd38vqg7b7jpnfzssrl4"; }; kernelTests = args.kernelTests or [ nixosTests.kernel-generic.linux_5_4 ]; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-lqx.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-lqx.nix index eacb906f2e..f701c2846f 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-lqx.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-lqx.nix @@ -1,7 +1,7 @@ { lib, fetchFromGitHub, buildLinux, linux_zen, ... } @ args: let - version = "5.12.14"; + version = "5.12.17"; suffix = "lqx2"; in @@ -14,7 +14,7 @@ buildLinux (args // { owner = "zen-kernel"; repo = "zen-kernel"; rev = "v${version}-${suffix}"; - sha256 = "sha256-pj5sSW4ggZEx2n7bVU2sfK3JOXG5n4Rsp3S66/+/wVU="; + sha256 = "sha256-i0Ha9H1VVRKlmomWz1+UmKBH9CSlmHAZm0kwz0Kamqg="; }; extraMeta = { diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-rt-5.10.nix b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-rt-5.10.nix index efe499d024..62c411cd96 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-rt-5.10.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/kernel/linux-rt-5.10.nix @@ -6,7 +6,7 @@ , ... } @ args: let - version = "5.10.47-rt45"; # updated by ./update-rt.sh + version = "5.10.47-rt46"; # updated by ./update-rt.sh branch = lib.versions.majorMinor version; kversion = builtins.elemAt (lib.splitString "-" version) 0; in buildLinux (args // { @@ -25,7 +25,7 @@ in buildLinux (args // { name = "rt"; patch = fetchurl { url = "mirror://kernel/linux/kernel/projects/rt/${branch}/older/patch-${version}.patch.xz"; - sha256 = "0s3y636ymrhm8rg6n47wdk1pvvmpsnynmyhyy5681f2pw5z2c1ay"; + sha256 = "12jnnwnh3bgz2ygc173r45sbqm74rz3f2nlp7m2fb8dlxdby460q"; }; }; in [ rt-patch ] ++ kernelPatches; diff --git a/third_party/nixpkgs/pkgs/os-specific/linux/libnl/default.nix b/third_party/nixpkgs/pkgs/os-specific/linux/libnl/default.nix index b40b3c46e7..d6604f9e15 100644 --- a/third_party/nixpkgs/pkgs/os-specific/linux/libnl/default.nix +++ b/third_party/nixpkgs/pkgs/os-specific/linux/libnl/default.nix @@ -34,7 +34,6 @@ stdenv.mkDerivation rec { }; meta = with lib; { - inherit version; homepage = "http://www.infradead.org/~tgr/libnl/"; description = "Linux Netlink interface library suite"; license = licenses.lgpl21; diff --git a/third_party/nixpkgs/pkgs/servers/ftp/bftpd/default.nix b/third_party/nixpkgs/pkgs/servers/ftp/bftpd/default.nix index b92975149d..f8a9875914 100644 --- a/third_party/nixpkgs/pkgs/servers/ftp/bftpd/default.nix +++ b/third_party/nixpkgs/pkgs/servers/ftp/bftpd/default.nix @@ -25,7 +25,6 @@ in stdenv.mkDerivation rec { enableParallelBuilding = true; meta = with lib; { - inherit version; description = "A minimal ftp server"; downloadPage = "http://bftpd.sf.net/download.html"; homepage = "http://bftpd.sf.net/"; diff --git a/third_party/nixpkgs/pkgs/servers/http/nix-binary-cache/default.nix b/third_party/nixpkgs/pkgs/servers/http/nix-binary-cache/default.nix index 6532332396..5baba23102 100644 --- a/third_party/nixpkgs/pkgs/servers/http/nix-binary-cache/default.nix +++ b/third_party/nixpkgs/pkgs/servers/http/nix-binary-cache/default.nix @@ -54,7 +54,6 @@ stdenv.mkDerivation rec { ''; maintainers = [lib.maintainers.raskin]; license = lib.licenses.gpl2Plus; - inherit version; platforms = lib.platforms.all; hydraPlatforms = []; }; diff --git a/third_party/nixpkgs/pkgs/servers/nosql/neo4j/default.nix b/third_party/nixpkgs/pkgs/servers/nosql/neo4j/default.nix index d9c9ddf875..9147de6d4a 100644 --- a/third_party/nixpkgs/pkgs/servers/nosql/neo4j/default.nix +++ b/third_party/nixpkgs/pkgs/servers/nosql/neo4j/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, makeWrapper, jre8, which, gawk }: +{ lib, stdenv, fetchurl, makeWrapper, jre, which, gawk }: with lib; @@ -12,8 +12,6 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ jre8 which gawk ]; - installPhase = '' mkdir -p "$out/share/neo4j" @@ -24,8 +22,8 @@ stdenv.mkDerivation rec { do makeWrapper "$out/share/neo4j/bin/$NEO4J_SCRIPT" \ "$out/bin/$NEO4J_SCRIPT" \ - --prefix PATH : "${lib.makeBinPath [ jre8 which gawk ]}" \ - --set JAVA_HOME "$jre8" + --prefix PATH : "${lib.makeBinPath [ jre which gawk ]}" \ + --set JAVA_HOME "${jre}" done ''; diff --git a/third_party/nixpkgs/pkgs/servers/plex/raw.nix b/third_party/nixpkgs/pkgs/servers/plex/raw.nix index b6618eb429..ff676b2776 100644 --- a/third_party/nixpkgs/pkgs/servers/plex/raw.nix +++ b/third_party/nixpkgs/pkgs/servers/plex/raw.nix @@ -89,6 +89,7 @@ stdenv.mkDerivation rec { lnl7 pjones thoughtpolice + maxeaubrey ]; description = "Media library streaming server"; longDescription = '' diff --git a/third_party/nixpkgs/pkgs/shells/zsh/antigen/default.nix b/third_party/nixpkgs/pkgs/shells/zsh/antigen/default.nix index c80471677f..935939f90e 100644 --- a/third_party/nixpkgs/pkgs/shells/zsh/antigen/default.nix +++ b/third_party/nixpkgs/pkgs/shells/zsh/antigen/default.nix @@ -9,7 +9,7 @@ stdenv.mkDerivation rec { sha256 = "1bmp3qf14509swpxin4j9f98n05pdilzapjm0jdzbv0dy3hn20ix"; }; - phases = "installPhase"; + dontUnpack = true; installPhase = '' outdir=$out/share/antigen diff --git a/third_party/nixpkgs/pkgs/shells/zsh/zsh-command-time/default.nix b/third_party/nixpkgs/pkgs/shells/zsh/zsh-command-time/default.nix index 9696e441cf..b92ced6be7 100644 --- a/third_party/nixpkgs/pkgs/shells/zsh/zsh-command-time/default.nix +++ b/third_party/nixpkgs/pkgs/shells/zsh/zsh-command-time/default.nix @@ -19,7 +19,7 @@ stdenv.mkDerivation { sha256 = "1bvyjgz6bhgg1nwr56r50p6fblgah6yiql55pgm5abnn2h876fjq"; }; - phases = [ "installPhase" ]; + dontUnpack = true; installPhase = '' install -Dm0444 $src/command-time.plugin.zsh --target-directory=$out/share/zsh/plugins/command-time diff --git a/third_party/nixpkgs/pkgs/tools/archivers/zpaq/default.nix b/third_party/nixpkgs/pkgs/tools/archivers/zpaq/default.nix index 08d98716f1..150633e620 100644 --- a/third_party/nixpkgs/pkgs/tools/archivers/zpaq/default.nix +++ b/third_party/nixpkgs/pkgs/tools/archivers/zpaq/default.nix @@ -32,6 +32,5 @@ stdenv.mkDerivation rec { license = licenses.gpl3Plus ; maintainers = with maintainers; [ raskin ]; platforms = platforms.linux; - inherit version; }; } diff --git a/third_party/nixpkgs/pkgs/tools/backup/btrbk/default.nix b/third_party/nixpkgs/pkgs/tools/backup/btrbk/default.nix index 4b4dadd4fa..12308b2404 100644 --- a/third_party/nixpkgs/pkgs/tools/backup/btrbk/default.nix +++ b/third_party/nixpkgs/pkgs/tools/backup/btrbk/default.nix @@ -43,6 +43,5 @@ stdenv.mkDerivation rec { license = licenses.gpl3; platforms = platforms.unix; maintainers = with maintainers; [ asymmetric ]; - inherit version; }; } diff --git a/third_party/nixpkgs/pkgs/tools/compression/lrzip/default.nix b/third_party/nixpkgs/pkgs/tools/compression/lrzip/default.nix index 9f4f66521f..820389300e 100644 --- a/third_party/nixpkgs/pkgs/tools/compression/lrzip/default.nix +++ b/third_party/nixpkgs/pkgs/tools/compression/lrzip/default.nix @@ -19,7 +19,6 @@ stdenv.mkDerivation rec { homepage = "http://ck.kolivas.org/apps/lrzip/"; description = "The CK LRZIP compression program (LZMA + RZIP)"; license = lib.licenses.gpl2Plus; - inherit version; platforms = lib.platforms.unix; }; } diff --git a/third_party/nixpkgs/pkgs/tools/compression/mozlz4a/default.nix b/third_party/nixpkgs/pkgs/tools/compression/mozlz4a/default.nix index dabde674d2..0aec49827e 100644 --- a/third_party/nixpkgs/pkgs/tools/compression/mozlz4a/default.nix +++ b/third_party/nixpkgs/pkgs/tools/compression/mozlz4a/default.nix @@ -24,7 +24,6 @@ stdenv.mkDerivation rec { buildInputs = [ python3 python3.pkgs.python-lz4 ]; meta = { - inherit version; description = "A script to handle Mozilla's mozlz4 files"; license = lib.licenses.bsd2; maintainers = [lib.maintainers.raskin]; diff --git a/third_party/nixpkgs/pkgs/tools/compression/pixz/default.nix b/third_party/nixpkgs/pkgs/tools/compression/pixz/default.nix index d0418ffdd6..bb504e85f6 100644 --- a/third_party/nixpkgs/pkgs/tools/compression/pixz/default.nix +++ b/third_party/nixpkgs/pkgs/tools/compression/pixz/default.nix @@ -28,7 +28,6 @@ stdenv.mkDerivation rec { ''; meta = { - inherit version; description = "A parallel compressor/decompressor for xz format"; license = lib.licenses.bsd2; maintainers = [lib.maintainers.raskin]; diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/fatsort/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/fatsort/default.nix index ec7563dfc4..7c9edf2f84 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/fatsort/default.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/fatsort/default.nix @@ -20,7 +20,6 @@ stdenv.mkDerivation rec { description = "Sorts FAT partition table, for devices that don't do sorting of files"; maintainers = [ maintainers.kovirobi ]; license = licenses.gpl2; - inherit version; platforms = platforms.linux; }; } diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/fuse-7z-ng/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/fuse-7z-ng/default.nix index 8a0671957c..0149071ab0 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/fuse-7z-ng/default.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/fuse-7z-ng/default.nix @@ -25,7 +25,6 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - inherit version; inherit (src.homepage); description = "A FUSE-based filesystem that uses the p7zip library"; longDescription = '' diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/jmtpfs/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/jmtpfs/default.nix index 8589abffc7..2754d223a6 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/jmtpfs/default.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/jmtpfs/default.nix @@ -1,9 +1,8 @@ { lib, stdenv, fetchFromGitHub, fetchpatch, pkg-config, file, fuse, libmtp }: -let version = "0.5"; in -stdenv.mkDerivation { +stdenv.mkDerivation rec { pname = "jmtpfs"; - inherit version; + version = "0.5"; src = fetchFromGitHub { sha256 = "1pm68agkhrwgrplrfrnbwdcvx5lrivdmqw8pb5gdmm3xppnryji1"; diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/reiser4progs/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/reiser4progs/default.nix index 961a286729..f833d56297 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/reiser4progs/default.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/reiser4progs/default.nix @@ -1,9 +1,8 @@ {lib, stdenv, fetchurl, libaal}: -let version = "2.0.4"; in stdenv.mkDerivation rec { pname = "reiser4progs"; - inherit version; + version = "2.0.4"; src = fetchurl { url = "mirror://sourceforge/reiser4/reiser4-utils/${pname}-${version}.tar.gz"; diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/reiserfsprogs/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/reiserfsprogs/default.nix index dc97cdb652..c6583410ff 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/reiserfsprogs/default.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/reiserfsprogs/default.nix @@ -1,9 +1,8 @@ { lib, stdenv, fetchurl, libuuid, autoreconfHook }: -let version = "3.6.24"; in stdenv.mkDerivation rec { pname = "reiserfsprogs"; - inherit version; + version = "3.6.24"; src = fetchurl { url = "https://www.kernel.org/pub/linux/kernel/people/jeffm/reiserfsprogs/v${version}/${pname}-${version}.tar.xz"; diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/smbnetfs/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/smbnetfs/default.nix index 3bbff2903b..bb042a95ec 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/smbnetfs/default.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/smbnetfs/default.nix @@ -18,7 +18,6 @@ stdenv.mkDerivation rec { license = licenses.gpl2; downloadPage = "https://sourceforge.net/projects/smbnetfs/files/smbnetfs"; updateWalker = true; - inherit version; homepage = "https://sourceforge.net/projects/smbnetfs/"; }; } diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/yandex-disk/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/yandex-disk/default.nix index d2779e2b4c..e837350abd 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/yandex-disk/default.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/yandex-disk/default.nix @@ -4,18 +4,18 @@ let p = if stdenv.is64bit then { arch = "x86_64"; gcclib = "${stdenv.cc.cc.lib}/lib64"; - sha256 = "14bpc5ddhxvgfxkxhj5q9z443s7z4nn1zf4k1hxj7rbf13rcpg00"; + sha256 = "e4f579963199f05476657f0066beaa32d1261aef2203382f3919e1ed4bc4594e"; } else { arch = "i386"; gcclib = "${stdenv.cc.cc.lib}/lib"; - sha256 = "1s829q8gy9xgz0jm7w70aljqs2h49x402blqfr9zvn806aprmrm5"; + sha256 = "69113bf33ba0c57a363305b76361f2866c3b8394b173eed0f49db1f50bfe0373"; }; in stdenv.mkDerivation rec { pname = "yandex-disk"; - version = "0.1.5.1039"; + version = "0.1.6.1074"; src = fetchurl { url = "https://repo.yandex.ru/yandex-disk/rpm/stable/${p.arch}/${pname}-${version}-1.fedora.${p.arch}.rpm"; diff --git a/third_party/nixpkgs/pkgs/tools/filesystems/zfstools/default.nix b/third_party/nixpkgs/pkgs/tools/filesystems/zfstools/default.nix index ecc4b11848..feb5b23df5 100644 --- a/third_party/nixpkgs/pkgs/tools/filesystems/zfstools/default.nix +++ b/third_party/nixpkgs/pkgs/tools/filesystems/zfstools/default.nix @@ -1,9 +1,8 @@ { lib, stdenv, fetchFromGitHub, ruby, zfs }: -let version = "0.3.6"; in stdenv.mkDerivation rec { pname = "zfstools"; - inherit version; + version = "0.3.6"; src = fetchFromGitHub { sha256 = "16lvw3xbmxp2pr8nixqn7lf4504zaaxvbbdnjkv4dggwd4lsdjyg"; diff --git a/third_party/nixpkgs/pkgs/tools/inputmethods/skk/skk-dicts/default.nix b/third_party/nixpkgs/pkgs/tools/inputmethods/skk/skk-dicts/default.nix index bc9aa73c2f..d165f404f6 100644 --- a/third_party/nixpkgs/pkgs/tools/inputmethods/skk/skk-dicts/default.nix +++ b/third_party/nixpkgs/pkgs/tools/inputmethods/skk/skk-dicts/default.nix @@ -33,7 +33,8 @@ stdenv.mkDerivation { srcs = [ small medium large edict assoc ]; nativeBuildInputs = [ skktools ] ++ lib.optional stdenv.isDarwin libiconv; - phases = [ "installPhase" ]; + dontUnpack = true; + installPhase = '' function dictname() { src=$1 diff --git a/third_party/nixpkgs/pkgs/tools/misc/dust/default.nix b/third_party/nixpkgs/pkgs/tools/misc/dust/default.nix index dc8dc5af97..97b98eea4f 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/dust/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/dust/default.nix @@ -25,5 +25,6 @@ rustPlatform.buildRustPackage rec { homepage = "https://github.com/bootandy/dust"; license = licenses.asl20; maintainers = with maintainers; [ infinisil SuperSandro2000 ]; + mainProgram = "dust"; }; } diff --git a/third_party/nixpkgs/pkgs/tools/misc/man-db/default.nix b/third_party/nixpkgs/pkgs/tools/misc/man-db/default.nix index 4ac11aa62c..9c8adc1d8d 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/man-db/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/man-db/default.nix @@ -77,5 +77,6 @@ stdenv.mkDerivation rec { description = "An implementation of the standard Unix documentation system accessed using the man command"; license = licenses.gpl2; platforms = lib.platforms.unix; + mainProgram = "man"; }; } diff --git a/third_party/nixpkgs/pkgs/tools/misc/zsh-autoenv/default.nix b/third_party/nixpkgs/pkgs/tools/misc/zsh-autoenv/default.nix index 61589345d7..375f2ebb34 100644 --- a/third_party/nixpkgs/pkgs/tools/misc/zsh-autoenv/default.nix +++ b/third_party/nixpkgs/pkgs/tools/misc/zsh-autoenv/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation { pname = "zsh-autoenv"; - version = "2017-12-16"; + version = "unstable-2017-12-16"; src = fetchFromGitHub { owner = "Tarrasch"; diff --git a/third_party/nixpkgs/pkgs/tools/networking/getmail/default.nix b/third_party/nixpkgs/pkgs/tools/networking/getmail/default.nix index 44481802cc..fc06ba0363 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/getmail/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/getmail/default.nix @@ -23,7 +23,6 @@ python2Packages.buildPythonApplication rec { platforms = lib.platforms.linux; homepage = "http://pyropus.ca/software/getmail/"; - inherit version; updateWalker = true; license = lib.licenses.gpl2Plus; }; diff --git a/third_party/nixpkgs/pkgs/tools/networking/kea/default.nix b/third_party/nixpkgs/pkgs/tools/networking/kea/default.nix index e852fdb1c2..e3e4a67c13 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/kea/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/kea/default.nix @@ -8,7 +8,9 @@ , libmysqlclient , log4cplus , postgresql -, python3 }: +, python3 +, nixosTests +}: stdenv.mkDerivation rec { pname = "kea"; @@ -48,11 +50,15 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + passthru.tests = { + inherit (nixosTests) kea; + }; + meta = with lib; { homepage = "https://kea.isc.org/"; description = "High-performance, extensible DHCP server by ISC"; longDescription = '' - KEA is a new open source DHCPv4/DHCPv6 server being developed by + Kea is a new open source DHCPv4/DHCPv6 server being developed by Internet Systems Consortium. The objective of this project is to provide a very high-performance, extensible DHCP server engine for use by enterprises and service providers, either as is or with @@ -60,6 +66,6 @@ stdenv.mkDerivation rec { ''; license = licenses.mpl20; platforms = platforms.unix; - maintainers = with maintainers; [ fpletz ]; + maintainers = with maintainers; [ fpletz hexa ]; }; } diff --git a/third_party/nixpkgs/pkgs/tools/networking/wavemon/default.nix b/third_party/nixpkgs/pkgs/tools/networking/wavemon/default.nix index 19bfd6ae45..c54c4f8691 100644 --- a/third_party/nixpkgs/pkgs/tools/networking/wavemon/default.nix +++ b/third_party/nixpkgs/pkgs/tools/networking/wavemon/default.nix @@ -15,7 +15,6 @@ stdenv.mkDerivation rec { }; meta = with lib; { - inherit version; description = "Ncurses-based monitoring application for wireless network devices"; homepage = "https://github.com/uoaerg/wavemon"; license = licenses.gpl3Plus; diff --git a/third_party/nixpkgs/pkgs/tools/package-management/nix-serve/default.nix b/third_party/nixpkgs/pkgs/tools/package-management/nix-serve/default.nix index f85adee491..a1edfdd136 100644 --- a/third_party/nixpkgs/pkgs/tools/package-management/nix-serve/default.nix +++ b/third_party/nixpkgs/pkgs/tools/package-management/nix-serve/default.nix @@ -1,5 +1,11 @@ -{ lib, stdenv, fetchFromGitHub, - bzip2, nix, perl, makeWrapper, +{ lib +, stdenv +, fetchFromGitHub +, bzip2 +, nix +, perl +, makeWrapper +, nixosTests }: with lib; @@ -30,6 +36,8 @@ stdenv.mkDerivation { --add-flags $out/libexec/nix-serve/nix-serve.psgi ''; + passthru.tests.nix-serve = nixosTests.nix-serve; + meta = { homepage = "https://github.com/edolstra/nix-serve"; description = "A utility for sharing a Nix store as a binary cache"; diff --git a/third_party/nixpkgs/pkgs/tools/security/aws-okta/default.nix b/third_party/nixpkgs/pkgs/tools/security/aws-okta/default.nix index 08508dd157..363abbd395 100644 --- a/third_party/nixpkgs/pkgs/tools/security/aws-okta/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/aws-okta/default.nix @@ -21,7 +21,6 @@ buildGoPackage rec { buildInputs = [ libusb1 libiconv ]; meta = with lib; { - inherit version; description = "aws-vault like tool for Okta authentication"; license = licenses.mit; maintainers = with maintainers; [imalsogreg Chili-Man]; diff --git a/third_party/nixpkgs/pkgs/tools/security/sshuttle/default.nix b/third_party/nixpkgs/pkgs/tools/security/sshuttle/default.nix index 9fd57c82e8..eec82712c8 100644 --- a/third_party/nixpkgs/pkgs/tools/security/sshuttle/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/sshuttle/default.nix @@ -1,4 +1,5 @@ -{ lib, stdenv +{ lib +, stdenv , python3Packages , makeWrapper , coreutils @@ -19,15 +20,18 @@ python3Packages.buildPythonApplication rec { patches = [ ./sudo.patch ]; + postPatch = '' + substituteInPlace setup.cfg \ + --replace '--cov=sshuttle --cov-branch --cov-report=term-missing' "" + ''; + nativeBuildInputs = [ makeWrapper python3Packages.setuptools-scm ]; - checkInputs = with python3Packages; [ mock pytest pytestcov pytestrunner flake8 ]; - - runtimeDeps = [ coreutils openssh procps ] ++ lib.optionals stdenv.isLinux [ iptables nettools ]; + checkInputs = with python3Packages; [ mock pytestCheckHook flake8 ]; postInstall = '' wrapProgram $out/bin/sshuttle \ - --prefix PATH : "${lib.makeBinPath runtimeDeps}" \ + --prefix PATH : "${lib.makeBinPath ([ coreutils openssh procps ] ++ lib.optionals stdenv.isLinux [ iptables nettools ])}" \ ''; meta = with lib; { @@ -40,6 +44,5 @@ python3Packages.buildPythonApplication rec { ''; license = licenses.gpl2; maintainers = with maintainers; [ domenkozar carlosdagos ]; - platforms = platforms.unix; }; } diff --git a/third_party/nixpkgs/pkgs/tools/security/sudolikeaboss/default.nix b/third_party/nixpkgs/pkgs/tools/security/sudolikeaboss/default.nix index 53f99636b4..242da1a67b 100644 --- a/third_party/nixpkgs/pkgs/tools/security/sudolikeaboss/default.nix +++ b/third_party/nixpkgs/pkgs/tools/security/sudolikeaboss/default.nix @@ -22,7 +22,6 @@ buildGoPackage rec { ]; meta = with lib; { - inherit version; inherit (src.meta) homepage; description = "Get 1password access from iterm2"; license = licenses.mit; diff --git a/third_party/nixpkgs/pkgs/tools/system/smartmontools/default.nix b/third_party/nixpkgs/pkgs/tools/system/smartmontools/default.nix index 0142156a73..669d1a9fbc 100644 --- a/third_party/nixpkgs/pkgs/tools/system/smartmontools/default.nix +++ b/third_party/nixpkgs/pkgs/tools/system/smartmontools/default.nix @@ -38,5 +38,6 @@ in stdenv.mkDerivation rec { license = licenses.gpl2Plus; maintainers = with maintainers; [ peti Frostman ]; platforms = with platforms; linux ++ darwin; + mainProgram = "smartctl"; }; } diff --git a/third_party/nixpkgs/pkgs/top-level/all-packages.nix b/third_party/nixpkgs/pkgs/top-level/all-packages.nix index 1c3366e81d..732931d778 100644 --- a/third_party/nixpkgs/pkgs/top-level/all-packages.nix +++ b/third_party/nixpkgs/pkgs/top-level/all-packages.nix @@ -13906,6 +13906,10 @@ in modd = callPackage ../development/tools/modd { }; + mold = callPackage ../development/tools/mold { + stdenv = llvmPackages_latest.stdenv; + }; + msgpack-tools = callPackage ../development/tools/msgpack-tools { }; msgpuck = callPackage ../development/libraries/msgpuck { }; @@ -19982,7 +19986,9 @@ in check_systemd = callPackage ../servers/monitoring/nagios/plugins/check_systemd.nix { }; - neo4j = callPackage ../servers/nosql/neo4j { }; + neo4j = callPackage ../servers/nosql/neo4j { + jre = jre8_headless; + }; neo4j-desktop = callPackage ../applications/misc/neo4j-desktop { }; @@ -31496,6 +31502,10 @@ in fsuae = callPackage ../misc/emulators/fs-uae { }; + fsuae-launcher = callPackage ../misc/emulators/fs-uae-launcher { + inherit (python3Packages) pyqt5 setuptools requests; + }; + putty = callPackage ../applications/networking/remote/putty { gtk2 = gtk2-x11; };