mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-23 23:43:30 +00:00
Merge pull request #134332 from fufexan/auth-a2aclr
This commit is contained in:
commit
188fd378d3
@ -1,4 +1,4 @@
|
||||
{ fetchFromGitHub, lib, pkgs }:
|
||||
{ fetchFromGitHub, fetchFromGitLab, lib, pkgs }:
|
||||
|
||||
let
|
||||
|
||||
@ -33,6 +33,29 @@ in
|
||||
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";
|
||||
@ -50,20 +73,21 @@ in
|
||||
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}
|
||||
'';
|
||||
}; 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";
|
||||
owner = "nginx-modules";
|
||||
repo = "ngx_cache_purge";
|
||||
rev = "2.5.1";
|
||||
sha256 = "0va4jz36mxj76nmq05n3fgnpdad30cslg7c10vnlhdmmic9vqncd";
|
||||
};
|
||||
};
|
||||
@ -71,9 +95,9 @@ in
|
||||
coolkit = {
|
||||
src = fetchFromGitHub {
|
||||
name = "coolkit";
|
||||
owner = "FRiCKLE";
|
||||
repo = "ngx_coolkit";
|
||||
rev = "0.2";
|
||||
owner = "FRiCKLE";
|
||||
repo = "ngx_coolkit";
|
||||
rev = "0.2";
|
||||
sha256 = "1idj0cqmfsdqawjcqpr1fsq670fdki51ksqk2lslfpcs3yrfjpqh";
|
||||
};
|
||||
};
|
||||
@ -141,13 +165,14 @@ in
|
||||
};
|
||||
|
||||
ipscrub = {
|
||||
src = fetchFromGitHub {
|
||||
name = "ipscrub";
|
||||
owner = "masonicboom";
|
||||
repo = "ipscrub";
|
||||
rev = "v1.0.1";
|
||||
sha256 = "0qcx15c8wbsmyz2hkmyy5yd7qn1n84kx9amaxnfxkpqi05vzm1zz";
|
||||
} + "/ipscrub";
|
||||
src = fetchFromGitHub
|
||||
{
|
||||
name = "ipscrub";
|
||||
owner = "masonicboom";
|
||||
repo = "ipscrub";
|
||||
rev = "v1.0.1";
|
||||
sha256 = "0qcx15c8wbsmyz2hkmyy5yd7qn1n84kx9amaxnfxkpqi05vzm1zz";
|
||||
} + "/ipscrub";
|
||||
inputs = [ pkgs.libbsd ];
|
||||
};
|
||||
|
||||
@ -161,7 +186,7 @@ in
|
||||
};
|
||||
};
|
||||
|
||||
live ={
|
||||
live = {
|
||||
src = fetchFromGitHub {
|
||||
name = "live";
|
||||
owner = "arut";
|
||||
@ -228,7 +253,7 @@ in
|
||||
};
|
||||
};
|
||||
|
||||
mpeg-ts ={
|
||||
mpeg-ts = {
|
||||
src = fetchFromGitHub {
|
||||
name = "mpeg-ts";
|
||||
owner = "arut";
|
||||
@ -238,14 +263,15 @@ in
|
||||
};
|
||||
};
|
||||
|
||||
naxsi ={
|
||||
src = fetchFromGitHub {
|
||||
name = "naxsi";
|
||||
owner = "nbs-system";
|
||||
repo = "naxsi";
|
||||
rev = "95ac520eed2ea04098a76305fd0ad7e9158840b7";
|
||||
sha256 = "0b5pnqkgg18kbw5rf2ifiq7lsx5rqmpqsql6hx5ycxjzxj6acfb3";
|
||||
} + "/naxsi_src";
|
||||
naxsi = {
|
||||
src = fetchFromGitHub
|
||||
{
|
||||
name = "naxsi";
|
||||
owner = "nbs-system";
|
||||
repo = "naxsi";
|
||||
rev = "95ac520eed2ea04098a76305fd0ad7e9158840b7";
|
||||
sha256 = "0b5pnqkgg18kbw5rf2ifiq7lsx5rqmpqsql6hx5ycxjzxj6acfb3";
|
||||
} + "/naxsi_src";
|
||||
};
|
||||
|
||||
opentracing = {
|
||||
@ -266,10 +292,10 @@ in
|
||||
version = pkgs.psol.version;
|
||||
|
||||
moduleSrc = fetchFromGitHub {
|
||||
name = "pagespeed";
|
||||
owner = "pagespeed";
|
||||
repo = "ngx_pagespeed";
|
||||
rev = "v${version}-stable";
|
||||
name = "pagespeed";
|
||||
owner = "pagespeed";
|
||||
repo = "ngx_pagespeed";
|
||||
rev = "v${version}-stable";
|
||||
sha256 = "0ry7vmkb2bx0sspl1kgjlrzzz6lbz07313ks2lr80rrdm2zb16wp";
|
||||
};
|
||||
|
||||
@ -278,8 +304,8 @@ in
|
||||
{
|
||||
meta = {
|
||||
description = "PageSpeed module for Nginx";
|
||||
homepage = "https://developers.google.com/speed/pagespeed/module/";
|
||||
license = pkgs.lib.licenses.asl20;
|
||||
homepage = "https://developers.google.com/speed/pagespeed/module/";
|
||||
license = pkgs.lib.licenses.asl20;
|
||||
};
|
||||
}
|
||||
''
|
||||
@ -287,7 +313,8 @@ in
|
||||
chmod -R +w "$out"
|
||||
ln -s "${pkgs.psol}" "$out/psol"
|
||||
'';
|
||||
in {
|
||||
in
|
||||
{
|
||||
src = ngx_pagespeed;
|
||||
inputs = [ pkgs.zlib pkgs.libuuid ]; # psol deps
|
||||
allowMemoryWriteExecute = true;
|
||||
@ -314,7 +341,7 @@ in
|
||||
};
|
||||
};
|
||||
|
||||
push-stream ={
|
||||
push-stream = {
|
||||
src = fetchFromGitHub {
|
||||
name = "push-stream";
|
||||
owner = "wandenberg";
|
||||
@ -378,9 +405,9 @@ in
|
||||
slowfs-cache = {
|
||||
src = fetchFromGitHub {
|
||||
name = "slowfs-cache";
|
||||
owner = "FRiCKLE";
|
||||
repo = "ngx_slowfs_cache";
|
||||
rev = "1.10";
|
||||
owner = "FRiCKLE";
|
||||
repo = "ngx_slowfs_cache";
|
||||
rev = "1.10";
|
||||
sha256 = "1gyza02pcws3zqm1phv3ag50db5gnapxyjwy8skjmvawz7p5bmxr";
|
||||
};
|
||||
};
|
||||
|
Loading…
Reference in New Issue
Block a user