diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2018-02-26 22:53:18 +0100 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2018-02-26 22:53:18 +0100 |
commit | f5ce8f86dfa0a9f9dfe63462161f5ba982e57738 (patch) | |
tree | 051d54e5f5d5d1d0d9042e2b7f50bee36debb32f /pkgs/applications/misc/pytrainer | |
parent | b8f4df9d9e5ca70b6a873957e5b0899bb3b892dd (diff) | |
download | nixpkgs-f5ce8f86dfa0a9f9dfe63462161f5ba982e57738.tar nixpkgs-f5ce8f86dfa0a9f9dfe63462161f5ba982e57738.tar.gz nixpkgs-f5ce8f86dfa0a9f9dfe63462161f5ba982e57738.tar.bz2 nixpkgs-f5ce8f86dfa0a9f9dfe63462161f5ba982e57738.tar.lz nixpkgs-f5ce8f86dfa0a9f9dfe63462161f5ba982e57738.tar.xz nixpkgs-f5ce8f86dfa0a9f9dfe63462161f5ba982e57738.tar.zst nixpkgs-f5ce8f86dfa0a9f9dfe63462161f5ba982e57738.zip |
Revert "Merge staging at '8d490ca9934d0' into master"
This reverts commit fc232422201c0364dbd57826c9a137cc1239caea, reversing changes made to 754816b84b98afdc0727e13dd66e1698b097de6a. We don't have many binaries yet. Comment on the original merge commit.
Diffstat (limited to 'pkgs/applications/misc/pytrainer')
-rw-r--r-- | pkgs/applications/misc/pytrainer/default.nix | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/pkgs/applications/misc/pytrainer/default.nix b/pkgs/applications/misc/pytrainer/default.nix index 8605801dea1..ecc4c341a68 100644 --- a/pkgs/applications/misc/pytrainer/default.nix +++ b/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"; |