about summary refs log tree commit diff
path: root/corepkgs
diff options
context:
space:
mode:
authorEelco Dolstra <e.dolstra@tudelft.nl>2003-07-10T15·11+0000
committerEelco Dolstra <e.dolstra@tudelft.nl>2003-07-10T15·11+0000
commit1d1c3691d2fdf5aad0baceadd8596f23c1e0e1fa (patch)
treec89123e33796e3408b613e1a824bcc66ad30395e /corepkgs
parentd072485d2895d01dbbab1d899418726e3349343f (diff)
* The policy-free derivate sharing now *almost* works. :-) For any
  hash for which no local expansion is available, Nix can execute a
  `substitute' which should produce a path with such a hash.

  This is policy-free since Nix does not in any way specify how the
  substitute should work, i.e., it's an arbitrary (unnormalised)
  fstate expression.  For example, `nix-pull' registers substitutes
  that fetch Nix archives from the network (through `wget') and unpack
  them, but any other method is possible as well.  This is an
  improvement over the old Nix sharing scheme, which had a policy
  (fetching through `wget') built in.

  The sharing scheme doesn't work completely yet because successors
  from fstate rewriting have to be registered on the receiving side.
  Probably the whole successor stuff can be folded up into the
  substitute mechanism; this would be a nice simplification.

Diffstat (limited to 'corepkgs')
-rw-r--r--corepkgs/Makefile.am2
-rw-r--r--corepkgs/nar/unnar.fix8
-rw-r--r--corepkgs/nar/unnar.sh3
3 files changed, 13 insertions, 0 deletions
diff --git a/corepkgs/Makefile.am b/corepkgs/Makefile.am
index 9ce9c8c790eb..9298865bff2f 100644
--- a/corepkgs/Makefile.am
+++ b/corepkgs/Makefile.am
@@ -6,3 +6,5 @@ install-data-local:
 	$(INSTALL) -d $(datadir)/fix/nar
 	$(INSTALL_DATA) nar/nar.fix $(datadir)/fix/nar
 	$(INSTALL_DATA) nar/nar.sh $(datadir)/fix/nar
+	$(INSTALL_DATA) nar/unnar.fix $(datadir)/fix/nar
+	$(INSTALL_DATA) nar/unnar.sh $(datadir)/fix/nar
diff --git a/corepkgs/nar/unnar.fix b/corepkgs/nar/unnar.fix
new file mode 100644
index 000000000000..db97750aaa18
--- /dev/null
+++ b/corepkgs/nar/unnar.fix
@@ -0,0 +1,8 @@
+Function(["nar", "name"],
+  Package(
+    [ ("name", Var("name"))
+    , ("build", Relative("nar/unnar.sh"))
+    , ("nar", Var("nar"))
+    ]
+  )
+)
\ No newline at end of file
diff --git a/corepkgs/nar/unnar.sh b/corepkgs/nar/unnar.sh
new file mode 100644
index 000000000000..e6a3f3c1fe19
--- /dev/null
+++ b/corepkgs/nar/unnar.sh
@@ -0,0 +1,3 @@
+#! /bin/sh
+
+/tmp/nix/bin/nix --restore "$out" < $nar || exit 1