From 6675bb5710be535e66914c013d7087fd71f44cb2 Mon Sep 17 00:00:00 2001 From: Fabian Affolter Date: Sun, 6 Jul 2025 16:55:12 +0200 Subject: [PATCH] ssh-mitm: remove override for paramiko --- pkgs/by-name/ss/ssh-mitm/package.nix | 61 ++++++++++++---------------- 1 file changed, 25 insertions(+), 36 deletions(-) diff --git a/pkgs/by-name/ss/ssh-mitm/package.nix b/pkgs/by-name/ss/ssh-mitm/package.nix index 4fa03112e80c..3f65868c8125 100644 --- a/pkgs/by-name/ss/ssh-mitm/package.nix +++ b/pkgs/by-name/ss/ssh-mitm/package.nix @@ -6,24 +6,7 @@ python3, }: -let - py = python3.override { - self = py; - packageOverrides = self: super: { - paramiko = super.paramiko.overridePythonAttrs (oldAttrs: rec { - version = "3.4.1"; - src = oldAttrs.src.override { - inherit version; - hash = "sha256-ixUwKHCvf2ZS8uA4l1wdKXPwYEbLXX1lNVZos+y+zgw="; - }; - dependencies = oldAttrs.dependencies ++ [ python3.pkgs.icecream ]; - }); - }; - }; -in -with py.pkgs; - -buildPythonApplication rec { +python3.pkgs.buildPythonApplication rec { pname = "ssh-mitm"; version = "5.0.1"; pyproject = true; @@ -35,32 +18,38 @@ buildPythonApplication rec { hash = "sha256-FmxVhYkPRZwS+zFwuId9nRGN832LRkgCNgDYb8Pg01U="; }; - build-system = [ + pythonRelaxDeps = [ "paramiko" ]; + + build-system = with python3.pkgs; [ hatchling hatch-requirements-txt ]; - dependencies = [ - appimage - argcomplete - colored - packaging - paramiko - pytz - pyyaml - python-json-logger - rich - tkinter - setuptools - sshpubkeys - wrapt - ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ setuptools ]; - # fix for darwin users - nativeBuildInputs = [ installShellFiles ]; + dependencies = + with python3.pkgs; + [ + appimage + argcomplete + colored + packaging + paramiko + pytz + pyyaml + python-json-logger + rich + tkinter + setuptools + sshpubkeys + wrapt + ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ setuptools ]; + # fix for darwin users + # Module has no tests doCheck = false; + # Install man page postInstall = '' installManPage man1/*