mirror of
https://github.com/NixOS/nix
synced 2025-06-25 14:51:16 +02:00
Move some stuff from Settings
to a new FetchSettings
.
Starting work on #5638 The exact boundary between `FetchSettings` and `EvalSettings` is not clear to me, but that's fine. First lets clean out `libstore`, and then worry about what, if anything, should be the separation between those two.
This commit is contained in:
parent
1c985428c4
commit
ea71da395f
9 changed files with 128 additions and 83 deletions
|
@ -1,11 +1,13 @@
|
|||
#include "filetransfer.hh"
|
||||
#include "cache.hh"
|
||||
#include "fetchers.hh"
|
||||
#include "globals.hh"
|
||||
#include "store-api.hh"
|
||||
#include "types.hh"
|
||||
#include "url-parts.hh"
|
||||
|
||||
#include "fetchers.hh"
|
||||
#include "fetch-settings.hh"
|
||||
|
||||
#include <optional>
|
||||
#include <nlohmann/json.hpp>
|
||||
#include <fstream>
|
||||
|
@ -157,7 +159,7 @@ struct GitArchiveInputScheme : InputScheme
|
|||
|
||||
std::optional<std::string> getAccessToken(const std::string & host) const
|
||||
{
|
||||
auto tokens = settings.accessTokens.get();
|
||||
auto tokens = fetchSettings.accessTokens.get();
|
||||
if (auto token = get(tokens, host))
|
||||
return *token;
|
||||
return {};
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue