diff options
| author | Qyriad <qyriad@qyriad.me> | 2024-08-01 16:25:43 +0000 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@localhost> | 2024-08-01 16:25:43 +0000 |
| commit | 61a93d53081141d4ab222dcb939dd5caa8ffc767 (patch) | |
| tree | 28a0b7471e9b8fb8edeefc566c8c76293ebd168a /src/libcmd | |
| parent | a3ab2cc78a736109435f3cc8e1364fcc366c6c97 (diff) | |
| parent | 17d7e8870712a2742719424ffd67c64b0a1e8612 (diff) | |
Merge changes Icc4747ae,Id4717b5b,Ie3ddb3d0,Ic4d93a08,I00d9ff70 into main
* changes:
remove unused headers in installable-attr-path
libexpr: include the type of the non-derivation value in the type error
libexpr: mild cleanup to getDerivations
libexpr: DrvInfo: remove unused bad-citizen constructor
cleanup and slightly refactor DrvInfo::queryOutputs
Diffstat (limited to 'src/libcmd')
| -rw-r--r-- | src/libcmd/installable-attr-path.cc | 12 | ||||
| -rw-r--r-- | src/libcmd/installable-attr-path.hh | 14 |
2 files changed, 0 insertions, 26 deletions
diff --git a/src/libcmd/installable-attr-path.cc b/src/libcmd/installable-attr-path.cc index eb15fecc3..9891b263c 100644 --- a/src/libcmd/installable-attr-path.cc +++ b/src/libcmd/installable-attr-path.cc @@ -1,23 +1,11 @@ -#include "globals.hh" #include "installable-attr-path.hh" #include "outputs-spec.hh" #include "command.hh" #include "attr-path.hh" #include "common-eval-args.hh" -#include "derivations.hh" -#include "eval-inline.hh" #include "eval.hh" #include "get-drvs.hh" -#include "store-api.hh" -#include "shared.hh" #include "flake/flake.hh" -#include "eval-cache.hh" -#include "url.hh" -#include "registry.hh" -#include "build-result.hh" - -#include <regex> -#include <queue> #include <nlohmann/json.hpp> diff --git a/src/libcmd/installable-attr-path.hh b/src/libcmd/installable-attr-path.hh index 86c2f8219..edc9c2906 100644 --- a/src/libcmd/installable-attr-path.hh +++ b/src/libcmd/installable-attr-path.hh @@ -1,25 +1,11 @@ #pragma once ///@file -#include "globals.hh" #include "installable-value.hh" #include "outputs-spec.hh" #include "command.hh" -#include "attr-path.hh" #include "common-eval-args.hh" -#include "derivations.hh" -#include "eval-inline.hh" #include "eval.hh" -#include "get-drvs.hh" -#include "store-api.hh" -#include "shared.hh" -#include "eval-cache.hh" -#include "url.hh" -#include "registry.hh" -#include "build-result.hh" - -#include <regex> -#include <queue> #include <nlohmann/json.hpp> |