From 132023e223405a165edac815261a56132d36d74b Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Mon, 4 Nov 2024 21:15:22 +0100
Subject: [PATCH 1/2] python312Packages.appimage: init at 1.0.0

AppImage start scripts

https://github.com/ssh-mitm/appimage
---
 .../python-modules/appimage/default.nix       | 37 +++++++++++++++++++
 pkgs/top-level/python-packages.nix            |  2 +
 2 files changed, 39 insertions(+)
 create mode 100644 pkgs/development/python-modules/appimage/default.nix

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/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index 40bc928f4361..13ddd086142d 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -700,6 +700,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 { };

From a19f263bccb947c5bcd1f77902424ab9cb43202e Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Mon, 4 Nov 2024 21:17:54 +0100
Subject: [PATCH 2/2] ssh-mitm: 4.1.1 -> 5.0.0

Diff: https://github.com/ssh-mitm/ssh-mitm/compare/refs/tags/4.1.1...5.0.0

Changelog: https://github.com/ssh-mitm/ssh-mitm/blob/5.0.0/CHANGELOG.md
---
 pkgs/tools/security/ssh-mitm/default.nix | 19 ++++++-------------
 1 file changed, 6 insertions(+), 13 deletions(-)

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