From 727cc6aacfb612600e5d762703c49ab63535db18 Mon Sep 17 00:00:00 2001
From: Phillip Cloud <417981+cpcloud@users.noreply.github.com>
Date: Fri, 24 Jun 2022 14:16:56 -0400
Subject: [PATCH 1/4] duckdb: add patch to fix list type inference

---
 pkgs/development/libraries/duckdb/default.nix | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/pkgs/development/libraries/duckdb/default.nix b/pkgs/development/libraries/duckdb/default.nix
index 059c79bfcbb53..7e331322a1867 100644
--- a/pkgs/development/libraries/duckdb/default.nix
+++ b/pkgs/development/libraries/duckdb/default.nix
@@ -33,6 +33,11 @@ stdenv.mkDerivation rec {
       url = "https://github.com/duckdb/duckdb/commit/82e13a4bb9f0683af6c52468af2fb903cce4286d.patch";
       sha256 = "sha256-m0Bs0DOJQtkadbKZKk88NHyBFJkjxXUsiWYciuRIJLU=";
     })
+    (fetchpatch {
+      name = "fix-list-type-metadata.patch";
+      url = "https://patch-diff.githubusercontent.com/raw/duckdb/duckdb/pull/3953.patch";
+      sha256 = "sha256-ttqs5EjeSLhZQOXc43Y5/N5IYSESQTD1FZWV1uJ15Fo=";
+    })
   ];
 
   postPatch = ''

From 6706d7aef0b66f79fdf4927257b521d0c0ad9450 Mon Sep 17 00:00:00 2001
From: Phillip Cloud <417981+cpcloud@users.noreply.github.com>
Date: Fri, 24 Jun 2022 14:17:21 -0400
Subject: [PATCH 2/4] python3Packages.duckdb: use patches from `duckdb` package

---
 pkgs/development/python-modules/duckdb/default.nix | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/duckdb/default.nix b/pkgs/development/python-modules/duckdb/default.nix
index dd7ad8737975a..56390bbcccfbe 100644
--- a/pkgs/development/python-modules/duckdb/default.nix
+++ b/pkgs/development/python-modules/duckdb/default.nix
@@ -1,5 +1,6 @@
 { lib
 , buildPythonPackage
+, fetchpatch
 , duckdb
 , google-cloud-storage
 , mypy
@@ -13,10 +14,12 @@
 
 buildPythonPackage rec {
   pname = "duckdb";
-  inherit (duckdb) version src;
+  inherit (duckdb) version src patches;
   format = "setuptools";
 
-  sourceRoot = "source/tools/pythonpkg";
+  preConfigure = ''
+    cd tools/pythonpkg
+  '';
 
   SETUPTOOLS_SCM_PRETEND_VERSION = version;
 

From 4f1f1686cd36af08aa2a1b4e545a674619b49be9 Mon Sep 17 00:00:00 2001
From: Phillip Cloud <417981+cpcloud@users.noreply.github.com>
Date: Fri, 24 Jun 2022 14:17:39 -0400
Subject: [PATCH 3/4] python3Packages.duckdb: add cpcloud as maintainer

---
 pkgs/development/python-modules/duckdb/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/python-modules/duckdb/default.nix b/pkgs/development/python-modules/duckdb/default.nix
index 56390bbcccfbe..d7878bd6a44df 100644
--- a/pkgs/development/python-modules/duckdb/default.nix
+++ b/pkgs/development/python-modules/duckdb/default.nix
@@ -48,6 +48,6 @@ buildPythonPackage rec {
     description = "Python binding for DuckDB";
     homepage = "https://duckdb.org/";
     license = licenses.mit;
-    maintainers = with maintainers; [ costrouc ];
+    maintainers = with maintainers; [ costrouc cpcloud ];
   };
 }

From d90da9a74d93570f01a4edd22df83f3785608ce3 Mon Sep 17 00:00:00 2001
From: Phillip Cloud <417981+cpcloud@users.noreply.github.com>
Date: Fri, 24 Jun 2022 15:18:46 -0400
Subject: [PATCH 4/4] duckdb: use upstream patch instead of PR

---
 pkgs/development/libraries/duckdb/default.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/development/libraries/duckdb/default.nix b/pkgs/development/libraries/duckdb/default.nix
index 7e331322a1867..d4d45713de254 100644
--- a/pkgs/development/libraries/duckdb/default.nix
+++ b/pkgs/development/libraries/duckdb/default.nix
@@ -35,7 +35,7 @@ stdenv.mkDerivation rec {
     })
     (fetchpatch {
       name = "fix-list-type-metadata.patch";
-      url = "https://patch-diff.githubusercontent.com/raw/duckdb/duckdb/pull/3953.patch";
+      url = "https://github.com/duckdb/duckdb/commit/26d123fdc57273903573c72b1ddafc52f365e378.patch";
       sha256 = "sha256-ttqs5EjeSLhZQOXc43Y5/N5IYSESQTD1FZWV1uJ15Fo=";
     })
   ];