Merge remote-tracking branch 'origin/master' into multiple-outputs

Conflicts:
	pkgs/development/libraries/gtk+/2.x.nix
	pkgs/development/libraries/libsamplerate/default.nix
	pkgs/development/libraries/libsndfile/default.nix
	pkgs/misc/cups/default.nix
	pkgs/top-level/all-packages.nix

pkgs/servers/http/apache-httpd/2.2.nix

@@ -12,12 +12,12 @@ assert ldapSupport -> aprutil.ldapSupport && openldap != null;
 assert mpm == "prefork" || mpm == "worker" || mpm == "event";
 
 stdenv.mkDerivation rec {
-  version = "2.2.24";
+  version = "2.2.25";
   name = "apache-httpd-${version}";
 
   src = fetchurl {
     url = "mirror://apache/httpd/httpd-${version}.tar.bz2";
-    sha1 = "f73bce14832ec40c1aae68f4f8c367cab2266241";
+    sha1 = "e34222d1a8de38825397a1c70949bcc5836a1236";
   };
 
   outputs = [ "dev" "out" "doc" ];

pkgs/servers/http/apache-httpd/2.4.nix

@@ -27,7 +27,7 @@ stdenv.mkDerivation rec {
     optional libxml2Support libxml2;
 
   # Required for ‘pthread_cancel’.
-  NIX_LDFLAGS = "-lgcc_s";
+  NIX_LDFLAGS = stdenv.lib.optionalString (!stdenv.isDarwin) "-lgcc_s";
 
   configureFlags = ''
     --with-apr=${apr}
@@ -58,11 +58,11 @@ stdenv.mkDerivation rec {
     inherit apr aprutil sslSupport proxySupport ldapSupport;
   };
 
-  meta = {
+  meta = with stdenv.lib; {
     description = "Apache HTTPD, the world's most popular web server";
-    homepage = "http://httpd.apache.org/";
-    license = stdenv.lib.licenses.asl20;
-    platforms = stdenv.lib.platforms.unix;
-    maintainers = [ stdenv.lib.maintainers.simons ];
+    homepage    = http://httpd.apache.org/;
+    license     = licenses.asl20;
+    platforms   = stdenv.lib.platforms.unix;
+    maintainers = with maintainers; [ lovek323 simons ];
   };
 }

pkgs/servers/http/myserver/default.nix

@@ -37,7 +37,7 @@ let version = "0.11"; in
 
       license = "GPLv3+";
 
-      maintainers = [ stdenv.lib.maintainers.ludo ];
+      maintainers = [ ];
 
       # libevent fails to build on Cygwin and Guile has troubles on Darwin.
       platforms = stdenv.lib.platforms.gnu;

pkgs/servers/http/nginx/default.nix

@@ -9,11 +9,11 @@ let
 in
 
 stdenv.mkDerivation rec {
-  name = "nginx-1.2.8";
+  name = "nginx-${meta.version}";
 
   src = fetchurl {
     url = "http://nginx.org/download/${name}.tar.gz";
-    sha256 = "0dvi8n3ljh3zz80r5zkb5q7f94mg62kkakn0wsqi3lxyqnc7r56j";
+    sha256 = "06ficmjiya3m8mdlyq3bgqx604h475n77qc5c502kfjijzld39dw";
   };
 
   buildInputs = [ openssl zlib pcre libxml2 libxslt ] ++ stdenv.lib.optional fullWebDAV expat;
@@ -41,5 +41,6 @@ stdenv.mkDerivation rec {
     description = "A reverse proxy and lightweight webserver";
     maintainers = [ stdenv.lib.maintainers.raskin];
     platforms = stdenv.lib.platforms.all;
+    version = "1.4.1";
   };
 }

pkgs/servers/http/nginx/default.upstream

@@ -0,0 +1,8 @@
+url http://nginx.org/en/download.html
+version_link '.*-([0-9]+[.][0-9]*[02468]([.][0-9]+)*)[.]tar[.][a-z0-9]*$' 
+
+do_overwrite() {
+  ensure_hash
+  set_var_value version "$CURRENT_VERSION"
+  set_var_value sha256 "$CURRENT_HASH" 2
+}

pkgs/servers/http/thttpd/default.nix

@@ -0,0 +1,27 @@
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation rec {
+  name = "thttpd-${version}";
+  version = "2.25b";
+
+  src = fetchurl {
+    url = "http://acme.com/software/thttpd/${name}.tar.gz";
+    sha256 = "0q13sfkh6amn5wk0ccbmxq3mnhlm8g5pnyk910fa5xngn449nw87";
+  };
+
+  prePatch = ''
+    sed -i -e 's/getline/getlineX/' extras/htpasswd.c
+  '';
+
+  preInstall = ''
+    ensureDir "$out/man/man1"
+    sed -i -e 's/-o bin -g bin *//' Makefile
+    sed -i -e '/chgrp/d' extras/Makefile
+  '';
+
+  meta = {
+    description = "Tiny/turbo/throttling HTTP server";
+    homepage = "http://www.acme.com/software/thttpd/";
+    license = stdenv.lib.licenses.bsd2;
+  };
+}