about summary refs log tree commit diff
diff options
context:
space:
mode:
authorVincent Ambo <tazjin@google.com>2019-09-02T22·35+0100
committerVincent Ambo <github@tazj.in>2019-09-02T22·44+0100
commit496a4ab84742279fb7bbd1c8ac9d4ebd1a44b148 (patch)
tree8bd91260e27caa04cc41c5b6424241be28aebfb0
parent32b9b5099eaeabc5672b6236e26743736b85cc41 (diff)
docs: Add information about NIX_TIMEOUT variable
-rw-r--r--tools/nixery/README.md2
-rw-r--r--tools/nixery/docs/src/run-your-own.md4
2 files changed, 5 insertions, 1 deletions
diff --git a/tools/nixery/README.md b/tools/nixery/README.md
index cdae23bc4b72..3bc6df845a7f 100644
--- a/tools/nixery/README.md
+++ b/tools/nixery/README.md
@@ -81,6 +81,8 @@ variables:
   locally configured SSH/git credentials)
 * `NIXERY_PKGS_PATH`: A local filesystem path containing a Nix package set to use
   for building
+* `NIX_TIMEOUT`: Number of seconds that any Nix builder is allowed to run
+  (defaults to 60
 * `GCS_SIGNING_KEY`: A Google service account key (in PEM format) that can be
   used to sign Cloud Storage URLs
 * `GCS_SIGNING_ACCOUNT`: Google service account ID that the signing key belongs
diff --git a/tools/nixery/docs/src/run-your-own.md b/tools/nixery/docs/src/run-your-own.md
index 0539ab02fcff..7a294f56055e 100644
--- a/tools/nixery/docs/src/run-your-own.md
+++ b/tools/nixery/docs/src/run-your-own.md
@@ -81,8 +81,10 @@ You may set *one* of these, if unset Nixery defaults to `nixos-19.03`:
 * `NIXERY_PKGS_PATH`: A local filesystem path containing a Nix package set to use
   for building
 
-You may set *both* of these:
+You may set *all* of these:
 
+* `NIX_TIMEOUT`: Number of seconds that any Nix builder is allowed to run
+  (defaults to 60)
 * `GCS_SIGNING_KEY`: A Google service account key (in PEM format) that can be
   used to [sign Cloud Storage URLs][signed-urls]
 * `GCS_SIGNING_ACCOUNT`: Google service account ID that the signing key belongs