diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2020-04-22 17:20:20 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2020-04-22 17:20:20 +0200 |
| commit | 8374a2a0eee41361d4af9d32460e4956dcbea61c (patch) | |
| tree | 0a4788ab72ad7968aad65dd0668147d065ea9951 /pkgs/tools/networking | |
| parent | 23be4a8b4de7790f48998d245a3ff5fe549e0f2b (diff) | |
| parent | 95f82e2a45266cdca661389705da7c672c7a9cbc (diff) | |
| download | nixlib-8374a2a0eee41361d4af9d32460e4956dcbea61c.tar nixlib-8374a2a0eee41361d4af9d32460e4956dcbea61c.tar.gz nixlib-8374a2a0eee41361d4af9d32460e4956dcbea61c.tar.bz2 nixlib-8374a2a0eee41361d4af9d32460e4956dcbea61c.tar.lz nixlib-8374a2a0eee41361d4af9d32460e4956dcbea61c.tar.xz nixlib-8374a2a0eee41361d4af9d32460e4956dcbea61c.tar.zst nixlib-8374a2a0eee41361d4af9d32460e4956dcbea61c.zip | |
Merge master into staging-next
Diffstat (limited to 'pkgs/tools/networking')
| -rw-r--r-- | pkgs/tools/networking/cjdns/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/tools/networking/yggdrasil/default.nix | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/pkgs/tools/networking/cjdns/default.nix b/pkgs/tools/networking/cjdns/default.nix index 452181754b17..9a74344d2936 100644 --- a/pkgs/tools/networking/cjdns/default.nix +++ b/pkgs/tools/networking/cjdns/default.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchFromGitHub, nodejs, which, python27, utillinux }: +{ stdenv, fetchFromGitHub, nodejs, which, python27, utillinux, nixosTests }: let version = "20.6"; in stdenv.mkDerivation { @@ -29,6 +29,8 @@ stdenv.mkDerivation { cp -R contrib tools node_build node_modules $out/share/cjdns/ ''; + passthru.tests.basic = nixosTests.cjdns; + meta = with stdenv.lib; { homepage = "https://github.com/cjdelisle/cjdns"; description = "Encrypted networking for regular people"; diff --git a/pkgs/tools/networking/yggdrasil/default.nix b/pkgs/tools/networking/yggdrasil/default.nix index 91b080153279..d8c8c429ef98 100644 --- a/pkgs/tools/networking/yggdrasil/default.nix +++ b/pkgs/tools/networking/yggdrasil/default.nix @@ -1,4 +1,4 @@ -{ lib, buildGoModule, fetchFromGitHub }: +{ lib, buildGoModule, fetchFromGitHub, nixosTests }: buildGoModule rec { pname = "yggdrasil"; @@ -27,6 +27,8 @@ buildGoModule rec { -s -w ''; + passthru.tests.basic = nixosTests.yggdrasil; + meta = with lib; { description = "An experiment in scalable routing as an encrypted IPv6 overlay network"; |