Merge pull request #105668 from flokli/openresty-1.19.3

openresty: 1.17.8 -> 1.19.3
This commit is contained in:
Austin Seipp 2020-12-02 03:24:35 -06:00 committed by GitHub
commit c9ae57cdb4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -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 ];
};
}