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

Merge branch 'master' into staging-next

Browse Source
This commit is contained in:
Vladimír Čunát
2018-11-26 10:28:00 +01:00
parent e41154d1ab 4fef4fbb4b
commit a5de78b7d7
198 changed files with 2486 additions and 1200 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/top-level/python-packages.nix
+8
View File
@@ -2068,6 +2068,8 @@ in {
setuptools-git = callPackage ../development/python-modules/setuptools-git { };
sievelib = callPackage ../development/python-modules/sievelib { };
watchdog = callPackage ../development/python-modules/watchdog { };
zope_deprecation = callPackage ../development/python-modules/zope_deprecation { };
@@ -3827,6 +3829,8 @@ in {
simplejson = callPackage ../development/python-modules/simplejson { };
simplekml = callPackage ../development/python-modules/simplekml { };
slimit = callPackage ../development/python-modules/slimit { };
snowballstemmer = callPackage ../development/python-modules/snowballstemmer { };
@@ -4732,6 +4736,8 @@ in {
tvdb_api = callPackage ../development/python-modules/tvdb_api { };
sdnotify = callPackage ../development/python-modules/sdnotify { };
tvnamer = callPackage ../development/python-modules/tvnamer { };
threadpool = callPackage ../development/python-modules/threadpool { };
@@ -4975,6 +4981,8 @@ in {
simpy = callPackage ../development/python-modules/simpy { };
yattag = callPackage ../development/python-modules/yattag { };
z3 = (toPythonModule (pkgs.z3.override {
inherit python;
})).python;