aboutsummaryrefslogtreecommitdiff
path: root/guix
diff options
context:
space:
mode:
authorChristopher Baines <mail@cbaines.net>2024-03-27 13:43:43 +0000
committerChristopher Baines <mail@cbaines.net>2024-04-03 17:18:38 +0100
commitac19e038b457d0585812091200005befd9b29259 (patch)
treead6d1229f61ad8df789ff5e4d4a0fa574ff8ffa5 /guix
parentd439deae12959f6d254f088107a9f40ea82dd5a7 (diff)
downloadguix-ac19e038b457d0585812091200005befd9b29259.tar
guix-ac19e038b457d0585812091200005befd9b29259.tar.gz
Switch order of the default substitute servers.
The aim here is to improve the user experience. There's anecdotal evidence that the network performance for bordeaux is better compared to ci at least for some users, and I don't know of any issues with rate limiting or access restriction for bordeaux compared to ci. It also has IPv6 support. Additionally, bordeaux generally had more substitutes than ci, particularly for aarch64-linux and armhf-linux. This change will offer a very slight speedup for those substitutes that only bordeaux has. Bordeaux has been a default substitute server for nearly 3 years now and I think this change is overdue. I'm also hopeful that we'll be able to build on the testing regarding mirrors for bordeaux, and that'll allow potentially improving the hosting setup (through providing more redundancy) and further improving substitute fetching for users who currently have issues with substitute access. * config-daemon.ac: Switch substitute urls order. * doc/guix.texi: Ditto. * etc/guix-install.sh: Ditto. * gnu/installer/newt/network.scm (wait-service-online): Ditto. * guix/store.scm (%default-substitute-urls): Ditto. Change-Id: I4f6d93ae1fc8b03d80b47b18b5749a51f1fde17b Signed-off-by: Christopher Baines <mail@cbaines.net>
Diffstat (limited to 'guix')
-rwxr-xr-xguix/scripts/substitute.scm4
-rw-r--r--guix/store.scm4
2 files changed, 4 insertions, 4 deletions
diff --git a/guix/scripts/substitute.scm b/guix/scripts/substitute.scm
index 3af0bf0019..1b2d735d68 100755
--- a/guix/scripts/substitute.scm
+++ b/guix/scripts/substitute.scm
@@ -751,8 +751,8 @@ found."
(#f
;; This can only happen when this script is not invoked by the
;; daemon.
- '("http://ci.guix.gnu.org"
- "http://bordeaux.guix.gnu.org"))))
+ '("http://bordeaux.guix.gnu.org"
+ "http://ci.guix.gnu.org"))))
;; In order to prevent using large number of discovered local substitute
;; servers, limit the local substitute urls list size.
diff --git a/guix/store.scm b/guix/store.scm
index 97c4f32a5b..1229198b09 100644
--- a/guix/store.scm
+++ b/guix/store.scm
@@ -767,8 +767,8 @@ encoding conversion errors."
(map (if (false-if-exception (resolve-interface '(gnutls)))
(cut string-append "https://" <>)
(cut string-append "http://" <>))
- '("ci.guix.gnu.org"
- "bordeaux.guix.gnu.org")))
+ '("bordeaux.guix.gnu.org"
+ "ci.guix.gnu.org")))
(define (current-user-name)
"Return the name of the calling user."