From a5ece7d016e72a61ca69a401e833314f538518f9 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <e.dolstra@tudelft.nl>
Date: Thu, 1 Apr 2010 16:59:07 +0000
Subject: [PATCH] * Removed the `~' operator.

---
 src/libexpr/nixexpr-ast.def | 1 -
 src/libexpr/parser.y        | 1 -
 tests/dependencies.nix      | 2 +-
 3 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/libexpr/nixexpr-ast.def b/src/libexpr/nixexpr-ast.def
index b34466543..36c25dcfe 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 3a56c2627..3463a5c5d 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 a397e1ce4..00717ae98 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 {