Merge staging-next into staging

pkgs/by-name/to/todoman/package.nix

@@ -90,8 +90,6 @@ python3.pkgs.buildPythonApplication (finalAttrs: {
     "test_xdg_existant"
     # Tests are sensitive to performance
     "test_sorting_fields"
-    # Test fails with urwid 3.0.4, but should work with 3.0.5 again
-    "test_todo_editor_list"
   ];
 
   pythonImportsCheck = [

pkgs/development/python-modules/grpcio-tools/default.nix

@@ -3,6 +3,7 @@
   buildPythonPackage,
   fetchPypi,
   protobuf,
+  cython,
   grpcio,
   setuptools,
 }:
@@ -21,6 +22,11 @@ buildPythonPackage rec {
     hash = "sha256-Sw3YZWAnQxbhVdklFYJ2+FZFCBkwiLxD4g0/Xf+Vays=";
   };
 
+  postPatch = ''
+    substituteInPlace pyproject.toml \
+      --replace-fail "Cython==3.1.1" Cython
+  '';
+
   outputs = [
     "out"
     "dev"
@@ -28,7 +34,10 @@ buildPythonPackage rec {
 
   enableParallelBuilding = true;
 
-  build-system = [ setuptools ];
+  build-system = [
+    cython
+    setuptools
+  ];
 
   pythonRelaxDeps = [
     "protobuf"

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

@@ -7,6 +7,7 @@
   pygobject3,
   pyserial,
   pytestCheckHook,
+  pythonOlder,
   pyzmq,
   setuptools,
   setuptools-scm,
@@ -19,14 +20,14 @@
 
 buildPythonPackage rec {
   pname = "urwid";
-  version = "3.0.4";
+  version = "3.0.5";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "urwid";
     repo = "urwid";
     tag = version;
-    hash = "sha256-mKBLAoEBiqr//1Gl8DAmpUJ9woq6Zf2HhbYEirAoi2M=";
+    hash = "sha256-9ajcpyQTSASz8A4eM78vPjL+9Rk07Q30JmIrSx0Crpo=";
   };
 
   postPatch = ''
@@ -44,12 +45,10 @@ buildPythonPackage rec {
   ];
 
   optional-dependencies = {
+    curses = [ ];
     glib = [ pygobject3 ];
     tornado = [ tornado ];
-    trio = [
-      exceptiongroup
-      trio
-    ];
+    trio = [ trio ] ++ lib.optionals (pythonOlder "3.11") [ exceptiongroup ];
     twisted = [ twisted ];
     zmq = [ pyzmq ];
     serial = [ pyserial ];