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

Merge branch 'master' into staging

Browse Source
This commit is contained in:
Jan Tojnar
2018-12-24 15:02:29 +01:00
parent d5d15828b5 dd3eea4b47
commit ef935fa101
336 changed files with 5417 additions and 2469 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -26,7 +26,7 @@ let
isPy35 = python.pythonVersion == "3.5";
isPy36 = python.pythonVersion == "3.6";
isPy37 = python.pythonVersion == "3.7";
isPyPy = python.executable == "pypy";
isPyPy = strings.substring 0 4 python.executable == "pypy";
isPy3k = strings.substring 0 1 python.pythonVersion == "3";
callPackage = pkgs.newScope self;
@@ -358,6 +358,8 @@ in {
filterpy = callPackage ../development/python-modules/filterpy { };
fints = callPackage ../development/python-modules/fints { };
fire = callPackage ../development/python-modules/fire { };
fdint = callPackage ../development/python-modules/fdint { };
@@ -702,6 +704,8 @@ in {
selectors2 = callPackage ../development/python-modules/selectors2 { };
sepaxml = callPackage ../development/python-modules/sepaxml { };
serversyncstorage = callPackage ../development/python-modules/serversyncstorage {};
shellingham = callPackage ../development/python-modules/shellingham {};
@@ -1871,6 +1875,8 @@ in {
jupyterlab = callPackage ../development/python-modules/jupyterlab {};
jupytext = callPackage ../development/python-modules/jupytext { };
PyLTI = callPackage ../development/python-modules/pylti { };
lmdb = callPackage ../development/python-modules/lmdb { };
@@ -2209,7 +2215,7 @@ in {
django_tagging = callPackage ../development/python-modules/django_tagging { };
django_tagging_0_4_3 = if
self.django.version != "1.8.18"
self.django.version != "1.8.19"
then throw "django_tagging_0_4_3 should be build with django_1_8"
else (callPackage ../development/python-modules/django_tagging {}).overrideAttrs (attrs: rec {
pname = "django-tagging";
@@ -3719,7 +3725,7 @@ in {
pythonnet = callPackage ../development/python-modules/pythonnet {
# `mono >= 4.6` required to prevent crashes encountered with earlier versions.
mono = pkgs.mono46;
mono = pkgs.mono4;
};
pytz = callPackage ../development/python-modules/pytz { };
@@ -3932,6 +3938,8 @@ in {
snowballstemmer = callPackage ../development/python-modules/snowballstemmer { };
snscrape = callPackage ../development/python-modules/snscrape { };
snug = callPackage ../development/python-modules/snug { };
snuggs = callPackage ../development/python-modules/snuggs { };
@@ -4371,8 +4379,6 @@ in {
unittest-xml-reporting = callPackage ../development/python-modules/unittest-xml-reporting { };
uritemplate_py = callPackage ../development/python-modules/uritemplate_py { };
traceback2 = callPackage ../development/python-modules/traceback2 { };
linecache2 = callPackage ../development/python-modules/linecache2 { };