diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2018-02-26 13:05:32 +0100 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2018-02-26 13:05:32 +0100 |
commit | fc232422201c0364dbd57826c9a137cc1239caea (patch) | |
tree | b1fe3819cd0f4a609d925ff8ebfea618ff376360 /pkgs/applications/misc | |
parent | 754816b84b98afdc0727e13dd66e1698b097de6a (diff) | |
parent | 8d490ca9934d0c01e1e9ade455657e54e2e843c0 (diff) |
Merge staging at '8d490ca9934d0c01e1e9ade455657e54e2e843c0' into master
Diffstat (limited to 'pkgs/applications/misc')
-rw-r--r-- | pkgs/applications/misc/pytrainer/default.nix | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/pkgs/applications/misc/pytrainer/default.nix b/pkgs/applications/misc/pytrainer/default.nix index ecc4c341a6867..8605801dea166 100644 --- a/pkgs/applications/misc/pytrainer/default.nix +++ b/pkgs/applications/misc/pytrainer/default.nix @@ -1,19 +1,19 @@ -{ stdenv, fetchFromGitHub, perl, python2Packages, sqlite, gpsbabel +{ stdenv, fetchFromGitHub, perl, python, 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 = python2Packages.matplotlib.override { + matplotlibGtk = python.pkgs.matplotlib.override { enableGtk2 = true; - pygtk = python2Packages.pyGtkGlade; + pygtk = python.pkgs.pyGtkGlade; }; in -python2Packages.buildPythonApplication rec { - name = "pytrainer-${version}"; +python.pkgs.buildPythonApplication rec { + pname = "pytrainer"; version = "1.11.0"; src = fetchFromGitHub { @@ -35,7 +35,7 @@ python2Packages.buildPythonApplication rec { ./pytrainer-webkit.patch ]; - propagatedBuildInputs = with python2Packages; [ + propagatedBuildInputs = with python.pkgs; [ dateutil lxml matplotlibGtk pyGtkGlade sqlalchemy_migrate ] ++ stdenv.lib.optional withWebKit [ pywebkitgtk ]; @@ -45,6 +45,10 @@ python2Packages.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"; |