From 69f859f8069e6a6035d2fc93ae013303f589e486 Mon Sep 17 00:00:00 2001
From: Nathan Viets <nathan.g.viets@gmail.com>
Date: Fri, 17 Feb 2023 07:49:31 -0500
Subject: [PATCH] xgboost: 1.7.3 -> 1.7.4

---
 pkgs/development/libraries/xgboost/default.nix | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/xgboost/default.nix b/pkgs/development/libraries/xgboost/default.nix
index 4370a27012d..c57bc7c7f17 100644
--- a/pkgs/development/libraries/xgboost/default.nix
+++ b/pkgs/development/libraries/xgboost/default.nix
@@ -25,14 +25,14 @@ stdenv.mkDerivation rec {
   #   in \
   #   rWrapper.override{ packages = [ xgb ]; }"
   pname = lib.optionalString rLibrary "r-" + pnameBase;
-  version = "1.7.3";
+  version = "1.7.4";
 
   src = fetchFromGitHub {
     owner = "dmlc";
     repo = pnameBase;
     rev = "v${version}";
     fetchSubmodules = true;
-    hash = "sha256-unTss2byytG8KUQfg5s34YpRuHHDLo7D/ZickHhz1AE=";
+    hash = "sha256-HGS9w4g2+Aw5foKjHK/XQvSCnFHUswhzAsQf6XkdvOI=";
   };
 
   nativeBuildInputs = [ cmake ]
@@ -74,6 +74,18 @@ stdenv.mkDerivation rec {
     }
   '';
 
+  # Disable finicky tests from dmlc core that fail in Hydra. XGboost team
+  # confirmed xgboost itself does not use this part of the dmlc code.
+  GTEST_FILTER =
+    let
+      # Upstream Issue: https://github.com/xtensor-stack/xsimd/issues/456
+      filteredTests = lib.optionals stdenv.hostPlatform.isDarwin [
+        "ThreadGroup.TimerThread"
+        "ThreadGroup.TimerThreadSimple"
+      ];
+    in
+    "-${builtins.concatStringsSep ":" filteredTests}";
+
   installPhase =
     let libname = "libxgboost${stdenv.hostPlatform.extensions.sharedLibrary}";
     in ''