branch master updated (6b9839e -> f9e0488)

[guix-commits]

civodul pushed a change to branch master
in repository guix.

    from 6b9839e  gnu: Add emacs-metal-mercury-mode.
     new 6e36f1c  deprecation: Add a two-element form for simple aliases.
     new 9b65dea  gnu: Use the two-element 'define-deprecated' form where 
applicable.
     new 0de28f9  gnu: cmake@3.15.5: Apply "cmake-curl-certificates.patch".
     new 79154f0  gnu: cmake@3.15.5: Honor 'SSL_CERT_DIR' and 'SSL_CERT_FILE'.
     new 7033c76  daemon: Account for deleted store files when deduplication is 
on.
     new be0fb34  daemon: Fix the displayed GC estimated progress.
     new 58236d3  system: Drop net-tools from %BASE-PACKAGES (replaced by 
iproute2).
     new 4897038  gnu: entr: Fix references to external programs.
     new 3065bf8  gnu: timidity++: Add libvorbis as input
     new 20b49f4  gnu: Add libolm.
     new 30d83f4  doc: Update htmlxref.cnf.
     new f9e0488  doc: Make sure 'htmlxref.cnf' is honored.

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


Summary of changes:
 doc/build.scm           |  7 ++++++-
 doc/htmlxref.cnf        | 45 ++++++++++++++++++++++++++++-----------------
 gnu/packages/audio.scm  |  1 +
 gnu/packages/cmake.scm  | 39 ++++++++++++++++++++++++++-------------
 gnu/packages/crypto.scm | 29 ++++++++++++++++++++++++++++-
 gnu/packages/entr.scm   | 10 +++++++---
 gnu/packages/guile.scm  |  6 ++----
 gnu/packages/kde.scm    |  4 ++--
 gnu/packages/mpi.scm    |  3 +--
 gnu/packages/qt.scm     |  4 ++--
 gnu/system.scm          |  1 -
 guix/deprecation.scm    |  8 ++++++--
 nix/libstore/gc.cc      | 18 +++++++++++++-----
 nix/libutil/util.cc     | 10 +++++-----
 nix/libutil/util.hh     |  6 ++++--
 15 files changed, 131 insertions(+), 60 deletions(-)