From 3bb305515f9312d5f9f3162858c50a283ff48d08 Mon Sep 17 00:00:00 2001 From: Benjamin Hipple Date: Mon, 11 Jun 2018 19:31:05 -0400 Subject: [PATCH] mariadb: provide multiple src url mirrors Both mariadb.com and mariadb.org appear to be canonical upstream sources, and have identical sha256 hashes at these URLs. For the third-party mirrors, if we are just going to provide one URL, it should be an HTTPS url instead of FTP or SSH, which many users may not be able to access due to network security configurations. --- pkgs/servers/sql/mariadb/default.nix | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/pkgs/servers/sql/mariadb/default.nix b/pkgs/servers/sql/mariadb/default.nix index 4b254262f9f..d12621a4608 100644 --- a/pkgs/servers/sql/mariadb/default.nix +++ b/pkgs/servers/sql/mariadb/default.nix @@ -25,7 +25,10 @@ common = rec { # attributes common to both builds version = "10.2.15"; src = fetchurl { - url = "https://downloads.mariadb.org/f/mariadb-${version}/source/mariadb-${version}.tar.gz"; + urls = [ + "https://downloads.mariadb.org/f/mariadb-${version}/source/mariadb-${version}.tar.gz" + "https://downloads.mariadb.com/MariaDB/mariadb-${version}/source/mariadb-${version}.tar.gz" + ]; sha256 = "04ds6vkb7k2lqpcdz663z4ll1jx1zz2hqxz5nj7gs8pwb18j1pik"; name = "mariadb-${version}.tar.gz"; }; @@ -180,7 +183,7 @@ connector-c = stdenv.mkDerivation rec { version = "2.3.6"; src = fetchurl { - url = "https://downloads.mariadb.org/interstitial/connector-c-${version}/mariadb-connector-c-${version}-src.tar.gz/from/http%3A//ftp.hosteurope.de/mirror/archive.mariadb.org/?serve"; + url = "https://downloads.mariadb.org/interstitial/connector-c-${version}/mariadb-connector-c-${version}-src.tar.gz/from/http%3A//nyc2.mirrors.digitalocean.com/mariadb/"; sha256 = "15iy5iqp0njbwbn086x2dq8qnbkaci7ydvi84cf5z8fxvljis9vb"; name = "mariadb-connector-c-${version}-src.tar.gz"; };