diff --git a/doc/coding-conventions.xml b/doc/coding-conventions.xml index 0457018f7d0..0776e70f14e 100644 --- a/doc/coding-conventions.xml +++ b/doc/coding-conventions.xml @@ -365,7 +365,7 @@ splitting up an existing category. If it’s a (set of) tool(s): - (A tool is a relatively small program, especially one intented + (A tool is a relatively small program, especially one intended to be used non-interactively.) @@ -608,7 +608,7 @@ evaluate correctly.
Fetching Sources There are multiple ways to fetch a package source in nixpkgs. The - general guidline is that you should package sources with a high degree of + general guideline is that you should package sources with a high degree of availability. Right now there is only one fetcher which has mirroring support and that is fetchurl. Note that you should also prefer protocols which have a corresponding proxy environment variable. diff --git a/doc/languages-frameworks/python.md b/doc/languages-frameworks/python.md index c57fd4aec17..f2de0225b1d 100644 --- a/doc/languages-frameworks/python.md +++ b/doc/languages-frameworks/python.md @@ -590,7 +590,7 @@ By default tests are run because `doCheck = true`. Test dependencies, like e.g. the test runner, should be added to `buildInputs`. By default `meta.platforms` is set to the same value -as the interpreter unless overriden otherwise. +as the interpreter unless overridden otherwise. ##### `buildPythonPackage` parameters diff --git a/doc/languages-frameworks/rust.md b/doc/languages-frameworks/rust.md index ef6ebc392b3..481b76fb78f 100644 --- a/doc/languages-frameworks/rust.md +++ b/doc/languages-frameworks/rust.md @@ -17,7 +17,7 @@ into the `environment.systemPackages` or bring them into scope with `nix-shell -p rustStable.rustc -p rustStable.cargo`. There are also `rustBeta` and `rustNightly` package sets available. -These are not updated very regulary. For daily builds use either rustup from +These are not updated very regularly. For daily builds use either rustup from nixpkgs or use the [Rust nightlies overlay](#using-the-rust-nightlies-overlay). ## Packaging Rust applications