From ca1bd1f38fc7a699a9916ab70b5962f9990db068 Mon Sep 17 00:00:00 2001 From: creator54 Date: Tue, 11 Jan 2022 19:27:23 +0530 Subject: [PATCH 001/214] python3Packages.grapheme: init at 0.6.0 --- .../python-modules/grapheme/default.nix | 22 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 24 insertions(+) create mode 100644 pkgs/development/python-modules/grapheme/default.nix diff --git a/pkgs/development/python-modules/grapheme/default.nix b/pkgs/development/python-modules/grapheme/default.nix new file mode 100644 index 000000000000..54e0b45bbc34 --- /dev/null +++ b/pkgs/development/python-modules/grapheme/default.nix @@ -0,0 +1,22 @@ +{ lib, buildPythonPackage, fetchPypi, pythonOlder }: + +buildPythonPackage rec { + pname = "grapheme"; + version = "0.6.0"; + + disabled = pythonOlder "3.7"; + + src = fetchPypi { + inherit pname version; + sha256 = "1jiwc3w05c8kh22s3zk7a8km8na3plqc5zimb2qcyxxy3grbkhj4"; + }; + + pythonImportsCheck = [ "grapheme" ]; + + meta = with lib; { + homepage = "https://github.com/alvinlindstam/grapheme"; + description = "A python package for grapheme aware string handling"; + maintainers = with maintainers; [ creator54 ]; + license = licenses.mit; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index fae8daecada7..e9ee2cc6f0b3 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3425,6 +3425,8 @@ in { grandalf = callPackage ../development/python-modules/grandalf { }; + grapheme = callPackage ../development/python-modules/grapheme { }; + graphite_api = callPackage ../development/python-modules/graphite-api { }; graphite_beacon = callPackage ../development/python-modules/graphite_beacon { }; From 4131e99160d29d351511e216903b1d6ddc4aadba Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Sat, 15 Jan 2022 10:50:47 +0300 Subject: [PATCH 002/214] =?UTF-8?q?gopass:=201.13.0=20=E2=86=92=201.13.1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/tools/security/gopass/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/gopass/default.nix b/pkgs/tools/security/gopass/default.nix index 3555f65c40d0..5e4da52bf670 100644 --- a/pkgs/tools/security/gopass/default.nix +++ b/pkgs/tools/security/gopass/default.nix @@ -13,7 +13,7 @@ buildGoModule rec { pname = "gopass"; - version = "1.13.0"; + version = "1.13.1"; nativeBuildInputs = [ installShellFiles makeWrapper ]; @@ -21,7 +21,7 @@ buildGoModule rec { owner = "gopasspw"; repo = pname; rev = "v${version}"; - sha256 = "sha256-MBpk84H3Ng/+rCjW2Scm/su0/5kgs7IzvFk/bFLNzXY="; + sha256 = "sha256-g/ICT489uW3a5EnsxJPYOnV+yeOFfaFPMowdIK0M1Fc="; }; vendorSha256 = "sha256-HGc6jUp4WO5P5dwfa0r7+X78a8us9fWrf+/IOotZHqk="; From eb76ab351115395cc92152f63d6824a456ea05b9 Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Sat, 15 Jan 2022 10:55:13 +0300 Subject: [PATCH 003/214] gopass-summon-provider: init at 1.12.0 --- pkgs/tools/security/gopass/summon.nix | 39 +++++++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 41 insertions(+) create mode 100644 pkgs/tools/security/gopass/summon.nix diff --git a/pkgs/tools/security/gopass/summon.nix b/pkgs/tools/security/gopass/summon.nix new file mode 100644 index 000000000000..c1be7c9eb081 --- /dev/null +++ b/pkgs/tools/security/gopass/summon.nix @@ -0,0 +1,39 @@ +{ lib +, makeWrapper +, buildGoModule +, fetchFromGitHub +, gopass +}: + +buildGoModule rec { + pname = "gopass-summon-provider"; + version = "1.12.0"; + + src = fetchFromGitHub { + owner = "gopasspw"; + repo = pname; + rev = "v${version}"; + sha256 = "sha256-mRZXczIlW1s0VGZJ+KQue4Dz6XCXGfl56+g6iRv2lZg="; + }; + + vendorSha256 = "sha256-fiV4rtel2jOw6y/ukOZHeFuNVqxHS3rnYhXJ6JZ+a/8="; + + subPackages = [ "." ]; + + nativeBuildInputs = [ makeWrapper ]; + + ldflags = [ + "-s" "-w" "-X main.version=${version}" "-X main.commit=${src.rev}" + ]; + + postFixup = '' + wrapProgram $out/bin/gopass-summon-provider --prefix PATH : "${lib.makeBinPath [ gopass ]}" + ''; + + meta = with lib; { + description = "Gopass Summon Provider"; + homepage = "https://www.gopass.pw/"; + license = licenses.mit; + maintainers = with maintainers; [ sikmir ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 99b7b76fb7a7..22051fc0089b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1939,6 +1939,8 @@ with pkgs; git-credential-gopass = callPackage ../tools/security/gopass/git-credential.nix { }; + gopass-summon-provider = callPackage ../tools/security/gopass/summon.nix { }; + gosh = callPackage ../tools/security/gosh { }; gospider = callPackage ../tools/security/gospider { }; From 6aaf4938f803125f52665a5768845bc2a1e0542a Mon Sep 17 00:00:00 2001 From: Kevin Amado Date: Sat, 22 Jan 2022 20:32:56 -0500 Subject: [PATCH 004/214] nixos/virtualisation.virtualbox.guest: remove override - See nixos/nixpkgs#156242 for further information --- nixos/modules/virtualisation/virtualbox-guest.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/virtualisation/virtualbox-guest.nix b/nixos/modules/virtualisation/virtualbox-guest.nix index f702fb4e525c..7b55b3b9759e 100644 --- a/nixos/modules/virtualisation/virtualbox-guest.nix +++ b/nixos/modules/virtualisation/virtualbox-guest.nix @@ -68,7 +68,7 @@ in SUBSYSTEM=="misc", KERNEL=="vboxguest", TAG+="systemd" ''; } (mkIf cfg.x11 { - services.xserver.videoDrivers = mkOverride 50 [ "vmware" "virtualbox" "modesetting" ]; + services.xserver.videoDrivers = [ "vmware" "virtualbox" "modesetting" ]; services.xserver.config = '' From efc5a7170c18909fe9aec7e19bf4af2f3a857200 Mon Sep 17 00:00:00 2001 From: superherointj <5861043+superherointj@users.noreply.github.com> Date: Mon, 24 Jan 2022 18:18:24 -0300 Subject: [PATCH 005/214] firebird: 3.0.7 -> 3.0.8; 4.0.0 -> 4.0.1 --- pkgs/servers/firebird/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/servers/firebird/default.nix b/pkgs/servers/firebird/default.nix index 7924f6e6ab4a..5348862ed6d5 100644 --- a/pkgs/servers/firebird/default.nix +++ b/pkgs/servers/firebird/default.nix @@ -54,13 +54,13 @@ let base = { }); firebird_3 = stdenv.mkDerivation (base // rec { - version = "3.0.7"; + version = "3.0.8"; src = fetchFromGitHub { owner = "FirebirdSQL"; repo = "firebird"; - rev = "R${builtins.replaceStrings [ "." ] [ "_" ] version}"; - sha256 = "sha256-8nGan10qjW8dFF89BL/tUWtwMGhahBiODbOqRrHSrbs="; + rev = "v${version}"; + sha256 = "sha256-l1V3CGxTybPY8pl6WhsExqdWJLiYsOv5BCrU/iD+I7k="; }; buildInputs = base.buildInputs ++ [ zlib libtommath ]; @@ -69,13 +69,13 @@ let base = { }); firebird_4 = stdenv.mkDerivation (base // rec { - version = "4.0.0"; + version = "4.0.1"; src = fetchFromGitHub { owner = "FirebirdSQL"; repo = "firebird"; rev = "v${version}"; - sha256 = "sha256-Pc3hUAhXgpa6VOkjidfh/vS/60Gtjenid8nHnIH7s0E="; + sha256 = "sha256-0XUu1g/VTrklA3vCpX6HWr7sdW2eQupnelpFNSGcouM="; }; buildInputs = base.buildInputs ++ [ zlib unzip libtommath libtomcrypt ]; From 625ca679a4dd55f4ecc707c13fab06e8bc474917 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Thu, 27 Jan 2022 07:51:02 -0300 Subject: [PATCH 006/214] marwaita: 12.0 -> 12.1 --- pkgs/data/themes/marwaita/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/data/themes/marwaita/default.nix b/pkgs/data/themes/marwaita/default.nix index 7a1b79d6d97c..966cb1c4f6f8 100644 --- a/pkgs/data/themes/marwaita/default.nix +++ b/pkgs/data/themes/marwaita/default.nix @@ -9,13 +9,13 @@ stdenv.mkDerivation rec { pname = "marwaita"; - version = "12.0"; + version = "12.1"; src = fetchFromGitHub { owner = "darkomarko42"; repo = pname; rev = version; - sha256 = "10mf1cbm6a9k0b1vcafy3jb7kicpvnf6xqmn1dfxwsq3k81mmy7d"; + sha256 = "04im7va5xpi17yjkrc46m5bm9j55qq66br1xg8a2arm0j4i0bqsk"; }; buildInputs = [ From 4a8911363c2ee719a42db7c8b0461f2d73711c8b Mon Sep 17 00:00:00 2001 From: Joel Date: Sat, 29 Jan 2022 01:15:01 +1000 Subject: [PATCH 007/214] obsidian: 0.13.19 -> 0.13.23 --- pkgs/applications/misc/obsidian/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/obsidian/default.nix b/pkgs/applications/misc/obsidian/default.nix index 290553b8d345..6626c3321578 100644 --- a/pkgs/applications/misc/obsidian/default.nix +++ b/pkgs/applications/misc/obsidian/default.nix @@ -31,11 +31,11 @@ let in stdenv.mkDerivation rec { pname = "obsidian"; - version = "0.13.19"; + version = "0.13.23"; src = fetchurl { url = "https://github.com/obsidianmd/obsidian-releases/releases/download/v${version}/obsidian-${version}.tar.gz"; - sha256 = "1jx1raynr0dgffqwya7cp4yr3szdn9bfwrhzk09bkmn8ys7d426r"; + sha256 = "1chxf6vrybjvc64k66a3l5xvv6iv6w8b03pdcrc0pr0nnlwkcf8c"; }; nativeBuildInputs = [ makeWrapper graphicsmagick ]; From 72c5287cb7146e63cb3495ca7698606d49423010 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 29 Jan 2022 10:30:11 +0100 Subject: [PATCH 008/214] dontgo403: init at 0.3 --- pkgs/tools/security/dontgo403/default.nix | 25 +++++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 27 insertions(+) create mode 100644 pkgs/tools/security/dontgo403/default.nix diff --git a/pkgs/tools/security/dontgo403/default.nix b/pkgs/tools/security/dontgo403/default.nix new file mode 100644 index 000000000000..d1595d9de2b7 --- /dev/null +++ b/pkgs/tools/security/dontgo403/default.nix @@ -0,0 +1,25 @@ +{ lib +, buildGoModule +, fetchFromGitHub +}: + +buildGoModule rec { + pname = "dontgo403"; + version = "0.3"; + + src = fetchFromGitHub { + owner = "devploit"; + repo = pname; + rev = version; + hash = "sha256-QHkmnhOLdyci3PAhf/JIiYlCta8DJ3cZb1S6Sim0qGQ="; + }; + + vendorSha256 = "sha256-jF+CSmLHMdlFpttYf3pK84wdfFAHSVPAK8S5zunUzB0="; + + meta = with lib; { + description = "Tool to bypass 40X response codes"; + homepage = "https://github.com/devploit/dontgo403"; + license = licenses.asl20; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 68b7e3e6b83d..743a0c38b98f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1693,6 +1693,8 @@ with pkgs; dkimpy = with python3Packages; toPythonApplication dkimpy; + dontgo403 = callPackage ../tools/security/dontgo403 { }; + dpt-rp1-py = callPackage ../tools/misc/dpt-rp1-py { }; dot-http = callPackage ../development/tools/dot-http { From 47e9de5f860491aaa054d2d1d8eb42a12c427260 Mon Sep 17 00:00:00 2001 From: FliegendeWurst <2012gdwu+github@posteo.de> Date: Sat, 29 Jan 2022 11:12:07 +0100 Subject: [PATCH 009/214] munin: disable parallel build --- pkgs/servers/monitoring/munin/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/servers/monitoring/munin/default.nix b/pkgs/servers/monitoring/munin/default.nix index 28ff8ac80705..d284c94e20af 100644 --- a/pkgs/servers/monitoring/munin/default.nix +++ b/pkgs/servers/monitoring/munin/default.nix @@ -89,6 +89,10 @@ stdenv.mkDerivation rec { sed -i '/ENV{PATH}/d' node/lib/Munin/Node/Service.pm ''; + # Disable parallel build, errors: + # Can't locate Munin/Common/Defaults.pm in @INC ... + enableParallelBuilding = false; + # DESTDIR shouldn't be needed (and shouldn't have worked), but munin # developers have forgotten to use PREFIX everywhere, so we use DESTDIR to # ensure that everything is installed in $out. From 0022c16ae5a9706ed77c94bdd3da94d57a9a1843 Mon Sep 17 00:00:00 2001 From: FliegendeWurst <2012gdwu+github@posteo.de> Date: Sat, 29 Jan 2022 11:33:46 +0100 Subject: [PATCH 010/214] netboot: disable parallel build --- pkgs/tools/networking/netboot/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/tools/networking/netboot/default.nix b/pkgs/tools/networking/netboot/default.nix index cfd768e40ab6..995c7ff72678 100644 --- a/pkgs/tools/networking/netboot/default.nix +++ b/pkgs/tools/networking/netboot/default.nix @@ -13,6 +13,10 @@ stdenv.mkDerivation rec { hardeningDisable = [ "format" ]; + # Disable parallel build, errors: + # link: `parseopt.lo' is not a valid libtool object + enableParallelBuilding = false; + meta = with lib; { description = "Mini PXE server"; maintainers = [ maintainers.raskin ]; From 79c5bf1d8655f1a2fa41d892d5e4c94f270060b0 Mon Sep 17 00:00:00 2001 From: FliegendeWurst <2012gdwu+github@posteo.de> Date: Sat, 29 Jan 2022 11:34:05 +0100 Subject: [PATCH 011/214] ipvsadm: disable parallel build --- pkgs/os-specific/linux/ipvsadm/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/os-specific/linux/ipvsadm/default.nix b/pkgs/os-specific/linux/ipvsadm/default.nix index fbd4d8efdac8..c98816746918 100644 --- a/pkgs/os-specific/linux/ipvsadm/default.nix +++ b/pkgs/os-specific/linux/ipvsadm/default.nix @@ -16,6 +16,10 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ libnl popt ]; + # Disable parallel build, errors: + # *** No rule to make target 'libipvs/libipvs.a', needed by 'ipvsadm'. Stop. + enableParallelBuilding = false; + preBuild = '' makeFlagsArray+=( INCLUDE=$(pkg-config --cflags libnl-genl-3.0) From c4da493b248e4821a99e0855e33ec1869c26cf54 Mon Sep 17 00:00:00 2001 From: FliegendeWurst <2012gdwu+github@posteo.de> Date: Sat, 29 Jan 2022 11:34:48 +0100 Subject: [PATCH 012/214] ats2: disable parallel build --- pkgs/development/compilers/ats2/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/compilers/ats2/default.nix b/pkgs/development/compilers/ats2/default.nix index c75600b5341a..e8c3af5d7e1e 100644 --- a/pkgs/development/compilers/ats2/default.nix +++ b/pkgs/development/compilers/ats2/default.nix @@ -36,6 +36,10 @@ stdenv.mkDerivation rec { buildInputs = [ gmp ]; + # Disable parallel build, errors: + # *** No rule to make target 'patscc.dats', needed by 'patscc_dats.c'. Stop. + enableParallelBuilding = false; + setupHook = with lib; let hookFiles = From 32e714161b7478944b089e301739b8bc0dfdf02d Mon Sep 17 00:00:00 2001 From: FliegendeWurst <2012gdwu+github@posteo.de> Date: Sat, 29 Jan 2022 11:34:56 +0100 Subject: [PATCH 013/214] lazarus-qt: disable parallel build --- pkgs/development/compilers/fpc/lazarus.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/development/compilers/fpc/lazarus.nix b/pkgs/development/compilers/fpc/lazarus.nix index 5cd0609960df..5ddaa7c429f2 100644 --- a/pkgs/development/compilers/fpc/lazarus.nix +++ b/pkgs/development/compilers/fpc/lazarus.nix @@ -45,6 +45,10 @@ stdenv.mkDerivation rec { ] ++ lib.optionals withQt [ libqt5pas qtbase ]; + # Disable parallel build, errors: + # Fatal: (1018) Compilation aborted + enableParallelBuilding = false; + nativeBuildInputs = [ makeWrapper ] ++ lib.optional withQt wrapQtAppsHook; From 3a1c21cd5b6c5ba8c79fa1a3fc10a416644895bd Mon Sep 17 00:00:00 2001 From: FliegendeWurst <2012gdwu+github@posteo.de> Date: Sat, 29 Jan 2022 11:35:07 +0100 Subject: [PATCH 014/214] hylafaxplus: disable parallel build --- pkgs/servers/hylafaxplus/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/servers/hylafaxplus/default.nix b/pkgs/servers/hylafaxplus/default.nix index 00dfd7c48176..1731da358768 100644 --- a/pkgs/servers/hylafaxplus/default.nix +++ b/pkgs/servers/hylafaxplus/default.nix @@ -87,6 +87,10 @@ stdenv.mkDerivation { openldap # optional pam # optional ]; + # Disable parallel build, errors: + # *** No rule to make target '../util/libfaxutil.so.7.0.4', needed by 'faxmsg'. Stop. + enableParallelBuilding = false; + postPatch = ". ${postPatch}"; dontAddPrefix = true; postInstall = ". ${postInstall}"; From a43431f376778b47a3976d3c8cf29eaeb26ad376 Mon Sep 17 00:00:00 2001 From: FliegendeWurst <2012gdwu+github@posteo.de> Date: Sat, 29 Jan 2022 11:35:18 +0100 Subject: [PATCH 015/214] alliance: disable parallel build --- pkgs/applications/science/electronics/alliance/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/applications/science/electronics/alliance/default.nix b/pkgs/applications/science/electronics/alliance/default.nix index 909a3ec767c6..cf135b9469a7 100644 --- a/pkgs/applications/science/electronics/alliance/default.nix +++ b/pkgs/applications/science/electronics/alliance/default.nix @@ -19,6 +19,10 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ libtool automake autoconf flex ]; buildInputs = [ xorgproto motif libX11 libXt libXpm bison ]; + # Disable parallel build, errors: + # ./pat_decl_y.y:736:5: error: expected '=', ... + enableParallelBuilding = false; + ALLIANCE_TOP = placeholder "out"; configureFlags = [ From a84c7c1d3a3c11cf2e08246b79c5850643e617ce Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 31 Jan 2022 07:03:30 +0000 Subject: [PATCH 016/214] swayr: 0.12.0 -> 0.12.1 --- pkgs/tools/wayland/swayr/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/wayland/swayr/default.nix b/pkgs/tools/wayland/swayr/default.nix index 1e0e963b8e8e..b6de504be8a4 100644 --- a/pkgs/tools/wayland/swayr/default.nix +++ b/pkgs/tools/wayland/swayr/default.nix @@ -2,16 +2,16 @@ rustPlatform.buildRustPackage rec { pname = "swayr"; - version = "0.12.0"; + version = "0.12.1"; src = fetchFromSourcehut { owner = "~tsdh"; repo = "swayr"; rev = "v${version}"; - sha256 = "sha256-bmMfrwxdriE/o8fezLbmhorBDvjtC4vaVamwDtrxiMQ="; + sha256 = "sha256-xcpgebGyYJep4vSdBb0OXhX66DGA7w3B5KYOHj8BKKM="; }; - cargoSha256 = "sha256-5hTiu2fGyMcbsg05hLngQXsjw3Vql2q8zlW5e6jD9Ok="; + cargoSha256 = "sha256-CYavcHLIQKEh1SoELevAa6g0Q2nksWwcS7/syK4oYq0="; patches = [ ./icon-paths.patch From 95069d76d34b0c40d3585c579004e4221a90c22f Mon Sep 17 00:00:00 2001 From: talyz Date: Mon, 31 Jan 2022 12:44:54 +0100 Subject: [PATCH 017/214] genJqSecretsReplacementSnippet: Propagate secret file read errors If an error occurs while trying to read a secret file, we want that error to propagate to the main shell context. That means we have to set the `inherit_errexit` option, which allows errors from subshells to propagate to the outer shell. Also, the subshell cannot run as part of another command, such as `export`, since that will simply ignore the subshell exit status and only respect `export`s exit status; first assigning the value to a variable and then exporting it solves issue. --- nixos/lib/utils.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/nixos/lib/utils.nix b/nixos/lib/utils.nix index bbebf8ba35a0..190c4db4d49d 100644 --- a/nixos/lib/utils.nix +++ b/nixos/lib/utils.nix @@ -149,10 +149,16 @@ rec { if [[ -h '${output}' ]]; then rm '${output}' fi + + inherit_errexit_restore=$(shopt -p inherit_errexit) + shopt -s inherit_errexit '' + concatStringsSep "\n" - (imap1 (index: name: "export secret${toString index}=$(<'${secrets.${name}}')") + (imap1 (index: name: '' + secret${toString index}=$(<'${secrets.${name}}') + export secret${toString index} + '') (attrNames secrets)) + "\n" + "${pkgs.jq}/bin/jq >'${output}' '" @@ -164,6 +170,7 @@ rec { ' <<'EOF' ${builtins.toJSON set} EOF + $inherit_errexit_restore ''; systemdUtils = { From b65b9bf73cf49765e5802615b10c6eab7a2036a8 Mon Sep 17 00:00:00 2001 From: talyz Date: Mon, 31 Jan 2022 13:09:20 +0100 Subject: [PATCH 018/214] nixos/gitlab: Implement better script error handling Fail scripts on pipeline errors and propagate subshell errors. If an error occurs in a subshell, including while trying to read a secret file, we want that error to propagate to the main shell context. That means we have to set the `inherit_errexit` option, which allows errors from subshells to propagate to the outer shell. Also, the subshell cannot run as part of another command, such as `export`, since that will simply ignore the subshell exit status and only respect `export`s exit status; first assigning the value to a variable and then exporting it solves issue. --- nixos/modules/services/misc/gitlab.nix | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/nixos/modules/services/misc/gitlab.nix b/nixos/modules/services/misc/gitlab.nix index 219155777db9..e762a9d76b15 100644 --- a/nixos/modules/services/misc/gitlab.nix +++ b/nixos/modules/services/misc/gitlab.nix @@ -1129,8 +1129,8 @@ in { ExecStartPre = let preStartFullPrivileges = '' - shopt -s dotglob nullglob - set -eu + set -o errexit -o pipefail -o nounset + shopt -s dotglob nullglob inherit_errexit chown --no-dereference '${cfg.user}':'${cfg.group}' '${cfg.statePath}'/* if [[ -n "$(ls -A '${cfg.statePath}'/config/)" ]]; then @@ -1140,7 +1140,8 @@ in { in "+${pkgs.writeShellScript "gitlab-pre-start-full-privileges" preStartFullPrivileges}"; ExecStart = pkgs.writeShellScript "gitlab-config" '' - set -eu + set -o errexit -o pipefail -o nounset + shopt -s inherit_errexit umask u=rwx,g=rx,o= @@ -1169,7 +1170,8 @@ in { rm -f '${cfg.statePath}/config/database.yml' ${if cfg.databasePasswordFile != null then '' - export db_password="$(<'${cfg.databasePasswordFile}')" + db_password="$(<'${cfg.databasePasswordFile}')" + export db_password if [[ -z "$db_password" ]]; then >&2 echo "Database password was an empty string!" @@ -1193,10 +1195,11 @@ in { rm -f '${cfg.statePath}/config/secrets.yml' - export secret="$(<'${cfg.secrets.secretFile}')" - export db="$(<'${cfg.secrets.dbFile}')" - export otp="$(<'${cfg.secrets.otpFile}')" - export jws="$(<'${cfg.secrets.jwsFile}')" + secret="$(<'${cfg.secrets.secretFile}')" + db="$(<'${cfg.secrets.dbFile}')" + otp="$(<'${cfg.secrets.otpFile}')" + jws="$(<'${cfg.secrets.jwsFile}')" + export secret db otp jws jq -n '{production: {secret_key_base: $ENV.secret, otp_key_base: $ENV.otp, db_key_base: $ENV.db, @@ -1230,7 +1233,8 @@ in { RemainAfterExit = true; ExecStart = pkgs.writeShellScript "gitlab-db-config" '' - set -eu + set -o errexit -o pipefail -o nounset + shopt -s inherit_errexit umask u=rwx,g=rx,o= initial_root_password="$(<'${cfg.initialRootPasswordFile}')" From 48c625215f4786ab3d1bd3d4da6d6146ef6885b9 Mon Sep 17 00:00:00 2001 From: Dennis Gosnell Date: Tue, 1 Feb 2022 10:10:59 +0900 Subject: [PATCH 019/214] spago: 0.20.2 -> 0.20.4 --- .../haskell-modules/configuration-nix.nix | 12 +----------- pkgs/development/tools/purescript/spago/spago.nix | 6 +++--- 2 files changed, 4 insertions(+), 14 deletions(-) diff --git a/pkgs/development/haskell-modules/configuration-nix.nix b/pkgs/development/haskell-modules/configuration-nix.nix index 48ef3d1515e6..f76c91c64d9e 100644 --- a/pkgs/development/haskell-modules/configuration-nix.nix +++ b/pkgs/development/haskell-modules/configuration-nix.nix @@ -605,17 +605,7 @@ self: super: builtins.intersectAttrs super { sha256 = "1hjdprm990vyxz86fgq14ajn0lkams7i00h8k2i2g1a0hjdwppq6"; }; - spagoWithPatches = appendPatch ( - # Spago needs a small patch to work with versions-5.0.0: - # https://github.com/purescript/spago/pull/798 - # This can probably be removed with >spago-0.20.3. - pkgs.fetchpatch { - url = "https://github.com/purescript/spago/commit/dd4bf4413d9675c1c8065d24d0ed7b345c7fa5dd.patch"; - sha256 = "1i1r3f4n9mlkckx15bfrdy5m7gjf0zx7ycwyqra6qn34zpcbzpmf"; - } - ) super.spago; - - spagoWithOverrides = spagoWithPatches.override { + spagoWithOverrides = super.spago.override { # spago has not yet been updated for the latest dhall. dhall = self.dhall_1_38_1; }; diff --git a/pkgs/development/tools/purescript/spago/spago.nix b/pkgs/development/tools/purescript/spago/spago.nix index 0bd33f19f8e9..d5646a6c2fff 100644 --- a/pkgs/development/tools/purescript/spago/spago.nix +++ b/pkgs/development/tools/purescript/spago/spago.nix @@ -14,11 +14,11 @@ }: mkDerivation { pname = "spago"; - version = "0.20.2"; + version = "0.20.4"; src = fetchgit { url = "https://github.com/purescript/spago.git"; - sha256 = "11jh3bszvl8zfi4xcabpx43jply28dxdywd6fadxspaa05jdxxn2"; - rev = "0f38c9153e46f30e9d87963e181f5c1a595f4b64"; + sha256 = "0dj7z2yr4s2kqjklbjdzsrmc5lqli322wg5k412jixxpmlx11a5f"; + rev = "33da63176fe07967761f43c83af9715f104013f0"; fetchSubmodules = true; }; isLibrary = true; From b8d7ebff9d2d2a4565b70045c2ca19cbdb38f308 Mon Sep 17 00:00:00 2001 From: "Travis A. Everett" Date: Mon, 31 Jan 2022 20:50:02 -0600 Subject: [PATCH 020/214] yallback: 0.1.0 -> 0.2.0 --- pkgs/development/tools/analysis/yallback/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/analysis/yallback/default.nix b/pkgs/development/tools/analysis/yallback/default.nix index 17263d1766a8..4e62ff5b9ed8 100644 --- a/pkgs/development/tools/analysis/yallback/default.nix +++ b/pkgs/development/tools/analysis/yallback/default.nix @@ -7,13 +7,13 @@ }: stdenv.mkDerivation rec { - version = "0.1.0"; + version = "0.2.0"; pname = "yallback"; src = fetchFromGitHub { owner = "abathur"; repo = "yallback"; rev = "v${version}"; - hash = "sha256-FaPqpxstKMhqLPFLIdenHgwzDE3gspBbJUSY95tblgI="; + hash = "sha256-t+fdnDJMFiFqN23dSY3TnsZsIDcravtwdNKJ5MiZosE="; }; buildInputs = [ coreutils bashInteractive ]; From b08ee51cc7dc57e104698e446a45bbb8e962fe07 Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Tue, 1 Feb 2022 16:46:18 +0100 Subject: [PATCH 021/214] stdenv.md: Remove off topic phase propaganda Phases are cool, I get it, but the reader will enjoy it when they see it. And they'll see it sooner if they don't have to read about it. --- doc/stdenv/stdenv.chapter.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/stdenv/stdenv.chapter.md b/doc/stdenv/stdenv.chapter.md index 6d72bd0deb4f..9c78539945fd 100644 --- a/doc/stdenv/stdenv.chapter.md +++ b/doc/stdenv/stdenv.chapter.md @@ -319,7 +319,7 @@ For information about how to run the updates, execute `nix-shell maintainers/scr ## Phases {#sec-stdenv-phases} -The generic builder has a number of *phases*. Package builds are split into phases to make it easier to override specific parts of the build (e.g., unpacking the sources or installing the binaries). Furthermore, it allows a nicer presentation of build logs in the Nix build farm. +The generic builder has a number of *phases*. Package builds are split into phases to make it easier to override specific parts of the build (e.g., unpacking the sources or installing the binaries). Each phase can be overridden in its entirety either by setting the environment variable `namePhase` to a string containing some shell commands to be executed, or by redefining the shell function `namePhase`. The former is convenient to override a phase from the derivation, while the latter is convenient from a build script. However, typically one only wants to *add* some commands to a phase, e.g. by defining `postInstall` or `preFixup`, as skipping some of the default actions may have unexpected consequences. The default script for each phase is defined in the file `pkgs/stdenv/generic/setup.sh`. From 0838f79f0b5fd3e9c8067e9debce3ce38c635190 Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Tue, 1 Feb 2022 16:52:32 +0100 Subject: [PATCH 022/214] stdenv.md: Document genericBuild --- doc/stdenv/stdenv.chapter.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/doc/stdenv/stdenv.chapter.md b/doc/stdenv/stdenv.chapter.md index 9c78539945fd..5e2248918753 100644 --- a/doc/stdenv/stdenv.chapter.md +++ b/doc/stdenv/stdenv.chapter.md @@ -319,10 +319,14 @@ For information about how to run the updates, execute `nix-shell maintainers/scr ## Phases {#sec-stdenv-phases} -The generic builder has a number of *phases*. Package builds are split into phases to make it easier to override specific parts of the build (e.g., unpacking the sources or installing the binaries). +`stdenv.mkDerivation` sets the Nix [derivation](https://nixos.org/manual/nix/stable/expressions/derivations.html#derivations)'s builder to a script that loads the stdenv `setup.sh` bash library and calls `genericBuild`. Most packaging functions rely on this default builder. + +This generic command invokes a number of *phases*. Package builds are split into phases to make it easier to override specific parts of the build (e.g., unpacking the sources or installing the binaries). Each phase can be overridden in its entirety either by setting the environment variable `namePhase` to a string containing some shell commands to be executed, or by redefining the shell function `namePhase`. The former is convenient to override a phase from the derivation, while the latter is convenient from a build script. However, typically one only wants to *add* some commands to a phase, e.g. by defining `postInstall` or `preFixup`, as skipping some of the default actions may have unexpected consequences. The default script for each phase is defined in the file `pkgs/stdenv/generic/setup.sh`. +If you want to run all phases in `nix-shell`, you can invoke `genericBuild` yourself in the interactive shell. + ### Controlling phases {#ssec-controlling-phases} There are a number of variables that control what phases are executed and in what order: From ecdb35ffbcbf50cb991f264e96db014bbb9a255d Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Tue, 1 Feb 2022 18:45:50 +0100 Subject: [PATCH 023/214] pure-modules: rename name to pname&version --- pkgs/development/pure-modules/audio/default.nix | 5 ++--- pkgs/development/pure-modules/avahi/default.nix | 5 ++--- pkgs/development/pure-modules/csv/default.nix | 5 ++--- pkgs/development/pure-modules/doc/default.nix | 5 ++--- pkgs/development/pure-modules/fastcgi/default.nix | 5 ++--- pkgs/development/pure-modules/faust/default.nix | 5 ++--- pkgs/development/pure-modules/ffi/default.nix | 5 ++--- pkgs/development/pure-modules/gen/default.nix | 5 ++--- pkgs/development/pure-modules/gl/default.nix | 5 ++--- pkgs/development/pure-modules/glpk/default.nix | 5 ++--- pkgs/development/pure-modules/gplot/default.nix | 5 ++--- pkgs/development/pure-modules/gsl/default.nix | 5 ++--- pkgs/development/pure-modules/gtk/default.nix | 5 ++--- pkgs/development/pure-modules/liblo/default.nix | 5 ++--- pkgs/development/pure-modules/lilv/default.nix | 5 ++--- pkgs/development/pure-modules/lv2/default.nix | 5 ++--- pkgs/development/pure-modules/midi/default.nix | 5 ++--- pkgs/development/pure-modules/mpfr/default.nix | 5 ++--- pkgs/development/pure-modules/octave/default.nix | 5 ++--- pkgs/development/pure-modules/odbc/default.nix | 5 ++--- pkgs/development/pure-modules/pandoc/default.nix | 5 ++--- pkgs/development/pure-modules/rational/default.nix | 5 ++--- pkgs/development/pure-modules/readline/default.nix | 5 ++--- pkgs/development/pure-modules/sockets/default.nix | 5 ++--- pkgs/development/pure-modules/sql3/default.nix | 5 ++--- pkgs/development/pure-modules/stldict/default.nix | 5 ++--- pkgs/development/pure-modules/stllib/default.nix | 3 +-- pkgs/development/pure-modules/tk/default.nix | 5 ++--- pkgs/development/pure-modules/xml/default.nix | 5 ++--- 29 files changed, 57 insertions(+), 86 deletions(-) diff --git a/pkgs/development/pure-modules/audio/default.nix b/pkgs/development/pure-modules/audio/default.nix index 34d405d6a396..5a19ef0a72d5 100644 --- a/pkgs/development/pure-modules/audio/default.nix +++ b/pkgs/development/pure-modules/audio/default.nix @@ -1,12 +1,11 @@ { lib, stdenv, fetchurl, pkg-config, pure, portaudio, fftw, libsndfile, libsamplerate }: stdenv.mkDerivation rec { - baseName = "audio"; + pname = "pure-audio"; version = "0.6"; - name = "pure-${baseName}-${version}"; src = fetchurl { - url = "https://bitbucket.org/purelang/pure-lang/downloads/${name}.tar.gz"; + url = "https://bitbucket.org/purelang/pure-lang/downloads/pure-audio-${version}.tar.gz"; sha256 = "c1f2a5da73983efb5a54f86d57ba93713ebed20ff0c72de9b3467f10f2904ee0"; }; diff --git a/pkgs/development/pure-modules/avahi/default.nix b/pkgs/development/pure-modules/avahi/default.nix index 7b8cc1b00ac3..d2f35ffca766 100644 --- a/pkgs/development/pure-modules/avahi/default.nix +++ b/pkgs/development/pure-modules/avahi/default.nix @@ -1,12 +1,11 @@ { lib, stdenv, fetchurl, pkg-config, pure, avahi }: stdenv.mkDerivation rec { - baseName = "avahi"; + pname = "pure-avahi"; version = "0.3"; - name = "pure-${baseName}-${version}"; src = fetchurl { - url = "https://bitbucket.org/purelang/pure-lang/downloads/${name}.tar.gz"; + url = "https://bitbucket.org/purelang/pure-lang/downloads/pure-avahi-${version}.tar.gz"; sha256 = "5fac8a6e3a54e45648ceb207ee0061b22eac8c4e668b8d53f13eb338b09c9160"; }; diff --git a/pkgs/development/pure-modules/csv/default.nix b/pkgs/development/pure-modules/csv/default.nix index f51739f03395..767ac0432ee0 100644 --- a/pkgs/development/pure-modules/csv/default.nix +++ b/pkgs/development/pure-modules/csv/default.nix @@ -1,12 +1,11 @@ { lib, stdenv, fetchurl, pkg-config, pure }: stdenv.mkDerivation rec { - baseName = "csv"; + pname = "pure-csv"; version = "1.6"; - name = "pure-${baseName}-${version}"; src = fetchurl { - url = "https://bitbucket.org/purelang/pure-lang/downloads/${name}.tar.gz"; + url = "https://bitbucket.org/purelang/pure-lang/downloads/pure-csv-${version}.tar.gz"; sha256 = "fe7c4edebe8208c54d5792a9eefaeb28c4a58b9094d161a6dda8126f0823ab3c"; }; diff --git a/pkgs/development/pure-modules/doc/default.nix b/pkgs/development/pure-modules/doc/default.nix index aa678cb21a4f..2940c58b21b6 100644 --- a/pkgs/development/pure-modules/doc/default.nix +++ b/pkgs/development/pure-modules/doc/default.nix @@ -1,12 +1,11 @@ { lib, stdenv, fetchurl, pkg-config, pure }: stdenv.mkDerivation rec { - baseName = "doc"; + pname = "pure-doc"; version = "0.7"; - name = "pure-${baseName}-${version}"; src = fetchurl { - url = "https://bitbucket.org/purelang/pure-lang/downloads/${name}.tar.gz"; + url = "https://bitbucket.org/purelang/pure-lang/downloads/pure-doc-${version}.tar.gz"; sha256 = "cfa880573941f37868269bcc443a09fecd2a141a78556383d2213f6c9f45ddd9"; }; diff --git a/pkgs/development/pure-modules/fastcgi/default.nix b/pkgs/development/pure-modules/fastcgi/default.nix index 04ea1dde589b..63b91f9a4f2c 100644 --- a/pkgs/development/pure-modules/fastcgi/default.nix +++ b/pkgs/development/pure-modules/fastcgi/default.nix @@ -1,12 +1,11 @@ { lib, stdenv, fetchurl, pkg-config, pure, fcgi }: stdenv.mkDerivation rec { - baseName = "fastcgi"; + pname = "pure-fastcgi"; version = "0.6"; - name = "pure-${baseName}-${version}"; src = fetchurl { - url = "https://bitbucket.org/purelang/pure-lang/downloads/${name}.tar.gz"; + url = "https://bitbucket.org/purelang/pure-lang/downloads/pure-fastcgi-${version}.tar.gz"; sha256 = "aa5789cc1e17521c01f349ee82ce2a00500e025b3f8494f89a7ebe165b5aabc7"; }; diff --git a/pkgs/development/pure-modules/faust/default.nix b/pkgs/development/pure-modules/faust/default.nix index 4a3b12ea7fae..eef81e59cbf6 100644 --- a/pkgs/development/pure-modules/faust/default.nix +++ b/pkgs/development/pure-modules/faust/default.nix @@ -1,12 +1,11 @@ { lib, stdenv, fetchurl, pkg-config, pure, faust, libtool }: stdenv.mkDerivation rec { - baseName = "faust"; + pname = "pure-faust"; version = "0.11"; - name = "pure-${baseName}-${version}"; src = fetchurl { - url = "https://bitbucket.org/purelang/pure-lang/downloads/${name}.tar.gz"; + url = "https://bitbucket.org/purelang/pure-lang/downloads/pure-faust-${version}.tar.gz"; sha256 = "51278a3b0807c4770163dc2ce423507dcf0ffec9cd1c1fbc08426d07294f6ae0"; }; diff --git a/pkgs/development/pure-modules/ffi/default.nix b/pkgs/development/pure-modules/ffi/default.nix index 3b076a4f38c2..fd119b309ba0 100644 --- a/pkgs/development/pure-modules/ffi/default.nix +++ b/pkgs/development/pure-modules/ffi/default.nix @@ -1,12 +1,11 @@ { lib, stdenv, fetchurl, pkg-config, pure, libffi }: stdenv.mkDerivation rec { - baseName = "ffi"; + pname = "pure-ffi"; version = "0.14"; - name = "pure-${baseName}-${version}"; src = fetchurl { - url = "https://bitbucket.org/purelang/pure-lang/downloads/${name}.tar.gz"; + url = "https://bitbucket.org/purelang/pure-lang/downloads/pure-ffi-${version}.tar.gz"; sha256 = "0331f48efaae40af21b23cf286fd7eac0ea0a249d08fd97bf23246929c0ea71a"; }; diff --git a/pkgs/development/pure-modules/gen/default.nix b/pkgs/development/pure-modules/gen/default.nix index 278c782da327..9698f0659a2b 100644 --- a/pkgs/development/pure-modules/gen/default.nix +++ b/pkgs/development/pure-modules/gen/default.nix @@ -2,12 +2,11 @@ pkg-config, pure, haskellPackages }: stdenv.mkDerivation rec { - baseName = "gen"; + pname = "pure-gen"; version = "0.20"; - name = "pure-${baseName}-${version}"; src = fetchurl { - url = "https://bitbucket.org/purelang/pure-lang/downloads/${name}.tar.gz"; + url = "https://bitbucket.org/purelang/pure-lang/downloads/pure-gen-${version}.tar.gz"; sha256 = "cfadd99a378b296325937d2492347611cc1e1d9f24594f91f3c2293eca01a4a8"; }; diff --git a/pkgs/development/pure-modules/gl/default.nix b/pkgs/development/pure-modules/gl/default.nix index 952d583bfd88..479835d95794 100644 --- a/pkgs/development/pure-modules/gl/default.nix +++ b/pkgs/development/pure-modules/gl/default.nix @@ -1,12 +1,11 @@ { lib, stdenv, fetchurl, pkg-config, pure, freeglut, libGLU, libGL, xlibsWrapper }: stdenv.mkDerivation rec { - baseName = "gl"; + pname = "pure-gl"; version = "0.9"; - name = "pure-${baseName}-${version}"; src = fetchurl { - url = "https://bitbucket.org/purelang/pure-lang/downloads/${name}.tar.gz"; + url = "https://bitbucket.org/purelang/pure-lang/downloads/pure-gl-${version}.tar.gz"; sha256 = "edd594222f89ae372067eda6679a37488986b9739b5b79b4a25ac48255d31bba"; }; diff --git a/pkgs/development/pure-modules/glpk/default.nix b/pkgs/development/pure-modules/glpk/default.nix index 7b8c46ef47f4..112d1ef23594 100644 --- a/pkgs/development/pure-modules/glpk/default.nix +++ b/pkgs/development/pure-modules/glpk/default.nix @@ -2,12 +2,11 @@ pkg-config, pure, glpk, gmp, libtool, libmysqlclient, libiodbc }: stdenv.mkDerivation rec { - baseName = "glpk"; + pname = "pure-glpk"; version = "0.5"; - name = "pure-${baseName}-${version}"; src = fetchurl { - url = "https://bitbucket.org/purelang/pure-lang/downloads/${name}.tar.gz"; + url = "https://bitbucket.org/purelang/pure-lang/downloads/pure-glpk-${version}.tar.gz"; sha256 = "5d6dc11706985dda02d96d481ea5f164c9e95ee446432fc4fc3d0db61a076346"; }; diff --git a/pkgs/development/pure-modules/gplot/default.nix b/pkgs/development/pure-modules/gplot/default.nix index ddae95c43f06..54fca97a9cd2 100644 --- a/pkgs/development/pure-modules/gplot/default.nix +++ b/pkgs/development/pure-modules/gplot/default.nix @@ -1,12 +1,11 @@ { lib, stdenv, fetchurl, pkg-config, pure, gnuplot }: stdenv.mkDerivation rec { - baseName = "gplot"; + pname = "pure-gplot"; version = "0.1"; - name = "pure-${baseName}-${version}"; src = fetchurl { - url = "https://bitbucket.org/purelang/pure-lang/downloads/${name}.tar.gz"; + url = "https://bitbucket.org/purelang/pure-lang/downloads/pure-gplot-${version}.tar.gz"; sha256 = "841ded98e4d1cdfaf78f95481e5995d0440bfda2d5df533d6741a6e7058a882c"; }; diff --git a/pkgs/development/pure-modules/gsl/default.nix b/pkgs/development/pure-modules/gsl/default.nix index 204aeb6bb741..7ba60a9ea6c4 100644 --- a/pkgs/development/pure-modules/gsl/default.nix +++ b/pkgs/development/pure-modules/gsl/default.nix @@ -1,12 +1,11 @@ { lib, stdenv, fetchurl, pure, pkg-config, gsl }: stdenv.mkDerivation rec { - baseName = "gsl"; + pname = "pure-gsl"; version = "0.12"; - name = "pure-${baseName}-${version}"; src = fetchurl { - url = "https://bitbucket.org/purelang/pure-lang/downloads/${name}.tar.gz"; + url = "https://bitbucket.org/purelang/pure-lang/downloads/pure-gsl-${version}.tar.gz"; sha256 = "06bdd873d5417d90ca35093056a060b77365123ed24c3ac583cd3922d4c78a75"; }; diff --git a/pkgs/development/pure-modules/gtk/default.nix b/pkgs/development/pure-modules/gtk/default.nix index 8cc3781e825e..adbd824abb69 100644 --- a/pkgs/development/pure-modules/gtk/default.nix +++ b/pkgs/development/pure-modules/gtk/default.nix @@ -1,12 +1,11 @@ { lib, stdenv, fetchurl, pkg-config, pure, pure-ffi, gtk2 }: stdenv.mkDerivation rec { - baseName = "gtk"; + pname = "pure-gtk"; version = "0.13"; - name = "pure-${baseName}-${version}"; src = fetchurl { - url = "https://bitbucket.org/purelang/pure-lang/downloads/${name}.tar.gz"; + url = "https://bitbucket.org/purelang/pure-lang/downloads/pure-gtk-${version}.tar.gz"; sha256 = "e659ff1bc5809ce35b810f8ac3fb7e8cadaaef13996537d8632e2f86ed76d203"; }; diff --git a/pkgs/development/pure-modules/liblo/default.nix b/pkgs/development/pure-modules/liblo/default.nix index 40502bbc140a..d19c7b511cf1 100644 --- a/pkgs/development/pure-modules/liblo/default.nix +++ b/pkgs/development/pure-modules/liblo/default.nix @@ -1,12 +1,11 @@ { lib, stdenv, fetchurl, pkg-config, pure, liblo }: stdenv.mkDerivation rec { - baseName = "liblo"; + pname = "pure-liblo"; version = "0.9"; - name = "pure-${baseName}-${version}"; src = fetchurl { - url = "https://bitbucket.org/purelang/pure-lang/downloads/${name}.tar.gz"; + url = "https://bitbucket.org/purelang/pure-lang/downloads/pure-liblo-${version}.tar.gz"; sha256 = "c2ba4d6f94489acf8a8fac73982ae03d5ad4113146eb1f7d6558a956c57cb8ee"; }; diff --git a/pkgs/development/pure-modules/lilv/default.nix b/pkgs/development/pure-modules/lilv/default.nix index 577170118bb1..bcadeba5acff 100644 --- a/pkgs/development/pure-modules/lilv/default.nix +++ b/pkgs/development/pure-modules/lilv/default.nix @@ -1,12 +1,11 @@ { lib, stdenv, fetchurl, pkg-config, pure, lilv, lv2, serd, sord, sratom }: stdenv.mkDerivation rec { - baseName = "lilv"; + pname = "pure-lilv"; version = "0.4"; - name = "pure-${baseName}-${version}"; src = fetchurl { - url = "https://bitbucket.org/purelang/pure-lang/downloads/${name}.tar.gz"; + url = "https://bitbucket.org/purelang/pure-lang/downloads/pure-lilv-${version}.tar.gz"; sha256 = "af20982fe43e8dce62d50bf7a78e461ab36c308325b123cddbababf0d3beaf9f"; }; diff --git a/pkgs/development/pure-modules/lv2/default.nix b/pkgs/development/pure-modules/lv2/default.nix index 800c39684318..742db4eac413 100644 --- a/pkgs/development/pure-modules/lv2/default.nix +++ b/pkgs/development/pure-modules/lv2/default.nix @@ -1,12 +1,11 @@ { lib, stdenv, fetchurl, pkg-config, pure, lv2 }: stdenv.mkDerivation rec { - baseName = "lv2"; + pname = "pure-lv2"; version = "0.2"; - name = "pure-${baseName}-${version}"; src = fetchurl { - url = "https://bitbucket.org/purelang/pure-lang/downloads/${name}.tar.gz"; + url = "https://bitbucket.org/purelang/pure-lang/downloads/pure-lv2-${version}.tar.gz"; sha256 = "721cacd831781d8309e7ecabb0ee7c01da17e75c5642a5627cf158bfb36093e1"; }; diff --git a/pkgs/development/pure-modules/midi/default.nix b/pkgs/development/pure-modules/midi/default.nix index bbca0b080892..f1a463414af1 100644 --- a/pkgs/development/pure-modules/midi/default.nix +++ b/pkgs/development/pure-modules/midi/default.nix @@ -1,12 +1,11 @@ { lib, stdenv, fetchurl, pkg-config, pure, portmidi }: stdenv.mkDerivation rec { - baseName = "midi"; + pname = "pure-midi"; version = "0.6"; - name = "pure-${baseName}-${version}"; src = fetchurl { - url = "https://bitbucket.org/purelang/pure-lang/downloads/${name}.tar.gz"; + url = "https://bitbucket.org/purelang/pure-lang/downloads/pure-midi-${version}.tar.gz"; sha256 = "817ae9fa5f443a8c478a6770f36091e3cf99f3515c74e00d09ca958dead1e7eb"; }; diff --git a/pkgs/development/pure-modules/mpfr/default.nix b/pkgs/development/pure-modules/mpfr/default.nix index 8afb74027d73..3a2ef117b5b7 100644 --- a/pkgs/development/pure-modules/mpfr/default.nix +++ b/pkgs/development/pure-modules/mpfr/default.nix @@ -1,12 +1,11 @@ { lib, stdenv, fetchurl, pkg-config, pure }: stdenv.mkDerivation rec { - baseName = "mpfr"; + pname = "pure-mpfr"; version = "0.5"; - name = "pure-${baseName}-${version}"; src = fetchurl { - url = "https://bitbucket.org/purelang/pure-lang/downloads/${name}.tar.gz"; + url = "https://bitbucket.org/purelang/pure-lang/downloads/pure-mpfr-${version}.tar.gz"; sha256 = "39d2255c2c0c2d60ce727be178b5e5a06f7c92eb365976c49c4a34b1edc576e7"; }; diff --git a/pkgs/development/pure-modules/octave/default.nix b/pkgs/development/pure-modules/octave/default.nix index 591555f39c8e..ffb622567e5a 100644 --- a/pkgs/development/pure-modules/octave/default.nix +++ b/pkgs/development/pure-modules/octave/default.nix @@ -1,12 +1,11 @@ { lib, stdenv, fetchurl, pkg-config, pure, octave }: stdenv.mkDerivation rec { - baseName = "octave"; + pname = "pure-octave"; version = "0.9"; - name = "pure-${baseName}-${version}"; src = fetchurl { - url = "https://bitbucket.org/purelang/pure-lang/downloads/${name}.tar.gz"; + url = "https://bitbucket.org/purelang/pure-lang/downloads/pure-octave-${version}.tar.gz"; sha256 = "0l1mvmi3rpabzjcrk6p04rdn922mvdm9x67zby3dha5iiccc47q0"; }; diff --git a/pkgs/development/pure-modules/odbc/default.nix b/pkgs/development/pure-modules/odbc/default.nix index 272c88a697cd..e826eae2eb55 100644 --- a/pkgs/development/pure-modules/odbc/default.nix +++ b/pkgs/development/pure-modules/odbc/default.nix @@ -1,12 +1,11 @@ { lib, stdenv, fetchurl, pkg-config, pure, libiodbc }: stdenv.mkDerivation rec { - baseName = "odbc"; + pname = "pure-odbc"; version = "0.10"; - name = "pure-${baseName}-${version}"; src = fetchurl { - url = "https://bitbucket.org/purelang/pure-lang/downloads/${name}.tar.gz"; + url = "https://bitbucket.org/purelang/pure-lang/downloads/pure-odbc-${version}.tar.gz"; sha256 = "1907e9ebca11cc68762cf7046084b31e9e2bf056df85c40ccbcbe9f02221ff8d"; }; diff --git a/pkgs/development/pure-modules/pandoc/default.nix b/pkgs/development/pure-modules/pandoc/default.nix index bbf22e9c6fbe..bf9bd988ddbc 100644 --- a/pkgs/development/pure-modules/pandoc/default.nix +++ b/pkgs/development/pure-modules/pandoc/default.nix @@ -1,12 +1,11 @@ { lib, stdenv, fetchurl, pkg-config, pure, pandoc, gawk, getopt }: stdenv.mkDerivation rec { - baseName = "pandoc"; + pname = "pure-pandoc"; version = "0.1"; - name = "pure-${baseName}-${version}"; src = fetchurl { - url = "https://bitbucket.org/purelang/pure-lang/downloads/${name}.tar.gz"; + url = "https://bitbucket.org/purelang/pure-lang/downloads/pure-pandoc-${version}.tar.gz"; sha256 = "0f23a17549048ca3a8f4936ea9e931feb05997390b486850936b746996350cda"; }; diff --git a/pkgs/development/pure-modules/rational/default.nix b/pkgs/development/pure-modules/rational/default.nix index 99cefc9682a9..2dfed3422507 100644 --- a/pkgs/development/pure-modules/rational/default.nix +++ b/pkgs/development/pure-modules/rational/default.nix @@ -1,12 +1,11 @@ { lib, stdenv, fetchurl, pkg-config, pure }: stdenv.mkDerivation rec { - baseName = "rational"; + pname = "pure-rational"; version = "0.1"; - name = "pure-${baseName}-${version}"; src = fetchurl { - url = "https://bitbucket.org/purelang/pure-lang/downloads/${name}.tar.gz"; + url = "https://bitbucket.org/purelang/pure-lang/downloads/pure-rational-${version}.tar.gz"; sha256 = "62cb4079a0dadd232a859e577e97e50e9718ccfcc5983c4d9c4c32cac7a9bafa"; }; diff --git a/pkgs/development/pure-modules/readline/default.nix b/pkgs/development/pure-modules/readline/default.nix index f3015e275355..283d75323bef 100644 --- a/pkgs/development/pure-modules/readline/default.nix +++ b/pkgs/development/pure-modules/readline/default.nix @@ -1,12 +1,11 @@ { lib, stdenv, fetchurl, pkg-config, pure, readline }: stdenv.mkDerivation rec { - baseName = "readline"; + pname = "pure-readline"; version = "0.3"; - name = "pure-${baseName}-${version}"; src = fetchurl { - url = "https://bitbucket.org/purelang/pure-lang/downloads/${name}.tar.gz"; + url = "https://bitbucket.org/purelang/pure-lang/downloads/pure-readline-${version}.tar.gz"; sha256 = "db8e6663b1c085466c09662fe86d952b6f4ffdafeecffe805c681ab91c910886"; }; diff --git a/pkgs/development/pure-modules/sockets/default.nix b/pkgs/development/pure-modules/sockets/default.nix index 5e1a01bc624e..f50d3f3efbf7 100644 --- a/pkgs/development/pure-modules/sockets/default.nix +++ b/pkgs/development/pure-modules/sockets/default.nix @@ -1,12 +1,11 @@ { lib, stdenv, fetchurl, pkg-config, pure }: stdenv.mkDerivation rec { - baseName = "sockets"; + pname = "pure-sockets"; version = "0.7"; - name = "pure-${baseName}-${version}"; src = fetchurl { - url = "https://bitbucket.org/purelang/pure-lang/downloads/${name}.tar.gz"; + url = "https://bitbucket.org/purelang/pure-lang/downloads/pure-sockets-${version}.tar.gz"; sha256 = "4f2769618ae5818cf6005bb08bcf02fe359a2e31998d12dc0c72f0494e9c0420"; }; diff --git a/pkgs/development/pure-modules/sql3/default.nix b/pkgs/development/pure-modules/sql3/default.nix index 009b367c6915..8db3fa58085d 100644 --- a/pkgs/development/pure-modules/sql3/default.nix +++ b/pkgs/development/pure-modules/sql3/default.nix @@ -1,12 +1,11 @@ { lib, stdenv, fetchurl, pkg-config, pure, sqlite }: stdenv.mkDerivation rec { - baseName = "sql3"; + pname = "pure-sql3"; version = "0.5"; - name = "pure-${baseName}-${version}"; src = fetchurl { - url = "https://bitbucket.org/purelang/pure-lang/downloads/${name}.tar.gz"; + url = "https://bitbucket.org/purelang/pure-lang/downloads/pure-sql3-${version}.tar.gz"; sha256 = "b9f79dd443c8ffc5cede51e2af617f24726f5c0409aab4948c9847e6adb53c37"; }; diff --git a/pkgs/development/pure-modules/stldict/default.nix b/pkgs/development/pure-modules/stldict/default.nix index 46b711d9fa63..145617bc83ec 100644 --- a/pkgs/development/pure-modules/stldict/default.nix +++ b/pkgs/development/pure-modules/stldict/default.nix @@ -1,12 +1,11 @@ { lib, stdenv, fetchurl, pkg-config, pure }: stdenv.mkDerivation rec { - baseName = "stldict"; + pname = "pure-stldict"; version = "0.8"; - name = "pure-${baseName}-${version}"; src = fetchurl { - url = "https://bitbucket.org/purelang/pure-lang/downloads/${name}.tar.gz"; + url = "https://bitbucket.org/purelang/pure-lang/downloads/pure-stldict-${version}.tar.gz"; sha256 = "5b894ae6dc574c7022258e2732bea649c82c959ec4d0be13fb5a3e8ba8488f28"; }; diff --git a/pkgs/development/pure-modules/stllib/default.nix b/pkgs/development/pure-modules/stllib/default.nix index 009543ee71cb..dabdb73fd7ce 100644 --- a/pkgs/development/pure-modules/stllib/default.nix +++ b/pkgs/development/pure-modules/stllib/default.nix @@ -1,9 +1,8 @@ { lib, stdenv, fetchurl, pkg-config, pure }: stdenv.mkDerivation rec { - baseName = "stllib"; + pname = "pure-stllib"; version = "0.6"; - name = "pure-${baseName}-${version}"; src = fetchurl { url = "https://bitbucket.org/purelang/pure-lang/downloads/pure-stllib-${version}.tar.gz"; diff --git a/pkgs/development/pure-modules/tk/default.nix b/pkgs/development/pure-modules/tk/default.nix index 4a2c86783c1a..35da57f47cda 100644 --- a/pkgs/development/pure-modules/tk/default.nix +++ b/pkgs/development/pure-modules/tk/default.nix @@ -1,12 +1,11 @@ { lib, stdenv, fetchurl, pkg-config, pure, tcl, tk, xlibsWrapper }: stdenv.mkDerivation rec { - baseName = "tk"; + pname = "pure-tk"; version = "0.5"; - name = "pure-${baseName}-${version}"; src = fetchurl { - url = "https://bitbucket.org/purelang/pure-lang/downloads/${name}.tar.gz"; + url = "https://bitbucket.org/purelang/pure-lang/downloads/pure-tk-${version}.tar.gz"; sha256 = "3b6e97e2d723d5a05bf25f4ac62068ac17a1fd81db03e1986366097bf071a516"; }; diff --git a/pkgs/development/pure-modules/xml/default.nix b/pkgs/development/pure-modules/xml/default.nix index e9d35c4d1fb5..92f4b62966e0 100644 --- a/pkgs/development/pure-modules/xml/default.nix +++ b/pkgs/development/pure-modules/xml/default.nix @@ -1,12 +1,11 @@ { lib, stdenv, fetchurl, pkg-config, pure, libxml2, libxslt }: stdenv.mkDerivation rec { - baseName = "xml"; + pname = "pure-xml"; version = "0.7"; - name = "pure-${baseName}-${version}"; src = fetchurl { - url = "https://bitbucket.org/purelang/pure-lang/downloads/${name}.tar.gz"; + url = "https://bitbucket.org/purelang/pure-lang/downloads/pure-xml-${version}.tar.gz"; sha256 = "e862dec060917a285bc3befc90f4eb70b6cc33136fb524ad3aa173714a35b0f7"; }; From e67ee13da76134cb2061c319fade3e8e54ef0923 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Tue, 1 Feb 2022 23:01:51 +0100 Subject: [PATCH 024/214] treewide: rename name to pname&version --- pkgs/development/ocaml-modules/webbrowser/default.nix | 2 +- pkgs/development/python-modules/i-pi/default.nix | 2 +- pkgs/development/python-modules/skein/skeinjar.nix | 4 ++-- pkgs/development/python-modules/skein/skeinrepo.nix | 4 ++-- pkgs/development/tools/analysis/cccc/default.nix | 9 +++------ pkgs/development/tools/analysis/ikos/default.nix | 4 ++-- pkgs/development/tools/analysis/qcachegrind/default.nix | 8 +++----- pkgs/development/tools/bazel-watcher/default.nix | 2 +- .../tools/build-managers/bazel/bazel_0_26/default.nix | 4 ++-- .../continuous-integration/buildkite-agent/default.nix | 2 +- .../tools/continuous-integration/gocd-agent/default.nix | 2 +- .../tools/continuous-integration/gocd-server/default.nix | 2 +- pkgs/development/tools/corgi/default.nix | 7 +++---- 13 files changed, 23 insertions(+), 29 deletions(-) diff --git a/pkgs/development/ocaml-modules/webbrowser/default.nix b/pkgs/development/ocaml-modules/webbrowser/default.nix index ebc5472ce53b..6a21a1e1f751 100644 --- a/pkgs/development/ocaml-modules/webbrowser/default.nix +++ b/pkgs/development/ocaml-modules/webbrowser/default.nix @@ -3,7 +3,7 @@ }: stdenv.mkDerivation rec { - name = "ocaml${ocaml.version}-webbrowser-${version}"; + pname = "ocaml${ocaml.version}-webbrowser"; version = "0.6.1"; src = fetchurl { url = "https://erratique.ch/software/webbrowser/releases/webbrowser-${version}.tbz"; diff --git a/pkgs/development/python-modules/i-pi/default.nix b/pkgs/development/python-modules/i-pi/default.nix index 5f031197978a..340e3618be1a 100644 --- a/pkgs/development/python-modules/i-pi/default.nix +++ b/pkgs/development/python-modules/i-pi/default.nix @@ -3,7 +3,7 @@ } : buildPythonPackage rec { - name = "i-pi"; + pname = "i-pi"; version = "2.4.0"; src = fetchFromGitHub { diff --git a/pkgs/development/python-modules/skein/skeinjar.nix b/pkgs/development/python-modules/skein/skeinjar.nix index c1a0d8a57515..d29e0e2f99c7 100644 --- a/pkgs/development/python-modules/skein/skeinjar.nix +++ b/pkgs/development/python-modules/skein/skeinjar.nix @@ -4,9 +4,9 @@ let skeinRepo = callPackage ./skeinrepo.nix { inherit src version; }; in stdenv.mkDerivation rec { - name = "skein-${version}.jar"; + pname = "skein.jar"; - inherit src; + inherit version src; nativeBuildInputs = [ maven ]; diff --git a/pkgs/development/python-modules/skein/skeinrepo.nix b/pkgs/development/python-modules/skein/skeinrepo.nix index d7bdef56ebe3..86cbf82b7f0f 100644 --- a/pkgs/development/python-modules/skein/skeinrepo.nix +++ b/pkgs/development/python-modules/skein/skeinrepo.nix @@ -1,9 +1,9 @@ { autoPatchelfHook, lib, maven, stdenv, src, version }: stdenv.mkDerivation rec { - name = "skein-${version}-maven-repo"; + pname = "skein-maven-repo"; - inherit src; + inherit version src; nativeBuildInputs = [ maven ] ++ lib.optional stdenv.isLinux autoPatchelfHook; diff --git a/pkgs/development/tools/analysis/cccc/default.nix b/pkgs/development/tools/analysis/cccc/default.nix index bcbda8ad7e60..dc7cccd9dc1d 100644 --- a/pkgs/development/tools/analysis/cccc/default.nix +++ b/pkgs/development/tools/analysis/cccc/default.nix @@ -1,14 +1,11 @@ { lib, stdenv, fetchurl }: -let - name = "cccc"; +stdenv.mkDerivation rec { + pname = "cccc"; version = "3.1.4"; -in -stdenv.mkDerivation { - name = "${name}-${version}"; src = fetchurl { - url = "mirror://sourceforge/${name}/${version}/${name}-${version}.tar.gz"; + url = "mirror://sourceforge/cccc/${version}/cccc-${version}.tar.gz"; sha256 = "1gsdzzisrk95kajs3gfxks3bjvfd9g680fin6a9pjrism2lyrcr7"; }; diff --git a/pkgs/development/tools/analysis/ikos/default.nix b/pkgs/development/tools/analysis/ikos/default.nix index 26c7b6dd0b70..a1eec36204bf 100644 --- a/pkgs/development/tools/analysis/ikos/default.nix +++ b/pkgs/development/tools/analysis/ikos/default.nix @@ -10,12 +10,12 @@ let in stdenv.mkDerivation rec { - name = "ikos"; + pname = "ikos"; version = "3.0"; src = fetchFromGitHub { owner = "NASA-SW-VnV"; - repo = name; + repo = "ikos"; rev = "v${version}"; sha256 = "0k3kp1af0qx3l1x6a4sl4fm8qlwchjvwkvs2ck0fhfnc62q2im5f"; }; diff --git a/pkgs/development/tools/analysis/qcachegrind/default.nix b/pkgs/development/tools/analysis/qcachegrind/default.nix index 6b238fb9266e..5ce79a092488 100644 --- a/pkgs/development/tools/analysis/qcachegrind/default.nix +++ b/pkgs/development/tools/analysis/qcachegrind/default.nix @@ -1,10 +1,8 @@ { lib, stdenv, qmake, qtbase, perl, python2, php, kcachegrind, wrapQtAppsHook }: -let - name = lib.replaceStrings ["kcachegrind"] ["qcachegrind"] kcachegrind.name; - -in stdenv.mkDerivation { - inherit name; +stdenv.mkDerivation { + pname = "qcachegrind"; + version = kcachegrind.version; src = kcachegrind.src; diff --git a/pkgs/development/tools/bazel-watcher/default.nix b/pkgs/development/tools/bazel-watcher/default.nix index e10a455c0906..5b0dd0349439 100644 --- a/pkgs/development/tools/bazel-watcher/default.nix +++ b/pkgs/development/tools/bazel-watcher/default.nix @@ -12,7 +12,7 @@ let ]; in buildBazelPackage rec { - name = "bazel-watcher-${version}"; + pname = "bazel-watcher"; version = "0.14.0"; src = fetchFromGitHub { diff --git a/pkgs/development/tools/build-managers/bazel/bazel_0_26/default.nix b/pkgs/development/tools/build-managers/bazel/bazel_0_26/default.nix index f03f42be389f..6168c4a477f6 100644 --- a/pkgs/development/tools/build-managers/bazel/bazel_0_26/default.nix +++ b/pkgs/development/tools/build-managers/bazel/bazel_0_26/default.nix @@ -114,10 +114,10 @@ stdenv'.mkDerivation rec { bashTools = callPackage ./bash-tools-test.nix {}; }; - name = "bazel-${version}"; + pname = "bazel"; src = fetchurl { - url = "https://github.com/bazelbuild/bazel/releases/download/${version}/${name}-dist.zip"; + url = "https://github.com/bazelbuild/bazel/releases/download/${version}/bazel-${version}-dist.zip"; sha256 = "d26dadf62959255d58e523da3448a6222af768fe1224e321b120c1d5bbe4b4f2"; }; diff --git a/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix b/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix index 897b191cdd66..b6375f1c286a 100644 --- a/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix +++ b/pkgs/development/tools/continuous-integration/buildkite-agent/default.nix @@ -2,7 +2,7 @@ makeWrapper, coreutils, git, openssh, bash, gnused, gnugrep, nixosTests }: buildGoModule rec { - name = "buildkite-agent-${version}"; + pname = "buildkite-agent"; version = "3.33.3"; src = fetchFromGitHub { diff --git a/pkgs/development/tools/continuous-integration/gocd-agent/default.nix b/pkgs/development/tools/continuous-integration/gocd-agent/default.nix index 3041a0317370..47b52e5f70b3 100644 --- a/pkgs/development/tools/continuous-integration/gocd-agent/default.nix +++ b/pkgs/development/tools/continuous-integration/gocd-agent/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchurl, unzip }: stdenv.mkDerivation rec { - name = "gocd-agent-${version}-${rev}"; + pname = "gocd-agent"; version = "19.3.0"; rev = "8959"; diff --git a/pkgs/development/tools/continuous-integration/gocd-server/default.nix b/pkgs/development/tools/continuous-integration/gocd-server/default.nix index 4b3f61cf4b4b..a55d3a2efe7b 100644 --- a/pkgs/development/tools/continuous-integration/gocd-server/default.nix +++ b/pkgs/development/tools/continuous-integration/gocd-server/default.nix @@ -1,7 +1,7 @@ { lib, stdenv, fetchurl, unzip }: stdenv.mkDerivation rec { - name = "gocd-server-${version}-${rev}"; + pname = "gocd-server"; version = "19.3.0"; rev = "8959"; diff --git a/pkgs/development/tools/corgi/default.nix b/pkgs/development/tools/corgi/default.nix index e39e42c40af5..ce003457e23d 100644 --- a/pkgs/development/tools/corgi/default.nix +++ b/pkgs/development/tools/corgi/default.nix @@ -1,16 +1,15 @@ { lib, buildGoPackage, fetchFromGitHub }: buildGoPackage rec { - name = "corgi-${rev}"; - rev = "v0.2.4"; + pname = "corgi"; + version = "0.2.4"; goPackagePath = "github.com/DrakeW/corgi"; src = fetchFromGitHub { - inherit rev; - owner = "DrakeW"; repo = "corgi"; + rev = "v${version}"; sha256 = "0h9rjv1j129n1ichwpiiyspgim1273asi3s6hgizvbc75gbbb8fn"; }; From 187efe0961b651084ab811c8ea6016916c536195 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Feb 2022 01:56:21 +0100 Subject: [PATCH 025/214] zigbee2mqtt: 1.22.2 -> 1.23.0 https://github.com/Koenkk/zigbee2mqtt/releases/tag/1.23.0 --- pkgs/servers/zigbee2mqtt/default.nix | 4 +- pkgs/servers/zigbee2mqtt/node-packages.nix | 2965 +++++++++----------- 2 files changed, 1330 insertions(+), 1639 deletions(-) diff --git a/pkgs/servers/zigbee2mqtt/default.nix b/pkgs/servers/zigbee2mqtt/default.nix index bcd877183c27..7ec06e365997 100644 --- a/pkgs/servers/zigbee2mqtt/default.nix +++ b/pkgs/servers/zigbee2mqtt/default.nix @@ -3,14 +3,14 @@ let package = (import ./node.nix { inherit pkgs; inherit (stdenv.hostPlatform) system; }).package; in package.override rec { - version = "1.22.2"; + version = "1.23.0"; reconstructLock = true; src = pkgs.fetchFromGitHub { owner = "Koenkk"; repo = "zigbee2mqtt"; rev = version; - sha256 = "181al3530zdbng6fpcpz35q28cxi3p46ydxff7a2bpm9i7kxnc3i"; + sha256 = "0mf6ya5pw5gh0ld0j5dlsicx3ndhfrm3q683faqcm4ks7c5kjhax"; }; passthru.tests.zigbee2mqtt = nixosTests.zigbee2mqtt; diff --git a/pkgs/servers/zigbee2mqtt/node-packages.nix b/pkgs/servers/zigbee2mqtt/node-packages.nix index 0085292102dd..82b3e50e1d3d 100644 --- a/pkgs/servers/zigbee2mqtt/node-packages.nix +++ b/pkgs/servers/zigbee2mqtt/node-packages.nix @@ -4,22 +4,13 @@ let sources = { - "@babel/cli-7.16.0" = { + "@babel/cli-7.16.8" = { name = "_at_babel_slash_cli"; packageName = "@babel/cli"; - version = "7.16.0"; + version = "7.16.8"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/cli/-/cli-7.16.0.tgz"; - sha512 = "WLrM42vKX/4atIoQB+eb0ovUof53UUvecb4qGjU2PDDWRiZr50ZpiV8NpcLo7iSxeGYrRG0Mqembsa+UrTAV6Q=="; - }; - }; - "@babel/code-frame-7.16.0" = { - name = "_at_babel_slash_code-frame"; - packageName = "@babel/code-frame"; - version = "7.16.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.16.0.tgz"; - sha512 = "IF4EOMEV+bfYwOmNxGzSnjR2EmQod7f1UXOpZM3l4i4o4QNwzjtJAu/HxdjHq0aYBvdqMuQEY1eg0nqW9ZPORA=="; + url = "https://registry.npmjs.org/@babel/cli/-/cli-7.16.8.tgz"; + sha512 = "FTKBbxyk5TclXOGmwYyqelqP5IF6hMxaeJskd85jbR5jBfYlwqgwAbJwnixi1ZBbTqKfFuAA95mdmUFeSRwyJA=="; }; }; "@babel/code-frame-7.16.7" = { @@ -31,76 +22,49 @@ let sha512 = "iAXqUn8IIeBTNd72xsFlgaXHkMBMt6y4HJp1tIaK465CWLT/fG1aqB7ykr95gHHmlBdGbFeWWfyB4NJJ0nmeIg=="; }; }; - "@babel/compat-data-7.16.4" = { + "@babel/compat-data-7.16.8" = { name = "_at_babel_slash_compat-data"; packageName = "@babel/compat-data"; - version = "7.16.4"; + version = "7.16.8"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.16.4.tgz"; - sha512 = "1o/jo7D+kC9ZjHX5v+EHrdjl3PhxMrLSOTGsOdHJ+KL8HCaEK6ehrVL2RS6oHDZp+L7xLirLrPmQtEng769J/Q=="; + url = "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.16.8.tgz"; + sha512 = "m7OkX0IdKLKPpBlJtF561YJal5y/jyI5fNfWbPxh2D/nbzzGI4qRyrD8xO2jB24u7l+5I2a43scCG2IrfjC50Q=="; }; }; - "@babel/core-7.16.5" = { + "@babel/core-7.16.12" = { name = "_at_babel_slash_core"; packageName = "@babel/core"; - version = "7.16.5"; + version = "7.16.12"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/core/-/core-7.16.5.tgz"; - sha512 = "wUcenlLzuWMZ9Zt8S0KmFwGlH6QKRh3vsm/dhDA3CHkiTA45YuG1XkHRcNRl73EFPXDp/d5kVOU0/y7x2w6OaQ=="; + url = "https://registry.npmjs.org/@babel/core/-/core-7.16.12.tgz"; + sha512 = "dK5PtG1uiN2ikk++5OzSYsitZKny4wOCD0nrO4TqnW4BVBTQ2NGS3NgilvT/TEyxTST7LNyWV/T4tXDoD3fOgg=="; }; }; - "@babel/core-7.16.7" = { - name = "_at_babel_slash_core"; - packageName = "@babel/core"; - version = "7.16.7"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/core/-/core-7.16.7.tgz"; - sha512 = "aeLaqcqThRNZYmbMqtulsetOQZ/5gbR/dWruUCJcpas4Qoyy+QeagfDsPdMrqwsPRDNxJvBlRiZxxX7THO7qtA=="; - }; - }; - "@babel/generator-7.16.5" = { + "@babel/generator-7.16.8" = { name = "_at_babel_slash_generator"; packageName = "@babel/generator"; - version = "7.16.5"; + version = "7.16.8"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/generator/-/generator-7.16.5.tgz"; - sha512 = "kIvCdjZqcdKqoDbVVdt5R99icaRtrtYhYK/xux5qiWCBmfdvEYMFZ68QCrpE5cbFM1JsuArUNs1ZkuKtTtUcZA=="; + url = "https://registry.npmjs.org/@babel/generator/-/generator-7.16.8.tgz"; + sha512 = "1ojZwE9+lOXzcWdWmO6TbUzDfqLD39CmEhN8+2cX9XkDo5yW1OpgfejfliysR2AWLpMamTiOiAp/mtroaymhpw=="; }; }; - "@babel/generator-7.16.7" = { - name = "_at_babel_slash_generator"; - packageName = "@babel/generator"; - version = "7.16.7"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/generator/-/generator-7.16.7.tgz"; - sha512 = "/ST3Sg8MLGY5HVYmrjOgL60ENux/HfO/CsUh7y4MalThufhE/Ff/6EibFDHi4jiDCaWfJKoqbE6oTh21c5hrRg=="; - }; - }; - "@babel/helper-annotate-as-pure-7.16.0" = { + "@babel/helper-annotate-as-pure-7.16.7" = { name = "_at_babel_slash_helper-annotate-as-pure"; packageName = "@babel/helper-annotate-as-pure"; - version = "7.16.0"; + version = "7.16.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.16.0.tgz"; - sha512 = "ItmYF9vR4zA8cByDocY05o0LGUkp1zhbTQOH1NFyl5xXEqlTJQCEJjieriw+aFpxo16swMxUnUiKS7a/r4vtHg=="; + url = "https://registry.npmjs.org/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.16.7.tgz"; + sha512 = "s6t2w/IPQVTAET1HitoowRGXooX8mCgtuP5195wD/QJPV6wYjpujCGF7JuMODVX2ZAJOf1GT6DT9MHEZvLOFSw=="; }; }; - "@babel/helper-builder-binary-assignment-operator-visitor-7.16.5" = { + "@babel/helper-builder-binary-assignment-operator-visitor-7.16.7" = { name = "_at_babel_slash_helper-builder-binary-assignment-operator-visitor"; packageName = "@babel/helper-builder-binary-assignment-operator-visitor"; - version = "7.16.5"; + version = "7.16.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.16.5.tgz"; - sha512 = "3JEA9G5dmmnIWdzaT9d0NmFRgYnWUThLsDaL7982H0XqqWr56lRrsmwheXFMjR+TMl7QMBb6mzy9kvgr1lRLUA=="; - }; - }; - "@babel/helper-compilation-targets-7.16.3" = { - name = "_at_babel_slash_helper-compilation-targets"; - packageName = "@babel/helper-compilation-targets"; - version = "7.16.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.16.3.tgz"; - sha512 = "vKsoSQAyBmxS35JUOOt+07cLc6Nk/2ljLIHwmq2/NM6hdioUaqEXq/S+nXvbvXbZkNDlWOymPanJGOc4CBjSJA=="; + 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=="; }; }; "@babel/helper-compilation-targets-7.16.7" = { @@ -112,40 +76,31 @@ let sha512 = "mGojBwIWcwGD6rfqgRXVlVYmPAv7eOpIemUG3dGnDdCY4Pae70ROij3XmfrH6Fa1h1aiDylpglbZyktfzyo/hA=="; }; }; - "@babel/helper-create-class-features-plugin-7.16.5" = { + "@babel/helper-create-class-features-plugin-7.16.10" = { name = "_at_babel_slash_helper-create-class-features-plugin"; packageName = "@babel/helper-create-class-features-plugin"; - version = "7.16.5"; + version = "7.16.10"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.16.5.tgz"; - sha512 = "NEohnYA7mkB8L5JhU7BLwcBdU3j83IziR9aseMueWGeAjblbul3zzb8UvJ3a1zuBiqCMObzCJHFqKIQE6hTVmg=="; + url = "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.16.10.tgz"; + sha512 = "wDeej0pu3WN/ffTxMNCPW5UCiOav8IcLRxSIyp/9+IF2xJUM9h/OYjg0IJLHaL6F8oU8kqMz9nc1vryXhMsgXg=="; }; }; - "@babel/helper-create-regexp-features-plugin-7.16.0" = { + "@babel/helper-create-regexp-features-plugin-7.16.7" = { name = "_at_babel_slash_helper-create-regexp-features-plugin"; packageName = "@babel/helper-create-regexp-features-plugin"; - version = "7.16.0"; + version = "7.16.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.16.0.tgz"; - sha512 = "3DyG0zAFAZKcOp7aVr33ddwkxJ0Z0Jr5V99y3I690eYLpukJsJvAbzTy1ewoCqsML8SbIrjH14Jc/nSQ4TvNPA=="; + url = "https://registry.npmjs.org/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.16.7.tgz"; + sha512 = "fk5A6ymfp+O5+p2yCkXAu5Kyj6v0xh0RBeNcAkYUMDvvAAoxvSKXn+Jb37t/yWFiQVDFK1ELpUTD8/aLhCPu+g=="; }; }; - "@babel/helper-define-polyfill-provider-0.3.0" = { + "@babel/helper-define-polyfill-provider-0.3.1" = { name = "_at_babel_slash_helper-define-polyfill-provider"; packageName = "@babel/helper-define-polyfill-provider"; - version = "0.3.0"; + version = "0.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.3.0.tgz"; - sha512 = "7hfT8lUljl/tM3h+izTX/pO3W3frz2ok6Pk+gzys8iJqDfZrZy2pXjRTZAvG2YmfHun1X4q8/UZRLatMfqc5Tg=="; - }; - }; - "@babel/helper-environment-visitor-7.16.5" = { - name = "_at_babel_slash_helper-environment-visitor"; - packageName = "@babel/helper-environment-visitor"; - version = "7.16.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.16.5.tgz"; - sha512 = "ODQyc5AnxmZWm/R2W7fzhamOk1ey8gSguo5SGvF0zcB3uUzRpTRmM/jmLSm9bDMyPlvbyJ+PwPEK0BWIoZ9wjg=="; + url = "https://registry.npmjs.org/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.3.1.tgz"; + sha512 = "J9hGMpJQmtWmj46B3kBHmL38UhJGhYX7eqkcq+2gsstyYt341HmPeWspihX43yVRA0mS+8GGk2Gckc7bY/HCmA=="; }; }; "@babel/helper-environment-visitor-7.16.7" = { @@ -157,22 +112,13 @@ let sha512 = "SLLb0AAn6PkUeAfKJCCOl9e1R53pQlGAfc4y4XuMRZfqeMYLE0dM1LMhqbGAlGQY0lfw5/ohoYWAe9V1yibRag=="; }; }; - "@babel/helper-explode-assignable-expression-7.16.0" = { + "@babel/helper-explode-assignable-expression-7.16.7" = { name = "_at_babel_slash_helper-explode-assignable-expression"; packageName = "@babel/helper-explode-assignable-expression"; - version = "7.16.0"; + version = "7.16.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.16.0.tgz"; - sha512 = "Hk2SLxC9ZbcOhLpg/yMznzJ11W++lg5GMbxt1ev6TXUiJB0N42KPC+7w8a+eWGuqDnUYuwStJoZHM7RgmIOaGQ=="; - }; - }; - "@babel/helper-function-name-7.16.0" = { - name = "_at_babel_slash_helper-function-name"; - packageName = "@babel/helper-function-name"; - version = "7.16.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.16.0.tgz"; - sha512 = "BZh4mEk1xi2h4HFjWUXRQX5AEx4rvaZxHgax9gcjdLWdkjsY7MKt5p0otjsg5noXw+pB+clMCjw+aEVYADMjog=="; + url = "https://registry.npmjs.org/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.16.7.tgz"; + sha512 = "KyUenhWMC8VrxzkGP0Jizjo4/Zx+1nNZhgocs+gLzyZyB8SHidhoq9KK/8Ato4anhwsivfkBLftky7gvzbZMtQ=="; }; }; "@babel/helper-function-name-7.16.7" = { @@ -184,15 +130,6 @@ let sha512 = "QfDfEnIUyyBSR3HtrtGECuZ6DAyCkYFp7GHl75vFtTnn6pjKeK0T1DB5lLkFvBea8MdaiUABx3osbgLyInoejA=="; }; }; - "@babel/helper-get-function-arity-7.16.0" = { - name = "_at_babel_slash_helper-get-function-arity"; - packageName = "@babel/helper-get-function-arity"; - version = "7.16.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.16.0.tgz"; - sha512 = "ASCquNcywC1NkYh/z7Cgp3w31YW8aojjYIlNg4VeJiHkqyP4AzIvr4qx7pYDb4/s8YcsZWqqOSxgkvjUz1kpDQ=="; - }; - }; "@babel/helper-get-function-arity-7.16.7" = { name = "_at_babel_slash_helper-get-function-arity"; packageName = "@babel/helper-get-function-arity"; @@ -202,15 +139,6 @@ let sha512 = "flc+RLSOBXzNzVhcLu6ujeHUrD6tANAOU5ojrRx/as+tbzf8+stUCj7+IfRRoAbEZqj/ahXEMsjhOhgeZsrnTw=="; }; }; - "@babel/helper-hoist-variables-7.16.0" = { - name = "_at_babel_slash_helper-hoist-variables"; - packageName = "@babel/helper-hoist-variables"; - version = "7.16.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-hoist-variables/-/helper-hoist-variables-7.16.0.tgz"; - sha512 = "1AZlpazjUR0EQZQv3sgRNfM9mEVWPK3M6vlalczA+EECcPz3XPh6VplbErL5UoMpChhSck5wAJHthlj1bYpcmg=="; - }; - }; "@babel/helper-hoist-variables-7.16.7" = { name = "_at_babel_slash_helper-hoist-variables"; packageName = "@babel/helper-hoist-variables"; @@ -220,22 +148,13 @@ let sha512 = "m04d/0Op34H5v7pbZw6pSKP7weA6lsMvfiIAMeIvkY/R4xQtBSMFEigu9QTZ2qB/9l22vsxtM8a+Q8CzD255fg=="; }; }; - "@babel/helper-member-expression-to-functions-7.16.5" = { + "@babel/helper-member-expression-to-functions-7.16.7" = { name = "_at_babel_slash_helper-member-expression-to-functions"; packageName = "@babel/helper-member-expression-to-functions"; - version = "7.16.5"; + version = "7.16.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.16.5.tgz"; - sha512 = "7fecSXq7ZrLE+TWshbGT+HyCLkxloWNhTbU2QM1NTI/tDqyf0oZiMcEfYtDuUDCo528EOlt39G1rftea4bRZIw=="; - }; - }; - "@babel/helper-module-imports-7.16.0" = { - name = "_at_babel_slash_helper-module-imports"; - packageName = "@babel/helper-module-imports"; - version = "7.16.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-module-imports/-/helper-module-imports-7.16.0.tgz"; - sha512 = "kkH7sWzKPq0xt3H1n+ghb4xEMP8k0U7XV3kkB+ZGy69kDk2ySFW1qPi06sjKzFY3t1j6XbJSqr4mF9L7CYVyhg=="; + url = "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.16.7.tgz"; + sha512 = "VtJ/65tYiU/6AbMTDwyoXGPKHgTsfRarivm+YbB5uAzKUyuPjgZSgAFeG87FCigc7KNHu2Pegh1XIT3lXjvz3Q=="; }; }; "@babel/helper-module-imports-7.16.7" = { @@ -247,15 +166,6 @@ let sha512 = "LVtS6TqjJHFc+nYeITRo6VLXve70xmq7wPhWTqDJusJEgGmkAACWwMiTNrvfoQo6hEhFwAIixNkvB0jPXDL8Wg=="; }; }; - "@babel/helper-module-transforms-7.16.5" = { - name = "_at_babel_slash_helper-module-transforms"; - packageName = "@babel/helper-module-transforms"; - version = "7.16.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.16.5.tgz"; - sha512 = "CkvMxgV4ZyyioElFwcuWnDCcNIeyqTkCm9BxXZi73RR1ozqlpboqsbGUNvRTflgZtFbbJ1v5Emvm+lkjMYY/LQ=="; - }; - }; "@babel/helper-module-transforms-7.16.7" = { name = "_at_babel_slash_helper-module-transforms"; packageName = "@babel/helper-module-transforms"; @@ -265,22 +175,13 @@ let sha512 = "gaqtLDxJEFCeQbYp9aLAefjhkKdjKcdh6DB7jniIGU3Pz52WAmP268zK0VgPz9hUNkMSYeH976K2/Y6yPadpng=="; }; }; - "@babel/helper-optimise-call-expression-7.16.0" = { + "@babel/helper-optimise-call-expression-7.16.7" = { name = "_at_babel_slash_helper-optimise-call-expression"; packageName = "@babel/helper-optimise-call-expression"; - version = "7.16.0"; + version = "7.16.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.16.0.tgz"; - sha512 = "SuI467Gi2V8fkofm2JPnZzB/SUuXoJA5zXe/xzyPP2M04686RzFKFHPK6HDVN6JvWBIEW8tt9hPR7fXdn2Lgpw=="; - }; - }; - "@babel/helper-plugin-utils-7.16.5" = { - name = "_at_babel_slash_helper-plugin-utils"; - packageName = "@babel/helper-plugin-utils"; - version = "7.16.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-plugin-utils/-/helper-plugin-utils-7.16.5.tgz"; - sha512 = "59KHWHXxVA9K4HNF4sbHCf+eJeFe0Te/ZFGqBT4OjXhrwvA04sGfaEGsVTdsjoszq0YTP49RC9UKe5g8uN2RwQ=="; + url = "https://registry.npmjs.org/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.16.7.tgz"; + sha512 = "EtgBhg7rd/JcnpZFXpBy0ze1YRfdm7BnBX4uKMBd3ixa3RGAE002JZB66FJyNH7g0F38U05pXmA5P8cBh7z+1w=="; }; }; "@babel/helper-plugin-utils-7.16.7" = { @@ -292,31 +193,22 @@ let sha512 = "Qg3Nk7ZxpgMrsox6HreY1ZNKdBq7K72tDSliA6dCl5f007jR4ne8iD5UzuNnCJH2xBf2BEEVGr+/OL6Gdp7RxA=="; }; }; - "@babel/helper-remap-async-to-generator-7.16.5" = { + "@babel/helper-remap-async-to-generator-7.16.8" = { name = "_at_babel_slash_helper-remap-async-to-generator"; packageName = "@babel/helper-remap-async-to-generator"; - version = "7.16.5"; + version = "7.16.8"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.16.5.tgz"; - sha512 = "X+aAJldyxrOmN9v3FKp+Hu1NO69VWgYgDGq6YDykwRPzxs5f2N+X988CBXS7EQahDU+Vpet5QYMqLk+nsp+Qxw=="; + url = "https://registry.npmjs.org/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.16.8.tgz"; + sha512 = "fm0gH7Flb8H51LqJHy3HJ3wnE1+qtYR2A99K06ahwrawLdOFsCEWjZOrYricXJHoPSudNKxrMBUPEIPxiIIvBw=="; }; }; - "@babel/helper-replace-supers-7.16.5" = { + "@babel/helper-replace-supers-7.16.7" = { name = "_at_babel_slash_helper-replace-supers"; packageName = "@babel/helper-replace-supers"; - version = "7.16.5"; + version = "7.16.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.16.5.tgz"; - sha512 = "ao3seGVa/FZCMCCNDuBcqnBFSbdr8N2EW35mzojx3TwfIbdPmNK+JV6+2d5bR0Z71W5ocLnQp9en/cTF7pBJiQ=="; - }; - }; - "@babel/helper-simple-access-7.16.0" = { - name = "_at_babel_slash_helper-simple-access"; - packageName = "@babel/helper-simple-access"; - version = "7.16.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.16.0.tgz"; - sha512 = "o1rjBT/gppAqKsYfUdfHq5Rk03lMQrkPHG1OWzHWpLgVXRH4HnMM9Et9CVdIqwkCQlobnGHEJMsgWP/jE1zUiw=="; + url = "https://registry.npmjs.org/@babel/helper-replace-supers/-/helper-replace-supers-7.16.7.tgz"; + sha512 = "y9vsWilTNaVnVh6xiJfABzsNpgDPKev9HnAgz6Gb1p6UUwf9NepdlsV7VXGCftJM+jqD5f7JIEubcpLjZj5dBw=="; }; }; "@babel/helper-simple-access-7.16.7" = { @@ -337,15 +229,6 @@ let sha512 = "+il1gTy0oHwUsBQZyJvukbB4vPMdcYBrFHa0Uc4AizLxbq6BOYC51Rv4tWocX9BLBDLZ4kc6qUFpQ6HRgL+3zw=="; }; }; - "@babel/helper-split-export-declaration-7.16.0" = { - name = "_at_babel_slash_helper-split-export-declaration"; - packageName = "@babel/helper-split-export-declaration"; - version = "7.16.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.16.0.tgz"; - sha512 = "0YMMRpuDFNGTHNRiiqJX19GjNXA4H0E8jZ2ibccfSxaCogbm3am5WN/2nQNj0YnQwGWM1J06GOcQ2qnh3+0paw=="; - }; - }; "@babel/helper-split-export-declaration-7.16.7" = { name = "_at_babel_slash_helper-split-export-declaration"; packageName = "@babel/helper-split-export-declaration"; @@ -355,15 +238,6 @@ let sha512 = "xbWoy/PFoxSWazIToT9Sif+jJTlrMcndIsaOKvTA6u7QEo7ilkRZpjew18/W3c7nm8fXdUDXh02VXTbZ0pGDNw=="; }; }; - "@babel/helper-validator-identifier-7.15.7" = { - name = "_at_babel_slash_helper-validator-identifier"; - packageName = "@babel/helper-validator-identifier"; - version = "7.15.7"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-validator-identifier/-/helper-validator-identifier-7.15.7.tgz"; - sha512 = "K4JvCtQqad9OY2+yTU8w+E82ywk/fe+ELNlt1G8z3bVGlZfn/hOcQQsUhGhW/N+tb3fxK800wLtKOE/aM0m72w=="; - }; - }; "@babel/helper-validator-identifier-7.16.7" = { name = "_at_babel_slash_helper-validator-identifier"; packageName = "@babel/helper-validator-identifier"; @@ -373,15 +247,6 @@ let sha512 = "hsEnFemeiW4D08A5gUAZxLBTXpZ39P+a+DGDsHw1yxqyQ/jzFEnxf5uTEGp+3bzAbNOxU1paTgYS4ECU/IgfDw=="; }; }; - "@babel/helper-validator-option-7.14.5" = { - name = "_at_babel_slash_helper-validator-option"; - packageName = "@babel/helper-validator-option"; - version = "7.14.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-validator-option/-/helper-validator-option-7.14.5.tgz"; - sha512 = "OX8D5eeX4XwcroVW45NMvoYaIuFI+GQpA2a8Gi+X/U/cDUIRsV37qQfF905F0htTRCREQIB4KqPeaveRJUl3Ow=="; - }; - }; "@babel/helper-validator-option-7.16.7" = { name = "_at_babel_slash_helper-validator-option"; packageName = "@babel/helper-validator-option"; @@ -391,22 +256,13 @@ let sha512 = "TRtenOuRUVo9oIQGPC5G9DgK4743cdxvtOw0weQNpZXaS16SCBi5MNjZF8vba3ETURjZpTbVn7Vvcf2eAwFozQ=="; }; }; - "@babel/helper-wrap-function-7.16.5" = { + "@babel/helper-wrap-function-7.16.8" = { name = "_at_babel_slash_helper-wrap-function"; packageName = "@babel/helper-wrap-function"; - version = "7.16.5"; + version = "7.16.8"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.16.5.tgz"; - sha512 = "2J2pmLBqUqVdJw78U0KPNdeE2qeuIyKoG4mKV7wAq3mc4jJG282UgjZw4ZYDnqiWQuS3Y3IYdF/AQ6CpyBV3VA=="; - }; - }; - "@babel/helpers-7.16.5" = { - name = "_at_babel_slash_helpers"; - packageName = "@babel/helpers"; - version = "7.16.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/helpers/-/helpers-7.16.5.tgz"; - sha512 = "TLgi6Lh71vvMZGEkFuIxzaPsyeYCHQ5jJOOX1f0xXn0uciFuE8cEk0wyBquMcCxBXZ5BJhE2aUB7pnWTD150Tw=="; + url = "https://registry.npmjs.org/@babel/helper-wrap-function/-/helper-wrap-function-7.16.8.tgz"; + sha512 = "8RpyRVIAW1RcDDGTA+GpPAwV22wXCfKOoM9bet6TLkGIFTkRQSkH1nMQ5Yet4MpoXe1ZwHPVtNasc2w0uZMqnw=="; }; }; "@babel/helpers-7.16.7" = { @@ -418,202 +274,184 @@ let sha512 = "9ZDoqtfY7AuEOt3cxchfii6C7GDyyMBffktR5B2jvWv8u2+efwvpnVKXMWzNehqy68tKgAfSwfdw/lWpthS2bw=="; }; }; - "@babel/highlight-7.16.0" = { + "@babel/highlight-7.16.10" = { name = "_at_babel_slash_highlight"; packageName = "@babel/highlight"; - version = "7.16.0"; + version = "7.16.10"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/highlight/-/highlight-7.16.0.tgz"; - sha512 = "t8MH41kUQylBtu2+4IQA3atqevA2lRgqA2wyVB/YiWmsDSuylZZuXOUy9ric30hfzauEFfdsuk/eXTRrGrfd0g=="; + url = "https://registry.npmjs.org/@babel/highlight/-/highlight-7.16.10.tgz"; + sha512 = "5FnTQLSLswEj6IkgVw5KusNUUFY9ZGqe/TRFnP/BKYHYgfh7tc+C7mwiy95/yNP7Dh9x580Vv8r7u7ZfTBFxdw=="; }; }; - "@babel/highlight-7.16.7" = { - name = "_at_babel_slash_highlight"; - packageName = "@babel/highlight"; - version = "7.16.7"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/highlight/-/highlight-7.16.7.tgz"; - sha512 = "aKpPMfLvGO3Q97V0qhw/V2SWNWlwfJknuwAunU7wZLSfrM4xTBvg7E5opUVi1kJTBKihE38CPg4nBiqX83PWYw=="; - }; - }; - "@babel/parser-7.16.6" = { + "@babel/parser-7.16.12" = { name = "_at_babel_slash_parser"; packageName = "@babel/parser"; - version = "7.16.6"; + version = "7.16.12"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/parser/-/parser-7.16.6.tgz"; - sha512 = "Gr86ujcNuPDnNOY8mi383Hvi8IYrJVJYuf3XcuBM/Dgd+bINn/7tHqsj+tKkoreMbmGsFLsltI/JJd8fOFWGDQ=="; + url = "https://registry.npmjs.org/@babel/parser/-/parser-7.16.12.tgz"; + sha512 = "VfaV15po8RiZssrkPweyvbGVSe4x2y+aciFCgn0n0/SJMR22cwofRV1mtnJQYcSB1wUTaA/X1LnA3es66MCO5A=="; }; }; - "@babel/parser-7.16.7" = { - name = "_at_babel_slash_parser"; - packageName = "@babel/parser"; - version = "7.16.7"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/parser/-/parser-7.16.7.tgz"; - sha512 = "sR4eaSrnM7BV7QPzGfEX5paG/6wrZM3I0HDzfIAK06ESvo9oy3xBuVBxE3MbQaKNhvg8g/ixjMWo2CGpzpHsDA=="; - }; - }; - "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.16.2" = { + "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.16.7" = { name = "_at_babel_slash_plugin-bugfix-safari-id-destructuring-collision-in-function-expression"; packageName = "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression"; - version = "7.16.2"; + version = "7.16.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.16.2.tgz"; - sha512 = "h37CvpLSf8gb2lIJ2CgC3t+EjFbi0t8qS7LCS1xcJIlEXE4czlofwaW7W1HA8zpgOCzI9C1nmoqNR1zWkk0pQg=="; + url = "https://registry.npmjs.org/@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression/-/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.16.7.tgz"; + sha512 = "anv/DObl7waiGEnC24O9zqL0pSuI9hljihqiDuFHC8d7/bjr/4RLGPWuc8rYOff/QPzbEPSkzG8wGG9aDuhHRg=="; }; }; - "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.16.0" = { + "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.16.7" = { name = "_at_babel_slash_plugin-bugfix-v8-spread-parameters-in-optional-chaining"; packageName = "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining"; - version = "7.16.0"; + version = "7.16.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.16.0.tgz"; - sha512 = "4tcFwwicpWTrpl9qjf7UsoosaArgImF85AxqCRZlgc3IQDvkUHjJpruXAL58Wmj+T6fypWTC/BakfEkwIL/pwA=="; + url = "https://registry.npmjs.org/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.16.7.tgz"; + sha512 = "di8vUHRdf+4aJ7ltXhaDbPoszdkh59AQtJM5soLsuHpQJdFQZOA4uGj0V2u/CZ8bJ/u8ULDL5yq6FO/bCXnKHw=="; }; }; - "@babel/plugin-proposal-async-generator-functions-7.16.5" = { + "@babel/plugin-proposal-async-generator-functions-7.16.8" = { name = "_at_babel_slash_plugin-proposal-async-generator-functions"; packageName = "@babel/plugin-proposal-async-generator-functions"; - version = "7.16.5"; + version = "7.16.8"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.16.5.tgz"; - sha512 = "C/FX+3HNLV6sz7AqbTQqEo1L9/kfrKjxcVtgyBCmvIgOjvuBVUWooDoi7trsLxOzCEo5FccjRvKHkfDsJFZlfA=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.16.8.tgz"; + sha512 = "71YHIvMuiuqWJQkebWJtdhQTfd4Q4mF76q2IX37uZPkG9+olBxsX+rH1vkhFto4UeJZ9dPY2s+mDvhDm1u2BGQ=="; }; }; - "@babel/plugin-proposal-class-properties-7.16.5" = { + "@babel/plugin-proposal-class-properties-7.16.7" = { name = "_at_babel_slash_plugin-proposal-class-properties"; packageName = "@babel/plugin-proposal-class-properties"; - version = "7.16.5"; + version = "7.16.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.16.5.tgz"; - sha512 = "pJD3HjgRv83s5dv1sTnDbZOaTjghKEz8KUn1Kbh2eAIRhGuyQ1XSeI4xVXU3UlIEVA3DAyIdxqT1eRn7Wcn55A=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.16.7.tgz"; + sha512 = "IobU0Xme31ewjYOShSIqd/ZGM/r/cuOz2z0MDbNrhF5FW+ZVgi0f2lyeoj9KFPDOAqsYxmLWZte1WOwlvY9aww=="; }; }; - "@babel/plugin-proposal-class-static-block-7.16.5" = { + "@babel/plugin-proposal-class-static-block-7.16.7" = { name = "_at_babel_slash_plugin-proposal-class-static-block"; packageName = "@babel/plugin-proposal-class-static-block"; - version = "7.16.5"; + version = "7.16.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-class-static-block/-/plugin-proposal-class-static-block-7.16.5.tgz"; - sha512 = "EEFzuLZcm/rNJ8Q5krK+FRKdVkd6FjfzT9tuSZql9sQn64K0hHA2KLJ0DqVot9/iV6+SsuadC5yI39zWnm+nmQ=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-class-static-block/-/plugin-proposal-class-static-block-7.16.7.tgz"; + sha512 = "dgqJJrcZoG/4CkMopzhPJjGxsIe9A8RlkQLnL/Vhhx8AA9ZuaRwGSlscSh42hazc7WSrya/IK7mTeoF0DP9tEw=="; }; }; - "@babel/plugin-proposal-decorators-7.16.5" = { + "@babel/plugin-proposal-decorators-7.16.7" = { name = "_at_babel_slash_plugin-proposal-decorators"; packageName = "@babel/plugin-proposal-decorators"; - version = "7.16.5"; + version = "7.16.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.16.5.tgz"; - sha512 = "XAiZll5oCdp2Dd2RbXA3LVPlFyIRhhcQy+G34p9ePpl6mjFkbqHAYHovyw2j5mqUrlBf0/+MtOIJ3JGYtz8qaw=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.16.7.tgz"; + sha512 = "DoEpnuXK14XV9btI1k8tzNGCutMclpj4yru8aXKoHlVmbO1s+2A+g2+h4JhcjrxkFJqzbymnLG6j/niOf3iFXQ=="; }; }; - "@babel/plugin-proposal-dynamic-import-7.16.5" = { + "@babel/plugin-proposal-dynamic-import-7.16.7" = { name = "_at_babel_slash_plugin-proposal-dynamic-import"; packageName = "@babel/plugin-proposal-dynamic-import"; - version = "7.16.5"; + version = "7.16.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.16.5.tgz"; - sha512 = "P05/SJZTTvHz79LNYTF8ff5xXge0kk5sIIWAypcWgX4BTRUgyHc8wRxJ/Hk+mU0KXldgOOslKaeqnhthcDJCJQ=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.16.7.tgz"; + sha512 = "I8SW9Ho3/8DRSdmDdH3gORdyUuYnk1m4cMxUAdu5oy4n3OfN8flDEH+d60iG7dUfi0KkYwSvoalHzzdRzpWHTg=="; }; }; - "@babel/plugin-proposal-export-namespace-from-7.16.5" = { + "@babel/plugin-proposal-export-namespace-from-7.16.7" = { name = "_at_babel_slash_plugin-proposal-export-namespace-from"; packageName = "@babel/plugin-proposal-export-namespace-from"; - version = "7.16.5"; + version = "7.16.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.16.5.tgz"; - sha512 = "i+sltzEShH1vsVydvNaTRsgvq2vZsfyrd7K7vPLUU/KgS0D5yZMe6uipM0+izminnkKrEfdUnz7CxMRb6oHZWw=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.16.7.tgz"; + sha512 = "ZxdtqDXLRGBL64ocZcs7ovt71L3jhC1RGSyR996svrCi3PYqHNkb3SwPJCs8RIzD86s+WPpt2S73+EHCGO+NUA=="; }; }; - "@babel/plugin-proposal-json-strings-7.16.5" = { + "@babel/plugin-proposal-json-strings-7.16.7" = { name = "_at_babel_slash_plugin-proposal-json-strings"; packageName = "@babel/plugin-proposal-json-strings"; - version = "7.16.5"; + version = "7.16.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.16.5.tgz"; - sha512 = "QQJueTFa0y9E4qHANqIvMsuxM/qcLQmKttBACtPCQzGUEizsXDACGonlPiSwynHfOa3vNw0FPMVvQzbuXwh4SQ=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.16.7.tgz"; + sha512 = "lNZ3EEggsGY78JavgbHsK9u5P3pQaW7k4axlgFLYkMd7UBsiNahCITShLjNQschPyjtO6dADrL24757IdhBrsQ=="; }; }; - "@babel/plugin-proposal-logical-assignment-operators-7.16.5" = { + "@babel/plugin-proposal-logical-assignment-operators-7.16.7" = { name = "_at_babel_slash_plugin-proposal-logical-assignment-operators"; packageName = "@babel/plugin-proposal-logical-assignment-operators"; - version = "7.16.5"; + version = "7.16.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.16.5.tgz"; - sha512 = "xqibl7ISO2vjuQM+MzR3rkd0zfNWltk7n9QhaD8ghMmMceVguYrNDt7MikRyj4J4v3QehpnrU8RYLnC7z/gZLA=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.16.7.tgz"; + sha512 = "K3XzyZJGQCr00+EtYtrDjmwX7o7PLK6U9bi1nCwkQioRFVUv6dJoxbQjtWVtP+bCPy82bONBKG8NPyQ4+i6yjg=="; }; }; - "@babel/plugin-proposal-nullish-coalescing-operator-7.16.5" = { + "@babel/plugin-proposal-nullish-coalescing-operator-7.16.7" = { name = "_at_babel_slash_plugin-proposal-nullish-coalescing-operator"; packageName = "@babel/plugin-proposal-nullish-coalescing-operator"; - version = "7.16.5"; + version = "7.16.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.16.5.tgz"; - sha512 = "YwMsTp/oOviSBhrjwi0vzCUycseCYwoXnLiXIL3YNjHSMBHicGTz7GjVU/IGgz4DtOEXBdCNG72pvCX22ehfqg=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.16.7.tgz"; + sha512 = "aUOrYU3EVtjf62jQrCj63pYZ7k6vns2h/DQvHPWGmsJRYzWXZ6/AsfgpiRy6XiuIDADhJzP2Q9MwSMKauBQ+UQ=="; }; }; - "@babel/plugin-proposal-numeric-separator-7.16.5" = { + "@babel/plugin-proposal-numeric-separator-7.16.7" = { name = "_at_babel_slash_plugin-proposal-numeric-separator"; packageName = "@babel/plugin-proposal-numeric-separator"; - version = "7.16.5"; + version = "7.16.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.16.5.tgz"; - sha512 = "DvB9l/TcsCRvsIV9v4jxR/jVP45cslTVC0PMVHvaJhhNuhn2Y1SOhCSFlPK777qLB5wb8rVDaNoqMTyOqtY5Iw=="; + 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=="; }; }; - "@babel/plugin-proposal-object-rest-spread-7.16.5" = { + "@babel/plugin-proposal-object-rest-spread-7.16.7" = { name = "_at_babel_slash_plugin-proposal-object-rest-spread"; packageName = "@babel/plugin-proposal-object-rest-spread"; - version = "7.16.5"; + version = "7.16.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.16.5.tgz"; - sha512 = "UEd6KpChoyPhCoE840KRHOlGhEZFutdPDMGj+0I56yuTTOaT51GzmnEl/0uT41fB/vD2nT+Pci2KjezyE3HmUw=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.16.7.tgz"; + sha512 = "3O0Y4+dw94HA86qSg9IHfyPktgR7q3gpNVAeiKQd+8jBKFaU5NQS1Yatgo4wY+UFNuLjvxcSmzcsHqrhgTyBUA=="; }; }; - "@babel/plugin-proposal-optional-catch-binding-7.16.5" = { + "@babel/plugin-proposal-optional-catch-binding-7.16.7" = { name = "_at_babel_slash_plugin-proposal-optional-catch-binding"; packageName = "@babel/plugin-proposal-optional-catch-binding"; - version = "7.16.5"; + version = "7.16.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.16.5.tgz"; - sha512 = "ihCMxY1Iljmx4bWy/PIMJGXN4NS4oUj1MKynwO07kiKms23pNvIn1DMB92DNB2R0EA882sw0VXIelYGdtF7xEQ=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.16.7.tgz"; + sha512 = "eMOH/L4OvWSZAE1VkHbr1vckLG1WUcHGJSLqqQwl2GaUqG6QjddvrOaTUMNYiv77H5IKPMZ9U9P7EaHwvAShfA=="; }; }; - "@babel/plugin-proposal-optional-chaining-7.16.5" = { + "@babel/plugin-proposal-optional-chaining-7.16.7" = { name = "_at_babel_slash_plugin-proposal-optional-chaining"; packageName = "@babel/plugin-proposal-optional-chaining"; - version = "7.16.5"; + version = "7.16.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.16.5.tgz"; - sha512 = "kzdHgnaXRonttiTfKYnSVafbWngPPr2qKw9BWYBESl91W54e+9R5pP70LtWxV56g0f05f/SQrwHYkfvbwcdQ/A=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.16.7.tgz"; + sha512 = "eC3xy+ZrUcBtP7x+sq62Q/HYd674pPTb/77XZMb5wbDPGWIdUbSr4Agr052+zaUPSb+gGRnjxXfKFvx5iMJ+DA=="; }; }; - "@babel/plugin-proposal-private-methods-7.16.5" = { + "@babel/plugin-proposal-private-methods-7.16.11" = { name = "_at_babel_slash_plugin-proposal-private-methods"; packageName = "@babel/plugin-proposal-private-methods"; - version = "7.16.5"; + version = "7.16.11"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.16.5.tgz"; - sha512 = "+yFMO4BGT3sgzXo+lrq7orX5mAZt57DwUK6seqII6AcJnJOIhBJ8pzKH47/ql/d426uQ7YhN8DpUFirQzqYSUA=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.16.11.tgz"; + sha512 = "F/2uAkPlXDr8+BHpZvo19w3hLFKge+k75XUprE6jaqKxjGkSYcK+4c+bup5PdW/7W/Rpjwql7FTVEDW+fRAQsw=="; }; }; - "@babel/plugin-proposal-private-property-in-object-7.16.5" = { + "@babel/plugin-proposal-private-property-in-object-7.16.7" = { name = "_at_babel_slash_plugin-proposal-private-property-in-object"; packageName = "@babel/plugin-proposal-private-property-in-object"; - version = "7.16.5"; + version = "7.16.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.16.5.tgz"; - sha512 = "+YGh5Wbw0NH3y/E5YMu6ci5qTDmAEVNoZ3I54aB6nVEOZ5BQ7QJlwKq5pYVucQilMByGn/bvX0af+uNaPRCabA=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.16.7.tgz"; + sha512 = "rMQkjcOFbm+ufe3bTZLyOfsOUOxyvLXZJCTARhJr+8UMSoZmqTe1K1BgkFcrW37rAchWg57yI69ORxiWvUINuQ=="; }; }; - "@babel/plugin-proposal-unicode-property-regex-7.16.5" = { + "@babel/plugin-proposal-unicode-property-regex-7.16.7" = { name = "_at_babel_slash_plugin-proposal-unicode-property-regex"; packageName = "@babel/plugin-proposal-unicode-property-regex"; - version = "7.16.5"; + version = "7.16.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.16.5.tgz"; - sha512 = "s5sKtlKQyFSatt781HQwv1hoM5BQ9qRH30r+dK56OLDsHmV74mzwJNX7R1yMuE7VZKG5O6q/gmOGSAO6ikTudg=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.16.7.tgz"; + sha512 = "QRK0YI/40VLhNVGIjRNAAQkEHws0cswSdFFjpFyt943YmJIU1da9uW63Iu6NFV6CxTZW5eTDCrwZUstBWgp/Rg=="; }; }; "@babel/plugin-syntax-async-generators-7.8.4" = { @@ -652,13 +490,13 @@ let sha512 = "b+YyPmr6ldyNnM6sqYeMWE+bgJcJpO6yS4QD7ymxgH34GBPNDM/THBh8iunyvKIZztiwLH4CJZ0RxTk9emgpjw=="; }; }; - "@babel/plugin-syntax-decorators-7.16.5" = { + "@babel/plugin-syntax-decorators-7.16.7" = { name = "_at_babel_slash_plugin-syntax-decorators"; packageName = "@babel/plugin-syntax-decorators"; - version = "7.16.5"; + version = "7.16.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-syntax-decorators/-/plugin-syntax-decorators-7.16.5.tgz"; - sha512 = "3CbYTXfflvyy8O819uhZcZSMedZG4J8yS/NLTc/8T24M9ke1GssTGvg8VZu3Yn2LU5IyQSv1CmPq0a9JWHXJwg=="; + url = "https://registry.npmjs.org/@babel/plugin-syntax-decorators/-/plugin-syntax-decorators-7.16.7.tgz"; + sha512 = "vQ+PxL+srA7g6Rx6I1e15m55gftknl2X8GCUW1JTlkTaXZLJOS0UcaY0eK9jYT7IYf4awn6qwyghVHLDz1WyMw=="; }; }; "@babel/plugin-syntax-dynamic-import-7.8.3" = { @@ -769,15 +607,6 @@ let sha512 = "hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw=="; }; }; - "@babel/plugin-syntax-typescript-7.16.5" = { - name = "_at_babel_slash_plugin-syntax-typescript"; - packageName = "@babel/plugin-syntax-typescript"; - version = "7.16.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-syntax-typescript/-/plugin-syntax-typescript-7.16.5.tgz"; - sha512 = "/d4//lZ1Vqb4mZ5xTep3dDK888j7BGM/iKqBmndBaoYAFPlPKrGU608VVBz5JeyAb6YQDjRu1UKqj86UhwWVgw=="; - }; - }; "@babel/plugin-syntax-typescript-7.16.7" = { name = "_at_babel_slash_plugin-syntax-typescript"; packageName = "@babel/plugin-syntax-typescript"; @@ -787,310 +616,310 @@ let sha512 = "YhUIJHHGkqPgEcMYkPCKTyGUdoGKWtopIycQyjJH8OjvRgOYsXsaKehLVPScKJWAULPxMa4N1vCe6szREFlZ7A=="; }; }; - "@babel/plugin-transform-arrow-functions-7.16.5" = { + "@babel/plugin-transform-arrow-functions-7.16.7" = { name = "_at_babel_slash_plugin-transform-arrow-functions"; packageName = "@babel/plugin-transform-arrow-functions"; - version = "7.16.5"; + version = "7.16.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.16.5.tgz"; - sha512 = "8bTHiiZyMOyfZFULjsCnYOWG059FVMes0iljEHSfARhNgFfpsqE92OrCffv3veSw9rwMkYcFe9bj0ZoXU2IGtQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.16.7.tgz"; + sha512 = "9ffkFFMbvzTvv+7dTp/66xvZAWASuPD5Tl9LK3Z9vhOmANo6j94rik+5YMBt4CwHVMWLWpMsriIc2zsa3WW3xQ=="; }; }; - "@babel/plugin-transform-async-to-generator-7.16.5" = { + "@babel/plugin-transform-async-to-generator-7.16.8" = { name = "_at_babel_slash_plugin-transform-async-to-generator"; packageName = "@babel/plugin-transform-async-to-generator"; - version = "7.16.5"; + version = "7.16.8"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.16.5.tgz"; - sha512 = "TMXgfioJnkXU+XRoj7P2ED7rUm5jbnDWwlCuFVTpQboMfbSya5WrmubNBAMlk7KXvywpo8rd8WuYZkis1o2H8w=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.16.8.tgz"; + sha512 = "MtmUmTJQHCnyJVrScNzNlofQJ3dLFuobYn3mwOTKHnSCMtbNsqvF71GQmJfFjdrXSsAA7iysFmYWw4bXZ20hOg=="; }; }; - "@babel/plugin-transform-block-scoped-functions-7.16.5" = { + "@babel/plugin-transform-block-scoped-functions-7.16.7" = { name = "_at_babel_slash_plugin-transform-block-scoped-functions"; packageName = "@babel/plugin-transform-block-scoped-functions"; - version = "7.16.5"; + version = "7.16.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.16.5.tgz"; - sha512 = "BxmIyKLjUGksJ99+hJyL/HIxLIGnLKtw772zYDER7UuycDZ+Xvzs98ZQw6NGgM2ss4/hlFAaGiZmMNKvValEjw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.16.7.tgz"; + sha512 = "JUuzlzmF40Z9cXyytcbZEZKckgrQzChbQJw/5PuEHYeqzCsvebDx0K0jWnIIVcmmDOAVctCgnYs0pMcrYj2zJg=="; }; }; - "@babel/plugin-transform-block-scoping-7.16.5" = { + "@babel/plugin-transform-block-scoping-7.16.7" = { name = "_at_babel_slash_plugin-transform-block-scoping"; packageName = "@babel/plugin-transform-block-scoping"; - version = "7.16.5"; + version = "7.16.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.16.5.tgz"; - sha512 = "JxjSPNZSiOtmxjX7PBRBeRJTUKTyJ607YUYeT0QJCNdsedOe+/rXITjP08eG8xUpsLfPirgzdCFN+h0w6RI+pQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.16.7.tgz"; + sha512 = "ObZev2nxVAYA4bhyusELdo9hb3H+A56bxH3FZMbEImZFiEDYVHXQSJ1hQKFlDnlt8G9bBrCZ5ZpURZUrV4G5qQ=="; }; }; - "@babel/plugin-transform-classes-7.16.5" = { + "@babel/plugin-transform-classes-7.16.7" = { name = "_at_babel_slash_plugin-transform-classes"; packageName = "@babel/plugin-transform-classes"; - version = "7.16.5"; + version = "7.16.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.16.5.tgz"; - sha512 = "DzJ1vYf/7TaCYy57J3SJ9rV+JEuvmlnvvyvYKFbk5u46oQbBvuB9/0w+YsVsxkOv8zVWKpDmUoj4T5ILHoXevA=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-classes/-/plugin-transform-classes-7.16.7.tgz"; + sha512 = "WY7og38SFAGYRe64BrjKf8OrE6ulEHtr5jEYaZMwox9KebgqPi67Zqz8K53EKk1fFEJgm96r32rkKZ3qA2nCWQ=="; }; }; - "@babel/plugin-transform-computed-properties-7.16.5" = { + "@babel/plugin-transform-computed-properties-7.16.7" = { name = "_at_babel_slash_plugin-transform-computed-properties"; packageName = "@babel/plugin-transform-computed-properties"; - version = "7.16.5"; + version = "7.16.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.16.5.tgz"; - sha512 = "n1+O7xtU5lSLraRzX88CNcpl7vtGdPakKzww74bVwpAIRgz9JVLJJpOLb0uYqcOaXVM0TL6X0RVeIJGD2CnCkg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.16.7.tgz"; + sha512 = "gN72G9bcmenVILj//sv1zLNaPyYcOzUho2lIJBMh/iakJ9ygCo/hEF9cpGb61SCMEDxbbyBoVQxrt+bWKu5KGw=="; }; }; - "@babel/plugin-transform-destructuring-7.16.5" = { + "@babel/plugin-transform-destructuring-7.16.7" = { name = "_at_babel_slash_plugin-transform-destructuring"; packageName = "@babel/plugin-transform-destructuring"; - version = "7.16.5"; + version = "7.16.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.16.5.tgz"; - sha512 = "GuRVAsjq+c9YPK6NeTkRLWyQskDC099XkBSVO+6QzbnOnH2d/4mBVXYStaPrZD3dFRfg00I6BFJ9Atsjfs8mlg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.16.7.tgz"; + sha512 = "VqAwhTHBnu5xBVDCvrvqJbtLUa++qZaWC0Fgr2mqokBlulZARGyIvZDoqbPlPaKImQ9dKAcCzbv+ul//uqu70A=="; }; }; - "@babel/plugin-transform-dotall-regex-7.16.5" = { + "@babel/plugin-transform-dotall-regex-7.16.7" = { name = "_at_babel_slash_plugin-transform-dotall-regex"; packageName = "@babel/plugin-transform-dotall-regex"; - version = "7.16.5"; + version = "7.16.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.16.5.tgz"; - sha512 = "iQiEMt8Q4/5aRGHpGVK2Zc7a6mx7qEAO7qehgSug3SDImnuMzgmm/wtJALXaz25zUj1PmnNHtShjFgk4PDx4nw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.16.7.tgz"; + sha512 = "Lyttaao2SjZF6Pf4vk1dVKv8YypMpomAbygW+mU5cYP3S5cWTfCJjG8xV6CFdzGFlfWK81IjL9viiTvpb6G7gQ=="; }; }; - "@babel/plugin-transform-duplicate-keys-7.16.5" = { + "@babel/plugin-transform-duplicate-keys-7.16.7" = { name = "_at_babel_slash_plugin-transform-duplicate-keys"; packageName = "@babel/plugin-transform-duplicate-keys"; - version = "7.16.5"; + version = "7.16.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.16.5.tgz"; - sha512 = "81tijpDg2a6I1Yhj4aWY1l3O1J4Cg/Pd7LfvuaH2VVInAkXtzibz9+zSPdUM1WvuUi128ksstAP0hM5w48vQgg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.16.7.tgz"; + sha512 = "03DvpbRfvWIXyK0/6QiR1KMTWeT6OcQ7tbhjrXyFS02kjuX/mu5Bvnh5SDSWHxyawit2g5aWhKwI86EE7GUnTw=="; }; }; - "@babel/plugin-transform-exponentiation-operator-7.16.5" = { + "@babel/plugin-transform-exponentiation-operator-7.16.7" = { name = "_at_babel_slash_plugin-transform-exponentiation-operator"; packageName = "@babel/plugin-transform-exponentiation-operator"; - version = "7.16.5"; + version = "7.16.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.16.5.tgz"; - sha512 = "12rba2HwemQPa7BLIKCzm1pT2/RuQHtSFHdNl41cFiC6oi4tcrp7gjB07pxQvFpcADojQywSjblQth6gJyE6CA=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.16.7.tgz"; + sha512 = "8UYLSlyLgRixQvlYH3J2ekXFHDFLQutdy7FfFAMm3CPZ6q9wHCwnUyiXpQCe3gVVnQlHc5nsuiEVziteRNTXEA=="; }; }; - "@babel/plugin-transform-for-of-7.16.5" = { + "@babel/plugin-transform-for-of-7.16.7" = { name = "_at_babel_slash_plugin-transform-for-of"; packageName = "@babel/plugin-transform-for-of"; - version = "7.16.5"; + version = "7.16.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.16.5.tgz"; - sha512 = "+DpCAJFPAvViR17PIMi9x2AE34dll5wNlXO43wagAX2YcRGgEVHCNFC4azG85b4YyyFarvkc/iD5NPrz4Oneqw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.16.7.tgz"; + sha512 = "/QZm9W92Ptpw7sjI9Nx1mbcsWz33+l8kuMIQnDwgQBG5s3fAfQvkRjQ7NqXhtNcKOnPkdICmUHyCaWW06HCsqg=="; }; }; - "@babel/plugin-transform-function-name-7.16.5" = { + "@babel/plugin-transform-function-name-7.16.7" = { name = "_at_babel_slash_plugin-transform-function-name"; packageName = "@babel/plugin-transform-function-name"; - version = "7.16.5"; + version = "7.16.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.16.5.tgz"; - sha512 = "Fuec/KPSpVLbGo6z1RPw4EE1X+z9gZk1uQmnYy7v4xr4TO9p41v1AoUuXEtyqAI7H+xNJYSICzRqZBhDEkd3kQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.16.7.tgz"; + sha512 = "SU/C68YVwTRxqWj5kgsbKINakGag0KTgq9f2iZEXdStoAbOzLHEBRYzImmA6yFo8YZhJVflvXmIHUO7GWHmxxA=="; }; }; - "@babel/plugin-transform-literals-7.16.5" = { + "@babel/plugin-transform-literals-7.16.7" = { name = "_at_babel_slash_plugin-transform-literals"; packageName = "@babel/plugin-transform-literals"; - version = "7.16.5"; + version = "7.16.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.16.5.tgz"; - sha512 = "B1j9C/IfvshnPcklsc93AVLTrNVa69iSqztylZH6qnmiAsDDOmmjEYqOm3Ts2lGSgTSywnBNiqC949VdD0/gfw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-literals/-/plugin-transform-literals-7.16.7.tgz"; + sha512 = "6tH8RTpTWI0s2sV6uq3e/C9wPo4PTqqZps4uF0kzQ9/xPLFQtipynvmT1g/dOfEJ+0EQsHhkQ/zyRId8J2b8zQ=="; }; }; - "@babel/plugin-transform-member-expression-literals-7.16.5" = { + "@babel/plugin-transform-member-expression-literals-7.16.7" = { name = "_at_babel_slash_plugin-transform-member-expression-literals"; packageName = "@babel/plugin-transform-member-expression-literals"; - version = "7.16.5"; + version = "7.16.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.16.5.tgz"; - sha512 = "d57i3vPHWgIde/9Y8W/xSFUndhvhZN5Wu2TjRrN1MVz5KzdUihKnfDVlfP1U7mS5DNj/WHHhaE4/tTi4hIyHwQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.16.7.tgz"; + sha512 = "mBruRMbktKQwbxaJof32LT9KLy2f3gH+27a5XSuXo6h7R3vqltl0PgZ80C8ZMKw98Bf8bqt6BEVi3svOh2PzMw=="; }; }; - "@babel/plugin-transform-modules-amd-7.16.5" = { + "@babel/plugin-transform-modules-amd-7.16.7" = { name = "_at_babel_slash_plugin-transform-modules-amd"; packageName = "@babel/plugin-transform-modules-amd"; - version = "7.16.5"; + version = "7.16.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.16.5.tgz"; - sha512 = "oHI15S/hdJuSCfnwIz+4lm6wu/wBn7oJ8+QrkzPPwSFGXk8kgdI/AIKcbR/XnD1nQVMg/i6eNaXpszbGuwYDRQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.16.7.tgz"; + sha512 = "KaaEtgBL7FKYwjJ/teH63oAmE3lP34N3kshz8mm4VMAw7U3PxjVwwUmxEFksbgsNUaO3wId9R2AVQYSEGRa2+g=="; }; }; - "@babel/plugin-transform-modules-commonjs-7.16.5" = { + "@babel/plugin-transform-modules-commonjs-7.16.8" = { name = "_at_babel_slash_plugin-transform-modules-commonjs"; packageName = "@babel/plugin-transform-modules-commonjs"; - version = "7.16.5"; + version = "7.16.8"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.16.5.tgz"; - sha512 = "ABhUkxvoQyqhCWyb8xXtfwqNMJD7tx+irIRnUh6lmyFud7Jln1WzONXKlax1fg/ey178EXbs4bSGNd6PngO+SQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.16.8.tgz"; + sha512 = "oflKPvsLT2+uKQopesJt3ApiaIS2HW+hzHFcwRNtyDGieAeC/dIHZX8buJQ2J2X1rxGPy4eRcUijm3qcSPjYcA=="; }; }; - "@babel/plugin-transform-modules-systemjs-7.16.5" = { + "@babel/plugin-transform-modules-systemjs-7.16.7" = { name = "_at_babel_slash_plugin-transform-modules-systemjs"; packageName = "@babel/plugin-transform-modules-systemjs"; - version = "7.16.5"; + version = "7.16.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.16.5.tgz"; - sha512 = "53gmLdScNN28XpjEVIm7LbWnD/b/TpbwKbLk6KV4KqC9WyU6rq1jnNmVG6UgAdQZVVGZVoik3DqHNxk4/EvrjA=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.16.7.tgz"; + sha512 = "DuK5E3k+QQmnOqBR9UkusByy5WZWGRxfzV529s9nPra1GE7olmxfqO2FHobEOYSPIjPBTr4p66YDcjQnt8cBmw=="; }; }; - "@babel/plugin-transform-modules-umd-7.16.5" = { + "@babel/plugin-transform-modules-umd-7.16.7" = { name = "_at_babel_slash_plugin-transform-modules-umd"; packageName = "@babel/plugin-transform-modules-umd"; - version = "7.16.5"; + version = "7.16.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.16.5.tgz"; - sha512 = "qTFnpxHMoenNHkS3VoWRdwrcJ3FhX567GvDA3hRZKF0Dj8Fmg0UzySZp3AP2mShl/bzcywb/UWAMQIjA1bhXvw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.16.7.tgz"; + sha512 = "EMh7uolsC8O4xhudF2F6wedbSHm1HHZ0C6aJ7K67zcDNidMzVcxWdGr+htW9n21klm+bOn+Rx4CBsAntZd3rEQ=="; }; }; - "@babel/plugin-transform-named-capturing-groups-regex-7.16.5" = { + "@babel/plugin-transform-named-capturing-groups-regex-7.16.8" = { name = "_at_babel_slash_plugin-transform-named-capturing-groups-regex"; packageName = "@babel/plugin-transform-named-capturing-groups-regex"; - version = "7.16.5"; + version = "7.16.8"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.16.5.tgz"; - sha512 = "/wqGDgvFUeKELW6ex6QB7dLVRkd5ehjw34tpXu1nhKC0sFfmaLabIswnpf8JgDyV2NeDmZiwoOb0rAmxciNfjA=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.16.8.tgz"; + sha512 = "j3Jw+n5PvpmhRR+mrgIh04puSANCk/T/UA3m3P1MjJkhlK906+ApHhDIqBQDdOgL/r1UYpz4GNclTXxyZrYGSw=="; }; }; - "@babel/plugin-transform-new-target-7.16.5" = { + "@babel/plugin-transform-new-target-7.16.7" = { name = "_at_babel_slash_plugin-transform-new-target"; packageName = "@babel/plugin-transform-new-target"; - version = "7.16.5"; + version = "7.16.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.16.5.tgz"; - sha512 = "ZaIrnXF08ZC8jnKR4/5g7YakGVL6go6V9ql6Jl3ecO8PQaQqFE74CuM384kezju7Z9nGCCA20BqZaR1tJ/WvHg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.16.7.tgz"; + sha512 = "xiLDzWNMfKoGOpc6t3U+etCE2yRnn3SM09BXqWPIZOBpL2gvVrBWUKnsJx0K/ADi5F5YC5f8APFfWrz25TdlGg=="; }; }; - "@babel/plugin-transform-object-super-7.16.5" = { + "@babel/plugin-transform-object-super-7.16.7" = { name = "_at_babel_slash_plugin-transform-object-super"; packageName = "@babel/plugin-transform-object-super"; - version = "7.16.5"; + version = "7.16.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.16.5.tgz"; - sha512 = "tded+yZEXuxt9Jdtkc1RraW1zMF/GalVxaVVxh41IYwirdRgyAxxxCKZ9XB7LxZqmsjfjALxupNE1MIz9KH+Zg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.16.7.tgz"; + sha512 = "14J1feiQVWaGvRxj2WjyMuXS2jsBkgB3MdSN5HuC2G5nRspa5RK9COcs82Pwy5BuGcjb+fYaUj94mYcOj7rCvw=="; }; }; - "@babel/plugin-transform-parameters-7.16.5" = { + "@babel/plugin-transform-parameters-7.16.7" = { name = "_at_babel_slash_plugin-transform-parameters"; packageName = "@babel/plugin-transform-parameters"; - version = "7.16.5"; + version = "7.16.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.16.5.tgz"; - sha512 = "B3O6AL5oPop1jAVg8CV+haeUte9oFuY85zu0jwnRNZZi3tVAbJriu5tag/oaO2kGaQM/7q7aGPBlTI5/sr9enA=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.16.7.tgz"; + sha512 = "AT3MufQ7zZEhU2hwOA11axBnExW0Lszu4RL/tAlUJBuNoRak+wehQW8h6KcXOcgjY42fHtDxswuMhMjFEuv/aw=="; }; }; - "@babel/plugin-transform-property-literals-7.16.5" = { + "@babel/plugin-transform-property-literals-7.16.7" = { name = "_at_babel_slash_plugin-transform-property-literals"; packageName = "@babel/plugin-transform-property-literals"; - version = "7.16.5"; + version = "7.16.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.16.5.tgz"; - sha512 = "+IRcVW71VdF9pEH/2R/Apab4a19LVvdVsr/gEeotH00vSDVlKD+XgfSIw+cgGWsjDB/ziqGv/pGoQZBIiQVXHg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.16.7.tgz"; + sha512 = "z4FGr9NMGdoIl1RqavCqGG+ZuYjfZ/hkCIeuH6Do7tXmSm0ls11nYVSJqFEUOSJbDab5wC6lRE/w6YjVcr6Hqw=="; }; }; - "@babel/plugin-transform-regenerator-7.16.5" = { + "@babel/plugin-transform-regenerator-7.16.7" = { name = "_at_babel_slash_plugin-transform-regenerator"; packageName = "@babel/plugin-transform-regenerator"; - version = "7.16.5"; + version = "7.16.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.16.5.tgz"; - sha512 = "2z+it2eVWU8TtQQRauvGUqZwLy4+7rTfo6wO4npr+fvvN1SW30ZF3O/ZRCNmTuu4F5MIP8OJhXAhRV5QMJOuYg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.16.7.tgz"; + sha512 = "mF7jOgGYCkSJagJ6XCujSQg+6xC1M77/03K2oBmVJWoFGNUtnVJO4WHKJk3dnPC8HCcj4xBQP1Egm8DWh3Pb3Q=="; }; }; - "@babel/plugin-transform-reserved-words-7.16.5" = { + "@babel/plugin-transform-reserved-words-7.16.7" = { name = "_at_babel_slash_plugin-transform-reserved-words"; packageName = "@babel/plugin-transform-reserved-words"; - version = "7.16.5"; + version = "7.16.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.16.5.tgz"; - sha512 = "aIB16u8lNcf7drkhXJRoggOxSTUAuihTSTfAcpynowGJOZiGf+Yvi7RuTwFzVYSYPmWyARsPqUGoZWWWxLiknw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.16.7.tgz"; + sha512 = "KQzzDnZ9hWQBjwi5lpY5v9shmm6IVG0U9pB18zvMu2i4H90xpT4gmqwPYsn8rObiadYe2M0gmgsiOIF5A/2rtg=="; }; }; - "@babel/plugin-transform-shorthand-properties-7.16.5" = { + "@babel/plugin-transform-shorthand-properties-7.16.7" = { name = "_at_babel_slash_plugin-transform-shorthand-properties"; packageName = "@babel/plugin-transform-shorthand-properties"; - version = "7.16.5"; + version = "7.16.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.16.5.tgz"; - sha512 = "ZbuWVcY+MAXJuuW7qDoCwoxDUNClfZxoo7/4swVbOW1s/qYLOMHlm9YRWMsxMFuLs44eXsv4op1vAaBaBaDMVg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.16.7.tgz"; + sha512 = "hah2+FEnoRoATdIb05IOXf+4GzXYTq75TVhIn1PewihbpyrNWUt2JbudKQOETWw6QpLe+AIUpJ5MVLYTQbeeUg=="; }; }; - "@babel/plugin-transform-spread-7.16.5" = { + "@babel/plugin-transform-spread-7.16.7" = { name = "_at_babel_slash_plugin-transform-spread"; packageName = "@babel/plugin-transform-spread"; - version = "7.16.5"; + version = "7.16.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.16.5.tgz"; - sha512 = "5d6l/cnG7Lw4tGHEoga4xSkYp1euP7LAtrah1h1PgJ3JY7yNsjybsxQAnVK4JbtReZ/8z6ASVmd3QhYYKLaKZw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-spread/-/plugin-transform-spread-7.16.7.tgz"; + sha512 = "+pjJpgAngb53L0iaA5gU/1MLXJIfXcYepLgXB3esVRf4fqmj8f2cxM3/FKaHsZms08hFQJkFccEWuIpm429TXg=="; }; }; - "@babel/plugin-transform-sticky-regex-7.16.5" = { + "@babel/plugin-transform-sticky-regex-7.16.7" = { name = "_at_babel_slash_plugin-transform-sticky-regex"; packageName = "@babel/plugin-transform-sticky-regex"; - version = "7.16.5"; + version = "7.16.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.16.5.tgz"; - sha512 = "usYsuO1ID2LXxzuUxifgWtJemP7wL2uZtyrTVM4PKqsmJycdS4U4mGovL5xXkfUheds10Dd2PjoQLXw6zCsCbg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.16.7.tgz"; + sha512 = "NJa0Bd/87QV5NZZzTuZG5BPJjLYadeSZ9fO6oOUoL4iQx+9EEuw/eEM92SrsT19Yc2jgB1u1hsjqDtH02c3Drw=="; }; }; - "@babel/plugin-transform-template-literals-7.16.5" = { + "@babel/plugin-transform-template-literals-7.16.7" = { name = "_at_babel_slash_plugin-transform-template-literals"; packageName = "@babel/plugin-transform-template-literals"; - version = "7.16.5"; + version = "7.16.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.16.5.tgz"; - sha512 = "gnyKy9RyFhkovex4BjKWL3BVYzUDG6zC0gba7VMLbQoDuqMfJ1SDXs8k/XK41Mmt1Hyp4qNAvGFb9hKzdCqBRQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.16.7.tgz"; + sha512 = "VwbkDDUeenlIjmfNeDX/V0aWrQH2QiVyJtwymVQSzItFDTpxfyJh3EVaQiS0rIN/CqbLGr0VcGmuwyTdZtdIsA=="; }; }; - "@babel/plugin-transform-typeof-symbol-7.16.5" = { + "@babel/plugin-transform-typeof-symbol-7.16.7" = { name = "_at_babel_slash_plugin-transform-typeof-symbol"; packageName = "@babel/plugin-transform-typeof-symbol"; - version = "7.16.5"; + version = "7.16.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.16.5.tgz"; - sha512 = "ldxCkW180qbrvyCVDzAUZqB0TAeF8W/vGJoRcaf75awm6By+PxfJKvuqVAnq8N9wz5Xa6mSpM19OfVKKVmGHSQ=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.16.7.tgz"; + sha512 = "p2rOixCKRJzpg9JB4gjnG4gjWkWa89ZoYUnl9snJ1cWIcTH/hvxZqfO+WjG6T8DRBpctEol5jw1O5rA8gkCokQ=="; }; }; - "@babel/plugin-transform-typescript-7.16.1" = { + "@babel/plugin-transform-typescript-7.16.8" = { name = "_at_babel_slash_plugin-transform-typescript"; packageName = "@babel/plugin-transform-typescript"; - version = "7.16.1"; + version = "7.16.8"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.16.1.tgz"; - sha512 = "NO4XoryBng06jjw/qWEU2LhcLJr1tWkhpMam/H4eas/CDKMX/b2/Ylb6EI256Y7+FVPCawwSM1rrJNOpDiz+Lg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-typescript/-/plugin-transform-typescript-7.16.8.tgz"; + sha512 = "bHdQ9k7YpBDO2d0NVfkj51DpQcvwIzIusJ7mEUaMlbZq3Kt/U47j24inXZHQ5MDiYpCs+oZiwnXyKedE8+q7AQ=="; }; }; - "@babel/plugin-transform-unicode-escapes-7.16.5" = { + "@babel/plugin-transform-unicode-escapes-7.16.7" = { name = "_at_babel_slash_plugin-transform-unicode-escapes"; packageName = "@babel/plugin-transform-unicode-escapes"; - version = "7.16.5"; + version = "7.16.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.16.5.tgz"; - sha512 = "shiCBHTIIChGLdyojsKQjoAyB8MBwat25lKM7MJjbe1hE0bgIppD+LX9afr41lLHOhqceqeWl4FkLp+Bgn9o1Q=="; + 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=="; }; }; - "@babel/plugin-transform-unicode-regex-7.16.5" = { + "@babel/plugin-transform-unicode-regex-7.16.7" = { name = "_at_babel_slash_plugin-transform-unicode-regex"; packageName = "@babel/plugin-transform-unicode-regex"; - version = "7.16.5"; + version = "7.16.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.16.5.tgz"; - sha512 = "GTJ4IW012tiPEMMubd7sD07iU9O/LOo8Q/oU4xNhcaq0Xn8+6TcUQaHtC8YxySo1T+ErQ8RaWogIEeFhKGNPzw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.16.7.tgz"; + sha512 = "oC5tYYKw56HO75KZVLQ+R/Nl3Hro9kf8iG0hXoaHP7tjAyCpvqBiSNe6vGrZni1Z6MggmUOC6A7VP7AVmw225Q=="; }; }; - "@babel/preset-env-7.16.5" = { + "@babel/preset-env-7.16.11" = { name = "_at_babel_slash_preset-env"; packageName = "@babel/preset-env"; - version = "7.16.5"; + version = "7.16.11"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.16.5.tgz"; - sha512 = "MiJJW5pwsktG61NDxpZ4oJ1CKxM1ncam9bzRtx9g40/WkLRkxFP6mhpkYV0/DxcciqoiHicx291+eUQrXb/SfQ=="; + url = "https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.16.11.tgz"; + sha512 = "qcmWG8R7ZW6WBRPZK//y+E3Cli151B20W1Rv7ln27vuPaXU/8TKms6jFdiJtF7UDTxcrb7mZd88tAeK9LjdT8g=="; }; }; "@babel/preset-modules-0.1.5" = { @@ -1102,31 +931,22 @@ let sha512 = "A57th6YRG7oR3cq/yt/Y84MvGgE0eJG2F1JLhKuyG+jFxEgrd/HAMJatiFtmOiZurz+0DkrvbheCLaV5f2JfjA=="; }; }; - "@babel/preset-typescript-7.16.5" = { + "@babel/preset-typescript-7.16.7" = { name = "_at_babel_slash_preset-typescript"; packageName = "@babel/preset-typescript"; - version = "7.16.5"; + version = "7.16.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/preset-typescript/-/preset-typescript-7.16.5.tgz"; - sha512 = "lmAWRoJ9iOSvs3DqOndQpj8XqXkzaiQs50VG/zESiI9D3eoZhGriU675xNCr0UwvsuXrhMAGvyk1w+EVWF3u8Q=="; + url = "https://registry.npmjs.org/@babel/preset-typescript/-/preset-typescript-7.16.7.tgz"; + sha512 = "WbVEmgXdIyvzB77AQjGBEyYPZx+8tTsO50XtfozQrkW8QB2rLJpH2lgx0TRw5EJrBxOZQ+wCcyPVQvS8tjEHpQ=="; }; }; - "@babel/runtime-7.16.5" = { + "@babel/runtime-7.16.7" = { name = "_at_babel_slash_runtime"; packageName = "@babel/runtime"; - version = "7.16.5"; + version = "7.16.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/runtime/-/runtime-7.16.5.tgz"; - sha512 = "TXWihFIS3Pyv5hzR7j6ihmeLkZfrXGxAr5UfSl8CHf+6q/wpiYDkUau0czckpYG8QmnCIuPpdLtuA9VmuGGyMA=="; - }; - }; - "@babel/template-7.16.0" = { - name = "_at_babel_slash_template"; - packageName = "@babel/template"; - version = "7.16.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/template/-/template-7.16.0.tgz"; - sha512 = "MnZdpFD/ZdYhXwiunMqqgyZyucaYsbL0IrjoGjaVhGilz+x8YB++kRfygSOIj1yOtWKPlx7NBp+9I1RQSgsd5A=="; + url = "https://registry.npmjs.org/@babel/runtime/-/runtime-7.16.7.tgz"; + sha512 = "9E9FJowqAsytyOY6LG+1KuueckRL+aQW+mKvXRXnuFGyRAyepJPmEo9vgMfXUA6O9u3IeEdv9MAkppFcaQwogQ=="; }; }; "@babel/template-7.16.7" = { @@ -1138,40 +958,22 @@ let sha512 = "I8j/x8kHUrbYRTUxXrrMbfCa7jxkE7tZre39x3kjr9hvI82cK1FfqLygotcWN5kdPGWcLdWMHpSBavse5tWw3w=="; }; }; - "@babel/traverse-7.16.5" = { + "@babel/traverse-7.16.10" = { name = "_at_babel_slash_traverse"; packageName = "@babel/traverse"; - version = "7.16.5"; + version = "7.16.10"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.16.5.tgz"; - sha512 = "FOCODAzqUMROikDYLYxl4nmwiLlu85rNqBML/A5hKRVXG2LV8d0iMqgPzdYTcIpjZEBB7D6UDU9vxRZiriASdQ=="; + url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.16.10.tgz"; + sha512 = "yzuaYXoRJBGMlBhsMJoUW7G1UmSb/eXr/JHYM/MsOJgavJibLwASijW7oXBdw3NQ6T0bW7Ty5P/VarOs9cHmqw=="; }; }; - "@babel/traverse-7.16.7" = { - name = "_at_babel_slash_traverse"; - packageName = "@babel/traverse"; - version = "7.16.7"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.16.7.tgz"; - sha512 = "8KWJPIb8c2VvY8AJrydh6+fVRo2ODx1wYBU2398xJVq0JomuLBZmVQzLPBblJgHIGYG4znCpUZUZ0Pt2vdmVYQ=="; - }; - }; - "@babel/types-7.16.0" = { + "@babel/types-7.16.8" = { name = "_at_babel_slash_types"; packageName = "@babel/types"; - version = "7.16.0"; + version = "7.16.8"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/types/-/types-7.16.0.tgz"; - sha512 = "PJgg/k3SdLsGb3hhisFvtLOw5ts113klrpLuIPtCJIU+BB24fqq6lf8RWqKJEjzqXR9AEH1rIb5XTqwBHB+kQg=="; - }; - }; - "@babel/types-7.16.7" = { - name = "_at_babel_slash_types"; - packageName = "@babel/types"; - version = "7.16.7"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/types/-/types-7.16.7.tgz"; - sha512 = "E8HuV7FO9qLpx6OtoGfUQ2cjIYnbFwvZWYBS+87EwtdMvmUPJSwykpovFB+8insbpF0uJcpr8KMUi64XZntZcg=="; + url = "https://registry.npmjs.org/@babel/types/-/types-7.16.8.tgz"; + sha512 = "smN2DQc5s4M7fntyjGtyIPbRJv6wW4rU/94fmYJ7PKQuZkC0qGMHXJbg6sNGt12JmVr4k5YaptI/XtiLJBnmIg=="; }; }; "@bcoe/v8-coverage-0.2.3" = { @@ -1201,13 +1003,13 @@ let sha512 = "BLxsnmK3KyPunz5wmCCpqy0YelEoxxGmH73Is+Z74oOTMtExcjkr3dDR6quwrjh1YspA8DH9gnX1o069KiS9AQ=="; }; }; - "@humanwhocodes/config-array-0.9.2" = { + "@humanwhocodes/config-array-0.9.3" = { name = "_at_humanwhocodes_slash_config-array"; packageName = "@humanwhocodes/config-array"; - version = "0.9.2"; + version = "0.9.3"; src = fetchurl { - url = "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.9.2.tgz"; - sha512 = "UXOuFCGcwciWckOpmfKDq/GyhlTf9pN/BzG//x8p8zTOFEcGuA68ANXheFS0AGvy3qgZqLBUkMs7hqzqCKOVwA=="; + url = "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.9.3.tgz"; + sha512 = "3xSMlXHh03hCcCmFc0rbKp3Ivt2PFEJnQUJDDMTJQ2wkECZWdq4GePs2ctc5H8zV+cHPaq8k2vU8mrQjA6iHdQ=="; }; }; "@humanwhocodes/object-schema-1.2.1" = { @@ -1237,58 +1039,58 @@ let sha512 = "ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA=="; }; }; - "@jest/console-27.4.2" = { + "@jest/console-27.4.6" = { name = "_at_jest_slash_console"; packageName = "@jest/console"; - version = "27.4.2"; + version = "27.4.6"; src = fetchurl { - url = "https://registry.npmjs.org/@jest/console/-/console-27.4.2.tgz"; - sha512 = "xknHThRsPB/To1FUbi6pCe43y58qFC03zfb6R7fDb/FfC7k2R3i1l+izRBJf8DI46KhYGRaF14Eo9A3qbBoixg=="; + url = "https://registry.npmjs.org/@jest/console/-/console-27.4.6.tgz"; + sha512 = "jauXyacQD33n47A44KrlOVeiXHEXDqapSdfb9kTekOchH/Pd18kBIO1+xxJQRLuG+LUuljFCwTG92ra4NW7SpA=="; }; }; - "@jest/core-27.4.5" = { + "@jest/core-27.4.7" = { name = "_at_jest_slash_core"; packageName = "@jest/core"; - version = "27.4.5"; + version = "27.4.7"; src = fetchurl { - url = "https://registry.npmjs.org/@jest/core/-/core-27.4.5.tgz"; - sha512 = "3tm/Pevmi8bDsgvo73nX8p/WPng6KWlCyScW10FPEoN1HU4pwI83tJ3TsFvi1FfzsjwUlMNEPowgb/rPau/LTQ=="; + url = "https://registry.npmjs.org/@jest/core/-/core-27.4.7.tgz"; + sha512 = "n181PurSJkVMS+kClIFSX/LLvw9ExSb+4IMtD6YnfxZVerw9ANYtW0bPrm0MJu2pfe9SY9FJ9FtQ+MdZkrZwjg=="; }; }; - "@jest/environment-27.4.4" = { + "@jest/environment-27.4.6" = { name = "_at_jest_slash_environment"; packageName = "@jest/environment"; - version = "27.4.4"; + version = "27.4.6"; src = fetchurl { - url = "https://registry.npmjs.org/@jest/environment/-/environment-27.4.4.tgz"; - sha512 = "q+niMx7cJgt/t/b6dzLOh4W8Ef/8VyKG7hxASK39jakijJzbFBGpptx3RXz13FFV7OishQ9lTbv+dQ5K3EhfDQ=="; + url = "https://registry.npmjs.org/@jest/environment/-/environment-27.4.6.tgz"; + sha512 = "E6t+RXPfATEEGVidr84WngLNWZ8ffCPky8RqqRK6u1Bn0LK92INe0MDttyPl/JOzaq92BmDzOeuqk09TvM22Sg=="; }; }; - "@jest/fake-timers-27.4.2" = { + "@jest/fake-timers-27.4.6" = { name = "_at_jest_slash_fake-timers"; packageName = "@jest/fake-timers"; - version = "27.4.2"; + version = "27.4.6"; src = fetchurl { - url = "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-27.4.2.tgz"; - sha512 = "f/Xpzn5YQk5adtqBgvw1V6bF8Nx3hY0OIRRpCvWcfPl0EAjdqWPdhH3t/3XpiWZqtjIEHDyMKP9ajpva1l4Zmg=="; + url = "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-27.4.6.tgz"; + sha512 = "mfaethuYF8scV8ntPpiVGIHQgS0XIALbpY2jt2l7wb/bvq4Q5pDLk4EP4D7SAvYT1QrPOPVZAtbdGAOOyIgs7A=="; }; }; - "@jest/globals-27.4.4" = { + "@jest/globals-27.4.6" = { name = "_at_jest_slash_globals"; packageName = "@jest/globals"; - version = "27.4.4"; + version = "27.4.6"; src = fetchurl { - url = "https://registry.npmjs.org/@jest/globals/-/globals-27.4.4.tgz"; - sha512 = "bqpqQhW30BOreXM8bA8t8JbOQzsq/WnPTnBl+It3UxAD9J8yxEAaBEylHx1dtBapAr/UBk8GidXbzmqnee8tYQ=="; + url = "https://registry.npmjs.org/@jest/globals/-/globals-27.4.6.tgz"; + sha512 = "kAiwMGZ7UxrgPzu8Yv9uvWmXXxsy0GciNejlHvfPIfWkSxChzv6bgTS3YqBkGuHcis+ouMFI2696n2t+XYIeFw=="; }; }; - "@jest/reporters-27.4.5" = { + "@jest/reporters-27.4.6" = { name = "_at_jest_slash_reporters"; packageName = "@jest/reporters"; - version = "27.4.5"; + version = "27.4.6"; src = fetchurl { - url = "https://registry.npmjs.org/@jest/reporters/-/reporters-27.4.5.tgz"; - sha512 = "3orsG4vi8zXuBqEoy2LbnC1kuvkg1KQUgqNxmxpQgIOQEPeV0onvZu+qDQnEoX8qTQErtqn/xzcnbpeTuOLSiA=="; + url = "https://registry.npmjs.org/@jest/reporters/-/reporters-27.4.6.tgz"; + sha512 = "+Zo9gV81R14+PSq4wzee4GC2mhAN9i9a7qgJWL90Gpx7fHYkWpTBvwWNZUXvJByYR9tAVBdc8VxDWqfJyIUrIQ=="; }; }; "@jest/source-map-27.4.0" = { @@ -1300,31 +1102,31 @@ let sha512 = "Ntjx9jzP26Bvhbm93z/AKcPRj/9wrkI88/gK60glXDx1q+IeI0rf7Lw2c89Ch6ofonB0On/iRDreQuQ6te9pgQ=="; }; }; - "@jest/test-result-27.4.2" = { + "@jest/test-result-27.4.6" = { name = "_at_jest_slash_test-result"; packageName = "@jest/test-result"; - version = "27.4.2"; + version = "27.4.6"; src = fetchurl { - url = "https://registry.npmjs.org/@jest/test-result/-/test-result-27.4.2.tgz"; - sha512 = "kr+bCrra9jfTgxHXHa2UwoQjxvQk3Am6QbpAiJ5x/50LW8llOYrxILkqY0lZRW/hu8FXesnudbql263+EW9iNA=="; + url = "https://registry.npmjs.org/@jest/test-result/-/test-result-27.4.6.tgz"; + sha512 = "fi9IGj3fkOrlMmhQqa/t9xum8jaJOOAi/lZlm6JXSc55rJMXKHxNDN1oCP39B0/DhNOa2OMupF9BcKZnNtXMOQ=="; }; }; - "@jest/test-sequencer-27.4.5" = { + "@jest/test-sequencer-27.4.6" = { name = "_at_jest_slash_test-sequencer"; packageName = "@jest/test-sequencer"; - version = "27.4.5"; + version = "27.4.6"; src = fetchurl { - url = "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-27.4.5.tgz"; - sha512 = "n5woIn/1v+FT+9hniymHPARA9upYUmfi5Pw9ewVwXCDlK4F5/Gkees9v8vdjGdAIJ2MPHLHodiajLpZZanWzEQ=="; + url = "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-27.4.6.tgz"; + sha512 = "3GL+nsf6E1PsyNsJuvPyIz+DwFuCtBdtvPpm/LMXVkBJbdFvQYCDpccYT56qq5BGniXWlE81n2qk1sdXfZebnw=="; }; }; - "@jest/transform-27.4.5" = { + "@jest/transform-27.4.6" = { name = "_at_jest_slash_transform"; packageName = "@jest/transform"; - version = "27.4.5"; + version = "27.4.6"; src = fetchurl { - url = "https://registry.npmjs.org/@jest/transform/-/transform-27.4.5.tgz"; - sha512 = "PuMet2UlZtlGzwc6L+aZmR3I7CEBpqadO03pU40l2RNY2fFJ191b9/ITB44LNOhVtsyykx0OZvj0PCyuLm7Eew=="; + url = "https://registry.npmjs.org/@jest/transform/-/transform-27.4.6.tgz"; + sha512 = "9MsufmJC8t5JTpWEQJ0OcOOAXaH5ioaIX6uHVBLBMoCZPfKKQF+EqP8kACAvCZ0Y1h2Zr3uOccg8re+Dr5jxyw=="; }; }; "@jest/types-27.4.2" = { @@ -1498,15 +1300,6 @@ let sha512 = "RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw=="; }; }; - "@types/babel__core-7.1.17" = { - name = "_at_types_slash_babel__core"; - packageName = "@types/babel__core"; - version = "7.1.17"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.1.17.tgz"; - sha512 = "6zzkezS9QEIL8yCBvXWxPTJPNuMeECJVxSOhxNY/jfq9LxOTHivaYTqr37n9LknWWRTIkzqH2UilS5QFvfa90A=="; - }; - }; "@types/babel__core-7.1.18" = { name = "_at_types_slash_babel__core"; packageName = "@types/babel__core"; @@ -1624,13 +1417,13 @@ let sha512 = "c3mAZEuK0lvBp8tmuL74XRKn1+y2dcwOUpH7x4WrF6gk1GIgiluDRgMYQtw2OFcBvAJWlt6ASU3tSqxp0Uu0Aw=="; }; }; - "@types/jest-27.0.3" = { + "@types/jest-27.4.0" = { name = "_at_types_slash_jest"; packageName = "@types/jest"; - version = "27.0.3"; + version = "27.4.0"; src = fetchurl { - url = "https://registry.npmjs.org/@types/jest/-/jest-27.0.3.tgz"; - sha512 = "cmmwv9t7gBYt7hNKH5Spu7Kuu/DotGa+Ff+JGRKZ4db5eh8PnKS4LuebJ3YLUoyOyIHraTGyULn23YtEAm0VSg=="; + url = "https://registry.npmjs.org/@types/jest/-/jest-27.4.0.tgz"; + sha512 = "gHl8XuC1RZ8H2j5sHv/JqsaxXkDDM9iDOgu0Wp8sjs4u/snb2PVehyWXJPr+ORA0RPpgw231mnutWI1+0hgjIQ=="; }; }; "@types/js-yaml-4.0.5" = { @@ -1687,22 +1480,22 @@ let sha512 = "ICDoQMORMjOSqfNFXT4ENXfwwCir1BPblXNm0SPH7C4Q10ou+pvVagcFAJ+rrzf3A47tGU4K/KbzKu7wO9j45Q=="; }; }; - "@types/node-17.0.4" = { + "@types/node-17.0.13" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "17.0.4"; + version = "17.0.13"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-17.0.4.tgz"; - sha512 = "6xwbrW4JJiJLgF+zNypN5wr2ykM9/jHcL7rQ8fZe2vuftggjzZeRSM4OwRc6Xk8qWjwJ99qVHo/JgOGmomWRog=="; + url = "https://registry.npmjs.org/@types/node/-/node-17.0.13.tgz"; + sha512 = "Y86MAxASe25hNzlDbsviXl8jQHb0RDvKt4c40ZJQ1Don0AAL0STLZSs4N+6gLEO55pedy7r2cLwS+ZDxPm/2Bw=="; }; }; - "@types/node-17.0.5" = { + "@types/node-17.0.14" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "17.0.5"; + version = "17.0.14"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-17.0.5.tgz"; - sha512 = "w3mrvNXLeDYV1GKTZorGJQivK6XLCoGwpnyJFbJVK/aTBQUxOCaa/GlFAAN3OTDFcb7h5tiFG+YXCO2By+riZw=="; + url = "https://registry.npmjs.org/@types/node/-/node-17.0.14.tgz"; + sha512 = "SbjLmERksKOGzWzPNuW7fJM7fk3YXVTFiZWB/Hs99gwhk+/dnrQRPBQjPW9aO+fi1tAffi9PrwFvsmOKmDTyng=="; }; }; "@types/object-assign-deep-0.4.0" = { @@ -1714,13 +1507,13 @@ let sha512 = "3D0F3rHRNDc8cQSXNzwF1jBrJi28Mdrhc10ZLlqbJWDPYRWTTWB9Tc8JoKrgBvLKioXoPoHT6Uzf3s2F7akCUg=="; }; }; - "@types/prettier-2.4.2" = { + "@types/prettier-2.4.3" = { name = "_at_types_slash_prettier"; packageName = "@types/prettier"; - version = "2.4.2"; + version = "2.4.3"; src = fetchurl { - url = "https://registry.npmjs.org/@types/prettier/-/prettier-2.4.2.tgz"; - sha512 = "ekoj4qOQYp7CvjX8ZDBgN86w3MqQhLE1hczEJbEIjgFEumDy+na/4AJAbLXfgEWFNB2pKadM5rPFtuSGMWK7xA=="; + url = "https://registry.npmjs.org/@types/prettier/-/prettier-2.4.3.tgz"; + sha512 = "QzSuZMBuG5u8HqYz01qtMdg/Jfctlnvj1z/lYnIDXs/golxw0fxtRAHd9KrzjR7Yxz1qVeI00o0kiO3PmVdJ9w=="; }; }; "@types/rimraf-3.0.2" = { @@ -1777,112 +1570,121 @@ let sha512 = "7tFImggNeNBVMsn0vLrpn1H1uPrUBdnARPTpZoitY37ZrdJREzf7I16tMrlK3hen349gr1NYh8CmZQa7CTG6Aw=="; }; }; - "@typescript-eslint/eslint-plugin-5.8.0" = { + "@typescript-eslint/eslint-plugin-5.10.1" = { name = "_at_typescript-eslint_slash_eslint-plugin"; packageName = "@typescript-eslint/eslint-plugin"; - version = "5.8.0"; + version = "5.10.1"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.8.0.tgz"; - sha512 = "spu1UW7QuBn0nJ6+psnfCc3iVoQAifjKORgBngKOmC8U/1tbe2YJMzYQqDGYB4JCss7L8+RM2kKLb1B1Aw9BNA=="; + url = "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.10.1.tgz"; + sha512 = "xN3CYqFlyE/qOcy978/L0xLR2HlcAGIyIK5sMOasxaaAPfQRj/MmMV6OC3I7NZO84oEUdWCOju34Z9W8E0pFDQ=="; }; }; - "@typescript-eslint/experimental-utils-5.8.0" = { - name = "_at_typescript-eslint_slash_experimental-utils"; - packageName = "@typescript-eslint/experimental-utils"; - version = "5.8.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-5.8.0.tgz"; - sha512 = "KN5FvNH71bhZ8fKtL+lhW7bjm7cxs1nt+hrDZWIqb6ViCffQcWyLunGrgvISgkRojIDcXIsH+xlFfI4RCDA0xA=="; - }; - }; - "@typescript-eslint/experimental-utils-5.8.1" = { - name = "_at_typescript-eslint_slash_experimental-utils"; - packageName = "@typescript-eslint/experimental-utils"; - version = "5.8.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/experimental-utils/-/experimental-utils-5.8.1.tgz"; - sha512 = "fbodVnjIDU4JpeXWRDsG5IfIjYBxEvs8EBO8W1+YVdtrc2B9ppfof5sZhVEDOtgTfFHnYQJDI8+qdqLYO4ceww=="; - }; - }; - "@typescript-eslint/parser-5.8.0" = { + "@typescript-eslint/parser-5.10.1" = { name = "_at_typescript-eslint_slash_parser"; packageName = "@typescript-eslint/parser"; - version = "5.8.0"; + version = "5.10.1"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.8.0.tgz"; - sha512 = "Gleacp/ZhRtJRYs5/T8KQR3pAQjQI89Dn/k+OzyCKOsLiZH2/Vh60cFBTnFsHNI6WAD+lNUo/xGZ4NeA5u0Ipw=="; + url = "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.10.1.tgz"; + sha512 = "GReo3tjNBwR5RnRO0K2wDIDN31cM3MmDtgyQ85oAxAmC5K3j/g85IjP+cDfcqDsDDBf1HNKQAD0WqOYL8jXqUA=="; }; }; - "@typescript-eslint/scope-manager-5.8.0" = { + "@typescript-eslint/scope-manager-5.10.1" = { name = "_at_typescript-eslint_slash_scope-manager"; packageName = "@typescript-eslint/scope-manager"; - version = "5.8.0"; + version = "5.10.1"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.8.0.tgz"; - sha512 = "x82CYJsLOjPCDuFFEbS6e7K1QEWj7u5Wk1alw8A+gnJiYwNnDJk0ib6PCegbaPMjrfBvFKa7SxE3EOnnIQz2Gg=="; + url = "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.10.1.tgz"; + sha512 = "Lyvi559Gvpn94k7+ElXNMEnXu/iundV5uFmCUNnftbFrUbAJ1WBoaGgkbOBm07jVZa682oaBU37ao/NGGX4ZDg=="; }; }; - "@typescript-eslint/scope-manager-5.8.1" = { + "@typescript-eslint/scope-manager-5.10.2" = { name = "_at_typescript-eslint_slash_scope-manager"; packageName = "@typescript-eslint/scope-manager"; - version = "5.8.1"; + version = "5.10.2"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.8.1.tgz"; - sha512 = "DGxJkNyYruFH3NIZc3PwrzwOQAg7vvgsHsHCILOLvUpupgkwDZdNq/cXU3BjF4LNrCsVg0qxEyWasys5AiJ85Q=="; + url = "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.10.2.tgz"; + sha512 = "39Tm6f4RoZoVUWBYr3ekS75TYgpr5Y+X0xLZxXqcZNDWZdJdYbKd3q2IR4V9y5NxxiPu/jxJ8XP7EgHiEQtFnw=="; }; }; - "@typescript-eslint/types-5.8.0" = { + "@typescript-eslint/type-utils-5.10.1" = { + name = "_at_typescript-eslint_slash_type-utils"; + packageName = "@typescript-eslint/type-utils"; + version = "5.10.1"; + src = fetchurl { + url = "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.10.1.tgz"; + sha512 = "AfVJkV8uck/UIoDqhu+ptEdBoQATON9GXnhOpPLzkQRJcSChkvD//qsz9JVffl2goxX+ybs5klvacE9vmrQyCw=="; + }; + }; + "@typescript-eslint/types-5.10.1" = { name = "_at_typescript-eslint_slash_types"; packageName = "@typescript-eslint/types"; - version = "5.8.0"; + version = "5.10.1"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.8.0.tgz"; - sha512 = "LdCYOqeqZWqCMOmwFnum6YfW9F3nKuxJiR84CdIRN5nfHJ7gyvGpXWqL/AaW0k3Po0+wm93ARAsOdzlZDPCcXg=="; + url = "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.10.1.tgz"; + sha512 = "ZvxQ2QMy49bIIBpTqFiOenucqUyjTQ0WNLhBM6X1fh1NNlYAC6Kxsx8bRTY3jdYsYg44a0Z/uEgQkohbR0H87Q=="; }; }; - "@typescript-eslint/types-5.8.1" = { + "@typescript-eslint/types-5.10.2" = { name = "_at_typescript-eslint_slash_types"; packageName = "@typescript-eslint/types"; - version = "5.8.1"; + version = "5.10.2"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.8.1.tgz"; - sha512 = "L/FlWCCgnjKOLefdok90/pqInkomLnAcF9UAzNr+DSqMC3IffzumHTQTrINXhP1gVp9zlHiYYjvozVZDPleLcA=="; + url = "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.10.2.tgz"; + sha512 = "Qfp0qk/5j2Rz3p3/WhWgu4S1JtMcPgFLnmAKAW061uXxKSa7VWKZsDXVaMXh2N60CX9h6YLaBoy9PJAfCOjk3w=="; }; }; - "@typescript-eslint/typescript-estree-5.8.0" = { + "@typescript-eslint/typescript-estree-5.10.1" = { name = "_at_typescript-eslint_slash_typescript-estree"; packageName = "@typescript-eslint/typescript-estree"; - version = "5.8.0"; + version = "5.10.1"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.8.0.tgz"; - sha512 = "srfeZ3URdEcUsSLbkOFqS7WoxOqn8JNil2NSLO9O+I2/Uyc85+UlfpEvQHIpj5dVts7KKOZnftoJD/Fdv0L7nQ=="; + url = "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.10.1.tgz"; + sha512 = "PwIGnH7jIueXv4opcwEbVGDATjGPO1dx9RkUl5LlHDSe+FXxPwFL5W/qYd5/NHr7f6lo/vvTrAzd0KlQtRusJQ=="; }; }; - "@typescript-eslint/typescript-estree-5.8.1" = { + "@typescript-eslint/typescript-estree-5.10.2" = { name = "_at_typescript-eslint_slash_typescript-estree"; packageName = "@typescript-eslint/typescript-estree"; - version = "5.8.1"; + version = "5.10.2"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.8.1.tgz"; - sha512 = "26lQ8l8tTbG7ri7xEcCFT9ijU5Fk+sx/KRRyyzCv7MQ+rZZlqiDPtMKWLC8P7o+dtCnby4c+OlxuX1tp8WfafQ=="; + url = "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.10.2.tgz"; + sha512 = "WHHw6a9vvZls6JkTgGljwCsMkv8wu8XU8WaYKeYhxhWXH/atZeiMW6uDFPLZOvzNOGmuSMvHtZKd6AuC8PrwKQ=="; }; }; - "@typescript-eslint/visitor-keys-5.8.0" = { - name = "_at_typescript-eslint_slash_visitor-keys"; - packageName = "@typescript-eslint/visitor-keys"; - version = "5.8.0"; + "@typescript-eslint/utils-5.10.1" = { + name = "_at_typescript-eslint_slash_utils"; + packageName = "@typescript-eslint/utils"; + version = "5.10.1"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.8.0.tgz"; - sha512 = "+HDIGOEMnqbxdAHegxvnOqESUH6RWFRR2b8qxP1W9CZnnYh4Usz6MBL+2KMAgPk/P0o9c1HqnYtwzVH6GTIqug=="; + url = "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.10.1.tgz"; + sha512 = "RRmlITiUbLuTRtn/gcPRi4202niF+q7ylFLCKu4c+O/PcpRvZ/nAUwQ2G00bZgpWkhrNLNnvhZLbDn8Ml0qsQw=="; }; }; - "@typescript-eslint/visitor-keys-5.8.1" = { + "@typescript-eslint/utils-5.10.2" = { + name = "_at_typescript-eslint_slash_utils"; + packageName = "@typescript-eslint/utils"; + version = "5.10.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.10.2.tgz"; + sha512 = "vuJaBeig1NnBRkf7q9tgMLREiYD7zsMrsN1DA3wcoMDvr3BTFiIpKjGiYZoKPllfEwN7spUjv7ZqD+JhbVjEPg=="; + }; + }; + "@typescript-eslint/visitor-keys-5.10.1" = { name = "_at_typescript-eslint_slash_visitor-keys"; packageName = "@typescript-eslint/visitor-keys"; - version = "5.8.1"; + version = "5.10.1"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.8.1.tgz"; - sha512 = "SWgiWIwocK6NralrJarPZlWdr0hZnj5GXHIgfdm8hNkyKvpeQuFyLP6YjSIe9kf3YBIfU6OHSZLYkQ+smZwtNg=="; + url = "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.10.1.tgz"; + sha512 = "NjQ0Xinhy9IL979tpoTRuLKxMc0zJC7QVSdeerXs2/QvOy2yRkzX5dRb10X5woNUdJgU8G3nYRDlI33sq1K4YQ=="; + }; + }; + "@typescript-eslint/visitor-keys-5.10.2" = { + name = "_at_typescript-eslint_slash_visitor-keys"; + packageName = "@typescript-eslint/visitor-keys"; + version = "5.10.2"; + src = fetchurl { + url = "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.10.2.tgz"; + sha512 = "zHIhYGGGrFJvvyfwHk5M08C5B5K4bewkm+rrvNTKk1/S15YHR+SA/QUF8ZWscXSfEaB8Nn2puZj+iHcoxVOD/Q=="; }; }; "abab-2.0.5" = { @@ -1903,15 +1705,6 @@ let sha512 = "nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A=="; }; }; - "acorn-8.6.0" = { - name = "acorn"; - packageName = "acorn"; - version = "8.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/acorn/-/acorn-8.6.0.tgz"; - sha512 = "U1riIR+lBSNi3IbxtaHOIKdH8sLFv3NYfNv8sg7ZsNhcfl4HF2++BfqqrNAxoCLQW1iiylOj76ecnaUxz+z9yw=="; - }; - }; "acorn-8.7.0" = { name = "acorn"; packageName = "acorn"; @@ -1966,22 +1759,13 @@ let sha512 = "j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g=="; }; }; - "ajv-8.8.2" = { + "ajv-8.9.0" = { name = "ajv"; packageName = "ajv"; - version = "8.8.2"; + version = "8.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/ajv/-/ajv-8.8.2.tgz"; - sha512 = "x9VuX+R/jcFj1DHo/fCp99esgGDWiHENrKxaCENuCxpoMCmAt/COCGVDwA7kleEpEzJjDnvh3yGoOuLu0Dtllw=="; - }; - }; - "ansi-colors-4.1.1" = { - name = "ansi-colors"; - packageName = "ansi-colors"; - version = "4.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.1.tgz"; - sha512 = "JoX0apGbHaUJBNl6yF+p6JAFYZ666/hhCGKN5t9QFjbJQKUU/g8MNbFDbvfrgKXvI1QpZplPOnwIo99lX/AAmA=="; + url = "https://registry.npmjs.org/ajv/-/ajv-8.9.0.tgz"; + sha512 = "qOKJyNj/h+OWx7s5DePL6Zu1KeM9jPZhwBqs+7DzP6bGOvqzVCSf0xueYmVuaC/oQ/VtS2zLMLHdQFbkka+XDQ=="; }; }; "ansi-escapes-4.3.2" = { @@ -2101,13 +1885,13 @@ let sha512 = "HGyxoOTYUyCM6stUe6EJgnd4EoewAI7zMdfqO+kGjnlZmBDz/cR5pf8r/cR4Wq60sL/p0IkcjUEEPwS3GFrIyw=="; }; }; - "async-3.2.2" = { + "async-3.2.3" = { name = "async"; packageName = "async"; - version = "3.2.2"; + version = "3.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/async/-/async-3.2.2.tgz"; - sha512 = "H0E+qZaDEfx/FY4t7iLRv1W2fFI6+pyCeTw1uN20AQPiwqwM6ojPxHxdLv4z8hi2DtnW9BOckSspLucW7pIE5g=="; + url = "https://registry.npmjs.org/async/-/async-3.2.3.tgz"; + sha512 = "spZRyzKL5l5BZQrr/6m/SqFdBN0q3OCI0f9rjfBzCMBIP4p75P620rR3gTmaksNOhmzgdxcaxdNfMy6anrbM0g=="; }; }; "asynckit-0.4.0" = { @@ -2119,22 +1903,22 @@ let sha1 = "c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"; }; }; - "axios-0.24.0" = { + "axios-0.25.0" = { name = "axios"; packageName = "axios"; - version = "0.24.0"; + version = "0.25.0"; src = fetchurl { - url = "https://registry.npmjs.org/axios/-/axios-0.24.0.tgz"; - sha512 = "Q6cWsys88HoPgAaFAVUb0WpPk0O8iTeisR9IMqy9G8AbO4NlpVknrnQS03zzF9PGAWgO3cgletO3VjV/P7VztA=="; + url = "https://registry.npmjs.org/axios/-/axios-0.25.0.tgz"; + sha512 = "cD8FOb0tRH3uuEe6+evtAbgJtfxr7ly3fQjYcMcuPlgkwVS9xboaVIpcDV+cYQe+yGykgwZCs1pzjntcGa6l5g=="; }; }; - "babel-jest-27.4.5" = { + "babel-jest-27.4.6" = { name = "babel-jest"; packageName = "babel-jest"; - version = "27.4.5"; + version = "27.4.6"; src = fetchurl { - url = "https://registry.npmjs.org/babel-jest/-/babel-jest-27.4.5.tgz"; - sha512 = "3uuUTjXbgtODmSv/DXO9nZfD52IyC2OYTFaXGRzL0kpykzroaquCrD5+lZNafTvZlnNqZHt5pb0M08qVBZnsnA=="; + url = "https://registry.npmjs.org/babel-jest/-/babel-jest-27.4.6.tgz"; + sha512 = "qZL0JT0HS1L+lOuH+xC2DVASR3nunZi/ozGhpgauJHgmI7f8rudxf6hUjEHympdQ/J64CdKmPkgfJ+A3U6QCrg=="; }; }; "babel-plugin-dynamic-import-node-2.3.3" = { @@ -2164,31 +1948,31 @@ let sha512 = "Jcu7qS4OX5kTWBc45Hz7BMmgXuJqRnhatqpUhnzGC3OBYpOmf2tv6jFNwZpwM7wU7MUuv2r9IPS/ZlYOuburVw=="; }; }; - "babel-plugin-polyfill-corejs2-0.3.0" = { + "babel-plugin-polyfill-corejs2-0.3.1" = { name = "babel-plugin-polyfill-corejs2"; packageName = "babel-plugin-polyfill-corejs2"; - version = "0.3.0"; + version = "0.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.3.0.tgz"; - sha512 = "wMDoBJ6uG4u4PNFh72Ty6t3EgfA91puCuAwKIazbQlci+ENb/UU9A3xG5lutjUIiXCIn1CY5L15r9LimiJyrSA=="; + url = "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.3.1.tgz"; + sha512 = "v7/T6EQcNfVLfcN2X8Lulb7DjprieyLWJK/zOWH5DUYcAgex9sP3h25Q+DLsX9TloXe3y1O8l2q2Jv9q8UVB9w=="; }; }; - "babel-plugin-polyfill-corejs3-0.4.0" = { + "babel-plugin-polyfill-corejs3-0.5.1" = { name = "babel-plugin-polyfill-corejs3"; packageName = "babel-plugin-polyfill-corejs3"; - version = "0.4.0"; + version = "0.5.1"; src = fetchurl { - url = "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.4.0.tgz"; - sha512 = "YxFreYwUfglYKdLUGvIF2nJEsGwj+RhWSX/ije3D2vQPOXuyMLMtg/cCGMDpOA7Nd+MwlNdnGODbd2EwUZPlsw=="; + url = "https://registry.npmjs.org/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.5.1.tgz"; + sha512 = "TihqEe4sQcb/QcPJvxe94/9RZuLQuF1+To4WqQcRvc+3J3gLCPIPgDKzGLG6zmQLfH3nn25heRuDNkS2KR4I8A=="; }; }; - "babel-plugin-polyfill-regenerator-0.3.0" = { + "babel-plugin-polyfill-regenerator-0.3.1" = { name = "babel-plugin-polyfill-regenerator"; packageName = "babel-plugin-polyfill-regenerator"; - version = "0.3.0"; + version = "0.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.3.0.tgz"; - sha512 = "dhAPTDLGoMW5/84wkgwiLRwMnio2i1fUe53EuvtKMv0pn2p3S8OCoV1xAzfJPl0KOX7IB89s2ib85vbYiea3jg=="; + url = "https://registry.npmjs.org/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.3.1.tgz"; + sha512 = "Y2B06tvgHYt1x0yz17jGkGeeMr5FeKUu+ASJ+N6nB5lQ8Dapfg42i0OVrf8PNGJ3zKL4A23snMi1IRwrqqND7A=="; }; }; "babel-preset-current-node-syntax-1.0.1" = { @@ -2362,31 +2146,22 @@ let sha512 = "L28STB170nwWS63UjtlEOE3dldQApaJXZkOI1uMFfzf3rRuPegHaHesyee+YxQ+W6SvRDQV6UrdOdRiR153wJg=="; }; }; - "camelcase-6.2.1" = { + "camelcase-6.3.0" = { name = "camelcase"; packageName = "camelcase"; - version = "6.2.1"; + version = "6.3.0"; src = fetchurl { - url = "https://registry.npmjs.org/camelcase/-/camelcase-6.2.1.tgz"; - sha512 = "tVI4q5jjFV5CavAU8DXfza/TJcZutVKo/5Foskmsqcm0MsL91moHvwiGNnqaa2o6PF/7yT5ikDRcVcl8Rj6LCA=="; + url = "https://registry.npmjs.org/camelcase/-/camelcase-6.3.0.tgz"; + sha512 = "Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA=="; }; }; - "caniuse-lite-1.0.30001292" = { + "caniuse-lite-1.0.30001304" = { name = "caniuse-lite"; packageName = "caniuse-lite"; - version = "1.0.30001292"; + version = "1.0.30001304"; src = fetchurl { - url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001292.tgz"; - sha512 = "jnT4Tq0Q4ma+6nncYQVe7d73kmDmE9C3OGTx3MvW7lBM/eY1S1DZTMBON7dqV481RhNiS5OxD7k9JQvmDOTirw=="; - }; - }; - "caniuse-lite-1.0.30001294" = { - name = "caniuse-lite"; - packageName = "caniuse-lite"; - version = "1.0.30001294"; - src = fetchurl { - url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001294.tgz"; - sha512 = "LiMlrs1nSKZ8qkNhpUf5KD0Al1KCBE3zaT7OLOwEkagXMEDij98SiOovn9wxVGQpklk9vVC/pUSqgYmkmKOS8g=="; + url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001304.tgz"; + sha512 = "bdsfZd6K6ap87AGqSHJP/s1V+U6Z5lyrcbBu3ovbCCf8cSYpwTtGrCBObMpJqwxfTbLW6YTIdbb1jEeTelcpYQ=="; }; }; "chalk-2.4.2" = { @@ -2416,13 +2191,13 @@ let sha512 = "kWWXztvZ5SBQV+eRgKFeh8q5sLuZY2+8WUIzlxWVTg+oGwY14qylx1KbKzHd8P6ZYkAg0xyIDU9JMHhyJMZ1jw=="; }; }; - "chokidar-3.5.2" = { + "chokidar-3.5.3" = { name = "chokidar"; packageName = "chokidar"; - version = "3.5.2"; + version = "3.5.3"; src = fetchurl { - url = "https://registry.npmjs.org/chokidar/-/chokidar-3.5.2.tgz"; - sha512 = "ekGhOnNVPgT77r4K/U3GDhu+FQ2S8TnK/s2KbIGXi0SZWuwkZ2QNyfWdZW+TVfn84DpEP7rLeCt2UI6bJ8GwbQ=="; + url = "https://registry.npmjs.org/chokidar/-/chokidar-3.5.3.tgz"; + sha512 = "Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw=="; }; }; "chownr-1.1.4" = { @@ -2488,15 +2263,6 @@ let sha512 = "iBPtljfCNcTKNAto0KEtDfZ3qzjJvqE3aTGZsbhjSBlorqpXJlaWWtPO35D+ZImoC3KWejX64o+yPGxhWSTzfg=="; }; }; - "collections-5.1.12" = { - name = "collections"; - packageName = "collections"; - version = "5.1.12"; - src = fetchurl { - url = "https://registry.npmjs.org/collections/-/collections-5.1.12.tgz"; - sha512 = "7WV0gdGlQFHjB//+/5JW4CdMnOlf7fWMMeM3EWvuao7RbK0MeFS01bZOgWmIH5DHDejSutf455QUZ56ZjjROXw=="; - }; - }; "color-3.2.1" = { name = "color"; packageName = "color"; @@ -2641,22 +2407,22 @@ let sha512 = "+OQdjP49zViI/6i7nIJpA8rAl4sV/JdPfU9nZs3VqOwGIgizICvuN2ru6fMd+4llL0tar18UYJXfZ/TWtmhUjA=="; }; }; - "core-js-3.20.1" = { + "core-js-3.20.3" = { name = "core-js"; packageName = "core-js"; - version = "3.20.1"; + version = "3.20.3"; src = fetchurl { - url = "https://registry.npmjs.org/core-js/-/core-js-3.20.1.tgz"; - sha512 = "btdpStYFQScnNVQ5slVcr858KP0YWYjV16eGJQw8Gg7CWtu/2qNvIM3qVRIR3n1pK2R9NNOrTevbvAYxajwEjg=="; + url = "https://registry.npmjs.org/core-js/-/core-js-3.20.3.tgz"; + sha512 = "vVl8j8ph6tRS3B8qir40H7yw7voy17xL0piAjlbBUsH7WIfzoedL/ZOr1OV9FyZQLWXsayOJyV4tnRyXR85/ag=="; }; }; - "core-js-compat-3.20.1" = { + "core-js-compat-3.20.3" = { name = "core-js-compat"; packageName = "core-js-compat"; - version = "3.20.1"; + version = "3.20.3"; src = fetchurl { - url = "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.20.1.tgz"; - sha512 = "AVhKZNpqMV3Jz8hU0YEXXE06qoxtQGsAqU0u1neUngz5IusDJRX/ZJ6t3i7mS7QxNyEONbCo14GprkBrxPlTZA=="; + url = "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.20.3.tgz"; + sha512 = "c8M5h0IkNZ+I92QhIpuSijOxGAcj3lgpsWdkCqmUTZNwidujF4r3pi6x1DCN+Vcs5qTS2XWWMfWSuCqyupX8gw=="; }; }; "core-util-is-1.0.3" = { @@ -2785,13 +2551,13 @@ let sha512 = "oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ=="; }; }; - "deep-object-diff-1.1.0" = { + "deep-object-diff-1.1.7" = { name = "deep-object-diff"; packageName = "deep-object-diff"; - version = "1.1.0"; + version = "1.1.7"; src = fetchurl { - url = "https://registry.npmjs.org/deep-object-diff/-/deep-object-diff-1.1.0.tgz"; - sha512 = "b+QLs5vHgS+IoSNcUE4n9HP2NwcHj7aqnJWsjPtuG75Rh5TOaGt0OjAYInh77d5T16V5cRDC+Pw/6ZZZiETBGw=="; + url = "https://registry.npmjs.org/deep-object-diff/-/deep-object-diff-1.1.7.tgz"; + sha512 = "QkgBca0mL08P6HiOjoqvmm6xOAl2W6CT2+34Ljhg0OeFan8cwlcdq8jrLKsBBuUFAZLsN5b6y491KdKEoSo9lg=="; }; }; "deepmerge-4.2.2" = { @@ -2848,13 +2614,13 @@ let sha1 = "978857442c44749e4206613e37946205826abd80"; }; }; - "detect-libc-1.0.3" = { + "detect-libc-2.0.0" = { name = "detect-libc"; packageName = "detect-libc"; - version = "1.0.3"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/detect-libc/-/detect-libc-1.0.3.tgz"; - sha1 = "fa137c4bd698edf55cd5cd02ac559f91a4c4ba9b"; + url = "https://registry.npmjs.org/detect-libc/-/detect-libc-2.0.0.tgz"; + sha512 = "S55LzUl8HUav8l9E2PBTlC5PAJrHK7tkM+XXFGD+fbsbkTzhCpG6K05LxJcUOEWzMa4v6ptcMZ9s3fOdJDu0Zw=="; }; }; "detect-newline-3.1.0" = { @@ -2920,22 +2686,22 @@ let sha1 = "590c61156b0ae2f4f0255732a158b266bc56b21d"; }; }; - "electron-to-chromium-1.4.28" = { + "electron-to-chromium-1.4.57" = { name = "electron-to-chromium"; packageName = "electron-to-chromium"; - version = "1.4.28"; + version = "1.4.57"; src = fetchurl { - url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.28.tgz"; - sha512 = "Gzbf0wUtKfyPaqf0Plz+Ctinf9eQIzxEqBHwSvbGfeOm9GMNdLxyu1dNiCUfM+x6r4BE0xUJNh3Nmg9gfAtTmg=="; + url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.57.tgz"; + sha512 = "FNC+P5K1n6pF+M0zIK+gFCoXcJhhzDViL3DRIGy2Fv5PohuSES1JHR7T+GlwxSxlzx4yYbsuzCZvHxcBSRCIOw=="; }; }; - "electron-to-chromium-1.4.31" = { + "electron-to-chromium-1.4.59" = { name = "electron-to-chromium"; packageName = "electron-to-chromium"; - version = "1.4.31"; + version = "1.4.59"; src = fetchurl { - url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.31.tgz"; - sha512 = "t3XVQtk+Frkv6aTD4RRk0OqosU+VLe1dQFW83MDer78ZD6a52frgXuYOIsLYTQiH2Lm+JB2OKYcn7zrX+YGAiQ=="; + url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.59.tgz"; + sha512 = "AOJ3cAE0TWxz4fQ9zkND5hWrQg16nsZKVz9INOot1oV//u4wWu5xrj9CQMmPTYskkZRunSRc9sAnr4EkexXokg=="; }; }; "emittery-0.8.1" = { @@ -2983,15 +2749,6 @@ let sha512 = "+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q=="; }; }; - "enquirer-2.3.6" = { - name = "enquirer"; - packageName = "enquirer"; - version = "2.3.6"; - src = fetchurl { - url = "https://registry.npmjs.org/enquirer/-/enquirer-2.3.6.tgz"; - sha512 = "yjNnPr315/FjS4zIsUxYguYUPP2e1NK4d7E7ZOLiyYCcbFBiTMyID+2wvm2w6+pZ/odMA7cRkjhsPbltwBOrLg=="; - }; - }; "escalade-3.1.1" = { name = "escalade"; packageName = "escalade"; @@ -3046,22 +2803,13 @@ let sha512 = "mmHKys/C8BFUGI+MAWNcSYoORYLMdPzjrknd2Vc+bUsjN5bXcr8EhrNB+UTqfL1y3I9c4fw2ihgtMPQLBRiQxw=="; }; }; - "eslint-8.5.0" = { + "eslint-8.8.0" = { name = "eslint"; packageName = "eslint"; - version = "8.5.0"; + version = "8.8.0"; src = fetchurl { - url = "https://registry.npmjs.org/eslint/-/eslint-8.5.0.tgz"; - sha512 = "tVGSkgNbOfiHyVte8bCM8OmX+xG9PzVG/B4UCF60zx7j61WIVY/AqJECDgpLD4DbbESD0e174gOg3ZlrX15GDg=="; - }; - }; - "eslint-8.6.0" = { - name = "eslint"; - packageName = "eslint"; - version = "8.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/eslint/-/eslint-8.6.0.tgz"; - sha512 = "UvxdOJ7mXFlw7iuHZA4jmzPaUqIw54mZrv+XPYKNbKdLR0et4rf60lIZUU9kiNtnzzMzGWxMV+tQ7uG7JG8DPw=="; + url = "https://registry.npmjs.org/eslint/-/eslint-8.8.0.tgz"; + sha512 = "H3KXAzQGBH1plhYS3okDix2ZthuYJlQQEGE5k0IKuEqUSiyu4AmxxlJ2MtTYeJ3xB4jDhcYCwGOg2TXYdnDXlQ=="; }; }; "eslint-config-google-0.14.0" = { @@ -3073,22 +2821,13 @@ let sha512 = "WsbX4WbjuMvTdeVL6+J3rK1RGhCTqjsFjX7UMSMgZiyxxaNLkoJENbrGExzERFeoTpGw3F3FypTiWAP9ZXzkEw=="; }; }; - "eslint-plugin-jest-25.3.0" = { + "eslint-plugin-jest-26.0.0" = { name = "eslint-plugin-jest"; packageName = "eslint-plugin-jest"; - version = "25.3.0"; + version = "26.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/eslint-plugin-jest/-/eslint-plugin-jest-25.3.0.tgz"; - sha512 = "79WQtuBsTN1S8Y9+7euBYwxIOia/k7ykkl9OCBHL3xuww5ecursHy/D8GCIlvzHVWv85gOkS5Kv6Sh7RxOgK1Q=="; - }; - }; - "eslint-plugin-jest-25.3.3" = { - name = "eslint-plugin-jest"; - packageName = "eslint-plugin-jest"; - version = "25.3.3"; - src = fetchurl { - url = "https://registry.npmjs.org/eslint-plugin-jest/-/eslint-plugin-jest-25.3.3.tgz"; - sha512 = "qi7aduaU4/oWegWo0zH4kbJbx8+Be+ABTr72OnO68zTMcJeeSuyH1CduTGF4ATyNFgpE1zp0u10/gIhe+QDSfg=="; + url = "https://registry.npmjs.org/eslint-plugin-jest/-/eslint-plugin-jest-26.0.0.tgz"; + sha512 = "Fvs0YgJ/nw9FTrnqTuMGVrkozkd07jkQzWm0ajqyHlfcsdkxGfAuv30fgfWHOnHiCr9+1YQ365CcDX7vrNhqQg=="; }; }; "eslint-scope-5.1.1" = { @@ -3127,22 +2866,13 @@ let sha512 = "0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw=="; }; }; - "eslint-visitor-keys-3.1.0" = { + "eslint-visitor-keys-3.2.0" = { name = "eslint-visitor-keys"; packageName = "eslint-visitor-keys"; - version = "3.1.0"; + version = "3.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.1.0.tgz"; - sha512 = "yWJFpu4DtjsWKkt5GeNBBuZMlNcYVs6vRCLoCVEJrTjaSB6LC98gFipNK/erM2Heg/E8mIK+hXG/pJMLK+eRZA=="; - }; - }; - "espree-9.2.0" = { - name = "espree"; - packageName = "espree"; - version = "9.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/espree/-/espree-9.2.0.tgz"; - sha512 = "oP3utRkynpZWF/F2x/HZJ+AGtnIclaR7z1pYPxy7NYM2fSO6LgK/Rkny8anRSPK/VwEA1eqm2squui0T7ZMOBg=="; + url = "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.2.0.tgz"; + sha512 = "IOzT0X126zn7ALX0dwFiUQEdsfzrm4+ISsQS8nukaJXwEyYKRSnEIIDULYg1mCtGp7UUXgfGl7BIolXREQK+XQ=="; }; }; "espree-9.3.0" = { @@ -3244,13 +2974,13 @@ let sha512 = "XYfuKMvj4O35f/pOXLObndIRvyQ+/+6AhODh+OKWj9S9498pHHn/IMszH+gt0fBCRWMNfk1ZSp5x3AifmnI2vg=="; }; }; - "expect-27.4.2" = { + "expect-27.4.6" = { name = "expect"; packageName = "expect"; - version = "27.4.2"; + version = "27.4.6"; src = fetchurl { - url = "https://registry.npmjs.org/expect/-/expect-27.4.2.tgz"; - sha512 = "BjAXIDC6ZOW+WBFNg96J22D27Nq5ohn+oGcuP2rtOtcjuxNoV9McpQ60PcQWhdFOSBIQdR72e+4HdnbZTFSTyg=="; + url = "https://registry.npmjs.org/expect/-/expect-27.4.6.tgz"; + sha512 = "1M/0kAALIaj5LaG66sFJTbRsWTADnylly82cu4bspI0nl+pgP4E6Bh/aqdHlTUjul06K7xQnnrAoqfxVU0+/ag=="; }; }; "fast-deep-equal-3.1.3" = { @@ -3262,13 +2992,13 @@ let sha512 = "f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q=="; }; }; - "fast-glob-3.2.7" = { + "fast-glob-3.2.11" = { name = "fast-glob"; packageName = "fast-glob"; - version = "3.2.7"; + version = "3.2.11"; src = fetchurl { - url = "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.7.tgz"; - sha512 = "rYGMRwip6lUMvYD3BTScMwT1HtAs2d71SMv66Vrxs0IekGZEjhM0pcMfjQPnknBt2zeCwQMEupiN02ZP4DiT1Q=="; + url = "https://registry.npmjs.org/fast-glob/-/fast-glob-3.2.11.tgz"; + sha512 = "xrO3+1bxSo3ZVHAnqzyuewYT6aMFHRAd4Kcs92MAonjwQZLsK9d0SF1IyQ3k5PoirxTW0Oe/RqFgMQ6TcNE5Ew=="; }; }; "fast-json-stable-stringify-2.1.0" = { @@ -3379,13 +3109,13 @@ let sha512 = "dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg=="; }; }; - "flatted-3.2.4" = { + "flatted-3.2.5" = { name = "flatted"; packageName = "flatted"; - version = "3.2.4"; + version = "3.2.5"; src = fetchurl { - url = "https://registry.npmjs.org/flatted/-/flatted-3.2.4.tgz"; - sha512 = "8/sOawo8tJ4QOBX8YlQBMxL8+RLZfxMQOif9o0KUKTNTjMYElWPE0r/m5VNFxTRd0NSw8qSy8dajrwX4RYI1Hw=="; + url = "https://registry.npmjs.org/flatted/-/flatted-3.2.5.tgz"; + sha512 = "WIWGi2L3DyTUvUrwRKgGi9TwxQMUEqPOPQBVi71R96jZXJdFskXEmf54BoZaS1kknGODoIGASGEzBUYdyMCBJg=="; }; }; "fn.name-1.1.0" = { @@ -3397,13 +3127,13 @@ let sha512 = "GRnmB5gPyJpAhTQdSZTSp9uaPSvl09KoYcMQtsB9rQoOmzs9dH6ffeccH+Z+cv6P68Hu5bC6JjRh4Ah/mHSNRw=="; }; }; - "follow-redirects-1.14.6" = { + "follow-redirects-1.14.7" = { name = "follow-redirects"; packageName = "follow-redirects"; - version = "1.14.6"; + version = "1.14.7"; src = fetchurl { - url = "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.6.tgz"; - sha512 = "fhUl5EwSJbbl8AR+uYL2KQDxLkdSjZGR36xy46AO7cOMTrCMON6Sa28FmAnC2tRTDbd/Uuzz3aJBv7EBN7JH8A=="; + url = "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.14.7.tgz"; + sha512 = "+hbxoLbFMbRKDwohX8GkTataGqO6Jb7jGwpAlwgy2bIz25XtRm7KEzJM76R1WiNT5SwZkX4Y75SwBolkpmE7iQ=="; }; }; "form-data-3.0.1" = { @@ -3595,13 +3325,13 @@ let sha512 = "uS8X6lSKN2JumVoXrbUz+uG4BYG+eiawqm3qFcT7ammfbUHeCBoJMlHcec/S3krSk73/AE/f0szYFmgAA3kYZg=="; }; }; - "globby-11.0.4" = { + "globby-11.1.0" = { name = "globby"; packageName = "globby"; - version = "11.0.4"; + version = "11.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/globby/-/globby-11.0.4.tgz"; - sha512 = "9O4MVG9ioZJ08ffbcyVYyLOJLk5JQ688pJ4eMGLpdWLHq/Wr1D9BlriLQyL0E+jbkuePVZXYFj47QM/v093wHg=="; + url = "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz"; + sha512 = "jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g=="; }; }; "glossy-0.1.7" = { @@ -3613,13 +3343,13 @@ let sha1 = "769b5984a96f6066ab9ea758224825ee6c210f0b"; }; }; - "graceful-fs-4.2.8" = { + "graceful-fs-4.2.9" = { name = "graceful-fs"; packageName = "graceful-fs"; - version = "4.2.8"; + version = "4.2.9"; src = fetchurl { - url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.8.tgz"; - sha512 = "qkIilPUYcNhJpd33n0GBXTB1MMPp14TxEsEs0pTrsSVucApsYzW5V+Q8Qxhik6KU3evy+qkAAowTByymK0avdg=="; + url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.9.tgz"; + sha512 = "NtNxqUcXgpW2iMrfqSfR73Glt39K+BLwWsPs94yR63v45T0Wbej7eRmL5cWfwEgqXnmjQp3zaJTshdRW/qC2ZQ=="; }; }; "handlebars-4.7.7" = { @@ -3793,13 +3523,13 @@ let sha512 = "veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw=="; }; }; - "import-local-3.0.3" = { + "import-local-3.1.0" = { name = "import-local"; packageName = "import-local"; - version = "3.0.3"; + version = "3.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/import-local/-/import-local-3.0.3.tgz"; - sha512 = "bE9iaUY3CXH8Cwfan/abDKAxe1KGT9kyGsBPqf6DMK/z0a2OzAsrukeYNgIH6cH5Xr452jb1TUL8rSfCLjZ9uA=="; + url = "https://registry.npmjs.org/import-local/-/import-local-3.1.0.tgz"; + sha512 = "ASB07uLtnDs1o6EHjKpX34BKYDSqnFerfTOJL2HvMqF70LnxpjkzDB8J44oT9pu4AMPkQwf8jl6szgvNd2tRIg=="; }; }; "imurmurhash-0.1.4" = { @@ -3856,13 +3586,13 @@ let sha512 = "ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw=="; }; }; - "is-core-module-2.8.0" = { + "is-core-module-2.8.1" = { name = "is-core-module"; packageName = "is-core-module"; - version = "2.8.0"; + version = "2.8.1"; src = fetchurl { - url = "https://registry.npmjs.org/is-core-module/-/is-core-module-2.8.0.tgz"; - sha512 = "vd15qHsaqrRL7dtH6QNuy0ndJmRDrS9HAM1CAiSifNUFv4x1a0CCVsj18hJ1mShxIG6T2i1sO78MkP56r0nYRw=="; + url = "https://registry.npmjs.org/is-core-module/-/is-core-module-2.8.1.tgz"; + sha512 = "SdNCUs284hr40hFTFP6l0IfZ/RSrMXF3qgoRHd3/79unUTvrFO/JoXwkGm+5J/Oe3E/b5GsnG330uUNgRpu1PA=="; }; }; "is-extglob-2.1.1" = { @@ -3973,15 +3703,6 @@ let sha512 = "eOeJ5BHCmHYvQK7xt9GkdHuzuCGS1Y6g9Gvnx3Ym33fz/HpLRYxiS0wHNr+m/MBC8B647Xt608vCDEvhl9c6Mw=="; }; }; - "istanbul-lib-instrument-4.0.3" = { - name = "istanbul-lib-instrument"; - packageName = "istanbul-lib-instrument"; - version = "4.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-4.0.3.tgz"; - sha512 = "BXgQl9kf4WTCPCCpmFGoJkz/+uhvm7h7PFKUYxh7qarQd3ER33vHG//qaE8eN25l07YqZPpHXU9I09l/RD5aGQ=="; - }; - }; "istanbul-lib-instrument-5.1.0" = { name = "istanbul-lib-instrument"; packageName = "istanbul-lib-instrument"; @@ -4009,15 +3730,6 @@ let sha512 = "n3s8EwkdFIJCG3BPKBYvskgXGoy88ARzvegkitk60NxRdwltLOTaH7CUiMRXvwYorl0Q712iEjcWB+fK/MrWVw=="; }; }; - "istanbul-reports-3.1.2" = { - name = "istanbul-reports"; - packageName = "istanbul-reports"; - version = "3.1.2"; - src = fetchurl { - url = "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.1.2.tgz"; - sha512 = "0gHxuT1NNC0aEIL1zbJ+MTgPbbHhU77eJPuU35WKA7TgXiSNlCAx4PENoMrH0Or6M2H80TaZcWKhM0IK6V8gRw=="; - }; - }; "istanbul-reports-3.1.3" = { name = "istanbul-reports"; packageName = "istanbul-reports"; @@ -4027,13 +3739,13 @@ let sha512 = "x9LtDVtfm/t1GFiLl3NffC7hz+I1ragvgX1P/Lg1NlIagifZDKUkuuaAxH/qpwj2IuEfD8G2Bs/UKp+sZ/pKkg=="; }; }; - "jest-27.4.5" = { + "jest-27.4.7" = { name = "jest"; packageName = "jest"; - version = "27.4.5"; + version = "27.4.7"; src = fetchurl { - url = "https://registry.npmjs.org/jest/-/jest-27.4.5.tgz"; - sha512 = "uT5MiVN3Jppt314kidCk47MYIRilJjA/l2mxwiuzzxGUeJIvA8/pDaJOAX5KWvjAo7SCydcW0/4WEtgbLMiJkg=="; + url = "https://registry.npmjs.org/jest/-/jest-27.4.7.tgz"; + sha512 = "8heYvsx7nV/m8m24Vk26Y87g73Ba6ueUd0MWed/NXMhSZIm62U/llVbS0PJe1SHunbyXjJ/BqG1z9bFjGUIvTg=="; }; }; "jest-changed-files-27.4.2" = { @@ -4045,40 +3757,40 @@ let sha512 = "/9x8MjekuzUQoPjDHbBiXbNEBauhrPU2ct7m8TfCg69ywt1y/N+yYwGh3gCpnqUS3klYWDU/lSNgv+JhoD2k1A=="; }; }; - "jest-circus-27.4.5" = { + "jest-circus-27.4.6" = { name = "jest-circus"; packageName = "jest-circus"; - version = "27.4.5"; + version = "27.4.6"; src = fetchurl { - url = "https://registry.npmjs.org/jest-circus/-/jest-circus-27.4.5.tgz"; - sha512 = "eTNWa9wsvBwPykhMMShheafbwyakcdHZaEYh5iRrQ0PFJxkDP/e3U/FvzGuKWu2WpwUA3C3hPlfpuzvOdTVqnw=="; + url = "https://registry.npmjs.org/jest-circus/-/jest-circus-27.4.6.tgz"; + sha512 = "UA7AI5HZrW4wRM72Ro80uRR2Fg+7nR0GESbSI/2M+ambbzVuA63mn5T1p3Z/wlhntzGpIG1xx78GP2YIkf6PhQ=="; }; }; - "jest-cli-27.4.5" = { + "jest-cli-27.4.7" = { name = "jest-cli"; packageName = "jest-cli"; - version = "27.4.5"; + version = "27.4.7"; src = fetchurl { - url = "https://registry.npmjs.org/jest-cli/-/jest-cli-27.4.5.tgz"; - sha512 = "hrky3DSgE0u7sQxaCL7bdebEPHx5QzYmrGuUjaPLmPE8jx5adtvGuOlRspvMoVLTTDOHRnZDoRLYJuA+VCI7Hg=="; + url = "https://registry.npmjs.org/jest-cli/-/jest-cli-27.4.7.tgz"; + sha512 = "zREYhvjjqe1KsGV15mdnxjThKNDgza1fhDT+iUsXWLCq3sxe9w5xnvyctcYVT5PcdLSjv7Y5dCwTS3FCF1tiuw=="; }; }; - "jest-config-27.4.5" = { + "jest-config-27.4.7" = { name = "jest-config"; packageName = "jest-config"; - version = "27.4.5"; + version = "27.4.7"; src = fetchurl { - url = "https://registry.npmjs.org/jest-config/-/jest-config-27.4.5.tgz"; - sha512 = "t+STVJtPt+fpqQ8GBw850NtSQbnDOw/UzdPfzDaHQ48/AylQlW7LHj3dH+ndxhC1UxJ0Q3qkq7IH+nM1skwTwA=="; + url = "https://registry.npmjs.org/jest-config/-/jest-config-27.4.7.tgz"; + sha512 = "xz/o/KJJEedHMrIY9v2ParIoYSrSVY6IVeE4z5Z3i101GoA5XgfbJz+1C8EYPsv7u7f39dS8F9v46BHDhn0vlw=="; }; }; - "jest-diff-27.4.2" = { + "jest-diff-27.4.6" = { name = "jest-diff"; packageName = "jest-diff"; - version = "27.4.2"; + version = "27.4.6"; src = fetchurl { - url = "https://registry.npmjs.org/jest-diff/-/jest-diff-27.4.2.tgz"; - sha512 = "ujc9ToyUZDh9KcqvQDkk/gkbf6zSaeEg9AiBxtttXW59H/AcqEYp1ciXAtJp+jXWva5nAf/ePtSsgWwE5mqp4Q=="; + url = "https://registry.npmjs.org/jest-diff/-/jest-diff-27.4.6.tgz"; + sha512 = "zjaB0sh0Lb13VyPsd92V7HkqF6yKRH9vm33rwBt7rPYrpQvS1nCvlIy2pICbKta+ZjWngYLNn4cCK4nyZkjS/w=="; }; }; "jest-docblock-27.4.0" = { @@ -4090,31 +3802,31 @@ let sha512 = "7TBazUdCKGV7svZ+gh7C8esAnweJoG+SvcF6Cjqj4l17zA2q1cMwx2JObSioubk317H+cjcHgP+7fTs60paulg=="; }; }; - "jest-each-27.4.2" = { + "jest-each-27.4.6" = { name = "jest-each"; packageName = "jest-each"; - version = "27.4.2"; + version = "27.4.6"; src = fetchurl { - url = "https://registry.npmjs.org/jest-each/-/jest-each-27.4.2.tgz"; - sha512 = "53V2MNyW28CTruB3lXaHNk6PkiIFuzdOC9gR3C6j8YE/ACfrPnz+slB0s17AgU1TtxNzLuHyvNlLJ+8QYw9nBg=="; + url = "https://registry.npmjs.org/jest-each/-/jest-each-27.4.6.tgz"; + sha512 = "n6QDq8y2Hsmn22tRkgAk+z6MCX7MeVlAzxmZDshfS2jLcaBlyhpF3tZSJLR+kXmh23GEvS0ojMR8i6ZeRvpQcA=="; }; }; - "jest-environment-jsdom-27.4.4" = { + "jest-environment-jsdom-27.4.6" = { name = "jest-environment-jsdom"; packageName = "jest-environment-jsdom"; - version = "27.4.4"; + version = "27.4.6"; src = fetchurl { - url = "https://registry.npmjs.org/jest-environment-jsdom/-/jest-environment-jsdom-27.4.4.tgz"; - sha512 = "cYR3ndNfHBqQgFvS1RL7dNqSvD//K56j/q1s2ygNHcfTCAp12zfIromO1w3COmXrxS8hWAh7+CmZmGCIoqGcGA=="; + url = "https://registry.npmjs.org/jest-environment-jsdom/-/jest-environment-jsdom-27.4.6.tgz"; + sha512 = "o3dx5p/kHPbUlRvSNjypEcEtgs6LmvESMzgRFQE6c+Prwl2JLA4RZ7qAnxc5VM8kutsGRTB15jXeeSbJsKN9iA=="; }; }; - "jest-environment-node-27.4.4" = { + "jest-environment-node-27.4.6" = { name = "jest-environment-node"; packageName = "jest-environment-node"; - version = "27.4.4"; + version = "27.4.6"; src = fetchurl { - url = "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-27.4.4.tgz"; - sha512 = "D+v3lbJ2GjQTQR23TK0kY3vFVmSeea05giInI41HHOaJnAwOnmUHTZgUaZL+VxUB43pIzoa7PMwWtCVlIUoVoA=="; + url = "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-27.4.6.tgz"; + sha512 = "yfHlZ9m+kzTKZV0hVfhVu6GuDxKAYeFHrfulmy7Jxwsq4V7+ZK7f+c0XP/tbVDMQW7E4neG2u147hFkuVz0MlQ=="; }; }; "jest-get-type-27.4.0" = { @@ -4126,58 +3838,58 @@ let sha512 = "tk9o+ld5TWq41DkK14L4wox4s2D9MtTpKaAVzXfr5CUKm5ZK2ExcaFE0qls2W71zE/6R2TxxrK9w2r6svAFDBQ=="; }; }; - "jest-haste-map-27.4.5" = { + "jest-haste-map-27.4.6" = { name = "jest-haste-map"; packageName = "jest-haste-map"; - version = "27.4.5"; + version = "27.4.6"; src = fetchurl { - url = "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-27.4.5.tgz"; - sha512 = "oJm1b5qhhPs78K24EDGifWS0dELYxnoBiDhatT/FThgB9yxqUm5F6li3Pv+Q+apMBmmPNzOBnZ7ZxWMB1Leq1Q=="; + url = "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-27.4.6.tgz"; + sha512 = "0tNpgxg7BKurZeFkIOvGCkbmOHbLFf4LUQOxrQSMjvrQaQe3l6E8x6jYC1NuWkGo5WDdbr8FEzUxV2+LWNawKQ=="; }; }; - "jest-jasmine2-27.4.5" = { + "jest-jasmine2-27.4.6" = { name = "jest-jasmine2"; packageName = "jest-jasmine2"; - version = "27.4.5"; + version = "27.4.6"; src = fetchurl { - url = "https://registry.npmjs.org/jest-jasmine2/-/jest-jasmine2-27.4.5.tgz"; - sha512 = "oUnvwhJDj2LhOiUB1kdnJjkx8C5PwgUZQb9urF77mELH9DGR4e2GqpWQKBOYXWs5+uTN9BGDqRz3Aeg5Wts7aw=="; + url = "https://registry.npmjs.org/jest-jasmine2/-/jest-jasmine2-27.4.6.tgz"; + sha512 = "uAGNXF644I/whzhsf7/qf74gqy9OuhvJ0XYp8SDecX2ooGeaPnmJMjXjKt0mqh1Rl5dtRGxJgNrHlBQIBfS5Nw=="; }; }; - "jest-leak-detector-27.4.2" = { + "jest-leak-detector-27.4.6" = { name = "jest-leak-detector"; packageName = "jest-leak-detector"; - version = "27.4.2"; + version = "27.4.6"; src = fetchurl { - url = "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-27.4.2.tgz"; - sha512 = "ml0KvFYZllzPBJWDei3mDzUhyp/M4ubKebX++fPaudpe8OsxUE+m+P6ciVLboQsrzOCWDjE20/eXew9QMx/VGw=="; + url = "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-27.4.6.tgz"; + sha512 = "kkaGixDf9R7CjHm2pOzfTxZTQQQ2gHTIWKY/JZSiYTc90bZp8kSZnUMS3uLAfwTZwc0tcMRoEX74e14LG1WapA=="; }; }; - "jest-matcher-utils-27.4.2" = { + "jest-matcher-utils-27.4.6" = { name = "jest-matcher-utils"; packageName = "jest-matcher-utils"; - version = "27.4.2"; + version = "27.4.6"; src = fetchurl { - url = "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-27.4.2.tgz"; - sha512 = "jyP28er3RRtMv+fmYC/PKG8wvAmfGcSNproVTW2Y0P/OY7/hWUOmsPfxN1jOhM+0u2xU984u2yEagGivz9OBGQ=="; + url = "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-27.4.6.tgz"; + sha512 = "XD4PKT3Wn1LQnRAq7ZsTI0VRuEc9OrCPFiO1XL7bftTGmfNF0DcEwMHRgqiu7NGf8ZoZDREpGrCniDkjt79WbA=="; }; }; - "jest-message-util-27.4.2" = { + "jest-message-util-27.4.6" = { name = "jest-message-util"; packageName = "jest-message-util"; - version = "27.4.2"; + version = "27.4.6"; src = fetchurl { - url = "https://registry.npmjs.org/jest-message-util/-/jest-message-util-27.4.2.tgz"; - sha512 = "OMRqRNd9E0DkBLZpFtZkAGYOXl6ZpoMtQJWTAREJKDOFa0M6ptB7L67tp+cszMBkvSgKOhNtQp2Vbcz3ZZKo/w=="; + url = "https://registry.npmjs.org/jest-message-util/-/jest-message-util-27.4.6.tgz"; + sha512 = "0p5szriFU0U74czRSFjH6RyS7UYIAkn/ntwMuOwTGWrQIOh5NzXXrq72LOqIkJKKvFbPq+byZKuBz78fjBERBA=="; }; }; - "jest-mock-27.4.2" = { + "jest-mock-27.4.6" = { name = "jest-mock"; packageName = "jest-mock"; - version = "27.4.2"; + version = "27.4.6"; src = fetchurl { - url = "https://registry.npmjs.org/jest-mock/-/jest-mock-27.4.2.tgz"; - sha512 = "PDDPuyhoukk20JrQKeofK12hqtSka7mWH0QQuxSNgrdiPsrnYYLS6wbzu/HDlxZRzji5ylLRULeuI/vmZZDrYA=="; + url = "https://registry.npmjs.org/jest-mock/-/jest-mock-27.4.6.tgz"; + sha512 = "kvojdYRkst8iVSZ1EJ+vc1RRD9llueBjKzXzeCytH3dMM7zvPV/ULcfI2nr0v0VUgm3Bjt3hBCQvOeaBz+ZTHw=="; }; }; "jest-pnp-resolver-1.2.2" = { @@ -4198,40 +3910,40 @@ let sha512 = "WeCpMpNnqJYMQoOjm1nTtsgbR4XHAk1u00qDoNBQoykM280+/TmgA5Qh5giC1ecy6a5d4hbSsHzpBtu5yvlbEg=="; }; }; - "jest-resolve-27.4.5" = { + "jest-resolve-27.4.6" = { name = "jest-resolve"; packageName = "jest-resolve"; - version = "27.4.5"; + version = "27.4.6"; src = fetchurl { - url = "https://registry.npmjs.org/jest-resolve/-/jest-resolve-27.4.5.tgz"; - sha512 = "xU3z1BuOz/hUhVUL+918KqUgK+skqOuUsAi7A+iwoUldK6/+PW+utK8l8cxIWT9AW7IAhGNXjSAh1UYmjULZZw=="; + url = "https://registry.npmjs.org/jest-resolve/-/jest-resolve-27.4.6.tgz"; + sha512 = "SFfITVApqtirbITKFAO7jOVN45UgFzcRdQanOFzjnbd+CACDoyeX7206JyU92l4cRr73+Qy/TlW51+4vHGt+zw=="; }; }; - "jest-resolve-dependencies-27.4.5" = { + "jest-resolve-dependencies-27.4.6" = { name = "jest-resolve-dependencies"; packageName = "jest-resolve-dependencies"; - version = "27.4.5"; + version = "27.4.6"; src = fetchurl { - url = "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-27.4.5.tgz"; - sha512 = "elEVvkvRK51y037NshtEkEnukMBWvlPzZHiL847OrIljJ8yIsujD2GXRPqDXC4rEVKbcdsy7W0FxoZb4WmEs7w=="; + url = "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-27.4.6.tgz"; + sha512 = "W85uJZcFXEVZ7+MZqIPCscdjuctruNGXUZ3OHSXOfXR9ITgbUKeHj+uGcies+0SsvI5GtUfTw4dY7u9qjTvQOw=="; }; }; - "jest-runner-27.4.5" = { + "jest-runner-27.4.6" = { name = "jest-runner"; packageName = "jest-runner"; - version = "27.4.5"; + version = "27.4.6"; src = fetchurl { - url = "https://registry.npmjs.org/jest-runner/-/jest-runner-27.4.5.tgz"; - sha512 = "/irauncTfmY1WkTaRQGRWcyQLzK1g98GYG/8QvIPviHgO1Fqz1JYeEIsSfF+9mc/UTA6S+IIHFgKyvUrtiBIZg=="; + url = "https://registry.npmjs.org/jest-runner/-/jest-runner-27.4.6.tgz"; + sha512 = "IDeFt2SG4DzqalYBZRgbbPmpwV3X0DcntjezPBERvnhwKGWTW7C5pbbA5lVkmvgteeNfdd/23gwqv3aiilpYPg=="; }; }; - "jest-runtime-27.4.5" = { + "jest-runtime-27.4.6" = { name = "jest-runtime"; packageName = "jest-runtime"; - version = "27.4.5"; + version = "27.4.6"; src = fetchurl { - url = "https://registry.npmjs.org/jest-runtime/-/jest-runtime-27.4.5.tgz"; - sha512 = "CIYqwuJQXHQtPd/idgrx4zgJ6iCb6uBjQq1RSAGQrw2S8XifDmoM1Ot8NRd80ooAm+ZNdHVwsktIMGlA1F1FAQ=="; + url = "https://registry.npmjs.org/jest-runtime/-/jest-runtime-27.4.6.tgz"; + sha512 = "eXYeoR/MbIpVDrjqy5d6cGCFOYBFFDeKaNWqTp0h6E74dK0zLHzASQXJpl5a2/40euBmKnprNLJ0Kh0LCndnWQ=="; }; }; "jest-serializer-27.4.0" = { @@ -4243,13 +3955,13 @@ let sha512 = "RDhpcn5f1JYTX2pvJAGDcnsNTnsV9bjYPU8xcV+xPwOXnUPOQwf4ZEuiU6G9H1UztH+OapMgu/ckEVwO87PwnQ=="; }; }; - "jest-snapshot-27.4.5" = { + "jest-snapshot-27.4.6" = { name = "jest-snapshot"; packageName = "jest-snapshot"; - version = "27.4.5"; + version = "27.4.6"; src = fetchurl { - url = "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-27.4.5.tgz"; - sha512 = "eCi/iM1YJFrJWiT9de4+RpWWWBqsHiYxFG9V9o/n0WXs6GpW4lUt4FAHAgFPTLPqCUVzrMQmSmTZSgQzwqR7IQ=="; + url = "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-27.4.6.tgz"; + sha512 = "fafUCDLQfzuNP9IRcEqaFAMzEe7u5BF7mude51wyWv7VRex60WznZIC7DfKTgSIlJa8aFzYmXclmN328aqSDmQ=="; }; }; "jest-util-27.4.2" = { @@ -4261,31 +3973,40 @@ let sha512 = "YuxxpXU6nlMan9qyLuxHaMMOzXAl5aGZWCSzben5DhLHemYQxCc4YK+4L3ZrCutT8GPQ+ui9k5D8rUJoDioMnA=="; }; }; - "jest-validate-27.4.2" = { + "jest-validate-27.4.6" = { name = "jest-validate"; packageName = "jest-validate"; - version = "27.4.2"; + version = "27.4.6"; src = fetchurl { - url = "https://registry.npmjs.org/jest-validate/-/jest-validate-27.4.2.tgz"; - sha512 = "hWYsSUej+Fs8ZhOm5vhWzwSLmVaPAxRy+Mr+z5MzeaHm9AxUpXdoVMEW4R86y5gOobVfBsMFLk4Rb+QkiEpx1A=="; + url = "https://registry.npmjs.org/jest-validate/-/jest-validate-27.4.6.tgz"; + sha512 = "872mEmCPVlBqbA5dToC57vA3yJaMRfIdpCoD3cyHWJOMx+SJwLNw0I71EkWs41oza/Er9Zno9XuTkRYCPDUJXQ=="; }; }; - "jest-watcher-27.4.2" = { + "jest-watcher-27.4.6" = { name = "jest-watcher"; packageName = "jest-watcher"; - version = "27.4.2"; + version = "27.4.6"; src = fetchurl { - url = "https://registry.npmjs.org/jest-watcher/-/jest-watcher-27.4.2.tgz"; - sha512 = "NJvMVyyBeXfDezhWzUOCOYZrUmkSCiatpjpm+nFUid74OZEHk6aMLrZAukIiFDwdbqp6mTM6Ui1w4oc+8EobQg=="; + url = "https://registry.npmjs.org/jest-watcher/-/jest-watcher-27.4.6.tgz"; + sha512 = "yKQ20OMBiCDigbD0quhQKLkBO+ObGN79MO4nT7YaCuQ5SM+dkBNWE8cZX0FjU6czwMvWw6StWbe+Wv4jJPJ+fw=="; }; }; - "jest-worker-27.4.5" = { + "jest-worker-27.4.6" = { name = "jest-worker"; packageName = "jest-worker"; - version = "27.4.5"; + version = "27.4.6"; src = fetchurl { - url = "https://registry.npmjs.org/jest-worker/-/jest-worker-27.4.5.tgz"; - sha512 = "f2s8kEdy15cv9r7q4KkzGXvlY0JTcmCbMHZBfSQDwW77REr45IDWwd0lksDFeVHH2jJ5pqb90T77XscrjeGzzg=="; + url = "https://registry.npmjs.org/jest-worker/-/jest-worker-27.4.6.tgz"; + sha512 = "gHWJF/6Xi5CTG5QCvROr6GcmpIqNYpDJyc8A1h/DyXqH1tD6SnRCM0d3U5msV31D2LB/U+E0M+W4oyvKV44oNw=="; + }; + }; + "js-sdsl-2.1.4" = { + name = "js-sdsl"; + packageName = "js-sdsl"; + version = "2.1.4"; + src = fetchurl { + url = "https://registry.npmjs.org/js-sdsl/-/js-sdsl-2.1.4.tgz"; + sha512 = "/Ew+CJWHNddr7sjwgxaVeIORIH4AMVC9dy0hPf540ZGMVgS9d3ajwuVdyhDt6/QUvT8ATjR3yuYBKsS79F+H4A=="; }; }; "js-tokens-4.0.0" = { @@ -4477,13 +4198,13 @@ let sha512 = "0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ=="; }; }; - "logform-2.3.0" = { + "logform-2.3.2" = { name = "logform"; packageName = "logform"; - version = "2.3.0"; + version = "2.3.2"; src = fetchurl { - url = "https://registry.npmjs.org/logform/-/logform-2.3.0.tgz"; - sha512 = "graeoWUH2knKbGthMtuG1EfaSPMZFZBIrhuJHhkS5ZseFBrc7DupCzihOQAzsK/qIKPQaPJ/lFQFctILUY5ARQ=="; + url = "https://registry.npmjs.org/logform/-/logform-2.3.2.tgz"; + sha512 = "V6JiPThZzTsbVRspNO6TmHkR99oqYTs8fivMBYQkjZj6rxW92KxtDCPE6IkAk1DNBnYKNkjm4jYBm6JDUcyhOA=="; }; }; "lru-cache-6.0.0" = { @@ -4531,13 +4252,13 @@ let sha512 = "JmqCvUhmt43madlpFzG4BQzG2Z3m6tvQDNKdClZnO3VbIudJYmxsT0FNJMeiB2+JTSlTQTSbU8QdesVmwJcmLg=="; }; }; - "marked-3.0.8" = { + "marked-4.0.12" = { name = "marked"; packageName = "marked"; - version = "3.0.8"; + version = "4.0.12"; src = fetchurl { - url = "https://registry.npmjs.org/marked/-/marked-3.0.8.tgz"; - sha512 = "0gVrAjo5m0VZSJb4rpL59K1unJAMb/hm8HRXqasD8VeC8m91ytDPMritgFSlKonfdt+rRYYpP/JfLxgIX8yoSw=="; + url = "https://registry.npmjs.org/marked/-/marked-4.0.12.tgz"; + sha512 = "hgibXWrEDNBWgGiK18j/4lkS6ihTe9sxtV4Q1OQppb/0zzyPSzoFANBa5MfsG/zgsWklmNnhm0XACZOH/0HBiQ=="; }; }; "merge-stream-2.0.0" = { @@ -4666,13 +4387,13 @@ let sha512 = "kHmoybcPV8Sqy59DwNDY3Jefr64lK/by/da0ViFcuA4DH0vQg5Q6Ze5VimxkfQNSC+Mls/Kx53s7TjP1RhFEDQ=="; }; }; - "mqtt-4.3.1" = { + "mqtt-4.3.4" = { name = "mqtt"; packageName = "mqtt"; - version = "4.3.1"; + version = "4.3.4"; src = fetchurl { - url = "https://registry.npmjs.org/mqtt/-/mqtt-4.3.1.tgz"; - sha512 = "262jQ0K3CHnG8WxDvWTqQ99gSI26+gGKax4xoTizkLQZInX8jhwqS9YCCO5F8kCdqpKnEkNdlMva6n7PFbxDfw=="; + url = "https://registry.npmjs.org/mqtt/-/mqtt-4.3.4.tgz"; + sha512 = "yAVDfVHz3Cjn6K68z54mf7fTni/AWsPhiEsRwZSvet2wO47R6NFUn2psWxYIph2JxWtL3ZKa/da8pjJKSaXPdQ=="; }; }; "mqtt-packet-6.10.0" = { @@ -4810,13 +4531,13 @@ let sha512 = "2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg=="; }; }; - "number-allocator-1.0.7" = { + "number-allocator-1.0.9" = { name = "number-allocator"; packageName = "number-allocator"; - version = "1.0.7"; + version = "1.0.9"; src = fetchurl { - url = "https://registry.npmjs.org/number-allocator/-/number-allocator-1.0.7.tgz"; - sha512 = "l8nkXEe+uaRWbP3qqPKRphy5BpYOYKOhrY0vE7NVQvNpVto+zSNsEMiQ4UHbGP1LrVeDTFFBVBoGaSoi9OWMqQ=="; + url = "https://registry.npmjs.org/number-allocator/-/number-allocator-1.0.9.tgz"; + sha512 = "sIIF0dZKMs3roPUD7rLreH8H3x47QKV9dHZ+PeSnH24gL0CxKxz/823woGZC0hLBSb2Ar/rOOeHiNbnPBum/Mw=="; }; }; "number-is-nan-1.0.1" = { @@ -5035,13 +4756,13 @@ let sha512 = "1fygroTLlHu66zi26VoTDv8yRgm0Fccecssto+MhsZ0D/DGW2sm8E8AjW7NU5VVTRt5GxbeZ5qBuJr+HyLYkjQ=="; }; }; - "picomatch-2.3.0" = { + "picomatch-2.3.1" = { name = "picomatch"; packageName = "picomatch"; - version = "2.3.0"; + version = "2.3.1"; src = fetchurl { - url = "https://registry.npmjs.org/picomatch/-/picomatch-2.3.0.tgz"; - sha512 = "lY1Q/PiJGC2zOv/z391WOTD+Z02bCgsFfvxoXXf6h7kv9o+WmsmzYqrAwY63sNgOxE4xEdq0WyUnXfKeBrSvYw=="; + url = "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz"; + sha512 = "JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA=="; }; }; "pify-4.0.1" = { @@ -5053,13 +4774,13 @@ let sha512 = "uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g=="; }; }; - "pirates-4.0.4" = { + "pirates-4.0.5" = { name = "pirates"; packageName = "pirates"; - version = "4.0.4"; + version = "4.0.5"; src = fetchurl { - url = "https://registry.npmjs.org/pirates/-/pirates-4.0.4.tgz"; - sha512 = "ZIrVPH+A52Dw84R0L3/VS9Op04PuQ2SEoJL6bkshmiTic/HldyW9Tf7oH5mhJZBK7NmDx27vSMrYEXPXclpDKw=="; + url = "https://registry.npmjs.org/pirates/-/pirates-4.0.5.tgz"; + sha512 = "8V9+HQPupnaXMA23c5hvl69zXvTwTzyAYasnkb0Tts4XvO4CliqONMOnvlq26rkhLC3nWDFBJf73LU1e1VZLaQ=="; }; }; "pkg-dir-4.2.0" = { @@ -5071,13 +4792,13 @@ let sha512 = "HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ=="; }; }; - "prebuild-install-7.0.0" = { + "prebuild-install-7.0.1" = { name = "prebuild-install"; packageName = "prebuild-install"; - version = "7.0.0"; + version = "7.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/prebuild-install/-/prebuild-install-7.0.0.tgz"; - sha512 = "IvSenf33K7JcgddNz2D5w521EgO+4aMMjFt73Uk9FRzQ7P+QZPKrp7qPsDydsSwjGt3T5xRNnM1bj1zMTD5fTA=="; + url = "https://registry.npmjs.org/prebuild-install/-/prebuild-install-7.0.1.tgz"; + sha512 = "QBSab31WqkyxpnMWQxubYAHR5S9B2+r81ucocew34Fkl98FhvKIF50jIJnNOBmAZfyNV7vE5T6gd3hTVWgY6tg=="; }; }; "prelude-ls-1.1.2" = { @@ -5098,13 +4819,13 @@ let sha512 = "vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g=="; }; }; - "pretty-format-27.4.2" = { + "pretty-format-27.4.6" = { name = "pretty-format"; packageName = "pretty-format"; - version = "27.4.2"; + version = "27.4.6"; src = fetchurl { - url = "https://registry.npmjs.org/pretty-format/-/pretty-format-27.4.2.tgz"; - sha512 = "p0wNtJ9oLuvgOQDEIZ9zQjZffK7KtyR6Si0jnXULIDwrlNF8Cuir3AZP0hHv0jmKuNN/edOnbMjnzd4uTcmWiw=="; + url = "https://registry.npmjs.org/pretty-format/-/pretty-format-27.4.6.tgz"; + sha512 = "NblstegA1y/RJW2VyML+3LlpFjzx62cUrtBIKIWDXEDkjNeleA7Od7nrzcs/VLQvAeV4CgSYhrN39DRN88Qi/g=="; }; }; "process-nextick-args-2.0.1" = { @@ -5116,15 +4837,6 @@ let sha512 = "3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag=="; }; }; - "progress-2.0.3" = { - name = "progress"; - packageName = "progress"; - version = "2.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz"; - sha512 = "7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA=="; - }; - }; "prompts-2.4.2" = { name = "prompts"; packageName = "prompts"; @@ -5323,13 +5035,13 @@ let sha512 = "Xf0nWe6RseziFMu+Ap9biiUbmplq6S9/p+7w7YXP/JBHhrUDDUhwa+vANyubuqfZWTveU//DYVGsDG7RKL/vEw=="; }; }; - "resolve-1.20.0" = { + "resolve-1.22.0" = { name = "resolve"; packageName = "resolve"; - version = "1.20.0"; + version = "1.22.0"; src = fetchurl { - url = "https://registry.npmjs.org/resolve/-/resolve-1.20.0.tgz"; - sha512 = "wENBPt4ySzg4ybFQW2TT1zMQucPK95HSh/nq2CFTZVOGut2+pQvSsgtda4d26YrYcr067wjbmzOG8byDPBX63A=="; + url = "https://registry.npmjs.org/resolve/-/resolve-1.22.0.tgz"; + sha512 = "Hhtrw0nLeSrFQ7phPp4OOcVjLPIeMnRlr5mcnVuMe7M/7eBn98A3hmFRLoFo3DLZkivSYwhRUJTyPyWAk56WLw=="; }; }; "resolve-cwd-3.0.0" = { @@ -5431,6 +5143,15 @@ let sha512 = "ERq4hUjKDbJfE4+XtZLFPCDi8Vb1JqaxAPTxWFLBx8XcAlf9Bda/ZJdVezs/NAfsMQScyIlUMx+Yeu7P7rx5jw=="; }; }; + "safe-stable-stringify-2.3.1" = { + name = "safe-stable-stringify"; + packageName = "safe-stable-stringify"; + version = "2.3.1"; + src = fetchurl { + url = "https://registry.npmjs.org/safe-stable-stringify/-/safe-stable-stringify-2.3.1.tgz"; + sha512 = "kYBSfT+troD9cDA85VDnHZ1rpHC50O0g1e6WlGHVCz/g+JS+9WKLj+XwFYyR8UbrZN8ll9HUpDAAddY58MGisg=="; + }; + }; "safer-buffer-2.1.2" = { name = "safer-buffer"; packageName = "safer-buffer"; @@ -5548,13 +5269,13 @@ let sha512 = "7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A=="; }; }; - "shiki-0.9.15" = { + "shiki-0.10.0" = { name = "shiki"; packageName = "shiki"; - version = "0.9.15"; + version = "0.10.0"; src = fetchurl { - url = "https://registry.npmjs.org/shiki/-/shiki-0.9.15.tgz"; - sha512 = "/Y0z9IzhJ8nD9nbceORCqu6NgT9X6I8Fk8c3SICHI5NbZRLdZYFaB233gwct9sU0vvSypyaL/qaKvzyQGJBZSw=="; + url = "https://registry.npmjs.org/shiki/-/shiki-0.10.0.tgz"; + sha512 = "iczxaIYeBFHTFrQPb9DVy2SKgYxC4Wo7Iucm7C17cCh2Ge/refnvHscUOxM85u57MfLoNOtjoEFUWt9gBexblA=="; }; }; "signal-exit-3.0.6" = { @@ -5575,13 +5296,13 @@ let sha512 = "cSFtAPtRhljv69IK0hTVZQ+OfE9nePi/rtJmw5UjHeVyVroEqJXP1sFztKUy1qU+xvz3u/sfYJLa947b7nAN2Q=="; }; }; - "simple-get-4.0.0" = { + "simple-get-4.0.1" = { name = "simple-get"; packageName = "simple-get"; - version = "4.0.0"; + version = "4.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/simple-get/-/simple-get-4.0.0.tgz"; - sha512 = "ZalZGexYr3TA0SwySsr5HlgOOinS4Jsa8YB2GJ6lUNAazyAu4KG/VmzMTwAt2YVXzzVj8QmefmAonZIK2BSGcQ=="; + url = "https://registry.npmjs.org/simple-get/-/simple-get-4.0.1.tgz"; + sha512 = "brv7p5WgH0jmQJr1ZDDfKDOSeWWg+OVypG99A/5vYGPqJ6pxiaHLy8nxtFjBA7oMa01ebA9gfh1uMCFqOuXxvA=="; }; }; "simple-swizzle-0.2.2" = { @@ -5854,6 +5575,15 @@ let sha512 = "6sXEzV5+I5j8Bmq9/vUphGRM/RJNT9SCURJLjwfOg51heRtguGWDzcaBlgAzKhQa0EVNpPEKzQuBwZ8S8WaCeQ=="; }; }; + "supports-preserve-symlinks-flag-1.0.0" = { + name = "supports-preserve-symlinks-flag"; + packageName = "supports-preserve-symlinks-flag"; + version = "1.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz"; + sha512 = "ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w=="; + }; + }; "symbol-tree-3.2.4" = { name = "symbol-tree"; packageName = "symbol-tree"; @@ -6115,22 +5845,22 @@ let sha512 = "zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q=="; }; }; - "typedoc-0.22.10" = { + "typedoc-0.22.11" = { name = "typedoc"; packageName = "typedoc"; - version = "0.22.10"; + version = "0.22.11"; src = fetchurl { - url = "https://registry.npmjs.org/typedoc/-/typedoc-0.22.10.tgz"; - sha512 = "hQYZ4WtoMZ61wDC6w10kxA42+jclWngdmztNZsDvIz7BMJg7F2xnT+uYsUa7OluyKossdFj9E9Ye4QOZKTy8SA=="; + url = "https://registry.npmjs.org/typedoc/-/typedoc-0.22.11.tgz"; + sha512 = "pVr3hh6dkS3lPPaZz1fNpvcrqLdtEvXmXayN55czlamSgvEjh+57GUqfhAI1Xsuu/hNHUT1KNSx8LH2wBP/7SA=="; }; }; - "typedoc-plugin-markdown-3.11.8" = { + "typedoc-plugin-markdown-3.11.12" = { name = "typedoc-plugin-markdown"; packageName = "typedoc-plugin-markdown"; - version = "3.11.8"; + version = "3.11.12"; src = fetchurl { - url = "https://registry.npmjs.org/typedoc-plugin-markdown/-/typedoc-plugin-markdown-3.11.8.tgz"; - sha512 = "j2Kwi/RnwDwiNr9CMy4lrwB9+1alwjrMakb9+7S0Bz9gnDsdqamOguZ6e27iB97U18nK6GBeR8qDarIyoJYDCg=="; + url = "https://registry.npmjs.org/typedoc-plugin-markdown/-/typedoc-plugin-markdown-3.11.12.tgz"; + sha512 = "gb/RuzgZ1zCnRUOqUg6firIqU7xDs9s7hq0vlU/gAsFfVCnpl3NTM9vPyPON75nnpfVFCxr/hmKQ01k1CYY/Qg=="; }; }; "typedoc-plugin-no-inherit-1.3.1" = { @@ -6151,22 +5881,22 @@ let sha512 = "xHq9DzkoQywS7FyPneMm2/Hr9GRoCpjSQXkVN0W6SCJKP7fguqg2tasgh+8l5/mW6YSYvqCqEbkSYLbuD4Y6gA=="; }; }; - "typescript-4.5.4" = { + "typescript-4.5.5" = { name = "typescript"; packageName = "typescript"; - version = "4.5.4"; + version = "4.5.5"; src = fetchurl { - url = "https://registry.npmjs.org/typescript/-/typescript-4.5.4.tgz"; - sha512 = "VgYs2A2QIRuGphtzFV7aQJduJ2gyfTljngLzjpfW9FoYZF6xuw1W0vW9ghCKLfcWrCFxK81CSGRAvS1pn4fIUg=="; + url = "https://registry.npmjs.org/typescript/-/typescript-4.5.5.tgz"; + sha512 = "TCTIul70LyWe6IJWT8QSYeA54WQe8EjQFU4wY52Fasj5UKx88LNYKCgBEHcOMOrFF1rKGbD8v/xcNWVUq9SymA=="; }; }; - "uglify-js-3.14.5" = { + "uglify-js-3.15.0" = { name = "uglify-js"; packageName = "uglify-js"; - version = "3.14.5"; + version = "3.15.0"; src = fetchurl { - url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.14.5.tgz"; - sha512 = "qZukoSxOG0urUTvjc2ERMTcAy+BiFh3weWAkeurLwjrCba73poHmG3E36XEjd/JGukMzwTL7uCxZiAexj8ppvQ=="; + url = "https://registry.npmjs.org/uglify-js/-/uglify-js-3.15.0.tgz"; + sha512 = "x+xdeDWq7FiORDvyIJ0q/waWd4PhjBNOm5dQUOq2AKC0IEjxOS66Ha9tctiVDGcRQuh69K7fgU5oRuTK4cysSg=="; }; }; "unicode-canonical-property-names-ecmascript-2.0.0" = { @@ -6259,13 +5989,13 @@ let sha512 = "l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA=="; }; }; - "v8-to-istanbul-8.1.0" = { + "v8-to-istanbul-8.1.1" = { name = "v8-to-istanbul"; packageName = "v8-to-istanbul"; - version = "8.1.0"; + version = "8.1.1"; src = fetchurl { - url = "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-8.1.0.tgz"; - sha512 = "/PRhfd8aTNp9Ggr62HPzXg2XasNFGy5PBt0Rp04du7/8GNNSgxFL6WBTkgMKSL9bFjH+8kKEG3f37FmxiTqUUA=="; + url = "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-8.1.1.tgz"; + sha512 = "FGtKtv3xIpR6BYhvgH8MI/y78oT7d8Au3ww4QIxymrCtZEh5b8gCw2siywE+puhEmuWKDtmfrvF5UlB298ut3w=="; }; }; "vscode-oniguruma-1.6.1" = { @@ -6313,15 +6043,6 @@ let sha512 = "ts/8E8l5b7kY0vlWLewOkDXMmPdLcVV4GmOQLyxuSswIJsweeFZtAsMF7k1Nszz+TYBQrlYRmzOnr398y1JemQ=="; }; }; - "weak-map-1.0.5" = { - name = "weak-map"; - packageName = "weak-map"; - version = "1.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/weak-map/-/weak-map-1.0.5.tgz"; - sha1 = "79691584d98607f5070bd3b70a40e6bb22e401eb"; - }; - }; "webidl-conversions-5.0.0" = { name = "webidl-conversions"; packageName = "webidl-conversions"; @@ -6385,13 +6106,13 @@ let sha512 = "eDMORYaPNZ4sQIuuYPDHdQvf4gyCF9rEEV/yPxGfwPkRodwEgiMUUXTx/dex+Me0wxx53S+NgUHaP7y3MGlDmg=="; }; }; - "winston-3.3.3" = { + "winston-3.5.0" = { name = "winston"; packageName = "winston"; - version = "3.3.3"; + version = "3.5.0"; src = fetchurl { - url = "https://registry.npmjs.org/winston/-/winston-3.3.3.tgz"; - sha512 = "oEXTISQnC8VlSAKf1KYSSd7J6IWuRPQqDdo8eoRNaYKLvwSb5+79Z3Yi1lrl6KDpU6/VWaxpakDAtb1oQ4n9aw=="; + url = "https://registry.npmjs.org/winston/-/winston-3.5.0.tgz"; + sha512 = "OQMbmLsIdVHvm2hSurrYZs+iZNIImXneYJ6pX7LseSMEq20HdTETXiNnNX3FDwN4LB/xDRZLF6JYOY+AI112Kw=="; }; }; "winston-syslog-2.4.4" = { @@ -6403,13 +6124,13 @@ let sha512 = "zDjoKO932Yszvzq8WtbIFMXHwAT2MOxpWC9s6djw2tvjdRESWw3au6l+0xDMatMhNWVoVaVNkDXF+r/eyoBUVA=="; }; }; - "winston-transport-4.4.1" = { + "winston-transport-4.4.2" = { name = "winston-transport"; packageName = "winston-transport"; - version = "4.4.1"; + version = "4.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/winston-transport/-/winston-transport-4.4.1.tgz"; - sha512 = "ciZRlU4CSjHqHe8RQG1iPxKMRVwv6ZJ0RC7DxStKWd0KjpAhPDy5gVYSCpIUq+5CUsP+IyNOTZy1X0tO2QZqjg=="; + url = "https://registry.npmjs.org/winston-transport/-/winston-transport-4.4.2.tgz"; + sha512 = "9jmhltAr5ygt5usgUTQbEiw/7RYXpyUbEAFRCSicIacpUzPkrnQsQZSPGEI12aLK9Jth4zNcYJx3Cvznwrl8pw=="; }; }; "word-wrap-1.2.3" = { @@ -6466,13 +6187,13 @@ let sha512 = "6GLgCqo2cy2A2rjCNFlxQS6ZljG/coZfZXclldI8FB/1G3CCI36Zd8xy2HrFVACi8tfk5XrgLQEk+P0Tnz9UcA=="; }; }; - "ws-8.4.0" = { + "ws-8.4.2" = { name = "ws"; packageName = "ws"; - version = "8.4.0"; + version = "8.4.2"; src = fetchurl { - url = "https://registry.npmjs.org/ws/-/ws-8.4.0.tgz"; - sha512 = "IHVsKe2pjajSUIl4KYMQOdlyliovpEPquKkqbwswulszzI7r0SfQrxnXdWAEqOlDCLrVSJzo+O1hAwdog2sKSQ=="; + url = "https://registry.npmjs.org/ws/-/ws-8.4.2.tgz"; + sha512 = "Kbk4Nxyq7/ZWqr/tarI9yIt/+iNNFOjBXEWgTb4ydaNHBNGgvf2QHbS9fdfsndfjFlFwEd4Al+mw83YkaD10ZA=="; }; }; "xml-name-validator-3.0.0" = { @@ -6538,43 +6259,43 @@ let sha512 = "y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w=="; }; }; - "zigbee-herdsman-0.13.188" = { + "zigbee-herdsman-0.14.10" = { name = "zigbee-herdsman"; packageName = "zigbee-herdsman"; - version = "0.13.188"; + version = "0.14.10"; src = fetchurl { - url = "https://registry.npmjs.org/zigbee-herdsman/-/zigbee-herdsman-0.13.188.tgz"; - sha512 = "eaI91kwl46TgumM7v9WtpEIfwblHlLjpLOM51DqWlnIqq3ehTwu2wTMQcTsxqxcNKzx4CpCmkBAbdaKc1ZlRVQ=="; + url = "https://registry.npmjs.org/zigbee-herdsman/-/zigbee-herdsman-0.14.10.tgz"; + sha512 = "exPtxyJij2fByFhrJpVro9DeL11D1OpjfvEPkEMaPF12C3/fMDdEjZZX66a2mU07KvhlTqynQ+wZFwsighrimg=="; }; }; - "zigbee-herdsman-converters-14.0.366" = { + "zigbee-herdsman-converters-14.0.406" = { name = "zigbee-herdsman-converters"; packageName = "zigbee-herdsman-converters"; - version = "14.0.366"; + version = "14.0.406"; src = fetchurl { - url = "https://registry.npmjs.org/zigbee-herdsman-converters/-/zigbee-herdsman-converters-14.0.366.tgz"; - sha512 = "GGxWDhU1aBYwWJaM9SkX9nVVTORc5wumy9D9Z5TDJBSKkVrobAFYBDXB9GTvk+ZMrqVXgIdKgwalgoJjQg5qag=="; + url = "https://registry.npmjs.org/zigbee-herdsman-converters/-/zigbee-herdsman-converters-14.0.406.tgz"; + sha512 = "vc5xBAI4rfv4jWBQi0Gj4gFK4LftS9J/T/mytgfh73e4N+U3rmNaiA+3syovydsDB1G0PLphIWy5CLrMKLM6UA=="; }; }; - "zigbee2mqtt-frontend-0.6.67" = { + "zigbee2mqtt-frontend-0.6.71" = { name = "zigbee2mqtt-frontend"; packageName = "zigbee2mqtt-frontend"; - version = "0.6.67"; + version = "0.6.71"; src = fetchurl { - url = "https://registry.npmjs.org/zigbee2mqtt-frontend/-/zigbee2mqtt-frontend-0.6.67.tgz"; - sha512 = "yILqMfe5UsT4Z/AccR/N8jQ40qs9u/3ObVJPtc7iLhYSKIPAl9dPrK0k5vsI7i8oVCVC2h1dqOpKfnXarmmc/Q=="; + url = "https://registry.npmjs.org/zigbee2mqtt-frontend/-/zigbee2mqtt-frontend-0.6.71.tgz"; + sha512 = "+7cbMrbxhR5sPY7/trBoY6vzjFfNL4zlgfoOvE5pDmg4t5ZcJpf5VoCnK7c9ALEMQnBCPxTFfXjkivarQktrpA=="; }; }; }; args = { name = "zigbee2mqtt"; packageName = "zigbee2mqtt"; - version = "1.22.2"; + version = "1.23.0"; src = ./.; dependencies = [ - sources."@babel/code-frame-7.16.0" - sources."@babel/compat-data-7.16.4" - (sources."@babel/core-7.16.5" // { + sources."@babel/code-frame-7.16.7" + sources."@babel/compat-data-7.16.8" + (sources."@babel/core-7.16.12" // { dependencies = [ sources."debug-4.3.3" sources."ms-2.1.2" @@ -6582,71 +6303,71 @@ let sources."source-map-0.5.7" ]; }) - (sources."@babel/generator-7.16.5" // { + (sources."@babel/generator-7.16.8" // { dependencies = [ sources."source-map-0.5.7" ]; }) - sources."@babel/helper-annotate-as-pure-7.16.0" - sources."@babel/helper-builder-binary-assignment-operator-visitor-7.16.5" - (sources."@babel/helper-compilation-targets-7.16.3" // { + 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.16.7" // { dependencies = [ sources."semver-6.3.0" ]; }) - sources."@babel/helper-create-class-features-plugin-7.16.5" - sources."@babel/helper-create-regexp-features-plugin-7.16.0" - (sources."@babel/helper-define-polyfill-provider-0.3.0" // { + sources."@babel/helper-create-class-features-plugin-7.16.10" + sources."@babel/helper-create-regexp-features-plugin-7.16.7" + (sources."@babel/helper-define-polyfill-provider-0.3.1" // { dependencies = [ sources."debug-4.3.3" sources."ms-2.1.2" sources."semver-6.3.0" ]; }) - sources."@babel/helper-environment-visitor-7.16.5" - sources."@babel/helper-explode-assignable-expression-7.16.0" - sources."@babel/helper-function-name-7.16.0" - sources."@babel/helper-get-function-arity-7.16.0" - sources."@babel/helper-hoist-variables-7.16.0" - sources."@babel/helper-member-expression-to-functions-7.16.5" - sources."@babel/helper-module-imports-7.16.0" - sources."@babel/helper-module-transforms-7.16.5" - sources."@babel/helper-optimise-call-expression-7.16.0" - sources."@babel/helper-plugin-utils-7.16.5" - sources."@babel/helper-remap-async-to-generator-7.16.5" - sources."@babel/helper-replace-supers-7.16.5" - sources."@babel/helper-simple-access-7.16.0" + sources."@babel/helper-environment-visitor-7.16.7" + sources."@babel/helper-explode-assignable-expression-7.16.7" + sources."@babel/helper-function-name-7.16.7" + sources."@babel/helper-get-function-arity-7.16.7" + sources."@babel/helper-hoist-variables-7.16.7" + sources."@babel/helper-member-expression-to-functions-7.16.7" + sources."@babel/helper-module-imports-7.16.7" + sources."@babel/helper-module-transforms-7.16.7" + sources."@babel/helper-optimise-call-expression-7.16.7" + sources."@babel/helper-plugin-utils-7.16.7" + sources."@babel/helper-remap-async-to-generator-7.16.8" + sources."@babel/helper-replace-supers-7.16.7" + sources."@babel/helper-simple-access-7.16.7" sources."@babel/helper-skip-transparent-expression-wrappers-7.16.0" - sources."@babel/helper-split-export-declaration-7.16.0" - sources."@babel/helper-validator-identifier-7.15.7" - sources."@babel/helper-validator-option-7.14.5" - sources."@babel/helper-wrap-function-7.16.5" - sources."@babel/helpers-7.16.5" - sources."@babel/highlight-7.16.0" - sources."@babel/parser-7.16.6" - sources."@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.16.2" - sources."@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.16.0" - sources."@babel/plugin-proposal-async-generator-functions-7.16.5" - sources."@babel/plugin-proposal-class-properties-7.16.5" - sources."@babel/plugin-proposal-class-static-block-7.16.5" - sources."@babel/plugin-proposal-decorators-7.16.5" - sources."@babel/plugin-proposal-dynamic-import-7.16.5" - sources."@babel/plugin-proposal-export-namespace-from-7.16.5" - sources."@babel/plugin-proposal-json-strings-7.16.5" - sources."@babel/plugin-proposal-logical-assignment-operators-7.16.5" - sources."@babel/plugin-proposal-nullish-coalescing-operator-7.16.5" - sources."@babel/plugin-proposal-numeric-separator-7.16.5" - sources."@babel/plugin-proposal-object-rest-spread-7.16.5" - sources."@babel/plugin-proposal-optional-catch-binding-7.16.5" - sources."@babel/plugin-proposal-optional-chaining-7.16.5" - sources."@babel/plugin-proposal-private-methods-7.16.5" - sources."@babel/plugin-proposal-private-property-in-object-7.16.5" - sources."@babel/plugin-proposal-unicode-property-regex-7.16.5" + 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.16.7" + sources."@babel/highlight-7.16.10" + sources."@babel/parser-7.16.12" + sources."@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.16.7" + sources."@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.16.7" + sources."@babel/plugin-proposal-async-generator-functions-7.16.8" + sources."@babel/plugin-proposal-class-properties-7.16.7" + sources."@babel/plugin-proposal-class-static-block-7.16.7" + sources."@babel/plugin-proposal-decorators-7.16.7" + sources."@babel/plugin-proposal-dynamic-import-7.16.7" + sources."@babel/plugin-proposal-export-namespace-from-7.16.7" + sources."@babel/plugin-proposal-json-strings-7.16.7" + sources."@babel/plugin-proposal-logical-assignment-operators-7.16.7" + sources."@babel/plugin-proposal-nullish-coalescing-operator-7.16.7" + sources."@babel/plugin-proposal-numeric-separator-7.16.7" + sources."@babel/plugin-proposal-object-rest-spread-7.16.7" + sources."@babel/plugin-proposal-optional-catch-binding-7.16.7" + sources."@babel/plugin-proposal-optional-chaining-7.16.7" + sources."@babel/plugin-proposal-private-methods-7.16.11" + sources."@babel/plugin-proposal-private-property-in-object-7.16.7" + sources."@babel/plugin-proposal-unicode-property-regex-7.16.7" sources."@babel/plugin-syntax-async-generators-7.8.4" sources."@babel/plugin-syntax-bigint-7.8.3" sources."@babel/plugin-syntax-class-properties-7.12.13" sources."@babel/plugin-syntax-class-static-block-7.14.5" - sources."@babel/plugin-syntax-decorators-7.16.5" + sources."@babel/plugin-syntax-decorators-7.16.7" sources."@babel/plugin-syntax-dynamic-import-7.8.3" sources."@babel/plugin-syntax-export-namespace-from-7.8.3" sources."@babel/plugin-syntax-import-meta-7.10.4" @@ -6659,56 +6380,56 @@ let sources."@babel/plugin-syntax-optional-chaining-7.8.3" sources."@babel/plugin-syntax-private-property-in-object-7.14.5" sources."@babel/plugin-syntax-top-level-await-7.14.5" - sources."@babel/plugin-syntax-typescript-7.16.5" - sources."@babel/plugin-transform-arrow-functions-7.16.5" - sources."@babel/plugin-transform-async-to-generator-7.16.5" - sources."@babel/plugin-transform-block-scoped-functions-7.16.5" - sources."@babel/plugin-transform-block-scoping-7.16.5" - sources."@babel/plugin-transform-classes-7.16.5" - sources."@babel/plugin-transform-computed-properties-7.16.5" - sources."@babel/plugin-transform-destructuring-7.16.5" - sources."@babel/plugin-transform-dotall-regex-7.16.5" - sources."@babel/plugin-transform-duplicate-keys-7.16.5" - sources."@babel/plugin-transform-exponentiation-operator-7.16.5" - sources."@babel/plugin-transform-for-of-7.16.5" - sources."@babel/plugin-transform-function-name-7.16.5" - sources."@babel/plugin-transform-literals-7.16.5" - sources."@babel/plugin-transform-member-expression-literals-7.16.5" - sources."@babel/plugin-transform-modules-amd-7.16.5" - sources."@babel/plugin-transform-modules-commonjs-7.16.5" - sources."@babel/plugin-transform-modules-systemjs-7.16.5" - sources."@babel/plugin-transform-modules-umd-7.16.5" - sources."@babel/plugin-transform-named-capturing-groups-regex-7.16.5" - sources."@babel/plugin-transform-new-target-7.16.5" - sources."@babel/plugin-transform-object-super-7.16.5" - sources."@babel/plugin-transform-parameters-7.16.5" - sources."@babel/plugin-transform-property-literals-7.16.5" - sources."@babel/plugin-transform-regenerator-7.16.5" - sources."@babel/plugin-transform-reserved-words-7.16.5" - sources."@babel/plugin-transform-shorthand-properties-7.16.5" - sources."@babel/plugin-transform-spread-7.16.5" - sources."@babel/plugin-transform-sticky-regex-7.16.5" - sources."@babel/plugin-transform-template-literals-7.16.5" - sources."@babel/plugin-transform-typeof-symbol-7.16.5" - sources."@babel/plugin-transform-typescript-7.16.1" - sources."@babel/plugin-transform-unicode-escapes-7.16.5" - sources."@babel/plugin-transform-unicode-regex-7.16.5" - (sources."@babel/preset-env-7.16.5" // { + sources."@babel/plugin-syntax-typescript-7.16.7" + sources."@babel/plugin-transform-arrow-functions-7.16.7" + sources."@babel/plugin-transform-async-to-generator-7.16.8" + sources."@babel/plugin-transform-block-scoped-functions-7.16.7" + sources."@babel/plugin-transform-block-scoping-7.16.7" + sources."@babel/plugin-transform-classes-7.16.7" + sources."@babel/plugin-transform-computed-properties-7.16.7" + sources."@babel/plugin-transform-destructuring-7.16.7" + sources."@babel/plugin-transform-dotall-regex-7.16.7" + sources."@babel/plugin-transform-duplicate-keys-7.16.7" + sources."@babel/plugin-transform-exponentiation-operator-7.16.7" + sources."@babel/plugin-transform-for-of-7.16.7" + sources."@babel/plugin-transform-function-name-7.16.7" + sources."@babel/plugin-transform-literals-7.16.7" + sources."@babel/plugin-transform-member-expression-literals-7.16.7" + sources."@babel/plugin-transform-modules-amd-7.16.7" + sources."@babel/plugin-transform-modules-commonjs-7.16.8" + sources."@babel/plugin-transform-modules-systemjs-7.16.7" + sources."@babel/plugin-transform-modules-umd-7.16.7" + sources."@babel/plugin-transform-named-capturing-groups-regex-7.16.8" + sources."@babel/plugin-transform-new-target-7.16.7" + sources."@babel/plugin-transform-object-super-7.16.7" + sources."@babel/plugin-transform-parameters-7.16.7" + sources."@babel/plugin-transform-property-literals-7.16.7" + sources."@babel/plugin-transform-regenerator-7.16.7" + sources."@babel/plugin-transform-reserved-words-7.16.7" + sources."@babel/plugin-transform-shorthand-properties-7.16.7" + sources."@babel/plugin-transform-spread-7.16.7" + sources."@babel/plugin-transform-sticky-regex-7.16.7" + sources."@babel/plugin-transform-template-literals-7.16.7" + sources."@babel/plugin-transform-typeof-symbol-7.16.7" + sources."@babel/plugin-transform-typescript-7.16.8" + sources."@babel/plugin-transform-unicode-escapes-7.16.7" + sources."@babel/plugin-transform-unicode-regex-7.16.7" + (sources."@babel/preset-env-7.16.11" // { dependencies = [ sources."semver-6.3.0" ]; }) sources."@babel/preset-modules-0.1.5" - sources."@babel/preset-typescript-7.16.5" - sources."@babel/runtime-7.16.5" - sources."@babel/template-7.16.0" - (sources."@babel/traverse-7.16.5" // { + sources."@babel/preset-typescript-7.16.7" + sources."@babel/runtime-7.16.7" + sources."@babel/template-7.16.7" + (sources."@babel/traverse-7.16.10" // { dependencies = [ sources."debug-4.3.3" sources."ms-2.1.2" ]; }) - sources."@babel/types-7.16.0" + sources."@babel/types-7.16.8" sources."@bcoe/v8-coverage-0.2.3" sources."@dabh/diagnostics-2.0.2" (sources."@eslint/eslintrc-1.0.5" // { @@ -6721,7 +6442,7 @@ let sources."ms-2.1.2" ]; }) - (sources."@humanwhocodes/config-array-0.9.2" // { + (sources."@humanwhocodes/config-array-0.9.3" // { dependencies = [ sources."debug-4.3.3" sources."ms-2.1.2" @@ -6735,7 +6456,7 @@ let ]; }) sources."@istanbuljs/schema-0.1.3" - (sources."@jest/console-27.4.2" // { + (sources."@jest/console-27.4.6" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.2" @@ -6745,7 +6466,7 @@ let sources."supports-color-7.2.0" ]; }) - (sources."@jest/core-27.4.5" // { + (sources."@jest/core-27.4.7" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.2" @@ -6755,25 +6476,23 @@ let sources."supports-color-7.2.0" ]; }) - sources."@jest/environment-27.4.4" - sources."@jest/fake-timers-27.4.2" - sources."@jest/globals-27.4.4" - (sources."@jest/reporters-27.4.5" // { + sources."@jest/environment-27.4.6" + sources."@jest/fake-timers-27.4.6" + sources."@jest/globals-27.4.6" + (sources."@jest/reporters-27.4.6" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.2" sources."color-convert-2.0.1" sources."color-name-1.1.4" sources."has-flag-4.0.0" - sources."istanbul-lib-instrument-4.0.3" - sources."semver-6.3.0" sources."supports-color-7.2.0" ]; }) sources."@jest/source-map-27.4.0" - sources."@jest/test-result-27.4.2" - sources."@jest/test-sequencer-27.4.5" - (sources."@jest/transform-27.4.5" // { + sources."@jest/test-result-27.4.6" + sources."@jest/test-sequencer-27.4.6" + (sources."@jest/transform-27.4.6" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.2" @@ -6799,7 +6518,7 @@ let sources."@sinonjs/commons-1.8.3" sources."@sinonjs/fake-timers-8.1.0" sources."@tootallnate/once-1.1.2" - sources."@types/babel__core-7.1.17" + sources."@types/babel__core-7.1.18" sources."@types/babel__generator-7.6.4" sources."@types/babel__template-7.4.1" sources."@types/babel__traverse-7.14.2" @@ -6811,42 +6530,48 @@ let sources."@types/istanbul-lib-coverage-2.0.4" sources."@types/istanbul-lib-report-3.0.0" sources."@types/istanbul-reports-3.0.1" - sources."@types/jest-27.0.3" + sources."@types/jest-27.4.0" sources."@types/js-yaml-4.0.5" sources."@types/json-schema-7.0.9" sources."@types/minimatch-3.0.5" - sources."@types/node-17.0.4" + sources."@types/node-17.0.13" sources."@types/object-assign-deep-0.4.0" - sources."@types/prettier-2.4.2" + sources."@types/prettier-2.4.3" sources."@types/rimraf-3.0.2" sources."@types/stack-utils-2.0.1" sources."@types/ws-8.2.2" sources."@types/yargs-16.0.4" sources."@types/yargs-parser-20.2.1" - (sources."@typescript-eslint/eslint-plugin-5.8.0" // { + (sources."@typescript-eslint/eslint-plugin-5.10.1" // { dependencies = [ sources."debug-4.3.3" sources."ms-2.1.2" ]; }) - sources."@typescript-eslint/experimental-utils-5.8.0" - (sources."@typescript-eslint/parser-5.8.0" // { + (sources."@typescript-eslint/parser-5.10.1" // { dependencies = [ sources."debug-4.3.3" sources."ms-2.1.2" ]; }) - sources."@typescript-eslint/scope-manager-5.8.0" - sources."@typescript-eslint/types-5.8.0" - (sources."@typescript-eslint/typescript-estree-5.8.0" // { + sources."@typescript-eslint/scope-manager-5.10.1" + (sources."@typescript-eslint/type-utils-5.10.1" // { dependencies = [ sources."debug-4.3.3" sources."ms-2.1.2" ]; }) - sources."@typescript-eslint/visitor-keys-5.8.0" + sources."@typescript-eslint/types-5.10.1" + (sources."@typescript-eslint/typescript-estree-5.10.1" // { + dependencies = [ + sources."debug-4.3.3" + sources."ms-2.1.2" + ]; + }) + sources."@typescript-eslint/utils-5.10.1" + sources."@typescript-eslint/visitor-keys-5.10.1" sources."abab-2.0.5" - sources."acorn-8.6.0" + sources."acorn-8.7.0" (sources."acorn-globals-6.0.0" // { dependencies = [ sources."acorn-7.4.1" @@ -6860,8 +6585,7 @@ let sources."ms-2.1.2" ]; }) - sources."ajv-8.8.2" - sources."ansi-colors-4.1.1" + sources."ajv-8.9.0" (sources."ansi-escapes-4.3.2" // { dependencies = [ sources."type-fest-0.21.3" @@ -6872,9 +6596,9 @@ let sources."anymatch-3.1.2" sources."argparse-2.0.1" sources."array-union-2.1.0" - sources."async-3.2.2" + sources."async-3.2.3" sources."asynckit-0.4.0" - (sources."babel-jest-27.4.5" // { + (sources."babel-jest-27.4.6" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.2" @@ -6887,13 +6611,13 @@ let sources."babel-plugin-dynamic-import-node-2.3.3" sources."babel-plugin-istanbul-6.1.1" sources."babel-plugin-jest-hoist-27.4.0" - (sources."babel-plugin-polyfill-corejs2-0.3.0" // { + (sources."babel-plugin-polyfill-corejs2-0.3.1" // { dependencies = [ sources."semver-6.3.0" ]; }) - sources."babel-plugin-polyfill-corejs3-0.4.0" - sources."babel-plugin-polyfill-regenerator-0.3.0" + sources."babel-plugin-polyfill-corejs3-0.5.1" + sources."babel-plugin-polyfill-regenerator-0.3.1" sources."babel-preset-current-node-syntax-1.0.1" sources."babel-preset-jest-27.4.0" sources."balanced-match-1.0.2" @@ -6911,7 +6635,7 @@ let sources."call-bind-1.0.2" sources."callsites-3.1.0" sources."camelcase-5.3.1" - sources."caniuse-lite-1.0.30001292" + sources."caniuse-lite-1.0.30001304" sources."chalk-2.4.2" sources."char-regex-1.0.2" sources."ci-info-3.3.0" @@ -6919,7 +6643,6 @@ let sources."cliui-7.0.4" sources."co-4.6.0" sources."collect-v8-coverage-1.0.1" - sources."collections-5.1.12" sources."color-3.2.1" sources."color-convert-1.9.3" sources."color-name-1.1.3" @@ -6936,8 +6659,8 @@ let sources."safe-buffer-5.1.2" ]; }) - sources."core-js-3.20.1" - (sources."core-js-compat-3.20.1" // { + sources."core-js-3.20.3" + (sources."core-js-compat-3.20.3" // { dependencies = [ sources."semver-7.0.0" ]; @@ -6955,7 +6678,7 @@ let sources."decimal.js-10.3.1" sources."dedent-0.7.0" sources."deep-is-0.1.4" - sources."deep-object-diff-1.1.0" + sources."deep-object-diff-1.1.7" sources."deepmerge-4.2.2" sources."define-properties-1.1.3" sources."delayed-stream-1.0.0" @@ -6972,13 +6695,12 @@ let }) sources."duplexify-4.1.2" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.4.28" + sources."electron-to-chromium-1.4.57" sources."emittery-0.8.1" sources."emoji-regex-8.0.0" sources."enabled-2.0.0" sources."encodeurl-1.0.2" sources."end-of-stream-1.4.4" - sources."enquirer-2.3.6" sources."escalade-3.1.1" sources."escape-html-1.0.3" sources."escape-string-regexp-1.0.5" @@ -6991,7 +6713,7 @@ let sources."type-check-0.3.2" ]; }) - (sources."eslint-8.5.0" // { + (sources."eslint-8.8.0" // { dependencies = [ sources."ajv-6.12.6" sources."ansi-styles-4.3.0" @@ -7005,22 +6727,21 @@ let sources."glob-parent-6.0.2" sources."globals-13.12.0" sources."has-flag-4.0.0" - sources."ignore-4.0.6" sources."json-schema-traverse-0.4.1" sources."ms-2.1.2" sources."supports-color-7.2.0" ]; }) sources."eslint-config-google-0.14.0" - sources."eslint-plugin-jest-25.3.0" + sources."eslint-plugin-jest-26.0.0" sources."eslint-scope-5.1.1" (sources."eslint-utils-3.0.0" // { dependencies = [ sources."eslint-visitor-keys-2.1.0" ]; }) - sources."eslint-visitor-keys-3.1.0" - sources."espree-9.2.0" + sources."eslint-visitor-keys-3.2.0" + sources."espree-9.3.0" sources."esprima-4.0.1" (sources."esquery-1.4.0" // { dependencies = [ @@ -7037,13 +6758,9 @@ let sources."etag-1.8.1" sources."execa-5.1.1" sources."exit-0.1.2" - (sources."expect-27.4.2" // { - dependencies = [ - sources."ansi-styles-5.2.0" - ]; - }) + sources."expect-27.4.6" sources."fast-deep-equal-3.1.3" - sources."fast-glob-3.2.7" + sources."fast-glob-3.2.11" sources."fast-json-stable-stringify-2.1.0" sources."fast-levenshtein-2.0.6" sources."fastq-1.13.0" @@ -7056,7 +6773,7 @@ let sources."find-0.3.0" sources."find-up-4.1.0" sources."flat-cache-3.0.4" - sources."flatted-3.2.4" + sources."flatted-3.2.5" sources."fn.name-1.1.0" sources."form-data-3.0.1" sources."fresh-0.5.2" @@ -7073,9 +6790,9 @@ let sources."glob-7.2.0" sources."glob-parent-5.1.2" sources."globals-11.12.0" - sources."globby-11.0.4" + sources."globby-11.1.0" sources."glossy-0.1.7" - sources."graceful-fs-4.2.8" + sources."graceful-fs-4.2.9" sources."has-1.0.3" sources."has-flag-3.0.0" sources."has-symbols-1.0.2" @@ -7105,12 +6822,12 @@ let sources."resolve-from-4.0.0" ]; }) - sources."import-local-3.0.3" + sources."import-local-3.1.0" sources."imurmurhash-0.1.4" sources."inflight-1.0.6" sources."inherits-2.0.4" sources."is-arrayish-0.3.2" - sources."is-core-module-2.8.0" + sources."is-core-module-2.8.1" sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-3.0.0" sources."is-generator-fn-2.1.0" @@ -7138,20 +6855,20 @@ let sources."ms-2.1.2" ]; }) - sources."istanbul-reports-3.1.2" - (sources."jest-27.4.5" // { + sources."istanbul-reports-3.1.3" + (sources."jest-27.4.7" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.2" sources."color-convert-2.0.1" sources."color-name-1.1.4" sources."has-flag-4.0.0" - sources."jest-cli-27.4.5" + sources."jest-cli-27.4.7" sources."supports-color-7.2.0" ]; }) sources."jest-changed-files-27.4.2" - (sources."jest-circus-27.4.5" // { + (sources."jest-circus-27.4.6" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.2" @@ -7161,7 +6878,7 @@ let sources."supports-color-7.2.0" ]; }) - (sources."jest-config-27.4.5" // { + (sources."jest-config-27.4.7" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.2" @@ -7171,7 +6888,7 @@ let sources."supports-color-7.2.0" ]; }) - (sources."jest-diff-27.4.2" // { + (sources."jest-diff-27.4.6" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.2" @@ -7182,7 +6899,7 @@ let ]; }) sources."jest-docblock-27.4.0" - (sources."jest-each-27.4.2" // { + (sources."jest-each-27.4.6" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.2" @@ -7192,11 +6909,11 @@ let sources."supports-color-7.2.0" ]; }) - sources."jest-environment-jsdom-27.4.4" - sources."jest-environment-node-27.4.4" + sources."jest-environment-jsdom-27.4.6" + sources."jest-environment-node-27.4.6" sources."jest-get-type-27.4.0" - sources."jest-haste-map-27.4.5" - (sources."jest-jasmine2-27.4.5" // { + sources."jest-haste-map-27.4.6" + (sources."jest-jasmine2-27.4.6" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.2" @@ -7206,8 +6923,8 @@ let sources."supports-color-7.2.0" ]; }) - sources."jest-leak-detector-27.4.2" - (sources."jest-matcher-utils-27.4.2" // { + sources."jest-leak-detector-27.4.6" + (sources."jest-matcher-utils-27.4.6" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.2" @@ -7217,7 +6934,7 @@ let sources."supports-color-7.2.0" ]; }) - (sources."jest-message-util-27.4.2" // { + (sources."jest-message-util-27.4.6" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.2" @@ -7227,10 +6944,10 @@ let sources."supports-color-7.2.0" ]; }) - sources."jest-mock-27.4.2" + sources."jest-mock-27.4.6" sources."jest-pnp-resolver-1.2.2" sources."jest-regex-util-27.4.0" - (sources."jest-resolve-27.4.5" // { + (sources."jest-resolve-27.4.6" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.2" @@ -7240,8 +6957,8 @@ let sources."supports-color-7.2.0" ]; }) - sources."jest-resolve-dependencies-27.4.5" - (sources."jest-runner-27.4.5" // { + sources."jest-resolve-dependencies-27.4.6" + (sources."jest-runner-27.4.6" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.2" @@ -7251,7 +6968,7 @@ let sources."supports-color-7.2.0" ]; }) - (sources."jest-runtime-27.4.5" // { + (sources."jest-runtime-27.4.6" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.2" @@ -7262,7 +6979,7 @@ let ]; }) sources."jest-serializer-27.4.0" - (sources."jest-snapshot-27.4.5" // { + (sources."jest-snapshot-27.4.6" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.2" @@ -7282,10 +6999,10 @@ let sources."supports-color-7.2.0" ]; }) - (sources."jest-validate-27.4.2" // { + (sources."jest-validate-27.4.6" // { dependencies = [ sources."ansi-styles-4.3.0" - sources."camelcase-6.2.1" + sources."camelcase-6.3.0" sources."chalk-4.1.2" sources."color-convert-2.0.1" sources."color-name-1.1.4" @@ -7294,7 +7011,7 @@ let sources."supports-color-7.2.0" ]; }) - (sources."jest-watcher-27.4.2" // { + (sources."jest-watcher-27.4.6" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.2" @@ -7304,12 +7021,13 @@ let sources."supports-color-7.2.0" ]; }) - (sources."jest-worker-27.4.5" // { + (sources."jest-worker-27.4.6" // { dependencies = [ sources."has-flag-4.0.0" sources."supports-color-8.1.1" ]; }) + sources."js-sdsl-2.1.4" sources."js-tokens-4.0.0" sources."js-yaml-4.1.0" (sources."jsdom-16.7.0" // { @@ -7329,9 +7047,10 @@ let sources."lodash-4.17.21" sources."lodash.debounce-4.0.8" sources."lodash.merge-4.6.2" - (sources."logform-2.3.0" // { + (sources."logform-2.3.2" // { dependencies = [ sources."ms-2.1.3" + sources."safe-stable-stringify-1.1.1" ]; }) sources."lru-cache-6.0.0" @@ -7352,7 +7071,7 @@ let sources."minimist-1.2.5" sources."mkdir-recursive-0.4.0" sources."moment-2.29.1" - (sources."mqtt-4.3.1" // { + (sources."mqtt-4.3.4" // { dependencies = [ sources."debug-4.3.3" sources."ms-2.1.2" @@ -7372,7 +7091,7 @@ let sources."node-releases-2.0.1" sources."normalize-path-3.0.0" sources."npm-run-path-4.0.1" - (sources."number-allocator-1.0.7" // { + (sources."number-allocator-1.0.9" // { dependencies = [ sources."debug-4.3.3" sources."ms-2.1.2" @@ -7399,17 +7118,16 @@ let sources."path-parse-1.0.7" sources."path-type-4.0.0" sources."picocolors-1.0.0" - sources."picomatch-2.3.0" - sources."pirates-4.0.4" + sources."picomatch-2.3.1" + sources."pirates-4.0.5" sources."pkg-dir-4.2.0" sources."prelude-ls-1.2.1" - (sources."pretty-format-27.4.2" // { + (sources."pretty-format-27.4.6" // { dependencies = [ sources."ansi-styles-5.2.0" ]; }) sources."process-nextick-args-2.0.1" - sources."progress-2.0.3" sources."prompts-2.4.2" sources."psl-1.8.0" sources."pump-3.0.0" @@ -7433,7 +7151,7 @@ let sources."reinterval-1.1.0" sources."require-directory-2.1.1" sources."require-from-string-2.0.2" - sources."resolve-1.20.0" + sources."resolve-1.22.0" sources."resolve-cwd-3.0.0" sources."resolve-from-5.0.0" sources."resolve.exports-1.1.0" @@ -7442,7 +7160,7 @@ let sources."rimraf-3.0.2" sources."run-parallel-1.2.0" sources."safe-buffer-5.2.1" - sources."safe-stable-stringify-1.1.1" + sources."safe-stable-stringify-2.3.1" sources."safer-buffer-2.1.2" sources."saxes-5.0.1" sources."semver-7.3.5" @@ -7485,6 +7203,7 @@ let sources."supports-color-7.2.0" ]; }) + sources."supports-preserve-symlinks-flag-1.0.0" sources."symbol-tree-3.2.4" sources."terminal-link-2.1.1" sources."test-exclude-6.0.0" @@ -7507,7 +7226,7 @@ let sources."type-fest-0.20.2" sources."typedarray-0.0.6" sources."typedarray-to-buffer-3.1.5" - sources."typescript-4.5.4" + sources."typescript-4.5.5" sources."unicode-canonical-property-names-ecmascript-2.0.0" sources."unicode-match-property-ecmascript-2.0.0" sources."unicode-match-property-value-ecmascript-2.0.0" @@ -7518,7 +7237,7 @@ let sources."uri-js-4.4.1" sources."util-deprecate-1.0.2" sources."v8-compile-cache-2.3.0" - (sources."v8-to-istanbul-8.1.0" // { + (sources."v8-to-istanbul-8.1.1" // { dependencies = [ sources."source-map-0.7.3" ]; @@ -7526,15 +7245,14 @@ let sources."w3c-hr-time-1.0.2" sources."w3c-xmlserializer-2.0.0" sources."walker-1.0.8" - sources."weak-map-1.0.5" sources."webidl-conversions-6.1.0" sources."whatwg-encoding-1.0.5" sources."whatwg-mimetype-2.3.0" sources."whatwg-url-8.7.0" sources."which-2.0.2" - sources."winston-3.3.3" + sources."winston-3.5.0" sources."winston-syslog-2.4.4" - sources."winston-transport-4.4.1" + sources."winston-transport-4.4.2" sources."word-wrap-1.2.3" (sources."wrap-ansi-7.0.0" // { dependencies = [ @@ -7545,7 +7263,7 @@ let }) sources."wrappy-1.0.2" sources."write-file-atomic-3.0.3" - sources."ws-8.4.0" + sources."ws-8.4.2" sources."xml-name-validator-3.0.0" sources."xmlchars-2.2.0" sources."xtend-4.0.2" @@ -7553,69 +7271,69 @@ let sources."yallist-4.0.0" sources."yargs-16.2.0" sources."yargs-parser-20.2.9" - (sources."zigbee-herdsman-0.13.188" // { + (sources."zigbee-herdsman-0.14.10" // { dependencies = [ - sources."@babel/cli-7.16.0" - sources."@babel/code-frame-7.16.0" - sources."@babel/compat-data-7.16.4" - (sources."@babel/core-7.16.5" // { + sources."@babel/cli-7.16.8" + sources."@babel/code-frame-7.16.7" + sources."@babel/compat-data-7.16.8" + (sources."@babel/core-7.16.12" // { dependencies = [ sources."semver-6.3.0" ]; }) - sources."@babel/generator-7.16.5" - sources."@babel/helper-annotate-as-pure-7.16.0" - sources."@babel/helper-builder-binary-assignment-operator-visitor-7.16.5" - (sources."@babel/helper-compilation-targets-7.16.3" // { + sources."@babel/generator-7.16.8" + 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.16.7" // { dependencies = [ sources."semver-6.3.0" ]; }) - sources."@babel/helper-create-class-features-plugin-7.16.5" - sources."@babel/helper-create-regexp-features-plugin-7.16.0" - (sources."@babel/helper-define-polyfill-provider-0.3.0" // { + sources."@babel/helper-create-class-features-plugin-7.16.10" + sources."@babel/helper-create-regexp-features-plugin-7.16.7" + (sources."@babel/helper-define-polyfill-provider-0.3.1" // { dependencies = [ sources."semver-6.3.0" ]; }) - sources."@babel/helper-environment-visitor-7.16.5" - sources."@babel/helper-explode-assignable-expression-7.16.0" - sources."@babel/helper-function-name-7.16.0" - sources."@babel/helper-get-function-arity-7.16.0" - sources."@babel/helper-hoist-variables-7.16.0" - sources."@babel/helper-member-expression-to-functions-7.16.5" - sources."@babel/helper-module-imports-7.16.0" - sources."@babel/helper-module-transforms-7.16.5" - sources."@babel/helper-optimise-call-expression-7.16.0" - sources."@babel/helper-plugin-utils-7.16.5" - sources."@babel/helper-remap-async-to-generator-7.16.5" - sources."@babel/helper-replace-supers-7.16.5" - sources."@babel/helper-simple-access-7.16.0" + sources."@babel/helper-environment-visitor-7.16.7" + sources."@babel/helper-explode-assignable-expression-7.16.7" + sources."@babel/helper-function-name-7.16.7" + sources."@babel/helper-get-function-arity-7.16.7" + sources."@babel/helper-hoist-variables-7.16.7" + sources."@babel/helper-member-expression-to-functions-7.16.7" + sources."@babel/helper-module-imports-7.16.7" + sources."@babel/helper-module-transforms-7.16.7" + sources."@babel/helper-optimise-call-expression-7.16.7" + sources."@babel/helper-plugin-utils-7.16.7" + sources."@babel/helper-remap-async-to-generator-7.16.8" + sources."@babel/helper-replace-supers-7.16.7" + sources."@babel/helper-simple-access-7.16.7" sources."@babel/helper-skip-transparent-expression-wrappers-7.16.0" - sources."@babel/helper-split-export-declaration-7.16.0" - sources."@babel/helper-validator-identifier-7.15.7" - sources."@babel/helper-validator-option-7.14.5" - sources."@babel/helper-wrap-function-7.16.5" - sources."@babel/helpers-7.16.5" - sources."@babel/highlight-7.16.0" - sources."@babel/parser-7.16.6" - sources."@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.16.2" - sources."@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.16.0" - sources."@babel/plugin-proposal-async-generator-functions-7.16.5" - sources."@babel/plugin-proposal-class-properties-7.16.5" - sources."@babel/plugin-proposal-class-static-block-7.16.5" - sources."@babel/plugin-proposal-dynamic-import-7.16.5" - sources."@babel/plugin-proposal-export-namespace-from-7.16.5" - sources."@babel/plugin-proposal-json-strings-7.16.5" - sources."@babel/plugin-proposal-logical-assignment-operators-7.16.5" - sources."@babel/plugin-proposal-nullish-coalescing-operator-7.16.5" - sources."@babel/plugin-proposal-numeric-separator-7.16.5" - sources."@babel/plugin-proposal-object-rest-spread-7.16.5" - sources."@babel/plugin-proposal-optional-catch-binding-7.16.5" - sources."@babel/plugin-proposal-optional-chaining-7.16.5" - sources."@babel/plugin-proposal-private-methods-7.16.5" - sources."@babel/plugin-proposal-private-property-in-object-7.16.5" - sources."@babel/plugin-proposal-unicode-property-regex-7.16.5" + 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.16.7" + sources."@babel/highlight-7.16.10" + sources."@babel/parser-7.16.12" + sources."@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.16.7" + sources."@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.16.7" + sources."@babel/plugin-proposal-async-generator-functions-7.16.8" + sources."@babel/plugin-proposal-class-properties-7.16.7" + sources."@babel/plugin-proposal-class-static-block-7.16.7" + sources."@babel/plugin-proposal-dynamic-import-7.16.7" + sources."@babel/plugin-proposal-export-namespace-from-7.16.7" + sources."@babel/plugin-proposal-json-strings-7.16.7" + sources."@babel/plugin-proposal-logical-assignment-operators-7.16.7" + sources."@babel/plugin-proposal-nullish-coalescing-operator-7.16.7" + sources."@babel/plugin-proposal-numeric-separator-7.16.7" + sources."@babel/plugin-proposal-object-rest-spread-7.16.7" + sources."@babel/plugin-proposal-optional-catch-binding-7.16.7" + sources."@babel/plugin-proposal-optional-chaining-7.16.7" + sources."@babel/plugin-proposal-private-methods-7.16.11" + sources."@babel/plugin-proposal-private-property-in-object-7.16.7" + sources."@babel/plugin-proposal-unicode-property-regex-7.16.7" sources."@babel/plugin-syntax-async-generators-7.8.4" sources."@babel/plugin-syntax-bigint-7.8.3" sources."@babel/plugin-syntax-class-properties-7.12.13" @@ -7632,51 +7350,51 @@ let sources."@babel/plugin-syntax-optional-chaining-7.8.3" sources."@babel/plugin-syntax-private-property-in-object-7.14.5" sources."@babel/plugin-syntax-top-level-await-7.14.5" - sources."@babel/plugin-syntax-typescript-7.16.5" - sources."@babel/plugin-transform-arrow-functions-7.16.5" - sources."@babel/plugin-transform-async-to-generator-7.16.5" - sources."@babel/plugin-transform-block-scoped-functions-7.16.5" - sources."@babel/plugin-transform-block-scoping-7.16.5" - sources."@babel/plugin-transform-classes-7.16.5" - sources."@babel/plugin-transform-computed-properties-7.16.5" - sources."@babel/plugin-transform-destructuring-7.16.5" - sources."@babel/plugin-transform-dotall-regex-7.16.5" - sources."@babel/plugin-transform-duplicate-keys-7.16.5" - sources."@babel/plugin-transform-exponentiation-operator-7.16.5" - sources."@babel/plugin-transform-for-of-7.16.5" - sources."@babel/plugin-transform-function-name-7.16.5" - sources."@babel/plugin-transform-literals-7.16.5" - sources."@babel/plugin-transform-member-expression-literals-7.16.5" - sources."@babel/plugin-transform-modules-amd-7.16.5" - sources."@babel/plugin-transform-modules-commonjs-7.16.5" - sources."@babel/plugin-transform-modules-systemjs-7.16.5" - sources."@babel/plugin-transform-modules-umd-7.16.5" - sources."@babel/plugin-transform-named-capturing-groups-regex-7.16.5" - sources."@babel/plugin-transform-new-target-7.16.5" - sources."@babel/plugin-transform-object-super-7.16.5" - sources."@babel/plugin-transform-parameters-7.16.5" - sources."@babel/plugin-transform-property-literals-7.16.5" - sources."@babel/plugin-transform-regenerator-7.16.5" - sources."@babel/plugin-transform-reserved-words-7.16.5" - sources."@babel/plugin-transform-shorthand-properties-7.16.5" - sources."@babel/plugin-transform-spread-7.16.5" - sources."@babel/plugin-transform-sticky-regex-7.16.5" - sources."@babel/plugin-transform-template-literals-7.16.5" - sources."@babel/plugin-transform-typeof-symbol-7.16.5" - sources."@babel/plugin-transform-typescript-7.16.1" - sources."@babel/plugin-transform-unicode-escapes-7.16.5" - sources."@babel/plugin-transform-unicode-regex-7.16.5" - (sources."@babel/preset-env-7.16.5" // { + sources."@babel/plugin-syntax-typescript-7.16.7" + sources."@babel/plugin-transform-arrow-functions-7.16.7" + sources."@babel/plugin-transform-async-to-generator-7.16.8" + sources."@babel/plugin-transform-block-scoped-functions-7.16.7" + sources."@babel/plugin-transform-block-scoping-7.16.7" + sources."@babel/plugin-transform-classes-7.16.7" + sources."@babel/plugin-transform-computed-properties-7.16.7" + sources."@babel/plugin-transform-destructuring-7.16.7" + sources."@babel/plugin-transform-dotall-regex-7.16.7" + sources."@babel/plugin-transform-duplicate-keys-7.16.7" + sources."@babel/plugin-transform-exponentiation-operator-7.16.7" + sources."@babel/plugin-transform-for-of-7.16.7" + sources."@babel/plugin-transform-function-name-7.16.7" + sources."@babel/plugin-transform-literals-7.16.7" + sources."@babel/plugin-transform-member-expression-literals-7.16.7" + sources."@babel/plugin-transform-modules-amd-7.16.7" + sources."@babel/plugin-transform-modules-commonjs-7.16.8" + sources."@babel/plugin-transform-modules-systemjs-7.16.7" + sources."@babel/plugin-transform-modules-umd-7.16.7" + sources."@babel/plugin-transform-named-capturing-groups-regex-7.16.8" + sources."@babel/plugin-transform-new-target-7.16.7" + sources."@babel/plugin-transform-object-super-7.16.7" + sources."@babel/plugin-transform-parameters-7.16.7" + sources."@babel/plugin-transform-property-literals-7.16.7" + sources."@babel/plugin-transform-regenerator-7.16.7" + sources."@babel/plugin-transform-reserved-words-7.16.7" + sources."@babel/plugin-transform-shorthand-properties-7.16.7" + sources."@babel/plugin-transform-spread-7.16.7" + sources."@babel/plugin-transform-sticky-regex-7.16.7" + sources."@babel/plugin-transform-template-literals-7.16.7" + sources."@babel/plugin-transform-typeof-symbol-7.16.7" + sources."@babel/plugin-transform-typescript-7.16.8" + sources."@babel/plugin-transform-unicode-escapes-7.16.7" + sources."@babel/plugin-transform-unicode-regex-7.16.7" + (sources."@babel/preset-env-7.16.11" // { dependencies = [ sources."semver-6.3.0" ]; }) sources."@babel/preset-modules-0.1.5" - sources."@babel/preset-typescript-7.16.5" - sources."@babel/runtime-7.16.5" - sources."@babel/template-7.16.0" - sources."@babel/traverse-7.16.5" - sources."@babel/types-7.16.0" + sources."@babel/preset-typescript-7.16.7" + sources."@babel/runtime-7.16.7" + sources."@babel/template-7.16.7" + sources."@babel/traverse-7.16.10" + sources."@babel/types-7.16.8" sources."@bcoe/v8-coverage-0.2.3" (sources."@eslint/eslintrc-1.0.5" // { dependencies = [ @@ -7687,11 +7405,11 @@ let sources."strip-json-comments-3.1.1" ]; }) - sources."@humanwhocodes/config-array-0.9.2" + sources."@humanwhocodes/config-array-0.9.3" sources."@humanwhocodes/object-schema-1.2.1" sources."@istanbuljs/load-nyc-config-1.1.0" sources."@istanbuljs/schema-0.1.3" - (sources."@jest/console-27.4.2" // { + (sources."@jest/console-27.4.6" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.2" @@ -7702,7 +7420,7 @@ let sources."supports-color-7.2.0" ]; }) - (sources."@jest/core-27.4.5" // { + (sources."@jest/core-27.4.7" // { dependencies = [ sources."ansi-regex-5.0.1" sources."ansi-styles-4.3.0" @@ -7715,18 +7433,16 @@ let sources."supports-color-7.2.0" ]; }) - sources."@jest/environment-27.4.4" - sources."@jest/fake-timers-27.4.2" - sources."@jest/globals-27.4.4" - (sources."@jest/reporters-27.4.5" // { + sources."@jest/environment-27.4.6" + sources."@jest/fake-timers-27.4.6" + sources."@jest/globals-27.4.6" + (sources."@jest/reporters-27.4.6" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.2" sources."color-convert-2.0.1" sources."color-name-1.1.4" sources."has-flag-4.0.0" - sources."istanbul-lib-instrument-4.0.3" - sources."semver-6.3.0" sources."slash-3.0.0" sources."source-map-0.6.1" sources."supports-color-7.2.0" @@ -7737,9 +7453,9 @@ let sources."source-map-0.6.1" ]; }) - sources."@jest/test-result-27.4.2" - sources."@jest/test-sequencer-27.4.5" - (sources."@jest/transform-27.4.5" // { + sources."@jest/test-result-27.4.6" + sources."@jest/test-sequencer-27.4.6" + (sources."@jest/transform-27.4.6" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.2" @@ -7779,7 +7495,7 @@ let sources."@sinonjs/commons-1.8.3" sources."@sinonjs/fake-timers-8.1.0" sources."@tootallnate/once-1.1.2" - sources."@types/babel__core-7.1.17" + sources."@types/babel__core-7.1.18" sources."@types/babel__generator-7.6.4" sources."@types/babel__template-7.4.1" sources."@types/babel__traverse-7.14.2" @@ -7789,26 +7505,27 @@ let sources."@types/istanbul-lib-coverage-2.0.4" sources."@types/istanbul-lib-report-3.0.0" sources."@types/istanbul-reports-3.0.1" - sources."@types/jest-27.0.3" + sources."@types/jest-27.4.0" sources."@types/json-schema-7.0.9" sources."@types/ms-0.7.31" sources."@types/mz-2.7.4" sources."@types/nedb-1.8.12" - sources."@types/node-17.0.4" - sources."@types/prettier-2.4.2" + sources."@types/node-17.0.13" + sources."@types/prettier-2.4.3" sources."@types/serialport-8.0.2" sources."@types/stack-utils-2.0.1" sources."@types/yargs-16.0.4" sources."@types/yargs-parser-20.2.1" - sources."@typescript-eslint/eslint-plugin-5.8.0" - sources."@typescript-eslint/experimental-utils-5.8.0" - sources."@typescript-eslint/parser-5.8.0" - sources."@typescript-eslint/scope-manager-5.8.0" - sources."@typescript-eslint/types-5.8.0" - sources."@typescript-eslint/typescript-estree-5.8.0" - sources."@typescript-eslint/visitor-keys-5.8.0" + sources."@typescript-eslint/eslint-plugin-5.10.1" + sources."@typescript-eslint/parser-5.10.1" + sources."@typescript-eslint/scope-manager-5.10.1" + sources."@typescript-eslint/type-utils-5.10.1" + sources."@typescript-eslint/types-5.10.1" + sources."@typescript-eslint/typescript-estree-5.10.1" + sources."@typescript-eslint/utils-5.10.1" + sources."@typescript-eslint/visitor-keys-5.10.1" sources."abab-2.0.5" - sources."acorn-8.6.0" + sources."acorn-8.7.0" (sources."acorn-globals-6.0.0" // { dependencies = [ sources."acorn-7.4.1" @@ -7818,7 +7535,6 @@ let sources."acorn-walk-7.2.0" sources."agent-base-6.0.2" sources."ajv-6.12.6" - sources."ansi-colors-4.1.1" (sources."ansi-escapes-4.3.2" // { dependencies = [ sources."type-fest-0.21.3" @@ -7833,7 +7549,7 @@ let sources."argparse-1.0.10" sources."array-union-2.1.0" sources."asynckit-0.4.0" - (sources."babel-jest-27.4.5" // { + (sources."babel-jest-27.4.6" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.2" @@ -7847,13 +7563,13 @@ let sources."babel-plugin-dynamic-import-node-2.3.3" sources."babel-plugin-istanbul-6.1.1" sources."babel-plugin-jest-hoist-27.4.0" - (sources."babel-plugin-polyfill-corejs2-0.3.0" // { + (sources."babel-plugin-polyfill-corejs2-0.3.1" // { dependencies = [ sources."semver-6.3.0" ]; }) - sources."babel-plugin-polyfill-corejs3-0.4.0" - sources."babel-plugin-polyfill-regenerator-0.3.0" + sources."babel-plugin-polyfill-corejs3-0.5.1" + sources."babel-plugin-polyfill-regenerator-0.3.1" sources."babel-preset-current-node-syntax-1.0.1" sources."babel-preset-jest-27.4.0" sources."balanced-match-1.0.2" @@ -7875,10 +7591,10 @@ let sources."call-bind-1.0.2" sources."callsites-3.1.0" sources."camelcase-5.3.1" - sources."caniuse-lite-1.0.30001292" + sources."caniuse-lite-1.0.30001304" sources."chalk-2.4.2" sources."char-regex-1.0.2" - sources."chokidar-3.5.2" + sources."chokidar-3.5.3" sources."chownr-1.1.4" sources."ci-info-3.3.0" sources."cjs-module-lexer-1.2.2" @@ -7900,7 +7616,7 @@ let sources."concat-map-0.0.1" sources."console-control-strings-1.1.0" sources."convert-source-map-1.8.0" - (sources."core-js-compat-3.20.1" // { + (sources."core-js-compat-3.20.3" // { dependencies = [ sources."semver-7.0.0" ]; @@ -7925,7 +7641,7 @@ let sources."define-properties-1.1.3" sources."delayed-stream-1.0.0" sources."delegates-1.0.0" - sources."detect-libc-1.0.3" + sources."detect-libc-2.0.0" sources."detect-newline-3.1.0" sources."diff-sequences-27.4.0" sources."dir-glob-3.0.1" @@ -7935,11 +7651,10 @@ let sources."webidl-conversions-5.0.0" ]; }) - sources."electron-to-chromium-1.4.28" + sources."electron-to-chromium-1.4.57" sources."emittery-0.8.1" sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" - sources."enquirer-2.3.6" sources."escalade-3.1.1" sources."escape-string-regexp-1.0.5" (sources."escodegen-2.0.0" // { @@ -7952,7 +7667,7 @@ let sources."type-check-0.3.2" ]; }) - (sources."eslint-8.5.0" // { + (sources."eslint-8.8.0" // { dependencies = [ sources."ansi-regex-5.0.1" sources."ansi-styles-4.3.0" @@ -7966,7 +7681,6 @@ let sources."glob-parent-6.0.2" sources."globals-13.12.0" sources."has-flag-4.0.0" - sources."ignore-4.0.6" sources."js-yaml-4.1.0" sources."strip-ansi-6.0.1" sources."strip-json-comments-3.1.1" @@ -7979,8 +7693,8 @@ let sources."eslint-visitor-keys-2.1.0" ]; }) - sources."eslint-visitor-keys-3.1.0" - sources."espree-9.2.0" + sources."eslint-visitor-keys-3.2.0" + sources."espree-9.3.0" sources."esprima-4.0.1" (sources."esquery-1.4.0" // { dependencies = [ @@ -7997,13 +7711,9 @@ let sources."execa-5.1.1" sources."exit-0.1.2" sources."expand-template-2.0.3" - (sources."expect-27.4.2" // { - dependencies = [ - sources."ansi-styles-5.2.0" - ]; - }) + sources."expect-27.4.6" sources."fast-deep-equal-3.1.3" - sources."fast-glob-3.2.7" + sources."fast-glob-3.2.11" sources."fast-json-stable-stringify-2.1.0" sources."fast-levenshtein-2.0.6" sources."fastq-1.13.0" @@ -8013,7 +7723,7 @@ let sources."fill-range-7.0.1" sources."find-up-4.1.0" sources."flat-cache-3.0.4" - sources."flatted-3.2.4" + sources."flatted-3.2.5" sources."form-data-3.0.1" sources."fs-constants-1.0.0" sources."fs-readdir-recursive-1.1.0" @@ -8031,12 +7741,12 @@ let sources."glob-7.2.0" sources."glob-parent-5.1.2" sources."globals-11.12.0" - (sources."globby-11.0.4" // { + (sources."globby-11.1.0" // { dependencies = [ sources."slash-3.0.0" ]; }) - sources."graceful-fs-4.2.8" + sources."graceful-fs-4.2.9" (sources."handlebars-4.7.7" // { dependencies = [ sources."source-map-0.6.1" @@ -8059,13 +7769,13 @@ let sources."resolve-from-4.0.0" ]; }) - sources."import-local-3.0.3" + sources."import-local-3.1.0" sources."imurmurhash-0.1.4" sources."inflight-1.0.6" sources."inherits-2.0.4" sources."ini-1.3.8" sources."is-binary-path-2.1.0" - sources."is-core-module-2.8.0" + sources."is-core-module-2.8.1" sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-1.0.0" sources."is-generator-fn-2.1.0" @@ -8095,20 +7805,20 @@ let sources."source-map-0.6.1" ]; }) - sources."istanbul-reports-3.1.2" - (sources."jest-27.4.5" // { + sources."istanbul-reports-3.1.3" + (sources."jest-27.4.7" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.2" sources."color-convert-2.0.1" sources."color-name-1.1.4" sources."has-flag-4.0.0" - sources."jest-cli-27.4.5" + sources."jest-cli-27.4.7" sources."supports-color-7.2.0" ]; }) sources."jest-changed-files-27.4.2" - (sources."jest-circus-27.4.5" // { + (sources."jest-circus-27.4.6" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.2" @@ -8119,7 +7829,7 @@ let sources."supports-color-7.2.0" ]; }) - (sources."jest-config-27.4.5" // { + (sources."jest-config-27.4.7" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.2" @@ -8130,7 +7840,7 @@ let sources."supports-color-7.2.0" ]; }) - (sources."jest-diff-27.4.2" // { + (sources."jest-diff-27.4.6" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.2" @@ -8141,7 +7851,7 @@ let ]; }) sources."jest-docblock-27.4.0" - (sources."jest-each-27.4.2" // { + (sources."jest-each-27.4.6" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.2" @@ -8151,11 +7861,11 @@ let sources."supports-color-7.2.0" ]; }) - sources."jest-environment-jsdom-27.4.4" - sources."jest-environment-node-27.4.4" + sources."jest-environment-jsdom-27.4.6" + sources."jest-environment-node-27.4.6" sources."jest-get-type-27.4.0" - sources."jest-haste-map-27.4.5" - (sources."jest-jasmine2-27.4.5" // { + sources."jest-haste-map-27.4.6" + (sources."jest-jasmine2-27.4.6" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.2" @@ -8165,8 +7875,8 @@ let sources."supports-color-7.2.0" ]; }) - sources."jest-leak-detector-27.4.2" - (sources."jest-matcher-utils-27.4.2" // { + sources."jest-leak-detector-27.4.6" + (sources."jest-matcher-utils-27.4.6" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.2" @@ -8176,7 +7886,7 @@ let sources."supports-color-7.2.0" ]; }) - (sources."jest-message-util-27.4.2" // { + (sources."jest-message-util-27.4.6" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.2" @@ -8187,10 +7897,10 @@ let sources."supports-color-7.2.0" ]; }) - sources."jest-mock-27.4.2" + sources."jest-mock-27.4.6" sources."jest-pnp-resolver-1.2.2" sources."jest-regex-util-27.4.0" - (sources."jest-resolve-27.4.5" // { + (sources."jest-resolve-27.4.6" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.2" @@ -8201,8 +7911,8 @@ let sources."supports-color-7.2.0" ]; }) - sources."jest-resolve-dependencies-27.4.5" - (sources."jest-runner-27.4.5" // { + sources."jest-resolve-dependencies-27.4.6" + (sources."jest-runner-27.4.6" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.2" @@ -8212,7 +7922,7 @@ let sources."supports-color-7.2.0" ]; }) - (sources."jest-runtime-27.4.5" // { + (sources."jest-runtime-27.4.6" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.2" @@ -8224,7 +7934,7 @@ let ]; }) sources."jest-serializer-27.4.0" - (sources."jest-snapshot-27.4.5" // { + (sources."jest-snapshot-27.4.6" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.2" @@ -8244,10 +7954,10 @@ let sources."supports-color-7.2.0" ]; }) - (sources."jest-validate-27.4.2" // { + (sources."jest-validate-27.4.6" // { dependencies = [ sources."ansi-styles-4.3.0" - sources."camelcase-6.2.1" + sources."camelcase-6.3.0" sources."chalk-4.1.2" sources."color-convert-2.0.1" sources."color-name-1.1.4" @@ -8255,7 +7965,7 @@ let sources."supports-color-7.2.0" ]; }) - (sources."jest-watcher-27.4.2" // { + (sources."jest-watcher-27.4.6" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.2" @@ -8265,7 +7975,7 @@ let sources."supports-color-7.2.0" ]; }) - (sources."jest-worker-27.4.5" // { + (sources."jest-worker-27.4.6" // { dependencies = [ sources."has-flag-4.0.0" sources."supports-color-8.1.1" @@ -8294,7 +8004,7 @@ let ]; }) sources."makeerror-1.0.12" - sources."marked-3.0.8" + sources."marked-4.0.12" sources."merge-stream-2.0.0" sources."merge2-1.4.1" sources."micromatch-4.0.4" @@ -8337,20 +8047,19 @@ let sources."path-parse-1.0.7" sources."path-type-4.0.0" sources."picocolors-1.0.0" - sources."picomatch-2.3.0" + sources."picomatch-2.3.1" sources."pify-4.0.1" - sources."pirates-4.0.4" + sources."pirates-4.0.5" sources."pkg-dir-4.2.0" - sources."prebuild-install-7.0.0" + sources."prebuild-install-7.0.1" sources."prelude-ls-1.2.1" - (sources."pretty-format-27.4.2" // { + (sources."pretty-format-27.4.6" // { dependencies = [ sources."ansi-regex-5.0.1" sources."ansi-styles-5.2.0" ]; }) sources."process-nextick-args-2.0.1" - sources."progress-2.0.3" sources."prompts-2.4.2" sources."psl-1.8.0" sources."pump-3.0.0" @@ -8373,7 +8082,7 @@ let ]; }) sources."require-directory-2.1.1" - sources."resolve-1.20.0" + sources."resolve-1.22.0" sources."resolve-cwd-3.0.0" sources."resolve-from-5.0.0" sources."resolve.exports-1.1.0" @@ -8388,10 +8097,10 @@ let sources."set-blocking-2.0.0" sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" - sources."shiki-0.9.15" + sources."shiki-0.10.0" sources."signal-exit-3.0.6" sources."simple-concat-1.0.1" - sources."simple-get-4.0.0" + sources."simple-get-4.0.1" sources."sisteransi-1.0.5" sources."slash-2.0.0" sources."slip-1.0.2" @@ -8426,6 +8135,7 @@ let sources."supports-color-7.2.0" ]; }) + sources."supports-preserve-symlinks-flag-1.0.0" sources."symbol-tree-3.2.4" sources."tar-fs-2.1.1" (sources."tar-stream-2.2.0" // { @@ -8451,12 +8161,12 @@ let sources."type-detect-4.0.8" sources."type-fest-0.20.2" sources."typedarray-to-buffer-3.1.5" - sources."typedoc-0.22.10" - sources."typedoc-plugin-markdown-3.11.8" + sources."typedoc-0.22.11" + sources."typedoc-plugin-markdown-3.11.12" sources."typedoc-plugin-no-inherit-1.3.1" sources."typedoc-plugin-sourcefile-url-1.0.6" - sources."typescript-4.5.4" - sources."uglify-js-3.14.5" + sources."typescript-4.5.5" + sources."uglify-js-3.15.0" sources."unicode-canonical-property-names-ecmascript-2.0.0" sources."unicode-match-property-ecmascript-2.0.0" sources."unicode-match-property-value-ecmascript-2.0.0" @@ -8465,7 +8175,7 @@ let sources."uri-js-4.4.1" sources."util-deprecate-1.0.2" sources."v8-compile-cache-2.3.0" - (sources."v8-to-istanbul-8.1.0" // { + (sources."v8-to-istanbul-8.1.1" // { dependencies = [ sources."source-map-0.7.3" ]; @@ -8512,17 +8222,17 @@ let sources."yargs-parser-20.2.9" ]; }) - (sources."zigbee-herdsman-converters-14.0.366" // { + (sources."zigbee-herdsman-converters-14.0.406" // { dependencies = [ sources."@babel/code-frame-7.16.7" - sources."@babel/compat-data-7.16.4" - (sources."@babel/core-7.16.7" // { + sources."@babel/compat-data-7.16.8" + (sources."@babel/core-7.16.12" // { dependencies = [ sources."semver-6.3.0" sources."source-map-0.5.7" ]; }) - (sources."@babel/generator-7.16.7" // { + (sources."@babel/generator-7.16.8" // { dependencies = [ sources."source-map-0.5.7" ]; @@ -8544,7 +8254,7 @@ let sources."@babel/helper-validator-identifier-7.16.7" sources."@babel/helper-validator-option-7.16.7" sources."@babel/helpers-7.16.7" - (sources."@babel/highlight-7.16.7" // { + (sources."@babel/highlight-7.16.10" // { dependencies = [ sources."ansi-styles-3.2.1" sources."chalk-2.4.2" @@ -8555,7 +8265,7 @@ let sources."supports-color-5.5.0" ]; }) - sources."@babel/parser-7.16.7" + sources."@babel/parser-7.16.12" sources."@babel/plugin-syntax-async-generators-7.8.4" sources."@babel/plugin-syntax-bigint-7.8.3" sources."@babel/plugin-syntax-class-properties-7.12.13" @@ -8570,15 +8280,19 @@ let sources."@babel/plugin-syntax-top-level-await-7.14.5" sources."@babel/plugin-syntax-typescript-7.16.7" sources."@babel/template-7.16.7" - (sources."@babel/traverse-7.16.7" // { + (sources."@babel/traverse-7.16.10" // { dependencies = [ sources."globals-11.12.0" ]; }) - sources."@babel/types-7.16.7" + sources."@babel/types-7.16.8" sources."@bcoe/v8-coverage-0.2.3" - sources."@eslint/eslintrc-1.0.5" - sources."@humanwhocodes/config-array-0.9.2" + (sources."@eslint/eslintrc-1.0.5" // { + dependencies = [ + sources."ignore-4.0.6" + ]; + }) + sources."@humanwhocodes/config-array-0.9.3" sources."@humanwhocodes/object-schema-1.2.1" (sources."@istanbuljs/load-nyc-config-1.1.0" // { dependencies = [ @@ -8588,16 +8302,16 @@ let ]; }) sources."@istanbuljs/schema-0.1.3" - sources."@jest/console-27.4.2" - sources."@jest/core-27.4.5" - sources."@jest/environment-27.4.4" - sources."@jest/fake-timers-27.4.2" - sources."@jest/globals-27.4.4" - sources."@jest/reporters-27.4.5" + sources."@jest/console-27.4.6" + sources."@jest/core-27.4.7" + sources."@jest/environment-27.4.6" + sources."@jest/fake-timers-27.4.6" + sources."@jest/globals-27.4.6" + sources."@jest/reporters-27.4.6" sources."@jest/source-map-27.4.0" - sources."@jest/test-result-27.4.2" - sources."@jest/test-sequencer-27.4.5" - sources."@jest/transform-27.4.5" + sources."@jest/test-result-27.4.6" + sources."@jest/test-sequencer-27.4.6" + sources."@jest/transform-27.4.6" sources."@jest/types-27.4.2" sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" @@ -8614,21 +8328,21 @@ let sources."@types/istanbul-lib-report-3.0.0" sources."@types/istanbul-reports-3.0.1" sources."@types/json-schema-7.0.9" - sources."@types/node-17.0.5" - sources."@types/prettier-2.4.2" + sources."@types/node-17.0.14" + sources."@types/prettier-2.4.3" sources."@types/stack-utils-2.0.1" sources."@types/yargs-16.0.4" sources."@types/yargs-parser-20.2.1" - (sources."@typescript-eslint/experimental-utils-5.8.1" // { + sources."@typescript-eslint/scope-manager-5.10.2" + sources."@typescript-eslint/types-5.10.2" + sources."@typescript-eslint/typescript-estree-5.10.2" + (sources."@typescript-eslint/utils-5.10.2" // { dependencies = [ sources."eslint-scope-5.1.1" sources."estraverse-4.3.0" ]; }) - sources."@typescript-eslint/scope-manager-5.8.1" - sources."@typescript-eslint/types-5.8.1" - sources."@typescript-eslint/typescript-estree-5.8.1" - sources."@typescript-eslint/visitor-keys-5.8.1" + sources."@typescript-eslint/visitor-keys-5.10.2" sources."abab-2.0.5" sources."acorn-8.7.0" (sources."acorn-globals-6.0.0" // { @@ -8640,7 +8354,6 @@ let sources."acorn-walk-7.2.0" sources."agent-base-6.0.2" sources."ajv-6.12.6" - sources."ansi-colors-4.1.1" (sources."ansi-escapes-4.3.2" // { dependencies = [ sources."type-fest-0.21.3" @@ -8652,14 +8365,9 @@ let sources."argparse-2.0.1" sources."array-union-2.1.0" sources."asynckit-0.4.0" - sources."axios-0.24.0" - sources."babel-jest-27.4.5" - (sources."babel-plugin-istanbul-6.1.1" // { - dependencies = [ - sources."istanbul-lib-instrument-5.1.0" - sources."semver-6.3.0" - ]; - }) + sources."axios-0.25.0" + sources."babel-jest-27.4.6" + sources."babel-plugin-istanbul-6.1.1" sources."babel-plugin-jest-hoist-27.4.0" sources."babel-preset-current-node-syntax-1.0.1" sources."babel-preset-jest-27.4.0" @@ -8676,7 +8384,7 @@ let sources."buffer-from-1.1.2" sources."callsites-3.1.0" sources."camelcase-5.3.1" - sources."caniuse-lite-1.0.30001294" + sources."caniuse-lite-1.0.30001304" sources."chalk-4.1.2" sources."char-regex-1.0.2" sources."ci-info-3.3.0" @@ -8716,11 +8424,10 @@ let sources."webidl-conversions-5.0.0" ]; }) - sources."electron-to-chromium-1.4.31" + sources."electron-to-chromium-1.4.59" sources."emittery-0.8.1" sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" - sources."enquirer-2.3.6" sources."escalade-3.1.1" sources."escape-string-regexp-4.0.0" (sources."escodegen-2.0.0" // { @@ -8731,16 +8438,16 @@ let sources."type-check-0.3.2" ]; }) - sources."eslint-8.6.0" + sources."eslint-8.8.0" sources."eslint-config-google-0.14.0" - sources."eslint-plugin-jest-25.3.3" + sources."eslint-plugin-jest-26.0.0" sources."eslint-scope-7.1.0" (sources."eslint-utils-3.0.0" // { dependencies = [ sources."eslint-visitor-keys-2.1.0" ]; }) - sources."eslint-visitor-keys-3.1.0" + sources."eslint-visitor-keys-3.2.0" sources."espree-9.3.0" sources."esprima-4.0.1" sources."esquery-1.4.0" @@ -8749,13 +8456,9 @@ let sources."esutils-2.0.3" sources."execa-5.1.1" sources."exit-0.1.2" - (sources."expect-27.4.2" // { - dependencies = [ - sources."ansi-styles-5.2.0" - ]; - }) + sources."expect-27.4.6" sources."fast-deep-equal-3.1.3" - (sources."fast-glob-3.2.7" // { + (sources."fast-glob-3.2.11" // { dependencies = [ sources."glob-parent-5.1.2" ]; @@ -8768,8 +8471,8 @@ let sources."fill-range-7.0.1" sources."find-up-4.1.0" sources."flat-cache-3.0.4" - sources."flatted-3.2.4" - sources."follow-redirects-1.14.6" + sources."flatted-3.2.5" + sources."follow-redirects-1.14.7" sources."form-data-3.0.1" sources."fs-constants-1.0.0" sources."fs.realpath-1.0.0" @@ -8783,12 +8486,8 @@ let sources."glob-7.2.0" sources."glob-parent-6.0.2" sources."globals-13.12.0" - (sources."globby-11.0.4" // { - dependencies = [ - sources."ignore-5.2.0" - ]; - }) - sources."graceful-fs-4.2.8" + sources."globby-11.1.0" + sources."graceful-fs-4.2.9" sources."has-1.0.3" sources."has-flag-4.0.0" sources."html-encoding-sniffer-2.0.1" @@ -8798,13 +8497,13 @@ let sources."human-signals-2.1.0" sources."iconv-lite-0.4.24" sources."ieee754-1.2.1" - sources."ignore-4.0.6" + sources."ignore-5.2.0" sources."import-fresh-3.3.0" - sources."import-local-3.0.3" + sources."import-local-3.1.0" sources."imurmurhash-0.1.4" sources."inflight-1.0.6" sources."inherits-2.0.4" - sources."is-core-module-2.8.0" + sources."is-core-module-2.8.1" sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-3.0.0" sources."is-generator-fn-2.1.0" @@ -8815,7 +8514,7 @@ let sources."is-typedarray-1.0.0" sources."isexe-2.0.0" sources."istanbul-lib-coverage-3.2.0" - (sources."istanbul-lib-instrument-4.0.3" // { + (sources."istanbul-lib-instrument-5.1.0" // { dependencies = [ sources."semver-6.3.0" ]; @@ -8823,42 +8522,42 @@ let sources."istanbul-lib-report-3.0.0" sources."istanbul-lib-source-maps-4.0.1" sources."istanbul-reports-3.1.3" - (sources."jest-27.4.5" // { + (sources."jest-27.4.7" // { dependencies = [ - sources."jest-cli-27.4.5" + sources."jest-cli-27.4.7" ]; }) sources."jest-changed-files-27.4.2" - sources."jest-circus-27.4.5" - sources."jest-config-27.4.5" - sources."jest-diff-27.4.2" + sources."jest-circus-27.4.6" + sources."jest-config-27.4.7" + sources."jest-diff-27.4.6" sources."jest-docblock-27.4.0" - sources."jest-each-27.4.2" - sources."jest-environment-jsdom-27.4.4" - sources."jest-environment-node-27.4.4" + sources."jest-each-27.4.6" + sources."jest-environment-jsdom-27.4.6" + sources."jest-environment-node-27.4.6" sources."jest-get-type-27.4.0" - sources."jest-haste-map-27.4.5" - sources."jest-jasmine2-27.4.5" - sources."jest-leak-detector-27.4.2" - sources."jest-matcher-utils-27.4.2" - sources."jest-message-util-27.4.2" - sources."jest-mock-27.4.2" + sources."jest-haste-map-27.4.6" + sources."jest-jasmine2-27.4.6" + sources."jest-leak-detector-27.4.6" + sources."jest-matcher-utils-27.4.6" + sources."jest-message-util-27.4.6" + sources."jest-mock-27.4.6" sources."jest-pnp-resolver-1.2.2" sources."jest-regex-util-27.4.0" - sources."jest-resolve-27.4.5" - sources."jest-resolve-dependencies-27.4.5" - sources."jest-runner-27.4.5" - sources."jest-runtime-27.4.5" + sources."jest-resolve-27.4.6" + sources."jest-resolve-dependencies-27.4.6" + sources."jest-runner-27.4.6" + sources."jest-runtime-27.4.6" sources."jest-serializer-27.4.0" - sources."jest-snapshot-27.4.5" + sources."jest-snapshot-27.4.6" sources."jest-util-27.4.2" - (sources."jest-validate-27.4.2" // { + (sources."jest-validate-27.4.6" // { dependencies = [ - sources."camelcase-6.2.1" + sources."camelcase-6.3.0" ]; }) - sources."jest-watcher-27.4.2" - (sources."jest-worker-27.4.5" // { + sources."jest-watcher-27.4.6" + (sources."jest-worker-27.4.6" // { dependencies = [ sources."supports-color-8.1.1" ]; @@ -8912,16 +8611,15 @@ let sources."path-parse-1.0.7" sources."path-type-4.0.0" sources."picocolors-1.0.0" - sources."picomatch-2.3.0" - sources."pirates-4.0.4" + sources."picomatch-2.3.1" + sources."pirates-4.0.5" sources."pkg-dir-4.2.0" sources."prelude-ls-1.2.1" - (sources."pretty-format-27.4.2" // { + (sources."pretty-format-27.4.6" // { dependencies = [ sources."ansi-styles-5.2.0" ]; }) - sources."progress-2.0.3" sources."prompts-2.4.2" sources."psl-1.8.0" sources."punycode-2.1.1" @@ -8930,7 +8628,7 @@ let sources."readable-stream-3.6.0" sources."regexpp-3.2.0" sources."require-directory-2.1.1" - sources."resolve-1.20.0" + sources."resolve-1.22.0" (sources."resolve-cwd-3.0.0" // { dependencies = [ sources."resolve-from-5.0.0" @@ -8967,6 +8665,7 @@ let sources."strip-json-comments-3.1.1" sources."supports-color-7.2.0" sources."supports-hyperlinks-2.2.0" + sources."supports-preserve-symlinks-flag-1.0.0" sources."symbol-tree-3.2.4" sources."tar-stream-2.2.0" sources."terminal-link-2.1.1" @@ -8988,7 +8687,7 @@ let sources."uri-js-4.4.1" sources."util-deprecate-1.0.2" sources."v8-compile-cache-2.3.0" - (sources."v8-to-istanbul-8.1.0" // { + (sources."v8-to-istanbul-8.1.1" // { dependencies = [ sources."source-map-0.7.3" ]; @@ -9012,69 +8711,69 @@ let sources."yallist-4.0.0" sources."yargs-16.2.0" sources."yargs-parser-20.2.9" - (sources."zigbee-herdsman-0.13.188" // { + (sources."zigbee-herdsman-0.14.10" // { dependencies = [ - sources."@babel/cli-7.16.0" - sources."@babel/code-frame-7.16.0" - sources."@babel/compat-data-7.16.4" - (sources."@babel/core-7.16.5" // { + sources."@babel/cli-7.16.8" + sources."@babel/code-frame-7.16.7" + sources."@babel/compat-data-7.16.8" + (sources."@babel/core-7.16.12" // { dependencies = [ sources."semver-6.3.0" ]; }) - sources."@babel/generator-7.16.5" - sources."@babel/helper-annotate-as-pure-7.16.0" - sources."@babel/helper-builder-binary-assignment-operator-visitor-7.16.5" - (sources."@babel/helper-compilation-targets-7.16.3" // { + sources."@babel/generator-7.16.8" + 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.16.7" // { dependencies = [ sources."semver-6.3.0" ]; }) - sources."@babel/helper-create-class-features-plugin-7.16.5" - sources."@babel/helper-create-regexp-features-plugin-7.16.0" - (sources."@babel/helper-define-polyfill-provider-0.3.0" // { + sources."@babel/helper-create-class-features-plugin-7.16.10" + sources."@babel/helper-create-regexp-features-plugin-7.16.7" + (sources."@babel/helper-define-polyfill-provider-0.3.1" // { dependencies = [ sources."semver-6.3.0" ]; }) - sources."@babel/helper-environment-visitor-7.16.5" - sources."@babel/helper-explode-assignable-expression-7.16.0" - sources."@babel/helper-function-name-7.16.0" - sources."@babel/helper-get-function-arity-7.16.0" - sources."@babel/helper-hoist-variables-7.16.0" - sources."@babel/helper-member-expression-to-functions-7.16.5" - sources."@babel/helper-module-imports-7.16.0" - sources."@babel/helper-module-transforms-7.16.5" - sources."@babel/helper-optimise-call-expression-7.16.0" - sources."@babel/helper-plugin-utils-7.16.5" - sources."@babel/helper-remap-async-to-generator-7.16.5" - sources."@babel/helper-replace-supers-7.16.5" - sources."@babel/helper-simple-access-7.16.0" + sources."@babel/helper-environment-visitor-7.16.7" + sources."@babel/helper-explode-assignable-expression-7.16.7" + sources."@babel/helper-function-name-7.16.7" + sources."@babel/helper-get-function-arity-7.16.7" + sources."@babel/helper-hoist-variables-7.16.7" + sources."@babel/helper-member-expression-to-functions-7.16.7" + sources."@babel/helper-module-imports-7.16.7" + sources."@babel/helper-module-transforms-7.16.7" + sources."@babel/helper-optimise-call-expression-7.16.7" + sources."@babel/helper-plugin-utils-7.16.7" + sources."@babel/helper-remap-async-to-generator-7.16.8" + sources."@babel/helper-replace-supers-7.16.7" + sources."@babel/helper-simple-access-7.16.7" sources."@babel/helper-skip-transparent-expression-wrappers-7.16.0" - sources."@babel/helper-split-export-declaration-7.16.0" - sources."@babel/helper-validator-identifier-7.15.7" - sources."@babel/helper-validator-option-7.14.5" - sources."@babel/helper-wrap-function-7.16.5" - sources."@babel/helpers-7.16.5" - sources."@babel/highlight-7.16.0" - sources."@babel/parser-7.16.6" - sources."@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.16.2" - sources."@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.16.0" - sources."@babel/plugin-proposal-async-generator-functions-7.16.5" - sources."@babel/plugin-proposal-class-properties-7.16.5" - sources."@babel/plugin-proposal-class-static-block-7.16.5" - sources."@babel/plugin-proposal-dynamic-import-7.16.5" - sources."@babel/plugin-proposal-export-namespace-from-7.16.5" - sources."@babel/plugin-proposal-json-strings-7.16.5" - sources."@babel/plugin-proposal-logical-assignment-operators-7.16.5" - sources."@babel/plugin-proposal-nullish-coalescing-operator-7.16.5" - sources."@babel/plugin-proposal-numeric-separator-7.16.5" - sources."@babel/plugin-proposal-object-rest-spread-7.16.5" - sources."@babel/plugin-proposal-optional-catch-binding-7.16.5" - sources."@babel/plugin-proposal-optional-chaining-7.16.5" - sources."@babel/plugin-proposal-private-methods-7.16.5" - sources."@babel/plugin-proposal-private-property-in-object-7.16.5" - sources."@babel/plugin-proposal-unicode-property-regex-7.16.5" + 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.16.7" + sources."@babel/highlight-7.16.10" + sources."@babel/parser-7.16.12" + sources."@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.16.7" + sources."@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.16.7" + sources."@babel/plugin-proposal-async-generator-functions-7.16.8" + sources."@babel/plugin-proposal-class-properties-7.16.7" + sources."@babel/plugin-proposal-class-static-block-7.16.7" + sources."@babel/plugin-proposal-dynamic-import-7.16.7" + sources."@babel/plugin-proposal-export-namespace-from-7.16.7" + sources."@babel/plugin-proposal-json-strings-7.16.7" + sources."@babel/plugin-proposal-logical-assignment-operators-7.16.7" + sources."@babel/plugin-proposal-nullish-coalescing-operator-7.16.7" + sources."@babel/plugin-proposal-numeric-separator-7.16.7" + sources."@babel/plugin-proposal-object-rest-spread-7.16.7" + sources."@babel/plugin-proposal-optional-catch-binding-7.16.7" + sources."@babel/plugin-proposal-optional-chaining-7.16.7" + sources."@babel/plugin-proposal-private-methods-7.16.11" + sources."@babel/plugin-proposal-private-property-in-object-7.16.7" + sources."@babel/plugin-proposal-unicode-property-regex-7.16.7" sources."@babel/plugin-syntax-async-generators-7.8.4" sources."@babel/plugin-syntax-bigint-7.8.3" sources."@babel/plugin-syntax-class-properties-7.12.13" @@ -9091,51 +8790,51 @@ let sources."@babel/plugin-syntax-optional-chaining-7.8.3" sources."@babel/plugin-syntax-private-property-in-object-7.14.5" sources."@babel/plugin-syntax-top-level-await-7.14.5" - sources."@babel/plugin-syntax-typescript-7.16.5" - sources."@babel/plugin-transform-arrow-functions-7.16.5" - sources."@babel/plugin-transform-async-to-generator-7.16.5" - sources."@babel/plugin-transform-block-scoped-functions-7.16.5" - sources."@babel/plugin-transform-block-scoping-7.16.5" - sources."@babel/plugin-transform-classes-7.16.5" - sources."@babel/plugin-transform-computed-properties-7.16.5" - sources."@babel/plugin-transform-destructuring-7.16.5" - sources."@babel/plugin-transform-dotall-regex-7.16.5" - sources."@babel/plugin-transform-duplicate-keys-7.16.5" - sources."@babel/plugin-transform-exponentiation-operator-7.16.5" - sources."@babel/plugin-transform-for-of-7.16.5" - sources."@babel/plugin-transform-function-name-7.16.5" - sources."@babel/plugin-transform-literals-7.16.5" - sources."@babel/plugin-transform-member-expression-literals-7.16.5" - sources."@babel/plugin-transform-modules-amd-7.16.5" - sources."@babel/plugin-transform-modules-commonjs-7.16.5" - sources."@babel/plugin-transform-modules-systemjs-7.16.5" - sources."@babel/plugin-transform-modules-umd-7.16.5" - sources."@babel/plugin-transform-named-capturing-groups-regex-7.16.5" - sources."@babel/plugin-transform-new-target-7.16.5" - sources."@babel/plugin-transform-object-super-7.16.5" - sources."@babel/plugin-transform-parameters-7.16.5" - sources."@babel/plugin-transform-property-literals-7.16.5" - sources."@babel/plugin-transform-regenerator-7.16.5" - sources."@babel/plugin-transform-reserved-words-7.16.5" - sources."@babel/plugin-transform-shorthand-properties-7.16.5" - sources."@babel/plugin-transform-spread-7.16.5" - sources."@babel/plugin-transform-sticky-regex-7.16.5" - sources."@babel/plugin-transform-template-literals-7.16.5" - sources."@babel/plugin-transform-typeof-symbol-7.16.5" - sources."@babel/plugin-transform-typescript-7.16.1" - sources."@babel/plugin-transform-unicode-escapes-7.16.5" - sources."@babel/plugin-transform-unicode-regex-7.16.5" - (sources."@babel/preset-env-7.16.5" // { + sources."@babel/plugin-syntax-typescript-7.16.7" + sources."@babel/plugin-transform-arrow-functions-7.16.7" + sources."@babel/plugin-transform-async-to-generator-7.16.8" + sources."@babel/plugin-transform-block-scoped-functions-7.16.7" + sources."@babel/plugin-transform-block-scoping-7.16.7" + sources."@babel/plugin-transform-classes-7.16.7" + sources."@babel/plugin-transform-computed-properties-7.16.7" + sources."@babel/plugin-transform-destructuring-7.16.7" + sources."@babel/plugin-transform-dotall-regex-7.16.7" + sources."@babel/plugin-transform-duplicate-keys-7.16.7" + sources."@babel/plugin-transform-exponentiation-operator-7.16.7" + sources."@babel/plugin-transform-for-of-7.16.7" + sources."@babel/plugin-transform-function-name-7.16.7" + sources."@babel/plugin-transform-literals-7.16.7" + sources."@babel/plugin-transform-member-expression-literals-7.16.7" + sources."@babel/plugin-transform-modules-amd-7.16.7" + sources."@babel/plugin-transform-modules-commonjs-7.16.8" + sources."@babel/plugin-transform-modules-systemjs-7.16.7" + sources."@babel/plugin-transform-modules-umd-7.16.7" + sources."@babel/plugin-transform-named-capturing-groups-regex-7.16.8" + sources."@babel/plugin-transform-new-target-7.16.7" + sources."@babel/plugin-transform-object-super-7.16.7" + sources."@babel/plugin-transform-parameters-7.16.7" + sources."@babel/plugin-transform-property-literals-7.16.7" + sources."@babel/plugin-transform-regenerator-7.16.7" + sources."@babel/plugin-transform-reserved-words-7.16.7" + sources."@babel/plugin-transform-shorthand-properties-7.16.7" + sources."@babel/plugin-transform-spread-7.16.7" + sources."@babel/plugin-transform-sticky-regex-7.16.7" + sources."@babel/plugin-transform-template-literals-7.16.7" + sources."@babel/plugin-transform-typeof-symbol-7.16.7" + sources."@babel/plugin-transform-typescript-7.16.8" + sources."@babel/plugin-transform-unicode-escapes-7.16.7" + sources."@babel/plugin-transform-unicode-regex-7.16.7" + (sources."@babel/preset-env-7.16.11" // { dependencies = [ sources."semver-6.3.0" ]; }) sources."@babel/preset-modules-0.1.5" - sources."@babel/preset-typescript-7.16.5" - sources."@babel/runtime-7.16.5" - sources."@babel/template-7.16.0" - sources."@babel/traverse-7.16.5" - sources."@babel/types-7.16.0" + sources."@babel/preset-typescript-7.16.7" + sources."@babel/runtime-7.16.7" + sources."@babel/template-7.16.7" + sources."@babel/traverse-7.16.10" + sources."@babel/types-7.16.8" sources."@bcoe/v8-coverage-0.2.3" (sources."@eslint/eslintrc-1.0.5" // { dependencies = [ @@ -9146,11 +8845,11 @@ let sources."strip-json-comments-3.1.1" ]; }) - sources."@humanwhocodes/config-array-0.9.2" + sources."@humanwhocodes/config-array-0.9.3" sources."@humanwhocodes/object-schema-1.2.1" sources."@istanbuljs/load-nyc-config-1.1.0" sources."@istanbuljs/schema-0.1.3" - (sources."@jest/console-27.4.2" // { + (sources."@jest/console-27.4.6" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.2" @@ -9161,7 +8860,7 @@ let sources."supports-color-7.2.0" ]; }) - (sources."@jest/core-27.4.5" // { + (sources."@jest/core-27.4.7" // { dependencies = [ sources."ansi-regex-5.0.1" sources."ansi-styles-4.3.0" @@ -9174,18 +8873,16 @@ let sources."supports-color-7.2.0" ]; }) - sources."@jest/environment-27.4.4" - sources."@jest/fake-timers-27.4.2" - sources."@jest/globals-27.4.4" - (sources."@jest/reporters-27.4.5" // { + sources."@jest/environment-27.4.6" + sources."@jest/fake-timers-27.4.6" + sources."@jest/globals-27.4.6" + (sources."@jest/reporters-27.4.6" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.2" sources."color-convert-2.0.1" sources."color-name-1.1.4" sources."has-flag-4.0.0" - sources."istanbul-lib-instrument-4.0.3" - sources."semver-6.3.0" sources."slash-3.0.0" sources."source-map-0.6.1" sources."supports-color-7.2.0" @@ -9196,9 +8893,9 @@ let sources."source-map-0.6.1" ]; }) - sources."@jest/test-result-27.4.2" - sources."@jest/test-sequencer-27.4.5" - (sources."@jest/transform-27.4.5" // { + sources."@jest/test-result-27.4.6" + sources."@jest/test-sequencer-27.4.6" + (sources."@jest/transform-27.4.6" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.2" @@ -9238,7 +8935,7 @@ let sources."@sinonjs/commons-1.8.3" sources."@sinonjs/fake-timers-8.1.0" sources."@tootallnate/once-1.1.2" - sources."@types/babel__core-7.1.17" + sources."@types/babel__core-7.1.18" sources."@types/babel__generator-7.6.4" sources."@types/babel__template-7.4.1" sources."@types/babel__traverse-7.14.2" @@ -9248,26 +8945,27 @@ let sources."@types/istanbul-lib-coverage-2.0.4" sources."@types/istanbul-lib-report-3.0.0" sources."@types/istanbul-reports-3.0.1" - sources."@types/jest-27.0.3" + sources."@types/jest-27.4.0" sources."@types/json-schema-7.0.9" sources."@types/ms-0.7.31" sources."@types/mz-2.7.4" sources."@types/nedb-1.8.12" - sources."@types/node-17.0.4" - sources."@types/prettier-2.4.2" + sources."@types/node-17.0.13" + sources."@types/prettier-2.4.3" sources."@types/serialport-8.0.2" sources."@types/stack-utils-2.0.1" sources."@types/yargs-16.0.4" sources."@types/yargs-parser-20.2.1" - sources."@typescript-eslint/eslint-plugin-5.8.0" - sources."@typescript-eslint/experimental-utils-5.8.0" - sources."@typescript-eslint/parser-5.8.0" - sources."@typescript-eslint/scope-manager-5.8.0" - sources."@typescript-eslint/types-5.8.0" - sources."@typescript-eslint/typescript-estree-5.8.0" - sources."@typescript-eslint/visitor-keys-5.8.0" + sources."@typescript-eslint/eslint-plugin-5.10.1" + sources."@typescript-eslint/parser-5.10.1" + sources."@typescript-eslint/scope-manager-5.10.1" + sources."@typescript-eslint/type-utils-5.10.1" + sources."@typescript-eslint/types-5.10.1" + sources."@typescript-eslint/typescript-estree-5.10.1" + sources."@typescript-eslint/utils-5.10.1" + sources."@typescript-eslint/visitor-keys-5.10.1" sources."abab-2.0.5" - sources."acorn-8.6.0" + sources."acorn-8.7.0" (sources."acorn-globals-6.0.0" // { dependencies = [ sources."acorn-7.4.1" @@ -9277,7 +8975,6 @@ let sources."acorn-walk-7.2.0" sources."agent-base-6.0.2" sources."ajv-6.12.6" - sources."ansi-colors-4.1.1" (sources."ansi-escapes-4.3.2" // { dependencies = [ sources."type-fest-0.21.3" @@ -9292,7 +8989,7 @@ let sources."argparse-1.0.10" sources."array-union-2.1.0" sources."asynckit-0.4.0" - (sources."babel-jest-27.4.5" // { + (sources."babel-jest-27.4.6" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.2" @@ -9306,13 +9003,13 @@ let sources."babel-plugin-dynamic-import-node-2.3.3" sources."babel-plugin-istanbul-6.1.1" sources."babel-plugin-jest-hoist-27.4.0" - (sources."babel-plugin-polyfill-corejs2-0.3.0" // { + (sources."babel-plugin-polyfill-corejs2-0.3.1" // { dependencies = [ sources."semver-6.3.0" ]; }) - sources."babel-plugin-polyfill-corejs3-0.4.0" - sources."babel-plugin-polyfill-regenerator-0.3.0" + sources."babel-plugin-polyfill-corejs3-0.5.1" + sources."babel-plugin-polyfill-regenerator-0.3.1" sources."babel-preset-current-node-syntax-1.0.1" sources."babel-preset-jest-27.4.0" sources."balanced-match-1.0.2" @@ -9334,10 +9031,10 @@ let sources."call-bind-1.0.2" sources."callsites-3.1.0" sources."camelcase-5.3.1" - sources."caniuse-lite-1.0.30001292" + sources."caniuse-lite-1.0.30001304" sources."chalk-2.4.2" sources."char-regex-1.0.2" - sources."chokidar-3.5.2" + sources."chokidar-3.5.3" sources."chownr-1.1.4" sources."ci-info-3.3.0" sources."cjs-module-lexer-1.2.2" @@ -9359,7 +9056,7 @@ let sources."concat-map-0.0.1" sources."console-control-strings-1.1.0" sources."convert-source-map-1.8.0" - (sources."core-js-compat-3.20.1" // { + (sources."core-js-compat-3.20.3" // { dependencies = [ sources."semver-7.0.0" ]; @@ -9384,7 +9081,7 @@ let sources."define-properties-1.1.3" sources."delayed-stream-1.0.0" sources."delegates-1.0.0" - sources."detect-libc-1.0.3" + sources."detect-libc-2.0.0" sources."detect-newline-3.1.0" sources."diff-sequences-27.4.0" sources."dir-glob-3.0.1" @@ -9394,11 +9091,10 @@ let sources."webidl-conversions-5.0.0" ]; }) - sources."electron-to-chromium-1.4.28" + sources."electron-to-chromium-1.4.57" sources."emittery-0.8.1" sources."emoji-regex-8.0.0" sources."end-of-stream-1.4.4" - sources."enquirer-2.3.6" sources."escalade-3.1.1" sources."escape-string-regexp-1.0.5" (sources."escodegen-2.0.0" // { @@ -9411,7 +9107,7 @@ let sources."type-check-0.3.2" ]; }) - (sources."eslint-8.5.0" // { + (sources."eslint-8.8.0" // { dependencies = [ sources."ansi-regex-5.0.1" sources."ansi-styles-4.3.0" @@ -9425,7 +9121,6 @@ let sources."glob-parent-6.0.2" sources."globals-13.12.0" sources."has-flag-4.0.0" - sources."ignore-4.0.6" sources."js-yaml-4.1.0" sources."strip-ansi-6.0.1" sources."strip-json-comments-3.1.1" @@ -9438,8 +9133,8 @@ let sources."eslint-visitor-keys-2.1.0" ]; }) - sources."eslint-visitor-keys-3.1.0" - sources."espree-9.2.0" + sources."eslint-visitor-keys-3.2.0" + sources."espree-9.3.0" sources."esprima-4.0.1" (sources."esquery-1.4.0" // { dependencies = [ @@ -9456,13 +9151,9 @@ let sources."execa-5.1.1" sources."exit-0.1.2" sources."expand-template-2.0.3" - (sources."expect-27.4.2" // { - dependencies = [ - sources."ansi-styles-5.2.0" - ]; - }) + sources."expect-27.4.6" sources."fast-deep-equal-3.1.3" - sources."fast-glob-3.2.7" + sources."fast-glob-3.2.11" sources."fast-json-stable-stringify-2.1.0" sources."fast-levenshtein-2.0.6" sources."fastq-1.13.0" @@ -9472,7 +9163,7 @@ let sources."fill-range-7.0.1" sources."find-up-4.1.0" sources."flat-cache-3.0.4" - sources."flatted-3.2.4" + sources."flatted-3.2.5" sources."form-data-3.0.1" sources."fs-constants-1.0.0" sources."fs-readdir-recursive-1.1.0" @@ -9490,12 +9181,12 @@ let sources."glob-7.2.0" sources."glob-parent-5.1.2" sources."globals-11.12.0" - (sources."globby-11.0.4" // { + (sources."globby-11.1.0" // { dependencies = [ sources."slash-3.0.0" ]; }) - sources."graceful-fs-4.2.8" + sources."graceful-fs-4.2.9" (sources."handlebars-4.7.7" // { dependencies = [ sources."source-map-0.6.1" @@ -9518,13 +9209,13 @@ let sources."resolve-from-4.0.0" ]; }) - sources."import-local-3.0.3" + sources."import-local-3.1.0" sources."imurmurhash-0.1.4" sources."inflight-1.0.6" sources."inherits-2.0.4" sources."ini-1.3.8" sources."is-binary-path-2.1.0" - sources."is-core-module-2.8.0" + sources."is-core-module-2.8.1" sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-1.0.0" sources."is-generator-fn-2.1.0" @@ -9554,20 +9245,20 @@ let sources."source-map-0.6.1" ]; }) - sources."istanbul-reports-3.1.2" - (sources."jest-27.4.5" // { + sources."istanbul-reports-3.1.3" + (sources."jest-27.4.7" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.2" sources."color-convert-2.0.1" sources."color-name-1.1.4" sources."has-flag-4.0.0" - sources."jest-cli-27.4.5" + sources."jest-cli-27.4.7" sources."supports-color-7.2.0" ]; }) sources."jest-changed-files-27.4.2" - (sources."jest-circus-27.4.5" // { + (sources."jest-circus-27.4.6" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.2" @@ -9578,7 +9269,7 @@ let sources."supports-color-7.2.0" ]; }) - (sources."jest-config-27.4.5" // { + (sources."jest-config-27.4.7" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.2" @@ -9589,7 +9280,7 @@ let sources."supports-color-7.2.0" ]; }) - (sources."jest-diff-27.4.2" // { + (sources."jest-diff-27.4.6" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.2" @@ -9600,7 +9291,7 @@ let ]; }) sources."jest-docblock-27.4.0" - (sources."jest-each-27.4.2" // { + (sources."jest-each-27.4.6" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.2" @@ -9610,11 +9301,11 @@ let sources."supports-color-7.2.0" ]; }) - sources."jest-environment-jsdom-27.4.4" - sources."jest-environment-node-27.4.4" + sources."jest-environment-jsdom-27.4.6" + sources."jest-environment-node-27.4.6" sources."jest-get-type-27.4.0" - sources."jest-haste-map-27.4.5" - (sources."jest-jasmine2-27.4.5" // { + sources."jest-haste-map-27.4.6" + (sources."jest-jasmine2-27.4.6" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.2" @@ -9624,8 +9315,8 @@ let sources."supports-color-7.2.0" ]; }) - sources."jest-leak-detector-27.4.2" - (sources."jest-matcher-utils-27.4.2" // { + sources."jest-leak-detector-27.4.6" + (sources."jest-matcher-utils-27.4.6" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.2" @@ -9635,7 +9326,7 @@ let sources."supports-color-7.2.0" ]; }) - (sources."jest-message-util-27.4.2" // { + (sources."jest-message-util-27.4.6" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.2" @@ -9646,10 +9337,10 @@ let sources."supports-color-7.2.0" ]; }) - sources."jest-mock-27.4.2" + sources."jest-mock-27.4.6" sources."jest-pnp-resolver-1.2.2" sources."jest-regex-util-27.4.0" - (sources."jest-resolve-27.4.5" // { + (sources."jest-resolve-27.4.6" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.2" @@ -9660,8 +9351,8 @@ let sources."supports-color-7.2.0" ]; }) - sources."jest-resolve-dependencies-27.4.5" - (sources."jest-runner-27.4.5" // { + sources."jest-resolve-dependencies-27.4.6" + (sources."jest-runner-27.4.6" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.2" @@ -9671,7 +9362,7 @@ let sources."supports-color-7.2.0" ]; }) - (sources."jest-runtime-27.4.5" // { + (sources."jest-runtime-27.4.6" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.2" @@ -9683,7 +9374,7 @@ let ]; }) sources."jest-serializer-27.4.0" - (sources."jest-snapshot-27.4.5" // { + (sources."jest-snapshot-27.4.6" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.2" @@ -9703,10 +9394,10 @@ let sources."supports-color-7.2.0" ]; }) - (sources."jest-validate-27.4.2" // { + (sources."jest-validate-27.4.6" // { dependencies = [ sources."ansi-styles-4.3.0" - sources."camelcase-6.2.1" + sources."camelcase-6.3.0" sources."chalk-4.1.2" sources."color-convert-2.0.1" sources."color-name-1.1.4" @@ -9714,7 +9405,7 @@ let sources."supports-color-7.2.0" ]; }) - (sources."jest-watcher-27.4.2" // { + (sources."jest-watcher-27.4.6" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.2" @@ -9724,7 +9415,7 @@ let sources."supports-color-7.2.0" ]; }) - (sources."jest-worker-27.4.5" // { + (sources."jest-worker-27.4.6" // { dependencies = [ sources."has-flag-4.0.0" sources."supports-color-8.1.1" @@ -9753,7 +9444,7 @@ let ]; }) sources."makeerror-1.0.12" - sources."marked-3.0.8" + sources."marked-4.0.12" sources."merge-stream-2.0.0" sources."merge2-1.4.1" sources."micromatch-4.0.4" @@ -9796,20 +9487,19 @@ let sources."path-parse-1.0.7" sources."path-type-4.0.0" sources."picocolors-1.0.0" - sources."picomatch-2.3.0" + sources."picomatch-2.3.1" sources."pify-4.0.1" - sources."pirates-4.0.4" + sources."pirates-4.0.5" sources."pkg-dir-4.2.0" - sources."prebuild-install-7.0.0" + sources."prebuild-install-7.0.1" sources."prelude-ls-1.2.1" - (sources."pretty-format-27.4.2" // { + (sources."pretty-format-27.4.6" // { dependencies = [ sources."ansi-regex-5.0.1" sources."ansi-styles-5.2.0" ]; }) sources."process-nextick-args-2.0.1" - sources."progress-2.0.3" sources."prompts-2.4.2" sources."psl-1.8.0" sources."pump-3.0.0" @@ -9832,7 +9522,7 @@ let ]; }) sources."require-directory-2.1.1" - sources."resolve-1.20.0" + sources."resolve-1.22.0" sources."resolve-cwd-3.0.0" sources."resolve-from-5.0.0" sources."resolve.exports-1.1.0" @@ -9847,10 +9537,10 @@ let sources."set-blocking-2.0.0" sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" - sources."shiki-0.9.15" + sources."shiki-0.10.0" sources."signal-exit-3.0.6" sources."simple-concat-1.0.1" - sources."simple-get-4.0.0" + sources."simple-get-4.0.1" sources."sisteransi-1.0.5" sources."slash-2.0.0" sources."slip-1.0.2" @@ -9885,6 +9575,7 @@ let sources."supports-color-7.2.0" ]; }) + sources."supports-preserve-symlinks-flag-1.0.0" sources."symbol-tree-3.2.4" sources."tar-fs-2.1.1" (sources."tar-stream-2.2.0" // { @@ -9910,12 +9601,12 @@ let sources."type-detect-4.0.8" sources."type-fest-0.20.2" sources."typedarray-to-buffer-3.1.5" - sources."typedoc-0.22.10" - sources."typedoc-plugin-markdown-3.11.8" + sources."typedoc-0.22.11" + sources."typedoc-plugin-markdown-3.11.12" sources."typedoc-plugin-no-inherit-1.3.1" sources."typedoc-plugin-sourcefile-url-1.0.6" - sources."typescript-4.5.4" - sources."uglify-js-3.14.5" + sources."typescript-4.5.5" + sources."uglify-js-3.15.0" sources."unicode-canonical-property-names-ecmascript-2.0.0" sources."unicode-match-property-ecmascript-2.0.0" sources."unicode-match-property-value-ecmascript-2.0.0" @@ -9924,7 +9615,7 @@ let sources."uri-js-4.4.1" sources."util-deprecate-1.0.2" sources."v8-compile-cache-2.3.0" - (sources."v8-to-istanbul-8.1.0" // { + (sources."v8-to-istanbul-8.1.1" // { dependencies = [ sources."source-map-0.7.3" ]; @@ -9973,7 +9664,7 @@ let }) ]; }) - sources."zigbee2mqtt-frontend-0.6.67" + sources."zigbee2mqtt-frontend-0.6.71" ]; buildInputs = globalBuildInputs; meta = { From dc211d3c4c7fdb344c7cb49171e807c5c5531970 Mon Sep 17 00:00:00 2001 From: Rodney Lorrimar Date: Wed, 20 Oct 2021 19:26:02 +0800 Subject: [PATCH 026/214] ddccontrol: 0.5.2 -> 0.6.0 --- pkgs/tools/misc/ddccontrol/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/misc/ddccontrol/default.nix b/pkgs/tools/misc/ddccontrol/default.nix index 2a85c0dc2b8f..6a64b4a933f9 100644 --- a/pkgs/tools/misc/ddccontrol/default.nix +++ b/pkgs/tools/misc/ddccontrol/default.nix @@ -12,13 +12,13 @@ stdenv.mkDerivation rec { pname = "ddccontrol"; - version = "0.5.2"; + version = "0.6.0"; src = fetchFromGitHub { owner = "ddccontrol"; repo = "ddccontrol"; - rev = "0.5.2"; - sha256 = "sha256-kul0sjbwbCwadvrccG3KwL/fKWACFUg74QGvgfWE4FQ="; + rev = version; + sha256 = "00pmnzvd4l3w6chzw41mrf1pd7lrcwi1n7320bnq20rn8hsnbnxk"; }; nativeBuildInputs = [ From 84b9af46cfc5b9d7349c02927efba8e6e68f6a61 Mon Sep 17 00:00:00 2001 From: Rodney Lorrimar Date: Wed, 24 Nov 2021 09:56:18 +0800 Subject: [PATCH 027/214] ddccontrol: Ensure that /etc files are included in package --- pkgs/tools/misc/ddccontrol/default.nix | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/misc/ddccontrol/default.nix b/pkgs/tools/misc/ddccontrol/default.nix index 6a64b4a933f9..f89626c55ffd 100644 --- a/pkgs/tools/misc/ddccontrol/default.nix +++ b/pkgs/tools/misc/ddccontrol/default.nix @@ -39,10 +39,17 @@ stdenv.mkDerivation rec { ]; prePatch = '' - oldPath="\$""{datadir}/ddccontrol-db" - newPath="${ddccontrol-db}/share/ddccontrol-db" - sed -i -e "s|$oldPath|$newPath|" configure.ac - sed -i -e "s/chmod 4711/chmod 0711/" src/ddcpci/Makefile* + substituteInPlace configure.ac \ + --replace \ + "\$""{datadir}/ddccontrol-db" \ + "${ddccontrol-db}/share/ddccontrol-db" + + substituteInPlace src/ddcpci/Makefile.am \ + --replace "chmod 4711" "chmod 0711" + '' + lib.optionalString (lib.versionAtLeast "0.6.0" version) '' + # Upstream PR: https://github.com/ddccontrol/ddccontrol/pull/115 + substituteInPlace src/lib/Makefile.am \ + --replace "/etc/" "\$""{sysconfdir}/" ''; preConfigure = '' From d9b8919e34e0460dd1a098b6cc033f34c6ab67e8 Mon Sep 17 00:00:00 2001 From: Rodney Lorrimar Date: Wed, 20 Oct 2021 19:26:28 +0800 Subject: [PATCH 028/214] nixos/ddccontrol: Ensure that i2c_dev module is loaded --- nixos/modules/services/hardware/ddccontrol.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/nixos/modules/services/hardware/ddccontrol.nix b/nixos/modules/services/hardware/ddccontrol.nix index 766bf12ee9f0..f0b5a9c81960 100644 --- a/nixos/modules/services/hardware/ddccontrol.nix +++ b/nixos/modules/services/hardware/ddccontrol.nix @@ -20,6 +20,9 @@ in ###### implementation config = lib.mkIf cfg.enable { + # Load the i2c-dev module + boot.kernelModules = [ "i2c_dev" ]; + # Give users access to the "gddccontrol" tool environment.systemPackages = [ pkgs.ddccontrol From 26216a3fbd352c9ccf299a6d66044af2add5e7ea Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 2 Feb 2022 02:14:50 +0000 Subject: [PATCH 029/214] selene: 0.15.0 -> 0.16.0 --- pkgs/development/tools/selene/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/selene/default.nix b/pkgs/development/tools/selene/default.nix index dd936781d9d9..37071321f510 100644 --- a/pkgs/development/tools/selene/default.nix +++ b/pkgs/development/tools/selene/default.nix @@ -10,16 +10,16 @@ rustPlatform.buildRustPackage rec { pname = "selene"; - version = "0.15.0"; + version = "0.16.0"; src = fetchFromGitHub { owner = "kampfkarren"; repo = pname; rev = version; - sha256 = "sha256-tA1exZ97N2tAagAljt+MOSGh6objOiqbZXUaBZ62Sls="; + sha256 = "sha256-S0EeFJS90bzQ7C+hN4CyZ7l9wmizT2d3P6utshI5JWs="; }; - cargoSha256 = "sha256-4vCKiTWwnibNK6/S1GOYRurgm2Aq1e9o4rAmp0hqGeA="; + cargoSha256 = "sha256-3J1Q595LxAI0LBP4/cLHDrMbZBnoA2+OSr8/erQcN+0="; nativeBuildInputs = lib.optional robloxSupport pkg-config; From bbcdceed4d78cc5367ad354c667200f7c5079ef0 Mon Sep 17 00:00:00 2001 From: Nick Cao Date: Wed, 2 Feb 2022 11:50:18 +0800 Subject: [PATCH 030/214] libnatpmp: fix cross compilation --- pkgs/development/libraries/libnatpmp/default.nix | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/pkgs/development/libraries/libnatpmp/default.nix b/pkgs/development/libraries/libnatpmp/default.nix index 36c1c0dc098c..9672d1cceca7 100644 --- a/pkgs/development/libraries/libnatpmp/default.nix +++ b/pkgs/development/libraries/libnatpmp/default.nix @@ -10,13 +10,10 @@ stdenv.mkDerivation rec { sha256 = "1c1n8n7mp0amsd6vkz32n8zj3vnsckv308bb7na0dg0r8969rap1"; }; - postPatch = '' - substituteInPlace Makefile \ - --replace "gcc" "${stdenv.cc.targetPrefix}cc" \ - --replace "ar" "${stdenv.cc.targetPrefix}ar" - ''; - - makeFlags = [ "INSTALLPREFIX=$(out)" ]; + makeFlags = [ + "INSTALLPREFIX=$(out)" + "CC:=$(CC)" + ]; postFixup = '' chmod +x $out/lib/* From ede5fff9295a9cfb1af5c54e6e983f6bd0c09722 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Tue, 1 Feb 2022 23:02:42 +0800 Subject: [PATCH 031/214] nixos/pantheon: stop setting GTK_CSD=1 See https://github.com/elementary/gala/issues/244 --- nixos/modules/services/x11/desktop-managers/pantheon.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/nixos/modules/services/x11/desktop-managers/pantheon.nix b/nixos/modules/services/x11/desktop-managers/pantheon.nix index 980a6b939d5a..70911e02f7e0 100644 --- a/nixos/modules/services/x11/desktop-managers/pantheon.nix +++ b/nixos/modules/services/x11/desktop-managers/pantheon.nix @@ -224,7 +224,6 @@ in programs.file-roller.package = pkgs.pantheon.file-roller; # Settings from elementary-default-settings - environment.sessionVariables.GTK_CSD = "1"; environment.etc."gtk-3.0/settings.ini".source = "${pkgs.pantheon.elementary-default-settings}/etc/gtk-3.0/settings.ini"; xdg.portal.extraPortals = with pkgs.pantheon; [ From be1e44b7d2319b96973f0d7cad6db29ce4831478 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Wed, 2 Feb 2022 09:47:36 +0800 Subject: [PATCH 032/214] pantheon.elementary-photos: 2.7.3 -> 2.7.4 --- pkgs/desktops/pantheon/apps/elementary-photos/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/desktops/pantheon/apps/elementary-photos/default.nix b/pkgs/desktops/pantheon/apps/elementary-photos/default.nix index 55a42f806447..1ff9157b301b 100644 --- a/pkgs/desktops/pantheon/apps/elementary-photos/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-photos/default.nix @@ -32,13 +32,13 @@ stdenv.mkDerivation rec { pname = "elementary-photos"; - version = "2.7.3"; + version = "2.7.4"; src = fetchFromGitHub { owner = "elementary"; repo = "photos"; rev = version; - sha256 = "sha256-ja4ElW0FNm9oNyn+00SdI2Cxep6LyWTYM8Blc6bnuiY="; + sha256 = "sha256-NhF/WgS6IOwgALSCNyFNxz8ROVTb+mUX+lBtnWEyhEI="; }; nativeBuildInputs = [ From 246f4949ede10370f98742e815172858509e4364 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Wed, 2 Feb 2022 09:53:39 +0800 Subject: [PATCH 033/214] pkgs/pantheon: minor formatting Simply because all other Pantheon packages have addressed these formatting. --- .../pantheon/apps/elementary-videos/default.nix | 11 ++++++----- pkgs/desktops/pantheon/default.nix | 4 +++- .../desktop/wingpanel-indicators/power/default.nix | 4 ++-- 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/pkgs/desktops/pantheon/apps/elementary-videos/default.nix b/pkgs/desktops/pantheon/apps/elementary-videos/default.nix index 494b50605e97..cb1ea291225b 100644 --- a/pkgs/desktops/pantheon/apps/elementary-videos/default.nix +++ b/pkgs/desktops/pantheon/apps/elementary-videos/default.nix @@ -40,21 +40,22 @@ stdenv.mkDerivation rec { wrapGAppsHook ]; - buildInputs = with gst_all_1; [ + buildInputs = [ clutter-gst clutter-gtk elementary-icon-theme granite + gtk3 + libgee + libhandy + ] ++ (with gst_all_1; [ gst-libav gst-plugins-bad gst-plugins-base gst-plugins-good gst-plugins-ugly gstreamer - gtk3 - libgee - libhandy - ]; + ]); postPatch = '' chmod +x meson/post_install.py diff --git a/pkgs/desktops/pantheon/default.nix b/pkgs/desktops/pantheon/default.nix index 617c6ed086da..e005f08ba30a 100644 --- a/pkgs/desktops/pantheon/default.nix +++ b/pkgs/desktops/pantheon/default.nix @@ -161,7 +161,9 @@ lib.makeScope pkgs.newScope (self: with self; { wingpanel-indicator-notifications = callPackage ./desktop/wingpanel-indicators/notifications { }; - wingpanel-indicator-power = callPackage ./desktop/wingpanel-indicators/power { }; + wingpanel-indicator-power = callPackage ./desktop/wingpanel-indicators/power { + inherit (gnome) gnome-power-manager; + }; wingpanel-indicator-session = callPackage ./desktop/wingpanel-indicators/session { }; diff --git a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/power/default.nix b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/power/default.nix index 6c300536b2f8..ac9803495574 100644 --- a/pkgs/desktops/pantheon/desktop/wingpanel-indicators/power/default.nix +++ b/pkgs/desktops/pantheon/desktop/wingpanel-indicators/power/default.nix @@ -3,7 +3,7 @@ , fetchFromGitHub , substituteAll , nix-update-script -, gnome +, gnome-power-manager , pkg-config , meson , python3 @@ -33,7 +33,7 @@ stdenv.mkDerivation rec { patches = [ (substituteAll { src = ./fix-paths.patch; - gnome_power_manager = gnome.gnome-power-manager; + gnome_power_manager = gnome-power-manager; }) ]; From 9137abbea8bef42c6412eaf72682f6e00340ce64 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Wed, 2 Feb 2022 10:04:13 +0800 Subject: [PATCH 034/214] pkgs/pantheon: remove old aliases This is mostly Pantheon version of e703bc0ade3b6a3669f77d0acede1c2047e51fc2, we move the aliases outside of the scope. --- pkgs/desktops/pantheon/default.nix | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/pkgs/desktops/pantheon/default.nix b/pkgs/desktops/pantheon/default.nix index e005f08ba30a..29192a4dd80a 100644 --- a/pkgs/desktops/pantheon/default.nix +++ b/pkgs/desktops/pantheon/default.nix @@ -234,18 +234,20 @@ lib.makeScope pkgs.newScope (self: with self; { # Please call these packages in pkgs/top-level/all-packages.nix instead of this file. # https://github.com/NixOS/nixpkgs/issues/115222#issuecomment-906868654 -} // lib.optionalAttrs (config.allowAliases or true) { +}) // lib.optionalAttrs (config.allowAliases or true) { ### ALIASES - inherit (pkgs) vala; # added 2019-10-10 + # They need to be outside the scope or they will shadow the attributes from parent scope. - cerbere = throw "Cerbere is now obsolete https://github.com/elementary/cerbere/releases/tag/2.5.1."; + vala = throw "The ‘pantheon.vala’ alias was removed on 2022-02-02, please use ‘pkgs.vala’ directly."; # added 2019-10-10 - elementary-screenshot-tool = elementary-screenshot; # added 2021-07-21 + cerbere = throw "Cerbere is now obsolete https://github.com/elementary/cerbere/releases/tag/2.5.1."; # added 2020-04-06 + + elementary-screenshot-tool = throw "The ‘pantheon.elementary-screenshot-tool’ alias was removed on 2022-02-02, please use ‘pantheon.elementary-screenshot’ directly."; # added 2021-07-21 extra-elementary-contracts = throw "extra-elementary-contracts has been removed as all contracts have been upstreamed."; # added 2021-12-01 - inherit (pkgs) notes-up; # added 2021-12-18 + notes-up = throw "The ‘pantheon.notes-up’ alias was removed on 2022-02-02, please use ‘pkgs.notes-up’ directly."; # added 2021-12-18 -}) +} From 4fcca9b41fd46f2c67b282c3d79abffe2a72f730 Mon Sep 17 00:00:00 2001 From: Bobby Rong Date: Wed, 2 Feb 2022 10:27:08 +0800 Subject: [PATCH 035/214] nixos/pantheon/files: remove This shouldn't appear in search.nixos.org. --- nixos/modules/module-list.nix | 1 - nixos/modules/rename.nix | 3 +++ nixos/modules/services/desktops/pantheon/files.nix | 13 ------------- 3 files changed, 3 insertions(+), 14 deletions(-) delete mode 100644 nixos/modules/services/desktops/pantheon/files.nix diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index 1e3b8f3099b6..c8b45724b3c1 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -356,7 +356,6 @@ ./services/desktops/cpupower-gui.nix ./services/desktops/dleyna-renderer.nix ./services/desktops/dleyna-server.nix - ./services/desktops/pantheon/files.nix ./services/desktops/espanso.nix ./services/desktops/flatpak.nix ./services/desktops/geoclue2.nix diff --git a/nixos/modules/rename.nix b/nixos/modules/rename.nix index 31538c422192..17ec13b770a8 100644 --- a/nixos/modules/rename.nix +++ b/nixos/modules/rename.nix @@ -60,6 +60,9 @@ with lib; (mkRemovedOptionModule [ "services" "moinmoin" ] "The corresponding package was removed from nixpkgs.") (mkRemovedOptionModule [ "services" "mwlib" ] "The corresponding package was removed from nixpkgs.") (mkRemovedOptionModule [ "services" "osquery" ] "The osquery module has been removed") + (mkRemovedOptionModule [ "services" "pantheon" "files" ] '' + This module was removed, please add pkgs.pantheon.elementary-files to environment.systemPackages directly. + '') (mkRemovedOptionModule [ "services" "prey" ] '' prey-bash-client is deprecated upstream '') diff --git a/nixos/modules/services/desktops/pantheon/files.nix b/nixos/modules/services/desktops/pantheon/files.nix deleted file mode 100644 index 8cee9f42b62f..000000000000 --- a/nixos/modules/services/desktops/pantheon/files.nix +++ /dev/null @@ -1,13 +0,0 @@ -# pantheon files daemon. - -{ config, pkgs, lib, ... }: - -with lib; - -{ - - imports = [ - (mkRemovedOptionModule [ "services" "pantheon" "files" "enable" ] "Use `environment.systemPackages [ pkgs.pantheon.elementary-files ];`") - ]; - -} From 91b63fa2086a3fc496694de091316ced51c0cb6d Mon Sep 17 00:00:00 2001 From: FliegendeWurst <2012gdwu+github@posteo.de> Date: Wed, 2 Feb 2022 11:55:49 +0100 Subject: [PATCH 036/214] patchutils: disable parallel build --- pkgs/tools/text/patchutils/generic.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/tools/text/patchutils/generic.nix b/pkgs/tools/text/patchutils/generic.nix index 923dd06d1826..d1cd4334e119 100644 --- a/pkgs/tools/text/patchutils/generic.nix +++ b/pkgs/tools/text/patchutils/generic.nix @@ -15,6 +15,9 @@ stdenv.mkDerivation rec { buildInputs = [ perl ] ++ extraBuildInputs; hardeningDisable = [ "format" ]; + # tests fail when building in parallel + enableParallelBuilding = false; + postInstall = '' for bin in $out/bin/{splitdiff,rediff,editdiff,dehtmldiff}; do wrapProgram "$bin" \ From 6282d34ad4eeaea6b42a9e5b4fdbf3d4d34bb30a Mon Sep 17 00:00:00 2001 From: FliegendeWurst <2012gdwu+github@posteo.de> Date: Wed, 2 Feb 2022 11:57:19 +0100 Subject: [PATCH 037/214] ocamlPackages.camlidl: disable parallel build --- pkgs/development/tools/ocaml/camlidl/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/tools/ocaml/camlidl/default.nix b/pkgs/development/tools/ocaml/camlidl/default.nix index 36a1c7f755e1..1c3da92273ce 100644 --- a/pkgs/development/tools/ocaml/camlidl/default.nix +++ b/pkgs/development/tools/ocaml/camlidl/default.nix @@ -15,6 +15,9 @@ stdenv.mkDerivation rec { buildInputs = [ ocaml ]; + # build fails otherwise + enableParallelBuilding = false; + preBuild = '' mv config/Makefile.unix config/Makefile substituteInPlace config/Makefile --replace BINDIR=/usr/local/bin BINDIR=$out From 049e715ba7f5fb00dcf7a064b0f9b559aee52c01 Mon Sep 17 00:00:00 2001 From: FliegendeWurst <2012gdwu+github@posteo.de> Date: Wed, 2 Feb 2022 11:59:01 +0100 Subject: [PATCH 038/214] deadpixi-sam: disable parallel build --- pkgs/applications/editors/deadpixi-sam/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/applications/editors/deadpixi-sam/default.nix b/pkgs/applications/editors/deadpixi-sam/default.nix index e17fb402ed38..3f84666fe029 100644 --- a/pkgs/applications/editors/deadpixi-sam/default.nix +++ b/pkgs/applications/editors/deadpixi-sam/default.nix @@ -20,6 +20,8 @@ stdenv.mkDerivation rec { CFLAGS = "-D_DARWIN_C_SOURCE"; makeFlags = [ "DESTDIR=$(out)" ]; buildInputs = [ libX11 libXi libXt libXft ]; + # build fails when run in parallel + enableParallelBuilding = false; postInstall = '' mkdir -p $out/share/applications From 3d6155a8a7837bef5288643c9b2cdd95b40da4e2 Mon Sep 17 00:00:00 2001 From: FliegendeWurst <2012gdwu+github@posteo.de> Date: Wed, 2 Feb 2022 12:03:03 +0100 Subject: [PATCH 039/214] cdesktopenv: disable parallel build --- pkgs/desktops/cdesktopenv/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/desktops/cdesktopenv/default.nix b/pkgs/desktops/cdesktopenv/default.nix index 7715f4f232ad..71b661f1265b 100644 --- a/pkgs/desktops/cdesktopenv/default.nix +++ b/pkgs/desktops/cdesktopenv/default.nix @@ -46,6 +46,8 @@ in stdenv.mkDerivation rec { bison ncompress gawk autoPatchelfHook makeWrapper fakeroot rpcsvc-proto ]; + # build fails otherwise + enableParallelBuilding = false; makeFlags = [ "World" From ee1c5b7856d3a08516f8b7f7cb0425805e8c410b Mon Sep 17 00:00:00 2001 From: Wout Mertens Date: Wed, 2 Feb 2022 12:07:18 +0100 Subject: [PATCH 040/214] chromium: no need to eval makeWrapper --- pkgs/applications/networking/browsers/chromium/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/chromium/default.nix b/pkgs/applications/networking/browsers/chromium/default.nix index f296da05c313..b3738ed8c1dd 100644 --- a/pkgs/applications/networking/browsers/chromium/default.nix +++ b/pkgs/applications/networking/browsers/chromium/default.nix @@ -182,8 +182,8 @@ in stdenv.mkDerivation { in with lib; '' mkdir -p "$out/bin" - eval makeWrapper "${browserBinary}" "$out/bin/chromium" \ - --add-flags ${escapeShellArg (escapeShellArg commandLineArgs)} \ + makeWrapper "${browserBinary}" "$out/bin/chromium" \ + --add-flags ${escapeShellArg commandLineArgs} \ --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--enable-features=UseOzonePlatform --ozone-platform=wayland}}" ed -v -s "$out/bin/chromium" << EOF From 3b31741229a12f851904f42ef26f78dd24f55725 Mon Sep 17 00:00:00 2001 From: FliegendeWurst <2012gdwu+github@posteo.de> Date: Wed, 2 Feb 2022 12:09:32 +0100 Subject: [PATCH 041/214] ocamlPackages.stdcompat: disable parallel build --- pkgs/development/ocaml-modules/stdcompat/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/ocaml-modules/stdcompat/default.nix b/pkgs/development/ocaml-modules/stdcompat/default.nix index df5c1a58b17b..2e6266957148 100644 --- a/pkgs/development/ocaml-modules/stdcompat/default.nix +++ b/pkgs/development/ocaml-modules/stdcompat/default.nix @@ -12,6 +12,8 @@ stdenv.mkDerivation rec { }; buildInputs = [ ocaml findlib ]; + # build fails otherwise + enableParallelBuilding = false; configureFlags = "--libdir=$(OCAMLFIND_DESTDIR)"; From 6f930f18f041ea291e2878229e747c5eaded49d0 Mon Sep 17 00:00:00 2001 From: FliegendeWurst <2012gdwu+github@posteo.de> Date: Wed, 2 Feb 2022 12:14:36 +0100 Subject: [PATCH 042/214] ocamlPackages.camlp4: disable parallel build --- pkgs/development/tools/ocaml/camlp4/default.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/tools/ocaml/camlp4/default.nix b/pkgs/development/tools/ocaml/camlp4/default.nix index acf1730af1bc..97a769628fe0 100644 --- a/pkgs/development/tools/ocaml/camlp4/default.nix +++ b/pkgs/development/tools/ocaml/camlp4/default.nix @@ -55,6 +55,9 @@ stdenv.mkDerivation rec { buildInputs = [ which ocaml ocamlbuild ]; + # build fails otherwise + enableParallelBuilding = false; + dontAddPrefix = true; preConfigure = '' From ccc26c651f3615f73a4ddee0dccbdadcc1d0c89d Mon Sep 17 00:00:00 2001 From: FliegendeWurst <2012gdwu+github@posteo.de> Date: Wed, 2 Feb 2022 12:19:55 +0100 Subject: [PATCH 043/214] mlton: disable parallel build --- pkgs/development/compilers/mlton/from-git-source.nix | 3 +++ 1 file changed, 3 insertions(+) diff --git a/pkgs/development/compilers/mlton/from-git-source.nix b/pkgs/development/compilers/mlton/from-git-source.nix index ec0b96bbf23a..b91e6c7480da 100644 --- a/pkgs/development/compilers/mlton/from-git-source.nix +++ b/pkgs/development/compilers/mlton/from-git-source.nix @@ -21,6 +21,9 @@ stdenv.mkDerivation { buildInputs = [mltonBootstrap gmp]; + # build fails otherwise + enableParallelBuilding = false; + preBuild = '' find . -type f | grep -v -e '\.tgz''$' | xargs sed -i "s@/usr/bin/env bash@$(type -p bash)@" sed -i "s|/tmp|$TMPDIR|" bin/regression From 3994e8f9f07e30f9828366b02777ead9ec515467 Mon Sep 17 00:00:00 2001 From: Yurii Matsiuk Date: Wed, 26 Jan 2022 12:59:04 +0100 Subject: [PATCH 044/214] i3status-rust: add missing iproute and iw --- pkgs/applications/window-managers/i3/status-rust.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/window-managers/i3/status-rust.nix b/pkgs/applications/window-managers/i3/status-rust.nix index 803d5154bce5..a194a1326690 100644 --- a/pkgs/applications/window-managers/i3/status-rust.nix +++ b/pkgs/applications/window-managers/i3/status-rust.nix @@ -9,6 +9,8 @@ , openssl , ethtool , lm_sensors +, iw +, iproute2 }: rustPlatform.buildRustPackage rec { @@ -45,7 +47,7 @@ rustPlatform.buildRustPackage rec { ''; postFixup = '' - wrapProgram $out/bin/i3status-rs --prefix PATH : "${ethtool}/bin" + wrapProgram $out/bin/i3status-rs --prefix PATH : ${lib.makeBinPath [ iproute2 ethtool iw ]} ''; # Currently no tests are implemented, so we avoid building the package twice From 88326c18bcb4aefa2b7c85637bb841da389641ed Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 2 Feb 2022 18:07:09 +0100 Subject: [PATCH 045/214] python3Packages.grapheme: disable tests --- .../python-modules/grapheme/default.nix | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/grapheme/default.nix b/pkgs/development/python-modules/grapheme/default.nix index 54e0b45bbc34..965b1a1d2197 100644 --- a/pkgs/development/python-modules/grapheme/default.nix +++ b/pkgs/development/python-modules/grapheme/default.nix @@ -1,8 +1,13 @@ -{ lib, buildPythonPackage, fetchPypi, pythonOlder }: +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder +}: buildPythonPackage rec { pname = "grapheme"; version = "0.6.0"; + format = "setuptools"; disabled = pythonOlder "3.7"; @@ -11,12 +16,18 @@ buildPythonPackage rec { sha256 = "1jiwc3w05c8kh22s3zk7a8km8na3plqc5zimb2qcyxxy3grbkhj4"; }; - pythonImportsCheck = [ "grapheme" ]; + # Tests are no available on PyPI + # https://github.com/alvinlindstam/grapheme/issues/18 + doCheck = false; + + pythonImportsCheck = [ + "grapheme" + ]; meta = with lib; { + description = "Python package for grapheme aware string handling"; homepage = "https://github.com/alvinlindstam/grapheme"; - description = "A python package for grapheme aware string handling"; - maintainers = with maintainers; [ creator54 ]; license = licenses.mit; + maintainers = with maintainers; [ creator54 ]; }; } From d3637a6e7b5379d935104d379c761b870690823b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 2 Feb 2022 18:25:55 +0100 Subject: [PATCH 046/214] python3Packages.patrowl4py: 1.1.7 -> 1.1.9 --- pkgs/development/python-modules/patrowl4py/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/patrowl4py/default.nix b/pkgs/development/python-modules/patrowl4py/default.nix index 3dc1fc038bc7..22de8feb0e74 100644 --- a/pkgs/development/python-modules/patrowl4py/default.nix +++ b/pkgs/development/python-modules/patrowl4py/default.nix @@ -21,13 +21,13 @@ buildPythonPackage rec { pname = "patrowl4py"; - version = "1.1.7"; + version = "1.1.9"; src = fetchFromGitHub { owner = "Patrowl"; repo = "Patrowl4py"; rev = version; - sha256 = "19r9ym31bcaxcrv35gnfx5k8mn5lyascqzdr312rzc7ikbhcj73s"; + sha256 = "sha256-ZGvntLbXIWmL0WoT+kQoNT6gDPgsSKwHQQjYlarvnKo="; }; propagatedBuildInputs = [ From e6e371ea723163c3aaabf240005b41d1fd76b688 Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Wed, 2 Feb 2022 13:07:04 -0500 Subject: [PATCH 047/214] marlin-calc: mark as broken on darwin --- pkgs/tools/misc/marlin-calc/default.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/tools/misc/marlin-calc/default.nix b/pkgs/tools/misc/marlin-calc/default.nix index 0e75af62231c..cdcdad99477a 100644 --- a/pkgs/tools/misc/marlin-calc/default.nix +++ b/pkgs/tools/misc/marlin-calc/default.nix @@ -27,5 +27,6 @@ stdenv.mkDerivation { license = licenses.gpl3; maintainers = with maintainers; [ gebner ]; platforms = platforms.unix; + broken = stdenv.isDarwin; # never built on Hydra https://hydra.nixos.org/job/nixpkgs/trunk/marlin-calc.x86_64-darwin }; } From e21174bcf5db2ad7d17a4ad89564b36978e9f1ca Mon Sep 17 00:00:00 2001 From: Stefan Frijters Date: Wed, 2 Feb 2022 19:42:36 +0100 Subject: [PATCH 048/214] yabridge: Add upstream fix for recent wine 7.1 update --- pkgs/tools/audio/yabridge/default.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/tools/audio/yabridge/default.nix b/pkgs/tools/audio/yabridge/default.nix index f08832b02ac8..40c3b594dc98 100644 --- a/pkgs/tools/audio/yabridge/default.nix +++ b/pkgs/tools/audio/yabridge/default.nix @@ -1,6 +1,7 @@ { lib , multiStdenv , fetchFromGitHub +, fetchpatch , substituteAll , pkgsi686Linux , libnotify @@ -77,6 +78,14 @@ in multiStdenv.mkDerivation rec { libxcb32 = pkgsi686Linux.xorg.libxcb; inherit libnotify wine; }) + # Remove with next yabridge update + (fetchpatch { + name = "fix-for-wine-7.1.patch"; + url = "https://github.com/robbert-vdh/yabridge/commit/de470d345ab206b08f6d4a147b6af1d285a4211f.patch"; + sha256 = "sha256-xJx1zvxD+DIjbkm7Ovoy4RaAvjx936/j/7AYUPh/kOo="; + includes = [ "src/wine-host/xdnd-proxy.cpp" ]; + }) + ]; postPatch = '' From 30c8f7c42d12cab1d3d71f668ad238b09a1ab506 Mon Sep 17 00:00:00 2001 From: Patryk Wychowaniec Date: Wed, 2 Feb 2022 20:48:35 +0100 Subject: [PATCH 049/214] nixos/kvmgt: add myself to maintainers I've got a use case and compatible hardware, so why not :-) --- nixos/modules/virtualisation/kvmgt.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/virtualisation/kvmgt.nix b/nixos/modules/virtualisation/kvmgt.nix index 72bd2c24e566..5e7a73bec902 100644 --- a/nixos/modules/virtualisation/kvmgt.nix +++ b/nixos/modules/virtualisation/kvmgt.nix @@ -82,5 +82,5 @@ in { }; }; - meta.maintainers = with maintainers; [ ]; + meta.maintainers = with maintainers; [ patryk27 ]; } From 3e77ca677f6d7e8168cdddd6207a9264cae86fe6 Mon Sep 17 00:00:00 2001 From: roblabla Date: Wed, 2 Feb 2022 21:41:12 +0100 Subject: [PATCH 050/214] ghidra: 10.1.1 -> 10.1.2 --- pkgs/tools/security/ghidra/build.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/ghidra/build.nix b/pkgs/tools/security/ghidra/build.nix index 2e5311696d16..831ec3b6133e 100644 --- a/pkgs/tools/security/ghidra/build.nix +++ b/pkgs/tools/security/ghidra/build.nix @@ -19,13 +19,13 @@ let pkg_path = "$out/lib/ghidra"; pname = "ghidra"; - version = "10.1.1"; + version = "10.1.2"; src = fetchFromGitHub { owner = "NationalSecurityAgency"; repo = "Ghidra"; rev = "Ghidra_${version}_build"; - sha256 = "sha256-0hj9IVvTxgStCbfnTzqeKD+Q5GnGowDsIkMvk2GqJqY="; + sha256 = "sha256-gnSIXje0hUpAculNXAyiS7Twc5XWitMgYp7svyZQxzE="; }; desktopItem = makeDesktopItem { @@ -101,7 +101,7 @@ HERE ''; outputHashAlgo = "sha256"; outputHashMode = "recursive"; - outputHash = "sha256-Yxf6g908+fRRUh40PrwNUCTvxzlvSmwzE8R+3ZkRIvs="; + outputHash = "sha256-UHV7Z2HaVTOCY5U0zjUtkchJicrXMBfYBHvL8AA7NTg="; }; in stdenv.mkDerivation rec { @@ -172,6 +172,7 @@ in stdenv.mkDerivation rec { homepage = "https://ghidra-sre.org/"; platforms = [ "x86_64-linux" "x86_64-darwin" ]; license = licenses.asl20; + maintainers = [ "roblabla" ]; }; } From e9ac83ebb5fd3d8a8497a2015c5fb5278c506627 Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Wed, 2 Feb 2022 22:10:22 +0100 Subject: [PATCH 051/214] connman: 1.40 -> 1.41 Fixes CVE-2022-23096 Changelog: https://git.kernel.org/pub/scm/network/connman/connman.git/commit/?id=4a27c58ad8b1afd980ebe122ca178c7f659c025e --- pkgs/tools/networking/connman/connman.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/connman/connman.nix b/pkgs/tools/networking/connman/connman.nix index c92cceeabc6f..2e3fcca33e19 100644 --- a/pkgs/tools/networking/connman/connman.nix +++ b/pkgs/tools/networking/connman/connman.nix @@ -56,10 +56,10 @@ let inherit (lib) optionals; in stdenv.mkDerivation rec { pname = "connman"; - version = "1.40"; + version = "1.41"; src = fetchurl { url = "mirror://kernel/linux/network/connman/${pname}-${version}.tar.xz"; - sha256 = "sha256-GleufOI0qjoXRKrDvlwhIdmNzpmUQO+KucxO39XtyxI="; + sha256 = "sha256-eftA9P3VUwxFqo5ZL7Froj02dPOpjPELiaZXbxmN5Yk="; }; patches = lib.optionals stdenv.hostPlatform.isMusl [ From 9c087317e1b70142113912d989ce878c9b5abb40 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Feb 2022 23:01:39 +0100 Subject: [PATCH 052/214] esphome: 2022.1.2 -> 2022.1.3 --- pkgs/tools/misc/esphome/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/esphome/default.nix b/pkgs/tools/misc/esphome/default.nix index 537b964f6f0b..e87b88e63b54 100644 --- a/pkgs/tools/misc/esphome/default.nix +++ b/pkgs/tools/misc/esphome/default.nix @@ -17,14 +17,14 @@ let in with python.pkgs; buildPythonApplication rec { pname = "esphome"; - version = "2022.1.2"; + version = "2022.1.3"; format = "setuptools"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "sha256-hq+gYhDkEzIqgP4CcHRuA5A9694L3LeW9bditejfjm8="; + sha256 = "sha256-4ME6XiS0tNgxtbHbOXw0z/kOqjzv3pog48qTRGJSsww="; }; patches = [ From b8453874f0c00db2141e4bf8dd25650c54288e4a Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Thu, 3 Feb 2022 08:31:40 +1000 Subject: [PATCH 053/214] skopeo: 1.5.2 -> 1.6.0 https://github.com/containers/skopeo/releases/tag/v1.6.0 --- pkgs/development/tools/skopeo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/skopeo/default.nix b/pkgs/development/tools/skopeo/default.nix index 7b9a727c2ef0..5ec2ff7ac459 100644 --- a/pkgs/development/tools/skopeo/default.nix +++ b/pkgs/development/tools/skopeo/default.nix @@ -14,13 +14,13 @@ buildGoModule rec { pname = "skopeo"; - version = "1.5.2"; + version = "1.6.0"; src = fetchFromGitHub { rev = "v${version}"; owner = "containers"; repo = "skopeo"; - sha256 = "sha256-KleTvRQwQFr4rrRXFW2z4N7DXIT920O2gig6wmOFIKs="; + sha256 = "sha256-SXwIwBlajzcXJaB90aesPk6BTRUNLRXtx4FPuM7pcyU="; }; outputs = [ "out" "man" ]; From c9b3d27be060e6ae86aab03a6ac0c390a1676e13 Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Wed, 2 Feb 2022 23:45:51 +0100 Subject: [PATCH 054/214] stdenv.md: Call out that genericBuild has correct order Co-authored-by: Cole Helbling --- doc/stdenv/stdenv.chapter.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/stdenv/stdenv.chapter.md b/doc/stdenv/stdenv.chapter.md index 5e2248918753..974f8747936a 100644 --- a/doc/stdenv/stdenv.chapter.md +++ b/doc/stdenv/stdenv.chapter.md @@ -325,7 +325,7 @@ This generic command invokes a number of *phases*. Package builds are split into Each phase can be overridden in its entirety either by setting the environment variable `namePhase` to a string containing some shell commands to be executed, or by redefining the shell function `namePhase`. The former is convenient to override a phase from the derivation, while the latter is convenient from a build script. However, typically one only wants to *add* some commands to a phase, e.g. by defining `postInstall` or `preFixup`, as skipping some of the default actions may have unexpected consequences. The default script for each phase is defined in the file `pkgs/stdenv/generic/setup.sh`. -If you want to run all phases in `nix-shell`, you can invoke `genericBuild` yourself in the interactive shell. +While inside an interactive `nix-shell`, if you wanted to run all phases in the order they would be run in an actual build, you can invoke `genericBuild` yourself. ### Controlling phases {#ssec-controlling-phases} From f3654fb0bb87f292a7cc6d59bc1c0bf5a6d3de8e Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Tue, 25 Jan 2022 21:50:59 +0100 Subject: [PATCH 055/214] python3Packages.aiodiscover: 1.4.5 -> 1.4.7 --- .../python-modules/aiodiscover/default.nix | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/aiodiscover/default.nix b/pkgs/development/python-modules/aiodiscover/default.nix index 268654ea9baa..4e2b0c5897fc 100644 --- a/pkgs/development/python-modules/aiodiscover/default.nix +++ b/pkgs/development/python-modules/aiodiscover/default.nix @@ -3,6 +3,7 @@ , dnspython , fetchFromGitHub , ifaddr +, netifaces , pyroute2 , pytest-asyncio , pytestCheckHook @@ -11,18 +12,21 @@ buildPythonPackage rec { pname = "aiodiscover"; - version = "1.4.5"; + version = "1.4.7"; + format = "setuptools"; + disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "bdraco"; repo = pname; rev = "v${version}"; - sha256 = "sha256-QfeAEFB5WikuriBTcfFIgnJw5H4vEcGIVX47fyDb1Dk="; + sha256 = "sha256-NtiShZpPFl+elYNPLaKAg6uV8pDJv0pyR+NTUiFoMm0="; }; propagatedBuildInputs = [ dnspython + netifaces pyroute2 ifaddr ]; @@ -43,7 +47,9 @@ buildPythonPackage rec { "test_async_discover_hosts" ]; - pythonImportsCheck = ["aiodiscover"]; + pythonImportsCheck = [ + "aiodiscover" + ]; meta = with lib; { description = "Python module to discover hosts via ARP and PTR lookup"; From 7ce412eba26413953a4cf16c2ba554cab08b816b Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Feb 2022 20:05:33 +0100 Subject: [PATCH 056/214] python3Packages.aiohue: 3.0.11 -> 4.0.1 --- pkgs/development/python-modules/aiohue/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aiohue/default.nix b/pkgs/development/python-modules/aiohue/default.nix index 1f479311af05..2b0061875b75 100644 --- a/pkgs/development/python-modules/aiohue/default.nix +++ b/pkgs/development/python-modules/aiohue/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "aiohue"; - version = "3.0.11"; + version = "4.0.1"; src = fetchPypi { inherit pname version; - sha256 = "sha256-McC5DX3Cti9eGpPniywNY2DvbAqHSFwhek85TJN/zn0="; + sha256 = "sha256-wPqEubd+vUpdj7tM0CTPkW5kV4qlF19T+djlGrtA5h8="; }; propagatedBuildInputs = [ From 6c9dbe9a8979da6ce99a697268606f63d7c220a1 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Feb 2022 20:06:14 +0100 Subject: [PATCH 057/214] python3Packages.aiohwenergy: 0.7.0 -> 0.8.0 --- pkgs/development/python-modules/aiohwenergy/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aiohwenergy/default.nix b/pkgs/development/python-modules/aiohwenergy/default.nix index a3ec8edd6d9f..3e7c4c7b85a5 100644 --- a/pkgs/development/python-modules/aiohwenergy/default.nix +++ b/pkgs/development/python-modules/aiohwenergy/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "aiohwenergy"; - version = "0.7.0"; + version = "0.8.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "DCSBL"; repo = pname; rev = version; - sha256 = "0pgk9ky4kfb1kp0mpyxdinwql1q85a3bl5w34pr88wqdqdw467ms"; + sha256 = "sha256-WfkwIxyDzLNzhWNWST/V3iN9Bhu2oXDwGiA5UXCq5ho="; }; propagatedBuildInputs = [ From eda1a6c1b90145ede964c18d312eda9c11b7cb10 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Feb 2022 20:06:29 +0100 Subject: [PATCH 058/214] python3Packages.aiolookin: 0.0.4 -> 0.1.0 --- pkgs/development/python-modules/aiolookin/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aiolookin/default.nix b/pkgs/development/python-modules/aiolookin/default.nix index 0af203d8fb7b..2de513e6fbcb 100644 --- a/pkgs/development/python-modules/aiolookin/default.nix +++ b/pkgs/development/python-modules/aiolookin/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "aiolookin"; - version = "0.0.4"; + version = "0.1.0"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "ANMalko"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Kqys76c/9Mw3ETgF0N4rA9mz5DELwTMjAK38PPN8Ahs="; + sha256 = "sha256-l3A1fOydAUQ4arR7Zl/PDYksp53C/56fVVcz35q1hjY="; }; propagatedBuildInputs = [ From daa057683bdd132e95f066312a97333ad578ee06 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Feb 2022 20:07:55 +0100 Subject: [PATCH 059/214] python3Packages.async-upnp-client: 0.23.1 -> 0.23.4 --- pkgs/development/python-modules/async-upnp-client/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/async-upnp-client/default.nix b/pkgs/development/python-modules/async-upnp-client/default.nix index 3f09521e34f2..12d1e3d098a0 100644 --- a/pkgs/development/python-modules/async-upnp-client/default.nix +++ b/pkgs/development/python-modules/async-upnp-client/default.nix @@ -14,14 +14,14 @@ buildPythonPackage rec { pname = "async-upnp-client"; - version = "0.23.1"; + version = "0.23.4"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "StevenLooman"; repo = "async_upnp_client"; rev = version; - sha256 = "sha256-m8oTqGbsJ99ImtnSlL4LX1qR0bUhGtVPPWmjsZfV6sE="; + sha256 = "sha256-FrH5PwNpXZpNk7mUnMBGA9MQUPBqBEOoMd9T5ond2WA="; }; propagatedBuildInputs = [ From 3755785f609b3a2846f83b24f2b87719d356d1d4 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Feb 2022 20:09:02 +0100 Subject: [PATCH 060/214] python3Packages.emoji: 1.6.2 -> 1.6.3 --- pkgs/development/python-modules/emoji/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/emoji/default.nix b/pkgs/development/python-modules/emoji/default.nix index 1497b412d741..76579e4dd89f 100644 --- a/pkgs/development/python-modules/emoji/default.nix +++ b/pkgs/development/python-modules/emoji/default.nix @@ -6,13 +6,13 @@ buildPythonPackage rec { pname = "emoji"; - version = "1.6.2"; + version = "1.6.3"; src = fetchFromGitHub { owner = "carpedm20"; repo = pname; rev = "v${version}"; - sha256 = "1g927w9l3j5mycg6pqa4vjk2lyy35sppfp8pbzb6mvca500001rk"; + sha256 = "sha256-0QOtsHGhqbjaEDpSbUXdE8+u6xzWbrTexx+BAeYwKa8="; }; checkInputs = [ From 99ea3df9c47ac8aae1b023ab0a3984ef96012d3c Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Feb 2022 20:09:27 +0100 Subject: [PATCH 061/214] python3Packages.fritzconnection: 1.7.2 -> 1.9.1 --- pkgs/development/python-modules/fritzconnection/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/fritzconnection/default.nix b/pkgs/development/python-modules/fritzconnection/default.nix index 0797d39c3125..092b00f6b02e 100644 --- a/pkgs/development/python-modules/fritzconnection/default.nix +++ b/pkgs/development/python-modules/fritzconnection/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "fritzconnection"; - version = "1.7.2"; + version = "1.9.1"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "kbr"; repo = pname; rev = version; - sha256 = "sha256-TT0mc3ID+R5Dhm0xSMpyg68wZR70xJfRfgPkHkvLstA="; + sha256 = "sha256-wapZ4lCG0tfE+LbFVeIxVlbMJN/sSwIeYK5GLCqoWLs="; }; propagatedBuildInputs = [ From 4b259a5334b4bfe35c87ca86c12edea048da04d0 Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Sun, 21 Mar 2021 22:59:00 +0100 Subject: [PATCH 062/214] nautilus-open-any-terminal: init at 0.2.15 --- .../nautilus-open-any-terminal/default.nix | 64 +++++++++++++++++++ .../hardcode-gsettings.patch | 32 ++++++++++ pkgs/top-level/all-packages.nix | 2 + 3 files changed, 98 insertions(+) create mode 100644 pkgs/tools/misc/nautilus-open-any-terminal/default.nix create mode 100644 pkgs/tools/misc/nautilus-open-any-terminal/hardcode-gsettings.patch diff --git a/pkgs/tools/misc/nautilus-open-any-terminal/default.nix b/pkgs/tools/misc/nautilus-open-any-terminal/default.nix new file mode 100644 index 000000000000..321b139ca157 --- /dev/null +++ b/pkgs/tools/misc/nautilus-open-any-terminal/default.nix @@ -0,0 +1,64 @@ +{ lib +, pkg-config +, dbus +, dconf +, fetchFromGitHub +, glib +, gnome +, gobject-introspection +, gsettings-desktop-schemas +, gtk3 +, python3 +, substituteAll +, wrapGAppsHook +}: + +python3.pkgs.buildPythonPackage rec { + pname = "nautilus-open-any-terminal"; + version = "0.2.15"; + + src = fetchFromGitHub { + owner = "Stunkymonkey"; + repo = pname; + rev = version; + sha256 = "sha256-cc6Lh5XeAuU5Os4eJ0QcL6XJYB6DqxeUGaOf6m1OnpY="; + }; + + patches = [ ./hardcode-gsettings.patch ]; + + nativeBuildInputs = [ + glib + pkg-config + wrapGAppsHook + ]; + + buildInputs = [ + dbus + dconf + gnome.nautilus + gnome.nautilus-python + gobject-introspection + gsettings-desktop-schemas + gtk3 + python3.pkgs.pygobject3 + ]; + + postPatch = '' + substituteInPlace nautilus_open_any_terminal/open_any_terminal_extension.py \ + --subst-var-by gsettings_path ${glib.makeSchemaPath "$out" "$name"} + ''; + + postInstall = '' + glib-compile-schemas "$out/share/glib-2.0/schemas" + ''; + + PKG_CONFIG_LIBNAUTILUS_EXTENSION_EXTENSIONDIR = "${placeholder "out"}/lib/nautilus/extensions-3.0"; + + meta = with lib; { + description = "Extension for nautilus, which adds an context-entry for opening other terminal-emulators then `gnome-terminal`"; + license = licenses.gpl3Plus; + maintainers = with maintainers; [ stunkymonkey ]; + homepage = "https://github.com/Stunkymonkey/nautilus-open-any-terminal"; + platforms = platforms.linux; + }; +} diff --git a/pkgs/tools/misc/nautilus-open-any-terminal/hardcode-gsettings.patch b/pkgs/tools/misc/nautilus-open-any-terminal/hardcode-gsettings.patch new file mode 100644 index 000000000000..402f78ed04b1 --- /dev/null +++ b/pkgs/tools/misc/nautilus-open-any-terminal/hardcode-gsettings.patch @@ -0,0 +1,32 @@ +diff --git a/nautilus_open_any_terminal/open_any_terminal_extension.py b/nautilus_open_any_terminal/open_any_terminal_extension.py +index b02a995..a616399 100644 +--- a/nautilus_open_any_terminal/open_any_terminal_extension.py ++++ b/nautilus_open_any_terminal/open_any_terminal_extension.py +@@ -125,9 +125,10 @@ def set_terminal_args(*args): + + class OpenAnyTerminalShortcutProvider(GObject.GObject, Nautilus.LocationWidgetProvider): + def __init__(self): +- source = Gio.SettingsSchemaSource.get_default() +- if source.lookup(GSETTINGS_PATH, True): +- self._gsettings = Gio.Settings.new(GSETTINGS_PATH) ++ source = Gio.SettingsSchemaSource.new_from_directory("@gsettings_path@", Gio.SettingsSchemaSource.get_default(), True) ++ if True: ++ _schema = source.lookup(GSETTINGS_PATH, False) ++ self._gsettings = Gio.Settings.new_full(_schema, None, None); + self._gsettings.connect("changed", self._bind_shortcut) + self._create_accel_group() + self._window = None +@@ -232,9 +233,10 @@ class OpenAnyTerminalExtension(GObject.GObject, Nautilus.MenuProvider): + return items + + +-source = Gio.SettingsSchemaSource.get_default() +-if source is not None and source.lookup(GSETTINGS_PATH, True): +- _gsettings = Gio.Settings.new(GSETTINGS_PATH) ++source = Gio.SettingsSchemaSource.new_from_directory("@gsettings_path@", Gio.SettingsSchemaSource.get_default(), True) ++if True: ++ _schema = source.lookup(GSETTINGS_PATH, False) ++ _gsettings = Gio.Settings.new_full(_schema, None, None); + _gsettings.connect("changed", set_terminal_args) + value = _gsettings.get_string(GSETTINGS_TERMINAL) + if value in TERM_PARAMS: diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 391ecbbfa45e..770ad9aacd0c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3467,6 +3467,8 @@ with pkgs; mrkd = with python3Packages; toPythonApplication mrkd; + nautilus-open-any-terminal = callPackage ../tools/misc/nautilus-open-any-terminal { }; + n2n = callPackage ../tools/networking/n2n { }; nextdns = callPackage ../applications/networking/nextdns { }; From af86d240e801fd57ad1da102ff034cdb31c09e7f Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Feb 2022 20:31:15 +0100 Subject: [PATCH 063/214] python3Packages.garages-amsterdam: 2.1.1 -> 3.2.1 --- .../python-modules/garages-amsterdam/default.nix | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/garages-amsterdam/default.nix b/pkgs/development/python-modules/garages-amsterdam/default.nix index 08a687d70601..3276934e65b2 100644 --- a/pkgs/development/python-modules/garages-amsterdam/default.nix +++ b/pkgs/development/python-modules/garages-amsterdam/default.nix @@ -2,21 +2,27 @@ , buildPythonPackage , fetchFromGitHub , pythonOlder +, poetry-core , aiohttp }: buildPythonPackage rec { pname = "garages-amsterdam"; - version = "2.1.1"; + version = "3.2.1"; + format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchFromGitHub { owner = "klaasnicolaas"; repo = "garages_amsterdam"; - rev = version; - sha256 = "1m0bc3bzb83apprk412s7k5r2g6p5br2hrak2a976lh9ifk1d8hj"; + rev = "v${version}"; + sha256 = "16f2742r9p3mrg2nz8lnkgsxabbjga2qnp9vzq59026q6mmfwkm9"; }; + nativeBuildInputs = [ + poetry-core + ]; + propagatedBuildInputs = [ aiohttp ]; From f84098a596e5cd904dfa75e880990c670868cadf Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Feb 2022 20:41:39 +0100 Subject: [PATCH 064/214] python3Packages.google-nest-sdm: 1.5.1 -> 1.6.0 --- pkgs/development/python-modules/google-nest-sdm/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-nest-sdm/default.nix b/pkgs/development/python-modules/google-nest-sdm/default.nix index 02a0f6f08d93..2b076f4cae02 100644 --- a/pkgs/development/python-modules/google-nest-sdm/default.nix +++ b/pkgs/development/python-modules/google-nest-sdm/default.nix @@ -8,6 +8,7 @@ , google-auth-oauthlib , google-cloud-pubsub , pytest-aiohttp +, pytest-asyncio , pytestCheckHook , pythonOlder , requests_oauthlib @@ -15,7 +16,7 @@ buildPythonPackage rec { pname = "google-nest-sdm"; - version = "1.5.1"; + version = "1.6.0"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -24,7 +25,7 @@ buildPythonPackage rec { owner = "allenporter"; repo = "python-google-nest-sdm"; rev = version; - sha256 = "sha256-8Y3ixkDl/AmXQMOY+29og5njMh9M2qjwWBGCsiqX5PU="; + sha256 = "sha256-qgowVCsSNa+Gt+fWnR1eMfkbtpZD7DS4ALZYz6KZZTM="; }; propagatedBuildInputs = [ @@ -39,6 +40,7 @@ buildPythonPackage rec { asynctest coreutils pytest-aiohttp + pytest-asyncio pytestCheckHook ]; From 6930626b426db8a30da7f3ec328875abe1adce68 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Feb 2022 20:42:09 +0100 Subject: [PATCH 065/214] python3Packages.hass-nabucasa: 0.51.0 -> 0.52.0 --- pkgs/development/python-modules/hass-nabucasa/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/hass-nabucasa/default.nix b/pkgs/development/python-modules/hass-nabucasa/default.nix index d1228fc0c5f5..2e3be091cef6 100644 --- a/pkgs/development/python-modules/hass-nabucasa/default.nix +++ b/pkgs/development/python-modules/hass-nabucasa/default.nix @@ -15,13 +15,13 @@ buildPythonPackage rec { pname = "hass-nabucasa"; - version = "0.51.0"; + version = "0.52.0"; src = fetchFromGitHub { owner = "nabucasa"; repo = pname; rev = version; - sha256 = "sha256-qN7AXs4hJpuP+GaxjOPR2CqKMYyDJxTrCuE5HreZnhU="; + sha256 = "sha256-mTbNuER26BPQIjcmlpkdFNeBcNF1vTldaNpoEla0XbM="; }; postPatch = '' From b2a603297b75ac13a43e82e30c8b89e50dbb6285 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Feb 2022 20:45:22 +0100 Subject: [PATCH 066/214] python3Packages.influxdb: 5.3.0 -> 5.3.1 --- .../python-modules/influxdb/default.nix | 20 +++++-------------- 1 file changed, 5 insertions(+), 15 deletions(-) diff --git a/pkgs/development/python-modules/influxdb/default.nix b/pkgs/development/python-modules/influxdb/default.nix index 8ecd46e3b96b..ec81f631ac30 100644 --- a/pkgs/development/python-modules/influxdb/default.nix +++ b/pkgs/development/python-modules/influxdb/default.nix @@ -1,7 +1,7 @@ { lib , buildPythonPackage , python-dateutil -, fetchFromGitHub +, fetchPypi , fetchpatch , mock , msgpack @@ -16,13 +16,11 @@ buildPythonPackage rec { pname = "influxdb"; - version = "5.3.0"; + version = "5.3.1"; - src = fetchFromGitHub { - owner = "influxdata"; - repo = "influxdb-python"; - rev = "v${version}"; - sha256 = "1jfkf53jcf8lcq98qc0bw5d1d0yp3558mh8l2dqc9jlsm0smigjs"; + src = fetchPypi { + inherit pname version; + sha256 = "0ymjv322mv6y424fmpd70f87152w55mbwwj6i7p3sjzf0ixmxy26"; }; propagatedBuildInputs = [ @@ -41,14 +39,6 @@ buildPythonPackage rec { pandas ]; - patches = [ - (fetchpatch { - # Relaxes msgpack pinning - url = "https://github.com/influxdata/influxdb-python/commit/cc41e290f690c4eb67f75c98fa9f027bdb6eb16b.patch"; - sha256 = "1fb9qrq1kp24pixjwvzhdy67z3h0wnj92aj0jw0a25fd0rdxdvg4"; - }) - ]; - disabledTests = [ # Tests cause FutureWarning due to use of 'record' instead of 'records' in pandas. # https://github.com/influxdata/influxdb-python/pull/845 From d4767e4220cf2f423b38bb0c1e2aa1402bad1d42 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Feb 2022 20:46:33 +0100 Subject: [PATCH 067/214] python3Packages.mill-local: 0.1.0 -> 0.1.1 --- pkgs/development/python-modules/mill-local/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mill-local/default.nix b/pkgs/development/python-modules/mill-local/default.nix index 9d00bb71c8bc..003fbc974f1d 100644 --- a/pkgs/development/python-modules/mill-local/default.nix +++ b/pkgs/development/python-modules/mill-local/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "mill-local"; - version = "0.1.0"; + version = "0.1.1"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "Danielhiversen"; repo = "pyMillLocal"; rev = version; - sha256 = "0q0frwj9yxdmqi5axl7gxirfflgn8xh1932c6lhp9my2v1d0gdrk"; + sha256 = "sha256-OKaR0hpNVBlaZrEmEmHxqRG1i03XP2Z4c7c35YIqe+I="; }; propagatedBuildInputs = [ From b940be13b179f2c124a6d41cb1c6230b79b3fc51 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Feb 2022 20:56:52 +0100 Subject: [PATCH 068/214] python3Packages.pyatv: 0.9.8 -> 0.10.0 --- .../python-modules/pyatv/default.nix | 22 +++++++++++-------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/pkgs/development/python-modules/pyatv/default.nix b/pkgs/development/python-modules/pyatv/default.nix index 9f1bd0081084..85c526334caa 100644 --- a/pkgs/development/python-modules/pyatv/default.nix +++ b/pkgs/development/python-modules/pyatv/default.nix @@ -14,13 +14,14 @@ , pytest-timeout , pytestCheckHook , pythonOlder +, requests , srptools , zeroconf }: buildPythonPackage rec { pname = "pyatv"; - version = "0.9.8"; + version = "0.10.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -29,9 +30,18 @@ buildPythonPackage rec { owner = "postlund"; repo = pname; rev = "v${version}"; - sha256 = "1ns1ys3mwi1s1b8zxcr7xgr1rfnlxwdn2fp680yi09x4d9nmnvqp"; + sha256 = "sha256-aYNBFtsnSg3PORq72U0PXPFCTVj2+8D2TS3nMau55t4="; }; + postPatch = '' + substituteInPlace setup.py \ + --replace "pytest-runner" "" + # Remove all version pinning + + substituteInPlace base_versions.txt \ + --replace "protobuf==3.19.1,<4" "protobuf>=3.19.0,<4" + ''; + propagatedBuildInputs = [ aiohttp bitarray @@ -40,6 +50,7 @@ buildPythonPackage rec { miniaudio netifaces protobuf + requests srptools zeroconf ]; @@ -52,13 +63,6 @@ buildPythonPackage rec { pytestCheckHook ]; - postPatch = '' - substituteInPlace setup.py \ - --replace "pytest-runner" "" - # Remove all version pinning - sed -i -e "s/==[0-9.]*//" requirements/requirements.txt - ''; - disabledTestPaths = [ # Test doesn't work in the sandbox "tests/protocols/companion/test_companion_auth.py" From f6ae0ef02e036bc18a56b2b9cca149eb90d6607b Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Feb 2022 20:57:16 +0100 Subject: [PATCH 069/214] python3Packages.pydaikin: 2.6.0 -> 2.7.0 --- pkgs/development/python-modules/pydaikin/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/pydaikin/default.nix b/pkgs/development/python-modules/pydaikin/default.nix index 67f8da66be78..adbb0d21a8c3 100644 --- a/pkgs/development/python-modules/pydaikin/default.nix +++ b/pkgs/development/python-modules/pydaikin/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "pydaikin"; - version = "2.6.0"; + version = "2.7.0"; disabled = pythonOlder "3.6"; src = fetchFromBitbucket { owner = "mustang51"; repo = pname; rev = "v${version}"; - sha256 = "sha256-Fk6zMWgvhKp+7BMDGw89Akb4fgK6+xi+AyvEY3pdTQQ="; + sha256 = "sha256-k6NAQvt79Qo7sAXQwOjq4Coz2iTZAUImasc/oMSpmmg="; }; propagatedBuildInputs = [ @@ -28,7 +28,7 @@ buildPythonPackage rec { urllib3 ]; - # while they have tests, they do not run them in their CI and they fail as of 2.6.0 + # while they have tests, they do not run them in their CI and they fail as of 2.7.0 # AttributeError: 'DaikinBRP069' object has no attribute 'last_hour_cool_energy_consumption' doCheck = false; From f239aa2e297e57e98ce3119b20e7b02948e1dca7 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Feb 2022 20:59:10 +0100 Subject: [PATCH 070/214] python3Packages.pyezviz: 0.2.0.5 -> 0.2.0.6 --- pkgs/development/python-modules/pyezviz/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyezviz/default.nix b/pkgs/development/python-modules/pyezviz/default.nix index f7d564e7e54d..e6a2d5c02260 100644 --- a/pkgs/development/python-modules/pyezviz/default.nix +++ b/pkgs/development/python-modules/pyezviz/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "pyezviz"; - version = "0.2.0.5"; + version = "0.2.0.6"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "baqs"; repo = "pyEzviz"; rev = version; - sha256 = "sha256-a+u8zS69qLHABPSvWEzhM/gdzlLh2RJLTDJjaX4DtpI="; + sha256 = "sha256-3GRyM6OK0EpQ7wepTzqg+XANx9D0OVBTnw98i3b1V/8="; }; propagatedBuildInputs = [ From 1dbf51c3bef48aa53c1d87554ab2d3166770db7f Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Feb 2022 21:01:39 +0100 Subject: [PATCH 071/214] python3Packages.pyinsteon: 1.0.13 -> 1.0.14 --- pkgs/development/python-modules/pyinsteon/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyinsteon/default.nix b/pkgs/development/python-modules/pyinsteon/default.nix index 04dbd8142ff6..869cb06a57a5 100644 --- a/pkgs/development/python-modules/pyinsteon/default.nix +++ b/pkgs/development/python-modules/pyinsteon/default.nix @@ -17,14 +17,14 @@ buildPythonPackage rec { pname = "pyinsteon"; - version = "1.0.13"; + version = "1.0.14"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = pname; repo = pname; rev = version; - sha256 = "sha256-KVwAF+yoU26ktNRKWQ+nrhS1i90xQxAhRAr4VJ+xtl0="; + sha256 = "sha256-1ByCd7PymRLm67msNu6TXSm37C9KnmEl0v/+flfqz1A="; }; propagatedBuildInputs = [ From 5aebf78fbf703fa827574d52a7937a9bc08278be Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Feb 2022 21:01:57 +0100 Subject: [PATCH 072/214] python3Packages.pylitterbot: 2021.11.0 -> 2021.12.0 --- pkgs/development/python-modules/pylitterbot/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pylitterbot/default.nix b/pkgs/development/python-modules/pylitterbot/default.nix index be6d71aed5d3..eec564c126b0 100644 --- a/pkgs/development/python-modules/pylitterbot/default.nix +++ b/pkgs/development/python-modules/pylitterbot/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "pylitterbot"; - version = "2021.11.0"; + version = "2021.12.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "natekspencer"; repo = pname; rev = version; - sha256 = "sha256-HdIxi6RfdXBYEYFEcv/f9wAqKZg/MsEZd6mDYwE45to="; + sha256 = "sha256-hz+MQTxobf7IkOJTpwbDDd3i13FFtxFn2kmCwPV3pu4="; }; propagatedBuildInputs = [ From 4e26847ee5b88df7667f10560cfc9752d542cb37 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Feb 2022 21:02:40 +0100 Subject: [PATCH 073/214] python3Packages.pynina: 2021-11-11 -> 0.1.4 --- pkgs/development/python-modules/pynina/default.nix | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/pynina/default.nix b/pkgs/development/python-modules/pynina/default.nix index b9e026886c86..5eaf015e9bb4 100644 --- a/pkgs/development/python-modules/pynina/default.nix +++ b/pkgs/development/python-modules/pynina/default.nix @@ -1,22 +1,21 @@ { lib , aiohttp , buildPythonPackage -, fetchFromGitLab +, fetchPypi , pythonOlder }: buildPythonPackage rec { pname = "pynina"; - version = "unstable-2021-11-11"; + version = "0.1.4"; format = "setuptools"; disabled = pythonOlder "3.7"; - src = fetchFromGitLab { - owner = "DeerMaximum"; - repo = pname; - rev = "0ac42b28d48af7bcd9c83f5d425b5b23c4c19f02"; - sha256 = "FSrFCs/4tfYcSPz9cgR+LFsRbWIHE1X+ZUl8BWSEaWQ="; + src = fetchPypi { + pname = "PyNINA"; + inherit version; + sha256 = "1q382b70ydzzbqb9sa5y5w7039rp6q0wyffarrsdw916kbc4zyqd"; }; propagatedBuildInputs = [ From f4f6718a58cf40719e1fea0628c5e37a24b91966 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Feb 2022 21:08:48 +0100 Subject: [PATCH 074/214] python3Packages.pynuki: 1.4.1 -> 1.5.2 and relax the very narrow requests requirement --- pkgs/development/python-modules/pynuki/default.nix | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pynuki/default.nix b/pkgs/development/python-modules/pynuki/default.nix index 9c3dc394cc04..641165cedd3f 100644 --- a/pkgs/development/python-modules/pynuki/default.nix +++ b/pkgs/development/python-modules/pynuki/default.nix @@ -7,16 +7,21 @@ buildPythonPackage rec { pname = "pynuki"; - version = "1.4.1"; + version = "1.5.2"; format = "pyproject"; src = fetchFromGitHub { owner = "pschmitt"; repo = pname; rev = version; - sha256 = "1nymlrf0j430851plp355697p55asfxjmavdh2zr96b16d41dnn4"; + sha256 = "sha256-Uqw1Xa0pBQmQsFEBv/l1gtsPy+owYcTZITOYUmMvT5Y="; }; + postPatch = '' + substituteInPlace pyproject.toml \ + --replace 'requests = ">=2.27,<3"' 'requests = "*"' + ''; + nativeBuildInputs = [ poetry-core ]; propagatedBuildInputs = [ requests ]; From 7154c489566decb6cbee3964a0024ab952425e89 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Feb 2022 21:09:13 +0100 Subject: [PATCH 075/214] python3Packages.pypck: 0.7.11 -> 0.7.13 --- pkgs/development/python-modules/pypck/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pypck/default.nix b/pkgs/development/python-modules/pypck/default.nix index 797657a28c5c..76146f3c15d3 100644 --- a/pkgs/development/python-modules/pypck/default.nix +++ b/pkgs/development/python-modules/pypck/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "pypck"; - version = "0.7.11"; + version = "0.7.13"; disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "alengwenus"; repo = pname; rev = version; - sha256 = "1jj0y487qcxrprx4x2rs6r7rqsf5m9khk0xhigbvnbyvh8rsd2jr"; + sha256 = "sha256-Gbz+3Hq4yStlTI7UxB4NBZigUzZjSJFFcwdzWtbGnio="; }; checkInputs = [ From db4a4d52a86d7d63963d8c6d7680cb4bcdc9a088 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Feb 2022 21:11:25 +0100 Subject: [PATCH 076/214] python3Packages.pysml: 0.0.5 -> 0.0.7 and migrate to pyproject and poetry-core. --- pkgs/development/python-modules/pysml/default.nix | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pysml/default.nix b/pkgs/development/python-modules/pysml/default.nix index 1f08eb14180c..f7c1e4857c42 100644 --- a/pkgs/development/python-modules/pysml/default.nix +++ b/pkgs/development/python-modules/pysml/default.nix @@ -3,20 +3,26 @@ , bitstring , buildPythonPackage , fetchFromGitHub +, poetry-core , pyserial-asyncio }: buildPythonPackage rec { pname = "pysml"; - version = "0.0.5"; + version = "0.0.7"; + format = "pyproject"; src = fetchFromGitHub { owner = "mtdcr"; repo = pname; rev = version; - sha256 = "05zgrk49b2y5jflxnjww2kqg1flynl3j4ifm0jr28nk0li5wg2bs"; + sha256 = "sha256-h8rQOKZozioZ7HmPETC5wBJyz7rMH1Q2wL6lF8G3zQU="; }; + nativeBuildInputs = [ + poetry-core + ]; + propagatedBuildInputs = [ async-timeout bitstring From 734bdf9aa16b6fe2ab8babdee7cb912b22688b6f Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Feb 2022 21:15:31 +0100 Subject: [PATCH 077/214] python3Packages.renault-api: 0.1.6 -> 0.1.7 --- pkgs/development/python-modules/renault-api/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/renault-api/default.nix b/pkgs/development/python-modules/renault-api/default.nix index eef2459c259d..3c750cbcbec1 100644 --- a/pkgs/development/python-modules/renault-api/default.nix +++ b/pkgs/development/python-modules/renault-api/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "renault-api"; - version = "0.1.6"; + version = "0.1.7"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "hacf-fr"; repo = pname; rev = "v${version}"; - sha256 = "0v9a8p0ynikqzg7vvinvik5gjvsc5nrfqkq528mhcw7y4hmj8ndm"; + sha256 = "sha256-D0fsJ8mwBPcwuGuRkzgDTrwvnbe5yhilxTx49badKEQ="; }; nativeBuildInputs = [ From 8e02e37bb25c007874fba4cd5578722a119e4535 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Feb 2022 21:16:29 +0100 Subject: [PATCH 078/214] python3Packages.rflink: 0.0.58 -> 0.0.62 --- pkgs/development/python-modules/rflink/default.nix | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/pkgs/development/python-modules/rflink/default.nix b/pkgs/development/python-modules/rflink/default.nix index 82374a8a0423..c33d44f628fb 100644 --- a/pkgs/development/python-modules/rflink/default.nix +++ b/pkgs/development/python-modules/rflink/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "rflink"; - version = "0.0.58"; + version = "0.0.62"; format = "setuptools"; src = fetchFromGitHub { owner = "aequitas"; repo = "python-rflink"; rev = version; - sha256 = "1zab55lsw419gg0jfrl69ap6128vbi3wdmg5z7qin65ijpjdhasc"; + sha256 = "sha256-dEzkYE8xtUzvdsnPaSiQR8960WLOEcr/QhwDiQlobcs="; }; propagatedBuildInputs = [ @@ -34,15 +34,6 @@ buildPythonPackage rec { pytestCheckHook ]; - patches = [ - # Remove loop, https://github.com/aequitas/python-rflink/pull/61 - (fetchpatch { - name = "remove-loop.patch"; - url = "https://github.com/aequitas/python-rflink/commit/777e19b5bde3398df5b8f142896c34a01ae18d52.patch"; - sha256 = "sJmihxY3fNSfZVFhkvQ/+9gysQup/1jklKDMyDDLOs8="; - }) - ]; - postPatch = '' substituteInPlace setup.py \ --replace "version=version_from_git()" "version='${version}'" From 90a1dc061fb6170d0667162e045d99802fb7905d Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Feb 2022 21:20:48 +0100 Subject: [PATCH 079/214] python3Packages.sentry-sdk: 1.5.2 -> 1.5.4 --- pkgs/development/python-modules/sentry-sdk/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/sentry-sdk/default.nix b/pkgs/development/python-modules/sentry-sdk/default.nix index 26ccb1aacc51..a2c8ea958495 100644 --- a/pkgs/development/python-modules/sentry-sdk/default.nix +++ b/pkgs/development/python-modules/sentry-sdk/default.nix @@ -40,14 +40,14 @@ buildPythonPackage rec { pname = "sentry-sdk"; - version = "1.5.2"; + version = "1.5.4"; format = "setuptools"; src = fetchFromGitHub { owner = "getsentry"; repo = "sentry-python"; rev = version; - sha256 = "086kzvrpy1c7kiwjrdyr4i4a8dp4vncsc8dk6hp8c7bwswfffa3d"; + sha256 = "sha256-MZ1J2Stq+pRoeJ05hv8cSpxtaeRGaJEWAtidbr8YP88="; }; propagatedBuildInputs = [ From 2bf4803be8b050c74a865e19af2b85837a0fb176 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Feb 2022 21:22:00 +0100 Subject: [PATCH 080/214] python3Packages.soco: 0.25.3 -> 0.26.0 --- pkgs/development/python-modules/soco/default.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/soco/default.nix b/pkgs/development/python-modules/soco/default.nix index 1a7747e2c2ec..915645730bc1 100644 --- a/pkgs/development/python-modules/soco/default.nix +++ b/pkgs/development/python-modules/soco/default.nix @@ -2,6 +2,7 @@ , buildPythonPackage , fetchFromGitHub , graphviz +, appdirs , ifaddr , pythonOlder , mock @@ -14,17 +15,18 @@ buildPythonPackage rec { pname = "soco"; - version = "0.25.3"; + version = "0.26.0"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "SoCo"; repo = "SoCo"; rev = "v${version}"; - sha256 = "sha256-CoAmpcXy4oHMk0X4iJ/XMbUnI2m3ZWl8QzobH677FrI="; + sha256 = "sha256-rOJiO8BBbkp3dzy9hk3LV0hqQDLRgrA1kqnhvrseU0o="; }; propagatedBuildInputs = [ + appdirs ifaddr requests xmltodict From cb3fad914c0d4016e162e712c6b018b714d2445a Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Feb 2022 21:34:09 +0100 Subject: [PATCH 081/214] python3Packages.awesomeversion: 21.11.0 -> 22.1.0 --- pkgs/development/python-modules/awesomeversion/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/awesomeversion/default.nix b/pkgs/development/python-modules/awesomeversion/default.nix index f99407030cdd..84a3aec05b3f 100644 --- a/pkgs/development/python-modules/awesomeversion/default.nix +++ b/pkgs/development/python-modules/awesomeversion/default.nix @@ -7,7 +7,7 @@ buildPythonPackage rec { pname = "awesomeversion"; - version = "21.11.0"; + version = "22.1.0"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -16,7 +16,7 @@ buildPythonPackage rec { owner = "ludeeus"; repo = pname; rev = version; - sha256 = "sha256-qxN5AdLlzadG0/raeAyJ/37PLgYLndl1JQSVkgdLv/4="; + sha256 = "sha256-eoY920c8mgunvZd0M/vR7+bMCPFqqCm3F/fq0vo6K/0="; }; postPatch = '' From fd574e3c6d1e82075ce971a42ab1791e7143bad8 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Feb 2022 21:35:23 +0100 Subject: [PATCH 082/214] python3Packages.wled: 0.11.0 -> 0.13.0 --- pkgs/development/python-modules/wled/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/wled/default.nix b/pkgs/development/python-modules/wled/default.nix index ea69a22c27b0..3b88afa7e65c 100644 --- a/pkgs/development/python-modules/wled/default.nix +++ b/pkgs/development/python-modules/wled/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "wled"; - version = "0.11.0"; + version = "0.13.0"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "frenck"; repo = "python-wled"; rev = "v${version}"; - sha256 = "02mc9dbz7lvk7d8aaimggm3vg99bc42njsv8sfchvc9amvdi94qy"; + sha256 = "sha256-n+TIzlnyPeSywTQr7wlGNezsbQ2+S/WYt1H95+Id2Rw="; }; nativeBuildInputs = [ From 163b78f1a291b52436f649773d8d7ec2d171e060 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Feb 2022 21:35:49 +0100 Subject: [PATCH 083/214] python3Packages.xknx: 0.18.15 -> 0.19.1 --- pkgs/development/python-modules/xknx/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/xknx/default.nix b/pkgs/development/python-modules/xknx/default.nix index 781f59fa3cf7..3b2f567c7daf 100644 --- a/pkgs/development/python-modules/xknx/default.nix +++ b/pkgs/development/python-modules/xknx/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "xknx"; - version = "0.18.15"; + version = "0.19.1"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "XKNX"; repo = pname; rev = version; - sha256 = "sha256-k/fLUuBjXScTvlvoBLZIVPEqNGIPI04FBeTBadp5uiY="; + sha256 = "sha256-CmiibJc8cy0NuGVS9CEsML2DgVRIsNmWsqp9nmzInAA="; }; propagatedBuildInputs = [ From 04fe5e989440a477b54a08fe850be1b8a8f353cc Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Feb 2022 21:39:37 +0100 Subject: [PATCH 084/214] python3Packages.yalesmartalarmclient: 0.3.5 -> 0.3.7 --- .../python-modules/yalesmartalarmclient/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/yalesmartalarmclient/default.nix b/pkgs/development/python-modules/yalesmartalarmclient/default.nix index 201a1636f173..e9a8ae0323d0 100644 --- a/pkgs/development/python-modules/yalesmartalarmclient/default.nix +++ b/pkgs/development/python-modules/yalesmartalarmclient/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "yalesmartalarmclient"; - version = "0.3.5"; + version = "0.3.7"; src = fetchFromGitHub { owner = "domwillcode"; repo = "yale-smart-alarm-client"; rev = "v${version}"; - sha256 = "11i7vh61a5xfv32zm7rkigl010wzd6snag6sf7w38256j95nnb05"; + sha256 = "sha256-LcHXw4rZhQ942EhiGrRTf3MpT7G5OFSX8QbpxVjvTTo="; }; propagatedBuildInputs = [ From 09972dd20f76b596efd4b3c3488d6067e1e482eb Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Feb 2022 21:40:40 +0100 Subject: [PATCH 085/214] python3Packages.yalexs: 1.1.19 -> 1.1.20 --- pkgs/development/python-modules/yalexs/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/yalexs/default.nix b/pkgs/development/python-modules/yalexs/default.nix index d83b031fe4c4..c19a145b4947 100644 --- a/pkgs/development/python-modules/yalexs/default.nix +++ b/pkgs/development/python-modules/yalexs/default.nix @@ -16,7 +16,7 @@ buildPythonPackage rec { pname = "yalexs"; - version = "1.1.19"; + version = "1.1.20"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -25,7 +25,7 @@ buildPythonPackage rec { owner = "bdraco"; repo = pname; rev = "v${version}"; - sha256 = "sha256-i6UFsSY2DQ4jB316fy5cZ+2C93TTmvyB4Caxj3syPdo="; + sha256 = "sha256-0wcvlgKlWhj9jZ53c+uEk9F28+m7BwsmlwTRlBMPoho="; }; propagatedBuildInputs = [ From 82157ea5048f1fe16398d2cce4cfbfc87f6009b6 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Feb 2022 21:46:20 +0100 Subject: [PATCH 086/214] python3Packages.zeroconf: 0.38.1 -> 0.38.3 --- pkgs/development/python-modules/zeroconf/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/zeroconf/default.nix b/pkgs/development/python-modules/zeroconf/default.nix index 12e0279eb3de..319cd7cce0f1 100644 --- a/pkgs/development/python-modules/zeroconf/default.nix +++ b/pkgs/development/python-modules/zeroconf/default.nix @@ -10,7 +10,7 @@ buildPythonPackage rec { pname = "zeroconf"; - version = "0.38.1"; + version = "0.38.3"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -19,7 +19,7 @@ buildPythonPackage rec { owner = "jstasiak"; repo = "python-zeroconf"; rev = version; - sha256 = "sha256-8bJEH+m+83rkKdN5GjD4THs1CUy/wstoBFiXR7kHKtw="; + sha256 = "sha256-pLTqnIbe7rTZrQFe//0/h5Tyx0GzJW+q9mUuDNifo/0="; }; propagatedBuildInputs = [ From bbeaa3c743b2fa2946e16a807fbefb52785405ee Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Feb 2022 21:47:14 +0100 Subject: [PATCH 087/214] python3Packages.zwave-js-server-python: 0.33.0 -> 0.34.0 --- .../python-modules/zwave-js-server-python/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/zwave-js-server-python/default.nix b/pkgs/development/python-modules/zwave-js-server-python/default.nix index 5b18c09f15a8..543056972723 100644 --- a/pkgs/development/python-modules/zwave-js-server-python/default.nix +++ b/pkgs/development/python-modules/zwave-js-server-python/default.nix @@ -9,7 +9,7 @@ buildPythonPackage rec { pname = "zwave-js-server-python"; - version = "0.33.0"; + version = "0.34.0"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -18,7 +18,7 @@ buildPythonPackage rec { owner = "home-assistant-libs"; repo = pname; rev = version; - sha256 = "sha256-0hAksizQSIOg+hbSq/OZqFqlBBdpa0bSf+puWfD9TSg="; + sha256 = "sha256-hqq/CYlM9ZahDiH3iFLFzfE22CB19WQnFIDt+gCrEXU="; }; propagatedBuildInputs = [ From cb9bb7723736fc84c2ad7e9671538dd5c4b2c7ba Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 3 Feb 2022 00:36:06 +0100 Subject: [PATCH 088/214] python3Packages.glances-api: 0.3.3 -> 0.3.4 --- pkgs/development/python-modules/glances-api/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/glances-api/default.nix b/pkgs/development/python-modules/glances-api/default.nix index bdd2e63e07aa..2185522cef73 100644 --- a/pkgs/development/python-modules/glances-api/default.nix +++ b/pkgs/development/python-modules/glances-api/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "glances-api"; - version = "0.3.3"; + version = "0.3.4"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "home-assistant-ecosystem"; repo = "python-glances-api"; rev = version; - sha256 = "sha256-F3jmYBZNzI4hRmH1J+S5RwxjouZNcUJOnD3QpX1J39s="; + sha256 = "sha256-mV67mppzx3lka04bxQ5CdufknZTTqWqGJzqPaHb4C2o="; }; nativeBuildInputs = [ From 93a6cd0fd6e5540bfbc40e38502425078d91d137 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Feb 2022 21:53:50 +0100 Subject: [PATCH 089/214] home-assistant: 2021.12.10 -> 2022.2.0 https://www.home-assistant.io/blog/2022/02/02/release-20222/ --- .../home-assistant/component-packages.nix | 64 +++++++++++----- pkgs/servers/home-assistant/default.nix | 74 +++---------------- pkgs/servers/home-assistant/frontend.nix | 4 +- pkgs/servers/home-assistant/tests.nix | 7 +- 4 files changed, 59 insertions(+), 90 deletions(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 7a325693a0ff..5a3297094561 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -2,14 +2,14 @@ # Do not edit! { - version = "2021.12.10"; + version = "2022.2.0"; components = { "abode" = ps: with ps; [ abodepy ]; "accuweather" = ps: with ps; [ accuweather ]; "acer_projector" = ps: with ps; [ pyserial ]; "acmeda" = ps: with ps; [ aiopulse ]; "actiontec" = ps: with ps; [ ]; - "adax" = ps: with ps; [ adax ]; + "adax" = ps: with ps; [ adax ]; # missing inputs: Adax-local "adguard" = ps: with ps; [ adguardhome ]; "ads" = ps: with ps; [ pyads ]; "advantage_air" = ps: with ps; [ advantage-air ]; @@ -45,18 +45,18 @@ "apcupsd" = ps: with ps; [ apcaccess ]; "api" = ps: with ps; [ aiohttp-cors ]; "apns" = ps: with ps; [ ]; # missing inputs: apns2 - "apple_tv" = ps: with ps; [ pyatv ]; + "apple_tv" = ps: with ps; [ aiohttp-cors ifaddr pyatv zeroconf ]; "apprise" = ps: with ps; [ apprise ]; "aprs" = ps: with ps; [ aprslib geopy ]; "aqualogic" = ps: with ps; [ aqualogic ]; "aquostv" = ps: with ps; [ ]; # missing inputs: sharp_aquos_rc "arcam_fmj" = ps: with ps; [ arcam-fmj ]; - "arduino" = ps: with ps; [ ]; # missing inputs: PyMata "arest" = ps: with ps; [ ]; "arlo" = ps: with ps; [ ha-ffmpeg pyarlo ]; "arris_tg2492lg" = ps: with ps; [ ]; # missing inputs: arris-tg2492lg "aruba" = ps: with ps; [ pexpect ]; "arwn" = ps: with ps; [ aiohttp-cors paho-mqtt ]; + "aseko_pool_live" = ps: with ps; [ ]; # missing inputs: aioaseko "asterisk_cdr" = ps: with ps; [ ]; # missing inputs: asterisk_mbox "asterisk_mbox" = ps: with ps; [ ]; # missing inputs: asterisk_mbox "asuswrt" = ps: with ps; [ aioasuswrt ]; @@ -66,6 +66,7 @@ "august" = ps: with ps; [ yalexs ]; "aurora" = ps: with ps; [ auroranoaa ]; "aurora_abb_powerone" = ps: with ps; [ ]; # missing inputs: aurorapy + "aussie_broadband" = ps: with ps; [ ]; # missing inputs: pyaussiebb "auth" = ps: with ps; [ aiohttp-cors ]; "automation" = ps: with ps; [ aiohttp-cors ]; "avea" = ps: with ps; [ avea ]; @@ -181,6 +182,7 @@ "dexcom" = ps: with ps; [ pydexcom ]; "dhcp" = ps: with ps; [ aiodiscover scapy ]; "dht" = ps: with ps; [ ]; # missing inputs: RPi.GPIO adafruit-circuitpython-dht + "diagnostics" = ps: with ps; [ aiohttp-cors ]; "dialogflow" = ps: with ps; [ aiohttp-cors ]; "digital_ocean" = ps: with ps; [ digital-ocean ]; "digitalloggers" = ps: with ps; [ ]; # missing inputs: dlipower @@ -223,6 +225,7 @@ "elgato" = ps: with ps; [ elgato ]; "eliqonline" = ps: with ps; [ eliqonline ]; "elkm1" = ps: with ps; [ elkm1-lib ]; + "elmax" = ps: with ps; [ elmax-api ]; "elv" = ps: with ps; [ pypca ]; "emby" = ps: with ps; [ pyemby ]; "emoncms" = ps: with ps; [ ]; @@ -282,7 +285,7 @@ "flume" = ps: with ps; [ pyflume ]; "flunearyou" = ps: with ps; [ pyflunearyou ]; "flux" = ps: with ps; [ ]; - "flux_led" = ps: with ps; [ flux-led ]; + "flux_led" = ps: with ps; [ aiohttp-cors flux-led ifaddr ]; "folder" = ps: with ps; [ ]; "folder_watcher" = ps: with ps; [ watchdog ]; "foobot" = ps: with ps; [ foobot-async ]; @@ -325,6 +328,7 @@ "goalfeed" = ps: with ps; [ ]; # missing inputs: pysher "goalzero" = ps: with ps; [ goalzero ]; "gogogate2" = ps: with ps; [ ismartgate ]; + "goodwe" = ps: with ps; [ goodwe ]; "google" = ps: with ps; [ google-api-python-client httplib2 oauth2client ]; "google_assistant" = ps: with ps; [ pyturbojpeg aiohttp-cors ]; "google_cloud" = ps: with ps; [ google-cloud-texttospeech ]; @@ -371,6 +375,7 @@ "homekit_controller" = ps: with ps; [ aiohomekit aiohttp-cors ifaddr zeroconf ]; "homematic" = ps: with ps; [ pyhomematic ]; "homematicip_cloud" = ps: with ps; [ homematicip ]; + "homewizard" = ps: with ps; [ aiohwenergy ]; "homeworks" = ps: with ps; [ pyhomeworks ]; "honeywell" = ps: with ps; [ somecomfort ]; "horizon" = ps: with ps; [ ]; # missing inputs: horimote @@ -402,12 +407,14 @@ "incomfort" = ps: with ps; [ incomfort-client ]; "influxdb" = ps: with ps; [ influxdb-client influxdb ]; "input_boolean" = ps: with ps; [ ]; + "input_button" = ps: with ps; [ ]; "input_datetime" = ps: with ps; [ ]; "input_number" = ps: with ps; [ ]; "input_select" = ps: with ps; [ ]; "input_text" = ps: with ps; [ ]; "insteon" = ps: with ps; [ pyinsteon ]; "integration" = ps: with ps; [ ]; + "intellifire" = ps: with ps; [ ]; # missing inputs: intellifire4py "intent" = ps: with ps; [ aiohttp-cors ]; "intent_script" = ps: with ps; [ ]; "intesishome" = ps: with ps; [ pyintesishome ]; @@ -482,7 +489,7 @@ "luftdaten" = ps: with ps; [ luftdaten ]; "lupusec" = ps: with ps; [ lupupy ]; "lutron" = ps: with ps; [ pylutron ]; - "lutron_caseta" = ps: with ps; [ aiolip pylutron-caseta ]; + "lutron_caseta" = ps: with ps; [ pylutron-caseta ]; "lw12wifi" = ps: with ps; [ ]; # missing inputs: lw12 "lyric" = ps: with ps; [ aiohttp-cors aiolyric ]; "magicseaweed" = ps: with ps; [ ]; # missing inputs: magicseaweed @@ -574,6 +581,7 @@ "nightscout" = ps: with ps; [ py-nightscout ]; "niko_home_control" = ps: with ps; [ niko-home-control ]; "nilu" = ps: with ps; [ niluclient ]; + "nina" = ps: with ps; [ pynina ]; "nissan_leaf" = ps: with ps; [ pycarwings2 ]; "nmap_tracker" = ps: with ps; [ aiohttp-cors getmac ifaddr netmap ]; # missing inputs: mac-vendor-lookup "nmbs" = ps: with ps; [ ]; # missing inputs: pyrail @@ -601,10 +609,12 @@ "ombi" = ps: with ps; [ pyombi ]; "omnilogic" = ps: with ps; [ omnilogic ]; "onboarding" = ps: with ps; [ aiohttp-cors home-assistant-frontend pillow sqlalchemy ]; + "oncue" = ps: with ps; [ ]; # missing inputs: aiooncue "ondilo_ico" = ps: with ps; [ aiohttp-cors ondilo ]; "onewire" = ps: with ps; [ ]; # missing inputs: pi1wire pyownet "onkyo" = ps: with ps; [ onkyo-eiscp ]; "onvif" = ps: with ps; [ ha-ffmpeg ]; # missing inputs: WSDiscovery onvif-zeep-async + "open_meteo" = ps: with ps; [ open-meteo ]; "openalpr_cloud" = ps: with ps; [ ]; "openalpr_local" = ps: with ps; [ ]; "opencv" = ps: with ps; [ numpy ]; # missing inputs: opencv-python-headless @@ -626,6 +636,7 @@ "orvibo" = ps: with ps; [ orvibo ]; "osramlightify" = ps: with ps; [ ]; # missing inputs: lightify "otp" = ps: with ps; [ pyotp ]; + "overkiz" = ps: with ps; [ ]; # missing inputs: pyoverkiz "ovo_energy" = ps: with ps; [ ovoenergy ]; "owntracks" = ps: with ps; [ pynacl pyturbojpeg aiohttp-cors hass-nabucasa paho-mqtt ]; "ozw" = ps: with ps; [ aiohttp-cors paho-mqtt python-openzwave-mqtt ]; @@ -673,7 +684,7 @@ "pushbullet" = ps: with ps; [ pushbullet ]; "pushover" = ps: with ps; [ pushover-complete ]; "pushsafer" = ps: with ps; [ ]; - "pvoutput" = ps: with ps; [ jsonpath xmltodict ]; + "pvoutput" = ps: with ps; [ pvo ]; "pvpc_hourly_pricing" = ps: with ps; [ aiopvpc ]; "pyload" = ps: with ps; [ ]; "python_script" = ps: with ps; [ restrictedpython ]; @@ -729,6 +740,7 @@ "rpi_rf" = ps: with ps; [ ]; # missing inputs: RPi.GPIO rpi-rf "rss_feed_template" = ps: with ps; [ aiohttp-cors ]; "rtorrent" = ps: with ps; [ ]; + "rtsp_to_webrtc" = ps: with ps; [ pyturbojpeg aiohttp-cors ]; # missing inputs: rtsp-to-webrtc "ruckus_unleashed" = ps: with ps; [ pyruckus ]; "russound_rio" = ps: with ps; [ ]; # missing inputs: russound_rio "russound_rnet" = ps: with ps; [ ]; # missing inputs: russound @@ -749,6 +761,7 @@ "sendgrid" = ps: with ps; [ sendgrid ]; "sense" = ps: with ps; [ sense-energy ]; "sensehat" = ps: with ps; [ ]; # missing inputs: sense-hat + "senseme" = ps: with ps; [ ]; # missing inputs: aiosenseme "sensibo" = ps: with ps; [ ]; # missing inputs: pysensibo "sensor" = ps: with ps; [ sqlalchemy ]; "sentry" = ps: with ps; [ sentry-sdk ]; @@ -803,7 +816,7 @@ "somfy_mylink" = ps: with ps; [ somfy-mylink-synergy ]; "sonarr" = ps: with ps; [ sonarr ]; "songpal" = ps: with ps; [ python-songpal ]; - "sonos" = ps: with ps; [ aiohttp-cors async-upnp-client ifaddr plexapi plexauth plexwebsocket soco zeroconf ]; + "sonos" = ps: with ps; [ aiohttp-cors async-upnp-client ifaddr plexapi plexauth plexwebsocket soco spotipy zeroconf ]; "sony_projector" = ps: with ps; [ pysdcp ]; "soundtouch" = ps: with ps; [ aiohttp-cors ifaddr libsoundtouch zeroconf ]; "spaceapi" = ps: with ps; [ aiohttp-cors ]; @@ -822,9 +835,10 @@ "statistics" = ps: with ps; [ sqlalchemy ]; "statsd" = ps: with ps; [ statsd ]; "steam_online" = ps: with ps; [ ]; # missing inputs: steamodd + "steamist" = ps: with ps; [ aiohttp-cors ifaddr ]; # missing inputs: aiosteamist discovery30303 "stiebel_eltron" = ps: with ps; [ pymodbus ]; # missing inputs: pystiebeleltron "stookalert" = ps: with ps; [ ]; # missing inputs: stookalert - "stream" = ps: with ps; [ aiohttp-cors ha-av ]; + "stream" = ps: with ps; [ pyturbojpeg aiohttp-cors av ]; "streamlabswater" = ps: with ps; [ streamlabswater ]; "stt" = ps: with ps; [ aiohttp-cors ]; "subaru" = ps: with ps; [ subarulink ]; @@ -848,11 +862,10 @@ "syslog" = ps: with ps; [ ]; "system_bridge" = ps: with ps; [ aiohttp-cors ifaddr systembridge zeroconf ]; "system_health" = ps: with ps; [ aiohttp-cors ]; - "system_log" = ps: with ps; [ aiohttp-cors ]; + "system_log" = ps: with ps; [ ]; "systemmonitor" = ps: with ps; [ psutil ]; "tado" = ps: with ps; [ python-tado ]; "tag" = ps: with ps; [ ]; - "tahoma" = ps: with ps; [ tahoma-api ]; "tailscale" = ps: with ps; [ tailscale ]; "tank_utility" = ps: with ps; [ ]; # missing inputs: tank_utility "tankerkoenig" = ps: with ps; [ pytankerkoenig ]; @@ -877,7 +890,7 @@ "thinkingcleaner" = ps: with ps; [ ]; # missing inputs: pythinkingcleaner "thomson" = ps: with ps; [ ]; "threshold" = ps: with ps; [ ]; - "tibber" = ps: with ps; [ pytibber ]; + "tibber" = ps: with ps; [ pytibber sqlalchemy ]; "tikteck" = ps: with ps; [ ]; # missing inputs: tikteck "tile" = ps: with ps; [ pytile ]; "time_date" = ps: with ps; [ ]; @@ -910,7 +923,7 @@ "twilio" = ps: with ps; [ aiohttp-cors twilio ]; "twilio_call" = ps: with ps; [ aiohttp-cors twilio ]; "twilio_sms" = ps: with ps; [ aiohttp-cors twilio ]; - "twinkly" = ps: with ps; [ twinkly-client ]; + "twinkly" = ps: with ps; [ ]; # missing inputs: ttls "twitch" = ps: with ps; [ python-twitch-client ]; "twitter" = ps: with ps; [ twitterapi ]; "ubus" = ps: with ps; [ openwrt-ubus-rpc ]; @@ -919,6 +932,7 @@ "unifi" = ps: with ps; [ aiounifi ]; "unifi_direct" = ps: with ps; [ pexpect ]; "unifiled" = ps: with ps; [ unifiled ]; + "unifiprotect" = ps: with ps; [ aiohttp-cors ]; # missing inputs: pyunifiprotect unifi-discovery "universal" = ps: with ps; [ ]; "upb" = ps: with ps; [ upb-lib ]; "upc_connect" = ps: with ps; [ connect-box ]; @@ -935,7 +949,7 @@ "vacuum" = ps: with ps; [ ]; "vallox" = ps: with ps; [ ]; # missing inputs: vallox-websocket-api "vasttrafik" = ps: with ps; [ ]; # missing inputs: vtjp - "velbus" = ps: with ps; [ velbus-aio ]; + "velbus" = ps: with ps; [ aiohttp-cors pyserial pyudev velbus-aio ]; "velux" = ps: with ps; [ pyvlx ]; "venstar" = ps: with ps; [ venstarcolortouch ]; "vera" = ps: with ps; [ pyvera ]; @@ -967,11 +981,11 @@ "waze_travel_time" = ps: with ps; [ wazeroutecalculator ]; "weather" = ps: with ps; [ ]; "webhook" = ps: with ps; [ aiohttp-cors ]; - "webostv" = ps: with ps; [ aiopylgtv ]; + "webostv" = ps: with ps; [ sqlalchemy ]; # missing inputs: aiowebostv "websocket_api" = ps: with ps; [ aiohttp-cors ]; "wemo" = ps: with ps; [ pywemo ]; "whirlpool" = ps: with ps; [ whirlpool-sixth-sense ]; - "whois" = ps: with ps; [ python-whois ]; + "whois" = ps: with ps; [ whois ]; "wiffi" = ps: with ps; [ wiffi ]; "wilight" = ps: with ps; [ pywilight ]; "wirelesstag" = ps: with ps; [ ]; # missing inputs: wirelesstagpy @@ -1023,7 +1037,6 @@ "abode" "accuweather" "acmeda" - "adax" "adguard" "advantage_air" "aemet" @@ -1103,6 +1116,7 @@ "coronavirus" "counter" "cover" + "cpuspeed" "crownstone" "daikin" "darksky" @@ -1120,10 +1134,12 @@ "devolo_home_network" "dexcom" "dhcp" + "diagnostics" "dialogflow" "directv" "discovery" "dlna_dmr" + "dnsip" "doorbird" "dsmr" "dte_energy_bridge" @@ -1135,6 +1151,7 @@ "efergy" "elgato" "elkm1" + "elmax" "emonitor" "emulated_hue" "emulated_kasa" @@ -1162,6 +1179,7 @@ "fireservicerota" "firmata" "fjaraskupan" + "flic" "flick_electric" "flipr" "flo" @@ -1194,9 +1212,11 @@ "geonetnz_quakes" "geonetnz_volcano" "gios" + "github" "glances" "goalzero" "gogogate2" + "goodwe" "google" "google_assistant" "google_domains" @@ -1229,6 +1249,7 @@ "homekit_controller" "homematic" "homematicip_cloud" + "homewizard" "honeywell" "html5" "http" @@ -1249,6 +1270,7 @@ "imap_email_content" "influxdb" "input_boolean" + "input_button" "input_datetime" "input_number" "input_select" @@ -1277,6 +1299,7 @@ "kraken" "kulersky" "lastfm" + "launch_library" "lcn" "light" "litterrobot" @@ -1343,6 +1366,7 @@ "network" "nexia" "nightscout" + "nina" "no_ip" "notify" "notion" @@ -1356,6 +1380,7 @@ "omnilogic" "onboarding" "ondilo_ico" + "open_meteo" "openalpr_cloud" "openalpr_local" "openerz" @@ -1389,6 +1414,7 @@ "proximity" "push" "pushbullet" + "pvoutput" "pvpc_hourly_pricing" "python_script" "qld_bushfire" @@ -1453,6 +1479,7 @@ "snips" "solaredge" "solarlog" + "solax" "soma" "somfy" "somfy_mylink" @@ -1519,7 +1546,6 @@ "tuya" "twentemilieu" "twilio" - "twinkly" "twitch" "uk_transport" "unifi" @@ -1556,10 +1582,10 @@ "waze_travel_time" "weather" "webhook" - "webostv" "websocket_api" "wemo" "whirlpool" + "whois" "wiffi" "wilight" "wled" diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index e26c38bc87f3..6890311255cb 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -25,19 +25,6 @@ let defaultOverrides = [ - # aiounify 29 breaks integration tests - (self: super: { - aiounifi = super.aiounifi.overridePythonAttrs (oldAttrs: rec { - version = "28"; - src = fetchFromGitHub { - owner = "Kane610"; - repo = "aiounifi"; - rev = "v${version}"; - sha256 = "1r86pk80sa1la2s7c6v9svh5cpkci6jcw1xziz0h09jdvv5j5iff"; - }; - }); - }) - # Override the version of some packages pinned in Home Assistant's setup.py and requirements_all.txt (mkOverride "python-slugify" "4.0.1" "69a517766e00c1268e5bbfc0d010a0a8508de0b18d30ad5a1ff357f8ae724270") @@ -54,36 +41,6 @@ let }); }) - # Pinned due to API changes in iaqualink>=2.0, remove after - # https://github.com/home-assistant/core/pull/48137 was merged - (self: super: { - iaqualink = super.iaqualink.overridePythonAttrs (oldAttrs: rec { - version = "0.3.90"; - src = fetchFromGitHub { - owner = "flz"; - repo = "iaqualink-py"; - rev = "v${version}"; - sha256 = "0c8ckbbr1n8gx5k63ymgyfkbz3d0rbdvghg8fqdvbg4nrigrs5v0"; - }; - checkInputs = oldAttrs.checkInputs ++ [ python3.pkgs.asynctest ]; - }); - }) - - # Pinned due to API changes in influxdb-client>1.21.0 - (self: super: { - influxdb-client = super.influxdb-client.overridePythonAttrs (oldAttrs: rec { - version = "1.21.0"; - src = fetchFromGitHub { - owner = "influxdata"; - repo = "influxdb-client-python"; - rev = "v${version}"; - sha256 = "081pwd3aa7kbgxqcl1hfi2ny4iapnxkcp9ypsfslr69d0khvfc4s"; - }; - }); - }) - - (mkOverride "jinja2" "3.0.3" "1mvwr02s86zck5wsmd9wjxxb9iaqr17hdi5xza9vkwv8rmrv46v1") - # Pinned due to API changes in pyruckus>0.12 (self: super: { pyruckus = super.pyruckus.overridePythonAttrs (oldAttrs: rec { @@ -97,24 +54,11 @@ let }); }) - # Pinned due to API changes in eebrightbox>=0.0.5 - (self: super: { - eebrightbox = super.eebrightbox.overridePythonAttrs (oldAttrs: rec { - version = "0.0.4"; - src = fetchFromGitHub { - owner = "krygal"; - repo = "eebrightbox"; - rev = version; - sha256 = "0d8mmpwgrd7gymw5263r1v2wjv6dx6w6pq13d62fkfm4h2hya4a4"; - }; - }); - }) - # Pinned due to API changes in 0.1.0 (mkOverride "poolsense" "0.0.8" "09y4fq0gdvgkfsykpxnvmfv92dpbknnq5v82spz43ak6hjnhgcyp") # Requirements for recorder not found: ['sqlalchemy==1.4.27']. - (mkOverride "sqlalchemy" "1.4.27" "031jbd0svrvwr3n52iibp9mkwsj9wicnck45yd26da5kmsfkas6p") + #(mkOverride "sqlalchemy" "1.4.27" "031jbd0svrvwr3n52iibp9mkwsj9wicnck45yd26da5kmsfkas6p") # Pinned due to API changes in 0.4.0 (self: super: { @@ -177,14 +121,15 @@ let extraBuildInputs = extraPackages python.pkgs; # Don't forget to run parse-requirements.py after updating - hassVersion = "2021.12.10"; + hassVersion = "2022.2.0"; in python.pkgs.buildPythonApplication rec { pname = "homeassistant"; version = assert (componentPackages.version == hassVersion); hassVersion; + format = "pyproject"; # check REQUIRED_PYTHON_VER in homeassistant/const.py - disabled = python.pythonOlder "3.8"; + disabled = python.pythonOlder "3.9"; # don't try and fail to strip 6600+ python files, it takes minutes! dontStrip = true; @@ -194,7 +139,7 @@ in python.pkgs.buildPythonApplication rec { owner = "home-assistant"; repo = "core"; rev = version; - hash = "sha256:0nyddcjy4diq5bakpb76frax44i0jraj2vvpfxrj50h9l5pdwsaf"; + hash = "sha256:01gx6i147h7amj41mv46x6j9aah4qd1zjybv5px5y9p5cbhjccms"; }; # leave this in, so users don't have to constantly update their downstream patch handling @@ -223,9 +168,9 @@ in python.pkgs.buildPythonApplication rec { in '' sed -r -i \ ${lib.concatStringsSep "\n" (map (package: - ''-e 's@${package}[<>=]+.*@${package}",@g' \'' + ''-e 's@${package}[<>=]+.*@${package}@g' \'' ) relaxedConstraints)} - setup.py + setup.cfg substituteInPlace tests/test_config.py --replace '"/usr"' '"/build/media"' ''; @@ -256,8 +201,6 @@ in python.pkgs.buildPythonApplication rec { yarl # Not in setup.py, but used in homeassistant/util/package.py setuptools - ] ++ lib.optionals (pythonOlder "3.9") [ - backports-zoneinfo ] ++ componentBuildInputs ++ extraBuildInputs; makeWrapperArgs = lib.optional skipPip "--add-flags --skip-pip"; @@ -280,6 +223,9 @@ in python.pkgs.buildPythonApplication rec { respx stdlib-list tqdm + # required by tests/pylint + astroid + pylint # required by tests/auth/mfa_modules pyotp ] ++ lib.concatMap (component: getPackages component python.pkgs) [ diff --git a/pkgs/servers/home-assistant/frontend.nix b/pkgs/servers/home-assistant/frontend.nix index cdb60172fa8f..cda024cd1bee 100644 --- a/pkgs/servers/home-assistant/frontend.nix +++ b/pkgs/servers/home-assistant/frontend.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { # the frontend version corresponding to a specific home-assistant version can be found here # https://github.com/home-assistant/home-assistant/blob/master/homeassistant/components/frontend/manifest.json pname = "home-assistant-frontend"; - version = "20211229.1"; + version = "20220202.0"; src = fetchPypi { inherit pname version; - sha256 = "sha256-glVjJ9iOmhAIGD65PHQu9l7Wc/lr5XRya2mi20/UVgs="; + sha256 = "sha256-O5oDDptQmwM02SESSS314YlvCqrOcEHNBSKlYE/qrTc="; }; # there is nothing to strip in this package diff --git a/pkgs/servers/home-assistant/tests.nix b/pkgs/servers/home-assistant/tests.nix index 8e552ed15e0b..25bd411b76f6 100644 --- a/pkgs/servers/home-assistant/tests.nix +++ b/pkgs/servers/home-assistant/tests.nix @@ -50,17 +50,14 @@ in lib.listToAttrs (map (component: lib.nameValuePair component ( ++ extraPytestFlagsArray.${component} or [ ] ++ [ "tests/components/${component}" ]; - preCheck = old.preCheck + lib.optionalString (component != "network") '' + preCheck = old.preCheck + lib.optionalString (builtins.elem component [ "emulated_hue" "songpal" "system_log" ]) '' patch -p1 < ${./patches/tests-mock-source-ip.patch} ''; meta = old.meta // { broken = lib.elem component [ "airtouch4" - "glances" - "ridwell" - "venstar" - "yamaha_musiccast" + "dnsip" ]; # upstream only tests on Linux, so do we. platforms = lib.platforms.linux; From 225fd5c892a21ef1d75979aee4c41cd10abb3c8b Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Wed, 2 Feb 2022 23:00:34 +0100 Subject: [PATCH 090/214] python3Packages.glean-sdk: 42.2.0 -> 43.0.2 --- .../python-modules/glean-sdk/default.nix | 12 +++-------- .../fix-spawned-process-environment.patch | 20 ------------------- 2 files changed, 3 insertions(+), 29 deletions(-) delete mode 100644 pkgs/development/python-modules/glean-sdk/fix-spawned-process-environment.patch diff --git a/pkgs/development/python-modules/glean-sdk/default.nix b/pkgs/development/python-modules/glean-sdk/default.nix index e729d927cdae..e52f2def3954 100644 --- a/pkgs/development/python-modules/glean-sdk/default.nix +++ b/pkgs/development/python-modules/glean-sdk/default.nix @@ -12,23 +12,17 @@ buildPythonPackage rec { pname = "glean-sdk"; - version = "42.2.0"; + version = "43.0.2"; src = fetchPypi { inherit pname version; - sha256 = "sha256-X2p6KQnEB6ZHdCHGFVEoEMiI+0R2vfGqel+jFKTcx74="; + sha256 = "sha256-9LLE7cUJhJ+0/rFtVkSdiXUohrXW0JFy3XcYMAAivfw="; }; - patches = [ - # Fix the environment for spawned process - # https://github.com/mozilla/glean/pull/1542 - ./fix-spawned-process-environment.patch - ]; - cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - sha256 = "sha256-/+rKGPYTLovgjTGL2F/pWzlUy1tY207yuJz3Xdhm1hg="; + sha256 = "sha256:1qi7zn2278jpry466w3xj1wpyy5f82bffi55i6nva591i3r1z4am"; }; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/glean-sdk/fix-spawned-process-environment.patch b/pkgs/development/python-modules/glean-sdk/fix-spawned-process-environment.patch deleted file mode 100644 index f9a7b2723eba..000000000000 --- a/pkgs/development/python-modules/glean-sdk/fix-spawned-process-environment.patch +++ /dev/null @@ -1,20 +0,0 @@ -diff --git a/glean-core/python/glean/_process_dispatcher.py b/glean-core/python/glean/_process_dispatcher.py -index 33a8b12796..a39b54a917 100644 ---- a/glean-core/python/glean/_process_dispatcher.py -+++ b/glean-core/python/glean/_process_dispatcher.py -@@ -120,8 +120,14 @@ def dispatch(cls, func, args) -> Union[_SyncWorkWrapper, subprocess.Popen]: - Path(".coveragerc").absolute() - ) - -+ # Explicitly pass the contents of `sys.path` as `PYTHONPATH` to the -+ # subprocess so that there aren't any module search path -+ # differences. -+ python_path = ":".join(sys.path)[1:] -+ - p = subprocess.Popen( -- [sys.executable, _process_dispatcher_helper.__file__, payload] -+ [sys.executable, _process_dispatcher_helper.__file__, payload], -+ env={"PYTHONPATH": python_path}, - ) - - cls._last_process = p From 5b8e263c9034522effe49a0eb4efbedd96e8815d Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 3 Feb 2022 00:09:27 +0100 Subject: [PATCH 091/214] python3Packages.eebrightbox: drop The package is unmaintained upstream and was introduced because it was a dependency in home-assistant. That is no longer the case. --- .../python-modules/eebrightbox/default.nix | 58 ------------------- pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 2 - 3 files changed, 1 insertion(+), 60 deletions(-) delete mode 100644 pkgs/development/python-modules/eebrightbox/default.nix diff --git a/pkgs/development/python-modules/eebrightbox/default.nix b/pkgs/development/python-modules/eebrightbox/default.nix deleted file mode 100644 index d8050b9bf5e3..000000000000 --- a/pkgs/development/python-modules/eebrightbox/default.nix +++ /dev/null @@ -1,58 +0,0 @@ -{ lib -, buildPythonPackage -, fetchFromGitHub -, pbr -, calmjs-parse -, certifi -, chardet -, idna -, ply -, requests -, urllib3 -, httpretty -, pytestCheckHook -}: - -buildPythonPackage rec { - pname = "eebrightbox"; - version = "0.0.6"; - - src = fetchFromGitHub { - owner = "krygal"; - repo = "eebrightbox"; - rev = version; - sha256 = "1kms240g01871qbvyc5rzf86yxsrlnfvp323jh4k35fpf45z44rr"; - }; - - postPatch = '' - substituteInPlace requirements.txt --replace "==" ">=" - ''; - - nativeBuildInputs = [ - pbr - ]; - - PBR_VERSION = version; - - propagatedBuildInputs = [ - calmjs-parse - certifi - chardet - idna - ply - requests - urllib3 - ]; - - checkInputs = [ - httpretty - pytestCheckHook - ]; - - meta = with lib; { - description = "Connector for EE BrightBox routers"; - homepage = "https://github.com/krygal/eebrightbox"; - license = licenses.mit; - maintainers = with maintainers; [ dotlambda ]; - }; -} diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index a221e083fa31..c8519b58d587 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -52,6 +52,7 @@ mapAliases ({ dns = dnspython; # added 2017-12-10 dogpile_cache = dogpile-cache; # added 2021-10-28 dogpile-core = throw "dogpile-core is no longer maintained, use dogpile-cache instead"; # added 2021-11-20 + eebrightbox = throw "eebrightbox is unmaintained upstream and has therefore been removed"; # added 2022-02-03 faulthandler = throw "faulthandler is built into ${python.executable}"; # added 2021-07-12 gitdb2 = throw "gitdb2 has been deprecated, use gitdb instead."; # added 2020-03-14 glances = throw "glances has moved to pkgs.glances"; # added 2020-20-28 diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 920214488d76..b0d445c6f37a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -2512,8 +2512,6 @@ in { edward = callPackage ../development/python-modules/edward { }; - eebrightbox = callPackage ../development/python-modules/eebrightbox { }; - effect = callPackage ../development/python-modules/effect { }; eggdeps = callPackage ../development/python-modules/eggdeps { }; From 6267a995ec2abd5c4a9f977851e54ffaa7080977 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 3 Feb 2022 01:37:20 +0100 Subject: [PATCH 092/214] nixos/home-assistant: drop --runner flag Home Assistant now always emits exit code 100 when a restart is requested, making this option redundant. --- nixos/modules/services/misc/home-assistant.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/services/misc/home-assistant.nix b/nixos/modules/services/misc/home-assistant.nix index ac4c0222aac3..fc8ce08b2e13 100644 --- a/nixos/modules/services/misc/home-assistant.nix +++ b/nixos/modules/services/misc/home-assistant.nix @@ -329,7 +329,7 @@ in { "zwave_js" ]; in { - ExecStart = "${package}/bin/hass --runner --config '${cfg.configDir}'"; + ExecStart = "${package}/bin/hass --config '${cfg.configDir}'"; ExecReload = "${pkgs.coreutils}/bin/kill -HUP $MAINPID"; User = "hass"; Group = "hass"; From a63b5c9e5cbc8bbee514eff72acffacde530942d Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 2 Feb 2022 18:05:07 +0000 Subject: [PATCH 093/214] clickhouse-cli: 0.3.7 -> 0.3.8 --- pkgs/development/python-modules/clickhouse-cli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/clickhouse-cli/default.nix b/pkgs/development/python-modules/clickhouse-cli/default.nix index 68d69023e25d..4806f965f092 100644 --- a/pkgs/development/python-modules/clickhouse-cli/default.nix +++ b/pkgs/development/python-modules/clickhouse-cli/default.nix @@ -10,11 +10,11 @@ buildPythonPackage rec { pname = "clickhouse-cli"; - version = "0.3.7"; + version = "0.3.8"; src = fetchPypi { inherit pname version; - sha256 = "sha256-fDvUdL6LzgCv6LDmB0R0M7v6BbnbL68p9pHMebP58h8="; + sha256 = "sha256-pa3vkIyNblS1LOwBReTqg8JAR2Ii32a2QIHWjau0uZE="; }; propagatedBuildInputs = [ From 5d6e9b3d53734b1956ea35f4b8280e95a064bb09 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 2 Feb 2022 18:30:21 +0100 Subject: [PATCH 094/214] python3Packages.pubnub: 6.0.0 -> 6.0.1 --- pkgs/development/python-modules/pubnub/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pubnub/default.nix b/pkgs/development/python-modules/pubnub/default.nix index 6464b376d60e..c36554122de1 100644 --- a/pkgs/development/python-modules/pubnub/default.nix +++ b/pkgs/development/python-modules/pubnub/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "pubnub"; - version = "6.0.0"; + version = "6.0.1"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = pname; repo = "python"; rev = "v${version}"; - hash = "sha256-ktwPut4FBkPMukUk00I1xNOuTvSJkbskPOjoYDJN5Eg="; + hash = "sha256-TXxnFKDq1eWShimtNKaUMEQrs1nRQ8NqAQSI8Hutcp8="; }; propagatedBuildInputs = [ From 6536222c0051bcfe9660f83af74d187dcd33a41a Mon Sep 17 00:00:00 2001 From: Charlotte Van Petegem Date: Wed, 2 Feb 2022 09:38:03 +0100 Subject: [PATCH 095/214] python3Packages.pywlroots: 0.15.4 -> 0.15.6 --- pkgs/development/python-modules/pywlroots/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pywlroots/default.nix b/pkgs/development/python-modules/pywlroots/default.nix index ebe0825a360d..1b38517cde61 100644 --- a/pkgs/development/python-modules/pywlroots/default.nix +++ b/pkgs/development/python-modules/pywlroots/default.nix @@ -18,11 +18,11 @@ buildPythonPackage rec { pname = "pywlroots"; - version = "0.15.4"; + version = "0.15.6"; src = fetchPypi { inherit pname version; - sha256 = "Cyj3B9uK1RoIuStCO+z9/bq7RjTPdjTqVhfc+tCRofo="; + sha256 = "vOdmwsMyDzz1kbA7+W2irax/1SFSNYTrRCQjfW7Npzk="; }; # The XWayland detection uses some hard-coded FHS paths. Since we From ebd52e4984e44283adbc2746274b3936983cb5d7 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 2 Feb 2022 19:28:14 +0000 Subject: [PATCH 096/214] python310Packages.vowpalwabbit: 9.0.0 -> 9.0.1 --- pkgs/development/python-modules/vowpalwabbit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/vowpalwabbit/default.nix b/pkgs/development/python-modules/vowpalwabbit/default.nix index 472e8138591f..87c3d7fe30c3 100644 --- a/pkgs/development/python-modules/vowpalwabbit/default.nix +++ b/pkgs/development/python-modules/vowpalwabbit/default.nix @@ -18,11 +18,11 @@ buildPythonPackage rec { pname = "vowpalwabbit"; - version = "9.0.0"; + version = "9.0.1"; src = fetchPypi{ inherit pname version; - sha256 = "sha256-Ah6ITMdmbVay0CL7nR4vKRTlxbPfZFlqWaaBvU9olqk="; + sha256 = "sha256-rDUgOjroY8S73+s+MWyBl86u+8XCH4O8KMCo9zUlqAs="; }; nativeBuildInputs = [ From 6d957f73abd92d193a55b09660c2d2b39bc87e33 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 3 Feb 2022 02:08:33 +0000 Subject: [PATCH 097/214] vowpal-wabbit: 8.11.0 -> 9.0.1 --- .../science/machine-learning/vowpal-wabbit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/machine-learning/vowpal-wabbit/default.nix b/pkgs/applications/science/machine-learning/vowpal-wabbit/default.nix index 7e9b322b4157..8dd55efaeb52 100644 --- a/pkgs/applications/science/machine-learning/vowpal-wabbit/default.nix +++ b/pkgs/applications/science/machine-learning/vowpal-wabbit/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "vowpal-wabbit"; - version = "8.11.0"; + version = "9.0.1"; src = fetchFromGitHub { owner = "VowpalWabbit"; repo = "vowpal_wabbit"; rev = version; - sha256 = "sha256-F3la4n1ULMN2nktr+PVWFPl3V2RfCowR0ozL+dnbhgA="; + sha256 = "sha256-ZUurY2bmTKKIW4GR4oiIpLxb6DSRUNJI/EyNSOu9D9c="; }; nativeBuildInputs = [ cmake ]; From 7b5b5adfcc80164e27031646c99ce87d0fd024aa Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 2 Feb 2022 01:43:07 +0000 Subject: [PATCH 098/214] sentry-native: 0.4.13 -> 0.4.14 --- pkgs/development/libraries/sentry-native/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/sentry-native/default.nix b/pkgs/development/libraries/sentry-native/default.nix index ba4c8fcd0efd..d7fa0f0ff072 100644 --- a/pkgs/development/libraries/sentry-native/default.nix +++ b/pkgs/development/libraries/sentry-native/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "sentry-native"; - version = "0.4.13"; + version = "0.4.14"; src = fetchFromGitHub { owner = "getsentry"; repo = "sentry-native"; rev = version; - sha256 = "sha256-btgv/GwwQhT/DtWhjM/g081UYLT7E76ZhqXZdMiIWsk="; + sha256 = "sha256-DMVMS7Mshglg7+QkHzZvmZ2dhEFbQRqcHU98JiaysCg="; }; nativeBuildInputs = [ cmake ]; From 8ab663aaa5fbe8ae90931cb64d2dbd64dfac5c0c Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Thu, 3 Feb 2022 03:32:36 +0000 Subject: [PATCH 099/214] brave: 1.34.81 -> 1.35.100 https://github.com/brave/brave-browser/blob/master/CHANGELOG_DESKTOP.md#135100 --- pkgs/applications/networking/browsers/brave/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/brave/default.nix b/pkgs/applications/networking/browsers/brave/default.nix index 3c0690861134..16be1b2f7c01 100644 --- a/pkgs/applications/networking/browsers/brave/default.nix +++ b/pkgs/applications/networking/browsers/brave/default.nix @@ -93,11 +93,11 @@ in stdenv.mkDerivation rec { pname = "brave"; - version = "1.34.81"; + version = "1.35.100"; src = fetchurl { url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb"; - sha256 = "bMNk1l3MguQho0vck78U1e3A+/571DyoWSKKerQVE7s="; + sha256 = "ToPh2uhWHMR6CS7wtos26iVuyKLXi3ctOP/dFyeosoM="; }; dontConfigure = true; From c52e85672b425130b1d76ba8f08abeac02458408 Mon Sep 17 00:00:00 2001 From: Peter Hoeg Date: Tue, 1 Feb 2022 21:14:42 +0800 Subject: [PATCH 100/214] qemu: remove broker wrapper script --- .../virtualization/qemu/default.nix | 28 +------------------ 1 file changed, 1 insertion(+), 27 deletions(-) diff --git a/pkgs/applications/virtualization/qemu/default.nix b/pkgs/applications/virtualization/qemu/default.nix index 059057bc497b..c45c519f370c 100644 --- a/pkgs/applications/virtualization/qemu/default.nix +++ b/pkgs/applications/virtualization/qemu/default.nix @@ -243,13 +243,7 @@ stdenv.mkDerivation rec { # Add a ‘qemu-kvm’ wrapper for compatibility/convenience. postInstall = '' - install -m755 -D $emitKvmWarningsPath $out/libexec/emit-kvm-warnings - if [ -x $out/bin/qemu-system-${stdenv.hostPlatform.qemuArch} ]; then - makeWrapper $out/bin/qemu-system-${stdenv.hostPlatform.qemuArch} \ - $out/bin/qemu-kvm \ - --run $out/libexec/emit-kvm-warnings \ - --add-flags "\$([ -r /dev/kvm -a -w /dev/kvm ] && echo -enable-kvm)" - fi + ln -s $out/bin/qemu-system-${stdenv.hostPlatform.qemuArch} $out/bin/qemu-kvm ''; passthru = { @@ -259,26 +253,6 @@ stdenv.mkDerivation rec { # Builds in ~3h with 2 cores, and ~20m with a big-parallel builder. requiredSystemFeatures = [ "big-parallel" ]; - emitKvmWarnings = '' - #!${runtimeShell} - WARNCOL='\033[1;35m' - NEUTRALCOL='\033[0m' - WARNING="''${WARNCOL}warning:''${NEUTRALCOL}" - if [ ! -e /dev/kvm ]; then - echo -e "''${WARNING} KVM is not available - execution will be slow" >&2 - echo "Consider installing KVM for hardware-accelerated execution." >&2 - echo "If KVM is already installed make sure the kernel module is loaded." >&2 - elif [ ! -r /dev/kvm -o ! -w /dev/kvm ]; then - echo -e "''${WARNING} /dev/kvm is not read-/writable - execution will be slow" >&2 - echo "/dev/kvm needs to be read-/writable by the user executing QEMU." >&2 - echo "" >&2 - echo "For hardware-acceleration inside the nix build sandbox /dev/kvm" >&2 - echo "must be world-read-/writable (rw-rw-rw-)." >&2 - fi - ''; - - passAsFile = [ "emitKvmWarnings" ]; - meta = with lib; { homepage = "http://www.qemu.org/"; description = "A generic and open source machine emulator and virtualizer"; From cd17b35b1c77e4d5102d09895f975778cad3c10a Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Thu, 3 Feb 2022 03:42:54 +0000 Subject: [PATCH 101/214] electron_13: 13.6.8 -> 13.6.9 https://github.com/electron/electron/releases/tag/v13.6.9 --- pkgs/development/tools/electron/default.nix | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/pkgs/development/tools/electron/default.nix b/pkgs/development/tools/electron/default.nix index 149b1aa5ab19..cb209a45119a 100644 --- a/pkgs/development/tools/electron/default.nix +++ b/pkgs/development/tools/electron/default.nix @@ -80,14 +80,14 @@ rec { headers = "1idam1xirxqxqg4g7n33kdx2skk0r351m00g59a8yx9z82g06ah9"; }; - electron_13 = mkElectron "13.6.8" { - armv7l-linux = "94cf65f1454ea26017d80cd98a9fd3d9c9767d2a2ba7030d29d674d643814d59"; - aarch64-linux = "5579b20438e5637f0ec8e0f07a46d5359691bfd631290372d538217c1904e07b"; - x86_64-linux = "054f2a83a1361ea25438b609a681adb8c8dec8a2f03fd5b3605b10818799ea01"; - i686-linux = "87cb2af357ba568fb56c99aea0a25714501fbacd02ce27c9ba55e3db8deb5535"; - x86_64-darwin = "d8fa0254c4a5fe61f5a047f9cb6968a2dbc817cbd10cac1fd9c9d362608bc58d"; - aarch64-darwin = "8e59ea97744791f7edaf3ff4c2fa1a144f9737c165c29ee0f0d13175a2140399"; - headers = "0s253jdmfyfgb5mwslqd50g623fwj3dgsgsq4cn3pl5qfpmcm26x"; + electron_13 = mkElectron "13.6.9" { + armv7l-linux = "e70cf80ac17850f3291c19a89235c59a7a6e0c791e7965805872ce584479c419"; + aarch64-linux = "cb570f77e46403a75b99740c41b297154f057dc3b9aa75fd235dccc5619972cf"; + x86_64-linux = "5e29701394041ba2acd8a9bb042d77967c399b8fe007d7ffbd1d3e6bfdb9eb8a"; + i686-linux = "7c31b60ee0e1d9966b8cf977528ace91e10ce25bb289a46eabbcf6087bee50e6"; + x86_64-darwin = "3393f0e87f30be325b76fb2275fe2d5614d995457de77fe00fa6eef2d60f331e"; + aarch64-darwin = "8471777eafc6fb641148a9c6acff2ea41c02a989d4d0a3a460322672d85169df"; + headers = "0vvizddmhprprbdf6bklasz6amwc254bpc9j0zlx23d1pgyxpnhc"; }; electron_14 = mkElectron "14.2.5" { From 2571561c50fa86155fb153da0c52005c1a4d5dfe Mon Sep 17 00:00:00 2001 From: TredwellGit Date: Thu, 3 Feb 2022 03:51:45 +0000 Subject: [PATCH 102/214] element-desktop: update electron_13 -> electron_15 https://github.com/vector-im/element-desktop/blob/v1.10.1/package.json#L64 --- 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 7c45b47fda39..69de14818e2b 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2981,7 +2981,7 @@ with pkgs; element-desktop = callPackage ../applications/networking/instant-messengers/element/element-desktop.nix { inherit (darwin.apple_sdk.frameworks) Security AppKit CoreServices; - electron = electron_13; + electron = electron_15; }; element-desktop-wayland = writeScriptBin "element-desktop" '' #!/bin/sh From df8f06c8e58dc0f643c3238ab3ecee223afec4ea Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Wed, 2 Feb 2022 09:18:58 -0800 Subject: [PATCH 103/214] release-small.nix: cleanup --- pkgs/top-level/release-small.nix | 3 --- 1 file changed, 3 deletions(-) diff --git a/pkgs/top-level/release-small.nix b/pkgs/top-level/release-small.nix index 66c6bb373484..a9ff7f369092 100644 --- a/pkgs/top-level/release-small.nix +++ b/pkgs/top-level/release-small.nix @@ -30,7 +30,6 @@ with import ./release-lib.nix { inherit supportedSystems nixpkgsArgs; }; bind = linux; bsdiff = all; bzip2 = all; - classpath = linux; cmake = all; coreutils = all; cpio = all; @@ -58,7 +57,6 @@ with import ./release-lib.nix { inherit supportedSystems nixpkgsArgs; }; gnused = all; gnutar = all; gnutls = linux; - gogoclient = linux; grub = linux; grub2 = linux; gsl = linux; @@ -103,7 +101,6 @@ with import ./release-lib.nix { inherit supportedSystems nixpkgsArgs; }; mesa = mesaPlatforms; midori = linux; mingetty = linux; - mk = linux; mktemp = all; mono = linux; monotone = linux; From 702a93b15ebcdb592b7110bbb20aad3f6592997c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Koz=C5=82owski?= Date: Thu, 3 Feb 2022 04:28:57 +0100 Subject: [PATCH 104/214] vscode-extensions.kubukoz.nickel-syntax: init at 0.0.1 --- pkgs/misc/vscode-extensions/default.nix | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/pkgs/misc/vscode-extensions/default.nix b/pkgs/misc/vscode-extensions/default.nix index f37183e30229..3010c270e37c 100644 --- a/pkgs/misc/vscode-extensions/default.nix +++ b/pkgs/misc/vscode-extensions/default.nix @@ -1173,6 +1173,18 @@ let }; }; + kubukoz.nickel-syntax = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "nickel-syntax"; + publisher = "kubukoz"; + version = "0.0.1"; + sha256 = "010zn58j9kdb2jpxmlfyyyais51pwn7v2c5cfi4051ayd02b9n3s"; + }; + meta = { + license = lib.licenses.asl20; + }; + }; + llvm-vs-code-extensions.vscode-clangd = buildVscodeMarketplaceExtension { mktplcRef = { name = "vscode-clangd"; From ee99db6c3fc1f5d84d32e54be380865a01ff0962 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Koz=C5=82owski?= Date: Thu, 3 Feb 2022 04:29:26 +0100 Subject: [PATCH 105/214] vscode-extensions.scalameta.metals: 1.12.0 -> 1.12.18 --- pkgs/misc/vscode-extensions/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/vscode-extensions/default.nix b/pkgs/misc/vscode-extensions/default.nix index 3010c270e37c..c5ea1082ec53 100644 --- a/pkgs/misc/vscode-extensions/default.nix +++ b/pkgs/misc/vscode-extensions/default.nix @@ -1558,8 +1558,8 @@ let mktplcRef = { name = "metals"; publisher = "scalameta"; - version = "1.12.0"; - sha256 = "13zwjnrmkrs3wxh8c9nz9zxxs3p6lkj41q30v4a1md5pscfa1s44"; + version = "1.12.18"; + sha256 = "104h3qfdn0y4138g3mdw1209qqh3mj3jsdsbzpnw2plk1cmr3nx5"; }; meta = { license = lib.licenses.asl20; From 65256edaa8c552018276c90e35434f9cab526d2a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Koz=C5=82owski?= Date: Thu, 3 Feb 2022 04:30:25 +0100 Subject: [PATCH 106/214] vscode-extensions.baccata.scaladex-search: 0.0.1 -> 0.2.0 --- pkgs/misc/vscode-extensions/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/vscode-extensions/default.nix b/pkgs/misc/vscode-extensions/default.nix index c5ea1082ec53..619b1cbf22b4 100644 --- a/pkgs/misc/vscode-extensions/default.nix +++ b/pkgs/misc/vscode-extensions/default.nix @@ -275,8 +275,8 @@ let mktplcRef = { name = "scaladex-search"; publisher = "baccata"; - version = "0.0.1"; - sha256 = "1y8p4rr8qq5ng52g4pbx8ayq04gi2869wrx68k69rl7ga7bzcyp9"; + version = "0.2.0"; + sha256 = "0xbikwlrascmn9nzyl4fxb2ql1dczd00ragp30a3yv8bax173bnz"; }; meta = { license = lib.licenses.asl20; From 08c04a59a9fb380d2f57debec74fca735a929283 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Koz=C5=82owski?= Date: Thu, 3 Feb 2022 04:31:50 +0100 Subject: [PATCH 107/214] vscode-extensions.silvenon.mdx: init at 0.1.0 --- pkgs/misc/vscode-extensions/default.nix | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/pkgs/misc/vscode-extensions/default.nix b/pkgs/misc/vscode-extensions/default.nix index 619b1cbf22b4..3fcbcc286079 100644 --- a/pkgs/misc/vscode-extensions/default.nix +++ b/pkgs/misc/vscode-extensions/default.nix @@ -1603,6 +1603,18 @@ let }; }; + silvenon.mdx = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "mdx"; + publisher = "silvenon"; + version = "0.1.0"; + sha256 = "1mzsqgv0zdlj886kh1yx1zr966yc8hqwmiqrb1532xbmgyy6adz3"; + }; + meta = { + license = lib.licenses.mit; + }; + }; + skyapps.fish-vscode = buildVscodeMarketplaceExtension { mktplcRef = { name = "fish-vscode"; From 6ff4ad160f2b58506a76c6ca86fd4ca1825461cc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Koz=C5=82owski?= Date: Thu, 3 Feb 2022 04:34:17 +0100 Subject: [PATCH 108/214] vscode-extensions.benfradet.vscode-unison: init at 0.3.0 --- pkgs/misc/vscode-extensions/default.nix | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/pkgs/misc/vscode-extensions/default.nix b/pkgs/misc/vscode-extensions/default.nix index 3fcbcc286079..ef46422fed30 100644 --- a/pkgs/misc/vscode-extensions/default.nix +++ b/pkgs/misc/vscode-extensions/default.nix @@ -295,6 +295,18 @@ let }; }; + benfradet.vscode-unison = buildVscodeMarketplaceExtension { + mktplcRef = { + name = "vscode-unison"; + publisher = "benfradet"; + version = "0.3.0"; + sha256 = "1x80s8l8djchg17553aiwaf4b49hf6awiayk49wyii0i26hlpjk1"; + }; + meta = with lib; { + license = licenses.asl20; + }; + }; + betterthantomorrow.calva = buildVscodeMarketplaceExtension { mktplcRef = { name = "calva"; From e18081929d8e1767bab8849136102c1b60b367b2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Koz=C5=82owski?= Date: Thu, 3 Feb 2022 04:37:22 +0100 Subject: [PATCH 109/214] vscode-extensions.humao.rest-client: init at 0.24.6 --- pkgs/misc/vscode-extensions/default.nix | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/pkgs/misc/vscode-extensions/default.nix b/pkgs/misc/vscode-extensions/default.nix index ef46422fed30..5ce528a82e5c 100644 --- a/pkgs/misc/vscode-extensions/default.nix +++ b/pkgs/misc/vscode-extensions/default.nix @@ -867,6 +867,18 @@ let }; }; + humao.rest-client = buildVscodeMarketplaceExtension { + mktplcRef = { + publisher = "humao"; + name = "rest-client"; + version = "0.24.6"; + sha256 = "196pm7gv0488bpv1lklh8hpwmdqc4yimz389gad6nsna368m4m43"; + }; + meta = with lib; { + license = licenses.mit; + }; + }; + jkillian.custom-local-formatters = buildVscodeMarketplaceExtension { mktplcRef = { publisher = "jkillian"; From ed89d9af8c30ab1255371e344b1c8d684dc76617 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Koz=C5=82owski?= Date: Thu, 3 Feb 2022 04:39:38 +0100 Subject: [PATCH 110/214] vscode-extensions.Arjun.swagger-viewer: init at 3.1.2 --- pkgs/misc/vscode-extensions/default.nix | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/pkgs/misc/vscode-extensions/default.nix b/pkgs/misc/vscode-extensions/default.nix index 5ce528a82e5c..c36004e0e962 100644 --- a/pkgs/misc/vscode-extensions/default.nix +++ b/pkgs/misc/vscode-extensions/default.nix @@ -193,6 +193,18 @@ let }; }; + Arjun.swagger-viewer = buildVscodeMarketplaceExtension { + mktplcRef = { + publisher = "Arjun"; + name = "swagger-viewer"; + version = "3.1.2"; + sha256 = "1cjvc99x1q5w3i2vnbxrsl5a1dr9gb3s6s9lnwn6mq5db6iz1nlm"; + }; + meta = { + license = lib.licenses.mit; + }; + }; + arrterian.nix-env-selector = buildVscodeMarketplaceExtension { mktplcRef = { name = "nix-env-selector"; From 0272dc8a6bcfc3989b740de0465ae3521d0e5b07 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Koz=C5=82owski?= Date: Thu, 3 Feb 2022 04:40:46 +0100 Subject: [PATCH 111/214] vscode-extensions.disneystreaming.smithy: init at 0.0.2 --- pkgs/misc/vscode-extensions/default.nix | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/pkgs/misc/vscode-extensions/default.nix b/pkgs/misc/vscode-extensions/default.nix index c36004e0e962..f939408e050f 100644 --- a/pkgs/misc/vscode-extensions/default.nix +++ b/pkgs/misc/vscode-extensions/default.nix @@ -569,6 +569,16 @@ let meta = { license = lib.licenses.mit; }; }; + disneystreaming.smithy = buildVscodeMarketplaceExtension { + mktplcRef = { + publisher = "disneystreaming"; + name = "smithy"; + version = "0.0.2"; + sha256 = "0rdh7b5s7ynsyfrq1r1170g65q9vvvfl3qbfvbh1b38ndvj2f0yq"; + }; + meta = { license = lib.licenses.asl20; }; + }; + divyanshuagrawal.competitive-programming-helper = buildVscodeMarketplaceExtension { mktplcRef = { name = "competitive-programming-helper"; From 7a72dafbc10fa421fc07cbaa2af076ba12b3ed78 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Koz=C5=82owski?= Date: Thu, 3 Feb 2022 04:41:45 +0100 Subject: [PATCH 112/214] vscode-extensions.edonet.vscode-command-runner: 0.0.116 -> 0.0.122 --- pkgs/misc/vscode-extensions/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/vscode-extensions/default.nix b/pkgs/misc/vscode-extensions/default.nix index f939408e050f..409d22390bd3 100644 --- a/pkgs/misc/vscode-extensions/default.nix +++ b/pkgs/misc/vscode-extensions/default.nix @@ -686,8 +686,8 @@ let mktplcRef = { name = "vscode-command-runner"; publisher = "edonet"; - version = "0.0.116"; - sha256 = "0fxvplyk080m0cdsvzynp6wjillrd4flr5qz7af7fibb2jbmfdkn"; + version = "0.0.122"; + sha256 = "1lvwvcs18azqhkzyvhf83ckfhfdgcqrw2gxb2myspqj59783hfpg"; }; meta = { license = lib.licenses.mit; From c23128e6aece4f914e520ea8d76311def648fe57 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Koz=C5=82owski?= Date: Thu, 3 Feb 2022 04:42:47 +0100 Subject: [PATCH 113/214] vscode-extensions.github.copilot: 1.7.4421 -> 1.7.4812 --- pkgs/misc/vscode-extensions/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/vscode-extensions/default.nix b/pkgs/misc/vscode-extensions/default.nix index 409d22390bd3..965a943b8ea2 100644 --- a/pkgs/misc/vscode-extensions/default.nix +++ b/pkgs/misc/vscode-extensions/default.nix @@ -931,8 +931,8 @@ let mktplcRef = { publisher = "github"; name = "copilot"; - version = "1.7.4421"; - sha256 = "1wvzf8rq8ligj079f1m74zzna2mfmhcbgvvrsw6w0wxw9x8fn4wy"; + version = "1.7.4812"; + sha256 = "1yl7m90m38pv8nz4dwcszjsa1sf253459xln17mngmc8z9wd3d3a"; }; meta = { license = lib.licenses.unfree; }; }; From bd528715d8f004940ded9351e32c24698bde79f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Koz=C5=82owski?= Date: Thu, 3 Feb 2022 04:43:23 +0100 Subject: [PATCH 114/214] vscode-extensions.codezombiech.gitignore: 0.6.0 -> 0.7.0 --- pkgs/misc/vscode-extensions/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/vscode-extensions/default.nix b/pkgs/misc/vscode-extensions/default.nix index 965a943b8ea2..85d30af1dbe4 100644 --- a/pkgs/misc/vscode-extensions/default.nix +++ b/pkgs/misc/vscode-extensions/default.nix @@ -423,8 +423,8 @@ let mktplcRef = { name = "gitignore"; publisher = "codezombiech"; - version = "0.6.0"; - sha256 = "0gnc0691pwkd9s8ldqabmpfvj0236rw7bxvkf0bvmww32kv1ia0b"; + version = "0.7.0"; + sha256 = "0fm4sxx1cb679vn4v85dw8dfp5x0p74m9p2b56gqkvdap0f2q351"; }; meta = with lib; { license = licenses.mit; From c45cab552ac5695a3ac682e4d12c52f47ba76880 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Koz=C5=82owski?= Date: Thu, 3 Feb 2022 04:43:50 +0100 Subject: [PATCH 115/214] vscode-extensions.mishkinf.goto-next-previous-member: 0.0.5 -> 0.0.6 --- pkgs/misc/vscode-extensions/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/vscode-extensions/default.nix b/pkgs/misc/vscode-extensions/default.nix index 85d30af1dbe4..101842f8f8a4 100644 --- a/pkgs/misc/vscode-extensions/default.nix +++ b/pkgs/misc/vscode-extensions/default.nix @@ -1296,8 +1296,8 @@ let mktplcRef = { name = "goto-next-previous-member"; publisher = "mishkinf"; - version = "0.0.5"; - sha256 = "0kgzap1k924i95al0a63hxcsv8skhaapgfpi9d7vvaxm0fc10l1i"; + version = "0.0.6"; + sha256 = "07rpnbkb51835gflf4fpr0v7fhj8hgbhsgcz2wpag8wdzdxc3025"; }; meta = { license = lib.licenses.mit; From 16dba82a7ae3ea82e4e06c1f9e2319f7ee99c1c0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Koz=C5=82owski?= Date: Thu, 3 Feb 2022 04:44:25 +0100 Subject: [PATCH 116/214] vscode-extensions.graphql.vscode-graphql: 0.3.13 -> 0.3.50 --- pkgs/misc/vscode-extensions/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/vscode-extensions/default.nix b/pkgs/misc/vscode-extensions/default.nix index 101842f8f8a4..02771a245b6c 100644 --- a/pkgs/misc/vscode-extensions/default.nix +++ b/pkgs/misc/vscode-extensions/default.nix @@ -981,8 +981,8 @@ let mktplcRef = { name = "vscode-graphql"; publisher = "GraphQL"; - version = "0.3.13"; - sha256 = "sha256-JjEefVHQUYidUsr8Ce/dh7hLDm21WkyS+2RwsXHoY04="; + version = "0.3.50"; + sha256 = "1yf6v2vsgmq86ysb6vxzbg2gh6vz03fsz0d0rhpvpghayrjlk5az"; }; meta = { license = lib.licenses.mit; From 09d592432581ba5bd2725b604b5490bea5fa460f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Koz=C5=82owski?= Date: Thu, 3 Feb 2022 04:44:59 +0100 Subject: [PATCH 117/214] vscode-extensions.jnoortheen.nix-ide: 0.1.18 -> 0.1.19 --- pkgs/misc/vscode-extensions/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/vscode-extensions/default.nix b/pkgs/misc/vscode-extensions/default.nix index 02771a245b6c..da2b8cdfa931 100644 --- a/pkgs/misc/vscode-extensions/default.nix +++ b/pkgs/misc/vscode-extensions/default.nix @@ -1146,8 +1146,8 @@ let mktplcRef = { name = "nix-ide"; publisher = "jnoortheen"; - version = "0.1.18"; - sha256 = "sha256-dmmx/u+hRQfY/MCIaSdcVtbYnf5cLCDUwr75heQxcuw="; + version = "0.1.19"; + sha256 = "1ms96ij6z4bysdhqgdaxx2znvczyhzx57iifbqws50m1c3m7pkx7"; }; meta = with lib; { changelog = "https://marketplace.visualstudio.com/items/jnoortheen.nix-ide/changelog"; From f6d1a3a25c01f4b3c2e4956ab1d16d5aa6d85630 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Koz=C5=82owski?= Date: Thu, 3 Feb 2022 04:45:54 +0100 Subject: [PATCH 118/214] vscode-extensions.zhuangtongfa.material-theme: 3.9.12 -> 3.13.17 --- pkgs/misc/vscode-extensions/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/vscode-extensions/default.nix b/pkgs/misc/vscode-extensions/default.nix index da2b8cdfa931..2d311ce8ebfe 100644 --- a/pkgs/misc/vscode-extensions/default.nix +++ b/pkgs/misc/vscode-extensions/default.nix @@ -2069,8 +2069,8 @@ let mktplcRef = { name = "material-theme"; publisher = "zhuangtongfa"; - version = "3.9.12"; - sha256 = "017h9hxplf2rhmlhn3vag0wypcx6gxi7p9fgllj5jzwrl2wsjl0g"; + version = "3.13.17"; + sha256 = "100riqnvc2j315i1lvnwxmgga17s369xxvds5skgnk2yi2xnm2g9"; }; meta = { license = lib.licenses.mit; From 9a81c40ce60b92068b7845257696919f09fb149f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Koz=C5=82owski?= Date: Thu, 3 Feb 2022 04:46:57 +0100 Subject: [PATCH 119/214] vscode-extensions.timonwong.shellcheck: 0.14.4 -> 0.18.4 --- pkgs/misc/vscode-extensions/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/vscode-extensions/default.nix b/pkgs/misc/vscode-extensions/default.nix index 2d311ce8ebfe..72be3baa5b5b 100644 --- a/pkgs/misc/vscode-extensions/default.nix +++ b/pkgs/misc/vscode-extensions/default.nix @@ -1830,8 +1830,8 @@ let mktplcRef = { name = "shellcheck"; publisher = "timonwong"; - version = "0.14.4"; - sha256 = "05z314sw9nqym3qlj7dcwm0fz1hb23xppzqn3nr2wcj17hs8zz4m"; + version = "0.18.4"; + sha256 = "00cii58md6v028h0xfvbdjvg3r44451mi0lfmjwiwif5xcw3wnlx"; }; nativeBuildInputs = [ jq moreutils ]; postInstall = '' From 4f39313552307af3130a3cabee8d8967004a7a5f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Koz=C5=82owski?= Date: Thu, 3 Feb 2022 04:47:16 +0100 Subject: [PATCH 120/214] vscode-extensions.alygin.vscode-tlaplus: 1.5.3 -> 1.5.4 --- pkgs/misc/vscode-extensions/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/vscode-extensions/default.nix b/pkgs/misc/vscode-extensions/default.nix index 72be3baa5b5b..c785e43e3768 100644 --- a/pkgs/misc/vscode-extensions/default.nix +++ b/pkgs/misc/vscode-extensions/default.nix @@ -93,8 +93,8 @@ let mktplcRef = { name = "vscode-tlaplus"; publisher = "alygin"; - version = "1.5.3"; - sha256 = "1cy0qn8iyjrinscn9p5ckpsa2hyryapxfi7is6s2zk2mpligbb1d"; + version = "1.5.4"; + sha256 = "0mf98244z6wzb0vj6qdm3idgr2sr5086x7ss2khaxlrziif395dx"; }; meta = { license = lib.licenses.mit; From f3e4bb247f036b00df63364e9adb26743b85399a Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 3 Feb 2022 01:17:58 +0000 Subject: [PATCH 121/214] timetagger: 22.1.4 -> 22.2.1 --- pkgs/development/python-modules/timetagger/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/timetagger/default.nix b/pkgs/development/python-modules/timetagger/default.nix index 4db9297834f4..8ad393bd35f1 100644 --- a/pkgs/development/python-modules/timetagger/default.nix +++ b/pkgs/development/python-modules/timetagger/default.nix @@ -9,13 +9,13 @@ python3Packages.buildPythonPackage rec { pname = "timetagger"; - version = "22.1.4"; + version = "22.2.1"; src = fetchFromGitHub { owner = "almarklein"; repo = pname; rev = "v${version}"; - sha256 = "sha256-aOA/2SqvTpXtkURyJ2vf5gGqPpy5reN7/2zUUdaJvyA="; + sha256 = "sha256-2Yne9gTMyuwqBNYz7elzW09olmgIKeRyuO0LdrtYt5c="; }; propagatedBuildInputs = with python3Packages; [ From 5453d9693bf1067d441370b1d12f0c474936b982 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 2 Feb 2022 23:37:10 +0000 Subject: [PATCH 122/214] python310Packages.repoze_who: 2.4 -> 2.4.1 --- pkgs/development/python-modules/repoze_who/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/repoze_who/default.nix b/pkgs/development/python-modules/repoze_who/default.nix index 1b33bb6954bf..47bb842cc875 100644 --- a/pkgs/development/python-modules/repoze_who/default.nix +++ b/pkgs/development/python-modules/repoze_who/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "repoze.who"; - version = "2.4"; + version = "2.4.1"; src = fetchPypi { inherit pname version; - sha256 = "cf97450de3c8eb5c03b4037be75b018db91befab1094204e452a0b1c0f7a94a6"; + sha256 = "sha256-ikybkmi0/w7dkG6Xwu7XzoPrn2LkJQv+A7zbum0xojc="; }; propagatedBuildInputs = [ zope_interface webob ]; From dc5859ef7a75e79cfb3cc0084ed59738a018bb17 Mon Sep 17 00:00:00 2001 From: Euan Kemp Date: Wed, 2 Feb 2022 20:55:25 -0800 Subject: [PATCH 123/214] nixos/tests/k3s: remove stale test reference https://github.com/NixOS/nixpkgs/pull/142706 renamed this test, but the old 'k3s' one wasn't removed from all-tests. Fix that. --- nixos/tests/all-tests.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index b75cbf4d10b9..e49d7e9ab379 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -237,7 +237,6 @@ in jibri = handleTest ./jibri.nix {}; jirafeau = handleTest ./jirafeau.nix {}; jitsi-meet = handleTest ./jitsi-meet.nix {}; - k3s = handleTest ./k3s.nix {}; k3s-single-node = handleTest ./k3s-single-node.nix {}; k3s-single-node-docker = handleTest ./k3s-single-node-docker.nix {}; kafka = handleTest ./kafka.nix {}; From 7fbf10b51942ff6e01225849726b4c59efa391e5 Mon Sep 17 00:00:00 2001 From: Aaron Jheng Date: Thu, 3 Feb 2022 03:03:15 +0000 Subject: [PATCH 124/214] buf: 1.0.0-rc11 -> 1.0.0-rc12 --- pkgs/development/tools/buf/default.nix | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) diff --git a/pkgs/development/tools/buf/default.nix b/pkgs/development/tools/buf/default.nix index 514607317840..67c132bd9e08 100644 --- a/pkgs/development/tools/buf/default.nix +++ b/pkgs/development/tools/buf/default.nix @@ -5,19 +5,20 @@ , git , testVersion , buf +, installShellFiles }: buildGoModule rec { pname = "buf"; - version = "1.0.0-rc11"; + version = "1.0.0-rc12"; src = fetchFromGitHub { owner = "bufbuild"; repo = pname; rev = "v${version}"; - sha256 = "sha256-V6xaGnSoKuJC59uZLW8uSLqwseJHvLGjrvhzE8o9fho="; + sha256 = "sha256-UqyWQdlCDTSjW348f87W7g2kwB5nzIOviSE5/1T1soY="; }; - vendorSha256 = "sha256-442NHTREM2zC8VA7zAV35YSwX1lM/BXnx6p8a+avzps="; + vendorSha256 = "sha256-qBgGZTok3G0Pgku76uiV9bZperhiSNoWSrzxrHe4QXw="; patches = [ # Skip a test that requires networking to be available to work. @@ -26,7 +27,7 @@ buildGoModule rec { ./skip_test_requiring_dotgit.patch ]; - nativeBuildInputs = [ protobuf ]; + nativeBuildInputs = [ protobuf installShellFiles ]; # Required for TestGitCloner checkInputs = [ git ]; @@ -42,6 +43,7 @@ buildGoModule rec { installPhase = '' runHook preInstall + # Binaries mkdir -p "$out/bin" # Only install required binaries, don't install testing binaries for FILE in \ @@ -51,6 +53,16 @@ buildGoModule rec { cp "$GOPATH/bin/$FILE" "$out/bin/" done + # Completions + installShellCompletion --cmd buf \ + --bash <($GOPATH/bin/buf bash-completion) \ + --fish <($GOPATH/bin/buf fish-completion) \ + --zsh <($GOPATH/bin/buf zsh-completion) + + # Man Pages + mkdir man && $GOPATH/bin/buf manpages man + installManPage man/* + runHook postInstall ''; From 2292af28f1ce1e27c433c59b77153628587141a3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 3 Feb 2022 05:58:19 +0000 Subject: [PATCH 125/214] python310Packages.google-cloud-logging: 2.7.0 -> 3.0.0 --- .../python-modules/google-cloud-logging/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/google-cloud-logging/default.nix b/pkgs/development/python-modules/google-cloud-logging/default.nix index 467fe9542474..dc60abddb6df 100644 --- a/pkgs/development/python-modules/google-cloud-logging/default.nix +++ b/pkgs/development/python-modules/google-cloud-logging/default.nix @@ -16,11 +16,11 @@ buildPythonPackage rec { pname = "google-cloud-logging"; - version = "2.7.0"; + version = "3.0.0"; src = fetchPypi { inherit pname version; - sha256 = "5a4ad2832be3b86c8f0fb57b2d382a1f67218137c6f6051372647ac5147d6421"; + sha256 = "sha256-RS42Hh3Lwo8iCMCAXBp8usAwdkVWcD2XZW0FIYuTNwg="; }; postPatch = '' From 7acca6575875b60e7bd0ab4a1fd6bbc099522f56 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 25 Jan 2022 23:54:18 +0000 Subject: [PATCH 126/214] chatty: 0.4.0 -> 0.6.0 https://source.puri.sm/Librem5/chatty/-/blob/v0.6.0/NEWS --- .../networking/instant-messengers/chatty/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/instant-messengers/chatty/default.nix b/pkgs/applications/networking/instant-messengers/chatty/default.nix index fe7881de9959..a82a3617dc18 100644 --- a/pkgs/applications/networking/instant-messengers/chatty/default.nix +++ b/pkgs/applications/networking/instant-messengers/chatty/default.nix @@ -11,6 +11,7 @@ , evolution-data-server , feedbackd , glibmm +, gnome , gspell , gtk3 , json-glib @@ -27,14 +28,15 @@ stdenv.mkDerivation rec { pname = "chatty"; - version = "0.4.0"; + version = "0.6.0"; src = fetchFromGitLab { domain = "source.puri.sm"; owner = "Librem5"; repo = "chatty"; rev = "v${version}"; - sha256 = "12k1a5xrwd6zk4x0m53hbzggk695z3bpbzy1wcikzy0jvch7h13d"; + fetchSubmodules = true; + hash = "sha256-8haVzRfAZwdTlYu7oKeu8E3uEH87yrHS4j+BWFQ/Nj0="; }; postPatch = '' @@ -55,6 +57,7 @@ stdenv.mkDerivation rec { evolution-data-server feedbackd glibmm + gnome.gnome-desktop gspell gtk3 json-glib From 37e39b389795ea9456ff60f6934f14bb61ff754d Mon Sep 17 00:00:00 2001 From: Winter Date: Sun, 9 Jan 2022 16:43:20 -0500 Subject: [PATCH 127/214] crystal_1_2: add support for aarch64-darwin --- pkgs/development/compilers/crystal/default.nix | 16 ++++++++++++++-- pkgs/top-level/all-packages.nix | 2 +- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/crystal/default.nix b/pkgs/development/compilers/crystal/default.nix index 330cf851ab1b..705ba157ec5e 100644 --- a/pkgs/development/compilers/crystal/default.nix +++ b/pkgs/development/compilers/crystal/default.nix @@ -32,9 +32,11 @@ let x86_64-linux = "linux-x86_64"; i686-linux = "linux-i686"; x86_64-darwin = "darwin-x86_64"; + aarch64-darwin = "darwin-universal"; }; arch = archs.${stdenv.system} or (throw "system ${stdenv.system} not supported"); + isAarch64Darwin = stdenv.system == "aarch64-darwin"; checkInputs = [ git gmp openssl readline libxml2 libyaml ]; @@ -53,6 +55,8 @@ let tar --strip-components=1 -C $out -xf ${src} patchShebangs $out/bin/crystal ''; + + meta.broken = lib.versionOlder version "1.2.0" && isAarch64Darwin; }; commonBuildInputs = extraBuildInputs: [ @@ -206,7 +210,8 @@ let homepage = "https://crystal-lang.org/"; license = licenses.asl20; maintainers = with maintainers; [ david50407 fabianhjr manveru peterhoeg ]; - platforms = builtins.attrNames archs; + platforms = let archNames = builtins.attrNames archs; in + if (lib.versionOlder version "1.2.0") then remove "aarch64-darwin" archNames else archNames; broken = lib.versionOlder version "0.36.1" && stdenv.isDarwin; }; }) @@ -223,6 +228,13 @@ rec { }; }; + binaryCrystal_1_2 = genericBinary { + version = "1.2.0"; + sha256s = { + aarch64-darwin = "1hrs8cpjxdkcf8mr9qgzilwbg6bakq87sd4yydfsk2f4pqd6g7nf"; + }; + }; + crystal_1_0 = generic { version = "1.0.0"; sha256 = "sha256-RI+a3w6Rr+uc5jRf7xw0tOenR+q6qii/ewWfID6dbQ8="; @@ -238,7 +250,7 @@ rec { crystal_1_2 = generic { version = "1.2.2"; sha256 = "sha256-nyOXhsutVBRdtJlJHe2dALl//BUXD1JeeQPgHU4SwiU="; - binary = crystal_1_1; + binary = if isAarch64Darwin then binaryCrystal_1_2 else crystal_1_1; }; crystal = crystal_1_2; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7c45b47fda39..c019e5ac631d 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11900,7 +11900,7 @@ with pkgs; copper = callPackage ../development/compilers/copper {}; inherit (callPackages ../development/compilers/crystal { - llvmPackages = llvmPackages_10; + llvmPackages = if stdenv.system == "aarch64-darwin" then llvmPackages_11 else llvmPackages_10; }) crystal_1_0 crystal_1_1 From 5320a03fdc39753784de42b8b4af9ef4110f9f4f Mon Sep 17 00:00:00 2001 From: Winter Date: Mon, 10 Jan 2022 20:53:22 -0500 Subject: [PATCH 128/214] crystal: remove broken crystal2nix attribute --- pkgs/development/compilers/crystal/default.nix | 2 -- 1 file changed, 2 deletions(-) diff --git a/pkgs/development/compilers/crystal/default.nix b/pkgs/development/compilers/crystal/default.nix index 705ba157ec5e..4ac820b7e015 100644 --- a/pkgs/development/compilers/crystal/default.nix +++ b/pkgs/development/compilers/crystal/default.nix @@ -254,6 +254,4 @@ rec { }; crystal = crystal_1_2; - - crystal2nix = callPackage ./crystal2nix.nix { }; } From e0a91196b5a9279ecd924d77287ade72aba536d3 Mon Sep 17 00:00:00 2001 From: vdovhanych Date: Thu, 3 Feb 2022 10:34:32 +0100 Subject: [PATCH 129/214] trezor-suite: 21.12.2 -> 22.1.1 --- pkgs/applications/blockchains/trezor-suite/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/blockchains/trezor-suite/default.nix b/pkgs/applications/blockchains/trezor-suite/default.nix index 2075c95aad96..43f41e5aeef7 100644 --- a/pkgs/applications/blockchains/trezor-suite/default.nix +++ b/pkgs/applications/blockchains/trezor-suite/default.nix @@ -8,7 +8,7 @@ let pname = "trezor-suite"; - version = "21.12.2"; + version = "22.1.1"; name = "${pname}-${version}"; suffix = { @@ -19,8 +19,8 @@ let src = fetchurl { url = "https://github.com/trezor/${pname}/releases/download/v${version}/Trezor-Suite-${version}-${suffix}.AppImage"; sha512 = { # curl -Lfs https://github.com/trezor/trezor-suite/releases/latest/download/latest-linux{-arm64,}.yml | grep ^sha512 | sed 's/: /-/' - aarch64-linux = "sha512-LzcTFSNN/loYaTDt+QpW8QpSgOTw2097IYdc7mC57Mn4NR/X2hycYZ9ZfZjBh9QFfVu/4R3UN2sA177v6Inomg=="; - x86_64-linux = "sha512-W/voBZrXaJVDN4eSUDD6lyBR9BqboD2k2/azI1pWm1NFUmDZFM+OGzyiPB3n+6SziAhca32Ot5Wy27sfmIjh3g=="; + aarch64-linux = "sha512-hRPwhKdAqiHmsaIuNm5r3ZuKhUh+IipR5/5N/9PwiLEfaSQRWink0dUwyuUoWzy4DyGabLQyIWbQRvR7eRGKJA=="; + x86_64-linux = "sha512-W4S7W4TeDtSwWCj6N6EoJJOCYG3m1pK3D+UPlsp7B7VY/0uBtI31+tS28E6TUgXZUttr8IIbqzJYWCuyLfDthQ=="; }.${stdenv.hostPlatform.system} or (throw "Unsupported system: ${stdenv.hostPlatform.system}"); }; From c559795c0fd8c784f890520f1a4949b85bcbcf69 Mon Sep 17 00:00:00 2001 From: Martino Fontana Date: Wed, 2 Feb 2022 12:19:26 +0100 Subject: [PATCH 130/214] duckstation: 0.pre+date=2021-12-16 -> 0.pre+date=2022-01-18 --- pkgs/misc/emulators/duckstation/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/misc/emulators/duckstation/default.nix b/pkgs/misc/emulators/duckstation/default.nix index bbe4819246a2..8e4d909a724a 100644 --- a/pkgs/misc/emulators/duckstation/default.nix +++ b/pkgs/misc/emulators/duckstation/default.nix @@ -21,13 +21,13 @@ mkDerivation rec { pname = "duckstation"; - version = "0.pre+date=2021-12-16"; + version = "0.pre+date=2022-01-18"; src = fetchFromGitHub { owner = "stenzek"; repo = pname; - rev = "59cb7c03432f5f8d9f6283c71a34825d05e118c6"; - sha256 = "sha256-vF3YEpicbwCtR6QW2huNk0+pJ7BBjn/x9/Ae1c00gN4="; + rev = "51041e47f70123eda41d999701f5651830a0a95e"; + sha256 = "sha256-nlF6ctDU8KCK7MN2pniPLLqUbPUygX9rl0hjzVQ+mPo="; }; nativeBuildInputs = [ From 6daff24989d8142c4dd1e54d7e365d915d8203c3 Mon Sep 17 00:00:00 2001 From: K0RR <43277609+RDKRACZ@users.noreply.github.com> Date: Thu, 3 Feb 2022 11:15:29 +0100 Subject: [PATCH 131/214] out_of_date_package_report.md: fix typo --- .github/ISSUE_TEMPLATE/out_of_date_package_report.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/out_of_date_package_report.md b/.github/ISSUE_TEMPLATE/out_of_date_package_report.md index 72c09a19c0e6..f1535526c2a7 100644 --- a/.github/ISSUE_TEMPLATE/out_of_date_package_report.md +++ b/.github/ISSUE_TEMPLATE/out_of_date_package_report.md @@ -13,10 +13,10 @@ assignees: '' - [ ] Checked the [nixpkgs master branch](https://github.com/NixOS/nixpkgs) current version: From 06d0bc55bf1f210499326babc6ce33d1548fb6e0 Mon Sep 17 00:00:00 2001 From: Nikolay Korotkiy Date: Thu, 3 Feb 2022 14:10:22 +0300 Subject: [PATCH 132/214] =?UTF-8?q?gmid:=201.7.5=20=E2=86=92=201.8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/servers/gemini/gmid/default.nix | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/pkgs/servers/gemini/gmid/default.nix b/pkgs/servers/gemini/gmid/default.nix index 803945c7a234..80b5fbda817b 100644 --- a/pkgs/servers/gemini/gmid/default.nix +++ b/pkgs/servers/gemini/gmid/default.nix @@ -2,23 +2,15 @@ stdenv.mkDerivation rec { pname = "gmid"; - version = "1.7.5"; + version = "1.8"; src = fetchFromGitHub { owner = "omar-polo"; repo = pname; rev = version; - sha256 = "sha256-BBd0AL5jRRslxzDnxcTZRR+8J5D23NAQ7mp9K+leXAQ="; + sha256 = "sha256-CwJPaZefRDyn2fliOd9FnOLXq70HFu2RsUZhzWQdE3E"; }; - patches = [ - # Fix cross-compilation - (fetchpatch { - url = "https://github.com/omar-polo/gmid/commit/eb77afa8d308a2f4f422df2ff19f023b5b2cc591.patch"; - sha256 = "sha256-rTTZUpfXOg7X0Ad0Y9evyU7k+aVYpJ0t9SEkNA/sSdk="; - }) - ]; - nativeBuildInputs = [ bison ]; buildInputs = [ libressl libevent ]; From b8305074253b16fe0d98778491ee08f81f100281 Mon Sep 17 00:00:00 2001 From: William Carroll Date: Wed, 2 Feb 2022 10:48:14 -0800 Subject: [PATCH 133/214] nixos/self-deploy: consume self-deploy's startAt attribute As #157879 points-out, this attribute appears unused. Fixes #157879 --- nixos/modules/services/system/self-deploy.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nixos/modules/services/system/self-deploy.nix b/nixos/modules/services/system/self-deploy.nix index 33d15e08f4aa..6224c8f748e9 100644 --- a/nixos/modules/services/system/self-deploy.nix +++ b/nixos/modules/services/system/self-deploy.nix @@ -128,6 +128,8 @@ in systemd.services.self-deploy = { wantedBy = [ "multi-user.target" ]; + startAt = cfg.startAt; + requires = lib.mkIf (!(isPathType cfg.repository)) [ "network-online.target" ]; environment.GIT_SSH_COMMAND = lib.mkIf (!(isNull cfg.sshKeyFile)) From 778b1f8b4f7ac8011e15a1dafb6d90c753ef4750 Mon Sep 17 00:00:00 2001 From: Mauricio Collares Date: Thu, 3 Feb 2022 08:28:22 -0300 Subject: [PATCH 134/214] sage: no longer assume fonttools emits deprecation warnings --- .../fonttools-deprecation-warnings.patch | 39 ------------------- .../science/math/sage/sage-src.nix | 8 ---- 2 files changed, 47 deletions(-) delete mode 100644 pkgs/applications/science/math/sage/patches/fonttools-deprecation-warnings.patch diff --git a/pkgs/applications/science/math/sage/patches/fonttools-deprecation-warnings.patch b/pkgs/applications/science/math/sage/patches/fonttools-deprecation-warnings.patch deleted file mode 100644 index 93c03a04ddb1..000000000000 --- a/pkgs/applications/science/math/sage/patches/fonttools-deprecation-warnings.patch +++ /dev/null @@ -1,39 +0,0 @@ -diff --git a/src/doc/en/prep/Advanced-2DPlotting.rst b/src/doc/en/prep/Advanced-2DPlotting.rst -index 337457afef..f7c76f4b56 100644 ---- a/src/doc/en/prep/Advanced-2DPlotting.rst -+++ b/src/doc/en/prep/Advanced-2DPlotting.rst -@@ -695,6 +695,8 @@ by the cells. - - sage: pdf_savename = name+'.pdf' - sage: p.save(pdf_savename) -+ ... -+ DeprecationWarning: The py23 module has been deprecated and will be removed in a future release. Please update your code. - - Notably, we can export in formats ready for inclusion in web pages. - -diff --git a/src/sage/plot/disk.py b/src/sage/plot/disk.py -index 8680a1c9b1..e83763b678 100644 ---- a/src/sage/plot/disk.py -+++ b/src/sage/plot/disk.py -@@ -156,6 +156,8 @@ class Disk(GraphicPrimitive): - sage: f = tmp_filename(ext='.pdf') - sage: p = disk((0,0), 5, (0, pi/4), alpha=0.5) - sage: p.save(f) -+ ... -+ DeprecationWarning: The py23 module has been deprecated and will be removed in a future release. Please update your code. - - """ - import matplotlib.patches as patches -diff --git a/src/sage/plot/text.py b/src/sage/plot/text.py -index 04cbdedf76..a970f97b79 100644 ---- a/src/sage/plot/text.py -+++ b/src/sage/plot/text.py -@@ -325,6 +325,8 @@ def text(string, xy, **options): - You can save text as part of PDF output:: - - sage: text("sage", (0,0), rgbcolor=(0,0,0)).save(os.path.join(SAGE_TMP, 'a.pdf')) -+ ... -+ DeprecationWarning: The py23 module has been deprecated and will be removed in a future release. Please update your code. - - Some examples of bounding box:: - diff --git a/pkgs/applications/science/math/sage/sage-src.nix b/pkgs/applications/science/math/sage/sage-src.nix index a51e92cde52e..95b01d9f3f58 100644 --- a/pkgs/applications/science/math/sage/sage-src.nix +++ b/pkgs/applications/science/math/sage/sage-src.nix @@ -114,14 +114,6 @@ stdenv.mkDerivation rec { # strictly necessary, but keeps us from littering in the user's HOME. ./patches/sympow-cache.patch - # fonttools 4.26.2, used by matplotlib, uses deprecated methods internally. - # This is fixed in fonttools 4.27.0, but since fonttools is a dependency of - # 2000+ packages and DeprecationWarnings are hidden almost everywhere by - # default (not on Sage's doctest harness, though), it doesn't make sense to - # backport the fix (see https://github.com/NixOS/nixpkgs/pull/151415). - # Let's just assume warnings are expected until we update to 4.27.0. - ./patches/fonttools-deprecation-warnings.patch - # https://trac.sagemath.org/ticket/32968 (fetchSageDiff { base = "9.5.beta8"; From f53b32b059dd42ca873a72b9d1dd87dc7b28e140 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Wed, 2 Feb 2022 13:46:17 +0100 Subject: [PATCH 135/214] python3Packages.geometric: init at 0.9.7.2 --- .../python-modules/geometric/default.nix | 33 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 35 insertions(+) create mode 100644 pkgs/development/python-modules/geometric/default.nix diff --git a/pkgs/development/python-modules/geometric/default.nix b/pkgs/development/python-modules/geometric/default.nix new file mode 100644 index 000000000000..89f1e73ed9af --- /dev/null +++ b/pkgs/development/python-modules/geometric/default.nix @@ -0,0 +1,33 @@ +{ buildPythonPackage, lib, fetchFromGitHub +, networkx, numpy, scipy, six +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "geometric"; + version = "0.9.7.2"; + + src = fetchFromGitHub { + owner = "leeping"; + repo = "geomeTRIC"; + rev = version; + hash = "sha256-QFpfY6tWqcda6AJT17YBEuwu/4DYPbIMJU1c9/gHjaA="; + }; + + propagatedBuildInputs = [ + networkx + numpy + scipy + six + ]; + + checkInputs = [ pytestCheckHook ]; + + meta = with lib; { + description = "Geometry optimization code for molecular structures"; + homepage = "https://github.com/leeping/geomeTRIC"; + license = [ licenses.bsd3 ]; + maintainers = [ maintainers.markuskowa ]; + }; +} + diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 79aeeeb463c5..93f2e790bd01 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3193,6 +3193,8 @@ in { geomet = callPackage ../development/python-modules/geomet { }; + geometric = callPackage ../development/python-modules/geometric { }; + geopandas = callPackage ../development/python-modules/geopandas { }; geopy = callPackage ../development/python-modules/geopy { }; From 0ebdfab88bb1d794d854e2e2ec0ed45ec1c252f3 Mon Sep 17 00:00:00 2001 From: Mauricio Collares Date: Thu, 3 Feb 2022 09:21:20 -0300 Subject: [PATCH 136/214] lean: 3.38.0 -> 3.39.0 --- pkgs/applications/science/logic/lean/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/science/logic/lean/default.nix b/pkgs/applications/science/logic/lean/default.nix index c9ba47eca140..6da8b1cdc429 100644 --- a/pkgs/applications/science/logic/lean/default.nix +++ b/pkgs/applications/science/logic/lean/default.nix @@ -2,7 +2,7 @@ stdenv.mkDerivation rec { pname = "lean"; - version = "3.38.0"; + version = "3.39.0"; src = fetchFromGitHub { owner = "leanprover-community"; @@ -11,8 +11,8 @@ stdenv.mkDerivation rec { # from. this is then used to check whether an olean file should be # rebuilt. don't use a tag as rev because this will get replaced into # src/githash.h.in in preConfigure. - rev = "a8cf8a0c9ea19a633baeb3aa7e8d706b86c2c0f9"; - sha256 = "14dam91pnn266fgii5c2j5p9p2i31bghx0s2h3qnnqyvxi4s5isx"; + rev = "85c581588857624e9cd562aaa0301a951c497833"; + sha256 = "1v9rqvpgm2hw0mvsg1arp7xp4r9h9p286364hn3if55pg3h8bjzn"; }; nativeBuildInputs = [ cmake ]; From db6600c30147ad6bde737e645db4219d4ee80c0c Mon Sep 17 00:00:00 2001 From: Kerstin Humm Date: Thu, 3 Feb 2022 14:13:43 +0100 Subject: [PATCH 137/214] mastodon: 3.4.5 -> 3.4.6 fixes CVE-2022-24307 --- pkgs/servers/mastodon/package.json | 2 +- pkgs/servers/mastodon/source.nix | 4 ++-- pkgs/servers/mastodon/version.nix | 2 +- pkgs/servers/mastodon/version.patch | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/servers/mastodon/package.json b/pkgs/servers/mastodon/package.json index fd7321fae529..4c3e64141fd3 100644 --- a/pkgs/servers/mastodon/package.json +++ b/pkgs/servers/mastodon/package.json @@ -1,5 +1,5 @@ { - "version": "3.4.5", + "version": "3.4.6", "name": "@mastodon/mastodon", "license": "AGPL-3.0-or-later", "engines": { diff --git a/pkgs/servers/mastodon/source.nix b/pkgs/servers/mastodon/source.nix index 66be9c5d34a9..921066e5df60 100644 --- a/pkgs/servers/mastodon/source.nix +++ b/pkgs/servers/mastodon/source.nix @@ -2,8 +2,8 @@ { fetchgit, applyPatches }: let src = fetchgit { url = "https://github.com/tootsuite/mastodon.git"; - rev = "v3.4.5"; - sha256 = "04zqvamlsrbmizjagkd1jqk474lqk13hh7cswc31f2mdw7zn8n6k"; + rev = "v3.4.6"; + sha256 = "1lg25m6wsnb7iabbn1vpvn85csv6ywyvcm0ji6d8iq7wwgyq77xs"; }; in applyPatches { inherit src; diff --git a/pkgs/servers/mastodon/version.nix b/pkgs/servers/mastodon/version.nix index 2e14fc68d209..77b242e89770 100644 --- a/pkgs/servers/mastodon/version.nix +++ b/pkgs/servers/mastodon/version.nix @@ -1 +1 @@ -"3.4.5" +"3.4.6" diff --git a/pkgs/servers/mastodon/version.patch b/pkgs/servers/mastodon/version.patch index 4b04dc8280bf..2182de89b827 100644 --- a/pkgs/servers/mastodon/version.patch +++ b/pkgs/servers/mastodon/version.patch @@ -3,7 +3,7 @@ diff -Naur --label a/package.json --label b/package.json a/package.json b/packag +++ b/package.json @@ -1,4 +1,5 @@ { -+ "version": "3.4.5", ++ "version": "3.4.6", "name": "@mastodon/mastodon", "license": "AGPL-3.0-or-later", "engines": { From af57710166671dbde702114ca6cbe9f72e438219 Mon Sep 17 00:00:00 2001 From: Markus Kowalewski Date: Thu, 3 Feb 2022 15:23:02 +0100 Subject: [PATCH 138/214] libxc: 5.2.0 -> 5.2.2 --- pkgs/development/libraries/libxc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libxc/default.nix b/pkgs/development/libraries/libxc/default.nix index e96914157b89..f28420229ab9 100644 --- a/pkgs/development/libraries/libxc/default.nix +++ b/pkgs/development/libraries/libxc/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "libxc"; - version = "5.2.0"; + version = "5.2.2"; src = fetchFromGitLab { owner = "libxc"; repo = "libxc"; rev = version; - sha256 = "1zfhfiwk8cnfbmkagaia4xhsc133icl1pryzync28kzsjxzlwfzc"; + sha256 = "113sk7hxjpfbz3nrgjsc7bi6zrlwb3qq5s6h0zh37hz9bd1brq54"; }; nativeBuildInputs = [ perl cmake gfortran ]; From 3504c23b789d898b647cfea964179febed81b1b7 Mon Sep 17 00:00:00 2001 From: Thomas Gerbet Date: Thu, 3 Feb 2022 15:49:13 +0100 Subject: [PATCH 139/214] rpm: fix build for darwin aarch64 This contribution uses an upstream fix rpm-software-management/rpm#1775 To limit the chances of breaking other architectures or systems the patch is only used when we target darwin aarch64. --- pkgs/tools/package-management/rpm/default.nix | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/package-management/rpm/default.nix b/pkgs/tools/package-management/rpm/default.nix index 9c0da87a90ae..3deda8d7c5da 100644 --- a/pkgs/tools/package-management/rpm/default.nix +++ b/pkgs/tools/package-management/rpm/default.nix @@ -1,7 +1,7 @@ { stdenv, lib , pkg-config, autoreconfHook , fetchurl, cpio, zlib, bzip2, file, elfutils, libbfd, libgcrypt, libarchive, nspr, nss, popt, db, xz, python, lua, llvmPackages -, sqlite, zstd +, sqlite, zstd, fetchpatch }: stdenv.mkDerivation rec { @@ -37,6 +37,13 @@ stdenv.mkDerivation rec { "--sharedstatedir=/com" ]; + patches = lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isAarch64) [ # Fix build for macOS aarch64 + (fetchpatch { + url = "https://github.com/rpm-software-management/rpm/commit/ad87ced3990c7e14b6b593fa411505e99412e248.patch"; + hash = "sha256-WYlxPGcPB5lGQmkyJ/IpGoqVfAKtMxKzlr5flTqn638="; + }) + ]; + postPatch = '' substituteInPlace Makefile.am --replace '@$(MKDIR_P) $(DESTDIR)$(localstatedir)/tmp' "" ''; From b8f6ce151a2882309a11b48f29158fea12e44da5 Mon Sep 17 00:00:00 2001 From: Zane van Iperen Date: Thu, 3 Feb 2022 15:08:38 +0000 Subject: [PATCH 140/214] gocyclo: 2015-02-08 -> 0.4.0 (#157227) We're pulling from a random fork, so switch to the actual upstream. Also change to use buildGoModule instead of buildGoPackage. Co-Authored-By: Martin --- pkgs/development/tools/gocyclo/default.nix | 23 ++++++++++------------ 1 file changed, 10 insertions(+), 13 deletions(-) diff --git a/pkgs/development/tools/gocyclo/default.nix b/pkgs/development/tools/gocyclo/default.nix index d11cf609328d..096af41ba90d 100644 --- a/pkgs/development/tools/gocyclo/default.nix +++ b/pkgs/development/tools/gocyclo/default.nix @@ -1,28 +1,25 @@ -{ buildGoPackage +{ buildGoModule , lib , fetchFromGitHub }: -buildGoPackage rec { - pname = "gocyclo-unstable"; - version = "2015-02-08"; - rev = "aa8f8b160214d8dfccfe3e17e578dd0fcc6fede7"; - - goPackagePath = "github.com/alecthomas/gocyclo"; +buildGoModule rec { + pname = "gocyclo"; + version = "0.4.0"; src = fetchFromGitHub { - inherit rev; - - owner = "alecthomas"; + owner = "fzipp"; repo = "gocyclo"; - sha256 = "094rj97q38j53lmn2scshrg8kws8c542yq5apih1ahm9wdkv8pxr"; + rev = "v${version}"; + sha256 = "1s9m5m5p76wcxi5n4diz891kd5db4ll21fsh9fnvvf9w7yrmgdw2"; }; + vendorSha256 = "0sjjj9z1dhilhpc8pq4154czrb79z9cm044jvn75kxcjv6v5l2m5"; + meta = with lib; { description = "Calculate cyclomatic complexities of functions in Go source code"; - homepage = "https://github.com/alecthomas/gocyclo"; + homepage = "https://github.com/fzipp/gocyclo"; license = licenses.bsd3; maintainers = with maintainers; [ kalbasit ]; - platforms = platforms.linux ++ platforms.darwin; }; } From 829196bfbe0d41f636d80ee87a85bfa384dec1f3 Mon Sep 17 00:00:00 2001 From: "R. RyanTM" Date: Thu, 3 Feb 2022 07:56:17 -0800 Subject: [PATCH 141/214] ruffle: 2021-09-17 -> 2022-02-02 (#157974) --- pkgs/misc/emulators/ruffle/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/misc/emulators/ruffle/default.nix b/pkgs/misc/emulators/ruffle/default.nix index 8cbdaf21a864..784ea69d3979 100644 --- a/pkgs/misc/emulators/ruffle/default.nix +++ b/pkgs/misc/emulators/ruffle/default.nix @@ -13,13 +13,13 @@ rustPlatform.buildRustPackage rec { pname = "ruffle"; - version = "nightly-2021-09-17"; + version = "nightly-2022-02-02"; src = fetchFromGitHub { owner = "ruffle-rs"; repo = pname; rev = version; - sha256 = "sha256-N4i13vx/hWzFf2DT3lToAAnbMgIaUL/B2C3WI1el3ps="; + sha256 = "sha256-AV3zGfWacYdkyxHED1nGwTqRHhXpybaCVnudmHqWvqw="; }; nativeBuildInputs = [ @@ -48,7 +48,7 @@ rustPlatform.buildRustPackage rec { wrapProgram $out/bin/ruffle_desktop --prefix LD_LIBRARY_PATH ':' ${vulkan-loader}/lib ''; - cargoSha256 = "sha256-6B6bSIU15Ca1/lLYij9YjpFykbJhOGZieydNXis/Cw8="; + cargoSha256 = "sha256-LP9aHcey+e3fqtWdOkqF5k8dwjdAOKpP+mKGxFhTte0="; meta = with lib; { description = "An Adobe Flash Player emulator written in the Rust programming language."; From 743d01161616720fb668eae2ea7199edb37af9e3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-Fran=C3=A7ois=20Roche?= Date: Thu, 3 Feb 2022 17:15:34 +0100 Subject: [PATCH 142/214] hivemind: 1.0.6 -> 1.1.0 (#157994) Update to latest release: https://github.com/DarthSim/hivemind/releases/tag/v1.1.0 --- pkgs/applications/misc/hivemind/default.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/misc/hivemind/default.nix b/pkgs/applications/misc/hivemind/default.nix index 6ada1fd749bd..0562e1d52d9f 100644 --- a/pkgs/applications/misc/hivemind/default.nix +++ b/pkgs/applications/misc/hivemind/default.nix @@ -1,9 +1,8 @@ -{ lib, buildGoPackage, fetchFromGitHub, runtimeShell }: +{ lib, buildGoModule, fetchFromGitHub, runtimeShell }: -buildGoPackage rec { +buildGoModule rec { pname = "hivemind"; - version = "1.0.6"; - goPackagePath = "github.com/DarthSim/hivemind"; + version = "1.1.0"; postPatch = '' substituteInPlace process.go --replace \"/bin/sh\" \"${runtimeShell}\" @@ -13,8 +12,9 @@ buildGoPackage rec { owner = "DarthSim"; repo = "hivemind"; rev = "v${version}"; - sha256 = "0afcnd03wsdphbbpha65rv5pnv0x6ldnnm6rnv1m6xkkywgnzx95"; + sha256 = "YUR9OwRuH1xSPs8iTsSIjLCt2TyYH357IAYULGTyYUc="; }; + vendorSha256 = "KweFhT8Zueg45Q/vw3kNET35hB+0WbUPfz0FYaAiIA8="; meta = with lib; { homepage = "https://github.com/DarthSim/"; From 2d011298dc4cfbb03279d80db33ea44a568325c0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 3 Feb 2022 15:41:57 +0000 Subject: [PATCH 143/214] python310Packages.python-telegram-bot: 13.10 -> 13.11 --- .../python-modules/python-telegram-bot/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-telegram-bot/default.nix b/pkgs/development/python-modules/python-telegram-bot/default.nix index 939c4404d836..8d6ab3aeecd3 100644 --- a/pkgs/development/python-modules/python-telegram-bot/default.nix +++ b/pkgs/development/python-modules/python-telegram-bot/default.nix @@ -13,14 +13,14 @@ buildPythonPackage rec { pname = "python-telegram-bot"; - version = "13.10"; + version = "13.11"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "d2c555431821f4ace0c1b7ce12af41999f01b793b275dee131f1034d08c01e3e"; + sha256 = "sha256-uu/3BLqirD3BepRMAtqIgiitJY6Jvi5by9E6ilEC1XM="; }; propagatedBuildInputs = [ From e796d111569b76db93c4632bdc156a8f3a3c0797 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 3 Feb 2022 15:34:39 +0000 Subject: [PATCH 144/214] python310Packages.pyface: 7.3.0 -> 7.4.0 --- pkgs/development/python-modules/pyface/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyface/default.nix b/pkgs/development/python-modules/pyface/default.nix index 3a29fd79f779..aafd60c0dbae 100644 --- a/pkgs/development/python-modules/pyface/default.nix +++ b/pkgs/development/python-modules/pyface/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "pyface"; - version = "7.3.0"; + version = "7.4.0"; src = fetchPypi { inherit pname version; - sha256 = "a7031ec4cfff034affc822e47ff5e6c1a0272e576d79465cdbbe25f721740322"; + sha256 = "sha256-r8Awj9dOYPWxh1Ar2JK/nhuY8hAGFO4+6yr9yq7Pb6s="; }; propagatedBuildInputs = [ importlib-metadata importlib-resources six traits ]; From a751e798041053c226c734c707c2e6dc0fc76c66 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 3 Feb 2022 16:38:51 +0000 Subject: [PATCH 145/214] openai: 0.13.0 -> 0.14.0 --- pkgs/development/python-modules/openai/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/openai/default.nix b/pkgs/development/python-modules/openai/default.nix index 8c922413cace..3c557eabb9dc 100644 --- a/pkgs/development/python-modules/openai/default.nix +++ b/pkgs/development/python-modules/openai/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "openai"; - version = "0.13.0"; + version = "0.14.0"; disabled = pythonOlder "3.7.1"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "openai"; repo = "openai-python"; rev = "v${version}"; - sha256 = "sha256-y1ewaVwCcJGACwupGoh7zcKxE9qVXRjMf7k3q/hFhDE="; + sha256 = "sha256-AFfbMeYxdZaIABhf4XpszhLvFuMJebhl07sv9kuiknA="; }; propagatedBuildInputs = [ From 0ccdb13c05e26b5e1bbaefea285b9500c8505284 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 3 Feb 2022 04:03:24 +0000 Subject: [PATCH 146/214] numberstation: 1.0.1 -> 1.1.0 https://git.sr.ht/~martijnbraam/numberstation/refs/1.1.0 --- pkgs/applications/misc/numberstation/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/numberstation/default.nix b/pkgs/applications/misc/numberstation/default.nix index 41467e0c58de..af50644f1f71 100644 --- a/pkgs/applications/misc/numberstation/default.nix +++ b/pkgs/applications/misc/numberstation/default.nix @@ -15,7 +15,7 @@ python3.pkgs.buildPythonApplication rec { pname = "numberstation"; - version = "1.0.1"; + version = "1.1.0"; format = "other"; @@ -23,7 +23,7 @@ python3.pkgs.buildPythonApplication rec { owner = "~martijnbraam"; repo = "numberstation"; rev = version; - sha256 = "sha256-8q5cEpQRnevY98PKaTUW10bqRAr5NVG/rU24+nx27rw="; + hash = "sha256-A6qwsbeNZXfSOZwHp19/4JQ8dZgjsK7Y2zho6vJXsGA="; }; postPatch = '' From e5213f40dbd5a5ce22a13b5a0e130310e43ece76 Mon Sep 17 00:00:00 2001 From: Jonas Heinrich Date: Fri, 14 Jan 2022 18:49:39 +0100 Subject: [PATCH 147/214] cups: Add passthru printing test --- pkgs/misc/cups/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/misc/cups/default.nix b/pkgs/misc/cups/default.nix index 0e9977f564b1..2d0129e21c5c 100644 --- a/pkgs/misc/cups/default.nix +++ b/pkgs/misc/cups/default.nix @@ -18,11 +18,9 @@ , avahi ? null , libpaper ? null , coreutils +, nixosTests }: -### IMPORTANT: before updating cups, make sure the nixos/tests/printing.nix test -### works at least for your platform. - with lib; stdenv.mkDerivation rec { pname = "cups"; @@ -137,6 +135,8 @@ stdenv.mkDerivation rec { --replace "Exec=htmlview" "Exec=xdg-open" ''; + passthru.tests.nixos = nixosTests.printing; + meta = { homepage = "https://openprinting.github.io/cups/"; description = "A standards-based printing system for UNIX"; From f52a615afbc381cd06f7702b166727ab21a55ddc Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 3 Feb 2022 14:07:00 +0000 Subject: [PATCH 148/214] python310Packages.snowflake-connector-python: 2.7.3 -> 2.7.4 --- .../python-modules/snowflake-connector-python/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/snowflake-connector-python/default.nix b/pkgs/development/python-modules/snowflake-connector-python/default.nix index d13fbfb78893..744883302a0e 100644 --- a/pkgs/development/python-modules/snowflake-connector-python/default.nix +++ b/pkgs/development/python-modules/snowflake-connector-python/default.nix @@ -24,12 +24,12 @@ buildPythonPackage rec { pname = "snowflake-connector-python"; - version = "2.7.3"; + version = "2.7.4"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "026562392d8733bdfaddcd5ec1537a139940df46a3a225849a36c71c1bf3e61c"; + sha256 = "sha256-Es8Xe7yHetAl9bAO83ecTuv9r0cueRL4fCvNyfOGQAg="; }; propagatedBuildInputs = [ From 750f63123a89145a93f09d82a2b07d1d7ef57338 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 3 Feb 2022 09:18:53 +0000 Subject: [PATCH 149/214] python310Packages.types-urllib3: 1.26.8 -> 1.26.9 --- pkgs/development/python-modules/types-urllib3/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/types-urllib3/default.nix b/pkgs/development/python-modules/types-urllib3/default.nix index 915d11b5d8d1..3e6eac4427a0 100644 --- a/pkgs/development/python-modules/types-urllib3/default.nix +++ b/pkgs/development/python-modules/types-urllib3/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "types-urllib3"; - version = "1.26.8"; + version = "1.26.9"; format = "setuptools"; src = fetchPypi { inherit pname version; - hash = "sha256-qg3iaJPxOFI9VVK7sCOCbAzH6ldJ2AwWk8V6q3tV9Gk="; + hash = "sha256-q9LUhXg3SCsYNLSBfwWHZ43MUx28mr5M3k2ijO8/Uiw="; }; # Module doesn't have tests From 9f7b46184462c86cc4c8a7c5001554db9c1cc496 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 3 Feb 2022 09:10:28 +0000 Subject: [PATCH 150/214] python310Packages.googlemaps: 4.5.3 -> 4.6.0 --- pkgs/development/python-modules/googlemaps/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/googlemaps/default.nix b/pkgs/development/python-modules/googlemaps/default.nix index 58b50f5f84f8..f00a694dfcf4 100644 --- a/pkgs/development/python-modules/googlemaps/default.nix +++ b/pkgs/development/python-modules/googlemaps/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "googlemaps"; - version = "4.5.3"; + version = "4.6.0"; disabled = pythonOlder "3.5"; src = fetchFromGitHub { owner = "googlemaps"; repo = "google-maps-services-python"; rev = "v${version}"; - sha256 = "1yfsfspvjngrb1lwaq04ahm94j9y2dwzdf4dsg3yl1c8w0vgf9yw"; + sha256 = "sha256-pzCM1uZupqJgoogwacuuy1P8I9LF65w7ZS6vY10VgeU="; }; propagatedBuildInputs = [ requests ]; From 44a9603ae7e6967e21b2e857652c610a4fb0fcf8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 3 Feb 2022 07:19:39 +0000 Subject: [PATCH 151/214] python310Packages.dropbox: 11.26.0 -> 11.27.0 --- pkgs/development/python-modules/dropbox/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/dropbox/default.nix b/pkgs/development/python-modules/dropbox/default.nix index a7ee6597b337..8f53ff4ebbf7 100644 --- a/pkgs/development/python-modules/dropbox/default.nix +++ b/pkgs/development/python-modules/dropbox/default.nix @@ -11,7 +11,7 @@ buildPythonPackage rec { pname = "dropbox"; - version = "11.26.0"; + version = "11.27.0"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "dropbox"; repo = "dropbox-sdk-python"; rev = "v${version}"; - sha256 = "0ncx41jg2wbsklqkrh0zjwjs3kfkscz8d6gcbsxqa1qpa3pa5519"; + sha256 = "sha256-atIrrK4BgTfu0UaHTqJ66AxEeSJLanrmYx8myrOCOfo="; }; propagatedBuildInputs = [ From e7982e91d857e33effff6dbaafd2f89a6f2c258f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 3 Feb 2022 14:21:39 +0000 Subject: [PATCH 152/214] python310Packages.pyshp: 2.1.3 -> 2.2.0 --- pkgs/development/python-modules/pyshp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyshp/default.nix b/pkgs/development/python-modules/pyshp/default.nix index 3cb56247b553..fab58a72251f 100644 --- a/pkgs/development/python-modules/pyshp/default.nix +++ b/pkgs/development/python-modules/pyshp/default.nix @@ -2,12 +2,12 @@ , setuptools }: buildPythonPackage rec { - version = "2.1.3"; + version = "2.2.0"; pname = "pyshp"; src = fetchPypi { inherit pname version; - sha256 = "e32b4a6832a3b97986df442df63b4c4a7dcc846b326c903189530a5cc6df0260"; + sha256 = "sha256-Dtogm9YvM0VwHE9nmbY4wRTOtn/uKClc3bThyvBT6UQ="; }; buildInputs = [ setuptools ]; From 8c4e18593f4401594b1eac9c45e182ee1a68f2c8 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 2 Feb 2022 23:08:47 +0000 Subject: [PATCH 153/214] python310Packages.pytrends: 4.7.3 -> 4.8.0 --- pkgs/development/python-modules/pytrends/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pytrends/default.nix b/pkgs/development/python-modules/pytrends/default.nix index 20dbe0ba31c9..9156db165f41 100644 --- a/pkgs/development/python-modules/pytrends/default.nix +++ b/pkgs/development/python-modules/pytrends/default.nix @@ -9,12 +9,12 @@ buildPythonPackage rec { pname = "pytrends"; - version = "4.7.3"; + version = "4.8.0"; disabled = isPy27; # python2 pandas is too old src = fetchPypi { inherit pname version; - sha256 = "8ccb06c57c31fa157b978a0d810de7718ee46583d28cf818250d45f36abd2faa"; + sha256 = "sha256-BLezPrbfwSCqictGQGiKi2MzNydrbdzqRP8Mf2tiQ9I="; }; propagatedBuildInputs = [ requests lxml pandas ]; From 349740ca4f9c36ce8cacb6100798447b59f45728 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 2 Feb 2022 17:54:39 +0000 Subject: [PATCH 154/214] python310Packages.django_classytags: 3.0.0 -> 3.0.1 --- pkgs/development/python-modules/django_classytags/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/django_classytags/default.nix b/pkgs/development/python-modules/django_classytags/default.nix index d4d67ba58255..d7d2e8789ae7 100644 --- a/pkgs/development/python-modules/django_classytags/default.nix +++ b/pkgs/development/python-modules/django_classytags/default.nix @@ -7,11 +7,11 @@ buildPythonPackage rec { pname = "django-classy-tags"; - version = "3.0.0"; + version = "3.0.1"; src = fetchPypi { inherit pname version; - sha256 = "2ef8b82b4f7d77d4fd152b25c45128d926e7a5840d862f2ecd3e5faf6acbe343"; + sha256 = "sha256-0iK0VQKsmeVQpWZmeDnvrvlUucc2amST8UOGKqvqyHg="; }; propagatedBuildInputs = [ django six ]; From 13e6570b1ee2a71399d9f2ab66ad85a12ae4fb0e Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 2 Feb 2022 17:06:57 +0000 Subject: [PATCH 155/214] python310Packages.xml2rfc: 3.12.0 -> 3.12.1 --- pkgs/development/python-modules/xml2rfc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/xml2rfc/default.nix b/pkgs/development/python-modules/xml2rfc/default.nix index 26b51d1a4ac3..5ba54f203171 100644 --- a/pkgs/development/python-modules/xml2rfc/default.nix +++ b/pkgs/development/python-modules/xml2rfc/default.nix @@ -22,13 +22,13 @@ buildPythonPackage rec { pname = "xml2rfc"; - version = "3.12.0"; + version = "3.12.1"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - sha256 = "25deadb9ee95f0dc71376a60e9c1e34636b5016c1952ad5597a6246495e34464"; + sha256 = "sha256-xIStWb03CygnqB92AXf0uxMLw7pLhSE3mLQ8l1J6dZM="; }; propagatedBuildInputs = [ From 38ce6b3ccbd2b24aaf3cf425bf82f60f89ffb9ad Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 2 Feb 2022 15:20:20 +0000 Subject: [PATCH 156/214] python310Packages.awscrt: 0.13.0 -> 0.13.1 --- pkgs/development/python-modules/awscrt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/awscrt/default.nix b/pkgs/development/python-modules/awscrt/default.nix index a8cc3a34f94a..4ca232a2a815 100644 --- a/pkgs/development/python-modules/awscrt/default.nix +++ b/pkgs/development/python-modules/awscrt/default.nix @@ -2,7 +2,7 @@ buildPythonPackage rec { pname = "awscrt"; - version = "0.13.0"; + version = "0.13.1"; buildInputs = lib.optionals stdenv.isDarwin [ CoreFoundation Security ]; @@ -22,7 +22,7 @@ buildPythonPackage rec { src = fetchPypi { inherit pname version; - sha256 = "f8c46335bdf94a5e48d3df2018edbd07c4c903635501c62c1bea4153f407531a"; + sha256 = "sha256-1Qx3fcZ0I9RONLpFPDyXHkUEAF09KBgXV64NvepmDm8="; }; meta = with lib; { From 9c6d41d9f80253206ef84bf5b9ac57f35c36e258 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 3 Feb 2022 10:09:18 +0000 Subject: [PATCH 157/214] saml2aws: 2.33.0 -> 2.34.0 --- pkgs/tools/security/saml2aws/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/saml2aws/default.nix b/pkgs/tools/security/saml2aws/default.nix index 6d96025f0ce3..131956bed5c0 100644 --- a/pkgs/tools/security/saml2aws/default.nix +++ b/pkgs/tools/security/saml2aws/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "saml2aws"; - version = "2.33.0"; + version = "2.34.0"; src = fetchFromGitHub { owner = "Versent"; repo = "saml2aws"; rev = "v${version}"; - sha256 = "sha256-99URhGJJKO4l+ztMGljiuNKVTYIG2iyWUMBXG1WTPdI="; + sha256 = "sha256-JRJjuVF0MkV7KVmbAZhiWPWVwDORByCsZqPwdTuVRoA="; }; - vendorSha256 = "sha256-oUEgJ1DDzhKUpYevylIr+1X28xFGaWMh5+q1HTqOHaU="; + vendorSha256 = "sha256-nsuI8z0xJYZwhlYHasxHpAAYycpqN0qmS8c0APvxxwc="; buildInputs = lib.optionals stdenv.isDarwin [ AppKit ]; From a5b8447bbd6989c443fb43af7b933347f1da4e4c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 2 Feb 2022 01:03:42 +0000 Subject: [PATCH 158/214] soft-serve: 0.1.2 -> 0.1.3 --- pkgs/servers/soft-serve/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/soft-serve/default.nix b/pkgs/servers/soft-serve/default.nix index 3c169d6f1254..dab8df564ff3 100644 --- a/pkgs/servers/soft-serve/default.nix +++ b/pkgs/servers/soft-serve/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "soft-serve"; - version = "0.1.2"; + version = "0.1.3"; src = fetchFromGitHub { owner = "charmbracelet"; repo = "soft-serve"; rev = "v${version}"; - sha256 = "sha256-sRlEF1ee+oBnYOGSN6rDOvNr3OnfAqV+1Wx5XOyIylw="; + sha256 = "sha256-DEtWFWzUytj9xhNCVTPgSy2vR3sL2VYG76UmF6Dx78M="; }; - vendorSha256 = "sha256-txC85Y5t880XGgJb7tumDgqWTdTRCXXgATAtlWXF7n8="; + vendorSha256 = "sha256-ljbUAsbgonEFDVY6cSeVPkjieXWgF9JFGl6c7J6/164="; doCheck = false; From 01d86082da7ab8ad86a8cf3742a09f6b5a2ae5f0 Mon Sep 17 00:00:00 2001 From: Jonas Heinrich Date: Sun, 30 Jan 2022 14:01:12 +0100 Subject: [PATCH 159/214] cups: 2.4.0 -> 2.4.1 --- pkgs/misc/cups/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/cups/default.nix b/pkgs/misc/cups/default.nix index 2d0129e21c5c..af43c55072c3 100644 --- a/pkgs/misc/cups/default.nix +++ b/pkgs/misc/cups/default.nix @@ -26,14 +26,14 @@ stdenv.mkDerivation rec { pname = "cups"; # After 2.2.6, CUPS requires headers only available in macOS 10.12+ - version = if stdenv.isDarwin then "2.2.6" else "2.4.0"; + version = if stdenv.isDarwin then "2.2.6" else "2.4.1"; src = fetchurl (if stdenv.isDarwin then { url = "https://github.com/apple/cups/releases/download/v${version}/cups-${version}-source.tar.gz"; sha256 = "16qn41b84xz6khrr2pa2wdwlqxr29rrrkjfi618gbgdkq9w5ff20"; } else { url = "https://github.com/OpenPrinting/cups/releases/download/v${version}/cups-${version}-source.tar.gz"; - sha256 = "1pm6lf08z8vgs62g5b5rjw32qy3vr0q3sgidpg2lfs6a530wxgls"; + sha256 = "sha256-xzOfdfjU8t7FDGczQaRfwGtohbttQ2bWv1mk5sEK4Xg="; }); outputs = [ "out" "lib" "dev" "man" ]; From 3bb74c77da6e349b33cbe551bc64fb7fd87f8b93 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 2 Feb 2022 01:54:49 +0000 Subject: [PATCH 160/214] stern: 1.20.1 -> 1.21.0 --- pkgs/applications/networking/cluster/stern/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/stern/default.nix b/pkgs/applications/networking/cluster/stern/default.nix index 3040b0f7b1bb..19184ac15ae8 100644 --- a/pkgs/applications/networking/cluster/stern/default.nix +++ b/pkgs/applications/networking/cluster/stern/default.nix @@ -4,16 +4,16 @@ let isCrossBuild = stdenv.hostPlatform != stdenv.buildPlatform; in buildGoModule rec { pname = "stern"; - version = "1.20.1"; + version = "1.21.0"; src = fetchFromGitHub { owner = "stern"; repo = "stern"; rev = "v${version}"; - sha256 = "sha256-JredVk2hjnhoaJ9bT7D5k35skBNjcEBLa6GgO8dB2+U="; + sha256 = "sha256-+V0mRSjAwhZoiIS/OpZyqa5rvlqU9pGJwmW0QZ3H2g4="; }; - vendorSha256 = "sha256-GMAYu/BCmDrCUfc0x9TVw6HXJu+eE8eigZoPqPodM3Q="; + vendorSha256 = "sha256-IPHu23/2e6406FELB1Mwegp0C16cFD65mbW5Ah32D4Q="; subPackages = [ "." ]; From 2536a4a2d887975d9bf16c1b41171b506ec16393 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 2 Feb 2022 00:04:18 +0000 Subject: [PATCH 161/214] terragrunt: 0.36.0 -> 0.36.1 --- pkgs/applications/networking/cluster/terragrunt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/cluster/terragrunt/default.nix b/pkgs/applications/networking/cluster/terragrunt/default.nix index 3753e9393ce8..92810bcad4b0 100644 --- a/pkgs/applications/networking/cluster/terragrunt/default.nix +++ b/pkgs/applications/networking/cluster/terragrunt/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "terragrunt"; - version = "0.36.0"; + version = "0.36.1"; src = fetchFromGitHub { owner = "gruntwork-io"; repo = pname; rev = "v${version}"; - sha256 = "sha256-HUhV6FcLd75ZOPKw9Fl+7KUsSVG7HpQ6X2JZo9C9eeA="; + sha256 = "sha256-aGVhxyPm5GtYjJlFNiPNxkPtdGdOiYOSkRRTlzyF/lM="; }; vendorSha256 = "sha256-tNgEepKqwiqXhmoRCIEg7VJw7Y0TGt+R+6dZzd8aECg="; From 7cb44e1b8eb4163653588c4ebaaa44d578321acd Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 2 Feb 2022 00:53:51 +0000 Subject: [PATCH 162/214] python310Packages.mautrix: 0.14.8 -> 0.14.10 --- pkgs/development/python-modules/mautrix/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mautrix/default.nix b/pkgs/development/python-modules/mautrix/default.nix index c2278b5d79f1..683b3c099e05 100644 --- a/pkgs/development/python-modules/mautrix/default.nix +++ b/pkgs/development/python-modules/mautrix/default.nix @@ -4,11 +4,11 @@ buildPythonPackage rec { pname = "mautrix"; - version = "0.14.8"; + version = "0.14.10"; src = fetchPypi { inherit pname version; - sha256 = "sha256-0GB6LDsZlWmNS3O01nHWu20JCgSptyih7iBjbEFoZaE="; + sha256 = "sha256-mO0bKUepIjb50UKEOvFIaepHAskehkBajevsTRST8e4="; }; propagatedBuildInputs = [ From 6593e3f2ae40e2dafb5f2793c62e08699afba188 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 3 Feb 2022 10:51:16 +0100 Subject: [PATCH 163/214] python3Packages.intellifire4py: init at 0.5 --- .../python-modules/intellifire4py/default.nix | 45 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 47 insertions(+) create mode 100644 pkgs/development/python-modules/intellifire4py/default.nix diff --git a/pkgs/development/python-modules/intellifire4py/default.nix b/pkgs/development/python-modules/intellifire4py/default.nix new file mode 100644 index 000000000000..82122d13ffdc --- /dev/null +++ b/pkgs/development/python-modules/intellifire4py/default.nix @@ -0,0 +1,45 @@ +{ lib +, aiohttp +, buildPythonPackage +, fetchFromGitHub +, pydantic +, pytestCheckHook +, pythonOlder +, requests +}: + +buildPythonPackage rec { + pname = "intellifire4py"; + version = "0.5"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "jeeftor"; + repo = pname; + rev = version; + hash = "sha256-ESNFTlzwxv0SZA/vVU3aIjkt5nCX3D4VbwIRNSzMIK4="; + }; + + propagatedBuildInputs = [ + aiohttp + pydantic + requests + ]; + + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "intellifire4py" + ]; + + meta = with lib; { + description = "Module to read Intellifire fireplace status data"; + homepage = "https://github.com/jeeftor/intellifire4py"; + 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 a50d5ba71e4d..8bceeb8a47fb 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -3997,6 +3997,8 @@ in { intelhex = callPackage ../development/python-modules/intelhex { }; + intellifire4py = callPackage ../development/python-modules/intellifire4py { }; + intensity-normalization = callPackage ../development/python-modules/intensity-normalization { }; internetarchive = callPackage ../development/python-modules/internetarchive { }; From 4d5d012dd4cb4402db469c784df1f9b2136fa73f Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 3 Feb 2022 07:24:22 +0000 Subject: [PATCH 164/214] python310Packages.azure-batch: 11.0.0 -> 12.0.0 --- pkgs/development/python-modules/azure-batch/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/azure-batch/default.nix b/pkgs/development/python-modules/azure-batch/default.nix index 9202919ae6dd..9a39aa70c64f 100644 --- a/pkgs/development/python-modules/azure-batch/default.nix +++ b/pkgs/development/python-modules/azure-batch/default.nix @@ -8,12 +8,12 @@ buildPythonPackage rec { pname = "azure-batch"; - version = "11.0.0"; + version = "12.0.0"; src = fetchPypi { inherit pname version; extension = "zip"; - sha256 = "ce5fdb0ec962eddfe85cd82205e9177cb0bbdb445265746e38b3bbbf1f16dc73"; + sha256 = "sha256-GpseF4mEp79JWvZ7zOUfDbHkqKlXr7KeM1VKFKlnTes="; }; propagatedBuildInputs = [ From 9edef3a262f0ca6cff2aa80a210fcfc73fa269dc Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 3 Feb 2022 09:49:15 -0800 Subject: [PATCH 165/214] azure-cli: fix azure-batch sha --- pkgs/tools/admin/azure-cli/python-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/admin/azure-cli/python-packages.nix b/pkgs/tools/admin/azure-cli/python-packages.nix index 0339caa72ce8..a24aadd80c5e 100644 --- a/pkgs/tools/admin/azure-cli/python-packages.nix +++ b/pkgs/tools/admin/azure-cli/python-packages.nix @@ -118,7 +118,7 @@ let }; azure-batch = overrideAzureMgmtPackage super.azure-batch "11.0.0" "zip" - "83d7a2b0be42ca456ac2b56fa3dc6ce704c130e888d37d924072c1d3718f32da"; + "sha256-zl/bDsli7d/oXNgiBekXfLC720RSZXRuOLO7vx8W3HM="; azure-mgmt-apimanagement = overrideAzureMgmtPackage super.azure-mgmt-apimanagement "0.2.0" "zip" "0whx3s8ri9939r3pdvjf8iqcslas1xy6cnccidmp10r5ng0023vr"; From ecbb9e669d0a66d9d8297e5f7c278772dec425e3 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 3 Feb 2022 19:21:14 +0100 Subject: [PATCH 166/214] home-assistant: update component-packages --- pkgs/servers/home-assistant/component-packages.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 5a3297094561..19e4dd6a00c4 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -414,7 +414,7 @@ "input_text" = ps: with ps; [ ]; "insteon" = ps: with ps; [ pyinsteon ]; "integration" = ps: with ps; [ ]; - "intellifire" = ps: with ps; [ ]; # missing inputs: intellifire4py + "intellifire" = ps: with ps; [ intellifire4py ]; "intent" = ps: with ps; [ aiohttp-cors ]; "intent_script" = ps: with ps; [ ]; "intesishome" = ps: with ps; [ pyintesishome ]; @@ -1277,6 +1277,7 @@ "input_text" "insteon" "integration" + "intellifire" "intent" "intent_script" "ios" From f6068cbf1e9a2223a0942b64018991f8191220d8 Mon Sep 17 00:00:00 2001 From: Jonathan Ringer Date: Thu, 3 Feb 2022 10:23:14 -0800 Subject: [PATCH 167/214] Revert "cups: 2.4.0 -> 2.4.1" This reverts commit 01d86082da7ab8ad86a8cf3742a09f6b5a2ae5f0. --- pkgs/misc/cups/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/misc/cups/default.nix b/pkgs/misc/cups/default.nix index af43c55072c3..2d0129e21c5c 100644 --- a/pkgs/misc/cups/default.nix +++ b/pkgs/misc/cups/default.nix @@ -26,14 +26,14 @@ stdenv.mkDerivation rec { pname = "cups"; # After 2.2.6, CUPS requires headers only available in macOS 10.12+ - version = if stdenv.isDarwin then "2.2.6" else "2.4.1"; + version = if stdenv.isDarwin then "2.2.6" else "2.4.0"; src = fetchurl (if stdenv.isDarwin then { url = "https://github.com/apple/cups/releases/download/v${version}/cups-${version}-source.tar.gz"; sha256 = "16qn41b84xz6khrr2pa2wdwlqxr29rrrkjfi618gbgdkq9w5ff20"; } else { url = "https://github.com/OpenPrinting/cups/releases/download/v${version}/cups-${version}-source.tar.gz"; - sha256 = "sha256-xzOfdfjU8t7FDGczQaRfwGtohbttQ2bWv1mk5sEK4Xg="; + sha256 = "1pm6lf08z8vgs62g5b5rjw32qy3vr0q3sgidpg2lfs6a530wxgls"; }); outputs = [ "out" "lib" "dev" "man" ]; From 4be4b4ee54e00ed52aee07c2502604d725e219e9 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 3 Feb 2022 19:01:02 +0100 Subject: [PATCH 168/214] python3Packages.ttls: init at 1.4.2 --- .../python-modules/ttls/default.nix | 46 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 48 insertions(+) create mode 100644 pkgs/development/python-modules/ttls/default.nix diff --git a/pkgs/development/python-modules/ttls/default.nix b/pkgs/development/python-modules/ttls/default.nix new file mode 100644 index 000000000000..a389135bc35e --- /dev/null +++ b/pkgs/development/python-modules/ttls/default.nix @@ -0,0 +1,46 @@ +{ lib +, aiohttp +, buildPythonPackage +, colour +, fetchFromGitHub +, poetry-core +, pythonOlder +}: + +buildPythonPackage rec { + pname = "ttls"; + version = "1.4.2"; + format = "pyproject"; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "jschlyter"; + repo = pname; + rev = "v${version}"; + hash = "sha256-zDMgH9o9obfuihX8pXj226T1eMiKx33xyYOGKjdB1wk="; + }; + + nativeBuildInputs = [ + poetry-core + ]; + + propagatedBuildInputs = [ + aiohttp + colour + ]; + + # Module has no tests + doCheck = false; + + pythonImportsCheck = [ + "ttls" + ]; + + meta = with lib; { + description = "Module to interact with Twinkly LEDs"; + homepage = "https://github.com/jschlyter/ttls"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index a50d5ba71e4d..db2d4a70fb93 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9931,6 +9931,8 @@ in { trytond = callPackage ../development/python-modules/trytond { }; + ttls = callPackage ../development/python-modules/ttls { }; + ttp = callPackage ../development/python-modules/ttp { }; tubes = callPackage ../development/python-modules/tubes { }; From 6159254671a1e5d52afda2bc56bbdd5ef4020ff0 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 3 Feb 2022 19:19:33 +0100 Subject: [PATCH 169/214] home-assistant: update component-packages --- pkgs/servers/home-assistant/component-packages.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 5a3297094561..8ced5e7d0dea 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -923,7 +923,7 @@ "twilio" = ps: with ps; [ aiohttp-cors twilio ]; "twilio_call" = ps: with ps; [ aiohttp-cors twilio ]; "twilio_sms" = ps: with ps; [ aiohttp-cors twilio ]; - "twinkly" = ps: with ps; [ ]; # missing inputs: ttls + "twinkly" = ps: with ps; [ ttls ]; "twitch" = ps: with ps; [ python-twitch-client ]; "twitter" = ps: with ps; [ twitterapi ]; "ubus" = ps: with ps; [ openwrt-ubus-rpc ]; @@ -1546,6 +1546,7 @@ "tuya" "twentemilieu" "twilio" + "twinkly" "twitch" "uk_transport" "unifi" From 2563b46830c9a6e12cdd73a68f820429ea908273 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 3 Feb 2022 18:49:38 +0100 Subject: [PATCH 170/214] python3Packages.rtsp-to-webrtc: init at 0.5.0 --- .../python-modules/rtsp-to-webrtc/default.nix | 43 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 45 insertions(+) create mode 100644 pkgs/development/python-modules/rtsp-to-webrtc/default.nix diff --git a/pkgs/development/python-modules/rtsp-to-webrtc/default.nix b/pkgs/development/python-modules/rtsp-to-webrtc/default.nix new file mode 100644 index 000000000000..9cc4a85bee6a --- /dev/null +++ b/pkgs/development/python-modules/rtsp-to-webrtc/default.nix @@ -0,0 +1,43 @@ +{ lib +, aiohttp +, buildPythonPackage +, fetchFromGitHub +, pytest-aiohttp +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "rtsp-to-webrtc"; + version = "0.5.0"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "allenporter"; + repo = "rtsp-to-webrtc-client"; + rev = version; + hash = "sha256-ry6xNymWgkkvYXliVLUFOUiPz8gbCsQDrSuGmCaH4ZE="; + }; + + propagatedBuildInputs = [ + aiohttp + ]; + + checkInputs = [ + pytest-aiohttp + pytestCheckHook + ]; + + pythonImportsCheck = [ + "rtsp_to_webrtc" + ]; + + meta = with lib; { + description = "Module for RTSPtoWeb and RTSPtoWebRTC"; + homepage = "https://github.com/allenporter/rtsp-to-webrtc-client"; + 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 db2d4a70fb93..fa6aeba7f944 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -8725,6 +8725,8 @@ in { rtslib = callPackage ../development/python-modules/rtslib { }; + rtsp-to-webrtc = callPackage ../development/python-modules/rtsp-to-webrtc { }; + ruamel-base = callPackage ../development/python-modules/ruamel-base { }; ruamel-yaml = callPackage ../development/python-modules/ruamel-yaml { }; From d0e8f0c9513fb1b3d4358ae2f85b864e95c226ff Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 3 Feb 2022 19:17:09 +0100 Subject: [PATCH 171/214] home-assistant: update component-packages --- pkgs/servers/home-assistant/component-packages.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 8ced5e7d0dea..410d38a9e4c4 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -740,7 +740,7 @@ "rpi_rf" = ps: with ps; [ ]; # missing inputs: RPi.GPIO rpi-rf "rss_feed_template" = ps: with ps; [ aiohttp-cors ]; "rtorrent" = ps: with ps; [ ]; - "rtsp_to_webrtc" = ps: with ps; [ pyturbojpeg aiohttp-cors ]; # missing inputs: rtsp-to-webrtc + "rtsp_to_webrtc" = ps: with ps; [ pyturbojpeg aiohttp-cors rtsp-to-webrtc ]; "ruckus_unleashed" = ps: with ps; [ pyruckus ]; "russound_rio" = ps: with ps; [ ]; # missing inputs: russound_rio "russound_rnet" = ps: with ps; [ ]; # missing inputs: russound @@ -1443,6 +1443,7 @@ "roon" "rpi_power" "rss_feed_template" + "rtsp_to_webrtc" "ruckus_unleashed" "safe_mode" "samsungtv" From a4992f0e97f374b483929ae11feb763e3cee73ca Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 3 Feb 2022 10:01:22 +0100 Subject: [PATCH 172/214] python3Packages.aiowebostv: init at 0.1.2 --- .../python-modules/aiowebostv/default.nix | 39 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 41 insertions(+) create mode 100644 pkgs/development/python-modules/aiowebostv/default.nix diff --git a/pkgs/development/python-modules/aiowebostv/default.nix b/pkgs/development/python-modules/aiowebostv/default.nix new file mode 100644 index 000000000000..ab16c2d1e49a --- /dev/null +++ b/pkgs/development/python-modules/aiowebostv/default.nix @@ -0,0 +1,39 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, websockets +}: + +buildPythonPackage rec { + pname = "aiowebostv"; + version = "0.1.2"; + format = "setuptools"; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "home-assistant-libs"; + repo = pname; + rev = "v${version}"; + hash = "sha256-YSrttPoU5XQ9tqNxhHBUqZqKaEZdUdYYJ2CsSREVbbg="; + }; + + propagatedBuildInputs = [ + websockets + ]; + + # Module doesn't have tests + doCheck = false; + + pythonImportsCheck = [ + "aiowebostv" + ]; + + meta = with lib; { + description = "Module to interact with LG webOS based TV devices"; + homepage = "https://github.com/home-assistant-libs/aiowebostv"; + 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 fa6aeba7f944..f573420727f6 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -416,6 +416,8 @@ in { aiowatttime = callPackage ../development/python-modules/aiowatttime { }; + aiowebostv = callPackage ../development/python-modules/aiowebostv { }; + aiowinreg = callPackage ../development/python-modules/aiowinreg { }; aioymaps = callPackage ../development/python-modules/aioymaps { }; From 1a476523b8a8c1ac65fb31495c49ebe231d25fac Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 3 Feb 2022 19:32:13 +0100 Subject: [PATCH 173/214] home-assistant: update component-packages --- pkgs/servers/home-assistant/component-packages.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 410d38a9e4c4..9db24a0bc261 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -981,7 +981,7 @@ "waze_travel_time" = ps: with ps; [ wazeroutecalculator ]; "weather" = ps: with ps; [ ]; "webhook" = ps: with ps; [ aiohttp-cors ]; - "webostv" = ps: with ps; [ sqlalchemy ]; # missing inputs: aiowebostv + "webostv" = ps: with ps; [ aiowebostv sqlalchemy ]; "websocket_api" = ps: with ps; [ aiohttp-cors ]; "wemo" = ps: with ps; [ pywemo ]; "whirlpool" = ps: with ps; [ whirlpool-sixth-sense ]; @@ -1584,6 +1584,7 @@ "waze_travel_time" "weather" "webhook" + "webostv" "websocket_api" "wemo" "whirlpool" From e72710456d5adf5ab44f5ed9c48fc3d6a6e9a453 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 3 Feb 2022 19:10:17 +0100 Subject: [PATCH 174/214] python3Packages.circuit-webhook: init at 1.0.1 --- .../circuit-webhook/default.nix | 32 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 ++ 2 files changed, 34 insertions(+) create mode 100644 pkgs/development/python-modules/circuit-webhook/default.nix diff --git a/pkgs/development/python-modules/circuit-webhook/default.nix b/pkgs/development/python-modules/circuit-webhook/default.nix new file mode 100644 index 000000000000..895c6803142e --- /dev/null +++ b/pkgs/development/python-modules/circuit-webhook/default.nix @@ -0,0 +1,32 @@ +{ lib +, buildPythonPackage +, fetchPypi +, pythonOlder +}: + +buildPythonPackage rec { + pname = "circuit-webhook"; + version = "1.0.1"; + format = "setuptools"; + + disabled = pythonOlder "3.8"; + + src = fetchPypi { + inherit pname version; + hash = "sha256-NhePKBfzdkw7iVHmVrOxf8ZcQrb1Sq2xMIfu4P9+Ppw="; + }; + + # Module has no tests + doCheck = false; + + pythonImportsCheck = [ + "circuit_webhook" + ]; + + meta = with lib; { + description = "Module for Unify Circuit API webhooks"; + homepage = "https://github.com/braam/unify/tree/master/circuit-webhook-python"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index fa6aeba7f944..57b9284e1d49 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1581,6 +1581,8 @@ in { ci-py = callPackage ../development/python-modules/ci-py { }; + circuit-webhook = callPackage ../development/python-modules/circuit-webhook { }; + circuitbreaker = callPackage ../development/python-modules/circuitbreaker { }; cirq = callPackage ../development/python-modules/cirq { }; From d18a68f3e047253d89b118c99388744d72dd4ac7 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 3 Feb 2022 19:13:09 +0100 Subject: [PATCH 175/214] home-assistant: update component-packages --- pkgs/servers/home-assistant/component-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 410d38a9e4c4..7c99c9bf10c6 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -122,7 +122,7 @@ "cast" = ps: with ps; [ pyturbojpeg aiohttp-cors hass-nabucasa ifaddr mutagen plexapi plexauth plexwebsocket PyChromecast zeroconf ]; "cert_expiry" = ps: with ps; [ ]; "channels" = ps: with ps; [ pychannels ]; - "circuit" = ps: with ps; [ ]; # missing inputs: circuit-webhook + "circuit" = ps: with ps; [ circuit-webhook ]; "cisco_ios" = ps: with ps; [ pexpect ]; "cisco_mobility_express" = ps: with ps; [ ciscomobilityexpress ]; "cisco_webex_teams" = ps: with ps; [ webexteamssdk ]; From 9baf6886462a2a4cd71599680802d2459f28be23 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 30 Jan 2022 13:35:10 +0000 Subject: [PATCH 176/214] python310Packages.limnoria: 2022.1.1.post1 -> 2022.1.29 --- pkgs/development/python-modules/limnoria/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/limnoria/default.nix b/pkgs/development/python-modules/limnoria/default.nix index 7a4e93f9ddd3..16bfab961143 100644 --- a/pkgs/development/python-modules/limnoria/default.nix +++ b/pkgs/development/python-modules/limnoria/default.nix @@ -15,14 +15,14 @@ buildPythonPackage rec { pname = "limnoria"; - version = "2022.1.1.post1"; + version = "2022.1.29"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-9p06yD95emBOFKtTZMVR/3ySAB24pB3QRmzVEnqeb9U="; + hash = "sha256-fBIWmFo3uTswLfxmSaYixALeJ89HCpLcooldw1UZwCw="; }; propagatedBuildInputs = [ From cd1daa018aa17873e0dc6df16a2b26df3595e950 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 29 Jan 2022 09:21:02 +0000 Subject: [PATCH 177/214] sidplayfp: 2.2.2 -> 2.2.3 --- pkgs/applications/audio/sidplayfp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/sidplayfp/default.nix b/pkgs/applications/audio/sidplayfp/default.nix index 73f1f650677c..9aef427f509f 100644 --- a/pkgs/applications/audio/sidplayfp/default.nix +++ b/pkgs/applications/audio/sidplayfp/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "sidplayfp"; - version = "2.2.2"; + version = "2.2.3"; src = fetchFromGitHub { owner = "libsidplayfp"; repo = "sidplayfp"; rev = "v${version}"; - sha256 = "sha256-DBZZf3A0AYkeQxQvHGyHHbsQ2EDuxsZnZPbxkWTNcHA="; + sha256 = "sha256-R60Dh19GYM157ysmN8EOJ47eO8a7sdkEEF1TObG1xzk="; }; nativeBuildInputs = [ autoreconfHook perl pkg-config ]; From e4a506d6997ea653a4debb165232d8205d5cd1ab Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 3 Feb 2022 09:47:59 +0100 Subject: [PATCH 178/214] python3Packages.aiooncue: init at 0.3.2 --- .../python-modules/aiooncue/default.nix | 44 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 46 insertions(+) create mode 100644 pkgs/development/python-modules/aiooncue/default.nix diff --git a/pkgs/development/python-modules/aiooncue/default.nix b/pkgs/development/python-modules/aiooncue/default.nix new file mode 100644 index 000000000000..f1d71e77d4bb --- /dev/null +++ b/pkgs/development/python-modules/aiooncue/default.nix @@ -0,0 +1,44 @@ +{ lib +, aiohttp +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +}: + +buildPythonPackage rec { + pname = "aiooncue"; + version = "0.3.2"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "bdraco"; + repo = pname; + rev = version; + hash = "sha256-6GnXuYpggUMisfeOnl52xvWFIZRV+oCwsFKAjPwscTU="; + }; + + propagatedBuildInputs = [ + aiohttp + ]; + + # Module doesn't have tests + doCheck = false; + + postPatch = '' + substituteInPlace setup.py \ + --replace '"pytest-runner",' "" + ''; + + pythonImportsCheck = [ + "aiooncue" + ]; + + meta = with lib; { + description = "Module to interact with the Kohler Oncue API"; + homepage = "https://github.com/bdraco/aiooncue"; + 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 57b9284e1d49..c6f97ad70ba9 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -362,6 +362,8 @@ in { aionotion = callPackage ../development/python-modules/aionotion { }; + aiooncue = callPackage ../development/python-modules/aiooncue { }; + aiopg = callPackage ../development/python-modules/aiopg { }; aioprocessing = callPackage ../development/python-modules/aioprocessing { }; From 9e0cc1ce07a8d40799d14b106169bb87fc1712d2 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 3 Feb 2022 19:37:11 +0100 Subject: [PATCH 179/214] home-assistant: update component-packages --- pkgs/servers/home-assistant/component-packages.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 7c99c9bf10c6..d950419be78a 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -609,7 +609,7 @@ "ombi" = ps: with ps; [ pyombi ]; "omnilogic" = ps: with ps; [ omnilogic ]; "onboarding" = ps: with ps; [ aiohttp-cors home-assistant-frontend pillow sqlalchemy ]; - "oncue" = ps: with ps; [ ]; # missing inputs: aiooncue + "oncue" = ps: with ps; [ aiooncue ]; "ondilo_ico" = ps: with ps; [ aiohttp-cors ondilo ]; "onewire" = ps: with ps; [ ]; # missing inputs: pi1wire pyownet "onkyo" = ps: with ps; [ onkyo-eiscp ]; @@ -1379,6 +1379,7 @@ "octoprint" "omnilogic" "onboarding" + "oncue" "ondilo_ico" "open_meteo" "openalpr_cloud" From b484b1c2dd85bd4233296278d410d280157949af Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 31 Jan 2022 07:40:17 +0000 Subject: [PATCH 180/214] stgit: 1.4 -> 1.5 --- .../version-management/git-and-tools/stgit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/git-and-tools/stgit/default.nix b/pkgs/applications/version-management/git-and-tools/stgit/default.nix index 1c3fdf90aa79..0a6251548be2 100644 --- a/pkgs/applications/version-management/git-and-tools/stgit/default.nix +++ b/pkgs/applications/version-management/git-and-tools/stgit/default.nix @@ -12,13 +12,13 @@ python3Packages.buildPythonApplication rec { pname = "stgit"; - version = "1.4"; + version = "1.5"; src = fetchFromGitHub { owner = "stacked-git"; repo = "stgit"; rev = "v${version}"; - sha256 = "0yx81d61kp33h7n0c14wvcrh8vvjjjq4xjh1qwq2sdbmqc43p3hg"; + sha256 = "sha256-TsJr2Riygz/DZrn6UZMPvq1tTfvl3dFEZZNq2wVj1Nw="; }; nativeBuildInputs = [ installShellFiles asciidoc xmlto docbook_xsl docbook_xml_dtd_45 ]; From 2336118ea9e33f9714efbf0c7e4927abade8cbbc Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 1 Feb 2022 15:38:30 +0000 Subject: [PATCH 181/214] tcpreplay: 4.3.4 -> 4.4.0 --- pkgs/tools/networking/tcpreplay/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/tcpreplay/default.nix b/pkgs/tools/networking/tcpreplay/default.nix index 6e2fb35fd4c2..f2bb52318761 100644 --- a/pkgs/tools/networking/tcpreplay/default.nix +++ b/pkgs/tools/networking/tcpreplay/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "tcpreplay"; - version = "4.3.4"; + version = "4.4.0"; src = fetchurl { url = "https://github.com/appneta/tcpreplay/releases/download/v${version}/tcpreplay-${version}.tar.gz"; - sha256 = "sha256-7gZTEIBsIuL9NvAU4euzMbmKfsTblY6Rw9nL2gZA2Sw="; + sha256 = "sha256-o7ElwDGb0JbWj4IcSggFGy09kni6xv4Yz+PJIBcDpWc="; }; buildInputs = [ libpcap ] From 3f76c7d11a8bb09361f3d4c5c676a9ce35fd993c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 3 Feb 2022 09:24:56 +0100 Subject: [PATCH 182/214] python3Packages.pyaussiebb: init at 0.0.9 --- .../python-modules/pyaussiebb/default.nix | 44 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 46 insertions(+) create mode 100644 pkgs/development/python-modules/pyaussiebb/default.nix diff --git a/pkgs/development/python-modules/pyaussiebb/default.nix b/pkgs/development/python-modules/pyaussiebb/default.nix new file mode 100644 index 000000000000..ccee1ff51e84 --- /dev/null +++ b/pkgs/development/python-modules/pyaussiebb/default.nix @@ -0,0 +1,44 @@ +{ lib +, aiohttp +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +, loguru +, requests +}: + +buildPythonPackage rec { + pname = "pyaussiebb"; + version = "0.0.9"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "yaleman"; + repo = "aussiebb"; + rev = "v${version}"; + hash = "sha256-DMU29dTqDaPLQS20iuHIph6mhBdj6ni3+MA9KkRMtzg="; + }; + + propagatedBuildInputs = [ + aiohttp + requests + loguru + ]; + + # Tests require network access + # https://github.com/yaleman/aussiebb/issues/6 + doCheck = false; + + pythonImportsCheck = [ + "aussiebb" + ]; + + meta = with lib; { + description = "Module for interacting with the Aussie Broadband APIs"; + homepage = "https://github.com/yaleman/aussiebb"; + 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 57b9284e1d49..2cb6c77b3d22 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -6536,6 +6536,8 @@ in { pyaudio = callPackage ../development/python-modules/pyaudio { }; + pyaussiebb = callPackage ../development/python-modules/pyaussiebb { }; + pyautogui = callPackage ../development/python-modules/pyautogui { }; pyavm = callPackage ../development/python-modules/pyavm { }; From 5c6b8b6fcfc029f8468b7a5e4038d1f7bd64fc70 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 3 Feb 2022 19:41:42 +0100 Subject: [PATCH 183/214] home-assistant: update component-packages --- pkgs/servers/home-assistant/component-packages.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 7c99c9bf10c6..2f7f8a23ccea 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -66,7 +66,7 @@ "august" = ps: with ps; [ yalexs ]; "aurora" = ps: with ps; [ auroranoaa ]; "aurora_abb_powerone" = ps: with ps; [ ]; # missing inputs: aurorapy - "aussie_broadband" = ps: with ps; [ ]; # missing inputs: pyaussiebb + "aussie_broadband" = ps: with ps; [ pyaussiebb ]; "auth" = ps: with ps; [ aiohttp-cors ]; "automation" = ps: with ps; [ aiohttp-cors ]; "avea" = ps: with ps; [ avea ]; @@ -1069,6 +1069,7 @@ "atag" "august" "aurora" + "aussie_broadband" "auth" "automation" "awair" From 241fc63f215952427ecfd0c3989f3f965063ce89 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 3 Feb 2022 09:10:19 +0100 Subject: [PATCH 184/214] python3Packages.aioaseko: init at 0.0.1 --- .../python-modules/aioaseko/default.nix | 39 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 41 insertions(+) create mode 100644 pkgs/development/python-modules/aioaseko/default.nix diff --git a/pkgs/development/python-modules/aioaseko/default.nix b/pkgs/development/python-modules/aioaseko/default.nix new file mode 100644 index 000000000000..ca05910511ed --- /dev/null +++ b/pkgs/development/python-modules/aioaseko/default.nix @@ -0,0 +1,39 @@ +{ lib +, aiohttp +, buildPythonPackage +, fetchFromGitHub +, pythonOlder +}: + +buildPythonPackage rec { + pname = "aioaseko"; + version = "0.0.1"; + format = "pyproject"; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "milanmeu"; + repo = pname; + rev = "v${version}"; + hash = "sha256-dfU2J4aDKNR+GoEmdq/NhX4Mrmm9tmCkse1tb+V5EFQ="; + }; + + propagatedBuildInputs = [ + aiohttp + ]; + + # Module has no tests + doCheck = false; + + pythonImportsCheck = [ + "aioaseko" + ]; + + meta = with lib; { + description = "Module to interact with the Aseko Pool Live API"; + homepage = "https://github.com/milanmeu/aioaseko"; + license = with licenses; [ lgpl3Plus ]; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 57b9284e1d49..a7db766a3936 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -258,6 +258,8 @@ in { aioamqp = callPackage ../development/python-modules/aioamqp { }; + aioaseko = callPackage ../development/python-modules/aioaseko { }; + aioasuswrt = callPackage ../development/python-modules/aioasuswrt { }; aioazuredevops = callPackage ../development/python-modules/aioazuredevops { }; From a699e7ceb41ebc46798ea3222b6ab7153fef0919 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 3 Feb 2022 19:44:07 +0100 Subject: [PATCH 185/214] home-assistant: update component-packages --- pkgs/servers/home-assistant/component-packages.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 7c99c9bf10c6..53c33425e4e3 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -56,7 +56,7 @@ "arris_tg2492lg" = ps: with ps; [ ]; # missing inputs: arris-tg2492lg "aruba" = ps: with ps; [ pexpect ]; "arwn" = ps: with ps; [ aiohttp-cors paho-mqtt ]; - "aseko_pool_live" = ps: with ps; [ ]; # missing inputs: aioaseko + "aseko_pool_live" = ps: with ps; [ aioaseko ]; "asterisk_cdr" = ps: with ps; [ ]; # missing inputs: asterisk_mbox "asterisk_mbox" = ps: with ps; [ ]; # missing inputs: asterisk_mbox "asuswrt" = ps: with ps; [ aioasuswrt ]; @@ -1065,6 +1065,7 @@ "aprs" "arcam_fmj" "arlo" + "aseko_pool_live" "asuswrt" "atag" "august" From 5a7f3100e3ccd4269c0da5a39b7c4c14b6a33dbf Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Tue, 1 Feb 2022 13:24:57 +0000 Subject: [PATCH 186/214] vaultwarden: 1.23.1 -> 1.24.0 --- pkgs/tools/security/vaultwarden/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/vaultwarden/default.nix b/pkgs/tools/security/vaultwarden/default.nix index 13399698c0ed..49e02a4e1c26 100644 --- a/pkgs/tools/security/vaultwarden/default.nix +++ b/pkgs/tools/security/vaultwarden/default.nix @@ -5,16 +5,16 @@ rustPlatform.buildRustPackage rec { pname = "vaultwarden"; - version = "1.23.1"; + version = "1.24.0"; src = fetchFromGitHub { owner = "dani-garcia"; repo = pname; rev = version; - sha256 = "sha256-UMeltpuGUPdB5j4NBxA6SuLUqzinrF8USCaJk9SjDJA="; + sha256 = "sha256-zeMVdsTSp1z8cwebU2N6w7436N8CcI7PzNedDOSvEx4="; }; - cargoSha256 = "sha256-8SjCWioOK/bk6G+0Yfl0ilgbLu83hn+AtuX9QWrnQEc="; + cargoSha256 = "sha256-Sn6DuzV2OfaywE0W2afRG0h8PfOprqMtZtYM/exGEww="; postPatch = '' # Upstream specifies 1.57; nixpkgs has 1.56 which also produces a working From 1ec30a90031eaa98c691a68fa2156403af76e4e8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Janne=20He=C3=9F?= Date: Thu, 3 Feb 2022 19:55:11 +0100 Subject: [PATCH 187/214] perlPackages.ConfigIniFiles: Use buildPerlPackage This is to fix cross NixOS builds. buildPerlModule uses Module::Build which does not cross-build. The package doesn't seem to need Module::Build so switching to buildPerlPackage seems to be safe. --- pkgs/top-level/perl-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 3257845b0a81..11cf419b6240 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -3683,7 +3683,7 @@ let }; }; - ConfigIniFiles = buildPerlModule { + ConfigIniFiles = buildPerlPackage { pname = "Config-IniFiles"; version = "3.000003"; src = fetchurl { From f4dccd58f4676b8363ede9e7779c7fb8352ce3b0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 3 Feb 2022 10:54:35 +0000 Subject: [PATCH 188/214] rocksdb: 6.27.3 -> 6.28.2 --- pkgs/development/libraries/rocksdb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/rocksdb/default.nix b/pkgs/development/libraries/rocksdb/default.nix index 9364fdf75d5b..dd7719c8c838 100644 --- a/pkgs/development/libraries/rocksdb/default.nix +++ b/pkgs/development/libraries/rocksdb/default.nix @@ -15,13 +15,13 @@ stdenv.mkDerivation rec { pname = "rocksdb"; - version = "6.27.3"; + version = "6.28.2"; src = fetchFromGitHub { owner = "facebook"; repo = pname; rev = "v${version}"; - sha256 = "sha256-s3vBW/vN6lUvOp3vlx/Wo2ZrzobZ2s8MHujFouSU2NM="; + sha256 = "sha256-0T/ANHTRzk0ymezRQbvJt6aL350Z004gcj4JapAyAnQ="; }; nativeBuildInputs = [ cmake ninja ]; From 30da1274dbd90939520fe6e18499489650d06787 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 3 Feb 2022 19:05:43 +0000 Subject: [PATCH 189/214] python310Packages.deezer-python: 5.0.1 -> 5.1.0 --- pkgs/development/python-modules/deezer-python/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/deezer-python/default.nix b/pkgs/development/python-modules/deezer-python/default.nix index 95d8026bbc6f..0e2a465843c9 100644 --- a/pkgs/development/python-modules/deezer-python/default.nix +++ b/pkgs/development/python-modules/deezer-python/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "deezer-python"; - version = "5.0.1"; + version = "5.1.0"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "browniebroke"; repo = pname; rev = "v${version}"; - sha256 = "sha256-dL1d1bF+hHIQrsyk6t1Afj22yNC/cIpuID5Ajgal5bA="; + sha256 = "sha256-hBZBbREPxfAkGf2KRZtO3BpscFGlYiecQjM5l1/Edo0="; }; nativeBuildInputs = [ From 277d6494b24a310c2e91fa0d9b136576f682c162 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 3 Feb 2022 08:55:11 +0100 Subject: [PATCH 190/214] python3Packages.aurorapy: init at 0.2.6 --- .../python-modules/aurorapy/default.nix | 43 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 45 insertions(+) create mode 100644 pkgs/development/python-modules/aurorapy/default.nix diff --git a/pkgs/development/python-modules/aurorapy/default.nix b/pkgs/development/python-modules/aurorapy/default.nix new file mode 100644 index 000000000000..17abcf0e9c47 --- /dev/null +++ b/pkgs/development/python-modules/aurorapy/default.nix @@ -0,0 +1,43 @@ +{ lib +, buildPythonPackage +, fetchFromGitLab +, future +, pyserial +, pytestCheckHook +, pythonOlder +}: + +buildPythonPackage rec { + pname = "aurorapy"; + version = "0.2.6"; + format = "pyproject"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitLab { + owner = "energievalsabbia"; + repo = pname; + rev = version; + hash = "sha256-DMlzzLe94dbeHjESmLc045v7vQ//IEsngAv7TeVznHE="; + }; + + propagatedBuildInputs = [ + future + pyserial + ]; + + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "aurorapy" + ]; + + meta = with lib; { + description = "Implementation of the communication protocol for Power-One Aurora inverters"; + homepage = "https://gitlab.com/energievalsabbia/aurorapy"; + 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 4e48619b09fb..c393dcfc0d61 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -752,6 +752,8 @@ in { auroranoaa = callPackage ../development/python-modules/auroranoaa { }; + aurorapy = callPackage ../development/python-modules/aurorapy { }; + auth0-python = callPackage ../development/python-modules/auth0-python { }; authcaptureproxy = callPackage ../development/python-modules/authcaptureproxy { }; From fcb7b15b10ad7eb51221df5e2d93a6306f9abe9a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 3 Feb 2022 08:56:54 +0100 Subject: [PATCH 191/214] home-assistant: update component-packages --- pkgs/servers/home-assistant/component-packages.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 80e77aed72b5..0abf0577a658 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -65,7 +65,7 @@ "atome" = ps: with ps; [ pyatome ]; "august" = ps: with ps; [ yalexs ]; "aurora" = ps: with ps; [ auroranoaa ]; - "aurora_abb_powerone" = ps: with ps; [ ]; # missing inputs: aurorapy + "aurora_abb_powerone" = ps: with ps; [ aurorapy ]; "aussie_broadband" = ps: with ps; [ pyaussiebb ]; "auth" = ps: with ps; [ aiohttp-cors ]; "automation" = ps: with ps; [ aiohttp-cors ]; @@ -1070,6 +1070,7 @@ "atag" "august" "aurora" + "aurora_abb_powerone" "aussie_broadband" "auth" "automation" From 47a89959405ea0c254cf0a16b1aec0a7baecdb46 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Thu, 6 Jan 2022 15:43:24 +1000 Subject: [PATCH 192/214] go, buildGoModule, buildGoPackage: default to 1.17 --- pkgs/top-level/all-packages.nix | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 24ed89fdc883..684083d12ef8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -12539,7 +12539,7 @@ with pkgs; buildPackages = buildPackages // { stdenv = buildPackages.gcc8Stdenv; }; }); - go = go_1_16; + go = go_1_17; go-repo-root = callPackage ../development/tools/go-repo-root { }; @@ -20844,30 +20844,20 @@ with pkgs; buildGo116Package = callPackage ../development/go-packages/generic { go = buildPackages.go_1_16; }; - # go_1_17 has go module changes which may not be portable - # across different go versions and/or platforms: - # https://github.com/NixOS/nixpkgs/issues/144667 - # - # That's why `buildGoPackage != buildGo117Package`. buildGo117Package = callPackage ../development/go-packages/generic { go = buildPackages.go_1_17; }; - buildGoPackage = buildGo116Package; + buildGoPackage = buildGo117Package; buildGo116Module = callPackage ../development/go-modules/generic { go = buildPackages.go_1_16; }; - # go_1_17 has go module changes which may not be portable - # across different go versions and/or platforms: - # https://github.com/NixOS/nixpkgs/issues/144667 - # - # That's why `buildGoModule != buildGo117Module`. buildGo117Module = callPackage ../development/go-modules/generic { go = buildPackages.go_1_17; }; - buildGoModule = buildGo116Module; + buildGoModule = buildGo117Module; go2nix = callPackage ../development/tools/go2nix { }; From c76d51fcedff5f8d68e1c3391ddf452edad1e974 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Tue, 1 Feb 2022 09:15:55 +1000 Subject: [PATCH 193/214] gopls: update vendorSha256 --- pkgs/development/tools/gopls/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/tools/gopls/default.nix b/pkgs/development/tools/gopls/default.nix index d541393a8946..ae813c0f6ee9 100644 --- a/pkgs/development/tools/gopls/default.nix +++ b/pkgs/development/tools/gopls/default.nix @@ -12,7 +12,7 @@ buildGoModule rec { }; modRoot = "gopls"; - vendorSha256 = "sha256-nKjJjtVHk/RLIHI/5v8tO4RcaLLZhr0A6llYGsB0ifQ="; + vendorSha256 = "sha256-8osb5C5G58x9KWCxqiepmN6J0jp+q6aR+As/pJeeTKM="; doCheck = false; From 46a658d41450e71c17143a532a36e9b69f505e85 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Tue, 1 Feb 2022 09:15:55 +1000 Subject: [PATCH 194/214] vgo2nix: update vendorSha256 --- pkgs/development/tools/vgo2nix/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/tools/vgo2nix/default.nix b/pkgs/development/tools/vgo2nix/default.nix index 16926b16e981..365bb920e4ac 100644 --- a/pkgs/development/tools/vgo2nix/default.nix +++ b/pkgs/development/tools/vgo2nix/default.nix @@ -17,7 +17,8 @@ buildGoModule { sha256 = "0n9pf0i5y59kiiv6dq8h8w1plaz9w6s67rqr2acqgxa45iq36mkh"; }; - vendorSha256 = "1lzhhg9wimn8nfzrrla5bshgk1ghnlsdfmq6iask0zqz311g96bv"; + vendorSha256 = "1xgl4avq0rblzqqpaxl4dwg4ysrhacwhfd21vb0v9ffr3zcpdw9n"; + proxyVendor = true; subPackages = [ "." ]; From c8a3a56753d1e33908b9c79ca3a7d1c2a26bdddf Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Thu, 3 Feb 2022 09:35:23 +1000 Subject: [PATCH 195/214] keybase: update vendorSha256 --- pkgs/tools/security/keybase/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/security/keybase/default.nix b/pkgs/tools/security/keybase/default.nix index d8773080b9d6..4e372e7dad83 100644 --- a/pkgs/tools/security/keybase/default.nix +++ b/pkgs/tools/security/keybase/default.nix @@ -18,7 +18,7 @@ buildGoModule rec { rev = "v${version}"; sha256 = "sha256-WAI/rl6awVLbXqdqYAq8fyABAO2qet+GYucuiwClylI="; }; - vendorSha256 = "sha256-ZZTM1s/kFHkCjnaDYuP7xCrkW2an3I6kvcMXMy63ySE="; + vendorSha256 = "sha256-ckAnSSSEF00gbgxnPAi2Pi8TNu3nmAahK7TP6HnfmNo="; patches = [ (substituteAll { From 2a4dab81d8f216aae84532facb0c62e115a627ac Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Thu, 3 Feb 2022 13:30:52 +1000 Subject: [PATCH 196/214] gocode-gomod: disable check --- pkgs/development/tools/gocode-gomod/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/development/tools/gocode-gomod/default.nix b/pkgs/development/tools/gocode-gomod/default.nix index f610b19d79b9..fca346b78c42 100644 --- a/pkgs/development/tools/gocode-gomod/default.nix +++ b/pkgs/development/tools/gocode-gomod/default.nix @@ -24,6 +24,8 @@ buildGoModule rec { mv $out/bin/gocode $out/bin/gocode-gomod ''; + doCheck = false; # fails on go 1.17 + meta = with lib; { description = "An autocompletion daemon for the Go programming language"; longDescription = '' From d5143d4ef929acb540b3bc13322dfcc37c4c201f Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Thu, 3 Feb 2022 13:32:19 +1000 Subject: [PATCH 197/214] reproxy: pin to go_1_16 --- 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 684083d12ef8..851260684934 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -21946,7 +21946,9 @@ with pkgs; redstore = callPackage ../servers/http/redstore { }; - reproxy = callPackage ../servers/reproxy { }; + reproxy = callPackage ../servers/reproxy { + buildGoModule = buildGo116Module; + }; restic = callPackage ../tools/backup/restic { }; From cbe3e2797a599b31a167c43cdad145a75a6cbf2f Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Thu, 3 Feb 2022 13:33:53 +1000 Subject: [PATCH 198/214] open-policy-agent: pin to go_1_16 --- 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 851260684934..67f375569170 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -27738,7 +27738,9 @@ with pkgs; onlyoffice-bin = callPackage ../applications/office/onlyoffice-bin { }; - open-policy-agent = callPackage ../development/tools/open-policy-agent { }; + open-policy-agent = callPackage ../development/tools/open-policy-agent { + buildGoModule = buildGo116Module; + }; openshift = callPackage ../applications/networking/cluster/openshift { }; From 7c5b41b6b8c4ae24d17c7e2d29861f759a86c54f Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Fri, 4 Feb 2022 06:13:50 +1000 Subject: [PATCH 199/214] victoriametrics: pin to go_1_16 --- 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 67f375569170..756a18d5b1a8 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22125,7 +22125,9 @@ with pkgs; buildGoModule = buildGo116Module; }; - victoriametrics = callPackage ../servers/nosql/victoriametrics { }; + victoriametrics = callPackage ../servers/nosql/victoriametrics { + buildGoModule = buildGo116Module; + }; virtiofsd = callPackage ../servers/misc/virtiofsd { }; From 357025f888b7060a91d4f62fcb9bced19e65bd11 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Fri, 4 Feb 2022 06:22:48 +1000 Subject: [PATCH 200/214] saml2aws: update vendorSha256 --- pkgs/tools/security/saml2aws/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/security/saml2aws/default.nix b/pkgs/tools/security/saml2aws/default.nix index 131956bed5c0..2f1127fd68a2 100644 --- a/pkgs/tools/security/saml2aws/default.nix +++ b/pkgs/tools/security/saml2aws/default.nix @@ -11,7 +11,7 @@ buildGoModule rec { sha256 = "sha256-JRJjuVF0MkV7KVmbAZhiWPWVwDORByCsZqPwdTuVRoA="; }; - vendorSha256 = "sha256-nsuI8z0xJYZwhlYHasxHpAAYycpqN0qmS8c0APvxxwc="; + vendorSha256 = "sha256-/N/RYqt+lhhECK+uq99vkm3Mg7PWpdE0GYLXkIYthNw="; buildInputs = lib.optionals stdenv.isDarwin [ AppKit ]; From 23eb6d2924720f357eeb63b526c62fd81ab96522 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 3 Feb 2022 21:24:42 +0100 Subject: [PATCH 201/214] python3Packages.adax-local: init at 0.1.3 --- .../python-modules/adax-local/default.nix | 43 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 45 insertions(+) create mode 100644 pkgs/development/python-modules/adax-local/default.nix diff --git a/pkgs/development/python-modules/adax-local/default.nix b/pkgs/development/python-modules/adax-local/default.nix new file mode 100644 index 000000000000..758667cc2d53 --- /dev/null +++ b/pkgs/development/python-modules/adax-local/default.nix @@ -0,0 +1,43 @@ +{ lib +, aiohttp +, bleak +, buildPythonPackage +, fetchFromGitHub +, async-timeout +, pythonOlder +}: + +buildPythonPackage rec { + pname = "adax-local"; + version = "0.1.3"; + format = "setuptools"; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "Danielhiversen"; + repo = "pyAdaxLocal"; + rev = version; + hash = "sha256-SGVXzSjtYNRVJN5fUjjskko55/e0L3P8aB90G4HuBOE="; + }; + + propagatedBuildInputs = [ + aiohttp + bleak + async-timeout + ]; + + # Module has no tests + doCheck = false; + + pythonImportsCheck = [ + "adax_local" + ]; + + meta = with lib; { + description = "Module for local access to Adax"; + homepage = "https://github.com/Danielhiversen/pyAdaxLocal"; + 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 4e48619b09fb..aeadc09f867a 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -194,6 +194,8 @@ in { adax = callPackage ../development/python-modules/adax { }; + adax-local = callPackage ../development/python-modules/adax-local { }; + adb-enhanced = callPackage ../development/python-modules/adb-enhanced { }; adb-homeassistant = callPackage ../development/python-modules/adb-homeassistant { }; From 06ee2778b6cadc847ad6cab926af4359c757b98c Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 3 Feb 2022 21:24:53 +0100 Subject: [PATCH 202/214] home-assistant: update component-packages --- pkgs/servers/home-assistant/component-packages.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 80e77aed72b5..f04e4a3dbd90 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -9,7 +9,7 @@ "acer_projector" = ps: with ps; [ pyserial ]; "acmeda" = ps: with ps; [ aiopulse ]; "actiontec" = ps: with ps; [ ]; - "adax" = ps: with ps; [ adax ]; # missing inputs: Adax-local + "adax" = ps: with ps; [ adax-local adax ]; "adguard" = ps: with ps; [ adguardhome ]; "ads" = ps: with ps; [ pyads ]; "advantage_air" = ps: with ps; [ advantage-air ]; @@ -1037,6 +1037,7 @@ "abode" "accuweather" "acmeda" + "adax" "adguard" "advantage_air" "aemet" From 9c60df4c8de2fb316e9e798be5d1ef0970a178ec Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 3 Feb 2022 21:43:44 +0100 Subject: [PATCH 203/214] python3Packages.filetype: 1.0.9 -> 1.0.10 --- pkgs/development/python-modules/filetype/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/filetype/default.nix b/pkgs/development/python-modules/filetype/default.nix index f89b4e690914..3c777d828b48 100644 --- a/pkgs/development/python-modules/filetype/default.nix +++ b/pkgs/development/python-modules/filetype/default.nix @@ -6,11 +6,11 @@ buildPythonPackage rec { pname = "filetype"; - version = "1.0.9"; + version = "1.0.10"; src = fetchPypi { inherit pname version; - sha256 = "7124e1bc6a97ffc7c6bead5b8fb2e129baf312a9e60db5772bc27c741799d475"; + sha256 = "sha256-MjoTUAcxtsZaJTvDkwu86aVt+6cekLYP/ZaKtp2a6Tc="; }; checkPhase = '' From fac7eed24230d3f8e14ff55789ac578c51f1833f Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Fri, 4 Feb 2022 07:01:45 +1000 Subject: [PATCH 204/214] yt-dlp: 2022.1.21 -> 2022.2.3 https://github.com/yt-dlp/yt-dlp/releases/tag/2022.02.03 --- pkgs/tools/misc/yt-dlp/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/misc/yt-dlp/default.nix b/pkgs/tools/misc/yt-dlp/default.nix index 3534769b86f9..02670e878308 100644 --- a/pkgs/tools/misc/yt-dlp/default.nix +++ b/pkgs/tools/misc/yt-dlp/default.nix @@ -20,12 +20,12 @@ buildPythonPackage rec { # The websites yt-dlp deals with are a very moving target. That means that # downloads break constantly. Because of that, updates should always be backported # to the latest stable release. - version = "2022.1.21"; + version = "2022.2.3"; src = fetchPypi { inherit pname; version = builtins.replaceStrings [ ".0" ] [ "." ] version; - sha256 = "sha256-Ig7EBzibXqcuJd/BHDDlQ0ibkAdcVTEdUlXiBF24qeI="; + sha256 = "sha256-lV3RgUq9F4uv8jg9FULv7kit/J3p4vXIZ4SwnNb1omI="; }; propagatedBuildInputs = [ websockets mutagen ] From b00ecd5e3d4610fb61777ba7c0fe6a1da2b30cb6 Mon Sep 17 00:00:00 2001 From: Thomas Boerger Date: Thu, 3 Feb 2022 22:04:31 +0100 Subject: [PATCH 205/214] mysides: new package for darwin (#155053) --- maintainers/maintainer-list.nix | 7 ++++ pkgs/os-specific/darwin/mysides/default.nix | 36 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 45 insertions(+) create mode 100644 pkgs/os-specific/darwin/mysides/default.nix diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index ceb84e902797..ff347b5f99a8 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -11811,6 +11811,13 @@ githubId = 863327; name = "Tyler Benster"; }; + tboerger = { + email = "thomas@webhippie.de"; + matrix = "@tboerger:matrix.org"; + github = "tboerger"; + githubId = 156964; + name = "Thomas Boerger"; + }; tcbravo = { email = "tomas.bravo@protonmail.ch"; github = "tcbravo"; diff --git a/pkgs/os-specific/darwin/mysides/default.nix b/pkgs/os-specific/darwin/mysides/default.nix new file mode 100644 index 000000000000..cdbfee5046a2 --- /dev/null +++ b/pkgs/os-specific/darwin/mysides/default.nix @@ -0,0 +1,36 @@ +{ lib, stdenv, fetchurl, libarchive, p7zip }: + +stdenv.mkDerivation rec { + pname = "mysides"; + version = "1.0.1"; + + src = fetchurl { + url = "https://github.com/mosen/mysides/releases/download/v${version}/mysides-${version}.pkg"; + sha256 = "sha256-dpRrj3xb9xQSXXXxragUDgNPBaniiMc6evRF12wqVRQ="; + }; + + dontBuild = true; + nativeBuildInputs = [ libarchive p7zip ]; + + unpackPhase = '' + 7z x $src + bsdtar -xf Payload~ + ''; + + installPhase = '' + runHook preInstall + + mkdir -p $out/bin + install -Dm755 usr/local/bin/mysides -t $out/bin + + runHook postInstall + ''; + + meta = with lib; { + description = "Manage macOS Finder sidebar favorites"; + homepage = "https://github.com/mosen/mysides"; + license = licenses.mit; + maintainers = with maintainers; [ tboerger ]; + platforms = platforms.darwin; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 24ed89fdc883..9bc46cd44271 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -33344,6 +33344,8 @@ with pkgs; mynewt-newt = callPackage ../tools/package-management/mynewt-newt { }; + mysides = callPackage ../os-specific/darwin/mysides { }; + nar-serve = callPackage ../tools/nix/nar-serve { }; neo = callPackage ../applications/misc/neo { }; From c9c1eed34e0c5777ab5ef094b9560f58b290c7a2 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 3 Feb 2022 22:36:02 +0100 Subject: [PATCH 206/214] python3Packages.papis: switch to pytestCheckHook --- .../python-modules/papis/default.nix | 121 +++++++++++++----- 1 file changed, 88 insertions(+), 33 deletions(-) diff --git a/pkgs/development/python-modules/papis/default.nix b/pkgs/development/python-modules/papis/default.nix index 1805172f4d7d..d117c8eb8db6 100644 --- a/pkgs/development/python-modules/papis/default.nix +++ b/pkgs/development/python-modules/papis/default.nix @@ -1,66 +1,121 @@ -{ lib, buildPythonPackage, fetchFromGitHub, xdg-utils -, requests, filetype, pyparsing, configparser, arxiv2bib -, pyyaml, chardet, beautifulsoup4, colorama, bibtexparser -, click, python-slugify, habanero, isbnlib, typing-extensions -, prompt-toolkit, pygments, stevedore, tqdm, lxml -, python-doi, isPy3k, pytest-cov -#, optional, dependencies -, whoosh, pytest +{ lib , stdenv +, arxiv2bib +, beautifulsoup4 +, bibtexparser +, buildPythonPackage +, chardet +, click +, colorama +, configparser +, fetchFromGitHub +, filetype +, habanero +, isbnlib +, lxml +, prompt-toolkit +, pygments +, pyparsing +, pytestCheckHook +, python-doi +, python-slugify +, pythonAtLeast +, pythonOlder +, pyyaml +, requests +, stevedore +, tqdm +, typing-extensions +, whoosh +, xdg-utils }: buildPythonPackage rec { pname = "papis"; version = "0.11.1"; - disabled = !isPy3k; + format = "setuptools"; + + disabled = pythonOlder "3.7"; - # Missing tests on Pypi src = fetchFromGitHub { owner = "papis"; repo = pname; rev = "v${version}"; - sha256 = "0bbkjyw1fsvvp0380l404h2lys8ib4xqga5s6401k1y1hld28nl6"; + hash = "sha256-hlokGoXBhxkAMbqohztZEWlPBSSAUIAGuHtrF7iXcy0="; }; propagatedBuildInputs = [ - requests filetype pyparsing configparser arxiv2bib - pyyaml chardet beautifulsoup4 colorama bibtexparser - click python-slugify habanero isbnlib - prompt-toolkit pygments typing-extensions - stevedore tqdm lxml + arxiv2bib + beautifulsoup4 + bibtexparser + chardet + click + colorama + configparser + filetype + habanero + isbnlib + lxml + prompt-toolkit + pygments + pyparsing python-doi - # optional dependencies + python-slugify + pyyaml + requests + stevedore + tqdm + typing-extensions whoosh ]; postPatch = '' substituteInPlace setup.py \ - --replace "lxml<=4.3.5" "lxml~=4.3" \ - --replace "isbnlib>=3.9.1,<3.10" "isbnlib~=3.9" \ - --replace "python-slugify>=1.2.6,<4" "python-slugify" + --replace "isbnlib>=3.9.1,<3.10" "isbnlib>=3.9" + substituteInPlace setup.cfg \ + --replace "--cov=papis" "" ''; - doCheck = !stdenv.isDarwin; + # Tests are failing on Python > 3.9 + doCheck = !stdenv.isDarwin && !(pythonAtLeast "3.10"); checkInputs = ([ - pytest pytest-cov + pytestCheckHook ]) ++ [ xdg-utils ]; - # most of the downloader tests and 4 other tests require a network connection - # test_export_yaml and test_citations check for the exact output produced by pyyaml 3.x and - # fail with 5.x - checkPhase = '' - HOME=$(mktemp -d) pytest papis tests --ignore tests/downloaders \ - -k "not test_get_data and not test_doi_to_data and not test_general and not get_document_url \ - and not test_validate_arxivid and not test_downloader_getter and not match" + preCheck = '' + export HOME=$(mktemp -d); ''; - meta = { + pytestFlagsArray = [ + "papis tests" + ]; + + disabledTestPaths = [ + "tests/downloaders" + ]; + + disabledTests = [ + "get_document_url" + "match" + "test_doi_to_data" + "test_downloader_getter" + "test_general" + "test_get_data" + "test_validate_arxivid" + "test_yaml" + ]; + + pythonImportsCheck = [ + "papis" + ]; + + meta = with lib; { description = "Powerful command-line document and bibliography manager"; - homepage = "https://papis.readthedocs.io/en/latest/"; - license = lib.licenses.gpl3; - maintainers = with lib.maintainers; [ nico202 teto ]; + homepage = "https://papis.readthedocs.io/"; + license = licenses.gpl3Only; + maintainers = with maintainers; [ nico202 teto ]; }; } From 50299ef014f201b1993f34f84dc8c51c1a3086b1 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 3 Feb 2022 22:57:14 +0100 Subject: [PATCH 207/214] python3Packages.pyqvrpro: init at 0.52 --- .../python-modules/pyqvrpro/default.nix | 47 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 49 insertions(+) create mode 100644 pkgs/development/python-modules/pyqvrpro/default.nix diff --git a/pkgs/development/python-modules/pyqvrpro/default.nix b/pkgs/development/python-modules/pyqvrpro/default.nix new file mode 100644 index 000000000000..0e12b339c07c --- /dev/null +++ b/pkgs/development/python-modules/pyqvrpro/default.nix @@ -0,0 +1,47 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, pytest-vcr +, pytestCheckHook +, pythonOlder +, pyyaml +, requests +, untangle +}: + +buildPythonPackage rec { + pname = "pyqvrpro"; + version = "0.52"; + format = "setuptools"; + + disabled = pythonOlder "3.7"; + + src = fetchFromGitHub { + owner = "oblogic7"; + repo = pname; + rev = "v${version}"; + hash = "sha256-lOd2AqnrkexNqT/usmJts5NW7vJtV8CRsliYgkhgRaU="; + }; + + propagatedBuildInputs = [ + pyyaml + requests + untangle + ]; + + checkInputs = [ + pytest-vcr + pytestCheckHook + ]; + + pythonImportsCheck = [ + "pyqvrpro" + ]; + + meta = with lib; { + description = "Module for interfacing with QVR Pro API"; + homepage = "https://github.com/oblogic7/pyqvrpro"; + license = licenses.mit; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 53b3ef813460..830695faf131 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -7355,6 +7355,8 @@ in { pyquil = callPackage ../development/python-modules/pyquil { }; + pyqvrpro = callPackage ../development/python-modules/pyqvrpro { }; + pyrabbit2 = callPackage ../development/python-modules/pyrabbit2 { }; pyrad = callPackage ../development/python-modules/pyrad { }; From be8837a25807286aa74c90b1c87cfc49486c4654 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 3 Feb 2022 22:57:40 +0100 Subject: [PATCH 208/214] home-assistant: update component-packages --- pkgs/servers/home-assistant/component-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index 55d9bad60316..93ea28060af5 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -693,7 +693,7 @@ "qnap" = ps: with ps; [ ]; # missing inputs: qnapstats "qrcode" = ps: with ps; [ pillow ]; # missing inputs: pyzbar "quantum_gateway" = ps: with ps; [ quantum-gateway ]; - "qvr_pro" = ps: with ps; [ ]; # missing inputs: pyqvrpro + "qvr_pro" = ps: with ps; [ pyqvrpro ]; "qwikswitch" = ps: with ps; [ ]; # missing inputs: pyqwikswitch "rachio" = ps: with ps; [ pyturbojpeg aiohttp-cors hass-nabucasa rachiopy ]; "radarr" = ps: with ps; [ ]; From 06b5a57024dc8f2d9f8754e9665b10b67c521043 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 3 Feb 2022 23:03:07 +0100 Subject: [PATCH 209/214] python3Packages.meshtastic: 1.2.80 -> 1.2.81 --- pkgs/development/python-modules/meshtastic/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/meshtastic/default.nix b/pkgs/development/python-modules/meshtastic/default.nix index 2492a0ba0fc5..c8df80596f5e 100644 --- a/pkgs/development/python-modules/meshtastic/default.nix +++ b/pkgs/development/python-modules/meshtastic/default.nix @@ -18,7 +18,7 @@ buildPythonPackage rec { pname = "meshtastic"; - version = "1.2.80"; + version = "1.2.81"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -27,7 +27,7 @@ buildPythonPackage rec { owner = "meshtastic"; repo = "Meshtastic-python"; rev = version; - sha256 = "sha256-w1pFTp/34o+fJS99SFXKWpFaaD7XrgRh723smjaoXzE="; + sha256 = "sha256-ITE3gtcvXMisARlmnhlSzkZr/tGLiDq8aSO6d6jmlOw="; }; propagatedBuildInputs = [ From 59c967ab74fd17db43c26569812cfaf38296adf6 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 3 Feb 2022 23:19:50 +0100 Subject: [PATCH 210/214] python3Packages.seatconnect: 1.1.4 -> 1.1.5 --- pkgs/development/python-modules/seatconnect/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/seatconnect/default.nix b/pkgs/development/python-modules/seatconnect/default.nix index 76df76ba5965..bc02e81e2ba6 100644 --- a/pkgs/development/python-modules/seatconnect/default.nix +++ b/pkgs/development/python-modules/seatconnect/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "seatconnect"; - version = "1.1.4"; + version = "1.1.5"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -21,8 +21,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "farfar"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-NA/UiapJ/SyUmrj9hd2xGV5WWy1KhxwQtqGLV73TfHk="; + rev = version; + hash = "sha256-NA/UiapJ/SyUmrj9hd2xGV5WWy1KhxwQtqGLV73TfHk="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; From 63e8294fd1adf66e5f7398694bb6f6e420094afe Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 3 Feb 2022 23:22:32 +0100 Subject: [PATCH 211/214] python3Packages.skodaconnect: 1.1.14 -> 1.1.17 --- pkgs/development/python-modules/skodaconnect/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/skodaconnect/default.nix b/pkgs/development/python-modules/skodaconnect/default.nix index fcac9d9eaddc..16ffaf9393ad 100644 --- a/pkgs/development/python-modules/skodaconnect/default.nix +++ b/pkgs/development/python-modules/skodaconnect/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "skodaconnect"; - version = "1.1.14"; + version = "1.1.17"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -20,8 +20,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "lendy007"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-aMyowz5+4Iu7bb8FSnHzx6QGp1WzzMXQZI23OZcr/kM="; + rev = version; + hash = "sha256-aMyowz5+4Iu7bb8FSnHzx6QGp1WzzMXQZI23OZcr/kM="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; From 2dba964f32cb68799dceb02a095a41e9f09b4dad Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 16 Jan 2022 23:30:41 +0100 Subject: [PATCH 212/214] python3Packages.glances-api: remove stale substituteInPlace --- pkgs/development/python-modules/glances-api/default.nix | 5 ----- 1 file changed, 5 deletions(-) diff --git a/pkgs/development/python-modules/glances-api/default.nix b/pkgs/development/python-modules/glances-api/default.nix index 2185522cef73..2c52db8ab5ff 100644 --- a/pkgs/development/python-modules/glances-api/default.nix +++ b/pkgs/development/python-modules/glances-api/default.nix @@ -37,11 +37,6 @@ buildPythonPackage rec { pytestCheckHook ]; - postPatch = '' - substituteInPlace pyproject.toml \ - --replace 'httpx = ">=0.20,<1"' 'httpx = ">=0.19,<1"' - ''; - pythonImportsCheck = [ "glances_api" ]; From 027b3fab5cb431cfba422391a9f10713eff3e024 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 3 Feb 2022 23:35:34 +0100 Subject: [PATCH 213/214] python3Packages.pvo: 0.2.0 -> 0.2.1 --- pkgs/development/python-modules/pvo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pvo/default.nix b/pkgs/development/python-modules/pvo/default.nix index 55802290c15a..a49465e1e34d 100644 --- a/pkgs/development/python-modules/pvo/default.nix +++ b/pkgs/development/python-modules/pvo/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "pvo"; - version = "0.2.0"; + version = "0.2.1"; format = "pyproject"; disabled = pythonOlder "3.8"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "frenck"; repo = "python-pvoutput"; rev = "v${version}"; - sha256 = "sha256-liV5Ae3Bz6MZT3KQ/1aNt6P4Wsg4SOfAMQKI0Qpxvao="; + sha256 = "sha256-IXK4DvmwSLdxyW4418pe1/UOeQELUBSnTO+P6TzPnKw="; }; nativeBuildInputs = [ From 1bad7be6c6ec114355a403414f131f70b1769274 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Thu, 3 Feb 2022 23:44:50 +0100 Subject: [PATCH 214/214] python3Packages.homematicip: 1.0.1 -> 1.0.2 --- .../python-modules/homematicip/default.nix | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/pkgs/development/python-modules/homematicip/default.nix b/pkgs/development/python-modules/homematicip/default.nix index 2a1cb8790386..71752fede539 100644 --- a/pkgs/development/python-modules/homematicip/default.nix +++ b/pkgs/development/python-modules/homematicip/default.nix @@ -5,7 +5,6 @@ , async-timeout , buildPythonPackage , fetchFromGitHub -, fetchpatch , pytestCheckHook , pythonAtLeast , pythonOlder @@ -18,7 +17,7 @@ buildPythonPackage rec { pname = "homematicip"; - version = "1.0.1"; + version = "1.0.2"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -27,18 +26,9 @@ buildPythonPackage rec { owner = "coreGreenberet"; repo = "homematicip-rest-api"; rev = version; - sha256 = "008snxx9ijpi1zr1pi1v4a6g74j821hyw0khs9lmi08v2mcabm36"; + sha256 = "sha256-j2ansly05auevlcDY5TFz6PZR/pNIGIbtkJuU8L5b0o="; }; - patches = [ - (fetchpatch { - # Drop loop kwarg from async_timeout.timeout - # https://github.com/coreGreenberet/homematicip-rest-api/pull/424 - url = "https://github.com/coreGreenberet/homematicip-rest-api/commit/90efb335667e3d462b7f9ef113d2e0b8bb4e96b4.patch"; - sha256 = "0f2bbs0666mf6sc7p4n8fwh29yjilkq36qf5pn0waf6iqdzxqwih"; - }) - ]; - propagatedBuildInputs = [ aenum aiohttp