gnu: apache-arrow: Update to 4.0.1.

* gnu/packages/databases.scm (apache-arrow): Update to 4.0.1.
[arguments]: Remove trailing boolean; ensure that xsimd is not downloaded and
built anew.
[inputs]: Add xsimd.
This commit is contained in:
Ricardo Wurmus 2021-06-21 12:15:52 +02:00
parent 71c3f95419
commit bf0f9dd051
No known key found for this signature in database
GPG key ID: 197A5888235FACAC

View file

@ -81,6 +81,7 @@ (define-module (gnu packages databases)
#:use-module (gnu packages check) #:use-module (gnu packages check)
#:use-module (gnu packages cmake) #:use-module (gnu packages cmake)
#:use-module (gnu packages compression) #:use-module (gnu packages compression)
#:use-module (gnu packages cpp)
#:use-module (gnu packages crypto) #:use-module (gnu packages crypto)
#:use-module (gnu packages curl) #:use-module (gnu packages curl)
#:use-module (gnu packages cyrus-sasl) #:use-module (gnu packages cyrus-sasl)
@ -3655,7 +3656,7 @@ (define-public python-pypika
(define-public apache-arrow (define-public apache-arrow
(package (package
(name "apache-arrow") (name "apache-arrow")
(version "3.0.0") (version "4.0.1")
(source (source
(origin (origin
(method git-fetch) (method git-fetch)
@ -3665,21 +3666,22 @@ (define-public apache-arrow
(file-name (git-file-name name version)) (file-name (git-file-name name version))
(sha256 (sha256
(base32 (base32
"03ngddh3r1g6f9aja2jlfksgvgyzmxmfy4bxvzjrcv5fvl5x8ii0")))) "1lcd9gdpwlrr92rm812a5p4l6zx0arwd0zj72a4ga699s1psz8yv"))))
(build-system cmake-build-system) (build-system cmake-build-system)
(arguments (arguments
`(#:tests? #f `(#:tests? #f
#:phases #:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(add-before 'configure 'enter-source-directory (add-before 'configure 'enter-source-directory
(lambda _ (chdir "cpp") #t)) (lambda _ (chdir "cpp")))
(add-after 'unpack 'set-env (add-after 'unpack 'set-env
(lambda _ (lambda _
(substitute* "cpp/cmake_modules/ThirdpartyToolchain.cmake"
(("set\\(xsimd_SOURCE.*") ""))
(setenv "BOOST_ROOT" (assoc-ref %build-inputs "boost")) (setenv "BOOST_ROOT" (assoc-ref %build-inputs "boost"))
(setenv "BROTLI_HOME" (assoc-ref %build-inputs "brotli")) (setenv "BROTLI_HOME" (assoc-ref %build-inputs "brotli"))
(setenv "FLATBUFFERS_HOME" (assoc-ref %build-inputs "flatbuffers")) (setenv "FLATBUFFERS_HOME" (assoc-ref %build-inputs "flatbuffers"))
(setenv "RAPIDJSON_HOME" (assoc-ref %build-inputs "rapidjson")) (setenv "RAPIDJSON_HOME" (assoc-ref %build-inputs "rapidjson")))))
#t)))
#:build-type "Release" #:build-type "Release"
#:configure-flags #:configure-flags
(list "-DARROW_PYTHON=ON" (list "-DARROW_PYTHON=ON"
@ -3701,6 +3703,7 @@ (define-public apache-arrow
;; function, or using pkg-config for packages that do not ;; function, or using pkg-config for packages that do not
;; have this feature ;; have this feature
"-DARROW_DEPENDENCY_SOURCE=SYSTEM" "-DARROW_DEPENDENCY_SOURCE=SYSTEM"
"-Dxsimd_SOURCE=SYSTEM"
;; Split output into its component packages. ;; Split output into its component packages.
(string-append "-DCMAKE_INSTALL_PREFIX=" (string-append "-DCMAKE_INSTALL_PREFIX="
@ -3759,6 +3762,7 @@ (define-public apache-arrow
("re2" ,re2) ("re2" ,re2)
("snappy" ,snappy) ("snappy" ,snappy)
("utf8proc" ,utf8proc) ("utf8proc" ,utf8proc)
("xsimd" ,xsimd)
("zlib" ,zlib) ("zlib" ,zlib)
("zstd" ,zstd "lib"))) ("zstd" ,zstd "lib")))
(native-inputs (native-inputs