duckdb: 1.3.2 -> 1.4.1
Co-authored-by: sikmir <688044+sikmir@users.noreply.github.com>
This commit is contained in:
@@ -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;
|
||||
|
||||
@@ -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="
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user