lix-project/lix
20
57
Fork 31
Code Issues 350 Code Review (Gerrit) Projects 3 Releases Wiki Activity

Rename "use-substitutes" to "substitute"

Browse source 
Commit c2154d4c84 renamed
"build-use-substitutes" to "use-substitutes", but that broke
"nix-copy-closure --use-substitutes".
This commit is contained in:
Eelco Dolstra 2018-01-04 16:57:25 +01:00
parent 1b851ae8f6
commit 44272d8719
No known key found for this signature in database
GPG key ID: 8170B4726D7198DE
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
doc/manual/command-ref/conf-file.xml
View file

@ -312,7 +312,7 @@ false</literal>.</para>
</varlistentry> </varlistentry>
<varlistentry><term><literal>use-substitutes</literal></term> <varlistentry><term><literal>substitute</literal></term>
<listitem><para>If set to <literal>true</literal> (default), Nix <listitem><para>If set to <literal>true</literal> (default), Nix
will use binary substitutes if available. This option can be will use binary substitutes if available. This option can be

2
src/libstore/globals.hh
View file

@ -150,7 +150,7 @@ public:
Setting<bool> syncBeforeRegistering{this, false, "sync-before-registering", Setting<bool> syncBeforeRegistering{this, false, "sync-before-registering",
"Whether to call sync() before registering a path as valid."}; "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.", "Whether to use substitutes.",
{"build-use-substitutes"}}; {"build-use-substitutes"}};

2
tests/shell.shebang.sh
View file

@ -1,4 +1,4 @@
#! @ENV_PROG@ nix-shell #! @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 #! nix-shell --pure -i bash -p foo bar
echo "$(foo) $(bar) $@" echo "$(foo) $(bar) $@"