Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Add headroom to treefmt, pin to 0.5.0.0 (github master).
18 changes: 18 additions & 0 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

7 changes: 7 additions & 0 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,13 @@
url = "github:velveteer/arbiter?rev=b9c57eb1f8277d97616aa449bea471fe9ce14eda";
flake = false;
};

headroom = {
# https://github.com/xwinus/headroom/issues/117
# this pin should be removed once 0.5.0.0 has been released.
url = "github:xwinus/headroom?rev=010ed0ca68f0af9026bb613800cbeae80be6ebbd";
flake = false;
};
};

outputs = inputs@{ nixpkgs, nixpkgs_24_11, flake-utils, tom-bombadil, sbomnix, ... }:
Expand Down
6 changes: 5 additions & 1 deletion nix/haskell-pins.nix
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,10 @@ let
};
};

headroom = {
src = inputs.headroom;
};

bloodhound = {
src = inputs.bloodhound;
};
Expand Down Expand Up @@ -149,7 +153,7 @@ let
# N.B. only the listed packages work. If you want to use another:
# - list it here
# - patch it on the fork (if required)
#
#
# Can't currently be removed because amazonka-dynamodb-attributevalue
# does not exist on hackage
amazonka = {
Expand Down
2 changes: 1 addition & 1 deletion nix/wire-server.nix
Original file line number Diff line number Diff line change
Expand Up @@ -470,7 +470,7 @@ let
pkgs.cfssl
pkgs.awscli2
(hlib.justStaticExecutables pkgs.haskellPackages.cabal-fmt)
(hlib.justStaticExecutables pkgs.haskellPackages.headroom)
(hlib.justStaticExecutables (hlib.dontCheck haskellPackages.headroom))
(hlib.justStaticExecutables pkgs.haskellPackages.weeder)
] ++ pkgs.lib.optionals pkgs.stdenv.isLinux [
pkgs.skopeo
Expand Down
7 changes: 7 additions & 0 deletions treefmt.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,13 @@ excludes = [
"dist-newstyle/"
]

[formatter.headroom]
command = "hack/bin/headroom-treefmt.sh"
includes = ["*.hs", "*.hsc", "*.rs"]
excludes = [
"dist-newstyle/",
"services/wire-server-enterprise/*",
]

[formatter.shellcheck]
command = "shellcheck"
Expand Down