diff options
author | Shea Levy <shea@shealevy.com> | 2014-04-09 20:34:32 -0400 |
---|---|---|
committer | Shea Levy <shea@shealevy.com> | 2014-04-09 20:34:32 -0400 |
commit | 9dcffe951d3e7eb97ca920296bd7734f67479423 (patch) | |
tree | 4eeb393edfaca056439a6a502b67fa511418863f /pkgs/tools | |
parent | d912cdf264d3ecba17fbf8e156bee6c65055dced (diff) | |
parent | 316e809ff869c38c78d2cd561416b5168fab9de0 (diff) | |
download | nixlib-9dcffe951d3e7eb97ca920296bd7734f67479423.tar nixlib-9dcffe951d3e7eb97ca920296bd7734f67479423.tar.gz nixlib-9dcffe951d3e7eb97ca920296bd7734f67479423.tar.bz2 nixlib-9dcffe951d3e7eb97ca920296bd7734f67479423.tar.lz nixlib-9dcffe951d3e7eb97ca920296bd7734f67479423.tar.xz nixlib-9dcffe951d3e7eb97ca920296bd7734f67479423.tar.zst nixlib-9dcffe951d3e7eb97ca920296bd7734f67479423.zip |
Merge branch 'cjdns' of git://github.com/ehmry/nixpkgs
cjdns: update to 20130303
Diffstat (limited to 'pkgs/tools')
-rw-r--r-- | pkgs/tools/networking/cjdns/builder.sh | 9 | ||||
-rw-r--r-- | pkgs/tools/networking/cjdns/default.nix | 26 |
2 files changed, 20 insertions, 15 deletions
diff --git a/pkgs/tools/networking/cjdns/builder.sh b/pkgs/tools/networking/cjdns/builder.sh new file mode 100644 index 000000000000..c2e3701c0468 --- /dev/null +++ b/pkgs/tools/networking/cjdns/builder.sh @@ -0,0 +1,9 @@ +source $stdenv/setup + +unpackPhase +cd git-export + +bash do + +mkdir -p $out/sbin +cp cjdroute $out/sbin diff --git a/pkgs/tools/networking/cjdns/default.nix b/pkgs/tools/networking/cjdns/default.nix index b42f202099b1..48e21f4507e5 100644 --- a/pkgs/tools/networking/cjdns/default.nix +++ b/pkgs/tools/networking/cjdns/default.nix @@ -1,31 +1,27 @@ -{ stdenv, fetchgit, cmake }: +{ stdenv, fetchgit, nodejs, which, python27 }: let - rev = "f7b02ac0cc"; + date = "20140303"; + rev = "f11ce1fd4795b0173ac0ef18c8a6f752aa824adb"; in stdenv.mkDerivation { - name = "cjdns-20130620-${stdenv.lib.strings.substring 0 7 rev}"; + name = "cjdns-${date}-${stdenv.lib.strings.substring 0 7 rev}"; src = fetchgit { - url = "https://github.com/cjdelisle/cjdns.git"; + url = "git://github.com/cjdelisle/cjdns.git"; inherit rev; - sha256 = "1580a62yhph62nv7q2jdqrbkyk9a9g5i17snibkxyykc7rili5zq"; + sha256 = "1bxhf9f1v0slf9mz3ll6jf45mkwvwxlf3yqxx9k23kjyr1nsc8s8"; }; - preConfigure = '' - sed -i -e '/toolchain.*CACHE/d' CMakeLists.txt - ''; + buildInputs = [ which python27 nodejs]; - doCheck = true; - checkPhase = "ctest"; - - buildInputs = [ cmake ]; + builder = ./builder.sh; meta = { homepage = https://github.com/cjdelisle/cjdns; description = "Encrypted networking for regular people"; - license = "GPLv3+"; - maintainers = with stdenv.lib.maintainers; [viric]; - platforms = with stdenv.lib.platforms; linux; + license = stdenv.lib.licenses.gpl3; + maintainers = with stdenv.lib.maintainers; [ viric emery ]; + platforms = stdenv.lib.platforms.linux; }; } |