From 509f33b9956bcd33db149b8e4a957a1d0bad9079 Mon Sep 17 00:00:00 2001
From: Emily <vcs@emily.moe>
Date: Wed, 13 Nov 2024 16:07:49 +0000
Subject: [PATCH] edencommon: 2024.03.11.00 -> 2024.11.18.00

Diff: https://github.com/facebookexperimental/edencommon/compare/refs/tags/v2024.03.11.00...v2024.11.18.00
---
 pkgs/by-name/ed/edencommon/package.nix | 20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/ed/edencommon/package.nix b/pkgs/by-name/ed/edencommon/package.nix
index 0fef1acdb9a2..44c2ad509db9 100644
--- a/pkgs/by-name/ed/edencommon/package.nix
+++ b/pkgs/by-name/ed/edencommon/package.nix
@@ -10,6 +10,9 @@
   glog,
   gflags,
   folly,
+  fb303,
+  wangle,
+  fbthrift,
   gtest,
   apple-sdk_11,
   darwinMinVersionHook,
@@ -17,13 +20,13 @@
 
 stdenv.mkDerivation (finalAttrs: {
   pname = "edencommon";
-  version = "2024.03.11.00";
+  version = "2024.11.18.00";
 
   src = fetchFromGitHub {
     owner = "facebookexperimental";
     repo = "edencommon";
     rev = "refs/tags/v${finalAttrs.version}";
-    hash = "sha256-1z4QicS98juv4bUEbHBkCjVJHEhnoJyLYp4zMHmDbMg=";
+    hash = "sha256-pVPkH80vowdpwWv/h6ovEk335OeI6/0k0cAFhhFqSDM=";
   };
 
   patches = lib.optionals (stdenv.hostPlatform.isDarwin && stdenv.hostPlatform.isx86_64) [
@@ -41,6 +44,9 @@ stdenv.mkDerivation (finalAttrs: {
       glog
       gflags
       folly
+      fb303
+      wangle
+      fbthrift
       gtest
     ]
     ++ lib.optionals stdenv.hostPlatform.isDarwin [
@@ -48,6 +54,16 @@ stdenv.mkDerivation (finalAttrs: {
       (darwinMinVersionHook "11.0")
     ];
 
+  postPatch = ''
+    # The CMake build requires the FBThrift Python support even though
+    # it’s not used, presumably because of the relevant code having
+    # been moved in from another repository.
+    substituteInPlace CMakeLists.txt \
+      --replace-fail \
+        'find_package(FBThrift CONFIG REQUIRED COMPONENTS cpp2 py)' \
+        'find_package(FBThrift CONFIG REQUIRED COMPONENTS cpp2)'
+  '';
+
   meta = {
     description = "Shared library for Meta's source control filesystem tools (EdenFS and Watchman)";
     homepage = "https://github.com/facebookexperimental/edencommon";