From e76e8cf22e8639250266df96a90f4746c9c34f95 Mon Sep 17 00:00:00 2001 From: Florian Klink Date: Wed, 2 Dec 2020 09:08:02 +0100 Subject: [PATCH] openresty: 1.17.8 -> 1.19.3 Also, add a quick comment about what fixPatch does. --- pkgs/servers/http/openresty/default.nix | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/pkgs/servers/http/openresty/default.nix b/pkgs/servers/http/openresty/default.nix index 734dfb04140..96451764990 100644 --- a/pkgs/servers/http/openresty/default.nix +++ b/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 ]; }; }