diff --git a/pkgs/applications/misc/databricks-sql-cli/default.nix b/pkgs/applications/misc/databricks-sql-cli/default.nix index be798894ba86..ae118501f47d 100644 --- a/pkgs/applications/misc/databricks-sql-cli/default.nix +++ b/pkgs/applications/misc/databricks-sql-cli/default.nix @@ -1,20 +1,10 @@ { lib -, buildPythonApplication , fetchFromGitHub , fetchpatch -, poetry-core -, pandas -, prompt-toolkit -, databricks-sql-connector -, pygments -, configobj -, sqlparse -, cli-helpers -, click -, pytestCheckHook +, python3 }: -buildPythonApplication rec { +python3.pkgs.buildPythonApplication rec { pname = "databricks-sql-cli"; version = "0.1.4"; format = "pyproject"; @@ -22,8 +12,8 @@ buildPythonApplication rec { src = fetchFromGitHub { owner = "databricks"; repo = "databricks-sql-cli"; - rev = "v${version}"; - sha256 = "sha256-gr7LJfnvIu2Jf1XgILqfZoi8CbXeQyq0g1wLEBa5TPM="; + rev = "refs/tags/v${version}"; + hash = "sha256-gr7LJfnvIu2Jf1XgILqfZoi8CbXeQyq0g1wLEBa5TPM="; }; patches = [ @@ -37,27 +27,32 @@ buildPythonApplication rec { postPatch = '' substituteInPlace pyproject.toml \ --replace 'python = ">=3.7.1,<4.0"' 'python = ">=3.8,<4.0"' \ - --replace 'pandas = "1.3.4"' 'pandas = "~1.4"' + --replace 'pandas = "1.3.4"' 'pandas = "~1.5"' ''; - nativeBuildInputs = [ poetry-core ]; - - propagatedBuildInputs = [ - prompt-toolkit - pandas - databricks-sql-connector - pygments - configobj - sqlparse - cli-helpers - click + nativeBuildInputs = with python3.pkgs; [ + poetry-core ]; - nativeCheckInputs = [ pytestCheckHook ]; + propagatedBuildInputs = with python3.pkgs; [ + cli-helpers + click + configobj + databricks-sql-connector + pandas + prompt-toolkit + pygments + sqlparse + ]; + + nativeCheckInputs = with python3.pkgs; [ + pytestCheckHook + ]; meta = with lib; { description = "CLI for querying Databricks SQL"; homepage = "https://github.com/databricks/databricks-sql-cli"; + changelog = "https://github.com/databricks/databricks-sql-cli/releases/tag/v${version}"; license = licenses.databricks; maintainers = with maintainers; [ kfollesdal ]; }; diff --git a/pkgs/development/python-modules/databricks-sql-connector/default.nix b/pkgs/development/python-modules/databricks-sql-connector/default.nix index 5c01cb734d75..278d7c15faa1 100644 --- a/pkgs/development/python-modules/databricks-sql-connector/default.nix +++ b/pkgs/development/python-modules/databricks-sql-connector/default.nix @@ -1,21 +1,24 @@ { lib , buildPythonPackage , fetchFromGitHub +, alembic , lz4 , numpy , oauthlib +, openpyxl , pandas , poetry-core , pyarrow , pytestCheckHook , pythonOlder , pythonRelaxDepsHook +, sqlalchemy , thrift }: buildPythonPackage rec { pname = "databricks-sql-connector"; - version = "2.3.0"; + version = "2.4.0"; format = "pyproject"; disabled = pythonOlder "3.7"; @@ -24,7 +27,7 @@ buildPythonPackage rec { owner = "databricks"; repo = "databricks-sql-python"; rev = "refs/tags/v${version}"; - hash = "sha256-XyDkL/bGnivx7MRG86vGS69mKdrWw7kKiuvQfBYFKVQ="; + hash = "sha256-V8Nl6xr96Xnd1gkw9R0aqXkitLESsAyW7ufTYn6ttLg="; }; pythonRelaxDeps = [ @@ -38,11 +41,14 @@ buildPythonPackage rec { ]; propagatedBuildInputs = [ + alembic lz4 numpy oauthlib + openpyxl pandas pyarrow + sqlalchemy thrift ];