{python3Packages.,}duckdb: 1.4.1 -> 1.4.3; update python hash in duckdb updateScript (#474603)

This commit is contained in:
Michael Daniels
2026-01-01 16:04:10 +00:00
committed by GitHub
4 changed files with 16 additions and 9 deletions

View File

@@ -10,6 +10,7 @@
unixODBC,
withJdbc ? false,
withOdbc ? false,
versionCheckHook,
}:
let
@@ -56,6 +57,8 @@ stdenv.mkDerivation (finalAttrs: {
doInstallCheck = true;
nativeInstallCheckInputs = [ versionCheckHook ];
installCheckPhase =
let
excludes = map (pattern: "exclude:'${pattern}'") (
@@ -132,6 +135,7 @@ stdenv.mkDerivation (finalAttrs: {
'';
passthru.updateScript = ./update.sh;
passthru.pythonHash = versions.python_hash;
meta = {
changelog = "https://github.com/duckdb/duckdb/releases/tag/v${finalAttrs.version}";

View File

@@ -35,3 +35,6 @@ json=$(nix-prefetch-github "${owner}" "${repo}" --rev "v${tag}")
json_set ".version" "${tag}"
json_set ".rev" "$(jq -r '.rev' <<< "${json}")"
json_set ".hash" "$(jq -r '.hash' <<< "${json}")"
python_json=$(nix-prefetch-github "${owner}" "${repo}-python" --rev "v${tag}")
json_set ".python_hash" "$(jq -r '.hash' <<< "${python_json}")"

View File

@@ -1,5 +1,6 @@
{
"version": "1.4.1",
"rev": "b390a7c3760bd95926fe8aefde20d04b349b472e",
"hash": "sha256-w/mELyRs4B9hJngi1MLed0fHRq/ldkkFV+SDkSxs3O8="
"version": "1.4.3",
"rev": "d1dc88f950d456d72493df452dabdcd13aa413dd",
"hash": "sha256-zYiyY/8mYCyKuSQYNxepGbZPVgdCgULLmhZlWAAW0QA=",
"python_hash": "sha256-qq8y1rdNixQ6oqjKtmIj8IG52gypmP3Qu9ldojPr+Cg="
}

View File

@@ -25,7 +25,7 @@
buildPythonPackage rec {
inherit (duckdb)
pname
version
version # nixpkgs-update: no auto update
;
pyproject = true;
@@ -33,14 +33,13 @@ buildPythonPackage rec {
owner = "duckdb";
repo = "duckdb-python";
tag = "v${version}";
hash = "sha256-cZyiTqu5iW/cqEo42b/XnOG7hJqtQs1h2RXXL392ujA=";
hash = duckdb.passthru.pythonHash;
};
postPatch = ''
# patch cmake to ignore absence of git submodule copy of duckdb
substituteInPlace cmake/duckdb_loader.cmake \
--replace-fail '"''${CMAKE_CURRENT_SOURCE_DIR}/external/duckdb"' \
'"${duckdb.src}"'
# The build depends on a duckdb git submodule
rm -r external/duckdb
ln -s ${duckdb.src} external/duckdb
# replace pybind11[global] with pybind11
substituteInPlace pyproject.toml \