diff --git a/pkgs/development/python-modules/pymobiledevice3/default.nix b/pkgs/development/python-modules/pymobiledevice3/default.nix index 9acb35471961..10567ef0a329 100644 --- a/pkgs/development/python-modules/pymobiledevice3/default.nix +++ b/pkgs/development/python-modules/pymobiledevice3/default.nix @@ -1,7 +1,6 @@ { bpylist2, buildPythonPackage, - click, coloredlogs, construct, construct-typing, @@ -41,6 +40,8 @@ srptools, sslpsk-pmd3, tqdm, + typer, + typer-injector, uvicorn, wsproto, xonsh, @@ -48,14 +49,14 @@ buildPythonPackage rec { pname = "pymobiledevice3"; - version = "6.2.0"; + version = "7.0.7"; pyproject = true; src = fetchFromGitHub { owner = "doronz88"; repo = "pymobiledevice3"; tag = "v${version}"; - hash = "sha256-Sc02p2zZb/CPYFU+lz6fe1UZgWhdJYH2/pSJ5gVE0iY="; + hash = "sha256-akJjxGj8kSvp9cRzEZrndW9il1zCabneZfKx8ACOmLk="; }; build-system = [ @@ -65,7 +66,6 @@ buildPythonPackage rec { dependencies = [ bpylist2 - click coloredlogs construct construct-typing @@ -99,6 +99,8 @@ buildPythonPackage rec { srptools sslpsk-pmd3 tqdm + typer + typer-injector uvicorn wsproto xonsh diff --git a/pkgs/development/python-modules/typer-injector/default.nix b/pkgs/development/python-modules/typer-injector/default.nix new file mode 100644 index 000000000000..109ae7c7b796 --- /dev/null +++ b/pkgs/development/python-modules/typer-injector/default.nix @@ -0,0 +1,44 @@ +{ + buildPythonPackage, + fetchFromGitHub, + hatch-vcs, + hatchling, + lib, + pytestCheckHook, + typer-slim, +}: + +buildPythonPackage rec { + pname = "typer-injector"; + version = "0.2.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "BenjyWiener"; + repo = "typer-injector"; + tag = "v${version}"; + hash = "sha256-nwEYFw+4jeF/SoaZWR51VWRezqBFjGoLiVgJWdPNoIk="; + }; + + build-system = [ + hatch-vcs + hatchling + ]; + + dependencies = [ + typer-slim + ]; + + pythonImportsCheck = [ "typer_injector" ]; + + nativeCheckInputs = [ + pytestCheckHook + ]; + + meta = { + description = "Dependency injection for Typer"; + homepage = "https://github.com/BenjyWiener/typer-injector"; + license = lib.licenses.mit; + maintainers = [ lib.maintainers.dotlambda ]; + }; +} diff --git a/pkgs/development/python-modules/typer-slim/default.nix b/pkgs/development/python-modules/typer-slim/default.nix index 55c736320c78..71bda750278c 100644 --- a/pkgs/development/python-modules/typer-slim/default.nix +++ b/pkgs/development/python-modules/typer-slim/default.nix @@ -24,14 +24,14 @@ buildPythonPackage rec { pname = "typer-slim"; - version = "0.19.2"; + version = "0.21.0"; pyproject = true; src = fetchFromGitHub { owner = "fastapi"; repo = "typer"; tag = version; - hash = "sha256-mMsOEI4FpLkLkpjxjnUdmKdWD65Zx3Z1+L+XsS79k44="; + hash = "sha256-MvrwHemciLa2m0QUTZNuCLa7x63RKWFzJ5k6Ask25ZY="; }; postPatch = '' diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 0acb8b188d10..066034b3e27c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -19440,6 +19440,8 @@ self: super: with self; { typer-config = callPackage ../development/python-modules/typer-config { }; + typer-injector = callPackage ../development/python-modules/typer-injector { }; + typer-shell = callPackage ../development/python-modules/typer-shell { }; typer-slim = callPackage ../development/python-modules/typer-slim { };