Merge remote-tracking branch 'origin/master' into hardened-stdenv

9 files changed, 55 insertions, 132 deletions

diff --git a/pkgs/servers/http/4store/default.nix b/pkgs/servers/http/4store/default.nix
index 4854f9e18dda..18cfe488f83f 100644
--- a/pkgs/servers/http/4store/default.nix
+++ b/pkgs/servers/http/4store/default.nix
@@ -1,48 +1,44 @@
-x@{builderDefsPackage
-  , librdf_raptor, librdf_rasqal,
-  glib, libxml2, pcre, avahi,
-  readline, ncurses, expat,
-  zlib, pkgconfig, which,
-  perl, libuuid, gmp, mpfr
-  , db_dir ? "/var/lib/4store"
-  , ...}:
-builderDefsPackage
-(a :  
-let 
-  s = import ./src-for-default.nix;
-  helperArgNames = ["stdenv" "fetchurl" "builderDefsPackage"] ++ 
-    ["db_dir"];
-  buildInputs = map (n: builtins.getAttr n x)
-    (builtins.attrNames (builtins.removeAttrs x helperArgNames));
-in
-rec {
-  src = a.fetchUrlFromSrcInfo s;
+{ stdenv, fetchFromGitHub, librdf_raptor
+, librdf_rasqal, glib, libxml2, pcre
+, avahi, readline, ncurses, expat, autoreconfHook
+, zlib, pkgconfig, which, perl, libuuid
+, gmp, mpfr
+, db_dir ? "/var/lib/4store" }:
 
-  inherit (s) name;
-  inherit buildInputs;
 
-  /* doConfigure should be removed if not needed */
-  phaseNames = ["doFixConfigure" "doConfigure" "doMakeInstall"
-    "fixInterpreter"];
+stdenv.mkDerivation rec {
+  name = "4store-${version}";
+  version = "1.1.6";
 
-  doFixConfigure = a.fullDepEntry ''
-    sed -e 's@#! */bin/bash@#! ${a.stdenv.shell}@' -i configure
+  src = fetchFromGitHub {
+    owner = "garlik";
+    repo = "4store";
+    rev = "v${version}";
+    sha256 = "1kzdfmwpzy64cgqlkcz5v4klwx99w0jk7afckyf7yqbqb4rydmpk";
+  };
+
+  buildInputs = [ librdf_raptor librdf_rasqal glib libxml2 pcre
+    avahi readline ncurses expat zlib pkgconfig which perl libuuid
+    gmp mpfr autoreconfHook ];
+
+  # needed for ./autogen.sh
+  prePatch = ''
+    echo "${version}" > .version
+  '';
+
+  preConfigure =  ''
+    sed -e 's@#! */bin/bash@#! ${stdenv.shell}@' -i configure
     find . -name Makefile -exec sed -e "s@/usr/local@$out@g" -i '{}' ';'
     
-    sed -e 's@/var/lib/4store@${db_dir}@g' -i src/common/params.h src/utilities/*
+    rm src/utilities/4s-backend 
+    sed -e 's@/var/lib/4store@${db_dir}@g' -i configure.ac src/utilities/*
     sed -e '/FS_STORE_ROOT/d' -i src/utilities/Makefile*
-  '' ["minInit" "doUnpack"];
+  '';
 
-  fixInterpreter = (a.doPatchShebangs "$out/bin");
-      
-  meta = {
+  meta = with stdenv.lib; {
     description = "SparQL query server (RDF storage)";
     homepage = http://4store.org/;
-    maintainers = with a.lib.maintainers;
-    [
-      raskin
-    ];
-    platforms = with a.lib.platforms;
-      linux;
+    maintainers = with maintainers; [ raskin ];
+    platforms = platforms.linux;
   };
-}) x
+}
diff --git a/pkgs/servers/http/apache-httpd/2.2.nix b/pkgs/servers/http/apache-httpd/2.2.nix
index bb4fa9782d6a..361aa3d58f75 100644
--- a/pkgs/servers/http/apache-httpd/2.2.nix
+++ b/pkgs/servers/http/apache-httpd/2.2.nix
@@ -75,6 +75,6 @@ stdenv.mkDerivation rec {
     homepage    = http://httpd.apache.org/;
     license     = stdenv.lib.licenses.asl20;
     platforms   = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin;
-    maintainers = with stdenv.lib.maintainers; [ eelco simons lovek323 ];
+    maintainers = with stdenv.lib.maintainers; [ eelco lovek323 ];
   };
 }
diff --git a/pkgs/servers/http/apache-httpd/2.4.nix b/pkgs/servers/http/apache-httpd/2.4.nix
index f69001da08ac..bc7fd1441c13 100644
--- a/pkgs/servers/http/apache-httpd/2.4.nix
+++ b/pkgs/servers/http/apache-httpd/2.4.nix
@@ -83,6 +83,6 @@ stdenv.mkDerivation rec {
     homepage    = http://httpd.apache.org/;
     license     = licenses.asl20;
     platforms   = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin;
-    maintainers = with maintainers; [ lovek323 simons ];
+    maintainers = with maintainers; [ lovek323 peti ];
   };
 }
diff --git a/pkgs/servers/http/apache-modules/mod_fastcgi/default.nix b/pkgs/servers/http/apache-modules/mod_fastcgi/default.nix
index 178900570d07..40bd37ce40bf 100644
--- a/pkgs/servers/http/apache-modules/mod_fastcgi/default.nix
+++ b/pkgs/servers/http/apache-modules/mod_fastcgi/default.nix
@@ -39,6 +39,6 @@ stdenv.mkDerivation rec {
     '';
 
     platforms = stdenv.lib.platforms.linux;
-    maintainers = [ stdenv.lib.maintainers.simons ];
+    maintainers = [ stdenv.lib.maintainers.peti ];
   };
 }
diff --git a/pkgs/servers/http/apache-modules/mod_wsgi/default.nix b/pkgs/servers/http/apache-modules/mod_wsgi/default.nix
index 7aded47dad18..4cccf237b9e2 100644
--- a/pkgs/servers/http/apache-modules/mod_wsgi/default.nix
+++ b/pkgs/servers/http/apache-modules/mod_wsgi/default.nix
@@ -21,8 +21,6 @@ stdenv.mkDerivation rec {
     homepage = http://code.google.com/p/modwsgi/;
     description = "Host Python applications in Apache through the WSGI interface";
     license = stdenv.lib.licenses.asl20;
-
     platforms = stdenv.lib.platforms.linux;
-    maintainers = [ stdenv.lib.maintainers.simons ];
   };
 }
diff --git a/pkgs/servers/http/lighttpd/default.nix b/pkgs/servers/http/lighttpd/default.nix
index 60848516155d..af029cc4db2d 100644
--- a/pkgs/servers/http/lighttpd/default.nix
+++ b/pkgs/servers/http/lighttpd/default.nix
@@ -7,11 +7,11 @@ assert enableMagnet -> lua5_1 != null;
 assert enableMysql -> mysql != null;
 
 stdenv.mkDerivation rec {
-  name = "lighttpd-1.4.37";
+  name = "lighttpd-1.4.39";
 
   src = fetchurl {
     url = "http://download.lighttpd.net/lighttpd/releases-1.4.x/${name}.tar.xz";
-    sha256 = "1gbri5avg1jv2g585wk0jp53mf9jjdz2py9774mxm8bwarh6ykl0";
+    sha256 = "0nrnhxl1ypzgsms0ky6zdf6ib94vf8x77c422s2xav9x7j2s3fby";
   };
 
   buildInputs = [ pkgconfig pcre libxml2 zlib attr bzip2 which file openssl ]
diff --git a/pkgs/servers/http/mini-httpd/default.nix b/pkgs/servers/http/mini-httpd/default.nix
index 7fb6a16dd1c3..f35497fef8e4 100644
--- a/pkgs/servers/http/mini-httpd/default.nix
+++ b/pkgs/servers/http/mini-httpd/default.nix
@@ -17,6 +17,6 @@ stdenv.mkDerivation rec {
     description = "a minimalistic high-performance web server";
     license = stdenv.lib.licenses.gpl3;
     platforms = stdenv.lib.platforms.unix;
-    maintainers = [ stdenv.lib.maintainers.simons ];
+    maintainers = [ stdenv.lib.maintainers.peti ];
   };
 }
diff --git a/pkgs/servers/http/nginx/default.nix b/pkgs/servers/http/nginx/default.nix
index ed13ae0bea7f..38436f87bfb8 100644
--- a/pkgs/servers/http/nginx/default.nix
+++ b/pkgs/servers/http/nginx/default.nix
@@ -1,34 +1,29 @@
 { stdenv, fetchurl, fetchFromGitHub, openssl, zlib, pcre, libxml2, libxslt, expat
 , gd, geoip
+, withStream ? false
 , modules ? []
 , hardening ? true
 }:
 
 with stdenv.lib;
 
-let
-  version = "1.8.1";
-  mainSrc = fetchurl {
+stdenv.mkDerivation rec {
+  name = "nginx-${version}";
+  version = "1.10.0";
+
+  src = fetchurl {
     url = "http://nginx.org/download/nginx-${version}.tar.gz";
-    sha256 = "1dwpyw4pvhj68vxramqxm8f79pqz9lrm8mvifbn49h3615ikqjwg";
+    sha256 = "0kdyqa5xaxvhz6y75ixs05mzygk3kszzdq5h0gnlrg35vp1lgmlf";
   };
 
-in
-
-stdenv.mkDerivation rec {
-  name = "nginx-${version}";
-  src = mainSrc;
 
   buildInputs =
     [ openssl zlib pcre libxml2 libxslt gd geoip ]
     ++ concatMap (mod: mod.inputs or []) modules;
 
   configureFlags = [
-    "--with-select_module"
-    "--with-poll_module"
-    "--with-threads"
     "--with-http_ssl_module"
-    "--with-http_spdy_module"
+    "--with-http_v2_module"
     "--with-http_realip_module"
     "--with-http_addition_module"
     "--with-http_xslt_module"
@@ -48,16 +43,20 @@ stdenv.mkDerivation rec {
     "--with-ipv6"
     # Install destination problems
     # "--with-http_perl_module"
-  ] ++ optionals (elem stdenv.system (with platforms; linux ++ freebsd))
-        [ "--with-file-aio" "--with-aio_module" ]
+  ] ++ optional withStream "--with-stream"
+    ++ optional (elem stdenv.system (with platforms; linux ++ freebsd)) "--with-file-aio"
     ++ map (mod: "--add-module=${mod.src}") modules;
 
-  NIX_CFLAGS_COMPILE = [ "-I${libxml2.dev}/include/libxml2" ] ++ optional stdenv.isDarwin "-Wno-error=deprecated-declarations -Wno-error=conditional-uninitialized";
+  NIX_CFLAGS_COMPILE = [ "-I${libxml2.dev}/include/libxml2" ] ++ optional stdenv.isDarwin "-Wno-error=deprecated-declarations";
 
   preConfigure = (concatMapStringsSep "\n" (mod: mod.preConfigure or "") modules);
 
   hardeningEnable = [ "pie" ];
 
+  postInstall = ''
+    mv $out/sbin $out/bin
+  '';
+
   meta = {
     description = "A reverse proxy and lightweight webserver";
     homepage    = http://nginx.org;
diff --git a/pkgs/servers/http/nginx/unstable.nix b/pkgs/servers/http/nginx/unstable.nix
deleted file mode 100644
index 05cc58e41487..000000000000
--- a/pkgs/servers/http/nginx/unstable.nix
+++ /dev/null
@@ -1,70 +0,0 @@
-{ stdenv, fetchurl, fetchFromGitHub, openssl, zlib, pcre, libxml2, libxslt, expat
-, gd, geoip
-, withStream ? false
-, modules ? []
-, hardening ? true
-}:
-
-with stdenv.lib;
-
-let
-  version = "1.9.14";
-  mainSrc = fetchurl {
-    url = "http://nginx.org/download/nginx-${version}.tar.gz";
-    sha256 = "1ljpyigqb6sbm4f8mi4fyvwfcvfapzg4z35s9cwb9ri8dl3r6j1b";
-  };
-
-in
-
-stdenv.mkDerivation rec {
-  name = "nginx-${version}";
-  src = mainSrc;
-
-  buildInputs =
-    [ openssl zlib pcre libxml2 libxslt gd geoip ]
-    ++ concatMap (mod: mod.inputs or []) modules;
-
-  configureFlags = [
-    "--with-http_ssl_module"
-    "--with-http_v2_module"
-    "--with-http_realip_module"
-    "--with-http_addition_module"
-    "--with-http_xslt_module"
-    "--with-http_image_filter_module"
-    "--with-http_geoip_module"
-    "--with-http_sub_module"
-    "--with-http_dav_module"
-    "--with-http_flv_module"
-    "--with-http_mp4_module"
-    "--with-http_gunzip_module"
-    "--with-http_gzip_static_module"
-    "--with-http_auth_request_module"
-    "--with-http_random_index_module"
-    "--with-http_secure_link_module"
-    "--with-http_degradation_module"
-    "--with-http_stub_status_module"
-    "--with-ipv6"
-    # Install destination problems
-    # "--with-http_perl_module"
-  ] ++ optional withStream "--with-stream"
-    ++ optional (elem stdenv.system (with platforms; linux ++ freebsd)) "--with-file-aio"
-    ++ map (mod: "--add-module=${mod.src}") modules;
-
-  NIX_CFLAGS_COMPILE = [ "-I${libxml2.dev}/include/libxml2" ] ++ optional stdenv.isDarwin "-Wno-error=deprecated-declarations";
-
-  preConfigure = (concatMapStringsSep "\n" (mod: mod.preConfigure or "") modules);
-
-  hardeningEnable = [ "pie" ];
-
-  postInstall = ''
-    mv $out/sbin $out/bin
-  '';
-
-  meta = {
-    description = "A reverse proxy and lightweight webserver";
-    homepage    = http://nginx.org;
-    license     = licenses.bsd2;
-    platforms   = platforms.all;
-    maintainers = with maintainers; [ thoughtpolice raskin ];
-  };
-}