diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2021-07-04 06:01:11 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-07-04 06:01:11 +0000 |
| commit | 89ee82a6e9e46e3394e6e87e30f9fd46b0b7947e (patch) | |
| tree | 83c3eb52d8316c8da139464edee029e046e963bd /pkgs/applications/science | |
| parent | af65e88cc673a4963db0c3d2059b6bcb04c83df9 (diff) | |
| parent | af7a317f79d07270a5ac036e3d22083f7ff6b2be (diff) | |
Merge master into staging-next
Diffstat (limited to 'pkgs/applications/science')
| -rw-r--r-- | pkgs/applications/science/math/caffe/default.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/applications/science/math/caffe/default.nix b/pkgs/applications/science/math/caffe/default.nix index 565c6a17672dc..08bf84be7c894 100644 --- a/pkgs/applications/science/math/caffe/default.nix +++ b/pkgs/applications/science/math/caffe/default.nix @@ -76,7 +76,7 @@ stdenv.mkDerivation rec { let pp = python.pkgs; in ([ pp.numpy pp.scipy pp.scikitimage pp.h5py pp.matplotlib pp.ipython pp.networkx pp.nose - pp.pandas pp.dateutil pp.protobuf pp.gflags + pp.pandas pp.python-dateutil pp.protobuf pp.gflags pp.pyyaml pp.pillow pp.six ] ++ lib.optional leveldbSupport pp.leveldb) ); |