From 3fe746cfc2f26c9161c659305810f14f32f4b8e5 Mon Sep 17 00:00:00 2001
From: Alexander Ried <ried@mytum.de>
Date: Tue, 3 May 2016 19:39:53 +0200
Subject: tinc_pre: 1.1pre-git2016.01.28 -> 1.1pre-14 (#15192)

split the documentation output
remove the tinc-gui binary because python dependencies are not fulfilled
---
 pkgs/tools/networking/tinc/pre.nix | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

(limited to 'pkgs/tools/networking')

diff --git a/pkgs/tools/networking/tinc/pre.nix b/pkgs/tools/networking/tinc/pre.nix
index 5473a637b6a3..61e4ee281edc 100644
--- a/pkgs/tools/networking/tinc/pre.nix
+++ b/pkgs/tools/networking/tinc/pre.nix
@@ -2,15 +2,16 @@
 
 stdenv.mkDerivation rec {
   name = "tinc-${version}";
-  rev = "d8ca00fe40ff4b6d87e7e64c273f536fab462356";
-  version = "1.1pre-2016-01-28-${builtins.substring 0 7 rev}";
+  version = "1.1pre14";
 
   src = fetchgit {
-    inherit rev;
+    rev = "refs/tags/release-${version}";
     url = "git://tinc-vpn.org/tinc";
-    sha256 = "0wqgzbqlafbkmj71vhfrqwmp61g95amzd43py47kq3fn5aiybcqf";
+    sha256 = "0idc4ddhz380xw26c8wwdyr0p6pibada55f0hzhnc2cz9za9x4iv";
   };
 
+  outputs = [ "out" "doc" ];
+
   nativeBuildInputs = [ autoreconfHook texinfo ];
   buildInputs = [ ncurses readline zlib lzo openssl ];
 
@@ -18,6 +19,10 @@ stdenv.mkDerivation rec {
     substituteInPlace configure.ac --replace UNKNOWN ${version}
   '';
 
+  postInstall = ''
+    rm $out/bin/tinc-gui
+  '';
+
   configureFlags = [
     "--sysconfdir=/etc"
     "--localstatedir=/var"
-- 
cgit 1.4.1