diff options
author | Tobias Geerinckx-Rice <me@tobias.gr> | 2017-07-19 01:42:08 +0200 |
---|---|---|
committer | Tobias Geerinckx-Rice <me@tobias.gr> | 2017-07-19 01:42:08 +0200 |
commit | 644e5f17dfd2f5b3bbf656580d6f1f84c52e668a (patch) | |
tree | dd54db917eede273859401fa2913fda8caa96e4a /gnu | |
parent | b225b1bec25313941c8737f7e1ce872492edc533 (diff) | |
download | guix-644e5f17dfd2f5b3bbf656580d6f1f84c52e668a.tar guix-644e5f17dfd2f5b3bbf656580d6f1f84c52e668a.tar.gz |
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.
Diffstat (limited to 'gnu')
-rw-r--r-- | gnu/packages/ntp.scm | 4 | ||||
-rw-r--r-- | gnu/packages/ssh.scm | 16 | ||||
-rw-r--r-- | gnu/packages/tls.scm | 16 |
3 files changed, 14 insertions, 22 deletions
diff --git a/gnu/packages/ntp.scm b/gnu/packages/ntp.scm index 7befd491ac..959aa55a76 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 3cde6af5fe..89df37a636 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 2b317a84f1..0a81633aa7 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 |