From f5010e8d04a5479df73bffd482c22e1eecbbc715 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 17 Mar 2024 18:46:16 +0000 Subject: [PATCH 1/5] python311Packages.aiomisc: 17.5.2 -> 17.5.4 --- pkgs/development/python-modules/aiomisc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aiomisc/default.nix b/pkgs/development/python-modules/aiomisc/default.nix index 92e016c786b8..d9c41639f805 100644 --- a/pkgs/development/python-modules/aiomisc/default.nix +++ b/pkgs/development/python-modules/aiomisc/default.nix @@ -22,14 +22,14 @@ buildPythonPackage rec { pname = "aiomisc"; - version = "17.5.2"; + version = "17.5.4"; pyproject = true; disabled = pythonOlder "3.7"; src = fetchPypi { inherit pname version; - hash = "sha256-bpR9HsR/7qVaDcTsHXJypGDyS7/BE/CzFk6eNaQ/C8k="; + hash = "sha256-/2WEaM9ZM9dbMA73XADOE2u5r3SfMAyjH8isOsXaJhE="; }; nativeBuildInputs = [ From 1c333171f872c5b2ddb61f4e6c44dc7b9b040e92 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 29 Mar 2024 18:20:33 +0100 Subject: [PATCH 2/5] python311Packages.aiomisc: update disabled --- pkgs/development/python-modules/aiomisc/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/development/python-modules/aiomisc/default.nix b/pkgs/development/python-modules/aiomisc/default.nix index d9c41639f805..5765586e3703 100644 --- a/pkgs/development/python-modules/aiomisc/default.nix +++ b/pkgs/development/python-modules/aiomisc/default.nix @@ -25,7 +25,7 @@ buildPythonPackage rec { version = "17.5.4"; pyproject = true; - disabled = pythonOlder "3.7"; + disabled = pythonOlder "3.8"; src = fetchPypi { inherit pname version; From 5bdd8429ca029f11f0782517284c6807691542f2 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Fri, 29 Mar 2024 18:21:07 +0100 Subject: [PATCH 3/5] python311Packages.aiomisc: refactor --- pkgs/development/python-modules/aiomisc/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/development/python-modules/aiomisc/default.nix b/pkgs/development/python-modules/aiomisc/default.nix index 5765586e3703..ea49d322d317 100644 --- a/pkgs/development/python-modules/aiomisc/default.nix +++ b/pkgs/development/python-modules/aiomisc/default.nix @@ -32,11 +32,11 @@ buildPythonPackage rec { hash = "sha256-/2WEaM9ZM9dbMA73XADOE2u5r3SfMAyjH8isOsXaJhE="; }; - nativeBuildInputs = [ + build-system = [ poetry-core ]; - propagatedBuildInputs = [ + dependencies = [ colorlog logging-journald setuptools From 0d35be12b4dc254e1c8bbc4893a91f63f79caf9a Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 3 Apr 2024 21:59:59 +0200 Subject: [PATCH 4/5] python311Packages.aiomisc: use nixfmt --- .../python-modules/aiomisc/default.nix | 57 ++++++++----------- 1 file changed, 24 insertions(+), 33 deletions(-) diff --git a/pkgs/development/python-modules/aiomisc/default.nix b/pkgs/development/python-modules/aiomisc/default.nix index ea49d322d317..b61bcec10d42 100644 --- a/pkgs/development/python-modules/aiomisc/default.nix +++ b/pkgs/development/python-modules/aiomisc/default.nix @@ -1,23 +1,24 @@ -{ lib -, aiocontextvars +{ + lib, + aiocontextvars, #, aiocarbon -, aiohttp + aiohttp, #, aiohttp-asgi -, async-timeout -, buildPythonPackage -, colorlog -, croniter -, fastapi -, fetchPypi -, logging-journald -, poetry-core -, pytestCheckHook -, pythonOlder -, raven + async-timeout, + buildPythonPackage, + colorlog, + croniter, + fastapi, + fetchPypi, + logging-journald, + poetry-core, + pytestCheckHook, + pythonOlder, + raven, #, raven-aiohttp -, setproctitle -, setuptools -, uvloop + setproctitle, + setuptools, + uvloop, }: buildPythonPackage rec { @@ -32,9 +33,7 @@ buildPythonPackage rec { hash = "sha256-/2WEaM9ZM9dbMA73XADOE2u5r3SfMAyjH8isOsXaJhE="; }; - build-system = [ - poetry-core - ]; + build-system = [ poetry-core ]; dependencies = [ colorlog @@ -49,32 +48,24 @@ buildPythonPackage rec { pytestCheckHook raven setproctitle - ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); + ] ++ lib.flatten (builtins.attrValues passthru.optional-dependencies); passthru.optional-dependencies = { - aiohttp = [ - aiohttp - ]; + aiohttp = [ aiohttp ]; #asgi = [ # aiohttp-asgi #]; - cron = [ - croniter - ]; + cron = [ croniter ]; #carbon = [ # aiocarbon #]; #raven = [ # raven-aiohttp #]; - uvloop = [ - uvloop - ]; + uvloop = [ uvloop ]; }; - pythonImportsCheck = [ - "aiomisc" - ]; + pythonImportsCheck = [ "aiomisc" ]; # Upstream stopped tagging with 16.2 doCheck = false; From c6f37df6466ac8564bad211225b0377c5065f331 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Wed, 3 Apr 2024 22:09:09 +0200 Subject: [PATCH 5/5] python311Packages.aiomisc: adjust inputs --- .../python-modules/aiomisc/default.nix | 33 ++++++++----------- 1 file changed, 14 insertions(+), 19 deletions(-) diff --git a/pkgs/development/python-modules/aiomisc/default.nix b/pkgs/development/python-modules/aiomisc/default.nix index b61bcec10d42..e3b0b7de9b48 100644 --- a/pkgs/development/python-modules/aiomisc/default.nix +++ b/pkgs/development/python-modules/aiomisc/default.nix @@ -1,9 +1,8 @@ { lib, + stdenv, aiocontextvars, - #, aiocarbon aiohttp, - #, aiohttp-asgi async-timeout, buildPythonPackage, colorlog, @@ -15,9 +14,9 @@ pytestCheckHook, pythonOlder, raven, - #, raven-aiohttp + rich, setproctitle, - setuptools, + typing-extensions, uvloop, }: @@ -35,33 +34,29 @@ buildPythonPackage rec { build-system = [ poetry-core ]; - dependencies = [ - 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); passthru.optional-dependencies = { aiohttp = [ aiohttp ]; - #asgi = [ - # aiohttp-asgi - #]; + #asgi = [ aiohttp-asgi ]; cron = [ croniter ]; - #carbon = [ - # aiocarbon - #]; - #raven = [ - # raven-aiohttp - #]; + #carbon = [ aiocarbon ]; + raven = [ + aiohttp + raven + ]; + rich = [ rich ]; uvloop = [ uvloop ]; };