Merge branch 'master' into staging-next

Hydra nixpkgs: ?compare=1506218
This commit is contained in:
Vladimír Čunát
2019-02-22 17:51:01 +01:00
163 changed files with 1856 additions and 870 deletions

View File

@@ -2804,6 +2804,8 @@ in {
imageio = callPackage ../development/python-modules/imageio { };
imageio-ffmpeg = callPackage ../development/python-modules/imageio-ffmpeg { };
imgaug = callPackage ../development/python-modules/imgaug { };
inflection = callPackage ../development/python-modules/inflection { };