Merge master into stdenv-updates

Conflicts (easy):
	pkgs/development/compilers/llvm/default.nix
	pkgs/development/compilers/openjdk/default.nix
	pkgs/development/libraries/icu/default.nix
	pkgs/development/libraries/libssh/default.nix
	pkgs/development/libraries/libxslt/default.nix
	pkgs/development/tools/parsing/bison/3.x.nix

4 files changed, 26 insertions, 20 deletions

diff --git a/pkgs/misc/emulators/atari800/default.nix b/pkgs/misc/emulators/atari800/default.nix
index 4e499a499fd7..5b1576bd97ca 100644
--- a/pkgs/misc/emulators/atari800/default.nix
+++ b/pkgs/misc/emulators/atari800/default.nix
@@ -1,11 +1,11 @@
 {stdenv, fetchurl, unzip, zlib, SDL}:
 
 stdenv.mkDerivation {
-  name = "atari800-2.0.2";
+  name = "atari800-2.2.1";
   builder = ./builder.sh;
   src = fetchurl {
-    url = mirror://sourceforge/atari800/atari800-2.0.2.tar.gz;
-    md5 = "a81f8a5ace5fd89eb6094faef7c936af";
+    url = mirror://sourceforge/atari800/atari800-2.2.1.tar.gz;
+    sha256 = "0gkhlb3jc0rd7fcqjm41877fsqr7als3a0n552qmnjzrlcczf5yz";
   };
   rom = fetchurl {
     url = mirror://sourceforge/atari800/xf25.zip;
diff --git a/pkgs/misc/emulators/retroarch/default.nix b/pkgs/misc/emulators/retroarch/default.nix
index a98e6db2db4b..8bc53da8f0c8 100644
--- a/pkgs/misc/emulators/retroarch/default.nix
+++ b/pkgs/misc/emulators/retroarch/default.nix
@@ -1,27 +1,31 @@
-{ stdenv, fetchurl, pkgconfig, which
+{ stdenv, fetchgit, pkgconfig, which
 , SDL, mesa, alsaLib
+, libXxf86vm, libXinerama, libXv
 }:
 
 stdenv.mkDerivation rec {
-  name = "retroarch-0.9.9";
+  name = "retroarch-0.9.9.7";
 
-  src = fetchurl {
-    url = "http://themaister.net/retroarch-dl/${name}.tar.gz";
-    sha256 = "08xlndpl14c4ccgp752ixx3a7ajf3xp93nawhinwxq0cw801prda";
+  src = fetchgit {
+    url = "https://github.com/libretro/RetroArch.git";
+    rev = "ea0c4880556e0f9d1fe8253ddc713bc743b00e1b";
+    sha256 = "1jhyh7f8ijy67fxslxqsp8pjl2lwayjljp06hp4n5cn33yajpbd7";
   };
 
   buildInputs = [
     pkgconfig which SDL mesa alsaLib
+    libXxf86vm libXinerama libXv
   ];
 
   preConfigure = ''
     configureFlags="--global-config-dir=$out/etc"
   '';
-
+ 
   meta = {
-    description = "A cross-platform multi-system emulator";
-    homepage = "http://themaister.net/retroarch.html";
+    description = "Modular multi-system game/emulator system";
+    homepage = "http://www.libretro.com/";
     license = stdenv.lib.licenses.gpl3Plus;
-    platform = stdenv.lib.platforms.linux;
+    platforms = stdenv.lib.platforms.linux;
+    maintainers = with stdenv.lib.maintainers; [ iyzsong ];
   };
 }
diff --git a/pkgs/misc/emulators/wine/stable.nix b/pkgs/misc/emulators/wine/stable.nix
index a9e0aacba263..5bec6a310d19 100644
--- a/pkgs/misc/emulators/wine/stable.nix
+++ b/pkgs/misc/emulators/wine/stable.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, xlibs, flex, bison, mesa, alsaLib
+{ stdenv, fetchurl, pkgconfig, xlibs, flex, bison, mesa, mesa_noglu, alsaLib
 , ncurses, libpng, libjpeg, lcms, freetype, fontconfig, fontforge
 , libxml2, libxslt, openssl, gnutls, cups, libdrm, makeWrapper
 }:
@@ -34,7 +34,8 @@ in stdenv.mkDerivation rec {
   inherit version name src;
 
   buildInputs = [
-    xlibs.xlibs flex bison xlibs.libXi mesa
+    pkgconfig
+    xlibs.xlibs flex bison xlibs.libXi mesa mesa_noglu.osmesa
     xlibs.libXcursor xlibs.libXinerama xlibs.libXrandr
     xlibs.libXrender xlibs.libXxf86vm xlibs.libXcomposite
     alsaLib ncurses libpng libjpeg lcms fontforge
@@ -45,7 +46,7 @@ in stdenv.mkDerivation rec {
   # them to the RPATH so that the user doesn't have to set them in
   # LD_LIBRARY_PATH.
   NIX_LDFLAGS = map (path: "-rpath ${path}/lib ") [
-    freetype fontconfig stdenv.gcc.gcc mesa libdrm
+    freetype fontconfig stdenv.gcc.gcc mesa mesa_noglu.osmesa libdrm
     xlibs.libXinerama xlibs.libXrender xlibs.libXrandr
     xlibs.libXcursor xlibs.libXcomposite libpng libjpeg
     openssl gnutls cups
diff --git a/pkgs/misc/emulators/wine/unstable.nix b/pkgs/misc/emulators/wine/unstable.nix
index 2c6499000348..0cb81a8185a4 100644
--- a/pkgs/misc/emulators/wine/unstable.nix
+++ b/pkgs/misc/emulators/wine/unstable.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, xlibs, flex, bison, mesa, alsaLib
+{ stdenv, fetchurl, pkgconfig, xlibs, flex, bison, mesa, mesa_noglu, alsaLib
 , ncurses, libpng, libjpeg, lcms, freetype, fontconfig, fontforge
 , libxml2, libxslt, openssl, gnutls, cups, libdrm, makeWrapper
 }:
@@ -7,12 +7,12 @@ assert stdenv.isLinux;
 assert stdenv.gcc.gcc != null;
 
 let 
-    version = "1.7.7";
+    version = "1.7.8";
     name = "wine-${version}";
 
     src = fetchurl {
       url = "mirror://sourceforge/wine/${name}.tar.bz2";
-      sha256 = "19xcspll0ljbr2v0y7xy4943pgqalya2zrzndqsl2d7kpyv061hi";
+      sha256 = "010qa6xn0b0161kcmm43yr0bp39iddb6d5i27mpl229shrgpzq9h";
     };
 
     gecko = fetchurl {
@@ -34,7 +34,8 @@ in stdenv.mkDerivation rec {
   inherit version name src;
 
   buildInputs = [
-    xlibs.xlibs flex bison xlibs.libXi mesa
+    pkgconfig
+    xlibs.xlibs flex bison xlibs.libXi mesa mesa_noglu.osmesa
     xlibs.libXcursor xlibs.libXinerama xlibs.libXrandr
     xlibs.libXrender xlibs.libXxf86vm xlibs.libXcomposite
     alsaLib ncurses libpng libjpeg lcms fontforge
@@ -45,7 +46,7 @@ in stdenv.mkDerivation rec {
   # them to the RPATH so that the user doesn't have to set them in
   # LD_LIBRARY_PATH.
   NIX_LDFLAGS = map (path: "-rpath ${path}/lib ") [
-    freetype fontconfig stdenv.gcc.gcc mesa libdrm
+    freetype fontconfig stdenv.gcc.gcc mesa mesa_noglu.osmesa libdrm
     xlibs.libXinerama xlibs.libXrender xlibs.libXrandr
     xlibs.libXcursor xlibs.libXcomposite libpng libjpeg
     openssl gnutls cups