Merge branch 'master' into staging

Conflicts:
      pkgs/applications/misc/navit/default.nix
      pkgs/applications/networking/mailreaders/alpine/default.nix
      pkgs/applications/networking/mailreaders/realpine/default.nix
      pkgs/development/compilers/ghc/head.nix
      pkgs/development/libraries/openssl/default.nix
      pkgs/games/liquidwar/default.nix
      pkgs/games/spring/springlobby.nix
      pkgs/os-specific/linux/kernel/perf.nix
      pkgs/servers/sip/freeswitch/default.nix
      pkgs/tools/archivers/cromfs/default.nix
      pkgs/tools/graphics/plotutils/default.nix

7 files changed, 52 insertions, 5 deletions

diff --git a/pkgs/games/crawl/crawl_purify.patch b/pkgs/games/crawl/crawl_purify.patch
index bae82bebfb7..0e2d335adac 100644
--- a/pkgs/games/crawl/crawl_purify.patch
+++ b/pkgs/games/crawl/crawl_purify.patch
@@ -7,7 +7,7 @@ index b7e2fbf..5ff23db 100644
  
  ifndef CROSSHOST
 -	SQLITE_INCLUDE_DIR := /usr/include
-+	SQLITE_INCLUDE_DIR := ${sqlite.dev}/include
++	SQLITE_INCLUDE_DIR := ${sqlite}/include
  else
  	# This is totally wrong, works only with some old-style setups, and
  	# on some architectures of Debian/new FHS multiarch -- excluding, for
diff --git a/pkgs/games/crawl/default.nix b/pkgs/games/crawl/default.nix
index edaa3ef1fcc..186768617f7 100644
--- a/pkgs/games/crawl/default.nix
+++ b/pkgs/games/crawl/default.nix
@@ -30,6 +30,7 @@ stdenv.mkDerivation rec {
       patchShebangs $i
     done
     patchShebangs util/gen-mi-enum
+    rm -rf contrib
   '';
 
   makeFlags = [ "prefix=$(out)" "FORCE_CC=gcc" "FORCE_CXX=g++" "HOSTCXX=g++"
diff --git a/pkgs/games/liquidwar/5.nix b/pkgs/games/liquidwar/5.nix
new file mode 100644
index 00000000000..ac24f3bac74
--- /dev/null
+++ b/pkgs/games/liquidwar/5.nix
@@ -0,0 +1,24 @@
+{ stdenv, fetchurl, allegro }:
+stdenv.mkDerivation rec {
+  version = "5.6.4";
+  name = "liquidwar5-${version}";
+  src = fetchurl {
+    url = "http://download.savannah.gnu.org/releases/liquidwar/liquidwar-${version}.tar.gz";
+    sha256 = "18wkbfzp07yckg05b5gjy67rw06z9lxp0hzg0zwj7rz8i12jxi9j";
+  };
+
+   buildInputs = [
+     allegro
+   ];
+
+   configureFlags = 
+     (stdenv.lib.optional stdenv.isx86_64 "--disable-asm")
+     ;
+
+   meta = with stdenv.lib; {
+     description = ''The classic version of a quick tactics game LiquidWar'';
+     maintainers = [ maintainers.raskin ];
+     license = licenses.gpl2Plus;
+     platforms = platforms.linux;
+   };
+}
diff --git a/pkgs/games/pokerth/default.nix b/pkgs/games/pokerth/default.nix
index 9daf98dcfb4..e34f05402f7 100644
--- a/pkgs/games/pokerth/default.nix
+++ b/pkgs/games/pokerth/default.nix
@@ -19,6 +19,8 @@ in stdenv.mkDerivation rec {
 
   qmakeFlags = [ "pokerth.pro" ];
 
+  NIX_CFLAGS_COMPILE = [ "-I${SDL.dev}/include/SDL" ];
+
   postPatch = ''
     for f in connectivity.pro load.pro pokerth_game.pro pokerth_server.pro
     do
@@ -27,6 +29,8 @@ in stdenv.mkDerivation rec {
     done
   '';
 
+  enableParallelBuilding = true;
+
   postInstall = ''
     install -D -m755 bin/pokerth_server $server/bin/pokerth_server
   '';
diff --git a/pkgs/games/spring/default.nix b/pkgs/games/spring/default.nix
index 5b14e287f2c..634389d1410 100644
--- a/pkgs/games/spring/default.nix
+++ b/pkgs/games/spring/default.nix
@@ -8,11 +8,11 @@
 stdenv.mkDerivation rec {
 
   name = "spring-${version}";
-  version = "102.0";
+  version = "103.0";
 
   src = fetchurl {
     url = "mirror://sourceforge/springrts/spring_${version}_src.tar.lzma";
-    sha256 = "0gjlpzwl3bdv1ickm8r3xlrbc6dm7m8i968hw3p0an49k6bqa77i";
+    sha256 = "1fmnwk8ig36429pkp1rafzg4hyzp7i6mwy27p7fdxrdj1q4blx9l";
   };
 
   # The cmake included module correcly finds nix's glew, however
diff --git a/pkgs/games/spring/revert_58b423e.patch b/pkgs/games/spring/revert_58b423e.patch
new file mode 100644
index 00000000000..79a42cefa5a
--- /dev/null
+++ b/pkgs/games/spring/revert_58b423e.patch
@@ -0,0 +1,16 @@
+--- a/src/utils/slpaths.cpp
++++ b/src/utils/slpaths.cpp
+@@ -165,13 +165,10 @@
+ 			usync_paths.push_back(bundle);
+ 		}
+ 		if (!SlPaths::IsPortableMode()) {
+-			/*
+-//FIXME: reenable when #707 is fixed / spring 102.0 is "established"
+ 			LSL::SpringBundle systembundle;
+ 			if (LSL::SpringBundle::LocateSystemInstalledSpring(systembundle)) {
+ 				usync_paths.push_back(systembundle);
+ 			}
+-*/
+ 
+ 			std::vector<std::string> paths;
+ 			PossibleEnginePaths(paths);
diff --git a/pkgs/games/spring/springlobby.nix b/pkgs/games/spring/springlobby.nix
index efab1defbed..78b9e155642 100644
--- a/pkgs/games/spring/springlobby.nix
+++ b/pkgs/games/spring/springlobby.nix
@@ -4,11 +4,11 @@
 
 stdenv.mkDerivation rec {
   name = "springlobby-${version}";
-  version = "0.247";
+  version = "0.255";
 
   src = fetchurl {
     url = "http://www.springlobby.info/tarballs/springlobby-${version}.tar.bz2";
-    sha256 = "0sx14k4xsyjkmphhxfn9q341lv32c53g6wl1cbdx2sknzs3qasxs";
+    sha256 = "12iv6h1mz998lzxc2jwkza0m1yvaaq8h05k36i85xyp7g90197jw";
   };
 
   buildInputs = [
@@ -16,6 +16,8 @@ stdenv.mkDerivation rec {
     boost libpng libX11 libnotify gtk doxygen makeWrapper glib minizip alure
   ];
 
+  patches = [ ./revert_58b423e.patch ]; # Allows springLobby to continue using system installed spring until #707 is fixed
+
   enableParallelBuilding = true;
 
   postInstall = ''