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

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.
This commit is contained in:
Tobias Geerinckx-Rice 2019-06-28 16:24:44 +02:00
parent 3a8bfebed9
commit 87a90486ca
No known key found for this signature in database
GPG Key ID: 0DB0FF884F556D79
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
guix/build/download-nar.scm
View File

@ -42,10 +42,10 @@
"Return the fallback nar URL for ITEM--e.g., "Return the fallback nar URL for ITEM--e.g.,
\"/gnu/store/cabbag3…-foo-1.2-checkout\"." \"/gnu/store/cabbag3…-foo-1.2-checkout\"."
;; Here we hard-code nar URLs without checking narinfos. That's probably OK ;; 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. ;; TODO: Use HTTPS? The downside is the extra dependency.
(let ((bases '("http://mirror.hydra.gnu.org/guix" (let ((bases '("http://berlin.guixsd.org"))
"http://berlin.guixsd.org"))
(item (basename item))) (item (basename item)))
(append (map (cut string-append <> "/nar/gzip/" item) bases) (append (map (cut string-append <> "/nar/gzip/" item) bases)
(map (cut string-append <> "/nar/" item) bases)))) (map (cut string-append <> "/nar/" item) bases))))

1
guix/download.scm
View File

@ -394,7 +394,6 @@
'(guix base16) '(bytevector->base16-string)) '(guix base16) '(bytevector->base16-string))
(list (guix-publish "ci.guix.gnu.org") (list (guix-publish "ci.guix.gnu.org")
(guix-publish "mirror.hydra.gnu.org")
(lambda (file algo hash) (lambda (file algo hash)
;; 'tarballs.nixos.org' supports several algorithms. ;; 'tarballs.nixos.org' supports several algorithms.
(string-append "https://tarballs.nixos.org/" (string-append "https://tarballs.nixos.org/"