Tuomas Tynkkynen
34f95d92a2
Merge remote-tracking branch 'upstream/master' into staging
...
Conflicts:
pkgs/applications/misc/pytrainer/default.nix
pkgs/development/tools/pew/default.nix
pkgs/tools/misc/you-get/default.nix
2018-02-28 20:52:49 +02:00
Robert Helgesson
e21057ae4f
pytrainer: 1.11.0 -> 1.12.0
2018-02-27 22:21:38 +01:00
Vladimír Čunát
f5ce8f86df
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.
2018-02-26 22:53:18 +01:00
Robert Schütz
da31b47790
pytrainer: fix tests
2018-02-22 01:46:11 +01:00
Robert Helgesson
03eae7a38d
pytrainer: add missing patch file
2017-09-30 19:06:27 +02:00
Robert Helgesson
181c6216d4
pytrainer: 1.10.0 -> 1.11.0
...
Also explicitly use python2 and default to running without webkit.
2017-09-30 19:05:35 +02:00
Frederik Rietdijk
4d06bf70f4
buildPythonApplication: use new function for Python applications
2016-02-19 13:16:41 +01:00
Domen Kožar
704c8bab41
buildPythonPackage: fix standalone applications using it
2015-11-21 21:44:12 +01:00
Robert Helgesson
b2be4092c6
Add package 'pytrainer'.
2015-01-18 13:34:02 +01:00
