diff options
| author | Jan Tojnar <jtojnar@gmail.com> | 2020-09-29 00:12:06 +0200 |
|---|---|---|
| committer | Jan Tojnar <jtojnar@gmail.com> | 2020-09-29 00:12:06 +0200 |
| commit | 695fd81e02ced2a9591cf2ac3183c360de763c07 (patch) | |
| tree | 47deefb3d9b8858672c274630a9931082ae5c8f4 /doc | |
| parent | d341a1c6148ec60e9eeeb0a2ec4479969039c0ec (diff) | |
| parent | 046c6a7038998507134981c8a294bb70861484bf (diff) | |
Merge branch 'master' into staging-next
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/languages-frameworks/rust.section.md | 12 | ||||
| -rw-r--r-- | doc/stdenv/stdenv.xml | 4 |
2 files changed, 12 insertions, 4 deletions
diff --git a/doc/languages-frameworks/rust.section.md b/doc/languages-frameworks/rust.section.md index 7f9d93216ed98..0e1d59e1a952a 100644 --- a/doc/languages-frameworks/rust.section.md +++ b/doc/languages-frameworks/rust.section.md @@ -119,6 +119,18 @@ The above are just guidelines, and exceptions may be granted on a case-by-case b However, please check if it's possible to disable a problematic subset of the test suite and leave a comment explaining your reasoning. +#### Setting `test-threads` + +`buildRustPackage` will use parallel test threads by default, +sometimes it may be necessary to disable this so the tests run consecutively. + +```nix +rustPlatform.buildRustPackage { + /* ... */ + cargoParallelTestThreads = false; +} +``` + ### Building a package in `debug` mode By default, `buildRustPackage` will use `release` mode for builds. If a package diff --git a/doc/stdenv/stdenv.xml b/doc/stdenv/stdenv.xml index f97c2a145af52..42fae73e8816b 100644 --- a/doc/stdenv/stdenv.xml +++ b/doc/stdenv/stdenv.xml @@ -1636,10 +1636,6 @@ substitute ./foo.in ./foo.out \ --subst-var someVar </programlisting> </para> - <para> - <function>substitute</function> is implemented using the <command - xlink:href="http://replace.richardlloyd.org.uk/">replace</command> command. Unlike with the <command>sed</command> command, you don’t have to worry about escaping special characters. It supports performing substitutions on binary files (such as executables), though there you’ll probably want to make sure that the replacement string is as long as the replaced string. - </para> </listitem> </varlistentry> <varlistentry xml:id='fun-substituteInPlace'> |