From 9228e03b1fc1ebae9b6a8868382156bd209e5dbe Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Wed, 11 Dec 2024 23:32:23 +0000 Subject: [PATCH 1/2] mediamtx: 1.9.3 -> 1.10.0 Co-authored-by: Franz Pletz --- pkgs/by-name/me/mediamtx/package.nix | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/pkgs/by-name/me/mediamtx/package.nix b/pkgs/by-name/me/mediamtx/package.nix index c0d1f224b387..f3f4356507c0 100644 --- a/pkgs/by-name/me/mediamtx/package.nix +++ b/pkgs/by-name/me/mediamtx/package.nix @@ -8,23 +8,23 @@ let hlsJs = fetchurl { - url = "https://cdn.jsdelivr.net/npm/hls.js@v1.5.17/dist/hls.min.js"; - hash = "sha256-SEBU6M0D0/bReB+39AK9wxjYpMUn+TOpXGJOJ8yalHA="; + url = "https://cdn.jsdelivr.net/npm/hls.js@v1.5.18/dist/hls.min.js"; + hash = "sha256-X/LXFN4wvkKPx3sT4B25pLTPAV6bTWs+iGS2XT19Ptc="; }; in buildGoModule rec { pname = "mediamtx"; # check for hls.js version updates in internal/servers/hls/hlsjsdownloader/VERSION - version = "1.9.3"; + version = "1.10.0"; src = fetchFromGitHub { owner = "bluenviron"; repo = pname; rev = "v${version}"; - hash = "sha256-2qFJujfnlpmiOAmDBPl3hrbbHDOZOWFy8Yh2VOU0FEI="; + hash = "sha256-nz+8soxZ6lyc0saB4U3tDsTtqA0kV886M95cA3Gn3R0="; }; - vendorHash = "sha256-6MHtYrHZF3Oo53MV1Di0wGw9Xk+2CMei2XeoI0OcKsQ="; + vendorHash = "sha256-Csa8G+ji/OoTItu3XbGOySqmNMVdr7QqE8SNCba8cbI="; postPatch = '' cp ${hlsJs} internal/servers/hls/hls.min.js From 81ab58479676079cae07ae2a8bb58961acfabee2 Mon Sep 17 00:00:00 2001 From: Franz Pletz Date: Thu, 19 Dec 2024 12:13:52 +0100 Subject: [PATCH 2/2] mediamtx: fix build on non-linux platforms --- pkgs/by-name/me/mediamtx/package.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/by-name/me/mediamtx/package.nix b/pkgs/by-name/me/mediamtx/package.nix index f3f4356507c0..ebd2c9f4b3d7 100644 --- a/pkgs/by-name/me/mediamtx/package.nix +++ b/pkgs/by-name/me/mediamtx/package.nix @@ -32,7 +32,7 @@ buildGoModule rec { # disable binary-only rpi camera support substituteInPlace internal/staticsources/rpicamera/camera_disabled.go \ - --replace-fail '!linux || (!arm && !arm64)' 'linux' + --replace-fail '!linux || (!arm && !arm64)' 'linux || !linux' substituteInPlace internal/staticsources/rpicamera/{component,camera,params_serialize,pipe}.go \ --replace-fail '(linux && arm) || (linux && arm64)' 'linux && !linux' substituteInPlace internal/staticsources/rpicamera/component_32.go \