Merge master into staging-next

1 files changed, 25 insertions, 1 deletions

diff --git a/pkgs/development/python-modules/python-openstackclient/default.nix b/pkgs/development/python-modules/python-openstackclient/default.nix
index 50aa590d6b6a..e3dd953e93b0 100644
--- a/pkgs/development/python-modules/python-openstackclient/default.nix
+++ b/pkgs/development/python-modules/python-openstackclient/default.nix
@@ -6,14 +6,21 @@
   openstackdocstheme,
   osc-lib,
   pbr,
+  python-barbicanclient,
   python-cinderclient,
+  python-designateclient,
+  python-heatclient,
+  python-ironicclient,
   python-keystoneclient,
+  python-manilaclient,
   python-novaclient,
+  python-openstackclient,
   requests-mock,
   setuptools,
   sphinxHook,
   sphinxcontrib-apidoc,
   stestr,
+  testers,
 }:
 
 buildPythonPackage rec {
@@ -45,8 +52,8 @@ buildPythonPackage rec {
 
   nativeCheckInputs = [
     ddt
-    stestr
     requests-mock
+    stestr
   ];
 
   checkPhase = ''
@@ -57,6 +64,23 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "openstackclient" ];
 
+  passthru = {
+    optional-dependencies = {
+      # See https://github.com/openstack/python-openstackclient/blob/master/doc/source/contributor/plugins.rst
+      cli-plugins = [
+        python-barbicanclient
+        python-designateclient
+        python-heatclient
+        python-ironicclient
+        python-manilaclient
+      ];
+    };
+    tests.version = testers.testVersion {
+      package = python-openstackclient;
+      command = "openstack --version";
+    };
+  };
+
   meta = with lib; {
     description = "OpenStack Command-line Client";
     mainProgram = "openstack";