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

Conflicts:
	pkgs/misc/emulators/wine/default.nix

pkgs/tools/filesystems/ntfs-3g/default.nix

@@ -2,7 +2,7 @@
 , crypto ? false, libgcrypt, gnutls, pkgconfig}:
 
 stdenv.mkDerivation rec {
-  pname = "ntfs-3g_ntfsprogs";
+  pname = "ntfs-3g";
   version = "2012.1.15";
   name = "${pname}-${version}";
 
@@ -10,7 +10,7 @@ stdenv.mkDerivation rec {
   nativeBuildInputs = stdenv.lib.optional crypto pkgconfig;
 
   src = fetchurl {
-    url = "http://tuxera.com/opensource/${name}.tgz";
+    url = "http://tuxera.com/opensource/ntfs-3g_ntfsprogs-${version}.tgz";
     sha256 = "09gvfgvqm4dswzxmwvg3r23bv39cp8y8b6qs2jcwmrqd032i25kg";
   };
 

pkgs/tools/misc/hddtemp/default.nix

@@ -1,7 +1,7 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation {
-  name = "hddtemp-0.3-beta15";
+  name = "hddtemp-0.3_beta15";
 
   db = fetchurl{
     url = http://download.savannah.nongnu.org/releases/hddtemp/hddtemp.db;

pkgs/tools/misc/rmlint/default.nix

@@ -0,0 +1,19 @@
+{ fetchurl, stdenv }:
+
+stdenv.mkDerivation rec {
+  name = "rmlint-1.0.8";
+
+  src = fetchurl {
+    url = "https://github.com/downloads/sahib/rmlint/rmlint_1.0.8.tar.gz";
+    sha256 = "bea39a5872b39d3596e756f242967bc5bde6febeb996fdcd63fbcf5bfdc75f01";
+  };
+
+  makeFlags="DESTDIR=$(out)";
+
+  meta = {
+    description = "A tool to remove duplicates and other lint";
+    homepage = "https://github.com/sahib/rmlint";
+    platforms = stdenv.lib.platforms.linux;
+    license = stdenv.lib.licenses.gpl3;
+  };
+}

pkgs/tools/networking/openconnect.nix

@@ -1,26 +1,25 @@
 { stdenv, fetchurl, pkgconfig, vpnc, openssl, libxml2 } :
 
 stdenv.mkDerivation rec {
-  name = "openconnect-5.00";
+  name = "openconnect-5.01";
 
   src = fetchurl {
     urls = [
       "ftp://ftp.infradead.org/pub/openconnect/${name}.tar.gz"
     ];
-    sha256 = "8bacd8d00b2c0ecf35594a8417e695b5ed3a7757467f22f980134de81ee7713a";
+    sha256 = "1l90ks87iwmy7jprav11lhjr4n18ycy0d9fndspg50p9qd3jlvwi";
   };
 
   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"
-
+    "--without-openssl-version-check"
   ];
 
   propagatedBuildInputs = [ vpnc openssl libxml2 ];

pkgs/tools/text/html-tidy/default.nix

@@ -2,7 +2,7 @@
 
 let date = "2009-07-04"; in
   stdenv.mkDerivation rec {
-    name = "html-tidy-${date}";
+    name = "html-tidy-20090704";
 
     # According to http://tidy.sourceforge.net/, there are no new
     # release tarballs, so one has to either get the code from CVS or