diff --git a/pkgs/development/python-modules/greynoise/default.nix b/pkgs/development/python-modules/greynoise/default.nix index 0b9631179569..2ffdbcc4c8de 100644 --- a/pkgs/development/python-modules/greynoise/default.nix +++ b/pkgs/development/python-modules/greynoise/default.nix @@ -17,6 +17,9 @@ pytestCheckHook, mock, pythonOlder, + # The REPL depends on click-repl, which is incompatible with our version of + # click. + withRepl ? false, }: buildPythonPackage rec { @@ -33,22 +36,32 @@ buildPythonPackage rec { hash = "sha256-wJDO666HC3EohfR+LbG5F0Cp/eL7q4kXniWhJfc7C3s="; }; + patches = lib.optionals (!withRepl) [ + ./remove-repl.patch + ]; + build-system = [ hatchling ]; + pythonRelaxDeps = [ + "click" + ]; + dependencies = [ click ansimarkup cachetools colorama click-default-group - click-repl dict2xml jinja2 more-itertools requests six + ] + ++ lib.optionals withRepl [ + click-repl ]; nativeCheckInputs = [ diff --git a/pkgs/development/python-modules/greynoise/remove-repl.patch b/pkgs/development/python-modules/greynoise/remove-repl.patch new file mode 100644 index 000000000000..88f46af3bdc3 --- /dev/null +++ b/pkgs/development/python-modules/greynoise/remove-repl.patch @@ -0,0 +1,37 @@ +diff --git a/pyproject.toml b/pyproject.toml +index 9c5950e..f19a5db 100644 +--- a/pyproject.toml ++++ b/pyproject.toml +@@ -33,7 +33,6 @@ dependencies = [ + "cachetools", + "colorama", + "click-default-group", +- "click-repl", + "dict2xml", + "jinja2", + "more-itertools>=8.14.0", +@@ -53,4 +52,4 @@ greynoise = "greynoise.cli:main" + packages = ["src/greynoise"] + + [tool.hatch.build.targets.wheel.shared-data] +-"src/greynoise/cli/templates/*.j2" = "greynoise/cli/templates" +\ No newline at end of file ++"src/greynoise/cli/templates/*.j2" = "greynoise/cli/templates" +diff --git a/src/greynoise/cli/__init__.py b/src/greynoise/cli/__init__.py +index a7c22ea..9d26d3e 100644 +--- a/src/greynoise/cli/__init__.py ++++ b/src/greynoise/cli/__init__.py +@@ -2,7 +2,6 @@ + + import click + from click_default_group import DefaultGroup +-from click_repl import register_repl + + from greynoise.cli import subcommand + +@@ -24,5 +23,3 @@ SUBCOMMAND_FUNCTIONS = [ + + for subcommand_function in SUBCOMMAND_FUNCTIONS: + main.add_command(subcommand_function) +- +-register_repl(main)