diff --git a/pkgs/development/python-modules/appimage/default.nix b/pkgs/development/python-modules/appimage/default.nix new file mode 100644 index 000000000000..c8de232e73c4 --- /dev/null +++ b/pkgs/development/python-modules/appimage/default.nix @@ -0,0 +1,37 @@ +{ + lib, + buildPythonPackage, + fetchFromGitHub, + hatchling, + pythonOlder, +}: + +buildPythonPackage rec { + pname = "appimage"; + version = "1.0.0"; + pyproject = true; + + disabled = pythonOlder "3.8"; + + src = fetchFromGitHub { + owner = "ssh-mitm"; + repo = "appimage"; + rev = "refs/tags/${version}"; + hash = "sha256-d8LwZ4iZ+fwFaBP/IFoKImI/TsYtVD0rllbYN9XP/es="; + }; + + build-system = [ hatchling ]; + + # Module has no test + doCheck = false; + + pythonImportsCheck = [ "appimage" ]; + + meta = { + description = "AppImage start scripts"; + homepage = "https://github.com/ssh-mitm/appimage"; + changelog = "https://github.com/ssh-mitm/appimage/blob/${src.rev}/CHANGELOG.md"; + license = lib.licenses.gpl3Only; + maintainers = with lib.maintainers; [ fab ]; + }; +} diff --git a/pkgs/tools/security/ssh-mitm/default.nix b/pkgs/tools/security/ssh-mitm/default.nix index 7020bcf32d9a..e17925444dea 100644 --- a/pkgs/tools/security/ssh-mitm/default.nix +++ b/pkgs/tools/security/ssh-mitm/default.nix @@ -12,19 +12,11 @@ let self = py; packageOverrides = self: super: { paramiko = super.paramiko.overridePythonAttrs (oldAttrs: rec { - version = "3.3.1"; + version = "3.4.1"; src = oldAttrs.src.override { inherit version; - hash = "sha256-ajd3qWGshtvvN1xfW41QAUoaltD9fwVKQ7yIATSw/3c="; + hash = "sha256-ixUwKHCvf2ZS8uA4l1wdKXPwYEbLXX1lNVZos+y+zgw="; }; - patches = [ - (fetchpatch { - name = "Use-pytest-s-setup_method-in-pytest-8-the-nose-method-setup-is-deprecated.patch"; - url = "https://github.com/paramiko/paramiko/pull/2349.diff"; - hash = "sha256-4CTIZ9BmzRdh+HOwxSzfM9wkUGJOnndctK5swqqsIvU="; - }) - - ]; dependencies = oldAttrs.dependencies ++ [ python3.pkgs.icecream ]; }); }; @@ -35,14 +27,14 @@ with py.pkgs; buildPythonApplication rec { pname = "ssh-mitm"; - version = "4.1.1"; + version = "5.0.0"; pyproject = true; src = fetchFromGitHub { owner = "ssh-mitm"; repo = "ssh-mitm"; rev = "refs/tags/${version}"; - hash = "sha256-Uf1B7oEZyNWj4TjrLvEfFdxsvsGeMLXFsSdxGLUV4ZU="; + hash = "sha256-jRheKLAXbbMyxdtDSJ4QSN4PoUM2YoK7nmU5xqPq7DY="; }; build-system = [ @@ -50,7 +42,8 @@ buildPythonApplication rec { hatch-requirements-txt ]; - propagatedBuildInputs = [ + dependencies = [ + appimage argcomplete colored packaging diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 5a090c44ff03..154e746005fd 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -702,6 +702,8 @@ self: super: with self; { appdirs = callPackage ../development/python-modules/appdirs { }; + appimage = callPackage ../development/python-modules/appimage { }; + apple-weatherkit = callPackage ../development/python-modules/apple-weatherkit { }; applicationinsights = callPackage ../development/python-modules/applicationinsights { };