diff options
author | Vladimír Čunát <vcunat@gmail.com> | 2013-08-02 18:28:29 +0200 |
---|---|---|
committer | Vladimír Čunát <vcunat@gmail.com> | 2013-08-02 18:30:53 +0200 |
commit | 625f40151b0767cb421999cf988f4eb7bcf8b63d (patch) | |
tree | 629565f6f9efb26ad36b2a6d8e7e266290feb94b /pkgs/servers/http | |
parent | d239d24a89276cc7ee4bab1343c7e5bb40cbdfd4 (diff) | |
parent | 4fb87e91ffcbf6f6785e32b7e608198401a7155d (diff) | |
download | nixlib-625f40151b0767cb421999cf988f4eb7bcf8b63d.tar nixlib-625f40151b0767cb421999cf988f4eb7bcf8b63d.tar.gz nixlib-625f40151b0767cb421999cf988f4eb7bcf8b63d.tar.bz2 nixlib-625f40151b0767cb421999cf988f4eb7bcf8b63d.tar.lz nixlib-625f40151b0767cb421999cf988f4eb7bcf8b63d.tar.xz nixlib-625f40151b0767cb421999cf988f4eb7bcf8b63d.tar.zst nixlib-625f40151b0767cb421999cf988f4eb7bcf8b63d.zip |
Merge branch 'master' into x-updates
Conflicts (a little tricky, I did some cleanup of interacting changes): pkgs/development/compilers/llvm/default.nix pkgs/development/libraries/libpng/default.nix pkgs/tools/package-management/nixops/default.nix pkgs/top-level/all-packages.nix
Diffstat (limited to 'pkgs/servers/http')
-rw-r--r-- | pkgs/servers/http/apache-httpd/2.2.nix | 4 | ||||
-rw-r--r-- | pkgs/servers/http/apache-httpd/2.4.nix | 12 | ||||
-rw-r--r-- | pkgs/servers/http/nginx/default.nix | 5 | ||||
-rw-r--r-- | pkgs/servers/http/nginx/default.upstream | 8 | ||||
-rw-r--r-- | pkgs/servers/http/thttpd/default.nix | 27 |
5 files changed, 46 insertions, 10 deletions
diff --git a/pkgs/servers/http/apache-httpd/2.2.nix b/pkgs/servers/http/apache-httpd/2.2.nix index 23454d048b71..e9b1dba22e15 100644 --- a/pkgs/servers/http/apache-httpd/2.2.nix +++ b/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"; }; buildInputs = [perl apr aprutil pcre] ++ diff --git a/pkgs/servers/http/apache-httpd/2.4.nix b/pkgs/servers/http/apache-httpd/2.4.nix index da3532126579..bbf84a852b8f 100644 --- a/pkgs/servers/http/apache-httpd/2.4.nix +++ b/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 ]; }; } diff --git a/pkgs/servers/http/nginx/default.nix b/pkgs/servers/http/nginx/default.nix index 52a17ea399c3..083dbc482f0a 100644 --- a/pkgs/servers/http/nginx/default.nix +++ b/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"; }; } diff --git a/pkgs/servers/http/nginx/default.upstream b/pkgs/servers/http/nginx/default.upstream new file mode 100644 index 000000000000..f6a12eedda42 --- /dev/null +++ b/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 +} diff --git a/pkgs/servers/http/thttpd/default.nix b/pkgs/servers/http/thttpd/default.nix new file mode 100644 index 000000000000..e03183cbe49d --- /dev/null +++ b/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; + }; +} |