diff options
| author | Franz Pletz <fpletz@fnordicwalking.de> | 2015-12-18 11:39:45 +0100 |
|---|---|---|
| committer | Franz Pletz <fpletz@fnordicwalking.de> | 2016-02-22 04:59:59 +0100 |
| commit | d31f58c6889574bd2ab4b7ea3c8670d6e66f0d99 (patch) | |
| tree | 4bab1d0415cd41a77fedbce7ed6c8a312dee35b8 /pkgs | |
| parent | c3c5622817ea593804272b5110c27c8456d53a62 (diff) | |
| download | nixlib-d31f58c6889574bd2ab4b7ea3c8670d6e66f0d99.tar nixlib-d31f58c6889574bd2ab4b7ea3c8670d6e66f0d99.tar.gz nixlib-d31f58c6889574bd2ab4b7ea3c8670d6e66f0d99.tar.bz2 nixlib-d31f58c6889574bd2ab4b7ea3c8670d6e66f0d99.tar.lz nixlib-d31f58c6889574bd2ab4b7ea3c8670d6e66f0d99.tar.xz nixlib-d31f58c6889574bd2ab4b7ea3c8670d6e66f0d99.tar.zst nixlib-d31f58c6889574bd2ab4b7ea3c8670d6e66f0d99.zip | |
tinc_pre: 2015-11-07 -> 2016-01-27
Also fixes `--version` parameter in exectuables.
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/tools/networking/tinc/pre.nix | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/pkgs/tools/networking/tinc/pre.nix b/pkgs/tools/networking/tinc/pre.nix index b8a58db2d1e3..5473a637b6a3 100644 --- a/pkgs/tools/networking/tinc/pre.nix +++ b/pkgs/tools/networking/tinc/pre.nix @@ -1,17 +1,23 @@ { stdenv, fetchgit, autoreconfHook, texinfo, ncurses, readline, zlib, lzo, openssl }: 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 { + inherit rev; url = "git://tinc-vpn.org/tinc"; - rev = "bdd84660c756437cf3bc8f64adf612055acc84ea"; - sha256 = "1vkpdn3gjlrrm0rfpbhz410mpcq16xy0ilvgkxsgifc9xgdgflmn"; + sha256 = "0wqgzbqlafbkmj71vhfrqwmp61g95amzd43py47kq3fn5aiybcqf"; }; nativeBuildInputs = [ autoreconfHook texinfo ]; buildInputs = [ ncurses readline zlib lzo openssl ]; + prePatch = '' + substituteInPlace configure.ac --replace UNKNOWN ${version} + ''; + configureFlags = [ "--sysconfdir=/etc" "--localstatedir=/var" @@ -28,6 +34,6 @@ stdenv.mkDerivation rec { homepage="http://www.tinc-vpn.org/"; license = licenses.gpl2Plus; platforms = platforms.unix; - maintainers = with maintainers; [ wkennington ]; + maintainers = with maintainers; [ wkennington fpletz ]; }; } |