diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2020-05-29 17:05:38 +0200 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2020-05-29 17:05:38 +0200 |
commit | c7d25a5db6beb915be4dd714821f342fab7980a2 (patch) | |
tree | 89a87c2e327f754f3af0702753db51266919baf1 /pkgs/tools/networking | |
parent | e27e3ae169d4ac64856befb6bbf044f2153e337d (diff) | |
parent | 3bc5b8593be638dd9fc7d0f427eccdb2a6c8485b (diff) | |
download | nixlib-c7d25a5db6beb915be4dd714821f342fab7980a2.tar nixlib-c7d25a5db6beb915be4dd714821f342fab7980a2.tar.gz nixlib-c7d25a5db6beb915be4dd714821f342fab7980a2.tar.bz2 nixlib-c7d25a5db6beb915be4dd714821f342fab7980a2.tar.lz nixlib-c7d25a5db6beb915be4dd714821f342fab7980a2.tar.xz nixlib-c7d25a5db6beb915be4dd714821f342fab7980a2.tar.zst nixlib-c7d25a5db6beb915be4dd714821f342fab7980a2.zip |
Merge master into staging-next
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 2b826224f42b..c61da53c6ad5 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 632ef2803c2f..6cd3682c3f27 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 = { |