diff --git a/pkgs/development/python-modules/atopile/default.nix b/pkgs/development/python-modules/atopile/default.nix index 50bdeb18a84a..44509b3b0c0b 100644 --- a/pkgs/development/python-modules/atopile/default.nix +++ b/pkgs/development/python-modules/atopile/default.nix @@ -130,6 +130,7 @@ buildPythonPackage (finalAttrs: { ]; pythonRelaxDeps = [ + "deprecated" "posthog" "prompt-toolkit" ]; diff --git a/pkgs/development/python-modules/kicad-python/default.nix b/pkgs/development/python-modules/kicad-python/default.nix index ad36f17fbe15..7ff7938917c2 100644 --- a/pkgs/development/python-modules/kicad-python/default.nix +++ b/pkgs/development/python-modules/kicad-python/default.nix @@ -4,7 +4,7 @@ fetchFromGitLab, poetry-core, protoletariat, - mypy-protobuf, + mypy-protobuf_3_6, pkgs, protobuf, pynng, @@ -34,13 +34,12 @@ buildPythonPackage (finalAttrs: { dependencies = [ protobuf pynng - mypy-protobuf ] ++ (lib.optional (pythonOlder "3.13") typing-extensions); nativeBuildInputs = [ pkgs.protobuf - mypy-protobuf + mypy-protobuf_3_6 gitMinimal ]; diff --git a/pkgs/development/python-modules/mypy-protobuf_3_6/default.nix b/pkgs/development/python-modules/mypy-protobuf_3_6/default.nix new file mode 100644 index 000000000000..d51ab7a1a898 --- /dev/null +++ b/pkgs/development/python-modules/mypy-protobuf_3_6/default.nix @@ -0,0 +1,51 @@ +{ + buildPythonPackage, + fetchFromGitHub, + grpcio-tools, + lib, + protobuf, + pytestCheckHook, + setuptools, + types-protobuf, + versionCheckHook, +}: + +buildPythonPackage (finalAttrs: { + pname = "mypy-protobuf"; + version = "3.6.0"; + pyproject = true; + + src = fetchFromGitHub { + owner = "nipunn1313"; + repo = "mypy-protobuf"; + tag = "v${finalAttrs.version}"; + hash = "sha256-YBm/qfmas0kPmzhlgAwCdT8nsnC45fj2bhK3cXpvANo="; + }; + + pythonRelaxDeps = [ "protobuf" ]; + + build-system = [ setuptools ]; + + dependencies = [ + grpcio-tools + protobuf + types-protobuf + ]; + + doCheck = false; # ModuleNotFoundError: No module named 'testproto' + + nativeCheckInputs = [ pytestCheckHook ]; + + pythonImportsCheck = [ "mypy_protobuf" ]; + + nativeInstallCheckInputs = [ versionCheckHook ]; + + meta = { + changelog = "https://github.com/nipunn1313/mypy-protobuf/blob/${finalAttrs.src.tag}/CHANGELOG.md"; + description = "Generate mypy stub files from protobuf specs"; + homepage = "https://github.com/nipunn1313/mypy-protobuf"; + license = lib.licenses.asl20; + mainProgram = "protoc-gen-mypy"; + maintainers = with lib.maintainers; [ sigmanificient ]; + }; +}) diff --git a/pkgs/development/python-modules/protoletariat/default.nix b/pkgs/development/python-modules/protoletariat/default.nix index 2187bdbece57..92f5a09ed77c 100644 --- a/pkgs/development/python-modules/protoletariat/default.nix +++ b/pkgs/development/python-modules/protoletariat/default.nix @@ -8,7 +8,7 @@ click, pkgs, protobuf, - mypy-protobuf, + mypy-protobuf_3_6, pytestCheckHook, writableTmpDirAsHomeHook, }: @@ -47,11 +47,10 @@ buildPythonPackage (finalAttrs: { nativeCheckInputs = [ pytestCheckHook writableTmpDirAsHomeHook - mypy-protobuf + mypy-protobuf_3_6 ]; meta = { - broken = true; description = "Python protocol buffers for the rest of us"; changelog = "https://github.com/cpcloud/protoletariat/blob/${finalAttrs.src.tag}/CHANGELOG.md"; license = with lib.licenses; [ asl20 ]; diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 9151d256002d..d2845e4f82c2 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -10735,6 +10735,8 @@ self: super: with self; { mypy-protobuf = callPackage ../development/python-modules/mypy-protobuf { }; + mypy-protobuf_3_6 = callPackage ../development/python-modules/mypy-protobuf_3_6 { }; + mypyllant = callPackage ../development/python-modules/mypyllant { }; mysql-connector = callPackage ../development/python-modules/mysql-connector { };