WIP

Cargo.toml

@@ -101,13 +101,13 @@ metrics = "0.21"
 metrics-util = "0.15"
 
 topiary-core = "0.4.0"
-topiary-queries = { version = "0.4.2", default-features = false, features = ["nickel"] }
+topiary-queries = { version = "=0.4.2", default-features = false, features = ["nickel"] }
 # This version should agree with the topiary-query version: Nickel queries
 # target a specific version of the Nickel grammar (though that dependency
 # doesn't appear explicitly in `topiary-queries`'s Cargo.toml file). For now you
 # might have to look at Topiary's commit messages, but in a near future, we'll
 # try to make this data more accessible, e.g. in the query file
-tree-sitter-nickel = "0.2.0"
+tree-sitter-nickel = "=0.2.0"
 tempfile = "3.5.0"
 
 [profile.dev.package.lalrpop]

flake.nix

@@ -13,22 +13,6 @@
     crane = {
       url = "github:ipetkov/crane";
     };
-    topiary = {
-      # We pin this specific PR because we need a recent version of Topiary to
-      # get rid of the dreaded bash version drift
-      # (https://github.com/tweag/topiary/issues/702), but current the latest
-      # Topiary doesn't build with Nix since the addition of dynamic loading of
-      # grammars. So once https://github.com/tweag/topiary/pull/747
-      # (allow-path-for-grammar-source) is merged, we can go back to following
-      # the main branch.
-      url = "github:tweag/topiary/tmp-allow-for-path-grammar-source";
-      inputs = {
-        nixpkgs.follows = "nixpkgs";
-        crane.follows = "crane";
-        flake-utils.follows = "flake-utils";
-        rust-overlay.follows = "rust-overlay";
-      };
-    };
     nix-input = {
       url = "github:nixos/nix";
       inputs = {
@@ -50,7 +34,6 @@
     , pre-commit-hooks
     , rust-overlay
     , crane
-    , topiary
     , nix-input
     }:
     let
@@ -175,6 +158,10 @@
             ];
           };
 
+          # We could use Topiary here, but the Topiary version pulled from Nix
+          # and the one baked in Nickel could differ. It's saner that what we
+          # check in the CI is matching exactly the formatting performed by the
+          # `nickel` binary of this repo.
           nickel-format = {
             name = "nickel-format";
             description = "The nickel formatter";
@@ -511,7 +498,6 @@
           pkgs.yarn2nix
           pkgs.nodePackages.markdownlint-cli
           pkgs.python3
-          topiary.packages.${system}.topiary-cli-nix
         ];
 
         shellHook = (pre-commit-builder { inherit rust; checkFormat = true; }).shellHook + ''