From e6b873e84a585c6f90f17ea83cdc706b637f5ecc Mon Sep 17 00:00:00 2001 From: Emily Date: Wed, 13 Nov 2024 16:01:47 +0000 Subject: [PATCH] fbthrift: 2024.03.11.00 -> 2024.11.11.00 We need to explicitly disable the Python bindings now. Diff: https://github.com/facebook/fbthrift/compare/refs/tags/v2024.03.18.00...v2024.11.18.00 (cherry picked from commit dc60c66359534f5f69ab126974b05d8b71f6271d) (cherry picked from commit 2abc54bbb607d99c0bdb642ee22cd45aefba016c) --- pkgs/by-name/fb/fbthrift/package.nix | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkgs/by-name/fb/fbthrift/package.nix b/pkgs/by-name/fb/fbthrift/package.nix index ea531d7978f6..801c1b1dc588 100644 --- a/pkgs/by-name/fb/fbthrift/package.nix +++ b/pkgs/by-name/fb/fbthrift/package.nix @@ -15,6 +15,7 @@ wangle, zlib, zstd, + xxHash, mvfst, apple-sdk_11, darwinMinVersionHook, @@ -22,13 +23,13 @@ stdenv.mkDerivation (finalAttrs: { pname = "fbthrift"; - version = "2024.03.11.00"; + version = "2024.11.18.00"; src = fetchFromGitHub { owner = "facebook"; repo = "fbthrift"; rev = "refs/tags/v${finalAttrs.version}"; - hash = "sha256-iCiiKNDlfKm1Y4SGzcSP6o/OdiRRrj9UEawW6qpBpSY="; + hash = "sha256-dJf4vaIcat24WiKLFNEqeCnJYiO+c5YkuFu+hrS6cPE="; }; nativeBuildInputs = [ @@ -46,6 +47,7 @@ stdenv.mkDerivation (finalAttrs: { wangle zlib zstd + xxHash mvfst ] ++ lib.optionals stdenv.hostPlatform.isDarwin [ @@ -55,6 +57,8 @@ stdenv.mkDerivation (finalAttrs: { cmakeFlags = [ "-DBUILD_SHARED_LIBS=${if stdenv.hostPlatform.isDarwin then "OFF" else "ON"}" + + (lib.cmakeBool "thriftpy" false) ]; meta = {