branch master updated (558e8b1 -> fb393cd)

[Ludovic Courtès]

civodul pushed a change to branch master
in repository guix.

      from  558e8b1   gexp: Add 'plain-file'.
       new  366801a   build: Bump version number.
       new  54c260e   Merge branch 'nix'.
       new  fb393cd   doc: Build guix-daemon man page.

The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "adds" were already present in the repository and have only
been added to this reference.


Summary of changes:
 config-daemon.ac                |    2 +-
 configure.ac                    |    2 +-
 doc.am                          |    5 +
 nix/libstore/build.cc           |  171 ++++++++++++++++++++-------------------
 nix/libstore/gc.cc              |    6 +-
 nix/libstore/local-store.cc     |   31 ++++---
 nix/libstore/local-store.hh     |    2 +-
 nix/libstore/optimise-store.cc  |    1 +
 nix/libstore/pathlocks.cc       |    2 +-
 nix/libstore/remote-store.cc    |   17 +++-
 nix/libstore/remote-store.hh    |   29 ++++---
 nix/libstore/store-api.hh       |   24 +++---
 nix/libstore/worker-protocol.hh |    3 +-
 nix/libutil/hash.cc             |  101 +++++++-----------------
 nix/libutil/util.cc             |   62 +++++++++-----
 nix/libutil/util.hh             |    6 ++
 nix/nix-daemon/nix-daemon.cc    |   34 ++++++--
 17 files changed, 262 insertions(+), 236 deletions(-)