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

tinc_pre: 2015-11-07 -> 2016-01-27

Browse Source 
Also fixes `--version` parameter in exectuables.
This commit is contained in:
Franz Pletz 2015-12-18 11:39:45 +01:00
parent c3c5622817
commit d31f58c688
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
pkgs/tools/networking/tinc/pre.nix
View File

@ -1,17 +1,23 @@
{ stdenv, fetchgit, autoreconfHook, texinfo, ncurses, readline, zlib, lzo, openssl }: { stdenv, fetchgit, autoreconfHook, texinfo, ncurses, readline, zlib, lzo, openssl }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "tinc-1.1pre-2015-11-07"; name = "tinc-${version}";
rev = "d8ca00fe40ff4b6d87e7e64c273f536fab462356";
version = "1.1pre-2016-01-28-${builtins.substring 0 7 rev}";
src = fetchgit { src = fetchgit {
inherit rev;
url = "git://tinc-vpn.org/tinc"; url = "git://tinc-vpn.org/tinc";
rev = "bdd84660c756437cf3bc8f64adf612055acc84ea"; sha256 = "0wqgzbqlafbkmj71vhfrqwmp61g95amzd43py47kq3fn5aiybcqf";
sha256 = "1vkpdn3gjlrrm0rfpbhz410mpcq16xy0ilvgkxsgifc9xgdgflmn";
}; };
nativeBuildInputs = [ autoreconfHook texinfo ]; nativeBuildInputs = [ autoreconfHook texinfo ];
buildInputs = [ ncurses readline zlib lzo openssl ]; buildInputs = [ ncurses readline zlib lzo openssl ];
prePatch = ''
substituteInPlace configure.ac --replace UNKNOWN ${version}
'';
configureFlags = [ configureFlags = [
"--sysconfdir=/etc" "--sysconfdir=/etc"
"--localstatedir=/var" "--localstatedir=/var"
@ -28,6 +34,6 @@ stdenv.mkDerivation rec {
homepage="http://www.tinc-vpn.org/"; homepage="http://www.tinc-vpn.org/";
license = licenses.gpl2Plus; license = licenses.gpl2Plus;
platforms = platforms.unix; platforms = platforms.unix;
maintainers = with maintainers; [ wkennington ]; maintainers = with maintainers; [ wkennington fpletz ];
}; };
} }