From e08ce0d54d67a1a4bdd88ca3f062f489bba0f801 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Mon, 26 Sep 2022 07:40:09 +0000
Subject: [PATCH 01/58] skytemple: 1.3.10 -> 1.3.11.post1

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

diff --git a/pkgs/applications/misc/skytemple/default.nix b/pkgs/applications/misc/skytemple/default.nix
index 2ec034e882e1..3eacada55b22 100644
--- a/pkgs/applications/misc/skytemple/default.nix
+++ b/pkgs/applications/misc/skytemple/default.nix
@@ -10,13 +10,13 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "skytemple";
-  version = "1.3.10";
+  version = "1.3.11.post1";
 
   src = fetchFromGitHub {
     owner = "SkyTemple";
     repo = pname;
-    rev = version;
-    hash = "sha256-CyYGTXdQsGpDR/gpqViEQO1xUPHaXTES592nRJixa1o=";
+    rev = "refs/tags/${version}";
+    hash = "sha256-H3apAb5viupj7cNsiHsTMDBAhK5sUzpV4aOn5KVu6mI=";
   };
 
   buildInputs = [

From 64110b1518467b87d7b5eb2f90d9236434501b11 Mon Sep 17 00:00:00 2001
From: marius david <marius@mariusdavid.fr>
Date: Mon, 7 Nov 2022 13:36:40 +0100
Subject: [PATCH 02/58] python3Packages.pmdsky-debug-py: init at 4.0.0

---
 .../pmdsky-debug-py/default.nix               | 33 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 35 insertions(+)
 create mode 100644 pkgs/development/python-modules/pmdsky-debug-py/default.nix

diff --git a/pkgs/development/python-modules/pmdsky-debug-py/default.nix b/pkgs/development/python-modules/pmdsky-debug-py/default.nix
new file mode 100644
index 000000000000..3f7e3305b98e
--- /dev/null
+++ b/pkgs/development/python-modules/pmdsky-debug-py/default.nix
@@ -0,0 +1,33 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, setuptools
+}:
+
+#This package is auto-generated. It could totally be possible to generate it from upstream, but seems unecessary
+buildPythonPackage rec {
+  pname = "pmdsky-debug-py";
+  version = "4.0.0";
+  # SkyTemple specifically require this version. This is used when patching the binary,
+  # and risk to be a bit problematic if using the latest version, given it doesn’t follow semver.
+
+  src = fetchFromGitHub {
+    owner = "SkyTemple";
+    repo = pname;
+    rev = version;
+    sha256 = "sha256-iRiUZoyWAkFGPvRyQRWvI0210Vk2jPS0PSCCCns5yJI=";
+  };
+
+  prePatch = "cd src";
+
+  format = "pyproject";
+
+  nativeBuildInputs = [ setuptools ];
+
+  meta = with lib; {
+    description = "Autogenerated and statically check-able pmdsky-debug symbol definitions for Python";
+    homepage = "https://github.com/SkyTemple/pmdsky-debug-py";
+    license = licenses.mit;
+    maintainers = with maintainers; [ marius851000 ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 5d124af9813b..d2e0e560dabd 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -7650,6 +7650,8 @@ self: super: with self; {
 
   pmw = callPackage ../development/python-modules/pmw { };
 
+  pmdsky-debug-py = callPackage ../development/python-modules/pmdsky-debug-py { };
+
   pnglatex = callPackage ../development/python-modules/pnglatex { };
 
   pocket = callPackage ../development/python-modules/pocket { };

From 102ee94b2de883b261c848c7907588d831b467fa Mon Sep 17 00:00:00 2001
From: marius david <marius@mariusdavid.fr>
Date: Mon, 7 Nov 2022 13:37:01 +0100
Subject: [PATCH 03/58] python3Packages.range-typed-integers: init at 1.0.1

---
 .../range-typed-integers/default.nix          | 34 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 ++
 2 files changed, 36 insertions(+)
 create mode 100644 pkgs/development/python-modules/range-typed-integers/default.nix

diff --git a/pkgs/development/python-modules/range-typed-integers/default.nix b/pkgs/development/python-modules/range-typed-integers/default.nix
new file mode 100644
index 000000000000..1bb5d7b26f62
--- /dev/null
+++ b/pkgs/development/python-modules/range-typed-integers/default.nix
@@ -0,0 +1,34 @@
+{ lib
+, buildPythonPackage
+, pythonOlder
+, fetchFromGitHub
+, pytestCheckHook
+, setuptools
+}:
+
+buildPythonPackage rec {
+  pname = "range-typed-integers";
+  version = "1.0.1";
+
+  disabled = pythonOlder "3.8";
+
+  src = fetchFromGitHub {
+    owner = "theCapypara";
+    repo = "range-typed-integers";
+    rev = version;
+    sha256 = "sha256-4+XdalHq6Q2cBbuYi4x7kmCNQh1MwYf+XlLP9FzzzgE=";
+  };
+
+  format = "pyproject";
+
+  nativeBuildInputs = [ setuptools ];
+
+  checkInputs = [ pytestCheckHook ];
+
+  meta = with lib; {
+    description = "A package provides integer types that have a specific range of valid values";
+    homepage = "https://github.com/theCapypara/range-typed-integers";
+    license = [ licenses.mit ];
+    maintainers = with maintainers; [ marius851000 ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index d2e0e560dabd..8f0a7c604da1 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -10109,6 +10109,8 @@ self: super: with self; {
 
   random2 = callPackage ../development/python-modules/random2 { };
 
+  range-typed-integers = callPackage ../development/python-modules/range-typed-integers { };
+
   rangehttpserver = callPackage ../development/python-modules/rangehttpserver { };
 
   rapidfuzz = callPackage ../development/python-modules/rapidfuzz { };

From eb81ab148d3aeff7902f5b810d487c99b1efdd04 Mon Sep 17 00:00:00 2001
From: marius david <marius@mariusdavid.fr>
Date: Mon, 7 Nov 2022 13:37:47 +0100
Subject: [PATCH 04/58] python3Packages.py-desmume: 0.0.4.post2 -> 0.0.5.post0

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

diff --git a/pkgs/development/python-modules/py-desmume/default.nix b/pkgs/development/python-modules/py-desmume/default.nix
index 30631de36e52..1ed79995b4ee 100644
--- a/pkgs/development/python-modules/py-desmume/default.nix
+++ b/pkgs/development/python-modules/py-desmume/default.nix
@@ -17,7 +17,7 @@
 
 buildPythonPackage rec {
   pname = "py-desmume";
-  version = "0.0.4.post2";
+  version = "0.0.5.post0";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
@@ -26,7 +26,7 @@ buildPythonPackage rec {
     owner = "SkyTemple";
     repo = pname;
     rev = version;
-    hash = "sha256-a819+K/Ovnz53ViDKpUGGjeblWvrAO5ozt/tizdLKCY=";
+    hash = "sha256-q6E7J7e0yXt+jo1KNqqAw2cG/Us+Tw0dLfTqAKWfAlc=";
     fetchSubmodules = true;
   };
 
@@ -64,6 +64,6 @@ buildPythonPackage rec {
     description = "Python library to interface with DeSmuME, the Nintendo DS emulator";
     homepage = "https://github.com/SkyTemple/py-desmume";
     license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ xfix ];
+    maintainers = with maintainers; [ marius851000 xfix ];
   };
 }

From 35fb0f40fb774e6b699f2dc0c8f479c9b52168a2 Mon Sep 17 00:00:00 2001
From: marius david <marius@mariusdavid.fr>
Date: Mon, 7 Nov 2022 13:38:18 +0100
Subject: [PATCH 05/58] python3Packages.tilequant: 0.4.0.post0 -> 0.4.1.post0

---
 .../python-modules/tilequant/default.nix      | 19 ++++---------------
 1 file changed, 4 insertions(+), 15 deletions(-)

diff --git a/pkgs/development/python-modules/tilequant/default.nix b/pkgs/development/python-modules/tilequant/default.nix
index a72802e2c7b3..c0d182693553 100644
--- a/pkgs/development/python-modules/tilequant/default.nix
+++ b/pkgs/development/python-modules/tilequant/default.nix
@@ -9,17 +9,9 @@
 , sortedcollections
 }:
 
-let
-  aikku93-tilequant = fetchFromGitHub {
-    owner = "SkyTemple";
-    repo = "aikku93-tilequant";
-    rev = "6604e0906edff384b6c8d4cde03e6601731f66fd";
-    sha256 = "0w19h3n2i0xriqsy0b0rifjgbv4hqd7gl78fw0cappkrdykij5r1";
-  };
-in
 buildPythonPackage rec {
   pname = "tilequant";
-  version = "0.4.0.post0";
+  version = "0.4.1.post0";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
@@ -28,13 +20,10 @@ buildPythonPackage rec {
     owner = "SkyTemple";
     repo = pname;
     rev = version;
-    sha256 = "189af203iay3inj1bbgm3hh1fshn879bcm28ypbvfp27fy7j5b25";
+    hash = "sha256-7vU/AYnX7deOH3PjrseRIj9BUJMWzDlwR3UcMpBRyfc=";
+    fetchSubmodules = true;
   };
 
-  postPatch = ''
-    cp -R --no-preserve=mode ${aikku93-tilequant} __aikku93_tilequant
-  '';
-
   buildInputs = [
     gitpython
   ];
@@ -56,6 +45,6 @@ buildPythonPackage rec {
     description = "Tool for quantizing image colors using tile-based palette restrictions";
     homepage = "https://github.com/SkyTemple/tilequant";
     license = licenses.gpl3Plus;
-    maintainers = with maintainers; [ xfix ];
+    maintainers = with maintainers; [ marius851000 xfix ];
   };
 }

From fbf0455874cda2ed6c1ffe8d2a546a2b7b66460a Mon Sep 17 00:00:00 2001
From: marius david <marius@mariusdavid.fr>
Date: Mon, 7 Nov 2022 13:38:47 +0100
Subject: [PATCH 06/58] python3Packages.skytemple-ssb-debugger: 1.3.8.post2 ->
 1.4.2

---
 .../skytemple-ssb-debugger/default.nix        | 23 ++++++++++++++-----
 1 file changed, 17 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/python-modules/skytemple-ssb-debugger/default.nix b/pkgs/development/python-modules/skytemple-ssb-debugger/default.nix
index b394dd1662e9..26479aacdad9 100644
--- a/pkgs/development/python-modules/skytemple-ssb-debugger/default.nix
+++ b/pkgs/development/python-modules/skytemple-ssb-debugger/default.nix
@@ -1,20 +1,31 @@
-{ lib, buildPythonPackage, fetchFromGitHub, gobject-introspection, gtk3, gtksourceview3
-, wrapGAppsHook, nest-asyncio, pycairo, py-desmume, pygtkspellcheck, setuptools
-, skytemple-files, skytemple-icons
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, gobject-introspection
+, gtk3
+, gtksourceview4
+, wrapGAppsHook
+, nest-asyncio
+, pycairo
+, py-desmume
+, pygtkspellcheck
+, setuptools
+, skytemple-files
+, skytemple-icons
 }:
 
 buildPythonPackage rec {
   pname = "skytemple-ssb-debugger";
-  version = "1.3.8.post2";
+  version = "1.4.4";
 
   src = fetchFromGitHub {
     owner = "SkyTemple";
     repo = pname;
     rev = version;
-    hash = "sha256-dd0qsSNBwxuSopjz2PLqEFddZpvMgeJIjBXY5P6OAow=";
+    hash = "sha256-/LBz0PCQI3QOAmOZk6Jynqi/+NN0w8gbY/S3YckRZ68=";
   };
 
-  buildInputs = [ gobject-introspection gtk3 gtksourceview3 ];
+  buildInputs = [ gobject-introspection gtk3 gtksourceview4 ];
   nativeBuildInputs = [ gobject-introspection wrapGAppsHook ];
   propagatedBuildInputs = [
     nest-asyncio

From c489175b763859ae44a14be46e564f15560f9cbc Mon Sep 17 00:00:00 2001
From: marius david <marius@mariusdavid.fr>
Date: Mon, 7 Nov 2022 13:39:16 +0100
Subject: [PATCH 07/58] python3Packages.skytemple-rust: 1.3.7 -> 1.4.0.post0

---
 .../python-modules/skytemple-rust/default.nix         | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/python-modules/skytemple-rust/default.nix b/pkgs/development/python-modules/skytemple-rust/default.nix
index 87319d81270b..e894dec0dec0 100644
--- a/pkgs/development/python-modules/skytemple-rust/default.nix
+++ b/pkgs/development/python-modules/skytemple-rust/default.nix
@@ -5,27 +5,30 @@
 , libiconv
 , Foundation
 , rustPlatform
-, setuptools-rust }:
+, setuptools-rust
+, range-typed-integers
+}:
 
 buildPythonPackage rec {
   pname = "skytemple-rust";
-  version = "1.3.7";
+  version = "1.4.0.post0";
 
   src = fetchFromGitHub {
     owner = "SkyTemple";
     repo = pname;
     rev = version;
-    hash = "sha256-rC7KA79va8gZpMKJQ7s3xYdbopNqmWdRYDCbaWaxsR0=";
+    hash = "sha256-aw57B15sDbMcdNPD8MW+O7AdqSSqjlOcuXNSm10GdPM=";
   };
 
   cargoDeps = rustPlatform.fetchCargoTarball {
     inherit src;
     name = "${pname}-${version}";
-    hash = "sha256-lXPCxRbaqUC5EfyeBPtJDuGADYOA+DWMaOZRwXppP8E=";
+    hash = "sha256-SvHrMr5k4afVdU5nvg+bcoHVmzHYyoOYqv7nOSVxRCE=";
   };
 
   buildInputs = lib.optionals stdenv.isDarwin [ libiconv Foundation ];
   nativeBuildInputs = [ setuptools-rust ] ++ (with rustPlatform; [ cargoSetupHook rust.cargo rust.rustc ]);
+  propagatedBuildInputs = [ range-typed-integers ];
 
   GETTEXT_SYSTEM = true;
 

From 286a5af4598b0f2c389bacdb1518c266603d9a68 Mon Sep 17 00:00:00 2001
From: marius david <marius@mariusdavid.fr>
Date: Mon, 7 Nov 2022 13:39:32 +0100
Subject: [PATCH 08/58] python3Packages.skytemple-files: 1.3.9 -> 1.4.7

---
 .../skytemple-files/default.nix               | 64 +++++++++++++++++--
 1 file changed, 58 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/python-modules/skytemple-files/default.nix b/pkgs/development/python-modules/skytemple-files/default.nix
index 226cc5295e7f..b850f694dcf8 100644
--- a/pkgs/development/python-modules/skytemple-files/default.nix
+++ b/pkgs/development/python-modules/skytemple-files/default.nix
@@ -1,16 +1,40 @@
-{ stdenv, lib, buildPythonPackage, fetchFromGitHub, appdirs, dungeon-eos, explorerscript
-, ndspy, pillow, setuptools, skytemple-rust, tilequant, armips
+{ stdenv
+, lib
+, buildPythonPackage
+, fetchFromGitHub
+, appdirs
+, dungeon-eos
+, explorerscript
+, ndspy
+, pillow
+, setuptools
+, skytemple-rust
+, tilequant
+, pyyaml
+, pmdsky-debug-py
+, typing-extensions
+, pythonOlder
+, # optional dependancies for SpriteCollab
+  aiohttp
+, lru-dict
+, graphql-core
+, gql
+, armips
+# tests
+, pytestCheckHook
+, parameterized
+, xmldiff
 }:
 
 buildPythonPackage rec {
   pname = "skytemple-files";
-  version = "1.3.9";
+  version = "1.4.7";
 
   src = fetchFromGitHub {
     owner = "SkyTemple";
     repo = pname;
     rev = version;
-    hash = "sha256-Z/jbr9o0WKPjkAsfZzxuwAKKdwYV3rLGkUMlMgyC5s0=";
+    hash = "sha256-SLRZ9ThrH2UWqfr5BbjJKDM/SRkCfMNK70XZT4+Ks7w=";
     fetchSubmodules = true;
   };
 
@@ -21,9 +45,37 @@ buildPythonPackage rec {
 
   buildInputs = [ armips ];
 
-  propagatedBuildInputs = [ appdirs dungeon-eos explorerscript ndspy pillow setuptools skytemple-rust tilequant ];
+  propagatedBuildInputs = [
+    appdirs
+    dungeon-eos
+    explorerscript
+    ndspy
+    pillow
+    setuptools
+    skytemple-rust
+    tilequant
+    pyyaml
+    pmdsky-debug-py
+  ] ++ lib.optionals (pythonOlder "3.9") [
+    typing-extensions
+  ];
+
+  passthru.optional-dependencies = {
+    spritecollab = [
+      aiohttp
+      gql
+      graphql-core
+      lru-dict
+    ] ++ gql.optional-dependencies.aiohttp;
+  };
+
+  checkInputs = [ pytestCheckHook parameterized xmldiff ] ++ passthru.optional-dependencies.spritecollab;
+  pytestFlagsArray = "test/";
+  disabledTestPaths = [
+    "test/skytemple_files_test/common/spritecollab/sc_online_test.py"
+    "test/skytemple_files_test/compression_container/atupx/atupx_test.py" # Particularly long test
+  ];
 
-  doCheck = false; # requires Pokémon Mystery Dungeon ROM
   pythonImportsCheck = [ "skytemple_files" ];
 
   meta = with lib; {

From 6428e9be30f75094cabf50d88e665a691db63230 Mon Sep 17 00:00:00 2001
From: marius david <marius@mariusdavid.fr>
Date: Mon, 24 Apr 2023 22:40:43 +0200
Subject: [PATCH 09/58] python3Packages.explorerscript: 0.1.1 -> 0.1.2

---
 .../python-modules/explorerscript/default.nix       | 13 ++-----------
 1 file changed, 2 insertions(+), 11 deletions(-)

diff --git a/pkgs/development/python-modules/explorerscript/default.nix b/pkgs/development/python-modules/explorerscript/default.nix
index cd31e6ff0101..b3ecf7a3fce2 100644
--- a/pkgs/development/python-modules/explorerscript/default.nix
+++ b/pkgs/development/python-modules/explorerscript/default.nix
@@ -1,7 +1,6 @@
 { lib
 , buildPythonPackage
 , fetchFromGitHub
-, fetchpatch
 , antlr4
 , antlr4-python3-runtime
 , igraph
@@ -11,27 +10,19 @@
 
 buildPythonPackage rec {
   pname = "explorerscript";
-  version = "0.1.1";
+  version = "0.1.2";
 
   src = fetchFromGitHub {
     owner = "SkyTemple";
     repo = pname;
     rev = version;
-    sha256 = "1vzyliiyrxx8l9sfbqcyr4xn5swd7znkxy69kn0vb5rban8hm9c1";
+    sha256 = "sha256-REQYyxB2sb/gG54+OkMw+M4Agg9SWfAyqAhiSNnd3tE=";
   };
 
   nativeBuildInputs = [
     antlr4
   ];
 
-  patches = [
-    # https://github.com/SkyTemple/ExplorerScript/pull/17
-    (fetchpatch {
-      url = "https://github.com/SkyTemple/ExplorerScript/commit/47d8b3d246881d675a82b4049b87ed7d9a0e1b15.patch";
-      sha256 = "0sadw9l2nypl2s8lw526lvbdj4rzqdvrjncx4zxxgyp3x47csb48";
-    })
-  ];
-
   postPatch = ''
     sed -i "s/antlr4-python3-runtime.*/antlr4-python3-runtime',/" setup.py
     antlr -Dlanguage=Python3 -visitor explorerscript/antlr/{ExplorerScript,SsbScript}.g4

From e9efa398cf97b9044415c9b2547995fc0daa96c1 Mon Sep 17 00:00:00 2001
From: marius david <marius@mariusdavid.fr>
Date: Mon, 7 Nov 2022 13:40:18 +0100
Subject: [PATCH 10/58] skytemple: 1.3.11.post1 -> 1.4.7

---
 pkgs/applications/misc/skytemple/default.nix | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/misc/skytemple/default.nix b/pkgs/applications/misc/skytemple/default.nix
index 3eacada55b22..c1a77d634d35 100644
--- a/pkgs/applications/misc/skytemple/default.nix
+++ b/pkgs/applications/misc/skytemple/default.nix
@@ -2,7 +2,7 @@
 , fetchFromGitHub
 , gobject-introspection
 , gtk3
-, gtksourceview3
+, gtksourceview4
 , webkitgtk
 , wrapGAppsHook
 , python3Packages
@@ -10,19 +10,19 @@
 
 python3Packages.buildPythonApplication rec {
   pname = "skytemple";
-  version = "1.3.11.post1";
+  version = "1.4.7";
 
   src = fetchFromGitHub {
     owner = "SkyTemple";
     repo = pname;
     rev = "refs/tags/${version}";
-    hash = "sha256-H3apAb5viupj7cNsiHsTMDBAhK5sUzpV4aOn5KVu6mI=";
+    hash = "sha256-NK0yLxs7/pVpl9LCz6ggYsaUDuEAj6edBEPC+4yCxNM=";
   };
 
   buildInputs = [
     gobject-introspection
     gtk3
-    gtksourceview3
+    gtksourceview4
     # webkitgkt is used for rendering interactive statistics graph which
     # can be seen by opening a ROM, entering Pokemon section, selecting
     # any Pokemon, and clicking Stats and Moves tab.
@@ -52,7 +52,7 @@ python3Packages.buildPythonApplication rec {
     skytemple-icons
     skytemple-ssb-debugger
     tilequant
-  ];
+  ] ++ skytemple-files.optional-dependencies.spritecollab;
 
   doCheck = false; # there are no tests
 

From e4299be27f615d9917d726d616d62b023e65e6a6 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Thu, 27 Apr 2023 18:35:22 +0200
Subject: [PATCH 11/58] python310Packages.sectools: init at 1.3.9

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

diff --git a/pkgs/development/python-modules/sectools/default.nix b/pkgs/development/python-modules/sectools/default.nix
new file mode 100644
index 000000000000..2fdc27283f08
--- /dev/null
+++ b/pkgs/development/python-modules/sectools/default.nix
@@ -0,0 +1,40 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, ldap3
+, pythonOlder
+}:
+
+buildPythonPackage rec {
+  pname = "sectools";
+  version = "1.3.9";
+  format = "setuptools";
+
+  disabled = pythonOlder "3.7";
+
+  src = fetchFromGitHub {
+    owner = "p0dalirius";
+    repo = pname;
+    rev = "refs/tags/${version}";
+    hash = "sha256-F9mmPSlfSSS7UDNuX9OPrqDsEpqq0bD3eROG8D9CC78=";
+  };
+
+  propagatedBuildInputs = [
+    ldap3
+  ];
+
+  # Module has no tests
+  doCheck = false;
+
+  pythonImportsCheck = [
+    "sectools"
+  ];
+
+  meta = with lib; {
+    description = "library containing functions to write security tools";
+    homepage = "https://github.com/p0dalirius/sectools";
+    changelog = "https://github.com/p0dalirius/sectools/releases/tag/${version}";
+    license = with licenses; [ gpl3Only ];
+    maintainers = with maintainers; [ fab ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 3911f78be3f3..34ad6f8f2a0b 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -10655,6 +10655,8 @@ self: super: with self; {
 
   securetar = callPackage ../development/python-modules/securetar { };
 
+  sectools = callPackage ../development/python-modules/sectools { };
+
   seedir = callPackage ../development/python-modules/seedir { };
 
   seekpath = callPackage ../development/python-modules/seekpath { };

From b57cc76031c278380c1aff8357e6e054483e1299 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Thu, 27 Apr 2023 18:51:47 +0200
Subject: [PATCH 12/58] apachetomcatscanner: init at 3.5

---
 .../security/apachetomcatscanner/default.nix  | 38 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 +
 2 files changed, 40 insertions(+)
 create mode 100644 pkgs/tools/security/apachetomcatscanner/default.nix

diff --git a/pkgs/tools/security/apachetomcatscanner/default.nix b/pkgs/tools/security/apachetomcatscanner/default.nix
new file mode 100644
index 000000000000..13a11808b7dd
--- /dev/null
+++ b/pkgs/tools/security/apachetomcatscanner/default.nix
@@ -0,0 +1,38 @@
+{ lib
+, python3
+, fetchFromGitHub
+}:
+
+python3.pkgs.buildPythonApplication rec {
+  pname = "apachetomcatscanner";
+  version = "3.5";
+  format = "setuptools";
+
+  src = fetchFromGitHub {
+    owner = "p0dalirius";
+    repo = "ApacheTomcatScanner";
+    rev = "refs/tags/${version}";
+    hash = "sha256-ChVVXUjm6y71iRs64Kv63oiOG1GSqmx6J0YiGtEI0ao=";
+  };
+
+  propagatedBuildInputs = with python3.pkgs; [
+    requests
+    sectools
+    xlsxwriter
+  ];
+
+  # Project has no test
+  doCheck = false;
+
+  pythonImportsCheck = [
+    "apachetomcatscanner"
+  ];
+
+  meta = with lib; {
+    description = "Tool to scan for Apache Tomcat server vulnerabilities";
+    homepage = "https://github.com/p0dalirius/ApacheTomcatScanner";
+    changelog = "https://github.com/p0dalirius/ApacheTomcatScanner/releases/tag/${version}";
+    license = with licenses; [ gpl2Only ];
+    maintainers = with maintainers; [ fab ];
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 96a42f49ceed..c40daf07c24c 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1400,6 +1400,8 @@ with pkgs;
 
   apache-airflow = with python3.pkgs; toPythonApplication apache-airflow;
 
+  apachetomcatscanner = callPackage ../tools/security/apachetomcatscanner { };
+
   airsonic = callPackage ../servers/misc/airsonic { };
 
   airspy = callPackage ../applications/radio/airspy { };

From 655b114f3d295082b421c769cc87dcd6410930e8 Mon Sep 17 00:00:00 2001
From: ajs124 <git@ajs124.de>
Date: Thu, 27 Apr 2023 21:56:06 +0200
Subject: [PATCH 13/58] grafana-loki: 2.8.0 -> 2.8.1

https://github.com/grafana/loki/releases/tag/v2.8.1
---
 pkgs/servers/monitoring/loki/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/monitoring/loki/default.nix b/pkgs/servers/monitoring/loki/default.nix
index e02f94d93dec..67dbeeeaef6a 100644
--- a/pkgs/servers/monitoring/loki/default.nix
+++ b/pkgs/servers/monitoring/loki/default.nix
@@ -8,14 +8,14 @@
 }:
 
 buildGoModule rec {
-  version = "2.8.0";
+  version = "2.8.1";
   pname = "grafana-loki";
 
   src = fetchFromGitHub {
     owner = "grafana";
     repo = "loki";
     rev = "v${version}";
-    hash = "sha256-RPa3G1zrWzunyQOdNUQ/dZGJ/7sh2OGvoEqeYaT7Qv0=";
+    hash = "sha256-kMVbswnq8hnPv/QmvPXmOL4QOTHyuKvgQ6+CNX0DunQ=";
   };
 
   vendorHash = null;

From c4624facaac04500f0fb61992bdf22298e0386b0 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 28 Apr 2023 04:46:58 +0000
Subject: [PATCH 14/58] rssguard: 4.3.3 -> 4.3.4

---
 pkgs/applications/networking/feedreaders/rssguard/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/feedreaders/rssguard/default.nix b/pkgs/applications/networking/feedreaders/rssguard/default.nix
index eb306ff2c99e..72e3c0e6d8d1 100644
--- a/pkgs/applications/networking/feedreaders/rssguard/default.nix
+++ b/pkgs/applications/networking/feedreaders/rssguard/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "rssguard";
-  version = "4.3.3";
+  version = "4.3.4";
 
   src = fetchFromGitHub {
     owner = "martinrotter";
     repo = pname;
     rev = version;
-    sha256 = "sha256-dSnPQbCPXREMOeqyn17BEi29soeVfrThnDBqdti5BiA=";
+    sha256 = "sha256-1xoMymsx5Z8oZzZtPzLWaOs0zy/E0pIsLpHgZlVdgSw=";
   };
 
   buildInputs =  [ qtwebengine qttools ];

From 97db4671b060f50e9ebc7bae3e93b9ab81eda828 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 28 Apr 2023 04:47:36 +0000
Subject: [PATCH 15/58] temporal: 1.20.0 -> 1.20.2

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

diff --git a/pkgs/applications/networking/cluster/temporal/default.nix b/pkgs/applications/networking/cluster/temporal/default.nix
index f7b4a32a388a..10cfbbe99def 100644
--- a/pkgs/applications/networking/cluster/temporal/default.nix
+++ b/pkgs/applications/networking/cluster/temporal/default.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "temporal";
-  version = "1.20.0";
+  version = "1.20.2";
 
   src = fetchFromGitHub {
     owner = "temporalio";
     repo = "temporal";
     rev = "v${version}";
-    hash = "sha256-YZzGAOPCljTMmyt1t0gjbgn+IelntCo/275+SjOJiJE=";
+    hash = "sha256-2xer6W8pSZttjn5m5GgTOpHyXx2rE4qRZsBZzxwWh4o=";
   };
 
-  vendorHash = "sha256-UMqkgQsnOxFcXgbm+oi3JGjqmbwaKEh6s5bzivGVAM8=";
+  vendorHash = "sha256-Fo/xePou96KdFlUNIqhDZX4TJoYXqlMyuLDvmR/XreY=";
 
   excludedPackages = [ "./build" ];
 

From 56724e7f0f92d081ea7df2bd314fe35be835d83e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 28 Apr 2023 05:15:41 +0000
Subject: [PATCH 16/58] prometheus-zfs-exporter: 2.2.7 -> 2.2.8

---
 pkgs/servers/monitoring/prometheus/zfs-exporter.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/monitoring/prometheus/zfs-exporter.nix b/pkgs/servers/monitoring/prometheus/zfs-exporter.nix
index 488d3e22e654..9112a1c51c53 100644
--- a/pkgs/servers/monitoring/prometheus/zfs-exporter.nix
+++ b/pkgs/servers/monitoring/prometheus/zfs-exporter.nix
@@ -5,16 +5,16 @@
 
 buildGoModule rec {
   pname = "zfs_exporter";
-  version = "2.2.7";
+  version = "2.2.8";
 
   src = fetchFromGitHub {
     owner = "pdf";
     repo = pname;
     rev = "v" + version;
-    hash = "sha256-bc9bmGrRGhm58JzrVLLJBUc1zaGXqz2fqx+ZphidFbc=";
+    hash = "sha256-NTlYMznUfDfLftvuR5YWOW4Zu0rWfLkKPHPTrD/62+Q=";
   };
 
-  vendorHash = "sha256-jQiw3HlqWcsjdadDdovCsDMBB3rnWtacfbtzDb5rc9c=";
+  vendorHash = "sha256-ZJRxH9RhNSnVmcsonaakbvvjQ+3ovnyMny1Pe/vyQxE=";
 
   postInstall = ''
     install -Dm444 -t $out/share/doc/${pname} *.md

From 652d267da649cfb466ddcbc2a56651b009cb3a24 Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Fri, 28 Apr 2023 08:32:48 +0300
Subject: [PATCH 17/58] vim-full: fix build on darwin

---
 pkgs/applications/editors/vim/configurable.nix | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pkgs/applications/editors/vim/configurable.nix b/pkgs/applications/editors/vim/configurable.nix
index ad64772de554..8b49850d6003 100644
--- a/pkgs/applications/editors/vim/configurable.nix
+++ b/pkgs/applications/editors/vim/configurable.nix
@@ -160,6 +160,9 @@ in stdenv.mkDerivation rec {
     ++ lib.optional tclSupport tcl
     ++ lib.optional rubySupport ruby;
 
+  # error: '__declspec' attributes are not enabled; use '-fdeclspec' or '-fms-extensions' to enable support for __declspec attributes
+  env.NIX_CFLAGS_COMPILE = lib.optionalString stdenv.isDarwin "-fdeclspec";
+
   preConfigure = "" + lib.optionalString ftNixSupport ''
       cp ${vimPlugins.vim-nix.src}/ftplugin/nix.vim runtime/ftplugin/nix.vim
       cp ${vimPlugins.vim-nix.src}/indent/nix.vim runtime/indent/nix.vim

From 8a6d7b7ed8637e71b60cf549332781eaad5ca13b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 28 Apr 2023 05:49:35 +0000
Subject: [PATCH 18/58] mysql_jdbc: 8.0.31 -> 8.0.33

---
 pkgs/servers/sql/mysql/jdbc/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/servers/sql/mysql/jdbc/default.nix b/pkgs/servers/sql/mysql/jdbc/default.nix
index a9f7bb8a51c3..e1082480efb6 100644
--- a/pkgs/servers/sql/mysql/jdbc/default.nix
+++ b/pkgs/servers/sql/mysql/jdbc/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "mysql-connector-java";
-  version = "8.0.31";
+  version = "8.0.33";
 
   src = fetchurl {
     url = "https://dev.mysql.com/get/Downloads/Connector-J/mysql-connector-j-${version}.zip";
-    sha256 = "sha256-Wo86n/4mono7YAagI/5Efm/X+2jjpOPaFSCMNAB6btI=";
+    sha256 = "sha256-k3jft7sM2xrc88mdhltxtm+SZcRAn6B4EvglMyJyX4Y=";
   };
 
   installPhase = ''

From 29fe601881270d4e40a6108139dd63cec3961629 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 28 Apr 2023 06:32:07 +0000
Subject: [PATCH 19/58] klayout: 0.28.6 -> 0.28.7

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

diff --git a/pkgs/applications/misc/klayout/default.nix b/pkgs/applications/misc/klayout/default.nix
index bb7d41057800..3a35a36394e8 100644
--- a/pkgs/applications/misc/klayout/default.nix
+++ b/pkgs/applications/misc/klayout/default.nix
@@ -5,13 +5,13 @@
 
 mkDerivation rec {
   pname = "klayout";
-  version = "0.28.6";
+  version = "0.28.7";
 
   src = fetchFromGitHub {
     owner = "KLayout";
     repo = "klayout";
     rev = "v${version}";
-    hash = "sha256-Errpn2GHxVncum+6zriM9OrhrCDK8EtD2ZYVYPoyabk=";
+    hash = "sha256-CA6PNoQtg59Mo7dKIgSVeC4owVuAirJ3mFds1J9IQtI=";
   };
 
   postPatch = ''

From 88823ab66a3998152619a0c43ad80dfdcce197b0 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 28 Apr 2023 09:15:23 +0200
Subject: [PATCH 20/58] python310Packages.censys: 2.1.9 -> 2.2.0

Diff: https://github.com/censys/censys-python/compare/refs/tags/v2.1.9...v2.2.0
---
 pkgs/development/python-modules/censys/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/censys/default.nix b/pkgs/development/python-modules/censys/default.nix
index 63787b87f184..014776d30ca5 100644
--- a/pkgs/development/python-modules/censys/default.nix
+++ b/pkgs/development/python-modules/censys/default.nix
@@ -17,7 +17,7 @@
 
 buildPythonPackage rec {
   pname = "censys";
-  version = "2.1.9";
+  version = "2.2.0";
   format = "pyproject";
 
   disabled = pythonOlder "3.7";
@@ -26,7 +26,7 @@ buildPythonPackage rec {
     owner = "censys";
     repo = "censys-python";
     rev = "refs/tags/v${version}";
-    hash = "sha256-BB/pLpPK2qh5902bZp9QM3Wiu/l48pzq7HcjaAtM4D0=";
+    hash = "sha256-CtW6EN9oH/OIZ4XaoSuKlMYK9Mh/ewRs6y34xbfY234=";
   };
 
   nativeBuildInputs = [

From 3b5d030707b082eab5b0614ab6764b6366114e4b Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 28 Apr 2023 09:18:59 +0200
Subject: [PATCH 21/58] python310Packages.can: 4.1.0 -> 4.2.0

Diff: https://github.com/hardbyte/python-can/compare/refs/tags/v4.1.0...v4.2.0

Changelog: https://github.com/hardbyte/python-can/releases/tag/v4.2.0
---
 pkgs/development/python-modules/can/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/can/default.nix b/pkgs/development/python-modules/can/default.nix
index d8937082cb69..0d449743b2f8 100644
--- a/pkgs/development/python-modules/can/default.nix
+++ b/pkgs/development/python-modules/can/default.nix
@@ -19,7 +19,7 @@
 
 buildPythonPackage rec {
   pname = "can";
-  version = "4.1.0";
+  version = "4.2.0";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
@@ -28,7 +28,7 @@ buildPythonPackage rec {
     owner = "hardbyte";
     repo = "python-can";
     rev = "refs/tags/v${version}";
-    hash = "sha256-jNy47SapujTF3ReJtIbwUY53IftIH4cXZjkzHrnZMFQ=";
+    hash = "sha256-KY+WViWcKbrO6SO6cIo5dWylyBDEdmAR6wYwJogeCjs=";
   };
 
   postPatch = ''

From 6eeb951035db67602bf0c29aa8b1226e92a3344e Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 28 Apr 2023 09:26:26 +0200
Subject: [PATCH 22/58] qovery-cli: 0.58.7 -> 0.58.8

Diff: https://github.com/Qovery/qovery-cli/compare/v0.58.7...v0.58.8

Changelog: https://github.com/Qovery/qovery-cli/releases/tag/v0.58.8
---
 pkgs/tools/admin/qovery-cli/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/tools/admin/qovery-cli/default.nix b/pkgs/tools/admin/qovery-cli/default.nix
index 61e0d64fdc13..2ef824f21f52 100644
--- a/pkgs/tools/admin/qovery-cli/default.nix
+++ b/pkgs/tools/admin/qovery-cli/default.nix
@@ -8,16 +8,16 @@
 
 buildGoModule rec {
   pname = "qovery-cli";
-  version = "0.58.7";
+  version = "0.58.8";
 
   src = fetchFromGitHub {
     owner = "Qovery";
     repo = pname;
     rev = "v${version}";
-    hash = "sha256-96tbVlFvKe8ExgOhTeiDiq51NHTrh1BzBVp6omcydXg=";
+    hash = "sha256-MwBj1rrj23SBOKDV60EI/WqXy+zqT+43IWnjFdrDT+Q=";
   };
 
-  vendorHash = "sha256-w40zewXGB76kMgP0GzUtyncBBnCDgxcGJ7EO107WWN0=";
+  vendorHash = "sha256-WeHcB1yETbnTVxtccPf3q0JNwLDbTJyKKme02Xnfy60=";
 
   nativeBuildInputs = [ installShellFiles ];
 

From bc577a24858ca0777d6ba28ed1a63c6ef760c187 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 28 Apr 2023 10:00:54 +0200
Subject: [PATCH 23/58] python310Packages.authheaders: 0.15.1 -> 0.15.2

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

diff --git a/pkgs/development/python-modules/authheaders/default.nix b/pkgs/development/python-modules/authheaders/default.nix
index 96a035f4a582..04b8f2fcb652 100644
--- a/pkgs/development/python-modules/authheaders/default.nix
+++ b/pkgs/development/python-modules/authheaders/default.nix
@@ -4,11 +4,11 @@
 
 buildPythonPackage rec {
   pname = "authheaders";
-  version = "0.15.1";
+  version = "0.15.2";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-90rOvu+CbHtammrMDZpPx7rIboIT2X/jL1GtfjpmuOk=";
+    hash = "sha256-kAzuiKYeZH74Tr38vO4BVDIHRNjsHX1ukmhC9EcoO98=";
   };
 
   propagatedBuildInputs = [ authres dnspython dkimpy publicsuffix2 ];

From 745fd3cac161c1c342329d4cf87cd6bbdaefd764 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 28 Apr 2023 10:03:39 +0200
Subject: [PATCH 24/58] python310Packages.authheaders: add changelog to meta

---
 pkgs/development/python-modules/authheaders/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/python-modules/authheaders/default.nix b/pkgs/development/python-modules/authheaders/default.nix
index 04b8f2fcb652..8d10a9891292 100644
--- a/pkgs/development/python-modules/authheaders/default.nix
+++ b/pkgs/development/python-modules/authheaders/default.nix
@@ -16,6 +16,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Python library for the generation of email authentication headers";
     homepage = "https://github.com/ValiMail/authentication-headers";
+    changelog = "https://github.com/ValiMail/authentication-headers/blob${version}/CHANGES";
     license = licenses.mit;
     maintainers = with maintainers; [ ];
   };

From b86d49493065eb0ee9527d0139f929fe28034311 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 28 Apr 2023 10:08:07 +0200
Subject: [PATCH 25/58] python310Packages.authheaders: add format

- disable on unsupported Python releases
---
 .../python-modules/authheaders/default.nix    | 20 ++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/authheaders/default.nix b/pkgs/development/python-modules/authheaders/default.nix
index 8d10a9891292..b70078d41678 100644
--- a/pkgs/development/python-modules/authheaders/default.nix
+++ b/pkgs/development/python-modules/authheaders/default.nix
@@ -1,17 +1,31 @@
-{ buildPythonPackage, fetchPypi, lib
-, authres, dnspython, dkimpy, publicsuffix2
+{ lib
+, buildPythonPackage
+, fetchPypi
+, authres
+, dnspython
+, dkimpy
+, publicsuffix2
+, pythonOlder
 }:
 
 buildPythonPackage rec {
   pname = "authheaders";
   version = "0.15.2";
+  format = "setuptools";
+
+  disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
     hash = "sha256-kAzuiKYeZH74Tr38vO4BVDIHRNjsHX1ukmhC9EcoO98=";
   };
 
-  propagatedBuildInputs = [ authres dnspython dkimpy publicsuffix2 ];
+  propagatedBuildInputs = [
+    authres
+    dnspython
+    dkimpy
+    publicsuffix2
+  ];
 
   meta = with lib; {
     description = "Python library for the generation of email authentication headers";

From 2884a9a8a899ff8c1d88ce83596fa32020249ccb Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 28 Apr 2023 10:09:26 +0200
Subject: [PATCH 26/58] python310Packages.authheaders: add pythonImportsCheck

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

diff --git a/pkgs/development/python-modules/authheaders/default.nix b/pkgs/development/python-modules/authheaders/default.nix
index b70078d41678..43d043cf26ce 100644
--- a/pkgs/development/python-modules/authheaders/default.nix
+++ b/pkgs/development/python-modules/authheaders/default.nix
@@ -27,6 +27,10 @@ buildPythonPackage rec {
     publicsuffix2
   ];
 
+  pythonImportsCheck = [
+    "authheaders"
+  ];
+
   meta = with lib; {
     description = "Python library for the generation of email authentication headers";
     homepage = "https://github.com/ValiMail/authentication-headers";

From e5d668a1f8f89b9c854c49a1840f93e155e4e9a4 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 28 Apr 2023 10:15:17 +0200
Subject: [PATCH 27/58] python310Packages.authheaders: enable tests

---
 .../python-modules/authheaders/default.nix    | 19 +++++++++++++------
 1 file changed, 13 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/python-modules/authheaders/default.nix b/pkgs/development/python-modules/authheaders/default.nix
index 43d043cf26ce..37e81f714290 100644
--- a/pkgs/development/python-modules/authheaders/default.nix
+++ b/pkgs/development/python-modules/authheaders/default.nix
@@ -1,11 +1,12 @@
 { lib
-, buildPythonPackage
-, fetchPypi
 , authres
-, dnspython
+, buildPythonPackage
 , dkimpy
+, dnspython
+, fetchFromGitHub
 , publicsuffix2
 , pythonOlder
+, pytestCheckHook
 }:
 
 buildPythonPackage rec {
@@ -15,9 +16,11 @@ buildPythonPackage rec {
 
   disabled = pythonOlder "3.7";
 
-  src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-kAzuiKYeZH74Tr38vO4BVDIHRNjsHX1ukmhC9EcoO98=";
+  src = fetchFromGitHub {
+    owner = "ValiMail";
+    repo = "authentication-headers";
+    rev = "refs/tags/${version}";
+    hash = "sha256-vtLt7JUdLF0gBWgMzP65UAR6A9BnTech5n0alFErcSQ=";
   };
 
   propagatedBuildInputs = [
@@ -27,6 +30,10 @@ buildPythonPackage rec {
     publicsuffix2
   ];
 
+  nativeCheckInputs = [
+    pytestCheckHook
+  ];
+
   pythonImportsCheck = [
     "authheaders"
   ];

From b238b43e42be0f51da1e19ddbaf38b052e04dac0 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 28 Apr 2023 10:17:41 +0200
Subject: [PATCH 28/58] python310Packages.asyncsleepiq: 1.2.3 -> 1.3.4

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

diff --git a/pkgs/development/python-modules/asyncsleepiq/default.nix b/pkgs/development/python-modules/asyncsleepiq/default.nix
index 1266019371b7..09901a10b5b6 100644
--- a/pkgs/development/python-modules/asyncsleepiq/default.nix
+++ b/pkgs/development/python-modules/asyncsleepiq/default.nix
@@ -7,14 +7,14 @@
 
 buildPythonPackage rec {
   pname = "asyncsleepiq";
-  version = "1.2.3";
+  version = "1.3.4";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-X+bJyzQxWJaS1/KNOE/3zQKSbwUpm9XN35HYf6s+BPs=";
+    hash = "sha256-eW6iSGuaZ/cQZKN55b6tHsBPdYglxGYt7OoxV7czB8w=";
   };
 
   propagatedBuildInputs = [

From 45eb1b8c6209f8193fbc445b9c33ee7d9eb47fb2 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 28 Apr 2023 10:19:17 +0200
Subject: [PATCH 29/58] python310Packages.asyncsleepiq: add changelog to meta

---
 pkgs/development/python-modules/asyncsleepiq/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/python-modules/asyncsleepiq/default.nix b/pkgs/development/python-modules/asyncsleepiq/default.nix
index 09901a10b5b6..ebd6c48ef2e5 100644
--- a/pkgs/development/python-modules/asyncsleepiq/default.nix
+++ b/pkgs/development/python-modules/asyncsleepiq/default.nix
@@ -31,6 +31,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Async interface to SleepIQ API";
     homepage = "https://github.com/kbickar/asyncsleepiq";
+    changelog = "https://github.com/kbickar/asyncsleepiq/releases/tag/v${version}";
     license = licenses.mit;
     maintainers = with maintainers; [ dotlambda ];
   };

From 60a6ce7a501b81fe22bd63fe133db2a6f6bd2324 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 28 Apr 2023 10:24:57 +0200
Subject: [PATCH 30/58] python310Packages.bashlex: 0.16 -> 0.18

Diff: https://github.com/idank/bashlex/compare/0.16...0.18
---
 pkgs/development/python-modules/bashlex/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/bashlex/default.nix b/pkgs/development/python-modules/bashlex/default.nix
index e1d635c18b69..7f97f5d933cb 100644
--- a/pkgs/development/python-modules/bashlex/default.nix
+++ b/pkgs/development/python-modules/bashlex/default.nix
@@ -7,7 +7,7 @@
 
 buildPythonPackage rec {
   pname = "bashlex";
-  version = "0.16";
+  version = "0.18";
 
   format = "setuptools";
 
@@ -15,7 +15,7 @@ buildPythonPackage rec {
     owner = "idank";
     repo = pname;
     rev = version;
-    hash = "sha256-vpcru/ax872WK3XuRQWTmTD9zRdObn2Bit6kY9ZIQaI=";
+    hash = "sha256-ddZN91H95RiTLXx4lpES1Dmz7nNsSVUeuFuOEpJ7LQI=";
   };
 
   # workaround https://github.com/idank/bashlex/issues/51

From fdfea5fba41226b83c144bed0d84cd97cde10d88 Mon Sep 17 00:00:00 2001
From: Florian Klink <flokli@flokli.de>
Date: Fri, 28 Apr 2023 11:27:22 +0300
Subject: [PATCH 31/58] gnomeExtensions.pop-shell: unstable-2023-04-05 ->
 unstable-2023-04-27

This contains https://github.com/pop-os/shell/pull/1618, which should
fix grab handling behaviour in GNOME/Mutter 44.
---
 pkgs/desktops/gnome/extensions/pop-shell/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/desktops/gnome/extensions/pop-shell/default.nix b/pkgs/desktops/gnome/extensions/pop-shell/default.nix
index fbe88e96b873..8d8966357092 100644
--- a/pkgs/desktops/gnome/extensions/pop-shell/default.nix
+++ b/pkgs/desktops/gnome/extensions/pop-shell/default.nix
@@ -2,13 +2,13 @@
 
 stdenv.mkDerivation rec {
   pname = "gnome-shell-extension-pop-shell";
-  version = "unstable-2023-04-05";
+  version = "unstable-2023-04-27";
 
   src = fetchFromGitHub {
     owner = "pop-os";
     repo = "shell";
-    rev = "a3a1b7bb832838fec2ea875954d33443fc680912";
-    hash = "sha256-B82UKtJRDDejBX1UBBIjPRO8rzHNapJRi8wv6dT7oJ8=";
+    rev = "b5acccefcaa653791d25f70a22c0e04f1858d96e";
+    hash = "sha256-w6EBHKWJ4L3ZRVmFqZhCqHGumbElQXk9udYSnwjIl6c=";
   };
 
   nativeBuildInputs = [ glib nodePackages.typescript gjs ];

From 452166c9c06bcb9bd5451157a16c328d9ca688c9 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 28 Apr 2023 10:29:06 +0200
Subject: [PATCH 32/58] python310Packages.bellows: 0.35.1 -> 0.35.2

Diff: https://github.com/zigpy/bellows/compare/refs/tags/0.35.1...0.35.2

Changelog: https://github.com/zigpy/bellows/releases/tag/0.35.2
---
 pkgs/development/python-modules/bellows/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/bellows/default.nix b/pkgs/development/python-modules/bellows/default.nix
index dd7a274735f4..00cc61a3092e 100644
--- a/pkgs/development/python-modules/bellows/default.nix
+++ b/pkgs/development/python-modules/bellows/default.nix
@@ -15,7 +15,7 @@
 
 buildPythonPackage rec {
   pname = "bellows";
-  version = "0.35.1";
+  version = "0.35.2";
   format = "setuptools";
 
   disabled = pythonOlder "3.8";
@@ -24,7 +24,7 @@ buildPythonPackage rec {
     owner = "zigpy";
     repo = "bellows";
     rev = "refs/tags/${version}";
-    hash = "sha256-o2806cXjtt+yMeSdpEq4KOlIlDsvf7qCUO2TBzkt5uY=";
+    hash = "sha256-I9PXFdRXHQ7OnzCdB631nlfnkpConl+j5Z3iiH7RcA4=";
   };
 
   propagatedBuildInputs = [

From 9e7819884b50535f2bbbf4f93ab1727ee2a4c27e Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 28 Apr 2023 10:40:26 +0200
Subject: [PATCH 33/58] python310Packages.bumps: 0.9.0 -> 0.9.1

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

diff --git a/pkgs/development/python-modules/bumps/default.nix b/pkgs/development/python-modules/bumps/default.nix
index d1926c9631aa..6d92958ef469 100644
--- a/pkgs/development/python-modules/bumps/default.nix
+++ b/pkgs/development/python-modules/bumps/default.nix
@@ -7,14 +7,14 @@
 
 buildPythonPackage rec {
   pname = "bumps";
-  version = "0.9.0";
+  version = "0.9.1";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-BY9kg0ksKfrpQgsl1aDDJJ+zKJmURqwTtKxlITxse+o=";
+    hash = "sha256-J8NeV9FCUC5dLkosBzVrovxiJJbeuj8Xc50NGEI9Bms=";
   };
 
   propagatedBuildInputs = [

From 74631a6abede04c119bbcfd3844eecacaaf2677e Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 28 Apr 2023 10:42:18 +0200
Subject: [PATCH 34/58] python310Packages.bumps: add changelog to meta

---
 pkgs/development/python-modules/bumps/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/python-modules/bumps/default.nix b/pkgs/development/python-modules/bumps/default.nix
index 6d92958ef469..71d535141f0a 100644
--- a/pkgs/development/python-modules/bumps/default.nix
+++ b/pkgs/development/python-modules/bumps/default.nix
@@ -31,6 +31,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Data fitting with bayesian uncertainty analysis";
     homepage = "https://bumps.readthedocs.io/";
+    changelog = "https://github.com/bumps/bumps/releases/tag/v${version}";
     license = licenses.publicDomain;
     maintainers = with maintainers; [ rprospero ];
   };

From 0e95899ab52ad9e33097f6743df21fa804ea3459 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 28 Apr 2023 10:50:18 +0200
Subject: [PATCH 35/58] python310Packages.hahomematic: 2023.4.2 -> 2023.4.4

Diff: https://github.com/danielperna84/hahomematic/compare/refs/tags/2023.4.2...2023.4.4

Changelog: https://github.com/danielperna84/hahomematic/releases/tag/2023.4.4
---
 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 5458986e7f15..00b145589c7b 100644
--- a/pkgs/development/python-modules/hahomematic/default.nix
+++ b/pkgs/development/python-modules/hahomematic/default.nix
@@ -16,7 +16,7 @@
 
 buildPythonPackage rec {
   pname = "hahomematic";
-  version = "2023.4.2";
+  version = "2023.4.4";
   format = "pyproject";
 
   disabled = pythonOlder "3.9";
@@ -25,7 +25,7 @@ buildPythonPackage rec {
     owner = "danielperna84";
     repo = pname;
     rev = "refs/tags/${version}";
-    hash = "sha256-cMrp0IewFezXpuXDnXDoDmEge/2NWRlhqkBmIwBjlrE=";
+    hash = "sha256-5wUx0S3Wg30Kn6RAkybAOMQqRvVDt9HeIJyTPCVHqRc=";
   };
 
   nativeBuildInputs = [

From d4e911c101b465a9c2ce6f9b031cb48432a54093 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 28 Apr 2023 10:52:10 +0200
Subject: [PATCH 36/58] python310Packages.gvm-tools: 23.3.0 -> 23.4.0

Diff: https://github.com/greenbone/gvm-tools/compare/refs/tags/v23.3.0...v23.4.0

Changelog: https://github.com/greenbone/gvm-tools/releases/tag/v23.4.0
---
 pkgs/development/python-modules/gvm-tools/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/gvm-tools/default.nix b/pkgs/development/python-modules/gvm-tools/default.nix
index 9c7d70822eb0..b80f9a2e4d06 100644
--- a/pkgs/development/python-modules/gvm-tools/default.nix
+++ b/pkgs/development/python-modules/gvm-tools/default.nix
@@ -10,7 +10,7 @@
 
 buildPythonPackage rec {
   pname = "gvm-tools";
-  version = "23.3.0";
+  version = "23.4.0";
   format = "pyproject";
 
   disabled = pythonOlder "3.7";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
     owner = "greenbone";
     repo = pname;
     rev = "refs/tags/v${version}";
-    hash = "sha256-sv34PwOEWGsIgSNpUcqvwjJ+6FSrmpXNB5gc47EjFU0=";
+    hash = "sha256-L7GR50nlcm2EQ6YxLAfieQJ+vPUrCrj72KNSY73LFko=";
   };
 
   nativeBuildInputs = [

From 45539fc2fd6399bf1596e43346acaa7fc32e8786 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 28 Apr 2023 10:53:11 +0200
Subject: [PATCH 37/58] python310Packages.google-resumable-media: 2.4.1 ->
 2.5.0

Changelog: https://github.com/googleapis/google-resumable-media-python/blob/v2.5.0/CHANGELOG.md
---
 .../python-modules/google-resumable-media/default.nix         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/google-resumable-media/default.nix b/pkgs/development/python-modules/google-resumable-media/default.nix
index b39e550860ad..a93cc2441f5c 100644
--- a/pkgs/development/python-modules/google-resumable-media/default.nix
+++ b/pkgs/development/python-modules/google-resumable-media/default.nix
@@ -14,14 +14,14 @@
 
 buildPythonPackage rec {
   pname = "google-resumable-media";
-  version = "2.4.1";
+  version = "2.5.0";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-Fbii5130LcZQLRMG2wvOJke6YBP5zQO24XNowIhu6Qo=";
+    hash = "sha256-IYkx6OKypzpY6zVKKI4DoP1fscRYMmGsbkwHhmZGjJM=";
   };
 
   propagatedBuildInputs = [

From b6d266bd9c2b5ddb203f51f400e2cf1fddac8fc0 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 28 Apr 2023 10:53:52 +0200
Subject: [PATCH 38/58] python310Packages.google-cloud-spanner: 3.31.0 ->
 3.32.0

Changelog: https://github.com/googleapis/python-spanner/blob/v3.32.0/CHANGELOG.md
---
 .../python-modules/google-cloud-spanner/default.nix           | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/google-cloud-spanner/default.nix b/pkgs/development/python-modules/google-cloud-spanner/default.nix
index feefd609f269..b096bafa62e9 100644
--- a/pkgs/development/python-modules/google-cloud-spanner/default.nix
+++ b/pkgs/development/python-modules/google-cloud-spanner/default.nix
@@ -17,14 +17,14 @@
 
 buildPythonPackage rec {
   pname = "google-cloud-spanner";
-  version = "3.31.0";
+  version = "3.32.0";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-gVQL0boXV/4vaYBpSM8Qli8do3YC7X5ULJeepE2LDUo=";
+    hash = "sha256-/2ktwVBV6CmEKrX8cngxmeOz4Hwhpw2ThOX1rA/yYeQ=";
   };
 
   propagatedBuildInputs = [

From 8ab043b1ee8220de4d21f8f4e93049e5b0ab040a Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 28 Apr 2023 10:54:56 +0200
Subject: [PATCH 39/58] python310Packages.google-cloud-pubsub: 2.15.0 -> 2.16.0

Changelog: https://github.com/googleapis/python-pubsub/blob/v2.16.0/CHANGELOG.md
---
 .../python-modules/google-cloud-pubsub/default.nix            | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/google-cloud-pubsub/default.nix b/pkgs/development/python-modules/google-cloud-pubsub/default.nix
index ac0c0bf039fa..abbe91f45c84 100644
--- a/pkgs/development/python-modules/google-cloud-pubsub/default.nix
+++ b/pkgs/development/python-modules/google-cloud-pubsub/default.nix
@@ -16,14 +16,14 @@
 
 buildPythonPackage rec {
   pname = "google-cloud-pubsub";
-  version = "2.15.0";
+  version = "2.16.0";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-PKVX/A1AT3EqHahBLnGlXNY7aiZZdbCmvsQ/+KNV7UA=";
+    hash = "sha256-WH2n1TXKhYzu7XA2IFNV5abdPkTqSryW9OUNGr/YhDs=";
   };
 
   propagatedBuildInputs = [

From 248e9380d357ab671c60268809fa2a3c0f049f13 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 28 Apr 2023 10:55:01 +0200
Subject: [PATCH 40/58] python310Packages.google-cloud-dlp: 3.12.0 -> 3.12.1

Changelog: https://github.com/googleapis/python-dlp/blob/v3.12.1/CHANGELOG.md
---
 pkgs/development/python-modules/google-cloud-dlp/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/google-cloud-dlp/default.nix b/pkgs/development/python-modules/google-cloud-dlp/default.nix
index 94941e4eef3c..a0ed249d47bc 100644
--- a/pkgs/development/python-modules/google-cloud-dlp/default.nix
+++ b/pkgs/development/python-modules/google-cloud-dlp/default.nix
@@ -13,14 +13,14 @@
 
 buildPythonPackage rec {
   pname = "google-cloud-dlp";
-  version = "3.12.0";
+  version = "3.12.1";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-v874eaWthn7DD9Sxg+hrXr/93k7u591h0GL68wwmeP4=";
+    hash = "sha256-KBqnGp56U2lGLo/2MWu5kfHr7pfIJJDT857+xnrK+iU=";
   };
 
   propagatedBuildInputs = [

From e6ba9a964dbcdd54b370b1dfc6c895c79603db05 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 28 Apr 2023 10:59:24 +0200
Subject: [PATCH 41/58] python310Packages.graphene: 3.2.1 -> 3.2.2

Diff: https://github.com/graphql-python/graphene/compare/refs/tags/v3.2.1...v3.2.2

Changelog: https://github.com/graphql-python/graphene/releases/tag/v3.2.2
---
 pkgs/development/python-modules/graphene/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/graphene/default.nix b/pkgs/development/python-modules/graphene/default.nix
index 190d3e708205..1ce628cc215e 100644
--- a/pkgs/development/python-modules/graphene/default.nix
+++ b/pkgs/development/python-modules/graphene/default.nix
@@ -18,7 +18,7 @@
 
 buildPythonPackage rec {
   pname = "graphene";
-  version = "3.2.1";
+  version = "3.2.2";
   format = "setuptools";
 
   disabled = pythonOlder "3.6";
@@ -27,7 +27,7 @@ buildPythonPackage rec {
     owner = "graphql-python";
     repo = "graphene";
     rev = "refs/tags/v${version}";
-    hash = "sha256-XnrzgPkkFsTgNE9J+eSkD8f5MokKjtZhbbE/dxNZryk=";
+    hash = "sha256-kwF6oXp06w7r1PbPoJTCQ9teTExYMoqvIZDhtv5QNn8=";
   };
 
   propagatedBuildInputs = [

From f017b54bd9407b39461c6ee6e27bde179e9d10ae Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 28 Apr 2023 11:01:24 +0200
Subject: [PATCH 42/58] python310Packages.google-auth: 2.17.1 -> 2.17.3

Changelog: https://github.com/googleapis/google-auth-library-python/blob/v2.17.3/CHANGELOG.md
---
 pkgs/development/python-modules/google-auth/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/google-auth/default.nix b/pkgs/development/python-modules/google-auth/default.nix
index 1d53c35a9879..5797fd297d25 100644
--- a/pkgs/development/python-modules/google-auth/default.nix
+++ b/pkgs/development/python-modules/google-auth/default.nix
@@ -27,14 +27,14 @@
 
 buildPythonPackage rec {
   pname = "google-auth";
-  version = "2.17.1";
+  version = "2.17.3";
   format = "setuptools";
 
   disabled = pythonOlder "3.6";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-jzebRrrTga0qC5id+wwTrSjTwqefJzSCE/iUah0V1Vo=";
+    hash = "sha256-zjEeK8WLEw/d8xbfV8mzlDwqe09uwx3pZjqTM+QGTvw=";
   };
 
   propagatedBuildInputs = [

From 993b95d373a409fcff820ac501baf12bee4527f6 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 28 Apr 2023 11:02:03 +0200
Subject: [PATCH 43/58] python310Packages.isbnlib: 3.10.13 -> 3.10.14

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

diff --git a/pkgs/development/python-modules/isbnlib/default.nix b/pkgs/development/python-modules/isbnlib/default.nix
index 3e612c6cda8d..db791dddf69f 100644
--- a/pkgs/development/python-modules/isbnlib/default.nix
+++ b/pkgs/development/python-modules/isbnlib/default.nix
@@ -8,14 +8,14 @@
 
 buildPythonPackage rec {
   pname = "isbnlib";
-  version = "3.10.13";
+  version = "3.10.14";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-Rnk0H1ag35HGNeg4oiLOfxB1XLW8yVSOP3qK/1Z009Q=";
+    hash = "sha256-lvkIZMd7AfVfoR5b/Kn9kJUB2YQvO8cQ1Oq4UZXZBTk=";
   };
 
   nativeCheckInputs = [

From 6b3878712e60c8f75f77e779952f01d7004be1c5 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 28 Apr 2023 11:03:47 +0200
Subject: [PATCH 44/58] python310Packages.msal: 1.21.0 -> 1.22.0

Changelog: https://github.com/AzureAD/microsoft-authentication-library-for-python/releases/tag/1.22.0
---
 pkgs/development/python-modules/msal/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/msal/default.nix b/pkgs/development/python-modules/msal/default.nix
index 336439824140..70d2ebdd36a9 100644
--- a/pkgs/development/python-modules/msal/default.nix
+++ b/pkgs/development/python-modules/msal/default.nix
@@ -8,14 +8,14 @@
 
 buildPythonPackage rec {
   pname = "msal";
-  version = "1.21.0";
+  version = "1.22.0";
   format = "setuptools";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-lrXIZ4MP0Rbl99DsjvGyOLTNpNGuqG2P7PUYJg4Tb78=";
+    hash = "sha256-ioL1N1ZCwWJciQWAGEMClMEJRA3OQupmfUZsLKtSCs0=";
   };
 
   propagatedBuildInputs = [

From d7b3b861360231d315c85a9839040a9dd22e7969 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 28 Apr 2023 11:06:21 +0200
Subject: [PATCH 45/58] python310Packages.isbnlib: add changelog to meta

---
 pkgs/development/python-modules/isbnlib/default.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/development/python-modules/isbnlib/default.nix b/pkgs/development/python-modules/isbnlib/default.nix
index db791dddf69f..a1af373ad58e 100644
--- a/pkgs/development/python-modules/isbnlib/default.nix
+++ b/pkgs/development/python-modules/isbnlib/default.nix
@@ -37,6 +37,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Extract, clean, transform, hyphenate and metadata for ISBNs";
     homepage = "https://github.com/xlcnd/isbnlib";
+    changelog = "https://github.com/xlcnd/isbnlib/blob/v${version}/CHANGES.txt";
     license = licenses.lgpl3Plus;
     maintainers = with maintainers; [ dotlambda ];
   };

From 83a5590476b1aaa60acb688cb1122ae79750c952 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 28 Apr 2023 11:14:24 +0200
Subject: [PATCH 46/58] python310Packages.pex: 2.1.131 -> 2.1.134

Changelog: https://github.com/pantsbuild/pex/releases/tag/v2.1.134
---
 pkgs/development/python-modules/pex/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pex/default.nix b/pkgs/development/python-modules/pex/default.nix
index 45b2475f69fc..6a746264dd85 100644
--- a/pkgs/development/python-modules/pex/default.nix
+++ b/pkgs/development/python-modules/pex/default.nix
@@ -7,14 +7,14 @@
 
 buildPythonPackage rec {
   pname = "pex";
-  version = "2.1.131";
+  version = "2.1.134";
   format = "flit";
 
   disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-eG1giXUuQfxROe0H8ZhU0qde8LZwRXy6YCiT54mZ6q4=";
+    hash = "sha256-hVh8N/eTJL5HpxIUkLsnD985zm1pGnD5YDgwJ/3N6dU=";
   };
 
   nativeBuildInputs = [

From c480720ef057fa2d2ac23f25fa51a6234a1e1e8e Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 28 Apr 2023 11:17:48 +0200
Subject: [PATCH 47/58] python310Packages.pontos: 23.4.7 -> 23.4.9

Diff: https://github.com/greenbone/pontos/compare/refs/tags/v23.4.7...v23.4.9

Changelog: https://github.com/greenbone/pontos/releases/tag/v23.4.9
---
 pkgs/development/python-modules/pontos/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pontos/default.nix b/pkgs/development/python-modules/pontos/default.nix
index 9609ecb39976..7b7143434388 100644
--- a/pkgs/development/python-modules/pontos/default.nix
+++ b/pkgs/development/python-modules/pontos/default.nix
@@ -17,7 +17,7 @@
 
 buildPythonPackage rec {
   pname = "pontos";
-  version = "23.4.7";
+  version = "23.4.9";
   format = "pyproject";
 
   disabled = pythonOlder "3.9";
@@ -26,7 +26,7 @@ buildPythonPackage rec {
     owner = "greenbone";
     repo = pname;
     rev = "refs/tags/v${version}";
-    hash = "sha256-8EZzxVluFl/EnnJZpu3Mo1KtZVIC36/UvgBeUaPLouo=";
+    hash = "sha256-rShSVoDL5jY1xCZ6O9jUdGpErMMmq91Ypb0rBoTApIQ=";
   };
 
   nativeBuildInputs = [

From 73531df3b62bbead22370d67dbc469a10c5c727b Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 28 Apr 2023 11:35:41 +0200
Subject: [PATCH 48/58] python310Packages.pysiaalarm: 3.0.2 -> 3.1.1

Changelog: https://github.com/eavanvalkenburg/pysiaalarm/releases/tag/v3.1.1
---
 pkgs/development/python-modules/pysiaalarm/default.nix | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pysiaalarm/default.nix b/pkgs/development/python-modules/pysiaalarm/default.nix
index 2ab7236c2c7c..6956aca6826d 100644
--- a/pkgs/development/python-modules/pysiaalarm/default.nix
+++ b/pkgs/development/python-modules/pysiaalarm/default.nix
@@ -8,17 +8,18 @@
 , pytest-asyncio
 , pytest-cases
 , pytestCheckHook
+, pytz
 }:
 
 buildPythonPackage rec {
   pname = "pysiaalarm";
-  version = "3.0.2";
+  version = "3.1.1";
 
   disabled = pythonOlder "3.8";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-hS0OaafYjRdPVSCOHfb2zKp0tEOl1LyMJpwnpvsvALs=";
+    hash = "sha256-q42bsBeAwU9lt7wtYGFJv23UBND+aMXZJlSWyTfZDQE=";
   };
 
   postPatch = ''
@@ -35,6 +36,7 @@ buildPythonPackage rec {
   propagatedBuildInputs = [
     dataclasses-json
     pycryptodome
+    pytz
   ];
 
   nativeCheckInputs = [
@@ -51,6 +53,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Python package for creating a client that talks with SIA-based alarm systems";
     homepage = "https://github.com/eavanvalkenburg/pysiaalarm";
+    changelog = "https://github.com/eavanvalkenburg/pysiaalarm/releases/tag/v${version}";
     license = licenses.mit;
     maintainers = with maintainers; [ dotlambda ];
   };

From 0369edb22db7d2a0e97d090b8d04d0142c9256c9 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 28 Apr 2023 11:36:36 +0200
Subject: [PATCH 49/58] python310Packages.python-engineio: 4.4.0 -> 4.4.1

Diff: https://github.com/miguelgrinberg/python-engineio/compare/refs/tags/v4.4.0...v4.4.1

Changelog: https://github.com/miguelgrinberg/python-engineio/blob/v4.4.1/CHANGES.md
---
 pkgs/development/python-modules/python-engineio/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/python-engineio/default.nix b/pkgs/development/python-modules/python-engineio/default.nix
index d08e62a81555..02ae7cf6441f 100644
--- a/pkgs/development/python-modules/python-engineio/default.nix
+++ b/pkgs/development/python-modules/python-engineio/default.nix
@@ -16,7 +16,7 @@
 
 buildPythonPackage rec {
   pname = "python-engineio";
-  version = "4.4.0";
+  version = "4.4.1";
   format = "setuptools";
 
   disabled = pythonOlder "3.6";
@@ -25,7 +25,7 @@ buildPythonPackage rec {
     owner = "miguelgrinberg";
     repo = "python-engineio";
     rev = "refs/tags/v${version}";
-    hash = "sha256-pixLk9Q7mIw1ReFemDu039lJtCwqi73tvhXl0KhKvgw=";
+    hash = "sha256-sE6AlT01Rou427i9w+xwUTMflKxUr0Heqt2l+Y2AMmU=";
   };
 
   nativeCheckInputs = [

From e4cc47c4156b49276a2a3e94667a3d12c36ed537 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 28 Apr 2023 12:58:43 +0200
Subject: [PATCH 50/58] python310Packages.pyvizio: 0.1.60 -> 0.1.61

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

diff --git a/pkgs/development/python-modules/pyvizio/default.nix b/pkgs/development/python-modules/pyvizio/default.nix
index 4a11c8f30ba1..567e8c4d5ebb 100644
--- a/pkgs/development/python-modules/pyvizio/default.nix
+++ b/pkgs/development/python-modules/pyvizio/default.nix
@@ -12,11 +12,11 @@
 
 buildPythonPackage rec {
   pname = "pyvizio";
-  version = "0.1.60";
+  version = "0.1.61";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-RwwZDb4mQJZw8w1sTFJ0eM3az4pDQbVLGtA+anyKEJM=";
+    sha256 = "sha256-AtqMWe2zgRqOp5S9oKq7keHNHM8pnTmV1mfGiVzygTc=";
   };
 
   propagatedBuildInputs = [

From 3ec0efcd3a6e1561b098384b007813e1cfdd1a65 Mon Sep 17 00:00:00 2001
From: Pavol Rusnak <pavol@rusnak.io>
Date: Fri, 28 Apr 2023 13:00:04 +0200
Subject: [PATCH 51/58] elementsd-simplicity: init at unstable-2023-04-18

---
 pkgs/top-level/all-packages.nix | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e10d94db89be..83d227cfc498 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -35432,6 +35432,15 @@ with pkgs;
     boost = boost175;
     inherit (darwin) autoSignDarwinBinariesHook;
   };
+  elementsd-simplicity = elementsd.overrideAttrs (_: rec {
+    version = "unstable-2023-04-18";
+    src = fetchFromGitHub {
+      owner = "ElementsProject";
+      repo = "elements";
+      rev = "ea318a45094ab3d31dd017d7781a6f28f1ffaa33"; # simplicity branch latest
+      sha256 = "ooe+If3HWaJWpr2ux7DpiCTqB9Hv+aXjquEjplDjvhM=";
+    };
+  });
 
   ergo = callPackage ../applications/blockchains/ergo { };
 

From 9a495b4f8cc6c407ae64f6bbf56ea593a1fdc56f Mon Sep 17 00:00:00 2001
From: linsui <linsui555@gmail.com>
Date: Fri, 28 Apr 2023 19:43:36 +0800
Subject: [PATCH 52/58] vimPlugins.statuscol-nvim: init at 2023-04-23

---
 pkgs/applications/editors/vim/plugins/generated.nix  | 12 ++++++++++++
 .../editors/vim/plugins/vim-plugin-names             |  1 +
 2 files changed, 13 insertions(+)

diff --git a/pkgs/applications/editors/vim/plugins/generated.nix b/pkgs/applications/editors/vim/plugins/generated.nix
index f2a7de9cbb1e..d61534f1c90d 100644
--- a/pkgs/applications/editors/vim/plugins/generated.nix
+++ b/pkgs/applications/editors/vim/plugins/generated.nix
@@ -8317,6 +8317,18 @@ final: prev:
     meta.homepage = "https://github.com/darfink/starsearch.vim/";
   };
 
+  statuscol-nvim = buildVimPluginFrom2Nix {
+    pname = "statuscol.nvim";
+    version = "2023-04-23";
+    src = fetchFromGitHub {
+      owner = "luukvbaal";
+      repo = "statuscol.nvim";
+      rev = "b115b5d7a4ea5d4b152d61d89457cc874e08a7d1";
+      sha256 = "026j7m8la14pfz9xqmw13gr1x8c9yx9ykqq4wa8x7cyf3a1s8z13";
+    };
+    meta.homepage = "https://github.com/luukvbaal/statuscol.nvim/";
+  };
+
   stylish-nvim = buildVimPluginFrom2Nix {
     pname = "stylish.nvim";
     version = "2022-02-01";
diff --git a/pkgs/applications/editors/vim/plugins/vim-plugin-names b/pkgs/applications/editors/vim/plugins/vim-plugin-names
index 1c3312d3b92b..007141f93ec9 100644
--- a/pkgs/applications/editors/vim/plugins/vim-plugin-names
+++ b/pkgs/applications/editors/vim/plugins/vim-plugin-names
@@ -698,6 +698,7 @@ https://github.com/cshuaimin/ssr.nvim/,HEAD,
 https://github.com/luukvbaal/stabilize.nvim/,,
 https://github.com/eigenfoo/stan-vim/,,
 https://github.com/darfink/starsearch.vim/,,
+https://github.com/luukvbaal/statuscol.nvim/,,
 https://github.com/teto/stylish.nvim/,HEAD,
 https://github.com/kvrohit/substrata.nvim/,HEAD,
 https://github.com/lambdalisue/suda.vim/,,

From ffb470ec45671f97e57a29d2e8c852ccf589ce47 Mon Sep 17 00:00:00 2001
From: Alissa Ceres <aqh+gh@posteo.net>
Date: Tue, 18 Apr 2023 04:30:03 +0200
Subject: [PATCH 53/58] raysession: Add bash to buildInputs

Needed since all executables are bash scripts that need their shebang patched.
---
 pkgs/applications/audio/raysession/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/audio/raysession/default.nix b/pkgs/applications/audio/raysession/default.nix
index 2cae90bdd8d0..279d0f85b218 100644
--- a/pkgs/applications/audio/raysession/default.nix
+++ b/pkgs/applications/audio/raysession/default.nix
@@ -1,4 +1,4 @@
-{ lib, fetchurl, buildPythonApplication, libjack2, pydbus, pyliblo, pyqt5, qttools, which }:
+{ lib, fetchurl, buildPythonApplication, libjack2, pydbus, pyliblo, pyqt5, qttools, which, bash }:
 
 buildPythonApplication rec {
   pname = "raysession";
@@ -23,7 +23,7 @@ buildPythonApplication rec {
     qttools # lrelease to build translations.
     which   # which to find lrelease.
   ];
-  buildInputs = [ libjack2 ];
+  buildInputs = [ libjack2 bash ];
   propagatedBuildInputs = [ pydbus pyliblo pyqt5 ];
 
   dontWrapQtApps = true; # The program is a python script.

From 7f9b903128af0e0cf0d6093b101b2f1a88e7b78b Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Fri, 28 Apr 2023 15:15:16 +0300
Subject: [PATCH 54/58] isoimagewriter: 0.9.2 -> 1.0.0

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

diff --git a/pkgs/tools/misc/isoimagewriter/default.nix b/pkgs/tools/misc/isoimagewriter/default.nix
index f84ad03324fd..e7ce4fd79ace 100644
--- a/pkgs/tools/misc/isoimagewriter/default.nix
+++ b/pkgs/tools/misc/isoimagewriter/default.nix
@@ -2,11 +2,11 @@
 karchive, kcoreaddons, kcrash, kiconthemes, kwidgetsaddons, solid, qgpgme }:
 mkDerivation rec {
   pname = "isoimagewriter";
-  version = "0.9.2";
+  version = "1.0.0";
 
   src = fetchurl {
-    url = "mirror://kde/unstable/${pname}/${version}/${pname}-${version}.tar.xz";
-    hash = "sha256-c6cHnGVKPOw/cGXlKWsc40/1ZbiUJH/H+XmffE0MQcU=";
+    url = "mirror://kde/stable/${pname}/${version}/${pname}-${version}.tar.xz";
+    hash = "sha256-ppAiMD7Bvra3tPDWjlnkGZ08mGh2fLnrI8bdGZngal0=";
   };
 
   nativeBuildInputs = [ cmake extra-cmake-modules wrapQtAppsHook ];

From f873350afdb4627f520161cf850007e102287c6c Mon Sep 17 00:00:00 2001
From: rewine <lhongxu@outlook.com>
Date: Fri, 28 Apr 2023 10:14:20 +0800
Subject: [PATCH 55/58] wio: remove

---
 .../window-managers/wio/default.nix           | 68 -------------------
 pkgs/top-level/aliases.nix                    |  1 +
 pkgs/top-level/all-packages.nix               |  4 --
 3 files changed, 1 insertion(+), 72 deletions(-)
 delete mode 100644 pkgs/applications/window-managers/wio/default.nix

diff --git a/pkgs/applications/window-managers/wio/default.nix b/pkgs/applications/window-managers/wio/default.nix
deleted file mode 100644
index 86bbfd3dc72d..000000000000
--- a/pkgs/applications/window-managers/wio/default.nix
+++ /dev/null
@@ -1,68 +0,0 @@
-{ lib
-, stdenv
-, fetchFromGitHub
-, alacritty
-, cage
-, cairo
-, libxkbcommon
-, makeWrapper
-, mesa
-, meson
-, ninja
-, pkg-config
-, udev
-, wayland
-, wayland-protocols
-, wlroots
-, xwayland
-}:
-
-stdenv.mkDerivation rec {
-  pname = "wio";
-  version = "0.pre+unstable=2021-06-27";
-
-  src = fetchFromGitHub {
-    owner = "museoa";
-    repo = pname;
-    rev = "e0b258777995055d69e61a0246a6a64985743f42";
-    sha256 = "sha256-8H9fOnZsNjjq9XvOv68F4RRglGNluxs5/jp/h4ROLiI=";
-  };
-
-  nativeBuildInputs = [
-    makeWrapper
-    meson
-    ninja
-    pkg-config
-  ];
-
-  buildInputs = [
-    cairo
-    libxkbcommon
-    mesa # for libEGL
-    udev
-    wayland
-    wayland-protocols
-    wlroots
-    xwayland
-  ];
-
-  postInstall = ''
-    wrapProgram $out/bin/wio \
-      --prefix PATH ":" "${lib.makeBinPath [ alacritty cage ]}"
-  '';
-
-  meta = with lib; {
-    homepage = "https://wio-project.org/";
-    description = "That Plan 9 feel, for Wayland";
-    longDescription = ''
-      Wio is a Wayland compositor for Linux and FreeBSD which has a similar look
-      and feel to plan9's rio.
-    '';
-    license = licenses.mit;
-    maintainers = with maintainers; [ AndersonTorres ];
-    inherit (wayland.meta) platforms;
-  };
-
-  passthru.providedSessions = [ "wio" ];
-}
-# TODO: factor Linux-specific options
diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
index 55e7e3dd17ad..2d2fb1580b7a 100644
--- a/pkgs/top-level/aliases.nix
+++ b/pkgs/top-level/aliases.nix
@@ -1721,6 +1721,7 @@ mapAliases ({
   weechat-matrix-bridge = throw "'weechat-matrix-bridge' has been renamed to/replaced by 'weechatScripts.weechat-matrix-bridge'"; # Converted to throw 2022-02-22
   weighttp = throw "weighttp has been removed: abandoned by upstream"; # Added 2022-04-20
   whirlpool-gui = throw "whirlpool-gui has been removed as it depended on an insecure version of Electron"; # added 2022-02-08
+  wio = throw "wio has been removed from nixpkgs, it was unmaintained and required wlroots_0_14 at the time of removal"; # Added 2023-04-28
   wicd = throw "wicd has been removed as it is abandoned"; # Added 2021-09-11
   wineFull = throw "'wineFull' has been renamed to/replaced by 'winePackages.full'"; # Converted to throw 2022-02-22
   wineMinimal = throw "'wineMinimal' has been renamed to/replaced by 'winePackages.minimal'"; # Converted to throw 2022-02-22
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ece6dff37d3a..c2397c4ce5db 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -34835,10 +34835,6 @@ with pkgs;
     electron = electron_19;
   };
 
-  wio = callPackage ../applications/window-managers/wio {
-    wlroots = wlroots_0_14;
-  };
-
   windowlab = callPackage ../applications/window-managers/windowlab { };
 
   windowmaker = callPackage ../applications/window-managers/windowmaker { };

From 143eb4716350250d24098b4546a8e3cacc41251f Mon Sep 17 00:00:00 2001
From: Matthias Beyer <mail@beyermatthias.de>
Date: Fri, 28 Apr 2023 16:23:49 +0200
Subject: [PATCH 56/58] cargo-public-api: 0.28.0 -> 0.29.0

Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
---
 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 26e034d207e8..cb8d230c29f5 100644
--- a/pkgs/development/tools/rust/cargo-public-api/default.nix
+++ b/pkgs/development/tools/rust/cargo-public-api/default.nix
@@ -9,14 +9,14 @@
 
 rustPlatform.buildRustPackage rec {
   pname = "cargo-public-api";
-  version = "0.28.0";
+  version = "0.29.0";
 
   src = fetchCrate {
     inherit pname version;
-    hash = "sha256-lItbWIY9CytvcLmASkbbF5wLYKWrXn2Gl9mgccg9J0M=";
+    hash = "sha256-Tf2nAisZlKPalWa0T5XDAWy+d/ERJYtzJVb3gEdcGSo=";
   };
 
-  cargoHash = "sha256-6Eula3fex0KhWhBR53K0Kl0nlbqpfZfD/Y3zrEURPmc=";
+  cargoHash = "sha256-X+4C/ExKAVvAX11dBcJHhV7WW/EUI1zk3UR8mBQkSY4=";
 
   nativeBuildInputs = [ pkg-config ];
 

From d44390ab186273b2043c9f1a6df87f2be3465dbb Mon Sep 17 00:00:00 2001
From: Artturin <Artturin@artturin.com>
Date: Sun, 16 Apr 2023 02:02:48 +0300
Subject: [PATCH 57/58] mkPythonDerivation: validate propagatedBuildInputs use
 a matching python

mkPythonDerivation: apply checks to buildInputs as well

fixup: add a suggestion about nativeBuildInputs

Clean up the wording, add reasons for the suggestions

switch to throw

Adjust error to clarify build-time vs. run-time
---
 .../python/mk-python-derivation.nix           | 59 ++++++++++++++++++-
 1 file changed, 56 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/interpreters/python/mk-python-derivation.nix b/pkgs/development/interpreters/python/mk-python-derivation.nix
index b1f35cc2fb13..17b5667e8ee9 100644
--- a/pkgs/development/interpreters/python/mk-python-derivation.nix
+++ b/pkgs/development/interpreters/python/mk-python-derivation.nix
@@ -108,6 +108,59 @@ let
 
   name_ = name;
 
+  validatePythonMatches = attrName: let
+    isPythonModule = drv:
+      # all pythonModules have the pythonModule attribute
+      (drv ? "pythonModule")
+      # Some pythonModules are turned in to a pythonApplication by setting the field to false
+      && (!builtins.isBool drv.pythonModule);
+    isMismatchedPython = drv: drv.pythonModule != python;
+
+    optionalLocation = let
+        pos = builtins.unsafeGetAttrPos (if attrs ? "pname" then "pname" else "name") attrs;
+      in if pos == null then "" else " at ${pos.file}:${toString pos.line}:${toString pos.column}";
+
+    leftPadName = name: against: let
+        len = lib.max (lib.stringLength name) (lib.stringLength against);
+      in lib.strings.fixedWidthString len " " name;
+
+    throwMismatch = drv: let
+      myName = "'${namePrefix}${name}'";
+      theirName = "'${drv.name}'";
+    in throw ''
+      Python version mismatch in ${myName}:
+
+      The Python derivation ${myName} depends on a Python derivation
+      named ${theirName}, but the two derivations use different versions
+      of Python:
+
+          ${leftPadName myName theirName} uses ${python}
+          ${leftPadName theirName myName} uses ${toString drv.pythonModule}
+
+      Possible solutions:
+
+        * If ${theirName} is a Python library, change the reference to ${theirName}
+          in the ${attrName} of ${myName} to use a ${theirName} built from the same
+          version of Python
+
+        * If ${theirName} is used as a tool during the build, move the reference to
+          ${theirName} in ${myName} from ${attrName} to nativeBuildInputs
+
+        * If ${theirName} provides executables that are called at run time, pass its
+          bin path to makeWrapperArgs:
+
+              makeWrapperArgs = [ "--prefix PATH : ''${lib.makeBinPath [ ${lib.getName drv } ] }" ];
+
+      ${optionalLocation}
+    '';
+
+    checkDrv = drv:
+      if (isPythonModule drv) && (isMismatchedPython drv)
+      then throwMismatch drv
+      else drv;
+
+    in inputs: builtins.map (checkDrv) inputs;
+
   # Keep extra attributes from `attrs`, e.g., `patchPhase', etc.
   self = toPythonModule (stdenv.mkDerivation ((builtins.removeAttrs attrs [
     "disabled" "checkPhase" "checkInputs" "nativeCheckInputs" "doCheck" "doInstallCheck" "dontWrapPythonPrograms" "catchConflicts" "format"
@@ -149,14 +202,14 @@ let
       pythonOutputDistHook
     ] ++ nativeBuildInputs;
 
-    buildInputs = buildInputs ++ pythonPath;
+    buildInputs = validatePythonMatches "buildInputs" (buildInputs ++ pythonPath);
 
-    propagatedBuildInputs = propagatedBuildInputs ++ [
+    propagatedBuildInputs = validatePythonMatches "propagatedBuildInputs" (propagatedBuildInputs ++ [
       # we propagate python even for packages transformed with 'toPythonApplication'
       # this pollutes the PATH but avoids rebuilds
       # see https://github.com/NixOS/nixpkgs/issues/170887 for more context
       python
-    ];
+    ]);
 
     inherit strictDeps;
 

From 7e6b335400dbd7f57bc76ee653b84a4125df959f Mon Sep 17 00:00:00 2001
From: K900 <me@0upti.me>
Date: Fri, 28 Apr 2023 20:23:31 +0300
Subject: [PATCH 58/58] path-of-building: 2.28.0 -> 2.29.0

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

diff --git a/pkgs/games/path-of-building/default.nix b/pkgs/games/path-of-building/default.nix
index e83c24e22898..37ead517bda4 100644
--- a/pkgs/games/path-of-building/default.nix
+++ b/pkgs/games/path-of-building/default.nix
@@ -1,6 +1,6 @@
 { stdenv, lib, fetchFromGitHub, runCommand, unzip, meson, ninja, pkg-config, qtbase, qttools, wrapQtAppsHook, luajit }:
 let
-  dataVersion = "2.28.0";
+  dataVersion = "2.29.0";
   frontendVersion = "unstable-2023-04-09";
 in
 stdenv.mkDerivation {
@@ -19,7 +19,7 @@ stdenv.mkDerivation {
       owner = "PathOfBuildingCommunity";
       repo = "PathOfBuilding";
       rev = "v${dataVersion}";
-      hash = "sha256-IO6qUE6OcjNibljNzcJQlwji3DZqrBm7cvHedKuAwpM=";
+      hash = "sha256-uG+Qb50+oG5yd67w2WgnatKpq+/0UA8IfJeJXRKnQXU=";
     };
 
     nativeBuildInputs = [ unzip ];