diff options
author | Sandro Jäckel <sandro.jaeckel@gmail.com> | 2022-12-19 08:37:40 +0100 |
---|---|---|
committer | Sandro Jäckel <sandro.jaeckel@gmail.com> | 2022-12-19 08:38:48 +0100 |
commit | 7f2d5f369ce7a386c51c505dc08e21a8e94255f4 (patch) | |
tree | f4a31c2719084d64e1d1ed56cc9534aba910a436 /pkgs/servers/http/openresty | |
parent | 76672661b9b8cf731e2cd87984f701937e8df655 (diff) |
openresty: 1.19.9 -> 1.21.4
Diffstat (limited to 'pkgs/servers/http/openresty')
-rw-r--r-- | pkgs/servers/http/openresty/default.nix | 21 |
1 files changed, 12 insertions, 9 deletions
diff --git a/pkgs/servers/http/openresty/default.nix b/pkgs/servers/http/openresty/default.nix index 5c852de5b64aa..433d8fd3969b8 100644 --- a/pkgs/servers/http/openresty/default.nix +++ b/pkgs/servers/http/openresty/default.nix @@ -2,6 +2,7 @@ , runCommand , lib , fetchurl +, perl , postgresql , nixosTests , ... @@ -9,17 +10,17 @@ callPackage ../nginx/generic.nix args rec { pname = "openresty"; - nginxVersion = "1.19.9"; + nginxVersion = "1.21.4"; version = "${nginxVersion}.1"; src = fetchurl { url = "https://openresty.org/download/openresty-${version}.tar.gz"; - sha256 = "1xn1d0x2y63z0mi0qq3js6lz6ziba92r7vyyfkj1qc738vjz8vsp"; + sha256 = "sha256-DFCTtk94IehQZcmeXU5swxggz9fze5oN7IQgnYeir5k="; }; - # 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. + # 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; } '' @@ -28,14 +29,16 @@ callPackage ../nginx/generic.nix args rec { --replace "b/" "b/bundle/nginx-${nginxVersion}/" ''; - buildInputs = [ postgresql ]; + nativeBuildInputs = [ perl ]; - configureFlags = [ "--with-http_postgres_module" ]; + buildInputs = [ postgresql ]; - preConfigure = '' - patchShebangs . + postPatch = '' + patchShebangs configure bundle/ ''; + configureFlags = [ "--with-http_postgres_module" ]; + postInstall = '' ln -s $out/luajit/bin/luajit-2.1.0-beta3 $out/bin/luajit-openresty ln -s $out/nginx/sbin/nginx $out/bin/nginx |