Updated Nix

.gitignore

@@ -10,3 +10,4 @@ target
 *.svg
 .direnv/
 .vscode/
+.nixd.json

flake.nix

@@ -13,13 +13,9 @@
       ];
 
       forAllSystems = f: nixpkgs.lib.genAttrs allSystems (system: f {
-        pkgs = import nixpkgs { inherit system; overlays = [ tdengineOverlay ]; };
+        pkgs = import nixpkgs { inherit system; overlays = [ (import ./overlays) ]; };
         inherit system;
       });
-
-      tdengineOverlay = final: prev: {
-          tdengine = prev.callPackage ./overlays/tdengine/default.nix {};
-      };
     in
     {
       devShells = forAllSystems ({ pkgs, system }: {
@@ -32,7 +28,6 @@
             zlib
             zstd
             rdkafka
-            tdengine
           ]) ++ pkgs.lib.optionals pkgs.stdenv.isDarwin (with pkgs; [ libiconv ]);
         };
       });

overlays/default.nix

@@ -1,5 +1,3 @@
-{ pkgs }: {
-  default = final: _prev: {
-    tdengine-client = pkgs.callPackage ./tdengine {pkgs = final;};
-  };
+final: prev: {
+    tdengine = final.callPackage ./tdengine { nixpkgs = prev; };
 }

overlays/tdengine/default.nix

@@ -1,24 +1,39 @@
 {
+  self,
   nixpkgs,
   stdenv,
   fetchFromGitHub
-}:rec {
-  default = stdenv.mkDerivation {
-    name = "TDengine-client";
-    version = "3.0.4.2";
+}: 
+stdenv.mkDerivation {
+  name = "TDengine-client";
+  version = "3.0.4.2";
 
-    src = fetchFromGitHub {
-      owner = "taosdata";
-      repo = "TDEngine";
-      rev = "ver-${default.version}";
-      hash = "sha256-CMpfaVhq3LOngugxp9POvXIQMjtpgwqP1VoCj2KkfYE=";
-    };
-    nativeBuildInputs = with nixpkgs; [
-      cmake
-    ];
-
-    installPhase = ''
-      sudo make install
-    '';
+  src = fetchFromGitHub {
+    owner = "taosdata";
+    repo = "TDEngine";
+    rev = "ver-${self.version}";
+    hash = "sha256-CMpfaVhq3LOngugxp9POvXIQMjtpgwqP1VoCj2KkfYE=";
   };
+
+  dontUseCmakeConfigure=true;
+
+  nativeBuildInputs = with nixpkgs; [
+    cjson
+    lz4
+    git
+    cmake
+  ];
+
+  buildPhase = ''
+    mkdir debug
+    cd debug
+    cmake .. -DBUILD_TOOLS=false -DBUILD_HTTP=true
+    ls
+    make
+    ls -f
+  '';
+
+  installPhase = ''
+    make install
+  '';
 }

tdengine/src/tdengine.rs

@@ -39,8 +39,12 @@ impl TDEngine {
             .build()
             .await
             .map_err(TDEngineError::TaosBuilder)?;
-        let stmt = Stmt::init(&client).await.map_err(TDEngineError::TaosBuilder)?;
-        let frame_stmt = Stmt::init(&client).await.map_err(TDEngineError::TaosBuilder)?;
+        let stmt = Stmt::init(&client)
+            .await
+            .map_err(TDEngineError::TaosBuilder)?;
+        let frame_stmt = Stmt::init(&client)
+            .await
+            .map_err(TDEngineError::TaosBuilder)?;
         Ok(TDEngine {
             login,
             client,