nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

doc: Mark zlib as mandatory, libbz2 as optional. 

* doc/guix.texi (Requirements): Move zlib to mandatory and libbz2 to
optional.
* README: Ditto.
This commit is contained in:
Ludovic Courtès 2018-01-05 17:56:10 +01:00
parent f997137d0e
commit 06e3a5181e
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
README
View File

@ -25,13 +25,14 @@ GNU Guix currently depends on the following packages:
- [[https://www.gnu.org/software/make/][GNU Make]] - [[https://www.gnu.org/software/make/][GNU Make]]
- [[https://www.gnutls.org][GnuTLS]] compiled with guile support enabled. - [[https://www.gnutls.org][GnuTLS]] compiled with guile support enabled.
- [[https://gitlab.com/guile-git/guile-git][Guile-Git]] - [[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 - 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: Unless `--disable-daemon' was passed, the following packages are needed:
- [[https://sqlite.org/][SQLite 3]] - [[https://sqlite.org/][SQLite 3]]
- [[http://www.bzip.org][libbz2]]
- [[https://gcc.gnu.org][GCC's g++]] - [[https://gcc.gnu.org][GCC's g++]]
- optionally [[http://www.bzip.org][libbz2]]
When `--disable-daemon' was passed, you instead need the following: When `--disable-daemon' was passed, you instead need the following:

6
doc/guix.texi
View File

@ -605,6 +605,7 @@ Guile,, gnutls-guile, GnuTLS-Guile});
@c FIXME: Specify a version number once a release has been made. @c FIXME: Specify a version number once a release has been made.
@uref{https://gitlab.com/guile-git/guile-git, Guile-Git}, from August @uref{https://gitlab.com/guile-git/guile-git, Guile-Git}, from August
2017 or later; 2017 or later;
@item @url{http://zlib.net, zlib};
@item @url{http://www.gnu.org/software/make/, GNU Make}. @item @url{http://www.gnu.org/software/make/, GNU Make}.
@end itemize @end itemize
@ -626,8 +627,8 @@ Support for build offloading (@pxref{Daemon Offload Setup}) and
version 0.10.2 or later. version 0.10.2 or later.
@item @item
When @url{http://zlib.net, zlib} is available, @command{guix publish} When @url{http://www.bzip.org, libbz2} is available,
can compress build byproducts (@pxref{Invoking guix publish}). @command{guix-daemon} can use it to compress build logs.
@end itemize @end itemize
Unless @code{--disable-daemon} was passed to @command{configure}, the Unless @code{--disable-daemon} was passed to @command{configure}, the
@ -635,7 +636,6 @@ following packages are also needed:
@itemize @itemize
@item @url{http://sqlite.org, SQLite 3}; @item @url{http://sqlite.org, SQLite 3};
@item @url{http://www.bzip.org, libbz2};
@item @url{http://gcc.gnu.org, GCC's g++}, with support for the @item @url{http://gcc.gnu.org, GCC's g++}, with support for the
C++11 standard. C++11 standard.
@end itemize @end itemize