From 9d77b1220ff77d31e4171f3e177003affd12b275 Mon Sep 17 00:00:00 2001 From: Jeremy Wall Date: Wed, 6 Apr 2022 09:03:51 -0400 Subject: [PATCH] ensure sqlite3 is always bundled with the plugin --- flake.nix | 2 +- nix/dbt-sqlite/default.nix | 24 ++++++++++++++---------- 2 files changed, 15 insertions(+), 11 deletions(-) diff --git a/flake.nix b/flake.nix index bbfd843..a175cf1 100644 --- a/flake.nix +++ b/flake.nix @@ -40,7 +40,7 @@ core = pkgs.mkShell { packages = [ dbt-core ]; }; postgres = pkgs.mkShell { packages = [dbt-core dbt-postgres ]; }; redshift = pkgs.mkShell { packages = [dbt-core dbt-redshift ]; }; - sqlite = pkgs.mkShell { packages = [dbt-core dbt-sqlite pkgs.sqlite ]; }; + sqlite = pkgs.mkShell { packages = [dbt-core dbt-sqlite ]; }; }; }); } \ No newline at end of file diff --git a/nix/dbt-sqlite/default.nix b/nix/dbt-sqlite/default.nix index 1813de3..336e099 100644 --- a/nix/dbt-sqlite/default.nix +++ b/nix/dbt-sqlite/default.nix @@ -1,15 +1,19 @@ {pkgs, dbt-core, ...}: with pkgs; with python39Packages; - -buildPythonPackage rec { - pname = "dbt-sqlite"; - version = "1.0.0"; - propagatedBuildInputs = [ - dbt-core - ]; - src = fetchPypi { - inherit pname version; - sha256 = "sha256-nIwk30kMvWBtbAPVE1kfdc4l9W3rWdBRB082OyoiccA="; +let + dbt-sqlite = buildPythonPackage rec { + pname = "dbt-sqlite"; + version = "1.0.0"; + propagatedBuildInputs = [ + dbt-core + ]; + src = fetchPypi { + inherit pname version; + sha256 = "sha256-nIwk30kMvWBtbAPVE1kfdc4l9W3rWdBRB082OyoiccA="; + }; }; +in symlinkJoin { + name = "dbt-sqlite-bundled"; + paths = [ dbt-sqlite sqlite ]; } \ No newline at end of file