Previous update was #361875

This time, the diff includes:

• Configurable indentation with --indent: Make indentation configurable nixfmt#209
• Fix comments being moved around: Suggestion: commented out lines at the end of a let block should stay in the let block nixfmt#259
• Allow building with newest GHC: Allow building with newest GHC nixfmt#286
• Implement git mergetool mode: Implement --mergetool mode nixfmt#283

Things done

• Built on platform(s)
  • x86_64-linux
  • aarch64-linux
  • x86_64-darwin
  • aarch64-darwin
• For non-Linux: Is sandboxing enabled in nix.conf? (See Nix manual)
  • sandbox = relaxed
  • sandbox = true
• Tested, as applicable:
  • NixOS test(s) (look inside nixos/tests)
  • and/or package tests
  • or, for functions and "core" functionality, tests in lib/tests or pkgs/test
  • made sure NixOS tests are linked to the relevant packages
• Tested compilation of all packages that depend on this change using nix-shell -p nixpkgs-review --run "nixpkgs-review rev HEAD". Note: all changes have to be committed, also see nixpkgs-review usage
• Tested basic functionality of all binary files (usually in ./result/bin/)
• 25.05 Release Notes (or backporting 24.11 and 25.05 Release notes)
  • (Package updates) Added a release notes entry if the change is major or breaking
  • (Module updates) Added a release notes entry if the change is significant
  • (Module addition) Added a release notes entry if adding a new NixOS module
• Fits CONTRIBUTING.md.

This work is funded by Antithesis and Tweag ✨

Add a 👍 reaction to pull requests you find important.