Merge pull request #178450 from cpcloud/bump-duckdb
This commit is contained in:
commit
82cb21e417
|
@ -1,6 +1,7 @@
|
|||
{ lib
|
||||
, stdenv
|
||||
, fetchFromGitHub
|
||||
, fetchpatch
|
||||
, cmake
|
||||
, ninja
|
||||
, openssl
|
||||
|
@ -16,16 +17,24 @@ let
|
|||
in
|
||||
stdenv.mkDerivation rec {
|
||||
pname = "duckdb";
|
||||
version = "0.3.4";
|
||||
version = "0.4.0";
|
||||
|
||||
src = fetchFromGitHub {
|
||||
owner = pname;
|
||||
repo = pname;
|
||||
rev = "v${version}";
|
||||
sha256 = "sha256-2PBc5qe2md87u2nvMTx/XZVzLsr8QrvUkw46/6VTlGs=";
|
||||
sha256 = "sha256-pQ/t26dv9ZWLl0MHcAn0sgxryW2T2hM8XyOkXyfC5CY=";
|
||||
};
|
||||
|
||||
patches = [ ./version.patch ];
|
||||
patches = [
|
||||
./version.patch
|
||||
(fetchpatch {
|
||||
name = "fix-tpce-test.patch";
|
||||
url = "https://github.com/duckdb/duckdb/commit/82e13a4bb9f0683af6c52468af2fb903cce4286d.patch";
|
||||
sha256 = "sha256-m0Bs0DOJQtkadbKZKk88NHyBFJkjxXUsiWYciuRIJLU=";
|
||||
})
|
||||
];
|
||||
|
||||
postPatch = ''
|
||||
substituteInPlace CMakeLists.txt --subst-var-by DUCKDB_VERSION "v${version}"
|
||||
'';
|
||||
|
@ -62,6 +71,7 @@ stdenv.mkDerivation rec {
|
|||
"test/common/test_cast_hugeint.test"
|
||||
"test/sql/copy/csv/test_csv_remote.test"
|
||||
"test/sql/copy/parquet/test_parquet_remote.test"
|
||||
"test/sql/copy/parquet/test_parquet_remote_foreign_files.test"
|
||||
] ++ lib.optionals stdenv.isAarch64 [
|
||||
"test/sql/aggregate/aggregates/test_kurtosis.test"
|
||||
"test/sql/aggregate/aggregates/test_skewness.test"
|
||||
|
|
|
@ -1,9 +1,11 @@
|
|||
{ lib
|
||||
, buildPythonPackage
|
||||
, duckdb
|
||||
, google-cloud-storage
|
||||
, mypy
|
||||
, numpy
|
||||
, pandas
|
||||
, psutil
|
||||
, pybind11
|
||||
, setuptools-scm
|
||||
, pytestCheckHook
|
||||
|
@ -29,7 +31,9 @@ buildPythonPackage rec {
|
|||
];
|
||||
|
||||
checkInputs = [
|
||||
google-cloud-storage
|
||||
mypy
|
||||
psutil
|
||||
pytestCheckHook
|
||||
];
|
||||
|
||||
|
|
Loading…
Reference in a new issue