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

Merge staging-next into staging

Browse Source
This commit is contained in:
Frederik Rietdijk
2020-04-21 08:29:51 +02:00
parent d2d7fbc431 b71232fc53
commit 803b3d296c
213 changed files with 3824 additions and 2109 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
pkgs/development/python-modules/apptools/default.nix
View File

@@ -1,4 +1,4 @@
{ lib, fetchPypi, buildPythonPackage
{ lib, fetchPypi, buildPythonPackage, fetchpatch
, configobj, six, traitsui
, nose, tables, pandas
}:
@@ -12,6 +12,13 @@ buildPythonPackage rec {
sha256 = "10h52ibhr2aw076pivqxiajr9rpcr1mancg6xlpxzckcm3if02i6";
};
# PyTables issue; should be merged in next post-4.5.0 release (#117)
patches = [ (fetchpatch {
url = "https://github.com/enthought/apptools/commit/3734289d1a0ebd8513fa67f75288add31ed0113c.patch";
sha256 = "001012q1ib5cbib3nq1alh9ckzj588bfrywr8brkd1f6y1pgvngk";
})
];
propagatedBuildInputs = [ configobj six traitsui ];
checkInputs = [

3
pkgs/development/python-modules/cryptography/default.nix
View File

@@ -17,6 +17,7 @@
, iso8601
, pytz
, hypothesis
, enum34
}:
buildPythonPackage rec {
@@ -36,7 +37,7 @@ buildPythonPackage rec {
packaging
six
] ++ stdenv.lib.optional (!isPyPy) cffi
++ stdenv.lib.optionals isPy27 [ ipaddress ];
++ stdenv.lib.optionals isPy27 [ ipaddress enum34 ];
checkInputs = [
cryptography_vectors

29
pkgs/development/python-modules/envisage/default.nix
View File

@@ -1,15 +1,18 @@
{ stdenv, fetchPypi, buildPythonPackage
{ lib, fetchPypi, fetchpatch, isPy27
, buildPythonPackage
, traits, apptools
, ipykernel
, python, ipykernel, ipython
}:
buildPythonPackage rec {
pname = "envisage";
version = "4.7.2";
version = "4.9.2";
disabled = isPy27;
src = fetchPypi {
inherit pname version;
sha256 = "0jb5nw0w9x97jij0hd3d7kfzcj58r1cqmplmdy56bj11dyc4wyc9";
sha256 = "1srjmkhnz84nz5jd72vdsnc4fn7dd9jr8nyf3hzk6yx1dsn815gd";
};
propagatedBuildInputs = [ traits apptools ];
@@ -18,16 +21,26 @@ buildPythonPackage rec {
export HOME=$PWD/HOME
'';
# fix a test failure; should be merged in next release
patches = [ (fetchpatch {
url = "https://github.com/enthought/envisage/pull/248/commits/7b6d2dd615d5cb7455b200eb8f37e030bbf4df9e.patch";
sha256 = "0a3dmbpxwsn1bkjcjv9v7b751rcmppj6hc9wcgiayg4l9r2nrvyh";
}) ];
checkInputs = [
ipykernel
ipykernel ipython
];
doCheck = true;
checkPhase = ''
runHook preCheck
${python.interpreter} -m unittest
runHook postCheck
'';
meta = with stdenv.lib; {
meta = with lib; {
description = "Framework for building applications whose functionalities can be extended by adding 'plug-ins'";
homepage = "https://github.com/enthought/envisage";
maintainers = with stdenv.lib.maintainers; [ knedlsepp ];
maintainers = with lib.maintainers; [ knedlsepp ];
license = licenses.bsdOriginal;
};
}

4
pkgs/development/python-modules/howdoi/default.nix
View File

@@ -5,6 +5,8 @@
, requests-cache
, pygments
, pyquery
, cachelib
, appdirs
}:
buildPythonPackage rec {
@@ -16,7 +18,7 @@ buildPythonPackage rec {
sha256 = "3b322668606d29d8a841c3b28c0574851f512b55c33a7ceb982b6a98d82fa3e3";
};
propagatedBuildInputs = [ six requests-cache pygments pyquery ];
propagatedBuildInputs = [ six requests-cache pygments pyquery cachelib appdirs ];
preCheck = ''
export HOME=$(mktemp -d)

3
pkgs/development/python-modules/lektor/default.nix
View File

@@ -19,6 +19,7 @@
, pytest-click
, isPy27
, functools32
, setuptools
}:
buildPythonPackage rec {
@@ -34,7 +35,7 @@ buildPythonPackage rec {
propagatedBuildInputs = [
click watchdog exifread requests mistune inifile Babel jinja2
flask pyopenssl ndg-httpsclient
flask pyopenssl ndg-httpsclient setuptools
] ++ lib.optionals isPy27 [ functools32 ];
checkInputs = [

45
pkgs/development/python-modules/matplotlib/2.nix
View File

@@ -7,7 +7,6 @@
# darwin has its own "MacOSX" backend
, enableTk ? !stdenv.isDarwin, tcl ? null, tk ? null, tkinter ? null, libX11 ? null
, enableQt ? false, pyqt4
, libcxx
, Cocoa
, pythonOlder
}:
@@ -29,13 +28,20 @@ buildPythonPackage rec {
sha256 = "7355bf757ecacd5f0ac9dd9523c8e1a1103faadf8d33c22664178e17533f8ce5";
};
NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-I${libcxx}/include/c++/v1";
patches = [
# https://github.com/matplotlib/matplotlib/pull/12478
(fetchpatch {
name = "numpy-1.16-compat.patch";
url = "https://github.com/matplotlib/matplotlib/commit/2980184d092382a40ab21f95b79582ffae6e19d6.patch";
sha256 = "1c0wj28zy8s5h6qiavx9zzbhlmhjwpzbc3fyyw9039mbnqk0spg2";
})
];
XDG_RUNTIME_DIR = "/tmp";
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ python which sphinx stdenv ]
buildInputs = [ which sphinx ]
++ stdenv.lib.optional enableGhostscript ghostscript
++ stdenv.lib.optional stdenv.isDarwin [ Cocoa ];
@@ -48,16 +54,10 @@ buildPythonPackage rec {
++ stdenv.lib.optionals enableQt [ pyqt4 ]
++ stdenv.lib.optionals python.isPy2 [ functools32 subprocess32 ];
patches = [
./basedirlist.patch
# https://github.com/matplotlib/matplotlib/pull/12478
(fetchpatch {
name = "numpy-1.16-compat.patch";
url = "https://github.com/matplotlib/matplotlib/commit/2980184d092382a40ab21f95b79582ffae6e19d6.patch";
sha256 = "1c0wj28zy8s5h6qiavx9zzbhlmhjwpzbc3fyyw9039mbnqk0spg2";
})
];
setup_cfg = ./setup.cfg;
preBuild = ''
cp "$setup_cfg" ./setup.cfg
'';
# Matplotlib tries to find Tcl/Tk by opening a Tk window and asking the
# corresponding interpreter object for its library paths. This fails if
@@ -73,27 +73,14 @@ buildPythonPackage rec {
stdenv.lib.optionalString enableTk
"sed -i '/self.tcl_tk_cache = None/s|None|${tcl_tk_cache}|' setupext.py";
checkPhase = ''
${python.interpreter} tests.py
'';
# Test data is not included in the distribution (the `tests` folder
# is missing)
# Matplotlib needs to be built against a specific version of freetype in
# order for all of the tests to pass.
doCheck = false;
prePatch = ''
# Failing test: ERROR: matplotlib.tests.test_style.test_use_url
sed -i 's/test_use_url/fails/' lib/matplotlib/tests/test_style.py
# Failing test: ERROR: test suite for <class 'matplotlib.sphinxext.tests.test_tinypages.TestTinyPages'>
sed -i 's/TestTinyPages/fails/' lib/matplotlib/sphinxext/tests/test_tinypages.py
# Transient errors
sed -i 's/test_invisible_Line_rendering/noop/' lib/matplotlib/tests/test_lines.py
'';
meta = with stdenv.lib; {
description = "Python plotting library, making publication quality plots";
homepage = "https://matplotlib.org/";
maintainers = with maintainers; [ lovek323 ];
maintainers = with maintainers; [ lovek323 veprbl ];
};
}

8
pkgs/development/python-modules/matplotlib/basedirlist.patch
View File

@@ -1,8 +0,0 @@
diff --git a/setup.cfg b/setup.cfg
new file mode 100644
index 0000000..6f81985
--- /dev/null
+++ b/setup.cfg
@@ -0,0 +1,2 @@
+[directories]
+basedirlist = .

35
pkgs/development/python-modules/matplotlib/default.nix
View File

@@ -6,7 +6,6 @@
# darwin has its own "MacOSX" backend
, enableTk ? !stdenv.isDarwin, tcl ? null, tk ? null, tkinter ? null, libX11 ? null
, enableQt ? false, pyqt5 ? null
, libcxx
, Cocoa
, pythonOlder
}:
@@ -20,36 +19,35 @@ assert enableTk -> (tcl != null)
assert enableQt -> pyqt5 != null;
buildPythonPackage rec {
version = "3.1.3";
version = "3.2.1";
pname = "matplotlib";
disabled = !isPy3k;
src = fetchPypi {
inherit pname version;
sha256 = "db3121f12fb9b99f105d1413aebaeb3d943f269f3d262b45586d12765866f0c6";
sha256 = "ffe2f9cdcea1086fc414e82f42271ecf1976700b8edd16ca9d376189c6d93aee";
};
NIX_CFLAGS_COMPILE = stdenv.lib.optionalString stdenv.isDarwin "-I${libcxx}/include/c++/v1";
XDG_RUNTIME_DIR = "/tmp";
nativeBuildInputs = [ pkgconfig ];
buildInputs = [ python which sphinx stdenv ]
buildInputs = [ which sphinx ]
++ stdenv.lib.optional enableGhostscript ghostscript
++ stdenv.lib.optional stdenv.isDarwin [ Cocoa ];
propagatedBuildInputs =
[ cycler dateutil numpy pyparsing tornado freetype kiwisolver
libpng mock pytz ]
++ stdenv.lib.optional (pythonOlder "3.3") backports_functools_lru_cache
++ stdenv.lib.optionals enableGtk3 [ cairo pycairo gtk3 gobject-introspection pygobject3 ]
++ stdenv.lib.optionals enableTk [ tcl tk tkinter libX11 ]
++ stdenv.lib.optionals enableQt [ pyqt5 ];
patches =
[ ./basedirlist.patch ];
setup_cfg = ./setup.cfg;
preBuild = ''
cp "$setup_cfg" ./setup.cfg
'';
# Matplotlib tries to find Tcl/Tk by opening a Tk window and asking the
# corresponding interpreter object for its library paths. This fails if
@@ -65,27 +63,14 @@ buildPythonPackage rec {
stdenv.lib.optionalString enableTk
"sed -i '/self.tcl_tk_cache = None/s|None|${tcl_tk_cache}|' setupext.py";
checkPhase = ''
${python.interpreter} tests.py
'';
# Test data is not included in the distribution (the `tests` folder
# is missing)
# Matplotlib needs to be built against a specific version of freetype in
# order for all of the tests to pass.
doCheck = false;
prePatch = ''
# Failing test: ERROR: matplotlib.tests.test_style.test_use_url
sed -i 's/test_use_url/fails/' lib/matplotlib/tests/test_style.py
# Failing test: ERROR: test suite for <class 'matplotlib.sphinxext.tests.test_tinypages.TestTinyPages'>
sed -i 's/TestTinyPages/fails/' lib/matplotlib/sphinxext/tests/test_tinypages.py
# Transient errors
sed -i 's/test_invisible_Line_rendering/noop/' lib/matplotlib/tests/test_lines.py
'';
meta = with stdenv.lib; {
description = "Python plotting library, making publication quality plots";
homepage = "https://matplotlib.org/";
maintainers = with maintainers; [ lovek323 ];
maintainers = with maintainers; [ lovek323 veprbl ];
};
}

2
pkgs/development/python-modules/matplotlib/setup.cfg Normal file
View File

@@ -0,0 +1,2 @@
[directories]
basedirlist = .

32
pkgs/development/python-modules/mayavi/default.nix
View File

@@ -1,37 +1,45 @@
{ stdenv, fetchPypi, buildPythonPackage
, wxPython, pygments, numpy, vtk, traitsui, envisage, apptools
, nose, mock
, isPy3k
{ lib, buildPythonPackage, isPy27, fetchPypi, wrapQtAppsHook
, pyface, pygments, numpy, vtk, traitsui, envisage, apptools, pyqt5
}:
buildPythonPackage rec {
pname = "mayavi";
version = "4.7.1";
disabled = isPy27;
src = fetchPypi {
inherit pname version;
extension = "tar.bz2";
sha256 = "095p7mds6kqqrp7xqv24iygr3mw85rm7x41wb5y4yc3gi1pznldy";
};
# Discovery of 'vtk' in setuptools is not working properly, due to a missing
# .egg-info in the vtk package. It does however import and run just fine.
postPatch = ''
# Discovery of 'vtk' in setuptools is not working properly, due to a missing
# .egg-info in the vtk package. It does however import and run just fine.
substituteInPlace mayavi/__init__.py --replace "'vtk'" ""
# building the docs fails with the usual Qt xcb error, so skip:
substituteInPlace setup.py \
--replace "build.build.run(self)" "build.build.run(self); return"
'';
propagatedBuildInputs = [ wxPython pygments numpy vtk traitsui envisage apptools ];
nativeBuildInputs = [ wrapQtAppsHook ];
checkInputs = [ nose mock ];
disabled = isPy3k; # TODO: This would need pyqt5 instead of wxPython
propagatedBuildInputs = [
pyface pygments numpy vtk traitsui envisage apptools pyqt5
];
doCheck = false; # Needs X server
meta = with stdenv.lib; {
preFixup = ''
makeWrapperArgs+=("''${qtWrapperArgs[@]}")
'';
meta = with lib; {
description = "3D visualization of scientific data in Python";
homepage = "https://github.com/enthought/mayavi";
maintainers = with stdenv.lib.maintainers; [ knedlsepp ];
maintainers = with maintainers; [ knedlsepp ];
license = licenses.bsdOriginal;
};
}

26
pkgs/development/python-modules/publicsuffix2/default.nix Normal file
View File

@@ -0,0 +1,26 @@
{ stdenv, buildPythonPackage, fetchFromGitHub, requests }:
buildPythonPackage rec {
pname = "publicsuffix2";
version = "2.20191221";
# Tests are missing in the sdist
# See: https://github.com/nexB/python-publicsuffix2/issues/12
src = fetchFromGitHub {
owner = "nexB";
repo = "python-publicsuffix2";
rev = "release-2.2019-12-21";
sha256 = "1dkvfvl0izq9hqzilnw8ipkbgjs9xyad9p21i3864hzinbh0wp9r";
};
nativeBuildInputs = [ requests ];
meta = with stdenv.lib; {
description = ''
Get a public suffix for a domain name using the Public Suffix
List. Forked from and using the same API as the publicsuffix package.
'';
homepage = "https://pypi.python.org/pypi/publicsuffix2/";
license = licenses.mpl20;
};
}

4
pkgs/development/python-modules/pyface/default.nix
View File

@@ -1,5 +1,5 @@
{ stdenv, fetchPypi, buildPythonPackage
, setuptools, six, traits, wxPython
, setuptools, six, traits
}:
buildPythonPackage rec {
@@ -11,7 +11,7 @@ buildPythonPackage rec {
sha256 = "1g2g3za64rfffbivlihbf5njrqbv63ln62rv9d8fi1gcrgaw6akw";
};
propagatedBuildInputs = [ setuptools six traits wxPython ];
propagatedBuildInputs = [ setuptools six traits ];
doCheck = false; # Needs X server

2
pkgs/development/python-modules/pyopengl/default.nix
View File

@@ -15,7 +15,7 @@ buildPythonPackage rec {
sha256 = "0bdf5ed600df30c8830455702338902528717c0af85ac5914f1dc5aa0bfa6eee";
};
propagatedBuildInputs = [ pkgs.libGLU pkgs.libGL pkgs.freeglut pillow ];
propagatedBuildInputs = [ pillow ];
patchPhase = let
ext = stdenv.hostPlatform.extensions.sharedLibrary; in ''

4
pkgs/development/python-modules/pytesseract/default.nix
View File

@@ -2,11 +2,11 @@
buildPythonPackage rec {
pname = "pytesseract";
version = "0.3.3";
version = "0.3.4";
src = fetchPypi {
inherit pname version;
sha256 = "0lml55jrvdzy9fm31zpw64fqc4d6p5djg1ax2kgnimzfscxghh8h";
sha256 = "16l9b9f5v0a9j5jfgpd8irk9yhc9byzirrzv1rlkapdbz36sbn5g";
};
patches = [

3
pkgs/development/python-modules/secretstorage/default.nix
View File

@@ -1,4 +1,4 @@
{ lib, fetchPypi, buildPythonPackage, pythonOlder, cryptography, jeepney, pygobject3 }:
{ lib, fetchPypi, buildPythonPackage, pythonOlder, cryptography, jeepney }:
buildPythonPackage rec {
pname = "secretstorage";
@@ -15,7 +15,6 @@ buildPythonPackage rec {
propagatedBuildInputs = [
cryptography
jeepney
pygobject3
];
# Needs a D-Bus Sesison