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

Fix cargo-flash build
2021-05-16 18:27:14 -07:00
parent 6020fe2508 8aea69e5ab
commit d8e62d8e41
80 changed files with 906 additions and 354 deletions
@@ -31,6 +31,6 @@ stdenv.mkDerivation rec {
    description = "A pure Unix shell script implementing ACME client protocol";
    homepage = "https://acme.sh/";
    license = licenses.gpl3;
-    maintainers = [ maintainers.yorickvp ];
+    maintainers = teams.serokell.members;
  };
 }
@@ -457,6 +457,10 @@ let
          inherit version;
          sha256 = "15hflax5qkw1v6nssk1r0wkj83jgghskcmn875m3wgvpzdvajncd";
        };
+
+        # new cryptography returns slightly different values than what's expected
+        # this gets tested in azure-cli-core, so not absolutely necessary to run tests here
+        doCheck = false;
      });

      knack = super.knack.overridePythonAttrs(oldAttrs: rec {