branch master updated (2c7ee16 -> 9ac97e8)

[Ludovic Courtès]

civodul pushed a change to branch master
in repository guix.

      from  2c7ee16   gnu: Add bowtie
       new  3645756   Merge branch 'nix' into 'master'.
       new  9ac97e8   Remove 'nix-upstream' submodule.

The 2 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:
 .gitmodules                               |    3 -
 bootstrap                                 |   12 +-
 nix/AUTHORS                               |    2 +
 nix/COPYING                               |  504 +++++
 nix/boost/assert.hpp                      |   38 +
 nix/boost/format.hpp                      |   64 +
 nix/boost/format/exceptions.hpp           |   96 +
 nix/boost/format/feed_args.hpp            |  247 +++
 nix/boost/format/format_class.hpp         |  135 ++
 nix/boost/format/format_fwd.hpp           |   49 +
 nix/boost/format/format_implementation.cc |  256 +++
 nix/boost/format/free_funcs.cc            |   71 +
 nix/boost/format/group.hpp                |  680 ++++++
 nix/boost/format/internals.hpp            |  167 ++
 nix/boost/format/internals_fwd.hpp        |   65 +
 nix/boost/format/macros_default.hpp       |   48 +
 nix/boost/format/parsing.cc               |  454 ++++
 nix/boost/throw_exception.hpp             |   47 +
 nix/libstore/build.cc                     | 3351 +++++++++++++++++++++++++++++
 nix/libstore/derivations.cc               |  278 +++
 nix/libstore/derivations.hh               |   93 +
 nix/libstore/gc.cc                        |  748 +++++++
 nix/libstore/globals.cc                   |  240 ++
 nix/libstore/globals.hh                   |  218 ++
 nix/libstore/local-store.cc               | 2010 +++++++++++++++++
 nix/libstore/local-store.hh               |  333 +++
 nix/libstore/misc.cc                      |  220 ++
 nix/libstore/misc.hh                      |   38 +
 nix/libstore/optimise-store.cc            |  180 ++
 nix/libstore/pathlocks.cc                 |  199 ++
 nix/libstore/pathlocks.hh                 |   45 +
 nix/libstore/references.cc                |  122 ++
 nix/libstore/references.hh                |   11 +
 nix/libstore/remote-store.cc              |  602 ++++++
 nix/libstore/remote-store.hh              |  104 +
 nix/libstore/schema.sql                   |   44 +
 nix/libstore/store-api.cc                 |  331 +++
 nix/libstore/store-api.hh                 |  366 ++++
 nix/libstore/worker-protocol.hh           |   60 +
 nix/libutil/affinity.cc                   |   55 +
 nix/libutil/affinity.hh                   |    9 +
 nix/libutil/archive.cc                    |  335 +++
 nix/libutil/archive.hh                    |   75 +
 nix/libutil/hash.cc                       |  382 ++++
 nix/libutil/hash.hh                       |  113 +
 nix/libutil/serialise.cc                  |  259 +++
 nix/libutil/serialise.hh                  |  133 ++
 nix/libutil/types.hh                      |   86 +
 nix/libutil/util.cc                       | 1105 ++++++++++
 nix/libutil/util.hh                       |  349 +++
 nix/libutil/xml-writer.cc                 |   94 +
 nix/libutil/xml-writer.hh                 |   69 +
 nix/nix-daemon/nix-daemon.cc              |  939 ++++++++
 nix/sync-with-upstream                    |   89 -
 54 files changed, 16520 insertions(+), 103 deletions(-)
 delete mode 100644 .gitmodules
 create mode 100644 nix/AUTHORS
 create mode 100644 nix/COPYING
 create mode 100644 nix/boost/assert.hpp
 create mode 100644 nix/boost/format.hpp
 create mode 100644 nix/boost/format/exceptions.hpp
 create mode 100644 nix/boost/format/feed_args.hpp
 create mode 100644 nix/boost/format/format_class.hpp
 create mode 100644 nix/boost/format/format_fwd.hpp
 create mode 100644 nix/boost/format/format_implementation.cc
 create mode 100644 nix/boost/format/free_funcs.cc
 create mode 100644 nix/boost/format/group.hpp
 create mode 100644 nix/boost/format/internals.hpp
 create mode 100644 nix/boost/format/internals_fwd.hpp
 create mode 100644 nix/boost/format/macros_default.hpp
 create mode 100644 nix/boost/format/parsing.cc
 create mode 100644 nix/boost/throw_exception.hpp
 create mode 100644 nix/libstore/build.cc
 create mode 100644 nix/libstore/derivations.cc
 create mode 100644 nix/libstore/derivations.hh
 create mode 100644 nix/libstore/gc.cc
 create mode 100644 nix/libstore/globals.cc
 create mode 100644 nix/libstore/globals.hh
 create mode 100644 nix/libstore/local-store.cc
 create mode 100644 nix/libstore/local-store.hh
 create mode 100644 nix/libstore/misc.cc
 create mode 100644 nix/libstore/misc.hh
 create mode 100644 nix/libstore/optimise-store.cc
 create mode 100644 nix/libstore/pathlocks.cc
 create mode 100644 nix/libstore/pathlocks.hh
 create mode 100644 nix/libstore/references.cc
 create mode 100644 nix/libstore/references.hh
 create mode 100644 nix/libstore/remote-store.cc
 create mode 100644 nix/libstore/remote-store.hh
 create mode 100644 nix/libstore/schema.sql
 create mode 100644 nix/libstore/store-api.cc
 create mode 100644 nix/libstore/store-api.hh
 create mode 100644 nix/libstore/worker-protocol.hh
 create mode 100644 nix/libutil/affinity.cc
 create mode 100644 nix/libutil/affinity.hh
 create mode 100644 nix/libutil/archive.cc
 create mode 100644 nix/libutil/archive.hh
 create mode 100644 nix/libutil/hash.cc
 create mode 100644 nix/libutil/hash.hh
 create mode 100644 nix/libutil/serialise.cc
 create mode 100644 nix/libutil/serialise.hh
 create mode 100644 nix/libutil/types.hh
 create mode 100644 nix/libutil/util.cc
 create mode 100644 nix/libutil/util.hh
 create mode 100644 nix/libutil/xml-writer.cc
 create mode 100644 nix/libutil/xml-writer.hh
 create mode 100644 nix/nix-daemon/nix-daemon.cc
 delete mode 100755 nix/sync-with-upstream