diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2022-03-17 22:29:15 +0000 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2022-03-17 22:35:53 +0000 |
| commit | 197feed51dd770929ba8f6f12aec50ed8597a747 (patch) | |
| tree | 47d2dcc1552b629dab0675604bd3c8ba4a20eae2 /src/libexpr/primops | |
| parent | 6afc3617982e872fac2142c3aeccd1e8482e7e52 (diff) | |
Clean up `DerivationOutput`, and headers
1. `DerivationOutput` now as the `std::variant` as a base class. And the
variants are given hierarchical names under `DerivationOutput`.
In 8e0d0689be797f9e42f9b43b06f50c1af7f20b4a @matthewbauer and I
didn't know a better idiom, and so we made it a field. But this sort
of "newtype" is anoying for literals downstream.
Since then we leaned the base class, inherit the constructors trick,
e.g. used in `DerivedPath`. Switching to use that makes this more
ergonomic, and consistent.
2. `store-api.hh` and `derivations.hh` are now independent.
In bcde5456cc3295061a0726881c3e441444dd6680 I swapped the dependency,
but I now know it is better to just keep on using incomplete types as
much as possible for faster compilation and good separation of
concerns.
Diffstat (limited to 'src/libexpr/primops')
| -rw-r--r-- | src/libexpr/primops/context.cc | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/src/libexpr/primops/context.cc b/src/libexpr/primops/context.cc index 3701bd442..324394d10 100644 --- a/src/libexpr/primops/context.cc +++ b/src/libexpr/primops/context.cc @@ -1,5 +1,6 @@ #include "primops.hh" #include "eval-inline.hh" +#include "derivations.hh" #include "store-api.hh" namespace nix { |