From 44272d87193e6ab17d15501ebdcd317cdd39f616 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Thu, 4 Jan 2018 16:57:25 +0100 Subject: [PATCH] Rename "use-substitutes" to "substitute" Commit c2154d4c8422ddc1c201d503bb52edff854af2ad renamed "build-use-substitutes" to "use-substitutes", but that broke "nix-copy-closure --use-substitutes". --- doc/manual/command-ref/conf-file.xml | 2 +- src/libstore/globals.hh | 2 +- 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 e52cbcd53..87f05fb1c 100644 --- a/doc/manual/command-ref/conf-file.xml +++ b/doc/manual/command-ref/conf-file.xml @@ -312,7 +312,7 @@ false. - use-substitutes + substitute If set to true (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 5c857cbb6..ae4b78a01 100644 --- a/src/libstore/globals.hh +++ b/src/libstore/globals.hh @@ -150,7 +150,7 @@ public: Setting syncBeforeRegistering{this, false, "sync-before-registering", "Whether to call sync() before registering a path as valid."}; - Setting useSubstitutes{this, true, "use-substitutes", + Setting useSubstitutes{this, true, "substitute", "Whether to use substitutes.", {"build-use-substitutes"}}; diff --git a/tests/shell.shebang.sh b/tests/shell.shebang.sh index c8e55ca9b..f7132043d 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) $@"