diff --git a/pkgs/by-name/du/duckdb/package.nix b/pkgs/by-name/du/duckdb/package.nix index 9849e2f7e01b..905eab0038ee 100644 --- a/pkgs/by-name/du/duckdb/package.nix +++ b/pkgs/by-name/du/duckdb/package.nix @@ -122,6 +122,24 @@ stdenv.mkDerivation (finalAttrs: { "test/sql/function/list/aggregates/skewness.test" "test/sql/aggregate/aggregates/histogram_table_function.test" ] + ++ lib.optionals stdenv.hostPlatform.isDarwin [ + # SIGTRAP during iejoin tests on aarch64-darwin (with and without sandbox) + # iejoin implementation rewritten in 1.5.x with new parallel task scheduling + "test/sql/join/iejoin/iejoin_issue_6861.test" + "test/sql/join/iejoin/iejoin_issue_7278.test" + "test/sql/join/iejoin/iejoin_projection_maps.test" + "test/sql/join/iejoin/merge_join_switch.test" + "test/sql/join/iejoin/predicate_expressions.test" + "test/sql/join/iejoin/test_countzeros.test" + "test/sql/join/iejoin/test_ieantijoin.test" + "test/sql/join/iejoin/test_iejoin.test" + "test/sql/join/iejoin/test_iejoin_east_west.test" + "test/sql/join/iejoin/test_iejoin_events.test" + "test/sql/join/iejoin/test_iejoin_null_keys.test" + "test/sql/join/iejoin/test_iejoin_overlaps.test" + "test/sql/join/iejoin/test_iejoin_predicate.test" + "test/sql/join/iejoin/test_iesemijoin.test" + ] ); LD_LIBRARY_PATH = lib.optionalString stdenv.hostPlatform.isDarwin "DY" + "LD_LIBRARY_PATH"; in @@ -144,6 +162,7 @@ stdenv.mkDerivation (finalAttrs: { license = lib.licenses.mit; mainProgram = "duckdb"; maintainers = with lib.maintainers; [ + cameronraysmith costrouc cpcloud ]; diff --git a/pkgs/by-name/du/duckdb/versions.json b/pkgs/by-name/du/duckdb/versions.json index c570a27d61ca..14c629fe5313 100644 --- a/pkgs/by-name/du/duckdb/versions.json +++ b/pkgs/by-name/du/duckdb/versions.json @@ -1,6 +1,6 @@ { - "version": "1.4.4", - "rev": "6ddac802ffa9bcfbcc3f5f0d71de5dff9b0bc250", - "hash": "sha256-h9Mldv29u47DnFOCN28HBHWz8daFGE/Nj1JcnNhhQ5Q=", - "python_hash": "sha256-860KbaM7Ojp4Qwm5x5WPQg176XKOYayk8pLVaUAuC4M=" + "version": "1.5.1", + "rev": "7dbb2e646fea939a89f10a55aa98c474cbb0c098", + "hash": "sha256-FygBpfhvezvUbI969Dta+vZOPt6BnSW2d5gO4I4oB2A=", + "python_hash": "sha256-ZB+Zcxg5VjBzfTkQk7TxoP9pw+hvOXpB2qqnqqmjhxM=" } diff --git a/pkgs/development/python-modules/duckdb/default.nix b/pkgs/development/python-modules/duckdb/default.nix index 2f9287fd4b35..9736c5eeae5f 100644 --- a/pkgs/development/python-modules/duckdb/default.nix +++ b/pkgs/development/python-modules/duckdb/default.nix @@ -145,6 +145,9 @@ buildPythonPackage rec { description = "Python binding for DuckDB"; homepage = "https://duckdb.org/"; license = lib.licenses.mit; - maintainers = with lib.maintainers; [ cpcloud ]; + maintainers = with lib.maintainers; [ + cameronraysmith + cpcloud + ]; }; }