From 3ab2cf227936d71d8f22eedd4242610515b31c36 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo?= <malaquias@gmail.com>
Date: Sat, 14 May 2022 11:18:33 -0300
Subject: [PATCH 01/50] lxqt.libqtxdg: 3.9.0 -> 3.9.1

---
 pkgs/desktops/lxqt/libqtxdg/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/lxqt/libqtxdg/default.nix b/pkgs/desktops/lxqt/libqtxdg/default.nix
index 521fdacf583d..ea2f28c09df6 100644
--- a/pkgs/desktops/lxqt/libqtxdg/default.nix
+++ b/pkgs/desktops/lxqt/libqtxdg/default.nix
@@ -10,13 +10,13 @@
 
 mkDerivation rec {
   pname = "libqtxdg";
-  version = "3.9.0";
+  version = "3.9.1";
 
   src = fetchFromGitHub {
     owner = "lxqt";
     repo = pname;
     rev = version;
-    sha256 = "llE4OxI4I/n0P8Pv5tKT3tXM7IfD3VMQSxdaLkBJ4Gk=";
+    sha256 = "zrlaOiIsfbwjHFjqhYZ9lCo+oTsddICxl2UAum9Xoi4=";
   };
 
   nativeBuildInputs = [

From 6a693179007f5b432559cd06859d7e1fd3488b55 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo?= <malaquias@gmail.com>
Date: Sat, 14 May 2022 11:48:51 -0300
Subject: [PATCH 02/50] lxqt.qtxdg-tools: init at 3.9.1

---
 pkgs/desktops/lxqt/default.nix             |  1 +
 pkgs/desktops/lxqt/qtxdg-tools/default.nix | 41 ++++++++++++++++++++++
 2 files changed, 42 insertions(+)
 create mode 100644 pkgs/desktops/lxqt/qtxdg-tools/default.nix

diff --git a/pkgs/desktops/lxqt/default.nix b/pkgs/desktops/lxqt/default.nix
index 193db77c3662..28ea04116034 100644
--- a/pkgs/desktops/lxqt/default.nix
+++ b/pkgs/desktops/lxqt/default.nix
@@ -17,6 +17,7 @@ let
     lxqt-build-tools = callPackage ./lxqt-build-tools {};
     libsysstat = callPackage ./libsysstat {};
     liblxqt = callPackage ./liblxqt {};
+    qtxdg-tools = callPackage ./qtxdg-tools {};
 
     ### CORE 1
     libfm-qt = callPackage ./libfm-qt {};
diff --git a/pkgs/desktops/lxqt/qtxdg-tools/default.nix b/pkgs/desktops/lxqt/qtxdg-tools/default.nix
new file mode 100644
index 000000000000..def7935a1c91
--- /dev/null
+++ b/pkgs/desktops/lxqt/qtxdg-tools/default.nix
@@ -0,0 +1,41 @@
+{ lib
+, mkDerivation
+, fetchFromGitHub
+, cmake
+, qtbase
+, libqtxdg
+, lxqt-build-tools
+, lxqtUpdateScript
+}:
+
+mkDerivation rec {
+  pname = "qtxdg-tools";
+  version = "3.9.1";
+
+  src = fetchFromGitHub {
+    owner = "lxqt";
+    repo = pname;
+    rev = version;
+    sha256 = "sha256-NUSeXEJ6zjTz6p/8R6YTVfPQEnk1ukZ2ikdDdkaPeSw=";
+  };
+
+  nativeBuildInputs = [
+    cmake
+    lxqt-build-tools
+  ];
+
+  buildInputs = [
+    qtbase
+    libqtxdg
+  ];
+
+  passthru.updateScript = lxqtUpdateScript { inherit pname version src; };
+
+  meta = with lib; {
+    homepage = "https://github.com/lxqt/qtxdg-tools";
+    description = "libqtxdg user tools";
+    license = licenses.lgpl21Plus;
+    platforms = platforms.linux;
+    maintainers = teams.lxqt.members;
+  };
+}

From 1c884fb5bd1ceae9e73220a8edb92c968142e223 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo?= <malaquias@gmail.com>
Date: Sat, 14 May 2022 11:51:05 -0300
Subject: [PATCH 03/50] lxqt.lxqt-session: 1.1.0 -> 1.1.1

---
 pkgs/desktops/lxqt/lxqt-session/default.nix | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/pkgs/desktops/lxqt/lxqt-session/default.nix b/pkgs/desktops/lxqt/lxqt-session/default.nix
index 7cd30e09f5e3..ebab3bbee615 100644
--- a/pkgs/desktops/lxqt/lxqt-session/default.nix
+++ b/pkgs/desktops/lxqt/lxqt-session/default.nix
@@ -11,6 +11,7 @@
 , kwindowsystem
 , liblxqt
 , libqtxdg
+, qtxdg-tools
 , procps
 , xorg
 , xdg-user-dirs
@@ -19,13 +20,13 @@
 
 mkDerivation rec {
   pname = "lxqt-session";
-  version = "1.1.0";
+  version = "1.1.1";
 
   src = fetchFromGitHub {
     owner = "lxqt";
     repo = pname;
     rev = version;
-    sha256 = "urm4Ehd26fmssJwu/V9Uu/lZ0J8yDOtAA0DIihTPxng=";
+    sha256 = "NOwuHz5SiygE/9cLrYPz24L5v8BE6Hwqp6uKD5SnOBU=";
   };
 
   nativeBuildInputs = [
@@ -42,6 +43,7 @@ mkDerivation rec {
     kwindowsystem
     liblxqt
     libqtxdg
+    qtxdg-tools
     procps
     xorg.libpthreadstubs
     xorg.libXdmcp

From 695b93b0795da031baeb0d46319d7b5710d40842 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 18 May 2022 11:22:15 +0200
Subject: [PATCH 04/50] python310Packages.pg8000: 1.28.0 -> 1.28.2

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

diff --git a/pkgs/development/python-modules/pg8000/default.nix b/pkgs/development/python-modules/pg8000/default.nix
index b3ac256e0bb5..ac09e1a6f0bc 100644
--- a/pkgs/development/python-modules/pg8000/default.nix
+++ b/pkgs/development/python-modules/pg8000/default.nix
@@ -8,14 +8,14 @@
 
 buildPythonPackage rec {
   pname = "pg8000";
-  version = "1.28.0";
-  format = "setuptools";
+  version = "1.28.2";
+  format = "pyproject";
 
   disabled = pythonOlder "3.6";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-Q1E949TjeOc6xEKpOQa6qdNWJFqmeqf2FgXFbjmn9ZE=";
+    sha256 = "sha256-4aJLqJobQeLSCVuf188W2vm1vf8g85WNmX3fg2GkyLU=";
   };
 
   propagatedBuildInputs = [

From c2261bce535eb7e8887c8134a0d4f5c499eac8a6 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Wed, 18 May 2022 20:47:34 +0200
Subject: [PATCH 05/50] python310Packages.pg8000: 1.28.2 -> 1.28.3

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

diff --git a/pkgs/development/python-modules/pg8000/default.nix b/pkgs/development/python-modules/pg8000/default.nix
index ac09e1a6f0bc..54241dde5702 100644
--- a/pkgs/development/python-modules/pg8000/default.nix
+++ b/pkgs/development/python-modules/pg8000/default.nix
@@ -1,6 +1,7 @@
 { lib
 , buildPythonPackage
 , fetchPypi
+, importlib-metadata
 , passlib
 , pythonOlder
 , scramp
@@ -8,19 +9,21 @@
 
 buildPythonPackage rec {
   pname = "pg8000";
-  version = "1.28.2";
+  version = "1.28.3";
   format = "pyproject";
 
   disabled = pythonOlder "3.6";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-4aJLqJobQeLSCVuf188W2vm1vf8g85WNmX3fg2GkyLU=";
+    sha256 = "sha256-1hA3s/Iff8fVz+TupoN4klnnzLnu9fcinLxi8x6mujI=";
   };
 
   propagatedBuildInputs = [
     passlib
     scramp
+  ] ++ lib.optionals (pythonOlder "3.8") [
+    importlib-metadata
   ];
 
   # Tests require a running PostgreSQL instance

From c1aec2157fe753de9f057fc7f940f2fbb6c31e3a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo?= <malaquias@gmail.com>
Date: Thu, 19 May 2022 14:35:02 -0300
Subject: [PATCH 06/50] libsForQt5.qtstyleplugin-kvantum: 1.0.1 -> 1.0.2

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

diff --git a/pkgs/development/libraries/qtstyleplugin-kvantum/default.nix b/pkgs/development/libraries/qtstyleplugin-kvantum/default.nix
index 5a747fd91063..3b76bf24a302 100644
--- a/pkgs/development/libraries/qtstyleplugin-kvantum/default.nix
+++ b/pkgs/development/libraries/qtstyleplugin-kvantum/default.nix
@@ -4,13 +4,13 @@
 
 stdenv.mkDerivation rec {
   pname = "qtstyleplugin-kvantum";
-  version = "1.0.1";
+  version = "1.0.2";
 
   src = fetchFromGitHub {
     owner = "tsujan";
     repo = "Kvantum";
     rev = "V${version}";
-    sha256 = "0k3j74klvd386ijsd4j09ccxlhga54z4pgnh36s9cv3rs7ab39qm";
+    sha256 = "NPMqd7j9Unvw8p/cUNMYWmgrb2ysdMvSSGJ6lJWh4/M=";
   };
 
   nativeBuildInputs = [

From 6238d2fe76bb2dcdc0af05ab6eacf9ac15d4a7ec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Romildo?= <malaquias@gmail.com>
Date: Thu, 19 May 2022 14:35:41 -0300
Subject: [PATCH 07/50] libsForQt5.qtstyleplugin-kvantum: add update script

---
 .../libraries/qtstyleplugin-kvantum/default.nix            | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/pkgs/development/libraries/qtstyleplugin-kvantum/default.nix b/pkgs/development/libraries/qtstyleplugin-kvantum/default.nix
index 3b76bf24a302..6468c8051966 100644
--- a/pkgs/development/libraries/qtstyleplugin-kvantum/default.nix
+++ b/pkgs/development/libraries/qtstyleplugin-kvantum/default.nix
@@ -1,5 +1,6 @@
 { lib, stdenv, fetchFromGitHub, qmake, qtbase, qtsvg, qtx11extras, kwindowsystem
 , libX11, libXext, qttools, wrapQtAppsHook
+, gitUpdater
 }:
 
 stdenv.mkDerivation rec {
@@ -29,6 +30,12 @@ stdenv.mkDerivation rec {
       --replace "\$\$[QT_INSTALL_PLUGINS]" "$out/$qtPluginPrefix"
   '';
 
+  passthru.updateScript = gitUpdater {
+    inherit pname version;
+    attrPath = "libsForQt5.${pname}";
+    rev-prefix = "V";
+  };
+
   meta = with lib; {
     description = "SVG-based Qt5 theme engine plus a config tool and extra themes";
     homepage = "https://github.com/tsujan/Kvantum";

From 924139096a8064b4959c7e314c19293459741b37 Mon Sep 17 00:00:00 2001
From: Hubert Jasudowicz <hubert.jasudowicz@gmail.com>
Date: Mon, 23 May 2022 18:52:22 +0200
Subject: [PATCH 08/50] honggfuzz: Use LLVM 12

Using LLVM 11 results in broken binaries generated by hfuzz-clang,
crashing with error:
UndefinedBehaviorSanitizer failed to allocate 0x0 (0) bytes of SetAlternateSignalStack

Fixes #174118
---
 pkgs/top-level/all-packages.nix | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 78d4ca310ee0..211d68e51fe5 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1047,7 +1047,10 @@ with pkgs;
     stdenv = clangStdenv;
   };
 
-  honggfuzz = callPackage ../tools/security/honggfuzz { };
+  honggfuzz = callPackage ../tools/security/honggfuzz {
+    clang = clang_12;
+    llvm = llvm_12;
+  };
 
   aflplusplus = callPackage ../tools/security/aflplusplus {
     clang = clang_9;

From bc11ff0cbc4ac9f4ae0d2ee535eaa0abc116fdc5 Mon Sep 17 00:00:00 2001
From: Mario Rodas <marsam@users.noreply.github.com>
Date: Wed, 25 May 2022 04:20:00 +0000
Subject: [PATCH 09/50] ocamlPackages.cppo: 1.6.8 -> 1.6.9

https://github.com/ocaml-community/cppo/releases/tag/v1.6.9
---
 pkgs/development/tools/ocaml/cppo/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/ocaml/cppo/default.nix b/pkgs/development/tools/ocaml/cppo/default.nix
index 3134c310c453..753ef0a836b9 100644
--- a/pkgs/development/tools/ocaml/cppo/default.nix
+++ b/pkgs/development/tools/ocaml/cppo/default.nix
@@ -21,7 +21,7 @@ if lib.versionAtLeast ocaml.version "4.02" then
 
 buildDunePackage rec {
   inherit pname;
-  version = "1.6.8";
+  version = "1.6.9";
 
   useDune2 = true;
 
@@ -29,7 +29,7 @@ buildDunePackage rec {
     owner = "ocaml-community";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256:0xjb1dnj8lvdcccskrhrakknd9q4vfy5330sjbqpf4h95dsz90k9";
+    sha256 = "sha256-NdN2QnVRfRq9hEcSAnO2Wha7icDlf2Zg4JQqoEWmErE=";
   };
 
   doCheck = true;

From dcd7915d177acd0ce63ef3b54fe61d23c6733e0f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Wed, 25 May 2022 20:32:28 +0000
Subject: [PATCH 10/50] ostinato: fix desktop file

---
 .../networking/ostinato/default.nix           | 22 +++++++++++--------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/pkgs/applications/networking/ostinato/default.nix b/pkgs/applications/networking/ostinato/default.nix
index 45307504d731..b3ff51ab7c19 100644
--- a/pkgs/applications/networking/ostinato/default.nix
+++ b/pkgs/applications/networking/ostinato/default.nix
@@ -1,6 +1,7 @@
 { lib, mkDerivation, fetchFromGitHub, fetchurl, qmake, makeDesktopItem
 , qtbase, qtscript, protobuf, libpcap, wireshark, gzip, diffutils, gawk
 , libnl
+, copyDesktopItems
 }:
 
 mkDerivation rec {
@@ -21,31 +22,34 @@ mkDerivation rec {
 
   buildInputs = [ qtbase protobuf libpcap qtscript libnl ];
 
-  nativeBuildInputs = [ qmake ];
+  nativeBuildInputs = [
+    copyDesktopItems
+    qmake
+  ];
 
   patches = [ ./drone_ini.patch ];
   prePatch = ''
     sed -i 's|/usr/include/libnl3|${libnl.dev}/include/libnl3|' server/drone.pro
   '';
 
-  desktopItem = makeDesktopItem {
+  desktopItems = lib.singleton (makeDesktopItem {
     name          = "ostinato";
     desktopName   = "Ostinato";
     genericName   = "Packet/Traffic Generator and Analyzer";
     comment       = "Network packet and traffic generator and analyzer with a friendly GUI";
     categories    = [ "Network" ];
     startupNotify = true;
-    exec          = "$out/bin/ostinato";
+    exec          = "@out@/bin/ostinato";
     icon          =  ostinatoIcon;
     extraConfig   = {
       "GenericName[it]" = "Generatore ed Analizzatore di pacchetti di rete";
       "Comment[it]"     = "Generatore ed Analizzatore di pacchetti di rete con interfaccia amichevole";
     };
-  };
+  });
 
-  postInstall = ''
-    mkdir -p $out/share/applications
-    ln -s ${desktopItem}/share/applications/* $out/share/applications/
+  preFixup = ''
+    substituteInPlace $out/share/applications/ostinato.desktop \
+      --subst-var out
 
     cat > $out/bin/ostinato.ini <<EOF
     WiresharkPath=${wireshark}/bin/wireshark
@@ -62,8 +66,8 @@ mkDerivation rec {
 
   meta = with lib; {
     description = "A packet traffic generator and analyzer";
-    homepage    = "https://ostinato.org";
-    license     = licenses.gpl3;
+    homepage    = "https://ostinato.org/";
+    license     = licenses.gpl3Plus;
     maintainers = with maintainers; [ rick68 ];
     platforms   = with platforms; linux ++ darwin ++ cygwin;
   };

From d75f202ce494f56a5f40cbb5dc0bf81611afb003 Mon Sep 17 00:00:00 2001
From: Hubert Jasudowicz <hubert.jasudowicz@gmail.com>
Date: Thu, 26 May 2022 18:17:58 +0200
Subject: [PATCH 11/50] honggfuzz: Add chivay to maintainers

---
 pkgs/tools/security/honggfuzz/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/security/honggfuzz/default.nix b/pkgs/tools/security/honggfuzz/default.nix
index 7333c20fd7b8..c6276eb56ca0 100644
--- a/pkgs/tools/security/honggfuzz/default.nix
+++ b/pkgs/tools/security/honggfuzz/default.nix
@@ -45,7 +45,7 @@ let
       homepage = "https://honggfuzz.dev/";
       license = lib.licenses.asl20;
       platforms = [ "x86_64-linux" ];
-      maintainers = with lib.maintainers; [ cpu ];
+      maintainers = with lib.maintainers; [ cpu chivay ];
     };
   };
 in honggfuzz

From 43e661da405cb916977c4a91bd6567ba6f1bb641 Mon Sep 17 00:00:00 2001
From: "Bryan A. S" <bryanasdev000@gmail.com>
Date: Thu, 26 May 2022 14:37:20 -0300
Subject: [PATCH 12/50] awscli2: 2.5.6 -> 2.7.3

- upgrade package

- test overrides

- add myself as maintainer
---
 pkgs/tools/admin/awscli2/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/admin/awscli2/default.nix b/pkgs/tools/admin/awscli2/default.nix
index 061981672d95..ca74704309d3 100644
--- a/pkgs/tools/admin/awscli2/default.nix
+++ b/pkgs/tools/admin/awscli2/default.nix
@@ -29,13 +29,13 @@ let
 in
 with py.pkgs; buildPythonApplication rec {
   pname = "awscli2";
-  version = "2.5.6"; # N.B: if you change this, check if overrides are still up-to-date
+  version = "2.7.3"; # N.B: if you change this, check if overrides are still up-to-date
 
   src = fetchFromGitHub {
     owner = "aws";
     repo = "aws-cli";
     rev = version;
-    sha256 = "sha256-NANdm2RK4U5sXPuGbC8KUGXsbYl/WwAoUep4JxJA5lI=";
+    sha256 = "sha256-CM20zBuby1X+XOiphDDtWHUB08Mw7IYf0aZUWIvEAqI=";
   };
 
   propagatedBuildInputs = [
@@ -100,6 +100,6 @@ with py.pkgs; buildPythonApplication rec {
     changelog = "https://github.com/aws/aws-cli/blob/${version}/CHANGELOG.rst";
     description = "Unified tool to manage your AWS services";
     license = licenses.asl20;
-    maintainers = with maintainers; [ bhipple davegallant ];
+    maintainers = with maintainers; [ bhipple davegallant bryanasdev000 ];
   };
 }

From 8278f5c3b03c3992078ecc9b768c0606fc2e42a9 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Mon, 23 May 2022 19:13:10 +0200
Subject: [PATCH 13/50] python39Packages.numba-scipy: update stale
 substituteInPlace

---
 .../python-modules/numba-scipy/default.nix         | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/numba-scipy/default.nix b/pkgs/development/python-modules/numba-scipy/default.nix
index c8f84cbf43f5..525624eb05de 100644
--- a/pkgs/development/python-modules/numba-scipy/default.nix
+++ b/pkgs/development/python-modules/numba-scipy/default.nix
@@ -4,15 +4,19 @@
 , scipy
 , numba
 , pytestCheckHook
+, pythonOlder
 }:
 
 buildPythonPackage rec {
   pname = "numba-scipy";
   version = "0.3.0";
+  format = "setuptools";
+
+  disabled = pythonOlder "3.6";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-qJeoWiG1LdtFB9cME1d8xVaC0BXGDJEYjCOEdHvSkmQ=";
+    hash = "sha256-qJeoWiG1LdtFB9cME1d8xVaC0BXGDJEYjCOEdHvSkmQ=";
   };
 
   propagatedBuildInputs = [
@@ -21,14 +25,18 @@ buildPythonPackage rec {
   ];
 
   postPatch = ''
-    substituteInPlace setup.py --replace "scipy>=0.16,<=1.6.2" "scipy>=0.16,<=1.7.3"
+    # https://github.com/numba/numba-scipy/pull/76
+    substituteInPlace setup.py \
+      --replace "scipy>=0.16,<=1.6.2" "scipy>=0.16"
   '';
 
   checkInputs = [
     pytestCheckHook
   ];
 
-  pythonImportsCheck = [ "numba" ];
+  pythonImportsCheck = [
+    "numba_scipy"
+  ];
 
   meta = with lib; {
     description = "Extends Numba to make it aware of SciPy";

From 2e32938d54c380289eb9d19e61d3da793821daa8 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Mon, 23 May 2022 13:09:45 +0200
Subject: [PATCH 14/50] python310Packages.numba: update disable

---
 .../python-modules/numba/default.nix          | 23 ++++++++++++++-----
 1 file changed, 17 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/python-modules/numba/default.nix b/pkgs/development/python-modules/numba/default.nix
index d656a56e3c17..23921959f596 100644
--- a/pkgs/development/python-modules/numba/default.nix
+++ b/pkgs/development/python-modules/numba/default.nix
@@ -24,11 +24,11 @@ let
 in buildPythonPackage rec {
   version = "0.55.1";
   pname = "numba";
-  disabled = pythonOlder "3.6" || pythonAtLeast "3.10";
+  disabled = pythonOlder "3.6" || pythonAtLeast "3.11";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-A+kGmiZm0chPk7ANvXFvuP7d6Lssbvr6LwSEKkZELqM=";
+    hash = "sha256-A+kGmiZm0chPk7ANvXFvuP7d6Lssbvr6LwSEKkZELqM=";
   };
 
   postPatch = ''
@@ -42,9 +42,18 @@ in buildPythonPackage rec {
 
   NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-I${lib.getDev libcxx}/include/c++/v1";
 
-  propagatedBuildInputs = [ numpy llvmlite setuptools ] ++ lib.optionals cudaSupport [ cudatoolkit cudatoolkit.lib ];
+  propagatedBuildInputs = [
+    numpy
+    llvmlite
+    setuptools
+  ] ++ lib.optionals cudaSupport [
+    cudatoolkit
+    cudatoolkit.lib
+  ];
 
-  nativeBuildInputs = lib.optional cudaSupport [ addOpenGLRunpath ];
+  nativeBuildInputs = lib.optional cudaSupport [
+    addOpenGLRunpath
+  ];
 
   patches = lib.optionals cudaSupport [
     (substituteAll {
@@ -69,12 +78,14 @@ in buildPythonPackage rec {
   # ImportError: cannot import name '_typeconv'
   doCheck = false;
 
-  pythonImportsCheck = [ "numba" ];
+  pythonImportsCheck = [
+    "numba"
+  ];
 
   meta =  with lib; {
+    description = "Compiling Python code using LLVM";
     homepage = "https://numba.pydata.org/";
     license = licenses.bsd2;
-    description = "Compiling Python code using LLVM";
     maintainers = with maintainers; [ fridh ];
   };
 }

From b7874eee051c6a194935e8b18745a7b9455df419 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 24 May 2022 11:44:25 +0200
Subject: [PATCH 15/50] python39Packages.aesara: 2.5.3 -> 2.6.6

---
 .../python-modules/aesara/default.nix         | 54 ++++++++++++-------
 1 file changed, 35 insertions(+), 19 deletions(-)

diff --git a/pkgs/development/python-modules/aesara/default.nix b/pkgs/development/python-modules/aesara/default.nix
index 58a39422a3a3..d34a0fb0770f 100644
--- a/pkgs/development/python-modules/aesara/default.nix
+++ b/pkgs/development/python-modules/aesara/default.nix
@@ -1,30 +1,33 @@
 { lib
 , buildPythonPackage
-, fetchFromGitHub
-, numpy
-, scipy
-, filelock
+, cons
+, cython
 , etuples
+, fetchFromGitHub
+, filelock
 , logical-unification
 , minikanren
-, cons
 , numba
 , numba-scipy
-, libgpuarray
-, sympy
-, cython
+, numpy
 , pytestCheckHook
+, pythonOlder
+, scipy
+, typing-extensions
 }:
 
 buildPythonPackage rec {
   pname = "aesara";
-  version = "2.5.3";
+  version = "2.6.6";
+  format = "setuptools";
+
+  disabled = pythonOlder "3.7";
 
   src = fetchFromGitHub {
     owner = "aesara-devs";
     repo = "aesara";
     rev = "refs/tags/rel-${version}";
-    sha256 = "sha256-20nc70gNdcGjtGxv2WxmYxmswNH8v7yGLkToP2iazjc=";
+    hash = "sha256-ChLMQCXw9EBR0hnNYGdkUbiLF+4oCqOxzsKsnsf22Jk=";
   };
 
   nativeBuildInputs = [
@@ -32,28 +35,41 @@ buildPythonPackage rec {
   ];
 
   propagatedBuildInputs = [
-    numpy
-    scipy
-    filelock
+    cons
     etuples
+    filelock
     logical-unification
     minikanren
-    cons
-    numba
-    numba-scipy
-    libgpuarray
-    sympy
+    numpy
+    scipy
+    typing-extensions
   ];
 
   checkInputs = [
+    numba
+    numba-scipy
     pytestCheckHook
   ];
 
+  postPatch = ''
+    substituteInPlace setup.cfg \
+      --replace "--durations=50" ""
+  '';
+
   preBuild = ''
     export HOME=$(mktemp -d)
   '';
 
-  pythonImportsCheck = [ "aesara" ];
+  pythonImportsCheck = [
+    "aesara"
+  ];
+
+  disabledTestPaths = [
+    # Don't run the most compute-intense tests
+    "tests/scan/"
+    "tests/tensor/"
+    "tests/sandbox/"
+  ];
 
   meta = with lib; {
     description = "Python library to define, optimize, and efficiently evaluate mathematical expressions involving multi-dimensional arrays";

From d69a2ffcea2fec72eb24c8ce202151cb3adfc992 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 24 May 2022 12:32:14 +0200
Subject: [PATCH 16/50] python310Packages.persim: disable failing tests on
 Python 3.10

---
 .../python-modules/persim/default.nix         | 25 +++++++++++++++++--
 1 file changed, 23 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/persim/default.nix b/pkgs/development/python-modules/persim/default.nix
index 4ac21159d956..4e3717dec07e 100644
--- a/pkgs/development/python-modules/persim/default.nix
+++ b/pkgs/development/python-modules/persim/default.nix
@@ -9,15 +9,20 @@
 , scikit-learn
 , scipy
 , pytestCheckHook
+, pythonAtLeast
+, pythonOlder
 }:
 
 buildPythonPackage rec {
   pname = "persim";
   version = "0.3.1";
+  format = "setuptools";
+
+  disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "ef0f0a247adcf6104ecac14117db0b24581710ea8a8d964816805395700b4975";
+    sha256 = "sha256-7w8KJHrc9hBOysFBF9sLJFgXEOqKjZZIFoBTlXALSXU=";
   };
 
   propagatedBuildInputs = [
@@ -41,10 +46,26 @@ buildPythonPackage rec {
     echo "backend: ps" > $HOME/.matplotlib/matplotlibrc
   '';
 
+  pythonImportsCheck = [
+    "persim"
+  ];
+
+  disabledTests = lib.optionals (pythonAtLeast "3.10") [
+    # AttributeError: module 'collections' has no attribute 'Iterable'
+    "test_empyt_diagram_list"
+    "test_empty_diagram_list"
+    "test_fit_diagram"
+    "test_integer_diagrams"
+    "test_lists_of_lists"
+    "test_mixed_pairs"
+    "test_multiple_diagrams"
+    "test_n_pixels"
+  ];
+
   meta = with lib; {
     description = "Distances and representations of persistence diagrams";
     homepage = "https://persim.scikit-tda.org";
     license = licenses.mit;
-    maintainers = [ maintainers.costrouc ];
+    maintainers = with maintainers; [ costrouc ];
   };
 }

From 0fb3b8bddfcb7ddc59693451c7027914035bb730 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 24 May 2022 15:40:06 +0200
Subject: [PATCH 17/50] python310Packages.numdifftools: init at 0.9.40

---
 .../python-modules/numdifftools/default.nix   | 51 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 53 insertions(+)
 create mode 100644 pkgs/development/python-modules/numdifftools/default.nix

diff --git a/pkgs/development/python-modules/numdifftools/default.nix b/pkgs/development/python-modules/numdifftools/default.nix
new file mode 100644
index 000000000000..bc5914be721c
--- /dev/null
+++ b/pkgs/development/python-modules/numdifftools/default.nix
@@ -0,0 +1,51 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, numpy
+, pytestCheckHook
+, pythonOlder
+, scipy
+}:
+
+buildPythonPackage rec {
+  pname = "numdifftools";
+  version = "0.9.40";
+  format = "setuptools";
+
+  disabled = pythonOlder "3.7";
+
+  src = fetchFromGitHub {
+    owner = "pbrod";
+    repo = pname;
+    rev = "v${version}";
+    hash = "sha256-YLi9cNHcZ/PlhrhvYOMfRTOt4kinQcfxvqInT8/0Qpg=";
+  };
+
+  propagatedBuildInputs = [
+    numpy
+    scipy
+  ];
+
+  # Tests requires algopy and other modules which are optional and/or not available
+  doCheck = false;
+
+  postPatch = ''
+    substituteInPlace setup.py \
+      --replace '"pytest-runner"' ""
+    # Remove optional dependencies
+    substituteInPlace requirements.txt \
+      --replace "algopy>=0.4" "" \
+      --replace "statsmodels>=0.6" ""
+  '';
+
+  pythonImportsCheck = [
+    "numdifftools"
+  ];
+
+  meta = with lib; {
+    description = "Library to solve automatic numerical differentiation problems in one or more variables";
+    homepage = "https://github.com/pbrod/numdifftools";
+    license = licenses.bsd3;
+    maintainers = with maintainers; [ fab ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 3d4ff7c5ebb8..5e8009a838db 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -5862,6 +5862,8 @@ in {
 
   numcodecs = callPackage ../development/python-modules/numcodecs { };
 
+  numdifftools = callPackage ../development/python-modules/numdifftools { };
+
   numericalunits = callPackage ../development/python-modules/numericalunits { };
 
   numexpr = callPackage ../development/python-modules/numexpr { };

From 91824e319240fc6e9a0cc0bcb0bbfaa80aac32fb Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 24 May 2022 16:19:53 +0200
Subject: [PATCH 18/50] python310Packages.aeppl: init at 0.0.31

---
 .../python-modules/aeppl/default.nix          | 51 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 53 insertions(+)
 create mode 100644 pkgs/development/python-modules/aeppl/default.nix

diff --git a/pkgs/development/python-modules/aeppl/default.nix b/pkgs/development/python-modules/aeppl/default.nix
new file mode 100644
index 000000000000..bf7f4b8d02aa
--- /dev/null
+++ b/pkgs/development/python-modules/aeppl/default.nix
@@ -0,0 +1,51 @@
+{ lib
+, aesara
+, buildPythonPackage
+, fetchFromGitHub
+, numdifftools
+, numpy
+, pytestCheckHook
+, pythonOlder
+, scipy
+}:
+
+buildPythonPackage rec {
+  pname = "aeppl";
+  version = "0.0.31";
+  format = "setuptools";
+
+  disabled = pythonOlder "3.7";
+
+  src = fetchFromGitHub {
+    owner = "aesara-devs";
+    repo = pname;
+    rev = "refs/tags/v${version}";
+    hash = "sha256-fbBtjU2skvfDCnRRW+9PIObsEOfKhl15qSLw3TGhl4k=";
+  };
+
+  propagatedBuildInputs = [
+    aesara
+    numpy
+    scipy
+  ];
+
+  checkInputs = [
+    numdifftools
+    pytestCheckHook
+  ];
+
+  preCheck = ''
+    export HOME=$(mktemp -d);
+  '';
+
+  pythonImportsCheck = [
+    "aeppl"
+  ];
+
+  meta = with lib; {
+    description = "Library for an Aesara-based PPL";
+    homepage = "https://github.com/aesara-devs/aeppl";
+    license = licenses.mit;
+    maintainers = with maintainers; [ fab ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 5e8009a838db..d1e09ad6cf48 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -209,6 +209,8 @@ in {
 
   aenum = callPackage ../development/python-modules/aenum { };
 
+  aeppl = callPackage ../development/python-modules/aeppl { };
+
   aesara = callPackage ../development/python-modules/aesara { };
 
   aesedb = callPackage ../development/python-modules/aesedb { };

From 5af41eba18d0c1623836293b4c777910e47bfd0a Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 24 May 2022 17:52:31 +0200
Subject: [PATCH 19/50] python310Packages.pynndescent: 0.5.6 -> 0.5.7

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

diff --git a/pkgs/development/python-modules/pynndescent/default.nix b/pkgs/development/python-modules/pynndescent/default.nix
index 79b914f6122c..8389a7ae9c1f 100644
--- a/pkgs/development/python-modules/pynndescent/default.nix
+++ b/pkgs/development/python-modules/pynndescent/default.nix
@@ -12,14 +12,14 @@
 
 buildPythonPackage rec {
   pname = "pynndescent";
-  version = "0.5.6";
+  version = "0.5.7";
   format = "setuptools";
 
   disabled = pythonOlder "3.6";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-YfsxiFuqxGnWeTPix8k1tu3rsG7kmOLw+d/JfFnTclw=";
+    hash = "sha256-7LOVJV+janSLWHC0ugMA6g99qLGWSGS47dYld6hN/X0=";
   };
 
   propagatedBuildInputs = [

From 7f38d0a148a5222026929e2b0f79f04ebb3890dd Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 24 May 2022 18:13:32 +0200
Subject: [PATCH 20/50] python310Packages.datashader: 0.13.0 -> 0.14.0

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

diff --git a/pkgs/development/python-modules/datashader/default.nix b/pkgs/development/python-modules/datashader/default.nix
index 243571f248bb..e72d54cde4e3 100644
--- a/pkgs/development/python-modules/datashader/default.nix
+++ b/pkgs/development/python-modules/datashader/default.nix
@@ -15,6 +15,7 @@
 , pyct
 , scipy
 , pytestCheckHook
+, pythonOlder
 , nbsmoke
 , fastparquet
 , nbconvert
@@ -24,12 +25,14 @@
 
 buildPythonPackage rec {
   pname = "datashader";
-  version = "0.13.0";
+  version = "0.14.0";
   format = "setuptools";
 
+  disabled = pythonOlder "3.7";
+
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-6JscHm1QjDmXOLLa83qhAvY/xwvlPM6duQ1lSxnCVV8=";
+    hash = "sha256-VKEDOJV2ITO1gxKLbFQbcem0gEd/fzTIo+QSmZVsMGI=";
   };
 
   propagatedBuildInputs = [

From c18e7de036625a81b8266cf41ed755fb8b4d69d3 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 24 May 2022 21:44:44 +0200
Subject: [PATCH 21/50] python39Packages.umap-learn: disable flaky test

---
 .../python-modules/umap-learn/default.nix     | 27 ++++++++++---------
 1 file changed, 15 insertions(+), 12 deletions(-)

diff --git a/pkgs/development/python-modules/umap-learn/default.nix b/pkgs/development/python-modules/umap-learn/default.nix
index 1281d90cdaf5..25016f9b4cc5 100644
--- a/pkgs/development/python-modules/umap-learn/default.nix
+++ b/pkgs/development/python-modules/umap-learn/default.nix
@@ -1,43 +1,45 @@
 { lib
 , buildPythonPackage
 , fetchFromGitHub
-, nose
+, keras
+, numba
 , numpy
+, pynndescent
+, pytestCheckHook
+, pythonOlder
 , scikit-learn
 , scipy
-, numba
-, pynndescent
 , tensorflow
 , tqdm
-, pytestCheckHook
-, keras
 }:
 
 buildPythonPackage rec {
   pname = "umap-learn";
   version = "0.5.3";
+  format = "setuptools";
+
+  disabled = pythonOlder "3.7";
 
   src = fetchFromGitHub {
     owner = "lmcinnes";
     repo = "umap";
     rev = version;
-    sha256 = "sha256-S2+k7Ec4AxsN6d0GUGnU81oLnBgmlZp8OmUFCNaUJYw=";
+    hash = "sha256-S2+k7Ec4AxsN6d0GUGnU81oLnBgmlZp8OmUFCNaUJYw=";
   };
 
   propagatedBuildInputs = [
+    numba
     numpy
+    pynndescent
     scikit-learn
     scipy
-    numba
-    pynndescent
     tqdm
   ];
 
   checkInputs = [
-    nose
-    tensorflow
-    pytestCheckHook
     keras
+    pytestCheckHook
+    tensorflow
   ];
 
   preCheck = ''
@@ -52,6 +54,7 @@ buildPythonPackage rec {
 
     # Flaky test. Fails with AssertionError sometimes.
     "test_sparse_hellinger"
+    "test_densmap_trustworthiness_on_iris_supervised"
 
     # tensorflow maybe incompatible? https://github.com/lmcinnes/umap/issues/821
     "test_save_load"
@@ -61,6 +64,6 @@ buildPythonPackage rec {
     description = "Uniform Manifold Approximation and Projection";
     homepage = "https://github.com/lmcinnes/umap";
     license = licenses.bsd3;
-    maintainers = [ maintainers.costrouc ];
+    maintainers = with maintainers; [ costrouc ];
   };
 }

From cd22937423fc5c97f45677dc8af0895096a3df72 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Thu, 26 May 2022 23:32:44 +0200
Subject: [PATCH 22/50] python310Packages.arviz: 0.12.0 -> 0.12.1

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

diff --git a/pkgs/development/python-modules/arviz/default.nix b/pkgs/development/python-modules/arviz/default.nix
index 4b5ed5ca687b..8cd1ae1b83da 100644
--- a/pkgs/development/python-modules/arviz/default.nix
+++ b/pkgs/development/python-modules/arviz/default.nix
@@ -31,7 +31,7 @@
 
 buildPythonPackage rec {
   pname = "arviz";
-  version = "0.12.0";
+  version = "0.12.1";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
@@ -40,7 +40,7 @@ buildPythonPackage rec {
     owner = "arviz-devs";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-ClARxgfji/CavEy8g5oeYK7pwSZS1yUIZnBiyTbZ/zU=";
+    hash = "sha256-5P6EXXAAS1Q2eNQuj/5JrDg0lPHfA5K4WaYfKaaXm9s=";
   };
 
   propagatedBuildInputs = [

From 9b3553d1c4f685c0654a3b8043814eb458f2faa1 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 27 May 2022 00:30:18 +0200
Subject: [PATCH 23/50] python310Packages.numba: 0.55.1 -> 0.55.2

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

diff --git a/pkgs/development/python-modules/numba/default.nix b/pkgs/development/python-modules/numba/default.nix
index 23921959f596..a9c152f412f8 100644
--- a/pkgs/development/python-modules/numba/default.nix
+++ b/pkgs/development/python-modules/numba/default.nix
@@ -22,13 +22,13 @@
 let
   inherit (cudaPackages) cudatoolkit;
 in buildPythonPackage rec {
-  version = "0.55.1";
+  version = "0.55.2";
   pname = "numba";
   disabled = pythonOlder "3.6" || pythonAtLeast "3.11";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-A+kGmiZm0chPk7ANvXFvuP7d6Lssbvr6LwSEKkZELqM=";
+    hash = "sha256-5CjZ4R2bpZKEnMyfegCQA+t9MGEgB+Nlr+dDznEYxvQ=";
   };
 
   postPatch = ''

From bc1da43a85404666b241fa15d211d62363f69805 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 27 May 2022 05:19:32 +0000
Subject: [PATCH 24/50] cbatticon: 1.6.12 -> 1.6.13

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

diff --git a/pkgs/applications/misc/cbatticon/default.nix b/pkgs/applications/misc/cbatticon/default.nix
index 0440e806c0c1..4d189d1c37a4 100644
--- a/pkgs/applications/misc/cbatticon/default.nix
+++ b/pkgs/applications/misc/cbatticon/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "cbatticon";
-  version = "1.6.12";
+  version = "1.6.13";
 
   src = fetchFromGitHub {
     owner = "valr";
     repo = pname;
     rev = version;
-    sha256 = "sha256-FGCT3gP+KL71Am4cd+f71iY8EwDPRZJ4+FDgQqjZK1M=";
+    sha256 = "sha256-VQjJujF9lnVvQxV+0YqodLgnI9F90JKDAGBu5nM/Q/c=";
   };
 
   nativeBuildInputs = [ pkg-config gettext wrapGAppsHook ];

From a14ca09c6497f25783ef7ab2ee1bbc071f01e760 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 27 May 2022 06:16:45 +0000
Subject: [PATCH 25/50] clickhouse-backup: 1.3.2 -> 1.4.0

---
 .../tools/database/clickhouse-backup/default.nix            | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/tools/database/clickhouse-backup/default.nix b/pkgs/development/tools/database/clickhouse-backup/default.nix
index a55ed8a3b650..239fb50ae40f 100644
--- a/pkgs/development/tools/database/clickhouse-backup/default.nix
+++ b/pkgs/development/tools/database/clickhouse-backup/default.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "clickhouse-backup";
-  version = "1.3.2";
+  version = "1.4.0";
 
   src = fetchFromGitHub {
     owner = "AlexAkulov";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-dpVFDLDEqqW1u1afb3klpdqwOptudbjUfoFhFBc85Pg=";
+    sha256 = "sha256-NlOYRgCsReEeP/X98fddVRLnTnkqsiwpCg6MpdRcfZ0=";
   };
 
-  vendorSha256 = "sha256-wj4N146iqj/YwyBI0XdrvBp1tqeK43Yq4kSpN594hRs=";
+  vendorSha256 = "sha256-F+FfZESB/m/2m4RnYzFPs0PL5+8lyxzEwAdHMykrFsw=";
 
   postConfigure = ''
     export CGO_ENABLED=0

From b57d56e0356e6edc71c06e33a6dc6edd90d448d5 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 27 May 2022 17:07:22 +0200
Subject: [PATCH 26/50] python310Packages.slack-sdk: 3.16.2 -> 3.17.0

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

diff --git a/pkgs/development/python-modules/slack-sdk/default.nix b/pkgs/development/python-modules/slack-sdk/default.nix
index b3122653a840..8827230b92a7 100644
--- a/pkgs/development/python-modules/slack-sdk/default.nix
+++ b/pkgs/development/python-modules/slack-sdk/default.nix
@@ -20,7 +20,7 @@
 
 buildPythonPackage rec {
   pname = "slack-sdk";
-  version = "3.16.2";
+  version = "3.17.0";
   format = "setuptools";
 
   disabled = pythonOlder "3.6";
@@ -29,7 +29,7 @@ buildPythonPackage rec {
     owner = "slackapi";
     repo = "python-slack-sdk";
     rev = "refs/tags/v${version}";
-    sha256 = "sha256-xecmza5Zsv6mJ4SCRl5VnGseKJG1yznBbLZ1tyBSjIE=";
+    sha256 = "sha256-XyxvJsALAEuAJWORhIs4bGB4vYnCbFHecerA4gTr6ak=";
   };
 
   propagatedBuildInputs = [

From dfbfacd2c1c5ab70ac2ac4c621f0c6b32e96beac Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 27 May 2022 17:10:30 +0200
Subject: [PATCH 27/50] python310Packages.nats-py: 2.1.2 -> 2.1.3

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

diff --git a/pkgs/development/python-modules/nats-py/default.nix b/pkgs/development/python-modules/nats-py/default.nix
index 195fb37d3339..87367fee79bb 100644
--- a/pkgs/development/python-modules/nats-py/default.nix
+++ b/pkgs/development/python-modules/nats-py/default.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "nats-py";
-  version = "2.1.2";
+  version = "2.1.3";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
     owner = "nats-io";
     repo = "nats.py";
     rev = "refs/tags/v${version}";
-    hash = "sha256-i197ZePxngAhGh7xzaJoo7m8el+7t7yJrvhO2CTmajU=";
+    hash = "sha256-anQBy+TOEGJhAv1C5AvLL1KNLD/jiHA7Tze92Ir7Ie8=";
   };
 
   propagatedBuildInputs = [

From b26794a3fd651954950c6adb437d818694ba39c2 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 27 May 2022 17:53:42 +0200
Subject: [PATCH 28/50] python310Packages.pysensibo: 1.0.14 -> 1.0.15

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

diff --git a/pkgs/development/python-modules/pysensibo/default.nix b/pkgs/development/python-modules/pysensibo/default.nix
index 98cf9444b0e6..5a215352af8d 100644
--- a/pkgs/development/python-modules/pysensibo/default.nix
+++ b/pkgs/development/python-modules/pysensibo/default.nix
@@ -7,7 +7,7 @@
 
 buildPythonPackage rec {
   pname = "pysensibo";
-  version = "1.0.14";
+  version = "1.0.15";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
@@ -16,7 +16,7 @@ buildPythonPackage rec {
     owner = "andrey-git";
     repo = pname;
     rev = version;
-    hash = "sha256-r2YIQ6JPyRWzfXprj3tFwrsAR0NtmVLncWZAsLkAzSA=";
+    hash = "sha256-TZjlMry9Ek/13gRKg54aCif/xbx9IEg+rsYnuOzwxRo=";
   };
 
   propagatedBuildInputs = [

From 59908bbe2ad6c993552818f4f76a04cf876dcde7 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 27 May 2022 18:02:06 +0200
Subject: [PATCH 29/50] kubescape: 2.0.155 -> 2.0.156

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

diff --git a/pkgs/tools/security/kubescape/default.nix b/pkgs/tools/security/kubescape/default.nix
index b98ca7ed817f..e1d05a632dc3 100644
--- a/pkgs/tools/security/kubescape/default.nix
+++ b/pkgs/tools/security/kubescape/default.nix
@@ -6,13 +6,13 @@
 
 buildGoModule rec {
   pname = "kubescape";
-  version = "2.0.155";
+  version = "2.0.156";
 
   src = fetchFromGitHub {
     owner = "armosec";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-ZBjwgrF0Pkour1yXMcY4cZt3W2biCzmPd+EYcY4Ppz0=";
+    hash = "sha256-bbTafsHllJQZ9Qn+qFnlr/AdU7NgB/vAvQGIgt/XDNQ=";
   };
   vendorSha256 = "sha256-zj2gDx5333AguLs1Gzu3bYXslDwvPFSbMmOTOFxmq6A=";
 

From 3c6a6e5eed857fa704c4a3cc21085cf80a9b2552 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 27 May 2022 18:33:02 +0200
Subject: [PATCH 30/50] python310Packages.pg8000: 1.28.3 -> 1.29.1

---
 pkgs/development/python-modules/pg8000/default.nix | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/pg8000/default.nix b/pkgs/development/python-modules/pg8000/default.nix
index 54241dde5702..4ae1daa17951 100644
--- a/pkgs/development/python-modules/pg8000/default.nix
+++ b/pkgs/development/python-modules/pg8000/default.nix
@@ -9,14 +9,14 @@
 
 buildPythonPackage rec {
   pname = "pg8000";
-  version = "1.28.3";
+  version = "1.29.1";
   format = "pyproject";
 
-  disabled = pythonOlder "3.6";
+  disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-1hA3s/Iff8fVz+TupoN4klnnzLnu9fcinLxi8x6mujI=";
+    hash = "sha256-gLT03ksCVIMreUhRHg3UY0LRwERszU/diStj0C5PvHs=";
   };
 
   propagatedBuildInputs = [
@@ -26,6 +26,10 @@ buildPythonPackage rec {
     importlib-metadata
   ];
 
+  postPatch = ''
+    sed '/^\[metadata\]/a version = ${version}' setup.cfg
+  '';
+
   # Tests require a running PostgreSQL instance
   doCheck = false;
 

From 47d7ecfcea24ce6c4806fe4edae4cba3c324313c Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 27 May 2022 18:33:38 +0200
Subject: [PATCH 31/50] python310Packages.testing-postgresql: disable on older
 Python releases

---
 .../testing-postgresql/default.nix            | 44 +++++++++++++++----
 1 file changed, 36 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/python-modules/testing-postgresql/default.nix b/pkgs/development/python-modules/testing-postgresql/default.nix
index 7ebff6ccc365..fd88ea03bf72 100644
--- a/pkgs/development/python-modules/testing-postgresql/default.nix
+++ b/pkgs/development/python-modules/testing-postgresql/default.nix
@@ -1,32 +1,60 @@
-{ lib, buildPythonPackage, fetchFromGitHub, postgresql, testing-common-database
-, pg8000, pytestCheckHook, psycopg2, sqlalchemy }:
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, pg8000
+, postgresql
+, psycopg2
+, pytestCheckHook
+, pythonOlder
+, sqlalchemy
+, testing-common-database
+}:
 
 buildPythonPackage rec {
-  pname = "testing.postgresql";
+  pname = "testing-postgresql";
   # Version 1.3.0 isn't working so let's use the latest commit from GitHub
   version = "unstable-2017-10-31";
+  format = "setuptools";
+
+  disabled = pythonOlder "3.7";
 
   src = fetchFromGitHub {
     owner = "tk0miya";
-    repo = pname;
+    repo = "testing.postgresql";
     rev = "c81ded434d00ec8424de0f9e1f4063c778c6aaa8";
-    sha256 = "1asqsi38di768i1sc1qm1k068dj0906ds6lnx7xcbxws0s25m2q3";
+    sha256 = "sha256-A4tahAaa98X66ZYa3QxIQDZkwAwVB6ZDRObEhkbUWKs=";
   };
 
+  propagatedBuildInputs = [
+    testing-common-database
+    pg8000
+  ];
+
+  checkInputs = [
+    pytestCheckHook
+    psycopg2
+    sqlalchemy
+  ];
+
   # Add PostgreSQL to search path
   prePatch = ''
     substituteInPlace src/testing/postgresql.py \
       --replace "/usr/local/pgsql" "${postgresql}"
   '';
 
-  propagatedBuildInputs = [ testing-common-database pg8000 ];
+  postPatch = ''
+    substituteInPlace setup.py \
+      --replace "pg8000 >= 1.10" "pg8000"
+  '';
+
+  pythonImportsCheck = [
+    "testing.postgresql"
+  ];
 
   # Fix tests for Darwin build. See:
   # https://github.com/NixOS/nixpkgs/pull/74716#issuecomment-598546916
   __darwinAllowLocalNetworking = true;
 
-  checkInputs = [ pytestCheckHook psycopg2 sqlalchemy ];
-
   meta = with lib; {
     description = "Use temporary postgresql instance in testing";
     homepage = "https://github.com/tk0miya/testing.postgresql";

From 8d5481d01c8ab2840f50f31b88e195b1cc30bd54 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bj=C3=B8rn=20Forsman?= <bjorn.forsman@gmail.com>
Date: Thu, 26 May 2022 15:26:50 +0200
Subject: [PATCH 32/50] pulseview: hotfix build

libsForQt514 uses a custom stdenv that cause breakage when mixed with
boost built with normal stdenv. Fix it by building boost with the same
stdenv as libsForQt514.

This is a dirty fix compared to https://github.com/NixOS/nixpkgs/pull/171380,
but without mass rebuilds.
---
 pkgs/top-level/all-packages.nix | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 78d4ca310ee0..abafda662b44 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -29076,7 +29076,14 @@ with pkgs;
 
   pulseaudio-dlna = callPackage ../applications/audio/pulseaudio-dlna { };
 
-  pulseview = libsForQt514.callPackage ../applications/science/electronics/pulseview { };
+  pulseview = libsForQt514.callPackage ../applications/science/electronics/pulseview {
+    # use the same stdenv as libsForQt514 to fix build
+    boost = boost.override {
+      stdenv = if stdenv.cc.isGNU
+        then (if (stdenv.targetPlatform.isx86_64) then gcc10Stdenv else gcc9Stdenv)
+        else stdenv;
+      };
+  };
 
   puredata = callPackage ../applications/audio/puredata { };
   puredata-with-plugins = plugins: callPackage ../applications/audio/puredata/wrapper.nix { inherit plugins; };

From cd97b40fac8bfb0ebc5893dc6f803fcce1342f00 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 27 May 2022 18:23:27 +0000
Subject: [PATCH 33/50] python310Packages.google-cloud-datastore: 2.6.0 ->
 2.6.1

---
 .../python-modules/google-cloud-datastore/default.nix         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/google-cloud-datastore/default.nix b/pkgs/development/python-modules/google-cloud-datastore/default.nix
index 1212f21e9baf..73c887748a04 100644
--- a/pkgs/development/python-modules/google-cloud-datastore/default.nix
+++ b/pkgs/development/python-modules/google-cloud-datastore/default.nix
@@ -13,11 +13,11 @@
 
 buildPythonPackage rec {
   pname = "google-cloud-datastore";
-  version = "2.6.0";
+  version = "2.6.1";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-6DHp8kz+CiZkzXDxPfT7KB4Yh11CwcEj3MTn5yd404Q=";
+    sha256 = "sha256-2ItUrY5oMTtWig2UIC2IEOKgaaYsVuy9ralDitzQzdc=";
   };
 
   propagatedBuildInputs = [

From 202d40b9a98b77baecacfaa47d312ed4af86856a Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 27 May 2022 18:32:08 +0000
Subject: [PATCH 34/50] python310Packages.google-cloud-org-policy: 1.3.1 ->
 1.3.2

---
 .../python-modules/google-cloud-org-policy/default.nix        | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/google-cloud-org-policy/default.nix b/pkgs/development/python-modules/google-cloud-org-policy/default.nix
index 2e698db4aef2..495623b3342a 100644
--- a/pkgs/development/python-modules/google-cloud-org-policy/default.nix
+++ b/pkgs/development/python-modules/google-cloud-org-policy/default.nix
@@ -2,11 +2,11 @@
 
 buildPythonPackage rec {
   pname = "google-cloud-org-policy";
-  version = "1.3.1";
+  version = "1.3.2";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-r9qz2/HjDYHXu9jY03rt0QC1BofzQ/HrKVjGCtvXzsU=";
+    sha256 = "sha256-i60DIRtWtB1MEB2/MuNycy7T9MFPnlRtJ7lnFhDVJbE=";
   };
 
   propagatedBuildInputs = [ google-api-core proto-plus ];

From 5ea1301e11367af3c2782fad3b6d03e57713124e Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 27 May 2022 20:43:22 +0200
Subject: [PATCH 35/50] python310Packages.asteval: 0.9.26 -> 0.9.27

---
 .../python-modules/asteval/default.nix          | 17 +++++++++++++----
 1 file changed, 13 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/asteval/default.nix b/pkgs/development/python-modules/asteval/default.nix
index 4bcfa7d8e671..bddfa3c30d4e 100644
--- a/pkgs/development/python-modules/asteval/default.nix
+++ b/pkgs/development/python-modules/asteval/default.nix
@@ -8,14 +8,16 @@
 
 buildPythonPackage rec {
   pname = "asteval";
-  version = "0.9.26";
-  disabled = pythonOlder "3.6";
+  version = "0.9.27";
+  format = "setuptools";
+
+  disabled = pythonOlder "3.7";
 
   src = fetchFromGitHub {
     owner = "newville";
     repo = pname;
     rev = version;
-    sha256 = "0l2iv51yclqn52w3yvyz3brpbca076ivv70h4gd6bkhwjbax1i2b";
+    hash = "sha256-FxWs4l9bqZoqdyhpVRys8Mo9Wdtn1fm5XonisPscWEs=";
   };
 
   SETUPTOOLS_SCM_PRETEND_VERSION = version;
@@ -28,7 +30,14 @@ buildPythonPackage rec {
     pytestCheckHook
   ];
 
-  pythonImportsCheck = [ "asteval" ];
+  postPatch = ''
+    substituteInPlace setup.cfg \
+      --replace " --cov=asteval --cov-report xml" ""
+  '';
+
+  pythonImportsCheck = [
+    "asteval"
+  ];
 
   meta = with lib; {
     description = "AST evaluator of Python expression using ast module";

From 66c6c914a8a4f72b66686f7d4946cb4792636b3e Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 27 May 2022 22:13:37 +0200
Subject: [PATCH 36/50] python310Packages.pysnmplib: 5.0.10 -> 5.0.15

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

diff --git a/pkgs/development/python-modules/pysnmplib/default.nix b/pkgs/development/python-modules/pysnmplib/default.nix
index 3c3333074a68..97a6cf4ff5d6 100644
--- a/pkgs/development/python-modules/pysnmplib/default.nix
+++ b/pkgs/development/python-modules/pysnmplib/default.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "pysnmplib";
-  version = "5.0.10";
+  version = "5.0.15";
   format = "pyproject";
 
   disabled = pythonOlder "3.8";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
     owner = "pysnmp";
     repo = "pysnmp";
     rev = "v${version}";
-    hash = "sha256-PsfsOVzeHCVdd1Bi+FYYi68Wzn1MI8dZUbRr/tmT+cA=";
+    hash = "sha256-9HkS8oY9aHr8jXmryUMNz3z36BMWeYMuXLKdpEzCgZc=";
   };
 
   nativeBuildInputs = [

From 625c3daaf97b794a3bb5701afb0749d92529cc72 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 27 May 2022 22:43:07 +0200
Subject: [PATCH 37/50] python310Packages.brother: relax pysnmplib constraint

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

diff --git a/pkgs/development/python-modules/brother/default.nix b/pkgs/development/python-modules/brother/default.nix
index db4ef16522e8..be6595408db6 100644
--- a/pkgs/development/python-modules/brother/default.nix
+++ b/pkgs/development/python-modules/brother/default.nix
@@ -37,6 +37,8 @@ buildPythonPackage rec {
       --replace "--cov --cov-report term-missing " ""
     substituteInPlace setup.py \
       --replace '"pytest-runner"' ""
+    substituteInPlace requirements.txt \
+      --replace "pysnmplib==5.0.10" "pysnmplib>=5.0.10"
   '';
 
   pythonImportsCheck = [

From 2a5bbbc6e92867a3aeb3c07d86b297b56300cc6c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Fri, 27 May 2022 23:19:37 +0200
Subject: [PATCH 38/50] python310Packages.service-identity: normalise directory
 name

---
 .../{service_identity => service-identity}/default.nix          | 0
 pkgs/top-level/python-packages.nix                              | 2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename pkgs/development/python-modules/{service_identity => service-identity}/default.nix (100%)

diff --git a/pkgs/development/python-modules/service_identity/default.nix b/pkgs/development/python-modules/service-identity/default.nix
similarity index 100%
rename from pkgs/development/python-modules/service_identity/default.nix
rename to pkgs/development/python-modules/service-identity/default.nix
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 3d4ff7c5ebb8..73e08715b771 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -9462,7 +9462,7 @@ in {
 
   serverlessrepo = callPackage ../development/python-modules/serverlessrepo { };
 
-  service-identity = callPackage ../development/python-modules/service_identity { };
+  service-identity = callPackage ../development/python-modules/service-identity { };
 
   setproctitle = callPackage ../development/python-modules/setproctitle { };
 

From 515a09d3559184abc273a24dad62712e32a74709 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sandro=20J=C3=A4ckel?= <sandro.jaeckel@gmail.com>
Date: Fri, 27 May 2022 23:49:44 +0200
Subject: [PATCH 39/50] python310Packages.xmlsec: fix comment position

---
 pkgs/development/python-modules/xmlsec/default.nix | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/xmlsec/default.nix b/pkgs/development/python-modules/xmlsec/default.nix
index 76ce32e5e8f3..0224c03ab3e8 100644
--- a/pkgs/development/python-modules/xmlsec/default.nix
+++ b/pkgs/development/python-modules/xmlsec/default.nix
@@ -34,17 +34,16 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [ lxml ];
 
-  # Full git clone required for test_doc_examples
   checkInputs = [ pytestCheckHook hypothesis ];
 
   disabledTestPaths = [
+    # Full git clone required for test_doc_examples
     "tests/test_doc_examples.py"
     # test_reinitialize_module segfaults python
     # https://github.com/mehcode/python-xmlsec/issues/203
     "tests/test_xmlsec.py"
   ];
 
-
   pythonImportsCheck = [ "xmlsec" ];
 
   meta = with lib; {

From 20db324c17b7c4bdc08655368a1405d4793cd66c Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Thu, 26 May 2022 20:18:05 +1000
Subject: [PATCH 40/50] terraform-providers.auth0: 0.26.2 -> 0.30.2

alexkappa/auth0 -> auth0/auth0
---
 .../cluster/terraform-providers/providers.json       | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json
index 7e379d480936..6e3109a84b87 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -73,13 +73,13 @@
     "version": "2.2.0"
   },
   "auth0": {
-    "owner": "alexkappa",
-    "provider-source-address": "registry.terraform.io/alexkappa/auth0",
+    "owner": "auth0",
+    "provider-source-address": "registry.terraform.io/auth0/auth0",
     "repo": "terraform-provider-auth0",
-    "rev": "v0.26.2",
-    "sha256": "1n9gn7zsdygdr2ybki7xz2snp3fygls6myb1w5zndby497kgxrkw",
-    "vendorSha256": "1x61f7vz73m2q6pdb6ddy27j4npiwrrlgzvd90zrcc0yj22h6mms",
-    "version": "0.26.2"
+    "rev": "v0.30.2",
+    "sha256": "sha256-6+81QomUnKEbaqGHSRabLSb7O6lrrG+Fp9N8y8ZtS8A=",
+    "vendorSha256": "sha256-4o+/iB853zXcEYgPKVZ8CVHdIOEZW+/OX+LDBHSNjUk=",
+    "version": "0.30.2"
   },
   "avi": {
     "owner": "vmware",

From 463d470ad1241a821de4a8fd1952fd4a315bf6c0 Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Fri, 27 May 2022 13:10:43 +1000
Subject: [PATCH 41/50] terraform-providers.snowflake: 0.33.1 -> 0.34.0

chanzuckerberg/snowflake -> Snowflake-Labs/snowflake
---
 .../cluster/terraform-providers/providers.json       | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json
index 6e3109a84b87..f955c555ea08 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -1068,13 +1068,13 @@
     "version": "0.14.5"
   },
   "snowflake": {
-    "owner": "chanzuckerberg",
-    "provider-source-address": "registry.terraform.io/chanzuckerberg/snowflake",
+    "owner": "Snowflake-Labs",
+    "provider-source-address": "registry.terraform.io/Snowflake-Labs/snowflake",
     "repo": "terraform-provider-snowflake",
-    "rev": "v0.33.1",
-    "sha256": "sha256-xFtk1WbMe2/UFGB/ej6QEL07+dZTsWFmqvyVCa2YBw8=",
-    "vendorSha256": "sha256-l++IzY3/W4qsdFJY7ik0xF6tZWluLb4EcW5KQtBVY5s=",
-    "version": "0.33.1"
+    "rev": "v0.34.0",
+    "sha256": "sha256-7FQp5lDm6WKFmtk9V8Sf+e5J4tLpAOfgMKpbcQRcfIE=",
+    "vendorSha256": "sha256-HGukjbPQyQpFnVkgUnreQlNAW9nhLirnQnYIpBfFe+M=",
+    "version": "0.34.0"
   },
   "sops": {
     "owner": "carlpett",

From f7ba0283cb48fa885baffb83a743ebbb945beda3 Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Thu, 26 May 2022 20:37:19 +1000
Subject: [PATCH 42/50] terraform-providers: drop outdated aliases

---
 .../cluster/terraform-providers/default.nix   | 34 -------------------
 1 file changed, 34 deletions(-)

diff --git a/pkgs/applications/networking/cluster/terraform-providers/default.nix b/pkgs/applications/networking/cluster/terraform-providers/default.nix
index 0be97ceb9b14..941bbcc8ae9f 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/default.nix
+++ b/pkgs/applications/networking/cluster/terraform-providers/default.nix
@@ -70,40 +70,6 @@ let
       removed = date: throw "removed from nixpkgs on ${date}";
     in
     lib.optionalAttrs config.allowAliases {
-      arukas = archived "2022/01";
-      chef = archived "2022/01";
-      cherryservers = archived "2022/01";
-      clc = archived "2022/01";
-      cloudstack = removed "2022/01";
-      cobbler = archived "2022/01";
-      cohesity = archived "2022/01";
-      dyn = archived "2022/01";
-      genymotion = archived "2022/01";
-      hedvig = archived "2022/01";
-      ignition = archived "2022/01";
-      incapsula = archived "2022/01";
-      influxdb = archived "2022/01";
-      jdcloud = archived "2022/01";
-      kubernetes-alpha = throw "This has been merged as beta into the kubernetes provider. See https://www.hashicorp.com/blog/beta-support-for-crds-in-the-terraform-provider-for-kubernetes for details";
-      librato = archived "2022/01";
-      logentries = archived "2022/01";
-      metalcloud = archived "2022/01";
-      mysql = archived "2022/01";
-      nixos = archived "2022/01";
-      oneandone = archived "2022/01";
-      packet = archived "2022/01";
-      profitbricks = archived "2022/01";
-      pureport = archived "2022/01";
-      rancher = archived "2022/01";
-      rightscale = archived "2022/01";
-      runscope = archived "2022/01";
-      segment = removed "2022/01";
-      softlayer = archived "2022/01";
-      telefonicaopencloud = archived "2022/01";
-      teleport = removed "2022/01";
-      terraform = archived "2022/01";
-      ultradns = archived "2022/01";
-      vthunder = throw "provider was renamed to thunder on 2022/01";
     };
 
   # excluding aliases, used by terraform-full

From df490e463487249b6ca2b393aa1b63c79bb8f4cc Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Thu, 26 May 2022 20:27:08 +1000
Subject: [PATCH 43/50] terraform-providers.opc: archived

---
 .../networking/cluster/terraform-providers/default.nix   | 1 +
 .../cluster/terraform-providers/providers.json           | 9 ---------
 2 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/pkgs/applications/networking/cluster/terraform-providers/default.nix b/pkgs/applications/networking/cluster/terraform-providers/default.nix
index 941bbcc8ae9f..1f97f3670cf7 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/default.nix
+++ b/pkgs/applications/networking/cluster/terraform-providers/default.nix
@@ -70,6 +70,7 @@ let
       removed = date: throw "removed from nixpkgs on ${date}";
     in
     lib.optionalAttrs config.allowAliases {
+      opc = archived "2022/05";
     };
 
   # excluding aliases, used by terraform-full
diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json
index f955c555ea08..90c61dd4d033 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -860,15 +860,6 @@
     "vendorSha256": null,
     "version": "1.0.1"
   },
-  "opc": {
-    "owner": "terraform-providers",
-    "provider-source-address": "registry.terraform.io/hashicorp/opc",
-    "repo": "terraform-provider-opc",
-    "rev": "v1.4.1",
-    "sha256": "1kylnjy7s5bkx6zjksbz8sfx77pxcc9ycbi8kd8axnrcmj4q01xc",
-    "vendorSha256": null,
-    "version": "1.4.1"
-  },
   "opennebula": {
     "owner": "OpenNebula",
     "provider-source-address": "registry.terraform.io/OpenNebula/opennebula",

From 030abdb3776a4d73cdf61e9bf580a610ee61e4ba Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Thu, 26 May 2022 20:27:22 +1000
Subject: [PATCH 44/50] terraform-providers.oraclepass: archived

---
 .../networking/cluster/terraform-providers/default.nix   | 1 +
 .../cluster/terraform-providers/providers.json           | 9 ---------
 2 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/pkgs/applications/networking/cluster/terraform-providers/default.nix b/pkgs/applications/networking/cluster/terraform-providers/default.nix
index 1f97f3670cf7..754a962edab1 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/default.nix
+++ b/pkgs/applications/networking/cluster/terraform-providers/default.nix
@@ -71,6 +71,7 @@ let
     in
     lib.optionalAttrs config.allowAliases {
       opc = archived "2022/05";
+      oraclepaas = archived "2022/05";
     };
 
   # excluding aliases, used by terraform-full
diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json
index 90c61dd4d033..91d393932488 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -896,15 +896,6 @@
     "vendorSha256": null,
     "version": "0.6.10"
   },
-  "oraclepaas": {
-    "owner": "terraform-providers",
-    "provider-source-address": "registry.terraform.io/hashicorp/oraclepaas",
-    "repo": "terraform-provider-oraclepaas",
-    "rev": "v1.5.3",
-    "sha256": "0xb03b5jgm06rgrllib6zj1nkh54zv2mqjnyfflgnazpf4c1ia15",
-    "vendorSha256": null,
-    "version": "1.5.3"
-  },
   "ovh": {
     "owner": "ovh",
     "provider-source-address": "registry.terraform.io/ovh/ovh",

From 870d43c5aaea49b33166bbc7c3a3b35ca469606d Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Thu, 26 May 2022 20:27:33 +1000
Subject: [PATCH 45/50] terraform-providers.template: archived

---
 .../networking/cluster/terraform-providers/default.nix   | 1 +
 .../cluster/terraform-providers/providers.json           | 9 ---------
 2 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/pkgs/applications/networking/cluster/terraform-providers/default.nix b/pkgs/applications/networking/cluster/terraform-providers/default.nix
index 754a962edab1..9af916e855c8 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/default.nix
+++ b/pkgs/applications/networking/cluster/terraform-providers/default.nix
@@ -72,6 +72,7 @@ let
     lib.optionalAttrs config.allowAliases {
       opc = archived "2022/05";
       oraclepaas = archived "2022/05";
+      template = archived "2022/05";
     };
 
   # excluding aliases, used by terraform-full
diff --git a/pkgs/applications/networking/cluster/terraform-providers/providers.json b/pkgs/applications/networking/cluster/terraform-providers/providers.json
index 91d393932488..54a3904550be 100644
--- a/pkgs/applications/networking/cluster/terraform-providers/providers.json
+++ b/pkgs/applications/networking/cluster/terraform-providers/providers.json
@@ -1103,15 +1103,6 @@
     "vendorSha256": "sha256-7DGY+L41bJJrtLwdWgu2aMCefgcmtR6tmH12foi68Kc=",
     "version": "2.16.0"
   },
-  "template": {
-    "owner": "hashicorp",
-    "provider-source-address": "registry.terraform.io/hashicorp/template",
-    "repo": "terraform-provider-template",
-    "rev": "v2.2.0",
-    "sha256": "12pn1i06jz4xl50md94yfdggg3pg5bv1viwf35izizm5rnyksyv2",
-    "vendorSha256": null,
-    "version": "2.2.0"
-  },
   "tencentcloud": {
     "owner": "tencentcloudstack",
     "provider-source-address": "registry.terraform.io/tencentcloudstack/tencentcloud",

From 0f45ffa21be63cf363de393941b4ebfe2884fad6 Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Tue, 24 May 2022 09:59:44 +1000
Subject: [PATCH 46/50] megatools: fmt

---
 pkgs/tools/networking/megatools/default.nix | 36 +++++++++++++++++----
 1 file changed, 30 insertions(+), 6 deletions(-)

diff --git a/pkgs/tools/networking/megatools/default.nix b/pkgs/tools/networking/megatools/default.nix
index ac37e93c7360..1e6227359755 100644
--- a/pkgs/tools/networking/megatools/default.nix
+++ b/pkgs/tools/networking/megatools/default.nix
@@ -1,5 +1,19 @@
-{ lib, stdenv, fetchgit, autoreconfHook, pkg-config, glib, fuse, curl, glib-networking
-, asciidoc, libxml2, docbook_xsl, docbook_xml_dtd_45, libxslt, wrapGAppsNoGuiHook }:
+{ lib
+, stdenv
+, fetchgit
+, autoreconfHook
+, pkg-config
+, glib
+, fuse
+, curl
+, glib-networking
+, asciidoc
+, libxml2
+, docbook_xsl
+, docbook_xml_dtd_45
+, libxslt
+, wrapGAppsNoGuiHook
+}:
 
 stdenv.mkDerivation rec {
   pname = "megatools";
@@ -12,11 +26,21 @@ stdenv.mkDerivation rec {
   };
 
   nativeBuildInputs = [
-    autoreconfHook pkg-config wrapGAppsNoGuiHook asciidoc libxml2
-    docbook_xsl docbook_xml_dtd_45 libxslt
+    asciidoc
+    autoreconfHook
+    docbook_xml_dtd_45
+    docbook_xsl
+    libxml2
+    libxslt
+    pkg-config
+    wrapGAppsNoGuiHook
   ];
-  buildInputs = [ glib glib-networking curl ]
-  ++ lib.optionals stdenv.isLinux [ fuse ];
+
+  buildInputs = [
+    curl
+    glib
+    glib-networking
+  ] ++ lib.optionals stdenv.isLinux [ fuse ];
 
   enableParallelBuilding = true;
 

From 7ef1df63740abb68b834337a3ff8a545e7834112 Mon Sep 17 00:00:00 2001
From: zowoq <59103226+zowoq@users.noreply.github.com>
Date: Tue, 24 May 2022 09:59:54 +1000
Subject: [PATCH 47/50] megatools: 1.10.3 -> 1.11.0

https://megous.com/git/megatools/tree/NEWS?h=1.11.0
---
 pkgs/tools/networking/megatools/default.nix | 31 ++++++++++-----------
 1 file changed, 14 insertions(+), 17 deletions(-)

diff --git a/pkgs/tools/networking/megatools/default.nix b/pkgs/tools/networking/megatools/default.nix
index 1e6227359755..b4d420ea22da 100644
--- a/pkgs/tools/networking/megatools/default.nix
+++ b/pkgs/tools/networking/megatools/default.nix
@@ -1,48 +1,45 @@
 { lib
 , stdenv
 , fetchgit
-, autoreconfHook
+, asciidoc
+, docbook_xml_dtd_45
+, docbook2x
+, libxml2
+, meson
+, ninja
 , pkg-config
+, curl
 , glib
 , fuse
-, curl
-, glib-networking
-, asciidoc
-, libxml2
-, docbook_xsl
-, docbook_xml_dtd_45
-, libxslt
-, wrapGAppsNoGuiHook
 }:
 
 stdenv.mkDerivation rec {
   pname = "megatools";
-  version = "1.10.3";
+  version = "1.11.0";
 
   src = fetchgit {
     url = "https://megous.com/git/megatools";
-    rev = "5581d06e447b84d0101d36dc96ab72920eec1017";
-    sha256 = "1fh456kjsmdvpmvklkpi06h720yvhahd4rxa6cm5x818pl44p1r4";
+    rev = version;
+    sha256 = "sha256-Q9hMJBQBenufubbmeAw8Q8w+Oo+UcZLWathKNDwTv3s=";
   };
 
   nativeBuildInputs = [
     asciidoc
-    autoreconfHook
     docbook_xml_dtd_45
-    docbook_xsl
+    docbook2x
     libxml2
-    libxslt
+    meson
+    ninja
     pkg-config
-    wrapGAppsNoGuiHook
   ];
 
   buildInputs = [
     curl
     glib
-    glib-networking
   ] ++ lib.optionals stdenv.isLinux [ fuse ];
 
   enableParallelBuilding = true;
+  strictDeps = true;
 
   meta = with lib; {
     description = "Command line client for Mega.co.nz";

From 108dea5cdacd5f8fb221f051c06f7078aa8a3b49 Mon Sep 17 00:00:00 2001
From: Luna Nova <git@lunnova.dev>
Date: Sat, 21 May 2022 19:10:40 -0700
Subject: [PATCH 48/50] vkdisplayinfo: init at 0.1

https://github.com/ChristophHaag/vkdisplayinfo

Apply suggestions from @SuperSandro2000's code review

Co-authored-by: Sandro <sandro.jaeckel@gmail.com>

Don't use pipefail
---
 pkgs/tools/graphics/vkdisplayinfo/default.nix | 48 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 2 files changed, 50 insertions(+)
 create mode 100644 pkgs/tools/graphics/vkdisplayinfo/default.nix

diff --git a/pkgs/tools/graphics/vkdisplayinfo/default.nix b/pkgs/tools/graphics/vkdisplayinfo/default.nix
new file mode 100644
index 000000000000..a48c4d1154fe
--- /dev/null
+++ b/pkgs/tools/graphics/vkdisplayinfo/default.nix
@@ -0,0 +1,48 @@
+{ lib
+, stdenv
+, meson
+, ninja
+, vulkan-loader
+, vulkan-headers
+, fetchFromGitHub
+}:
+stdenv.mkDerivation rec {
+  pname = "vkdisplayinfo";
+  version = "0.1";
+
+  src = fetchFromGitHub {
+    owner = "ChristophHaag";
+    repo = "vkdisplayinfo";
+    rev = version;
+    hash = "sha256-n6U7T5aOYTpgWE2WGPBPHtQKzitf9PxAoXJNWyz4rYw=";
+  };
+
+  postInstall = ''
+    install vkdisplayinfo -Dm755 -t $out/bin
+  '';
+
+  doInstallCheck = true;
+  installCheckPhase = ''
+    runHook preInstallCheck
+    ($out/bin/vkdisplayinfo 2>&1 || true) | grep -q vkdisplayinfo
+    runHook postInstallCheck
+  '';
+
+  nativeBuildInputs = [
+    meson
+    ninja
+  ];
+
+  buildInputs = [
+    vulkan-loader
+    vulkan-headers
+  ];
+
+  meta = with lib; {
+    description = "Print displays and modes enumerated with the Vulkan function vkGetPhysicalDeviceDisplayPropertiesKHR";
+    homepage = "https://github.com/ChristophHaag/vkdisplayinfo";
+    platforms = platforms.linux;
+    license = licenses.boost;
+    maintainers = [ maintainers.LunNova ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b30eeac305d6..e1bcf2f1252f 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -20975,6 +20975,8 @@ with pkgs;
     hdf5 = hdf5.override { usev110Api = true; };
   };
 
+  vkdisplayinfo = callPackage ../tools/graphics/vkdisplayinfo { };
+
   vlock = callPackage ../misc/screensavers/vlock { };
 
   vmime = callPackage ../development/libraries/vmime { };

From 2be2461a98380707dcd3858f927f4fa090b84682 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Thu, 26 May 2022 15:36:19 +0000
Subject: [PATCH 49/50] qutebrowser: 2.5.0 -> 2.5.1

https://github.com/qutebrowser/qutebrowser/releases/tag/v2.5.1
---
 .../networking/browsers/qutebrowser/default.nix       | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/pkgs/applications/networking/browsers/qutebrowser/default.nix b/pkgs/applications/networking/browsers/qutebrowser/default.nix
index 91ef3270dc45..a9e6436c8da1 100644
--- a/pkgs/applications/networking/browsers/qutebrowser/default.nix
+++ b/pkgs/applications/networking/browsers/qutebrowser/default.nix
@@ -14,12 +14,11 @@ assert withMediaPlayback -> gst_all_1 != null;
 let
   python3Packages = python3.pkgs;
   pdfjs = let
-    version = "2.8.335";
+    version = "2.14.305";
   in
   fetchzip rec {
-    name = "pdfjs-${version}";
-    url = "https://github.com/mozilla/pdf.js/releases/download/v${version}/${name}-dist.zip";
-    sha256 = "1zschfpxnhdinn9nasl5in4s62ad0h1g369cglamjgxx36x27zly";
+    url = "https://github.com/mozilla/pdf.js/releases/download/v${version}/pdfjs-${version}-dist.zip";
+    hash = "sha256-E7t+0AUndrgi4zfJth0w28RmWLqLyXMUCnueNf/gNi4=";
     stripRoot = false;
   };
 
@@ -33,12 +32,12 @@ let
 
 in mkDerivationWith python3Packages.buildPythonApplication rec {
   pname = "qutebrowser";
-  version = "2.5.0";
+  version = "2.5.1";
 
   # the release tarballs are different from the git checkout!
   src = fetchurl {
     url = "https://github.com/qutebrowser/qutebrowser/releases/download/v${version}/${pname}-${version}.tar.gz";
-    sha256 = "1zai8ivc9cqax2idspwvyp24dkis0x6sv29fia8ja3sp62i45171";
+    hash = "sha256-5ohYhqhM0WamumM3lKWKTGfYccJxiBJ+XdvFJ2127bw=";
   };
 
   # Needs tox

From dbd004ea9bee830402aa410c6b8a0a493efa454b Mon Sep 17 00:00:00 2001
From: midchildan <git@midchildan.org>
Date: Sat, 28 May 2022 08:24:15 +0900
Subject: [PATCH 50/50] xkcd-font: fix build (#174776)

* xkcd-font: fix build

* xkcd-font: remove dotfiles from output

* xkcd-font: add comment
---
 pkgs/data/fonts/xkcd-font/default.nix | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/pkgs/data/fonts/xkcd-font/default.nix b/pkgs/data/fonts/xkcd-font/default.nix
index af740e408981..af79e7f1d8f1 100644
--- a/pkgs/data/fonts/xkcd-font/default.nix
+++ b/pkgs/data/fonts/xkcd-font/default.nix
@@ -11,11 +11,22 @@ in fetchFromGitHub {
   rev = "5632fde618845dba5c22f14adc7b52bf6c52d46d";
 
   postFetch = ''
-    tar xf $downloadedFile --strip=1
+    pushd $out
+
     install -Dm444 -t $out/share/fonts/opentype/ xkcd/build/xkcd.otf
     install -Dm444 -t $out/share/fonts/truetype/ xkcd-script/font/xkcd-script.ttf
+
+    # remove unrelated files
+    for f in * .*; do
+      case "$f" in
+        share|.|..) ;;
+        *) rm -rf "$f" ;;
+      esac
+    done
+
+    popd
   '';
-  sha256 = "0xhwa53aiz20763jb9nvbr2zq9k6jl69p07dc4b0apwrrwz0jfr1";
+  sha256 = "sha256-ITsJPs+ZXwUWYe2AmwyVZib8RV7bpiWHOUD8qEZRHHY=";
 
   meta = with lib; {
     description = "The xkcd font";