2 files changed, 37 insertions, 4 deletions
diff --git a/pkgs/tools/networking/gandi-cli/default.nix b/pkgs/tools/networking/gandi-cli/default.nix
new file mode 100644
index 000000000000..2f95123ba212
--- /dev/null
+++ b/pkgs/tools/networking/gandi-cli/default.nix
@@ -0,0 +1,28 @@
+{ stdenv, pythonPackages, fetchFromGitHub }:
+
+with pythonPackages;
+
+buildPythonPackage rec {
+  namePrefix = "";
+  name = "gandi-cli-${version}";
+  version = "0.18";
+
+  src = fetchFromGitHub {
+    sha256 = "045gnz345nfbi1g7j3gcyzrxrx3hcidaxzr05cb49rcr8nmqh1s3";
+    rev = version;
+    repo = "gandi.cli";
+    owner = "Gandi";
+  };
+
+  propagatedBuildInputs = [ click ipy pyyaml requests ];
+
+  doCheck = false;    # Tests try to contact the actual remote API
+
+  meta = with stdenv.lib; {
+    description = "Command-line interface to the public Gandi.net API";
+    homepage = http://cli.gandi.net/;
+    license = licenses.gpl3Plus;
+    maintainers = with maintainers; [ nckx ];
+  };
+}
+
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"