diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2020-05-29 17:06:01 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2020-05-29 17:06:01 +0200 |
| commit | 36d9eeb9c7a4c0044d3ac7cde65b2344eb649c64 (patch) | |
| tree | 3fc41497f5bfdb4683080bd7c7d8e412fb6aadc4 /pkgs/tools/networking | |
| parent | afa9962538b12237f5a4604017fe9c0914404800 (diff) | |
| parent | c7d25a5db6beb915be4dd714821f342fab7980a2 (diff) | |
| download | nixpkgs-36d9eeb9c7a4c0044d3ac7cde65b2344eb649c64.tar nixpkgs-36d9eeb9c7a4c0044d3ac7cde65b2344eb649c64.tar.gz nixpkgs-36d9eeb9c7a4c0044d3ac7cde65b2344eb649c64.tar.bz2 nixpkgs-36d9eeb9c7a4c0044d3ac7cde65b2344eb649c64.tar.lz nixpkgs-36d9eeb9c7a4c0044d3ac7cde65b2344eb649c64.tar.xz nixpkgs-36d9eeb9c7a4c0044d3ac7cde65b2344eb649c64.tar.zst nixpkgs-36d9eeb9c7a4c0044d3ac7cde65b2344eb649c64.zip | |
Merge staging-next into staging
Diffstat (limited to 'pkgs/tools/networking')
| -rw-r--r-- | pkgs/tools/networking/tunnelto/default.nix (renamed from pkgs/tools/networking/wormhole/default.nix) | 8 | ||||
| -rw-r--r-- | pkgs/tools/networking/wireguard-tools/default.nix | 4 |
2 files changed, 5 insertions, 7 deletions
diff --git a/pkgs/tools/networking/wormhole/default.nix b/pkgs/tools/networking/tunnelto/default.nix index 2b826224f42..c61da53c6ad 100644 --- a/pkgs/tools/networking/wormhole/default.nix +++ b/pkgs/tools/networking/tunnelto/default.nix @@ -7,17 +7,17 @@ }: rustPlatform.buildRustPackage rec { - pname = "wormhole"; - version = "0.1.5"; + pname = "tunnelto"; + version = "0.1.6"; src = fetchFromGitHub { owner = "agrinman"; repo = pname; rev = version; - sha256 = "0aq2myzqd9xqz4zdl03jhdd7f22y9k39xdhiark6ymhwcxijsq8y"; + sha256 = "0yigjg8kjl8v0636hjr3sg33p4v963vzq7wbfi986ymxfx47jqp7"; }; - cargoSha256 = "1gjqiv8sgdab0i461v72zcvh91cpqmmpcc3qyx3svq0391rwzp46"; + cargoSha256 = "0603b0hn84shl9wdg7zg7kf9050gh33d8ghscwsby1vqanakms9j"; nativeBuildInputs = stdenv.lib.optionals stdenv.isLinux [ pkg-config ]; buildInputs = [ ] diff --git a/pkgs/tools/networking/wireguard-tools/default.nix b/pkgs/tools/networking/wireguard-tools/default.nix index 632ef2803c2..6cd3682c3f2 100644 --- a/pkgs/tools/networking/wireguard-tools/default.nix +++ b/pkgs/tools/networking/wireguard-tools/default.nix @@ -49,9 +49,7 @@ stdenv.mkDerivation rec { passthru = { updateScript = ./update.sh; - tests = { - inherit (nixosTests) wireguard wg-quick wireguard-generated wireguard-namespaces; - }; + tests = nixosTests.wireguard; }; meta = { |