From cdf612bc0d86f02a9f2d837656366872ed4e9376 Mon Sep 17 00:00:00 2001
From: Dmitry Kalinkin <dmitry.kalinkin@gmail.com>
Date: Wed, 4 Apr 2018 14:35:47 -0400
Subject: [PATCH] arrow-cpp,pythonPackages.pyarrow: 0.8.0 -> 0.9.0

---
 pkgs/development/libraries/arrow-cpp/default.nix   |  4 ++--
 .../development/python-modules/pyarrow/default.nix | 14 ++++++++++----
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/libraries/arrow-cpp/default.nix b/pkgs/development/libraries/arrow-cpp/default.nix
index 1db034170ddc..7704cfd1c53b 100644
--- a/pkgs/development/libraries/arrow-cpp/default.nix
+++ b/pkgs/development/libraries/arrow-cpp/default.nix
@@ -2,11 +2,11 @@
 
 stdenv.mkDerivation rec {
   name = "arrow-cpp-${version}";
-  version = "0.8.0";
+  version = "0.9.0";
 
   src = fetchurl {
     url = "mirror://apache/arrow/arrow-${version}/apache-arrow-${version}.tar.gz";
-    sha256 = "1i79sh9ip32agbrn4n51pjn9266i45s8spk5jsi8ax0hqy1vhhmi";
+    sha256 = "16l91fixb5dgx3v6xc73ipn1w1hjgbmijyvs81j7ywzpna2cdcdy";
   };
 
   sourceRoot = "apache-arrow-${version}/cpp";
diff --git a/pkgs/development/python-modules/pyarrow/default.nix b/pkgs/development/python-modules/pyarrow/default.nix
index 11c2868c3370..5939e3a77949 100644
--- a/pkgs/development/python-modules/pyarrow/default.nix
+++ b/pkgs/development/python-modules/pyarrow/default.nix
@@ -1,19 +1,19 @@
-{ lib, buildPythonPackage, fetchurl, arrow-cpp, cmake, cython, futures, numpy, pandas, pytest, parquet-cpp, pkgconfig, setuptools_scm, six }:
+{ lib, buildPythonPackage, fetchurl, arrow-cpp, cmake, cython, futures, numpy, pandas, pytest, pytestrunner, parquet-cpp, pkgconfig, setuptools_scm, six }:
 
 buildPythonPackage rec {
   pname = "pyarrow";
-  version = "0.8.0";
+  version = "0.9.0";
 
   src = fetchurl {
     url = "mirror://apache/arrow/arrow-${version}/apache-arrow-${version}.tar.gz";
-    sha256 = "1i79sh9ip32agbrn4n51pjn9266i45s8spk5jsi8ax0hqy1vhhmi";
+    sha256 = "16l91fixb5dgx3v6xc73ipn1w1hjgbmijyvs81j7ywzpna2cdcdy";
   };
 
   sourceRoot = "apache-arrow-${version}/python";
 
   nativeBuildInputs = [ cmake cython pkgconfig setuptools_scm ];
   propagatedBuildInputs = [ futures numpy six ];
-  checkInputs = [ pandas pytest ];
+  checkInputs = [ pandas pytest pytestrunner ];
 
   PYARROW_BUILD_TYPE = "release";
   PYARROW_CMAKE_OPTIONS = "-DCMAKE_INSTALL_RPATH=${ARROW_HOME}/lib;${PARQUET_HOME}/lib";
@@ -37,6 +37,12 @@ buildPythonPackage rec {
 
     # probably broken on python2
     substituteInPlace pyarrow/tests/test_feather.py --replace "test_unicode_filename" "_disabled"
+
+    # fails "error: [Errno 2] No such file or directory: 'test'" because
+    # nix_run_setup invocation somehow manages to import deserialize_buffer.py
+    # when it is not intended to be imported at all
+    rm pyarrow/tests/deserialize_buffer.py
+    substituteInPlace pyarrow/tests/test_feather.py --replace "test_deserialize_buffer_in_different_process" "_disabled"
   '';
 
   ARROW_HOME = arrow-cpp;