aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--configure.ac9
-rw-r--r--doc/manual/package-management.xml2
-rw-r--r--doc/manual/release-notes.xml12
-rw-r--r--src/bin2c/Makefile.am3
-rw-r--r--src/libexpr/expr-to-xml.cc66
-rw-r--r--src/libexpr/expr-to-xml.hh2
-rw-r--r--src/libutil/util.cc10
-rw-r--r--src/libutil/xml-writer.cc1
-rw-r--r--src/nix-instantiate/help.txt2
-rw-r--r--src/nix-instantiate/nix-instantiate.cc15
-rw-r--r--tests/lang.sh3
-rw-r--r--tests/lang/eval-okay-toxml.exp1
-rw-r--r--tests/lang/eval-okay-toxml.nix3
-rw-r--r--tests/lang/eval-okay-with.exp2
-rw-r--r--tests/lang/eval-okay-with.nix8
-rw-r--r--version2
16 files changed, 107 insertions, 34 deletions
diff --git a/configure.ac b/configure.ac
index bc024c69c..c10c56276 100644
--- a/configure.ac
+++ b/configure.ac
@@ -71,6 +71,15 @@ fi
AC_PROG_CC
AC_PROG_CXX
+# To build programs to be run in the build machine
+if test "$CC_FOR_BUILD" = ""; then
+ if test "$cross_compiling" = "yes"; then
+ AC_CHECK_PROGS(CC_FOR_BUILD, gcc cc)
+ else
+ CC_FOR_BUILD="$CC"
+ fi
+fi
+AC_SUBST([CC_FOR_BUILD])
# We are going to use libtool.
AC_DISABLE_STATIC
diff --git a/doc/manual/package-management.xml b/doc/manual/package-management.xml
index fa40af2ef..8cc6aa857 100644
--- a/doc/manual/package-management.xml
+++ b/doc/manual/package-management.xml
@@ -38,7 +38,7 @@ to end-user applications like Mozilla Firefox. (Nix is however not
tied to the Nix Package collection; you could write your own Nix
expressions based on it, or completely new ones.) You can download
the latest version from <link
-xlink:href='http://nixos.org/releases/full-index-nixpkgs.html' />.</para>
+xlink:href='http://nixos.org/nixpkgs/download.html' />.</para>
<para>Assuming that you have downloaded and unpacked a release of Nix
Packages, you can view the set of available packages in the release:
diff --git a/doc/manual/release-notes.xml b/doc/manual/release-notes.xml
index 907d6dc7c..e79563440 100644
--- a/doc/manual/release-notes.xml
+++ b/doc/manual/release-notes.xml
@@ -8,6 +8,18 @@
<!--==================================================================-->
+<section xml:id="ssec-relnotes-0.15"><title>Release 0.15 (March 17, 2010)</title>
+
+<para>This is a bug-fix release. Among other things, it fixes
+building on Mac OS X (Snow Leopard), and improves the contents of
+<filename>/etc/passwd</filename> and <filename>/etc/group</filename>
+in <literal>chroot</literal> builds.</para>
+
+</section>
+
+
+<!--==================================================================-->
+
<section xml:id="ssec-relnotes-0.14"><title>Release 0.14 (February 4, 2010)</title>
<para>This release has the following improvements:</para>
diff --git a/src/bin2c/Makefile.am b/src/bin2c/Makefile.am
index bdd58808a..bba3c3e3a 100644
--- a/src/bin2c/Makefile.am
+++ b/src/bin2c/Makefile.am
@@ -1,3 +1,6 @@
noinst_PROGRAMS = bin2c
bin2c_SOURCES = bin2c.c
+
+bin2c$(EXEEXT): bin2c.c
+ $(CC_FOR_BUILD) $(CFLAGS_FOR_BUILD) -o bin2c bin2c.c
diff --git a/src/libexpr/expr-to-xml.cc b/src/libexpr/expr-to-xml.cc
index e401001ea..1e59eebfc 100644
--- a/src/libexpr/expr-to-xml.cc
+++ b/src/libexpr/expr-to-xml.cc
@@ -24,18 +24,35 @@ typedef set<Expr> ExprSet;
static void printTermAsXML(Expr e, XMLWriter & doc, PathSet & context,
- ExprSet & drvsSeen);
+ ExprSet & drvsSeen, bool location);
static void showAttrs(const ATermMap & attrs, XMLWriter & doc,
- PathSet & context, ExprSet & drvsSeen)
+ PathSet & context, ExprSet & drvsSeen, bool location)
{
StringSet names;
for (ATermMap::const_iterator i = attrs.begin(); i != attrs.end(); ++i)
names.insert(aterm2String(i->key));
for (StringSet::iterator i = names.begin(); i != names.end(); ++i) {
- XMLOpenElement _(doc, "attr", singletonAttrs("name", *i));
- printTermAsXML(attrs.get(toATerm(*i)), doc, context, drvsSeen);
+ ATerm attrRHS = attrs.get(toATerm(*i));
+ ATerm attr;
+ Pos pos;
+ XMLAttrs xmlAttrs;
+
+ xmlAttrs["name"] = *i;
+ if(matchAttrRHS(attrRHS, attr, pos)) {
+ ATerm path;
+ int line, column;
+ if (location && matchPos(pos, path, line, column)) {
+ xmlAttrs["path"] = aterm2String(path);
+ xmlAttrs["line"] = (format("%1%") % line).str();
+ xmlAttrs["column"] = (format("%1%") % column).str();
+ }
+ } else
+ abort(); // Should not happen.
+
+ XMLOpenElement _(doc, "attr", xmlAttrs);
+ printTermAsXML(attr, doc, context, drvsSeen, location);
}
}
@@ -66,7 +83,7 @@ static void printPatternAsXML(Pattern pat, XMLWriter & doc)
static void printTermAsXML(Expr e, XMLWriter & doc, PathSet & context,
- ExprSet & drvsSeen)
+ ExprSet & drvsSeen, bool location)
{
XMLAttrs attrs;
string s;
@@ -97,45 +114,58 @@ static void printTermAsXML(Expr e, XMLWriter & doc, PathSet & context,
else if (matchAttrs(e, as)) {
ATermMap attrs;
- queryAllAttrs(e, attrs);
+ queryAllAttrs(e, attrs, true);
- Expr a = attrs.get(toATerm("type"));
+ Expr aRHS = attrs.get(toATerm("type"));
+ Expr a = NULL;
+ if (aRHS)
+ matchAttrRHS(aRHS, a, pos);
if (a && matchStr(a, s, context) && s == "derivation") {
XMLAttrs xmlAttrs;
Path outPath, drvPath;
-
- a = attrs.get(toATerm("drvPath"));
+
+ aRHS = attrs.get(toATerm("drvPath"));
+ matchAttrRHS(aRHS, a, pos);
if (matchStr(a, drvPath, context))
xmlAttrs["drvPath"] = drvPath;
-
- a = attrs.get(toATerm("outPath"));
+
+ aRHS = attrs.get(toATerm("outPath"));
+ matchAttrRHS(aRHS, a, pos);
if (matchStr(a, outPath, context))
xmlAttrs["outPath"] = outPath;
-
+
XMLOpenElement _(doc, "derivation", xmlAttrs);
if (drvsSeen.find(e) == drvsSeen.end()) {
drvsSeen.insert(e);
- showAttrs(attrs, doc, context, drvsSeen);
+ showAttrs(attrs, doc, context, drvsSeen, location);
} else
doc.writeEmptyElement("repeated");
}
else {
XMLOpenElement _(doc, "attrs");
- showAttrs(attrs, doc, context, drvsSeen);
+ showAttrs(attrs, doc, context, drvsSeen, location);
}
}
else if (matchList(e, es)) {
XMLOpenElement _(doc, "list");
for (ATermIterator i(es); i; ++i)
- printTermAsXML(*i, doc, context, drvsSeen);
+ printTermAsXML(*i, doc, context, drvsSeen, location);
}
else if (matchFunction(e, pat, body, pos)) {
- XMLOpenElement _(doc, "function");
+ ATerm path;
+ int line, column;
+ XMLAttrs xmlAttrs;
+ if (location && matchPos(pos, path, line, column)) {
+ xmlAttrs["path"] = aterm2String(path);
+ xmlAttrs["line"] = (format("%1%") % line).str();
+ xmlAttrs["column"] = (format("%1%") % column).str();
+ }
+ XMLOpenElement _(doc, "function", xmlAttrs);
printPatternAsXML(pat, doc);
}
@@ -144,12 +174,12 @@ static void printTermAsXML(Expr e, XMLWriter & doc, PathSet & context,
}
-void printTermAsXML(Expr e, std::ostream & out, PathSet & context)
+void printTermAsXML(Expr e, std::ostream & out, PathSet & context, bool location)
{
XMLWriter doc(true, out);
XMLOpenElement root(doc, "expr");
ExprSet drvsSeen;
- printTermAsXML(e, doc, context, drvsSeen);
+ printTermAsXML(e, doc, context, drvsSeen, location);
}
diff --git a/src/libexpr/expr-to-xml.hh b/src/libexpr/expr-to-xml.hh
index 576a46fc3..cf64f26e3 100644
--- a/src/libexpr/expr-to-xml.hh
+++ b/src/libexpr/expr-to-xml.hh
@@ -8,7 +8,7 @@
namespace nix {
-void printTermAsXML(Expr e, std::ostream & out, PathSet & context);
+void printTermAsXML(Expr e, std::ostream & out, PathSet & context, bool location = false);
}
diff --git a/src/libutil/util.cc b/src/libutil/util.cc
index 3f76be670..1c1c9a9e5 100644
--- a/src/libutil/util.cc
+++ b/src/libutil/util.cc
@@ -809,7 +809,8 @@ void killUser(uid_t uid)
case 0:
try { /* child */
- if (setuid(uid) == -1) abort();
+ if (setuid(uid) == -1)
+ throw SysError("setting uid");
while (true) {
if (kill(-1, SIGKILL) == 0) break;
@@ -819,7 +820,7 @@ void killUser(uid_t uid)
}
} catch (std::exception & e) {
- std::cerr << format("killing processes beloging to uid `%1%': %1%")
+ std::cerr << format("killing processes belonging to uid `%1%': %2%")
% uid % e.what() << std::endl;
quickExit(1);
}
@@ -827,8 +828,9 @@ void killUser(uid_t uid)
}
/* parent */
- if (pid.wait(true) != 0)
- throw Error(format("cannot kill processes for uid `%1%'") % uid);
+ int status = pid.wait(true);
+ if (status != 0)
+ throw Error(format("cannot kill processes for uid `%1%': %2%") % uid % statusToString(status));
/* !!! We should really do some check to make sure that there are
no processes left running under `uid', but there is no portable
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 << "&quot;";
else if (c == '<') output << "&lt;";
+ else if (c == '>') output << "&gt;";
else if (c == '&') output << "&amp;";
/* 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 d8b39eca2..03fb35ada 100644
--- a/src/nix-instantiate/nix-instantiate.cc
+++ b/src/nix-instantiate/nix-instantiate.cc
@@ -39,13 +39,13 @@ static bool indirectRoot = false;
static void printResult(EvalState & state, Expr e,
- bool evalOnly, bool xmlOutput, const ATermMap & autoArgs)
+ bool evalOnly, bool xmlOutput, bool location, const ATermMap & autoArgs)
{
PathSet context;
if (evalOnly)
if (xmlOutput)
- printTermAsXML(e, std::cout, context);
+ printTermAsXML(e, std::cout, context, location);
else
std::cout << format("%1%\n") % canonicaliseExpr(e);
@@ -68,7 +68,7 @@ static void printResult(EvalState & state, Expr e,
void processExpr(EvalState & state, const Strings & attrPaths,
bool parseOnly, bool strict, const ATermMap & autoArgs,
- bool evalOnly, bool xmlOutput, Expr e)
+ bool evalOnly, bool xmlOutput, bool location, Expr e)
{
for (Strings::const_iterator i = attrPaths.begin(); i != attrPaths.end(); ++i) {
Expr e2 = findAlongAttrPath(state, *i, autoArgs, e);
@@ -77,7 +77,7 @@ void processExpr(EvalState & state, const Strings & attrPaths,
e2 = strictEvalExpr(state, e2);
else
e2 = evalExpr(state, e2);
- printResult(state, e2, evalOnly, xmlOutput, autoArgs);
+ printResult(state, e2, evalOnly, xmlOutput, location, autoArgs);
}
}
@@ -90,6 +90,7 @@ void run(Strings args)
bool evalOnly = false;
bool parseOnly = false;
bool xmlOutput = false;
+ bool xmlOutputSourceLocation = true;
bool strict = false;
Strings attrPaths;
ATermMap autoArgs(128);
@@ -125,6 +126,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] == '-')
@@ -140,7 +143,7 @@ void run(Strings args)
if (readStdin) {
Expr e = parseStdin(state);
processExpr(state, attrPaths, parseOnly, strict, autoArgs,
- evalOnly, xmlOutput, e);
+ evalOnly, xmlOutput, xmlOutputSourceLocation, e);
}
for (Strings::iterator i = files.begin();
@@ -149,7 +152,7 @@ void run(Strings args)
Path path = absPath(*i);
Expr e = parseExprFromFile(state, path);
processExpr(state, attrPaths, parseOnly, strict, autoArgs,
- evalOnly, xmlOutput, e);
+ evalOnly, xmlOutput, xmlOutputSourceLocation, e);
}
printEvalStats(state);
diff --git a/tests/lang.sh b/tests/lang.sh
index 18eb0278c..54f010763 100644
--- a/tests/lang.sh
+++ b/tests/lang.sh
@@ -54,7 +54,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..379f3c076
--- /dev/null
+++ b/tests/lang/eval-okay-toxml.exp
@@ -0,0 +1 @@
+Str("<?xml version='1.0' encoding='utf-8'?>\n<expr>\n <attrs>\n <attr name=\"a\">\n <string value=\"s\" />\n </attr>\n </attrs>\n</expr>\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-with.exp b/tests/lang/eval-okay-with.exp
index 31e24293b..2c9bd8ba0 100644
--- a/tests/lang/eval-okay-with.exp
+++ b/tests/lang/eval-okay-with.exp
@@ -1 +1 @@
-Str("xyzzybar",[])
+Str("xyzzybarxyzzybar",[])
diff --git a/tests/lang/eval-okay-with.nix b/tests/lang/eval-okay-with.nix
index ea4ea612d..033e8d3ab 100644
--- a/tests/lang/eval-okay-with.nix
+++ b/tests/lang/eval-okay-with.nix
@@ -7,7 +7,13 @@ let {
b = "bar";
};
+ bs = {
+ a = "bar";
+ };
+
x = with as; a + b;
- body = x;
+ y = with as; with bs; a + b;
+
+ body = x + y;
}
diff --git a/version b/version
index 20adfac7f..a59ac4608 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-0.15 \ No newline at end of file
+0.16 \ No newline at end of file
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-23 14:47:50 +0000