Skip to content

Commit c4c3203

Browse files
Ericson2314Ericson2314
authored
Merge pull request NixOS#13706 from xokdvium/meson-format
meson: Apply formatting universally
2 parents 041a733 + cf10085 commit c4c3203

File tree

75 files changed

+469
-476
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

75 files changed

+469
-476
lines changed

‎.git-blame-ignore-revs‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,4 @@
11
# bulk initial re-formatting with clang-format
22
e4f62e46088919428a68bd8014201dc8e379fed7 # !autorebase ./maintainers/format.sh --until-stable
3+
# meson re-formatting
4+
385e2c3542c707d95e3784f7f6d623f67e77ab61 # !autorebase ./maintainers/format.sh --until-stable

‎doc/manual/meson.build‎

Lines changed: 22 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
project('nix-manual',
1+
project(
2+
'nix-manual',
23
version : files('.version'),
34
meson_version : '>= 1.1',
45
license : 'LGPL-2.1-or-later',
@@ -8,44 +9,45 @@ nix = find_program('nix', native : true)
89

910
mdbook = find_program('mdbook', native : true)
1011
bash = find_program('bash', native : true)
11-
rsync = find_program('rsync', required: true, native: true)
12+
rsync = find_program('rsync', required : true, native : true)
1213

1314
pymod = import('python')
1415
python = pymod.find_installation('python3')
1516

1617
nix_env_for_docs = {
17-
'HOME': '/dummy',
18-
'NIX_CONF_DIR': '/dummy',
19-
'NIX_SSL_CERT_FILE': '/dummy/no-ca-bundle.crt',
20-
'NIX_STATE_DIR': '/dummy',
21-
'NIX_CONFIG': 'cores = 0',
18+
'HOME' : '/dummy',
19+
'NIX_CONF_DIR' : '/dummy',
20+
'NIX_SSL_CERT_FILE' : '/dummy/no-ca-bundle.crt',
21+
'NIX_STATE_DIR' : '/dummy',
22+
'NIX_CONFIG' : 'cores = 0',
2223
}
2324

24-
nix_for_docs = [nix, '--experimental-features', 'nix-command']
25+
nix_for_docs = [ nix, '--experimental-features', 'nix-command' ]
2526
nix_eval_for_docs_common = nix_for_docs + [
2627
'eval',
27-
'-I', 'nix=' + meson.current_source_dir(),
28+
'-I',
29+
'nix=' + meson.current_source_dir(),
2830
'--store', 'dummy://',
2931
'--impure',
3032
]
3133
nix_eval_for_docs = nix_eval_for_docs_common + '--raw'
3234

3335
conf_file_json = custom_target(
34-
command : nix_for_docs + ['config', 'show', '--json'],
36+
command : nix_for_docs + [ 'config', 'show', '--json' ],
3537
capture : true,
3638
output : 'conf-file.json',
3739
env : nix_env_for_docs,
3840
)
3941

4042
language_json = custom_target(
41-
command: [nix, '__dump-language'],
43+
command : [ nix, '__dump-language' ],
4244
output : 'language.json',
4345
capture : true,
4446
env : nix_env_for_docs,
4547
)
4648

4749
nix3_cli_json = custom_target(
48-
command : [nix, '__dump-cli'],
50+
command : [ nix, '__dump-cli' ],
4951
capture : true,
5052
output : 'nix.json',
5153
env : nix_env_for_docs,
@@ -79,7 +81,8 @@ manual = custom_target(
7981
'manual',
8082
command : [
8183
bash,
82-
'-euo', 'pipefail',
84+
'-euo',
85+
'pipefail',
8386
'-c',
8487
'''
8588
@0@ @INPUT0@ @CURRENT_SOURCE_DIR@ > @DEPFILE@
@@ -120,8 +123,8 @@ manual = custom_target(
120123
],
121124
depfile : 'manual.d',
122125
env : {
123-
'RUST_LOG': 'info',
124-
'MDBOOK_SUBSTITUTE_SEARCH': meson.current_build_dir() / 'source',
126+
'RUST_LOG' : 'info',
127+
'MDBOOK_SUBSTITUTE_SEARCH' : meson.current_build_dir() / 'source',
125128
},
126129
)
127130
manual_html = manual[0]
@@ -133,7 +136,8 @@ install_subdir(
133136
)
134137

135138
nix_nested_manpages = [
136-
[ 'nix-env',
139+
[
140+
'nix-env',
137141
[
138142
'delete-generations',
139143
'install',
@@ -148,7 +152,8 @@ nix_nested_manpages = [
148152
'upgrade',
149153
],
150154
],
151-
[ 'nix-store',
155+
[
156+
'nix-store',
152157
[
153158
'add-fixed',
154159
'add',

‎doc/manual/source/command-ref/meson.build‎

Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,12 @@
11
xp_features_json = custom_target(
2-
command : [nix, '__dump-xp-features'],
2+
command : [ nix, '__dump-xp-features' ],
33
capture : true,
44
output : 'xp-features.json',
55
)
66

77
experimental_features_shortlist_md = custom_target(
88
command : nix_eval_for_docs + [
9-
'--expr',
10-
'import @INPUT0@ (builtins.fromJSON (builtins.readFile ./@INPUT1@))',
9+
'--expr', 'import @INPUT0@ (builtins.fromJSON (builtins.readFile ./@INPUT1@))',
1110
],
1211
input : [
1312
'../../generate-xp-features-shortlist.nix',
@@ -19,14 +18,8 @@ experimental_features_shortlist_md = custom_target(
1918
)
2019

2120
nix3_cli_files = custom_target(
22-
command : [
23-
python.full_path(),
24-
'@INPUT0@',
25-
'@OUTPUT@',
26-
'--'
27-
] + nix_eval_for_docs + [
28-
'--expr',
29-
'import @INPUT1@ true (builtins.readFile ./@INPUT2@)',
21+
command : [ python.full_path(), '@INPUT0@', '@OUTPUT@', '--' ] + nix_eval_for_docs + [
22+
'--expr', 'import @INPUT1@ true (builtins.readFile ./@INPUT2@)',
3023
],
3124
input : [
3225
'../../remove_before_wrapper.py',
@@ -40,8 +33,7 @@ nix3_cli_files = custom_target(
4033
conf_file_md_body = custom_target(
4134
command : [
4235
nix_eval_for_docs,
43-
'--expr',
44-
'import @INPUT0@ { prefix = "conf"; } (builtins.fromJSON (builtins.readFile ./@INPUT1@))',
36+
'--expr', 'import @INPUT0@ { prefix = "conf"; } (builtins.fromJSON (builtins.readFile ./@INPUT1@))',
4537
],
4638
capture : true,
4739
input : [

‎doc/manual/source/development/meson.build‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
experimental_feature_descriptions_md = custom_target(
22
command : nix_eval_for_docs + [
3-
'--expr',
4-
'import @INPUT0@ (builtins.fromJSON (builtins.readFile @INPUT1@))',
3+
'--expr', 'import @INPUT0@ (builtins.fromJSON (builtins.readFile @INPUT1@))',
54
],
65
input : [
76
'../../generate-xp-features.nix',

‎doc/manual/source/language/meson.build‎

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,13 @@
11
builtins_md = custom_target(
2-
command : [
3-
python.full_path(),
4-
'@INPUT0@',
5-
'@OUTPUT@',
6-
'--'
7-
] + nix_eval_for_docs + [
8-
'--expr',
9-
'(builtins.readFile @INPUT3@) + import @INPUT1@ (builtins.fromJSON (builtins.readFile ./@INPUT2@)) + (builtins.readFile @INPUT4@)',
2+
command : [ python.full_path(), '@INPUT0@', '@OUTPUT@', '--' ] + nix_eval_for_docs + [
3+
'--expr', '(builtins.readFile @INPUT3@) + import @INPUT1@ (builtins.fromJSON (builtins.readFile ./@INPUT2@)) + (builtins.readFile @INPUT4@)',
104
],
115
input : [
126
'../../remove_before_wrapper.py',
137
'../../generate-builtins.nix',
148
language_json,
159
'builtins-prefix.md',
16-
'builtins-suffix.md'
10+
'builtins-suffix.md',
1711
],
1812
output : 'builtins.md',
1913
env : nix_env_for_docs,

‎doc/manual/source/meson.build‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
summary_rl_next = custom_target(
22
command : [
33
bash,
4-
'-euo', 'pipefail',
4+
'-euo',
5+
'pipefail',
56
'-c',
67
'''
78
if [ -e "@INPUT@" ]; then
@@ -12,6 +13,6 @@ summary_rl_next = custom_target(
1213
input : [
1314
rl_next_generated,
1415
],
15-
capture: true,
16+
capture : true,
1617
output : 'SUMMARY-rl-next.md',
1718
)

‎doc/manual/source/store/meson.build‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,6 @@
11
types_dir = custom_target(
2-
command : [
3-
python.full_path(),
4-
'@INPUT0@',
5-
'@OUTPUT@',
6-
'--'
7-
] + nix_eval_for_docs + [
8-
'--expr',
9-
'import @INPUT1@ (builtins.fromJSON (builtins.readFile ./@INPUT2@)).stores',
2+
command : [ python.full_path(), '@INPUT0@', '@OUTPUT@', '--' ] + nix_eval_for_docs + [
3+
'--expr', 'import @INPUT1@ (builtins.fromJSON (builtins.readFile ./@INPUT2@)).stores',
104
],
115
input : [
126
'../../remove_before_wrapper.py',

‎maintainers/flake-module.nix‎

Lines changed: 23 additions & 112 deletions
Original file line numberDiff line numberDiff line change
@@ -37,118 +37,29 @@
3737
fi
3838
''}";
3939
};
40-
meson-format = {
41-
enable = true;
42-
files = "(meson.build|meson.options)$";
43-
entry = "${pkgs.writeScript "format-meson" ''
44-
#!${pkgs.runtimeShell}
45-
for file in "$@"; do
46-
${lib.getExe pkgs.meson} format -ic ${../meson.format} "$file"
47-
done
48-
''}";
49-
excludes = [
50-
# We haven't applied formatting to these files yet
51-
''^doc/manual/meson.build$''
52-
''^doc/manual/source/command-ref/meson.build$''
53-
''^doc/manual/source/development/meson.build$''
54-
''^doc/manual/source/language/meson.build$''
55-
''^doc/manual/source/meson.build$''
56-
''^doc/manual/source/release-notes/meson.build$''
57-
''^doc/manual/source/store/meson.build$''
58-
''^misc/bash/meson.build$''
59-
''^misc/fish/meson.build$''
60-
''^misc/launchd/meson.build$''
61-
''^misc/meson.build$''
62-
''^misc/systemd/meson.build$''
63-
''^misc/zsh/meson.build$''
64-
''^nix-meson-build-support/$''
65-
''^nix-meson-build-support/big-objs/meson.build$''
66-
''^nix-meson-build-support/common/meson.build$''
67-
''^nix-meson-build-support/deps-lists/meson.build$''
68-
''^nix-meson-build-support/export/meson.build$''
69-
''^nix-meson-build-support/export-all-symbols/meson.build$''
70-
''^nix-meson-build-support/generate-header/meson.build$''
71-
''^nix-meson-build-support/libatomic/meson.build$''
72-
''^nix-meson-build-support/subprojects/meson.build$''
73-
''^scripts/meson.build$''
74-
''^src/external-api-docs/meson.build$''
75-
''^src/internal-api-docs/meson.build$''
76-
''^src/libcmd/include/nix/cmd/meson.build$''
77-
''^src/libcmd/meson.build$''
78-
''^src/libcmd/nix-meson-build-support$''
79-
''^src/libexpr/include/nix/expr/meson.build$''
80-
''^src/libexpr/meson.build$''
81-
''^src/libexpr/nix-meson-build-support$''
82-
''^src/libexpr-c/meson.build$''
83-
''^src/libexpr-c/nix-meson-build-support$''
84-
''^src/libexpr-test-support/meson.build$''
85-
''^src/libexpr-test-support/nix-meson-build-support$''
86-
''^src/libexpr-tests/meson.build$''
87-
''^src/libexpr-tests/nix-meson-build-support$''
88-
''^src/libfetchers/include/nix/fetchers/meson.build$''
89-
''^src/libfetchers/meson.build$''
90-
''^src/libfetchers/nix-meson-build-support$''
91-
''^src/libfetchers-c/meson.build$''
92-
''^src/libfetchers-c/nix-meson-build-support$''
93-
''^src/libfetchers-tests/meson.build$''
94-
''^src/libfetchers-tests/nix-meson-build-support$''
95-
''^src/libflake/include/nix/flake/meson.build$''
96-
''^src/libflake/meson.build$''
97-
''^src/libflake/nix-meson-build-support$''
98-
''^src/libflake-c/meson.build$''
99-
''^src/libflake-c/nix-meson-build-support$''
100-
''^src/libflake-tests/meson.build$''
101-
''^src/libflake-tests/nix-meson-build-support$''
102-
''^src/libmain/include/nix/main/meson.build$''
103-
''^src/libmain/meson.build$''
104-
''^src/libmain/nix-meson-build-support$''
105-
''^src/libmain-c/meson.build$''
106-
''^src/libmain-c/nix-meson-build-support$''
107-
''^src/libstore/include/nix/store/meson.build$''
108-
''^src/libstore/meson.build$''
109-
''^src/libstore/nix-meson-build-support$''
110-
''^src/libstore/unix/include/nix/store/meson.build$''
111-
''^src/libstore/unix/meson.build$''
112-
''^src/libstore/windows/meson.build$''
113-
''^src/libstore-c/meson.build$''
114-
''^src/libstore-c/nix-meson-build-support$''
115-
''^src/libstore-test-support/include/nix/store/tests/meson.build$''
116-
''^src/libstore-test-support/meson.build$''
117-
''^src/libstore-test-support/nix-meson-build-support$''
118-
''^src/libstore-tests/meson.build$''
119-
''^src/libstore-tests/nix-meson-build-support$''
120-
''^src/libutil/meson.build$''
121-
''^src/libutil/nix-meson-build-support$''
122-
''^src/libutil/unix/include/nix/util/meson.build$''
123-
''^src/libutil/unix/meson.build$''
124-
''^src/libutil/windows/meson.build$''
125-
''^src/libutil-c/meson.build$''
126-
''^src/libutil-c/nix-meson-build-support$''
127-
''^src/libutil-test-support/include/nix/util/tests/meson.build$''
128-
''^src/libutil-test-support/meson.build$''
129-
''^src/libutil-test-support/nix-meson-build-support$''
130-
''^src/libutil-tests/meson.build$''
131-
''^src/libutil-tests/nix-meson-build-support$''
132-
''^src/nix/meson.build$''
133-
''^src/nix/nix-meson-build-support$''
134-
''^src/perl/lib/Nix/meson.build$''
135-
''^src/perl/meson.build$''
136-
''^tests/functional/ca/meson.build$''
137-
''^tests/functional/common/meson.build$''
138-
''^tests/functional/dyn-drv/meson.build$''
139-
''^tests/functional/flakes/meson.build$''
140-
''^tests/functional/git-hashing/meson.build$''
141-
''^tests/functional/local-overlay-store/meson.build$''
142-
''^tests/functional/meson.build$''
143-
''^src/libcmd/meson.options$''
144-
''^src/libexpr/meson.options$''
145-
''^src/libstore/meson.options$''
146-
''^src/libutil/meson.options$''
147-
''^src/libutil-c/meson.options$''
148-
''^src/nix/meson.options$''
149-
''^src/perl/meson.options$''
150-
];
151-
};
40+
meson-format =
41+
let
42+
meson = pkgs.meson.overrideAttrs {
43+
doCheck = false;
44+
doInstallCheck = false;
45+
patches = [
46+
(pkgs.fetchpatch {
47+
url = "https://github.com/mesonbuild/meson/commit/38d29b4dd19698d5cad7b599add2a69b243fd88a.patch";
48+
hash = "sha256-PgPBvGtCISKn1qQQhzBW5XfknUe91i5XGGBcaUK4yeE=";
49+
})
50+
];
51+
};
52+
in
53+
{
54+
enable = true;
55+
files = "(meson.build|meson.options)$";
56+
entry = "${pkgs.writeScript "format-meson" ''
57+
#!${pkgs.runtimeShell}
58+
for file in "$@"; do
59+
${lib.getExe meson} format -ic ${../meson.format} "$file"
60+
done
61+
''}";
62+
};
15263
nixfmt-rfc-style = {
15364
enable = true;
15465
excludes = [

‎meson.build‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@ project(
88
subproject_dir : 'src',
99
default_options : [
1010
'localstatedir=/nix/var',
11-
# hack for trailing newline
1211
],
1312
meson_version : '>= 1.1',
1413
)

‎misc/launchd/meson.build‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,5 @@ configure_file(
99
# 'storedir' : store_dir,
1010
# 'localstatedir' : localstatedir,
1111
# 'bindir' : bindir,
12-
},
12+
},
1313
)

0 commit comments

Comments
 (0)