Skip to content

Commit af7b306

Browse files
committed
nix: use nixfmt instead of nixpkgs-fmt
nixpkgs-fmt is deprecated
1 parent b69db1e commit af7b306

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

shell.nix

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@ pkgs.mkShell {
1111
nativeBuildInputs = with pkgs; [
1212
# nix related stuff (such as dependency management)
1313
niv
14-
nixpkgs-fmt
14+
# TODO use "nixfmt" once it is stable - likely in nixpkgs @ NixOS 24.11
15+
nixfmt-rfc-style
1516

1617
# Integration test dependencies
1718
swtpm

xtask/src/main.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -261,9 +261,9 @@ fn run_fmt_project(fmt_opt: &FmtOpt) -> Result<()> {
261261
}
262262

263263
// fmt nix
264-
if has_cmd("nixpkgs-fmt") {
264+
if has_cmd("nixfmt") {
265265
eprintln!("Formatting: nix");
266-
let mut command = Command::new("nixpkgs-fmt");
266+
let mut command = Command::new("nixfmt");
267267
if fmt_opt.check {
268268
command.arg("--check");
269269
}

0 commit comments

Comments
 (0)