diff options
| author | rebecca “wiggles” turner <rbt@sent.as> | 2024-09-01 22:06:36 +0000 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@localhost> | 2024-09-01 22:06:36 +0000 |
| commit | 02eb07cfd539c34c080cb1baf042e5e780c1fcc2 (patch) | |
| tree | 0397ab434cce8b284a8d447594e2e1f3f35a1470 /src/libfetchers | |
| parent | d75df91f74b6819f674f0733143fdf32580af183 (diff) | |
| parent | 690f07272e58bfe86d12adb0bd6c81c031f930fd (diff) | |
Merge changes I5566a985,I88cf53d3 into main
* changes:
Support relative and `~/` paths in config settings
Thread `ApplyConfigOptions` through config parsing
Diffstat (limited to 'src/libfetchers')
| -rw-r--r-- | src/libfetchers/fetch-settings.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/libfetchers/fetch-settings.cc b/src/libfetchers/fetch-settings.cc index aeb3c542b..007f2725f 100644 --- a/src/libfetchers/fetch-settings.cc +++ b/src/libfetchers/fetch-settings.cc @@ -7,7 +7,7 @@ namespace nix { -template<> AcceptFlakeConfig BaseSetting<AcceptFlakeConfig>::parse(const std::string & str) const +template<> AcceptFlakeConfig BaseSetting<AcceptFlakeConfig>::parse(const std::string & str, const ApplyConfigOptions & options) const { if (str == "true") return AcceptFlakeConfig::True; else if (str == "ask") return AcceptFlakeConfig::Ask; |