cafkafk/lix
cafkafk/lix
1
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

Split shell & json creation for build environments with structured attrs

Browse source
This commit is contained in:
Maximilian Bosch 2021-05-13 16:11:56 +02:00
parent 447928bdb5
commit f1e281c4fe
No known key found for this signature in database
GPG key ID: 091DBF4D1FC46B8E
4 changed files with 20 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/libstore/build/local-derivation-goal.cc
View file

@ -1086,10 +1086,9 @@ void LocalDerivationGoal::initEnv()
void LocalDerivationGoal::writeStructuredAttrs() void LocalDerivationGoal::writeStructuredAttrs()
{ {
if (auto structAttrs = parsedDrv->generateStructuredAttrs(inputRewrites, worker.store, inputPaths)) { if (auto structAttrsJson = parsedDrv->prepareStructuredAttrs(inputRewrites, worker.store, inputPaths)) {
auto value = structAttrs.value(); auto json = structAttrsJson.value();
auto jsonSh = value.first; auto jsonSh = parsedDrv->writeStructuredAttrsShell(json);
auto json = value.second;
writeFile(tmpDir + "/.attrs.sh", rewriteStrings(jsonSh, inputRewrites)); writeFile(tmpDir + "/.attrs.sh", rewriteStrings(jsonSh, inputRewrites));
chownToBuilder(tmpDir + "/.attrs.sh"); chownToBuilder(tmpDir + "/.attrs.sh");

10
src/libstore/parsed-derivations.cc
View file

@ -124,8 +124,7 @@ bool ParsedDerivation::substitutesAllowed() const
} }
static std::regex shVarName("[A-Za-z_][A-Za-z0-9_]*"); static std::regex shVarName("[A-Za-z_][A-Za-z0-9_]*");
std::optional<StructuredAttrsWithShellRC> ParsedDerivation::generateStructuredAttrs( std::optional<nlohmann::json> ParsedDerivation::prepareStructuredAttrs(std::optional<StringMap> inputRewrites, Store & store, const StorePathSet & inputPaths)
std::optional<StringMap> inputRewrites, Store & store, const StorePathSet & inputPaths)
{ {
auto structuredAttrs = getStructuredAttrs(); auto structuredAttrs = getStructuredAttrs();
if (!structuredAttrs) return std::nullopt; if (!structuredAttrs) return std::nullopt;
@ -163,6 +162,11 @@ std::optional<StructuredAttrsWithShellRC> ParsedDerivation::generateStructuredAt
} }
} }
return json;
}
std::string ParsedDerivation::writeStructuredAttrsShell(nlohmann::json & json)
{
/* As a convenience to bash scripts, write a shell file that /* As a convenience to bash scripts, write a shell file that
maps all attributes that are representable in bash - maps all attributes that are representable in bash -
namely, strings, integers, nulls, Booleans, and arrays and namely, strings, integers, nulls, Booleans, and arrays and
@ -229,6 +233,6 @@ std::optional<StructuredAttrsWithShellRC> ParsedDerivation::generateStructuredAt
} }
} }
return std::make_pair(jsonSh, json); return jsonSh;
} }
} }

3
src/libstore/parsed-derivations.hh
View file

@ -39,7 +39,8 @@ public:
bool substitutesAllowed() const; bool substitutesAllowed() const;
std::optional<StructuredAttrsWithShellRC> generateStructuredAttrs(std::optional<StringMap> inputRewrites, Store & store, const StorePathSet & inputPaths); std::optional<nlohmann::json> prepareStructuredAttrs(std::optional<StringMap> inputRewrites, Store & store, const StorePathSet & inputPaths);
std::string writeStructuredAttrsShell(nlohmann::json & json);
}; };
} }

13
src/nix-build/nix-build.cc
View file

@ -444,13 +444,16 @@ static void main_nix_build(int argc, char * * argv)
drv drv
); );
if (auto structAttrs = parsedDrv.generateStructuredAttrs(std::nullopt, *store, inputs)) { if (auto structAttrs = parsedDrv.prepareStructuredAttrs(std::nullopt, *store, inputs)) {
auto val = structAttrs.value(); auto json = structAttrs.value();
structuredAttrsRC = val.first; structuredAttrsRC = parsedDrv.writeStructuredAttrsShell(json);
auto attrsJSON = (Path) tmpDir + "/.attrs.json"; auto attrsJSON = (Path) tmpDir + "/.attrs.json";
writeFile(attrsJSON, val.second.dump()); writeFile(attrsJSON, json.dump());
auto attrsSH = (Path) tmpDir + "/.attrs.sh"; auto attrsSH = (Path) tmpDir + "/.attrs.sh";
writeFile(attrsSH, val.first); writeFile(attrsSH, structuredAttrsRC);
env["ATTRS_SH_FILE"] = attrsSH; env["ATTRS_SH_FILE"] = attrsSH;
env["ATTRS_JSON_FILE"] = attrsJSON; env["ATTRS_JSON_FILE"] = attrsJSON;
keepTmp = true; keepTmp = true;