From 1b18f0e3758a6b82d6c4b8a142cfab9a0123bd7e Mon Sep 17 00:00:00 2001
From: Benjamin Asbach <asbachb@users.noreply.github.com>
Date: Sat, 11 Jun 2022 02:37:30 +0300
Subject: [PATCH 01/80] oraclejdk14: Removed as it's end of life since 09/2020

---
 .../compilers/oraclejdk/jdk14-linux.nix       | 54 -------------------
 pkgs/top-level/all-packages.nix               |  2 -
 2 files changed, 56 deletions(-)
 delete mode 100644 pkgs/development/compilers/oraclejdk/jdk14-linux.nix

diff --git a/pkgs/development/compilers/oraclejdk/jdk14-linux.nix b/pkgs/development/compilers/oraclejdk/jdk14-linux.nix
deleted file mode 100644
index 6604ebbef82d..000000000000
--- a/pkgs/development/compilers/oraclejdk/jdk14-linux.nix
+++ /dev/null
@@ -1,54 +0,0 @@
-{ lib, stdenv
-, requireFile
-, xorg
-, zlib
-, freetype
-, alsa-lib
-, setJavaClassPath
-}:
-
-let result = stdenv.mkDerivation rec {
-  pname = "oraclejdk";
-  version = "14.0.2";
-
-  src = requireFile {
-    name = "jdk-${version}_linux-x64_bin.tar.gz";
-    url = "https://www.oracle.com/java/technologies/javase-jdk14-downloads.html";
-    sha256 = "cb811a86926cc0f529d16bec7bd2e25fb73e75125bbd1775cdb9a96998593dde";
-  };
-
-  installPhase = ''
-    mv ../$sourceRoot $out
-
-    mkdir -p $out/nix-support
-    printWords ${setJavaClassPath} > $out/nix-support/propagated-build-inputs
-
-    # Set JAVA_HOME automatically.
-    cat <<EOF >> $out/nix-support/setup-hook
-    if [ -z "\''${JAVA_HOME-}" ]; then export JAVA_HOME=$out; fi
-    EOF
-  '';
-
-  postFixup = ''
-    rpath="$out/lib/jli:$out/lib/server:$out/lib:${lib.strings.makeLibraryPath [ stdenv.cc.cc zlib xorg.libX11 xorg.libXext xorg.libXtst xorg.libXi xorg.libXrender freetype alsa-lib]}"
-
-    for f in $(find $out -name "*.so") $(find $out -type f -perm -0100); do
-      patchelf --interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" "$f" || true
-      patchelf --set-rpath   "$rpath"                                    "$f" || true
-    done
-
-    for f in $(find $out -name "*.so") $(find $out -type f -perm -0100); do
-      if ldd "$f" | fgrep 'not found'; then echo "in file $f"; fi
-    done
-  '';
-
-  passthru.jre = result;
-  passthru.home = result;
-
-  dontStrip = true; # See: https://github.com/NixOS/patchelf/issues/10
-
-  meta = with lib; {
-    license = licenses.unfree;
-    platforms = [ "x86_64-linux" ];
-  };
-}; in result
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a3f93bdfe181..129e897791f1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -13265,8 +13265,6 @@ with pkgs;
 
   oraclejdk11 = callPackage ../development/compilers/oraclejdk/jdk11-linux.nix { };
 
-  oraclejdk14 = callPackage ../development/compilers/oraclejdk/jdk14-linux.nix { };
-
   jasmin = callPackage ../development/compilers/jasmin { };
 
   java-service-wrapper = callPackage ../tools/system/java-service-wrapper {

From 8b8e7483ca4202f95c7b3459f35199b2e6fb166f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 28 Jul 2022 10:13:13 +0000
Subject: [PATCH 02/80] cmdstan: 2.30.0 -> 2.30.1

---
 pkgs/development/compilers/cmdstan/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/compilers/cmdstan/default.nix b/pkgs/development/compilers/cmdstan/default.nix
index 077df4983214..45ab576878cf 100644
--- a/pkgs/development/compilers/cmdstan/default.nix
+++ b/pkgs/development/compilers/cmdstan/default.nix
@@ -2,12 +2,12 @@
 
 stdenv.mkDerivation rec {
   pname = "cmdstan";
-  version = "2.30.0";
+  version = "2.30.1";
 
   # includes stanc binaries needed to build cmdstand
   src = fetchurl {
     url = "https://github.com/stan-dev/cmdstan/releases/download/v${version}/cmdstan-${version}.tar.gz";
-    sha256 = "sha256-AJwuoAQ6pKkcA6x4ky5k88/0+qPnNBOi4CadW+LY3mw=";
+    sha256 = "sha256-urdtzvp/TJVVlcC/BJZ3BQf8arDfWJboz4wtsKF+7bk=";
   };
 
   buildFlags = [ "build" ];

From 4e1ebe4f37358a6b7fd01fea457c509fc3b4948a Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Sat, 18 Jun 2022 04:20:00 +0000
Subject: [PATCH 03/80] cmdstan: fix build on darwin

---
 pkgs/development/compilers/cmdstan/default.nix | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/compilers/cmdstan/default.nix b/pkgs/development/compilers/cmdstan/default.nix
index 45ab576878cf..7070d3d5394b 100644
--- a/pkgs/development/compilers/cmdstan/default.nix
+++ b/pkgs/development/compilers/cmdstan/default.nix
@@ -16,6 +16,8 @@ stdenv.mkDerivation rec {
   doCheck = true;
   checkInputs = [ python3 ];
 
+  CXXFLAGS = lib.optionalString stdenv.isDarwin "-D_BOOST_LGAMMA";
+
   postPatch = ''
     substituteInPlace stan/lib/stan_math/make/libraries \
       --replace "/usr/bin/env bash" "bash"
@@ -42,7 +44,7 @@ stdenv.mkDerivation rec {
   preFixup = "rm -rf $(pwd)";
 
   meta = {
-    broken = (stdenv.isLinux && stdenv.isAarch64) || stdenv.isDarwin;
+    broken = stdenv.isLinux && stdenv.isAarch64;
     description = "Command-line interface to Stan";
     longDescription = ''
       Stan is a probabilistic programming language implementing full Bayesian

From ea4a17f576d1b7ee6e87ae1f94ee155a4ff1e46f Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Mon, 11 Jul 2022 15:19:01 +0200
Subject: [PATCH 04/80] python310Packages.lru-dict: 1.1.7 -> 1.1.8

---
 pkgs/development/python-modules/lru-dict/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/lru-dict/default.nix b/pkgs/development/python-modules/lru-dict/default.nix
index b075ead34297..36b8c8978954 100644
--- a/pkgs/development/python-modules/lru-dict/default.nix
+++ b/pkgs/development/python-modules/lru-dict/default.nix
@@ -6,7 +6,7 @@
 
 let
   pname = "lru-dict";
-  version = "1.1.7";
+  version = "1.1.8";
 in
 buildPythonPackage {
   inherit pname version;
@@ -14,7 +14,7 @@ buildPythonPackage {
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-RbgfZ9dTQdRDOrreeZpH6cQqniKhGFMdy15UmGQDLXw=";
+    hash = "sha256-h4vI70Bz5c+5U9/Bz0WF20HouBTAEGq9400A7g0LMRU=";
   };
 
   checkInputs = [

From 604a88a787cc260b6a8908b46d1607943c8fc9d7 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Sun, 17 Jul 2022 15:03:13 +0200
Subject: [PATCH 05/80] wf-recorder: Remove myself and CrazedProgrammer as
 maintainers

---
 pkgs/applications/video/wf-recorder/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/video/wf-recorder/default.nix b/pkgs/applications/video/wf-recorder/default.nix
index 18b35c0d398b..418c931a7ccd 100644
--- a/pkgs/applications/video/wf-recorder/default.nix
+++ b/pkgs/applications/video/wf-recorder/default.nix
@@ -24,7 +24,7 @@ stdenv.mkDerivation rec {
     inherit (src.meta) homepage;
     changelog = "https://github.com/ammen99/wf-recorder/releases/tag/v${version}";
     license = licenses.mit;
-    maintainers = with maintainers; [ primeos CrazedProgrammer ];
+    maintainers = with maintainers; [ ];
     platforms = platforms.linux;
   };
 }

From 032d0b3a3c1aa003640d9ee2e81f673c0487c08e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Tue, 19 Jul 2022 16:54:33 +0000
Subject: [PATCH 06/80] python310Packages.fastavro: 1.5.2 -> 1.5.3

---
 pkgs/development/python-modules/fastavro/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/fastavro/default.nix b/pkgs/development/python-modules/fastavro/default.nix
index 3ea51b2e03f2..883acef11b92 100644
--- a/pkgs/development/python-modules/fastavro/default.nix
+++ b/pkgs/development/python-modules/fastavro/default.nix
@@ -15,14 +15,14 @@
 
 buildPythonPackage rec {
   pname = "fastavro";
-  version = "1.5.2";
+  version = "1.5.3";
 
   disabled = pythonOlder "3.6";
   src = fetchFromGitHub {
     owner = pname;
     repo = pname;
     rev = "refs/tags/${version}";
-    sha256 = "sha256-DNBTuONWlyn+ls4VfWv54tXXbsjxLVfwEjWp3PpruYk=";
+    sha256 = "sha256-6Zs4Whf/9c829D3tHvrhOzVRjYzqomcT9wzrBCklQmc=";
   };
 
   preBuild = ''

From 69c108fd354aff0a1529af1faf63ad35c8705bf7 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Thu, 21 Jul 2022 11:00:57 +0200
Subject: [PATCH 07/80] checkSSLCert: 2.34.0 -> 2.35.0

---
 pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix b/pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix
index 205e33ee0185..758e71d24406 100644
--- a/pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix
+++ b/pkgs/servers/monitoring/nagios/plugins/check_ssl_cert.nix
@@ -10,13 +10,13 @@
 
 stdenv.mkDerivation rec {
   pname = "check_ssl_cert";
-  version = "2.34.0";
+  version = "2.35.0";
 
   src = fetchFromGitHub {
     owner = "matteocorti";
     repo = "check_ssl_cert";
     rev = "v${version}";
-    hash = "sha256-cEjYDb614JLNyuzpSUcIiZgK4vHa6NkL/DefqV+IGdQ=";
+    hash = "sha256-xJBXINIPJm48LinPAlVHGxO82Jh2Kx/0OqHr87w63yo=";
   };
 
   nativeBuildInputs = [

From 913cbfda3332f42da21dd37f49944c06b8b20aec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vladim=C3=ADr=20=C4=8Cun=C3=A1t?= <v@cunat.cz>
Date: Thu, 21 Jul 2022 19:55:40 +0200
Subject: [PATCH 08/80] apkg: init at 0.4.0

---
 .../tools/package-management/apkg/default.nix | 49 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 2 files changed, 51 insertions(+)
 create mode 100644 pkgs/tools/package-management/apkg/default.nix

diff --git a/pkgs/tools/package-management/apkg/default.nix b/pkgs/tools/package-management/apkg/default.nix
new file mode 100644
index 000000000000..9f187724666d
--- /dev/null
+++ b/pkgs/tools/package-management/apkg/default.nix
@@ -0,0 +1,49 @@
+{ lib, fetchFromGitLab, python3Packages
+, gitMinimal, rpm, dpkg, fakeroot
+}:
+
+python3Packages.buildPythonApplication rec {
+  pname = "apkg";
+  version = "0.4.0";
+
+  src = fetchFromGitLab {
+    domain = "gitlab.nic.cz";
+    owner = "packaging";
+    repo = pname;
+    rev = "v${version}";
+    sha256 = "duZz2Kwjgek5pMJTDH8gMZAZ13uFwaIYT5E1brW7I7U=";
+  };
+
+  propagatedBuildInputs = with python3Packages; [
+    # copy&pasted requirements.txt (almost exactly)
+    beautifulsoup4   # upstream version detection
+    blessings        # terminal colors
+    build            # apkg distribution
+    cached-property  # @cached_property for python <= 3.7
+    click            # nice CLI framework
+    distro           # current distro detection
+    jinja2           # templating
+    packaging        # version parsing
+    requests         # HTTP for humans™
+    setuptools       # required by minver
+    toml             # config files
+  ];
+
+  makeWrapperArgs = [ # deps for `srcpkg` operation for other distros; could be optional
+    "--prefix" "PATH" ":" (lib.makeBinPath [ gitMinimal rpm dpkg fakeroot ])
+  ];
+
+  checkInputs = with python3Packages; [ pytest ];
+  checkPhase = ''
+    runHook preCheck
+    py.test # inspiration: .gitlab-ci.yml
+    runHook postCheck
+  '';
+
+  meta = with lib; {
+    description = "Upstream packaging automation tool";
+    homepage = "https://pkg.labs.nic.cz/pages/apkg";
+    license = licenses.gpl3Plus;
+    maintainers = [ maintainers.vcunat /* close to upstream */ ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 49772490ff0f..06d72e898a91 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -15157,6 +15157,8 @@ with pkgs;
 
   anybadge = with python3Packages; toPythonApplication anybadge;
 
+  apkg = callPackage ../tools/package-management/apkg { };
+
   augeas = callPackage ../tools/system/augeas { };
 
   autoadb = callPackage ../misc/autoadb { };

From 7fcae89d1c5e0f51d1b18564d443658acec56f19 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Tue, 26 Jul 2022 04:20:00 +0000
Subject: [PATCH 09/80] python310Packages.wandb: fix build

---
 .../python-modules/wandb/default.nix          | 73 ++++++++++---------
 .../wandb/hardcode-git-path.patch             |  6 +-
 2 files changed, 41 insertions(+), 38 deletions(-)

diff --git a/pkgs/development/python-modules/wandb/default.nix b/pkgs/development/python-modules/wandb/default.nix
index 586463dbaa88..534b1cdba4f8 100644
--- a/pkgs/development/python-modules/wandb/default.nix
+++ b/pkgs/development/python-modules/wandb/default.nix
@@ -101,47 +101,50 @@ buildPythonPackage rec {
 
   disabledTestPaths = [
     # Tests that try to get chatty over sockets or spin up servers, not possible in the nix build environment.
-    "tests/integrations/test_keras.py"
-    "tests/integrations/test_torch.py"
-    "tests/test_cli.py"
-    "tests/test_data_types.py"
-    "tests/test_file_stream.py"
-    "tests/test_file_upload.py"
-    "tests/test_footer.py"
-    "tests/test_internal_api.py"
-    "tests/test_label_full.py"
-    "tests/test_login.py"
-    "tests/test_meta.py"
-    "tests/test_metric_full.py"
-    "tests/test_metric_internal.py"
-    "tests/test_mode_disabled.py"
-    "tests/test_model_workflows.py"
-    "tests/test_mp_full.py"
-    "tests/test_public_api.py"
-    "tests/test_redir.py"
-    "tests/test_runtime.py"
-    "tests/test_sender.py"
-    "tests/test_start_method.py"
-    "tests/test_tb_watcher.py"
-    "tests/test_telemetry_full.py"
-    "tests/test_util.py"
-    "tests/wandb_agent_test.py"
-    "tests/wandb_artifacts_test.py"
-    "tests/wandb_integration_test.py"
-    "tests/wandb_run_test.py"
-    "tests/wandb_settings_test.py"
-    "tests/wandb_sweep_test.py"
-    "tests/wandb_tensorflow_test.py"
-    "tests/wandb_verify_test.py"
+    "tests/unit_tests/integrations/test_keras.py"
+    "tests/unit_tests/integrations/test_torch.py"
+    "tests/unit_tests/test_cli.py"
+    "tests/unit_tests/test_data_types.py"
+    "tests/unit_tests/test_file_stream.py"
+    "tests/unit_tests/test_file_upload.py"
+    "tests/unit_tests/test_footer.py"
+    "tests/unit_tests/test_internal_api.py"
+    "tests/unit_tests/test_label_full.py"
+    "tests/unit_tests/test_login.py"
+    "tests/unit_tests/test_meta.py"
+    "tests/unit_tests/test_metric_full.py"
+    "tests/unit_tests/test_metric_internal.py"
+    "tests/unit_tests/test_mode_disabled.py"
+    "tests/unit_tests/test_model_workflows.py"
+    "tests/unit_tests/test_mp_full.py"
+    "tests/unit_tests/test_public_api.py"
+    "tests/unit_tests/test_redir.py"
+    "tests/unit_tests/test_runtime.py"
+    "tests/unit_tests/test_sender.py"
+    "tests/unit_tests/test_start_method.py"
+    "tests/unit_tests/test_tb_watcher.py"
+    "tests/unit_tests/test_telemetry_full.py"
+    "tests/unit_tests/test_util.py"
+    "tests/unit_tests/wandb_agent_test.py"
+    "tests/unit_tests/wandb_artifacts_test.py"
+    "tests/unit_tests/wandb_integration_test.py"
+    "tests/unit_tests/wandb_run_test.py"
+    "tests/unit_tests/wandb_settings_test.py"
+    "tests/unit_tests/wandb_sweep_test.py"
+    "tests/unit_tests/wandb_tensorflow_test.py"
+    "tests/unit_tests/wandb_verify_test.py"
+    "tests/unit_tests/test_tpu.py"
+    "tests/unit_tests/test_plots.py"
+    "tests/unit_tests/test_report_api.py"
 
     # Requires metaflow, which is not yet packaged.
-    "tests/integrations/test_metaflow.py"
+    "tests/unit_tests/integrations/test_metaflow.py"
 
     # Fails and borks the pytest runner as well.
-    "tests/wandb_test.py"
+    "tests/unit_tests/wandb_test.py"
 
     # Tries to access /homeless-shelter
-    "tests/test_tables.py"
+    "tests/unit_tests/test_tables.py"
   ];
 
   # Disable test that fails on darwin due to issue with python3Packages.psutil:
diff --git a/pkgs/development/python-modules/wandb/hardcode-git-path.patch b/pkgs/development/python-modules/wandb/hardcode-git-path.patch
index 6d91add9d383..23097c535e06 100644
--- a/pkgs/development/python-modules/wandb/hardcode-git-path.patch
+++ b/pkgs/development/python-modules/wandb/hardcode-git-path.patch
@@ -1,7 +1,7 @@
-diff --git a/functional_tests/kfp/wandb_probe.py b/functional_tests/kfp/wandb_probe.py
+diff --git a/tests/functional_tests/t0_main/kfp/wandb_probe.py b/tests/functional_tests/t0_main/kfp/wandb_probe.py
 index 82fadfe1..25c1454c 100644
---- a/functional_tests/kfp/wandb_probe.py
-+++ b/functional_tests/kfp/wandb_probe.py
+--- a/tests/functional_tests/t0_main/kfp/wandb_probe.py
++++ b/tests/functional_tests/t0_main/kfp/wandb_probe.py
 @@ -5,7 +5,7 @@ import subprocess
  def wandb_probe_package():
      if not os.environ.get("WB_PROBE_PACKAGE"):

From 75fd4d5d21c5b977e0388cad85c741db076dd1dc Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Tue, 26 Jul 2022 04:20:00 +0000
Subject: [PATCH 10/80] python310Packages.wandb: update meta

---
 pkgs/development/python-modules/wandb/default.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/wandb/default.nix b/pkgs/development/python-modules/wandb/default.nix
index 534b1cdba4f8..fc6dbadaecb6 100644
--- a/pkgs/development/python-modules/wandb/default.nix
+++ b/pkgs/development/python-modules/wandb/default.nix
@@ -159,7 +159,8 @@ buildPythonPackage rec {
 
   meta = with lib; {
     description = "A CLI and library for interacting with the Weights and Biases API";
-    homepage = "https://github.com/wandb/client";
+    homepage = "https://github.com/wandb/wandb";
+    changelog = "https://github.com/wandb/wandb/raw/v${version}/CHANGELOG.md";
     license = licenses.mit;
     maintainers = with maintainers; [ samuela ];
   };

From 508e4f889fb03d352fb631f08f3f43ea65965a5f Mon Sep 17 00:00:00 2001
From: figsoda <figsoda@pm.me>
Date: Wed, 27 Jul 2022 12:04:47 +0800
Subject: [PATCH 11/80] hyperfine: 1.13.0 -> 1.14.0

---
 pkgs/tools/misc/hyperfine/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/misc/hyperfine/default.nix b/pkgs/tools/misc/hyperfine/default.nix
index 1a5cc30264f9..897c1bdf5002 100644
--- a/pkgs/tools/misc/hyperfine/default.nix
+++ b/pkgs/tools/misc/hyperfine/default.nix
@@ -8,14 +8,14 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "hyperfine";
-  version = "1.13.0";
+  version = "1.14.0";
 
   src = fetchCrate {
     inherit pname version;
-    sha256 = "sha256-1TWaLw1JxUE8RjPVVTldCbMSArNb+uhXM865iuJaJUo=";
+    sha256 = "sha256-3DDgh/0iD1LJEPjicLtHcs9PMso/Wv+3vlkWfdJlpIM=";
   };
 
-  cargoSha256 = "sha256-kzDjxWMXie6qjherzdXvHxrS4i8FAXcKiuk/+wbMkAA=";
+  cargoSha256 = "sha256-VkB6KJUi5PACpjrK/OJ5tmroJJVnDxhZAQzSWkrtuCU=";
 
   nativeBuildInputs = [ installShellFiles ];
   buildInputs = lib.optional stdenv.isDarwin Security;

From 023abfd05df321a2943546fcd55e7b3df933fff4 Mon Sep 17 00:00:00 2001
From: 06kellyjac <dev@j-k.io>
Date: Wed, 27 Jul 2022 12:36:05 +0100
Subject: [PATCH 12/80] go-containerregistry: 0.8.0 -> 0.11.0

---
 pkgs/development/tools/go-containerregistry/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/go-containerregistry/default.nix b/pkgs/development/tools/go-containerregistry/default.nix
index d0f02795ce34..56b2a8b07c03 100644
--- a/pkgs/development/tools/go-containerregistry/default.nix
+++ b/pkgs/development/tools/go-containerregistry/default.nix
@@ -4,13 +4,13 @@ let bins = [ "crane" "gcrane" ]; in
 
 buildGoModule rec {
   pname = "go-containerregistry";
-  version = "0.8.0";
+  version = "0.11.0";
 
   src = fetchFromGitHub {
     owner = "google";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-TbMx+DVIYzhQ50f7sDXfhQnT/U6U+G9GTUbtYSu4/KI=";
+    sha256 = "sha256-9C5tlJChDyflFlqwn9YDZB+40PUqwjgIFcdxNBCxWTM=";
   };
   vendorSha256 = null;
 

From 5c71196ffb5f3884d3b3b98273a2839d0a109800 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 27 Jul 2022 19:15:37 +0000
Subject: [PATCH 13/80] aws-nuke: 2.17.0 -> 2.19.0

---
 pkgs/tools/admin/aws-nuke/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/admin/aws-nuke/default.nix b/pkgs/tools/admin/aws-nuke/default.nix
index 0c12e54d2530..af0d06b1b6a0 100644
--- a/pkgs/tools/admin/aws-nuke/default.nix
+++ b/pkgs/tools/admin/aws-nuke/default.nix
@@ -5,16 +5,16 @@
 
 buildGoModule rec {
   pname = "aws-nuke";
-  version = "2.17.0";
+  version = "2.19.0";
 
   src = fetchFromGitHub {
     owner = "rebuy-de";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-e5EtIRIM0Gz2BXGaZx3jiO+MNdD1Eh9h7U+aZSBVFGc=";
+    sha256 = "sha256-4G+/VNTp5Bb1TAcqb//LUvwEGDrXRNNka4X52jCH+Rs=";
   };
 
-  vendorSha256 = "sha256-tRFYZ0GBJDumvfOYMJDcYqTlTn5do3trZ1gXafuDVi4=";
+  vendorSha256 = "sha256-p+pcVvu+d/scel8VVCFqZccwfOTOyKeud3gKLqpWE1g=";
 
   preBuild = ''
     if [ "x$outputHashAlgo" != "x" ]; then

From 05d8e4cb6d49b8302435192084c78373b54014b7 Mon Sep 17 00:00:00 2001
From: Kenny MacDermid <kenny@macdermid.ca>
Date: Sun, 3 Jul 2022 23:55:52 -0300
Subject: [PATCH 14/80] pc-ble-driver: fix building with gcc 11

Pull down an upstream patch to fix the compile error:

error: 'sleep_for' is not a member of 'std::this_thread'
---
 pkgs/development/libraries/pc-ble-driver/default.nix | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/pc-ble-driver/default.nix b/pkgs/development/libraries/pc-ble-driver/default.nix
index 5f09860cb3a4..b06a771e1999 100644
--- a/pkgs/development/libraries/pc-ble-driver/default.nix
+++ b/pkgs/development/libraries/pc-ble-driver/default.nix
@@ -1,4 +1,4 @@
-{ lib, stdenv, fetchFromGitHub
+{ lib, stdenv, fetchpatch, fetchFromGitHub
 , cmake, git
 , asio, catch2, spdlog
 , IOKit, udev
@@ -15,6 +15,14 @@ stdenv.mkDerivation rec {
     sha256 = "1609x17sbfi668jfwyvnfk9z29w6cgzvgv67xcpvpx5jv0czpcdj";
   };
 
+  patches = [
+     # Fix build with GCC 11
+    (fetchpatch {
+      url = "https://github.com/NordicSemiconductor/pc-ble-driver/commit/37258e65bdbcd0b4369ae448faf650dd181816ec.patch";
+      sha256 = "sha256-gOdzIW8YJQC+PE4FJd644I1+I7CMcBY8wpF6g02eI5g=";
+    })
+  ];
+
   cmakeFlags = [
     "-DNRF_BLE_DRIVER_VERSION=${version}"
   ];

From 467e45ea3df1701d108d3a58c4bce14803f82cfe Mon Sep 17 00:00:00 2001
From: Kenny MacDermid <kenny@macdermid.ca>
Date: Sun, 3 Jul 2022 23:58:22 -0300
Subject: [PATCH 15/80] python3Packages.pc-ble-driver-py: 0.16.3 -> 0.17.0

This version adds support for Python 3.10.
---
 .../development/python-modules/pc-ble-driver-py/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/pc-ble-driver-py/default.nix b/pkgs/development/python-modules/pc-ble-driver-py/default.nix
index 6dec8d2308f1..b9f8486aa5d6 100644
--- a/pkgs/development/python-modules/pc-ble-driver-py/default.nix
+++ b/pkgs/development/python-modules/pc-ble-driver-py/default.nix
@@ -16,15 +16,15 @@
 
 buildPythonPackage rec {
   pname = "pc-ble-driver-py";
-  version = "0.16.3";
+  version = "0.17.0";
 
-  disabled = pythonOlder "3.7" || pythonAtLeast "3.10";
+  disabled = pythonOlder "3.7";
 
   src = fetchFromGitHub {
     owner = "NordicSemiconductor";
     repo = "pc-ble-driver-py";
     rev = "v${version}";
-    sha256 = "sha256-X21GQsyRZu1xdoTlD9DjceIWKpcuTLdIDf8UahntS3s=";
+    sha256 = "sha256-brC33ar2Jq3R2xdrklvVsQKf6pcnKwD25PO4TIvXgTg=";
   };
 
   nativeBuildInputs = [

From 361072ab382e527f47fc4170df6dc82d1c691190 Mon Sep 17 00:00:00 2001
From: Kenny MacDermid <kenny@macdermid.ca>
Date: Mon, 4 Jul 2022 00:01:18 -0300
Subject: [PATCH 16/80] nrfutil: 6.1.3 -> 6.1.6

Version adds support for Python 3.10.

Patch out the hardcoded libusb1 version. Upstream locked it due
to pip pulling down libraries that had issues on the host system.
That shouldn't be an issue here with libusb1 in nixpkgs.
---
 .../tools/misc/nrfutil/default.nix            | 30 +++----------------
 1 file changed, 4 insertions(+), 26 deletions(-)

diff --git a/pkgs/development/tools/misc/nrfutil/default.nix b/pkgs/development/tools/misc/nrfutil/default.nix
index 7ffd92451bf5..7d2cbabef40e 100644
--- a/pkgs/development/tools/misc/nrfutil/default.nix
+++ b/pkgs/development/tools/misc/nrfutil/default.nix
@@ -1,41 +1,20 @@
 { lib
 , stdenv
 , fetchFromGitHub
-, pkgs
 , python3
-, python3Packages
 }:
-let
-  py = python3.override {
-    packageOverrides = self: super: {
 
-      libusb1 = super.libusb1.overridePythonAttrs (oldAttrs: rec {
-        version = "1.9.3";
-        src = oldAttrs.src.override {
-          inherit version;
-          sha256 = "0j8p7jb7sibiiib18vyv3w5rrk0f4d2dl99bs18nwkq6pqvwxrk0";
-        };
-
-        postPatch = ''
-          substituteInPlace usb1/libusb1.py --replace \
-            "ctypes.util.find_library(base_name)" \
-            "'${pkgs.libusb1}/lib/libusb-1.0${stdenv.hostPlatform.extensions.sharedLibrary}'"
-        '';
-      });
-    };
-  };
-in
-with py.pkgs;
+with python3.pkgs;
 
 buildPythonApplication rec {
   pname = "nrfutil";
-  version = "6.1.3";
+  version = "6.1.6";
 
   src = fetchFromGitHub {
     owner = "NordicSemiconductor";
     repo = "pc-nrfutil";
     rev = "v${version}";
-    sha256 = "1gpxjdcjn4rjvk649vpkh563c7lx3rrfvamazb1qjii1pxrvvqa7";
+    sha256 = "sha256-UiGNNJxNSpIzpeYMlzocLG2kuetl8xti5A3n6zz0lcY=";
   };
 
   propagatedBuildInputs = [
@@ -60,6 +39,7 @@ buildPythonApplication rec {
 
   postPatch = ''
     mkdir test-reports
+    substituteInPlace requirements.txt --replace "libusb1==1.9.3" "libusb1"
   '';
 
   meta = with lib; {
@@ -68,7 +48,5 @@ buildPythonApplication rec {
     license = licenses.unfreeRedistributable;
     platforms = platforms.unix;
     maintainers = with maintainers; [ gebner ];
-    # libusb1 1.9.3 uses setuptools' 2to3 translation feature, which has been removed in setuptools 58
-    broken = true;
   };
 }

From 5534e801645253174c0c6f8bae8a159bcd902eea Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 27 Jul 2022 21:42:29 +0000
Subject: [PATCH 17/80] armadillo: 11.2.2 -> 11.2.3

---
 pkgs/development/libraries/armadillo/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/armadillo/default.nix b/pkgs/development/libraries/armadillo/default.nix
index 43fa2027cc81..6277ec4f87e3 100644
--- a/pkgs/development/libraries/armadillo/default.nix
+++ b/pkgs/development/libraries/armadillo/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "armadillo";
-  version = "11.2.2";
+  version = "11.2.3";
 
   src = fetchurl {
     url = "mirror://sourceforge/arma/armadillo-${version}.tar.xz";
-    sha256 = "sha256-1AHZmkImwoxb+9nUMB8LM/4sgAyoZavgDNnFk+OTpic=";
+    sha256 = "sha256-TC6XzmBwf8HzSPRPevDLbSRm0KrQ0OpL9dXcGA5sukE=";
   };
 
   nativeBuildInputs = [ cmake ];

From ed7991a493a8d7aad8e97d711869119f3715452f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 27 Jul 2022 23:35:25 +0000
Subject: [PATCH 18/80] cardinal: 22.06 -> 22.07

---
 pkgs/applications/audio/cardinal/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/audio/cardinal/default.nix b/pkgs/applications/audio/cardinal/default.nix
index f09a9169c947..4cef30602aee 100644
--- a/pkgs/applications/audio/cardinal/default.nix
+++ b/pkgs/applications/audio/cardinal/default.nix
@@ -21,12 +21,12 @@
 
 stdenv.mkDerivation rec {
   pname = "cardinal";
-  version = "22.06";
+  version = "22.07";
 
   src = fetchurl {
     url =
       "https://github.com/DISTRHO/Cardinal/releases/download/${version}/cardinal+deps-${version}.tar.xz";
-    sha256 = "sha256-h7pNoLpB7XkWHZUCQfvJsSnOn37DcP9xuH9kxtfmCos=";
+    sha256 = "sha256-4PpqGfycIwJ7g7gnogPYUO1BnlW7dkwYzw/9QV3R3+g=";
   };
 
   prePatch = ''

From b3759720e05f644fb3e19cc0ef1fcf0b51047881 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 28 Jul 2022 01:49:49 +0000
Subject: [PATCH 19/80] python310Packages.rpy2: 3.5.2 -> 3.5.3

---
 pkgs/development/python-modules/rpy2/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/rpy2/default.nix b/pkgs/development/python-modules/rpy2/default.nix
index f75f3aee622d..ac5eb3a90e75 100644
--- a/pkgs/development/python-modules/rpy2/default.nix
+++ b/pkgs/development/python-modules/rpy2/default.nix
@@ -24,13 +24,13 @@
 }:
 
 buildPythonPackage rec {
-    version = "3.5.2";
+    version = "3.5.3";
     pname = "rpy2";
 
     disabled = isPyPy;
     src = fetchPypi {
       inherit version pname;
-      sha256 = "sha256-Re4A/brQtIHDk2n7MVZR3fhUz0rVbSS33LPHThNb0Q4=";
+      sha256 = "sha256-U6CS1ItE9GQo+zDLMVVmTW0vevCOvExF35jfTEWkLMs=";
     };
 
     patches = [

From 2729e3ec1249e16ccea225de311b944baa47c15b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 28 Jul 2022 02:39:23 +0000
Subject: [PATCH 20/80] cirrus-cli: 0.81.1 -> 0.82.0

---
 .../tools/continuous-integration/cirrus-cli/default.nix       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/continuous-integration/cirrus-cli/default.nix b/pkgs/development/tools/continuous-integration/cirrus-cli/default.nix
index 5b5d13164bf0..15dbb59f11e5 100644
--- a/pkgs/development/tools/continuous-integration/cirrus-cli/default.nix
+++ b/pkgs/development/tools/continuous-integration/cirrus-cli/default.nix
@@ -5,13 +5,13 @@
 
 buildGoModule rec {
   pname = "cirrus-cli";
-  version = "0.81.1";
+  version = "0.82.0";
 
   src = fetchFromGitHub {
     owner = "cirruslabs";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-qbo7QGPvPLalKbiApkpTtPSeIh1SjqEuKXBIuHJJBB8=";
+    sha256 = "sha256-ZOfgzS6cHtjfQPcmS/tDob7WTPtusyD8iUFFSqE2c94=";
   };
 
   vendorSha256 = "sha256-XVGFJv9TYjuwVubTcFVI2b+M2ZDE1Jv4u/dxowcLL2s=";

From e6a5e610f45faa61e9a4b9fcb9984dd7d62ece7b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 28 Jul 2022 04:15:23 +0000
Subject: [PATCH 21/80] civo: 1.0.28 -> 1.0.30

---
 pkgs/applications/networking/cluster/civo/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/cluster/civo/default.nix b/pkgs/applications/networking/cluster/civo/default.nix
index 9066cbe7b9c3..64f5e57d8da0 100644
--- a/pkgs/applications/networking/cluster/civo/default.nix
+++ b/pkgs/applications/networking/cluster/civo/default.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "civo";
-  version = "1.0.28";
+  version = "1.0.30";
 
   src = fetchFromGitHub {
     owner  = "civo";
     repo   = "cli";
     rev    = "v${version}";
-    sha256 = "sha256-PuLmjX7ps0pdfaDpshWrc67OW83/jpB4HkNCi1fzpAU=";
+    sha256 = "sha256-7UEnp42IHW7CyfnUr+j8HP9qV1vtIk9j5mDOXOTi4LY=";
   };
 
-  vendorSha256 = "sha256-VMBMiwBFXKe+E4Xzcmhu2Ge5JzS+jIbUtxTfp+B0EWE=";
+  vendorSha256 = "sha256-2vbjYki+i7DfegvdTFo7XNf9droNeLDzAP2skpLDjDU=";
 
   CGO_ENABLED = 0;
 

From e4277a5b187883a3af0c9ce700cdcf5f0d421302 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 28 Jul 2022 04:18:14 +0000
Subject: [PATCH 22/80] bitwig-studio: 4.3.1 -> 4.3.2

---
 pkgs/applications/audio/bitwig-studio/bitwig-studio4.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/audio/bitwig-studio/bitwig-studio4.nix b/pkgs/applications/audio/bitwig-studio/bitwig-studio4.nix
index ce019af95a8b..1d822f4687e8 100644
--- a/pkgs/applications/audio/bitwig-studio/bitwig-studio4.nix
+++ b/pkgs/applications/audio/bitwig-studio/bitwig-studio4.nix
@@ -6,11 +6,11 @@
 
 stdenv.mkDerivation rec {
   pname = "bitwig-studio";
-  version = "4.3.1";
+  version = "4.3.2";
 
   src = fetchurl {
     url = "https://downloads.bitwig.com/stable/${version}/${pname}-${version}.deb";
-    sha256 = "sha256-8V8ryb+ANPSyjObAKioSYpzNWJTdDA9ax/8gZ3X4mvs=";
+    sha256 = "sha256-vR5C7imMA5oJ5F3Q/tmVNN/FLhFjegFjls9HR4CYoVk=";
   };
 
   nativeBuildInputs = [ dpkg makeWrapper wrapGAppsHook ];

From 4df593f60a35f28340e6ad87f2e48f2232e8ecc3 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 28 Jul 2022 04:24:27 +0000
Subject: [PATCH 23/80] chart-testing: 3.6.0 -> 3.7.0

---
 .../networking/cluster/helm/chart-testing/default.nix       | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/cluster/helm/chart-testing/default.nix b/pkgs/applications/networking/cluster/helm/chart-testing/default.nix
index 85971b8dfb10..38c00f66b2b5 100644
--- a/pkgs/applications/networking/cluster/helm/chart-testing/default.nix
+++ b/pkgs/applications/networking/cluster/helm/chart-testing/default.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "chart-testing";
-  version = "3.6.0";
+  version = "3.7.0";
 
   src = fetchFromGitHub {
     owner = "helm";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-WGoLj6IuhxARSB3vAnprW1UO2g142uKZVHI3ubJepRs=";
+    sha256 = "sha256-wwXHSjb5FeWOx008jpGNzplzRtHyvcxkcHWLOSoaIE0=";
   };
 
-  vendorSha256 = "sha256-gXW1NarCo42d/awg22wr6bIQQFRVTVnRUUAtQU8zY4M=";
+  vendorSha256 = "sha256-VYa97JaVGadltrUH/2S9QU5ndgAjozKUXtmaN0q478Q=";
 
   postPatch = ''
     substituteInPlace pkg/config/config.go \

From 974ce895f8de93cf9a28d8e095d29e04fcf6227a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 28 Jul 2022 04:25:02 +0000
Subject: [PATCH 24/80] chezmoi: 2.18.1 -> 2.19.0

---
 pkgs/tools/misc/chezmoi/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/misc/chezmoi/default.nix b/pkgs/tools/misc/chezmoi/default.nix
index 7fc8f0ad1458..e9476b3d84a0 100644
--- a/pkgs/tools/misc/chezmoi/default.nix
+++ b/pkgs/tools/misc/chezmoi/default.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "chezmoi";
-  version = "2.18.1";
+  version = "2.19.0";
 
   src = fetchFromGitHub {
     owner = "twpayne";
     repo = "chezmoi";
     rev = "v${version}";
-    sha256 = "sha256-eRlEhtpUBZBS3fNrkkXPiktPyGQ2K8MFwsDVo3DUb+o=";
+    sha256 = "sha256-0MZw0sETo8wMqSNInyy1NE+M06Wo9o1NZJGEBZZN9Jk=";
   };
 
-  vendorSha256 = "sha256-u+iFnBzlaa+7heQEI18WWD45TSxEpIY73ZrxjLx84Ic=";
+  vendorSha256 = "sha256-J10C8YbTeQMF815k+IbpdX8BEsCwNB/4VwQWliHQQto=";
 
   doCheck = false;
 

From 3e7b272b72705bcc14225a21f30c42fb9c557469 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 28 Jul 2022 04:25:14 +0000
Subject: [PATCH 25/80] ckan: 1.30.4 -> 1.31.0

---
 pkgs/games/ckan/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/games/ckan/default.nix b/pkgs/games/ckan/default.nix
index 3649369aeaad..88d13b9b6f8d 100644
--- a/pkgs/games/ckan/default.nix
+++ b/pkgs/games/ckan/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "ckan";
-  version = "1.30.4";
+  version = "1.31.0";
 
   src = fetchurl {
     url = "https://github.com/KSP-CKAN/CKAN/releases/download/v${version}/ckan.exe";
-    sha256 = "sha256-IgPqUEDpaIuGoaGoH2GCEzh3KxF3pkJC3VjTYXwSiQE=";
+    sha256 = "sha256-+Tm1aQUibRNn1jfewowOTBHt1OngJKD+Jeh9meg0YxA=";
   };
 
   dontUnpack = true;

From 37ece42470f5a2444580e1f287e3d0625bd7b9e9 Mon Sep 17 00:00:00 2001
From: Chua Hou <human+github@chuahou.dev>
Date: Thu, 28 Jul 2022 12:28:27 +0800
Subject: [PATCH 26/80] stork: 1.4.2 -> 1.5.0

---
 pkgs/applications/misc/stork/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/misc/stork/default.nix b/pkgs/applications/misc/stork/default.nix
index b65dad473590..196e35042284 100644
--- a/pkgs/applications/misc/stork/default.nix
+++ b/pkgs/applications/misc/stork/default.nix
@@ -9,16 +9,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "stork";
-  version = "1.4.2";
+  version = "1.5.0";
 
   src = fetchFromGitHub {
     owner = "jameslittle230";
     repo = "stork";
     rev = "v${version}";
-    sha256 = "sha256-itjRJLbRTwovK+HcNEzwViEDTJ1MoRRTvZD412XYVKk=";
+    sha256 = "sha256-4aNY66y4dY+/MsZZGb5GBIlpZI+bAySff9+BEQUlx9M=";
   };
 
-  cargoSha256 = "sha256-GaYdgC3Bf759ZPcZxoFG0nmCSz7aNHuqtyid6RS8Ui8=";
+  cargoSha256 = "sha256-XyFZSQylBetf9tJLaV97oHbpe0aBadEZ60NyyxK8lfo=";
 
   nativeBuildInputs = [ pkg-config ];
 

From 4a902e9954f3cdcc09a84ffb5cb4f11e23033dc7 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 28 Jul 2022 04:32:08 +0000
Subject: [PATCH 27/80] blueman: 2.3 -> 2.3.1

---
 pkgs/tools/bluetooth/blueman/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/bluetooth/blueman/default.nix b/pkgs/tools/bluetooth/blueman/default.nix
index 4b675c646f31..43c7ee6a251c 100644
--- a/pkgs/tools/bluetooth/blueman/default.nix
+++ b/pkgs/tools/bluetooth/blueman/default.nix
@@ -9,11 +9,11 @@ let
 
 in stdenv.mkDerivation rec {
   pname = "blueman";
-  version = "2.3";
+  version = "2.3.1";
 
   src = fetchurl {
     url = "https://github.com/blueman-project/blueman/releases/download/${version}/${pname}-${version}.tar.xz";
-    sha256 = "sha256-M7pgl9M08XmJwIlPeCRrXgHTFJn5CoZOuTtc5WJv2uo=";
+    sha256 = "sha256-9swQ+lLgcEG+f8cMnB+5SFeT5BBrwUCcjVXJsfwXq4I=";
   };
 
   nativeBuildInputs = [

From cf04b73efcd97f1e2f57d6b965baaad6461a53a7 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 28 Jul 2022 04:32:15 +0000
Subject: [PATCH 28/80] clamav: 0.105.0 -> 0.105.1

---
 pkgs/tools/security/clamav/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/security/clamav/default.nix b/pkgs/tools/security/clamav/default.nix
index 86d729f95d61..eb27468b40fb 100644
--- a/pkgs/tools/security/clamav/default.nix
+++ b/pkgs/tools/security/clamav/default.nix
@@ -6,11 +6,11 @@
 
 stdenv.mkDerivation rec {
   pname = "clamav";
-  version = "0.105.0";
+  version = "0.105.1";
 
   src = fetchurl {
     url = "https://www.clamav.net/downloads/production/${pname}-${version}.tar.gz";
-    sha256 = "sha256-JwIDpUxFgEnbVPzZNoP/Wy2xkVHzY8SOgs7O/d4rNdQ=";
+    sha256 = "sha256-0rwWN024iablpqxA+MbnACVKA5rKpTaIWgnu6kuFKfY=";
   };
 
   patches = [

From efc4bd3a04b2be2008654a1825bc3328da413b23 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 28 Jul 2022 04:32:20 +0000
Subject: [PATCH 29/80] cargo-release: 0.21.0 -> 0.21.1

---
 pkgs/development/tools/rust/cargo-release/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/rust/cargo-release/default.nix b/pkgs/development/tools/rust/cargo-release/default.nix
index 965c94742ec5..7c0917c57d7d 100644
--- a/pkgs/development/tools/rust/cargo-release/default.nix
+++ b/pkgs/development/tools/rust/cargo-release/default.nix
@@ -2,16 +2,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "cargo-release";
-  version = "0.21.0";
+  version = "0.21.1";
 
   src = fetchFromGitHub {
     owner = "crate-ci";
     repo = "cargo-release";
     rev = "v${version}";
-    sha256 = "sha256-QTHevbEifYsf/nCmkarbrHgijjlHragLieCpVZBfKGQ=";
+    sha256 = "sha256-Ll2/wdjJdSW3fA6kscfFROVVrPYer0b5CHyOGUKPXmQ=";
   };
 
-  cargoSha256 = "sha256-hEHEcB42mRn6pO5413wQbEWfJNBbiOSUuy9PGjP5EYw=";
+  cargoSha256 = "sha256-yASjTRldbHnXFpZHncfAdZstdchTHBxCDhxEof3mY6k=";
 
   nativeBuildInputs = [ pkg-config ];
 

From 3648bf2675c04001cd52828ca4c5c47aa9628f58 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 28 Jul 2022 04:49:35 +0000
Subject: [PATCH 30/80] corectrl: 1.2.3 -> 1.2.4

---
 pkgs/applications/misc/corectrl/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/misc/corectrl/default.nix b/pkgs/applications/misc/corectrl/default.nix
index b976ea890747..899939b6cfc2 100644
--- a/pkgs/applications/misc/corectrl/default.nix
+++ b/pkgs/applications/misc/corectrl/default.nix
@@ -21,13 +21,13 @@
 
 stdenv.mkDerivation rec{
   pname = "corectrl";
-  version = "1.2.3";
+  version = "1.2.4";
 
   src = fetchFromGitLab {
     owner = "corectrl";
     repo = "corectrl";
     rev = "v${version}";
-    sha256 = "sha256-vMSIo4tfvEO6SVxB5aNBnHEn+PXN6wUfRAgUCwZEHKQ=";
+    sha256 = "sha256-3WOuPOJEY941JVoF5aQp5LvPeh3shalb6H9FMmmctN4=";
   };
 
   nativeBuildInputs = [

From cd77ca0180d9d3b430313dec794337e5a06e7831 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 28 Jul 2022 04:58:55 +0000
Subject: [PATCH 31/80] conftest: 0.33.1 -> 0.33.2

---
 pkgs/development/tools/conftest/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/conftest/default.nix b/pkgs/development/tools/conftest/default.nix
index 393d3cdcf83f..b42b7c05c1de 100644
--- a/pkgs/development/tools/conftest/default.nix
+++ b/pkgs/development/tools/conftest/default.nix
@@ -2,15 +2,15 @@
 
 buildGoModule rec {
   pname = "conftest";
-  version = "0.33.1";
+  version = "0.33.2";
 
   src = fetchFromGitHub {
     owner = "open-policy-agent";
     repo = "conftest";
     rev = "v${version}";
-    sha256 = "sha256-ok6fBdT0YWXnl8JR/uszUzFM+gJR7LTtOSgGaXvuY88=";
+    sha256 = "sha256-/iSkgICZghnMgpV/Bz3OCTcfJuLmeIsip8Nx2uwVMNw=";
   };
-  vendorSha256 = "sha256-WGrvYPNnHNpsjTxgK8Y/94ELH/peGv7OwZCBFr1UMKk=";
+  vendorSha256 = "sha256-U7BqGlQ5PRbUGvTTMgSo3hcf269GIowEGh87yoWmxqM=";
 
   ldflags = [
     "-s"

From 84defc4b52bd134515ec4c5add6b4ae29d29c2d1 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 28 Jul 2022 05:20:53 +0000
Subject: [PATCH 32/80] duc: 1.4.4 -> 1.4.5

---
 pkgs/tools/misc/duc/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/duc/default.nix b/pkgs/tools/misc/duc/default.nix
index b5fe5074d7e5..d630c9412738 100644
--- a/pkgs/tools/misc/duc/default.nix
+++ b/pkgs/tools/misc/duc/default.nix
@@ -8,13 +8,13 @@ assert enableCairo -> cairo != null && pango != null;
 
 stdenv.mkDerivation rec {
   pname = "duc";
-  version = "1.4.4";
+  version = "1.4.5";
 
   src = fetchFromGitHub {
     owner = "zevv";
     repo = "duc";
     rev = version;
-    sha256 = "1i7ry25xzy027g6ysv6qlf09ax04q4vy0kikl8h0aq5jbxsl9q52";
+    sha256 = "sha256-ZLNsyp82UnsveEfDKzH8WfRh/Y/PQlXq8Ma+jIZl9Gk=";
   };
 
   nativeBuildInputs = [ autoreconfHook pkg-config ];

From ebf1115d4b13cf0b2a4043dcd4733a6ab9c5faa8 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 28 Jul 2022 05:26:20 +0000
Subject: [PATCH 33/80] earthly: 0.6.19 -> 0.6.20

---
 pkgs/development/tools/earthly/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/earthly/default.nix b/pkgs/development/tools/earthly/default.nix
index 43b7b19c6ee5..67a732dc1803 100644
--- a/pkgs/development/tools/earthly/default.nix
+++ b/pkgs/development/tools/earthly/default.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "earthly";
-  version = "0.6.19";
+  version = "0.6.20";
 
   src = fetchFromGitHub {
     owner = "earthly";
     repo = "earthly";
     rev = "v${version}";
-    sha256 = "sha256-TjAooHRkmC9bmgfRSLQByXyyKHVgXqj4X5xbCqAEYpM=";
+    sha256 = "sha256-2tdmAoHh9sqX3zWrerNqnwluQB79iZHPuE0xsPOB09w=";
   };
 
-  vendorSha256 = "sha256-bXu1W0FpEPLBBw4D1B95Q3Uh2Ro2BYvjaPkROJpFlK4=";
+  vendorSha256 = "sha256-LHpmzQeonLFLCs2D1gRACZSdAtRkzzQ7Ftq/2D+PI80=";
 
   ldflags = [
     "-s" "-w"

From c976f3e8f3310f5cb1d889e86d7602b194fc7c2e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 28 Jul 2022 05:40:18 +0000
Subject: [PATCH 34/80] folly: 2022.07.04.00 -> 2022.07.25.00

---
 pkgs/development/libraries/folly/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/folly/default.nix b/pkgs/development/libraries/folly/default.nix
index a8cf6cec5735..2cbe43a93a0f 100644
--- a/pkgs/development/libraries/folly/default.nix
+++ b/pkgs/development/libraries/folly/default.nix
@@ -22,13 +22,13 @@
 
 stdenv.mkDerivation rec {
   pname = "folly";
-  version = "2022.07.04.00";
+  version = "2022.07.25.00";
 
   src = fetchFromGitHub {
     owner = "facebook";
     repo = "folly";
     rev = "v${version}";
-    sha256 = "sha256-TUtqwFBxYMnjXpygwXYWK7FNvTPL4a7T+rn1TMtUIPc=";
+    sha256 = "sha256-Bb6Txg0GNhkRP1qqeracmYENrO6x79HXMuWU2gtGGxU=";
   };
 
   nativeBuildInputs = [

From 6d6a532bf4f31c3d5349b2dbb711668c5c02f8f7 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 28 Jul 2022 05:43:55 +0000
Subject: [PATCH 35/80] fnm: 1.31.0 -> 1.31.1

---
 pkgs/development/tools/fnm/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/fnm/default.nix b/pkgs/development/tools/fnm/default.nix
index c83966c7d6d3..ffcd313de0b0 100644
--- a/pkgs/development/tools/fnm/default.nix
+++ b/pkgs/development/tools/fnm/default.nix
@@ -10,20 +10,20 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "fnm";
-  version = "1.31.0";
+  version = "1.31.1";
 
   src = fetchFromGitHub {
     owner = "Schniz";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-8A6MKDeyuk0bzyoDydcOy4LzyYe/S+x+ZJMTOo59UA8=";
+    sha256 = "sha256-5DonN9tzap3mMu6/WS5evXtOjpRg4g80evCaSOsTgQA=";
   };
 
   nativeBuildInputs = [ installShellFiles ];
 
   buildInputs = lib.optionals stdenv.isDarwin [ DiskArbitration Foundation Security ];
 
-  cargoSha256 = "sha256-oiGYkRqxN6e5EG6EDQalIK0tOekyIVQ+GhxCKK0Sd3g=";
+  cargoSha256 = "sha256-E4Zbk3+fbjZMXRxBcTn9S8XMSts+5m78UIP33oZOsXQ=";
 
   doCheck = false;
 

From 65cd83a18d18c851e80dcb7fcbaf04a1ff1bf7f2 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 28 Jul 2022 05:50:50 +0000
Subject: [PATCH 36/80] evans: 0.10.6 -> 0.10.8

---
 pkgs/development/tools/evans/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/evans/default.nix b/pkgs/development/tools/evans/default.nix
index 3172d3679896..1d012c691018 100644
--- a/pkgs/development/tools/evans/default.nix
+++ b/pkgs/development/tools/evans/default.nix
@@ -2,18 +2,18 @@
 
 buildGoModule rec {
   pname = "evans";
-  version = "0.10.6";
+  version = "0.10.8";
 
   src = fetchFromGitHub {
     owner = "ktr0731";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-rQwoiV87XMz/5GbVOyLDkfIKIgMzBcwY4ln73XCI/so=";
+    sha256 = "sha256-2Fn+pPYknuQCofTNrgDbZ4A6C5hazSqKqlUOUG10ekU=";
   };
 
   subPackages = [ "." ];
 
-  vendorSha256 = "sha256-3R/HRfr1GjJwkCT6xQ51Y/zRcuvknunYKgVpM6jg+wY=";
+  vendorSha256 = "sha256-IxlzSzFEIIBC32S7u1Lkbi/fOxFYlbockNAfl/tnJpA=";
 
   meta = with lib; {
     description = "More expressive universal gRPC client";

From 78ed4d7a936d333821b2604fd40073cacf81bd60 Mon Sep 17 00:00:00 2001
From: figsoda <figsoda@pm.me>
Date: Thu, 28 Jul 2022 12:12:03 +0800
Subject: [PATCH 37/80] menyoki: 1.6.0 -> 1.6.1

---
 pkgs/applications/graphics/menyoki/default.nix | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/graphics/menyoki/default.nix b/pkgs/applications/graphics/menyoki/default.nix
index 296c9d206548..5615044b90e7 100644
--- a/pkgs/applications/graphics/menyoki/default.nix
+++ b/pkgs/applications/graphics/menyoki/default.nix
@@ -4,6 +4,8 @@
 , pkg-config
 , rustPlatform
 , stdenv
+, withSixel ? false
+, libsixel
 , libX11
 , libXrandr
 , AppKit
@@ -12,24 +14,31 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "menyoki";
-  version = "1.6.0";
+  version = "1.6.1";
 
   src = fetchFromGitHub {
     owner = "orhun";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-7dqV18+Q0M1PrSXfMro5bUqSeA72Stj5JfP4MsTlrjM=";
+    sha256 = "sha256-z0OpRnjVfU6vcyZsxkdD2x3l+a9GkDHZcFveGunDYww=";
   };
 
-  cargoSha256 = "sha256-c3VpHr/X2tKh7mY4dOQac0lS7oem0GGqjzv7feNwc24=";
+  cargoSha256 = "sha256-uSoyfgPlsHeUwnTHE49ErrlB65wcfl5dxn/YrW5EKZw=";
 
   nativeBuildInputs = [ installShellFiles ]
     ++ lib.optional stdenv.isLinux pkg-config;
 
-  buildInputs = lib.optionals stdenv.isLinux [ libX11 libXrandr ]
+  buildInputs = lib.optional withSixel libsixel
+    ++ lib.optionals stdenv.isLinux [ libX11 libXrandr ]
     ++ lib.optional stdenv.isDarwin AppKit;
 
   buildNoDefaultFeatures = !withSki;
+  buildFeatures = lib.optional withSixel "sixel";
+
+  checkFlags = [
+    # sometimes fails on lower end machines
+    "--skip=record::fps::tests::test_fps"
+  ];
 
   postInstall = ''
     installManPage man/*

From 4fd58033a7313e2bcd8f656450d6a5dc70269d8b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 28 Jul 2022 06:08:19 +0000
Subject: [PATCH 38/80] flyctl: 0.0.351 -> 0.0.362

---
 pkgs/development/web/flyctl/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/web/flyctl/default.nix b/pkgs/development/web/flyctl/default.nix
index cdc82dc26aed..ba822cdd6c59 100644
--- a/pkgs/development/web/flyctl/default.nix
+++ b/pkgs/development/web/flyctl/default.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "flyctl";
-  version = "0.0.351";
+  version = "0.0.362";
 
   src = fetchFromGitHub {
     owner = "superfly";
     repo = "flyctl";
     rev = "v${version}";
-    sha256 = "sha256-vxX11kaQMOQ2LJ/2q4QrlzMmuJtkn1Oe1iBHQgXn0mI=";
+    sha256 = "sha256-MpMMsA7fY5apKh7+9H3ZItzPIRJ08Mw6E26h+0DDoj4=";
   };
 
-  vendorSha256 = "sha256-gAdKrPU6js3zrzX2+NWQZSXxGuuUiggprua4gvd++OQ=";
+  vendorSha256 = "sha256-SbbBXkb/+N6uF3HHbGSi/tIA6s6YYkKhZfuNWWvuqHA=";
 
   subPackages = [ "." ];
 

From a9a2976ecc6db5cd8e7e4800a957aab31c998936 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 28 Jul 2022 06:28:54 +0000
Subject: [PATCH 39/80] sarasa-gothic: 0.36.2 -> 0.36.8

---
 pkgs/data/fonts/sarasa-gothic/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/data/fonts/sarasa-gothic/default.nix b/pkgs/data/fonts/sarasa-gothic/default.nix
index c9bc0aa7922b..ef923ba9a888 100644
--- a/pkgs/data/fonts/sarasa-gothic/default.nix
+++ b/pkgs/data/fonts/sarasa-gothic/default.nix
@@ -1,14 +1,14 @@
 { lib, fetchurl, libarchive }:
 
 let
-  version = "0.36.2";
+  version = "0.36.8";
 in fetchurl {
   name = "sarasa-gothic-${version}";
 
   # Use the 'ttc' files here for a smaller closure size.
   # (Using 'ttf' files gives a closure size about 15x larger, as of November 2021.)
   url = "https://github.com/be5invis/Sarasa-Gothic/releases/download/v${version}/sarasa-gothic-ttc-${version}.7z";
-  sha256 = "sha256-hUQi8mbtQC+peslaz+AVINjELVXseuVi44qbDBtJ+fc=";
+  sha256 = "sha256-lKrpaTVYmV3wr1Uj5Yqj1p1t0CYF0ApX7j+QFNfpdz0=";
 
   recursiveHash = true;
   downloadToTemp = true;

From 0fe8e4bd73efda91dafa68870476d012c3d10088 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 28 Jul 2022 06:34:29 +0000
Subject: [PATCH 40/80] fluxctl: 1.25.2 -> 1.25.3

---
 pkgs/applications/networking/cluster/fluxctl/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/cluster/fluxctl/default.nix b/pkgs/applications/networking/cluster/fluxctl/default.nix
index dd9875929258..cda692cacf42 100644
--- a/pkgs/applications/networking/cluster/fluxctl/default.nix
+++ b/pkgs/applications/networking/cluster/fluxctl/default.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "fluxctl";
-  version = "1.25.2";
+  version = "1.25.3";
 
   src = fetchFromGitHub {
     owner = "weaveworks";
     repo = "flux";
     rev = version;
-    sha256 = "sha256-OZLTT54InDPF+m5e4xtuAL311wCD16Ne/T0PbgiSaN4=";
+    sha256 = "sha256-tV6rPpZW3HWxUBUdDkYOP6gIc/ZD+CMmT7FVYXiLp5A=";
   };
 
-  vendorSha256 = "sha256-Q9THG76/B/gdfhf5wLxVXoAAzXeOjaaAyYaGKy9LeF0=";
+  vendorSha256 = "sha256-wApm7IXblhQiV7VpBXZndJgFpQmq2WEFjCEG1qd+Nlo=";
 
   nativeBuildInputs = [ installShellFiles ];
 

From 577c3b801c77c967b90dc7e77ca97620c4fdc996 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 28 Jul 2022 06:35:08 +0000
Subject: [PATCH 41/80] flyway: 8.5.13 -> 9.0.2

---
 pkgs/development/tools/flyway/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/flyway/default.nix b/pkgs/development/tools/flyway/default.nix
index 4cf9efb964ab..5caab59579f8 100644
--- a/pkgs/development/tools/flyway/default.nix
+++ b/pkgs/development/tools/flyway/default.nix
@@ -1,10 +1,10 @@
 { lib, stdenv, fetchurl, jre_headless, makeWrapper }:
 stdenv.mkDerivation rec{
   pname = "flyway";
-  version = "8.5.13";
+  version = "9.0.2";
   src = fetchurl {
     url = "mirror://maven/org/flywaydb/flyway-commandline/${version}/flyway-commandline-${version}.tar.gz";
-    sha256 = "sha256-9MEsZ5lc9cF7MKD+dYdZGR9cnMHFxELACp4gsC0gzRc=";
+    sha256 = "sha256-tio76LolcD7dk3cNyNOH9mjq7h59mRynflCIbwkAcZ0=";
   };
   nativeBuildInputs = [ makeWrapper ];
   dontBuild = true;

From 246efd98a1bc4636d2d88edac7dd2d252a7ed69d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 28 Jul 2022 06:41:41 +0000
Subject: [PATCH 42/80] gops: 0.3.22 -> 0.3.25

---
 pkgs/development/tools/gops/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/gops/default.nix b/pkgs/development/tools/gops/default.nix
index 8fce1ee97824..3804368d20fe 100644
--- a/pkgs/development/tools/gops/default.nix
+++ b/pkgs/development/tools/gops/default.nix
@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   pname = "gops";
-  version = "0.3.22";
+  version = "0.3.25";
 
   src = fetchFromGitHub {
     owner = "google";
     repo = "gops";
     rev = "v${version}";
-    sha256 = "sha256-97D92sWGqtMGzwrQ3NUR7prgsqtJvAQOjYlfmSWIEKo=";
+    sha256 = "sha256-y2T+v4EafiVuyRiuQdNDECc06e5eHtquvGA9ugW55Bs=";
   };
 
   vendorSha256 = null;

From e9790787cac469b8a7b97c4a5a060af9e59671fe Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 28 Jul 2022 06:46:30 +0000
Subject: [PATCH 43/80] fq: 0.0.7 -> 0.0.8

---
 pkgs/development/tools/fq/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/fq/default.nix b/pkgs/development/tools/fq/default.nix
index 76757e1f8914..697899ad8672 100644
--- a/pkgs/development/tools/fq/default.nix
+++ b/pkgs/development/tools/fq/default.nix
@@ -7,16 +7,16 @@
 
 buildGoModule rec {
   pname = "fq";
-  version = "0.0.7";
+  version = "0.0.8";
 
   src = fetchFromGitHub {
     owner = "wader";
     repo = "fq";
     rev = "v${version}";
-    sha256 = "sha256-4bCJcLpU/k87p884jw9Gq1i6ocuD4vMn4PuOStihssE=";
+    sha256 = "sha256-9ABlfA7osM1bYMwNy/pQyb32uJbwZry3s3iGHBXiQHQ=";
   };
 
-  vendorSha256 = "sha256-XsMhxQ83nQO3fQ1EN2XxcZeN+I96h8mcAq+TNIvbTyo=";
+  vendorSha256 = "sha256-GDhaeR26MXWR23yVy4kjo/mIUR3vezEs8twjoRgzbwU=";
 
   ldflags = [
     "-s"

From d6022761d03c81c84059a0104a952d0d5cc65c12 Mon Sep 17 00:00:00 2001
From: figsoda <figsoda@pm.me>
Date: Thu, 28 Jul 2022 15:47:10 +0800
Subject: [PATCH 44/80] nomino: 1.1.0 -> 1.2.1

---
 pkgs/tools/misc/nomino/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/misc/nomino/default.nix b/pkgs/tools/misc/nomino/default.nix
index d30d40527e10..c8dcfd313031 100644
--- a/pkgs/tools/misc/nomino/default.nix
+++ b/pkgs/tools/misc/nomino/default.nix
@@ -2,16 +2,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "nomino";
-  version = "1.1.0";
+  version = "1.2.1";
 
   src = fetchFromGitHub {
     owner = "yaa110";
     repo = pname;
     rev = version;
-    sha256 = "1nnyz4gkwrc2zccw0ir5kvmiyyv3r0vxys9r7j4cf0ymngal5kwp";
+    sha256 = "sha256-+bnEuSro3/t9aXu2WpwsaqHqB+poSXsVbna01a7pnKo=";
   };
 
-  cargoSha256 = "0501w3124vkipb1rnksjaizkghw3jf3nmmmmf3zprmcaim1b4szg";
+  cargoSha256 = "sha256-IKsA8btCmKnZfRIwS4QdxJMi1As6SNbTI7ibOL7M+5U=";
 
   meta = with lib; {
     description = "Batch rename utility for developers";

From 755af2930791ff6d986ca140336a102c887bc767 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 28 Jul 2022 07:48:17 +0000
Subject: [PATCH 45/80] alfis: 0.7.6 -> 0.7.7

---
 pkgs/applications/blockchains/alfis/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/blockchains/alfis/default.nix b/pkgs/applications/blockchains/alfis/default.nix
index bde3bb71e9a7..0fd55594f2ef 100644
--- a/pkgs/applications/blockchains/alfis/default.nix
+++ b/pkgs/applications/blockchains/alfis/default.nix
@@ -14,16 +14,16 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "alfis";
-  version = "0.7.6";
+  version = "0.7.7";
 
   src = fetchFromGitHub {
     owner = "Revertron";
     repo = "Alfis";
     rev = "v${version}";
-    sha256 = "sha256-g9oaUdmwHGU2EIqSYLGlSN8597ORTzm8XzTxBbiKUNA=";
+    sha256 = "sha256-I9vJc3J3OoUA6GOc8NkWBKSCkjHC4KOztglJOg9S0Eo=";
   };
 
-  cargoSha256 = "sha256-SNROmuChSOHUMhMCTKPOOuoYOATx9JEwuVP0mtGZ/G8=";
+  cargoSha256 = "sha256-VVBO2w6iwZ+K4gnN6+TckgBXCCc/dGO6/yZEunWGK8g=";
 
   checkFlags = [
     # these want internet access, disable them

From 2f2faa44be3b34c0fa1481adeb39ec7260d494b8 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 28 Jul 2022 07:52:46 +0000
Subject: [PATCH 46/80] argo-rollouts: 1.2.1 -> 1.2.2

---
 .../applications/networking/cluster/argo-rollouts/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/cluster/argo-rollouts/default.nix b/pkgs/applications/networking/cluster/argo-rollouts/default.nix
index 371d0b3a55d6..e3e15162d7b2 100644
--- a/pkgs/applications/networking/cluster/argo-rollouts/default.nix
+++ b/pkgs/applications/networking/cluster/argo-rollouts/default.nix
@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   pname = "argo-rollouts";
-  version = "1.2.1";
+  version = "1.2.2";
 
   src = fetchFromGitHub {
     owner = "argoproj";
     repo = "argo-rollouts";
     rev = "v${version}";
-    sha256 = "sha256-1oF93+pN9wyCq5R5bTeMN/uzg9DHpc/AkX/d1lB5r1g=";
+    sha256 = "sha256-l23RVpwT/XYkpVTWkSYdPyvn7Xirs0Sf85U6Wrx5H1k=";
   };
 
   vendorSha256 = "sha256-URuIeF1ejKdMGxziJbujLctYheiIr/Jfo+gTzppZG9E=";

From 07d04d6febdedf5dcecb419987d4195cf0f25d7f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 28 Jul 2022 08:28:46 +0000
Subject: [PATCH 47/80] azure-storage-azcopy: 10.15.0 -> 10.16.0

---
 pkgs/development/tools/azcopy/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/azcopy/default.nix b/pkgs/development/tools/azcopy/default.nix
index b4233ca8693c..c4572f9e1bf9 100644
--- a/pkgs/development/tools/azcopy/default.nix
+++ b/pkgs/development/tools/azcopy/default.nix
@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   pname = "azure-storage-azcopy";
-  version = "10.15.0";
+  version = "10.16.0";
 
   src = fetchFromGitHub {
     owner = "Azure";
     repo = "azure-storage-azcopy";
     rev = "v${version}";
-    sha256 = "sha256-iXMkvrBANuOIyyVyQ11YQ1DWRQf4JAtu+1Ou3aQrhlc=";
+    sha256 = "sha256-FLrYovepVOE1NUB46Kc8z/l5o6IMFbJyY3smxPyuIsI=";
   };
 
   subPackages = [ "." ];

From a7a70ae4abdd691a5a7399fedcb661fa9d0d27a8 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 28 Jul 2022 09:02:35 +0000
Subject: [PATCH 48/80] python310Packages.azure-mgmt-cosmosdb: 6.4.0 -> 7.0.0

---
 .../python-modules/azure-mgmt-cosmosdb/default.nix            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/azure-mgmt-cosmosdb/default.nix b/pkgs/development/python-modules/azure-mgmt-cosmosdb/default.nix
index f546f2e23e0d..f4dab34b4980 100644
--- a/pkgs/development/python-modules/azure-mgmt-cosmosdb/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-cosmosdb/default.nix
@@ -11,12 +11,12 @@
 
 buildPythonPackage rec {
   pname = "azure-mgmt-cosmosdb";
-  version = "6.4.0";
+  version = "7.0.0";
 
   src = fetchPypi {
     inherit pname version;
     extension = "zip";
-    sha256 = "fb6b8ab80ab97214b94ae9e462ba1c459b68a3af296ffc26317ebd3ff500e00b";
+    sha256 = "sha256-NMwcqgvxwma+aXUhL8OQm+tpH+MCCjHMALf0Ii8bQlo=";
   };
 
   propagatedBuildInputs = [

From 52a3ebab0ac51f727717784c2cd220ddff08470b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 28 Jul 2022 09:45:28 +0000
Subject: [PATCH 49/80] buildkite-cli: 1.2.0 -> 2.0.0

---
 .../tools/continuous-integration/buildkite-cli/default.nix  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/continuous-integration/buildkite-cli/default.nix b/pkgs/development/tools/continuous-integration/buildkite-cli/default.nix
index 116cb78d78b0..0c04ece125d3 100644
--- a/pkgs/development/tools/continuous-integration/buildkite-cli/default.nix
+++ b/pkgs/development/tools/continuous-integration/buildkite-cli/default.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "buildkite-cli";
-  version = "1.2.0";
+  version = "2.0.0";
 
   src = fetchFromGitHub {
     owner = "buildkite";
     repo = "cli";
     rev = "v${version}";
-    sha256 = "sha256-AIa+hEYtPJ4CFvAFSpNJFxY+B3+DJH1Q0hL/3BD/yN0=";
+    sha256 = "sha256-4MUgyUKyycsreAMVtyKJFpQOHvI6JJSn7TUZtbQANyc=";
   };
 
-  vendorSha256 = "sha256-4AH9PZWSrBXi9w4Mr7dpXqDkQZGzuELG876YCaFTj2Q=";
+  vendorSha256 = "sha256-3x7yJenJ2BHdqVPaBaqfFVeOSJZ/VRNF/TTfSsw+2os=";
 
   doCheck = false;
 

From c245ed1cc1cc359e6cb333af56fac4e7db6cd3aa Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 28 Jul 2022 09:46:19 +0000
Subject: [PATCH 50/80] buf: 1.6.0 -> 1.7.0

---
 pkgs/development/tools/buf/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/buf/default.nix b/pkgs/development/tools/buf/default.nix
index c853e361bae9..aae1c7af173b 100644
--- a/pkgs/development/tools/buf/default.nix
+++ b/pkgs/development/tools/buf/default.nix
@@ -10,16 +10,16 @@
 
 buildGoModule rec {
   pname = "buf";
-  version = "1.6.0";
+  version = "1.7.0";
 
   src = fetchFromGitHub {
     owner = "bufbuild";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-sqByTrhtaytBMD8ULOP+xoacxMD6sw3n2XYVZ1hWIJ4=";
+    sha256 = "sha256-ALqyl5GLOxwsojR0/hfjO4yD3AEkyQK+faa3smMW94c=";
   };
 
-  vendorSha256 = "sha256-H000xhqjSFXGW3Saa/ryYdVcDl2ieeSW3dq3DPVX+c0=";
+  vendorSha256 = "sha256-K+CAC2OrmjzpRF0DLSYp21BgvkxtJCF2FdpzYx/CqGI=";
 
   patches = [
     # Skip a test that requires networking to be available to work.

From 1127c761f9654b5390b114a0cb881c3b4bfc1507 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 28 Jul 2022 09:51:12 +0000
Subject: [PATCH 51/80] cargo-public-api: 0.12.2 -> 0.12.4

---
 pkgs/development/tools/rust/cargo-public-api/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/rust/cargo-public-api/default.nix b/pkgs/development/tools/rust/cargo-public-api/default.nix
index ef4f8dcb2fb2..e58c741d2c71 100644
--- a/pkgs/development/tools/rust/cargo-public-api/default.nix
+++ b/pkgs/development/tools/rust/cargo-public-api/default.nix
@@ -8,14 +8,14 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "cargo-public-api";
-  version = "0.12.2";
+  version = "0.12.4";
 
   src = fetchCrate {
     inherit pname version;
-    sha256 = "sha256-ZpzR6A9mV6ARz2+SedVtLjNANOEj8Ks09AWcQooltug=";
+    sha256 = "sha256-URCKsI7q0/b8KkCooKeYr342m7C8ukJJITRDgOUmcEM=";
   };
 
-  cargoSha256 = "sha256-8BZ1fPzRSJysyLCmoMxk+8xOfmfIs7viHFCeSfnxvt8=";
+  cargoSha256 = "sha256-qXJeNbGvC6zoxdn2QmApw1m7gn4CI1eUC3Cqhrn8dpU=";
 
   nativeBuildInputs = [ pkg-config ];
 

From 55ed608144b1b1ffb8e942953dc0e9cb3a575861 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 28 Jul 2022 10:07:51 +0000
Subject: [PATCH 52/80] clickhouse-backup: 1.4.7 -> 1.4.9

---
 pkgs/development/tools/database/clickhouse-backup/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/database/clickhouse-backup/default.nix b/pkgs/development/tools/database/clickhouse-backup/default.nix
index 2d3cec52af2d..a52fdcbd5f34 100644
--- a/pkgs/development/tools/database/clickhouse-backup/default.nix
+++ b/pkgs/development/tools/database/clickhouse-backup/default.nix
@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   pname = "clickhouse-backup";
-  version = "1.4.7";
+  version = "1.4.9";
 
   src = fetchFromGitHub {
     owner = "AlexAkulov";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-1lkG8Rboq6t/hRrdAweo3Kxz9IkukQ39sQSpidFTElw=";
+    sha256 = "sha256-I/4o9hynmB9Bj3WDgrNesy9noUgtV8pMOcSaA2EsX2o=";
   };
 
   vendorSha256 = "sha256-N4zAdylb7etNknR0/VjIVkuI6kTWlk137HNT03Y2gWs=";

From 1ca340bb4d6c83a47d5f8254a049d01940781234 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 28 Jul 2022 11:40:12 +0000
Subject: [PATCH 53/80] ent-go: 0.10.1 -> 0.11.0

---
 pkgs/development/tools/ent/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/ent/default.nix b/pkgs/development/tools/ent/default.nix
index c9ed951d5960..42de24825e41 100644
--- a/pkgs/development/tools/ent/default.nix
+++ b/pkgs/development/tools/ent/default.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "ent-go";
-  version = "0.10.1";
+  version = "0.11.0";
 
   src = fetchFromGitHub {
     owner = "ent";
     repo = "ent";
     rev = "v${version}";
-    sha256 = "sha256-MvfbQKGVYWbZkqc3X3BqsB+z2KMkr0gMOquL02qHwUY=";
+    sha256 = "sha256-EPUaBOvEAOjA24EYD0pyuNRdyX9qPxERXrBzHXC6cLI=";
   };
 
-  vendorSha256 = "sha256-BF2eD/jOtY1XhZ0hB7f3/frKQYwS9PbuGxum5SSnjzA=";
+  vendorSha256 = "sha256-Q5vnfhUcbTmk3+t0D0z4dwU6pXKT7/hTfVHOUPXEzrg=";
 
   subPackages = [ "cmd/ent" ];
 

From 6af873487fd3bb94238a128a9ae49169af44f663 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 28 Jul 2022 11:41:33 +0000
Subject: [PATCH 54/80] ergo: 4.0.34 -> 4.0.35

---
 pkgs/applications/blockchains/ergo/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/blockchains/ergo/default.nix b/pkgs/applications/blockchains/ergo/default.nix
index 67f44eac450e..85c616304b74 100644
--- a/pkgs/applications/blockchains/ergo/default.nix
+++ b/pkgs/applications/blockchains/ergo/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "ergo";
-  version = "4.0.34";
+  version = "4.0.35";
 
   src = fetchurl {
     url = "https://github.com/ergoplatform/ergo/releases/download/v${version}/ergo-${version}.jar";
-    sha256 = "sha256-VFzjoa9TdFMSdWtYvpW1ZfECEmuj25yCXIV99/lzZwI=";
+    sha256 = "sha256-DrDBGb3/trIqHuitj6YVRmXT1/sz9sWQcW4OHj4vhLo=";
   };
 
   nativeBuildInputs = [ makeWrapper ];

From bcf8331300549a8028fc00694291d218202c33bf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@sap.com>
Date: Thu, 28 Jul 2022 14:02:42 +0200
Subject: [PATCH 55/80] lscolors: 0.9.0 -> 0.11.0

---
 pkgs/applications/misc/lscolors/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/misc/lscolors/default.nix b/pkgs/applications/misc/lscolors/default.nix
index cdbc1c23d236..b51bf337f664 100644
--- a/pkgs/applications/misc/lscolors/default.nix
+++ b/pkgs/applications/misc/lscolors/default.nix
@@ -2,14 +2,14 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "lscolors";
-  version = "0.9.0";
+  version = "0.11.0";
 
   src = fetchCrate {
     inherit version pname;
-    sha256 = "sha256-8r1MTc6sSgHXuioagj7K4f6Kf4WYnnpie17tvzhz7+M=";
+    sha256 = "sha256-TGraX1H9grqTm3kQ3NLET2EnD9pzdiblEfMt+g5Szkc=";
   };
 
-  cargoSha256 = "sha256-GsrQKv34EWepq0ihRmINMkShl8nyGQ1Q2De+1Y53TUo=";
+  cargoSha256 = "sha256-OAQaazT4ChmTokw5yFKaGxwAXJklNgPWaegJVsCkOaA=";
 
   # setid is not allowed in the sandbox
   checkFlags = [ "--skip=tests::style_for_setid" ];

From 4024625aa6cf03de652d171caca32e97c4976efc Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 28 Jul 2022 12:03:03 +0000
Subject: [PATCH 56/80] flannel: 0.18.1 -> 0.19.0

---
 pkgs/tools/networking/flannel/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/flannel/default.nix b/pkgs/tools/networking/flannel/default.nix
index 68c3dc6b99cd..a4480f4eac4e 100644
--- a/pkgs/tools/networking/flannel/default.nix
+++ b/pkgs/tools/networking/flannel/default.nix
@@ -4,7 +4,7 @@ with lib;
 
 buildGoModule rec {
   pname = "flannel";
-  version = "0.18.1";
+  version = "0.19.0";
   rev = "v${version}";
 
   vendorSha256 = null;
@@ -13,7 +13,7 @@ buildGoModule rec {
     inherit rev;
     owner = "flannel-io";
     repo = "flannel";
-    sha256 = "sha256-l0W896miwnILQo3VWozV1aMNZoSerydUzWltl7D9y1E=";
+    sha256 = "sha256-vWDOEeHJaXGo+p60ls3a5FGwjDBI49QdZ92ibxO1aEU=";
   };
 
   ldflags = [ "-X github.com/flannel-io/flannel/version.Version=${rev}" ];

From bfb856696deea26dd6aa001ede88cd79410d4bbe Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 28 Jul 2022 12:39:08 +0000
Subject: [PATCH 57/80] gh-ost: 1.1.4 -> 1.1.5

---
 pkgs/tools/misc/gh-ost/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/misc/gh-ost/default.nix b/pkgs/tools/misc/gh-ost/default.nix
index 948132416ab5..5692ac812dee 100644
--- a/pkgs/tools/misc/gh-ost/default.nix
+++ b/pkgs/tools/misc/gh-ost/default.nix
@@ -2,13 +2,13 @@
 
 buildGoPackage rec {
   pname = "gh-ost";
-  version = "1.1.4";
+  version = "1.1.5";
 
   src = fetchFromGitHub {
     owner = "github";
     repo = "gh-ost";
     rev = "v${version}";
-    sha256 = "sha256-HtLtwqPijOE19iJ2AUNAnyc2ujLPeH43HSg3QRBbKEg=";
+    sha256 = "sha256-FTWKbZ/32cr/BUI+jtV0HYlWDFz+R2YQd6ZSzilDj64=";
   };
 
   goPackagePath = "github.com/github/gh-ost";

From df94e3fdce2479ca4760b68a88b889efa9cc6c2e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 28 Jul 2022 14:51:34 +0000
Subject: [PATCH 58/80] i2pd: 2.41.0 -> 2.42.1

---
 pkgs/tools/networking/i2pd/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/i2pd/default.nix b/pkgs/tools/networking/i2pd/default.nix
index 01328f66a4d8..ab245540c9b6 100644
--- a/pkgs/tools/networking/i2pd/default.nix
+++ b/pkgs/tools/networking/i2pd/default.nix
@@ -10,13 +10,13 @@ assert upnpSupport -> miniupnpc != null;
 
 stdenv.mkDerivation rec {
   pname = "i2pd";
-  version = "2.41.0";
+  version = "2.42.1";
 
   src = fetchFromGitHub {
     owner = "PurpleI2P";
     repo = pname;
     rev = version;
-    sha256 = "sha256-fQqbZYb0brGmGf7Yc/2Zd5BZ+YOkGYC3o9uhShYdAE4=";
+    sha256 = "sha256-q44r+PVGxeoElVfthUh++X8EhxbzqJwjC/r5TD+89WA=";
   };
 
   buildInputs = with lib; [ boost zlib openssl ]

From eff79f3bbff76b4fd46b9817d49b4d1ff337d3ce Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 28 Jul 2022 15:50:58 +0000
Subject: [PATCH 59/80] infracost: 0.10.0 -> 0.10.8

---
 pkgs/tools/misc/infracost/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/misc/infracost/default.nix b/pkgs/tools/misc/infracost/default.nix
index 172bcc074a5b..f9336fc53355 100644
--- a/pkgs/tools/misc/infracost/default.nix
+++ b/pkgs/tools/misc/infracost/default.nix
@@ -2,15 +2,15 @@
 
 buildGoModule rec {
   pname = "infracost";
-  version = "0.10.0";
+  version = "0.10.8";
 
   src = fetchFromGitHub {
     owner = "infracost";
     rev = "v${version}";
     repo = "infracost";
-    sha256 = "sha256-soMATF2lVFFwdKjqm7YiQ66MsjOk2pyrohFlHMMGiW0=";
+    sha256 = "sha256-2jA6X/emjRl3hiy1riOUAhtb9gocs3rcs8i4TvzXXvc=";
   };
-  vendorSha256 = "sha256-gPNQQQvHQch4Qa4c6OtS26lohhigzspB5M5H4NvvJY0=";
+  vendorSha256 = "sha256-uoGkckOIEUa5aoiUMEY1f+emgLo8hyUqKtcNvOGPOMI=";
 
   ldflags = [ "-s" "-w" "-X github.com/infracost/infracost/internal/version.Version=v${version}" ];
 

From 7abd24983ece320efcee8ea696c61c71b50d48e7 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 28 Jul 2022 17:38:08 +0000
Subject: [PATCH 60/80] kalker: 1.1.0 -> 2.0.0

---
 pkgs/tools/misc/kalker/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/misc/kalker/default.nix b/pkgs/tools/misc/kalker/default.nix
index b4a84adb457f..8e976bb063ef 100644
--- a/pkgs/tools/misc/kalker/default.nix
+++ b/pkgs/tools/misc/kalker/default.nix
@@ -6,16 +6,16 @@
 }:
 rustPlatform.buildRustPackage rec {
   pname = "kalker";
-  version = "1.1.0";
+  version = "2.0.0";
 
   src = fetchFromGitHub {
     owner = "PaddiM8";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-NnX4+VmV4oZg/8Z3ZCWHGZ6dqDfvH30XErnrvKMxyls=";
+    sha256 = "sha256-D7FlX72fcbeVtQ/OtK2Y3P1hZ5Bmowa04up5rTTXDDU=";
   };
 
-  cargoSha256 = "sha256-nSLbe3EhcLYylvyzOWuLIehBnD6mMofsNpFQVEybV8k=";
+  cargoSha256 = "sha256-r20kQG6YeNGGb7ovYaAx+4DGijZSmf5YoIYh3z5zOpk=";
 
   buildInputs = [ gmp mpfr libmpc ];
 

From 5883dc3bccc09fe1396ce5e6e3e58859212e9dd1 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Thu, 28 Jul 2022 19:44:58 +0200
Subject: [PATCH 61/80] python310Packages.azure-mgmt-cosmosdb: disable on older
 Python releases

---
 .../python-modules/azure-mgmt-cosmosdb/default.nix     | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/development/python-modules/azure-mgmt-cosmosdb/default.nix b/pkgs/development/python-modules/azure-mgmt-cosmosdb/default.nix
index f4dab34b4980..d1a717802432 100644
--- a/pkgs/development/python-modules/azure-mgmt-cosmosdb/default.nix
+++ b/pkgs/development/python-modules/azure-mgmt-cosmosdb/default.nix
@@ -5,18 +5,20 @@
 , msrestazure
 , azure-common
 , azure-mgmt-core
-, azure-mgmt-nspkg
-, isPy3k
+, pythonOlder
 }:
 
 buildPythonPackage rec {
   pname = "azure-mgmt-cosmosdb";
   version = "7.0.0";
+  format = "setuptools";
+
+  disabled = pythonOlder "3.6";
 
   src = fetchPypi {
     inherit pname version;
     extension = "zip";
-    sha256 = "sha256-NMwcqgvxwma+aXUhL8OQm+tpH+MCCjHMALf0Ii8bQlo=";
+    hash = "sha256-NMwcqgvxwma+aXUhL8OQm+tpH+MCCjHMALf0Ii8bQlo=";
   };
 
   propagatedBuildInputs = [
@@ -24,8 +26,6 @@ buildPythonPackage rec {
     msrestazure
     azure-common
     azure-mgmt-core
-  ] ++ lib.optionals (!isPy3k) [
-    azure-mgmt-nspkg
   ];
 
   # has no tests

From 1f7149414859e9aa25591577de9b22705376592f Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Thu, 28 Jul 2022 19:54:33 +0200
Subject: [PATCH 62/80] naabu: 2.0.8 -> 2.0.9

---
 pkgs/tools/security/naabu/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/security/naabu/default.nix b/pkgs/tools/security/naabu/default.nix
index 600e2000bc3f..ab34d667ee29 100644
--- a/pkgs/tools/security/naabu/default.nix
+++ b/pkgs/tools/security/naabu/default.nix
@@ -6,16 +6,16 @@
 
 buildGoModule rec {
   pname = "naabu";
-  version = "2.0.8";
+  version = "2.0.9";
 
   src = fetchFromGitHub {
     owner = "projectdiscovery";
     repo = "naabu";
     rev = "v${version}";
-    sha256 = "sha256-W0GFSshnVmejq0XHZHFZRHB+RVSsUsHLRqGtyxo/BmQ=";
+    sha256 = "sha256-RmgyltdBk8uiE8EU5fJROJgCz0bTT1aUp8ZzbsnCzow=";
   };
 
-  vendorSha256 = "sha256-+VtQz4objH5Z6IIuQj63E7L9nMWxb5mWK2H/MF0+FxE=";
+  vendorSha256 = "sha256-5Rp+/RPUmD3bAPEFGH03swx9/eV7dvvVL3UNwfIGkgQ=";
 
   buildInputs = [
     libpcap

From e8982052837a64969bab75b37acd49b3b2c1edc6 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Thu, 28 Jul 2022 19:58:38 +0200
Subject: [PATCH 63/80] python310Packages.fastcore: 1.5.9 -> 1.5.11

---
 pkgs/development/python-modules/fastcore/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/fastcore/default.nix b/pkgs/development/python-modules/fastcore/default.nix
index 99f2e12ae9ad..dea9e8a33970 100644
--- a/pkgs/development/python-modules/fastcore/default.nix
+++ b/pkgs/development/python-modules/fastcore/default.nix
@@ -8,7 +8,7 @@
 
 buildPythonPackage rec {
   pname = "fastcore";
-  version = "1.5.9";
+  version = "1.5.11";
   format = "setuptools";
 
   disabled = pythonOlder "3.8";
@@ -17,7 +17,7 @@ buildPythonPackage rec {
     owner = "fastai";
     repo = pname;
     rev = "refs/tags/${version}";
-    sha256 = "sha256-8sRFTiGHhrVLOOa6sZMzUVOaMuzeDCCsaq6BSeQvkuo=";
+    sha256 = "sha256-VEiG2m9rCla6i8Q2KrO+0pnhxyFh4o/eCU5rDlbTAbs=";
   };
 
   propagatedBuildInputs = [

From 493659c8fbadf48ad648fd6c13bb4f035f8ef380 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Thu, 28 Jul 2022 20:01:11 +0200
Subject: [PATCH 64/80] python310Packages.hahomematic: 2022.7.13 -> 2022.7.14

---
 pkgs/development/python-modules/hahomematic/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/hahomematic/default.nix b/pkgs/development/python-modules/hahomematic/default.nix
index 4ad242570027..6a358088b50e 100644
--- a/pkgs/development/python-modules/hahomematic/default.nix
+++ b/pkgs/development/python-modules/hahomematic/default.nix
@@ -14,7 +14,7 @@
 
 buildPythonPackage rec {
   pname = "hahomematic";
-  version = "2022.7.13";
+  version = "2022.7.14";
   format = "pyproject";
 
   disabled = pythonOlder "3.9";
@@ -23,7 +23,7 @@ buildPythonPackage rec {
     owner = "danielperna84";
     repo = pname;
     rev = "refs/tags/${version}";
-    sha256 = "sha256-wvvoYcTkOJP5xa0GngD7nCuBfm0x+rZkQdW5qFQX7u8=";
+    sha256 = "sha256-5XgK9vlZswwA48a/tggL78JT1T4NrEiGZ40JnkgX9MM=";
   };
 
   propagatedBuildInputs = [

From bd1d3222779e67d17293bdbf1a42e7827aa8b945 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Thu, 28 Jul 2022 20:04:25 +0200
Subject: [PATCH 65/80] python310Packages.enturclient: 0.2.3 -> 0.2.4

---
 pkgs/development/python-modules/enturclient/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/enturclient/default.nix b/pkgs/development/python-modules/enturclient/default.nix
index b114c794ae3f..a177a68766fb 100644
--- a/pkgs/development/python-modules/enturclient/default.nix
+++ b/pkgs/development/python-modules/enturclient/default.nix
@@ -9,7 +9,7 @@
 
 buildPythonPackage rec {
   pname = "enturclient";
-  version = "0.2.3";
+  version = "0.2.4";
   disabled = pythonOlder "3.8";
 
   format = "pyproject";
@@ -18,7 +18,7 @@ buildPythonPackage rec {
     owner = "hfurubotten";
     repo = pname;
     rev = "v${version}";
-    sha256 = "1w0791f4p3yyncc1izx3q97fyaky2ling14qr0yn0acrmq9yh5cc";
+    sha256 = "sha256-Y2sBPikCAxumylP1LUy8XgjBRCWaNryn5XHSrRjJIIo=";
   };
 
   nativeBuildInputs = [

From 7cbb614ebb25928c163c8a9d190852267537541d Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Thu, 28 Jul 2022 20:09:55 +0200
Subject: [PATCH 66/80] python310Packages.peaqevcore: 3.3.0 -> 4.0.0

---
 pkgs/development/python-modules/peaqevcore/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/peaqevcore/default.nix b/pkgs/development/python-modules/peaqevcore/default.nix
index 3661ea42ca9e..970c1adf5b4f 100644
--- a/pkgs/development/python-modules/peaqevcore/default.nix
+++ b/pkgs/development/python-modules/peaqevcore/default.nix
@@ -6,14 +6,14 @@
 
 buildPythonPackage rec {
   pname = "peaqevcore";
-  version = "3.3.0";
+  version = "4.0.0";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-0Smw0WyGWgGR+NunWT06y2OpKmMA84cxrn01CvE655A=";
+    hash = "sha256-q1qxjrdDLTOprgunsq70oPFgSxSZ1jOfUY6qPud/d9o=";
   };
 
   postPatch = ''

From e4bfca0b9d66dcb8b747ddc1ce6664f64bb4241b Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Thu, 28 Jul 2022 20:11:13 +0200
Subject: [PATCH 67/80] python310Packages.meilisearch: 0.19.0 -> 0.19.1

---
 pkgs/development/python-modules/meilisearch/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/meilisearch/default.nix b/pkgs/development/python-modules/meilisearch/default.nix
index 5b2acecf6369..f215ec661f0e 100644
--- a/pkgs/development/python-modules/meilisearch/default.nix
+++ b/pkgs/development/python-modules/meilisearch/default.nix
@@ -7,7 +7,7 @@
 
 buildPythonPackage rec {
   pname = "meilisearch";
-  version = "0.19.0";
+  version = "0.19.1";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
@@ -16,7 +16,7 @@ buildPythonPackage rec {
     owner = "meilisearch";
     repo = "meilisearch-python";
     rev = "refs/tags/v${version}";
-    hash = "sha256-ky5Z1bu+JFpnSGfzaEB6g/nl/F/QJQGVpgb+Jf/o/tM=";
+    hash = "sha256-/z1UtZJE91dUHogXCbCv8nI8bd26HYVi1OzUV3sArJU=";
   };
 
   propagatedBuildInputs = [

From ed9cba5687af42d8f12ab2018e335020e424b670 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Thu, 28 Jul 2022 20:18:18 +0200
Subject: [PATCH 68/80] python310Packages.pubnub: 6.4.1 -> 6.5.0

---
 pkgs/development/python-modules/pubnub/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pubnub/default.nix b/pkgs/development/python-modules/pubnub/default.nix
index f650ad955b81..d474306d2a3d 100644
--- a/pkgs/development/python-modules/pubnub/default.nix
+++ b/pkgs/development/python-modules/pubnub/default.nix
@@ -13,7 +13,7 @@
 
 buildPythonPackage rec {
   pname = "pubnub";
-  version = "6.4.1";
+  version = "6.5.0";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
@@ -22,7 +22,7 @@ buildPythonPackage rec {
     owner = pname;
     repo = "python";
     rev = "refs/tags/v${version}";
-    hash = "sha256-NpGhZrfUXKpz520l1S+cCfTrI2T/7XlO0Kk1e+XR8Ew=";
+    hash = "sha256-zY40VLjjb9VBbw2579UPD/csk9o0AWIZMWRKxo78NrE=";
   };
 
   propagatedBuildInputs = [

From 17c854c4f03946c7f8ec4f00c4c56b5678a3b52d Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Thu, 28 Jul 2022 16:24:15 +0200
Subject: [PATCH 69/80] libosinfo: add darwin support

---
 pkgs/data/misc/osinfo-db/default.nix             | 2 +-
 pkgs/development/libraries/libosinfo/default.nix | 2 +-
 pkgs/tools/misc/osinfo-db-tools/default.nix      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/data/misc/osinfo-db/default.nix b/pkgs/data/misc/osinfo-db/default.nix
index bde4188154f7..c0d98131850f 100644
--- a/pkgs/data/misc/osinfo-db/default.nix
+++ b/pkgs/data/misc/osinfo-db/default.nix
@@ -30,7 +30,7 @@ stdenv.mkDerivation rec {
     homepage = "https://gitlab.com/libosinfo/osinfo-db/";
     changelog = "https://gitlab.com/libosinfo/osinfo-db/-/commits/v${version}";
     license = licenses.gpl2Plus;
-    platforms = platforms.linux;
+    platforms = platforms.unix;
     maintainers = [ maintainers.bjornfor ];
   };
 }
diff --git a/pkgs/development/libraries/libosinfo/default.nix b/pkgs/development/libraries/libosinfo/default.nix
index 894aee90ff4b..7564e87cdc25 100644
--- a/pkgs/development/libraries/libosinfo/default.nix
+++ b/pkgs/development/libraries/libosinfo/default.nix
@@ -80,7 +80,7 @@ stdenv.mkDerivation rec {
     homepage = "https://libosinfo.org/";
     changelog = "https://gitlab.com/libosinfo/libosinfo/-/blob/v${version}/NEWS";
     license = licenses.lgpl2Plus;
-    platforms = platforms.linux;
+    platforms = platforms.unix;
     maintainers = [ maintainers.bjornfor ];
   };
 }
diff --git a/pkgs/tools/misc/osinfo-db-tools/default.nix b/pkgs/tools/misc/osinfo-db-tools/default.nix
index 189f549e172f..cf0ab2776ba5 100644
--- a/pkgs/tools/misc/osinfo-db-tools/default.nix
+++ b/pkgs/tools/misc/osinfo-db-tools/default.nix
@@ -51,7 +51,7 @@ stdenv.mkDerivation rec {
     homepage = "https://libosinfo.org/";
     changelog = "https://gitlab.com/libosinfo/osinfo-db-tools/-/blob/v${version}/NEWS";
     license = licenses.lgpl2Plus;
-    platforms = platforms.linux;
+    platforms = platforms.unix;
     maintainers = [ maintainers.bjornfor ];
   };
 }

From eff2b5ae789f980c13a4ea20b905d9010b683034 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Thu, 28 Jul 2022 20:38:51 +0200
Subject: [PATCH 70/80] python310Packages.bleak: disable on older Python
 releases

- add missing input
---
 .../python-modules/bleak/default.nix          | 34 +++++++++++++------
 1 file changed, 24 insertions(+), 10 deletions(-)

diff --git a/pkgs/development/python-modules/bleak/default.nix b/pkgs/development/python-modules/bleak/default.nix
index 2a401955317c..a06b31b64a6d 100644
--- a/pkgs/development/python-modules/bleak/default.nix
+++ b/pkgs/development/python-modules/bleak/default.nix
@@ -1,32 +1,46 @@
-{ lib, buildPythonPackage, isPy3k, fetchPypi
-, bluez, dbus-next, pytestCheckHook, pytest-cov
+{ lib
+, bluez
+, buildPythonPackage
+, dbus-next
+, fetchPypi
+, pytestCheckHook
+, pythonOlder
+, typing-extensions
 }:
 
 buildPythonPackage rec {
   pname = "bleak";
   version = "0.14.3";
+  format = "setuptools";
 
-  disabled = !isPy3k;
+  disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-dg5bsegECH92JXa5uVY9Y7R9UhsWUpiOKMPLXmS2GZA=";
+    hash = "sha256-dg5bsegECH92JXa5uVY9Y7R9UhsWUpiOKMPLXmS2GZA=";
   };
 
+  propagatedBuildInputs = [
+    dbus-next
+    typing-extensions
+  ];
+
+  checkInputs = [
+    pytestCheckHook
+  ];
+
   postPatch = ''
     # bleak checks BlueZ's version with a call to `bluetoothctl --version`
     substituteInPlace bleak/backends/bluezdbus/__init__.py \
       --replace \"bluetoothctl\" \"${bluez}/bin/bluetoothctl\"
   '';
 
-  propagatedBuildInputs = [ dbus-next ];
-
-  checkInputs = [ pytestCheckHook pytest-cov ];
-
-  pythonImportsCheck = [ "bleak" ];
+  pythonImportsCheck = [
+    "bleak"
+  ];
 
   meta = with lib; {
-    description = "Bluetooth Low Energy platform Agnostic Klient for Python";
+    description = "Bluetooth Low Energy platform agnostic client";
     homepage = "https://github.com/hbldh/bleak";
     license = licenses.mit;
     platforms = platforms.linux;

From 0901882683ba2f8dcce76aa89a190edfb65d0917 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Thu, 28 Jul 2022 20:53:51 +0200
Subject: [PATCH 71/80] python310Packages.bleak-retry-connector: init at 1.1.0

---
 .../bleak-retry-connector/default.nix         | 48 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 50 insertions(+)
 create mode 100644 pkgs/development/python-modules/bleak-retry-connector/default.nix

diff --git a/pkgs/development/python-modules/bleak-retry-connector/default.nix b/pkgs/development/python-modules/bleak-retry-connector/default.nix
new file mode 100644
index 000000000000..eea5b8b44777
--- /dev/null
+++ b/pkgs/development/python-modules/bleak-retry-connector/default.nix
@@ -0,0 +1,48 @@
+{ lib
+, bleak
+, buildPythonPackage
+, fetchFromGitHub
+, pytestCheckHook
+, pythonOlder
+, pytest-asyncio
+}:
+
+buildPythonPackage rec {
+  pname = "bleak-retry-connector";
+  version = "1.1.0";
+  format = "setuptools";
+
+  disabled = pythonOlder "3.7";
+
+  src = fetchFromGitHub {
+    owner = "Bluetooth-Devices";
+    repo = pname;
+    rev = "v${version}";
+    hash = "sha256-3d66Kp4bz+ZhiC4ZVJscI5nE+qJdsIaefrC4SM0wGP4=";
+  };
+
+  propagatedBuildInputs = [
+    bleak
+  ];
+
+  checkInputs = [
+    pytest-asyncio
+    pytestCheckHook
+  ];
+
+  postPatch = ''
+    substituteInPlace pyproject.toml \
+      --replace " --cov=bleak_retry_connector --cov-report=term-missing:skip-covered" ""
+  '';
+
+  pythonImportsCheck = [
+    "bleak_retry_connector"
+  ];
+
+  meta = with lib; {
+    description = "Connector for Bleak Clients that handles transient connection failures";
+    homepage = "https://github.com/bluetooth-devices/bleak-retry-connector";
+    license = licenses.mit;
+    maintainers = with maintainers; [ fab ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index f62c6f49e28d..dfa493883041 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -1313,6 +1313,8 @@ in {
 
   bleak = callPackage ../development/python-modules/bleak { };
 
+  bleak-retry-connector = callPackage ../development/python-modules/bleak-retry-connector { };
+
   blebox-uniapi = callPackage ../development/python-modules/blebox-uniapi { };
 
   blessed = callPackage ../development/python-modules/blessed { };

From 925439e4fdeca30941e432182f9a60cfe70d9c78 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Thu, 28 Jul 2022 20:54:39 +0200
Subject: [PATCH 72/80] python310Packages.pyswitchbot: 0.15.0 -> 0.15.2

---
 pkgs/development/python-modules/pyswitchbot/default.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pyswitchbot/default.nix b/pkgs/development/python-modules/pyswitchbot/default.nix
index e66489bbc2e9..0ee613b67f17 100644
--- a/pkgs/development/python-modules/pyswitchbot/default.nix
+++ b/pkgs/development/python-modules/pyswitchbot/default.nix
@@ -1,5 +1,6 @@
 { lib
 , bleak
+, bleak-retry-connector
 , buildPythonPackage
 , fetchFromGitHub
 , pythonOlder
@@ -7,7 +8,7 @@
 
 buildPythonPackage rec {
   pname = "pyswitchbot";
-  version = "0.15.0";
+  version = "0.15.2";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
@@ -16,11 +17,12 @@ buildPythonPackage rec {
     owner = "Danielhiversen";
     repo = "pySwitchbot";
     rev = "refs/tags/${version}";
-    hash = "sha256-x1uRUr9mU510X2rSGBYBheB9rqsGBFr3SLnWcXiIBfk=";
+    hash = "sha256-JoHFDFJcltgNrP3faFfyTV7D15h8YTyojWEUcrREeGU=";
   };
 
   propagatedBuildInputs = [
     bleak
+    bleak-retry-connector
   ];
 
   # Project has no tests

From 5af51045018bdb0d8d81026df53d7dec22049c01 Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Thu, 28 Jul 2022 22:47:32 +0200
Subject: [PATCH 73/80] chromiumBeta: 104.0.5112.57 -> 104.0.5112.65

---
 .../networking/browsers/chromium/upstream-info.json         | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json
index fec22570751d..9f40b0055466 100644
--- a/pkgs/applications/networking/browsers/chromium/upstream-info.json
+++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json
@@ -19,9 +19,9 @@
     }
   },
   "beta": {
-    "version": "104.0.5112.57",
-    "sha256": "1fvcmnxfw65c2dgis2vwhzg671y62irzvcl609vxwxcslhwwqc4r",
-    "sha256bin64": "0nx4ca2v1bgk25yjlfgn8vgdwwplyim6a0ai1hppy4yhm9mhppk7",
+    "version": "104.0.5112.65",
+    "sha256": "03adyhinhmih54rsv23w0cm86ldyfsxlmqhgk36vhgylgdras81v",
+    "sha256bin64": "17rck7zvyxmlhmi4x27xhlrn6sznx75cbidhbw7bxk3z9x7qybfy",
     "deps": {
       "gn": {
         "version": "2022-06-08",

From b746ec744631bee0cc2a0f37884ce698089d4dba Mon Sep 17 00:00:00 2001
From: Michael Weiss <dev.primeos@gmail.com>
Date: Thu, 28 Jul 2022 22:47:33 +0200
Subject: [PATCH 74/80] chromiumDev: 105.0.5191.2 -> 105.0.5195.10

---
 .../networking/browsers/chromium/upstream-info.json         | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/applications/networking/browsers/chromium/upstream-info.json b/pkgs/applications/networking/browsers/chromium/upstream-info.json
index fec22570751d..ad70895f9d67 100644
--- a/pkgs/applications/networking/browsers/chromium/upstream-info.json
+++ b/pkgs/applications/networking/browsers/chromium/upstream-info.json
@@ -32,9 +32,9 @@
     }
   },
   "dev": {
-    "version": "105.0.5191.2",
-    "sha256": "1vfgazay1h125qjiy9fnymmdskw06l8lhvllkbbpvz08zf9jfmaj",
-    "sha256bin64": "06l9ypr945dic3kj5m12dr9x098lfh208blp8gax6rxvdj8br4wh",
+    "version": "105.0.5195.10",
+    "sha256": "12spa7b8iy1ipj6f2rs6kdv6r986zdjmdkng5gk1ki1qli80gv2x",
+    "sha256bin64": "146qxhzhlmd5hvp2g1nrfk7hjdxjlrafwa1gl4msjgrdrfz3bdql",
     "deps": {
       "gn": {
         "version": "2022-07-11",

From 4f49424289cc6a80b50b2e6eec7d6c16e965c446 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 28 Jul 2022 21:17:25 +0000
Subject: [PATCH 75/80] libmtp: 1.1.19 -> 1.1.20

---
 pkgs/development/libraries/libmtp/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/libmtp/default.nix b/pkgs/development/libraries/libmtp/default.nix
index c3c9c20e86fd..e0c3e195b2da 100644
--- a/pkgs/development/libraries/libmtp/default.nix
+++ b/pkgs/development/libraries/libmtp/default.nix
@@ -12,13 +12,13 @@
 
 stdenv.mkDerivation rec {
   pname = "libmtp";
-  version = "1.1.19";
+  version = "1.1.20";
 
   src = fetchFromGitHub {
     owner = "libmtp";
     repo = "libmtp";
     rev = "libmtp-${builtins.replaceStrings [ "." ] [ "-" ] version}";
-    sha256 = "sha256-o8JKoKVNpU/nHTDnKJpa8FlXt37fZnTf45WBTCxLyTs=";
+    sha256 = "sha256-/tyCoEW/rCLfZH2HhA3Nxuij9d/ZJgsfyP4fLlfyNRA=";
   };
 
   outputs = [ "bin" "dev" "out" ];

From a06ac1c36a9d43ed713cd77b89a6d0a2c12eb118 Mon Sep 17 00:00:00 2001
From: Jan Tojnar <jtojnar@gmail.com>
Date: Thu, 28 Jul 2022 23:07:15 +0200
Subject: [PATCH 76/80] =?UTF-8?q?webkitgtk:=202.36.4=20=E2=86=92=202.36.5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://webkitgtk.org/2022/07/28/webkitgtk2.36.5-released.html
https://webkitgtk.org/security/WSA-2022-0007.html
---
 pkgs/development/libraries/webkitgtk/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/webkitgtk/default.nix b/pkgs/development/libraries/webkitgtk/default.nix
index 4ffbf24ad25e..28dbfe796252 100644
--- a/pkgs/development/libraries/webkitgtk/default.nix
+++ b/pkgs/development/libraries/webkitgtk/default.nix
@@ -67,7 +67,7 @@
 
 stdenv.mkDerivation rec {
   pname = "webkitgtk";
-  version = "2.36.4";
+  version = "2.36.5";
 
   outputs = [ "out" "dev" ];
 
@@ -75,7 +75,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "https://webkitgtk.org/releases/${pname}-${version}.tar.xz";
-    sha256 = "sha256-tr6+H4WkedlowZ5EpHBGIu+M72FjatGyQGt30Wri4qg=";
+    sha256 = "sha256-1VMvqITJQ9xI8ZEUc91mOrpAejs1yqewS6wUGbQeWQg=";
   };
 
   patches = lib.optionals stdenv.isLinux [

From a9fb3ea0e746226a8bed539854f44ba87df03909 Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Wed, 27 Jul 2022 09:46:29 +1000
Subject: [PATCH 77/80] buildGoModule: move setup-hook to gotools

the hook is for gotools, doesn't need to live with buildGoModule

- also remove duplicate buildGoPackage hook
---
 pkgs/development/go-packages/tools/setup-hook.sh                | 1 -
 pkgs/development/tools/gotools/default.nix                      | 2 +-
 .../{go-modules/tools => tools/gotools}/setup-hook.sh           | 0
 3 files changed, 1 insertion(+), 2 deletions(-)
 delete mode 100644 pkgs/development/go-packages/tools/setup-hook.sh
 rename pkgs/development/{go-modules/tools => tools/gotools}/setup-hook.sh (100%)

diff --git a/pkgs/development/go-packages/tools/setup-hook.sh b/pkgs/development/go-packages/tools/setup-hook.sh
deleted file mode 100644
index e354e50c35aa..000000000000
--- a/pkgs/development/go-packages/tools/setup-hook.sh
+++ /dev/null
@@ -1 +0,0 @@
-export GOTOOLDIR=@bin@/bin
diff --git a/pkgs/development/tools/gotools/default.nix b/pkgs/development/tools/gotools/default.nix
index 9ea238233c36..eaa521f7a17a 100644
--- a/pkgs/development/tools/gotools/default.nix
+++ b/pkgs/development/tools/gotools/default.nix
@@ -43,7 +43,7 @@ buildGoModule rec {
   # Set GOTOOLDIR for derivations adding this to buildInputs
   postInstall = ''
     mkdir -p $out/nix-support
-    substitute ${../../go-modules/tools/setup-hook.sh} $out/nix-support/setup-hook \
+    substitute ${./setup-hook.sh} $out/nix-support/setup-hook \
       --subst-var-by bin $out
   '';
 
diff --git a/pkgs/development/go-modules/tools/setup-hook.sh b/pkgs/development/tools/gotools/setup-hook.sh
similarity index 100%
rename from pkgs/development/go-modules/tools/setup-hook.sh
rename to pkgs/development/tools/gotools/setup-hook.sh

From 496caa738a16d2bb3607243d9127df718bb50513 Mon Sep 17 00:00:00 2001
From: Winter <winter@winter.cafe>
Date: Thu, 28 Jul 2022 18:33:53 -0400
Subject: [PATCH 78/80] gitlab: 15.1.2 -> 15.1.4 (#183404)

---
 .../applications/version-management/gitlab/data.json | 12 ++++++------
 .../version-management/gitlab/gitaly/default.nix     |  4 ++--
 .../gitlab/gitlab-workhorse/default.nix              |  2 +-
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/pkgs/applications/version-management/gitlab/data.json b/pkgs/applications/version-management/gitlab/data.json
index dce348e9f2d0..8f61560bca54 100644
--- a/pkgs/applications/version-management/gitlab/data.json
+++ b/pkgs/applications/version-management/gitlab/data.json
@@ -1,14 +1,14 @@
 {
-  "version": "15.1.2",
-  "repo_hash": "sha256-gZCKI2OXKQZzRe3T/nbnRC0qFHnOBVOAST+ky0qmJDc=",
+  "version": "15.1.4",
+  "repo_hash": "sha256-Ca3rhUJV7OVr3Uv6YmQxHspgwCKp1CZ4phUL1reREy8=",
   "yarn_hash": "19df16gk0vpvdi1idqaakaglf11cic93i5njw0x4m2cnsznhpvz4",
   "owner": "gitlab-org",
   "repo": "gitlab",
-  "rev": "v15.1.2-ee",
+  "rev": "v15.1.4-ee",
   "passthru": {
-    "GITALY_SERVER_VERSION": "15.1.2",
-    "GITLAB_PAGES_VERSION": "1.59.0",
+    "GITALY_SERVER_VERSION": "15.1.4",
+    "GITLAB_PAGES_VERSION": "1.59.1",
     "GITLAB_SHELL_VERSION": "14.7.4",
-    "GITLAB_WORKHORSE_VERSION": "15.1.2"
+    "GITLAB_WORKHORSE_VERSION": "15.1.4"
   }
 }
diff --git a/pkgs/applications/version-management/gitlab/gitaly/default.nix b/pkgs/applications/version-management/gitlab/gitaly/default.nix
index 09639bd0763d..d3390fa419a7 100644
--- a/pkgs/applications/version-management/gitlab/gitaly/default.nix
+++ b/pkgs/applications/version-management/gitlab/gitaly/default.nix
@@ -11,7 +11,7 @@ let
     gemdir = ./.;
   };
 
-  version = "15.1.2";
+  version = "15.1.4";
   package_version = "v${lib.versions.major version}";
   gitaly_package = "gitlab.com/gitlab-org/gitaly/${package_version}";
 in
@@ -24,7 +24,7 @@ buildGoModule {
     owner = "gitlab-org";
     repo = "gitaly";
     rev = "v${version}";
-    sha256 = "sha256-g/SlrE/NVMYqZaEgKncMLjsfI8jAE0xfyy6rpShsi2Q=";
+    sha256 = "sha256-7bsbmC+a+Qk0MevAJvbQoRfvd3G7+q2zY6Gsb5yP44U=";
   };
 
   vendorSha256 = "sha256-0JWJ2mpf79gJdnNRdlQLi0oDvnj6VmibkW2XcPnaCww=";
diff --git a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix
index ec0a2f8e99ee..639240c6493e 100644
--- a/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix
+++ b/pkgs/applications/version-management/gitlab/gitlab-workhorse/default.nix
@@ -5,7 +5,7 @@ in
 buildGoModule rec {
   pname = "gitlab-workhorse";
 
-  version = "15.1.2";
+  version = "15.1.4";
 
   src = fetchFromGitLab {
     owner = data.owner;

From 58e78ab2213f6bdd04b493f91774fb20badaf1b6 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Thu, 28 Jul 2022 22:36:11 +0000
Subject: [PATCH 79/80] libtpms: 0.9.4 -> 0.9.5

---
 pkgs/tools/security/libtpms/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/security/libtpms/default.nix b/pkgs/tools/security/libtpms/default.nix
index d410663e4fce..558c0fd0c37a 100644
--- a/pkgs/tools/security/libtpms/default.nix
+++ b/pkgs/tools/security/libtpms/default.nix
@@ -7,13 +7,13 @@
 
 stdenv.mkDerivation rec {
   pname = "libtpms";
-  version = "0.9.4";
+  version = "0.9.5";
 
   src = fetchFromGitHub {
     owner = "stefanberger";
     repo = "libtpms";
     rev = "v${version}";
-    sha256 = "sha256-f88hT9+rbZXkSQ39mUuGHqmBYN/7pdd5q4Aq4gGjVdY=";
+    sha256 = "sha256-gA3tXsrJgk0WCI2rKy81f3PrGu/Ml1WExJ0P9AzLQ+c=";
   };
 
   nativeBuildInputs = [

From 11fc0df709d93ed64caf16b980c79428423b7c03 Mon Sep 17 00:00:00 2001
From: Yureka <yuka@yuka.dev>
Date: Fri, 29 Jul 2022 00:40:09 +0200
Subject: [PATCH 80/80] heisenbridge: override to mautrix 0.16.x

---
 pkgs/servers/heisenbridge/default.nix | 21 ++++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/heisenbridge/default.nix b/pkgs/servers/heisenbridge/default.nix
index 82599cdcbaa5..576df924ad90 100644
--- a/pkgs/servers/heisenbridge/default.nix
+++ b/pkgs/servers/heisenbridge/default.nix
@@ -1,5 +1,20 @@
 { lib, fetchFromGitHub, fetchpatch, python3 }:
-python3.pkgs.buildPythonApplication rec {
+
+let
+  python = python3.override {
+    packageOverrides = self: super: {
+      mautrix = super.mautrix.overridePythonAttrs (oldAttrs: rec {
+        version = "0.16.3";
+        src = oldAttrs.src.override {
+          inherit (oldAttrs) pname;
+          inherit version;
+          sha256 = "sha256-OpHLh5pCzGooQ5yxAa0+85m/szAafV+l+OfipQcfLtU=";
+        };
+      });
+    };
+  };
+
+in python.pkgs.buildPythonApplication rec {
   pname = "heisenbridge";
   version = "1.13.1";
 
@@ -14,7 +29,7 @@ python3.pkgs.buildPythonApplication rec {
     echo "${version}" > heisenbridge/version.txt
   '';
 
-  propagatedBuildInputs = with python3.pkgs; [
+  propagatedBuildInputs = with python.pkgs; [
     aiohttp
     irc
     mautrix
@@ -22,7 +37,7 @@ python3.pkgs.buildPythonApplication rec {
     pyyaml
   ];
 
-  checkInputs = with python3.pkgs; [
+  checkInputs = with python.pkgs; [
     pytestCheckHook
   ];