forked from lix-project/lix
7ad66cb3ef
We use the same nested map representation we used for goals, again in order to save space. We might someday want to combine with `inputDrvs`, by doing `V = bool` instead of `V = std::set<OutputName>`, but we are not doing that yet for sake of a smaller diff. The ATerm format for Derivations also needs to be extended, in addition to the in-memory format. To accomodate this, we added a new basic versioning scheme, so old versions of Nix will get nice errors. (And going forward, if the ATerm format changes again the errors will be even better.) `parsedStrings`, an internal function used as part of parsing derivations in A-Term format, used to consume the final `]` but expect the initial `[` to already be consumed. This made for what looked like unbalanced brackets at callsites, which was confusing. Now it consumes both which is hopefully less confusing. As part of testing, we also created a unit test for the A-Term format for regular non-experimental derivations too. Co-authored-by: Robert Hensing <roberth@users.noreply.github.com> Co-authored-by: Valentin Gagarin <valentin.gagarin@tweag.io> Apply suggestions from code review Co-authored-by: Robert Hensing <roberth@users.noreply.github.com>
95 lines
2.3 KiB
C++
95 lines
2.3 KiB
C++
#include "derived-path.hh"
|
|
#include "realisation.hh"
|
|
|
|
namespace nix {
|
|
|
|
struct SingleBuiltPath;
|
|
|
|
struct SingleBuiltPathBuilt {
|
|
ref<SingleBuiltPath> drvPath;
|
|
std::pair<std::string, StorePath> output;
|
|
|
|
SingleDerivedPathBuilt discardOutputPath() const;
|
|
|
|
std::string to_string(const Store & store) const;
|
|
static SingleBuiltPathBuilt parse(const Store & store, std::string_view, std::string_view);
|
|
nlohmann::json toJSON(const Store & store) const;
|
|
|
|
DECLARE_CMP(SingleBuiltPathBuilt);
|
|
};
|
|
|
|
using _SingleBuiltPathRaw = std::variant<
|
|
DerivedPathOpaque,
|
|
SingleBuiltPathBuilt
|
|
>;
|
|
|
|
struct SingleBuiltPath : _SingleBuiltPathRaw {
|
|
using Raw = _SingleBuiltPathRaw;
|
|
using Raw::Raw;
|
|
|
|
using Opaque = DerivedPathOpaque;
|
|
using Built = SingleBuiltPathBuilt;
|
|
|
|
inline const Raw & raw() const {
|
|
return static_cast<const Raw &>(*this);
|
|
}
|
|
|
|
StorePath outPath() const;
|
|
|
|
SingleDerivedPath discardOutputPath() const;
|
|
|
|
static SingleBuiltPath parse(const Store & store, std::string_view);
|
|
nlohmann::json toJSON(const Store & store) const;
|
|
};
|
|
|
|
static inline ref<SingleBuiltPath> staticDrv(StorePath drvPath)
|
|
{
|
|
return make_ref<SingleBuiltPath>(SingleBuiltPath::Opaque { drvPath });
|
|
}
|
|
|
|
/**
|
|
* A built derived path with hints in the form of optional concrete output paths.
|
|
*
|
|
* See 'BuiltPath' for more an explanation.
|
|
*/
|
|
struct BuiltPathBuilt {
|
|
ref<SingleBuiltPath> drvPath;
|
|
std::map<std::string, StorePath> outputs;
|
|
|
|
std::string to_string(const Store & store) const;
|
|
static BuiltPathBuilt parse(const Store & store, std::string_view, std::string_view);
|
|
nlohmann::json toJSON(const Store & store) const;
|
|
|
|
DECLARE_CMP(BuiltPathBuilt);
|
|
};
|
|
|
|
using _BuiltPathRaw = std::variant<
|
|
DerivedPath::Opaque,
|
|
BuiltPathBuilt
|
|
>;
|
|
|
|
/**
|
|
* A built path. Similar to a DerivedPath, but enriched with the corresponding
|
|
* output path(s).
|
|
*/
|
|
struct BuiltPath : _BuiltPathRaw {
|
|
using Raw = _BuiltPathRaw;
|
|
using Raw::Raw;
|
|
|
|
using Opaque = DerivedPathOpaque;
|
|
using Built = BuiltPathBuilt;
|
|
|
|
inline const Raw & raw() const {
|
|
return static_cast<const Raw &>(*this);
|
|
}
|
|
|
|
StorePathSet outPaths() const;
|
|
RealisedPath::Set toRealisedPaths(Store & store) const;
|
|
|
|
nlohmann::json toJSON(const Store & store) const;
|
|
};
|
|
|
|
typedef std::vector<BuiltPath> BuiltPaths;
|
|
|
|
}
|