* Prebuilt package sharing. We allow transparent binary deployment by

  sharing package directories (i.e., the result of building a Nix
  descriptor).

  `nix-pull-prebuilts' obtains a list of all known prebuilts by
  consulting the paths and URLs specified in
  $prefix/etc/nix/prebuilts.conf.  The mappings ($pkghash,
  $prebuilthash) and ($prebuilthash, $location) are registered with
  Nix so that it can use the prebuilt with hash $prebuilthash when
  installing a package with hash $pkghash by downloading and unpacking
  $location.

  `nix-push-prebuilts' creates prebuilts for all packages for which no
  prebuilt is known to exist.  It can then optionally upload these
  to the network through rsync.

  `nix-[pull|push]-prebuilts' just provide a policy.  Nix provides the
  mechanism through the `nix [export|regprebuilt|regurl]' commands.

1 files changed, 21 insertions, 48 deletions

diff --git a/src/fix.cc b/src/fix.cc
index 052c1d4c91..286b552c38 100644
--- a/src/fix.cc
+++ b/src/fix.cc
@@ -13,7 +13,6 @@ extern "C" {
 
 
 static string nixDescriptorDir;
-static string nixSourcesDir;
 
 
 static bool verbose = false;
@@ -33,46 +32,6 @@ void registerFile(string filename)
         throw Error("cannot register " + filename + " with Nix");
 }
 
-
-/* Return the directory part of the given path, i.e., everything
-   before the final `/'. */
-string dirOf(string s)
-{
-    unsigned int pos = s.rfind('/');
-    if (pos == string::npos) throw Error("invalid file name");
-    return string(s, 0, pos);
-}
-
-
-/* Return the base name of the given path, i.e., everything following
-   the final `/'. */
-string baseNameOf(string s)
-{
-    unsigned int pos = s.rfind('/');
-    if (pos == string::npos) throw Error("invalid file name");
-    return string(s, pos + 1);
-}
-
-
-/* Download object referenced by the given URL into the sources
-   directory.  Return the file name it was downloaded to. */
-string fetchURL(string url)
-{
-    string filename = baseNameOf(url);
-    string fullname = nixSourcesDir + "/" + filename;
-    struct stat st;
-    if (stat(fullname.c_str(), &st)) {
-        /* !!! quoting */
-        string shellCmd =
-            "cd " + nixSourcesDir + " && wget --quiet -N \"" + url + "\"";
-        int res = system(shellCmd.c_str());
-        if (WEXITSTATUS(res) != 0)
-            throw Error("cannot fetch " + url);
-    }
-    return fullname;
-}
-
-
 Error badTerm(const string & msg, ATerm e)
 {
     char * s = ATwriteToString(e);
@@ -120,7 +79,7 @@ bool evaluateBool(ATerm e, EvalContext ctx)
 ATerm evaluate(ATerm e, EvalContext ctx)
 {
     char * s;
-    ATerm e2;
+    ATerm e2, e3;
     ATerm eCond, eTrue, eFalse;
 
     /* Check for normal forms first. */
@@ -166,6 +125,7 @@ ATerm evaluate(ATerm e, EvalContext ctx)
             instantiateDescriptor(filename, ctx).c_str());
     }
 
+#if 0
     /* `Source' copies the specified file to nixSourcesDir, registers
        it with Nix, and returns the hash of the file. */
     else if (ATmatch(e, "Source(<term>)", &e2)) {
@@ -185,15 +145,29 @@ ATerm evaluate(ATerm e, EvalContext ctx)
         registerFile(target);
         return ATmake("File(<str>)", hashFile(target).c_str());
     }
+#endif
+
+    /* `Local' registers a file with Nix, and returns the file's
+       hash. */
+    else if (ATmatch(e, "Local(<term>)", &e2)) {
+        string filename = absPath(evaluateStr(e2, ctx), ctx.dir); /* !!! */
+        string hash = hashFile(filename);
+        return ATmake("File(<str>)", hash.c_str());
+    }
 
-    /* `Url' fetches a file from the network, caching it in
-       nixSourcesDir and returning the file name. */
-    else if (ATmatch(e, "Url(<term>)", &e2)) {
-        string url = evaluateStr(e2, ctx);
+    /* `Url' registers a mapping from a hash to an url with Nix, and
+       returns the hash. */
+    else if (ATmatch(e, "Url(<term>, <term>)", &e2, &e3)) {
+        string hash = evaluateStr(e2, ctx);
+        checkHash(hash);
+        string url = evaluateStr(e3, ctx);
+#if 0
         if (verbose)
             cerr << "fetching " << url << endl;
         string filename = fetchURL(url);
-        return ATmake("Str(<str>)", filename.c_str());
+#endif
+        /* !!! register */
+        return ATmake("File(<str>)", hash.c_str());
     }
 
     /* `If' provides conditional evaluation. */
@@ -329,7 +303,6 @@ void run(Strings::iterator argCur, Strings::iterator argEnd)
     if (homeDir) nixHomeDir = homeDir;
 
     nixDescriptorDir = nixHomeDir + "/var/nix/descriptors";
-    nixSourcesDir = nixHomeDir + "/var/nix/sources";
 
     for ( ; argCur != argEnd; argCur++) {
         string arg(*argCur);