diff --git a/README.md b/README.md index 588e506d5..14871f0b8 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ For systems that **already have a Nix implementation installed**, such as NixOS ## Building And Developing -See our [Hacking guide](https://git.lix.systems/lix-project/lix/src/branch/main/doc/manual/src/contributing/hacking.md) in our manual for instruction on how to to set up a development environment and build Lix from source. +See our [Hacking guide](https://git.lix.systems/lix-project/lix/src/branch/main/doc/manual/src/contributing/hacking.md) in our manual for instruction on how to set up a development environment and build Lix from source. ## Additional Resources diff --git a/doc/manual/rl-next/crash-in-syslog.md b/doc/manual/rl-next/crash-in-syslog.md index f9181d9d2..1e3c54564 100644 --- a/doc/manual/rl-next/crash-in-syslog.md +++ b/doc/manual/rl-next/crash-in-syslog.md @@ -1,5 +1,5 @@ --- -synopsis: "Crashs land in syslog now" +synopsis: "Crashes land in syslog now" cls: [2640] category: Improvements credits: [jade] diff --git a/doc/manual/rl-next/deprecated-features.md b/doc/manual/rl-next/deprecated-features.md index 0d4e7a606..fbdc9887f 100644 --- a/doc/manual/rl-next/deprecated-features.md +++ b/doc/manual/rl-next/deprecated-features.md @@ -9,5 +9,5 @@ credits: [piegames, horrors] This release cycle features a new batch of deprecated (anti-)features. You can opt in into the old behavior with `--extra-deprecated-features` or any equivalent configuration option. -- `cr-line-endings`: Current handling of CR (`\r`) or CRLF (`\r\n`) line endings in Nix is inconsistent and broken, and will lead to unexpected evaluation results with certain strings. Given that fixing the semantics might silently alter the evaluation result of derivations, the only option at the moment is to disallow them alltogether. More proper support for CRLF is planned to be added back again in the future. Until then, all files must use `\n` exclusively. +- `cr-line-endings`: Current handling of CR (`\r`) or CRLF (`\r\n`) line endings in Nix is inconsistent and broken, and will lead to unexpected evaluation results with certain strings. Given that fixing the semantics might silently alter the evaluation result of derivations, the only option at the moment is to disallow them altogether. More proper support for CRLF is planned to be added back again in the future. Until then, all files must use `\n` exclusively. - `nul-bytes`: Currently the Nix grammar allows NUL bytes (`\0`) in strings, and thus indirectly also in identifiers. Unfortunately, several core parts of the code base still work with NUL-terminated strings and cannot easily be migrated. Also note that it is still possible to introduce NUL bytes and thus problematic behavior via other means, those are tracked separately. diff --git a/doc/manual/rl-next/improve-error-messages-for-lambdas.md b/doc/manual/rl-next/improve-error-messages-for-lambdas.md index 846d2deec..87ef87ad9 100644 --- a/doc/manual/rl-next/improve-error-messages-for-lambdas.md +++ b/doc/manual/rl-next/improve-error-messages-for-lambdas.md @@ -1,5 +1,5 @@ --- -synopsis: 'Show all missing and unexpected arguments in errorneous function calls' +synopsis: 'Show all missing and unexpected arguments in erroneous function calls' issues: [] cls: [2477] category: Improvements diff --git a/doc/manual/src/architecture/architecture.md b/doc/manual/src/architecture/architecture.md index 9fc232ea9..c258943a8 100644 --- a/doc/manual/src/architecture/architecture.md +++ b/doc/manual/src/architecture/architecture.md @@ -22,9 +22,9 @@ The following [concept map] shows its main components (rectangles), the objects | | +----------|-------------------|--------------------------------+ | Nix impl.| V | -| (Lix) | +-------------------------+ | -| | | commmand line interface |------. | -| | +-------------------------+ | | +| (Lix) | +------------------------+ | +| | | command line interface |------. | +| | +------------------------+ | | | | | | | | evaluated by calls manages | | | | | | diff --git a/doc/manual/src/command-ref/nix-collect-garbage.md b/doc/manual/src/command-ref/nix-collect-garbage.md index f9a3f1940..220107284 100644 --- a/doc/manual/src/command-ref/nix-collect-garbage.md +++ b/doc/manual/src/command-ref/nix-collect-garbage.md @@ -36,7 +36,7 @@ Instead, it looks in a few locations, and acts on all profiles it finds there: > > Not stable; subject to change > - > Do not rely on this functionality; it just exists for migration purposes and is may change in the future. + > Do not rely on this functionality; it just exists for migration purposes and may change in the future. > These deprecated paths remain a private implementation detail of Lix. diff --git a/doc/manual/src/command-ref/nix-env/delete-generations.md b/doc/manual/src/command-ref/nix-env/delete-generations.md index adc6fc219..726db624e 100644 --- a/doc/manual/src/command-ref/nix-env/delete-generations.md +++ b/doc/manual/src/command-ref/nix-env/delete-generations.md @@ -26,7 +26,7 @@ This operation deletes the specified generations of the current profile. > > Older *and newer* generations will be deleted by this operation. > - > One might expect this to just delete older generations than the curent one, but that is only true if the current generation is also the latest. + > One might expect this to just delete older generations than the current one, but that is only true if the current generation is also the latest. > Because one can roll back to a previous generation, it is possible to have generations newer than the current one. > They will also be deleted. diff --git a/doc/manual/src/command-ref/opt-common.md b/doc/manual/src/command-ref/opt-common.md index 7740da953..0e76d9538 100644 --- a/doc/manual/src/command-ref/opt-common.md +++ b/doc/manual/src/command-ref/opt-common.md @@ -85,7 +85,7 @@ Most commands in Lix accept the following command-line options: - `multiline-with-logs` - Displayes the raw logs, with a progress bar and activities each in a new line at the bottom. + Display the raw logs, with a progress bar and activities each in a new line at the bottom. - [`--no-build-output`](#opt-no-build-output) / `-Q` diff --git a/doc/manual/src/contributing/hacking.md b/doc/manual/src/contributing/hacking.md index 15c96000c..87b3d75ee 100644 --- a/doc/manual/src/contributing/hacking.md +++ b/doc/manual/src/contributing/hacking.md @@ -463,11 +463,11 @@ The following metadata properties are supported for builtin functions: * `implementation` (optional): a C++ expression specifying the implementation of the builtin. It must be a function of signature `void(EvalState &, PosIdx, Value * *, Value &)`. If not specified, defaults to `prim_${name}`. -* `renameInGlobalScope` (optional): whether the definiton should be "hidden" in the global scope by prefixing its name with two underscores. +* `renameInGlobalScope` (optional): whether the definition should be "hidden" in the global scope by prefixing its name with two underscores. If not specified, defaults to `true`. * `args` (required): list containing the names of the arguments, as shown in the documentation. All arguments must be listed here since the function arity is derived as the length of this list. -* `experimental_feature` (optional): the user-facing name of the experimental feature which needs to be enabled for the bultin function to be available. +* `experimental_feature` (optional): the user-facing name of the experimental feature which needs to be enabled for the builtin function to be available. If not specified, no experimental feature is required. New builtin function definition files must be added to `lix/libexpr/builtins` and registered in the `builtin_definitions` list in `lix/libexpr/meson.build`. diff --git a/doc/manual/src/glossary.md b/doc/manual/src/glossary.md index caf740724..07ba27587 100644 --- a/doc/manual/src/glossary.md +++ b/doc/manual/src/glossary.md @@ -249,7 +249,7 @@ links. NARs are generated and unpacked using `nix-store --dump` and `nix-store --restore`. -- [`∅`]{#gloss-emtpy-set} +- [`∅`]{#gloss-empty-set} The empty set symbol. In the context of profile history, this denotes a package is not present in a particular version of the profile. diff --git a/doc/manual/src/language/advanced-attributes.md b/doc/manual/src/language/advanced-attributes.md index ee93f5672..977ee48f2 100644 --- a/doc/manual/src/language/advanced-attributes.md +++ b/doc/manual/src/language/advanced-attributes.md @@ -261,7 +261,7 @@ Derivations can declare some infrequently used optional attributes. useful for very trivial derivations (such as `writeText` in Nixpkgs) that are cheaper to build than to substitute from a binary cache. - You may disable the effects of this attibute by enabling the + You may disable the effects of this attribute by enabling the `always-allow-substitutes` configuration option in Lix. > **Note** diff --git a/lix/libexpr/builtins/fetchGit.md b/lix/libexpr/builtins/fetchGit.md index 9dc128fab..1fe92e79b 100644 --- a/lix/libexpr/builtins/fetchGit.md +++ b/lix/libexpr/builtins/fetchGit.md @@ -74,7 +74,7 @@ Here are some examples of how to use `fetchGit`. name in the `ref` attribute. However, if the revision you're looking for is in a future - branch for the non-default branch you will need to specify the + branch for the non-default branch you will need to specify the `ref` attribute as well. ```nix diff --git a/lix/libexpr/builtins/outputOf.md b/lix/libexpr/builtins/outputOf.md index f1b2bedf0..905e5d328 100644 --- a/lix/libexpr/builtins/outputOf.md +++ b/lix/libexpr/builtins/outputOf.md @@ -5,7 +5,7 @@ experimentalFeature: dynamic-derivations --- Return the output path of a derivation, literally or using a placeholder if needed. -If the derivation has a statically-known output path (i.e. the derivation output is input-addressed, or fixed content-addresed), the output path will just be returned. +If the derivation has a statically-known output path (i.e. the derivation output is input-addressed, or fixed content-addressed), the output path will just be returned. But if the derivation is content-addressed or if the derivation is itself not-statically produced (i.e. is the output of another derivation), a placeholder will be returned instead. *`derivation reference`* must be a string that may contain a regular store path to a derivation, or may be a placeholder reference. If the derivation is produced by a derivation, you must explicitly select `drv.outPath`. diff --git a/lix/libexpr/builtins/unsafeDiscardOutputDependency.md b/lix/libexpr/builtins/unsafeDiscardOutputDependency.md index 23c4de043..9839ff1d5 100644 --- a/lix/libexpr/builtins/unsafeDiscardOutputDependency.md +++ b/lix/libexpr/builtins/unsafeDiscardOutputDependency.md @@ -6,7 +6,7 @@ Create a copy of the given string where every "derivation deep" string context e This is the opposite of [`builtins.addDrvOutputDependencies`](#builtins-addDrvOutputDependencies). -This is unsafe because it allows us to "forget" store objects we would have otherwise refered to with the string context, +This is unsafe because it allows us to "forget" store objects we would have otherwise referred to with the string context, whereas Nix normally tracks all dependencies consistently. Safe operations "grow" but never "shrink" string contexts. [`builtins.addDrvOutputDependencies`] in contrast is safe because "derivation deep" string context element always refers to the underlying derivation (among many more things). diff --git a/subprojects/nix-eval-jobs/README.md b/subprojects/nix-eval-jobs/README.md index cea04ee10..a0903a53b 100644 --- a/subprojects/nix-eval-jobs/README.md +++ b/subprojects/nix-eval-jobs/README.md @@ -35,7 +35,7 @@ $ nix-eval-jobs --gc-roots-dir gcroot --flake 'github:NixOS/patchelf#hydraJobs' {"attr":"tarball","attrPath":["tarball"],"drvPath":"/nix/store/c0gg7lj101xhd8v2b3cjl5dwwkpxfc0q-patchelf-tarball-0.18.0.drv","inputDrvs":{"/nix/store/6z1jfnqqgyqr221zgbpm30v91yfj3r45-bash-5.1-p16.drv":["out"],"/nix/store/9d754glmsvpjm5kxvgsjslvgv356kbmn-libtool-2.4.7.drv":["out"],"/nix/store/ap9g09fxbicj836zm88d56dn3ff4clxl-stdenv-linux.drv":["out"],"/nix/store/f1ksgsyplvb0sli4pls6k6vsfvmv519d-autoconf-2.71.drv":["out"],"/nix/store/jf58lcnch1bmpbi2188c59w5zr1cqrx2-automake-1.16.5.drv":["out"]},"name":"patchelf-tarball-0.18.0","outputs":{"out":"/nix/store/72pz5awc7gpwdqxrdsy8j0bvg2n7z78q-patchelf-tarball-0.18.0"},"system":"x86_64-linux"} ``` -The output here is newline-seperated json according to https://jsonlines.org. +The output here is newline-separated json according to https://jsonlines.org. The code is derived from [hydra's](https://github.com/nixos/hydra) eval-jobs executable.