summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomas Volf <~@wolfsden.cz>2024-05-09 01:13:24 +0200
committerLudovic Courtès <ludo@gnu.org>2024-06-26 23:36:24 +0200
commit76a2b9d70778918f4cfd0c07592d82fd176b3603 (patch)
tree52254b2e42c5f8b56330006b8a88353e1c1a567a
parent398393187cc48f449215b14cf18b13fefb228558 (diff)
downloadguix-patches-76a2b9d70778918f4cfd0c07592d82fd176b3603.tar
guix-patches-76a2b9d70778918f4cfd0c07592d82fd176b3603.tar.gz
services: guix: Default `channels' field to #f.
In the absence of the /etc/guix/channels.scm file, %default-channels is used anyway. If user manually (or by extra-special-file) created the file, we should respect it. This commit therefore changes the default to #f, hopefully having zero impact on people not actively using the `channels' field. * gnu/services/base.scm (<guix-configuration>)[channels]: Set default to #f. Change-Id: I516c1735a037a153fabbebfc337051aaf0be2155 Signed-off-by: Ludovic Courtès <ludo@gnu.org>
-rw-r--r--doc/guix.texi2
-rw-r--r--gnu/services/base.scm2
2 files changed, 2 insertions, 2 deletions
diff --git a/doc/guix.texi b/doc/guix.texi
index 500a462bfb..6770c9d664 100644
--- a/doc/guix.texi
+++ b/doc/guix.texi
@@ -19679,7 +19679,7 @@ might want to turn it off for instance in a virtual machine that does
not need it and where the extra boot time is a problem.
@anchor{guix-configuration-channels}
-@item @code{channels} (default: @code{%default-channels})
+@item @code{channels} (default: @code{#f})
List of channels to be specified in @file{/etc/guix/channels.scm}, which
is what @command{guix pull} uses by default (@pxref{Invoking guix
pull}).
diff --git a/gnu/services/base.scm b/gnu/services/base.scm
index c7a14c7ed4..4b5b103cc3 100644
--- a/gnu/services/base.scm
+++ b/gnu/services/base.scm
@@ -1859,7 +1859,7 @@ archive' public keys, with GUIX."
(generate-substitute-key? guix-configuration-generate-substitute-key?
(default #t)) ;Boolean
(channels guix-configuration-channels ;file-like
- (default %default-channels))
+ (default #f))
(chroot-directories guix-configuration-chroot-directories ;list of file-like/strings
(default '()))
(max-silent-time guix-configuration-max-silent-time ;integer