diff options
| author | Anderson Torres <torres.anderson.85@protonmail.com> | 2023-11-03 12:02:54 -0300 |
|---|---|---|
| committer | Anderson Torres <torres.anderson.85@protonmail.com> | 2023-11-04 22:18:32 -0300 |
| commit | f18465480fe3ccb5ab4b407b7b6bd546cf19650a (patch) | |
| tree | 3fdca9dd2191b318ef35c96faabedc6ddb46377b /pkgs/tools | |
| parent | 6864f2c2e769176d310f8959d9874ec615a96a82 (diff) | |
wtfis: remove patch
Diffstat (limited to 'pkgs/tools')
| -rw-r--r-- | pkgs/tools/networking/wtfis/000-pyproject-remove-versions.diff | 29 | ||||
| -rw-r--r-- | pkgs/tools/networking/wtfis/default.nix | 25 |
2 files changed, 16 insertions, 38 deletions
diff --git a/pkgs/tools/networking/wtfis/000-pyproject-remove-versions.diff b/pkgs/tools/networking/wtfis/000-pyproject-remove-versions.diff deleted file mode 100644 index b94ca03bb3176..0000000000000 --- a/pkgs/tools/networking/wtfis/000-pyproject-remove-versions.diff +++ /dev/null @@ -1,29 +0,0 @@ -diff -Naur source-old/pyproject.toml source-new/pyproject.toml ---- source-old/pyproject.toml 1980-01-02 00:00:00.000000000 -0300 -+++ source-new/pyproject.toml 2023-02-04 10:09:48.087418202 -0300 -@@ -29,11 +29,11 @@ - "Topic :: Security", - ] - dependencies = [ -- "pydantic~=1.10.2", -- "python-dotenv~=0.21.0", -- "requests~=2.28.1", -- "rich~=12.6.0", -- "shodan~=1.28.0", -+ "pydantic", -+ "python-dotenv", -+ "requests", -+ "rich", -+ "shodan", - ] - dynamic = ["version"] - -@@ -63,7 +63,7 @@ - "mypy", - "pytest", - "pytest-cov", -- "types-requests~=2.28.1", -+ "types-requests", - ] - [tool.hatch.envs.default.scripts] - typecheck = "mypy -p {args:wtfis}" diff --git a/pkgs/tools/networking/wtfis/default.nix b/pkgs/tools/networking/wtfis/default.nix index ba6175f59b332..b8b90da5b9f16 100644 --- a/pkgs/tools/networking/wtfis/default.nix +++ b/pkgs/tools/networking/wtfis/default.nix @@ -6,29 +6,36 @@ let pname = "wtfis"; version = "0.6.1"; -in python3.pkgs.buildPythonApplication { - inherit pname version; - src = fetchFromGitHub { owner = "pirxthepilot"; repo = "wtfis"; rev = "refs/tags/v${version}"; hash = "sha256-bHgv5+HoM1hFhpkqml+HxqiMDvKbMqsTH+zYtDrV7Ko="; }; - - patches = [ - # TODO: get rid of that newbie patch - ./000-pyproject-remove-versions.diff - ]; +in python3.pkgs.buildPythonApplication { + inherit pname version src; format = "pyproject"; + nativeBuildInputs = [ + python3.pkgs.pythonRelaxDepsHook + ]; + propagatedBuildInputs = [ python3.pkgs.hatchling python3.pkgs.pydantic + python3.pkgs.python-dotenv python3.pkgs.rich python3.pkgs.shodan - python3.pkgs.python-dotenv + ]; + + pythonRelaxDeps = [ + "pydantic" + "python-dotenv" + "requests" + "rich" + "shodan" + "types-requests" ]; meta = { |