diff --git a/pkgs/by-name/ch/chromaprint/package.nix b/pkgs/by-name/ch/chromaprint/package.nix index 89674dc9f6a0..70e5fd0e8b8a 100644 --- a/pkgs/by-name/ch/chromaprint/package.nix +++ b/pkgs/by-name/ch/chromaprint/package.nix @@ -75,12 +75,12 @@ stdenv.mkDerivation (finalAttrs: { }; # sha256 because actual output of fpcalc is quite long - expectedHash = "c47ae40e02caf798ff5ab4d91ff00cfdca8f6786c581662436941d3e000c9aac"; + expectedHash = "e2895130bcbe7190184379021daa60c5f5d476da4a2fecb06df7160819662e20"; in '' runHook preCheck tests/all_tests - ${lib.optionalString withTools "diff -u <(src/cmd/fpcalc ${exampleAudio} | sha256sum | cut -c-64) <(echo '${expectedHash}')"} + ${lib.optionalString withTools "diff -u <(src/cmd/fpcalc -plain ${exampleAudio} | sha256sum | cut -c-64) <(echo '${expectedHash}')"} runHook postCheck ''; diff --git a/pkgs/by-name/ml/mlt/package.nix b/pkgs/by-name/ml/mlt/package.nix index 41e7af71554e..ae965a28077c 100644 --- a/pkgs/by-name/ml/mlt/package.nix +++ b/pkgs/by-name/ml/mlt/package.nix @@ -6,7 +6,7 @@ cmake, pkg-config, which, - ffmpeg, + ffmpeg_7, fftw, frei0r, libdv, @@ -71,8 +71,8 @@ stdenv.mkDerivation rec { ]; buildInputs = [ - (opencv4.override { inherit ffmpeg; }) - ffmpeg + (opencv4.override { inherit ffmpeg_7; }) + ffmpeg_7 fftw frei0r libdv @@ -137,7 +137,7 @@ stdenv.mkDerivation rec { ''; passthru = { - inherit ffmpeg; + ffmpeg = ffmpeg_7; }; passthru.updateScript = gitUpdater { diff --git a/pkgs/development/libraries/ffmpeg/default.nix b/pkgs/development/libraries/ffmpeg/default.nix index cc0332510307..1db45f0d2feb 100644 --- a/pkgs/development/libraries/ffmpeg/default.nix +++ b/pkgs/development/libraries/ffmpeg/default.nix @@ -65,7 +65,7 @@ rec { # unversioned aliases to allow for quicker migration to new releases, # but can pin one of the versioned variants if they do not work with # the current default version. - ffmpeg = ffmpeg_7; - ffmpeg-headless = ffmpeg_7-headless; - ffmpeg-full = ffmpeg_7-full; + ffmpeg = ffmpeg_8; + ffmpeg-headless = ffmpeg_8-headless; + ffmpeg-full = ffmpeg_8-full; } diff --git a/pkgs/development/libraries/opencv/4.x.nix b/pkgs/development/libraries/opencv/4.x.nix index f3a264cf2644..ef861e8ee153 100644 --- a/pkgs/development/libraries/opencv/4.x.nix +++ b/pkgs/development/libraries/opencv/4.x.nix @@ -58,7 +58,7 @@ enableVtk ? false, vtk, enableFfmpeg ? true, - ffmpeg, + ffmpeg_7, enableGStreamer ? true, elfutils, gst_all_1, @@ -365,7 +365,7 @@ effectiveStdenv.mkDerivation { openjpeg ] ++ optionals enableFfmpeg [ - ffmpeg + ffmpeg_7 ] ++ optionals (enableGStreamer && effectiveStdenv.hostPlatform.isLinux) [ elfutils