* Don't barf on lines in nix-pull manifests that we don't recognise.

Necessary for compatibility with 0.7 patch deployment.
* Bumped version number to 0.6.1.

configure.ac

@@ -1,4 +1,4 @@
-AC_INIT(nix, "0.6")
+AC_INIT(nix, "0.6.1")
 AC_CONFIG_SRCDIR(README)
 AC_CONFIG_AUX_DIR(config)
 AM_INIT_AUTOMAKE

scripts/readmanifest.pm.in

@@ -17,6 +17,7 @@ sub processURL {
     open MANIFEST, "<$manifest";
 
     my $inside = 0;
+    my $type;
 
     my $storePath;
     my $narurl;
@@ -29,23 +30,27 @@ sub processURL {
         next if (/^$/);
 
         if (!$inside) {
-            if (/^\{$/) { 
+            if (/^\s*(\w*)\s*\{$/) {
                 $inside = 1;
+                $type = $1;
+                $type = "narfile" if $type eq "";
                 undef $storePath;
                 undef $narurl;
                 undef $hash;
                 @preds = ();
 	    }
-            else { die "bad line: $_"; }
         } else {
             if (/^\}$/) {
                 $inside = 0;
 
-		$$storePaths2urls{$storePath} = $narurl;
-		$$urls2hashes{$narurl} = $hash;
+                if ($type eq "narfile") {
 
-                foreach my $p (@preds) {
-		    $$successors{$p} = $storePath;
+                    $$storePaths2urls{$storePath} = $narurl;
+                    $$urls2hashes{$narurl} = $hash;
+
+                    foreach my $p (@preds) {
+                        $$successors{$p} = $storePath;
+                    }
                 }
 
             }
@@ -61,7 +66,7 @@ sub processURL {
             elsif (/^\s*SuccOf:\s*(\/\S+)\s*$/) {
                 push @preds, $1;
             }
-            else { die "bad line: $_"; }
+
         }
     }
 

src/libexpr/Makefile.am

@@ -26,6 +26,8 @@ lexer-tab.c lexer-tab.h: lexer.l
 
 # ATerm helper function generation.
 
+nixexpr.cc eval.cc parser.cc primops.cc: nixexpr-ast.hh
+
 nixexpr-ast.cc nixexpr-ast.hh: ../aterm-helper.pl nixexpr-ast.def
 	$(perl) ../aterm-helper.pl nixexpr-ast.hh nixexpr-ast.cc < nixexpr-ast.def