Merge pull request #5247 from edolstra/stablize-ca-references

Remove the 'ca-references' feature check
This commit is contained in:
Eelco Dolstra 2021-09-14 15:42:50 +02:00 committed by GitHub
commit d589a6aa8a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -1244,11 +1244,6 @@ void LocalStore::addToStore(const ValidPathInfo & info, Source & source,
deletePath(realPath); deletePath(realPath);
// text hashing has long been allowed to have non-self-references because it is used for drv files.
bool refersToSelf = info.references.count(info.path) > 0;
if (info.ca.has_value() && !info.references.empty() && !(std::holds_alternative<TextHash>(*info.ca) && !refersToSelf))
settings.requireExperimentalFeature("ca-references");
/* While restoring the path from the NAR, compute the hash /* While restoring the path from the NAR, compute the hash
of the NAR. */ of the NAR. */
HashSink hashSink(htSHA256); HashSink hashSink(htSHA256);