From db5e5b3bfcd1d8f9a8eda716be181fceeecc40cf Mon Sep 17 00:00:00 2001 From: Gaetan Lepage Date: Thu, 13 Nov 2025 09:07:52 +0000 Subject: [PATCH 1/2] protobuf: 33.0 -> 33.1 Diff: https://github.com/protocolbuffers/protobuf/compare/v33.0...v33.1 Changelog: https://github.com/protocolbuffers/protobuf/releases/tag/v33.1 --- pkgs/development/libraries/protobuf/33.nix | 4 ++-- pkgs/development/python-modules/protobuf/6.nix | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/pkgs/development/libraries/protobuf/33.nix b/pkgs/development/libraries/protobuf/33.nix index 24ace1256005..6365e5fac5a5 100644 --- a/pkgs/development/libraries/protobuf/33.nix +++ b/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 ) diff --git a/pkgs/development/python-modules/protobuf/6.nix b/pkgs/development/python-modules/protobuf/6.nix index f5ce6a82e716..bba5b5da6dac 100644 --- a/pkgs/development/python-modules/protobuf/6.nix +++ b/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 ]; From f710823c96adcfa943b9f504c99206a7e2e6365b Mon Sep 17 00:00:00 2001 From: winston Date: Sat, 15 Nov 2025 16:27:13 +0100 Subject: [PATCH 2/2] ncurses: set unicodeSupport flag according to abiVersion --- pkgs/development/libraries/ncurses/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkgs/development/libraries/ncurses/default.nix b/pkgs/development/libraries/ncurses/default.nix index fdaed1c50758..39e73047f2bd 100644 --- a/pkgs/development/libraries/ncurses/default.nix +++ b/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"