diff --git a/pkgs/development/python-modules/cyclonedx-python-lib/default.nix b/pkgs/development/python-modules/cyclonedx-python-lib/default.nix index 6d68cfb0f1e6..cdbb1738b9b4 100644 --- a/pkgs/development/python-modules/cyclonedx-python-lib/default.nix +++ b/pkgs/development/python-modules/cyclonedx-python-lib/default.nix @@ -9,12 +9,14 @@ , requirements-parser , setuptools , toml +, types-setuptools +, types-toml , tox }: buildPythonPackage rec { pname = "cyclonedx-python-lib"; - version = "0.10.2"; + version = "0.11.0"; format = "pyproject"; disabled = pythonOlder "3.6"; @@ -23,7 +25,7 @@ buildPythonPackage rec { owner = "CycloneDX"; repo = pname; rev = "v${version}"; - sha256 = "11sbnlbxighmmygrlgg4d31y70067pxzjsirwicaslfq95wgdlav"; + sha256 = "sha256-FNEtVTcmVyhAri55GjlzQbg21YByAJjmKQvWaYh3xRw="; }; nativeBuildInputs = [ @@ -36,6 +38,8 @@ buildPythonPackage rec { requirements-parser setuptools toml + types-setuptools + types-toml ]; checkInputs = [ diff --git a/pkgs/development/python-modules/types-setuptools/default.nix b/pkgs/development/python-modules/types-setuptools/default.nix new file mode 100644 index 000000000000..512b5386625b --- /dev/null +++ b/pkgs/development/python-modules/types-setuptools/default.nix @@ -0,0 +1,27 @@ +{ lib +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec { + pname = "types-setuptools"; + version = "57.4.2"; + format = "setuptools"; + + src = fetchPypi { + inherit pname version; + sha256 = "1y0vx949wx5w4ra854ykwvgmdcwsb6v7jk29m4x1l79857sa16al"; + }; + + # Module doesn't have tests + doCheck = false; + + pythonImportsCheck = [ "setuptools-stubs" ]; + + meta = with lib; { + description = "Typing stubs for setuptools"; + homepage = "https://github.com/python/typeshed"; + license = licenses.asl20; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/development/python-modules/types-toml/default.nix b/pkgs/development/python-modules/types-toml/default.nix new file mode 100644 index 000000000000..d87528c20324 --- /dev/null +++ b/pkgs/development/python-modules/types-toml/default.nix @@ -0,0 +1,27 @@ +{ lib +, buildPythonPackage +, fetchPypi +}: + +buildPythonPackage rec { + pname = "types-toml"; + version = "0.10.1"; + format = "setuptools"; + + src = fetchPypi { + inherit pname version; + sha256 = "1jqh0vki1hccj391gnxpblim429sj56npgq2z749f8v9ay6qy7sw"; + }; + + # Module doesn't have tests + doCheck = false; + + pythonImportsCheck = [ "toml-stubs" ]; + + meta = with lib; { + description = "Typing stubs for toml"; + homepage = "https://github.com/python/typeshed"; + license = licenses.asl20; + maintainers = with maintainers; [ fab ]; + }; +} diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index d24f52972dcd..8d586c94849e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -9477,6 +9477,10 @@ in { types-requests = callPackage ../development/python-modules/types-requests { }; + types-setuptools = callPackage ../development/python-modules/types-setuptools { }; + + types-toml = callPackage ../development/python-modules/types-toml { }; + typesentry = callPackage ../development/python-modules/typesentry { }; typesystem = callPackage ../development/python-modules/typesystem { };