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-18 10:32:12 +01:00
parent 327ecf882a d208fa53eb
commit 63c6875f26
346 changed files with 64817 additions and 64479 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -196,6 +196,8 @@ in {
astropy = callPackage ../development/python-modules/astropy { };
astroquery = callPackage ../development/python-modules/astroquery { };
atom = callPackage ../development/python-modules/atom { };
augeas = callPackage ../development/python-modules/augeas {
@@ -278,6 +280,8 @@ in {
browsermob-proxy = disabledIf isPy3k (callPackage ../development/python-modules/browsermob-proxy {});
bt_proximity = callPackage ../development/python-modules/bt-proximity { };
bugseverywhere = callPackage ../applications/version-management/bugseverywhere {};
cachecontrol = callPackage ../development/python-modules/cachecontrol { };
@@ -390,6 +394,10 @@ in {
hdmedians = callPackage ../development/python-modules/hdmedians { };
hoomd-blue = toPythonModule (callPackage ../development/python-modules/hoomd-blue {
inherit python;
});
httpsig = callPackage ../development/python-modules/httpsig { };
i3ipc = callPackage ../development/python-modules/i3ipc { };
@@ -454,6 +462,10 @@ in {
outcome = callPackage ../development/python-modules/outcome {};
ovito = toPythonModule (pkgs.libsForQt5.callPackage ../development/python-modules/ovito {
pythonPackages = self;
});
palettable = callPackage ../development/python-modules/palettable { };
pathlib = callPackage ../development/python-modules/pathlib { };
@@ -520,6 +532,8 @@ in {
pyfakefs = callPackage ../development/python-modules/pyfakefs {};
pyfttt = callPackage ../development/python-modules/pyfttt { };
pygame = callPackage ../development/python-modules/pygame { };
pygame-git = callPackage ../development/python-modules/pygame/git.nix { };
@@ -704,6 +718,8 @@ in {
pyunbound = callPackage ../tools/networking/unbound/python.nix { };
WazeRouteCalculator = callPackage ../development/python-modules/WazeRouteCalculator { };
# packages defined here
aafigure = callPackage ../development/python-modules/aafigure { };
@@ -2950,6 +2966,8 @@ in {
nose = callPackage ../development/python-modules/nose { };
nose-cov = callPackage ../development/python-modules/nose-cov { };
nose-exclude = callPackage ../development/python-modules/nose-exclude { };
nose2 = callPackage ../development/python-modules/nose2 { };
@@ -4878,17 +4896,9 @@ in {
rfc7464 = callPackage ../development/python-modules/rfc7464 { };
foundationdb51 = (toPythonModule (pkgs.fdbPackages.override {
inherit python;
}).foundationdb51).python;
foundationdb52 = (toPythonModule (pkgs.fdbPackages.override {
inherit python;
}).foundationdb52).python;
foundationdb60 = (toPythonModule (pkgs.fdbPackages.override {
inherit python;
}).foundationdb60).python;
foundationdb51 = callPackage ../servers/foundationdb/python.nix { foundationdb = pkgs.foundationdb51; };
foundationdb52 = callPackage ../servers/foundationdb/python.nix { foundationdb = pkgs.foundationdb52; };
foundationdb60 = callPackage ../servers/foundationdb/python.nix { foundationdb = pkgs.foundationdb60; };
libtorrentRasterbar = (toPythonModule (pkgs.libtorrentRasterbar.override {
inherit python;