From adf6ef386532b033d0ec3e4432d96a9e37fde1a8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= <viric@viric.name>
Date: Fri, 30 Jan 2015 09:25:21 +0100
Subject: [PATCH] cjdns: updating with bugfix, and readd nodejs tools

(cherry picked from commit cd80d050cb8145d45c56533625beb82f37177fae)
---
 pkgs/tools/networking/cjdns/default.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/tools/networking/cjdns/default.nix b/pkgs/tools/networking/cjdns/default.nix
index 8349799a3b7..60534683813 100644
--- a/pkgs/tools/networking/cjdns/default.nix
+++ b/pkgs/tools/networking/cjdns/default.nix
@@ -2,7 +2,7 @@
 
 let
   version = "15"; # see ${src}/util/version/Version.h
-  date = "20150129";
+  date = "20150130";
 in
 stdenv.mkDerivation {
   name = "cjdns-${version}-${date}";
@@ -10,8 +10,8 @@ stdenv.mkDerivation {
   src = fetchFromGitHub {
     owner = "cjdelisle";
     repo = "cjdns";
-    rev = "97161a5fef6b98ffbba94888587bd9ce733c2278";
-    sha256 = "0wxiwgjcl4rn71b6hjdlfgv9hjy9d43sypikzcl5z65r7xkrb41j";
+    rev = "b7681f601dc0ba84c6c710061089f9898247ba4e";
+    sha256 = "0r59j9x5i1nkd6k8172l9iq95f6c22ymmkrm9nxwxr5dp2bj0qn5";
   };
 
   buildInputs = [ which python27 nodejs ] ++
@@ -26,7 +26,7 @@ stdenv.mkDerivation {
     sed -i 's,/usr/bin/env python,'$(type -P python), \
       $(find contrib -type f)
     mkdir -p $out/share/cjdns
-    cp -R contrib node_build node_modules $out/share/cjdns/
+    cp -R contrib tools node_build node_modules $out/share/cjdns/
   '';
 
   meta = with stdenv.lib; {