Merge staging into python-unstable
This commit is contained in:
@@ -168,6 +168,10 @@ in {
|
||||
|
||||
aioimaplib = callPackage ../development/python-modules/aioimaplib { };
|
||||
|
||||
aiolifx = callPackage ../development/python-modules/aiolifx { };
|
||||
|
||||
aiolifx-effects = callPackage ../development/python-modules/aiolifx-effects { };
|
||||
|
||||
aioamqp = callPackage ../development/python-modules/aioamqp { };
|
||||
|
||||
ansicolor = callPackage ../development/python-modules/ansicolor { };
|
||||
@@ -264,6 +268,8 @@ in {
|
||||
|
||||
bayespy = callPackage ../development/python-modules/bayespy { };
|
||||
|
||||
beanstalkc = disabledIf isPy3k (callPackage ../development/python-modules/beanstalkc {});
|
||||
|
||||
bitarray = callPackage ../development/python-modules/bitarray { };
|
||||
|
||||
bitcoinlib = callPackage ../development/python-modules/bitcoinlib { };
|
||||
@@ -486,6 +492,8 @@ in {
|
||||
|
||||
nanomsg-python = callPackage ../development/python-modules/nanomsg-python { inherit (pkgs) nanomsg; };
|
||||
|
||||
nbsphinx = callPackage ../development/python-modules/nbsphinx { };
|
||||
|
||||
nbval = callPackage ../development/python-modules/nbval { };
|
||||
|
||||
nest-asyncio = callPackage ../development/python-modules/nest-asyncio { };
|
||||
@@ -712,6 +720,8 @@ in {
|
||||
|
||||
python-binance = callPackage ../development/python-modules/python-binance { };
|
||||
|
||||
python-dbusmock = callPackage ../development/python-modules/python-dbusmock { };
|
||||
|
||||
python-engineio = callPackage ../development/python-modules/python-engineio { };
|
||||
|
||||
python-hosts = callPackage ../development/python-modules/python-hosts { };
|
||||
@@ -840,6 +850,8 @@ in {
|
||||
|
||||
webapp2 = callPackage ../development/python-modules/webapp2 { };
|
||||
|
||||
wrf-python = callPackage ../development/python-modules/wrf-python { };
|
||||
|
||||
pyunbound = callPackage ../tools/networking/unbound/python.nix { };
|
||||
|
||||
WazeRouteCalculator = callPackage ../development/python-modules/WazeRouteCalculator { };
|
||||
@@ -1094,11 +1106,10 @@ in {
|
||||
|
||||
cached-property = callPackage ../development/python-modules/cached-property { };
|
||||
|
||||
caffe = pkgs.caffe.override {
|
||||
python = self.python;
|
||||
boost = self.boost;
|
||||
numpy = self.numpy;
|
||||
};
|
||||
caffe = toPythonModule (pkgs.caffe.override {
|
||||
pythonSupport = true;
|
||||
inherit (self) python numpy boost;
|
||||
});
|
||||
|
||||
capstone = callPackage ../development/python-modules/capstone { };
|
||||
|
||||
@@ -4069,6 +4080,8 @@ in {
|
||||
|
||||
scikit-bio = callPackage ../development/python-modules/scikit-bio { };
|
||||
|
||||
scikit-build = callPackage ../development/python-modules/scikit-build { };
|
||||
|
||||
scp = callPackage ../development/python-modules/scp {};
|
||||
|
||||
seaborn = callPackage ../development/python-modules/seaborn { };
|
||||
|
||||
Reference in New Issue
Block a user