Merge pull request #247367 from geluk/master

pythonPackages.ansible-pylibssh: init at 1.1.0

maintainers/maintainer-list.nix

@@ -6113,6 +6113,12 @@
     githubId = 313929;
     name = "Gabriel Ebner";
   };
+  geluk = {
+    email = "johan+nix@geluk.io";
+    github = "geluk";
+    githubId = 1516985;
+    name = "Johan Geluk";
+  };
   genericnerdyusername = {
     name = "GenericNerdyUsername";
     email = "genericnerdyusername@proton.me";

pkgs/development/python-modules/ansible-pylibssh/default.nix

@@ -0,0 +1,49 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, pythonOlder
+, libssh
+, cython
+, wheel
+, setuptools
+, setuptools-scm
+, toml
+, expandvars
+}:
+
+buildPythonPackage rec {
+  pname = "ansible-pylibssh";
+  version = "1.1.0";
+  format = "pyproject";
+
+  disabled = pythonOlder "3.6";
+
+  src = fetchPypi {
+    inherit pname version;
+    hash = "sha256-spaGux6dYvtUtpOdU6oN7SEn8IgBof2NpQSPvr+Zplg=";
+  };
+
+  nativeBuildInputs = [
+    cython
+    wheel
+    setuptools
+    setuptools-scm
+    toml
+    expandvars
+  ];
+
+  propagatedBuildInputs = [
+    libssh
+  ];
+
+  pythonImportsCheck = [
+    "pylibsshext"
+  ];
+
+  meta = with lib; {
+    description = "Python bindings to client functionality of libssh specific to Ansible use case";
+    homepage = "https://github.com/ansible/pylibssh";
+    license = licenses.lgpl21Plus;
+    maintainers = with maintainers; [ geluk ];
+  };
+}

pkgs/development/python-modules/ansible/core.nix

@@ -13,6 +13,7 @@
 , ncclient
 , packaging
 , paramiko
+, ansible-pylibssh
 , passlib
 , pexpect
 , psutil
@@ -63,6 +64,7 @@ buildPythonPackage rec {
     lxml
     ncclient
     paramiko
+    ansible-pylibssh
     pexpect
     psutil
     pycrypto

pkgs/development/python-modules/ansible/default.nix

@@ -7,6 +7,7 @@
 , ncclient
 , netaddr
 , paramiko
+, ansible-pylibssh
 , pynetbox
 , scp
 , textfsm
@@ -45,6 +46,7 @@ buildPythonPackage {
     ncclient
     netaddr
     paramiko
+    ansible-pylibssh
     xmltodict
     # ansible.posix
     # ansible.utils
@@ -62,6 +64,7 @@ buildPythonPackage {
     jxmlease
     ncclient
     paramiko
+    ansible-pylibssh
     scp
     xmltodict
   ] ++ lib.optionals (withNetbox) [

pkgs/development/python-modules/expandvars/default.nix

@@ -0,0 +1,39 @@
+{ lib
+, buildPythonPackage
+, fetchPypi
+, pythonOlder
+, setuptools
+, wheel
+}:
+
+buildPythonPackage rec {
+  pname = "expandvars";
+  version = "0.11.0";
+  format = "pyproject";
+
+  disabled = pythonOlder "3.6";
+
+  src = fetchPypi {
+    inherit pname version;
+    hash = "sha256-Q7Qn9dMnqzYAY98mFR+Y0qbwj+GPKJWjKn9fDxF7W1I=";
+  };
+
+  nativeBuildInputs = [
+    setuptools
+    wheel
+  ];
+
+  # The PyPi package does not supply any tests
+  doCheck = false;
+
+  pythonImportsCheck = [
+    "expandvars"
+  ];
+
+  meta = with lib; {
+    description = "Expand system variables Unix style";
+    homepage = "https://github.com/sayanarijit/expandvars";
+    license = licenses.mit;
+    maintainers = with maintainers; [ geluk ];
+  };
+}

pkgs/top-level/python-packages.nix

@@ -522,6 +522,8 @@ self: super: with self; {
 
   ansible-kernel = callPackage ../development/python-modules/ansible-kernel { };
 
+  ansible-pylibssh = callPackage ../development/python-modules/ansible-pylibssh { };
+
   ansible-runner = callPackage ../development/python-modules/ansible-runner { };
 
   ansible-vault-rw = callPackage ../development/python-modules/ansible-vault-rw { };
@@ -3532,6 +3534,8 @@ self: super: with self; {
 
   exifread = callPackage ../development/python-modules/exifread { };
 
+  expandvars = callPackage ../development/python-modules/expandvars { };
+
   expects = callPackage ../development/python-modules/expects { };
 
   expecttest = callPackage ../development/python-modules/expecttest { };