1
1
Fork 0
mirror of https://github.com/NixOS/nix.git synced 2025-11-09 12:06:01 +01:00

maintainers: Fetch patch for multiline formatting in meson

This commit is contained in:
Sergei Zimmerman 2025-08-07 02:34:21 +03:00
parent 9ff4c446df
commit da028aa454
No known key found for this signature in database

View file

@ -37,118 +37,131 @@
fi fi
''}"; ''}";
}; };
meson-format = { meson-format =
enable = true; let
files = "(meson.build|meson.options)$"; meson = pkgs.meson.overrideAttrs {
entry = "${pkgs.writeScript "format-meson" '' doCheck = false;
#!${pkgs.runtimeShell} doInstallCheck = false;
for file in "$@"; do patches = [
${lib.getExe pkgs.meson} format -ic ${../meson.format} "$file" (pkgs.fetchpatch {
done url = "https://github.com/mesonbuild/meson/commit/38d29b4dd19698d5cad7b599add2a69b243fd88a.patch";
''}"; hash = "sha256-PgPBvGtCISKn1qQQhzBW5XfknUe91i5XGGBcaUK4yeE=";
excludes = [ })
# We haven't applied formatting to these files yet ];
''^doc/manual/meson.build$'' };
''^doc/manual/source/command-ref/meson.build$'' in
''^doc/manual/source/development/meson.build$'' {
''^doc/manual/source/language/meson.build$'' enable = true;
''^doc/manual/source/meson.build$'' files = "(meson.build|meson.options)$";
''^doc/manual/source/release-notes/meson.build$'' entry = "${pkgs.writeScript "format-meson" ''
''^doc/manual/source/store/meson.build$'' #!${pkgs.runtimeShell}
''^misc/bash/meson.build$'' for file in "$@"; do
''^misc/fish/meson.build$'' ${lib.getExe meson} format -ic ${../meson.format} "$file"
''^misc/launchd/meson.build$'' done
''^misc/meson.build$'' ''}";
''^misc/systemd/meson.build$'' excludes = [
''^misc/zsh/meson.build$'' # We haven't applied formatting to these files yet
''^nix-meson-build-support/$'' ''^doc/manual/meson.build$''
''^nix-meson-build-support/big-objs/meson.build$'' ''^doc/manual/source/command-ref/meson.build$''
''^nix-meson-build-support/common/meson.build$'' ''^doc/manual/source/development/meson.build$''
''^nix-meson-build-support/deps-lists/meson.build$'' ''^doc/manual/source/language/meson.build$''
''^nix-meson-build-support/export/meson.build$'' ''^doc/manual/source/meson.build$''
''^nix-meson-build-support/export-all-symbols/meson.build$'' ''^doc/manual/source/release-notes/meson.build$''
''^nix-meson-build-support/generate-header/meson.build$'' ''^doc/manual/source/store/meson.build$''
''^nix-meson-build-support/libatomic/meson.build$'' ''^misc/bash/meson.build$''
''^nix-meson-build-support/subprojects/meson.build$'' ''^misc/fish/meson.build$''
''^scripts/meson.build$'' ''^misc/launchd/meson.build$''
''^src/external-api-docs/meson.build$'' ''^misc/meson.build$''
''^src/internal-api-docs/meson.build$'' ''^misc/systemd/meson.build$''
''^src/libcmd/include/nix/cmd/meson.build$'' ''^misc/zsh/meson.build$''
''^src/libcmd/meson.build$'' ''^nix-meson-build-support/$''
''^src/libcmd/nix-meson-build-support$'' ''^nix-meson-build-support/big-objs/meson.build$''
''^src/libexpr/include/nix/expr/meson.build$'' ''^nix-meson-build-support/common/meson.build$''
''^src/libexpr/meson.build$'' ''^nix-meson-build-support/deps-lists/meson.build$''
''^src/libexpr/nix-meson-build-support$'' ''^nix-meson-build-support/export/meson.build$''
''^src/libexpr-c/meson.build$'' ''^nix-meson-build-support/export-all-symbols/meson.build$''
''^src/libexpr-c/nix-meson-build-support$'' ''^nix-meson-build-support/generate-header/meson.build$''
''^src/libexpr-test-support/meson.build$'' ''^nix-meson-build-support/libatomic/meson.build$''
''^src/libexpr-test-support/nix-meson-build-support$'' ''^nix-meson-build-support/subprojects/meson.build$''
''^src/libexpr-tests/meson.build$'' ''^scripts/meson.build$''
''^src/libexpr-tests/nix-meson-build-support$'' ''^src/external-api-docs/meson.build$''
''^src/libfetchers/include/nix/fetchers/meson.build$'' ''^src/internal-api-docs/meson.build$''
''^src/libfetchers/meson.build$'' ''^src/libcmd/include/nix/cmd/meson.build$''
''^src/libfetchers/nix-meson-build-support$'' ''^src/libcmd/meson.build$''
''^src/libfetchers-c/meson.build$'' ''^src/libcmd/nix-meson-build-support$''
''^src/libfetchers-c/nix-meson-build-support$'' ''^src/libexpr/include/nix/expr/meson.build$''
''^src/libfetchers-tests/meson.build$'' ''^src/libexpr/meson.build$''
''^src/libfetchers-tests/nix-meson-build-support$'' ''^src/libexpr/nix-meson-build-support$''
''^src/libflake/include/nix/flake/meson.build$'' ''^src/libexpr-c/meson.build$''
''^src/libflake/meson.build$'' ''^src/libexpr-c/nix-meson-build-support$''
''^src/libflake/nix-meson-build-support$'' ''^src/libexpr-test-support/meson.build$''
''^src/libflake-c/meson.build$'' ''^src/libexpr-test-support/nix-meson-build-support$''
''^src/libflake-c/nix-meson-build-support$'' ''^src/libexpr-tests/meson.build$''
''^src/libflake-tests/meson.build$'' ''^src/libexpr-tests/nix-meson-build-support$''
''^src/libflake-tests/nix-meson-build-support$'' ''^src/libfetchers/include/nix/fetchers/meson.build$''
''^src/libmain/include/nix/main/meson.build$'' ''^src/libfetchers/meson.build$''
''^src/libmain/meson.build$'' ''^src/libfetchers/nix-meson-build-support$''
''^src/libmain/nix-meson-build-support$'' ''^src/libfetchers-c/meson.build$''
''^src/libmain-c/meson.build$'' ''^src/libfetchers-c/nix-meson-build-support$''
''^src/libmain-c/nix-meson-build-support$'' ''^src/libfetchers-tests/meson.build$''
''^src/libstore/include/nix/store/meson.build$'' ''^src/libfetchers-tests/nix-meson-build-support$''
''^src/libstore/meson.build$'' ''^src/libflake/include/nix/flake/meson.build$''
''^src/libstore/nix-meson-build-support$'' ''^src/libflake/meson.build$''
''^src/libstore/unix/include/nix/store/meson.build$'' ''^src/libflake/nix-meson-build-support$''
''^src/libstore/unix/meson.build$'' ''^src/libflake-c/meson.build$''
''^src/libstore/windows/meson.build$'' ''^src/libflake-c/nix-meson-build-support$''
''^src/libstore-c/meson.build$'' ''^src/libflake-tests/meson.build$''
''^src/libstore-c/nix-meson-build-support$'' ''^src/libflake-tests/nix-meson-build-support$''
''^src/libstore-test-support/include/nix/store/tests/meson.build$'' ''^src/libmain/include/nix/main/meson.build$''
''^src/libstore-test-support/meson.build$'' ''^src/libmain/meson.build$''
''^src/libstore-test-support/nix-meson-build-support$'' ''^src/libmain/nix-meson-build-support$''
''^src/libstore-tests/meson.build$'' ''^src/libmain-c/meson.build$''
''^src/libstore-tests/nix-meson-build-support$'' ''^src/libmain-c/nix-meson-build-support$''
''^src/libutil/meson.build$'' ''^src/libstore/include/nix/store/meson.build$''
''^src/libutil/nix-meson-build-support$'' ''^src/libstore/meson.build$''
''^src/libutil/unix/include/nix/util/meson.build$'' ''^src/libstore/nix-meson-build-support$''
''^src/libutil/unix/meson.build$'' ''^src/libstore/unix/include/nix/store/meson.build$''
''^src/libutil/windows/meson.build$'' ''^src/libstore/unix/meson.build$''
''^src/libutil-c/meson.build$'' ''^src/libstore/windows/meson.build$''
''^src/libutil-c/nix-meson-build-support$'' ''^src/libstore-c/meson.build$''
''^src/libutil-test-support/include/nix/util/tests/meson.build$'' ''^src/libstore-c/nix-meson-build-support$''
''^src/libutil-test-support/meson.build$'' ''^src/libstore-test-support/include/nix/store/tests/meson.build$''
''^src/libutil-test-support/nix-meson-build-support$'' ''^src/libstore-test-support/meson.build$''
''^src/libutil-tests/meson.build$'' ''^src/libstore-test-support/nix-meson-build-support$''
''^src/libutil-tests/nix-meson-build-support$'' ''^src/libstore-tests/meson.build$''
''^src/nix/meson.build$'' ''^src/libstore-tests/nix-meson-build-support$''
''^src/nix/nix-meson-build-support$'' ''^src/libutil/meson.build$''
''^src/perl/lib/Nix/meson.build$'' ''^src/libutil/nix-meson-build-support$''
''^src/perl/meson.build$'' ''^src/libutil/unix/include/nix/util/meson.build$''
''^tests/functional/ca/meson.build$'' ''^src/libutil/unix/meson.build$''
''^tests/functional/common/meson.build$'' ''^src/libutil/windows/meson.build$''
''^tests/functional/dyn-drv/meson.build$'' ''^src/libutil-c/meson.build$''
''^tests/functional/flakes/meson.build$'' ''^src/libutil-c/nix-meson-build-support$''
''^tests/functional/git-hashing/meson.build$'' ''^src/libutil-test-support/include/nix/util/tests/meson.build$''
''^tests/functional/local-overlay-store/meson.build$'' ''^src/libutil-test-support/meson.build$''
''^tests/functional/meson.build$'' ''^src/libutil-test-support/nix-meson-build-support$''
''^src/libcmd/meson.options$'' ''^src/libutil-tests/meson.build$''
''^src/libexpr/meson.options$'' ''^src/libutil-tests/nix-meson-build-support$''
''^src/libstore/meson.options$'' ''^src/nix/meson.build$''
''^src/libutil/meson.options$'' ''^src/nix/nix-meson-build-support$''
''^src/libutil-c/meson.options$'' ''^src/perl/lib/Nix/meson.build$''
''^src/nix/meson.options$'' ''^src/perl/meson.build$''
''^src/perl/meson.options$'' ''^tests/functional/ca/meson.build$''
]; ''^tests/functional/common/meson.build$''
}; ''^tests/functional/dyn-drv/meson.build$''
''^tests/functional/flakes/meson.build$''
''^tests/functional/git-hashing/meson.build$''
''^tests/functional/local-overlay-store/meson.build$''
''^tests/functional/meson.build$''
''^src/libcmd/meson.options$''
''^src/libexpr/meson.options$''
''^src/libstore/meson.options$''
''^src/libutil/meson.options$''
''^src/libutil-c/meson.options$''
''^src/nix/meson.options$''
''^src/perl/meson.options$''
];
};
nixfmt-rfc-style = { nixfmt-rfc-style = {
enable = true; enable = true;
excludes = [ excludes = [