1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-06-24 13:51:16 +02:00

Restore multiline formatting of lists in meson files

Applies a workaround to enforce multiline formatting
of lists to reduce code churn introduced in 93a42a5971.
This commit is contained in:
Sergei Zimmerman 2025-06-20 23:12:36 +03:00
parent 42ea2724a8
commit 6ef683cb2a
No known key found for this signature in database
GPG key ID: A9B0B557CA632325
12 changed files with 54 additions and 12 deletions

View file

@ -6,7 +6,10 @@ project(
'cpp', 'cpp',
version : files('.version'), version : files('.version'),
subproject_dir : 'src', subproject_dir : 'src',
default_options : [ 'localstatedir=/nix/var' ], default_options : [
'localstatedir=/nix/var',
# hack for trailing newline
],
meson_version : '>= 1.1', meson_version : '>= 1.1',
) )

View file

@ -2,4 +2,9 @@
include_dirs = [ include_directories('../../..') ] include_dirs = [ include_directories('../../..') ]
headers = files('libexpr.hh', 'nix_api_expr.hh', 'value/context.hh') headers = files(
'libexpr.hh',
'nix_api_expr.hh',
'value/context.hh',
# hack for trailing newline
)

View file

@ -1,3 +1,6 @@
include_dirs += include_directories('../..') include_dirs += include_directories('../..')
headers += files('personality.hh') headers += files(
'personality.hh',
# hack for trailing newline
)

View file

@ -1,3 +1,6 @@
sources += files('personality.cc') sources += files(
'personality.cc',
# hack for trailing newline
)
subdir('include/nix/store') subdir('include/nix/store')

View file

@ -2,4 +2,7 @@
include_dirs += include_directories('../..') include_dirs += include_directories('../..')
headers += files('freebsd-jail.hh') headers += files(
'freebsd-jail.hh',
# hack for trailing newline
)

View file

@ -1,3 +1,6 @@
sources += files('freebsd-jail.cc') sources += files(
'freebsd-jail.cc',
# hack for trailing newline
)
subdir('include/nix/util') subdir('include/nix/util')

View file

@ -2,4 +2,8 @@
include_dirs += include_directories('../..') include_dirs += include_directories('../..')
headers += files('cgroup.hh', 'linux-namespaces.hh') headers += files(
'cgroup.hh',
'linux-namespaces.hh',
# hack for trailing newline
)

View file

@ -1,3 +1,7 @@
sources += files('cgroup.cc', 'linux-namespaces.cc') sources += files(
'cgroup.cc',
'linux-namespaces.cc',
# hack for trailing newline
)
subdir('include/nix/util') subdir('include/nix/util')

View file

@ -2,4 +2,9 @@
include_dirs += include_directories('../..') include_dirs += include_directories('../..')
headers += files('signals-impl.hh', 'windows-async-pipe.hh', 'windows-error.hh') headers += files(
'signals-impl.hh',
'windows-async-pipe.hh',
'windows-error.hh',
# hack for trailing newline
)

View file

@ -5,7 +5,10 @@
# src # src
#--------------------------------------------------- #---------------------------------------------------
nix_perl_tests = files('init.t') nix_perl_tests = files(
'init.t',
# hack for trailing newline
)
foreach f : nix_perl_tests foreach f : nix_perl_tests

View file

@ -1,6 +1,9 @@
libplugintest = shared_module( libplugintest = shared_module(
'plugintest', 'plugintest',
'plugintest.cc', 'plugintest.cc',
dependencies : [ dependency('nix-expr') ], dependencies : [
dependency('nix-expr'),
# hack for trailing newline
],
build_by_default : false, build_by_default : false,
) )

View file

@ -1,6 +1,9 @@
libstoreconsumer_tester = executable( libstoreconsumer_tester = executable(
'test-libstoreconsumer', 'test-libstoreconsumer',
'main.cc', 'main.cc',
dependencies : [ dependency('nix-store') ], dependencies : [
dependency('nix-store'),
# hack for trailing newline
],
build_by_default : false, build_by_default : false,
) )