Merge branch 'master' into staging

* master: (271 commits)
  pysmbc: clarify license
  pysmbc: fix license
  bazel: 0.5.4 -> 0.6.0 (#29990)
  googler: init at 3.3
  go: declare support for aarch64
  firefox-beta-bin: 56.0b5 -> 57.0b4
  spotify: 1.0.64.401.g9d720389-21 -> 1.0.64.407.g9bd02c2d-26
  gogs: 0.11.19 -> 0.11.29
  grafana: 4.5.1 -> 4.5.2
  mopidy-iris: 3.4.1 -> 3.4.9
  nextcloud: 12.0.2 -> 12.0.3
  haskell-json-autotype: jailbreak to fix build within LTS 9.x
  kore: fix up
  kore: init at 2.0.0
  glusterfs service: fix issues with useRpcbind
  tig: 2.2.2 -> 2.3.0
  haskell-hspec-core: enable test suite again
  hackage-packages.nix: automatic Haskell package set update
  librsvg: fix thumbnailer path
  awscli: 1.11.108 -> 1.11.162
  ...

5 files changed, 20 insertions, 13 deletions

diff --git a/pkgs/games/flightgear/default.nix b/pkgs/games/flightgear/default.nix
index 2d7f5566c5d2..743194269917 100644
--- a/pkgs/games/flightgear/default.nix
+++ b/pkgs/games/flightgear/default.nix
@@ -2,18 +2,18 @@
 , freeglut, freealut, mesa, libICE, libjpeg, openal, openscenegraph, plib
 , libSM, libunwind, libX11, xproto, libXext, xextproto, libXi, inputproto
 , libXmu, libXt, simgear, zlib, boost, cmake, libpng, udev, fltk13, apr
-, makeDesktopItem, qtbase
+, makeDesktopItem, qtbase, qtdeclarative, glew
 }:
 
 let
-  version = "2016.4.4";
-  shortVersion = "2016.4";
+  version = "2017.3.1";
+  shortVersion = "2017.3";
   data = stdenv.mkDerivation rec {
     name = "flightgear-base-${version}";
 
     src = fetchurl {
       url = "mirror://sourceforge/flightgear/release-${shortVersion}/FlightGear-${version}-data.tar.bz2";
-      sha256 = "0s4nlkwi9jfc408agsl0w5xl3vajrvplc66k3nwg92wsr614pz9x";
+      sha256 = "166q0fsbp17lx1l1n6i8cfk3d1i79pasz1liya09z6m2i1pb026z";
     };
 
     phases = [ "installPhase" ];
@@ -31,7 +31,7 @@ stdenv.mkDerivation rec {
 
   src = fetchurl {
     url = "mirror://sourceforge/flightgear/release-${shortVersion}/${name}.tar.bz2";
-    sha256 = "1z7s9m2g85g8q9zxawhpal84rq2jin1ppchshbwi460gwk5r46fm";
+    sha256 = "1kccf91vmxnzyki6grx09s10dvr4j6qrz34ikj7jn81g5scisbkg";
   };
 
   # Of all the files in the source and data archives, there doesn't seem to be
@@ -56,6 +56,7 @@ stdenv.mkDerivation rec {
     freeglut freealut mesa libICE libjpeg openal openscenegraph plib
     libSM libunwind libX11 xproto libXext xextproto libXi inputproto
     libXmu libXt simgear zlib boost cmake libpng udev fltk13 apr qtbase
+    glew qtdeclarative
   ];
 
   postInstall = ''
@@ -66,10 +67,10 @@ stdenv.mkDerivation rec {
     do
       wrapProgram $f --set FG_ROOT "${data}/share/FlightGear"
     done
-
-
   '';
 
+  enableParallelBuilding = true;
+
   meta = with stdenv.lib; {
     description = "Flight simulator";
     maintainers = with maintainers; [ raskin the-kenny ];
diff --git a/pkgs/games/odamex/default.nix b/pkgs/games/odamex/default.nix
index 40915c98485d..c70744ea2991 100644
--- a/pkgs/games/odamex/default.nix
+++ b/pkgs/games/odamex/default.nix
@@ -18,5 +18,6 @@ stdenv.mkDerivation rec {
     license = stdenv.lib.licenses.gpl2;
     platforms = stdenv.lib.platforms.unix;
     maintainers = with stdenv.lib.maintainers; [ MP2E ];
+    broken = true;
   };
 }
diff --git a/pkgs/games/openrw/default.nix b/pkgs/games/openrw/default.nix
index 0c235383acff..6dd098ee7b8e 100644
--- a/pkgs/games/openrw/default.nix
+++ b/pkgs/games/openrw/default.nix
@@ -1,16 +1,20 @@
-{ stdenv, fetchgit, cmake, sfml, mesa, bullet, glm, libmad, x11 }:
+{ stdenv, fetchgit, cmake, sfml, mesa, bullet, glm, libmad, x11, openal
+, SDL2, boost, ffmpeg }:
 
 stdenv.mkDerivation rec {
-  version = "2016-06-29";
+  version = "2017-09-17";
   name = "openrw-${version}";
+
   src = fetchgit {
     url = "https://github.com/rwengine/openrw";
-    rev = "46a7254a41d9f6e1eda8d31e742de492abb2540e";
-    sha256 = "16ip9779dy59xcj9src2i4zp8jq2h0h5mb4a7d5cpkhd3xlcpabm";
+    rev = "11e90c61e56b60240251cd080f175ddff7d7a101";
+    sha256 = "16qklk9yc4ssxxkicxvww4gmg1c7cm6vhyilyv287vhz1fq9sz49";
     fetchSubmodules = true;
   };
 
-  buildInputs = [ cmake sfml mesa bullet glm libmad x11 ];
+  buildInputs = [
+    cmake sfml mesa bullet glm libmad x11 openal SDL2 boost ffmpeg
+  ];
 
   meta = with stdenv.lib; {
     description = "Unofficial open source recreation of the classic Grand Theft Auto III game executable";
diff --git a/pkgs/games/spring/default.nix b/pkgs/games/spring/default.nix
index 634389d1410d..40e97567d394 100644
--- a/pkgs/games/spring/default.nix
+++ b/pkgs/games/spring/default.nix
@@ -50,5 +50,6 @@ stdenv.mkDerivation rec {
     license = licenses.gpl2;
     maintainers = [ maintainers.phreedom maintainers.qknight maintainers.domenkozar ];
     platforms = platforms.linux;
+    broken = true;
   };
 }
diff --git a/pkgs/games/stockfish/default.nix b/pkgs/games/stockfish/default.nix
index 629d7b1ea82f..14b9b424345d 100644
--- a/pkgs/games/stockfish/default.nix
+++ b/pkgs/games/stockfish/default.nix
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
       much stronger than the best human chess grandmasters.
       '';
     maintainers = with maintainers; [ luispedro peti ];
-    platforms = with platforms; i686 ++ x86_64;
+    platforms = ["x86_64-linux" "i686-linux"];
     license = licenses.gpl2;
   };