diff --git a/pkgs/by-name/ha/harlequin/package.nix b/pkgs/by-name/ha/harlequin/package.nix index c4bbad05fdcf..2d811b9825b2 100644 --- a/pkgs/by-name/ha/harlequin/package.nix +++ b/pkgs/by-name/ha/harlequin/package.nix @@ -25,6 +25,7 @@ python3Packages.buildPythonApplication rec { "numpy" "pyarrow" "textual" + "syrupy" ]; build-system = with python3Packages; [ poetry-core ]; diff --git a/pkgs/development/libraries/duckdb/update.sh b/pkgs/development/libraries/duckdb/update.sh index f3acd176ee86..c440e2d5b1e2 100755 --- a/pkgs/development/libraries/duckdb/update.sh +++ b/pkgs/development/libraries/duckdb/update.sh @@ -1,45 +1,37 @@ #!/usr/bin/env nix-shell -#!nix-shell --pure -i bash -p cacert curl jq moreutils nix-prefetch +#!nix-shell -i bash -p cacert jq git moreutils nix nix-prefetch-github # shellcheck shell=bash set -euo pipefail cd "$(dirname "${BASH_SOURCE[0]}")" -nixpkgs=$(while [[ ! -e .git ]]; do [[ ${PWD} != / ]] || exit 1; cd ..; done; echo "${PWD}") - repo=duckdb owner=duckdb msg() { - echo "$*" >&2 + echo "$*" >&2 } json_get() { - jq -r "$1" < 'versions.json' + jq -r "$1" < ./versions.json } json_set() { - jq --arg x "$2" "$1 = \$x" < 'versions.json' | sponge 'versions.json' + jq --arg x "$2" "$1 = \$x" < ./versions.json | sponge 'versions.json' } get_latest() { - curl ${GITHUB_TOKEN:+" -u \":$GITHUB_TOKEN\""} -s \ - "https://api.github.com/repos/${owner}/${repo}/releases/latest" | jq -r .tag_name + gh release --repo "${owner}/${repo}" list \ + --exclude-pre-releases \ + --limit 1 \ + --json tagName \ + --jq '.[].tagName' } -get_sha() { - curl ${GITHUB_TOKEN:+" -u \":$GITHUB_TOKEN\""} -s \ - "https://api.github.com/repos/${owner}/${repo}/git/ref/tags/$1" | jq -r .object.sha -} +tag="$(get_latest | sed 's/^v//g')" -tag=$(get_latest) -version=${tag/v/} +json=$(nix-prefetch-github "${owner}" "${repo}" --rev "v${tag}") -[[ ${version} = $(json_get .version) ]] && { msg "${version} is up to date"; exit 0; } - -sha=$(get_sha "${tag}") -sri=$(nix-prefetch -I nixpkgs="${nixpkgs}" -E "duckdb.overrideAttrs { version = \"${version}\"; }") - -json_set ".version" "${version}" -json_set ".rev" "${sha}" -json_set ".hash" "${sri}" +json_set ".version" "${tag}" +json_set ".rev" "$(jq -r '.rev' <<< "${json}")" +json_set ".hash" "$(jq -r '.hash' <<< "${json}")" diff --git a/pkgs/development/libraries/duckdb/versions.json b/pkgs/development/libraries/duckdb/versions.json index 2ed38b48db51..bfe1c0f12964 100644 --- a/pkgs/development/libraries/duckdb/versions.json +++ b/pkgs/development/libraries/duckdb/versions.json @@ -1,5 +1,5 @@ { - "version": "1.1.3", - "rev": "19864453f7d0ed095256d848b46e7b8630989bac", - "hash": "sha256-Inaawm6mAy1CPCPfGO5LNBgaF/QcZOTAjm1aGjrJp6w=" + "version": "1.2.0", + "rev": "5f5512b827df6397afd31daedb4bbdee76520019", + "hash": "sha256-93iBUsNKXRGdnN1ZRSWJfnSNM23U/M0sudgHk6HGIhM=" } diff --git a/pkgs/development/python-modules/dask-expr/default.nix b/pkgs/development/python-modules/dask-expr/default.nix index 2e06ececffb3..c7bb6c734ee9 100644 --- a/pkgs/development/python-modules/dask-expr/default.nix +++ b/pkgs/development/python-modules/dask-expr/default.nix @@ -13,7 +13,7 @@ pyarrow, # checks - distributed, + jinja2, pytestCheckHook, xarray, }: @@ -49,7 +49,7 @@ buildPythonPackage rec { pythonImportsCheck = [ "dask_expr" ]; nativeCheckInputs = [ - distributed + jinja2 pytestCheckHook xarray ]; diff --git a/pkgs/development/python-modules/duckdb/default.nix b/pkgs/development/python-modules/duckdb/default.nix index 77b348e271f0..c714eb03ab04 100644 --- a/pkgs/development/python-modules/duckdb/default.nix +++ b/pkgs/development/python-modules/duckdb/default.nix @@ -38,7 +38,6 @@ buildPythonPackage rec { ''; env = { - BUILD_HTTPFS = 1; DUCKDB_BUILD_UNITY = 1; OVERRIDE_GIT_DESCRIBE = "v${version}-0-g${rev}"; }; diff --git a/pkgs/development/python-modules/pytest-textual-snapshot/default.nix b/pkgs/development/python-modules/pytest-textual-snapshot/default.nix index b0ab480685fd..30ffa1b09144 100644 --- a/pkgs/development/python-modules/pytest-textual-snapshot/default.nix +++ b/pkgs/development/python-modules/pytest-textual-snapshot/default.nix @@ -36,6 +36,10 @@ buildPythonPackage rec { textual ]; + pythonRelaxDeps = [ + "syrupy" + ]; + # Module has no tests doCheck = false;