mirrors/nixpkgs
1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-01-22 14:45:27 +00:00
Code Issues Wiki Activity

cjdns: update from 20140919 20140922

Browse source 
package installs to .../bin
fix service module to look in .../bin

Closes #4240
This commit is contained in:
Emery Hemingway 2014-09-23 13:53:35 -04:00 committed by Mateusz Kowalczyk
parent f0dae64cf3
commit 61f0d9b251
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
nixos/modules/services/networking/cjdns.nix
View file

@ -190,7 +190,7 @@ in
echo '${cjdrouteConf}' | sed \ echo '${cjdrouteConf}' | sed \
-e "s/@CJDNS_ADMIN_PASSWORD@/$CJDNS_ADMIN_PASSWORD/g" \ -e "s/@CJDNS_ADMIN_PASSWORD@/$CJDNS_ADMIN_PASSWORD/g" \
-e "s/@CJDNS_PRIVATE_KEY@/$CJDNS_PRIVATE_KEY/g" \ -e "s/@CJDNS_PRIVATE_KEY@/$CJDNS_PRIVATE_KEY/g" \
| ${pkgs.cjdns}/sbin/cjdroute | ${pkgs.cjdns}/bin/cjdroute
''; '';
serviceConfig = { serviceConfig = {
@ -201,7 +201,7 @@ in
system.activationScripts.cjdns = '' system.activationScripts.cjdns = ''
grep -q "CJDNS_PRIVATE_KEY=" /etc/cjdns.keys || \ 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 >> /etc/cjdns.keys
grep -q "CJDNS_ADMIN_PASSWORD=" /etc/cjdns.keys || \ grep -q "CJDNS_ADMIN_PASSWORD=" /etc/cjdns.keys || \

6
pkgs/tools/networking/cjdns/default.nix
View file

@ -1,8 +1,8 @@
{ stdenv, fetchgit, nodejs, which, python27 }: { stdenv, fetchgit, nodejs, which, python27 }:
let let
date = "20140919"; date = "20140922";
rev = "e9bcb0f9f06870d6f4904149e1c15eca09c7ed8a"; rev = "5ebca772b0582173127e8c1e61ee235c5ab3fb50";
in in
stdenv.mkDerivation { stdenv.mkDerivation {
name = "cjdns-${date}-${stdenv.lib.strings.substring 0 7 rev}"; name = "cjdns-${date}-${stdenv.lib.strings.substring 0 7 rev}";
@ -10,7 +10,7 @@ stdenv.mkDerivation {
src = fetchgit { src = fetchgit {
url = "https://github.com/cjdelisle/cjdns.git"; url = "https://github.com/cjdelisle/cjdns.git";
inherit rev; inherit rev;
sha256 = "e9fa82f3495b718cebd4d1836312b224c6689dc521fba093ad1accf2d2e15ff1"; sha256 = "04abf73f4aede12c35b70ae09a367b3d6352a63f818185f788ed13356d06197a";
}; };
buildInputs = [ which python27 nodejs]; buildInputs = [ which python27 nodejs];