Unverified Commit 0d0328aa authored by Gaétan Lepage's avatar Gaétan Lepage Committed by GitHub
Browse files

duckdb: 1.1.3 -> 1.2.0 (#379866)

parents 3aaef5ab 6c3565c9

pkgs/by-name/ha/harlequin/package.nix

+1 −0
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ python3Packages.buildPythonApplication rec { 
    "numpy"

    "pyarrow"

    "textual"

    "syrupy"

  ];



  build-system = with python3Packages; [ poetry-core ];

pkgs/development/libraries/duckdb/update.sh

+14 −22
Original line number Diff line number Diff line 
#!/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
@@ -15,31 +13,25 @@ msg() { 
}



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

}



get_sha() {

    curl ${GITHUB_TOKEN:+" -u \":$GITHUB_TOKEN\""} -s \

        "https://api.github.com/repos/${owner}/${repo}/git/ref/tags/$1" | jq -r .object.sha

  gh release --repo "${owner}/${repo}" list \

    --exclude-pre-releases \

    --limit 1 \

    --json tagName \

    --jq '.[].tagName'

}



tag=$(get_latest)

version=${tag/v/}



[[ ${version} = $(json_get .version) ]] && { msg "${version} is up to date"; exit 0; }

tag="$(get_latest | sed 's/^v//g')"



sha=$(get_sha "${tag}")

sri=$(nix-prefetch -I nixpkgs="${nixpkgs}" -E "duckdb.overrideAttrs { version = \"${version}\"; }")

json=$(nix-prefetch-github "${owner}" "${repo}" --rev "v${tag}")



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}")"

pkgs/development/libraries/duckdb/versions.json

+3 −3
Original line number Diff line number Diff line 
{

  "version": "1.1.3",

  "rev": "19864453f7d0ed095256d848b46e7b8630989bac",

  "hash": "sha256-Inaawm6mAy1CPCPfGO5LNBgaF/QcZOTAjm1aGjrJp6w="

  "version": "1.2.0",

  "rev": "5f5512b827df6397afd31daedb4bbdee76520019",

  "hash": "sha256-93iBUsNKXRGdnN1ZRSWJfnSNM23U/M0sudgHk6HGIhM="

}

pkgs/development/python-modules/dask-expr/default.nix

+2 −2
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ 
  pyarrow,



  # checks

  distributed,

  jinja2,

  pytestCheckHook,

  xarray,

}:
@@ -49,7 +49,7 @@ buildPythonPackage rec { 
  pythonImportsCheck = [ "dask_expr" ];



  nativeCheckInputs = [

    distributed

    jinja2

    pytestCheckHook

    xarray

  ];

pkgs/development/python-modules/duckdb/default.nix

+0 −1
Original line number Diff line number Diff line
@@ -38,7 +38,6 @@ buildPythonPackage rec { 
    '';



  env = {

    BUILD_HTTPFS = 1;

    DUCKDB_BUILD_UNITY = 1;

    OVERRIDE_GIT_DESCRIBE = "v${version}-0-g${rev}";

  };