diff options
Diffstat (limited to 'infra/libkookie/nixpkgs/pkgs/servers/http')
8 files changed, 28 insertions, 23 deletions
diff --git a/infra/libkookie/nixpkgs/pkgs/servers/http/couchdb/3.nix b/infra/libkookie/nixpkgs/pkgs/servers/http/couchdb/3.nix index 18271e82a8f9..bb856d7aa07d 100644 --- a/infra/libkookie/nixpkgs/pkgs/servers/http/couchdb/3.nix +++ b/infra/libkookie/nixpkgs/pkgs/servers/http/couchdb/3.nix @@ -3,14 +3,14 @@ stdenv.mkDerivation rec { pname = "couchdb"; - version = "3.1.0"; + version = "3.1.1"; # 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 = "1vgqj3zsrkdqgnwzji3mqkapnfd6kq466f5xnya0fvzzl6bcfrs8"; + sha256 = "18wcqxrv2bz88xadkqpqznprrxmcmwr0g6k895xrm8rbp9mpdzlg"; }; buildInputs = [ erlang icu openssl spidermonkey_68 (python3.withPackages(ps: with ps; [ requests ]))]; diff --git a/infra/libkookie/nixpkgs/pkgs/servers/http/gitlab-pages/default.nix b/infra/libkookie/nixpkgs/pkgs/servers/http/gitlab-pages/default.nix index 441dba9fb7b5..0174f8af43f5 100644 --- a/infra/libkookie/nixpkgs/pkgs/servers/http/gitlab-pages/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/servers/http/gitlab-pages/default.nix @@ -2,16 +2,16 @@ buildGoModule rec { pname = "gitlab-pages"; - version = "1.21.0"; + version = "1.30.0"; src = fetchFromGitLab { owner = "gitlab-org"; repo = "gitlab-pages"; rev = "v${version}"; - sha256 = "0f317lx4iarlsbnq2ipcm4lpx66xzl8wfilj8xajq1csz19ws24z"; + sha256 = "0gn5lwn1lk1ghv6lw0fvax0m829w09mmq8flbmcxvszfyv7x0rix"; }; - vendorSha256 = "186rxvl523n1d87jz4zzbj83ikzw9d0c1wrj78xs4iqzm8z3snh0"; + vendorSha256 = "08zma4b58b9132h41m6frbdi502yima9lkpab87fi0q5r6qwhf1z"; subPackages = [ "." ]; doCheck = false; # Broken diff --git a/infra/libkookie/nixpkgs/pkgs/servers/http/jetty/default.nix b/infra/libkookie/nixpkgs/pkgs/servers/http/jetty/default.nix index 20370fd37c70..72e6c00278a4 100644 --- a/infra/libkookie/nixpkgs/pkgs/servers/http/jetty/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/servers/http/jetty/default.nix @@ -2,11 +2,11 @@ stdenv.mkDerivation rec { pname = "jetty"; - version = "9.4.31.v20200723"; + version = "9.4.35.v20201120"; src = fetchurl { url = "https://repo1.maven.org/maven2/org/eclipse/jetty/jetty-distribution/${version}/jetty-distribution-${version}.tar.gz"; name = "jetty-distribution-${version}.tar.gz"; - sha256 = "1j1dhlrlj7xnijp55c1hd9r47m6bq37vpjkaf8f9fg7q9m2z9x6x"; + sha256 = "1cpdrqz6wi7fd228lh4ijs82jq51qr5aym6vff464w3y2sd0jbav"; }; phases = [ "unpackPhase" "installPhase" ]; diff --git a/infra/libkookie/nixpkgs/pkgs/servers/http/lighttpd/default.nix b/infra/libkookie/nixpkgs/pkgs/servers/http/lighttpd/default.nix index 01a07a9f5029..d90357044f54 100644 --- a/infra/libkookie/nixpkgs/pkgs/servers/http/lighttpd/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/servers/http/lighttpd/default.nix @@ -15,11 +15,11 @@ assert enableWebDAV -> libuuid != null; assert enableExtendedAttrs -> attr != null; stdenv.mkDerivation rec { - name = "lighttpd-1.4.55"; + name = "lighttpd-1.4.56"; src = fetchurl { url = "https://download.lighttpd.net/lighttpd/releases-1.4.x/${name}.tar.xz"; - sha256 = "09z947730yjh438wrqb3z1c5hr1dbb11a8sr92g3vk6mr7lm02va"; + sha256 = "0xyzahrkmldwskwgjgj4dc3rmfmgqiwwr9y7jfhqpbp8g76q9kp4"; }; postPatch = '' diff --git a/infra/libkookie/nixpkgs/pkgs/servers/http/nginx/mainline.nix b/infra/libkookie/nixpkgs/pkgs/servers/http/nginx/mainline.nix index 934506c45ca9..edb87258d6b7 100644 --- a/infra/libkookie/nixpkgs/pkgs/servers/http/nginx/mainline.nix +++ b/infra/libkookie/nixpkgs/pkgs/servers/http/nginx/mainline.nix @@ -1,6 +1,6 @@ { callPackage, ... }@args: callPackage ./generic.nix args { - version = "1.19.3"; - sha256 = "1w4dkq7bl5gyix3x0ap3d9lndh7zyvc3mscl693d4ybql57vgrci"; + version = "1.19.5"; + sha256 = "173rv8gacd9bakb0r9jmkr4pqgjw9mzpdh3f7x2d8ln4ssplc2jw"; } diff --git a/infra/libkookie/nixpkgs/pkgs/servers/http/openresty/default.nix b/infra/libkookie/nixpkgs/pkgs/servers/http/openresty/default.nix index 734dfb041403..964517649900 100644 --- a/infra/libkookie/nixpkgs/pkgs/servers/http/openresty/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/servers/http/openresty/default.nix @@ -8,15 +8,19 @@ callPackage ../nginx/generic.nix args rec { pname = "openresty"; - nginxVersion = "1.17.8"; - version = "${nginxVersion}.2"; + nginxVersion = "1.19.3"; + version = "${nginxVersion}.1"; src = fetchurl { url = "https://openresty.org/download/openresty-${version}.tar.gz"; - sha256 = "1813w33hjm1hcqvl3b3f67qgi5zfjiqg6s01hiy12a5j3jqilcig"; + sha256 = "0p9xn0xgbk6nmjfb25a3d6bwxm8q23igkixqma5fpygla6fcsvzk"; }; - fixPatch = patch: let name = patch.name or (builtins.baseNameOf patch); in + # generic.nix applies fixPatch on top of every patch defined there. This + # allows updating the patch destination, as openresty has nginx source code + # in a different folder. + fixPatch = patch: + let name = patch.name or (builtins.baseNameOf patch); in runCommand "openresty-${name}" { src = patch; } '' substitute $src $out \ --replace "a/" "a/bundle/nginx-${nginxVersion}/" \ @@ -40,9 +44,9 @@ callPackage ../nginx/generic.nix args rec { meta = { description = "A fast web application server built on Nginx"; - homepage = "http://openresty.org"; - license = lib.licenses.bsd2; - platforms = lib.platforms.all; + homepage = "http://openresty.org"; + license = lib.licenses.bsd2; + platforms = lib.platforms.all; maintainers = with lib.maintainers; [ thoughtpolice lblasc emily ]; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/servers/http/showoff/default.nix b/infra/libkookie/nixpkgs/pkgs/servers/http/showoff/default.nix index 0a10c806e5ed..ecfd034e05b3 100644 --- a/infra/libkookie/nixpkgs/pkgs/servers/http/showoff/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/servers/http/showoff/default.nix @@ -13,6 +13,6 @@ bundlerApp { homepage = "https://puppetlabs.github.io/showoff/"; license = with licenses; mit; platforms = platforms.unix; - maintainers = with maintainers; [ mwilsoninsight nicknovitski ]; + maintainers = with maintainers; [ maxwilson nicknovitski ]; }; } diff --git a/infra/libkookie/nixpkgs/pkgs/servers/http/unit/default.nix b/infra/libkookie/nixpkgs/pkgs/servers/http/unit/default.nix index cbe17cdb8064..f4379aa6fa2c 100644 --- a/infra/libkookie/nixpkgs/pkgs/servers/http/unit/default.nix +++ b/infra/libkookie/nixpkgs/pkgs/servers/http/unit/default.nix @@ -1,4 +1,5 @@ { stdenv, fetchFromGitHub, nixosTests, which +, pcre2 , withPython2 ? false, python2 , withPython3 ? true, python3, ncurses , withPHP73 ? false, php73 @@ -30,19 +31,19 @@ let php74-unit = php74.override phpConfig; in stdenv.mkDerivation rec { - version = "1.19.0"; + version = "1.21.0"; pname = "unit"; src = fetchFromGitHub { owner = "nginx"; - repo = "unit"; + repo = pname; rev = version; - sha256 = "0k3q42q198sb0w6hyyymw92dbhz67axn6w6vnzr0d883xw3sva7k"; + sha256 = "1jczdxixxyj16w10pkcplchbqvx3m32nkmcl0hqap5ffqj08mmf7"; }; nativeBuildInputs = [ which ]; - buildInputs = [ ] + buildInputs = [ pcre2.dev ] ++ optional withPython2 python2 ++ optionals withPython3 [ python3 ncurses ] ++ optional withPHP73 php73-unit |