From 4c0970c21684b31da57b608400d885d685e6e58e Mon Sep 17 00:00:00 2001 From: nviets Date: Fri, 31 Mar 2023 19:41:21 -0500 Subject: [PATCH] xgboost: 1.7.4 -> 1.7.5 --- pkgs/development/libraries/xgboost/default.nix | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/pkgs/development/libraries/xgboost/default.nix b/pkgs/development/libraries/xgboost/default.nix index 3fbbb9d1f8c..2f0c7a1d7a4 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 ]