From beae056884a1315b9a5d54dd15689712be2182f4 Mon Sep 17 00:00:00 2001
From: Jonathan Ringer <jonringer117@gmail.com>
Date: Fri, 13 Sep 2019 16:06:06 -0700
Subject: [PATCH] pythonPackage.datatable: 0.8.0 -> 0.9.0

---
 .../python-modules/datatable/default.nix      | 26 ++++++-----------
 ...onkeypatch_disable-native-relocation.patch | 28 -------------------
 2 files changed, 8 insertions(+), 46 deletions(-)
 delete mode 100644 pkgs/development/python-modules/datatable/remove-compiler-monkeypatch_disable-native-relocation.patch

diff --git a/pkgs/development/python-modules/datatable/default.nix b/pkgs/development/python-modules/datatable/default.nix
index 200ebef1faaa..81a53ac15f47 100644
--- a/pkgs/development/python-modules/datatable/default.nix
+++ b/pkgs/development/python-modules/datatable/default.nix
@@ -1,32 +1,25 @@
-{ blessed
-, buildPythonPackage
-, fetchPypi
-, lib
+{ stdenv, lib, buildPythonPackage, fetchPypi, substituteAll, pythonOlder
+, blessed
+, docutils
 , libcxx
 , libcxxabi
 , llvm
 , openmp
 , pytest
-, pythonOlder
-, stdenv
-, substituteAll
 , typesentry
 }:
 
 buildPythonPackage rec {
   pname = "datatable";
-  version = "0.8.0";
+  version = "0.9.0";
+  disabled = pythonOlder "3.5";
 
   src = fetchPypi {
     inherit pname version;
-    sha256 = "1s8z81zffrckvdwrrl0pkjc7gsdvjxw59xgg6ck81dl7gkh5grjk";
+    sha256 = "1shwjkm9nyaj6asn57vwdd74pn13pggh14r6dzv729lzxm7nm65f";
   };
 
-  patches = [
-    # Disable the compiler monkey patching, and remove the task that's copying
-    # the native dependencies to the build directory.
-    ./remove-compiler-monkeypatch_disable-native-relocation.patch
-  ] ++ lib.optionals stdenv.isDarwin [
+  patches = lib.optionals stdenv.isDarwin [
     # Replace the library auto-detection with hardcoded paths.
     (substituteAll {
       src = ./hardcode-library-paths.patch;
@@ -37,16 +30,13 @@ buildPythonPackage rec {
     })
   ];
 
-  disabled = pythonOlder "3.5";
-
   propagatedBuildInputs = [ typesentry blessed ];
   buildInputs = [ llvm ] ++ lib.optionals stdenv.isDarwin [ openmp ];
-  checkInputs = [ pytest ];
+  checkInputs = [ docutils pytest ];
 
   LLVM = llvm;
 
   checkPhase = ''
-    # py.test adds local datatable to path, which doesn't contain built native library.
     mv datatable datatable.hidden
     pytest
   '';
diff --git a/pkgs/development/python-modules/datatable/remove-compiler-monkeypatch_disable-native-relocation.patch b/pkgs/development/python-modules/datatable/remove-compiler-monkeypatch_disable-native-relocation.patch
deleted file mode 100644
index 7cdbfa907241..000000000000
--- a/pkgs/development/python-modules/datatable/remove-compiler-monkeypatch_disable-native-relocation.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff --git a/setup.py b/setup.py
-index 58fc875..8032561 100644
---- a/setup.py
-+++ b/setup.py
-@@ -141,23 +141,6 @@ if cmd in ("build", "bdist_wheel", "build_ext", "install"):
-     extra_link_args = get_extra_link_args()
-     cpp_files = get_c_sources("c")
- 
--    with TaskContext("Copy dynamic libraries") as log:
--        # Copy system libraries into the datatable/lib folder, so that they can
--        # be packaged with the wheel
--        libs = find_linked_dynamic_libraries()
--        for libpath in libs:
--            trgfile = os.path.join("datatable", "lib",
--                                   os.path.basename(libpath))
--            if os.path.exists(trgfile):
--                log.info("File %s already exists, skipped" % trgfile)
--            else:
--                log.info("Copying %s to %s" % (libpath, trgfile))
--                shutil.copy(libpath, trgfile)
--
--    if ismacos():
--        monkey_patch_compiler()
--
--
- # Create the git version file
- if cmd in ("build", "sdist", "bdist_wheel", "install"):
-     make_git_version_file(True)