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

* Removed the `~' operator.

Browse source
This commit is contained in:
Eelco Dolstra 2010-04-01 16:59:07 +00:00
parent c172274e17
commit a5ece7d016
3 changed files with 1 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -14,7 +14,6 @@ OpAnd | Expr Expr | Expr |
OpOr | Expr Expr | Expr | OpOr | Expr Expr | Expr |
OpImpl | Expr Expr | Expr | OpImpl | Expr Expr | Expr |
OpUpdate | Expr Expr | Expr | OpUpdate | Expr Expr | Expr |
SubPath | Expr Expr | Expr |
OpHasAttr | Expr string | Expr | OpHasAttr | Expr string | Expr |
OpPlus | Expr Expr | Expr | OpPlus | Expr Expr | Expr |
OpConcat | Expr Expr | Expr | OpConcat | Expr Expr | Expr |

1
src/libexpr/parser.y
View file

@ -373,7 +373,6 @@ expr_op
| expr_op OR expr_op { $$ = makeOpOr($1, $3); } | expr_op OR expr_op { $$ = makeOpOr($1, $3); }
| expr_op IMPL expr_op { $$ = makeOpImpl($1, $3); } | expr_op IMPL expr_op { $$ = makeOpImpl($1, $3); }
| expr_op UPDATE expr_op { $$ = makeOpUpdate($1, $3); } | expr_op UPDATE expr_op { $$ = makeOpUpdate($1, $3); }
| expr_op '~' expr_op { $$ = makeSubPath($1, $3); }
| expr_op '?' ID { $$ = makeOpHasAttr($1, $3); } | expr_op '?' ID { $$ = makeOpHasAttr($1, $3); }
| expr_op '+' expr_op { $$ = makeConcatStrings(ATmakeList2($1, $3)); } | expr_op '+' expr_op { $$ = makeConcatStrings(ATmakeList2($1, $3)); }
| expr_op CONCAT expr_op { $$ = makeOpConcat($1, $3); } | expr_op CONCAT expr_op { $$ = makeOpConcat($1, $3); }

2
tests/dependencies.nix
View file

@ -9,7 +9,7 @@ let {
input2 = mkDerivation { input2 = mkDerivation {
name = "dependencies-input-2"; name = "dependencies-input-2";
builder = ./. ~ "dependencies.builder2.sh"; builder = ./dependencies.builder2.sh;
}; };
body = mkDerivation { body = mkDerivation {