From be06c18e8730bd5eaa28742364301720b27b1725 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Thu, 10 Oct 2024 22:24:47 +0200
Subject: [PATCH] python312Packages.plumbum: 1.8.3 -> 1.9.0

Diff: https://github.com/tomerfiliba/plumbum/compare/refs/tags/v1.8.3...v1.9.0

Changelog: https://github.com/tomerfiliba/plumbum/releases/tag/v1.9.0
---
 .../python-modules/plumbum/default.nix        | 35 ++++++++++---------
 1 file changed, 18 insertions(+), 17 deletions(-)

diff --git a/pkgs/development/python-modules/plumbum/default.nix b/pkgs/development/python-modules/plumbum/default.nix
index 42a9234a08d0..4f2227563068 100644
--- a/pkgs/development/python-modules/plumbum/default.nix
+++ b/pkgs/development/python-modules/plumbum/default.nix
@@ -2,46 +2,47 @@
   lib,
   buildPythonPackage,
   fetchFromGitHub,
-  hatchling,
   hatch-vcs,
-  openssh,
-  ps,
+  hatchling,
+  paramiko,
   psutil,
+  pytest-cov-stub,
   pytest-mock,
   pytest-timeout,
   pytestCheckHook,
+  pythonOlder,
 }:
 
 buildPythonPackage rec {
   pname = "plumbum";
-  version = "1.8.3";
-  format = "pyproject";
+  version = "1.9.0";
+  pyproject = true;
+
+  disabled = pythonOlder "3.10";
 
   src = fetchFromGitHub {
     owner = "tomerfiliba";
     repo = "plumbum";
     rev = "refs/tags/v${version}";
-    hash = "sha256-k2H/FBQAWrCN1P587s/OhiCGNasMKEFJYIBIU808rlE=";
+    hash = "sha256-3PAvSjZ0+BMq+/g4qNNZl27KnAm01fWFYxBBY+feNTU=";
   };
 
-  postPatch = ''
-    substituteInPlace pyproject.toml \
-      --replace '"--cov-config=setup.cfg", ' ""
-  '';
-
-  nativeBuildInputs = [
+  build-system = [
     hatchling
     hatch-vcs
   ];
 
+  optional-dependencies = {
+    ssh = [ paramiko ];
+  };
+
   nativeCheckInputs = [
-    openssh
-    ps
     psutil
+    pytest-cov-stub
     pytest-mock
     pytest-timeout
     pytestCheckHook
-  ];
+  ] ++ lib.flatten (builtins.attrValues optional-dependencies);
 
   preCheck = ''
     export HOME=$TMP
@@ -63,9 +64,9 @@ buildPythonPackage rec {
   ];
 
   meta = with lib; {
+    description = "Module Shell Combinators";
     changelog = "https://github.com/tomerfiliba/plumbum/releases/tag/v${version}";
-    description = " Plumbum: Shell Combinators";
-    homepage = " https://github.com/tomerfiliba/plumbum ";
+    homepage = " https://github.com/tomerfiliba/plumbum";
     license = licenses.mit;
     maintainers = [ ];
   };