@@ -48,14 +48,14 @@ effectiveStdenv.mkDerivation rec {
4848 # in \
4949 # rWrapper.override{ packages = [ xgb ]; }"
5050 pname = lib . optionalString rLibrary "r-" + pnameBase ;
51- version = "2.1.4 " ;
51+ version = "3.0.0 " ;
5252
5353 src = fetchFromGitHub {
5454 owner = "dmlc" ;
5555 repo = pnameBase ;
5656 rev = "v${ version } " ;
5757 fetchSubmodules = true ;
58- hash = "sha256-k1k6K11cWpG6PtzTt99q/rrkN3FyxCVEzfPI9fCTAjM =" ;
58+ hash = "sha256-OwsZ1RzVi6ba+XJqFbIW1Rmqu5OVttBfcpDe84gmQxI =" ;
5959 } ;
6060
6161 nativeBuildInputs =
@@ -88,6 +88,9 @@ effectiveStdenv.mkDerivation rec {
8888 ++ lib . optionals ncclSupport [ "-DUSE_NCCL=ON" ]
8989 ++ lib . optionals rLibrary [ "-DR_LIB=ON" ] ;
9090
91+ # on Darwin, cmake uses find_library to locate R instead of using the PATH
92+ env . NIX_LDFLAGS = "-L${ R } /lib/R/lib" ;
93+
9194 preConfigure = lib . optionals rLibrary ''
9295 substituteInPlace cmake/RPackageInstall.cmake.in --replace "CMD INSTALL" "CMD INSTALL -l $out/library"
9396 export R_LIBS_SITE="$R_LIBS_SITE'' ${R_LIBS_SITE:+:}$out/library"
@@ -124,12 +127,14 @@ effectiveStdenv.mkDerivation rec {
124127 "Approx.PartitionerColumnSplit"
125128 "BroadcastTest.Basic"
126129 "CPUHistogram.BuildHistColSplit"
130+ "CPUHistogram.BuildHistColumnSplit"
127131 "CPUPredictor.CategoricalPredictLeafColumnSplit"
128132 "CPUPredictor.CategoricalPredictionColumnSplit"
129133 "ColumnSplit/ColumnSplitTrainingTest*"
130134 "ColumnSplit/TestApproxColumnSplit*"
131135 "ColumnSplit/TestHistColumnSplit*"
132136 "ColumnSplitObjective/TestColumnSplit*"
137+ "Cpu/ColumnSplitTrainingTest*"
133138 "CommGroupTest.Basic"
134139 "CommTest.Channel"
135140 "CpuPredictor.BasicColumnSplit"
@@ -150,6 +155,8 @@ effectiveStdenv.mkDerivation rec {
150155 "Quantile.SortedDistributedBasic"
151156 "QuantileHist.MultiPartitionerColumnSplit"
152157 "QuantileHist.PartitionerColumnSplit"
158+ "Stats.SampleMean"
159+ "Stats.WeightedSampleMean"
153160 "SimpleDMatrix.ColumnSplit"
154161 "TrackerAPITest.CAPI"
155162 "TrackerTest.AfterShutdown"
@@ -174,7 +181,6 @@ effectiveStdenv.mkDerivation rec {
174181 ''
175182 + ''
176183 cmake --install .
177- cp -r ../rabit/include/rabit $out/include
178184 runHook postInstall
179185 '' ;
180186
0 commit comments