diff --git a/pkgs/development/libraries/duckdb/default.nix b/pkgs/development/libraries/duckdb/default.nix index 8d95bedf0223..d4b62d8ef64e 100644 --- a/pkgs/development/libraries/duckdb/default.nix +++ b/pkgs/development/libraries/duckdb/default.nix @@ -17,21 +17,26 @@ let in stdenv.mkDerivation rec { pname = "duckdb"; - version = "0.6.1"; + version = "0.7.0"; src = fetchFromGitHub { owner = pname; repo = pname; rev = "v${version}"; - sha256 = "sha256-no4fcukEpzKmh2i41sdXGDljGhEDkzk3rYBATqlq6Gw="; + sha256 = "sha256-9m9+fldOgv2QTuUbw5y0zekBxZe8Dd4+8FqR3t3uFGg="; }; - patches = [ ./version.patch ]; + patches = [ ./version.patch ./shell-install.patch ]; postPatch = '' substituteInPlace CMakeLists.txt --subst-var-by DUCKDB_VERSION "v${version}" ''; + nativeBuildInputs = [ cmake ninja ]; + buildInputs = lib.optionals withHttpFs [ openssl ] + ++ lib.optionals withJdbc [ openjdk11 ] + ++ lib.optionals withOdbc [ unixODBC ]; + cmakeFlags = [ "-DBUILD_EXCEL_EXTENSION=ON" "-DBUILD_FTS_EXTENSION=ON" @@ -69,6 +74,10 @@ stdenv.mkDerivation rec { "test/sql/storage/compression/chimp/chimp_read_float.test" "test/sql/storage/compression/patas/patas_compression_ratio.test_coverage" "test/sql/storage/compression/patas/patas_read.test" + "test/sql/json/read_json_objects.test" + "test/sql/json/read_json.test" + "test/sql/copy/parquet/parquet_5968.test" + "test/fuzzer/pedro/buffer_manager_out_of_memory.test" # these are only hidden if no filters are passed in "[!hide]" # this test apparently never terminates @@ -87,11 +96,6 @@ stdenv.mkDerivation rec { runHook postInstallCheck ''; - nativeBuildInputs = [ cmake ninja ]; - buildInputs = lib.optionals withHttpFs [ openssl ] - ++ lib.optionals withJdbc [ openjdk11 ] - ++ lib.optionals withOdbc [ unixODBC ]; - meta = with lib; { homepage = "https://github.com/duckdb/duckdb"; description = "Embeddable SQL OLAP Database Management System"; diff --git a/pkgs/development/libraries/duckdb/shell-install.patch b/pkgs/development/libraries/duckdb/shell-install.patch new file mode 100644 index 000000000000..fb3d5ad8879f --- /dev/null +++ b/pkgs/development/libraries/duckdb/shell-install.patch @@ -0,0 +1,10 @@ +diff --git a/tools/shell/CMakeLists.txt b/tools/shell/CMakeLists.txt +index 4e0352d79d..4f0441a090 100644 +--- a/tools/shell/CMakeLists.txt ++++ b/tools/shell/CMakeLists.txt +@@ -28,4 +28,4 @@ set_target_properties(shell PROPERTIES OUTPUT_NAME duckdb) + set_target_properties(shell PROPERTIES RUNTIME_OUTPUT_DIRECTORY + ${PROJECT_BINARY_DIR}) + +-install(TARGETS shell RUNTIME DESTINATION "${PROJECT_BINARY_DIR}") ++install(TARGETS shell RUNTIME DESTINATION "${INSTALL_BIN_DIR}")