diff options
| author | Eelco Dolstra <edolstra@gmail.com> | 2018-01-04T15·57+0100 |
|---|---|---|
| committer | Eelco Dolstra <edolstra@gmail.com> | 2018-01-04T15·58+0100 |
| commit | 44272d87193e6ab17d15501ebdcd317cdd39f616 (patch) | |
| tree | d0e6aa18d9e8f9bb6c937cc0283b9f6cdf4cce1d | |
| parent | 1b851ae8f6332fb7a5c966a90b0cd3119af3d51d (diff) | |
Rename "use-substitutes" to "substitute"
Commit c2154d4c8422ddc1c201d503bb52edff854af2ad renamed "build-use-substitutes" to "use-substitutes", but that broke "nix-copy-closure --use-substitutes".
| -rw-r--r-- | doc/manual/command-ref/conf-file.xml | 2 | ||||
| -rw-r--r-- | src/libstore/globals.hh | 2 | ||||
| -rwxr-xr-x | tests/shell.shebang.sh | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/doc/manual/command-ref/conf-file.xml b/doc/manual/command-ref/conf-file.xml index e52cbcd535e3..87f05fb1c704 100644 --- a/doc/manual/command-ref/conf-file.xml +++ b/doc/manual/command-ref/conf-file.xml @@ -312,7 +312,7 @@ false</literal>.</para> </varlistentry> - <varlistentry><term><literal>use-substitutes</literal></term> + <varlistentry><term><literal>substitute</literal></term> <listitem><para>If set to <literal>true</literal> (default), Nix will use binary substitutes if available. This option can be diff --git a/src/libstore/globals.hh b/src/libstore/globals.hh index 5c857cbb6a9c..ae4b78a018e0 100644 --- a/src/libstore/globals.hh +++ b/src/libstore/globals.hh @@ -150,7 +150,7 @@ public: Setting<bool> syncBeforeRegistering{this, false, "sync-before-registering", "Whether to call sync() before registering a path as valid."}; - Setting<bool> useSubstitutes{this, true, "use-substitutes", + Setting<bool> useSubstitutes{this, true, "substitute", "Whether to use substitutes.", {"build-use-substitutes"}}; diff --git a/tests/shell.shebang.sh b/tests/shell.shebang.sh index c8e55ca9b90c..f7132043de44 100755 --- a/tests/shell.shebang.sh +++ b/tests/shell.shebang.sh @@ -1,4 +1,4 @@ #! @ENV_PROG@ nix-shell -#! nix-shell -I nixpkgs=shell.nix --no-use-substitutes +#! nix-shell -I nixpkgs=shell.nix --no-substitute #! nix-shell --pure -i bash -p foo bar echo "$(foo) $(bar) $@" |