branch master updated (6bb5f88 -> 7c4700e)

[guix-commits]

civodul pushed a change to branch master
in repository guix.

      from  6bb5f88   gnu: Add guile-picture-language.
       new  f73ab81   doc: Show how to install Emacs, Guile, and Geiser.
       new  a87d66f   daemon: Rename 'NIX_STATE_DIR' and 'NIX_DB_DIR' 
environment variables.
       new  765a5bf   self: Ensure the daemon refers to the right 'guix' 
command.
       new  65d13e3   daemon: Remove unused 'NIX_DATA_DIR' environment variable.
       new  7c4700e   store: 'log-file' honors 'GUIX_LOG_DIRECTORY'.

The 5 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:
 build-aux/build-self.scm            |  4 ++--
 build-aux/test-env.in               | 22 +++++++++++-----------
 doc/contributing.texi               |  6 +++++-
 gnu/packages/package-management.scm |  2 +-
 guix/config.scm.in                  |  6 +++---
 guix/self.scm                       | 18 ++++++++++++++----
 guix/store.scm                      |  5 +++--
 nix/libstore/globals.cc             |  7 +++----
 nix/libstore/globals.hh             |  2 --
 nix/local.mk                        |  3 +--
 tests/derivations.scm               | 15 ++++++++-------
 tests/guix-build.sh                 |  4 ++--
 tests/guix-daemon.sh                |  2 +-
 13 files changed, 54 insertions(+), 42 deletions(-)