Merge staging-next into staging

pkgs/development/libraries/ncurses/default.nix

@@ -65,7 +65,8 @@ stdenv.mkDerivation (finalAttrs: {
     "--with-versioned-syms"
   ]
   ++ lib.optional (!finalAttrs.separateDebugInfo) "--without-debug"
-  ++ lib.optional (!unicodeSupport) "--disable-widec"
+  ++ lib.optional (unicodeSupport && abiVersion == "5") "--enable-widec"
+  ++ lib.optional (!unicodeSupport && abiVersion == "6") "--disable-widec"
   ++ lib.optional (!withCxx) "--without-cxx"
   ++ lib.optional (abiVersion == "5") "--with-abi-version=5"
   ++ lib.optional stdenv.hostPlatform.isNetBSD "--enable-rpath"

pkgs/development/libraries/protobuf/33.nix

@@ -2,8 +2,8 @@
 
 callPackage ./generic.nix (
   {
-    version = "33.0";
-    hash = "sha256-VoMMMyPGAyjhXrYw7muHFBRjYshfqgLZZPPOXCfmmPs=";
+    version = "33.1";
+    hash = "sha256-IW6wLkr/NwIZy5N8s+7Fe9CSexXgliW8QSlvmUD+g5Q=";
   }
   // args
 )

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

@@ -9,12 +9,12 @@
 
 buildPythonPackage rec {
   pname = "protobuf";
-  version = "6.33.0";
+  version = "6.33.1";
   pyproject = true;
 
   src = fetchPypi {
     inherit pname version;
-    hash = "sha256-FAMD1cjSA3cwxUj4x7k7ILsdwwG+KAw3i4K4iUWJyVQ=";
+    hash = "sha256-l/ZXV+jQmHDeb9lzrt25L4VDVgcjXSCy3+2TQF0AyFs=";
   };
 
   build-system = [ setuptools ];