diff options
| author | Emery Hemingway <emery@vfemail.net> | 2014-09-23 13:53:35 -0400 |
|---|---|---|
| committer | Mateusz Kowalczyk <fuuzetsu@fuuzetsu.co.uk> | 2014-09-23 22:30:53 +0100 |
| commit | 61f0d9b251fd0dda6dfb263a43f6ccb5e0c9aa97 (patch) | |
| tree | d99459b099d2866aacc85b72b0d2d025b6807fc5 | |
| parent | f0dae64cf3cafb637cc8e2a914a3b76f4bb47988 (diff) | |
| download | nixlib-61f0d9b251fd0dda6dfb263a43f6ccb5e0c9aa97.tar nixlib-61f0d9b251fd0dda6dfb263a43f6ccb5e0c9aa97.tar.gz nixlib-61f0d9b251fd0dda6dfb263a43f6ccb5e0c9aa97.tar.bz2 nixlib-61f0d9b251fd0dda6dfb263a43f6ccb5e0c9aa97.tar.lz nixlib-61f0d9b251fd0dda6dfb263a43f6ccb5e0c9aa97.tar.xz nixlib-61f0d9b251fd0dda6dfb263a43f6ccb5e0c9aa97.tar.zst nixlib-61f0d9b251fd0dda6dfb263a43f6ccb5e0c9aa97.zip | |
cjdns: update from 20140919 20140922
package installs to .../bin fix service module to look in .../bin Closes #4240
| -rw-r--r-- | nixos/modules/services/networking/cjdns.nix | 4 | ||||
| -rw-r--r-- | pkgs/tools/networking/cjdns/default.nix | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/nixos/modules/services/networking/cjdns.nix b/nixos/modules/services/networking/cjdns.nix index 0519172db914..7192b8b7a0e0 100644 --- a/nixos/modules/services/networking/cjdns.nix +++ b/nixos/modules/services/networking/cjdns.nix @@ -190,7 +190,7 @@ in echo '${cjdrouteConf}' | sed \ -e "s/@CJDNS_ADMIN_PASSWORD@/$CJDNS_ADMIN_PASSWORD/g" \ -e "s/@CJDNS_PRIVATE_KEY@/$CJDNS_PRIVATE_KEY/g" \ - | ${pkgs.cjdns}/sbin/cjdroute + | ${pkgs.cjdns}/bin/cjdroute ''; serviceConfig = { @@ -201,7 +201,7 @@ in system.activationScripts.cjdns = '' grep -q "CJDNS_PRIVATE_KEY=" /etc/cjdns.keys || \ - echo "CJDNS_PRIVATE_KEY=$(${pkgs.cjdns}/sbin/makekey)" \ + echo "CJDNS_PRIVATE_KEY=$(${pkgs.cjdns}/bin/makekey)" \ >> /etc/cjdns.keys grep -q "CJDNS_ADMIN_PASSWORD=" /etc/cjdns.keys || \ diff --git a/pkgs/tools/networking/cjdns/default.nix b/pkgs/tools/networking/cjdns/default.nix index 40152d2d295b..c56faac690c3 100644 --- a/pkgs/tools/networking/cjdns/default.nix +++ b/pkgs/tools/networking/cjdns/default.nix @@ -1,8 +1,8 @@ { stdenv, fetchgit, nodejs, which, python27 }: let - date = "20140919"; - rev = "e9bcb0f9f06870d6f4904149e1c15eca09c7ed8a"; + date = "20140922"; + rev = "5ebca772b0582173127e8c1e61ee235c5ab3fb50"; in stdenv.mkDerivation { name = "cjdns-${date}-${stdenv.lib.strings.substring 0 7 rev}"; @@ -10,7 +10,7 @@ stdenv.mkDerivation { src = fetchgit { url = "https://github.com/cjdelisle/cjdns.git"; inherit rev; - sha256 = "e9fa82f3495b718cebd4d1836312b224c6689dc521fba093ad1accf2d2e15ff1"; + sha256 = "04abf73f4aede12c35b70ae09a367b3d6352a63f818185f788ed13356d06197a"; }; buildInputs = [ which python27 nodejs]; |