python312Package.{fabric,paramiko}: modernize and fix compilation

NixOS · Oct 26, 2024 · c53c9bf · c53c9bf
1 parent 08c5673
commit c53c9bf
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 27 deletions.
diff --git a/pkgs/development/python-modules/fabric/default.nix b/pkgs/development/python-modules/fabric/default.nix
@@ -2,57 +2,53 @@
   lib,
   buildPythonPackage,
   fetchPypi,
-  cryptography,
+  setuptools,
   decorator,
+  deprecated,
   invoke,
   mock,
   paramiko,
   pytestCheckHook,
   pytest-relaxed,
+  icecream,
 }:
 
 buildPythonPackage rec {
   pname = "fabric";
   version = "3.2.2";
-  format = "setuptools";
+  pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
     hash = "sha256-h4PKQuOwB28IsmkBqsa52bHxnEEAdOesz6uQLBhP9KM=";
   };
 
-  # only relevant to python < 3.4
-  postPatch = ''
-    substituteInPlace setup.py \
-        --replace ', "pathlib2"' ' '
-  '';
+  build-system = [ setuptools ];
 
-  propagatedBuildInputs = [
+  dependencies = [
     invoke
     paramiko
-    cryptography
     decorator
+    deprecated
   ];
 
   nativeCheckInputs = [
     pytestCheckHook
     pytest-relaxed
+    icecream
     mock
   ];
 
-  # ==================================== ERRORS ====================================
-  # ________________________ ERROR collecting test session _________________________
-  # Direct construction of SpecModule has been deprecated, please use SpecModule.from_parent
-  # See https://docs.pytest.org/en/stable/deprecations.html#node-construction-changed-to-node-from-parent for more details.
+  # distutils.errors.DistutilsArgError: no commands supplied
   doCheck = false;
 
   pythonImportsCheck = [ "fabric" ];
 
-  meta = with lib; {
+  meta = {
     description = "Pythonic remote execution";
     mainProgram = "fab";
     homepage = "https://www.fabfile.org/";
-    license = licenses.bsd2;
+    license = lib.licenses.bsd2;
     maintainers = [ ];
   };
 }
diff --git a/pkgs/development/python-modules/paramiko/default.nix b/pkgs/development/python-modules/paramiko/default.nix
@@ -1,10 +1,12 @@
 {
   lib,
+  stdenv,
   bcrypt,
   buildPythonPackage,
   cryptography,
   fetchpatch,
   fetchPypi,
+  setuptools,
   gssapi,
   icecream,
   invoke,
@@ -13,13 +15,12 @@
   pynacl,
   pytestCheckHook,
   pytest-relaxed,
-  six,
 }:
 
 buildPythonPackage rec {
   pname = "paramiko";
   version = "3.5.0";
-  format = "setuptools";
+  pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
@@ -35,22 +36,17 @@ buildPythonPackage rec {
     })
   ];
 
+  build-system = [ setuptools ];
+
   dependencies = [
     bcrypt
     cryptography
-    pyasn1
-    six
+    pynacl
   ];
 
   optional-dependencies = {
-    gssapi = [
-      pyasn1
-      gssapi
-    ];
-    ed25519 = [
-      pynacl
-      bcrypt
-    ];
+    gssapi = [ pyasn1 ] ++ lib.optional (!stdenv.hostPlatform.isWindows) [ gssapi ];
+    ed25519 = [ ];
     invoke = [ invoke ];
   };