Merge remote-tracking branch 'origin/master' into haskell-updates

1 files changed, 19 insertions, 16 deletions

diff --git a/pkgs/development/misc/datafusion/default.nix b/pkgs/development/misc/datafusion/default.nix
index a2e90dab612..f048839292b 100644
--- a/pkgs/development/misc/datafusion/default.nix
+++ b/pkgs/development/misc/datafusion/default.nix
@@ -1,35 +1,38 @@
-{ stdenv
-, lib
+{ lib
 , rustPlatform
 , fetchFromGitHub
+, stdenv
+, darwin
 }:
-let
+
+rustPlatform.buildRustPackage rec {
   pname = "datafusion-cli";
-  version = "unstable-2022-04-08";
-in
-rustPlatform.buildRustPackage {
-  inherit pname version;
+  version = "15.0.0";
 
-  # TODO the crate has been yanked so not the best source
-  # the repo is a workspace with a lock inside a subdirectory, making
-  # compilation from github source not straightforward
-  # re-evaluate strategy on release after 7.0.0
   src = fetchFromGitHub {
     owner = "apache";
     repo = "arrow-datafusion";
-    rev = "9cbde6d0e30fd29f59b0a16e309bdb0843cc7c64";
-    sha256 = "sha256-XXd9jvWVivOBRS0PVOU9F4RQ6MrS/q78JF4S6Htd67w=";
+    rev = version;
+    sha256 = "sha256-s+gQoczTesJGOpz4W5hBPDdxo4eQnf+D10+V2kx65Io=";
   };
   sourceRoot = "source/datafusion-cli";
 
-  cargoSha256 = "sha256-Q0SjVofl1+sex15sSU9s7PgKeHG2b0gJPSqz7YZFOVs=";
+  cargoSha256 = "sha256-w+/5Ig+U8y4nwu7QisnZvc3UlZaEU/kovV6birOWndE=";
+
+  buildInputs = lib.optional stdenv.isDarwin [
+    darwin.apple_sdk.frameworks.Security
+  ];
+
+  checkFlags = [
+    # fails even outside the Nix sandbox
+    "--skip=object_storage::tests::s3_region_validation"
+  ];
 
   meta = with lib; {
-    broken = stdenv.isDarwin;
     description = "cli for Apache Arrow DataFusion";
     homepage = "https://arrow.apache.org/datafusion";
+    changelog = "https://github.com/apache/arrow-datafusion/blob/${version}/datafusion/CHANGELOG.md";
     license = licenses.asl20;
     maintainers = with maintainers; [ happysalada ];
-    platforms = platforms.unix;
   };
 }