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

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;
+   };
+}