From 144e7d8859761538d062aa262941baeefb0c5d63 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 14 Mar 2023 11:49:54 +0100
Subject: [PATCH 1/3] databricks-sql-cli: add changelog to meta

---
 .../misc/databricks-sql-cli/default.nix             | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/pkgs/applications/misc/databricks-sql-cli/default.nix b/pkgs/applications/misc/databricks-sql-cli/default.nix
index be798894ba86..9af9dd873d5b 100644
--- a/pkgs/applications/misc/databricks-sql-cli/default.nix
+++ b/pkgs/applications/misc/databricks-sql-cli/default.nix
@@ -22,8 +22,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 = [
@@ -40,7 +40,9 @@ buildPythonApplication rec {
       --replace 'pandas = "1.3.4"' 'pandas = "~1.4"'
   '';
 
-  nativeBuildInputs = [ poetry-core ];
+  nativeBuildInputs = [
+    poetry-core
+  ];
 
   propagatedBuildInputs = [
     prompt-toolkit
@@ -53,11 +55,14 @@ buildPythonApplication rec {
     click
   ];
 
-  nativeCheckInputs = [ pytestCheckHook ];
+  nativeCheckInputs = [
+    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 ];
   };

From d51b160067442c8b232366cc0e91e6760104c459 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 14 Mar 2023 11:55:11 +0100
Subject: [PATCH 2/3] databricks-sql-cli: use python3.pkgs

---
 .../misc/databricks-sql-cli/default.nix       | 34 +++++++------------
 1 file changed, 12 insertions(+), 22 deletions(-)

diff --git a/pkgs/applications/misc/databricks-sql-cli/default.nix b/pkgs/applications/misc/databricks-sql-cli/default.nix
index 9af9dd873d5b..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";
@@ -37,25 +27,25 @@ 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 = [
+  nativeBuildInputs = with python3.pkgs; [
     poetry-core
   ];
 
-  propagatedBuildInputs = [
-    prompt-toolkit
-    pandas
-    databricks-sql-connector
-    pygments
-    configobj
-    sqlparse
+  propagatedBuildInputs = with python3.pkgs; [
     cli-helpers
     click
+    configobj
+    databricks-sql-connector
+    pandas
+    prompt-toolkit
+    pygments
+    sqlparse
   ];
 
-  nativeCheckInputs = [
+  nativeCheckInputs = with python3.pkgs; [
     pytestCheckHook
   ];
 

From 1df9510fdba443f7cc24a7f291cf173f49dd9504 Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Tue, 14 Mar 2023 12:07:48 +0100
Subject: [PATCH 3/3] python310Packages.databricks-sql-connector: 2.3.0 ->
 2.4.0

Changelog: https://github.com/databricks/databricks-sql-python/blob/v2.4.0/CHANGELOG.md
---
 .../databricks-sql-connector/default.nix               | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

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