mirror of
https://github.com/NixOS/nix.git
synced 2024-11-22 06:42:28 +00:00
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:
commit
aaeaa4e133
@ -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),
|
||||||
};
|
};
|
||||||
|
Loading…
Reference in New Issue
Block a user