diff --git a/CHANGELOG.md b/CHANGELOG.md index f55d752..6bf9011 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,6 +6,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0 ## [Unreleased] +## Fixed +- C/C++ format commands used `[]` instead of `{}` in the fd glob + expression so it matched single chars. + ## [5.0.0] - 2024-10-15 ## Added diff --git a/c/make-derivation.nix b/c/make-derivation.nix index 1687483..a0a00b9 100644 --- a/c/make-derivation.nix +++ b/c/make-derivation.nix @@ -106,7 +106,7 @@ let runHook preLint if [ -z "''${dontCheckClangFormat:-}" ]; then echo "🏟 Checking format in C/C++ files..." - ${buildPackages.fd}/bin/fd --ignore-file=.gitignore --glob '*.[h,hpp,hh,cpp,cxx,cc,c]' --exec-batch clang-format -Werror -n --style=LLVM + ${buildPackages.fd}/bin/fd --ignore-file=.gitignore --glob '*.{h,hpp,hh,cpp,cxx,cc,c}' --exec-batch clang-format -Werror -n --style=LLVM rc=$? if [ $rc -eq 0 ]; then @@ -129,7 +129,7 @@ let script = '' runHook preFormat echo "🏟️ Formatting C++ files..." - ${buildPackages.fd}/bin/fd --glob '*.[h,hpp,hh,cpp,cxx,cc,c]' --exec-batch clang-format --style=LLVM -i "$@" + ${buildPackages.fd}/bin/fd --glob '*.{h,hpp,hh,cpp,cxx,cc,c}' --exec-batch clang-format --style=LLVM -i "$@" runHook postFormat ''; description = "Format source code in the component.";