Fix typo.

Add a way to cache result for future evaluations.
Add a session independent cache.
2009-07-08 09:44:22 +00:00 · 2009-07-08 09:27:35 +00:00 · 2009-07-08 09:26:15 +00:00 · 2009-07-08 09:18:26 +00:00
54 changed files with 572 additions and 622 deletions
--- a/Makefile.am
+++ b/Makefile.am
@@ -33,7 +33,7 @@ init-state:
 	$(INSTALL) $(INIT_FLAGS) $(GROUP_WRITABLE) -d $(DESTDIR)$(localstatedir)/nix/gcroots/channels
 	ln -sfn $(localstatedir)/nix/profiles $(DESTDIR)$(localstatedir)/nix/gcroots/profiles
 	$(INSTALL) $(INIT_FLAGS) -d $(DESTDIR)$(localstatedir)/nix/userpool
-	-$(INSTALL) $(INIT_FLAGS) -m 1777 -d $(DESTDIR)$(storedir)
+	$(INSTALL) $(INIT_FLAGS) -m 1777 -d $(DESTDIR)$(storedir)
 	$(INSTALL) $(INIT_FLAGS) $(GROUP_WRITABLE) -d $(DESTDIR)$(localstatedir)/nix/manifests
 	ln -sfn $(localstatedir)/nix/manifests $(DESTDIR)$(localstatedir)/nix/gcroots/manifests

--- a/configure.ac
+++ b/configure.ac
@@ -55,7 +55,7 @@ test "$localstatedir" = '${prefix}/var' && localstatedir=/nix/var
 # except that it requires the ATerm "lib" directory to be in $PATH, as
 # Windows doesn't have anything like an RPATH embedded in executable.
 # Since this is kind of annoying, we use static libraries for now.
-
+    
 AC_ARG_ENABLE(static-nix, AC_HELP_STRING([--enable-static-nix],
  [produce statically linked binaries]),
  static_nix=$enableval, static_nix=no)
@@ -63,25 +63,19 @@ AC_ARG_ENABLE(static-nix, AC_HELP_STRING([--enable-static-nix],
 if test "$sys_name" = cygwin; then
   static_nix=yes
 fi
-
+  
 if test "$static_nix" = yes; then
    AC_DISABLE_SHARED
    AC_ENABLE_STATIC
 fi

-
+  
 # Windows-specific stuff.
 if test "$sys_name" = "cygwin"; then
    # We cannot delete open files.
    AC_DEFINE(CANNOT_DELETE_OPEN_FILES, 1, [Whether it is impossible to delete open files.])
 fi

-# Solaris-specific stuff.
-if test "$sys_name" = "sunos"; then
-    # Solaris requires -lsocket -lnsl for network functions
-    ADDITIONAL_NETWORK_LIBS="-lsocket -lnsl"
-    AC_SUBST(ADDITIONAL_NETWORK_LIBS)
-fi

 AC_PROG_CC
 AC_PROG_CXX
@@ -94,7 +88,8 @@ AC_PROG_LIBTOOL


 # Use 64-bit file system calls so that we can support files > 2 GiB.
-AC_SYS_LARGEFILE
+CFLAGS="-D_FILE_OFFSET_BITS=64 $CFLAGS"
+CXXFLAGS="-D_FILE_OFFSET_BITS=64 $CXXFLAGS"


 # Check for pubsetbuf.
@@ -145,6 +140,7 @@ NEED_PROG(bash, bash)
 NEED_PROG(patch, patch)
 AC_PATH_PROG(xmllint, xmllint, false)
 AC_PATH_PROG(xsltproc, xsltproc, false)
+AC_PATH_PROG(jing, jing, false) # needed because xmllint --relaxng seems broken
 AC_PATH_PROG(w3m, w3m, false)
 AC_PATH_PROG(flex, flex, false)
 AC_PATH_PROG(bison, bison, false)
@@ -264,7 +260,7 @@ else
  bzip2_include="-I$bzip2/include"
  bzip2_bin="$bzip2/bin"
  bzip2_bin_test="$bzip2/bin"
-fi
+fi   
 AC_SUBST(bzip2_lib)
 AC_SUBST(bzip2_include)
 AC_SUBST(bzip2_bin)
--- a/doc/manual/Makefile.am
+++ b/doc/manual/Makefile.am
@@ -6,12 +6,7 @@ XSLTPROC = $(xsltproc) $(xmlflags) \
 --param xref.with.number.and.title 1 \
 --param toc.section.depth 3 \
 --param admon.style \'\' \
- --param callout.graphics.extension \'.gif\' \
- --param contrib.inline.enabled 0
-
-dblatex_opts = \
- -P doc.collab.show=0 \
- -P latex.output.revhistory=0
+ --param callout.graphics.extension \'.gif\'

 # Note: we use GIF for now, since the PNGs shipped with Docbook aren't
 # transparent.
@@ -34,9 +29,13 @@ MANUAL_SRCS = manual.xml introduction.xml installation.xml \
 conf-file.xml release-notes.xml \
 style.css images

-# Note: RelaxNG validation requires xmllint >= 2.7.4.
 manual.is-valid: $(MANUAL_SRCS) version.txt
-	$(XMLLINT) --noout --nonet --xinclude --noxincludenode --relaxng $(docbookrng)/docbook.rng $<
+#	$(XMLLINT) --xinclude $< | $(XMLLINT) --noout --nonet --relaxng $(docbookrng)/docbook.rng -
+	if test "$(jing)" != "false"; then \
+		$(XMLLINT) --xinclude $< | $(jing) $(docbookrng)/docbook.rng /dev/fd/0; \
+	else \
+		echo "Not validating."; \
+	fi
 	touch $@

 version.txt:
@@ -51,7 +50,7 @@ manual.html: $(MANUAL_SRCS) manual.is-valid images

 manual.pdf: $(MANUAL_SRCS) manual.is-valid images
 	if test "$(dblatex)" != ""; then \
-		$(dblatex) $(dblatex_opts) manual.xml; \
+		$(dblatex) manual.xml; \
 	else \
 		echo "Please install dblatex and rerun configure."; \
 		exit 1; \
--- a/doc/manual/builtins.xml
+++ b/doc/manual/builtins.xml
@@ -324,16 +324,6 @@ x: x + 456</programlisting>
  </varlistentry>

  
-  <varlistentry><term><function>builtins.intersectAttrs</function>
-  <replaceable>e1</replaceable> <replaceable>e2</replaceable></term>
-
-    <listitem><para>Return an attribute set consisting of the
-    attributes in the set <replaceable>e2</replaceable> that also
-    exist in the set <replaceable>e1</replaceable>.</para></listitem>
-
-  </varlistentry>
-        
-    
  <varlistentry><term><function>builtins.isAttrs</function>
  <replaceable>e</replaceable></term>

--- a/doc/manual/installation.xml
+++ b/doc/manual/installation.xml
@@ -140,25 +140,16 @@ $ ./bootstrap</screen>
 <para>The installation path can be specified by passing the
 <option>--prefix=<replaceable>prefix</replaceable></option> to
 <command>configure</command>.  The default installation directory is
-<filename>/usr/local</filename>.  You can change this to any location
-you like.  You must have write permission to the
+<filename>/nix</filename>.  You can change this to any location you
+like.  You must have write permission to the
 <replaceable>prefix</replaceable> path.</para>

-<para>Nix keeps its <emphasis>store</emphasis> (the place where
-packages are stored) in <filename>/nix/store</filename> by default.
-This can be changed using
-<option>--with-store-dir=<replaceable>path</replaceable></option>.</para>
+<warning><para>It is best <emphasis>not</emphasis> to change the
+installation prefix from its default, since doing so makes it
+impossible to use pre-built binaries from the standard Nixpkgs
+channels.</para></warning>

-<warning><para>It is best <emphasis>not</emphasis> to change the Nix
-store from its default, since doing so makes it impossible to use
-pre-built binaries from the standard Nixpkgs channels — that is, all
-packages will need to be built from source.</para></warning>
-
-<para>Nix keeps state (such as its database and log files) in
-<filename>/nix/var</filename> by default.  This can be changed using
-<option>--localstatedir=<replaceable>path</replaceable></option>.</para>
-
-<para>If you want to rebuild the documentation, pass the full path to
+<para>If you want to rebuilt the documentation, pass the full path to
 the DocBook RELAX NG schemas and to the DocBook XSL stylesheets using
 the
 <option>--with-docbook-rng=<replaceable>path</replaceable></option>
@@ -169,26 +160,27 @@ options.</para>
 </section>


-<section><title>Installing a binary distribution</title>
+<section><title>Installing from RPMs</title>

-<para>RPM and Deb packages of Nix for a number of different versions
-of Fedora, openSUSE, Debian and Ubuntu can be downloaded from <link
-xlink:href="http://nixos.org/" />.  Once downloaded, the RPMs can be
-installed or upgraded using <command>rpm -U</command>.  For example,
+<para>RPM packages of Nix can be downloaded from <link
+xlink:href="http://nixos.org/" />.  These RPMs should work for most
+fairly recent releases of SuSE and Red Hat Linux.  They have been
+known to work work on SuSE Linux 8.1 and 9.0, and Red Hat 9.0.  In
+fact, it should work on any RPM-based Linux distribution based on
+<literal>glibc</literal> 2.3 or later.</para>
+
+<para>Once downloaded, the RPMs can be installed or upgraded using
+<command>rpm -U</command>.  For example,

 <screen>
-$ rpm -U nix-0.13pre18104-1.i386.rpm</screen>
-
-Likewise, for a Deb package:
-
-<screen>
-$ dpkg -i nix_0.13pre18104-1_amd64.deb</screen>
+$ rpm -U nix-0.5pre664-1.i386.rpm</screen>

 </para>

-<para>Nix can be uninstalled using <command>rpm -e nix</command> or
-<command>dpkg -r nix</command>.  After this you should manually remove
-the Nix store and other auxiliary data, if desired:
+<para>The RPMs install into the directory <filename>/nix</filename>.
+Nix can be uninstalled using <command>rpm -e nix</command>.  After
+this it will be necessary to manually remove the Nix store and other
+auxiliary data:

 <screen>
 $ rm -rf /nix/store
@@ -199,7 +191,6 @@ $ rm -rf /nix/var</screen>
 </section>


-<!-- TODO: should be updated
 <section><title>Upgrading Nix through Nix</title>

 <para>You can install the latest stable version of Nix through Nix
@@ -212,7 +203,6 @@ installation</link> by clicking on the package links at <link
 xlink:href="http://nixos.org/releases/full-index-nix.html" />.</para>

 </section>
-->


 <section><title>Security</title>
--- a/doc/manual/introduction.xml
+++ b/doc/manual/introduction.xml
@@ -320,7 +320,7 @@ overview of NixOS is given in the HotOS XI paper <citetitle
 xlink:href="http://www.st.ewi.tudelft.nl/~dolstra/pubs/hotos-final.pdf">Purely
 Functional System Configuration Management</citetitle>.  The Nix
 homepage has <link
-xlink:href="http://nixos.org/docs/papers.html">an up-to-date list
+xlink:href="http://nix.cs.uu.nl/docs/papers.html">an up-to-date list
 of Nix-related papers</link>.</para>

 <para>Nix is the subject of Eelco Dolstra’s PhD thesis <citetitle
--- a/doc/manual/manual.xml
+++ b/doc/manual/manual.xml
@@ -17,7 +17,6 @@
        <orgname>Delft University of Technology</orgname>
        <orgdiv>Department of Software Technology</orgdiv>
      </affiliation>
-      <contrib>Author</contrib>
    </author>

    <copyright>
@@ -26,11 +25,10 @@
      <year>2006</year>
      <year>2007</year>
      <year>2008</year>
-      <year>2009</year>
      <holder>Eelco Dolstra</holder>
    </copyright>

-    <date>September 2009</date>
+    <date>November 2008</date>
    
  </info>

@@ -51,25 +49,64 @@
    
    <section>
      <title>Main commands</title>
-      <xi:include href="nix-env.xml" />
-      <xi:include href="nix-instantiate.xml" />
-      <xi:include href="nix-store.xml" />
+      <section xml:id="sec-nix-env">
+        <title>nix-env</title>
+        <xi:include href="nix-env.xml" />
+      </section>
+      <section xml:id="sec-nix-instantiate">
+        <title>nix-instantiate</title>
+        <xi:include href="nix-instantiate.xml" />
+      </section>
+      <section xml:id="sec-nix-store">
+        <title>nix-store</title>
+        <xi:include href="nix-store.xml" />
+      </section>
    </section>
    
    <section>
      <title>Utilities</title>
-      <xi:include href="nix-build.xml" />
-      <xi:include href="nix-channel.xml" />
-      <xi:include href="nix-collect-garbage.xml" />
-      <xi:include href="nix-copy-closure.xml" />
-      <xi:include href="nix-hash.xml" />
-      <xi:include href="nix-install-package.xml" />
-      <xi:include href="nix-prefetch-url.xml" />
-      <xi:include href="nix-pull.xml" />
-      <xi:include href="nix-push.xml" />
-      <xi:include href="nix-worker.xml" />
+      <section xml:id="sec-nix-build">
+        <title>nix-build</title>
+        <xi:include href="nix-build.xml" />
+      </section>
+      <section xml:id="sec-nix-channel">
+        <title>nix-channel</title>
+        <xi:include href="nix-channel.xml" />
+      </section>
+      <section xml:id="sec-nix-collect-garbage">
+        <title>nix-collect-garbage</title>
+        <xi:include href="nix-collect-garbage.xml" />
+      </section>
+      <section xml:id="sec-nix-copy-closure">
+        <title>nix-copy-closure</title>
+        <xi:include href="nix-copy-closure.xml" />
+      </section>
+      <section xml:id="sec-nix-hash">
+        <title>nix-hash</title>
+        <xi:include href="nix-hash.xml" />
+      </section>
+      <section xml:id="sec-nix-install-package">
+        <title>nix-install-package</title>
+        <xi:include href="nix-install-package.xml" />
+      </section>
+      <section xml:id="sec-nix-prefetch-url">
+        <title>nix-prefetch-url</title>
+        <xi:include href="nix-prefetch-url.xml" />
+      </section>
+      <section xml:id="sec-nix-pull">
+        <title>nix-pull</title>
+        <xi:include href="nix-pull.xml" />
+      </section>
+      <section xml:id="sec-nix-push">
+        <title>nix-push</title>
+        <xi:include href="nix-push.xml" />
+      </section>
+      <section xml:id="sec-nix-worker">
+        <title>nix-worker</title>
+        <xi:include href="nix-worker.xml" />
+      </section>
    </section>
-
+    
  </appendix>

  <xi:include href="troubleshooting.xml" />
--- a/doc/manual/nix-build.xml
+++ b/doc/manual/nix-build.xml
@@ -1,7 +1,6 @@
 <refentry xmlns="http://docbook.org/ns/docbook"
          xmlns:xlink="http://www.w3.org/1999/xlink"
-          xmlns:xi="http://www.w3.org/2001/XInclude"
-          xml:id="sec-nix-build">
+          xmlns:xi="http://www.w3.org/2001/XInclude">

 <refmeta>
  <refentrytitle>nix-build</refentrytitle>
--- a/doc/manual/nix-channel.xml
+++ b/doc/manual/nix-channel.xml
@@ -1,7 +1,6 @@
 <refentry xmlns="http://docbook.org/ns/docbook"
          xmlns:xlink="http://www.w3.org/1999/xlink"
-          xmlns:xi="http://www.w3.org/2001/XInclude"
-          xml:id="sec-nix-channel">
+          xmlns:xi="http://www.w3.org/2001/XInclude">
  
 <refmeta>
  <refentrytitle>nix-channel</refentrytitle>
--- a/doc/manual/nix-collect-garbage.xml
+++ b/doc/manual/nix-collect-garbage.xml
@@ -1,7 +1,6 @@
 <refentry xmlns="http://docbook.org/ns/docbook"
          xmlns:xlink="http://www.w3.org/1999/xlink"
-          xmlns:xi="http://www.w3.org/2001/XInclude"
-          xml:id="sec-nix-collect-garbage">
+          xmlns:xi="http://www.w3.org/2001/XInclude">
  
 <refmeta>
  <refentrytitle>nix-collect-garbage</refentrytitle>
--- a/doc/manual/nix-copy-closure.xml
+++ b/doc/manual/nix-copy-closure.xml
@@ -1,7 +1,6 @@
 <refentry xmlns="http://docbook.org/ns/docbook"
          xmlns:xlink="http://www.w3.org/1999/xlink"
-          xmlns:xi="http://www.w3.org/2001/XInclude"
-          xml:id="sec-nix-copy-closure">
+          xmlns:xi="http://www.w3.org/2001/XInclude">

 <refmeta>
  <refentrytitle>nix-copy-closure</refentrytitle>
--- a/doc/manual/nix-env.xml
+++ b/doc/manual/nix-env.xml
@@ -1,7 +1,6 @@
 <refentry xmlns="http://docbook.org/ns/docbook"
          xmlns:xlink="http://www.w3.org/1999/xlink"
-          xmlns:xi="http://www.w3.org/2001/XInclude"
-          xml:id="sec-nix-env">
+          xmlns:xi="http://www.w3.org/2001/XInclude">
  
 <refmeta>
  <refentrytitle>nix-env</refentrytitle>
--- a/doc/manual/nix-hash.xml
+++ b/doc/manual/nix-hash.xml
@@ -1,7 +1,6 @@
 <refentry xmlns="http://docbook.org/ns/docbook"
          xmlns:xlink="http://www.w3.org/1999/xlink"
-          xmlns:xi="http://www.w3.org/2001/XInclude"
-          xml:id="sec-nix-hash">
+          xmlns:xi="http://www.w3.org/2001/XInclude">
  
 <refmeta>
  <refentrytitle>nix-hash</refentrytitle>
--- a/doc/manual/nix-install-package.xml
+++ b/doc/manual/nix-install-package.xml
@@ -1,7 +1,6 @@
 <refentry xmlns="http://docbook.org/ns/docbook"
          xmlns:xlink="http://www.w3.org/1999/xlink"
-          xmlns:xi="http://www.w3.org/2001/XInclude"
-          xml:id="sec-nix-install-package">
+          xmlns:xi="http://www.w3.org/2001/XInclude">
  
 <refmeta>
  <refentrytitle>nix-install-package</refentrytitle>
--- a/doc/manual/nix-instantiate.xml
+++ b/doc/manual/nix-instantiate.xml
@@ -1,7 +1,6 @@
 <refentry xmlns="http://docbook.org/ns/docbook"
          xmlns:xlink="http://www.w3.org/1999/xlink"
-          xmlns:xi="http://www.w3.org/2001/XInclude"
-          xml:id="sec-nix-instantiate">
+          xmlns:xi="http://www.w3.org/2001/XInclude">
  
 <refmeta>
  <refentrytitle>nix-instantiate</refentrytitle>
--- a/doc/manual/nix-lang-ref.xml
+++ b/doc/manual/nix-lang-ref.xml
@@ -178,5 +178,100 @@
    </productionset>
    
  </sect1>
+  
+
+
+  <sect1>
+    <title>Semantics</title>
+
+
+    
+    <sect2>
+      <title>Built-in functions</title>
+
+      <para>
+        The Nix language provides the following built-in function
+        (<quote>primops</quote>):
+      </para>
+
+      <variablelist>
+
+        <varlistentry>
+          <term><function>import</function>
+          <replaceable>e</replaceable></term>
+          <listitem>
+            <para>
+              Evaluates the expression <replaceable>e</replaceable>,
+              which must yield a path value.  The Nix expression
+              stored at this path in the file system is then read,
+              parsed, and evaluated.  Returns the result of the
+              evaluation of the Nix expression just read.
+            </para>
+
+            <para>
+              Example: <literal>import ./foo.nix</literal> evaluates
+              the expression stored in <filename>foo.nix</filename>
+              (in the directory containing the expression in which the
+              <function>import</function> occurs).
+            </para>
+          </listitem>
+        </varlistentry>
+
+        <varlistentry>
+          <term><function>derivation</function>
+          <replaceable>e</replaceable></term>
+          <listitem>
+            <para>
+              Evaluates the expression <replaceable>e</replaceable>,
+              which must yield an attribute set.  [...]
+            </para>
+          </listitem>
+        </varlistentry>
+
+        <varlistentry>
+          <term><function>baseNameOf</function>
+          <replaceable>e</replaceable></term>
+          <listitem>
+            <para>
+              Evaluates the expression <replaceable>e</replaceable>,
+              which must yield a string value, and returns a string
+              representing its <emphasis>base name</emphasis>.  This
+              is the substring following the last path separator
+              (<literal>/</literal>).
+            </para>
+
+            <para>
+              Example: <literal>baseNameOf "/foo/bar"</literal>
+              returns <literal>"bar"</literal>, and
+              <literal>baseNameOf "/foo/bar/"</literal> returns
+              <literal>""</literal>.
+            </para>
+          </listitem>
+        </varlistentry>
+
+        <varlistentry>
+          <term><function>toString</function>
+          <replaceable>e</replaceable></term>
+          <listitem>
+            <para>
+              Evaluates the expression <replaceable>e</replaceable>
+              and coerces it into a string, if possible.  Only
+              strings, paths, and URIs can be so coerced.
+            </para>
+
+            <para>
+              Example: <literal>toString
+              http://www.cs.uu.nl/</literal> returns
+              <literal>"http://www.cs.uu.nl/"</literal>.
+            </para>
+          </listitem>
+        </varlistentry>
+            
+      </variablelist>
+
+    </sect2>
+
+  </sect1>
+  

 </appendix>
--- a/doc/manual/nix-prefetch-url.xml
+++ b/doc/manual/nix-prefetch-url.xml
@@ -1,7 +1,6 @@
 <refentry xmlns="http://docbook.org/ns/docbook"
          xmlns:xlink="http://www.w3.org/1999/xlink"
-          xmlns:xi="http://www.w3.org/2001/XInclude"
-          xml:id="sec-nix-prefetch-url">
+          xmlns:xi="http://www.w3.org/2001/XInclude">
  
 <refmeta>
  <refentrytitle>nix-prefetch-url</refentrytitle>
--- a/doc/manual/nix-pull.xml
+++ b/doc/manual/nix-pull.xml
@@ -1,7 +1,6 @@
 <refentry xmlns="http://docbook.org/ns/docbook"
          xmlns:xlink="http://www.w3.org/1999/xlink"
-          xmlns:xi="http://www.w3.org/2001/XInclude"
-          xml:id="sec-nix-pull">
+          xmlns:xi="http://www.w3.org/2001/XInclude">

 <refmeta>
  <refentrytitle>nix-pull</refentrytitle>
--- a/doc/manual/nix-push.xml
+++ b/doc/manual/nix-push.xml
@@ -1,7 +1,6 @@
 <refentry xmlns="http://docbook.org/ns/docbook"
          xmlns:xlink="http://www.w3.org/1999/xlink"
-          xmlns:xi="http://www.w3.org/2001/XInclude"
-          xml:id="sec-nix-push">
+          xmlns:xi="http://www.w3.org/2001/XInclude">

 <refmeta>
  <refentrytitle>nix-push</refentrytitle>
--- a/doc/manual/nix-store.xml
+++ b/doc/manual/nix-store.xml
@@ -1,7 +1,6 @@
 <refentry xmlns="http://docbook.org/ns/docbook"
          xmlns:xlink="http://www.w3.org/1999/xlink"
-          xmlns:xi="http://www.w3.org/2001/XInclude"
-          xml:id="sec-nix-store">
+          xmlns:xi="http://www.w3.org/2001/XInclude">

 <refmeta>
  <refentrytitle>nix-store</refentrytitle>
--- a/doc/manual/nix-worker.xml
+++ b/doc/manual/nix-worker.xml
@@ -1,7 +1,6 @@
 <refentry xmlns="http://docbook.org/ns/docbook"
          xmlns:xlink="http://www.w3.org/1999/xlink"
-          xmlns:xi="http://www.w3.org/2001/XInclude"
-          xml:id="sec-nix-worker">
+          xmlns:xi="http://www.w3.org/2001/XInclude">

 <refmeta>
  <refentrytitle>nix-worker</refentrytitle>
--- a/doc/manual/package-management.xml
+++ b/doc/manual/package-management.xml
@@ -331,7 +331,7 @@ default profile, respectively.  If the profile doesn’t exist, it will
 be created automatically.  You should be careful about storing a
 profile in another location than the <filename>profiles</filename>
 directory, since otherwise it might not be used as a root of the
-garbage collector (see <xref linkend='sec-garbage-collection'
+garbage collector (see section <xref linkend='sec-garbage-collection'
 />).</para>

 <para>All <command>nix-env</command> operations work on the profile
@@ -507,16 +507,19 @@ click on it, and it will be installed with all the necessary
 dependencies.</para>

 <para>For instance, you can go to <link
-xlink:href="http://hydra.nixos.org/jobset/nixpkgs/trunk/channel/latest"
-/> and click on any link for the individual packages for your
-platform.  The first time you do this, your browser will ask what to
-do with <literal>application/nix-package</literal> files.  You should
-open them with <filename>/nix/bin/nix-install-package</filename>.
-This will open a window that asks you to confirm that you want to
-install the package.  When you answer <literal>Y</literal>, the
-package and all its dependencies will be installed.  This is a binary
-deployment mechanism — you get packages pre-compiled for the selected
-platform type.</para>
+xlink:href="http://nixos.org/releases/nixpkgs/nixpkgs-unstable/" /> —
+or to any older release of Nix Packages — and click on any link for
+the individual packages for your platform (say, <link
+xlink:href='http://nix.cs.uu.nl/dist/nix/nixpkgs-0.10pre6622/pkgs/subversion-1.4.0-i686-linux.nixpkg'><literal>subversion-1.4.0</literal>
+for <literal>i686-linux</literal></link>).  The first time you do
+this, your browser will ask what to do with
+<literal>application/nix-package</literal> files.  You should open
+them with <filename>/nix/bin/nix-install-package</filename>.  This
+will open a window that asks you to confirm that you want to install
+the package.  When you answer <literal>Y</literal>, the package and
+all its dependencies will be installed.  This is a binary deployment
+mechanism — you get packages pre-compiled for the selected platform
+type.</para>

 <para>You can also install <literal>application/nix-package</literal>
 files from the command line directly.  See <xref
--- a/doc/manual/quick-start.xml
+++ b/doc/manual/quick-start.xml
@@ -1,6 +1,5 @@
 <chapter xmlns="http://docbook.org/ns/docbook"
-         xmlns:xlink="http://www.w3.org/1999/xlink"
-         xml:id="chap-quick-start">
+         xmlns:xlink="http://www.w3.org/1999/xlink">

 <title>Quick Start</title>

@@ -11,9 +10,9 @@ to the following chapters.</para>

 <orderedlist>

-<listitem><para>Download a source tarball, RPM or Deb from <link
-xlink:href='http://nixos.org/'/>.  Build source distributions using
-the regular sequence:
+<listitem><para>Download a source tarball or RPM from <link
+xlink:href='http://nixos.org/'/>.  Build source
+distributions using the regular sequence:
        
 <screen>
 $ tar xvfj nix-<replaceable>version</replaceable>.tar.bz2
@@ -21,21 +20,13 @@ $ ./configure
 $ make
 $ make install <lineannotation>(as root)</lineannotation></screen>

-This will install the Nix binaries in <filename>/usr/local</filename>
-and keep the Nix store and other state in <filename>/nix</filename>.
-You can change the former by specifying
-<option>--prefix=<replaceable>path</replaceable></option>.  The
-location of the store can be changed using
-<option>--with-store-dir=<replaceable>path</replaceable></option>.
-However, you shouldn't change the store location, if at all possible,
-since that will make it impossible to use pre-built binaries from the
-Nixpkgs channel and other channels.  The location of the state can be
-changed using
-<option>--localstatedir=<replaceable>path</replaceable>.</option></para></listitem>
-
-<listitem><para>You should add
-<filename><replaceable>prefix</replaceable>/etc/profile.d/nix.sh</filename>
-to your <filename>~/.bashrc</filename> (or some other login
+This will install Nix in <filename>/nix</filename>.  You shouldn't
+change the prefix if at all possible since that will make it
+impossible to use pre-built binaries from the Nixpkgs channel and
+other channels.  Alternatively, you could grab an RPM if you're on an
+RPM-based system.  You should also add
+<filename>/nix/etc/profile.d/nix.sh</filename> to your
+<filename>~/.bashrc</filename> (or some other login
 file).</para></listitem>

 <listitem><para>Subscribe to the Nix Packages channel.
@@ -108,7 +99,7 @@ numbers).</para></listitem>

 <listitem><para>You can also install specific packages directly from
 your web browser.  For instance, you can go to <link
-xlink:href="http://hydra.nixos.org/jobset/nixpkgs/trunk/channel/latest" />
+xlink:href="http://nix.cs.uu.nl/dist/nix/nixpkgs-unstable-latest/" />
 and click on any link for the individual packages for your platform.
 Associate <literal>application/nix-package</literal> with the program
 <filename>/nix/bin/nix-install-package</filename>.  A window should
--- a/doc/manual/release-notes.xml
+++ b/doc/manual/release-notes.xml
@@ -8,7 +8,7 @@

 <!--==================================================================-->

-<section xml:id="ssec-relnotes-0.13"><title>Release 0.13 (November 5,
+<section xml:id="ssec-relnotes-0.13"><title>Release 0.13 (April NN,
 2009)</title>

 <para>This is primarily a bug fix release.  It has some new
@@ -85,25 +85,7 @@ features:</para>
    add a string to stack traces — useful for debugging),
    <varname>builtins.isBool</varname>,
    <varname>builtins.isString</varname>,
-    <varname>builtins.isInt</varname>,
-    <varname>builtins.intersectAttrs</varname>.</para>
-  </listitem>
-
-  <listitem>
-    <para>OpenSolaris support (Sander van der Burg).</para>
-  </listitem>
-
-  <listitem>
-    <para>Stack traces are no longer displayed unless the
-    <option>--show-trace</option> option is used.</para>
-  </listitem>
-
-  <listitem>
-    <para>The scoping rules for <literal>inherit
-    (<replaceable>e</replaceable>) ...</literal> in recursive
-    attribute sets have changed.  The expression
-    <replaceable>e</replaceable> can now refer to the attributes
-    defined in the containing set.</para>
+    <varname>builtins.isInt</varname>.</para>
  </listitem>

 </itemizedlist>
--- a/doc/manual/writing-nix-expressions.xml
+++ b/doc/manual/writing-nix-expressions.xml
@@ -1106,7 +1106,7 @@ used in the Nix expression for Subversion.</para>
    incompatibility might occur.</para>
  </callout>

-  <callout arearefs='ex-subversion-nix-co-3'>
+  <callout arearefs='ex-subversion-nix-co-2'>
    <para>This assertion says that in order for Subversion to have SSL
    support (so that it can access <literal>https</literal> URLs), an
    OpenSSL library must be passed.  Additionally, it says that
--- a/release.nix
+++ b/release.nix
@@ -18,10 +18,7 @@ let
        src = nix;
        inherit officialRelease;

-        buildInputs =
-          [ curl bison flex2533 perl libxml2 libxslt w3m bzip2
-            tetex dblatex nukeReferences
-          ];
+        buildInputs = [curl bison flex2533 perl libxml2 libxslt w3m bzip2 jing_tools tetex dblatex];

        configureFlags = ''
          --with-docbook-rng=${docbook5}/xml/rng/docbook
@@ -50,9 +47,6 @@ let

          stripHash ${bzip2.src}
          cp -pv ${bzip2.src} externals/$strippedName
-
-          # TeX needs a writable font cache.
-          export VARTEXFONTS=$TMPDIR/texfonts
        '';

        preDist = ''
@@ -60,14 +54,6 @@ let
          
          make -C doc/manual manual.pdf prefix=$out
          cp doc/manual/manual.pdf $out/manual.pdf
-
-          # The PDF containes filenames of included graphics (see
-          # http://www.tug.org/pipermail/pdftex/2007-August/007290.html).
-          # This causes a retained dependency on dblatex, which Hydra
-          # doesn't like (the output of the tarball job is distributed
-          # to Windows and Macs, so there should be no Linux binaries
-          # in the closure).
-          nuke-refs $out/manual.pdf
          
          echo "doc manual $out/share/doc/nix/manual" >> $out/nix-support/hydra-build-products
          echo "doc-pdf manual $out/manual.pdf" >> $out/nix-support/hydra-build-products
@@ -91,13 +77,11 @@ let

        configureFlags = ''
          --disable-init-state
-          ${if system == "i686-cygwin" then "--disable-old-db-compat" else "--with-bdb=${db45}"}
-          --with-aterm=${aterm242fixes} --with-bzip2=${bzip2}
+          --with-bdb=${db45} --with-aterm=${aterm242fixes} --with-bzip2=${bzip2}
        '';
      };

-
-    /*
+      
    static =
      { tarball ? jobs.tarball {}
      , system ? "i686-linux"
@@ -117,7 +101,6 @@ let
          --enable-static-nix
        '';
      };
-    */

      
    coverage =
@@ -151,29 +134,21 @@ let

      
    rpm_fedora5i386 = makeRPM_i686 (diskImages: diskImages.fedora5i386) 20;
-    rpm_fedora9i386 = makeRPM_i686 (diskImages: diskImages.fedora9i386) 30;
-    rpm_fedora9x86_64 = makeRPM_x86_64 (diskImages: diskImages.fedora9x86_64) 30;
+    rpm_fedora9i386 = makeRPM_i686 (diskImages: diskImages.fedora9i386) 50;
+    rpm_fedora9x86_64 = makeRPM_x86_64 (diskImages: diskImages.fedora9x86_64) 50;
    rpm_fedora10i386 = makeRPM_i686 (diskImages: diskImages.fedora10i386) 40;
    rpm_fedora10x86_64 = makeRPM_x86_64 (diskImages: diskImages.fedora10x86_64) 40;
-    rpm_fedora11i386 = makeRPM_i686 (diskImages: diskImages.fedora11i386) 50;
-    rpm_fedora11x86_64 = makeRPM_x86_64 (diskImages: diskImages.fedora11x86_64) 50;
    rpm_opensuse103i386 = makeRPM_i686 (diskImages: diskImages.opensuse103i386) 40;
-    rpm_opensuse110i386 = makeRPM_i686 (diskImages: diskImages.opensuse110i386) 50;
-    rpm_opensuse110x86_64 = makeRPM_x86_64 (diskImages: diskImages.opensuse110x86_64) 50;

    
    deb_debian40i386 = makeDeb_i686 (diskImages: diskImages.debian40i386) 40;
    deb_debian40x86_64 = makeDeb_x86_64 (diskImages: diskImages.debian40x86_64) 40;
-    deb_debian50i386 = makeDeb_i686 (diskImages: diskImages.debian50i386) 50;
-    deb_debian50x86_64 = makeDeb_x86_64 (diskImages: diskImages.debian50x86_64) 50;
-    deb_ubuntu804i386 = makeDeb_i686 (diskImages: diskImages.ubuntu804i386) 20;
-    deb_ubuntu804x86_64 = makeDeb_x86_64 (diskImages: diskImages.ubuntu804x86_64) 20;
-    deb_ubuntu810i386 = makeDeb_i686 (diskImages: diskImages.ubuntu810i386) 30;
-    deb_ubuntu810x86_64 = makeDeb_x86_64 (diskImages: diskImages.ubuntu810x86_64) 30;
-    deb_ubuntu904i386 = makeDeb_i686 (diskImages: diskImages.ubuntu904i386) 40;
-    deb_ubuntu904x86_64 = makeDeb_x86_64 (diskImages: diskImages.ubuntu904x86_64) 40;
-    deb_ubuntu910i386 = makeDeb_i686 (diskImages: diskImages.ubuntu910i386) 50;
-    deb_ubuntu910x86_64 = makeDeb_x86_64 (diskImages: diskImages.ubuntu910x86_64) 50;
+    deb_debian50i386 = makeDeb_i686 (diskImages: diskImages.debian50i386) 30;
+    deb_debian50x86_64 = makeDeb_x86_64 (diskImages: diskImages.debian50x86_64) 30;
+    deb_ubuntu804i386 = makeDeb_i686 (diskImages: diskImages.ubuntu804i386) 50;
+    deb_ubuntu804x86_64 = makeDeb_x86_64 (diskImages: diskImages.ubuntu804x86_64) 50;
+    deb_ubuntu810i386 = makeDeb_i686 (diskImages: diskImages.ubuntu810i386) 40;
+    deb_ubuntu810x86_64 = makeDeb_x86_64 (diskImages: diskImages.ubuntu810x86_64) 40;


  };
@@ -215,7 +190,6 @@ let
      memSize = 1024;
      meta = { schedulingPriority = toString prio; };
      configureFlags = "--sysconfdir=/etc";
-      debRequires = ["curl"];
    };


--- a/scripts/build-remote.pl.in
+++ b/scripts/build-remote.pl.in
@@ -47,21 +47,24 @@ decline if !defined $conf || ! -e $conf;
 my $canBuildLocally = $amWilling && ($localSystem eq $neededSystem);


-# Read the list of machines.
+# Otherwise find a willing remote machine.
 my @machines;
+my %curJobs;
+
+
+# Read the list of machines.
 open CONF, "< $conf" or die;

 while (<CONF>) {
    chomp;
    s/\#.*$//g;
    next if /^\s*$/;
-    /^\s*(\S+)\s+(\S+)\s+(\S+)\s+(\d+)(\s+([0-9\.]+))?\s*$/ or die;
+    /^\s*(\S+)\s+(\S+)\s+(\S+)\s+(\d+)\s*$/ or die;
    push @machines,
        { hostName => $1
-        , systemTypes => [split(/,/, $2)]
+        , systemType => $2
        , sshKeys => $3
        , maxJobs => $4
-        , speedFactor => 1.0 * ($6 || 1)
        };
 }

@@ -74,53 +77,39 @@ open MAINLOCK, ">>$mainLock" or die;
 flock(MAINLOCK, LOCK_EX) or die;


-sub openSlotLock {
-    my ($machine, $slot) = @_;
-    my $slotLockFn = "$currentLoad/" . (join '+', @{$machine->{systemTypes}}) . "-" . $machine->{hostName} . "-$slot";
-    my $slotLock = new IO::Handle;
-    open $slotLock, ">>$slotLockFn" or die;
-    return $slotLock;
-}
-    
-
-# Find all machine that can execute this build, i.e., that support
-# builds for the given platform and are not at their job limit.
+# Find a suitable system.
 my $rightType = 0;
-my @available = ();
+my $machine;
+my $slotLock;
 LOOP: foreach my $cur (@machines) {
-    if (grep { $neededSystem eq $_ } @{$cur->{systemTypes}}) {
+    if ($neededSystem eq $cur->{systemType}
+        || ($neededSystem eq "i686-linux" && $cur->{systemType} eq "x86_64-linux"))
+    {
        $rightType = 1;

-        # We have a machine of the right type.  Determine the load on
-        # the machine.
+        # We have a machine of the right type.  Try to get a lock on
+        # one of the machine's lock files.
        my $slot = 0;
-        my $load = 0;
-        my $free;
        while ($slot < $cur->{maxJobs}) {
-            my $slotLock = openSlotLock($cur, $slot);
+            my $slotLockFn = "$currentLoad/" . $cur->{systemType} . "-" . $cur->{hostName} . "-$slot";
+            $slotLock = new IO::Handle;
+            open $slotLock, ">>$slotLockFn" or die;
            if (flock($slotLock, LOCK_EX | LOCK_NB)) {
-                $free = $slot unless defined $free;
-                flock($slotLock, LOCK_UN) or die;
-            } else {
-                $load++;
+                utime undef, undef, $slotLock;
+                $machine = $cur;
+                last LOOP;
            }
            close $slotLock;
            $slot++;
        }
-
-        push @available, { machine => $cur, load => $load, free => $free }
-            if $load < $cur->{maxJobs};
    }
 }

-if (defined $ENV{NIX_DEBUG_HOOK}) {
-    print STDERR "load on " . $_->{machine}->{hostName} . " = " . $_->{load} . "\n"
-        foreach @available;
-}
+close MAINLOCK;


-# Didn't find any available machine?  Then decline or postpone.
-if (scalar @available == 0) {
+# Didn't find one?  Then decline or postpone.
+if (!defined $machine) {
    # Postpone if we have a machine of the right type, except if the
    # local system can and wants to do the build.
    if ($rightType && !$canBuildLocally) {
@@ -131,41 +120,8 @@ if (scalar @available == 0) {
    }
 }

-
-# Prioritise the available machines as follows:
-# - First by load divided by speed factor, rounded to the nearest
-#   integer.  This causes fast machines to be preferred over slow
-#   machines with similar loads.
-# - Then by speed factor.
-# - Finally by load.
-sub lf { my $x = shift; return int($x->{load} / $x->{machine}->{speedFactor} + 0.4999); }
-@available = sort
-    { lf($a) <=> lf($b)
-          || $b->{machine}->{speedFactor} <=> $a->{machine}->{speedFactor}
-          || $a->{load} <=> $b->{load}
-    } @available;
-
-
-# Select the best available machine and lock a free slot.
-my $selected = $available[0]; 
-my $machine = $selected->{machine};
-
-my $slotLock = openSlotLock($machine, $selected->{free});
-flock($slotLock, LOCK_EX | LOCK_NB) or die;
-utime undef, undef, $slotLock;
-
-close MAINLOCK;
-
-
-# Tell Nix we've accepted the build.
+# Yes we did, accept.
 sendReply "accept";
-if (defined $ENV{NIX_DEBUG_HOOK}) {
-    my $hostName = $machine->{hostName};
-    my $sp = $machine->{speedFactor};
-    print STDERR "building `$drvPath' on `$hostName' - $sp - " . $selected->{free} . "\n";
-    sleep 10;
-    exit 0;
-}
 my $x = <STDIN>;
 chomp $x;

@@ -174,7 +130,7 @@ if ($x ne "okay") {
 }


-# Do the actual build.
+# Do the actual job.
 my $hostName = $machine->{hostName};
 print STDERR "building `$drvPath' on `$hostName'\n";

--- a/scripts/nix-build.in
+++ b/scripts/nix-build.in
@@ -112,10 +112,6 @@ EOF
        $dryRun = 1;
    }
    
-    elsif ($arg eq "--show-trace") {
-        push @instArgs, $arg;
-    }
-    
    elsif (substr($arg, 0, 1) eq "-") {
        push @buildArgs, $arg;
    }
--- a/src/libexpr/Makefile.am
+++ b/src/libexpr/Makefile.am
@@ -3,7 +3,7 @@ pkglib_LTLIBRARIES = libexpr.la
 libexpr_la_SOURCES = \
 nixexpr.cc eval.cc primops.cc lexer-tab.cc parser-tab.cc \
 get-drvs.cc attr-path.cc expr-to-xml.cc common-opts.cc \
- names.cc
+ names.cc normal-forms.cc

 pkginclude_HEADERS = \
 nixexpr.hh eval.hh parser.hh lexer-tab.hh parser-tab.hh \
--- a/src/libexpr/eval.cc
+++ b/src/libexpr/eval.cc
@@ -16,15 +16,23 @@ namespace nix {
    

 EvalState::EvalState()
-    : normalForms(32768), primOps(128)
+    : sessionNormalForms(32768), normalForms(32768), primOps(128)
 {
-    nrEvaluated = nrCached = 0;
+    nrEvaluated = nrCached = nrDepthAfterReset = 0;

    initNixExprHelpers();

    addPrimOps();

    allowUnsafeEquality = getEnv("NIX_NO_UNSAFE_EQ", "") == "";
+    safeCache = true;
+
+    loadNormalForms();
+}
+
+EvalState::~EvalState()
+{
+    saveNormalForms();
 }


@@ -468,8 +476,10 @@ LocalNoInline(Expr evalVar(EvalState & state, ATerm name))
    if (arity == 0)
        /* !!! backtrace for primop call */
        return ((PrimOp) ATgetBlobData(fun)) (state, ATermVector());
-    else
+    else {
+        state.safeCache = false;
        return makePrimOp(arity, fun, ATempty);
+    }
 }


@@ -495,6 +505,7 @@ LocalNoInline(Expr evalCall(EvalState & state, Expr fun, Expr arg))
            for (ATermIterator i(args); i; ++i)
                args2[--arity] = *i;
            /* !!! backtrace for primop call */
+            state.safeCache = true;
            return ((PrimOp) ATgetBlobData(funBlob))
                (state, args2);
        } else
@@ -802,11 +813,19 @@ Expr evalExpr(EvalState & state, Expr e)
        format("evaluating expression: %1%") % e);
 #endif

-    state.nrEvaluated++;
+    const unsigned int hugeEvalExpr = 100;
+    unsigned int nrEvaluated = state.nrEvaluated++;
+    state.nrDepthAfterReset++;

    /* Consult the memo table to quickly get the normal form of
       previously evaluated expressions. */
    Expr nf = state.normalForms.get(e);
+    if (nf) {
+        state.nrCached++;
+        return nf;
+    }
+
+    nf = state.sessionNormalForms.get(e);
    if (nf) {
        if (nf == makeBlackHole())
            throwEvalError("infinite recursion encountered");
@@ -815,14 +834,25 @@ Expr evalExpr(EvalState & state, Expr e)
    }

    /* Otherwise, evaluate and memoize. */
-    state.normalForms.set(e, makeBlackHole());
+    state.sessionNormalForms.set(e, makeBlackHole());
    try {
        nf = evalExpr2(state, e);
    } catch (Error & err) {
-        state.normalForms.remove(e);
+        state.sessionNormalForms.remove(e);
        throw;
    }
-    state.normalForms.set(e, nf);
+
+    // session independent condition
+    if (state.nrDepthAfterReset && state.safeCache &&
+        // heuristic condition
+        state.nrEvaluated - nrEvaluated > hugeEvalExpr) {
+        state.sessionNormalForms.remove(e);
+        state.normalForms.set(e, nf);
+        state.nrDepthAfterReset--;
+    } else {
+        state.sessionNormalForms.set(e, nf);
+    }
+
    return nf;
 }

@@ -830,6 +860,7 @@ Expr evalExpr(EvalState & state, Expr e)
 Expr evalFile(EvalState & state, const Path & path)
 {
    startNest(nest, lvlTalkative, format("evaluating file `%1%'") % path);
+    state.nrDepthAfterReset = 0;
    Expr e = parseExprFromFile(state, path);
    try {
        return evalExpr(state, e);
@@ -901,11 +932,13 @@ void printEvalStats(EvalState & state)
    char x;
    bool showStats = getEnv("NIX_SHOW_STATS", "0") != "0";
    printMsg(showStats ? lvlInfo : lvlDebug,
-        format("evaluated %1% expressions, %2% cache hits, %3%%% efficiency, used %4% ATerm bytes, used %5% bytes of stack space")
+             format("evaluated %1% expressions, %2% cache hits, %3%%% efficiency, used %4% ATerm bytes, used %5% bytes of stack space, %6% cached normal reduction, %7% session dependent reduction.")
        % state.nrEvaluated % state.nrCached
        % ((float) state.nrCached / (float) state.nrEvaluated * 100)
        % AT_calcAllocatedSize()
-        % (&x - deepestStack));
+        % (&x - deepestStack)
+        % state.normalForms.size()
+        % state.sessionNormalForms.size());
    if (showStats)
        printATermMapStats();
 }
--- a/src/libexpr/eval.hh
+++ b/src/libexpr/eval.hh
@@ -30,6 +30,7 @@ typedef Expr (* PrimOp) (EvalState &, const ATermVector & args);
 struct EvalState 
 {
    ATermMap normalForms;
+    ATermMap sessionNormalForms;
    ATermMap primOps;
    DrvRoots drvRoots;
    DrvHashes drvHashes; /* normalised derivation hashes */
@@ -37,14 +38,19 @@ struct EvalState

    unsigned int nrEvaluated;
    unsigned int nrCached;
+    unsigned int nrDepthAfterReset;

    bool allowUnsafeEquality;
+    bool safeCache;

    EvalState();
+    ~EvalState();

    void addPrimOps();
    void addPrimOp(const string & name,
        unsigned int arity, PrimOp primOp);
+    void loadNormalForms();
+    void saveNormalForms();
 };


--- a/src/libexpr/normal-forms.cc
+++ b/src/libexpr/normal-forms.cc
@@ -0,0 +1,64 @@
+#include "eval.hh"
+#include "util.hh"
+#include "globals.hh"
+#include "serialise.hh"
+
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+
+namespace nix {
+
+
+void EvalState::loadNormalForms()
+{
+    //    nixCacheFile = getEnv("NIX_CACHE_FILE", nixStateDir + "/reduce-cache");
+    nixCacheFile = getEnv("NIX_CACHE_FILE");
+    string loadFlag = getEnv("NIX_CACHE_FILE_LOAD", "1");
+
+    if(nixCacheFile == "" || loadFlag == "")
+        return;
+    if(!pathExists(nixCacheFile))
+        return;
+
+    printMsg(lvlInfo, format("Load cache: ..."));
+    try {
+        int fd = open(nixCacheFile.c_str(), O_RDONLY);
+        if (fd == -1)
+            throw SysError(format("opening file `%1%'") % nixCacheFile);
+        AutoCloseFD auto_fd = fd;
+
+        FdSource source = fd;
+        normalForms = readATermMap(source);
+    } catch (Error & e) {
+        e.addPrefix(format("Cannot load cached reduce operations from %1%:\n") % nixCacheFile);
+        throw;
+    }
+    printMsg(lvlInfo, format("Load cache: end"));
+}
+
+void EvalState::saveNormalForms()
+{
+    string saveFlag = getEnv("NIX_CACHE_FILE_SAVE", "");
+
+    if(nixCacheFile == "" || saveFlag == "")
+        return;
+
+    printMsg(lvlInfo, format("Save cache: ..."));
+    try {
+        int fd = open(nixCacheFile.c_str(), O_WRONLY | O_TRUNC | O_CREAT, 0666);
+        if (fd == -1)
+            throw SysError(format("opening file `%1%'") % nixCacheFile);
+        AutoCloseFD auto_fd = fd;
+
+        FdSink sink = fd;
+        writeATermMap(normalForms, sink);
+    } catch (Error & e) {
+        e.addPrefix(format("Cannot save cached reduce operations to %1%:\n") % nixCacheFile);
+        throw;
+    }
+    printMsg(lvlInfo, format("Save cache: end"));
+}
+
+
+}
--- a/src/libexpr/primops.cc
+++ b/src/libexpr/primops.cc
@@ -74,12 +74,14 @@ static Expr prim_null(EvalState & state, const ATermVector & args)
   platforms. */
 static Expr prim_currentSystem(EvalState & state, const ATermVector & args)
 {
+    state.nrDepthAfterReset = 0;
    return makeStr(thisSystem);
 }


 static Expr prim_currentTime(EvalState & state, const ATermVector & args)
 {
+    state.nrDepthAfterReset = 0;
    return ATmake("Int(<int>)", time(0));
 }

@@ -223,28 +225,12 @@ static Expr prim_addErrorContext(EvalState & state, const ATermVector & args)
    }
 }

-/* Try evaluating the argument. Success => {success=true; value=something;}, 
- * else => {success=false; value=false;} */
-static Expr prim_tryEval(EvalState & state, const ATermVector & args)
-{
-    ATermMap res = ATermMap();
-    try {
-        Expr val = evalExpr(state, args[0]);
-        res.set(toATerm("value"), makeAttrRHS(val, makeNoPos()));
-        res.set(toATerm("success"), makeAttrRHS(eTrue, makeNoPos()));
-    } catch (AssertionError & e) {
-        printMsg(lvlDebug, format("tryEval caught an error: %1%: %2%") % e.prefix() % e.msg());
-        res.set(toATerm("value"), makeAttrRHS(eFalse, makeNoPos()));
-        res.set(toATerm("success"), makeAttrRHS(eFalse, makeNoPos()));
-    }
-    return makeAttrs(res);
-}
-

 /* Return an environment variable.  Use with care. */
 static Expr prim_getEnv(EvalState & state, const ATermVector & args)
 {
    string name = evalStringNoCtx(state, args[0]);
+    state.nrDepthAfterReset = 0;
    return makeStr(getEnv(name));
 }

@@ -256,12 +242,7 @@ static Expr prim_getEnv(EvalState & state, const ATermVector & args)
 static Expr prim_trace(EvalState & state, const ATermVector & args)
 {
    Expr e = evalExpr(state, args[0]);
-    string s;
-    PathSet context;
-    if (matchStr(e, s, context))
-        printMsg(lvlError, format("trace: %1%") % s);
-    else
-        printMsg(lvlError, format("trace: %1%") % e);
+    printMsg(lvlError, format("trace: %1%") % e);
    return evalExpr(state, args[1]);
 }

@@ -338,6 +319,7 @@ static Hash hashDerivationModulo(EvalState & state, Derivation drv)
 static Expr prim_derivationStrict(EvalState & state, const ATermVector & args)
 {
    startNest(nest, lvlVomit, "evaluating derivation");
+    state.nrDepthAfterReset = 0;

    ATermMap attrs;
    queryAllAttrs(evalExpr(state, args[0]), attrs, true);
@@ -440,18 +422,10 @@ static Expr prim_derivationStrict(EvalState & state, const ATermVector & args)
                    drv.inputDrvs[*j] = singleton<StringSet>("out");
            }
        }
-
-        /* See prim_unsafeDiscardOutputDependency. */
-        bool useDrvAsSrc = false;
-        if (path.at(0) == '~') {
-            path = string(path, 1);
-            useDrvAsSrc = true;
-        }
-
-        assert(isStorePath(path));
-
+        
        debug(format("derivation uses `%1%'") % path);
-        if (!useDrvAsSrc && isDerivation(path))
+        assert(isStorePath(path));
+        if (isDerivation(path))
            drv.inputDrvs[path] = singleton<StringSet>("out");
        else
            drv.inputSrcs.insert(path);
@@ -579,6 +553,7 @@ static Expr prim_storePath(EvalState & state, const ATermVector & args)
 {
    PathSet context;
    Path path = canonPath(coerceToPath(state, args[0], context));
+    state.nrDepthAfterReset = 0;
    if (!isInStore(path))
        throw EvalError(format("path `%1%' is not in the Nix store") % path);
    Path path2 = toStorePath(path);
@@ -595,6 +570,7 @@ static Expr prim_pathExists(EvalState & state, const ATermVector & args)
    Path path = coerceToPath(state, args[0], context);
    if (!context.empty())
        throw EvalError(format("string `%1%' cannot refer to other paths") % path);
+    state.nrDepthAfterReset = 0;
    return makeBool(pathExists(path));
 }

@@ -628,6 +604,7 @@ static Expr prim_readFile(EvalState & state, const ATermVector & args)
    Path path = coerceToPath(state, args[0], context);
    if (!context.empty())
        throw EvalError(format("string `%1%' cannot refer to other paths") % path);
+    state.nrDepthAfterReset = 0;
    return makeStr(readFile(path));
 }

@@ -667,6 +644,7 @@ static Expr prim_toFile(EvalState & state, const ATermVector & args)
        refs.insert(path);
    }
    
+    state.nrDepthAfterReset = 0;
    Path storePath = readOnlyMode
        ? computeStorePathForText(name, contents, refs)
        : store->addTextToStore(name, contents, refs);
@@ -719,6 +697,7 @@ static Expr prim_filterSource(EvalState & state, const ATermVector & args)

    FilterFromExpr filter(state, args[0]);

+    state.nrDepthAfterReset = 0;
    Path dstPath = readOnlyMode
        ? computeStorePathForPath(path, true, htSHA256, filter).first
        : store->addToStore(path, true, htSHA256, filter);
@@ -825,70 +804,6 @@ static Expr prim_isAttrs(EvalState & state, const ATermVector & args)
 }


-/* Return the right-biased intersection of two attribute sets as1 and
-   as2, i.e. a set that contains every attribute from as2 that is also
-   a member of as1. */
-static Expr prim_intersectAttrs(EvalState & state, const ATermVector & args)
-{
-    ATermMap as1, as2;
-    queryAllAttrs(evalExpr(state, args[0]), as1, true);
-    queryAllAttrs(evalExpr(state, args[1]), as2, true);
-
-    ATermMap res;
-    foreach (ATermMap::const_iterator, i, as2)
-        if (as1[i->key]) res.set(i->key, i->value);
-
-    return makeAttrs(res);
-}
-
-
-static void attrsInPattern(ATermMap & map, Pattern pat)
-{
-    ATerm name;
-    ATermList formals;
-    Pattern pat1, pat2;
-    ATermBool ellipsis;
-    if (matchAttrsPat(pat, formals, ellipsis)) { 
-        for (ATermIterator i(formals); i; ++i) {
-            ATerm def;
-            if (!matchFormal(*i, name, def)) abort();
-            map.set(name, makeAttrRHS(makeBool(def != constNoDefaultValue), makeNoPos()));
-        }
-    }
-    else if (matchAtPat(pat, pat1, pat2)) {
-        attrsInPattern(map, pat1);
-        attrsInPattern(map, pat2);
-    }
-}
-
-
-/* Return a set containing the names of the formal arguments expected
-   by the function `f'.  The value of each attribute is a Boolean
-   denoting whether has a default value.  For instance,
-
-      functionArgs ({ x, y ? 123}: ...)
-   => { x = false; y = true; }
-
-   "Formal argument" here refers to the attributes pattern-matched by
-   the function.  Plain lambdas are not included, e.g.
-
-      functionArgs (x: ...)
-   => { }
-*/
-static Expr prim_functionArgs(EvalState & state, const ATermVector & args)
-{
-    Expr f = evalExpr(state, args[0]);
-    ATerm pat, body, pos;
-    if (!matchFunction(f, pat, body, pos))
-        throw TypeError("`functionArgs' required a function");
-    
-    ATermMap as;
-    attrsInPattern(as, pat);
-
-    return makeAttrs(as);
-}
-
-
 /*************************************************************
 * Lists
 *************************************************************/
@@ -1040,28 +955,6 @@ static Expr prim_unsafeDiscardStringContext(EvalState & state, const ATermVector
 }


-/* Sometimes we want to pass a derivation path (i.e. pkg.drvPath) to a
-   builder without causing the derivation to be built (for instance,
-   in the derivation that builds NARs in nix-push, when doing
-   source-only deployment).  This primop marks the string context so
-   that builtins.derivation adds the path to drv.inputSrcs rather than
-   drv.inputDrvs. */
-static Expr prim_unsafeDiscardOutputDependency(EvalState & state, const ATermVector & args)
-{
-    PathSet context;
-    string s = coerceToString(state, args[0], context);
-
-    PathSet context2;
-    foreach (PathSet::iterator, i, context) {
-        Path p = *i;
-        if (p.at(0) == '=') p = "~" + string(p, 1);
-        context2.insert(p);
-    }
-    
-    return makeStr(s, context2);
-}
-
-
 /* Expression serialization/deserialization */


@@ -1136,7 +1029,6 @@ void EvalState::addPrimOps()
    addPrimOp("abort", 1, prim_abort);
    addPrimOp("throw", 1, prim_throw);
    addPrimOp("__addErrorContext", 2, prim_addErrorContext);
-    addPrimOp("__tryEval", 1, prim_tryEval);
    addPrimOp("__getEnv", 1, prim_getEnv);
    addPrimOp("__trace", 2, prim_trace);

@@ -1169,8 +1061,6 @@ void EvalState::addPrimOps()
    addPrimOp("__isAttrs", 1, prim_isAttrs);
    addPrimOp("removeAttrs", 2, prim_removeAttrs);
    addPrimOp("__listToAttrs", 1, prim_listToAttrs);
-    addPrimOp("__intersectAttrs", 2, prim_intersectAttrs);
-    addPrimOp("__functionArgs", 1, prim_functionArgs);

    // Lists
    addPrimOp("__isList", 1, prim_isList);
@@ -1191,7 +1081,6 @@ void EvalState::addPrimOps()
    addPrimOp("__substring", 3, prim_substring);
    addPrimOp("__stringLength", 1, prim_stringLength);
    addPrimOp("__unsafeDiscardStringContext", 1, prim_unsafeDiscardStringContext);
-    addPrimOp("__unsafeDiscardOutputDependency", 1, prim_unsafeDiscardOutputDependency);

    // Versions
    addPrimOp("__parseDrvName", 1, prim_parseDrvName);
--- a/src/libstore/Makefile.am
+++ b/src/libstore/Makefile.am
@@ -10,7 +10,7 @@ pkginclude_HEADERS = \
  globals.hh db.hh references.hh pathlocks.hh \
  worker-protocol.hh

-libstore_la_LIBADD = ../libutil/libutil.la ../boost/format/libformat.la @ADDITIONAL_NETWORK_LIBS@
+libstore_la_LIBADD = ../libutil/libutil.la ../boost/format/libformat.la

 BUILT_SOURCES = derivations-ast.cc derivations-ast.hh

--- a/src/libstore/build.cc
+++ b/src/libstore/build.cc
@@ -4,7 +4,6 @@
 #include "globals.hh"
 #include "local-store.hh"
 #include "util.hh"
-#include "archive.hh"

 #include <map>
 #include <iostream>
@@ -16,13 +15,11 @@

 #include <time.h>
 #include <sys/time.h>
-#include <sys/wait.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <unistd.h>
 #include <errno.h>
-#include <stdio.h>

 #include <pwd.h>
 #include <grp.h>
@@ -469,8 +466,6 @@ void UserLock::acquire()
        if (!pw)
            throw Error(format("the user `%1%' in the group `%2%' does not exist")
                % *i % buildUsersGroup);
-
-        createDirs(nixStateDir + "/userpool");
        
        fnUserLock = (format("%1%/userpool/%2%") % nixStateDir % pw->pw_uid).str();

@@ -1605,18 +1600,8 @@ void DerivationGoal::startBuilder()
                dirsInChroot.insert(*i);
            else {
                Path p = chrootRootDir + *i;
-                if (link(i->c_str(), p.c_str()) == -1) {
-                    /* Hard-linking fails if we exceed the maximum
-                       link count on a file (e.g. 32000 of ext3),
-                       which is quite possible after a `nix-store
-                       --optimise'.  Make a copy instead. */
-                    if (errno != EMLINK)
-                        throw SysError(format("linking `%1%' to `%2%'") % p % *i);
-                    StringSink sink;
-                    dumpPath(*i, sink);
-                    StringSource source(sink.s);
-                    restorePath(p, source);
-                }
+                if (link(i->c_str(), p.c_str()) == -1)
+                    throw SysError(format("linking `%1%' to `%2%'") % p % *i);
            }
        }
        
--- a/src/libstore/globals.cc
+++ b/src/libstore/globals.cc
@@ -13,6 +13,7 @@ string nixDataDir = "/UNINIT";
 string nixLogDir = "/UNINIT";
 string nixStateDir = "/UNINIT";
 string nixDBPath = "/UNINIT";
+string nixCacheFile = "/UNINIT";
 string nixConfDir = "/UNINIT";
 string nixLibexecDir = "/UNINIT";
 string nixBinDir = "/UNINIT";
--- a/src/libstore/globals.hh
+++ b/src/libstore/globals.hh
@@ -24,6 +24,9 @@ extern string nixStateDir;
 /* nixDBPath is the path name of our Berkeley DB environment. */
 extern string nixDBPath;

+/* nixCacheFile is the path name of the normal form cache. */
+extern string nixCacheFile;
+
 /* nixConfDir is the directory where configuration files are
   stored. */
 extern string nixConfDir;
--- a/src/libstore/local-store.cc
+++ b/src/libstore/local-store.cc
@@ -16,7 +16,6 @@
 #include <utime.h>
 #include <fcntl.h>
 #include <errno.h>
-#include <stdio.h>


 namespace nix {
@@ -48,21 +47,8 @@ LocalStore::LocalStore()
    
    if (readOnlyMode) return;

-    /* Create missing state directories if they don't already exist. */
    createDirs(nixStore);
-    createDirs(nixDBPath + "/info");
-    createDirs(nixDBPath + "/referrer");
-    createDirs(nixDBPath + "/failed");
-    Path profilesDir = nixStateDir + "/profiles";
-    createDirs(nixStateDir + "/profiles");
-    createDirs(nixStateDir + "/temproots");
-    Path gcRootsDir = nixStateDir + "/gcroots";
-    if (!pathExists(gcRootsDir)) {
-        createDirs(gcRootsDir);
-        if (symlink(profilesDir.c_str(), (gcRootsDir + "/profiles").c_str()) == -1)
-            throw SysError(format("creating symlink to `%1%'") % profilesDir);
-    }
-  
+    
    checkStoreNotSymlink();

    try {
@@ -78,7 +64,11 @@ LocalStore::LocalStore()
        printMsg(lvlError, "waiting for the big Nix store lock...");
        lockFile(globalLock, ltRead, true);
    }
-    
+
+    createDirs(nixDBPath + "/info");
+    createDirs(nixDBPath + "/referrer");
+    createDirs(nixDBPath + "/failed");
+
    int curSchema = getSchema();
    if (curSchema > nixSchemaVersion)
        throw Error(format("current Nix store schema is version %1%, but I only support %2%")
@@ -519,13 +509,6 @@ void LocalStore::startSubstituter(const Path & substituter, RunningSubstituter &

    case 0: /* child */
        try {
-            /* Hack to let "make check" succeed on Darwin.  The
-               libtool wrapper script sets DYLD_LIBRARY_PATH to our
-               libutil (among others), but Perl also depends on a
-               library named libutil.  As a result, substituters
-               written in Perl (i.e. all of them) fail. */
-            unsetenv("DYLD_LIBRARY_PATH");
-            
            fromPipe.readSide.close();
            toPipe.writeSide.close();
            if (dup2(toPipe.readSide, STDIN_FILENO) == -1)
--- a/src/libstore/local-store.hh
+++ b/src/libstore/local-store.hh
@@ -185,6 +185,9 @@ private:
 };


+/* Copy a path recursively. */
+void copyPath(const Path & src, const Path & dst);
+
 /* "Fix", or canonicalise, the meta-data of the files in a store path
   after it has been built.  In particular:
   - the last modification date on each file is set to 1 (i.e.,
--- a/src/libstore/optimise-store.cc
+++ b/src/libstore/optimise-store.cc
@@ -5,7 +5,6 @@
 #include <sys/stat.h>
 #include <unistd.h>
 #include <errno.h>
-#include <stdio.h>


 namespace nix {
--- a/src/libutil/archive.cc
+++ b/src/libutil/archive.cc
@@ -302,12 +302,7 @@ struct RestoreSink : ParseSink
 #if HAVE_POSIX_FALLOCATE
        if (len) {
            errno = posix_fallocate(fd, 0, len);
-            /* Note that EINVAL may indicate that the underlying
-               filesystem doesn't support preallocation (e.g. on
-               OpenSolaris).  Since preallocation is just an
-               optimisation, ignore it. */
-            if (errno && errno != EINVAL)
-                throw SysError(format("preallocating file of %1% bytes") % len);
+            if (errno) throw SysError(format("preallocating file of %1% bytes") % len);
        }
 #endif
    }
--- a/src/libutil/aterm-map.cc
+++ b/src/libutil/aterm-map.cc
@@ -215,7 +215,7 @@ void ATermMap::remove(ATerm key)
 }


-unsigned int ATermMap::size()
+unsigned int ATermMap::size() const
 {
    return count; /* STL nomenclature */
 }
--- a/src/libutil/aterm-map.hh
+++ b/src/libutil/aterm-map.hh
@@ -59,7 +59,7 @@ public:

    void remove(ATerm key);

-    unsigned int size();
+    unsigned int size() const;

    struct const_iterator
    {
--- a/src/libutil/serialise.cc
+++ b/src/libutil/serialise.cc
@@ -1,9 +1,9 @@
 #include "serialise.hh"
 #include "util.hh"
+#include "aterm.hh"

 #include <cstring>

-
 namespace nix {


@@ -73,6 +73,67 @@ void writeStringSet(const StringSet & ss, Sink & sink)
 }


+void writeATerm(ATerm t, Sink & sink)
+{
+    int len;
+    unsigned char *buf = (unsigned char *) ATwriteToBinaryString(t, &len);
+    AutoDeleteArray<unsigned char> d(buf);
+    writeInt(len, sink);
+    sink(buf, len);
+}
+
+
+/* convert the ATermMap to a list of couple because many terms are shared
+   between the keys and between the values.  Thus the BAF stored by
+   writeATerm consume less memory space.  The list of couples is saved
+   inside a tree structure of /treedepth/ height because the serialiasation
+   of ATerm cause a tail recurssion on list tails. */
+void writeATermMap(const ATermMap & tm, Sink & sink)
+{
+    const unsigned int treedepth = 5;
+    const unsigned int maxarity = 128; // 2 < maxarity < MAX_ARITY (= 255)
+    const unsigned int bufsize = treedepth * maxarity;
+
+    AFun map = ATmakeAFun("map", 2, ATfalse);
+    AFun node = ATmakeAFun("node", maxarity, ATfalse);
+    ATerm empty = (ATerm) ATmakeAppl0(ATmakeAFun("empty", 0, ATfalse));
+
+    unsigned int c[treedepth];
+    ATerm *buf = new ATerm[bufsize];
+    AutoDeleteArray<ATerm> d(buf);
+
+    memset(buf, 0, bufsize * sizeof(ATerm));
+    ATprotectArray(buf, bufsize);
+
+    for (unsigned int j = 0; j < treedepth; j++)
+        c[j] = 0;
+
+    for (ATermMap::const_iterator i = tm.begin(); i != tm.end(); ++i) {
+         unsigned int depth = treedepth - 1;
+         ATerm term = (ATerm) ATmakeAppl2(map, i->key, i->value);
+         buf[depth * maxarity + c[depth]++] = term;
+         while (c[depth] % maxarity == 0) {
+             c[depth] = 0;
+             term = (ATerm) ATmakeApplArray(node, &buf[depth * maxarity]);
+             depth--;
+             buf[depth * maxarity + c[depth]++] = term;
+         }
+    }
+
+    unsigned int depth = treedepth;
+    ATerm last_node = empty;
+    while (depth--) {
+        buf[depth * maxarity + c[depth]++] = last_node;
+        while (c[depth] % maxarity)
+            buf[depth * maxarity + c[depth]++] = empty;
+        last_node = (ATerm) ATmakeApplArray(node, &buf[depth * maxarity]);
+    }
+
+    writeATerm(last_node, sink);
+    ATunprotectArray(buf);
+}
+
+
 void readPadding(unsigned int len, Source & source)
 {
    if (len % 8) {
@@ -136,4 +197,48 @@ StringSet readStringSet(Source & source)
 }


+ATerm readATerm(Source & source)
+{
+    unsigned int len = readInt(source);
+    unsigned char * buf = new unsigned char[len];
+    AutoDeleteArray<unsigned char> d(buf);
+    source(buf, len);
+    ATerm t = ATreadFromBinaryString((char *) buf, len);
+    if (t == 0)
+        throw SerialisationError("cannot read a valid ATerm.");
+    return t;
+}
+
+
+static void recursiveInitATermMap(ATermMap &tm, bool &stop, ATermAppl node)
+{
+    const unsigned int arity = ATgetArity(ATgetAFun(node));
+    ATerm key, value;
+
+    switch (arity) {
+        case 0:
+            stop = true;
+            return;
+        case 2:
+            key = ATgetArgument(node, 0);
+            value = ATgetArgument(node, 1);
+            tm.set(key, value);
+            return;
+        default:
+            for (unsigned int i = 0; i < arity && !stop; i++)
+              recursiveInitATermMap(tm, stop, (ATermAppl) ATgetArgument(node, i));
+            return;
+    }
+}
+
+ATermMap readATermMap(Source & source)
+{
+    ATermMap tm;
+    bool stop = false;
+
+    recursiveInitATermMap(tm, stop, (ATermAppl) readATerm(source));
+    return tm;
+}
+
+
 }
--- a/src/libutil/serialise.hh
+++ b/src/libutil/serialise.hh
@@ -2,7 +2,7 @@
 #define __SERIALISE_H

 #include "types.hh"
-
+#include "aterm-map.hh"

 namespace nix {

@@ -98,12 +98,16 @@ void writeInt(unsigned int n, Sink & sink);
 void writeLongLong(unsigned long long n, Sink & sink);
 void writeString(const string & s, Sink & sink);
 void writeStringSet(const StringSet & ss, Sink & sink);
+void writeATerm(ATerm t, Sink & sink);
+void writeATermMap(const ATermMap & tm, Sink & sink);

 void readPadding(unsigned int len, Source & source);
 unsigned int readInt(Source & source);
 unsigned long long readLongLong(Source & source);
 string readString(Source & source);
 StringSet readStringSet(Source & source);
+ATerm readATerm(Source & source);
+ATermMap readATermMap(Source & source);


 MakeError(SerialisationError, Error)
--- a/src/nix-env/Makefile.am
+++ b/src/nix-env/Makefile.am
@@ -3,7 +3,7 @@ bin_PROGRAMS = nix-env
 nix_env_SOURCES = nix-env.cc profiles.cc profiles.hh help.txt
 nix_env_LDADD = ../libmain/libmain.la ../libexpr/libexpr.la \
 ../libstore/libstore.la ../libutil/libutil.la \
- ../boost/format/libformat.la ${bdb_lib} ${aterm_lib} @ADDITIONAL_NETWORK_LIBS@
+ ../boost/format/libformat.la ${bdb_lib} ${aterm_lib}

 nix-env.o: help.txt.hh

--- a/src/nix-env/nix-env.cc
+++ b/src/nix-env/nix-env.cc
@@ -704,59 +704,52 @@ static void upgradeDerivations(Globals & globals,
        foreach (DrvInfos::iterator, i, installedElems) {
            DrvName drvName(i->name);

-            try {
+            MetaInfo meta = i->queryMetaInfo(globals.state);
+            if (keep(meta)) {
+                newElems.push_back(*i);
+                continue;
+            }

-                MetaInfo meta = i->queryMetaInfo(globals.state);
-                if (keep(meta)) {
-                    newElems.push_back(*i);
-                    continue;
-                }
-
-                /* Find the derivation in the input Nix expression
-                   with the same name that satisfies the version
-                   constraints specified by upgradeType.  If there are
-                   multiple matches, take the one with the highest
-                   priority.  If there are still multiple matches,
-                   take the one with the highest version. */
-                DrvInfos::iterator bestElem = availElems.end();
-                DrvName bestName;
-                foreach (DrvInfos::iterator, j, availElems) {
-                    DrvName newName(j->name);
-                    if (newName.name == drvName.name) {
-                        int d = comparePriorities(globals.state, *i, *j);
-                        if (d == 0) d = compareVersions(drvName.version, newName.version);
-                        if ((upgradeType == utLt && d < 0) ||
-                            (upgradeType == utLeq && d <= 0) ||
-                            (upgradeType == utEq && d == 0) ||
-                            upgradeType == utAlways)
-                        {
-                            int d2 = -1;
-                            if (bestElem != availElems.end()) {
-                                d2 = comparePriorities(globals.state, *bestElem, *j);
-                                if (d2 == 0) d2 = compareVersions(bestName.version, newName.version);
-                            }
-                            if (d2 < 0) {
-                                bestElem = j;
-                                bestName = newName;
-                            }
+            /* Find the derivation in the input Nix expression with
+               the same name that satisfies the version constraints
+               specified by upgradeType.  If there are multiple
+               matches, take the one with the highest priority.  If
+               there are still multiple matches, take the one with the
+               highest version. */
+            DrvInfos::iterator bestElem = availElems.end();
+            DrvName bestName;
+            foreach (DrvInfos::iterator, j, availElems) {
+                DrvName newName(j->name);
+                if (newName.name == drvName.name) {
+                    int d = comparePriorities(globals.state, *i, *j);
+                    if (d == 0) d = compareVersions(drvName.version, newName.version);
+                    if ((upgradeType == utLt && d < 0) ||
+                        (upgradeType == utLeq && d <= 0) ||
+                        (upgradeType == utEq && d == 0) ||
+                        upgradeType == utAlways)
+                    {
+                        int d2 = -1;
+                        if (bestElem != availElems.end()) {
+                            d2 = comparePriorities(globals.state, *bestElem, *j);
+                            if (d2 == 0) d2 = compareVersions(bestName.version, newName.version);
+                        }
+                        if (d2 < 0) {
+                            bestElem = j;
+                            bestName = newName;
                        }
                    }
                }
-                
-                if (bestElem != availElems.end() &&
-                    i->queryOutPath(globals.state) !=
-                    bestElem->queryOutPath(globals.state))
-                {
-                    printMsg(lvlInfo,
-                        format("upgrading `%1%' to `%2%'")
-                        % i->name % bestElem->name);
-                    newElems.push_back(*bestElem);
-                } else newElems.push_back(*i);
-
-            } catch (Error & e) {
-                e.addPrefix(format("while trying to find an upgrade for `%1%':\n") % i->name);
-                throw;
            }
+
+            if (bestElem != availElems.end() &&
+                i->queryOutPath(globals.state) !=
+                bestElem->queryOutPath(globals.state))
+            {
+                printMsg(lvlInfo,
+                    format("upgrading `%1%' to `%2%'")
+                    % i->name % bestElem->name);
+                newElems.push_back(*bestElem);
+            } else newElems.push_back(*i);
        }
    
        printMissing(globals.state, newElems);
--- a/src/nix-hash/Makefile.am
+++ b/src/nix-hash/Makefile.am
@@ -2,7 +2,7 @@ bin_PROGRAMS = nix-hash

 nix_hash_SOURCES = nix-hash.cc help.txt
 nix_hash_LDADD = ../libmain/libmain.la ../libstore/libstore.la ../libutil/libutil.la \
- ../boost/format/libformat.la ${bdb_lib} ${aterm_lib} @ADDITIONAL_NETWORK_LIBS@
+ ../boost/format/libformat.la ${bdb_lib} ${aterm_lib}

 nix-hash.o: help.txt.hh

--- a/src/nix-instantiate/Makefile.am
+++ b/src/nix-instantiate/Makefile.am
@@ -3,7 +3,7 @@ bin_PROGRAMS = nix-instantiate
 nix_instantiate_SOURCES = nix-instantiate.cc help.txt
 nix_instantiate_LDADD = ../libmain/libmain.la ../libexpr/libexpr.la \
 ../libstore/libstore.la ../libutil/libutil.la \
- ../boost/format/libformat.la ${bdb_lib} ${aterm_lib} @ADDITIONAL_NETWORK_LIBS@
+ ../boost/format/libformat.la ${bdb_lib} ${aterm_lib}

 nix-instantiate.o: help.txt.hh

--- a/src/nix-store/Makefile.am
+++ b/src/nix-store/Makefile.am
@@ -2,7 +2,7 @@ bin_PROGRAMS = nix-store

 nix_store_SOURCES = nix-store.cc dotgraph.cc dotgraph.hh help.txt
 nix_store_LDADD = ../libmain/libmain.la ../libstore/libstore.la ../libutil/libutil.la \
- ../boost/format/libformat.la ${bdb_lib} ${aterm_lib} @ADDITIONAL_NETWORK_LIBS@
+ ../boost/format/libformat.la ${bdb_lib} ${aterm_lib}

 nix-store.o: help.txt.hh

--- a/src/nix-worker/Makefile.am
+++ b/src/nix-worker/Makefile.am
@@ -2,7 +2,7 @@ bin_PROGRAMS = nix-worker

 nix_worker_SOURCES = nix-worker.cc help.txt
 nix_worker_LDADD = ../libmain/libmain.la ../libstore/libstore.la ../libutil/libutil.la \
- ../boost/format/libformat.la ${bdb_lib} ${aterm_lib} @ADDITIONAL_NETWORK_LIBS@
+ ../boost/format/libformat.la ${bdb_lib} ${aterm_lib}

 nix-worker.o: help.txt.hh

--- a/src/nix-worker/nix-worker.cc
+++ b/src/nix-worker/nix-worker.cc
@@ -20,18 +20,9 @@
 using namespace nix;


-/* On platforms that have O_ASYNC, we can detect when a client
-   disconnects and immediately kill any ongoing builds.  On platforms
-   that lack it, we only notice the disconnection the next time we try
-   to write to the client.  So if you have a builder that never
-   generates output on stdout/stderr, the worker will never notice
-   that the client has disconnected until the builder terminates. */
-#ifdef O_ASYNC
-#define HAVE_HUP_NOTIFICATION
 #ifndef SIGPOLL
 #define SIGPOLL SIGIO
 #endif
-#endif


 static FdSource from(STDIN_FILENO);
@@ -99,7 +90,7 @@ static bool isFarSideClosed(int socket)


 /* A SIGPOLL signal is received when data is available on the client
-   communication socket, or when the client has closed its side of the
+   communication scoket, or when the client has closed its side of the
   socket.  This handler is enabled at precisely those moments in the
   protocol when we're doing work and the client is supposed to be
   quiet.  Thus, if we get a SIGPOLL signal, it means that the client
@@ -140,14 +131,12 @@ static void sigPollHandler(int sigNo)

 static void setSigPollAction(bool enable)
 {
-#ifdef HAVE_HUP_NOTIFICATION
    struct sigaction act, oact;
    act.sa_handler = enable ? sigPollHandler : SIG_IGN;
    sigfillset(&act.sa_mask);
    act.sa_flags = 0;
    if (sigaction(SIGPOLL, &act, &oact))
        throw SysError("setting handler for SIGPOLL");
-#endif
 }


@@ -531,14 +520,12 @@ static void processConnection()
    myPid = getpid();    
    writeToStderr = tunnelStderr;

-#ifdef HAVE_HUP_NOTIFICATION
    /* Allow us to receive SIGPOLL for events on the client socket. */
    setSigPollAction(false);
    if (fcntl(from.fd, F_SETOWN, getpid()) == -1)
        throw SysError("F_SETOWN");
-    if (fcntl(from.fd, F_SETFL, fcntl(from.fd, F_GETFL, 0) | O_ASYNC) == -1)
+    if (fcntl(from.fd, F_SETFL, fcntl(from.fd, F_GETFL, 0) | FASYNC) == -1)
        throw SysError("F_SETFL");
-#endif

    /* Exchange the greeting. */
    unsigned int magic = readInt(from);
@@ -676,12 +663,11 @@ static void daemonLoop()
            AutoCloseFD remote = accept(fdSocket,
                (struct sockaddr *) &remoteAddr, &remoteAddrLen);
            checkInterrupt();
-            if (remote == -1) {
+            if (remote == -1)
 		if (errno == EINTR)
 		    continue;
 		else
 		    throw SysError("accepting connection");
-            }

            printMsg(lvlInfo, format("accepted connection %1%") % remote);

--- a/tests/lang/eval-okay-functionargs.exp.xml
+++ b/tests/lang/eval-okay-functionargs.exp.xml
@@ -1,15 +0,0 @@
-<?xml version='1.0' encoding='utf-8'?>
-<expr>
-  <list>
-    <string value="stdenv" />
-    <string value="fetchurl" />
-    <string value="aterm-stdenv" />
-    <string value="aterm-stdenv2" />
-    <string value="libX11" />
-    <string value="libXv" />
-    <string value="mplayer-stdenv2.libXv-libX11" />
-    <string value="mplayer-stdenv2.libXv-libX11_2" />
-    <string value="nix-stdenv-aterm-stdenv" />
-    <string value="nix-stdenv2-aterm2-stdenv2" />
-  </list>
-</expr>
--- a/tests/lang/eval-okay-functionargs.nix
+++ b/tests/lang/eval-okay-functionargs.nix
@@ -1,80 +0,0 @@
-let
-
-  stdenvFun = { }: { name = "stdenv"; };
-  stdenv2Fun = { }: { name = "stdenv2"; };
-  fetchurlFun = { stdenv }: assert stdenv.name == "stdenv"; { name = "fetchurl"; };
-  atermFun = { stdenv, fetchurl }: { name = "aterm-${stdenv.name}"; };
-  aterm2Fun = { stdenv, fetchurl }: { name = "aterm2-${stdenv.name}"; };
-  nixFun = { stdenv, fetchurl, aterm }: { name = "nix-${stdenv.name}-${aterm.name}"; };
-  
-  mplayerFun =
-    { stdenv, fetchurl, enableX11 ? false, xorg ? null, enableFoo ? true, foo ? null  }:
-    assert stdenv.name == "stdenv2";
-    assert enableX11 -> xorg.libXv.name == "libXv";
-    assert enableFoo -> foo != null;
-    { name = "mplayer-${stdenv.name}.${xorg.libXv.name}-${xorg.libX11.name}"; };
-
-  makeOverridable = f: origArgs: f origArgs //
-    { override = newArgs:
-        makeOverridable f (origArgs // (if builtins.isFunction newArgs then newArgs origArgs else newArgs));
-    };
-    
-  callPackage_ = pkgs: f: args:
-    makeOverridable f ((builtins.intersectAttrs (builtins.functionArgs f) pkgs) // args);
-
-  allPackages =
-    { overrides ? (pkgs: pkgsPrev: { }) }:
-    let
-      callPackage = callPackage_ pkgs;
-      pkgs = pkgsStd // (overrides pkgs pkgsStd);
-      pkgsStd = {
-        inherit pkgs;
-        stdenv = callPackage stdenvFun { };
-        stdenv2 = callPackage stdenv2Fun { };
-        fetchurl = callPackage fetchurlFun { };
-        aterm = callPackage atermFun { };
-        xorg = callPackage xorgFun { };
-        mplayer = callPackage mplayerFun { stdenv = pkgs.stdenv2; enableFoo = false; };
-        nix = callPackage nixFun { };
-      };
-    in pkgs;
-
-  libX11Fun = { stdenv, fetchurl }: { name = "libX11"; };
-  libX11_2Fun = { stdenv, fetchurl }: { name = "libX11_2"; };
-  libXvFun = { stdenv, fetchurl, libX11 }: { name = "libXv"; };
-  
-  xorgFun =
-    { pkgs }:
-    let callPackage = callPackage_ (pkgs // pkgs.xorg); in
-    {
-      libX11 = callPackage libX11Fun { };
-      libXv = callPackage libXvFun { };
-    };
-
-in
-
-let
-
-  pkgs = allPackages { };
-  
-  pkgs2 = allPackages {
-    overrides = pkgs: pkgsPrev: {
-      stdenv = pkgs.stdenv2;
-      nix = pkgsPrev.nix.override { aterm = aterm2Fun { inherit (pkgs) stdenv fetchurl; }; };
-      xorg = pkgsPrev.xorg // { libX11 = libX11_2Fun { inherit (pkgs) stdenv fetchurl; }; };
-    };
-  };
-  
-in
-
-  [ pkgs.stdenv.name
-    pkgs.fetchurl.name
-    pkgs.aterm.name
-    pkgs2.aterm.name
-    pkgs.xorg.libX11.name
-    pkgs.xorg.libXv.name
-    pkgs.mplayer.name
-    pkgs2.mplayer.name
-    pkgs.nix.name
-    pkgs2.nix.name
-  ]
Author	SHA1	Message	Date
Nicolas Pierron	6468f63994	Fix typo.	2009-07-08 09:44:22 +00:00
Nicolas Pierron	9416202465	Add a way to cache result for future evaluations.	2009-07-08 09:27:35 +00:00
Nicolas Pierron	4941ba3413	Add a session independent cache.	2009-07-08 09:26:15 +00:00
Nicolas Pierron	7244b9b861	Create a cache of reduce operations which are session independent.	2009-07-08 09:18:26 +00:00