public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #24908 from adamruzicka/cjdns-v19.1 

cjdns: 18 -> 19.1
This commit is contained in:
Joachim F 2017-04-16 12:10:59 +01:00 committed by GitHub
parent 98777646f9 21efba54ca
commit 901a0bb9fa
1 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/tools/networking/cjdns/default.nix
View File

@ -1,20 +1,14 @@
{ stdenv, fetchurl, fetchpatch, nodejs, which, python27, utillinux }: { stdenv, fetchurl, fetchpatch, nodejs, which, python27, utillinux }:
let version = "18"; in let version = "19.1"; in
stdenv.mkDerivation { stdenv.mkDerivation {
name = "cjdns-"+version; name = "cjdns-"+version;
src = fetchurl { src = fetchurl {
url = "https://github.com/cjdelisle/cjdns/archive/cjdns-v${version}.tar.gz"; url = "https://github.com/cjdelisle/cjdns/archive/cjdns-v${version}.tar.gz";
sha256 = "1as7n730ppn93cpal7s6r6iq1qx46m0c45iwy8baypbpp42zxrap"; sha256 = "53c568a500215b055a9894178eb4477bd93a6e1abf751d0bc5ef2a03ea01a188";
}; };
patches = [(fetchpatch {
name = "glibc-2.25.diff";
url = https://github.com/cjdelisle/cjdns/pull/1017.diff;
sha256 = "1k05d1w04lngcki56b6brkwg9xakzsbr5ibkcba8112v6jdzw51f";
})];
buildInputs = [ which python27 nodejs ] ++ buildInputs = [ which python27 nodejs ] ++
# for flock # for flock
stdenv.lib.optional stdenv.isLinux utillinux; stdenv.lib.optional stdenv.isLinux utillinux;