Merge master into staging-next

2021-05-13 00:56:26 +00:00
parent ba2140b657 d950065319
commit a8e5ac148b
31 changed files with 438 additions and 149 deletions
--- a/pkgs/development/tools/build-managers/conan/default.nix
+++ b/pkgs/development/tools/build-managers/conan/default.nix
@@ -35,6 +35,9 @@ let newPython = python3.override {
        inherit version;
        sha256 = "8d59a976fb773f3e6a39c85636357c4f0e242707394cadadd9814f5cbaa20e96";
      };
+      disabledTests = [
+        "test_ec_verify_should_return_false_if_signature_invalid"
+      ];
    });
  };
 };