Merge master into staging-next
This commit is contained in:
@@ -268,7 +268,7 @@ in {
|
||||
|
||||
bayespy = callPackage ../development/python-modules/bayespy { };
|
||||
|
||||
beanstalkc = disabledIf isPy3k (callPackage ../development/python-modules/beanstalkc {});
|
||||
beanstalkc = callPackage ../development/python-modules/beanstalkc { };
|
||||
|
||||
bitarray = callPackage ../development/python-modules/bitarray { };
|
||||
|
||||
@@ -418,6 +418,8 @@ in {
|
||||
|
||||
guestfs = callPackage ../development/python-modules/guestfs { };
|
||||
|
||||
gumath = callPackage ../development/python-modules/gumath { };
|
||||
|
||||
h5py = callPackage ../development/python-modules/h5py {
|
||||
hdf5 = pkgs.hdf5;
|
||||
};
|
||||
@@ -496,6 +498,8 @@ in {
|
||||
|
||||
nbval = callPackage ../development/python-modules/nbval { };
|
||||
|
||||
ndtypes = callPackage ../development/python-modules/ndtypes { };
|
||||
|
||||
nest-asyncio = callPackage ../development/python-modules/nest-asyncio { };
|
||||
|
||||
neuron = pkgs.neuron.override {
|
||||
@@ -812,6 +816,8 @@ in {
|
||||
|
||||
snapcast = callPackage ../development/python-modules/snapcast { };
|
||||
|
||||
sparse = callPackage ../development/python-modules/sparse { };
|
||||
|
||||
spglib = callPackage ../development/python-modules/spglib { };
|
||||
|
||||
sslib = callPackage ../development/python-modules/sslib { };
|
||||
@@ -1619,6 +1625,8 @@ in {
|
||||
|
||||
dask-ml = callPackage ../development/python-modules/dask-ml { };
|
||||
|
||||
dask-mpi = callPackage ../development/python-modules/dask-mpi { };
|
||||
|
||||
dask-xgboost = callPackage ../development/python-modules/dask-xgboost { };
|
||||
|
||||
datrie = callPackage ../development/python-modules/datrie { };
|
||||
@@ -2790,6 +2798,8 @@ in {
|
||||
|
||||
xdis = callPackage ../development/python-modules/xdis { };
|
||||
|
||||
xnd = callPackage ../development/python-modules/xnd { };
|
||||
|
||||
uncompyle6 = callPackage ../development/python-modules/uncompyle6 { };
|
||||
|
||||
lsi = callPackage ../development/python-modules/lsi { };
|
||||
|
||||
Reference in New Issue
Block a user