duckdb,python311Packages.duckdb: 0.10.0 -> 0.10.1

in

stdenv.mkDerivation (finalAttrs: {

  pname = "duckdb";

  inherit (versions) version;

  inherit (versions) rev version;

  src = fetchFromGitHub {

    # to update run:

  outputs = [ "out" "lib" "dev" ];

  patches = [

    # remove calls to git and set DUCKDB_VERSION to version

    (substituteAll {

      src = ./version.patch;

      version = "v${finalAttrs.version}";

      rev = versions.rev;

    })

    # add missing file needed for httpfs compile

    # remove on next update

    (fetchpatch {

      name = "missing-httpfs-file.patch";

      url = "https://github.com/duckdb/duckdb/commit/3d7aa3ed46ecf5f18122559e385b75f1f5e9aba8.patch";

      hash = "sha256-Q4IHCpMpxn86OquUZdEF7P0nHEPOcWS0TQijTkvBYbQ=";

    })

  ];

  nativeBuildInputs = [ cmake ninja python3 ];

  buildInputs = [ openssl ]

    ++ lib.optionals withJdbc [ openjdk11 ]

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

    "-DBUILD_ODBC_DRIVER=${enableFeature withOdbc}"

    "-DJDBC_DRIVER=${enableFeature withJdbc}"

    "-DOVERRIDE_GIT_DESCRIBE=v${finalAttrs.version}-0-g${finalAttrs.rev}"

  ] ++ lib.optionals finalAttrs.doInstallCheck [

    # development settings

    "-DBUILD_UNITTESTS=ON"

        "test/sql/copy/csv/auto/test_csv_auto.test"

        # test expects installed file timestamp to be > 2024

        "test/sql/table_function/read_text_and_blob.test"

        # can re-enable next update (broken for 0.10.0)

        "test/sql/secrets/create_secret_non_writable_persistent_dir.test"

        # https://github.com/duckdb/duckdb/issues/10722

        "test/sql/types/nested/list/list_aggregate_dict.test"

        # fails with Out of Memory Error

        "test/sql/copy/parquet/batched_write/batch_memory_usage.test"

        # wants http connection

        "test/sql/copy/csv/test_mixed_lines.test"

      ] ++ lib.optionals stdenv.isAarch64 [

        "test/sql/aggregate/aggregates/test_kurtosis.test"

        "test/sql/aggregate/aggregates/test_skewness.test"

diff --git a/CMakeLists.txt b/CMakeLists.txt

index 2b49e11288..0a4a69b9a0 100644

--- a/CMakeLists.txt

+++ b/CMakeLists.txt

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

   set(SUN TRUE)

 endif()

-find_package(Git)

-if(Git_FOUND)

-  if (NOT DEFINED GIT_COMMIT_HASH)

-    execute_process(

-            COMMAND ${GIT_EXECUTABLE} log -1 --format=%h

-            WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}

-            RESULT_VARIABLE GIT_RESULT

-            OUTPUT_VARIABLE GIT_COMMIT_HASH

-            OUTPUT_STRIP_TRAILING_WHITESPACE)

-  endif()

-  execute_process(

-          COMMAND ${GIT_EXECUTABLE} describe --tags --abbrev=0

-          WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}

-          OUTPUT_VARIABLE GIT_LAST_TAG

-          OUTPUT_STRIP_TRAILING_WHITESPACE)

-  execute_process(

-          COMMAND ${GIT_EXECUTABLE} describe --tags --long

-          WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}

-          OUTPUT_VARIABLE GIT_ITERATION

-          OUTPUT_STRIP_TRAILING_WHITESPACE)

-else()

-  message("Git NOT FOUND")

-endif()

-

-if(GIT_RESULT EQUAL "0")

-  string(REGEX REPLACE "v([0-9]+).[0-9]+.[0-9]+" "\\1" DUCKDB_MAJOR_VERSION "${GIT_LAST_TAG}")

-  string(REGEX REPLACE "v[0-9]+.([0-9]+).[0-9]+" "\\1" DUCKDB_MINOR_VERSION "${GIT_LAST_TAG}")

-  string(REGEX REPLACE "v[0-9]+.[0-9]+.([0-9]+)" "\\1" DUCKDB_PATCH_VERSION "${GIT_LAST_TAG}")

-  string(REGEX REPLACE ".*-([0-9]+)-.*" "\\1" DUCKDB_DEV_ITERATION "${GIT_ITERATION}")

-

-  if(DUCKDB_DEV_ITERATION EQUAL 0)

-    # on a tag; directly use the version

-    set(DUCKDB_VERSION "${GIT_LAST_TAG}")

-  else()

-    # not on a tag, increment the patch version by one and add a -devX suffix

-    math(EXPR DUCKDB_PATCH_VERSION "${DUCKDB_PATCH_VERSION}+1")

-    set(DUCKDB_VERSION "v${DUCKDB_MAJOR_VERSION}.${DUCKDB_MINOR_VERSION}.${DUCKDB_PATCH_VERSION}-dev${DUCKDB_DEV_ITERATION}")

-  endif()

-else()

-  # fallback for when building from tarball

-  set(DUCKDB_MAJOR_VERSION 0)

-  set(DUCKDB_MINOR_VERSION 0)

-  set(DUCKDB_PATCH_VERSION 1)

-  set(DUCKDB_DEV_ITERATION 0)

-  set(DUCKDB_VERSION "v${DUCKDB_MAJOR_VERSION}.${DUCKDB_MINOR_VERSION}.${DUCKDB_PATCH_VERSION}-dev${DUCKDB_DEV_ITERATION}")

-endif()

+set(DUCKDB_VERSION "@version@")

+set(GIT_COMMIT_HASH "@rev@")

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

{

  "version": "0.10.0",

  "rev": "20b1486d1192f9fbd2328d1122b5afe5f1747fce",

  "hash": "sha256-qGUq0iYTaLNHKqbXNLRmvqHMqunvIlP991IKb4qdSt4="

  "version": "0.10.1",

  "rev": "4a89d97db8a5a23a15f3025c8d2d2885337c2637",

  "hash": "sha256-/j/DaUzsfACI5Izr4lblkYmIEmKsOXr760UTwC0l/qg="

}

}:

buildPythonPackage rec {

  inherit (duckdb) patches pname src version;

  inherit (duckdb) patches pname rev src version;

  pyproject = true;

  postPatch = (duckdb.postPatch or "") + ''

  env = {

    BUILD_HTTPFS = 1;

    DUCKDB_BUILD_UNITY = 1;

    OVERRIDE_GIT_DESCRIBE="v${version}-0-g${rev}";

  };

  dontPretendSetuptoolsSCMVersion = true;

  nativeBuildInputs = [

    pybind11

    setuptools-scm