lol
0
fork

Configure Feed

Select the types of activity you want to include in your feed.

openresty: 1.9.3.1 -> 1.13.6.1 (#36289)

authored by

Luka Blašković and committed by
Jörg Thalheim
75d4499e d44dd05a

+21 -20
+21 -20
pkgs/servers/http/openresty/default.nix
··· 1 - { stdenv, fetchurl, fetchgit, openssl, zlib, pcre, libxml2, libxslt, gd, geoip 2 - , perl }: 3 - 4 - assert stdenv.isLinux; 1 + { stdenv, fetchurl, fetchgit, openssl, zlib, pcre, postgresql, libxml2, libxslt, 2 + gd, geoip, perl }: 5 3 6 4 with stdenv.lib; 7 5 8 6 stdenv.mkDerivation rec { 9 7 name = "openresty-${version}"; 10 - version = "1.9.3.1"; 8 + version = "1.13.6.1"; 11 9 12 10 src = fetchurl { 13 - url = "http://openresty.org/download/ngx_openresty-${version}.tar.gz"; 14 - sha256 = "1fw8yxjndf5gsk44l4bsixm270fxv7f5cdiwzq9ps6j3hhgx5kyv"; 11 + url = "http://openresty.org/download/openresty-${version}.tar.gz"; 12 + sha256 = "0sv93nw1j597mdpnibmgaa3nnghdk0z6k27vavm8w2c1z9n6w96i"; 15 13 }; 16 14 17 - buildInputs = [ openssl zlib pcre libxml2 libxslt gd geoip perl ]; 15 + buildInputs = [ openssl zlib pcre libxml2 libxslt gd geoip postgresql ]; 16 + nativeBuildInputs = [ perl ]; 17 + 18 + NIX_CFLAGS_COMPILE = ["-I${libxml2.dev}/include/libxml2"]; 19 + 20 + preConfigure = '' 21 + patchShebangs . 22 + ''; 18 23 19 24 configureFlags = [ 20 25 "--with-pcre-jit" 21 26 "--with-http_ssl_module" 22 - "--with-http_spdy_module" 27 + "--with-http_v2_module" 23 28 "--with-http_realip_module" 24 29 "--with-http_addition_module" 25 30 "--with-http_xslt_module" ··· 36 41 "--with-http_secure_link_module" 37 42 "--with-http_degradation_module" 38 43 "--with-http_stub_status_module" 44 + "--with-http_postgres_module" 39 45 "--with-ipv6" 40 46 ]; 41 47 42 - postInstall = '' 43 - mv $out/nginx/sbin/nginx $out/bin 44 - mv $out/luajit/bin/luajit-2.1.0-alpha $out/bin/luajit-openresty 45 - ln -s $out/bin/nginx $out/bin/openresty 46 - ''; 48 + enableParallelBuilding = true; 47 49 48 - preConfigure = '' 49 - export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${libxml2.dev}/include/libxml2 $additionalFlags" 50 - export PATH="$PATH:${stdenv.cc.libc.bin}/bin" 51 - patchShebangs . 50 + postInstall = '' 51 + ln -s $out/luajit/bin/luajit-2.1.0-beta3 $out/bin/luajit-openresty 52 + ln -s $out/nginx/sbin/nginx $out/bin/nginx 52 53 ''; 53 54 54 55 meta = { 55 56 description = "A fast web application server built on Nginx"; 56 57 homepage = http://openresty.org; 57 58 license = licenses.bsd2; 58 - platforms = platforms.linux; 59 - maintainers = with maintainers; [ thoughtpolice ]; 59 + platforms = platforms.all; 60 + maintainers = with maintainers; [ thoughtpolice lblasc ]; 60 61 }; 61 62 }