catkin-tools, osrf-pycommon: cleanup

Author: lopsided98

pkgs/catkin-tools/default.nix

@@ -1,4 +1,5 @@
-{ lib, buildPythonPackage, fetchPypi, fetchpatch, setuptools, catkin-pkg, osrf-pycommon, pyyaml}:
+{ lib, buildPythonPackage, fetchPypi, setuptools, catkin-pkg, osrf-pycommon
+, pyyaml }:
 
 buildPythonPackage rec {
   pname = "catkin_tools";
@@ -9,10 +10,11 @@ buildPythonPackage rec {
     sha256 = "17r6sz7jdq78mab8n5ihcf991f8lwykdjcddlgsz7c1ab7j4dkns";
   };
 
-  propagatedBuildInputs = [ catkin-pkg setuptools osrf-pycommon pyyaml ];
+  propagatedBuildInputs = [ setuptools catkin-pkg osrf-pycommon pyyaml ];
 
+  # No tests in PyPi tarball
   doCheck = false;
-  pythonImportsCheck = ["catkin_tools" ];
+  pythonImportsCheck = [ "catkin_tools" ];
 
   meta = with lib; {
     description = "Command line tools for working with catkin";

pkgs/osrf-pycommon/default.nix

@@ -1,4 +1,4 @@
-{ lib, buildPythonPackage, fetchPypi, fetchpatch, python, nose}:
+{ lib, buildPythonPackage, fetchPypi }:
 
 buildPythonPackage rec {
   pname = "osrf_pycommon";
@@ -9,8 +9,9 @@ buildPythonPackage rec {
     sha256 = "01qi6m7frc6g2pyy2wmy29c3xdpbgxmwn11ax48qy3fav4mq5ky3";
   };
 
-  buildInputs = [ nose ];
-  checkPhase = "${python.interpreter} ./setup.py nosetests";
+  # No tests in PyPi tarball
+  doCheck = false;
+  pythonImportsCheck = [ "osrf_pycommon" ];
 
   meta = with lib; {
     description = "Commonly needed Python modules, used by Python software developed at OSRF";