uboot: (firmwareOdroidC2/C4) don't invoke patch tool, use patches = [] instead
https://github.com/NixOS/nixpkgs/blob/master/pkgs/stdenv/generic/setup.sh#L948 this can do it nicely. Signed-off-by: Anton Arapov <anton@deadbeef.mx>
This commit is contained in:
Anton Arapov
Alan Daniels
commit
56de2bcd43
30691 changed files with 3076956 additions and 0 deletions
186
pkgs/servers/http/nginx/generic.nix
Normal file
186
pkgs/servers/http/nginx/generic.nix
Normal file
|
|
@ -0,0 +1,186 @@
|
|||
outer@{ lib, stdenv, fetchurl, fetchpatch, openssl, zlib, pcre, libxml2, libxslt
|
||||
, nginx-doc
|
||||
|
||||
, nixosTests
|
||||
, substituteAll, removeReferencesTo, gd, geoip, perl
|
||||
, withDebug ? false
|
||||
, withKTLS ? false
|
||||
, withStream ? true
|
||||
, withMail ? false
|
||||
, withPerl ? true
|
||||
, modules ? []
|
||||
, ...
|
||||
}:
|
||||
|
||||
{ pname ? "nginx"
|
||||
, version
|
||||
, nginxVersion ? version
|
||||
, src ? null # defaults to upstream nginx ${version}
|
||||
, sha256 ? null # when not specifying src
|
||||
, configureFlags ? []
|
||||
, buildInputs ? []
|
||||
, extraPatches ? []
|
||||
, fixPatch ? p: p
|
||||
, preConfigure ? ""
|
||||
, postInstall ? ""
|
||||
, meta ? null
|
||||
, nginx-doc ? outer.nginx-doc
|
||||
, passthru ? { tests = {}; }
|
||||
}:
|
||||
|
||||
with lib;
|
||||
|
||||
let
|
||||
|
||||
mapModules = attrPath: flip concatMap modules
|
||||
(mod:
|
||||
let supports = mod.supports or (_: true);
|
||||
in
|
||||
if supports nginxVersion then mod.${attrPath} or []
|
||||
else throw "Module at ${toString mod.src} does not support nginx version ${nginxVersion}!");
|
||||
|
||||
in
|
||||
|
||||
stdenv.mkDerivation {
|
||||
inherit pname;
|
||||
inherit version;
|
||||
inherit nginxVersion;
|
||||
|
||||
outputs = ["out" "doc"];
|
||||
|
||||
src = if src != null then src else fetchurl {
|
||||
url = "https://nginx.org/download/nginx-${version}.tar.gz";
|
||||
inherit sha256;
|
||||
};
|
||||
|
||||
buildInputs = [ openssl zlib pcre libxml2 libxslt gd geoip perl ]
|
||||
++ buildInputs
|
||||
++ mapModules "inputs";
|
||||
|
||||
configureFlags = [
|
||||
"--with-http_ssl_module"
|
||||
"--with-http_v2_module"
|
||||
"--with-http_realip_module"
|
||||
"--with-http_addition_module"
|
||||
"--with-http_xslt_module"
|
||||
"--with-http_sub_module"
|
||||
"--with-http_dav_module"
|
||||
"--with-http_flv_module"
|
||||
"--with-http_mp4_module"
|
||||
"--with-http_gunzip_module"
|
||||
"--with-http_gzip_static_module"
|
||||
"--with-http_auth_request_module"
|
||||
"--with-http_random_index_module"
|
||||
"--with-http_secure_link_module"
|
||||
"--with-http_degradation_module"
|
||||
"--with-http_stub_status_module"
|
||||
"--with-threads"
|
||||
"--with-pcre-jit"
|
||||
"--http-log-path=/var/log/nginx/access.log"
|
||||
"--error-log-path=/var/log/nginx/error.log"
|
||||
"--pid-path=/var/log/nginx/nginx.pid"
|
||||
"--http-client-body-temp-path=/var/cache/nginx/client_body"
|
||||
"--http-proxy-temp-path=/var/cache/nginx/proxy"
|
||||
"--http-fastcgi-temp-path=/var/cache/nginx/fastcgi"
|
||||
"--http-uwsgi-temp-path=/var/cache/nginx/uwsgi"
|
||||
"--http-scgi-temp-path=/var/cache/nginx/scgi"
|
||||
] ++ optionals withDebug [
|
||||
"--with-debug"
|
||||
] ++ optionals withKTLS [
|
||||
"--with-openssl-opt=enable-ktls"
|
||||
] ++ optionals withStream [
|
||||
"--with-stream"
|
||||
"--with-stream_realip_module"
|
||||
"--with-stream_ssl_module"
|
||||
"--with-stream_ssl_preread_module"
|
||||
] ++ optionals withMail [
|
||||
"--with-mail"
|
||||
"--with-mail_ssl_module"
|
||||
] ++ optionals withPerl [
|
||||
"--with-http_perl_module"
|
||||
"--with-perl=${perl}/bin/perl"
|
||||
"--with-perl_modules_path=lib/perl5"
|
||||
]
|
||||
++ optional (gd != null) "--with-http_image_filter_module"
|
||||
++ optional (geoip != null) "--with-http_geoip_module"
|
||||
++ optional (withStream && geoip != null) "--with-stream_geoip_module"
|
||||
++ optional (with stdenv.hostPlatform; isLinux || isFreeBSD) "--with-file-aio"
|
||||
++ configureFlags
|
||||
++ map (mod: "--add-module=${mod.src}") modules;
|
||||
|
||||
NIX_CFLAGS_COMPILE = toString ([
|
||||
"-I${libxml2.dev}/include/libxml2"
|
||||
"-Wno-error=implicit-fallthrough"
|
||||
] ++ optionals (stdenv.cc.isGNU && lib.versionAtLeast stdenv.cc.version "11") [
|
||||
# fix build vts module on gcc11
|
||||
"-Wno-error=stringop-overread"
|
||||
] ++ optional stdenv.isDarwin "-Wno-error=deprecated-declarations");
|
||||
|
||||
configurePlatforms = [];
|
||||
|
||||
# Disable _multioutConfig hook which adds --bindir=$out/bin into configureFlags,
|
||||
# which breaks build, since nginx does not actually use autoconf.
|
||||
preConfigure = ''
|
||||
setOutputFlags=
|
||||
'' + preConfigure
|
||||
+ concatMapStringsSep "\n" (mod: mod.preConfigure or "") modules;
|
||||
|
||||
patches = map fixPatch ([
|
||||
(substituteAll {
|
||||
src = ./nix-etag-1.15.4.patch;
|
||||
preInstall = ''
|
||||
export nixStoreDir="$NIX_STORE" nixStoreDirLen="''${#NIX_STORE}"
|
||||
'';
|
||||
})
|
||||
./nix-skip-check-logs-path.patch
|
||||
] ++ optionals (stdenv.hostPlatform != stdenv.buildPlatform) [
|
||||
(fetchpatch {
|
||||
url = "https://raw.githubusercontent.com/openwrt/packages/c057dfb09c7027287c7862afab965a4cd95293a3/net/nginx/patches/102-sizeof_test_fix.patch";
|
||||
sha256 = "0i2k30ac8d7inj9l6bl0684kjglam2f68z8lf3xggcc2i5wzhh8a";
|
||||
})
|
||||
(fetchpatch {
|
||||
url = "https://raw.githubusercontent.com/openwrt/packages/c057dfb09c7027287c7862afab965a4cd95293a3/net/nginx/patches/101-feature_test_fix.patch";
|
||||
sha256 = "0v6890a85aqmw60pgj3mm7g8nkaphgq65dj4v9c6h58wdsrc6f0y";
|
||||
})
|
||||
(fetchpatch {
|
||||
url = "https://raw.githubusercontent.com/openwrt/packages/c057dfb09c7027287c7862afab965a4cd95293a3/net/nginx/patches/103-sys_nerr.patch";
|
||||
sha256 = "0s497x6mkz947aw29wdy073k8dyjq8j99lax1a1mzpikzr4rxlmd";
|
||||
})
|
||||
] ++ mapModules "patches")
|
||||
++ extraPatches;
|
||||
|
||||
hardeningEnable = optional (!stdenv.isDarwin) "pie";
|
||||
|
||||
enableParallelBuilding = true;
|
||||
|
||||
preInstall = ''
|
||||
mkdir -p $doc
|
||||
cp -r ${nginx-doc}/* $doc
|
||||
'';
|
||||
|
||||
nativeBuildInputs = [ removeReferencesTo ];
|
||||
|
||||
disallowedReferences = map (m: m.src) modules;
|
||||
|
||||
postInstall =
|
||||
let
|
||||
noSourceRefs = lib.concatMapStrings (m: "remove-references-to -t ${m.src} $out/sbin/nginx\n") modules;
|
||||
in noSourceRefs + postInstall;
|
||||
|
||||
passthru = {
|
||||
modules = modules;
|
||||
tests = {
|
||||
inherit (nixosTests) nginx nginx-auth nginx-etag nginx-http3 nginx-pubhtml nginx-sandbox nginx-sso;
|
||||
variants = lib.recurseIntoAttrs nixosTests.nginx-variants;
|
||||
acme-integration = nixosTests.acme;
|
||||
} // passthru.tests;
|
||||
};
|
||||
|
||||
meta = if meta != null then meta else {
|
||||
description = "A reverse proxy and lightweight webserver";
|
||||
homepage = "http://nginx.org";
|
||||
license = licenses.bsd2;
|
||||
platforms = platforms.all;
|
||||
maintainers = with maintainers; [ thoughtpolice raskin fpletz globin ajs124 ];
|
||||
};
|
||||
}
|
||||
6
pkgs/servers/http/nginx/mainline.nix
Normal file
6
pkgs/servers/http/nginx/mainline.nix
Normal file
|
|
@ -0,0 +1,6 @@
|
|||
{ callPackage, ... }@args:
|
||||
|
||||
callPackage ./generic.nix args {
|
||||
version = "1.22.0";
|
||||
sha256 = "0lzb4sn8hv491zad9kbpvka3m5ayjf1pxqbwllri980idyd5cgdk";
|
||||
}
|
||||
573
pkgs/servers/http/nginx/modules.nix
Normal file
573
pkgs/servers/http/nginx/modules.nix
Normal file
|
|
@ -0,0 +1,573 @@
|
|||
{ fetchFromGitHub, fetchFromGitLab, lib, pkgs }:
|
||||
|
||||
let
|
||||
|
||||
http_proxy_connect_module_generic = patchName: rec {
|
||||
src = fetchFromGitHub {
|
||||
name = "http_proxy_connect_module_generic";
|
||||
owner = "chobits";
|
||||
repo = "ngx_http_proxy_connect_module";
|
||||
rev = "96ae4e06381f821218f368ad0ba964f87cbe0266";
|
||||
sha256 = "1nc7z31i7x9dzp67kzgvs34hs6ps749y26wcpi3wf5mm63i803rh";
|
||||
};
|
||||
|
||||
patches = [
|
||||
"${src}/patch/${patchName}.patch"
|
||||
];
|
||||
};
|
||||
|
||||
in
|
||||
|
||||
{
|
||||
fastcgi-cache-purge = throw "fastcgi-cache-purge was renamed to cache-purge";
|
||||
ngx_aws_auth = throw "ngx_aws_auth was renamed to aws-auth";
|
||||
|
||||
akamai-token-validate = {
|
||||
src = fetchFromGitHub {
|
||||
name = "akamai-token-validate";
|
||||
owner = "kaltura";
|
||||
repo = "nginx-akamai-token-validate-module";
|
||||
rev = "34fd0c94d2c43c642f323491c4f4a226cd83b962";
|
||||
sha256 = "0yf34s11vgkcl03wbl6gjngm3p9hs8vvm7hkjkwhjh39vkk2a7cy";
|
||||
};
|
||||
inputs = [ pkgs.openssl ];
|
||||
};
|
||||
|
||||
auth-a2aclr = {
|
||||
src = fetchFromGitLab {
|
||||
name = "auth-a2aclr";
|
||||
owner = "arpa2";
|
||||
repo = "nginx-auth-a2aclr";
|
||||
rev = "bbabf9480bb2b40ac581551883a18dfa6522dd63";
|
||||
sha256 = "sha256-h2LgMhreCgod+H/bNQzY9BvqG9ezkwikwWB3T6gHH04=";
|
||||
};
|
||||
inputs = [
|
||||
(pkgs.arpa2common.overrideAttrs
|
||||
(old: rec {
|
||||
version = "0.7.1";
|
||||
|
||||
src = fetchFromGitLab {
|
||||
owner = "arpa2";
|
||||
repo = "arpa2common";
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-8zVsAlGtmya9EK4OkGUMu2FKJRn2Q3bg2QWGjqcii64=";
|
||||
};
|
||||
}))
|
||||
];
|
||||
};
|
||||
|
||||
aws-auth = {
|
||||
src = fetchFromGitHub {
|
||||
name = "aws-auth";
|
||||
owner = "anomalizer";
|
||||
repo = "ngx_aws_auth";
|
||||
rev = "2.1.1";
|
||||
sha256 = "10z67g40w7wpd13fwxyknkbg3p6hn61i4v8xw6lh27br29v1y6h9";
|
||||
};
|
||||
};
|
||||
|
||||
brotli = {
|
||||
src = let gitsrc = pkgs.fetchFromGitHub {
|
||||
name = "brotli";
|
||||
owner = "google";
|
||||
repo = "ngx_brotli";
|
||||
rev = "25f86f0bac1101b6512135eac5f93c49c63609e3";
|
||||
sha256 = "02hfvfa6milj40qc2ikpb9f95sxqvxk4hly3x74kqhysbdi06hhv";
|
||||
}; in
|
||||
pkgs.runCommand "ngx_brotli-src" { } ''
|
||||
cp -a ${gitsrc} $out
|
||||
substituteInPlace $out/filter/config \
|
||||
--replace '$ngx_addon_dir/deps/brotli/c' ${lib.getDev pkgs.brotli}
|
||||
'';
|
||||
inputs = [ pkgs.brotli ];
|
||||
};
|
||||
|
||||
cache-purge = {
|
||||
src = fetchFromGitHub {
|
||||
name = "cache-purge";
|
||||
owner = "nginx-modules";
|
||||
repo = "ngx_cache_purge";
|
||||
rev = "2.5.1";
|
||||
sha256 = "0va4jz36mxj76nmq05n3fgnpdad30cslg7c10vnlhdmmic9vqncd";
|
||||
};
|
||||
};
|
||||
|
||||
coolkit = {
|
||||
src = fetchFromGitHub {
|
||||
name = "coolkit";
|
||||
owner = "FRiCKLE";
|
||||
repo = "ngx_coolkit";
|
||||
rev = "0.2";
|
||||
sha256 = "1idj0cqmfsdqawjcqpr1fsq670fdki51ksqk2lslfpcs3yrfjpqh";
|
||||
};
|
||||
};
|
||||
|
||||
dav = {
|
||||
src = fetchFromGitHub {
|
||||
name = "dav";
|
||||
owner = "arut";
|
||||
repo = "nginx-dav-ext-module";
|
||||
rev = "v3.0.0";
|
||||
sha256 = "000dm5zk0m1hm1iq60aff5r6y8xmqd7djrwhgnz9ig01xyhnjv9w";
|
||||
};
|
||||
inputs = [ pkgs.expat ];
|
||||
};
|
||||
|
||||
develkit = {
|
||||
src = fetchFromGitHub {
|
||||
name = "develkit";
|
||||
owner = "vision5";
|
||||
repo = "ngx_devel_kit";
|
||||
rev = "v0.3.1";
|
||||
sha256 = "1c5zfpvm0hrd9lp8rasmw79dnr2aabh0i6y11wzb783bp8m3p2sq";
|
||||
};
|
||||
};
|
||||
|
||||
echo = {
|
||||
src = fetchFromGitHub {
|
||||
name = "echo";
|
||||
owner = "openresty";
|
||||
repo = "echo-nginx-module";
|
||||
rev = "v0.62";
|
||||
sha256 = "0kr1y094yw1a9fyrf4w73ikq18w5ys463wza9n7yfl77xdwirnvl";
|
||||
};
|
||||
};
|
||||
|
||||
fancyindex = {
|
||||
src = fetchFromGitHub {
|
||||
name = "fancyindex";
|
||||
owner = "aperezdc";
|
||||
repo = "ngx-fancyindex";
|
||||
rev = "v0.5.2";
|
||||
sha256 = "0nar45lp3jays3p6b01a78a6gwh6v0snpzcncgiphcqmj5kw8ipg";
|
||||
};
|
||||
meta = {
|
||||
maintainers = with lib.maintainers; [ aneeshusa ];
|
||||
};
|
||||
};
|
||||
|
||||
fluentd = {
|
||||
src = fetchFromGitHub {
|
||||
name = "fluentd";
|
||||
owner = "fluent";
|
||||
repo = "nginx-fluentd-module";
|
||||
rev = "8af234043059c857be27879bc547c141eafd5c13";
|
||||
sha256 = "1ycb5zd9sw60ra53jpak1m73zwrjikwhrrh9q6266h1mlyns7zxm";
|
||||
};
|
||||
};
|
||||
|
||||
geoip2 = {
|
||||
src = fetchFromGitHub {
|
||||
name = "geoip2";
|
||||
owner = "leev";
|
||||
repo = "ngx_http_geoip2_module";
|
||||
rev = "3.3";
|
||||
sha256 = "EEn/qxPsBFgVBqOgPYTrRhaLPwSBlSPWYYSr3SL8wZA=";
|
||||
};
|
||||
inputs = [ pkgs.libmaxminddb ];
|
||||
|
||||
meta = {
|
||||
maintainers = with lib.maintainers; [ pinpox ];
|
||||
};
|
||||
};
|
||||
|
||||
http_proxy_connect_module_v18 = http_proxy_connect_module_generic "proxy_connect_rewrite_1018" // {
|
||||
supports = with lib.versions; version: major version == "1" && minor version == "18";
|
||||
};
|
||||
|
||||
http_proxy_connect_module_v19 = http_proxy_connect_module_generic "proxy_connect_rewrite_1018" // {
|
||||
supports = with lib.versions; version: major version == "1" && minor version == "19";
|
||||
};
|
||||
|
||||
ipscrub = {
|
||||
src = fetchFromGitHub
|
||||
{
|
||||
name = "ipscrub";
|
||||
owner = "masonicboom";
|
||||
repo = "ipscrub";
|
||||
rev = "v1.0.1";
|
||||
sha256 = "0qcx15c8wbsmyz2hkmyy5yd7qn1n84kx9amaxnfxkpqi05vzm1zz";
|
||||
} + "/ipscrub";
|
||||
inputs = [ pkgs.libbsd ];
|
||||
};
|
||||
|
||||
limit-speed = {
|
||||
src = fetchFromGitHub {
|
||||
name = "limit-speed";
|
||||
owner = "yaoweibin";
|
||||
repo = "nginx_limit_speed_module";
|
||||
rev = "f77ad4a56fbb134878e75827b40cf801990ed936";
|
||||
sha256 = "0kkrd08zpcwx938i2is07vq6pgjkvn97xzjab0g4zaz8bivgmjp8";
|
||||
};
|
||||
};
|
||||
|
||||
live = {
|
||||
src = fetchFromGitHub {
|
||||
name = "live";
|
||||
owner = "arut";
|
||||
repo = "nginx-live-module";
|
||||
rev = "5e4a1e3a718e65e5206c24eba00d42b0d1c4b7dd";
|
||||
sha256 = "1kpnhl4b50zim84z22ahqxyxfq4jv8ab85kzsy2n5ciqbyg491lz";
|
||||
};
|
||||
};
|
||||
|
||||
lua = {
|
||||
src = fetchFromGitHub {
|
||||
name = "lua";
|
||||
owner = "openresty";
|
||||
repo = "lua-nginx-module";
|
||||
rev = "v0.10.15";
|
||||
sha256 = "1j216isp0546hycklbr5wi8mlga5hq170hk7f2sm16sfavlkh5gz";
|
||||
};
|
||||
inputs = [ pkgs.luajit ];
|
||||
preConfigure = ''
|
||||
export LUAJIT_LIB="${pkgs.luajit}/lib"
|
||||
export LUAJIT_INC="${pkgs.luajit}/include/luajit-2.0"
|
||||
'';
|
||||
allowMemoryWriteExecute = true;
|
||||
};
|
||||
|
||||
lua-upstream = {
|
||||
src = fetchFromGitHub {
|
||||
name = "lua-upstream";
|
||||
owner = "openresty";
|
||||
repo = "lua-upstream-nginx-module";
|
||||
rev = "v0.07";
|
||||
sha256 = "1gqccg8airli3i9103zv1zfwbjm27h235qjabfbfqk503rjamkpk";
|
||||
};
|
||||
inputs = [ pkgs.luajit ];
|
||||
allowMemoryWriteExecute = true;
|
||||
};
|
||||
|
||||
modsecurity = {
|
||||
src = "${pkgs.modsecurity_standalone.nginx}/nginx/modsecurity";
|
||||
inputs = [ pkgs.curl pkgs.apr pkgs.aprutil pkgs.apacheHttpd pkgs.yajl ];
|
||||
preConfigure = ''
|
||||
export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -I${pkgs.aprutil.dev}/include/apr-1 -I${pkgs.apacheHttpd.dev}/include -I${pkgs.apr.dev}/include/apr-1 -I${pkgs.yajl}/include"
|
||||
'';
|
||||
};
|
||||
|
||||
modsecurity-nginx = {
|
||||
src = fetchFromGitHub {
|
||||
name = "modsecurity-nginx";
|
||||
owner = "SpiderLabs";
|
||||
repo = "ModSecurity-nginx";
|
||||
rev = "v1.0.2";
|
||||
sha256 = "sha256-UXiitc3jZlgXlCsDPS+xEFLNRVgRbn8BCCXUEqAWlII=";
|
||||
};
|
||||
inputs = [ pkgs.curl pkgs.geoip pkgs.libmodsecurity pkgs.libxml2 pkgs.lmdb pkgs.yajl ];
|
||||
disableIPC = true;
|
||||
};
|
||||
|
||||
moreheaders = {
|
||||
src = fetchFromGitHub {
|
||||
name = "moreheaders";
|
||||
owner = "openresty";
|
||||
repo = "headers-more-nginx-module";
|
||||
rev = "v0.33";
|
||||
sha256 = "1cgdjylrdd69vlkwwmn018hrglzjwd83nqva1hrapgcfw12f7j53";
|
||||
};
|
||||
};
|
||||
|
||||
mpeg-ts = {
|
||||
src = fetchFromGitHub {
|
||||
name = "mpeg-ts";
|
||||
owner = "arut";
|
||||
repo = "nginx-ts-module";
|
||||
rev = "v0.1.1";
|
||||
sha256 = "12dxcyy6wna1fccl3a9lnsbymd6p4apnwz6c24w74v97qvpfdxqd";
|
||||
};
|
||||
};
|
||||
|
||||
naxsi = {
|
||||
src = fetchFromGitHub
|
||||
{
|
||||
name = "naxsi";
|
||||
owner = "nbs-system";
|
||||
repo = "naxsi";
|
||||
rev = "95ac520eed2ea04098a76305fd0ad7e9158840b7";
|
||||
sha256 = "0b5pnqkgg18kbw5rf2ifiq7lsx5rqmpqsql6hx5ycxjzxj6acfb3";
|
||||
} + "/naxsi_src";
|
||||
};
|
||||
|
||||
opentracing = {
|
||||
src =
|
||||
let src' = fetchFromGitHub {
|
||||
name = "opentracing";
|
||||
owner = "opentracing-contrib";
|
||||
repo = "nginx-opentracing";
|
||||
rev = "v0.10.0";
|
||||
sha256 = "1q234s3p55xv820207dnh4fcxkqikjcq5rs02ai31ylpmfsf0kkb";
|
||||
};
|
||||
in "${src'}/opentracing";
|
||||
inputs = [ pkgs.opentracing-cpp ];
|
||||
};
|
||||
|
||||
pagespeed =
|
||||
let
|
||||
version = pkgs.psol.version;
|
||||
|
||||
moduleSrc = fetchFromGitHub {
|
||||
name = "pagespeed";
|
||||
owner = "pagespeed";
|
||||
repo = "ngx_pagespeed";
|
||||
rev = "v${version}-stable";
|
||||
sha256 = "0ry7vmkb2bx0sspl1kgjlrzzz6lbz07313ks2lr80rrdm2zb16wp";
|
||||
};
|
||||
|
||||
ngx_pagespeed = pkgs.runCommand
|
||||
"ngx_pagespeed"
|
||||
{
|
||||
meta = {
|
||||
description = "PageSpeed module for Nginx";
|
||||
homepage = "https://developers.google.com/speed/pagespeed/module/";
|
||||
license = pkgs.lib.licenses.asl20;
|
||||
};
|
||||
}
|
||||
''
|
||||
cp -r "${moduleSrc}" "$out"
|
||||
chmod -R +w "$out"
|
||||
ln -s "${pkgs.psol}" "$out/psol"
|
||||
'';
|
||||
in
|
||||
{
|
||||
src = ngx_pagespeed;
|
||||
inputs = [ pkgs.zlib pkgs.libuuid ]; # psol deps
|
||||
allowMemoryWriteExecute = true;
|
||||
};
|
||||
|
||||
pam = {
|
||||
src = fetchFromGitHub {
|
||||
name = "pam";
|
||||
owner = "sto";
|
||||
repo = "ngx_http_auth_pam_module";
|
||||
rev = "v1.5.3";
|
||||
sha256 = "sha256:09lnljdhjg65643bc4535z378lsn4llbq67zcxlln0pizk9y921a";
|
||||
};
|
||||
inputs = [ pkgs.pam ];
|
||||
};
|
||||
|
||||
pinba = {
|
||||
src = fetchFromGitHub {
|
||||
name = "pinba";
|
||||
owner = "tony2001";
|
||||
repo = "ngx_http_pinba_module";
|
||||
rev = "28131255d4797a7e2f82a6a35cf9fc03c4678fe6";
|
||||
sha256 = "00fii8bjvyipq6q47xhjhm3ylj4rhzmlk3qwxmfpdn37j7bc8p8c";
|
||||
};
|
||||
};
|
||||
|
||||
push-stream = {
|
||||
src = fetchFromGitHub {
|
||||
name = "push-stream";
|
||||
owner = "wandenberg";
|
||||
repo = "nginx-push-stream-module";
|
||||
rev = "1cdc01521ed44dc614ebb5c0d19141cf047e1f90";
|
||||
sha256 = "0ijka32b37dl07k2jl48db5a32ix43jaczrpjih84cvq8yph0jjr";
|
||||
};
|
||||
};
|
||||
|
||||
rtmp = {
|
||||
src = fetchFromGitHub {
|
||||
name = "rtmp";
|
||||
owner = "arut";
|
||||
repo = "nginx-rtmp-module";
|
||||
rev = "v1.2.2";
|
||||
sha256 = "0y45bswk213yhkc2v1xca2rnsxrhx8v6azxz9pvi71vvxcggqv6h";
|
||||
};
|
||||
};
|
||||
|
||||
secure-token = {
|
||||
src = fetchFromGitHub {
|
||||
name = "secure-token";
|
||||
owner = "kaltura";
|
||||
repo = "nginx-secure-token-module";
|
||||
rev = "95bdc0d1aca06ea7fe42555f71e65910bd74914d";
|
||||
sha256 = "19wzck1xzq4kz7nyabcwzlank1k7wi7w2wn2c1mwz374c79g8ggp";
|
||||
};
|
||||
inputs = [ pkgs.openssl ];
|
||||
};
|
||||
|
||||
set-misc = {
|
||||
src = fetchFromGitHub {
|
||||
name = "set-misc";
|
||||
owner = "openresty";
|
||||
repo = "set-misc-nginx-module";
|
||||
rev = "v0.32";
|
||||
sha256 = "048a6jwinbjgxiprjj9ml3fdp0mhkx89g6ggams57fsx9m5vaxax";
|
||||
};
|
||||
};
|
||||
|
||||
shibboleth = {
|
||||
src = fetchFromGitHub {
|
||||
name = "shibboleth";
|
||||
owner = "nginx-shib";
|
||||
repo = "nginx-http-shibboleth";
|
||||
rev = "3f5ff4212fa12de23cb1acae8bf3a5a432b3f43b";
|
||||
sha256 = "136zjipaz7iikgcgqwdv1mrh3ya996zyzbkdy6d4k07s2h9g7hy6";
|
||||
};
|
||||
};
|
||||
|
||||
sla = {
|
||||
src = fetchFromGitHub {
|
||||
name = "sla";
|
||||
owner = "goldenclone";
|
||||
repo = "nginx-sla";
|
||||
rev = "7778f0125974befbc83751d0e1cadb2dcea57601";
|
||||
sha256 = "1x5hm6r0dkm02ffny8kjd7mmq8przyd9amg2qvy5700x6lb63pbs";
|
||||
};
|
||||
};
|
||||
|
||||
slowfs-cache = {
|
||||
src = fetchFromGitHub {
|
||||
name = "slowfs-cache";
|
||||
owner = "FRiCKLE";
|
||||
repo = "ngx_slowfs_cache";
|
||||
rev = "1.10";
|
||||
sha256 = "1gyza02pcws3zqm1phv3ag50db5gnapxyjwy8skjmvawz7p5bmxr";
|
||||
};
|
||||
};
|
||||
|
||||
sorted-querystring = {
|
||||
src = fetchFromGitHub {
|
||||
name = "sorted-querystring";
|
||||
owner = "wandenberg";
|
||||
repo = "nginx-sorted-querystring-module";
|
||||
rev = "0.3";
|
||||
sha256 = "0p6b0hcws39n27fx4xp9k4hb3pcv7b6kah4qqaj0pzjy3nbp4gj7";
|
||||
};
|
||||
};
|
||||
|
||||
spnego-http-auth = {
|
||||
src = fetchFromGitHub {
|
||||
name = "spnego-http-auth";
|
||||
owner = "stnoonan";
|
||||
repo = "spnego-http-auth-nginx-module";
|
||||
rev = "72c8ee04c81f929ec84d5a6d126f789b77781a8c";
|
||||
sha256 = "05rw3a7cv651951li995r5l1yzz6kwkm2xpbd59jsfzd74bw941i";
|
||||
};
|
||||
};
|
||||
|
||||
statsd = {
|
||||
src = fetchFromGitHub {
|
||||
name = "statsd";
|
||||
owner = "harvesthq";
|
||||
repo = "nginx-statsd";
|
||||
rev = "b970e40467a624ba710c9a5106879a0554413d15";
|
||||
sha256 = "1x8j4i1i2ahrr7qvz03vkldgdjdxi6mx75mzkfizfcc8smr4salr";
|
||||
};
|
||||
};
|
||||
|
||||
stream-sts = {
|
||||
src = fetchFromGitHub {
|
||||
name = "stream-sts";
|
||||
owner = "vozlt";
|
||||
repo = "nginx-module-stream-sts";
|
||||
rev = "v0.1.1";
|
||||
sha256 = "1jdj1kik6l3rl9nyx61xkqk7hmqbncy0rrqjz3dmjqsz92y8zaya";
|
||||
};
|
||||
};
|
||||
|
||||
sts = {
|
||||
src = fetchFromGitHub {
|
||||
name = "sts";
|
||||
owner = "vozlt";
|
||||
repo = "nginx-module-sts";
|
||||
rev = "v0.1.1";
|
||||
sha256 = "0nvb29641x1i7mdbydcny4qwlvdpws38xscxirajd2x7nnfdflrk";
|
||||
};
|
||||
};
|
||||
|
||||
subsFilter = {
|
||||
src = fetchFromGitHub {
|
||||
name = "subsFilter";
|
||||
owner = "yaoweibin";
|
||||
repo = "ngx_http_substitutions_filter_module";
|
||||
rev = "b8a71eacc7f986ba091282ab8b1bbbc6ae1807e0";
|
||||
sha256 = "027jxzx66q9a6ycn47imjh40xmnqr0z423lz0ds3w4rf1c2x130f";
|
||||
};
|
||||
};
|
||||
|
||||
sysguard = {
|
||||
src = fetchFromGitHub {
|
||||
name = "sysguard";
|
||||
owner = "vozlt";
|
||||
repo = "nginx-module-sysguard";
|
||||
rev = "e512897f5aba4f79ccaeeebb51138f1704a58608";
|
||||
sha256 = "19c6w6wscbq9phnx7vzbdf4ay6p2ys0g7kp2rmc9d4fb53phrhfx";
|
||||
};
|
||||
};
|
||||
|
||||
upload = {
|
||||
src = fetchFromGitHub {
|
||||
name = "upload";
|
||||
owner = "fdintino";
|
||||
repo = "nginx-upload-module";
|
||||
rev = "2.3.0";
|
||||
sha256 = "8veZP516oC7TESO368ZsZreetbDt+1eTcamk7P1kWjU=";
|
||||
};
|
||||
};
|
||||
|
||||
upstream-check = {
|
||||
src = fetchFromGitHub {
|
||||
name = "upstream-check";
|
||||
owner = "yaoweibin";
|
||||
repo = "nginx_upstream_check_module";
|
||||
rev = "e538034b6ad7992080d2403d6d3da56e4f7ac01e";
|
||||
sha256 = "06y7k04072xzqyqyb08m0vaaizkp4rfwm0q7i735imbzw2rxb74l";
|
||||
};
|
||||
};
|
||||
|
||||
upstream-tarantool = {
|
||||
src = fetchFromGitHub {
|
||||
name = "upstream-tarantool";
|
||||
owner = "tarantool";
|
||||
repo = "nginx_upstream_module";
|
||||
rev = "v2.7.1";
|
||||
sha256 = "0ya4330in7zjzqw57djv4icpk0n1j98nvf0f8v296yi9rjy054br";
|
||||
};
|
||||
inputs = [ pkgs.msgpuck.dev pkgs.yajl ];
|
||||
};
|
||||
|
||||
url = {
|
||||
src = fetchFromGitHub {
|
||||
name = "url";
|
||||
owner = "vozlt";
|
||||
repo = "nginx-module-url";
|
||||
rev = "9299816ca6bc395625c3683fbd2aa7b916bfe91e";
|
||||
sha256 = "0mk1gjmfnry6hgdsnlavww9bn7223idw50jlkhh5k00q5509w4ip";
|
||||
};
|
||||
};
|
||||
|
||||
video-thumbextractor = {
|
||||
src = fetchFromGitHub {
|
||||
name = "video-thumbextractor";
|
||||
owner = "wandenberg";
|
||||
repo = "nginx-video-thumbextractor-module";
|
||||
rev = "92b80642538eec4cfc98114dec5917b8d820e912";
|
||||
sha256 = "0a8d9ifryhhnll7k7jcsf9frshk5yhpsgz7zgxdmw81wbz5hxklc";
|
||||
};
|
||||
inputs = [ pkgs.ffmpeg ];
|
||||
};
|
||||
|
||||
vod = {
|
||||
src = fetchFromGitHub {
|
||||
name = "vod";
|
||||
owner = "kaltura";
|
||||
repo = "nginx-vod-module";
|
||||
rev = "1.29";
|
||||
sha256 = "1z0ka0cwqbgh3fv2d5yva395sf90626rdzx7lyfrgs89gy4h9nrr";
|
||||
};
|
||||
inputs = with pkgs; [ ffmpeg fdk_aac openssl libxml2 libiconv ];
|
||||
};
|
||||
|
||||
vts = {
|
||||
src = fetchFromGitHub {
|
||||
name = "vts";
|
||||
owner = "vozlt";
|
||||
repo = "nginx-module-vts";
|
||||
rev = "v0.1.18";
|
||||
sha256 = "1jq2s9k7hah3b317hfn9y3g1q4g4x58k209psrfsqs718a9sw8c7";
|
||||
};
|
||||
};
|
||||
}
|
||||
85
pkgs/servers/http/nginx/nix-etag-1.15.4.patch
Normal file
85
pkgs/servers/http/nginx/nix-etag-1.15.4.patch
Normal file
|
|
@ -0,0 +1,85 @@
|
|||
This patch makes it possible to serve static content from Nix store paths, by
|
||||
using the hash of the store path for the ETag header.
|
||||
|
||||
diff --git a/src/http/ngx_http_core_module.c b/src/http/ngx_http_core_module.c
|
||||
index cb49ef74..7b456993 100644
|
||||
--- a/src/http/ngx_http_core_module.c
|
||||
+++ b/src/http/ngx_http_core_module.c
|
||||
@@ -1583,6 +1583,8 @@ ngx_http_set_etag(ngx_http_request_t *r)
|
||||
{
|
||||
ngx_table_elt_t *etag;
|
||||
ngx_http_core_loc_conf_t *clcf;
|
||||
+ u_char *real, *ptr1, *ptr2;
|
||||
+ ngx_err_t err;
|
||||
|
||||
clcf = ngx_http_get_module_loc_conf(r, ngx_http_core_module);
|
||||
|
||||
@@ -1598,16 +1600,60 @@ ngx_http_set_etag(ngx_http_request_t *r)
|
||||
etag->hash = 1;
|
||||
ngx_str_set(&etag->key, "ETag");
|
||||
|
||||
- etag->value.data = ngx_pnalloc(r->pool, NGX_OFF_T_LEN + NGX_TIME_T_LEN + 3);
|
||||
- if (etag->value.data == NULL) {
|
||||
- etag->hash = 0;
|
||||
- return NGX_ERROR;
|
||||
+ err = ngx_errno;
|
||||
+ real = ngx_realpath(clcf->root.data, NULL);
|
||||
+ ngx_set_errno(err);
|
||||
+
|
||||
+ #define NIX_STORE_DIR "@nixStoreDir@"
|
||||
+ #define NIX_STORE_LEN @nixStoreDirLen@
|
||||
+
|
||||
+ if (r->headers_out.last_modified_time == 1
|
||||
+ && real != NULL
|
||||
+ && !ngx_strncmp(real, NIX_STORE_DIR, NIX_STORE_LEN)
|
||||
+ && real[NIX_STORE_LEN] == '/'
|
||||
+ && real[NIX_STORE_LEN + 1] != '\0')
|
||||
+ {
|
||||
+ ptr1 = real + NIX_STORE_LEN;
|
||||
+ *ptr1 = '"';
|
||||
+
|
||||
+ ptr2 = (u_char *) ngx_strchr(ptr1, '-');
|
||||
+
|
||||
+ if (ptr2 == NULL) {
|
||||
+ ngx_free(real);
|
||||
+ etag->hash = 0;
|
||||
+ return NGX_ERROR;
|
||||
+ }
|
||||
+
|
||||
+ *ptr2++ = '"';
|
||||
+ *ptr2 = '\0';
|
||||
+
|
||||
+ etag->value.len = ngx_strlen(ptr1);
|
||||
+ etag->value.data = ngx_pnalloc(r->pool, etag->value.len);
|
||||
+
|
||||
+ if (etag->value.data == NULL) {
|
||||
+ ngx_free(real);
|
||||
+ etag->hash = 0;
|
||||
+ return NGX_ERROR;
|
||||
+ }
|
||||
+
|
||||
+ ngx_memcpy(etag->value.data, ptr1, etag->value.len);
|
||||
+ ngx_http_clear_last_modified(r);
|
||||
+ } else {
|
||||
+ etag->value.data = ngx_pnalloc(r->pool, NGX_OFF_T_LEN + NGX_TIME_T_LEN + 3);
|
||||
+
|
||||
+ if (etag->value.data == NULL) {
|
||||
+ ngx_free(real);
|
||||
+ etag->hash = 0;
|
||||
+ return NGX_ERROR;
|
||||
+ }
|
||||
+
|
||||
+ etag->value.len = ngx_sprintf(etag->value.data, "\"%xT-%xO\"",
|
||||
+ r->headers_out.last_modified_time,
|
||||
+ r->headers_out.content_length_n)
|
||||
+ - etag->value.data;
|
||||
}
|
||||
|
||||
- etag->value.len = ngx_sprintf(etag->value.data, "\"%xT-%xO\"",
|
||||
- r->headers_out.last_modified_time,
|
||||
- r->headers_out.content_length_n)
|
||||
- - etag->value.data;
|
||||
+ ngx_free(real);
|
||||
|
||||
r->headers_out.etag = etag;
|
||||
|
||||
27
pkgs/servers/http/nginx/nix-skip-check-logs-path.patch
Normal file
27
pkgs/servers/http/nginx/nix-skip-check-logs-path.patch
Normal file
|
|
@ -0,0 +1,27 @@
|
|||
diff --git a/auto/install b/auto/install
|
||||
index d884487..dccc411 100644
|
||||
--- a/auto/install
|
||||
+++ b/auto/install
|
||||
@@ -148,12 +148,6 @@ install: build $NGX_INSTALL_PERL_MODULES
|
||||
|| cp conf/nginx.conf '\$(DESTDIR)$NGX_CONF_PATH'
|
||||
cp conf/nginx.conf '\$(DESTDIR)$NGX_CONF_PREFIX/nginx.conf.default'
|
||||
|
||||
- test -d '\$(DESTDIR)`dirname "$NGX_PID_PATH"`' \\
|
||||
- || mkdir -p '\$(DESTDIR)`dirname "$NGX_PID_PATH"`'
|
||||
-
|
||||
- test -d '\$(DESTDIR)`dirname "$NGX_HTTP_LOG_PATH"`' \\
|
||||
- || mkdir -p '\$(DESTDIR)`dirname "$NGX_HTTP_LOG_PATH"`'
|
||||
-
|
||||
test -d '\$(DESTDIR)$NGX_PREFIX/html' \\
|
||||
|| cp -R $NGX_HTML '\$(DESTDIR)$NGX_PREFIX'
|
||||
END
|
||||
@@ -161,9 +155,6 @@ END
|
||||
|
||||
if test -n "$NGX_ERROR_LOG_PATH"; then
|
||||
cat << END >> $NGX_MAKEFILE
|
||||
-
|
||||
- test -d '\$(DESTDIR)`dirname "$NGX_ERROR_LOG_PATH"`' \\
|
||||
- || mkdir -p '\$(DESTDIR)`dirname "$NGX_ERROR_LOG_PATH"`'
|
||||
END
|
||||
|
||||
fi
|
||||
23
pkgs/servers/http/nginx/quic.nix
Normal file
23
pkgs/servers/http/nginx/quic.nix
Normal file
|
|
@ -0,0 +1,23 @@
|
|||
{ callPackage
|
||||
, fetchhg
|
||||
, ...
|
||||
} @ args:
|
||||
|
||||
callPackage ./generic.nix args {
|
||||
src = fetchhg {
|
||||
url = "https://hg.nginx.org/nginx-quic";
|
||||
rev = "5b1011b5702b"; # branch=quic
|
||||
sha256 = "sha256-q1gsJ6CJ7SD1XLitygnRusJ+exFPFg+B3wdsN+NvuL8=";
|
||||
};
|
||||
|
||||
preConfigure = ''
|
||||
ln -s auto/configure configure
|
||||
'';
|
||||
|
||||
configureFlags = [
|
||||
"--with-http_v3_module"
|
||||
"--with-stream_quic_module"
|
||||
];
|
||||
|
||||
version = "1.21.7-quic";
|
||||
}
|
||||
6
pkgs/servers/http/nginx/stable.nix
Normal file
6
pkgs/servers/http/nginx/stable.nix
Normal file
|
|
@ -0,0 +1,6 @@
|
|||
{ callPackage, ... } @ args:
|
||||
|
||||
callPackage ./generic.nix args {
|
||||
version = "1.22.0";
|
||||
sha256 = "0lzb4sn8hv491zad9kbpvka3m5ayjf1pxqbwllri980idyd5cgdk";
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue