Unverified Commit 59ef550a authored by dotlambda's avatar dotlambda Committed by GitHub
Browse files

python3Packages.{protoletariat,kicad-python}: fix build (#498079)

parents 1e43a0de f9d699a6
Loading
Loading
Loading
Loading
+1 −0
Original line number Diff line number Diff line
@@ -130,6 +130,7 @@ buildPythonPackage (finalAttrs: {
  ];

  pythonRelaxDeps = [
    "deprecated"
    "posthog"
    "prompt-toolkit"
  ];
+2 −3
Original line number Diff line number Diff line
@@ -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
  ];

+51 −0
Original line number Diff line number Diff line
{
  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 ];
  };
})
+2 −3
Original line number Diff line number Diff line
@@ -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 ];
+2 −0
Original line number Diff line number Diff line
@@ -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 { };