Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nix
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: e01c01f72ce4
Choose a base ref
...
head repository: NixOS/nix
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 446bb88f1308
Choose a head ref
  • 3 commits
  • 3 files changed
  • 1 contributor

Commits on Mar 29, 2018

  1. ValidPathInfo::isContentAddressed(): Ensure there are no references

    @edolstra
    edolstra committed Mar 29, 2018

    Verified

    This commit was signed with the committer’s verified signature.
    jtojnar Jan Tojnar
    GPG key ID: 7FAB2A15F7A607A4
    Verified
    Learn about vigilant mode
    Copy the full SHA
    9d1220a View commit details

  2. Process --option use-case-hack properly 

    Fixes #2009.
    @edolstra
    edolstra committed Mar 29, 2018

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    2b61c74 View commit details

  3. Remove reference to non-existent manpages

    @edolstra
    edolstra committed Mar 29, 2018
    Copy the full SHA
    446bb88 View commit details
Showing with 5 additions and 2 deletions.
  1. +1 −1 src/libstore/globals.hh
  2. +2 −1 src/libstore/store-api.cc
  3. +2 −0 src/nix/command.cc
2 changes: 1 addition & 1 deletion src/libstore/globals.hh
View file
Original file line number Diff line number Diff line change
@@ -29,7 +29,7 @@ struct CaseHackSetting : public BaseSetting<bool>
void set(const std::string & str) override
{
BaseSetting<bool>::set(str);
nix::useCaseHack = true;
nix::useCaseHack = value;
}
};

3 changes: 2 additions & 1 deletion src/libstore/store-api.cc
View file
Original file line number Diff line number Diff line change
@@ -757,7 +757,8 @@ bool ValidPathInfo::isContentAddressed(const Store & store) const
else if (hasPrefix(ca, "fixed:")) {
bool recursive = ca.compare(6, 2, "r:") == 0;
Hash hash(std::string(ca, recursive ? 8 : 6));
if (store.makeFixedOutputPath(recursive, hash, storePathToName(path)) == path)
if (references.empty() &&
store.makeFixedOutputPath(recursive, hash, storePathToName(path)) == path)
return true;
else
warn();
2 changes: 2 additions & 0 deletions src/nix/command.cc
View file
Original file line number Diff line number Diff line change
@@ -57,8 +57,10 @@ void MultiCommand::printHelp(const string & programName, std::ostream & out)
}
printTable(out, table);

#if 0
out << "\n";
out << "For full documentation, run 'man " << programName << "' or 'man " << programName << "-<COMMAND>'.\n";
#endif
}

bool MultiCommand::processFlag(Strings::iterator & pos, Strings::iterator end)