Merge remote-tracking branch 'origin/master' into staging-next

This commit is contained in:
Martin Weinelt
2021-03-01 16:03:00 +01:00
115 changed files with 6286 additions and 4595 deletions
+4
View File
@@ -2043,6 +2043,8 @@ in {
ed25519 = callPackage ../development/python-modules/ed25519 { };
editdistance = callPackage ../development/python-modules/editdistance { };
editorconfig = callPackage ../development/python-modules/editorconfig { };
edward = callPackage ../development/python-modules/edward { };
@@ -2061,6 +2063,8 @@ in {
eliot = callPackage ../development/python-modules/eliot { };
elmax = callPackage ../development/python-modules/elmax { };
emailthreads = callPackage ../development/python-modules/emailthreads { };
email_validator = callPackage ../development/python-modules/email-validator { };