Unverified Commit 335a5494 authored by 7c6f434c's avatar 7c6f434c Committed by GitHub
Browse files

Merge pull request #257452 from purcell/duckdb-0.9 

duckdb: 0.8.1 -> 0.9.0
parents 4f9c54a8 875eb2dc

pkgs/development/libraries/duckdb/default.nix

+7 −15
Original line number Diff line number Diff line
@@ -15,13 +15,13 @@ let 
in

stdenv.mkDerivation rec {

  pname = "duckdb";

  version = "0.8.1";

  version = "0.9.0";



  src = fetchFromGitHub {

    owner = pname;

    repo = pname;

    rev = "v${version}";

    hash = "sha256-LEv9yURkYvONObTbIA4CS+umwCRMH8gRQaDtzbCzID4=";

    hash = "sha256-EKvDH7RwOC4Gu/lturrfnGpzXnJ9azIwAFeuVoa6L/Y=";

  };



  patches = [ ./version.patch ];
@@ -36,19 +36,7 @@ stdenv.mkDerivation rec { 
    ++ lib.optionals withOdbc [ unixODBC ];



  cmakeFlags = [

    "-DBUILD_AUTOCOMPLETE_EXTENSION=ON"

    "-DBUILD_ICU_EXTENSION=ON"

    "-DBUILD_PARQUET_EXTENSION=ON"

    "-DBUILD_TPCH_EXTENSION=ON"

    "-DBUILD_TPCDS_EXTENSION=ON"

    "-DBUILD_FTS_EXTENSION=ON"

    "-DBUILD_HTTPFS_EXTENSION=ON"

    "-DBUILD_VISUALIZER_EXTENSION=ON"

    "-DBUILD_JSON_EXTENSION=ON"

    "-DBUILD_JEMALLOC_EXTENSION=ON"

    "-DBUILD_EXCEL_EXTENSION=ON"

    "-DBUILD_INET_EXTENSION=ON"

    "-DBUILD_TPCE=ON"

    "-DDUCKDB_EXTENSION_CONFIGS=${src}/.github/config/in_tree_extensions.cmake"

    "-DBUILD_ODBC_DRIVER=${enableFeature withOdbc}"

    "-DJDBC_DRIVER=${enableFeature withJdbc}"

  ] ++ lib.optionals doInstallCheck [
@@ -69,6 +57,7 @@ stdenv.mkDerivation rec { 
      excludes = map (pattern: "exclude:'${pattern}'") [

        "[s3]"

        "Test closing database during long running query"

        "Test using a remote optimizer pass in case thats important to someone"

        "test/common/test_cast_hugeint.test"

        "test/sql/copy/csv/test_csv_remote.test"

        "test/sql/copy/parquet/test_parquet_remote.test"
@@ -79,6 +68,8 @@ stdenv.mkDerivation rec { 
        "test/sql/storage/compression/patas/patas_read.test"

        "test/sql/json/read_json_objects.test"

        "test/sql/json/read_json.test"

        "test/sql/json/table/read_json_objects.test"

        "test/sql/json/table/read_json.test"

        "test/sql/copy/parquet/parquet_5968.test"

        "test/fuzzer/pedro/buffer_manager_out_of_memory.test"

        "test/sql/storage/compression/bitpacking/bitpacking_size_calculation.test"
@@ -90,6 +81,7 @@ stdenv.mkDerivation rec { 
        "test/sql/copy/parquet/delta_byte_array_multiple_pages.test"

        "test/sql/copy/csv/test_csv_httpfs_prepared.test"

        "test/sql/copy/csv/test_csv_httpfs.test"

        "test/sql/settings/test_disabled_file_system_httpfs.test"

        "test/sql/copy/csv/parallel/test_parallel_csv.test"

        "test/sql/copy/csv/parallel/csv_parallel_httpfs.test"

        "test/common/test_cast_struct.test"

pkgs/development/libraries/duckdb/version.patch

+24 −2
Original line number Diff line number Diff line 
diff --git a/CMakeLists.txt b/CMakeLists.txt

index 349af6acf7..7ffec0b4cb 100644

index 2b49e11288..0a4a69b9a0 100644

--- a/CMakeLists.txt

+++ b/CMakeLists.txt

@@ -196,52 +196,7 @@ if(${CMAKE_SYSTEM_NAME} STREQUAL "SunOS")

@@ -244,52 +244,7 @@ if(${CMAKE_SYSTEM_NAME} STREQUAL "SunOS")

   set(SUN TRUE)

 endif()
@@ -56,3 +56,25 @@ index 349af6acf7..7ffec0b4cb 100644 
 

 message(STATUS "git hash ${GIT_COMMIT_HASH}, version ${DUCKDB_VERSION}")

 

diff --git a/tools/pythonpkg/setup.py b/tools/pythonpkg/setup.py

index fdf2911019..c363cc518a 100644

--- a/tools/pythonpkg/setup.py

+++ b/tools/pythonpkg/setup.py

@@ -163,8 +163,6 @@ if 'BUILD_HTTPFS' in os.environ:

 for ext in extensions:

     toolchain_args.extend(['-DDUCKDB_EXTENSION_{}_LINKED'.format(ext.upper())])

 

-toolchain_args.extend(['-DDUCKDB_EXTENSION_AUTOLOAD_DEFAULT=1', '-DDUCKDB_EXTENSION_AUTOINSTALL_DEFAULT=1'])

-

 

 class get_pybind_include(object):

     def __init__(self, user=False):

@@ -343,7 +341,7 @@ setup(

     packages=packages,

     include_package_data=True,

     python_requires='>=3.7.0',

-    setup_requires=setup_requires + ["setuptools_scm<7.0.0", 'pybind11>=2.6.0'],

+    setup_requires=setup_requires + ["setuptools_scm", 'pybind11>=2.6.0'],

     use_scm_version=setuptools_scm_conf,

     tests_require=['google-cloud-storage', 'mypy', 'pytest'],

     classifiers=[

pkgs/development/lisp-modules/packages.nix

+45 −9
Original line number Diff line number Diff line 
{ build-asdf-system, spec, quicklispPackagesFor, pkgs, ... }:

{ build-asdf-system, spec, quicklispPackagesFor, stdenv, pkgs, ... }:



let
@@ -80,6 +80,7 @@ let 
      url = "https://github.com/cffi/cffi/archive/3f842b92ef808900bf20dae92c2d74232c2f6d3a.tar.gz";

      sha256 = "1jilvmbbfrmb23j07lwmkbffc6r35wnvas5s4zjc84i856ccclm2";

    };

    patches = optionals stdenv.isDarwin [ ./patches/cffi-libffi-darwin-ffi-h.patch ];

  };



  cl-unicode = build-with-compile-into-pwd {
@@ -668,29 +669,64 @@ let 
    ];

  };



  trivial-clock = build-asdf-system {

    pname = "trivial-clock";

    version = "trunk";

    src = pkgs.fetchFromGitHub {

      owner = "ak-coram";

      repo = "cl-trivial-clock";

      rev = "641e12ab1763914996beb1ceee67aabc9f1a3b1e";

      hash = "sha256-mltQEJ2asxyQ/aS/9BuWmN3XZ9bGmmkopcF5YJU1cPk=";

    };

    systems = [ "trivial-clock" "trivial-clock/test" ];

    lispLibs = [ self.cffi self.fiveam ];

  };



  frugal-uuid = build-asdf-system {

    pname = "frugal-uuid";

    version = "trunk";

    src = pkgs.fetchFromGitHub {

      owner = "ak-coram";

      repo = "cl-frugal-uuid";

      rev = "be27972333a16fc3f16bc7fbf9e3013b2123d75c";

      hash = "sha256-rWO43vWMibF8/OxL70jle5nhd9oRWC7+MI44KWrQD48=";

    };

    systems = [ "frugal-uuid"

                "frugal-uuid/non-frugal"

                "frugal-uuid/benchmark"

                "frugal-uuid/test" ];

    lispLibs = with self; [

      babel

      bordeaux-threads

      fiveam

      ironclad

      trivial-benchmark

      trivial-clock

    ];

  };



  duckdb = build-asdf-system {

    pname = "duckdb";

    version = "trunk";

    src = pkgs.fetchFromGitHub {

      owner = "ak-coram";

      repo = "cl-duckdb";

      rev = "2f0df62f59fbede0addd8d72cf286f4007818a3e";

      hash = "sha256-+jeOuXtCFZwMvF0XvlRaqTNHIAAFKMx6y1pz6u8Wxug=";

      rev = "3ed1df5ba5c738a0b7fed7aa73632ec86f558d09";

      hash = "sha256-AJMxhtDACe6WTwEOxLsC8y6uBaPqjt8HLRw/eIZI02E=";

    };

    systems = [ "duckdb" "duckdb/test" "duckdb/benchmark" ];

    lispLibs = with super; [

    lispLibs = with self; [

      bordeaux-threads

      cffi-libffi

      cl-ascii-table

      cl-spark

      fiveam

      cl-ppcre

      frugal-uuid

      let-plus

      local-time

      local-time-duration

      periods

      trivial-benchmark

      serapeum

      str

      uuid

      float-features

    ];

    nativeLibs = with pkgs; [

      duckdb libffi

pkgs/development/lisp-modules/patches/cffi-libffi-darwin-ffi-h.patch

0 → 100644
+14 −0
Original line number Diff line number Diff line 
--- a/libffi/libffi-types.lisp

+++ b/libffi/libffi-types.lisp

@@ -43,9 +43,6 @@

 

 (pkg-config-cflags "libffi" :optional t)

 

-#+darwin

-(include "ffi/ffi.h")

-#-darwin

 (include "ffi.h")

 

 (cenum status



Diff finished.  Sun Nov 13 00:23:10 2022
 
 No newline at end of file

pkgs/development/python-modules/duckdb-engine/default.nix

+7 −2
Original line number Diff line number Diff line
@@ -14,7 +14,7 @@ 


buildPythonPackage rec {

  pname = "duckdb-engine";

  version = "0.7.3";

  version = "0.9.2";

  format = "pyproject";



  disabled = pythonOlder "3.7";
@@ -23,9 +23,11 @@ buildPythonPackage rec { 
    repo = "duckdb_engine";

    owner = "Mause";

    rev = "refs/tags/v${version}";

    hash = "sha256-Z9m1+Bc/csWKdPDuwf82xX0qOiD1Y5LBgJjUlLntAO8=";

    hash = "sha256-T02nGF+YlughRQPinb0I3NC6xsarh4+qRhG8YfhTvhI=";

  };



  patches = [ ./remote_data.patch ];



  nativeBuildInputs = [

    poetry-core

  ];
@@ -42,8 +44,11 @@ buildPythonPackage rec { 
  disabledTests = [

    # this test tries to download the httpfs extension

    "test_preload_extension"

    "test_motherduck"

    # test should be skipped based on sqlalchemy version but isn't and fails

    "test_commit"

    # rowcount no longer generates an attribute error.

    "test_rowcount"

  ];



  nativeCheckInputs = [