public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #6919 from ehmry/cjdns

Browse Source 
cjdns: update pkg and fix nixos test
This commit is contained in:
William A. Kennington III 2015-03-25 22:16:23 -07:00
commit 9d9a393a4b
3 changed files with 17 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
nixos/release.nix
View File

@ -242,7 +242,7 @@ in rec {
tests.blivet = callTest tests/blivet.nix {}; tests.blivet = callTest tests/blivet.nix {};
tests.cadvisor = hydraJob (import tests/cadvisor.nix { system = "x86_64-linux"; }); tests.cadvisor = hydraJob (import tests/cadvisor.nix { system = "x86_64-linux"; });
tests.chromium = callTest tests/chromium.nix {}; tests.chromium = callTest tests/chromium.nix {};
#tests.cjdns = callTest tests/cjdns.nix {}; tests.cjdns = callTest tests/cjdns.nix {};
tests.containers = callTest tests/containers.nix {}; tests.containers = callTest tests/containers.nix {};
tests.docker = hydraJob (import tests/docker.nix { system = "x86_64-linux"; }); tests.docker = hydraJob (import tests/docker.nix { system = "x86_64-linux"; });
tests.dockerRegistry = hydraJob (import tests/docker-registry.nix { system = "x86_64-linux"; }); tests.dockerRegistry = hydraJob (import tests/docker-registry.nix { system = "x86_64-linux"; });

5
nixos/tests/cjdns.nix
View File

@ -52,8 +52,7 @@ import ./make-test.nix {
{ UDPInterface = { UDPInterface =
{ bind = "0.0.0.0:1024"; { bind = "0.0.0.0:1024";
connectTo."192.168.0.1:1024}" = connectTo."192.168.0.1:1024}" =
{ hostname = "carol.hype"; { password = carolPassword;
password = carolPassword;
publicKey = carolPubKey; publicKey = carolPubKey;
}; };
}; };
@ -108,7 +107,7 @@ import ./make-test.nix {
# ping a few times each to let the routing table establish itself # ping a few times each to let the routing table establish itself
$alice->succeed("ping6 -c 4 $carolIp6"); $alice->succeed("ping6 -c 4 $carolIp6");
$bob->succeed("ping6 -c 4 carol.hype"); $bob->succeed("ping6 -c 4 $carolIp6");
$carol->succeed("ping6 -c 4 $aliceIp6"); $carol->succeed("ping6 -c 4 $aliceIp6");
$carol->succeed("ping6 -c 4 $bobIp6"); $carol->succeed("ping6 -c 4 $bobIp6");

8
pkgs/tools/networking/cjdns/default.nix
View File

@ -1,8 +1,8 @@
{ stdenv, fetchFromGitHub, nodejs, which, python27, utillinux }: { stdenv, fetchFromGitHub, nodejs, which, python27, utillinux }:
let let
version = "15"; # see ${src}/util/version/Version.h version = "16"; # see ${src}/util/version/Version.h
date = "20150207"; date = "20150308";
in in
stdenv.mkDerivation { stdenv.mkDerivation {
name = "cjdns-${version}-${date}"; name = "cjdns-${version}-${date}";
@ -10,8 +10,8 @@ stdenv.mkDerivation {
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "cjdelisle"; owner = "cjdelisle";
repo = "cjdns"; repo = "cjdns";
rev = "0fc585e15e25b1bd39be24a534f47bb966485a4a"; rev = "dc7eaf676cb83f13ba3e76a1bd0f2e093e6d6e1b";
sha256 = "090zx30bgfk6wyh10wbjqpkvjq9l30jc7fh2iagajsmpjs9iipqm"; sha256 = "1llhv9kflh4rzv9b9qq9zhrckcc6a7xs0dp147adwmaxqjj8v601";
}; };
buildInputs = [ which python27 nodejs ] ++ buildInputs = [ which python27 nodejs ] ++