Pinned sqlformat

holochain-open-dev · Sep 11, 2024 · ff53979 · ff53979
1 parent 1038fb1
commit ff53979
Show file tree

Hide file tree

Showing 6 changed files with 13 additions and 17 deletions.
diff --git a/flake.nix b/flake.nix
@@ -109,7 +109,6 @@ rec {
                 # CARGO_TARGET_X86_64_UNKNOWN_LINUX_GNU_RUSTFLAGS =
                 #   " -Clink-arg=-fuse-ld=mold";
                 # CARGO_PROFILE = "release";
-                FIX_SQL_FMT = 1;
                 CARGO_PROFILE = "release";
                 pname = "sweettest";
                 version = "for-holochain-0.3.2";

diff --git a/nix/fixtures/module-repo/Cargo.lock b/nix/fixtures/module-repo/Cargo.lock
diff --git a/nix/fixtures/module-repo/Cargo.toml b/nix/fixtures/module-repo/Cargo.toml
@@ -9,9 +9,3 @@ holochain = "0.3.2"
 
 [profile.release]
 opt-level = "z"
-
-
-[patch.crates-io]
-# Revert to crates.io once https://github.com/holochain/lair/issues/133 is fixed 
-lair_keystore = { git = "https://github.com/guillemcordoba/lair", branch = "fix-sqlformat" }
-lair_keystore_api = { git = "https://github.com/guillemcordoba/lair", branch = "fix-sqlformat" }
diff --git a/nix/fixtures/module-repo/flake.lock b/nix/fixtures/module-repo/flake.lock
diff --git a/nix/fixtures/module-repo/zomes/coordinator/Cargo.toml b/nix/fixtures/module-repo/zomes/coordinator/Cargo.toml
@@ -20,3 +20,4 @@ futures = { version = "0.3", default-features = false }
 hdk = { workspace = true, features = ["encoding", "test_utils"] }
 holochain = { workspace = true, features = ["test_utils"] }
 tokio = { version = "1.3", features = ["full"] }
+sqlformat = "=0.2.3"
diff --git a/nix/sweettest.nix b/nix/sweettest.nix
@@ -6,10 +6,7 @@ let
 
   src = craneLib.cleanCargoSource (craneLib.path workspacePath);
 
-  commonArgs = {
-    inherit cargoArtifacts buildInputs src;
-    FIX_SQL_FMT = 1;
-  };
+  commonArgs = { inherit cargoArtifacts buildInputs src; };
 
   listCratesFromWorkspace = src:
     let