about summary refs log tree commit diff
diff options
context:
space:
mode:
authorFabian Affolter <fabian@affolter-engineering.ch>2024-04-04 00:20:00 +0200
committerGitHub <noreply@github.com>2024-04-04 00:20:00 +0200
commita92caa6271e87566876dd50accc2108799148d5e (patch)
tree05509fdde65a4d544247e0ffe2271932856a5415
parentdb653a454dc280c40cb701a66609b581ed65e8c4 (diff)
parentc6f37df6466ac8564bad211225b0377c5065f331 (diff)
Merge pull request #296726 from r-ryantm/auto-update/python311Packages.aiomisc
python311Packages.aiomisc: 17.5.2 -> 17.5.4
-rw-r--r--pkgs/development/python-modules/aiomisc/default.nix90
1 files changed, 38 insertions, 52 deletions
diff --git a/pkgs/development/python-modules/aiomisc/default.nix b/pkgs/development/python-modules/aiomisc/default.nix
index 92e016c786b8a..e3b0b7de9b486 100644
--- a/pkgs/development/python-modules/aiomisc/default.nix
+++ b/pkgs/development/python-modules/aiomisc/default.nix
@@ -1,80 +1,66 @@
-{ lib
-, aiocontextvars
-  #, aiocarbon
-, aiohttp
-  #, aiohttp-asgi
-, async-timeout
-, buildPythonPackage
-, colorlog
-, croniter
-, fastapi
-, fetchPypi
-, logging-journald
-, poetry-core
-, pytestCheckHook
-, pythonOlder
-, raven
-  #, raven-aiohttp
-, setproctitle
-, setuptools
-, uvloop
+{
+  lib,
+  stdenv,
+  aiocontextvars,
+  aiohttp,
+  async-timeout,
+  buildPythonPackage,
+  colorlog,
+  croniter,
+  fastapi,
+  fetchPypi,
+  logging-journald,
+  poetry-core,
+  pytestCheckHook,
+  pythonOlder,
+  raven,
+  rich,
+  setproctitle,
+  typing-extensions,
+  uvloop,
 }:
 
 buildPythonPackage rec {
   pname = "aiomisc";
-  version = "17.5.2";
+  version = "17.5.4";
   pyproject = true;
 
-  disabled = pythonOlder "3.7";
+  disabled = pythonOlder "3.8";
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-bpR9HsR/7qVaDcTsHXJypGDyS7/BE/CzFk6eNaQ/C8k=";
+    hash = "sha256-/2WEaM9ZM9dbMA73XADOE2u5r3SfMAyjH8isOsXaJhE=";
   };
 
-  nativeBuildInputs = [
-    poetry-core
-  ];
+  build-system = [ poetry-core ];
 
-  propagatedBuildInputs = [
-    colorlog
-    logging-journald
-    setuptools
-  ];
+  dependencies =
+    [ colorlog ]
+    ++ lib.optionals (pythonOlder "3.11") [ typing-extensions ]
+    ++ lib.optionals stdenv.isLinux [ logging-journald ];
 
   nativeCheckInputs = [
     aiocontextvars
     async-timeout
     fastapi
     pytestCheckHook
-    raven
     setproctitle
-  ]  ++ lib.flatten (builtins.attrValues passthru.optional-dependencies);
+  ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies);
 
   passthru.optional-dependencies = {
-    aiohttp = [
+    aiohttp = [ aiohttp ];
+    #asgi = [ aiohttp-asgi ];
+    cron = [ croniter ];
+    #carbon = [ aiocarbon ];
+    raven = [
       aiohttp
+      raven
     ];
-    #asgi = [
-    #  aiohttp-asgi
-    #];
-    cron = [
-      croniter
-    ];
-    #carbon = [
-    #  aiocarbon
-    #];
-    #raven = [
-    #  raven-aiohttp
-    #];
-    uvloop = [
-      uvloop
-    ];
+    rich = [ rich ];
+    uvloop = [ uvloop ];
   };
 
-  pythonImportsCheck = [
-    "aiomisc"
-  ];
+  pythonImportsCheck = [ "aiomisc" ];
 
   # Upstream stopped tagging with 16.2
   doCheck = false;