[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
01/01: download: Add OpenBSD mirrors.
|
From: |
Tobias Geerinckx-Rice |
|
Subject: |
01/01: download: Add OpenBSD mirrors. |
|
Date: |
Tue, 18 Jul 2017 19:44:32 -0400 (EDT) |
nckx pushed a commit to branch master
in repository guix.
commit 644e5f17dfd2f5b3bbf656580d6f1f84c52e668a
Author: Tobias Geerinckx-Rice <address@hidden>
Date: Wed Jul 19 01:42:08 2017 +0200
download: Add OpenBSD mirrors.
* guix/download.scm (%mirrors) <openbsd>: Add HTTPS OpenBSD mirrors.
* gnu/packages/ntp.scm (openntpd)[source]: Use them.
* gnu/packages/ssh.scm (openssh)[source]: Likewise.
* gnu/packages/tls.scm (libressl)[source]: Likewise.
---
gnu/packages/ntp.scm | 4 +---
gnu/packages/ssh.scm | 16 ++++++----------
gnu/packages/tls.scm | 16 +++++++---------
guix/download.scm | 51 ++++++++++++++++++++++++++++++++++++++++++++++++++-
4 files changed, 64 insertions(+), 23 deletions(-)
diff --git a/gnu/packages/ntp.scm b/gnu/packages/ntp.scm
index 7befd49..959aa55 100644
--- a/gnu/packages/ntp.scm
+++ b/gnu/packages/ntp.scm
@@ -101,10 +101,8 @@ computers over a network.")
(version "6.1p1")
(source (origin
(method url-fetch)
- ;; XXX Use mirror://openbsd
(uri (string-append
- "http://ftp.openbsd.org/pub/OpenBSD/OpenNTPD/openntpd-";
- version ".tar.gz"))
+ "mirror://openbsd/OpenNTPD/" name "-" version ".tar.gz"))
(sha256
(base32
"1ykx9ga76k5m54h7k5x4ds2clxsyfniss5vmf88pxnrip5bx6if8"))))
diff --git a/gnu/packages/ssh.scm b/gnu/packages/ssh.scm
index 3cde6af..89df37a 100644
--- a/gnu/packages/ssh.scm
+++ b/gnu/packages/ssh.scm
@@ -130,16 +130,12 @@ a server that supports the SSH-2 protocol.")
(name "openssh")
(version "7.5p1")
(source (origin
- (method url-fetch)
- (uri (let ((tail (string-append name "-" version ".tar.gz")))
- (list (string-append
"http://openbsd.cs.fau.de/pub/OpenBSD/OpenSSH/portable/";
- tail)
- (string-append
"http://ftp.fr.openbsd.org/pub/OpenBSD/OpenSSH/portable/";
- tail)
- (string-append
"http://ftp2.fr.openbsd.org/pub/OpenBSD/OpenSSH/portable/";
- tail))))
- (sha256 (base32
- "1w7rb5gbrikxdkp8w7zxnci4549gk4bw1lml01s59w5rzb2y6ilq"))))
+ (method url-fetch)
+ (uri (string-append "mirror://openbsd/OpenSSH/portable/"
+ name "-" version ".tar.gz"))
+ (sha256
+ (base32
+ "1w7rb5gbrikxdkp8w7zxnci4549gk4bw1lml01s59w5rzb2y6ilq"))))
(build-system gnu-build-system)
(native-inputs `(("groff" ,groff)))
(inputs `(("openssl" ,openssl)
diff --git a/gnu/packages/tls.scm b/gnu/packages/tls.scm
index 2b317a8..0a81633 100644
--- a/gnu/packages/tls.scm
+++ b/gnu/packages/tls.scm
@@ -456,15 +456,13 @@ required structures.")
(package
(name "libressl")
(version "2.5.5")
- (source
- (origin
- (method url-fetch)
- (uri (string-append
- "https://ftp.openbsd.org/pub/OpenBSD/LibreSSL/libressl-";
- version ".tar.gz"))
- (sha256
- (base32
- "1i77viqy1afvbr392npk9v54k9zhr9zq2vhv6pliza22b0ymwzz5"))))
+ (source (origin
+ (method url-fetch)
+ (uri (string-append "mirror://openbsd/LibreSSL/"
+ name "-" version ".tar.gz"))
+ (sha256
+ (base32
+ "1i77viqy1afvbr392npk9v54k9zhr9zq2vhv6pliza22b0ymwzz5"))))
(build-system gnu-build-system)
(arguments
;; Do as if 'getentropy' was missing since older Linux kernels lack it
diff --git a/guix/download.scm b/guix/download.scm
index c1da515..d7590d4 100644
--- a/guix/download.scm
+++ b/guix/download.scm
@@ -277,7 +277,56 @@
"http://kde.mirrors.tds.net/pub/kde/";
;; Oceania
"http://ftp.kddlabs.co.jp/pub/X11/kde/";
- "http://kde.mirror.uber.com.au/";))))
+ "http://kde.mirror.uber.com.au/";)
+ (openbsd
+ "https://ftp.openbsd.org/pub/OpenBSD/";
+ ;; Anycast CDN redirecting to your friendly local mirror.
+ "https://mirrors.evowise.com/pub/OpenBSD/";
+ ;; Other HTTPS mirrors from https://www.openbsd.org/ftp.html
+ "https://mirror.aarnet.edu.au/pub/OpenBSD/";
+ "https://ftp2.eu.openbsd.org/pub/OpenBSD/";
+ "https://openbsd.c3sl.ufpr.br/pub/OpenBSD/";
+ "https://openbsd.ipacct.com/pub/OpenBSD/";
+ "https://ftp.OpenBSD.org/pub/OpenBSD/";
+ "https://openbsd.cs.toronto.edu/pub/OpenBSD/";
+ "https://openbsd.delfic.org/pub/OpenBSD/";
+ "https://openbsd.mirror.netelligent.ca/pub/OpenBSD/";
+ "https://mirrors.ucr.ac.cr/pub/OpenBSD/";
+ "https://mirrors.dotsrc.org/pub/OpenBSD/";
+ "https://mirror.one.com/pub/OpenBSD/";
+ "https://ftp.fr.openbsd.org/pub/OpenBSD/";
+ "https://ftp2.fr.openbsd.org/pub/OpenBSD/";
+ "https://mirrors.ircam.fr/pub/OpenBSD/";
+ "https://ftp.spline.de/pub/OpenBSD/";
+ "https://mirror.hs-esslingen.de/pub/OpenBSD/";
+ "https://ftp.halifax.rwth-aachen.de/openbsd/";
+ "https://ftp.hostserver.de/pub/OpenBSD/";
+ "https://ftp.fau.de/pub/OpenBSD/";
+ "https://ftp.cc.uoc.gr/pub/OpenBSD/";
+ "https://openbsd.hk/pub/OpenBSD/";
+ "https://ftp.heanet.ie/pub/OpenBSD/";
+ "https://openbsd.mirror.garr.it/pub/OpenBSD/";
+ "https://mirror.litnet.lt/pub/OpenBSD/";
+ "https://mirror.meerval.net/pub/OpenBSD/";
+ "https://ftp.nluug.nl/pub/OpenBSD/";
+ "https://ftp.bit.nl/pub/OpenBSD/";
+ "https://mirrors.dalenys.com/pub/OpenBSD/";
+ "https://ftp.icm.edu.pl/pub/OpenBSD/";
+ "https://ftp.rnl.tecnico.ulisboa.pt/pub/OpenBSD/";
+ "https://mirrors.pidginhost.com/pub/OpenBSD/";
+ "https://mirror.yandex.ru/pub/OpenBSD/";
+ "https://ftp.eu.openbsd.org/pub/OpenBSD/";
+ "https://ftp.yzu.edu.tw/pub/OpenBSD/";
+ "https://www.mirrorservice.org/pub/OpenBSD/";
+ "https://anorien.csc.warwick.ac.uk/pub/OpenBSD/";
+ "https://mirror.bytemark.co.uk/pub/OpenBSD/";
+ "https://mirrors.sonic.net/pub/OpenBSD/";
+ "https://ftp3.usa.openbsd.org/pub/OpenBSD/";
+ "https://mirrors.syringanetworks.net/pub/OpenBSD/";
+ "https://openbsd.mirror.constant.com/pub/OpenBSD/";
+ "https://ftp4.usa.openbsd.org/pub/OpenBSD/";
+ "https://ftp5.usa.openbsd.org/pub/OpenBSD/";
+ "https://mirror.esc7.net/pub/OpenBSD/";))))
(define %mirror-file
;; Copy of the list of mirrors to a file. This allows us to keep a single