wroclaw-git-backups/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-06-28 17:51:15 +02:00
Code Activity

Merge InputAccessor into SourceAccessor

Browse source 
After the removal of the InputAccessor::fetchToStore() method, the
only remaining functionality in InputAccessor was `fingerprint` and
`getLastModified()`, and there is no reason to keep those in a
separate class.
This commit is contained in:
Eelco Dolstra 2024-05-03 12:14:01 +02:00
parent 00ca2b05b8
commit ba5929c7be
35 changed files with 130 additions and 188 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/libexpr/eval.hh
View file

@ -9,7 +9,7 @@
#include "symbol-table.hh"
#include "config.hh"
#include "experimental-features.hh"
#include "input-accessor.hh"
#include "source-accessor.hh"
#include "search-path.hh"
#include "repl-exit-status.hh"
@ -33,7 +33,7 @@ class EvalState;
class StorePath;
struct SingleDerivedPath;
enum RepairFlag : bool;
struct MemoryInputAccessor;
struct MemorySourceAccessor;
namespace eval_cache {
class EvalCache;
}
@ -229,18 +229,18 @@ public:
/**
* The accessor for the root filesystem.
*/
const ref<InputAccessor> rootFS;
const ref<SourceAccessor> rootFS;
/**
* The in-memory filesystem for <nix/...> paths.
*/
const ref<MemoryInputAccessor> corepkgsFS;
const ref<MemorySourceAccessor> corepkgsFS;
/**
* In-memory filesystem for internal, non-user-callable Nix
* expressions like call-flake.nix.
*/
const ref<MemoryInputAccessor> internalFS;
const ref<MemorySourceAccessor> internalFS;
const SourcePath derivationInternal;