about summary refs log tree commit diff
path: root/pkgs/development/libraries/xgboost
diff options
context:
space:
mode:
authornviets <nathan.viets@gmail.com>2023-03-31 19:41:21 -0500
committernviets <nathan.viets@gmail.com>2023-04-15 10:09:04 -0500
commit4c0970c21684b31da57b608400d885d685e6e58e (patch)
treeeb48cd156faef8e11a51e8752646e00fecd485ab /pkgs/development/libraries/xgboost
parented0a9877559a5ff1949067b0ae5f9a7a70d80f9e (diff)
xgboost: 1.7.4 -> 1.7.5
Diffstat (limited to 'pkgs/development/libraries/xgboost')
-rw-r--r--pkgs/development/libraries/xgboost/default.nix14
1 files changed, 11 insertions, 3 deletions
diff --git a/pkgs/development/libraries/xgboost/default.nix b/pkgs/development/libraries/xgboost/default.nix
index 3fbbb9d1f8cfc..2f0c7a1d7a4c7 100644
--- a/pkgs/development/libraries/xgboost/default.nix
+++ b/pkgs/development/libraries/xgboost/default.nix
@@ -12,7 +12,7 @@
 , llvmPackages
 , R
 , rPackages
-}:
+}@inputs:
 
 assert ncclSupport -> cudaSupport;
 # Disable regular tests when building the R package
@@ -22,6 +22,14 @@ assert ncclSupport -> cudaSupport;
 # tests.
 assert rLibrary -> doCheck != true;
 
+let
+  # This ensures xgboost gets the correct libstdc++ when
+  # built with cuda support. This may be removed once
+  # #226165 rewrites cudaStdenv
+  inherit (cudaPackages) backendStdenv;
+  stdenv = if cudaSupport then backendStdenv else inputs.stdenv;
+in
+
 stdenv.mkDerivation rec {
   pnameBase = "xgboost";
   # prefix with r when building the R library
@@ -37,14 +45,14 @@ stdenv.mkDerivation rec {
   #   in \
   #   rWrapper.override{ packages = [ xgb ]; }"
   pname = lib.optionalString rLibrary "r-" + pnameBase;
-  version = "1.7.4";
+  version = "1.7.5";
 
   src = fetchFromGitHub {
     owner = "dmlc";
     repo = pnameBase;
     rev = "v${version}";
     fetchSubmodules = true;
-    hash = "sha256-HGS9w4g2+Aw5foKjHK/XQvSCnFHUswhzAsQf6XkdvOI=";
+    hash = "sha256-IBqtyz40VVHdncibnZQAe5oDsjb5isWBYQ6pGx/zt38=";
   };
 
   nativeBuildInputs = [ cmake ]