From c14456e41eb4395989095bd5060e4bcda57e9c1c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sat, 2 Apr 2022 02:32:01 +0000 Subject: [PATCH 001/147] libsolv: 0.7.21 -> 0.7.22 --- pkgs/development/libraries/libsolv/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/libraries/libsolv/default.nix b/pkgs/development/libraries/libsolv/default.nix index 2d50851e583..3dde7038535 100644 --- a/pkgs/development/libraries/libsolv/default.nix +++ b/pkgs/development/libraries/libsolv/default.nix @@ -1,14 +1,14 @@ { lib, stdenv, fetchFromGitHub, cmake, ninja, zlib, expat, rpm, db }: stdenv.mkDerivation rec { - version = "0.7.21"; + version = "0.7.22"; pname = "libsolv"; src = fetchFromGitHub { owner = "openSUSE"; repo = "libsolv"; rev = version; - sha256 = "sha256-ka1HXVo0CFr0eqGTkatYq1jXE+9UgM0YTZNW1WtMLF0="; + sha256 = "sha256-rqWQJz3gZuhcNblyFWiYCC17miNY8F5xguAJwDk3xFE="; }; cmakeFlags = [ From b9ef500f11387852a9d4ed438c666151e8a56986 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 3 Apr 2022 16:55:01 +0000 Subject: [PATCH 002/147] scli: 0.7.0 -> 0.7.1 --- pkgs/applications/misc/scli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/scli/default.nix b/pkgs/applications/misc/scli/default.nix index 05223aeb5c1..6a32b395be9 100644 --- a/pkgs/applications/misc/scli/default.nix +++ b/pkgs/applications/misc/scli/default.nix @@ -8,13 +8,13 @@ python3.pkgs.buildPythonApplication rec { pname = "scli"; - version = "0.7.0"; + version = "0.7.1"; src = fetchFromGitHub { owner = "isamert"; repo = pname; rev = "v${version}"; - sha256 = "sha256-DUDf5FlcNZzZASa8vTc72Z1/Dk+iAhtcgVJtjDUwyEo="; + sha256 = "sha256-YEgeeoUqDeBx3jPddTeykl+68lS8gVKD+zdo+gRTaT4="; }; propagatedBuildInputs = with python3.pkgs; [ From 9d1895cd2418f87c8841170a118f005059d7339c Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 4 Apr 2022 18:36:19 +0000 Subject: [PATCH 003/147] html-xml-utils: 8.3 -> 8.4 --- pkgs/tools/text/xml/html-xml-utils/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/text/xml/html-xml-utils/default.nix b/pkgs/tools/text/xml/html-xml-utils/default.nix index f1ab390e481..741dcaad344 100644 --- a/pkgs/tools/text/xml/html-xml-utils/default.nix +++ b/pkgs/tools/text/xml/html-xml-utils/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "html-xml-utils"; - version = "8.3"; + version = "8.4"; src = fetchurl { url = "https://www.w3.org/Tools/HTML-XML-utils/${pname}-${version}.tar.gz"; - sha256 = "sha256-pQxNFtrWYK1nku9TvHfvqdVyl5diN3Gj/OUtjiPT0Iw="; + sha256 = "sha256-QbubFOH0zWEC4/jft55xRqJMCWk4aYcxZcQhdppX0Tc="; }; buildInputs = [curl libiconv]; From 8655b82de7507281718f2625a04415295c7fd3ac Mon Sep 17 00:00:00 2001 From: Vincent Haupert Date: Wed, 6 Apr 2022 21:36:28 +0200 Subject: [PATCH 004/147] sgx-sdk: 2.15.1 -> 2.16 --- pkgs/os-specific/linux/sgx/sdk/default.nix | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/pkgs/os-specific/linux/sgx/sdk/default.nix b/pkgs/os-specific/linux/sgx/sdk/default.nix index baa4ad2a337..977139406fe 100644 --- a/pkgs/os-specific/linux/sgx/sdk/default.nix +++ b/pkgs/os-specific/linux/sgx/sdk/default.nix @@ -29,15 +29,15 @@ stdenv.mkDerivation rec { pname = "sgx-sdk"; # Version as given in se_version.h - version = "2.15.101.1"; + version = "2.16.100.4"; # Version as used in the Git tag - versionTag = "2.15.1"; + versionTag = "2.16"; src = fetchFromGitHub { owner = "intel"; repo = "linux-sgx"; rev = "sgx_${versionTag}"; - hash = "sha256-e11COTR5eDPMB81aPRKatvIkAOeX+OZgnvn2utiv78M="; + hash = "sha256-qgXuJJWiqmcU11umCsE3DnlK4VryuTDAsNf53YPw6UY="; fetchSubmodules = true; }; @@ -53,18 +53,9 @@ stdenv.mkDerivation rec { url = "https://github.com/intel/linux-sgx/commit/254b58f922a6bd49c308a4f47f05f525305bd760.patch"; sha256 = "sha256-sHU++K7NJ+PdITx3y0PwstA9MVh10rj2vrLn01N9F4w="; }) - # Commit to add missing sgx_ippcp.h not yet part of this release - (fetchpatch { - name = "add-missing-sgx_ippcp-header.patch"; - url = "https://github.com/intel/linux-sgx/commit/51d1087b707a47e18588da7bae23e5f686d44be6.patch"; - sha256 = "sha256-RZC14H1oEuGp0zn8CySDPy1KNqP/POqb+KMYoQt2A7M="; - }) ]; postPatch = '' - # https://github.com/intel/linux-sgx/pull/730 - substituteInPlace buildenv.mk --replace '/bin/cp' 'cp' - patchShebangs linux/installer/bin/build-installpkg.sh \ linux/installer/common/sdk/createTarball.sh \ linux/installer/common/sdk/install.sh From 02e6180ce788ba0a36a2e3ccdc12b6eb6c25c442 Mon Sep 17 00:00:00 2001 From: Vincent Haupert Date: Wed, 6 Apr 2022 21:36:44 +0200 Subject: [PATCH 005/147] sgx-psw: 2.15.1 -> 2.16 --- pkgs/os-specific/linux/sgx/psw/default.nix | 25 ++-------------------- 1 file changed, 2 insertions(+), 23 deletions(-) diff --git a/pkgs/os-specific/linux/sgx/psw/default.nix b/pkgs/os-specific/linux/sgx/psw/default.nix index b418d5c1822..7f64cdc3594 100644 --- a/pkgs/os-specific/linux/sgx/psw/default.nix +++ b/pkgs/os-specific/linux/sgx/psw/default.nix @@ -28,11 +28,11 @@ stdenv.mkDerivation rec { hash = "sha256-JriA9UGYFkAPuCtRizk8RMM1YOYGR/eO9ILnx47A40s="; }; dcap = rec { - version = "1.12.1"; + version = "1.13"; filename = "prebuilt_dcap_${version}.tar.gz"; prebuilt = fetchurl { url = "https://download.01.org/intel-sgx/sgx-dcap/${version}/linux/${filename}"; - hash = "sha256-V/XHva9Sq3P36xSW+Sd0G6Dnk4H0ANO1Ns/u+FI1eGI="; + hash = "sha256-0kD6hxN8qZ/7/H99aboQx7Qg7ewmYPEexoU6nqczAik="; }; }; in @@ -64,19 +64,6 @@ stdenv.mkDerivation rec { ]; postPatch = '' - # https://github.com/intel/linux-sgx/pull/730 - substituteInPlace buildenv.mk --replace '/bin/cp' 'cp' - substituteInPlace psw/ae/aesm_service/source/CMakeLists.txt \ - --replace '/usr/bin/getconf' 'getconf' - - # https://github.com/intel/SGXDataCenterAttestationPrimitives/pull/205 - substituteInPlace ./external/dcap_source/QuoteGeneration/buildenv.mk \ - --replace '/bin/cp' 'cp' - substituteInPlace external/dcap_source/tools/SGXPlatformRegistration/Makefile \ - --replace '/bin/cp' 'cp' - substituteInPlace external/dcap_source/tools/SGXPlatformRegistration/buildenv.mk \ - --replace '/bin/cp' 'cp' - patchShebangs \ linux/installer/bin/build-installpkg.sh \ linux/installer/common/psw/createTarball.sh \ @@ -166,14 +153,6 @@ stdenv.mkDerivation rec { substituteInPlace $out/lib/systemd/system/remount-dev-exec.service \ --replace '/bin/mount' \ "${util-linux}/bin/mount" - - header "Fixing linksgx.sh" - # https://github.com/intel/linux-sgx/pull/736 - substituteInPlace $out/aesm/linksgx.sh \ - --replace '/usr/bin/getent' \ - '${glibc.bin}/bin/getent' \ - --replace '/usr/sbin/usermod' \ - '${shadow}/bin/usermod' ''; passthru.tests = { From f6b177664893b057c443a2008dd30b0001c4f982 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 6 Apr 2022 20:53:39 +0000 Subject: [PATCH 006/147] tgt: 1.0.81 -> 1.0.82 --- pkgs/tools/networking/tgt/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/tgt/default.nix b/pkgs/tools/networking/tgt/default.nix index fdaf0dc177f..34f09368760 100644 --- a/pkgs/tools/networking/tgt/default.nix +++ b/pkgs/tools/networking/tgt/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "tgt"; - version = "1.0.81"; + version = "1.0.82"; src = fetchFromGitHub { owner = "fujita"; repo = pname; rev = "v${version}"; - sha256 = "sha256-SgMpoaVAuTbgpmnXRfQFWlK5gl01fsE9vJxu3C2ctPU="; + sha256 = "sha256-uVd1qPNBIqs9+pRnRP/Q8Z5sXpRdcwBejKjt0BJbXWA="; }; nativeBuildInputs = [ libxslt docbook_xsl makeWrapper ]; From d7b3ff6d566011c47e4b4d4f3c0ad1e0a74831e3 Mon Sep 17 00:00:00 2001 From: Nick Novitski Date: Thu, 14 Apr 2022 22:12:25 -0700 Subject: [PATCH 007/147] minikube: disable update notifications Note that the kubectl download message setting was removed from the upstream program, so MINIKUBE_WANTKUBECTLDOWNLOADMSG=false no longer has an effect on behavior. --- pkgs/applications/networking/cluster/minikube/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/cluster/minikube/default.nix b/pkgs/applications/networking/cluster/minikube/default.nix index d4a9ba4af7d..3ee00d4121a 100644 --- a/pkgs/applications/networking/cluster/minikube/default.nix +++ b/pkgs/applications/networking/cluster/minikube/default.nix @@ -7,6 +7,7 @@ , which , libvirt , vmnet +, makeWrapper }: buildGoModule rec { @@ -24,7 +25,7 @@ buildGoModule rec { sha256 = "sha256-WIk4ibq7jcqao0Qiz3mz9yfHdxTUlvtPuEh4gApSDBg="; }; - nativeBuildInputs = [ installShellFiles pkg-config which ]; + nativeBuildInputs = [ installShellFiles pkg-config which makeWrapper ]; buildInputs = if stdenv.isDarwin then [ vmnet ] else if stdenv.isLinux then [ libvirt ] else null; @@ -35,9 +36,8 @@ buildGoModule rec { installPhase = '' install out/minikube -Dt $out/bin + wrapProgram $out/bin/minikube --set MINIKUBE_WANTUPDATENOTIFICATION false export HOME=$PWD - export MINIKUBE_WANTUPDATENOTIFICATION=false - export MINIKUBE_WANTKUBECTLDOWNLOADMSG=false for shell in bash zsh fish; do $out/bin/minikube completion $shell > minikube.$shell From 7d9514667094595c3263c5dddf85ae737c64caf5 Mon Sep 17 00:00:00 2001 From: Aaron Jheng Date: Sat, 16 Apr 2022 01:26:38 +0000 Subject: [PATCH 008/147] codesearch: 1.0.0 -> 1.2.0 --- pkgs/tools/text/codesearch/default.nix | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/pkgs/tools/text/codesearch/default.nix b/pkgs/tools/text/codesearch/default.nix index 40ee8c58fbc..b02d4fcd5fc 100644 --- a/pkgs/tools/text/codesearch/default.nix +++ b/pkgs/tools/text/codesearch/default.nix @@ -1,18 +1,20 @@ -{ lib, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: -buildGoPackage rec { +buildGoModule rec { pname = "codesearch"; - version = "1.0.0"; - - goPackagePath = "github.com/google/codesearch"; + version = "1.2.0"; src = fetchFromGitHub { owner = "google"; repo = "codesearch"; rev = "v${version}"; - sha256 = "sha256-3kJ/JT89krbIvprWayBL4chUmT77Oa1W13UNCr4fe4k="; + sha256 = "sha256-i03w8PZ31j5EutUZaamZsHz+z4qgX4prePbj5DLA78s="; }; + vendorSha256 = "sha256-pQpattmS9VmO3ZIQUFn66az8GSmB4IvYhTTCFn6SUmo="; + + ldflags = [ "-s" "-w" ]; + meta = with lib; { description = "Fast, indexed regexp search over large file trees"; homepage = "https://github.com/google/codesearch"; From aa977f5b7724e24fed379a9a46c4414e08a87ee1 Mon Sep 17 00:00:00 2001 From: Aaron Jheng Date: Sat, 16 Apr 2022 02:01:46 +0000 Subject: [PATCH 009/147] mmake: 1.2.0 -> 1.4.0 --- pkgs/tools/misc/mmake/default.nix | 18 ++++++++++-------- pkgs/tools/misc/mmake/deps.nix | 30 ------------------------------ 2 files changed, 10 insertions(+), 38 deletions(-) delete mode 100644 pkgs/tools/misc/mmake/deps.nix diff --git a/pkgs/tools/misc/mmake/default.nix b/pkgs/tools/misc/mmake/default.nix index 564e1989aee..2172b8b958c 100644 --- a/pkgs/tools/misc/mmake/default.nix +++ b/pkgs/tools/misc/mmake/default.nix @@ -1,19 +1,21 @@ -{ lib, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: -buildGoPackage rec { +buildGoModule rec { pname = "mmake"; - version = "1.2.0"; - - goPackagePath = "github.com/tj/mmake"; + version = "1.4.0"; src = fetchFromGitHub { owner = "tj"; repo = "mmake"; rev = "v${version}"; - sha256 = "1pyqgk04v0f7a28cwq9c40bd2cgrkrv4wqcijdzpgn4bqhrqab4f"; + sha256 = "sha256-JPsVfLIl06PJ8Nsfu7ogwrttB1G93HTKbZFqUTSV9O8="; }; - goDeps = ./deps.nix; + vendorSha256 = "sha256-0z+sujzzBl/rtzXbhL4Os+jYfLUuO9PlXshUDxAH9DU="; + + ldflags = [ "-s" "-w" ]; + + checkFlags = [ "-short" ]; meta = with lib; { homepage = "https://github.com/tj/mmake"; @@ -23,7 +25,7 @@ buildGoPackage rec { functionality, such as user-friendly help output, remote includes, and eventually more. It otherwise acts as a pass-through to standard make. - ''; + ''; license = licenses.mit; maintainers = [ maintainers.gabesoft ]; }; diff --git a/pkgs/tools/misc/mmake/deps.nix b/pkgs/tools/misc/mmake/deps.nix deleted file mode 100644 index 0721ad0af60..00000000000 --- a/pkgs/tools/misc/mmake/deps.nix +++ /dev/null @@ -1,30 +0,0 @@ -# This file was generated by https://github.com/kamilchm/go2nix v1.2.1 -[ - { - goPackagePath = "github.com/apex/log"; - fetch = { - type = "git"; - url = "https://github.com/apex/log"; - rev = "0296d6eb16bb28f8a0c55668affcf4876dc269be"; - sha256 = "067px84y73h60bai1yy6xqf2l05gq6zsp64fn58d4fwzk04aa16v"; - }; - } - { - goPackagePath = "github.com/pkg/errors"; - fetch = { - type = "git"; - url = "https://github.com/pkg/errors"; - rev = "c605e284fe17294bda444b34710735b29d1a9d90"; - sha256 = "1izjk4msnc6wn1mclg0ypa6i31zfwb1r3032k8q4jfbd57hp0bz6"; - }; - } - { - goPackagePath = "github.com/segmentio/go-env"; - fetch = { - type = "git"; - url = "https://github.com/segmentio/go-env"; - rev = "ea0600a7760cd15ccca9057be4a87d68e95ee876"; - sha256 = "0rgclbi0na5042cirr52lriwyb5a2rdpqx211zfwyrrvc3zq4lwq"; - }; - } -] From 606333cb1e4480ecd0ef641790cdc202a3f916a0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Mon, 18 Apr 2022 05:35:07 +0000 Subject: [PATCH 010/147] logseq: 0.6.5 -> 0.6.6 --- pkgs/applications/misc/logseq/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/logseq/default.nix b/pkgs/applications/misc/logseq/default.nix index 153e50f9a87..1fdf48ac1a0 100644 --- a/pkgs/applications/misc/logseq/default.nix +++ b/pkgs/applications/misc/logseq/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "logseq"; - version = "0.6.5"; + version = "0.6.6"; src = fetchurl { url = "https://github.com/logseq/logseq/releases/download/${version}/logseq-linux-x64-${version}.AppImage"; - sha256 = "WKROcCv0IzRnQd74j5Iget5jlfyDbeJ/PXgZmSNrSsQ="; + sha256 = "r6IBvhA8H8XnMIBgZZodyU61xtqNA4N9kCRv/QWQc9M="; name = "${pname}-${version}.AppImage"; }; From 7f01ff7822ac74f2e92a6fcc5367c16838038dd4 Mon Sep 17 00:00:00 2001 From: Shawn8901 Date: Mon, 18 Apr 2022 17:35:58 +0200 Subject: [PATCH 011/147] nixos/prometheus: use pkgs.formats.json.generate to write config file The old way of writing the file omited qoutes within strings which are needed by some configurations like federations. The quotes got lost when `echo`ing the content via `echo '${builtins.toJSON x}'`. The pkgs.formats.json does handle that race condition properly, so this commit switches the writing to that helper. --- nixos/modules/services/monitoring/prometheus/default.nix | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/nixos/modules/services/monitoring/prometheus/default.nix b/nixos/modules/services/monitoring/prometheus/default.nix index 52525e8935b..ceb2db1faef 100644 --- a/nixos/modules/services/monitoring/prometheus/default.nix +++ b/nixos/modules/services/monitoring/prometheus/default.nix @@ -3,6 +3,7 @@ with lib; let + json = pkgs.formats.json { }; cfg = config.services.prometheus; workingDir = "/var/lib/" + cfg.stateDir; @@ -34,13 +35,7 @@ let promtool ${what} $out '' else file; - # Pretty-print JSON to a file - writePrettyJSON = name: x: - pkgs.runCommandLocal name { } '' - echo '${builtins.toJSON x}' | ${pkgs.jq}/bin/jq . > $out - ''; - - generatedPrometheusYml = writePrettyJSON "prometheus.yml" promConfig; + generatedPrometheusYml = json.generate "prometheus.yml" promConfig; # This becomes the main config file for Prometheus promConfig = { From b6012814b6bb66f9a4b3b43cbe75a97f9d6cdb30 Mon Sep 17 00:00:00 2001 From: Aaron Jheng Date: Sun, 17 Apr 2022 00:52:48 +0000 Subject: [PATCH 012/147] aws-rotate-key: 1.0.6 -> 1.0.8 --- pkgs/tools/admin/aws-rotate-key/default.nix | 22 +++++++++------- pkgs/tools/admin/aws-rotate-key/deps.nix | 29 --------------------- 2 files changed, 13 insertions(+), 38 deletions(-) delete mode 100644 pkgs/tools/admin/aws-rotate-key/deps.nix diff --git a/pkgs/tools/admin/aws-rotate-key/default.nix b/pkgs/tools/admin/aws-rotate-key/default.nix index 82b57739120..35221b3fb5b 100644 --- a/pkgs/tools/admin/aws-rotate-key/default.nix +++ b/pkgs/tools/admin/aws-rotate-key/default.nix @@ -1,25 +1,29 @@ -{ lib, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub, testers, aws-rotate-key }: -buildGoPackage rec { +buildGoModule rec { pname = "aws-rotate-key"; - version = "1.0.6"; - - goPackagePath = "github.com/Fullscreen/aws-rotate-key"; + version = "1.0.8"; src = fetchFromGitHub { - rev = "v${version}"; owner = "Fullscreen"; repo = "aws-rotate-key"; - sha256 = "1w9704g1l2b0y6g6mk79g28kk0yaswpgljkk85d0i10wyxq4icby"; + rev = "v${version}"; + sha256 = "sha256-5kV87uQDSc/qpm79Pd2nXo/EcbMlhZqFYaw+gJQa2uo="; }; - goDeps = ./deps.nix; + vendorSha256 = "sha256-h7tmJx/Um1Cy/ojiFjoKCH/LcOwhGU8ADb5WwmrkkJM="; + + ldflags = [ "-s" "-w" ]; + + passthru.tests.version = testers.testVersion { + package = aws-rotate-key; + }; meta = with lib; { description = "Easily rotate your AWS key"; homepage = "https://github.com/Fullscreen/aws-rotate-key"; license = licenses.mit; - maintainers = [maintainers.mbode]; + maintainers = [ maintainers.mbode ]; platforms = platforms.unix; }; } diff --git a/pkgs/tools/admin/aws-rotate-key/deps.nix b/pkgs/tools/admin/aws-rotate-key/deps.nix deleted file mode 100644 index 680a18e7e2d..00000000000 --- a/pkgs/tools/admin/aws-rotate-key/deps.nix +++ /dev/null @@ -1,29 +0,0 @@ -[ - { - goPackagePath = "github.com/go-ini/ini"; - fetch = { - type = "git"; - url = "https://github.com/go-ini/ini"; - rev = "af26abd521cd7697481572fdbc4a53cbea3dde1b"; - sha256 = "1yribbqy9i4i70dfg3yrjhkn3n0fywpr3kismn2mvi882mm01pxz"; - }; - } - { - goPackagePath = "github.com/jmespath/go-jmespath"; - fetch = { - type = "git"; - url = "https://github.com/jmespath/go-jmespath"; - rev = "c2b33e8439af944379acbdd9c3a5fe0bc44bd8a5"; - sha256 = "1r6w7ydx8ydryxk3sfhzsk8m6f1nsik9jg3i1zhi69v4kfl4d5cz"; - }; - } - { - goPackagePath = "github.com/aws/aws-sdk-go"; - fetch = { - type = "git"; - url = "https://github.com/aws/aws-sdk-go"; - rev = "f844700ba2a387dfee7ab3679e7544b5dbd6d394"; - sha256 = "0s9100bzqj58nnax3dxfgi5qr4rbaa53cb0cj3s58k9jc9z6270m"; - }; - } -] From f3100dd4e0072cf641d52ae3dc9da959e5335bf9 Mon Sep 17 00:00:00 2001 From: Caleb Maclennan Date: Tue, 26 Apr 2022 13:09:28 +0300 Subject: [PATCH 013/147] sile: Change default interpreter to Lua 5.4 --- pkgs/top-level/all-packages.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index db85ec62247..bccfe9518a2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10173,7 +10173,9 @@ with pkgs; silc_server = callPackage ../servers/silc-server { }; - sile = callPackage ../tools/typesetting/sile { }; + sile = callPackage ../tools/typesetting/sile { + lua = lua5_4; + }; silver-searcher = callPackage ../tools/text/silver-searcher { }; From f5032db47ea5b561f54abddafe0d667266603fa7 Mon Sep 17 00:00:00 2001 From: Armeen Mahdian Date: Tue, 26 Apr 2022 09:13:47 -0500 Subject: [PATCH 014/147] opencc: switch to python3 --- pkgs/tools/text/opencc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/text/opencc/default.nix b/pkgs/tools/text/opencc/default.nix index 5ad14295e87..fbff68abb69 100644 --- a/pkgs/tools/text/opencc/default.nix +++ b/pkgs/tools/text/opencc/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake, python2 }: +{ lib, stdenv, fetchFromGitHub, cmake, python3 }: stdenv.mkDerivation rec { pname = "opencc"; @@ -11,7 +11,7 @@ stdenv.mkDerivation rec { sha256 = "sha256-q/y4tRov/BYCAiE4i7fT6ysTerxxOHMZUWT2Jlo/0rI="; }; - nativeBuildInputs = [ cmake python2 ]; + nativeBuildInputs = [ cmake python3 ]; # let intermediate tools find intermediate library preBuild = lib.optionalString stdenv.isLinux '' From 8b4c5b383dd0d223ec40572965915d30cfea2cf2 Mon Sep 17 00:00:00 2001 From: Luflosi Date: Fri, 29 Apr 2022 09:17:41 +0200 Subject: [PATCH 015/147] swtpm: 0.7.2 -> 0.7.3 https://github.com/stefanberger/swtpm/releases/tag/v0.7.3 --- pkgs/tools/security/swtpm/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/security/swtpm/default.nix b/pkgs/tools/security/swtpm/default.nix index 39128084352..5d20b65d591 100644 --- a/pkgs/tools/security/swtpm/default.nix +++ b/pkgs/tools/security/swtpm/default.nix @@ -16,13 +16,13 @@ stdenv.mkDerivation rec { pname = "swtpm"; - version = "0.7.2"; + version = "0.7.3"; src = fetchFromGitHub { owner = "stefanberger"; repo = "swtpm"; rev = "v${version}"; - sha256 = "sha256-qeyPCJTNnwuaCosHzqnrQc0JNznGBfDTLsuDmuKREjU="; + sha256 = "sha256-YaNQgxk0uT8FLUIxF80jpgO/L9ygGRHaABEcs5ukq5E="; }; nativeBuildInputs = [ From b05132d12fe0956543ba9f2cd3f34e9e7ae1174c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Sun, 1 May 2022 11:09:39 -0300 Subject: [PATCH 016/147] cmst: add update script --- pkgs/tools/networking/cmst/default.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/networking/cmst/default.nix b/pkgs/tools/networking/cmst/default.nix index 2f757edbdb1..4cecc85979f 100644 --- a/pkgs/tools/networking/cmst/default.nix +++ b/pkgs/tools/networking/cmst/default.nix @@ -1,4 +1,4 @@ -{ mkDerivation, lib, fetchFromGitHub, qmake, qtbase, qttools }: +{ mkDerivation, lib, fetchFromGitHub, qmake, qtbase, qttools, gitUpdater }: mkDerivation rec { pname = "cmst"; @@ -21,6 +21,11 @@ mkDerivation rec { done ''; + passthru.updateScript = gitUpdater { + inherit pname version; + rev-prefix = "${pname}-"; + }; + meta = with lib; { description = "QT GUI for Connman with system tray icon"; homepage = "https://github.com/andrew-bibb/cmst"; From 3020f31d9b66d4eb164d84d8edb5ac6eaa453b61 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo?= Date: Sun, 1 May 2022 11:10:24 -0300 Subject: [PATCH 017/147] cmst: 2022.03.13 -> 2020.11.01 --- pkgs/tools/networking/cmst/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/cmst/default.nix b/pkgs/tools/networking/cmst/default.nix index 4cecc85979f..1447569020c 100644 --- a/pkgs/tools/networking/cmst/default.nix +++ b/pkgs/tools/networking/cmst/default.nix @@ -2,13 +2,13 @@ mkDerivation rec { pname = "cmst"; - version = "2022.03.13"; + version = "2022.05.01"; src = fetchFromGitHub { repo = "cmst"; owner = "andrew-bibb"; rev = "${pname}-${version}"; - sha256 = "sha256-PIS77yYM7tR+0vpTDh9Li/dnaWHUQW+w1NLRb5g+sz8="; + sha256 = "sha256-d3uvJf1tI9vXyq1eIbHkKrinBuPkYoBUcusHsJmSqMA="; }; nativeBuildInputs = [ qmake qttools ]; From c9f742f7bc09672c661a0597f048fa3d5d9f399f Mon Sep 17 00:00:00 2001 From: dnaq Date: Mon, 11 Apr 2022 20:14:38 +0200 Subject: [PATCH 018/147] anki -> 2.1.51 Since the previous version of anki no longer works on nixos-unstable due to glibc changes the version was bumped to 2.1.51 which works. Also adds support for aarch64 on apple silicon Fixes #167765 --- pkgs/games/anki/bin.nix | 26 ++++++++++++++++++-------- 1 file changed, 18 insertions(+), 8 deletions(-) diff --git a/pkgs/games/anki/bin.nix b/pkgs/games/anki/bin.nix index 7e62f006102..aade2aaae9e 100644 --- a/pkgs/games/anki/bin.nix +++ b/pkgs/games/anki/bin.nix @@ -1,24 +1,31 @@ -{ fetchurl, stdenv, lib, buildFHSUserEnv, appimageTools, writeShellScript, anki, undmg }: +{ fetchurl, stdenv, lib, buildFHSUserEnv, appimageTools, writeShellScript, anki, undmg, zstd }: let pname = "anki-bin"; # Update hashes for both Linux and Darwin! - version = "2.1.49"; + version = "2.1.51"; sources = { linux = fetchurl { - url = "https://github.com/ankitects/anki/releases/download/${version}/anki-${version}-linux.tar.bz2"; - sha256 = "sha256-uG39g9CXnquArFsxtFHWWoDaNwu8y2KKh+SqGt8aqi0="; + url = "https://github.com/ankitects/anki/releases/download/${version}/anki-${version}-linux-qt6.tar.zst"; + sha256 = "sha256-ZKVc+TvkNu5mGgibhRIuoLuIfvyoVDy+c4h+Apz9P+0="; }; - darwin = fetchurl { - url = "https://github.com/ankitects/anki/releases/download/${version}/anki-${version}-mac.dmg"; - sha256 = "sha256-sEVWZQpICL7RYrOuPm1Y5XhzPxCwNk1WGP1rctTtE4Y="; + + # For some reason anki distributes completely separate dmg-files for the aarch64 version and the x86_64 version + darwin-x86_64 = fetchurl { + url = "https://github.com/ankitects/anki/releases/download/${version}/anki-${version}-mac-intel-qt6.dmg"; + sha256 = "sha256-wZMJEbcpezVAuBSKlwNTHlqjp0FfmyDB7XD6BBuJhyA="; + }; + darwin-aarch64 = fetchurl { + url = "https://github.com/ankitects/anki/releases/download/${version}/anki-${version}-mac-apple-qt6.dmg"; + sha256 = "sha256-6RDTYKoisX5DJ9VPWrP9VH9DCABabb9MB3nG4S8jtR0="; }; }; unpacked = stdenv.mkDerivation { inherit pname version; + nativeBuildInputs = [ zstd ]; src = sources.linux; installPhase = '' @@ -47,6 +54,9 @@ in if stdenv.isLinux then buildFHSUserEnv (appimageTools.defaultFhsEnvArgs // { name = "anki"; + # Dependencies of anki + targetPkgs = pkgs: (with pkgs; [ xorg.libxkbfile krb5 ]); + runScript = writeShellScript "anki-wrapper.sh" '' exec ${unpacked}/bin/anki ''; @@ -63,7 +73,7 @@ if stdenv.isLinux then buildFHSUserEnv (appimageTools.defaultFhsEnvArgs // { }) else stdenv.mkDerivation { inherit pname version passthru; - src = sources.darwin; + src = if stdenv.isAarch64 then sources.darwin-aarch64 else sources.darwin-x86_64; nativeBuildInputs = [ undmg ]; sourceRoot = "."; From e602c06be76673aaa1afd57d66be93d91174e276 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 1 May 2022 23:50:07 +0200 Subject: [PATCH 019/147] zigbee2mqtt: 1.25.0 -> 1.25.1 https://github.com/Koenkk/zigbee2mqtt/releases/tag/1.25.1 --- pkgs/servers/zigbee2mqtt/default.nix | 4 +- pkgs/servers/zigbee2mqtt/node-packages.nix | 4583 ++------------------ 2 files changed, 420 insertions(+), 4167 deletions(-) diff --git a/pkgs/servers/zigbee2mqtt/default.nix b/pkgs/servers/zigbee2mqtt/default.nix index 3634548223d..967c6448a40 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.25.0"; + version = "1.25.1"; reconstructLock = true; src = pkgs.fetchFromGitHub { owner = "Koenkk"; repo = "zigbee2mqtt"; rev = version; - sha256 = "Wp3+N3np/biNw2xaR79PpQ/S7o3FftjH6AgyMLM+ya8="; + sha256 = "IMRpT4BQvnsk8rl2bxiUbzVp4UcEaPLsniKneOq7Av4="; }; passthru.tests.zigbee2mqtt = nixosTests.zigbee2mqtt; diff --git a/pkgs/servers/zigbee2mqtt/node-packages.nix b/pkgs/servers/zigbee2mqtt/node-packages.nix index e4143d6eece..b14ca0a6e13 100644 --- a/pkgs/servers/zigbee2mqtt/node-packages.nix +++ b/pkgs/servers/zigbee2mqtt/node-packages.nix @@ -4,15 +4,6 @@ let sources = { - "@ampproject/remapping-2.0.3" = { - name = "_at_ampproject_slash_remapping"; - packageName = "@ampproject/remapping"; - version = "2.0.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@ampproject/remapping/-/remapping-2.0.3.tgz"; - sha512 = "DmIAguV77yFP0MGVFWknCMgSLAtsLR3VlRTteR6xgMpIfYtwaZuMvjGv5YlpiqN7S/5q87DHyuIx8oa15kiyag=="; - }; - }; "@ampproject/remapping-2.1.2" = { name = "_at_ampproject_slash_remapping"; packageName = "@ampproject/remapping"; @@ -22,25 +13,6 @@ let sha512 = "hoyByceqwKirw7w3Z7gnIIZC3Wx3J484Y3L/cMpXFbr7d9ZQj2mODrirNzcJa+SM3UlpWXYvKV4RlRpFXlWgXg=="; }; }; - "@babel/cli-7.17.0" = { - name = "_at_babel_slash_cli"; - packageName = "@babel/cli"; - version = "7.17.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/cli/-/cli-7.17.0.tgz"; - sha512 = "es10YH/ejXbg551vtnmEzIPe3MQRNOS644o3pf8vUr1tIeNzVNlP8BBvs1Eh7roh5A+k2fEHUas+ZptOWHA1fQ=="; - }; - }; - "@babel/cli-https://registry.npmjs.org/@babel/cli/-/cli-7.17.0.tgz" = { - name = "_at_babel_slash_cli"; - packageName = "@babel/cli"; - version = 1; - src = fetchurl { - name = "cli-1.tar.gz"; - url = "https://registry.npmjs.org/@babel/cli/-/cli-7.17.0.tgz"; - sha512 = "es10YH/ejXbg551vtnmEzIPe3MQRNOS644o3pf8vUr1tIeNzVNlP8BBvs1Eh7roh5A+k2fEHUas+ZptOWHA1fQ=="; - }; - }; "@babel/code-frame-7.16.7" = { name = "_at_babel_slash_code-frame"; packageName = "@babel/code-frame"; @@ -50,15 +22,6 @@ let sha512 = "iAXqUn8IIeBTNd72xsFlgaXHkMBMt6y4HJp1tIaK465CWLT/fG1aqB7ykr95gHHmlBdGbFeWWfyB4NJJ0nmeIg=="; }; }; - "@babel/compat-data-7.17.0" = { - name = "_at_babel_slash_compat-data"; - packageName = "@babel/compat-data"; - version = "7.17.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.17.0.tgz"; - sha512 = "392byTlpGWXMv4FbyWw3sAZ/FrW/DrwqLGXpy0mbyNe9Taqv1mg9yON5/o0cnr8XYCkFTZbC1eV+c+LAROgrng=="; - }; - }; "@babel/compat-data-7.17.7" = { name = "_at_babel_slash_compat-data"; packageName = "@babel/compat-data"; @@ -68,40 +31,22 @@ let sha512 = "p8pdE6j0a29TNGebNm7NzYZWB3xVZJBZ7XGs42uAKzQo8VQ3F0By/cQCtUEABwIqw5zo6WA4NbmxsfzADzMKnQ=="; }; }; - "@babel/core-7.17.0" = { - name = "_at_babel_slash_core"; - packageName = "@babel/core"; - version = "7.17.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/core/-/core-7.17.0.tgz"; - sha512 = "x/5Ea+RO5MvF9ize5DeVICJoVrNv0Mi2RnIABrZEKYvPEpldXwauPkgvYA17cKa6WpU3LoYvYbuEMFtSNFsarA=="; - }; - }; - "@babel/core-7.17.8" = { + "@babel/core-7.17.9" = { name = "_at_babel_slash_core"; packageName = "@babel/core"; - version = "7.17.8"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/core/-/core-7.17.8.tgz"; - sha512 = "OdQDV/7cRBtJHLSOBqqbYNkOcydOgnX59TZx4puf41fzcVtN3e/4yqY8lMQsK+5X2lJtAdmA+6OHqsj1hBJ4IQ=="; - }; - }; - "@babel/generator-7.17.0" = { - name = "_at_babel_slash_generator"; - packageName = "@babel/generator"; - version = "7.17.0"; + version = "7.17.9"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/generator/-/generator-7.17.0.tgz"; - sha512 = "I3Omiv6FGOC29dtlZhkfXO6pgkmukJSlT26QjVvS1DGZe/NzSVCPG41X0tS21oZkJYlovfj9qDWgKP+Cn4bXxw=="; + url = "https://registry.npmjs.org/@babel/core/-/core-7.17.9.tgz"; + sha512 = "5ug+SfZCpDAkVp9SFIZAzlW18rlzsOcJGaetCjkySnrXXDUw9AR8cDUm1iByTmdWM6yxX6/zycaV76w3YTF2gw=="; }; }; - "@babel/generator-7.17.7" = { + "@babel/generator-7.17.9" = { name = "_at_babel_slash_generator"; packageName = "@babel/generator"; - version = "7.17.7"; + version = "7.17.9"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/generator/-/generator-7.17.7.tgz"; - sha512 = "oLcVCTeIFadUoArDTwpluncplrYBmTCCZZgXCbgNGvOBBiSDDK3eWO4b/+eOTli5tKv1lg+a5/NAXg+nTcei1w=="; + url = "https://registry.npmjs.org/@babel/generator/-/generator-7.17.9.tgz"; + sha512 = "rAdDousTwxbIxbz5I7GEQ3lUip+xVCXooZNbsydCWs3xA7ZsYOv+CFRdzGxRX78BmQHu9B1Eso59AOZQOJDEdQ=="; }; }; "@babel/helper-annotate-as-pure-7.16.7" = { @@ -122,15 +67,6 @@ let sha512 = "C6FdbRaxYjwVu/geKW4ZeQ0Q31AftgRcdSnZ5/jsH6BzCJbtvXvhpfkbkThYSuutZA7nCXpPR6AD9zd1dprMkA=="; }; }; - "@babel/helper-compilation-targets-7.16.7" = { - name = "_at_babel_slash_helper-compilation-targets"; - packageName = "@babel/helper-compilation-targets"; - version = "7.16.7"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.16.7.tgz"; - sha512 = "mGojBwIWcwGD6rfqgRXVlVYmPAv7eOpIemUG3dGnDdCY4Pae70ROij3XmfrH6Fa1h1aiDylpglbZyktfzyo/hA=="; - }; - }; "@babel/helper-compilation-targets-7.17.7" = { name = "_at_babel_slash_helper-compilation-targets"; packageName = "@babel/helper-compilation-targets"; @@ -140,22 +76,13 @@ let sha512 = "UFzlz2jjd8kroj0hmCFV5zr+tQPi1dpC2cRsDV/3IEW8bJfCPrPpmcSN6ZS8RqIq4LXcmpipCQFPddyFA5Yc7w=="; }; }; - "@babel/helper-create-class-features-plugin-7.17.1" = { - name = "_at_babel_slash_helper-create-class-features-plugin"; - packageName = "@babel/helper-create-class-features-plugin"; - version = "7.17.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.17.1.tgz"; - sha512 = "JBdSr/LtyYIno/pNnJ75lBcqc3Z1XXujzPanHqjvvrhOA+DTceTFuJi8XjmWTZh4r3fsdfqaCMN0iZemdkxZHQ=="; - }; - }; - "@babel/helper-create-class-features-plugin-7.17.6" = { + "@babel/helper-create-class-features-plugin-7.17.9" = { name = "_at_babel_slash_helper-create-class-features-plugin"; packageName = "@babel/helper-create-class-features-plugin"; - version = "7.17.6"; + version = "7.17.9"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.17.6.tgz"; - sha512 = "SogLLSxXm2OkBbSsHZMM4tUi8fUzjs63AT/d0YQIzr6GSd8Hxsbk2KYDX0k0DweAzGMj/YWeiCsorIdtdcW8Eg=="; + url = "https://registry.npmjs.org/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.17.9.tgz"; + sha512 = "kUjip3gruz6AJKOq5i3nC6CoCEEF/oHH3cp6tOZhB+IyyyPyW0g1Gfsxn3mkk6S08pIA2y8GQh609v9G/5sHVQ=="; }; }; "@babel/helper-create-regexp-features-plugin-7.17.0" = { @@ -194,22 +121,13 @@ let sha512 = "KyUenhWMC8VrxzkGP0Jizjo4/Zx+1nNZhgocs+gLzyZyB8SHidhoq9KK/8Ato4anhwsivfkBLftky7gvzbZMtQ=="; }; }; - "@babel/helper-function-name-7.16.7" = { + "@babel/helper-function-name-7.17.9" = { name = "_at_babel_slash_helper-function-name"; packageName = "@babel/helper-function-name"; - version = "7.16.7"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.16.7.tgz"; - sha512 = "QfDfEnIUyyBSR3HtrtGECuZ6DAyCkYFp7GHl75vFtTnn6pjKeK0T1DB5lLkFvBea8MdaiUABx3osbgLyInoejA=="; - }; - }; - "@babel/helper-get-function-arity-7.16.7" = { - name = "_at_babel_slash_helper-get-function-arity"; - packageName = "@babel/helper-get-function-arity"; - version = "7.16.7"; + version = "7.17.9"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-get-function-arity/-/helper-get-function-arity-7.16.7.tgz"; - sha512 = "flc+RLSOBXzNzVhcLu6ujeHUrD6tANAOU5ojrRx/as+tbzf8+stUCj7+IfRRoAbEZqj/ahXEMsjhOhgeZsrnTw=="; + url = "https://registry.npmjs.org/@babel/helper-function-name/-/helper-function-name-7.17.9.tgz"; + sha512 = "7cRisGlVtiVqZ0MW0/yFB4atgpGLWEHUVYnb448hZK4x+vih0YO5UoS11XIYtZYqHd0dIPMdUSv8q5K4LdMnIg=="; }; }; "@babel/helper-hoist-variables-7.16.7" = { @@ -221,15 +139,6 @@ let sha512 = "m04d/0Op34H5v7pbZw6pSKP7weA6lsMvfiIAMeIvkY/R4xQtBSMFEigu9QTZ2qB/9l22vsxtM8a+Q8CzD255fg=="; }; }; - "@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.7"; - src = fetchurl { - 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-member-expression-to-functions-7.17.7" = { name = "_at_babel_slash_helper-member-expression-to-functions"; packageName = "@babel/helper-member-expression-to-functions"; @@ -248,15 +157,6 @@ let sha512 = "LVtS6TqjJHFc+nYeITRo6VLXve70xmq7wPhWTqDJusJEgGmkAACWwMiTNrvfoQo6hEhFwAIixNkvB0jPXDL8Wg=="; }; }; - "@babel/helper-module-transforms-7.16.7" = { - name = "_at_babel_slash_helper-module-transforms"; - packageName = "@babel/helper-module-transforms"; - version = "7.16.7"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.16.7.tgz"; - sha512 = "gaqtLDxJEFCeQbYp9aLAefjhkKdjKcdh6DB7jniIGU3Pz52WAmP268zK0VgPz9hUNkMSYeH976K2/Y6yPadpng=="; - }; - }; "@babel/helper-module-transforms-7.17.7" = { name = "_at_babel_slash_helper-module-transforms"; packageName = "@babel/helper-module-transforms"; @@ -302,15 +202,6 @@ let sha512 = "y9vsWilTNaVnVh6xiJfABzsNpgDPKev9HnAgz6Gb1p6UUwf9NepdlsV7VXGCftJM+jqD5f7JIEubcpLjZj5dBw=="; }; }; - "@babel/helper-simple-access-7.16.7" = { - name = "_at_babel_slash_helper-simple-access"; - packageName = "@babel/helper-simple-access"; - version = "7.16.7"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.16.7.tgz"; - sha512 = "ZIzHVyoeLMvXMN/vok/a4LWRy8G2v205mNP0XOuf9XRLyX5/u9CnVulUtDgUTama3lT+bf/UqucuZjqiGuTS1g=="; - }; - }; "@babel/helper-simple-access-7.17.7" = { name = "_at_babel_slash_helper-simple-access"; packageName = "@babel/helper-simple-access"; @@ -365,49 +256,31 @@ let sha512 = "8RpyRVIAW1RcDDGTA+GpPAwV22wXCfKOoM9bet6TLkGIFTkRQSkH1nMQ5Yet4MpoXe1ZwHPVtNasc2w0uZMqnw=="; }; }; - "@babel/helpers-7.17.0" = { - name = "_at_babel_slash_helpers"; - packageName = "@babel/helpers"; - version = "7.17.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/helpers/-/helpers-7.17.0.tgz"; - sha512 = "Xe/9NFxjPwELUvW2dsukcMZIp6XwPSbI4ojFBJuX5ramHuVE22SVcZIwqzdWo5uCgeTXW8qV97lMvSOjq+1+nQ=="; - }; - }; - "@babel/helpers-7.17.8" = { + "@babel/helpers-7.17.9" = { name = "_at_babel_slash_helpers"; packageName = "@babel/helpers"; - version = "7.17.8"; + version = "7.17.9"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helpers/-/helpers-7.17.8.tgz"; - sha512 = "QcL86FGxpfSJwGtAvv4iG93UL6bmqBdmoVY0CMCU2g+oD2ezQse3PT5Pa+jiD6LJndBQi0EDlpzOWNlLuhz5gw=="; + url = "https://registry.npmjs.org/@babel/helpers/-/helpers-7.17.9.tgz"; + sha512 = "cPCt915ShDWUEzEp3+UNRktO2n6v49l5RSnG9M5pS24hA+2FAc5si+Pn1i4VVbQQ+jh+bIZhPFQOJOzbrOYY1Q=="; }; }; - "@babel/highlight-7.16.10" = { + "@babel/highlight-7.17.9" = { name = "_at_babel_slash_highlight"; packageName = "@babel/highlight"; - version = "7.16.10"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/highlight/-/highlight-7.16.10.tgz"; - sha512 = "5FnTQLSLswEj6IkgVw5KusNUUFY9ZGqe/TRFnP/BKYHYgfh7tc+C7mwiy95/yNP7Dh9x580Vv8r7u7ZfTBFxdw=="; - }; - }; - "@babel/parser-7.17.0" = { - name = "_at_babel_slash_parser"; - packageName = "@babel/parser"; - version = "7.17.0"; + version = "7.17.9"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/parser/-/parser-7.17.0.tgz"; - sha512 = "VKXSCQx5D8S04ej+Dqsr1CzYvvWgf20jIw2D+YhQCrIlr2UZGaDds23Y0xg75/skOxpLCRpUZvk/1EAVkGoDOw=="; + url = "https://registry.npmjs.org/@babel/highlight/-/highlight-7.17.9.tgz"; + sha512 = "J9PfEKCbFIv2X5bjTMiZu6Vf341N05QIY+d6FvVKynkG1S7G0j3I0QoRtWIrXhZ+/Nlb5Q0MzqL7TokEJ5BNHg=="; }; }; - "@babel/parser-7.17.8" = { + "@babel/parser-7.17.9" = { name = "_at_babel_slash_parser"; packageName = "@babel/parser"; - version = "7.17.8"; + version = "7.17.9"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/parser/-/parser-7.17.8.tgz"; - sha512 = "BoHhDJrJXqcg+ZL16Xv39H9n+AqJ4pcDrQBGZN+wHxIysrLZ3/ECwCBUch/1zUNhnsXULcONU3Ei5Hmkfk6kiQ=="; + url = "https://registry.npmjs.org/@babel/parser/-/parser-7.17.9.tgz"; + sha512 = "vqUSBLP8dQHFPdPi9bc5GK9vRkYHJ49fsZdtoJ8EQ8ibpwk5rPKfvNIwChB0KVXcIjcepEBBd2VHC5r9Gy8ueg=="; }; }; "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.16.7" = { @@ -446,15 +319,6 @@ let sha512 = "IobU0Xme31ewjYOShSIqd/ZGM/r/cuOz2z0MDbNrhF5FW+ZVgi0f2lyeoj9KFPDOAqsYxmLWZte1WOwlvY9aww=="; }; }; - "@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.7"; - src = fetchurl { - 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-class-static-block-7.17.6" = { name = "_at_babel_slash_plugin-proposal-class-static-block"; packageName = "@babel/plugin-proposal-class-static-block"; @@ -464,13 +328,13 @@ let sha512 = "X/tididvL2zbs7jZCeeRJ8167U/+Ac135AM6jCAx6gYXDUviZV5Ku9UDvWS2NCuWlFjIRXklYhwo6HhAC7ETnA=="; }; }; - "@babel/plugin-proposal-decorators-7.17.8" = { + "@babel/plugin-proposal-decorators-7.17.9" = { name = "_at_babel_slash_plugin-proposal-decorators"; packageName = "@babel/plugin-proposal-decorators"; - version = "7.17.8"; + version = "7.17.9"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.17.8.tgz"; - sha512 = "U69odN4Umyyx1xO1rTII0IDkAEC+RNlcKXtqOblfpzqy1C+aOplb76BQNq0+XdpVkOaPlpEDwd++joY8FNFJKA=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.17.9.tgz"; + sha512 = "EfH2LZ/vPa2wuPwJ26j+kYRkaubf89UlwxKXtxqEm57HrgSEYDB8t4swFP+p8LcI9yiP9ZRJJjo/58hS6BnaDA=="; }; }; "@babel/plugin-proposal-dynamic-import-7.16.7" = { @@ -527,15 +391,6 @@ let sha512 = "vQgPMknOIgiuVqbokToyXbkY/OmmjAzr/0lhSIbG/KmnzXPGwW/AdhdKpi+O4X/VkWiWjnkKOBiqJrTaC98VKw=="; }; }; - "@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.7"; - src = fetchurl { - 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-object-rest-spread-7.17.3" = { name = "_at_babel_slash_plugin-proposal-object-rest-spread"; packageName = "@babel/plugin-proposal-object-rest-spread"; @@ -806,15 +661,6 @@ let sha512 = "gN72G9bcmenVILj//sv1zLNaPyYcOzUho2lIJBMh/iakJ9ygCo/hEF9cpGb61SCMEDxbbyBoVQxrt+bWKu5KGw=="; }; }; - "@babel/plugin-transform-destructuring-7.16.7" = { - name = "_at_babel_slash_plugin-transform-destructuring"; - packageName = "@babel/plugin-transform-destructuring"; - version = "7.16.7"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.16.7.tgz"; - sha512 = "VqAwhTHBnu5xBVDCvrvqJbtLUa++qZaWC0Fgr2mqokBlulZARGyIvZDoqbPlPaKImQ9dKAcCzbv+ul//uqu70A=="; - }; - }; "@babel/plugin-transform-destructuring-7.17.7" = { name = "_at_babel_slash_plugin-transform-destructuring"; packageName = "@babel/plugin-transform-destructuring"; @@ -896,31 +742,13 @@ let sha512 = "KaaEtgBL7FKYwjJ/teH63oAmE3lP34N3kshz8mm4VMAw7U3PxjVwwUmxEFksbgsNUaO3wId9R2AVQYSEGRa2+g=="; }; }; - "@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.8"; - src = fetchurl { - 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-commonjs-7.17.7" = { + "@babel/plugin-transform-modules-commonjs-7.17.9" = { name = "_at_babel_slash_plugin-transform-modules-commonjs"; packageName = "@babel/plugin-transform-modules-commonjs"; - version = "7.17.7"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.17.7.tgz"; - sha512 = "ITPmR2V7MqioMJyrxUo2onHNC3e+MvfFiFIR0RP21d3PtlVb6sfzoxNKiphSZUOM9hEIdzCcZe83ieX3yoqjUA=="; - }; - }; - "@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.7"; + version = "7.17.9"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.16.7.tgz"; - sha512 = "DuK5E3k+QQmnOqBR9UkusByy5WZWGRxfzV529s9nPra1GE7olmxfqO2FHobEOYSPIjPBTr4p66YDcjQnt8cBmw=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.17.9.tgz"; + sha512 = "2TBFd/r2I6VlYn0YRTz2JdazS+FoUuQ2rIFHoAxtyP/0G3D82SBLaRq9rnUkpqlLg03Byfl/+M32mpxjO6KaPw=="; }; }; "@babel/plugin-transform-modules-systemjs-7.17.8" = { @@ -986,13 +814,13 @@ let sha512 = "z4FGr9NMGdoIl1RqavCqGG+ZuYjfZ/hkCIeuH6Do7tXmSm0ls11nYVSJqFEUOSJbDab5wC6lRE/w6YjVcr6Hqw=="; }; }; - "@babel/plugin-transform-regenerator-7.16.7" = { + "@babel/plugin-transform-regenerator-7.17.9" = { name = "_at_babel_slash_plugin-transform-regenerator"; packageName = "@babel/plugin-transform-regenerator"; - version = "7.16.7"; + version = "7.17.9"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.16.7.tgz"; - sha512 = "mF7jOgGYCkSJagJ6XCujSQg+6xC1M77/03K2oBmVJWoFGNUtnVJO4WHKJk3dnPC8HCcj4xBQP1Egm8DWh3Pb3Q=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.17.9.tgz"; + sha512 = "Lc2TfbxR1HOyn/c6b4Y/b6NHoTb67n/IoWLxTu4kC7h4KQnWlhCq2S8Tx0t2SVvv5Uu87Hs+6JEJ5kt2tYGylQ=="; }; }; "@babel/plugin-transform-reserved-words-7.16.7" = { @@ -1085,16 +913,6 @@ let sha512 = "qcmWG8R7ZW6WBRPZK//y+E3Cli151B20W1Rv7ln27vuPaXU/8TKms6jFdiJtF7UDTxcrb7mZd88tAeK9LjdT8g=="; }; }; - "@babel/preset-env-https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.16.11.tgz" = { - name = "_at_babel_slash_preset-env"; - packageName = "@babel/preset-env"; - version = 1; - src = fetchurl { - name = "preset-env-1.tar.gz"; - 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" = { name = "_at_babel_slash_preset-modules"; packageName = "@babel/preset-modules"; @@ -1113,32 +931,13 @@ let sha512 = "WbVEmgXdIyvzB77AQjGBEyYPZx+8tTsO50XtfozQrkW8QB2rLJpH2lgx0TRw5EJrBxOZQ+wCcyPVQvS8tjEHpQ=="; }; }; - "@babel/preset-typescript-https://registry.npmjs.org/@babel/preset-typescript/-/preset-typescript-7.16.7.tgz" = { - name = "_at_babel_slash_preset-typescript"; - packageName = "@babel/preset-typescript"; - version = 1; - src = fetchurl { - name = "preset-typescript-1.tar.gz"; - url = "https://registry.npmjs.org/@babel/preset-typescript/-/preset-typescript-7.16.7.tgz"; - sha512 = "WbVEmgXdIyvzB77AQjGBEyYPZx+8tTsO50XtfozQrkW8QB2rLJpH2lgx0TRw5EJrBxOZQ+wCcyPVQvS8tjEHpQ=="; - }; - }; - "@babel/runtime-7.17.0" = { - name = "_at_babel_slash_runtime"; - packageName = "@babel/runtime"; - version = "7.17.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/runtime/-/runtime-7.17.0.tgz"; - sha512 = "etcO/ohMNaNA2UBdaXBBSX/3aEzFMRrVfaPv8Ptc0k+cWpWW0QFiGZ2XnVqQZI1Cf734LbPGmqBKWESfW4x/dQ=="; - }; - }; - "@babel/runtime-7.17.8" = { + "@babel/runtime-7.17.9" = { name = "_at_babel_slash_runtime"; packageName = "@babel/runtime"; - version = "7.17.8"; + version = "7.17.9"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/runtime/-/runtime-7.17.8.tgz"; - sha512 = "dQpEpK0O9o6lj6oPu0gRDbbnk+4LeHlNcBpspf6Olzt3GIX4P1lWF1gS+pHLDFlaJvbR6q7jCfQ08zA4QJBnmA=="; + url = "https://registry.npmjs.org/@babel/runtime/-/runtime-7.17.9.tgz"; + sha512 = "lSiBBvodq29uShpWGNbgFdKYNiFDo5/HIYsaCEY9ff4sb10x9jizo2+pRrSyF4jKZCXqgzuqBOQKbUm90gQwJg=="; }; }; "@babel/template-7.16.7" = { @@ -1150,22 +949,13 @@ let sha512 = "I8j/x8kHUrbYRTUxXrrMbfCa7jxkE7tZre39x3kjr9hvI82cK1FfqLygotcWN5kdPGWcLdWMHpSBavse5tWw3w=="; }; }; - "@babel/traverse-7.17.0" = { + "@babel/traverse-7.17.9" = { name = "_at_babel_slash_traverse"; packageName = "@babel/traverse"; - version = "7.17.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.17.0.tgz"; - sha512 = "fpFIXvqD6kC7c7PUNnZ0Z8cQXlarCLtCUpt2S1Dx7PjoRtCFffvOkHHSom+m5HIxMZn5bIBVb71lhabcmjEsqg=="; - }; - }; - "@babel/traverse-7.17.3" = { - name = "_at_babel_slash_traverse"; - packageName = "@babel/traverse"; - version = "7.17.3"; + version = "7.17.9"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.17.3.tgz"; - sha512 = "5irClVky7TxRWIRtxlh2WPUUOLhcPN06AGgaQSB8AEwuyEBgJVuJ5imdHm5zxk8w0QS5T+tDfnDxAlhWjpb7cw=="; + url = "https://registry.npmjs.org/@babel/traverse/-/traverse-7.17.9.tgz"; + sha512 = "PQO8sDIJ8SIwipTPiR71kJQCKQYB5NGImbOviK8K+kg5xkNSYXLBupuX9QhatFowrsvo9Hj8WgArg3W7ijNAQw=="; }; }; "@babel/types-7.17.0" = { @@ -1204,31 +994,13 @@ let sha512 = "hrlQOIi7hAfzsMqlGSFyVucrx38O+j6wiGOf//H2ecvIEqYN4ADBSS2iLMh5UFyDunCNniUIPk/q3riFv45xRA=="; }; }; - "@eslint/eslintrc-1.0.5" = { - name = "_at_eslint_slash_eslintrc"; - packageName = "@eslint/eslintrc"; - version = "1.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-1.0.5.tgz"; - sha512 = "BLxsnmK3KyPunz5wmCCpqy0YelEoxxGmH73Is+Z74oOTMtExcjkr3dDR6quwrjh1YspA8DH9gnX1o069KiS9AQ=="; - }; - }; - "@eslint/eslintrc-1.2.1" = { + "@eslint/eslintrc-1.2.2" = { name = "_at_eslint_slash_eslintrc"; packageName = "@eslint/eslintrc"; - version = "1.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-1.2.1.tgz"; - sha512 = "bxvbYnBPN1Gibwyp6NrpnFzA3YtRL3BBAyEAFVIpNTm2Rn4Vy87GA5M4aSn3InRrlsbX5N0GW7XIx+U4SAEKdQ=="; - }; - }; - "@humanwhocodes/config-array-0.9.3" = { - name = "_at_humanwhocodes_slash_config-array"; - packageName = "@humanwhocodes/config-array"; - version = "0.9.3"; + version = "1.2.2"; src = fetchurl { - url = "https://registry.npmjs.org/@humanwhocodes/config-array/-/config-array-0.9.3.tgz"; - sha512 = "3xSMlXHh03hCcCmFc0rbKp3Ivt2PFEJnQUJDDMTJQ2wkECZWdq4GePs2ctc5H8zV+cHPaq8k2vU8mrQjA6iHdQ=="; + url = "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-1.2.2.tgz"; + sha512 = "lTVWHs7O2hjBFZunXTZYnYqtB9GakA1lnxIf+gKq2nY5gxkkNi/lQvveW6t8gFdOHTg6nG50Xs95PrLqVpcaLg=="; }; }; "@humanwhocodes/config-array-0.9.5" = { @@ -1267,15 +1039,6 @@ let sha512 = "ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA=="; }; }; - "@jest/console-27.5.0" = { - name = "_at_jest_slash_console"; - packageName = "@jest/console"; - version = "27.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@jest/console/-/console-27.5.0.tgz"; - sha512 = "WUzX5neFb0IOQOy/7A2VhiGdxJKk85Xns2Oq29JaHmtnSel+BsjwyQZxzAs2Xxfd2i452fwdDG9ox/IWi81bdQ=="; - }; - }; "@jest/console-27.5.1" = { name = "_at_jest_slash_console"; packageName = "@jest/console"; @@ -1285,15 +1048,6 @@ let sha512 = "kZ/tNpS3NXn0mlXXXPNuDZnb4c0oZ20r4K5eemM2k30ZC3G0T02nXUvyhf5YdbXWHPEJLc9qGLxEZ216MdL+Zg=="; }; }; - "@jest/core-27.5.0" = { - name = "_at_jest_slash_core"; - packageName = "@jest/core"; - version = "27.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@jest/core/-/core-27.5.0.tgz"; - sha512 = "DcUTkZyon+dRozTEjy38Bgt3PIU51GdUJuz3uHKg5maGtmCaYqPUGiM3Xddqi7eIMC7E3fTGIlHqH9i0pTOy6Q=="; - }; - }; "@jest/core-27.5.1" = { name = "_at_jest_slash_core"; packageName = "@jest/core"; @@ -1303,15 +1057,6 @@ let sha512 = "AK6/UTrvQD0Cd24NSqmIA6rKsu0tKIxfiCducZvqxYdmMisOYAsdItspT+fQDQYARPf8XgjAFZi0ogW2agH5nQ=="; }; }; - "@jest/environment-27.5.0" = { - name = "_at_jest_slash_environment"; - packageName = "@jest/environment"; - version = "27.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@jest/environment/-/environment-27.5.0.tgz"; - sha512 = "lg0JFsMaLKgpwzs0knOg21Z4OQwaJoBLutnmYzip4tyLTXP21VYWtYGpLXgx42fw/Mw05m1WDXWKgwR6WnsiTw=="; - }; - }; "@jest/environment-27.5.1" = { name = "_at_jest_slash_environment"; packageName = "@jest/environment"; @@ -1321,15 +1066,6 @@ let sha512 = "/WQjhPJe3/ghaol/4Bq480JKXV/Rfw8nQdN7f41fM8VDHLcxKXou6QyXAh3EFr9/bVG3x74z1NWDkP87EiY8gA=="; }; }; - "@jest/fake-timers-27.5.0" = { - name = "_at_jest_slash_fake-timers"; - packageName = "@jest/fake-timers"; - version = "27.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@jest/fake-timers/-/fake-timers-27.5.0.tgz"; - sha512 = "e3WrlpqSHq3HAQ03JFjTn8YCrsyg640/sr1rjkM2rNv8z1ufjudpv4xq6DvvTJYB6FuUrfg0g+7bSKPet5QfCQ=="; - }; - }; "@jest/fake-timers-27.5.1" = { name = "_at_jest_slash_fake-timers"; packageName = "@jest/fake-timers"; @@ -1339,15 +1075,6 @@ let sha512 = "/aPowoolwa07k7/oM3aASneNeBGCmGQsc3ugN4u6s4C/+s5M64MFo/+djTdiwcbQlRfFElGuDXWzaWj6QgKObQ=="; }; }; - "@jest/globals-27.5.0" = { - name = "_at_jest_slash_globals"; - packageName = "@jest/globals"; - version = "27.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@jest/globals/-/globals-27.5.0.tgz"; - sha512 = "wWpMnTiR65Q4JD7fr2BqN+ZDbi99mmILnEM6u7AaX4geASEIVvQsiB4RCvwZrIX5YZCsAjviJQVq9CYddLABkg=="; - }; - }; "@jest/globals-27.5.1" = { name = "_at_jest_slash_globals"; packageName = "@jest/globals"; @@ -1357,15 +1084,6 @@ let sha512 = "ZEJNB41OBQQgGzgyInAv0UUfDDj3upmHydjieSxFvTRuZElrx7tXg/uVQ5hYVEwiXs3+aMsAeEc9X7xiSKCm4Q=="; }; }; - "@jest/reporters-27.5.0" = { - name = "_at_jest_slash_reporters"; - packageName = "@jest/reporters"; - version = "27.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@jest/reporters/-/reporters-27.5.0.tgz"; - sha512 = "DG+BmVSx2uaJSTKz5z1eScgHTQ6/cZ5CCKSpmpr4sXQPwV2V5aUMOBDwXX1MnqNRhH7/Rq9K97ynnocvho5aMA=="; - }; - }; "@jest/reporters-27.5.1" = { name = "_at_jest_slash_reporters"; packageName = "@jest/reporters"; @@ -1375,15 +1093,6 @@ let sha512 = "cPXh9hWIlVJMQkVk84aIvXuBB4uQQmFqZiacloFuGiP3ah1sbCxCosidXFDfqG8+6fO1oR2dTJTlsOy4VFmUfw=="; }; }; - "@jest/source-map-27.5.0" = { - name = "_at_jest_slash_source-map"; - packageName = "@jest/source-map"; - version = "27.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@jest/source-map/-/source-map-27.5.0.tgz"; - sha512 = "0xr7VZ+JNCRrlCyRMYhquUm8eU3kNdGDaIW4s3L625bNjk273v9ZhAm3YczIuzJzYH0pnjT+QSCiZQegWKjeow=="; - }; - }; "@jest/source-map-27.5.1" = { name = "_at_jest_slash_source-map"; packageName = "@jest/source-map"; @@ -1393,15 +1102,6 @@ let sha512 = "y9NIHUYF3PJRlHk98NdC/N1gl88BL08aQQgu4k4ZopQkCw9t9cV8mtl3TV8b/YCB8XaVTFrmUTAJvjsntDireg=="; }; }; - "@jest/test-result-27.5.0" = { - name = "_at_jest_slash_test-result"; - packageName = "@jest/test-result"; - version = "27.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@jest/test-result/-/test-result-27.5.0.tgz"; - sha512 = "Lxecvx5mN6WIeynIyW0dWDQm8UPGMHvTwxUPK+OsZaqBDMGaNDSZtw53VoVk7HyT6AcRblMR/pfa0XucmH4hGw=="; - }; - }; "@jest/test-result-27.5.1" = { name = "_at_jest_slash_test-result"; packageName = "@jest/test-result"; @@ -1411,15 +1111,6 @@ let sha512 = "EW35l2RYFUcUQxFJz5Cv5MTOxlJIQs4I7gxzi2zVU7PJhOwfYq1MdC5nhSmYjX1gmMmLPvB3sIaC+BkcHRBfag=="; }; }; - "@jest/test-sequencer-27.5.0" = { - name = "_at_jest_slash_test-sequencer"; - packageName = "@jest/test-sequencer"; - version = "27.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@jest/test-sequencer/-/test-sequencer-27.5.0.tgz"; - sha512 = "WzjcDflqbpWe+SnJPCvB2gB6haGfrkzAgzY6Pb1aq+EPoVAj2mwBaKN0ROWI4H87aSslCjq2M+BUQFNJ8VpnDA=="; - }; - }; "@jest/test-sequencer-27.5.1" = { name = "_at_jest_slash_test-sequencer"; packageName = "@jest/test-sequencer"; @@ -1429,15 +1120,6 @@ let sha512 = "LCheJF7WB2+9JuCS7VB/EmGIdQuhtqjRNI9A43idHv3E4KltCTsPsLxvdaubFHSYwY/fNjMWjl6vNRhDiN7vpQ=="; }; }; - "@jest/transform-27.5.0" = { - name = "_at_jest_slash_transform"; - packageName = "@jest/transform"; - version = "27.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@jest/transform/-/transform-27.5.0.tgz"; - sha512 = "yXUy/iO3TH1itxJ9BF7LLjuXt8TtgtjAl0PBQbUaCvRa+L0yYBob6uayW9dFRX/CDQweouLhvmXh44zRiaB+yA=="; - }; - }; "@jest/transform-27.5.1" = { name = "_at_jest_slash_transform"; packageName = "@jest/transform"; @@ -1447,15 +1129,6 @@ let sha512 = "ipON6WtYgl/1329g5AIJVbUuEh0wZVbdpGwC99Jw4LwuoBNS95MVphU6zOeD9pDkon+LLbFL7lOQRapbB8SCHw=="; }; }; - "@jest/types-27.5.0" = { - name = "_at_jest_slash_types"; - packageName = "@jest/types"; - version = "27.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@jest/types/-/types-27.5.0.tgz"; - sha512 = "oDHEp7gwSgA82RZ6pzUL3ugM2njP/lVB1MsxRZNOBk+CoNvh9SpH1lQixPFc/kDlV50v59csiW4HLixWmhmgPQ=="; - }; - }; "@jest/types-27.5.1" = { name = "_at_jest_slash_types"; packageName = "@jest/types"; @@ -1465,31 +1138,13 @@ let sha512 = "Cx46iJ9QpwQTjIdq5VJu2QTMMs3QlEjI0x1QbBP5W1+nMzyc2XmimiRR/CbX9TO0cPTeUlxWMOu8mslYsJ8DEw=="; }; }; - "@jridgewell/resolve-uri-3.0.4" = { - name = "_at_jridgewell_slash_resolve-uri"; - packageName = "@jridgewell/resolve-uri"; - version = "3.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.0.4.tgz"; - sha512 = "cz8HFjOFfUBtvN+NXYSFMHYRdxZMaEl0XypVrhzxBgadKIXhIkRd8aMeHhmF56Sl7SuS8OnUpQ73/k9LE4VnLg=="; - }; - }; - "@jridgewell/resolve-uri-3.0.5" = { + "@jridgewell/resolve-uri-3.0.6" = { name = "_at_jridgewell_slash_resolve-uri"; packageName = "@jridgewell/resolve-uri"; - version = "3.0.5"; - src = fetchurl { - url = "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.0.5.tgz"; - sha512 = "VPeQ7+wH0itvQxnG+lIzWgkysKIr3L9sslimFW55rHMdGu/qCQ5z5h9zq4gI8uBtqkpHhsF4Z/OwExufUCThew=="; - }; - }; - "@jridgewell/sourcemap-codec-1.4.10" = { - name = "_at_jridgewell_slash_sourcemap-codec"; - packageName = "@jridgewell/sourcemap-codec"; - version = "1.4.10"; + version = "3.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.10.tgz"; - sha512 = "Ht8wIW5v165atIX1p+JvKR5ONzUyF4Ac8DZIQ5kZs9zrb6M8SJNXpx1zn04rn65VjBMygRoMXcyYwNK0fT7bEg=="; + url = "https://registry.npmjs.org/@jridgewell/resolve-uri/-/resolve-uri-3.0.6.tgz"; + sha512 = "R7xHtBSNm+9SyvpJkdQl+qrM3Hm2fea3Ef197M3mUug+v+yR+Rhfbs7PBtcBUVnIWJ4JcAdjvij+c8hXS9p5aw=="; }; }; "@jridgewell/sourcemap-codec-1.4.11" = { @@ -1501,31 +1156,13 @@ let sha512 = "Fg32GrJo61m+VqYSdRSjRXMjQ06j8YIYfcTqndLYVAaHmroZHLJZCydsWBOTDqXS2v+mjxohBWEMfg97GXmYQg=="; }; }; - "@jridgewell/trace-mapping-0.2.7" = { - name = "_at_jridgewell_slash_trace-mapping"; - packageName = "@jridgewell/trace-mapping"; - version = "0.2.7"; - src = fetchurl { - url = "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.2.7.tgz"; - sha512 = "ZKfRhw6eK2vvdWqpU7DQq49+BZESqh5rmkYpNhuzkz01tapssl2sNNy6uMUIgrTtUWQDijomWJzJRCoevVrfgw=="; - }; - }; - "@jridgewell/trace-mapping-0.3.4" = { + "@jridgewell/trace-mapping-0.3.9" = { name = "_at_jridgewell_slash_trace-mapping"; packageName = "@jridgewell/trace-mapping"; - version = "0.3.4"; + version = "0.3.9"; src = fetchurl { - url = "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.4.tgz"; - sha512 = "vFv9ttIedivx0ux3QSjhgtCVjPZd5l46ZOMDSCwnH1yUO2e964gO8LZGyv2QkqcgR6TnBU1v+1IFqmeoG+0UJQ=="; - }; - }; - "@nicolo-ribaudo/chokidar-2-2.1.8-no-fsevents.3" = { - name = "_at_nicolo-ribaudo_slash_chokidar-2"; - packageName = "@nicolo-ribaudo/chokidar-2"; - version = "2.1.8-no-fsevents.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@nicolo-ribaudo/chokidar-2/-/chokidar-2-2.1.8-no-fsevents.3.tgz"; - sha512 = "s88O1aVtXftvp5bCPB7WnmXc5IwOZZ7YPuwNPt+GtOOXpPvad1LfbmjYv+qII7zP6RU2QGnqve27dnLycEnyEQ=="; + url = "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.9.tgz"; + sha512 = "3Belt6tdc8bPgAtbcmdtNJlirVoTmEb5e2gC94PnkwEW9jI6CAHUeoG85tjWP5WquqfavoMtMwiG4P926ZKKuQ=="; }; }; "@nodelib/fs.scandir-2.1.5" = { @@ -1681,15 +1318,6 @@ let sha512 = "RbzJvlNzmRq5c3O09UipeuXno4tA1FE6ikOjxZK0tuxVv3412l64l5t1W5pj4+rJq9vpkm/kwiR07aZXnsKPxw=="; }; }; - "@types/babel__core-7.1.18" = { - name = "_at_types_slash_babel__core"; - packageName = "@types/babel__core"; - version = "7.1.18"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.1.18.tgz"; - sha512 = "S7unDjm/C7z2A2R9NzfKCK1I+BAALDtxEmsJBwlB3EzNfb929ykjL++1CK9LO++EIp2fQrC8O+BwjKvz6UeDyQ=="; - }; - }; "@types/babel__core-7.1.19" = { name = "_at_types_slash_babel__core"; packageName = "@types/babel__core"; @@ -1717,13 +1345,13 @@ let sha512 = "azBFKemX6kMg5Io+/rdGT0dkGreboUVR0Cdm3fz9QJWpaQGJRQXl7C+6hOTCZcMll7KFyEQpgbYI2lHdsS4U7g=="; }; }; - "@types/babel__traverse-7.14.2" = { + "@types/babel__traverse-7.17.0" = { name = "_at_types_slash_babel__traverse"; packageName = "@types/babel__traverse"; - version = "7.14.2"; + version = "7.17.0"; src = fetchurl { - url = "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.14.2.tgz"; - sha512 = "K2waXdXBi2302XUdcHcR1jCeU0LL4TD9HRs/gk0N2Xvrht+G/BfJa4QObBQZfhMdxiCpV3COl5Nfq4uKTeTnJA=="; + url = "https://registry.npmjs.org/@types/babel__traverse/-/babel__traverse-7.17.0.tgz"; + sha512 = "r8aveDbd+rzGP+ykSdF3oPuTVRWRfbBiHl0rVDM2yNEmSMXfkObQLV46b4RnCv3Lra51OlfnZhkkFaDl2MIRaA=="; }; }; "@types/debounce-1.2.1" = { @@ -1735,35 +1363,6 @@ let sha512 = "epMsEE85fi4lfmJUH/89/iV/LI+F5CvNIvmgs5g5jYFPfhO2S/ae8WSsLOKWdwtoaZw9Q2IhJ4tQ5tFCcS/4HA=="; }; }; - "@types/debounce-https://registry.npmjs.org/@types/debounce/-/debounce-1.2.1.tgz" = { - name = "_at_types_slash_debounce"; - packageName = "@types/debounce"; - version = 1; - src = fetchurl { - name = "debounce-1.tar.gz"; - url = "https://registry.npmjs.org/@types/debounce/-/debounce-1.2.1.tgz"; - sha512 = "epMsEE85fi4lfmJUH/89/iV/LI+F5CvNIvmgs5g5jYFPfhO2S/ae8WSsLOKWdwtoaZw9Q2IhJ4tQ5tFCcS/4HA=="; - }; - }; - "@types/debug-4.1.7" = { - name = "_at_types_slash_debug"; - packageName = "@types/debug"; - version = "4.1.7"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/debug/-/debug-4.1.7.tgz"; - sha512 = "9AonUzyTjXXhEOa0DnqpzZi6VHlqKMswga9EXjpXnnqxwLtdvPPtlO8evrI5D9S6asFRCQ6v+wpiUKbw+vKqyg=="; - }; - }; - "@types/debug-https://registry.npmjs.org/@types/debug/-/debug-4.1.7.tgz" = { - name = "_at_types_slash_debug"; - packageName = "@types/debug"; - version = 1; - src = fetchurl { - name = "debug-1.tar.gz"; - url = "https://registry.npmjs.org/@types/debug/-/debug-4.1.7.tgz"; - sha512 = "9AonUzyTjXXhEOa0DnqpzZi6VHlqKMswga9EXjpXnnqxwLtdvPPtlO8evrI5D9S6asFRCQ6v+wpiUKbw+vKqyg=="; - }; - }; "@types/finalhandler-1.1.1" = { name = "_at_types_slash_finalhandler"; packageName = "@types/finalhandler"; @@ -1827,15 +1426,6 @@ let sha512 = "c3mAZEuK0lvBp8tmuL74XRKn1+y2dcwOUpH7x4WrF6gk1GIgiluDRgMYQtw2OFcBvAJWlt6ASU3tSqxp0Uu0Aw=="; }; }; - "@types/jest-27.4.0" = { - name = "_at_types_slash_jest"; - packageName = "@types/jest"; - version = "27.4.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/jest/-/jest-27.4.0.tgz"; - sha512 = "gHl8XuC1RZ8H2j5sHv/JqsaxXkDDM9iDOgu0Wp8sjs4u/snb2PVehyWXJPr+ORA0RPpgw231mnutWI1+0hgjIQ=="; - }; - }; "@types/jest-27.4.1" = { name = "_at_types_slash_jest"; packageName = "@types/jest"; @@ -1845,16 +1435,6 @@ let sha512 = "23iPJADSmicDVrWk+HT58LMJtzLAnB2AgIzplQuq/bSrGaxCrlvRFjGbXmamnnk/mAmCdLStiGqggu28ocUyiw=="; }; }; - "@types/jest-https://registry.npmjs.org/@types/jest/-/jest-27.4.0.tgz" = { - name = "_at_types_slash_jest"; - packageName = "@types/jest"; - version = 1; - src = fetchurl { - name = "jest-1.tar.gz"; - url = "https://registry.npmjs.org/@types/jest/-/jest-27.4.0.tgz"; - sha512 = "gHl8XuC1RZ8H2j5sHv/JqsaxXkDDM9iDOgu0Wp8sjs4u/snb2PVehyWXJPr+ORA0RPpgw231mnutWI1+0hgjIQ=="; - }; - }; "@types/js-yaml-4.0.5" = { name = "_at_types_slash_js-yaml"; packageName = "@types/js-yaml"; @@ -1873,15 +1453,6 @@ let sha512 = "wOuvG1SN4Us4rez+tylwwwCV1psiNVOkJeM3AUWUNWg/jDQY2+HE/444y5gc+jBmRqASOm2Oeh5c1axHobwRKQ=="; }; }; - "@types/json-schema-7.0.9" = { - name = "_at_types_slash_json-schema"; - packageName = "@types/json-schema"; - version = "7.0.9"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.9.tgz"; - sha512 = "qcUXuemtEu+E5wZSJHNxUXeCZhAfXKQ41D+duX+VYPde7xyEVZci+/oXKJL13tnRs9lR2pr4fod59GT6/X1/yQ=="; - }; - }; "@types/minimatch-3.0.5" = { name = "_at_types_slash_minimatch"; packageName = "@types/minimatch"; @@ -1891,69 +1462,13 @@ let sha512 = "Klz949h02Gz2uZCMGwDUSDS1YBlTdDDgbWHi+81l29tQALUtvz4rAYi5uoVhE5Lagoq6DeqAUlbrHvW/mXDgdQ=="; }; }; - "@types/ms-0.7.31" = { - name = "_at_types_slash_ms"; - packageName = "@types/ms"; - version = "0.7.31"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/ms/-/ms-0.7.31.tgz"; - sha512 = "iiUgKzV9AuaEkZqkOLDIvlQiL6ltuZd9tGcW3gwpnX8JbuiuhFlEGmmFXEXkN50Cvq7Os88IY2v0dkDqXYWVgA=="; - }; - }; - "@types/mz-2.7.4" = { - name = "_at_types_slash_mz"; - packageName = "@types/mz"; - version = "2.7.4"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/mz/-/mz-2.7.4.tgz"; - sha512 = "Zs0imXxyWT20j3Z2NwKpr0IO2LmLactBblNyLua5Az4UHuqOQ02V3jPTgyKwDkuc33/ahw+C3O1PIZdrhFMuQA=="; - }; - }; - "@types/mz-https://registry.npmjs.org/@types/mz/-/mz-2.7.4.tgz" = { - name = "_at_types_slash_mz"; - packageName = "@types/mz"; - version = 1; - src = fetchurl { - name = "mz-1.tar.gz"; - url = "https://registry.npmjs.org/@types/mz/-/mz-2.7.4.tgz"; - sha512 = "Zs0imXxyWT20j3Z2NwKpr0IO2LmLactBblNyLua5Az4UHuqOQ02V3jPTgyKwDkuc33/ahw+C3O1PIZdrhFMuQA=="; - }; - }; - "@types/nedb-1.8.12" = { - name = "_at_types_slash_nedb"; - packageName = "@types/nedb"; - version = "1.8.12"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/nedb/-/nedb-1.8.12.tgz"; - sha512 = "ICDoQMORMjOSqfNFXT4ENXfwwCir1BPblXNm0SPH7C4Q10ou+pvVagcFAJ+rrzf3A47tGU4K/KbzKu7wO9j45Q=="; - }; - }; - "@types/nedb-https://registry.npmjs.org/@types/nedb/-/nedb-1.8.12.tgz" = { - name = "_at_types_slash_nedb"; - packageName = "@types/nedb"; - version = 1; - src = fetchurl { - name = "nedb-1.tar.gz"; - url = "https://registry.npmjs.org/@types/nedb/-/nedb-1.8.12.tgz"; - sha512 = "ICDoQMORMjOSqfNFXT4ENXfwwCir1BPblXNm0SPH7C4Q10ou+pvVagcFAJ+rrzf3A47tGU4K/KbzKu7wO9j45Q=="; - }; - }; - "@types/node-17.0.15" = { - name = "_at_types_slash_node"; - packageName = "@types/node"; - version = "17.0.15"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-17.0.15.tgz"; - sha512 = "zWt4SDDv1S9WRBNxLFxFRHxdD9tvH8f5/kg5/IaLFdnSNXsDY4eL3Q3XXN+VxUnWIhyVFDwcsmAprvwXoM/ClA=="; - }; - }; - "@types/node-17.0.23" = { + "@types/node-17.0.25" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "17.0.23"; + version = "17.0.25"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-17.0.23.tgz"; - sha512 = "UxDxWn7dl97rKVeVS61vErvw086aCYhDLyvRQZ5Rk65rZKepaFdm53GeqXaKBuOhED4e9uWq34IC3TdSdJJ2Gw=="; + url = "https://registry.npmjs.org/@types/node/-/node-17.0.25.tgz"; + sha512 = "wANk6fBrUwdpY4isjWrKTufkrXdu1D2YHCot2fD/DfWxF5sMrVSA+KN7ydckvaTCh0HiqX9IVl0L5/ZoXg5M7w=="; }; }; "@types/object-assign-deep-0.4.0" = { @@ -1965,22 +1480,13 @@ let sha512 = "3D0F3rHRNDc8cQSXNzwF1jBrJi28Mdrhc10ZLlqbJWDPYRWTTWB9Tc8JoKrgBvLKioXoPoHT6Uzf3s2F7akCUg=="; }; }; - "@types/prettier-2.4.3" = { - name = "_at_types_slash_prettier"; - packageName = "@types/prettier"; - version = "2.4.3"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/prettier/-/prettier-2.4.3.tgz"; - sha512 = "QzSuZMBuG5u8HqYz01qtMdg/Jfctlnvj1z/lYnIDXs/golxw0fxtRAHd9KrzjR7Yxz1qVeI00o0kiO3PmVdJ9w=="; - }; - }; - "@types/prettier-2.4.4" = { + "@types/prettier-2.6.0" = { name = "_at_types_slash_prettier"; packageName = "@types/prettier"; - version = "2.4.4"; + version = "2.6.0"; src = fetchurl { - url = "https://registry.npmjs.org/@types/prettier/-/prettier-2.4.4.tgz"; - sha512 = "ReVR2rLTV1kvtlWFyuot+d1pkpG2Fw/XKE3PDAdj57rbM97ttSp9JZ2UsP+2EHTylra9cUf6JA7tGwW1INzUrA=="; + url = "https://registry.npmjs.org/@types/prettier/-/prettier-2.6.0.tgz"; + sha512 = "G/AdOadiZhnJp0jXCaBQU449W2h716OW/EoXeYkCytxKL06X1WCXB4DZpp8TpZ8eyIJVS1cw4lrlkkSYU21cDw=="; }; }; "@types/rimraf-3.0.2" = { @@ -1992,25 +1498,6 @@ let sha512 = "F3OznnSLAUxFrCEu/L5PY8+ny8DtcFRjx7fZZ9bycvXRi3KPTRS9HOitGZwvPg0juRhXFWIeKX58cnX5YqLohQ=="; }; }; - "@types/serialport-8.0.2" = { - name = "_at_types_slash_serialport"; - packageName = "@types/serialport"; - version = "8.0.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/serialport/-/serialport-8.0.2.tgz"; - sha512 = "z4b1I8/vdZE3upgCcAL9VAWlVVFUVn5uo3faAHavkVfK/Hb1LUxKwp9YCtA5AZqEUCWoSWl20SRTOvAI/5fQWQ=="; - }; - }; - "@types/serialport-https://registry.npmjs.org/@types/serialport/-/serialport-8.0.2.tgz" = { - name = "_at_types_slash_serialport"; - packageName = "@types/serialport"; - version = 1; - src = fetchurl { - name = "serialport-1.tar.gz"; - url = "https://registry.npmjs.org/@types/serialport/-/serialport-8.0.2.tgz"; - sha512 = "z4b1I8/vdZE3upgCcAL9VAWlVVFUVn5uo3faAHavkVfK/Hb1LUxKwp9YCtA5AZqEUCWoSWl20SRTOvAI/5fQWQ=="; - }; - }; "@types/stack-utils-2.0.1" = { name = "_at_types_slash_stack-utils"; packageName = "@types/stack-utils"; @@ -2038,15 +1525,6 @@ let sha512 = "T8Yc9wt/5LbJyCaLiHPReJa0kApcIgJ7Bn735GjItUfh08Z1pJvu8QZqb9s+mMvKV6WUQRV7K2R46YbjMXTTJw=="; }; }; - "@types/yargs-parser-20.2.1" = { - name = "_at_types_slash_yargs-parser"; - packageName = "@types/yargs-parser"; - version = "20.2.1"; - src = fetchurl { - url = "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-20.2.1.tgz"; - sha512 = "7tFImggNeNBVMsn0vLrpn1H1uPrUBdnARPTpZoitY37ZrdJREzf7I16tMrlK3hen349gr1NYh8CmZQa7CTG6Aw=="; - }; - }; "@types/yargs-parser-21.0.0" = { name = "_at_types_slash_yargs-parser"; packageName = "@types/yargs-parser"; @@ -2056,177 +1534,85 @@ let sha512 = "iO9ZQHkZxHn4mSakYV0vFHAVDyEOIJQrV2uZ06HxEPcx+mt8swXoZHIbaaJ2crJYFfErySgktuTZ3BeLz+XmFA=="; }; }; - "@typescript-eslint/eslint-plugin-5.10.2" = { - name = "_at_typescript-eslint_slash_eslint-plugin"; - packageName = "@typescript-eslint/eslint-plugin"; - version = "5.10.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.10.2.tgz"; - sha512 = "4W/9lLuE+v27O/oe7hXJKjNtBLnZE8tQAFpapdxwSVHqtmIoPB1gph3+ahNwVuNL37BX7YQHyGF9Xv6XCnIX2Q=="; - }; - }; - "@typescript-eslint/eslint-plugin-5.16.0" = { - name = "_at_typescript-eslint_slash_eslint-plugin"; - packageName = "@typescript-eslint/eslint-plugin"; - version = "5.16.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.16.0.tgz"; - sha512 = "SJoba1edXvQRMmNI505Uo4XmGbxCK9ARQpkvOd00anxzri9RNQk0DDCxD+LIl+jYhkzOJiOMMKYEHnHEODjdCw=="; - }; - }; - "@typescript-eslint/eslint-plugin-https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.10.2.tgz" = { + "@typescript-eslint/eslint-plugin-5.20.0" = { name = "_at_typescript-eslint_slash_eslint-plugin"; packageName = "@typescript-eslint/eslint-plugin"; - version = 1; - src = fetchurl { - name = "eslint-plugin-1.tar.gz"; - url = "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.10.2.tgz"; - sha512 = "4W/9lLuE+v27O/oe7hXJKjNtBLnZE8tQAFpapdxwSVHqtmIoPB1gph3+ahNwVuNL37BX7YQHyGF9Xv6XCnIX2Q=="; - }; - }; - "@typescript-eslint/parser-5.10.2" = { - name = "_at_typescript-eslint_slash_parser"; - packageName = "@typescript-eslint/parser"; - version = "5.10.2"; - src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.10.2.tgz"; - sha512 = "JaNYGkaQVhP6HNF+lkdOr2cAs2wdSZBoalE22uYWq8IEv/OVH0RksSGydk+sW8cLoSeYmC+OHvRyv2i4AQ7Czg=="; - }; - }; - "@typescript-eslint/parser-5.16.0" = { - name = "_at_typescript-eslint_slash_parser"; - packageName = "@typescript-eslint/parser"; - version = "5.16.0"; + version = "5.20.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.16.0.tgz"; - sha512 = "fkDq86F0zl8FicnJtdXakFs4lnuebH6ZADDw6CYQv0UZeIjHvmEw87m9/29nk2Dv5Lmdp0zQ3zDQhiMWQf/GbA=="; + url = "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.20.0.tgz"; + sha512 = "fapGzoxilCn3sBtC6NtXZX6+P/Hef7VDbyfGqTTpzYydwhlkevB+0vE0EnmHPVTVSy68GUncyJ/2PcrFBeCo5Q=="; }; }; - "@typescript-eslint/parser-https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.10.2.tgz" = { + "@typescript-eslint/parser-5.20.0" = { name = "_at_typescript-eslint_slash_parser"; packageName = "@typescript-eslint/parser"; - version = 1; - src = fetchurl { - name = "parser-1.tar.gz"; - url = "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.10.2.tgz"; - sha512 = "JaNYGkaQVhP6HNF+lkdOr2cAs2wdSZBoalE22uYWq8IEv/OVH0RksSGydk+sW8cLoSeYmC+OHvRyv2i4AQ7Czg=="; - }; - }; - "@typescript-eslint/scope-manager-5.10.2" = { - name = "_at_typescript-eslint_slash_scope-manager"; - packageName = "@typescript-eslint/scope-manager"; - version = "5.10.2"; + version = "5.20.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.10.2.tgz"; - sha512 = "39Tm6f4RoZoVUWBYr3ekS75TYgpr5Y+X0xLZxXqcZNDWZdJdYbKd3q2IR4V9y5NxxiPu/jxJ8XP7EgHiEQtFnw=="; + url = "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.20.0.tgz"; + sha512 = "UWKibrCZQCYvobmu3/N8TWbEeo/EPQbS41Ux1F9XqPzGuV7pfg6n50ZrFo6hryynD8qOTTfLHtHjjdQtxJ0h/w=="; }; }; - "@typescript-eslint/scope-manager-5.16.0" = { + "@typescript-eslint/scope-manager-5.20.0" = { name = "_at_typescript-eslint_slash_scope-manager"; packageName = "@typescript-eslint/scope-manager"; - version = "5.16.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.16.0.tgz"; - sha512 = "P+Yab2Hovg8NekLIR/mOElCDPyGgFZKhGoZA901Yax6WR6HVeGLbsqJkZ+Cvk5nts/dAlFKm8PfL43UZnWdpIQ=="; - }; - }; - "@typescript-eslint/type-utils-5.10.2" = { - name = "_at_typescript-eslint_slash_type-utils"; - packageName = "@typescript-eslint/type-utils"; - version = "5.10.2"; + version = "5.20.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.10.2.tgz"; - sha512 = "uRKSvw/Ccs5FYEoXW04Z5VfzF2iiZcx8Fu7DGIB7RHozuP0VbKNzP1KfZkHBTM75pCpsWxIthEH1B33dmGBKHw=="; + url = "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.20.0.tgz"; + sha512 = "h9KtuPZ4D/JuX7rpp1iKg3zOH0WNEa+ZIXwpW/KWmEFDxlA/HSfCMhiyF1HS/drTICjIbpA6OqkAhrP/zkCStg=="; }; }; - "@typescript-eslint/type-utils-5.16.0" = { + "@typescript-eslint/type-utils-5.20.0" = { name = "_at_typescript-eslint_slash_type-utils"; packageName = "@typescript-eslint/type-utils"; - version = "5.16.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.16.0.tgz"; - sha512 = "SKygICv54CCRl1Vq5ewwQUJV/8padIWvPgCxlWPGO/OgQLCijY9G7lDu6H+mqfQtbzDNlVjzVWQmeqbLMBLEwQ=="; - }; - }; - "@typescript-eslint/types-5.10.2" = { - name = "_at_typescript-eslint_slash_types"; - packageName = "@typescript-eslint/types"; - version = "5.10.2"; + version = "5.20.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.10.2.tgz"; - sha512 = "Qfp0qk/5j2Rz3p3/WhWgu4S1JtMcPgFLnmAKAW061uXxKSa7VWKZsDXVaMXh2N60CX9h6YLaBoy9PJAfCOjk3w=="; + url = "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.20.0.tgz"; + sha512 = "WxNrCwYB3N/m8ceyoGCgbLmuZwupvzN0rE8NBuwnl7APgjv24ZJIjkNzoFBXPRCGzLNkoU/WfanW0exvp/+3Iw=="; }; }; - "@typescript-eslint/types-5.16.0" = { + "@typescript-eslint/types-5.20.0" = { name = "_at_typescript-eslint_slash_types"; packageName = "@typescript-eslint/types"; - version = "5.16.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.16.0.tgz"; - sha512 = "oUorOwLj/3/3p/HFwrp6m/J2VfbLC8gjW5X3awpQJ/bSG+YRGFS4dpsvtQ8T2VNveV+LflQHjlLvB6v0R87z4g=="; - }; - }; - "@typescript-eslint/typescript-estree-5.10.2" = { - name = "_at_typescript-eslint_slash_typescript-estree"; - packageName = "@typescript-eslint/typescript-estree"; - version = "5.10.2"; + version = "5.20.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.10.2.tgz"; - sha512 = "WHHw6a9vvZls6JkTgGljwCsMkv8wu8XU8WaYKeYhxhWXH/atZeiMW6uDFPLZOvzNOGmuSMvHtZKd6AuC8PrwKQ=="; + url = "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.20.0.tgz"; + sha512 = "+d8wprF9GyvPwtoB4CxBAR/s0rpP25XKgnOvMf/gMXYDvlUC3rPFHupdTQ/ow9vn7UDe5rX02ovGYQbv/IUCbg=="; }; }; - "@typescript-eslint/typescript-estree-5.16.0" = { + "@typescript-eslint/typescript-estree-5.20.0" = { name = "_at_typescript-eslint_slash_typescript-estree"; packageName = "@typescript-eslint/typescript-estree"; - version = "5.16.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.16.0.tgz"; - sha512 = "SE4VfbLWUZl9MR+ngLSARptUv2E8brY0luCdgmUevU6arZRY/KxYoLI/3V/yxaURR8tLRN7bmZtJdgmzLHI6pQ=="; - }; - }; - "@typescript-eslint/utils-5.10.2" = { - name = "_at_typescript-eslint_slash_utils"; - packageName = "@typescript-eslint/utils"; - version = "5.10.2"; + version = "5.20.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.10.2.tgz"; - sha512 = "vuJaBeig1NnBRkf7q9tgMLREiYD7zsMrsN1DA3wcoMDvr3BTFiIpKjGiYZoKPllfEwN7spUjv7ZqD+JhbVjEPg=="; + url = "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.20.0.tgz"; + sha512 = "36xLjP/+bXusLMrT9fMMYy1KJAGgHhlER2TqpUVDYUQg4w0q/NW/sg4UGAgVwAqb8V4zYg43KMUpM8vV2lve6w=="; }; }; - "@typescript-eslint/utils-5.16.0" = { + "@typescript-eslint/utils-5.20.0" = { name = "_at_typescript-eslint_slash_utils"; packageName = "@typescript-eslint/utils"; - version = "5.16.0"; - src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.16.0.tgz"; - sha512 = "iYej2ER6AwmejLWMWzJIHy3nPJeGDuCqf8Jnb+jAQVoPpmWzwQOfa9hWVB8GIQE5gsCv/rfN4T+AYb/V06WseQ=="; - }; - }; - "@typescript-eslint/visitor-keys-5.10.2" = { - name = "_at_typescript-eslint_slash_visitor-keys"; - packageName = "@typescript-eslint/visitor-keys"; - version = "5.10.2"; + version = "5.20.0"; 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=="; + url = "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.20.0.tgz"; + sha512 = "lHONGJL1LIO12Ujyx8L8xKbwWSkoUKFSO+0wDAqGXiudWB2EO7WEUT+YZLtVbmOmSllAjLb9tpoIPwpRe5Tn6w=="; }; }; - "@typescript-eslint/visitor-keys-5.16.0" = { + "@typescript-eslint/visitor-keys-5.20.0" = { name = "_at_typescript-eslint_slash_visitor-keys"; packageName = "@typescript-eslint/visitor-keys"; - version = "5.16.0"; + version = "5.20.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.16.0.tgz"; - sha512 = "jqxO8msp5vZDhikTwq9ubyMHqZ67UIvawohr4qF3KhlpL7gzSjOd+8471H3nh5LyABkaI85laEKKU8SnGUK5/g=="; + url = "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.20.0.tgz"; + sha512 = "1flRpNF+0CAQkMNlTJ6L/Z5jiODG/e5+7mk6XwtPOUS3UrTz3UOiAg9jG2VtKsWI6rZQfy4C6a232QNRZTRGlg=="; }; }; - "abab-2.0.5" = { + "abab-2.0.6" = { name = "abab"; packageName = "abab"; - version = "2.0.5"; + version = "2.0.6"; src = fetchurl { - url = "https://registry.npmjs.org/abab/-/abab-2.0.5.tgz"; - sha512 = "9IK9EadsbHo6jLWIpxpR6pL0sazTXV6+SQv25ZB+F7Bj9mJNaOc4nCRabwd5M/JwmUa8idz6Eci6eKfJryPs6Q=="; + url = "https://registry.npmjs.org/abab/-/abab-2.0.6.tgz"; + sha512 = "j2afSsaIENvHZN2B8GOpF566vZ5WVk5opAiMTvWgaQT8DkbOqsTfvNAvHoRGU2zzP8cPoqys+xHTRDWW8L+/BA=="; }; }; "acorn-7.4.1" = { @@ -2436,22 +1822,13 @@ let sha1 = "c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"; }; }; - "axios-0.26.1" = { + "axios-0.27.2" = { name = "axios"; packageName = "axios"; - version = "0.26.1"; - src = fetchurl { - url = "https://registry.npmjs.org/axios/-/axios-0.26.1.tgz"; - sha512 = "fPwcX4EvnSHuInCMItEhAGnaSEXRBjtzh9fOtsE6E1G6p7vl7edEeZe11QHf18+6+9gR5PbKV/sGKNaD8YaMeA=="; - }; - }; - "babel-jest-27.5.0" = { - name = "babel-jest"; - packageName = "babel-jest"; - version = "27.5.0"; + version = "0.27.2"; src = fetchurl { - url = "https://registry.npmjs.org/babel-jest/-/babel-jest-27.5.0.tgz"; - sha512 = "puhCyvBTNLevhbd1oyw6t3gWBicWoUARQYKCBB/B1moif17NbyhxbsfadqZIw8zfJJD+W7Vw0Nb20pEjLxkXqQ=="; + url = "https://registry.npmjs.org/axios/-/axios-0.27.2.tgz"; + sha512 = "t+yRIyySRTp/wua5xEr+z1q60QmLq8ABsS5O9Me1AsE5dfKqgnCFzwiCZZ/cGNd1lq4/7akDWMxdhVlucjmnOQ=="; }; }; "babel-jest-27.5.1" = { @@ -2481,15 +1858,6 @@ let sha512 = "Y1IQok9821cC9onCx5otgFfRm7Lm+I+wwxOx738M/WLPZ9Q42m4IG5W0FNX8WLL2gYMZo3JkuXIH2DOpWM+qwA=="; }; }; - "babel-plugin-jest-hoist-27.5.0" = { - name = "babel-plugin-jest-hoist"; - packageName = "babel-plugin-jest-hoist"; - version = "27.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-27.5.0.tgz"; - sha512 = "ztwNkHl+g1GaoQcb8f2BER4C3LMvSXuF7KVqtUioXQgScSEnkl6lLgCILUYIR+CPTwL8H3F/PNLze64HPWF9JA=="; - }; - }; "babel-plugin-jest-hoist-27.5.1" = { name = "babel-plugin-jest-hoist"; packageName = "babel-plugin-jest-hoist"; @@ -2535,15 +1903,6 @@ let sha512 = "M7LQ0bxarkxQoN+vz5aJPsLBn77n8QgTFmo8WK0/44auK2xlCXrYcUxHFxgU7qW5Yzw/CjmLRK2uJzaCd7LvqQ=="; }; }; - "babel-preset-jest-27.5.0" = { - name = "babel-preset-jest"; - packageName = "babel-preset-jest"; - version = "27.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/babel-preset-jest/-/babel-preset-jest-27.5.0.tgz"; - sha512 = "7bfu1cJBlgK/nKfTvMlElzA3jpi6GzDWX3fntnyP2cQSzoi/KUz6ewGlcb3PSRYZGyv+uPnVHY0Im3JbsViqgA=="; - }; - }; "babel-preset-jest-27.5.1" = { name = "babel-preset-jest"; packageName = "babel-preset-jest"; @@ -2571,15 +1930,6 @@ let sha512 = "AKpaYlHn8t4SVbOHCy+b5+KKgvR4vrsD8vbvrbiQJps7fKDTkjkDry6ji0rUJjC0kzbNePLwzxq8iypo41qeWA=="; }; }; - "binary-extensions-2.2.0" = { - name = "binary-extensions"; - packageName = "binary-extensions"; - version = "2.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.2.0.tgz"; - sha512 = "jDctJ/IVQbZoJykoeHbhXpOlNBqGNcwXJKJog42E5HDPUwQTSdjCHdihjj0DlnheQ7blbT6dHOafNAiS8ooQKA=="; - }; - }; "bind-decorator-1.0.11" = { name = "bind-decorator"; packageName = "bind-decorator"; @@ -2634,15 +1984,6 @@ let sha512 = "9o5UecI3GhkpM6DrXr69PblIuWxPKk9Y0jHBRhdocZ2y7YECBFCsHm79Pr3OyR2AvjhDkabFJaDJMYRazHgsow=="; }; }; - "browserslist-4.19.1" = { - name = "browserslist"; - packageName = "browserslist"; - version = "4.19.1"; - src = fetchurl { - url = "https://registry.npmjs.org/browserslist/-/browserslist-4.19.1.tgz"; - sha512 = "u2tbbG5PdKRTUoctO3NBD8FQ5HdPh1ZXPHzp1rwaa5jTc+RV9/+RlWiAIKmjRPQF+xbGM9Kklj5bZQFa2s/38A=="; - }; - }; "browserslist-4.20.2" = { name = "browserslist"; packageName = "browserslist"; @@ -2724,22 +2065,13 @@ let sha512 = "Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA=="; }; }; - "caniuse-lite-1.0.30001307" = { - name = "caniuse-lite"; - packageName = "caniuse-lite"; - version = "1.0.30001307"; - src = fetchurl { - url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001307.tgz"; - sha512 = "+MXEMczJ4FuxJAUp0jvAl6Df0NI/OfW1RWEE61eSmzS7hw6lz4IKutbhbXendwq8BljfFuHtu26VWsg4afQ7Ng=="; - }; - }; - "caniuse-lite-1.0.30001320" = { + "caniuse-lite-1.0.30001332" = { name = "caniuse-lite"; packageName = "caniuse-lite"; - version = "1.0.30001320"; + version = "1.0.30001332"; src = fetchurl { - url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001320.tgz"; - sha512 = "MWPzG54AGdo3nWx7zHZTefseM5Y1ccM7hlQKHRqJkPozUaw3hNbBTMmLn16GG2FUzjR13Cr3NPfhIieX5PzXDA=="; + url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001332.tgz"; + sha512 = "10T30NYOEQtN6C11YGg411yebhvpnC6Z102+B95eAsN0oB6KUs01ivE8u+G6FMIRtIrVlYXhL+LUwQ3/hXwDWw=="; }; }; "chalk-2.4.2" = { @@ -2778,15 +2110,6 @@ let sha512 = "Y4kiDb+AM4Ecy58YkuZrrSRJBDQdQ2L+NyS1vHHFtNtUjgutcZfx3yp1dAONI/oPaPmyGfCLx5CxL+zauIMyKQ=="; }; }; - "chokidar-3.5.3" = { - name = "chokidar"; - packageName = "chokidar"; - version = "3.5.3"; - src = fetchurl { - url = "https://registry.npmjs.org/chokidar/-/chokidar-3.5.3.tgz"; - sha512 = "Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw=="; - }; - }; "chownr-1.1.4" = { name = "chownr"; packageName = "chownr"; @@ -2895,13 +2218,13 @@ let sha512 = "dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="; }; }; - "color-string-1.9.0" = { + "color-string-1.9.1" = { name = "color-string"; packageName = "color-string"; - version = "1.9.0"; + version = "1.9.1"; src = fetchurl { - url = "https://registry.npmjs.org/color-string/-/color-string-1.9.0.tgz"; - sha512 = "9Mrz2AQLefkH1UvASKj6v6hj/7eWgjnT/cVsR8CumieLoT+g900exWeNogqtweI8dxloXN9BDQTYro1oWu/5CQ=="; + url = "https://registry.npmjs.org/color-string/-/color-string-1.9.1.tgz"; + sha512 = "shrVawQFojnZv6xM40anx4CkoDP+fZsw/ZerEMsW/pyzsRbElpsL/DBVW7q3ExxwusdNXI3lXpuhEZkzs8p5Eg=="; }; }; "colorspace-1.1.4" = { @@ -2922,15 +2245,6 @@ let sha512 = "FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg=="; }; }; - "commander-4.1.1" = { - name = "commander"; - packageName = "commander"; - version = "4.1.1"; - src = fetchurl { - url = "https://registry.npmjs.org/commander/-/commander-4.1.1.tgz"; - sha512 = "NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA=="; - }; - }; "commist-1.1.0" = { name = "commist"; packageName = "commist"; @@ -2985,31 +2299,22 @@ let sha512 = "+OQdjP49zViI/6i7nIJpA8rAl4sV/JdPfU9nZs3VqOwGIgizICvuN2ru6fMd+4llL0tar18UYJXfZ/TWtmhUjA=="; }; }; - "core-js-3.21.1" = { + "core-js-3.22.2" = { name = "core-js"; packageName = "core-js"; - version = "3.21.1"; - src = fetchurl { - url = "https://registry.npmjs.org/core-js/-/core-js-3.21.1.tgz"; - sha512 = "FRq5b/VMrWlrmCzwRrpDYNxyHP9BcAZC+xHJaqTgIE5091ZV1NTmyh0sGOg5XqpnHvR0svdy0sv1gWA1zmhxig=="; - }; - }; - "core-js-compat-3.21.0" = { - name = "core-js-compat"; - packageName = "core-js-compat"; - version = "3.21.0"; + version = "3.22.2"; src = fetchurl { - url = "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.21.0.tgz"; - sha512 = "OSXseNPSK2OPJa6GdtkMz/XxeXx8/CJvfhQWTqd6neuUraujcL4jVsjkLQz1OWnax8xVQJnRPe0V2jqNWORA+A=="; + url = "https://registry.npmjs.org/core-js/-/core-js-3.22.2.tgz"; + sha512 = "Z5I2vzDnEIqO2YhELVMFcL1An2CIsFe9Q7byZhs8c/QxummxZlAHw33TUHbIte987LkisOgL0LwQ1P9D6VISnA=="; }; }; - "core-js-compat-3.21.1" = { + "core-js-compat-3.22.2" = { name = "core-js-compat"; packageName = "core-js-compat"; - version = "3.21.1"; + version = "3.22.2"; src = fetchurl { - url = "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.21.1.tgz"; - sha512 = "gbgX5AUvMb8gwxC7FLVWYT7Kkgu/y7+h/h1X43yJkNqhlK2fuYyQimqvKGNZFAY6CKii/GFKJ2cp/1/42TN36g=="; + url = "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.22.2.tgz"; + sha512 = "Fns9lU06ZJ07pdfmPMu7OnkIKGPKDzXKIiuGlSvHHapwqMUF2QnnsWwtueFZtSyZEilP0o6iUeHQwpn7LxtLUw=="; }; }; "core-util-is-1.0.3" = { @@ -3084,15 +2389,6 @@ let sha512 = "bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA=="; }; }; - "debug-4.3.3" = { - name = "debug"; - packageName = "debug"; - version = "4.3.3"; - src = fetchurl { - url = "https://registry.npmjs.org/debug/-/debug-4.3.3.tgz"; - sha512 = "/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q=="; - }; - }; "debug-4.3.4" = { name = "debug"; packageName = "debug"; @@ -3165,13 +2461,13 @@ let sha512 = "FJ3UgI4gIl+PHZm53knsuSFpE+nESMr7M4v9QcgB7S63Kj/6WqMiFQJpBBYz1Pt+66bZpP3Q7Lye0Oo9MPKEdg=="; }; }; - "define-properties-1.1.3" = { + "define-properties-1.1.4" = { name = "define-properties"; packageName = "define-properties"; - version = "1.1.3"; + version = "1.1.4"; src = fetchurl { - url = "https://registry.npmjs.org/define-properties/-/define-properties-1.1.3.tgz"; - sha512 = "3MqfYKj2lLzdMSf8ZIZE/V+Zuy+BgD6f164e8K2w7dgnpKArBDerGYpM46IYYcjnkdPNMjPk9A6VFB8+3SKlXQ=="; + url = "https://registry.npmjs.org/define-properties/-/define-properties-1.1.4.tgz"; + sha512 = "uckOqKcfaVvtBdsVkdPv3XjveQJsNQqmhXgRi8uhvWWuPYZCNlzT8qAyblUgNoXdHdjMTzAqeGjAoli8f+bzPA=="; }; }; "delayed-stream-1.0.0" = { @@ -3210,13 +2506,13 @@ let sha512 = "2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg=="; }; }; - "detect-libc-2.0.0" = { + "detect-libc-2.0.1" = { name = "detect-libc"; packageName = "detect-libc"; - version = "2.0.0"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/detect-libc/-/detect-libc-2.0.0.tgz"; - sha512 = "S55LzUl8HUav8l9E2PBTlC5PAJrHK7tkM+XXFGD+fbsbkTzhCpG6K05LxJcUOEWzMa4v6ptcMZ9s3fOdJDu0Zw=="; + url = "https://registry.npmjs.org/detect-libc/-/detect-libc-2.0.1.tgz"; + sha512 = "463v3ZeIrcWtdgIg6vI6XUncguvr2TnGl4SzDXinkt9mSLpBJKXT3mW6xT3VQdDN11+WVs29pgvivTc4Lp8v+w=="; }; }; "detect-newline-3.1.0" = { @@ -3228,15 +2524,6 @@ let sha512 = "TLz+x/vEXm/Y7P7wn1EJFNLxYpUD4TgMosxY6fAVJUnJMbupHBOncxyWUG9OpTaH9EBD7uFI5LfEgmMOc54DsA=="; }; }; - "diff-sequences-27.5.0" = { - name = "diff-sequences"; - packageName = "diff-sequences"; - version = "27.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/diff-sequences/-/diff-sequences-27.5.0.tgz"; - sha512 = "ZsOBWnhXiH+Zn0DcBNX/tiQsqrREHs/6oQsEVy2VJJjrTblykPima11pyHMSA/7PGmD+fwclTnKVKL/qtNREDQ=="; - }; - }; "diff-sequences-27.5.1" = { name = "diff-sequences"; packageName = "diff-sequences"; @@ -3291,22 +2578,13 @@ let sha1 = "590c61156b0ae2f4f0255732a158b266bc56b21d"; }; }; - "electron-to-chromium-1.4.65" = { - name = "electron-to-chromium"; - packageName = "electron-to-chromium"; - version = "1.4.65"; - src = fetchurl { - url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.65.tgz"; - sha512 = "0/d8Skk8sW3FxXP0Dd6MnBlrwx7Qo9cqQec3BlIAlvKnrmS3pHsIbaroEi+nd0kZkGpQ6apMEre7xndzjlEnLw=="; - }; - }; - "electron-to-chromium-1.4.95" = { + "electron-to-chromium-1.4.118" = { name = "electron-to-chromium"; packageName = "electron-to-chromium"; - version = "1.4.95"; + version = "1.4.118"; src = fetchurl { - url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.95.tgz"; - sha512 = "h2VAMV/hPtmAeiDkwA8c5sjS+cWt6GlQL4ERdrOUWu7cRIG5IRk9uwR9f0utP+hPJ9ZZsADTq9HpbuT46eBYAg=="; + url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.118.tgz"; + sha512 = "maZIKjnYDvF7Fs35nvVcyr44UcKNwybr93Oba2n3HkKDFAtk0svERkLN/HyczJDS3Fo4wU9th9fUQd09ZLtj1w=="; }; }; "emittery-0.8.1" = { @@ -3417,22 +2695,13 @@ let sha512 = "mmHKys/C8BFUGI+MAWNcSYoORYLMdPzjrknd2Vc+bUsjN5bXcr8EhrNB+UTqfL1y3I9c4fw2ihgtMPQLBRiQxw=="; }; }; - "eslint-8.12.0" = { - name = "eslint"; - packageName = "eslint"; - version = "8.12.0"; - src = fetchurl { - url = "https://registry.npmjs.org/eslint/-/eslint-8.12.0.tgz"; - sha512 = "it1oBL9alZg1S8UycLm5YDMAkIhtH6FtAzuZs6YvoGVldWjbS08BkAdb/ymP9LlAyq8koANu32U7Ib/w+UNh8Q=="; - }; - }; - "eslint-8.8.0" = { + "eslint-8.14.0" = { name = "eslint"; packageName = "eslint"; - version = "8.8.0"; + version = "8.14.0"; src = fetchurl { - url = "https://registry.npmjs.org/eslint/-/eslint-8.8.0.tgz"; - sha512 = "H3KXAzQGBH1plhYS3okDix2ZthuYJlQQEGE5k0IKuEqUSiyu4AmxxlJ2MtTYeJ3xB4jDhcYCwGOg2TXYdnDXlQ=="; + url = "https://registry.npmjs.org/eslint/-/eslint-8.14.0.tgz"; + sha512 = "3/CE4aJX7LNEiE3i6FeodHmI/38GZtWCsAtsymScmzYapx8q1nVVb+eLcLSzATmCPXw5pT4TqVs1E0OmxAd9tw=="; }; }; "eslint-config-google-0.14.0" = { @@ -3444,23 +2713,13 @@ let sha512 = "WsbX4WbjuMvTdeVL6+J3rK1RGhCTqjsFjX7UMSMgZiyxxaNLkoJENbrGExzERFeoTpGw3F3FypTiWAP9ZXzkEw=="; }; }; - "eslint-https://registry.npmjs.org/eslint/-/eslint-8.8.0.tgz" = { - name = "eslint"; - packageName = "eslint"; - version = 1; - src = fetchurl { - name = "eslint-1.tar.gz"; - url = "https://registry.npmjs.org/eslint/-/eslint-8.8.0.tgz"; - sha512 = "H3KXAzQGBH1plhYS3okDix2ZthuYJlQQEGE5k0IKuEqUSiyu4AmxxlJ2MtTYeJ3xB4jDhcYCwGOg2TXYdnDXlQ=="; - }; - }; - "eslint-plugin-jest-26.1.3" = { + "eslint-plugin-jest-26.1.5" = { name = "eslint-plugin-jest"; packageName = "eslint-plugin-jest"; - version = "26.1.3"; + version = "26.1.5"; src = fetchurl { - url = "https://registry.npmjs.org/eslint-plugin-jest/-/eslint-plugin-jest-26.1.3.tgz"; - sha512 = "Pju+T7MFpo5VFhFlwrkK/9jRUu18r2iugvgyrWOnnGRaVTFFmFXp+xFJpHyqmjjLmGJPKLeEFLVTAxezkApcpQ=="; + url = "https://registry.npmjs.org/eslint-plugin-jest/-/eslint-plugin-jest-26.1.5.tgz"; + sha512 = "su89aDuljL9bTjEufTXmKUMSFe2kZUL9bi7+woq+C2ukHZordhtfPm4Vg+tdioHBaKf8v3/FXW9uV0ksqhYGFw=="; }; }; "eslint-scope-5.1.1" = { @@ -3472,15 +2731,6 @@ let sha512 = "2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw=="; }; }; - "eslint-scope-7.1.0" = { - name = "eslint-scope"; - packageName = "eslint-scope"; - version = "7.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/eslint-scope/-/eslint-scope-7.1.0.tgz"; - sha512 = "aWwkhnS0qAXqNOgKOK0dJ2nvzEbhEvpy8OlJ9kZ0FeZnA6zpjv1/Vei+puGFFX7zkPCkHHXb7IDX3A+7yPrRWg=="; - }; - }; "eslint-scope-7.1.1" = { name = "eslint-scope"; packageName = "eslint-scope"; @@ -3508,15 +2758,6 @@ let sha512 = "0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw=="; }; }; - "eslint-visitor-keys-3.2.0" = { - name = "eslint-visitor-keys"; - packageName = "eslint-visitor-keys"; - version = "3.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-3.2.0.tgz"; - sha512 = "IOzT0X126zn7ALX0dwFiUQEdsfzrm4+ISsQS8nukaJXwEyYKRSnEIIDULYg1mCtGp7UUXgfGl7BIolXREQK+XQ=="; - }; - }; "eslint-visitor-keys-3.3.0" = { name = "eslint-visitor-keys"; packageName = "eslint-visitor-keys"; @@ -3526,15 +2767,6 @@ let sha512 = "mQ+suqKJVyeuwGYHAdjMFqjCyfl8+Ldnxuyp3ldiMBFKkvytrXUZWaiPCEav8qDHKty44bD+qV1IP4T+w+xXRA=="; }; }; - "espree-9.3.0" = { - name = "espree"; - packageName = "espree"; - version = "9.3.0"; - src = fetchurl { - url = "https://registry.npmjs.org/espree/-/espree-9.3.0.tgz"; - sha512 = "d/5nCsb0JcqsSEeQzFZ8DH1RmxPcglRWh24EFTlUEmCKoehXGdpsx0RkHDubqUI8LSAIKMQp4r9SzQ3n+sm4HQ=="; - }; - }; "espree-9.3.1" = { name = "espree"; packageName = "espree"; @@ -3634,15 +2866,6 @@ let sha512 = "XYfuKMvj4O35f/pOXLObndIRvyQ+/+6AhODh+OKWj9S9498pHHn/IMszH+gt0fBCRWMNfk1ZSp5x3AifmnI2vg=="; }; }; - "expect-27.5.0" = { - name = "expect"; - packageName = "expect"; - version = "27.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/expect/-/expect-27.5.0.tgz"; - sha512 = "z73GZ132cBqrapO0X6BeRjyBXqOt9YeRtnDteHJIQqp5s2pZ41Hz23VUbsVFMfkrsFLU9GwoIRS0ZzLuFK8M5w=="; - }; - }; "expect-27.5.1" = { name = "expect"; packageName = "expect"; @@ -3706,13 +2929,13 @@ let sha512 = "DkPJKQeY6kKwmuMretBhr7G6Vodr7bFwDYTXIkfG1gjvNpaxBTQV3PbXg6bR1c1UP4jPOX0jHUbbHANL9vRjVg=="; }; }; - "fecha-4.2.1" = { + "fecha-4.2.3" = { name = "fecha"; packageName = "fecha"; - version = "4.2.1"; + version = "4.2.3"; src = fetchurl { - url = "https://registry.npmjs.org/fecha/-/fecha-4.2.1.tgz"; - sha512 = "MMMQ0ludy/nBs1/o0zVOiKTpG7qMbonKUzjJgQFEuvq6INZ1OraKPRAWkBq5vlKLOUMpmNYG1JoN3oDPUQ9m3Q=="; + url = "https://registry.npmjs.org/fecha/-/fecha-4.2.3.tgz"; + sha512 = "OP2IUU6HeYKJi3i0z4A19kHMQoLVs4Hc+DPqqxI2h/DPZHTm/vjsfC6P0b4jCMy14XizLBqvndQ+UilD7707Jw=="; }; }; "file-entry-cache-6.0.1" = { @@ -3814,6 +3037,15 @@ let sha512 = "RHkBKtLWUVwd7SqRIvCZMEvAMoGUp0XU+seQiZejj0COz3RI3hWP4sCv3gZWWLjJTd7rGwcsF5eKZGii0r/hbg=="; }; }; + "form-data-4.0.0" = { + name = "form-data"; + packageName = "form-data"; + version = "4.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/form-data/-/form-data-4.0.0.tgz"; + sha512 = "ETEklSGi5t0QMZuiXoA/Q6vcnxcLQP5vdugSpuAyi6SVGi2clPPp+xgEhuMaHC+zGgn31Kd235W35f7Hykkaww=="; + }; + }; "fresh-0.5.2" = { name = "fresh"; packageName = "fresh"; @@ -3832,15 +3064,6 @@ let sha512 = "y6OAwoSIf7FyjMIv94u+b5rdheZEjzR63GTyZJm5qh4Bi+2YgwLCcI/fPFZkL5PSixOt6ZNKm+w+Hfp/Bciwow=="; }; }; - "fs-readdir-recursive-1.1.0" = { - name = "fs-readdir-recursive"; - packageName = "fs-readdir-recursive"; - version = "1.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/fs-readdir-recursive/-/fs-readdir-recursive-1.1.0.tgz"; - sha512 = "GNanXlVr2pf02+sPN40XN8HG+ePaNcvM0q5mZBd668Obwb0yD5GiUbZOFgwn8kGMY6I3mdyDJzieUy3PTYyTRA=="; - }; - }; "fs.realpath-1.0.0" = { name = "fs.realpath"; packageName = "fs.realpath"; @@ -3985,15 +3208,6 @@ let sha512 = "WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA=="; }; }; - "globals-13.12.1" = { - name = "globals"; - packageName = "globals"; - version = "13.12.1"; - src = fetchurl { - url = "https://registry.npmjs.org/globals/-/globals-13.12.1.tgz"; - sha512 = "317dFlgY2pdJZ9rspXDks7073GpDmXdfbM3vYYp0HAMKGDh1FfWPleI2ljVNLQX5M5lXcAslTcPTrOrMEFOjyw=="; - }; - }; "globals-13.13.0" = { name = "globals"; packageName = "globals"; @@ -4021,22 +3235,13 @@ let sha1 = "769b5984a96f6066ab9ea758224825ee6c210f0b"; }; }; - "graceful-fs-4.2.9" = { + "graceful-fs-4.2.10" = { name = "graceful-fs"; packageName = "graceful-fs"; - version = "4.2.9"; - src = fetchurl { - url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.9.tgz"; - sha512 = "NtNxqUcXgpW2iMrfqSfR73Glt39K+BLwWsPs94yR63v45T0Wbej7eRmL5cWfwEgqXnmjQp3zaJTshdRW/qC2ZQ=="; - }; - }; - "handlebars-4.7.7" = { - name = "handlebars"; - packageName = "handlebars"; - version = "4.7.7"; + version = "4.2.10"; src = fetchurl { - url = "https://registry.npmjs.org/handlebars/-/handlebars-4.7.7.tgz"; - sha512 = "aAcXm5OAfE/8IXkcZvCepKU3VzW1/39Fb5ZuqMtgI/hT8X2YgoMvBY5dLhq/cpOvw7Lk1nK/UF71aLG/ZnVYRA=="; + url = "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.10.tgz"; + sha512 = "9ByhssR2fPVsNZj478qUUbKfmL0+t5BDVyjShtyZZLiK7ZDAArFFfopyOTj0M05wE2tJPisA4iTnnXl2YoPvOA=="; }; }; "has-1.0.3" = { @@ -4066,13 +3271,13 @@ let sha512 = "EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ=="; }; }; - "has-symbols-1.0.2" = { - name = "has-symbols"; - packageName = "has-symbols"; - version = "1.0.2"; + "has-property-descriptors-1.0.0" = { + name = "has-property-descriptors"; + packageName = "has-property-descriptors"; + version = "1.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.2.tgz"; - sha512 = "chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw=="; + url = "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.0.tgz"; + sha512 = "62DVLZGoiEBDHQyqG4w9xCuZ7eJEwNmJRWw2VY84Oedb7WFcA27fiEVe8oUQx9hAUJ4ekurquucTGwsyO1XGdQ=="; }; }; "has-symbols-1.0.3" = { @@ -4138,13 +3343,13 @@ let sha512 = "k0zdNgqWTGA6aeIRVpvfVob4fL52dTfaehylg0Y4UvSySvOq/Y+BOyPrgpUrA7HylqvU8vIZGsRuXmspskV0Tg=="; }; }; - "https-proxy-agent-5.0.0" = { + "https-proxy-agent-5.0.1" = { name = "https-proxy-agent"; packageName = "https-proxy-agent"; - version = "5.0.0"; + version = "5.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.0.tgz"; - sha512 = "EkYm5BcKUGiduxzSt3Eppko+PiNWNEpa4ySk9vTC6wDsQJW9rHSa+UhGNJoRYp7bz6Ht1eaRIa6QaJqO5rCFbA=="; + url = "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz"; + sha512 = "dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA=="; }; }; "human-signals-2.1.0" = { @@ -4183,15 +3388,6 @@ let sha512 = "dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA=="; }; }; - "ignore-4.0.6" = { - name = "ignore"; - packageName = "ignore"; - version = "4.0.6"; - src = fetchurl { - url = "https://registry.npmjs.org/ignore/-/ignore-4.0.6.tgz"; - sha512 = "cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg=="; - }; - }; "ignore-5.2.0" = { name = "ignore"; packageName = "ignore"; @@ -4273,22 +3469,13 @@ let sha512 = "eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ=="; }; }; - "is-binary-path-2.1.0" = { - name = "is-binary-path"; - packageName = "is-binary-path"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz"; - sha512 = "ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw=="; - }; - }; - "is-core-module-2.8.1" = { + "is-core-module-2.9.0" = { name = "is-core-module"; packageName = "is-core-module"; - version = "2.8.1"; + version = "2.9.0"; src = fetchurl { - url = "https://registry.npmjs.org/is-core-module/-/is-core-module-2.8.1.tgz"; - sha512 = "SdNCUs284hr40hFTFP6l0IfZ/RSrMXF3qgoRHd3/79unUTvrFO/JoXwkGm+5J/Oe3E/b5GsnG330uUNgRpu1PA=="; + url = "https://registry.npmjs.org/is-core-module/-/is-core-module-2.9.0.tgz"; + sha512 = "+5FPy5PnwmO3lvfMb0AsoPaBG+5KHUI0wYFXOtYPnVVVspTFUuMZNfNaNVRt3FZadstu2c8x23vykRW/NBoU6A=="; }; }; "is-extglob-2.1.1" = { @@ -4399,13 +3586,13 @@ let sha512 = "eOeJ5BHCmHYvQK7xt9GkdHuzuCGS1Y6g9Gvnx3Ym33fz/HpLRYxiS0wHNr+m/MBC8B647Xt608vCDEvhl9c6Mw=="; }; }; - "istanbul-lib-instrument-5.1.0" = { + "istanbul-lib-instrument-5.2.0" = { name = "istanbul-lib-instrument"; packageName = "istanbul-lib-instrument"; - version = "5.1.0"; + version = "5.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-5.1.0.tgz"; - sha512 = "czwUz525rkOFDJxfKK6mYfIs9zBKILyrZQxjz3ABhjQXhbhFsSbo1HW/BFcsDnfJYJWA6thRR5/TUY2qs5W99Q=="; + url = "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-5.2.0.tgz"; + sha512 = "6Lthe1hqXHBNsqvgDzGO6l03XNeu3CrG4RqQ1KM9+l5+jNGpEJfIELx1NS3SEHmJQA8np/u+E4EPRKRiu6m19A=="; }; }; "istanbul-lib-report-3.0.0" = { @@ -4435,15 +3622,6 @@ let sha512 = "r1/DshN4KSE7xWEknZLLLLDn5CJybV3nw01VTkp6D5jzLuELlcbudfj/eSQFvrKsJuTVCGnePO7ho82Nw9zzfw=="; }; }; - "jest-27.5.0" = { - name = "jest"; - packageName = "jest"; - version = "27.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/jest/-/jest-27.5.0.tgz"; - sha512 = "sCMZhL9zy0fiFc4H0cKlXq7BcghMSxm5ZnEyaPWTteArU5ix6JjOKyOXSUBGLTQCmt5kuX9zEvQ9BSshHOPB3A=="; - }; - }; "jest-27.5.1" = { name = "jest"; packageName = "jest"; @@ -4453,15 +3631,6 @@ let sha512 = "Yn0mADZB89zTtjkPJEXwrac3LHudkQMR+Paqa8uxJHCBr9agxztUifWCyiYrjhMPBoUVBjyny0I7XH6ozDr7QQ=="; }; }; - "jest-changed-files-27.5.0" = { - name = "jest-changed-files"; - packageName = "jest-changed-files"; - version = "27.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/jest-changed-files/-/jest-changed-files-27.5.0.tgz"; - sha512 = "BGWKI7E6ORqbF5usF1oA4ftbkhVZVrXr8jB0/BrU6TAn3kfOVwX2Zx6pKIXYutJ+qNEjT8Da/gGak0ajya/StA=="; - }; - }; "jest-changed-files-27.5.1" = { name = "jest-changed-files"; packageName = "jest-changed-files"; @@ -4471,15 +3640,6 @@ let sha512 = "buBLMiByfWGCoMsLLzGUUSpAmIAGnbR2KJoMN10ziLhOLvP4e0SlypHnAel8iqQXTrcbmfEY9sSqae5sgUsTvw=="; }; }; - "jest-circus-27.5.0" = { - name = "jest-circus"; - packageName = "jest-circus"; - version = "27.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/jest-circus/-/jest-circus-27.5.0.tgz"; - sha512 = "+NPd1OxpAHYKjbW8dgL0huFgmtZRKSUKee/UtRgZJEfAxCeA12d7sp0coh5EGDBpW4fCk1Pcia/2dG+j6BQvdw=="; - }; - }; "jest-circus-27.5.1" = { name = "jest-circus"; packageName = "jest-circus"; @@ -4489,15 +3649,6 @@ let sha512 = "D95R7x5UtlMA5iBYsOHFFbMD/GVA4R/Kdq15f7xYWUfWHBto9NYRsOvnSauTgdF+ogCpJ4tyKOXhUifxS65gdw=="; }; }; - "jest-cli-27.5.0" = { - name = "jest-cli"; - packageName = "jest-cli"; - version = "27.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/jest-cli/-/jest-cli-27.5.0.tgz"; - sha512 = "9ANs79Goz1ULKtG7HDm/F//4E69v8EFOLXRIHmeC/eK1xTUeQGlU6XP0Zwst386sKaKB4O60qhWY/UaTBS2MLA=="; - }; - }; "jest-cli-27.5.1" = { name = "jest-cli"; packageName = "jest-cli"; @@ -4507,15 +3658,6 @@ let sha512 = "Hc6HOOwYq4/74/c62dEE3r5elx8wjYqxY0r0G/nFrLDPMFRu6RA/u8qINOIkvhxG7mMQ5EJsOGfRpI8L6eFUVw=="; }; }; - "jest-config-27.5.0" = { - name = "jest-config"; - packageName = "jest-config"; - version = "27.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/jest-config/-/jest-config-27.5.0.tgz"; - sha512 = "eOIpvpXFz5WHuIYZN1QmvBLEjsSk3w+IAC/2jBpZClbprF53Bj9meBMgAbE15DSkaaJBDFmhXXd1L2eCLaWxQw=="; - }; - }; "jest-config-27.5.1" = { name = "jest-config"; packageName = "jest-config"; @@ -4525,15 +3667,6 @@ let sha512 = "5sAsjm6tGdsVbW9ahcChPAFCk4IlkQUknH5AvKjuLTSlcO/wCZKyFdn7Rg0EkC+OGgWODEy2hDpWB1PgzH0JNA=="; }; }; - "jest-diff-27.5.0" = { - name = "jest-diff"; - packageName = "jest-diff"; - version = "27.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/jest-diff/-/jest-diff-27.5.0.tgz"; - sha512 = "zztvHDCq/QcAVv+o6rts0reupSOxyrX+KLQEOMWCW2trZgcBFgp/oTK7hJCGpXvEIqKrQzyQlaPKn9W04+IMQg=="; - }; - }; "jest-diff-27.5.1" = { name = "jest-diff"; packageName = "jest-diff"; @@ -4543,15 +3676,6 @@ let sha512 = "m0NvkX55LDt9T4mctTEgnZk3fmEg3NRYutvMPWM/0iPnkFj2wIeF45O1718cMSOFO1vINkqmxqD8vE37uTEbqw=="; }; }; - "jest-docblock-27.5.0" = { - name = "jest-docblock"; - packageName = "jest-docblock"; - version = "27.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/jest-docblock/-/jest-docblock-27.5.0.tgz"; - sha512 = "U4MtJgdZn2x+jpPzd7NAYvDmgJAA5h9QxVAwsyuH7IymGzY8VGHhAkHcIGOmtmdC61ORLxCbEhj6fCJsaCWzXA=="; - }; - }; "jest-docblock-27.5.1" = { name = "jest-docblock"; packageName = "jest-docblock"; @@ -4561,15 +3685,6 @@ let sha512 = "rl7hlABeTsRYxKiUfpHrQrG4e2obOiTQWfMEH3PxPjOtdsfLQO4ReWSZaQ7DETm4xu07rl4q/h4zcKXyU0/OzQ=="; }; }; - "jest-each-27.5.0" = { - name = "jest-each"; - packageName = "jest-each"; - version = "27.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/jest-each/-/jest-each-27.5.0.tgz"; - sha512 = "2vpajSdDMZmAxjSP1f4BG9KKduwHtuaI0w66oqLUkfaGUU7Ix/W+d8BW0h3/QEJiew7hR0GSblqdFwTEEbhBdw=="; - }; - }; "jest-each-27.5.1" = { name = "jest-each"; packageName = "jest-each"; @@ -4579,15 +3694,6 @@ let sha512 = "1Ff6p+FbhT/bXQnEouYy00bkNSY7OUpfIcmdl8vZ31A1UUaurOLPA8a8BbJOF2RDUElwJhmeaV7LnagI+5UwNQ=="; }; }; - "jest-environment-jsdom-27.5.0" = { - name = "jest-environment-jsdom"; - packageName = "jest-environment-jsdom"; - version = "27.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/jest-environment-jsdom/-/jest-environment-jsdom-27.5.0.tgz"; - sha512 = "sX49N8rjp6HSHeGpNgLk6mtHRd1IPAnE/u7wLQkb6Tz/1E08Q++Y8Zk/IbpVdcFywbzH1icFqEuDuHJ6o+uXXg=="; - }; - }; "jest-environment-jsdom-27.5.1" = { name = "jest-environment-jsdom"; packageName = "jest-environment-jsdom"; @@ -4597,15 +3703,6 @@ let sha512 = "TFBvkTC1Hnnnrka/fUb56atfDtJ9VMZ94JkjTbggl1PEpwrYtUBKMezB3inLmWqQsXYLcMwNoDQwoBTAvFfsfw=="; }; }; - "jest-environment-node-27.5.0" = { - name = "jest-environment-node"; - packageName = "jest-environment-node"; - version = "27.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-27.5.0.tgz"; - sha512 = "7UzisMMfGyrURhS/eUa7p7mgaqN3ajHylsjOgfcn0caNeYRZq4LHKZLfAxrPM34DWLnBZcRupEJlpQsizdSUsw=="; - }; - }; "jest-environment-node-27.5.1" = { name = "jest-environment-node"; packageName = "jest-environment-node"; @@ -4615,15 +3712,6 @@ let sha512 = "Jt4ZUnxdOsTGwSRAfKEnE6BcwsSPNOijjwifq5sDFSA2kesnXTvNqKHYgM0hDq3549Uf/KzdXNYn4wMZJPlFLw=="; }; }; - "jest-get-type-27.5.0" = { - name = "jest-get-type"; - packageName = "jest-get-type"; - version = "27.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/jest-get-type/-/jest-get-type-27.5.0.tgz"; - sha512 = "Vp6O8a52M/dahXRG/E0EJuWQROps2mDQ0sJYPgO8HskhdLwj9ajgngy2OAqZgV6e/RcU67WUHq6TgfvJb8flbA=="; - }; - }; "jest-get-type-27.5.1" = { name = "jest-get-type"; packageName = "jest-get-type"; @@ -4633,15 +3721,6 @@ let sha512 = "2KY95ksYSaK7DMBWQn6dQz3kqAf3BB64y2udeG+hv4KfSOb9qwcYQstTJc1KCbsix+wLZWZYN8t7nwX3GOBLRw=="; }; }; - "jest-haste-map-27.5.0" = { - name = "jest-haste-map"; - packageName = "jest-haste-map"; - version = "27.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-27.5.0.tgz"; - sha512 = "0KfckSBEKV+D6e0toXmIj4zzp72EiBnvkC0L+xYxenkLhAdkp2/8tye4AgMzz7Fqb1r8SWtz7+s1UQLrxMBang=="; - }; - }; "jest-haste-map-27.5.1" = { name = "jest-haste-map"; packageName = "jest-haste-map"; @@ -4651,25 +3730,6 @@ let sha512 = "7GgkZ4Fw4NFbMSDSpZwXeBiIbx+t/46nJ2QitkOjvwPYyZmqttu2TDSimMHP1EkPOi4xUZAN1doE5Vd25H4Jng=="; }; }; - "jest-https://registry.npmjs.org/jest/-/jest-27.5.0.tgz" = { - name = "jest"; - packageName = "jest"; - version = 1; - src = fetchurl { - name = "jest-1.tar.gz"; - url = "https://registry.npmjs.org/jest/-/jest-27.5.0.tgz"; - sha512 = "sCMZhL9zy0fiFc4H0cKlXq7BcghMSxm5ZnEyaPWTteArU5ix6JjOKyOXSUBGLTQCmt5kuX9zEvQ9BSshHOPB3A=="; - }; - }; - "jest-jasmine2-27.5.0" = { - name = "jest-jasmine2"; - packageName = "jest-jasmine2"; - version = "27.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/jest-jasmine2/-/jest-jasmine2-27.5.0.tgz"; - sha512 = "X7sT3HLNjjrBEepilxzPyNhNdyunaFBepo1L3T/fvYb9tb8Wb8qY576gwIa+SZcqYUqAA7/bT3EpZI4lAp0Qew=="; - }; - }; "jest-jasmine2-27.5.1" = { name = "jest-jasmine2"; packageName = "jest-jasmine2"; @@ -4679,15 +3739,6 @@ let sha512 = "jtq7VVyG8SqAorDpApwiJJImd0V2wv1xzdheGHRGyuT7gZm6gG47QEskOlzsN1PG/6WNaCo5pmwMHDf3AkG2pQ=="; }; }; - "jest-leak-detector-27.5.0" = { - name = "jest-leak-detector"; - packageName = "jest-leak-detector"; - version = "27.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-27.5.0.tgz"; - sha512 = "Ak3k+DD3ao5d4/zzJrxAQ5UV5wiCrp47jH94ZD4/vXSzQgE6WBVDfg83VtculLILO7Y6/Q/7yzKSrtN9Na8luA=="; - }; - }; "jest-leak-detector-27.5.1" = { name = "jest-leak-detector"; packageName = "jest-leak-detector"; @@ -4697,15 +3748,6 @@ let sha512 = "POXfWAMvfU6WMUXftV4HolnJfnPOGEu10fscNCA76KBpRRhcMN2c8d3iT2pxQS3HLbA+5X4sOUPzYO2NUyIlHQ=="; }; }; - "jest-matcher-utils-27.5.0" = { - name = "jest-matcher-utils"; - packageName = "jest-matcher-utils"; - version = "27.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-27.5.0.tgz"; - sha512 = "5ruyzWMGb1ilCWD6ECwNdOhQBeIXAjHmHd5c3uO6quR7RIMHPRP2ucOaejz2j+0R0Ko4GanWM6SqXAeF8nYN5g=="; - }; - }; "jest-matcher-utils-27.5.1" = { name = "jest-matcher-utils"; packageName = "jest-matcher-utils"; @@ -4715,15 +3757,6 @@ let sha512 = "z2uTx/T6LBaCoNWNFWwChLBKYxTMcGBRjAt+2SbP929/Fflb9aa5LGma654Rz8z9HLxsrUaYzxE9T/EFIL/PAw=="; }; }; - "jest-message-util-27.5.0" = { - name = "jest-message-util"; - packageName = "jest-message-util"; - version = "27.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/jest-message-util/-/jest-message-util-27.5.0.tgz"; - sha512 = "lfbWRhTtmZMEHPAtl0SrvNzK1F4UnVNMHOliRQT2BJ4sBFzIb0gBCHA4ebWD4o6l1fUyvDPxM01K9OIMQTAdQw=="; - }; - }; "jest-message-util-27.5.1" = { name = "jest-message-util"; packageName = "jest-message-util"; @@ -4733,15 +3766,6 @@ let sha512 = "rMyFe1+jnyAAf+NHwTclDz0eAaLkVDdKVHHBFWsBWHnnh5YeJMNWWsv7AbFYXfK3oTqvL7VTWkhNLu1jX24D+g=="; }; }; - "jest-mock-27.5.0" = { - name = "jest-mock"; - packageName = "jest-mock"; - version = "27.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/jest-mock/-/jest-mock-27.5.0.tgz"; - sha512 = "PHluG6MJGng82/sxh8OiB9fnxzNn3cazceSHCAmAKs4g5rMhc3EZCrJXv+4w61rA2WGagMUj7QLLrA1SRlFpzQ=="; - }; - }; "jest-mock-27.5.1" = { name = "jest-mock"; packageName = "jest-mock"; @@ -4760,15 +3784,6 @@ let sha512 = "olV41bKSMm8BdnuMsewT4jqlZ8+3TCARAXjZGT9jcoSnrfUnRCqnMoF9XEeoWjbzObpqF9dRhHQj0Xb9QdF6/w=="; }; }; - "jest-regex-util-27.5.0" = { - name = "jest-regex-util"; - packageName = "jest-regex-util"; - version = "27.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-27.5.0.tgz"; - sha512 = "e9LqSd6HsDsqd7KS3rNyYwmQAaG9jq4U3LbnwVxN/y3nNlDzm2OFs596uo9zrUY+AV1opXq6ome78tRDUCRWfA=="; - }; - }; "jest-regex-util-27.5.1" = { name = "jest-regex-util"; packageName = "jest-regex-util"; @@ -4778,15 +3793,6 @@ let sha512 = "4bfKq2zie+x16okqDXjXn9ql2B0dScQu+vcwe4TvFVhkVyuWLqpZrZtXxLLWoXYgn0E87I6r6GRYHF7wFZBUvg=="; }; }; - "jest-resolve-27.5.0" = { - name = "jest-resolve"; - packageName = "jest-resolve"; - version = "27.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/jest-resolve/-/jest-resolve-27.5.0.tgz"; - sha512 = "PkDpYEGV/nFqThnIrlPtj8oTxyAV3iuuS6or7dZYyUWaHr/tyyVb5qfBmZS6FEr7ozBHgjrF1bgcgIefnlicbw=="; - }; - }; "jest-resolve-27.5.1" = { name = "jest-resolve"; packageName = "jest-resolve"; @@ -4796,15 +3802,6 @@ let sha512 = "FFDy8/9E6CV83IMbDpcjOhumAQPDyETnU2KZ1O98DwTnz8AOBsW/Xv3GySr1mOZdItLR+zDZ7I/UdTFbgSOVCw=="; }; }; - "jest-resolve-dependencies-27.5.0" = { - name = "jest-resolve-dependencies"; - packageName = "jest-resolve-dependencies"; - version = "27.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-27.5.0.tgz"; - sha512 = "xQsy7CmrT4CJxdNUEdzZU2M/v6YmtQ/pkJM+sx7TA1siG1zfsZuo78PZvzglwRMQFr88f3Su4Om8OEBAic+SMw=="; - }; - }; "jest-resolve-dependencies-27.5.1" = { name = "jest-resolve-dependencies"; packageName = "jest-resolve-dependencies"; @@ -4814,15 +3811,6 @@ let sha512 = "QQOOdY4PE39iawDn5rzbIePNigfe5B9Z91GDD1ae/xNDlu9kaat8QQ5EKnNmVWPV54hUdxCVwwj6YMgR2O7IOg=="; }; }; - "jest-runner-27.5.0" = { - name = "jest-runner"; - packageName = "jest-runner"; - version = "27.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/jest-runner/-/jest-runner-27.5.0.tgz"; - sha512 = "RMzXhkJLLOKKgUPY2trpyVBijaFmswMtgoCCBk2PQVRHC6yo1vLd1/jmFP39s5OXXnt7rntuzKSYvxl+QUibqQ=="; - }; - }; "jest-runner-27.5.1" = { name = "jest-runner"; packageName = "jest-runner"; @@ -4832,15 +3820,6 @@ let sha512 = "g4NPsM4mFCOwFKXO4p/H/kWGdJp9V8kURY2lX8Me2drgXqG7rrZAx5kv+5H7wtt/cdFIjhqYx1HrlqWHaOvDaQ=="; }; }; - "jest-runtime-27.5.0" = { - name = "jest-runtime"; - packageName = "jest-runtime"; - version = "27.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/jest-runtime/-/jest-runtime-27.5.0.tgz"; - sha512 = "T7APxCPjN3p3ePcLuypbWtD0UZHyAdvIADZ9ABI/sFZ9t/Rf2xIUd6D7RzZIX+unewJRooVGWrgDIgeUuj0OUA=="; - }; - }; "jest-runtime-27.5.1" = { name = "jest-runtime"; packageName = "jest-runtime"; @@ -4850,15 +3829,6 @@ let sha512 = "o7gxw3Gf+H2IGt8fv0RiyE1+r83FJBRruoA+FXrlHw6xEyBsU8ugA6IPfTdVyA0w8HClpbK+DGJxH59UrNMx8A=="; }; }; - "jest-serializer-27.5.0" = { - name = "jest-serializer"; - packageName = "jest-serializer"; - version = "27.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/jest-serializer/-/jest-serializer-27.5.0.tgz"; - sha512 = "aSDFqQlVXtBH+Zb5dl9mCvTSFkabixk/9P9cpngL4yJKpmEi9USxfDhONFMzJrtftPvZw3PcltUVmtFZTB93rg=="; - }; - }; "jest-serializer-27.5.1" = { name = "jest-serializer"; packageName = "jest-serializer"; @@ -4868,15 +3838,6 @@ let sha512 = "jZCyo6iIxO1aqUxpuBlwTDMkzOAJS4a3eYz3YzgxxVQFwLeSA7Jfq5cbqCY+JLvTDrWirgusI/0KwxKMgrdf7w=="; }; }; - "jest-snapshot-27.5.0" = { - name = "jest-snapshot"; - packageName = "jest-snapshot"; - version = "27.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-27.5.0.tgz"; - sha512 = "cAJj15uqWGkro0bfcv/EgusBnqNgCpRruFQZghsMYTq4Fm2lk/VhAf8DgRr8wvhR6Ue1hkeL8tn70Cw4t8x/5A=="; - }; - }; "jest-snapshot-27.5.1" = { name = "jest-snapshot"; packageName = "jest-snapshot"; @@ -4886,15 +3847,6 @@ let sha512 = "yYykXI5a0I31xX67mgeLw1DZ0bJB+gpq5IpSuCAoyDi0+BhgU/RIrL+RTzDmkNTchvDFWKP8lp+w/42Z3us5sA=="; }; }; - "jest-util-27.5.0" = { - name = "jest-util"; - packageName = "jest-util"; - version = "27.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/jest-util/-/jest-util-27.5.0.tgz"; - sha512 = "FUUqOx0gAzJy3ytatT1Ss372M1kmhczn8x7aE0++11oPGW1FyD/5NjYBI8w1KOXFm6IVjtaZm2szfJJL+CHs0g=="; - }; - }; "jest-util-27.5.1" = { name = "jest-util"; packageName = "jest-util"; @@ -4904,15 +3856,6 @@ let sha512 = "Kv2o/8jNvX1MQ0KGtw480E/w4fBCDOnH6+6DmeKi6LZUIlKA5kwY0YNdlzaWTiVgxqAqik11QyxDOKk543aKXw=="; }; }; - "jest-validate-27.5.0" = { - name = "jest-validate"; - packageName = "jest-validate"; - version = "27.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/jest-validate/-/jest-validate-27.5.0.tgz"; - sha512 = "2XZzQWNrY9Ypo11mm4ZeVjvr++CQG/45XnmA2aWwx155lTwy1JGFI8LpQ2dBCSAeO21ooqg/FCIvv9WwfnPClA=="; - }; - }; "jest-validate-27.5.1" = { name = "jest-validate"; packageName = "jest-validate"; @@ -4922,15 +3865,6 @@ let sha512 = "thkNli0LYTmOI1tDB3FI1S1RTp/Bqyd9pTarJwL87OIBFuqEb5Apv5EaApEudYg4g86e3CT6kM0RowkhtEnCBQ=="; }; }; - "jest-watcher-27.5.0" = { - name = "jest-watcher"; - packageName = "jest-watcher"; - version = "27.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/jest-watcher/-/jest-watcher-27.5.0.tgz"; - sha512 = "MhIeIvEd6dnnspE0OfYrqHOAfZZdyFqx/k8U2nvVFSkLYf22qAFfyNWPVQYcwqKVNobcOhJoT0kV/nRHGbqK8A=="; - }; - }; "jest-watcher-27.5.1" = { name = "jest-watcher"; packageName = "jest-watcher"; @@ -4940,15 +3874,6 @@ let sha512 = "z676SuD6Z8o8qbmEGhoEUFOM1+jfEiL3DXHK/xgEiG2EyNYfFG60jluWcupY6dATjfEsKQuibReS1djInQnoVw=="; }; }; - "jest-worker-27.5.0" = { - name = "jest-worker"; - packageName = "jest-worker"; - version = "27.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/jest-worker/-/jest-worker-27.5.0.tgz"; - sha512 = "8OEHiPNOPTfaWnJ2SUHM8fmgeGq37uuGsQBvGKQJl1f+6WIy6g7G3fE2ruI5294bUKUI9FaCWt5hDvO8HSwsSg=="; - }; - }; "jest-worker-27.5.1" = { name = "jest-worker"; packageName = "jest-worker"; @@ -5057,15 +3982,6 @@ let sha1 = "9db7b59496ad3f3cfef30a75142d2d930ad72651"; }; }; - "json5-2.2.0" = { - name = "json5"; - packageName = "json5"; - version = "2.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/json5/-/json5-2.2.0.tgz"; - sha512 = "f+8cldu7X/y7RAJurMEJmdoKXGB/X550w2Nr3tTbezL6RwEE/iMcm+tZnXeoZtKuOq6ft8+CqzEkrIgx1fPoQA=="; - }; - }; "json5-2.2.1" = { name = "json5"; packageName = "json5"; @@ -5075,15 +3991,6 @@ let sha512 = "1hqLFMSrGHRHxav9q9gNjJ5EXznIxGVO09xQRrwplcS8qs28pZ8s8hupZAmqDwZUmVZ2Qb2jnyPOWcDH8m8dlA=="; }; }; - "jsonc-parser-3.0.0" = { - name = "jsonc-parser"; - packageName = "jsonc-parser"; - version = "3.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/jsonc-parser/-/jsonc-parser-3.0.0.tgz"; - sha512 = "fQzRfAbIBnR0IQvftw9FJveWiHp72Fg20giDrHz6TdfB12UH/uue0D3hm57UB5KgAVuniLMCaS8P1IMj9NR7cA=="; - }; - }; "kleur-3.0.3" = { name = "kleur"; packageName = "kleur"; @@ -5201,24 +4108,6 @@ let sha512 = "Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA=="; }; }; - "lunr-2.3.9" = { - name = "lunr"; - packageName = "lunr"; - version = "2.3.9"; - src = fetchurl { - url = "https://registry.npmjs.org/lunr/-/lunr-2.3.9.tgz"; - sha512 = "zTU3DaZaF3Rt9rhN3uBMGQD3dD2/vFQqnvZCDv4dl5iOzq2IZQqTxu90r4E5J+nP70J3ilqVCrbho2eWaeW8Ow=="; - }; - }; - "make-dir-2.1.0" = { - name = "make-dir"; - packageName = "make-dir"; - version = "2.1.0"; - src = fetchurl { - url = "https://registry.npmjs.org/make-dir/-/make-dir-2.1.0.tgz"; - sha512 = "LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA=="; - }; - }; "make-dir-3.1.0" = { name = "make-dir"; packageName = "make-dir"; @@ -5237,15 +4126,6 @@ let sha512 = "JmqCvUhmt43madlpFzG4BQzG2Z3m6tvQDNKdClZnO3VbIudJYmxsT0FNJMeiB2+JTSlTQTSbU8QdesVmwJcmLg=="; }; }; - "marked-4.0.12" = { - name = "marked"; - packageName = "marked"; - version = "4.0.12"; - src = fetchurl { - url = "https://registry.npmjs.org/marked/-/marked-4.0.12.tgz"; - sha512 = "hgibXWrEDNBWgGiK18j/4lkS6ihTe9sxtV4Q1OQppb/0zzyPSzoFANBa5MfsG/zgsWklmNnhm0XACZOH/0HBiQ=="; - }; - }; "merge-stream-2.0.0" = { name = "merge-stream"; packageName = "merge-stream"; @@ -5264,15 +4144,6 @@ let sha512 = "8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg=="; }; }; - "micromatch-4.0.4" = { - name = "micromatch"; - packageName = "micromatch"; - version = "4.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/micromatch/-/micromatch-4.0.4.tgz"; - sha512 = "pRmzw/XUcwXGpD9aI9q/0XOwLNygjETJ8y0ao0wdqprrzDa4YnxLcz7fQRZr8voh8V10kGhABbNcHVk5wHgWwg=="; - }; - }; "micromatch-4.0.5" = { name = "micromatch"; packageName = "micromatch"; @@ -5291,15 +4162,6 @@ let sha512 = "x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg=="; }; }; - "mime-db-1.51.0" = { - name = "mime-db"; - packageName = "mime-db"; - version = "1.51.0"; - src = fetchurl { - url = "https://registry.npmjs.org/mime-db/-/mime-db-1.51.0.tgz"; - sha512 = "5y8A56jg7XVQx2mbv1lu49NR4dokRnhZYTtL+KGfaa27uq4pSTXkwQkFJl4pkRMyNFz/EtYDSkiiEHx3F7UN6g=="; - }; - }; "mime-db-1.52.0" = { name = "mime-db"; packageName = "mime-db"; @@ -5309,15 +4171,6 @@ let sha512 = "sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg=="; }; }; - "mime-types-2.1.34" = { - name = "mime-types"; - packageName = "mime-types"; - version = "2.1.34"; - src = fetchurl { - url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.34.tgz"; - sha512 = "6cP692WwGIs9XXdOO4++N+7qjqv0rqxxVvJ3VHPh/Sc9mVZcQP+ZGhkKiTvWMQRr2tbHkJP/Yn7Y0npb3ZBs4A=="; - }; - }; "mime-types-2.1.35" = { name = "mime-types"; packageName = "mime-types"; @@ -5345,15 +4198,6 @@ let sha512 = "z0yWI+4FDrrweS8Zmt4Ej5HdJmky15+L2e6Wgn3+iK5fWzb6T3fhNFq2+MeTRb064c6Wr4N/wv0DzQTjNzHNGQ=="; }; }; - "minimatch-3.0.4" = { - name = "minimatch"; - packageName = "minimatch"; - version = "3.0.4"; - src = fetchurl { - url = "https://registry.npmjs.org/minimatch/-/minimatch-3.0.4.tgz"; - sha512 = "yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA=="; - }; - }; "minimatch-3.1.2" = { name = "minimatch"; packageName = "minimatch"; @@ -5363,15 +4207,6 @@ let sha512 = "J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw=="; }; }; - "minimist-1.2.5" = { - name = "minimist"; - packageName = "minimist"; - version = "1.2.5"; - src = fetchurl { - url = "https://registry.npmjs.org/minimist/-/minimist-1.2.5.tgz"; - sha512 = "FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw=="; - }; - }; "minimist-1.2.6" = { name = "minimist"; packageName = "minimist"; @@ -5408,13 +4243,13 @@ let sha512 = "gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A=="; }; }; - "moment-2.29.1" = { + "moment-2.29.3" = { name = "moment"; packageName = "moment"; - version = "2.29.1"; + version = "2.29.3"; src = fetchurl { - url = "https://registry.npmjs.org/moment/-/moment-2.29.1.tgz"; - sha512 = "kHmoybcPV8Sqy59DwNDY3Jefr64lK/by/da0ViFcuA4DH0vQg5Q6Ze5VimxkfQNSC+Mls/Kx53s7TjP1RhFEDQ=="; + url = "https://registry.npmjs.org/moment/-/moment-2.29.3.tgz"; + sha512 = "c6YRvhEo//6T2Jz/vVtYzqBzwvPT95JBQ+smCytzf7c50oMZRsR/a4w88aD34I+/QVSfnoAnSBFPJHItlOMJVw=="; }; }; "mqtt-4.3.7" = { @@ -5498,22 +4333,13 @@ let sha1 = "4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7"; }; }; - "neo-async-2.6.2" = { - name = "neo-async"; - packageName = "neo-async"; - version = "2.6.2"; - src = fetchurl { - url = "https://registry.npmjs.org/neo-async/-/neo-async-2.6.2.tgz"; - sha512 = "Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw=="; - }; - }; - "node-abi-3.8.0" = { + "node-abi-3.15.0" = { name = "node-abi"; packageName = "node-abi"; - version = "3.8.0"; + version = "3.15.0"; src = fetchurl { - url = "https://registry.npmjs.org/node-abi/-/node-abi-3.8.0.tgz"; - sha512 = "tzua9qWWi7iW4I42vUPKM+SfaF0vQSLAm4yO5J83mSwB7GeoWrDKC/K+8YCnYNwqP5duwazbw2X9l4m8SC2cUw=="; + url = "https://registry.npmjs.org/node-abi/-/node-abi-3.15.0.tgz"; + sha512 = "Ic6z/j6I9RLm4ov7npo1I48UQr2BEyFCqh6p7S1dhEx9jPO0GPGq/e2Rb7x7DroQrmiVMz/Bw1vJm9sPAl2nxA=="; }; }; "node-int64-0.4.0" = { @@ -5525,22 +4351,13 @@ let sha1 = "87a9065cdb355d3182d8f94ce11188b825c68a3b"; }; }; - "node-releases-2.0.1" = { - name = "node-releases"; - packageName = "node-releases"; - version = "2.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/node-releases/-/node-releases-2.0.1.tgz"; - sha512 = "CqyzN6z7Q6aMeF/ktcMVTzhAHCEpf8SOarwpzpf8pNBY2k5/oM34UHldUwp8VKI7uxct2HxSRdJjBaZeESzcxA=="; - }; - }; - "node-releases-2.0.2" = { + "node-releases-2.0.3" = { name = "node-releases"; packageName = "node-releases"; - version = "2.0.2"; + version = "2.0.3"; src = fetchurl { - url = "https://registry.npmjs.org/node-releases/-/node-releases-2.0.2.tgz"; - sha512 = "XxYDdcQ6eKqp/YjI+tb2C5WM2LgjnZrfYg4vgQt49EK268b6gYCHsBLrK2qvJo4FmCtqmKezb0WZFK4fkrZNsg=="; + url = "https://registry.npmjs.org/node-releases/-/node-releases-2.0.3.tgz"; + sha512 = "maHFz6OLqYxz+VQyCAtA3PTX4UP/53pa05fyDNc9CwjvJ0yEh6+xBwKsgCxMNhS8taUKBFYxfuiaD9U/55iFaw=="; }; }; "normalize-path-3.0.0" = { @@ -5813,15 +4630,6 @@ let sha512 = "JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA=="; }; }; - "pify-4.0.1" = { - name = "pify"; - packageName = "pify"; - version = "4.0.1"; - src = fetchurl { - url = "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz"; - sha512 = "uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g=="; - }; - }; "pirates-4.0.5" = { name = "pirates"; packageName = "pirates"; @@ -5840,13 +4648,13 @@ let sha512 = "HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ=="; }; }; - "prebuild-install-7.0.1" = { + "prebuild-install-7.1.0" = { name = "prebuild-install"; packageName = "prebuild-install"; - version = "7.0.1"; + version = "7.1.0"; src = fetchurl { - url = "https://registry.npmjs.org/prebuild-install/-/prebuild-install-7.0.1.tgz"; - sha512 = "QBSab31WqkyxpnMWQxubYAHR5S9B2+r81ucocew34Fkl98FhvKIF50jIJnNOBmAZfyNV7vE5T6gd3hTVWgY6tg=="; + url = "https://registry.npmjs.org/prebuild-install/-/prebuild-install-7.1.0.tgz"; + sha512 = "CNcMgI1xBypOyGqjp3wOc8AAo1nMhZS3Cwd3iHIxOdAUbb+YxdNuM4Z5iIrZ8RLvOsf3F3bl7b7xGq6DjQoNYA=="; }; }; "prelude-ls-1.1.2" = { @@ -5867,15 +4675,6 @@ let sha512 = "vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g=="; }; }; - "pretty-format-27.5.0" = { - name = "pretty-format"; - packageName = "pretty-format"; - version = "27.5.0"; - src = fetchurl { - url = "https://registry.npmjs.org/pretty-format/-/pretty-format-27.5.0.tgz"; - sha512 = "xEi6BRPZ+J1AIS4BAtFC/+rh5jXlXObGZjx5+OSpM95vR/PGla78bFVHMy5GdZjP9wk3AHAMHROXq/r69zXltw=="; - }; - }; "pretty-format-27.5.1" = { name = "pretty-format"; packageName = "pretty-format"; @@ -5984,15 +4783,6 @@ let sha512 = "BViHy7LKeTz4oNnkcLJ+lVSL6vpiFeX6/d3oSH8zCW7UxP2onchk+vTGB143xuFjHS3deTgkKoXXymXqymiIdA=="; }; }; - "readdirp-3.6.0" = { - name = "readdirp"; - packageName = "readdirp"; - version = "3.6.0"; - src = fetchurl { - url = "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz"; - sha512 = "hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA=="; - }; - }; "regenerate-1.4.2" = { name = "regenerate"; packageName = "regenerate"; @@ -6020,13 +4810,13 @@ let sha512 = "p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA=="; }; }; - "regenerator-transform-0.14.5" = { + "regenerator-transform-0.15.0" = { name = "regenerator-transform"; packageName = "regenerator-transform"; - version = "0.14.5"; + version = "0.15.0"; src = fetchurl { - url = "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.14.5.tgz"; - sha512 = "eOf6vka5IO151Jfsw2NO9WpGX58W6wWmefK3I1zEGr0lOD0u8rwPaNqQL1aRxUaxLeKO3ArNh3VYg1KbaD+FFw=="; + url = "https://registry.npmjs.org/regenerator-transform/-/regenerator-transform-0.15.0.tgz"; + sha512 = "LsrGtPmbYg19bcPHwdtmXwbW+TqNvtY4riE3P83foeHRroMbH6/2ddFBfab3t7kbzc7v7p4wbkIecHImqt0QNg=="; }; }; "regexpp-3.2.0" = { @@ -6218,15 +5008,6 @@ let sha512 = "5LBh1Tls8c9xgGjw3QrMwETmTMVk0oFgvrFSvWx62llR2hcEInrKNZ2GZCCuuy2lvWrdl5jhbpeqc5hRYKFOcw=="; }; }; - "semver-5.7.1" = { - name = "semver"; - packageName = "semver"; - version = "5.7.1"; - src = fetchurl { - url = "https://registry.npmjs.org/semver/-/semver-5.7.1.tgz"; - sha512 = "sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ=="; - }; - }; "semver-6.3.0" = { name = "semver"; packageName = "semver"; @@ -6245,13 +5026,13 @@ let sha512 = "+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A=="; }; }; - "semver-7.3.5" = { + "semver-7.3.7" = { name = "semver"; packageName = "semver"; - version = "7.3.5"; + version = "7.3.7"; src = fetchurl { - url = "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz"; - sha512 = "PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ=="; + url = "https://registry.npmjs.org/semver/-/semver-7.3.7.tgz"; + sha512 = "QlYTucUYOews+WeEujDoEGziz4K6c47V/Bd+LjSSYcA94p+DmINdf7ncaUinThfvZyu13lN9OY1XDxt8C0Tw0g=="; }; }; "send-0.18.0" = { @@ -6317,15 +5098,6 @@ let sha512 = "7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A=="; }; }; - "shiki-0.10.0" = { - name = "shiki"; - packageName = "shiki"; - version = "0.10.0"; - src = fetchurl { - url = "https://registry.npmjs.org/shiki/-/shiki-0.10.0.tgz"; - sha512 = "iczxaIYeBFHTFrQPb9DVy2SKgYxC4Wo7Iucm7C17cCh2Ge/refnvHscUOxM85u57MfLoNOtjoEFUWt9gBexblA=="; - }; - }; "signal-exit-3.0.7" = { name = "signal-exit"; packageName = "signal-exit"; @@ -6371,15 +5143,6 @@ let sha512 = "bLGGlR1QxBcynn2d5YmDX4MGjlZvy2MRBDRNHLJ8VI6l6+9FUiyTFNJ0IveOSP0bcXgVDPRcfGqA0pjaqUpfVg=="; }; }; - "slash-2.0.0" = { - name = "slash"; - packageName = "slash"; - version = "2.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/slash/-/slash-2.0.0.tgz"; - sha512 = "ZYKh3Wh2z1PpEXWr0MpSBZ0V6mZHAQfYevttO11c51CaWjGTaadiKZ+wVt1PbMlDV5qhMFslpZCemhwOK7C89A=="; - }; - }; "slash-3.0.0" = { name = "slash"; packageName = "slash"; @@ -6893,91 +5656,6 @@ let sha512 = "zdu8XMNEDepKKR+XYOXAVPtWui0ly0NtohUscw+UmaHiAWT8hrV1rr//H6V+0DvJ3OQ19S979M0laLfX8rm82Q=="; }; }; - "typedoc-0.22.11" = { - name = "typedoc"; - packageName = "typedoc"; - version = "0.22.11"; - src = fetchurl { - url = "https://registry.npmjs.org/typedoc/-/typedoc-0.22.11.tgz"; - sha512 = "pVr3hh6dkS3lPPaZz1fNpvcrqLdtEvXmXayN55czlamSgvEjh+57GUqfhAI1Xsuu/hNHUT1KNSx8LH2wBP/7SA=="; - }; - }; - "typedoc-https://registry.npmjs.org/typedoc/-/typedoc-0.22.11.tgz" = { - name = "typedoc"; - packageName = "typedoc"; - version = 1; - src = fetchurl { - name = "typedoc-1.tar.gz"; - url = "https://registry.npmjs.org/typedoc/-/typedoc-0.22.11.tgz"; - sha512 = "pVr3hh6dkS3lPPaZz1fNpvcrqLdtEvXmXayN55czlamSgvEjh+57GUqfhAI1Xsuu/hNHUT1KNSx8LH2wBP/7SA=="; - }; - }; - "typedoc-plugin-markdown-3.11.13" = { - name = "typedoc-plugin-markdown"; - packageName = "typedoc-plugin-markdown"; - version = "3.11.13"; - src = fetchurl { - url = "https://registry.npmjs.org/typedoc-plugin-markdown/-/typedoc-plugin-markdown-3.11.13.tgz"; - sha512 = "9Y7eWWmUF5i8LMfetPlOP+kTn5L3Q71fm/AUHZhxWYoAiugbybQujhjQk4h09uY2WghPP2BldOivtTxnOwj85A=="; - }; - }; - "typedoc-plugin-markdown-https://registry.npmjs.org/typedoc-plugin-markdown/-/typedoc-plugin-markdown-3.11.13.tgz" = { - name = "typedoc-plugin-markdown"; - packageName = "typedoc-plugin-markdown"; - version = 1; - src = fetchurl { - name = "typedoc-plugin-markdown-1.tar.gz"; - url = "https://registry.npmjs.org/typedoc-plugin-markdown/-/typedoc-plugin-markdown-3.11.13.tgz"; - sha512 = "9Y7eWWmUF5i8LMfetPlOP+kTn5L3Q71fm/AUHZhxWYoAiugbybQujhjQk4h09uY2WghPP2BldOivtTxnOwj85A=="; - }; - }; - "typedoc-plugin-no-inherit-1.3.1" = { - name = "typedoc-plugin-no-inherit"; - packageName = "typedoc-plugin-no-inherit"; - version = "1.3.1"; - src = fetchurl { - url = "https://registry.npmjs.org/typedoc-plugin-no-inherit/-/typedoc-plugin-no-inherit-1.3.1.tgz"; - sha512 = "3fdPHRaIcCVV1W5gJYpZTdZL+F2VZTlUMd3Hw9xIv931ILh18CcD8IfxZtTtOijJRuKbgRLJ+J/+hVlgCbq1RQ=="; - }; - }; - "typedoc-plugin-no-inherit-https://registry.npmjs.org/typedoc-plugin-no-inherit/-/typedoc-plugin-no-inherit-1.3.1.tgz" = { - name = "typedoc-plugin-no-inherit"; - packageName = "typedoc-plugin-no-inherit"; - version = 1; - src = fetchurl { - name = "typedoc-plugin-no-inherit-1.tar.gz"; - url = "https://registry.npmjs.org/typedoc-plugin-no-inherit/-/typedoc-plugin-no-inherit-1.3.1.tgz"; - sha512 = "3fdPHRaIcCVV1W5gJYpZTdZL+F2VZTlUMd3Hw9xIv931ILh18CcD8IfxZtTtOijJRuKbgRLJ+J/+hVlgCbq1RQ=="; - }; - }; - "typedoc-plugin-sourcefile-url-1.0.6" = { - name = "typedoc-plugin-sourcefile-url"; - packageName = "typedoc-plugin-sourcefile-url"; - version = "1.0.6"; - src = fetchurl { - url = "https://registry.npmjs.org/typedoc-plugin-sourcefile-url/-/typedoc-plugin-sourcefile-url-1.0.6.tgz"; - sha512 = "xHq9DzkoQywS7FyPneMm2/Hr9GRoCpjSQXkVN0W6SCJKP7fguqg2tasgh+8l5/mW6YSYvqCqEbkSYLbuD4Y6gA=="; - }; - }; - "typedoc-plugin-sourcefile-url-https://registry.npmjs.org/typedoc-plugin-sourcefile-url/-/typedoc-plugin-sourcefile-url-1.0.6.tgz" = { - name = "typedoc-plugin-sourcefile-url"; - packageName = "typedoc-plugin-sourcefile-url"; - version = 1; - src = fetchurl { - name = "typedoc-plugin-sourcefile-url-1.tar.gz"; - url = "https://registry.npmjs.org/typedoc-plugin-sourcefile-url/-/typedoc-plugin-sourcefile-url-1.0.6.tgz"; - sha512 = "xHq9DzkoQywS7FyPneMm2/Hr9GRoCpjSQXkVN0W6SCJKP7fguqg2tasgh+8l5/mW6YSYvqCqEbkSYLbuD4Y6gA=="; - }; - }; - "typescript-4.5.5" = { - name = "typescript"; - packageName = "typescript"; - version = "4.5.5"; - src = fetchurl { - url = "https://registry.npmjs.org/typescript/-/typescript-4.5.5.tgz"; - sha512 = "TCTIul70LyWe6IJWT8QSYeA54WQe8EjQFU4wY52Fasj5UKx88LNYKCgBEHcOMOrFF1rKGbD8v/xcNWVUq9SymA=="; - }; - }; "typescript-4.6.3" = { name = "typescript"; packageName = "typescript"; @@ -6987,25 +5665,6 @@ let sha512 = "yNIatDa5iaofVozS/uQJEl3JRWLKKGJKh6Yaiv0GLGSuhpFJe7P3SbHZ8/yjAHRQwKRoA6YZqlfjXWmVzoVSMw=="; }; }; - "typescript-https://registry.npmjs.org/typescript/-/typescript-4.5.5.tgz" = { - name = "typescript"; - packageName = "typescript"; - version = 1; - src = fetchurl { - name = "typescript-1.tar.gz"; - url = "https://registry.npmjs.org/typescript/-/typescript-4.5.5.tgz"; - sha512 = "TCTIul70LyWe6IJWT8QSYeA54WQe8EjQFU4wY52Fasj5UKx88LNYKCgBEHcOMOrFF1rKGbD8v/xcNWVUq9SymA=="; - }; - }; - "uglify-js-3.15.0" = { - name = "uglify-js"; - packageName = "uglify-js"; - version = "3.15.0"; - src = fetchurl { - 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" = { name = "unicode-canonical-property-names-ecmascript"; packageName = "unicode-canonical-property-names-ecmascript"; @@ -7105,24 +5764,6 @@ let sha512 = "FGtKtv3xIpR6BYhvgH8MI/y78oT7d8Au3ww4QIxymrCtZEh5b8gCw2siywE+puhEmuWKDtmfrvF5UlB298ut3w=="; }; }; - "vscode-oniguruma-1.6.1" = { - name = "vscode-oniguruma"; - packageName = "vscode-oniguruma"; - version = "1.6.1"; - src = fetchurl { - url = "https://registry.npmjs.org/vscode-oniguruma/-/vscode-oniguruma-1.6.1.tgz"; - sha512 = "vc4WhSIaVpgJ0jJIejjYxPvURJavX6QG41vu0mGhqywMkQqulezEqEQ3cO3gc8GvcOpX6ycmKGqRoROEMBNXTQ=="; - }; - }; - "vscode-textmate-5.2.0" = { - name = "vscode-textmate"; - packageName = "vscode-textmate"; - version = "5.2.0"; - src = fetchurl { - url = "https://registry.npmjs.org/vscode-textmate/-/vscode-textmate-5.2.0.tgz"; - sha512 = "Uw5ooOQxRASHgu6C7GVvUxisKXfSgW4oFlO+aa+PAkgmH89O3CXxEEzNRNtHSqtXFTl0nAC1uYj0GMSH27uwtQ=="; - }; - }; "w3c-hr-time-1.0.2" = { name = "w3c-hr-time"; packageName = "w3c-hr-time"; @@ -7213,13 +5854,13 @@ let sha512 = "eDMORYaPNZ4sQIuuYPDHdQvf4gyCF9rEEV/yPxGfwPkRodwEgiMUUXTx/dex+Me0wxx53S+NgUHaP7y3MGlDmg=="; }; }; - "winston-3.6.0" = { + "winston-3.7.2" = { name = "winston"; packageName = "winston"; - version = "3.6.0"; + version = "3.7.2"; src = fetchurl { - url = "https://registry.npmjs.org/winston/-/winston-3.6.0.tgz"; - sha512 = "9j8T75p+bcN6D00sF/zjFVmPp+t8KMPB1MzbbzYjeN9VWxdsYnTB40TkbNUEXAmILEfChMvAMgidlX64OG3p6w=="; + url = "https://registry.npmjs.org/winston/-/winston-3.7.2.tgz"; + sha512 = "QziIqtojHBoyzUOdQvQiar1DH0Xp9nF1A1y7NVy2DGEsz82SBDtOalS0ulTRGVT14xPX3WRWkCsdcJKqNflKng=="; }; }; "winston-syslog-2.5.0" = { @@ -7249,15 +5890,6 @@ let sha512 = "Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ=="; }; }; - "wordwrap-1.0.0" = { - name = "wordwrap"; - packageName = "wordwrap"; - version = "1.0.0"; - src = fetchurl { - url = "https://registry.npmjs.org/wordwrap/-/wordwrap-1.0.0.tgz"; - sha1 = "27584810891456a4171c8d0226441ade90cbcaeb"; - }; - }; "wrap-ansi-7.0.0" = { name = "wrap-ansi"; packageName = "wrap-ansi"; @@ -7285,15 +5917,6 @@ let sha512 = "AvHcyZ5JnSfq3ioSyjrBkH9yW4m7Ayk8/9My/DD9onKeu/94fwrMocemO2QAJFAlnnDN+ZDS+ZjAR5ua1/PV/Q=="; }; }; - "ws-7.5.6" = { - name = "ws"; - packageName = "ws"; - version = "7.5.6"; - src = fetchurl { - url = "https://registry.npmjs.org/ws/-/ws-7.5.6.tgz"; - sha512 = "6GLgCqo2cy2A2rjCNFlxQS6ZljG/coZfZXclldI8FB/1G3CCI36Zd8xy2HrFVACi8tfk5XrgLQEk+P0Tnz9UcA=="; - }; - }; "ws-7.5.7" = { name = "ws"; packageName = "ws"; @@ -7375,55 +5998,49 @@ let sha512 = "y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w=="; }; }; - "zigbee-herdsman-0.14.20" = { + "zigbee-herdsman-0.14.27" = { name = "zigbee-herdsman"; packageName = "zigbee-herdsman"; - version = "0.14.20"; + version = "0.14.27"; src = fetchurl { - url = "https://registry.npmjs.org/zigbee-herdsman/-/zigbee-herdsman-0.14.20.tgz"; - sha512 = "YwvAHEfWtcCLilnoHcIpZ9DCPHSLwpy2iboC2zjJUGNQp0vUClJhjAxb6JdTnaHxrNB2FN6+b3Q6BS8QiTtg5g=="; + url = "https://registry.npmjs.org/zigbee-herdsman/-/zigbee-herdsman-0.14.27.tgz"; + sha512 = "B7Ofk4GPMwFMZS4KBvUu9IW3C7h5+9Ly6O6M2cXTeMdL2fiyZB3Tpzs7fGscevSbCpnkEOSI4xpK+MeVMwH/Og=="; }; }; - "zigbee-herdsman-converters-14.0.467" = { + "zigbee-herdsman-converters-14.0.504" = { name = "zigbee-herdsman-converters"; packageName = "zigbee-herdsman-converters"; - version = "14.0.467"; + version = "14.0.504"; src = fetchurl { - url = "https://registry.npmjs.org/zigbee-herdsman-converters/-/zigbee-herdsman-converters-14.0.467.tgz"; - sha512 = "fkOSFkKj/4q/nh2elXHcTHTvPte54Y4hrXq/BZpnkMgNuLr2lkJgZ52ChG5XyI/4wHtAJq8lgnjGubqr8xNNMQ=="; + url = "https://registry.npmjs.org/zigbee-herdsman-converters/-/zigbee-herdsman-converters-14.0.504.tgz"; + sha512 = "StMDWFt4DBhrgMvapiOqzurMBW02bIbjS1ul8EaiNBYA91cg9qUrTSmJssuZKEPTXs1I8yS7X2OGS8Kzja4z4Q=="; }; }; - "zigbee2mqtt-frontend-0.6.80" = { + "zigbee2mqtt-frontend-0.6.83" = { name = "zigbee2mqtt-frontend"; packageName = "zigbee2mqtt-frontend"; - version = "0.6.80"; + version = "0.6.83"; src = fetchurl { - url = "https://registry.npmjs.org/zigbee2mqtt-frontend/-/zigbee2mqtt-frontend-0.6.80.tgz"; - sha512 = "mDRQ35j5SuTKCsn7NvjNng7x0OK0Hv9sqxMnl0ISfoNEAD5RDpvzDiEBS6XGoymTI+PRNmaNdbczC5/DVqo5xQ=="; + url = "https://registry.npmjs.org/zigbee2mqtt-frontend/-/zigbee2mqtt-frontend-0.6.83.tgz"; + sha512 = "I44236qdpo/dSVpKyVV54RTCmb6BNpLXpZ414DOIBXXqIhseZhQEx7WC8UZ/ZtxxORBAd8E9LCYp5eWOb+zoNQ=="; }; }; }; args = { name = "zigbee2mqtt"; packageName = "zigbee2mqtt"; - version = "1.25.0"; + version = "1.25.1"; src = ./.; dependencies = [ sources."@ampproject/remapping-2.1.2" sources."@babel/code-frame-7.16.7" sources."@babel/compat-data-7.17.7" - (sources."@babel/core-7.17.8" // { + (sources."@babel/core-7.17.9" // { dependencies = [ - sources."debug-4.3.4" - sources."ms-2.1.2" sources."semver-6.3.0" ]; }) - (sources."@babel/generator-7.17.7" // { - dependencies = [ - sources."source-map-0.5.7" - ]; - }) + sources."@babel/generator-7.17.9" 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.17.7" // { @@ -7431,19 +6048,16 @@ let sources."semver-6.3.0" ]; }) - sources."@babel/helper-create-class-features-plugin-7.17.6" + sources."@babel/helper-create-class-features-plugin-7.17.9" sources."@babel/helper-create-regexp-features-plugin-7.17.0" (sources."@babel/helper-define-polyfill-provider-0.3.1" // { dependencies = [ - sources."debug-4.3.4" - sources."ms-2.1.2" sources."semver-6.3.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-function-name-7.17.9" sources."@babel/helper-hoist-variables-7.16.7" sources."@babel/helper-member-expression-to-functions-7.17.7" sources."@babel/helper-module-imports-7.16.7" @@ -7458,15 +6072,15 @@ let 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.17.8" - sources."@babel/highlight-7.16.10" - sources."@babel/parser-7.17.8" + sources."@babel/helpers-7.17.9" + sources."@babel/highlight-7.17.9" + sources."@babel/parser-7.17.9" 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.17.6" - sources."@babel/plugin-proposal-decorators-7.17.8" + sources."@babel/plugin-proposal-decorators-7.17.9" 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" @@ -7512,7 +6126,7 @@ let 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.17.7" + sources."@babel/plugin-transform-modules-commonjs-7.17.9" sources."@babel/plugin-transform-modules-systemjs-7.17.8" sources."@babel/plugin-transform-modules-umd-7.16.7" sources."@babel/plugin-transform-named-capturing-groups-regex-7.16.8" @@ -7520,7 +6134,7 @@ let 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-regenerator-7.17.9" 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" @@ -7537,33 +6151,22 @@ let }) sources."@babel/preset-modules-0.1.5" sources."@babel/preset-typescript-7.16.7" - sources."@babel/runtime-7.17.8" + sources."@babel/runtime-7.17.9" sources."@babel/template-7.16.7" - (sources."@babel/traverse-7.17.3" // { - dependencies = [ - sources."debug-4.3.4" - sources."ms-2.1.2" - ]; - }) + sources."@babel/traverse-7.17.9" sources."@babel/types-7.17.0" sources."@bcoe/v8-coverage-0.2.3" sources."@colors/colors-1.5.0" sources."@dabh/diagnostics-2.0.3" - (sources."@eslint/eslintrc-1.2.1" // { + (sources."@eslint/eslintrc-1.2.2" // { dependencies = [ sources."ajv-6.12.6" - sources."debug-4.3.4" sources."globals-13.13.0" sources."json-schema-traverse-0.4.1" - sources."ms-2.1.2" - ]; - }) - (sources."@humanwhocodes/config-array-0.9.5" // { - dependencies = [ - sources."debug-4.3.4" - sources."ms-2.1.2" + sources."type-fest-0.20.2" ]; }) + sources."@humanwhocodes/config-array-0.9.5" sources."@humanwhocodes/object-schema-1.2.1" (sources."@istanbuljs/load-nyc-config-1.1.0" // { dependencies = [ @@ -7602,10 +6205,15 @@ let sources."color-convert-2.0.1" sources."color-name-1.1.4" sources."has-flag-4.0.0" + sources."source-map-0.6.1" sources."supports-color-7.2.0" ]; }) - sources."@jest/source-map-27.5.1" + (sources."@jest/source-map-27.5.1" // { + dependencies = [ + sources."source-map-0.6.1" + ]; + }) sources."@jest/test-result-27.5.1" sources."@jest/test-sequencer-27.5.1" (sources."@jest/transform-27.5.1" // { @@ -7615,6 +6223,7 @@ let sources."color-convert-2.0.1" sources."color-name-1.1.4" sources."has-flag-4.0.0" + sources."source-map-0.6.1" sources."supports-color-7.2.0" ]; }) @@ -7628,19 +6237,30 @@ let sources."supports-color-7.2.0" ]; }) - sources."@jridgewell/resolve-uri-3.0.5" + sources."@jridgewell/resolve-uri-3.0.6" sources."@jridgewell/sourcemap-codec-1.4.11" - sources."@jridgewell/trace-mapping-0.3.4" + sources."@jridgewell/trace-mapping-0.3.9" sources."@nodelib/fs.scandir-2.1.5" sources."@nodelib/fs.stat-2.0.5" sources."@nodelib/fs.walk-1.2.8" + sources."@serialport/binding-abstract-9.2.3" + sources."@serialport/binding-mock-9.2.4" + sources."@serialport/bindings-9.2.8" + sources."@serialport/parser-byte-length-9.2.4" + sources."@serialport/parser-cctalk-9.2.4" + sources."@serialport/parser-delimiter-9.2.4" + sources."@serialport/parser-inter-byte-timeout-9.2.4" + sources."@serialport/parser-readline-9.2.4" + sources."@serialport/parser-ready-9.2.4" + sources."@serialport/parser-regex-9.2.4" + sources."@serialport/stream-9.2.4" 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.19" sources."@types/babel__generator-7.6.4" sources."@types/babel__template-7.4.1" - sources."@types/babel__traverse-7.14.2" + sources."@types/babel__traverse-7.17.0" sources."@types/debounce-1.2.1" sources."@types/finalhandler-1.1.1" sources."@types/glob-7.2.0" @@ -7653,43 +6273,23 @@ let sources."@types/js-yaml-4.0.5" sources."@types/json-schema-7.0.11" sources."@types/minimatch-3.0.5" - sources."@types/node-17.0.23" + sources."@types/node-17.0.25" sources."@types/object-assign-deep-0.4.0" - sources."@types/prettier-2.4.4" + sources."@types/prettier-2.6.0" sources."@types/rimraf-3.0.2" sources."@types/stack-utils-2.0.1" sources."@types/ws-8.5.3" sources."@types/yargs-16.0.4" sources."@types/yargs-parser-21.0.0" - (sources."@typescript-eslint/eslint-plugin-5.16.0" // { - dependencies = [ - sources."debug-4.3.4" - sources."ms-2.1.2" - ]; - }) - (sources."@typescript-eslint/parser-5.16.0" // { - dependencies = [ - sources."debug-4.3.4" - sources."ms-2.1.2" - ]; - }) - sources."@typescript-eslint/scope-manager-5.16.0" - (sources."@typescript-eslint/type-utils-5.16.0" // { - dependencies = [ - sources."debug-4.3.4" - sources."ms-2.1.2" - ]; - }) - sources."@typescript-eslint/types-5.16.0" - (sources."@typescript-eslint/typescript-estree-5.16.0" // { - dependencies = [ - sources."debug-4.3.4" - sources."ms-2.1.2" - ]; - }) - sources."@typescript-eslint/utils-5.16.0" - sources."@typescript-eslint/visitor-keys-5.16.0" - sources."abab-2.0.5" + sources."@typescript-eslint/eslint-plugin-5.20.0" + sources."@typescript-eslint/parser-5.20.0" + sources."@typescript-eslint/scope-manager-5.20.0" + sources."@typescript-eslint/type-utils-5.20.0" + sources."@typescript-eslint/types-5.20.0" + sources."@typescript-eslint/typescript-estree-5.20.0" + sources."@typescript-eslint/utils-5.20.0" + sources."@typescript-eslint/visitor-keys-5.20.0" + sources."abab-2.0.6" sources."acorn-8.7.0" (sources."acorn-globals-6.0.0" // { dependencies = [ @@ -7698,25 +6298,29 @@ let }) sources."acorn-jsx-5.3.2" sources."acorn-walk-7.2.0" - (sources."agent-base-6.0.2" // { - dependencies = [ - sources."debug-4.3.4" - sources."ms-2.1.2" - ]; - }) + sources."agent-base-6.0.2" sources."ajv-8.11.0" - (sources."ansi-escapes-4.3.2" // { - dependencies = [ - sources."type-fest-0.21.3" - ]; - }) + sources."ansi-escapes-4.3.2" sources."ansi-regex-5.0.1" sources."ansi-styles-3.2.1" + sources."any-promise-1.3.0" sources."anymatch-3.1.2" + sources."aproba-1.2.0" + (sources."are-we-there-yet-1.1.7" // { + dependencies = [ + sources."readable-stream-2.3.7" + sources."string_decoder-1.1.1" + ]; + }) sources."argparse-2.0.1" sources."array-union-2.1.0" sources."async-3.2.3" sources."asynckit-0.4.0" + (sources."axios-0.27.2" // { + dependencies = [ + sources."form-data-4.0.0" + ]; + }) (sources."babel-jest-27.5.1" // { dependencies = [ sources."ansi-styles-4.3.0" @@ -7750,40 +6354,50 @@ let sources."browserslist-4.20.2" sources."bser-2.1.1" sources."buffer-5.7.1" + sources."buffer-crc32-0.2.13" sources."buffer-from-1.1.2" sources."call-bind-1.0.2" sources."callsites-3.1.0" sources."camelcase-5.3.1" - sources."caniuse-lite-1.0.30001320" + sources."caniuse-lite-1.0.30001332" sources."chalk-2.4.2" sources."char-regex-1.0.2" sources."charcodes-0.2.0" + sources."chownr-1.1.4" sources."ci-info-3.3.0" sources."cjs-module-lexer-1.2.2" sources."cliui-7.0.4" sources."co-4.6.0" + sources."code-point-at-1.1.0" sources."collect-v8-coverage-1.0.1" sources."color-3.2.1" sources."color-convert-1.9.3" sources."color-name-1.1.3" - sources."color-string-1.9.0" + sources."color-string-1.9.1" sources."colorspace-1.1.4" sources."combined-stream-1.0.8" - sources."commist-1.1.0" + (sources."commist-1.1.0" // { + dependencies = [ + sources."leven-2.1.0" + ]; + }) sources."concat-map-0.0.1" sources."concat-stream-2.0.0" - sources."connect-gzip-static-2.1.1" - (sources."convert-source-map-1.8.0" // { + (sources."connect-gzip-static-2.1.1" // { dependencies = [ - sources."safe-buffer-5.1.2" + sources."debug-2.6.9" + sources."ms-2.0.0" ]; }) - sources."core-js-3.21.1" - (sources."core-js-compat-3.21.1" // { + sources."console-control-strings-1.1.0" + sources."convert-source-map-1.8.0" + sources."core-js-3.22.2" + (sources."core-js-compat-3.22.2" // { dependencies = [ sources."semver-7.0.0" ]; }) + sources."core-util-is-1.0.3" sources."cross-spawn-7.0.3" sources."cssom-0.4.4" (sources."cssstyle-2.3.0" // { @@ -7793,16 +6407,20 @@ let }) sources."data-urls-2.0.0" sources."debounce-1.2.1" - sources."debug-2.6.9" + sources."debug-4.3.4" sources."decimal.js-10.3.1" + sources."decompress-response-6.0.0" sources."dedent-0.7.0" + sources."deep-extend-0.6.0" sources."deep-is-0.1.4" sources."deep-object-diff-1.1.7" sources."deepmerge-4.2.2" - sources."define-properties-1.1.3" + sources."define-properties-1.1.4" sources."delayed-stream-1.0.0" + sources."delegates-1.0.0" sources."depd-2.0.0" sources."destroy-1.2.0" + sources."detect-libc-2.0.1" sources."detect-newline-3.1.0" sources."diff-sequences-27.5.1" sources."dir-glob-3.0.1" @@ -7814,17 +6432,13 @@ let }) sources."duplexify-4.1.2" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.4.95" + sources."electron-to-chromium-1.4.118" 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."error-ex-1.3.2" // { - dependencies = [ - sources."is-arrayish-0.2.1" - ]; - }) + sources."error-ex-1.3.2" sources."escalade-3.1.1" sources."escape-html-1.0.3" sources."escape-string-regexp-1.0.5" @@ -7834,30 +6448,29 @@ let sources."levn-0.3.0" sources."optionator-0.8.3" sources."prelude-ls-1.1.2" + sources."source-map-0.6.1" sources."type-check-0.3.2" ]; }) - (sources."eslint-8.12.0" // { + (sources."eslint-8.14.0" // { dependencies = [ sources."ajv-6.12.6" sources."ansi-styles-4.3.0" sources."chalk-4.1.2" sources."color-convert-2.0.1" sources."color-name-1.1.4" - sources."debug-4.3.4" sources."escape-string-regexp-4.0.0" sources."eslint-scope-7.1.1" sources."estraverse-5.3.0" - sources."glob-parent-6.0.2" sources."globals-13.13.0" sources."has-flag-4.0.0" sources."json-schema-traverse-0.4.1" - sources."ms-2.1.2" sources."supports-color-7.2.0" + sources."type-fest-0.20.2" ]; }) sources."eslint-config-google-0.14.0" - sources."eslint-plugin-jest-26.1.3" + sources."eslint-plugin-jest-26.1.5" sources."eslint-scope-5.1.1" (sources."eslint-utils-3.0.0" // { dependencies = [ @@ -7882,60 +6495,73 @@ let sources."etag-1.8.1" sources."execa-5.1.1" sources."exit-0.1.2" + sources."expand-template-2.0.3" sources."expect-27.5.1" sources."fast-deep-equal-3.1.3" - sources."fast-glob-3.2.11" + (sources."fast-glob-3.2.11" // { + dependencies = [ + sources."glob-parent-5.1.2" + ]; + }) sources."fast-json-stable-stringify-2.1.0" sources."fast-levenshtein-2.0.6" sources."fastq-1.13.0" sources."fb-watchman-2.0.1" - sources."fecha-4.2.1" + sources."fecha-4.2.3" sources."file-entry-cache-6.0.1" sources."file-uri-to-path-1.0.0" sources."fill-range-7.0.1" - sources."finalhandler-1.2.0" + (sources."finalhandler-1.2.0" // { + dependencies = [ + sources."debug-2.6.9" + sources."ms-2.0.0" + ]; + }) sources."find-0.3.0" sources."find-up-4.1.0" sources."flat-cache-3.0.4" sources."flatted-3.2.5" sources."fn.name-1.1.0" + sources."follow-redirects-1.14.9" sources."form-data-3.0.1" sources."fresh-0.5.2" + sources."fs-constants-1.0.0" sources."fs.realpath-1.0.0" sources."fsevents-2.3.2" sources."function-bind-1.1.1" sources."functional-red-black-tree-1.0.1" + (sources."gauge-2.7.4" // { + dependencies = [ + sources."ansi-regex-2.1.1" + sources."is-fullwidth-code-point-1.0.0" + sources."string-width-1.0.2" + sources."strip-ansi-3.0.1" + ]; + }) sources."gensync-1.0.0-beta.2" sources."get-caller-file-2.0.5" sources."get-intrinsic-1.1.1" sources."get-package-type-0.1.0" sources."get-stream-6.0.1" sources."git-last-commit-1.0.1" + sources."github-from-package-0.0.0" sources."glob-7.2.0" - sources."glob-parent-5.1.2" + sources."glob-parent-6.0.2" sources."globals-11.12.0" sources."globby-11.1.0" sources."glossy-0.1.7" - sources."graceful-fs-4.2.9" + sources."graceful-fs-4.2.10" sources."has-1.0.3" sources."has-flag-3.0.0" + sources."has-property-descriptors-1.0.0" sources."has-symbols-1.0.3" + sources."has-unicode-2.0.1" sources."help-me-3.0.0" sources."html-encoding-sniffer-2.0.1" sources."html-escaper-2.0.2" sources."http-errors-2.0.0" - (sources."http-proxy-agent-4.0.1" // { - dependencies = [ - sources."debug-4.3.4" - sources."ms-2.1.2" - ]; - }) - (sources."https-proxy-agent-5.0.0" // { - dependencies = [ - sources."debug-4.3.4" - sources."ms-2.1.2" - ]; - }) + sources."http-proxy-agent-4.0.1" + sources."https-proxy-agent-5.0.1" sources."human-signals-2.1.0" sources."humanize-duration-3.27.1" sources."iconv-lite-0.4.24" @@ -7950,8 +6576,9 @@ let 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.1" + sources."ini-1.3.8" + sources."is-arrayish-0.2.1" + sources."is-core-module-2.9.0" sources."is-extglob-2.1.1" sources."is-fullwidth-code-point-3.0.0" sources."is-generator-fn-2.1.0" @@ -7960,9 +6587,10 @@ let sources."is-potential-custom-element-name-1.0.1" sources."is-stream-2.0.1" sources."is-typedarray-1.0.0" + sources."isarray-1.0.0" sources."isexe-2.0.0" sources."istanbul-lib-coverage-3.2.0" - (sources."istanbul-lib-instrument-5.1.0" // { + (sources."istanbul-lib-instrument-5.2.0" // { dependencies = [ sources."semver-6.3.0" ]; @@ -7975,24 +6603,23 @@ let }) (sources."istanbul-lib-source-maps-4.0.1" // { dependencies = [ - sources."debug-4.3.4" - sources."ms-2.1.2" + sources."source-map-0.6.1" ]; }) sources."istanbul-reports-3.1.4" - (sources."jest-27.5.1" // { + sources."jest-27.5.1" + sources."jest-changed-files-27.5.1" + (sources."jest-circus-27.5.1" // { 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.5.1" sources."supports-color-7.2.0" ]; }) - sources."jest-changed-files-27.5.1" - (sources."jest-circus-27.5.1" // { + (sources."jest-cli-27.5.1" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.2" @@ -8131,7 +6758,6 @@ let sources."color-convert-2.0.1" sources."color-name-1.1.4" sources."has-flag-4.0.0" - sources."leven-3.1.0" sources."supports-color-7.2.0" ]; }) @@ -8166,18 +6792,14 @@ let sources."json5-2.2.1" sources."kleur-3.0.3" sources."kuler-2.0.0" - sources."leven-2.1.0" + sources."leven-3.1.0" sources."levn-0.4.1" sources."lines-and-columns-1.2.4" sources."locate-path-5.0.0" sources."lodash-4.17.21" sources."lodash.debounce-4.0.8" sources."lodash.merge-4.6.2" - (sources."logform-2.4.0" // { - dependencies = [ - sources."ms-2.1.3" - ]; - }) + sources."logform-2.4.0" sources."lru-cache-6.0.0" (sources."make-dir-3.1.0" // { dependencies = [ @@ -8192,37 +6814,34 @@ let sources."mime-db-1.52.0" sources."mime-types-2.1.35" sources."mimic-fn-2.1.0" + sources."mimic-response-3.1.0" sources."minimatch-3.1.2" sources."minimist-1.2.6" + sources."mixin-deep-2.0.1" sources."mkdir-recursive-0.4.0" - sources."moment-2.29.1" + sources."mkdirp-classic-0.5.3" + sources."moment-2.29.3" (sources."mqtt-4.3.7" // { dependencies = [ - sources."debug-4.3.4" - sources."ms-2.1.2" sources."ws-7.5.7" ]; }) - (sources."mqtt-packet-6.10.0" // { - dependencies = [ - sources."debug-4.3.4" - sources."ms-2.1.2" - ]; - }) - sources."ms-2.0.0" + sources."mqtt-packet-6.10.0" + sources."ms-2.1.2" + sources."mz-2.7.0" sources."nan-2.15.0" + sources."napi-build-utils-1.0.2" sources."natural-compare-1.4.0" + sources."node-abi-3.15.0" sources."node-int64-0.4.0" - sources."node-releases-2.0.2" + sources."node-releases-2.0.3" sources."normalize-path-3.0.0" sources."npm-run-path-4.0.1" - (sources."number-allocator-1.0.10" // { - dependencies = [ - sources."debug-4.3.4" - sources."ms-2.1.2" - ]; - }) + sources."npmlog-4.1.2" + sources."number-allocator-1.0.10" + sources."number-is-nan-1.0.1" sources."nwsapi-2.2.0" + sources."object-assign-4.1.1" sources."object-assign-deep-0.4.0" sources."object-keys-1.1.1" sources."object.assign-4.1.2" @@ -8247,6 +6866,7 @@ let sources."picomatch-2.3.1" sources."pirates-4.0.5" sources."pkg-dir-4.2.0" + sources."prebuild-install-7.1.0" sources."prelude-ls-1.2.1" (sources."pretty-format-27.5.1" // { dependencies = [ @@ -8260,12 +6880,17 @@ let sources."punycode-2.1.1" sources."queue-microtask-1.2.3" sources."range-parser-1.2.1" + (sources."rc-1.2.8" // { + dependencies = [ + sources."strip-json-comments-2.0.1" + ]; + }) sources."react-is-17.0.2" sources."readable-stream-3.6.0" sources."regenerate-1.4.2" sources."regenerate-unicode-properties-10.0.1" sources."regenerator-runtime-0.13.9" - sources."regenerator-transform-0.14.5" + sources."regenerator-transform-0.15.0" sources."regexpp-3.2.0" sources."regexpu-core-5.0.1" sources."regjsgen-0.6.0" @@ -8285,26 +6910,44 @@ let sources."rfdc-1.3.0" sources."rimraf-3.0.2" sources."run-parallel-1.2.0" - sources."safe-buffer-5.2.1" + sources."safe-buffer-5.1.2" sources."safe-stable-stringify-2.3.1" sources."safer-buffer-2.1.2" sources."saxes-5.0.1" - sources."semver-7.3.5" + sources."semver-7.3.7" (sources."send-0.18.0" // { dependencies = [ + (sources."debug-2.6.9" // { + dependencies = [ + sources."ms-2.0.0" + ]; + }) sources."ms-2.1.3" ]; }) + sources."serialport-9.2.8" sources."serve-static-1.15.0" + sources."set-blocking-2.0.0" sources."setprototypeof-1.2.0" sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" sources."signal-exit-3.0.7" - sources."simple-swizzle-0.2.2" + sources."simple-concat-1.0.1" + sources."simple-get-4.0.1" + (sources."simple-swizzle-0.2.2" // { + dependencies = [ + sources."is-arrayish-0.3.2" + ]; + }) sources."sisteransi-1.0.5" sources."slash-3.0.0" - sources."source-map-0.6.1" - sources."source-map-support-0.5.21" + sources."slip-1.0.2" + sources."source-map-0.5.7" + (sources."source-map-support-0.5.21" // { + dependencies = [ + sources."source-map-0.6.1" + ]; + }) sources."split2-3.2.2" sources."sprintf-js-1.0.3" sources."stack-trace-0.0.10" @@ -8317,7 +6960,11 @@ let sources."stream-shift-1.0.1" sources."string-length-4.0.2" sources."string-width-4.2.3" - sources."string_decoder-1.3.0" + (sources."string_decoder-1.3.0" // { + dependencies = [ + sources."safe-buffer-5.2.1" + ]; + }) sources."strip-ansi-6.0.1" sources."strip-bom-4.0.0" sources."strip-final-newline-2.0.0" @@ -8331,10 +6978,14 @@ let }) 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" sources."terminal-link-2.1.1" sources."test-exclude-6.0.0" sources."text-hex-1.0.0" sources."text-table-0.2.0" + sources."thenify-3.3.1" + sources."thenify-all-1.6.0" sources."throat-6.0.1" sources."tmp-0.2.1" sources."tmpl-1.0.5" @@ -8347,9 +6998,10 @@ let sources."triple-beam-1.3.0" sources."tslib-1.14.1" sources."tsutils-3.21.0" + sources."tunnel-agent-0.6.0" sources."type-check-0.4.0" sources."type-detect-4.0.8" - sources."type-fest-0.20.2" + sources."type-fest-0.21.3" sources."typedarray-0.0.6" sources."typedarray-to-buffer-3.1.5" sources."typescript-4.6.3" @@ -8376,7 +7028,8 @@ let sources."whatwg-mimetype-2.3.0" sources."whatwg-url-8.7.0" sources."which-2.0.2" - sources."winston-3.6.0" + sources."wide-align-1.1.5" + sources."winston-3.7.2" sources."winston-syslog-2.5.0" sources."winston-transport-4.5.0" sources."word-wrap-1.2.3" @@ -8397,2409 +7050,9 @@ let sources."yallist-4.0.0" sources."yargs-16.2.0" sources."yargs-parser-20.2.9" - (sources."zigbee-herdsman-0.14.20" // { - dependencies = [ - sources."@ampproject/remapping-2.0.3" - sources."@babel/cli-7.17.0" - sources."@babel/code-frame-7.16.7" - sources."@babel/compat-data-7.17.0" - (sources."@babel/core-7.17.0" // { - dependencies = [ - sources."semver-6.3.0" - ]; - }) - sources."@babel/generator-7.17.0" - 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.17.1" - sources."@babel/helper-create-regexp-features-plugin-7.17.0" - (sources."@babel/helper-define-polyfill-provider-0.3.1" // { - dependencies = [ - sources."semver-6.3.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.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.17.0" - sources."@babel/highlight-7.16.10" - sources."@babel/parser-7.17.0" - 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" - sources."@babel/plugin-syntax-class-static-block-7.14.5" - 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" - sources."@babel/plugin-syntax-json-strings-7.8.3" - sources."@babel/plugin-syntax-logical-assignment-operators-7.10.4" - sources."@babel/plugin-syntax-nullish-coalescing-operator-7.8.3" - sources."@babel/plugin-syntax-numeric-separator-7.10.4" - sources."@babel/plugin-syntax-object-rest-spread-7.8.3" - sources."@babel/plugin-syntax-optional-catch-binding-7.8.3" - 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.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.7" - sources."@babel/runtime-7.17.0" - sources."@babel/template-7.16.7" - sources."@babel/traverse-7.17.0" - sources."@babel/types-7.17.0" - sources."@bcoe/v8-coverage-0.2.3" - (sources."@eslint/eslintrc-1.0.5" // { - dependencies = [ - sources."argparse-2.0.1" - sources."globals-13.12.1" - sources."ignore-4.0.6" - sources."js-yaml-4.1.0" - sources."strip-json-comments-3.1.1" - ]; - }) - 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.5.0" // { - 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."slash-3.0.0" - sources."supports-color-7.2.0" - ]; - }) - (sources."@jest/core-27.5.0" // { - dependencies = [ - sources."ansi-regex-5.0.1" - 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."slash-3.0.0" - sources."strip-ansi-6.0.1" - sources."supports-color-7.2.0" - ]; - }) - sources."@jest/environment-27.5.0" - sources."@jest/fake-timers-27.5.0" - sources."@jest/globals-27.5.0" - (sources."@jest/reporters-27.5.0" // { - 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."slash-3.0.0" - sources."source-map-0.6.1" - sources."supports-color-7.2.0" - ]; - }) - (sources."@jest/source-map-27.5.0" // { - dependencies = [ - sources."source-map-0.6.1" - ]; - }) - sources."@jest/test-result-27.5.0" - sources."@jest/test-sequencer-27.5.0" - (sources."@jest/transform-27.5.0" // { - 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."slash-3.0.0" - sources."source-map-0.6.1" - sources."supports-color-7.2.0" - ]; - }) - (sources."@jest/types-27.5.0" // { - 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."supports-color-7.2.0" - ]; - }) - sources."@jridgewell/resolve-uri-3.0.4" - sources."@jridgewell/sourcemap-codec-1.4.10" - sources."@jridgewell/trace-mapping-0.2.7" - sources."@nicolo-ribaudo/chokidar-2-2.1.8-no-fsevents.3" - sources."@nodelib/fs.scandir-2.1.5" - sources."@nodelib/fs.stat-2.0.5" - sources."@nodelib/fs.walk-1.2.8" - sources."@serialport/binding-abstract-9.2.3" - sources."@serialport/binding-mock-9.2.4" - sources."@serialport/bindings-9.2.8" - sources."@serialport/parser-byte-length-9.2.4" - sources."@serialport/parser-cctalk-9.2.4" - sources."@serialport/parser-delimiter-9.2.4" - sources."@serialport/parser-inter-byte-timeout-9.2.4" - sources."@serialport/parser-readline-9.2.4" - sources."@serialport/parser-ready-9.2.4" - sources."@serialport/parser-regex-9.2.4" - sources."@serialport/stream-9.2.4" - 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.18" - sources."@types/babel__generator-7.6.4" - sources."@types/babel__template-7.4.1" - sources."@types/babel__traverse-7.14.2" - sources."@types/debounce-1.2.1" - sources."@types/debug-4.1.7" - sources."@types/graceful-fs-4.1.5" - 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.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.15" - 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.10.2" - sources."@typescript-eslint/parser-5.10.2" - sources."@typescript-eslint/scope-manager-5.10.2" - sources."@typescript-eslint/type-utils-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" - sources."@typescript-eslint/visitor-keys-5.10.2" - sources."abab-2.0.5" - sources."acorn-8.7.0" - (sources."acorn-globals-6.0.0" // { - dependencies = [ - sources."acorn-7.4.1" - ]; - }) - sources."acorn-jsx-5.3.2" - sources."acorn-walk-7.2.0" - sources."agent-base-6.0.2" - sources."ajv-6.12.6" - (sources."ansi-escapes-4.3.2" // { - dependencies = [ - sources."type-fest-0.21.3" - ]; - }) - sources."ansi-regex-2.1.1" - sources."ansi-styles-3.2.1" - sources."any-promise-1.3.0" - sources."anymatch-3.1.2" - sources."aproba-1.2.0" - sources."are-we-there-yet-1.1.7" - sources."argparse-1.0.10" - sources."array-union-2.1.0" - sources."asynckit-0.4.0" - (sources."babel-jest-27.5.0" // { - 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."slash-3.0.0" - sources."supports-color-7.2.0" - ]; - }) - sources."babel-plugin-dynamic-import-node-2.3.3" - sources."babel-plugin-istanbul-6.1.1" - sources."babel-plugin-jest-hoist-27.5.0" - (sources."babel-plugin-polyfill-corejs2-0.3.1" // { - dependencies = [ - sources."semver-6.3.0" - ]; - }) - sources."babel-plugin-polyfill-corejs3-0.5.2" - sources."babel-plugin-polyfill-regenerator-0.3.1" - sources."babel-preset-current-node-syntax-1.0.1" - sources."babel-preset-jest-27.5.0" - sources."balanced-match-1.0.2" - sources."base64-js-1.5.1" - sources."binary-extensions-2.2.0" - sources."bindings-1.5.0" - (sources."bl-4.1.0" // { - dependencies = [ - sources."readable-stream-3.6.0" - ]; - }) - sources."brace-expansion-1.1.11" - sources."braces-3.0.2" - sources."browser-process-hrtime-1.0.0" - sources."browserslist-4.19.1" - sources."bser-2.1.1" - sources."buffer-5.7.1" - sources."buffer-from-1.1.2" - sources."call-bind-1.0.2" - sources."callsites-3.1.0" - sources."camelcase-5.3.1" - sources."caniuse-lite-1.0.30001307" - sources."chalk-2.4.2" - sources."char-regex-1.0.2" - sources."chokidar-3.5.3" - sources."chownr-1.1.4" - sources."ci-info-3.3.0" - sources."cjs-module-lexer-1.2.2" - (sources."cliui-7.0.4" // { - dependencies = [ - sources."ansi-regex-5.0.1" - sources."is-fullwidth-code-point-3.0.0" - sources."string-width-4.2.3" - sources."strip-ansi-6.0.1" - ]; - }) - sources."co-4.6.0" - sources."code-point-at-1.1.0" - sources."collect-v8-coverage-1.0.1" - sources."color-convert-1.9.3" - sources."color-name-1.1.3" - sources."combined-stream-1.0.8" - sources."commander-4.1.1" - 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.21.0" // { - dependencies = [ - sources."semver-7.0.0" - ]; - }) - sources."core-util-is-1.0.3" - sources."cross-spawn-7.0.3" - sources."cssom-0.4.4" - (sources."cssstyle-2.3.0" // { - dependencies = [ - sources."cssom-0.3.8" - ]; - }) - sources."data-urls-2.0.0" - sources."debounce-1.2.1" - sources."debug-4.3.3" - sources."decimal.js-10.3.1" - sources."decompress-response-6.0.0" - sources."dedent-0.7.0" - sources."deep-extend-0.6.0" - sources."deep-is-0.1.4" - sources."deepmerge-4.2.2" - sources."define-properties-1.1.3" - sources."delayed-stream-1.0.0" - sources."delegates-1.0.0" - sources."detect-libc-2.0.0" - sources."detect-newline-3.1.0" - sources."diff-sequences-27.5.0" - sources."dir-glob-3.0.1" - sources."doctrine-3.0.0" - (sources."domexception-2.0.1" // { - dependencies = [ - sources."webidl-conversions-5.0.0" - ]; - }) - sources."electron-to-chromium-1.4.65" - sources."emittery-0.8.1" - sources."emoji-regex-8.0.0" - sources."end-of-stream-1.4.4" - sources."escalade-3.1.1" - sources."escape-string-regexp-1.0.5" - (sources."escodegen-2.0.0" // { - dependencies = [ - sources."estraverse-5.3.0" - sources."levn-0.3.0" - sources."optionator-0.8.3" - sources."prelude-ls-1.1.2" - sources."source-map-0.6.1" - sources."type-check-0.3.2" - ]; - }) - (sources."eslint-8.8.0" // { - dependencies = [ - sources."ansi-regex-5.0.1" - sources."ansi-styles-4.3.0" - sources."argparse-2.0.1" - sources."chalk-4.1.2" - sources."color-convert-2.0.1" - sources."color-name-1.1.4" - sources."escape-string-regexp-4.0.0" - sources."eslint-scope-7.1.0" - sources."estraverse-5.3.0" - sources."glob-parent-6.0.2" - sources."globals-13.12.1" - sources."has-flag-4.0.0" - sources."js-yaml-4.1.0" - sources."strip-ansi-6.0.1" - sources."strip-json-comments-3.1.1" - sources."supports-color-7.2.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.2.0" - sources."espree-9.3.0" - sources."esprima-4.0.1" - (sources."esquery-1.4.0" // { - dependencies = [ - sources."estraverse-5.3.0" - ]; - }) - (sources."esrecurse-4.3.0" // { - dependencies = [ - sources."estraverse-5.3.0" - ]; - }) - sources."estraverse-4.3.0" - sources."esutils-2.0.3" - sources."execa-5.1.1" - sources."exit-0.1.2" - sources."expand-template-2.0.3" - sources."expect-27.5.0" - sources."fast-deep-equal-3.1.3" - 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" - sources."fb-watchman-2.0.1" - sources."file-entry-cache-6.0.1" - sources."file-uri-to-path-1.0.0" - sources."fill-range-7.0.1" - sources."find-up-4.1.0" - sources."flat-cache-3.0.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" - sources."fs.realpath-1.0.0" - sources."fsevents-2.3.2" - sources."function-bind-1.1.1" - sources."functional-red-black-tree-1.0.1" - sources."gauge-2.7.4" - sources."gensync-1.0.0-beta.2" - sources."get-caller-file-2.0.5" - sources."get-intrinsic-1.1.1" - sources."get-package-type-0.1.0" - sources."get-stream-6.0.1" - sources."github-from-package-0.0.0" - sources."glob-7.2.0" - sources."glob-parent-5.1.2" - sources."globals-11.12.0" - (sources."globby-11.1.0" // { - dependencies = [ - sources."slash-3.0.0" - ]; - }) - sources."graceful-fs-4.2.9" - (sources."handlebars-4.7.7" // { - dependencies = [ - sources."source-map-0.6.1" - ]; - }) - sources."has-1.0.3" - sources."has-flag-3.0.0" - sources."has-symbols-1.0.2" - sources."has-unicode-2.0.1" - sources."html-encoding-sniffer-2.0.1" - sources."html-escaper-2.0.2" - sources."http-proxy-agent-4.0.1" - sources."https-proxy-agent-5.0.0" - sources."human-signals-2.1.0" - sources."iconv-lite-0.4.24" - sources."ieee754-1.2.1" - sources."ignore-5.2.0" - (sources."import-fresh-3.3.0" // { - dependencies = [ - sources."resolve-from-4.0.0" - ]; - }) - 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.1" - sources."is-extglob-2.1.1" - sources."is-fullwidth-code-point-1.0.0" - sources."is-generator-fn-2.1.0" - sources."is-glob-4.0.3" - sources."is-number-7.0.0" - sources."is-potential-custom-element-name-1.0.1" - sources."is-stream-2.0.1" - sources."is-typedarray-1.0.0" - sources."isarray-1.0.0" - sources."isexe-2.0.0" - sources."istanbul-lib-coverage-3.2.0" - (sources."istanbul-lib-instrument-5.1.0" // { - dependencies = [ - sources."semver-6.3.0" - ]; - }) - (sources."istanbul-lib-report-3.0.0" // { - dependencies = [ - sources."has-flag-4.0.0" - sources."make-dir-3.1.0" - sources."semver-6.3.0" - sources."supports-color-7.2.0" - ]; - }) - (sources."istanbul-lib-source-maps-4.0.1" // { - dependencies = [ - sources."source-map-0.6.1" - ]; - }) - sources."istanbul-reports-3.1.4" - (sources."jest-27.5.0" // { - 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.5.0" - sources."supports-color-7.2.0" - ]; - }) - sources."jest-changed-files-27.5.0" - (sources."jest-circus-27.5.0" // { - 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."slash-3.0.0" - sources."supports-color-7.2.0" - ]; - }) - (sources."jest-config-27.5.0" // { - 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."slash-3.0.0" - sources."supports-color-7.2.0" - ]; - }) - (sources."jest-diff-27.5.0" // { - 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."supports-color-7.2.0" - ]; - }) - sources."jest-docblock-27.5.0" - (sources."jest-each-27.5.0" // { - 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."supports-color-7.2.0" - ]; - }) - sources."jest-environment-jsdom-27.5.0" - sources."jest-environment-node-27.5.0" - sources."jest-get-type-27.5.0" - sources."jest-haste-map-27.5.0" - (sources."jest-jasmine2-27.5.0" // { - 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."supports-color-7.2.0" - ]; - }) - sources."jest-leak-detector-27.5.0" - (sources."jest-matcher-utils-27.5.0" // { - 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."supports-color-7.2.0" - ]; - }) - (sources."jest-message-util-27.5.0" // { - 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."slash-3.0.0" - sources."supports-color-7.2.0" - ]; - }) - sources."jest-mock-27.5.0" - sources."jest-pnp-resolver-1.2.2" - sources."jest-regex-util-27.5.0" - (sources."jest-resolve-27.5.0" // { - 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."slash-3.0.0" - sources."supports-color-7.2.0" - ]; - }) - sources."jest-resolve-dependencies-27.5.0" - (sources."jest-runner-27.5.0" // { - 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."supports-color-7.2.0" - ]; - }) - (sources."jest-runtime-27.5.0" // { - 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."slash-3.0.0" - sources."supports-color-7.2.0" - ]; - }) - sources."jest-serializer-27.5.0" - (sources."jest-snapshot-27.5.0" // { - 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."supports-color-7.2.0" - ]; - }) - (sources."jest-util-27.5.0" // { - 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."supports-color-7.2.0" - ]; - }) - (sources."jest-validate-27.5.0" // { - dependencies = [ - sources."ansi-styles-4.3.0" - sources."camelcase-6.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."supports-color-7.2.0" - ]; - }) - (sources."jest-watcher-27.5.0" // { - 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."supports-color-7.2.0" - ]; - }) - (sources."jest-worker-27.5.0" // { - dependencies = [ - sources."has-flag-4.0.0" - sources."supports-color-8.1.1" - ]; - }) - sources."js-tokens-4.0.0" - sources."js-yaml-3.14.1" - sources."jsdom-16.7.0" - sources."jsesc-2.5.2" - sources."json-schema-traverse-0.4.1" - sources."json-stable-stringify-without-jsonify-1.0.1" - sources."json5-2.2.0" - sources."jsonc-parser-3.0.0" - sources."kleur-3.0.3" - sources."leven-3.1.0" - sources."levn-0.4.1" - sources."locate-path-5.0.0" - sources."lodash-4.17.21" - sources."lodash.debounce-4.0.8" - sources."lodash.merge-4.6.2" - sources."lru-cache-6.0.0" - sources."lunr-2.3.9" - (sources."make-dir-2.1.0" // { - dependencies = [ - sources."semver-5.7.1" - ]; - }) - sources."makeerror-1.0.12" - sources."marked-4.0.12" - sources."merge-stream-2.0.0" - sources."merge2-1.4.1" - sources."micromatch-4.0.4" - sources."mime-db-1.51.0" - sources."mime-types-2.1.34" - sources."mimic-fn-2.1.0" - sources."mimic-response-3.1.0" - sources."minimatch-3.0.4" - sources."minimist-1.2.5" - sources."mixin-deep-2.0.1" - sources."mkdirp-classic-0.5.3" - sources."ms-2.1.2" - sources."mz-2.7.0" - sources."nan-2.15.0" - sources."napi-build-utils-1.0.2" - sources."natural-compare-1.4.0" - sources."neo-async-2.6.2" - sources."node-abi-3.8.0" - sources."node-int64-0.4.0" - sources."node-releases-2.0.1" - sources."normalize-path-3.0.0" - sources."npm-run-path-4.0.1" - sources."npmlog-4.1.2" - sources."number-is-nan-1.0.1" - sources."nwsapi-2.2.0" - sources."object-assign-4.1.1" - sources."object-keys-1.1.1" - sources."object.assign-4.1.2" - sources."once-1.4.0" - sources."onetime-5.1.2" - sources."optionator-0.9.1" - sources."p-limit-2.3.0" - sources."p-locate-4.1.0" - sources."p-try-2.2.0" - sources."parent-module-1.0.1" - sources."parse5-6.0.1" - sources."path-exists-4.0.0" - sources."path-is-absolute-1.0.1" - sources."path-key-3.1.1" - sources."path-parse-1.0.7" - sources."path-type-4.0.0" - sources."picocolors-1.0.0" - sources."picomatch-2.3.1" - sources."pify-4.0.1" - sources."pirates-4.0.5" - sources."pkg-dir-4.2.0" - sources."prebuild-install-7.0.1" - sources."prelude-ls-1.2.1" - (sources."pretty-format-27.5.0" // { - dependencies = [ - sources."ansi-regex-5.0.1" - sources."ansi-styles-5.2.0" - ]; - }) - sources."process-nextick-args-2.0.1" - sources."prompts-2.4.2" - sources."psl-1.8.0" - sources."pump-3.0.0" - sources."punycode-2.1.1" - sources."queue-microtask-1.2.3" - sources."rc-1.2.8" - sources."react-is-17.0.2" - sources."readable-stream-2.3.7" - sources."readdirp-3.6.0" - sources."regenerate-1.4.2" - sources."regenerate-unicode-properties-10.0.1" - sources."regenerator-runtime-0.13.9" - sources."regenerator-transform-0.14.5" - sources."regexpp-3.2.0" - sources."regexpu-core-5.0.1" - sources."regjsgen-0.6.0" - (sources."regjsparser-0.8.4" // { - dependencies = [ - sources."jsesc-0.5.0" - ]; - }) - sources."require-directory-2.1.1" - sources."resolve-1.22.0" - sources."resolve-cwd-3.0.0" - sources."resolve-from-5.0.0" - sources."resolve.exports-1.1.0" - sources."reusify-1.0.4" - sources."rimraf-3.0.2" - sources."run-parallel-1.2.0" - sources."safe-buffer-5.1.2" - sources."safer-buffer-2.1.2" - sources."saxes-5.0.1" - sources."semver-7.3.5" - sources."serialport-9.2.8" - sources."set-blocking-2.0.0" - sources."shebang-command-2.0.0" - sources."shebang-regex-3.0.0" - sources."shiki-0.10.0" - sources."signal-exit-3.0.7" - sources."simple-concat-1.0.1" - sources."simple-get-4.0.1" - sources."sisteransi-1.0.5" - sources."slash-2.0.0" - sources."slip-1.0.2" - sources."source-map-0.5.7" - (sources."source-map-support-0.5.21" // { - dependencies = [ - sources."source-map-0.6.1" - ]; - }) - sources."sprintf-js-1.0.3" - (sources."stack-utils-2.0.5" // { - dependencies = [ - sources."escape-string-regexp-2.0.0" - ]; - }) - (sources."string-length-4.0.2" // { - dependencies = [ - sources."ansi-regex-5.0.1" - sources."strip-ansi-6.0.1" - ]; - }) - sources."string-width-1.0.2" - sources."string_decoder-1.1.1" - sources."strip-ansi-3.0.1" - sources."strip-bom-4.0.0" - sources."strip-final-newline-2.0.0" - sources."strip-json-comments-2.0.1" - sources."supports-color-5.5.0" - (sources."supports-hyperlinks-2.2.0" // { - dependencies = [ - sources."has-flag-4.0.0" - 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" // { - dependencies = [ - sources."readable-stream-3.6.0" - ]; - }) - sources."terminal-link-2.1.1" - sources."test-exclude-6.0.0" - sources."text-table-0.2.0" - sources."thenify-3.3.1" - sources."thenify-all-1.6.0" - sources."throat-6.0.1" - sources."tmpl-1.0.5" - sources."to-fast-properties-2.0.0" - sources."to-regex-range-5.0.1" - sources."tough-cookie-4.0.0" - sources."tr46-2.1.0" - sources."tslib-1.14.1" - sources."tsutils-3.21.0" - sources."tunnel-agent-0.6.0" - sources."type-check-0.4.0" - sources."type-detect-4.0.8" - sources."type-fest-0.20.2" - sources."typedarray-to-buffer-3.1.5" - sources."typedoc-0.22.11" - sources."typedoc-plugin-markdown-3.11.13" - sources."typedoc-plugin-no-inherit-1.3.1" - sources."typedoc-plugin-sourcefile-url-1.0.6" - 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" - sources."unicode-property-aliases-ecmascript-2.0.0" - sources."universalify-0.1.2" - 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.1" // { - dependencies = [ - sources."source-map-0.7.3" - ]; - }) - sources."vscode-oniguruma-1.6.1" - sources."vscode-textmate-5.2.0" - sources."w3c-hr-time-1.0.2" - sources."w3c-xmlserializer-2.0.0" - sources."walker-1.0.8" - 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."wide-align-1.1.5" - sources."word-wrap-1.2.3" - sources."wordwrap-1.0.0" - (sources."wrap-ansi-7.0.0" // { - dependencies = [ - sources."ansi-regex-5.0.1" - sources."ansi-styles-4.3.0" - sources."color-convert-2.0.1" - sources."color-name-1.1.4" - sources."is-fullwidth-code-point-3.0.0" - sources."string-width-4.2.3" - sources."strip-ansi-6.0.1" - ]; - }) - sources."wrappy-1.0.2" - sources."write-file-atomic-3.0.3" - sources."ws-7.5.6" - sources."xml-name-validator-3.0.0" - sources."xmlchars-2.2.0" - sources."y18n-5.0.8" - sources."yallist-4.0.0" - (sources."yargs-16.2.0" // { - dependencies = [ - sources."ansi-regex-5.0.1" - sources."is-fullwidth-code-point-3.0.0" - sources."string-width-4.2.3" - sources."strip-ansi-6.0.1" - ]; - }) - sources."yargs-parser-20.2.9" - ]; - }) - (sources."zigbee-herdsman-converters-14.0.467" // { - dependencies = [ - sources."@ampproject/remapping-2.1.2" - sources."@babel/code-frame-7.16.7" - sources."@babel/compat-data-7.17.7" - (sources."@babel/core-7.17.8" // { - dependencies = [ - sources."semver-6.3.0" - ]; - }) - (sources."@babel/generator-7.17.7" // { - dependencies = [ - sources."source-map-0.5.7" - ]; - }) - (sources."@babel/helper-compilation-targets-7.17.7" // { - dependencies = [ - sources."semver-6.3.0" - ]; - }) - sources."@babel/helper-environment-visitor-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-module-imports-7.16.7" - sources."@babel/helper-module-transforms-7.17.7" - sources."@babel/helper-plugin-utils-7.16.7" - sources."@babel/helper-simple-access-7.17.7" - 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/helpers-7.17.8" - (sources."@babel/highlight-7.16.10" // { - dependencies = [ - sources."ansi-styles-3.2.1" - sources."chalk-2.4.2" - sources."color-convert-1.9.3" - sources."color-name-1.1.3" - sources."escape-string-regexp-1.0.5" - sources."has-flag-3.0.0" - sources."supports-color-5.5.0" - ]; - }) - sources."@babel/parser-7.17.8" - 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-import-meta-7.10.4" - sources."@babel/plugin-syntax-json-strings-7.8.3" - sources."@babel/plugin-syntax-logical-assignment-operators-7.10.4" - sources."@babel/plugin-syntax-nullish-coalescing-operator-7.8.3" - sources."@babel/plugin-syntax-numeric-separator-7.10.4" - sources."@babel/plugin-syntax-object-rest-spread-7.8.3" - sources."@babel/plugin-syntax-optional-catch-binding-7.8.3" - sources."@babel/plugin-syntax-optional-chaining-7.8.3" - sources."@babel/plugin-syntax-top-level-await-7.14.5" - sources."@babel/plugin-syntax-typescript-7.16.7" - sources."@babel/template-7.16.7" - (sources."@babel/traverse-7.17.3" // { - dependencies = [ - sources."globals-11.12.0" - ]; - }) - sources."@babel/types-7.17.0" - sources."@bcoe/v8-coverage-0.2.3" - sources."@eslint/eslintrc-1.2.1" - sources."@humanwhocodes/config-array-0.9.5" - sources."@humanwhocodes/object-schema-1.2.1" - (sources."@istanbuljs/load-nyc-config-1.1.0" // { - dependencies = [ - sources."argparse-1.0.10" - sources."js-yaml-3.14.1" - sources."resolve-from-5.0.0" - ]; - }) - sources."@istanbuljs/schema-0.1.3" - sources."@jest/console-27.5.1" - sources."@jest/core-27.5.1" - sources."@jest/environment-27.5.1" - sources."@jest/fake-timers-27.5.1" - sources."@jest/globals-27.5.1" - sources."@jest/reporters-27.5.1" - sources."@jest/source-map-27.5.1" - sources."@jest/test-result-27.5.1" - sources."@jest/test-sequencer-27.5.1" - sources."@jest/transform-27.5.1" - sources."@jest/types-27.5.1" - sources."@jridgewell/resolve-uri-3.0.5" - sources."@jridgewell/sourcemap-codec-1.4.11" - sources."@jridgewell/trace-mapping-0.3.4" - sources."@nodelib/fs.scandir-2.1.5" - sources."@nodelib/fs.stat-2.0.5" - sources."@nodelib/fs.walk-1.2.8" - 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.19" - sources."@types/babel__generator-7.6.4" - sources."@types/babel__template-7.4.1" - sources."@types/babel__traverse-7.14.2" - sources."@types/graceful-fs-4.1.5" - 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/json-schema-7.0.11" - sources."@types/node-17.0.23" - sources."@types/prettier-2.4.4" - sources."@types/stack-utils-2.0.1" - sources."@types/yargs-16.0.4" - sources."@types/yargs-parser-21.0.0" - sources."@typescript-eslint/scope-manager-5.16.0" - sources."@typescript-eslint/types-5.16.0" - sources."@typescript-eslint/typescript-estree-5.16.0" - (sources."@typescript-eslint/utils-5.16.0" // { - dependencies = [ - sources."eslint-scope-5.1.1" - sources."estraverse-4.3.0" - ]; - }) - sources."@typescript-eslint/visitor-keys-5.16.0" - sources."abab-2.0.5" - sources."acorn-8.7.0" - (sources."acorn-globals-6.0.0" // { - dependencies = [ - sources."acorn-7.4.1" - ]; - }) - sources."acorn-jsx-5.3.2" - sources."acorn-walk-7.2.0" - sources."agent-base-6.0.2" - sources."ajv-6.12.6" - (sources."ansi-escapes-4.3.2" // { - dependencies = [ - sources."type-fest-0.21.3" - ]; - }) - sources."ansi-regex-5.0.1" - sources."ansi-styles-4.3.0" - sources."anymatch-3.1.2" - sources."argparse-2.0.1" - sources."array-union-2.1.0" - sources."asynckit-0.4.0" - sources."axios-0.26.1" - sources."babel-jest-27.5.1" - sources."babel-plugin-istanbul-6.1.1" - sources."babel-plugin-jest-hoist-27.5.1" - sources."babel-preset-current-node-syntax-1.0.1" - sources."babel-preset-jest-27.5.1" - sources."balanced-match-1.0.2" - sources."base64-js-1.5.1" - sources."bl-4.1.0" - sources."brace-expansion-1.1.11" - sources."braces-3.0.2" - sources."browser-process-hrtime-1.0.0" - sources."browserslist-4.20.2" - sources."bser-2.1.1" - sources."buffer-5.7.1" - sources."buffer-crc32-0.2.13" - sources."buffer-from-1.1.2" - sources."callsites-3.1.0" - sources."camelcase-5.3.1" - sources."caniuse-lite-1.0.30001320" - sources."chalk-4.1.2" - sources."char-regex-1.0.2" - sources."ci-info-3.3.0" - sources."cjs-module-lexer-1.2.2" - sources."cliui-7.0.4" - sources."co-4.6.0" - sources."collect-v8-coverage-1.0.1" - sources."color-convert-2.0.1" - sources."color-name-1.1.4" - sources."combined-stream-1.0.8" - sources."concat-map-0.0.1" - sources."convert-source-map-1.8.0" - sources."cross-spawn-7.0.3" - sources."cssom-0.4.4" - (sources."cssstyle-2.3.0" // { - dependencies = [ - sources."cssom-0.3.8" - ]; - }) - sources."data-urls-2.0.0" - sources."debug-4.3.4" - sources."decimal.js-10.3.1" - sources."dedent-0.7.0" - sources."deep-is-0.1.4" - sources."deepmerge-4.2.2" - sources."delayed-stream-1.0.0" - sources."detect-newline-3.1.0" - sources."diff-sequences-27.5.1" - sources."dir-glob-3.0.1" - sources."doctrine-3.0.0" - (sources."domexception-2.0.1" // { - dependencies = [ - sources."webidl-conversions-5.0.0" - ]; - }) - sources."electron-to-chromium-1.4.95" - sources."emittery-0.8.1" - sources."emoji-regex-8.0.0" - sources."end-of-stream-1.4.4" - sources."error-ex-1.3.2" - sources."escalade-3.1.1" - sources."escape-string-regexp-4.0.0" - (sources."escodegen-2.0.0" // { - dependencies = [ - sources."levn-0.3.0" - sources."optionator-0.8.3" - sources."prelude-ls-1.1.2" - sources."type-check-0.3.2" - ]; - }) - sources."eslint-8.12.0" - sources."eslint-config-google-0.14.0" - sources."eslint-plugin-jest-26.1.3" - sources."eslint-scope-7.1.1" - (sources."eslint-utils-3.0.0" // { - dependencies = [ - sources."eslint-visitor-keys-2.1.0" - ]; - }) - sources."eslint-visitor-keys-3.3.0" - sources."espree-9.3.1" - sources."esprima-4.0.1" - sources."esquery-1.4.0" - sources."esrecurse-4.3.0" - sources."estraverse-5.3.0" - sources."esutils-2.0.3" - sources."execa-5.1.1" - sources."exit-0.1.2" - sources."expect-27.5.1" - sources."fast-deep-equal-3.1.3" - (sources."fast-glob-3.2.11" // { - dependencies = [ - sources."glob-parent-5.1.2" - ]; - }) - sources."fast-json-stable-stringify-2.1.0" - sources."fast-levenshtein-2.0.6" - sources."fastq-1.13.0" - sources."fb-watchman-2.0.1" - sources."file-entry-cache-6.0.1" - sources."fill-range-7.0.1" - sources."find-up-4.1.0" - sources."flat-cache-3.0.4" - sources."flatted-3.2.5" - sources."follow-redirects-1.14.9" - sources."form-data-3.0.1" - sources."fs-constants-1.0.0" - sources."fs.realpath-1.0.0" - sources."fsevents-2.3.2" - sources."function-bind-1.1.1" - sources."functional-red-black-tree-1.0.1" - sources."gensync-1.0.0-beta.2" - sources."get-caller-file-2.0.5" - sources."get-package-type-0.1.0" - sources."get-stream-6.0.1" - sources."glob-7.2.0" - sources."glob-parent-6.0.2" - sources."globals-13.13.0" - 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" - sources."html-escaper-2.0.2" - sources."http-proxy-agent-4.0.1" - sources."https-proxy-agent-5.0.0" - sources."human-signals-2.1.0" - sources."iconv-lite-0.4.24" - sources."ieee754-1.2.1" - sources."ignore-5.2.0" - sources."import-fresh-3.3.0" - 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.2.1" - 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" - sources."is-glob-4.0.3" - sources."is-number-7.0.0" - sources."is-potential-custom-element-name-1.0.1" - sources."is-stream-2.0.1" - sources."is-typedarray-1.0.0" - sources."isexe-2.0.0" - sources."istanbul-lib-coverage-3.2.0" - (sources."istanbul-lib-instrument-5.1.0" // { - dependencies = [ - sources."semver-6.3.0" - ]; - }) - sources."istanbul-lib-report-3.0.0" - sources."istanbul-lib-source-maps-4.0.1" - sources."istanbul-reports-3.1.4" - sources."jest-27.5.1" - sources."jest-changed-files-27.5.1" - sources."jest-circus-27.5.1" - sources."jest-cli-27.5.1" - sources."jest-config-27.5.1" - sources."jest-diff-27.5.1" - sources."jest-docblock-27.5.1" - sources."jest-each-27.5.1" - sources."jest-environment-jsdom-27.5.1" - sources."jest-environment-node-27.5.1" - sources."jest-get-type-27.5.1" - sources."jest-haste-map-27.5.1" - sources."jest-jasmine2-27.5.1" - sources."jest-leak-detector-27.5.1" - sources."jest-matcher-utils-27.5.1" - sources."jest-message-util-27.5.1" - sources."jest-mock-27.5.1" - sources."jest-pnp-resolver-1.2.2" - sources."jest-regex-util-27.5.1" - sources."jest-resolve-27.5.1" - sources."jest-resolve-dependencies-27.5.1" - sources."jest-runner-27.5.1" - sources."jest-runtime-27.5.1" - sources."jest-serializer-27.5.1" - sources."jest-snapshot-27.5.1" - sources."jest-util-27.5.1" - (sources."jest-validate-27.5.1" // { - dependencies = [ - sources."camelcase-6.3.0" - ]; - }) - sources."jest-watcher-27.5.1" - (sources."jest-worker-27.5.1" // { - dependencies = [ - sources."supports-color-8.1.1" - ]; - }) - sources."js-tokens-4.0.0" - sources."js-yaml-4.1.0" - sources."jsdom-16.7.0" - sources."jsesc-2.5.2" - sources."json-parse-even-better-errors-2.3.1" - sources."json-schema-traverse-0.4.1" - sources."json-stable-stringify-without-jsonify-1.0.1" - sources."json5-2.2.1" - sources."kleur-3.0.3" - sources."leven-3.1.0" - sources."levn-0.4.1" - sources."lines-and-columns-1.2.4" - sources."locate-path-5.0.0" - sources."lodash-4.17.21" - sources."lodash.merge-4.6.2" - sources."lru-cache-6.0.0" - (sources."make-dir-3.1.0" // { - dependencies = [ - sources."semver-6.3.0" - ]; - }) - sources."makeerror-1.0.12" - sources."merge-stream-2.0.0" - sources."merge2-1.4.1" - sources."micromatch-4.0.5" - sources."mime-db-1.52.0" - sources."mime-types-2.1.35" - sources."mimic-fn-2.1.0" - sources."minimatch-3.1.2" - sources."ms-2.1.2" - sources."natural-compare-1.4.0" - sources."node-int64-0.4.0" - sources."node-releases-2.0.2" - sources."normalize-path-3.0.0" - sources."npm-run-path-4.0.1" - sources."nwsapi-2.2.0" - sources."once-1.4.0" - sources."onetime-5.1.2" - sources."optionator-0.9.1" - sources."p-limit-2.3.0" - sources."p-locate-4.1.0" - sources."p-try-2.2.0" - sources."parent-module-1.0.1" - sources."parse-json-5.2.0" - sources."parse5-6.0.1" - sources."path-exists-4.0.0" - sources."path-is-absolute-1.0.1" - sources."path-key-3.1.1" - sources."path-parse-1.0.7" - sources."path-type-4.0.0" - sources."picocolors-1.0.0" - 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.5.1" // { - dependencies = [ - sources."ansi-styles-5.2.0" - ]; - }) - sources."prompts-2.4.2" - sources."psl-1.8.0" - sources."punycode-2.1.1" - sources."queue-microtask-1.2.3" - sources."react-is-17.0.2" - sources."readable-stream-3.6.0" - sources."regexpp-3.2.0" - sources."require-directory-2.1.1" - sources."resolve-1.22.0" - (sources."resolve-cwd-3.0.0" // { - dependencies = [ - sources."resolve-from-5.0.0" - ]; - }) - sources."resolve-from-4.0.0" - sources."resolve.exports-1.1.0" - sources."reusify-1.0.4" - sources."rimraf-3.0.2" - sources."run-parallel-1.2.0" - sources."safe-buffer-5.1.2" - sources."safer-buffer-2.1.2" - sources."saxes-5.0.1" - sources."semver-7.3.5" - sources."shebang-command-2.0.0" - sources."shebang-regex-3.0.0" - sources."signal-exit-3.0.7" - sources."sisteransi-1.0.5" - sources."slash-3.0.0" - sources."source-map-0.6.1" - sources."source-map-support-0.5.21" - sources."sprintf-js-1.0.3" - (sources."stack-utils-2.0.5" // { - dependencies = [ - sources."escape-string-regexp-2.0.0" - ]; - }) - sources."string-length-4.0.2" - sources."string-width-4.2.3" - (sources."string_decoder-1.3.0" // { - dependencies = [ - sources."safe-buffer-5.2.1" - ]; - }) - sources."strip-ansi-6.0.1" - sources."strip-bom-4.0.0" - sources."strip-final-newline-2.0.0" - 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" - sources."test-exclude-6.0.0" - sources."text-table-0.2.0" - sources."throat-6.0.1" - sources."tmpl-1.0.5" - sources."to-fast-properties-2.0.0" - sources."to-regex-range-5.0.1" - sources."tough-cookie-4.0.0" - sources."tr46-2.1.0" - sources."tslib-1.14.1" - sources."tsutils-3.21.0" - sources."type-check-0.4.0" - sources."type-detect-4.0.8" - sources."type-fest-0.20.2" - sources."typedarray-to-buffer-3.1.5" - sources."typescript-4.6.3" - sources."universalify-0.1.2" - 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.1" // { - dependencies = [ - sources."source-map-0.7.3" - ]; - }) - sources."w3c-hr-time-1.0.2" - sources."w3c-xmlserializer-2.0.0" - sources."walker-1.0.8" - 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."word-wrap-1.2.3" - sources."wrap-ansi-7.0.0" - sources."wrappy-1.0.2" - sources."write-file-atomic-3.0.3" - sources."ws-7.5.7" - sources."xml-name-validator-3.0.0" - sources."xmlchars-2.2.0" - sources."y18n-5.0.8" - sources."yallist-4.0.0" - sources."yargs-16.2.0" - sources."yargs-parser-20.2.9" - (sources."zigbee-herdsman-0.14.20" // { - dependencies = [ - sources."@ampproject/remapping-2.0.3" - sources."@babel/cli-https://registry.npmjs.org/@babel/cli/-/cli-7.17.0.tgz" - sources."@babel/code-frame-7.16.7" - sources."@babel/compat-data-7.17.0" - (sources."@babel/core-7.17.0" // { - dependencies = [ - sources."semver-6.3.0" - ]; - }) - sources."@babel/generator-7.17.0" - 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.17.1" - sources."@babel/helper-create-regexp-features-plugin-7.17.0" - (sources."@babel/helper-define-polyfill-provider-0.3.1" // { - dependencies = [ - sources."semver-6.3.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.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.17.0" - sources."@babel/highlight-7.16.10" - sources."@babel/parser-7.17.0" - 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" - sources."@babel/plugin-syntax-class-static-block-7.14.5" - 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" - sources."@babel/plugin-syntax-json-strings-7.8.3" - sources."@babel/plugin-syntax-logical-assignment-operators-7.10.4" - sources."@babel/plugin-syntax-nullish-coalescing-operator-7.8.3" - sources."@babel/plugin-syntax-numeric-separator-7.10.4" - sources."@babel/plugin-syntax-object-rest-spread-7.8.3" - sources."@babel/plugin-syntax-optional-catch-binding-7.8.3" - 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.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-https://registry.npmjs.org/@babel/preset-env/-/preset-env-7.16.11.tgz" // { - dependencies = [ - sources."semver-6.3.0" - ]; - }) - sources."@babel/preset-modules-0.1.5" - sources."@babel/preset-typescript-https://registry.npmjs.org/@babel/preset-typescript/-/preset-typescript-7.16.7.tgz" - sources."@babel/runtime-7.17.0" - sources."@babel/template-7.16.7" - sources."@babel/traverse-7.17.0" - sources."@babel/types-7.17.0" - sources."@bcoe/v8-coverage-0.2.3" - (sources."@eslint/eslintrc-1.0.5" // { - dependencies = [ - sources."argparse-2.0.1" - sources."globals-13.12.1" - sources."ignore-4.0.6" - sources."js-yaml-4.1.0" - sources."strip-json-comments-3.1.1" - ]; - }) - 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.5.0" // { - 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."slash-3.0.0" - sources."supports-color-7.2.0" - ]; - }) - (sources."@jest/core-27.5.0" // { - dependencies = [ - sources."ansi-regex-5.0.1" - 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."slash-3.0.0" - sources."strip-ansi-6.0.1" - sources."supports-color-7.2.0" - ]; - }) - sources."@jest/environment-27.5.0" - sources."@jest/fake-timers-27.5.0" - sources."@jest/globals-27.5.0" - (sources."@jest/reporters-27.5.0" // { - 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."slash-3.0.0" - sources."source-map-0.6.1" - sources."supports-color-7.2.0" - ]; - }) - (sources."@jest/source-map-27.5.0" // { - dependencies = [ - sources."source-map-0.6.1" - ]; - }) - sources."@jest/test-result-27.5.0" - sources."@jest/test-sequencer-27.5.0" - (sources."@jest/transform-27.5.0" // { - 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."slash-3.0.0" - sources."source-map-0.6.1" - sources."supports-color-7.2.0" - ]; - }) - (sources."@jest/types-27.5.0" // { - 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."supports-color-7.2.0" - ]; - }) - sources."@jridgewell/resolve-uri-3.0.4" - sources."@jridgewell/sourcemap-codec-1.4.10" - sources."@jridgewell/trace-mapping-0.2.7" - sources."@nicolo-ribaudo/chokidar-2-2.1.8-no-fsevents.3" - sources."@nodelib/fs.scandir-2.1.5" - sources."@nodelib/fs.stat-2.0.5" - sources."@nodelib/fs.walk-1.2.8" - sources."@serialport/binding-abstract-9.2.3" - sources."@serialport/binding-mock-9.2.4" - sources."@serialport/bindings-9.2.8" - sources."@serialport/parser-byte-length-9.2.4" - sources."@serialport/parser-cctalk-9.2.4" - sources."@serialport/parser-delimiter-9.2.4" - sources."@serialport/parser-inter-byte-timeout-9.2.4" - sources."@serialport/parser-readline-9.2.4" - sources."@serialport/parser-ready-9.2.4" - sources."@serialport/parser-regex-9.2.4" - sources."@serialport/stream-9.2.4" - 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.18" - sources."@types/babel__generator-7.6.4" - sources."@types/babel__template-7.4.1" - sources."@types/babel__traverse-7.14.2" - sources."@types/debounce-https://registry.npmjs.org/@types/debounce/-/debounce-1.2.1.tgz" - sources."@types/debug-https://registry.npmjs.org/@types/debug/-/debug-4.1.7.tgz" - sources."@types/graceful-fs-4.1.5" - 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-https://registry.npmjs.org/@types/jest/-/jest-27.4.0.tgz" - sources."@types/json-schema-7.0.9" - sources."@types/ms-0.7.31" - sources."@types/mz-https://registry.npmjs.org/@types/mz/-/mz-2.7.4.tgz" - sources."@types/nedb-https://registry.npmjs.org/@types/nedb/-/nedb-1.8.12.tgz" - sources."@types/node-17.0.15" - sources."@types/prettier-2.4.3" - sources."@types/serialport-https://registry.npmjs.org/@types/serialport/-/serialport-8.0.2.tgz" - 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-https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.10.2.tgz" - sources."@typescript-eslint/parser-https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.10.2.tgz" - sources."@typescript-eslint/scope-manager-5.10.2" - sources."@typescript-eslint/type-utils-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" - sources."@typescript-eslint/visitor-keys-5.10.2" - sources."abab-2.0.5" - sources."acorn-8.7.0" - (sources."acorn-globals-6.0.0" // { - dependencies = [ - sources."acorn-7.4.1" - ]; - }) - sources."acorn-jsx-5.3.2" - sources."acorn-walk-7.2.0" - sources."agent-base-6.0.2" - sources."ajv-6.12.6" - (sources."ansi-escapes-4.3.2" // { - dependencies = [ - sources."type-fest-0.21.3" - ]; - }) - sources."ansi-regex-2.1.1" - sources."ansi-styles-3.2.1" - sources."any-promise-1.3.0" - sources."anymatch-3.1.2" - sources."aproba-1.2.0" - sources."are-we-there-yet-1.1.7" - sources."argparse-1.0.10" - sources."array-union-2.1.0" - sources."asynckit-0.4.0" - (sources."babel-jest-27.5.0" // { - 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."slash-3.0.0" - sources."supports-color-7.2.0" - ]; - }) - sources."babel-plugin-dynamic-import-node-2.3.3" - sources."babel-plugin-istanbul-6.1.1" - sources."babel-plugin-jest-hoist-27.5.0" - (sources."babel-plugin-polyfill-corejs2-0.3.1" // { - dependencies = [ - sources."semver-6.3.0" - ]; - }) - sources."babel-plugin-polyfill-corejs3-0.5.2" - sources."babel-plugin-polyfill-regenerator-0.3.1" - sources."babel-preset-current-node-syntax-1.0.1" - sources."babel-preset-jest-27.5.0" - sources."balanced-match-1.0.2" - sources."base64-js-1.5.1" - sources."binary-extensions-2.2.0" - sources."bindings-1.5.0" - (sources."bl-4.1.0" // { - dependencies = [ - sources."readable-stream-3.6.0" - ]; - }) - sources."brace-expansion-1.1.11" - sources."braces-3.0.2" - sources."browser-process-hrtime-1.0.0" - sources."browserslist-4.19.1" - sources."bser-2.1.1" - sources."buffer-5.7.1" - sources."buffer-from-1.1.2" - sources."call-bind-1.0.2" - sources."callsites-3.1.0" - sources."camelcase-5.3.1" - sources."caniuse-lite-1.0.30001307" - sources."chalk-2.4.2" - sources."char-regex-1.0.2" - sources."chokidar-3.5.3" - sources."chownr-1.1.4" - sources."ci-info-3.3.0" - sources."cjs-module-lexer-1.2.2" - (sources."cliui-7.0.4" // { - dependencies = [ - sources."ansi-regex-5.0.1" - sources."is-fullwidth-code-point-3.0.0" - sources."string-width-4.2.3" - sources."strip-ansi-6.0.1" - ]; - }) - sources."co-4.6.0" - sources."code-point-at-1.1.0" - sources."collect-v8-coverage-1.0.1" - sources."color-convert-1.9.3" - sources."color-name-1.1.3" - sources."combined-stream-1.0.8" - sources."commander-4.1.1" - 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.21.0" // { - dependencies = [ - sources."semver-7.0.0" - ]; - }) - sources."core-util-is-1.0.3" - sources."cross-spawn-7.0.3" - sources."cssom-0.4.4" - (sources."cssstyle-2.3.0" // { - dependencies = [ - sources."cssom-0.3.8" - ]; - }) - sources."data-urls-2.0.0" - sources."debounce-1.2.1" - sources."debug-4.3.3" - sources."decimal.js-10.3.1" - sources."decompress-response-6.0.0" - sources."dedent-0.7.0" - sources."deep-extend-0.6.0" - sources."deep-is-0.1.4" - sources."deepmerge-4.2.2" - sources."define-properties-1.1.3" - sources."delayed-stream-1.0.0" - sources."delegates-1.0.0" - sources."detect-libc-2.0.0" - sources."detect-newline-3.1.0" - sources."diff-sequences-27.5.0" - sources."dir-glob-3.0.1" - sources."doctrine-3.0.0" - (sources."domexception-2.0.1" // { - dependencies = [ - sources."webidl-conversions-5.0.0" - ]; - }) - sources."electron-to-chromium-1.4.65" - sources."emittery-0.8.1" - sources."emoji-regex-8.0.0" - sources."end-of-stream-1.4.4" - sources."escalade-3.1.1" - sources."escape-string-regexp-1.0.5" - (sources."escodegen-2.0.0" // { - dependencies = [ - sources."estraverse-5.3.0" - sources."levn-0.3.0" - sources."optionator-0.8.3" - sources."prelude-ls-1.1.2" - sources."source-map-0.6.1" - sources."type-check-0.3.2" - ]; - }) - (sources."eslint-https://registry.npmjs.org/eslint/-/eslint-8.8.0.tgz" // { - dependencies = [ - sources."ansi-regex-5.0.1" - sources."ansi-styles-4.3.0" - sources."argparse-2.0.1" - sources."chalk-4.1.2" - sources."color-convert-2.0.1" - sources."color-name-1.1.4" - sources."escape-string-regexp-4.0.0" - sources."eslint-scope-7.1.0" - sources."estraverse-5.3.0" - sources."glob-parent-6.0.2" - sources."globals-13.12.1" - sources."has-flag-4.0.0" - sources."js-yaml-4.1.0" - sources."strip-ansi-6.0.1" - sources."strip-json-comments-3.1.1" - sources."supports-color-7.2.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.2.0" - sources."espree-9.3.0" - sources."esprima-4.0.1" - (sources."esquery-1.4.0" // { - dependencies = [ - sources."estraverse-5.3.0" - ]; - }) - (sources."esrecurse-4.3.0" // { - dependencies = [ - sources."estraverse-5.3.0" - ]; - }) - sources."estraverse-4.3.0" - sources."esutils-2.0.3" - sources."execa-5.1.1" - sources."exit-0.1.2" - sources."expand-template-2.0.3" - sources."expect-27.5.0" - sources."fast-deep-equal-3.1.3" - 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" - sources."fb-watchman-2.0.1" - sources."file-entry-cache-6.0.1" - sources."file-uri-to-path-1.0.0" - sources."fill-range-7.0.1" - sources."find-up-4.1.0" - sources."flat-cache-3.0.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" - sources."fs.realpath-1.0.0" - sources."fsevents-2.3.2" - sources."function-bind-1.1.1" - sources."functional-red-black-tree-1.0.1" - sources."gauge-2.7.4" - sources."gensync-1.0.0-beta.2" - sources."get-caller-file-2.0.5" - sources."get-intrinsic-1.1.1" - sources."get-package-type-0.1.0" - sources."get-stream-6.0.1" - sources."github-from-package-0.0.0" - sources."glob-7.2.0" - sources."glob-parent-5.1.2" - sources."globals-11.12.0" - (sources."globby-11.1.0" // { - dependencies = [ - sources."slash-3.0.0" - ]; - }) - sources."graceful-fs-4.2.9" - (sources."handlebars-4.7.7" // { - dependencies = [ - sources."source-map-0.6.1" - ]; - }) - sources."has-1.0.3" - sources."has-flag-3.0.0" - sources."has-symbols-1.0.2" - sources."has-unicode-2.0.1" - sources."html-encoding-sniffer-2.0.1" - sources."html-escaper-2.0.2" - sources."http-proxy-agent-4.0.1" - sources."https-proxy-agent-5.0.0" - sources."human-signals-2.1.0" - sources."iconv-lite-0.4.24" - sources."ieee754-1.2.1" - sources."ignore-5.2.0" - (sources."import-fresh-3.3.0" // { - dependencies = [ - sources."resolve-from-4.0.0" - ]; - }) - 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.1" - sources."is-extglob-2.1.1" - sources."is-fullwidth-code-point-1.0.0" - sources."is-generator-fn-2.1.0" - sources."is-glob-4.0.3" - sources."is-number-7.0.0" - sources."is-potential-custom-element-name-1.0.1" - sources."is-stream-2.0.1" - sources."is-typedarray-1.0.0" - sources."isarray-1.0.0" - sources."isexe-2.0.0" - sources."istanbul-lib-coverage-3.2.0" - (sources."istanbul-lib-instrument-5.1.0" // { - dependencies = [ - sources."semver-6.3.0" - ]; - }) - (sources."istanbul-lib-report-3.0.0" // { - dependencies = [ - sources."has-flag-4.0.0" - sources."make-dir-3.1.0" - sources."semver-6.3.0" - sources."supports-color-7.2.0" - ]; - }) - (sources."istanbul-lib-source-maps-4.0.1" // { - dependencies = [ - sources."source-map-0.6.1" - ]; - }) - sources."istanbul-reports-3.1.4" - (sources."jest-https://registry.npmjs.org/jest/-/jest-27.5.0.tgz" // { - 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.5.0" - sources."supports-color-7.2.0" - ]; - }) - sources."jest-changed-files-27.5.0" - (sources."jest-circus-27.5.0" // { - 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."slash-3.0.0" - sources."supports-color-7.2.0" - ]; - }) - (sources."jest-config-27.5.0" // { - 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."slash-3.0.0" - sources."supports-color-7.2.0" - ]; - }) - (sources."jest-diff-27.5.0" // { - 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."supports-color-7.2.0" - ]; - }) - sources."jest-docblock-27.5.0" - (sources."jest-each-27.5.0" // { - 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."supports-color-7.2.0" - ]; - }) - sources."jest-environment-jsdom-27.5.0" - sources."jest-environment-node-27.5.0" - sources."jest-get-type-27.5.0" - sources."jest-haste-map-27.5.0" - (sources."jest-jasmine2-27.5.0" // { - 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."supports-color-7.2.0" - ]; - }) - sources."jest-leak-detector-27.5.0" - (sources."jest-matcher-utils-27.5.0" // { - 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."supports-color-7.2.0" - ]; - }) - (sources."jest-message-util-27.5.0" // { - 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."slash-3.0.0" - sources."supports-color-7.2.0" - ]; - }) - sources."jest-mock-27.5.0" - sources."jest-pnp-resolver-1.2.2" - sources."jest-regex-util-27.5.0" - (sources."jest-resolve-27.5.0" // { - 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."slash-3.0.0" - sources."supports-color-7.2.0" - ]; - }) - sources."jest-resolve-dependencies-27.5.0" - (sources."jest-runner-27.5.0" // { - 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."supports-color-7.2.0" - ]; - }) - (sources."jest-runtime-27.5.0" // { - 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."slash-3.0.0" - sources."supports-color-7.2.0" - ]; - }) - sources."jest-serializer-27.5.0" - (sources."jest-snapshot-27.5.0" // { - 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."supports-color-7.2.0" - ]; - }) - (sources."jest-util-27.5.0" // { - 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."supports-color-7.2.0" - ]; - }) - (sources."jest-validate-27.5.0" // { - dependencies = [ - sources."ansi-styles-4.3.0" - sources."camelcase-6.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."supports-color-7.2.0" - ]; - }) - (sources."jest-watcher-27.5.0" // { - 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."supports-color-7.2.0" - ]; - }) - (sources."jest-worker-27.5.0" // { - dependencies = [ - sources."has-flag-4.0.0" - sources."supports-color-8.1.1" - ]; - }) - sources."js-tokens-4.0.0" - sources."js-yaml-3.14.1" - sources."jsdom-16.7.0" - sources."jsesc-2.5.2" - sources."json-schema-traverse-0.4.1" - sources."json-stable-stringify-without-jsonify-1.0.1" - sources."json5-2.2.0" - sources."jsonc-parser-3.0.0" - sources."kleur-3.0.3" - sources."leven-3.1.0" - sources."levn-0.4.1" - sources."locate-path-5.0.0" - sources."lodash-4.17.21" - sources."lodash.debounce-4.0.8" - sources."lodash.merge-4.6.2" - sources."lru-cache-6.0.0" - sources."lunr-2.3.9" - (sources."make-dir-2.1.0" // { - dependencies = [ - sources."semver-5.7.1" - ]; - }) - sources."makeerror-1.0.12" - sources."marked-4.0.12" - sources."merge-stream-2.0.0" - sources."merge2-1.4.1" - sources."micromatch-4.0.4" - sources."mime-db-1.51.0" - sources."mime-types-2.1.34" - sources."mimic-fn-2.1.0" - sources."mimic-response-3.1.0" - sources."minimatch-3.0.4" - sources."minimist-1.2.5" - sources."mixin-deep-2.0.1" - sources."mkdirp-classic-0.5.3" - sources."ms-2.1.2" - sources."mz-2.7.0" - sources."nan-2.15.0" - sources."napi-build-utils-1.0.2" - sources."natural-compare-1.4.0" - sources."neo-async-2.6.2" - sources."node-abi-3.8.0" - sources."node-int64-0.4.0" - sources."node-releases-2.0.1" - sources."normalize-path-3.0.0" - sources."npm-run-path-4.0.1" - sources."npmlog-4.1.2" - sources."number-is-nan-1.0.1" - sources."nwsapi-2.2.0" - sources."object-assign-4.1.1" - sources."object-keys-1.1.1" - sources."object.assign-4.1.2" - sources."once-1.4.0" - sources."onetime-5.1.2" - sources."optionator-0.9.1" - sources."p-limit-2.3.0" - sources."p-locate-4.1.0" - sources."p-try-2.2.0" - sources."parent-module-1.0.1" - sources."parse5-6.0.1" - sources."path-exists-4.0.0" - sources."path-is-absolute-1.0.1" - sources."path-key-3.1.1" - sources."path-parse-1.0.7" - sources."path-type-4.0.0" - sources."picocolors-1.0.0" - sources."picomatch-2.3.1" - sources."pify-4.0.1" - sources."pirates-4.0.5" - sources."pkg-dir-4.2.0" - sources."prebuild-install-7.0.1" - sources."prelude-ls-1.2.1" - (sources."pretty-format-27.5.0" // { - dependencies = [ - sources."ansi-regex-5.0.1" - sources."ansi-styles-5.2.0" - ]; - }) - sources."process-nextick-args-2.0.1" - sources."prompts-2.4.2" - sources."psl-1.8.0" - sources."pump-3.0.0" - sources."punycode-2.1.1" - sources."queue-microtask-1.2.3" - sources."rc-1.2.8" - sources."react-is-17.0.2" - sources."readable-stream-2.3.7" - sources."readdirp-3.6.0" - sources."regenerate-1.4.2" - sources."regenerate-unicode-properties-10.0.1" - sources."regenerator-runtime-0.13.9" - sources."regenerator-transform-0.14.5" - sources."regexpp-3.2.0" - sources."regexpu-core-5.0.1" - sources."regjsgen-0.6.0" - (sources."regjsparser-0.8.4" // { - dependencies = [ - sources."jsesc-0.5.0" - ]; - }) - sources."require-directory-2.1.1" - sources."resolve-1.22.0" - sources."resolve-cwd-3.0.0" - sources."resolve-from-5.0.0" - sources."resolve.exports-1.1.0" - sources."reusify-1.0.4" - sources."rimraf-3.0.2" - sources."run-parallel-1.2.0" - sources."safe-buffer-5.1.2" - sources."safer-buffer-2.1.2" - sources."saxes-5.0.1" - sources."semver-7.3.5" - sources."serialport-9.2.8" - sources."set-blocking-2.0.0" - sources."shebang-command-2.0.0" - sources."shebang-regex-3.0.0" - sources."shiki-0.10.0" - sources."signal-exit-3.0.7" - sources."simple-concat-1.0.1" - sources."simple-get-4.0.1" - sources."sisteransi-1.0.5" - sources."slash-2.0.0" - sources."slip-1.0.2" - sources."source-map-0.5.7" - (sources."source-map-support-0.5.21" // { - dependencies = [ - sources."source-map-0.6.1" - ]; - }) - sources."sprintf-js-1.0.3" - (sources."stack-utils-2.0.5" // { - dependencies = [ - sources."escape-string-regexp-2.0.0" - ]; - }) - (sources."string-length-4.0.2" // { - dependencies = [ - sources."ansi-regex-5.0.1" - sources."strip-ansi-6.0.1" - ]; - }) - sources."string-width-1.0.2" - sources."string_decoder-1.1.1" - sources."strip-ansi-3.0.1" - sources."strip-bom-4.0.0" - sources."strip-final-newline-2.0.0" - sources."strip-json-comments-2.0.1" - sources."supports-color-5.5.0" - (sources."supports-hyperlinks-2.2.0" // { - dependencies = [ - sources."has-flag-4.0.0" - 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" // { - dependencies = [ - sources."readable-stream-3.6.0" - ]; - }) - sources."terminal-link-2.1.1" - sources."test-exclude-6.0.0" - sources."text-table-0.2.0" - sources."thenify-3.3.1" - sources."thenify-all-1.6.0" - sources."throat-6.0.1" - sources."tmpl-1.0.5" - sources."to-fast-properties-2.0.0" - sources."to-regex-range-5.0.1" - sources."tough-cookie-4.0.0" - sources."tr46-2.1.0" - sources."tslib-1.14.1" - sources."tsutils-3.21.0" - sources."tunnel-agent-0.6.0" - sources."type-check-0.4.0" - sources."type-detect-4.0.8" - sources."type-fest-0.20.2" - sources."typedarray-to-buffer-3.1.5" - sources."typedoc-https://registry.npmjs.org/typedoc/-/typedoc-0.22.11.tgz" - sources."typedoc-plugin-markdown-https://registry.npmjs.org/typedoc-plugin-markdown/-/typedoc-plugin-markdown-3.11.13.tgz" - sources."typedoc-plugin-no-inherit-https://registry.npmjs.org/typedoc-plugin-no-inherit/-/typedoc-plugin-no-inherit-1.3.1.tgz" - sources."typedoc-plugin-sourcefile-url-https://registry.npmjs.org/typedoc-plugin-sourcefile-url/-/typedoc-plugin-sourcefile-url-1.0.6.tgz" - sources."typescript-https://registry.npmjs.org/typescript/-/typescript-4.5.5.tgz" - 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" - sources."unicode-property-aliases-ecmascript-2.0.0" - sources."universalify-0.1.2" - 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.1" // { - dependencies = [ - sources."source-map-0.7.3" - ]; - }) - sources."vscode-oniguruma-1.6.1" - sources."vscode-textmate-5.2.0" - sources."w3c-hr-time-1.0.2" - sources."w3c-xmlserializer-2.0.0" - sources."walker-1.0.8" - 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."wide-align-1.1.5" - sources."word-wrap-1.2.3" - sources."wordwrap-1.0.0" - (sources."wrap-ansi-7.0.0" // { - dependencies = [ - sources."ansi-regex-5.0.1" - sources."ansi-styles-4.3.0" - sources."color-convert-2.0.1" - sources."color-name-1.1.4" - sources."is-fullwidth-code-point-3.0.0" - sources."string-width-4.2.3" - sources."strip-ansi-6.0.1" - ]; - }) - sources."wrappy-1.0.2" - sources."write-file-atomic-3.0.3" - sources."ws-7.5.6" - sources."xml-name-validator-3.0.0" - sources."xmlchars-2.2.0" - sources."y18n-5.0.8" - sources."yallist-4.0.0" - (sources."yargs-16.2.0" // { - dependencies = [ - sources."ansi-regex-5.0.1" - sources."is-fullwidth-code-point-3.0.0" - sources."string-width-4.2.3" - sources."strip-ansi-6.0.1" - ]; - }) - sources."yargs-parser-20.2.9" - ]; - }) - ]; - }) - sources."zigbee2mqtt-frontend-0.6.80" + sources."zigbee-herdsman-0.14.27" + sources."zigbee-herdsman-converters-14.0.504" + sources."zigbee2mqtt-frontend-0.6.83" ]; buildInputs = globalBuildInputs; meta = { From 509a6f1ebae10bf3c056ef49961768e5ca5a3406 Mon Sep 17 00:00:00 2001 From: Ashish SHUKLA Date: Tue, 3 May 2022 06:23:35 +0530 Subject: [PATCH 020/147] fnc: unbreak build Import a patch from upstream to be present in the next release --- pkgs/applications/version-management/fnc/default.nix | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/version-management/fnc/default.nix b/pkgs/applications/version-management/fnc/default.nix index 1e234dea5e3..3d0c7a9cd30 100644 --- a/pkgs/applications/version-management/fnc/default.nix +++ b/pkgs/applications/version-management/fnc/default.nix @@ -1,4 +1,4 @@ -{ lib, fetchurl, stdenv, zlib, ncurses, libiconv }: +{ lib, fetchurl, fetchpatch, stdenv, zlib, ncurses, libiconv }: stdenv.mkDerivation rec { pname = "fnc"; @@ -9,6 +9,15 @@ stdenv.mkDerivation rec { sha256 = "1phqxh0afky7q2qmhgjlsq1awbv4254yd8wpzxlww4p7a57cp0lk"; }; + patches = [ + (fetchpatch { + name = "sqlite3-upgrade.patch"; + url = "https://fnc.bsdbox.org/vpatch?from=12e8919d436f52ca&to=091ce838edf67f1d"; + sha256 = "sha256-uKSO+lCY6h7Wkv5T7zeagMbpDxj6oirA/bty6i6Py8s="; + }) + ]; + patchFlags = [ "-p0" ]; + buildInputs = [ libiconv ncurses zlib ]; makeFlags = [ "PREFIX=$(out)" ]; From a318ca39c9cbdf0b1e752f2d87d9bcd8ff230d68 Mon Sep 17 00:00:00 2001 From: Aaron Jheng Date: Tue, 3 May 2022 01:24:10 +0000 Subject: [PATCH 021/147] exoscale-cli: 1.52.1 -> 1.54.0 --- pkgs/tools/admin/exoscale-cli/default.nix | 27 +++++++++++------------ 1 file changed, 13 insertions(+), 14 deletions(-) diff --git a/pkgs/tools/admin/exoscale-cli/default.nix b/pkgs/tools/admin/exoscale-cli/default.nix index b05f3380426..a745c693305 100644 --- a/pkgs/tools/admin/exoscale-cli/default.nix +++ b/pkgs/tools/admin/exoscale-cli/default.nix @@ -1,33 +1,32 @@ -{ lib, buildGoPackage, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub }: -buildGoPackage rec { +buildGoModule rec { pname = "exoscale-cli"; - version = "1.52.1"; + version = "1.54.0"; src = fetchFromGitHub { - owner = "exoscale"; - repo = "cli"; - rev = "v${version}"; - sha256 = "sha256-CSltvSdKLAH711ubT6ROgkmq2EcFJplPmavsJa9xupM="; + owner = "exoscale"; + repo = "cli"; + rev = "v${version}"; + sha256 = "sha256-uvPJ1cOKMpDf1KfEPkSTWMIMNojUlfpqI1ESomX1MlM="; }; - goPackagePath = "github.com/exoscale/cli"; + vendorSha256 = null; - ldflags = [ "-s" "-w" "-X main.version=${version}" "-X main.commit=${src.rev}" ]; + excludedPackages = [ "./completion" "./docs" ]; - # ensures only the cli binary is built and we don't clutter bin/ with submodules - subPackages = [ "." ]; + ldflags = [ "-s" "-w" "-X main.version=${version}" "-X main.commit=${src.rev}" ]; # we need to rename the resulting binary but can't use buildFlags with -o here # because these are passed to "go install" which does not recognize -o postBuild = '' - mv go/bin/cli go/bin/exo + mv $GOPATH/bin/cli $GOPATH/bin/exo ''; meta = { description = "Command-line tool for everything at Exoscale: compute, storage, dns"; - homepage = "https://github.com/exoscale/cli"; - license = lib.licenses.asl20; + homepage = "https://github.com/exoscale/cli"; + license = lib.licenses.asl20; maintainers = with lib.maintainers; [ dramaturg ]; mainProgram = "exo"; }; From 35227e5abb956ae2885306ef4769617ed28427e7 Mon Sep 17 00:00:00 2001 From: Daniel Lambert Date: Mon, 2 May 2022 22:29:44 -0500 Subject: [PATCH 022/147] trunk: 0.14.0 -> 0.15.0 --- pkgs/development/tools/trunk/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/trunk/default.nix b/pkgs/development/tools/trunk/default.nix index 00cdae21e1f..3c40a0c0ce8 100644 --- a/pkgs/development/tools/trunk/default.nix +++ b/pkgs/development/tools/trunk/default.nix @@ -3,13 +3,13 @@ rustPlatform.buildRustPackage rec { pname = "trunk"; - version = "0.14.0"; + version = "0.15.0"; src = fetchFromGitHub { owner = "thedodd"; repo = "trunk"; rev = "v${version}"; - sha256 = "sha256-69MQDIF79pSuaOgZEIqb/ESPQzL7MUiQaJaxPccGxo8="; + sha256 = "sha256-VHUs/trR1M5WacEA0gwKLkGtsws9GFmn1vK0kRxpNII="; }; nativeBuildInputs = [ pkg-config ]; @@ -20,7 +20,7 @@ rustPlatform.buildRustPackage rec { # requires network checkFlags = [ "--skip=tools::tests::download_and_install_binaries" ]; - cargoSha256 = "sha256-3WTxCMNpBmiNbZMHp5BrqTXa1vmE/ZZ/8XbdcfxBfYg="; + cargoSha256 = "sha256-czXe9W+oR1UV7zGZiiHcbydzH6sowa/8upm+5lkPG1U="; meta = with lib; { homepage = "https://github.com/thedodd/trunk"; From 493c9e0d860ccd2c5dce3f4d60436a93d415a4a7 Mon Sep 17 00:00:00 2001 From: renesat Date: Mon, 2 May 2022 22:20:37 +0300 Subject: [PATCH 023/147] autorestic: 1.5.8 -> 1.7.1 --- pkgs/tools/backup/autorestic/default.nix | 8 ++++---- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/pkgs/tools/backup/autorestic/default.nix b/pkgs/tools/backup/autorestic/default.nix index d7b6af03164..45a359e0aad 100644 --- a/pkgs/tools/backup/autorestic/default.nix +++ b/pkgs/tools/backup/autorestic/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "autorestic"; - version = "1.5.8"; + version = "1.7.1"; src = fetchFromGitHub { owner = "cupcakearmy"; repo = pname; rev = "v${version}"; - sha256 = "sha256-0eq2u3DCNgfxsiE4lycf+xGIoEC3sZgEMha9+40j+9s="; + sha256 = "sha256-UUK5C26wM8LKQ7TE6DWEfzq+uPXH09B2Nybkfuqk+1o="; }; - vendorSha256 = "sha256-qYXdRpQT7x+Y5h8PuKGjsANXLqjNlsPKO76GQhnufTU="; + vendorSha256 = "sha256-eB24vCElnnk3EMKniCblmeRsFk0BQ0wFeBf0B8OPanE="; nativeBuildInputs = [ installShellFiles ]; @@ -27,6 +27,6 @@ buildGoModule rec { homepage = "https://github.com/cupcakearmy/autorestic"; license = licenses.asl20; maintainers = with maintainers; [ renesat ]; - platforms = platforms.linux ++ platforms.darwin; + mainProgram = "autorestic"; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 80bc32f334b..fbd4966780e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -161,7 +161,9 @@ with pkgs; autoconf = autoconf269; }; - autorestic = callPackage ../tools/backup/autorestic { }; + autorestic = callPackage ../tools/backup/autorestic { + buildGoModule = buildGo118Module; + }; autoPatchelfHook = makeSetupHook { name = "auto-patchelf-hook"; From e3f9f3a1b0d27301d97b1b4fb5a5d9157112da63 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 4 May 2022 01:29:05 +0000 Subject: [PATCH 024/147] brave: 1.38.109 -> 1.38.111 --- 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 ed9f16066b0..f6b2009655f 100644 --- a/pkgs/applications/networking/browsers/brave/default.nix +++ b/pkgs/applications/networking/browsers/brave/default.nix @@ -87,11 +87,11 @@ in stdenv.mkDerivation rec { pname = "brave"; - version = "1.38.109"; + version = "1.38.111"; src = fetchurl { url = "https://github.com/brave/brave-browser/releases/download/v${version}/brave-browser_${version}_amd64.deb"; - sha256 = "sha256-w/Wm8msW4etF6E1UDujLfixhxmKBcnB+uw/CMcj4jGI="; + sha256 = "sha256-sUTQktCQOVyXbw58u9ilFZaKg6D24Okpa+rUIO56ors="; }; dontConfigure = true; From 673e0e969fa5d9339f86dec2f39a2075a9ca4564 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=81tila=20Saraiva?= Date: Sat, 23 Apr 2022 00:37:57 -0300 Subject: [PATCH 025/147] kompute: init at 0.8.1 --- .../development/libraries/kompute/default.nix | 47 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 49 insertions(+) create mode 100644 pkgs/development/libraries/kompute/default.nix diff --git a/pkgs/development/libraries/kompute/default.nix b/pkgs/development/libraries/kompute/default.nix new file mode 100644 index 00000000000..426aaf3c581 --- /dev/null +++ b/pkgs/development/libraries/kompute/default.nix @@ -0,0 +1,47 @@ +{ lib +, stdenv +, fetchFromGitHub +, cmake +, vulkan-headers +, vulkan-loader +, fmt +, glslang +, ninja +}: + +stdenv.mkDerivation rec { + pname = "kompute"; + version = "0.8.1"; + + src = fetchFromGitHub { + owner = "KomputeProject"; + repo = "kompute"; + rev = "v${version}"; + sha256 = "sha256-OkVGYh8QrD7JNqWFBLrDTYlk6IYHdvt4i7UtC4sQTzo="; + }; + + cmakeFlags = [ + "-DKOMPUTE_OPT_INSTALL=1" + "-DRELEASE=1" + "-DKOMPUTE_ENABLE_SPDLOG=1" + ]; + + nativeBuildInputs = [ cmake ninja ]; + buildInputs = [ fmt ]; + propagatedBuildInputs = [ glslang vulkan-headers vulkan-loader ]; + + meta = with lib; { + description = "General purpose GPU compute framework built on Vulkan"; + longDescription = '' + General purpose GPU compute framework built on Vulkan to + support 1000s of cross vendor graphics cards (AMD, + Qualcomm, NVIDIA & friends). Blazing fast, mobile-enabled, + asynchronous and optimized for advanced GPU data + processing usecases. Backed by the Linux Foundation" + ''; + homepage = "https://kompute.cc/"; + license = licenses.asl20; + maintainers = with maintainers; [ atila ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7bb61f74238..c25c6251c3c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -33985,6 +33985,8 @@ with pkgs; kompose = callPackage ../applications/networking/cluster/kompose { }; + kompute = callPackage ../development/libraries/kompute { }; + kontemplate = callPackage ../applications/networking/cluster/kontemplate { }; # In general we only want keep the last three minor versions around that From 803098100746207bab1d1276f81383d439c80b8a Mon Sep 17 00:00:00 2001 From: Thomas Watson Date: Tue, 3 May 2022 20:57:46 -0500 Subject: [PATCH 026/147] qgroundcontrol: fix build Fixes build problems on x86_64 caused by a bug in their vendored version of gst-plugins-good. Unfortunately I can't `fetchpatch` the fix because it just changes a submodule pointer. The patch I added was generated from the fix at https://github.com/mavlink/qgroundcontrol/issues/10140 . --- .../robotics/qgroundcontrol/default.nix | 6 ++ .../robotics/qgroundcontrol/fix-10132.patch | 62 +++++++++++++++++++ 2 files changed, 68 insertions(+) create mode 100644 pkgs/applications/science/robotics/qgroundcontrol/fix-10132.patch diff --git a/pkgs/applications/science/robotics/qgroundcontrol/default.nix b/pkgs/applications/science/robotics/qgroundcontrol/default.nix index afd05c3e8f7..7a75c8edb2b 100644 --- a/pkgs/applications/science/robotics/qgroundcontrol/default.nix +++ b/pkgs/applications/science/robotics/qgroundcontrol/default.nix @@ -68,6 +68,12 @@ mkDerivation rec { fetchSubmodules = true; }; + patches = [ + # fix build problems caused by https://github.com/mavlink/qgroundcontrol/pull/10132 + # remove once updated past 4.2.0 + ./fix-10132.patch + ]; + meta = with lib; { description = "Provides full ground station support and configuration for the PX4 and APM Flight Stacks"; homepage = "http://qgroundcontrol.com/"; diff --git a/pkgs/applications/science/robotics/qgroundcontrol/fix-10132.patch b/pkgs/applications/science/robotics/qgroundcontrol/fix-10132.patch new file mode 100644 index 00000000000..0a666132f93 --- /dev/null +++ b/pkgs/applications/science/robotics/qgroundcontrol/fix-10132.patch @@ -0,0 +1,62 @@ +diff --git a/libs/qmlglsink/gst-plugins-good/ext/qt/gstqsgtexture.cc b/libs/qmlglsink/gst-plugins-good/ext/qt/gstqsgtexture.cc +index 2b314e0..ad1425e 100644 +--- a/libs/qmlglsink/gst-plugins-good/ext/qt/gstqsgtexture.cc ++++ b/libs/qmlglsink/gst-plugins-good/ext/qt/gstqsgtexture.cc +@@ -35,7 +35,7 @@ GST_DEBUG_CATEGORY_STATIC (GST_CAT_DEFAULT); + + GstQSGTexture::GstQSGTexture () + { +- static volatile gsize _debug; ++ static gsize _debug; + + initializeOpenGLFunctions(); + +diff --git a/libs/qmlglsink/gst-plugins-good/ext/qt/gstqtglutility.cc b/libs/qmlglsink/gst-plugins-good/ext/qt/gstqtglutility.cc +index 3a68576..5203d13 100644 +--- a/libs/qmlglsink/gst-plugins-good/ext/qt/gstqtglutility.cc ++++ b/libs/qmlglsink/gst-plugins-good/ext/qt/gstqtglutility.cc +@@ -58,7 +58,7 @@ gst_qt_get_gl_display () + { + GstGLDisplay *display = NULL; + QGuiApplication *app = static_cast (QCoreApplication::instance ()); +- static volatile gsize _debug; ++ static gsize _debug; + + g_assert (app != NULL); + +diff --git a/libs/qmlglsink/gst-plugins-good/ext/qt/qtitem.cc b/libs/qmlglsink/gst-plugins-good/ext/qt/qtitem.cc +index f031b36..3c6722a 100644 +--- a/libs/qmlglsink/gst-plugins-good/ext/qt/qtitem.cc ++++ b/libs/qmlglsink/gst-plugins-good/ext/qt/qtitem.cc +@@ -106,7 +106,7 @@ void InitializeSceneGraph::run() + + QtGLVideoItem::QtGLVideoItem() + { +- static volatile gsize _debug; ++ static gsize _debug; + + if (g_once_init_enter (&_debug)) { + GST_DEBUG_CATEGORY_INIT (GST_CAT_DEFAULT, "qtglwidget", 0, "Qt GL Widget"); +diff --git a/libs/qmlglsink/gst-plugins-good/ext/qt/qtwindow.cc b/libs/qmlglsink/gst-plugins-good/ext/qt/qtwindow.cc +index 8bf14ae..2f88aa9 100644 +--- a/libs/qmlglsink/gst-plugins-good/ext/qt/qtwindow.cc ++++ b/libs/qmlglsink/gst-plugins-good/ext/qt/qtwindow.cc +@@ -107,7 +107,7 @@ QtGLWindow::QtGLWindow ( QWindow * parent, QQuickWindow *src ) : + QQuickWindow( parent ), source (src) + { + QGuiApplication *app = static_cast (QCoreApplication::instance ()); +- static volatile gsize _debug; ++ static gsize _debug; + + g_assert (app != NULL); + +@@ -156,7 +156,7 @@ QtGLWindow::beforeRendering() + + g_mutex_lock (&this->priv->lock); + +- static volatile gsize once = 0; ++ static gsize once = 0; + if (g_once_init_enter(&once)) { + this->priv->start = QDateTime::currentDateTime().toMSecsSinceEpoch(); + g_once_init_leave(&once,1); + From e168e46338e1659bd4c366c685da31810466090b Mon Sep 17 00:00:00 2001 From: Daniel Nagy Date: Wed, 4 May 2022 10:43:07 +0200 Subject: [PATCH 027/147] chickenPackages: recurse into attrs This makes chicken packages (eggs) discoverable. This came up during: https://github.com/NixOS/nixpkgs/pull/165023#issuecomment-1116655349 --- pkgs/development/compilers/chicken/4/default.nix | 2 +- pkgs/development/compilers/chicken/5/default.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/chicken/4/default.nix b/pkgs/development/compilers/chicken/4/default.nix index 5445469b776..08952e028de 100644 --- a/pkgs/development/compilers/chicken/4/default.nix +++ b/pkgs/development/compilers/chicken/4/default.nix @@ -13,7 +13,7 @@ let bootstrap-chicken = self.chicken.override { bootstrap-chicken = null; }; }; - chickenEggs = callPackage ./eggs.nix { }; + chickenEggs = lib.recurseIntoAttrs (callPackage ./eggs.nix { }); egg2nix = callPackage ./egg2nix.nix { }; }; diff --git a/pkgs/development/compilers/chicken/5/default.nix b/pkgs/development/compilers/chicken/5/default.nix index 5445469b776..08952e028de 100644 --- a/pkgs/development/compilers/chicken/5/default.nix +++ b/pkgs/development/compilers/chicken/5/default.nix @@ -13,7 +13,7 @@ let bootstrap-chicken = self.chicken.override { bootstrap-chicken = null; }; }; - chickenEggs = callPackage ./eggs.nix { }; + chickenEggs = lib.recurseIntoAttrs (callPackage ./eggs.nix { }); egg2nix = callPackage ./egg2nix.nix { }; }; From 6051f8028dd0487d73a657b524e4247934d34350 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Thu, 5 May 2022 00:39:05 +0200 Subject: [PATCH 028/147] nixos/tools: move firefox into user packages Installing Firefox is a good example for a package that could be installed as a user, since it is a graphical one. Also use thunderbird as a second example. --- nixos/modules/installer/tools/tools.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/nixos/modules/installer/tools/tools.nix b/nixos/modules/installer/tools/tools.nix index bf5ec0f9690..8aff02dc118 100644 --- a/nixos/modules/installer/tools/tools.nix +++ b/nixos/modules/installer/tools/tools.nix @@ -177,6 +177,10 @@ in # users.users.jane = { # isNormalUser = true; # extraGroups = [ "wheel" ]; # Enable ‘sudo’ for the user. + # packages = with pkgs; [ + # firefox + # thunderbird + # ]; # }; # List packages installed in system profile. To search, run: @@ -184,7 +188,6 @@ in # environment.systemPackages = with pkgs; [ # vim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default. # wget - # firefox # ]; # Some programs need SUID wrappers, can be configured further or are From 160094c9ecfcc739c7779f69309b6fc713866663 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Thu, 5 May 2022 06:03:22 +0000 Subject: [PATCH 029/147] hydrus: 482 -> 483 --- pkgs/applications/graphics/hydrus/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/hydrus/default.nix b/pkgs/applications/graphics/hydrus/default.nix index 5a25ad3998f..39eefb00345 100644 --- a/pkgs/applications/graphics/hydrus/default.nix +++ b/pkgs/applications/graphics/hydrus/default.nix @@ -10,14 +10,14 @@ python3Packages.buildPythonPackage rec { pname = "hydrus"; - version = "482"; + version = "483"; format = "other"; src = fetchFromGitHub { owner = "hydrusnetwork"; repo = "hydrus"; rev = "refs/tags/v${version}"; - sha256 = "sha256-b7zMHwsyZv4dCn4Gd/2a+MHhT3IHISJup/zm95pEcQ4="; + sha256 = "sha256-UU3XQ0NC/apJ0S/uDDNG+8DOD+sRyX98yMcjtL2Htig="; }; nativeBuildInputs = [ From d4b3932c4433cb59d4b825d71622bb37fb988281 Mon Sep 17 00:00:00 2001 From: Malte Voos Date: Wed, 4 May 2022 23:49:16 +0200 Subject: [PATCH 030/147] bdfresize: init at 1.5 --- pkgs/tools/misc/bdfresize/default.nix | 20 +++++++++++++++++++ .../bdfresize/remove-malloc-declaration.patch | 11 ++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 3 files changed, 33 insertions(+) create mode 100644 pkgs/tools/misc/bdfresize/default.nix create mode 100644 pkgs/tools/misc/bdfresize/remove-malloc-declaration.patch diff --git a/pkgs/tools/misc/bdfresize/default.nix b/pkgs/tools/misc/bdfresize/default.nix new file mode 100644 index 00000000000..f1ac559fb67 --- /dev/null +++ b/pkgs/tools/misc/bdfresize/default.nix @@ -0,0 +1,20 @@ +{ lib, stdenv, fetchurl }: + +stdenv.mkDerivation rec { + pname = "bdfresize"; + version = "1.5"; + + src = fetchurl { + url = "http://openlab.ring.gr.jp/efont/dist/tools/bdfresize/${pname}-${version}.tar.gz"; + hash = "sha256-RAz8BiCgI35GNSwUoHdMqj8wWXWbCiDe/vyU6EkIl6Y="; + }; + + patches = [ ./remove-malloc-declaration.patch ]; + + meta = with lib; { + description = "Tool to resize BDF fonts"; + homepage = "http://openlab.ring.gr.jp/efont/dist/tools/bdfresize/"; + license = licenses.gpl2Only; + maintainers = with maintainers; [ malvo ]; + }; +} diff --git a/pkgs/tools/misc/bdfresize/remove-malloc-declaration.patch b/pkgs/tools/misc/bdfresize/remove-malloc-declaration.patch new file mode 100644 index 00000000000..c58888a4be2 --- /dev/null +++ b/pkgs/tools/misc/bdfresize/remove-malloc-declaration.patch @@ -0,0 +1,11 @@ +Remove an unneeded declaration of malloc so gcc doesn't complain. +--- a/charresize.c ++++ b/charresize.c +@@ -46,7 +46,6 @@ static int bit[8] = { 0x80, 0x40, 0x20, 0x10, 0x08, 0x04, 0x02, 0x01 }; + void + processChar(void) + { +- char *malloc(); + char *srcimage; + int *dstgray; + diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 0d30f0a6e41..0dabc262269 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -2615,6 +2615,8 @@ with pkgs; bdf2sfd = callPackage ../tools/misc/bdf2sfd { }; + bdfresize = callPackage ../tools/misc/bdfresize { }; + bcache-tools = callPackage ../tools/filesystems/bcache-tools { }; bchunk = callPackage ../tools/cd-dvd/bchunk { }; From dacd54d3f71303bffad8002084d2e117d8321464 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Fri, 29 Apr 2022 01:00:57 +0200 Subject: [PATCH 031/147] openjdk: mark major version 12 through 16 as EOL https://endoflife.date/java https://www.azul.com/products/azul-support-roadmap/ Related: #170825 --- pkgs/development/compilers/openjdk/11.nix | 2 +- pkgs/development/compilers/openjdk/12.nix | 2 +- pkgs/development/compilers/openjdk/13.nix | 2 +- pkgs/development/compilers/openjdk/14.nix | 2 +- pkgs/development/compilers/openjdk/15.nix | 2 +- pkgs/development/compilers/openjdk/16.nix | 2 +- pkgs/development/compilers/openjdk/17.nix | 2 +- pkgs/development/compilers/openjdk/darwin/11.nix | 2 +- pkgs/development/compilers/openjdk/darwin/16.nix | 2 +- pkgs/development/compilers/openjdk/darwin/17.nix | 2 +- pkgs/development/compilers/openjdk/darwin/8.nix | 2 +- pkgs/development/compilers/openjdk/darwin/meta.nix | 2 +- pkgs/development/compilers/openjdk/meta.nix | 5 ++++- 13 files changed, 16 insertions(+), 13 deletions(-) diff --git a/pkgs/development/compilers/openjdk/11.nix b/pkgs/development/compilers/openjdk/11.nix index 1a74a78fc6c..0dc085d032b 100644 --- a/pkgs/development/compilers/openjdk/11.nix +++ b/pkgs/development/compilers/openjdk/11.nix @@ -147,7 +147,7 @@ let disallowedReferences = [ openjdk11-bootstrap ]; - meta = import ./meta.nix lib; + meta = import ./meta.nix lib version; passthru = { architecture = ""; diff --git a/pkgs/development/compilers/openjdk/12.nix b/pkgs/development/compilers/openjdk/12.nix index 8f2b6d40546..addaa13270d 100644 --- a/pkgs/development/compilers/openjdk/12.nix +++ b/pkgs/development/compilers/openjdk/12.nix @@ -151,7 +151,7 @@ let disallowedReferences = [ openjdk11 ]; - meta = import ./meta.nix lib; + meta = import ./meta.nix lib version; passthru = { architecture = ""; diff --git a/pkgs/development/compilers/openjdk/13.nix b/pkgs/development/compilers/openjdk/13.nix index 7fb1c35cf9f..37ff9983378 100644 --- a/pkgs/development/compilers/openjdk/13.nix +++ b/pkgs/development/compilers/openjdk/13.nix @@ -151,7 +151,7 @@ let disallowedReferences = [ openjdk13-bootstrap ]; - meta = import ./meta.nix lib; + meta = import ./meta.nix lib version; passthru = { architecture = ""; diff --git a/pkgs/development/compilers/openjdk/14.nix b/pkgs/development/compilers/openjdk/14.nix index 29a5c3cc5c3..d4e88f278cd 100644 --- a/pkgs/development/compilers/openjdk/14.nix +++ b/pkgs/development/compilers/openjdk/14.nix @@ -147,7 +147,7 @@ let disallowedReferences = [ openjdk14-bootstrap ]; - meta = import ./meta.nix lib; + meta = import ./meta.nix lib version; passthru = { architecture = ""; diff --git a/pkgs/development/compilers/openjdk/15.nix b/pkgs/development/compilers/openjdk/15.nix index 987d018cdf3..e692de71a10 100644 --- a/pkgs/development/compilers/openjdk/15.nix +++ b/pkgs/development/compilers/openjdk/15.nix @@ -147,7 +147,7 @@ let disallowedReferences = [ openjdk15-bootstrap ]; - meta = import ./meta.nix lib; + meta = import ./meta.nix lib version; passthru = { architecture = ""; diff --git a/pkgs/development/compilers/openjdk/16.nix b/pkgs/development/compilers/openjdk/16.nix index 0a4a8e1de41..3e9ae98f366 100644 --- a/pkgs/development/compilers/openjdk/16.nix +++ b/pkgs/development/compilers/openjdk/16.nix @@ -154,7 +154,7 @@ let disallowedReferences = [ openjdk16-bootstrap ]; - meta = import ./meta.nix lib; + meta = import ./meta.nix lib version.feature; passthru = { architecture = ""; diff --git a/pkgs/development/compilers/openjdk/17.nix b/pkgs/development/compilers/openjdk/17.nix index de12711894f..45acc7f1ce9 100644 --- a/pkgs/development/compilers/openjdk/17.nix +++ b/pkgs/development/compilers/openjdk/17.nix @@ -157,7 +157,7 @@ let disallowedReferences = [ openjdk17-bootstrap ]; - meta = import ./meta.nix lib; + meta = import ./meta.nix lib version.feature; passthru = { architecture = ""; diff --git a/pkgs/development/compilers/openjdk/darwin/11.nix b/pkgs/development/compilers/openjdk/darwin/11.nix index d8c1bb6bf25..1ca2901b048 100644 --- a/pkgs/development/compilers/openjdk/darwin/11.nix +++ b/pkgs/development/compilers/openjdk/darwin/11.nix @@ -86,7 +86,7 @@ let home = jdk; }; - meta = import ./meta.nix lib; + meta = import ./meta.nix lib version; }; in jdk diff --git a/pkgs/development/compilers/openjdk/darwin/16.nix b/pkgs/development/compilers/openjdk/darwin/16.nix index d491d75322f..b8f6b2d62ad 100644 --- a/pkgs/development/compilers/openjdk/darwin/16.nix +++ b/pkgs/development/compilers/openjdk/darwin/16.nix @@ -86,7 +86,7 @@ let home = jdk; }; - meta = import ./meta.nix lib; + meta = import ./meta.nix lib version; }; in jdk diff --git a/pkgs/development/compilers/openjdk/darwin/17.nix b/pkgs/development/compilers/openjdk/darwin/17.nix index 98e6fc6216e..2720a887565 100644 --- a/pkgs/development/compilers/openjdk/darwin/17.nix +++ b/pkgs/development/compilers/openjdk/darwin/17.nix @@ -75,7 +75,7 @@ let home = jdk; }; - meta = import ./meta.nix lib; + meta = import ./meta.nix lib version; }; in jdk diff --git a/pkgs/development/compilers/openjdk/darwin/8.nix b/pkgs/development/compilers/openjdk/darwin/8.nix index aeb60d8bc46..3048c53f10f 100644 --- a/pkgs/development/compilers/openjdk/darwin/8.nix +++ b/pkgs/development/compilers/openjdk/darwin/8.nix @@ -90,7 +90,7 @@ let home = jdk; }; - meta = import ./meta.nix lib; + meta = import ./meta.nix lib version; }; in jdk diff --git a/pkgs/development/compilers/openjdk/darwin/meta.nix b/pkgs/development/compilers/openjdk/darwin/meta.nix index abe469af691..f07a7f38a45 100644 --- a/pkgs/development/compilers/openjdk/darwin/meta.nix +++ b/pkgs/development/compilers/openjdk/darwin/meta.nix @@ -1,4 +1,4 @@ -lib: (removeAttrs (import ../meta.nix lib) [ "maintainers" ]) // { +lib: version: (removeAttrs (import ../meta.nix lib version) [ "maintainers" ]) // { platforms = lib.platforms.darwin; homepage = "https://www.azul.com/"; } diff --git a/pkgs/development/compilers/openjdk/meta.nix b/pkgs/development/compilers/openjdk/meta.nix index d635d5c01e6..c66ecc29cf5 100644 --- a/pkgs/development/compilers/openjdk/meta.nix +++ b/pkgs/development/compilers/openjdk/meta.nix @@ -1,8 +1,11 @@ -lib: with lib; { +lib: version: with lib; { homepage = "https://openjdk.java.net/"; license = licenses.gpl2Only; description = "The open-source Java Development Kit"; maintainers = with maintainers; [ edwtjo asbachb ]; platforms = [ "i686-linux" "x86_64-linux" "aarch64-linux" "armv7l-linux" "armv6l-linux" ]; mainProgram = "java"; + knownVulnerabilities = optionals (builtins.elem (versions.major version) [ "12" "13" "14" "15" "16" ]) [ + "This OpenJDK version has reached its end of life." + ]; } From 8e56de6925a2c36dcef5c912da34d959049051f1 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Thu, 5 May 2022 22:29:30 +0100 Subject: [PATCH 032/147] btrfs-progs: 5.16.2 -> 5.17 Added trivial updater. Updated build-time doc dependencies from asciidoc to sphinx. Changes: https://github.com/kdave/btrfs-progs/blob/master/CHANGES --- pkgs/tools/filesystems/btrfs-progs/default.nix | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/pkgs/tools/filesystems/btrfs-progs/default.nix b/pkgs/tools/filesystems/btrfs-progs/default.nix index fad1944c4a0..f9e5340802e 100644 --- a/pkgs/tools/filesystems/btrfs-progs/default.nix +++ b/pkgs/tools/filesystems/btrfs-progs/default.nix @@ -1,22 +1,24 @@ { lib, stdenv, fetchurl -, asciidoc, docbook_xml_dtd_45, docbook_xsl, libxslt, pkg-config, python3, xmlto +, pkg-config, python3, sphinx , zstd , acl, attr, e2fsprogs, libuuid, lzo, udev, zlib , runCommand, btrfs-progs +, gitUpdater }: stdenv.mkDerivation rec { pname = "btrfs-progs"; - version = "5.16.2"; + version = "5.17"; src = fetchurl { url = "mirror://kernel/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v${version}.tar.xz"; - sha256 = "sha256-npswOh0P2c6q8gTudMHI+h/VV5TiI9n+K8Yodey9U9I="; + sha256 = "sha256-Y7d4/kwrrRjjcdzljtNUiOCPWDkhNnRU/diFB6PQ2J4="; }; nativeBuildInputs = [ - pkg-config asciidoc xmlto docbook_xml_dtd_45 docbook_xsl libxslt + pkg-config python3 python3.pkgs.setuptools + sphinx ]; buildInputs = [ acl attr e2fsprogs libuuid lzo python3 zlib zstd ] ++ lib.optionals stdenv.hostPlatform.isGnu [ udev ]; @@ -47,6 +49,14 @@ stdenv.mkDerivation rec { [ -e $out/success ] ''; }; + + passthru.updateScript = gitUpdater { + inherit pname version; + # No nicer place to find latest release. + url = "https://github.com/kdave/btrfs-progs.git"; + rev-prefix = "v"; + }; + meta = with lib; { description = "Utilities for the btrfs filesystem"; homepage = "https://btrfs.wiki.kernel.org/"; From 97a2e11a75b9f5cc30e4e68bd901d39dd372e485 Mon Sep 17 00:00:00 2001 From: Aaron Jheng Date: Fri, 6 May 2022 00:14:39 +0000 Subject: [PATCH 033/147] protobuf: remove 3.1 --- pkgs/development/libraries/protobuf/3.1.nix | 6 ------ pkgs/top-level/all-packages.nix | 1 - 2 files changed, 7 deletions(-) delete mode 100644 pkgs/development/libraries/protobuf/3.1.nix diff --git a/pkgs/development/libraries/protobuf/3.1.nix b/pkgs/development/libraries/protobuf/3.1.nix deleted file mode 100644 index 91ef87512c8..00000000000 --- a/pkgs/development/libraries/protobuf/3.1.nix +++ /dev/null @@ -1,6 +0,0 @@ -{ callPackage, ... }: - -callPackage ./generic-v3.nix { - version = "3.1.0"; - sha256 = "0qlvpsmqgh9nw0k4zrxlxf75pafi3p0ahz99v6761b903y8qyv4i"; -} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8172605a210..adeb5e2e5f4 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20126,7 +20126,6 @@ with pkgs; protobuf3_8 = callPackage ../development/libraries/protobuf/3.8.nix { }; protobuf3_7 = callPackage ../development/libraries/protobuf/3.7.nix { }; protobuf3_6 = callPackage ../development/libraries/protobuf/3.6.nix { }; - protobuf3_1 = callPackage ../development/libraries/protobuf/3.1.nix { }; protobufc = callPackage ../development/libraries/protobufc/1.3.nix { }; From 64436e0df5cfea5e8ddfa85ab21aabf9e78f446d Mon Sep 17 00:00:00 2001 From: Evils Date: Fri, 6 May 2022 04:48:05 +0200 Subject: [PATCH 034/147] kicad: 6.0.4 -> 6.0.5 --- .../science/electronics/kicad/versions.nix | 22 +++++++++---------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/pkgs/applications/science/electronics/kicad/versions.nix b/pkgs/applications/science/electronics/kicad/versions.nix index 9adfac344b3..7c19d5416a7 100644 --- a/pkgs/applications/science/electronics/kicad/versions.nix +++ b/pkgs/applications/science/electronics/kicad/versions.nix @@ -3,23 +3,23 @@ { "kicad" = { kicadVersion = { - version = "6.0.4"; + version = "6.0.5"; src = { - rev = "6f826c9f35a3dc9a104bb24a0a89a2e04b2d9721"; - sha256 = "0lki59ws0ncqkp9wxrhyni1ck2sx5z07mmpkjg0d9jpkync9hx9y"; + rev = "a6ca702e916df70e499615d8613102e780e96a40"; + sha256 = "19mg672h1gjdvnkp13cpkhk67xpwms72y4gd6g8983fcsxr8nq23"; }; }; libVersion = { - version = "6.0.4"; + version = "6.0.5"; libSources = { - symbols.rev = "9d00fbb9373571e54d9f29985b21a03d862795a4"; - symbols.sha256 = "12lyc187337bf2frl3jvwqdwwnd69f7l414k3kxhccs3sa2mcf1y"; - templates.rev = "c4f4fe4b821e062a3ddd275f9313d5d81ff8f8d7"; + symbols.rev = "c7f82c947ab3a1afec8d7b602ee7c6bfdfb24693"; + symbols.sha256 = "1dhgdp08ah08fc5nvwkqmgpl2any9vgy1gykmyzsd4dl8hhvznh5"; + templates.rev = "5ec65bfd3ecefaf85f79db02981f0568fe8b0eb8"; templates.sha256 = "13h9ly6amiwm7zkwa2fd9730kh295ls8j95fszlfjp9rczv2yyzm"; - footprints.rev = "c48d3dfcfa6ce58ec11e10b7a74878bb69fae580"; - footprints.sha256 = "0px2g9jansky0rvc0bdjylbmv8xwhc0q63g88hd2nzbknqli9f1y"; - packages3d.rev = "b1de0b5c3edc16999602b809a05017da62ff52cc"; - packages3d.sha256 = "0ms9py93qyihxrhh9wm2ziycmdn88m36r8adx22ynjnxixw1f9ja"; + footprints.rev = "35e3d08f1ab23b5b08ba903572776aab6de7499f"; + footprints.sha256 = "0sxzd4dr1g12ck8b2wsyg9r2s1j3472nksrjrwpzjdyfc8rqbjai"; + packages3d.rev = "6ea94caf40c4bdccecb569e81ed82b902d4c104e"; + packages3d.sha256 = "00i6mybg3pprzb283b26z5b2g7a8sbghlvc0fwk9gwrp3wz1yqzc"; }; }; }; From a198efc31350f957f9b10df0cf40bbb7223ed57a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 6 May 2022 02:37:19 +0000 Subject: [PATCH 035/147] python3Packages.python-memcached: 1.51 -> 1.59 Also rename from memcached to python-memcached. --- .../python-modules/beaker/default.nix | 10 ++--- .../python-modules/cachy/default.nix | 4 +- pkgs/development/python-modules/django/4.nix | 4 +- .../python-modules/graphite-web/default.nix | 4 +- .../python-modules/influxgraph/default.nix | 10 +---- .../python-modules/memcached/default.nix | 27 ------------- .../python-memcached/default.nix | 40 +++++++++++++++++++ pkgs/top-level/python-aliases.nix | 1 + pkgs/top-level/python-packages.nix | 4 +- 9 files changed, 54 insertions(+), 50 deletions(-) delete mode 100644 pkgs/development/python-modules/memcached/default.nix create mode 100644 pkgs/development/python-modules/python-memcached/default.nix diff --git a/pkgs/development/python-modules/beaker/default.nix b/pkgs/development/python-modules/beaker/default.nix index 60823b4c077..c455ee50284 100644 --- a/pkgs/development/python-modules/beaker/default.nix +++ b/pkgs/development/python-modules/beaker/default.nix @@ -5,7 +5,7 @@ , glibcLocales , nose , pylibmc -, memcached +, python-memcached , redis , pymongo , mock @@ -42,7 +42,7 @@ buildPythonPackage rec { checkInputs = [ glibcLocales - memcached + python-memcached mock nose pylibmc @@ -52,11 +52,7 @@ buildPythonPackage rec { ]; # Can not run memcached tests because it immediately tries to connect - postPatch = lib.optionalString isPy3k '' - substituteInPlace setup.py \ - --replace "python-memcached" "python3-memcached" - '' + '' - + postPatch = '' rm tests/test_memcached.py ''; diff --git a/pkgs/development/python-modules/cachy/default.nix b/pkgs/development/python-modules/cachy/default.nix index 278dd5a8ae6..c88067146f3 100644 --- a/pkgs/development/python-modules/cachy/default.nix +++ b/pkgs/development/python-modules/cachy/default.nix @@ -1,6 +1,6 @@ { lib, buildPythonPackage, fetchPypi , redis -, memcached +, python-memcached , msgpack }: @@ -15,7 +15,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ redis - memcached + python-memcached msgpack ]; diff --git a/pkgs/development/python-modules/django/4.nix b/pkgs/development/python-modules/django/4.nix index db005067981..f36c064a647 100644 --- a/pkgs/development/python-modules/django/4.nix +++ b/pkgs/development/python-modules/django/4.nix @@ -22,7 +22,7 @@ , docutils , geoip2 , jinja2 -, memcached +, python-memcached , numpy , pillow , pylibmc @@ -76,7 +76,7 @@ buildPythonPackage rec { docutils geoip2 jinja2 - memcached + python-memcached numpy pillow pylibmc diff --git a/pkgs/development/python-modules/graphite-web/default.nix b/pkgs/development/python-modules/graphite-web/default.nix index cf188e1d5d1..cb05a8104bf 100644 --- a/pkgs/development/python-modules/graphite-web/default.nix +++ b/pkgs/development/python-modules/graphite-web/default.nix @@ -2,7 +2,7 @@ , buildPythonPackage , fetchPypi , django -, memcached +, python-memcached , txamqp , django_tagging , gunicorn @@ -36,7 +36,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ django - memcached + python-memcached txamqp django_tagging gunicorn diff --git a/pkgs/development/python-modules/influxgraph/default.nix b/pkgs/development/python-modules/influxgraph/default.nix index c8403cf6446..7f24e1fd87e 100644 --- a/pkgs/development/python-modules/influxgraph/default.nix +++ b/pkgs/development/python-modules/influxgraph/default.nix @@ -1,5 +1,5 @@ { lib, buildPythonPackage, fetchPypi, isPy3k -, influxdb, graphite_api, memcached +, influxdb, graphite_api, python-memcached }: buildPythonPackage rec { @@ -11,13 +11,7 @@ buildPythonPackage rec { sha256 = "0l33sfwdh4bfprmzp2kx0d9098g6yxbnhyyx9qr3kzczpm0jg9vy"; }; - patchPhase = lib.optionalString isPy3k '' - sed 's/python-memcached/python3-memcached/' \ - -i ./influxgraph.egg-info/requires.txt \ - -i ./setup.py - ''; - - propagatedBuildInputs = [ influxdb graphite_api memcached ]; + propagatedBuildInputs = [ influxdb graphite_api python-memcached ]; passthru.moduleName = "influxgraph.InfluxDBFinder"; diff --git a/pkgs/development/python-modules/memcached/default.nix b/pkgs/development/python-modules/memcached/default.nix deleted file mode 100644 index e7a41d7b238..00000000000 --- a/pkgs/development/python-modules/memcached/default.nix +++ /dev/null @@ -1,27 +0,0 @@ -{ lib -, buildPythonPackage -, fetchurl -, fetchPypi -, isPy3k -}: - -buildPythonPackage rec { - pname = "memcached"; - version = "1.51"; - - src = if isPy3k then fetchPypi { - inherit version; - pname = "python3-${pname}"; - sha256 = "0na8b369q8fivh3y0nvzbvhh3lgvxiyyv9xp93cnkvwfsr8mkgkw"; - } else fetchurl { - url = "http://ftp.tummy.com/pub/python-memcached/old-releases/python-${pname}-${version}.tar.gz"; - sha256 = "124s98m6hvxj6x90d7aynsjfz878zli771q96ns767r2mbqn7192"; - }; - - meta = with lib; { - description = "Python API for communicating with the memcached distributed memory object cache daemon"; - homepage = "https://github.com/linsomniac/python-memcached"; - license = licenses.psfl; - }; - -} diff --git a/pkgs/development/python-modules/python-memcached/default.nix b/pkgs/development/python-modules/python-memcached/default.nix new file mode 100644 index 00000000000..1f69062a64e --- /dev/null +++ b/pkgs/development/python-modules/python-memcached/default.nix @@ -0,0 +1,40 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub +, six +, mock +, pytestCheckHook +}: + +buildPythonPackage rec { + pname = "python-memcached"; + version = "1.59"; + + src = fetchFromGitHub { + owner = "linsomniac"; + repo = "python-memcached"; + rev = version; + hash = "sha256-tHqkwNloPTXOrEGtuDLu1cTw4SKJ4auv8UUbqdNp698="; + }; + + propagatedBuildInputs = [ + six + ]; + + checkInputs = [ + mock + pytestCheckHook + ]; + + # all tests fail + doCheck = false; + + pythonImportsCheck = [ "memcache" ]; + + meta = with lib; { + description = "Pure python memcached client"; + homepage = "https://github.com/linsomniac/python-memcached"; + license = licenses.psfl; + maintainers = with maintainers; [ dotlambda ]; + }; +} diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix index 0dcb33f7965..979e47663fa 100644 --- a/pkgs/top-level/python-aliases.nix +++ b/pkgs/top-level/python-aliases.nix @@ -82,6 +82,7 @@ mapAliases ({ loo-py = loopy; # added 2022-05-03 Markups = markups; # added 2022-02-14 MechanicalSoup = mechanicalsoup; # added 2021-06-01 + memcached = python-memcached; # added 2022-05-06 net2grid = gridnet; # add 2022-04-22 nose-cover3 = throw "nose-cover3 has been removed, it was using setuptools 2to3 translation feature, which has been removed in setuptools 58"; # added 2022-02-16 pam = python-pam; # added 2020-09-07. diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 8ebd87e812a..4fedb308f84 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -5185,8 +5185,6 @@ in { meld3 = callPackage ../development/python-modules/meld3 { }; - memcached = callPackage ../development/python-modules/memcached { }; - memory-allocator = callPackage ../development/python-modules/memory-allocator { }; memory_profiler = callPackage ../development/python-modules/memory_profiler { }; @@ -6463,6 +6461,8 @@ in { python-lsp-black = callPackage ../development/python-modules/python-lsp-black { }; + python-memcached = callPackage ../development/python-modules/python-memcached { }; + python-openems = callPackage ../development/python-modules/python-openems { }; python-openzwave-mqtt = callPackage ../development/python-modules/python-openzwave-mqtt { }; From 4c3c753c443e47f34e3d52acc5dc0014fe0c3e27 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Fri, 6 May 2022 04:20:00 +0000 Subject: [PATCH 036/147] buildkit: 0.10.1 -> 0.10.3 https://github.com/moby/buildkit/releases/tag/v0.10.2 https://github.com/moby/buildkit/releases/tag/v0.10.3 --- pkgs/development/tools/buildkit/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/tools/buildkit/default.nix b/pkgs/development/tools/buildkit/default.nix index 88f8846a47b..b8cef88f71a 100644 --- a/pkgs/development/tools/buildkit/default.nix +++ b/pkgs/development/tools/buildkit/default.nix @@ -2,13 +2,13 @@ buildGoModule rec { pname = "buildkit"; - version = "0.10.1"; + version = "0.10.3"; src = fetchFromGitHub { owner = "moby"; repo = "buildkit"; rev = "v${version}"; - sha256 = "sha256-qMSXz4ZJ0po+Qi/K3Q/51MgHBO4tOa+DHw6Ok0yYc+k="; + sha256 = "sha256-hZINmKzLB0nFVVP8eXK2ghe4Emmuq55w0vDwLw8XuJk="; }; vendorSha256 = null; From fbf81f9e47172905445f3cef909b43abb3ebcbf3 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Fri, 6 May 2022 04:20:00 +0000 Subject: [PATCH 037/147] spglib: 1.16.3 -> 1.16.5 --- pkgs/development/libraries/spglib/default.nix | 13 ++++++++----- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/pkgs/development/libraries/spglib/default.nix b/pkgs/development/libraries/spglib/default.nix index 6d973f36c02..e1472b594a4 100644 --- a/pkgs/development/libraries/spglib/default.nix +++ b/pkgs/development/libraries/spglib/default.nix @@ -1,24 +1,27 @@ -{ stdenv, lib, fetchFromGitHub, cmake } : +{ stdenv, lib, fetchFromGitHub, cmake, openmp }: stdenv.mkDerivation rec { pname = "spglib"; - version = "1.16.3"; + version = "1.16.5"; # N.B: if you change this, please update: pythonPackages.spglib src = fetchFromGitHub { - owner = "atztogo"; + owner = "spglib"; repo = "spglib"; rev = "v${version}"; - sha256 = "sha256-sM6+RBAVc2aJYlWatdD4nYZkFnaTFVjBzd/VDSSA+kk="; + sha256 = "sha256-BbqyL7WJ/jpOls1MmY7VNCN+OlF6u4uz/pZjMAqk87w="; }; nativeBuildInputs = [ cmake ]; + buildInputs = lib.optionals stdenv.isDarwin [ openmp ]; + checkTarget = "check"; doCheck = true; meta = with lib; { description = "C library for finding and handling crystal symmetries"; - homepage = "https://atztogo.github.io/spglib/"; + homepage = "https://spglib.github.io/spglib/"; + changelog = "https://github.com/spglib/spglib/raw/v${version}/ChangeLog"; license = licenses.bsd3; maintainers = [ maintainers.markuskowa ]; platforms = platforms.all; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 87782f38ea5..b59bac6a26f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -10362,7 +10362,9 @@ with pkgs; jdk = jdk11; }; - spglib = callPackage ../development/libraries/spglib { }; + spglib = callPackage ../development/libraries/spglib { + inherit (llvmPackages) openmp; + }; spicy = callPackage ../development/tools/spicy { }; From 4fa28aadcdd1015a2e42000ab68ac1575626f04b Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Fri, 6 May 2022 04:20:00 +0000 Subject: [PATCH 038/147] python39Packages.pdfminer: 20220319 -> 20220506 https://github.com/pdfminer/pdfminer.six/releases/tag/20220506 --- .../python-modules/ocrmypdf/default.nix | 2 +- .../python-modules/pdfminer_six/default.nix | 24 +++++++++++++++---- 2 files changed, 21 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/ocrmypdf/default.nix b/pkgs/development/python-modules/ocrmypdf/default.nix index 72565e55419..6700b88479d 100644 --- a/pkgs/development/python-modules/ocrmypdf/default.nix +++ b/pkgs/development/python-modules/ocrmypdf/default.nix @@ -83,7 +83,7 @@ buildPythonPackage rec { postPatch = '' # https://github.com/ocrmypdf/OCRmyPDF/issues/933 substituteInPlace setup.cfg \ - --replace "pdfminer.six!=20200720,>=20191110,<=20211012" "pdfminer.six!=20200720,>=20191110,<=20220319" + --replace "pdfminer.six!=20200720,>=20191110,<=20220319" "pdfminer.six!=20200720,>=20191110" ''; pythonImportsCheck = [ diff --git a/pkgs/development/python-modules/pdfminer_six/default.nix b/pkgs/development/python-modules/pdfminer_six/default.nix index 449ea4f7fd7..b52106af285 100644 --- a/pkgs/development/python-modules/pdfminer_six/default.nix +++ b/pkgs/development/python-modules/pdfminer_six/default.nix @@ -1,8 +1,16 @@ -{ lib, buildPythonPackage, fetchFromGitHub, isPy3k, cryptography, chardet, pytestCheckHook }: +{ lib +, buildPythonPackage +, fetchFromGitHub +, isPy3k +, cryptography +, charset-normalizer +, pytestCheckHook +, ocrmypdf +}: buildPythonPackage rec { pname = "pdfminer_six"; - version = "20220319"; + version = "20220506"; disabled = !isPy3k; @@ -10,10 +18,10 @@ buildPythonPackage rec { owner = "pdfminer"; repo = "pdfminer.six"; rev = version; - sha256 = "sha256-sjO7jmHSe4EDmJ1rfiXx+lsHxc+DfKeMet37Nbg03WQ="; + sha256 = "sha256-Lq+ou7+Lmr1H69L8X/vuky+/tXDD3bBBaCysymeRuXA="; }; - propagatedBuildInputs = [ chardet cryptography ]; + propagatedBuildInputs = [ charset-normalizer cryptography ]; postInstall = '' for file in $out/bin/*.py; do @@ -27,8 +35,16 @@ buildPythonPackage rec { substituteInPlace pdfminer/__init__.py --replace "__VERSION__" ${version} ''; + pythonImportsCheck = [ "pdfminer" ]; + checkInputs = [ pytestCheckHook ]; + passthru = { + tests = { + inherit ocrmypdf; + }; + }; + meta = with lib; { description = "PDF parser and analyzer"; homepage = "https://github.com/pdfminer/pdfminer.six"; From 3592ccf6cc19460bf585a61d43ebedd28cc34018 Mon Sep 17 00:00:00 2001 From: Evils Date: Fri, 6 May 2022 06:20:03 +0200 Subject: [PATCH 039/147] kicad-unstable: 2022-03-19 -> 2022-05-06 --- .../science/electronics/kicad/versions.nix | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/science/electronics/kicad/versions.nix b/pkgs/applications/science/electronics/kicad/versions.nix index 9adfac344b3..6942d0f6801 100644 --- a/pkgs/applications/science/electronics/kicad/versions.nix +++ b/pkgs/applications/science/electronics/kicad/versions.nix @@ -25,23 +25,23 @@ }; "kicad-unstable" = { kicadVersion = { - version = "2022-03-19"; + version = "2022-05-06"; src = { - rev = "58c146a7c00ee64ca07cacbcc594121f40aa2aeb"; - sha256 = "0gcbl11pq0dgp590hdwsh5np7spixk5kgva0v8mx9rqd374z4bdm"; + rev = "dfdedfa605f58711d286d6e24e4ae9b5f75444e6"; + sha256 = "1bs7s2x0zh3wbk2hawg47v1s3nidmcl0xaardbpiafrrnh1qprf2"; }; }; libVersion = { - version = "2022-03-19"; + version = "2022-05-06"; libSources = { - symbols.rev = "9b8d3163450172a7f368462c6d005841ad199144"; - symbols.sha256 = "12lyc187337bf2frl3jvwqdwwnd69f7l414k3kxhccs3sa2mcf1y"; + symbols.rev = "e1d70243a68a721a9f94a7df1d04c9c6ebc056ef"; + symbols.sha256 = "0gbl22g73cms9jrk9f6dlgd3ksnhiik39aywfm15m98jfglnlbg8"; templates.rev = "a27d83f0a20f0be0c1ab04b139a0c518da51a5d4"; templates.sha256 = "13h9ly6amiwm7zkwa2fd9730kh295ls8j95fszlfjp9rczv2yyzm"; - footprints.rev = "c871df2c81a894bc5e91d2d517b76884d5a918aa"; - footprints.sha256 = "0px2g9jansky0rvc0bdjylbmv8xwhc0q63g88hd2nzbknqli9f1y"; - packages3d.rev = "6ff98426fd51d53c55bc48025d66d3d0b0c5df92"; - packages3d.sha256 = "0ms9py93qyihxrhh9wm2ziycmdn88m36r8adx22ynjnxixw1f9ja"; + footprints.rev = "25bb68c2d0e61d1e1e31375adfcf0b6ccdb33ff9"; + footprints.sha256 = "0sxzd4dr1g12ck8b2wsyg9r2s1j3472nksrjrwpzjdyfc8rqbjai"; + packages3d.rev = "ac7189ed55d5a3bf5eaa87d31fb97a3e7b5ad80e"; + packages3d.sha256 = "00i6mybg3pprzb283b26z5b2g7a8sbghlvc0fwk9gwrp3wz1yqzc"; }; }; }; From 6b75fe063838adeba35d2e93a457972835d978b0 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Fri, 6 May 2022 08:36:57 +0100 Subject: [PATCH 040/147] read-edid: fix build on -fno-common toolchains Without the change build fails on toolchains like clang-13 which switch to -fno-common by default: $ nix build -L --impure --expr 'with import ./. {}; read-edid.override { stdenv = clang13Stdenv; }' ... read-edid> ld: CMakeFiles/get-edid.dir/classic.c.o:(.bss+0x0): multiple definition of `quiet'; CMakeFiles/get-edid.dir/get-edid.c.o:(.bss+0x0): first defined here read-edid> ld: CMakeFiles/get-edid.dir/i2c.c.o:(.bss+0x0): multiple definition of `quiet'; CMakeFiles/get-edid.dir/get-edid.c.o:(.bss+0x0): first defined here --- pkgs/os-specific/linux/read-edid/default.nix | 9 +++++--- .../linux/read-edid/fno-common.patch | 22 +++++++++++++++++++ 2 files changed, 28 insertions(+), 3 deletions(-) create mode 100644 pkgs/os-specific/linux/read-edid/fno-common.patch diff --git a/pkgs/os-specific/linux/read-edid/default.nix b/pkgs/os-specific/linux/read-edid/default.nix index 7f6d224ff4d..6e040d3cbff 100644 --- a/pkgs/os-specific/linux/read-edid/default.nix +++ b/pkgs/os-specific/linux/read-edid/default.nix @@ -9,14 +9,17 @@ stdenv.mkDerivation rec { sha256 = "0vqqmwsgh2gchw7qmpqk6idgzcm5rqf2fab84y7gk42v1x2diin7"; }; + patches = [ ./fno-common.patch ]; + + postPatch = '' + substituteInPlace CMakeLists.txt --replace 'COPYING' 'LICENSE' + ''; + nativeBuildInputs = [ cmake ]; buildInputs = lib.optional stdenv.hostPlatform.isx86 libx86; cmakeFlags = [ "-DCLASSICBUILD=${if stdenv.hostPlatform.isx86 then "ON" else "OFF"}" ]; - patchPhase = '' - substituteInPlace CMakeLists.txt --replace 'COPYING' 'LICENSE' - ''; meta = with lib; { description = "Tool for reading and parsing EDID data from monitors"; diff --git a/pkgs/os-specific/linux/read-edid/fno-common.patch b/pkgs/os-specific/linux/read-edid/fno-common.patch new file mode 100644 index 00000000000..336b48b66ad --- /dev/null +++ b/pkgs/os-specific/linux/read-edid/fno-common.patch @@ -0,0 +1,22 @@ +--- a/get-edid/classic.c ++++ b/get-edid/classic.c +@@ -26,7 +26,7 @@ typedef byte* real_ptr; + #define dosmemput(buffer,length,offset) memcpy(offset,buffer,length) + + #define display(...) if (quiet == 0) { fprintf(stderr, __VA_ARGS__); } +-int quiet; ++extern int quiet; + + real_ptr far_ptr_to_real_ptr( uint32 farptr ) + { +--- a/get-edid/i2c.c ++++ b/get-edid/i2c.c +@@ -15,7 +15,7 @@ + + //Ideas (but not too much actual code) taken from i2c-tools. Thanks guys. + +-int quiet; ++extern int quiet; + + #define display(...) if (quiet == 0) { fprintf(stderr, __VA_ARGS__); } + From 1d02b2cc9017250c58ad22db7d5aa114becbbac5 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Fri, 6 May 2022 09:01:17 +0100 Subject: [PATCH 041/147] ipmitool: fix build on -fno-common toolchains Without the change build fails on toolchains like clang-13 which switch to -fno-common by default: $ nix build --impure --expr 'with import ./. {}; ipmitool.override { stdenv = clang13Stdenv; }' ... ld: ../lib/.libs/libipmitool.a(ipmi_hpmfwupg.o):/build/ipmitool-1.8.18/lib/../include/ipmitool/ipmi_hpmfwupg.h:803: multiple definition of `gVersionInfo'; ipmitool.o:/build/ipmitool-1.8.18/src/../include/ipmitool/ipmi_hpmfwupg.h:803: first defined here Pull upstream fix to move definition to .c file. --- pkgs/tools/system/ipmitool/default.nix | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/pkgs/tools/system/ipmitool/default.nix b/pkgs/tools/system/ipmitool/default.nix index 2ad0d11f95f..6020f1658e6 100644 --- a/pkgs/tools/system/ipmitool/default.nix +++ b/pkgs/tools/system/ipmitool/default.nix @@ -24,6 +24,13 @@ stdenv.mkDerivation rec { url = "https://github.com/ipmitool/ipmitool/commit/e824c23316ae50beb7f7488f2055ac65e8b341f2.patch"; sha256 = "sha256-X7MnoX2fzByRpRY4p33xetT+V2aehlQ/qU+aeaqtTUY="; }) + # Pull upstream patch to support upstream gcc-10: + # https://github.com/ipmitool/ipmitool/pull/180 + (fetchpatch { + name = "fno-common.patch"; + url = "https://github.com/ipmitool/ipmitool/commit/51c7e0822f531469cf860dfa5d010c87b284b747.patch"; + sha256 = "sha256-5UszUdVw3s2S5RCm5Exq4mqDqiYcN62in1O5+TZu9YA="; + }) ]; buildInputs = [ openssl ]; From 3863692d0046753ad4707a41b2891d14201b983b Mon Sep 17 00:00:00 2001 From: Ram Kromberg Date: Fri, 6 May 2022 11:03:25 +0300 Subject: [PATCH 042/147] deadpixi-sam-unstable: fix remote connection and add icon --- pkgs/applications/editors/deadpixi-sam/default.nix | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/editors/deadpixi-sam/default.nix b/pkgs/applications/editors/deadpixi-sam/default.nix index 3f84666fe02..4321119156e 100644 --- a/pkgs/applications/editors/deadpixi-sam/default.nix +++ b/pkgs/applications/editors/deadpixi-sam/default.nix @@ -14,7 +14,8 @@ stdenv.mkDerivation rec { postPatch = '' substituteInPlace config.mk.def \ --replace "/usr/include/freetype2" "${freetype.dev}/include/freetype2" \ - --replace "CC=gcc" "CC=${stdenv.cc.targetPrefix}cc" + --replace "CC=gcc" "CC=${stdenv.cc.targetPrefix}cc" \ + --replace "RXPATH=/usr/bin/ssh" "RXPATH=ssh" ''; CFLAGS = "-D_DARWIN_C_SOURCE"; @@ -24,8 +25,12 @@ stdenv.mkDerivation rec { enableParallelBuilding = false; postInstall = '' + substituteInPlace deadpixi-sam.desktop \ + --replace "accessories-text-editor" "$out/share/icons/hicolor/scalable/apps/sam.svg" mkdir -p $out/share/applications + mkdir -p $out/share/icons/hicolor/scalable/apps mv deadpixi-sam.desktop $out/share/applications + mv sam.svg $out/share/icons/hicolor/scalable/apps ''; meta = with lib; { From 607be2704a556513c156d35d0e749599750e21c1 Mon Sep 17 00:00:00 2001 From: Nicolas Benes Date: Fri, 6 May 2022 11:13:04 +0200 Subject: [PATCH 043/147] tor-browser-bundle-bin: 11.0.10 -> 11.0.11 --- .../networking/browsers/tor-browser-bundle-bin/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix index 56c7083fee6..f7f0f0c230b 100644 --- a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix +++ b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix @@ -87,7 +87,7 @@ let fteLibPath = makeLibraryPath [ stdenv.cc.cc gmp ]; # Upstream source - version = "11.0.10"; + version = "11.0.11"; lang = "en-US"; @@ -98,7 +98,7 @@ let "https://tor.eff.org/dist/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz" "https://tor.calyxinstitute.org/dist/torbrowser/${version}/tor-browser-linux64-${version}_${lang}.tar.xz" ]; - sha256 = "1j39v01bb97hkhkfvz7xyfmv6y0sjjcymvn3sa9ahz2av1xlrplp"; + sha256 = "1dx92jdnvs7w52mps4zhnnjym6jsl9vwfiav1jw8qq0g8hslgybd"; }; i686-linux = fetchurl { @@ -107,7 +107,7 @@ let "https://tor.eff.org/dist/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz" "https://tor.calyxinstitute.org/dist/torbrowser/${version}/tor-browser-linux32-${version}_${lang}.tar.xz" ]; - sha256 = "0vh913z828ncb8pwz461xx61ylxqp44rf9iah7n6lzda7hcw79r3"; + sha256 = "165mg9gwmlqwskbk3i8lhjjqp4lmpq5vzdvd9zalx69xqh9v85i5"; }; }; in From af3565ce64fa629f520d6d6c8c2435e28713ca05 Mon Sep 17 00:00:00 2001 From: Artturin Date: Fri, 6 May 2022 16:21:37 +0300 Subject: [PATCH 044/147] tor-browser-bundle-bin: fix unbound variables --- .../browsers/tor-browser-bundle-bin/default.nix | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix index 56c7083fee6..fa31d79c962 100644 --- a/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix +++ b/pkgs/applications/networking/browsers/tor-browser-bundle-bin/default.nix @@ -357,7 +357,7 @@ stdenv.mkDerivation rec { TMPDIR="\''${TMPDIR:-/tmp}" \ HOME="\$HOME" \ XAUTHORITY="\''${XAUTHORITY:-\$HOME/.Xauthority}" \ - DISPLAY="\$DISPLAY" \ + DISPLAY="\''${DISPLAY:-}" \ DBUS_SESSION_BUS_ADDRESS="\''${DBUS_SESSION_BUS_ADDRESS:-unix:path=\$XDG_RUNTIME_DIR/bus}" \\ \ XDG_DATA_HOME="\$HOME/.local/share" \ @@ -366,10 +366,10 @@ stdenv.mkDerivation rec { PULSE_SERVER="\''${PULSE_SERVER:-}" \ PULSE_COOKIE="\''${PULSE_COOKIE:-}" \ \ - MOZ_ENABLE_WAYLAND=\$MOZ_ENABLE_WAYLAND \ - WAYLAND_DISPLAY="\$WAYLAND_DISPLAY" \ - XDG_RUNTIME_DIR="\$XDG_RUNTIME_DIR" \ - XCURSOR_PATH="\$XCURSOR_PATH" \ + MOZ_ENABLE_WAYLAND="\''${MOZ_ENABLE_WAYLAND:-}" \ + WAYLAND_DISPLAY="\''${WAYLAND_DISPLAY:-}" \ + XDG_RUNTIME_DIR="\''${XDG_RUNTIME_DIR:-}" \ + XCURSOR_PATH="\''${XCURSOR_PATH:-}" \ \ APULSE_PLAYBACK_DEVICE="\''${APULSE_PLAYBACK_DEVICE:-plug:dmix}" \ \ @@ -409,9 +409,7 @@ stdenv.mkDerivation rec { LD_LIBRARY_PATH=$libPath $TBB_IN_STORE/TorBrowser/Tor/tor --version >/dev/null echo "Checking tor-browser wrapper ..." - DISPLAY="" MOZ_ENABLE_WAYLAND="" WAYLAND_DISPLAY="" XAUTHORITY="" \ - XCURSOR_PATH="" XDG_RUNTIME_DIR="" XDG_SESSION_TYPE="" \ - DBUS_SESSION_BUS_ADDRESS="" TBB_HOME=$(mktemp -d) \ + TBB_HOME=$(mktemp -d) \ $out/bin/tor-browser --version >/dev/null ''; From da840a3ba1f4d8037bb88cf6ccfb3f058dbb7b01 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Fri, 6 May 2022 18:02:12 +0100 Subject: [PATCH 045/147] opentyrian: 2.1.20130907 -> 2.1.20220318 Updated homepage url and download url to github. Updated assets URL. --- pkgs/games/opentyrian/default.nix | 44 ++++++++++++++++++------------- 1 file changed, 26 insertions(+), 18 deletions(-) diff --git a/pkgs/games/opentyrian/default.nix b/pkgs/games/opentyrian/default.nix index 43c8e08c79f..5d386bce6db 100644 --- a/pkgs/games/opentyrian/default.nix +++ b/pkgs/games/opentyrian/default.nix @@ -1,35 +1,43 @@ -{ lib, stdenv, fetchurl, fetchzip, SDL, SDL_net }: +{ lib +, stdenv +, fetchFromGitHub +, fetchzip +, SDL2 +, SDL2_net +, pkg-config +}: stdenv.mkDerivation rec { pname = "opentyrian"; - version = "2.1.20130907"; + version = "2.1.20220318"; - src = fetchurl { - url = "https://bitbucket.org/opentyrian/opentyrian/get/${version}.tar.gz"; - sha256 = "1jnrkq616pc4dhlbd4n30d65vmn25q84w6jfv9383l9q20cqf2ph"; + src = fetchFromGitHub { + owner = "opentyrian"; + repo = "opentyrian"; + rev = "v${version}"; + sha256 = "01z1zxpps4ils0bnwazl9lmqdbfhfd8fkacahnh6kqyczavg40xg"; }; data = fetchzip { - url = "http://sites.google.com/a/camanis.net/opentyrian/tyrian/tyrian21.zip"; + url = "https://camanis.net/tyrian/tyrian21.zip"; sha256 = "1biz6hf6s7qrwn8ky0g6p8w7yg715w7yklpn6258bkks1s15hpdb"; }; - buildInputs = [SDL SDL_net]; + nativeBuildInputs = [ pkg-config ]; + buildInputs = [ SDL2 SDL2_net ]; - patchPhase = " - substituteInPlace src/file.c --replace /usr/share $out/share - "; - buildPhase = "make release"; - installPhase = " - mkdir -p $out/bin - cp ./opentyrian $out/bin - mkdir -p $out/share/opentyrian/data - cp -r $data/* $out/share/opentyrian/data - "; + enableParallelBuilding = true; + + makeFlags = [ "prefix=${placeholder "out"}" ]; + + postInstall = '' + mkdir -p $out/share/games/tyrian + cp -r $data/* $out/share/games/tyrian/ + ''; meta = { description = ''Open source port of the game "Tyrian"''; - homepage = "https://bitbucket.org/opentyrian/opentyrian"; + homepage = "https://github.com/opentyrian/opentyrian"; # This does not account of Tyrian data. # license = lib.licenses.gpl2; }; From ff9c57fbedce56d81ee2e5f4e004928c58e87716 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Fri, 6 May 2022 19:02:39 +0100 Subject: [PATCH 046/147] wmfs: fix build on -fno-common toolchain Without the change build fails on -fno-common tollchains as: $ nix build --impure --expr 'with import ~/nm {}; wmfs.override { stdenv = clang13Stdenv; }' ... ld: src/log.o:(.bss+0x0): multiple definition of `W'; src/barwin.o:(.bss+0x0): first defined here ld: src/wmfs.o:(.bss+0x0): multiple definition of `W'; src/barwin.o:(.bss+0x0): first defined here ld: src/wmfs.o:(.bss+0x10): multiple definition of `event_handle'; src/client.o:(.bss+0x10): first defined here --- pkgs/applications/window-managers/wmfs/default.nix | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/window-managers/wmfs/default.nix b/pkgs/applications/window-managers/wmfs/default.nix index 9169aea4f51..eaafac71b6c 100644 --- a/pkgs/applications/window-managers/wmfs/default.nix +++ b/pkgs/applications/window-managers/wmfs/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, +{ lib, stdenv, fetchFromGitHub, fetchpatch, libX11, libXinerama, libXrandr, libXpm, libXft, imlib2 }: stdenv.mkDerivation { pname = "wmfs"; @@ -12,6 +12,17 @@ stdenv.mkDerivation { rev = "b7b8ff812d28c79cb22a73db2739989996fdc6c2"; }; + patches = [ + # Pull patch pending upstream inclusion to fix build on + # -fno-common toolchain like upstream gcc-10: + # https://github.com/xorg62/wmfs/pull/104 + (fetchpatch { + name = "fno-common.patch"; + url = "https://github.com/xorg62/wmfs/commit/e4ec12618f4689d791892ebb49df9610a25d24d3.patch"; + sha256 = "0qvwry9sikvr85anzha9x4gcx0r2ckwdxqw2in2l6bl9z9d9c0w2"; + }) + ]; + buildInputs = [ imlib2 libX11 From 8fa20691d82463928e2ee14ec23851d7a24fcad9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Fri, 6 May 2022 23:57:57 +0200 Subject: [PATCH 047/147] rustscan: remove myself from maintainers --- pkgs/tools/security/rustscan/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/tools/security/rustscan/default.nix b/pkgs/tools/security/rustscan/default.nix index adf514006b1..8f7498083cc 100644 --- a/pkgs/tools/security/rustscan/default.nix +++ b/pkgs/tools/security/rustscan/default.nix @@ -33,6 +33,6 @@ rustPlatform.buildRustPackage rec { description = "Faster Nmap Scanning with Rust"; homepage = "https://github.com/RustScan/RustScan"; license = licenses.gpl3Only; - maintainers = [ maintainers.SuperSandro2000 ]; + maintainers = with maintainers; [ ]; }; } From 414083d8cf4a94e426c4b36b0ee497b8048b0c5c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sat, 7 May 2022 01:36:30 +0200 Subject: [PATCH 048/147] python310Packages.treq: adopt, enable tests, cleanup dependencies --- .../python-modules/treq/default.nix | 38 ++++++------------- 1 file changed, 11 insertions(+), 27 deletions(-) diff --git a/pkgs/development/python-modules/treq/default.nix b/pkgs/development/python-modules/treq/default.nix index f566fda6f8a..c894d3103b9 100644 --- a/pkgs/development/python-modules/treq/default.nix +++ b/pkgs/development/python-modules/treq/default.nix @@ -1,5 +1,10 @@ -{ lib, fetchPypi, buildPythonPackage, service-identity, requests, six -, mock, twisted, incremental, pep8, httpbin +{ lib +, fetchPypi +, buildPythonPackage +, requests +, twisted +, incremental +, httpbin }: buildPythonPackage rec { @@ -13,44 +18,23 @@ buildPythonPackage rec { propagatedBuildInputs = [ requests - six incremental - service-identity twisted - ] - # twisted [tls] requirements (we should find a way to list "extras") - ++ twisted.extras.tls; + ] ++ twisted.extras.tls; checkInputs = [ - pep8 - mock httpbin + twisted ]; - postPatch = '' - rm -fv src/treq/test/test_treq_integration.py - ''; - - # XXX tox tries to install coverage despite it is installed - #postBuild = '' - # # build documentation and install in $out - # tox -e docs - # mkdir -pv $out/docs - # cp -rv docs/* $out/docs/ - #''; - checkPhase = '' - pep8 --ignore=E902 treq trial treq ''; - # Failing tests https://github.com/twisted/treq/issues/208 - doCheck = false; - meta = with lib; { homepage = "https://github.com/twisted/treq"; - description = "A requests-like API built on top of twisted.web's Agent"; + description = "Requests-like API built on top of twisted.web's Agent"; license = licenses.mit; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ SuperSandro2000 ]; }; } From be9c4140e74d9fe094ed00f9bd4d92e154f38f79 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sat, 7 May 2022 03:31:48 +0200 Subject: [PATCH 049/147] python310Packages.urwid: add SuperSandro2000 as maintainer, enable on python2 again just works fine, so why not? --- pkgs/development/python-modules/urwid/default.nix | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/pkgs/development/python-modules/urwid/default.nix b/pkgs/development/python-modules/urwid/default.nix index 3df7f6703a7..57e64ba97a8 100644 --- a/pkgs/development/python-modules/urwid/default.nix +++ b/pkgs/development/python-modules/urwid/default.nix @@ -2,7 +2,6 @@ , buildPythonPackage , fetchPypi , isPy3k -, isPy27 , glibcLocales }: @@ -11,8 +10,6 @@ buildPythonPackage rec { version = "2.1.2"; format = "setuptools"; - disabled = isPy27; - src = fetchPypi { inherit pname version; sha256 = "588bee9c1cb208d0906a9f73c613d2bd32c3ed3702012f51efe318a3f2127eae"; @@ -33,6 +30,6 @@ buildPythonPackage rec { description = "A full-featured console (xterm et al.) user interface library"; homepage = "https://urwid.org/"; license = licenses.lgpl21Plus; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ SuperSandro2000 ]; }; } From c82c56ba783dd62de7c7dc823c0c43260f9e9401 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sat, 7 May 2022 08:48:50 +0100 Subject: [PATCH 050/147] bicon: unstable-2018-09-10 -> unstable-2020-06-04 Without the update build fails on -fno-common toolchains as: $ nix build --impure --expr 'with import ./. {}; bicon.override { stdenv = clang13Stdenv; }' ... ld: bicon_bin-bicon_read.o:/build/source/bicon/bicon_read.c:37: multiple definition of `bicon_options'; bicon_bin-bicon.o:/build/source/bicon/./bicon_read.h:4: first defined here While at it pulled in pending fix for clang compatibility. --- pkgs/applications/misc/bicon/default.nix | 31 ++++++++++++++++-------- 1 file changed, 21 insertions(+), 10 deletions(-) diff --git a/pkgs/applications/misc/bicon/default.nix b/pkgs/applications/misc/bicon/default.nix index 0b3ca09c6d0..dfb424ea9da 100644 --- a/pkgs/applications/misc/bicon/default.nix +++ b/pkgs/applications/misc/bicon/default.nix @@ -1,24 +1,35 @@ { lib, stdenv - , fetchFromGitHub - , autoreconfHook - , pkg-config - , perl - , fribidi - , kbd - , xkbutils +, fetchFromGitHub +, fetchpatch +, autoreconfHook +, pkg-config +, perl +, fribidi +, kbd +, xkbutils }: stdenv.mkDerivation rec { pname = "bicon"; - version = "unstable-2018-09-10"; + version = "unstable-2020-06-04"; src = fetchFromGitHub { owner = "behdad"; repo = pname; - rev = "38725c062a83ab19c4e4b4bc20eb9535561aa76c"; - sha256 = "0hdslrci8pq300f3rrjsvl5psfrxdwyxf9g2m5g789sr049dksnq"; + rev = "64ae10c94b94a573735a2c2b1502334b86d3b1f7"; + sha256 = "0ixsf65j4dbdl2aazjc2j0hiagbp6svvfwfmyivha0i1k5yx12v1"; }; + patches = [ + # Fix build on clang-13. Pull the change pending upstream + # inclusion: https://github.com/behdad/bicon/pull/29 + (fetchpatch { + name = "clang.patch"; + url = "https://github.com/behdad/bicon/commit/20f5a79571f222f96e07d7c0c5e76e2c9ff1c59a.patch"; + sha256 = "0l1dm7w52k57nv3lvz5pkbwp021mlsk3csyalxi90np1lx5sqbd1"; + }) + ]; + buildInputs = [ fribidi kbd xkbutils perl ]; nativeBuildInputs = [ autoreconfHook pkg-config ]; From d9c321639ccbdb32948056f1a2934eec1244b8f7 Mon Sep 17 00:00:00 2001 From: Ram Kromberg Date: Sat, 7 May 2022 11:34:24 +0300 Subject: [PATCH 051/147] jpegrescan: 2016-06-01 -> 2019-03-27 --- .../graphics/jpegrescan/default.nix | 29 ++++++++++--------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/pkgs/applications/graphics/jpegrescan/default.nix b/pkgs/applications/graphics/jpegrescan/default.nix index f96742e6c06..7ec0e478a9b 100644 --- a/pkgs/applications/graphics/jpegrescan/default.nix +++ b/pkgs/applications/graphics/jpegrescan/default.nix @@ -1,15 +1,17 @@ -{ lib, stdenv, fetchFromGitHub, makeWrapper, libjpeg_turbo, perl, perlPackages }: +{ lib, stdenv, fetchFromGitHub, makeWrapper, perl, perlPackages, libjpeg_original }: stdenv.mkDerivation rec { pname = "jpegrescan"; - date = "2016-06-01"; - name = "${pname}-${date}"; + version = "unstable-2019-03-27"; + + dontBuild = true; + dontConfigure = true; src = fetchFromGitHub { owner = "kud"; repo = pname; - rev = "e5e39cd972b48ccfb2cba4da6855c511385c05f9"; - sha256 = "0jbx1vzkzif6yjx1fnsm7fjsmq166sh7mn22lf01ll7s245nmpdp"; + rev = "3a7de06feabeb3c3235c3decbe2557893c1abe51"; + sha256 = "0cnl46z28lkqc5x27b8rpghvagahivrqcfvhzcsv9w1qs8qbd6dm"; }; patchPhase = '' @@ -23,24 +25,23 @@ stdenv.mkDerivation rec { mv jpegrescan $out/bin chmod +x $out/bin/jpegrescan - wrapProgram $out/bin/jpegrescan --prefix PERL5LIB : $PERL5LIB + wrapProgram $out/bin/jpegrescan \ + --prefix PATH : "${libjpeg_original}/bin:" \ + --prefix PERL5LIB : $PERL5LIB ''; propagatedBuildInputs = [ perlPackages.FileSlurp ]; - nativeBuildInputs = [ - makeWrapper - ]; + nativeBuildInputs = [ makeWrapper ]; - buildInputs = [ - perl libjpeg_turbo - ]; + buildInputs = [ perl ]; meta = with lib; { - description = "losslessly shrink any JPEG file"; + description = "Losslessly shrink any JPEG file"; homepage = "https://github.com/kud/jpegrescan"; license = licenses.publicDomain; - maintainers = [ maintainers.ramkromberg ]; + maintainers = with maintainers; [ ramkromberg ]; platforms = platforms.all; + mainProgram = "jpegrescan"; }; } From 5d2dfa253eaf9092bfc10695e40b2c80371dd55c Mon Sep 17 00:00:00 2001 From: Jonas Heinrich Date: Fri, 6 May 2022 14:05:35 +0200 Subject: [PATCH 052/147] firejail: Fix resolve binary paths in user environment --- pkgs/os-specific/linux/firejail/default.nix | 7 +++++++ .../linux/firejail/whitelist-nix-profile.patch | 9 +++++++++ 2 files changed, 16 insertions(+) create mode 100644 pkgs/os-specific/linux/firejail/whitelist-nix-profile.patch diff --git a/pkgs/os-specific/linux/firejail/default.nix b/pkgs/os-specific/linux/firejail/default.nix index c3dc819b5bc..3caf41cfca5 100644 --- a/pkgs/os-specific/linux/firejail/default.nix +++ b/pkgs/os-specific/linux/firejail/default.nix @@ -37,9 +37,16 @@ stdenv.mkDerivation rec { # Adds the /nix directory when using an overlay. # Required to run any programs under this mode. ./mount-nix-dir-on-overlay.patch + # By default fbuilder hardcodes the firejail binary to the install path. # On NixOS the firejail binary is a setuid wrapper available in $PATH. ./fbuilder-call-firejail-on-path.patch + + # NixOS specific whitelist to resolve binary paths in user environment + # Fixes https://github.com/NixOS/nixpkgs/issues/170784 + # Upstream fix https://github.com/netblue30/firejail/pull/5131 + # Upstream hopefully fixed in later versions > 0.9.68 + ./whitelist-nix-profile.patch ]; prePatch = '' diff --git a/pkgs/os-specific/linux/firejail/whitelist-nix-profile.patch b/pkgs/os-specific/linux/firejail/whitelist-nix-profile.patch new file mode 100644 index 00000000000..227d28846ea --- /dev/null +++ b/pkgs/os-specific/linux/firejail/whitelist-nix-profile.patch @@ -0,0 +1,9 @@ +--- a/etc/inc/whitelist-common.inc.org 2022-05-06 13:57:17.294206339 +0200 ++++ b/etc/inc/whitelist-common.inc 2022-05-06 13:58:00.108655548 +0200 +@@ -83,3 +83,6 @@ + whitelist ${HOME}/.kde4/share/config/oxygenrc + whitelist ${HOME}/.kde4/share/icons + whitelist ${HOME}/.local/share/qt5ct ++ ++# NixOS specific to resolve binary paths ++whitelist ${HOME}/.nix-profile From dcf8a34e1cdc2f932039efd4a5c6cc44c7b531d6 Mon Sep 17 00:00:00 2001 From: linsui Date: Sat, 7 May 2022 21:13:28 +0800 Subject: [PATCH 053/147] amberol: 0.4.3 -> 0.6.0 --- pkgs/applications/audio/amberol/default.nix | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/audio/amberol/default.nix b/pkgs/applications/audio/amberol/default.nix index f1da043d598..e337af93ec1 100644 --- a/pkgs/applications/audio/amberol/default.nix +++ b/pkgs/applications/audio/amberol/default.nix @@ -8,6 +8,7 @@ , ninja , pkg-config , reuse +, m4 , wrapGAppsHook4 , glib , gtk4 @@ -18,20 +19,20 @@ stdenv.mkDerivation rec { pname = "amberol"; - version = "0.4.3"; + version = "0.6.0"; src = fetchFromGitLab { domain = "gitlab.gnome.org"; owner = "World"; repo = pname; rev = version; - sha256 = "sha256-4yW7rVlP9Zskyt4l/VQoX+9q3TUdEuLZrNQuQvziIf4="; + hash = "sha256-7cwoP2Dvlrq44orckhCjFGrSVDuG8WdW8wbpAjD5zhI="; }; cargoDeps = rustPlatform.fetchCargoTarball { inherit src; name = "${pname}-${version}"; - sha256 = "sha256-1ahEWLBmkT+B8qD0Qd1skXqk1wvP6yuFNAQBRdispC4="; + hash = "sha256-CGPDaVS8F7H/tH0lRjFloWmZmW8NHheyZRCCqEavWeo="; }; postPatch = '' @@ -45,6 +46,7 @@ stdenv.mkDerivation rec { ninja pkg-config reuse + m4 wrapGAppsHook4 ] ++ (with rustPlatform; [ cargoSetupHook From 165d8e6db51dc8b5699f5d43263e174af876d930 Mon Sep 17 00:00:00 2001 From: Artturin Date: Sat, 7 May 2022 16:45:41 +0300 Subject: [PATCH 054/147] netcat-openbsd: init at 1.218-5 --- .../networking/netcat-openbsd/default.nix | 54 +++++++++++++++++++ pkgs/top-level/aliases.nix | 1 - pkgs/top-level/all-packages.nix | 2 + 3 files changed, 56 insertions(+), 1 deletion(-) create mode 100644 pkgs/tools/networking/netcat-openbsd/default.nix diff --git a/pkgs/tools/networking/netcat-openbsd/default.nix b/pkgs/tools/networking/netcat-openbsd/default.nix new file mode 100644 index 00000000000..67d458dad1b --- /dev/null +++ b/pkgs/tools/networking/netcat-openbsd/default.nix @@ -0,0 +1,54 @@ +{ lib, stdenv, fetchFromGitLab, pkg-config, libbsd, installShellFiles }: + +stdenv.mkDerivation rec { + pname = "netcat-openbsd"; + version = "1.218-5"; + + src = fetchFromGitLab { + domain = "salsa.debian.org"; + owner = "debian"; + repo = "netcat-openbsd"; + rev = "refs/tags/debian/${version}"; + sha256 = "sha256-jEJ8x49Z1UN2qOChGp173aQuPkgl2fWwUUJgUdOv60I="; + }; + + strictDeps = true; + nativeBuildInputs = [ pkg-config installShellFiles ]; + buildInputs = [ libbsd ]; + + NIX_CFLAGS_COMPILE = [ + "-I${lib.getDev libbsd}/include/libbsd" + ]; + + NIX_LDFLAGS = [ "-lbsd" ]; + + postPatch = '' + for file in $(cat debian/patches/series); do + patch -p1 < debian/patches/$file + done + ''; + + installPhase = '' + runHook preInstall + + mkdir -p $out/bin + mv nc $out/bin/nc + installManPage nc.1 + + runHook postInstall + ''; + + doInstallCheck = true; + installCheckPhase = '' + $out/bin/nc -h 2> /dev/null + ''; + + meta = with lib; { + description = "TCP/IP swiss army knife. OpenBSD variant"; + homepage = "https://salsa.debian.org/debian/netcat-openbsd"; + maintainers = with maintainers; [ artturin ]; + license = licenses.bsd3; + platforms = platforms.unix; + mainProgram = "nc"; + }; +} diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix index d0c8cee8e24..8315b70dbfc 100644 --- a/pkgs/top-level/aliases.nix +++ b/pkgs/top-level/aliases.nix @@ -850,7 +850,6 @@ mapAliases ({ navit = throw "navit has been removed from nixpkgs, due to being unmaintained"; # Added 2021-06-07 ncat = throw "'ncat' has been renamed to/replaced by 'nmap'"; # Converted to throw 2022-02-22 neap = throw "neap was removed from nixpkgs, as it relies on python2"; # Added 2022-01-12 - netcat-openbsd = throw "'netcat-openbsd' has been renamed to/replaced by 'libressl.nc'"; # Converted to throw 2022-02-22 netease-cloud-music = throw "netease-cloud-music has been removed together with deepin"; # Added 2020-08-31 networkmanager_fortisslvpn = throw "'networkmanager_fortisslvpn' has been renamed to/replaced by 'networkmanager-fortisslvpn'"; # Converted to throw 2022-02-22 networkmanager_iodine = throw "'networkmanager_iodine' has been renamed to/replaced by 'networkmanager-iodine'"; # Converted to throw 2022-02-22 diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 612f3dcd699..44231edb22f 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -8544,6 +8544,8 @@ with pkgs; netcat-gnu = callPackage ../tools/networking/netcat { }; + netcat-openbsd = callPackage ../tools/networking/netcat-openbsd { }; + netdiscover = callPackage ../tools/networking/netdiscover { }; nethogs = callPackage ../tools/networking/nethogs { }; From 51838e184e797af125183e62c17a81116bc37942 Mon Sep 17 00:00:00 2001 From: Artturin Date: Sat, 7 May 2022 17:01:05 +0300 Subject: [PATCH 055/147] flashfocus: use make it possible to use nc_flash_window it is faster than flash_window it needs netcat-openbsd --- pkgs/misc/flashfocus/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/misc/flashfocus/default.nix b/pkgs/misc/flashfocus/default.nix index fd93260a4bc..b74464de4f6 100644 --- a/pkgs/misc/flashfocus/default.nix +++ b/pkgs/misc/flashfocus/default.nix @@ -1,4 +1,4 @@ -{ lib, python3 }: +{ lib, python3, netcat-openbsd }: python3.pkgs.buildPythonApplication rec { pname = "flashfocus"; @@ -12,6 +12,9 @@ python3.pkgs.buildPythonApplication rec { postPatch = '' substituteInPlace setup.py \ --replace "pyyaml>=5.1,<6.0" "pyyaml>=5.1" + + substituteInPlace bin/nc_flash_window \ + --replace "nc" "${lib.getExe netcat-openbsd}" ''; nativeBuildInputs = with python3.pkgs; [ From f398d4f0fdc1dcd28a79beec885008d91c1cd529 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 7 May 2022 17:41:54 +0200 Subject: [PATCH 056/147] python310Packages.types-pytz: 2021.3.7 -> 2021.3.8 --- pkgs/development/python-modules/types-pytz/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/types-pytz/default.nix b/pkgs/development/python-modules/types-pytz/default.nix index d3ac7e4932b..bbbd7913018 100644 --- a/pkgs/development/python-modules/types-pytz/default.nix +++ b/pkgs/development/python-modules/types-pytz/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "types-pytz"; - version = "2021.3.7"; + version = "2021.3.8"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-EdW6BiaBZ5U8zEo+7hksJLQtANKu9FbBYKh5iJPLIIE="; + sha256 = "sha256-QSU6OivwKLaj8XtYdJppLZVa8PdOl13pT29NLTzQHb0="; }; # Modules doesn't have tests From 319dfb2709de79379e16204c43591f1c0cd053c5 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 7 May 2022 18:53:06 +0200 Subject: [PATCH 057/147] python310Packages.pyzerproc: 0.4.10 -> 0.4.11 --- pkgs/development/python-modules/pyzerproc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyzerproc/default.nix b/pkgs/development/python-modules/pyzerproc/default.nix index 7f726d8ae7f..bc90068e66e 100644 --- a/pkgs/development/python-modules/pyzerproc/default.nix +++ b/pkgs/development/python-modules/pyzerproc/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "pyzerproc"; - version = "0.4.10"; + version = "0.4.11"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "emlove"; repo = pname; rev = version; - sha256 = "sha256-sfxyHpJzYYwxLsvfJpqI6cC/CKS7Jx0vXSLL3QD9qV4="; + sha256 = "sha256-FNiq/dbh5PMTxnKCKDSHEvllehAEUYvWZS+OyP3lSW8="; }; postPatch = '' From b0d08ba09030cc491f8435b9f0a1c53d10d0fcf4 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 7 May 2022 18:57:08 +0200 Subject: [PATCH 058/147] python310Packages.yalexs: 1.1.23 -> 1.1.24 --- 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 2eb38dd0784..948ca6c6b88 100644 --- a/pkgs/development/python-modules/yalexs/default.nix +++ b/pkgs/development/python-modules/yalexs/default.nix @@ -17,7 +17,7 @@ buildPythonPackage rec { pname = "yalexs"; - version = "1.1.23"; + version = "1.1.24"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -26,7 +26,7 @@ buildPythonPackage rec { owner = "bdraco"; repo = pname; rev = "v${version}"; - sha256 = "sha256-CnAVkwCOADBNY0cUvq9Dt6JR+fIr4LiZVMzJIIFqzG0="; + sha256 = "sha256-6wuTY1nH7btGEktH5UmTV2rMbsap5M55tJx3fljsnlY="; }; propagatedBuildInputs = [ From cd9591ccd9fd5584288efe4aa8566d70e72600f8 Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 7 May 2022 18:58:05 +0200 Subject: [PATCH 059/147] =?UTF-8?q?sublime-merge:=202068=20=E2=86=92=20207?= =?UTF-8?q?1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://www.sublimemerge.com/download#changelog --- .../applications/version-management/sublime-merge/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/sublime-merge/default.nix b/pkgs/applications/version-management/sublime-merge/default.nix index fc8e5d4e4b1..cb794e176e8 100644 --- a/pkgs/applications/version-management/sublime-merge/default.nix +++ b/pkgs/applications/version-management/sublime-merge/default.nix @@ -4,8 +4,8 @@ let common = opts: callPackage (import ./common.nix opts); in { sublime-merge = common { - buildVersion = "2068"; - sha256 = "sha256-CseZQgjqr8B66Slf/yFZZsnRFc3zqCGKFAzSdMRQdNI="; + buildVersion = "2071"; + sha256 = "xYVk5Fx6VdoHzf0cbmhwKyEr5HDEZgPgDoBWQg/tS0U="; } {}; sublime-merge-dev = common { From e3104e95c5ad501e85828642b086e468222440ff Mon Sep 17 00:00:00 2001 From: Jan Tojnar Date: Sat, 7 May 2022 18:58:48 +0200 Subject: [PATCH 060/147] =?UTF-8?q?sublime-merge-dev:=202067=20=E2=86=92?= =?UTF-8?q?=202070?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit https://www.sublimemerge.com/dev#changelog --- .../applications/version-management/sublime-merge/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/version-management/sublime-merge/default.nix b/pkgs/applications/version-management/sublime-merge/default.nix index cb794e176e8..6526fdb2d1b 100644 --- a/pkgs/applications/version-management/sublime-merge/default.nix +++ b/pkgs/applications/version-management/sublime-merge/default.nix @@ -9,8 +9,8 @@ in { } {}; sublime-merge-dev = common { - buildVersion = "2067"; - sha256 = "sha256-ViBBi9Ghh4dHg7Gmg4i/B+Q4OgDd4XiHNIs12qffZdg="; + buildVersion = "2070"; + sha256 = "2AA2HBF19g34ov6ytjL2caqS7Ro4eyj18vzwINm0CTw="; dev = true; } {}; } From 2f653769f8d759b9a2e64f0ff44913843dac867e Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sat, 7 May 2022 12:10:19 +0100 Subject: [PATCH 061/147] freetalk: pull pending fix for -fno-common toolchains Without the change build on -fno-common toolchains like clamng-13 fails as: $ nix build --impure --expr 'with import ./. {}; freetalk.override { stdenv = clang13Stdenv; }' -L ... ld: more.o:src/./more.h:15: multiple definition of `cin'; primitives.o:src/./more.h:15: first defined here ld: more.o:src/./more.h:14: multiple definition of `initial_settings'; primitives.o:src/./more.h:14: first defined here --- .../instant-messengers/freetalk/default.nix | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/networking/instant-messengers/freetalk/default.nix b/pkgs/applications/networking/instant-messengers/freetalk/default.nix index 4c28e346a12..ffe82e6708a 100644 --- a/pkgs/applications/networking/instant-messengers/freetalk/default.nix +++ b/pkgs/applications/networking/instant-messengers/freetalk/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub +{ lib, stdenv, fetchFromGitHub, fetchpatch , guile, pkg-config, glib, loudmouth, gmp, libidn, readline, libtool , libunwind, ncurses, curl, jansson, texinfo , automake, autoconf }: @@ -13,6 +13,16 @@ stdenv.mkDerivation rec { sha256 = "09jwk2i8qd8c7wrn9xbqcwm32720dwxis22kf3jpbg8mn6w6i757"; }; + patches = [ + # Pull pending patch for -fno-common tuulchain support: + # https://github.com/GNUFreetalk/freetalk/pull/39 + (fetchpatch { + name = "fno-common.patch"; + url = "https://github.com/GNUFreetalk/freetalk/commit/f04d6bc8422be44cdf51b29c9a4310f20a18775a.patch"; + sha256 = "1zjm56cdibnqabgcwl2bx79dj6dmqjf40zghqwwb0lfi60v1njqf"; + }) + ]; + preConfigure = '' ./autogen.sh ''; From 3414ffe11fd6f4783e335ad67a5ea4ad1aca6a9f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 7 May 2022 20:11:04 +0200 Subject: [PATCH 062/147] python310Packages.devolo-plc-api: 0.7.1 -> 0.8.0 --- pkgs/development/python-modules/devolo-plc-api/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/devolo-plc-api/default.nix b/pkgs/development/python-modules/devolo-plc-api/default.nix index 4fbc0f06fc4..5d44866da0e 100644 --- a/pkgs/development/python-modules/devolo-plc-api/default.nix +++ b/pkgs/development/python-modules/devolo-plc-api/default.nix @@ -15,7 +15,7 @@ buildPythonPackage rec { pname = "devolo-plc-api"; - version = "0.7.1"; + version = "0.8.0"; format = "setuptools"; disabled = pythonOlder "3.8"; @@ -24,7 +24,7 @@ buildPythonPackage rec { owner = "2Fake"; repo = "devolo_plc_api"; rev = "v${version}"; - sha256 = "sha256-XR/daDrnfbLBrUTTMFYtndr6+RxPwnF4qbXAdXsXKHk="; + sha256 = "sha256-LMwvIwbP/nRFby295ur6QTgyXLLJ8ip30V9bti27qKQ="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; From c793d21b64cf18fbca5cb2da903c7e68f0a67b6f Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sat, 7 May 2022 20:15:18 +0200 Subject: [PATCH 063/147] python310Packages.devolo-home-control-api: 0.18.1 -> 0.18.2 --- .../python-modules/devolo-home-control-api/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/devolo-home-control-api/default.nix b/pkgs/development/python-modules/devolo-home-control-api/default.nix index 31e9da795d3..5485372a1e1 100644 --- a/pkgs/development/python-modules/devolo-home-control-api/default.nix +++ b/pkgs/development/python-modules/devolo-home-control-api/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "devolo-home-control-api"; - version = "0.18.1"; + version = "0.18.2"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "2Fake"; repo = "devolo_home_control_api"; rev = "v${version}"; - sha256 = "sha256-Xj5k09uEVxZgG0oLbiPOBx/dALsRjqkZbLKit4X4q9Q="; + sha256 = "sha256-H4kLomHM0qq6LqsRMEp34oKy/4Me7AQi6dij2vraBS8="; }; SETUPTOOLS_SCM_PRETEND_VERSION = version; From 0b084cd7afc8fa706026339cb0d0a982377a6397 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Thu, 5 May 2022 19:43:05 +0300 Subject: [PATCH 064/147] monkeysAudio: Fix compilation using an older version of gcc Fixes this issue: > /nix/store/...-gcc-11.2.0/include/c++/11.2.0/cmath:1930:1: error: expected declaration before '}' token > 1930 | } // extern "C++" > | ^ --- pkgs/applications/audio/monkeys-audio/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/audio/monkeys-audio/default.nix b/pkgs/applications/audio/monkeys-audio/default.nix index 62b63f7e1ca..805513b6a05 100644 --- a/pkgs/applications/audio/monkeys-audio/default.nix +++ b/pkgs/applications/audio/monkeys-audio/default.nix @@ -1,6 +1,6 @@ -{lib, stdenv, fetchurl}: +{lib, gcc10Stdenv, fetchurl}: -stdenv.mkDerivation rec { +gcc10Stdenv.mkDerivation rec { version = "3.99-u4-b5"; pname = "monkeys-audio"; From f8ee62b3dccac88700dbfb5c7650cd718259386b Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Sat, 7 May 2022 21:20:50 +0300 Subject: [PATCH 065/147] monkeysAudio: Add -old suffix to pname - to update URL --- pkgs/applications/audio/monkeys-audio/default.nix | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/audio/monkeys-audio/default.nix b/pkgs/applications/audio/monkeys-audio/default.nix index 805513b6a05..59fe5022981 100644 --- a/pkgs/applications/audio/monkeys-audio/default.nix +++ b/pkgs/applications/audio/monkeys-audio/default.nix @@ -2,11 +2,21 @@ gcc10Stdenv.mkDerivation rec { version = "3.99-u4-b5"; - pname = "monkeys-audio"; + pname = "monkeys-audio-old"; patches = [ ./buildfix.diff ]; src = fetchurl { + /* + The real homepage is , but in fact we are + getting an old, ported to Linux version of the sources, made by (quoting + from the AUTHORS file found in the source): + + Frank Klemm : First port to linux (with makefile) + + SuperMMX : Package the source, include the frontend and shared lib, + porting to Big Endian platform and adding other non-win32 enhancement. + */ url = "https://deb-multimedia.org/pool/main/m/${pname}/${pname}_${version}.orig.tar.gz"; sha256 = "0kjfwzfxfx7f958b2b1kf8yj655lp0ppmn0sh57gbkjvj8lml7nz"; }; From 44a91b715327dc058b30265a9c787da640095f26 Mon Sep 17 00:00:00 2001 From: Doron Behar Date: Sat, 7 May 2022 21:31:35 +0300 Subject: [PATCH 066/147] monkeysAudio: Update license --- pkgs/applications/audio/monkeys-audio/default.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/audio/monkeys-audio/default.nix b/pkgs/applications/audio/monkeys-audio/default.nix index 59fe5022981..05647af2201 100644 --- a/pkgs/applications/audio/monkeys-audio/default.nix +++ b/pkgs/applications/audio/monkeys-audio/default.nix @@ -24,7 +24,10 @@ gcc10Stdenv.mkDerivation rec { meta = with lib; { description = "Lossless audio codec"; platforms = platforms.linux; - license = licenses.lgpl2; + # This is not considered a GPL license, but it seems rather free although + # it's not standard, see a quote of it: + # https://github.com/NixOS/nixpkgs/pull/171682#issuecomment-1120260551 + license = licenses.free; maintainers = [ ]; }; } From 2d019e0931aadb3ef29a17f501e55362ec210559 Mon Sep 17 00:00:00 2001 From: Artturin Date: Sat, 7 May 2022 22:36:10 +0300 Subject: [PATCH 067/147] stdenv: deprecate unused adapters stdenv: deprecate addCoverageInstrumentation adapter this used to be used in nixos/tests but it hasn't been used in nixpkgs for years stdenv: deprecate replaceMaintainersField adapter it was added in 2009 in 01e98e49b155d989d8c80066db6de910396cdcaa by nbp there are no uses of it in nixpkgs now stdenv: deprecate validateLicenses adapter it was added in 2009 in b29073af25cb0ff2d8d9a0aa1f958316904d3dc9 unfreePredicate is now handled in ./pkgs/stdenv/generic/check-meta.nix so this is unnecessary --- pkgs/stdenv/adapters.nix | 35 ++++++----------------------------- 1 file changed, 6 insertions(+), 29 deletions(-) diff --git a/pkgs/stdenv/adapters.nix b/pkgs/stdenv/adapters.nix index 9884c219ff6..e11b6efb59c 100644 --- a/pkgs/stdenv/adapters.nix +++ b/pkgs/stdenv/adapters.nix @@ -149,25 +149,15 @@ rec { }); - /* Return a modified stdenv that builds packages with GCC's coverage - instrumentation. The coverage note files (*.gcno) are stored in - $out/.build, along with the source code of the package, to enable - programs like lcov to produce pretty-printed reports. - */ + # remove after 22.05 and before 22.11 addCoverageInstrumentation = stdenv: + builtins.trace "'addCoverageInstrumentation' adapter is deprecated and will be removed before 22.11" overrideInStdenv stdenv [ pkgs.enableGCOVInstrumentation pkgs.keepBuildTree ]; - /* Replace the meta.maintainers field of a derivation. This is useful - when you want to fork to update some packages without disturbing other - developers. - - e.g.: in all-packages.nix: - - # remove all maintainers. - defaultStdenv = replaceMaintainersField allStdenvs.stdenv pkgs []; - */ + # remove after 22.05 and before 22.11 replaceMaintainersField = stdenv: pkgs: maintainers: + builtins.trace "'replaceMaintainersField' adapter is deprecated and will be removed before 22.11" stdenv.override (old: { mkDerivationFromStdenv = overrideMkDerivationResult (pkg: lib.recursiveUpdate pkg { meta.maintainers = maintainers; }); @@ -193,22 +183,9 @@ rec { }); - /* Abort if the license predicate is not verified for a derivation - declared with mkDerivation. - - One possible predicate to avoid all non-free packages can be achieved - with the following function: - - isFree = license: with builtins; - if license == null then true - else if isList license then lib.all isFree license - else license != "non-free" && license != "unfree"; - - This adapter can be defined on the defaultStdenv definition. You can - use it by patching the all-packages.nix file or by using the override - feature of ~/.config/nixpkgs/config.nix . - */ + # remove after 22.05 and before 22.11 validateLicenses = licensePred: stdenv: + builtins.trace "'validateLicenses' adapter is deprecated and will be removed before 22.11" stdenv.override (old: { mkDerivationFromStdenv = overrideMkDerivationResult (pkg: let From 5bfd8093b72b0321354259cec9dc1050114a223c Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sat, 7 May 2022 22:00:28 +0100 Subject: [PATCH 068/147] xwinmosaic: pull upstream fix for -fno-common toolchains Without the change build fails as: $ nix build --impure --expr 'with import ./. {}; xwinmosaic.overrideAttrs (oa: { NIX_CFLAGS_COMPILE = (oa.NIX_CFLAGS_COMPILE or "") + "-fno-common"; })' ld: CMakeFiles/xwinmosaic.dir/main.c.o:(.bss+0xc0): multiple definition of `a_NET_CURRENT_DESKTOP'; CMakeFiles/xwinmosaic.dir/x_interaction.c.o:(.bss+0xc0): first defined here ld: CMakeFiles/xwinmosaic.dir/main.c.o:(.bss+0xc8): multiple definition of `a_NET_DESKTOP_VIEWPORT'; CMakeFiles/xwinmosaic.dir/x_interaction.c.o:(.bss+0xc8): first defined here --- pkgs/tools/X11/xwinmosaic/default.nix | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/X11/xwinmosaic/default.nix b/pkgs/tools/X11/xwinmosaic/default.nix index af17f3ade7d..51ba815f1de 100644 --- a/pkgs/tools/X11/xwinmosaic/default.nix +++ b/pkgs/tools/X11/xwinmosaic/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, gtk2, cmake, pkg-config, libXdamage }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, gtk2, cmake, pkg-config, libXdamage }: stdenv.mkDerivation rec { version = "0.4.2"; @@ -11,6 +11,16 @@ stdenv.mkDerivation rec { sha256 = "16qhrpgn84fz0q3nfvaz5sisc82zk6y7c0sbvbr69zfx5fwbs1rr"; }; + patches = [ + # Pull upstream fix for -fno-common toolchains like upstream gcc-10: + # https://github.com/soulthreads/xwinmosaic/pull/33 + (fetchpatch { + name = "fno-common.patch"; + url = "https://github.com/soulthreads/xwinmosaic/commit/a193a3f30850327066e5a93b29316cba2735e10d.patch"; + sha256 = "0qpk802j5x6bsfvj6jqw1nz482jynwyk7yrrh4bsziwc53khm95q"; + }) + ]; + nativeBuildInputs = [ pkg-config cmake ]; buildInputs = [ gtk2 libXdamage ]; From 527f2375d0c75641c8cebd2b00a6bea5820a1338 Mon Sep 17 00:00:00 2001 From: Euan Kemp Date: Sat, 7 May 2022 14:53:25 -0700 Subject: [PATCH 069/147] k3s: 1.23.5+k3s1 -> 1.23.6+k3s1 This updates k3s. This one's done by hand rather than via the update bot since the upstream repo ended up in a state where `go mod download` didn't work, and we had `proxyVendor` set (which causes a `go mod download`). Deleting `proxyVendor` works now though, and I didn't actually fully understand why it was needed before, so I've removed that. Which unblocks the update. The actual update was done via `./update.sh` after removing `proxyVendor` and the `k3sServerVendorSha256` variables. --- .../networking/cluster/k3s/default.nix | 21 ++++++++----------- .../networking/cluster/k3s/update.sh | 13 ------------ 2 files changed, 9 insertions(+), 25 deletions(-) diff --git a/pkgs/applications/networking/cluster/k3s/default.nix b/pkgs/applications/networking/cluster/k3s/default.nix index aeca62764f0..3cceae804cf 100644 --- a/pkgs/applications/networking/cluster/k3s/default.nix +++ b/pkgs/applications/networking/cluster/k3s/default.nix @@ -46,17 +46,15 @@ with lib; # Those pieces of software we entirely ignore upstream's handling of, and just # make sure they're in the path if desired. let - k3sVersion = "1.23.5+k3s1"; # k3s git tag - k3sCommit = "313aaca547f030752788dce696fdf8c9568bc035"; # k3s git commit at the above version - k3sRepoSha256 = "0vk72609cyyh64irp14jp2zspnxw34jm710cbwgklx0ch6kiz88d"; - k3sVendorSha256 = "sha256-d7kQsJi/eQbaTUDglp3gFpc5Im6CyD9coKeM3kMrbjI="; - - k3sServerVendorSha256 = "sha256-E3USXNuXY0lzZH+t3O7BOQ8rKNNQ6avOMItgOEi1cEg="; + k3sVersion = "1.23.6+k3s1"; # k3s git tag + k3sCommit = "418c3fa858b69b12b9cefbcff0526f666a6236b9"; # k3s git commit at the above version + k3sRepoSha256 = "0fmw491dn5mpi058mr7sij51i5m4qg2grx30cnl3h2v4s0sdkx2i"; + k3sVendorSha256 = "sha256-iHg5ySMaiSWXs98YGmxPwdZr4zdBIFma12dNEuf30Hs="; # taken from ./manifests/traefik.yaml, extracted from '.spec.chart' https://github.com/k3s-io/k3s/blob/v1.23.3%2Bk3s1/scripts/download#L9 # The 'patch' and 'minor' versions are currently hardcoded as single digits only, so ignore the trailing two digits. Weird, I know. - traefikChartVersion = "10.14.1"; - traefikChartSha256 = "09a6cialx7nrh7nwi1gkkh8zcsasxcgb52dyx0r8bjq9ng29simj"; + traefikChartVersion = "10.19.3"; + traefikChartSha256 = "04zg5li957svgscdmkzmzjkwljaljyav68rzxmhakkwgav6q9058"; # taken from ./scripts/version.sh VERSION_ROOT https://github.com/k3s-io/k3s/blob/v1.23.3%2Bk3s1/scripts/version.sh#L47 k3sRootVersion = "0.11.0"; @@ -68,8 +66,8 @@ let # taken from go.mod, the 'github.com/containerd/containerd' line # run `grep github.com/containerd/containerd go.mod | head -n1 | awk '{print $4}'` - containerdVersion = "1.5.10-k3s1"; - containerdSha256 = "1ff2sfaqpjimq7w0lprci6ibyi6v65ap6b9sr6b0j12gqr2sqwa5"; + containerdVersion = "1.5.11-k3s2"; + containerdSha256 = "16132snvrg8r0vwm6c0lz0q6fx686s2ix53nm3aka9a83xs75vf2"; # run `grep github.com/kubernetes-sigs/cri-tools go.mod | head -n1 | awk '{print $4}'` in the k3s repo at the tag criCtlVersion = "1.22.0-k3s1"; @@ -175,7 +173,7 @@ let version = k3sVersion; src = k3sRepo; - vendorSha256 = k3sServerVendorSha256; + vendorSha256 = k3sVendorSha256; nativeBuildInputs = [ pkg-config ]; buildInputs = [ libseccomp ]; @@ -223,7 +221,6 @@ buildGoModule rec { version = k3sVersion; src = k3sRepo; - proxyVendor = true; vendorSha256 = k3sVendorSha256; patches = [ diff --git a/pkgs/applications/networking/cluster/k3s/update.sh b/pkgs/applications/networking/cluster/k3s/update.sh index 8f199bf9cc0..6c9755334cd 100755 --- a/pkgs/applications/networking/cluster/k3s/update.sh +++ b/pkgs/applications/networking/cluster/k3s/update.sh @@ -81,19 +81,6 @@ setKV containerdSha256 ${CONTAINERD_SHA256} setKV criCtlVersion ${CRI_CTL_VERSION} -setKV k3sServerVendorSha256 "0000000000000000000000000000000000000000000000000000" - -set +e -K3S_SERVER_VENDOR_SHA256=$(nix-build ${NIXPKGS_ROOT} --no-out-link -A k3s 2>&1 >/dev/null | grep "got:" | cut -d':' -f2 | sed 's| ||g') -set -e - -if [ -n "${K3S_SERVER_VENDOR_SHA256:-}" ]; then - setKV k3sServerVendorSha256 ${K3S_SERVER_VENDOR_SHA256} -else - echo "Update failed. K3S_SERVER_VENDOR_SHA256 is empty." - exit 1 -fi - set +e K3S_VENDOR_SHA256=$(nix-prefetch -I nixpkgs=${NIXPKGS_ROOT} "{ sha256 }: (import ${NIXPKGS_ROOT}. {}).k3s.go-modules.overrideAttrs (_: { vendorSha256 = sha256; })") set -e From c268cb0725f0cef8539419bc20dc956fb9ce4a30 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Sat, 7 May 2022 18:51:49 -0300 Subject: [PATCH 070/147] lxde: refactor To be more in line with the other desktops. Indeed it is strange to look at all those lxde packages spread over all-packages.nix. --- .../default.nix} | 0 pkgs/desktops/lxde/default.nix | 23 +++++++++++++++ pkgs/top-level/all-packages.nix | 29 +++++++------------ 3 files changed, 34 insertions(+), 18 deletions(-) rename pkgs/desktops/lxde/core/{lxmenu-data.nix => lxmenu-data/default.nix} (100%) create mode 100644 pkgs/desktops/lxde/default.nix diff --git a/pkgs/desktops/lxde/core/lxmenu-data.nix b/pkgs/desktops/lxde/core/lxmenu-data/default.nix similarity index 100% rename from pkgs/desktops/lxde/core/lxmenu-data.nix rename to pkgs/desktops/lxde/core/lxmenu-data/default.nix diff --git a/pkgs/desktops/lxde/default.nix b/pkgs/desktops/lxde/default.nix new file mode 100644 index 00000000000..702b4bbb67d --- /dev/null +++ b/pkgs/desktops/lxde/default.nix @@ -0,0 +1,23 @@ +{ config, lib, pkgs }: + +lib.makeScope pkgs.newScope (self: with self; { + + lxappearance = callPackage ./core/lxappearance { }; + + lxappearance-gtk2 = callPackage ./core/lxappearance { + gtk2 = gtk2-x11; + withGtk3 = false; + }; + + lxmenu-data = callPackage ./core/lxmenu-data { }; + + lxpanel = callPackage ./core/lxpanel { + gtk2 = gtk2-x11; + }; + + lxrandr = callPackage ./core/lxrandr { }; + + lxsession = callPackage ./core/lxsession { }; + + lxtask = callPackage ./core/lxtask { }; +}) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e8a7e821ba9..96f3e4a0722 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -32493,24 +32493,17 @@ with pkgs; ### DESKTOPS/LXDE - lxappearance = callPackage ../desktops/lxde/core/lxappearance { }; - - lxappearance-gtk2 = callPackage ../desktops/lxde/core/lxappearance { - gtk2 = gtk2-x11; - withGtk3 = false; - }; - - lxmenu-data = callPackage ../desktops/lxde/core/lxmenu-data.nix { }; - - lxpanel = callPackage ../desktops/lxde/core/lxpanel { - gtk2 = gtk2-x11; - }; - - lxrandr = callPackage ../desktops/lxde/core/lxrandr { }; - - lxsession = callPackage ../desktops/lxde/core/lxsession { }; - - lxtask = callPackage ../desktops/lxde/core/lxtask { }; + lxde = recurseIntoAttrs (callPackage ../desktops/lxde { }); + # Backwards compatibility aliases + inherit (lxde) + lxappearance + lxappearance-gtk2 + lxmenu-data + lxpanel + lxrandr + lxsession + lxtask + ; lxqt = recurseIntoAttrs (import ../desktops/lxqt { inherit pkgs; From d9f391d75c562df1f411d19a364fdc4321340e83 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 8 May 2022 01:12:02 +0200 Subject: [PATCH 071/147] python310Packages.oscrypto: 1.2.1 -> 1.3.0 --- .../python-modules/oscrypto/default.nix | 44 +++++++++++-------- 1 file changed, 25 insertions(+), 19 deletions(-) diff --git a/pkgs/development/python-modules/oscrypto/default.nix b/pkgs/development/python-modules/oscrypto/default.nix index b4d1c8fb88a..96d4416ec96 100644 --- a/pkgs/development/python-modules/oscrypto/default.nix +++ b/pkgs/development/python-modules/oscrypto/default.nix @@ -1,24 +1,25 @@ { lib , stdenv -, buildPythonPackage , asn1crypto -, fetchPypi +, buildPythonPackage +, fetchFromGitHub , openssl +, pytestCheckHook +, pythonOlder }: buildPythonPackage rec { pname = "oscrypto"; - version = "1.2.1"; + version = "1.3.0"; + format = "setuptools"; - src = fetchPypi { - inherit pname version; - sha256 = "1546si2bdgkqnbvv4mw1hr4mhh6bq39d9z4wxgv1m7fq6miclb3x"; - }; + disabled = pythonOlder "3.7"; - testSources = fetchPypi { - inherit version; - pname = "oscrypto_tests"; - sha256 = "1ha68dsrbx6mlra44x0n81vscn17pajbl4yg7cqkk7mq1zfmjwks"; + src = fetchFromGitHub { + owner = "wbond"; + repo = pname; + rev = version; + hash = "sha256-CmDypmlc/kb6ONCUggjT1Iqd29xNSLRaGh5Hz36dvOw="; }; propagatedBuildInputs = [ @@ -26,21 +27,26 @@ buildPythonPackage rec { openssl ]; - preCheck = '' - tar -xf ${testSources} - mv oscrypto_tests-${version} tests - - # remove tests that require network - sed -e '/TLSTests/d' -e '/TrustListTests/d' -i tests/__init__.py - ''; + checkInputs = [ + pytestCheckHook + ]; - pythonImportsCheck = [ "oscrypto" ]; + pythonImportsCheck = [ + "oscrypto" + ]; doCheck = !stdenv.isDarwin; + disabledTests = [ + # Tests require network access + "TLSTests" + "TrustListTests" + ]; + meta = with lib; { description = "Encryption library for Python"; homepage = "https://github.com/wbond/oscrypto"; license = licenses.mit; + maintainers = with maintainers; [ ]; }; } From d51fa879756e4f79ae20e77b10a70360c6f8e340 Mon Sep 17 00:00:00 2001 From: AndersonTorres Date: Sat, 7 May 2022 20:51:41 -0300 Subject: [PATCH 072/147] lxde: bring gtk2-x11 to the scope --- pkgs/desktops/lxde/default.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/desktops/lxde/default.nix b/pkgs/desktops/lxde/default.nix index 702b4bbb67d..8421bc5dac6 100644 --- a/pkgs/desktops/lxde/default.nix +++ b/pkgs/desktops/lxde/default.nix @@ -2,6 +2,8 @@ lib.makeScope pkgs.newScope (self: with self; { + inherit (pkgs) gtk2-x11; + lxappearance = callPackage ./core/lxappearance { }; lxappearance-gtk2 = callPackage ./core/lxappearance { From ec31b56db168022642cbc33315209debf7aea730 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 8 May 2022 00:44:34 +0000 Subject: [PATCH 073/147] abcmidi: 2022.04.28 -> 2022.05.05 --- pkgs/tools/audio/abcmidi/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/audio/abcmidi/default.nix b/pkgs/tools/audio/abcmidi/default.nix index cd2661128a9..c50a49255c9 100644 --- a/pkgs/tools/audio/abcmidi/default.nix +++ b/pkgs/tools/audio/abcmidi/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "abcMIDI"; - version = "2022.04.28"; + version = "2022.05.05"; src = fetchzip { url = "https://ifdo.ca/~seymour/runabc/${pname}-${version}.zip"; - hash = "sha256-a/zFCxdy+GTh5daZO7QBHWeeJ1dead3Dn7dk02jBnc0="; + hash = "sha256-QGCws+S6Mfv0uQcfKg2DbRWS34UAeG17Z+YAyswVAFc="; }; meta = with lib; { From d707e510df39cdd8fe1d3e244371a3a9f23051d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Fri, 6 May 2022 01:50:26 +0000 Subject: [PATCH 074/147] python3Packages.pyrogram: 2.0.16 -> 2.0.17 --- pkgs/development/python-modules/pyrogram/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/pyrogram/default.nix b/pkgs/development/python-modules/pyrogram/default.nix index 6a2ce2af05e..0c34eb375bb 100644 --- a/pkgs/development/python-modules/pyrogram/default.nix +++ b/pkgs/development/python-modules/pyrogram/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "pyrogram"; - version = "2.0.16"; + version = "2.0.17"; disabled = pythonOlder "3.7"; @@ -20,7 +20,7 @@ buildPythonPackage rec { owner = "pyrogram"; repo = "pyrogram"; rev = "v${version}"; - hash = "sha256-uRGLk8XTHimKtkVjPPe2ohTPv3UiaxmkRywQY4iPHyg="; + hash = "sha256-MzbZVG6/+YirgKsfrsSaT6jS0fTq/TBhlduZzgQKU+M="; }; propagatedBuildInputs = [ From 98c41cf5b439e1fe2c1122916646de7a35932310 Mon Sep 17 00:00:00 2001 From: Vonfry Date: Sun, 8 May 2022 09:38:02 +0800 Subject: [PATCH 075/147] zsh-fzf-tab: unstable-2022-02-10 -> unstable-2022-04-15 --- pkgs/shells/zsh/zsh-fzf-tab/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/shells/zsh/zsh-fzf-tab/default.nix b/pkgs/shells/zsh/zsh-fzf-tab/default.nix index 6d8ea1a9de9..029950b9bee 100644 --- a/pkgs/shells/zsh/zsh-fzf-tab/default.nix +++ b/pkgs/shells/zsh/zsh-fzf-tab/default.nix @@ -4,13 +4,13 @@ let INSTALL_PATH="${placeholder "out"}/share/fzf-tab"; in stdenv.mkDerivation rec { pname = "zsh-fzf-tab"; - version = "unstable-2022-02-10"; + version = "unstable-2022-04-15"; src = fetchFromGitHub { owner = "Aloxaf"; repo = "fzf-tab"; - rev = "e8145d541a35d8a03df49fbbeefa50c4a0076bbf"; - sha256 = "h/3XP/BiNnUgQI29gEBl6RFee77WDhFyvsnTi1eRbKg="; + rev = "7e0eee64df6c7c81a57792674646b5feaf89f263"; + sha256 = "sha256-ixUnuNtxxmiigeVjzuV5uG6rIBPY/1vdBZF2/Qv0Trs="; }; buildInputs = [ ncurses ]; From e77d20ed558efc22e214bdd5c7f2bc1aea4ac9ea Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 8 May 2022 02:17:13 +0000 Subject: [PATCH 076/147] flexget: 3.3.8 -> 3.3.9 --- pkgs/applications/networking/flexget/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/networking/flexget/default.nix b/pkgs/applications/networking/flexget/default.nix index 8421a077d00..d74378378b9 100644 --- a/pkgs/applications/networking/flexget/default.nix +++ b/pkgs/applications/networking/flexget/default.nix @@ -5,14 +5,14 @@ python3Packages.buildPythonApplication rec { pname = "flexget"; - version = "3.3.8"; + version = "3.3.9"; # Fetch from GitHub in order to use `requirements.in` src = fetchFromGitHub { owner = "flexget"; repo = "flexget"; - rev = "v${version}"; - hash = "sha256-ZGs5ixNcrkoZ4TRVuIUeNF1FNJwKpYElNv6oPhGiEmU="; + rev = "refs/tags/v${version}"; + hash = "sha256-29V22B1Nkgj/qc6uyAOSOZ1rrjjtf75I9Eycu8I5ysQ="; }; postPatch = '' From 08a7a6670e1e583f518e11ae13e6fe490ef8cf5c Mon Sep 17 00:00:00 2001 From: "P. R. d. O" Date: Sat, 7 May 2022 20:51:49 -0600 Subject: [PATCH 077/147] bashblog: add hooks on install phase --- pkgs/tools/text/bashblog/default.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/tools/text/bashblog/default.nix b/pkgs/tools/text/bashblog/default.nix index 2649b564044..3c8d90caf84 100644 --- a/pkgs/tools/text/bashblog/default.nix +++ b/pkgs/tools/text/bashblog/default.nix @@ -45,8 +45,12 @@ in stdenv.mkDerivation rec { ''; installPhase = '' + runHook preInstall + mkdir -p $out/bin install -Dm755 bb.sh $out/bin/bashblog + + runHook postInstall ''; meta = with lib; { From 0cd600f9298cfe8e3a3c06c44540dcb51e87afc7 Mon Sep 17 00:00:00 2001 From: Zhaofeng Li Date: Sat, 7 May 2022 20:03:55 -0700 Subject: [PATCH 078/147] dropwatch: 1.5.3 -> 1.5.4 --- pkgs/os-specific/linux/dropwatch/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/pkgs/os-specific/linux/dropwatch/default.nix b/pkgs/os-specific/linux/dropwatch/default.nix index c2701c05719..470b5901870 100644 --- a/pkgs/os-specific/linux/dropwatch/default.nix +++ b/pkgs/os-specific/linux/dropwatch/default.nix @@ -13,13 +13,13 @@ stdenv.mkDerivation rec { pname = "dropwatch"; - version = "1.5.3"; + version = "1.5.4"; src = fetchFromGitHub { owner = "nhorman"; repo = pname; rev = "v${version}"; - sha256 = "0axx0zzrs7apqnl0r70jyvmgk7cs5wk185id479mapgngibwkyxy"; + sha256 = "sha256-TbhgcX5WzuigP5/Mj5JuK7O/UKcu70D7dcOcvo4fxeQ="; }; nativeBuildInputs = [ diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 7521d132290..fb14a864f69 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -22918,7 +22918,9 @@ with pkgs; drbd = callPackage ../os-specific/linux/drbd { }; - dropwatch = callPackage ../os-specific/linux/dropwatch { }; + dropwatch = callPackage ../os-specific/linux/dropwatch { + readline = readline81; + }; dsd = callPackage ../applications/radio/dsd { }; From 905f72e4ee14b426a98ab763f595a6cc3be675e3 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 8 May 2022 03:15:27 +0000 Subject: [PATCH 079/147] python310Packages.py-canary: 0.5.1 -> 0.5.2 --- pkgs/development/python-modules/py-canary/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/py-canary/default.nix b/pkgs/development/python-modules/py-canary/default.nix index 531624781b4..695b00a1a11 100644 --- a/pkgs/development/python-modules/py-canary/default.nix +++ b/pkgs/development/python-modules/py-canary/default.nix @@ -10,14 +10,14 @@ buildPythonPackage rec { pname = "py-canary"; - version = "0.5.1"; + version = "0.5.2"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "snjoetw"; repo = pname; - rev = version; - sha256 = "0j743cc0wv7im3anx1vvdm79zyvw67swhc3zwwc1r8626dgnmxjr"; + rev = "refs/tags/${version}"; + sha256 = "sha256-PE31J82Uc6mErnh7nQ1pkIjnMbuCnlYEX2R0azknMHQ="; }; propagatedBuildInputs = [ From 04f6a432c45f47560680f29595ffffe6a6644821 Mon Sep 17 00:00:00 2001 From: elikoga Date: Sun, 8 May 2022 05:20:34 +0200 Subject: [PATCH 080/147] Update link from old nix manual to current stable one https://github.com/NixOS/rfcs/pull/72 --- pkgs/stdenv/generic/make-derivation.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/stdenv/generic/make-derivation.nix b/pkgs/stdenv/generic/make-derivation.nix index 11c0a29ce4f..88450328ca7 100644 --- a/pkgs/stdenv/generic/make-derivation.nix +++ b/pkgs/stdenv/generic/make-derivation.nix @@ -83,7 +83,7 @@ makeOverlayable (overrideAttrs: # * https://nixos.org/nixpkgs/manual/#sec-using-stdenv # Details on how to use this mkDerivation function # -# * https://nixos.org/nix/manual/#ssec-derivation +# * https://nixos.org/manual/nix/stable/expressions/derivations.html#derivations # Explanation about derivations in general { From 3aef23986c605532f6e971463514413d40ce2aea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 5 May 2022 04:19:32 +0000 Subject: [PATCH 081/147] python3Packages.requests-aws4auth: specify extras-require --- .../python-modules/requests-aws4auth/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/requests-aws4auth/default.nix b/pkgs/development/python-modules/requests-aws4auth/default.nix index d2de7dff212..c38309f6d8d 100644 --- a/pkgs/development/python-modules/requests-aws4auth/default.nix +++ b/pkgs/development/python-modules/requests-aws4auth/default.nix @@ -24,14 +24,17 @@ buildPythonPackage rec { }; propagatedBuildInputs = [ - httpx requests six ]; + passthru.extras-require = { + httpx = [ httpx ]; + }; + checkInputs = [ pytestCheckHook - ]; + ] ++ passthru.extras-require.httpx; pythonImportsCheck = [ "requests_aws4auth" From 453590adec901a3f088b7c5090e6858255cc26e5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Thu, 5 May 2022 04:20:19 +0000 Subject: [PATCH 082/147] elasticsearch-curator: 5.8.1 -> 5.8.4 --- .../admin/elasticsearch-curator/default.nix | 90 ++++++++++--------- pkgs/top-level/all-packages.nix | 4 +- 2 files changed, 47 insertions(+), 47 deletions(-) diff --git a/pkgs/tools/admin/elasticsearch-curator/default.nix b/pkgs/tools/admin/elasticsearch-curator/default.nix index 60a7e0586f5..576df67ad5f 100644 --- a/pkgs/tools/admin/elasticsearch-curator/default.nix +++ b/pkgs/tools/admin/elasticsearch-curator/default.nix @@ -1,63 +1,68 @@ -{ lib, fetchFromGitHub, python }: +{ lib, fetchFromGitHub, python3 }: let -py = python.override { - packageOverrides = self: super: { - click = super.click.overridePythonAttrs (oldAttrs: rec { - version = "6.7"; - src = oldAttrs.src.override { - inherit version; - sha256 = "f15516df478d5a56180fbf80e68f206010e6d160fc39fa508b65e035fd75130b"; - }; - doCheck = false; - postPatch = ""; - }); + python = python3.override { + packageOverrides = self: super: { + click = super.click.overridePythonAttrs (old: rec { + version = "7.1.2"; + src = old.src.override { + inherit version; + sha256 = "d2b5255c7c6349bc1bd1e59e08cd12acbbd63ce649f2588755783aa94dfb6b1a"; + }; + }); + requests-aws4auth = super.requests-aws4auth.overridePythonAttrs (old: { + doCheck = false; # requires click>=8.0 + }); + }; }; -}; -in - -with py.pkgs; -buildPythonApplication rec { +in python.pkgs.buildPythonApplication rec { pname = "elasticsearch-curator"; - version = "5.8.1"; + version = "5.8.4"; + + format = "setuptools"; src = fetchFromGitHub { owner = "elastic"; repo = "curator"; rev = "v${version}"; - sha256 = "1shr9jslirjnbvma3p19djsnamxl7f3m9c8zrlclk57zv8rnwpkr"; + hash = "sha256-wSfd52jebUkgF5xhjcoUjI7j46eJF33pVb4Wrybq44g="; }; - # The test hangs so we disable it. - doCheck = false; + postPatch = '' + substituteInPlace setup.cfg \ + --replace "urllib3==1.26.4" "urllib3" + substituteInPlace setup.py \ + --replace "urllib3==1.26.4" "urllib3" \ + --replace "pyyaml==5.4.1" "pyyaml" + ''; - propagatedBuildInputs = [ - click - certifi - requests-aws4auth - pyopenssl - voluptuous - pyyaml + propagatedBuildInputs = with python.pkgs; [ elasticsearch + urllib3 + requests boto3 + requests-aws4auth + click + pyyaml + voluptuous + certifi + six ]; - checkInputs = [ - nosexcover - coverage - nose + checkInputs = with python.pkgs; [ mock - funcsigs + pytestCheckHook ]; - postPatch = '' - sed -i s/pyyaml==3.13/pyyaml/g setup.cfg setup.py - sed -i s/pyyaml==3.12/pyyaml/g setup.cfg setup.py - substituteInPlace setup.py \ - --replace "urllib3>=1.24.2,<1.25" "urllib3" - substituteInPlace setup.cfg \ - --replace "urllib3>=1.24.2,<1.25" "urllib3" - ''; + disabledTestPaths = [ + "test/integration" # requires running elasticsearch + ]; + + disabledTests = [ + # access network + "test_api_key_not_set" + "test_api_key_set" + ]; meta = with lib; { homepage = "https://github.com/elastic/curator"; @@ -76,8 +81,5 @@ buildPythonApplication rec { * Perform various actions on the items which remain in the actionable list. ''; maintainers = with maintainers; [ basvandijk ]; - - # https://github.com/elastic/curator/pull/1280 - #broken = versionAtLeast click.version "7.0"; }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index be01edf485b..a401ddd5836 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -5585,9 +5585,7 @@ with pkgs; elasticsearch = elasticsearch7; }; - elasticsearch-curator = callPackage ../tools/admin/elasticsearch-curator { - python = python3; - }; + elasticsearch-curator = callPackage ../tools/admin/elasticsearch-curator { }; embree = callPackage ../development/libraries/embree { }; embree2 = callPackage ../development/libraries/embree/2.x.nix { }; From 37b5883fe6ac5514dbaf27adba2c788b9ad8ec47 Mon Sep 17 00:00:00 2001 From: "P. R. d. O" Date: Sat, 7 May 2022 21:55:30 -0600 Subject: [PATCH 083/147] binance: 1.30.1 -> 1.35.0 --- pkgs/applications/misc/binance/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/misc/binance/default.nix b/pkgs/applications/misc/binance/default.nix index 86445f25984..d5d6f6b5358 100644 --- a/pkgs/applications/misc/binance/default.nix +++ b/pkgs/applications/misc/binance/default.nix @@ -3,11 +3,11 @@ stdenv.mkDerivation rec { pname = "binance"; - version = "1.30.1"; + version = "1.35.0"; src = fetchurl { url = "https://github.com/binance/desktop/releases/download/v${version}/${pname}-${version}-amd64-linux.deb"; - sha256 = "sha256-Su8pVf5GSBK770D778MmrgYr0ov/JBTNcnL8EZzoG3U="; + sha256 = "sha256-6c7nrdViunnvPqqbt5/LQp2iS4EgZOCQ9PLcG+bY1YQ="; }; nativeBuildInputs = [ From 3ecfee92ed4b82aa8233e926ad8cb1bd03de06be Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 8 May 2022 04:35:49 +0000 Subject: [PATCH 084/147] iosevka-bin: 15.2.0 -> 15.3.0 --- pkgs/data/fonts/iosevka/bin.nix | 2 +- pkgs/data/fonts/iosevka/variants.nix | 184 +++++++++++++-------------- 2 files changed, 93 insertions(+), 93 deletions(-) diff --git a/pkgs/data/fonts/iosevka/bin.nix b/pkgs/data/fonts/iosevka/bin.nix index 859dae4e49c..fbf16d16fd6 100644 --- a/pkgs/data/fonts/iosevka/bin.nix +++ b/pkgs/data/fonts/iosevka/bin.nix @@ -11,7 +11,7 @@ let (builtins.attrNames (builtins.removeAttrs variantHashes [ "iosevka" ])); in stdenv.mkDerivation rec { pname = "${name}-bin"; - version = "15.2.0"; + version = "15.3.0"; src = fetchurl { url = "https://github.com/be5invis/Iosevka/releases/download/v${version}/ttc-${name}-${version}.zip"; diff --git a/pkgs/data/fonts/iosevka/variants.nix b/pkgs/data/fonts/iosevka/variants.nix index 3e9e69ae9df..181aa44e018 100644 --- a/pkgs/data/fonts/iosevka/variants.nix +++ b/pkgs/data/fonts/iosevka/variants.nix @@ -1,95 +1,95 @@ # This file was autogenerated. DO NOT EDIT! { - iosevka = "0yyz8vmpi8pww0p9na564lvbkwhdhpk4bcyrli91dn5gq0pc1pvv"; - iosevka-aile = "1lciycahvxgvmcniq4h3m1v3rc42nmv8ydb0fpbl9g4sc0qp81hq"; - iosevka-curly = "02jvrj7kzd4bx3maj1bq2p9j746b8c5713d8lqkxx4fn9fm0zppq"; - iosevka-curly-slab = "1bhvf95xs74wm8srsvl4yxwvl36llk93mpl1y9acc5z9rdcpzjqq"; - iosevka-etoile = "1zmgfxfsbxv1k4fwnc7g2jlfhmlzp5kap8m3f10fqanpnkd0yf08"; - iosevka-slab = "1qy86kdl6lgq5k1qb97adibpfjm4vg1wdnxbqizhqka5bc7avyzb"; - iosevka-ss01 = "1k451iv9fvp86arw0z685xyixlkpnsg3mxl6k9s47xxf9r82ab2a"; - iosevka-ss02 = "066l1jamvlnksl1jn4l5qqll4wi19w0jr9x7bw0lpdic9478cs8g"; - iosevka-ss03 = "0qh5ds9s7rghmar90ymxvcninmcm2hc05f83ixjadjfg9a27sff7"; - iosevka-ss04 = "1zl2m68wqync8n93n06yj49r6n652yakrvdcsdvqm3agajnz0wnk"; - iosevka-ss05 = "0rxakr04kwrwjfq7a6y2vdyjfgn162d8353pn7nc9wsfyrjbqpc2"; - iosevka-ss06 = "0lfv6cvqy1mcn7zds7c6w68ky4y3clmvxcrg5knilm7sfql1jis1"; - iosevka-ss07 = "1cc15rnnq2vzp22p8ld94jl2lyn6k8bra5792yqvyg23lf493jk2"; - iosevka-ss08 = "0ysrq40kpvgfiapk1x9nzvvd81r0kyl1jlywwhmm3f4qca86a3ja"; - iosevka-ss09 = "1535y8gmlkd1nqywcbmp7x9y9ahmskmwgs138baaj642jbq85l1b"; - iosevka-ss10 = "01z7nwyqqda6jw819ajr9cd691yxd0b3irj4amdwnl6b46a278q7"; - iosevka-ss11 = "0zi2n6h7jqf4vbg6r5vjzk0y8fj1lfjifsa1s3j0dmgs05m2bzc8"; - iosevka-ss12 = "1h5bw4fp6kgszzwd9dpi461yf3mnkm0b5cgpaliyl2qpd8jivmm1"; - iosevka-ss13 = "06v5angxqnbz9a53358ls0w78ib1d57g3svnfyplw7ynd0rrvw93"; - iosevka-ss14 = "0ic0hh6xh1pl1jzkmp1ddbzhvfzislimlgwsdcnimzxk6ga5k44j"; - iosevka-ss15 = "1mg363g47j90z00dpha81jk0n2ck59ca172g165m7cmz1bb425iq"; - iosevka-ss16 = "0bs3rhwgnv9cwzgmsgzgjgv6awz5igxcvq64xpycw0dp17wbfl1z"; - iosevka-ss17 = "0ssi56j8jdkhpsq7acczy3z9v8q3amr6a6jxv49rd4473fxzh3zc"; - iosevka-ss18 = "13s77f1ki09szpa64qb00421kj2n5q2lv0vb2ahnlvphsbgik1j6"; - sgr-iosevka = "0pqhpm13q23f82lkcimk8pinm41j6xmdlqxmfzg1y7m50gzdm10r"; - sgr-iosevka-aile = "1malyfkc9dd552p04vq2b2nlv613pjzw84q8gnlpy8bycgx5np3s"; - sgr-iosevka-curly = "0b8gnk8hsily9wp91hi66xjyj5hwqcab7j64x1xzzdc7fnfaz0qq"; - sgr-iosevka-curly-slab = "0i9k38a7fb9z6jwds92kz3pgf1ryjz1m12ad1mslwq82kwy00h3f"; - sgr-iosevka-etoile = "0rw4dhivxf3yls28zs34xia56dzx1w2as2j619ji36dpmh1v3ljn"; - sgr-iosevka-fixed = "1zcr7zcpca5bhgaisjjlbn7zn1ih6mz6k4nj27y4ya8hnasfqxlh"; - sgr-iosevka-fixed-curly = "17jvx2rvfqx6ip8h8srr6iwy55nnwvkrrflr4hxdyv8ggi8d8y7d"; - sgr-iosevka-fixed-curly-slab = "01s3wz0r2wmybws96s1mcplx7zrbciqabsgaa5jy4kwn8rg0ajpi"; - sgr-iosevka-fixed-slab = "1xbsrywi413r6gkmwc11yw8pkrc6hkf5309dfr25qwnn6c8wvqiy"; - sgr-iosevka-fixed-ss01 = "17776y4lv7vyqhcanmayvksh85v0907vys4f3hpxjbw86497f4zj"; - sgr-iosevka-fixed-ss02 = "0cwz8bfj05vr2800r35nd8d7r05hr4fd2wbx26dga3qnddawcgbp"; - sgr-iosevka-fixed-ss03 = "1df1aigpy5g46g68l9fln2af4fafl9fs197nz49biw66ndraym4c"; - sgr-iosevka-fixed-ss04 = "02g22kfd4nw8cvfkcjw9mixvw2abfzpbalcwcqidyn8qd3s51x1v"; - sgr-iosevka-fixed-ss05 = "12zwmzh0ilclkpw18lqkp4dpawngwf21ah90ywi3spzl9whqk5wc"; - sgr-iosevka-fixed-ss06 = "01ajn8gwqljx8da9fv9dlawwafcnqvf9pld9h8lygrg67kf3p1j6"; - sgr-iosevka-fixed-ss07 = "000sk29gfp9z7690880kixmk08swnwpp8zs89idgpg5qhs5479qm"; - sgr-iosevka-fixed-ss08 = "1fcw4wmz12ar5hy3r5hmagwss46yjsckk4hxhjfphbapznmyw2dx"; - sgr-iosevka-fixed-ss09 = "0jxpf854njzjw7r1q1jaizbfhaal7idhs9v5l64c03q40s2cycxr"; - sgr-iosevka-fixed-ss10 = "0n40gl7ygcc03n6673rkjdfqshd6fx7f0a831fz007s61c38rdl9"; - sgr-iosevka-fixed-ss11 = "0r0wlmpa5nmgwx92f6x2jimgyh5x05id39wsmxpyhjfrl4dchkgm"; - sgr-iosevka-fixed-ss12 = "02dvkr2vim8zyd1gngjk41bbg5ncjr6yfxigy5l9gjm64x6q2szz"; - sgr-iosevka-fixed-ss13 = "14vz894yxw5252krpwh9981hmslwmyxdgp96kpq37lp35w7bhkc0"; - sgr-iosevka-fixed-ss14 = "0jaz1g89dj27s3xgcginxx4s3kr7114x7wqqda96jyc1zrg79am4"; - sgr-iosevka-fixed-ss15 = "1h12kcik341vp3yra8izcbj3490payjqy8b0y739s4bj6zmx7zb3"; - sgr-iosevka-fixed-ss16 = "0yiyxbi1snd33ys8ip29xprwm0876j818g3fr2g6d955lp94crkp"; - sgr-iosevka-fixed-ss17 = "1sv4zf5w7amhd591cjky7z2fc90hiiwj1g987scwcbvc0fb5gj86"; - sgr-iosevka-fixed-ss18 = "09yh76152ar2lkw1gavd9x5i6a6vswhw9qyic0zixzr2rmcm2j35"; - sgr-iosevka-slab = "0xdljj5bh4jsbwjgicpbi91hkjqvzxis9asd4g0vy3qqdr393i9k"; - sgr-iosevka-ss01 = "0fllywsy23d6nfvgpb98af76cwbq8pizjvcah0p8j4qql6353d5y"; - sgr-iosevka-ss02 = "0mlp4l3bbm2rm9gjb4pa8k730x3yb85qck7a1n5wdfz881mz6z59"; - sgr-iosevka-ss03 = "0kcimy2i28a82s74987f6dxkdxzr06fzsi6rb7wz5v4rn5v7vmm9"; - sgr-iosevka-ss04 = "0ynrq7di10349lfqm34vzr6z9z5hx6lz4q2z73ri91si224qsgih"; - sgr-iosevka-ss05 = "1p2062x9wd5kkas3j5aqkx7r4asm2727i0sjf207w4lh3r37k9by"; - sgr-iosevka-ss06 = "0zcpnw5mk3js5rc0cgpn5fncqqwf5s032z04xbaagzsmp7f3f1p9"; - sgr-iosevka-ss07 = "09h686i2jq2p9i0684kjmsfgdpfwkbncbg3zxhz4m1x4wpfblhk8"; - sgr-iosevka-ss08 = "0jbzr6saijbmbj1dkc4djawr75agp2c8krsnwskqr9dhisrmnjfk"; - sgr-iosevka-ss09 = "10ffzi57gibz6w7yn4ign8vn6cagc680jrv81aqdkgav2bx71z9g"; - sgr-iosevka-ss10 = "0d0wn7564zyvfk79hfqgnm3aa94k8xbddgmmxpq5jk918a1m6614"; - sgr-iosevka-ss11 = "1zmbnhr1jz53yhighcn8dkj72s4y66ma61qjf5y3z64j7ql99kxi"; - sgr-iosevka-ss12 = "06czjy90yx7pv958agwwnwn2vpfv1ha2j90bmcjg2c6shvnz5hsr"; - sgr-iosevka-ss13 = "19k47hb167l6jsymznivdy6mgz228vcc4r5mzjjcszy4ba6n5qvg"; - sgr-iosevka-ss14 = "0nkj7jmpbwfq7pl7s3ih30zs0szqf7xsbjn70w5i5x2g8fc3sffj"; - sgr-iosevka-ss15 = "18l78cg3vxibngdbx2ikqhgz1v499ihf7bmdd5w92wrkkjgd0q8m"; - sgr-iosevka-ss16 = "00mn81r50aw3ymp3mnwb8j6z6n98y03z0g5b8jfybpah65rgsrra"; - sgr-iosevka-ss17 = "07vpvldkph4wn50vj5179h6zrw7vaf9mylksscw4wyqalinhiiqk"; - sgr-iosevka-ss18 = "1h0jq8d2lbh0lfsmqcwbw6q9fbhbfrnn3c58xnknr9ys32xc88l2"; - sgr-iosevka-term = "1j7sv5k4pbrq278nwfxshw23f7hdigy90w82a11s8nkq5b7f81wd"; - sgr-iosevka-term-curly = "1v3vcvq6p4a3y1alkg45l2jipf0mwsv4x57yxl0dd41fb30araxw"; - sgr-iosevka-term-curly-slab = "05is4yw7v32yf1h3b5j86wmz0x9fgbp5q99jw2zgn5lmv8x71dgh"; - sgr-iosevka-term-slab = "1a0fn07ykx93y2myxdmg4xnz67dwmdl66n8la8x1h502b4hacqpl"; - sgr-iosevka-term-ss01 = "1bwnyd6g0c185ny3d34pza1szc8pzkj15hk76g7s3jancgyajcj8"; - sgr-iosevka-term-ss02 = "17srbkd4pbr2wwzcw6ycm1c4n5jlk4p5wlm1baqfzvffldbp609k"; - sgr-iosevka-term-ss03 = "1w9ydkm0lsd0chyhi3b24n6syns55jwgnxkbnn7z7hh9llglplsj"; - sgr-iosevka-term-ss04 = "1znabmm2plb5w5f8qj61shzm4v6kdqdak547j64w768g6pgc61hh"; - sgr-iosevka-term-ss05 = "0pg3zannb29pxbfcjarj39my2lhwnid3yr7sbhk5i6sxy8klwjdv"; - sgr-iosevka-term-ss06 = "0n25hc5gfi4zcc2zr0r5zh0q8v16z8ak2iphh5406pdgj3n9lmi9"; - sgr-iosevka-term-ss07 = "0kmv8p689wf3mpiaq3749a3361nsckg0v4hsaw2mlshvhp4159h4"; - sgr-iosevka-term-ss08 = "04g0q2pgimj73hgxr9nv8qmbc6n6fsadhy5x3l3cwcw7wh7s0g37"; - sgr-iosevka-term-ss09 = "19qssfrmkvdq7bl0bg3a9v6sgnn2hg93kq0qh4j9chr7ffxnlmb2"; - sgr-iosevka-term-ss10 = "1qc3cfw9f959h1gafhsddrlw2cbvazv17yllsj6rw4rff3bqscaq"; - sgr-iosevka-term-ss11 = "1jbz5qg2vgrqmhbz8yvmampv7zkmksilvd7y2zrz4h5s2jbr32sg"; - sgr-iosevka-term-ss12 = "0afcjcpb4dw4d3dggm82yls09rl71x4jqavbil4z7br96vgipdg9"; - sgr-iosevka-term-ss13 = "04zbhi5mpycb9c6gf5ci1h6pbghy8vmajmzifcpg8d0fb9vyz370"; - sgr-iosevka-term-ss14 = "0bps3zgarjdq5xn92rgdasnhcqlrmxwpa4bv9wr40df7zxhlvkr4"; - sgr-iosevka-term-ss15 = "0ylxgmrsl596zdlph2f2lcfy9a37wi0x7418y53g43bdd33kcpxp"; - sgr-iosevka-term-ss16 = "1ql8x3r19sa36424wijrzxnl3mfz7rjnwlavd0bz8qinfdvjvdsf"; - sgr-iosevka-term-ss17 = "0plhqk7j64wfs61snly0m49lghk4srmribfqlzdk9xrvnv9h7zv1"; - sgr-iosevka-term-ss18 = "1h7z1cnd4ia1pbyj5sq1718z8n747cq8kdy97c4vdmw6gjl8wp5x"; + iosevka = "0nh0vsm9gpl5fsyfp11f8ks5jk4wf5r0nhqq92p7fdyrv6x8ygci"; + iosevka-aile = "0hjys81klq8f2vhk68bmd2vd6fzpbhvkx74jxbfi6fq487a5g6ix"; + iosevka-curly = "06npnjgwn3a78p3i5pdjs4bg69r3jz7y25qdii6wri3zna21w55r"; + iosevka-curly-slab = "0mr8v0k8v9b45hyylmyjqa2npi16zq0ga4kdx7782qy5x96fxkwh"; + iosevka-etoile = "0q1w9xqjr7zfghpvqp1c54y8z1i353fgfshj11bva3bb1vcgllk7"; + iosevka-slab = "1pppsjj8nwg76lidv52z0swlhrg44lw5y0kcv5hw56cgz17vnhw0"; + iosevka-ss01 = "1xj6zsadpxd7rcx5sklvzbcis09xpkdj0rcxjb87d6da6x52897a"; + iosevka-ss02 = "0nj50p4wbin3cjsyw1mviy4s4asy77z8kgmbwl43cqyh8693q61i"; + iosevka-ss03 = "0ksdy6dz5nh13j95vq6r0z56lgzw9rxk6w3c1g4h9qr8x0h81i9s"; + iosevka-ss04 = "0qyrycc0ly69hs8zva0mqlbpxqcx4kcpw05li96bbigjv481li5g"; + iosevka-ss05 = "01kyjl53afz6s21ca7csr1pmn2b80cr55raq9maacx7dkphs85pk"; + iosevka-ss06 = "0ay7qzh17l3fpsfj48kiadbvs02v8jh3g0xz6rr6948z08sw2qx2"; + iosevka-ss07 = "0wwn88y7k6gxwvg34wpfg95biip45viarm5h4dv06ygfl8sjva1a"; + iosevka-ss08 = "00y5l3zb1b3l6yh0m5v80jwhkdj1njnk165wnjbg1w5qgl0yr3ww"; + iosevka-ss09 = "1f42cwz34zqc8dkw1ahypj5f31fsxs9rx3zyqk58w7pn85sjq3n6"; + iosevka-ss10 = "0bvip0lvmh11x0l0pj94n1akn0y18srai0k737xdn5s1h86jg2nf"; + iosevka-ss11 = "0m4h9i7fmicxh3g57fprcgfhh4255vyc5sdkvd5iv225bwsfr4mr"; + iosevka-ss12 = "13qxfz3d2h1w8gicssadgfr5inr6i7mmyjni4wi2ij6p4y0dlg5f"; + iosevka-ss13 = "0q5xkxv040j1h1p11w6b0ngyzjkhhfzclxssrcyaxfkcnn7nkfqq"; + iosevka-ss14 = "0xkhcjzha9kkgymcq18n50jp1ikd0n8nisii40ihibiifcgrfp28"; + iosevka-ss15 = "17m7v4p62apnj7i86b6gm6yg1kyyawjly9qch1ii1wawj6aixyrp"; + iosevka-ss16 = "1amyc0f1mmwqz161m9jxgasgij6bzxazm6r4r1y1z800z6zd03hm"; + iosevka-ss17 = "0ia2p364avlad7v0z50zvzkaj33c2ys90dywy8i877nh2hzj61ky"; + iosevka-ss18 = "12rfjmfc8vkj6r91idlic2gpmr7gba2dg79s71jgiclkfr0fsb1m"; + sgr-iosevka = "1wqcx09aps43yavm5gm43xgq5xzrs0bs6abspqxzg7hpzfh0s5fn"; + sgr-iosevka-aile = "0335bfjc0ddia8y2sv6h5x4hdg1abwsdfy3cb59w25y46l7vlk3k"; + sgr-iosevka-curly = "1clspm5b30253d5qg23sklvgvvcnvrhb7hjxgyglg6abksw1r7xj"; + sgr-iosevka-curly-slab = "0m9km2bvjmd09nj4gqwnjxik4iq7qabcaa42r5kdkj2b214hz622"; + sgr-iosevka-etoile = "0yg0086d4dl5faadcvv20kbppi75msc8680v8w8g8db2w6b0ahfh"; + sgr-iosevka-fixed = "19msi71p9d2kvm2yr6gxg08wzhnhx3vxn7ivq89yxs4793mznbza"; + sgr-iosevka-fixed-curly = "0fxwlcpl8mxkk4gcs53fadfcc3fayyg3vpplvvhq6vj6rh4fsmjd"; + sgr-iosevka-fixed-curly-slab = "1kfvzan5h6b790ci9b8dsv3k89l181fj39x0yn2i4va10vhrif8j"; + sgr-iosevka-fixed-slab = "0h7rnmrabay0qvs2l40s2sn5hlx1q02n1wdl9zbjnc0mkhlyhpav"; + sgr-iosevka-fixed-ss01 = "0ssyd2x43bxv7b3giirsnxr6mp33l27iph8gcfnb7bqxb6iy8iar"; + sgr-iosevka-fixed-ss02 = "0vliidfhihkvhslhbd39kj4f909k9m3jl0dkjvlyxhwcabydcqwp"; + sgr-iosevka-fixed-ss03 = "1l2b2svij67m2dgv036a0sv66w84j64wgizv1m4zk1i70i529l4a"; + sgr-iosevka-fixed-ss04 = "0g32q7l5ppl15jvfdhl3hr1a3jm48bzsqsdw5zby1qi9v004bcq6"; + sgr-iosevka-fixed-ss05 = "0rf36r4yidjfid5rxvsg2pxmlzhk48vb307ilyqahdlffhncac9f"; + sgr-iosevka-fixed-ss06 = "170m8fsgy0spv311ddg11nzhpf030b0psxd7q654xylfcbldzwxa"; + sgr-iosevka-fixed-ss07 = "16vym343hp6m9ln4swlypws9sbwn4grj772yxckfdj1w91hk9a3a"; + sgr-iosevka-fixed-ss08 = "13xrjbxss2dahqnxalr5afky8056ysdrw9m2schnd9r885lfjdaw"; + sgr-iosevka-fixed-ss09 = "1v11x60fnrchghvj0m10dzi17b2i844588gkrn71bz5xjdvd2cf9"; + sgr-iosevka-fixed-ss10 = "1hi5wsf2fjs1j6iahlv9pyhfzswz1sly89wi2lw4ll5s42na31qb"; + sgr-iosevka-fixed-ss11 = "1mzz3rvg35k796rra19rb5zmffwhjfr6q8q5632cjygiqizd99k2"; + sgr-iosevka-fixed-ss12 = "11k9z0k0p0nf9c6yi5m19nnzf6pbq6zqjlcp9cz4snz91wg4py9b"; + sgr-iosevka-fixed-ss13 = "1mdwd5xb0c5ypjbr6bgd378kid01lqq2knmrbvlq7py145c8wnhq"; + sgr-iosevka-fixed-ss14 = "0qzr0iw1axpn1dv5zpkcnk5r7678093q7cas9kbf4nb69r59zg3w"; + sgr-iosevka-fixed-ss15 = "13aqp10x0zdah7337pl8wr0v0w61yj70pracxh9znwl5a62rq98l"; + sgr-iosevka-fixed-ss16 = "082zh32xghi7vavadgkx85lbqsmmzn9dv26ywvzkw9kf8v1kp931"; + sgr-iosevka-fixed-ss17 = "0biijj9iwpa8i5sg721r3a6i3mbmyz9hc7j35dqxjvzyxa1c8lqf"; + sgr-iosevka-fixed-ss18 = "07s5lq0cm00ja3l0wq01y5nky7jhjsizx71rz63p1ln7iakq84fl"; + sgr-iosevka-slab = "1sqw8v56qgs5hvnm48psdv27gs83mn37hiqzskgqbyx1njkncrw1"; + sgr-iosevka-ss01 = "094bx7vkqjx4wpc0wqylviwy0k00w4wshngw6nk4mgsxbirxlvnm"; + sgr-iosevka-ss02 = "1m7ny32qx7s42lvnq6xw45ij7l270wj1nk2dkjdpfsagfyg869kv"; + sgr-iosevka-ss03 = "1z947mrpr9lz7wk3357y81yb8adqi8hn32bqm14bp330n658a5jj"; + sgr-iosevka-ss04 = "0jn0g2hy7l98sw3z1wvr263fqca6a4cmljsfam6qm48z3izcya2n"; + sgr-iosevka-ss05 = "0k5s1q84ssy95k4szd614y9f8cibhj7an9lalb5h4ds4mbmhsc4y"; + sgr-iosevka-ss06 = "170jz7fppj4zc1ik033jbkp71grkm2fyfybvy48zdbdzan050b87"; + sgr-iosevka-ss07 = "1s8y27fv0klijsz9wac7nyxcj8mqcj3a09qmifaqvx80zl50yjwy"; + sgr-iosevka-ss08 = "0002i1411s82qm75hmdshry4k5fs1bsj4s8ardy8llpfs3z9w501"; + sgr-iosevka-ss09 = "16l3099djsxb42j51yr21xjamws731f87c2dgrkxhf2hy8rr2pv4"; + sgr-iosevka-ss10 = "1r67zpqai0c4cjpfslapdp411c62vlbjsf2qdwws5fk0s6sk4wra"; + sgr-iosevka-ss11 = "0y2qbrgsfcssqwq8ljqhz7wzpyg5z7ji5a35w9dp7wfaz4fmiifh"; + sgr-iosevka-ss12 = "1zy4972m7wdawjx4rlwkf78fg6l53gyqc368dk8c0ng5sz5s5jc9"; + sgr-iosevka-ss13 = "0yrg0pdandgqcz3dqjm5y8kaapryxynrj9v2br542vh6vp0w13zn"; + sgr-iosevka-ss14 = "1c0bh3qach06wiprpi3mglnkzmmb6asah9d1s9g2vpx825vvwf6f"; + sgr-iosevka-ss15 = "0qqqjh1rlz3al9qs09iqzgmsjww1cnp4vy700b2hmdhl46rjjipy"; + sgr-iosevka-ss16 = "030x1234vhnryvy4hlw5b42blx2yrm0kikr07clmp8fqvdba1wy1"; + sgr-iosevka-ss17 = "0k1sjpphgajdxk1l41fhfl93mj58ijhyba40m4h261p58ygbnszv"; + sgr-iosevka-ss18 = "1sf5zcp3js6hsm47mr4kbx7q4x1kk999080jfx118yfvgj5whmq1"; + sgr-iosevka-term = "0vxgcp3mi1brbcz6xvf6y3kbfd11x35blkf2aa82f47yqh26n96w"; + sgr-iosevka-term-curly = "0fgvsq28g63xbcxbcfrkbina5cvvj6c677mgadhbvyjml4lm57pz"; + sgr-iosevka-term-curly-slab = "0sqi5iz4pz7l5jqxw0a150j3nffzivlpzsaglzfrq50xcqqk3an1"; + sgr-iosevka-term-slab = "1yihqfandm61rfkiifw7mxi10b59cvf41k4mgviw9ylrg7ca47km"; + sgr-iosevka-term-ss01 = "10phwnsc4my2gr38974mf1qy4fwp9bqd06bwqcafxvp776s0ya1x"; + sgr-iosevka-term-ss02 = "0zvi1114hw4xp68cgyp8n4i7lfm547l9awz1ffkvj07l5zshhjpf"; + sgr-iosevka-term-ss03 = "1g1l9dq0fgywfxzdlwc0h8a8x8178m7x74rms6vwsgjgjfz83cca"; + sgr-iosevka-term-ss04 = "13gcv4nn06jwafm74km0j48lmfjyi5x0hcgf1wrbhrabd06vrbc5"; + sgr-iosevka-term-ss05 = "13i912b8s42gjcxrhiqp26779zfpy38rr8pf2gyb5njv4pvxxk6m"; + sgr-iosevka-term-ss06 = "1k631gf37maz6zi1cf46nr93x7lvdmdl43ri4c9mbx1q5f36ys8w"; + sgr-iosevka-term-ss07 = "0zr85cmrg4my5f255wbg27rhlkflsbp2jksrhgm4f6a2fn2qn0fy"; + sgr-iosevka-term-ss08 = "1y9ly507xqp6h3bldfw1fji1gxszpj3jxv1by4b3r1as63vdhqkj"; + sgr-iosevka-term-ss09 = "198myb085pp427lwf7ih2kddh52jpn1930p6a8q1n6fig1vbk76x"; + sgr-iosevka-term-ss10 = "1csdkbfffjpcqhhf9n7c3gxar2403x2zwqg7nlsnih1hgpvhvxx8"; + sgr-iosevka-term-ss11 = "0yid9w70jqvy4a6mglfi3n12g0k0ad52zdx0szgjsrbw98mfrqdr"; + sgr-iosevka-term-ss12 = "08ad3mwp3rfd3mikah9nhcn4d3is5gqqfza3vz3ddnj48fdqd4sm"; + sgr-iosevka-term-ss13 = "0myic6pzhdbmcp8fdhc5idsspsrrrxvb7m7ycc8vigqd1inmz091"; + sgr-iosevka-term-ss14 = "1yw6zv4hfksmkdh0403l6dmc54hd04qfzafhvhc5r53kd4ja1k93"; + sgr-iosevka-term-ss15 = "1y9gclnvidhadcr842ah3s16wrv0mbil7z5varri9hambaryz3z5"; + sgr-iosevka-term-ss16 = "0qn3k93scc6hsxayfzagdgxqiv40vgz0ac0fa93zdyp5krb46rff"; + sgr-iosevka-term-ss17 = "1l7jfb3x83kxlhj4zi8w1adxzf6k66zdzp93zif0mhvk9718ckws"; + sgr-iosevka-term-ss18 = "19ip13fmkrismwm1ymhwfsv9a4w57460dkjmngpk2kp1av5nqc0m"; } From 17acaf170887f9c7aa76d01e74b92de5123a01fd Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 8 May 2022 05:24:16 +0000 Subject: [PATCH 085/147] kube-hunter: 0.6.5 -> 0.6.7 --- pkgs/tools/security/kube-hunter/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/tools/security/kube-hunter/default.nix b/pkgs/tools/security/kube-hunter/default.nix index cbd4e4e3150..0f82cc0cbab 100644 --- a/pkgs/tools/security/kube-hunter/default.nix +++ b/pkgs/tools/security/kube-hunter/default.nix @@ -5,13 +5,13 @@ python3.pkgs.buildPythonApplication rec { pname = "kube-hunter"; - version = "0.6.5"; + version = "0.6.7"; src = fetchFromGitHub { owner = "aquasecurity"; repo = pname; - rev = "v${version}"; - sha256 = "sha256-2pmViizQLwyTdP6J92ynvdIdqkfgc6SIhsll85g9pHA="; + rev = "refs/tags/v${version}"; + sha256 = "sha256-W7jW0V91o164EIAzZ7ODWeqTmUaUFDIqlE37x/AycqY="; }; nativeBuildInputs = with python3.pkgs; [ From 5b50f0de1d5e01c11bf612ed1ca468a645fc161b Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sun, 8 May 2022 08:05:15 +0100 Subject: [PATCH 086/147] xnee: pull fix pending upstream inclusion for -fno-common toolchain support Without the change build fails as: $ nix build -L --impure --expr 'with import ./. {}; xnee.overrideAttrs (oa: { NIX_CFLAGS_COMPILE = (oa.NIX_CFLAGS_COMPILE or "") + "-fno-common"; })' ... ld: .libs/xnee_xinput.o:/build/xnee-3.19/libxnee/src/../include/libxnee/xnee_internal.h:117: multiple definition of `xnee_mode'; --- pkgs/tools/X11/xnee/default.nix | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/X11/xnee/default.nix b/pkgs/tools/X11/xnee/default.nix index 00ebb1ecec2..d2236dfe354 100644 --- a/pkgs/tools/X11/xnee/default.nix +++ b/pkgs/tools/X11/xnee/default.nix @@ -1,4 +1,4 @@ -{ fetchurl, lib, stdenv, libX11, xorgproto, libXext, libXtst +{ fetchurl, fetchpatch, lib, stdenv, libX11, xorgproto, libXext, libXtst , gtk2, libXi, pkg-config, texinfo }: stdenv.mkDerivation rec { @@ -10,7 +10,17 @@ stdenv.mkDerivation rec { sha256 = "04n2lac0vgpv8zsn7nmb50hf3qb56pmj90dmwnivg09gyrf1x92j"; }; - patchPhase = + patches = [ + # Pull fix pending upstream inclusion for -fno-common + # toolchain support: https://savannah.gnu.org/bugs/?58810 + (fetchpatch { + name = "fno-common.patch"; + url = "https://savannah.gnu.org/bugs/download.php?file_id=49534"; + sha256 = "04j2cjy2yaiigg31a6k01vw0fq19yj3zpriikkjcz9q4ab4m5gh2"; + }) + ]; + + postPatch = '' for i in `find cnee/test -name \*.sh` do sed -i "$i" -e's|/bin/bash|${stdenv.shell}|g ; s|/usr/bin/env bash|${stdenv.shell}|g' From 11a0360f81537e72d7feeb23be213b9cf6c1f154 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 8 May 2022 07:13:17 +0000 Subject: [PATCH 087/147] python310Packages.types-dateutil: 2.8.14 -> 2.8.15 --- pkgs/development/python-modules/types-dateutil/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/types-dateutil/default.nix b/pkgs/development/python-modules/types-dateutil/default.nix index 8e52c5b6e01..e8cf1edbde5 100644 --- a/pkgs/development/python-modules/types-dateutil/default.nix +++ b/pkgs/development/python-modules/types-dateutil/default.nix @@ -5,12 +5,12 @@ buildPythonPackage rec { pname = "types-python-dateutil"; - version = "2.8.14"; + version = "2.8.15"; format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "sha256-Nnwf+hpSpLKlNMmzC0CwHyt/LqR6l/2CH2x20ceuMSk="; + sha256 = "sha256-fbHk7UkWvRKMvuPuze4OBsxWhNoqHN/Vf5hUHN++CGE="; }; pythonImportsCheck = [ "dateutil-stubs" ]; From 0a623980428250b5a51bc2c0b606de733281ccba Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 8 May 2022 09:22:01 +0200 Subject: [PATCH 088/147] python310Packages.py-canary: add format --- pkgs/development/python-modules/py-canary/default.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/py-canary/default.nix b/pkgs/development/python-modules/py-canary/default.nix index 695b00a1a11..6685d245833 100644 --- a/pkgs/development/python-modules/py-canary/default.nix +++ b/pkgs/development/python-modules/py-canary/default.nix @@ -11,13 +11,15 @@ buildPythonPackage rec { pname = "py-canary"; version = "0.5.2"; + format = "setuptools"; + disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "snjoetw"; repo = pname; rev = "refs/tags/${version}"; - sha256 = "sha256-PE31J82Uc6mErnh7nQ1pkIjnMbuCnlYEX2R0azknMHQ="; + hash = "sha256-PE31J82Uc6mErnh7nQ1pkIjnMbuCnlYEX2R0azknMHQ="; }; propagatedBuildInputs = [ @@ -30,7 +32,9 @@ buildPythonPackage rec { requests-mock ]; - pythonImportsCheck = [ "canary" ]; + pythonImportsCheck = [ + "canary" + ]; meta = with lib; { description = "Python package for Canary Security Camera"; From 0f5f6f617a0bd880279b2178a5b85c2e07ebc4df Mon Sep 17 00:00:00 2001 From: Alex Eyre Date: Sun, 8 May 2022 08:51:56 +0100 Subject: [PATCH 089/147] maintainers: rename @alex-eyre to @alexeyre --- maintainers/maintainer-list.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index ea6c701ca8c..35616b4d212 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -530,9 +530,9 @@ githubId = 782180; name = "Alex Vorobiev"; }; - alex-eyre = { + alexeyre = { email = "A.Eyre@sms.ed.ac.uk"; - github = "alex-eyre"; + github = "alexeyre"; githubId = 38869148; name = "Alex Eyre"; }; From f18b66dd983f88e552fcd2b069284fe4cd0217b2 Mon Sep 17 00:00:00 2001 From: Alex Eyre Date: Sun, 8 May 2022 08:55:27 +0100 Subject: [PATCH 090/147] nimbo: change maintainer @alex-eyre to @alexeyre --- pkgs/applications/misc/nimbo/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/misc/nimbo/default.nix b/pkgs/applications/misc/nimbo/default.nix index 8af9d1471a0..5ad86eeccd4 100644 --- a/pkgs/applications/misc/nimbo/default.nix +++ b/pkgs/applications/misc/nimbo/default.nix @@ -52,6 +52,6 @@ python3.pkgs.buildPythonApplication rec { description = "Run machine learning jobs on AWS with a single command"; homepage = "https://github.com/nimbo-sh/nimbo"; license = licenses.bsl11; - maintainers = with maintainers; [ alex-eyre noreferences ]; + maintainers = with maintainers; [ alexeyre noreferences ]; }; } From 08085640ee1094bb5fa18b0e962ae64c8f6cc1d8 Mon Sep 17 00:00:00 2001 From: Alex Eyre Date: Sun, 8 May 2022 08:56:30 +0100 Subject: [PATCH 091/147] scli: change maintainer @alex-eyre to @alexeyre --- pkgs/applications/misc/scli/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/misc/scli/default.nix b/pkgs/applications/misc/scli/default.nix index 6a32b395be9..9729301f6e7 100644 --- a/pkgs/applications/misc/scli/default.nix +++ b/pkgs/applications/misc/scli/default.nix @@ -47,6 +47,6 @@ python3.pkgs.buildPythonApplication rec { description = "Simple terminal user interface for Signal"; homepage = "https://github.com/isamert/scli"; license = licenses.gpl3Only; - maintainers = with maintainers; [ alex-eyre ]; + maintainers = with maintainers; [ alexeyre ]; }; } From 428045f39b3ad96ce0e9276dbebab317200c3ada Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sun, 8 May 2022 08:56:43 +0100 Subject: [PATCH 092/147] bwa: pull upstream fix for -fno-common tollchains Without the change build fails on -fno-common toolchains like upstream gcc-10 as: $ nix build -L --impure --expr 'with import ./. {}; bwa.overrideAttrs (oa: { NIX_CFLAGS_COMPILE = (oa.NIX_CFLAGS_COMPILE or "") + "-fno-common"; })' ... ld: ./libbwa.a(rope.o):/build/bwa-0.7.17/rle.h:33: multiple definition of `rle_auxtab'; ./libbwa.a(bwtindex.o):/build/bwa-0.7.17/rle.h:33: first defined here ld: ./libbwa.a(rle.o):/build/bwa-0.7.17/rle.h:33: multiple definition of `rle_auxtab'; ./libbwa.a(bwtindex.o):/build/bwa-0.7.17/rle.h:33: first defined here --- pkgs/applications/science/biology/bwa/default.nix | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/science/biology/bwa/default.nix b/pkgs/applications/science/biology/bwa/default.nix index d4727b41bd0..801ad00876b 100644 --- a/pkgs/applications/science/biology/bwa/default.nix +++ b/pkgs/applications/science/biology/bwa/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchurl, zlib }: +{ lib, stdenv, fetchurl, fetchpatch, zlib }: stdenv.mkDerivation rec { pname = "bwa"; @@ -9,6 +9,16 @@ stdenv.mkDerivation rec { sha256 = "1zfhv2zg9v1icdlq4p9ssc8k01mca5d1bd87w71py2swfi74s6yy"; }; + patches = [ + # Pull upstream patch for -fno-common toolchain support like upstream + # gcc-10: https://github.com/lh3/bwa/pull/267 + (fetchpatch { + name = "fno-common.patch"; + url = "https://github.com/lh3/bwa/commit/2a1ae7b6f34a96ea25be007ac9d91e57e9d32284.patch"; + sha256 = "1lihfxai6vcshv5vr3m7yhk833bdivkja3gld6ilwrc4z28f6wqy"; + }) + ]; + buildInputs = [ zlib ]; # Avoid hardcoding gcc to allow environments with a different From e994576b0d2824b3f8dc4442b031bccd8faadc1f Mon Sep 17 00:00:00 2001 From: K900 Date: Sun, 8 May 2022 11:07:36 +0300 Subject: [PATCH 093/147] installation-cd-base: fix eval --- nixos/modules/installer/cd-dvd/installation-cd-base.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/installer/cd-dvd/installation-cd-base.nix b/nixos/modules/installer/cd-dvd/installation-cd-base.nix index 618057618d0..3f92b779d60 100644 --- a/nixos/modules/installer/cd-dvd/installation-cd-base.nix +++ b/nixos/modules/installer/cd-dvd/installation-cd-base.nix @@ -46,5 +46,5 @@ with lib; done ''; - system.stateVersion = mkDefault "18.03"; + system.stateVersion = lib.mkDefault lib.trivial.release; } From 2ddfd7e81bf47cc31257b58dbc0525e0cc50e2a6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 3 May 2022 00:31:14 +0000 Subject: [PATCH 094/147] nixos/borgmatic: use pkgs.formats.yaml --- nixos/modules/services/backup/borgmatic.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/backup/borgmatic.nix b/nixos/modules/services/backup/borgmatic.nix index 5e5c0bbeccc..9414d78aa75 100644 --- a/nixos/modules/services/backup/borgmatic.nix +++ b/nixos/modules/services/backup/borgmatic.nix @@ -4,7 +4,8 @@ with lib; let cfg = config.services.borgmatic; - cfgfile = pkgs.writeText "config.yaml" (builtins.toJSON cfg.settings); + settingsFormat = pkgs.formats.yaml { }; + cfgfile = settingsFormat.generate "config.yaml" cfg.settings; in { options.services.borgmatic = { enable = mkEnableOption "borgmatic"; @@ -14,7 +15,7 @@ in { See https://torsion.org/borgmatic/docs/reference/configuration/ ''; type = types.submodule { - freeformType = with lib.types; attrsOf anything; + freeformType = settingsFormat.type; options.location = { source_directories = mkOption { type = types.listOf types.str; From a6d36a550dd6d117ad7c18e45e46c6865c9f5aa1 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 8 May 2022 08:08:57 +0000 Subject: [PATCH 095/147] python310Packages.fakeredis: 1.7.1 -> 1.7.4 --- pkgs/development/python-modules/fakeredis/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/fakeredis/default.nix b/pkgs/development/python-modules/fakeredis/default.nix index 5d45c4dc5ce..f5a28fa3839 100644 --- a/pkgs/development/python-modules/fakeredis/default.nix +++ b/pkgs/development/python-modules/fakeredis/default.nix @@ -16,14 +16,14 @@ buildPythonPackage rec { pname = "fakeredis"; - version = "1.7.1"; + version = "1.7.4"; format = "pyproject"; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-fCxLobQuCnUzfFS3d78GcQVrRWllDj/5J+S5s4WvyOw="; + hash = "sha256-aWl//usJk5BzYF7qyX9SS8yrrgQmV1eldcf8kjCHqmU="; }; postPatch = '' From 6220a45fdb50dd733212a1a79a62eab1580b1324 Mon Sep 17 00:00:00 2001 From: Joel Date: Sun, 8 May 2022 15:11:56 +1000 Subject: [PATCH 096/147] python3Packages.mcstatus: 9.0.4 -> 9.1.0 https://github.com/py-mine/mcstatus/releases/tag/v9.1.0 --- pkgs/development/python-modules/mcstatus/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/mcstatus/default.nix b/pkgs/development/python-modules/mcstatus/default.nix index f2745bf3f6f..9adbbf5e5d3 100644 --- a/pkgs/development/python-modules/mcstatus/default.nix +++ b/pkgs/development/python-modules/mcstatus/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { pname = "mcstatus"; - version = "9.0.4"; + version = "9.1.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -22,7 +22,7 @@ buildPythonPackage rec { owner = "py-mine"; repo = pname; rev = "v${version}"; - hash = "sha256-h5pPtzs04TDqOkDFBpcn6faFN4sz/nEMsjjiH7mTEH0="; + hash = "sha256-qKQs0uGPMUtueOryVzFk37Th+N9vmApr/IzJ6jZI2Ic="; }; nativeBuildInputs = [ From 8c8607d7a39b1ce79f01b9b9d87d99e9d03989ff Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 8 May 2022 10:19:30 +0200 Subject: [PATCH 097/147] python3Packages.total-connect-client: 2022.3 -> 2022.5 --- .../python-modules/total-connect-client/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/total-connect-client/default.nix b/pkgs/development/python-modules/total-connect-client/default.nix index 24d2093a59d..2f093200bf3 100644 --- a/pkgs/development/python-modules/total-connect-client/default.nix +++ b/pkgs/development/python-modules/total-connect-client/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "total-connect-client"; - version = "2022.3"; + version = "2022.5"; format = "setuptools"; disabled = pythonOlder "3.7"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "craigjmidwinter"; repo = "total-connect-client"; rev = version; - hash = "sha256-KfJFU85yQmBZn4f0ljnaiy/DjHMOuNi+Q7nb8yCpKVk="; + hash = "sha256-S+xki1Bj+wvKhbl2vRRa8gULyxTsH4fyypkrHj3JwH0="; }; propagatedBuildInputs = [ From 83cfaa762b1881ba4b190f799af9d3f2c4e81641 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sun, 8 May 2022 09:39:51 +0100 Subject: [PATCH 098/147] ncrack: pull upstream fix for fno-common toolchains Without the change build on -fno-common toolchains like upstream gcc-10 fails as: $ nix build -L --impure --expr 'with import ./. {}; ncrack.overrideAttrs (oa: { NIX_CFLAGS_COMPILE = (oa.NIX_CFLAGS_COMPILE or "") + "-fno-common"; })' ... ld: opensshlib/libopenssh.a(umac128.o):/build/source/opensshlib/umac.c:1184: multiple definition of `umac_ctx'; opensshlib/libopenssh.a(umac.o):/build/source/opensshlib/umac.c:1184: first defined here --- pkgs/tools/security/ncrack/default.nix | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/pkgs/tools/security/ncrack/default.nix b/pkgs/tools/security/ncrack/default.nix index e1504eb12b4..9e9aeaa409d 100644 --- a/pkgs/tools/security/ncrack/default.nix +++ b/pkgs/tools/security/ncrack/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, openssl, zlib }: +{ lib, stdenv, fetchFromGitHub, fetchpatch, openssl, zlib }: stdenv.mkDerivation rec { pname = "ncrack"; @@ -11,6 +11,16 @@ stdenv.mkDerivation rec { sha256 = "1gnv5xdd7n04glcpy7q1mkb6f8gdhdrhlrh8z6k4g2pjdhxlz26g"; }; + patches = [ + # Pull upstream fix for -fno-common toolchains like upstream gcc-10: + # https://github.com/nmap/ncrack/pull/83 + (fetchpatch { + name = "fno-common.patch"; + url = "https://github.com/nmap/ncrack/commit/cc4103267bab6017a4da9d41156d0c1075012eba.patch"; + sha256 = "06nlfvc7p108f8ppbcgwmj4iwmjy95xhc1sawa8c78lrx22r7gy3"; + }) + ]; + buildInputs = [ openssl zlib ]; meta = with lib; { From b9eea8930c533842f041a8af6389bff57a59615b Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 8 May 2022 11:09:42 +0200 Subject: [PATCH 099/147] metasploit: 6.1.40 -> 6.1.41 --- pkgs/tools/security/metasploit/Gemfile | 2 +- pkgs/tools/security/metasploit/Gemfile.lock | 22 ++++++------- pkgs/tools/security/metasploit/default.nix | 4 +-- pkgs/tools/security/metasploit/gemset.nix | 34 ++++++++++----------- 4 files changed, 31 insertions(+), 31 deletions(-) diff --git a/pkgs/tools/security/metasploit/Gemfile b/pkgs/tools/security/metasploit/Gemfile index 83534ca07c6..5624608734c 100644 --- a/pkgs/tools/security/metasploit/Gemfile +++ b/pkgs/tools/security/metasploit/Gemfile @@ -1,4 +1,4 @@ # frozen_string_literal: true source "https://rubygems.org" -gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.1.40" +gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.1.41" diff --git a/pkgs/tools/security/metasploit/Gemfile.lock b/pkgs/tools/security/metasploit/Gemfile.lock index 779d1f9c997..66826c4e1f7 100644 --- a/pkgs/tools/security/metasploit/Gemfile.lock +++ b/pkgs/tools/security/metasploit/Gemfile.lock @@ -1,9 +1,9 @@ GIT remote: https://github.com/rapid7/metasploit-framework - revision: 82d111481b8f46bf50473770673305b0ec0eb5d2 - ref: refs/tags/6.1.40 + revision: 4ecb04311be0dd55fbf66e6d05fa8b37135c5573 + ref: refs/tags/6.1.41 specs: - metasploit-framework (6.1.40) + metasploit-framework (6.1.41) actionpack (~> 6.0) activerecord (~> 6.0) activesupport (~> 6.0) @@ -31,7 +31,7 @@ GIT metasploit-concern metasploit-credential metasploit-model - metasploit-payloads (= 2.0.83) + metasploit-payloads (= 2.0.87) metasploit_data_models metasploit_payloads-mettle (= 1.0.18) mqtt @@ -129,13 +129,13 @@ GEM arel-helpers (2.14.0) activerecord (>= 3.1.0, < 8) aws-eventstream (1.2.0) - aws-partitions (1.581.0) + aws-partitions (1.586.0) aws-sdk-core (3.130.2) aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.525.0) aws-sigv4 (~> 1.1) jmespath (~> 1.0) - aws-sdk-ec2 (1.309.0) + aws-sdk-ec2 (1.312.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) aws-sdk-iam (1.68.0) @@ -144,7 +144,7 @@ GEM aws-sdk-kms (1.56.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) - aws-sdk-s3 (1.113.2) + aws-sdk-s3 (1.114.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sdk-kms (~> 1) aws-sigv4 (~> 1.4) @@ -254,7 +254,7 @@ GEM activemodel (~> 6.0) activesupport (~> 6.0) railties (~> 6.0) - metasploit-payloads (2.0.83) + metasploit-payloads (2.0.87) metasploit_data_models (5.0.5) activerecord (~> 6.0) activesupport (~> 6.0) @@ -287,7 +287,7 @@ GEM network_interface (0.0.2) nexpose (7.3.0) nio4r (2.5.8) - nokogiri (1.13.4) + nokogiri (1.13.5) mini_portile2 (~> 2.8.0) racc (~> 1.4) nori (2.6.0) @@ -373,7 +373,7 @@ GEM metasm rex-core rex-text - rex-socket (0.1.35) + rex-socket (0.1.38) rex-core rex-sslscan (0.1.7) rex-core @@ -388,7 +388,7 @@ GEM ruby-macho (3.0.0) ruby-rc4 (0.1.5) ruby2_keywords (0.0.5) - ruby_smb (3.1.1) + ruby_smb (3.1.2) bindata openssl-ccm openssl-cmac diff --git a/pkgs/tools/security/metasploit/default.nix b/pkgs/tools/security/metasploit/default.nix index 7fc91f012db..30c9997f416 100644 --- a/pkgs/tools/security/metasploit/default.nix +++ b/pkgs/tools/security/metasploit/default.nix @@ -15,13 +15,13 @@ let }; in stdenv.mkDerivation rec { pname = "metasploit-framework"; - version = "6.1.40"; + version = "6.1.41"; src = fetchFromGitHub { owner = "rapid7"; repo = "metasploit-framework"; rev = version; - sha256 = "sha256-3aQwzFaEANgc2inlZd2huu9W3vpv9bgIeRib4Q2zI3I="; + sha256 = "sha256-lm7YCvlwdialifh1IZrP+T8iB9g6BxUr2OEMd2ebyTg="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/security/metasploit/gemset.nix b/pkgs/tools/security/metasploit/gemset.nix index 383456bcf37..ace1051bd69 100644 --- a/pkgs/tools/security/metasploit/gemset.nix +++ b/pkgs/tools/security/metasploit/gemset.nix @@ -104,10 +104,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0qn84zn8g8aaqq9cmc2mkaakpgysl50mnhalzphxxvamg9pah5hq"; + sha256 = "1sgkw3hnpcq3m5drc8zyv2sj3lkm3v8658nxjy53j0gdpzkxg3as"; type = "gem"; }; - version = "1.581.0"; + version = "1.586.0"; }; aws-sdk-core = { groups = ["default"]; @@ -124,10 +124,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "05fw7sxwn5k9a944j0010kn6dl93fv10q1f8kmvdkb4i231xbxwl"; + sha256 = "13jgjfhi3wpvb9j852pwbm3qng3zb31bdjbfbfyz5nwqip90pc1m"; type = "gem"; }; - version = "1.309.0"; + version = "1.312.0"; }; aws-sdk-iam = { groups = ["default"]; @@ -154,10 +154,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "17pc197a6axmnj6rbhgsvks2w0mv2mmr2bwh1k4mazbfp72ss87i"; + sha256 = "1r6dxz3llgxbbm66jq5mkzk0i6qsxwv0d9s0ipwb23vv3bgp23yf"; type = "gem"; }; - version = "1.113.2"; + version = "1.114.0"; }; aws-sigv4 = { groups = ["default"]; @@ -694,12 +694,12 @@ platforms = []; source = { fetchSubmodules = false; - rev = "82d111481b8f46bf50473770673305b0ec0eb5d2"; - sha256 = "0wi3nc6y36qqg44bixbgzbg5dvxsl7fnbr99v8fdh044av63196x"; + rev = "4ecb04311be0dd55fbf66e6d05fa8b37135c5573"; + sha256 = "0f69kdkpf371v0mia1rsv03j4gzrryd22xgqi6jjcxkhz45dhvln"; type = "git"; url = "https://github.com/rapid7/metasploit-framework"; }; - version = "6.1.40"; + version = "6.1.41"; }; metasploit-model = { groups = ["default"]; @@ -716,10 +716,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "15vlazx39flz2pci2yqjcgd4ljslhivbq1vvyajgsxl15q772ni0"; + sha256 = "0dj3vxv17wfjgv24n5wwij2vlbk83s8d69rpxzmkbjpi6qscw17x"; type = "gem"; }; - version = "2.0.83"; + version = "2.0.87"; }; metasploit_data_models = { groups = ["default"]; @@ -907,10 +907,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1g43ii497cwdqhfnaxfl500bq5yfc5hfv5df1lvf6wcjnd708ihd"; + sha256 = "0y0yfi1y9ywdih7c0lskfwr4y36c4yq5gc7mwlyim4j6dpn70mg1"; type = "gem"; }; - version = "1.13.4"; + version = "1.13.5"; }; nori = { groups = ["default"]; @@ -1287,10 +1287,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1lisy36pcyhqvhxkl55pgcyw67n9birzsyrgkm0b7sbkn4jpv0d0"; + sha256 = "0mn4zgp7jhkn352435xsi5rz3d532d34zw3jxjdg4q9wpymsw6nr"; type = "gem"; }; - version = "0.1.35"; + version = "0.1.38"; }; rex-sslscan = { groups = ["default"]; @@ -1387,10 +1387,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1v0dvys954c1d5azzz05p1jg57knk3d10b61wwfx00dw8pz76amw"; + sha256 = "1c0qdi787hvf3d8p3ivjlfwnj2cz70cgj656x26wnn0rhrgbad1n"; type = "gem"; }; - version = "3.1.1"; + version = "3.1.2"; }; rubyntlm = { groups = ["default"]; From 387d083590c959d02f5a606937d5ffc9088e24d8 Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sun, 8 May 2022 09:29:54 +0100 Subject: [PATCH 100/147] rox-filer: pull upstream fix for -fno-common toolchains Without the change build agaist -fno-common toolchains like upstream gcc-10 fails as: $ nix build -L --impure --expr 'with import ./. {}; rox-filer.overrideAttrs (oa: { NIX_CFLAGS_COMPILE = (oa.NIX_CFLAGS_COMPILE or "") + "-fno-common"; })' ... ld: session.o:/build/rox-filer-2.11/ROX-Filer/build/../src/session.h:13: multiple definition of `session_auto_respawn'; main.o:/build/rox-filer-2.11/ROX-Filer/build/../src/session.h:13: first defined here While at it normalized local patch against top-level source tree to ease application of upstream patches as is. --- pkgs/desktops/rox/rox-filer/default.nix | 12 ++++++++++-- .../rox-filer/rox-filer-2.11-in-source-build.patch | 4 ++-- 2 files changed, 12 insertions(+), 4 deletions(-) diff --git a/pkgs/desktops/rox/rox-filer/default.nix b/pkgs/desktops/rox/rox-filer/default.nix index 032209c2f18..e26c9059225 100644 --- a/pkgs/desktops/rox/rox-filer/default.nix +++ b/pkgs/desktops/rox/rox-filer/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchurl +, fetchpatch , pkg-config , wrapGAppsHook , libxml2 @@ -27,13 +28,20 @@ stdenv.mkDerivation rec { patches = [ ./rox-filer-2.11-in-source-build.patch + # Pull upstream fix for -fno-common toolchains like upstream gcc-10: + # https://github.com/rox-desktop/rox-filer/pull/15 + (fetchpatch { + name = "fno-common.patch"; + url = "https://github.com/rox-desktop/rox-filer/commit/86b0bb9144186d51ea9b898905111bd8b143b552.patch"; + sha256 = "1csyx229i09p00lbdlkdqdhn3x2lb5zby1h9rkjgzlr2qz74gc69"; + }) ]; # go to the source directory after unpacking the sources setSourceRoot = "export sourceRoot=rox-filer-${version}/ROX-Filer/"; - # patch source with defined patches - patchFlags = [ "-p0" ]; + # account for 'setSourceRoot' offset + patchFlags = [ "-p2" ]; # patch the main.c to disable the lookup of the APP_DIR environment variable, # which is used to lookup the location for certain images when rox-filer diff --git a/pkgs/desktops/rox/rox-filer/rox-filer-2.11-in-source-build.patch b/pkgs/desktops/rox/rox-filer/rox-filer-2.11-in-source-build.patch index 11bd8004459..c68bba7ec6c 100644 --- a/pkgs/desktops/rox/rox-filer/rox-filer-2.11-in-source-build.patch +++ b/pkgs/desktops/rox/rox-filer/rox-filer-2.11-in-source-build.patch @@ -1,5 +1,5 @@ ---- src/configure 2011-10-09 16:32:14.000000000 +0200 -+++ src/configure2 2016-03-20 09:26:31.640891863 +0100 +--- a/Rox-Filer/src/configure 2011-10-09 16:32:14.000000000 +0200 ++++ b/Rox-Filer/src/configure 2016-03-20 09:26:31.640891863 +0100 @@ -2132,13 +2132,6 @@ From 9b4f18aeee4ef233d3b1da78f8000f8c227bb524 Mon Sep 17 00:00:00 2001 From: Jonas Heinrich Date: Mon, 25 Apr 2022 15:15:56 +0200 Subject: [PATCH 101/147] libsForQt5.mauikit-accounts: init at 2.1.1 --- .../libraries/mauikit-accounts/default.nix | 40 +++++++++++++++++++ pkgs/top-level/qt5-packages.nix | 2 + 2 files changed, 42 insertions(+) create mode 100644 pkgs/development/libraries/mauikit-accounts/default.nix diff --git a/pkgs/development/libraries/mauikit-accounts/default.nix b/pkgs/development/libraries/mauikit-accounts/default.nix new file mode 100644 index 00000000000..a102bd7f36a --- /dev/null +++ b/pkgs/development/libraries/mauikit-accounts/default.nix @@ -0,0 +1,40 @@ +{ lib +, mkDerivation +, fetchFromGitLab +, cmake +, extra-cmake-modules +, kconfig +, kio +, mauikit +}: + +mkDerivation rec { + pname = "mauikit-accounts"; + version = "2.1.1"; + + src = fetchFromGitLab { + domain = "invent.kde.org"; + owner = "maui"; + repo = "mauikit-accounts"; + rev = "v${version}"; + sha256 = "sha256-B0VmgE0L8kBOqR/lrWCHO3psCQ7GZVPIGljGAwpuymE="; + }; + + nativeBuildInputs = [ + cmake + extra-cmake-modules + ]; + + buildInputs = [ + kconfig + kio + mauikit + ]; + + meta = with lib; { + homepage = "https://invent.kde.org/maui/mauikit-accounts"; + description = "MauiKit utilities to handle User Accounts"; + license = licenses.lgpl2Plus; + maintainers = with maintainers; [ onny ]; + }; +} diff --git a/pkgs/top-level/qt5-packages.nix b/pkgs/top-level/qt5-packages.nix index 0b1324b8672..5d9604c0f13 100644 --- a/pkgs/top-level/qt5-packages.nix +++ b/pkgs/top-level/qt5-packages.nix @@ -146,6 +146,8 @@ in (kdeFrameworks // plasmaMobileGear // plasma5 // plasma5.thirdParty // kdeGea mauikit = callPackage ../development/libraries/mauikit { }; + mauikit-accounts = callPackage ../development/libraries/mauikit-accounts { }; + mauikit-filebrowsing = callPackage ../development/libraries/mauikit-filebrowsing { }; mlt = callPackage ../development/libraries/mlt/qt-5.nix { }; From 80a74ba322bd3a0f2402837a769b8192c59754f4 Mon Sep 17 00:00:00 2001 From: Jonas Heinrich Date: Mon, 25 Apr 2022 15:18:43 +0200 Subject: [PATCH 102/147] libsForQt5.mauikit-texteditor: init at 2.1.1 --- .../libraries/mauikit-texteditor/default.nix | 42 +++++++++++++++++++ pkgs/top-level/qt5-packages.nix | 2 + 2 files changed, 44 insertions(+) create mode 100644 pkgs/development/libraries/mauikit-texteditor/default.nix diff --git a/pkgs/development/libraries/mauikit-texteditor/default.nix b/pkgs/development/libraries/mauikit-texteditor/default.nix new file mode 100644 index 00000000000..a405fd851bd --- /dev/null +++ b/pkgs/development/libraries/mauikit-texteditor/default.nix @@ -0,0 +1,42 @@ +{ lib +, mkDerivation +, fetchFromGitLab +, cmake +, extra-cmake-modules +, kconfig +, kio +, mauikit +, syntax-highlighting +}: + +mkDerivation rec { + pname = "mauikit-texteditor"; + version = "2.1.1"; + + src = fetchFromGitLab { + domain = "invent.kde.org"; + owner = "maui"; + repo = "mauikit-texteditor"; + rev = "v${version}"; + sha256 = "sha256-C0EOc0CE6Ef7vnmOKRqTzeJUamGXsvREpHRPGTcAaIc="; + }; + + nativeBuildInputs = [ + cmake + extra-cmake-modules + ]; + + buildInputs = [ + kconfig + kio + mauikit + syntax-highlighting + ]; + + meta = with lib; { + homepage = "https://invent.kde.org/maui/mauikit-texteditor"; + description = "MauiKit Text Editor components"; + license = licenses.lgpl2Plus; + maintainers = with maintainers; [ onny ]; + }; +} diff --git a/pkgs/top-level/qt5-packages.nix b/pkgs/top-level/qt5-packages.nix index 5d9604c0f13..7629790d50d 100644 --- a/pkgs/top-level/qt5-packages.nix +++ b/pkgs/top-level/qt5-packages.nix @@ -150,6 +150,8 @@ in (kdeFrameworks // plasmaMobileGear // plasma5 // plasma5.thirdParty // kdeGea mauikit-filebrowsing = callPackage ../development/libraries/mauikit-filebrowsing { }; + mauikit-texteditor = callPackage ../development/libraries/mauikit-texteditor { }; + mlt = callPackage ../development/libraries/mlt/qt-5.nix { }; openbr = callPackage ../development/libraries/openbr { }; From 11c89da75d454dfe06313e7b3ba696af875cf38b Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 8 May 2022 11:13:56 +0000 Subject: [PATCH 103/147] python310Packages.types-tabulate: 0.8.8 -> 0.8.9 --- pkgs/development/python-modules/types-tabulate/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/types-tabulate/default.nix b/pkgs/development/python-modules/types-tabulate/default.nix index 5da6ea01680..c8f49386543 100644 --- a/pkgs/development/python-modules/types-tabulate/default.nix +++ b/pkgs/development/python-modules/types-tabulate/default.nix @@ -5,11 +5,11 @@ buildPythonPackage rec { pname = "types-tabulate"; - version = "0.8.8"; + version = "0.8.9"; src = fetchPypi { inherit pname version; - hash = "sha256-CzGcfhDdVh98FfVt7DR8MZP9hl9Ovl/x7LAg6vp5O8M="; + hash = "sha256-L8P6T+GFOsmHz1Do1FmeP+RG3VMGT+hqRqQHqY6fwE8="; }; # Module doesn't have tests From 8d9b3b3a243151309ce603552c0f99cca0d14912 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 8 May 2022 11:41:35 +0000 Subject: [PATCH 104/147] python310Packages.linkify-it-py: 1.0.3 -> 2.0.0 --- pkgs/development/python-modules/linkify-it-py/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/python-modules/linkify-it-py/default.nix b/pkgs/development/python-modules/linkify-it-py/default.nix index ef97439cdc8..54f71fe2ec2 100644 --- a/pkgs/development/python-modules/linkify-it-py/default.nix +++ b/pkgs/development/python-modules/linkify-it-py/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "linkify-it-py"; - version = "1.0.3"; + version = "2.0.0"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -16,8 +16,8 @@ buildPythonPackage rec { src = fetchFromGitHub { owner = "tsutsu3"; repo = pname; - rev = "v${version}"; - hash = "sha256-1QqfqFdTEdZr02jQnmHmvw3fgnC/ktsfALyhtkGSXoY="; + rev = "refs/tags/v${version}"; + hash = "sha256-3bgkhIC6tHl5zieiyllvqFCKwLms55m8MGt1xGhQ4Dk="; }; propagatedBuildInputs = [ uc-micro-py ]; From 51f78a34bf57954ae30aad58aceb04da9d0e7800 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 8 May 2022 12:21:04 +0000 Subject: [PATCH 105/147] python310Packages.poetry-dynamic-versioning: 0.15.0 -> 0.16.0 --- .../python-modules/poetry-dynamic-versioning/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/poetry-dynamic-versioning/default.nix b/pkgs/development/python-modules/poetry-dynamic-versioning/default.nix index b662452d8a0..bdc484fd1bb 100644 --- a/pkgs/development/python-modules/poetry-dynamic-versioning/default.nix +++ b/pkgs/development/python-modules/poetry-dynamic-versioning/default.nix @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "poetry-dynamic-versioning"; - version = "0.15.0"; + version = "0.16.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -21,7 +21,7 @@ buildPythonPackage rec { owner = "mtkennerly"; repo = pname; rev = "refs/tags/v${version}"; - hash = "sha256-RHCP5SakizURg5MwD96Bxs/NvoTdPSCKWVYt5m4meLA="; + hash = "sha256-dLtZSm10OYWLRK4eRo83RczW0zBVAUF0HQXLQbeDJCk="; }; nativeBuildInputs = [ From 13d4c4ef11f650cea2ec00905f668349e0160f17 Mon Sep 17 00:00:00 2001 From: xrelkd <46590321+xrelkd@users.noreply.github.com> Date: Sun, 8 May 2022 20:51:21 +0800 Subject: [PATCH 106/147] cargo-make: 0.35.11 -> 0.35.12 --- pkgs/development/tools/rust/cargo-make/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/rust/cargo-make/default.nix b/pkgs/development/tools/rust/cargo-make/default.nix index 46738f7cf45..92439d2a572 100644 --- a/pkgs/development/tools/rust/cargo-make/default.nix +++ b/pkgs/development/tools/rust/cargo-make/default.nix @@ -13,11 +13,11 @@ rustPlatform.buildRustPackage rec { pname = "cargo-make"; - version = "0.35.11"; + version = "0.35.12"; src = fetchCrate { inherit pname version; - sha256 = "sha256-NzhEXt0z+0/6F3pgGmQwjnexBA2icWV3dCifZ8BxnOQ="; + sha256 = "sha256-BBSZTbzT+8obY677Yfmf1VTwg0GtvMNY/FTlS6isJTE="; }; nativeBuildInputs = [ pkg-config ]; @@ -25,7 +25,7 @@ rustPlatform.buildRustPackage rec { buildInputs = [ openssl ] ++ lib.optionals stdenv.isDarwin [ Security SystemConfiguration libiconv ]; - cargoSha256 = "sha256-+FGl0JhaRu+KLQJGAcMXv9vP6pmRzdTDtNA3h6A1jcY="; + cargoSha256 = "sha256-Nsm6KnL72HjqGevXwg2qYagzMG5nEFuH9DblbcUv6Qg="; # Some tests fail because they need network access. # However, Travis ensures a proper build. From c1bdd973d0c8def3345fa55c87d7979edde756d2 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 8 May 2022 14:15:12 +0000 Subject: [PATCH 107/147] python310Packages.python-trovo: 0.1.5 -> 0.1.6 --- pkgs/development/python-modules/python-trovo/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/python-trovo/default.nix b/pkgs/development/python-modules/python-trovo/default.nix index d7fa18cfba3..b2f58f99f64 100644 --- a/pkgs/development/python-modules/python-trovo/default.nix +++ b/pkgs/development/python-modules/python-trovo/default.nix @@ -7,13 +7,13 @@ buildPythonPackage rec { pname = "python-trovo"; - version = "0.1.5"; + version = "0.1.6"; disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; - sha256 = "sha256-JUJax9nk4NqpMMrbDmQhcy22GIqPha+K4tudQ98PvlE="; + sha256 = "sha256-g1RDHSNGbGT1G2ej7A8WzyR17FaNPySfsAuKbHddmtQ="; }; propagatedBuildInputs = [ requests ]; From fa43ff6fe432039aaf9f410ae97a40d7675359cd Mon Sep 17 00:00:00 2001 From: Kevin Cox Date: Sat, 7 May 2022 11:00:32 -0400 Subject: [PATCH 108/147] mautrix-facebook: 0.4.0 -> 2022-05-06-5e2c4e7f The current version is broken on the version of mautrix-python in nixpkgs and there are a couple fixes scattered in unreleased commits. Simply update to HEAD to get it working again. --- pkgs/servers/mautrix-facebook/default.nix | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/mautrix-facebook/default.nix b/pkgs/servers/mautrix-facebook/default.nix index 08d7f1046c7..f955af78348 100644 --- a/pkgs/servers/mautrix-facebook/default.nix +++ b/pkgs/servers/mautrix-facebook/default.nix @@ -1,5 +1,6 @@ { enableSystemd ? stdenv.isLinux , fetchFromGitHub +, fetchpatch , lib , python3 , stdenv @@ -7,13 +8,13 @@ python3.pkgs.buildPythonPackage rec { pname = "mautrix-facebook"; - version = "0.4.0"; + version = "unstable-2022-05-06"; src = fetchFromGitHub { owner = "mautrix"; repo = "facebook"; - rev = "v${version}"; - hash = "sha256-Yc8W8A11dnXrJdLtu/rJHTVlu2pEawXn5xuT8Ez+h9U="; + rev = "5e2c4e7f5a38e3c5d984d690c0ebee9b6bb4768c"; + hash = "sha256-ukFtVRrmaJVVwgp5siwEwbfq6Yq5rmu3XJA5H2n/eJU="; }; propagatedBuildInputs = with python3.pkgs; [ From fb7b4d044e56f55d2dc0082fda1ba705017824c8 Mon Sep 17 00:00:00 2001 From: "P. R. d. O" Date: Sun, 8 May 2022 08:42:05 -0600 Subject: [PATCH 109/147] jenkins: 2.332.2 -> 2.332.3 --- .../tools/continuous-integration/jenkins/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/tools/continuous-integration/jenkins/default.nix b/pkgs/development/tools/continuous-integration/jenkins/default.nix index 5c95c99814d..a8f933dd505 100644 --- a/pkgs/development/tools/continuous-integration/jenkins/default.nix +++ b/pkgs/development/tools/continuous-integration/jenkins/default.nix @@ -4,11 +4,11 @@ stdenv.mkDerivation rec { pname = "jenkins"; - version = "2.332.2"; + version = "2.332.3"; src = fetchurl { - url = "http://get.jenkins.io/war-stable/${version}/jenkins.war"; - sha256 = "0z0igaq29nsxbkdzqfgrh10206a7ndsvz79bj8078hq8hqvl3an7"; + url = "https://get.jenkins.io/war-stable/${version}/jenkins.war"; + sha256 = "sha256-0ZPxearfOnzrYa3rw6tRIYrEp4UriJMv8ztE/XvmAQ8="; }; nativeBuildInputs = [ makeWrapper ]; From e8dc36df5cd2eb680ca7c0663372477461705acc Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 8 May 2022 17:11:25 +0200 Subject: [PATCH 110/147] python310Packages.pkutils: 2.0.0 -> 3.0.2 --- pkgs/development/python-modules/pkutils/default.nix | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/pkutils/default.nix b/pkgs/development/python-modules/pkutils/default.nix index 48afe57ef34..c4baa649cf9 100644 --- a/pkgs/development/python-modules/pkutils/default.nix +++ b/pkgs/development/python-modules/pkutils/default.nix @@ -8,7 +8,7 @@ buildPythonPackage rec { pname = "pkutils"; - version = "2.0.0"; + version = "3.0.2"; format = "setuptools"; disabled = pythonOlder "3.6"; @@ -17,7 +17,7 @@ buildPythonPackage rec { owner = "reubano"; repo = "pkutils"; rev = "v${version}"; - sha256 = "sha256-jvRUjuxlcfmJOX50bnZR/pP2Axe1KDy9/KGXTL4yPxA="; + hash = "sha256-AK+xX+LPz6IVLZedsqMUm7G28ue0s3pXgIzxS4EHHLE="; }; propagatedBuildInputs = [ @@ -28,12 +28,6 @@ buildPythonPackage rec { nose ]; - postPatch = '' - # Remove when https://github.com/reubano/pkutils/pull/4 merged - substituteInPlace requirements.txt \ - --replace "semver>=2.2.1,<2.7.3" "semver" - ''; - checkPhase = '' runHook preCheck nosetests From f6c5c1292ab690ea2e6d07f17eb0f2b5e9c65923 Mon Sep 17 00:00:00 2001 From: Daniel Nagy Date: Sun, 8 May 2022 15:39:38 +0200 Subject: [PATCH 111/147] vimb: 3.3.0 -> 3.6.0 --- pkgs/applications/networking/browsers/vimb/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/browsers/vimb/default.nix b/pkgs/applications/networking/browsers/vimb/default.nix index 240d9a972fb..35fece92529 100644 --- a/pkgs/applications/networking/browsers/vimb/default.nix +++ b/pkgs/applications/networking/browsers/vimb/default.nix @@ -4,13 +4,13 @@ stdenv.mkDerivation rec { pname = "vimb"; - version = "3.3.0"; + version = "3.6.0"; src = fetchFromGitHub { owner = "fanglingsu"; repo = "vimb"; rev = version; - sha256 = "1qg18z2gnsli9qgrqfhqfrsi6g9mcgr90w8yab28nxrq4aha6brf"; + sha256 = "sha256-Eq4riJSznKpkW9JJDnTCLxZ9oMJTmWkIoGphOiCcSAg="; }; nativeBuildInputs = [ wrapGAppsHook pkg-config ]; From fdca00482fdb55b07b4507079d80ab9617bcdd2e Mon Sep 17 00:00:00 2001 From: Daniel Nagy Date: Thu, 21 Apr 2022 13:09:09 +0200 Subject: [PATCH 112/147] arduino-cli: 0.20.2 -> 0.21.1 --- pkgs/development/embedded/arduino/arduino-cli/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/embedded/arduino/arduino-cli/default.nix b/pkgs/development/embedded/arduino/arduino-cli/default.nix index dc463c9fc4d..a432058f083 100644 --- a/pkgs/development/embedded/arduino/arduino-cli/default.nix +++ b/pkgs/development/embedded/arduino/arduino-cli/default.nix @@ -4,13 +4,13 @@ let pkg = buildGoModule rec { pname = "arduino-cli"; - version = "0.20.2"; + version = "0.21.1"; src = fetchFromGitHub { owner = "arduino"; repo = pname; rev = version; - sha256 = "sha256-q2uaJTfCcS/kv6xU5NjafzfcM3TixJlH5KzgEpLJKkQ="; + sha256 = "sha256-IXzN6CnZCzrkcLVNmKc1WB0V+TTa56CBzASzK0FQO8c="; }; subPackages = [ "." ]; From 9db1d1782b74f6717d2c5b3d171d60596b05a9fc Mon Sep 17 00:00:00 2001 From: Ivan Kozik Date: Sun, 8 May 2022 16:00:17 +0000 Subject: [PATCH 113/147] nixos/tinc: unbreak the service The user is actually tinc.${network}, as Mic92 points out in https://github.com/NixOS/nixpkgs/pull/171703#discussion_r867506032 Sorry, I broke this in https://github.com/NixOS/nixpkgs/pull/171703 earlier. coreutils 9.1 chown does not complain in this case with a valid dotted user. --- nixos/modules/services/networking/tinc.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/nixos/modules/services/networking/tinc.nix b/nixos/modules/services/networking/tinc.nix index 9bc019039e0..31731b60d48 100644 --- a/nixos/modules/services/networking/tinc.nix +++ b/nixos/modules/services/networking/tinc.nix @@ -383,9 +383,9 @@ in }; preStart = '' mkdir -p /etc/tinc/${network}/hosts - chown tinc:${network} /etc/tinc/${network}/hosts + chown tinc.${network} /etc/tinc/${network}/hosts mkdir -p /etc/tinc/${network}/invitations - chown tinc:${network} /etc/tinc/${network}/invitations + chown tinc.${network} /etc/tinc/${network}/invitations # Determine how we should generate our keys if type tinc >/dev/null 2>&1; then From afb8c54d8463f5035f6ece71cb54ba899378680f Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Fri, 6 May 2022 04:20:00 +0000 Subject: [PATCH 114/147] lua52Packages.luasystem: fix build on darwin Do not add glibc on darwin. --- pkgs/development/lua-modules/overrides.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/development/lua-modules/overrides.nix b/pkgs/development/lua-modules/overrides.nix index cc179f0b946..10744653ca1 100644 --- a/pkgs/development/lua-modules/overrides.nix +++ b/pkgs/development/lua-modules/overrides.nix @@ -240,7 +240,9 @@ with prev; ]; }); - luasystem = prev.lib.overrideLuarocks prev.luasystem (drv: { buildInputs = [ pkgs.glibc.out ]; }); + luasystem = prev.lib.overrideLuarocks prev.luasystem (drv: pkgs.lib.optionalAttrs pkgs.stdenv.isLinux { + buildInputs = [ pkgs.glibc.out ]; + }); luazip = prev.lib.overrideLuarocks prev.luazip (drv: { buildInputs = [ From f0eff1991c228cd7b7be76a827aba0c2b0aa57f9 Mon Sep 17 00:00:00 2001 From: Artturin Date: Sun, 8 May 2022 19:39:53 +0300 Subject: [PATCH 115/147] kitty: libGL doesn't have to be a propagatedBuildInputs it was added in cec27ceabc4f734bddc00f5bbf2c0d56a354f654 and there is no context of why its in propagatedBuildInputs --- pkgs/applications/terminal-emulators/kitty/default.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pkgs/applications/terminal-emulators/kitty/default.nix b/pkgs/applications/terminal-emulators/kitty/default.nix index 52e691f9850..65e15a12cc7 100644 --- a/pkgs/applications/terminal-emulators/kitty/default.nix +++ b/pkgs/applications/terminal-emulators/kitty/default.nix @@ -58,7 +58,7 @@ buildPythonApplication rec { ] ++ lib.optionals stdenv.isLinux [ fontconfig libunistring libcanberra libX11 libXrandr libXinerama libXcursor libxkbcommon libXi libXext - wayland-protocols wayland dbus + wayland-protocols wayland dbus libGL ]; nativeBuildInputs = [ @@ -75,8 +75,6 @@ buildPythonApplication rec { libicns # For the png2icns tool. ]; - propagatedBuildInputs = lib.optional stdenv.isLinux libGL; - outputs = [ "out" "terminfo" "shell_integration" ]; patches = [ From 14aa4a4d0ddf9a9471a199cabfc3d35e6b66a0dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nguy=E1=BB=85n=20Gia=20Phong?= Date: Wed, 4 May 2022 10:52:25 +0900 Subject: [PATCH 116/147] luaPackages.vicious: 2.5.0 -> 2.5.1 --- pkgs/top-level/lua-packages.nix | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/pkgs/top-level/lua-packages.nix b/pkgs/top-level/lua-packages.nix index e8ac6445d0e..3e0e8e25b2f 100644 --- a/pkgs/top-level/lua-packages.nix +++ b/pkgs/top-level/lua-packages.nix @@ -105,13 +105,13 @@ in vicious = luaLib.toLuaModule( stdenv.mkDerivation rec { pname = "vicious"; - version = "2.5.0"; + version = "2.5.1"; src = fetchFromGitHub { - owner = "Mic92"; + owner = "vicious-widgets"; repo = "vicious"; rev = "v${version}"; - sha256 = "0lb90334mz0my8ydsmnsnkki0xr58kinsg0hf9d6k4b0vjfi0r0a"; + sha256 = "sha256-geu/g/dFAVxtY1BuJYpZoVtFS/oL66NFnqiLAnJELtI="; }; buildInputs = [ lua ]; @@ -124,9 +124,9 @@ in meta = with lib; { description = "A modular widget library for the awesome window manager"; - homepage = "https://github.com/Mic92/vicious"; - license = licenses.gpl2; - maintainers = with maintainers; [ makefu mic92 ]; + homepage = "https://vicious.rtfd.io"; + license = licenses.gpl2Plus; + maintainers = with maintainers; [ makefu mic92 McSinyx ]; platforms = platforms.linux; }; }); From 49dce7182fe550d190b73ede64295c486c1b6763 Mon Sep 17 00:00:00 2001 From: Zaripov Kamil Date: Sun, 8 May 2022 19:01:19 +0300 Subject: [PATCH 117/147] stlink: fix stlink build for macos Currently stlink build fails on macOS since version 1.7.0 didn't contain https://github.com/stlink-org/stlink/commit/468b1d2daa853b975c33ab69876c486734f2c6a7 commit from upstream. This commit adds dependency on Security framework required for libusb. --- pkgs/development/tools/misc/stlink/default.nix | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/pkgs/development/tools/misc/stlink/default.nix b/pkgs/development/tools/misc/stlink/default.nix index 2fbb60a0ddc..850d0ea21bf 100644 --- a/pkgs/development/tools/misc/stlink/default.nix +++ b/pkgs/development/tools/misc/stlink/default.nix @@ -1,6 +1,7 @@ { lib , stdenv , fetchFromGitHub +, fetchpatch , cmake , libusb1 , gtk3 @@ -27,6 +28,13 @@ in stdenv.mkDerivation rec { sha256 = "03xypffpbp4imrczbxmq69vgkr7mbp0ps9dk815br5wwlz6vgygl"; }; + patches = [ + (fetchpatch { + url = "https://github.com/stlink-org/stlink/commit/468b1d2daa853b975c33ab69876c486734f2c6a7.diff"; + sha256 = "sha256-ueSi/zc7xbOATl0yBtCL4U64IQ/yqu6sMYDOiPl1JBI="; + }) + ]; + buildInputs = [ libusb1' ] ++ lib.optionals withGUI [ From fe4650c43670771ab61c8819b986295c4d7f8fc1 Mon Sep 17 00:00:00 2001 From: Hubert Jasudowicz Date: Sun, 8 May 2022 20:15:57 +0200 Subject: [PATCH 118/147] aerc: 0.9.0 -> 0.10.0 --- pkgs/applications/networking/mailreaders/aerc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/networking/mailreaders/aerc/default.nix b/pkgs/applications/networking/mailreaders/aerc/default.nix index 5d00242452b..97634c1d2cd 100644 --- a/pkgs/applications/networking/mailreaders/aerc/default.nix +++ b/pkgs/applications/networking/mailreaders/aerc/default.nix @@ -11,13 +11,13 @@ buildGoModule rec { pname = "aerc"; - version = "0.9.0"; + version = "0.10.0"; src = fetchFromSourcehut { owner = "~rjarry"; repo = pname; rev = version; - sha256 = "sha256-D4cZVNh3YFaVRHGFn5Nt6kMSRCShj0w5n7pTxgYik2s="; + sha256 = "sha256-v1+12UCgBbH/2PxZ9QdDN30LmyzVcfGlYiVNVPYO3zs="; }; proxyVendor = true; From c353f171b98440def5b11c4553cc4ac9eb71f3f3 Mon Sep 17 00:00:00 2001 From: Leon Schuermann Date: Sun, 8 May 2022 20:40:30 +0200 Subject: [PATCH 119/147] horizon-eda: 2.2.0 -> 2.3.0 Signed-off-by: Leon Schuermann --- .../science/electronics/horizon-eda/default.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/applications/science/electronics/horizon-eda/default.nix b/pkgs/applications/science/electronics/horizon-eda/default.nix index 6029bf5a994..f18afb77587 100644 --- a/pkgs/applications/science/electronics/horizon-eda/default.nix +++ b/pkgs/applications/science/electronics/horizon-eda/default.nix @@ -8,10 +8,11 @@ , glm , gtkmm3 , lib +, libarchive , libgit2 , librsvg +, libspnav , libuuid -, libzip , opencascade , pkg-config , podofo @@ -23,13 +24,13 @@ stdenv.mkDerivation rec { pname = "horizon-eda"; - version = "2.2.0"; + version = "2.3.0"; src = fetchFromGitHub { owner = "horizon-eda"; repo = "horizon"; rev = "v${version}"; - sha256 = "sha256-MUS1dIsULDJ5DahCtDpbHZq56nltHShli7+uoW1/Tqw="; + sha256 = "0lw5j1zqd2wdafgxl4ahcphaabs7vlw4kaa1c566hwfjxs46dmg9"; }; buildInputs = [ @@ -38,10 +39,11 @@ stdenv.mkDerivation rec { libepoxy glm gtkmm3 + libarchive libgit2 librsvg + libspnav libuuid - libzip opencascade podofo python3 From 3effbca0bc361f406cc22e6bd5f18edd7b6fa413 Mon Sep 17 00:00:00 2001 From: Michal Sojka Date: Sun, 8 May 2022 21:16:32 +0200 Subject: [PATCH 120/147] usbrelay: 0.9 -> 1.0 --- nixos/modules/services/hardware/usbrelayd.nix | 3 +-- pkgs/os-specific/linux/usbrelay/daemon.nix | 2 +- pkgs/os-specific/linux/usbrelay/default.nix | 14 +++++++++++--- 3 files changed, 13 insertions(+), 6 deletions(-) diff --git a/nixos/modules/services/hardware/usbrelayd.nix b/nixos/modules/services/hardware/usbrelayd.nix index c0322e89e6b..a0d3f15f684 100644 --- a/nixos/modules/services/hardware/usbrelayd.nix +++ b/nixos/modules/services/hardware/usbrelayd.nix @@ -26,8 +26,7 @@ in config = mkIf cfg.enable { - # TODO: Rename to .conf in upcomming release - environment.etc."usbrelayd.ini".text = '' + environment.etc."usbrelayd.conf".text = '' [MQTT] BROKER = ${cfg.broker} CLIENTNAME = ${cfg.clientName} diff --git a/pkgs/os-specific/linux/usbrelay/daemon.nix b/pkgs/os-specific/linux/usbrelay/daemon.nix index 5f8d23e5201..e5e4baae9e9 100644 --- a/pkgs/os-specific/linux/usbrelay/daemon.nix +++ b/pkgs/os-specific/linux/usbrelay/daemon.nix @@ -25,9 +25,9 @@ stdenv.mkDerivation rec { install -m 644 -D usbrelayd $out/bin/usbrelayd install -m 644 -D usbrelayd.service $out/lib/systemd/system/usbrelayd.service install -m 644 -D 50-usbrelay.rules $out/lib/udev/rules.d/50-usbrelay.rules + install -m 644 -D usbrelayd.conf $out/etc/usbrelayd.conf # include this as an example runHook postInstall ''; - # TODO for later releases: install -D usbrelayd.conf $out/etc/usbrelayd.conf # include this as an example meta = { description = "USB Relay MQTT service"; diff --git a/pkgs/os-specific/linux/usbrelay/default.nix b/pkgs/os-specific/linux/usbrelay/default.nix index ebbb1dd7922..25388d3b230 100644 --- a/pkgs/os-specific/linux/usbrelay/default.nix +++ b/pkgs/os-specific/linux/usbrelay/default.nix @@ -1,15 +1,19 @@ -{ stdenv, lib, fetchFromGitHub, hidapi }: +{ stdenv, lib, fetchFromGitHub, hidapi, installShellFiles }: stdenv.mkDerivation rec { pname = "usbrelay"; - version = "0.9"; + version = "1.0"; src = fetchFromGitHub { owner = "darrylb123"; repo = "usbrelay"; rev = version; - sha256 = "sha256-bxME4r5W5bZKxMZ/Svi1EenqHKVWIjU6iiKaM8U6lmA="; + sha256 = "sha256-5zgpN4a+r0tmw0ISTJM+d9mo+L/qwUvpWPSsykuG0cg="; }; + nativeBuildInputs = [ + installShellFiles + ]; + buildInputs = [ hidapi ]; @@ -19,6 +23,10 @@ stdenv.mkDerivation rec { "PREFIX=${placeholder "out"}" ]; + postInstall = '' + installManPage usbrelay.1 + ''; + meta = with lib; { description = "Tool to control USB HID relays"; homepage = "https://github.com/darrylb123/usbrelay"; From 13870b025a2729370f32b9145329243d9a0d7626 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= Date: Sat, 7 May 2022 03:28:21 +0200 Subject: [PATCH 121/147] python310Packages.m2r: adopt, run tests --- .../python-modules/m2r/default.nix | 23 +++++++++++++------ 1 file changed, 16 insertions(+), 7 deletions(-) diff --git a/pkgs/development/python-modules/m2r/default.nix b/pkgs/development/python-modules/m2r/default.nix index 35331c14b08..fd148382617 100644 --- a/pkgs/development/python-modules/m2r/default.nix +++ b/pkgs/development/python-modules/m2r/default.nix @@ -1,5 +1,11 @@ -{ lib, buildPythonPackage, fetchPypi, - mistune, docutils } : +{ lib +, buildPythonPackage +, fetchPypi +, docutils +, mistune +, pygments +}: + buildPythonPackage rec { pname = "m2r"; version = "0.2.1"; @@ -9,16 +15,19 @@ buildPythonPackage rec { sha256 = "bf90bad66cda1164b17e5ba4a037806d2443f2a4d5ddc9f6a5554a0322aaed99"; }; + postPatch = '' + substituteInPlace tests/test_cli.py \ + --replace "optional" "positional" + ''; + propagatedBuildInputs = [ mistune docutils ]; - # Some tests interfeere with each other (test.md and test.rst are - # deleted by some tests and not properly regenerated) - doCheck = false; + checkInputs = [ pygments ]; meta = with lib; { homepage = "https://github.com/miyakogi/m2r"; - description = "converts a markdown file including reST markups to a valid reST format"; + description = "Markdown to reStructuredText converter"; license = licenses.mit; - maintainers = [ ]; + maintainers = with maintainers; [ SuperSandro2000 ]; }; } From 98152f70fddfc38eb6cfcb07dbd0458c51e5dfb0 Mon Sep 17 00:00:00 2001 From: Rasmus Rendal Date: Sun, 8 May 2022 21:26:55 +0200 Subject: [PATCH 122/147] gnum4: Disable stack protector when using MinGW (#171828) Co-authored-by: Sandro --- pkgs/development/tools/misc/gnum4/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/tools/misc/gnum4/default.nix b/pkgs/development/tools/misc/gnum4/default.nix index e0f71b2b3c3..7d860528022 100644 --- a/pkgs/development/tools/misc/gnum4/default.nix +++ b/pkgs/development/tools/misc/gnum4/default.nix @@ -16,7 +16,8 @@ stdenv.mkDerivation rec { doCheck = false; - configureFlags = [ "--with-syscmd-shell=${stdenv.shell}" ]; + configureFlags = [ "--with-syscmd-shell=${stdenv.shell}" ] + ++ lib.optional stdenv.hostPlatform.isMinGW "CFLAGS=-fno-stack-protector"; meta = { description = "GNU M4, a macro processor"; From 26ec7081d647a51d63ac0695ad43758178f6962a Mon Sep 17 00:00:00 2001 From: Michal Sojka Date: Sun, 8 May 2022 21:43:37 +0200 Subject: [PATCH 123/147] nixos/usbrelayd: set myself as module maintainer I forgot setting that when creating the module. --- nixos/modules/services/hardware/usbrelayd.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/nixos/modules/services/hardware/usbrelayd.nix b/nixos/modules/services/hardware/usbrelayd.nix index a0d3f15f684..2cee4e1ff7e 100644 --- a/nixos/modules/services/hardware/usbrelayd.nix +++ b/nixos/modules/services/hardware/usbrelayd.nix @@ -40,4 +40,8 @@ in }; users.groups.usbrelay = { }; }; + + meta = { + maintainers = with lib.maintainers; [ wentasah ]; + }; } From d9361ea36c54030f916a972a2634aa3939187091 Mon Sep 17 00:00:00 2001 From: Sandro Date: Sun, 8 May 2022 21:59:28 +0200 Subject: [PATCH 124/147] Revert "python310Packages.m2r: adopt, run tests" --- .../python-modules/m2r/default.nix | 23 ++++++------------- 1 file changed, 7 insertions(+), 16 deletions(-) diff --git a/pkgs/development/python-modules/m2r/default.nix b/pkgs/development/python-modules/m2r/default.nix index fd148382617..35331c14b08 100644 --- a/pkgs/development/python-modules/m2r/default.nix +++ b/pkgs/development/python-modules/m2r/default.nix @@ -1,11 +1,5 @@ -{ lib -, buildPythonPackage -, fetchPypi -, docutils -, mistune -, pygments -}: - +{ lib, buildPythonPackage, fetchPypi, + mistune, docutils } : buildPythonPackage rec { pname = "m2r"; version = "0.2.1"; @@ -15,19 +9,16 @@ buildPythonPackage rec { sha256 = "bf90bad66cda1164b17e5ba4a037806d2443f2a4d5ddc9f6a5554a0322aaed99"; }; - postPatch = '' - substituteInPlace tests/test_cli.py \ - --replace "optional" "positional" - ''; - propagatedBuildInputs = [ mistune docutils ]; - checkInputs = [ pygments ]; + # Some tests interfeere with each other (test.md and test.rst are + # deleted by some tests and not properly regenerated) + doCheck = false; meta = with lib; { homepage = "https://github.com/miyakogi/m2r"; - description = "Markdown to reStructuredText converter"; + description = "converts a markdown file including reST markups to a valid reST format"; license = licenses.mit; - maintainers = with maintainers; [ SuperSandro2000 ]; + maintainers = [ ]; }; } From 1391482b41a65d67fd2a5af3ac670264a0f6b2db Mon Sep 17 00:00:00 2001 From: haslersn Date: Sun, 8 May 2022 22:11:41 +0200 Subject: [PATCH 125/147] virtctl: init at 0.52.0 (#171734) Co-authored-by: Sandro --- .../tools/virtualization/kubevirt/default.nix | 43 +++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 + 2 files changed, 45 insertions(+) create mode 100644 pkgs/tools/virtualization/kubevirt/default.nix diff --git a/pkgs/tools/virtualization/kubevirt/default.nix b/pkgs/tools/virtualization/kubevirt/default.nix new file mode 100644 index 00000000000..999d5b3dfc1 --- /dev/null +++ b/pkgs/tools/virtualization/kubevirt/default.nix @@ -0,0 +1,43 @@ +{ buildGoModule +, fetchFromGitHub +, lib +, testers +, kubevirt +}: + +buildGoModule rec { + pname = "kubevirt"; + version = "0.52.0"; + + src = fetchFromGitHub { + owner = "kubevirt"; + repo = "kubevirt"; + rev = "v${version}"; + sha256 = "0ldc13nypbk3r9ihbdfibpyvzyzz4m68zzb7g6cq551ks9qdiyma"; + }; + + vendorSha256 = null; + + subPackages = [ "cmd/virtctl" ]; + + tags = [ "selinux" ]; + + ldflags = [ + "-X kubevirt.io/client-go/version.gitCommit=v${version}" + "-X kubevirt.io/client-go/version.gitTreeState=clean" + "-X kubevirt.io/client-go/version.gitVersion=v${version}" + ]; + + passthru.tests.version = testers.testVersion { + package = kubevirt; + command = "virtctl version --client"; + version = "v${version}"; + }; + + meta = with lib; { + description = "Client tool to use advanced features such as console access"; + homepage = "https://kubevirt.io/"; + license = licenses.asl20; + maintainers = with maintainers; [ haslersn ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 1c6ae0a74fc..aeaca927106 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1213,6 +1213,8 @@ with pkgs; ventoy-bin = callPackage ../tools/cd-dvd/ventoy-bin { }; + kubevirt = callPackage ../tools/virtualization/kubevirt { }; + vopono = callPackage ../tools/networking/vopono { }; winbox = callPackage ../tools/admin/winbox { From 7ae04c1c4d6f4a2b10214c8ffa248f1cb4ca4a8b Mon Sep 17 00:00:00 2001 From: Artturin Date: Sun, 8 May 2022 23:12:20 +0300 Subject: [PATCH 126/147] xorg.xcbutilerrors: add dev output to not propagate a dev output --- pkgs/servers/x11/xorg/overrides.nix | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/pkgs/servers/x11/xorg/overrides.nix b/pkgs/servers/x11/xorg/overrides.nix index d58a3c929aa..b583a72c281 100644 --- a/pkgs/servers/x11/xorg/overrides.nix +++ b/pkgs/servers/x11/xorg/overrides.nix @@ -351,6 +351,10 @@ self: super: outputs = [ "out" "dev" ]; }); + xcbutilerrors = super.xcbutilerrors.overrideAttrs (attrs: { + outputs = [ "out" "dev" ]; # mainly to get rid of propagating others + }); + xcbutilcursor = super.xcbutilcursor.overrideAttrs (attrs: { outputs = [ "out" "dev" ]; meta = attrs.meta // { maintainers = [ lib.maintainers.lovek323 ]; }; From 5c52081c13eed291246b12c6ea5660296a7d4193 Mon Sep 17 00:00:00 2001 From: Tobias Poschwatta Date: Sun, 8 May 2022 17:47:54 +0200 Subject: [PATCH 127/147] slurm: 21.08.7.1 -> 21.08.8.2 https://www.schedmd.com/news.php Fixes: CVE-2022-29500, CVE-2022-29501, CVE-2022-29502 --- pkgs/servers/computing/slurm/default.nix | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/pkgs/servers/computing/slurm/default.nix b/pkgs/servers/computing/slurm/default.nix index de0ac56478a..827269d578a 100644 --- a/pkgs/servers/computing/slurm/default.nix +++ b/pkgs/servers/computing/slurm/default.nix @@ -1,15 +1,18 @@ { lib, stdenv, fetchFromGitHub, pkg-config, libtool, curl -, python3, munge, perl, pam, zlib, shadow, coreutils +, python3, munge, perl, pam, shadow, coreutils , ncurses, libmysqlclient, gtk2, lua, hwloc, numactl , readline, freeipmi, xorg, lz4, rdma-core, nixosTests , pmix +, libjwt +, libyaml +, json_c # enable internal X11 support via libssh2 , enableX11 ? true }: stdenv.mkDerivation rec { pname = "slurm"; - version = "21.08.7.1"; + version = "21.08.8.2"; # N.B. We use github release tags instead of https://www.schedmd.com/downloads.php # because the latter does not keep older releases. @@ -18,7 +21,7 @@ stdenv.mkDerivation rec { repo = "slurm"; # The release tags use - instead of . rev = "${pname}-${builtins.replaceStrings ["."] ["-"] version}"; - sha256 = "1rhhfiwpfrg3mpdpvmdl3qz20ydi5m88dfv9hhwqm95sldqb6qw1"; + sha256 = "1n9gn879lff3iv2yi163fv2cwymgfqigh0jxs2kklc97g3nn23yx"; }; outputs = [ "out" "dev" ]; @@ -46,18 +49,20 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config libtool python3 ]; buildInputs = [ - curl python3 munge perl pam zlib + curl python3 munge perl pam libmysqlclient ncurses gtk2 lz4 rdma-core lua hwloc numactl readline freeipmi shadow.su - pmix + pmix json_c libjwt libyaml ] ++ lib.optionals enableX11 [ xorg.xauth ]; configureFlags = with lib; [ "--with-freeipmi=${freeipmi}" "--with-hwloc=${hwloc.dev}" + "--with-json=${json_c.dev}" + "--with-jwt=${libjwt}" "--with-lz4=${lz4.dev}" "--with-munge=${munge}" - "--with-zlib=${zlib}" + "--with-yaml=${libyaml}" "--with-ofed=${rdma-core}" "--sysconfdir=/etc/slurm" "--with-pmix=${pmix}" From 72fe39ecf33631f759c84f8af5627ee581ef71bc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jos=C3=A9=20Romildo=20Malaquias?= Date: Sun, 8 May 2022 17:17:47 -0300 Subject: [PATCH 128/147] qogir-theme: 2021-12-25 -> 2022-04-29 (#171132) Co-authored-by: Sandro --- pkgs/data/themes/qogir/default.nix | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/pkgs/data/themes/qogir/default.nix b/pkgs/data/themes/qogir/default.nix index e3e3b6e485b..528ff53be37 100644 --- a/pkgs/data/themes/qogir/default.nix +++ b/pkgs/data/themes/qogir/default.nix @@ -7,17 +7,18 @@ , librsvg , sassc , which +, gitUpdater }: stdenv.mkDerivation rec { pname = "qogir-theme"; - version = "2021-12-25"; + version = "2022-04-29"; src = fetchFromGitHub { owner = "vinceliuice"; repo = pname; rev = version; - sha256 = "1h10yqz3i59bxhkk2r2p8as8g9ibx38bbpdxi7jgg2pxr581mn4f"; + sha256 = "oFGJ29He7ZmryW/Eg+JLM9C3FzNjmKjzNtyXDHGuhwo="; }; nativeBuildInputs = [ @@ -38,12 +39,14 @@ stdenv.mkDerivation rec { installPhase = '' patchShebangs . mkdir -p $out/share/themes - name= ./install.sh -t all -d $out/share/themes + name= HOME="$TMPDIR" ./install.sh -t all -d $out/share/themes mkdir -p $out/share/doc/${pname} cp -a src/firefox $out/share/doc/${pname} rm $out/share/themes/*/{AUTHORS,COPYING} ''; + passthru.updateScript = gitUpdater { inherit pname version; }; + meta = with lib; { description = "Flat Design theme for GTK based desktop environments"; homepage = "https://vinceliuice.github.io/Qogir-theme"; From 16e2b76b1a5a8b0ee8007881f41432dc5319f9ae Mon Sep 17 00:00:00 2001 From: Matthias Thym Date: Wed, 4 May 2022 11:29:44 +0200 Subject: [PATCH 129/147] pylint: add top-level package --- pkgs/top-level/all-packages.nix | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 9f5fd509e3e..f2891a461ec 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -9578,6 +9578,8 @@ with pkgs; pyinfra = with python3Packages; toPythonApplication pyinfra; + pylint = with python3Packages; toPythonApplication pylint; + pympress = callPackage ../applications/office/pympress { }; pyspread = libsForQt5.callPackage ../applications/office/pyspread { }; From 0596c29b4a60e5c2f764b2d3e0873c4dbeadfb8b Mon Sep 17 00:00:00 2001 From: Matthias Thym Date: Wed, 4 May 2022 11:30:14 +0200 Subject: [PATCH 130/147] pylint: add totoroot as maintainer --- pkgs/development/python-modules/pylint/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/pylint/default.nix b/pkgs/development/python-modules/pylint/default.nix index dda915bb7ef..db6606945a7 100644 --- a/pkgs/development/python-modules/pylint/default.nix +++ b/pkgs/development/python-modules/pylint/default.nix @@ -88,6 +88,6 @@ buildPythonPackage rec { homepage = "https://pylint.pycqa.org/"; description = "A bug and style checker for Python"; license = licenses.gpl1Plus; - maintainers = with maintainers; [ ]; + maintainers = with maintainers; [ totoroot ]; }; } From 8655fac3536ba3564daf95544a22dd70c1dfb335 Mon Sep 17 00:00:00 2001 From: Matthias Thym Date: Wed, 4 May 2022 14:18:21 +0200 Subject: [PATCH 131/147] pylint: add longDescription --- pkgs/development/python-modules/pylint/default.nix | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/pkgs/development/python-modules/pylint/default.nix b/pkgs/development/python-modules/pylint/default.nix index db6606945a7..263632e8654 100644 --- a/pkgs/development/python-modules/pylint/default.nix +++ b/pkgs/development/python-modules/pylint/default.nix @@ -87,6 +87,15 @@ buildPythonPackage rec { meta = with lib; { homepage = "https://pylint.pycqa.org/"; description = "A bug and style checker for Python"; + longDescription = '' + Pylint is a Python static code analysis tool which looks for programming errors, + helps enforcing a coding standard, sniffs for code smells and offers simple + refactoring suggestions. + Pylint is shipped with following additional commands: + - pyreverse: an UML diagram generator + - symilar: an independent similarities checker + - epylint: Emacs and Flymake compatible Pylint + ''; license = licenses.gpl1Plus; maintainers = with maintainers; [ totoroot ]; }; From 99ed27107eafcd4bad40d0dbb1b65b92616bb98c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 3 May 2022 04:23:51 +0000 Subject: [PATCH 132/147] python3Packages.passlib: specify extras-require --- .../python-modules/fastapi/default.nix | 2 +- .../flask-security-too/default.nix | 2 ++ .../python-modules/passlib/default.nix | 19 ++++++++++++++----- .../tools/devpi-server/default.nix | 2 +- pkgs/servers/radicale/3.x.nix | 2 +- 5 files changed, 19 insertions(+), 8 deletions(-) diff --git a/pkgs/development/python-modules/fastapi/default.nix b/pkgs/development/python-modules/fastapi/default.nix index c3abc2163be..63071fd9e44 100644 --- a/pkgs/development/python-modules/fastapi/default.nix +++ b/pkgs/development/python-modules/fastapi/default.nix @@ -49,7 +49,7 @@ buildPythonPackage rec { pytest-asyncio sqlalchemy trio - ]; + ] ++ passlib.extras-require.bcrypt; patches = [ # Bump starlette, https://github.com/tiangolo/fastapi/pull/4483 diff --git a/pkgs/development/python-modules/flask-security-too/default.nix b/pkgs/development/python-modules/flask-security-too/default.nix index 8379ec7bcfe..c3d98e405f3 100644 --- a/pkgs/development/python-modules/flask-security-too/default.nix +++ b/pkgs/development/python-modules/flask-security-too/default.nix @@ -32,6 +32,7 @@ , passlib # tests +, argon2_cffi , flask-mongoengine , mongoengine , mongomock @@ -85,6 +86,7 @@ buildPythonPackage rec { }; checkInputs = [ + argon2_cffi flask-mongoengine mongoengine mongomock diff --git a/pkgs/development/python-modules/passlib/default.nix b/pkgs/development/python-modules/passlib/default.nix index ab29ab74d68..9e35fb8f76a 100644 --- a/pkgs/development/python-modules/passlib/default.nix +++ b/pkgs/development/python-modules/passlib/default.nix @@ -1,9 +1,10 @@ { lib , buildPythonPackage , fetchPypi -, nose -, bcrypt , argon2_cffi +, bcrypt +, cryptography +, pytestCheckHook }: buildPythonPackage rec { @@ -15,9 +16,17 @@ buildPythonPackage rec { sha256 = "defd50f72b65c5402ab2c573830a6978e5f202ad0d984793c8dde2c4152ebe04"; }; - checkInputs = [ nose ]; - propagatedBuildInputs = [ bcrypt argon2_cffi ]; - propagatedNativeBuildInputs = [ argon2_cffi ]; + passthru.extras-require = { + argon2 = [ argon2_cffi ]; + bcrypt = [ bcrypt ]; + totp = [ cryptography ]; + }; + + checkInputs = [ + pytestCheckHook + ] ++ passthru.extras-require.argon2 + ++ passthru.extras-require.bcrypt + ++ passthru.extras-require.totp; meta = with lib; { description = "A password hashing library for Python"; diff --git a/pkgs/development/tools/devpi-server/default.nix b/pkgs/development/tools/devpi-server/default.nix index 8e78bebebe9..3f89bd4a1c5 100644 --- a/pkgs/development/tools/devpi-server/default.nix +++ b/pkgs/development/tools/devpi-server/default.nix @@ -46,7 +46,7 @@ buildPythonApplication rec { pyramid strictyaml waitress - ]; + ] ++ passlib.extras-require.argon2; checkInputs = [ beautifulsoup4 diff --git a/pkgs/servers/radicale/3.x.nix b/pkgs/servers/radicale/3.x.nix index 9867922d852..7171b4550fd 100644 --- a/pkgs/servers/radicale/3.x.nix +++ b/pkgs/servers/radicale/3.x.nix @@ -20,7 +20,7 @@ python3.pkgs.buildPythonApplication rec { passlib vobject python-dateutil - ]; + ] ++ passlib.extras-require.bcrypt; checkInputs = with python3.pkgs; [ pytestCheckHook From 921f4f96eae4a51fa8a7dee3f298355d0ef08c01 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 3 May 2022 03:31:52 +0000 Subject: [PATCH 133/147] python3Packages.relatorio: 0.10.0 -> 0.10.1 https://hg.tryton.org/relatorio/file/0.10.1/CHANGELOG --- .../python-modules/relatorio/default.nix | 34 ++++++++++++++++--- 1 file changed, 29 insertions(+), 5 deletions(-) diff --git a/pkgs/development/python-modules/relatorio/default.nix b/pkgs/development/python-modules/relatorio/default.nix index 3185213123c..86e53cde95d 100644 --- a/pkgs/development/python-modules/relatorio/default.nix +++ b/pkgs/development/python-modules/relatorio/default.nix @@ -1,24 +1,48 @@ -{ lib, fetchPypi, buildPythonPackage, genshi, lxml, python-magic }: +{ lib +, buildPythonPackage +, pythonOlder +, fetchPypi +, genshi +, lxml +, pyyaml +, python-magic +, pytestCheckHook +}: buildPythonPackage rec { pname = "relatorio"; - version = "0.10.0"; + version = "0.10.1"; + + disabled = pythonOlder "3.5"; + + format = "setuptools"; src = fetchPypi { inherit pname version; - sha256 = "6b9390eab696bdf569639ff58794fb9ef8ff19f94feea5b505a6ba06d0cfd026"; + sha256 = "a0c72302d50d5dfa433ddab191672eec1dde1c6ed26330a378b720e5a3012e23"; }; propagatedBuildInputs = [ genshi lxml - python-magic ]; + passthru.extras-require = { + chart = [ /* pycha */ pyyaml ]; + fodt = [ python-magic ]; + }; + + checkInputs = [ + pytestCheckHook + ] ++ passthru.extras-require.fodt; + + pythonImportsCheck = [ "relatorio" ]; + meta = { homepage = "https://relatorio.tryton.org/"; + changelog = "https://hg.tryton.org/relatorio/file/${version}/CHANGELOG"; description = "A templating library able to output odt and pdf files"; maintainers = with lib.maintainers; [ johbo ]; - license = lib.licenses.gpl3; + license = lib.licenses.gpl2Plus; }; } From 995979860bbbd9f31a31c0c306f857e4d2c2ecb2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 3 May 2022 03:44:32 +0000 Subject: [PATCH 134/147] python3Packages.trytond: 6.2.6 -> 6.4.0 https://hg.tryton.org/trytond/file/6.4.0/CHANGELOG --- .../python-modules/trytond/default.nix | 61 +++++++++---------- 1 file changed, 28 insertions(+), 33 deletions(-) diff --git a/pkgs/development/python-modules/trytond/default.nix b/pkgs/development/python-modules/trytond/default.nix index c2509c662d3..431342cf02d 100644 --- a/pkgs/development/python-modules/trytond/default.nix +++ b/pkgs/development/python-modules/trytond/default.nix @@ -1,9 +1,8 @@ { lib -, buildPythonApplication -, fetchpatch +, buildPythonPackage , fetchPypi , pythonOlder -, mock +, defusedxml , lxml , relatorio , genshi @@ -13,44 +12,30 @@ , werkzeug , wrapt , passlib -, pillow -, bcrypt , pydot , python-Levenshtein -, simplejson , html2text -, psycopg2 -, withPostgresql ? true +, weasyprint +, gevent +, pillow +, withPostgresql ? true, psycopg2 +, python }: -buildPythonApplication rec { +buildPythonPackage rec { pname = "trytond"; - version = "6.2.6"; + version = "6.4.0"; format = "setuptools"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - sha256 = "sha256-Sof6A9lxU70YnCbboJr56CAdTL0cRbaRNxdvG5Tnqnw="; + sha256 = "3c04d75c2a779b88b8c7ab6dd252cf4fc51f9546bf42760d10dbd1a17f61b288"; }; - patches = [ - (fetchpatch { - # werkzeug 2.1 compatibility for the tests - url = "https://github.com/tryton/trytond/commit/86a50ca06cf0d79404dbd731141ed29f8e9fcb9d.patch"; - hash = "sha256-xY5Sdhkd0lEgscV7NHwX2YWxobWqQFElY5BJvDT+we8="; - }) - ]; - - # Tells the tests which database to use - DB_NAME = ":memory:"; - - buildInputs = [ - mock - ]; - propagatedBuildInputs = [ + defusedxml lxml relatorio genshi @@ -59,20 +44,29 @@ buildPythonApplication rec { python-sql werkzeug wrapt - pillow passlib # extra dependencies - bcrypt pydot python-Levenshtein - simplejson html2text - ] ++ lib.optional withPostgresql psycopg2; + weasyprint + gevent + pillow + ] ++ relatorio.extras-require.fodt + ++ passlib.extras-require.bcrypt + ++ passlib.extras-require.argon2 + ++ lib.optional withPostgresql psycopg2; + + checkPhase = '' + runHook preCheck - # If unset, trytond will try to mkdir /homeless-shelter - preCheck = '' export HOME=$(mktemp -d) + export TRYTOND_DATABASE_URI="sqlite://" + export DB_NAME=":memory:"; + ${python.interpreter} -m unittest discover -s trytond.tests + + runHook postCheck ''; meta = with lib; { @@ -86,6 +80,7 @@ buildPythonApplication rec { modularity, scalability and security. ''; homepage = "http://www.tryton.org/"; + changelog = "https://hg.tryton.org/trytond/file/${version}/CHANGELOG"; license = licenses.gpl3Plus; maintainers = with maintainers; [ udono johbo ]; }; From c07476f4c596443a6d29d430526c0c510858a5fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 3 May 2022 05:19:38 +0000 Subject: [PATCH 135/147] privacyidea: fix sqlalchemy hash --- pkgs/applications/misc/privacyidea/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/applications/misc/privacyidea/default.nix b/pkgs/applications/misc/privacyidea/default.nix index 2a3a1a47410..225dfb93637 100644 --- a/pkgs/applications/misc/privacyidea/default.nix +++ b/pkgs/applications/misc/privacyidea/default.nix @@ -9,7 +9,7 @@ let version = "1.3.24"; src = oldAttrs.src.override { inherit version; - sha256 = "ebbb777cbf9312359b897bf81ba00dae0f5cb69fba2a18265dcc18a6f5ef7519"; + hash = "sha256-67t3fL+TEjWbiXv4G6ANrg9ctp+6KhgmXcwYpvXvdRk="; }; }); flask_migrate = super.flask_migrate.overridePythonAttrs (oldAttrs: rec { From a2675e7e293fe53d9ab3b0ac47b8814cf2c2adcb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Tue, 3 May 2022 14:07:00 -0700 Subject: [PATCH 136/147] python3Packages.twisted: use extras-require --- .../networking/syncplay/default.nix | 2 +- .../office/paperless-ngx/default.nix | 2 +- .../python-modules/buildbot/default.nix | 2 +- .../python-modules/treq/default.nix | 2 +- .../python-modules/twisted/default.nix | 23 ++++++++++++++++++- .../python-modules/txtorcon/default.nix | 2 +- .../networking/p2p/tahoe-lafs/default.nix | 3 ++- 7 files changed, 29 insertions(+), 7 deletions(-) diff --git a/pkgs/applications/networking/syncplay/default.nix b/pkgs/applications/networking/syncplay/default.nix index 4927bc51b23..96420ff04de 100644 --- a/pkgs/applications/networking/syncplay/default.nix +++ b/pkgs/applications/networking/syncplay/default.nix @@ -14,7 +14,7 @@ buildPythonApplication rec { }; propagatedBuildInputs = [ twisted certifi ] - ++ twisted.extras.tls + ++ twisted.extras-require.tls ++ lib.optional enableGUI pyside2; nativeBuildInputs = lib.optionals enableGUI [ qt5.wrapQtAppsHook ]; diff --git a/pkgs/applications/office/paperless-ngx/default.nix b/pkgs/applications/office/paperless-ngx/default.nix index dce6869f36e..17a1a56b769 100644 --- a/pkgs/applications/office/paperless-ngx/default.nix +++ b/pkgs/applications/office/paperless-ngx/default.nix @@ -122,7 +122,7 @@ py.pkgs.pythonPackages.buildPythonApplication rec { threadpoolctl tika tqdm - twisted.extras.tls + twisted.extras-require.tls txaio tzlocal urllib3 diff --git a/pkgs/development/python-modules/buildbot/default.nix b/pkgs/development/python-modules/buildbot/default.nix index 743c9f2c4b1..2eff37314e8 100644 --- a/pkgs/development/python-modules/buildbot/default.nix +++ b/pkgs/development/python-modules/buildbot/default.nix @@ -53,7 +53,7 @@ let unidiff ] # tls - ++ twisted.extras.tls; + ++ twisted.extras-require.tls; checkInputs = [ treq diff --git a/pkgs/development/python-modules/treq/default.nix b/pkgs/development/python-modules/treq/default.nix index c894d3103b9..1902a578ec2 100644 --- a/pkgs/development/python-modules/treq/default.nix +++ b/pkgs/development/python-modules/treq/default.nix @@ -20,7 +20,7 @@ buildPythonPackage rec { requests incremental twisted - ] ++ twisted.extras.tls; + ] ++ twisted.extras-require.tls; checkInputs = [ httpbin diff --git a/pkgs/development/python-modules/twisted/default.nix b/pkgs/development/python-modules/twisted/default.nix index 02a993fdf13..8bc03b1e5cf 100644 --- a/pkgs/development/python-modules/twisted/default.nix +++ b/pkgs/development/python-modules/twisted/default.nix @@ -1,5 +1,6 @@ { lib, stdenv , buildPythonPackage +, pythonOlder , fetchPypi , python , zope_interface @@ -14,11 +15,24 @@ , setuptools , idna , typing-extensions +, pyasn1 +, cryptography +, appdirs +, bcrypt +, pynacl +, pyserial +, h2 +, priority +, contextvars }: buildPythonPackage rec { pname = "Twisted"; version = "22.4.0"; + disabled = pythonOlder "3.6"; + + format = "setuptools"; + src = fetchPypi { inherit pname version; extension = "tar.gz"; @@ -27,7 +41,14 @@ buildPythonPackage rec { propagatedBuildInputs = [ zope_interface incremental automat constantly hyperlink pyhamcrest attrs setuptools typing-extensions ]; - passthru.extras.tls = [ pyopenssl service-identity idna ]; + passthru.extras-require = rec { + tls = [ pyopenssl service-identity idna ]; + conch = [ pyasn1 cryptography appdirs bcrypt ]; + conch_nacl = conch ++ [ pynacl ]; + serial = [ pyserial ]; + http2 = [ h2 priority ]; + contextvars = lib.optionals (pythonOlder "3.7") [ contextvars ]; + }; # Patch t.p._inotify to point to libc. Without this, # twisted.python.runtime.platform.supportsINotify() == False diff --git a/pkgs/development/python-modules/txtorcon/default.nix b/pkgs/development/python-modules/txtorcon/default.nix index 167e090fca0..7196e88e8dd 100644 --- a/pkgs/development/python-modules/txtorcon/default.nix +++ b/pkgs/development/python-modules/txtorcon/default.nix @@ -13,7 +13,7 @@ buildPythonPackage rec { propagatedBuildInputs = [ incremental twisted automat zope_interface - ] ++ twisted.extras.tls + ] ++ twisted.extras-require.tls ++ lib.optionals (!isPy3k) [ ipaddress ]; checkInputs = [ pytestCheckHook mock lsof GeoIP ]; diff --git a/pkgs/tools/networking/p2p/tahoe-lafs/default.nix b/pkgs/tools/networking/p2p/tahoe-lafs/default.nix index b0f4cd1f788..938bfa1dcd6 100644 --- a/pkgs/tools/networking/p2p/tahoe-lafs/default.nix +++ b/pkgs/tools/networking/p2p/tahoe-lafs/default.nix @@ -60,7 +60,8 @@ python3Packages.buildPythonApplication rec { html5lib magic-wormhole netifaces pyasn1 pycrypto pyutil pyyaml recommonmark service-identity simplejson sphinx_rtd_theme testtools treq twisted zfec zope_interface - ]; + ] ++ twisted.extras-require.tls + ++ twisted.extras-require.conch; checkInputs = with python3Packages; [ mock hypothesis twisted ]; From 9dc9e4344d1a0a2eac4b77253f6e2d75682dc2bd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 8 May 2022 20:34:06 +0000 Subject: [PATCH 137/147] getmail6: 6.18.6 -> 6.18.7 https://github.com/getmail6/getmail6/releases/tag/v6.18.7 --- pkgs/tools/networking/getmail6/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/tools/networking/getmail6/default.nix b/pkgs/tools/networking/getmail6/default.nix index dc508ff53ef..c31fe48d5b5 100644 --- a/pkgs/tools/networking/getmail6/default.nix +++ b/pkgs/tools/networking/getmail6/default.nix @@ -5,13 +5,13 @@ python3.pkgs.buildPythonApplication rec { pname = "getmail6"; - version = "6.18.6"; + version = "6.18.7"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "08a5yw6ll1kmd1ardj8rzhsw4wl48zzdc87g5lh4p5snv8w2m4ja"; + hash = "sha256-JghiV0zC9xtOGuGcf0lY5e73/04n6Bat/xOGgXyDWJk="; }; # needs a Docker setup @@ -28,6 +28,7 @@ python3.pkgs.buildPythonApplication rec { meta = with lib; { description = "A program for retrieving mail"; homepage = "https://getmail6.org"; + changelog = "https://github.com/getmail6/getmail6/blob/${src.rev}/docs/CHANGELOG"; license = licenses.gpl2Plus; maintainers = with maintainers; [ abbe dotlambda ]; }; From 2f677eae73fd58b85dcd82f85002c8550adc0a59 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= Date: Sun, 8 May 2022 00:26:44 +0000 Subject: [PATCH 138/147] imagemagick: 7.1.0-32 -> 7.1.0-33 --- pkgs/applications/graphics/ImageMagick/7.0.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/graphics/ImageMagick/7.0.nix b/pkgs/applications/graphics/ImageMagick/7.0.nix index 53b271b4d29..44d54014976 100644 --- a/pkgs/applications/graphics/ImageMagick/7.0.nix +++ b/pkgs/applications/graphics/ImageMagick/7.0.nix @@ -45,13 +45,13 @@ in stdenv.mkDerivation rec { pname = "imagemagick"; - version = "7.1.0-32"; + version = "7.1.0-33"; src = fetchFromGitHub { owner = "ImageMagick"; repo = "ImageMagick"; rev = version; - hash = "sha256-blDdNZJCyBdPEgdZXwgNUGSdSIwnqRaVLsLdFeA4JzQ="; + hash = "sha256-qiXTSQcc48IIzz7RUcyOH2w8JUOTdU1zg43gJhoELXo="; }; outputs = [ "out" "dev" "doc" ]; # bin/ isn't really big From 1d82f62aefd35988d9210942bbfeff1f677970d1 Mon Sep 17 00:00:00 2001 From: Niklaus Giger Date: Sun, 8 May 2022 22:40:52 +0200 Subject: [PATCH 139/147] UHK-agent: Support for Ultimate Hacking Keyboard udev-rules and configuration application (#132420) * maintainers: add ngiger * uhk-agent: init at 1.5.17 * Apply suggestions from code review * Update pkgs/os-specific/linux/uhk-agent/default.nix * Apply suggestions from code review * Update pkgs/os-specific/linux/uhk-agent/default.nix Co-authored-by: Sandro --- maintainers/maintainer-list.nix | 6 +++ nixos/modules/hardware/keyboard/uhk.nix | 21 ++++++++++ nixos/modules/module-list.nix | 1 + pkgs/os-specific/linux/uhk-agent/default.nix | 39 +++++++++++++++++++ .../linux/uhk-udev-rules/default.nix | 20 ++++++++++ pkgs/top-level/all-packages.nix | 4 ++ 6 files changed, 91 insertions(+) create mode 100644 nixos/modules/hardware/keyboard/uhk.nix create mode 100644 pkgs/os-specific/linux/uhk-agent/default.nix create mode 100644 pkgs/os-specific/linux/uhk-udev-rules/default.nix diff --git a/maintainers/maintainer-list.nix b/maintainers/maintainer-list.nix index 35616b4d212..e2d13c3b6b2 100644 --- a/maintainers/maintainer-list.nix +++ b/maintainers/maintainer-list.nix @@ -9026,6 +9026,12 @@ email = "nfjinjing@gmail.com"; name = "Jinjing Wang"; }; + ngiger = { + email = "niklaus.giger@member.fsf.org"; + github = "ngiger"; + githubId = 265800; + name = "Niklaus Giger"; + }; nh2 = { email = "mail@nh2.me"; matrix = "@nh2:matrix.org"; diff --git a/nixos/modules/hardware/keyboard/uhk.nix b/nixos/modules/hardware/keyboard/uhk.nix new file mode 100644 index 00000000000..bf2d739c3a9 --- /dev/null +++ b/nixos/modules/hardware/keyboard/uhk.nix @@ -0,0 +1,21 @@ +{ config, lib, pkgs, ... }: + +with lib; +let + cfg = config.hardware.keyboard.uhk; +in +{ + options.hardware.keyboard.uhk = { + enable = mkEnableOption '' + non-root access to the firmware of UHK keyboards. + You need it when you want to flash a new firmware on the keyboard. + Access to the keyboard is granted to users in the "input" group. + You may want to install the uhk-agent package. + ''; + + }; + + config = mkIf cfg.enable { + services.udev.packages = [ pkgs.uhk-udev-rules ]; + }; +} diff --git a/nixos/modules/module-list.nix b/nixos/modules/module-list.nix index dc658db8e2e..b3efa5d5e6f 100644 --- a/nixos/modules/module-list.nix +++ b/nixos/modules/module-list.nix @@ -57,6 +57,7 @@ ./hardware/sensor/hddtemp.nix ./hardware/sensor/iio.nix ./hardware/keyboard/teck.nix + ./hardware/keyboard/uhk.nix ./hardware/keyboard/zsa.nix ./hardware/ksm.nix ./hardware/ledger.nix diff --git a/pkgs/os-specific/linux/uhk-agent/default.nix b/pkgs/os-specific/linux/uhk-agent/default.nix new file mode 100644 index 00000000000..688a743fa9c --- /dev/null +++ b/pkgs/os-specific/linux/uhk-agent/default.nix @@ -0,0 +1,39 @@ +{ appimageTools, lib, fetchurl, polkit, udev }: +let + pname = "uhk-agent"; + version = "1.5.17"; + src = fetchurl { + url = "https://github.com/UltimateHackingKeyboard/agent/releases/download/v${version}/UHK.Agent-${version}-linux-x86_64.AppImage"; + name = "${pname}-${version}.AppImage"; + sha256 = "sha256-auOoTTRmkXVDDvcmRFzQIStNlbai8bTBLb/KUjk6EAc="; + }; + + appimageContents = appimageTools.extract { + name = "${pname}-${version}"; + inherit src; + }; +in appimageTools.wrapType2 { + inherit pname version src; + + extraPkgs = pkgs: with pkgs; [ polkit udev ]; + + extraInstallCommands = '' + mv $out/bin/${pname}-${version} $out/bin/${pname} + + install -m 444 -D ${appimageContents}/${pname}.desktop -t $out/share/applications + install -m 644 -D ${appimageContents}/resources/rules/50-uhk60.rules $out/rules/50-uhk60.rules + substituteInPlace $out/share/applications/${pname}.desktop \ + --replace 'Exec=AppRun' 'Exec=${pname}' + cp -r ${appimageContents}/usr/share/icons $out/share + ''; + # wrapType2 does not passthru pname+version + passthru.version = version; + + meta = with lib; { + description = "Agent is the configuration application of the Ultimate Hacking Keyboard"; + homepage = "https://github.com/UltimateHackingKeyboard/agent"; + license = licenses.unfreeRedistributable; + maintainers = with maintainers; [ ngiger ]; + platforms = [ "x86_64-linux" ]; + }; +} diff --git a/pkgs/os-specific/linux/uhk-udev-rules/default.nix b/pkgs/os-specific/linux/uhk-udev-rules/default.nix new file mode 100644 index 00000000000..bcb7799731f --- /dev/null +++ b/pkgs/os-specific/linux/uhk-udev-rules/default.nix @@ -0,0 +1,20 @@ +{ lib, stdenv, uhk-agent }: + +stdenv.mkDerivation { + pname = "uhk-udev-rules"; + inherit (uhk-agent) version; + + dontUnpack = true; + dontBuild = true; + installPhase = '' + runHook preInstall + install -D -m 644 ${uhk-agent.out}/rules/50-uhk60.rules $out/lib/udev/rules.d/50-uhk60.rules + runHook postInstall + ''; + + meta = { + description = "udev rules for UHK keyboards from https://ultimatehackingkeyboard.com"; + inherit (uhk-agent.meta) license; + maintainers = [ lib.maintainers.ngiger ]; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index aeaca927106..e24c269bbc2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -11147,6 +11147,10 @@ with pkgs; ugrep = callPackage ../tools/text/ugrep { }; + uhk-agent = callPackage ../os-specific/linux/uhk-agent { }; + + uhk-udev-rules = callPackage ../os-specific/linux/uhk-udev-rules { }; + uif2iso = callPackage ../tools/cd-dvd/uif2iso { }; uivonim = callPackage ../applications/editors/uivonim { }; From 56bd1c58b579655bbca5e0162fb6a2f22ea16f6e Mon Sep 17 00:00:00 2001 From: Artturin Date: Sun, 8 May 2022 23:48:19 +0300 Subject: [PATCH 140/147] swaylock: enable strictDeps and pull patch to fix cross --- pkgs/applications/window-managers/sway/lock.nix | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/window-managers/sway/lock.nix b/pkgs/applications/window-managers/sway/lock.nix index b70160b1dbf..970fdfe371f 100644 --- a/pkgs/applications/window-managers/sway/lock.nix +++ b/pkgs/applications/window-managers/sway/lock.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub +{ lib, stdenv, fetchFromGitHub, fetchpatch , meson, ninja, pkg-config, scdoc, wayland-scanner , wayland, wayland-protocols, libxkbcommon, cairo, gdk-pixbuf, pam }: @@ -14,6 +14,17 @@ stdenv.mkDerivation rec { sha256 = "sha256-VVGgidmSQWKxZNx9Cd6z52apxpxVfmX3Ut/G9kzfDcY="; }; + patches = [ + # remove once when updating to 1.7 + # https://github.com/swaywm/swaylock/pull/235 + (fetchpatch { + url = "https://github.com/swaywm/swaylock/commit/5a1e6ad79aa7d79b32d36cda39400f3e889b8f8f.diff"; + sha256 = "sha256-ZcZVImUzvng7sluC6q2B5UL8sVunLe4PIfc+tyw48RQ="; + }) + ]; + + strictDeps = true; + depsBuildBuild = [ pkg-config ]; nativeBuildInputs = [ meson ninja pkg-config scdoc wayland-scanner ]; buildInputs = [ wayland wayland-protocols libxkbcommon cairo gdk-pixbuf pam ]; From da4707d6366e0784116102743c58c89d98b7ac68 Mon Sep 17 00:00:00 2001 From: Artturin Date: Sun, 8 May 2022 23:56:15 +0300 Subject: [PATCH 141/147] window-managers/sway: enable strictDeps verified with https://github.com/Artturin/diffing/ --- pkgs/applications/window-managers/sway/bg.nix | 1 + pkgs/applications/window-managers/sway/contrib.nix | 4 +++- pkgs/applications/window-managers/sway/default.nix | 1 + pkgs/applications/window-managers/sway/idle.nix | 1 + pkgs/applications/window-managers/sway/lock-effects.nix | 4 +++- pkgs/applications/window-managers/sway/lock-fancy.nix | 4 +++- pkgs/applications/window-managers/sway/wrapper.nix | 1 + 7 files changed, 13 insertions(+), 3 deletions(-) diff --git a/pkgs/applications/window-managers/sway/bg.nix b/pkgs/applications/window-managers/sway/bg.nix index e98adefa447..7ef4a7d1f6a 100644 --- a/pkgs/applications/window-managers/sway/bg.nix +++ b/pkgs/applications/window-managers/sway/bg.nix @@ -15,6 +15,7 @@ stdenv.mkDerivation rec { hash = "sha256-Lt/hn/K+CjcmU3Bs5wChiZq0VGNcraH4tSVYsmYnKjc="; }; + strictDeps = true; depsBuildBuild = [ pkg-config ]; nativeBuildInputs = [ meson ninja pkg-config scdoc wayland-scanner ]; buildInputs = [ wayland wayland-protocols cairo gdk-pixbuf ]; diff --git a/pkgs/applications/window-managers/sway/contrib.nix b/pkgs/applications/window-managers/sway/contrib.nix index caf34e543b7..a221eb7a8e6 100644 --- a/pkgs/applications/window-managers/sway/contrib.nix +++ b/pkgs/applications/window-managers/sway/contrib.nix @@ -10,6 +10,7 @@ , slurp , grim , jq +, bash , python3Packages }: @@ -27,8 +28,9 @@ grimshot = stdenv.mkDerivation rec { outputs = [ "out" "man" ]; + strictDeps = true; nativeBuildInputs = [ makeWrapper installShellFiles ]; - + buildInputs = [ bash ]; installPhase = '' installManPage contrib/grimshot.1 diff --git a/pkgs/applications/window-managers/sway/default.nix b/pkgs/applications/window-managers/sway/default.nix index 727d9b4e6b3..1b662575134 100644 --- a/pkgs/applications/window-managers/sway/default.nix +++ b/pkgs/applications/window-managers/sway/default.nix @@ -49,6 +49,7 @@ stdenv.mkDerivation rec { ./sway-config-nixos-paths.patch ]; + strictDeps = true; depsBuildBuild = [ pkg-config ]; diff --git a/pkgs/applications/window-managers/sway/idle.nix b/pkgs/applications/window-managers/sway/idle.nix index da23386d41c..4b2909eac21 100644 --- a/pkgs/applications/window-managers/sway/idle.nix +++ b/pkgs/applications/window-managers/sway/idle.nix @@ -15,6 +15,7 @@ stdenv.mkDerivation rec { sha256 = "06iq12p4438d6bv3jlqsf01wjaxrzlnj1bnicn41kad563aq41xl"; }; + strictDeps = true; nativeBuildInputs = [ meson ninja pkg-config scdoc wayland-scanner ]; buildInputs = [ wayland wayland-protocols ] ++ lib.optionals systemdSupport [ systemd ]; diff --git a/pkgs/applications/window-managers/sway/lock-effects.nix b/pkgs/applications/window-managers/sway/lock-effects.nix index 9e919d3f88e..f186927f29f 100644 --- a/pkgs/applications/window-managers/sway/lock-effects.nix +++ b/pkgs/applications/window-managers/sway/lock-effects.nix @@ -8,6 +8,7 @@ , scdoc , wayland , wayland-protocols +, wayland-scanner , libxkbcommon , cairo , gdk-pixbuf @@ -36,7 +37,8 @@ stdenv.mkDerivation rec { sed -iE "s/version: '1\.3',/version: '${version}',/" meson.build ''; - nativeBuildInputs = [ meson ninja pkg-config scdoc ]; + strictDeps = true; + nativeBuildInputs = [ meson ninja pkg-config scdoc wayland-scanner]; buildInputs = [ wayland wayland-protocols libxkbcommon cairo gdk-pixbuf pam ]; mesonFlags = [ diff --git a/pkgs/applications/window-managers/sway/lock-fancy.nix b/pkgs/applications/window-managers/sway/lock-fancy.nix index 8c2a7e91649..8ca1dd77877 100644 --- a/pkgs/applications/window-managers/sway/lock-fancy.nix +++ b/pkgs/applications/window-managers/sway/lock-fancy.nix @@ -1,5 +1,5 @@ { lib, stdenv, fetchFromGitHub, coreutils, grim, gawk, jq, swaylock -, imagemagick, getopt, fontconfig, wmctrl, makeWrapper +, imagemagick, getopt, fontconfig, wmctrl, makeWrapper, bash }: let @@ -30,7 +30,9 @@ in stdenv.mkDerivation rec { --replace "/usr/share" "$out/share" ''; + strictDeps = true; nativeBuildInputs = [ makeWrapper ]; + buildInputs = [ bash ]; makeFlags = [ "PREFIX=${placeholder "out"}" ]; diff --git a/pkgs/applications/window-managers/sway/wrapper.nix b/pkgs/applications/window-managers/sway/wrapper.nix index c1f531683d7..1eb9693379e 100644 --- a/pkgs/applications/window-managers/sway/wrapper.nix +++ b/pkgs/applications/window-managers/sway/wrapper.nix @@ -37,6 +37,7 @@ in symlinkJoin { paths = (optional withBaseWrapper baseWrapper) ++ [ sway ]; + strictDeps = true; nativeBuildInputs = [ makeWrapper ] ++ (optional withGtkWrapper wrapGAppsHook); From 489e27efa8a8680fa3cb2cb089e81168ae4b0647 Mon Sep 17 00:00:00 2001 From: ajs124 Date: Sun, 8 May 2022 22:29:23 +0100 Subject: [PATCH 142/147] libressl_3_5: init at 3.5.2 --- pkgs/development/libraries/libressl/default.nix | 5 +++++ pkgs/top-level/all-packages.nix | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/libressl/default.nix b/pkgs/development/libraries/libressl/default.nix index 1ad63db733d..b4f71587204 100644 --- a/pkgs/development/libraries/libressl/default.nix +++ b/pkgs/development/libraries/libressl/default.nix @@ -90,4 +90,9 @@ in { version = "3.4.3"; sha256 = "sha256-/4i//jVIGLPM9UXjyv5FTFAxx6dyFwdPUzJx1jw38I0="; }; + + libressl_3_5 = generic { + version = "3.5.2"; + sha256 = "sha256-Vv6rjiHD+mVJ+LfXURZYuOmFGBYoOKeVMUcyZUrfPl8="; + }; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index e24c269bbc2..f6bbb1cd421 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -19954,7 +19954,8 @@ with pkgs; openvdb = callPackage ../development/libraries/openvdb {}; inherit (callPackages ../development/libraries/libressl { }) - libressl_3_4; + libressl_3_4 + libressl_3_5; libressl = libressl_3_4; From e4b550643cae8e0853277f106d38963364fccd16 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mustafa=20=C3=87al=C4=B1=C5=9Fkan?= Date: Mon, 9 May 2022 00:57:46 +0300 Subject: [PATCH 143/147] polymc: 1.2.1 -> 1.2.2 --- pkgs/games/polymc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/polymc/default.nix b/pkgs/games/polymc/default.nix index 4c5c8f6b780..4bb749db59f 100644 --- a/pkgs/games/polymc/default.nix +++ b/pkgs/games/polymc/default.nix @@ -18,13 +18,13 @@ mkDerivation rec { pname = "polymc"; - version = "1.2.1"; + version = "1.2.2"; src = fetchFromGitHub { owner = "PolyMC"; repo = "PolyMC"; rev = version; - sha256 = "sha256-pnMmmeIKAaX+z1YzzowotjaG/HKdiqcz2tJ5eGRR77I="; + sha256 = "sha256-lxiMz7vuq+BkNVjWWJbPUk68DSe8zVZPcvZ1iXDsfCY="; fetchSubmodules = true; }; From f7aaeb935564c74d1583ac519ab5be0ca1365f6a Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 9 May 2022 01:12:14 +0200 Subject: [PATCH 144/147] python3Packages.ukrainealarm: init at 0.0.1 --- .../python-modules/ukrainealarm/default.nix | 58 +++++++++++++++++++ pkgs/top-level/python-packages.nix | 2 + 2 files changed, 60 insertions(+) create mode 100644 pkgs/development/python-modules/ukrainealarm/default.nix diff --git a/pkgs/development/python-modules/ukrainealarm/default.nix b/pkgs/development/python-modules/ukrainealarm/default.nix new file mode 100644 index 00000000000..00854ded316 --- /dev/null +++ b/pkgs/development/python-modules/ukrainealarm/default.nix @@ -0,0 +1,58 @@ +{ lib +, buildPythonPackage +, fetchFromGitHub + +# build time +, setuptools-scm + +# propagates +, aiohttp + +# tests +, pytestCheckHook +}: + +let + pname = "ukrainealarm"; + version = "0.0.1"; +in + +buildPythonPackage { + inherit pname version; + format = "setuptools"; + + src = fetchFromGitHub { + owner = "PaulAnnekov"; + repo = pname; + rev = "v${version}"; + hash = "sha256-0gsxXQiSkJIM/I0VYsjdCCB3NjPr6QJbD/rBkGrwtW8="; + }; + + SETUPTOOLS_SCM_PRETEND_VERSION = version; + + nativeBuildInputs = [ + setuptools-scm + ]; + + propagatedBuildInputs = [ + aiohttp + ]; + + checkInputs = [ + pytestCheckHook + ]; + + pythonImportsCheck = [ + "ukrainealarm" + "ukrainealarm.client" + ]; + + meta = with lib; { + changelog = "https://github.com/PaulAnnekov/ukrainealarm/releases/tag/v${version}"; + description = "Implements api.ukrainealarm.com API that returns info about Ukraine air raid alarms"; + homepage = "https://github.com/PaulAnnekov/ukrainealarm"; + license = licenses.mit; + maintainers = with maintainers; [ hexa ]; + }; +} + diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 638c770ae95..d1fb7241b81 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -10579,6 +10579,8 @@ in { ukpostcodeparser = callPackage ../development/python-modules/ukpostcodeparser { }; + ukrainealarm = callPackage ../development/python-modules/ukrainealarm { }; + umalqurra = callPackage ../development/python-modules/umalqurra { }; umap-learn = callPackage ../development/python-modules/umap-learn { }; From 0d5fb7da36b483f410036a6ca503c7cebf0b9fd9 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Sun, 8 May 2022 23:50:51 +0200 Subject: [PATCH 145/147] home-assistant: 2022.5.2 -> 2022.5.3 https://github.com/home-assistant/core/releases/tag/2022.5.3 https://www.home-assistant.io/blog/2022/05/08/ukraine-alarm/ --- pkgs/servers/home-assistant/component-packages.nix | 6 +++++- pkgs/servers/home-assistant/default.nix | 4 ++-- pkgs/servers/home-assistant/frontend.nix | 4 ++-- 3 files changed, 9 insertions(+), 5 deletions(-) diff --git a/pkgs/servers/home-assistant/component-packages.nix b/pkgs/servers/home-assistant/component-packages.nix index afed37e315d..bfaf4f6f76d 100644 --- a/pkgs/servers/home-assistant/component-packages.nix +++ b/pkgs/servers/home-assistant/component-packages.nix @@ -2,7 +2,7 @@ # Do not edit! { - version = "2022.5.2"; + version = "2022.5.3"; components = { "abode" = ps: with ps; [ abodepy @@ -2823,6 +2823,9 @@ ]; "uk_transport" = ps: with ps; [ ]; + "ukraine_alarm" = ps: with ps; [ + ukrainealarm + ]; "unifi" = ps: with ps; [ aiounifi ]; @@ -3710,6 +3713,7 @@ "twinkly" "twitch" "uk_transport" + "ukraine_alarm" "unifi" "unifi_direct" "universal" diff --git a/pkgs/servers/home-assistant/default.nix b/pkgs/servers/home-assistant/default.nix index 61f207fadb1..7e47140a27b 100644 --- a/pkgs/servers/home-assistant/default.nix +++ b/pkgs/servers/home-assistant/default.nix @@ -179,7 +179,7 @@ let extraPackagesFile = writeText "home-assistant-packages" (lib.concatMapStringsSep "\n" (pkg: pkg.pname) extraBuildInputs); # Don't forget to run parse-requirements.py after updating - hassVersion = "2022.5.2"; + hassVersion = "2022.5.3"; in python.pkgs.buildPythonApplication rec { pname = "homeassistant"; @@ -197,7 +197,7 @@ in python.pkgs.buildPythonApplication rec { owner = "home-assistant"; repo = "core"; rev = version; - hash = "sha256-n8lM1Z5fkZRW0E9J7nPRYntoaUuug9XPoRAKl+5XC6Y="; + hash = "sha256-g15bMS6xOz6w7JLSVP/tqlKBGWkFsG093GF7fcoHvlg="; }; # leave this in, so users don't have to constantly update their downstream patch handling diff --git a/pkgs/servers/home-assistant/frontend.nix b/pkgs/servers/home-assistant/frontend.nix index 98fe3a04e2b..cbfd57d5f93 100644 --- a/pkgs/servers/home-assistant/frontend.nix +++ b/pkgs/servers/home-assistant/frontend.nix @@ -4,7 +4,7 @@ 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 = "20220504.0"; + version = "20220504.1"; format = "wheel"; src = fetchPypi { @@ -12,7 +12,7 @@ buildPythonPackage rec { pname = "home_assistant_frontend"; dist = "py3"; python = "py3"; - sha256 = "sha256-CYhUId5SGfPX9beAZH0ZemwciVDxchbDcTvQcRhJwog="; + sha256 = "sha256-EU9I/0+EmcNr7eYq3Z5J5/KiWu+Qz0+wn7UZMJFBxp0="; }; # there is nothing to strip in this package From 419af30452f089f5b07820485b4df4703160713d Mon Sep 17 00:00:00 2001 From: Sophie Taylor Date: Mon, 9 May 2022 09:23:01 +1000 Subject: [PATCH 146/147] Enable multithreading for cfitsio (#168579) --- .../development/libraries/science/astronomy/cfitsio/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/libraries/science/astronomy/cfitsio/default.nix b/pkgs/development/libraries/science/astronomy/cfitsio/default.nix index 3be249531bb..e7e8dd04b07 100644 --- a/pkgs/development/libraries/science/astronomy/cfitsio/default.nix +++ b/pkgs/development/libraries/science/astronomy/cfitsio/default.nix @@ -13,7 +13,7 @@ stdenv.mkDerivation rec { patches = [ ./darwin-rpath-universal.patch ]; - configureFlags = [ "--with-bzip2=${bzip2.out}" ]; + configureFlags = [ "--with-bzip2=${bzip2.out}" "--enable-reentrant" ]; hardeningDisable = [ "format" ]; From e1309bdbd4a6cff21a21782c29f9eea6b47145b1 Mon Sep 17 00:00:00 2001 From: Mostly Void Date: Mon, 9 May 2022 05:23:13 +0530 Subject: [PATCH 147/147] rofi-rbw : init at 0.5.0 (#171160) Co-authored-by: P. Co-authored-by: Sandro --- pkgs/applications/misc/rofi-rbw/default.nix | 26 +++++++++++++++++++++ pkgs/top-level/all-packages.nix | 2 ++ 2 files changed, 28 insertions(+) create mode 100644 pkgs/applications/misc/rofi-rbw/default.nix diff --git a/pkgs/applications/misc/rofi-rbw/default.nix b/pkgs/applications/misc/rofi-rbw/default.nix new file mode 100644 index 00000000000..6a631d5a950 --- /dev/null +++ b/pkgs/applications/misc/rofi-rbw/default.nix @@ -0,0 +1,26 @@ +{ lib, buildPythonApplication, fetchFromGitHub, configargparse }: + +buildPythonApplication rec { + pname = "rofi-rbw"; + version = "0.5.0"; + format = "pyproject"; + + src = fetchFromGitHub { + owner = "fdw"; + repo = "rofi-rbw"; + rev = version; + hash = "sha256-1RDwb8lKls6+X/XtARbi4F7sK4nT03Iy3Wb9N1LEa5o="; + }; + + propagatedBuildInputs = [ configargparse ]; + + pythonImportsCheck = [ "rofi_rbw" ]; + + meta = with lib; { + description = "Rofi frontend for Bitwarden"; + homepage = "https://github.com/fdw/rofi-rbw"; + license = licenses.mit; + maintainers = with maintainers; [ dit7ya ]; + platforms = platforms.linux; + }; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 08631932fa5..3614e65d4f1 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -28225,6 +28225,8 @@ with pkgs; rofi-pulse-select = callPackage ../applications/audio/rofi-pulse-select { }; + rofi-rbw = python3Packages.callPackage ../applications/misc/rofi-rbw { }; + rofi-vpn = callPackage ../applications/networking/rofi-vpn { }; ympd = callPackage ../applications/audio/ympd { };