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

Merge master into staging-next

Browse Source
This commit is contained in:
Frederik Rietdijk
2018-11-21 12:39:20 +01:00
parent 3357b3e86e f0b49c4d10
commit 701375662b
95 changed files with 12239 additions and 9200 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
pkgs/development/python-modules/cvxopt/default.nix
View File

@@ -1,4 +1,5 @@
{ lib
{ stdenv
, lib
, buildPythonPackage
, fetchPypi
, isPyPy
@@ -15,13 +16,13 @@
buildPythonPackage rec {
pname = "cvxopt";
version = "1.2.1";
version = "1.2.2";
disabled = isPyPy; # hangs at [translation:info]
src = fetchPypi {
inherit pname version;
sha256 = "12e3cfda982576b0b9b597d297aaf3172efa765a20fbed6f3c066aa0c48ee817";
sha256 = "19ipi6ljj9qv87lhgcsky1gy9543gcmqdbgzpk6v5ccv90nrcf00";
};
# similar to Gsl, glpk, fftw there is also a dsdp interface
@@ -50,7 +51,7 @@ buildPythonPackage rec {
${python.interpreter} -m unittest discover -s tests
'';
meta = {
meta = with lib; {
homepage = http://cvxopt.org/;
description = "Python Software for Convex Optimization";
longDescription = ''
@@ -63,7 +64,8 @@ buildPythonPackage rec {
standard library and on the strengths of Python as a high-level
programming language.
'';
maintainers = with lib.maintainers; [ edwtjo ];
license = lib.licenses.gpl3Plus;
maintainers = with maintainers; [ edwtjo ];
broken = stdenv.targetPlatform.isDarwin;
license = licenses.gpl3Plus;
};
}

41
pkgs/development/python-modules/ipykernel/4.nix Normal file
View File

@@ -0,0 +1,41 @@
{ lib
, buildPythonPackage
, fetchPypi
, nose
, isPy27
, mock
, ipython
, jupyter_client
, pexpect
, traitlets
, tornado
}:
buildPythonPackage rec {
pname = "ipykernel";
version = "4.10.0";
src = fetchPypi {
inherit pname version;
sha256 = "699103c8e64886e3ec7053f2a6aa83bb90426063526f63a818732ff385202bad";
};
checkInputs = [ nose ] ++ lib.optional isPy27 mock;
propagatedBuildInputs = [
ipython
jupyter_client
pexpect
traitlets
tornado
];
# Tests require backends.
# I don't want to add all supported backends as propagatedBuildInputs
doCheck = false;
meta = {
description = "IPython Kernel for Jupyter";
homepage = http://ipython.org/;
license = lib.licenses.bsd3;
};
}

30
pkgs/development/python-modules/ipykernel/default.nix
View File

@@ -1,37 +1,31 @@
{ lib
, buildPythonPackage
, fetchPypi
, nose
, isPy27
, mock
, ipython
, jupyter_client
, pexpect
, traitlets
, tornado
, pythonOlder
, pytest
, nose
}:
buildPythonPackage rec {
pname = "ipykernel";
version = "4.8.2";
version = "5.1.0";
disabled = pythonOlder "3.4";
src = fetchPypi {
inherit pname version;
sha256 = "c091449dd0fad7710ddd9c4a06e8b9e15277da306590bc07a3a1afa6b4453c8f";
sha256 = "0fc0bf97920d454102168ec2008620066878848fcfca06c22b669696212e292f";
};
buildInputs = [ nose ] ++ lib.optional isPy27 mock;
propagatedBuildInputs = [
ipython
jupyter_client
pexpect
traitlets
tornado
];
checkInputs = [ pytest nose ];
propagatedBuildInputs = [ ipython jupyter_client traitlets tornado ];
# Tests require backends.
# I don't want to add all supported backends as propagatedBuildInputs
doCheck = false;
checkPhase = ''
HOME=$(mktemp -d) pytest ipykernel
'';
meta = {
description = "IPython Kernel for Jupyter";
@@ -39,4 +33,4 @@ buildPythonPackage rec {
license = lib.licenses.bsd3;
maintainers = with lib.maintainers; [ fridh ];
};
}
}

14
pkgs/development/python-modules/ipython/5.nix
View File

@@ -26,27 +26,17 @@
buildPythonPackage rec {
pname = "ipython";
version = "5.7.0";
version = "5.8.0";
src = fetchPypi {
inherit pname version;
sha256 = "0g1jm06qriq48m58311cs7askp83ipq3yq96hv4kg431nxzkmd4d";
sha256 = "4bac649857611baaaf76bc82c173aa542f7486446c335fe1a6c05d0d491c8906";
};
prePatch = stdenv.lib.optionalString stdenv.isDarwin ''
substituteInPlace setup.py --replace "'gnureadline'" " "
'';
patches = [
# improve cython support, needed by sage, accepted upstream
# https://github.com/ipython/ipython/pull/11139
(fetchpatch {
name = "signature-use-inspect.patch";
url = "https://github.com/ipython/ipython/commit/8d399b98d3ed5c765835594100c4d36fb2f739dc.patch";
sha256 = "1r7v9clwwbskmj4y160vcj6g0vzqbvnj4y1bm2n4bskafapm42g0";
})
];
buildInputs = [ glibcLocales ];
checkInputs = [ nose pygments testpath ] ++ lib.optional isPy27 mock;

17
pkgs/development/python-modules/ipython/default.nix
View File

@@ -12,22 +12,21 @@
, jedi
, decorator
, pickleshare
, simplegeneric
, traitlets
, prompt_toolkit
, pexpect
, appnope
, typing
, backcall
}:
buildPythonPackage rec {
pname = "ipython";
version = "6.5.0";
version = "7.1.1";
disabled = pythonOlder "3.5";
src = fetchPypi {
inherit pname version;
sha256 = "b0f2ef9eada4a68ef63ee10b6dde4f35c840035c50fd24265f8052c98947d5a4";
sha256 = "b10a7ddd03657c761fc503495bc36471c8158e3fc948573fb9fe82a7029d8efd";
};
prePatch = lib.optionalString stdenv.isDarwin ''
@@ -42,13 +41,12 @@ buildPythonPackage rec {
jedi
decorator
pickleshare
simplegeneric
traitlets
prompt_toolkit
pygments
pexpect
backcall
] ++ lib.optionals stdenv.isDarwin [appnope]
++ lib.optionals (pythonOlder "3.5") [ typing ];
] ++ lib.optionals stdenv.isDarwin [appnope];
LC_ALL="en_US.UTF-8";
@@ -58,11 +56,6 @@ buildPythonPackage rec {
nosetests
'';
# IPython 6.0.0 and above does not support Python < 3.3.
# The last IPython version to support older Python versions
# is 5.3.x.
disabled = pythonOlder "3.3";
meta = {
description = "IPython: Productive Interactive Computing";
homepage = http://ipython.org/;

38
pkgs/development/python-modules/jupyter_console/5.nix Normal file
View File

@@ -0,0 +1,38 @@
{ lib
, buildPythonPackage
, fetchPypi
, nose
, jupyter_client
, ipython
, ipykernel
, prompt_toolkit
, pygments
}:
buildPythonPackage rec {
pname = "jupyter_console";
version = "5.2.0";
src = fetchPypi {
inherit pname version;
sha256 = "545dedd3aaaa355148093c5609f0229aeb121b4852995c2accfa64fe3e0e55cd";
};
checkInputs = [ nose ];
propagatedBuildInputs = [
jupyter_client
ipython
ipykernel
prompt_toolkit
pygments
];
# ValueError: underlying buffer has been detached
doCheck = false;
meta = {
description = "Jupyter terminal console";
homepage = "http://jupyter.org/";
license = lib.licenses.bsd3;
};
}

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

@@ -7,15 +7,17 @@
, ipykernel
, prompt_toolkit
, pygments
, pythonOlder
}:
buildPythonPackage rec {
pname = "jupyter_console";
version = "5.2.0";
version = "6.0.0";
disabled = pythonOlder "3.5";
src = fetchPypi {
inherit pname version;
sha256 = "545dedd3aaaa355148093c5609f0229aeb121b4852995c2accfa64fe3e0e55cd";
sha256 = "308ce876354924fb6c540b41d5d6d08acfc946984bf0c97777c1ddcb42e0b2f5";
};
checkInputs = [ nose ];
@@ -34,6 +36,5 @@ buildPythonPackage rec {
description = "Jupyter terminal console";
homepage = "http://jupyter.org/";
license = lib.licenses.bsd3;
platforms = lib.platforms.all;
};
}
}

26
pkgs/development/python-modules/jupyterhub/default.nix
View File

@@ -6,6 +6,8 @@
, ipython
, jinja2
, python-oauth2
, prometheus_client
, async_generator
, pamela
, sqlalchemy
, tornado
@@ -18,27 +20,27 @@
let
# js/css assets that setup.py tries to fetch via `npm install` when building
# from source.
bootstrap =
bootstrap =
fetchzip {
url = "https://registry.npmjs.org/bootstrap/-/bootstrap-3.3.7.tgz";
sha256 = "0r7s54bbf68ri1na9bbabyf12mcpb6zk5ja2q6z82aw1fa4xi3yd";
};
font-awesome =
font-awesome =
fetchzip {
url = "https://registry.npmjs.org/font-awesome/-/font-awesome-4.7.0.tgz";
sha256 = "1xnxbdlfdd60z5ix152m8r2kk9dkwlqwpypky1mm3dv64ajnzdbk";
};
jquery =
jquery =
fetchzip {
url = "https://registry.npmjs.org/jquery/-/jquery-3.2.1.tgz";
sha256 = "1j6y18miwzafdj8kfpwbmbn9qvgnbnpc7l4arqrhqj33m04xrlgi";
};
moment =
moment =
fetchzip {
url = "https://registry.npmjs.org/moment/-/moment-2.18.1.tgz";
sha256 = "1b4vyvs24v6y92pf2iqjm5aa7jg7khcpspn00girc7lpi917f9vw";
url = "https://registry.npmjs.org/moment/-/moment-2.22.2.tgz";
sha256 = "12gb3p0rz5wyjwykv9g0pix7dd352lx1z7rzdjsf2brhwc4ffyip";
};
requirejs =
requirejs =
fetchzip {
url = "https://registry.npmjs.org/requirejs/-/requirejs-2.3.4.tgz";
sha256 = "0q6mkj0iv341kks06dya6lfs2kdw0n6vc7n4a7aa3ia530fk9vja";
@@ -48,11 +50,12 @@ in
buildPythonPackage rec {
pname = "jupyterhub";
version = "0.8.1";
version = "0.9.4";
disabled = pythonOlder "3.5";
src = fetchPypi {
inherit pname version;
sha256 = "100cf18d539802807a45450d38fefbb376cf1c810f3b1b31be31638829a5c69c";
sha256 = "7848bbb299536641a59eb1977ec3c7c95d931bace4a2803d7e9b28b9256714da";
};
# Most of this only applies when building from source (e.g. js/css assets are
@@ -103,14 +106,13 @@ buildPythonPackage rec {
propagatedBuildInputs = [
alembic ipython jinja2 pamela python-oauth2 requests sqlalchemy tornado
traitlets
traitlets prometheus_client async_generator
];
# Disable tests because they take an excessive amount of time to complete.
doCheck = false;
disabled = pythonOlder "3.4";
meta = with lib; {
description = "Serves multiple Jupyter notebook instances";
homepage = http://jupyter.org/;

21
pkgs/development/python-modules/jupyterlab/default.nix
View File

@@ -1,19 +1,22 @@
{ lib, buildPythonPackage, isPy3k, fetchPypi, ipython_genutils, jupyterlab_launcher, notebook }:
{ lib
, buildPythonPackage
, fetchPypi
, jupyterlab_server
, notebook
, pythonOlder
}:
buildPythonPackage rec {
pname = "jupyterlab";
version = "0.34.12";
disabled = !isPy3k;
version = "0.35.4";
disabled = pythonOlder "3.5";
src = fetchPypi {
inherit pname version;
sha256 = "7d8378d19a0ae173e91a493db996c37828b410b7ee556da21a153486168ecf87";
sha256 = "deba0b2803640fcad72c61366bff11d5945173015961586d5e3b2f629ffeb455";
};
propagatedBuildInputs = [
ipython_genutils
jupyterlab_launcher
notebook
];
propagatedBuildInputs = [ jupyterlab_server notebook ];
makeWrapperArgs = [
"--set" "JUPYTERLAB_DIR" "$out/share/jupyter/lab"

38
pkgs/development/python-modules/jupyterlab_server/default.nix Normal file
View File

@@ -0,0 +1,38 @@
{ stdenv
, buildPythonPackage
, fetchPypi
, notebook
, jsonschema
, pythonOlder
, requests
, pytest
}:
buildPythonPackage rec {
pname = "jupyterlab_server";
version = "0.2.0";
disabled = pythonOlder "3.5";
src = fetchPypi {
inherit pname version;
sha256 = "72d916a73957a880cdb885def6d8664a6d1b2760ef5dca5ad665aa1e8d1bb783";
};
checkInputs = [ requests pytest ];
propagatedBuildInputs = [ notebook jsonschema ];
# test_listing test fails
# this is a new package and not all tests pass
doCheck = false;
checkPhase = ''
pytest
'';
meta = with stdenv.lib; {
description = "JupyterLab Server";
homepage = http://jupyter.org;
license = licenses.bsdOriginal;
maintainers = [ maintainers.costrouc ];
};
}

20
pkgs/development/python-modules/magic-wormhole-mailbox-server/default.nix Normal file
View File

@@ -0,0 +1,20 @@
{ stdenv, buildPythonPackage, fetchPypi, six, attrs, twisted, pyopenssl, service-identity, autobahn, treq, mock }:
buildPythonPackage rec {
version = "0.3.1";
pname = "magic-wormhole-mailbox-server";
src = fetchPypi {
inherit pname version;
sha256 = "1q6zhbx8fcpk7rchclm7yqcxdsc1x97hki2ji61sa544r5xvxv55";
};
propagatedBuildInputs = [ six attrs twisted pyopenssl service-identity autobahn ];
checkInputs = [ treq mock ];
meta = with stdenv.lib; {
description = "Securely transfer data between computers";
homepage = https://github.com/warner/magic-wormhole-mailbox-server;
license = licenses.mit;
};
}

37
pkgs/development/python-modules/magic-wormhole/default.nix
View File

@@ -1,8 +1,6 @@
{ lib
{ stdenv
, buildPythonPackage
, fetchPypi
, pythonAtLeast
, python
, spake2
, pynacl
, six
@@ -14,49 +12,42 @@
, tqdm
, click
, humanize
, ipaddress
, txtorcon
, nettools
, glibc
, glibcLocales
, mock
, magic-wormhole-transit-relay
, magic-wormhole-mailbox-server
}:
buildPythonPackage rec {
pname = "magic-wormhole";
version = "0.10.5";
version = "0.11.2";
src = fetchPypi {
inherit pname version;
sha256 = "9558ea1f3551e535deec3462cd5c8391cb32ebb12ecd8b40b36861dbee4917ee";
sha256 = "01fr4bi6kc6fz9n3c4qq892inrc3nf6p2djy65yvm7xkvdxncydf";
};
checkInputs = [ mock magic-wormhole-transit-relay ];
buildInputs = [ nettools glibcLocales ];
propagatedBuildInputs = [ spake2 pynacl six attrs twisted autobahn automat hkdf tqdm click humanize ipaddress txtorcon ];
buildInputs = [ glibcLocales ];
propagatedBuildInputs = [ spake2 pynacl six attrs twisted autobahn automat hkdf tqdm click humanize txtorcon ];
checkInputs = [ mock magic-wormhole-transit-relay magic-wormhole-mailbox-server ];
postPatch = ''
sed -i -e "s|'ifconfig'|'${nettools}/bin/ifconfig'|" src/wormhole/ipaddrs.py
sed -i -e "s|if (os.path.dirname(os.path.abspath(wormhole))|if not os.path.abspath(wormhole).startswith('/nix/store') and (os.path.dirname(os.path.abspath(wormhole))|" src/wormhole/test/test_cli.py
# magic-wormhole will attempt to find all available locales by running
# 'locale -a'. If we're building on Linux, then this may result in us
# running the system's locale binary instead of the one from Nix, so let's
# ensure we patch this.
sed -i -e 's|getProcessOutputAndValue("locale"|getProcessOutputAndValue("${glibc}/bin/locale"|' src/wormhole/test/test_cli.py
'' + lib.optionalString (pythonAtLeast "3.3") ''
sed -i -e 's|"ipaddress",||' setup.py
'';
checkPhase = ''
export PATH="$PATH:$out/bin"
preCheck = ''
export PATH=$out/bin:$PATH
export LANG="en_US.UTF-8"
export LC_ALL="en_US.UTF-8"
${python.interpreter} -m wormhole.test.run_trial wormhole
substituteInPlace src/wormhole/test/test_cli.py \
--replace 'getProcessOutputAndValue("locale", ["-a"])' 'getProcessOutputAndValue("locale", ["-a"], env=os.environ)' \
--replace 'if (os.path.dirname(os.path.abspath(wormhole))' 'if not os.path.abspath(wormhole).startswith("/nix/store") and (os.path.dirname(os.path.abspath(wormhole))' \
--replace 'locale_env = dict(LC_ALL=locale, LANG=locale)' 'locale_env = dict(LC_ALL=locale, LANG=locale, LOCALE_ARCHIVE=os.getenv("LOCALE_ARCHIVE"))'
'';
meta = with lib; {
meta = with stdenv.lib; {
description = "Securely transfer data between computers";
homepage = https://github.com/warner/magic-wormhole;
license = licenses.mit;

12
pkgs/development/python-modules/nbconvert/default.nix
View File

@@ -17,15 +17,16 @@
, pandocfilters
, tornado
, jupyter_client
, defusedxml
}:
buildPythonPackage rec {
pname = "nbconvert";
version = "5.3.1";
version = "5.4.0";
src = fetchPypi {
inherit pname version;
sha256 = "1f9dkvpx186xjm4xab0qbph588mncp4vqk3fmxrsnqs43mks9c8j";
sha256 = "a8a2749f972592aa9250db975304af6b7337f32337e523a2c995cc9e12c07807";
};
checkInputs = [ nose pytest glibcLocales ];
@@ -33,11 +34,14 @@ buildPythonPackage rec {
propagatedBuildInputs = [
entrypoints bleach mistune jinja2 pygments traitlets testpath
jupyter_core nbformat ipykernel pandocfilters tornado jupyter_client
defusedxml
];
# disable preprocessor tests for ipython 7
# see issue https://github.com/jupyter/nbconvert/issues/898
checkPhase = ''
mkdir tmp
LC_ALL=en_US.UTF-8 HOME=`realpath tmp` py.test -v
export LC_ALL=en_US.UTF-8
HOME=$(mktemp -d) py.test -v --ignore="nbconvert/preprocessors/tests/test_execute.py"
'';
meta = {

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

@@ -25,11 +25,11 @@
buildPythonPackage rec {
pname = "notebook";
version = "5.6.0";
version = "5.7.0";
src = fetchPypi {
inherit pname version;
sha256 = "e2c8e931cc19db4f8c63e6a396efbc13a228b2cb5b2919df011b946f28239a08";
sha256 = "b85e4de3d54cf4f14fe1d0515a980ccb49ddd4cdd21250cc0d4fb6374d50b1a7";
};
LC_ALL = "en_US.utf8";