nixos/nix
1
1
Fork 0
mirror of https://github.com/NixOS/nix.git synced 2025-11-14 06:22:42 +01:00
Code Activity

Move fetchers from libstore to libfetchers

Browse source
This commit is contained in:
Eelco Dolstra 2020-03-30 14:03:28 +02:00
parent 4ba4c7ff66
commit e0a0ae0467
35 changed files with 80 additions and 90 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/libexpr/flake/flake.cc
View file

@ -3,7 +3,7 @@
#include "primops.hh"
#include "eval-inline.hh"
#include "store-api.hh"
#include "fetchers/fetchers.hh"
#include "fetchers.hh"
#include "finally.hh"
namespace nix {

7
src/libexpr/flake/flakeref.cc
View file

@ -1,9 +1,8 @@
#include "flakeref.hh"
#include "store-api.hh"
#include "fetchers/parse.hh"
#include "fetchers/fetchers.hh"
#include "fetchers/registry.hh"
#include "fetchers/regex.hh"
#include "url.hh"
#include "fetchers.hh"
#include "registry.hh"
namespace nix {

2
src/libexpr/flake/flakeref.hh
View file

@ -2,7 +2,7 @@
#include "types.hh"
#include "hash.hh"
#include "fetchers/fetchers.hh"
#include "fetchers.hh"
#include <variant>

3
src/libexpr/flake/lockfile.cc
View file

@ -1,6 +1,5 @@
#include "lockfile.hh"
#include "store-api.hh"
#include "fetchers/regex.hh"
#include <nlohmann/json.hpp>
@ -268,7 +267,7 @@ InputPath parseInputPath(std::string_view s)
InputPath path;
for (auto & elem : tokenizeString<std::vector<std::string>>(s, "/")) {
if (!std::regex_match(elem, fetchers::flakeIdRegex))
if (!std::regex_match(elem, flakeIdRegex))
throw Error("invalid flake input path element '%s'", elem);
path.push_back(elem);
}