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

6 files changed, 93 insertions, 13 deletions

diff --git a/pkgs/servers/http/apache-httpd/2.4.nix b/pkgs/servers/http/apache-httpd/2.4.nix
index aa3ea07de537..f73ca2add068 100644
--- a/pkgs/servers/http/apache-httpd/2.4.nix
+++ b/pkgs/servers/http/apache-httpd/2.4.nix
@@ -16,12 +16,12 @@ assert ldapSupport -> aprutil.ldapSupport && openldap != null;
 assert http2Support -> nghttp2 != null;
 
 stdenv.mkDerivation rec {
-  version = "2.4.20";
+  version = "2.4.23";
   name = "apache-httpd-${version}";
 
   src = fetchurl {
     url = "mirror://apache/httpd/httpd-${version}.tar.bz2";
-    sha1 = "cefe8ea4a3f81c7a08e36c80ebbd792c67ab361b";
+    sha256 = "0n2yx3gjlpr4kgqx845fj6amnmg25r2l6a7rzab5hxnpmar985hc";
   };
 
   # FIXME: -dev depends on -doc
diff --git a/pkgs/servers/mail/postfix/pflogsumm.nix b/pkgs/servers/mail/postfix/pflogsumm.nix
new file mode 100644
index 000000000000..f73a22e130ab
--- /dev/null
+++ b/pkgs/servers/mail/postfix/pflogsumm.nix
@@ -0,0 +1,34 @@
+{ stdenv, fetchurl, buildPerlPackage, perlPackages
+}:
+
+buildPerlPackage rec {
+  name = "pflogsumm-${version}";
+  version = "1.1.3";
+
+  src = fetchurl {
+    url = "http://jimsun.linxnet.com/downloads/${name}.tar.gz";
+    sha256 = "0hkim9s5f1yg5sfs5048jydhy3sbxafls496wcjk0cggxb113py4";
+  };
+
+  outputs = [ "out" "man" ];
+  buildInputs = [ perlPackages.DateCalc ];
+
+  preConfigure = ''
+    touch Makefile.PL
+  '';
+  doCheck = false;
+
+  installPhase = ''
+    mkdir -p "$out/bin"
+    mv "pflogsumm.pl" "$out/bin/pflogsumm"
+
+    mkdir -p "$out/share/man/man1"
+    mv "pflogsumm.1" "$out/share/man/man1"
+  '';
+
+  meta = {
+    homepage = "http://jimsun.linxnet.com/postfix_contrib.html";
+    description = "Postfix activity overview";
+    license = stdenv.lib.licenses.gpl2Plus;
+  };
+}
diff --git a/pkgs/servers/matrix-synapse/default.nix b/pkgs/servers/matrix-synapse/default.nix
index b228ab826098..57abffa601fc 100644
--- a/pkgs/servers/matrix-synapse/default.nix
+++ b/pkgs/servers/matrix-synapse/default.nix
@@ -12,13 +12,13 @@ let
 in
 buildPythonApplication rec {
   name = "matrix-synapse-${version}";
-  version = "0.17.0";
+  version = "0.17.1";
 
   src = fetchFromGitHub {
     owner = "matrix-org";
     repo = "synapse";
     rev = "v${version}";
-    sha256 = "0rkaadc1vkg6p3d91yid2y6a0l7drbvpkqa8v7f50gpcbdzn1l93";
+    sha256 = "04wl6lznffxhvfq52cmbg2amkl03454wyaqc17i0zlc6b0p14dli";
   };
 
   patches = [ ./matrix-synapse.patch ];
diff --git a/pkgs/servers/nosql/redis/default.nix b/pkgs/servers/nosql/redis/default.nix
index 69d6377b664a..7dbdf5f04a2b 100644
--- a/pkgs/servers/nosql/redis/default.nix
+++ b/pkgs/servers/nosql/redis/default.nix
@@ -1,12 +1,12 @@
 { stdenv, fetchurl, lua }:
 
 stdenv.mkDerivation rec {
-  version = "3.2.2";
+  version = "3.2.3";
   name = "redis-${version}";
 
   src = fetchurl {
     url = "http://download.redis.io/releases/${name}.tar.gz";
-    sha256 = "05cf63502b2248b5d39588962100bfa4fcb47dabd56931a8cb60b301b1d8daea";
+    sha256 = "05az2g3gna5lkhh6x1a5m6yardbiig1l4ysggldlk5if8ww9qkk7";
   };
 
   buildInputs = [ lua ];
diff --git a/pkgs/servers/search/groonga/default.nix b/pkgs/servers/search/groonga/default.nix
new file mode 100644
index 000000000000..e1e6dacfe984
--- /dev/null
+++ b/pkgs/servers/search/groonga/default.nix
@@ -0,0 +1,42 @@
+{ stdenv, fetchurl, mecab, kytea, libedit, pkgconfig
+, suggestSupport ? false, zeromq, libevent, libmsgpack
+, lz4Support ? false, lz4
+, zlibSupport ? false, zlib
+}:
+
+stdenv.mkDerivation rec {
+
+  name    = "groonga-${version}";
+  version = "6.0.7";
+
+  src = fetchurl {
+    url    = "http://packages.groonga.org/source/groonga/groonga-6.0.7.tar.gz";
+    sha256 = "19vpjjq3mqaqy9idlmqg2agrz9dc48a9id8j7nx158pkwjvpj7jf";
+  };
+
+  buildInputs = with stdenv.lib; [ pkgconfig mecab kytea libedit ] ++
+    optional lz4Support lz4 ++
+    optional zlibSupport zlib ++
+    optional suggestSupport [ zeromq libevent libmsgpack ];
+
+  configureFlags = with stdenv.lib; ''
+    ${optionalString zlibSupport "--with-zlib"}
+    ${optionalString lz4Support "--with-lz4"}
+  '';
+
+  meta = with stdenv.lib; {
+    homepage = http://groonga.org/;
+    description = "An open-source fulltext search engine and column store";
+
+    longDescription = ''
+      Groonga is an open-source fulltext search engine and column store. 
+      It lets you write high-performance applications that requires fulltext search.
+    '';
+
+    license = licenses.lgpl21;
+
+    maintainers = [ maintainers.ericsagnes ];
+    platforms = platforms.linux;
+  };
+
+}
diff --git a/pkgs/servers/sip/freeswitch/default.nix b/pkgs/servers/sip/freeswitch/default.nix
index 1cce4c518ea9..977575491f5a 100644
--- a/pkgs/servers/sip/freeswitch/default.nix
+++ b/pkgs/servers/sip/freeswitch/default.nix
@@ -1,16 +1,20 @@
-{ fetchurl, stdenv, ncurses, curl, pkgconfig, gnutls, readline, openssl, perl, libjpeg
-, libzrtpcpp }:
+{ fetchurl, stdenv, ncurses, curl, pkgconfig, gnutls, readline
+, openssl, perl, sqlite, libjpeg, libzrtpcpp, speex, pcre
+, ldns, libedit, yasm, which, lua, libopus, libsndfile }:
 
 stdenv.mkDerivation rec {
-  name = "freeswitch-1.6.6";
+  name = "freeswitch-1.6.9";
 
   src = fetchurl {
-    url = "http://files.freeswitch.org/releases/freeswitch/${name}.tar.bz2";
-    sha256 = "0kfvn5f75c6r6yp18almjz9p6llvpm66gpbxcjswrg3ddgbkzg0k";
+    url = "http://files.freeswitch.org/freeswitch-releases/${name}.tar.bz2";
+    sha256 = "0g0x4m8rb2ybpxwrszb4w37rb10v9fbszm7l2skjakf4dx0gw5i7";
   };
 
-  buildInputs = [ ncurses curl pkgconfig gnutls readline openssl perl libjpeg
-    libzrtpcpp ];
+  buildInputs = [
+    ncurses curl pkgconfig gnutls readline openssl perl libjpeg
+    sqlite libzrtpcpp pcre speex ldns libedit yasm which lua libopus
+    libsndfile
+  ];
 
   NIX_CFLAGS_COMPILE = "-Wno-error";