Merge branch 'nix' into 'master'.
authorLudovic Courtès <ludo@gnu.org>
Wed, 17 Dec 2014 22:00:42 +0000 (23:00 +0100)
committerLudovic Courtès <ludo@gnu.org>
Fri, 19 Dec 2014 21:47:37 +0000 (22:47 +0100)
commit36457566f9917dc7c0c348d012816a2ca333ef1b
tree6f1d22a195ea2483b9ce539227d65e8e2a9c137d
parent2c7ee1672029aa43afb509af5b5f7261244fa2d1
Merge branch 'nix' into 'master'.
51 files changed:
nix/AUTHORS [new file with mode: 0644]
nix/COPYING [new file with mode: 0644]
nix/boost/assert.hpp [new file with mode: 0644]
nix/boost/format.hpp [new file with mode: 0644]
nix/boost/format/exceptions.hpp [new file with mode: 0644]
nix/boost/format/feed_args.hpp [new file with mode: 0644]
nix/boost/format/format_class.hpp [new file with mode: 0644]
nix/boost/format/format_fwd.hpp [new file with mode: 0644]
nix/boost/format/format_implementation.cc [new file with mode: 0644]
nix/boost/format/free_funcs.cc [new file with mode: 0644]
nix/boost/format/group.hpp [new file with mode: 0644]
nix/boost/format/internals.hpp [new file with mode: 0644]
nix/boost/format/internals_fwd.hpp [new file with mode: 0644]
nix/boost/format/macros_default.hpp [new file with mode: 0644]
nix/boost/format/parsing.cc [new file with mode: 0644]
nix/boost/throw_exception.hpp [new file with mode: 0644]
nix/libstore/build.cc [new file with mode: 0644]
nix/libstore/derivations.cc [new file with mode: 0644]
nix/libstore/derivations.hh [new file with mode: 0644]
nix/libstore/gc.cc [new file with mode: 0644]
nix/libstore/globals.cc [new file with mode: 0644]
nix/libstore/globals.hh [new file with mode: 0644]
nix/libstore/local-store.cc [new file with mode: 0644]
nix/libstore/local-store.hh [new file with mode: 0644]
nix/libstore/misc.cc [new file with mode: 0644]
nix/libstore/misc.hh [new file with mode: 0644]
nix/libstore/optimise-store.cc [new file with mode: 0644]
nix/libstore/pathlocks.cc [new file with mode: 0644]
nix/libstore/pathlocks.hh [new file with mode: 0644]
nix/libstore/references.cc [new file with mode: 0644]
nix/libstore/references.hh [new file with mode: 0644]
nix/libstore/remote-store.cc [new file with mode: 0644]
nix/libstore/remote-store.hh [new file with mode: 0644]
nix/libstore/schema.sql [new file with mode: 0644]
nix/libstore/store-api.cc [new file with mode: 0644]
nix/libstore/store-api.hh [new file with mode: 0644]
nix/libstore/worker-protocol.hh [new file with mode: 0644]
nix/libutil/affinity.cc [new file with mode: 0644]
nix/libutil/affinity.hh [new file with mode: 0644]
nix/libutil/archive.cc [new file with mode: 0644]
nix/libutil/archive.hh [new file with mode: 0644]
nix/libutil/hash.cc [new file with mode: 0644]
nix/libutil/hash.hh [new file with mode: 0644]
nix/libutil/serialise.cc [new file with mode: 0644]
nix/libutil/serialise.hh [new file with mode: 0644]
nix/libutil/types.hh [new file with mode: 0644]
nix/libutil/util.cc [new file with mode: 0644]
nix/libutil/util.hh [new file with mode: 0644]
nix/libutil/xml-writer.cc [new file with mode: 0644]
nix/libutil/xml-writer.hh [new file with mode: 0644]
nix/nix-daemon/nix-daemon.cc [new file with mode: 0644]