summary refs log tree commit diff
path: root/pkgs/tools
diff options
context:
space:
mode:
authorWilliam A. Kennington III <william@wkennington.com>2015-03-25 22:16:23 -0700
committerWilliam A. Kennington III <william@wkennington.com>2015-03-25 22:16:23 -0700
commit9d9a393a4bd051df3f7a7d12a9ca695717f55806 (patch)
tree0de7eb9a95bb0659c0e7f7257a80471de3269f16 /pkgs/tools
parent7f2adbf5693c5e5e43748c396660b31979738af2 (diff)
parentba2074fc310796f1cb43b82b86cb85cfc0a8ca53 (diff)
downloadnixlib-9d9a393a4bd051df3f7a7d12a9ca695717f55806.tar
nixlib-9d9a393a4bd051df3f7a7d12a9ca695717f55806.tar.gz
nixlib-9d9a393a4bd051df3f7a7d12a9ca695717f55806.tar.bz2
nixlib-9d9a393a4bd051df3f7a7d12a9ca695717f55806.tar.lz
nixlib-9d9a393a4bd051df3f7a7d12a9ca695717f55806.tar.xz
nixlib-9d9a393a4bd051df3f7a7d12a9ca695717f55806.tar.zst
nixlib-9d9a393a4bd051df3f7a7d12a9ca695717f55806.zip
Merge pull request #6919 from ehmry/cjdns
cjdns: update pkg and fix nixos test
Diffstat (limited to 'pkgs/tools')
-rw-r--r--pkgs/tools/networking/cjdns/default.nix8
1 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/tools/networking/cjdns/default.nix b/pkgs/tools/networking/cjdns/default.nix
index b0af961c733b..e602ee5f4126 100644
--- a/pkgs/tools/networking/cjdns/default.nix
+++ b/pkgs/tools/networking/cjdns/default.nix
@@ -1,8 +1,8 @@
 { stdenv, fetchFromGitHub, nodejs, which, python27, utillinux }:
 
 let
-  version = "15"; # see ${src}/util/version/Version.h
-  date = "20150207";
+  version = "16"; # see ${src}/util/version/Version.h
+  date = "20150308";
 in
 stdenv.mkDerivation {
   name = "cjdns-${version}-${date}";
@@ -10,8 +10,8 @@ stdenv.mkDerivation {
   src = fetchFromGitHub {
     owner = "cjdelisle";
     repo = "cjdns";
-    rev = "0fc585e15e25b1bd39be24a534f47bb966485a4a";
-    sha256 = "090zx30bgfk6wyh10wbjqpkvjq9l30jc7fh2iagajsmpjs9iipqm";
+    rev = "dc7eaf676cb83f13ba3e76a1bd0f2e093e6d6e1b";
+    sha256 = "1llhv9kflh4rzv9b9qq9zhrckcc6a7xs0dp147adwmaxqjj8v601";
   };
 
   buildInputs = [ which python27 nodejs ] ++