diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2023-10-28 18:00:57 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-10-28 18:00:57 +0000 |
| commit | 52b6b902433085b135c30c8024e0c5c28ed757c5 (patch) | |
| tree | fe9c934e2ad002d1035b968722a12405cbb55e8d /pkgs/servers/http | |
| parent | 223afab31f02a156627ce5918a083e0a8ef3b8be (diff) | |
| parent | d59ba91d5a8687a8872ce4941ef23533fc2aa009 (diff) | |
Merge master into staging-next
Diffstat (limited to 'pkgs/servers/http')
| -rw-r--r-- | pkgs/servers/http/jetty/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/servers/http/nginx/modules.nix | 22 |
2 files changed, 16 insertions, 10 deletions
diff --git a/pkgs/servers/http/jetty/default.nix b/pkgs/servers/http/jetty/default.nix index ff68d09bbe9dd..1ebd33f51d6f4 100644 --- a/pkgs/servers/http/jetty/default.nix +++ b/pkgs/servers/http/jetty/default.nix @@ -2,10 +2,10 @@ stdenv.mkDerivation rec { pname = "jetty"; - version = "12.0.1"; + version = "12.0.2"; src = fetchurl { url = "mirror://maven/org/eclipse/jetty/jetty-home/${version}/jetty-home-${version}.tar.gz"; - hash = "sha256-7nCai6S3eNly83aUQf0tiLTe+k3ih0cJnGqQvi143LI="; + hash = "sha256-DtlHTXjbr31RmK6ycDdiWOL7jIpbWNh0la90OnOhzvM="; }; dontBuild = true; diff --git a/pkgs/servers/http/nginx/modules.nix b/pkgs/servers/http/nginx/modules.nix index c81449aa762e0..e1ef395f9d926 100644 --- a/pkgs/servers/http/nginx/modules.nix +++ b/pkgs/servers/http/nginx/modules.nix @@ -11,10 +11,11 @@ , curl , expat , fdk_aac -, ffmpeg +, ffmpeg-headless , geoip , libbsd , libiconv +, libjpeg , libkrb5 , libmaxminddb , libmodsecurity @@ -959,17 +960,18 @@ let self = { }; }; - video-thumbextractor = { + video-thumbextractor = rec { name = "video-thumbextractor"; + version = "1.0.0"; src = fetchFromGitHub { name = "video-thumbextractor"; owner = "wandenberg"; repo = "nginx-video-thumbextractor-module"; - rev = "92b80642538eec4cfc98114dec5917b8d820e912"; - sha256 = "0a8d9ifryhhnll7k7jcsf9frshk5yhpsgz7zgxdmw81wbz5hxklc"; + rev = "refs/tags/${version}"; + hash = "sha256-F2cuzCbJdGYX0Zmz9MSXTB7x8+FBR6pPpXtLlDRCcj8="; }; - inputs = [ ffmpeg ]; + inputs = [ ffmpeg-headless libjpeg ]; meta = with lib; { description = "Extract thumbs from a video file"; @@ -985,11 +987,15 @@ let self = { name = "vod"; owner = "kaltura"; repo = "nginx-vod-module"; - rev = "1.31"; - hash = "sha256-ZpeO8QWQ+fGkz08u/zFOq7vj4aHcodzSHNrc1SgGUyc="; + rev = "1.32"; + hash = "sha256-ZpG0oj60D3o7/7uyE8AybCiOtncVe1Jnjaz22sIFypk="; + postFetch = '' + substituteInPlace $out/vod/media_set.h \ + --replace "MAX_CLIPS (128)" "MAX_CLIPS (1024)" + ''; }; - inputs = [ ffmpeg fdk_aac openssl libxml2 libiconv ]; + inputs = [ ffmpeg-headless fdk_aac openssl libxml2 libiconv ]; meta = with lib; { description = "VOD packager"; |