nixos/nix
1
1
Fork 0
mirror of https://github.com/NixOS/nix.git synced 2025-12-19 15:31:07 +01:00
Code Activity

refactor: Extract EvalState::realiseString

Browse source 
(cherry picked from commit 7465fbe926)

# Conflicts:
#	src/libexpr/primops.cc
This commit is contained in:
Robert Hensing 2025-01-27 12:32:46 +01:00 • committed by Mergify
parent a28791a91e
commit 865239c732
3 changed files with 29 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/libexpr/eval.hh
View file

@ -786,6 +786,15 @@ public:
*/
[[nodiscard]] StringMap realiseContext(const NixStringContext & context, StorePathSet * maybePaths = nullptr, bool isIFD = true);
/**
* Realise the given string with context, and return the string with outputs instead of downstream output placeholders.
* @param[in] str the string to realise
* @param[out] paths all referenced store paths will be added to this set
* @return the realised string
* @throw EvalError if the value is not a string, path or derivation (see `coerceToString`)
*/
std::string realiseString(Value & str, StorePathSet * storePathsOutMaybe, bool isIFD = true, const PosIdx pos = noPos);
/* Call the binary path filter predicate used builtins.path etc. */
bool callPathFilter(
Value * filterFun,

19
src/libexpr/primops.cc
View file

@ -40,6 +40,25 @@ namespace nix {
* Miscellaneous
*************************************************************/
<<<<<<< HEAD
=======
static inline Value * mkString(EvalState & state, const std::csub_match & match)
{
Value * v = state.allocValue();
v->mkString({match.first, match.second});
return v;
}
std::string EvalState::realiseString(Value & s, StorePathSet * storePathsOutMaybe, bool isIFD, const PosIdx pos)
{
nix::NixStringContext stringContext;
auto rawStr = coerceToString(pos, s, stringContext, "while realising a string").toOwned();
auto rewrites = realiseContext(stringContext, storePathsOutMaybe, isIFD);
return nix::rewriteStrings(rawStr, rewrites);
}
>>>>>>> 7465fbe92 (refactor: Extract EvalState::realiseString)
StringMap EvalState::realiseContext(const NixStringContext & context, StorePathSet * maybePathsOut, bool isIFD)
{
std::vector<DerivedPath::Built> drvs;