xgboost: 0.72 -> 0.90

3 files changed, 9 insertions, 24 deletions

diff --git a/pkgs/development/libraries/xgboost/default.nix b/pkgs/development/libraries/xgboost/default.nix
index b4c79d7f8164c..37e55afc4e9fc 100644
--- a/pkgs/development/libraries/xgboost/default.nix
+++ b/pkgs/development/libraries/xgboost/default.nix
@@ -8,13 +8,13 @@ assert ncclSupport -> cudaSupport;
 
 stdenv.mkDerivation rec {
   name = "xgboost-${version}";
-  version = "0.72";
+  version = "0.90";
 
   # needs submodules
   src = fetchgit {
     url = "https://github.com/dmlc/xgboost";
     rev = "refs/tags/v${version}";
-    sha256 = "1d4kw2jm7d12g8qwi7p9r3429y7sjks9xp9yhvfpx5jh7qakkxj6";
+    sha256 = "1zs15k9crkiq7bnr4gqq53mkn3w8z9dq4nwlavmfcr5xr5gw2pw4";
   };
 
   enableParallelBuilding = true;
diff --git a/pkgs/development/python-modules/xgboost/default.nix b/pkgs/development/python-modules/xgboost/default.nix
index d9b8fc892c165..559789149736e 100644
--- a/pkgs/development/python-modules/xgboost/default.nix
+++ b/pkgs/development/python-modules/xgboost/default.nix
@@ -1,9 +1,15 @@
 { stdenv
 , buildPythonPackage
+, pytest
 , nose
 , scipy
+, scikitlearn
 , xgboost
 , substituteAll
+, pandas
+, matplotlib
+, graphviz
+, datatable
 }:
 
 buildPythonPackage rec {
@@ -21,7 +27,7 @@ buildPythonPackage rec {
 
   propagatedBuildInputs = [ scipy ];
   buildInputs = [ xgboost ];
-  checkInputs = [ nose ];
+  checkInputs = [ nose pytest scikitlearn pandas matplotlib graphviz datatable ];
 
   checkPhase = ''
     ln -sf ../demo .
diff --git a/pkgs/development/python-modules/xgboost/lib-path-for-python.patch b/pkgs/development/python-modules/xgboost/lib-path-for-python.patch
index 68b39dee53e98..86c628c694bff 100644
--- a/pkgs/development/python-modules/xgboost/lib-path-for-python.patch
+++ b/pkgs/development/python-modules/xgboost/lib-path-for-python.patch
@@ -1,24 +1,3 @@
-diff --git a/python-package/setup.py b/python-package/setup.py
-index e6c3386f..4ed0a8bd 100644
---- a/python-package/setup.py
-+++ b/python-package/setup.py
-@@ -16,8 +16,6 @@ libpath_py = os.path.join(CURRENT_DIR, 'xgboost/libpath.py')
- libpath = {'__file__': libpath_py}
- exec(compile(open(libpath_py, "rb").read(), libpath_py, 'exec'), libpath, libpath)
- 
--LIB_PATH = [os.path.relpath(libfile, CURRENT_DIR) for libfile in libpath['find_lib_path']()]
--print("Install libxgboost from: %s" % LIB_PATH)
- # Please use setup_pip.py for generating and deploying pip installation
- # detailed instruction in setup_pip.py
- setup(name='xgboost',
-@@ -35,7 +33,6 @@ setup(name='xgboost',
-       # this will use MANIFEST.in during install where we specify additional files,
-       # this is the golden line
-       include_package_data=True,
--      data_files=[('xgboost', LIB_PATH)],
-       license='Apache-2.0',
-       classifiers=['License :: OSI Approved :: Apache Software License'],
-       url='https://github.com/dmlc/xgboost')
 diff --git a/python-package/xgboost/libpath.py b/python-package/xgboost/libpath.py
 index d87922c0..859a30fb 100644
 --- a/python-package/xgboost/libpath.py