Merge remote-tracking branch 'origin/master' into staging

Conflicts:
	pkgs/development/libraries/boost/generic.nix

10 files changed, 20 insertions, 17 deletions

diff --git a/pkgs/servers/beanstalkd/default.nix b/pkgs/servers/beanstalkd/default.nix
index 264e6ff749a5..cea7ca0b337f 100644
--- a/pkgs/servers/beanstalkd/default.nix
+++ b/pkgs/servers/beanstalkd/default.nix
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
 
   meta = with stdenv.lib; {
     homepage = http://kr.github.io/beanstalkd/;
-    description = "Beanstalk is a simple, fast work queue.";
+    description = "A simple, fast work queue";
     license = licenses.mit;
     maintainers = [ maintainers.zimbatm ];
     platforms = platforms.all;
diff --git a/pkgs/servers/bird/default.nix b/pkgs/servers/bird/default.nix
index 9b9655053693..9b17551a8cbb 100644
--- a/pkgs/servers/bird/default.nix
+++ b/pkgs/servers/bird/default.nix
@@ -1,19 +1,20 @@
 { stdenv, fetchurl, flex, bison, readline }:
 
 stdenv.mkDerivation rec {
-  name = "bird-1.4.4";
+  name = "bird-1.4.5";
 
   src = fetchurl {
     url = "ftp://bird.network.cz/pub/bird/${name}.tar.gz";
-    sha256 = "0dh14zi3v1j0iwxxcyfymfdyaxxmilfbf3bc4mwj682jb3x6ll7g";
+    sha256 = "1z4z7zmx3054zxi4q6a7095s267mw8ky628gir2n5xy5ch65yj7z";
   };
 
   buildInputs = [ flex bison readline ];
 
   meta = {
-    description = "";
+    description = "BIRD Internet Routing Daemon";
     homepage = http://bird.network.cz;
     license = stdenv.lib.licenses.gpl2Plus;
     maintainers = with stdenv.lib.maintainers; [viric];
+    platforms  = stdenv.lib.platforms.linux;
   };
 }
diff --git a/pkgs/servers/brickd/default.nix b/pkgs/servers/brickd/default.nix
index e88f62a1337d..a99c8c5a6f95 100644
--- a/pkgs/servers/brickd/default.nix
+++ b/pkgs/servers/brickd/default.nix
@@ -52,7 +52,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     homepage = http://www.tinkerforge.com/;
-    description = "The Brick Daemon is a daemon (or service on Windows) that acts as a bridge between the Bricks/Bricklets and the API bindings for the different programming languages.";
+    description = "A daemon (or service on Windows) that acts as a bridge between the Bricks/Bricklets and the API bindings for the different programming languages";
     maintainers = [ stdenv.lib.maintainers.qknight ];
     license = stdenv.lib.licenses.gpl2;
     platforms = stdenv.lib.platforms.all;
diff --git a/pkgs/servers/corosync/default.nix b/pkgs/servers/corosync/default.nix
index cd87e0530554..f4ceca5f386d 100644
--- a/pkgs/servers/corosync/default.nix
+++ b/pkgs/servers/corosync/default.nix
@@ -42,7 +42,7 @@ stdenv.mkDerivation rec {
 
   meta = {
     homepage = http://corosync.org/;
-    description = "a Group Communication System with features for implementing high availability within applications.";
+    description = "A Group Communication System with features for implementing high availability within applications";
     license = licenses.bsd3;
     platforms = platforms.unix;
     maintainers = with maintainers; [ wkennington ];
diff --git a/pkgs/servers/http/apache-httpd/2.2.nix b/pkgs/servers/http/apache-httpd/2.2.nix
index eb9c6846089c..2af7b761c24a 100644
--- a/pkgs/servers/http/apache-httpd/2.2.nix
+++ b/pkgs/servers/http/apache-httpd/2.2.nix
@@ -40,6 +40,10 @@ stdenv.mkDerivation rec {
     ${if sslSupport then "--enable-ssl --with-ssl=${openssl}" else ""}
     ${if ldapSupport then "--enable-ldap --enable-authnz-ldap" else ""}
     --with-mpm=${mpm}
+    --enable-cache
+    --enable-disk-cache
+    --enable-file-cache
+    --enable-mem-cache
   '';
 
   enableParallelBuilding = true;
diff --git a/pkgs/servers/http/winstone/default.nix b/pkgs/servers/http/winstone/default.nix
index 8991a220a76d..6a92c0a228af 100644
--- a/pkgs/servers/http/winstone/default.nix
+++ b/pkgs/servers/http/winstone/default.nix
@@ -17,8 +17,8 @@ stdenv.mkDerivation rec {
   '';
 
   meta = {
-    homepage = "http://winstone.sourceforge.net/";
-    description = "A simple Java Servlet container.";
+    homepage = http://winstone.sourceforge.net/;
+    description = "A simple Java Servlet container";
     license = stdenv.lib.licenses.cddl;
     platforms = stdenv.lib.platforms.all;
     maintainers = [ stdenv.lib.maintainers.rickynils ];
diff --git a/pkgs/servers/mail/opensmtpd/default.nix b/pkgs/servers/mail/opensmtpd/default.nix
index 522d0b60f00c..7c442bf8c7ec 100644
--- a/pkgs/servers/mail/opensmtpd/default.nix
+++ b/pkgs/servers/mail/opensmtpd/default.nix
@@ -22,10 +22,10 @@ stdenv.mkDerivation rec {
   ];  
 
   meta = {
-    homepage = "http://www.postfix.org/";
+    homepage = http://www.postfix.org/;
     description = ''
       A free implementation of the server-side SMTP protocol as defined by
-      RFC 5321, with some additional standard extensions.
+      RFC 5321, with some additional standard extensions
     '';
     license = stdenv.lib.licenses.isc;
     platforms = stdenv.lib.platforms.linux;
diff --git a/pkgs/servers/monitoring/riemann/default.nix b/pkgs/servers/monitoring/riemann/default.nix
index 5278e5438133..95b433abbf5c 100644
--- a/pkgs/servers/monitoring/riemann/default.nix
+++ b/pkgs/servers/monitoring/riemann/default.nix
@@ -17,10 +17,8 @@ stdenv.mkDerivation rec {
   '';
 
   meta = with stdenv.lib; {
-    homepage = "http://riemann.io/";
-    description = ''
-      A network monitoring system.
-    '';
+    homepage = http://riemann.io/;
+    description = "A network monitoring system";
     license = licenses.epl10;
     platforms = platforms.all;
     maintainers = [ maintainers.rickynils ];
diff --git a/pkgs/servers/nosql/cassandra/default.nix b/pkgs/servers/nosql/cassandra/default.nix
index 1413888f3f1b..fd263cad5d5a 100644
--- a/pkgs/servers/nosql/cassandra/default.nix
+++ b/pkgs/servers/nosql/cassandra/default.nix
@@ -35,8 +35,8 @@ in stdenv.mkDerivation rec {
     '';
 
   meta = {
-    homepage = "http://cassandra.apache.org/";
-    description = "Apache Cassandra™ is a massively scalable open source NoSQL database.";
+    homepage = http://cassandra.apache.org/;
+    description = "A massively scalable open source NoSQL database";
     platforms = stdenv.lib.platforms.all;
     license = stdenv.lib.licenses.asl20;
   };
diff --git a/pkgs/servers/s6/default.nix b/pkgs/servers/s6/default.nix
index 045e31207ba0..039128e9df4c 100644
--- a/pkgs/servers/s6/default.nix
+++ b/pkgs/servers/s6/default.nix
@@ -49,7 +49,7 @@ in stdenv.mkDerivation rec {
 
   meta = {
     homepage = http://www.skarnet.org/software/s6/;
-    description = "skarnet.org's small & secure supervision software suite.";
+    description = "skarnet.org's small & secure supervision software suite";
     platforms = stdenv.lib.platforms.all;
     license = stdenv.lib.licenses.isc;
   };