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-30 17:46:21 +01:00
parent 70f5d64cb3 74e283403c
commit 1828a5c5ba
101 changed files with 1225 additions and 601 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkgs/top-level/python-packages.nix
+22
View File
@@ -595,6 +595,8 @@ in {
pyparser = callPackage ../development/python-modules/pyparser { };
pyres = callPackage ../development/python-modules/pyres { };
pyqt4 = callPackage ../development/python-modules/pyqt/4.x.nix {
pythonPackages = self;
};
@@ -619,6 +621,8 @@ in {
slurm = pkgs.slurm;
};
pyssim = callPackage ../development/python-modules/pyssim { };
pystache = callPackage ../development/python-modules/pystache { };
pytesseract = callPackage ../development/python-modules/pytesseract { };
@@ -635,6 +639,8 @@ in {
python-ldap-test = callPackage ../development/python-modules/python-ldap-test { };
python-mnist = callPackage ../development/python-modules/python-mnist { };
python-igraph = callPackage ../development/python-modules/python-igraph {
pkgconfig = pkgs.pkgconfig;
igraph = pkgs.igraph;
@@ -666,6 +672,8 @@ in {
relatorio = callPackage ../development/python-modules/relatorio { };
remotecv = callPackage ../development/python-modules/remotecv { };
pyzufall = callPackage ../development/python-modules/pyzufall { };
rhpl = disabledIf isPy3k (callPackage ../development/python-modules/rhpl {});
@@ -1146,6 +1154,8 @@ in {
cairocffi = callPackage ../development/python-modules/cairocffi {};
cairosvg1 = callPackage ../development/python-modules/cairosvg/1_x.nix {};
cairosvg = callPackage ../development/python-modules/cairosvg {};
carrot = callPackage ../development/python-modules/carrot {};
@@ -3080,6 +3090,8 @@ in {
nose-exclude = callPackage ../development/python-modules/nose-exclude { };
nose-focus = callPackage ../development/python-modules/nose-focus { };
nose2 = callPackage ../development/python-modules/nose2 { };
nose-cover3 = callPackage ../development/python-modules/nose-cover3 { };
@@ -3090,6 +3102,10 @@ in {
nose-cprof = callPackage ../development/python-modules/nose-cprof { };
nose-of-yeti = callPackage ../development/python-modules/nose-of-yeti { };
nose-pattern-exclude = callPackage ../development/python-modules/nose-pattern-exclude { };
nose_warnings_filters = callPackage ../development/python-modules/nose_warnings_filters { };
notebook = callPackage ../development/python-modules/notebook { };
@@ -3857,6 +3873,8 @@ in {
simplegeneric = callPackage ../development/python-modules/simplegeneric { };
should-dsl = callPackage ../development/python-modules/should-dsl { };
simplejson = callPackage ../development/python-modules/simplejson { };
simplekml = callPackage ../development/python-modules/simplekml { };
@@ -4852,12 +4870,16 @@ in {
packaging = callPackage ../development/python-modules/packaging { };
preggy = callPackage ../development/python-modules/preggy { };
pytoml = callPackage ../development/python-modules/pytoml { };
pypandoc = callPackage ../development/python-modules/pypandoc { };
yamllint = callPackage ../development/python-modules/yamllint { };
yanc = callPackage ../development/python-modules/yanc { };
yarl = callPackage ../development/python-modules/yarl { };
suseapi = callPackage ../development/python-modules/suseapi { };