From ff394ff206fea222a30d6f68a9d8852170e1ad55 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Wed, 6 May 2020 17:20:23 +0200 Subject: [PATCH] Remove the nixpkgs. compatibility hack Since we've changed a lot of things in the 'nix' command (e.g. rename 'nix run') there is not much point in keeping this around. --- src/nix/installables.cc | 64 ++++++++++++++++------------------------- 1 file changed, 25 insertions(+), 39 deletions(-) diff --git a/src/nix/installables.cc b/src/nix/installables.cc index ab938281f..57060e9b1 100644 --- a/src/nix/installables.cc +++ b/src/nix/installables.cc @@ -417,10 +417,6 @@ InstallableFlake::getCursor(EvalState & state, bool useEvalCache) return res; } -// FIXME: extend -std::string attrRegex = R"([A-Za-z_][A-Za-z0-9-_+]*)"; -static std::regex attrPathRegex(fmt(R"(%1%(\.%1%)*)", attrRegex)); - std::vector> SourceExprCommand::parseInstallables( ref store, std::vector ss) { @@ -449,48 +445,38 @@ std::vector> SourceExprCommand::parseInstallables( } else { for (auto & s : ss) { - if (hasPrefix(s, "nixpkgs.")) { - bool static warned; - warnOnce(warned, "the syntax 'nixpkgs.' is deprecated; use 'nixpkgs#' instead"); - result.push_back(std::make_shared(*this, - FlakeRef::fromAttrs({{"type", "indirect"}, {"id", "nixpkgs"}}), - Strings{"legacyPackages." + settings.thisSystem.get() + "." + std::string(s, 8)}, Strings{})); + std::exception_ptr ex; + + try { + auto [flakeRef, fragment] = parseFlakeRefWithFragment(s, absPath(".")); + result.push_back(std::make_shared( + *this, std::move(flakeRef), + fragment == "" ? getDefaultFlakeAttrPaths() : Strings{fragment}, + getDefaultFlakeAttrPathPrefixes())); + continue; + } catch (...) { + ex = std::current_exception(); } - else { - std::exception_ptr ex; - + if (s.find('/') != std::string::npos) { try { - auto [flakeRef, fragment] = parseFlakeRefWithFragment(s, absPath(".")); - result.push_back(std::make_shared( - *this, std::move(flakeRef), - fragment == "" ? getDefaultFlakeAttrPaths() : Strings{fragment}, - getDefaultFlakeAttrPathPrefixes())); + result.push_back(std::make_shared(store, store->printStorePath(store->followLinksToStorePath(s)))); continue; + } catch (NotInStore &) { } catch (...) { - ex = std::current_exception(); + if (!ex) + ex = std::current_exception(); } - - if (s.find('/') != std::string::npos) { - try { - result.push_back(std::make_shared(store, store->printStorePath(store->followLinksToStorePath(s)))); - continue; - } catch (NotInStore &) { - } catch (...) { - if (!ex) - ex = std::current_exception(); - } - } - - std::rethrow_exception(ex); - - /* - throw Error( - pathExists(s) - ? "path '%s' is not a flake or a store path" - : "don't know how to handle argument '%s'", s); - */ } + + std::rethrow_exception(ex); + + /* + throw Error( + pathExists(s) + ? "path '%s' is not a flake or a store path" + : "don't know how to handle argument '%s'", s); + */ } }