diff --git a/src/libflake/flakeref.cc b/src/libflake/flakeref.cc index d56f2858f..37b7eff4c 100644 --- a/src/libflake/flakeref.cc +++ b/src/libflake/flakeref.cc @@ -57,18 +57,6 @@ FlakeRef parseFlakeRef( return flakeRef; } -std::optional maybeParseFlakeRef( - const fetchers::Settings & fetchSettings, - const std::string & url, - const std::optional & baseDir) -{ - try { - return parseFlakeRef(fetchSettings, url, baseDir); - } catch (Error &) { - return {}; - } -} - static std::pair fromParsedURL( const fetchers::Settings & fetchSettings, ParsedURL && parsedURL, @@ -261,17 +249,6 @@ std::pair parseFlakeRefWithFragment( } } -std::optional> maybeParseFlakeRefWithFragment( - const fetchers::Settings & fetchSettings, - const std::string & url, const std::optional & baseDir) -{ - try { - return parseFlakeRefWithFragment(fetchSettings, url, baseDir); - } catch (Error & e) { - return {}; - } -} - FlakeRef FlakeRef::fromAttrs( const fetchers::Settings & fetchSettings, const fetchers::Attrs & attrs) diff --git a/src/libflake/include/nix/flake/flakeref.hh b/src/libflake/include/nix/flake/flakeref.hh index 6184d2363..c0045fcf3 100644 --- a/src/libflake/include/nix/flake/flakeref.hh +++ b/src/libflake/include/nix/flake/flakeref.hh @@ -93,14 +93,6 @@ FlakeRef parseFlakeRef( bool isFlake = true, bool preserveRelativePaths = false); -/** - * @param baseDir Optional [base directory](https://nixos.org/manual/nix/unstable/glossary#gloss-base-directory) - */ -std::optional maybeParseFlake( - const fetchers::Settings & fetchSettings, - const std::string & url, - const std::optional & baseDir = {}); - /** * @param baseDir Optional [base directory](https://nixos.org/manual/nix/unstable/glossary#gloss-base-directory) */ @@ -112,14 +104,6 @@ std::pair parseFlakeRefWithFragment( bool isFlake = true, bool preserveRelativePaths = false); -/** - * @param baseDir Optional [base directory](https://nixos.org/manual/nix/unstable/glossary#gloss-base-directory) - */ -std::optional> maybeParseFlakeRefWithFragment( - const fetchers::Settings & fetchSettings, - const std::string & url, - const std::optional & baseDir = {}); - /** * @param baseDir Optional [base directory](https://nixos.org/manual/nix/unstable/glossary#gloss-base-directory) */