* Lots of manual stuff. Reference pages for most Nix commands.

* nix-pull now requires the full url to the manifest, i.e.,
  `/MANIFEST/' is no longer automatically appended.
* nix-prefetch-url works again.  

3 files changed, 3 insertions, 3 deletions

diff --git a/scripts/nix-prefetch-url.in b/scripts/nix-prefetch-url.in
index 050955682122..71ba3caab947 100644
--- a/scripts/nix-prefetch-url.in
+++ b/scripts/nix-prefetch-url.in
@@ -25,7 +25,7 @@ rename $out, $out2;
 # Create a Nix expression.
 my $nixexpr =
     "(import @datadir@/nix/corepkgs/fetchurl) " .
-    "{url = $url; md5 = \"$hash\"; system = \"@system@\"}";
+    "{url = $url; md5 = \"$hash\"; system = \"@system@\";}";
 
 print "expr: $nixexpr\n";
 
diff --git a/scripts/nix-push.in b/scripts/nix-push.in
index 1e1d905edcbe..b5899e45839a 100644
--- a/scripts/nix-push.in
+++ b/scripts/nix-push.in
@@ -169,5 +169,5 @@ foreach my $nararchive (@nararchives) {
 # Upload the manifest.
 print STDERR "uploading manifest...\n";
 system("$curl  --show-error --upload-file " .
-       "'$manifest' '$manifest_put_url/' > /dev/null") == 0 or
+       "'$manifest' '$manifest_put_url' > /dev/null") == 0 or
     die "curl failed on $manifest: $?";
diff --git a/scripts/readmanifest.pm.in b/scripts/readmanifest.pm.in
index 2c6223807d0c..08227a5d7ea5 100644
--- a/scripts/readmanifest.pm.in
+++ b/scripts/readmanifest.pm.in
@@ -11,7 +11,7 @@ sub processURL {
     print "obtaining list of Nix archives at $url...\n";
 
     system("curl --fail --silent --show-error " .
-           "'$url/MANIFEST' > '$manifest' 2> /dev/null") == 0
+           "'$url' > '$manifest' 2> /dev/null") == 0
            or die "curl failed: $?";
         
     open MANIFEST, "<$manifest";