From e5b24e6da2b638a4519ba2cda380cfe8d47c2ba2 Mon Sep 17 00:00:00 2001 From: Alexandre Iooss Date: Tue, 4 Jan 2022 08:14:36 +0100 Subject: [PATCH 001/133] nixos/prometheus-node-exporter: do not protect home Set ProtectHome to false for the node exporter. This allows free space monitoring under /home. --- nixos/modules/services/monitoring/prometheus/exporters/node.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/modules/services/monitoring/prometheus/exporters/node.nix b/nixos/modules/services/monitoring/prometheus/exporters/node.nix index 5e5fc7cd5524..417920402f34 100644 --- a/nixos/modules/services/monitoring/prometheus/exporters/node.nix +++ b/nixos/modules/services/monitoring/prometheus/exporters/node.nix @@ -44,6 +44,8 @@ in ]; # The timex collector needs to access clock APIs ProtectClock = any (collector: collector == "timex") cfg.disabledCollectors; + # Allow space monitoring under /home + ProtectHome = true; }; }; } From 31c82b62ff71115d93e5d71279229235d8f6099f Mon Sep 17 00:00:00 2001 From: Josh Robson Chase Date: Mon, 23 May 2022 11:00:41 -0400 Subject: [PATCH 002/133] innernet: package systemd units --- pkgs/tools/networking/innernet/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/tools/networking/innernet/default.nix b/pkgs/tools/networking/innernet/default.nix index 6f7669ff6f7f..9c0ed203af40 100644 --- a/pkgs/tools/networking/innernet/default.nix +++ b/pkgs/tools/networking/innernet/default.nix @@ -37,6 +37,8 @@ rustPlatform.buildRustPackage rec { installManPage doc/innernet.8.gz installShellCompletion doc/innernet.completions.{bash,fish,zsh} installShellCompletion doc/innernet-server.completions.{bash,fish,zsh} + find . -regex '.*\.\(target\|service\)' | xargs install -Dt $out/lib/systemd/system + find $out/lib/systemd/system -type f | xargs sed -i "s|/usr/bin/innernet|$out/bin/innernet|" ''; passthru.tests = { From 6b9080d336945a00344b1ec20ce8bc6e1122d28b Mon Sep 17 00:00:00 2001 From: Josh Robson Chase Date: Mon, 23 May 2022 11:16:50 -0400 Subject: [PATCH 003/133] innernet: only package systemd units for linux --- pkgs/tools/networking/innernet/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/networking/innernet/default.nix b/pkgs/tools/networking/innernet/default.nix index 9c0ed203af40..de6dc0fe215d 100644 --- a/pkgs/tools/networking/innernet/default.nix +++ b/pkgs/tools/networking/innernet/default.nix @@ -37,9 +37,10 @@ rustPlatform.buildRustPackage rec { installManPage doc/innernet.8.gz installShellCompletion doc/innernet.completions.{bash,fish,zsh} installShellCompletion doc/innernet-server.completions.{bash,fish,zsh} + '' + (lib.optionalString stdenv.isLinux '' find . -regex '.*\.\(target\|service\)' | xargs install -Dt $out/lib/systemd/system find $out/lib/systemd/system -type f | xargs sed -i "s|/usr/bin/innernet|$out/bin/innernet|" - ''; + ''); passthru.tests = { serverVersion = testers.testVersion { package = innernet; command = "innernet-server --version"; }; From c29a4892723e6ca61c5425cbce714bb89384e0b5 Mon Sep 17 00:00:00 2001 From: K900 Date: Sun, 19 Jun 2022 17:04:20 +0300 Subject: [PATCH 004/133] tempo: 1.1.0 -> 1.4.1 --- pkgs/servers/tracing/tempo/default.nix | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/tracing/tempo/default.nix b/pkgs/servers/tracing/tempo/default.nix index 3380a0e99d12..19f2df40ed45 100644 --- a/pkgs/servers/tracing/tempo/default.nix +++ b/pkgs/servers/tracing/tempo/default.nix @@ -1,18 +1,28 @@ { lib, buildGoModule, fetchFromGitHub }: buildGoModule rec { - version = "1.1.0"; pname = "tempo"; + version = "1.4.1"; src = fetchFromGitHub { - rev = "v${version}"; owner = "grafana"; repo = "tempo"; - sha256 = "sha256-qKsgcc62HTwl7Usmp8zk4vKDo4XEJnwL+A3hoLhgBkk="; + rev = "v${version}"; + fetchSubmodules = true; + sha256 = "sha256-kxR+xwhthsK3gThs0jPJfWlsRG35kCuWvKH3Wr7ENTs="; }; vendorSha256 = null; + subPackages = [ + "cmd/tempo-cli" + "cmd/tempo-query" + # FIXME: build is broken upstream, enable for next release + # "cmd/tempo-serverless" + "cmd/tempo-vulture" + "cmd/tempo" + ]; + # tests use docker doCheck = false; From 203696f098d3041b0fc97a0b8358a703de6f0672 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Na=C3=AFm=20Favier?= Date: Tue, 29 Mar 2022 21:14:13 +0200 Subject: [PATCH 005/133] nixos/resolvconf: add `package` Expose the package that provides the system-wide `resolvconf` command (either openresolv or systemd) to allow implementation-agnostic modules. --- nixos/modules/config/resolvconf.nix | 21 ++++++++++++++++++--- nixos/modules/system/boot/resolved.nix | 4 +++- 2 files changed, 21 insertions(+), 4 deletions(-) diff --git a/nixos/modules/config/resolvconf.nix b/nixos/modules/config/resolvconf.nix index 4499481811fd..3e14884bb2bf 100644 --- a/nixos/modules/config/resolvconf.nix +++ b/nixos/modules/config/resolvconf.nix @@ -50,7 +50,20 @@ in default = !(config.environment.etc ? "resolv.conf"); defaultText = literalExpression ''!(config.environment.etc ? "resolv.conf")''; description = '' - DNS configuration is managed by resolvconf. + Whether DNS configuration is managed by resolvconf. + ''; + }; + + package = mkOption { + type = types.package; + default = pkgs.openresolv; + defaultText = literalExpression "pkgs.openresolv"; + description = '' + The package that provides the system-wide resolvconf command. Defaults to openresolv + if this module is enabled. Otherwise, can be used by other modules (for example ) to + provide a compatibility layer. + + This option generally shouldn't be set by the user. ''; }; @@ -119,10 +132,12 @@ in exit 1 '' else configText; + + environment.systemPackages = [ cfg.package ]; } (mkIf cfg.enable { - environment.systemPackages = [ pkgs.openresolv ]; + networking.resolvconf.package = pkgs.openresolv; systemd.services.resolvconf = { description = "resolvconf update"; @@ -134,7 +149,7 @@ in serviceConfig = { Type = "oneshot"; - ExecStart = "${pkgs.openresolv}/bin/resolvconf -u"; + ExecStart = "${cfg.package}/bin/resolvconf -u"; RemainAfterExit = true; }; }; diff --git a/nixos/modules/system/boot/resolved.nix b/nixos/modules/system/boot/resolved.nix index 21d3fab2f35d..3a38201ff60d 100644 --- a/nixos/modules/system/boot/resolved.nix +++ b/nixos/modules/system/boot/resolved.nix @@ -1,4 +1,4 @@ -{ config, lib, ... }: +{ config, lib, pkgs, ... }: with lib; let @@ -178,6 +178,8 @@ in # If networkmanager is enabled, ask it to interface with resolved. networking.networkmanager.dns = "systemd-resolved"; + networking.resolvconf.package = pkgs.systemd; + }; } From fd662e5c4657f451d1fa534fccdc61aebba841ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Na=C3=AFm=20Favier?= Date: Tue, 29 Mar 2022 21:16:09 +0200 Subject: [PATCH 006/133] wireguard-tools: use resolvconf from PATH if available Allows using wg-quick with systemd-resolved which provides its own implementation of the resolvconf command. --- pkgs/tools/networking/wireguard-tools/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/networking/wireguard-tools/default.nix b/pkgs/tools/networking/wireguard-tools/default.nix index 59dafe9f9059..455bff2493ed 100644 --- a/pkgs/tools/networking/wireguard-tools/default.nix +++ b/pkgs/tools/networking/wireguard-tools/default.nix @@ -37,7 +37,10 @@ stdenv.mkDerivation rec { --replace /usr/bin $out/bin '' + lib.optionalString stdenv.isLinux '' for f in $out/bin/*; do - wrapProgram $f --prefix PATH : ${lib.makeBinPath [ procps iproute2 iptables openresolv ]} + # allow users to provide their own resolvconf implementation, e.g. the one provided by systemd-resolved + wrapProgram $f \ + --prefix PATH : ${lib.makeBinPath [ procps iproute2 iptables ]} \ + --suffix PATH : ${lib.makeBinPath [ openresolv ]} done ''; From 458ac47a1d5491dfb610cb8faaffcf5d5445b224 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Na=C3=AFm=20Favier?= Date: Tue, 29 Mar 2022 21:18:46 +0200 Subject: [PATCH 007/133] nixos/wg-quick: improve usage with systemd-networkd Use `networking.resolvconf.package` to allow DNS entries to be set using the system-wide resolver implementation instead of hardcoding systemd or openresolv. Extend the tests by adding DNS entries and making one of the peers use systemd-networkd (hence systemd-resolved). Also add a few `networkd`-specific settings. --- nixos/modules/services/networking/wg-quick.nix | 8 +++++++- nixos/tests/wireguard/wg-quick.nix | 5 +++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/nixos/modules/services/networking/wg-quick.nix b/nixos/modules/services/networking/wg-quick.nix index 236d3f452e7e..d44fad4202bb 100644 --- a/nixos/modules/services/networking/wg-quick.nix +++ b/nixos/modules/services/networking/wg-quick.nix @@ -273,7 +273,7 @@ let after = [ "network.target" "network-online.target" ]; wantedBy = optional values.autostart "multi-user.target"; environment.DEVICE = name; - path = [ pkgs.kmod pkgs.wireguard-tools ]; + path = [ pkgs.kmod pkgs.wireguard-tools config.networking.resolvconf.package ]; serviceConfig = { Type = "oneshot"; @@ -332,5 +332,11 @@ in { # breaks the wg-quick routing because wireguard packets leave with a fwmark from wireguard. networking.firewall.checkReversePath = false; systemd.services = mapAttrs' generateUnit cfg.interfaces; + + # Prevent networkd from clearing the rules set by wg-quick when restarted (e.g. when waking up from suspend). + systemd.network.config.networkConfig.ManageForeignRoutingPolicyRules = mkDefault false; + + # WireGuard interfaces should be ignored in determining whether the network is online. + systemd.network.wait-online.ignoredInterfaces = builtins.attrNames cfg.interfaces; }; } diff --git a/nixos/tests/wireguard/wg-quick.nix b/nixos/tests/wireguard/wg-quick.nix index 961c2e15c30f..bc2cba911888 100644 --- a/nixos/tests/wireguard/wg-quick.nix +++ b/nixos/tests/wireguard/wg-quick.nix @@ -29,6 +29,8 @@ import ../make-test-python.nix ({ pkgs, lib, ... }: inherit (wg-snakeoil-keys.peer1) publicKey; }; + + dns = [ "10.23.42.2" "fc00::2" "wg0" ]; }; }; }; @@ -38,6 +40,7 @@ import ../make-test-python.nix ({ pkgs, lib, ... }: ip6 = "fd00::2"; extraConfig = { boot = lib.mkIf (kernelPackages != null) { inherit kernelPackages; }; + networking.useNetworkd = true; networking.wg-quick.interfaces.wg0 = { address = [ "10.23.42.2/32" "fc00::2/128" ]; inherit (wg-snakeoil-keys.peer1) privateKey; @@ -49,6 +52,8 @@ import ../make-test-python.nix ({ pkgs, lib, ... }: inherit (wg-snakeoil-keys.peer0) publicKey; }; + + dns = [ "10.23.42.1" "fc00::1" "wg0" ]; }; }; }; From 953a5bd3dd3c527d6549592e0b7dbb96d5999bc2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Na=C3=AFm=20Favier?= Date: Tue, 29 Mar 2022 21:24:30 +0200 Subject: [PATCH 008/133] nixos/tailscale: use `networking.resolvconf.package` Allow using the appropriate resolver implementation to set DNS entries (typically systemd-resolved instead of openresolv). --- nixos/modules/services/networking/tailscale.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/networking/tailscale.nix b/nixos/modules/services/networking/tailscale.nix index 0133874d0e0d..aae5dacddf2f 100644 --- a/nixos/modules/services/networking/tailscale.nix +++ b/nixos/modules/services/networking/tailscale.nix @@ -46,7 +46,7 @@ in { systemd.services.tailscaled = { wantedBy = [ "multi-user.target" ]; path = [ - pkgs.openresolv # for configuring DNS in some configs + config.networking.resolvconf.package # for configuring DNS in some configs pkgs.procps # for collecting running services (opt-in feature) pkgs.glibc # for `getent` to look up user shells ]; From 4af5c46faa589c0fa1142cc59b83fd97a9e5a3ba Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Na=C3=AFm=20Favier?= Date: Tue, 21 Jun 2022 22:58:30 +0200 Subject: [PATCH 009/133] nixos/dhcpcd: use `networking.resolvconf.package` Allow using the appropriate resolver implementation to set DNS entries (typically systemd-resolved instead of openresolv). --- nixos/modules/services/networking/dhcpcd.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/networking/dhcpcd.nix b/nixos/modules/services/networking/dhcpcd.nix index 3eb7ca99eafd..a4c8608c31db 100644 --- a/nixos/modules/services/networking/dhcpcd.nix +++ b/nixos/modules/services/networking/dhcpcd.nix @@ -215,7 +215,7 @@ in # dhcpcd. So do a "systemctl restart" instead. stopIfChanged = false; - path = [ dhcpcd pkgs.nettools pkgs.openresolv ]; + path = [ dhcpcd pkgs.nettools config.networking.resolvconf.package ]; unitConfig.ConditionCapability = "CAP_NET_ADMIN"; From 160aaf5dd3a74d708e8a1478e98835c38f7ca8cc Mon Sep 17 00:00:00 2001 From: Torsten Schmits Date: Mon, 27 Jun 2022 18:31:49 +0200 Subject: [PATCH 010/133] nvidia-driver: Install windows libraries needed by Proton to support DLSS See https://github.com/NixOS/nixpkgs/issues/177533 --- pkgs/os-specific/linux/nvidia-x11/builder.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/os-specific/linux/nvidia-x11/builder.sh b/pkgs/os-specific/linux/nvidia-x11/builder.sh index da41837cfc2e..a53e57231650 100755 --- a/pkgs/os-specific/linux/nvidia-x11/builder.sh +++ b/pkgs/os-specific/linux/nvidia-x11/builder.sh @@ -119,6 +119,10 @@ installPhase() { fi fi + # Install libraries needed by Proton to support DLSS + install -Dm644 nvngx.dll $i/lib/nvidia/wine/ + install -Dm644 _nvngx.dll $i/lib/nvidia/wine/ + done if [ -n "$bin" ]; then From 7b5ee6d9275a26fdbcdbfc169cddab4d4a1d098a Mon Sep 17 00:00:00 2001 From: sternenseemann Date: Sat, 2 Jul 2022 12:45:36 +0200 Subject: [PATCH 011/133] python3Packages.afdko: 3.8.3 -> 3.9.0 3.9.1 is problematic atm because it'll unconditionally use the libxml2 externalproject on linux: https://github.com/adobe-type-tools/afdko/pull/1527#issuecomment-1172872618 https://github.com/adobe-type-tools/afdko/blob/3.9.0/NEWS.md#390-released-2022-06-23 --- .../python-modules/afdko/default.nix | 8 ++++-- .../afdko/libxml2-cmake-find-package.patch | 22 ++++++++++++++++ .../use-dynamic-system-antlr4-runtime.patch | 26 ++++++++++++++----- 3 files changed, 47 insertions(+), 9 deletions(-) create mode 100644 pkgs/development/python-modules/afdko/libxml2-cmake-find-package.patch diff --git a/pkgs/development/python-modules/afdko/default.nix b/pkgs/development/python-modules/afdko/default.nix index 613ee89f276e..2ca94a2085a4 100644 --- a/pkgs/development/python-modules/afdko/default.nix +++ b/pkgs/development/python-modules/afdko/default.nix @@ -5,6 +5,7 @@ , setuptools-scm, scikit-build , cmake , antlr4_9 +, libxml2 , pytestCheckHook # Enables some expensive tests, useful for verifying an update , runAllTests ? false @@ -13,13 +14,13 @@ buildPythonPackage rec { pname = "afdko"; - version = "3.8.3"; + version = "3.9.0"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "0mplyla4zcai3qld7is7bl5wn2kzhp87w87yi13wpqnw06i6ij4b"; + sha256 = "1fjsaz6bp028fbmry6fzfcih78mdzycqmky1wsz5y0bg4kfk4shh"; }; format = "pyproject"; @@ -32,6 +33,7 @@ buildPythonPackage rec { buildInputs = [ antlr4_9.runtime.cpp + libxml2.dev ]; patches = [ @@ -40,6 +42,8 @@ buildPythonPackage rec { # Use antlr4 runtime from nixpkgs and link it dynamically ./use-dynamic-system-antlr4-runtime.patch + + ./libxml2-cmake-find-package.patch ]; # setup.py will always (re-)execute cmake in buildPhase diff --git a/pkgs/development/python-modules/afdko/libxml2-cmake-find-package.patch b/pkgs/development/python-modules/afdko/libxml2-cmake-find-package.patch new file mode 100644 index 000000000000..87604199d3e9 --- /dev/null +++ b/pkgs/development/python-modules/afdko/libxml2-cmake-find-package.patch @@ -0,0 +1,22 @@ +commit c423d1ddf0345aed7ecaf4c8b9e1fa5108aafc6f +Author: sternenseemann +Date: Sat Jul 2 12:35:56 2022 +0200 + + Force use of CMake-shipped FindLibXml2 module + + This is needed to work around a nixpkgs bug: + https://github.com/NixOS/nixpkgs/issues/125008 + +diff --git a/CMakeLists.txt b/CMakeLists.txt +index a75b6fb1..c1408283 100644 +--- a/CMakeLists.txt ++++ b/CMakeLists.txt +@@ -42,7 +42,7 @@ set(ANTLR4_TAG tags/4.9.3) + find_path(ANTLR4_HEADER antlr4-runtime.h PATH_SUFFIXES antlr4-runtime) + set(ANTLR4_INCLUDE_DIRS ${ANTLR4_HEADER}) + +-FIND_PACKAGE(LibXml2) ++FIND_PACKAGE(LibXml2 REQUIRED MODULE) + IF (NOT ${LibXml2_FOUND}) + MESSAGE(STATUS "Could not locate LibXml2, will install externally.") + set(LIBXML2_TAG tags/v2.9.13) diff --git a/pkgs/development/python-modules/afdko/use-dynamic-system-antlr4-runtime.patch b/pkgs/development/python-modules/afdko/use-dynamic-system-antlr4-runtime.patch index 8198751a1606..a8ecb02c3e78 100644 --- a/pkgs/development/python-modules/afdko/use-dynamic-system-antlr4-runtime.patch +++ b/pkgs/development/python-modules/afdko/use-dynamic-system-antlr4-runtime.patch @@ -1,4 +1,4 @@ -commit 1ccbf21a67da0fdbaad881a1f5c2a4df915e8c57 +commit 286b9c6e69691292dce4f2b4beaac8f886da184d Author: sternenseemann Date: Tue Oct 5 18:16:10 2021 +0200 @@ -9,7 +9,7 @@ Date: Tue Oct 5 18:16:10 2021 +0200 called antlr4-runtime, not antlr4_static). diff --git a/CMakeLists.txt b/CMakeLists.txt -index e9c8c08e..dc3a46da 100644 +index 9ce80598..a75b6fb1 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -36,11 +36,11 @@ list(APPEND CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake) @@ -24,10 +24,22 @@ index e9c8c08e..dc3a46da 100644 +find_path(ANTLR4_HEADER antlr4-runtime.h PATH_SUFFIXES antlr4-runtime) +set(ANTLR4_INCLUDE_DIRS ${ANTLR4_HEADER}) - # sanitizer support - # work around https://github.com/pypa/setuptools/issues/1928 with environment + FIND_PACKAGE(LibXml2) + IF (NOT ${LibXml2_FOUND}) +diff --git a/c/makeotf/lib/cffread/CMakeLists.txt b/c/makeotf/lib/cffread/CMakeLists.txt +index 9a400fde..5452d987 100644 +--- a/c/makeotf/lib/cffread/CMakeLists.txt ++++ b/c/makeotf/lib/cffread/CMakeLists.txt +@@ -13,6 +13,6 @@ else () + endif() + endif() + +-target_link_libraries(makeotf_cffread PUBLIC antlr4_static) ++target_link_libraries(makeotf_cffread PUBLIC antlr4-runtime) + + target_compile_definitions(makeotf_cffread PRIVATE $<$:CFF_DEBUG=1> CFF_T13_SUPPORT=0) diff --git a/c/makeotf/lib/hotconv/CMakeLists.txt b/c/makeotf/lib/hotconv/CMakeLists.txt -index 82257bf2..02eb2e30 100644 +index 3cceceea..9695ea21 100644 --- a/c/makeotf/lib/hotconv/CMakeLists.txt +++ b/c/makeotf/lib/hotconv/CMakeLists.txt @@ -69,7 +69,7 @@ add_library(hotconv STATIC @@ -37,5 +49,5 @@ index 82257bf2..02eb2e30 100644 -target_link_libraries(hotconv PUBLIC antlr4_static) +target_link_libraries(hotconv PUBLIC antlr4-runtime) - if ( CMAKE_COMPILER_IS_GNUCC ) - target_compile_options(hotconv PRIVATE -Wall -Wno-attributes) + if (${LibXml2_FOUND}) + target_link_libraries(hotconv PUBLIC ${LIBXML2_LIBRARY}) From d1dcbade3dbe4ed018c8f25d58c8e02b282d1348 Mon Sep 17 00:00:00 2001 From: Luflosi Date: Sun, 3 Jul 2022 20:03:02 +0200 Subject: [PATCH 012/133] python3Packages.humanize: add Luflosi as maintainer --- pkgs/development/python-modules/humanize/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/humanize/default.nix b/pkgs/development/python-modules/humanize/default.nix index 299bd9685940..37adab72168e 100644 --- a/pkgs/development/python-modules/humanize/default.nix +++ b/pkgs/development/python-modules/humanize/default.nix @@ -48,6 +48,6 @@ buildPythonPackage rec { description = "Python humanize utilities"; homepage = "https://github.com/python-humanize/humanize"; license = licenses.mit; - maintainers = with maintainers; [ rmcgibbo ]; + maintainers = with maintainers; [ rmcgibbo Luflosi ]; }; } From 228c2d6c1c3e7f76a630ba1c7fb69d09c3227c27 Mon Sep 17 00:00:00 2001 From: Luflosi Date: Sun, 3 Jul 2022 20:27:18 +0200 Subject: [PATCH 013/133] python3Packages.humanize: include generated translations Without this, localization doesn't work and only english is available. --- pkgs/development/python-modules/humanize/default.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/development/python-modules/humanize/default.nix b/pkgs/development/python-modules/humanize/default.nix index 37adab72168e..4bbec306cc71 100644 --- a/pkgs/development/python-modules/humanize/default.nix +++ b/pkgs/development/python-modules/humanize/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , fetchFromGitHub , freezegun +, gettext , importlib-metadata , pytestCheckHook , pythonOlder @@ -27,6 +28,7 @@ buildPythonPackage rec { nativeBuildInputs = [ setuptools-scm + gettext ]; propagatedBuildInputs = [ @@ -35,6 +37,14 @@ buildPythonPackage rec { importlib-metadata ]; + postBuild = '' + scripts/generate-translation-binaries.sh + ''; + + postInstall = '' + cp -r 'src/humanize/locale' "$out/lib/"*'/site-packages/humanize/' + ''; + checkInputs = [ freezegun pytestCheckHook From dcc323e1f181f670904185a08b791f27991c6dea Mon Sep 17 00:00:00 2001 From: Luflosi Date: Sun, 3 Jul 2022 20:30:48 +0200 Subject: [PATCH 014/133] python3Packages.humanize: 4.1.0 -> 4.2.3 https://github.com/python-humanize/humanize/releases/tag/4.2.3 --- pkgs/development/python-modules/humanize/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/humanize/default.nix b/pkgs/development/python-modules/humanize/default.nix index 4bbec306cc71..b64b26844d18 100644 --- a/pkgs/development/python-modules/humanize/default.nix +++ b/pkgs/development/python-modules/humanize/default.nix @@ -11,7 +11,7 @@ }: buildPythonPackage rec { - version = "4.1.0"; + version = "4.2.3"; pname = "humanize"; format = "pyproject"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "python-humanize"; repo = pname; rev = version; - hash = "sha256-5xL3gfEohDjnF085Pgx/PBXWWM76X4FU2KR+8OGshMw="; + hash = "sha256-cAlNtN9sUnDAkCQj2bJfT72B2TQDYRBB4P4NJY9mUU0="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; From b3aee32add2396c1521b83b5c6c92e4c53108bcc Mon Sep 17 00:00:00 2001 From: Jiajie Chen Date: Mon, 4 Jul 2022 14:53:28 +0800 Subject: [PATCH 015/133] hdf5_1_10: 1.10.6 -> 1.10.9 pythonPackages.tables is updated, the version pin is removed. The bin-mv.patch is applied upstream. --- pkgs/tools/misc/hdf5/1.10.nix | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/misc/hdf5/1.10.nix b/pkgs/tools/misc/hdf5/1.10.nix index 74d8fce599a8..fbfac18414c8 100644 --- a/pkgs/tools/misc/hdf5/1.10.nix +++ b/pkgs/tools/misc/hdf5/1.10.nix @@ -12,12 +12,11 @@ let inherit (lib) optional optionals; in stdenv.mkDerivation rec { - # pinned to 1.10.6 for pythonPackages.tables v3.6.1. tables has test errors for hdf5 > 1.10.6. https://github.com/PyTables/PyTables/issues/845 - version = "1.10.6"; + version = "1.10.9"; pname = "hdf5"; src = fetchurl { url = "https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-${lib.versions.majorMinor version}/${pname}-${version}/src/${pname}-${version}.tar.bz2"; - sha256 = "1gf38x51128hn00744358w27xgzjk0ff4wra4yxh2lk804ck1mh9"; + sha256 = "sha256-AMS+cJbzb9yvpPl04SbGwUEkKOOOvHsYHZB0WeeB8ZE="; }; outputs = [ "out" "dev" ]; @@ -31,9 +30,7 @@ stdenv.mkDerivation rec { configureFlags = optional enableShared "--enable-shared" ++ optional javaSupport "--enable-java"; - patches = [ - ./bin-mv.patch - ]; + patches = [ ]; postInstall = '' find "$out" -type f -exec remove-references-to -t ${stdenv.cc} '{}' + From 4d6eacab55e0afef2ed16a6ca05302b46b1e3caf Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Mon, 4 Jul 2022 22:14:38 +0200 Subject: [PATCH 016/133] canon-cups-ufr2: fix libdir pointing to bindir, little format --- pkgs/misc/cups/drivers/canon/default.nix | 35 ++++++++++++------------ 1 file changed, 17 insertions(+), 18 deletions(-) diff --git a/pkgs/misc/cups/drivers/canon/default.nix b/pkgs/misc/cups/drivers/canon/default.nix index f20f31049111..07b81ce9bc28 100644 --- a/pkgs/misc/cups/drivers/canon/default.nix +++ b/pkgs/misc/cups/drivers/canon/default.nix @@ -27,7 +27,6 @@ }: let - i686_NIX_GCC = pkgsi686Linux.callPackage ({ gcc }: gcc) { }; ld32 = if stdenv.hostPlatform.system == "x86_64-linux" then "${stdenv.cc}/nix-support/dynamic-linker-m32" @@ -46,31 +45,31 @@ let }; buildInputs = [ cups zlib jbigkit glib gtk3 pkg-config gnome2.libglade libxml2 gdk-pixbuf pango cairo atk ]; - in - - stdenv.mkDerivation rec { pname = "canon-cups-ufr2"; inherit version; src = src_canon; postUnpack = '' - (cd $sourceRoot; tar -xzf Sources/cnrdrvcups-lb-${version}-1.tar.gz) - (cd $sourceRoot; sed -ie "s@_prefix=/usr@_prefix=$out@" cnrdrvcups-common-${version}/allgen.sh) - (cd $sourceRoot; sed -ie "s@_libdir=/usr/lib@_libdir=$out/lib@" cnrdrvcups-common-${version}/allgen.sh) - (cd $sourceRoot; sed -ie "s@_bindir=/usr/bin@_libdir=$out/bin@" cnrdrvcups-common-${version}/allgen.sh) - (cd $sourceRoot; sed -ie "s@etc/cngplp@$out/etc/cngplp@" cnrdrvcups-common-${version}/cngplp/Makefile.am) - (cd $sourceRoot; sed -ie "s@usr/share/cngplp@$out/usr/share/cngplp@" cnrdrvcups-common-${version}/cngplp/src/Makefile.am) - (cd $sourceRoot; patchShebangs cnrdrvcups-common-${version}) + ( + cd $sourceRoot + tar -xzf Sources/cnrdrvcups-lb-${version}-1.tar.gz + sed -ie "s@_prefix=/usr@_prefix=$out@" cnrdrvcups-common-${version}/allgen.sh + sed -ie "s@_libdir=/usr/lib@_libdir=$out/lib@" cnrdrvcups-common-${version}/allgen.sh + sed -ie "s@_bindir=/usr/bin@_bindir=$out/bin@" cnrdrvcups-common-${version}/allgen.sh + sed -ie "s@etc/cngplp@$out/etc/cngplp@" cnrdrvcups-common-${version}/cngplp/Makefile.am + sed -ie "s@usr/share/cngplp@$out/usr/share/cngplp@" cnrdrvcups-common-${version}/cngplp/src/Makefile.am + patchShebangs cnrdrvcups-common-${version} - (cd $sourceRoot; sed -ie "s@_prefix=/usr@_prefix=$out@" cnrdrvcups-lb-${version}/allgen.sh) - (cd $sourceRoot; sed -ie "s@_libdir=/usr/lib@_libdir=$out/lib@" cnrdrvcups-lb-${version}/allgen.sh) - (cd $sourceRoot; sed -ie "s@_bindir=/usr/bin@_libdir=$out/bin@" cnrdrvcups-lb-${version}/allgen.sh) - (cd $sourceRoot; sed -ie '/^cd \.\.\/cngplp/,/^cd files/{/^cd files/!{d}}' cnrdrvcups-lb-${version}/allgen.sh) - (cd $sourceRoot; sed -ie "s@cd \.\./pdftocpca@cd pdftocpca@" cnrdrvcups-lb-${version}/allgen.sh) - (cd $sourceRoot; sed -i "/CNGPLPDIR/d" cnrdrvcups-lb-${version}/Makefile) - (cd $sourceRoot; patchShebangs cnrdrvcups-lb-${version}) + sed -ie "s@_prefix=/usr@_prefix=$out@" cnrdrvcups-lb-${version}/allgen.sh + sed -ie "s@_libdir=/usr/lib@_libdir=$out/lib@" cnrdrvcups-lb-${version}/allgen.sh + sed -ie "s@_bindir=/usr/bin@_bindir=$out/bin@" cnrdrvcups-lb-${version}/allgen.sh + sed -ie '/^cd \.\.\/cngplp/,/^cd files/{/^cd files/!{d}}' cnrdrvcups-lb-${version}/allgen.sh + sed -ie "s@cd \.\./pdftocpca@cd pdftocpca@" cnrdrvcups-lb-${version}/allgen.sh + sed -i "/CNGPLPDIR/d" cnrdrvcups-lb-${version}/Makefile + patchShebangs cnrdrvcups-lb-${version} + ) ''; nativeBuildInputs = [ makeWrapper unzip autoconf automake libtool_1_5 ]; From 1a28fca817d81896f00f5064e76e8f363dbb05cb Mon Sep 17 00:00:00 2001 From: Fatih Altinok Date: Tue, 5 Jul 2022 14:35:40 +0300 Subject: [PATCH 017/133] difftastic: 0.29.1 -> 0.30.0 --- pkgs/tools/text/difftastic/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/text/difftastic/default.nix b/pkgs/tools/text/difftastic/default.nix index ef117d1c1d3b..1263933f4ca4 100644 --- a/pkgs/tools/text/difftastic/default.nix +++ b/pkgs/tools/text/difftastic/default.nix @@ -9,13 +9,13 @@ rustPlatform.buildRustPackage rec { pname = "difftastic"; - version = "0.29.1"; + version = "0.30.0"; src = fetchFromGitHub { owner = "wilfred"; repo = pname; rev = version; - sha256 = "sha256-eOW+cNIE/H4VtwqbWLGSmS/UAbKMoHFBFcUaLpcPHfw="; + sha256 = "sha256-7uVrE+HDEtZsbXI/PSZOAIbAs3spSkcm+1RGrcFxKLM="; }; depsExtraArgs = { @@ -40,7 +40,7 @@ rustPlatform.buildRustPackage rec { popd ''; }; - cargoSha256 = "sha256-/z+jimIDNej1vottvqmG3exd5BpOBUfmx1qaILhLKJU="; + cargoSha256 = "sha256-SQSshOJ3+z+jHXSjWv31tsGivE4ESMHW1h58vuacQ3U="; passthru.tests.version = testers.testVersion { package = difftastic; }; From 1271b83b6364cfcb9761e4b1a581094eee5aa487 Mon Sep 17 00:00:00 2001 From: Bart Brouns Date: Mon, 4 Jul 2022 17:35:39 +0200 Subject: [PATCH 018/133] faust: 2.40.0 -> 2.41.1 --- pkgs/applications/audio/faust/faust2.nix | 11 ++++++----- pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/audio/faust/faust2.nix b/pkgs/applications/audio/faust/faust2.nix index 2ad98d3d6d8d..32bcbee2e6cd 100644 --- a/pkgs/applications/audio/faust/faust2.nix +++ b/pkgs/applications/audio/faust/faust2.nix @@ -20,13 +20,13 @@ with lib.strings; let - version = "2.40.0"; + version = "2.41.1"; src = fetchFromGitHub { owner = "grame-cncm"; repo = "faust"; rev = version; - sha256 = "sha256-IsrLaoMDwrDPxtqCXIy/7tZCdogTUkJ00obSco9SR/A="; + sha256 = "sha256-x0nBWyILrNJijs7CIvRrgYG6vgB3UlxLj9i7E4cHr9I="; fetchSubmodules = true; }; @@ -58,9 +58,10 @@ let cd build ''; - cmakeFlags = '' - -C ../backends/all.cmake -C ../targets/all.cmake .. - ''; + cmakeFlags = [ + "-C../backends/all.cmake" + "-C../targets/all.cmake" + ]; postInstall = '' # syntax error when eval'd directly diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3770016107c5..099a7eec0e48 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -34406,9 +34406,7 @@ with pkgs; faust1 = callPackage ../applications/audio/faust/faust1.nix { }; - faust2 = callPackage ../applications/audio/faust/faust2.nix { - llvm = llvm_10; - }; + faust2 = callPackage ../applications/audio/faust/faust2.nix { }; faust2alqt = callPackage ../applications/audio/faust/faust2alqt.nix { }; From aa2c8f202652ec02db8477b7bc1db9ca01abdc67 Mon Sep 17 00:00:00 2001 From: Bart Brouns Date: Mon, 4 Jul 2022 17:37:17 +0200 Subject: [PATCH 019/133] faustlive: 2.5.10 -> 2.5.11 --- pkgs/applications/audio/faust/faustlive.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/faust/faustlive.nix b/pkgs/applications/audio/faust/faustlive.nix index 67ff0a828573..4ee5ab82e6e4 100644 --- a/pkgs/applications/audio/faust/faustlive.nix +++ b/pkgs/applications/audio/faust/faustlive.nix @@ -5,12 +5,12 @@ stdenv.mkDerivation rec { pname = "faustlive"; - version = "2.5.10"; + version = "2.5.11"; src = fetchFromGitHub { owner = "grame-cncm"; repo = "faustlive"; rev = version; - sha256 = "sha256-yLpIJr6A+NIX9RSGfQXT0O0USuRr0Ni9aUA+mbk31/o="; + sha256 = "sha256-ldn6st3/iIABjEfAwodOnPrI97DygWbnYmvMktlOgrk="; fetchSubmodules = true; }; From a07161dd739bf4c6d65e51bf25151e528bfedb48 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Wed, 6 Jul 2022 23:40:39 +0200 Subject: [PATCH 020/133] libressl: 3.5.2 -> 3.5.3 --- pkgs/development/libraries/libressl/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/development/libraries/libressl/default.nix b/pkgs/development/libraries/libressl/default.nix index 97f21d0cb94a..8ec7b2b87f5f 100644 --- a/pkgs/development/libraries/libressl/default.nix +++ b/pkgs/development/libraries/libressl/default.nix @@ -12,13 +12,13 @@ let then "DYLD_LIBRARY_PATH" else "LD_LIBRARY_PATH"; - generic = { version, sha256, patches ? [] }: stdenv.mkDerivation rec { + generic = { version, hash, patches ? [] }: stdenv.mkDerivation rec { pname = "libressl"; inherit version; src = fetchurl { url = "mirror://openbsd/LibreSSL/${pname}-${version}.tar.gz"; - inherit sha256; + inherit hash; }; nativeBuildInputs = [ cmake ]; @@ -86,11 +86,11 @@ let in { libressl_3_4 = generic { version = "3.4.3"; - sha256 = "sha256-/4i//jVIGLPM9UXjyv5FTFAxx6dyFwdPUzJx1jw38I0="; + hash = "sha256-/4i//jVIGLPM9UXjyv5FTFAxx6dyFwdPUzJx1jw38I0="; }; libressl_3_5 = generic { - version = "3.5.2"; - sha256 = "sha256-Vv6rjiHD+mVJ+LfXURZYuOmFGBYoOKeVMUcyZUrfPl8="; + version = "3.5.3"; + hash = "sha256-OrXl6u9pziDGsXDuZNeFtCI19I8uYrCV/KXXtmcriyg="; }; } From 59aa793664dc5c036bbfaaa309e09f300964f11e Mon Sep 17 00:00:00 2001 From: ajs124 Date: Wed, 6 Jul 2022 23:41:12 +0200 Subject: [PATCH 021/133] libressl: switch default to 3.5 --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 6242b1ec4f96..dd9197d6443f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20314,7 +20314,7 @@ with pkgs; libressl_3_4 libressl_3_5; - libressl = libressl_3_4; + libressl = libressl_3_5; boringssl = callPackage ../development/libraries/boringssl { }; From 9b62e0e7b187b96f07133cb72bedc3a1365f3752 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Thu, 7 Jul 2022 00:06:12 +0200 Subject: [PATCH 022/133] acme-client: pin to libressl 3.4 --- pkgs/top-level/all-packages.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index dd9197d6443f..3fb272fb06ca 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1069,7 +1069,10 @@ with pkgs; aether-lv2 = callPackage ../applications/audio/aether-lv2 { }; - acme-client = callPackage ../tools/networking/acme-client { stdenv = gccStdenv; }; + acme-client = callPackage ../tools/networking/acme-client { + stdenv = gccStdenv; + libressl = libressl_3_4; + }; adrgen = callPackage ../tools/misc/adrgen { }; From 6f96422524210531cbb5261ab931e43c641ea5bf Mon Sep 17 00:00:00 2001 From: ajs124 Date: Thu, 7 Jul 2022 00:09:09 +0200 Subject: [PATCH 023/133] fdbPackages: pin to libressl 3.4 --- pkgs/top-level/all-packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3fb272fb06ca..62cfcc550acc 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6298,6 +6298,7 @@ with pkgs; fdbPackages = dontRecurseIntoAttrs (callPackage ../servers/foundationdb { openjdk = openjdk8; # TODO: remove override https://github.com/NixOS/nixpkgs/pull/89731 + libressl = libressl_3_4; }); inherit (fdbPackages) From 2d11af56f53c0ff99b3a823407554bb612a3546e Mon Sep 17 00:00:00 2001 From: ajs124 Date: Thu, 7 Jul 2022 00:09:56 +0200 Subject: [PATCH 024/133] ovftool: pin to libressl 3.4 --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 62cfcc550acc..ce92c50fe330 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9355,7 +9355,9 @@ with pkgs; otpw = callPackage ../os-specific/linux/otpw { }; - ovftool = callPackage ../tools/virtualization/ovftool { }; + ovftool = callPackage ../tools/virtualization/ovftool { + libressl = libressl_3_4; + }; overcommit = callPackage ../development/tools/overcommit { }; From 610e5783d007784bb9c7780969b406636099a1ae Mon Sep 17 00:00:00 2001 From: ajs124 Date: Thu, 7 Jul 2022 00:12:08 +0200 Subject: [PATCH 025/133] wasm-pack: pin to libressl 3.4 --- pkgs/top-level/all-packages.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index ce92c50fe330..7bdc88d60bee 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -35349,6 +35349,7 @@ with pkgs; wasm-pack = callPackage ../development/tools/wasm-pack { inherit (darwin.apple_sdk.frameworks) Security; + libressl = libressl_3_4; }; wasynth = callPackage ../development/tools/wasynth { }; From 53e73b96212f8f42cbea6bd16fbaa7e27d6c63e1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 7 Jul 2022 19:20:25 +0000 Subject: [PATCH 026/133] bfs: 2.6 -> 2.6.1 --- pkgs/tools/system/bfs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/system/bfs/default.nix b/pkgs/tools/system/bfs/default.nix index 68feb0c1857c..7145ef5aeb66 100644 --- a/pkgs/tools/system/bfs/default.nix +++ b/pkgs/tools/system/bfs/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "bfs"; - version = "2.6"; + version = "2.6.1"; src = fetchFromGitHub { repo = "bfs"; owner = "tavianator"; rev = version; - sha256 = "sha256-QFhU8MElVaEtjCP0Wjt8d9/etCYsy4QrpOFldVdok8k="; + sha256 = "sha256-S0UQuG5xOQyVIqP203Rwa3FZTnsMuD6CiuiIc6nCKcM="; }; buildInputs = [ oniguruma ] ++ lib.optionals stdenv.isLinux [ libcap acl ]; From 41dbc0bdf257c820a5fbfc4b1faa1bc11da8f6df Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Thu, 7 Jul 2022 16:29:34 -0300 Subject: [PATCH 027/133] nixos/qt5: add kde platform theme --- nixos/modules/config/qt5.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/nixos/modules/config/qt5.nix b/nixos/modules/config/qt5.nix index fe7efa2eea19..0cda1ca9c3ec 100644 --- a/nixos/modules/config/qt5.nix +++ b/nixos/modules/config/qt5.nix @@ -10,11 +10,13 @@ let isQtStyle = cfg.platformTheme == "gtk2" && !(builtins.elem cfg.style ["adwaita" "adwaita-dark"]); isQt5ct = cfg.platformTheme == "qt5ct"; isLxqt = cfg.platformTheme == "lxqt"; + isKde = cfg.platformTheme == "kde"; packages = if isQGnome then [ pkgs.qgnomeplatform pkgs.adwaita-qt ] else if isQtStyle then [ pkgs.libsForQt5.qtstyleplugins ] else if isQt5ct then [ pkgs.libsForQt5.qt5ct ] else if isLxqt then [ pkgs.lxqt.lxqt-qtplugin pkgs.lxqt.lxqt-config ] + else if isKde then [ pkgs.libsForQt5.plasma-integration pkgs.libsForQt5.systemsettings ] else throw "`qt5.platformTheme` ${cfg.platformTheme} and `qt5.style` ${cfg.style} are not compatible."; in @@ -33,6 +35,7 @@ in "gnome" "lxqt" "qt5ct" + "kde" ]; example = "gnome"; relatedPackages = [ @@ -40,6 +43,7 @@ in ["libsForQt5" "qtstyleplugins"] ["libsForQt5" "qt5ct"] ["lxqt" "lxqt-qtplugin"] + ["libsForQt5" "plasma-integration"] ]; description = '' Selects the platform theme to use for Qt5 applications. @@ -71,6 +75,10 @@ in application. + + kde + Use Qt settings from Plasma. + ''; }; @@ -119,7 +127,7 @@ in environment.variables.QT_QPA_PLATFORMTHEME = cfg.platformTheme; - environment.variables.QT_STYLE_OVERRIDE = mkIf (! (isQt5ct || isLxqt)) cfg.style; + environment.variables.QT_STYLE_OVERRIDE = mkIf (! (isQt5ct || isLxqt || isKde)) cfg.style; environment.systemPackages = packages; From c318f3753961d92f1b9f8afbc5561e3b3a9d6a48 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 7 Jul 2022 19:30:49 +0000 Subject: [PATCH 028/133] cargo-tally: 1.0.5 -> 1.0.8 --- pkgs/development/tools/rust/cargo-tally/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-tally/default.nix b/pkgs/development/tools/rust/cargo-tally/default.nix index 8eb199f7f3eb..eb74f1a378e8 100644 --- a/pkgs/development/tools/rust/cargo-tally/default.nix +++ b/pkgs/development/tools/rust/cargo-tally/default.nix @@ -2,14 +2,14 @@ rustPlatform.buildRustPackage rec { pname = "cargo-tally"; - version = "1.0.5"; + version = "1.0.8"; src = fetchCrate { inherit pname version; - sha256 = "sha256-LHkj+RiUF7Zg2egEDgpViAlhZEhrOBMgLaNdhk5BNFI="; + sha256 = "sha256-NGYXe94eHvRQNxJgH7EiQaL9S+dtNlUrpVSWWQ/wHWY="; }; - cargoSha256 = "sha256-am5AcgqRpMzCNvrfqreyTHqSxxI9qlqUmGU/SVW7TMY="; + cargoSha256 = "sha256-vXhZyVMKa/itc+loKuSkSqIWyS3VSowOg1QRS213DPo="; buildInputs = lib.optionals stdenv.isDarwin [ DiskArbitration From 957bc34894420d0c22d792eb4a64f5fbfc7ed302 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 7 Jul 2022 19:49:01 +0000 Subject: [PATCH 029/133] cargo-nextest: 0.9.22 -> 0.9.24 --- pkgs/development/tools/rust/cargo-nextest/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-nextest/default.nix b/pkgs/development/tools/rust/cargo-nextest/default.nix index 8220b8a72666..f3cc8f5e1b2b 100644 --- a/pkgs/development/tools/rust/cargo-nextest/default.nix +++ b/pkgs/development/tools/rust/cargo-nextest/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-nextest"; - version = "0.9.22"; + version = "0.9.24"; src = fetchFromGitHub { owner = "nextest-rs"; repo = "nextest"; rev = "cargo-nextest-${version}"; - sha256 = "sha256-so9h6bpQzGMVwXI4qGHOJGbX7hnd9tllPGJcRvtIiIU="; + sha256 = "sha256-CGtPftjt09qGbEnI4qGSoRkjMVVTfPHNOzIb4/Hx78g="; }; - cargoSha256 = "sha256-rbrJPEMOFq37U+0uL5NIqithQAdjO8J6TDwr5vdfT50="; + cargoSha256 = "sha256-KAy5BDUrV3Voe3JBDBH2nZVUioRkONFMTdOyPjzx0Sk="; buildInputs = lib.optionals stdenv.isDarwin [ Security ]; From f76d71f98f8b070f638a9ce8df3ec923deb7fd28 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Thu, 7 Jul 2022 22:11:54 +0200 Subject: [PATCH 030/133] darwin.network_cmds:: pin to libressl 3.4 --- .../darwin/apple-source-releases/network_cmds/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/os-specific/darwin/apple-source-releases/network_cmds/default.nix b/pkgs/os-specific/darwin/apple-source-releases/network_cmds/default.nix index 3ffe77b73b34..2c93ad38b325 100644 --- a/pkgs/os-specific/darwin/apple-source-releases/network_cmds/default.nix +++ b/pkgs/os-specific/darwin/apple-source-releases/network_cmds/default.nix @@ -1,9 +1,9 @@ { lib, appleDerivation, xcbuildHook -, libressl, Librpcsvc, xnu, libpcap, developer_cmds }: +, libressl_3_4, Librpcsvc, xnu, libpcap, developer_cmds }: appleDerivation { nativeBuildInputs = [ xcbuildHook ]; - buildInputs = [ libressl xnu Librpcsvc libpcap developer_cmds ]; + buildInputs = [ libressl_3_4 xnu Librpcsvc libpcap developer_cmds ]; NIX_CFLAGS_COMPILE = " -I./unbound -I${xnu}/Library/Frameworks/System.framework/Headers/"; From 90761632aebd1f3fc0b82524fba2b846b959eaac Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Thu, 7 Jul 2022 16:19:19 +0200 Subject: [PATCH 031/133] nixos/hydra: use runuser like hydra flake --- .../services/continuous-integration/hydra/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/nixos/modules/services/continuous-integration/hydra/default.nix b/nixos/modules/services/continuous-integration/hydra/default.nix index 87806d48e89f..d3945f2370d7 100644 --- a/nixos/modules/services/continuous-integration/hydra/default.nix +++ b/nixos/modules/services/continuous-integration/hydra/default.nix @@ -298,6 +298,7 @@ in environment = env // { HYDRA_DBI = "${env.HYDRA_DBI};application_name=hydra-init"; }; + path = [ pkgs.util-linux ]; preStart = '' mkdir -p ${baseDir} chown hydra:hydra ${baseDir} @@ -318,11 +319,11 @@ in ${optionalString haveLocalDB '' if ! [ -e ${baseDir}/.db-created ]; then - ${pkgs.sudo}/bin/sudo -u ${config.services.postgresql.superUser} ${config.services.postgresql.package}/bin/createuser hydra - ${pkgs.sudo}/bin/sudo -u ${config.services.postgresql.superUser} ${config.services.postgresql.package}/bin/createdb -O hydra hydra + runuser -u ${config.services.postgresql.superUser} ${config.services.postgresql.package}/bin/createuser hydra + runuser -u ${config.services.postgresql.superUser} ${config.services.postgresql.package}/bin/createdb -O hydra hydra touch ${baseDir}/.db-created fi - echo "create extension if not exists pg_trgm" | ${pkgs.sudo}/bin/sudo -u ${config.services.postgresql.superUser} -- ${config.services.postgresql.package}/bin/psql hydra + echo "create extension if not exists pg_trgm" | runuser -u ${config.services.postgresql.superUser} -- ${config.services.postgresql.package}/bin/psql hydra ''} if [ ! -e ${cfg.gcRootsDir} ]; then From b1cb8f33f72a43025d85ef341cab36429f4de478 Mon Sep 17 00:00:00 2001 From: Maximilian Bosch Date: Thu, 7 Jul 2022 22:41:10 +0200 Subject: [PATCH 032/133] roundcube: 1.5.2 -> 1.5.3 ChangeLog: https://github.com/roundcube/roundcubemail/releases/tag/1.5.3 --- pkgs/servers/roundcube/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/roundcube/default.nix b/pkgs/servers/roundcube/default.nix index 285db86a133c..9376a024eceb 100644 --- a/pkgs/servers/roundcube/default.nix +++ b/pkgs/servers/roundcube/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "roundcube"; - version = "1.5.2"; + version = "1.5.3"; src = fetchurl { url = "https://github.com/roundcube/roundcubemail/releases/download/${version}/roundcubemail-${version}-complete.tar.gz"; - sha256 = "sha256-8DloOBFW/nkNhYr34GnFVQqFd/uWT5ZiRDSJUnIFODg="; + sha256 = "sha256-S8+sIZ8uAAXJEtrDIndDzB7Q3tacgi90yBpw0EHlo70="; }; patches = [ ./0001-Don-t-resolve-symlinks-when-trying-to-find-INSTALL_P.patch ]; From ea7269cd0e00ebab2fe123185c1c4706195af9d6 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 7 Jul 2022 21:00:55 +0000 Subject: [PATCH 033/133] cargo-udeps: 0.1.27 -> 0.1.30 --- pkgs/development/tools/rust/cargo-udeps/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-udeps/default.nix b/pkgs/development/tools/rust/cargo-udeps/default.nix index c8021a74441c..f6eecb224824 100644 --- a/pkgs/development/tools/rust/cargo-udeps/default.nix +++ b/pkgs/development/tools/rust/cargo-udeps/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "cargo-udeps"; - version = "0.1.27"; + version = "0.1.30"; src = fetchFromGitHub { owner = "est31"; repo = pname; rev = "v${version}"; - sha256 = "sha256-nxcrllAoS/1e5hFURtrB9e6zyHnot90PFAuyVCsO4lY="; + sha256 = "sha256-CTP8ENvaryZsoSp+9wx5SoWYXqMpwWfzjMn5kvL+gxk="; }; - cargoSha256 = "sha256-AV3fgKloQ/9UEWjYRI4gENSqilhFlpbUrXhXREytcWc="; + cargoSha256 = "sha256-Dzbogu/VqaASz7FEACavvrOIGZK2vn84IjQlCIx/Ey4="; nativeBuildInputs = [ pkg-config ]; From 19a442aae7cb5c3b2d59d53570f042fc3a40c6c0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 7 Jul 2022 21:11:13 +0000 Subject: [PATCH 034/133] discordchatexporter-cli: 2.34.1 -> 2.35 --- pkgs/tools/backup/discordchatexporter-cli/default.nix | 4 ++-- pkgs/tools/backup/discordchatexporter-cli/deps.nix | 3 +++ 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/backup/discordchatexporter-cli/default.nix b/pkgs/tools/backup/discordchatexporter-cli/default.nix index e8ebbee66056..b9499fa8fd0f 100644 --- a/pkgs/tools/backup/discordchatexporter-cli/default.nix +++ b/pkgs/tools/backup/discordchatexporter-cli/default.nix @@ -8,13 +8,13 @@ buildDotnetModule rec { pname = "discordchatexporter-cli"; - version = "2.34.1"; + version = "2.35"; src = fetchFromGitHub { owner = "tyrrrz"; repo = "discordchatexporter"; rev = version; - sha256 = "U+AwxHvyLD2BwrJH3h0yKKHBsgBM/D657TuG9IgllPs="; + sha256 = "xPHXs7lk7WaSTr5jH7q8mN1O6Z9cdD2EACx2CmLelJ8="; }; projectFile = "DiscordChatExporter.Cli/DiscordChatExporter.Cli.csproj"; diff --git a/pkgs/tools/backup/discordchatexporter-cli/deps.nix b/pkgs/tools/backup/discordchatexporter-cli/deps.nix index bdc388c18270..b00bd4c074c4 100644 --- a/pkgs/tools/backup/discordchatexporter-cli/deps.nix +++ b/pkgs/tools/backup/discordchatexporter-cli/deps.nix @@ -1,5 +1,7 @@ { fetchNuGet }: [ + (fetchNuGet { pname = "AdvancedStringBuilder"; version = "0.1.0"; sha256 = "1lpv5sggdxza0bmcqmzf5r4i340f0m7nr5073lac18naj5697q5g"; }) (fetchNuGet { pname = "CliFx"; version = "2.2.5"; sha256 = "1bk716rdswy28h53qy68xywci8k1h2iqdy2iz1yf7v8g0sa2n79p"; }) + (fetchNuGet { pname = "DotnetRuntimeBootstrapper"; version = "2.3.1"; sha256 = "0zsicyizachdam64mjm1brh5a3nzf7j8nalyhwnw26wk3v3rgmc9"; }) (fetchNuGet { pname = "Gress"; version = "2.0.1"; sha256 = "00xhyfkrlc38nbl6aymr7zwxc3kj0rxvx5gwk6fkfrvi1pzgq0wc"; }) (fetchNuGet { pname = "JsonExtensions"; version = "1.2.0"; sha256 = "0g54hibabbqqfhxjlnxwv1rxagpali5agvnpymp2w3dk8h6q66xy"; }) (fetchNuGet { pname = "MiniRazor.CodeGen"; version = "2.2.1"; sha256 = "1mrjw3vq59pbiqvayilazjgv6l87j20j8hmhcpbacz9p5bl1hvvr"; }) @@ -7,4 +9,5 @@ (fetchNuGet { pname = "Polly"; version = "7.2.3"; sha256 = "1iws4jd5iqj5nlfp16fg9p5vfqqas1si0cgh8xcj64y433a933cv"; }) (fetchNuGet { pname = "Spectre.Console"; version = "0.44.0"; sha256 = "0f4q52rmib0q3vg7ij6z73mnymyas7c7wrm8dfdhrkdzn53zwl6p"; }) (fetchNuGet { pname = "Superpower"; version = "3.0.0"; sha256 = "0p6riay4732j1fahc081dzgs9q4z3n2fpxrin4zfpj6q2226dhz4"; }) + (fetchNuGet { pname = "WebMarkupMin.Core"; version = "2.9.0"; sha256 = "1m184n0zdfxzk9vi2q9y8c8987a0c044vy97i9iginndzxvwazgg"; }) ] From 5460a68aa4e6778234785a66893ca48baf51ef7f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 7 Jul 2022 21:23:04 +0000 Subject: [PATCH 035/133] difftastic: 0.29.1 -> 0.30.0 --- pkgs/tools/text/difftastic/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/text/difftastic/default.nix b/pkgs/tools/text/difftastic/default.nix index ef117d1c1d3b..1263933f4ca4 100644 --- a/pkgs/tools/text/difftastic/default.nix +++ b/pkgs/tools/text/difftastic/default.nix @@ -9,13 +9,13 @@ rustPlatform.buildRustPackage rec { pname = "difftastic"; - version = "0.29.1"; + version = "0.30.0"; src = fetchFromGitHub { owner = "wilfred"; repo = pname; rev = version; - sha256 = "sha256-eOW+cNIE/H4VtwqbWLGSmS/UAbKMoHFBFcUaLpcPHfw="; + sha256 = "sha256-7uVrE+HDEtZsbXI/PSZOAIbAs3spSkcm+1RGrcFxKLM="; }; depsExtraArgs = { @@ -40,7 +40,7 @@ rustPlatform.buildRustPackage rec { popd ''; }; - cargoSha256 = "sha256-/z+jimIDNej1vottvqmG3exd5BpOBUfmx1qaILhLKJU="; + cargoSha256 = "sha256-SQSshOJ3+z+jHXSjWv31tsGivE4ESMHW1h58vuacQ3U="; passthru.tests.version = testers.testVersion { package = difftastic; }; From 9280eff26434a788eeb1dfffaa6eb5b937037507 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 8 Jul 2022 02:07:12 +0000 Subject: [PATCH 036/133] arc-kde-theme: 20180614 -> 20220706 --- pkgs/data/themes/arc-kde/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/themes/arc-kde/default.nix b/pkgs/data/themes/arc-kde/default.nix index ecf798364ff3..de863524aa2e 100644 --- a/pkgs/data/themes/arc-kde/default.nix +++ b/pkgs/data/themes/arc-kde/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "arc-kde-theme"; - version = "20180614"; + version = "20220706"; src = fetchFromGitHub { owner = "PapirusDevelopmentTeam"; repo = "arc-kde"; rev = version; - sha256 = "0wli16k9my7m8a9561545vjwfifmxm4w606z1h0j08msvlky40xw"; + sha256 = "sha256-k/+VhqvOg3wkqal7q7nSVpubK/yHnNoTUUWhnxwcIjM="; }; makeFlags = [ "PREFIX=$(out)" ]; From bce9c41aa6dd9e6b7a732ba14048e7c6d3811aa4 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 8 Jul 2022 03:45:26 +0000 Subject: [PATCH 037/133] bazel-gazelle: 0.25.0 -> 0.26.0 --- pkgs/development/tools/bazel-gazelle/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/bazel-gazelle/default.nix b/pkgs/development/tools/bazel-gazelle/default.nix index 0a6796185fbc..1c57aff18a8a 100644 --- a/pkgs/development/tools/bazel-gazelle/default.nix +++ b/pkgs/development/tools/bazel-gazelle/default.nix @@ -5,13 +5,13 @@ buildGoModule rec { pname = "bazel-gazelle"; - version = "0.25.0"; + version = "0.26.0"; src = fetchFromGitHub { owner = "bazelbuild"; repo = pname; rev = "v${version}"; - sha256 = "sha256-wMhFhJruXHuAq81A4efxvR9eJ5YTp7QTnr1gj8RrIX8="; + sha256 = "sha256-f+4XeH282VbasY6ShSNLsesn1OR8wb6kePU808UQWpw="; }; vendorSha256 = null; From d65897fdcb6586f3b0558cc7f7ef391571fdd782 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 8 Jul 2022 04:30:21 +0000 Subject: [PATCH 038/133] bschaffl: 1.4.8 -> 1.4.10 --- pkgs/applications/audio/bschaffl/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/bschaffl/default.nix b/pkgs/applications/audio/bschaffl/default.nix index eabdad3caa9c..c6dd87915229 100644 --- a/pkgs/applications/audio/bschaffl/default.nix +++ b/pkgs/applications/audio/bschaffl/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "bschaffl"; - version = "1.4.8"; + version = "1.4.10"; src = fetchFromGitHub { owner = "sjaehn"; repo = pname; rev = version; - sha256 = "sha256-zczDqJdUAN2oSyIRt9m3OnwOWXlwL4Yod8UMCXs5zM0="; + sha256 = "sha256-zfhPYH4eUNWHV27ZtX2IIvobyPdKs5yGr/ryJRQa6as="; }; nativeBuildInputs = [ pkg-config ]; From de230234380bcb1c9c3da8837f055dc75c9267a8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 8 Jul 2022 04:46:40 +0000 Subject: [PATCH 039/133] cargo-binutils: 0.3.3 -> 0.3.6 --- pkgs/development/tools/rust/cargo-binutils/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-binutils/default.nix b/pkgs/development/tools/rust/cargo-binutils/default.nix index d2f5471f3672..81a973547db6 100644 --- a/pkgs/development/tools/rust/cargo-binutils/default.nix +++ b/pkgs/development/tools/rust/cargo-binutils/default.nix @@ -2,14 +2,14 @@ rustPlatform.buildRustPackage rec { pname = "cargo-binutils"; - version = "0.3.3"; + version = "0.3.6"; src = fetchCrate { inherit pname version; - sha256 = "sha256-1sJ+vi78lZsYEQBDyUzifdiU47R1Z6Y8ejNI9h5U+Ao="; + sha256 = "sha256-tRh3+X6QCdkkJE1O60ZRkDBRbznGZ1aB1AOmcz0EINI="; }; - cargoSha256 = "sha256-kZhxKwSEI24LNJ9lPPjtX5etE0XeqaVN7h3HTzpoAY0="; + cargoSha256 = "sha256-lZJcsCg7e5ZmClnzKFjm/roXBIyhkPTzS7R6BTmcNIk="; meta = with lib; { description = "Cargo subcommands to invoke the LLVM tools shipped with the Rust toolchain"; From 8bf5c1d44c4de0db533272ab5c8f5be37e6de011 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 8 Jul 2022 04:57:18 +0000 Subject: [PATCH 040/133] carp: 0.5.4 -> 0.5.5 --- pkgs/development/compilers/carp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/carp/default.nix b/pkgs/development/compilers/carp/default.nix index 6941e5f71b18..209fc6aed611 100644 --- a/pkgs/development/compilers/carp/default.nix +++ b/pkgs/development/compilers/carp/default.nix @@ -2,13 +2,13 @@ haskellPackages.mkDerivation rec { pname = "carp"; - version = "0.5.4"; + version = "0.5.5"; src = fetchFromGitHub { owner = "carp-lang"; repo = "Carp"; rev = "v${version}"; - sha256 = "sha256-o7NLd7jC1BvcoVzbD18LvHg/SqOnfn9yELUrpg2uZtY="; + sha256 = "sha256-B7SBzjegFzL2gGivIJE6BZcLD3f0Bsh8yndjScG2TZI="; }; # -Werror breaks build with GHC >= 9.0 From d39186531eeee59520af328b9bdda67bc95f13da Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 8 Jul 2022 06:00:26 +0000 Subject: [PATCH 041/133] clickhouse-backup: 1.4.0 -> 1.4.7 --- .../tools/database/clickhouse-backup/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/database/clickhouse-backup/default.nix b/pkgs/development/tools/database/clickhouse-backup/default.nix index 239fb50ae40f..2d3cec52af2d 100644 --- a/pkgs/development/tools/database/clickhouse-backup/default.nix +++ b/pkgs/development/tools/database/clickhouse-backup/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "clickhouse-backup"; - version = "1.4.0"; + version = "1.4.7"; src = fetchFromGitHub { owner = "AlexAkulov"; repo = pname; rev = "v${version}"; - sha256 = "sha256-NlOYRgCsReEeP/X98fddVRLnTnkqsiwpCg6MpdRcfZ0="; + sha256 = "sha256-1lkG8Rboq6t/hRrdAweo3Kxz9IkukQ39sQSpidFTElw="; }; - vendorSha256 = "sha256-F+FfZESB/m/2m4RnYzFPs0PL5+8lyxzEwAdHMykrFsw="; + vendorSha256 = "sha256-N4zAdylb7etNknR0/VjIVkuI6kTWlk137HNT03Y2gWs="; postConfigure = '' export CGO_ENABLED=0 From bc41a593a5ce8f06dca53ca17010456c1c12d50d Mon Sep 17 00:00:00 2001 From: Mauricio Collares Date: Fri, 8 Jul 2022 11:23:46 +0200 Subject: [PATCH 042/133] singular: 4.3.0 -> 4.3.1 --- pkgs/applications/science/math/singular/default.nix | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/science/math/singular/default.nix b/pkgs/applications/science/math/singular/default.nix index aad3eaf529a0..c1ada27d581e 100644 --- a/pkgs/applications/science/math/singular/default.nix +++ b/pkgs/applications/science/math/singular/default.nix @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { pname = "singular"; - version = "4.3.0"; + version = "4.3.1"; # since the tarball does not contain tests, we fetch from GitHub. src = fetchFromGitHub { @@ -33,9 +33,8 @@ stdenv.mkDerivation rec { # if a release is tagged (which sometimes does not happen), it will # be in the format below. - # rev = "Release-${lib.replaceStrings ["."] ["-"] version}"; - rev = "d895b0f1f543c61eb03adddad20f08655a419d4e"; - sha256 = "sha256-c5Qr6VUuPKjfw8fowjJJz3oGAyUwo/K0WeMvU5djzVA="; + rev = "Release-${lib.replaceStrings ["."] ["-"] version}"; + sha256 = "sha256-3r3epwaVbyveyYtmfxuevO4Q52J6FbI6RRqiaHQGJIk="; # the repository's .gitattributes file contains the lines "/Tst/ # export-ignore" and "/doc/ export-ignore" so some directories are From 9ec702a44c2ab8906d4a31d07f6f90967ae01772 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 8 Jul 2022 09:26:57 +0000 Subject: [PATCH 043/133] erigon: 2022.07.01 -> 2022.07.02 --- pkgs/applications/blockchains/erigon.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/blockchains/erigon.nix b/pkgs/applications/blockchains/erigon.nix index 8f3159911ac6..0f127c4f0d47 100644 --- a/pkgs/applications/blockchains/erigon.nix +++ b/pkgs/applications/blockchains/erigon.nix @@ -2,17 +2,17 @@ buildGoModule rec { pname = "erigon"; - version = "2022.07.01"; + version = "2022.07.02"; src = fetchFromGitHub { owner = "ledgerwatch"; repo = pname; rev = "v${version}"; - sha256 = "sha256-UoK6pPGVeIrubM6vdZBQCE+lgcFthOxZXviyLD86wxg="; + sha256 = "sha256-/aT8E60dCk5spj5l5Zw/8FL1LfzXWYi7agiLflLYI5c="; fetchSubmodules = true; }; - vendorSha256 = "sha256-lIukjt/QtidijB1KmWQBlSFZqdh1PwhZNP2U73/beiU="; + vendorSha256 = "sha256-NBWK0wsUbv4bFbmW3xGaQ7LCgmgfRF5zbc/awm8ZZZY="; proxyVendor = true; # Build errors in mdbx when format hardening is enabled: From 6c85a9eafbf3e7c46af9da4c95a0f7f40391a614 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 8 Jul 2022 11:43:45 +0000 Subject: [PATCH 044/133] gdcm: 3.0.12 -> 3.0.14 --- pkgs/development/libraries/gdcm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/gdcm/default.nix b/pkgs/development/libraries/gdcm/default.nix index cfc4fc6d1b5f..1b1eb036ef9a 100644 --- a/pkgs/development/libraries/gdcm/default.nix +++ b/pkgs/development/libraries/gdcm/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "gdcm"; - version = "3.0.12"; + version = "3.0.14"; src = fetchFromGitHub { owner = "malaterre"; repo = "GDCM"; rev = "v${version}"; - sha256 = "sha256-ChHsbnX+128ZOugL6Nc8EqfaDMaNMNDmKTN55pyyem8="; + sha256 = "sha256-gXREvxgGpIBo5oVxxal+Xdwk0WFZufuJKGzABzhB7zM="; }; cmakeFlags = [ From bf67d1e09d0192646de77f3182d86984a34a6bcb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 8 Jul 2022 13:53:39 +0200 Subject: [PATCH 045/133] git-extras: fix lazy bash-completion loading when loaded through XDG_DATA_DIRS --- .../git-and-tools/git-extras/default.nix | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/version-management/git-and-tools/git-extras/default.nix b/pkgs/applications/version-management/git-and-tools/git-extras/default.nix index f0932fde2d5e..6e2377bbec4b 100644 --- a/pkgs/applications/version-management/git-and-tools/git-extras/default.nix +++ b/pkgs/applications/version-management/git-and-tools/git-extras/default.nix @@ -1,4 +1,10 @@ -{ lib, stdenv, fetchFromGitHub, unixtools, which }: +{ lib +, stdenv +, fetchFromGitHub +, fetchpatch +, unixtools +, which +}: stdenv.mkDerivation rec { pname = "git-extras"; @@ -11,6 +17,13 @@ stdenv.mkDerivation rec { sha256 = "sha256-Cn7IXMzgg0QIsNIHz+X14Gkmop0UbsSBlGlGkmg71ek="; }; + patches = [ + (fetchpatch { + url = "https://github.com/tj/git-extras/commit/66961ad4911cd0f1a908530f2b725bacc7d198e1.patch"; + sha256 = "sha256-iC1lUf/NmuAPADxDWZ2JScHIMgYjIaR0edlGpq0qCOc="; + }) + ]; + postPatch = '' patchShebangs check_dependencies.sh ''; From c2458eb1ae256931387ec53f3fcb6c7afbb7cb64 Mon Sep 17 00:00:00 2001 From: Jonas Heinrich Date: Fri, 8 Jul 2022 13:54:10 +0200 Subject: [PATCH 046/133] zabbix-cli: 2.2.1 -> 2.3.0 --- pkgs/tools/misc/zabbix-cli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/zabbix-cli/default.nix b/pkgs/tools/misc/zabbix-cli/default.nix index 3732361ea834..d77be7326d0b 100644 --- a/pkgs/tools/misc/zabbix-cli/default.nix +++ b/pkgs/tools/misc/zabbix-cli/default.nix @@ -5,14 +5,14 @@ python3.pkgs.buildPythonApplication rec { pname = "zabbix-cli"; - version = "2.2.1"; + version = "2.3.0"; format = "setuptools"; src = fetchFromGitHub { owner = "usit-gd"; repo = "zabbix-cli"; rev = version; - sha256 = "0wzmrn8p09ksqhhgawr179c4az7p2liqr0l4q2dra62bxliawyqz"; + sha256 = "sha256-t8iVsdoJEHXtq9KK0WUGUX65zekKv8yzNoe8XgeeHd0="; }; propagatedBuildInputs = with python3.pkgs; [ From e9fe7c8aab9d5401104bf3664d5cfcb8c8c2cae5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 8 Jul 2022 13:54:25 +0200 Subject: [PATCH 047/133] python310Packages.python-swiftclient: fix lazy bash-completion loading when loaded through XDG_DATA_DIRS, install man pages --- .../python-modules/python-swiftclient/default.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/python-swiftclient/default.nix b/pkgs/development/python-modules/python-swiftclient/default.nix index 357ba701d18f..bf0149e9e17e 100644 --- a/pkgs/development/python-modules/python-swiftclient/default.nix +++ b/pkgs/development/python-modules/python-swiftclient/default.nix @@ -1,6 +1,7 @@ { lib , buildPythonApplication , fetchPypi +, installShellFiles , mock , openstacksdk , pbr @@ -21,6 +22,10 @@ buildPythonApplication rec { hash = "sha256-V7bx/yO0ZoQ4AqaBb0trvGiWtq0F1ld6/udiK+OilTg="; }; + nativeBuildInputs = [ + installShellFiles + ]; + propagatedBuildInputs = [ pbr python-keystoneclient @@ -33,7 +38,9 @@ buildPythonApplication rec { ]; postInstall = '' - install -Dm644 tools/swift.bash_completion $out/share/bash_completion.d/swift + installShellCompletion --cmd swift \ + --bash tools/swift.bash_completion + installManPage doc/manpages/* ''; checkPhase = '' From 4a05028cd674b710b3912bea43b43cfc584e7601 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 8 Jul 2022 13:54:37 +0200 Subject: [PATCH 048/133] python310Packages.swift: install man pages --- pkgs/development/python-modules/swift/default.nix | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/swift/default.nix b/pkgs/development/python-modules/swift/default.nix index e06e7917be18..6457a4521a40 100644 --- a/pkgs/development/python-modules/swift/default.nix +++ b/pkgs/development/python-modules/swift/default.nix @@ -6,6 +6,7 @@ , eventlet , greenlet , iana-etc +, installShellFiles , libredirect , lxml , mock @@ -35,7 +36,10 @@ buildPythonPackage rec { rm test/functional/s3api/{__init__.py,s3_test_client.py} ''; - nativeBuildInputs = [ pbr ]; + nativeBuildInputs = [ + installShellFiles + pbr + ]; propagatedBuildInputs = [ cryptography @@ -51,6 +55,10 @@ buildPythonPackage rec { xattr ]; + postInstall = '' + installManPage doc/manpages/* + ''; + checkInputs = [ boto3 mock From cb52964d77b610b6a89b383473605a2ef6baf44e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Fri, 8 Jul 2022 12:00:12 +0000 Subject: [PATCH 049/133] gef: 2022.01 -> 2022.06 --- pkgs/development/tools/misc/gef/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/misc/gef/default.nix b/pkgs/development/tools/misc/gef/default.nix index b09cc795d8c0..cfc6f1b5de6f 100644 --- a/pkgs/development/tools/misc/gef/default.nix +++ b/pkgs/development/tools/misc/gef/default.nix @@ -21,13 +21,13 @@ let in stdenv.mkDerivation rec { pname = "gef"; - version = "2022.01"; + version = "2022.06"; src = fetchFromGitHub { owner = "hugsy"; repo = "gef"; rev = version; - sha256 = "sha256-Ot0OYMbXFGCzJdmDHD+LoZRDShCbYJ+IGzLTcU2Rfd4="; + sha256 = "sha256-XMm4K5X3F5DDtI/usHxNZwqzYpjck8sVaZIYKGuE6Qc="; }; dontBuild = true; From 871b935d7db63c827b29f71e2908c01aff91fcf6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 8 Jul 2022 14:19:36 +0200 Subject: [PATCH 050/133] goreleaser: 1.10.1 -> 1.10.2 --- pkgs/tools/misc/goreleaser/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/goreleaser/default.nix b/pkgs/tools/misc/goreleaser/default.nix index 9c1c36da9ee5..7ba3de825f7b 100644 --- a/pkgs/tools/misc/goreleaser/default.nix +++ b/pkgs/tools/misc/goreleaser/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "goreleaser"; - version = "1.10.1"; + version = "1.10.2"; src = fetchFromGitHub { owner = "goreleaser"; repo = pname; rev = "v${version}"; - sha256 = "sha256-m42Gu1ExHs29cCTWo8V2q67bXBJ4kyn2ElR9kqVREjU="; + sha256 = "sha256-v9/zy7wHqZexaIn3iVDvr3RQNGncnNqqcl88kNDBAfQ="; }; - vendorSha256 = "sha256-/fZbKLmGhB8b33NqLkETtYa664ZEq+KY8GJ4pOZJhLo="; + vendorSha256 = "sha256-sJHq2ZSeCpUXhcF5HZQxIE0Jkutnc/m86NcaDNs7a7A="; ldflags = [ "-s" From d440cc931eea01c3237a9a470c9dc1a695684988 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Fri, 8 Jul 2022 16:48:51 +0000 Subject: [PATCH 051/133] nixosTests.hardened: disable dhcpcd privsep Since 831024e2b93 ("nixos/dhcpcd: assert if privSep && alternative malloc"), this test has an assertion failure because dhcpcd (with privsep enabled) is not compatible with the allocator used by the hardened profile. Since it's unclear[1] what to do about this for the hardened profile, I propose doing the simplest thing possible to make the test eval, which is to just disable dhcpcd privsep. It's very inconvenient when trying to refactor the NixOS test infrastructure to have a test that doesn't evaluate. Once the correct solution is found for using dhcpcd with privsep with the hardened profile, this patch can be reverted. [1]: https://github.com/NixOS/nixpkgs/pull/157430 --- nixos/tests/hardened.nix | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/nixos/tests/hardened.nix b/nixos/tests/hardened.nix index 3afa8ebf2b5f..4e2ca4f273a7 100644 --- a/nixos/tests/hardened.nix +++ b/nixos/tests/hardened.nix @@ -12,6 +12,11 @@ import ./make-test-python.nix ({ pkgs, ... } : { imports = [ ../modules/profiles/hardened.nix ]; environment.memoryAllocator.provider = "graphene-hardened"; nix.settings.sandbox = false; + nixpkgs.overlays = [ + (final: super: { + dhcpcd = super.dhcpcd.override { enablePrivSep = false; }; + }) + ]; virtualisation.emptyDiskImages = [ 4096 ]; boot.initrd.postDeviceCommands = '' ${pkgs.dosfstools}/bin/mkfs.vfat -n EFISYS /dev/vdb From a14da86f2cfe5038ed84d3db5663c5138839fa97 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Fri, 8 Jul 2022 17:01:41 +0000 Subject: [PATCH 052/133] nixosTests.hardened: fix for recent Nix As far as I know, there's no stable equivalent of nix ping-store. --- nixos/tests/hardened.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/tests/hardened.nix b/nixos/tests/hardened.nix index 4e2ca4f273a7..ccb858168547 100644 --- a/nixos/tests/hardened.nix +++ b/nixos/tests/hardened.nix @@ -90,8 +90,8 @@ import ./make-test-python.nix ({ pkgs, ... } : { # Test Nix dæmon usage with subtest("nix-daemon cannot be used by all users"): - machine.fail("su -l nobody -s /bin/sh -c 'nix ping-store'") - machine.succeed("su -l alice -c 'nix ping-store'") + machine.fail("su -l nobody -s /bin/sh -c 'nix --extra-experimental-features nix-command ping-store'") + machine.succeed("su -l alice -c 'nix --extra-experimental-features nix-command ping-store'") # Test kernel image protection From 987b20bfe9c7cd6faab22976124d61431ff91a01 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabi=C3=A1n=20Heredia=20Montiel?= Date: Fri, 8 Jul 2022 13:23:04 -0500 Subject: [PATCH 053/133] =?UTF-8?q?androidStudioPackages.stable:=202021.2.?= =?UTF-8?q?1.14=20=E2=86=92=202021.2.1.15?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/applications/editors/android-studio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix index 605d90eaab9d..2ceedf3c6233 100644 --- a/pkgs/applications/editors/android-studio/default.nix +++ b/pkgs/applications/editors/android-studio/default.nix @@ -10,8 +10,8 @@ let inherit tiling_wm; }; stableVersion = { - version = "2021.2.1.14"; # "Android Studio Chipmunk (2021.2.1)" - sha256Hash = "1cy7ngm160w819ikrd459kg6lnk1k16jjnjm3d0aksmlws5b12z9"; + version = "2021.2.1.15"; # "Android Studio Chipmunk (2021.2.1)" + sha256Hash = "ABjg38DdKSFwBRb3osRDN3xVd4jaf7CkUkPstDAHRb4="; }; betaVersion = { version = "2021.2.1.11"; # "Android Studio Chipmunk (2021.2.1) Beta 4" From ad3e35365ad2a47259e0e697811a368b3eae9fd1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabi=C3=A1n=20Heredia=20Montiel?= Date: Fri, 8 Jul 2022 13:28:41 -0500 Subject: [PATCH 054/133] =?UTF-8?q?androidStudioPackages.beta:=202021.2.1.?= =?UTF-8?q?11=20=E2=86=92=202022.3.1.14?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/applications/editors/android-studio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix index 2ceedf3c6233..b12e1b3ef44a 100644 --- a/pkgs/applications/editors/android-studio/default.nix +++ b/pkgs/applications/editors/android-studio/default.nix @@ -14,8 +14,8 @@ let sha256Hash = "ABjg38DdKSFwBRb3osRDN3xVd4jaf7CkUkPstDAHRb4="; }; betaVersion = { - version = "2021.2.1.11"; # "Android Studio Chipmunk (2021.2.1) Beta 4" - sha256Hash = "0in8x6v957y9hsnz5ak845pdpvgvnvlm0s6r9y8f27zkm947vbjd"; + version = "2021.3.1.14"; # "Android Studio Dolphin (2021.3.1) Beta 5" + sha256Hash = "k1Qt54u45rwHsQNz9TVqnFB65kBKtfFZ3OknpfutKPI="; }; latestVersion = { # canary & dev version = "2021.3.1.9"; # "Android Studio Dolphin (2021.3.1) Canary 9" From 0996a97b916a50d584cb5dd5de9a5769b38160ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabi=C3=A1n=20Heredia=20Montiel?= Date: Fri, 8 Jul 2022 13:30:54 -0500 Subject: [PATCH 055/133] =?UTF-8?q?androidStudioPackages.canary:=202021.3.?= =?UTF-8?q?1.9=20=E2=86=92=202022.1.1.8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/applications/editors/android-studio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/android-studio/default.nix b/pkgs/applications/editors/android-studio/default.nix index b12e1b3ef44a..b25ee1ac6cdc 100644 --- a/pkgs/applications/editors/android-studio/default.nix +++ b/pkgs/applications/editors/android-studio/default.nix @@ -18,8 +18,8 @@ let sha256Hash = "k1Qt54u45rwHsQNz9TVqnFB65kBKtfFZ3OknpfutKPI="; }; latestVersion = { # canary & dev - version = "2021.3.1.9"; # "Android Studio Dolphin (2021.3.1) Canary 9" - sha256Hash = "0nx26xwy67mnbkz37m3nw354siv152sa6zx94pxrvbnxxgppigfb"; + version = "2022.1.1.8"; # "Android Studio Electric Eel (2022.1.1) Canary 8" + sha256Hash = "0bZXx4YpMztLAnwuBaSaNT3GJNfYnqCDanwR+Q7qyUc="; }; in { # Attributes are named by their corresponding release channels From 03dd01dd2fbba721f9f1a4c757e55cf2c6e15345 Mon Sep 17 00:00:00 2001 From: K900 Date: Sun, 19 Jun 2022 17:08:48 +0300 Subject: [PATCH 056/133] nixos: add module for tempo It's very barebones but should be OK for now. --- .../from_md/release-notes/rl-2211.section.xml | 7 ++ .../manual/release-notes/rl-2211.section.md | 2 + nixos/modules/module-list.nix | 1 + nixos/modules/services/tracing/tempo.nix | 68 +++++++++++++++++++ 4 files changed, 78 insertions(+) create mode 100644 nixos/modules/services/tracing/tempo.nix diff --git a/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml index 83f3c4a03bf9..04e1529148ed 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml @@ -90,6 +90,13 @@ services.expressvpn. + + + Grafana + Tempo, a distributed tracing store. Available as + services.tempo. + +
diff --git a/nixos/doc/manual/release-notes/rl-2211.section.md b/nixos/doc/manual/release-notes/rl-2211.section.md index 2c5cc7c633cf..a546d4cd9f3d 100644 --- a/nixos/doc/manual/release-notes/rl-2211.section.md +++ b/nixos/doc/manual/release-notes/rl-2211.section.md @@ -35,6 +35,8 @@ In addition to numerous new and upgraded packages, this release has the followin - [expressvpn](https://www.expressvpn.com), the CLI client for ExpressVPN. Available as [services.expressvpn](#opt-services.expressvpn.enable). +- [Grafana Tempo](https://www.grafana.com/oss/tempo/), a distributed tracing store. Available as [services.tempo](#opt-services.tempo.enable). + ## Backward Incompatibilities {#sec-release-22.11-incompatibilities} diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 2062b8335476..2bc1dff67300 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -1027,6 +1027,7 @@ ./services/torrent/peerflix.nix ./services/torrent/rtorrent.nix ./services/torrent/transmission.nix + ./services/tracing/tempo.nix ./services/ttys/getty.nix ./services/ttys/gpm.nix ./services/ttys/kmscon.nix diff --git a/nixos/modules/services/tracing/tempo.nix b/nixos/modules/services/tracing/tempo.nix new file mode 100644 index 000000000000..15491a51c8e9 --- /dev/null +++ b/nixos/modules/services/tracing/tempo.nix @@ -0,0 +1,68 @@ +{ config, lib, pkgs, ... }: + +let + inherit (lib) mkEnableOption mkIf mkOption types; + + cfg = config.services.tempo; + + settingsFormat = pkgs.formats.yaml {}; +in { + options.services.tempo = { + enable = mkEnableOption "Grafana Tempo"; + + settings = mkOption { + type = settingsFormat.type; + default = {}; + description = '' + Specify the configuration for Tempo in Nix. + + See https://grafana.com/docs/tempo/latest/configuration/ for available options. + ''; + }; + + configFile = mkOption { + type = types.nullOr types.path; + default = null; + description = '' + Specify a path to a configuration file that Tempo should use. + ''; + }; + }; + + config = mkIf cfg.enable { + # for tempo-cli and friends + environment.systemPackages = [ pkgs.tempo ]; + + assertions = [{ + assertion = ( + (cfg.settings == {}) != (cfg.configFile == null) + ); + message = '' + Please specify a configuration for Tempo with either + 'services.tempo.settings' or + 'services.tempo.configFile'. + ''; + }]; + + systemd.services.tempo = { + description = "Grafana Tempo Service Daemon"; + wantedBy = [ "multi-user.target" ]; + + serviceConfig = let + conf = if cfg.configFile == null + then settingsFormat.generate "config.yaml" cfg.settings + else cfg.configFile; + in + { + ExecStart = "${pkgs.tempo}/bin/tempo --config.file=${conf}"; + DynamicUser = true; + Restart = "always"; + ProtectSystem = "full"; + DevicePolicy = "closed"; + NoNewPrivileges = true; + WorkingDirectory = "/var/lib/tempo"; + StateDirectory = "tempo"; + }; + }; + }; +} From 7e4e497c43b592557d9b19766493a33d499bd838 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabi=C3=A1n=20Heredia=20Montiel?= Date: Fri, 8 Jul 2022 16:28:45 -0500 Subject: [PATCH 057/133] =?UTF-8?q?kotlin:=201.7.0=20=E2=86=92=201.7.10?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/compilers/kotlin/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/kotlin/default.nix b/pkgs/development/compilers/kotlin/default.nix index 33eb313cdc05..450659498f50 100644 --- a/pkgs/development/compilers/kotlin/default.nix +++ b/pkgs/development/compilers/kotlin/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "kotlin"; - version = "1.7.0"; + version = "1.7.10"; src = fetchurl { url = "https://github.com/JetBrains/kotlin/releases/download/v${version}/kotlin-compiler-${version}.zip"; - hash = "sha256-9SFmRK2BVx5dti7CMi/gdGiSe9pA9RFH7WJqKIS1X5o="; + hash = "sha256-doP1RR7zCOt3Omhu53eadqle2LFDxprCR5N2GdfKOgk="; }; propagatedBuildInputs = [ jre ] ; From d64ee0ff26da38a6f5cd8fe9f97348f45124b097 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabi=C3=A1n=20Heredia=20Montiel?= Date: Fri, 8 Jul 2022 16:28:54 -0500 Subject: [PATCH 058/133] =?UTF-8?q?kotlin-native:=201.7.0=20=E2=86=92=201.?= =?UTF-8?q?7.10?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/compilers/kotlin/native.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/compilers/kotlin/native.nix b/pkgs/development/compilers/kotlin/native.nix index 99e29cd0530d..dedfaa41d2e7 100644 --- a/pkgs/development/compilers/kotlin/native.nix +++ b/pkgs/development/compilers/kotlin/native.nix @@ -7,7 +7,7 @@ stdenv.mkDerivation rec { pname = "kotlin-native"; - version = "1.7.0"; + version = "1.7.10"; src = let getArch = { @@ -20,9 +20,9 @@ stdenv.mkDerivation rec { "https://github.com/JetBrains/kotlin/releases/download/v${version}/kotlin-native-${arch}-${version}.tar.gz"; getHash = arch: { - "macos-aarch64" = "sha256-Xx9MH7QJDCfbPK9fA5U1ZoVbuLoIJyy7QEFMlCD9JXw="; - "macos-x86_64" = "sha256-s5qFpuWeke7LCfUSkNyXBOgWdSJ1+cs6g7mU1osU/J8="; - "linux-x86_64" = "sha256-CnDam72UBSM/aNelhj0JjLNy9gFx5WIPAjtvubnpmpw="; + "macos-aarch64" = "sha256-wCvld/VBpcc+GvdVNABu6m4Jz2ezqIbzI9rm8EBryz4="; + "macos-x86_64" = "sha256-TpRwwl4Mazt56GpZx+yk15xaKMpRXoDbk1BFNbIzKgA="; + "linux-x86_64" = "sha256-uHQ3Poc4G5TGo4UXjqlZSltM/rL7rivYnTy4TJa8O5Y="; }.${arch}; in fetchurl { From 478940e2c7cfc1d21418e4e78c81734636b9a190 Mon Sep 17 00:00:00 2001 From: squalus Date: Fri, 8 Jul 2022 17:40:24 -0700 Subject: [PATCH 059/133] librewolf: add nixos test - support librewolf in the firefox nixos test - use the correct binary name - ensure autoplay is always on for the audio test, since librewolf disables it by default --- nixos/tests/all-tests.nix | 1 + nixos/tests/firefox.nix | 19 ++++++++++++++----- .../networking/browsers/librewolf/default.nix | 3 ++- 3 files changed, 17 insertions(+), 6 deletions(-) diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index 5164451cbe03..3253a3c750be 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -278,6 +278,7 @@ in { libreddit = handleTest ./libreddit.nix {}; libresprite = handleTest ./libresprite.nix {}; libreswan = handleTest ./libreswan.nix {}; + librewolf = handleTest ./firefox.nix { firefoxPackage = pkgs.librewolf; }; lidarr = handleTest ./lidarr.nix {}; lightdm = handleTest ./lightdm.nix {}; limesurvey = handleTest ./limesurvey.nix {}; diff --git a/nixos/tests/firefox.nix b/nixos/tests/firefox.nix index 63ccc6efb5bb..9bb78a97f36d 100644 --- a/nixos/tests/firefox.nix +++ b/nixos/tests/firefox.nix @@ -1,5 +1,14 @@ -import ./make-test-python.nix ({ pkgs, firefoxPackage, ... }: { - name = "firefox"; +import ./make-test-python.nix ({ pkgs, firefoxPackage, ... }: +let firefoxPackage' = firefoxPackage.override (args: { + extraPrefsFiles = (args.extraPrefsFiles or []) ++ [ + # make sure that autoplay is enabled by default for the audio test + (builtins.toString (builtins.toFile "autoplay-pref.js" ''defaultPref("media.autoplay.default",0);'')) + ]; + }); + +in +{ + name = firefoxPackage'.unwrapped.binaryName; meta = with pkgs.lib.maintainers; { maintainers = [ eelco shlevy ]; }; @@ -9,7 +18,7 @@ import ./make-test-python.nix ({ pkgs, firefoxPackage, ... }: { { imports = [ ./common/x11.nix ]; environment.systemPackages = [ - firefoxPackage + firefoxPackage' pkgs.xdotool ]; @@ -88,7 +97,7 @@ import ./make-test-python.nix ({ pkgs, firefoxPackage, ... }: { with subtest("Wait until Firefox has finished loading the Valgrind docs page"): machine.execute( - "xterm -e 'firefox file://${pkgs.valgrind.doc}/share/doc/valgrind/html/index.html' >&2 &" + "xterm -e '${firefoxPackage'.unwrapped.binaryName} file://${pkgs.valgrind.doc}/share/doc/valgrind/html/index.html' >&2 &" ) machine.wait_for_window("Valgrind") machine.sleep(40) @@ -96,7 +105,7 @@ import ./make-test-python.nix ({ pkgs, firefoxPackage, ... }: { with subtest("Check whether Firefox can play sound"): with record_audio(machine): machine.succeed( - "firefox file://${pkgs.sound-theme-freedesktop}/share/sounds/freedesktop/stereo/phone-incoming-call.oga >&2 &" + "${firefoxPackage'.unwrapped.binaryName} file://${pkgs.sound-theme-freedesktop}/share/sounds/freedesktop/stereo/phone-incoming-call.oga >&2 &" ) wait_for_sound(machine) machine.copy_from_vm("/tmp/record.wav") diff --git a/pkgs/applications/networking/browsers/librewolf/default.nix b/pkgs/applications/networking/browsers/librewolf/default.nix index bec0c3a9eda9..55451167e0a8 100644 --- a/pkgs/applications/networking/browsers/librewolf/default.nix +++ b/pkgs/applications/networking/browsers/librewolf/default.nix @@ -1,4 +1,4 @@ -{ stdenv, lib, callPackage, buildMozillaMach }: +{ stdenv, lib, callPackage, buildMozillaMach, nixosTests }: let librewolf-src = callPackage ./librewolf.nix { }; @@ -22,6 +22,7 @@ in maxSilent = 14400; # 4h, double the default of 7200s (c.f. #129212, #129115) license = lib.licenses.mpl20; }; + tests = [ nixosTests.librewolf ]; updateScript = callPackage ./update.nix { attrPath = "librewolf-unwrapped"; }; From 47f9f047883996aa54defa9cda7ccd7e04df7901 Mon Sep 17 00:00:00 2001 From: Dominique Martinet Date: Sat, 9 Jul 2022 10:29:40 +0900 Subject: [PATCH 060/133] linux-kernel config: disable DEBUG_INFO_REDUCED Linux's aarch64 defconfig has been updated in 5.13 to enable "reduced" debug infos (upstream commit ed938a4bfc58 ("arm64: defconfig: Use DEBUG_INFO_REDUCED"), but that commits locks DEBUG_INFO_BTF as noticed in #175467 This disables it back which should fix bpftrace usage of BTF not working on newer kernels. --- pkgs/os-specific/linux/kernel/common-config.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/os-specific/linux/kernel/common-config.nix b/pkgs/os-specific/linux/kernel/common-config.nix index 5f0d5d380991..59f89296dcd9 100644 --- a/pkgs/os-specific/linux/kernel/common-config.nix +++ b/pkgs/os-specific/linux/kernel/common-config.nix @@ -41,6 +41,9 @@ let (whenBetween "5.2" "5.18" yes) ]; DEBUG_INFO_DWARF_TOOLCHAIN_DEFAULT = whenAtLeast "5.18" yes; + # Reduced debug info conflict with BTF and have been enabled in + # aarch64 defconfig since 5.13 + DEBUG_INFO_REDUCED = whenAtLeast "5.13" (option no); # Disabled on 32-bit platforms, fails to build on 5.15+ with `Failed to parse base BTF 'vmlinux': -22` DEBUG_INFO_BTF = whenAtLeast "5.2" (option (if stdenv.hostPlatform.is32bit && (versionAtLeast version "5.15") then no else yes)); BPF_LSM = whenAtLeast "5.7" (option yes); From dcb5e9baa0d662b4387d5c9162b52ff5acdb67f0 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 9 Jul 2022 04:20:00 +0000 Subject: [PATCH 061/133] kbs2: 0.5.1 -> 0.6.0 https://github.com/woodruffw/kbs2/releases/tag/v0.6.0 --- pkgs/tools/security/kbs2/default.nix | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/pkgs/tools/security/kbs2/default.nix b/pkgs/tools/security/kbs2/default.nix index beaa06fd8360..acda29b53ac8 100644 --- a/pkgs/tools/security/kbs2/default.nix +++ b/pkgs/tools/security/kbs2/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "kbs2"; - version = "0.5.1"; + version = "0.6.0"; src = fetchFromGitHub { owner = "woodruffw"; repo = pname; rev = "v${version}"; - sha256 = "sha256-GKjumkeo7aAYaECa6NoXCiXU2kqekBX3wCysRz8seW4="; + sha256 = "sha256-clbd4xHHGpFIr4s3Jocw4oQ3GbyGWMxZEVgj6JpVK94="; }; - cargoSha256 = "sha256-rJ110kd18V2VGj0AHix3/vI09FG2kJ+TTOYKIthIrjQ="; + cargoSha256 = "sha256-gfrC9TOs/Vz3K1gVr6MJ1QAKCE5WOD8VZ/tjOw3Y1uI="; nativeBuildInputs = [ installShellFiles ] ++ lib.optionals stdenv.isLinux [ python3 ]; @@ -30,10 +30,10 @@ rustPlatform.buildRustPackage rec { postInstall = '' mkdir -p $out/share/kbs2 cp -r contrib/ $out/share/kbs2 - for shell in bash fish zsh; do - $out/bin/kbs2 --completions $shell > kbs2.$shell - installShellCompletion kbs2.$shell - done + installShellCompletion --cmd kbs2 \ + --bash <($out/bin/kbs2 --completions bash) \ + --fish <($out/bin/kbs2 --completions fish) \ + --zsh <($out/bin/kbs2 --completions zsh) ''; meta = with lib; { From 4578f6997d035a88bda8d515a1599f15f84601f9 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 9 Jul 2022 04:20:00 +0000 Subject: [PATCH 062/133] python310Packages.unidiff: 0.7.3 -> 0.7.4 https://github.com/matiasb/python-unidiff/releases/tag/v0.7.4 --- pkgs/development/python-modules/unidiff/default.nix | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/unidiff/default.nix b/pkgs/development/python-modules/unidiff/default.nix index 4c776070ae6e..8fe8a760cf09 100644 --- a/pkgs/development/python-modules/unidiff/default.nix +++ b/pkgs/development/python-modules/unidiff/default.nix @@ -1,14 +1,18 @@ -{ lib, buildPythonPackage, fetchPypi }: +{ lib, buildPythonPackage, fetchPypi, python }: buildPythonPackage rec { pname = "unidiff"; - version = "0.7.3"; + version = "0.7.4"; src = fetchPypi { inherit pname version; - sha256 = "sha256-1fLlOpoA2zIkqMNjSbU4Dg4i0a7GxpSxT7lIPuk8YgU="; + sha256 = "2bbcbc986e1fb97f04b1d7b864aa6002ab02f4d8a996bf03aa6e5a81447d1fc5"; }; + checkPhase = '' + ${python.interpreter} -m unittest discover -s tests/ + ''; + pythonImportsCheck = [ "unidiff" ]; meta = with lib; { From 4fe81e170d33b62b989693fa788386a870b29940 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 9 Jul 2022 04:20:00 +0000 Subject: [PATCH 063/133] vale: 2.18.0 -> 2.20.0 https://github.com/errata-ai/vale/releases/tag/v2.19.0 https://github.com/errata-ai/vale/releases/tag/v2.20.0 --- pkgs/tools/text/vale/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/text/vale/default.nix b/pkgs/tools/text/vale/default.nix index a4d62af5b67a..df571aa6f26d 100644 --- a/pkgs/tools/text/vale/default.nix +++ b/pkgs/tools/text/vale/default.nix @@ -2,7 +2,7 @@ buildGoModule rec { pname = "vale"; - version = "2.18.0"; + version = "2.20.0"; subPackages = [ "cmd/vale" ]; outputs = [ "out" "data" ]; @@ -11,14 +11,14 @@ buildGoModule rec { owner = "errata-ai"; repo = "vale"; rev = "v${version}"; - sha256 = "sha256-hstjE3+1QQSeS1z8fNhxTJI81liW77CdkEP+aS3c2zM="; + sha256 = "sha256-3W6bSFf23eOUyzyqUczsajBDjYaCxlgB+vg0Bf5o/X0="; }; - vendorSha256 = "sha256-zdgLWEArmtHTDM844LoSJwKp0UGoAR8bHnFOSlrrjdg="; + vendorSha256 = "sha256-ODzQkNOXEvSOhG6MoJbyxIwduFAW5FQb5hlOn3+io3A="; postInstall = '' mkdir -p $data/share/vale - cp -r styles $data/share/vale + cp -r testdata/styles $data/share/vale ''; ldflags = [ "-s" "-w" "-X main.version=${version}" ]; From 0f77809f6e45efed9dd6c22bfa98e108c69cf228 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 9 Jul 2022 04:20:00 +0000 Subject: [PATCH 064/133] odyssey: 1.2 -> 1.3 https://github.com/yandex/odyssey/releases/tag/1.3 --- pkgs/tools/misc/odyssey/default.nix | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/misc/odyssey/default.nix b/pkgs/tools/misc/odyssey/default.nix index f154cffa9c6b..f0a59e1d0aae 100644 --- a/pkgs/tools/misc/odyssey/default.nix +++ b/pkgs/tools/misc/odyssey/default.nix @@ -1,18 +1,18 @@ -{ lib, stdenv, fetchFromGitHub, cmake, openssl, postgresql }: +{ lib, stdenv, fetchFromGitHub, cmake, openssl, postgresql, zstd }: stdenv.mkDerivation rec { pname = "odyssey"; - version = "1.2"; + version = "1.3"; src = fetchFromGitHub { owner = "yandex"; repo = pname; rev = version; - sha256 = "sha256-wxENqB9CmRVsQY9jTPUlpdiXpuqoU/2hRCY41f9uH3A="; + sha256 = "sha256-1ALTKRjpKmmFcAuhmgpcbJBkNuUlTyau8xWDRHh7gf0="; }; nativeBuildInputs = [ cmake ]; - buildInputs = [ openssl postgresql ]; + buildInputs = [ openssl postgresql zstd ]; cmakeFlags = [ "-DPQ_LIBRARY=${postgresql.lib}/lib" ]; installPhase = '' From b3a0a45f9efe4ed10c426d75860ec1cc770b8118 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 9 Jul 2022 04:20:00 +0000 Subject: [PATCH 065/133] fastlane: 2.206.2 -> 2.207.0 https://github.com/fastlane/fastlane/releases/tag/2.207.0 --- pkgs/tools/admin/fastlane/Gemfile.lock | 40 +++++++++--------- pkgs/tools/admin/fastlane/gemset.nix | 56 +++++++++++++------------- 2 files changed, 48 insertions(+), 48 deletions(-) diff --git a/pkgs/tools/admin/fastlane/Gemfile.lock b/pkgs/tools/admin/fastlane/Gemfile.lock index 8371b8830d4b..5c5edfbe06e7 100644 --- a/pkgs/tools/admin/fastlane/Gemfile.lock +++ b/pkgs/tools/admin/fastlane/Gemfile.lock @@ -8,8 +8,8 @@ GEM artifactory (3.0.15) atomos (0.1.3) aws-eventstream (1.2.0) - aws-partitions (1.595.0) - aws-sdk-core (3.131.1) + aws-partitions (1.603.0) + aws-sdk-core (3.131.2) aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.525.0) aws-sigv4 (~> 1.1) @@ -56,8 +56,8 @@ GEM faraday-em_synchrony (1.0.0) faraday-excon (1.1.0) faraday-httpclient (1.0.1) - faraday-multipart (1.0.3) - multipart-post (>= 1.2, < 3) + faraday-multipart (1.0.4) + multipart-post (~> 2) faraday-net_http (1.0.1) faraday-net_http_persistent (1.2.0) faraday-patron (1.0.0) @@ -66,7 +66,7 @@ GEM faraday_middleware (1.2.0) faraday (~> 1.0) fastimage (2.2.6) - fastlane (2.206.2) + fastlane (2.207.0) CFPropertyList (>= 2.3, < 4.0.0) addressable (>= 2.8, < 3.0.0) artifactory (~> 3.0) @@ -106,9 +106,9 @@ GEM xcpretty (~> 0.3.0) xcpretty-travis-formatter (>= 0.0.3) gh_inspector (1.1.3) - google-apis-androidpublisher_v3 (0.21.0) - google-apis-core (>= 0.4, < 2.a) - google-apis-core (0.5.0) + google-apis-androidpublisher_v3 (0.24.0) + google-apis-core (>= 0.7, < 2.a) + google-apis-core (0.7.0) addressable (~> 2.5, >= 2.5.1) googleauth (>= 0.16.2, < 2.a) httpclient (>= 2.8.1, < 3.a) @@ -117,19 +117,19 @@ GEM retriable (>= 2.0, < 4.a) rexml webrick - google-apis-iamcredentials_v1 (0.10.0) - google-apis-core (>= 0.4, < 2.a) - google-apis-playcustomapp_v1 (0.7.0) - google-apis-core (>= 0.4, < 2.a) - google-apis-storage_v1 (0.14.0) - google-apis-core (>= 0.4, < 2.a) + google-apis-iamcredentials_v1 (0.13.0) + google-apis-core (>= 0.7, < 2.a) + google-apis-playcustomapp_v1 (0.10.0) + google-apis-core (>= 0.7, < 2.a) + google-apis-storage_v1 (0.17.0) + google-apis-core (>= 0.7, < 2.a) google-cloud-core (1.6.0) google-cloud-env (~> 1.0) google-cloud-errors (~> 1.0) google-cloud-env (1.6.0) faraday (>= 0.17.3, < 3.0) google-cloud-errors (1.2.0) - google-cloud-storage (1.36.2) + google-cloud-storage (1.37.0) addressable (~> 2.8) digest-crc (~> 0.4) google-apis-iamcredentials_v1 (~> 0.1) @@ -137,7 +137,7 @@ GEM google-cloud-core (~> 1.6) googleauth (>= 0.16.2, < 2.a) mini_mime (~> 1.0) - googleauth (1.1.3) + googleauth (1.2.0) faraday (>= 0.17.3, < 3.a) jwt (>= 1.4, < 3.0) memoist (~> 0.16) @@ -150,7 +150,7 @@ GEM httpclient (2.8.3) jmespath (1.6.1) json (2.6.2) - jwt (2.3.0) + jwt (2.4.1) memoist (0.16.2) mini_magick (4.11.0) mini_mime (1.1.2) @@ -173,9 +173,9 @@ GEM ruby2_keywords (0.0.5) rubyzip (2.3.2) security (0.1.3) - signet (0.16.1) + signet (0.17.0) addressable (~> 2.8) - faraday (>= 0.17.5, < 3.0) + faraday (>= 0.17.5, < 3.a) jwt (>= 1.5, < 3.0) multi_json (~> 1.10) simctl (1.6.8) @@ -196,7 +196,7 @@ GEM unicode-display_width (1.8.0) webrick (1.7.0) word_wrap (1.0.0) - xcodeproj (1.21.0) + xcodeproj (1.22.0) CFPropertyList (>= 2.3.3, < 4.0) atomos (~> 0.1.3) claide (>= 1.0.2, < 2.0) diff --git a/pkgs/tools/admin/fastlane/gemset.nix b/pkgs/tools/admin/fastlane/gemset.nix index 6e8cad97cb87..882b607df1e9 100644 --- a/pkgs/tools/admin/fastlane/gemset.nix +++ b/pkgs/tools/admin/fastlane/gemset.nix @@ -45,10 +45,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0vgm7l4nyj23sif850mfsh170jbkhm7j34686ygc0nfyzzm90c08"; + sha256 = "1i1ci3jibkqizr2ms31grj0j9ymhfq8rx7dn6nr10x6arv0db31z"; type = "gem"; }; - version = "1.595.0"; + version = "1.603.0"; }; aws-sdk-core = { dependencies = ["aws-eventstream" "aws-partitions" "aws-sigv4" "jmespath"]; @@ -56,10 +56,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0yiz3aaik62rxhxipwznb2bv8ywha13vdxg9nk6anq9bd0nn0728"; + sha256 = "164abp3cvmvfa2qsgzbxvkafbhwbgn3qwknp0amwmxw5nwvz8p3s"; type = "gem"; }; - version = "3.131.1"; + version = "3.131.2"; }; aws-sdk-kms = { dependencies = ["aws-sdk-core" "aws-sigv4"]; @@ -286,10 +286,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "03qfi9020ynf7hkdiaq01sd2mllvw7fg4qiin3pk028b4wv23j3j"; + sha256 = "09871c4hd7s5ws1wl4gs7js1k2wlby6v947m2bbzg43pnld044lh"; type = "gem"; }; - version = "1.0.3"; + version = "1.0.4"; }; faraday-net_http = { groups = ["default"]; @@ -368,10 +368,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0plwdkdnxq5x59bc45f6978yys4r5m85wmw8daa5136l33iypl41"; + sha256 = "0qfjqscldva6njrggs3cyvsdnbcz4rvdi69lp7h5rl74y0mr07ak"; type = "gem"; }; - version = "2.206.2"; + version = "2.207.0"; }; gh_inspector = { groups = ["default"]; @@ -389,10 +389,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "14ll3kbnb5glbb7qrqcsmy5rslb1hz9xdc16dl3a6j0a9nxrmiiv"; + sha256 = "0vswj47jc5k3x8frywsq295wfngfm8rgmb5i8z7bksxlcc4iysag"; type = "gem"; }; - version = "0.21.0"; + version = "0.24.0"; }; google-apis-core = { dependencies = ["addressable" "googleauth" "httpclient" "mini_mime" "representable" "retriable" "rexml" "webrick"]; @@ -400,10 +400,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "06s6kcvc6k5vgqkxf9xw1yaklr7yqf9kfvirm6i9b0lfmjfv26xv"; + sha256 = "07jhk74awjc1npf2rim4kmwz4v0n3ny6y5g31saq7aqxkjmlp3hd"; type = "gem"; }; - version = "0.5.0"; + version = "0.7.0"; }; google-apis-iamcredentials_v1 = { dependencies = ["google-apis-core"]; @@ -411,10 +411,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1yibminaffzz5npq605m0vqc024dcybiw7xk5vr0jxzlsh8nxvhn"; + sha256 = "0mf9l1r28hxqqh2ilza2pfffy32vvzq10ifqf88a732k16iwvin1"; type = "gem"; }; - version = "0.10.0"; + version = "0.13.0"; }; google-apis-playcustomapp_v1 = { dependencies = ["google-apis-core"]; @@ -422,10 +422,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "15wnkbn6kzijbyqkqrh7s6apjf5630yvf2v8zy93zk0x87n2drcd"; + sha256 = "0jgmfayhww7sy06pzf8r7bvxjix4jdazbyyy4mhp6ghv1s9r85w7"; type = "gem"; }; - version = "0.7.0"; + version = "0.10.0"; }; google-apis-storage_v1 = { dependencies = ["google-apis-core"]; @@ -433,10 +433,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "08qhbzxpnn278zlx79zzx27q66djksjym6jhwalb25qlcdnk6wvs"; + sha256 = "19ccrdgb34w49l62p28yy5qrgwgb4wxs9q3mnb2d334q4q3wsk9f"; type = "gem"; }; - version = "0.14.0"; + version = "0.17.0"; }; google-cloud-core = { dependencies = ["google-cloud-env" "google-cloud-errors"]; @@ -476,10 +476,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "09d1bvxma4czbgay9lhcqsrhh6pd8s9i5djflzpsn00h4isdilw3"; + sha256 = "1csghy4dqh1zzwj1zkc2q8ldsj6m8y5dqs4cfzjjgb6ymkyarycc"; type = "gem"; }; - version = "1.36.2"; + version = "1.37.0"; }; googleauth = { dependencies = ["faraday" "jwt" "memoist" "multi_json" "os" "signet"]; @@ -487,10 +487,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1y80y72bpz04piiskfn93i5rzfy02mjchp3ym77yf2811gzz33d9"; + sha256 = "030bcdnffwndk8h270cmbndixb5h3ss860yifv6bkfys95s5fjpp"; type = "gem"; }; - version = "1.1.3"; + version = "1.2.0"; }; highline = { groups = ["default"]; @@ -548,10 +548,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0bg8pjx0mpvl10k6d8a6gc8dzlv2z5jkqcjbjcirnk032iriq838"; + sha256 = "1lsk71qh5d7bm1qqrjvcwhp4h71ckkdbzxnw4xkd9cin8gjfvvr6"; type = "gem"; }; - version = "2.3.0"; + version = "2.4.1"; }; memoist = { groups = ["default"]; @@ -750,10 +750,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1jwyggz80xb3yi2hycmmw214c4072g8i56y0b0gsmpkiyk5d0vh1"; + sha256 = "0100rclkhagf032rg3r0gf3f4znrvvvqrimy6hpa73f21n9k2a0x"; type = "gem"; }; - version = "0.16.1"; + version = "0.17.0"; }; simctl = { dependencies = ["CFPropertyList" "naturally"]; @@ -895,10 +895,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0xmzb1mdsnkpf7v07whz0n2wc8kg6785sc7i5zyawd8dl8517rp4"; + sha256 = "1s7hxaqd1fi4rlmm2jbrglyvka1r95frlxan61vfcnd8n6pxynpi"; type = "gem"; }; - version = "1.21.0"; + version = "1.22.0"; }; xcpretty = { dependencies = ["rouge"]; From 78a851dbf3ea920049f5a15a3d3c1e8a2eda23aa Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Sat, 9 Jul 2022 03:02:23 -0400 Subject: [PATCH 066/133] hqplayerd: 4.31.0 -> 4.32.2 --- pkgs/servers/hqplayerd/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/hqplayerd/default.nix b/pkgs/servers/hqplayerd/default.nix index 3c4a609b8b5d..26f71e9dcccb 100644 --- a/pkgs/servers/hqplayerd/default.nix +++ b/pkgs/servers/hqplayerd/default.nix @@ -22,11 +22,11 @@ }: stdenv.mkDerivation rec { pname = "hqplayerd"; - version = "4.31.0-89"; + version = "4.32.2-92"; src = fetchurl { url = "https://www.signalyst.eu/bins/${pname}/fc35/${pname}-${version}.fc35.x86_64.rpm"; - hash = "sha256-L9S3MIbvvBViKSxu0x/GkE/pa61NETtw4vA8xM4rJEg="; + hash = "sha256-chgzu5r35VTSc1xOVTPCWCRrjABOy+vs57SsKOSzvkM="; }; unpackPhase = '' From 661c78879f026922596d052e04542e7b8147b668 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 9 Jul 2022 07:10:21 +0000 Subject: [PATCH 067/133] dapr-cli: 1.7.1 -> 1.8.0 --- pkgs/development/tools/dapr/cli/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/dapr/cli/default.nix b/pkgs/development/tools/dapr/cli/default.nix index 2b09f72b868d..12fc1aa0a965 100644 --- a/pkgs/development/tools/dapr/cli/default.nix +++ b/pkgs/development/tools/dapr/cli/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "dapr-cli"; - version = "1.7.1"; + version = "1.8.0"; src = fetchFromGitHub { owner = "dapr"; repo = "cli"; rev = "v${version}"; - sha256 = "sha256-gEYN9r5hHRya1nqle8qHaUaOpuBN8cSLJx2FBRqyztw="; + sha256 = "sha256-ytn7fG84Wu4+fcgkV5B9djCw8KgAJWgffoNbV7wveK4="; }; - vendorSha256 = "sha256-RGEoewLDKo+D9Wp/v8PI/LPjCh2rFrdLO/AS4RWFliY="; + vendorSha256 = "sha256-ZsuDaFcBPZuyt5rmjeBkzkrphCCcraLZCrMiQ2FtAUc="; nativeBuildInputs = [ installShellFiles ]; From c069cea5215dd56c04f1587c477f445161ac0a47 Mon Sep 17 00:00:00 2001 From: Bernardo Meurer Date: Sat, 9 Jul 2022 04:10:19 -0400 Subject: [PATCH 068/133] roon-server: 1.8-970 -> 1.8-988 --- pkgs/servers/roon-server/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/roon-server/default.nix b/pkgs/servers/roon-server/default.nix index dab3b1a03b85..b89932ac52b7 100644 --- a/pkgs/servers/roon-server/default.nix +++ b/pkgs/servers/roon-server/default.nix @@ -16,7 +16,7 @@ }: stdenv.mkDerivation rec { pname = "roon-server"; - version = "1.8-970"; + version = "1.8-988"; src = let @@ -24,7 +24,7 @@ stdenv.mkDerivation rec { in fetchurl { url = "http://download.roonlabs.com/builds/RoonServer_linuxx64_${urlVersion}.tar.bz2"; - hash = "sha256-A1DT3cVdUksszp+25D5JYHrxIGFPXJ/J14oQOfShbak="; + hash = "sha256-e8hSvHKeyJOIp6EWy1JLOWnj6HE2McFk9bw5vVZ96/I="; }; dontConfigure = true; From 8f00857bf94b1bd4027e7de8ae213a5f5d392cc4 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sat, 9 Jul 2022 09:35:25 +0100 Subject: [PATCH 069/133] pkgsMusl.gcc12: backport build fix (PR106102) Without the change gcc-12 on musl fails to build due to system headers poisoning: /build/build/./prev-gcc/xg++ ... ../../gcc-13-20220626/gcc/cp/mapper-resolver.cc In file included from /<>/musl-1.2.3-dev/include/pthread.h:30, from /build/build/prev-x86_64-unknown-linux-musl/libstdc++-v3/include/x86_64-unknown-linux-musl/bits/gthr-default.h:35, .... from /build/build/prev-x86_64-unknown-linux-musl/libstdc++-v3/include/memory:77, from ../../gcc-13-20220626/gcc/../libcody/cody.hh:24, from ../../gcc-13-20220626/gcc/cp/../../c++tools/resolver.h:25, from ../../gcc-13-20220626/gcc/cp/../../c++tools/resolver.cc:23, from ../../gcc-13-20220626/gcc/cp/mapper-resolver.cc:32: /<>/musl-1.2.3-dev/include/sched.h:84:7: error: attempt to use poisoned "calloc" 84 | void *calloc(size_t, size_t); | ^ /<>/musl-1.2.3-dev/include/sched.h:124:36: error: attempt to use poisoned "calloc" 124 | #define CPU_ALLOC(n) ((cpu_set_t *)calloc(1,CPU_ALLOC_SIZE(n))) | ^ The change pulls upstream fix as is. --- .../gcc/12/PR106102-musl-poison-cpp.patch | 52 ++++++++++++++ .../gcc/12/PR106102-musl-poison-jit.patch | 67 +++++++++++++++++++ pkgs/development/compilers/gcc/12/default.nix | 3 + 3 files changed, 122 insertions(+) create mode 100644 pkgs/development/compilers/gcc/12/PR106102-musl-poison-cpp.patch create mode 100644 pkgs/development/compilers/gcc/12/PR106102-musl-poison-jit.patch diff --git a/pkgs/development/compilers/gcc/12/PR106102-musl-poison-cpp.patch b/pkgs/development/compilers/gcc/12/PR106102-musl-poison-cpp.patch new file mode 100644 index 000000000000..05677f5cf85c --- /dev/null +++ b/pkgs/development/compilers/gcc/12/PR106102-musl-poison-cpp.patch @@ -0,0 +1,52 @@ +https://gcc.gnu.org/git/?p=gcc.git;a=commitdiff;h=3b21c21f3f5726823e19728fdd1571a14aae0fb3 +https://gcc.gnu.org/PR106102 +--- a/gcc/cp/mapper-client.cc ++++ b/gcc/cp/mapper-client.cc +@@ -27,6 +27,7 @@ along with GCC; see the file COPYING3. If not see + #define INCLUDE_STRING + #define INCLUDE_VECTOR + #define INCLUDE_MAP ++#define INCLUDE_MEMORY + #include "system.h" + + #include "line-map.h" +--- a/gcc/cp/mapper-resolver.cc ++++ b/gcc/cp/mapper-resolver.cc +@@ -25,6 +25,7 @@ along with GCC; see the file COPYING3. If not see + #define INCLUDE_VECTOR + #define INCLUDE_ALGORITHM + #define INCLUDE_MAP ++#define INCLUDE_MEMORY + #include "system.h" + + // We don't want or need to be aware of networking +--- a/gcc/cp/module.cc ++++ b/gcc/cp/module.cc +@@ -206,6 +206,7 @@ Classes used: + + #define _DEFAULT_SOURCE 1 /* To get TZ field of struct tm, if available. */ + #include "config.h" ++#define INCLUDE_MEMORY + #define INCLUDE_STRING + #define INCLUDE_VECTOR + #include "system.h" +--- a/libcc1/libcc1plugin.cc ++++ b/libcc1/libcc1plugin.cc +@@ -31,6 +31,7 @@ + #undef PACKAGE_TARNAME + #undef PACKAGE_VERSION + ++#define INCLUDE_MEMORY + #include "gcc-plugin.h" + #include "system.h" + #include "coretypes.h" +--- a/libcc1/libcp1plugin.cc ++++ b/libcc1/libcp1plugin.cc +@@ -32,6 +32,7 @@ + #undef PACKAGE_TARNAME + #undef PACKAGE_VERSION + ++#define INCLUDE_MEMORY + #include "gcc-plugin.h" + #include "system.h" + #include "coretypes.h" diff --git a/pkgs/development/compilers/gcc/12/PR106102-musl-poison-jit.patch b/pkgs/development/compilers/gcc/12/PR106102-musl-poison-jit.patch new file mode 100644 index 000000000000..e4ff25be512c --- /dev/null +++ b/pkgs/development/compilers/gcc/12/PR106102-musl-poison-jit.patch @@ -0,0 +1,67 @@ +https://gcc.gnu.org/git/?p=gcc.git;a=commitdiff;h=49d508065bdd36fb1a9b6aad9666b1edb5e06474 +https://gcc.gnu.org/PR106102 +--- a/gcc/jit/jit-playback.cc ++++ b/gcc/jit/jit-playback.cc +@@ -19,6 +19,7 @@ along with GCC; see the file COPYING3. If not see + . */ + + #include "config.h" ++#define INCLUDE_PTHREAD_H + #include "system.h" + #include "coretypes.h" + #include "target.h" +@@ -41,8 +42,6 @@ along with GCC; see the file COPYING3. If not see + #include "diagnostic.h" + #include "stmt.h" + +-#include +- + #include "jit-playback.h" + #include "jit-result.h" + #include "jit-builtins.h" +--- a/gcc/jit/jit-recording.cc ++++ b/gcc/jit/jit-recording.cc +@@ -19,13 +19,13 @@ along with GCC; see the file COPYING3. If not see + . */ + + #include "config.h" ++#define INCLUDE_PTHREAD_H + #include "system.h" + #include "coretypes.h" + #include "tm.h" + #include "pretty-print.h" + #include "toplev.h" + +-#include + + #include "jit-builtins.h" + #include "jit-recording.h" +--- a/gcc/jit/libgccjit.cc ++++ b/gcc/jit/libgccjit.cc +@@ -19,12 +19,12 @@ along with GCC; see the file COPYING3. If not see + . */ + + #include "config.h" ++#define INCLUDE_PTHREAD_H + #include "system.h" + #include "coretypes.h" + #include "timevar.h" + #include "typed-splay-tree.h" + #include "cppbuiltin.h" +-#include + + #include "libgccjit.h" + #include "jit-recording.h" +--- a/gcc/system.h ++++ b/gcc/system.h +@@ -753,6 +753,10 @@ extern int vsnprintf (char *, size_t, const char *, va_list); + #endif + #endif + ++#ifdef INCLUDE_PTHREAD_H ++#include ++#endif ++ + #ifdef INCLUDE_ISL + #ifdef HAVE_isl + #include diff --git a/pkgs/development/compilers/gcc/12/default.nix b/pkgs/development/compilers/gcc/12/default.nix index 13d040fc4957..20bc9dcf44bb 100644 --- a/pkgs/development/compilers/gcc/12/default.nix +++ b/pkgs/development/compilers/gcc/12/default.nix @@ -69,6 +69,9 @@ let majorVersion = "12"; ../gnat-cflags-11.patch ../gcc-12-gfortran-driving.patch ../ppc-musl.patch + # Backports. Should be removed with 12.2.0 release: + ./PR106102-musl-poison-cpp.patch + ./PR106102-musl-poison-jit.patch ] ++ optional (stdenv.isDarwin && stdenv.isAarch64) (fetchpatch { url = "https://github.com/fxcoudert/gcc/compare/releases/gcc-11.1.0...gcc-11.1.0-arm-20210504.diff"; sha256 = "sha256-JqCGJAfbOxSmkNyq49aFHteK/RFsCSLQrL9mzUCnaD0="; From 70896ec8711c3b97208118bf3d0346d07e225544 Mon Sep 17 00:00:00 2001 From: Michael Weiss Date: Sun, 10 Jul 2022 00:39:23 +0200 Subject: [PATCH 070/133] ungoogled-chromium: 103.0.5060.53 -> 103.0.5060.114 --- .../networking/browsers/chromium/upstream-info.json | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json index 74cf6526d05f..0fa6054c0661 100644 --- a/pkgs/applications/networking/browsers/chromium/upstream-info.json +++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json @@ -45,9 +45,9 @@ } }, "ungoogled-chromium": { - "version": "103.0.5060.53", - "sha256": "00di0nw6h3kb0qp2wp3ny3zsar1ayn1lyx5zr28dl1h5cwaaxjqf", - "sha256bin64": "19wxd4jl6fyjpcpy2331ckz6dgzrfj52wvdkp0kb18n0sym17fyn", + "version": "103.0.5060.114", + "sha256": "0rarcd2q1ggl10cw3vwjk7j9aka7i129a0qv8qr7751vy083as3p", + "sha256bin64": "1qxbnnnq0miizazprwynvxxvgaaw9dd9y7bssybvmga3g2c00fk9", "deps": { "gn": { "version": "2022-05-11", @@ -56,8 +56,8 @@ "sha256": "03dqfrdpf5xxl64dby3qmbwpzdq2gsa8g7xl438py3a629rgxg63" }, "ungoogled-patches": { - "rev": "103.0.5060.53-1", - "sha256": "1g5ciwzrhg9g13gvhrwqf19djk9jhj1d6nx2f6a8d5ch1mhi2z8s" + "rev": "103.0.5060.114-1", + "sha256": "11i7d480q21vcd9p14rc7rb408xwlg2nkj88dq0sfj2rz60lzy0a" } } } From b7609e106f0692506f58e401de5b6cd2431d64e2 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 10 Jul 2022 01:39:30 +0200 Subject: [PATCH 071/133] python310Packages.shodan: 1.27.0 -> 1.28.0 --- pkgs/development/python-modules/shodan/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/shodan/default.nix b/pkgs/development/python-modules/shodan/default.nix index 800bb0f2f4cf..1a17905f3b83 100644 --- a/pkgs/development/python-modules/shodan/default.nix +++ b/pkgs/development/python-modules/shodan/default.nix @@ -11,14 +11,14 @@ buildPythonPackage rec { pname = "shodan"; - version = "1.27.0"; + version = "1.28.0"; format = "setuptools"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-XkrnBuALYxZ6n/f34PM0QvxqxvC08mKci9Mswwf41VA="; + sha256 = "sha256-GL0q6BEUtwg24OMxUicyXhQ5gnUiOZiowjWwmUMvSws="; }; propagatedBuildInputs = [ From 86138531bc5040d35d9c5822066b0a973a56a3e3 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 10 Jul 2022 01:47:37 +0200 Subject: [PATCH 072/133] python310Packages.tweepy: add missing input --- pkgs/development/python-modules/tweepy/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/python-modules/tweepy/default.nix b/pkgs/development/python-modules/tweepy/default.nix index f837527be60c..b488ad8eaed7 100644 --- a/pkgs/development/python-modules/tweepy/default.nix +++ b/pkgs/development/python-modules/tweepy/default.nix @@ -8,6 +8,7 @@ , pythonOlder , requests , requests-oauthlib +, six , vcrpy }: @@ -31,6 +32,7 @@ buildPythonPackage rec { oauthlib requests requests-oauthlib + six ]; checkInputs = [ From ad36639f4759e607cc5e51f7e03f3b279d23eaed Mon Sep 17 00:00:00 2001 From: WeebSorceress Date: Tue, 5 Jul 2022 13:05:20 -0300 Subject: [PATCH 073/133] trackma: fix bug with qt option --- pkgs/tools/misc/trackma/default.nix | 56 ++++++++++++++++++++--------- pkgs/top-level/all-packages.nix | 4 ++- 2 files changed, 42 insertions(+), 18 deletions(-) diff --git a/pkgs/tools/misc/trackma/default.nix b/pkgs/tools/misc/trackma/default.nix index bebadd5db47f..ae63230c5e56 100644 --- a/pkgs/tools/misc/trackma/default.nix +++ b/pkgs/tools/misc/trackma/default.nix @@ -6,10 +6,22 @@ , gobject-introspection , glib , gtk3 +, qt5 +, makeDesktopItem +, copyDesktopItems , withCurses ? false -, withGtk ? false +, withGTK ? false +, withQT ? false }: - +let + mkDesktopItem = name: desktopName: comment: terminal: makeDesktopItem { + inherit name desktopName comment terminal; + icon = "trackma"; + exec = name + " %u"; + type = "Application"; + categories = [ "Network" ]; + }; +in python3.pkgs.buildPythonApplication rec { pname = "trackma"; version = "0.8.4"; @@ -19,36 +31,46 @@ python3.pkgs.buildPythonApplication rec { repo = "trackma"; rev = "v${version}"; sha256 = "sha256-drc39ID4WYBQ/L2py57CB5OkQNfRKNigPQW0Lp8GIMc="; + fetchSubmodules = true; # for anime-relations submodule }; - nativeBuildInputs = lib.optionals withGtk [ wrapGAppsHook ]; + nativeBuildInputs = [ copyDesktopItems ] + ++ lib.optionals withGTK [ wrapGAppsHook ] + ++ lib.optionals withQT [ qt5.wrapQtAppsHook ]; - buildInputs = lib.optionals withGtk [ glib gobject-introspection gtk3 ]; + buildInputs = lib.optionals withGTK [ glib gobject-introspection gtk3 ]; - propagatedBuildInputs = [ python3.pkgs.urllib3 python3.pkgs.dbus-python ] - ++ lib.optionals withGtk [ python3.pkgs.pillow python3.pkgs.pygobject3 python3.pkgs.pycairo ] - ++ lib.optionals withCurses [ python3.pkgs.urwid ] - ++ lib.optionals stdenv.isLinux [ python3.pkgs.pyinotify ]; + propagatedBuildInputs = with python3.pkgs; ([ urllib3 ] + ++ lib.optionals withQT [ pyqt5 ] + ++ lib.optionals withGTK [ pycairo ] + ++ lib.optionals withCurses [ urwid ] + ++ lib.optionals stdenv.isLinux [ dbus-python pygobject3 pyinotify ] + ++ lib.optionals (withGTK || withQT) [ pillow ]); # broken with gobject-introspection setup hook, see https://github.com/NixOS/nixpkgs/issues/56943 strictDeps = false; - dontWrapGApps = true; # prevent double wrapping + dontWrapQtApps = true; + dontWrapGApps = true; - preFixup = '' - makeWrapperArgs+=("''${gappsWrapperArgs[@]}") + preFixup = lib.optional withQT "wrapQtApp $out/bin/trackma-qt" + ++ lib.optional withGTK "wrapGApp $out/bin/trackma-gtk"; + + desktopItems = lib.optional withQT (mkDesktopItem "trackma-qt" "Trackma (Qt)" "Trackma Updater (Qt-frontend)" false) + ++ lib.optional withGTK (mkDesktopItem "trackma-gtk" "Trackma (GTK)" "Trackma Updater (Gtk-frontend)" false) + ++ lib.optional withCurses (mkDesktopItem "trackma-curses" "Trackma (ncurses)" "Trackma Updater (ncurses frontend)" true); + + postInstall = '' + install -Dvm444 $src/trackma/data/icon.png $out/share/pixmaps/trackma.png ''; doCheck = false; pythonImportsCheck = [ "trackma" ]; - # FIXME(trackma-qt): https://github.com/NixOS/nixpkgs/pull/179715#issuecomment-1171371059 - postDist = '' - rm $out/bin/trackma-qt - ${lib.optionalString (!withGtk) "rm $out/bin/trackma-gtk"} - ${lib.optionalString (!withCurses) "rm $out/bin/trackma-curses"} - ''; + postDist = lib.optional (!withQT) "rm $out/bin/trackma-qt" + ++ lib.optional (!withGTK) "rm $out/bin/trackma-gtk" + ++ lib.optional (!withCurses) "rm $out/bin/trackma-curses"; passthru.updateScript = ./update.sh; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7b2d834436f5..06cb4126a373 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11214,7 +11214,9 @@ with pkgs; trackma-curses = trackma.override { withCurses = true; }; - trackma-gtk = trackma.override { withGtk = true; }; + trackma-gtk = trackma.override { withGTK = true; }; + + trackma-qt = trackma.override { withQT = true; }; tpmmanager = libsForQt5.callPackage ../applications/misc/tpmmanager { }; From 69cb613852db5ec56250d664ee1a98a0dbd8af18 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 10 Jul 2022 00:06:10 +0000 Subject: [PATCH 074/133] python310Packages.panflute: 2.1.3 -> 2.1.5 --- pkgs/development/python-modules/panflute/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/panflute/default.nix b/pkgs/development/python-modules/panflute/default.nix index d94dc48b6d03..2e5cd4621c56 100644 --- a/pkgs/development/python-modules/panflute/default.nix +++ b/pkgs/development/python-modules/panflute/default.nix @@ -7,14 +7,14 @@ }: buildPythonPackage rec{ - version = "2.1.3"; + version = "2.1.5"; pname = "panflute"; disabled = !isPy3k; src = fetchPypi { inherit pname version; - sha256 = "y5QkT+dmiTuy8XLruCfsPe12G4//qE5MhLZ4ufip/5U="; + sha256 = "sha256-7xHcWVoZh51PlonvmoOCBKJGNMpjT7z8jkoO1B65EqE="; }; propagatedBuildInputs = [ From 38dc7696b6d17b9d8e833e7439d1609c30c0e7d1 Mon Sep 17 00:00:00 2001 From: superherointj <5861043+superherointj@users.noreply.github.com> Date: Sat, 9 Jul 2022 22:42:09 -0300 Subject: [PATCH 075/133] cod: disable tests --- pkgs/tools/misc/cod/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/tools/misc/cod/default.nix b/pkgs/tools/misc/cod/default.nix index 12d582f44925..582d0fe5ce07 100644 --- a/pkgs/tools/misc/cod/default.nix +++ b/pkgs/tools/misc/cod/default.nix @@ -24,6 +24,8 @@ buildGoModule rec { done popd export COD_TEST_BINARY="''${NIX_BUILD_TOP}/go/bin/cod" + + substituteInPlace test/learn_test.go --replace TestLearnArgparseSubCommand SkipLearnArgparseSubCommand ''; meta = with lib; { From 6978b3da7b2a4bba5d8192de244e1313d301b347 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebasti=C3=A1n=20Mancilla?= Date: Sat, 9 Jul 2022 22:43:33 -0400 Subject: [PATCH 076/133] binwalk: mark as unbroken on darwin Marked as broken by #173671 but builds and works fine on darwin, with sandbox enabled. --- pkgs/development/python-modules/binwalk/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/development/python-modules/binwalk/default.nix b/pkgs/development/python-modules/binwalk/default.nix index ff3fd58aed6b..a63df0d7d399 100644 --- a/pkgs/development/python-modules/binwalk/default.nix +++ b/pkgs/development/python-modules/binwalk/default.nix @@ -67,7 +67,5 @@ buildPythonPackage rec { description = "A tool for searching a given binary image for embedded files"; maintainers = [ maintainers.koral ]; license = licenses.mit; - # Signature Exception: [Errno 1] Operation not permitted: '/testing/tests/input-vectors/_dirtraversal.tar.extracted' - broken = (stdenv.isDarwin && stdenv.isx86_64); # broken on hydra since 2021-11-02 }; } From 84f32ec938db1aa5427e366107116a0e21b16207 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebasti=C3=A1n=20Mancilla?= Date: Sat, 9 Jul 2022 22:44:10 -0400 Subject: [PATCH 077/133] dieharder: mark as unbroken on darwin Marked as broken by #173671 but builds and works fine on darwin, with sandbox enabled. --- pkgs/tools/security/dieharder/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/tools/security/dieharder/default.nix b/pkgs/tools/security/dieharder/default.nix index aa363a24a771..b85a5c39656e 100644 --- a/pkgs/tools/security/dieharder/default.nix +++ b/pkgs/tools/security/dieharder/default.nix @@ -27,7 +27,6 @@ stdenv.mkDerivation rec { }; meta = with lib; { - broken = stdenv.isDarwin; description = "A Random Number Generator test suite"; homepage = "https://webhome.phy.duke.edu/~rgb/General/dieharder.php"; license = licenses.gpl2Plus; From 9df44cc54023fa59258fc68b17d3061b1aae516b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebasti=C3=A1n=20Mancilla?= Date: Sat, 9 Jul 2022 22:42:39 -0400 Subject: [PATCH 078/133] ginac: mark as unbroken on darwin Marked as broken by #173671 but builds and works fine on darwin, with sandbox enabled. --- pkgs/applications/science/math/ginac/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/applications/science/math/ginac/default.nix b/pkgs/applications/science/math/ginac/default.nix index a723fc720f10..2e18801a8812 100644 --- a/pkgs/applications/science/math/ginac/default.nix +++ b/pkgs/applications/science/math/ginac/default.nix @@ -25,7 +25,6 @@ stdenv.mkDerivation rec { configureFlags = [ "--disable-rpath" ]; meta = with lib; { - broken = stdenv.isDarwin; description = "GiNaC is Not a CAS"; homepage = "https://www.ginac.de/"; maintainers = with maintainers; [ lovek323 ]; From e212af64e8b4966215b012b58ab42b24ae31db82 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebasti=C3=A1n=20Mancilla?= Date: Sat, 9 Jul 2022 22:45:43 -0400 Subject: [PATCH 079/133] magic-wormhole-rs: mark as unbroken on darwin Marked as broken by #173671 but builds and works fine on darwin, with sandbox enabled. --- pkgs/tools/networking/magic-wormhole-rs/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/tools/networking/magic-wormhole-rs/default.nix b/pkgs/tools/networking/magic-wormhole-rs/default.nix index 742292e168bb..9d82cd36bf52 100644 --- a/pkgs/tools/networking/magic-wormhole-rs/default.nix +++ b/pkgs/tools/networking/magic-wormhole-rs/default.nix @@ -26,7 +26,6 @@ rustPlatform.buildRustPackage rec { doCheck = false; meta = with lib; { - broken = stdenv.isDarwin; description = "Rust implementation of Magic Wormhole, with new features and enhancements"; homepage = "https://github.com/magic-wormhole/magic-wormhole.rs"; changelog = "https://github.com/magic-wormhole/magic-wormhole.rs/raw/${version}/changelog.md"; From 27fcfa314f921058844ec4029522f643086a7d11 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Sun, 10 Jul 2022 00:03:19 -0300 Subject: [PATCH 080/133] ventoy-bin: 1.0.77 -> 1.0.78 --- pkgs/tools/cd-dvd/ventoy-bin/default.nix | 29 +++++++++++++++---- .../cd-dvd/ventoy-bin/ventoy-gui.desktop | 10 ------- 2 files changed, 23 insertions(+), 16 deletions(-) delete mode 100644 pkgs/tools/cd-dvd/ventoy-bin/ventoy-gui.desktop diff --git a/pkgs/tools/cd-dvd/ventoy-bin/default.nix b/pkgs/tools/cd-dvd/ventoy-bin/default.nix index 07d73f980525..245475a10d96 100644 --- a/pkgs/tools/cd-dvd/ventoy-bin/default.nix +++ b/pkgs/tools/cd-dvd/ventoy-bin/default.nix @@ -5,6 +5,7 @@ , autoPatchelfHook , bash , coreutils +, copyDesktopItems , cryptsetup , dosfstools , e2fsprogs @@ -15,6 +16,7 @@ , gtk3 , hexdump , makeWrapper +, makeDesktopItem , ntfs3g , parted , procps @@ -47,11 +49,11 @@ let in stdenv.mkDerivation rec { pname = "ventoy-bin"; - version = "1.0.77"; + version = "1.0.78"; src = fetchurl { url = "https://github.com/ventoy/Ventoy/releases/download/v${version}/ventoy-${version}-linux.tar.gz"; - hash = "sha256-DmDWt06gjrAEZ9Qvb7qbKbfJr/u84qmQ44kfDA3HDp0="; + hash = "sha256-vlSnnExtuh85yGFYUBeE7BRsVwl+kn7nSaIx2d3WICk="; }; patches = [ @@ -66,6 +68,9 @@ in stdenv.mkDerivation rec { patchFlags = [ "-p0" ]; + dontConfigure = true; + dontBuild = true; + postPatch = '' # Fix permissions. find -type f -name \*.sh -exec chmod a+x '{}' \; @@ -79,6 +84,7 @@ in stdenv.mkDerivation rec { autoPatchelfHook makeWrapper ] + ++ lib.optional (withQt5 || withGtk3) copyDesktopItems ++ lib.optional withQt5 qt5.wrapQtAppsHook; buildInputs = [ @@ -103,6 +109,18 @@ in stdenv.mkDerivation rec { ++ lib.optional withXfs xfsprogs ++ lib.optional withQt5 qt5.qtbase; + desktopItems = [ + (makeDesktopItem { + name = "Ventoy"; + desktopName = "Ventoy"; + comment = "Tool to create bootable USB drive for ISO/WIM/IMG/VHD(x)/EFI files"; + icon = "VentoyLogo"; + exec = "ventoy-gui"; + terminal = false; + categories = [ "Utility" ]; + startupNotify = true; + })]; + installPhase = '' runHook preInstall @@ -146,7 +164,7 @@ in stdenv.mkDerivation rec { done '' # VentoGUI uses the `ventoy_gui_type` file to determine the type of GUI. - # See . + # See: https://github.com/ventoy/Ventoy/blob/v1.0.78/LinuxGUI/Ventoy2Disk/ventoy_gui.c#L1096 + lib.optionalString (withGtk3 || withQt5) '' echo "${defaultGuiType}" > "$VENTOY_PATH/ventoy_gui_type" makeWrapper "$VENTOY_PATH/VentoyGUI.$ARCH" "$out/bin/ventoy-gui" \ @@ -154,7 +172,6 @@ in stdenv.mkDerivation rec { --chdir "$VENTOY_PATH" mkdir "$out"/share/{applications,pixmaps} ln -s "$VENTOY_PATH"/WebUI/static/img/VentoyLogo.png "$out"/share/pixmaps/ - cp ${./ventoy-gui.desktop} "$out"/share/applications/ '' + lib.optionalString (!withGtk3) '' rm "$VENTOY_PATH"/tool/{"$ARCH"/Ventoy2Disk.gtk3,VentoyGTK.glade} @@ -187,9 +204,9 @@ in stdenv.mkDerivation rec { 800+ image files are tested. 90%+ distros in DistroWatch supported. ''; changelog = "https://www.ventoy.net/doc_news.html"; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; license = licenses.gpl3Plus; + maintainers = with maintainers; [ k4leg AndersonTorres ]; platforms = [ "x86_64-linux" "i686-linux" "aarch64-linux" "mipsel-linux" ]; - maintainers = with maintainers; [ k4leg ]; + sourceProvenance = with sourceTypes; [ binaryNativeCode ]; }; } diff --git a/pkgs/tools/cd-dvd/ventoy-bin/ventoy-gui.desktop b/pkgs/tools/cd-dvd/ventoy-bin/ventoy-gui.desktop deleted file mode 100644 index a132f3bbf5a4..000000000000 --- a/pkgs/tools/cd-dvd/ventoy-bin/ventoy-gui.desktop +++ /dev/null @@ -1,10 +0,0 @@ -[Desktop Entry] -Categories=Utility; -Comment=Tool to create bootable USB drive for ISO/WIM/IMG/VHD(x)/EFI files -Exec=ventoy-gui -Hidden=false -Icon=VentoyLogo -Name=Ventoy -StartupNotify=true -Terminal=false -Type=Application From 3d1e82b6cee04d5f5298c3063910b0870783e93b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebasti=C3=A1n=20Mancilla?= Date: Sat, 9 Jul 2022 23:24:46 -0400 Subject: [PATCH 081/133] traitor: mark as Linux-only It's in the description of the package: "Automatic Linux privilege escalation". --- pkgs/tools/security/traitor/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/security/traitor/default.nix b/pkgs/tools/security/traitor/default.nix index fd767ca55857..c809a5cbd14d 100644 --- a/pkgs/tools/security/traitor/default.nix +++ b/pkgs/tools/security/traitor/default.nix @@ -18,7 +18,6 @@ buildGoModule rec { vendorSha256 = null; meta = with lib; { - broken = stdenv.isDarwin; description = "Automatic Linux privilege escalation"; longDescription = '' Automatically exploit low-hanging fruit to pop a root shell. Traitor packages @@ -26,6 +25,7 @@ buildGoModule rec { (including most of GTFOBins) in order to pop a root shell. ''; homepage = "https://github.com/liamg/traitor"; + platforms = platforms.linux; license = with licenses; [ mit ]; maintainers = with maintainers; [ fab ]; }; From 8211c55ec20824602f43a1c8aeba9dd7d413e6c3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebasti=C3=A1n=20Mancilla?= Date: Sat, 9 Jul 2022 23:28:27 -0400 Subject: [PATCH 082/133] sdnotify-wrapper: mark as Linux-only It's in pkgs/os-specific/linux. --- pkgs/os-specific/linux/sdnotify-wrapper/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/os-specific/linux/sdnotify-wrapper/default.nix b/pkgs/os-specific/linux/sdnotify-wrapper/default.nix index c6122910922f..b4b6a7f42a7e 100644 --- a/pkgs/os-specific/linux/sdnotify-wrapper/default.nix +++ b/pkgs/os-specific/linux/sdnotify-wrapper/default.nix @@ -12,10 +12,9 @@ in runCommandCC "sdnotify-wrapper" { outputs = [ "bin" "doc" "out" ]; meta = { - broken = stdenv.isDarwin; homepage = "https://skarnet.org/software/misc/sdnotify-wrapper.c"; description = "Use systemd sd_notify without having to link against libsystemd"; - platforms = lib.platforms.all; + platforms = lib.platforms.linux; license = lib.licenses.isc; maintainers = with lib.maintainers; [ Profpatsch ]; }; From fdfd961ee15caf176a6278f10c31ad0e0534f3d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebasti=C3=A1n=20Mancilla?= Date: Sat, 9 Jul 2022 23:31:19 -0400 Subject: [PATCH 083/133] gaw: mark as Linux-only The error when building on Darwin is: sockcon.c:19:10: fatal error: 'linux/tcp.h' file not found So, it uses Linux-specific headers. --- pkgs/applications/science/electronics/gaw/default.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/pkgs/applications/science/electronics/gaw/default.nix b/pkgs/applications/science/electronics/gaw/default.nix index acb5c7c96af7..a54602de13f3 100644 --- a/pkgs/applications/science/electronics/gaw/default.nix +++ b/pkgs/applications/science/electronics/gaw/default.nix @@ -19,7 +19,6 @@ stdenv.mkDerivation rec { buildInputs = [ gtk3 ]; meta = with lib; { - broken = stdenv.isDarwin; description = "Gtk Analog Wave viewer"; longDescription = '' Gaw is a software tool for displaying analog waveforms from @@ -30,6 +29,6 @@ stdenv.mkDerivation rec { homepage = "http://gaw.tuxfamily.org"; license = licenses.gpl2Plus; maintainers = with maintainers; [ fbeffa ]; - platforms = platforms.all; + platforms = platforms.linux; }; } From bc776c4d36fb20a80b0099bd616285e345ddf6dc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebasti=C3=A1n=20Mancilla?= Date: Sat, 9 Jul 2022 23:43:55 -0400 Subject: [PATCH 084/133] dotenv-linter: fix build on darwin Add missing Security framework as input. --- pkgs/development/tools/analysis/dotenv-linter/default.nix | 4 +++- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/analysis/dotenv-linter/default.nix b/pkgs/development/tools/analysis/dotenv-linter/default.nix index f1cf795d2e78..fdd4d84673b5 100644 --- a/pkgs/development/tools/analysis/dotenv-linter/default.nix +++ b/pkgs/development/tools/analysis/dotenv-linter/default.nix @@ -2,6 +2,7 @@ , lib , rustPlatform , fetchFromGitHub +, Security }: rustPlatform.buildRustPackage rec { @@ -17,8 +18,9 @@ rustPlatform.buildRustPackage rec { cargoSha256 = "sha256-q59hpnXc00OzrJk1KOWbIPQYfIE+7ku9XtTDXHgwQBg="; + buildInputs = lib.optional stdenv.isDarwin Security; + meta = with lib; { - broken = stdenv.isDarwin; description = "Lightning-fast linter for .env files. Written in Rust"; homepage = "https://dotenv-linter.github.io"; license = licenses.mit; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c05be7583114..43aa07cf480a 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3532,7 +3532,9 @@ with pkgs; dosage = callPackage ../applications/graphics/dosage { }; - dotenv-linter = callPackage ../development/tools/analysis/dotenv-linter { }; + dotenv-linter = callPackage ../development/tools/analysis/dotenv-linter { + inherit (darwin.apple_sdk.frameworks) Security; + }; inherit (ocamlPackages) dot-merlin-reader; From 6375863e93c634e3821b1e1781fd6e939abd0034 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebasti=C3=A1n=20Mancilla?= Date: Sat, 9 Jul 2022 23:49:22 -0400 Subject: [PATCH 085/133] mpd-discord-rpc: fix build on darwin Add missing Security framework as input. --- pkgs/tools/audio/mpd-discord-rpc/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/audio/mpd-discord-rpc/default.nix b/pkgs/tools/audio/mpd-discord-rpc/default.nix index cbaeb9e01145..7f363d28dcfb 100644 --- a/pkgs/tools/audio/mpd-discord-rpc/default.nix +++ b/pkgs/tools/audio/mpd-discord-rpc/default.nix @@ -4,6 +4,7 @@ , fetchFromGitHub , pkg-config , openssl +, Security }: rustPlatform.buildRustPackage rec { @@ -21,10 +22,9 @@ rustPlatform.buildRustPackage rec { nativeBuildInputs = [ pkg-config ]; - buildInputs = [ openssl ]; + buildInputs = [ openssl ] ++ lib.optional stdenv.isDarwin Security; meta = with lib; { - broken = stdenv.isDarwin; description = "Rust application which displays your currently playing song / album / artist from MPD in Discord using Rich Presence"; homepage = "https://github.com/JakeStanger/mpd-discord-rpc"; license = licenses.mit; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c05be7583114..eca14b7c3c73 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4214,7 +4214,9 @@ with pkgs; mpdris2 = callPackage ../tools/audio/mpdris2 { }; - mpd-discord-rpc = callPackage ../tools/audio/mpd-discord-rpc { }; + mpd-discord-rpc = callPackage ../tools/audio/mpd-discord-rpc { + inherit (darwin.apple_sdk.frameworks) Security; + }; mpd-mpris = callPackage ../tools/audio/mpd-mpris { }; From 8adfc29685055843d3d8171d78417b53eb2198ce Mon Sep 17 00:00:00 2001 From: Tobias Stenzel Date: Sun, 10 Jul 2022 05:53:18 +0200 Subject: [PATCH 086/133] myst-docutils: init at 0.17.2 (#171710) --- .../python-modules/myst-docutils/default.nix | 46 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 48 insertions(+) create mode 100644 pkgs/development/python-modules/myst-docutils/default.nix diff --git a/pkgs/development/python-modules/myst-docutils/default.nix b/pkgs/development/python-modules/myst-docutils/default.nix new file mode 100644 index 000000000000..5897573c8007 --- /dev/null +++ b/pkgs/development/python-modules/myst-docutils/default.nix @@ -0,0 +1,46 @@ +{ lib +, buildPythonPackage +, docutils +, fetchPypi +, flit-core +, jinja2 +, markdown-it-py +, mdit-py-plugins +, pythonOlder +, pyyaml +, typing-extensions +}: + +buildPythonPackage rec { + pname = "myst-docutils"; + version = "0.17.2"; + format = "pyproject"; + + src = fetchPypi { + inherit pname version; + sha256 = "sha256-Of3AVM0OsspcmvRAEXbfu2+V3ju6yqb2sFBexkbmNIU="; + }; + + nativeBuildInputs = [ + flit-core + ]; + + propagatedBuildInputs = [ + docutils + jinja2 + markdown-it-py + mdit-py-plugins + pyyaml + typing-extensions + ]; + + pythonImportsCheck = [ "myst_parser" ]; + + meta = with lib; { + description = "An extended commonmark compliant parser, with bridges to docutils/sphinx."; + homepage = "https://github.com/executablebooks/MyST-Parser"; + license = licenses.mit; + maintainers = with maintainers; [ dpausp ]; + broken = pythonOlder "3.8"; # dependency networkx requires 3.8 + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 6f11745db65f..39fbe08eee48 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5688,6 +5688,8 @@ in { mysql-connector = callPackage ../development/python-modules/mysql-connector { }; + myst-docutils = callPackage ../development/python-modules/myst-docutils { }; + myst-nb = callPackage ../development/python-modules/myst-nb { }; myst-parser = callPackage ../development/python-modules/myst-parser { }; From c39770ecc5468a54aeaafb941ca0a055788fc6aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebasti=C3=A1n=20Mancilla?= Date: Sat, 9 Jul 2022 23:55:57 -0400 Subject: [PATCH 087/133] libui: fix typo when installing libs on darwin --- pkgs/development/libraries/libui/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libui/default.nix b/pkgs/development/libraries/libui/default.nix index 14fb004187d8..a798977b1f41 100644 --- a/pkgs/development/libraries/libui/default.nix +++ b/pkgs/development/libraries/libui/default.nix @@ -30,7 +30,7 @@ stdenv.mkDerivation rec { ln -s $out/lib/libui.so.0 $out/lib/libui.so '' + lib.optionalString stdenv.isDarwin '' mv ./out/libui.A.dylib $out/lib/ - ln -s $out/lib/lubui.A.dylib $out/lib/libui.dylib + ln -s $out/lib/libui.A.dylib $out/lib/libui.dylib '' + '' cp $src/ui.h $out/include cp $src/ui_${backend}.h $out/include From cf88ead89d554904e2b29aef73df98d9bd336523 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebasti=C3=A1n=20Mancilla?= Date: Sat, 9 Jul 2022 23:56:43 -0400 Subject: [PATCH 088/133] untrunc-anthwlock: mark as unbroken on darwin Fixed by c39770ecc54 (libui: fix typo when installing libs on darwin, 2022-07-09). --- pkgs/tools/video/untrunc-anthwlock/default.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/pkgs/tools/video/untrunc-anthwlock/default.nix b/pkgs/tools/video/untrunc-anthwlock/default.nix index 83b56e2f056a..4b950fd0f220 100644 --- a/pkgs/tools/video/untrunc-anthwlock/default.nix +++ b/pkgs/tools/video/untrunc-anthwlock/default.nix @@ -27,7 +27,6 @@ stdenv.mkDerivation { enableParallelBuilding = true; meta = with lib; { - broken = stdenv.isDarwin; description = "Restore a truncated mp4/mov (improved version of ponchio/untrunc)"; homepage = "https://github.com/anthwlock/untrunc"; license = licenses.gpl2; From 3239a0535787625e036af8f59a45a5fe689ff4ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebasti=C3=A1n=20Mancilla?= Date: Sat, 9 Jul 2022 23:57:14 -0400 Subject: [PATCH 089/133] untrunc-anthwlock: refactor build Use buildPhase to make clear that we need two invocations of 'make' with different targets. Also set IS_RELEASE to 1 to ensure an optimized build is created instead of a debug build (see Makefile). --- pkgs/tools/video/untrunc-anthwlock/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/video/untrunc-anthwlock/default.nix b/pkgs/tools/video/untrunc-anthwlock/default.nix index 4b950fd0f220..c127bfe8740e 100644 --- a/pkgs/tools/video/untrunc-anthwlock/default.nix +++ b/pkgs/tools/video/untrunc-anthwlock/default.nix @@ -11,11 +11,13 @@ stdenv.mkDerivation { sha256 = "14i2lq68q990hnm2kkfamlsi67bcml85zl8yjsyxc5h8ncc2f3dp"; }; - buildInputs = [ ffmpeg libui ]; - postBuild = '' - make untrunc-gui + buildPhase = '' + runHook preBuild + make IS_RELEASE=1 untrunc + make IS_RELEASE=1 untrunc-gui + runHook postBuild ''; installPhase = '' From f170b3aebcf2ed764e75869c98259a7bdd4bdf0d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebasti=C3=A1n=20Mancilla?= Date: Sun, 10 Jul 2022 00:04:01 -0400 Subject: [PATCH 090/133] coan: fix build on darwin The configure script was failing because the `-std=c++11` flag was used when trying to compile C. Set the flag with CXXFLAGS instead. --- pkgs/development/tools/analysis/coan/default.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/pkgs/development/tools/analysis/coan/default.nix b/pkgs/development/tools/analysis/coan/default.nix index 3a1b26f1cc8a..ff564916dd3a 100644 --- a/pkgs/development/tools/analysis/coan/default.nix +++ b/pkgs/development/tools/analysis/coan/default.nix @@ -11,9 +11,7 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ perl ]; - NIX_CFLAGS_COMPILE = [ - "-std=c++11" - ]; + CXXFLAGS = "-std=c++11"; enableParallelBuilding = true; @@ -22,7 +20,6 @@ stdenv.mkDerivation rec { ''; meta = with lib; { - broken = stdenv.isDarwin; description = "The C preprocessor chainsaw"; longDescription = '' A software engineering tool for analysing preprocessor-based From 09ae560c929b4f119dfaf7fabdf94057f8721c4c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebasti=C3=A1n=20Mancilla?= Date: Sun, 10 Jul 2022 00:09:30 -0400 Subject: [PATCH 091/133] sigal: fix build on darwin Disable failing test. --- pkgs/applications/misc/sigal/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/misc/sigal/default.nix b/pkgs/applications/misc/sigal/default.nix index e8d382bbf21b..bc48ce3e2afc 100644 --- a/pkgs/applications/misc/sigal/default.nix +++ b/pkgs/applications/misc/sigal/default.nix @@ -36,12 +36,15 @@ python3.pkgs.buildPythonApplication rec { pytestCheckHook ]); + disabledTests = lib.optionals stdenv.isDarwin [ + "test_nonmedia_files" + ]; + makeWrapperArgs = [ "--prefix PATH : ${lib.makeBinPath [ ffmpeg ]}" ]; meta = with lib; { - broken = stdenv.isDarwin; description = "Yet another simple static gallery generator"; homepage = "http://sigal.saimon.org/"; license = licenses.mit; From ed2b3201768ff0050fb60b30b4887db05f48657b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebasti=C3=A1n=20Mancilla?= Date: Sun, 10 Jul 2022 00:13:31 -0400 Subject: [PATCH 092/133] boofuzz: fix build on darwin Disable tests that need network access. --- pkgs/tools/security/boofuzz/default.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/security/boofuzz/default.nix b/pkgs/tools/security/boofuzz/default.nix index 61ba2136d794..220a372b2e9e 100644 --- a/pkgs/tools/security/boofuzz/default.nix +++ b/pkgs/tools/security/boofuzz/default.nix @@ -37,9 +37,10 @@ python3.pkgs.buildPythonApplication rec { ]; disabledTests = [ - # Tests require socket access - "test_raw_l2" - "test_raw_l3" + "TestNetworkMonitor" + "TestNoResponseFailure" + "TestProcessMonitor" + "TestSocketConnection" ]; pythonImportsCheck = [ @@ -51,7 +52,5 @@ python3.pkgs.buildPythonApplication rec { homepage = "https://github.com/jtpereyda/boofuzz"; license = with licenses; [ gpl2Plus ]; maintainers = with maintainers; [ fab ]; - # FAILED unit_tests/test_monitors.py::TestProcessMonitor::test_set_options_persistent - broken = (stdenv.isDarwin && stdenv.isx86_64); }; } From e259d968555be7a93b524b50f75314e453e5d8e1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 10 Jul 2022 04:28:13 +0000 Subject: [PATCH 093/133] python310Packages.sunpy: 4.0.2 -> 4.0.3 --- pkgs/development/python-modules/sunpy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sunpy/default.nix b/pkgs/development/python-modules/sunpy/default.nix index beb7c5b73ada..cacfad61bbb8 100644 --- a/pkgs/development/python-modules/sunpy/default.nix +++ b/pkgs/development/python-modules/sunpy/default.nix @@ -31,14 +31,14 @@ buildPythonPackage rec { pname = "sunpy"; - version = "4.0.2"; + version = "4.0.3"; format = "setuptools"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - hash = "sha256-ZswUFdMRqEiMpTXAuVtEnsHJ4dgwcx2f4k1DwLl8pz8="; + hash = "sha256-Ett9CBubdyKJh9MkwUhQ1kQH6/zBb6Ma0CdEH5Eqcw8="; }; nativeBuildInputs = [ From 0b35c85b3ff888955f2637d3f1c754be00ad6034 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 10 Jul 2022 05:03:00 +0000 Subject: [PATCH 094/133] python310Packages.levenshtein: 0.18.2 -> 0.19.1 --- pkgs/development/python-modules/levenshtein/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/levenshtein/default.nix b/pkgs/development/python-modules/levenshtein/default.nix index 658e3c3d5cad..ab15163b972b 100644 --- a/pkgs/development/python-modules/levenshtein/default.nix +++ b/pkgs/development/python-modules/levenshtein/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "levenshtein"; - version = "0.18.2"; + version = "0.19.1"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -20,8 +20,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "maxbachmann"; repo = "Levenshtein"; - rev = "v${version}"; - hash = "sha256-FmEB0i235rzK6S1MV189iDNB+CYpcBvcdVE+kdclwmE="; + rev = "refs/tags/v${version}"; + hash = "sha256-2/m9vn3yHDt5sjE/hY3s3gBCkZnehbk25+VReLo2jn8="; }; nativeBuildInputs = [ From ce2e4707b782657e077a0ef072cbd67756cae673 Mon Sep 17 00:00:00 2001 From: yuu Date: Sat, 9 Jul 2022 20:53:35 -0300 Subject: [PATCH 095/133] hardware/nvidia: add @ to constraint on busIDType On some configurations, the only known syntax that works requires the `@` character, such as `intelBusId = "0@0:2:0";` and `nvidiaBusId = "1@1:0:0";` [1]. [1]. https://discourse.nixos.org/t/struggling-with-nvidia-prime/13794/4 --- nixos/modules/hardware/video/nvidia.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/hardware/video/nvidia.nix b/nixos/modules/hardware/video/nvidia.nix index b4717719661a..5fcd165186ff 100644 --- a/nixos/modules/hardware/video/nvidia.nix +++ b/nixos/modules/hardware/video/nvidia.nix @@ -24,7 +24,7 @@ let primeEnabled = syncCfg.enable || offloadCfg.enable; nvidiaPersistencedEnabled = cfg.nvidiaPersistenced; nvidiaSettings = cfg.nvidiaSettings; - busIDType = types.strMatching "([[:print:]]+\:[0-9]{1,3}\:[0-9]{1,2}\:[0-9])?"; + busIDType = types.strMatching "([[:print:]]+[\:\@][0-9]{1,3}\:[0-9]{1,2}\:[0-9])?"; in { From 33be3debd5f2121d0815ca3ba1bb556c615b4bb3 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Sun, 10 Jul 2022 01:39:54 +0000 Subject: [PATCH 096/133] terraform-providers: update 2022-07-10 --- .../workflows/update-terraform-providers.yml | 2 +- .../cluster/terraform-providers/default.nix | 1 + .../terraform-providers/providers.json | 150 +++++++++--------- 3 files changed, 77 insertions(+), 76 deletions(-) diff --git a/.github/workflows/update-terraform-providers.yml b/.github/workflows/update-terraform-providers.yml index c966505843a1..d332fef12e6c 100644 --- a/.github/workflows/update-terraform-providers.yml +++ b/.github/workflows/update-terraform-providers.yml @@ -2,7 +2,7 @@ name: "Update terraform-providers" on: schedule: - - cron: "14 3 * * 1" + - cron: "14 3 * * 0" workflow_dispatch: permissions: diff --git a/pkgs/applications/networking/cluster/terraform-providers/default.nix b/pkgs/applications/networking/cluster/terraform-providers/default.nix index 0dc1c9c1e65c..464ad345b3a3 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/default.nix +++ b/pkgs/applications/networking/cluster/terraform-providers/default.nix @@ -60,6 +60,7 @@ let special-providers = { brightbox = automated-providers.brightbox.override { mkProviderGoModule = buildGo118Module; }; + hcloud = automated-providers.hcloud.override { mkProviderGoModule = buildGo118Module; }; # mkisofs needed to create ISOs holding cloud-init data, # and wrapped to terraform via deecb4c1aab780047d79978c636eeb879dd68630 libvirt = automated-providers.libvirt.overrideAttrs (_: { propagatedBuildInputs = [ cdrtools ]; }); diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json index e8f337e2184d..e7a2bf691814 100644 --- a/pkgs/applications/networking/cluster/terraform-providers/providers.json +++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json @@ -12,10 +12,10 @@ "owner": "vancluever", "provider-source-address": "registry.terraform.io/vancluever/acme", "repo": "terraform-provider-acme", - "rev": "v2.9.0", - "sha256": "sha256-ptWoKXuV6jcDu2v1oOcW11VjXOgf/jUG1kpFGcNLHtw=", - "vendorSha256": "sha256-sU8g+mjn14H9f3LwomcNJ7ho8LpYjCEevv4++6KPzow=", - "version": "2.9.0" + "rev": "v2.10.0", + "sha256": "sha256-nafJJ2Gr2jA09mjh8hozdDgl67h+10D35KtqjTUPgBE=", + "vendorSha256": "sha256-lNI0u8DCBl4mGVecRfAqieCooyJlqK+Z4eixPFFyBuU=", + "version": "2.10.0" }, "age": { "owner": "clementblaise", @@ -76,10 +76,10 @@ "owner": "auth0", "provider-source-address": "registry.terraform.io/auth0/auth0", "repo": "terraform-provider-auth0", - "rev": "v0.31.0", - "sha256": "sha256-Huv+eL/5RiI2A1X8RLU9LbIWMjb5yuuslV4CaP/kFiQ=", - "vendorSha256": "sha256-kTR8kSirqhY1GdKLzeFIPt6QNJ4wq2ESUT5ShQUhvRI=", - "version": "0.31.0" + "rev": "v0.32.0", + "sha256": "sha256-zy5brS1KsQM8JZahcmIsBdUS389OoQ53d4OGHpF6zwo=", + "vendorSha256": "sha256-xQEgoYPXt3ivgOMk+yQMS0SlPhDJ5qCVsI12LMU6ZcI=", + "version": "0.32.0" }, "avi": { "owner": "vmware", @@ -103,28 +103,28 @@ "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/aws", "repo": "terraform-provider-aws", - "rev": "v4.21.0", - "sha256": "sha256-XqUJGcKQh2QfKjiIcJ02ZUZ+pKUZAaYErIdVRCKLAKM=", - "vendorSha256": "sha256-KimkmnSGgynmxS3VcmNP4d+B6j1xy4+OZXkoG2iIS/w=", - "version": "4.21.0" + "rev": "v4.22.0", + "sha256": "sha256-F+YzXIKkF/eGUY3l8MjeP+8GqS37e1N9b+fmNCkdeMM=", + "vendorSha256": "sha256-kz0bPsfLCekRj/ZGCBT+eFRMRkV+Dc69RkyBbFaztd0=", + "version": "4.22.0" }, "azuread": { "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/azuread", "repo": "terraform-provider-azuread", - "rev": "v2.25.0", - "sha256": "sha256-+9h9rdbnqIul+V/fhrsNEq/cX24i05i2LBqIk6g9mRE=", + "rev": "v2.26.0", + "sha256": "sha256-M61kkeBRLb0fDPH1FZH5koFRZqCVfTlEXJ8N0Amc8ac=", "vendorSha256": null, - "version": "2.25.0" + "version": "2.26.0" }, "azurerm": { "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/azurerm", "repo": "terraform-provider-azurerm", - "rev": "v3.12.0", - "sha256": "sha256-P/KFdDGDUJofsOEnPUJ3rAdZHoJw8YF3ReQFdSsMUj4=", + "rev": "v3.13.0", + "sha256": "sha256-ptEsCgJsB++RYtc+SekUPoV9ONRfGCCoPGM6alwQ/wY=", "vendorSha256": null, - "version": "3.12.0" + "version": "3.13.0" }, "azurestack": { "owner": "hashicorp", @@ -140,10 +140,10 @@ "owner": "baidubce", "provider-source-address": "registry.terraform.io/baidubce/baiducloud", "repo": "terraform-provider-baiducloud", - "rev": "v1.12.9", - "sha256": "sha256-RKkTKRipmTqAfCGWzibrIsTrckwvEKCQmPhNjCXmFR4=", - "vendorSha256": "sha256-pA2dAC8AasWLTlC+SddS4kWT16FqcyBrtdVMV9k/FtE=", - "version": "1.12.9" + "rev": "v1.13.0", + "sha256": "sha256-C/dvFwtqOJAXgk5CNr06cehOiVZ2c4Zcqcb+g/k0iPY=", + "vendorSha256": "sha256-GZZKJkK9ug6iUhaAXxR2nKfQQ96MHiYv/hsaB5O9Oig=", + "version": "1.13.0" }, "bigip": { "owner": "F5Networks", @@ -185,10 +185,10 @@ "owner": "checkly", "provider-source-address": "registry.terraform.io/checkly/checkly", "repo": "terraform-provider-checkly", - "rev": "v1.6.0", - "sha256": "sha256-zmA6fVpXW4HOJaZzmv5K6cbmO2vM3yGWsa9TSYY4obY=", + "rev": "v1.6.1", + "sha256": "sha256-vzYOieW4KdYcaPSSa6j57GsPAAIdwmWu5hIBCCmnstM=", "vendorSha256": "sha256-VnYRDBneQ+bUzISJM9DJdBEBmjA1WOXPo+kaYBW4w4U=", - "version": "1.6.0" + "version": "1.6.1" }, "checkpoint": { "deleteVendor": true, @@ -367,10 +367,10 @@ "owner": "equinix", "provider-source-address": "registry.terraform.io/equinix/equinix", "repo": "terraform-provider-equinix", - "rev": "v1.6.0", - "sha256": "sha256-wvx0dZS38i5B7Jpaaa9iuv93PyzNAaKCxxU8OxklOhE=", - "vendorSha256": "sha256-tWMmwCFWwRvsFC/Bu4Eax+uopxN3ijRP9qr35bcg6qQ=", - "version": "1.6.0" + "rev": "v1.6.1", + "sha256": "sha256-QktIBtSz7UZoU6+z/sjpU4bZhc+Cw1BptO6hW19uJoU=", + "vendorSha256": "sha256-G1lDfygJnuJaQ4ms2/R6oynZCJAtIwx7xoU6Bec3CfQ=", + "version": "1.6.1" }, "exoscale": { "owner": "exoscale", @@ -394,10 +394,10 @@ "owner": "fastly", "provider-source-address": "registry.terraform.io/fastly/fastly", "repo": "terraform-provider-fastly", - "rev": "v2.1.0", - "sha256": "sha256-d6hi8b8KdCBHvb3pRR5UB+jC81aVYnj1RgzOI6wO6jA=", + "rev": "v2.2.0", + "sha256": "sha256-x5Rl4JW59kuAoX0pSpCpto3dcvyEhvZlocg8fv2R6Jw=", "vendorSha256": null, - "version": "2.1.0" + "version": "2.2.0" }, "flexibleengine": { "owner": "FlexibleEngineCloud", @@ -439,10 +439,10 @@ "owner": "gitlabhq", "provider-source-address": "registry.terraform.io/gitlabhq/gitlab", "repo": "terraform-provider-gitlab", - "rev": "v3.15.1", - "sha256": "sha256-10dxre+HwpXZ//+PfQvAa3bipHCaJ4+dgaMXiTkSS04=", - "vendorSha256": "sha256-uc29HXlsMRn/MuXlOfYIr49NtfN1goL4y22EX3farBU=", - "version": "3.15.1" + "rev": "v3.16.0", + "sha256": "sha256-RG1d0B6SdT3c9zIHtOZUZBHOdi7azc9uJe0aDdY5c/U=", + "vendorSha256": "sha256-5OXllLq5VjFpay2vVEXczqvSmgLeAQ66fXqYf+eDJOI=", + "version": "3.16.0" }, "google": { "owner": "hashicorp", @@ -495,10 +495,10 @@ "owner": "hetznercloud", "provider-source-address": "registry.terraform.io/hetznercloud/hcloud", "repo": "terraform-provider-hcloud", - "rev": "v1.34.1", - "sha256": "sha256-+Duv9D4yG2bS9xGJIfA86nSpPk6TFuGjk8CZp5dUigU=", - "vendorSha256": "sha256-fFQte/gp/PY/cdTS6ehoqgNYvCqRj88cOLGzf5bxn+U=", - "version": "1.34.1" + "rev": "v1.34.3", + "sha256": "sha256-3p7pdpBxrbKZx6di39GQb2DOS2ZtN4uVmIb2OU0Zs+c=", + "vendorSha256": "sha256-3JFdsuJlDW6xTgSgn7hkIWfH9Iqr35t8op4yVXYIFpg=", + "version": "1.34.3" }, "helm": { "owner": "hashicorp", @@ -648,10 +648,10 @@ "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/kubernetes", "repo": "terraform-provider-kubernetes", - "rev": "v2.12.0", - "sha256": "sha256-MmXJutHh1M/KLJvF8h8hFrihiTOUDxwuXPtxeUvUgAw=", + "rev": "v2.12.1", + "sha256": "sha256-wswBD4XqtHZsg8vhxIqtjZkXNhFLu/nHUCJDW/24dbQ=", "vendorSha256": null, - "version": "2.12.0" + "version": "2.12.1" }, "launchdarkly": { "owner": "launchdarkly", @@ -756,10 +756,10 @@ "owner": "mongodb", "provider-source-address": "registry.terraform.io/mongodb/mongodbatlas", "repo": "terraform-provider-mongodbatlas", - "rev": "v1.3.1", - "sha256": "sha256-X2Utt+MUboLc0/nAXB78ko3w2ieTIQaVsDK6MhbUKSQ=", - "vendorSha256": "sha256-yZ/TgAVlBxHhrrZU6SH1KXNoZj8oWRqx3BjVHkTtI+Q=", - "version": "1.3.1" + "rev": "v1.4.2", + "sha256": "sha256-bu/DpqeOIIgtUauBVzbKW+DHJUoD2oVhIhmk+M7fcBg=", + "vendorSha256": "sha256-yomqc0uxB02zi/IfZKIOBq3mcs0GkHbRpaQos0jcELw=", + "version": "1.4.2" }, "namecheap": { "owner": "namecheap", @@ -838,28 +838,28 @@ "owner": "nutanix", "provider-source-address": "registry.terraform.io/nutanix/nutanix", "repo": "terraform-provider-nutanix", - "rev": "v1.5.0", - "sha256": "sha256-H8wLMLBB4pSbiilmP9C0WPn62fCYHgPhy8OlvtrUYro=", + "rev": "v1.6.1", + "sha256": "sha256-eqWx48ARoL2elnaqTgp/L6a0K8TFSvIFaNH72gdbrZA=", "vendorSha256": "sha256-LRIfxQGwG988HE5fftGl6JmBG7tTknvmgpm4Fu1NbWI=", - "version": "1.5.0" + "version": "1.6.1" }, "oci": { "owner": "oracle", "provider-source-address": "registry.terraform.io/oracle/oci", "repo": "terraform-provider-oci", - "rev": "v4.82.0", - "sha256": "sha256-S/UraZfbirBkUjLQQO+6imvNVGRu+lzENIWKlobHdGw=", + "rev": "v4.83.0", + "sha256": "sha256-WuvWE3k2j1whH7UaEx7fa4lZF+GZUKp7T1bVpatxF1w=", "vendorSha256": null, - "version": "4.82.0" + "version": "4.83.0" }, "okta": { "owner": "okta", "provider-source-address": "registry.terraform.io/okta/okta", "repo": "terraform-provider-okta", - "rev": "v3.30.0", - "sha256": "sha256-iE+lLWnVwb5jUt4EsNc3jZqQ4HEtjE8GB2RniKGegy0=", - "vendorSha256": "sha256-9Qz3uGI2x40XL8JAB9l3Lsw6OQ47sHEBFVJNgsbVt/c=", - "version": "3.30.0" + "rev": "v3.31.0", + "sha256": "sha256-IUCiImmT4LG58r342mvWVMxBjVO9zGX8BVHe5G1GiMg=", + "vendorSha256": "sha256-BnxtHEd1C0DOUPVggPCXSBtQ36gcNwL7Hl0Pl1B5e4U=", + "version": "3.31.0" }, "oktaasa": { "owner": "oktadeveloper", @@ -874,10 +874,10 @@ "owner": "OpenNebula", "provider-source-address": "registry.terraform.io/OpenNebula/opennebula", "repo": "terraform-provider-opennebula", - "rev": "v0.5.0", - "sha256": "sha256-MJQQyU+NmLbIWSQY1BqWKY7q9RrF+HAFIr8AFNg2dWc=", + "rev": "v0.5.1", + "sha256": "sha256-lrdL0aWgrODvgI0gUW1tmHEHldeD5jJzOCD2BMvGPM8=", "vendorSha256": "sha256-NOIXn4RWMUz0invWRqAHxVWez7MD0DyWccwcKYz8jTY=", - "version": "0.5.0" + "version": "0.5.1" }, "openstack": { "owner": "terraform-provider-openstack", @@ -892,10 +892,10 @@ "owner": "opentelekomcloud", "provider-source-address": "registry.terraform.io/opentelekomcloud/opentelekomcloud", "repo": "terraform-provider-opentelekomcloud", - "rev": "v1.29.8", - "sha256": "sha256-oIJ+ygunt8ilW3IfnR0sAvwLOxknt7BN5Ks63tJMbQ4=", - "vendorSha256": "sha256-1z5SaH6AoYkrMZVnNurZLmtvVRDNwTBwmQMX0KngKpA=", - "version": "1.29.8" + "rev": "v1.29.9", + "sha256": "sha256-jVDpiNGGw93XLAMYaDrO3mEcok3bnzC4y9tz6C27lhM=", + "vendorSha256": "sha256-ImrWG+IPNkFr9lTGdiYaBU2OnHrKXIiNIDGSy4Br+Aw=", + "version": "1.29.9" }, "opsgenie": { "owner": "opsgenie", @@ -1090,10 +1090,10 @@ "owner": "spotinst", "provider-source-address": "registry.terraform.io/spotinst/spotinst", "repo": "terraform-provider-spotinst", - "rev": "v1.78.0", - "sha256": "sha256-Irbjqp4Yoa8+nNxCLdXvFTCQZhRWUcXK9WfqayIIiPU=", - "vendorSha256": "sha256-uXRatEtZMP6V1yJQHSjbWNXKf/DGLTvkCZM7LhbbElU=", - "version": "1.78.0" + "rev": "v1.79.0", + "sha256": "sha256-UOqXUUqbZ7qVlqFI1YABahfW4+ghyMS7n2Yc9Lfd6cc=", + "vendorSha256": "sha256-AJfQhIsh7a1WVQ//oT6P12H/sqmGtKD7jwW3JthvVNQ=", + "version": "1.79.0" }, "stackpath": { "owner": "stackpath", @@ -1126,19 +1126,19 @@ "owner": "tencentcloudstack", "provider-source-address": "registry.terraform.io/tencentcloudstack/tencentcloud", "repo": "terraform-provider-tencentcloud", - "rev": "v1.75.5", - "sha256": "sha256-tDdNkDtUuwtOrbvdR/NPUXpsyrRsES4MtreOKD7/PYc=", + "rev": "v1.75.7", + "sha256": "sha256-FSdBAaG1xrr0Jnl7wPsaooraerlqKti5uskZyixkbSY=", "vendorSha256": null, - "version": "1.75.5" + "version": "1.75.7" }, "tfe": { "owner": "hashicorp", "provider-source-address": "registry.terraform.io/hashicorp/tfe", "repo": "terraform-provider-tfe", - "rev": "v0.32.1", - "sha256": "sha256-7a2uc0f7+OFrbCvHJkKyeX7hXR63PpzpfNhUCWHqOxU=", - "vendorSha256": "sha256-V1nXhDwDMWJsbhPu9otXrOmtzVv0rjvL7CH/13AR5iw=", - "version": "0.32.1" + "rev": "v0.33.0", + "sha256": "sha256-OmQQau3nr84sSIiCGeoi2vDvvoK2L7Zve2tzuul0Wyg=", + "vendorSha256": "sha256-IeteO1xIpEwdfHGkz9SKy5EZJCHsHho2L02O6yWzoTk=", + "version": "0.33.0" }, "thunder": { "owner": "a10networks", From c4e35baa74345a9aebc65f0675d7575b948f1117 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 10 Jul 2022 07:41:02 +0000 Subject: [PATCH 097/133] python310Packages.pymazda: 0.3.4 -> 0.3.6 --- pkgs/development/python-modules/pymazda/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pymazda/default.nix b/pkgs/development/python-modules/pymazda/default.nix index 228323f94845..4ac8ed9ba65c 100644 --- a/pkgs/development/python-modules/pymazda/default.nix +++ b/pkgs/development/python-modules/pymazda/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "pymazda"; - version = "0.3.4"; + version = "0.3.6"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "sha256-Xq+DXrZp1NrsCgUnjaMWUoM+SDfnXK+YDX2Gcr7FKvQ="; + sha256 = "sha256-zzyaG1i5eEnQWBiW8Wh/cIncJsU/XdEC61JmkB6Z6mY="; }; propagatedBuildInputs = [ From b3db8355ca23aa716da5bb0b3e1785cf0af2e0b4 Mon Sep 17 00:00:00 2001 From: kilianar Date: Sun, 10 Jul 2022 10:10:27 +0200 Subject: [PATCH 098/133] papirus-icon-theme: 20220606 -> 20220710 --- pkgs/data/icons/papirus-icon-theme/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/icons/papirus-icon-theme/default.nix b/pkgs/data/icons/papirus-icon-theme/default.nix index d00da5cf478d..35ccd3764331 100644 --- a/pkgs/data/icons/papirus-icon-theme/default.nix +++ b/pkgs/data/icons/papirus-icon-theme/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "papirus-icon-theme"; - version = "20220606"; + version = "20220710"; src = fetchFromGitHub { owner = "PapirusDevelopmentTeam"; repo = pname; rev = version; - sha256 = "sha256-HJb77ArzwMX9ZYTp0Ffxxtst1/xhPAa+eEP5n950DSs="; + sha256 = "sha256-CInoUlWMmLwc4mMi1krmXr2a2JCWZ7XcPe20wFSNjqk="; }; nativeBuildInputs = [ gtk3 papirus-folders ]; From 259acf447a247502bbf4cf00a858b0d3807c3540 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 10 Jul 2022 10:54:43 +0200 Subject: [PATCH 099/133] python310Packages.panflute: add pythonImportsCheck --- .../python-modules/panflute/default.nix | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/pkgs/development/python-modules/panflute/default.nix b/pkgs/development/python-modules/panflute/default.nix index 2e5cd4621c56..4e91756e647e 100644 --- a/pkgs/development/python-modules/panflute/default.nix +++ b/pkgs/development/python-modules/panflute/default.nix @@ -3,18 +3,19 @@ , click , pyyaml , buildPythonPackage -, isPy3k +, pythonOlder }: buildPythonPackage rec{ - version = "2.1.5"; pname = "panflute"; + version = "2.1.5"; + format = "setuptools"; - disabled = !isPy3k; - + disabled = pythonOlder "3.7"; + src = fetchPypi { inherit pname version; - sha256 = "sha256-7xHcWVoZh51PlonvmoOCBKJGNMpjT7z8jkoO1B65EqE="; + hash = "sha256-7xHcWVoZh51PlonvmoOCBKJGNMpjT7z8jkoO1B65EqE="; }; propagatedBuildInputs = [ @@ -22,8 +23,12 @@ buildPythonPackage rec{ pyyaml ]; + pythonImportsCheck = [ + "panflute" + ]; + meta = with lib; { - description = "A Pythonic alternative to John MacFarlane's pandocfilters, with extra helper functions"; + description = "Pythonic alternative to John MacFarlane's pandocfilters, with extra helper functions"; homepage = "http://scorreia.com/software/panflute"; license = licenses.bsd3; maintainers = with maintainers; [ synthetica ]; From 90514b78654ae4706355884ef0f5782cb1943d69 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 10 Jul 2022 10:56:55 +0200 Subject: [PATCH 100/133] python310Packages.panflute: remove whitespace --- pkgs/development/python-modules/panflute/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/panflute/default.nix b/pkgs/development/python-modules/panflute/default.nix index 4e91756e647e..610c63aeacd5 100644 --- a/pkgs/development/python-modules/panflute/default.nix +++ b/pkgs/development/python-modules/panflute/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec{ format = "setuptools"; disabled = pythonOlder "3.7"; - + src = fetchPypi { inherit pname version; hash = "sha256-7xHcWVoZh51PlonvmoOCBKJGNMpjT7z8jkoO1B65EqE="; From 9ac4852b3d281e2800d80d4e08c256b8ce2cf4a0 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 10 Jul 2022 11:08:47 +0200 Subject: [PATCH 101/133] python310Packages.aio-geojson-usgs-earthquakes: init at 0.1 --- .../aio-geojson-usgs-earthquakes/default.nix | 51 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 53 insertions(+) create mode 100644 pkgs/development/python-modules/aio-geojson-usgs-earthquakes/default.nix diff --git a/pkgs/development/python-modules/aio-geojson-usgs-earthquakes/default.nix b/pkgs/development/python-modules/aio-geojson-usgs-earthquakes/default.nix new file mode 100644 index 000000000000..0fde28910415 --- /dev/null +++ b/pkgs/development/python-modules/aio-geojson-usgs-earthquakes/default.nix @@ -0,0 +1,51 @@ +{ lib +, aio-geojson-client +, aiohttp +, aresponses +, asynctest +, buildPythonPackage +, fetchFromGitHub +, pytest-asyncio +, pytestCheckHook +, pytz +, pythonOlder +}: + +buildPythonPackage rec { + pname = "aio-geojson-usgs-earthquakes"; + version = "0.1"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "exxamalte"; + repo = "python-aio-geojson-usgs-earthquakes"; + rev = "v${version}"; + hash = "sha256-Hb0/BdK/jjxlPl9WJJpFdOCzZpZDCguXoGreGIyN8oo="; + }; + + propagatedBuildInputs = [ + aio-geojson-client + aiohttp + pytz + ]; + + checkInputs = [ + aresponses + asynctest + pytest-asyncio + pytestCheckHook + ]; + + pythonImportsCheck = [ + "aio_geojson_usgs_earthquakes" + ]; + + meta = with lib; { + description = "Python module for accessing the U.S. Geological Survey Earthquake Hazards Program feeds"; + homepage = "https://github.com/exxamalte/python-aio-geojson-usgs-earthquakes"; + license = with licenses; [ asl20 ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index df044ef44b38..1ad375be219b 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -241,6 +241,8 @@ in { aio-geojson-nsw-rfs-incidents = callPackage ../development/python-modules/aio-geojson-nsw-rfs-incidents { }; + aio-geojson-usgs-earthquakes = callPackage ../development/python-modules/aio-geojson-usgs-earthquakes { }; + aio-georss-client = callPackage ../development/python-modules/aio-georss-client { }; aio-georss-gdacs = callPackage ../development/python-modules/aio-georss-gdacs { }; From accc93f1dc7a5d0863601f40fba19b5303e06042 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 10 Jul 2022 11:10:13 +0200 Subject: [PATCH 102/133] home-assistant: update component-packages --- pkgs/servers/home-assistant/component-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 1c65fce6e7fe..0fb57ef07f70 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -2917,7 +2917,8 @@ "uscis" = ps: with ps; [ ]; # missing inputs: uscisstatus "usgs_earthquakes_feed" = ps: with ps; [ - ]; # missing inputs: aio_geojson_usgs_earthquakes + aio-geojson-usgs-earthquakes + ]; "utility_meter" = ps: with ps; [ croniter ]; @@ -3803,6 +3804,7 @@ "uptime" "uptimerobot" "usb" + "usgs_earthquakes_feed" "utility_meter" "uvc" "vacuum" From ada1d87767b8826ea6233952279a1d6c77784bc0 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sat, 9 Jul 2022 07:07:48 +0000 Subject: [PATCH 103/133] python3.pkgs.graphite_beacon: remove Due to lack of maintenance. It is not compatible with the default Python version (due to the tornado 5) dependency, and doesn't look like it will be any time soon. --- .../from_md/release-notes/rl-2211.section.xml | 7 ++++ .../manual/release-notes/rl-2211.section.md | 3 ++ .../modules/services/monitoring/graphite.nix | 28 ++-------------- nixos/tests/graphite.nix | 2 -- .../graphite_beacon/default.nix | 33 ------------------- pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 4 +-- 7 files changed, 14 insertions(+), 64 deletions(-) delete mode 100644 pkgs/development/python-modules/graphite_beacon/default.nix diff --git a/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml index 2aa88d4bd93d..06aed6cca9e2 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml @@ -250,6 +250,13 @@ maintainer to update the package. + + + The services.graphite.beacon NixOS option, + and the python3.pkgs.graphite_beacon + package, has been removed due to lack of upstream maintenance. + + (Neo)Vim can not be configured with diff --git a/nixos/doc/manual/release-notes/rl-2211.section.md b/nixos/doc/manual/release-notes/rl-2211.section.md index 15c95c9206b2..ea3aea8f542f 100644 --- a/nixos/doc/manual/release-notes/rl-2211.section.md +++ b/nixos/doc/manual/release-notes/rl-2211.section.md @@ -97,6 +97,9 @@ In addition to numerous new and upgraded packages, this release has the followin - riak package removed along with `services.riak` module, due to lack of maintainer to update the package. +- The `services.graphite.beacon` NixOS option, and the `python3.pkgs.graphite_beacon` + package, has been removed due to lack of upstream maintenance. + - (Neo)Vim can not be configured with `configure.pathogen` anymore to reduce maintainance burden. Use `configure.packages` instead. diff --git a/nixos/modules/services/monitoring/graphite.nix b/nixos/modules/services/monitoring/graphite.nix index baa943302a00..9098cc797edf 100644 --- a/nixos/modules/services/monitoring/graphite.nix +++ b/nixos/modules/services/monitoring/graphite.nix @@ -72,6 +72,7 @@ let in { imports = [ + (mkRemovedOptionModule ["services" "graphite" "beacon"] "") (mkRemovedOptionModule ["services" "graphite" "pager"] "") ]; @@ -354,16 +355,6 @@ in { ''; }; }; - - beacon = { - enable = mkEnableOption "graphite beacon"; - - config = mkOption { - description = "Graphite beacon configuration."; - default = {}; - type = types.attrs; - }; - }; }; ###### implementation @@ -550,25 +541,10 @@ in { services.mongodb.enable = mkDefault true; }) - (mkIf cfg.beacon.enable { - systemd.services.graphite-beacon = { - description = "Grpahite Beacon Alerting Daemon"; - wantedBy = [ "multi-user.target" ]; - serviceConfig = { - ExecStart = '' - ${pkgs.python3Packages.graphite_beacon}/bin/graphite-beacon \ - --config=${pkgs.writeText "graphite-beacon.json" (builtins.toJSON cfg.beacon.config)} - ''; - User = "graphite"; - Group = "graphite"; - }; - }; - }) - (mkIf ( cfg.carbon.enableCache || cfg.carbon.enableAggregator || cfg.carbon.enableRelay || cfg.web.enable || cfg.api.enable || - cfg.seyren.enable || cfg.beacon.enable + cfg.seyren.enable ) { users.users.graphite = { uid = config.ids.uids.graphite; diff --git a/nixos/tests/graphite.nix b/nixos/tests/graphite.nix index 496f16846ea6..ce6b667bd344 100644 --- a/nixos/tests/graphite.nix +++ b/nixos/tests/graphite.nix @@ -19,7 +19,6 @@ import ./make-test-python.nix ({ pkgs, ... } : }; carbon.enableCache = true; seyren.enable = false; # Implicitely requires openssl-1.0.2u which is marked insecure - beacon.enable = true; }; }; }; @@ -29,7 +28,6 @@ import ./make-test-python.nix ({ pkgs, ... } : one.wait_for_unit("default.target") one.wait_for_unit("graphiteWeb.service") one.wait_for_unit("graphiteApi.service") - one.wait_for_unit("graphite-beacon.service") one.wait_for_unit("carbonCache.service") # The services above are of type "simple". systemd considers them active immediately # even if they're still in preStart (which takes quite long for graphiteWeb). diff --git a/pkgs/development/python-modules/graphite_beacon/default.nix b/pkgs/development/python-modules/graphite_beacon/default.nix deleted file mode 100644 index 20522d283045..000000000000 --- a/pkgs/development/python-modules/graphite_beacon/default.nix +++ /dev/null @@ -1,33 +0,0 @@ -{ lib, buildPythonPackage, fetchPypi -, tornado_5, pyyaml, funcparserlib -, nixosTests -}: - -buildPythonPackage rec { - pname = "graphite_beacon"; - version = "0.27.0"; - - src = fetchPypi { - inherit pname version; - sha256 = "03bp4wyfn3xhcqyvs5hnk1n87m4smsmm1p7qp459m7j8hwpbq2ks"; - }; - - propagatedBuildInputs = [ tornado_5 pyyaml funcparserlib ]; - - postPatch = '' - substituteInPlace requirements.txt --replace "==" ">=" - ''; - - pythonImportsCheck = [ "graphite_beacon" ]; - - passthru.tests = { - nixos = nixosTests.graphite; - }; - - meta = with lib; { - description = "A simple alerting application for Graphite metrics"; - homepage = "https://github.com/klen/graphite-beacon"; - maintainers = [ maintainers.offline ]; - license = licenses.mit; - }; -} diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index c1e4d27d3ff3..941ecc82c7bb 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -79,6 +79,7 @@ mapAliases ({ glances = throw "glances has moved to pkgs.glances"; # added 2020-20-28 google_api_python_client = google-api-python-client; # added 2021-03-19 googleapis_common_protos = googleapis-common-protos; # added 2021-03-19 + graphite_beacon = throw "graphite_beacon was removed, because it is no longer maintained"; # added 2022-07-09 grpc_google_iam_v1 = grpc-google-iam-v1; # added 2021-08-21 ha-av = throw "ha-av was removed, because it is no longer maintained"; # added 2022-04-06 HAP-python = hap-python; # added 2021-06-01 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index df044ef44b38..18b543d73f1c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3755,8 +3755,6 @@ in { graphite_api = callPackage ../development/python-modules/graphite-api { }; - graphite_beacon = callPackage ../development/python-modules/graphite_beacon { }; - graphite-web = callPackage ../development/python-modules/graphite-web { }; graphene = callPackage ../development/python-modules/graphene { }; @@ -10656,7 +10654,7 @@ in { # Used by circus and grab-site, 2020-08-29 tornado_4 = callPackage ../development/python-modules/tornado/4.nix { }; - # Used by streamlit, graphite_beacon, 2021-01-29 + # Used by streamlit, 2021-01-29 tornado_5 = callPackage ../development/python-modules/tornado/5.nix { }; torrequest = callPackage ../development/python-modules/torrequest { }; From 032655547ad188e054f8a7c3a4b779df0f9abf32 Mon Sep 17 00:00:00 2001 From: Sebastian Sellmeier Date: Sun, 10 Jul 2022 11:21:44 +0200 Subject: [PATCH 104/133] notepad-next: 0.5.2 -> 0.5.3 --- pkgs/applications/editors/notepad-next/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/editors/notepad-next/default.nix b/pkgs/applications/editors/notepad-next/default.nix index aaa751ea503c..06d5997af1e8 100644 --- a/pkgs/applications/editors/notepad-next/default.nix +++ b/pkgs/applications/editors/notepad-next/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "notepad-next"; - version = "0.5.2"; + version = "0.5.3"; src = fetchFromGitHub { owner = "dail8859"; repo = "NotepadNext"; rev = "v${version}"; - sha256 = "sha256-LyUV85wW6FGlkV0qSIfkLMHpXXj1qvRnGZuYy8ASwZ8="; + sha256 = "sha256-9VbtSpWiSVNRydqpTJ0Zd2/9mXy18Drl6q61BHZ0zrs="; # External dependencies - https://github.com/dail8859/NotepadNext/issues/135 fetchSubmodules = true; }; From 30874a7b94041cc3bd747af38f4ea2153ea1c32e Mon Sep 17 00:00:00 2001 From: Marek Fajkus Date: Sun, 10 Jul 2022 11:33:02 +0200 Subject: [PATCH 105/133] elmPackages: semi-automatic update of nodejs packages --- .../elm/packages/node-composition.nix | 2 +- .../compilers/elm/packages/node-packages.nix | 1890 ++++++++--------- 2 files changed, 945 insertions(+), 947 deletions(-) diff --git a/pkgs/development/compilers/elm/packages/node-composition.nix b/pkgs/development/compilers/elm/packages/node-composition.nix index bbb39db07b71..8fd8c0ffcce3 100644 --- a/pkgs/development/compilers/elm/packages/node-composition.nix +++ b/pkgs/development/compilers/elm/packages/node-composition.nix @@ -2,7 +2,7 @@ {pkgs ? import { inherit system; - }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-14_x"}: + }, system ? builtins.currentSystem, nodejs ? pkgs."nodejs-12_x"}: let nodeEnv = import ../../../node-packages/node-env.nix { diff --git a/pkgs/development/compilers/elm/packages/node-packages.nix b/pkgs/development/compilers/elm/packages/node-packages.nix index 546bad323fc6..5964eb66f8dc 100644 --- a/pkgs/development/compilers/elm/packages/node-packages.nix +++ b/pkgs/development/compilers/elm/packages/node-packages.nix @@ -22,22 +22,22 @@ let sha512 = "OfC2uemaknXr87bdLUkWog7nYuliM9Ij5HUcajsVcMCpQrcLmtxRbVFTIqmcSkSeYRBFBRxs2FiUqFJDLdiebA=="; }; }; - "@babel/code-frame-7.16.7" = { + "@babel/code-frame-7.18.6" = { name = "_at_babel_slash_code-frame"; packageName = "@babel/code-frame"; - version = "7.16.7"; + version = "7.18.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.16.7.tgz"; - sha512 = "iAXqUn8IIeBTNd72xsFlgaXHkMBMt6y4HJp1tIaK465CWLT/fG1aqB7ykr95gHHmlBdGbFeWWfyB4NJJ0nmeIg=="; + url = "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.18.6.tgz"; + sha512 = "TDCmlK5eOvH+eH7cdAFlNXeVJqWIQ7gW9tY1GJIpUtFb6CmjVyq2VM3u71bOyR8CRihcCgMUYoDNyLXao3+70Q=="; }; }; - "@babel/compat-data-7.17.10" = { + "@babel/compat-data-7.18.8" = { name = "_at_babel_slash_compat-data"; packageName = "@babel/compat-data"; - version = "7.17.10"; + version = "7.18.8"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.17.10.tgz"; - sha512 = "GZt/TCsG70Ms19gfZO1tM4CVnXsPgEPBCpJu+Qz3L0LUDsY5nZqFZglIoPC1kIYOtNBZlrnFT+klg12vFGZXrw=="; + url = "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.18.8.tgz"; + sha512 = "HSmX4WZPPK3FUxYp7g2T6EyO8j96HlZJlxmKPSh6KAcqwyDrfx7hKjXpAW/0FhFfTJsR0Yt4lAjLI2coMptIHQ=="; }; }; "@babel/core-7.12.10" = { @@ -49,355 +49,355 @@ let sha512 = "eTAlQKq65zHfkHZV0sIVODCPGVgoo1HdBlbSLi9CqOzuZanMv2ihzY+4paiKr1mH+XmYESMAmJ/dpZ68eN6d8w=="; }; }; - "@babel/generator-7.18.2" = { + "@babel/generator-7.18.7" = { name = "_at_babel_slash_generator"; packageName = "@babel/generator"; - version = "7.18.2"; + version = "7.18.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/generator/-/generator-7.18.2.tgz"; - sha512 = "W1lG5vUwFvfMd8HVXqdfbuG7RuaSrTCCD8cl8fP8wOivdbtbIg2Db3IWUcgvfxKbbn6ZBGYRW/Zk1MIwK49mgw=="; + url = "https://registry.npmjs.org/@babel/generator/-/generator-7.18.7.tgz"; + sha512 = "shck+7VLlY72a2w9c3zYWuE1pwOKEiQHV7GTUbSnhyl5eu3i04t30tBY82ZRWrDfo3gkakCFtevExnxbkf2a3A=="; }; }; - "@babel/helper-annotate-as-pure-7.16.7" = { + "@babel/helper-annotate-as-pure-7.18.6" = { name = "_at_babel_slash_helper-annotate-as-pure"; packageName = "@babel/helper-annotate-as-pure"; - version = "7.16.7"; + version = "7.18.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.16.7.tgz"; - sha512 = "s6t2w/IPQVTAET1HitoowRGXooX8mCgtuP5195wD/QJPV6wYjpujCGF7JuMODVX2ZAJOf1GT6DT9MHEZvLOFSw=="; + url = "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.18.6.tgz"; + sha512 = "duORpUiYrEpzKIop6iNbjnwKLAKnJ47csTyRACyEmWj0QdUrm5aqNJGHSSEQSUAvNW0ojX0dOmK9dZduvkfeXA=="; }; }; - "@babel/helper-builder-binary-assignment-operator-visitor-7.16.7" = { + "@babel/helper-builder-binary-assignment-operator-visitor-7.18.6" = { name = "_at_babel_slash_helper-builder-binary-assignment-operator-visitor"; packageName = "@babel/helper-builder-binary-assignment-operator-visitor"; - version = "7.16.7"; + version = "7.18.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.16.7.tgz"; - sha512 = "C6FdbRaxYjwVu/geKW4ZeQ0Q31AftgRcdSnZ5/jsH6BzCJbtvXvhpfkbkThYSuutZA7nCXpPR6AD9zd1dprMkA=="; + url = "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.18.6.tgz"; + sha512 = "KT10c1oWEpmrIRYnthbzHgoOf6B+Xd6a5yhdbNtdhtG7aO1or5HViuf1TQR36xY/QprXA5nvxO6nAjhJ4y38jw=="; }; }; - "@babel/helper-compilation-targets-7.18.2" = { + "@babel/helper-compilation-targets-7.18.6" = { name = "_at_babel_slash_helper-compilation-targets"; packageName = "@babel/helper-compilation-targets"; - version = "7.18.2"; + version = "7.18.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.18.2.tgz"; - sha512 = "s1jnPotJS9uQnzFtiZVBUxe67CuBa679oWFHpxYYnTpRL/1ffhyX44R9uYiXoa/pLXcY9H2moJta0iaanlk/rQ=="; + url = "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.18.6.tgz"; + sha512 = "vFjbfhNCzqdeAtZflUFrG5YIFqGTqsctrtkZ1D/NB0mDW9TwW3GmmUepYY4G9wCET5rY5ugz4OGTcLd614IzQg=="; }; }; - "@babel/helper-create-class-features-plugin-7.18.0" = { + "@babel/helper-create-class-features-plugin-7.18.6" = { name = "_at_babel_slash_helper-create-class-features-plugin"; packageName = "@babel/helper-create-class-features-plugin"; - version = "7.18.0"; + version = "7.18.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.18.0.tgz"; - sha512 = "Kh8zTGR9de3J63e5nS0rQUdRs/kbtwoeQQ0sriS0lItjC96u8XXZN6lKpuyWd2coKSU13py/y+LTmThLuVX0Pg=="; + url = "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.18.6.tgz"; + sha512 = "YfDzdnoxHGV8CzqHGyCbFvXg5QESPFkXlHtvdCkesLjjVMT2Adxe4FGUR5ChIb3DxSaXO12iIOCWoXdsUVwnqw=="; }; }; - "@babel/helper-create-regexp-features-plugin-7.17.12" = { + "@babel/helper-create-regexp-features-plugin-7.18.6" = { name = "_at_babel_slash_helper-create-regexp-features-plugin"; packageName = "@babel/helper-create-regexp-features-plugin"; - version = "7.17.12"; + version = "7.18.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.17.12.tgz"; - sha512 = "b2aZrV4zvutr9AIa6/gA3wsZKRwTKYoDxYiFKcESS3Ug2GTXzwBEvMuuFLhCQpEnRXs1zng4ISAXSUxxKBIcxw=="; + url = "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.18.6.tgz"; + sha512 = "7LcpH1wnQLGrI+4v+nPp+zUvIkF9x0ddv1Hkdue10tg3gmRnLy97DXh4STiOf1qeIInyD69Qv5kKSZzKD8B/7A=="; }; }; - "@babel/helper-environment-visitor-7.18.2" = { + "@babel/helper-environment-visitor-7.18.6" = { name = "_at_babel_slash_helper-environment-visitor"; packageName = "@babel/helper-environment-visitor"; - version = "7.18.2"; + version = "7.18.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.18.2.tgz"; - sha512 = "14GQKWkX9oJzPiQQ7/J36FTXcD4kSp8egKjO9nINlSKiHITRA9q/R74qu8S9xlc/b/yjsJItQUeeh3xnGN0voQ=="; + url = "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.18.6.tgz"; + sha512 = "8n6gSfn2baOY+qlp+VSzsosjCVGFqWKmDF0cCWOybh52Dw3SEyoWR1KrhMJASjLwIEkkAufZ0xvr+SxLHSpy2Q=="; }; }; - "@babel/helper-explode-assignable-expression-7.16.7" = { + "@babel/helper-explode-assignable-expression-7.18.6" = { name = "_at_babel_slash_helper-explode-assignable-expression"; packageName = "@babel/helper-explode-assignable-expression"; - version = "7.16.7"; + version = "7.18.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.16.7.tgz"; - sha512 = "KyUenhWMC8VrxzkGP0Jizjo4/Zx+1nNZhgocs+gLzyZyB8SHidhoq9KK/8Ato4anhwsivfkBLftky7gvzbZMtQ=="; + url = "https://registry.npmjs.org/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.18.6.tgz"; + sha512 = "eyAYAsQmB80jNfg4baAtLeWAQHfHFiR483rzFK+BhETlGZaQC9bsfrugfXDCbRHLQbIA7U5NxhhOxN7p/dWIcg=="; }; }; - "@babel/helper-function-name-7.17.9" = { + "@babel/helper-function-name-7.18.6" = { name = "_at_babel_slash_helper-function-name"; packageName = "@babel/helper-function-name"; - version = "7.17.9"; + version = "7.18.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.17.9.tgz"; - sha512 = "7cRisGlVtiVqZ0MW0/yFB4atgpGLWEHUVYnb448hZK4x+vih0YO5UoS11XIYtZYqHd0dIPMdUSv8q5K4LdMnIg=="; + url = "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.18.6.tgz"; + sha512 = "0mWMxV1aC97dhjCah5U5Ua7668r5ZmSC2DLfH2EZnf9c3/dHZKiFa5pRLMH5tjSl471tY6496ZWk/kjNONBxhw=="; }; }; - "@babel/helper-hoist-variables-7.16.7" = { + "@babel/helper-hoist-variables-7.18.6" = { name = "_at_babel_slash_helper-hoist-variables"; packageName = "@babel/helper-hoist-variables"; - version = "7.16.7"; + version = "7.18.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.16.7.tgz"; - sha512 = "m04d/0Op34H5v7pbZw6pSKP7weA6lsMvfiIAMeIvkY/R4xQtBSMFEigu9QTZ2qB/9l22vsxtM8a+Q8CzD255fg=="; + url = "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.18.6.tgz"; + sha512 = "UlJQPkFqFULIcyW5sbzgbkxn2FKRgwWiRexcuaR8RNJRy8+LLveqPjwZV/bwrLZCN0eUHD/x8D0heK1ozuoo6Q=="; }; }; - "@babel/helper-member-expression-to-functions-7.17.7" = { + "@babel/helper-member-expression-to-functions-7.18.6" = { name = "_at_babel_slash_helper-member-expression-to-functions"; packageName = "@babel/helper-member-expression-to-functions"; - version = "7.17.7"; + version = "7.18.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.17.7.tgz"; - sha512 = "thxXgnQ8qQ11W2wVUObIqDL4p148VMxkt5T/qpN5k2fboRyzFGFmKsTGViquyM5QHKUy48OZoca8kw4ajaDPyw=="; + url = "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.18.6.tgz"; + sha512 = "CeHxqwwipekotzPDUuJOfIMtcIHBuc7WAzLmTYWctVigqS5RktNMQ5bEwQSuGewzYnCtTWa3BARXeiLxDTv+Ng=="; }; }; - "@babel/helper-module-imports-7.16.7" = { + "@babel/helper-module-imports-7.18.6" = { name = "_at_babel_slash_helper-module-imports"; packageName = "@babel/helper-module-imports"; - version = "7.16.7"; + version = "7.18.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.16.7.tgz"; - sha512 = "LVtS6TqjJHFc+nYeITRo6VLXve70xmq7wPhWTqDJusJEgGmkAACWwMiTNrvfoQo6hEhFwAIixNkvB0jPXDL8Wg=="; + url = "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.18.6.tgz"; + sha512 = "0NFvs3VkuSYbFi1x2Vd6tKrywq+z/cLeYC/RJNFrIX/30Bf5aiGYbtvGXolEktzJH8o5E5KJ3tT+nkxuuZFVlA=="; }; }; - "@babel/helper-module-transforms-7.18.0" = { + "@babel/helper-module-transforms-7.18.8" = { name = "_at_babel_slash_helper-module-transforms"; packageName = "@babel/helper-module-transforms"; - version = "7.18.0"; + version = "7.18.8"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.18.0.tgz"; - sha512 = "kclUYSUBIjlvnzN2++K9f2qzYKFgjmnmjwL4zlmU5f8ZtzgWe8s0rUPSTGy2HmK4P8T52MQsS+HTQAgZd3dMEA=="; + url = "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.18.8.tgz"; + sha512 = "che3jvZwIcZxrwh63VfnFTUzcAM9v/lznYkkRxIBGMPt1SudOKHAEec0SIRCfiuIzTcF7VGj/CaTT6gY4eWxvA=="; }; }; - "@babel/helper-optimise-call-expression-7.16.7" = { + "@babel/helper-optimise-call-expression-7.18.6" = { name = "_at_babel_slash_helper-optimise-call-expression"; packageName = "@babel/helper-optimise-call-expression"; - version = "7.16.7"; + version = "7.18.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.16.7.tgz"; - sha512 = "EtgBhg7rd/JcnpZFXpBy0ze1YRfdm7BnBX4uKMBd3ixa3RGAE002JZB66FJyNH7g0F38U05pXmA5P8cBh7z+1w=="; + url = "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.18.6.tgz"; + sha512 = "HP59oD9/fEHQkdcbgFCnbmgH5vIQTJbxh2yf+CdM89/glUNnuzr87Q8GIjGEnOktTROemO0Pe0iPAYbqZuOUiA=="; }; }; - "@babel/helper-plugin-utils-7.17.12" = { + "@babel/helper-plugin-utils-7.18.6" = { name = "_at_babel_slash_helper-plugin-utils"; packageName = "@babel/helper-plugin-utils"; - version = "7.17.12"; + version = "7.18.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.17.12.tgz"; - sha512 = "JDkf04mqtN3y4iAbO1hv9U2ARpPyPL1zqyWs/2WG1pgSq9llHFjStX5jdxb84himgJm+8Ng+x0oiWF/nw/XQKA=="; + url = "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.18.6.tgz"; + sha512 = "gvZnm1YAAxh13eJdkb9EWHBnF3eAub3XTLCZEehHT2kWxiKVRL64+ae5Y6Ivne0mVHmMYKT+xWgZO+gQhuLUBg=="; }; }; - "@babel/helper-remap-async-to-generator-7.16.8" = { + "@babel/helper-remap-async-to-generator-7.18.6" = { name = "_at_babel_slash_helper-remap-async-to-generator"; packageName = "@babel/helper-remap-async-to-generator"; - version = "7.16.8"; + version = "7.18.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.16.8.tgz"; - sha512 = "fm0gH7Flb8H51LqJHy3HJ3wnE1+qtYR2A99K06ahwrawLdOFsCEWjZOrYricXJHoPSudNKxrMBUPEIPxiIIvBw=="; + url = "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.18.6.tgz"; + sha512 = "z5wbmV55TveUPZlCLZvxWHtrjuJd+8inFhk7DG0WW87/oJuGDcjDiu7HIvGcpf5464L6xKCg3vNkmlVVz9hwyQ=="; }; }; - "@babel/helper-replace-supers-7.18.2" = { + "@babel/helper-replace-supers-7.18.6" = { name = "_at_babel_slash_helper-replace-supers"; packageName = "@babel/helper-replace-supers"; - version = "7.18.2"; + version = "7.18.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.18.2.tgz"; - sha512 = "XzAIyxx+vFnrOxiQrToSUOzUOn0e1J2Li40ntddek1Y69AXUTXoDJ40/D5RdjFu7s7qHiaeoTiempZcbuVXh2Q=="; + url = "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.18.6.tgz"; + sha512 = "fTf7zoXnUGl9gF25fXCWE26t7Tvtyn6H4hkLSYhATwJvw2uYxd3aoXplMSe0g9XbwK7bmxNes7+FGO0rB/xC0g=="; }; }; - "@babel/helper-simple-access-7.18.2" = { + "@babel/helper-simple-access-7.18.6" = { name = "_at_babel_slash_helper-simple-access"; packageName = "@babel/helper-simple-access"; - version = "7.18.2"; + version = "7.18.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.18.2.tgz"; - sha512 = "7LIrjYzndorDY88MycupkpQLKS1AFfsVRm2k/9PtKScSy5tZq0McZTj+DiMRynboZfIqOKvo03pmhTaUgiD6fQ=="; + url = "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.18.6.tgz"; + sha512 = "iNpIgTgyAvDQpDj76POqg+YEt8fPxx3yaNBg3S30dxNKm2SWfYhD0TGrK/Eu9wHpUW63VQU894TsTg+GLbUa1g=="; }; }; - "@babel/helper-skip-transparent-expression-wrappers-7.16.0" = { + "@babel/helper-skip-transparent-expression-wrappers-7.18.6" = { name = "_at_babel_slash_helper-skip-transparent-expression-wrappers"; packageName = "@babel/helper-skip-transparent-expression-wrappers"; - version = "7.16.0"; + version = "7.18.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.16.0.tgz"; - sha512 = "+il1gTy0oHwUsBQZyJvukbB4vPMdcYBrFHa0Uc4AizLxbq6BOYC51Rv4tWocX9BLBDLZ4kc6qUFpQ6HRgL+3zw=="; + url = "https://registry.npmjs.org/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.18.6.tgz"; + sha512 = "4KoLhwGS9vGethZpAhYnMejWkX64wsnHPDwvOsKWU6Fg4+AlK2Jz3TyjQLMEPvz+1zemi/WBdkYxCD0bAfIkiw=="; }; }; - "@babel/helper-split-export-declaration-7.16.7" = { + "@babel/helper-split-export-declaration-7.18.6" = { name = "_at_babel_slash_helper-split-export-declaration"; packageName = "@babel/helper-split-export-declaration"; - version = "7.16.7"; + version = "7.18.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.16.7.tgz"; - sha512 = "xbWoy/PFoxSWazIToT9Sif+jJTlrMcndIsaOKvTA6u7QEo7ilkRZpjew18/W3c7nm8fXdUDXh02VXTbZ0pGDNw=="; + url = "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.18.6.tgz"; + sha512 = "bde1etTx6ZyTmobl9LLMMQsaizFVZrquTEHOqKeQESMKo4PlObf+8+JA25ZsIpZhT/WEd39+vOdLXAFG/nELpA=="; }; }; - "@babel/helper-validator-identifier-7.16.7" = { + "@babel/helper-validator-identifier-7.18.6" = { name = "_at_babel_slash_helper-validator-identifier"; packageName = "@babel/helper-validator-identifier"; - version = "7.16.7"; + version = "7.18.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.16.7.tgz"; - sha512 = "hsEnFemeiW4D08A5gUAZxLBTXpZ39P+a+DGDsHw1yxqyQ/jzFEnxf5uTEGp+3bzAbNOxU1paTgYS4ECU/IgfDw=="; + url = "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.18.6.tgz"; + sha512 = "MmetCkz9ej86nJQV+sFCxoGGrUbU3q02kgLciwkrt9QqEB7cP39oKEY0PakknEO0Gu20SskMRi+AYZ3b1TpN9g=="; }; }; - "@babel/helper-validator-option-7.16.7" = { + "@babel/helper-validator-option-7.18.6" = { name = "_at_babel_slash_helper-validator-option"; packageName = "@babel/helper-validator-option"; - version = "7.16.7"; + version = "7.18.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.16.7.tgz"; - sha512 = "TRtenOuRUVo9oIQGPC5G9DgK4743cdxvtOw0weQNpZXaS16SCBi5MNjZF8vba3ETURjZpTbVn7Vvcf2eAwFozQ=="; + url = "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.18.6.tgz"; + sha512 = "XO7gESt5ouv/LRJdrVjkShckw6STTaB7l9BrpBaAHDeF5YZT+01PCwmR0SJHnkW6i8OwW/EVWRShfi4j2x+KQw=="; }; }; - "@babel/helper-wrap-function-7.16.8" = { + "@babel/helper-wrap-function-7.18.6" = { name = "_at_babel_slash_helper-wrap-function"; packageName = "@babel/helper-wrap-function"; - version = "7.16.8"; + version = "7.18.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.16.8.tgz"; - sha512 = "8RpyRVIAW1RcDDGTA+GpPAwV22wXCfKOoM9bet6TLkGIFTkRQSkH1nMQ5Yet4MpoXe1ZwHPVtNasc2w0uZMqnw=="; + url = "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.18.6.tgz"; + sha512 = "I5/LZfozwMNbwr/b1vhhuYD+J/mU+gfGAj5td7l5Rv9WYmH6i3Om69WGKNmlIpsVW/mF6O5bvTKbvDQZVgjqOw=="; }; }; - "@babel/helpers-7.18.2" = { + "@babel/helpers-7.18.6" = { name = "_at_babel_slash_helpers"; packageName = "@babel/helpers"; - version = "7.18.2"; + version = "7.18.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helpers/-/helpers-7.18.2.tgz"; - sha512 = "j+d+u5xT5utcQSzrh9p+PaJX94h++KN+ng9b9WEJq7pkUPAd61FGqhjuUEdfknb3E/uDBb7ruwEeKkIxNJPIrg=="; + url = "https://registry.npmjs.org/@babel/helpers/-/helpers-7.18.6.tgz"; + sha512 = "vzSiiqbQOghPngUYt/zWGvK3LAsPhz55vc9XNN0xAl2gV4ieShI2OQli5duxWHD+72PZPTKAcfcZDE1Cwc5zsQ=="; }; }; - "@babel/highlight-7.17.12" = { + "@babel/highlight-7.18.6" = { name = "_at_babel_slash_highlight"; packageName = "@babel/highlight"; - version = "7.17.12"; + version = "7.18.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/highlight/-/highlight-7.17.12.tgz"; - sha512 = "7yykMVF3hfZY2jsHZEEgLc+3x4o1O+fYyULu11GynEUQNwB6lua+IIQn1FiJxNucd5UlyJryrwsOh8PL9Sn8Qg=="; + url = "https://registry.npmjs.org/@babel/highlight/-/highlight-7.18.6.tgz"; + sha512 = "u7stbOuYjaPezCuLj29hNW1v64M2Md2qupEKP1fHc7WdOA3DgLh37suiSrZYY7haUB7iBeQZ9P1uiRF359do3g=="; }; }; - "@babel/parser-7.18.3" = { + "@babel/parser-7.18.8" = { name = "_at_babel_slash_parser"; packageName = "@babel/parser"; - version = "7.18.3"; + version = "7.18.8"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/parser/-/parser-7.18.3.tgz"; - sha512 = "rL50YcEuHbbauAFAysNsJA4/f89fGTOBRNs9P81sniKnKAr4xULe5AecolcsKbi88xu0ByWYDj/S1AJ3FSFuSQ=="; + url = "https://registry.npmjs.org/@babel/parser/-/parser-7.18.8.tgz"; + sha512 = "RSKRfYX20dyH+elbJK2uqAkVyucL+xXzhqlMD5/ZXx+dAAwpyB7HsvnHe/ZUGOF+xLr5Wx9/JoXVTj6BQE2/oA=="; }; }; - "@babel/plugin-proposal-async-generator-functions-7.17.12" = { + "@babel/plugin-proposal-async-generator-functions-7.18.6" = { name = "_at_babel_slash_plugin-proposal-async-generator-functions"; packageName = "@babel/plugin-proposal-async-generator-functions"; - version = "7.17.12"; + version = "7.18.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.17.12.tgz"; - sha512 = "RWVvqD1ooLKP6IqWTA5GyFVX2isGEgC5iFxKzfYOIy/QEFdxYyCybBDtIGjipHpb9bDWHzcqGqFakf+mVmBTdQ=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.18.6.tgz"; + sha512 = "WAz4R9bvozx4qwf74M+sfqPMKfSqwM0phxPTR6iJIi8robgzXwkEgmeJG1gEKhm6sDqT/U9aV3lfcqybIpev8w=="; }; }; - "@babel/plugin-proposal-class-properties-7.17.12" = { + "@babel/plugin-proposal-class-properties-7.18.6" = { name = "_at_babel_slash_plugin-proposal-class-properties"; packageName = "@babel/plugin-proposal-class-properties"; - version = "7.17.12"; + version = "7.18.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.17.12.tgz"; - sha512 = "U0mI9q8pW5Q9EaTHFPwSVusPMV/DV9Mm8p7csqROFLtIE9rBF5piLqyrBGigftALrBcsBGu4m38JneAe7ZDLXw=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.18.6.tgz"; + sha512 = "cumfXOF0+nzZrrN8Rf0t7M+tF6sZc7vhQwYQck9q1/5w2OExlD+b4v4RpMJFaV1Z7WcDRgO6FqvxqxGlwo+RHQ=="; }; }; - "@babel/plugin-proposal-dynamic-import-7.16.7" = { + "@babel/plugin-proposal-dynamic-import-7.18.6" = { name = "_at_babel_slash_plugin-proposal-dynamic-import"; packageName = "@babel/plugin-proposal-dynamic-import"; - version = "7.16.7"; + version = "7.18.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.16.7.tgz"; - sha512 = "I8SW9Ho3/8DRSdmDdH3gORdyUuYnk1m4cMxUAdu5oy4n3OfN8flDEH+d60iG7dUfi0KkYwSvoalHzzdRzpWHTg=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.18.6.tgz"; + sha512 = "1auuwmK+Rz13SJj36R+jqFPMJWyKEDd7lLSdOj4oJK0UTgGueSAtkrCvz9ewmgyU/P941Rv2fQwZJN8s6QruXw=="; }; }; - "@babel/plugin-proposal-export-namespace-from-7.17.12" = { + "@babel/plugin-proposal-export-namespace-from-7.18.6" = { name = "_at_babel_slash_plugin-proposal-export-namespace-from"; packageName = "@babel/plugin-proposal-export-namespace-from"; - version = "7.17.12"; + version = "7.18.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.17.12.tgz"; - sha512 = "j7Ye5EWdwoXOpRmo5QmRyHPsDIe6+u70ZYZrd7uz+ebPYFKfRcLcNu3Ro0vOlJ5zuv8rU7xa+GttNiRzX56snQ=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.18.6.tgz"; + sha512 = "zr/QcUlUo7GPo6+X1wC98NJADqmy5QTFWWhqeQWiki4XHafJtLl/YMGkmRB2szDD2IYJCCdBTd4ElwhId9T7Xw=="; }; }; - "@babel/plugin-proposal-json-strings-7.17.12" = { + "@babel/plugin-proposal-json-strings-7.18.6" = { name = "_at_babel_slash_plugin-proposal-json-strings"; packageName = "@babel/plugin-proposal-json-strings"; - version = "7.17.12"; + version = "7.18.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.17.12.tgz"; - sha512 = "rKJ+rKBoXwLnIn7n6o6fulViHMrOThz99ybH+hKHcOZbnN14VuMnH9fo2eHE69C8pO4uX1Q7t2HYYIDmv8VYkg=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.18.6.tgz"; + sha512 = "lr1peyn9kOdbYc0xr0OdHTZ5FMqS6Di+H0Fz2I/JwMzGmzJETNeOFq2pBySw6X/KFL5EWDjlJuMsUGRFb8fQgQ=="; }; }; - "@babel/plugin-proposal-logical-assignment-operators-7.17.12" = { + "@babel/plugin-proposal-logical-assignment-operators-7.18.6" = { name = "_at_babel_slash_plugin-proposal-logical-assignment-operators"; packageName = "@babel/plugin-proposal-logical-assignment-operators"; - version = "7.17.12"; + version = "7.18.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.17.12.tgz"; - sha512 = "EqFo2s1Z5yy+JeJu7SFfbIUtToJTVlC61/C7WLKDntSw4Sz6JNAIfL7zQ74VvirxpjB5kz/kIx0gCcb+5OEo2Q=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.18.6.tgz"; + sha512 = "zMo66azZth/0tVd7gmkxOkOjs2rpHyhpcFo565PUP37hSp6hSd9uUKIfTDFMz58BwqgQKhJ9YxtM5XddjXVn+Q=="; }; }; - "@babel/plugin-proposal-nullish-coalescing-operator-7.17.12" = { + "@babel/plugin-proposal-nullish-coalescing-operator-7.18.6" = { name = "_at_babel_slash_plugin-proposal-nullish-coalescing-operator"; packageName = "@babel/plugin-proposal-nullish-coalescing-operator"; - version = "7.17.12"; + version = "7.18.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.17.12.tgz"; - sha512 = "ws/g3FSGVzv+VH86+QvgtuJL/kR67xaEIF2x0iPqdDfYW6ra6JF3lKVBkWynRLcNtIC1oCTfDRVxmm2mKzy+ag=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.18.6.tgz"; + sha512 = "wQxQzxYeJqHcfppzBDnm1yAY0jSRkUXR2z8RePZYrKwMKgMlE8+Z6LUno+bd6LvbGh8Gltvy74+9pIYkr+XkKA=="; }; }; - "@babel/plugin-proposal-numeric-separator-7.16.7" = { + "@babel/plugin-proposal-numeric-separator-7.18.6" = { name = "_at_babel_slash_plugin-proposal-numeric-separator"; packageName = "@babel/plugin-proposal-numeric-separator"; - version = "7.16.7"; + version = "7.18.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.16.7.tgz"; - sha512 = "vQgPMknOIgiuVqbokToyXbkY/OmmjAzr/0lhSIbG/KmnzXPGwW/AdhdKpi+O4X/VkWiWjnkKOBiqJrTaC98VKw=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.18.6.tgz"; + sha512 = "ozlZFogPqoLm8WBr5Z8UckIoE4YQ5KESVcNudyXOR8uqIkliTEgJ3RoketfG6pmzLdeZF0H/wjE9/cCEitBl7Q=="; }; }; - "@babel/plugin-proposal-object-rest-spread-7.18.0" = { + "@babel/plugin-proposal-object-rest-spread-7.18.6" = { name = "_at_babel_slash_plugin-proposal-object-rest-spread"; packageName = "@babel/plugin-proposal-object-rest-spread"; - version = "7.18.0"; + version = "7.18.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.18.0.tgz"; - sha512 = "nbTv371eTrFabDfHLElkn9oyf9VG+VKK6WMzhY2o4eHKaG19BToD9947zzGMO6I/Irstx9d8CwX6njPNIAR/yw=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.18.6.tgz"; + sha512 = "9yuM6wr4rIsKa1wlUAbZEazkCrgw2sMPEXCr4Rnwetu7cEW1NydkCWytLuYletbf8vFxdJxFhwEZqMpOx2eZyw=="; }; }; - "@babel/plugin-proposal-optional-catch-binding-7.16.7" = { + "@babel/plugin-proposal-optional-catch-binding-7.18.6" = { name = "_at_babel_slash_plugin-proposal-optional-catch-binding"; packageName = "@babel/plugin-proposal-optional-catch-binding"; - version = "7.16.7"; + version = "7.18.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.16.7.tgz"; - sha512 = "eMOH/L4OvWSZAE1VkHbr1vckLG1WUcHGJSLqqQwl2GaUqG6QjddvrOaTUMNYiv77H5IKPMZ9U9P7EaHwvAShfA=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.18.6.tgz"; + sha512 = "Q40HEhs9DJQyaZfUjjn6vE8Cv4GmMHCYuMGIWUnlxH6400VGxOuwWsPt4FxXxJkC/5eOzgn0z21M9gMT4MOhbw=="; }; }; - "@babel/plugin-proposal-optional-chaining-7.17.12" = { + "@babel/plugin-proposal-optional-chaining-7.18.6" = { name = "_at_babel_slash_plugin-proposal-optional-chaining"; packageName = "@babel/plugin-proposal-optional-chaining"; - version = "7.17.12"; + version = "7.18.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.17.12.tgz"; - sha512 = "7wigcOs/Z4YWlK7xxjkvaIw84vGhDv/P1dFGQap0nHkc8gFKY/r+hXc8Qzf5k1gY7CvGIcHqAnOagVKJJ1wVOQ=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.18.6.tgz"; + sha512 = "PatI6elL5eMzoypFAiYDpYQyMtXTn+iMhuxxQt5mAXD4fEmKorpSI3PHd+i3JXBJN3xyA6MvJv7at23HffFHwA=="; }; }; - "@babel/plugin-proposal-private-methods-7.17.12" = { + "@babel/plugin-proposal-private-methods-7.18.6" = { name = "_at_babel_slash_plugin-proposal-private-methods"; packageName = "@babel/plugin-proposal-private-methods"; - version = "7.17.12"; + version = "7.18.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.17.12.tgz"; - sha512 = "SllXoxo19HmxhDWm3luPz+cPhtoTSKLJE9PXshsfrOzBqs60QP0r8OaJItrPhAj0d7mZMnNF0Y1UUggCDgMz1A=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.18.6.tgz"; + sha512 = "nutsvktDItsNn4rpGItSNV2sz1XwS+nfU0Rg8aCx3W3NOKVzdMjJRu0O5OkgDp3ZGICSTbgRpxZoWsxoKRvbeA=="; }; }; - "@babel/plugin-proposal-unicode-property-regex-7.17.12" = { + "@babel/plugin-proposal-unicode-property-regex-7.18.6" = { name = "_at_babel_slash_plugin-proposal-unicode-property-regex"; packageName = "@babel/plugin-proposal-unicode-property-regex"; - version = "7.17.12"; + version = "7.18.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.17.12.tgz"; - sha512 = "Wb9qLjXf3ZazqXA7IvI7ozqRIXIGPtSo+L5coFmEkhTQK18ao4UDDD0zdTGAarmbLj2urpRwrc6893cu5Bfh0A=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.18.6.tgz"; + sha512 = "2BShG/d5yoZyXZfVePH91urL5wTG6ASZU9M4o03lKK8u8UW1y08OMttBSOADTcJrnPMpvDXRG3G8fyLh4ovs8w=="; }; }; "@babel/plugin-syntax-async-generators-7.8.4" = { @@ -508,229 +508,229 @@ let sha512 = "hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw=="; }; }; - "@babel/plugin-transform-arrow-functions-7.17.12" = { + "@babel/plugin-transform-arrow-functions-7.18.6" = { name = "_at_babel_slash_plugin-transform-arrow-functions"; packageName = "@babel/plugin-transform-arrow-functions"; - version = "7.17.12"; + version = "7.18.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.17.12.tgz"; - sha512 = "PHln3CNi/49V+mza4xMwrg+WGYevSF1oaiXaC2EQfdp4HWlSjRsrDXWJiQBKpP7749u6vQ9mcry2uuFOv5CXvA=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.18.6.tgz"; + sha512 = "9S9X9RUefzrsHZmKMbDXxweEH+YlE8JJEuat9FdvW9Qh1cw7W64jELCtWNkPBPX5En45uy28KGvA/AySqUh8CQ=="; }; }; - "@babel/plugin-transform-async-to-generator-7.17.12" = { + "@babel/plugin-transform-async-to-generator-7.18.6" = { name = "_at_babel_slash_plugin-transform-async-to-generator"; packageName = "@babel/plugin-transform-async-to-generator"; - version = "7.17.12"; + version = "7.18.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.17.12.tgz"; - sha512 = "J8dbrWIOO3orDzir57NRsjg4uxucvhby0L/KZuGsWDj0g7twWK3g7JhJhOrXtuXiw8MeiSdJ3E0OW9H8LYEzLQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.18.6.tgz"; + sha512 = "ARE5wZLKnTgPW7/1ftQmSi1CmkqqHo2DNmtztFhvgtOWSDfq0Cq9/9L+KnZNYSNrydBekhW3rwShduf59RoXag=="; }; }; - "@babel/plugin-transform-block-scoped-functions-7.16.7" = { + "@babel/plugin-transform-block-scoped-functions-7.18.6" = { name = "_at_babel_slash_plugin-transform-block-scoped-functions"; packageName = "@babel/plugin-transform-block-scoped-functions"; - version = "7.16.7"; + version = "7.18.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.16.7.tgz"; - sha512 = "JUuzlzmF40Z9cXyytcbZEZKckgrQzChbQJw/5PuEHYeqzCsvebDx0K0jWnIIVcmmDOAVctCgnYs0pMcrYj2zJg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.18.6.tgz"; + sha512 = "ExUcOqpPWnliRcPqves5HJcJOvHvIIWfuS4sroBUenPuMdmW+SMHDakmtS7qOo13sVppmUijqeTv7qqGsvURpQ=="; }; }; - "@babel/plugin-transform-block-scoping-7.17.12" = { + "@babel/plugin-transform-block-scoping-7.18.6" = { name = "_at_babel_slash_plugin-transform-block-scoping"; packageName = "@babel/plugin-transform-block-scoping"; - version = "7.17.12"; + version = "7.18.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.17.12.tgz"; - sha512 = "jw8XW/B1i7Lqwqj2CbrViPcZijSxfguBWZP2aN59NHgxUyO/OcO1mfdCxH13QhN5LbWhPkX+f+brKGhZTiqtZQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.18.6.tgz"; + sha512 = "pRqwb91C42vs1ahSAWJkxOxU1RHWDn16XAa6ggQ72wjLlWyYeAcLvTtE0aM8ph3KNydy9CQF2nLYcjq1WysgxQ=="; }; }; - "@babel/plugin-transform-classes-7.17.12" = { + "@babel/plugin-transform-classes-7.18.8" = { name = "_at_babel_slash_plugin-transform-classes"; packageName = "@babel/plugin-transform-classes"; - version = "7.17.12"; + version = "7.18.8"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.17.12.tgz"; - sha512 = "cvO7lc7pZat6BsvH6l/EGaI8zpl8paICaoGk+7x7guvtfak/TbIf66nYmJOH13EuG0H+Xx3M+9LQDtSvZFKXKw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.18.8.tgz"; + sha512 = "RySDoXdF6hgHSHuAW4aLGyVQdmvEX/iJtjVre52k0pxRq4hzqze+rAVP++NmNv596brBpYmaiKgTZby7ziBnVg=="; }; }; - "@babel/plugin-transform-computed-properties-7.17.12" = { + "@babel/plugin-transform-computed-properties-7.18.6" = { name = "_at_babel_slash_plugin-transform-computed-properties"; packageName = "@babel/plugin-transform-computed-properties"; - version = "7.17.12"; + version = "7.18.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.17.12.tgz"; - sha512 = "a7XINeplB5cQUWMg1E/GI1tFz3LfK021IjV1rj1ypE+R7jHm+pIHmHl25VNkZxtx9uuYp7ThGk8fur1HHG7PgQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.18.6.tgz"; + sha512 = "9repI4BhNrR0KenoR9vm3/cIc1tSBIo+u1WVjKCAynahj25O8zfbiE6JtAtHPGQSs4yZ+bA8mRasRP+qc+2R5A=="; }; }; - "@babel/plugin-transform-destructuring-7.18.0" = { + "@babel/plugin-transform-destructuring-7.18.6" = { name = "_at_babel_slash_plugin-transform-destructuring"; packageName = "@babel/plugin-transform-destructuring"; - version = "7.18.0"; + version = "7.18.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.18.0.tgz"; - sha512 = "Mo69klS79z6KEfrLg/1WkmVnB8javh75HX4pi2btjvlIoasuxilEyjtsQW6XPrubNd7AQy0MMaNIaQE4e7+PQw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.18.6.tgz"; + sha512 = "tgy3u6lRp17ilY8r1kP4i2+HDUwxlVqq3RTc943eAWSzGgpU1qhiKpqZ5CMyHReIYPHdo3Kg8v8edKtDqSVEyQ=="; }; }; - "@babel/plugin-transform-dotall-regex-7.16.7" = { + "@babel/plugin-transform-dotall-regex-7.18.6" = { name = "_at_babel_slash_plugin-transform-dotall-regex"; packageName = "@babel/plugin-transform-dotall-regex"; - version = "7.16.7"; + version = "7.18.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.16.7.tgz"; - sha512 = "Lyttaao2SjZF6Pf4vk1dVKv8YypMpomAbygW+mU5cYP3S5cWTfCJjG8xV6CFdzGFlfWK81IjL9viiTvpb6G7gQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.18.6.tgz"; + sha512 = "6S3jpun1eEbAxq7TdjLotAsl4WpQI9DxfkycRcKrjhQYzU87qpXdknpBg/e+TdcMehqGnLFi7tnFUBR02Vq6wg=="; }; }; - "@babel/plugin-transform-duplicate-keys-7.17.12" = { + "@babel/plugin-transform-duplicate-keys-7.18.6" = { name = "_at_babel_slash_plugin-transform-duplicate-keys"; packageName = "@babel/plugin-transform-duplicate-keys"; - version = "7.17.12"; + version = "7.18.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.17.12.tgz"; - sha512 = "EA5eYFUG6xeerdabina/xIoB95jJ17mAkR8ivx6ZSu9frKShBjpOGZPn511MTDTkiCO+zXnzNczvUM69YSf3Zw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.18.6.tgz"; + sha512 = "NJU26U/208+sxYszf82nmGYqVF9QN8py2HFTblPT9hbawi8+1C5a9JubODLTGFuT0qlkqVinmkwOD13s0sZktg=="; }; }; - "@babel/plugin-transform-exponentiation-operator-7.16.7" = { + "@babel/plugin-transform-exponentiation-operator-7.18.6" = { name = "_at_babel_slash_plugin-transform-exponentiation-operator"; packageName = "@babel/plugin-transform-exponentiation-operator"; - version = "7.16.7"; + version = "7.18.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.16.7.tgz"; - sha512 = "8UYLSlyLgRixQvlYH3J2ekXFHDFLQutdy7FfFAMm3CPZ6q9wHCwnUyiXpQCe3gVVnQlHc5nsuiEVziteRNTXEA=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.18.6.tgz"; + sha512 = "wzEtc0+2c88FVR34aQmiz56dxEkxr2g8DQb/KfaFa1JYXOFVsbhvAonFN6PwVWj++fKmku8NP80plJ5Et4wqHw=="; }; }; - "@babel/plugin-transform-for-of-7.18.1" = { + "@babel/plugin-transform-for-of-7.18.8" = { name = "_at_babel_slash_plugin-transform-for-of"; packageName = "@babel/plugin-transform-for-of"; - version = "7.18.1"; + version = "7.18.8"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.18.1.tgz"; - sha512 = "+TTB5XwvJ5hZbO8xvl2H4XaMDOAK57zF4miuC9qQJgysPNEAZZ9Z69rdF5LJkozGdZrjBIUAIyKUWRMmebI7vg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.18.8.tgz"; + sha512 = "yEfTRnjuskWYo0k1mHUqrVWaZwrdq8AYbfrpqULOJOaucGSp4mNMVps+YtA8byoevxS/urwU75vyhQIxcCgiBQ=="; }; }; - "@babel/plugin-transform-function-name-7.16.7" = { + "@babel/plugin-transform-function-name-7.18.6" = { name = "_at_babel_slash_plugin-transform-function-name"; packageName = "@babel/plugin-transform-function-name"; - version = "7.16.7"; + version = "7.18.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.16.7.tgz"; - sha512 = "SU/C68YVwTRxqWj5kgsbKINakGag0KTgq9f2iZEXdStoAbOzLHEBRYzImmA6yFo8YZhJVflvXmIHUO7GWHmxxA=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.18.6.tgz"; + sha512 = "kJha/Gbs5RjzIu0CxZwf5e3aTTSlhZnHMT8zPWnJMjNpLOUgqevg+PN5oMH68nMCXnfiMo4Bhgxqj59KHTlAnA=="; }; }; - "@babel/plugin-transform-literals-7.17.12" = { + "@babel/plugin-transform-literals-7.18.6" = { name = "_at_babel_slash_plugin-transform-literals"; packageName = "@babel/plugin-transform-literals"; - version = "7.17.12"; + version = "7.18.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.17.12.tgz"; - sha512 = "8iRkvaTjJciWycPIZ9k9duu663FT7VrBdNqNgxnVXEFwOIp55JWcZd23VBRySYbnS3PwQ3rGiabJBBBGj5APmQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.18.6.tgz"; + sha512 = "x3HEw0cJZVDoENXOp20HlypIHfl0zMIhMVZEBVTfmqbObIpsMxMbmU5nOEO8R7LYT+z5RORKPlTI5Hj4OsO9/Q=="; }; }; - "@babel/plugin-transform-member-expression-literals-7.16.7" = { + "@babel/plugin-transform-member-expression-literals-7.18.6" = { name = "_at_babel_slash_plugin-transform-member-expression-literals"; packageName = "@babel/plugin-transform-member-expression-literals"; - version = "7.16.7"; + version = "7.18.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.16.7.tgz"; - sha512 = "mBruRMbktKQwbxaJof32LT9KLy2f3gH+27a5XSuXo6h7R3vqltl0PgZ80C8ZMKw98Bf8bqt6BEVi3svOh2PzMw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.18.6.tgz"; + sha512 = "qSF1ihLGO3q+/g48k85tUjD033C29TNTVB2paCwZPVmOsjn9pClvYYrM2VeJpBY2bcNkuny0YUyTNRyRxJ54KA=="; }; }; - "@babel/plugin-transform-modules-amd-7.18.0" = { + "@babel/plugin-transform-modules-amd-7.18.6" = { name = "_at_babel_slash_plugin-transform-modules-amd"; packageName = "@babel/plugin-transform-modules-amd"; - version = "7.18.0"; + version = "7.18.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.18.0.tgz"; - sha512 = "h8FjOlYmdZwl7Xm2Ug4iX2j7Qy63NANI+NQVWQzv6r25fqgg7k2dZl03p95kvqNclglHs4FZ+isv4p1uXMA+QA=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.18.6.tgz"; + sha512 = "Pra5aXsmTsOnjM3IajS8rTaLCy++nGM4v3YR4esk5PCsyg9z8NA5oQLwxzMUtDBd8F+UmVza3VxoAaWCbzH1rg=="; }; }; - "@babel/plugin-transform-modules-commonjs-7.18.2" = { + "@babel/plugin-transform-modules-commonjs-7.18.6" = { name = "_at_babel_slash_plugin-transform-modules-commonjs"; packageName = "@babel/plugin-transform-modules-commonjs"; - version = "7.18.2"; + version = "7.18.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.18.2.tgz"; - sha512 = "f5A865gFPAJAEE0K7F/+nm5CmAE3y8AWlMBG9unu5j9+tk50UQVK0QS8RNxSp7MJf0wh97uYyLWt3Zvu71zyOQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.18.6.tgz"; + sha512 = "Qfv2ZOWikpvmedXQJDSbxNqy7Xr/j2Y8/KfijM0iJyKkBTmWuvCA1yeH1yDM7NJhBW/2aXxeucLj6i80/LAJ/Q=="; }; }; - "@babel/plugin-transform-modules-systemjs-7.18.0" = { + "@babel/plugin-transform-modules-systemjs-7.18.6" = { name = "_at_babel_slash_plugin-transform-modules-systemjs"; packageName = "@babel/plugin-transform-modules-systemjs"; - version = "7.18.0"; + version = "7.18.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.18.0.tgz"; - sha512 = "vwKpxdHnlM5tIrRt/eA0bzfbi7gUBLN08vLu38np1nZevlPySRe6yvuATJB5F/WPJ+ur4OXwpVYq9+BsxqAQuQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.18.6.tgz"; + sha512 = "UbPYpXxLjTw6w6yXX2BYNxF3p6QY225wcTkfQCy3OMnSlS/C3xGtwUjEzGkldb/sy6PWLiCQ3NbYfjWUTI3t4g=="; }; }; - "@babel/plugin-transform-modules-umd-7.18.0" = { + "@babel/plugin-transform-modules-umd-7.18.6" = { name = "_at_babel_slash_plugin-transform-modules-umd"; packageName = "@babel/plugin-transform-modules-umd"; - version = "7.18.0"; + version = "7.18.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.18.0.tgz"; - sha512 = "d/zZ8I3BWli1tmROLxXLc9A6YXvGK8egMxHp+E/rRwMh1Kip0AP77VwZae3snEJ33iiWwvNv2+UIIhfalqhzZA=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.18.6.tgz"; + sha512 = "dcegErExVeXcRqNtkRU/z8WlBLnvD4MRnHgNs3MytRO1Mn1sHRyhbcpYbVMGclAqOjdW+9cfkdZno9dFdfKLfQ=="; }; }; - "@babel/plugin-transform-named-capturing-groups-regex-7.17.12" = { + "@babel/plugin-transform-named-capturing-groups-regex-7.18.6" = { name = "_at_babel_slash_plugin-transform-named-capturing-groups-regex"; packageName = "@babel/plugin-transform-named-capturing-groups-regex"; - version = "7.17.12"; + version = "7.18.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.17.12.tgz"; - sha512 = "vWoWFM5CKaTeHrdUJ/3SIOTRV+MBVGybOC9mhJkaprGNt5demMymDW24yC74avb915/mIRe3TgNb/d8idvnCRA=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.18.6.tgz"; + sha512 = "UmEOGF8XgaIqD74bC8g7iV3RYj8lMf0Bw7NJzvnS9qQhM4mg+1WHKotUIdjxgD2RGrgFLZZPCFPFj3P/kVDYhg=="; }; }; - "@babel/plugin-transform-new-target-7.17.12" = { + "@babel/plugin-transform-new-target-7.18.6" = { name = "_at_babel_slash_plugin-transform-new-target"; packageName = "@babel/plugin-transform-new-target"; - version = "7.17.12"; + version = "7.18.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.17.12.tgz"; - sha512 = "CaOtzk2fDYisbjAD4Sd1MTKGVIpRtx9bWLyj24Y/k6p4s4gQ3CqDGJauFJxt8M/LEx003d0i3klVqnN73qvK3w=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.18.6.tgz"; + sha512 = "DjwFA/9Iu3Z+vrAn+8pBUGcjhxKguSMlsFqeCKbhb9BAV756v0krzVK04CRDi/4aqmk8BsHb4a/gFcaA5joXRw=="; }; }; - "@babel/plugin-transform-object-super-7.16.7" = { + "@babel/plugin-transform-object-super-7.18.6" = { name = "_at_babel_slash_plugin-transform-object-super"; packageName = "@babel/plugin-transform-object-super"; - version = "7.16.7"; + version = "7.18.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.16.7.tgz"; - sha512 = "14J1feiQVWaGvRxj2WjyMuXS2jsBkgB3MdSN5HuC2G5nRspa5RK9COcs82Pwy5BuGcjb+fYaUj94mYcOj7rCvw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.18.6.tgz"; + sha512 = "uvGz6zk+pZoS1aTZrOvrbj6Pp/kK2mp45t2B+bTDre2UgsZZ8EZLSJtUg7m/no0zOJUWgFONpB7Zv9W2tSaFlA=="; }; }; - "@babel/plugin-transform-parameters-7.17.12" = { + "@babel/plugin-transform-parameters-7.18.8" = { name = "_at_babel_slash_plugin-transform-parameters"; packageName = "@babel/plugin-transform-parameters"; - version = "7.17.12"; + version = "7.18.8"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.17.12.tgz"; - sha512 = "6qW4rWo1cyCdq1FkYri7AHpauchbGLXpdwnYsfxFb+KtddHENfsY5JZb35xUwkK5opOLcJ3BNd2l7PhRYGlwIA=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.18.8.tgz"; + sha512 = "ivfbE3X2Ss+Fj8nnXvKJS6sjRG4gzwPMsP+taZC+ZzEGjAYlvENixmt1sZ5Ca6tWls+BlKSGKPJ6OOXvXCbkFg=="; }; }; - "@babel/plugin-transform-property-literals-7.16.7" = { + "@babel/plugin-transform-property-literals-7.18.6" = { name = "_at_babel_slash_plugin-transform-property-literals"; packageName = "@babel/plugin-transform-property-literals"; - version = "7.16.7"; + version = "7.18.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.16.7.tgz"; - sha512 = "z4FGr9NMGdoIl1RqavCqGG+ZuYjfZ/hkCIeuH6Do7tXmSm0ls11nYVSJqFEUOSJbDab5wC6lRE/w6YjVcr6Hqw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.18.6.tgz"; + sha512 = "cYcs6qlgafTud3PAzrrRNbQtfpQ8+y/+M5tKmksS9+M1ckbH6kzY8MrexEM9mcA6JDsukE19iIRvAyYl463sMg=="; }; }; - "@babel/plugin-transform-regenerator-7.18.0" = { + "@babel/plugin-transform-regenerator-7.18.6" = { name = "_at_babel_slash_plugin-transform-regenerator"; packageName = "@babel/plugin-transform-regenerator"; - version = "7.18.0"; + version = "7.18.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.18.0.tgz"; - sha512 = "C8YdRw9uzx25HSIzwA7EM7YP0FhCe5wNvJbZzjVNHHPGVcDJ3Aie+qGYYdS1oVQgn+B3eAIJbWFLrJ4Jipv7nw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.18.6.tgz"; + sha512 = "poqRI2+qiSdeldcz4wTSTXBRryoq3Gc70ye7m7UD5Ww0nE29IXqMl6r7Nd15WBgRd74vloEMlShtH6CKxVzfmQ=="; }; }; - "@babel/plugin-transform-reserved-words-7.17.12" = { + "@babel/plugin-transform-reserved-words-7.18.6" = { name = "_at_babel_slash_plugin-transform-reserved-words"; packageName = "@babel/plugin-transform-reserved-words"; - version = "7.17.12"; + version = "7.18.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.17.12.tgz"; - sha512 = "1KYqwbJV3Co03NIi14uEHW8P50Md6KqFgt0FfpHdK6oyAHQVTosgPuPSiWud1HX0oYJ1hGRRlk0fP87jFpqXZA=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.18.6.tgz"; + sha512 = "oX/4MyMoypzHjFrT1CdivfKZ+XvIPMFXwwxHp/r0Ddy2Vuomt4HDFGmft1TAY2yiTKiNSsh3kjBAzcM8kSdsjA=="; }; }; "@babel/plugin-transform-runtime-7.12.10" = { @@ -742,67 +742,67 @@ let sha512 = "xOrUfzPxw7+WDm9igMgQCbO3cJKymX7dFdsgRr1eu9n3KjjyU4pptIXbXPseQDquw+W+RuJEJMHKHNsPNNm3CA=="; }; }; - "@babel/plugin-transform-shorthand-properties-7.16.7" = { + "@babel/plugin-transform-shorthand-properties-7.18.6" = { name = "_at_babel_slash_plugin-transform-shorthand-properties"; packageName = "@babel/plugin-transform-shorthand-properties"; - version = "7.16.7"; + version = "7.18.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.16.7.tgz"; - sha512 = "hah2+FEnoRoATdIb05IOXf+4GzXYTq75TVhIn1PewihbpyrNWUt2JbudKQOETWw6QpLe+AIUpJ5MVLYTQbeeUg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.18.6.tgz"; + sha512 = "eCLXXJqv8okzg86ywZJbRn19YJHU4XUa55oz2wbHhaQVn/MM+XhukiT7SYqp/7o00dg52Rj51Ny+Ecw4oyoygw=="; }; }; - "@babel/plugin-transform-spread-7.17.12" = { + "@babel/plugin-transform-spread-7.18.6" = { name = "_at_babel_slash_plugin-transform-spread"; packageName = "@babel/plugin-transform-spread"; - version = "7.17.12"; + version = "7.18.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.17.12.tgz"; - sha512 = "9pgmuQAtFi3lpNUstvG9nGfk9DkrdmWNp9KeKPFmuZCpEnxRzYlS8JgwPjYj+1AWDOSvoGN0H30p1cBOmT/Svg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.18.6.tgz"; + sha512 = "ayT53rT/ENF8WWexIRg9AiV9h0aIteyWn5ptfZTZQrjk/+f3WdrJGCY4c9wcgl2+MKkKPhzbYp97FTsquZpDCw=="; }; }; - "@babel/plugin-transform-sticky-regex-7.16.7" = { + "@babel/plugin-transform-sticky-regex-7.18.6" = { name = "_at_babel_slash_plugin-transform-sticky-regex"; packageName = "@babel/plugin-transform-sticky-regex"; - version = "7.16.7"; + version = "7.18.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.16.7.tgz"; - sha512 = "NJa0Bd/87QV5NZZzTuZG5BPJjLYadeSZ9fO6oOUoL4iQx+9EEuw/eEM92SrsT19Yc2jgB1u1hsjqDtH02c3Drw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.18.6.tgz"; + sha512 = "kfiDrDQ+PBsQDO85yj1icueWMfGfJFKN1KCkndygtu/C9+XUfydLC8Iv5UYJqRwy4zk8EcplRxEOeLyjq1gm6Q=="; }; }; - "@babel/plugin-transform-template-literals-7.18.2" = { + "@babel/plugin-transform-template-literals-7.18.6" = { name = "_at_babel_slash_plugin-transform-template-literals"; packageName = "@babel/plugin-transform-template-literals"; - version = "7.18.2"; + version = "7.18.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.18.2.tgz"; - sha512 = "/cmuBVw9sZBGZVOMkpAEaVLwm4JmK2GZ1dFKOGGpMzEHWFmyZZ59lUU0PdRr8YNYeQdNzTDwuxP2X2gzydTc9g=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.18.6.tgz"; + sha512 = "UuqlRrQmT2SWRvahW46cGSany0uTlcj8NYOS5sRGYi8FxPYPoLd5DDmMd32ZXEj2Jq+06uGVQKHxa/hJx2EzKw=="; }; }; - "@babel/plugin-transform-typeof-symbol-7.17.12" = { + "@babel/plugin-transform-typeof-symbol-7.18.6" = { name = "_at_babel_slash_plugin-transform-typeof-symbol"; packageName = "@babel/plugin-transform-typeof-symbol"; - version = "7.17.12"; + version = "7.18.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.17.12.tgz"; - sha512 = "Q8y+Jp7ZdtSPXCThB6zjQ74N3lj0f6TDh1Hnf5B+sYlzQ8i5Pjp8gW0My79iekSpT4WnI06blqP6DT0OmaXXmw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.18.6.tgz"; + sha512 = "7m71iS/QhsPk85xSjFPovHPcH3H9qeyzsujhTc+vcdnsXavoWYJ74zx0lP5RhpC5+iDnVLO+PPMHzC11qels1g=="; }; }; - "@babel/plugin-transform-unicode-escapes-7.16.7" = { + "@babel/plugin-transform-unicode-escapes-7.18.6" = { name = "_at_babel_slash_plugin-transform-unicode-escapes"; packageName = "@babel/plugin-transform-unicode-escapes"; - version = "7.16.7"; + version = "7.18.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.16.7.tgz"; - sha512 = "TAV5IGahIz3yZ9/Hfv35TV2xEm+kaBDaZQCn2S/hG9/CZ0DktxJv9eKfPc7yYCvOYR4JGx1h8C+jcSOvgaaI/Q=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.18.6.tgz"; + sha512 = "XNRwQUXYMP7VLuy54cr/KS/WeL3AZeORhrmeZ7iewgu+X2eBqmpaLI/hzqr9ZxCeUoq0ASK4GUzSM0BDhZkLFw=="; }; }; - "@babel/plugin-transform-unicode-regex-7.16.7" = { + "@babel/plugin-transform-unicode-regex-7.18.6" = { name = "_at_babel_slash_plugin-transform-unicode-regex"; packageName = "@babel/plugin-transform-unicode-regex"; - version = "7.16.7"; + version = "7.18.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.16.7.tgz"; - sha512 = "oC5tYYKw56HO75KZVLQ+R/Nl3Hro9kf8iG0hXoaHP7tjAyCpvqBiSNe6vGrZni1Z6MggmUOC6A7VP7AVmw225Q=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.18.6.tgz"; + sha512 = "gE7A6Lt7YLnNOL3Pb9BNeZvi+d8l7tcRrG4+pwJjK9hD2xX4mEvjlQW60G9EEmfXVYRPv9VRQcyegIVHCql/AA=="; }; }; "@babel/preset-env-7.12.10" = { @@ -832,31 +832,31 @@ let sha512 = "plcc+hbExy3McchJCEQG3knOsuh3HH+Prx1P6cLIkET/0dLuQDEnrT+s27Axgc9bqfsmNUNHfscgMUdBpC9xfg=="; }; }; - "@babel/template-7.16.7" = { + "@babel/template-7.18.6" = { name = "_at_babel_slash_template"; packageName = "@babel/template"; - version = "7.16.7"; + version = "7.18.6"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/template/-/template-7.16.7.tgz"; - sha512 = "I8j/x8kHUrbYRTUxXrrMbfCa7jxkE7tZre39x3kjr9hvI82cK1FfqLygotcWN5kdPGWcLdWMHpSBavse5tWw3w=="; + url = "https://registry.npmjs.org/@babel/template/-/template-7.18.6.tgz"; + sha512 = "JoDWzPe+wgBsTTgdnIma3iHNFC7YVJoPssVBDjiHfNlyt4YcunDtcDOUmfVDfCK5MfdsaIoX9PkijPhjH3nYUw=="; }; }; - "@babel/traverse-7.18.2" = { + "@babel/traverse-7.18.8" = { name = "_at_babel_slash_traverse"; packageName = "@babel/traverse"; - version = "7.18.2"; + version = "7.18.8"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.18.2.tgz"; - sha512 = "9eNwoeovJ6KH9zcCNnENY7DMFwTU9JdGCFtqNLfUAqtUHRCOsTOqWoffosP8vKmNYeSBUv3yVJXjfd8ucwOjUA=="; + url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.18.8.tgz"; + sha512 = "UNg/AcSySJYR/+mIcJQDCv00T+AqRO7j/ZEJLzpaYtgM48rMg5MnkJgyNqkzo88+p4tfRvZJCEiwwfG6h4jkRg=="; }; }; - "@babel/types-7.18.2" = { + "@babel/types-7.18.8" = { name = "_at_babel_slash_types"; packageName = "@babel/types"; - version = "7.18.2"; + version = "7.18.8"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/types/-/types-7.18.2.tgz"; - sha512 = "0On6B8A4/+mFUto5WERt3EEuG1NznDirvwca1O8UwXQHVY8g3R7OzYgxXdOfMwLO08UrpUD/2+3Bclyq+/C94Q=="; + url = "https://registry.npmjs.org/@babel/types/-/types-7.18.8.tgz"; + sha512 = "qwpdsmraq0aJ3osLJRApsc2ouSJCdnMeZwB0DhbtHAtRpZNZCdlbRnHIgcRKzdE1g0iOGg644fzjOBcdOz9cPw=="; }; }; "@hapi/address-2.1.4" = { @@ -904,49 +904,58 @@ let sha512 = "tAag0jEcjwH+P2quUfipd7liWCNX2F8NvYjQp2wtInsZxnMlypdw0FtAOLxtvvkO+GSRRbmNi8m/5y42PQJYCQ=="; }; }; - "@jridgewell/gen-mapping-0.3.1" = { + "@jridgewell/gen-mapping-0.3.2" = { name = "_at_jridgewell_slash_gen-mapping"; packageName = "@jridgewell/gen-mapping"; - version = "0.3.1"; + version = "0.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.1.tgz"; - sha512 = "GcHwniMlA2z+WFPWuY8lp3fsza0I8xPFMWL5+n8LYyP6PSvPrXf4+n8stDHZY2DM0zy9sVkRDy1jDI4XGzYVqg=="; + url = "https://registry.npmjs.org/@jridgewell/gen-mapping/-/gen-mapping-0.3.2.tgz"; + sha512 = "mh65xKQAzI6iBcFzwv28KVWSmCkdRBWoOh+bYQGW3+6OZvbbN3TqMGo5hqYxQniRcH9F2VZIoJCm4pa3BPDK/A=="; }; }; - "@jridgewell/resolve-uri-3.0.7" = { + "@jridgewell/resolve-uri-3.1.0" = { name = "_at_jridgewell_slash_resolve-uri"; packageName = "@jridgewell/resolve-uri"; - version = "3.0.7"; + version = "3.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.0.7.tgz"; - sha512 = "8cXDaBBHOr2pQ7j77Y6Vp5VDT2sIqWyWQ56TjEq4ih/a4iST3dItRe8Q9fp0rrIl9DoKhWQtUQz/YpOxLkXbNA=="; + url = "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.1.0.tgz"; + sha512 = "F2msla3tad+Mfht5cJq7LSXcdudKTWCVYUgw6pLFOOHSTtZlj6SWNYAp+AhuqLmWdBO2X5hPrLcu8cVP8fy28w=="; }; }; - "@jridgewell/set-array-1.1.1" = { + "@jridgewell/set-array-1.1.2" = { name = "_at_jridgewell_slash_set-array"; packageName = "@jridgewell/set-array"; - version = "1.1.1"; + version = "1.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.1.1.tgz"; - sha512 = "Ct5MqZkLGEXTVmQYbGtx9SVqD2fqwvdubdps5D3djjAkgkKwT918VNOz65pEHFaYTeWcukmJmH5SwsA9Tn2ObQ=="; + url = "https://registry.npmjs.org/@jridgewell/set-array/-/set-array-1.1.2.tgz"; + sha512 = "xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw=="; }; }; - "@jridgewell/sourcemap-codec-1.4.13" = { + "@jridgewell/source-map-0.3.2" = { + name = "_at_jridgewell_slash_source-map"; + packageName = "@jridgewell/source-map"; + version = "0.3.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@jridgewell/source-map/-/source-map-0.3.2.tgz"; + sha512 = "m7O9o2uR8k2ObDysZYzdfhb08VuEml5oWGiosa1VdaPZ/A6QyPkAJuwN0Q1lhULOf6B7MtQmHENS743hWtCrgw=="; + }; + }; + "@jridgewell/sourcemap-codec-1.4.14" = { name = "_at_jridgewell_slash_sourcemap-codec"; packageName = "@jridgewell/sourcemap-codec"; - version = "1.4.13"; + version = "1.4.14"; src = fetchurl { - url = "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.13.tgz"; - sha512 = "GryiOJmNcWbovBxTfZSF71V/mXbgcV3MewDe3kIMCLyIh5e7SKAeUZs+rMnJ8jkMolZ/4/VsdBmMrw3l+VdZ3w=="; + url = "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz"; + sha512 = "XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw=="; }; }; - "@jridgewell/trace-mapping-0.3.13" = { + "@jridgewell/trace-mapping-0.3.14" = { name = "_at_jridgewell_slash_trace-mapping"; packageName = "@jridgewell/trace-mapping"; - version = "0.3.13"; + version = "0.3.14"; src = fetchurl { - url = "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.13.tgz"; - sha512 = "o1xbKhp9qnIAoHJSWd6KlCZfqslL4valSF81H8ImioOAxluWYWOpWkpyktY2vnt4tbrX9XYaxovq6cgowaJp2w=="; + url = "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.14.tgz"; + sha512 = "bJWEfQ9lPTvm3SneWwRFVLzrh6nhjwqw7TUFFBEMzwvg7t7PCDenf2lDwqo4NQXzdpgBXyFgDWnQA+2vkruksQ=="; }; }; "@kwsites/file-exists-1.1.1" = { @@ -1129,13 +1138,13 @@ let sha512 = "QsbSjA/fSk7xB+UXlCT3wHBy5ai9wOcNDWwZAtud+jXhwOM3l+EYZh8Lng4+/6n8uar0J7xILzqftJdJ/Wdfkw=="; }; }; - "@types/jest-27.5.1" = { + "@types/jest-27.5.2" = { name = "_at_types_slash_jest"; packageName = "@types/jest"; - version = "27.5.1"; + version = "27.5.2"; src = fetchurl { - url = "https://registry.npmjs.org/@types/jest/-/jest-27.5.1.tgz"; - sha512 = "fUy7YRpT+rHXto1YlL+J9rs0uLGyiqVt3ZOTQR+4ROc47yNl8WLdVLgUloBRhOxP1PZvguHl44T3H0wAWxahYQ=="; + url = "https://registry.npmjs.org/@types/jest/-/jest-27.5.2.tgz"; + sha512 = "mpT8LJJ4CMeeahobofYWIjFo0xonRS/HfxnVEPMPFSQdGUt1uHCnoPT7Zhb+sjDU2wz0oKV0OLUR0WzrHNgfeA=="; }; }; "@types/json-buffer-3.0.0" = { @@ -1192,13 +1201,13 @@ let sha512 = "U5icWpv7YnZYGsN4/cmh3WD2onMY0aJIiTE6+51TwJCttdHvtCYmkBNOobHlXwrJRL0nkH9jH4kD+1FAdMN4Tg=="; }; }; - "@types/node-17.0.35" = { + "@types/node-18.0.3" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "17.0.35"; + version = "18.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-17.0.35.tgz"; - sha512 = "vu1SrqBjbbZ3J6vwY17jBs8Sr/BKA+/a/WtjRG+whKg1iuLFOosq872EXS0eXWILdO36DHQQeku/ZcL6hz2fpg=="; + url = "https://registry.npmjs.org/@types/node/-/node-18.0.3.tgz"; + sha512 = "HzNRZtp4eepNitP+BD6k2L6DROIDG4Q0fm4x+dwfsr6LGmROENnok75VGw40628xf+iR24WeMFcHuuBDUAzzsQ=="; }; }; "@types/node-8.10.66" = { @@ -1273,13 +1282,13 @@ let sha512 = "gVC1InwyVrO326wbBZw+AO3u2vRXz/iRWq9jYhpG4W8LXyIgDv3ZmcLQ5Q4Gs+gFMyqx+viFoFT+l3p61QFCmQ=="; }; }; - "@types/uglify-js-3.13.2" = { + "@types/uglify-js-3.16.0" = { name = "_at_types_slash_uglify-js"; packageName = "@types/uglify-js"; - version = "3.13.2"; + version = "3.16.0"; src = fetchurl { - url = "https://registry.npmjs.org/@types/uglify-js/-/uglify-js-3.13.2.tgz"; - sha512 = "/xFrPIo+4zOeNGtVMbf9rUm0N+i4pDf1ynExomqtokIJmVzR3962lJ1UE+MmexMkA0cmN9oTzg5Xcbwge0Ij2Q=="; + url = "https://registry.npmjs.org/@types/uglify-js/-/uglify-js-3.16.0.tgz"; + sha512 = "0yeUr92L3r0GLRnBOvtYK1v2SjqMIqQDHMl7GLb+l2L8+6LSFWEEWEIgVsPdMn5ImLM8qzWT8xFPtQYpp8co0g=="; }; }; "@types/webpack-4.41.32" = { @@ -2290,6 +2299,15 @@ let sha512 = "iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA=="; }; }; + "brace-expansion-2.0.1" = { + name = "brace-expansion"; + packageName = "brace-expansion"; + version = "2.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz"; + sha512 = "XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA=="; + }; + }; "braces-2.3.2" = { name = "braces"; packageName = "braces"; @@ -2380,13 +2398,13 @@ let sha512 = "VBorw+tgpOtZ1BYhrVSVTzTt/3+vSE3eFUh0N2GCFK1HffceOaf32YS/bs6WiFhjDAblAFrx85jMy3BG9fBK2Q=="; }; }; - "browserslist-4.20.3" = { + "browserslist-4.21.1" = { name = "browserslist"; packageName = "browserslist"; - version = "4.20.3"; + version = "4.21.1"; src = fetchurl { - url = "https://registry.npmjs.org/browserslist/-/browserslist-4.20.3.tgz"; - sha512 = "NBhymBQl1zM0Y5dQT/O+xiLP9/rzOIQdKM/eMJBAq7yBgaB6krIYLGejrwVYnSHZdqjscB1SPuAjHwxjvN6Wdg=="; + url = "https://registry.npmjs.org/browserslist/-/browserslist-4.21.1.tgz"; + sha512 = "Nq8MFCSrnJXSc88yliwlzQe3qNe3VntIjhsArW9IJOEPSHNx23FalwApUVbzAWABLhYJJ7y8AynWI/XM8OdfjQ=="; }; }; "buffer-4.9.2" = { @@ -2632,13 +2650,13 @@ let sha512 = "bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw=="; }; }; - "caniuse-lite-1.0.30001344" = { + "caniuse-lite-1.0.30001364" = { name = "caniuse-lite"; packageName = "caniuse-lite"; - version = "1.0.30001344"; + version = "1.0.30001364"; src = fetchurl { - url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001344.tgz"; - sha512 = "0ZFjnlCaXNOAYcV7i+TtdKBp0L/3XEU2MF/x6Du1lrh+SRX4IfzIVL4HNJg5pB2PmFb8rszIGyOvsZnqqRoc2g=="; + url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001364.tgz"; + sha512 = "9O0xzV3wVyX0SlegIQ6knz+okhBB5pE0PC40MNdwcipjwpxoUEHL24uJ+gG42cgklPjfO5ZjZPme9FTSN3QT2Q=="; }; }; "case-sensitive-paths-webpack-plugin-2.3.0" = { @@ -3109,15 +3127,6 @@ let sha512 = "U7VdrJFnJgo4xjrHpTzu0yrHPGImdsmD95ZlgYSEajAn2JKzDhDTPG9kBTefmObL2w/ngeZnilk+OV9CG3d7UA=="; }; }; - "commander-7.2.0" = { - name = "commander"; - packageName = "commander"; - version = "7.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz"; - sha512 = "QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw=="; - }; - }; "commander-8.3.0" = { name = "commander"; packageName = "commander"; @@ -3127,6 +3136,15 @@ let sha512 = "OkTL9umf+He2DZkUq8f8J9of7yL6RJKI24dVITBmNfZBmri9zYZQrKkuXiKhyfPSu8tUhnVBB1iKXevvnlR4Ww=="; }; }; + "commander-9.3.0" = { + name = "commander"; + packageName = "commander"; + version = "9.3.0"; + src = fetchurl { + url = "https://registry.npmjs.org/commander/-/commander-9.3.0.tgz"; + sha512 = "hv95iU5uXPbK83mjrJKuZyFM/LBAoCV/XhVGkS5Je6tl7sxr6A0ITMw5WoRV46/UaJ46Nllm3Xt7IaJhXTIkzw=="; + }; + }; "common-tags-1.8.2" = { name = "common-tags"; packageName = "common-tags"; @@ -3361,13 +3379,13 @@ let sha512 = "Kb2wC0fvsWfQrgk8HU5lW6U/Lcs8+9aaYcy4ZFc6DDlo4nZ7n70dEgE5rtR0oG6ufKDUnrwfWL1mXR5ljDatrQ=="; }; }; - "core-js-compat-3.22.7" = { + "core-js-compat-3.23.4" = { name = "core-js-compat"; packageName = "core-js-compat"; - version = "3.22.7"; + version = "3.23.4"; src = fetchurl { - url = "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.22.7.tgz"; - sha512 = "uI9DAQKKiiE/mclIC5g4AjRpio27g+VMRhe6rQoz+q4Wm4L6A/fJhiLtBw+sfOpDG9wZ3O0pxIw7GbfOlBgjOA=="; + url = "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.23.4.tgz"; + sha512 = "RkSRPe+JYEoflcsuxJWaiMPhnZoFS51FcIxm53k4KzhISCBTmaGlto9dTIrYuk0hnJc3G6pKufAKepHnBq6B6Q=="; }; }; "core-util-is-1.0.2" = { @@ -3376,7 +3394,7 @@ let version = "1.0.2"; src = fetchurl { url = "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz"; - sha1 = "b5fd54220aa2bc5ab57aab7140c940754503c1a7"; + sha512 = "3lqz5YjWTYnW6dlDa5TLaTCcShfar1e40rmcJVwCBJC6mWlFuj0eCHIElmG1g5kyuJ/GD+8Wn4FFCcz4gJPfaQ=="; }; }; "core-util-is-1.0.3" = { @@ -3448,7 +3466,7 @@ let version = "5.0.1"; src = fetchurl { url = "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.0.1.tgz"; - sha1 = "a3bbb302db2297cbea3c04edf36941f4613aa399"; + sha512 = "77q+/Kkp43OBZUppmezGBqwB1qdjGk8y1Kb6zdPaYVz8qKFRdGpL6TRLqJhlhG5RhtGkNnKaeEYCt7b/vtYteg=="; }; }; "cross-spawn-5.1.0" = { @@ -3457,7 +3475,7 @@ let version = "5.1.0"; src = fetchurl { url = "https://registry.npmjs.org/cross-spawn/-/cross-spawn-5.1.0.tgz"; - sha1 = "e8bd0efee58fcff6f8f94510a0a554bbfa235449"; + sha512 = "pTgQJ5KC0d2hcY8eyL1IzlBPYjTkyH72XRZPnLyKus2mBfNjQs3klqbJU2VILqZryAZUt9JOb3h/mWMy23/f5A=="; }; }; "cross-spawn-6.0.5" = { @@ -3493,7 +3511,7 @@ let version = "0.0.2"; src = fetchurl { url = "https://registry.npmjs.org/crypt/-/crypt-0.0.2.tgz"; - sha1 = "88d7ff7ec0dfb86f713dc87bbb42d044d3e6c41b"; + sha512 = "mCxBlsHFYh9C+HVpiEacem8FEBnMXgU9gy4zmNC+SXAZNB/1idgp/aulFJ4FgCi7GPEVbfyng092GqL2k2rmow=="; }; }; "crypto-browserify-3.12.0" = { @@ -3511,7 +3529,7 @@ let version = "0.0.4"; src = fetchurl { url = "https://registry.npmjs.org/css-color-names/-/css-color-names-0.0.4.tgz"; - sha1 = "808adc2e79cf84738069b646cb20ec27beb629e0"; + sha512 = "zj5D7X1U2h2zsXOAM8EyUREBnnts6H+Jm+d1M2DbiQQcUtnqgQsMrdo8JW9R80YFUmIdBZeMu5wvYM7hcgWP/Q=="; }; }; "css-declaration-sorter-4.0.1" = { @@ -3628,7 +3646,7 @@ let version = "4.0.0"; src = fetchurl { url = "https://registry.npmjs.org/cssnano-util-get-arguments/-/cssnano-util-get-arguments-4.0.0.tgz"; - sha1 = "ed3a08299f21d75741b20f3b81f194ed49cc150f"; + sha512 = "6RIcwmV3/cBMG8Aj5gucQRsJb4vv4I4rn6YjPbVWd5+Pn/fuG+YseGvXGk00XLkoZkaj31QOD7vMUpNPC4FIuw=="; }; }; "cssnano-util-get-match-4.0.0" = { @@ -3637,7 +3655,7 @@ let version = "4.0.0"; src = fetchurl { url = "https://registry.npmjs.org/cssnano-util-get-match/-/cssnano-util-get-match-4.0.0.tgz"; - sha1 = "c0e4ca07f5386bb17ec5e52250b4f5961365156d"; + sha512 = "JPMZ1TSMRUPVIqEalIBNoBtAYbi8okvcFns4O0YIhcdGebeYZK7dMyHJiQ6GqNBA9kE0Hym4Aqym5rPdsV/4Cw=="; }; }; "cssnano-util-raw-cache-4.0.1" = { @@ -3673,7 +3691,7 @@ let version = "1.0.3"; src = fetchurl { url = "https://registry.npmjs.org/cycle/-/cycle-1.0.3.tgz"; - sha1 = "21e80b2be8580f98b468f379430662b046c34ad2"; + sha512 = "TVF6svNzeQCOpjCqsy0/CSy8VgObG3wXusJ73xW2GbG5rGx7lC8zxDSURicsXI2UsGdi2L0QNRCi745/wUDvsA=="; }; }; "cyclist-1.0.1" = { @@ -3682,7 +3700,7 @@ let version = "1.0.1"; src = fetchurl { url = "https://registry.npmjs.org/cyclist/-/cyclist-1.0.1.tgz"; - sha1 = "596e9698fd0c80e12038c2b82d6eb1b35b6224d9"; + sha512 = "NJGVKPS81XejHcLhaLJS7plab0fK3slPh11mESeeDq2W4ZI5kUKK/LRRdVDvjJseojbPB7ZwjnyOybg3Igea/A=="; }; }; "dashdash-1.14.1" = { @@ -3691,7 +3709,7 @@ let version = "1.14.1"; src = fetchurl { url = "https://registry.npmjs.org/dashdash/-/dashdash-1.14.1.tgz"; - sha1 = "853cfa0f7cbe2fed5de20326b8dd581035f6e2f0"; + sha512 = "jRFi8UDGo6j+odZiEpjazZaWqEal3w/basFjQHQEwVtZJGDpxbH1MeYluwCS8Xq5wmLJooDlMgvVarmWfGM44g=="; }; }; "debug-2.6.9" = { @@ -3727,7 +3745,7 @@ let version = "1.2.0"; src = fetchurl { url = "https://registry.npmjs.org/decamelize/-/decamelize-1.2.0.tgz"; - sha1 = "f6534d15148269b20352e7bee26f501f9a191290"; + sha512 = "z2S+W9X73hAUUki+N+9Za2lBlun89zigOyGrsax+KUQ6wKW4ZoWpEYBkGhQjwAjjDCkWxhY0VKEhk8wzY7F5cA=="; }; }; "decode-uri-component-0.2.0" = { @@ -3736,7 +3754,7 @@ let version = "0.2.0"; src = fetchurl { url = "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.0.tgz"; - sha1 = "eb3913333458775cb84cd1a1fae062106bb87545"; + sha512 = "hjf+xovcEn31w/EUYdTXQh/8smFL/dzYjohQGEIgjyNavaJfBY2p5F527Bo1VPATxv0VYTUC2bOcXvqFwk78Og=="; }; }; "decompress-response-3.3.0" = { @@ -3745,7 +3763,7 @@ let version = "3.3.0"; src = fetchurl { url = "https://registry.npmjs.org/decompress-response/-/decompress-response-3.3.0.tgz"; - sha1 = "80a4dd323748384bfa248083622aedec982adff3"; + sha512 = "BzRPQuY1ip+qDonAOz42gRm/pg9F768C+npV/4JOsxRC2sq+Rlk+Q4ZCAsOhnIaMrgarILY+RMUIvMmmX1qAEA=="; }; }; "decompress-response-5.0.0" = { @@ -3763,7 +3781,7 @@ let version = "0.2.2"; src = fetchurl { url = "https://registry.npmjs.org/deep-equal/-/deep-equal-0.2.2.tgz"; - sha1 = "84b745896f34c684e98f2ce0e42abaf43bba017d"; + sha512 = "FXgye2Jr6oEk01S7gmSrHrPEQ1ontR7wwl+nYiZ8h4SXlHVm0DYda74BIPcHz2s2qPz4+375IcAz1vsWLwddgQ=="; }; }; "deep-equal-1.1.1" = { @@ -3799,7 +3817,7 @@ let version = "1.0.3"; src = fetchurl { url = "https://registry.npmjs.org/defaults/-/defaults-1.0.3.tgz"; - sha1 = "c656051e9817d9ff08ed881477f3fe4019f3ef7d"; + sha512 = "s82itHOnYrN0Ib8r+z7laQz3sdE+4FP3d9Q7VLO7U+KRT+CR0GsWuyHxzdAY82I7cXv0G/twrqomTJLOssO5HA=="; }; }; "defer-to-connect-1.1.3" = { @@ -3835,7 +3853,7 @@ let version = "0.2.5"; src = fetchurl { url = "https://registry.npmjs.org/define-property/-/define-property-0.2.5.tgz"; - sha1 = "c35b1ef918ec3c990f9a5bc57be04aacec5c8116"; + sha512 = "Rr7ADjQZenceVOAKop6ALkkRAmH1A4Gx9hV/7ZujPUN2rkATqFO0JZLZInbAjpZYoJ1gUx8MRMQVkYemcbMSTA=="; }; }; "define-property-1.0.0" = { @@ -3844,7 +3862,7 @@ let version = "1.0.0"; src = fetchurl { url = "https://registry.npmjs.org/define-property/-/define-property-1.0.0.tgz"; - sha1 = "769ebaaf3f4a63aad3af9e8d304c9bbe79bfb0e6"; + sha512 = "cZTYKFWspt9jZsMscWo8sc/5lbPC9Q0N5nBLgb+Yd915iL3udB1uFgS3B8YCx66UVHq018DAVFoee7x+gxggeA=="; }; }; "define-property-2.0.2" = { @@ -3871,7 +3889,7 @@ let version = "1.0.0"; src = fetchurl { url = "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz"; - sha1 = "df3ae199acadfb7d440aaae0b29e2272b24ec619"; + sha512 = "ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ=="; }; }; "depd-1.1.1" = { @@ -3880,7 +3898,7 @@ let version = "1.1.1"; src = fetchurl { url = "https://registry.npmjs.org/depd/-/depd-1.1.1.tgz"; - sha1 = "5783b4e1c459f06fa5ca27f991f3d06e7a310359"; + sha512 = "Jlk9xvkTDGXwZiIDyoM7+3AsuvJVoyOpRupvEVy9nX3YO3/ieZxhlgh8GpLNZ8AY7HjO6y2YwpMSh1ejhu3uIw=="; }; }; "depd-1.1.2" = { @@ -3889,7 +3907,7 @@ let version = "1.1.2"; src = fetchurl { url = "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz"; - sha1 = "9bcd52e14c097763e749b274c4346ed2e560b5a9"; + sha512 = "7emPTl6Dpo6JRXOXjLRxck+FlLRX5847cLKEn00PLAgc3g2hTZZgr+e4c2v6QpSmLeFP3n5yUo7ft6avBK/5jQ=="; }; }; "depd-2.0.0" = { @@ -3916,7 +3934,7 @@ let version = "1.0.4"; src = fetchurl { url = "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz"; - sha1 = "978857442c44749e4206613e37946205826abd80"; + sha512 = "3NdhDuEXnfun/z7x9GOElY49LoqVHoGScmOKwmxhsS8N5Y+Z8KyPPDnaSzqWgYt/ji4mqwfTS34Htrk0zPIXVg=="; }; }; "destroy-1.2.0" = { @@ -3946,13 +3964,13 @@ let sha512 = "5tQykt+LqfJFBEYaDITx7S7cR7mJ/zQmLXZ2qt5w04ainYZw6tBf9dBunMjVeVOdYVRUzUOE4HkY5J7+uttb5Q=="; }; }; - "devcert-1.2.1" = { + "devcert-1.2.2" = { name = "devcert"; packageName = "devcert"; - version = "1.2.1"; + version = "1.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/devcert/-/devcert-1.2.1.tgz"; - sha512 = "R7DqtMtsNmFVY75kzRHXON3hXoJili2xxlEcZgHi0VHSx8aJECfm7ZqAquXzTeAM/I9f8G2pHc/zq5k6iXHQzA=="; + url = "https://registry.npmjs.org/devcert/-/devcert-1.2.2.tgz"; + sha512 = "UsLqvtJGPiGwsIZnJINUnFYaWgK7CroreGRndWHZkRD58tPFr3pVbbSyHR8lbh41+azR4jKvuNZ+eCoBZGA5kA=="; }; }; "diff-sequences-27.5.1" = { @@ -3997,7 +4015,7 @@ let version = "1.0.0"; src = fetchurl { url = "https://registry.npmjs.org/dns-equal/-/dns-equal-1.0.0.tgz"; - sha1 = "b39e7f1da6eb0a75ba9c17324b34753c47e0654d"; + sha512 = "z+paD6YUQsk+AbGCEM4PrOXSss5gd66QfcVBFTKR/HpFL9jCqikS94HYwKww6fQyO7IxrIIyUu+g0Ka9tUS2Cg=="; }; }; "dns-packet-1.3.4" = { @@ -4015,7 +4033,7 @@ let version = "2.0.2"; src = fetchurl { url = "https://registry.npmjs.org/dns-txt/-/dns-txt-2.0.2.tgz"; - sha1 = "b91d806f5d27188e4ab3e7d107d881a1cc4642b6"; + sha512 = "Ix5PrWjphuSoUXV/Zv5gaFHjnaJtb02F2+Si3Ht9dyJ87+Z/lMmy+dpNHtTGraNK958ndXq2i+GLkWsWHcKaBQ=="; }; }; "dom-converter-0.2.0" = { @@ -4135,13 +4153,13 @@ let sha512 = "jtD6YG370ZCIi/9GTaJKQxWTZD045+4R4hTk/x1UyoqadyJ9x9CgSi1RlVDQF8U2sxLLSnFkCaMihqljHIWgMg=="; }; }; - "duplexer3-0.1.4" = { + "duplexer3-0.1.5" = { name = "duplexer3"; packageName = "duplexer3"; - version = "0.1.4"; + version = "0.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/duplexer3/-/duplexer3-0.1.4.tgz"; - sha1 = "ee01dd1cac0ed3cbc7fdbea37dc0a8f1ce002ce2"; + url = "https://registry.npmjs.org/duplexer3/-/duplexer3-0.1.5.tgz"; + sha512 = "1A8za6ws41LQgv9HrE/66jyC5yuSjQ3L/KOpFtoBilsAK2iA2wuS5rTt1OCzIvtS2V7nVmedsUU+DGRcjBmOYA=="; }; }; "duplexify-3.7.1" = { @@ -4159,7 +4177,7 @@ let version = "0.1.2"; src = fetchurl { url = "https://registry.npmjs.org/ecc-jsbn/-/ecc-jsbn-0.1.2.tgz"; - sha1 = "3a83a904e54353287874c564b7549386849a98c9"; + sha512 = "eh9O+hwRHNbG4BLTjEl3nw044CkGm5X6LoaCf7LPp7UU8Qrt47JYNi6nPX8xjW97TKGKm1ouctg0QSpZe9qrnw=="; }; }; "ee-first-1.1.1" = { @@ -4168,16 +4186,16 @@ let version = "1.1.1"; src = fetchurl { url = "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz"; - sha1 = "590c61156b0ae2f4f0255732a158b266bc56b21d"; + sha512 = "WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow=="; }; }; - "electron-to-chromium-1.4.140" = { + "electron-to-chromium-1.4.185" = { name = "electron-to-chromium"; packageName = "electron-to-chromium"; - version = "1.4.140"; + version = "1.4.185"; src = fetchurl { - url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.140.tgz"; - sha512 = "NLz5va823QfJBYOO/hLV4AfU4Crmkl/6Hl2pH3qdJcmi0ySZ3YTWHxOlDm3uJOFBEPy3pIhu8gKQo6prQTWKKA=="; + url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.185.tgz"; + sha512 = "9kV/isoOGpKkBt04yYNaSWIBn3187Q5VZRtoReq8oz5NY/A4XmU6cAoqgQlDp7kKJCZMRjWZ8nsQyxfpFHvfyw=="; }; }; "elliptic-6.5.4" = { @@ -4252,6 +4270,15 @@ let sha512 = "FcRN8UlTl52EigvGjTaG9rnfdUJYh88eWRrruUmZLNVb/71maM92l3HNDAcyztOj4pEYGhoo9DEHEquZm6B08A=="; }; }; + "elm-solve-deps-wasm-1.0.1" = { + name = "elm-solve-deps-wasm"; + packageName = "elm-solve-deps-wasm"; + version = "1.0.1"; + src = fetchurl { + url = "https://registry.npmjs.org/elm-solve-deps-wasm/-/elm-solve-deps-wasm-1.0.1.tgz"; + sha512 = "A05XKZKhzM8vWTo8KvNR4g1ICt9iMPOAMfo79OK25c+tQaLSfQ8iMYvW6XgSEd+SgRfM5VSKX4hKEiH6iTiWsg=="; + }; + }; "elm-test-0.19.1" = { name = "elm-test"; packageName = "elm-test"; @@ -4261,13 +4288,13 @@ let sha512 = "SyZgZ/hxq62budS3k0M1Qj1E8fIRvldSxFSm4XfzE6qRRuHAT2a82fxprZRZl1yG2GwnImGmhuKH5hSyjPpzjA=="; }; }; - "elm-test-0.19.1-revision7" = { + "elm-test-0.19.1-revision9" = { name = "elm-test"; packageName = "elm-test"; - version = "0.19.1-revision7"; + version = "0.19.1-revision9"; src = fetchurl { - url = "https://registry.npmjs.org/elm-test/-/elm-test-0.19.1-revision7.tgz"; - sha512 = "sd3nCQMeYMaY84Sz41bVJ30ZvQN1/4ZcD8uYMOuUbM39FDh58NY9/AcImVJ7Z+gjCFdcSU6VscZzhUoPW8jp6Q=="; + url = "https://registry.npmjs.org/elm-test/-/elm-test-0.19.1-revision9.tgz"; + sha512 = "lvHJbh16sy7oUBBPIEMN+0v6dGDZFmfvwq+V+TnGPk5ZlI64vcykx8E8+zLt/E+Ja42UKMMXXgN1ZHQ1V6Ic2Q=="; }; }; "elm-tooling-1.8.0" = { @@ -4321,7 +4348,7 @@ let version = "2.1.0"; src = fetchurl { url = "https://registry.npmjs.org/emojis-list/-/emojis-list-2.1.0.tgz"; - sha1 = "4daa4d9db00f9819880c79fa457ae5b09a1fd389"; + sha512 = "knHEZMgs8BB+MInokmNTg/OyPlAddghe1YBgNwJBc5zsJi/uyIcXoSDsL/W9ymOsBoBGdPIHXYJ9+qKFwRwDng=="; }; }; "emojis-list-3.0.0" = { @@ -4339,7 +4366,7 @@ let version = "1.0.2"; src = fetchurl { url = "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz"; - sha1 = "ad3ff4c86ec2d029322f5a02c3a9a606c95b3f59"; + sha512 = "TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w=="; }; }; "end-of-stream-1.4.4" = { @@ -4447,7 +4474,7 @@ let version = "1.0.3"; src = fetchurl { url = "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz"; - sha1 = "0258eae4d3d0c0974de1c169188ef0051d1d1988"; + sha512 = "NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow=="; }; }; "escape-string-regexp-1.0.5" = { @@ -4456,7 +4483,7 @@ let version = "1.0.5"; src = fetchurl { url = "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz"; - sha1 = "1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"; + sha512 = "vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg=="; }; }; "escape-string-regexp-2.0.0" = { @@ -4537,7 +4564,7 @@ let version = "1.8.1"; src = fetchurl { url = "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz"; - sha1 = "41ae2eeb65efa62268aebfea83ac7d79299b0887"; + sha512 = "aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg=="; }; }; "eventemitter3-3.1.2" = { @@ -4573,16 +4600,16 @@ let version = "0.1.6"; src = fetchurl { url = "https://registry.npmjs.org/eventsource/-/eventsource-0.1.6.tgz"; - sha1 = "0acede849ed7dd1ccc32c811bb11b944d4f29232"; + sha512 = "bbB5tEuvC+SuRUG64X8ghvjgiRniuA4WlehWbFnoN4z6TxDXpyX+BMHF7rMgZAqoe+EbyNRUbHN0uuP9phy5jQ=="; }; }; - "eventsource-1.1.1" = { + "eventsource-1.1.2" = { name = "eventsource"; packageName = "eventsource"; - version = "1.1.1"; + version = "1.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/eventsource/-/eventsource-1.1.1.tgz"; - sha512 = "qV5ZC0h7jYIAOhArFJgSfdyz6rALJyb270714o7ZtNnw2WSJ+eexhKtE0O8LYPRsHZHf2osHKZBxGPvm3kPkCA=="; + url = "https://registry.npmjs.org/eventsource/-/eventsource-1.1.2.tgz"; + sha512 = "xAH3zWhgO2/3KIniEKYPr8plNSzlGINOUqYj0m0u7AB81iRw8b/3E73W6AuU+6klLbaSFmZnaETQ2lXPfAydrA=="; }; }; "evp_bytestokey-1.0.3" = { @@ -4618,7 +4645,7 @@ let version = "2.1.4"; src = fetchurl { url = "https://registry.npmjs.org/expand-brackets/-/expand-brackets-2.1.4.tgz"; - sha1 = "b77735e315ce30f6b6eff0f83b04151a22449622"; + sha512 = "w/ozOKR9Obk3qoWeY/WDi6MFta9AoMR+zud60mdnbniMcBxRuFJyDt2LdX/14A1UABeqk+Uk+LDfUpvoGKppZA=="; }; }; "expand-tilde-2.0.2" = { @@ -4627,7 +4654,7 @@ let version = "2.0.2"; src = fetchurl { url = "https://registry.npmjs.org/expand-tilde/-/expand-tilde-2.0.2.tgz"; - sha1 = "97e801aa052df02454de46b02bf621642cdc8502"; + sha512 = "A5EmesHW6rfnZ9ysHQjPdJRni0SRar0tjtG5MNtm9n5TUvsYU8oozprtRD4AqHxcZWWlVuAmQo2nWKfN9oyjTw=="; }; }; "express-4.16.3" = { @@ -4636,7 +4663,7 @@ let version = "4.16.3"; src = fetchurl { url = "https://registry.npmjs.org/express/-/express-4.16.3.tgz"; - sha1 = "6af8a502350db3246ecc4becf6b5a34d22f7ed53"; + sha512 = "CDaOBMB9knI6vx9SpIxEMOJ6VBbC2U/tYNILs0qv1YOZc15K9U2EcF06v10F0JX6IYcWnKYZJwIDJspEHLvUaQ=="; }; }; "express-4.18.1" = { @@ -4654,7 +4681,7 @@ let version = "2.0.0"; src = fetchurl { url = "https://registry.npmjs.org/express-ws/-/express-ws-2.0.0.tgz"; - sha1 = "96d13fa41c8de8fa5dcbfa2dacace6f594272888"; + sha512 = "Voh/dZzLoNVxd+foiLS24ch2ZBKEuSJyXjHIjE2mq5bKtII8JKUVRqhr5onD7nVXU8SCxJtn4LYKnHlypRYGOA=="; }; }; "express-ws-4.0.0" = { @@ -4681,7 +4708,7 @@ let version = "2.0.1"; src = fetchurl { url = "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz"; - sha1 = "51af7d614ad9a9f610ea1bafbb989d6b1c56890f"; + sha512 = "zCnTtlxNoAiDc3gqY2aYAWFx7XWWiasuF2K8Me5WbN8otHKTUKBwjPtNpRs/rbUZm7KxWAaNj7P1a/p52GbVug=="; }; }; "extend-shallow-3.0.2" = { @@ -4690,7 +4717,7 @@ let version = "3.0.2"; src = fetchurl { url = "https://registry.npmjs.org/extend-shallow/-/extend-shallow-3.0.2.tgz"; - sha1 = "26a71aaf073b39fb2127172746131c2704028db8"; + sha512 = "BwY5b5Ql4+qZoefgMj2NUmx+tehVTH/Kf4k1ZEtOHNFcm2wSxMRo992l6X3TIgni2eZVTZ85xMOjF31fwZAj6Q=="; }; }; "external-editor-3.1.0" = { @@ -4717,7 +4744,7 @@ let version = "1.3.0"; src = fetchurl { url = "https://registry.npmjs.org/extsprintf/-/extsprintf-1.3.0.tgz"; - sha1 = "96918440e3041a7a414f8c52e3c574eb3c3e1e05"; + sha512 = "11Ndz7Nv+mvAC1j0ktTa7fAb0vLyGGX+rMHNBYQviQDGU0Hw7lhctJANqbPhu9nV9/izT/IntTgZ7Im/9LJs9g=="; }; }; "eyes-0.1.8" = { @@ -4726,7 +4753,7 @@ let version = "0.1.8"; src = fetchurl { url = "https://registry.npmjs.org/eyes/-/eyes-0.1.8.tgz"; - sha1 = "62cf120234c683785d902348a800ef3e0cc20bc0"; + sha512 = "GipyPsXO1anza0AOZdy69Im7hGFCNB7Y/NGjDlZGJ3GJJLtwNSb2vrzYrTYJRrRloVx7pl+bhUaTB8yiccPvFQ=="; }; }; "fast-deep-equal-3.1.3" = { @@ -4807,7 +4834,7 @@ let version = "0.10.0"; src = fetchurl { url = "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.10.0.tgz"; - sha1 = "4e492f8d04dfb6f89003507f6edbf2d501e7c6f4"; + sha512 = "Xhj93RXbMSq8urNCUq4p9l0P6hnySJ/7YNRhYNug0bLOuii7pKO7xQFb5mx9xZXWCar88pLPb805PvUkwrLZpQ=="; }; }; "faye-websocket-0.11.4" = { @@ -4834,7 +4861,7 @@ let version = "2.0.0"; src = fetchurl { url = "https://registry.npmjs.org/figures/-/figures-2.0.0.tgz"; - sha1 = "3ab1a2d2a62c8bfb431a0c94cb797a2fce27c962"; + sha512 = "Oa2M9atig69ZkfwiApY8F2Yy+tzMbazyvqv21R0NsSC8floSOC09BbT1ITWAdoMGQvJ/aZnR1KMwdx9tvHnTNA=="; }; }; "file-loader-6.2.0" = { @@ -4870,7 +4897,7 @@ let version = "4.0.0"; src = fetchurl { url = "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz"; - sha1 = "d544811d428f98eb06a63dc402d2403c328c38f7"; + sha512 = "VcpLTWqWDiTerugjj8e3+esbg+skS3M9e54UuR3iCeIDMXCLTsAH8hTSzDQU/X6/6t3eYkOKoZSef2PlU6U1XQ=="; }; }; "fill-range-7.0.1" = { @@ -4915,7 +4942,7 @@ let version = "0.2.7"; src = fetchurl { url = "https://registry.npmjs.org/find/-/find-0.2.7.tgz"; - sha1 = "7afbd00f8f08c5b622f97cda6f714173d547bb3f"; + sha512 = "+QhLzsS+vyYsZqojEIGDwzp5KxkhHs1BJUt2CtI93bL27SKj7H6FnAjwVIvjQiEXKV2qmgCj9ikqegVUIrw7ZA=="; }; }; "find-0.2.9" = { @@ -4924,7 +4951,7 @@ let version = "0.2.9"; src = fetchurl { url = "https://registry.npmjs.org/find/-/find-0.2.9.tgz"; - sha1 = "4b73f1ff9e56ad91b76e716407fe5ffe6554bb8c"; + sha512 = "7a4/LCiInB9xYMnAUEjLilL9FKclwbwK7VlXw+h5jMvT2TDFeYFCHM24O1XdnC/on/hx8mxVO3FTQkyHZnOghQ=="; }; }; "find-cache-dir-1.0.0" = { @@ -4933,7 +4960,7 @@ let version = "1.0.0"; src = fetchurl { url = "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-1.0.0.tgz"; - sha1 = "9288e3e9e3cc3748717d39eade17cf71fc30ee6f"; + sha512 = "46TFiBOzX7xq/PcSWfFwkyjpemdRnMe31UQF+os0y+1W3k95f6R4SEt02Hj4p3X0Mir9gfrkmOtshFidS0VPUg=="; }; }; "find-cache-dir-2.1.0" = { @@ -4987,7 +5014,7 @@ let version = "1.1.2"; src = fetchurl { url = "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz"; - sha1 = "6b2e9822b1a2ce0a60ab64d610eccad53cb24d0f"; + sha512 = "jvElSjyuo4EMQGoTwo1uJU5pQMwTW5lS1x05zzfJuTIyLR3zwO27LYrxNg+dlvKpGOuGy/MzBdXh80g0ve5+HA=="; }; }; "find-up-2.1.0" = { @@ -4996,7 +5023,7 @@ let version = "2.1.0"; src = fetchurl { url = "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz"; - sha1 = "45d1b7e506c717ddd482775a2b77920a3c0c57a7"; + sha512 = "NWzkk0jSJtTt08+FBFMvXoeZnOJD+jTtsRmBYbAIzJdX6l7dLgR7CTubCM5/eDdPUBvLCeVasP1brfVR/9/EZQ=="; }; }; "find-up-3.0.0" = { @@ -5023,7 +5050,7 @@ let version = "1.2.0"; src = fetchurl { url = "https://registry.npmjs.org/firstline/-/firstline-1.2.0.tgz"; - sha1 = "c9f4886e7f7fbf0afc12d71941dce06b192aea05"; + sha512 = "JBzSqQYZvZaD3aHRG1okOog1aZXuXCWHcf9BzkpHYIN9s9zQQCjFajawWxGzDco50p9wtg93A5qC90gnnfngKg=="; }; }; "firstline-1.3.1" = { @@ -5077,7 +5104,7 @@ let version = "1.0.2"; src = fetchurl { url = "https://registry.npmjs.org/for-in/-/for-in-1.0.2.tgz"; - sha1 = "81068d295a8142ec0ac726c6e2200c30fb6d5e80"; + sha512 = "7EwmXrOjyL+ChxMhmG5lnW9MPt1aIeZEwKhQzoBUdTV0N3zuwWDZYVJatDvZ2OyzPUvdIAZDsCetk3coyMfcnQ=="; }; }; "forever-agent-0.6.1" = { @@ -5086,7 +5113,7 @@ let version = "0.6.1"; src = fetchurl { url = "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz"; - sha1 = "fbc71f0c41adeb37f96c577ad1ed42d8fdacca91"; + sha512 = "j0KLYPhm6zeac4lz3oJ3o65qvgQCcPubiyotZrXqEaG4hNagNYO8qdlUrX5vwqv9ohqeT/Z3j6+yW067yWWdUw=="; }; }; "form-data-2.3.3" = { @@ -5122,7 +5149,7 @@ let version = "0.2.1"; src = fetchurl { url = "https://registry.npmjs.org/fragment-cache/-/fragment-cache-0.2.1.tgz"; - sha1 = "4290fad27f13e89be7f33799c6bc5a0abfff0d19"; + sha512 = "GMBAbW9antB8iZRHLoGw0b3HANt57diZYFO/HL1JGIC1MjKrdmhxvrJbupnVvpys0zsz7yBApXdQyfepKly2kA=="; }; }; "fresh-0.5.2" = { @@ -5131,7 +5158,7 @@ let version = "0.5.2"; src = fetchurl { url = "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz"; - sha1 = "3d8cadd90d976569fa835ab1f8e4b23a105605a7"; + sha512 = "zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q=="; }; }; "from2-2.3.0" = { @@ -5140,7 +5167,7 @@ let version = "2.3.0"; src = fetchurl { url = "https://registry.npmjs.org/from2/-/from2-2.3.0.tgz"; - sha1 = "8bfb5502bde4a4d36cfdeea007fcca21d7e382af"; + sha512 = "OMcX/4IC/uqEPVgGeyfN22LJk6AZrMkRZHxcHBMBvHScDGgwTm2GT2Wkgtocyd3JfZffjj2kYUDXXII0Fk9W0g=="; }; }; "fs-extra-10.1.0" = { @@ -5158,7 +5185,7 @@ let version = "2.0.0"; src = fetchurl { url = "https://registry.npmjs.org/fs-extra/-/fs-extra-2.0.0.tgz"; - sha1 = "337352bded4a0b714f3eb84de8cea765e9d37600"; + sha512 = "DERmRq6uGnu7I4uFJiWQBe5pYy67v2oKowEi8jYA/52u/ZO9xXBP2HAGacD9Nus0UT/WhJFZTq8cWbxZqOHVUg=="; }; }; "fs-extra-4.0.3" = { @@ -5248,7 +5275,7 @@ let version = "1.0.10"; src = fetchurl { url = "https://registry.npmjs.org/fs-write-stream-atomic/-/fs-write-stream-atomic-1.0.10.tgz"; - sha1 = "b47df53493ef911df75731e70a9ded0189db40c9"; + sha512 = "gehEzmPn2nAwr39eay+x3X34Ra+M2QlVUTLhkXPjWdeO8RF9kszk116avgBJM3ZyNHgHXBNx+VmPaFC36k0PzA=="; }; }; "fs.realpath-1.0.0" = { @@ -5257,7 +5284,7 @@ let version = "1.0.0"; src = fetchurl { url = "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz"; - sha1 = "1504ad2523158caa40db4a2787cb01411994ea4f"; + sha512 = "OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw=="; }; }; "fsevents-1.2.13" = { @@ -5341,13 +5368,13 @@ let sha512 = "DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg=="; }; }; - "get-intrinsic-1.1.1" = { + "get-intrinsic-1.1.2" = { name = "get-intrinsic"; packageName = "get-intrinsic"; - version = "1.1.1"; + version = "1.1.2"; src = fetchurl { - url = "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.1.tgz"; - sha512 = "kWZrnVM42QCiEA2Ig1bG8zjoIMOgxWwYCEeNdwY6Tv/cOSeGpcoX4pXHfKUxNKVoArnrEr2e9srnAxxGIraS9Q=="; + url = "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.1.2.tgz"; + sha512 = "Jfm3OyCxHh9DJyc28qGk+JmfkpO41A4XkneDSujN9MDXrm4oDKdHvndhZ2dN94+ERNfkYJWDclW6k2L/ZGHjXA=="; }; }; "get-own-enumerable-property-symbols-3.0.2" = { @@ -5365,7 +5392,7 @@ let version = "3.2.0"; src = fetchurl { url = "https://registry.npmjs.org/get-port/-/get-port-3.2.0.tgz"; - sha1 = "dd7ce7de187c06c8bf353796ac71e099f0980ebc"; + sha512 = "x5UJKlgeUiNT8nyo/AcnwLnZuZNcSjSw0kogRB+Whd1fjjFq4B1hySFxSFWWSn4mIBzg3sRNUDFYc4g5gjPoLg=="; }; }; "get-proxy-2.1.0" = { @@ -5419,7 +5446,7 @@ let version = "2.0.6"; src = fetchurl { url = "https://registry.npmjs.org/get-value/-/get-value-2.0.6.tgz"; - sha1 = "dc15ca1c672387ca76bd37ac0a395ba2042a2c28"; + sha512 = "Ln0UQDlxH1BapMu3GPtf7CuYNwRZf2gwCuPqbyG6pB8WfmFpzqcy4xtAaAMUhnNqjMKTiCPZG2oMT3YSx8U2NA=="; }; }; "getpass-0.1.7" = { @@ -5428,7 +5455,7 @@ let version = "0.1.7"; src = fetchurl { url = "https://registry.npmjs.org/getpass/-/getpass-0.1.7.tgz"; - sha1 = "5eff8e3e684d569ae4cb2b1282604e8ba62149fa"; + sha512 = "0fzj9JxOLfJ+XGLhR8ze3unN0KZCgZwiSSDz168VERjK8Wl8kVSdcu2kspd4s4wtAa1y/qrVRiAA0WclVsu0ng=="; }; }; "git-clone-able-0.1.2" = { @@ -5437,7 +5464,7 @@ let version = "0.1.2"; src = fetchurl { url = "https://registry.npmjs.org/git-clone-able/-/git-clone-able-0.1.2.tgz"; - sha1 = "13d4cced31fdcaa51db5027b3c90a8bdf867bccb"; + sha512 = "0pcXixfRCfLXdkwC/FJxiYEg5sYnbqYqtMmtXRzlKrStI9tLev7G/PDuFH2GmySJQ3ix5YUPRN/OJEuFD827EA=="; }; }; "glob-7.1.4" = { @@ -5458,13 +5485,22 @@ let sha512 = "nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q=="; }; }; + "glob-8.0.3" = { + name = "glob"; + packageName = "glob"; + version = "8.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/glob/-/glob-8.0.3.tgz"; + sha512 = "ull455NHSHI/Y1FqGaaYFaLGkNMMJbavMrEGFXG/PGrg6y7sutWHUHrz6gy6WEBH6akM1M414dWKCNs+IhKdiQ=="; + }; + }; "glob-parent-3.1.0" = { name = "glob-parent"; packageName = "glob-parent"; version = "3.1.0"; src = fetchurl { url = "https://registry.npmjs.org/glob-parent/-/glob-parent-3.1.0.tgz"; - sha1 = "9e6af6299d8d3bd2bd40430832bd113df906c5ae"; + sha512 = "E8Ak/2+dZY6fnzlR7+ueWvhsH1SjHr4jjss4YS/h4py44jY9MhK/VFdaZJAWDz6BbL21KeteKxFSFpq8OS5gVA=="; }; }; "glob-parent-5.1.2" = { @@ -5482,7 +5518,7 @@ let version = "0.3.0"; src = fetchurl { url = "https://registry.npmjs.org/glob-to-regexp/-/glob-to-regexp-0.3.0.tgz"; - sha1 = "8c5a1494d2066c570cc3bfe4496175acc4d502ab"; + sha512 = "Iozmtbqv0noj0uDDqoL0zNq0VBEfK2YFoMAZoxJe4cwphvLR+JskfF30QhXHOR4m3KrE6NLRYw+U9MRXvifyig=="; }; }; "global-modules-1.0.0" = { @@ -5500,7 +5536,7 @@ let version = "1.0.2"; src = fetchurl { url = "https://registry.npmjs.org/global-prefix/-/global-prefix-1.0.2.tgz"; - sha1 = "dbf743c6c14992593c655568cb66ed32c0122ebe"; + sha512 = "5lsx1NUDHtSjfg0eHlmYvZKv8/nVqX4ckFbM+FrGcQ+04KWcWFo9P5MxPZYSzUvyzmdTbI7Eix8Q4IbELDqzKg=="; }; }; "globals-11.12.0" = { @@ -5536,7 +5572,7 @@ let version = "6.1.0"; src = fetchurl { url = "https://registry.npmjs.org/globby/-/globby-6.1.0.tgz"; - sha1 = "f5a6d70e8395e21c858fb0489d64df02424d506c"; + sha512 = "KVbFv2TQtbzCoxAnfD6JcHZTYCzyliEaaeM/gH8qQdkKr5s0OP9scEgvdcngyk7AVdY6YVW/TJHd+lQ/Df3Daw=="; }; }; "globby-7.1.1" = { @@ -5545,7 +5581,7 @@ let version = "7.1.1"; src = fetchurl { url = "https://registry.npmjs.org/globby/-/globby-7.1.1.tgz"; - sha1 = "fb2ccff9401f8600945dfada97440cca972b8680"; + sha512 = "yANWAN2DUcBtuus5Cpd+SKROzXHs2iVXFZt/Ykrfz6SAXqacLX25NZpltE+39ceMexYF4TtEadjuSTw8+3wX4g=="; }; }; "globby-8.0.1" = { @@ -5617,7 +5653,7 @@ let version = "2.0.0"; src = fetchurl { url = "https://registry.npmjs.org/har-schema/-/har-schema-2.0.0.tgz"; - sha1 = "a94c2224ebcac04782a0d9035521f24735b7ec92"; + sha512 = "Oqluz6zhGX8cyRaTQlFMPw80bSJVG2x/cFb8ZPhUILGgHka9SsokCCOQgpveePerqidZOrT14ipqfJb7ILcW5Q=="; }; }; "har-validator-5.1.5" = { @@ -5644,7 +5680,7 @@ let version = "2.0.0"; src = fetchurl { url = "https://registry.npmjs.org/has-ansi/-/has-ansi-2.0.0.tgz"; - sha1 = "34f5049ce1ecdf2b0649af3ef24e45ed35416d91"; + sha512 = "C8vBJ8DwUCx19vhm7urhTuUsr4/IyP6l4VzNQDv+ryHQObW3TTTp9yB68WpYgRe2bbaGuZ/se74IqFeVnMnLZg=="; }; }; "has-bigints-1.0.2" = { @@ -5662,7 +5698,7 @@ let version = "3.0.0"; src = fetchurl { url = "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz"; - sha1 = "b5d454dc2199ae225699f3467e5a07f3b955bafd"; + sha512 = "sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw=="; }; }; "has-flag-4.0.0" = { @@ -5725,7 +5761,7 @@ let version = "0.3.1"; src = fetchurl { url = "https://registry.npmjs.org/has-value/-/has-value-0.3.1.tgz"; - sha1 = "7b1f58bada62ca827ec0a2078025654845995e1f"; + sha512 = "gpG936j8/MzaeID5Yif+577c17TxaDmhuyVgSwtnL/q8UUTySg8Mecb+8Cf1otgLoD7DDH75axp86ER7LFsf3Q=="; }; }; "has-value-1.0.0" = { @@ -5734,7 +5770,7 @@ let version = "1.0.0"; src = fetchurl { url = "https://registry.npmjs.org/has-value/-/has-value-1.0.0.tgz"; - sha1 = "18b281da585b1c5c51def24c930ed29a0be6b177"; + sha512 = "IBXk4GTsLYdQ7Rvt+GRBrFSVEkmuOUy4re0Xjd9kJSUQpnTrWR4/y9RpfexN9vkAPMFuQoeWKwqzPozRTlasGw=="; }; }; "has-values-0.1.4" = { @@ -5743,7 +5779,7 @@ let version = "0.1.4"; src = fetchurl { url = "https://registry.npmjs.org/has-values/-/has-values-0.1.4.tgz"; - sha1 = "6d61de95d91dfca9b9a02089ad384bff8f62b771"; + sha512 = "J8S0cEdWuQbqD9//tlZxiMuMNmxB8PlEwvYwuxsTmR1G5RXUePEX/SJn7aD0GMLieuZYSwNH0cQuJGwnYunXRQ=="; }; }; "has-values-1.0.0" = { @@ -5752,7 +5788,7 @@ let version = "1.0.0"; src = fetchurl { url = "https://registry.npmjs.org/has-values/-/has-values-1.0.0.tgz"; - sha1 = "95b0b63fec2146619a6fe57fe75628d5a39efe4f"; + sha512 = "ODYZC64uqzmtfGMEAX/FvZiRyWLpAC3vYnNunURUnkGVTS+mI0smVsWaPydRBsE3g+ok7h960jChO8mFcWlHaQ=="; }; }; "hash-base-3.1.0" = { @@ -5797,7 +5833,7 @@ let version = "1.0.1"; src = fetchurl { url = "https://registry.npmjs.org/hmac-drbg/-/hmac-drbg-1.0.1.tgz"; - sha1 = "d2745701025a6c775a6c545793ed502fc0c649a1"; + sha512 = "Tti3gMqLdZfhOQY1Mzf/AanLiqh1WTiJgEj26ZuYQ9fbkLomzGchCws4FyrSd4VkpBfiNhaE1On+lOz894jvXg=="; }; }; "homedir-polyfill-1.0.3" = { @@ -5824,7 +5860,7 @@ let version = "2.1.6"; src = fetchurl { url = "https://registry.npmjs.org/hpack.js/-/hpack.js-2.1.6.tgz"; - sha1 = "87774c0949e513f42e84575b3c45681fade2a0b2"; + sha512 = "zJxVehUdMGIKsRaNt7apO2Gqp0BdqW5yaiGHXXmbpvxgBYVZnAql+BJb4RO5ad2MgpbZKn5G6nMnegrH1FcNYQ=="; }; }; "hsl-regex-1.0.0" = { @@ -5833,7 +5869,7 @@ let version = "1.0.0"; src = fetchurl { url = "https://registry.npmjs.org/hsl-regex/-/hsl-regex-1.0.0.tgz"; - sha1 = "d49330c789ed819e276a4c0d272dffa30b18fe6e"; + sha512 = "M5ezZw4LzXbBKMruP+BNANf0k+19hDQMgpzBIYnya//Al+fjNct9Wf3b1WedLqdEs2hKBvxq/jh+DsHJLj0F9A=="; }; }; "hsla-regex-1.0.0" = { @@ -5842,7 +5878,7 @@ let version = "1.0.0"; src = fetchurl { url = "https://registry.npmjs.org/hsla-regex/-/hsla-regex-1.0.0.tgz"; - sha1 = "c1ce7a3168c8c6614033a4b5f7877f3b225f9c38"; + sha512 = "7Wn5GMLuHBjZCb2bTmnDOycho0p/7UVaAeqXZGbHrBCl6Yd/xDhQJAXe6Ga9AXJH2I5zY1dEdYw2u1UptnSBJA=="; }; }; "html-entities-1.4.0" = { @@ -5896,7 +5932,7 @@ let version = "1.2.7"; src = fetchurl { url = "https://registry.npmjs.org/http-deceiver/-/http-deceiver-1.2.7.tgz"; - sha1 = "fa7168944ab9a519d337cb0bec7284dc3e723d87"; + sha512 = "LmpOGxTfbpgtGVxJrj5k7asXHCgNZp5nLfp+hWc8QQRqtb7fUy6kRY3BO1h9ddF6yIPYUARgxGOwB42DnxIaNw=="; }; }; "http-errors-1.6.2" = { @@ -5905,7 +5941,7 @@ let version = "1.6.2"; src = fetchurl { url = "https://registry.npmjs.org/http-errors/-/http-errors-1.6.2.tgz"; - sha1 = "0a002cc85707192a7e7946ceedc11155f60ec736"; + sha512 = "STnYGcKMXL9CGdtpeTFnLmgMSHTTNQJSHxiC4DETHKf934Q160Ht5pljrNeH24S0O9xUN+9vsDJZdZtk5js6Ww=="; }; }; "http-errors-1.6.3" = { @@ -5914,7 +5950,7 @@ let version = "1.6.3"; src = fetchurl { url = "https://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz"; - sha1 = "8b55680bb4be283a0b5bf4ea2e38580be1d9320d"; + sha512 = "lks+lVC8dgGyh97jxvxeYTWQFvh4uw4yC12gVl63Cg30sjPX4wuGcdkICVXDAESr6OJGjqGA8Iz5mkeN6zlD7A=="; }; }; "http-errors-1.7.2" = { @@ -5944,13 +5980,13 @@ let sha512 = "FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ=="; }; }; - "http-parser-js-0.5.6" = { + "http-parser-js-0.5.8" = { name = "http-parser-js"; packageName = "http-parser-js"; - version = "0.5.6"; + version = "0.5.8"; src = fetchurl { - url = "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.5.6.tgz"; - sha512 = "vDlkRPDJn93swjcjqMSaGSPABbIarsr1TLAui/gLDXzV5VsJNdXNzMYDyNBLQkjWQCJ1uizu8T2oDMhmGt0PRA=="; + url = "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.5.8.tgz"; + sha512 = "SGeBX54F94Wgu5RH3X5jsDtf4eHyRogWX1XGT3b4HuW3tQPM4AaBzoUji/4AAJNXCEOWZ5O0DgZmJw1947gD5Q=="; }; }; "http-proxy-1.17.0" = { @@ -5995,7 +6031,7 @@ let version = "1.2.0"; src = fetchurl { url = "https://registry.npmjs.org/http-signature/-/http-signature-1.2.0.tgz"; - sha1 = "9aecd925114772f3d95b65a60abb8f7c18fbace1"; + sha512 = "CAbnr6Rz4CYQkLYUtSNXxQPUH2gK8f3iWexVlsnMeD+GjlsQ0Xsy1cOX+mN3dtxYomRy21CiOzU8Uhw6OwncEQ=="; }; }; "https-browserify-1.0.0" = { @@ -6004,7 +6040,7 @@ let version = "1.0.0"; src = fetchurl { url = "https://registry.npmjs.org/https-browserify/-/https-browserify-1.0.0.tgz"; - sha1 = "ec06c10e0a34c0f2faf199f7fd7fc78fffd03c73"; + sha512 = "J+FkSdyD+0mA0N+81tMotaRMfSL9SGi+xpD3T6YApKsc3bGSXJlfXri3VyFOeYkfLRQisDk1W+jIFFKBeUBbBg=="; }; }; "human-signals-2.1.0" = { @@ -6067,7 +6103,7 @@ let version = "0.1.5"; src = fetchurl { url = "https://registry.npmjs.org/iferr/-/iferr-0.1.5.tgz"; - sha1 = "c60eed69e6d8fdb6b3104a1fcbca1c192dc5b501"; + sha512 = "DUNFN5j7Tln0D+TxzloUjKB+CtVu6myn0JEFak6dG18mNt9YkQ6lzGCdafwofISZ1lLF3xRHJ98VKy9ynkcFaA=="; }; }; "ignore-3.3.10" = { @@ -6103,7 +6139,7 @@ let version = "2.0.0"; src = fetchurl { url = "https://registry.npmjs.org/import-fresh/-/import-fresh-2.0.0.tgz"; - sha1 = "d81355c15612d386c61f9ddd3922d4304822a546"; + sha512 = "eZ5H8rcgYazHbKC3PG4ClHNykCSxtAhxSSEM+2mb+7evD2CKF5V7c0dNum7AdpDh0ZdICwZY9sRSn8f+KH96sg=="; }; }; "import-fresh-3.3.0" = { @@ -6130,7 +6166,7 @@ let version = "0.1.4"; src = fetchurl { url = "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz"; - sha1 = "9218b9b2b928a238b13dc4fb6b6d576f231453ea"; + sha512 = "JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA=="; }; }; "indexes-of-1.0.1" = { @@ -6139,7 +6175,7 @@ let version = "1.0.1"; src = fetchurl { url = "https://registry.npmjs.org/indexes-of/-/indexes-of-1.0.1.tgz"; - sha1 = "f30f716c8e2bd346c7b67d3df3915566a7c05607"; + sha512 = "bup+4tap3Hympa+JBJUG7XuOsdNQ6fxt0MHyXMKuLBKn0OqsTfvUxkUrroEX1+B2VsSHvCjiIcZVxRtYa4nllA=="; }; }; "infer-owner-1.0.4" = { @@ -6157,7 +6193,7 @@ let version = "1.0.6"; src = fetchurl { url = "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz"; - sha1 = "49bd6331d7d02d0c09bc910a1075ba8165b56df9"; + sha512 = "k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA=="; }; }; "inherits-2.0.1" = { @@ -6166,7 +6202,7 @@ let version = "2.0.1"; src = fetchurl { url = "https://registry.npmjs.org/inherits/-/inherits-2.0.1.tgz"; - sha1 = "b17d08d326b4423e568eff719f91b0b1cbdf69f1"; + sha512 = "8nWq2nLTAwd02jTqJExUYFSD/fKq6VH9Y/oG2accc/kdI0V98Bag8d5a4gi3XHz73rDWa2PvTtvcWYquKqSENA=="; }; }; "inherits-2.0.3" = { @@ -6175,7 +6211,7 @@ let version = "2.0.3"; src = fetchurl { url = "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz"; - sha1 = "633c2c83e3da42a502f52466022480f4208261de"; + sha512 = "x00IRNXNy63jwGkJmzPigoySHbaqpNuzKbBOmzK+g2OdZpQ9w+sxCN+VSB3ja7IAge2OP2qpfxTjeNcyjmW1uw=="; }; }; "inherits-2.0.4" = { @@ -6229,7 +6265,7 @@ let version = "1.0.0"; src = fetchurl { url = "https://registry.npmjs.org/invert-kv/-/invert-kv-1.0.0.tgz"; - sha1 = "104a8e4aaca6d3d8cd157a8ef8bfab2d7a3ffdb6"; + sha512 = "xgs2NH9AE66ucSq4cNG1nhSFghr5l6tdL15Pk+jl46bmmBapgoaY/AacXyaDznAqmGL99TiLSQgO/XazFSKYeQ=="; }; }; "ip-1.1.8" = { @@ -6247,7 +6283,7 @@ let version = "2.1.0"; src = fetchurl { url = "https://registry.npmjs.org/ip-regex/-/ip-regex-2.1.0.tgz"; - sha1 = "fa78bf5d2e6913c911ce9f819ee5146bb6d844e9"; + sha512 = "58yWmlHpp7VYfcdTwMTvwMmqx/Elfxjd9RXTDyMsbL7lLWmhMylLEqiYVLKuLzOZqVgiWXD9MfR62Vv89VRxkw=="; }; }; "ipaddr.js-1.9.1" = { @@ -6265,7 +6301,7 @@ let version = "2.1.0"; src = fetchurl { url = "https://registry.npmjs.org/is-absolute-url/-/is-absolute-url-2.1.0.tgz"; - sha1 = "50530dfb84fcc9aa7dbe7852e83a37b93b9f2aa6"; + sha512 = "vOx7VprsKyllwjSkLV79NIhpyLfr3jAp7VaTCMXOJHu4m0Ew1CZ2fcjASwmV1jI3BWuWHB013M48eyeldk9gYg=="; }; }; "is-absolute-url-3.0.3" = { @@ -6283,7 +6319,7 @@ let version = "0.1.6"; src = fetchurl { url = "https://registry.npmjs.org/is-accessor-descriptor/-/is-accessor-descriptor-0.1.6.tgz"; - sha1 = "a9e12cb3ae8d876727eeef3843f8a0897b5c98d6"; + sha512 = "e1BM1qnDbMRG3ll2U9dSK0UMHuWOs3pY3AtcFsmvwPtKL3MML/Q86i+GilLfvqEs4GW+ExB91tQ3Ig9noDIZ+A=="; }; }; "is-accessor-descriptor-1.0.0" = { @@ -6310,7 +6346,7 @@ let version = "0.2.1"; src = fetchurl { url = "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz"; - sha1 = "77c99840527aa8ecb1a8ba697b80645a7a926a9d"; + sha512 = "zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg=="; }; }; "is-arrayish-0.3.2" = { @@ -6337,7 +6373,7 @@ let version = "1.0.1"; src = fetchurl { url = "https://registry.npmjs.org/is-binary-path/-/is-binary-path-1.0.1.tgz"; - sha1 = "75f16642b480f187a711c814161fd3a4a7655898"; + sha512 = "9fRVlXc0uCxEDj1nQzaWONSpbTfx0FmJfzHF7pwlI8DkWGoHBBea4Pg5Ky0ojwwxQmnSifgbKkI06Qv0Ljgj+Q=="; }; }; "is-binary-path-2.1.0" = { @@ -6382,7 +6418,7 @@ let version = "1.1.0"; src = fetchurl { url = "https://registry.npmjs.org/is-color-stop/-/is-color-stop-1.1.0.tgz"; - sha1 = "cfff471aee4dd5c9e158598fbe12967b5cdad345"; + sha512 = "H1U8Vz0cfXNujrJzEcvvwMDW9Ra+biSYA3ThdQvAnMLJkEHQXn6bWzLkxHtVYJ+Sdbx0b6finn3jZiaVe7MAHA=="; }; }; "is-core-module-2.9.0" = { @@ -6400,7 +6436,7 @@ let version = "0.1.4"; src = fetchurl { url = "https://registry.npmjs.org/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz"; - sha1 = "0b5ee648388e2c860282e793f1856fec3f301b56"; + sha512 = "+w9D5ulSoBNlmw9OHn3U2v51SyoCd0he+bB3xMl62oijhrspxowjU+AIcDY0N3iEJbUEkB15IlMASQsxYigvXg=="; }; }; "is-data-descriptor-1.0.0" = { @@ -6445,7 +6481,7 @@ let version = "0.3.1"; src = fetchurl { url = "https://registry.npmjs.org/is-directory/-/is-directory-0.3.1.tgz"; - sha1 = "61339b6f2475fc772fd9c9d83f5c8575dc154ae1"; + sha512 = "yVChGzahRFvbkscn2MlwGismPO12i9+znNruC5gVEntG3qu0xQMzsGg/JFbrsqDOHtHFPci+V5aP5T9I+yeKqw=="; }; }; "is-docker-2.2.1" = { @@ -6463,7 +6499,7 @@ let version = "0.1.1"; src = fetchurl { url = "https://registry.npmjs.org/is-extendable/-/is-extendable-0.1.1.tgz"; - sha1 = "62b110e289a471418e3ec36a617d472e301dfc89"; + sha512 = "5BMULNob1vgFX6EjQw5izWDxrecWK9AM72rugNr0TFldMOi0fj6Jk+zeKIt0xGj4cEfQIJth4w3OKWOJ4f+AFw=="; }; }; "is-extendable-1.0.1" = { @@ -6481,7 +6517,7 @@ let version = "2.1.1"; src = fetchurl { url = "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz"; - sha1 = "a88c02535791f02ed37c76a1b9ea9773c833f8c2"; + sha512 = "SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ=="; }; }; "is-fullwidth-code-point-1.0.0" = { @@ -6490,7 +6526,7 @@ let version = "1.0.0"; src = fetchurl { url = "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz"; - sha1 = "ef9e31386f031a7f0d643af82fde50c457ef00cb"; + sha512 = "1pqUqRjkhPJ9miNq9SwMfdvi6lBJcd6eFxvfaivQhaH3SgisfiuudvFntdKOmxuee/77l+FPjKrQjWvmPjWrRw=="; }; }; "is-fullwidth-code-point-2.0.0" = { @@ -6499,7 +6535,7 @@ let version = "2.0.0"; src = fetchurl { url = "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz"; - sha1 = "a3b30a5c4f199183167aaab93beefae3ddfb654f"; + sha512 = "VHskAKYM8RfSFXwee5t5cbN5PZeq1Wrh6qd5bkyiXIf6UQcN6w/A0eXM9r6t8d+GYOh+o6ZhiEnb88LN/Y8m2w=="; }; }; "is-fullwidth-code-point-3.0.0" = { @@ -6517,7 +6553,7 @@ let version = "3.1.0"; src = fetchurl { url = "https://registry.npmjs.org/is-glob/-/is-glob-3.1.0.tgz"; - sha1 = "7ba5ae24217804ac70707b96922567486cc3e84a"; + sha512 = "UFpDDrPgM6qpnFNI+rh/p3bUaq9hKLZN8bMUWzxmcnZVS3omf4IPK+BrewlnWjO1WmUsMYuSjKh4UJuV4+Lqmw=="; }; }; "is-glob-4.0.3" = { @@ -6553,7 +6589,7 @@ let version = "3.0.0"; src = fetchurl { url = "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz"; - sha1 = "24fd6201a4782cf50561c810276afc7d12d71195"; + sha512 = "4cboCqIpliH+mAvFNegjZQ4kgKc3ZUhQVr3HvWbSh5q3WH2v82ct+T2Y1hdU5Gdtorx/cLifQjqCbL7bpznLTg=="; }; }; "is-number-7.0.0" = { @@ -6580,7 +6616,7 @@ let version = "1.0.1"; src = fetchurl { url = "https://registry.npmjs.org/is-obj/-/is-obj-1.0.1.tgz"; - sha1 = "3e4729ac1f5fde025cd7d83a896dab9f4f67db0f"; + sha512 = "l4RyHgRqGN4Y3+9JHVrNqO+tN0rV5My76uW5/nuO4K1b6vw5G8d/cmFjP9tRfEsdhZNt0IFdZuK/c2Vr4Nb+Qg=="; }; }; "is-obj-2.0.0" = { @@ -6634,7 +6670,7 @@ let version = "1.1.0"; src = fetchurl { url = "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-1.1.0.tgz"; - sha1 = "71a50c8429dfca773c92a390a4a03b39fcd51d3e"; + sha512 = "yvkRyxmFKEOQ4pNXCmJG5AEQNlXJS5LaONXo5/cLdTZdWvsZ1ioJEonLGAosKlMWE8lwUy/bJzMjcw8az73+Fg=="; }; }; "is-plain-object-2.0.4" = { @@ -6661,7 +6697,7 @@ let version = "1.0.0"; src = fetchurl { url = "https://registry.npmjs.org/is-regexp/-/is-regexp-1.0.0.tgz"; - sha1 = "fd2d883545c46bac5a633e7b9a09e87fa2cb5069"; + sha512 = "7zjFAPO4/gwyQAAgRRmqeEeyIICSdmCqa3tsVHMdBzaXXRiqopZL4Cyghg/XulGWrtABTpbnYYzzIRffLkP4oA=="; }; }; "is-resolvable-1.1.0" = { @@ -6697,7 +6733,7 @@ let version = "1.1.0"; src = fetchurl { url = "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz"; - sha1 = "12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44"; + sha512 = "uQPm8kcs47jx38atAcWTVxyltQYoPT68y9aWYdV6yWXSyW8mzSat0TL6CiWdZeCdF3KrAvpVtnHbTv4RN+rqdQ=="; }; }; "is-stream-2.0.1" = { @@ -6733,7 +6769,7 @@ let version = "1.0.0"; src = fetchurl { url = "https://registry.npmjs.org/is-typedarray/-/is-typedarray-1.0.0.tgz"; - sha1 = "e479c80858df0c1b11ddda6940f96011fcda4a9a"; + sha512 = "cyA56iCMHAh5CdzjJIa4aohJyeO1YbwLi3Jc35MmRU6poroFjIGZzUzupGiRPOjgHg9TLu43xbpwXk523fMxKA=="; }; }; "is-unicode-supported-0.1.0" = { @@ -6751,7 +6787,7 @@ let version = "0.2.1"; src = fetchurl { url = "https://registry.npmjs.org/is-utf8/-/is-utf8-0.2.1.tgz"; - sha1 = "4b0da1442104d1b336340e80797e865cf39f7d72"; + sha512 = "rMYPYvCzsXywIsldgLaSoPlw5PfoB/ssr7hY4pLfcodrA5M/eArza1a9VmTiNIBNMjOGr1Ow9mTyU2o69U6U9Q=="; }; }; "is-valid-domain-0.1.6" = { @@ -6787,7 +6823,7 @@ let version = "1.1.0"; src = fetchurl { url = "https://registry.npmjs.org/is-wsl/-/is-wsl-1.1.0.tgz"; - sha1 = "1f16e4aa22b04d1336b66188a66af3c600c3a66d"; + sha512 = "gfygJYZ2gLTDlmbWMI0CE2MwnFzSN/2SZfkMlItC4K/JBlsWVDB0bO6XhqcY13YXE7iMcAJnzTCJjPiTeJJ0Mw=="; }; }; "is-wsl-2.2.0" = { @@ -6805,7 +6841,7 @@ let version = "1.0.0"; src = fetchurl { url = "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz"; - sha1 = "bb935d48582cba168c06834957a54a3e07124f11"; + sha512 = "VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ=="; }; }; "isexe-2.0.0" = { @@ -6814,7 +6850,7 @@ let version = "2.0.0"; src = fetchurl { url = "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz"; - sha1 = "e8fbf374dc556ff8947a10dcb0572d633f2cfa10"; + sha512 = "RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw=="; }; }; "isobject-2.1.0" = { @@ -6823,7 +6859,7 @@ let version = "2.1.0"; src = fetchurl { url = "https://registry.npmjs.org/isobject/-/isobject-2.1.0.tgz"; - sha1 = "f065561096a3f1da2ef46272f815c840d87e0c89"; + sha512 = "+OUdGJlgjOBZDfxnDjYYG6zp487z0JGNQq3cYQYg5f5hKR+syHMsaztzGeml/4kGG55CSpKSpWTY+jYGgsHLgA=="; }; }; "isobject-3.0.1" = { @@ -6832,7 +6868,7 @@ let version = "3.0.1"; src = fetchurl { url = "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz"; - sha1 = "4e431e92b11a9731636aa1f9c8d1ccbcfdab78df"; + sha512 = "WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg=="; }; }; "isstream-0.1.2" = { @@ -6841,7 +6877,7 @@ let version = "0.1.2"; src = fetchurl { url = "https://registry.npmjs.org/isstream/-/isstream-0.1.2.tgz"; - sha1 = "47e63f7af55afa6f92e1500e690eb8b8529c099a"; + sha512 = "Yljz7ffyPbrLpLngrMtZ7NduUgVvi6wG9RJ9IUcyCd59YQ911PBJphODUcbOVbqYfxe1wuYf/LJ8PauMRwsM/g=="; }; }; "isurl-1.0.0" = { @@ -6904,7 +6940,7 @@ let version = "0.1.1"; src = fetchurl { url = "https://registry.npmjs.org/jsbn/-/jsbn-0.1.1.tgz"; - sha1 = "a5e654c2e5a2deb5f201d96cefbca80c0ef2f513"; + sha512 = "UVU9dibq2JcFWxQPA6KCqj5O42VOmAY3zQUfEKxU0KpTGXwNoCjkX1e13eHNvw/xPynt6pU0rZ1htjWTNTSXsg=="; }; }; "jsesc-0.5.0" = { @@ -6913,7 +6949,7 @@ let version = "0.5.0"; src = fetchurl { url = "https://registry.npmjs.org/jsesc/-/jsesc-0.5.0.tgz"; - sha1 = "e7dee66e35d6fc16f710fe91d5cf69f70f08911d"; + sha512 = "uZz5UnB7u4T9LvwmFqXii7pZSouaRPorGs5who1Ip7VO0wxanFvBL7GkM6dTHlgX+jhBApRetaWpnDabOeTcnA=="; }; }; "jsesc-2.5.2" = { @@ -6940,7 +6976,7 @@ let version = "3.0.0"; src = fetchurl { url = "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.0.tgz"; - sha1 = "5b1f397afc75d677bde8bcfc0e47e1f9a3d9a898"; + sha512 = "CuUqjv0FUZIdXkHPI8MezCnFCdaTAacej1TZYulLoAg1h/PhwkdXFN4V/gzY4g+fMBCOV2xF+rp7t2XD2ns/NQ=="; }; }; "json-buffer-3.0.1" = { @@ -7003,7 +7039,7 @@ let version = "1.0.1"; src = fetchurl { url = "https://registry.npmjs.org/json-stable-stringify/-/json-stable-stringify-1.0.1.tgz"; - sha1 = "9a759d39c5f2ff503fd5300646ed445f88c4f9af"; + sha512 = "i/J297TW6xyj7sDFa7AmBPkQvLIxWr2kKPWI26tXydnZrzVAocNqn5DMNT1Mzk0vit1V5UkRM7C1KdVNp7Lmcg=="; }; }; "json-stringify-safe-5.0.1" = { @@ -7012,7 +7048,7 @@ let version = "5.0.1"; src = fetchurl { url = "https://registry.npmjs.org/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz"; - sha1 = "1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"; + sha512 = "ZClg6AaYvamvYEE82d3Iyd3vSSIjQ+odgjaTzRuO3s7toCdFKczob2i0zCh7JE8kWn17yvAWhUVxvqGwUalsRA=="; }; }; "json3-3.3.3" = { @@ -7030,7 +7066,7 @@ let version = "0.5.1"; src = fetchurl { url = "https://registry.npmjs.org/json5/-/json5-0.5.1.tgz"; - sha1 = "1eade7acc012034ad84e2396767ead9fa5495821"; + sha512 = "4xrs1aW+6N5DalkqSVA8fxh458CXvR99WU8WLKmq4v8eWAL86Xo3BVqyd3SkA9wEVjCMqyvvRRkshAdOnBp5rw=="; }; }; "json5-1.0.1" = { @@ -7057,7 +7093,7 @@ let version = "2.4.0"; src = fetchurl { url = "https://registry.npmjs.org/jsonfile/-/jsonfile-2.4.0.tgz"; - sha1 = "3736a2b428b87bbda0cc83b53fa3d633a35c2ae8"; + sha512 = "PKllAqbgLgxHaj8TElYymKCAgrASebJrWpTnEkOaTowt23VKXXN0sUeriJ+eh7y6ufb/CC5ap11pz71/cM0hUw=="; }; }; "jsonfile-4.0.0" = { @@ -7066,7 +7102,7 @@ let version = "4.0.0"; src = fetchurl { url = "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz"; - sha1 = "8771aae0799b64076b76640fca058f9c10e33ecb"; + sha512 = "m6F1R3z8jjlf2imQHS2Qez5sjKWQzbuuhuJ/FKYFRZvPE3PuHcSMVZzfsLhGVOkfd20obL5SWEBew5ShlquNxg=="; }; }; "jsonfile-6.1.0" = { @@ -7084,7 +7120,7 @@ let version = "0.0.0"; src = fetchurl { url = "https://registry.npmjs.org/jsonify/-/jsonify-0.0.0.tgz"; - sha1 = "2c74b6ee41d93ca51b7b5aaee8f503631d252a73"; + sha512 = "trvBk1ki43VZptdBI5rIlG4YOzyeH/WefQt5rj1grasPn4iiZWKet8nkgc4GlsAylaztn0qZfUYOiTsASJFdNA=="; }; }; "jsprim-1.4.2" = { @@ -7105,13 +7141,13 @@ let sha512 = "9ykJ/46SN/9KPM/sichzQ7OvXyGDYKGTaDlKMGCAlg2UK8KRy4jb0d8sFc+0Tt0YYnThq8X2RZgCg74RPxgcVA=="; }; }; - "keyv-4.3.0" = { + "keyv-4.3.2" = { name = "keyv"; packageName = "keyv"; - version = "4.3.0"; + version = "4.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/keyv/-/keyv-4.3.0.tgz"; - sha512 = "C30Un9+63J0CsR7Wka5quXKqYZsT6dcRQ2aOwGcSc3RiQ4HGWpTAHlCA+puNfw2jA/s11EsxA1nCXgZRuRKMQQ=="; + url = "https://registry.npmjs.org/keyv/-/keyv-4.3.2.tgz"; + sha512 = "kn8WmodVBe12lmHpA6W8OY7SNh6wVR+Z+wZESF4iF5FCazaVXGWOtnbnvX0tMQ1bO+/TmOD9LziuYMvrIIs0xw=="; }; }; "killable-1.0.1" = { @@ -7129,7 +7165,7 @@ let version = "3.2.2"; src = fetchurl { url = "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz"; - sha1 = "31ea21a734bab9bbb0f32466d893aea51e4a3c64"; + sha512 = "NOW9QQXMoZGg/oqnVNoNTTIFEIid1627WCffUBJEdMxYApq7mNE7CpzucIPc+ZQg25Phej7IJSmX3hO+oblOtQ=="; }; }; "kind-of-4.0.0" = { @@ -7138,7 +7174,7 @@ let version = "4.0.0"; src = fetchurl { url = "https://registry.npmjs.org/kind-of/-/kind-of-4.0.0.tgz"; - sha1 = "20813df3d712928b207378691a45066fae72dd57"; + sha512 = "24XsCxmEbRwEDbz/qz3stgin8TTzZ1ESR56OMCN0ujYg+vRutNSiOj9bHH9u85DKgXguraugV5sFuvbD4FW/hw=="; }; }; "kind-of-5.1.0" = { @@ -7165,7 +7201,7 @@ let version = "2.1.1"; src = fetchurl { url = "https://registry.npmjs.org/klaw/-/klaw-2.1.1.tgz"; - sha1 = "42b76894701169cc910fd0d19ce677b5fb378af1"; + sha512 = "kuInGWCNc98b1ghOqBJfqPOvAKn9HHgm+SdluR5VNfdA7rs7uNsuXGy7CCqsP6pFKPpUoCH4s9o00GEj9xONHg=="; }; }; "kleur-3.0.3" = { @@ -7177,13 +7213,13 @@ let sha512 = "eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w=="; }; }; - "kleur-4.1.4" = { + "kleur-4.1.5" = { name = "kleur"; packageName = "kleur"; - version = "4.1.4"; + version = "4.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/kleur/-/kleur-4.1.4.tgz"; - sha512 = "8QADVssbrFjivHWQU7KkMgptGTl6WAcSdlbBPY4uNF+mWr6DGcKrvY2w4FQJoXch7+fKMjj0dRrL75vk3k23OA=="; + url = "https://registry.npmjs.org/kleur/-/kleur-4.1.5.tgz"; + sha512 = "o+NO+8WrRiQEE4/7nwRJhN1HWpVmJm511pBHUxPLtp0BUISzlBplORYSmTclCnJvQq2tKu/sgl3xVpkc7ZWuQQ=="; }; }; "klona-2.0.5" = { @@ -7219,7 +7255,7 @@ let version = "1.0.0"; src = fetchurl { url = "https://registry.npmjs.org/lcid/-/lcid-1.0.0.tgz"; - sha1 = "308accafa0bc483a3867b4b6f2b9506251d1b835"; + sha512 = "YiGkH6EnGrDGqLMITnGjXtGmNtjoXw9SVUzcaos8RBi7Ps0VBylkq+vOcY9QE5poLasPCR849ucFUkl0UzUyOw=="; }; }; "lines-and-columns-1.2.4" = { @@ -7237,7 +7273,7 @@ let version = "1.1.0"; src = fetchurl { url = "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz"; - sha1 = "956905708d58b4bab4c2261b04f59f31c99374c0"; + sha512 = "cy7ZdNRXdablkXYNI049pthVeXFurRyb9+hA/dZzerZ0pGTx42z+y+ssxBaVV2l70t1muq5IdKhn4UtcoGUY9A=="; }; }; "loader-runner-2.4.0" = { @@ -7255,7 +7291,7 @@ let version = "1.1.0"; src = fetchurl { url = "https://registry.npmjs.org/loader-utils/-/loader-utils-1.1.0.tgz"; - sha1 = "c98aef488bcceda2ffb5e2de646d6a754429f5cd"; + sha512 = "gkD9aSEG9UGglyPcDJqY9YBTUtCLKaBK6ihD2VP1d1X60lTfFspNZNulGBBbUZLkPygy4LySYHyxBpq+VhjObQ=="; }; }; "loader-utils-1.4.0" = { @@ -7282,7 +7318,7 @@ let version = "2.0.0"; src = fetchurl { url = "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz"; - sha1 = "2b568b265eec944c6d9c0de9c3dbbbca0354cd8e"; + sha512 = "NCI2kiDkyR7VeEKm27Kda/iQHyKJe1Bu0FlTbYp3CqJu+9IFe9bLyAjMxf5ZDDbEg+iMPzB5zYyUTSm8wVTKmA=="; }; }; "locate-path-3.0.0" = { @@ -7327,7 +7363,7 @@ let version = "3.0.0"; src = fetchurl { url = "https://registry.npmjs.org/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz"; - sha1 = "0ccf2d89166af03b3663c796538b75ac6e114d9d"; + sha512 = "xYHt68QRoYGjeeM/XOE1uJtvXQAgvszfBhjV4yvsQH0u2i9I6cI6c6/eG4Hh3UAOVn0y/xAXwmTzEay49Q//HA=="; }; }; "lodash.memoize-4.1.2" = { @@ -7336,16 +7372,7 @@ let version = "4.1.2"; src = fetchurl { url = "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-4.1.2.tgz"; - sha1 = "bcc6c49a42a2840ed997f323eada5ecd182e0bfe"; - }; - }; - "lodash.sortby-4.7.0" = { - name = "lodash.sortby"; - packageName = "lodash.sortby"; - version = "4.7.0"; - src = fetchurl { - url = "https://registry.npmjs.org/lodash.sortby/-/lodash.sortby-4.7.0.tgz"; - sha1 = "edd14c824e2cc9c1e0b0a1b42bb5210516a42438"; + sha512 = "t7j+NzmgnQzTAYXcsHYLgimltOV1MXHtlOWf6GjL9Kj8GK5FInw5JotxvbOs+IvV1/Dzo04/fCGfLVs7aXb4Ag=="; }; }; "lodash.template-4.5.0" = { @@ -7372,7 +7399,7 @@ let version = "4.4.2"; src = fetchurl { url = "https://registry.npmjs.org/lodash.truncate/-/lodash.truncate-4.4.2.tgz"; - sha1 = "5a350da0b1113b837ecfffd5812cbe58d6eae193"; + sha512 = "jttmRe7bRse52OsWIMDLaXxWqRAmtIUccAQ3garviCqJjafXOfNMO0yMfNpdD6zbGaTU0P5Nz7e7gAT6cKmJRw=="; }; }; "lodash.uniq-4.5.0" = { @@ -7381,7 +7408,7 @@ let version = "4.5.0"; src = fetchurl { url = "https://registry.npmjs.org/lodash.uniq/-/lodash.uniq-4.5.0.tgz"; - sha1 = "d0225373aeb652adc1bc82e4945339a842754773"; + sha512 = "xfBaXQd9ryd9dlSDvnvI0lvxfLJlYAZzXomUYzLKtUeOQvOP5piqAWuGtrhWeqaXK9hhoM/iyJc5AV+XfsX3HQ=="; }; }; "log-symbols-4.1.0" = { @@ -7489,7 +7516,7 @@ let version = "0.2.2"; src = fetchurl { url = "https://registry.npmjs.org/map-cache/-/map-cache-0.2.2.tgz"; - sha1 = "c32abd0bd6525d9b051645bb4f26ac5dc98a0dbf"; + sha512 = "8y/eV9QQZCiyn1SprXSrCmqJN0yNRATe+PO8ztwqrvrbdRLA3eYJF0yaR0YayLWkMbsQSKWS9N2gPcGEc4UsZg=="; }; }; "map-visit-1.0.0" = { @@ -7498,7 +7525,7 @@ let version = "1.0.0"; src = fetchurl { url = "https://registry.npmjs.org/map-visit/-/map-visit-1.0.0.tgz"; - sha1 = "ecdca8f13144e660f1b5bd41f12f3479d98dfb8f"; + sha512 = "4y7uGv8bd2WdM9vpQsiQNo41Ln1NvhvDRuVt0k2JZQ+ezN2uaQes7lZeZ+QQUHOLQAtDaBJ+7wCbi+ab/KFs+w=="; }; }; "md5-2.3.0" = { @@ -7543,7 +7570,7 @@ let version = "0.3.0"; src = fetchurl { url = "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz"; - sha1 = "8710d7af0aa626f8fffa1ce00168545263255748"; + sha512 = "dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ=="; }; }; "memory-fs-0.4.1" = { @@ -7552,7 +7579,7 @@ let version = "0.4.1"; src = fetchurl { url = "https://registry.npmjs.org/memory-fs/-/memory-fs-0.4.1.tgz"; - sha1 = "3a9a20b8462523e447cfbc7e8bb80ed667bfc552"; + sha512 = "cda4JKCxReDXFXRqOHPQscuIYg1PvxbE2S2GP45rnwfEK+vZaXC8C1OFvdHIbgw0DLzowXGVoxLaAmlgRy14GQ=="; }; }; "memory-fs-0.5.0" = { @@ -7570,7 +7597,7 @@ let version = "1.0.1"; src = fetchurl { url = "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.1.tgz"; - sha1 = "b00aaa556dd8b44568150ec9d1b953f3f90cbb61"; + sha512 = "cCi6g3/Zr1iqQi6ySbseM1Xvooa98N0w31jzUYrXPX2xqObmFGHJ0tQ5u74H3mVh7wLouTseZyYIq39g8cNp1w=="; }; }; "merge-stream-2.0.0" = { @@ -7597,7 +7624,7 @@ let version = "1.1.2"; src = fetchurl { url = "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz"; - sha1 = "5529a4d67654134edcc5266656835b0f851afcee"; + sha512 = "iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w=="; }; }; "micromatch-3.1.10" = { @@ -7741,7 +7768,7 @@ let version = "1.0.1"; src = fetchurl { url = "https://registry.npmjs.org/minimalistic-crypto-utils/-/minimalistic-crypto-utils-1.0.1.tgz"; - sha1 = "f6c00c1c0b082246e5c4d99dfb8c7c083b2b582a"; + sha512 = "JIYlbt6g8i5jKfJ3xz7rF0LXmv2TkDxBLUkiBeZ7bAx4GnnNMr8xFpGnOxn6GhTEHx3SjRrZEoU+j04prX1ktg=="; }; }; "minimatch-3.0.4" = { @@ -7771,13 +7798,22 @@ let sha512 = "J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw=="; }; }; + "minimatch-5.1.0" = { + name = "minimatch"; + packageName = "minimatch"; + version = "5.1.0"; + src = fetchurl { + url = "https://registry.npmjs.org/minimatch/-/minimatch-5.1.0.tgz"; + sha512 = "9TPBGGak4nHfGZsPBohm9AWg6NoT7QTCehS3BIJABslyZbzxfV78QM2Y6+i741OPZIafFAaiiEMh5OyIrJPgtg=="; + }; + }; "minimist-1.2.0" = { name = "minimist"; packageName = "minimist"; version = "1.2.0"; src = fetchurl { url = "https://registry.npmjs.org/minimist/-/minimist-1.2.0.tgz"; - sha1 = "a35008b20f41383eec1fb914f4cd5df79a264284"; + sha512 = "7Wl+Jz+IGWuSdgsQEJ4JunV0si/iMhg42MnQQG6h1R6TNeVenp4U9x5CC5v/gYqz/fENLQITAWXidNtVL0NNbw=="; }; }; "minimist-1.2.5" = { @@ -7807,13 +7843,13 @@ let sha512 = "wxfUjg9WebH+CUDX/CdbRlh5SmfZiy/hpkxaRI16Y9W56Pa75sWgd/rvFilSgrauD9NyFymP/+JFV3KwzIsJeg=="; }; }; - "minipass-3.1.6" = { + "minipass-3.3.4" = { name = "minipass"; packageName = "minipass"; - version = "3.1.6"; + version = "3.3.4"; src = fetchurl { - url = "https://registry.npmjs.org/minipass/-/minipass-3.1.6.tgz"; - sha512 = "rty5kpw9/z8SX9dmxblFA6edItUmwJgMeYDZRrwlIVN27i8gysGbznJwUggw2V/FVqFSDdWy040ZPS811DYAqQ=="; + url = "https://registry.npmjs.org/minipass/-/minipass-3.3.4.tgz"; + sha512 = "I9WPbWHCGu8W+6k1ZiGpPu0GkoKBeorkfKNuAFBNS1HNFJvke82sxvI5bzcCNpWPorkOO5QQ+zomzzwRxejXiw=="; }; }; "minizlib-1.3.3" = { @@ -7888,13 +7924,13 @@ let sha512 = "vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw=="; }; }; - "moment-2.29.3" = { + "moment-2.29.4" = { name = "moment"; packageName = "moment"; - version = "2.29.3"; + version = "2.29.4"; src = fetchurl { - url = "https://registry.npmjs.org/moment/-/moment-2.29.3.tgz"; - sha512 = "c6YRvhEo//6T2Jz/vVtYzqBzwvPT95JBQ+smCytzf7c50oMZRsR/a4w88aD34I+/QVSfnoAnSBFPJHItlOMJVw=="; + url = "https://registry.npmjs.org/moment/-/moment-2.29.4.tgz"; + sha512 = "5LC9SOxjSc2HF6vO2CyuTDNivEdoz2IvyJJGj6X8DJ0eFyfszE0QiEd+iXmBvUP3WHxSjFH/vIsA0EN00cgr8w=="; }; }; "move-concurrently-1.0.1" = { @@ -7903,7 +7939,7 @@ let version = "1.0.1"; src = fetchurl { url = "https://registry.npmjs.org/move-concurrently/-/move-concurrently-1.0.1.tgz"; - sha1 = "be2c005fda32e0b29af1f05d7c4b33214c701f92"; + sha512 = "hdrFxZOycD/g6A6SoI2bB5NA/5NEqD0569+S47WZhPvm46sD50ZHdYaFmnua5lndde9rCHGjmfK7Z8BuCt/PcQ=="; }; }; "ms-2.0.0" = { @@ -7912,7 +7948,7 @@ let version = "2.0.0"; src = fetchurl { url = "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz"; - sha1 = "5608aeadfc00be6c2901df5f9861788de0d597c8"; + sha512 = "Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="; }; }; "ms-2.1.1" = { @@ -7957,7 +7993,7 @@ let version = "1.1.0"; src = fetchurl { url = "https://registry.npmjs.org/multicast-dns-service-types/-/multicast-dns-service-types-1.1.0.tgz"; - sha1 = "899f11d9686e5e05cb91b35d5f0e63b773cfc901"; + sha512 = "cnAsSVxIDsYt0v7HmC0hWZFwwXSh+E6PgCrREDuN/EsjgLwA5XRmlMHhSiDPrt6HxY1gTivEa/Zh7GtODoLevQ=="; }; }; "murmur-hash-js-1.0.0" = { @@ -7966,7 +8002,7 @@ let version = "1.0.0"; src = fetchurl { url = "https://registry.npmjs.org/murmur-hash-js/-/murmur-hash-js-1.0.0.tgz"; - sha1 = "5041049269c96633c866386960b2f4289e75e5b0"; + sha512 = "g3vtW36bHHcmcGOLlI+cVUBPtaoLdPkBNVNkHE+1mKgaYfjWXF6bWOlhsU6r+V+yG8tqUyM7WveRAXvHa98dZg=="; }; }; "mustache-3.2.1" = { @@ -7984,7 +8020,7 @@ let version = "0.0.7"; src = fetchurl { url = "https://registry.npmjs.org/mute-stream/-/mute-stream-0.0.7.tgz"; - sha1 = "3075ce93bc21b8fab43e1bc4da7e8115ed1e7bab"; + sha512 = "r65nCZhrbXXb6dXOACihYApHw2Q6pV0M3V0PSxd74N0+D8nzAdEAITq2oAjA1jVnKI+tGvEBUpqiMh0+rW6zDQ=="; }; }; "mute-stream-0.0.8" = { @@ -8029,7 +8065,7 @@ let version = "1.0.1"; src = fetchurl { url = "https://registry.npmjs.org/ncp/-/ncp-1.0.1.tgz"; - sha1 = "d15367e5cb87432ba117d2bf80fdf45aecfb4246"; + sha512 = "akBX7I5X9KQDDWmYYgQlLbVbjkveTje2mioZjhLLrVt09akSZcoqXWE5LEn1E2fu8T7th1PZYGfewQsTkTLTmQ=="; }; }; "negotiator-0.6.3" = { @@ -8113,13 +8149,13 @@ let sha512 = "rB1DUFUNAN4Gn9keO2K1efO35IDK7yKHCdCaIMvFO7yUYmmZYeDjnGKle26G4rwj+LKRQpjyUUvMkPglwGCYNQ=="; }; }; - "node-releases-2.0.5" = { + "node-releases-2.0.6" = { name = "node-releases"; packageName = "node-releases"; - version = "2.0.5"; + version = "2.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/node-releases/-/node-releases-2.0.5.tgz"; - sha512 = "U9h1NLROZTq9uE1SNffn6WuPDg8icmi3ns4rEl/oTfIle4iLjTliCzgTsbaIFMq/Xn078/lfY/BL0GWZ+psK4Q=="; + url = "https://registry.npmjs.org/node-releases/-/node-releases-2.0.6.tgz"; + sha512 = "PiVXnNuFm5+iYkLBNeq5211hvO38y63T0i2KKh2KnUs3RpzJ+JtODFjkD8yjLwnDkTYF1eKXheUwdssR+NRZdg=="; }; }; "node-watch-0.5.5" = { @@ -8137,7 +8173,7 @@ let version = "1.0.10"; src = fetchurl { url = "https://registry.npmjs.org/nopt/-/nopt-1.0.10.tgz"; - sha1 = "6ddd21bd2a31417b92727dd585f8a6f37608ebee"; + sha512 = "NWmpvLSqUrgrAC9HCuxEvb+PSloHpqVu+FqcO4eeF2h5qYRhA7ev6KvelyQAKtegUbC6RypJnlEOhd8vloNKYg=="; }; }; "normalize-package-data-2.5.0" = { @@ -8155,7 +8191,7 @@ let version = "2.1.1"; src = fetchurl { url = "https://registry.npmjs.org/normalize-path/-/normalize-path-2.1.1.tgz"; - sha1 = "1ab28b556e198363a8c1a6f7e6fa20137fe6aed9"; + sha512 = "3pKJwH184Xo/lnH6oyP1q2pMd7HcypqqmRs91/6/i2CGtWwIKGCkOOMTm/zXbgTEWHw1uNpNi/igc3ePOYHb6w=="; }; }; "normalize-path-3.0.0" = { @@ -8173,7 +8209,7 @@ let version = "0.1.2"; src = fetchurl { url = "https://registry.npmjs.org/normalize-range/-/normalize-range-0.1.2.tgz"; - sha1 = "2d10c06bdfd312ea9777695a4d28439456b75942"; + sha512 = "bdok/XvKII3nUpklnV6P2hxtMNrCboOjAcyBuQnWEhO665FwrSNRxU+AqpsyvO6LgGYPspN+lu5CLtw4jPRKNA=="; }; }; "normalize-url-1.9.1" = { @@ -8182,7 +8218,7 @@ let version = "1.9.1"; src = fetchurl { url = "https://registry.npmjs.org/normalize-url/-/normalize-url-1.9.1.tgz"; - sha1 = "2cc0d66b31ea23036458436e3620d85954c66c3c"; + sha512 = "A48My/mtCklowHBlI8Fq2jFWK4tX4lJ5E6ytFsSOq1fzpvT0SQSgKhSg7lN5c2uYFOrUAOQp6zhhJnpp1eMloQ=="; }; }; "normalize-url-3.3.0" = { @@ -8227,7 +8263,7 @@ let version = "2.0.2"; src = fetchurl { url = "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz"; - sha1 = "35a9232dfa35d7067b4cb2ddf2357b1871536c5f"; + sha512 = "lJxZYlT4DW/bRUtFh1MQIWqmLwQfAxnqWG4HhEdjMlkrJYnJn0Jrr2u3mgxqaWsdiBc76TYkTG/mhrnYTuzfHw=="; }; }; "npm-run-path-4.0.1" = { @@ -8263,7 +8299,7 @@ let version = "1.0.1"; src = fetchurl { url = "https://registry.npmjs.org/number-is-nan/-/number-is-nan-1.0.1.tgz"; - sha1 = "097b602b53422a522c1afb8790318336941a011d"; + sha512 = "4jbtZXNAsfZbAHiiqjLPBiCl16dES1zI4Hpzzxw61Tk+loF+sBDBKx1ICKKKwIqQ7M0mFn1TmkN7euSncWgHiQ=="; }; }; "oauth-sign-0.9.0" = { @@ -8281,7 +8317,7 @@ let version = "4.1.1"; src = fetchurl { url = "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz"; - sha1 = "2109adc7965887cfc05cbbd442cac8bfbb360863"; + sha512 = "rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg=="; }; }; "object-copy-0.1.0" = { @@ -8290,7 +8326,7 @@ let version = "0.1.0"; src = fetchurl { url = "https://registry.npmjs.org/object-copy/-/object-copy-0.1.0.tgz"; - sha1 = "7e7d858b781bd7c991a41ba975ed3812754e998c"; + sha512 = "79LYn6VAb63zgtmAteVOWo9Vdj71ZVBy3Pbse+VqxDpEP83XuujMrGqHIwAXJ5I/aM0zU7dIyIAhifVTPrNItQ=="; }; }; "object-hash-2.2.0" = { @@ -8335,7 +8371,7 @@ let version = "1.0.1"; src = fetchurl { url = "https://registry.npmjs.org/object-visit/-/object-visit-1.0.1.tgz"; - sha1 = "f79c4493af0c5377b59fe39d395e41042dd045bb"; + sha512 = "GBaMwwAVK9qbQN3Scdo0OyvgPW7l3lnaVMj84uTOZlswkX0KpF6fyDBJhtTthf7pymztoN36/KEr1DyhF96zEA=="; }; }; "object.assign-4.1.2" = { @@ -8371,7 +8407,7 @@ let version = "1.3.0"; src = fetchurl { url = "https://registry.npmjs.org/object.pick/-/object.pick-1.3.0.tgz"; - sha1 = "87a10ac4c1694bd2e1cbf53591a66141fb5dd747"; + sha512 = "tqa/UMy/CCoYmj+H5qc07qvSL9dqcs/WZENZ1JbtWBlATP+iVOe778gE6MSijnyCnORzDuX6hU+LA4SZ09YjFQ=="; }; }; "object.values-1.1.5" = { @@ -8398,7 +8434,7 @@ let version = "2.3.0"; src = fetchurl { url = "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz"; - sha1 = "20f1336481b083cd75337992a16971aa2d906947"; + sha512 = "ikqdkGAAyf/X/gPhXGvfgAytDZtDbr+bkNUJ0N9h5MI/dmdgCs3l6hoHrcUv41sRKew3jIwrp4qQDXiK99Utww=="; }; }; "on-finished-2.4.1" = { @@ -8425,7 +8461,7 @@ let version = "1.4.0"; src = fetchurl { url = "https://registry.npmjs.org/once/-/once-1.4.0.tgz"; - sha1 = "583b1aa775961d4b113ac17d9c50baef9dd76bd1"; + sha512 = "lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w=="; }; }; "onetime-2.0.1" = { @@ -8434,7 +8470,7 @@ let version = "2.0.1"; src = fetchurl { url = "https://registry.npmjs.org/onetime/-/onetime-2.0.1.tgz"; - sha1 = "067428230fd67443b2794b22bba528b6867962d4"; + sha512 = "oyyPpiMaKARvvcgip+JV+7zci5L8D1W9RZIz2l1o08AM3pfspitVWnPt3mzHcBPp12oYMTy0pqrFs/C+m3EwsQ=="; }; }; "onetime-5.1.2" = { @@ -8497,7 +8533,7 @@ let version = "0.0.6"; src = fetchurl { url = "https://registry.npmjs.org/options/-/options-0.0.6.tgz"; - sha1 = "ec22d312806bb53e731773e7cdaefcf1c643128f"; + sha512 = "bOj3L1ypm++N+n7CEbbe473A414AB7z+amKYshRb//iuL3MpdDCLhPnw6aVTdKB9g5ZRVHIEp8eUln6L2NUStg=="; }; }; "ora-5.4.1" = { @@ -8524,7 +8560,7 @@ let version = "0.3.0"; src = fetchurl { url = "https://registry.npmjs.org/os-browserify/-/os-browserify-0.3.0.tgz"; - sha1 = "854373c7f5c2315914fc9bfc6bd8238fdda1ec27"; + sha512 = "gjcpUc3clBf9+210TRaDWbf+rZZZEshZ+DlXMRCeAjp0xhTrnQsKHypIy1J3d5hKdUzj69t708EHtU8P6bUn0A=="; }; }; "os-homedir-1.0.2" = { @@ -8533,7 +8569,7 @@ let version = "1.0.2"; src = fetchurl { url = "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz"; - sha1 = "ffbc4988336e0e833de0c168c7ef152121aa7fb3"; + sha512 = "B5JU3cabzk8c67mRRd3ECmROafjYMXbuzlwtqdM8IbS8ktlTix8aFGb2bAGKrSRIlnfKwovGUUr72JUPyOb6kQ=="; }; }; "os-locale-1.4.0" = { @@ -8542,7 +8578,7 @@ let version = "1.4.0"; src = fetchurl { url = "https://registry.npmjs.org/os-locale/-/os-locale-1.4.0.tgz"; - sha1 = "20f9f17ae29ed345e8bde583b13d2009803c14d9"; + sha512 = "PRT7ZORmwu2MEFt4/fv3Q+mEfN4zetKxufQrkShY2oGvUms9r8otu5HfdyIFHkYXjO7laNsoVGmM2MANfuTA8g=="; }; }; "os-tmpdir-1.0.2" = { @@ -8551,7 +8587,7 @@ let version = "1.0.2"; src = fetchurl { url = "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz"; - sha1 = "bbe67406c79aa85c5cfec766fe5734555dfa1274"; + sha512 = "D2FR03Vir7FIu45XBY20mTb+/ZSWB00sjU9jdQXt83gDrI4Ztz5Fs7/yy74g2N5SVQY4xY1qDr4rNddwYRVX0g=="; }; }; "p-cancelable-1.1.0" = { @@ -8587,7 +8623,7 @@ let version = "1.0.0"; src = fetchurl { url = "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz"; - sha1 = "3fbcfb15b899a44123b34b6dcc18b724336a2cae"; + sha512 = "LICb2p9CB7FS+0eR1oqWnHhp0FljGLZCWBE9aix0Uye9W8LTQPwMTYVGWQWIw9RdQiDg4+epXQODwIYJtSJaow=="; }; }; "p-limit-1.3.0" = { @@ -8614,7 +8650,7 @@ let version = "2.0.0"; src = fetchurl { url = "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz"; - sha1 = "20a0103b222a70c8fd39cc2e580680f3dde5ec43"; + sha512 = "nQja7m7gSKuewoVRen45CtVfODR3crN3goVQ0DDZ9N3yHxgpkuBhZqsaiotSQRrADUrne346peY7kT3TSACykg=="; }; }; "p-locate-3.0.0" = { @@ -8668,7 +8704,7 @@ let version = "1.0.0"; src = fetchurl { url = "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz"; - sha1 = "cbc79cdbaf8fd4228e13f621f2b1a237c1b207b3"; + sha512 = "U1etNYuMJoIz3ZXSrrySFjsXQTWOx2/jdi86L+2pRvph/qMKL6sbcCYdH23fqsbm8TH2Gn0OybpT4eSFlCVHww=="; }; }; "p-try-2.2.0" = { @@ -8740,7 +8776,7 @@ let version = "2.2.0"; src = fetchurl { url = "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz"; - sha1 = "f480f40434ef80741f8469099f8dea18f55a4dc9"; + sha512 = "QR/GGaKCkhwk1ePQNYDRKYZ3mwU9ypsKhB0XyFnLQdomyEqk3e8wpW3V5Jp88zbxK4n5ST1nqo+g9juTpownhQ=="; }; }; "parse-json-4.0.0" = { @@ -8749,7 +8785,7 @@ let version = "4.0.0"; src = fetchurl { url = "https://registry.npmjs.org/parse-json/-/parse-json-4.0.0.tgz"; - sha1 = "be35f5425be1f7f6c747184f98a788cb99477ee0"; + sha512 = "aOIos8bujGN93/8Ox/jPLh7RwVnPEysynVFE+fQZyg6jKELEHwzgKdLRFHUgXJL6kylijVSBC4BvN9OmsB48Rw=="; }; }; "parse-json-5.2.0" = { @@ -8767,7 +8803,7 @@ let version = "1.0.0"; src = fetchurl { url = "https://registry.npmjs.org/parse-passwd/-/parse-passwd-1.0.0.tgz"; - sha1 = "6d5b934a456993b23d37f40a382d6f1666a8e5c6"; + sha512 = "1Y1A//QUXEZK7YKz+rD9WydcE1+EuPr6ZBgKecAB8tmoW6UFv0NREVJe1p+jRxtThkcbbKkfwIbWJe/IeE6m2Q=="; }; }; "parseurl-1.3.3" = { @@ -8794,7 +8830,7 @@ let version = "0.1.1"; src = fetchurl { url = "https://registry.npmjs.org/pascalcase/-/pascalcase-0.1.1.tgz"; - sha1 = "b363e55e8006ca6fe21784d2db22bd15d7917f14"; + sha512 = "XHXfu/yOQRy9vYOtUDVMN60OEJjW013GoObG1o+xwQTpB9eYJX/BjXMsdW13ZDPruFhYYn0AG22w0xgQMwl3Nw=="; }; }; "password-prompt-1.1.2" = { @@ -8821,7 +8857,7 @@ let version = "1.0.2"; src = fetchurl { url = "https://registry.npmjs.org/path-dirname/-/path-dirname-1.0.2.tgz"; - sha1 = "cc33d24d525e099a5388c0336c6e32b9160609e0"; + sha512 = "ALzNPpyNq9AqXMBjeymIjFDAkAFH06mHJH/cSBHAgU0s4vfpBn6b2nf8tiRLvagKD8RbTpq2FKTBg7cl9l3c7Q=="; }; }; "path-exists-2.1.0" = { @@ -8830,7 +8866,7 @@ let version = "2.1.0"; src = fetchurl { url = "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz"; - sha1 = "0feb6c64f0fc518d9a754dd5efb62c7022761f4b"; + sha512 = "yTltuKuhtNeFJKa1PiRzfLAU5182q1y4Eb4XCJ3PBqyzEDkAZRzBrKKBct682ls9reBVHf9udYLN5Nd+K1B9BQ=="; }; }; "path-exists-3.0.0" = { @@ -8839,7 +8875,7 @@ let version = "3.0.0"; src = fetchurl { url = "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz"; - sha1 = "ce0ebeaa5f78cb18925ea7d810d7b59b010fd515"; + sha512 = "bpC7GYwiDYQ4wYLe+FA8lhRjhQCMcQGuSgGGqDkg/QerRWw9CmGRT0iSOVRSZJ29NMLZgIzqaljJ63oaL4NIJQ=="; }; }; "path-exists-4.0.0" = { @@ -8857,7 +8893,7 @@ let version = "1.0.1"; src = fetchurl { url = "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz"; - sha1 = "174b9268735534ffbc7ace6bf53a5a9e1b5c5f5f"; + sha512 = "AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg=="; }; }; "path-is-inside-1.0.2" = { @@ -8866,7 +8902,7 @@ let version = "1.0.2"; src = fetchurl { url = "https://registry.npmjs.org/path-is-inside/-/path-is-inside-1.0.2.tgz"; - sha1 = "365417dede44430d1c11af61027facf074bdfc53"; + sha512 = "DUWJr3+ULp4zXmol/SZkFf3JGsS9/SIv+Y3Rt93/UjPpDpklB5f1er4O3POIbUuUJ3FXgqte2Q7SrU6zAqwk8w=="; }; }; "path-key-2.0.1" = { @@ -8875,7 +8911,7 @@ let version = "2.0.1"; src = fetchurl { url = "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz"; - sha1 = "411cadb574c5a140d3a4b1910d40d80cc9f40b40"; + sha512 = "fEHGKCSmUSDPv4uoj8AlD+joPlq3peND+HRYyxFz4KPw4z926S/b8rIuFs2FYJg3BwsxJf6A9/3eIdLaYC+9Dw=="; }; }; "path-key-3.1.1" = { @@ -8902,7 +8938,7 @@ let version = "0.1.7"; src = fetchurl { url = "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.7.tgz"; - sha1 = "df604178005f522f15eb4490e7247a1bfaa67f8c"; + sha512 = "5DFkuoqlv1uYQKxy8omFBeJPQcdoE07Kv2sferDCrAq1ohOU+MSDswDIbnx3YAM60qIOnYa53wBhXW0EbMonrQ=="; }; }; "path-type-1.1.0" = { @@ -8911,7 +8947,7 @@ let version = "1.1.0"; src = fetchurl { url = "https://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz"; - sha1 = "59c44f7ee491da704da415da5a4070ba4f8fe441"; + sha512 = "S4eENJz1pkiQn9Znv33Q+deTOKmbl+jj1Fl+qiP/vYezj+S8x+J3Uo0ISrx/QoEvIlOaDWJhPaRd1flJ9HXZqg=="; }; }; "path-type-3.0.0" = { @@ -8956,7 +8992,7 @@ let version = "2.1.0"; src = fetchurl { url = "https://registry.npmjs.org/performance-now/-/performance-now-2.1.0.tgz"; - sha1 = "6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"; + sha512 = "7EAHlyLHI56VEIdK57uwHdHKIaAGbnXPiw0yWbarQZOKaKpvUIgW0jWRVLiatnM+XXlSwsanIBH/hzGMJulMow=="; }; }; "picocolors-0.2.1" = { @@ -8992,7 +9028,7 @@ let version = "2.3.0"; src = fetchurl { url = "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz"; - sha1 = "ed141a6ac043a849ea588498e7dca8b15330e90c"; + sha512 = "udgsAY+fTnvv7kI7aaxbqwWNb0AHiB0qBO89PZKPkoTmGOgdbrHDKD+0B2X4uTfJ/FT1R09r9gTsjUjNJotuog=="; }; }; "pify-3.0.0" = { @@ -9001,7 +9037,7 @@ let version = "3.0.0"; src = fetchurl { url = "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz"; - sha1 = "e5a4acd2c101fdf3d9a4d07f0dbc4db49dd28176"; + sha512 = "C3FsVNH1udSEX48gGX1xfvwTWfsYWj5U+8/uK15BGzIGrKoUpghX8hWZwa/OFnakBiiVNmBvemTJR5mcy7iPcg=="; }; }; "pify-4.0.1" = { @@ -9019,7 +9055,7 @@ let version = "2.0.4"; src = fetchurl { url = "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz"; - sha1 = "72556b80cfa0d48a974e80e77248e80ed4f7f870"; + sha512 = "MnUuEycAemtSaeFSjXKW/aroV7akBbY+Sv+RkyqFjgAe73F+MR0TBWKBRDkmfWq/HiFmdavfZ1G7h4SPZXaCSg=="; }; }; "pinkie-promise-2.0.1" = { @@ -9028,7 +9064,7 @@ let version = "2.0.1"; src = fetchurl { url = "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz"; - sha1 = "2135d6dfa7a358c069ac9b178776288228450ffa"; + sha512 = "0Gni6D4UcLTbv9c57DfxDGdr41XfgUjqWZu492f0cIGr16zDU06BWP/RAEvOuo7CQ0CNjHaLlM59YJJFm3NWlw=="; }; }; "pjson-1.0.9" = { @@ -9046,7 +9082,7 @@ let version = "2.0.0"; src = fetchurl { url = "https://registry.npmjs.org/pkg-dir/-/pkg-dir-2.0.0.tgz"; - sha1 = "f6d5d1109e19d63edf428e0bd57e12777615334b"; + sha512 = "ojakdnUgL5pzJYWw2AIDEupaQCX5OPbM688ZevubICjdIX01PRSYKqm33fJoCOJBRseYCTUlQRnBNX+Pchaejw=="; }; }; "pkg-dir-3.0.0" = { @@ -9073,7 +9109,7 @@ let version = "2.0.0"; src = fetchurl { url = "https://registry.npmjs.org/pkg-up/-/pkg-up-2.0.0.tgz"; - sha1 = "c819ac728059a461cab1c3889a2be3c49a004d7f"; + sha512 = "fjAPuiws93rm7mPUu21RdBnkeZNrbfCFCwfAhPWY+rR3zG0ubpe5cEReHOw5fIbfmsxEV/g2kSxGTATY3Bpnwg=="; }; }; "pkginfo-0.3.1" = { @@ -9082,7 +9118,7 @@ let version = "0.3.1"; src = fetchurl { url = "https://registry.npmjs.org/pkginfo/-/pkginfo-0.3.1.tgz"; - sha1 = "5b29f6a81f70717142e09e765bbeab97b4f81e21"; + sha512 = "yO5feByMzAp96LtP58wvPKSbaKAi/1C4kV9XpTctr6EepnP6F33RBNOiVrdz9BrPA98U2BMFsTNHo44TWcbQ2A=="; }; }; "pkginfo-0.4.1" = { @@ -9091,7 +9127,7 @@ let version = "0.4.1"; src = fetchurl { url = "https://registry.npmjs.org/pkginfo/-/pkginfo-0.4.1.tgz"; - sha1 = "b5418ef0439de5425fc4995042dced14fb2a84ff"; + sha512 = "8xCNE/aT/EXKenuMDZ+xTVwkT8gsoHN2z/Q29l80u0ppGEXVvsKRzNMbtKhg8LS8k1tJLAHHylf6p4VFmP6XUQ=="; }; }; "portfinder-1.0.28" = { @@ -9109,7 +9145,7 @@ let version = "0.1.1"; src = fetchurl { url = "https://registry.npmjs.org/posix-character-classes/-/posix-character-classes-0.1.1.tgz"; - sha1 = "01eac0fe3b5af71a2a6c02feabb8c1fef7e00eab"; + sha512 = "xTgYBc3fuo7Yt7JbiuFxSYGToMoz8fLoE6TC9Wx1P/u+LfeThMOAqmuyECnlBaaJb+u1m9hHiXUEtwW4OzfUJg=="; }; }; "postcss-7.0.39" = { @@ -9478,7 +9514,7 @@ let version = "1.0.4"; src = fetchurl { url = "https://registry.npmjs.org/prepend-http/-/prepend-http-1.0.4.tgz"; - sha1 = "d4f4562b0ce3696e41ac52d0e002e57a635dc6dc"; + sha512 = "PhmXi5XmoyKw1Un4E+opM2KcsJInDvKyuOumcjjw3waw86ZNjHwVUOOWLc4bCzLdcKNaWBH9e99sbWzDQsVaYg=="; }; }; "prepend-http-2.0.0" = { @@ -9487,7 +9523,7 @@ let version = "2.0.0"; src = fetchurl { url = "https://registry.npmjs.org/prepend-http/-/prepend-http-2.0.0.tgz"; - sha1 = "e92434bfa5ea8c19f41cdfd401d741a3c819d897"; + sha512 = "ravE6m9Atw9Z/jjttRUZ+clIXogdghyZAuWJ3qEzjT+jI/dL1ifAqhZeC5VHzQp1MSt1+jxKkFNemj/iO7tVUA=="; }; }; "pretty-bytes-5.6.0" = { @@ -9523,7 +9559,7 @@ let version = "0.11.10"; src = fetchurl { url = "https://registry.npmjs.org/process/-/process-0.11.10.tgz"; - sha1 = "7332300e840161bda3e69a1d1d91a7d4bc16f182"; + sha512 = "cdGef/drWFoydD1JsMzuFf8100nZl+GT+yacc2bEced5f9Rjk4z+WtFUTBu9PhOi9j/jfmBPu0mMEY4wIdAF8A=="; }; }; "process-nextick-args-1.0.7" = { @@ -9532,7 +9568,7 @@ let version = "1.0.7"; src = fetchurl { url = "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-1.0.7.tgz"; - sha1 = "150e20b756590ad3f91093f25a4f2ad8bff30ba3"; + sha512 = "yN0WQmuCX63LP/TMvAg31nvT6m4vDqJEiiv2CAZqWOGNWutc9DfDk1NPYYmKUFmaVM2UwDowH4u5AHWYP/jxKw=="; }; }; "process-nextick-args-2.0.1" = { @@ -9559,7 +9595,7 @@ let version = "1.0.1"; src = fetchurl { url = "https://registry.npmjs.org/promise-inflight/-/promise-inflight-1.0.1.tgz"; - sha1 = "98472870bf228132fcbdd868129bad12c3c029e3"; + sha512 = "6zWPyEOFaQBJYcGMHBKTKJ3u6TBsnMFOIZSa6ce1e/ZrrsOlnHRHbabMjLiBYKp+n44X9eUI6VUPaukCXHuG4g=="; }; }; "prompt-1.0.0" = { @@ -9568,7 +9604,7 @@ let version = "1.0.0"; src = fetchurl { url = "https://registry.npmjs.org/prompt/-/prompt-1.0.0.tgz"; - sha1 = "8e57123c396ab988897fb327fd3aedc3e735e4fe"; + sha512 = "SIliATETjBHvX5c2h8xhjFP0GmGie58sdq7utvoMIv1qkcow3O/NLy21ME35D3uCMYYf/ZASPzG6kFTKXZ8Yxg=="; }; }; "prompts-2.4.2" = { @@ -9586,7 +9622,7 @@ let version = "1.2.4"; src = fetchurl { url = "https://registry.npmjs.org/proto-list/-/proto-list-1.2.4.tgz"; - sha1 = "212d5bfe1318306a420f6402b8e26ff39647a849"; + sha512 = "vtK/94akxsTMhe0/cbfpR+syPuszcuwhqVjJq26CuNDgFGj682oRBXOP5MJpv2r7JtE8MsiepGIqvvOTBwn2vA=="; }; }; "proxy-addr-2.0.7" = { @@ -9604,7 +9640,7 @@ let version = "1.0.1"; src = fetchurl { url = "https://registry.npmjs.org/prr/-/prr-1.0.1.tgz"; - sha1 = "d3fc114ba06995a45ec6893f484ceb1d78f5f476"; + sha512 = "yPw4Sng1gWghHQWj0B3ZggWUm4qVbPwPFcRG8KyxiU7J2OHFSoEHKS+EZ3fv5l1t9CyCiop6l/ZYeWbrgoQejw=="; }; }; "pseudomap-1.0.2" = { @@ -9613,16 +9649,16 @@ let version = "1.0.2"; src = fetchurl { url = "https://registry.npmjs.org/pseudomap/-/pseudomap-1.0.2.tgz"; - sha1 = "f052a28da70e618917ef0a8ac34c1ae5a68286b3"; + sha512 = "b/YwNhb8lk1Zz2+bXXpS/LK9OisiZZ1SNsSLxN1x2OXVEhW2Ckr/7mWE5vrC1ZTiJlD9g19jWszTmJsB+oEpFQ=="; }; }; - "psl-1.8.0" = { + "psl-1.9.0" = { name = "psl"; packageName = "psl"; - version = "1.8.0"; + version = "1.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/psl/-/psl-1.8.0.tgz"; - sha512 = "RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ=="; + url = "https://registry.npmjs.org/psl/-/psl-1.9.0.tgz"; + sha512 = "E/ZsdU4HLs/68gYzgGTkMicWTLPdAftJLfJFlLUAAKZGkStNU72sZjT66SnMDVOfOWY/YAoiD7Jxa9iHvngcag=="; }; }; "public-encrypt-4.0.3" = { @@ -9667,7 +9703,7 @@ let version = "1.3.2"; src = fetchurl { url = "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz"; - sha1 = "9653a036fb7c1ee42342f2325cceefea3926c48d"; + sha512 = "RofWgt/7fL5wP1Y7fxE7/EmTLzQVnB0ycyibJ0OOHIlJqTNzglYFxVwETOcIoJqJmpDXJ9xImDv+Fq34F/d4Dw=="; }; }; "punycode-1.4.1" = { @@ -9676,7 +9712,7 @@ let version = "1.4.1"; src = fetchurl { url = "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz"; - sha1 = "c0d5a63b2718800ad8e1eb0fa5269c84dd41845e"; + sha512 = "jmYNElW7yvO7TV33CjSmvSiE2yco3bV2czu/OzDKdMNVZQWfxCblURLhf+47syQRBntjfLdd/H0egrzIG+oaFQ=="; }; }; "punycode-2.1.1" = { @@ -9694,7 +9730,7 @@ let version = "1.5.1"; src = fetchurl { url = "https://registry.npmjs.org/q/-/q-1.5.1.tgz"; - sha1 = "7e32f75b41381291d04611f1bf14109ac00651d7"; + sha512 = "kV/CThkXo6xyFEZUugw/+pIOywXcDbFYgSct5cT3gqlbkBE1SJdwy6UQoZvodiWF/ckQLZyDE/Bu1M6gVu5lVw=="; }; }; "qs-6.10.3" = { @@ -9739,7 +9775,7 @@ let version = "4.3.4"; src = fetchurl { url = "https://registry.npmjs.org/query-string/-/query-string-4.3.4.tgz"; - sha1 = "bbb693b9ca915c232515b228b1a02b609043dbeb"; + sha512 = "O2XLNDBIg1DnTOa+2XrIwSiXEV8h2KImXUnjhhn2+UsvZ+Es2uyd5CCRTNQlDGbzUQOW3aYCBx9rVA6dzsiY7Q=="; }; }; "querystring-0.2.0" = { @@ -9748,7 +9784,7 @@ let version = "0.2.0"; src = fetchurl { url = "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz"; - sha1 = "b209849203bb25df820da756e747005878521620"; + sha512 = "X/xY82scca2tau62i9mDyU9K+I+djTMUsvwf7xnUX5GLvVzgJybOJf4Y6o9Zx3oJK/LSXg5tTZBjwzqVPaPO2g=="; }; }; "querystring-es3-0.2.1" = { @@ -9757,7 +9793,7 @@ let version = "0.2.1"; src = fetchurl { url = "https://registry.npmjs.org/querystring-es3/-/querystring-es3-0.2.1.tgz"; - sha1 = "9ec61f79049875707d69414596fd907a4d711e73"; + sha512 = "773xhDQnZBMFobEiztv8LIl70ch5MSF/jUQVlhwFyBILqq96anmoctVIYz+ZRp0qbCKATTn6ev02M3r7Ga5vqA=="; }; }; "querystringify-2.2.0" = { @@ -9811,7 +9847,7 @@ let version = "2.3.2"; src = fetchurl { url = "https://registry.npmjs.org/raw-body/-/raw-body-2.3.2.tgz"; - sha1 = "bcd60c77d3eb93cde0050295c3f379389bc88f89"; + sha512 = "Ss0DsBxqLxCmQkfG5yazYhtbVVTJqS9jTsZG2lhrNwqzOk2SUC7O/NB/M//CkEBqsrtmlNgJCPccJGuYSFr6Vg=="; }; }; "raw-body-2.4.0" = { @@ -9883,7 +9919,7 @@ let version = "1.0.7"; src = fetchurl { url = "https://registry.npmjs.org/read/-/read-1.0.7.tgz"; - sha1 = "b3da19bd052431a97671d44a42634adf710b40c4"; + sha512 = "rSOKNYUmaxy0om1BNjMN4ezNT6VKK+2xF4GBhc81mkH7L60i6dp8qPYrkndNLT3QPphoII3maL9PVC9XmhHwVQ=="; }; }; "read-pkg-1.1.0" = { @@ -9892,7 +9928,7 @@ let version = "1.1.0"; src = fetchurl { url = "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz"; - sha1 = "f5ffaa5ecd29cb31c0474bca7d756b6bb29e3f28"; + sha512 = "7BGwRHqt4s/uVbuyoeejRn4YmFnYZiFl4AuaeXHlgZf3sONF0SOGlxs2Pw8g6hCKupo08RafIO5YXFNOKTfwsQ=="; }; }; "read-pkg-up-1.0.1" = { @@ -9901,7 +9937,7 @@ let version = "1.0.1"; src = fetchurl { url = "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz"; - sha1 = "9d63c13276c065918d57f002a57f40a1b643fb02"; + sha512 = "WD9MTlNtI55IwYUS27iHh9tK3YoIVhxis8yKhLpTqWtml739uXc9NWTpxoHkfZf3+DkCCsXox94/VWZniuZm6A=="; }; }; "readable-stream-2.0.6" = { @@ -9910,7 +9946,7 @@ let version = "2.0.6"; src = fetchurl { url = "https://registry.npmjs.org/readable-stream/-/readable-stream-2.0.6.tgz"; - sha1 = "8f90341e68a53ccc928788dacfcd11b36eb9b78e"; + sha512 = "TXcFfb63BQe1+ySzsHZI/5v1aJPCShfqvWJ64ayNImXMsN1Cd0YGk/wm8KB7/OeessgPc9QvS9Zou8QTkFzsLw=="; }; }; "readable-stream-2.3.7" = { @@ -10018,7 +10054,7 @@ let version = "0.9.6"; src = fetchurl { url = "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.9.6.tgz"; - sha1 = "d33eb95d0d2001a4be39659707c51b0cb71ce029"; + sha512 = "D0Y/JJ4VhusyMOd/o25a3jdUqN/bC85EFsaoL9Oqmy/O4efCh+xhp7yj2EEOsj974qvMkcW8AwUzJ1jB/MbxCw=="; }; }; "regenerator-transform-0.15.0" = { @@ -10048,22 +10084,22 @@ let sha512 = "fjggEOO3slI6Wvgjwflkc4NFRCTZAu5CnNfBd5qOMYhWdn67nJBBu34/TkD++eeFmd8C9r9jfXJ27+nSiRkSUA=="; }; }; - "regexpu-core-5.0.1" = { + "regexpu-core-5.1.0" = { name = "regexpu-core"; packageName = "regexpu-core"; - version = "5.0.1"; + version = "5.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/regexpu-core/-/regexpu-core-5.0.1.tgz"; - sha512 = "CriEZlrKK9VJw/xQGJpQM5rY88BtuL8DM+AEwvcThHilbxiTAy8vq4iJnd2tqq8wLmjbGZzP7ZcKFjbGkmEFrw=="; + url = "https://registry.npmjs.org/regexpu-core/-/regexpu-core-5.1.0.tgz"; + sha512 = "bb6hk+xWd2PEOkj5It46A16zFMs2mv86Iwpdu94la4S3sJ7C973h2dHpYKwIBGaWSO7cIRJ+UX0IeMaWcO4qwA=="; }; }; - "registry-auth-token-4.2.1" = { + "registry-auth-token-4.2.2" = { name = "registry-auth-token"; packageName = "registry-auth-token"; - version = "4.2.1"; + version = "4.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/registry-auth-token/-/registry-auth-token-4.2.1.tgz"; - sha512 = "6gkSb4U6aWJB4SF2ZvLb76yCBjcvufXBqvvEx1HbmKPkutswjW1xNVRY0+daljIYRbogN7O0etYSlbiaEQyMyw=="; + url = "https://registry.npmjs.org/registry-auth-token/-/registry-auth-token-4.2.2.tgz"; + sha512 = "PC5ZysNb42zpFME6D/XlIgtNGdTl8bBOCw90xQLVMpzuuubJKYDWFAEuUNc+Cn8Z8724tg2SDhDRrkVEsqfDMg=="; }; }; "registry-url-5.1.0" = { @@ -10099,7 +10135,7 @@ let version = "0.2.7"; src = fetchurl { url = "https://registry.npmjs.org/relateurl/-/relateurl-0.2.7.tgz"; - sha1 = "54dbf377e51440aca90a4cd274600d3ff2d888a9"; + sha512 = "G08Dxvm4iDN3MLM0EsP62EDV9IuhXPR6blNz6Utcp7zyV3tr4HVNINt6MpaRWbxoOHT3Q7YN2P+jaHX8vUbgog=="; }; }; "remove-trailing-separator-1.1.0" = { @@ -10108,7 +10144,7 @@ let version = "1.1.0"; src = fetchurl { url = "https://registry.npmjs.org/remove-trailing-separator/-/remove-trailing-separator-1.1.0.tgz"; - sha1 = "c24bce2a283adad5bc3f58e0d48249b92379d8ef"; + sha512 = "/hS+Y0u3aOfIETiaiirUFwDBDzmXPvO+jAfKTitUngIPzdKc6Z0LoFjM/CK5PL4C+eKwHohlHAb6H0VFfmmUsw=="; }; }; "renderkid-2.0.7" = { @@ -10135,7 +10171,7 @@ let version = "1.6.1"; src = fetchurl { url = "https://registry.npmjs.org/repeat-string/-/repeat-string-1.6.1.tgz"; - sha1 = "8dcae470e1c88abc2d600fff4a776286da75e637"; + sha512 = "PV0dzCYDNfRi1jCDbJzpW7jNNDRuCOG/jI5ctQcGKt/clZD+YcPS3yIlWuTJMmESC8aevCFmWJy5wjAFgNqN6w=="; }; }; "request-2.88.0" = { @@ -10180,7 +10216,7 @@ let version = "2.1.1"; src = fetchurl { url = "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz"; - sha1 = "8c64ad5fd30dab1c976e2344ffe7f792a6a6df42"; + sha512 = "fGxEI7+wsG9xrvdjsrlmL22OMTTiHRwAMroiEeMgq8gzoLC/PQr7RsRDSTLUg/bZAZtF+TVIkHc6/4RIKrui+Q=="; }; }; "require-from-string-2.0.2" = { @@ -10198,7 +10234,7 @@ let version = "1.0.1"; src = fetchurl { url = "https://registry.npmjs.org/require-main-filename/-/require-main-filename-1.0.1.tgz"; - sha1 = "97f717b69d48784f5f526a6c5aa8ffdda055a4d1"; + sha512 = "IqSUtOVP4ksd1C/ej5zeEh/BIP2ajqpn8c5x+q99gvcIG/Qf0cud5raVnE/Dwd0ua9TXYDoDc0RE5hBSdz22Ug=="; }; }; "require-main-filename-2.0.0" = { @@ -10216,16 +10252,16 @@ let version = "1.0.0"; src = fetchurl { url = "https://registry.npmjs.org/requires-port/-/requires-port-1.0.0.tgz"; - sha1 = "925d2601d39ac485e091cf0da5c6e694dc3dcaff"; + sha512 = "KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ=="; }; }; - "resolve-1.22.0" = { + "resolve-1.22.1" = { name = "resolve"; packageName = "resolve"; - version = "1.22.0"; + version = "1.22.1"; src = fetchurl { - url = "https://registry.npmjs.org/resolve/-/resolve-1.22.0.tgz"; - sha512 = "Hhtrw0nLeSrFQ7phPp4OOcVjLPIeMnRlr5mcnVuMe7M/7eBn98A3hmFRLoFo3DLZkivSYwhRUJTyPyWAk56WLw=="; + url = "https://registry.npmjs.org/resolve/-/resolve-1.22.1.tgz"; + sha512 = "nBpuuYuY5jFsli/JIs1oldw6fOQCBioohqWZg/2hiaOybXOft4lonv85uDOKXdf8rhyK159cxU5cDcK/NKk8zw=="; }; }; "resolve-cwd-2.0.0" = { @@ -10234,7 +10270,7 @@ let version = "2.0.0"; src = fetchurl { url = "https://registry.npmjs.org/resolve-cwd/-/resolve-cwd-2.0.0.tgz"; - sha1 = "00a9f7387556e27038eae232caa372a6a59b665a"; + sha512 = "ccu8zQTrzVr954472aUVPLEcB3YpKSYR3cg/3lo1okzobPBM+1INXBbBZlDbnI/hbEocnf8j0QVo43hQKrbchg=="; }; }; "resolve-dir-1.0.1" = { @@ -10243,7 +10279,7 @@ let version = "1.0.1"; src = fetchurl { url = "https://registry.npmjs.org/resolve-dir/-/resolve-dir-1.0.1.tgz"; - sha1 = "79a40644c362be82f26effe739c9bb5382046f43"; + sha512 = "R7uiTjECzvOsWSfdM0QKFNBVFcK27aHOUwdvK53BcW8zqnGdYp0Fbj82cy54+2A4P2tFM22J5kRfe1R+lM/1yg=="; }; }; "resolve-from-3.0.0" = { @@ -10252,7 +10288,7 @@ let version = "3.0.0"; src = fetchurl { url = "https://registry.npmjs.org/resolve-from/-/resolve-from-3.0.0.tgz"; - sha1 = "b22c7af7d9d6881bc8b6e653335eebcb0a188748"; + sha512 = "GnlH6vxLymXJNMBo7XP1fJIzBFbdYt49CuTwmB/6N53t+kMPRMFKz783LlQ4tv28XoQfMWinAJX6WCGf2IlaIw=="; }; }; "resolve-from-4.0.0" = { @@ -10270,7 +10306,7 @@ let version = "0.2.1"; src = fetchurl { url = "https://registry.npmjs.org/resolve-url/-/resolve-url-0.2.1.tgz"; - sha1 = "2c637fe77c893afd2a663fe21aa9080068e2052a"; + sha512 = "ZuF55hVUQaaczgOIwqWzkEcEidmlD/xl44x1UZnhOXcYuFN2S6+rcxpG+C1N3So0wvNI3DmJICUFfu2SxhBmvg=="; }; }; "responselike-1.0.2" = { @@ -10279,7 +10315,7 @@ let version = "1.0.2"; src = fetchurl { url = "https://registry.npmjs.org/responselike/-/responselike-1.0.2.tgz"; - sha1 = "918720ef3b631c5642be068f15ade5a46f4ba1e7"; + sha512 = "/Fpe5guzJk1gPqdJLJR5u7eG/gNY4nImjbRDaVWVMRhne55TCmj2i9Q+54PBRfatRC8v/rIiv9BN0pMd9OV5EQ=="; }; }; "responselike-2.0.0" = { @@ -10297,7 +10333,7 @@ let version = "2.0.0"; src = fetchurl { url = "https://registry.npmjs.org/restore-cursor/-/restore-cursor-2.0.0.tgz"; - sha1 = "9f7ee287f82fd326d4fd162923d62129eee0dfaf"; + sha512 = "6IzJLuGi4+R14vwagDHX+JrXmPVtPpn4mffDJ1UdR7/Edm87fl6yi8mMBIVvFtJaNTUvjughmW4hwLhRG7gC1Q=="; }; }; "restore-cursor-3.1.0" = { @@ -10324,7 +10360,7 @@ let version = "0.12.0"; src = fetchurl { url = "https://registry.npmjs.org/retry/-/retry-0.12.0.tgz"; - sha1 = "1b42a6266a21f07421d1b0b54b7dc167b01c013b"; + sha512 = "9LkiTwjUh6rT555DtE9rTX+BKByPfrMzEAtnlEtdEwr3Nkffwiihqe2bWADg+OQRjt9gl6ICdmB/ZFDCGAtSow=="; }; }; "reusify-1.0.4" = { @@ -10342,7 +10378,7 @@ let version = "0.1.8"; src = fetchurl { url = "https://registry.npmjs.org/revalidator/-/revalidator-0.1.8.tgz"; - sha1 = "fece61bfa0c1b52a206bd6b18198184bdd523a3b"; + sha512 = "xcBILK2pA9oh4SiinPEZfhP8HfrB/ha+a2fTMyl7Om2WjlDVrOQy99N2MXXlUHqGJz4qEu2duXxHJjDWuK/0xg=="; }; }; "rgb-regex-1.0.1" = { @@ -10351,7 +10387,7 @@ let version = "1.0.1"; src = fetchurl { url = "https://registry.npmjs.org/rgb-regex/-/rgb-regex-1.0.1.tgz"; - sha1 = "c0e0d6882df0e23be254a475e8edd41915feaeb1"; + sha512 = "gDK5mkALDFER2YLqH6imYvK6g02gpNGM4ILDZ472EwWfXZnC2ZEpoB2ECXTyOVUKuk/bPJZMzwQPBYICzP+D3w=="; }; }; "rgba-regex-1.0.0" = { @@ -10360,7 +10396,7 @@ let version = "1.0.0"; src = fetchurl { url = "https://registry.npmjs.org/rgba-regex/-/rgba-regex-1.0.0.tgz"; - sha1 = "43374e2e2ca0968b0ef1523460b7d730ff22eeb3"; + sha512 = "zgn5OjNQXLUTdq8m17KdaicF6w89TZs8ZU8y0AYENIU6wG8GG6LLm0yLSiPY8DmaYmHdgRW8rnApjoT0fQRfMg=="; }; }; "rimraf-2.6.3" = { @@ -10381,15 +10417,6 @@ let sha512 = "uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w=="; }; }; - "rimraf-3.0.2" = { - name = "rimraf"; - packageName = "rimraf"; - version = "3.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/rimraf/-/rimraf-3.0.2.tgz"; - sha512 = "JZkJMZkAGFFPP2YqXZXPbMlMBgsxzE8ILs4lMIX/2o0L9UBw9O/Y3o6wFw/i9YLapcUJWwqbi3kdxIPdC62TIA=="; - }; - }; "ripemd160-2.0.2" = { name = "ripemd160"; packageName = "ripemd160"; @@ -10423,7 +10450,7 @@ let version = "1.0.3"; src = fetchurl { url = "https://registry.npmjs.org/run-queue/-/run-queue-1.0.3.tgz"; - sha1 = "e848396f057d223f24386924618e25694161ec47"; + sha512 = "ntymy489o0/QQplUDnpYAYUsO50K9SBrIVaKCWDOJzYJts0f9WH9RFJkyagebkw5+y1oi00R7ynNW/d12GBumg=="; }; }; "rxjs-6.6.7" = { @@ -10468,7 +10495,7 @@ let version = "1.1.0"; src = fetchurl { url = "https://registry.npmjs.org/safe-regex/-/safe-regex-1.1.0.tgz"; - sha1 = "40a3669f3b077d1e943d44629e157dd48023bf2e"; + sha512 = "aJXcif4xnaNUzvUuC5gcb46oTS7zvg4jpMTnuqtrEPlR3vFr4pxtdTwaF1Qs3Enjn9HK+ZlwQui+a7z0SywIzg=="; }; }; "safename-1.0.2" = { @@ -10477,7 +10504,7 @@ let version = "1.0.2"; src = fetchurl { url = "https://registry.npmjs.org/safename/-/safename-1.0.2.tgz"; - sha1 = "e659f8ea3ce2148880fbf56de78d8e061f229031"; + sha512 = "MEa7NKjmDdLauyshwWGBcFgwHpr8pTKG7TLMOz/6Wb79U5mOVomBAAW5yR85ecf5XMMkuwqaKX/N9w8Wi+X2wA=="; }; }; "safer-buffer-2.1.2" = { @@ -10549,7 +10576,7 @@ let version = "2.0.0"; src = fetchurl { url = "https://registry.npmjs.org/select-hose/-/select-hose-2.0.0.tgz"; - sha1 = "625d8658f865af43ec962bfc376a37359a4994ca"; + sha512 = "mEugaLK+YfkijB4fx0e6kImuJdCIt2LxCRcbEYPqRGCs4F2ogyfZU5IAZRdjCP8JPq2AtdNoC/Dux63d9Kiryg=="; }; }; "selfsigned-1.10.14" = { @@ -10666,7 +10693,7 @@ let version = "1.9.1"; src = fetchurl { url = "https://registry.npmjs.org/serve-index/-/serve-index-1.9.1.tgz"; - sha1 = "d3768d69b1e7d82e5ce050fff5b453bea12a9239"; + sha512 = "pXHfKNP4qujrtteMrSBb0rc8HJ9Ms/GrXwcUtUtD5s4ewDJI8bT3Cz2zTVRMKtri49pLx2e0Ya8ziP5Ya2pZZw=="; }; }; "serve-static-1.13.2" = { @@ -10702,7 +10729,7 @@ let version = "2.0.0"; src = fetchurl { url = "https://registry.npmjs.org/set-blocking/-/set-blocking-2.0.0.tgz"; - sha1 = "045f9782d011ae9a6803ddd382b24392b3d890f7"; + sha512 = "KiKBS8AnWGEyLzofFfmvKwpdPzqiy16LvQfK3yv/fVH7Bj13/wl3JSR1J+rfgRE9q7xUJK4qvgS8raSOeLUehw=="; }; }; "set-value-2.0.1" = { @@ -10720,7 +10747,7 @@ let version = "1.0.5"; src = fetchurl { url = "https://registry.npmjs.org/setimmediate/-/setimmediate-1.0.5.tgz"; - sha1 = "290cbb232e306942d7d7ea9b83732ab7856f8285"; + sha512 = "MATJdZp8sLqDl/68LfQmbP8zKPLQNV6BIZoIgrscFDQ+RsvK/BxeDQOgyxKKoh0y/8h3BqVFnCqQ/gd+reiIXA=="; }; }; "setprototypeof-1.0.3" = { @@ -10729,7 +10756,7 @@ let version = "1.0.3"; src = fetchurl { url = "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.0.3.tgz"; - sha1 = "66567e37043eeb4f04d91bd658c0cbefb55b8e04"; + sha512 = "9jphSf3UbIgpOX/RKvX02iw/rN2TKdusnsPpGfO/rkcsrd+IRqgHZb4VGnmL0Cynps8Nj2hN45wsi30BzrHDIw=="; }; }; "setprototypeof-1.1.0" = { @@ -10774,7 +10801,7 @@ let version = "1.2.0"; src = fetchurl { url = "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz"; - sha1 = "44aac65b695b03398968c39f363fee5deafdf1ea"; + sha512 = "EV3L1+UQWGor21OmnvojK36mhg+TyIKDh3iFBKBohr5xeXIhNBcx8oWdgkTEEQ+BEFFYdLRuqMfd5L84N1V5Vg=="; }; }; "shebang-command-2.0.0" = { @@ -10792,7 +10819,7 @@ let version = "1.0.0"; src = fetchurl { url = "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz"; - sha1 = "da42f49740c0b42db2ca9728571cb190c98efea3"; + sha512 = "wpoSFAxys6b2a2wHZ1XpDSgD7N9iVjg29Ph9uV/uaP9Ex/KXlkTZTeddxDPSYQpgvzKLGJke2UU0AzoGCjNIvQ=="; }; }; "shebang-regex-3.0.0" = { @@ -10810,7 +10837,7 @@ let version = "1.6.1"; src = fetchurl { url = "https://registry.npmjs.org/shell-quote/-/shell-quote-1.6.1.tgz"; - sha1 = "f4781949cce402697127430ea3b3c5476f481767"; + sha512 = "V0iQEZ/uoem3NmD91rD8XiuozJnq9/ZJnbHVXHnWqP1ucAhS3yJ7sLIIzEi57wFFcK3oi3kFUC46uSyWr35mxg=="; }; }; "side-channel-1.0.4" = { @@ -10831,13 +10858,13 @@ let sha512 = "wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ=="; }; }; - "simple-git-3.7.1" = { + "simple-git-3.10.0" = { name = "simple-git"; packageName = "simple-git"; - version = "3.7.1"; + version = "3.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/simple-git/-/simple-git-3.7.1.tgz"; - sha512 = "+Osjtsumbtew2y9to0pOYjNzSIr4NkKGBg7Po5SUtjQhaJf2QBmiTX/9E9cv9rmc7oUiSGFIB9e7ys5ibnT9+A=="; + url = "https://registry.npmjs.org/simple-git/-/simple-git-3.10.0.tgz"; + sha512 = "2w35xrS5rVtAW0g67LqtxCZN5cdddz/woQRfS0OJXaljXEoTychZ4jnE+CQgra/wX4ZvHeiChTUMenCwfIYEYw=="; }; }; "simple-swizzle-0.2.2" = { @@ -10846,7 +10873,7 @@ let version = "0.2.2"; src = fetchurl { url = "https://registry.npmjs.org/simple-swizzle/-/simple-swizzle-0.2.2.tgz"; - sha1 = "a4da6b635ffcccca33f70d17cb92592de95e557a"; + sha512 = "JA//kQgZtbuY83m+xT+tXJkmJncGMTFT+C+g2h2R9uxkYIrE2yy9sgmcLhCnw57/WSD+Eh3J97FPEDFnbXnDUg=="; }; }; "sisteransi-1.0.5" = { @@ -10864,7 +10891,7 @@ let version = "1.0.0"; src = fetchurl { url = "https://registry.npmjs.org/slash/-/slash-1.0.0.tgz"; - sha1 = "c41f2f6c39fc16d1cd17ad4b5d896114ae470d55"; + sha512 = "3TYDR7xWt4dIqV2JauJr+EJeW356RXijHeUlO+8djJ+uBXPn8/2dpzBc8yQhh583sVvc9CvFAeQVgijsH+PNNg=="; }; }; "slash-2.0.0" = { @@ -10936,7 +10963,7 @@ let version = "1.1.5"; src = fetchurl { url = "https://registry.npmjs.org/sockjs-client/-/sockjs-client-1.1.5.tgz"; - sha1 = "1bb7c0f7222c40f42adf14f4442cbd1269771a83"; + sha512 = "PmPRkAYIeuRgX+ZSieViT4Z3Q23bLS2Itm/ck1tSf5P0/yVuFDiI5q9mcnpXoMdToaPSRS9MEyUx/aaBxrFzyw=="; }; }; "sockjs-client-1.4.0" = { @@ -10954,7 +10981,7 @@ let version = "1.1.2"; src = fetchurl { url = "https://registry.npmjs.org/sort-keys/-/sort-keys-1.1.2.tgz"; - sha1 = "441b6d4d346798f1b4e49e8920adfba0e543f9ad"; + sha512 = "vzn8aSqKgytVik0iwdBEi+zevbTYZogewTUM6dtpmGwEcdzbub/TX4bCzRhebDCRC3QzXgJsLRKB2V/Oof7HXg=="; }; }; "source-list-map-2.0.1" = { @@ -10972,7 +10999,7 @@ let version = "0.5.7"; src = fetchurl { url = "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz"; - sha1 = "8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"; + sha512 = "LbrmJOMUSdEVxIKvdcJzQC+nQhe8FUZQTXQy6+I75skNgn3OoQ0DZA8YnFa7gp8tqtL3KPf1kmo0R5DoApeSGQ=="; }; }; "source-map-0.6.1" = { @@ -10984,22 +11011,13 @@ let sha512 = "UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g=="; }; }; - "source-map-0.7.3" = { + "source-map-0.7.4" = { name = "source-map"; packageName = "source-map"; - version = "0.7.3"; + version = "0.7.4"; src = fetchurl { - url = "https://registry.npmjs.org/source-map/-/source-map-0.7.3.tgz"; - 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=="; + url = "https://registry.npmjs.org/source-map/-/source-map-0.7.4.tgz"; + sha512 = "l3BikUxvPOcn5E74dZiq5BGsTb5yEwhaTSzccU6t4sDOH8NWJCstKO5QT2CvtFoK6F0saL7p9xHAqHOlCPJygA=="; }; }; "source-map-js-1.0.2" = { @@ -11116,7 +11134,7 @@ let version = "1.0.3"; src = fetchurl { url = "https://registry.npmjs.org/sprintf-js/-/sprintf-js-1.0.3.tgz"; - sha1 = "04e6926f662895354f3dd015203633b857297e2c"; + sha512 = "D9cPgkvLlV3t3IzL0D0YLvGA9Ahk4PcvVwUbN0dSGr1aP0Nrt4AEnTUbuGvquEC0mA64Gqt1fzirlRs5ibXx8g=="; }; }; "sshpk-1.17.0" = { @@ -11161,7 +11179,7 @@ let version = "0.0.10"; src = fetchurl { url = "https://registry.npmjs.org/stack-trace/-/stack-trace-0.0.10.tgz"; - sha1 = "547c70b347e8d32b4e108ea1a2a159e5fdde19c0"; + sha512 = "KGzahc7puUKkzyMt+IqAep+TVNbKP+k2Lmwhub39m1AsTSkaDutx56aDCo+HLDzf/D26BIHTJWNiTG1KAJiQCg=="; }; }; "static-extend-0.1.2" = { @@ -11170,7 +11188,7 @@ let version = "0.1.2"; src = fetchurl { url = "https://registry.npmjs.org/static-extend/-/static-extend-0.1.2.tgz"; - sha1 = "60809c39cbff55337226fd5e0b520f341f1fb5c6"; + sha512 = "72E9+uLc27Mt718pMHt9VMNiAL4LMsmDbBva8mxWUCkT07fSzEGMYUCk0XWY6lp0j6RBAG4cJ3mWuZv2OE3s0g=="; }; }; "statuses-1.4.0" = { @@ -11188,7 +11206,7 @@ let version = "1.5.0"; src = fetchurl { url = "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz"; - sha1 = "161c7dac177659fd9811f43771fa99381478628c"; + sha512 = "OpZ3zP+jT1PI7I8nemJX4AKmAX070ZkYPVWV/AaKTJl+tXCTGyVdC1a4SL8RUQYEwk/f34ZX8UTykN68FwrqAA=="; }; }; "statuses-2.0.1" = { @@ -11206,7 +11224,7 @@ let version = "1.1.1"; src = fetchurl { url = "https://registry.npmjs.org/stealthy-require/-/stealthy-require-1.1.1.tgz"; - sha1 = "35b09875b4ff49f26a777e509b3090a3226bf24b"; + sha512 = "ZnWpYnYugiOVEY5GkcuJK1io5V8QmNYChG62gSit9pQVGErXtrKuPC55ITaVSukmMta5qpMU7vqLt2Lnni4f/g=="; }; }; "stream-browserify-2.0.2" = { @@ -11251,7 +11269,7 @@ let version = "1.1.0"; src = fetchurl { url = "https://registry.npmjs.org/strict-uri-encode/-/strict-uri-encode-1.1.0.tgz"; - sha1 = "279b225df1d582b1f54e65addd4352e18faa0713"; + sha512 = "R3f198pcvnB+5IpnBlRkphuE9n46WyVl8I39W/ZUTZLz4nqSP/oLYUrcnJrw462Ds8he4YKMov2efsTIw1BDGQ=="; }; }; "string-replace-loader-2.3.0" = { @@ -11269,7 +11287,7 @@ let version = "1.0.2"; src = fetchurl { url = "https://registry.npmjs.org/string-width/-/string-width-1.0.2.tgz"; - sha1 = "118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3"; + sha512 = "0XsVpQLnVCXHJfyEs8tC0zpTVIr5PKKsQtkT29IwupnPTjtPmQ3xT/4yCREF9hYkV/3M3kzcUTSAZT6a6h81tw=="; }; }; "string-width-2.1.1" = { @@ -11323,7 +11341,7 @@ let version = "0.10.31"; src = fetchurl { url = "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz"; - sha1 = "62e203bc41766c6c28c9fc84301dab1c5310fa94"; + sha512 = "ev2QzSzWPYmy9GuqfIVildA4OdcGLeFZQrq5ys6RtiuF+RQQiZWr8TZNyAcuVXyQRYfEO+MsoB/1BuQVhOJuoQ=="; }; }; "string_decoder-1.1.1" = { @@ -11359,7 +11377,7 @@ let version = "3.0.1"; src = fetchurl { url = "https://registry.npmjs.org/strip-ansi/-/strip-ansi-3.0.1.tgz"; - sha1 = "6a385fb8853d952d5ff05d0e8aaf94278dc63dcf"; + sha512 = "VhumSSbBqDTP8p2ZLKj40UjBCV4+v8bUSEpUb4KjRgWk9pbqGF4REFj6KEagidb2f/M6AzC0EmFyDNGaw9OCzg=="; }; }; "strip-ansi-4.0.0" = { @@ -11368,7 +11386,7 @@ let version = "4.0.0"; src = fetchurl { url = "https://registry.npmjs.org/strip-ansi/-/strip-ansi-4.0.0.tgz"; - sha1 = "a8479022eb1ac368a871389b635262c505ee368f"; + sha512 = "4XaJ2zQdCzROZDivEVIDPkcQn8LMFSa8kj8Gxb/Lnwzv9A8VctNZ+lfivC/sV3ivW8ElJTERXZoPBRrZKkNKow=="; }; }; "strip-ansi-5.2.0" = { @@ -11404,7 +11422,7 @@ let version = "2.0.0"; src = fetchurl { url = "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz"; - sha1 = "6219a85616520491f35788bdbf1447a99c7e6b0e"; + sha512 = "kwrX1y7czp1E69n2ajbG65mIo9dqvJ+8aBQXOGVxqwvNbsXdFM6Lq37dLAY3mknUwru8CfcCbfOLL/gMo+fi3g=="; }; }; "strip-bom-string-1.0.0" = { @@ -11413,7 +11431,7 @@ let version = "1.0.0"; src = fetchurl { url = "https://registry.npmjs.org/strip-bom-string/-/strip-bom-string-1.0.0.tgz"; - sha1 = "e5211e9224369fbb81d633a2f00044dc8cedad92"; + sha512 = "uCC2VHvQRYu+lMh4My/sFNmF2klFymLX1wHJeXnbEJERpV/ZsVuonzerjfrGpIGF7LBVa1O7i9kjiWvJiFck8g=="; }; }; "strip-comments-1.0.2" = { @@ -11431,7 +11449,7 @@ let version = "1.0.0"; src = fetchurl { url = "https://registry.npmjs.org/strip-eof/-/strip-eof-1.0.0.tgz"; - sha1 = "bb43ff5598a6eb05d89b59fcd129c983313606bf"; + sha512 = "7FCwGGmx8mD5xQd3RPUvnSpUXHM3BWuzjtpD4TXsfcZ9EL4azvVVUscFYwD9nx8Kh+uCBC00XBtAykoMHwTh8Q=="; }; }; "strip-final-newline-2.0.0" = { @@ -11449,7 +11467,7 @@ let version = "2.0.1"; src = fetchurl { url = "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-2.0.1.tgz"; - sha1 = "3c531942e908c2697c0ec344858c286c7ca0a60a"; + sha512 = "4gB8na07fecVVkOI6Rs4e7T6NOTki5EmL7TUduTs6bu3EdnSycntVJ4re8kgZA+wx9IueI2Y11bfbgwtzuE0KQ=="; }; }; "style-loader-1.3.0" = { @@ -11485,7 +11503,7 @@ let version = "0.2.4"; src = fetchurl { url = "https://registry.npmjs.org/sums/-/sums-0.2.4.tgz"; - sha1 = "d78c14398297d604fe6588dc3b03deca7b91ba93"; + sha512 = "5uXZlaoxZLgdXpBnwN5L0Gt4/k+dGynuvJVPSzhC2suOSojupMT/5fiZCrho9onLRSaXCe5j+QoKykFekgey4w=="; }; }; "supports-color-2.0.0" = { @@ -11494,7 +11512,7 @@ let version = "2.0.0"; src = fetchurl { url = "https://registry.npmjs.org/supports-color/-/supports-color-2.0.0.tgz"; - sha1 = "535d045ce6b6363fa40117084629995e9df324c7"; + sha512 = "KKNVtd6pCYgPIKU4cp2733HWYCpplQhddZLBUryaAHou723x+FRzQ5Df824Fj+IyyuiQTRoub4SnIFfIcrp70g=="; }; }; "supports-color-5.5.0" = { @@ -11632,13 +11650,13 @@ let sha512 = "EAPipTNeWsb/3wLPeup1tVPaXfIaU68xMnVdPafIL1TV05OhASArYyIfFvnvJCNrR2NIOvDVNNTFRa+Re2MWyw=="; }; }; - "terser-5.13.1" = { + "terser-5.14.1" = { name = "terser"; packageName = "terser"; - version = "5.13.1"; + version = "5.14.1"; src = fetchurl { - url = "https://registry.npmjs.org/terser/-/terser-5.13.1.tgz"; - sha512 = "hn4WKOfwnwbYfe48NgrQjqNOH9jzLqRcIfbYytOXCOv46LBfWr9bDS17MQqOi+BWGD0sJK3Sj5NC/gJjiojaoA=="; + url = "https://registry.npmjs.org/terser/-/terser-5.14.1.tgz"; + sha512 = "+ahUAE+iheqBTDxXhTisdA8hgvbEG1hHOQ9xmNjeUJSoi6DU/gMrKNcfZjHkyY6Alnuyc+ikYJaxxfHkT3+WuQ=="; }; }; "terser-webpack-plugin-1.4.5" = { @@ -11656,7 +11674,7 @@ let version = "0.2.0"; src = fetchurl { url = "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz"; - sha1 = "7f5ee823ae805207c00af2df4a84ec3fcfa570b4"; + sha512 = "N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw=="; }; }; "through-2.3.8" = { @@ -11665,7 +11683,7 @@ let version = "2.3.8"; src = fetchurl { url = "https://registry.npmjs.org/through/-/through-2.3.8.tgz"; - sha1 = "0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"; + sha512 = "w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg=="; }; }; "through2-2.0.1" = { @@ -11674,7 +11692,7 @@ let version = "2.0.1"; src = fetchurl { url = "https://registry.npmjs.org/through2/-/through2-2.0.1.tgz"; - sha1 = "384e75314d49f32de12eebb8136b8eb6b5d59da9"; + sha512 = "/vp02SIbpmVHapNMjox4hDBzykPdAOmH5y3INcKaxGfpEPSCMqzdWXyGfqPYyxoBLo1JpxBrlh3Z9esv0vWUYw=="; }; }; "through2-2.0.5" = { @@ -11710,7 +11728,7 @@ let version = "0.3.0"; src = fetchurl { url = "https://registry.npmjs.org/timsort/-/timsort-0.3.0.tgz"; - sha1 = "405411a8e7e6339fe64db9a234de11dc31e02bd4"; + sha512 = "qsdtZH+vMoCARQtyod4imc2nIJwg9Cc7lPRrw9CzF8ZKR0khdr8+2nX80PBhET3tcyTtJDxAffGh2rXH4tyU8A=="; }; }; "tmp-0.0.31" = { @@ -11719,7 +11737,7 @@ let version = "0.0.31"; src = fetchurl { url = "https://registry.npmjs.org/tmp/-/tmp-0.0.31.tgz"; - sha1 = "8f38ab9438e17315e5dbd8b3657e8bfb277ae4a7"; + sha512 = "lfyEfOppKvWNeId5CArFLwgwef+iCnbEIy0JWYf1httIEXnx4ndL4Dr1adw7hPgeQfSlTbc/gqn6iaKcROpw5Q=="; }; }; "tmp-0.0.33" = { @@ -11746,7 +11764,7 @@ let version = "1.0.1"; src = fetchurl { url = "https://registry.npmjs.org/to-arraybuffer/-/to-arraybuffer-1.0.1.tgz"; - sha1 = "7d229b1fcc637e466ca081180836a7aabff83f43"; + sha512 = "okFlQcoGTi4LQBG/PgSYblw9VOyptsz2KJZqc6qtgGdes8VktzUQkj4BI2blit072iS8VODNcMA+tvnS9dnuMA=="; }; }; "to-fast-properties-2.0.0" = { @@ -11755,7 +11773,7 @@ let version = "2.0.0"; src = fetchurl { url = "https://registry.npmjs.org/to-fast-properties/-/to-fast-properties-2.0.0.tgz"; - sha1 = "dc5e698cbd079265bc73e0377681a4e4e83f616e"; + sha512 = "/OaKK0xYrs3DmxRYqL/yDc+FxFUVYhDlXMhRmv3z915w2HF1tnN1omB354j8VUGO/hbRzyD6Y3sA7v7GS/ceog=="; }; }; "to-object-path-0.3.0" = { @@ -11764,7 +11782,7 @@ let version = "0.3.0"; src = fetchurl { url = "https://registry.npmjs.org/to-object-path/-/to-object-path-0.3.0.tgz"; - sha1 = "297588b7b0e7e0ac08e04e672f85c1f4999e17af"; + sha512 = "9mWHdnGRuh3onocaHzukyvCZhzvr6tiflAy/JRFXcJX0TjgfWA9pk9t8CMbzmBE4Jfw58pXbkngtBtqYxzNEyg=="; }; }; "to-readable-stream-1.0.0" = { @@ -11800,7 +11818,7 @@ let version = "2.1.1"; src = fetchurl { url = "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz"; - sha1 = "7c80c17b9dfebe599e27367e0d4dd5590141db38"; + sha512 = "ZZWNfCjUokXXDGXFpZehJIkZqq91BcULFq/Pi7M5i4JnxXdhMKAK682z8bCW3o8Hj1wuuzoKcW3DfVzaP6VuNg=="; }; }; "to-regex-range-5.0.1" = { @@ -11857,22 +11875,13 @@ let sha512 = "nlLsUzgm1kfLXSXfRZMc1KLAugd4hqJHDTvc2hDIwS3mZAfMEuMbc03SujMF+GEcpaX/qboeycw6iO8JwVv2+g=="; }; }; - "tr46-1.0.1" = { - name = "tr46"; - packageName = "tr46"; - version = "1.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/tr46/-/tr46-1.0.1.tgz"; - sha1 = "a8b13fd6bfd2489519674ccde55ba3693b706d09"; - }; - }; "traverse-0.3.9" = { name = "traverse"; packageName = "traverse"; version = "0.3.9"; src = fetchurl { url = "https://registry.npmjs.org/traverse/-/traverse-0.3.9.tgz"; - sha1 = "717b8f220cc0bb7b44e40514c22b2e8bbc70d8b9"; + sha512 = "iawgk0hLP3SxGKDfnDJf8wTz4p2qImnyihM5Hh/sGvQ3K37dPi/w8sRhdNIxYA1TwFwc5mDhIJq+O0RsvXBKdQ=="; }; }; "traverse-chain-0.1.0" = { @@ -11881,7 +11890,7 @@ let version = "0.1.0"; src = fetchurl { url = "https://registry.npmjs.org/traverse-chain/-/traverse-chain-0.1.0.tgz"; - sha1 = "61dbc2d53b69ff6091a12a168fd7d433107e40f1"; + sha512 = "up6Yvai4PYKhpNp5PkYtx50m3KbwQrqDwbuZP/ItyL64YEWHAvH6Md83LFLV/GRSk/BoUVwwgUzX6SOQSbsfAg=="; }; }; "ts-debounce-4.0.0" = { @@ -11920,13 +11929,13 @@ let sha512 = "d6xOpEDfsi2CZVlPQzGeux8XMwLT9hssAsaPYExaQMuYskwb+x1x7J371tWlbBdWHroy99KnVB6qIkUbs5X3UQ=="; }; }; - "tsyringe-4.6.0" = { + "tsyringe-4.7.0" = { name = "tsyringe"; packageName = "tsyringe"; - version = "4.6.0"; + version = "4.7.0"; src = fetchurl { - url = "https://registry.npmjs.org/tsyringe/-/tsyringe-4.6.0.tgz"; - sha512 = "BMQAZamSfEmIQzH8WJeRu1yZGQbPSDuI9g+yEiKZFIcO46GPZuMOC2d0b52cVBdw1d++06JnDSIIZvEnogMdAw=="; + url = "https://registry.npmjs.org/tsyringe/-/tsyringe-4.7.0.tgz"; + sha512 = "ncFDM1jTLsok4ejMvSW5jN1VGPQD48y2tfAR0pdptWRKYX4bkbqPt92k7KJ5RFJ1KV36JEs/+TMh7I6OUgj74g=="; }; }; "tty-browserify-0.0.0" = { @@ -11935,7 +11944,7 @@ let version = "0.0.0"; src = fetchurl { url = "https://registry.npmjs.org/tty-browserify/-/tty-browserify-0.0.0.tgz"; - sha1 = "a157ba402da24e9bf957f9aa69d524eed42901a6"; + sha512 = "JVa5ijo+j/sOoHGjw0sxw734b1LhBkQ3bvUGNdxnVXDCX81Yx7TFgnZygxrIIWn23hbfTaMYLwRmAxFyDuFmIw=="; }; }; "tunnel-agent-0.6.0" = { @@ -11944,7 +11953,7 @@ let version = "0.6.0"; src = fetchurl { url = "https://registry.npmjs.org/tunnel-agent/-/tunnel-agent-0.6.0.tgz"; - sha1 = "27a5dea06b36b04a0a9966774b290868f0fc40fd"; + sha512 = "McnNiV1l8RYeY8tBgEpuodCC1mLUdbSN+CYBL7kJsJNInOP8UjDDEwdk6Mw60vdLLrr5NHKZhMAOSrR2NZuQ+w=="; }; }; "tweetnacl-0.14.5" = { @@ -11953,7 +11962,7 @@ let version = "0.14.5"; src = fetchurl { url = "https://registry.npmjs.org/tweetnacl/-/tweetnacl-0.14.5.tgz"; - sha1 = "5ae68177f192d4456269d108afa93ff8743f4f64"; + sha512 = "KXXFFdAbFXY4geFIwoyNK+f5Z1b7swfXABfL7HXCmoIWMKU3dmS26672A4EeQtDzLKy7SXmfBu51JolvEKwtGA=="; }; }; "type-fest-0.10.0" = { @@ -11989,16 +11998,16 @@ let version = "0.0.6"; src = fetchurl { url = "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz"; - sha1 = "867ac74e3864187b1d3d47d996a78ec5c8830777"; + sha512 = "/aCDEGatGvZ2BIk+HmLf4ifCJFwvKFNb9/JeZPMulfgFracn9QFcAf5GO8B/mweUjSoblS5In0cWhqpfs/5PQA=="; }; }; - "typescript-4.7.2" = { + "typescript-4.7.4" = { name = "typescript"; packageName = "typescript"; - version = "4.7.2"; + version = "4.7.4"; src = fetchurl { - url = "https://registry.npmjs.org/typescript/-/typescript-4.7.2.tgz"; - sha512 = "Mamb1iX2FDUpcTRzltPxgWMKy3fhg0TN378ylbktPGPK/99KbDtMQ4W1hwgsbPAsG3a0xKa1vmw4VKZQbkvz5A=="; + url = "https://registry.npmjs.org/typescript/-/typescript-4.7.4.tgz"; + sha512 = "C0WQT0gezHuw6AdY1M2jxUO83Rjf0HP7Sk1DtXj6j1EwkQNZrHAg2XPWlq62oqEhYvONq5pkC2Y9oPljWToLmQ=="; }; }; "uglify-es-3.3.10" = { @@ -12025,7 +12034,7 @@ let version = "1.0.2"; src = fetchurl { url = "https://registry.npmjs.org/ultron/-/ultron-1.0.2.tgz"; - sha1 = "ace116ab557cd197386a4e88f4685378c8b2e4fa"; + sha512 = "QMpnpVtYaWEeY+MwKDN/UdKlE/LsFZXM5lO1u7GaZzNgmIbGixHEmVMIKT+vqYOALu3m5GYQy9kz4Xu4IVn7Ow=="; }; }; "ultron-1.1.1" = { @@ -12106,7 +12115,7 @@ let version = "1.0.1"; src = fetchurl { url = "https://registry.npmjs.org/uniq/-/uniq-1.0.1.tgz"; - sha1 = "b31c5ae8254844a3a8281541ce2b04b865a734ff"; + sha512 = "Gw+zz50YNKPDKXs+9d+aKAjVwpjNwqzvNpLigIruT4HA9lMZNdMqs9x07kKHB/L9WRzqp4+DlTU5s4wG2esdoA=="; }; }; "uniqs-2.0.0" = { @@ -12115,7 +12124,7 @@ let version = "2.0.0"; src = fetchurl { url = "https://registry.npmjs.org/uniqs/-/uniqs-2.0.0.tgz"; - sha1 = "ffede4b36b25290696e6e165d4a59edb998e6b02"; + sha512 = "mZdDpf3vBV5Efh29kMw5tXoup/buMgxLzOt/XKFKcVmi+15ManNQWr6HfZ2aiZTYlYixbdNJ0KFmIZIv52tHSQ=="; }; }; "unique-filename-1.1.1" = { @@ -12160,7 +12169,7 @@ let version = "1.0.0"; src = fetchurl { url = "https://registry.npmjs.org/unpipe/-/unpipe-1.0.0.tgz"; - sha1 = "b2bf4ee8514aae6165b4817829d21b2ef49904ec"; + sha512 = "pjy2bYhSsufwWlKwPc+l3cN7+wuJlK6uz0YdJEOlQDbl6jo/YlPi4mb8agUkVC8BF7V8NuzeyPNqRksA3hztKQ=="; }; }; "unquote-1.1.1" = { @@ -12169,7 +12178,7 @@ let version = "1.1.1"; src = fetchurl { url = "https://registry.npmjs.org/unquote/-/unquote-1.1.1.tgz"; - sha1 = "8fded7324ec6e88a0ff8b905e7c098cdc086d544"; + sha512 = "vRCqFv6UhXpWxZPyGDh/F3ZpNv8/qo7w6iufLpQg9aKnQ71qM4B5KiI7Mia9COcjEhrO9LueHpMYjYzsWH3OIg=="; }; }; "unset-value-1.0.0" = { @@ -12178,7 +12187,7 @@ let version = "1.0.0"; src = fetchurl { url = "https://registry.npmjs.org/unset-value/-/unset-value-1.0.0.tgz"; - sha1 = "8376873f7d2335179ffb1e6fc3a8ed0dfc8ab559"; + sha512 = "PcA2tsuGSF9cnySLHTLSh2qrQiJ70mn+r+Glzxv2TWZblxsxCC52BDlZoPCsz7STd9pN7EZetkWZBAvk4cgZdQ=="; }; }; "unzip-stream-0.3.1" = { @@ -12208,13 +12217,22 @@ let sha512 = "1uEe95xksV1O0CYKXo8vQvN1JEbtJp7lb7C5U9HMsIp6IVwntkH/oNUzyVNQSd4S1sYk2FpSSW44FqMc8qee5w=="; }; }; + "update-browserslist-db-1.0.4" = { + name = "update-browserslist-db"; + packageName = "update-browserslist-db"; + version = "1.0.4"; + src = fetchurl { + url = "https://registry.npmjs.org/update-browserslist-db/-/update-browserslist-db-1.0.4.tgz"; + sha512 = "jnmO2BEGUjsMOe/Fg9u0oczOe/ppIDZPebzccl1yDWGLFP16Pa1/RM5wEoKYPG2zstNcDuAStejyxsOuKINdGA=="; + }; + }; "upgrade-1.1.0" = { name = "upgrade"; packageName = "upgrade"; version = "1.1.0"; src = fetchurl { url = "https://registry.npmjs.org/upgrade/-/upgrade-1.1.0.tgz"; - sha1 = "4a50875ec5c715d19379799f0590a0e796958f61"; + sha512 = "NtkVvqVCqsJo5U3mYRum2Tw6uCltOxfIJ/AfTZeTmw6U39IB5X23xF+kRZ9aiPaORqeiQQ7Q209/ibhOvxzwHA=="; }; }; "uri-js-4.4.1" = { @@ -12232,7 +12250,7 @@ let version = "0.1.0"; src = fetchurl { url = "https://registry.npmjs.org/urix/-/urix-0.1.0.tgz"; - sha1 = "da937f7a62e21fec1fd18d49b35c2935067a6c72"; + sha512 = "Am1ousAhSLBeB9cG/7k7r2R0zj50uDRlZHPGbazid5s9rlF1F/QKYObEKSIunSjIOkJZqwRRLpvewjEkM7pSqg=="; }; }; "url-0.11.0" = { @@ -12241,7 +12259,7 @@ let version = "0.11.0"; src = fetchurl { url = "https://registry.npmjs.org/url/-/url-0.11.0.tgz"; - sha1 = "3838e97cfc60521eb73c525a8e55bfdd9e2e28f1"; + sha512 = "kbailJa29QrtXnxgq+DdCEGlbTeYM2eJUxsz6vjZavrCYPMIFHMKQmSKYAIuUK2i7hgPm28a8piX5NTUtM/LKQ=="; }; }; "url-loader-4.1.1" = { @@ -12268,7 +12286,7 @@ let version = "3.0.0"; src = fetchurl { url = "https://registry.npmjs.org/url-parse-lax/-/url-parse-lax-3.0.0.tgz"; - sha1 = "16b5cafc07dbe3676c1b1999177823d6503acb0c"; + sha512 = "NjFKA0DidqPa5ciFcSrXnAltTtzz84ogy+NebPvfEgAck0+TNg4UJ4IN+fB7zRZfbgUf0syOo9MDxFkDSMuFaQ=="; }; }; "url-to-options-1.0.1" = { @@ -12277,7 +12295,7 @@ let version = "1.0.1"; src = fetchurl { url = "https://registry.npmjs.org/url-to-options/-/url-to-options-1.0.1.tgz"; - sha1 = "1505a03a289a48cbd7a434efbaeec5055f5633a9"; + sha512 = "0kQLIzG4fdk/G5NONku64rSH/x32NOA39LVQqlK8Le6lvTF6GGRJpqaQFGgU+CLwySIqBSMdwYM0sYcW9f6P4A=="; }; }; "use-3.1.1" = { @@ -12295,7 +12313,7 @@ let version = "0.10.3"; src = fetchurl { url = "https://registry.npmjs.org/util/-/util-0.10.3.tgz"; - sha1 = "7afb1afe50805246489e3db7fe0ed379336ac0f9"; + sha512 = "5KiHfsmkqacuKjkRkdV7SsfDJ2EGiPsK92s2MhNSY0craxjTdKTtqKsJaCWp4LW33ZZ0OPUv1WO/TFvNQRiQxQ=="; }; }; "util-0.11.1" = { @@ -12313,7 +12331,7 @@ let version = "1.0.2"; src = fetchurl { url = "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz"; - sha1 = "450d4dc9fa70de732762fbd2d4a28981419a0ccf"; + sha512 = "EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw=="; }; }; "util.promisify-1.0.0" = { @@ -12331,7 +12349,7 @@ let version = "0.4.0"; src = fetchurl { url = "https://registry.npmjs.org/utila/-/utila-0.4.0.tgz"; - sha1 = "8a16a05d445657a3aea5eecc5b12a4fa5379772c"; + sha512 = "Z0DbgELS9/L/75wZbro8xAnT50pBVFQZ+hUEueGDU5FN51YSCYM+jdxsfCiHjwNP/4LCDD0i/graKpeBnOXKRA=="; }; }; "utile-0.3.0" = { @@ -12340,7 +12358,7 @@ let version = "0.3.0"; src = fetchurl { url = "https://registry.npmjs.org/utile/-/utile-0.3.0.tgz"; - sha1 = "1352c340eb820e4d8ddba039a4fbfaa32ed4ef3a"; + sha512 = "KaciY16ate/pJ7BAwBpVcfQlgJT02WRivIv8DlCX1cvg6WxaNEXHcdqazuS9fQ7PUoU5CH2UeY3wkqq16wRiWg=="; }; }; "utils-merge-1.0.1" = { @@ -12349,7 +12367,7 @@ let version = "1.0.1"; src = fetchurl { url = "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz"; - sha1 = "9f95710f50a267947b2ccc124741c1028427e713"; + sha512 = "pMZTvIkT1d+TFGvDOqodOclx0QWkkgi6Tdoa8gC8ffGAAqz9pzPTZWAybbsHHoED/ztMtkv/VoYTYyShUn81hA=="; }; }; "uuid-3.4.0" = { @@ -12376,7 +12394,7 @@ let version = "1.1.2"; src = fetchurl { url = "https://registry.npmjs.org/vary/-/vary-1.1.2.tgz"; - sha1 = "2299f02c6ded30d4a5961b0b9f74524a18f634fc"; + sha512 = "BNGbWLfd0eUPabhkXUVm0j8uuvREyTh5ovRa/dyow/BqAbZJyC+5fU+IzQOzmAKzYqYRAISoRhdQr3eIZ/PXqg=="; }; }; "vendors-1.0.4" = { @@ -12394,7 +12412,7 @@ let version = "1.10.0"; src = fetchurl { url = "https://registry.npmjs.org/verror/-/verror-1.10.0.tgz"; - sha1 = "3a105ca17053af55d6e270c1f8288682e18da400"; + sha512 = "ZZKSmDAEFOijERBLkmYfJ+vmk3w+7hOLYDNkRCuRuMJGEmqYNCNLyBBFwWKVMhfwaEF3WOd0Zlw86U/WC/+nYw=="; }; }; "vm-browserify-1.1.2" = { @@ -12493,7 +12511,7 @@ let version = "1.0.1"; src = fetchurl { url = "https://registry.npmjs.org/wcwidth/-/wcwidth-1.0.1.tgz"; - sha1 = "f0b0dcf915bc5ff1528afadb2c0e17b532da2fe8"; + sha512 = "XHPEwS0q6TaxcvG85+8EYkbiCux2XtWG2mkc47Ng2A77BQu9+DqIOJldST4HgPkuea7dvKSj5VgX3P1d4rW8Tg=="; }; }; "web-tree-sitter-0.20.5" = { @@ -12505,15 +12523,6 @@ let sha512 = "mpXlqIeEBE5Q71cnBnt8w6XKhIiKmllPECqsIFBtMvzcfCxA8+614iyMJXBCQo95Vs3y1zORLqiLJn25pYZ4Tw=="; }; }; - "webidl-conversions-4.0.2" = { - name = "webidl-conversions"; - packageName = "webidl-conversions"; - version = "4.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-4.0.2.tgz"; - sha512 = "YQ+BmxuTgd6UXZW3+ICGfyqRyHXVlD5GtQr5+qjiNW7bF0cqrzX500HVXPBOvgXb5YnzDd+h0zqyv61KUD7+Sg=="; - }; - }; "webpack-4.44.2" = { name = "webpack"; packageName = "webpack"; @@ -12574,7 +12583,7 @@ let version = "0.6.5"; src = fetchurl { url = "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.6.5.tgz"; - sha1 = "5cb2556ceb85f4373c6d8238aa691c8454e13a36"; + sha512 = "oBx6ZM1Gs5q2jwZuSN/Qxyy/fbgomV8+vqsmipaPKB/74hjHlKuM07jNmRhn4qa2AdUwsgxrltq+gaPsHgcl0Q=="; }; }; "websocket-driver-0.7.4" = { @@ -12604,15 +12613,6 @@ let sha512 = "jXkLtsR42xhXg7akoDKvKWE40eJeI+2KZqcp2h3NsOrRnDvtWX36KcKl30dy+hxECivdk2BVUHVNrPtoMBUx6A=="; }; }; - "whatwg-url-7.1.0" = { - name = "whatwg-url"; - packageName = "whatwg-url"; - version = "7.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/whatwg-url/-/whatwg-url-7.1.0.tgz"; - sha512 = "WUu7Rg1DroM7oQvGWfOiAK21n74Gg+T4elXEQYkOhtyLeWiJFoOGLXPKI/9gzIie9CtwVLm8wtw6YJdKyxSjeg=="; - }; - }; "which-1.3.1" = { name = "which"; packageName = "which"; @@ -12655,7 +12655,7 @@ let version = "1.0.0"; src = fetchurl { url = "https://registry.npmjs.org/which-module/-/which-module-1.0.0.tgz"; - sha1 = "bba63ca861948994ff307736089e3b96026c2a4f"; + sha512 = "F6+WgncZi/mJDrammbTuHe1q0R5hOXv/mBaiNA2TCNT/LTHusX0V+CJnj9XT8ki5ln2UZyyddDgHfCzyrOH7MQ=="; }; }; "which-module-2.0.0" = { @@ -12664,7 +12664,7 @@ let version = "2.0.0"; src = fetchurl { url = "https://registry.npmjs.org/which-module/-/which-module-2.0.0.tgz"; - sha1 = "d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a"; + sha512 = "B+enWhmw6cjfVC7kS8Pj9pCrKSc5txArRyaYGe088shv/FGWH+0Rjx/xPgtsWfsUtS27FkP697E4DDhgrgoc0Q=="; }; }; "winston-2.1.1" = { @@ -12673,7 +12673,7 @@ let version = "2.1.1"; src = fetchurl { url = "https://registry.npmjs.org/winston/-/winston-2.1.1.tgz"; - sha1 = "3c9349d196207fd1bdff9d4bc43ef72510e3a12e"; + sha512 = "CPXrr+LD3DBeCEAnhPYS7DYbdq8kwhnkrVY7Px0vEROil9iZWaz0VHZHg41pNcUJc+1/PDm2obR1Lb2QGto1ZQ=="; }; }; "workbox-background-sync-4.3.1" = { @@ -12835,7 +12835,7 @@ let version = "2.1.0"; src = fetchurl { url = "https://registry.npmjs.org/wrap-ansi/-/wrap-ansi-2.1.0.tgz"; - sha1 = "d8fc3d284dd05794fe84973caecdd1cf824fdd85"; + sha512 = "vAaEaDM946gbNpH5pLVNR+vX2ht6n0Bt3GXwVB1AuAqZosOvHNF3P7wDnh8KLkSqgUh0uh77le7Owgoz+Z9XBw=="; }; }; "wrap-ansi-5.1.0" = { @@ -12862,7 +12862,7 @@ let version = "1.0.2"; src = fetchurl { url = "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz"; - sha1 = "b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"; + sha512 = "l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ=="; }; }; "ws-1.1.5" = { @@ -12970,7 +12970,7 @@ let version = "2.1.2"; src = fetchurl { url = "https://registry.npmjs.org/yallist/-/yallist-2.1.2.tgz"; - sha1 = "1c11f9218f076089a47dd512f93c6699a6a81d52"; + sha512 = "ncTzHV7NvsQZkYe1DW7cbDLm0YpzHmZF5r/iyP3ZnQtMiJ+pjzisCiMNI+Sj+xQF5pXhSHxSB3uDbsBTzY/c2A=="; }; }; "yallist-3.1.1" = { @@ -13024,7 +13024,7 @@ let version = "6.6.0"; src = fetchurl { url = "https://registry.npmjs.org/yargs/-/yargs-6.6.0.tgz"; - sha1 = "782ec21ef403345f830a808ca3d513af56065208"; + sha512 = "6/QWTdisjnu5UHUzQGst+UOEuEVwIzFVGBjq3jMTFNs5WJQsH/X6nMURSaScIdF5txylr1Ao9bvbWiKi2yXbwA=="; }; }; "yargs-parser-13.1.2" = { @@ -13051,7 +13051,7 @@ let version = "4.2.1"; src = fetchurl { url = "https://registry.npmjs.org/yargs-parser/-/yargs-parser-4.2.1.tgz"; - sha1 = "29cceac0dc4f03c6c87b4a9f217dd18c9f74871c"; + sha512 = "+QQWqC2xeL0N5/TE+TY6OGEqyNRM+g2/r712PDNYgiCdXYCApXf1vzfmDSLBxfGRwV+moTq/V8FnMI24JCm2Yg=="; }; }; "yn-4.0.0" = { @@ -13187,7 +13187,7 @@ in sources."performance-now-2.1.0" sources."process-nextick-args-1.0.7" sources."proxy-addr-2.0.7" - sources."psl-1.8.0" + sources."psl-1.9.0" sources."punycode-2.1.1" sources."qs-6.7.0" sources."range-parser-1.2.1" @@ -13388,10 +13388,10 @@ in sources."mime-types-2.1.35" sources."minimatch-3.1.2" sources."minimist-1.2.6" - sources."minipass-3.1.6" + sources."minipass-3.3.4" sources."minizlib-2.1.2" sources."mkdirp-1.0.4" - sources."moment-2.29.3" + sources."moment-2.29.4" sources."murmur-hash-js-1.0.0" sources."mustache-3.2.1" sources."nice-try-1.0.5" @@ -13417,7 +13417,7 @@ in sources."performance-now-2.1.0" sources."picomatch-2.3.1" sources."pseudomap-1.0.2" - sources."psl-1.8.0" + sources."psl-1.9.0" sources."punycode-2.1.1" sources."qs-6.5.3" sources."readdirp-3.1.3" @@ -13552,7 +13552,7 @@ in sources."defer-to-connect-1.1.3" sources."depd-2.0.0" sources."destroy-1.2.0" - sources."duplexer3-0.1.4" + sources."duplexer3-0.1.5" sources."ee-first-1.1.1" sources."encodeurl-1.0.2" sources."end-of-stream-1.4.4" @@ -13571,7 +13571,7 @@ in sources."fs.realpath-1.0.0" sources."fsevents-2.3.2" sources."function-bind-1.1.1" - sources."get-intrinsic-1.1.1" + sources."get-intrinsic-1.1.2" sources."get-stream-4.1.0" sources."glob-7.2.3" sources."glob-parent-5.1.2" @@ -13629,7 +13629,7 @@ in sources."raw-body-2.5.1" sources."rc-1.2.8" sources."readdirp-3.6.0" - sources."registry-auth-token-4.2.1" + sources."registry-auth-token-4.2.2" sources."registry-url-5.1.0" sources."responselike-1.0.2" sources."rimraf-2.7.1" @@ -13742,7 +13742,7 @@ in sources."to-regex-range-5.0.1" sources."ts-debounce-4.0.0" sources."tslib-1.14.1" - sources."tsyringe-4.6.0" + sources."tsyringe-4.7.0" sources."vscode-jsonrpc-6.0.0" sources."vscode-languageserver-7.0.0" sources."vscode-languageserver-protocol-3.16.0" @@ -13882,30 +13882,29 @@ in elm-test = nodeEnv.buildNodePackage { name = "elm-test"; packageName = "elm-test"; - version = "0.19.1-revision7"; + version = "0.19.1-revision9"; src = fetchurl { - url = "https://registry.npmjs.org/elm-test/-/elm-test-0.19.1-revision7.tgz"; - sha512 = "sd3nCQMeYMaY84Sz41bVJ30ZvQN1/4ZcD8uYMOuUbM39FDh58NY9/AcImVJ7Z+gjCFdcSU6VscZzhUoPW8jp6Q=="; + url = "https://registry.npmjs.org/elm-test/-/elm-test-0.19.1-revision9.tgz"; + sha512 = "lvHJbh16sy7oUBBPIEMN+0v6dGDZFmfvwq+V+TnGPk5ZlI64vcykx8E8+zLt/E+Ja42UKMMXXgN1ZHQ1V6Ic2Q=="; }; dependencies = [ sources."ansi-styles-4.3.0" sources."anymatch-3.1.2" sources."balanced-match-1.0.2" sources."binary-extensions-2.2.0" - sources."brace-expansion-1.1.11" + sources."brace-expansion-2.0.1" sources."braces-3.0.2" sources."chalk-4.1.2" sources."chokidar-3.5.3" sources."color-convert-2.0.1" sources."color-name-1.1.4" - sources."commander-7.2.0" - sources."concat-map-0.0.1" + sources."commander-9.3.0" sources."cross-spawn-7.0.3" - sources."elm-tooling-1.8.0" + sources."elm-solve-deps-wasm-1.0.1" sources."fill-range-7.0.1" sources."fs.realpath-1.0.0" sources."fsevents-2.3.2" - sources."glob-7.2.3" + sources."glob-8.0.3" sources."glob-parent-5.1.2" sources."graceful-fs-4.2.10" sources."has-flag-4.0.0" @@ -13916,14 +13915,12 @@ in sources."is-glob-4.0.3" sources."is-number-7.0.0" sources."isexe-2.0.0" - sources."minimatch-3.1.2" + sources."minimatch-5.1.0" sources."normalize-path-3.0.0" sources."once-1.4.0" - sources."path-is-absolute-1.0.1" sources."path-key-3.1.1" sources."picomatch-2.3.1" sources."readdirp-3.6.0" - sources."rimraf-3.0.2" sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" sources."split-1.0.1" @@ -13959,7 +13956,7 @@ in sources."@types/http-cache-semantics-4.0.1" sources."@types/json-buffer-3.0.0" sources."@types/keyv-3.1.4" - sources."@types/node-17.0.35" + sources."@types/node-18.0.3" sources."@types/responselike-1.0.0" sources."cacheable-lookup-2.0.1" sources."cacheable-request-7.0.2" @@ -13973,7 +13970,7 @@ in sources."config-chain-1.1.13" sources."decompress-response-5.0.0" sources."defer-to-connect-2.0.1" - sources."duplexer3-0.1.4" + sources."duplexer3-0.1.5" sources."end-of-stream-1.4.4" sources."fs-extra-8.1.0" sources."get-proxy-2.1.0" @@ -13989,7 +13986,7 @@ in sources."isurl-1.0.0" sources."json-buffer-3.0.1" sources."jsonfile-4.0.0" - sources."keyv-4.3.0" + sources."keyv-4.3.2" sources."lowercase-keys-2.0.0" sources."lru-cache-6.0.0" sources."mimic-response-2.1.0" @@ -14159,7 +14156,7 @@ in sources."path-key-3.1.1" sources."performance-now-2.1.0" sources."picomatch-2.3.1" - sources."psl-1.8.0" + sources."psl-1.9.0" sources."punycode-2.1.1" sources."qs-6.5.3" sources."readdirp-3.1.3" @@ -14276,52 +14273,52 @@ in }; dependencies = [ sources."@babel/cli-7.12.10" - sources."@babel/code-frame-7.16.7" - sources."@babel/compat-data-7.17.10" + sources."@babel/code-frame-7.18.6" + sources."@babel/compat-data-7.18.8" sources."@babel/core-7.12.10" - sources."@babel/generator-7.18.2" - sources."@babel/helper-annotate-as-pure-7.16.7" - sources."@babel/helper-builder-binary-assignment-operator-visitor-7.16.7" - (sources."@babel/helper-compilation-targets-7.18.2" // { + sources."@babel/generator-7.18.7" + sources."@babel/helper-annotate-as-pure-7.18.6" + sources."@babel/helper-builder-binary-assignment-operator-visitor-7.18.6" + (sources."@babel/helper-compilation-targets-7.18.6" // { dependencies = [ sources."semver-6.3.0" ]; }) - sources."@babel/helper-create-class-features-plugin-7.18.0" - sources."@babel/helper-create-regexp-features-plugin-7.17.12" - sources."@babel/helper-environment-visitor-7.18.2" - sources."@babel/helper-explode-assignable-expression-7.16.7" - sources."@babel/helper-function-name-7.17.9" - sources."@babel/helper-hoist-variables-7.16.7" - sources."@babel/helper-member-expression-to-functions-7.17.7" - sources."@babel/helper-module-imports-7.16.7" - sources."@babel/helper-module-transforms-7.18.0" - sources."@babel/helper-optimise-call-expression-7.16.7" - sources."@babel/helper-plugin-utils-7.17.12" - sources."@babel/helper-remap-async-to-generator-7.16.8" - sources."@babel/helper-replace-supers-7.18.2" - sources."@babel/helper-simple-access-7.18.2" - sources."@babel/helper-skip-transparent-expression-wrappers-7.16.0" - sources."@babel/helper-split-export-declaration-7.16.7" - sources."@babel/helper-validator-identifier-7.16.7" - sources."@babel/helper-validator-option-7.16.7" - sources."@babel/helper-wrap-function-7.16.8" - sources."@babel/helpers-7.18.2" - sources."@babel/highlight-7.17.12" - sources."@babel/parser-7.18.3" - sources."@babel/plugin-proposal-async-generator-functions-7.17.12" - sources."@babel/plugin-proposal-class-properties-7.17.12" - sources."@babel/plugin-proposal-dynamic-import-7.16.7" - sources."@babel/plugin-proposal-export-namespace-from-7.17.12" - sources."@babel/plugin-proposal-json-strings-7.17.12" - sources."@babel/plugin-proposal-logical-assignment-operators-7.17.12" - sources."@babel/plugin-proposal-nullish-coalescing-operator-7.17.12" - sources."@babel/plugin-proposal-numeric-separator-7.16.7" - sources."@babel/plugin-proposal-object-rest-spread-7.18.0" - sources."@babel/plugin-proposal-optional-catch-binding-7.16.7" - sources."@babel/plugin-proposal-optional-chaining-7.17.12" - sources."@babel/plugin-proposal-private-methods-7.17.12" - sources."@babel/plugin-proposal-unicode-property-regex-7.17.12" + sources."@babel/helper-create-class-features-plugin-7.18.6" + sources."@babel/helper-create-regexp-features-plugin-7.18.6" + sources."@babel/helper-environment-visitor-7.18.6" + sources."@babel/helper-explode-assignable-expression-7.18.6" + sources."@babel/helper-function-name-7.18.6" + sources."@babel/helper-hoist-variables-7.18.6" + sources."@babel/helper-member-expression-to-functions-7.18.6" + sources."@babel/helper-module-imports-7.18.6" + sources."@babel/helper-module-transforms-7.18.8" + sources."@babel/helper-optimise-call-expression-7.18.6" + sources."@babel/helper-plugin-utils-7.18.6" + sources."@babel/helper-remap-async-to-generator-7.18.6" + sources."@babel/helper-replace-supers-7.18.6" + sources."@babel/helper-simple-access-7.18.6" + sources."@babel/helper-skip-transparent-expression-wrappers-7.18.6" + sources."@babel/helper-split-export-declaration-7.18.6" + sources."@babel/helper-validator-identifier-7.18.6" + sources."@babel/helper-validator-option-7.18.6" + sources."@babel/helper-wrap-function-7.18.6" + sources."@babel/helpers-7.18.6" + sources."@babel/highlight-7.18.6" + sources."@babel/parser-7.18.8" + sources."@babel/plugin-proposal-async-generator-functions-7.18.6" + sources."@babel/plugin-proposal-class-properties-7.18.6" + sources."@babel/plugin-proposal-dynamic-import-7.18.6" + sources."@babel/plugin-proposal-export-namespace-from-7.18.6" + sources."@babel/plugin-proposal-json-strings-7.18.6" + sources."@babel/plugin-proposal-logical-assignment-operators-7.18.6" + sources."@babel/plugin-proposal-nullish-coalescing-operator-7.18.6" + sources."@babel/plugin-proposal-numeric-separator-7.18.6" + sources."@babel/plugin-proposal-object-rest-spread-7.18.6" + sources."@babel/plugin-proposal-optional-catch-binding-7.18.6" + sources."@babel/plugin-proposal-optional-chaining-7.18.6" + sources."@babel/plugin-proposal-private-methods-7.18.6" + sources."@babel/plugin-proposal-unicode-property-regex-7.18.6" sources."@babel/plugin-syntax-async-generators-7.8.4" sources."@babel/plugin-syntax-class-properties-7.12.13" sources."@babel/plugin-syntax-dynamic-import-7.8.3" @@ -14334,55 +14331,55 @@ in sources."@babel/plugin-syntax-optional-catch-binding-7.8.3" sources."@babel/plugin-syntax-optional-chaining-7.8.3" sources."@babel/plugin-syntax-top-level-await-7.14.5" - sources."@babel/plugin-transform-arrow-functions-7.17.12" - sources."@babel/plugin-transform-async-to-generator-7.17.12" - sources."@babel/plugin-transform-block-scoped-functions-7.16.7" - sources."@babel/plugin-transform-block-scoping-7.17.12" - sources."@babel/plugin-transform-classes-7.17.12" - sources."@babel/plugin-transform-computed-properties-7.17.12" - sources."@babel/plugin-transform-destructuring-7.18.0" - sources."@babel/plugin-transform-dotall-regex-7.16.7" - sources."@babel/plugin-transform-duplicate-keys-7.17.12" - sources."@babel/plugin-transform-exponentiation-operator-7.16.7" - sources."@babel/plugin-transform-for-of-7.18.1" - sources."@babel/plugin-transform-function-name-7.16.7" - sources."@babel/plugin-transform-literals-7.17.12" - sources."@babel/plugin-transform-member-expression-literals-7.16.7" - sources."@babel/plugin-transform-modules-amd-7.18.0" - sources."@babel/plugin-transform-modules-commonjs-7.18.2" - sources."@babel/plugin-transform-modules-systemjs-7.18.0" - sources."@babel/plugin-transform-modules-umd-7.18.0" - sources."@babel/plugin-transform-named-capturing-groups-regex-7.17.12" - sources."@babel/plugin-transform-new-target-7.17.12" - sources."@babel/plugin-transform-object-super-7.16.7" - sources."@babel/plugin-transform-parameters-7.17.12" - sources."@babel/plugin-transform-property-literals-7.16.7" - sources."@babel/plugin-transform-regenerator-7.18.0" - sources."@babel/plugin-transform-reserved-words-7.17.12" + sources."@babel/plugin-transform-arrow-functions-7.18.6" + sources."@babel/plugin-transform-async-to-generator-7.18.6" + sources."@babel/plugin-transform-block-scoped-functions-7.18.6" + sources."@babel/plugin-transform-block-scoping-7.18.6" + sources."@babel/plugin-transform-classes-7.18.8" + sources."@babel/plugin-transform-computed-properties-7.18.6" + sources."@babel/plugin-transform-destructuring-7.18.6" + sources."@babel/plugin-transform-dotall-regex-7.18.6" + sources."@babel/plugin-transform-duplicate-keys-7.18.6" + sources."@babel/plugin-transform-exponentiation-operator-7.18.6" + sources."@babel/plugin-transform-for-of-7.18.8" + sources."@babel/plugin-transform-function-name-7.18.6" + sources."@babel/plugin-transform-literals-7.18.6" + sources."@babel/plugin-transform-member-expression-literals-7.18.6" + sources."@babel/plugin-transform-modules-amd-7.18.6" + sources."@babel/plugin-transform-modules-commonjs-7.18.6" + sources."@babel/plugin-transform-modules-systemjs-7.18.6" + sources."@babel/plugin-transform-modules-umd-7.18.6" + sources."@babel/plugin-transform-named-capturing-groups-regex-7.18.6" + sources."@babel/plugin-transform-new-target-7.18.6" + sources."@babel/plugin-transform-object-super-7.18.6" + sources."@babel/plugin-transform-parameters-7.18.8" + sources."@babel/plugin-transform-property-literals-7.18.6" + sources."@babel/plugin-transform-regenerator-7.18.6" + sources."@babel/plugin-transform-reserved-words-7.18.6" sources."@babel/plugin-transform-runtime-7.12.10" - sources."@babel/plugin-transform-shorthand-properties-7.16.7" - sources."@babel/plugin-transform-spread-7.17.12" - sources."@babel/plugin-transform-sticky-regex-7.16.7" - sources."@babel/plugin-transform-template-literals-7.18.2" - sources."@babel/plugin-transform-typeof-symbol-7.17.12" - sources."@babel/plugin-transform-unicode-escapes-7.16.7" - sources."@babel/plugin-transform-unicode-regex-7.16.7" + sources."@babel/plugin-transform-shorthand-properties-7.18.6" + sources."@babel/plugin-transform-spread-7.18.6" + sources."@babel/plugin-transform-sticky-regex-7.18.6" + sources."@babel/plugin-transform-template-literals-7.18.6" + sources."@babel/plugin-transform-typeof-symbol-7.18.6" + sources."@babel/plugin-transform-unicode-escapes-7.18.6" + sources."@babel/plugin-transform-unicode-regex-7.18.6" sources."@babel/preset-env-7.12.10" sources."@babel/preset-modules-0.1.5" sources."@babel/runtime-7.12.5" - sources."@babel/template-7.16.7" - sources."@babel/traverse-7.18.2" - sources."@babel/types-7.18.2" + sources."@babel/template-7.18.6" + sources."@babel/traverse-7.18.8" + sources."@babel/types-7.18.8" sources."@hapi/address-2.1.4" sources."@hapi/bourne-1.3.2" sources."@hapi/hoek-8.5.1" sources."@hapi/joi-15.1.1" sources."@hapi/topo-3.1.6" - sources."@jridgewell/gen-mapping-0.3.1" - sources."@jridgewell/resolve-uri-3.0.7" - sources."@jridgewell/set-array-1.1.1" - sources."@jridgewell/sourcemap-codec-1.4.13" - sources."@jridgewell/trace-mapping-0.3.13" + sources."@jridgewell/gen-mapping-0.3.2" + sources."@jridgewell/resolve-uri-3.1.0" + sources."@jridgewell/set-array-1.1.2" + sources."@jridgewell/sourcemap-codec-1.4.14" + sources."@jridgewell/trace-mapping-0.3.14" sources."@mrmlnc/readdir-enhanced-2.2.1" sources."@nodelib/fs.stat-1.1.3" sources."@types/glob-7.2.0" @@ -14390,12 +14387,12 @@ in sources."@types/http-proxy-1.17.9" sources."@types/json-schema-7.0.11" sources."@types/minimatch-3.0.5" - sources."@types/node-17.0.35" + sources."@types/node-18.0.3" sources."@types/parse-json-4.0.0" sources."@types/q-1.5.5" sources."@types/source-list-map-0.1.2" sources."@types/tapable-1.0.8" - (sources."@types/uglify-js-3.13.2" // { + (sources."@types/uglify-js-3.16.0" // { dependencies = [ sources."source-map-0.6.1" ]; @@ -14407,7 +14404,7 @@ in }) (sources."@types/webpack-sources-3.2.0" // { dependencies = [ - sources."source-map-0.7.3" + sources."source-map-0.7.4" ]; }) sources."@webassemblyjs/ast-1.9.0" @@ -14542,7 +14539,7 @@ in ]; }) sources."browserify-zlib-0.2.0" - sources."browserslist-4.20.3" + sources."browserslist-4.21.1" sources."buffer-4.9.2" sources."buffer-from-1.1.2" sources."buffer-indexof-1.1.1" @@ -14559,7 +14556,7 @@ in sources."camel-case-4.1.2" sources."camelcase-5.3.1" sources."caniuse-api-3.0.0" - sources."caniuse-lite-1.0.30001344" + sources."caniuse-lite-1.0.30001364" sources."case-sensitive-paths-webpack-plugin-2.3.0" sources."caseless-0.12.0" (sources."chalk-2.4.2" // { @@ -14658,7 +14655,7 @@ in ]; }) sources."core-js-2.6.12" - (sources."core-js-compat-3.22.7" // { + (sources."core-js-compat-3.23.4" // { dependencies = [ sources."semver-7.0.0" ]; @@ -14759,7 +14756,7 @@ in sources."duplexify-3.7.1" sources."ecc-jsbn-0.1.2" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.4.140" + sources."electron-to-chromium-1.4.185" (sources."elliptic-6.5.4" // { dependencies = [ sources."bn.js-4.12.0" @@ -14769,19 +14766,21 @@ in sources."elm-asset-webpack-loader-1.1.2" sources."elm-hot-1.1.6" sources."elm-hot-webpack-loader-1.1.7" - (sources."elm-test-0.19.1-revision7" // { + sources."elm-solve-deps-wasm-1.0.1" + (sources."elm-test-0.19.1-revision9" // { dependencies = [ sources."ansi-styles-4.3.0" + sources."brace-expansion-2.0.1" sources."chalk-4.1.2" sources."color-convert-2.0.1" sources."color-name-1.1.4" - sources."commander-7.2.0" + sources."commander-9.3.0" + sources."glob-8.0.3" sources."has-flag-4.0.0" - sources."rimraf-3.0.2" + sources."minimatch-5.1.0" sources."supports-color-7.2.0" ]; }) - sources."elm-tooling-1.8.0" sources."elm-webpack-loader-6.0.1" sources."emoji-regex-8.0.0" sources."emojis-list-3.0.0" @@ -14943,7 +14942,7 @@ in sources."functions-have-names-1.2.3" sources."gensync-1.0.0-beta.2" sources."get-caller-file-1.0.3" - sources."get-intrinsic-1.1.1" + sources."get-intrinsic-1.1.2" sources."get-own-enumerable-property-symbols-3.0.2" sources."get-stream-4.1.0" sources."get-symbol-description-1.0.0" @@ -15016,7 +15015,7 @@ in sources."htmlparser2-6.1.0" sources."http-deceiver-1.2.7" sources."http-errors-2.0.0" - sources."http-parser-js-0.5.6" + sources."http-parser-js-0.5.8" sources."http-proxy-1.18.1" sources."http-proxy-middleware-0.21.0" sources."http-signature-1.2.0" @@ -15211,7 +15210,7 @@ in sources."punycode-1.4.1" ]; }) - sources."node-releases-2.0.5" + sources."node-releases-2.0.6" sources."normalize-package-data-2.5.0" sources."normalize-path-3.0.0" sources."normalize-range-0.1.2" @@ -15466,7 +15465,7 @@ in sources."proxy-addr-2.0.7" sources."prr-1.0.1" sources."pseudomap-1.0.2" - sources."psl-1.8.0" + sources."psl-1.9.0" (sources."public-encrypt-4.0.3" // { dependencies = [ sources."bn.js-4.12.0" @@ -15551,7 +15550,7 @@ in sources."regenerator-transform-0.15.0" sources."regex-not-1.0.2" sources."regexp.prototype.flags-1.4.3" - sources."regexpu-core-5.0.1" + sources."regexpu-core-5.1.0" sources."regjsgen-0.6.0" (sources."regjsparser-0.8.4" // { dependencies = [ @@ -15572,7 +15571,7 @@ in sources."require-directory-2.1.1" sources."require-main-filename-1.0.1" sources."requires-port-1.0.0" - sources."resolve-1.22.0" + sources."resolve-1.22.1" sources."resolve-cwd-2.0.0" sources."resolve-dir-1.0.1" sources."resolve-from-3.0.0" @@ -15682,7 +15681,7 @@ in (sources."sockjs-client-1.4.0" // { dependencies = [ sources."debug-3.2.7" - sources."eventsource-1.1.1" + sources."eventsource-1.1.2" ]; }) sources."sort-keys-1.1.2" @@ -15881,6 +15880,7 @@ in ]; }) sources."upath-1.2.0" + sources."update-browserslist-db-1.0.4" sources."uri-js-4.4.1" sources."urix-0.1.0" (sources."url-0.11.0" // { @@ -16097,13 +16097,13 @@ in elm-optimize-level-2 = nodeEnv.buildNodePackage { name = "elm-optimize-level-2"; packageName = "elm-optimize-level-2"; - version = "0.3.4"; + version = "0.3.5"; src = fetchurl { - url = "https://registry.npmjs.org/elm-optimize-level-2/-/elm-optimize-level-2-0.3.4.tgz"; - sha512 = "DKhH6o+SNo3m8y9qAM932/gLMK0YmNSJevHdBYkaDWfKiw+vlo4Wtfskb8CI8ZAzWrAOcDNiLCsEbSsbPHk2Vg=="; + url = "https://registry.npmjs.org/elm-optimize-level-2/-/elm-optimize-level-2-0.3.5.tgz"; + sha512 = "t1xl8zR9UBspdmEMuLBE/qTLP+Ew3L4PzKLhSY/PsO21HU3jZ1ULmKxDtZmJPVG4ciqsY1JSl/GFbaSdQ1sX9Q=="; }; dependencies = [ - sources."@types/jest-27.5.1" + sources."@types/jest-27.5.2" sources."ansi-regex-5.0.1" sources."ansi-styles-5.2.0" sources."balanced-match-1.0.2" @@ -16148,7 +16148,7 @@ in sources."supports-color-7.2.0" sources."temp-0.9.4" sources."ts-union-2.3.0" - sources."typescript-4.7.2" + sources."typescript-4.7.4" sources."which-1.3.1" sources."wrappy-1.0.2" ]; @@ -16171,6 +16171,12 @@ in sha512 = "Xs1ZlHIM5VZ/7QyerY+JNyNzB5VqBdBeVudZznX672xINgZUa36fAKwIp+LJ01A7u/+9rHEP9MItVurZ/aBzNQ=="; }; dependencies = [ + sources."@jridgewell/gen-mapping-0.3.2" + sources."@jridgewell/resolve-uri-3.1.0" + sources."@jridgewell/set-array-1.1.2" + sources."@jridgewell/source-map-0.3.2" + sources."@jridgewell/sourcemap-codec-1.4.14" + sources."@jridgewell/trace-mapping-0.3.14" sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" @@ -16235,14 +16241,14 @@ in sources."defer-to-connect-1.1.3" sources."depd-2.0.0" sources."destroy-1.2.0" - (sources."devcert-1.2.1" // { + (sources."devcert-1.2.2" // { dependencies = [ sources."debug-3.2.7" sources."ms-2.1.3" ]; }) sources."dir-glob-3.0.1" - sources."duplexer3-0.1.4" + sources."duplexer3-0.1.5" sources."ee-first-1.1.1" (sources."elm-doc-preview-5.0.5" // { dependencies = [ @@ -16280,7 +16286,7 @@ in sources."fs.realpath-1.0.0" sources."fsevents-2.3.2" sources."function-bind-1.1.1" - sources."get-intrinsic-1.1.1" + sources."get-intrinsic-1.1.2" sources."get-port-3.2.0" sources."get-stream-4.1.0" sources."glob-7.2.3" @@ -16319,10 +16325,9 @@ in sources."jsonfile-6.1.0" sources."keyv-3.1.0" sources."kind-of-6.0.3" - sources."kleur-4.1.4" + sources."kleur-4.1.5" sources."latest-version-5.1.0" sources."lodash-4.17.21" - sources."lodash.sortby-4.7.0" sources."lowercase-keys-1.0.1" sources."media-typer-0.3.0" sources."merge-descriptors-1.0.1" @@ -16378,7 +16383,7 @@ in sources."raw-body-2.5.1" sources."rc-1.2.8" sources."readdirp-3.6.0" - sources."registry-auth-token-4.2.1" + sources."registry-auth-token-4.2.2" sources."registry-url-5.1.0" sources."responselike-1.0.2" sources."reusify-1.0.4" @@ -16409,19 +16414,15 @@ in sources."shebang-regex-3.0.0" sources."side-channel-1.0.4" sources."slash-3.0.0" - sources."source-map-0.8.0-beta.0" - (sources."source-map-support-0.5.21" // { - dependencies = [ - sources."source-map-0.6.1" - ]; - }) + sources."source-map-0.6.1" + sources."source-map-support-0.5.21" sources."sprintf-js-1.0.3" sources."statuses-1.5.0" sources."strip-bom-string-1.0.0" sources."strip-json-comments-2.0.1" sources."sudo-prompt-8.2.5" sources."supports-color-7.2.0" - (sources."terser-5.13.1" // { + (sources."terser-5.14.1" // { dependencies = [ sources."commander-2.20.3" ]; @@ -16430,7 +16431,6 @@ in sources."to-readable-stream-1.0.0" sources."to-regex-range-5.0.1" sources."toidentifier-1.0.1" - sources."tr46-1.0.1" sources."tslib-1.14.1" sources."type-is-1.6.18" sources."undici-4.16.0" @@ -16439,8 +16439,6 @@ in sources."url-parse-lax-3.0.0" sources."utils-merge-1.0.1" sources."vary-1.1.2" - sources."webidl-conversions-4.0.2" - sources."whatwg-url-7.1.0" sources."which-2.0.2" sources."wrappy-1.0.2" sources."ws-7.5.8" @@ -16470,7 +16468,7 @@ in sources."@types/http-cache-semantics-4.0.1" sources."@types/json-buffer-3.0.0" sources."@types/keyv-3.1.4" - sources."@types/node-17.0.35" + sources."@types/node-18.0.3" sources."@types/responselike-1.0.0" (sources."ansi-escapes-4.3.2" // { dependencies = [ @@ -16509,7 +16507,7 @@ in sources."decompress-response-5.0.0" sources."defaults-1.0.3" sources."defer-to-connect-2.0.1" - sources."duplexer3-0.1.4" + sources."duplexer3-0.1.5" sources."elm-tooling-1.8.0" sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" @@ -16545,7 +16543,7 @@ in sources."isexe-2.0.0" sources."json-buffer-3.0.1" sources."jsonfile-6.1.0" - sources."keyv-4.3.0" + sources."keyv-4.3.2" sources."kleur-3.0.3" sources."locate-path-5.0.0" sources."log-symbols-4.1.0" @@ -16627,7 +16625,7 @@ in sources."lru-cache-6.0.0" sources."ms-2.1.2" sources."semver-7.3.7" - sources."simple-git-3.7.1" + sources."simple-git-3.10.0" sources."upath-2.0.1" sources."yallist-4.0.0" ]; From cbfd288fd1494dca775019fe4973d190e920fdd0 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sun, 3 Jul 2022 21:01:38 +0000 Subject: [PATCH 106/133] libhugetlbfs: fix build with recent Glibc --- pkgs/development/libraries/libhugetlbfs/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/development/libraries/libhugetlbfs/default.nix b/pkgs/development/libraries/libhugetlbfs/default.nix index bd99e4d84a56..2ad7539ef1fd 100644 --- a/pkgs/development/libraries/libhugetlbfs/default.nix +++ b/pkgs/development/libraries/libhugetlbfs/default.nix @@ -9,6 +9,13 @@ stdenv.mkDerivation rec { sha256 = "0ya4q001g111d3pqlzrf3yaifadl0ccirx5dndz1pih7x3qp41mp"; }; + patches = [ + (fetchurl { + url = "https://build.opensuse.org/public/source/openSUSE:Factory/libhugetlbfs/glibc-2.34-fix.patch?rev=50"; + sha256 = "sha256-eRQa6M0ZdHMtwA5nnzDTWYv/x4AnRZhj+MpDiwyCvVM="; + }) + ]; + outputs = [ "bin" "dev" "man" "doc" "lib" "out" ]; postConfigure = '' From 9f2c91667dd687fef9b92b2b5b04c610e94bf907 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sun, 10 Jul 2022 09:42:49 +0000 Subject: [PATCH 107/133] python3.pkgs.influxgraph: remove Due to lack of maintenance. Last upstream commit was in 2018, and graphite_api doesn't build, is also unmaintained upstream, and will also be removed. --- .../from_md/release-notes/rl-2211.section.xml | 5 ++-- .../manual/release-notes/rl-2211.section.md | 3 ++- .../python-modules/influxgraph/default.nix | 24 ------------------- pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 2 -- 5 files changed, 6 insertions(+), 29 deletions(-) delete mode 100644 pkgs/development/python-modules/influxgraph/default.nix diff --git a/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml index 06aed6cca9e2..5ce32f86a2cb 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml @@ -253,8 +253,9 @@ The services.graphite.beacon NixOS option, - and the python3.pkgs.graphite_beacon - package, has been removed due to lack of upstream maintenance. + and the python3.pkgs.graphite_beacon and + python3.pkgs.influxgraph packages, have + been removed due to lack of upstream maintenance. diff --git a/nixos/doc/manual/release-notes/rl-2211.section.md b/nixos/doc/manual/release-notes/rl-2211.section.md index ea3aea8f542f..02f46e411e49 100644 --- a/nixos/doc/manual/release-notes/rl-2211.section.md +++ b/nixos/doc/manual/release-notes/rl-2211.section.md @@ -98,7 +98,8 @@ In addition to numerous new and upgraded packages, this release has the followin - riak package removed along with `services.riak` module, due to lack of maintainer to update the package. - The `services.graphite.beacon` NixOS option, and the `python3.pkgs.graphite_beacon` - package, has been removed due to lack of upstream maintenance. + and `python3.pkgs.influxgraph` packages, have been removed due to lack of + upstream maintenance. - (Neo)Vim can not be configured with `configure.pathogen` anymore to reduce maintainance burden. Use `configure.packages` instead. diff --git a/pkgs/development/python-modules/influxgraph/default.nix b/pkgs/development/python-modules/influxgraph/default.nix deleted file mode 100644 index 7f24e1fd87e5..000000000000 --- a/pkgs/development/python-modules/influxgraph/default.nix +++ /dev/null @@ -1,24 +0,0 @@ -{ lib, buildPythonPackage, fetchPypi, isPy3k -, influxdb, graphite_api, python-memcached -}: - -buildPythonPackage rec { - pname = "influxgraph"; - version = "1.5.0"; - - src = fetchPypi { - inherit pname version; - sha256 = "0l33sfwdh4bfprmzp2kx0d9098g6yxbnhyyx9qr3kzczpm0jg9vy"; - }; - - propagatedBuildInputs = [ influxdb graphite_api python-memcached ]; - - passthru.moduleName = "influxgraph.InfluxDBFinder"; - - meta = with lib; { - description = "InfluxDB storage plugin for Graphite-API"; - homepage = "https://github.com/InfluxGraph/influxgraph"; - license = licenses.asl20; - maintainers = with maintainers; [ basvandijk ]; - }; -} diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 941ecc82c7bb..90e0b066047f 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -88,6 +88,7 @@ mapAliases ({ hyperkitty = throw "Please use pkgs.mailmanPackages.hyperkitty"; # added 2022-04-29 IMAPClient = imapclient; # added 2021-10-28 ipaddress = throw "ipaddress has been removed because it is no longer required since python 2.7."; # added 2022-05-30 + influxgraph = throw "influxgraph has been removed because it is no longer maintained"; # added 2022-07-10 jupyter_client = jupyter-client; # added 2021-10-15 Keras = keras; # added 2021-11-25 lammps-cython = throw "lammps-cython no longer builds and is unmaintained"; # added 2021-07-04 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 18b543d73f1c..ce2da3d990b6 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -4276,8 +4276,6 @@ in { influxdb-client = callPackage ../development/python-modules/influxdb-client { }; - influxgraph = callPackage ../development/python-modules/influxgraph { }; - inform = callPackage ../development/python-modules/inform { }; iniconfig = callPackage ../development/python-modules/iniconfig { }; From 1f18d441063208968f38bed0fe5ddbcdb8f6cf34 Mon Sep 17 00:00:00 2001 From: Alyssa Ross Date: Sun, 10 Jul 2022 09:03:35 +0000 Subject: [PATCH 108/133] python3.pkgs.graphite_api: remove Due to lack of maintenance. It doesn't build, the last upstream commit was in 2017, and last significant change in Nixpkgs was in 2018. --- .../from_md/release-notes/rl-2211.section.xml | 6 +- .../manual/release-notes/rl-2211.section.md | 7 +- .../modules/services/monitoring/graphite.nix | 134 +----------------- nixos/tests/graphite.nix | 10 -- .../python-modules/graphite-api/default.nix | 46 ------ .../graphite-api/flask-caching-rebased.patch | 132 ----------------- pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 2 - 8 files changed, 11 insertions(+), 327 deletions(-) delete mode 100644 pkgs/development/python-modules/graphite-api/default.nix delete mode 100644 pkgs/development/python-modules/graphite-api/flask-caching-rebased.patch diff --git a/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml b/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml index 5ce32f86a2cb..d99d32938342 100644 --- a/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml +++ b/nixos/doc/manual/from_md/release-notes/rl-2211.section.xml @@ -252,8 +252,10 @@ - The services.graphite.beacon NixOS option, - and the python3.pkgs.graphite_beacon and + The services.graphite.api and + services.graphite.beacon NixOS options, and + the python3.pkgs.graphite_api, + python3.pkgs.graphite_beacon and python3.pkgs.influxgraph packages, have been removed due to lack of upstream maintenance. diff --git a/nixos/doc/manual/release-notes/rl-2211.section.md b/nixos/doc/manual/release-notes/rl-2211.section.md index 02f46e411e49..0304a08e94c2 100644 --- a/nixos/doc/manual/release-notes/rl-2211.section.md +++ b/nixos/doc/manual/release-notes/rl-2211.section.md @@ -97,9 +97,10 @@ In addition to numerous new and upgraded packages, this release has the followin - riak package removed along with `services.riak` module, due to lack of maintainer to update the package. -- The `services.graphite.beacon` NixOS option, and the `python3.pkgs.graphite_beacon` - and `python3.pkgs.influxgraph` packages, have been removed due to lack of - upstream maintenance. +- The `services.graphite.api` and `services.graphite.beacon` NixOS options, and + the `python3.pkgs.graphite_api`, `python3.pkgs.graphite_beacon` and + `python3.pkgs.influxgraph` packages, have been removed due to lack of upstream + maintenance. - (Neo)Vim can not be configured with `configure.pathogen` anymore to reduce maintainance burden. Use `configure.packages` instead. diff --git a/nixos/modules/services/monitoring/graphite.nix b/nixos/modules/services/monitoring/graphite.nix index 9098cc797edf..1dc2cee479ac 100644 --- a/nixos/modules/services/monitoring/graphite.nix +++ b/nixos/modules/services/monitoring/graphite.nix @@ -24,16 +24,6 @@ let + cfg.web.extraConfig ); - graphiteApiConfig = pkgs.writeText "graphite-api.yaml" '' - search_index: ${dataDir}/index - ${optionalString (config.time.timeZone != null) "time_zone: ${config.time.timeZone}"} - ${optionalString (cfg.api.finders != []) "finders:"} - ${concatMapStringsSep "\n" (f: " - " + f.moduleName) cfg.api.finders} - ${optionalString (cfg.api.functions != []) "functions:"} - ${concatMapStringsSep "\n" (f: " - " + f) cfg.api.functions} - ${cfg.api.extraConfig} - ''; - seyrenConfig = { SEYREN_URL = cfg.seyren.seyrenUrl; MONGO_URL = cfg.seyren.mongoUrl; @@ -72,6 +62,7 @@ let in { imports = [ + (mkRemovedOptionModule ["services" "graphite" "api"] "") (mkRemovedOptionModule ["services" "graphite" "beacon"] "") (mkRemovedOptionModule ["services" "graphite" "pager"] "") ]; @@ -116,88 +107,6 @@ in { }; }; - api = { - enable = mkOption { - description = '' - Whether to enable graphite api. Graphite api is lightweight alternative - to graphite web, with api and without dashboard. It's advised to use - grafana as alternative dashboard and influxdb as alternative to - graphite carbon. - - For more information visit - - ''; - default = false; - type = types.bool; - }; - - finders = mkOption { - description = "List of finder plugins to load."; - default = []; - example = literalExpression "[ pkgs.python3Packages.influxgraph ]"; - type = types.listOf types.package; - }; - - functions = mkOption { - description = "List of functions to load."; - default = [ - "graphite_api.functions.SeriesFunctions" - "graphite_api.functions.PieFunctions" - ]; - type = types.listOf types.str; - }; - - listenAddress = mkOption { - description = "Graphite web service listen address."; - default = "127.0.0.1"; - type = types.str; - }; - - port = mkOption { - description = "Graphite api service port."; - default = 8080; - type = types.int; - }; - - package = mkOption { - description = "Package to use for graphite api."; - default = pkgs.python3Packages.graphite_api; - defaultText = literalExpression "pkgs.python3Packages.graphite_api"; - type = types.package; - }; - - extraConfig = mkOption { - description = "Extra configuration for graphite api."; - default = '' - whisper: - directories: - - ${dataDir}/whisper - ''; - defaultText = literalExpression '' - ''' - whisper: - directories: - - ''${config.${opt.dataDir}}/whisper - ''' - ''; - example = '' - allowed_origins: - - dashboard.example.com - cheat_times: true - influxdb: - host: localhost - port: 8086 - user: influxdb - pass: influxdb - db: metrics - cache: - CACHE_TYPE: 'filesystem' - CACHE_DIR: '/tmp/graphite-api-cache' - ''; - type = types.lines; - }; - }; - carbon = { config = mkOption { description = "Content of carbon configuration file."; @@ -480,44 +389,6 @@ in { environment.systemPackages = [ pkgs.python3Packages.graphite-web ]; })) - (mkIf cfg.api.enable { - systemd.services.graphiteApi = { - description = "Graphite Api Interface"; - wantedBy = [ "multi-user.target" ]; - after = [ "network.target" ]; - environment = { - PYTHONPATH = let - aenv = pkgs.python3.buildEnv.override { - extraLibs = [ cfg.api.package pkgs.cairo pkgs.python3Packages.cffi ] ++ cfg.api.finders; - }; - in "${aenv}/${pkgs.python3.sitePackages}"; - GRAPHITE_API_CONFIG = graphiteApiConfig; - LD_LIBRARY_PATH = "${pkgs.cairo.out}/lib"; - }; - serviceConfig = { - ExecStart = '' - ${pkgs.python3Packages.waitress}/bin/waitress-serve \ - --host=${cfg.api.listenAddress} --port=${toString cfg.api.port} \ - graphite_api.app:app - ''; - User = "graphite"; - Group = "graphite"; - PermissionsStartOnly = true; - }; - preStart = '' - if ! test -e ${dataDir}/db-created; then - mkdir -p ${dataDir}/cache/ - chmod 0700 ${dataDir}/cache/ - - chown graphite:graphite ${cfg.dataDir} - chown -R graphite:graphite ${cfg.dataDir}/cache - - touch ${dataDir}/db-created - fi - ''; - }; - }) - (mkIf cfg.seyren.enable { systemd.services.seyren = { description = "Graphite Alerting Dashboard"; @@ -543,8 +414,7 @@ in { (mkIf ( cfg.carbon.enableCache || cfg.carbon.enableAggregator || cfg.carbon.enableRelay || - cfg.web.enable || cfg.api.enable || - cfg.seyren.enable + cfg.web.enable || cfg.seyren.enable ) { users.users.graphite = { uid = config.ids.uids.graphite; diff --git a/nixos/tests/graphite.nix b/nixos/tests/graphite.nix index ce6b667bd344..c534d45428e1 100644 --- a/nixos/tests/graphite.nix +++ b/nixos/tests/graphite.nix @@ -12,11 +12,6 @@ import ./make-test-python.nix ({ pkgs, ... } : SECRET_KEY = "abcd"; ''; }; - api = { - enable = true; - port = 8082; - finders = [ ]; - }; carbon.enableCache = true; seyren.enable = false; # Implicitely requires openssl-1.0.2u which is marked insecure }; @@ -27,20 +22,15 @@ import ./make-test-python.nix ({ pkgs, ... } : start_all() one.wait_for_unit("default.target") one.wait_for_unit("graphiteWeb.service") - one.wait_for_unit("graphiteApi.service") one.wait_for_unit("carbonCache.service") # The services above are of type "simple". systemd considers them active immediately # even if they're still in preStart (which takes quite long for graphiteWeb). # Wait for ports to open so we're sure the services are up and listening. one.wait_for_open_port(8080) - one.wait_for_open_port(8082) one.wait_for_open_port(2003) one.succeed('echo "foo 1 `date +%s`" | nc -N localhost 2003') one.wait_until_succeeds( "curl 'http://localhost:8080/metrics/find/?query=foo&format=treejson' --silent | grep foo >&2" ) - one.wait_until_succeeds( - "curl 'http://localhost:8082/metrics/find/?query=foo&format=treejson' --silent | grep foo >&2" - ) ''; }) diff --git a/pkgs/development/python-modules/graphite-api/default.nix b/pkgs/development/python-modules/graphite-api/default.nix deleted file mode 100644 index 34b8c271d932..000000000000 --- a/pkgs/development/python-modules/graphite-api/default.nix +++ /dev/null @@ -1,46 +0,0 @@ -{ stdenv, buildPythonPackage, fetchFromGitHub, lib, flask, flask-caching, cairocffi, pyparsing, pytz, pyyaml -, raven, six, structlog, tzlocal, nose, mock, cairo, isPyPy -}: - -buildPythonPackage rec { - pname = "graphite-api"; - version = "1.1.3"; - - disabled = isPyPy; - - src = fetchFromGitHub { - owner = "brutasse"; - repo = "graphite-api"; - rev = version; - sha256 = "0sz3kav2024ms2z4q03pigcf080gsr5v774z9bp3zw29k2p47ass"; - }; - - # https://github.com/brutasse/graphite-api/pull/239 rebased onto 1.1.3 - patches = [ ./flask-caching-rebased.patch ]; - - checkPhase = "nosetests"; - - propagatedBuildInputs = [ - flask - flask-caching - cairocffi - pyparsing - pytz - pyyaml - raven - six - structlog - tzlocal - ]; - - checkInputs = [ nose mock ]; - - LD_LIBRARY_PATH = "${cairo.out}/lib"; - - meta = with lib; { - broken = stdenv.isDarwin; - description = "Graphite-web, without the interface. Just the rendering HTTP API"; - homepage = "https://github.com/brutasse/graphite-api"; - license = licenses.asl20; - }; -} diff --git a/pkgs/development/python-modules/graphite-api/flask-caching-rebased.patch b/pkgs/development/python-modules/graphite-api/flask-caching-rebased.patch deleted file mode 100644 index 2d4a2f29bc43..000000000000 --- a/pkgs/development/python-modules/graphite-api/flask-caching-rebased.patch +++ /dev/null @@ -1,132 +0,0 @@ -diff --git a/graphite_api/config.py b/graphite_api/config.py -index 5e1e382..dc033a8 100644 ---- a/graphite_api/config.py -+++ b/graphite_api/config.py -@@ -112,11 +112,11 @@ def configure(app): - app.cache = None - if 'cache' in config: - try: -- from flask.ext.cache import Cache -+ from flask_caching import Cache - except ImportError: - warnings.warn("'cache' is provided in the configuration but " -- "Flask-Cache is not installed. Please `pip install " -- "Flask-Cache`.") -+ "flask-caching is not installed. Please `pip " -+ "install flask-caching`.") - else: - cache_conf = {'CACHE_DEFAULT_TIMEOUT': 60, - 'CACHE_KEY_PREFIX': 'graphite-api:'} -diff --git a/requirements.txt b/requirements.txt -index c68b446..7826b0c 100644 ---- a/requirements.txt -+++ b/requirements.txt -@@ -1,5 +1,5 @@ - Flask --Flask-Cache -+Flask-Caching - cairocffi - pyparsing>=1.5.7 - pytz -diff --git a/setup.py b/setup.py -index 0337cbe..df07989 100644 ---- a/setup.py -+++ b/setup.py -@@ -38,7 +38,7 @@ setup( - extras_require={ - 'sentry': ['raven[flask]'], - 'cyanite': ['cyanite'], -- 'cache': ['Flask-Cache'], -+ 'cache': ['Flask-Caching'], - 'statsd': ['statsd'], - }, - zip_safe=False, -diff --git a/tests/test_render.py b/tests/test_render.py -index be5609d..a0e7190 100644 ---- a/tests/test_render.py -+++ b/tests/test_render.py -@@ -8,7 +8,7 @@ from graphite_api._vendor import whisper - from . import TestCase, WHISPER_DIR - - try: -- from flask.ext.cache import Cache -+ from flask_caching import Cache - except ImportError: - Cache = None - -diff --git a/tox.ini b/tox.ini -index 85a0abb..c820393 100644 ---- a/tox.ini -+++ b/tox.ini -@@ -47,7 +47,7 @@ basepython = python2.7 - deps = - {[testenv]deps} - Flask -- Flask-Cache -+ Flask-Caching - pyparsing - mock - -@@ -56,7 +56,7 @@ basepython = python3.3 - deps = - {[testenv]deps} - Flask -- Flask-Cache -+ Flask-Caching - pyparsing - - [testenv:py34] -@@ -66,7 +66,7 @@ commands = - deps = - {[testenv]deps} - Flask -- Flask-Cache -+ Flask-Caching - pyparsing - - [testenv:py35] -@@ -76,7 +76,7 @@ commands = - deps = - {[testenv]deps} - Flask -- Flask-Cache -+ Flask-Caching - pyparsing - - [testenv:pyparsing1] -@@ -84,7 +84,7 @@ basepython = python2.7 - deps = - {[testenv]deps} - Flask -- Flask-Cache -+ Flask-Caching - pyparsing==1.5.7 - mock - -@@ -93,7 +93,7 @@ basepython = pypy - deps = - {[testenv]deps} - Flask -- Flask-Cache -+ Flask-Caching - pyparsing - mock - -@@ -102,7 +102,7 @@ basepython = python2.7 - deps = - {[testenv]deps} - Flask<0.9 -- Flask-Cache -+ Flask-Caching - pyparsing - mock - -@@ -111,7 +111,7 @@ basepython = python2.7 - deps = - {[testenv]deps} - Flask<0.10 -- Flask-Cache -+ Flask-Caching - pyparsing - mock - diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 90e0b066047f..087417c9fb35 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -79,6 +79,7 @@ mapAliases ({ glances = throw "glances has moved to pkgs.glances"; # added 2020-20-28 google_api_python_client = google-api-python-client; # added 2021-03-19 googleapis_common_protos = googleapis-common-protos; # added 2021-03-19 + graphite_api = throw "graphite_api was removed, because it is no longer maintained"; # added 2022-07-10 graphite_beacon = throw "graphite_beacon was removed, because it is no longer maintained"; # added 2022-07-09 grpc_google_iam_v1 = grpc-google-iam-v1; # added 2021-08-21 ha-av = throw "ha-av was removed, because it is no longer maintained"; # added 2022-04-06 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index ce2da3d990b6..39eb6f690992 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3753,8 +3753,6 @@ in { grapheme = callPackage ../development/python-modules/grapheme { }; - graphite_api = callPackage ../development/python-modules/graphite-api { }; - graphite-web = callPackage ../development/python-modules/graphite-web { }; graphene = callPackage ../development/python-modules/graphene { }; From 6089b88a23a30f43f79d3105ae47f4201c9555e3 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 10 Jul 2022 11:56:17 +0200 Subject: [PATCH 109/133] python310Packages.aioaladdinconnect: init 0.1.20 --- .../aioaladdinconnect/default.nix | 39 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 41 insertions(+) create mode 100644 pkgs/development/python-modules/aioaladdinconnect/default.nix diff --git a/pkgs/development/python-modules/aioaladdinconnect/default.nix b/pkgs/development/python-modules/aioaladdinconnect/default.nix new file mode 100644 index 000000000000..7229f5a1e3fb --- /dev/null +++ b/pkgs/development/python-modules/aioaladdinconnect/default.nix @@ -0,0 +1,39 @@ +{ lib +, aiohttp +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +}: + +buildPythonPackage rec { + pname = "aioaladdinconnect"; + version = "0.1.20"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "mkmer"; + repo = "AIOAladdinConnect"; + rev = version; + hash = "sha256-JHGAJx1Hb/NKWZ+y1ACmVUiesYj1VVHnYCcP+XZGADs="; + }; + + propagatedBuildInputs = [ + aiohttp + ]; + + # Module has no tests + doCheck = false; + + pythonImportsCheck = [ + "AIOAladdinConnect" + ]; + + meta = with lib; { + description = "Library for controlling Genie garage doors connected to Aladdin Connect devices"; + homepage = "https://github.com/mkmer/AIOAladdinConnect"; + license = with licenses; [ mit ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index df044ef44b38..27e885d0a854 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -247,6 +247,8 @@ in { aioairzone = callPackage ../development/python-modules/aioairzone { }; + aioaladdinconnect = callPackage ../development/python-modules/aioaladdinconnect { }; + aioambient = callPackage ../development/python-modules/aioambient { }; aioapns = callPackage ../development/python-modules/aioapns { }; From af480a0ff3765c2d76bd44201cec7a1498a340fc Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 10 Jul 2022 11:58:21 +0200 Subject: [PATCH 110/133] home-assistant: update component-packages --- pkgs/servers/home-assistant/component-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 1c65fce6e7fe..a6e2ee6b77cf 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -61,7 +61,8 @@ aioairzone ]; "aladdin_connect" = ps: with ps; [ - ]; # missing inputs: AIOAladdinConnect + aioaladdinconnect + ]; "alarm_control_panel" = ps: with ps; [ ]; "alarmdecoder" = ps: with ps; [ @@ -3231,6 +3232,7 @@ "airtouch4" "airvisual" "airzone" + "aladdin_connect" "alarm_control_panel" "alarmdecoder" "alert" From 188c6197767a844a9359d7aaed06a0bf4225160e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 10 Jul 2022 12:28:57 +0200 Subject: [PATCH 111/133] python310Packages.pyialarm: 1.9.0 -> 2.0.0 --- pkgs/development/python-modules/pyialarm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyialarm/default.nix b/pkgs/development/python-modules/pyialarm/default.nix index 312ef8a99657..501f1497a3a7 100644 --- a/pkgs/development/python-modules/pyialarm/default.nix +++ b/pkgs/development/python-modules/pyialarm/default.nix @@ -8,14 +8,14 @@ buildPythonPackage rec { pname = "pyialarm"; - version = "1.9.0"; + version = "2.0.0"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "RyuzakiKK"; repo = pname; rev = "v${version}"; - sha256 = "sha256-mvi8cd9uVFvG1Jc3OeuEwuLjbuMjPRrNRHFUVe3g/NM="; + sha256 = "sha256-rJS6KgEy4iuiY6QRue6K6woyGefuTN7/4RLCu8cb8M4="; }; propagatedBuildInputs = [ From 94d47519c0f5eb66ba37daea551be7ac2d9bda01 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 10 Jul 2022 12:31:23 +0200 Subject: [PATCH 112/133] python310Packages.rokuecp: 0.16.0 -> 0.17.0 --- pkgs/development/python-modules/rokuecp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/rokuecp/default.nix b/pkgs/development/python-modules/rokuecp/default.nix index 23c113bc46dd..e584fcdda879 100644 --- a/pkgs/development/python-modules/rokuecp/default.nix +++ b/pkgs/development/python-modules/rokuecp/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "rokuecp"; - version = "0.16.0"; + version = "0.17.0"; format = "pyproject"; disabled = pythonOlder "3.9"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "ctalkington"; repo = "python-rokuecp"; rev = version; - hash = "sha256-MeugjIZorwO8d0Yb7bthI6f4NNo6GX9JrRbxrVSdWv0="; + hash = "sha256-M4eZzFphhc96Pf1bspD+Hvl9SUN1N72xnxdtVFiPc78="; }; nativeBuildInputs = [ From ef26741ec00ca7ebd8474da0e688fb2a63456a6f Mon Sep 17 00:00:00 2001 From: Pierre Bourdon Date: Sun, 10 Jul 2022 12:47:46 +0200 Subject: [PATCH 113/133] jadx: 1.3.5 -> 1.4.2 --- pkgs/tools/security/jadx/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/jadx/default.nix b/pkgs/tools/security/jadx/default.nix index 654104ada73e..21a0a3c61241 100644 --- a/pkgs/tools/security/jadx/default.nix +++ b/pkgs/tools/security/jadx/default.nix @@ -2,13 +2,13 @@ let pname = "jadx"; - version = "1.3.5"; + version = "1.4.2"; src = fetchFromGitHub { owner = "skylot"; repo = pname; rev = "v${version}"; - hash = "sha256-uDNHjajGqEeXOIC5SaluhHWOkA2j3LUvB6O3MHB2+YA="; + hash = "sha256-WSQyym9RMrCiWlb2O4Cd7/ra2UNTL8XsaSNnSTAmhjs="; }; deps = stdenv.mkDerivation { @@ -40,7 +40,7 @@ let ''; outputHashMode = "recursive"; - outputHash = "sha256-SFj3VPCIxEA2mj/xsibXZ1MDmV/BnmvQJUBav1gfEGM="; + outputHash = "sha256-LCF03nTC7T2YxlLIWO3zgrbJVTCQOU8Who9NIqvicb4="; }; in stdenv.mkDerivation { inherit pname version src; From 4af3088e43ca1bf251e6530ea1eabd45b4e732b5 Mon Sep 17 00:00:00 2001 From: Andreas Date: Tue, 5 Jul 2022 18:37:46 +0200 Subject: [PATCH 114/133] hwatch: 0.3.6 -> 0.3.7 --- pkgs/tools/misc/hwatch/default.nix | 31 +++++++++++++++++++----------- 1 file changed, 20 insertions(+), 11 deletions(-) diff --git a/pkgs/tools/misc/hwatch/default.nix b/pkgs/tools/misc/hwatch/default.nix index 259297eb494f..512603bd3286 100644 --- a/pkgs/tools/misc/hwatch/default.nix +++ b/pkgs/tools/misc/hwatch/default.nix @@ -1,26 +1,35 @@ -{ lib, stdenv, fetchFromGitHub, fetchpatch, rustPlatform }: +{ lib, fetchFromGitHub, rustPlatform, testers, hwatch, installShellFiles }: rustPlatform.buildRustPackage rec { pname = "hwatch"; - version = "0.3.6"; + version = "0.3.7"; src = fetchFromGitHub { owner = "blacknon"; repo = pname; - # prefix, because just "0.3.6' causes the download to silently fail: - # $ curl -v https://github.com/blacknon/hwatch/archive/0.3.6.tar.gz - # ... - # < HTTP/2 300 - # ... - # the given path has multiple possibilities: #, # rev = "refs/tags/${version}"; - sha256 = "sha256-uaAgA6DWwYVT9mQh55onW+qxIC2i9GVuimctTJpUgfA="; + sha256 = "sha256-FVqvwqsHkV/yK5okL1p6TiNUGDK2ZnzVNO4UDVkG+zM="; }; - cargoSha256 = "sha256-Xt3Z6ax3Y45KZhTYMBr/Rfx1o+ZAoPYj51SN5hnrXQM="; + cargoSha256 = "sha256-E4qh2cfpVNUa9OyJowSsaHU7pYiNu7IpxwISP0djVRA="; + + nativeBuildInputs = [ installShellFiles ]; + + postInstall = '' + installShellCompletion --cmd hwatch \ + --bash $src/completion/bash/hwatch-completion.bash \ + --fish $src/completion/fish/hwatch.fish \ + --zsh $src/completion/zsh/_hwatch \ + ''; + + passthru.tests.version = testers.testVersion { + package = hwatch; + command = "hwatch --version"; + version = version; + }; meta = with lib; { - homepage = "https://github.com/blackmon/hwatch"; + homepage = "https://github.com/blacknon/hwatch"; description= "Modern alternative to the watch command"; longDescription = '' A modern alternative to the watch command, records the differences in From 5f42ffd1bcba535f4df44d73278c0a9e14c5c836 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 10 Jul 2022 13:11:24 +0200 Subject: [PATCH 115/133] python310Packages.aioaladdinconnect: 0.1.20 -> 0.1.21 --- .../python-modules/aioaladdinconnect/default.nix | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/aioaladdinconnect/default.nix b/pkgs/development/python-modules/aioaladdinconnect/default.nix index 7229f5a1e3fb..3b32cb3f2aab 100644 --- a/pkgs/development/python-modules/aioaladdinconnect/default.nix +++ b/pkgs/development/python-modules/aioaladdinconnect/default.nix @@ -1,22 +1,21 @@ { lib , aiohttp , buildPythonPackage -, fetchFromGitHub +, fetchPypi , pythonOlder }: buildPythonPackage rec { pname = "aioaladdinconnect"; - version = "0.1.20"; + version = "0.1.21"; format = "setuptools"; disabled = pythonOlder "3.7"; - src = fetchFromGitHub { - owner = "mkmer"; - repo = "AIOAladdinConnect"; - rev = version; - hash = "sha256-JHGAJx1Hb/NKWZ+y1ACmVUiesYj1VVHnYCcP+XZGADs="; + src = fetchPypi { + pname = "AIOAladdinConnect"; + inherit version; + hash = "sha256-Zr9QLiQNmphPpAVnFVpoOlVbuWUVtWXIacYKAnth+E4="; }; propagatedBuildInputs = [ From cd8baca3bcbca45390d9da2e0603845c2e666243 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 10 Jul 2022 11:13:37 +0000 Subject: [PATCH 116/133] python310Packages.aiomusiccast: 0.14.4 -> 0.14.5 --- pkgs/development/python-modules/aiomusiccast/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aiomusiccast/default.nix b/pkgs/development/python-modules/aiomusiccast/default.nix index 1ca2cdcb519b..470e84eb6cce 100644 --- a/pkgs/development/python-modules/aiomusiccast/default.nix +++ b/pkgs/development/python-modules/aiomusiccast/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "aiomusiccast"; - version = "0.14.4"; + version = "0.14.5"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "vigonotion"; repo = "aiomusiccast"; rev = "refs/tags/${version}"; - hash = "sha256-vSf4Fcioz+ZrXCaFQQbHzhz7vOknCOEFJXduXJlO/wE="; + hash = "sha256-YssBrG4sFtQtrzKU/O/tWEVL9eq8dpszejY/1So5Mec="; }; postPatch = '' From 34aa4fe7a9b48c7e81c56f6f3f758726c619cf80 Mon Sep 17 00:00:00 2001 From: Ivan Jager Date: Sun, 10 Jul 2022 06:58:32 -0500 Subject: [PATCH 117/133] raspberrypi-bootloader: Update doc URL for config.txt options The old URL was redirecting to more generic Rasbperry Pi documentation. --- nixos/modules/system/boot/loader/raspberrypi/raspberrypi.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/system/boot/loader/raspberrypi/raspberrypi.nix b/nixos/modules/system/boot/loader/raspberrypi/raspberrypi.nix index 1023361f0b1f..367feb5e88ec 100644 --- a/nixos/modules/system/boot/loader/raspberrypi/raspberrypi.nix +++ b/nixos/modules/system/boot/loader/raspberrypi/raspberrypi.nix @@ -86,7 +86,7 @@ in type = types.nullOr types.lines; description = '' Extra options that will be appended to /boot/config.txt file. - For possible values, see: https://www.raspberrypi.org/documentation/configuration/config-txt/ + For possible values, see: https://www.raspberrypi.com/documentation/computers/config_txt.html ''; }; }; From dd899b3c745b5d046f3ed21382638d614551edee Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 10 Jul 2022 05:47:49 +0000 Subject: [PATCH 118/133] libadwaita: 1.1.2 -> 1.1.3 --- pkgs/development/libraries/libadwaita/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libadwaita/default.nix b/pkgs/development/libraries/libadwaita/default.nix index 0ea75e2a2529..ef2daeb7074c 100644 --- a/pkgs/development/libraries/libadwaita/default.nix +++ b/pkgs/development/libraries/libadwaita/default.nix @@ -21,7 +21,7 @@ stdenv.mkDerivation rec { pname = "libadwaita"; - version = "1.1.2"; + version = "1.1.3"; outputs = [ "out" "dev" "devdoc" ]; outputBin = "devdoc"; # demo app @@ -31,7 +31,7 @@ stdenv.mkDerivation rec { owner = "GNOME"; repo = "libadwaita"; rev = version; - hash = "sha256-OyjuUWfKE8GoGFCmaCS7YAf5GAS0VwMPht7cvFtkA/Y="; + hash = "sha256-Mjv4Z9YaIT9atD8ekepBAA1ZV30kWnMnV8+kOuGULnw="; }; nativeBuildInputs = [ From 429fc9aaf74ac1bbdaaf8d561d736d536a06a5ef Mon Sep 17 00:00:00 2001 From: Emery Hemingway Date: Thu, 2 Jun 2022 10:38:06 -0500 Subject: [PATCH 119/133] nixos/hedgedoc: convert to settings-style configuration Replace "services.hedgedoc.configuration" with ".settings" to be consistent with RFC0042. This allows control of settings not declared in the module. --- nixos/modules/services/web-apps/hedgedoc.nix | 32 +++++++++++++++----- nixos/tests/hedgedoc.nix | 4 +-- 2 files changed, 26 insertions(+), 10 deletions(-) diff --git a/nixos/modules/services/web-apps/hedgedoc.nix b/nixos/modules/services/web-apps/hedgedoc.nix index 22270609dbcc..909b51750d85 100644 --- a/nixos/modules/services/web-apps/hedgedoc.nix +++ b/nixos/modules/services/web-apps/hedgedoc.nix @@ -13,17 +13,22 @@ let then "hedgedoc" else "codimd"; + settingsFormat = pkgs.formats.json {}; + prettyJSON = conf: pkgs.runCommandLocal "hedgedoc-config.json" { nativeBuildInputs = [ pkgs.jq ]; } '' - echo '${builtins.toJSON conf}' | jq \ - '{production:del(.[]|nulls)|del(.[][]?|nulls)}' > $out + jq '{production:del(.[]|nulls)|del(.[][]?|nulls)}' \ + < ${settingsFormat.generate "hedgedoc-ugly.json" cfg.settings} \ + > $out ''; in { imports = [ (mkRenamedOptionModule [ "services" "codimd" ] [ "services" "hedgedoc" ]) + (mkRenamedOptionModule + [ "services" "hedgedoc" "configuration" ] [ "services" "hedgedoc" "settings" ]) ]; options.services.hedgedoc = { @@ -45,7 +50,7 @@ in ''; }; - configuration = { + settings = let options = { debug = mkEnableOption "debug mode"; domain = mkOption { type = types.nullOr types.str; @@ -960,6 +965,16 @@ in default = null; description = "Configure the SAML integration."; }; + }; in lib.mkOption { + type = lib.types.submodule { + freeformType = settingsFormat.type; + inherit options; + }; + description = '' + HedgeDoc configuration, see + + for documentation. + ''; }; environmentFile = mkOption { @@ -1000,12 +1015,13 @@ in Package that provides HedgeDoc. ''; }; + }; config = mkIf cfg.enable { assertions = [ - { assertion = cfg.configuration.db == {} -> ( - cfg.configuration.dbURL != "" && cfg.configuration.dbURL != null + { assertion = cfg.settings.db == {} -> ( + cfg.settings.dbURL != "" && cfg.settings.dbURL != null ); message = "Database configuration for HedgeDoc missing."; } ]; @@ -1026,12 +1042,12 @@ in preStart = '' ${pkgs.envsubst}/bin/envsubst \ -o ${cfg.workDir}/config.json \ - -i ${prettyJSON cfg.configuration} - mkdir -p ${cfg.configuration.uploadsPath} + -i ${prettyJSON cfg.settings} + mkdir -p ${cfg.settings.uploadsPath} ''; serviceConfig = { WorkingDirectory = cfg.workDir; - StateDirectory = [ cfg.workDir cfg.configuration.uploadsPath ]; + StateDirectory = [ cfg.workDir cfg.settings.uploadsPath ]; ExecStart = "${cfg.package}/bin/hedgedoc"; EnvironmentFile = mkIf (cfg.environmentFile != null) [ cfg.environmentFile ]; Environment = [ diff --git a/nixos/tests/hedgedoc.nix b/nixos/tests/hedgedoc.nix index 657d49c555e9..410350d83627 100644 --- a/nixos/tests/hedgedoc.nix +++ b/nixos/tests/hedgedoc.nix @@ -11,7 +11,7 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: services = { hedgedoc = { enable = true; - configuration.dbURL = "sqlite:///var/lib/hedgedoc/hedgedoc.db"; + settings.dbURL = "sqlite:///var/lib/hedgedoc/hedgedoc.db"; }; }; }; @@ -21,7 +21,7 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: services = { hedgedoc = { enable = true; - configuration.dbURL = "postgres://hedgedoc:\${DB_PASSWORD}@localhost:5432/hedgedocdb"; + settings.dbURL = "postgres://hedgedoc:\${DB_PASSWORD}@localhost:5432/hedgedocdb"; /* * Do not use pkgs.writeText for secrets as From b0c5f3dd4c186fd630336b8cf171ff06b58ed65c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vesa=20Hagstr=C3=B6m?= Date: Sun, 10 Jul 2022 13:29:50 +0300 Subject: [PATCH 120/133] dhall-grafana: Update dhall-grafana version Updated to 49a3ee4801cf64f479e3f0bad839a5dd8e5b4932 --- pkgs/development/dhall-modules/dhall-grafana.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/dhall-modules/dhall-grafana.nix b/pkgs/development/dhall-modules/dhall-grafana.nix index d91b9c21895d..3314beb225d1 100644 --- a/pkgs/development/dhall-modules/dhall-grafana.nix +++ b/pkgs/development/dhall-modules/dhall-grafana.nix @@ -4,8 +4,8 @@ buildDhallGitHubPackage { name = "grafana"; owner = "weeezes"; repo = "dhall-grafana"; - # 2021-11-12 - rev = "d5630dc55deacf5100a99802a4df1d9680b263b3"; - sha256 = "01320hpqgr5r4grsydmdl9yznmly1ssnlc9gcwa8rj1ah0a8xlgz"; + # 2022-07-10 + rev = "49a3ee4801cf64f479e3f0bad839a5dd8e5b4932"; + sha256 = "1i8b98xx20b73afkmr78l4x4ci3dk2sc737hxkcaxp3sgncwnz1b"; dependencies = [ Prelude ]; } From 825e91fc33e816a4da1794f5e5c65cd01df91617 Mon Sep 17 00:00:00 2001 From: Profpatsch Date: Sun, 10 Jul 2022 15:25:47 +0200 Subject: [PATCH 121/133] sqlite: make package options slightly more obvious No changes to the drv. --- pkgs/development/libraries/sqlite/default.nix | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/sqlite/default.nix b/pkgs/development/libraries/sqlite/default.nix index b0333a094074..77ce108e267a 100644 --- a/pkgs/development/libraries/sqlite/default.nix +++ b/pkgs/development/libraries/sqlite/default.nix @@ -1,7 +1,12 @@ -{ lib, stdenv, fetchurl, zlib, interactive ? false, readline, ncurses -, python3Packages +{ lib, stdenv, fetchurl, zlib, readline, ncurses + +# for tests +, python3Packages, sqldiff, sqlite-analyzer + +# uses readline & ncurses for a better interactive experience if set to true +, interactive ? false +# TODO: can be removed since 3.36 since it is the default now. , enableDeserialize ? false -, sqldiff, sqlite-analyzer }: with lib; From 49548cace627e0ac5dbfda31c5100f669c27324d Mon Sep 17 00:00:00 2001 From: Jules Aguillon Date: Thu, 7 Jul 2022 10:57:56 +0200 Subject: [PATCH 122/133] ocamlformat_0_23_0: init New release with no changes to the dependencies. --- pkgs/development/tools/ocaml/ocamlformat/default.nix | 6 +++++- pkgs/development/tools/ocaml/ocamlformat/generic.nix | 1 + pkgs/top-level/all-packages.nix | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/ocaml/ocamlformat/default.nix b/pkgs/development/tools/ocaml/ocamlformat/default.nix index 84d3b850a5ff..a441d9745200 100644 --- a/pkgs/development/tools/ocaml/ocamlformat/default.nix +++ b/pkgs/development/tools/ocaml/ocamlformat/default.nix @@ -27,5 +27,9 @@ rec { version = "0.22.4"; }; - ocamlformat = ocamlformat_0_22_4; + ocamlformat_0_23_0 = mkOCamlformat { + version = "0.23.0"; + }; + + ocamlformat = ocamlformat_0_23_0; } diff --git a/pkgs/development/tools/ocaml/ocamlformat/generic.nix b/pkgs/development/tools/ocaml/ocamlformat/generic.nix index 97cc9699920b..5e58699fa745 100644 --- a/pkgs/development/tools/ocaml/ocamlformat/generic.nix +++ b/pkgs/development/tools/ocaml/ocamlformat/generic.nix @@ -12,6 +12,7 @@ let src = "0.20.1" = "sha256-fTpRZFQW+ngoc0T6A69reEUAZ6GmHkeQvxspd5zRAjU="; "0.21.0" = "sha256-KhgX9rxYH/DM6fCqloe4l7AnJuKrdXSe6Y1XY3BXMy0="; "0.22.4" = "sha256-61TeK4GsfMLmjYGn3ICzkagbc3/Po++Wnqkb2tbJwGA="; + "0.23.0" = "sha256-m9Pjz7DaGy917M1GjyfqG5Lm5ne7YSlJF2SVcDHe3+0="; }."${version}"; }; ocamlPackages = ocaml-ng.ocamlPackages; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index da06166c8993..802cb1ccf30b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -13895,7 +13895,7 @@ with pkgs; inherit (callPackage ../development/tools/ocaml/ocamlformat { }) ocamlformat # latest version ocamlformat_0_19_0 ocamlformat_0_20_0 ocamlformat_0_20_1 ocamlformat_0_21_0 - ocamlformat_0_22_4; + ocamlformat_0_22_4 ocamlformat_0_23_0; orc = callPackage ../development/compilers/orc { }; From 3ea8ed7d7e3fcba3d8e9286175077544c6f5faf9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Th=C3=A9o=20Zimmermann?= Date: Wed, 6 Jul 2022 20:40:19 +0200 Subject: [PATCH 123/133] Split out CoqIDE by default when Coq >= 8.14. --- .../science/logic/coq/default.nix | 5 +- .../coq-modules/coqide/default.nix | 61 +++++++++++++++++++ pkgs/top-level/coq-packages.nix | 1 + 3 files changed, 65 insertions(+), 2 deletions(-) create mode 100644 pkgs/development/coq-modules/coqide/default.nix diff --git a/pkgs/applications/science/logic/coq/default.nix b/pkgs/applications/science/logic/coq/default.nix index 5e516ca56385..06d4a915c91d 100644 --- a/pkgs/applications/science/logic/coq/default.nix +++ b/pkgs/applications/science/logic/coq/default.nix @@ -8,10 +8,10 @@ { lib, stdenv, fetchzip, writeText, pkg-config, gnumake42 , customOCamlPackages ? null , ocamlPackages_4_05, ocamlPackages_4_09, ocamlPackages_4_10, ocamlPackages_4_12, ncurses -, buildIde ? true +, buildIde ? null # default is true for Coq < 8.14 and false for Coq >= 8.14 , glib, gnome, wrapGAppsHook, makeDesktopItem, copyDesktopItems , csdp ? null -, version, coq-version ? null, +, version, coq-version ? null }@args: let lib' = lib; in let lib = import ../../../../build-support/coq/extra-lib.nix {lib = lib';}; in @@ -59,6 +59,7 @@ let version = fetched.version; coq-version = args.coq-version or (if version != "dev" then versions.majorMinor version else "dev"); coqAtLeast = v: coq-version == "dev" || versionAtLeast coq-version v; + buildIde = args.buildIde or (!coqAtLeast "8.14"); ideFlags = optionalString (buildIde && !coqAtLeast "8.10") "-lablgtkdir ${ocamlPackages.lablgtk}/lib/ocaml/*/site-lib/lablgtk2 -coqide opt"; csdpPatch = if csdp != null then '' diff --git a/pkgs/development/coq-modules/coqide/default.nix b/pkgs/development/coq-modules/coqide/default.nix new file mode 100644 index 000000000000..a827057a118b --- /dev/null +++ b/pkgs/development/coq-modules/coqide/default.nix @@ -0,0 +1,61 @@ +{ lib +, makeDesktopItem +, copyDesktopItems +, wrapGAppsHook +, glib +, gnome +, mkCoqDerivation +, coq +, version ? null }: + +with lib; mkCoqDerivation rec { + pname = "coqide"; + inherit version; + + inherit (coq) src; + release."${coq.version}" = {}; + + defaultVersion = if versions.isGe "8.14" coq.version then coq.version else null; + + preConfigure = '' + patchShebangs dev/tools/ + ''; + prefixKey = "-prefix "; + + useDune2 = true; + + buildInputs = [ + copyDesktopItems + wrapGAppsHook + coq.ocamlPackages.lablgtk3-sourceview3 + glib + gnome.adwaita-icon-theme + ]; + + buildPhase = '' + runHook preBuild + dune build -p ${pname} -j $NIX_BUILD_CORES + runHook postBuild + ''; + installPhase = '' + runHook preInstall + dune install --prefix $out ${pname} + runHook postInstall + ''; + + desktopItems = makeDesktopItem { + name = "coqide"; + exec = "coqide"; + icon = "coq"; + desktopName = "CoqIDE"; + comment = "Graphical interface for the Coq proof assistant"; + categories = [ "Development" "Science" "Math" "IDE" "GTK" ]; + }; + + meta = with lib; { + homepage = "https://coq.inria.fr"; + description = "The CoqIDE user interface for the Coq proof assistant"; + license = licenses.lgpl21Plus; + maintainers = [ maintainers.Zimmi48 ]; + }; +} diff --git a/pkgs/top-level/coq-packages.nix b/pkgs/top-level/coq-packages.nix index 91894bfaa9e7..e013bf7cd1bc 100644 --- a/pkgs/top-level/coq-packages.nix +++ b/pkgs/top-level/coq-packages.nix @@ -36,6 +36,7 @@ let coq-record-update = callPackage ../development/coq-modules/coq-record-update { }; coqeal = callPackage ../development/coq-modules/coqeal {}; coqhammer = callPackage ../development/coq-modules/coqhammer {}; + coqide = callPackage ../development/coq-modules/coqide {}; coqprime = callPackage ../development/coq-modules/coqprime {}; coqtail-math = callPackage ../development/coq-modules/coqtail-math {}; coquelicot = callPackage ../development/coq-modules/coquelicot {}; From d747f7993879edf21f789778e17aa8902ed8e2b8 Mon Sep 17 00:00:00 2001 From: devhell Date: Sun, 10 Jul 2022 14:57:46 +0100 Subject: [PATCH 124/133] termusic: 0.6.16 -> 0.6.17 --- pkgs/applications/audio/termusic/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/audio/termusic/default.nix b/pkgs/applications/audio/termusic/default.nix index 80cebab40c31..3d89289c747a 100644 --- a/pkgs/applications/audio/termusic/default.nix +++ b/pkgs/applications/audio/termusic/default.nix @@ -7,14 +7,14 @@ rustPlatform.buildRustPackage rec { pname = "termusic"; - version = "0.6.16"; + version = "0.6.17"; src = fetchCrate { inherit pname version; - sha256 = "sha256-2xPm4DahTv3+T92qMYuistfPTlZaJUushP0yrgHYqco="; + sha256 = "sha256-diZl+izb55EFQaL6soLVNrFhoi7AOFkFnVcAU2XlI+c="; }; - cargoHash = "sha256-oPRW1x/hXhT8LBW3Z3jMBoal5zC6jKKOTo/RrDwgeJU="; + cargoHash = "sha256-VW+tMnjuVnf/PsBAoMnOxbyNna1UpGB/5V52XSzBJr8="; nativeBuildInputs = [ pkg-config ]; buildInputs = [ alsa-lib ]; From d921864be3076cdd20c4bca546da0852b0114e60 Mon Sep 17 00:00:00 2001 From: Jonas Heinrich Date: Fri, 8 Jul 2022 11:23:28 +0200 Subject: [PATCH 125/133] python310Packages.softlayer: 5.9.9 -> 6.1.0 --- .../python-modules/softlayer/default.nix | 29 ++++++++++++++++--- 1 file changed, 25 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/softlayer/default.nix b/pkgs/development/python-modules/softlayer/default.nix index b66009639773..6c3df4eb6f98 100644 --- a/pkgs/development/python-modules/softlayer/default.nix +++ b/pkgs/development/python-modules/softlayer/default.nix @@ -14,20 +14,28 @@ , testtools , tkinter , urllib3 +, prettytable +, rich +, zeep }: buildPythonPackage rec { pname = "softlayer"; - version = "5.9.9"; + version = "6.1.0"; disabled = pythonOlder "3.5"; src = fetchFromGitHub { owner = pname; repo = "softlayer-python"; rev = "v${version}"; - sha256 = "sha256-LskPz5KXOi7olb3+DUP9uEFESQeo6ec/ZLx9B/w6Ni0="; + sha256 = "sha256-T49KVAsgcAZySkaJi47IrFcMHGZvEkGDjPWsdMarzwM="; }; + postPatch = '' + substituteInPlace setup.py \ + --replace 'rich == 12.3.0' 'rich >= 12.3.0' + ''; + propagatedBuildInputs = [ click prompt-toolkit @@ -35,6 +43,8 @@ buildPythonPackage rec { pygments requests urllib3 + prettytable + rich ]; checkInputs = [ @@ -43,15 +53,26 @@ buildPythonPackage rec { sphinx testtools tkinter + zeep + ]; + + # Otherwise soap_tests.py will fail to create directory + # Permission denied: '/homeless-shelter' + preCheck = '' + export HOME=$(mktemp -d) + ''; + + disabledTestPaths = [ + # Test fails with ConnectionError trying to connect to api.softlayer.com + "tests/transports/soap_tests.py" ]; pythonImportsCheck = [ "SoftLayer" ]; meta = with lib; { - broken = (stdenv.isLinux && stdenv.isAarch64) || stdenv.isDarwin; description = "Python libraries that assist in calling the SoftLayer API"; homepage = "https://github.com/softlayer/softlayer-python"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ onny ]; }; } From 22201396c911e9dac287a49463d6cc824a3c0ef0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sun, 10 Jul 2022 18:28:37 +0200 Subject: [PATCH 126/133] etcher: 1.7.3 -> 1.7.9 --- pkgs/tools/misc/etcher/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/etcher/default.nix b/pkgs/tools/misc/etcher/default.nix index a2a7b59e46f9..24d0c5c43dfd 100644 --- a/pkgs/tools/misc/etcher/default.nix +++ b/pkgs/tools/misc/etcher/default.nix @@ -14,8 +14,8 @@ let throwSystem = throw "Unsupported system: ${stdenv.hostPlatform.system}"; sha256 = { - "x86_64-linux" = "1yj6ybc99nqpzv2wjmvi7khfb5viwlb2rbjdpvgr4pmlzmiv7n2k"; - "i686-linux" = "09ddcqxw1jhl8v461ngdgj2l4infn2xiwvaqxi6qp3swci627vmz"; + "x86_64-linux" = "1rcidar97nnpjb163x9snnnhw1z1ld4asgbd5dxpzdh8hikh66ll"; + "i686-linux" = "1jll4i0j9kh78kl10s596xxs60gy7cnlafgpk89861yihj0i73a5"; }."${system}" or throwSystem; arch = { @@ -27,7 +27,7 @@ in stdenv.mkDerivation rec { pname = "etcher"; - version = "1.7.3"; + version = "1.7.9"; src = fetchurl { url = "https://github.com/balena-io/etcher/releases/download/v${version}/balena-etcher-electron_${version}_${arch}.deb"; From 60d0de8a48b3f1f45d1881079348d506039c5f10 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Sun, 10 Jul 2022 15:59:33 +0200 Subject: [PATCH 127/133] =?UTF-8?q?ocamlPackages.erm=5Fxmpp:=200.3+2020031?= =?UTF-8?q?7=20=E2=86=92=200.3+20220404?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/ocaml-modules/erm_xmpp/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/ocaml-modules/erm_xmpp/default.nix b/pkgs/development/ocaml-modules/erm_xmpp/default.nix index 1507154d2f64..452499aa401f 100644 --- a/pkgs/development/ocaml-modules/erm_xmpp/default.nix +++ b/pkgs/development/ocaml-modules/erm_xmpp/default.nix @@ -3,14 +3,14 @@ }: stdenv.mkDerivation rec { - version = "0.3+20200317"; + version = "0.3+20220404"; pname = "ocaml${ocaml.version}-erm_xmpp"; src = fetchFromGitHub { owner = "hannesm"; repo = "xmpp"; - rev = "7fa5bea252671fd88625c6af109998b879ca564f"; - sha256 = "0spzyd9kbyizzwl8y3mq8z19zlkzxnkh2fppry4lyc7vaw7bqrwq"; + rev = "e54d54e142ac9770c37e144693473692bf473530"; + sha256 = "sha256-Ize8Em4LI54Cy1Xuzr9BjQGV7JMr3W6KI1YzI8G1q/U="; }; nativeBuildInputs = [ ocaml findlib ocamlbuild camlp4 ]; From 98ac43a1cf689ecabe448489b5505107ee893ce9 Mon Sep 17 00:00:00 2001 From: Shawn8901 Date: Sun, 10 Jul 2022 20:32:27 +0200 Subject: [PATCH 128/133] zrepl: add package option to module (#179189) Co-authored-by: Sandro --- nixos/modules/services/backup/zrepl.nix | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/backup/zrepl.nix b/nixos/modules/services/backup/zrepl.nix index 73f5e4d9f6d7..1b4216ed1714 100644 --- a/nixos/modules/services/backup/zrepl.nix +++ b/nixos/modules/services/backup/zrepl.nix @@ -13,6 +13,13 @@ in services.zrepl = { enable = mkEnableOption "zrepl"; + package = mkOption { + type = types.package; + default = pkgs.zrepl; + defaultText = literalExpression "pkgs.zrepl"; + description = "Which package to use for zrepl"; + }; + settings = mkOption { default = { }; description = '' @@ -30,14 +37,14 @@ in ### Implementation ### config = mkIf cfg.enable { - environment.systemPackages = [ pkgs.zrepl ]; + environment.systemPackages = [ cfg.package ]; # zrepl looks for its config in this location by default. This # allows the use of e.g. `zrepl signal wakeup ` without having # to specify the storepath of the config. environment.etc."zrepl/zrepl.yml".source = configFile; - systemd.packages = [ pkgs.zrepl ]; + systemd.packages = [ cfg.package ]; # Note that pkgs.zrepl copies and adapts the upstream systemd unit, and # the fields defined here only override certain fields from that unit. From 341b9564bb7d9f69b9e804d956680c8d2ebf61b2 Mon Sep 17 00:00:00 2001 From: Matthieu Coudron Date: Sat, 25 Jun 2022 19:35:48 +0200 Subject: [PATCH 129/133] vimUtils: remove vam support having this many (complex) options not only is hard to maintain but I cant see the benefit of these options now that vim supports packages --- doc/languages-frameworks/vim.section.md | 98 +-------------- .../editors/vim/plugins/vim-utils.nix | 114 ++---------------- pkgs/test/vim/default.nix | 32 ----- 3 files changed, 11 insertions(+), 233 deletions(-) diff --git a/doc/languages-frameworks/vim.section.md b/doc/languages-frameworks/vim.section.md index 98173d7b2afb..ec0e60389155 100644 --- a/doc/languages-frameworks/vim.section.md +++ b/doc/languages-frameworks/vim.section.md @@ -5,11 +5,9 @@ and additional libraries. Loading can be deferred; see examples. -At the moment we support three different methods for managing plugins: +At the moment we support two different methods for managing plugins: - Vim packages (*recommended*) -- VAM (=vim-addon-manager) -- Pathogen - vim-plug ## Custom configuration {#custom-configuration} @@ -213,100 +211,6 @@ neovim.override { } ``` -## Managing plugins with VAM {#managing-plugins-with-vam} - -### Handling dependencies of Vim plugins {#handling-dependencies-of-vim-plugins} - -VAM introduced .json files supporting dependencies without versioning -assuming that "using latest version" is ok most of the time. - -### Example {#example} - -First create a vim-scripts file having one plugin name per line. Example: - -```vim -"tlib" -{'name': 'vim-addon-sql'} -{'filetype_regex': '\%(vim)$', 'names': ['reload', 'vim-dev-plugin']} -``` - -A discrete vim-scripts file can be read by VAM as well like this: - -```vim -call vam#Scripts(expand('~/.vim-scripts'), {}) -``` - -Create a default.nix file: - -```nix -{ nixpkgs ? import {}, compiler ? "ghc7102" }: -nixpkgs.vim_configurable.customize { name = "vim"; vimrcConfig.vam.pluginDictionaries = [ "vim-addon-vim2nix" ]; } -``` - -Create a generate.vim file: - -```vim -ActivateAddons vim-addon-vim2nix -let vim_scripts = "vim-scripts" -call nix#ExportPluginsForNix({ -\ 'path_to_nixpkgs': eval('{"'.substitute(substitute(substitute($NIX_PATH, ':', ',', 'g'), '=',':', 'g'), '\([:,]\)', '"\1"',"g").'"}')["nixpkgs"], -\ 'cache_file': '/tmp/vim2nix-cache', -\ 'try_catch': 0, -\ 'plugin_dictionaries': ["vim-addon-manager"]+map(readfile(vim_scripts), 'eval(v:val)') -\ }) -``` - -Then run - -```bash -nix-shell -p vimUtils.vim_with_vim2nix --command "vim -c 'source generate.vim'" -``` - -You should get a Vim buffer with the nix derivations (output1) and vam.pluginDictionaries (output2). -You can add your Vim to your system's configuration file like this and start it by "vim-my": - -```nix -my-vim = - let plugins = let inherit (vimUtils) buildVimPluginFrom2Nix; in { - copy paste output1 here - }; in vim_configurable.customize { - name = "vim-my"; - - vimrcConfig.vam.knownPlugins = plugins; # optional - vimrcConfig.vam.pluginDictionaries = [ - copy paste output2 here - ]; - - }; -``` - -Sample output1: - -```nix -"reload" = buildVimPluginFrom2Nix { # created by nix#NixDerivation - name = "reload"; - src = fetchgit { - url = "https://github.com/xolox/vim-reload"; - rev = "0a601a668727f5b675cb1ddc19f6861f3f7ab9e1"; - sha256 = "0vb832l9yxj919f5hfg6qj6bn9ni57gnjd3bj7zpq7d4iv2s4wdh"; - }; - dependencies = ["nim-misc"]; - -}; -[...] -``` - -Sample output2: - -```nix -[ - ''vim-addon-manager'' - ''tlib'' - { "name" = ''vim-addon-sql''; } - { "filetype_regex" = ''\%(vim)$$''; "names" = [ ''reload'' ''vim-dev-plugin'' ]; } -] -``` - ## Adding new plugins to nixpkgs {#adding-new-plugins-to-nixpkgs} Nix expressions for Vim plugins are stored in [pkgs/applications/editors/vim/plugins](https://github.com/NixOS/nixpkgs/tree/master/pkgs/applications/editors/vim/plugins). For the vast majority of plugins, Nix expressions are automatically generated by running [`./update.py`](https://github.com/NixOS/nixpkgs/blob/master/pkgs/applications/editors/vim/plugins/update.py). This creates a [generated.nix](https://github.com/NixOS/nixpkgs/blob/master/pkgs/applications/editors/vim/plugins/generated.nix) file based on the plugins listed in [vim-plugin-names](https://github.com/NixOS/nixpkgs/blob/master/pkgs/applications/editors/vim/plugins/vim-plugin-names). Plugins are listed in alphabetical order in `vim-plugin-names` using the format `[github username]/[repository]@[gitref]`. For example https://github.com/scrooloose/nerdtree becomes `scrooloose/nerdtree`. diff --git a/pkgs/applications/editors/vim/plugins/vim-utils.nix b/pkgs/applications/editors/vim/plugins/vim-utils.nix index 4c6bb5d0da0f..60d4856cae6f 100644 --- a/pkgs/applications/editors/vim/plugins/vim-utils.nix +++ b/pkgs/applications/editors/vim/plugins/vim-utils.nix @@ -33,24 +33,6 @@ vim-with-plugins in PATH: # To automatically load a plugin when opening a filetype, add vimrc lines like: # autocmd FileType php :packadd phpCompletion }; - - # plugins can also be managed by VAM - vimrcConfig.vam.knownPlugins = pkgs.vimPlugins; # optional - vimrcConfig.vam.pluginDictionaries = [ - # load always - { name = "youcompleteme"; } - { names = ["youcompleteme" "foo"]; } - - # only load when opening a .php file - { name = "phpCompletion"; ft_regex = "^php\$"; } - { name = "phpCompletion"; filename_regex = "^.php\$"; } - - # provide plugin which can be loaded manually: - { name = "phpCompletion"; tag = "lazy"; } - - # full documentation at github.com/MarcWeber/vim-addon-manager - ]; - }; WHAT IS A VIM PLUGIN? @@ -278,7 +260,7 @@ let plugins = findDependenciesRecursively (map (pluginToDrv knownPlugins) pathogen.pluginNames); - pathogenPackages.pathogen = lib.warn "'pathogen' attribute is deprecated. Use 'packages' instead in your vim configuration" { + pathogenPackages.pathogen = { start = plugins; }; in @@ -313,71 +295,26 @@ let yet */ - vamImpl = lib.optionalString (vam != null) - (let + vamImpl = + let knownPlugins = vam.knownPlugins or vimPlugins; # plugins specified by the user specifiedPlugins = map (pluginToDrv knownPlugins) (lib.concatMap vamDictToNames vam.pluginDictionaries); # plugins with dependencies plugins = findDependenciesRecursively specifiedPlugins; - - # Convert scalars, lists, and attrs, to VimL equivalents - toVimL = x: - if builtins.isString x then "'${lib.replaceStrings [ "\n" "'" ] [ "\n\\ " "''" ] x}'" - else if builtins.isAttrs x && builtins ? out then toVimL x # a derivation - else if builtins.isAttrs x then "{${lib.concatStringsSep ", " (lib.mapAttrsToList (n: v: "${toVimL n}: ${toVimL v}") x)}}" - else if builtins.isList x then "[${lib.concatMapStringsSep ", " toVimL x}]" - else if builtins.isInt x || builtins.isFloat x then builtins.toString x - else if builtins.isBool x then (if x then "1" else "0") - else throw "turning ${lib.generators.toPretty {} x} into a VimL thing not implemented yet"; - - in assert builtins.hasAttr "vim-addon-manager" knownPlugins; - '' - filetype indent plugin on | syn on - - let g:nix_plugin_locations = {} - ${lib.concatMapStrings (plugin: '' - let g:nix_plugin_locations['${plugin.pname}'] = "${plugin.rtp}" - '') plugins} - let g:nix_plugin_locations['vim-addon-manager'] = "${knownPlugins.vim-addon-manager.rtp}" - - let g:vim_addon_manager = {} - - if exists('g:nix_plugin_locations') - " nix managed config - - " override default function making VAM aware of plugin locations: - fun! NixPluginLocation(name) - let path = get(g:nix_plugin_locations, a:name, "") - return path == "" ? vam#DefaultPluginDirFromName(a:name) : path - endfun - let g:vim_addon_manager.plugin_dir_by_name = 'NixPluginLocation' - " tell Vim about VAM: - let &rtp.=(empty(&rtp)?"":','). g:nix_plugin_locations['vim-addon-manager'] - else - " standalone config - - let &rtp.=(empty(&rtp)?"":',').c.plugin_root_dir.'/vim-addon-manager' - if !isdirectory(c.plugin_root_dir.'/vim-addon-manager/autoload') - " checkout VAM - execute '!git clone --depth=1 https://github.com/MarcWeber/vim-addon-manager ' - \ shellescape(c.plugin_root_dir.'/vim-addon-manager', 1) - endif - endif - - " tell vam which plugins to load, and when: - let l = [] - ${lib.concatMapStrings (p: "call add(l, ${toVimL p})\n") vam.pluginDictionaries} - call vam#Scripts(l, {}) - ''); + vamPackages.vam = { + start = plugins; + }; + in + nativeImpl vamPackages; entries = [ beforePlugins - vamImpl ] + ++ lib.optional (vam != null) (lib.warn "'vam' attribute is deprecated. Use 'packages' instead in your vim configuration" vamImpl) ++ lib.optional (packages != null && packages != []) (nativeImpl packages) - ++ lib.optional (pathogen != null) pathogenImpl + ++ lib.optional (pathogen != null) (lib.warn "'pathogen' attribute is deprecated. Use 'packages' instead in your vim configuration" pathogenImpl) ++ lib.optional (plug != null) plugImpl ++ [ customRC ]; @@ -468,37 +405,6 @@ rec { vimWithRC = throw "vimWithRC was removed, please use vim.customize instead"; - pluginnames2Nix = {name, namefiles} : vim_configurable.customize { - inherit name; - vimrcConfig.vam.knownPlugins = vimPlugins; - vimrcConfig.vam.pluginDictionaries = ["vim2nix"]; - vimrcConfig.customRC = '' - " Yes - this is impure and will create the cache file and checkout vim-pi - " into ~/.vim/vim-addons - let g:vim_addon_manager.plugin_root_dir = "/tmp/vim2nix-".$USER - if !isdirectory(g:vim_addon_manager.plugin_root_dir) - call mkdir(g:vim_addon_manager.plugin_root_dir) - else - echom repeat("=", 80) - echom "WARNING: reusing cache directory :".g:vim_addon_manager.plugin_root_dir - echom repeat("=", 80) - endif - let opts = {} - let opts.nix_prefetch_git = "${nix-prefetch-git}/bin/nix-prefetch-git" - let opts.nix_prefetch_hg = "${nix-prefetch-hg}/bin/nix-prefetch-hg" - let opts.cache_file = g:vim_addon_manager.plugin_root_dir.'/cache' - let opts.plugin_dictionaries = [] - ${lib.concatMapStrings (file: "let opts.plugin_dictionaries += map(readfile(\"${file}\"), 'eval(v:val)')\n") namefiles } - - " uncomment for debugging failures - " let opts.try_catch = 0 - - " add more files - " let opts.plugin_dictionaries += map(.. other file ) - call nix#ExportPluginsForNix(opts) - ''; - }; - vimGenDocHook = callPackage ({ vim }: makeSetupHook { name = "vim-gen-doc-hook"; diff --git a/pkgs/test/vim/default.nix b/pkgs/test/vim/default.nix index 73c25ae20cb8..488a2fe99c56 100644 --- a/pkgs/test/vim/default.nix +++ b/pkgs/test/vim/default.nix @@ -13,15 +13,6 @@ in ### vim tests ################## - vim_with_vim2nix = vim_configurable.customize { - name = "vim"; vimrcConfig.vam.pluginDictionaries = [ "vim2nix" ]; - }; - - # test cases: - test_vim_with_vim_nix_using_vam = vim_configurable.customize { - name = "vim-with-vim-addon-nix-using-vam"; - vimrcConfig.vam.pluginDictionaries = [{name = "vim-nix"; }]; - }; test_vim_with_vim_nix_using_plug = vim_configurable.customize { name = "vim-with-vim-addon-nix-using-plug"; @@ -32,27 +23,4 @@ in name = "vim-with-vim-addon-nix"; vimrcConfig.packages.myVimPackage.start = with vimPlugins; [ vim-nix ]; }; - - # regression test for https://github.com/NixOS/nixpkgs/issues/53112 - # The user may have specified their own plugins which may not be formatted - # exactly as the generated ones. In particular, they may not have the `pname` - # attribute. - test_vim_with_custom_plugin = vim_configurable.customize { - name = "vim_with_custom_plugin"; - vimrcConfig.vam.knownPlugins = - vimPlugins // ({ - vim-trailing-whitespace = buildVimPluginFrom2Nix { - name = "vim-trailing-whitespace"; - src = fetchFromGitHub { - owner = "bronson"; - repo = "vim-trailing-whitespace"; - rev = "4c596548216b7c19971f8fc94e38ef1a2b55fee6"; - sha256 = "0f1cpnp1nxb4i5hgymjn2yn3k1jwkqmlgw1g02sq270lavp2dzs9"; - }; - # make sure string dependencies are handled - dependencies = [ "vim-nix" ]; - }; - }); - vimrcConfig.vam.pluginDictionaries = [ { names = [ "vim-trailing-whitespace" ]; } ]; - }; }) From 386142c24dce30d7cc94429bac4caf5f433c49a5 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 10 Jul 2022 23:42:14 +0200 Subject: [PATCH 130/133] python3Packages.afsapi: 0.2.4 -> 0.2.5 --- pkgs/development/python-modules/afsapi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/afsapi/default.nix b/pkgs/development/python-modules/afsapi/default.nix index d1f6325f8507..c80524a0b5c3 100644 --- a/pkgs/development/python-modules/afsapi/default.nix +++ b/pkgs/development/python-modules/afsapi/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "afsapi"; - version = "0.2.4"; + version = "0.2.5"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "wlcrs"; repo = "python-afsapi"; rev = "refs/tags/${version}"; - hash = "sha256-pNggrg97GIBBTm4rjtpx0NOZIWCGn9boB/Wss/QwF6U="; + hash = "sha256-GWBj4MsbWb4g67rjVWxe7RHinkv+rYlcAJiY4goFB5c="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; From cc2fead11e8135894b2a328db3eebfade7c3b7a8 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 10 Jul 2022 23:42:30 +0200 Subject: [PATCH 131/133] python3Packages.pysml: 0.0.7 -> 0.0.8 --- pkgs/development/python-modules/pysml/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pysml/default.nix b/pkgs/development/python-modules/pysml/default.nix index f7c1e4857c42..3ff7bee167cb 100644 --- a/pkgs/development/python-modules/pysml/default.nix +++ b/pkgs/development/python-modules/pysml/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "pysml"; - version = "0.0.7"; + version = "0.0.8"; format = "pyproject"; src = fetchFromGitHub { owner = "mtdcr"; repo = pname; rev = version; - sha256 = "sha256-h8rQOKZozioZ7HmPETC5wBJyz7rMH1Q2wL6lF8G3zQU="; + sha256 = "sha256-Qw2irvj94cBquYeVUhqOq8lw85oP5TqtA2XTT2z5/as="; }; nativeBuildInputs = [ From 78f24da88629e35636289f3f803a9116e79d2bda Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 10 Jul 2022 23:43:01 +0200 Subject: [PATCH 132/133] python3Packages.regenmaschine: 2022.07.0 -> 2022.07.1 --- pkgs/development/python-modules/regenmaschine/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/regenmaschine/default.nix b/pkgs/development/python-modules/regenmaschine/default.nix index da13a28b67f8..444ff144bbfc 100644 --- a/pkgs/development/python-modules/regenmaschine/default.nix +++ b/pkgs/development/python-modules/regenmaschine/default.nix @@ -14,7 +14,7 @@ buildPythonPackage rec { pname = "regenmaschine"; - version = "2022.07.0"; + version = "2022.07.1"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -23,7 +23,7 @@ buildPythonPackage rec { owner = "bachya"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-zUef2AMC+vNINUi78xv3rSfBJ9peG7dlDVVmn+WFAsk="; + sha256 = "sha256-x8KyNB3aNiRT64/rrA7y8LM7ZOd524ok++n1Fwjz1Gc="; }; nativeBuildInputs = [ From bdf1c0e9b97ed802e947be4780a80c8ec05e91e4 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 10 Jul 2022 23:51:33 +0200 Subject: [PATCH 133/133] home-assistant: 2022.7.2 -> 2022.7.3 https://github.com/home-assistant/core/releases/tag/2022.7.3 --- pkgs/servers/home-assistant/component-packages.nix | 2 +- pkgs/servers/home-assistant/default.nix | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index b5a00436db91..9a93117bd44f 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -2,7 +2,7 @@ # Do not edit! { - version = "2022.7.2"; + version = "2022.7.3"; components = { "abode" = ps: with ps; [ abodepy diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index a6c615cc3c1d..4fac9351727f 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -190,7 +190,7 @@ let extraPackagesFile = writeText "home-assistant-packages" (lib.concatMapStringsSep "\n" (pkg: pkg.pname) extraBuildInputs); # Don't forget to run parse-requirements.py after updating - hassVersion = "2022.7.2"; + hassVersion = "2022.7.3"; in python.pkgs.buildPythonApplication rec { pname = "homeassistant"; @@ -208,7 +208,7 @@ in python.pkgs.buildPythonApplication rec { owner = "home-assistant"; repo = "core"; rev = version; - hash = "sha256-POOt5SjDa9jnBqxhD0LUopfAmZ9lpnb7mj7SSVoqTr0="; + hash = "sha256-e0vu3QUalFncWloNum92YLvMWkeuFF74vrNdfmsfEw0="; }; # leave this in, so users don't have to constantly update their downstream patch handling