Revert "Merge staging at '8d490ca9934d0' into master"

This reverts commit fc23242220, reversing
changes made to 754816b84b.
We don't have many binaries yet.  Comment on the original merge commit.

pkgs/applications/misc/pytrainer/default.nix

@@ -1,19 +1,19 @@
-{ stdenv, fetchFromGitHub, perl, python, sqlite, gpsbabel
+{ stdenv, fetchFromGitHub, perl, python2Packages, sqlite, gpsbabel
 , withWebKit ? false }:
 
 let
 
   # Pytrainer needs a matplotlib with GTK backend. Also ensure we are
   # using the pygtk with glade support as needed by pytrainer.
-  matplotlibGtk = python.pkgs.matplotlib.override {
+  matplotlibGtk = python2Packages.matplotlib.override {
     enableGtk2 = true;
-    pygtk = python.pkgs.pyGtkGlade;
+    pygtk = python2Packages.pyGtkGlade;
   };
 
 in
 
-python.pkgs.buildPythonApplication rec {
-  pname = "pytrainer";
+python2Packages.buildPythonApplication rec {
+  name = "pytrainer-${version}";
   version = "1.11.0";
 
   src = fetchFromGitHub {
@@ -35,7 +35,7 @@ python.pkgs.buildPythonApplication rec {
     ./pytrainer-webkit.patch
   ];
 
-  propagatedBuildInputs = with python.pkgs; [
+  propagatedBuildInputs = with python2Packages; [
     dateutil lxml matplotlibGtk pyGtkGlade sqlalchemy_migrate
   ] ++ stdenv.lib.optional withWebKit [ pywebkitgtk ];
 
@@ -45,10 +45,6 @@ python.pkgs.buildPythonApplication rec {
   dontPatchELF = true;
   dontStrip = true;
 
-  checkPhase = ''
-    ${python.interpreter} -m unittest discover
-  '';
-
   meta = with stdenv.lib; {
     homepage = https://github.com/pytrainer/pytrainer/wiki;
     description = "Application for logging and graphing sporting excursions";