Merge branch 'master' into x-updates

Conflicts (just taken x-updates):
	pkgs/servers/x11/xorg/overrides.nix

pkgs/misc/emulators/hatari/default.nix

@@ -0,0 +1,22 @@
+{ stdenv, fetchurl, zlib, SDL, cmake }:
+
+stdenv.mkDerivation rec {
+  name = "hatari-1.6.2";
+
+  src = fetchurl {
+    url = "http://download.tuxfamily.org/hatari/1.6.2/${name}.tar.bz2";
+    sha256 = "0gqvfqqd0lg3hi261rwh6gi2b5kmza480kfzx43d4l49xcq09pi0";
+  };
+
+  # For pthread_cancel
+  cmakeFlags = "-DCMAKE_EXE_LINKER_FLAGS=-lgcc_s";
+
+  buildInputs = [ zlib SDL cmake ];
+
+  meta = {
+    homepage = "http://hatari.tuxfamily.org/";
+    description = "Hatari is an Atari ST/STE/TT/Falcon emulator.";
+    license = "GPLv2+";
+    platforms = with stdenv.lib.platforms; all;
+  };
+}

pkgs/misc/emulators/wine/default.nix

@@ -7,12 +7,12 @@ assert stdenv.isLinux;
 assert stdenv.gcc.gcc != null;
 
 stdenv.mkDerivation rec {
-  version = "1.5.25";
+  version = "1.5.28";
   name = "wine-${version}";
 
   src = fetchurl {
     url = "mirror://sourceforge/wine/${name}.tar.bz2";
-    sha256 = "0812ryv1v0gqr13vmvjci09k89qhcr1qs0n052z4zw0vpipjd4rx";
+    sha256 = "0ik02c11bp1glafcw82drkmjp8lxrkycvas3jlrvf1rv46blpy0b";
   };
 
   gecko = fetchurl {