Merge pull request #208006 from fabaff/aiosqlite-bump

python310Packages.aiosqlite: 0.17.0 -> 0.18.0 

2 files changed, 42 insertions, 21 deletions

diff --git a/pkgs/applications/backup/unifi-protect-backup/default.nix b/pkgs/applications/backup/unifi-protect-backup/default.nix
index 16169e98b1ff..d1610516f6f6 100644
--- a/pkgs/applications/backup/unifi-protect-backup/default.nix
+++ b/pkgs/applications/backup/unifi-protect-backup/default.nix
@@ -1,4 +1,7 @@
-{ fetchFromGitHub, python3, lib }:
+{ lib
+, fetchFromGitHub
+, python3
+}:
 
 python3.pkgs.buildPythonApplication rec {
   pname = "unifi-protect-backup";
@@ -13,15 +16,20 @@ python3.pkgs.buildPythonApplication rec {
     hash = "sha256-Z8qK7LprMyXl5irx9Xrs/RgqvNcFVBqLBSljovr6oiE=";
   };
 
-  preBuild = ''
-    sed -i 's_click = "8.0.1"_click = "^8"_' pyproject.toml
-    sed -i 's_pyunifiprotect = .*_pyunifiprotect = "*"_' pyproject.toml
-    sed -i 's_aiorun = .*_aiorun = "*"_' pyproject.toml
-    sed -i '/pylint/d' pyproject.toml
-  '';
+  pythonRelaxDeps = [
+    "aiorun"
+    "aiosqlite"
+    "click"
+    "pyunifiprotect"
+  ];
+
+  pythonRemoveDeps = [
+    "pylint"
+  ];
 
   nativeBuildInputs = with python3.pkgs; [
     poetry-core
+    pythonRelaxDepsHook
   ];
 
   propagatedBuildInputs = with python3.pkgs; [
@@ -39,7 +47,8 @@ python3.pkgs.buildPythonApplication rec {
   meta = with lib; {
     description = "Python tool to backup unifi event clips in realtime";
     homepage = "https://github.com/ep1cman/unifi-protect-backup";
-    maintainers = with maintainers; [ ajs124 ];
+    changelog = "https://github.com/ep1cman/unifi-protect-backup/blob/v${version}/CHANGELOG.md";
     license = licenses.mit;
+    maintainers = with maintainers; [ ajs124 ];
   };
 }
diff --git a/pkgs/development/python-modules/aiosqlite/default.nix b/pkgs/development/python-modules/aiosqlite/default.nix
index 022e34e23c1b..eb85dccf50d2 100644
--- a/pkgs/development/python-modules/aiosqlite/default.nix
+++ b/pkgs/development/python-modules/aiosqlite/default.nix
@@ -1,37 +1,49 @@
 { lib
 , aiounittest
 , buildPythonPackage
-, fetchPypi
-, isPy27
+, fetchFromGitHub
+, flit-core
 , pytestCheckHook
-, typing-extensions
+, pythonOlder
 }:
 
 buildPythonPackage rec {
   pname = "aiosqlite";
-  version = "0.17.0";
-  disabled = isPy27;
+  version = "0.18.0";
+  format = "pyproject";
 
-  src = fetchPypi {
-    inherit pname version;
-    sha256 = "sha256-8OaswkvEhkFJJnrIL7Rt+zvkRV+Z/iHfgmCcxua67lE=";
+  disabled = pythonOlder "3.8";
+
+  src = fetchFromGitHub {
+    owner = "omnilib";
+    repo = pname;
+    rev = "refs/tags/v${version}";
+    hash = "sha256-yPGSKqjOz1EY5/V0oKz2EiZ90q2O4TINoXdxHuB7Gqk=";
   };
 
+  nativeBuildInputs = [
+    flit-core
+  ];
+
   checkInputs = [
     aiounittest
     pytestCheckHook
-    typing-extensions
   ];
 
-  # tests are not pick-up automatically by the hook
-  pytestFlagsArray = [ "aiosqlite/tests/*.py" ];
+  # Tests are not pick-up automatically by the hook
+  pytestFlagsArray = [
+    "aiosqlite/tests/*.py"
+  ];
 
-  pythonImportsCheck = [ "aiosqlite" ];
+  pythonImportsCheck = [
+    "aiosqlite"
+  ];
 
   meta = with lib; {
     description = "Asyncio bridge to the standard sqlite3 module";
     homepage = "https://github.com/jreese/aiosqlite";
+    changelog = "https://github.com/omnilib/aiosqlite/blob/v${version}/CHANGELOG.md";
     license = licenses.mit;
-    maintainers = [ maintainers.costrouc ];
+    maintainers = with maintainers; [ costrouc ];
   };
 }