Merge master into staging-next

This commit is contained in:
Frederik Rietdijk
2020-01-14 10:20:32 +01:00
37 changed files with 1244 additions and 303 deletions
+8
View File
@@ -903,6 +903,8 @@ in {
oauthenticator = callPackage ../development/python-modules/oauthenticator { };
onnx = callPackage ../development/python-modules/onnx { };
ordered-set = callPackage ../development/python-modules/ordered-set { };
ortools = (toPythonModule (pkgs.or-tools.override {
@@ -1392,6 +1394,8 @@ in {
stups-fullstop = callPackage ../development/python-modules/stups-fullstop { };
stups-pierone = callPackage ../development/python-modules/stups-pierone { };
stups-tokens = callPackage ../development/python-modules/stups-tokens { };
stups-zign = callPackage ../development/python-modules/stups-zign { };
@@ -1669,6 +1673,8 @@ in {
avro3k = callPackage ../development/python-modules/avro3k {};
avro-python3 = callPackage ../development/python-modules/avro-python3 {};
aws-lambda-builders = callPackage ../development/python-modules/aws-lambda-builders { };
python-slugify = callPackage ../development/python-modules/python-slugify { };
@@ -5009,6 +5015,8 @@ in {
python-markdown-math = callPackage ../development/python-modules/python-markdown-math { };
python-miio = callPackage ../development/python-modules/python-miio { };
python-pipedrive = callPackage ../development/python-modules/python-pipedrive { };
python-ptrace = callPackage ../development/python-modules/python-ptrace { };