lehmanator/lix
0
0
Fork 0
forked from lix-project/lix
Code Pull requests Activity

nix-env -q --out-path: Support multiple outputs

Browse source 
We now print all output paths of a package, e.g.

  openssl-1.0.0i  bin=/nix/store/gq2mvh0wb9l90djvsagln3aqywqmr6vl-openssl-1.0.0i-bin;man=/nix/store/7zwf5r5hsdarl3n86dasvb4chm2xzw9n-openssl-1.0.0i-man;/nix/store/cj7xvk7fjp9q887359j75pw3pzjfmqf1-openssl-1.0.0i

or (in XML mode)

  <item attrPath="openssl" name="openssl-1.0.0i" system="x86_64-linux">
    <output name="bin" path="/nix/store/gq2mvh0wb9l90djvsagln3aqywqmr6vl-openssl-1.0.0i-bin" />
    <output name="man" path="/nix/store/7zwf5r5hsdarl3n86dasvb4chm2xzw9n-openssl-1.0.0i-man" />
    <output name="out" path="/nix/store/cj7xvk7fjp9q887359j75pw3pzjfmqf1-openssl-1.0.0i" />
  </item>
This commit is contained in:
Eelco Dolstra 2012-11-28 13:49:44 +01:00
parent 6c98e6a5de
commit 8eed07cda4
5 changed files with 94 additions and 45 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/libexpr/eval.cc
View file

@ -138,6 +138,7 @@ EvalState::EvalState()
, sName(symbols.create("name")) , sName(symbols.create("name"))
, sSystem(symbols.create("system")) , sSystem(symbols.create("system"))
, sOverrides(symbols.create("__overrides")) , sOverrides(symbols.create("__overrides"))
, sOutputs(symbols.create("outputs"))
, sOutputName(symbols.create("outputName")) , sOutputName(symbols.create("outputName"))
, sIgnoreNulls(symbols.create("__ignoreNulls")) , sIgnoreNulls(symbols.create("__ignoreNulls"))
, baseEnv(allocEnv(128)) , baseEnv(allocEnv(128))

2
src/libexpr/eval.hh
View file

@ -93,7 +93,7 @@ public:
SymbolTable symbols; SymbolTable symbols;
const Symbol sWith, sOutPath, sDrvPath, sType, sMeta, sName, const Symbol sWith, sOutPath, sDrvPath, sType, sMeta, sName,
sSystem, sOverrides, sOutputName, sIgnoreNulls; sSystem, sOverrides, sOutputs, sOutputName, sIgnoreNulls;
/* If set, force copying files to the Nix store even if they /* If set, force copying files to the Nix store even if they
already exist there. */ already exist there. */

46
src/libexpr/get-drvs.cc
View file

@ -28,12 +28,42 @@ string DrvInfo::queryOutPath(EvalState & state) const
} }
DrvInfo::Outputs DrvInfo::queryOutputs(EvalState & state)
{
if (outputs.empty()) {
/* Get the ‘outputs’ list. */
Bindings::iterator i = attrs->find(state.sOutputs);
if (i == attrs->end())
outputs["out"] = queryOutPath(state);
else {
state.forceList(*i->value);
/* For each output... */
for (unsigned int j = 0; j < i->value->list.length; ++j) {
/* Evaluate the corresponding attribute set. */
string name = state.forceStringNoCtx(*i->value->list.elems[j]);
Bindings::iterator out = attrs->find(state.symbols.create(name));
if (out == attrs->end()) continue; // FIXME: throw error?
state.forceAttrs(*out->value);
/* And evaluate its ‘outPath’ attribute. */
Bindings::iterator outPath = out->value->attrs->find(state.sOutPath);
if (outPath == out->value->attrs->end()) continue; // FIXME: throw error?
PathSet context;
outputs[name] = state.coerceToPath(*outPath->value, context);
}
}
}
return outputs;
}
string DrvInfo::queryOutputName(EvalState & state) const string DrvInfo::queryOutputName(EvalState & state) const
{ {
if (outputName == "" && attrs) { if (outputName == "" && attrs) {
Bindings::iterator i = attrs->find(state.sOutputName); Bindings::iterator i = attrs->find(state.sOutputName);
PathSet context; (string &) outputName = i != attrs->end() ? state.forceStringNoCtx(*i->value) : "";
(string &) outputName = i != attrs->end() ? state.coerceToString(*i->value, context) : "";
} }
return outputName; return outputName;
} }
@ -42,9 +72,9 @@ string DrvInfo::queryOutputName(EvalState & state) const
MetaInfo DrvInfo::queryMetaInfo(EvalState & state) const MetaInfo DrvInfo::queryMetaInfo(EvalState & state) const
{ {
if (metaInfoRead) return meta; if (metaInfoRead) return meta;
(bool &) metaInfoRead = true; (bool &) metaInfoRead = true;
Bindings::iterator a = attrs->find(state.sMeta); Bindings::iterator a = attrs->find(state.sMeta);
if (a == attrs->end()) return meta; /* fine, empty meta information */ if (a == attrs->end()) return meta; /* fine, empty meta information */
@ -108,7 +138,7 @@ static bool getDerivation(EvalState & state, Value & v,
done.insert(v.attrs); done.insert(v.attrs);
DrvInfo drv; DrvInfo drv;
Bindings::iterator i = v.attrs->find(state.sName); Bindings::iterator i = v.attrs->find(state.sName);
/* !!! We really would like to have a decent back trace here. */ /* !!! We really would like to have a decent back trace here. */
if (i == v.attrs->end()) throw TypeError("derivation name missing"); if (i == v.attrs->end()) throw TypeError("derivation name missing");
@ -126,7 +156,7 @@ static bool getDerivation(EvalState & state, Value & v,
drvs.push_back(drv); drvs.push_back(drv);
return false; return false;
} catch (AssertionError & e) { } catch (AssertionError & e) {
if (ignoreAssertionFailures) return false; if (ignoreAssertionFailures) return false;
throw; throw;
@ -159,7 +189,7 @@ static void getDerivations(EvalState & state, Value & vIn,
{ {
Value v; Value v;
state.autoCallFunction(autoArgs, vIn, v); state.autoCallFunction(autoArgs, vIn, v);
/* Process the expression. */ /* Process the expression. */
DrvInfo drv; DrvInfo drv;
@ -222,5 +252,5 @@ void getDerivations(EvalState & state, Value & v, const string & pathPrefix,
getDerivations(state, v, pathPrefix, autoArgs, drvs, done, ignoreAssertionFailures); getDerivations(state, v, pathPrefix, autoArgs, drvs, done, ignoreAssertionFailures);
} }
} }

11
src/libexpr/get-drvs.hh
View file

@ -25,16 +25,20 @@ typedef std::map<string, MetaValue> MetaInfo;
struct DrvInfo struct DrvInfo
{ {
public:
typedef std::map<string, Path> Outputs;
private: private:
string drvPath; string drvPath;
string outPath; string outPath;
string outputName; string outputName;
Outputs outputs;
bool metaInfoRead; bool metaInfoRead;
MetaInfo meta; MetaInfo meta;
bool failed; // set if we get an AssertionError bool failed; // set if we get an AssertionError
public: public:
string name; string name;
string attrPath; /* path towards the derivation */ string attrPath; /* path towards the derivation */
@ -48,6 +52,7 @@ public:
string queryDrvPath(EvalState & state) const; string queryDrvPath(EvalState & state) const;
string queryOutPath(EvalState & state) const; string queryOutPath(EvalState & state) const;
string queryOutputName(EvalState & state) const; string queryOutputName(EvalState & state) const;
Outputs queryOutputs(EvalState & state);
MetaInfo queryMetaInfo(EvalState & state) const; MetaInfo queryMetaInfo(EvalState & state) const;
MetaValue queryMetaInfo(EvalState & state, const string & name) const; MetaValue queryMetaInfo(EvalState & state, const string & name) const;
@ -55,7 +60,7 @@ public:
{ {
drvPath = s; drvPath = s;
} }
void setOutPath(const string & s) void setOutPath(const string & s)
{ {
outPath = s; outPath = s;
@ -84,5 +89,5 @@ void getDerivations(EvalState & state, Value & v, const string & pathPrefix,
Bindings & autoArgs, DrvInfos & drvs, Bindings & autoArgs, DrvInfos & drvs,
bool ignoreAssertionFailures); bool ignoreAssertionFailures);
} }

79
src/nix-env/nix-env.cc
View file

@ -1030,7 +1030,7 @@ static void opQuery(Globals & globals,
if (xmlOutput) { if (xmlOutput) {
if (i->system != "") attrs["system"] = i->system; if (i->system != "") attrs["system"] = i->system;
} }
else if (printSystem) else if (printSystem)
columns.push_back(i->system); columns.push_back(i->system);
if (printDrvPath) { if (printDrvPath) {
@ -1040,13 +1040,16 @@ static void opQuery(Globals & globals,
} else } else
columns.push_back(drvPath == "" ? "-" : drvPath); columns.push_back(drvPath == "" ? "-" : drvPath);
} }
if (printOutPath) { if (printOutPath && !xmlOutput) {
string outPath = i->queryOutPath(globals.state); DrvInfo::Outputs outputs = i->queryOutputs(globals.state);
if (xmlOutput) { string s;
if (outPath != "") attrs["outPath"] = outPath; foreach (DrvInfo::Outputs::iterator, j, outputs) {
} else if (!s.empty()) s += ';';
columns.push_back(outPath); if (j->first != "out") { s += j->first; s += "="; }
s += j->second;
}
columns.push_back(s);
} }
if (printDescription) { if (printDescription) {
@ -1059,35 +1062,45 @@ static void opQuery(Globals & globals,
columns.push_back(descr); columns.push_back(descr);
} }
if (xmlOutput) if (xmlOutput) {
if (printMeta) { if (printOutPath || printMeta) {
XMLOpenElement item(xml, "item", attrs); XMLOpenElement item(xml, "item", attrs);
MetaInfo meta = i->queryMetaInfo(globals.state); if (printOutPath) {
for (MetaInfo::iterator j = meta.begin(); j != meta.end(); ++j) { DrvInfo::Outputs outputs = i->queryOutputs(globals.state);
XMLAttrs attrs2; foreach (DrvInfo::Outputs::iterator, j, outputs) {
attrs2["name"] = j->first; XMLAttrs attrs2;
if (j->second.type == MetaValue::tpString) { attrs2["name"] = j->first;
attrs2["type"] = "string"; attrs2["path"] = j->second;
attrs2["value"] = j->second.stringValue; xml.writeEmptyElement("output", attrs2);
xml.writeEmptyElement("meta", attrs2);
} else if (j->second.type == MetaValue::tpInt) {
attrs2["type"] = "int";
attrs2["value"] = (format("%1%") % j->second.intValue).str();
xml.writeEmptyElement("meta", attrs2);
} else if (j->second.type == MetaValue::tpStrings) {
attrs2["type"] = "strings";
XMLOpenElement m(xml, "meta", attrs2);
foreach (Strings::iterator, k, j->second.stringValues) {
XMLAttrs attrs3;
attrs3["value"] = *k;
xml.writeEmptyElement("string", attrs3);
}
} }
} }
} if (printMeta) {
else MetaInfo meta = i->queryMetaInfo(globals.state);
for (MetaInfo::iterator j = meta.begin(); j != meta.end(); ++j) {
XMLAttrs attrs2;
attrs2["name"] = j->first;
if (j->second.type == MetaValue::tpString) {
attrs2["type"] = "string";
attrs2["value"] = j->second.stringValue;
xml.writeEmptyElement("meta", attrs2);
} else if (j->second.type == MetaValue::tpInt) {
attrs2["type"] = "int";
attrs2["value"] = (format("%1%") % j->second.intValue).str();
xml.writeEmptyElement("meta", attrs2);
} else if (j->second.type == MetaValue::tpStrings) {
attrs2["type"] = "strings";
XMLOpenElement m(xml, "meta", attrs2);
foreach (Strings::iterator, k, j->second.stringValues) {
XMLAttrs attrs3;
attrs3["value"] = *k;
xml.writeEmptyElement("string", attrs3);
}
}
}
}
} else
xml.writeEmptyElement("item", attrs); xml.writeEmptyElement("item", attrs);
else } else
table.push_back(columns); table.push_back(columns);
cout.flush(); cout.flush();