From 22e1613814314ef67f97c61aeec3cc9759ced56d Mon Sep 17 00:00:00 2001 From: Robert Hensing Date: Wed, 13 Nov 2024 16:25:31 +0100 Subject: [PATCH] Remove warning that interpretation of .drv has changed MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This was first tagged as 2.15.0, 1½ years ago; plenty of time for everyone to catch up. By now, the warning is causing more confusion than that it is helpful, because passing a `.drv` or `drvPath` has legitimate use cases. (cherry picked from commit f534a7a52440609c0d0b84b2f378753a5d85bd68) --- src/libcmd/installable-derived-path.cc | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/src/libcmd/installable-derived-path.cc b/src/libcmd/installable-derived-path.cc index 4d1f83a1c..abacd7350 100644 --- a/src/libcmd/installable-derived-path.cc +++ b/src/libcmd/installable-derived-path.cc @@ -32,16 +32,6 @@ InstallableDerivedPath InstallableDerivedPath::parse( // store path. [&](const ExtendedOutputsSpec::Default &) -> DerivedPath { 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 { .path = std::move(storePath), };