From 684fc6e79b8365e9e99890e1150f81954459a3ab Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 14 Sep 2024 23:41:26 +0200
Subject: [PATCH 1/2] python312Packages.dbt-common: 1.3.0 -> 1.8.0

Changelog: https://github.com/dbt-labs/dbt-common/blob/1.8.0/CHANGELOG.md
---
 .../python-modules/dbt-common/default.nix     | 35 +++++++++++--------
 1 file changed, 21 insertions(+), 14 deletions(-)

diff --git a/pkgs/development/python-modules/dbt-common/default.nix b/pkgs/development/python-modules/dbt-common/default.nix
index bf9a93abafab..0bb43248db08 100644
--- a/pkgs/development/python-modules/dbt-common/default.nix
+++ b/pkgs/development/python-modules/dbt-common/default.nix
@@ -1,34 +1,37 @@
 {
   lib,
-  buildPythonPackage,
-  fetchFromGitHub,
-  hatchling,
   agate,
+  buildPythonPackage,
   colorama,
+  deepdiff,
+  fetchPypi,
+  hatchling,
   isodate,
   jinja2,
   jsonschema,
   mashumaro,
   pathspec,
   protobuf,
-  python-dateutil,
-  requests,
-  typing-extensions,
   pytest-mock,
   pytest-xdist,
   pytestCheckHook,
+  python-dateutil,
+  pythonOlder,
+  requests,
+  typing-extensions,
 }:
 
 buildPythonPackage rec {
   pname = "dbt-common";
-  version = "1.3.0";
+  version = "1.8.0";
   pyproject = true;
 
-  src = fetchFromGitHub {
-    owner = "dbt-labs";
-    repo = "dbt-common";
-    rev = "refs/tags/v${version}";
-    hash = "sha256-3UjwQy257ks21fQV0uZNKu5EsuzjlIAEcVtRWkR9x/4=";
+  disabled = pythonOlder "3.8";
+
+  src = fetchPypi {
+    pname = "dbt_common";
+    inherit version;
+    hash = "sha256-ehZ+a3zznnWMY9NJx9LfRtkV1vHiIH0HEhsYWfMbmb4=";
   };
 
   build-system = [ hatchling ];
@@ -38,6 +41,7 @@ buildPythonPackage rec {
   dependencies = [
     agate
     colorama
+    deepdiff
     isodate
     jinja2
     jsonschema
@@ -49,7 +53,8 @@ buildPythonPackage rec {
     typing-extensions
   ] ++ mashumaro.optional-dependencies.msgpack;
 
-  pythonImportsCheck = [ "dbt_common" ];
+  # Upstream stopped to tag the source fo rnow
+  doCheck = false;
 
   nativeCheckInputs = [
     pytest-mock
@@ -57,10 +62,12 @@ buildPythonPackage rec {
     pytestCheckHook
   ];
 
+  pythonImportsCheck = [ "dbt_common" ];
+
   meta = {
     description = "Shared common utilities for dbt-core and adapter implementations use";
     homepage = "https://github.com/dbt-labs/dbt-common";
-    changelog = "https://github.com/dbt-labs/dbt-common/blob/${src.rev}/CHANGELOG.md";
+    changelog = "https://github.com/dbt-labs/dbt-common/blob/${version}/CHANGELOG.md";
     license = lib.licenses.asl20;
     maintainers = [ ];
   };

From 0df2244e6e7056bd34a461f5862a71369b43b23c Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 14 Sep 2024 23:42:19 +0200
Subject: [PATCH 2/2] python312Packages.dbt-adapters: 1.3.3 -> 1.6.0

Diff: https://github.com/dbt-labs/dbt-adapters/compare/refs/tags/v1.3.3...v1.6.0

Changelog: https://github.com/dbt-labs/dbt-adapters/blob/refs/tags/v1.6.0/CHANGELOG.md
---
 pkgs/development/python-modules/dbt-adapters/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/python-modules/dbt-adapters/default.nix b/pkgs/development/python-modules/dbt-adapters/default.nix
index 776725659d69..38cae3b9080b 100644
--- a/pkgs/development/python-modules/dbt-adapters/default.nix
+++ b/pkgs/development/python-modules/dbt-adapters/default.nix
@@ -14,14 +14,14 @@
 
 buildPythonPackage rec {
   pname = "dbt-adapters";
-  version = "1.3.3";
+  version = "1.6.0";
   pyproject = true;
 
   src = fetchFromGitHub {
     owner = "dbt-labs";
     repo = "dbt-adapters";
     rev = "refs/tags/v${version}";
-    hash = "sha256-M7n+WcHGBMNZ5k9GZRR05g8KzPDWjmB83iZSD16G774=";
+    hash = "sha256-P8AWh11nrP6EtBZrvxu9BoCpP+a8oljzRxbJXkVB2B4=";
   };
 
   build-system = [ hatchling ];