Merge pull request #134674 from fabaff/fix-softlayer

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

@@ -1,43 +1,55 @@
 { lib
 , buildPythonPackage
-, fetchFromGitHub
-, isPy27
-, ptable
 , click
-, requests
+, fetchFromGitHub
-, prompt-toolkit
-, pygments
-, urllib3
-, pytest
-, pytest-cov
 , mock
+, prompt-toolkit
+, ptable
+, pygments
+, pytestCheckHook
+, pythonOlder
+, requests
 , sphinx
 , testtools
+, tkinter
+, urllib3
 }:
 
 buildPythonPackage rec {
-  pname = "softlayer-python";
+  pname = "softlayer";
-  version = "5.8.4";
+  version = "5.9.7";
-  disabled = isPy27;
+  disabled = pythonOlder "3.5";
-
-  propagatedBuildInputs = [ ptable click requests prompt-toolkit pygments urllib3 ];
-
-  checkInputs = [ pytest pytest-cov mock sphinx testtools ];
-
-  checkPhase = ''
-    pytest
-  '';
 
   src = fetchFromGitHub {
-    owner = "softlayer";
+    owner = pname;
-    repo = pname;
+    repo = "softlayer-python";
     rev = "v${version}";
-    sha256 = "10kzi7kvvifr21a46q2xqsibs0bx5ys22nfym0bg605ka37vcz88";
+    sha256 = "0zwhykrpckx3ln4w6vlgp0nrkkr8343ni1w43hxznm55qmrllrpg";
   };
 
+  propagatedBuildInputs = [
+    click
+    prompt-toolkit
+    ptable
+    pygments
+    requests
+    urllib3
+  ];
+
+  checkInputs = [
+    mock
+    pytestCheckHook
+    sphinx
+    testtools
+    tkinter
+  ];
+
+  pythonImportsCheck = [ "SoftLayer" ];
+
   meta = with lib; {
-    description = "A set of Python libraries that assist in calling the SoftLayer API.";
+    description = "Python libraries that assist in calling the SoftLayer API";
     homepage = "https://github.com/softlayer/softlayer-python";
     license = licenses.mit;
+    maintainers = with maintainers; [ ];
   };
 }