summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--doc/guix.texi4
-rw-r--r--gnu/services/base.scm2
-rw-r--r--nix/libstore/globals.cc4
3 files changed, 3 insertions, 7 deletions
diff --git a/doc/guix.texi b/doc/guix.texi
index ea603ab56a2..28eaf8338c8 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -1705,7 +1705,7 @@ Compress build logs according to @var{type}, one of @code{gzip},
1705 1705
1706Unless @option{--lose-logs} is used, all the build logs are kept in the 1706Unless @option{--lose-logs} is used, all the build logs are kept in the
1707@var{localstatedir}. To save space, the daemon automatically compresses 1707@var{localstatedir}. To save space, the daemon automatically compresses
1708them with Bzip2 by default. 1708them with gzip by default.
1709 1709
1710@item --discover[=yes|no] 1710@item --discover[=yes|no]
1711Whether to discover substitute servers on the local network using mDNS 1711Whether to discover substitute servers on the local network using mDNS
@@ -16623,7 +16623,7 @@ The number of seconds of silence and the number of seconds of activity,
16623respectively, after which a build process times out. A value of zero 16623respectively, after which a build process times out. A value of zero
16624disables the timeout. 16624disables the timeout.
16625 16625
16626@item @code{log-compression} (default: @code{'bzip2}) 16626@item @code{log-compression} (default: @code{'gzip})
16627The type of compression used for build logs---one of @code{gzip}, 16627The type of compression used for build logs---one of @code{gzip},
16628@code{bzip2}, or @code{none}. 16628@code{bzip2}, or @code{none}.
16629 16629
diff --git a/gnu/services/base.scm b/gnu/services/base.scm
index cd8d512edc6..345e0ca0f77 100644
--- a/gnu/services/base.scm
+++ b/gnu/services/base.scm
@@ -1566,7 +1566,7 @@ archive' public keys, with GUIX."
1566 (timeout guix-configuration-timeout ;integer 1566 (timeout guix-configuration-timeout ;integer
1567 (default 0)) 1567 (default 0))
1568 (log-compression guix-configuration-log-compression 1568 (log-compression guix-configuration-log-compression
1569 (default 'bzip2)) 1569 (default 'gzip))
1570 (discover? guix-configuration-discover? 1570 (discover? guix-configuration-discover?
1571 (default #f)) 1571 (default #f))
1572 (extra-options guix-configuration-extra-options ;list of strings 1572 (extra-options guix-configuration-extra-options ;list of strings
diff --git a/nix/libstore/globals.cc b/nix/libstore/globals.cc
index 0cc001fbe4e..d4f9a46a747 100644
--- a/nix/libstore/globals.cc
+++ b/nix/libstore/globals.cc
@@ -45,11 +45,7 @@ Settings::Settings()
45 useChroot = false; 45 useChroot = false;
46 impersonateLinux26 = false; 46 impersonateLinux26 = false;
47 keepLog = true; 47 keepLog = true;
48#if HAVE_BZLIB_H
49 logCompression = COMPRESSION_BZIP2;
50#else
51 logCompression = COMPRESSION_GZIP; 48 logCompression = COMPRESSION_GZIP;
52#endif
53 maxLogSize = 0; 49 maxLogSize = 0;
54 cacheFailure = false; 50 cacheFailure = false;
55 pollInterval = 5; 51 pollInterval = 5;