Merge master into staging

This commit is contained in:
Orivej Desh
2019-07-25 09:23:01 +00:00
193 changed files with 4440 additions and 1950 deletions

View File

@@ -1123,6 +1123,8 @@ in {
spglib = callPackage ../development/python-modules/spglib { };
sshpubkeys = callPackage ../development/python-modules/sshpubkeys { };
sslib = callPackage ../development/python-modules/sslib { };
statistics = callPackage ../development/python-modules/statistics { };
@@ -4661,6 +4663,8 @@ in {
setuptools_scm = callPackage ../development/python-modules/setuptools_scm { };
setuptools-scm-git-archive = callPackage ../development/python-modules/setuptools-scm-git-archive { };
serverlessrepo = callPackage ../development/python-modules/serverlessrepo { };
shippai = callPackage ../development/python-modules/shippai {};