Merge branch 'origin/master' into stdenv-updates.

Conflicts:
	pkgs/tools/misc/less/default.nix

5 files changed, 39 insertions, 12 deletions

diff --git a/pkgs/games/LambdaHack/default.nix b/pkgs/games/LambdaHack/default.nix
index f76aab551648..b9b66f4be691 100644
--- a/pkgs/games/LambdaHack/default.nix
+++ b/pkgs/games/LambdaHack/default.nix
@@ -1,17 +1,17 @@
-{ cabal, binary, ConfigFile, deepseq, enummapset, filepath, gtk
-, hashable, keys, miniutter, mtl, prettyShow, random, stm, text
-, transformers, unorderedContainers, zlib
+{ cabal, assertFailure, binary, ConfigFile, deepseq, enummapsetTh
+, filepath, gtk, hashable, keys, miniutter, mtl, prettyShow, random
+, stm, text, transformers, unorderedContainers, zlib
 }:
 
 cabal.mkDerivation (self: {
   pname = "LambdaHack";
-  version = "0.2.10";
-  sha256 = "1lj960r6gyg8kpc13fs6yq51l0qkpk4yd7ixhh0j4j8xghvx9mw5";
+  version = "0.2.10.6";
+  sha256 = "19ak0ygw38b51wkm4p10xgdk3h9mh5vvb8c60qhs7cmgzjcph38n";
   isLibrary = true;
   isExecutable = true;
   buildDepends = [
-    binary ConfigFile deepseq enummapset filepath gtk hashable keys
-    miniutter mtl prettyShow random stm text transformers
+    assertFailure binary ConfigFile deepseq enummapsetTh filepath gtk
+    hashable keys miniutter mtl prettyShow random stm text transformers
     unorderedContainers zlib
   ];
   meta = {
diff --git a/pkgs/games/anki/default.nix b/pkgs/games/anki/default.nix
index d574f9c860f6..e039291882c5 100644
--- a/pkgs/games/anki/default.nix
+++ b/pkgs/games/anki/default.nix
@@ -9,10 +9,10 @@ let
 in
 
 stdenv.mkDerivation rec {
-    name = "anki-2.0.18";
+    name = "anki-2.0.20";
     src = fetchurl {
       url = "http://ankisrs.net/download/mirror/${name}.tgz";
-      sha256 = "1hpla3bgg7zh05f1dgycs5j4a01hnim66a8q2qzihf1r5zanr50j";
+      sha256 = "1w274g7as458bfkh86635p04fimvmkn70j8qy9m6nl2xwjaq8nhm";
     };
 
     pythonPath = [ pyqt4 py.pysqlite py.sqlalchemy py.pyaudio ]
diff --git a/pkgs/games/bzflag/default.nix b/pkgs/games/bzflag/default.nix
index d15c25cef3cd..ce3a0c8fa3c3 100644
--- a/pkgs/games/bzflag/default.nix
+++ b/pkgs/games/bzflag/default.nix
@@ -1,11 +1,11 @@
 { fetchurl, stdenv, curl, SDL, mesa, glew, ncurses }:
 
 stdenv.mkDerivation rec {
-  name = "bzflag-2.0.16";
+  name = "bzflag-2.4.2";
 
   src = fetchurl {
-    url = mirror://sourceforge/bzflag/bzflag-2.0.16.tar.bz2;
-    sha256 = "13v0ibiyq59j3xf23yf7s8blkmacagl8w48v2580k5bzkswa0vzy";
+    url = mirror://sourceforge/bzflag/bzflag-2.4.2.tar.bz2;
+    sha256 = "04f8c83hfwwh4i74gxqqdbgc2r5hn9ayam986py3jjychhicaysg";
   };
 
   buildInputs = [ curl SDL mesa glew ncurses ];
diff --git a/pkgs/games/fsg/default.nix b/pkgs/games/fsg/default.nix
index 7a9dc1105408..a4579ad2ae36 100644
--- a/pkgs/games/fsg/default.nix
+++ b/pkgs/games/fsg/default.nix
@@ -34,6 +34,7 @@ stdenv.mkDerivation {
     sed -e '
       s@currentProbIndex != 100@0@;
     ' -i MainFrame.cpp
+    sed -re '/ctrans_prob/s/energy\[center][+]energy\[other]/(int)(fmin(energy[center]+energy[other],99))/g' -i Canvas.cpp
   '';
 
   installPhase = ''
diff --git a/pkgs/games/stepmania/default.nix b/pkgs/games/stepmania/default.nix
new file mode 100644
index 000000000000..130f1f905a44
--- /dev/null
+++ b/pkgs/games/stepmania/default.nix
@@ -0,0 +1,26 @@
+{ stdenv, fetchhg, zlib, bzip2, pkgconfig, alsaLib, pulseaudio, libmad, libtheora,
+  libvorbis, libpng, libjpeg, mesa, gtk, ffmpeg, automake, autoconf, glew }:
+
+stdenv.mkDerivation rec {
+  name = "stepmania-5";
+
+  src = fetchhg {
+    url = "https://code.google.com/p/sm-ssc/";
+    # revision = "5fdf515a180e";
+    sha256 = "05v19giq7d956islr2r8350zfwc4h8sq89xlj93ccii8rp94cvvf";
+  };
+
+  buildInputs = [ zlib bzip2 pkgconfig alsaLib pulseaudio libmad libtheora
+                  libvorbis libpng libjpeg mesa gtk ffmpeg automake autoconf glew ];
+
+  preConfigure = "./autogen.sh";
+  postInstall = ''
+    mv "$out/stepmania 5/"* $out/
+    rmdir "$out/stepmania 5"
+    mkdir -p $out/bin
+    echo "#\!/bin/sh" > $out/bin/stepmania
+    echo 'export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:${alsaLib}/lib' >> $out/bin/stepmania
+    echo "exec $out/stepmania" >> $out/bin/stepmania
+    chmod +x $out/bin/stepmania
+  '';
+}