diff --git a/pkgs/tools/misc/tdarr/common.nix b/pkgs/tools/misc/tdarr/common.nix index b3d7c2e51bdc..06057ded501e 100644 --- a/pkgs/tools/misc/tdarr/common.nix +++ b/pkgs/tools/misc/tdarr/common.nix @@ -6,7 +6,7 @@ makeWrapper, copyDesktopItems, makeDesktopItem, - ffmpeg, + jellyfin-ffmpeg, handbrake, mkvtoolnix, ccextractor, @@ -24,6 +24,7 @@ tesseract4, perl, apprise, + openssl, }: { pname, @@ -51,7 +52,7 @@ let binPath = lib.makeBinPath ( [ - ffmpeg + jellyfin-ffmpeg mkvtoolnix ] ++ includeInPath @@ -77,10 +78,10 @@ let ''_cfg="$rootDataPath/configs/${componentName}_Config.json"; if [ -f "$_cfg" ]; then grep -q ffprobePath "$_cfg" || sed -i '1s/{/{"ffprobePath":"",/' "$_cfg"; else printf '{"ffprobePath":""}' > "$_cfg"; fi'' "--set-default" "ffmpegPath" - "${ffmpeg}/bin/ffmpeg" + "${jellyfin-ffmpeg}/bin/ffmpeg" "--set-default" "ffprobePath" - "${ffmpeg}/bin/ffprobe" + "${jellyfin-ffmpeg}/bin/ffprobe" "--set-default" "mkvpropeditPath" "${mkvtoolnix}/bin/mkvpropedit" @@ -100,7 +101,7 @@ let in stdenv.mkDerivation (finalAttrs: { inherit pname; - version = "2.78.01"; + version = "2.81.01"; src = fetchzip { url = "https://storage.tdarr.io/versions/${finalAttrs.version}/${platform}/${componentName}.zip"; @@ -129,6 +130,7 @@ stdenv.mkDerivation (finalAttrs: { libxcursor libxfixes apprise + openssl ]; postPatch = '' diff --git a/pkgs/tools/misc/tdarr/node.nix b/pkgs/tools/misc/tdarr/node.nix index eefa4530f5d3..f6b14934763f 100644 --- a/pkgs/tools/misc/tdarr/node.nix +++ b/pkgs/tools/misc/tdarr/node.nix @@ -5,10 +5,10 @@ callPackage ./common.nix { } { component = "node"; hashes = { - linux_x64 = "sha256-5wxf5E1M1bBXrv8/cBUZ7Edg90TnxY6UeXZpmkyJC0U="; - linux_arm64 = "sha256-jnrXHv5/u9YaMCwKy5QzcilRdEE60PQtTTMhoVsMGKw="; - darwin_x64 = "sha256-Ri4lop0XyE2oFUn74ZIx1UMhf/wVILnlwlRlIHzwr/A="; - darwin_arm64 = "sha256-ZSMsngeJM6QX0Z0J0ARH8Jo7NcH3CMwn9/Rk11VU3k8="; + linux_x64 = "sha256-hF4W72VEWAryCoLZecrwdT98iN3sARaPWJnEApFeHCw="; + linux_arm64 = "sha256-wJ3fZLJKUHama1P6YTslTb3fiYI4qjGm5VdHKGcG8k4="; + darwin_x64 = "sha256-cL6REyGqwFemXLMkgAXy9PTS0j7maT1lBNzckTL4Ez0="; + darwin_arm64 = "sha256-0LFTw4fbdFXcEYGVk1C1UOVRAh/MfGctFzfKB/mr6lM="; }; includeInPath = [ ccextractor ]; diff --git a/pkgs/tools/misc/tdarr/server.nix b/pkgs/tools/misc/tdarr/server.nix index b07c443c2176..5da81ebb81c6 100644 --- a/pkgs/tools/misc/tdarr/server.nix +++ b/pkgs/tools/misc/tdarr/server.nix @@ -5,10 +5,10 @@ callPackage ./common.nix { } { component = "server"; hashes = { - linux_x64 = "sha256-biFiDQNDbPtqWHMi0JkuYGaX+Y9aNoXdYd+WwILJ3lo="; - linux_arm64 = "sha256-KmG2hHiR7aKDS2qJ/fN8T3pppt6wNaVp4ZGaanxqPYU="; - darwin_x64 = "sha256-buDJ2OnjjYSZi/vwPL35TYTYdJq7Xg9VckCP/DSpNEU="; - darwin_arm64 = "sha256-CDuajhnC/KdyCqtHmqV1oXmXmqU6RksQc/VVJtc0p10="; + linux_x64 = "sha256-iTxbPJ1XmmGInpCz4cbwnW8u5uV3DpMyXGMuKmGXOlc="; + linux_arm64 = "sha256-G3jK5pqKMKiciajaMku9S/q7upWcxmfXwZQ1tWhGaDg="; + darwin_x64 = "sha256-xnOI47sMZlTJNkTFrQCsioLQsjeOCVu1RZLgpoiRhTU="; + darwin_arm64 = "sha256-wRuTyUmRWYEMMCgScr+yTbsU1VSXypz9T8WhgyZE2TM="; }; includeInPath = [ ccextractor ];