Merge staging-next into staging

pkgs/by-name/bl/blender/package.nix

@@ -16,7 +16,7 @@
   embree,
   fetchzip,
   fetchFromGitHub,
-  ffmpeg,
+  ffmpeg_7,
   fftw,
   fftwFloat,
   freetype,
@@ -239,7 +239,7 @@ stdenv'.mkDerivation (finalAttrs: {
   buildInputs = [
     alembic
     boost
-    ffmpeg
+    ffmpeg_7
     fftw
     fftwFloat
     freetype

pkgs/by-name/ff/ffmpegthumbnailer/package.nix

@@ -2,6 +2,7 @@
   lib,
   stdenv,
   fetchFromGitHub,
+  fetchpatch,
   cmake,
   pkg-config,
   ffmpeg-headless,
@@ -9,17 +10,25 @@
   libjpeg,
 }:
 
-stdenv.mkDerivation {
+stdenv.mkDerivation (finalAttrs: {
   pname = "ffmpegthumbnailer";
-  version = "unstable-2024-01-04";
+  version = "2.2.3";
 
   src = fetchFromGitHub {
     owner = "dirkvdb";
     repo = "ffmpegthumbnailer";
-    rev = "1b5a77983240bcf00a4ef7702c07bcd8f4e5f97c";
-    hash = "sha256-7SPRQMPgdvP7J3HCf7F1eXxZjUH5vCYZ9UOwTUFMLp0=";
+    tag = finalAttrs.version;
+    hash = "sha256-1hVPtCPwfovCtA6aagViUJkYTCFuiFkOqGEqMHIoZe8=";
   };
 
+  patches = [
+    (fetchpatch {
+      name = "ffmpeg-8-fix.patch";
+      url = "https://github.com/dirkvdb/ffmpegthumbnailer/commit/df789ec326ae0f2c619f91c8f2fc8b5e45b50a70.patch";
+      hash = "sha256-PArrcKuaWWA6/H59MbdC36B57GSvvp5sHz24QLTBZYw=";
+    })
+  ];
+
   nativeBuildInputs = [
     cmake
     pkg-config
@@ -60,4 +69,4 @@ stdenv.mkDerivation {
     platforms = platforms.unix;
     mainProgram = "ffmpegthumbnailer";
   };
-}
+})

pkgs/development/python-modules/protobuf/6.nix

@@ -23,8 +23,12 @@ buildPythonPackage rec {
     protobuf
   ];
 
-  # the pypi source archive does not ship tests
-  doCheck = false;
+  doCheck =
+    # https://protobuf.dev/support/cross-version-runtime-guarantee/#backwards
+    # The non-python protobuf provides the protoc binary which must not be newer.
+    assert lib.versionAtLeast version ("6." + protobuf.version);
+    # the pypi source archive does not ship tests
+    false;
 
   pythonImportsCheck = [
     "google.protobuf"
@@ -45,7 +49,9 @@ buildPythonPackage rec {
   meta = {
     description = "Protocol Buffers are Google's data interchange format";
     homepage = "https://developers.google.com/protocol-buffers/";
-    changelog = "https://github.com/protocolbuffers/protobuf/releases/v${version}";
+    changelog = "https://github.com/protocolbuffers/protobuf/releases/v${
+      builtins.substring 2 (-1) version
+    }";
     license = lib.licenses.bsd3;
     maintainers = with lib.maintainers; [ GaetanLepage ];
   };