max/nix-super
1
0
Fork 0
mirror of https://github.com/privatevoid-net/nix-super.git synced 2024-11-23 06:26:15 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

* Backwards compatibility with old user environment manifests.

Browse source
This commit is contained in:
Eelco Dolstra 2006-10-17 14:01:45 +00:00
parent 4bd5cdb90b
commit 24737f279e
2 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/libexpr/nixexpr-ast.def
View file

@ -44,6 +44,7 @@ Int | int | Expr |
#
# For canonicity, the store paths should be in sorted order.
Str | string ATermList | Expr |
Str | string | Expr | ObsoleteStr
# A path is a reference to a file system object that is to be copied
# to the Nix store when used as a derivation attribute. When it is
@ -67,7 +68,7 @@ Bool | ATerm | Expr |
Null | | Expr |
Bind | string Expr Pos | ATerm |
Bind | string Expr | ATerm | Bind2
Bind | string Expr | ATerm | ObsoleteBind
Inherit | Expr ATermList Pos | ATerm |
Scope | | Expr |

9
src/nix-env/main.cc
View file

@ -107,10 +107,11 @@ struct AddPos : TermFun
{
ATerm operator () (ATerm e)
{
ATerm x, y, z;
if (matchBind(e, x, y, z)) return e;
if (matchBind2(e, x, y))
ATerm x, y;
if (matchObsoleteBind(e, x, y))
return makeBind(x, y, makeNoPos());
if (matchObsoleteStr(e, x))
return makeStr(x, ATempty);
return e;
}
};
@ -921,6 +922,8 @@ static void opQuery(Globals & globals,
else
table.push_back(columns);
cout.flush();
} catch (AssertionError & e) {
/* !!! hm, maybe we should give some sort of warning here? */
}