mirror of
https://github.com/NixOS/nix.git
synced 2025-11-22 10:19:36 +01:00
Stratify ExtraPathInfo along Installable hierarchy
Instead of having a bunch of optional fields, have a few subclasses which can have mandatory fields. Additionally, the new `getExtraPathInfo`, and `nixpkgsFlakeRef`, are moved to `InstallableValue`. I did these things because https://github.com/NixOS/rfcs/pull/134 ; with these things moved to `InstallableValue`, the base `Installable` no longer depends on libexpr! This is a major step towards that. Also, add a bunch of doc comments for sake of the internal API docs.
This commit is contained in:
parent
e00abd3f56
commit
256f3e3063
12 changed files with 254 additions and 76 deletions
|
|
@ -4,9 +4,7 @@
|
|||
#include "path.hh"
|
||||
#include "outputs-spec.hh"
|
||||
#include "derived-path.hh"
|
||||
#include "eval.hh"
|
||||
#include "store-api.hh"
|
||||
#include "flake/flake.hh"
|
||||
#include "build-result.hh"
|
||||
|
||||
#include <optional>
|
||||
|
|
@ -14,83 +12,144 @@
|
|||
namespace nix {
|
||||
|
||||
struct DrvInfo;
|
||||
struct SourceExprCommand;
|
||||
|
||||
namespace eval_cache { class EvalCache; class AttrCursor; }
|
||||
|
||||
enum class Realise {
|
||||
/* Build the derivation. Postcondition: the
|
||||
derivation outputs exist. */
|
||||
/**
|
||||
* Build the derivation.
|
||||
*
|
||||
* Postcondition: the derivation outputs exist.
|
||||
*/
|
||||
Outputs,
|
||||
/* Don't build the derivation. Postcondition: the store derivation
|
||||
exists. */
|
||||
/**
|
||||
* Don't build the derivation.
|
||||
*
|
||||
* Postcondition: the store derivation exists.
|
||||
*/
|
||||
Derivation,
|
||||
/* Evaluate in dry-run mode. Postcondition: nothing. */
|
||||
// FIXME: currently unused, but could be revived if we can
|
||||
// evaluate derivations in-memory.
|
||||
/**
|
||||
* Evaluate in dry-run mode.
|
||||
*
|
||||
* Postcondition: nothing.
|
||||
*
|
||||
* \todo currently unused, but could be revived if we can evaluate
|
||||
* derivations in-memory.
|
||||
*/
|
||||
Nothing
|
||||
};
|
||||
|
||||
/* How to handle derivations in commands that operate on store paths. */
|
||||
/**
|
||||
* How to handle derivations in commands that operate on store paths.
|
||||
*/
|
||||
enum class OperateOn {
|
||||
/* Operate on the output path. */
|
||||
/**
|
||||
* Operate on the output path.
|
||||
*/
|
||||
Output,
|
||||
/* Operate on the .drv path. */
|
||||
/**
|
||||
* Operate on the .drv path.
|
||||
*/
|
||||
Derivation
|
||||
};
|
||||
|
||||
/**
|
||||
* Extra info about a DerivedPath
|
||||
*
|
||||
* Yes, this is empty, but that is intended. It will be sub-classed by
|
||||
* the subclasses of Installable to allow those to provide more info.
|
||||
* Certain commands will make use of this info.
|
||||
*/
|
||||
struct ExtraPathInfo
|
||||
{
|
||||
std::optional<NixInt> priority;
|
||||
std::optional<FlakeRef> originalRef;
|
||||
std::optional<FlakeRef> resolvedRef;
|
||||
std::optional<std::string> attrPath;
|
||||
// FIXME: merge with DerivedPath's 'outputs' field?
|
||||
std::optional<ExtendedOutputsSpec> extendedOutputsSpec;
|
||||
virtual ~ExtraPathInfo() = default;
|
||||
};
|
||||
|
||||
/* A derived path with any additional info that commands might
|
||||
need from the derivation. */
|
||||
/**
|
||||
* A DerivedPath with \ref ExtraPathInfo "any additional info" that
|
||||
* commands might need from the derivation.
|
||||
*/
|
||||
struct DerivedPathWithInfo
|
||||
{
|
||||
DerivedPath path;
|
||||
ExtraPathInfo info;
|
||||
ref<ExtraPathInfo> info;
|
||||
};
|
||||
|
||||
/**
|
||||
* Like DerivedPathWithInfo but extending BuiltPath with \ref
|
||||
* ExtraPathInfo "extra info" and also possibly the \ref BuildResult
|
||||
* "result of building".
|
||||
*/
|
||||
struct BuiltPathWithResult
|
||||
{
|
||||
BuiltPath path;
|
||||
ExtraPathInfo info;
|
||||
ref<ExtraPathInfo> info;
|
||||
std::optional<BuildResult> result;
|
||||
};
|
||||
|
||||
/**
|
||||
* Shorthand, for less typing and helping us keep the choice of
|
||||
* collection in sync.
|
||||
*/
|
||||
typedef std::vector<DerivedPathWithInfo> DerivedPathsWithInfo;
|
||||
|
||||
struct Installable;
|
||||
|
||||
/**
|
||||
* Shorthand, for less typing and helping us keep the choice of
|
||||
* collection in sync.
|
||||
*/
|
||||
typedef std::vector<ref<Installable>> Installables;
|
||||
|
||||
/**
|
||||
* Installables are the main positional arguments for the Nix
|
||||
* Command-line.
|
||||
*
|
||||
* This base class is very flexible, and just assumes and the
|
||||
* Installable refers to a collection of \ref DerivedPath "derived paths" with
|
||||
* \ref ExtraPathInfo "extra info".
|
||||
*/
|
||||
struct Installable
|
||||
{
|
||||
virtual ~Installable() { }
|
||||
|
||||
/**
|
||||
* What Installable is this?
|
||||
*
|
||||
* Prints back valid CLI syntax that would result in this same
|
||||
* installable. It doesn't need to be exactly what the user wrote,
|
||||
* just something that means the same thing.
|
||||
*/
|
||||
virtual std::string what() const = 0;
|
||||
|
||||
/**
|
||||
* Get the collection of \ref DerivedPathWithInfo "derived paths
|
||||
* with info" that this \ref Installable instalallable denotes.
|
||||
*
|
||||
* This is the main method of this class
|
||||
*/
|
||||
virtual DerivedPathsWithInfo toDerivedPaths() = 0;
|
||||
|
||||
/**
|
||||
* A convenience wrapper of the above for when we expect an
|
||||
* installable to produce a single \ref DerivedPath "derived path"
|
||||
* only.
|
||||
*
|
||||
* If no or multiple \ref DerivedPath "derived paths" are produced,
|
||||
* and error is raised.
|
||||
*/
|
||||
DerivedPathWithInfo toDerivedPath();
|
||||
|
||||
/* Return a value only if this installable is a store path or a
|
||||
symlink to it. */
|
||||
/**
|
||||
* Return a value only if this installable is a store path or a
|
||||
* symlink to it.
|
||||
*
|
||||
* \todo should we move this to InstallableDerivedPath? It is only
|
||||
* supposed to work there anyways. Can always downcast.
|
||||
*/
|
||||
virtual std::optional<StorePath> getStorePath()
|
||||
{
|
||||
return {};
|
||||
}
|
||||
|
||||
virtual FlakeRef nixpkgsFlakeRef() const
|
||||
{
|
||||
return FlakeRef::fromAttrs({{"type","indirect"}, {"id", "nixpkgs"}});
|
||||
}
|
||||
|
||||
static std::vector<BuiltPathWithResult> build(
|
||||
ref<Store> evalStore,
|
||||
ref<Store> store,
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue