From 733d57633a4ebb5285ccb46ae41c3b529ddf8670 Mon Sep 17 00:00:00 2001 From: pcboy Date: Sat, 4 Jan 2025 20:10:05 +0900 Subject: [PATCH] harlequin: 1.25.2 -> 1.25.2-unstable-2024-12-30 Fixing runtime issue with Textual > 0.82 --- pkgs/by-name/ha/harlequin/package.nix | 34 +++++++++++++++++---------- 1 file changed, 21 insertions(+), 13 deletions(-) diff --git a/pkgs/by-name/ha/harlequin/package.nix b/pkgs/by-name/ha/harlequin/package.nix index da6c0c4c5875..5d1f79fd4144 100644 --- a/pkgs/by-name/ha/harlequin/package.nix +++ b/pkgs/by-name/ha/harlequin/package.nix @@ -1,28 +1,30 @@ { lib, + stdenv, python3Packages, fetchFromGitHub, - harlequin, - testers, nix-update-script, - versionCheckHook, glibcLocales, withPostgresAdapter ? true, withBigQueryAdapter ? true, }: python3Packages.buildPythonApplication rec { pname = "harlequin"; - version = "1.25.2"; + version = "1.25.2-unstable-2024-12-30"; pyproject = true; src = fetchFromGitHub { owner = "tconbeer"; repo = "harlequin"; - tag = "v${version}"; - hash = "sha256-ov9pMvFzJAMfOM7JeSgnp6dZ424GiRaH7W5OCKin9Jk="; + rev = "7ef5327157c7617c1032c9128b487b32d1c91fea"; + hash = "sha256-QoIjEfQgN6YWDDor4PxfeFkkFGAidUC0ZvHy+PqgnWs="; }; - pythonRelaxDeps = [ "textual" ]; + pythonRelaxDeps = [ + "numpy" + "pyarrow" + "textual" + ]; build-system = with python3Packages; [ poetry-core ]; @@ -65,18 +67,24 @@ python3Packages.buildPythonApplication rec { nativeCheckInputs = [ - versionCheckHook + # FIX: restore on next release + # versionCheckHook ] ++ (with python3Packages; [ pytest-asyncio pytestCheckHook ]); - disabledTests = [ - # Tests require network access - "test_connect_extensions" - "test_connect_prql" - ]; + disabledTests = + [ + # Tests require network access + "test_connect_extensions" + "test_connect_prql" + ] + ++ lib.optionals (stdenv.hostPlatform.system == "aarch64-darwin") [ + # Test incorrectly tries to load a dylib compiled for x86_64 + "test_load_extension" + ]; disabledTestPaths = [ # Tests requires more setup