diff --git a/nixos/modules/system/boot/stage-2-init.sh b/nixos/modules/system/boot/stage-2-init.sh index 9f8d86da6b00..096a051f8684 100755 --- a/nixos/modules/system/boot/stage-2-init.sh +++ b/nixos/modules/system/boot/stage-2-init.sh @@ -89,6 +89,11 @@ else fi +# Required by the activation script +install -m 0755 -d /etc /etc/nixos +install -m 01777 -d /tmp + + # Run the script that performs all configuration activation that does # not have to be done at boot time. echo "running activation script..." diff --git a/nixos/modules/system/boot/systemd/tmpfiles.nix b/nixos/modules/system/boot/systemd/tmpfiles.nix index edbe59965560..97d60e9d6527 100644 --- a/nixos/modules/system/boot/systemd/tmpfiles.nix +++ b/nixos/modules/system/boot/systemd/tmpfiles.nix @@ -102,7 +102,6 @@ in ]; systemd.tmpfiles.rules = [ - "d /etc/nixos 0755 root root - -" "d /nix/var 0755 root root - -" "L+ /nix/var/nix/gcroots/booted-system 0755 root root - /run/booted-system" "d /run/lock 0755 root root - -" diff --git a/nixos/tests/boot.nix b/nixos/tests/boot.nix index 8e469a654972..ec2a9f6527c9 100644 --- a/nixos/tests/boot.nix +++ b/nixos/tests/boot.nix @@ -42,7 +42,7 @@ let nodes = { }; testScript = '' - nodes.machine = create_machine(${machineConfig}) + machine = create_machine(${machineConfig}) machine.start() machine.wait_for_unit("multi-user.target") machine.succeed("nix store verify --no-trust -r --option experimental-features nix-command /run/current-system") @@ -83,7 +83,7 @@ let name = "boot-netboot-" + name; nodes = { }; testScript = '' - nodes.machine = create_machine(${machineConfig}) + machine = create_machine(${machineConfig}) machine.start() machine.wait_for_unit("multi-user.target") machine.shutdown() @@ -138,7 +138,7 @@ in { if os.system("qemu-img create -f qcow2 -F raw -b ${sdImage} ${mutableImage}") != 0: raise RuntimeError("Could not create mutable linked image") - nodes.machine = create_machine(${machineConfig}) + machine = create_machine(${machineConfig}) machine.start() machine.wait_for_unit("multi-user.target") machine.succeed("nix store verify -r --no-trust --option experimental-features nix-command /run/current-system") diff --git a/nixos/tests/hibernate.nix b/nixos/tests/hibernate.nix index f81033b846ae..032ac6527bc7 100644 --- a/nixos/tests/hibernate.nix +++ b/nixos/tests/hibernate.nix @@ -39,7 +39,7 @@ in makeTest { nodes = { # System configuration used for installing the installedConfig from above. - nodes.machine = { config, lib, pkgs, ... }: with lib; { + machine = { config, lib, pkgs, ... }: with lib; { imports = [ ../modules/profiles/installation-device.nix ../modules/profiles/base.nix diff --git a/pkgs/applications/networking/cluster/arkade/default.nix b/pkgs/applications/networking/cluster/arkade/default.nix index e66343270cac..297e12a80a20 100644 --- a/pkgs/applications/networking/cluster/arkade/default.nix +++ b/pkgs/applications/networking/cluster/arkade/default.nix @@ -6,18 +6,18 @@ buildGoModule rec { pname = "arkade"; - version = "0.8.16"; + version = "0.8.18"; src = fetchFromGitHub { owner = "alexellis"; repo = "arkade"; rev = version; - sha256 = "sha256-NiUv7yl1nA7a826FHDF+1MhYscXkQjUpxZo2ZWrL+VQ="; + sha256 = "sha256-VQI2eAxOkOkwYkTM/UyyK6lnXFoLFHWE/ekm5qLN9OE="; }; CGO_ENABLED = 0; - vendorSha256 = "sha256-ipLVzBkliQSPBZTL5FU8xosTVjxFsUVlAvO0a0q+j2o="; + vendorSha256 = "sha256-An52QMjHaHRIicxCBpjgi+S2QeKXhB9rndjV+FIkS3c="; # Exclude pkg/get: tests downloading of binaries which fail when sandbox=true subPackages = [ @@ -42,6 +42,6 @@ buildGoModule rec { homepage = "https://github.com/alexellis/arkade"; description = "Open Source Kubernetes Marketplace"; license = licenses.mit; - maintainers = with maintainers; [ welteki ]; + maintainers = with maintainers; [ welteki techknowlogick ]; }; } diff --git a/pkgs/development/compilers/cudatoolkit/default.nix b/pkgs/development/compilers/cudatoolkit/default.nix index 65e9eb827605..4fa99f80c8e3 100644 --- a/pkgs/development/compilers/cudatoolkit/default.nix +++ b/pkgs/development/compilers/cudatoolkit/default.nix @@ -86,5 +86,9 @@ rec { gcc = gcc10; # can bump to 11 along with stdenv.cc }; + # Make sure to only ever update this to a version that is compatible with the + # latest cudnn, nccl, cutensor, etc! It sometimes happens that CUDA versions + # are released prior to compatibility with the rest of the ecosystem. And + # don't forget to request a review from @NixOS/cuda-maintainers! cudatoolkit_11 = cudatoolkit_11_5; } diff --git a/pkgs/development/libraries/gdal/default.nix b/pkgs/development/libraries/gdal/default.nix index bfa1c75b483f..bec478c66bd9 100644 --- a/pkgs/development/libraries/gdal/default.nix +++ b/pkgs/development/libraries/gdal/default.nix @@ -86,6 +86,46 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + doInstallCheck = true; + # preCheck rather than preInstallCheck because this is what pytestCheckHook + # calls (coming from the python world) + preCheck = '' + pushd ../autotest + # something has made files here read-only by this point + chmod -R u+w . + + export HOME=$(mktemp -d) + export PYTHONPATH="$out/${pythonPackages.python.sitePackages}:$PYTHONPATH" + ''; + installCheckInputs = with pythonPackages; [ + pytestCheckHook + pytest-env + lxml + ]; + disabledTestPaths = [ + # tests that attempt to make network requests + "gcore/vsis3.py" + "gdrivers/gdalhttp.py" + "gdrivers/wms.py" + ]; + disabledTests = [ + # tests that attempt to make network requests + "test_jp2openjpeg_45" + # tests that require the full proj dataset which we don't package yet + # https://github.com/OSGeo/gdal/issues/5523 + "test_transformer_dem_overrride_srs" + "test_osr_ct_options_area_of_interest" + ] ++ lib.optionals (!stdenv.isx86_64) [ + # likely precision-related expecting x87 behaviour + "test_jp2openjpeg_22" + ] ++ lib.optionals stdenv.isDarwin [ + # flaky on macos + "test_rda_download_queue" + ]; + postCheck = '' + popd # ../autotest + ''; + meta = { description = "Translator library for raster geospatial data formats"; homepage = "https://www.gdal.org/"; diff --git a/pkgs/development/libraries/science/math/cudnn/default.nix b/pkgs/development/libraries/science/math/cudnn/default.nix index d05cc3f90ec0..a3f785c5b38f 100644 --- a/pkgs/development/libraries/science/math/cudnn/default.nix +++ b/pkgs/development/libraries/science/math/cudnn/default.nix @@ -81,31 +81,27 @@ rec { cudnn_8_1_cudatoolkit_11_2 = cudnn_8_1_cudatoolkit_10_2.override { cudatoolkit = cudatoolkit_11_2; }; cudnn_8_1_cudatoolkit_10 = cudnn_8_1_cudatoolkit_10_2.override { cudatoolkit = cudatoolkit_10; }; - cudnn_8_1_cudatoolkit_11 = cudnn_8_1_cudatoolkit_10_2.override { cudatoolkit = cudatoolkit_11; }; # cuDNN 8.3 is necessary for the latest jaxlib, esp. jaxlib-bin. See # https://github.com/google/jax/discussions/9455 for more info. - cudnn_8_3_cudatoolkit_10_2 = - generic - rec { - version = "8.3.2"; - cudatoolkit = cudatoolkit_10_2; - # See https://docs.nvidia.com/deeplearning/cudnn/archives/cudnn-832/support-matrix/index.html#cudnn-cuda-hardware-versions. - minCudaVersion = "10.2.00000"; - maxCudaVersion = "11.5.99999"; - mkSrc = cudatoolkit: - let v = if lib.versions.majorMinor cudatoolkit.version == "10.2" then "10.2" else "11.5"; in - fetchurl { - # Starting at version 8.3.1 there's a new directory layout including - # a subdirectory `local_installers`. - url = "https://developer.download.nvidia.com/compute/redist/cudnn/v${version}/local_installers/${v}/cudnn-linux-x86_64-8.3.2.44_cuda${v}-archive.tar.xz"; - hash = { - "10.2" = "sha256-1vVu+cqM+PketzIQumw9ykm6REbBZhv6/lXB7EC2aaw="; - "11.5" = "sha256-VQCVPAjF5dHd3P2iNPnvvdzb5DpTsm3AqCxyP6FwxFc="; - }."${v}"; - }; - } - ; + cudnn_8_3_cudatoolkit_10_2 = generic rec { + version = "8.3.2"; + cudatoolkit = cudatoolkit_10_2; + # See https://docs.nvidia.com/deeplearning/cudnn/archives/cudnn-832/support-matrix/index.html#cudnn-cuda-hardware-versions. + minCudaVersion = "10.2.00000"; + maxCudaVersion = "11.5.99999"; + mkSrc = cudatoolkit: + let v = if lib.versions.majorMinor cudatoolkit.version == "10.2" then "10.2" else "11.5"; in + fetchurl { + # Starting at version 8.3.1 there's a new directory layout including + # a subdirectory `local_installers`. + url = "https://developer.download.nvidia.com/compute/redist/cudnn/v${version}/local_installers/${v}/cudnn-linux-x86_64-8.3.2.44_cuda${v}-archive.tar.xz"; + hash = { + "10.2" = "sha256-1vVu+cqM+PketzIQumw9ykm6REbBZhv6/lXB7EC2aaw="; + "11.5" = "sha256-VQCVPAjF5dHd3P2iNPnvvdzb5DpTsm3AqCxyP6FwxFc="; + }."${v}"; + }; + }; cudnn_8_3_cudatoolkit_11_0 = cudnn_8_3_cudatoolkit_10_2.override { cudatoolkit = cudatoolkit_11_0; }; cudnn_8_3_cudatoolkit_11_1 = cudnn_8_3_cudatoolkit_10_2.override { cudatoolkit = cudatoolkit_11_1; }; cudnn_8_3_cudatoolkit_11_2 = cudnn_8_3_cudatoolkit_10_2.override { cudatoolkit = cudatoolkit_11_2; }; diff --git a/pkgs/development/libraries/science/math/cutensor/default.nix b/pkgs/development/libraries/science/math/cutensor/default.nix index 25633ca63e6b..d0d24bd1adbe 100644 --- a/pkgs/development/libraries/science/math/cutensor/default.nix +++ b/pkgs/development/libraries/science/math/cutensor/default.nix @@ -1,6 +1,14 @@ { callPackage -, cudatoolkit_10_1, cudatoolkit_10_2 -, cudatoolkit_11_0, cudatoolkit_11_1, cudatoolkit_11_2, cudatoolkit_11_3, cudatoolkit_11_4 +, cudatoolkit_10_1 +, cudatoolkit_10_2 +, cudatoolkit_11 +, cudatoolkit_11_0 +, cudatoolkit_11_1 +, cudatoolkit_11_2 +, cudatoolkit_11_3 +, cudatoolkit_11_4 +, cudatoolkit_11_5 +, cudatoolkit_11_6 }: rec { @@ -8,18 +16,18 @@ rec { version = "1.2.2.5"; libPath = "lib/10.1"; cudatoolkit = cudatoolkit_10_1; - # 1.2.2 is compatible with CUDA 11.0, 11.1, and 11.2: - # ephemeral doc at https://developer.nvidia.com/cutensor/downloads - sha256 = "1dl9bd71frhac9cb8lvnh71zfsnqxbxbfhndvva2zf6nh0my4klm"; + # 1.2.2 is compatible with CUDA 10.1, 10.2, and 11.x. + # See https://docs.nvidia.com/cuda/cutensor/release_notes.html#cutensor-v1-2-2. + hash = "sha256-lU7iK4DWuC/U3s1Ct/rq2Gr3w4F2U7RYYgpmF05bibY="; }; cutensor_cudatoolkit_10_2 = cutensor_cudatoolkit_10_1.override { version = "1.3.1.3"; libPath = "lib/10.2"; cudatoolkit = cudatoolkit_10_2; - # 1.3.1 is compatible with CUDA 11.0, 11.1, and 11.2: - # ephemeral doc at https://developer.nvidia.com/cutensor/downloads - sha256 = "sha256-mNlVnabB2IC3HnYY0mb06RLqQzDxN9ePGVeBy3hkBC8="; + # 1.3.1 is compatible with CUDA 10.2 and 11.x. + # See https://docs.nvidia.com/cuda/cutensor/release_notes.html#cutensor-v1-3-1. + hash = "sha256-mNlVnabB2IC3HnYY0mb06RLqQzDxN9ePGVeBy3hkBC8="; }; cutensor_cudatoolkit_10 = cutensor_cudatoolkit_10_2; @@ -29,21 +37,12 @@ rec { cudatoolkit = cudatoolkit_11_0; }; - cutensor_cudatoolkit_11_1 = cutensor_cudatoolkit_11_0.override { - cudatoolkit = cudatoolkit_11_1; - }; + cutensor_cudatoolkit_11_1 = cutensor_cudatoolkit_11_0.override { cudatoolkit = cudatoolkit_11_1; }; + cutensor_cudatoolkit_11_2 = cutensor_cudatoolkit_11_0.override { cudatoolkit = cudatoolkit_11_2; }; + cutensor_cudatoolkit_11_3 = cutensor_cudatoolkit_11_0.override { cudatoolkit = cudatoolkit_11_3; }; + cutensor_cudatoolkit_11_4 = cutensor_cudatoolkit_11_0.override { cudatoolkit = cudatoolkit_11_4; }; + cutensor_cudatoolkit_11_5 = cutensor_cudatoolkit_11_0.override { cudatoolkit = cudatoolkit_11_5; }; + cutensor_cudatoolkit_11_6 = cutensor_cudatoolkit_11_0.override { cudatoolkit = cudatoolkit_11_6; }; - cutensor_cudatoolkit_11_2 = cutensor_cudatoolkit_11_0.override { - cudatoolkit = cudatoolkit_11_2; - }; - - cutensor_cudatoolkit_11_3 = cutensor_cudatoolkit_11_0.override { - cudatoolkit = cudatoolkit_11_3; - }; - - cutensor_cudatoolkit_11_4 = cutensor_cudatoolkit_11_0.override { - cudatoolkit = cudatoolkit_11_4; - }; - - cutensor_cudatoolkit_11 = cutensor_cudatoolkit_11_4; + cutensor_cudatoolkit_11 = cutensor_cudatoolkit_11_0.override { cudatoolkit = cudatoolkit_11; }; } diff --git a/pkgs/development/libraries/science/math/cutensor/generic.nix b/pkgs/development/libraries/science/math/cutensor/generic.nix index 0b2bd31b2c30..e7c5e0b298c0 100644 --- a/pkgs/development/libraries/science/math/cutensor/generic.nix +++ b/pkgs/development/libraries/science/math/cutensor/generic.nix @@ -7,7 +7,7 @@ , addOpenGLRunpath , version -, sha256 +, hash }: let @@ -21,7 +21,7 @@ stdenv.mkDerivation { src = fetchurl { url = "https://developer.download.nvidia.com/compute/cutensor/${mostOfVersion}/local_installers/libcutensor-${stdenv.hostPlatform.parsed.kernel.name}-${stdenv.hostPlatform.parsed.cpu.name}-${version}.tar.gz"; - inherit sha256; + inherit hash; }; outputs = [ "out" "dev" ]; diff --git a/pkgs/development/libraries/science/math/nccl/default.nix b/pkgs/development/libraries/science/math/nccl/default.nix index 5036ad890799..c08b5aa5851d 100644 --- a/pkgs/development/libraries/science/math/nccl/default.nix +++ b/pkgs/development/libraries/science/math/nccl/default.nix @@ -38,6 +38,10 @@ stdenv.mkDerivation rec { enableParallelBuilding = true; + passthru = { + inherit cudatoolkit; + }; + meta = with lib; { description = "Multi-GPU and multi-node collective communication primitives for NVIDIA GPUs"; homepage = "https://developer.nvidia.com/nccl"; diff --git a/pkgs/development/ocaml-modules/type_conv/108.08.00.nix b/pkgs/development/ocaml-modules/type_conv/108.08.00.nix deleted file mode 100644 index fb3977223f7e..000000000000 --- a/pkgs/development/ocaml-modules/type_conv/108.08.00.nix +++ /dev/null @@ -1,31 +0,0 @@ -{ lib, stdenv, fetchurl, ocaml, findlib, camlp4 }: - -if !lib.versionAtLeast ocaml.version "3.12" - || lib.versionAtLeast ocaml.version "4.03" -then throw "type_conv-108.08.00 is not available for OCaml ${ocaml.version}" else - -stdenv.mkDerivation rec { - pname = "ocaml-type_conv"; - version = "108.08.00"; - - src = fetchurl { - url = "https://ocaml.janestreet.com/ocaml-core/${version}/individual/type_conv-${version}.tar.gz"; - sha256 = "08ysikwwp69zvc147lzzg79nwlrzrk738rj0ggcfadi8h5il42sl"; - }; - - nativeBuildInputs = [ ocaml findlib ]; - buildInputs = [ camlp4 ]; - - strictDeps = true; - - createFindlibDestdir = true; - - meta = with lib; { - homepage = "https://ocaml.janestreet.com/"; - description = "Support library for OCaml preprocessor type conversions"; - license = licenses.asl20; - branch = "108"; - platforms = ocaml.meta.platforms or [ ]; - maintainers = with maintainers; [ maggesi ]; - }; -} diff --git a/pkgs/development/ocaml-modules/type_conv/109.60.01.nix b/pkgs/development/ocaml-modules/type_conv/109.60.01.nix deleted file mode 100644 index 1f6500c6ed17..000000000000 --- a/pkgs/development/ocaml-modules/type_conv/109.60.01.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ stdenv, lib, fetchFromGitHub, ocaml, findlib, camlp4 }: - -if !lib.versionAtLeast ocaml.version "4.00" - || lib.versionAtLeast ocaml.version "4.03" -then throw "type_conv-109.60.01 is not available for OCaml ${ocaml.version}" else - -stdenv.mkDerivation rec { - pname = "ocaml-type_conv"; - version = "109.60.01"; - - src = fetchFromGitHub { - owner = "janestreet"; - repo = "type_conv"; - rev = version; - sha256 = "sha256-8Oz/fPL3+RghyxQp5u6seSEdf0BgfP6XNcsMYty0rNs="; - }; - - nativeBuildInputs = [ ocaml findlib ]; - buildInputs = [ camlp4 ]; - - strictDeps = true; - - createFindlibDestdir = true; - - meta = { - homepage = "http://forge.ocamlcore.org/projects/type-conv/"; - description = "Support library for OCaml preprocessor type conversions"; - license = lib.licenses.lgpl21; - platforms = ocaml.meta.platforms or [ ]; - maintainers = with lib.maintainers; [ maggesi ]; - }; -} diff --git a/pkgs/development/ocaml-modules/type_conv/112.01.01.nix b/pkgs/development/ocaml-modules/type_conv/112.01.01.nix deleted file mode 100644 index 468b872ec3d0..000000000000 --- a/pkgs/development/ocaml-modules/type_conv/112.01.01.nix +++ /dev/null @@ -1,26 +0,0 @@ -{ lib, fetchFromGitHub, buildOcaml, camlp4}: - -buildOcaml rec { - minimumSupportedOcamlVersion = "4.02"; - - pname = "type_conv"; - version = "113.00.02"; - - src = fetchFromGitHub { - owner = "janestreet"; - repo = "type_conv"; - rev = version; - sha256 = "sha256-HzH0hnceCQ2kDRATjl+tfKk3XSBDsGnPzVUGYpDQUmU="; - }; - - strictDeps = true; - - buildInputs = [ camlp4 ]; - - meta = { - homepage = "https://github.com/janestreet/type_conv/"; - description = "Support library for preprocessor type conversions"; - license = lib.licenses.asl20; - maintainers = with lib.maintainers; [ maggesi ericbmerritt ]; - }; -} diff --git a/pkgs/development/python-modules/awscrt/default.nix b/pkgs/development/python-modules/awscrt/default.nix index 77c67e5a2aed..6197914f435b 100644 --- a/pkgs/development/python-modules/awscrt/default.nix +++ b/pkgs/development/python-modules/awscrt/default.nix @@ -12,14 +12,14 @@ buildPythonPackage rec { pname = "awscrt"; - version = "0.13.6"; + version = "0.13.7"; format = "setuptools"; disabled = pythonOlder "3.6"; src = fetchPypi { inherit pname version; - hash = "sha256-aZ1Mquc4IfrdWjOaHMipjNb6gLGGbdKS8ah5b33eqGo="; + hash = "sha256-FCmdYuXh8+nWfeGbJ9IhfwASFsZoxOp7jL+5/TrtG5Q="; }; buildInputs = lib.optionals stdenv.isDarwin [ diff --git a/pkgs/development/python-modules/cupy/default.nix b/pkgs/development/python-modules/cupy/default.nix index 2ae38e50513a..a798920ef7a8 100644 --- a/pkgs/development/python-modules/cupy/default.nix +++ b/pkgs/development/python-modules/cupy/default.nix @@ -5,6 +5,10 @@ , addOpenGLRunpath }: +assert cudnn.cudatoolkit == cudatoolkit; +assert cutensor.cudatoolkit == cudatoolkit; +assert nccl.cudatoolkit == cudatoolkit; + buildPythonPackage rec { pname = "cupy"; version = "10.2.0"; @@ -15,8 +19,15 @@ buildPythonPackage rec { sha256 = "sha256-5ovvA76QGOsOnVztMfDgLerks5nJrKR08rLc+ArmWA8="; }; + # See https://docs.cupy.dev/en/v10.2.0/reference/environment.html. Seting both + # CUPY_NUM_BUILD_JOBS and CUPY_NUM_NVCC_THREADS to NIX_BUILD_CORES results in + # a small amount of thrashing but it turns out there are a large number of + # very short builds and a few extremely long ones, so setting both ends up + # working nicely in practice. preConfigure = '' export CUDA_PATH=${cudatoolkit} + export CUPY_NUM_BUILD_JOBS="$NIX_BUILD_CORES" + export CUPY_NUM_NVCC_THREADS="$NIX_BUILD_CORES" ''; nativeBuildInputs = [ diff --git a/pkgs/development/python-modules/immutables/default.nix b/pkgs/development/python-modules/immutables/default.nix index 896db29f2c1a..83d6336fe597 100644 --- a/pkgs/development/python-modules/immutables/default.nix +++ b/pkgs/development/python-modules/immutables/default.nix @@ -9,14 +9,14 @@ buildPythonPackage rec { pname = "immutables"; - version = "0.16"; + version = "0.17"; disabled = pythonOlder "3.6"; src = fetchFromGitHub { owner = "MagicStack"; repo = pname; rev = "v${version}"; - sha256 = "1f6nlpvrs41cjrnikx48qd0rlf7d89h6dzlr5zcndzsim7fgsmgz"; + sha256 = "sha256-4VuB8eTWHD4hEDj11u/talfv38h2BhogSZmEVyUtnko="; }; propagatedBuildInputs = [ diff --git a/pkgs/development/python-modules/mizani/default.nix b/pkgs/development/python-modules/mizani/default.nix index 9136f1b8e594..8cd4eb98330b 100644 --- a/pkgs/development/python-modules/mizani/default.nix +++ b/pkgs/development/python-modules/mizani/default.nix @@ -11,16 +11,16 @@ buildPythonPackage rec { pname = "mizani"; - version = "0.7.3"; + version = "0.7.4"; format = "setuptools"; - disabled = pythonOlder "3.6"; + disabled = pythonOlder "3.8"; src = fetchFromGitHub { owner = "has2k1"; repo = pname; rev = "v${version}"; - sha256 = "04r53dp5jbklv8l9ncgc5wiq0gx25y73h65gmmbbfkxwgsl3w78l"; + hash = "sha256-oqbo/aQ5L1nQO8BvXH6/8PBPiWcv2m/LUjwow8+J90w="; }; propagatedBuildInputs = [ diff --git a/pkgs/games/liberation-circuit/default.nix b/pkgs/games/liberation-circuit/default.nix index c1f03e036c9f..365fbb2983eb 100644 --- a/pkgs/games/liberation-circuit/default.nix +++ b/pkgs/games/liberation-circuit/default.nix @@ -1,52 +1,23 @@ -{ stdenv, lib, fetchFromGitHub, fetchurl, cmake, git, makeWrapper, allegro5, libGL }: +{ stdenv, lib, fetchFromGitHub, fetchurl, pkg-config, makeWrapper, allegro5, libGL }: stdenv.mkDerivation rec { pname = "liberation-circuit"; - version = "1.3"; + version = "unstable-2022-01-02"; src = fetchFromGitHub { owner = "linleyh"; repo = pname; - rev = "v${version}"; - sha256 = "BAv0wEJw4pK77jV+1bWPHeqyU/u0HtZLBF3ETUoQEAk="; + rev = "19e3363547793e931fd9419b61ebc2cd8e257714"; + sha256 = "zIwjh4CBSmKz7pF7GM5af+VslWho5jHOLsulbW4C8TY="; }; - patches = [ - # Linux packaging assets - (fetchurl { - url = "https://github.com/linleyh/liberation-circuit/commit/72c1f6f4100bd227540aca14a535e7f4ebdeb851.patch"; - sha256 = "0sad1z1lls0hanv88g1q6x5qr4s8f5p42s8j8v55bmwsdc0s5qys"; - }) - ]; - - # Hack to make binary diffs work - prePatch = '' - function patch { - git apply --whitespace=nowarn "$@" - } - ''; - - postPatch = '' - unset -f patch - substituteInPlace bin/launcher.sh --replace ./libcirc ./liberation-circuit - ''; - - nativeBuildInputs = [ cmake git makeWrapper ]; + nativeBuildInputs = [ pkg-config makeWrapper ]; buildInputs = [ allegro5 libGL ]; - cmakeFlags = [ - "-DALLEGRO_LIBRARY=${lib.getDev allegro5}" - "-DALLEGRO_INCLUDE_DIR=${lib.getDev allegro5}/include" - ]; - - NIX_CFLAGS_LINK = "-lallegro_image -lallegro_primitives -lallegro_color -lallegro_acodec -lallegro_audio -lallegro_dialog -lallegro_font -lallegro_main -lallegro -lm"; - hardeningDisable = [ "format" ]; - installPhase = '' runHook preInstall mkdir -p $out/opt - cd .. cp -r bin $out/opt/liberation-circuit chmod +x $out/opt/liberation-circuit/launcher.sh makeWrapper $out/opt/liberation-circuit/launcher.sh $out/bin/liberation-circuit diff --git a/pkgs/servers/nosql/redis/default.nix b/pkgs/servers/nosql/redis/default.nix index af1d1d371062..f42acee87b51 100644 --- a/pkgs/servers/nosql/redis/default.nix +++ b/pkgs/servers/nosql/redis/default.nix @@ -1,4 +1,5 @@ { lib, stdenv, fetchurl, lua, pkg-config, nixosTests +, tcl, which, ps , withSystemd ? stdenv.isLinux && !stdenv.hostPlatform.isStatic, systemd # dependency ordering is broken at the moment when building with openssl , tlsSupport ? !stdenv.hostPlatform.isStatic, openssl @@ -44,7 +45,26 @@ stdenv.mkDerivation rec { NIX_CFLAGS_COMPILE = lib.optionals stdenv.cc.isClang [ "-std=c11" ]; - doCheck = false; # needs tcl + # darwin currently lacks a pure `pgrep` which is extensively used here + doCheck = !stdenv.isDarwin; + checkInputs = [ which tcl ps ]; + checkPhase = '' + runHook preCheck + + # disable test "Connect multiple replicas at the same time": even + # upstream find this test too timing-sensitive + substituteInPlace tests/integration/replication.tcl \ + --replace 'foreach mdl {no yes}' 'foreach mdl {}' + + ./runtest \ + --no-latency \ + --timeout 2000 \ + --clients $NIX_BUILD_CORES \ + --tags -leaks \ + --skipunit integration/failover # flaky and slow + + runHook postCheck + ''; passthru.tests.redis = nixosTests.redis; diff --git a/pkgs/servers/zigbee2mqtt/default.nix b/pkgs/servers/zigbee2mqtt/default.nix index 03c9337f5c44..3634548223dd 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.24.0"; + version = "1.25.0"; reconstructLock = true; src = pkgs.fetchFromGitHub { owner = "Koenkk"; repo = "zigbee2mqtt"; rev = version; - sha256 = "epQXexhTT6xuB50eudRRzTZHGv0vX+hgMUZcm36red4="; + sha256 = "Wp3+N3np/biNw2xaR79PpQ/S7o3FftjH6AgyMLM+ya8="; }; passthru.tests.zigbee2mqtt = nixosTests.zigbee2mqtt; diff --git a/pkgs/servers/zigbee2mqtt/node-packages.nix b/pkgs/servers/zigbee2mqtt/node-packages.nix index 0047c3a6acec..e4143d6eeced 100644 --- a/pkgs/servers/zigbee2mqtt/node-packages.nix +++ b/pkgs/servers/zigbee2mqtt/node-packages.nix @@ -31,6 +31,16 @@ let 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"; @@ -49,6 +59,15 @@ let sha512 = "392byTlpGWXMv4FbyWw3sAZ/FrW/DrwqLGXpy0mbyNe9Taqv1mg9yON5/o0cnr8XYCkFTZbC1eV+c+LAROgrng=="; }; }; + "@babel/compat-data-7.17.7" = { + name = "_at_babel_slash_compat-data"; + packageName = "@babel/compat-data"; + version = "7.17.7"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/compat-data/-/compat-data-7.17.7.tgz"; + sha512 = "p8pdE6j0a29TNGebNm7NzYZWB3xVZJBZ7XGs42uAKzQo8VQ3F0By/cQCtUEABwIqw5zo6WA4NbmxsfzADzMKnQ=="; + }; + }; "@babel/core-7.17.0" = { name = "_at_babel_slash_core"; packageName = "@babel/core"; @@ -58,13 +77,13 @@ let sha512 = "x/5Ea+RO5MvF9ize5DeVICJoVrNv0Mi2RnIABrZEKYvPEpldXwauPkgvYA17cKa6WpU3LoYvYbuEMFtSNFsarA=="; }; }; - "@babel/core-7.17.5" = { + "@babel/core-7.17.8" = { name = "_at_babel_slash_core"; packageName = "@babel/core"; - version = "7.17.5"; + version = "7.17.8"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/core/-/core-7.17.5.tgz"; - sha512 = "/BBMw4EvjmyquN5O+t5eh0+YqB3XXJkYD2cjKpYtWOfFy4lQ4UozNSmxAcWT8r2XtZs0ewG+zrfsqeR15i1ajA=="; + url = "https://registry.npmjs.org/@babel/core/-/core-7.17.8.tgz"; + sha512 = "OdQDV/7cRBtJHLSOBqqbYNkOcydOgnX59TZx4puf41fzcVtN3e/4yqY8lMQsK+5X2lJtAdmA+6OHqsj1hBJ4IQ=="; }; }; "@babel/generator-7.17.0" = { @@ -76,13 +95,13 @@ let sha512 = "I3Omiv6FGOC29dtlZhkfXO6pgkmukJSlT26QjVvS1DGZe/NzSVCPG41X0tS21oZkJYlovfj9qDWgKP+Cn4bXxw=="; }; }; - "@babel/generator-7.17.3" = { + "@babel/generator-7.17.7" = { name = "_at_babel_slash_generator"; packageName = "@babel/generator"; - version = "7.17.3"; + version = "7.17.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/generator/-/generator-7.17.3.tgz"; - sha512 = "+R6Dctil/MgUsZsZAkYgK+ADNSZzJRRy0TvY65T71z/CR854xHQ1EweBYXdfT+HNeN7w0cSJJEzgxZMv40pxsg=="; + url = "https://registry.npmjs.org/@babel/generator/-/generator-7.17.7.tgz"; + sha512 = "oLcVCTeIFadUoArDTwpluncplrYBmTCCZZgXCbgNGvOBBiSDDK3eWO4b/+eOTli5tKv1lg+a5/NAXg+nTcei1w=="; }; }; "@babel/helper-annotate-as-pure-7.16.7" = { @@ -112,6 +131,15 @@ let sha512 = "mGojBwIWcwGD6rfqgRXVlVYmPAv7eOpIemUG3dGnDdCY4Pae70ROij3XmfrH6Fa1h1aiDylpglbZyktfzyo/hA=="; }; }; + "@babel/helper-compilation-targets-7.17.7" = { + name = "_at_babel_slash_helper-compilation-targets"; + packageName = "@babel/helper-compilation-targets"; + version = "7.17.7"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/helper-compilation-targets/-/helper-compilation-targets-7.17.7.tgz"; + 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"; @@ -202,6 +230,15 @@ let 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"; + version = "7.17.7"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.17.7.tgz"; + sha512 = "thxXgnQ8qQ11W2wVUObIqDL4p148VMxkt5T/qpN5k2fboRyzFGFmKsTGViquyM5QHKUy48OZoca8kw4ajaDPyw=="; + }; + }; "@babel/helper-module-imports-7.16.7" = { name = "_at_babel_slash_helper-module-imports"; packageName = "@babel/helper-module-imports"; @@ -220,13 +257,13 @@ let sha512 = "gaqtLDxJEFCeQbYp9aLAefjhkKdjKcdh6DB7jniIGU3Pz52WAmP268zK0VgPz9hUNkMSYeH976K2/Y6yPadpng=="; }; }; - "@babel/helper-module-transforms-7.17.6" = { + "@babel/helper-module-transforms-7.17.7" = { name = "_at_babel_slash_helper-module-transforms"; packageName = "@babel/helper-module-transforms"; - version = "7.17.6"; + version = "7.17.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.17.6.tgz"; - sha512 = "2ULmRdqoOMpdvkbT8jONrZML/XALfzxlb052bldftkicAUy8AxSCkD5trDPQcwHNmolcl7wP6ehNqMlyUw6AaA=="; + url = "https://registry.npmjs.org/@babel/helper-module-transforms/-/helper-module-transforms-7.17.7.tgz"; + sha512 = "VmZD99F3gNTYB7fJRDTi+u6l/zxY0BE6OIxPSU7a50s6ZUQkHwSDmV92FfM+oCG0pZRVojGYhkR8I0OGeCVREw=="; }; }; "@babel/helper-optimise-call-expression-7.16.7" = { @@ -274,6 +311,15 @@ let 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"; + version = "7.17.7"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/helper-simple-access/-/helper-simple-access-7.17.7.tgz"; + sha512 = "txyMCGroZ96i+Pxr3Je3lzEJjqwaRC9buMUgtomcrLe5Nd0+fk1h0LLA+ixUF5OW7AhHuQ7Es1WcQJZmZsz2XA=="; + }; + }; "@babel/helper-skip-transparent-expression-wrappers-7.16.0" = { name = "_at_babel_slash_helper-skip-transparent-expression-wrappers"; packageName = "@babel/helper-skip-transparent-expression-wrappers"; @@ -328,13 +374,13 @@ let sha512 = "Xe/9NFxjPwELUvW2dsukcMZIp6XwPSbI4ojFBJuX5ramHuVE22SVcZIwqzdWo5uCgeTXW8qV97lMvSOjq+1+nQ=="; }; }; - "@babel/helpers-7.17.2" = { + "@babel/helpers-7.17.8" = { name = "_at_babel_slash_helpers"; packageName = "@babel/helpers"; - version = "7.17.2"; + version = "7.17.8"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/helpers/-/helpers-7.17.2.tgz"; - sha512 = "0Qu7RLR1dILozr/6M0xgj+DFPmi6Bnulgm9M8BVa9ZCWxDqlSnqt3cf8IDPB5m45sVXUZ0kuQAgUrdSFFH79fQ=="; + url = "https://registry.npmjs.org/@babel/helpers/-/helpers-7.17.8.tgz"; + sha512 = "QcL86FGxpfSJwGtAvv4iG93UL6bmqBdmoVY0CMCU2g+oD2ezQse3PT5Pa+jiD6LJndBQi0EDlpzOWNlLuhz5gw=="; }; }; "@babel/highlight-7.16.10" = { @@ -355,13 +401,13 @@ let sha512 = "VKXSCQx5D8S04ej+Dqsr1CzYvvWgf20jIw2D+YhQCrIlr2UZGaDds23Y0xg75/skOxpLCRpUZvk/1EAVkGoDOw=="; }; }; - "@babel/parser-7.17.3" = { + "@babel/parser-7.17.8" = { name = "_at_babel_slash_parser"; packageName = "@babel/parser"; - version = "7.17.3"; + version = "7.17.8"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/parser/-/parser-7.17.3.tgz"; - sha512 = "7yJPvPV+ESz2IUTPbOL+YkIGyCqOyNIzdguKQuJGnH7bg1WTIifuM21YqokFt/THWh1AkCRn9IgoykTRCBVpzA=="; + url = "https://registry.npmjs.org/@babel/parser/-/parser-7.17.8.tgz"; + sha512 = "BoHhDJrJXqcg+ZL16Xv39H9n+AqJ4pcDrQBGZN+wHxIysrLZ3/ECwCBUch/1zUNhnsXULcONU3Ei5Hmkfk6kiQ=="; }; }; "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression-7.16.7" = { @@ -418,13 +464,13 @@ let sha512 = "X/tididvL2zbs7jZCeeRJ8167U/+Ac135AM6jCAx6gYXDUviZV5Ku9UDvWS2NCuWlFjIRXklYhwo6HhAC7ETnA=="; }; }; - "@babel/plugin-proposal-decorators-7.17.2" = { + "@babel/plugin-proposal-decorators-7.17.8" = { name = "_at_babel_slash_plugin-proposal-decorators"; packageName = "@babel/plugin-proposal-decorators"; - version = "7.17.2"; + version = "7.17.8"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.17.2.tgz"; - sha512 = "WH8Z95CwTq/W8rFbMqb9p3hicpt4RX4f0K659ax2VHxgOyT6qQmUaEVEjIh4WR9Eh9NymkVn5vwsrE68fAQNUw=="; + url = "https://registry.npmjs.org/@babel/plugin-proposal-decorators/-/plugin-proposal-decorators-7.17.8.tgz"; + sha512 = "U69odN4Umyyx1xO1rTII0IDkAEC+RNlcKXtqOblfpzqy1C+aOplb76BQNq0+XdpVkOaPlpEDwd++joY8FNFJKA=="; }; }; "@babel/plugin-proposal-dynamic-import-7.16.7" = { @@ -769,13 +815,13 @@ let sha512 = "VqAwhTHBnu5xBVDCvrvqJbtLUa++qZaWC0Fgr2mqokBlulZARGyIvZDoqbPlPaKImQ9dKAcCzbv+ul//uqu70A=="; }; }; - "@babel/plugin-transform-destructuring-7.17.3" = { + "@babel/plugin-transform-destructuring-7.17.7" = { name = "_at_babel_slash_plugin-transform-destructuring"; packageName = "@babel/plugin-transform-destructuring"; - version = "7.17.3"; + version = "7.17.7"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.17.3.tgz"; - sha512 = "dDFzegDYKlPqa72xIlbmSkly5MluLoaC1JswABGktyt6NTXSBcUuse/kWE/wvKFWJHPETpi158qJZFS3JmykJg=="; + url = "https://registry.npmjs.org/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.17.7.tgz"; + sha512 = "XVh0r5yq9sLR4vZ6eVZe8FKfIcSgaTBxVBRSYokRj2qksf6QerYnTxz9/GTuKTH/n/HwLP7t6gtlybHetJ/6hQ=="; }; }; "@babel/plugin-transform-dotall-regex-7.16.7" = { @@ -859,6 +905,15 @@ let sha512 = "oflKPvsLT2+uKQopesJt3ApiaIS2HW+hzHFcwRNtyDGieAeC/dIHZX8buJQ2J2X1rxGPy4eRcUijm3qcSPjYcA=="; }; }; + "@babel/plugin-transform-modules-commonjs-7.17.7" = { + 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"; @@ -868,6 +923,15 @@ let sha512 = "DuK5E3k+QQmnOqBR9UkusByy5WZWGRxfzV529s9nPra1GE7olmxfqO2FHobEOYSPIjPBTr4p66YDcjQnt8cBmw=="; }; }; + "@babel/plugin-transform-modules-systemjs-7.17.8" = { + name = "_at_babel_slash_plugin-transform-modules-systemjs"; + packageName = "@babel/plugin-transform-modules-systemjs"; + version = "7.17.8"; + src = fetchurl { + url = "https://registry.npmjs.org/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.17.8.tgz"; + sha512 = "39reIkMTUVagzgA5x88zDYXPCMT6lcaRKs1+S9K6NKBPErbgO/w/kP8GlNQTC87b412ZTlmNgr3k2JrWgHH+Bw=="; + }; + }; "@babel/plugin-transform-modules-umd-7.16.7" = { name = "_at_babel_slash_plugin-transform-modules-umd"; packageName = "@babel/plugin-transform-modules-umd"; @@ -1021,6 +1085,16 @@ 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"; @@ -1039,6 +1113,16 @@ 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"; @@ -1048,13 +1132,13 @@ let sha512 = "etcO/ohMNaNA2UBdaXBBSX/3aEzFMRrVfaPv8Ptc0k+cWpWW0QFiGZ2XnVqQZI1Cf734LbPGmqBKWESfW4x/dQ=="; }; }; - "@babel/runtime-7.17.2" = { + "@babel/runtime-7.17.8" = { name = "_at_babel_slash_runtime"; packageName = "@babel/runtime"; - version = "7.17.2"; + version = "7.17.8"; src = fetchurl { - url = "https://registry.npmjs.org/@babel/runtime/-/runtime-7.17.2.tgz"; - sha512 = "hzeyJyMA1YGdJTuWU0e/j4wKXrU4OMFvY2MSlaI9B7VQb0r5cxTE3EAIS2Q7Tn2RIcDkRvTA/v2JsAEhxe99uw=="; + url = "https://registry.npmjs.org/@babel/runtime/-/runtime-7.17.8.tgz"; + sha512 = "dQpEpK0O9o6lj6oPu0gRDbbnk+4LeHlNcBpspf6Olzt3GIX4P1lWF1gS+pHLDFlaJvbR6q7jCfQ08zA4QJBnmA=="; }; }; "@babel/template-7.16.7" = { @@ -1129,13 +1213,13 @@ let sha512 = "BLxsnmK3KyPunz5wmCCpqy0YelEoxxGmH73Is+Z74oOTMtExcjkr3dDR6quwrjh1YspA8DH9gnX1o069KiS9AQ=="; }; }; - "@eslint/eslintrc-1.2.0" = { + "@eslint/eslintrc-1.2.1" = { name = "_at_eslint_slash_eslintrc"; packageName = "@eslint/eslintrc"; - version = "1.2.0"; + version = "1.2.1"; src = fetchurl { - url = "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-1.2.0.tgz"; - sha512 = "igm9SjJHNEJRiUnecP/1R5T3wKLEJ7pL6e2P+GUSfCd0dGjPYYZve08uzw8L2J8foVHFz+NGu12JxRcU2gGo6w=="; + url = "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-1.2.1.tgz"; + sha512 = "bxvbYnBPN1Gibwyp6NrpnFzA3YtRL3BBAyEAFVIpNTm2Rn4Vy87GA5M4aSn3InRrlsbX5N0GW7XIx+U4SAEKdQ=="; }; }; "@humanwhocodes/config-array-0.9.3" = { @@ -1606,6 +1690,15 @@ let sha512 = "S7unDjm/C7z2A2R9NzfKCK1I+BAALDtxEmsJBwlB3EzNfb929ykjL++1CK9LO++EIp2fQrC8O+BwjKvz6UeDyQ=="; }; }; + "@types/babel__core-7.1.19" = { + name = "_at_types_slash_babel__core"; + packageName = "@types/babel__core"; + version = "7.1.19"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/babel__core/-/babel__core-7.1.19.tgz"; + sha512 = "WEOTgRsbYkvA/KCsDwVEGkd7WAr1e3g31VHQ8zy5gul/V1qKullU/BU5I68X5v7V3GnB9eotmom4v5a5gjxorw=="; + }; + }; "@types/babel__generator-7.6.4" = { name = "_at_types_slash_babel__generator"; packageName = "@types/babel__generator"; @@ -1642,6 +1735,16 @@ 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"; @@ -1651,6 +1754,16 @@ let 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"; @@ -1732,6 +1845,16 @@ 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"; @@ -1741,6 +1864,15 @@ let sha512 = "FhpRzf927MNQdRZP0J5DLIdTXhjLYzeUTmLAu69mnVksLH9CJY3IuSeEgbKUki7GQZm0WqDkGzyxju2EZGD2wA=="; }; }; + "@types/json-schema-7.0.11" = { + name = "_at_types_slash_json-schema"; + packageName = "@types/json-schema"; + version = "7.0.11"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.11.tgz"; + sha512 = "wOuvG1SN4Us4rez+tylwwwCV1psiNVOkJeM3AUWUNWg/jDQY2+HE/444y5gc+jBmRqASOm2Oeh5c1axHobwRKQ=="; + }; + }; "@types/json-schema-7.0.9" = { name = "_at_types_slash_json-schema"; packageName = "@types/json-schema"; @@ -1777,6 +1909,16 @@ let 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"; @@ -1786,6 +1928,16 @@ let 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"; @@ -1795,13 +1947,13 @@ let sha512 = "zWt4SDDv1S9WRBNxLFxFRHxdD9tvH8f5/kg5/IaLFdnSNXsDY4eL3Q3XXN+VxUnWIhyVFDwcsmAprvwXoM/ClA=="; }; }; - "@types/node-17.0.21" = { + "@types/node-17.0.23" = { name = "_at_types_slash_node"; packageName = "@types/node"; - version = "17.0.21"; + version = "17.0.23"; src = fetchurl { - url = "https://registry.npmjs.org/@types/node/-/node-17.0.21.tgz"; - sha512 = "DBZCJbhII3r90XbQxI8Y9IjjiiOGlZ0Hr32omXIZvwwZ7p4DMMXGrKXVyPfuoBOri9XNtL0UK69jYIBIsRX3QQ=="; + url = "https://registry.npmjs.org/@types/node/-/node-17.0.23.tgz"; + sha512 = "UxDxWn7dl97rKVeVS61vErvw086aCYhDLyvRQZ5Rk65rZKepaFdm53GeqXaKBuOhED4e9uWq34IC3TdSdJJ2Gw=="; }; }; "@types/object-assign-deep-0.4.0" = { @@ -1849,6 +2001,16 @@ let 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"; @@ -1858,13 +2020,13 @@ let sha512 = "Hl219/BT5fLAaz6NDkSuhzasy49dwQS/DSdu4MdggFB8zcXv7vflBI3xp7FEmkmdDkBUI2bPUNeMttp2knYdxw=="; }; }; - "@types/ws-8.5.1" = { + "@types/ws-8.5.3" = { name = "_at_types_slash_ws"; packageName = "@types/ws"; - version = "8.5.1"; + version = "8.5.3"; src = fetchurl { - url = "https://registry.npmjs.org/@types/ws/-/ws-8.5.1.tgz"; - sha512 = "UxlLOfkuQnT2YSBCNq0x86SGOUxas6gAySFeDe2DcnEnA8655UIPoCDorWZCugcvKIL8IUI4oueUfJ1hhZSE2A=="; + url = "https://registry.npmjs.org/@types/ws/-/ws-8.5.3.tgz"; + sha512 = "6YOoWjruKj1uLf3INHH7D3qTXwFfEsg1kf3c0uDdSBJwfa/llkwIjrAGV7j7mVgGNbzTQ3HiHKKDXl6bJPD97w=="; }; }; "@types/yargs-16.0.4" = { @@ -1885,6 +2047,15 @@ let sha512 = "7tFImggNeNBVMsn0vLrpn1H1uPrUBdnARPTpZoitY37ZrdJREzf7I16tMrlK3hen349gr1NYh8CmZQa7CTG6Aw=="; }; }; + "@types/yargs-parser-21.0.0" = { + name = "_at_types_slash_yargs-parser"; + packageName = "@types/yargs-parser"; + version = "21.0.0"; + src = fetchurl { + url = "https://registry.npmjs.org/@types/yargs-parser/-/yargs-parser-21.0.0.tgz"; + sha512 = "iO9ZQHkZxHn4mSakYV0vFHAVDyEOIJQrV2uZ06HxEPcx+mt8swXoZHIbaaJ2crJYFfErySgktuTZ3BeLz+XmFA=="; + }; + }; "@typescript-eslint/eslint-plugin-5.10.2" = { name = "_at_typescript-eslint_slash_eslint-plugin"; packageName = "@typescript-eslint/eslint-plugin"; @@ -1894,13 +2065,23 @@ let sha512 = "4W/9lLuE+v27O/oe7hXJKjNtBLnZE8tQAFpapdxwSVHqtmIoPB1gph3+ahNwVuNL37BX7YQHyGF9Xv6XCnIX2Q=="; }; }; - "@typescript-eslint/eslint-plugin-5.12.1" = { + "@typescript-eslint/eslint-plugin-5.16.0" = { name = "_at_typescript-eslint_slash_eslint-plugin"; packageName = "@typescript-eslint/eslint-plugin"; - version = "5.12.1"; + version = "5.16.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.12.1.tgz"; - sha512 = "M499lqa8rnNK7mUv74lSFFttuUsubIRdAbHcVaP93oFcKkEmHmLqy2n7jM9C8DVmFMYK61ExrZU6dLYhQZmUpw=="; + 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" = { + 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" = { @@ -1912,13 +2093,23 @@ let sha512 = "JaNYGkaQVhP6HNF+lkdOr2cAs2wdSZBoalE22uYWq8IEv/OVH0RksSGydk+sW8cLoSeYmC+OHvRyv2i4AQ7Czg=="; }; }; - "@typescript-eslint/parser-5.12.1" = { + "@typescript-eslint/parser-5.16.0" = { name = "_at_typescript-eslint_slash_parser"; packageName = "@typescript-eslint/parser"; - version = "5.12.1"; + version = "5.16.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.12.1.tgz"; - sha512 = "6LuVUbe7oSdHxUWoX/m40Ni8gsZMKCi31rlawBHt7VtW15iHzjbpj2WLiToG2758KjtCCiLRKZqfrOdl3cNKuw=="; + url = "https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.16.0.tgz"; + sha512 = "fkDq86F0zl8FicnJtdXakFs4lnuebH6ZADDw6CYQv0UZeIjHvmEw87m9/29nk2Dv5Lmdp0zQ3zDQhiMWQf/GbA=="; + }; + }; + "@typescript-eslint/parser-https://registry.npmjs.org/@typescript-eslint/parser/-/parser-5.10.2.tgz" = { + 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" = { @@ -1930,13 +2121,13 @@ let sha512 = "39Tm6f4RoZoVUWBYr3ekS75TYgpr5Y+X0xLZxXqcZNDWZdJdYbKd3q2IR4V9y5NxxiPu/jxJ8XP7EgHiEQtFnw=="; }; }; - "@typescript-eslint/scope-manager-5.12.1" = { + "@typescript-eslint/scope-manager-5.16.0" = { name = "_at_typescript-eslint_slash_scope-manager"; packageName = "@typescript-eslint/scope-manager"; - version = "5.12.1"; + version = "5.16.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/scope-manager/-/scope-manager-5.12.1.tgz"; - sha512 = "J0Wrh5xS6XNkd4TkOosxdpObzlYfXjAFIm9QxYLCPOcHVv1FyyFCPom66uIh8uBr0sZCrtS+n19tzufhwab8ZQ=="; + 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" = { @@ -1948,13 +2139,13 @@ let sha512 = "uRKSvw/Ccs5FYEoXW04Z5VfzF2iiZcx8Fu7DGIB7RHozuP0VbKNzP1KfZkHBTM75pCpsWxIthEH1B33dmGBKHw=="; }; }; - "@typescript-eslint/type-utils-5.12.1" = { + "@typescript-eslint/type-utils-5.16.0" = { name = "_at_typescript-eslint_slash_type-utils"; packageName = "@typescript-eslint/type-utils"; - version = "5.12.1"; + version = "5.16.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/type-utils/-/type-utils-5.12.1.tgz"; - sha512 = "Gh8feEhsNLeCz6aYqynh61Vsdy+tiNNkQtc+bN3IvQvRqHkXGUhYkUi+ePKzP0Mb42se7FDb+y2SypTbpbR/Sg=="; + 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" = { @@ -1966,13 +2157,13 @@ let sha512 = "Qfp0qk/5j2Rz3p3/WhWgu4S1JtMcPgFLnmAKAW061uXxKSa7VWKZsDXVaMXh2N60CX9h6YLaBoy9PJAfCOjk3w=="; }; }; - "@typescript-eslint/types-5.12.1" = { + "@typescript-eslint/types-5.16.0" = { name = "_at_typescript-eslint_slash_types"; packageName = "@typescript-eslint/types"; - version = "5.12.1"; + version = "5.16.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/types/-/types-5.12.1.tgz"; - sha512 = "hfcbq4qVOHV1YRdhkDldhV9NpmmAu2vp6wuFODL71Y0Ixak+FLeEU4rnPxgmZMnGreGEghlEucs9UZn5KOfHJA=="; + 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" = { @@ -1984,13 +2175,13 @@ let sha512 = "WHHw6a9vvZls6JkTgGljwCsMkv8wu8XU8WaYKeYhxhWXH/atZeiMW6uDFPLZOvzNOGmuSMvHtZKd6AuC8PrwKQ=="; }; }; - "@typescript-eslint/typescript-estree-5.12.1" = { + "@typescript-eslint/typescript-estree-5.16.0" = { name = "_at_typescript-eslint_slash_typescript-estree"; packageName = "@typescript-eslint/typescript-estree"; - version = "5.12.1"; + version = "5.16.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/typescript-estree/-/typescript-estree-5.12.1.tgz"; - sha512 = "ahOdkIY9Mgbza7L9sIi205Pe1inCkZWAHE1TV1bpxlU4RZNPtXaDZfiiFWcL9jdxvW1hDYZJXrFm+vlMkXRbBw=="; + 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" = { @@ -2002,13 +2193,13 @@ let sha512 = "vuJaBeig1NnBRkf7q9tgMLREiYD7zsMrsN1DA3wcoMDvr3BTFiIpKjGiYZoKPllfEwN7spUjv7ZqD+JhbVjEPg=="; }; }; - "@typescript-eslint/utils-5.12.1" = { + "@typescript-eslint/utils-5.16.0" = { name = "_at_typescript-eslint_slash_utils"; packageName = "@typescript-eslint/utils"; - version = "5.12.1"; + version = "5.16.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/utils/-/utils-5.12.1.tgz"; - sha512 = "Qq9FIuU0EVEsi8fS6pG+uurbhNTtoYr4fq8tKjBupsK5Bgbk2I32UGm0Sh+WOyjOPgo/5URbxxSNV6HYsxV4MQ=="; + 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" = { @@ -2020,13 +2211,13 @@ let sha512 = "zHIhYGGGrFJvvyfwHk5M08C5B5K4bewkm+rrvNTKk1/S15YHR+SA/QUF8ZWscXSfEaB8Nn2puZj+iHcoxVOD/Q=="; }; }; - "@typescript-eslint/visitor-keys-5.12.1" = { + "@typescript-eslint/visitor-keys-5.16.0" = { name = "_at_typescript-eslint_slash_visitor-keys"; packageName = "@typescript-eslint/visitor-keys"; - version = "5.12.1"; + version = "5.16.0"; src = fetchurl { - url = "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.12.1.tgz"; - sha512 = "l1KSLfupuwrXx6wc0AuOmC7Ko5g14ZOQ86wJJqRbdLbXLK02pK/DPiDDqCc7BqqiiA04/eAA6ayL0bgOrAkH7A=="; + url = "https://registry.npmjs.org/@typescript-eslint/visitor-keys/-/visitor-keys-5.16.0.tgz"; + sha512 = "jqxO8msp5vZDhikTwq9ubyMHqZ67UIvawohr4qF3KhlpL7gzSjOd+8471H3nh5LyABkaI85laEKKU8SnGUK5/g=="; }; }; "abab-2.0.5" = { @@ -2101,13 +2292,13 @@ let sha512 = "j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g=="; }; }; - "ajv-8.10.0" = { + "ajv-8.11.0" = { name = "ajv"; packageName = "ajv"; - version = "8.10.0"; + version = "8.11.0"; src = fetchurl { - url = "https://registry.npmjs.org/ajv/-/ajv-8.10.0.tgz"; - sha512 = "bzqAEZOjkrUMl2afH8dknrq5KEk2SrwdBROR+vH1EKVQTqaUbJVPdc/gEdggTMM0Se+s+Ja4ju4TlNcStKl2Hw=="; + url = "https://registry.npmjs.org/ajv/-/ajv-8.11.0.tgz"; + sha512 = "wGgprdCvMalC0BztXvitD2hC04YffAvtsUn93JbGXYLAtCUO4xd17mCCZQxUOItiBwZvJScWo8NIvQMQ71rdpg=="; }; }; "ansi-escapes-4.3.2" = { @@ -2245,13 +2436,13 @@ let sha1 = "c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"; }; }; - "axios-0.26.0" = { + "axios-0.26.1" = { name = "axios"; packageName = "axios"; - version = "0.26.0"; + version = "0.26.1"; src = fetchurl { - url = "https://registry.npmjs.org/axios/-/axios-0.26.0.tgz"; - sha512 = "lKoGLMYtHvFrPVt3r+RBMp9nh34N0M8zEfCWqdWZx6phynIEhQqAdydpyBAAG211zlhX9Rgu08cOamy6XjE5Og=="; + url = "https://registry.npmjs.org/axios/-/axios-0.26.1.tgz"; + sha512 = "fPwcX4EvnSHuInCMItEhAGnaSEXRBjtzh9fOtsE6E1G6p7vl7edEeZe11QHf18+6+9gR5PbKV/sGKNaD8YaMeA=="; }; }; "babel-jest-27.5.0" = { @@ -2452,13 +2643,13 @@ let sha512 = "u2tbbG5PdKRTUoctO3NBD8FQ5HdPh1ZXPHzp1rwaa5jTc+RV9/+RlWiAIKmjRPQF+xbGM9Kklj5bZQFa2s/38A=="; }; }; - "browserslist-4.19.3" = { + "browserslist-4.20.2" = { name = "browserslist"; packageName = "browserslist"; - version = "4.19.3"; + version = "4.20.2"; src = fetchurl { - url = "https://registry.npmjs.org/browserslist/-/browserslist-4.19.3.tgz"; - sha512 = "XK3X4xtKJ+Txj8G5c30B4gsm71s69lqXlkYui4s6EkKxuv49qjYlY6oVd+IFJ73d4YymtM3+djvvt/R/iJwwDg=="; + url = "https://registry.npmjs.org/browserslist/-/browserslist-4.20.2.tgz"; + sha512 = "CQOBCqp/9pDvDbx3xfMi+86pr4KXIf2FDkTTdeuYw8OxS9t898LA1Khq57gtufFILXpfgsSx5woNgsBgvGjpsA=="; }; }; "bser-2.1.1" = { @@ -2542,13 +2733,13 @@ let sha512 = "+MXEMczJ4FuxJAUp0jvAl6Df0NI/OfW1RWEE61eSmzS7hw6lz4IKutbhbXendwq8BljfFuHtu26VWsg4afQ7Ng=="; }; }; - "caniuse-lite-1.0.30001312" = { + "caniuse-lite-1.0.30001320" = { name = "caniuse-lite"; packageName = "caniuse-lite"; - version = "1.0.30001312"; + version = "1.0.30001320"; src = fetchurl { - url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001312.tgz"; - sha512 = "Wiz1Psk2MEK0pX3rUzWaunLTZzqS2JYZFzNKqAiJGiuxIjRPLgV6+VDPOg6lQOUxmDwhTlh198JsTTi8Hzw6aQ=="; + url = "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001320.tgz"; + sha512 = "MWPzG54AGdo3nWx7zHZTefseM5Y1ccM7hlQKHRqJkPozUaw3hNbBTMmLn16GG2FUzjR13Cr3NPfhIieX5PzXDA=="; }; }; "chalk-2.4.2" = { @@ -2902,6 +3093,15 @@ let sha512 = "/zxw5+vh1Tfv+4Qn7a5nsbcJKPaSvCDhojn6FEl9vupwK2VCSDtEiEtqr8DFtzYFOdz63LBkxec7DYuc2jon6Q=="; }; }; + "debug-4.3.4" = { + name = "debug"; + packageName = "debug"; + version = "4.3.4"; + src = fetchurl { + url = "https://registry.npmjs.org/debug/-/debug-4.3.4.tgz"; + sha512 = "PRWFHuSU3eDtQJPvnNY7Jcket1j0t5OuOsFzPPzsekD52Zl8qUfFIPEiswXqIvHWGVHOgX+7G/vCNNhehwxfkQ=="; + }; + }; "decimal.js-10.3.1" = { name = "decimal.js"; packageName = "decimal.js"; @@ -2992,22 +3192,22 @@ let sha1 = "84c6e159b81904fdca59a0ef44cd870d31250f9a"; }; }; - "depd-1.1.2" = { + "depd-2.0.0" = { name = "depd"; packageName = "depd"; - version = "1.1.2"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz"; - sha1 = "9bcd52e14c097763e749b274c4346ed2e560b5a9"; + url = "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz"; + sha512 = "g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw=="; }; }; - "destroy-1.0.4" = { + "destroy-1.2.0" = { name = "destroy"; packageName = "destroy"; - version = "1.0.4"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz"; - sha1 = "978857442c44749e4206613e37946205826abd80"; + url = "https://registry.npmjs.org/destroy/-/destroy-1.2.0.tgz"; + sha512 = "2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg=="; }; }; "detect-libc-2.0.0" = { @@ -3100,13 +3300,13 @@ let sha512 = "0/d8Skk8sW3FxXP0Dd6MnBlrwx7Qo9cqQec3BlIAlvKnrmS3pHsIbaroEi+nd0kZkGpQ6apMEre7xndzjlEnLw=="; }; }; - "electron-to-chromium-1.4.73" = { + "electron-to-chromium-1.4.95" = { name = "electron-to-chromium"; packageName = "electron-to-chromium"; - version = "1.4.73"; + version = "1.4.95"; src = fetchurl { - url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.73.tgz"; - sha512 = "RlCffXkE/LliqfA5m29+dVDPB2r72y2D2egMMfIy3Le8ODrxjuZNVo4NIC2yPL01N4xb4nZQLwzi6Z5tGIGLnA=="; + url = "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.4.95.tgz"; + sha512 = "h2VAMV/hPtmAeiDkwA8c5sjS+cWt6GlQL4ERdrOUWu7cRIG5IRk9uwR9f0utP+hPJ9ZZsADTq9HpbuT46eBYAg=="; }; }; "emittery-0.8.1" = { @@ -3217,13 +3417,13 @@ let sha512 = "mmHKys/C8BFUGI+MAWNcSYoORYLMdPzjrknd2Vc+bUsjN5bXcr8EhrNB+UTqfL1y3I9c4fw2ihgtMPQLBRiQxw=="; }; }; - "eslint-8.10.0" = { + "eslint-8.12.0" = { name = "eslint"; packageName = "eslint"; - version = "8.10.0"; + version = "8.12.0"; src = fetchurl { - url = "https://registry.npmjs.org/eslint/-/eslint-8.10.0.tgz"; - sha512 = "tcI1D9lfVec+R4LE1mNDnzoJ/f71Kl/9Cv4nG47jOueCMBrCCKYXr4AUVS7go6mWYGFD4+EoN6+eXSrEbRzXVw=="; + url = "https://registry.npmjs.org/eslint/-/eslint-8.12.0.tgz"; + sha512 = "it1oBL9alZg1S8UycLm5YDMAkIhtH6FtAzuZs6YvoGVldWjbS08BkAdb/ymP9LlAyq8koANu32U7Ib/w+UNh8Q=="; }; }; "eslint-8.8.0" = { @@ -3244,13 +3444,23 @@ let sha512 = "WsbX4WbjuMvTdeVL6+J3rK1RGhCTqjsFjX7UMSMgZiyxxaNLkoJENbrGExzERFeoTpGw3F3FypTiWAP9ZXzkEw=="; }; }; - "eslint-plugin-jest-26.1.1" = { + "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" = { name = "eslint-plugin-jest"; packageName = "eslint-plugin-jest"; - version = "26.1.1"; + version = "26.1.3"; src = fetchurl { - url = "https://registry.npmjs.org/eslint-plugin-jest/-/eslint-plugin-jest-26.1.1.tgz"; - sha512 = "HRKOuPi5ADhza4ZBK5ufyNXy28bXXkib87w+pQqdvBhSTsamndh6sIAKPAUl8y0/n9jSWBdTPslrwtKWqkp8dA=="; + url = "https://registry.npmjs.org/eslint-plugin-jest/-/eslint-plugin-jest-26.1.3.tgz"; + sha512 = "Pju+T7MFpo5VFhFlwrkK/9jRUu18r2iugvgyrWOnnGRaVTFFmFXp+xFJpHyqmjjLmGJPKLeEFLVTAxezkApcpQ=="; }; }; "eslint-scope-5.1.1" = { @@ -3532,13 +3742,13 @@ let sha512 = "qOo9F+dMUmC2Lcb4BbVvnKJxTPjCm+RRpe4gDuGrzkL7mEVl/djYSu2OdQ2Pa302N4oqkSg9ir6jaLWJ2USVpQ=="; }; }; - "finalhandler-1.1.2" = { + "finalhandler-1.2.0" = { name = "finalhandler"; packageName = "finalhandler"; - version = "1.1.2"; + version = "1.2.0"; src = fetchurl { - url = "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.2.tgz"; - sha512 = "aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA=="; + url = "https://registry.npmjs.org/finalhandler/-/finalhandler-1.2.0.tgz"; + sha512 = "5uXcUVftlQMFnWC9qu/svkWv3GTd2PfUhK/3PLkYNAe7FbqJMt3515HaxE6eRL74GdsriiwujiawdaB1BpEISg=="; }; }; "find-0.3.0" = { @@ -3784,6 +3994,15 @@ let sha512 = "317dFlgY2pdJZ9rspXDks7073GpDmXdfbM3vYYp0HAMKGDh1FfWPleI2ljVNLQX5M5lXcAslTcPTrOrMEFOjyw=="; }; }; + "globals-13.13.0" = { + name = "globals"; + packageName = "globals"; + version = "13.13.0"; + src = fetchurl { + url = "https://registry.npmjs.org/globals/-/globals-13.13.0.tgz"; + sha512 = "EQ7Q18AJlPwp3vUDL4mKA0KXrXyNIQyWon6T6XQiBQF0XHvRsiCSrWmmeATpUzdJN2HhWZU6Pdl0a9zdep5p6A=="; + }; + }; "globby-11.1.0" = { name = "globby"; packageName = "globby"; @@ -3856,6 +4075,15 @@ let sha512 = "chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw=="; }; }; + "has-symbols-1.0.3" = { + name = "has-symbols"; + packageName = "has-symbols"; + version = "1.0.3"; + src = fetchurl { + url = "https://registry.npmjs.org/has-symbols/-/has-symbols-1.0.3.tgz"; + sha512 = "l3LCuF6MgDNwTDKkdYGEihYjt5pRPbEg46rtlmnSPlUbgmB8LOIrKJbYYFBSbnPaJexMKtiPO8hmeRjRz2Td+A=="; + }; + }; "has-unicode-2.0.1" = { name = "has-unicode"; packageName = "has-unicode"; @@ -3892,13 +4120,13 @@ let sha512 = "H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg=="; }; }; - "http-errors-1.8.1" = { + "http-errors-2.0.0" = { name = "http-errors"; packageName = "http-errors"; - version = "1.8.1"; + version = "2.0.0"; src = fetchurl { - url = "https://registry.npmjs.org/http-errors/-/http-errors-1.8.1.tgz"; - sha512 = "Kpk9Sm7NmI+RHhnj6OIWDI1d6fIoFAtFt9RLaTMRlg/8w49juAStsrBgp0Dp4OdxdVbRIeKhtCUvoi/RuAhO4g=="; + url = "https://registry.npmjs.org/http-errors/-/http-errors-2.0.0.tgz"; + sha512 = "FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ=="; }; }; "http-proxy-agent-4.0.1" = { @@ -4423,6 +4651,16 @@ 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"; @@ -4828,6 +5066,15 @@ let sha512 = "f+8cldu7X/y7RAJurMEJmdoKXGB/X550w2Nr3tTbezL6RwEE/iMcm+tZnXeoZtKuOq6ft8+CqzEkrIgx1fPoQA=="; }; }; + "json5-2.2.1" = { + name = "json5"; + packageName = "json5"; + version = "2.2.1"; + src = fetchurl { + url = "https://registry.npmjs.org/json5/-/json5-2.2.1.tgz"; + sha512 = "1hqLFMSrGHRHxav9q9gNjJ5EXznIxGVO09xQRrwplcS8qs28pZ8s8hupZAmqDwZUmVZ2Qb2jnyPOWcDH8m8dlA=="; + }; + }; "jsonc-parser-3.0.0" = { name = "jsonc-parser"; packageName = "jsonc-parser"; @@ -5026,6 +5273,15 @@ let sha512 = "pRmzw/XUcwXGpD9aI9q/0XOwLNygjETJ8y0ao0wdqprrzDa4YnxLcz7fQRZr8voh8V10kGhABbNcHVk5wHgWwg=="; }; }; + "micromatch-4.0.5" = { + name = "micromatch"; + packageName = "micromatch"; + version = "4.0.5"; + src = fetchurl { + url = "https://registry.npmjs.org/micromatch/-/micromatch-4.0.5.tgz"; + sha512 = "DMy+ERcEW2q8Z2Po+WNXuw3c5YaUSFjAO5GsJqfEl7UjvtIuFKO6ZrKvcItdy98dwFI2N1tg3zNIdKaQT+aNdA=="; + }; + }; "mime-1.6.0" = { name = "mime"; packageName = "mime"; @@ -5044,6 +5300,15 @@ let sha512 = "5y8A56jg7XVQx2mbv1lu49NR4dokRnhZYTtL+KGfaa27uq4pSTXkwQkFJl4pkRMyNFz/EtYDSkiiEHx3F7UN6g=="; }; }; + "mime-db-1.52.0" = { + name = "mime-db"; + packageName = "mime-db"; + version = "1.52.0"; + src = fetchurl { + url = "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz"; + sha512 = "sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg=="; + }; + }; "mime-types-2.1.34" = { name = "mime-types"; packageName = "mime-types"; @@ -5053,6 +5318,15 @@ let sha512 = "6cP692WwGIs9XXdOO4++N+7qjqv0rqxxVvJ3VHPh/Sc9mVZcQP+ZGhkKiTvWMQRr2tbHkJP/Yn7Y0npb3ZBs4A=="; }; }; + "mime-types-2.1.35" = { + name = "mime-types"; + packageName = "mime-types"; + version = "2.1.35"; + src = fetchurl { + url = "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz"; + sha512 = "ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw=="; + }; + }; "mimic-fn-2.1.0" = { name = "mimic-fn"; packageName = "mimic-fn"; @@ -5098,6 +5372,15 @@ let sha512 = "FM9nNUYrRBAELZQT3xeZQ7fmMOBg6nWNmJKTcgsJeaLstP/UODVpGsr5OhXhhXg6f+qtJ8uiZ+PUxkDWcgIXLw=="; }; }; + "minimist-1.2.6" = { + name = "minimist"; + packageName = "minimist"; + version = "1.2.6"; + src = fetchurl { + url = "https://registry.npmjs.org/minimist/-/minimist-1.2.6.tgz"; + sha512 = "Jsjnk4bw3YJqYzbdyBiNsPWHPfO++UGG749Cxs6peCu5Xg4nrena6OVxOYxrQTqww0Jmwt+Ref8rggumkTLz9Q=="; + }; + }; "mixin-deep-2.0.1" = { name = "mixin-deep"; packageName = "mixin-deep"; @@ -5134,13 +5417,13 @@ let sha512 = "kHmoybcPV8Sqy59DwNDY3Jefr64lK/by/da0ViFcuA4DH0vQg5Q6Ze5VimxkfQNSC+Mls/Kx53s7TjP1RhFEDQ=="; }; }; - "mqtt-4.3.6" = { + "mqtt-4.3.7" = { name = "mqtt"; packageName = "mqtt"; - version = "4.3.6"; + version = "4.3.7"; src = fetchurl { - url = "https://registry.npmjs.org/mqtt/-/mqtt-4.3.6.tgz"; - sha512 = "1dgQbkbh1Bba9iAGDNIrhSZ4nLDjbhmNHjOEvsmKI1Bb+2orj0gHwjqUKJ5CKUMKBYbkQYRM1fy+N1/2iZOj5w=="; + url = "https://registry.npmjs.org/mqtt/-/mqtt-4.3.7.tgz"; + sha512 = "ew3qwG/TJRorTz47eW46vZ5oBw5MEYbQZVaEji44j5lAUSQSqIEoul7Kua/BatBW0H0kKQcC9kwUHa1qzaWHSw=="; }; }; "mqtt-packet-6.10.0" = { @@ -5287,13 +5570,13 @@ let sha512 = "2uUqazuKlTaSI/dC8AzicUck7+IrEaOnN/e0jd3Xtt1KcGpwx30v50mL7oPyr/h9bL3E4aZccVwpwP+5W9Vjkg=="; }; }; - "number-allocator-1.0.9" = { + "number-allocator-1.0.10" = { name = "number-allocator"; packageName = "number-allocator"; - version = "1.0.9"; + version = "1.0.10"; src = fetchurl { - url = "https://registry.npmjs.org/number-allocator/-/number-allocator-1.0.9.tgz"; - sha512 = "sIIF0dZKMs3roPUD7rLreH8H3x47QKV9dHZ+PeSnH24gL0CxKxz/823woGZC0hLBSb2Ar/rOOeHiNbnPBum/Mw=="; + url = "https://registry.npmjs.org/number-allocator/-/number-allocator-1.0.10.tgz"; + sha512 = "K4AvNGKo9lP6HqsZyfSr9KDaqnwFzW203inhQEOwFrmFaYevpdX4VNwdOLk197aHujzbT//z6pCBrCOUYSM5iw=="; }; }; "number-is-nan-1.0.1" = { @@ -5350,13 +5633,13 @@ let sha512 = "ixT2L5THXsApyiUPYKmW+2EHpXXe5Ii3M+f4e+aJFAHao5amFRW6J0OO6c/LU8Be47utCx2GL89hxGB6XSmKuQ=="; }; }; - "on-finished-2.3.0" = { + "on-finished-2.4.1" = { name = "on-finished"; packageName = "on-finished"; - version = "2.3.0"; + version = "2.4.1"; src = fetchurl { - url = "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz"; - sha1 = "20f1336481b083cd75337992a16971aa2d906947"; + url = "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz"; + sha512 = "oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg=="; }; }; "once-1.4.0" = { @@ -5971,13 +6254,13 @@ let sha512 = "PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ=="; }; }; - "send-0.17.2" = { + "send-0.18.0" = { name = "send"; packageName = "send"; - version = "0.17.2"; + version = "0.18.0"; src = fetchurl { - url = "https://registry.npmjs.org/send/-/send-0.17.2.tgz"; - sha512 = "UJYB6wFSJE3G00nEivR5rgWp8c2xXvJ3OPWPhmuteU0IKj8nKbG3DrjiOmLwpnHGYWAVwA69zmTm++YG0Hmwww=="; + url = "https://registry.npmjs.org/send/-/send-0.18.0.tgz"; + sha512 = "qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg=="; }; }; "serialport-9.2.8" = { @@ -5989,13 +6272,13 @@ let sha512 = "FsWpMQgSJxi93JgWl5xM1f9/Z8IjRJuaUEoHqLf8FPBLw7gMhInuHOBhI2onQufWIYPGTz3H3oGcu1nCaK1EfA=="; }; }; - "serve-static-1.14.2" = { + "serve-static-1.15.0" = { name = "serve-static"; packageName = "serve-static"; - version = "1.14.2"; + version = "1.15.0"; src = fetchurl { - url = "https://registry.npmjs.org/serve-static/-/serve-static-1.14.2.tgz"; - sha512 = "+TMNA9AFxUEGuC0z2mevogSnn9MXKb4fa7ngeRMJaaGv8vTwnIEkKi+QGvPt33HSnf8pRS+WGM0EbMtCJLKMBQ=="; + url = "https://registry.npmjs.org/serve-static/-/serve-static-1.15.0.tgz"; + sha512 = "XGuRDNjXUijsUL0vl6nSD7cwURuzEgglbOaFuZM9g3kwDXOWVTck0jLzjPzGD+TazWbboZYu52/9/XPdUgne9g=="; }; }; "set-blocking-2.0.0" = { @@ -6187,13 +6470,13 @@ let sha512 = "xrQcmYhOsn/1kX+Vraq+7j4oE2j/6BFscZ0etmYg81xuM8Gq0022Pxb8+IqgOFUIaxHs0KaSb7T1+OegiNrNFA=="; }; }; - "statuses-1.5.0" = { + "statuses-2.0.1" = { name = "statuses"; packageName = "statuses"; - version = "1.5.0"; + version = "2.0.1"; src = fetchurl { - url = "https://registry.npmjs.org/statuses/-/statuses-1.5.0.tgz"; - sha1 = "161c7dac177659fd9811f43771fa99381478628c"; + url = "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz"; + sha512 = "RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ=="; }; }; "stream-shift-1.0.1" = { @@ -6619,6 +6902,16 @@ let 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"; @@ -6628,6 +6921,16 @@ let 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"; @@ -6637,6 +6940,16 @@ let 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"; @@ -6646,6 +6959,16 @@ let 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"; @@ -6655,6 +6978,25 @@ let sha512 = "TCTIul70LyWe6IJWT8QSYeA54WQe8EjQFU4wY52Fasj5UKx88LNYKCgBEHcOMOrFF1rKGbD8v/xcNWVUq9SymA=="; }; }; + "typescript-4.6.3" = { + name = "typescript"; + packageName = "typescript"; + version = "4.6.3"; + src = fetchurl { + url = "https://registry.npmjs.org/typescript/-/typescript-4.6.3.tgz"; + 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"; @@ -7042,49 +7384,49 @@ let sha512 = "YwvAHEfWtcCLilnoHcIpZ9DCPHSLwpy2iboC2zjJUGNQp0vUClJhjAxb6JdTnaHxrNB2FN6+b3Q6BS8QiTtg5g=="; }; }; - "zigbee-herdsman-converters-14.0.438" = { + "zigbee-herdsman-converters-14.0.467" = { name = "zigbee-herdsman-converters"; packageName = "zigbee-herdsman-converters"; - version = "14.0.438"; + version = "14.0.467"; src = fetchurl { - url = "https://registry.npmjs.org/zigbee-herdsman-converters/-/zigbee-herdsman-converters-14.0.438.tgz"; - sha512 = "abf5+j61VG1+P5R5BYmFHe/ddHNCf1dWzNcHB51qHKHrTGoVFtqh/J8y+i1zHaWoOxSTf09UZAbAxDxy8GmNwg=="; + url = "https://registry.npmjs.org/zigbee-herdsman-converters/-/zigbee-herdsman-converters-14.0.467.tgz"; + sha512 = "fkOSFkKj/4q/nh2elXHcTHTvPte54Y4hrXq/BZpnkMgNuLr2lkJgZ52ChG5XyI/4wHtAJq8lgnjGubqr8xNNMQ=="; }; }; - "zigbee2mqtt-frontend-0.6.76" = { + "zigbee2mqtt-frontend-0.6.80" = { name = "zigbee2mqtt-frontend"; packageName = "zigbee2mqtt-frontend"; - version = "0.6.76"; + version = "0.6.80"; src = fetchurl { - url = "https://registry.npmjs.org/zigbee2mqtt-frontend/-/zigbee2mqtt-frontend-0.6.76.tgz"; - sha512 = "c7U9Cl7rMLC+Ds1x7winHraMBQEFqWdFiRpncC5Xa28kz8drQtJXtewt0P/8w3NmtTk5W/z1ocpIk9q0RAEMRg=="; + url = "https://registry.npmjs.org/zigbee2mqtt-frontend/-/zigbee2mqtt-frontend-0.6.80.tgz"; + sha512 = "mDRQ35j5SuTKCsn7NvjNng7x0OK0Hv9sqxMnl0ISfoNEAD5RDpvzDiEBS6XGoymTI+PRNmaNdbczC5/DVqo5xQ=="; }; }; }; args = { name = "zigbee2mqtt"; packageName = "zigbee2mqtt"; - version = "1.24.0"; + version = "1.25.0"; src = ./.; dependencies = [ sources."@ampproject/remapping-2.1.2" sources."@babel/code-frame-7.16.7" - sources."@babel/compat-data-7.17.0" - (sources."@babel/core-7.17.5" // { + sources."@babel/compat-data-7.17.7" + (sources."@babel/core-7.17.8" // { dependencies = [ - sources."debug-4.3.3" + sources."debug-4.3.4" sources."ms-2.1.2" sources."semver-6.3.0" ]; }) - (sources."@babel/generator-7.17.3" // { + (sources."@babel/generator-7.17.7" // { dependencies = [ sources."source-map-0.5.7" ]; }) 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" // { + (sources."@babel/helper-compilation-targets-7.17.7" // { dependencies = [ sources."semver-6.3.0" ]; @@ -7093,7 +7435,7 @@ let sources."@babel/helper-create-regexp-features-plugin-7.17.0" (sources."@babel/helper-define-polyfill-provider-0.3.1" // { dependencies = [ - sources."debug-4.3.3" + sources."debug-4.3.4" sources."ms-2.1.2" sources."semver-6.3.0" ]; @@ -7103,28 +7445,28 @@ let 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-member-expression-to-functions-7.17.7" sources."@babel/helper-module-imports-7.16.7" - sources."@babel/helper-module-transforms-7.17.6" + sources."@babel/helper-module-transforms-7.17.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-simple-access-7.17.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.2" + sources."@babel/helpers-7.17.8" sources."@babel/highlight-7.16.10" - sources."@babel/parser-7.17.3" + sources."@babel/parser-7.17.8" 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.2" + sources."@babel/plugin-proposal-decorators-7.17.8" 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" @@ -7161,7 +7503,7 @@ let 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.17.3" + sources."@babel/plugin-transform-destructuring-7.17.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" @@ -7170,8 +7512,8 @@ 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.16.8" - sources."@babel/plugin-transform-modules-systemjs-7.16.7" + sources."@babel/plugin-transform-modules-commonjs-7.17.7" + 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" sources."@babel/plugin-transform-new-target-7.16.7" @@ -7195,11 +7537,11 @@ let }) sources."@babel/preset-modules-0.1.5" sources."@babel/preset-typescript-7.16.7" - sources."@babel/runtime-7.17.2" + sources."@babel/runtime-7.17.8" sources."@babel/template-7.16.7" (sources."@babel/traverse-7.17.3" // { dependencies = [ - sources."debug-4.3.3" + sources."debug-4.3.4" sources."ms-2.1.2" ]; }) @@ -7207,19 +7549,18 @@ let sources."@bcoe/v8-coverage-0.2.3" sources."@colors/colors-1.5.0" sources."@dabh/diagnostics-2.0.3" - (sources."@eslint/eslintrc-1.2.0" // { + (sources."@eslint/eslintrc-1.2.1" // { dependencies = [ sources."ajv-6.12.6" - sources."debug-4.3.3" - sources."globals-13.12.1" - sources."ignore-4.0.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.3" + sources."debug-4.3.4" sources."ms-2.1.2" ]; }) @@ -7296,7 +7637,7 @@ let sources."@sinonjs/commons-1.8.3" sources."@sinonjs/fake-timers-8.1.0" sources."@tootallnate/once-1.1.2" - sources."@types/babel__core-7.1.18" + 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" @@ -7310,44 +7651,44 @@ let sources."@types/istanbul-reports-3.0.1" sources."@types/jest-27.4.1" sources."@types/js-yaml-4.0.5" - sources."@types/json-schema-7.0.9" + sources."@types/json-schema-7.0.11" sources."@types/minimatch-3.0.5" - sources."@types/node-17.0.21" + sources."@types/node-17.0.23" sources."@types/object-assign-deep-0.4.0" sources."@types/prettier-2.4.4" sources."@types/rimraf-3.0.2" sources."@types/stack-utils-2.0.1" - sources."@types/ws-8.5.1" + sources."@types/ws-8.5.3" sources."@types/yargs-16.0.4" - sources."@types/yargs-parser-20.2.1" - (sources."@typescript-eslint/eslint-plugin-5.12.1" // { + sources."@types/yargs-parser-21.0.0" + (sources."@typescript-eslint/eslint-plugin-5.16.0" // { dependencies = [ - sources."debug-4.3.3" + sources."debug-4.3.4" sources."ms-2.1.2" ]; }) - (sources."@typescript-eslint/parser-5.12.1" // { + (sources."@typescript-eslint/parser-5.16.0" // { dependencies = [ - sources."debug-4.3.3" + sources."debug-4.3.4" sources."ms-2.1.2" ]; }) - sources."@typescript-eslint/scope-manager-5.12.1" - (sources."@typescript-eslint/type-utils-5.12.1" // { + sources."@typescript-eslint/scope-manager-5.16.0" + (sources."@typescript-eslint/type-utils-5.16.0" // { dependencies = [ - sources."debug-4.3.3" + sources."debug-4.3.4" sources."ms-2.1.2" ]; }) - sources."@typescript-eslint/types-5.12.1" - (sources."@typescript-eslint/typescript-estree-5.12.1" // { + sources."@typescript-eslint/types-5.16.0" + (sources."@typescript-eslint/typescript-estree-5.16.0" // { dependencies = [ - sources."debug-4.3.3" + sources."debug-4.3.4" sources."ms-2.1.2" ]; }) - sources."@typescript-eslint/utils-5.12.1" - sources."@typescript-eslint/visitor-keys-5.12.1" + sources."@typescript-eslint/utils-5.16.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" // { @@ -7359,11 +7700,11 @@ let sources."acorn-walk-7.2.0" (sources."agent-base-6.0.2" // { dependencies = [ - sources."debug-4.3.3" + sources."debug-4.3.4" sources."ms-2.1.2" ]; }) - sources."ajv-8.10.0" + sources."ajv-8.11.0" (sources."ansi-escapes-4.3.2" // { dependencies = [ sources."type-fest-0.21.3" @@ -7406,14 +7747,14 @@ let sources."brace-expansion-1.1.11" sources."braces-3.0.2" sources."browser-process-hrtime-1.0.0" - sources."browserslist-4.19.3" + sources."browserslist-4.20.2" 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.30001312" + sources."caniuse-lite-1.0.30001320" sources."chalk-2.4.2" sources."char-regex-1.0.2" sources."charcodes-0.2.0" @@ -7460,8 +7801,8 @@ let sources."deepmerge-4.2.2" sources."define-properties-1.1.3" sources."delayed-stream-1.0.0" - sources."depd-1.1.2" - sources."destroy-1.0.4" + sources."depd-2.0.0" + sources."destroy-1.2.0" sources."detect-newline-3.1.0" sources."diff-sequences-27.5.1" sources."dir-glob-3.0.1" @@ -7473,7 +7814,7 @@ let }) sources."duplexify-4.1.2" sources."ee-first-1.1.1" - sources."electron-to-chromium-1.4.73" + sources."electron-to-chromium-1.4.95" sources."emittery-0.8.1" sources."emoji-regex-8.0.0" sources."enabled-2.0.0" @@ -7496,19 +7837,19 @@ let sources."type-check-0.3.2" ]; }) - (sources."eslint-8.10.0" // { + (sources."eslint-8.12.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.3" + 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.12.1" + sources."globals-13.13.0" sources."has-flag-4.0.0" sources."json-schema-traverse-0.4.1" sources."ms-2.1.2" @@ -7516,7 +7857,7 @@ let ]; }) sources."eslint-config-google-0.14.0" - sources."eslint-plugin-jest-26.1.1" + sources."eslint-plugin-jest-26.1.3" sources."eslint-scope-5.1.1" (sources."eslint-utils-3.0.0" // { dependencies = [ @@ -7552,7 +7893,7 @@ let sources."file-entry-cache-6.0.1" sources."file-uri-to-path-1.0.0" sources."fill-range-7.0.1" - sources."finalhandler-1.1.2" + sources."finalhandler-1.2.0" sources."find-0.3.0" sources."find-up-4.1.0" sources."flat-cache-3.0.4" @@ -7578,20 +7919,20 @@ let sources."graceful-fs-4.2.9" sources."has-1.0.3" sources."has-flag-3.0.0" - sources."has-symbols-1.0.2" + sources."has-symbols-1.0.3" sources."help-me-3.0.0" sources."html-encoding-sniffer-2.0.1" sources."html-escaper-2.0.2" - sources."http-errors-1.8.1" + sources."http-errors-2.0.0" (sources."http-proxy-agent-4.0.1" // { dependencies = [ - sources."debug-4.3.3" + sources."debug-4.3.4" sources."ms-2.1.2" ]; }) (sources."https-proxy-agent-5.0.0" // { dependencies = [ - sources."debug-4.3.3" + sources."debug-4.3.4" sources."ms-2.1.2" ]; }) @@ -7634,7 +7975,7 @@ let }) (sources."istanbul-lib-source-maps-4.0.1" // { dependencies = [ - sources."debug-4.3.3" + sources."debug-4.3.4" sources."ms-2.1.2" ]; }) @@ -7822,7 +8163,7 @@ let sources."json-parse-even-better-errors-2.3.1" sources."json-schema-traverse-1.0.0" sources."json-stable-stringify-without-jsonify-1.0.1" - sources."json5-2.2.0" + sources."json5-2.2.1" sources."kleur-3.0.3" sources."kuler-2.0.0" sources."leven-2.1.0" @@ -7846,25 +8187,25 @@ let sources."makeerror-1.0.12" sources."merge-stream-2.0.0" sources."merge2-1.4.1" - sources."micromatch-4.0.4" + sources."micromatch-4.0.5" sources."mime-1.6.0" - sources."mime-db-1.51.0" - sources."mime-types-2.1.34" + sources."mime-db-1.52.0" + sources."mime-types-2.1.35" sources."mimic-fn-2.1.0" sources."minimatch-3.1.2" - sources."minimist-1.2.5" + sources."minimist-1.2.6" sources."mkdir-recursive-0.4.0" sources."moment-2.29.1" - (sources."mqtt-4.3.6" // { + (sources."mqtt-4.3.7" // { dependencies = [ - sources."debug-4.3.3" + 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.3" + sources."debug-4.3.4" sources."ms-2.1.2" ]; }) @@ -7875,9 +8216,9 @@ let sources."node-releases-2.0.2" sources."normalize-path-3.0.0" sources."npm-run-path-4.0.1" - (sources."number-allocator-1.0.9" // { + (sources."number-allocator-1.0.10" // { dependencies = [ - sources."debug-4.3.3" + sources."debug-4.3.4" sources."ms-2.1.2" ]; }) @@ -7885,7 +8226,7 @@ let sources."object-assign-deep-0.4.0" sources."object-keys-1.1.1" sources."object.assign-4.1.2" - sources."on-finished-2.3.0" + sources."on-finished-2.4.1" sources."once-1.4.0" sources."one-time-1.0.0" sources."onetime-5.1.2" @@ -7949,12 +8290,12 @@ let sources."safer-buffer-2.1.2" sources."saxes-5.0.1" sources."semver-7.3.5" - (sources."send-0.17.2" // { + (sources."send-0.18.0" // { dependencies = [ sources."ms-2.1.3" ]; }) - sources."serve-static-1.14.2" + sources."serve-static-1.15.0" sources."setprototypeof-1.2.0" sources."shebang-command-2.0.0" sources."shebang-regex-3.0.0" @@ -7972,7 +8313,7 @@ let sources."escape-string-regexp-2.0.0" ]; }) - sources."statuses-1.5.0" + sources."statuses-2.0.1" sources."stream-shift-1.0.1" sources."string-length-4.0.2" sources."string-width-4.2.3" @@ -8011,7 +8352,7 @@ let sources."type-fest-0.20.2" sources."typedarray-0.0.6" sources."typedarray-to-buffer-3.1.5" - sources."typescript-4.5.5" + sources."typescript-4.6.3" 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" @@ -9011,22 +9352,22 @@ let sources."yargs-parser-20.2.9" ]; }) - (sources."zigbee-herdsman-converters-14.0.438" // { + (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.0" - (sources."@babel/core-7.17.5" // { + sources."@babel/compat-data-7.17.7" + (sources."@babel/core-7.17.8" // { dependencies = [ sources."semver-6.3.0" ]; }) - (sources."@babel/generator-7.17.3" // { + (sources."@babel/generator-7.17.7" // { dependencies = [ sources."source-map-0.5.7" ]; }) - (sources."@babel/helper-compilation-targets-7.16.7" // { + (sources."@babel/helper-compilation-targets-7.17.7" // { dependencies = [ sources."semver-6.3.0" ]; @@ -9036,13 +9377,13 @@ let 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.6" + sources."@babel/helper-module-transforms-7.17.7" sources."@babel/helper-plugin-utils-7.16.7" - sources."@babel/helper-simple-access-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.2" + sources."@babel/helpers-7.17.8" (sources."@babel/highlight-7.16.10" // { dependencies = [ sources."ansi-styles-3.2.1" @@ -9054,7 +9395,7 @@ let sources."supports-color-5.5.0" ]; }) - sources."@babel/parser-7.17.3" + 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" @@ -9076,11 +9417,7 @@ let }) sources."@babel/types-7.17.0" sources."@bcoe/v8-coverage-0.2.3" - (sources."@eslint/eslintrc-1.2.0" // { - dependencies = [ - sources."ignore-4.0.6" - ]; - }) + 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" // { @@ -9111,7 +9448,7 @@ let sources."@sinonjs/commons-1.8.3" sources."@sinonjs/fake-timers-8.1.0" sources."@tootallnate/once-1.1.2" - sources."@types/babel__core-7.1.18" + 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" @@ -9119,22 +9456,22 @@ let sources."@types/istanbul-lib-coverage-2.0.4" sources."@types/istanbul-lib-report-3.0.0" sources."@types/istanbul-reports-3.0.1" - sources."@types/json-schema-7.0.9" - sources."@types/node-17.0.21" + 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-20.2.1" - sources."@typescript-eslint/scope-manager-5.12.1" - sources."@typescript-eslint/types-5.12.1" - sources."@typescript-eslint/typescript-estree-5.12.1" - (sources."@typescript-eslint/utils-5.12.1" // { + 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.12.1" + sources."@typescript-eslint/visitor-keys-5.16.0" sources."abab-2.0.5" sources."acorn-8.7.0" (sources."acorn-globals-6.0.0" // { @@ -9157,7 +9494,7 @@ let sources."argparse-2.0.1" sources."array-union-2.1.0" sources."asynckit-0.4.0" - sources."axios-0.26.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" @@ -9169,14 +9506,14 @@ let sources."brace-expansion-1.1.11" sources."braces-3.0.2" sources."browser-process-hrtime-1.0.0" - sources."browserslist-4.19.3" + 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.30001312" + sources."caniuse-lite-1.0.30001320" sources."chalk-4.1.2" sources."char-regex-1.0.2" sources."ci-info-3.3.0" @@ -9188,11 +9525,7 @@ let 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" // { - dependencies = [ - sources."safe-buffer-5.1.2" - ]; - }) + sources."convert-source-map-1.8.0" sources."cross-spawn-7.0.3" sources."cssom-0.4.4" (sources."cssstyle-2.3.0" // { @@ -9201,7 +9534,7 @@ let ]; }) sources."data-urls-2.0.0" - sources."debug-4.3.3" + sources."debug-4.3.4" sources."decimal.js-10.3.1" sources."dedent-0.7.0" sources."deep-is-0.1.4" @@ -9216,7 +9549,7 @@ let sources."webidl-conversions-5.0.0" ]; }) - sources."electron-to-chromium-1.4.73" + 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" @@ -9231,9 +9564,9 @@ let sources."type-check-0.3.2" ]; }) - sources."eslint-8.10.0" + sources."eslint-8.12.0" sources."eslint-config-google-0.14.0" - sources."eslint-plugin-jest-26.1.1" + sources."eslint-plugin-jest-26.1.3" sources."eslint-scope-7.1.1" (sources."eslint-utils-3.0.0" // { dependencies = [ @@ -9278,7 +9611,7 @@ let sources."get-stream-6.0.1" sources."glob-7.2.0" sources."glob-parent-6.0.2" - sources."globals-13.12.1" + sources."globals-13.13.0" sources."globby-11.1.0" sources."graceful-fs-4.2.9" sources."has-1.0.3" @@ -9316,13 +9649,10 @@ let 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" // { - dependencies = [ - sources."jest-cli-27.5.1" - ]; - }) + 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" @@ -9363,7 +9693,7 @@ let 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.0" + sources."json5-2.2.1" sources."kleur-3.0.3" sources."leven-3.1.0" sources."levn-0.4.1" @@ -9380,12 +9710,11 @@ let sources."makeerror-1.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."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."minimist-1.2.5" sources."ms-2.1.2" sources."natural-compare-1.4.0" sources."node-int64-0.4.0" @@ -9436,7 +9765,7 @@ let sources."reusify-1.0.4" sources."rimraf-3.0.2" sources."run-parallel-1.2.0" - sources."safe-buffer-5.2.1" + sources."safe-buffer-5.1.2" sources."safer-buffer-2.1.2" sources."saxes-5.0.1" sources."semver-7.3.5" @@ -9455,7 +9784,11 @@ let }) 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" @@ -9480,6 +9813,7 @@ let 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" @@ -9511,7 +9845,7 @@ let (sources."zigbee-herdsman-0.14.20" // { dependencies = [ sources."@ampproject/remapping-2.0.3" - sources."@babel/cli-7.17.0" + 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" // { @@ -9622,13 +9956,13 @@ let 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" // { + (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-7.16.7" + 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" @@ -9740,25 +10074,25 @@ let 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/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-27.4.0" + 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-2.7.4" - sources."@types/nedb-1.8.12" + 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-8.0.2" + 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-5.10.2" - sources."@typescript-eslint/parser-5.10.2" + 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" @@ -9908,7 +10242,7 @@ let sources."type-check-0.3.2" ]; }) - (sources."eslint-8.8.0" // { + (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" @@ -10047,7 +10381,7 @@ let ]; }) sources."istanbul-reports-3.1.4" - (sources."jest-27.5.0" // { + (sources."jest-https://registry.npmjs.org/jest/-/jest-27.5.0.tgz" // { dependencies = [ sources."ansi-styles-4.3.0" sources."chalk-4.1.2" @@ -10402,11 +10736,11 @@ let 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."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" @@ -10465,7 +10799,7 @@ let }) ]; }) - sources."zigbee2mqtt-frontend-0.6.76" + sources."zigbee2mqtt-frontend-0.6.80" ]; buildInputs = globalBuildInputs; meta = { diff --git a/pkgs/tools/misc/snapper/default.nix b/pkgs/tools/misc/snapper/default.nix index 80d9e191c8a6..72e239229b3f 100644 --- a/pkgs/tools/misc/snapper/default.nix +++ b/pkgs/tools/misc/snapper/default.nix @@ -6,13 +6,13 @@ stdenv.mkDerivation rec { pname = "snapper"; - version = "0.9.1"; + version = "0.10.0"; src = fetchFromGitHub { owner = "openSUSE"; repo = "snapper"; rev = "v${version}"; - sha256 = "1ci5mdsph2n5cqad51zf4sank35yj741adsqy2gg7vqwxrhpm8mj"; + sha256 = "sha256-02ufjPuXK3a+gQ8kp968KXd3Jgvx4O6TO2Q5wL5n2cw="; }; nativeBuildInputs = [ diff --git a/pkgs/tools/security/metasploit/Gemfile b/pkgs/tools/security/metasploit/Gemfile index 992e5c84fdfe..4c1ad65ed7a3 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.35" +gem "metasploit-framework", git: "https://github.com/rapid7/metasploit-framework", ref: "refs/tags/6.1.36" diff --git a/pkgs/tools/security/metasploit/Gemfile.lock b/pkgs/tools/security/metasploit/Gemfile.lock index c3fd51f14b7f..8ebeadbdfb08 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: c1efca37c6e967103978915618efa41515134ea1 - ref: refs/tags/6.1.35 + revision: b3ad212ba393cc87bb9e621dbad9d04362f1151c + ref: refs/tags/6.1.36 specs: - metasploit-framework (6.1.35) + metasploit-framework (6.1.36) actionpack (~> 6.0) activerecord (~> 6.0) activesupport (~> 6.0) @@ -128,13 +128,13 @@ GEM arel-helpers (2.14.0) activerecord (>= 3.1.0, < 8) aws-eventstream (1.2.0) - aws-partitions (1.570.0) + aws-partitions (1.573.0) aws-sdk-core (3.130.0) aws-eventstream (~> 1, >= 1.0.2) aws-partitions (~> 1, >= 1.525.0) aws-sigv4 (~> 1.1) jmespath (~> 1.0) - aws-sdk-ec2 (1.304.0) + aws-sdk-ec2 (1.305.0) aws-sdk-core (~> 3, >= 3.127.0) aws-sigv4 (~> 1.1) aws-sdk-iam (1.68.0) @@ -205,8 +205,9 @@ GEM filesize (0.2.0) gssapi (1.3.1) ffi (>= 1.0.1) - gyoku (1.3.1) + gyoku (1.4.0) builder (>= 2.1.2) + rexml (~> 3.0) hashery (2.1.2) hrr_rb_ssh (0.4.2) hrr_rb_ssh-ed25519 (0.4.2) @@ -229,7 +230,7 @@ GEM logging (2.3.0) little-plugger (~> 1.1) multi_json (~> 1.14) - loofah (2.15.0) + loofah (2.16.0) crass (~> 1.0.2) nokogiri (>= 1.5.9) metasm (1.0.5) @@ -298,9 +299,9 @@ GEM hashery (~> 2.0) ruby-rc4 ttfunk - pg (1.3.4) + pg (1.3.5) public_suffix (4.0.6) - puma (5.6.2) + puma (5.6.4) nio4r (~> 2.0) racc (1.6.0) rack (2.2.3) @@ -321,7 +322,7 @@ GEM thor (~> 1.0) rake (13.0.6) rb-readline (0.5.5) - recog (2.3.22) + recog (2.3.23) nokogiri redcarpet (3.5.1) reline (0.2.5) @@ -379,12 +380,12 @@ GEM ruby-macho (3.0.0) ruby-rc4 (0.1.5) ruby2_keywords (0.0.5) - ruby_smb (3.0.5) + ruby_smb (3.0.6) bindata openssl-ccm openssl-cmac rubyntlm - windows_error (>= 0.1.3) + windows_error (>= 0.1.4) rubyntlm (0.6.3) rubyzip (2.3.2) sawyer (0.8.2) @@ -422,7 +423,7 @@ GEM websocket-extensions (>= 0.1.0) websocket-extensions (0.1.5) win32api (0.1.0) - windows_error (0.1.3) + windows_error (0.1.4) winrm (2.3.6) builder (>= 2.1.2) erubi (~> 1.8) diff --git a/pkgs/tools/security/metasploit/default.nix b/pkgs/tools/security/metasploit/default.nix index 8d807d85844a..97948171bf5c 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.35"; + version = "6.1.36"; src = fetchFromGitHub { owner = "rapid7"; repo = "metasploit-framework"; rev = version; - sha256 = "sha256-1xEc+I2Pvs6GQuEGAHWWAum7ASESX5R5D1qN+wPtFgY="; + sha256 = "sha256-j90/ygZpwdMb0KL1bJPHpysokC3BoN/kUK/dsBo6HsU="; }; nativeBuildInputs = [ makeWrapper ]; diff --git a/pkgs/tools/security/metasploit/gemset.nix b/pkgs/tools/security/metasploit/gemset.nix index 45270cea4cfb..40c1d05ae29e 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 = "0w3y40l5xg0p5sha6w4wppwb6kil129nk760yblswqw7vz0s0mm0"; + sha256 = "162x55is7jfdy6cf1xw2llbrxcnk5gv3dsqfmi1klf6c2xfm87gm"; type = "gem"; }; - version = "1.570.0"; + version = "1.573.0"; }; aws-sdk-core = { groups = ["default"]; @@ -124,10 +124,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0vvplr6ml7acl047lynmsdl2bs2i992vx68dhzqmllppf8ggcjvs"; + sha256 = "1dpid33sl72nsxyr7d57yqzqb9jby0dyjc0ncncdm41is7d25vki"; type = "gem"; }; - version = "1.304.0"; + version = "1.305.0"; }; aws-sdk-iam = { groups = ["default"]; @@ -494,10 +494,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1wn0sl14396g5lyvp8sjmcb1hw9rbyi89gxng91r7w4df4jwiidh"; + sha256 = "1kd2q59xpm39hpvmmvyi6g3f1fr05xjbnxwkrdqz4xy7hirqi79q"; type = "gem"; }; - version = "1.3.1"; + version = "1.4.0"; }; hashery = { groups = ["default"]; @@ -644,10 +644,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1yp1h1j7pdkqvnx8jl6bkzlajav3h5mhqzihgs9p6y3c8927mw23"; + sha256 = "15s6z5bvhdhnqv4wg8zcz3mhbc7i4dbqskv5jvhprz33ak7682km"; type = "gem"; }; - version = "2.15.0"; + version = "2.16.0"; }; metasm = { groups = ["default"]; @@ -684,12 +684,12 @@ platforms = []; source = { fetchSubmodules = false; - rev = "c1efca37c6e967103978915618efa41515134ea1"; - sha256 = "01hnxl1zp3as1xwr8pqj440vps82jrsh01p18a3cxglgipw1q4fp"; + rev = "b3ad212ba393cc87bb9e621dbad9d04362f1151c"; + sha256 = "1i8y78db1pdga3jdz8615n82hax7qy9nrxd2s0dx7hb90v53zpcg"; type = "git"; url = "https://github.com/rapid7/metasploit-framework"; }; - version = "6.1.35"; + version = "6.1.36"; }; metasploit-model = { groups = ["default"]; @@ -977,10 +977,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "090c3kazlmiizp25las7dgi8wlc11s29nrs2gy3qrp1z8qikgcmb"; + sha256 = "10ryzmc3r5ja6g90a9ycsxcxsy5872xa1vf01jam0bm74zq3zmi6"; type = "gem"; }; - version = "1.3.4"; + version = "1.3.5"; }; public_suffix = { groups = ["default"]; @@ -997,10 +997,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1np2myaxlk5iab1zarwgmp7zsjvm5j8ssg35ijv8b6dpvc3cjd56"; + sha256 = "0dgr2rybayih2naz3658mbzqwfrg9fxl80zsvhscf6b972kp3jdw"; type = "gem"; }; - version = "5.6.2"; + version = "5.6.4"; }; racc = { groups = ["default"]; @@ -1097,10 +1097,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0ml58i34gjpgmpl392c77v2n50w2w233gwxgy6cxq81bp58ywj92"; + sha256 = "0axq8hw515b8hbv1jm4lbrqnjm5bvjjnj7xbx9pvp17zlklvsfzb"; type = "gem"; }; - version = "2.3.22"; + version = "2.3.23"; }; redcarpet = { groups = ["default"]; @@ -1357,10 +1357,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "0zgw3aplb0nd8ggyy2csywvnw7gdligzdqvw18j7s5yix8g2h4cz"; + sha256 = "1mxm2948xz9pfl2jhngvjw89arvm9qznrf86pbqi8hi7cxfr4grk"; type = "gem"; }; - version = "3.0.5"; + version = "3.0.6"; }; rubyntlm = { groups = ["default"]; @@ -1587,10 +1587,10 @@ platforms = []; source = { remotes = ["https://rubygems.org"]; - sha256 = "1dy35rfdmj6pfhdicix1kcgpj5y7844a43i6bnklngn7b1wmy3av"; + sha256 = "0zmm2if81ia33hp18h8yrgnpgcdyrxziyf185r0zx8qy7n8mlchl"; type = "gem"; }; - version = "0.1.3"; + version = "0.1.4"; }; winrm = { groups = ["default"]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 92ca591fc9b3..90b17d503045 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4647,7 +4647,6 @@ with pkgs; cudnn_8_1_cudatoolkit_11_1 cudnn_8_1_cudatoolkit_11_2 cudnn_8_1_cudatoolkit_10 - cudnn_8_1_cudatoolkit_11 cudnn_8_3_cudatoolkit_10_2 cudnn_8_3_cudatoolkit_11_0 cudnn_8_3_cudatoolkit_11_1 @@ -4658,8 +4657,8 @@ with pkgs; cudnn_8_3_cudatoolkit_10 cudnn_8_3_cudatoolkit_11; - # TODO(samuela): This is old and should be upgraded to 8.3 at some point. - cudnn = cudnn_7_6_cudatoolkit_10_1; + # Make sure to keep this in sync with the `cudatoolkit` version! + cudnn = cudnn_8_3_cudatoolkit_10; cutensorPackages = callPackages ../development/libraries/science/math/cutensor { }; inherit (cutensorPackages) @@ -32956,11 +32955,16 @@ with pkgs; ### SCIENCE / MATH caffe = callPackage ../applications/science/math/caffe ({ + cudaSupport = config.cudaSupport or false; + cudatoolkit = cudatoolkit_10_1; + cudnn = cudnn_7_6_cudatoolkit_10_1; opencv3 = opencv3WithoutCuda; # Used only for image loading. blas = openblas; inherit (darwin.apple_sdk.frameworks) Accelerate CoreGraphics CoreVideo; } // (config.caffe or {})); + caffeWithCuda = caffe.override { cudaSupport = true; }; + caffe2 = callPackage ../development/libraries/science/math/caffe2 (rec { inherit (python3Packages) python future six numpy pydot; protobuf = protobuf3_1; diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index 6e38e07ff3b6..255ba4eb4784 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -1138,18 +1138,6 @@ let inherit (pkgs.python3Packages) pytorch; }; - type_conv_108_08_00 = callPackage ../development/ocaml-modules/type_conv/108.08.00.nix { }; - type_conv_109_60_01 = callPackage ../development/ocaml-modules/type_conv/109.60.01.nix { }; - type_conv_112_01_01 = callPackage ../development/ocaml-modules/type_conv/112.01.01.nix { }; - type_conv = - if lib.versionOlder "4.02" ocaml.version - then type_conv_112_01_01 - else if lib.versionOlder "4.00" ocaml.version - then type_conv_109_60_01 - else if lib.versionOlder "3.12" ocaml.version - then type_conv_108_08_00 - else null; - ocaml-protoc = callPackage ../development/ocaml-modules/ocaml-protoc { }; ocaml_extlib = ocaml_extlib-1-7-8; diff --git a/pkgs/top-level/perl-packages.nix b/pkgs/top-level/perl-packages.nix index 5404878cbae8..91ee27af4736 100644 --- a/pkgs/top-level/perl-packages.nix +++ b/pkgs/top-level/perl-packages.nix @@ -3563,11 +3563,11 @@ let CompressRawZlib = buildPerlPackage { pname = "Compress-Raw-Zlib"; - version = "2.101"; + version = "2.103"; src = fetchurl { - url = "mirror://cpan/authors/id/P/PM/PMQS/Compress-Raw-Zlib-2.101.tar.gz"; - sha256 = "1cmb39dw928jssa3fzk4pxb7sw8q1zyx3yikgq01nz17x0ara6wx"; + url = "mirror://cpan/authors/id/P/PM/PMQS/Compress-Raw-Zlib-2.103.tar.gz"; + sha256 = "sha256-1p0mIMoCTcG0JPf0Io/hFpsrd0FrswMQ6JDTvn2kff8="; }; preConfigure = '' diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 497ba1e4cc2b..83d9b7414c91 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -1457,6 +1457,11 @@ in { inherit (self) python numpy boost; }); + caffeWithCuda = toPythonModule (pkgs.caffeWithCuda.override { + pythonSupport = true; + inherit (self) python numpy boost; + }); + cairocffi = callPackage ../development/python-modules/cairocffi { }; cairosvg = callPackage ../development/python-modules/cairosvg { }; @@ -1959,7 +1964,7 @@ in { cupy = callPackage ../development/python-modules/cupy { cudatoolkit = pkgs.cudatoolkit_11; - cudnn = pkgs.cudnn_8_1_cudatoolkit_11; + cudnn = pkgs.cudnn_8_3_cudatoolkit_11; nccl = pkgs.nccl_cudatoolkit_11; cutensor = pkgs.cutensor_cudatoolkit_11; }; @@ -8362,6 +8367,24 @@ in { pytorch = callPackage ../development/python-modules/pytorch { cudaSupport = pkgs.config.cudaSupport or false; + + # TODO: next time pytorch is updated (to 1.11.0, currently in staging as of + # 2022-03-31), make the following changes: + + # -> cudatoolk_11 + cudatoolkit = pkgs.cudatoolkit_10; + + # -> cudnn_8_3_cudatoolkit_11 + cudnn = pkgs.cudnn_8_1_cudatoolkit_10; + + # -> cutensor_cudatoolkit_11 (cutensor is a new dependency in v1.11.0) + # cutensor = pkgs.cutensor_cudatoolkit_11; + + # -> setting a custom magma should be unnecessary with v1.11.0 + magma = pkgs.magma.override { cudatoolkit = pkgs.cudatoolkit_10; }; + + # -> nccl_cudatoolkit_11 + nccl = pkgs.nccl.override { cudatoolkit = pkgs.cudatoolkit_10; }; }; pytorch-bin = callPackage ../development/python-modules/pytorch/bin.nix { };