diff options
| author | Phillip Cloud <417981+cpcloud@users.noreply.github.com> | 2022-07-01 08:14:19 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-07-01 15:14:19 +0200 |
| commit | a034fd5235f4cb7d61e4e2ff1e00b9f2af9a053c (patch) | |
| tree | c8051c791633b5754fb1e9331e2a97ab757b254a | |
| parent | 4c35729086139bae51d0575e47687e845f180eb5 (diff) | |
duckdb: add patch to fix list type inference (#178886)
| -rw-r--r-- | pkgs/development/libraries/duckdb/default.nix | 5 | ||||
| -rw-r--r-- | pkgs/development/python-modules/duckdb/default.nix | 9 |
2 files changed, 11 insertions, 3 deletions
diff --git a/pkgs/development/libraries/duckdb/default.nix b/pkgs/development/libraries/duckdb/default.nix index 059c79bfcbb53..d4d45713de254 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://github.com/duckdb/duckdb/commit/26d123fdc57273903573c72b1ddafc52f365e378.patch"; + sha256 = "sha256-ttqs5EjeSLhZQOXc43Y5/N5IYSESQTD1FZWV1uJ15Fo="; + }) ]; postPatch = '' diff --git a/pkgs/development/python-modules/duckdb/default.nix b/pkgs/development/python-modules/duckdb/default.nix index dd7ad8737975a..d7878bd6a44df 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; @@ -45,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 ]; }; } |