[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
05/07: doc: Mark zlib as mandatory, libbz2 as optional.
From: |
Ludovic Courtès |
Subject: |
05/07: doc: Mark zlib as mandatory, libbz2 as optional. |
Date: |
Sun, 7 Jan 2018 17:57:19 -0500 (EST) |
civodul pushed a commit to branch master
in repository guix.
commit 06e3a5181efa0ea83bb6608d3cbfba5caa56d7e9
Author: Ludovic Courtès <address@hidden>
Date: Fri Jan 5 17:56:10 2018 +0100
doc: Mark zlib as mandatory, libbz2 as optional.
* doc/guix.texi (Requirements): Move zlib to mandatory and libbz2 to
optional.
* README: Ditto.
---
README | 3 ++-
doc/guix.texi | 6 +++---
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/README b/README
index 4192eb4..d96a43b 100644
--- a/README
+++ b/README
@@ -25,13 +25,14 @@ GNU Guix currently depends on the following packages:
- [[https://www.gnu.org/software/make/][GNU Make]]
- [[https://www.gnutls.org][GnuTLS]] compiled with guile support enabled.
- [[https://gitlab.com/guile-git/guile-git][Guile-Git]]
+ - [[http://www.zlib.net/][zlib]]
- optionally
[[https://savannah.nongnu.org/projects/guile-json/][Guile-JSON]], for the 'guix
import pypi' command
Unless `--disable-daemon' was passed, the following packages are needed:
- [[https://sqlite.org/][SQLite 3]]
- - [[http://www.bzip.org][libbz2]]
- [[https://gcc.gnu.org][GCC's g++]]
+ - optionally [[http://www.bzip.org][libbz2]]
When `--disable-daemon' was passed, you instead need the following:
diff --git a/doc/guix.texi b/doc/guix.texi
index ca3f614..90d6f76 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -605,6 +605,7 @@ Guile,, gnutls-guile, GnuTLS-Guile});
@c FIXME: Specify a version number once a release has been made.
@uref{https://gitlab.com/guile-git/guile-git, Guile-Git}, from August
2017 or later;
address@hidden @url{http://zlib.net, zlib};
@item @url{http://www.gnu.org/software/make/, GNU Make}.
@end itemize
@@ -626,8 +627,8 @@ Support for build offloading (@pxref{Daemon Offload Setup})
and
version 0.10.2 or later.
@item
-When @url{http://zlib.net, zlib} is available, @command{guix publish}
-can compress build byproducts (@pxref{Invoking guix publish}).
+When @url{http://www.bzip.org, libbz2} is available,
address@hidden can use it to compress build logs.
@end itemize
Unless @code{--disable-daemon} was passed to @command{configure}, the
@@ -635,7 +636,6 @@ following packages are also needed:
@itemize
@item @url{http://sqlite.org, SQLite 3};
address@hidden @url{http://www.bzip.org, libbz2};
@item @url{http://gcc.gnu.org, GCC's g++}, with support for the
C++11 standard.
@end itemize
- branch master updated (b94f250 -> c04ffad), Ludovic Courtès, 2018/01/07
- 01/07: ui: Display hints that come along with '&message' conditions., Ludovic Courtès, 2018/01/07
- 02/07: ssh: Improve error reporting when retrieving files., Ludovic Courtès, 2018/01/07
- 06/07: publish: Use 'x-raw-file' internal response header., Ludovic Courtès, 2018/01/07
- 05/07: doc: Mark zlib as mandatory, libbz2 as optional.,
Ludovic Courtès <=
- 07/07: publish: Publish build logs., Ludovic Courtès, 2018/01/07
- 04/07: daemon: Make libbz2 an optional dependency., Ludovic Courtès, 2018/01/07
- 03/07: daemon: Add gzip log compression., Ludovic Courtès, 2018/01/07