Update 'nix-upstream' sub-module; adjust build system, doc, and substituter.

* nix-upstream: Update sub-module.
* daemon.am (libutil_a_SOURCES): Add affinity.cc.
  (libutil_headers): Add affinity.hh.
  (libexec_PROGRAMS, nix_setuid_helper_SOURCES,
  nix_setuid_helper_CPPFLAGS, nix_setuid_helper_LDADD): Remove.
* doc/guix.texi (Setting Up the Daemon): Remove paragraph about
  'nix-setuid-helper'.
* guix/scripts/substitute-binary.scm (guix-substitute-binary): Exit 0 when
  %CACHE-URL has an HTTP scheme and looking up its host fails.
  Always print a newline to stdout when starting.

1 files changed, 3 insertions, 11 deletions

diff --git a/daemon.am b/daemon.am
index 60bbaf73ede..f4700f0b071 100644
--- a/daemon.am
+++ b/daemon.am
@@ -1,5 +1,5 @@
 # GNU Guix --- Functional package management for GNU
-# Copyright © 2012, 2013 Ludovic Courtès <ludo@gnu.org>
+# Copyright © 2012, 2013, 2014 Ludovic Courtès <ludo@gnu.org>
 #
 # This file is part of GNU Guix.
 #
@@ -56,6 +56,7 @@ libformat_a_CPPFLAGS =				\
 
 libutil_a_SOURCES =                             \
   nix/libutil/archive.cc                        \
+  nix/libutil/affinity.cc                       \
   nix/libutil/serialise.cc                      \
   nix/libutil/util.cc                           \
   nix/libutil/xml-writer.cc                     \
@@ -63,6 +64,7 @@ libutil_a_SOURCES =				\
   nix/libutil/gcrypt-hash.cc
 
 libutil_headers =                               \
+  nix/libutil/affinity.hh                       \
   nix/libutil/hash.hh                           \
   nix/libutil/serialise.hh                      \
   nix/libutil/xml-writer.hh                     \
@@ -153,16 +155,6 @@ guix_register_LDADD =				\
   $(SQLITE3_LIBS) $(LIBGCRYPT_LIBS)
 
 
-libexec_PROGRAMS = nix-setuid-helper
-nix_setuid_helper_SOURCES =                     \
-  nix/nix-setuid-helper/nix-setuid-helper.cc
-
-nix_setuid_helper_CPPFLAGS =                    \
-  $(libutil_a_CPPFLAGS)
-
-nix_setuid_helper_LDADD =                       \
-  libutil.a libformat.a
-
 noinst_HEADERS =                                                \
   $(libformat_headers) $(libutil_headers) $(libstore_headers)   \
   $(guix_daemon_headers)