From 907fe2560108568a53a7144989a1201bc2c798c0 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sun, 8 Jan 2023 04:33:11 +0000
Subject: [PATCH 01/50] libwps: 0.4.12 -> 0.4.13

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

diff --git a/pkgs/development/libraries/libwps/default.nix b/pkgs/development/libraries/libwps/default.nix
index 7dd7153bae9f..cb6cd4237652 100644
--- a/pkgs/development/libraries/libwps/default.nix
+++ b/pkgs/development/libraries/libwps/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   pname = "libwps";
-  version = "0.4.12";
+  version = "0.4.13";
 
   src = fetchurl {
     url = "mirror://sourceforge/libwps/${pname}-${version}.tar.bz2";
-    sha256 = "16c6vq6hhi5lcvgyb9dwarr3kz69l1g5fs39b2hwqhkwzx5igpcl";
+    sha256 = "sha256-eVwva90EwLZgrMpRTcc2cAc9PG5wbXbV2GtK2BMpLrk=";
   };
 
   nativeBuildInputs = [ pkg-config ];

From 6abbc7f98edef876761089dbc6778efa07d9af8f Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Wed, 11 Jan 2023 15:22:01 +0000
Subject: [PATCH 02/50] latex2html: 2022.2 -> 2023

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

diff --git a/pkgs/tools/misc/latex2html/default.nix b/pkgs/tools/misc/latex2html/default.nix
index 84bda9e684b3..a3fbd6a7fc07 100644
--- a/pkgs/tools/misc/latex2html/default.nix
+++ b/pkgs/tools/misc/latex2html/default.nix
@@ -4,13 +4,13 @@
 
 stdenv.mkDerivation rec {
   pname = "latex2html";
-  version = "2022.2";
+  version = "2023";
 
   src = fetchFromGitHub {
     owner = pname;
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-Vl7ozawd4Ra+yDarRpmPhjF7deJELaxo07L4/qVV4fw=";
+    sha256 = "sha256-VQ416ieqZ+UqI2sgsh+YPkcdn2SmtXFhPqJd1tp49EQ=";
   };
 
   buildInputs = [ ghostscript netpbm perl ];

From 3a11d629f09b68433643dc4bcdd1ff7045dcc00a Mon Sep 17 00:00:00 2001
From: Atemu <atemu.main@gmail.com>
Date: Sun, 19 Feb 2023 17:30:32 +0100
Subject: [PATCH 03/50] linux_xanmod_latest: 6.1.7 -> 6.1.12

---
 pkgs/os-specific/linux/kernel/xanmod-kernels.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix
index 09562d42ec79..95b188984f63 100644
--- a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix
+++ b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix
@@ -9,8 +9,8 @@ let
   };
 
   mainVariant = {
-    version = "6.1.7";
-    hash = "sha256-cgUxM40cDl4lzoF4St3ckKAtsle2PRehfSag3VaycrY=";
+    version = "6.1.12";
+    hash = "sha256-nodVC9PFoIe/NVYfuVqqqYbhiIe9+K44kxfnlva2/b0=";
     variant = "main";
   };
 

From 402b1ebdcc6e9ecec91a384cfa1598aa89d362cc Mon Sep 17 00:00:00 2001
From: Dmitry Bogatov <serenity@kaction.cc>
Date: Wed, 15 Feb 2023 17:10:18 -0500
Subject: [PATCH 04/50] pkgsStatic.slstatus: fix build

---
 pkgs/applications/misc/slstatus/default.nix | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/pkgs/applications/misc/slstatus/default.nix b/pkgs/applications/misc/slstatus/default.nix
index 9c96cb2444b1..93ebc060c111 100644
--- a/pkgs/applications/misc/slstatus/default.nix
+++ b/pkgs/applications/misc/slstatus/default.nix
@@ -1,4 +1,14 @@
-{ lib, stdenv, fetchgit, pkg-config, writeText, libX11, conf ? null, patches ? [] }:
+{ lib
+, stdenv
+, fetchgit
+, pkg-config
+, writeText
+, libX11
+, libXau
+, libXdmcp
+, conf ? null
+, patches ? []
+}:
 
 stdenv.mkDerivation rec {
   pname = "slstatus";
@@ -11,14 +21,14 @@ stdenv.mkDerivation rec {
   };
 
   configFile = lib.optionalString (conf!=null) (writeText "config.def.h" conf);
-  preBuild = lib.optionalString (conf!=null) "cp ${configFile} config.def.h";
+  preBuild = lib.optionalString (conf!=null) "cp ${configFile} config.def.h" + ''
+    makeFlagsArray+=(LDLIBS="-lX11 -lxcb -lXau -lXdmcp" CC=$CC)
+  '';
 
   inherit patches;
 
   nativeBuildInputs = [ pkg-config ];
-  buildInputs = [ libX11 ];
-
-  makeFlags = [ "CC:=$(CC)" ];
+  buildInputs = [ libX11 libXau libXdmcp];
 
   installFlags = [ "PREFIX=$(out)" ];
 

From bb7490c76b38a96ab56a7b4808e7210daa7d1acd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Robert=20Sch=C3=BCtz?= <nix@dotlambda.de>
Date: Mon, 20 Feb 2023 10:52:23 -0800
Subject: [PATCH 05/50] chatty: 0.7.0_rc5 -> 0.7.0

Changelog: https://source.puri.sm/Librem5/chatty/-/blob/v0.7.0/NEWS
---
 .../networking/instant-messengers/chatty/default.nix          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/networking/instant-messengers/chatty/default.nix b/pkgs/applications/networking/instant-messengers/chatty/default.nix
index da4e41bed585..1c5c35248d59 100644
--- a/pkgs/applications/networking/instant-messengers/chatty/default.nix
+++ b/pkgs/applications/networking/instant-messengers/chatty/default.nix
@@ -29,7 +29,7 @@
 
 stdenv.mkDerivation rec {
   pname = "chatty";
-  version = "0.7.0_rc5";
+  version = "0.7.0";
 
   src = fetchFromGitLab {
     domain = "source.puri.sm";
@@ -37,7 +37,7 @@ stdenv.mkDerivation rec {
     repo = "chatty";
     rev = "v${version}";
     fetchSubmodules = true;
-    hash = "sha256-5V0ApHxsJaQ0MBhMlv1IxnD9Vq+Yw85jFvlvghhFxNI=";
+    hash = "sha256-e3lYzQjQx1ndomq4mJ8TmwXoUG3Bjl9JrLuTmjXmRCs=";
   };
 
   postPatch = ''

From add0f7fc1b7a541c176a030a9fa478fd9418e9e7 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 21 Feb 2023 11:37:06 +0100
Subject: [PATCH 06/50] python310Packages.flask-restplus: remove

---
 .../python-modules/flask-restplus/default.nix | 44 -------------------
 pkgs/top-level/python-aliases.nix             |  1 +
 pkgs/top-level/python-packages.nix            |  2 -
 3 files changed, 1 insertion(+), 46 deletions(-)
 delete mode 100644 pkgs/development/python-modules/flask-restplus/default.nix

diff --git a/pkgs/development/python-modules/flask-restplus/default.nix b/pkgs/development/python-modules/flask-restplus/default.nix
deleted file mode 100644
index 4673daa74644..000000000000
--- a/pkgs/development/python-modules/flask-restplus/default.nix
+++ /dev/null
@@ -1,44 +0,0 @@
-{ lib
-, buildPythonPackage
-, fetchPypi
-, nose
-, blinker
-, tzlocal
-, mock
-, rednose
-, flask
-, six
-, jsonschema
-, pytz
-, aniso8601
-, flask-restful
-, isPy27
-, enum34
-}:
-
-buildPythonPackage rec {
-  pname = "flask-restplus";
-  version = "0.13.0";
-
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "0p4zz8b5bwbw7w0vhbyihl99d2gw13cb81rxzj4z626a1cnl8vm6";
-  };
-
-  nativeCheckInputs = [ nose blinker tzlocal mock rednose ];
-  propagatedBuildInputs = [ flask six jsonschema pytz aniso8601 flask-restful ]
-   ++ lib.optional isPy27 enum34;
-
-  # RuntimeError: Working outside of application context.
-  doCheck = false;
-
-  checkPhase = ''
-    nosetests
-  '';
-
-  meta = {
-    homepage = "https://github.com/noirbizarre/flask-restplus";
-    description = "Fast, easy and documented API development with Flask";
-    license = lib.licenses.mit;
-  };
-}
diff --git a/pkgs/top-level/python-aliases.nix b/pkgs/top-level/python-aliases.nix
index 04da6d141ee9..9b9660ec86e5 100644
--- a/pkgs/top-level/python-aliases.nix
+++ b/pkgs/top-level/python-aliases.nix
@@ -85,6 +85,7 @@ mapAliases ({
   filemagic = throw "inactive since 2014, so use python-magic instead"; # added 2022-11-19
   flaskbabel = flask-babel; # added 2023-01-19
   flask_login = flask-login; # added 2022-10-17
+  flask-restplus = throw "flask-restplus is no longer maintained, use flask-restx instead"; # added 2023-02-21
   flask_sqlalchemy = flask-sqlalchemy; # added 2022-07-20
   flask_testing = flask-testing; # added 2022-04-25
   flask_wtf = flask-wtf; # added 2022-05-24
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 988f7e71981c..80524ff15689 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -3456,8 +3456,6 @@ self: super: with self; {
 
   flask-restful = callPackage ../development/python-modules/flask-restful { };
 
-  flask-restplus = callPackage ../development/python-modules/flask-restplus { };
-
   flask-restx = callPackage ../development/python-modules/flask-restx { };
 
   flask-reverse-proxy-fix = callPackage ../development/python-modules/flask-reverse-proxy-fix { };

From c60e3173b6dd593bf8ede4c6b7fe8ed87e1acaaf Mon Sep 17 00:00:00 2001
From: Atemu <atemu.main@gmail.com>
Date: Thu, 23 Feb 2023 12:39:40 +0100
Subject: [PATCH 07/50] linux_xanmod_latest: 6.1.12 -> 6.1.13

---
 pkgs/os-specific/linux/kernel/xanmod-kernels.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix
index 95b188984f63..c72bb2a628b6 100644
--- a/pkgs/os-specific/linux/kernel/xanmod-kernels.nix
+++ b/pkgs/os-specific/linux/kernel/xanmod-kernels.nix
@@ -9,8 +9,8 @@ let
   };
 
   mainVariant = {
-    version = "6.1.12";
-    hash = "sha256-nodVC9PFoIe/NVYfuVqqqYbhiIe9+K44kxfnlva2/b0=";
+    version = "6.1.13";
+    hash = "sha256-H3bEKPzwqpeDWlsj3ciP5D8NXVBvi+oKisWXveHnjLQ=";
     variant = "main";
   };
 

From e0965c0ae3de827805ce98ef4abe6ff81ee62f48 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 24 Feb 2023 00:15:48 +0100
Subject: [PATCH 08/50] python310Packages.sunweg: init at 0.0.8

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

diff --git a/pkgs/development/python-modules/sunweg/default.nix b/pkgs/development/python-modules/sunweg/default.nix
new file mode 100644
index 000000000000..18f386577a76
--- /dev/null
+++ b/pkgs/development/python-modules/sunweg/default.nix
@@ -0,0 +1,41 @@
+{ lib
+, buildPythonPackage
+, fetchFromGitHub
+, pytestCheckHook
+, pythonOlder
+, requests
+}:
+
+buildPythonPackage rec {
+  pname = "sunweg";
+  version = "0.0.8";
+  format = "setuptools";
+
+  disabled = pythonOlder "3.7";
+
+  src = fetchFromGitHub {
+    owner = "rokam";
+    repo = pname;
+    rev = "refs/tags/${version}";
+    hash = "sha256-IIVVLBoyMwp5BsdIf4Q6e5ObXONm1odpgxOE6tkFH5s=";
+  };
+
+  propagatedBuildInputs = [
+    requests
+  ];
+
+  # Module has no tests
+  doCheck = false;
+
+  pythonImportsCheck = [
+    "sunweg"
+  ];
+
+  meta = with lib; {
+    description = "Module to access the WEG solar energy platform";
+    homepage = "https://github.com/rokam/sunweg";
+    changelog = "https://github.com/rokam/sunweg/releases/tag/${version}";
+    license = licenses.mit;
+    maintainers = with maintainers; [ fab ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index c41bf30acb8c..92c76b4a503a 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -11194,6 +11194,8 @@ self: super: with self; {
 
   sunwatcher = callPackage ../development/python-modules/sunwatcher { };
 
+  sunweg = callPackage ../development/python-modules/sunweg { };
+
   supervise_api = callPackage ../development/python-modules/supervise_api { };
 
   supervisor = callPackage ../development/python-modules/supervisor { };

From 5814c89778ee82fe34c7d9f718dfed00956f2982 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 24 Feb 2023 00:31:50 +0100
Subject: [PATCH 09/50] python310Packages.mopeka-iot-ble: init at 0.4.1

---
 .../python-modules/mopeka-iot-ble/default.nix | 58 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 60 insertions(+)
 create mode 100644 pkgs/development/python-modules/mopeka-iot-ble/default.nix

diff --git a/pkgs/development/python-modules/mopeka-iot-ble/default.nix b/pkgs/development/python-modules/mopeka-iot-ble/default.nix
new file mode 100644
index 000000000000..318bd9a00bbd
--- /dev/null
+++ b/pkgs/development/python-modules/mopeka-iot-ble/default.nix
@@ -0,0 +1,58 @@
+{ lib
+, bluetooth-data-tools
+, bluetooth-sensor-state-data
+, buildPythonPackage
+, fetchFromGitHub
+, home-assistant-bluetooth
+, poetry-core
+, pytestCheckHook
+, pythonOlder
+, sensor-state-data
+}:
+
+buildPythonPackage rec {
+  pname = "mopeka-iot-ble";
+  version = "0.4.1";
+  format = "pyproject";
+
+  disabled = pythonOlder "3.9";
+
+  src = fetchFromGitHub {
+    owner = "bluetooth-devices";
+    repo = pname;
+    rev = "refs/tags/v${version}";
+    hash = "sha256-x/cKg2NC6kssUQeBuQH4yghlRDgs/fJ0bWWL+qnHgcM=";
+  };
+
+  nativeBuildInputs = [
+    poetry-core
+  ];
+
+  propagatedBuildInputs = [
+    bluetooth-data-tools
+    bluetooth-sensor-state-data
+    home-assistant-bluetooth
+    sensor-state-data
+  ];
+
+  nativeCheckInputs = [
+    pytestCheckHook
+  ];
+
+  postPatch = ''
+    substituteInPlace pyproject.toml \
+      --replace " --cov=mopeka_iot_ble --cov-report=term-missing:skip-covered" ""
+  '';
+
+  pythonImportsCheck = [
+    "mopeka_iot_ble"
+  ];
+
+  meta = with lib; {
+    description = "Library for Mopeka IoT BLE devices";
+    homepage = "https://github.com/bluetooth-devices/mopeka-iot-ble";
+    changelog = "https://github.com/Bluetooth-Devices/mopeka-iot-ble/releases/tag/v${version}";
+    license = with licenses; [ mit ];
+    maintainers = with maintainers; [ fab ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index c41bf30acb8c..1f81786fa4ff 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -6050,6 +6050,8 @@ self: super: with self; {
 
   moonraker-api = callPackage ../development/python-modules/moonraker-api { };
 
+  mopeka-iot-ble = callPackage ../development/python-modules/mopeka-iot-ble { };
+
   more-itertools = callPackage ../development/python-modules/more-itertools { };
 
   more-properties = callPackage ../development/python-modules/more-properties { };

From c3c60df81a05a6a375352dbb32bb4ea24f5d9c1e Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sun, 11 Dec 2022 11:33:02 +0100
Subject: [PATCH 10/50] python310Packages.dict2xml: add changelog to meta

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

diff --git a/pkgs/development/python-modules/dict2xml/default.nix b/pkgs/development/python-modules/dict2xml/default.nix
index a51ec5303cd2..1316b9bc3044 100644
--- a/pkgs/development/python-modules/dict2xml/default.nix
+++ b/pkgs/development/python-modules/dict2xml/default.nix
@@ -23,6 +23,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Library to convert a Python dictionary into an XML string";
     homepage = "https://github.com/delfick/python-dict2xml";
+    changelog = "https://github.com/delfick/python-dict2xml/releases/tag/release-${version}";
     license = licenses.mit;
     maintainers = with maintainers; [ johnazoidberg ];
   };

From c74fa614c382b1900ca1a92c0351d9df80414f48 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 24 Feb 2023 10:10:01 +0100
Subject: [PATCH 11/50] python310Packages.dict2xml: 1.7.1 -> 1.7.2

Changelog: https://github.com/delfick/python-dict2xml/releases/tag/release-1.7.2
---
 .../python-modules/dict2xml/default.nix       | 22 ++++++++++++++-----
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/python-modules/dict2xml/default.nix b/pkgs/development/python-modules/dict2xml/default.nix
index 1316b9bc3044..7b18007dc169 100644
--- a/pkgs/development/python-modules/dict2xml/default.nix
+++ b/pkgs/development/python-modules/dict2xml/default.nix
@@ -1,21 +1,31 @@
 { lib
-, fetchPypi
 , buildPythonPackage
+, fetchFromGitHub
 , pythonOlder
+, setuptools
 }:
 
 buildPythonPackage rec {
   pname = "dict2xml";
-  version = "1.7.1";
-  format = "setuptools";
+  version = "1.7.2";
+  format = "pyproject";
 
   disabled = pythonOlder "3.7";
 
-  src = fetchPypi {
-    inherit pname version;
-    hash = "sha256-ZgCqMx8X7uODNhH3GJmkOnZhLKdVoVdpzyBJLEsaoBY=";
+  src = fetchFromGitHub {
+    owner = "delfick";
+    repo = "python-dict2xml";
+    rev = "refs/tags/release-${version}";
+    hash = "sha256-Ara+eWaUQv4VuzuVrpb5mjMXHHCxydS22glLsYz+UE0=";
   };
 
+  nativeBuildInputs = [
+    setuptools
+  ];
+
+  # Tests are inplemented in a custom DSL (RSpec)
+  doCheck = false;
+
   pythonImportsCheck = [
     "dict2xml"
   ];

From 0bc6b3e997704f0ce3579cf434cab07b2e6c8d89 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 24 Feb 2023 11:16:11 +0100
Subject: [PATCH 12/50] python310Packages.flask-autoindex: normalize pname

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

diff --git a/pkgs/development/python-modules/flask-autoindex/default.nix b/pkgs/development/python-modules/flask-autoindex/default.nix
index fff8859e86e0..ee6259d1e901 100644
--- a/pkgs/development/python-modules/flask-autoindex/default.nix
+++ b/pkgs/development/python-modules/flask-autoindex/default.nix
@@ -9,11 +9,12 @@
 }:
 
 buildPythonPackage rec {
-  pname = "Flask-AutoIndex";
+  pname = "flask-autoindex";
   version = "0.6.6";
 
   src = fetchPypi {
-    inherit pname version;
+    pname = "Flask-AutoIndex";
+    inherit version;
     sha256 = "ea319f7ccadf68ddf98d940002066278c779323644f9944b300066d50e2effc7";
   };
 

From 1f5555d0c4fe58d623e9d2ef5644f7a20ae3f831 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 24 Feb 2023 11:17:11 +0100
Subject: [PATCH 13/50] python310Packages.flask-autoindex: add
 pythonImportsCheck

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

diff --git a/pkgs/development/python-modules/flask-autoindex/default.nix b/pkgs/development/python-modules/flask-autoindex/default.nix
index ee6259d1e901..bba2d7a07fd2 100644
--- a/pkgs/development/python-modules/flask-autoindex/default.nix
+++ b/pkgs/development/python-modules/flask-autoindex/default.nix
@@ -26,6 +26,10 @@ buildPythonPackage rec {
     pathlib
   ];
 
+  pythonImportsCheck = [
+    "flask_autoindex"
+  ];
+
   meta = with lib; {
     description = "The mod_autoindex for Flask";
     longDescription = ''

From 5bf951f9f86d41204c5de2c77268a875ab58f9ad Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 24 Feb 2023 11:20:19 +0100
Subject: [PATCH 14/50] python310Packages.flask-autoindex: update homepage and
 add changelog

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

diff --git a/pkgs/development/python-modules/flask-autoindex/default.nix b/pkgs/development/python-modules/flask-autoindex/default.nix
index bba2d7a07fd2..d770ce55c8c8 100644
--- a/pkgs/development/python-modules/flask-autoindex/default.nix
+++ b/pkgs/development/python-modules/flask-autoindex/default.nix
@@ -36,8 +36,9 @@ buildPythonPackage rec {
       Flask-AutoIndex generates an index page for your Flask application automatically.
       The result is just like mod_autoindex, but the look is more awesome!
     '';
+    homepage = "https://flask-autoindex.readthedocs.io/";
+    changelog = "https://github.com/general03/flask-autoindex/blob/v${version}/CHANGELOG.md";
     license = licenses.bsd2;
     maintainers = teams.sage.members;
-    homepage = "https://pythonhosted.org/Flask-AutoIndex/";
   };
 }

From b958cbfeac0c4805d2ddda309d0a0addde3e66f5 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 24 Feb 2023 11:22:28 +0100
Subject: [PATCH 15/50] python310Packages.flask-autoindex: disable on
 unsupported Python releases

---
 .../python-modules/flask-autoindex/default.nix         | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/python-modules/flask-autoindex/default.nix b/pkgs/development/python-modules/flask-autoindex/default.nix
index d770ce55c8c8..5ca5f21e2eb7 100644
--- a/pkgs/development/python-modules/flask-autoindex/default.nix
+++ b/pkgs/development/python-modules/flask-autoindex/default.nix
@@ -1,16 +1,17 @@
 { lib
 , buildPythonPackage
-, pythonOlder
 , fetchPypi
 , flask
 , flask-silk
-, future
-, pathlib
+, pythonOlder
 }:
 
 buildPythonPackage rec {
   pname = "flask-autoindex";
   version = "0.6.6";
+  format = "setuptools";
+
+  disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     pname = "Flask-AutoIndex";
@@ -21,9 +22,6 @@ buildPythonPackage rec {
   propagatedBuildInputs = [
     flask
     flask-silk
-    future
-  ] ++ lib.optionals (pythonOlder "3.4") [
-    pathlib
   ];
 
   pythonImportsCheck = [

From c7708e48490f6aacb2e6b2368380d0c515823491 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 24 Feb 2023 11:39:47 +0100
Subject: [PATCH 16/50] python310Packages.flask-autoindex: mark as broken

Test suite fails with current Flask
https://github.com/general03/flask-autoindex/issues/67
---
 .../python-modules/flask-autoindex/default.nix           | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/pkgs/development/python-modules/flask-autoindex/default.nix b/pkgs/development/python-modules/flask-autoindex/default.nix
index 5ca5f21e2eb7..c8e14eaf35e3 100644
--- a/pkgs/development/python-modules/flask-autoindex/default.nix
+++ b/pkgs/development/python-modules/flask-autoindex/default.nix
@@ -3,7 +3,9 @@
 , fetchPypi
 , flask
 , flask-silk
+, future
 , pythonOlder
+, unittestCheckHook
 }:
 
 buildPythonPackage rec {
@@ -22,6 +24,11 @@ buildPythonPackage rec {
   propagatedBuildInputs = [
     flask
     flask-silk
+    future
+  ];
+
+  nativeCheckInputs = [
+    unittestCheckHook
   ];
 
   pythonImportsCheck = [
@@ -38,5 +45,7 @@ buildPythonPackage rec {
     changelog = "https://github.com/general03/flask-autoindex/blob/v${version}/CHANGELOG.md";
     license = licenses.bsd2;
     maintainers = teams.sage.members;
+    # https://github.com/general03/flask-autoindex/issues/67
+    broken = true;
   };
 }

From 9e93542f3d40f86f58982c3e6c7132339a3a06a1 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 24 Feb 2023 12:40:37 +0100
Subject: [PATCH 17/50] python310Packages.pytest-flask:  update meta

- add changelog
- update homepage
- update description
---
 pkgs/development/python-modules/pytest-flask/default.nix | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pytest-flask/default.nix b/pkgs/development/python-modules/pytest-flask/default.nix
index 5fdd5c757d41..dccad20a9f82 100644
--- a/pkgs/development/python-modules/pytest-flask/default.nix
+++ b/pkgs/development/python-modules/pytest-flask/default.nix
@@ -22,9 +22,10 @@ buildPythonPackage rec {
   nativeBuildInputs = [ setuptools-scm ];
 
   meta = with lib; {
-    homepage = "https://github.com/pytest-dev/pytest-flask/";
+    description = "A set of pytest fixtures to test Flask applications";
+    homepage = "https://pytest-flask.readthedocs.io/";
+    changelog = "https://github.com/pytest-dev/pytest-flask/blob/${version}/docs/changelog.rst";
     license = licenses.mit;
-    description = "A set of py.test fixtures to test Flask applications";
     maintainers = with maintainers; [ vanschelven ];
   };
 }

From ac12e61254079ab3e3776fa4348ffbf807a6a125 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 24 Feb 2023 12:42:12 +0100
Subject: [PATCH 18/50] python310Packages.pytest-flask: disable on unsupported
 Python releases

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

diff --git a/pkgs/development/python-modules/pytest-flask/default.nix b/pkgs/development/python-modules/pytest-flask/default.nix
index dccad20a9f82..c48f3ea58f0a 100644
--- a/pkgs/development/python-modules/pytest-flask/default.nix
+++ b/pkgs/development/python-modules/pytest-flask/default.nix
@@ -1,9 +1,11 @@
-{ lib, buildPythonPackage, fetchPypi, pytest, flask, werkzeug, setuptools-scm, isPy27 }:
+{ lib, buildPythonPackage, fetchPypi, pytest, flask, werkzeug, setuptools-scm, pythonOlder }:
 
 buildPythonPackage rec {
   pname = "pytest-flask";
   version = "1.2.0";
-  disabled = isPy27;
+  format = "setuptools";
+
+  disabled = pythonOlder "3.7";
 
   src = fetchPypi {
     inherit pname version;

From 1a9fa1a2f3efa483f8a6b8eafd4a17b5d86bdc91 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 24 Feb 2023 12:43:39 +0100
Subject: [PATCH 19/50] python310Packages.pytest-flask: add pythonImportsCheck

---
 .../python-modules/pytest-flask/default.nix          | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/pytest-flask/default.nix b/pkgs/development/python-modules/pytest-flask/default.nix
index c48f3ea58f0a..97f4a8fdc862 100644
--- a/pkgs/development/python-modules/pytest-flask/default.nix
+++ b/pkgs/development/python-modules/pytest-flask/default.nix
@@ -12,16 +12,22 @@ buildPythonPackage rec {
     sha256 = "46fde652f77777bf02dc91205aec4ce20cdf2acbbbd66a918ab91f5c14693d3d";
   };
 
-  doCheck = false;
+  nativeBuildInputs = [
+    setuptools-scm
+  ];
 
-  buildInputs = [ pytest ];
+  buildInputs = [
+    pytest
+  ];
 
   propagatedBuildInputs = [
     flask
     werkzeug
   ];
 
-  nativeBuildInputs = [ setuptools-scm ];
+  pythonImportsCheck = [
+    "pytest_flask"
+  ];
 
   meta = with lib; {
     description = "A set of pytest fixtures to test Flask applications";

From 8a8d28fa984eb0c29b03c874e3c4b4e5bfbe5842 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 24 Feb 2023 12:47:48 +0100
Subject: [PATCH 20/50] python310Packages.pytest-flask: switch to
 pytestCheckHook

---
 .../python-modules/pytest-flask/default.nix     | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pytest-flask/default.nix b/pkgs/development/python-modules/pytest-flask/default.nix
index 97f4a8fdc862..4db1967dc609 100644
--- a/pkgs/development/python-modules/pytest-flask/default.nix
+++ b/pkgs/development/python-modules/pytest-flask/default.nix
@@ -1,4 +1,13 @@
-{ lib, buildPythonPackage, fetchPypi, pytest, flask, werkzeug, setuptools-scm, pythonOlder }:
+{ lib
+, buildPythonPackage
+, fetchPypi
+, flask
+, pytest
+, pytestCheckHook
+, pythonOlder
+, setuptools-scm
+, werkzeug
+}:
 
 buildPythonPackage rec {
   pname = "pytest-flask";
@@ -9,7 +18,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "46fde652f77777bf02dc91205aec4ce20cdf2acbbbd66a918ab91f5c14693d3d";
+    hash = "sha256-Rv3mUvd3d78C3JEgWuxM4gzfKsu71mqRirkfXBRpPT0=";
   };
 
   nativeBuildInputs = [
@@ -25,6 +34,10 @@ buildPythonPackage rec {
     werkzeug
   ];
 
+  nativeCheckInputs = [
+    pytestCheckHook
+  ];
+
   pythonImportsCheck = [
     "pytest_flask"
   ];

From 0793c311f6acd01465bd39917bc6b83083b6558c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 24 Feb 2023 13:14:47 +0000
Subject: [PATCH 21/50] python310Packages.pipenv-poetry-migrate: 0.3.1 -> 0.3.2

---
 .../python-modules/pipenv-poetry-migrate/default.nix          | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pipenv-poetry-migrate/default.nix b/pkgs/development/python-modules/pipenv-poetry-migrate/default.nix
index 7e6998175af2..2175a08fd7b2 100644
--- a/pkgs/development/python-modules/pipenv-poetry-migrate/default.nix
+++ b/pkgs/development/python-modules/pipenv-poetry-migrate/default.nix
@@ -10,7 +10,7 @@
 }:
 
 buildPythonPackage rec {
-  version = "0.3.1";
+  version = "0.3.2";
   pname = "pipenv-poetry-migrate";
   format = "pyproject";
   disabled = pythonOlder "3.7";
@@ -19,7 +19,7 @@ buildPythonPackage rec {
     owner = "yhino";
     repo = "pipenv-poetry-migrate";
     rev = "refs/tags/v${version}";
-    hash = "sha256-HYzKp7ZYvJZX2CiHmR8wIeuL2a1xdk0Y87HLs9EP2tM=";
+    hash = "sha256-aPG0MgChnJbivJRjYx9aQE5OPhL4WlPyt5uKCHZUpeE=";
   };
 
   nativeBuildInputs = [

From 2b74c840a2b81af809c89f4ca3cce018f81838de Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 24 Feb 2023 15:35:12 +0100
Subject: [PATCH 22/50] python310Packages.aiolivisi: add changelog to meta

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

diff --git a/pkgs/development/python-modules/aiolivisi/default.nix b/pkgs/development/python-modules/aiolivisi/default.nix
index 05404b9ac777..34368c8539b1 100644
--- a/pkgs/development/python-modules/aiolivisi/default.nix
+++ b/pkgs/development/python-modules/aiolivisi/default.nix
@@ -43,6 +43,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Module to communicate with LIVISI Smart Home Controller";
     homepage = "https://github.com/StefanIacobLivisi/aiolivisi";
+    changelog = "https://github.com/StefanIacobLivisi/aiolivisi/releases/tag/${version}";
     license = with licenses; [ asl20 ];
     maintainers = with maintainers; [ fab ];
   };

From 15281dbd860cae62b7d3ee95dc1c782262dc9d52 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 24 Feb 2023 15:35:58 +0100
Subject: [PATCH 23/50] python310Packages.aiolivisi: 0.0.15 -> 0.0.16

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

diff --git a/pkgs/development/python-modules/aiolivisi/default.nix b/pkgs/development/python-modules/aiolivisi/default.nix
index 34368c8539b1..1f0c21a208f9 100644
--- a/pkgs/development/python-modules/aiolivisi/default.nix
+++ b/pkgs/development/python-modules/aiolivisi/default.nix
@@ -10,14 +10,14 @@
 
 buildPythonPackage rec {
   pname = "aiolivisi";
-  version = "0.0.15";
+  version = "0.0.16";
   format = "setuptools";
 
   disabled = pythonOlder "3.8";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-qRIdIptvlSyxFYfi7ZFeoZKjnVPzdDW9rBr+DjUsDXc=";
+    hash = "sha256-L7KeTdC3IPbXBLDkP86CyQ59s2bL4byxgKhl8YCmZHQ=";
   };
 
   postPatch = ''

From 87fbc2fd9709c0301872a89dce793481edc7492f Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 24 Feb 2023 18:07:39 +0100
Subject: [PATCH 24/50] python310Packages.odp-amsterdam: 5.0.1 -> 5.1.0

Diff: https://github.com/klaasnicolaas/python-odp-amsterdam/compare/refs/tags/v5.0.1...v5.1.0

Changelog: https://github.com/klaasnicolaas/python-odp-amsterdam/releases/tag/v5.1.0
---
 pkgs/development/python-modules/odp-amsterdam/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/odp-amsterdam/default.nix b/pkgs/development/python-modules/odp-amsterdam/default.nix
index 3021333091ab..1ad03a48a957 100644
--- a/pkgs/development/python-modules/odp-amsterdam/default.nix
+++ b/pkgs/development/python-modules/odp-amsterdam/default.nix
@@ -11,7 +11,7 @@
 
 buildPythonPackage rec {
   pname = "odp-amsterdam";
-  version = "5.0.1";
+  version = "5.1.0";
   format = "pyproject";
 
   disabled = pythonOlder "3.9";
@@ -20,7 +20,7 @@ buildPythonPackage rec {
     owner = "klaasnicolaas";
     repo = "python-odp-amsterdam";
     rev = "refs/tags/v${version}";
-    hash = "sha256-gRfOZwUguQgoROnqQuQWKOgubR3wjcf7Yfje2+4+CB0=";
+    hash = "sha256-ECRm9I/wHb82F8UBqPQWd60wLybIloCJiTxXDb3GnGs=";
   };
 
   postPatch = ''

From b1911f115dc231b851ce175bcb630f158b87a0a9 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 24 Feb 2023 17:46:30 +0000
Subject: [PATCH 25/50] python310Packages.slackclient: 3.19.5 -> 3.20.0

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

diff --git a/pkgs/development/python-modules/slackclient/default.nix b/pkgs/development/python-modules/slackclient/default.nix
index 08671a0e0f44..d6b34e825e1e 100644
--- a/pkgs/development/python-modules/slackclient/default.nix
+++ b/pkgs/development/python-modules/slackclient/default.nix
@@ -24,7 +24,7 @@
 
 buildPythonPackage rec {
   pname = "slackclient";
-  version = "3.19.5";
+  version = "3.20.0";
   format =  "setuptools";
 
   disabled = !isPy3k;
@@ -33,7 +33,7 @@ buildPythonPackage rec {
     owner = "slackapi";
     repo = "python-slack-sdk";
     rev = "refs/tags/v${version}";
-    hash = "sha256-/DVcnfHjvmRreHSlZbzxz6pbqytEUdqbaGbQVxIW4Qk=";
+    hash = "sha256-NlUmoOlRV7h7d553uX2tAWi2aWCAqpHflSUrdZxlaws=";
   };
 
   propagatedBuildInputs = [

From b295d44fdc74a1ddd126037aed19237d4015c7de Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 24 Feb 2023 22:06:49 +0100
Subject: [PATCH 26/50] python310Packages.slackclient: add changelog to meta

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

diff --git a/pkgs/development/python-modules/slackclient/default.nix b/pkgs/development/python-modules/slackclient/default.nix
index d6b34e825e1e..0199da3248dd 100644
--- a/pkgs/development/python-modules/slackclient/default.nix
+++ b/pkgs/development/python-modules/slackclient/default.nix
@@ -83,6 +83,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "A client for Slack, which supports the Slack Web API and Real Time Messaging (RTM) API";
     homepage = "https://github.com/slackapi/python-slackclient";
+    changelog = "https://github.com/slackapi/python-slack-sdk/releases/tag/v${version}";
     license = licenses.mit;
     maintainers = with maintainers; [ flokli psyanticy ];
   };

From af60c2e536d958dd822f592b15c58d377ecd51d1 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 24 Feb 2023 22:12:00 +0100
Subject: [PATCH 27/50] python310Packages.slackclient: update disabled

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

diff --git a/pkgs/development/python-modules/slackclient/default.nix b/pkgs/development/python-modules/slackclient/default.nix
index 0199da3248dd..fefc841941d9 100644
--- a/pkgs/development/python-modules/slackclient/default.nix
+++ b/pkgs/development/python-modules/slackclient/default.nix
@@ -6,7 +6,7 @@
 , fetchFromGitHub
 , flask
 , flask-sockets
-, isPy3k
+, pythonOlder
 , mock
 , moto
 , psutil
@@ -16,7 +16,6 @@
 , pytest-runner
 , requests
 , responses
-, six
 , sqlalchemy
 , websockets
 , websocket-client
@@ -27,7 +26,7 @@ buildPythonPackage rec {
   version = "3.20.0";
   format =  "setuptools";
 
-  disabled = !isPy3k;
+  disabled = pythonOlder "3.6";
 
   src = fetchFromGitHub {
     owner = "slackapi";
@@ -40,7 +39,6 @@ buildPythonPackage rec {
     aiohttp
     websocket-client
     requests
-    six
   ];
 
   nativeCheckInputs = [

From 5f7260b1600a0986e9715cad542427fac9fe78de Mon Sep 17 00:00:00 2001
From: Weijia Wang <9713184+wegank@users.noreply.github.com>
Date: Fri, 24 Feb 2023 23:21:13 +0200
Subject: [PATCH 28/50] python310Packages.dvc-task: 0.1.9 -> 0.1.11

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

diff --git a/pkgs/development/python-modules/dvc-task/default.nix b/pkgs/development/python-modules/dvc-task/default.nix
index 52d7e4706e4b..32e01a537635 100644
--- a/pkgs/development/python-modules/dvc-task/default.nix
+++ b/pkgs/development/python-modules/dvc-task/default.nix
@@ -15,7 +15,7 @@
 
 buildPythonPackage rec {
   pname = "dvc-task";
-  version = "0.1.9";
+  version = "0.1.11";
   format = "pyproject";
 
   disabled = pythonOlder "3.7";
@@ -24,7 +24,7 @@ buildPythonPackage rec {
     owner = "iterative";
     repo = pname;
     rev = "refs/tags/${version}";
-    hash = "sha256-+v1M8bKcHWUTz4DJ85tB1qdFYKI0k8TS/Dvf166o920=";
+    hash = "sha256-0KfH0/rghq+03sFLaR8lsIi4TJuwwca/YhQgILCdHq8=";
   };
 
   SETUPTOOLS_SCM_PRETEND_VERSION = version;

From 6bb802f7cf5a4d3b8dba8bb288bc40f7c317ebd3 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 24 Feb 2023 22:31:41 +0100
Subject: [PATCH 29/50] python310Packages.syncedlyrics: init at 0.4.0

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

diff --git a/pkgs/development/python-modules/syncedlyrics/default.nix b/pkgs/development/python-modules/syncedlyrics/default.nix
new file mode 100644
index 000000000000..661fd29a288c
--- /dev/null
+++ b/pkgs/development/python-modules/syncedlyrics/default.nix
@@ -0,0 +1,55 @@
+{ lib
+, beautifulsoup4
+, buildPythonPackage
+, fetchFromGitHub
+, poetry-core
+, pytestCheckHook
+, pythonOlder
+, rapidfuzz
+, requests
+}:
+
+buildPythonPackage rec {
+  pname = "syncedlyrics";
+  version = "0.4.0";
+  format = "pyproject";
+
+  disabled = pythonOlder "3.7";
+
+  src = fetchFromGitHub {
+    owner = "rtcq";
+    repo = pname;
+    rev = "refs/tags/v${version}";
+    hash = "sha256-dH9irIah9CdZ9Kv7bIymP1o5ifWEYCiSqegUpu8Y+Tg=";
+  };
+
+  nativeBuildInputs = [
+    poetry-core
+  ];
+
+  propagatedBuildInputs = [
+    requests
+    rapidfuzz
+    beautifulsoup4
+  ];
+
+  nativeCheckInputs = [
+    pytestCheckHook
+  ];
+
+  pythonImportsCheck = [
+    "syncedlyrics"
+  ];
+
+  pytestFlagsArray = [
+    "test.py::test_all_providers"
+  ];
+
+  meta = with lib; {
+    description = "Module to get LRC format (synchronized) lyrics";
+    homepage = "https://github.com/rtcq/syncedlyrics";
+    changelog = "https://github.com/rtcq/syncedlyrics/releases/tag/v${version}";
+    license = licenses.mit;
+    maintainers = with maintainers; [ fab ];
+  };
+}
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index b0482f822498..752a10e44aed 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -11240,6 +11240,8 @@ self: super: with self; {
 
   sympy = callPackage ../development/python-modules/sympy { };
 
+  syncedlyrics = callPackage ../development/python-modules/syncedlyrics { };
+
   syncer = callPackage ../development/python-modules/syncer { };
 
   synergy = callPackage ../development/python-modules/synergy { };

From e7a6b17d575040d4682cc0d92fda5bec28a38263 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Fri, 24 Feb 2023 21:32:03 +0000
Subject: [PATCH 30/50] python310Packages.vivisect: 1.0.8 -> 1.1.0

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

diff --git a/pkgs/development/python-modules/vivisect/default.nix b/pkgs/development/python-modules/vivisect/default.nix
index df0c72a34494..235fca39cd8f 100644
--- a/pkgs/development/python-modules/vivisect/default.nix
+++ b/pkgs/development/python-modules/vivisect/default.nix
@@ -21,11 +21,11 @@
 
 buildPythonPackage rec {
   pname = "vivisect";
-  version = "1.0.8";
+  version = "1.1.0";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-Y8y6sAQJa9baPPdhtuR9Jv1tJkNWJsS1hJ1lknkHWU4=";
+    sha256 = "sha256-tAIhsHFds3qwPngfOsR1+xDKgi29ACnvFAYoklRnCAI=";
   };
 
   postPatch = ''

From 4e2a30356795f3d021f15c7e25ff489ffa938d67 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 24 Feb 2023 23:17:00 +0100
Subject: [PATCH 31/50] python310Packages.vivisect: add changelog to meta

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

diff --git a/pkgs/development/python-modules/vivisect/default.nix b/pkgs/development/python-modules/vivisect/default.nix
index 235fca39cd8f..c00b4a142399 100644
--- a/pkgs/development/python-modules/vivisect/default.nix
+++ b/pkgs/development/python-modules/vivisect/default.nix
@@ -25,7 +25,7 @@ buildPythonPackage rec {
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "sha256-tAIhsHFds3qwPngfOsR1+xDKgi29ACnvFAYoklRnCAI=";
+    hash = "sha256-tAIhsHFds3qwPngfOsR1+xDKgi29ACnvFAYoklRnCAI=";
   };
 
   postPatch = ''
@@ -64,6 +64,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Pure python disassembler, debugger, emulator, and static analysis framework";
     homepage = "https://github.com/vivisect/vivisect";
+    changelog = "https://github.com/vivisect/vivisect/blob/v${version}/CHANGELOG.rst";
     license = licenses.asl20;
     maintainers = teams.determinatesystems.members;
   };

From 9a1ad8af4ffe0e0e496d10d0ef6bfaa1cab4e029 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 24 Feb 2023 23:18:36 +0100
Subject: [PATCH 32/50] python310Packages.vivisect: disable on unsupported
 Python releases

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

diff --git a/pkgs/development/python-modules/vivisect/default.nix b/pkgs/development/python-modules/vivisect/default.nix
index c00b4a142399..931a052d24f4 100644
--- a/pkgs/development/python-modules/vivisect/default.nix
+++ b/pkgs/development/python-modules/vivisect/default.nix
@@ -1,6 +1,6 @@
 { lib
 , buildPythonPackage
-, isPy3k
+, pythonOlder
 , fetchPypi
 , wrapQtAppsHook
 
@@ -22,6 +22,9 @@
 buildPythonPackage rec {
   pname = "vivisect";
   version = "1.1.0";
+  format = "setuptools";
+
+  disabled = pythonOlder "3.6";
 
   src = fetchPypi {
     inherit pname version;

From b87d093bd40fad701988b008cf01abf3f9cc0734 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 24 Feb 2023 23:25:30 +0100
Subject: [PATCH 33/50] python310Packages.pontos: 23.2.9 -> 23.2.10

Changelog: https://github.com/greenbone/pontos/releases/tag/v23.2.10
---
 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 8bcc74025698..e828149b9cdd 100644
--- a/pkgs/development/python-modules/pontos/default.nix
+++ b/pkgs/development/python-modules/pontos/default.nix
@@ -16,7 +16,7 @@
 
 buildPythonPackage rec {
   pname = "pontos";
-  version = "23.2.9";
+  version = "23.2.10";
   format = "pyproject";
 
   disabled = pythonOlder "3.7";
@@ -25,7 +25,7 @@ buildPythonPackage rec {
     owner = "greenbone";
     repo = pname;
     rev = "refs/tags/v${version}";
-    hash = "sha256-+oHqBopA2FLrDdxsVQhciW4ZXluZn+z05LmHtyDtFyI=";
+    hash = "sha256-sXCBuN6H5/7cyOW7LuP5cJ5NixN3KWHJyJudT24rpYg=";
   };
 
   nativeBuildInputs = [

From f12cce600704efb9a33740b2b8575ed034c9ba6b Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Fri, 24 Feb 2023 23:54:59 +0100
Subject: [PATCH 34/50] python310Packages.dvc-task: add changelog to meta

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

diff --git a/pkgs/development/python-modules/dvc-task/default.nix b/pkgs/development/python-modules/dvc-task/default.nix
index 32e01a537635..21e079492fea 100644
--- a/pkgs/development/python-modules/dvc-task/default.nix
+++ b/pkgs/development/python-modules/dvc-task/default.nix
@@ -54,6 +54,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "Celery task queue used in DVC";
     homepage = "https://github.com/iterative/dvc-task";
+    changelog = "https://github.com/iterative/dvc-task/releases/tag/${version}";
     license = licenses.asl20;
     maintainers = with maintainers; [ ];
   };

From 744bc24e55cf235cafe5318b519bbc54ee2cb75c Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 25 Feb 2023 00:01:18 +0100
Subject: [PATCH 35/50] python310Packages.pipenv-poetry-migrate: add changelog
 to meta

---
 .../python-modules/pipenv-poetry-migrate/default.nix       | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/pipenv-poetry-migrate/default.nix b/pkgs/development/python-modules/pipenv-poetry-migrate/default.nix
index 2175a08fd7b2..33831490708f 100644
--- a/pkgs/development/python-modules/pipenv-poetry-migrate/default.nix
+++ b/pkgs/development/python-modules/pipenv-poetry-migrate/default.nix
@@ -10,9 +10,10 @@
 }:
 
 buildPythonPackage rec {
-  version = "0.3.2";
   pname = "pipenv-poetry-migrate";
+  version = "0.3.2";
   format = "pyproject";
+
   disabled = pythonOlder "3.7";
 
   src = fetchFromGitHub {
@@ -33,7 +34,8 @@ buildPythonPackage rec {
   ];
 
   postPatch = ''
-    substituteInPlace pyproject.toml --replace 'typer = "^0.4.0"' 'typer = ">=0.4"'
+    substituteInPlace pyproject.toml \
+      --replace 'typer = "^0.4.0"' 'typer = ">=0.4"'
   '';
 
   nativeCheckInputs = [
@@ -43,6 +45,7 @@ buildPythonPackage rec {
   meta = with lib; {
     description = "This is simple migration script, migrate pipenv to poetry";
     homepage = "https://github.com/yhino/pipenv-poetry-migrate";
+    changelog = "https://github.com/yhino/pipenv-poetry-migrate/blob/v${version}/CHANGELOG.md";
     license = licenses.asl20;
     maintainers = with maintainers; [ gador ];
   };

From 273c9629f647956a543afebc7171514eb476e6d5 Mon Sep 17 00:00:00 2001
From: lunik1 <ch.gpg@themaw.xyz>
Date: Fri, 24 Feb 2023 23:31:42 +0000
Subject: [PATCH 36/50] =?UTF-8?q?iosevka:=2017.1.0=20=E2=86=92=2019.0.1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Diff: https://github.com/be5invis/iosevka/compare/v17.1.0...v19.0.1
---
 pkgs/data/fonts/iosevka/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/data/fonts/iosevka/default.nix b/pkgs/data/fonts/iosevka/default.nix
index f9609c6c485b..3a1957ea96d0 100644
--- a/pkgs/data/fonts/iosevka/default.nix
+++ b/pkgs/data/fonts/iosevka/default.nix
@@ -55,16 +55,16 @@ assert (extraParameters != null) -> set != null;
 
 buildNpmPackage rec {
   pname = if set != null then "iosevka-${set}" else "iosevka";
-  version = "17.1.0";
+  version = "19.0.1";
 
   src = fetchFromGitHub {
     owner = "be5invis";
     repo = "iosevka";
     rev = "v${version}";
-    hash = "sha256-xGRymDhkNP9b2JYTEu4M/CrRINmMGY2S5ZuM3Ot1wGg=";
+    hash = "sha256-nkW9sp7AdaClNTuyC97S0bS6vgVeJQBphfoVOaexnBs=";
   };
 
-  npmDepsHash = "sha256-Ncf07ggyOnz/2SpgdmaYS2X/8Bad+J2sz8Yyx9Iri3E=";
+  npmDepsHash = "sha256-LWFHlVGYvOJzdCT2Y86VSzsf/fLJ3B9cJAkBkZyUrMM=";
 
   nativeBuildInputs = [
     remarshal

From 28ca776339a8877c0e0e9626e3fedb6963a2eb09 Mon Sep 17 00:00:00 2001
From: Bobby Rong <rjl931189261@126.com>
Date: Sat, 25 Feb 2023 09:51:05 +0800
Subject: [PATCH 37/50] monitor: 0.15.1 -> 0.16.0

https://github.com/stsdc/monitor/compare/0.15.1...0.16.0
---
 pkgs/applications/system/monitor/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/applications/system/monitor/default.nix b/pkgs/applications/system/monitor/default.nix
index f247b1292c4c..eb8d892dd62e 100644
--- a/pkgs/applications/system/monitor/default.nix
+++ b/pkgs/applications/system/monitor/default.nix
@@ -27,13 +27,13 @@
 
 stdenv.mkDerivation rec {
   pname = "monitor";
-  version = "0.15.1";
+  version = "0.16.0";
 
   src = fetchFromGitHub {
     owner = "stsdc";
     repo = "monitor";
     rev = version;
-    sha256 = "sha256-3Kgpb0gOVpsufevz4ZIsIngl/Djckft8nJW+wBgfp4A=";
+    sha256 = "sha256-+B3h7ydN+ISElpOMMCcKORYnq1MaMhvr+4I2qHJ26As=";
     fetchSubmodules = true;
   };
 

From 1ee3309f0f78668a9934e55a29a439fb0f06c90b Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 25 Feb 2023 03:39:56 +0000
Subject: [PATCH 38/50] talosctl: 1.3.4 -> 1.3.5

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

diff --git a/pkgs/applications/networking/cluster/talosctl/default.nix b/pkgs/applications/networking/cluster/talosctl/default.nix
index bad060ba41a1..4c8cbda6945b 100644
--- a/pkgs/applications/networking/cluster/talosctl/default.nix
+++ b/pkgs/applications/networking/cluster/talosctl/default.nix
@@ -2,16 +2,16 @@
 
 buildGoModule rec {
   pname = "talosctl";
-  version = "1.3.4";
+  version = "1.3.5";
 
   src = fetchFromGitHub {
     owner = "siderolabs";
     repo = "talos";
     rev = "v${version}";
-    hash = "sha256-bgwSkI5XxtPhm4XrDPUhOErHawkLf34tFsw5SkQrm74=";
+    hash = "sha256-LXAQSz39dtfSN6ks6UYJtXiTjcVz/a+f+JIsgC3MXic=";
   };
 
-  vendorHash = "sha256-hkfzn9wOc7W0CIs72Cn3qZ5iFrDAffSFa4BnRt6fsF8=";
+  vendorHash = "sha256-ctkeEGrh8tzWvEsVhcc2Cl3rAMkYQtcxD1b27ux1QDM=";
 
   ldflags = [ "-s" "-w" ];
 

From 6661e6245f8bb3aeec88253e22b4affc5887fe18 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 25 Feb 2023 05:41:59 +0000
Subject: [PATCH 39/50] popeye: 0.10.1 -> 0.11.1

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

diff --git a/pkgs/applications/networking/cluster/popeye/default.nix b/pkgs/applications/networking/cluster/popeye/default.nix
index 75f14c69bca7..c65c795a173b 100644
--- a/pkgs/applications/networking/cluster/popeye/default.nix
+++ b/pkgs/applications/networking/cluster/popeye/default.nix
@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   pname = "popeye";
-  version = "0.10.1";
+  version = "0.11.1";
 
   src = fetchFromGitHub {
     rev = "v${version}";
     owner = "derailed";
     repo = "popeye";
-    sha256 = "sha256-GETCwj9T1D6paG56LT/N2YkISE7UBpt/femwvHyHHJE=";
+    sha256 = "sha256-A1jUlEgjBoiN+NYwpyW/1eYzkCK3UuPID++fu+zGvzk=";
   };
 
   ldflags = [
@@ -17,7 +17,7 @@ buildGoModule rec {
     "-X github.com/derailed/popeye/cmd.commit=${version}"
   ];
 
-  vendorSha256 = "sha256-ZRDcZbaoGJ8jgSwMXTTcWSv/4dlOoTNcuj/bN4QYHNE=";
+  vendorHash = "sha256-MEsChBBn0mixgJ7pzRoqAqup75b/mVv6k3OMmzgyLC4=";
 
   doInstallCheck = true;
   installCheckPhase = ''

From 9e3c0b71567da417aac8c1c5c330b96b3d39c74c Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 25 Feb 2023 06:16:14 +0000
Subject: [PATCH 40/50] istioctl: 1.17.0 -> 1.17.1

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

diff --git a/pkgs/applications/networking/cluster/istioctl/default.nix b/pkgs/applications/networking/cluster/istioctl/default.nix
index fc7e0be004c9..a45002e34b70 100644
--- a/pkgs/applications/networking/cluster/istioctl/default.nix
+++ b/pkgs/applications/networking/cluster/istioctl/default.nix
@@ -2,15 +2,15 @@
 
 buildGoModule rec {
   pname = "istioctl";
-  version = "1.17.0";
+  version = "1.17.1";
 
   src = fetchFromGitHub {
     owner = "istio";
     repo = "istio";
     rev = version;
-    sha256 = "sha256-cMpFf+VTTH8d1KpvbUoB2pJYPp3FHhRthut8tjTEZtc=";
+    sha256 = "sha256-6YoznN/wqgmNzBV0ukySwSQvnF4qQeH52uXlEgZTpig=";
   };
-  vendorHash = "sha256-C8UyfVCCkLAU9/qY9Kcv8TKKfG3rLNzu8mfi23O18rU=";
+  vendorHash = "sha256-9A4Du5expdbFKFIrcPTADyRINhiPpsboqsbszg638LY=";
 
   nativeBuildInputs = [ installShellFiles ];
 

From 1c3af67db3464ff2c7fc625bb0f280dc576be6ee Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 25 Feb 2023 06:30:43 +0000
Subject: [PATCH 41/50] python310Packages.kbcstorage: 0.4.1 -> 0.5.0

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

diff --git a/pkgs/development/python-modules/kbcstorage/default.nix b/pkgs/development/python-modules/kbcstorage/default.nix
index 057f5f76a9f9..fa984230a96d 100644
--- a/pkgs/development/python-modules/kbcstorage/default.nix
+++ b/pkgs/development/python-modules/kbcstorage/default.nix
@@ -17,14 +17,14 @@
 
 buildPythonPackage rec {
     pname = "sapi-python-client";
-    version = "0.4.1";
+    version = "0.5.0";
     format = "setuptools";
 
     src = fetchFromGitHub {
       owner = "keboola";
       repo = pname;
-      rev  = version;
-      sha256 = "189dzj06vzp7366h2qsfvbjmw9qgl7jbp8syhynn9yvrjqp4k8h3";
+      rev = "refs/tags/${version}";
+      sha256 = "sha256-79v9quhzeNRXcm6Z7BhD76lTZtw+Z0T1yK3zhrdreXw=";
     };
 
     SETUPTOOLS_SCM_PRETEND_VERSION = version;

From 2dada4d7edd30f4ebbb373ab9f26ccfebc6ace2d Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 25 Feb 2023 06:49:26 +0000
Subject: [PATCH 42/50] python310Packages.types-docutils: 0.19.1.5 -> 0.19.1.6

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

diff --git a/pkgs/development/python-modules/types-docutils/default.nix b/pkgs/development/python-modules/types-docutils/default.nix
index 409fced16937..d42e2c0a2c84 100644
--- a/pkgs/development/python-modules/types-docutils/default.nix
+++ b/pkgs/development/python-modules/types-docutils/default.nix
@@ -5,12 +5,12 @@
 
 buildPythonPackage rec {
   pname = "types-docutils";
-  version = "0.19.1.5";
+  version = "0.19.1.6";
   format = "setuptools";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-uLSJwqDR3T5lu9i0HgX2vxMHVTUV3NowGX1j0bV2pe4=";
+    hash = "sha256-ozSnA6hoiRDQhpRk8fb4vTMNdYQ72rT4k1R7+ylBegE=";
   };
 
   # Module doesn't have tests

From dfd0441c5d24eff43a4a80836ece695958cdc856 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 25 Feb 2023 08:28:39 +0000
Subject: [PATCH 43/50] mame: 0.251 -> 0.252

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

diff --git a/pkgs/applications/emulators/mame/default.nix b/pkgs/applications/emulators/mame/default.nix
index 93348862104f..ac5f0f5ce034 100644
--- a/pkgs/applications/emulators/mame/default.nix
+++ b/pkgs/applications/emulators/mame/default.nix
@@ -39,14 +39,14 @@ let
 in
 stdenv.mkDerivation rec {
   pname = "mame";
-  version = "0.251";
+  version = "0.252";
   srcVersion = builtins.replaceStrings [ "." ] [ "" ] version;
 
   src = fetchFromGitHub {
     owner = "mamedev";
     repo = "mame";
     rev = "mame${srcVersion}";
-    hash = "sha256-x+QV4gunnERBHyYB2fXJ2LvMv437Z2omvk+fYkmZfqA=";
+    hash = "sha256-snef00pTbukiLQp8eAMfuIqNV3l0wP1+KlpFnS3iKFg=";
   };
 
   outputs = [ "out" "tools" ];

From 6dd6e88a881432cadaa7e50a0ff94116ba1ddd7a Mon Sep 17 00:00:00 2001
From: Thomas Gerbet <thomas@gerbet.me>
Date: Sat, 25 Feb 2023 10:01:44 +0100
Subject: [PATCH 44/50] cosign: 1.13.1 -> 2.0.0

https://github.com/sigstore/cosign/releases/tag/v2.0.0
https://github.com/sigstore/cosign/blob/69c9b37f2a021326c67b2aa9552c790e12ae5fb8/CHANGELOG.md
---
 pkgs/tools/security/cosign/default.nix | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/security/cosign/default.nix b/pkgs/tools/security/cosign/default.nix
index fc1b583ccc7f..96dc1fe30cbf 100644
--- a/pkgs/tools/security/cosign/default.nix
+++ b/pkgs/tools/security/cosign/default.nix
@@ -2,13 +2,13 @@
 
 buildGoModule rec {
   pname = "cosign";
-  version = "1.13.1";
+  version = "2.0.0";
 
   src = fetchFromGitHub {
     owner = "sigstore";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-R7MhfAnVJJ2NK8zV408xAk8Q6aWn9Gw6DOmFFX26x1Q=";
+    sha256 = "sha256-919oxYi4e56EhSBN0FdcEZBA430owaDnKHkgTneScXw=";
   };
 
   buildInputs = lib.optional (stdenv.isLinux && pivKeySupport) (lib.getDev pcsclite)
@@ -16,7 +16,7 @@ buildGoModule rec {
 
   nativeBuildInputs = [ pkg-config installShellFiles ];
 
-  vendorSha256 = "sha256-DpPEDttQnRGHVNiIpMGj14KvZEGR0Y80sZOffjQ3UHk=";
+  vendorSha256 = "sha256-DtFywktiGHlsdOFVpKUtKLYXJYwQYy1VISfUYVXlOG8=";
 
   subPackages = [
     "cmd/cosign"
@@ -35,8 +35,9 @@ buildGoModule rec {
     # test all paths
     unset subPackages
 
+    rm pkg/cosign/ctlog_test.go # Require network access
     rm pkg/cosign/tlog_test.go # Require network access
-    rm pkg/cosign/verify_test.go # Require network access
+    rm cmd/cosign/cli/verify/verify_blob_attestation_test.go # Require network access
   '';
 
   postInstall = ''

From d25023bdc029e2cba8a5643df7e57602bf7b702d Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 25 Feb 2023 10:46:15 +0100
Subject: [PATCH 45/50] python310Packages.kbcstorage: add changelog to meta

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

diff --git a/pkgs/development/python-modules/kbcstorage/default.nix b/pkgs/development/python-modules/kbcstorage/default.nix
index fa984230a96d..9fe883a6b50f 100644
--- a/pkgs/development/python-modules/kbcstorage/default.nix
+++ b/pkgs/development/python-modules/kbcstorage/default.nix
@@ -24,7 +24,7 @@ buildPythonPackage rec {
       owner = "keboola";
       repo = pname;
       rev = "refs/tags/${version}";
-      sha256 = "sha256-79v9quhzeNRXcm6Z7BhD76lTZtw+Z0T1yK3zhrdreXw=";
+      hash = "sha256-79v9quhzeNRXcm6Z7BhD76lTZtw+Z0T1yK3zhrdreXw=";
     };
 
     SETUPTOOLS_SCM_PRETEND_VERSION = version;
@@ -58,6 +58,7 @@ buildPythonPackage rec {
     meta = with lib; {
       description = "Keboola Connection Storage API client";
       homepage = "https://github.com/keboola/sapi-python-client";
+      changelog = "https://github.com/keboola/sapi-python-client/releases/tag/${version}";
       maintainers = with maintainers; [ mrmebelman ];
       license = licenses.mit;
     };

From ecb41a93702034db48deb1055dd09ec68e8aa852 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 25 Feb 2023 10:54:20 +0100
Subject: [PATCH 46/50] python310Packages.kbcstorage: use nixpkgs-fmt

- disable on unsupported Python releases
---
 .../python-modules/kbcstorage/default.nix     | 80 ++++++++++---------
 1 file changed, 41 insertions(+), 39 deletions(-)

diff --git a/pkgs/development/python-modules/kbcstorage/default.nix b/pkgs/development/python-modules/kbcstorage/default.nix
index 9fe883a6b50f..199ab908efd7 100644
--- a/pkgs/development/python-modules/kbcstorage/default.nix
+++ b/pkgs/development/python-modules/kbcstorage/default.nix
@@ -1,6 +1,7 @@
 { lib
 , buildPythonPackage
 , fetchFromGitHub
+, pythonOlder
 
 # build
 , setuptools-scm
@@ -14,52 +15,53 @@
 , responses
 , unittestCheckHook
 }:
-
 buildPythonPackage rec {
-    pname = "sapi-python-client";
-    version = "0.5.0";
-    format = "setuptools";
+  pname = "sapi-python-client";
+  version = "0.5.0";
+  format = "setuptools";
 
-    src = fetchFromGitHub {
-      owner = "keboola";
-      repo = pname;
-      rev = "refs/tags/${version}";
-      hash = "sha256-79v9quhzeNRXcm6Z7BhD76lTZtw+Z0T1yK3zhrdreXw=";
-    };
+  disabled = pythonOlder "3.7";
 
-    SETUPTOOLS_SCM_PRETEND_VERSION = version;
+  src = fetchFromGitHub {
+    owner = "keboola";
+    repo = pname;
+    rev = "refs/tags/${version}";
+    hash = "sha256-79v9quhzeNRXcm6Z7BhD76lTZtw+Z0T1yK3zhrdreXw=";
+  };
 
-    nativeBuildInputs = [
-      setuptools-scm
-    ];
+  SETUPTOOLS_SCM_PRETEND_VERSION = version;
 
-    propagatedBuildInputs = [
-      azure-storage-blob
-      boto3
-      requests
-    ];
+  nativeBuildInputs = [
+    setuptools-scm
+  ];
 
-    # requires API token and an active keboola bucket
-    # ValueError: Root URL is required.
-    doCheck = false;
+  propagatedBuildInputs = [
+    azure-storage-blob
+    boto3
+    requests
+  ];
 
-    nativeCheckInputs = [
-      unittestCheckHook
-      responses
-    ];
+  # Requires API token and an active Keboola bucket
+  # ValueError: Root URL is required.
+  doCheck = false;
 
-    pythonImportsCheck = [
-      "kbcstorage"
-      "kbcstorage.buckets"
-      "kbcstorage.client"
-      "kbcstorage.tables"
-    ];
+  nativeCheckInputs = [
+    unittestCheckHook
+    responses
+  ];
 
-    meta = with lib; {
-      description = "Keboola Connection Storage API client";
-      homepage = "https://github.com/keboola/sapi-python-client";
-      changelog = "https://github.com/keboola/sapi-python-client/releases/tag/${version}";
-      maintainers = with maintainers; [ mrmebelman ];
-      license = licenses.mit;
-    };
+  pythonImportsCheck = [
+    "kbcstorage"
+    "kbcstorage.buckets"
+    "kbcstorage.client"
+    "kbcstorage.tables"
+  ];
+
+  meta = with lib; {
+    description = "Keboola Connection Storage API client";
+    homepage = "https://github.com/keboola/sapi-python-client";
+    changelog = "https://github.com/keboola/sapi-python-client/releases/tag/${version}";
+    license = licenses.mit;
+    maintainers = with maintainers; [ mrmebelman ];
+  };
 }

From b707eb4409fa6499546b7899fe8cc891e72c9e8e Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 25 Feb 2023 09:11:23 +0000
Subject: [PATCH 47/50] meilisearch: 1.0.1 -> 1.0.2

---
 pkgs/servers/search/meilisearch/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/servers/search/meilisearch/default.nix b/pkgs/servers/search/meilisearch/default.nix
index b60dded03273..eb88b7345d9d 100644
--- a/pkgs/servers/search/meilisearch/default.nix
+++ b/pkgs/servers/search/meilisearch/default.nix
@@ -8,7 +8,7 @@
 , nixosTests
 }:
 
-let version = "1.0.1";
+let version = "1.0.2";
 in
 rustPlatform.buildRustPackage {
   pname = "meilisearch";
@@ -18,10 +18,10 @@ rustPlatform.buildRustPackage {
     owner = "meilisearch";
     repo = "MeiliSearch";
     rev = "refs/tags/v${version}";
-    hash = "sha256-PARvz1LEEgmelku69ywKditAx0G4xJnEL6dYIh1IYTM=";
+    hash = "sha256-2HfwNoluPPOOAdCaqUVaZcAd8M2naPYAsphZO1Inefg=";
   };
 
-  cargoHash = "sha256-p9X2l5nUR02Emo6dt6LsrO2Vef4dbCvCljaXL9imnFs=";
+  cargoHash = "sha256-HuVNI1Y+rhuAzAkDUuJJCZ500WuGPgABFfEbJNXaVpA=";
 
   # Default features include mini dashboard which downloads something from the internet.
   buildNoDefaultFeatures = true;

From 6dcf81061ae003e14ffb410382704f420ee178a6 Mon Sep 17 00:00:00 2001
From: davidak <git@davidak.de>
Date: Sat, 25 Feb 2023 11:19:16 +0100
Subject: [PATCH 48/50] p3x-onenote: set supported platforms

fixing build issue on not supported platforms
---
 pkgs/applications/office/p3x-onenote/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/applications/office/p3x-onenote/default.nix b/pkgs/applications/office/p3x-onenote/default.nix
index 43b511c74a6b..b2554cea7a69 100644
--- a/pkgs/applications/office/p3x-onenote/default.nix
+++ b/pkgs/applications/office/p3x-onenote/default.nix
@@ -46,6 +46,6 @@ appimageTools.wrapType2 rec {
     description = "Linux Electron Onenote - A Linux compatible version of OneNote";
     license = licenses.mit;
     maintainers = with maintainers; [ tiagolobocastro ];
-    platforms = platforms.linux;
+    platforms = [ "x86_64-linux" "aarch64-linux" "armv7l-linux" ];
   };
 }

From f55af2ad596b019807f7669239e4444084c268c0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alper=20=C3=87elik?= <dev.alpercelik@gmail.com>
Date: Fri, 24 Feb 2023 23:15:17 +0300
Subject: [PATCH 49/50] magic-enum: fix build issues on gcc 12

Update pkgs/development/libraries/magic-enum/default.nix

Co-authored-by: Weijia Wang <9713184+wegank@users.noreply.github.com>
---
 pkgs/development/libraries/magic-enum/default.nix | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/magic-enum/default.nix b/pkgs/development/libraries/magic-enum/default.nix
index c98143dcc4d6..ccf439ca9190 100644
--- a/pkgs/development/libraries/magic-enum/default.nix
+++ b/pkgs/development/libraries/magic-enum/default.nix
@@ -15,7 +15,12 @@ stdenv.mkDerivation rec{
 
   nativeBuildInputs = [ cmake ];
 
-  doCheck = true;
+  # disable tests until upstream fixes build issues with gcc 12
+  # see https://github.com/Neargye/magic_enum/issues/235
+  doCheck = false;
+  cmakeFlags = [
+    "-DMAGIC_ENUM_OPT_BUILD_TESTS=OFF"
+  ];
 
   meta = with lib;{
     description = "Static reflection for enums (to string, from string, iteration) for modern C++";

From 05e60af5f2e42487166ba49c5834e5ad2642e914 Mon Sep 17 00:00:00 2001
From: "R. Ryantm" <ryantm-bot@ryantm.com>
Date: Sat, 25 Feb 2023 11:00:12 +0000
Subject: [PATCH 50/50] subfinder: 2.5.5 -> 2.5.6

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

diff --git a/pkgs/tools/networking/subfinder/default.nix b/pkgs/tools/networking/subfinder/default.nix
index 88c87eabe195..d56da29687e6 100644
--- a/pkgs/tools/networking/subfinder/default.nix
+++ b/pkgs/tools/networking/subfinder/default.nix
@@ -5,16 +5,16 @@
 
 buildGoModule rec {
   pname = "subfinder";
-  version = "2.5.5";
+  version = "2.5.6";
 
   src = fetchFromGitHub {
     owner = "projectdiscovery";
     repo = pname;
     rev = "v${version}";
-    sha256 = "sha256-Wc/cm3vePIXBCcInsLZ3n/QV/3qHmGGrPr6coUqJPpE=";
+    sha256 = "sha256-Ii9R1Iwqgo0kFQgoZStz4qAKb31Y67qCa+zIaEnXuRU=";
   };
 
-  vendorSha256 = "sha256-uynfhwCR13UZR/Bk/oPwMuifLGn33qVPEyrpOSgeafY=";
+  vendorHash = "sha256-dSKjtgxJlHUL8MQTnrsjXDqQ17Ywdyq4AVWy3rv/GFY=";
 
   modRoot = "./v2";