summaryrefslogtreecommitdiff
path: root/guix
diff options
context:
space:
mode:
authorTobias Geerinckx-Rice <me@tobias.gr>2019-06-28 16:24:44 +0200
committerTobias Geerinckx-Rice <me@tobias.gr>2019-06-29 14:31:23 +0200
commit87a90486ca63939d0ef73bdc8e9a26fef03afccb (patch)
tree098f25c1f0b3c0b3fd0e3c2ec33e64d929550744 /guix
parent3a8bfebed94ba295432da8304b7ffb4a611ef761 (diff)
download: Remove hydra from content-addressed URL list
* guix/build/download-nar.scm (urls-for-item): Remove mirror.hydra.gnu.org. * guix/download.scm (%content-addressed-mirrors): Likewise.
Diffstat (limited to 'guix')
-rw-r--r--guix/build/download-nar.scm6
-rw-r--r--guix/download.scm1
2 files changed, 3 insertions, 4 deletions
diff --git a/guix/build/download-nar.scm b/guix/build/download-nar.scm
index 681f22238d..cb146038ad 100644
--- a/guix/build/download-nar.scm
+++ b/guix/build/download-nar.scm
@@ -42,10 +42,10 @@
"Return the fallback nar URL for ITEM--e.g.,
\"/gnu/store/cabbag3…-foo-1.2-checkout\"."
;; Here we hard-code nar URLs without checking narinfos. That's probably OK
- ;; though.
+ ;; though. Use berlin.guixsd.org instead of its ci.guix.gnu.org front end to
+ ;; avoid sending these requests to CDN providers without user consent.
;; TODO: Use HTTPS? The downside is the extra dependency.
- (let ((bases '("http://mirror.hydra.gnu.org/guix"
- "http://berlin.guixsd.org"))
+ (let ((bases '("http://berlin.guixsd.org"))
(item (basename item)))
(append (map (cut string-append <> "/nar/gzip/" item) bases)
(map (cut string-append <> "/nar/" item) bases))))
diff --git a/guix/download.scm b/guix/download.scm
index cd5d61cd13..fe680be4a2 100644
--- a/guix/download.scm
+++ b/guix/download.scm
@@ -394,7 +394,6 @@
'(guix base16) '(bytevector->base16-string))
(list (guix-publish "ci.guix.gnu.org")
- (guix-publish "mirror.hydra.gnu.org")
(lambda (file algo hash)
;; 'tarballs.nixos.org' supports several algorithms.
(string-append "https://tarballs.nixos.org/"