Skip to content

Commit 760eed5

Browse files
authored
flake.nix: remove treefmt-nix input (#6782)
Removing input until I have time to migrate usage to a dev flake for all the dev dependencies.
1 parent fefb6ae commit 760eed5

File tree

4 files changed

+5
-48
lines changed

4 files changed

+5
-48
lines changed

.github/workflows/test.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ jobs:
2323
exit 1
2424
fi
2525
- run: nix-build --show-trace -A docs.jsonModuleMaintainers
26-
- run: nix flake check
26+
- run: ./format --ci
2727
- run: nix-shell --show-trace . -A install
2828
- run: yes | home-manager -I home-manager=. uninstall
2929
- run: nix-shell -j auto --show-trace --arg enableBig false --pure tests -A run.all

flake.lock

+1-22
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

flake.nix

+2-24
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,12 @@
11
{
22
description = "Home Manager for Nix";
33

4-
inputs = {
5-
nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
6-
7-
treefmt-nix = {
8-
url = "github:numtide/treefmt-nix";
9-
inputs.nixpkgs.follows = "nixpkgs";
10-
};
11-
};
4+
inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
125

136
outputs =
147
{
158
self,
169
nixpkgs,
17-
treefmt-nix,
1810
...
1911
}:
2012
{
@@ -54,23 +46,9 @@
5446
// (
5547
let
5648
forAllSystems = nixpkgs.lib.genAttrs nixpkgs.lib.systems.flakeExposed;
57-
58-
treefmtEval = forAllSystems (
59-
system:
60-
treefmt-nix.lib.evalModule nixpkgs.legacyPackages.${system} {
61-
# Formatting configuration
62-
programs = {
63-
nixfmt.enable = true;
64-
};
65-
}
66-
);
6749
in
6850
{
69-
checks = forAllSystems (system: {
70-
formatting = treefmtEval.${system}.config.build.check self;
71-
});
72-
73-
formatter = forAllSystems (system: treefmtEval.${system}.config.build.wrapper);
51+
formatter = forAllSystems (system: nixpkgs.legacyPackages.${system}.nixfmt-tree);
7452

7553
packages = forAllSystems (
7654
system:

format

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ for arg do
1414
echo "$0 [-c]"
1515
exit
1616
;;
17-
-c)
17+
--ci)
1818
nixfmt_args+=("$arg")
1919
;;
2020
-*)

0 commit comments

Comments
 (0)