From 87338f90d46e0bd7fbb5d0254b7ca5bfecfa83c5 Mon Sep 17 00:00:00 2001 From: fleaz Date: Fri, 27 Oct 2023 15:45:49 +0200 Subject: [PATCH 1/2] nginxModules.video-thumbextractor: 92b8064 -> 1.0.0 Diff: https://github.com/wandenberg/nginx-video-thumbextractor-module/compare/92b8064...e81f850 --- pkgs/servers/http/nginx/modules.nix | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pkgs/servers/http/nginx/modules.nix b/pkgs/servers/http/nginx/modules.nix index c81449aa762e..9702ab11e8cc 100644 --- a/pkgs/servers/http/nginx/modules.nix +++ b/pkgs/servers/http/nginx/modules.nix @@ -15,6 +15,7 @@ , 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 libjpeg ]; meta = with lib; { description = "Extract thumbs from a video file"; From 55e29313dcc3f812a4d5b4652bc0007882dc22b8 Mon Sep 17 00:00:00 2001 From: fleaz Date: Fri, 27 Oct 2023 16:01:48 +0200 Subject: [PATCH 2/2] nginxModules: Switch from ffmpeg to ffmpeg-headless --- pkgs/servers/http/nginx/modules.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/servers/http/nginx/modules.nix b/pkgs/servers/http/nginx/modules.nix index 9702ab11e8cc..3f8b700ae2f8 100644 --- a/pkgs/servers/http/nginx/modules.nix +++ b/pkgs/servers/http/nginx/modules.nix @@ -11,7 +11,7 @@ , curl , expat , fdk_aac -, ffmpeg +, ffmpeg-headless , geoip , libbsd , libiconv @@ -971,7 +971,7 @@ let self = { hash = "sha256-F2cuzCbJdGYX0Zmz9MSXTB7x8+FBR6pPpXtLlDRCcj8="; }; - inputs = [ ffmpeg libjpeg ]; + inputs = [ ffmpeg-headless libjpeg ]; meta = with lib; { description = "Extract thumbs from a video file"; @@ -991,7 +991,7 @@ let self = { hash = "sha256-ZpeO8QWQ+fGkz08u/zFOq7vj4aHcodzSHNrc1SgGUyc="; }; - inputs = [ ffmpeg fdk_aac openssl libxml2 libiconv ]; + inputs = [ ffmpeg-headless fdk_aac openssl libxml2 libiconv ]; meta = with lib; { description = "VOD packager";