diff options
author | Peter Simons <simons@cryp.to> | 2015-02-09 16:51:10 +0100 |
---|---|---|
committer | Peter Simons <simons@cryp.to> | 2015-02-09 16:51:10 +0100 |
commit | 7b99c149a48eb9881105106aa0325531146adc16 (patch) | |
tree | d2e2abb32bfed50e1c4f83b45696a9dc21390c92 /pkgs/tools/networking/cjdns | |
parent | da3105d5385d6feb2b655c6d1ecbbbbc26a544c9 (diff) | |
parent | a81cfcc47527d222e6ae7fd5a5e22b70760f0227 (diff) | |
download | nixlib-7b99c149a48eb9881105106aa0325531146adc16.tar nixlib-7b99c149a48eb9881105106aa0325531146adc16.tar.gz nixlib-7b99c149a48eb9881105106aa0325531146adc16.tar.bz2 nixlib-7b99c149a48eb9881105106aa0325531146adc16.tar.lz nixlib-7b99c149a48eb9881105106aa0325531146adc16.tar.xz nixlib-7b99c149a48eb9881105106aa0325531146adc16.tar.zst nixlib-7b99c149a48eb9881105106aa0325531146adc16.zip |
Merge branch 'master' into staging.
Diffstat (limited to 'pkgs/tools/networking/cjdns')
-rw-r--r-- | pkgs/tools/networking/cjdns/default.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/tools/networking/cjdns/default.nix b/pkgs/tools/networking/cjdns/default.nix index e58ab1522051..b0af961c733b 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 = "20150130"; + date = "20150207"; in stdenv.mkDerivation { name = "cjdns-${version}-${date}"; @@ -10,8 +10,8 @@ stdenv.mkDerivation { src = fetchFromGitHub { owner = "cjdelisle"; repo = "cjdns"; - rev = "b7681f601dc0ba84c6c710061089f9898247ba4e"; - sha256 = "0r59j9x5i1nkd6k8172l9iq95f6c22ymmkrm9nxwxr5dp2bj0qn5"; + rev = "0fc585e15e25b1bd39be24a534f47bb966485a4a"; + sha256 = "090zx30bgfk6wyh10wbjqpkvjq9l30jc7fh2iagajsmpjs9iipqm"; }; buildInputs = [ which python27 nodejs ] ++ |