Skip to content

Commit 4e0b4b0

Browse files
committed
style: add treefmt Nix devshell
`haskell.nix`'s useful `devShells` function doesn't work with `flake-parts`, which we use for universal formatting support, so let's just create a separate Nix devshell for formatting. Also add a handy `make format` target. Signed-off-by: Drew Hess <src@drewhess.com>
1 parent e72016f commit 4e0b4b0

File tree

2 files changed

+10
-6
lines changed

2 files changed

+10
-6
lines changed

Makefile

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,13 @@ develop-frontend:
2525
develop-ui-demo:
2626
$(MAKE) -C primer-miso-ui develop-ui-demo
2727

28+
format:
29+
nix develop .#treefmt -c treefmt
30+
2831
clean:
2932
cabal clean
3033

31-
.PHONY: build $(project-targets) $(package-targets) clean
34+
.PHONY: build $(project-targets) $(package-targets) format clean
3235

3336
# Disabled until Weeder is fixed with haskell.nix
3437

flake.nix

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -291,11 +291,7 @@
291291
};
292292

293293
devShells = {
294-
default = primerFlake.devShells.default // {
295-
inputsFrom = [
296-
config.treefmt.build.devShell
297-
];
298-
};
294+
default = primerFlake.devShells.default;
299295
wasm = pkgs.mkShell {
300296
packages = with inputs.ghc-wasm.packages.${system};
301297
[
@@ -310,6 +306,11 @@
310306
(pkgs.haskell-nix.tool ghcVersion "tasty-discover" { })
311307
];
312308
};
309+
treefmt = pkgs.mkShell {
310+
inputsFrom = [
311+
config.treefmt.build.devShell
312+
];
313+
};
313314
};
314315
};
315316

0 commit comments

Comments
 (0)