about summary refs log tree commit diff
path: root/doc/build-helpers
diff options
context:
space:
mode:
authorChris McDonough <chrism@plope.com>2024-01-12 21:58:13 -0500
committerGitHub <noreply@github.com>2024-01-12 21:58:13 -0500
commit32638686d1913cc867cb8ab4ab0115e312c65113 (patch)
tree0e15a3c95acda4a50e328f769be1d755c6daa738 /doc/build-helpers
parent1e9fc75c6ee179872a0a9e0560fa638425a06fc7 (diff)
Apply @bzm3r suggestions from code review
Co-authored-by: Brian Merchant <bzm3r@proton.me>
Diffstat (limited to 'doc/build-helpers')
-rw-r--r--doc/build-helpers/trivial-build-helpers.chapter.md20
1 files changed, 11 insertions, 9 deletions
diff --git a/doc/build-helpers/trivial-build-helpers.chapter.md b/doc/build-helpers/trivial-build-helpers.chapter.md
index 4e15be0ba5393..5cf60b7a07836 100644
--- a/doc/build-helpers/trivial-build-helpers.chapter.md
+++ b/doc/build-helpers/trivial-build-helpers.chapter.md
@@ -1,6 +1,6 @@
 # Trivial build helpers {#chap-trivial-builders}
 
-`nixpkgs` provides a variety of wrapper functions that help build very simple derivations. Like [`stdenv.mkDerivation`](#sec-using-stdenv), each of these builders creates and returns a derivation, but the composition of the arguments passed to each are different (usually simpler) than the arguments that must be passed to `stdenv.mkDerivation`.
+Nixpkgs provides a variety of wrapper functions that help build commonly useful derivations. Like [`stdenv.mkDerivation`](#sec-using-stdenv), each of these builders creates a derivation, but the arguments passed are different (usually simpler) from those required by `stdenv.mkDerivation`.
 
 ## `runCommand` {#trivial-builder-runCommand}
 
@@ -60,9 +60,11 @@ This sets [`allowSubstitutes` to `false`](https://nixos.org/nix/manual/#adv-attr
 
 ## `writeTextFile`, `writeText`, `writeTextDir`, `writeScript`, `writeScriptBin`, `writeShellScript`, `writeShellScriptBin` {#trivial-builder-textwriting}
 
-`nixpkgs` provides a number of functions that produce derivations which write text into the Nix store.  These include `writeTextFile`, `writeText`, `writeTextDir`, `writeScript`, `writeScriptBin`, `writeShellScript`, and `writeShellScriptBin`, each of which is documented below.
+Nixpkgs provides the following functions for producing derivations which write text into the Nix store:  `writeTextFile`, `writeText`, `writeTextDir`, `writeScript`, `writeScriptBin`, `writeShellScript`, and `writeShellScriptBin`.
 
-These are useful for creating files from Nix expressions, which may be scripts or non-executable text files, depending on which of the functions is used and the arguments it takes.
+`writeText`, `writeTextDir`, `writeScript`, and `writeScriptBin`  are convenience functions over `writeTextFile`.
+
+These are useful for creating files from Nix expressions, which may be scripts or non-executable text files.
 
 The result of each of these functions will be a derivation.  When you coerce the resulting derivation to text, it will evaluate to the *store path*. Importantly, it will not include the destination subpath produced by the particular function.  So, for example, given the following expression:
 
@@ -212,7 +214,7 @@ writeText "my-file"
 ```
 :::
 
-This example is a simpler way to spell:
+This example is equivalent to:
 
 ```nix
 writeTextFile {
@@ -250,7 +252,7 @@ writeTextDir "share/my-file"
 ```
 :::
 
-The example is a simpler way to spell:
+This example is equivalent to:
 
 ```nix
 writeTextFile {
@@ -293,7 +295,7 @@ writeScript "my-file"
 ```
 :::
 
-The example is a simpler way to spell:
+This example is equivalent to:
 
 ```nix
 writeTextFile {
@@ -335,7 +337,7 @@ writeScriptBin "my-script"
 ```
 :::
 
-The example is a simpler way to spell:
+This example is equivalent to:
 
 ```nix
 writeTextFile {
@@ -380,7 +382,7 @@ writeShellScript "my-script"
 ```
 :::
 
-The example is a simpler way to spell:
+This example is equivalent to:
 
 ```nix
 writeTextFile {
@@ -422,7 +424,7 @@ writeShellScriptBin "my-script"
 ```
 :::
 
-The example is a simpler way to spell:
+This example is equivalent to:
 
 ```nix
 writeTextFile {