wroclaw-git-backups/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-06-25 10:41:16 +02:00
Code Activity

Fix conflict

Browse source
This commit is contained in:
Robert Hensing 2025-01-28 09:20:56 +01:00
parent 865239c732
commit 0f19bfe811
1 changed files with 0 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/libexpr/primops.cc
View file

@ -40,15 +40,6 @@ namespace nix {
* Miscellaneous * 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) std::string EvalState::realiseString(Value & s, StorePathSet * storePathsOutMaybe, bool isIFD, const PosIdx pos)
{ {
nix::NixStringContext stringContext; nix::NixStringContext stringContext;
@ -58,7 +49,6 @@ std::string EvalState::realiseString(Value & s, StorePathSet * storePathsOutMayb
return nix::rewriteStrings(rawStr, rewrites); return nix::rewriteStrings(rawStr, rewrites);
} }
>>>>>>> 7465fbe92 (refactor: Extract EvalState::realiseString)
StringMap EvalState::realiseContext(const NixStringContext & context, StorePathSet * maybePathsOut, bool isIFD) StringMap EvalState::realiseContext(const NixStringContext & context, StorePathSet * maybePathsOut, bool isIFD)
{ {
std::vector<DerivedPath::Built> drvs; std::vector<DerivedPath::Built> drvs;