Merge master into staging-next

This commit is contained in:
Frederik Rietdijk
2020-11-28 08:53:47 +01:00
112 changed files with 3712 additions and 2628 deletions
+4
View File
@@ -4947,6 +4947,8 @@ in {
pycm = callPackage ../development/python-modules/pycm { };
pycmarkgfm = callPackage ../development/python-modules/pycmarkgfm { };
pycodestyle = callPackage ../development/python-modules/pycodestyle { };
pycognito = callPackage ../development/python-modules/pycognito { };
@@ -6486,6 +6488,8 @@ in {
scikit-fmm = callPackage ../development/python-modules/scikit-fmm { };
scikit-fuzzy = callPackage ../development/python-modules/scikit-fuzzy { };
scikitimage = callPackage ../development/python-modules/scikit-image { };
scikitlearn = let args = { inherit (pkgs) gfortran glibcLocales; };