Skip to content

Commit

Permalink
Merge pull request #3582 from bhipple/doc/fixed-output
Browse files Browse the repository at this point in the history
doc: consistently refer to 'fixed-output' with a dash
  • Loading branch information
domenkozar committed May 11, 2020
2 parents b92f58f + 146f9c1 commit 612d57c
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion doc/manual/command-ref/nix-store.xml
Expand Up @@ -936,7 +936,7 @@ $ nix-store --add ./foo.c

<para>The operation <option>--add-fixed</option> adds the specified paths to
the Nix store. Unlike <option>--add</option> paths are registered using the
specified hashing algorithm, resulting in the same output path as a fixed output
specified hashing algorithm, resulting in the same output path as a fixed-output
derivation. This can be used for sources that are not available from a public
url or broke since the download expression was written.
</para>
Expand Down
2 changes: 1 addition & 1 deletion src/libstore/build.cc
Expand Up @@ -3155,7 +3155,7 @@ void DerivationGoal::runChild()
// Only use nss functions to resolve hosts and
// services. Don’t use it for anything else that may
// be configured for this system. This limits the
// potential impurities introduced in fixed outputs.
// potential impurities introduced in fixed-outputs.
writeFile(chrootRootDir + "/etc/nsswitch.conf", "hosts: files dns\nservices: files\n");

ss.push_back("/etc/services");
Expand Down

0 comments on commit 612d57c

Please sign in to comment.