Merge remote-tracking branch 'hydra/master' into x-updates

Conflicts (taken from @7c6f434c):
	pkgs/development/libraries/libgphoto2/default.nix

pkgs/tools/misc/gsmartcontrol/default.nix

@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version="0.8.7";
-  name = "gsmartcontrol";
+  name = "gsmartcontrol-${version}";
 
   src = fetchurl {
     url = "http://artificialtime.com/gsmartcontrol/gsmartcontrol-${version}.tar.bz2";

pkgs/tools/misc/hdf5/default.nix

@@ -3,7 +3,7 @@
 , fetchurl
 }:
 stdenv.mkDerivation {
-  name = "hdf5";
+  name = "hdf5-1.8.10";
   src = fetchurl {
     url = http://www.hdfgroup.org/ftp/HDF5/current/src/hdf5-1.8.10-patch1.tar.gz;
     sha256 = "08ad32fhnci6rdfn6mn3w9v1wcaxdcd326n3ljwkcq4dzhkh28qz";  			

pkgs/tools/misc/txt2man/default.nix

@@ -0,0 +1,22 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+  name = "txt2man-1.5.6";
+
+  src = fetchurl {
+    url = "http://mvertes.free.fr/download/${name}.tar.gz";
+    sha256 = "0ammlb4pwc4ya1kc9791vjl830074zrpfcmzc18lkcqczp2jaj4q";
+  };
+
+  preConfigure = ''
+    makeFlags=prefix="$out"
+  '';
+
+  meta = { 
+    description = "Convert flat ASCII text to man page format";
+    homepage = http://mvertes.free.fr/;
+    license = stdenv.lib.licenses.gpl2;
+    platforms = stdenv.lib.platforms.linux;
+    maintainers = with stdenv.lib.maintainers; [ bjornfor ];
+  };
+}

pkgs/tools/networking/openconnect.nix

@@ -0,0 +1,27 @@
+{ stdenv, fetchurl, pkgconfig, vpnc, openssl, libxml2 } :
+
+stdenv.mkDerivation rec {
+  name = "openconnect-5.00";
+
+  src = fetchurl {
+    urls = [
+      "ftp://ftp.infradead.org/pub/openconnect/${name}.tar.gz"
+    ];
+    sha256 = "8bacd8d00b2c0ecf35594a8417e695b5ed3a7757467f22f980134de81ee7713a";
+  };
+
+  preConfigure = ''
+      export PKG_CONFIG=${pkgconfig}/bin/pkg-config
+      export LIBXML2_CFLAGS="-I ${libxml2}/include/libxml2"
+      export LIBXML2_LIBS="-L${libxml2}/lib -lxml2"
+      export CFLAGS="-D NO_BROKEN_DTLS_CHECK $CFLAGS"
+    '';
+
+  configureFlags = [
+    "--with-vpnc-script=${vpnc}/etc/vpnc/vpnc-script"
+    "--disable-nls"
+
+  ];
+
+  propagatedBuildInputs = [ vpnc openssl libxml2 ];
+}

pkgs/tools/security/nmap/default.nix

@@ -2,7 +2,7 @@
 , openssl, python, pygtk, makeWrapper, pygobject
 , pycairo, pysqlite
 }:
-  
+
 stdenv.mkDerivation rec {
   name = "nmap-5.50";
 
@@ -11,6 +11,8 @@ stdenv.mkDerivation rec {
     sha256 = "aa044113caa47e172c154daed73afc70ffa18d359eb47c22a9ea85ffcb14ffb8";
   };
 
+  patches = [ ./zenmap.patch ];
+
   postInstall =
     ''
       wrapProgram $out/bin/zenmap --prefix PYTHONPATH : "$(toPythonPath $out)" --prefix PYTHONPATH : "$PYTHONPATH" --prefix PYTHONPATH : $(toPythonPath ${pygtk})/gtk-2.0 --prefix PYTHONPATH : $(toPythonPath ${pygobject})/gtk-2.0 --prefix PYTHONPATH : $(toPythonPath ${pycairo})/gtk-2.0

pkgs/tools/security/nmap/zenmap.patch

@@ -0,0 +1,15 @@
+diff -ruN nmap-5.50.orig/zenmap/zenmapCore/Paths.py nmap-5.50/zenmap/zenmapCore/Paths.py
+--- nmap-5.50.orig/zenmap/zenmapCore/Paths.py	2013-06-06 05:52:10.723087428 +0000
++++ nmap-5.50/zenmap/zenmapCore/Paths.py	2013-06-06 07:07:25.481261761 +0000
+@@ -115,7 +115,10 @@
+     else:
+         # Normal script execution. Look in the current directory to allow
+         # running from the distribution.
+-        return os.path.abspath(os.path.dirname(fs_dec(sys.argv[0])))
++        #
++        # Grrwlf: No,no,dear. That's not a script, thats Nixos wrapper. Go add
++        # those '..' to substract /bin part.
++        return os.path.abspath(os.path.join(os.path.dirname(fs_dec(sys.argv[0])), ".."))
+
+ prefix = get_prefix()
+

pkgs/tools/video/vncrec/default.nix

@@ -30,9 +30,10 @@ rec {
     xmkmf
   '') ["doUnpack" "minInit" "addInputs"];
       
-  name = "vncrec";
+  name = "vncrec-0.2"; # version taken from Arch AUR
   meta = {
     description = "VNC recorder";
+    homepage = http://ronja.twibright.com/utils/vncrec/;
     maintainers = [
     ];
   };