Merge branch 'staging-next' into staging

pkgs/development/libraries/spandsp/default.nix

@@ -2,6 +2,8 @@
   fetchurl,
   fetchpatch,
   callPackage,
+  lib,
+  stdenv,
 }:
 
 (callPackage ./common.nix { }) rec {
@@ -11,11 +13,31 @@
     sha256 = "0rclrkyspzk575v8fslzjpgp4y2s4x7xk3r55ycvpi4agv33l1fc";
   };
   patches = [
-    (fetchpatch {
-      url = "https://github.com/freeswitch/spandsp/commit/f7b96b08db148763039cf3459d0e00da9636eb92.patch";
-      includes = [ "spandsp-sim/g1050.c" ];
-      hash = "sha256-TwMhWJXQG/UaWddWgice0klp1uATyHMiE6DcsCebXYQ=";
-    })
+    # FIXME: clean up rebuild avoidance on staging.
+    (
+      if
+        lib.elem stdenv.hostPlatform.config [
+          "arm64-apple-darwin"
+          "aarch64-unknown-linux-gnu"
+          "x86_64-apple-darwin"
+          "x86_64-unknown-linux-gnu"
+        ]
+      then
+        fetchpatch {
+          url = "https://github.com/freeswitch/spandsp/commit/f7b96b08db148763039cf3459d0e00da9636eb92.patch";
+          includes = [ "spandsp-sim/g1050.c" ];
+          hash = "sha256-TwMhWJXQG/UaWddWgice0klp1uATyHMiE6DcsCebXYQ=";
+        }
+      else
+        fetchpatch {
+          url = "https://github.com/freeswitch/spandsp/commit/f7b96b08db148763039cf3459d0e00da9636eb92.patch";
+          includes = [
+            "spandsp-sim/g1050.c"
+            "spandsp-sim/test_utils.c"
+          ];
+          hash = "sha256-2MmVgyMUK0Zn+mL7IX57Y7brYpgmt4GVlis5/NstuNM=";
+        }
+    )
     (fetchpatch {
       url = "https://github.com/freeswitch/spandsp/commit/f47bcdc301fbddad44e918939eed1b361882f740.patch";
       hash = "sha256-O+lIC3V92GVFoiHsUQOXkoTN2hJ7v5+LQP7RrAhvwlY=";

pkgs/development/python-modules/aiolimiter/default.nix

@@ -3,20 +3,16 @@
   buildPythonPackage,
   fetchFromGitHub,
   poetry-core,
-  importlib-metadata,
   pytest-asyncio,
   pytest-cov-stub,
   pytestCheckHook,
-  pythonOlder,
   toml,
 }:
 
 buildPythonPackage rec {
   pname = "aiolimiter";
   version = "1.2.1";
-  format = "pyproject";
-
-  disabled = pythonOlder "3.7";
+  pyproject = true;
 
   src = fetchFromGitHub {
     owner = "mjpieters";
@@ -25,9 +21,15 @@ buildPythonPackage rec {
     hash = "sha256-wgHR0GzaPXlhL4ErklFqmWNFO49dvd5X5MgyYHVH4Eo=";
   };
 
-  nativeBuildInputs = [ poetry-core ];
+  # ERROR: '"session"' is not a valid asyncio_default_fixture_loop_scope. Valid scopes are: function, class, module, package, session.
+  # Post 1.2.1, the project switched from tox and is no longer affected, hence fixed in nixpkgs only.
+  postPatch = ''
+    substituteInPlace tox.ini --replace-fail \
+      'asyncio_default_fixture_loop_scope = "session"' \
+      'asyncio_default_fixture_loop_scope = session'
+  '';
 
-  propagatedBuildInputs = lib.optionals (pythonOlder "3.8") [ importlib-metadata ];
+  build-system = [ poetry-core ];
 
   nativeCheckInputs = [
     pytest-asyncio
@@ -38,11 +40,11 @@ buildPythonPackage rec {
 
   pythonImportsCheck = [ "aiolimiter" ];
 
-  meta = with lib; {
+  meta = {
     description = "Implementation of a rate limiter for asyncio";
     homepage = "https://github.com/mjpieters/aiolimiter";
     changelog = "https://github.com/mjpieters/aiolimiter/blob/v${version}/CHANGELOG.md";
-    license = with licenses; [ mit ];
-    maintainers = with maintainers; [ fab ];
+    license = with lib.licenses; [ mit ];
+    maintainers = with lib.maintainers; [ fab ];
   };
 }

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

@@ -9,12 +9,12 @@
 
 buildPythonPackage rec {
   pname = "protobuf";
-  version = "6.32.1";
+  version = "6.33.0";
   pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-7iRp5KAhR0q5uq/qbNBw5b8nx9KUM1BN3qGk7lhQ9o0=";
+    hash = "sha256-FAMD1cjSA3cwxUj4x7k7ILsdwwG+KAw3i4K4iUWJyVQ=";
   };
 
   build-system = [ setuptools ];