Merge remote-tracking branch 'origin/master' into flakes

This commit is contained in:
Eelco Dolstra
2019-12-11 14:53:30 +01:00
119 changed files with 3905 additions and 2250 deletions
+1 -1
View File
@@ -26,7 +26,7 @@ nlohmann::json LockedInput::toJson() const
Path LockedInput::computeStorePath(Store & store) const
{
return store.makeFixedOutputPath(true, narHash, "source");
return store.printStorePath(store.makeFixedOutputPath(true, narHash, "source"));
}
LockedInputs::LockedInputs(const nlohmann::json & json)