diff --git a/corepkgs/buildenv/builder.pl.in b/corepkgs/buildenv/builder.pl.in index 9eb9f7bb0..86abe0ca1 100755 --- a/corepkgs/buildenv/builder.pl.in +++ b/corepkgs/buildenv/builder.pl.in @@ -29,10 +29,18 @@ sub createLinks { $baseName =~ s/^.*\///g; # strip directory my $dstFile = "$dstDir/$baseName"; + # The files below are special-cased so that they don't show up + # in user profiles, either because they are useless, or + # because they would cause pointless collisions (e.g., each + # Python package brings its own + # `$out/lib/pythonX.Y/site-packages/easy-install.pth'.) # Urgh, hacky... - if ($srcFile =~ /\/propagated-build-inputs$/ || + if ($srcFile =~ /\/propagated-build-inputs$/ || $srcFile =~ /\/nix-support$/ || $srcFile =~ /\/perllocal.pod$/ || + $srcFile =~ /\/easy-install.pth$/ || + $srcFile =~ /\/site.py$/ || + $srcFile =~ /\/site.pyc$/ || $srcFile =~ /\/info\/dir$/ || $srcFile =~ /\/log$/) { diff --git a/doc/manual/nix-store.xml b/doc/manual/nix-store.xml index 566c75bf3..10bb3eda5 100644 --- a/doc/manual/nix-store.xml +++ b/doc/manual/nix-store.xml @@ -342,7 +342,7 @@ $ nix-store --gc --max-freed $((100 * 1024 * 1024)) nix-store - + paths diff --git a/src/libexpr/primops.cc b/src/libexpr/primops.cc index d33b0030f..a7e7bcdc8 100644 --- a/src/libexpr/primops.cc +++ b/src/libexpr/primops.cc @@ -582,7 +582,7 @@ static void prim_toXML(EvalState & state, Value * * args, Value & v) { std::ostringstream out; PathSet context; - printValueAsXML(state, true, *args[0], out, context); + printValueAsXML(state, true, false, *args[0], out, context); mkString(v, out.str(), context); } diff --git a/src/libexpr/value-to-xml.cc b/src/libexpr/value-to-xml.cc index 821f715e2..c3f352cfb 100644 --- a/src/libexpr/value-to-xml.cc +++ b/src/libexpr/value-to-xml.cc @@ -16,26 +16,40 @@ static XMLAttrs singletonAttrs(const string & name, const string & value) } -static void printValueAsXML(EvalState & state, bool strict, Value & v, - XMLWriter & doc, PathSet & context, PathSet & drvsSeen); +static void printValueAsXML(EvalState & state, bool strict, bool location, + Value & v, XMLWriter & doc, PathSet & context, PathSet & drvsSeen); -static void showAttrs(EvalState & state, bool strict, Bindings & attrs, - XMLWriter & doc, PathSet & context, PathSet & drvsSeen) +static void posToXML(XMLAttrs & xmlAttrs, const Pos & pos) +{ + xmlAttrs["path"] = pos.file; + xmlAttrs["line"] = (format("%1%") % pos.line).str(); + xmlAttrs["column"] = (format("%1%") % pos.column).str(); +} + + +static void showAttrs(EvalState & state, bool strict, bool location, + Bindings & attrs, XMLWriter & doc, PathSet & context, PathSet & drvsSeen) { StringSet names; foreach (Bindings::iterator, i, attrs) names.insert(i->first); foreach (StringSet::iterator, i, names) { - XMLOpenElement _(doc, "attr", singletonAttrs("name", *i)); - printValueAsXML(state, strict, attrs[state.symbols.create(*i)].value, - doc, context, drvsSeen); + Attr & a(attrs[state.symbols.create(*i)]); + + XMLAttrs xmlAttrs; + xmlAttrs["name"] = *i; + if (location && a.pos != &noPos) posToXML(xmlAttrs, *a.pos); + + XMLOpenElement _(doc, "attr", xmlAttrs); + printValueAsXML(state, strict, location, + a.value, doc, context, drvsSeen); } } -static void printValueAsXML(EvalState & state, bool strict, Value & v, - XMLWriter & doc, PathSet & context, PathSet & drvsSeen) +static void printValueAsXML(EvalState & state, bool strict, bool location, + Value & v, XMLWriter & doc, PathSet & context, PathSet & drvsSeen) { checkInterrupt(); @@ -72,25 +86,31 @@ static void printValueAsXML(EvalState & state, bool strict, Value & v, Path drvPath; a = v.attrs->find(state.sDrvPath); - if (a != v.attrs->end() && a->second.value.type == tString) - xmlAttrs["drvPath"] = drvPath = a->second.value.string.s; + if (a != v.attrs->end()) { + if (strict) state.forceValue(a->second.value); + if (a->second.value.type == tString) + xmlAttrs["drvPath"] = drvPath = a->second.value.string.s; + } a = v.attrs->find(state.sOutPath); - if (a != v.attrs->end() && a->second.value.type == tString) - xmlAttrs["outPath"] = a->second.value.string.s; + if (a != v.attrs->end()) { + if (strict) state.forceValue(a->second.value); + if (a->second.value.type == tString) + xmlAttrs["outPath"] = a->second.value.string.s; + } XMLOpenElement _(doc, "derivation", xmlAttrs); if (drvPath != "" && drvsSeen.find(drvPath) == drvsSeen.end()) { drvsSeen.insert(drvPath); - showAttrs(state, strict, *v.attrs, doc, context, drvsSeen); + showAttrs(state, strict, location, *v.attrs, doc, context, drvsSeen); } else doc.writeEmptyElement("repeated"); } else { XMLOpenElement _(doc, "attrs"); - showAttrs(state, strict, *v.attrs, doc, context, drvsSeen); + showAttrs(state, strict, location, *v.attrs, doc, context, drvsSeen); } break; @@ -98,12 +118,15 @@ static void printValueAsXML(EvalState & state, bool strict, Value & v, case tList: { XMLOpenElement _(doc, "list"); for (unsigned int n = 0; n < v.list.length; ++n) - printValueAsXML(state, strict, *v.list.elems[n], doc, context, drvsSeen); + printValueAsXML(state, strict, location, *v.list.elems[n], doc, context, drvsSeen); break; } case tLambda: { - XMLOpenElement _(doc, "function"); + XMLAttrs xmlAttrs; + if (location) posToXML(xmlAttrs, v.lambda.fun->pos); + XMLOpenElement _(doc, "function", xmlAttrs); + if (v.lambda.fun->matchAttrs) { XMLAttrs attrs; if (!v.lambda.fun->arg.empty()) attrs["name"] = v.lambda.fun->arg; @@ -113,6 +136,7 @@ static void printValueAsXML(EvalState & state, bool strict, Value & v, doc.writeEmptyElement("attr", singletonAttrs("name", i->name)); } else doc.writeEmptyElement("varpat", singletonAttrs("name", v.lambda.fun->arg)); + break; } @@ -122,13 +146,13 @@ static void printValueAsXML(EvalState & state, bool strict, Value & v, } -void printValueAsXML(EvalState & state, bool strict, +void printValueAsXML(EvalState & state, bool strict, bool location, Value & v, std::ostream & out, PathSet & context) { XMLWriter doc(true, out); XMLOpenElement root(doc, "expr"); PathSet drvsSeen; - printValueAsXML(state, strict, v, doc, context, drvsSeen); + printValueAsXML(state, strict, location, v, doc, context, drvsSeen); } diff --git a/src/libexpr/value-to-xml.hh b/src/libexpr/value-to-xml.hh index 7dfbe06d1..0c6de3a8b 100644 --- a/src/libexpr/value-to-xml.hh +++ b/src/libexpr/value-to-xml.hh @@ -9,7 +9,7 @@ namespace nix { -void printValueAsXML(EvalState & state, bool strict, +void printValueAsXML(EvalState & state, bool strict, bool location, Value & v, std::ostream & out, PathSet & context); } diff --git a/src/libutil/xml-writer.cc b/src/libutil/xml-writer.cc index 20351e2c3..7d698bf6a 100644 --- a/src/libutil/xml-writer.cc +++ b/src/libutil/xml-writer.cc @@ -91,6 +91,7 @@ void XMLWriter::writeAttrs(const XMLAttrs & attrs) char c = i->second[j]; if (c == '"') output << """; else if (c == '<') output << "<"; + else if (c == '>') output << ">"; else if (c == '&') output << "&"; /* Escape newlines to prevent attribute normalisation (see XML spec, section 3.3.3. */ diff --git a/src/nix-instantiate/help.txt b/src/nix-instantiate/help.txt index fa0a4590e..21822132a 100644 --- a/src/nix-instantiate/help.txt +++ b/src/nix-instantiate/help.txt @@ -22,6 +22,8 @@ Options: For --eval-only / --parse-only: --xml: print an XML representation of the abstract syntax tree + --no-location: don't provide source location information in the + output XML tree For --eval-only: diff --git a/src/nix-instantiate/nix-instantiate.cc b/src/nix-instantiate/nix-instantiate.cc index c61cf89c9..4d629ea1b 100644 --- a/src/nix-instantiate/nix-instantiate.cc +++ b/src/nix-instantiate/nix-instantiate.cc @@ -39,7 +39,7 @@ static bool indirectRoot = false; void processExpr(EvalState & state, const Strings & attrPaths, bool parseOnly, bool strict, const Bindings & autoArgs, - bool evalOnly, bool xmlOutput, Expr * e) + bool evalOnly, bool xmlOutput, bool location, Expr * e) { if (parseOnly) std::cout << format("%1%\n") % *e; @@ -52,7 +52,7 @@ void processExpr(EvalState & state, const Strings & attrPaths, PathSet context; if (evalOnly) if (xmlOutput) - printValueAsXML(state, strict, v, std::cout, context); + printValueAsXML(state, strict, location, v, std::cout, context); else { if (strict) state.strictForceValue(v); std::cout << v << std::endl; @@ -83,6 +83,7 @@ void run(Strings args) bool evalOnly = false; bool parseOnly = false; bool xmlOutput = false; + bool xmlOutputSourceLocation = true; bool strict = false; Strings attrPaths; Bindings autoArgs; @@ -116,6 +117,8 @@ void run(Strings args) indirectRoot = true; else if (arg == "--xml") xmlOutput = true; + else if (arg == "--no-location") + xmlOutputSourceLocation = false; else if (arg == "--strict") strict = true; else if (arg[0] == '-') @@ -131,14 +134,14 @@ void run(Strings args) if (readStdin) { Expr * e = parseStdin(state); processExpr(state, attrPaths, parseOnly, strict, autoArgs, - evalOnly, xmlOutput, e); + evalOnly, xmlOutput, xmlOutputSourceLocation, e); } foreach (Strings::iterator, i, files) { Path path = absPath(*i); Expr * e = parseExprFromFile(state, path); processExpr(state, attrPaths, parseOnly, strict, autoArgs, - evalOnly, xmlOutput, e); + evalOnly, xmlOutput, xmlOutputSourceLocation, e); } state.printStats(); diff --git a/tests/lang.sh b/tests/lang.sh index eec33734c..fab8c6e0d 100644 --- a/tests/lang.sh +++ b/tests/lang.sh @@ -50,7 +50,8 @@ for i in lang/eval-okay-*.nix; do fi if test -e lang/$i.exp.xml; then - if ! $nixinstantiate --eval-only --xml --strict lang/$i.nix > lang/$i.out.xml; then + if ! $nixinstantiate --eval-only --xml --no-location --strict \ + lang/$i.nix > lang/$i.out.xml; then echo "FAIL: $i should evaluate" fail=1 elif ! cmp -s lang/$i.out.xml lang/$i.exp.xml; then diff --git a/tests/lang/eval-okay-toxml.exp b/tests/lang/eval-okay-toxml.exp new file mode 100644 index 000000000..828220890 --- /dev/null +++ b/tests/lang/eval-okay-toxml.exp @@ -0,0 +1 @@ +"\n\n \n \n \n \n \n\n" diff --git a/tests/lang/eval-okay-toxml.nix b/tests/lang/eval-okay-toxml.nix new file mode 100644 index 000000000..068c97a6c --- /dev/null +++ b/tests/lang/eval-okay-toxml.nix @@ -0,0 +1,3 @@ +# Make sure the expected XML output is produced; in particular, make sure it +# doesn't contain source location information. +builtins.toXML { a = "s"; } diff --git a/tests/lang/eval-okay-to-xml.exp b/tests/lang/eval-okay-toxml2.exp similarity index 100% rename from tests/lang/eval-okay-to-xml.exp rename to tests/lang/eval-okay-toxml2.exp diff --git a/tests/lang/eval-okay-to-xml.nix b/tests/lang/eval-okay-toxml2.nix similarity index 100% rename from tests/lang/eval-okay-to-xml.nix rename to tests/lang/eval-okay-toxml2.nix