From d81e04ede94a2336eb15286eb685594d17cbc94f Mon Sep 17 00:00:00 2001
From: Rob <86313040+robert-manchester@users.noreply.github.com>
Date: Sun, 1 Oct 2023 01:28:56 -0700
Subject: [PATCH] use the full hash and shallow git clone

---
 pkgs/development/libraries/duckdb/default.nix |  6 +-
 .../libraries/duckdb/version.patch            | 64 +++++++++++++++++++
 .../python-modules/duckdb/default.nix         |  7 +-
 .../python-modules/duckdb/setup.patch         | 22 -------
 4 files changed, 71 insertions(+), 28 deletions(-)
 create mode 100644 pkgs/development/libraries/duckdb/version.patch
 delete mode 100644 pkgs/development/python-modules/duckdb/setup.patch

diff --git a/pkgs/development/libraries/duckdb/default.nix b/pkgs/development/libraries/duckdb/default.nix
index 80a110562e48..96fd06754b97 100644
--- a/pkgs/development/libraries/duckdb/default.nix
+++ b/pkgs/development/libraries/duckdb/default.nix
@@ -21,11 +21,13 @@ stdenv.mkDerivation rec {
   src = fetchFromGitHub {
     owner = pname;
     repo = pname;
-    deepClone = true;
+    leaveDotGit = true;
     rev = "v${version}";
     hash = "sha256-NFkeeTpsxazQOstKUUu0b27hXbnq3U5g/+24BIMqtJY=";
   };
 
+  patches = [ ./version.patch ];
+
   nativeBuildInputs = [ cmake git ninja ];
   buildInputs = [ openssl ]
     ++ lib.optionals withJdbc [ openjdk11 ]
@@ -33,8 +35,8 @@ stdenv.mkDerivation rec {
 
   cmakeFlags = [
     # use similar flags to what is defined in ${src}/.github/workflow/{LinuxRelease,OSX}.yml
-    "-DDEBUG_STACKTRACE=1"
     "-DDUCKDB_EXTENSION_CONFIGS=${src}/.github/config/bundled_extensions.cmake"
+    "-DGIT_LAST_TAG=${src.rev}"
     "-DBUILD_ODBC_DRIVER=${enableFeature withOdbc}"
     "-DJDBC_DRIVER=${enableFeature withJdbc}"
   ] ++ lib.optionals doInstallCheck [
diff --git a/pkgs/development/libraries/duckdb/version.patch b/pkgs/development/libraries/duckdb/version.patch
new file mode 100644
index 000000000000..1ba73557b0b5
--- /dev/null
+++ b/pkgs/development/libraries/duckdb/version.patch
@@ -0,0 +1,64 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 2b49e11288..0a3eaa7f4e 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -248,22 +248,13 @@ find_package(Git)
+ if(Git_FOUND)
+   if (NOT DEFINED GIT_COMMIT_HASH)
+     execute_process(
+-            COMMAND ${GIT_EXECUTABLE} log -1 --format=%h
++            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)
++  set(GIT_ITERATION "${GIT_LAST_TAG}-0-g${GIT_COMMIT_HASH}")
+ else()
+   message("Git NOT FOUND")
+ endif()
+diff --git a/scripts/package_build.py b/scripts/package_build.py
+index f0d7535ed0..350d74f877 100644
+--- a/scripts/package_build.py
++++ b/scripts/package_build.py
+@@ -130,7 +130,7 @@ def git_commit_hash():
+     if 'SETUPTOOLS_SCM_PRETEND_HASH' in os.environ:
+         return os.environ['SETUPTOOLS_SCM_PRETEND_HASH']
+     try:
+-        return subprocess.check_output(['git', 'log', '-1', '--format=%h']).strip().decode('utf8')
++        return subprocess.check_output(['git', 'log', '-1', '--format=%H']).strip().decode('utf8')
+     except:
+         return "deadbeeff"
+ 
+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=[
diff --git a/pkgs/development/python-modules/duckdb/default.nix b/pkgs/development/python-modules/duckdb/default.nix
index 4736024d6810..7bf204133f7f 100644
--- a/pkgs/development/python-modules/duckdb/default.nix
+++ b/pkgs/development/python-modules/duckdb/default.nix
@@ -14,12 +14,9 @@
 }:
 
 buildPythonPackage rec {
-  inherit (duckdb) pname version src;
+  inherit (duckdb) pname version src patches;
   format = "setuptools";
 
-  BUILD_HTTPFS = 1;
-  patches = [ ./setup.patch ];
-
   postPatch = ''
     # we can't use sourceRoot otherwise patches don't apply, because the patches apply to the C++ library
     cd tools/pythonpkg
@@ -33,6 +30,8 @@ buildPythonPackage rec {
       rm tests/stubs/test_stubs.py
   '';
 
+  BUILD_HTTPFS = 1;
+  SETUPTOOLS_SCM_PRETEND_VERSION = version;
 
   nativeBuildInputs = [
     git
diff --git a/pkgs/development/python-modules/duckdb/setup.patch b/pkgs/development/python-modules/duckdb/setup.patch
deleted file mode 100644
index 5532cc6c1cfc..000000000000
--- a/pkgs/development/python-modules/duckdb/setup.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-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=[