diff options
| author | Eelco Dolstra <e.dolstra@tudelft.nl> | 2010-04-01T16·59+0000 |
|---|---|---|
| committer | Eelco Dolstra <e.dolstra@tudelft.nl> | 2010-04-01T16·59+0000 |
| commit | a5ece7d016e72a61ca69a401e833314f538518f9 (patch) | |
| tree | db4e8dc521a7f794009c39b1338bc931dfee487a | |
| parent | c172274e170a87a30420842ee07ed1f7226d7f2e (diff) | |
* Removed the `~' operator.
| -rw-r--r-- | src/libexpr/nixexpr-ast.def | 1 | ||||
| -rw-r--r-- | src/libexpr/parser.y | 1 | ||||
| -rw-r--r-- | tests/dependencies.nix | 2 |
3 files changed, 1 insertions, 3 deletions
diff --git a/src/libexpr/nixexpr-ast.def b/src/libexpr/nixexpr-ast.def index b344665430c9..36c25dcfe7a0 100644 --- a/src/libexpr/nixexpr-ast.def +++ b/src/libexpr/nixexpr-ast.def @@ -14,7 +14,6 @@ OpAnd | Expr Expr | Expr | OpOr | Expr Expr | Expr | OpImpl | Expr Expr | Expr | OpUpdate | Expr Expr | Expr | -SubPath | Expr Expr | Expr | OpHasAttr | Expr string | Expr | OpPlus | Expr Expr | Expr | OpConcat | Expr Expr | Expr | diff --git a/src/libexpr/parser.y b/src/libexpr/parser.y index 3a56c2627c48..3463a5c5d7f8 100644 --- a/src/libexpr/parser.y +++ b/src/libexpr/parser.y @@ -373,7 +373,6 @@ expr_op | expr_op OR expr_op { $$ = makeOpOr($1, $3); } | expr_op IMPL expr_op { $$ = makeOpImpl($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 '+' expr_op { $$ = makeConcatStrings(ATmakeList2($1, $3)); } | expr_op CONCAT expr_op { $$ = makeOpConcat($1, $3); } diff --git a/tests/dependencies.nix b/tests/dependencies.nix index a397e1ce4159..00717ae98d90 100644 --- a/tests/dependencies.nix +++ b/tests/dependencies.nix @@ -9,7 +9,7 @@ let { input2 = mkDerivation { name = "dependencies-input-2"; - builder = ./. ~ "dependencies.builder2.sh"; + builder = ./dependencies.builder2.sh; }; body = mkDerivation { |