Merge recent 'staging' into closure-size

Let's get rid of those merge conflicts.

pkgs/servers/http/couchdb/default.nix

@@ -41,10 +41,11 @@ stdenv.mkDerivation rec {
     --enable-js-trunk
   '';
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "A database that uses JSON for documents, JavaScript for MapReduce queries, and regular HTTP for an API";
     homepage = "http://couchdb.apache.org";
-    license = stdenv.lib.licenses.asl20;
-    maintainers = with stdenv.lib.maintainers; [ viric garbas ];
+    license = licenses.asl20;
+    platform = platforms.all;
+    maintainers = with maintainers; [ garbas ];
   };
 }

pkgs/servers/http/nginx/default.nix

@@ -6,10 +6,10 @@
 with stdenv.lib;
 
 let
-  version = "1.8.0";
+  version = "1.8.1";
   mainSrc = fetchurl {
     url = "http://nginx.org/download/nginx-${version}.tar.gz";
-    sha256 = "1mgkkmmwkhmpn68sdvbd73ssv6lpqhh864fsyvc1ij4hk4is3k13";
+    sha256 = "1dwpyw4pvhj68vxramqxm8f79pqz9lrm8mvifbn49h3615ikqjwg";
   };
 
 in

pkgs/servers/http/nginx/modules.nix

@@ -108,4 +108,13 @@
     };
     inputs = [ pkgs.pam ];
   };
+
+  statsd = {
+    src = fetchFromGitHub {
+      owner = "zebrafishlabs";
+      repo = "nginx-statsd";
+      rev = "b756a12abf110b9e36399ab7ede346d4bb86d691";
+      sha256 = "1psrb5v071idlplvbnaq904nlhqw1zrbw4aawfs278zcdmq67zn8";
+    };
+  };
 }

pkgs/servers/http/nginx/unstable.nix

@@ -7,10 +7,10 @@
 with stdenv.lib;
 
 let
-  version = "1.9.9";
+  version = "1.9.10";
   mainSrc = fetchurl {
     url = "http://nginx.org/download/nginx-${version}.tar.gz";
-    sha256 = "0wwd0q00pnkw4gjn3izjr63sndp7piyc5k5mbjm369f824mvnrny";
+    sha256 = "1n9icvi9hq7gak21ixlhcyazjx2yjqlbws07i2habc6a8ildf57v";
   };
 
 in