public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #12127 from FRidh/decorator

Browse Source 
pythonPackages: fix tqdm and update decorator
This commit is contained in:
Domen Kožar 2016-01-04 10:06:24 +01:00
commit d47389473e
1 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
pkgs/top-level/python-packages.nix
View File

@ -3975,18 +3975,13 @@ in modules // {
decorator = buildPythonPackage rec { decorator = buildPythonPackage rec {
name = "decorator-${version}"; name = "decorator-${version}";
version = "4.0.4"; version = "4.0.6";
src = pkgs.fetchurl { src = pkgs.fetchurl {
url = "http://pypi.python.org/packages/source/d/decorator/${name}.tar.gz"; url = "http://pypi.python.org/packages/source/d/decorator/${name}.tar.gz";
sha256 = "1qf3iiv401vhsdmf4bd08fwb3fq4xq769q2yl7zqqr1iml7w3l2s"; sha256 = "1c6254597777fd003da2e8fb503c3dbf3d9e8f8d55f054709c0e65be3467209c";
}; };
# no idea what that file is doing there (probably bad release)
preCheck = ''
rm src/tests/x.py
'';
meta = { meta = {
homepage = http://pypi.python.org/pypi/decorator; homepage = http://pypi.python.org/pypi/decorator;
description = "Better living through Python with decorators"; description = "Better living through Python with decorators";
@ -19138,12 +19133,15 @@ in modules // {
buildInputs = with self; [ nose coverage pkgs.glibcLocales flake8 ]; buildInputs = with self; [ nose coverage pkgs.glibcLocales flake8 ];
propagatedBuildInputs = with self; [ matplotlib pandas ]; propagatedBuildInputs = with self; [ matplotlib pandas ];
# Performance test fails
prePatch = ''
rm tqdm/tests/tests_perf.py
'';
preBuild = '' preBuild = ''
export LC_ALL="en_US.UTF-8" export LC_ALL="en_US.UTF-8"
''; '';
doCheck = !(isPy27); # Performance test fails
meta = { meta = {
description = "A Fast, Extensible Progress Meter"; description = "A Fast, Extensible Progress Meter";
homepage = https://github.com/tqdm/tqdm; homepage = https://github.com/tqdm/tqdm;