Merge pull request #11879 from NixOS/mergify/bp/2.24-maintenance/pr-11878

Remove warning that interpretation of .drv has changed (backport #11878)
This commit is contained in:
Eelco Dolstra 2024-11-13 18:23:23 +01:00 committed by GitHub
commit aaeaa4e133
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194

View File

@ -32,16 +32,6 @@ InstallableDerivedPath InstallableDerivedPath::parse(
// store path. // store path.
[&](const ExtendedOutputsSpec::Default &) -> DerivedPath { [&](const ExtendedOutputsSpec::Default &) -> DerivedPath {
auto storePath = store->followLinksToStorePath(prefix); auto storePath = store->followLinksToStorePath(prefix);
// Remove this prior to stabilizing the new CLI.
if (storePath.isDerivation()) {
auto oldDerivedPath = DerivedPath::Built {
.drvPath = makeConstantStorePathRef(storePath),
.outputs = OutputsSpec::All { },
};
warn(
"The interpretation of store paths arguments ending in `.drv` recently changed. If this command is now failing try again with '%s'",
oldDerivedPath.to_string(*store));
};
return DerivedPath::Opaque { return DerivedPath::Opaque {
.path = std::move(storePath), .path = std::move(storePath),
}; };