Merge branch 'master' into staging-next

This commit is contained in:
Jan Tojnar
2020-02-28 11:30:44 +01:00
103 changed files with 1336 additions and 724 deletions

View File

@@ -11,10 +11,7 @@ rustPlatform.buildRustPackage rec {
sha256 = "1c4lndrr7xndgp60zcdjqpciwibm9sjwwrd3921fyz4jg44g76zy";
};
# Delete this on next update; see #79975 for details
legacyCargoFetcher = true;
cargoSha256 = "1sa81570cvvpqgdcpnb08b0q4c6ap8a2wxfp2z336jzbv0zgv8a6";
cargoSha256 = "1jnkfiyp5mlwm6bn7i66g5vbbrhps2avlmbilip4346m2j8qc2qv";
buildInputs = stdenv.lib.optional stdenv.isDarwin Security;

View File

@@ -11,10 +11,7 @@ rustPlatform.buildRustPackage rec {
sha256 = "0w7ysha46ml3j1i1knvll4pmqg291z8a2ypcy650m61dhrvkh2ng";
};
# Delete this on next update; see #79975 for details
legacyCargoFetcher = true;
cargoSha256 = "18nlvqa9ha4vs9xb60hivhgcsqr69zsigfmqyig48slvwgqkbwda";
cargoSha256 = "0srmn8ndy7vdvcysyb7a5pjly0m3jchq0zrqzhrwicynm291w56h";
buildInputs = [ openssl libsodium ]
++ stdenv.lib.optionals stdenv.isDarwin [ Security ];

View File

@@ -11,10 +11,7 @@ rustPlatform.buildRustPackage rec {
sha256 = "0nn036in5j1h0vxkwif0lf7fn900zy4f4kxlzy6qdx3jakgmxvwh";
};
# Delete this on next update; see #79975 for details
legacyCargoFetcher = true;
cargoSha256 = "0h41ws3jcxb90mhnznckfkfv0mpx6ykga7087bipbaw2fqhr7izd";
cargoSha256 = "0v1hx6kjsmydx6ckjqj31y2gcpvax4mshwrniicplkka3q6hx9ra";
meta = with stdenv.lib; {
description = "DNS tool that aims to replace dig and nsupdate";

View File

@@ -31,10 +31,7 @@ buildRustPackage rec {
doCheck = false;
# Delete this on next update; see #79975 for details
legacyCargoFetcher = true;
cargoSha256 = "1nv0630yb8k857n7km4bbgf41j747xdxv7xnc6a9746qpggmdbkh";
cargoSha256 = "1ka22krw8s05vpamg9naqqf7vv5h8dkpfdik0wy8nispkrxzgb92";
meta = with stdenv.lib; {
description = "A server application to run tox node written in pure Rust";