From 586f5d03165731e9fea5cd4ea61b29c387b6eded Mon Sep 17 00:00:00 2001 From: Jeremy Wall Date: Thu, 28 Oct 2021 14:19:02 -0400 Subject: [PATCH] Overlay sqlparse in our packages --- .gitignore | 4 ++++ dbt-core/default.nix | 30 +++++++++++++++++++++++++----- 2 files changed, 29 insertions(+), 5 deletions(-) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..d5813d2 --- /dev/null +++ b/.gitignore @@ -0,0 +1,4 @@ +lib/* +bin/* +pyvenv.cfg +share/* \ No newline at end of file diff --git a/dbt-core/default.nix b/dbt-core/default.nix index 8d729cc..4db1fc7 100644 --- a/dbt-core/default.nix +++ b/dbt-core/default.nix @@ -1,5 +1,24 @@ -with import {}; -with python38Packages; +with import (builtins.fetchTarball { + name = "nixpkgs-21.05-darwin"; + url = "https://github.com/nixos/nixpkgs/archive/06b49ba179e3e5b13364ed16aa9907821abc6988.tar.gz"; + sha256 = "18dij8g8p71a3ymr58bjn9j7bl9d3hkmzfccc0bqk5fi887i4z7z"; +}) { + overlays = [ + # Overlay our SQLParse to be the correct version. + (prev: final: { + sqlparse = prev.sqlparse.overrideAttrPythonAttrs (oldAttrs: rec { + version = "0.2.3"; + pname = oldAttrs.pname; + src = prev.fetchPypi { + inherit pname; + inherit version; + sha256 = "0000000000000000000000000000000000000000000000000000"; + }; + }); + }) + ]; +}; +with python39Packages; buildPythonPackage rec { pname = "dbt"; @@ -11,7 +30,7 @@ buildPythonPackage rec { Babel certifi cffi - charset-normalizer + #charset-normalizer click colorama #dbt-extractor @@ -31,7 +50,7 @@ buildPythonPackage rec { networkx packaging parsedatetime - #psycopg2-binary + psycopg2 pycparser pyparsing pyrsistent @@ -42,13 +61,14 @@ buildPythonPackage rec { pyyaml requests six + # TODO(jwall): We need to override sqlparse here to be exactly version 0.2.3 sqlparse text-unidecode typing-extensions urllib3 werkzeug zipp - snowflake-connector-python + #snowflake-connector-python ]; doCheck = false;