diff --git a/lix/libexpr/meson.build b/lix/libexpr/meson.build index 61eee272e..03a61a83e 100644 --- a/lix/libexpr/meson.build +++ b/lix/libexpr/meson.build @@ -14,6 +14,7 @@ endforeach subdir('flake') libexpr_setting_definitions = files( + # keep-sorted start 'settings/allow-import-from-derivation.md', 'settings/allow-unsafe-native-code-during-evaluation.md', 'settings/allowed-uris.md', @@ -28,6 +29,7 @@ libexpr_setting_definitions = files( 'settings/restrict-eval.md', 'settings/trace-function-calls.md', 'settings/trace-verbose.md', + # keep-sorted end ) libexpr_settings_header = custom_target( command : [ @@ -45,6 +47,7 @@ libexpr_settings_header = custom_target( ) builtin_definitions = files( + # keep-sorted start 'builtins/abort.md', 'builtins/add.md', 'builtins/addDrvOutputDependencies.md', @@ -145,6 +148,7 @@ builtin_definitions = files( 'builtins/typeOf.md', 'builtins/unsafeDiscardOutputDependency.md', 'builtins/zipAttrsWith.md', + # keep-sorted end ) builtins_gen = custom_target( command : [ @@ -165,6 +169,7 @@ register_builtins_header = builtins_gen[0] builtins_md = builtins_gen[1] builtin_constant_definitions = files( + # keep-sorted start 'builtin-constants/builtins.md', 'builtin-constants/currentSystem.md', 'builtin-constants/currentTime.md', @@ -175,6 +180,7 @@ builtin_constant_definitions = files( 'builtin-constants/null.md', 'builtin-constants/storeDir.md', 'builtin-constants/true.md', + # keep-sorted end ) builtin_constants_gen = custom_target( command : [ @@ -194,38 +200,41 @@ register_builtin_constants_header = builtin_constants_gen[0] builtin_constants_md = builtin_constants_gen[1] libexpr_sources = files( + # keep-sorted start 'attr-path.cc', 'attr-set.cc', 'eval-cache.cc', 'eval-error.cc', 'eval-settings.cc', 'eval.cc', - 'function-trace.cc', - 'get-drvs.cc', - 'gc-alloc.cc', - 'json-to-value.cc', - 'nixexpr.cc', - 'parser/parser.cc', - 'primops.cc', - 'print-ambiguous.cc', - 'print.cc', - 'search-path.cc', - 'value.cc', - 'value-to-json.cc', - 'value-to-xml.cc', 'flake/config.cc', 'flake/flake.cc', 'flake/flakeref.cc', 'flake/lockfile.cc', + 'function-trace.cc', + 'gc-alloc.cc', + 'get-drvs.cc', + 'json-to-value.cc', + 'nixexpr.cc', + 'parser/parser.cc', + 'primops.cc', 'primops/context.cc', 'primops/fetchClosure.cc', 'primops/fetchMercurial.cc', 'primops/fetchTree.cc', 'primops/fromTOML.cc', + 'print-ambiguous.cc', + 'print.cc', + 'search-path.cc', + 'value-to-json.cc', + 'value-to-xml.cc', + 'value.cc', 'value/context.cc', + # keep-sorted end ) libexpr_headers = files( + # keep-sorted start 'attr-path.hh', 'attr-set.hh', 'eval-cache.hh', @@ -237,9 +246,9 @@ libexpr_headers = files( 'flake/flakeref.hh', 'flake/lockfile.hh', 'function-trace.hh', + 'gc-alloc.hh', 'gc-small-vector.hh', 'get-drvs.hh', - 'gc-alloc.hh', 'json-to-value.hh', 'nixexpr.hh', 'parser/change_head.hh', @@ -254,10 +263,11 @@ libexpr_headers = files( 'repl-exit-status.hh', 'search-path.hh', 'symbol-table.hh', - 'value/context.hh', 'value-to-json.hh', 'value-to-xml.hh', 'value.hh', + 'value/context.hh', + # keep-sorted end ) libexpr = library( diff --git a/lix/libstore/meson.build b/lix/libstore/meson.build index fa3d206c2..2b2616d06 100644 --- a/lix/libstore/meson.build +++ b/lix/libstore/meson.build @@ -13,12 +13,14 @@ endforeach libstore_settings_headers = [] file_transfer_setting_definitions = files( + # keep-sorted start 'file-transfer-settings/connect-timeout.md', 'file-transfer-settings/download-attempts.md', 'file-transfer-settings/http-connections.md', 'file-transfer-settings/http2.md', 'file-transfer-settings/stalled-download-timeout.md', 'file-transfer-settings/user-agent-suffix.md', + # keep-sorted end ) libstore_settings_headers += custom_target( command : [ @@ -36,6 +38,7 @@ libstore_settings_headers += custom_target( ) libstore_setting_definitions = files( + # keep-sorted start 'settings/allow-symlinked-store.md', 'settings/allowed-impure-host-deps.md', 'settings/always-allow-substitutes.md', @@ -108,6 +111,7 @@ libstore_setting_definitions = files( 'settings/use-cgroups.md', 'settings/use-sqlite-wal.md', 'settings/use-xdg-base-directories.md', + # keep-sorted end ) libstore_settings_headers += custom_target( command : [ @@ -125,8 +129,22 @@ libstore_settings_headers += custom_target( ) libstore_sources = files( + # keep-sorted start 'binary-cache-store.cc', 'build-result.cc', + 'build/child.cc', + 'build/derivation-goal.cc', + 'build/drv-output-substitution-goal.cc', + 'build/entry-points.cc', + 'build/goal.cc', + 'build/hook-instance.cc', + 'build/local-derivation-goal.cc', + 'build/personality.cc', + 'build/substitution-goal.cc', + 'build/worker.cc', + 'builtins/buildenv.cc', + 'builtins/fetchurl.cc', + 'builtins/unpack-channel.cc', 'common-protocol.cc', 'content-address.cc', 'crypto.cc', @@ -176,24 +194,14 @@ libstore_sources = files( 'temporary-dir.cc', 'uds-remote-store.cc', 'worker-protocol.cc', - 'build/child.cc', - 'build/derivation-goal.cc', - 'build/drv-output-substitution-goal.cc', - 'build/entry-points.cc', - 'build/goal.cc', - 'build/hook-instance.cc', - 'build/local-derivation-goal.cc', - 'build/personality.cc', - 'build/substitution-goal.cc', - 'build/worker.cc', - 'builtins/buildenv.cc', - 'builtins/fetchurl.cc', - 'builtins/unpack-channel.cc', + # keep-sorted end ) libstore_headers = files( + # keep-sorted start 'binary-cache-store.hh', + 'build-result.hh', 'build/child.hh', 'build/derivation-goal.hh', 'build/drv-output-substitution-goal.hh', @@ -203,9 +211,8 @@ libstore_headers = files( 'build/personality.hh', 'build/substitution-goal.hh', 'build/worker.hh', - 'build-result.hh', - 'builtins/buildenv.hh', 'builtins.hh', + 'builtins/buildenv.hh', 'common-protocol-impl.hh', 'common-protocol.hh', 'content-address.hh', @@ -253,14 +260,15 @@ libstore_headers = files( 'serve-protocol-impl.hh', 'serve-protocol.hh', 'sqlite.hh', - 'ssh.hh', 'ssh-store.hh', + 'ssh.hh', 'store-api.hh', 'store-cast.hh', 'temporary-dir.hh', 'uds-remote-store.hh', 'worker-protocol-impl.hh', 'worker-protocol.hh', + # keep-sorted end ) if host_machine.system() == 'linux' diff --git a/lix/libutil/meson.build b/lix/libutil/meson.build index 7a93b4981..a78f67e5b 100644 --- a/lix/libutil/meson.build +++ b/lix/libutil/meson.build @@ -1,4 +1,5 @@ libutil_sources = files( + # keep-sorted start 'archive.cc', 'args.cc', 'async-io.cc', @@ -42,23 +43,25 @@ libutil_sources = files( 'thread-name.cc', 'thread-pool.cc', 'unix-domain-socket.cc', - 'url.cc', 'url-name.cc', + 'url.cc', 'users.cc', 'xml-writer.cc', + # keep-sorted end ) libutil_headers = files( - 'apply-config-options.hh', + # keep-sorted start 'abstract-setting-to-json.hh', 'ansicolor.hh', + 'apply-config-options.hh', 'archive.hh', - 'args/root.hh', 'args.hh', + 'args/root.hh', 'async-collect.hh', 'async-io.hh', - 'async.hh', 'async-semaphore.hh', + 'async.hh', 'backed-string-view.hh', 'box_ptr.hh', 'canon-path.hh', @@ -74,16 +77,16 @@ libutil_headers = files( 'config-impl.hh', 'config.hh', 'current-process.hh', - 'deprecated-features.hh', 'deprecated-features-json.hh', + 'deprecated-features.hh', 'english.hh', 'environment-variables.hh', 'error.hh', 'escape-char.hh', 'escape-string.hh', 'exit.hh', - 'experimental-features.hh', 'experimental-features-json.hh', + 'experimental-features.hh', 'file-descriptor.hh', 'file-system.hh', 'finally.hh', @@ -93,10 +96,10 @@ libutil_headers = files( 'hash.hh', 'hilite.hh', 'input-accessor.hh', - 'json.hh', 'json-fwd.hh', - 'logging.hh', + 'json.hh', 'logging-json.hh', + 'logging.hh', 'lru-cache.hh', 'manually-drop.hh', 'monitor-fd.hh', @@ -128,15 +131,17 @@ libutil_headers = files( 'topo-sort.hh', 'types.hh', 'unix-domain-socket.hh', - 'url-parts.hh', 'url-name.hh', + 'url-parts.hh', 'url.hh', 'users.hh', 'variant-wrapper.hh', 'xml-writer.hh', + # keep-sorted end ) experimental_feature_definitions = files( + # keep-sorted start 'experimental-features/auto-allocate-uids.md', 'experimental-features/ca-derivations.md', 'experimental-features/cgroups.md', @@ -153,15 +158,18 @@ experimental_feature_definitions = files( 'experimental-features/read-only-local-store.md', 'experimental-features/recursive-nix.md', 'experimental-features/repl-automation.md', + # keep-sorted end ) deprecated_feature_definitions = files( + # keep-sorted start 'deprecated-features/ancient-let.md', 'deprecated-features/cr-line-endings.md', 'deprecated-features/nul-bytes.md', 'deprecated-features/rec-set-overrides.md', - 'deprecated-features/url-literals.md', 'deprecated-features/shadow-internal-symbols.md', + 'deprecated-features/url-literals.md', + # keep-sorted end ) experimental_features_gen = custom_target(