diff --git a/pkgs/by-name/ha/harlequin/package.nix b/pkgs/by-name/ha/harlequin/package.nix index 186fa4ae2c04..4562f8e5fd88 100644 --- a/pkgs/by-name/ha/harlequin/package.nix +++ b/pkgs/by-name/ha/harlequin/package.nix @@ -10,40 +10,16 @@ withPostgresAdapter ? true, withBigQueryAdapter ? true, }: -let - # Using textual 5.3.0 to avoid error at runtime - # https://github.com/tconbeer/harlequin/issues/841 - python = python3Packages.python.override { - self = python3Packages.python; - packageOverrides = self: super: { - textual = super.textual.overridePythonAttrs (old: rec { - version = "5.3.0"; - - src = fetchFromGitHub { - owner = "Textualize"; - repo = "textual"; - tag = "v${version}"; - hash = "sha256-J7Sb4nv9wOl1JnR6Ky4XS9HZHABKtNKPB3uYfC/UGO4="; - }; - }); - - textual-textarea = super.textual-textarea.overridePythonAttrs (old: { - pythonRelaxDeps = (old.pythonRelaxDeps or [ ]) ++ [ "textual" ]; - }); - }; - }; - pythonPackages = python.pkgs; -in -pythonPackages.buildPythonApplication rec { +python3Packages.buildPythonApplication rec { pname = "harlequin"; - version = "2.2.1"; + version = "2.3.0"; pyproject = true; src = fetchFromGitHub { owner = "tconbeer"; repo = "harlequin"; tag = "v${version}"; - hash = "sha256-uBHzoawvhEeRjcvm+R3nft37cEv+1sqx9crYUbC7pRo="; + hash = "sha256-CbbqbnspQ4XZmNpE1CmD+zg2okFRTx95gQUVUqoOq9U="; }; pythonRelaxDeps = [ @@ -57,12 +33,12 @@ pythonPackages.buildPythonApplication rec { "tree-sitter-sql" ]; - build-system = with pythonPackages; [ hatchling ]; + build-system = with python3Packages; [ hatchling ]; nativeBuildInputs = [ glibcLocales ]; dependencies = - with pythonPackages; + with python3Packages; [ click duckdb @@ -94,7 +70,7 @@ pythonPackages.buildPythonApplication rec { updateScript = nix-update-script { }; }; - nativeCheckInputs = with pythonPackages; [ + nativeCheckInputs = with python3Packages; [ pytest-asyncio pytestCheckHook versionCheckHook