diff options
Diffstat (limited to 'nixpkgs/pkgs/servers/http')
| -rw-r--r-- | nixpkgs/pkgs/servers/http/apache-httpd/2.4.nix | 33 | ||||
| -rw-r--r-- | nixpkgs/pkgs/servers/http/apache-modules/mod_dnssd/default.nix | 10 | ||||
| -rw-r--r-- | nixpkgs/pkgs/servers/http/apache-modules/mod_fastcgi/default.nix | 1 | ||||
| -rw-r--r-- | nixpkgs/pkgs/servers/http/couchdb/3.nix | 12 | ||||
| -rw-r--r-- | nixpkgs/pkgs/servers/http/lighttpd/default.nix | 29 | ||||
| -rw-r--r-- | nixpkgs/pkgs/servers/http/lwan/default.nix | 4 | ||||
| -rw-r--r-- | nixpkgs/pkgs/servers/http/nginx/modules.nix | 16 | ||||
| -rw-r--r-- | nixpkgs/pkgs/servers/http/nginx/quic.nix | 4 | ||||
| -rw-r--r-- | nixpkgs/pkgs/servers/http/openresty/default.nix | 6 |
9 files changed, 65 insertions, 50 deletions
diff --git a/nixpkgs/pkgs/servers/http/apache-httpd/2.4.nix b/nixpkgs/pkgs/servers/http/apache-httpd/2.4.nix index 2ec30cbf0a75..3b8a4acbfc94 100644 --- a/nixpkgs/pkgs/servers/http/apache-httpd/2.4.nix +++ b/nixpkgs/pkgs/servers/http/apache-httpd/2.4.nix @@ -9,35 +9,28 @@ , luaSupport ? false, lua5 }: -let inherit (lib) optional; -in - -assert sslSupport -> aprutil.sslSupport && openssl != null; -assert ldapSupport -> aprutil.ldapSupport && openldap != null; -assert http2Support -> nghttp2 != null; - stdenv.mkDerivation rec { - version = "2.4.49"; pname = "apache-httpd"; + version = "2.4.51"; src = fetchurl { url = "mirror://apache/httpd/httpd-${version}.tar.bz2"; - sha256 = "0fqkfjcpdd40ji2279wfxh5hddb5jdxlnpjr0sbhva8fi7b6bfb5"; + sha256 = "20e01d81fecf077690a4439e3969a9b22a09a8d43c525356e863407741b838f4"; }; # FIXME: -dev depends on -doc outputs = [ "out" "dev" "man" "doc" ]; setOutputFlags = false; # it would move $out/modules, etc. - buildInputs = [perl] ++ - optional brotliSupport brotli ++ - optional sslSupport openssl ++ - optional ldapSupport openldap ++ # there is no --with-ldap flag - optional libxml2Support libxml2 ++ - optional http2Support nghttp2 ++ - optional stdenv.isDarwin libiconv; + buildInputs = [ perl ] ++ + lib.optional brotliSupport brotli ++ + lib.optional sslSupport openssl ++ + lib.optional ldapSupport openldap ++ # there is no --with-ldap flag + lib.optional libxml2Support libxml2 ++ + lib.optional http2Support nghttp2 ++ + lib.optional stdenv.isDarwin libiconv; - prePatch = '' + postPatch = '' sed -i config.layout -e "s|installbuilddir:.*|installbuilddir: $dev/share/build|" sed -i support/apachectl.in -e 's|@LYNX_PATH@|${lynx}/bin/lynx|' ''; @@ -93,9 +86,9 @@ stdenv.mkDerivation rec { meta = with lib; { description = "Apache HTTPD, the world's most popular web server"; - homepage = "http://httpd.apache.org/"; + homepage = "https://httpd.apache.org/"; license = licenses.asl20; - platforms = lib.platforms.linux ++ lib.platforms.darwin; - maintainers = with maintainers; [ lovek323 peti ]; + platforms = platforms.linux ++ platforms.darwin; + maintainers = with maintainers; [ lovek323 ]; }; } diff --git a/nixpkgs/pkgs/servers/http/apache-modules/mod_dnssd/default.nix b/nixpkgs/pkgs/servers/http/apache-modules/mod_dnssd/default.nix index a0a6235ace50..4f4236e91b58 100644 --- a/nixpkgs/pkgs/servers/http/apache-modules/mod_dnssd/default.nix +++ b/nixpkgs/pkgs/servers/http/apache-modules/mod_dnssd/default.nix @@ -20,8 +20,18 @@ stdenv.mkDerivation rec { }) ]; installPhase = '' + runHook preInstall + mkdir -p $out/modules cp src/.libs/mod_dnssd.so $out/modules + + runHook postInstall + ''; + + preFixup = '' + # TODO: Packages in non-standard directories not stripped. + # https://github.com/NixOS/nixpkgs/issues/141554 + stripDebugList=modules ''; meta = with lib; { diff --git a/nixpkgs/pkgs/servers/http/apache-modules/mod_fastcgi/default.nix b/nixpkgs/pkgs/servers/http/apache-modules/mod_fastcgi/default.nix index 39f21b189378..86c9ad6c00dc 100644 --- a/nixpkgs/pkgs/servers/http/apache-modules/mod_fastcgi/default.nix +++ b/nixpkgs/pkgs/servers/http/apache-modules/mod_fastcgi/default.nix @@ -43,7 +43,6 @@ stdenv.mkDerivation rec { ''; platforms = lib.platforms.linux; - maintainers = [ lib.maintainers.peti ]; broken = true; # patch 'compile-against-apache24.diff' no longer works }; } diff --git a/nixpkgs/pkgs/servers/http/couchdb/3.nix b/nixpkgs/pkgs/servers/http/couchdb/3.nix index 94b94081d430..50d4012297fc 100644 --- a/nixpkgs/pkgs/servers/http/couchdb/3.nix +++ b/nixpkgs/pkgs/servers/http/couchdb/3.nix @@ -1,26 +1,26 @@ -{ lib, stdenv, fetchurl, erlang, icu, openssl, spidermonkey_68 +{ lib, stdenv, fetchurl, erlang, icu, openssl, spidermonkey_78 , coreutils, bash, makeWrapper, python3 }: stdenv.mkDerivation rec { pname = "couchdb"; - version = "3.1.1"; + version = "3.2.0"; # when updating this, please consider bumping the erlang/OTP version # in all-packages.nix src = fetchurl { url = "mirror://apache/couchdb/source/${version}/apache-${pname}-${version}.tar.gz"; - sha256 = "18wcqxrv2bz88xadkqpqznprrxmcmwr0g6k895xrm8rbp9mpdzlg"; + sha256 = "035hy76399yy32rxl536gv7nh8ijihqxhhh5cxn95c3bm97mgslb"; }; - buildInputs = [ erlang icu openssl spidermonkey_68 (python3.withPackages(ps: with ps; [ requests ]))]; + buildInputs = [ erlang icu openssl spidermonkey_78 (python3.withPackages(ps: with ps; [ requests ]))]; postPatch = '' - substituteInPlace src/couch/rebar.config.script --replace '/usr/include/mozjs-68' "${spidermonkey_68.dev}/include/mozjs-68" + substituteInPlace src/couch/rebar.config.script --replace '/usr/include/mozjs-78' "${spidermonkey_78.dev}/include/mozjs-78" patchShebangs bin/rebar ''; dontAddPrefix= "True"; - configureFlags = ["--spidermonkey-version=68"]; + configureFlags = ["--spidermonkey-version=78"]; buildFlags = ["release"]; installPhase = '' diff --git a/nixpkgs/pkgs/servers/http/lighttpd/default.nix b/nixpkgs/pkgs/servers/http/lighttpd/default.nix index 98e378b2eeda..4f98e3c7dab3 100644 --- a/nixpkgs/pkgs/servers/http/lighttpd/default.nix +++ b/nixpkgs/pkgs/servers/http/lighttpd/default.nix @@ -1,19 +1,16 @@ { lib, stdenv, buildPackages, fetchurl, pkg-config, pcre, libxml2, zlib, bzip2, which, file -, openssl, enableMagnet ? false, lua5_1 ? null -, enableMysql ? false, libmysqlclient ? null -, enableLdap ? false, openldap ? null -, enableWebDAV ? false, sqlite ? null, libuuid ? null -, enableExtendedAttrs ? false, attr ? null +, openssl +, enableDbi ? false, libdbi +, enableMagnet ? false, lua5_1 +, enableMysql ? false, libmysqlclient +, enableLdap ? false, openldap +, enablePam ? false, linux-pam +, enableSasl ? false, cyrus_sasl +, enableWebDAV ? false, sqlite, libuuid +, enableExtendedAttrs ? false, attr , perl }: -assert enableMagnet -> lua5_1 != null; -assert enableMysql -> libmysqlclient != null; -assert enableLdap -> openldap != null; -assert enableWebDAV -> sqlite != null; -assert enableWebDAV -> libuuid != null; -assert enableExtendedAttrs -> attr != null; - stdenv.mkDerivation rec { pname = "lighttpd"; version = "1.4.59"; @@ -33,16 +30,22 @@ stdenv.mkDerivation rec { nativeBuildInputs = [ pkg-config ]; buildInputs = [ pcre pcre.dev libxml2 zlib bzip2 which file openssl ] + ++ lib.optional enableDbi libdbi ++ lib.optional enableMagnet lua5_1 ++ lib.optional enableMysql libmysqlclient ++ lib.optional enableLdap openldap + ++ lib.optional enablePam linux-pam + ++ lib.optional enableSasl cyrus_sasl ++ lib.optional enableWebDAV sqlite ++ lib.optional enableWebDAV libuuid; configureFlags = [ "--with-openssl" ] + ++ lib.optional enableDbi "--with-dbi" ++ lib.optional enableMagnet "--with-lua" ++ lib.optional enableMysql "--with-mysql" ++ lib.optional enableLdap "--with-ldap" + ++ lib.optional enablePam "--with-pam" + ++ lib.optional enableSasl "--with-sasl" ++ lib.optional enableWebDAV "--with-webdav-props" ++ lib.optional enableWebDAV "--with-webdav-locks" ++ lib.optional enableExtendedAttrs "--with-attr"; @@ -69,6 +72,6 @@ stdenv.mkDerivation rec { homepage = "http://www.lighttpd.net/"; license = lib.licenses.bsd3; platforms = platforms.linux ++ platforms.darwin; - maintainers = [ maintainers.bjornfor ]; + maintainers = with maintainers; [ bjornfor brecht ]; }; } diff --git a/nixpkgs/pkgs/servers/http/lwan/default.nix b/nixpkgs/pkgs/servers/http/lwan/default.nix index 11b580ed8a0c..3e90857d8db8 100644 --- a/nixpkgs/pkgs/servers/http/lwan/default.nix +++ b/nixpkgs/pkgs/servers/http/lwan/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "lwan"; - version = "0.3"; + version = "0.4"; src = fetchFromGitHub { owner = "lpereira"; repo = pname; rev = "v${version}"; - sha256 = "1znkcsbxw3r10prqvf2x27w1wmm9kd485pj59c364wlvqdhidwqr"; + sha256 = "sha256-Z8kiuZHLEupCKFrj8guiu9fTG7s+5KiQ6x0pg9iMy0c="; }; nativeBuildInputs = [ cmake pkg-config ]; diff --git a/nixpkgs/pkgs/servers/http/nginx/modules.nix b/nixpkgs/pkgs/servers/http/nginx/modules.nix index 568f6d8b9e50..2919438d1e4b 100644 --- a/nixpkgs/pkgs/servers/http/nginx/modules.nix +++ b/nixpkgs/pkgs/servers/http/nginx/modules.nix @@ -452,6 +452,16 @@ in }; }; + upload = { + src = fetchFromGitHub { + name = "upload"; + owner = "fdintino"; + repo = "nginx-upload-module"; + rev = "2.3.0"; + sha256 = "8veZP516oC7TESO368ZsZreetbDt+1eTcamk7P1kWjU="; + }; + }; + upstream-check = { src = fetchFromGitHub { name = "upstream-check"; @@ -499,10 +509,10 @@ in name = "vod"; owner = "kaltura"; repo = "nginx-vod-module"; - rev = "e46079f51282d5a378e6911714b5f3a533bb7700"; - sha256 = "0pzzq4xcq7jg8mxwnz7srj1nczg9ajd1b8q58qlm03lny8nd2hr5"; + rev = "1.29"; + sha256 = "1z0ka0cwqbgh3fv2d5yva395sf90626rdzx7lyfrgs89gy4h9nrr"; }; - inputs = [ pkgs.ffmpeg_3 pkgs.fdk_aac pkgs.openssl pkgs.libxml2 pkgs.libiconv ]; + inputs = with pkgs; [ ffmpeg fdk_aac openssl libxml2 libiconv ]; }; vts = { diff --git a/nixpkgs/pkgs/servers/http/nginx/quic.nix b/nixpkgs/pkgs/servers/http/nginx/quic.nix index 8bb383d59964..a6efda3bed7a 100644 --- a/nixpkgs/pkgs/servers/http/nginx/quic.nix +++ b/nixpkgs/pkgs/servers/http/nginx/quic.nix @@ -6,8 +6,8 @@ callPackage ./generic.nix args { src = fetchhg { url = "https://hg.nginx.org/nginx-quic"; - rev = "5b0c229ba5fe"; # branch=quic - sha256 = "1bb6n6b4nkc1cfllj75lwr4gjijl8883bkcvq8ncg7r4s5xs7r90"; + rev = "404de224517e"; # branch=quic + sha256 = "00x8djp3hqnq60jzpddfrj0v23j2fbl27jyw609ha3wqkkbxrip9"; }; preConfigure = '' diff --git a/nixpkgs/pkgs/servers/http/openresty/default.nix b/nixpkgs/pkgs/servers/http/openresty/default.nix index 71490b342805..3c30b2c3ed0a 100644 --- a/nixpkgs/pkgs/servers/http/openresty/default.nix +++ b/nixpkgs/pkgs/servers/http/openresty/default.nix @@ -8,12 +8,12 @@ callPackage ../nginx/generic.nix args rec { pname = "openresty"; - nginxVersion = "1.19.3"; - version = "${nginxVersion}.2"; + nginxVersion = "1.19.9"; + version = "${nginxVersion}.1"; src = fetchurl { url = "https://openresty.org/download/openresty-${version}.tar.gz"; - sha256 = "1fav3qykckqcyw9ksi8s61prpwab44zbcvj95rwfpfqgk5jffh6f"; + sha256 = "1xn1d0x2y63z0mi0qq3js6lz6ziba92r7vyyfkj1qc738vjz8vsp"; }; # generic.nix applies fixPatch on top of every patch defined there. This |