GnuTLS: Upgrade, run test suite, add support for Guile bindings.

svn path=/nixpkgs/trunk/; revision=11502

pkgs/development/libraries/gnutls/default.nix

@@ -1,15 +1,31 @@
-args: with args;
+{ fetchurl, stdenv, zlib, lzo, libgcrypt
+, guileBindings, guile }:
+
+assert guileBindings -> guile != null;
+
 stdenv.mkDerivation rec {
-	name = "gnutls-2.1.5";
-	src = fetchurl {
-		url = "${meta.homepage}/releases/${name}.tar.bz2";
-		sha256 = "0idkp54d1w1c6l17pl41p2mqabcb1qm2akhfmp4mxwa5mabkiyld";
-	};
-	buildInputs = [zlib lzo libgcrypt];
+
+  name = "gnutls-2.3.4";
+
+  src = fetchurl {
+    url = "${meta.homepage}/releases/${name}.tar.bz2";
+    sha256 = "0n1pq40yl3ali17gkfzd2ad3xb9qrwx67affsqgssqffgmljq63j";
+  };
+
+  patches = [ ./tmpdir.patch ];
+
+  configurePhase = ''
+    ./configure --prefix="$out" --enable-guile --with-guile-site-dir="$out/share/guile/site"
+  '';
+
+  buildInputs = [zlib lzo libgcrypt]
+    ++ (if guileBindings then [guile] else []);
+
+  doCheck = true;
   
   meta = {
     description = "The GNU Transport Layer Security Library";
     homepage = http://www.gnu.org/software/gnutls/;
-    license = "LGPL";
+    license = "LGPLv2.1+";
   };
 }