From f940a6d6fb8db8e4e9cd97c271fce55325ee249c Mon Sep 17 00:00:00 2001 From: Onni Hakala Date: Fri, 19 Sep 2025 08:21:07 +0300 Subject: [PATCH] duckdb: 1.3.2 -> 1.4.1 Co-authored-by: sikmir <688044+sikmir@users.noreply.github.com> --- pkgs/by-name/du/duckdb/package.nix | 13 +++++-------- pkgs/by-name/du/duckdb/versions.json | 6 +++--- 2 files changed, 8 insertions(+), 11 deletions(-) diff --git a/pkgs/by-name/du/duckdb/package.nix b/pkgs/by-name/du/duckdb/package.nix index 3cfd451a4681..8a5b6700476d 100644 --- a/pkgs/by-name/du/duckdb/package.nix +++ b/pkgs/by-name/du/duckdb/package.nix @@ -13,7 +13,6 @@ }: let - enableFeature = yes: if yes then "ON" else "OFF"; versions = lib.importJSON ./versions.json; in stdenv.mkDerivation (finalAttrs: { @@ -47,14 +46,12 @@ stdenv.mkDerivation (finalAttrs: { ++ lib.optionals withOdbc [ unixODBC ]; cmakeFlags = [ - "-DDUCKDB_EXTENSION_CONFIGS=${finalAttrs.src}/.github/config/in_tree_extensions.cmake" - "-DBUILD_ODBC_DRIVER=${enableFeature withOdbc}" - "-DJDBC_DRIVER=${enableFeature withJdbc}" - "-DOVERRIDE_GIT_DESCRIBE=v${finalAttrs.version}-0-g${finalAttrs.rev}" - ] - ++ lib.optionals finalAttrs.doInstallCheck [ + (lib.cmakeFeature "DUCKDB_EXTENSION_CONFIGS" "${finalAttrs.src}/.github/config/in_tree_extensions.cmake") + (lib.cmakeBool "BUILD_ODBC_DRIVER" withOdbc) + (lib.cmakeBool "JDBC_DRIVER" withJdbc) + (lib.cmakeFeature "OVERRIDE_GIT_DESCRIBE" "v${finalAttrs.version}-0-g${finalAttrs.rev}") # development settings - "-DBUILD_UNITTESTS=ON" + (lib.cmakeBool "BUILD_UNITTESTS" finalAttrs.doInstallCheck) ]; doInstallCheck = true; diff --git a/pkgs/by-name/du/duckdb/versions.json b/pkgs/by-name/du/duckdb/versions.json index a6127ebe6d3e..0bbd61cd8bbc 100644 --- a/pkgs/by-name/du/duckdb/versions.json +++ b/pkgs/by-name/du/duckdb/versions.json @@ -1,5 +1,5 @@ { - "version": "1.3.2", - "rev": "0b83e5d2f68bc02dfefde74b846bd039f078affa", - "hash": "sha256-6NMQ893g+nOiH8dnb63oa+fZMNXs8N6tJv+Er4x547U=" + "version": "1.4.1", + "rev": "b390a7c3760bd95926fe8aefde20d04b349b472e", + "hash": "sha256-w/mELyRs4B9hJngi1MLed0fHRq/ldkkFV+SDkSxs3O8=" }