diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2020-02-28 11:30:44 +0100 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2020-02-28 11:30:44 +0100 |
| commit | bb701376cf3d7d1ffe65b31dc6a1c46dd80a673b (patch) | |
| tree | 35f89b8bc0e0d75a05d2ca446ff66bc0146bf0a5 /pkgs/tools/networking | |
| parent | 35f00b429b54b01a753a16339305d14a3d9d087e (diff) | |
| parent | f7d07d48513dd3bf8f84f347c3c0e1800207f01d (diff) | |
| download | nixlib-bb701376cf3d7d1ffe65b31dc6a1c46dd80a673b.tar nixlib-bb701376cf3d7d1ffe65b31dc6a1c46dd80a673b.tar.gz nixlib-bb701376cf3d7d1ffe65b31dc6a1c46dd80a673b.tar.bz2 nixlib-bb701376cf3d7d1ffe65b31dc6a1c46dd80a673b.tar.lz nixlib-bb701376cf3d7d1ffe65b31dc6a1c46dd80a673b.tar.xz nixlib-bb701376cf3d7d1ffe65b31dc6a1c46dd80a673b.tar.zst nixlib-bb701376cf3d7d1ffe65b31dc6a1c46dd80a673b.zip | |
Merge branch 'master' into staging-next
Diffstat (limited to 'pkgs/tools/networking')
| -rw-r--r-- | pkgs/tools/networking/bandwhich/default.nix | 5 | ||||
| -rw-r--r-- | pkgs/tools/networking/shadowsocks-rust/default.nix | 5 | ||||
| -rw-r--r-- | pkgs/tools/networking/tdns-cli/default.nix | 5 | ||||
| -rw-r--r-- | pkgs/tools/networking/tox-node/default.nix | 5 |
4 files changed, 4 insertions, 16 deletions
diff --git a/pkgs/tools/networking/bandwhich/default.nix b/pkgs/tools/networking/bandwhich/default.nix index 39024ff462f9..e42de87f58be 100644 --- a/pkgs/tools/networking/bandwhich/default.nix +++ b/pkgs/tools/networking/bandwhich/default.nix @@ -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; diff --git a/pkgs/tools/networking/shadowsocks-rust/default.nix b/pkgs/tools/networking/shadowsocks-rust/default.nix index d746d1f42b53..973d0287149b 100644 --- a/pkgs/tools/networking/shadowsocks-rust/default.nix +++ b/pkgs/tools/networking/shadowsocks-rust/default.nix @@ -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 ]; diff --git a/pkgs/tools/networking/tdns-cli/default.nix b/pkgs/tools/networking/tdns-cli/default.nix index 4ad924ee5b55..20bc456eea80 100644 --- a/pkgs/tools/networking/tdns-cli/default.nix +++ b/pkgs/tools/networking/tdns-cli/default.nix @@ -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"; diff --git a/pkgs/tools/networking/tox-node/default.nix b/pkgs/tools/networking/tox-node/default.nix index 3b94c61a7131..6f9ee7355df9 100644 --- a/pkgs/tools/networking/tox-node/default.nix +++ b/pkgs/tools/networking/tox-node/default.nix @@ -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"; |