civodul pushed a commit to branch nix
in repository guix.
commit 766481d606e4b1860307692d6a44723983662d45
Merge: c69944c fdee1ce
Author: Ludovic Courtès <[email protected]>
Date: Mon May 11 17:04:26 2015 +0200
Merge commit 'fdee1ced43fb495d612a29e955141cdf6b9a95ba' into nix
nix/libstore/build.cc | 10 ++-
nix/libstore/globals.cc | 6 ++
nix/libstore/globals.hh | 9 ++
nix/libstore/local-store.cc | 4 +-
nix/libstore/remote-store.cc | 2 -
nix/libstore/remote-store.hh | 1 -
nix/libutil/archive.cc | 172 ++++++++++++++++++++++++------------------
nix/libutil/archive.hh | 12 ++-
nix/libutil/util.cc | 13 ++--
nix/nix-daemon/nix-daemon.cc | 58 ++++++++++++---
10 files changed, 184 insertions(+), 103 deletions(-)
