From b8a51ba9ed2632143dccd108d9c9f1d5718223fb Mon Sep 17 00:00:00 2001
From: Phillip Cloud <417981+cpcloud@users.noreply.github.com>
Date: Thu, 6 Feb 2025 11:12:40 -0500
Subject: [PATCH 1/7] duckdb: 1.1.3 -> 1.2.0

---
 pkgs/development/libraries/duckdb/versions.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

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

From fb4fe16cc7ac5fd57b4436c647f4b62b77c45bda Mon Sep 17 00:00:00 2001
From: Phillip Cloud <417981+cpcloud@users.noreply.github.com>
Date: Fri, 7 Feb 2025 10:55:40 -0500
Subject: [PATCH 2/7] duckdb: avoid building httpfs

---
 pkgs/development/python-modules/duckdb/default.nix | 1 -
 1 file changed, 1 deletion(-)

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

From e4f4ce39849370c4fe1045b681d5cdcf6b0ebd6b Mon Sep 17 00:00:00 2001
From: Phillip Cloud <417981+cpcloud@users.noreply.github.com>
Date: Fri, 7 Feb 2025 10:56:01 -0500
Subject: [PATCH 3/7] harlequin: relax the syrupy constraint

---
 pkgs/by-name/ha/harlequin/package.nix | 1 +
 1 file changed, 1 insertion(+)

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 ];

From 067d6926e6edd8a41b22912fd21da53383e41305 Mon Sep 17 00:00:00 2001
From: Phillip Cloud <417981+cpcloud@users.noreply.github.com>
Date: Fri, 7 Feb 2025 10:56:22 -0500
Subject: [PATCH 4/7] python3.pkgs.pytest-textual-snapshot: relax the syrupy
 constraint

---
 .../python-modules/pytest-textual-snapshot/default.nix        | 4 ++++
 1 file changed, 4 insertions(+)

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;
 

From af5286ec36b2a97166358ebee15850106f8c2ec3 Mon Sep 17 00:00:00 2001
From: Phillip Cloud <417981+cpcloud@users.noreply.github.com>
Date: Sat, 8 Feb 2025 06:39:41 -0500
Subject: [PATCH 5/7] python3.pkg.dask-expr: remove incompatible `distributed`
 check dependency

---
 pkgs/development/python-modules/dask-expr/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

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
   ];

From 63f8b4269b6958d5b7871f2d951a469d3a452317 Mon Sep 17 00:00:00 2001
From: Phillip Cloud <417981+cpcloud@users.noreply.github.com>
Date: Sat, 8 Feb 2025 09:05:43 -0500
Subject: [PATCH 6/7] duckdb: format `update.sh`

---
 pkgs/development/libraries/duckdb/update.sh | 27 ++++++++++++++-------
 1 file changed, 18 insertions(+), 9 deletions(-)

diff --git a/pkgs/development/libraries/duckdb/update.sh b/pkgs/development/libraries/duckdb/update.sh
index f3acd176ee86..925d7f6be1a8 100755
--- a/pkgs/development/libraries/duckdb/update.sh
+++ b/pkgs/development/libraries/duckdb/update.sh
@@ -5,37 +5,46 @@
 set -euo pipefail
 cd "$(dirname "${BASH_SOURCE[0]}")"
 
-nixpkgs=$(while [[ ! -e .git ]]; do [[ ${PWD} != / ]] || exit 1; cd ..; done; echo "${PWD}")
+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
+  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
+  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)
 version=${tag/v/}
 
-[[ ${version} = $(json_get .version) ]] && { msg "${version} is up to date"; exit 0; }
+[[ ${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}\"; }")

From 6c3565c909c87dab3ed68484335a4fc3f25c69f2 Mon Sep 17 00:00:00 2001
From: Phillip Cloud <417981+cpcloud@users.noreply.github.com>
Date: Sat, 8 Feb 2025 09:27:12 -0500
Subject: [PATCH 7/7] duckdb: fix update script to use nix-prefetch-github

---
 pkgs/development/libraries/duckdb/update.sh | 43 +++++++--------------
 1 file changed, 13 insertions(+), 30 deletions(-)

diff --git a/pkgs/development/libraries/duckdb/update.sh b/pkgs/development/libraries/duckdb/update.sh
index 925d7f6be1a8..c440e2d5b1e2 100755
--- a/pkgs/development/libraries/duckdb/update.sh
+++ b/pkgs/development/libraries/duckdb/update.sh
@@ -1,18 +1,10 @@
 #!/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
 
@@ -21,34 +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
+  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}")"