Good evening.
Here's another version of patch that changes download URL's for Apache
Foundation products.
What I have changed:
* Remove Apache mirror list from download.scm, since all Apache
projects now use it's own CDN instead of mirrors
* Set proper download URL to dlcdn.apache.org, not download.apache.org
mentioned earlier in this discussion. download.apache.org doesn't work.
All download URLs on apache.org are set to dlcdn.apache.org
* Use archive.apache.org for outdated httpd-2.4.52 package. The 'last
resort' trick in the mirror list doesn't work because some mirrors
return empty file when you try to download from them, guix returns 'sha
missmatch' error.
Dmitry
diff --git a/gnu/packages/apr.scm b/gnu/packages/apr.scm
index aac3822eae..cd8ab6ac51 100644
--- a/gnu/packages/apr.scm
+++ b/gnu/packages/apr.scm
@@ -36,7 +36,7 @@ (define-public apr
(version "1.7.0")
(source (origin
(method url-fetch)
- (uri (string-append "mirror://apache/apr/apr-"
+ (uri (string-append "https://dlcdn.apache.org/dist/apr/apr-";
version ".tar.bz2"))
(sha256
(base32
@@ -84,7 +84,7 @@ (define-public apr-util
(version "1.6.1")
(source (origin
(method url-fetch)
- (uri (string-append "mirror://apache/apr/apr-util-"
+ (uri (string-append "https://dlcdn.apache.org/dist/apr/apr-util-";
version ".tar.bz2"))
(sha256
(base32
diff --git a/gnu/packages/batik.scm b/gnu/packages/batik.scm
index 58f829dbd5..8ef958f8e7 100644
--- a/gnu/packages/batik.scm
+++ b/gnu/packages/batik.scm
@@ -301,7 +301,7 @@ (define-public java-xmlgraphics-commons
(origin
(method url-fetch)
(uri (string-append
- "mirror://apache/xmlgraphics/commons/source/xmlgraphics-commons-"
+ "https://dlcdn.apache.org/dist/xmlgraphics/commons/source/xmlgraphics-commons-";
version "-src.tar.gz"))
(sha256
(base32 "18gndjwzdd6vhp59fn8cwn6i6q0v0ym8nmwn65rcykdrzz0nvl72"))
diff --git a/gnu/packages/java-bootstrap.scm b/gnu/packages/java-bootstrap.scm
index 481d8cd075..93f57007d9 100644
--- a/gnu/packages/java-bootstrap.scm
+++ b/gnu/packages/java-bootstrap.scm
@@ -198,7 +198,7 @@ (define ant-bootstrap
(version "1.8.4")
(source (origin
(method url-fetch)
- (uri (string-append "mirror://apache/"
+ (uri (string-append "https://dlcdn.apache.org/dist/";
"ant/source/apache-ant-"
version "-src.tar.bz2"))
(sha256
diff --git a/gnu/packages/java-rdf.scm b/gnu/packages/java-rdf.scm
index 7c400643bc..332fe9959b 100644
--- a/gnu/packages/java-rdf.scm
+++ b/gnu/packages/java-rdf.scm
@@ -75,7 +75,7 @@ (define-public java-commons-rdf-api
(version "0.5.0")
(source (origin
(method url-fetch)
- (uri (string-append "mirror://apache/commons/rdf/source/"
+ (uri (string-append "https://dlcdn.apache.org/dist/commons/rdf/source/";
"apache-commons-rdf-" version
"-source-release.zip"))
(sha256
diff --git a/gnu/packages/java-xml.scm b/gnu/packages/java-xml.scm
index 9ec11fa83e..90621d2eaf 100644
--- a/gnu/packages/java-xml.scm
+++ b/gnu/packages/java-xml.scm
@@ -134,7 +134,7 @@ (define-public java-jaxp
(source
(origin
(method url-fetch)
- (uri (string-append "mirror://apache/xerces/xml-commons/source/"
+ (uri (string-append "https://dlcdn.apache.org/dist/xerces/xml-commons/source/";
"xml-commons-external-" version "-src.tar.gz"))
(sha256
(base32 "0rhq32a7dl9yik7zx9h0naz2iz068qgcdiayak91wp4wr26xhjyk"))))
@@ -168,7 +168,7 @@ (define-public java-apache-xml-commons-resolver
(source
(origin
(method url-fetch)
- (uri (string-append "mirror://apache/xerces/xml-commons/"
+ (uri (string-append "https://dlcdn.apache.org/dist/xerces/xml-commons/";
"xml-commons-resolver-" version ".tar.gz"))
(sha256
(base32 "1zhy4anc3fg9f8y348bj88vmab15aavrg6nf419ifb25asyygnsm"))
diff --git a/gnu/packages/java.scm b/gnu/packages/java.scm
index 7c8c4e0a36..9ee0286322 100644
--- a/gnu/packages/java.scm
+++ b/gnu/packages/java.scm
@@ -1798,7 +1798,7 @@ (define-public ant/java8
(version "1.10.13")
(source (origin
(method url-fetch)
- (uri (string-append "mirror://apache/ant/source/apache-ant-"
+ (uri (string-append "https://dlcdn.apache.org/dist/ant/source/apache-ant-";
version "-src.tar.gz"))
(sha256
(base32
@@ -1889,7 +1889,7 @@ (define-public ant
(version "1.9.15")
(source (origin
(method url-fetch)
- (uri (string-append "mirror://apache/ant/source/apache-ant-"
+ (uri (string-append "https://dlcdn.apache.org/dist/ant/source/apache-ant-";
version "-src.tar.gz"))
(sha256
(base32
@@ -5512,7 +5512,7 @@ (define-public java-commons-math3
(version "3.6.1")
(source (origin
(method url-fetch)
- (uri (string-append "mirror://apache/commons/math/source/"
+ (uri (string-append "https://dlcdn.apache.org/dist/commons/math/source/";
"commons-math3-" version "-src.tar.gz"))
(sha256
(base32
@@ -5599,7 +5599,7 @@ (define-public java-commons-collections4
(version "4.1")
(source (origin
(method url-fetch)
- (uri (string-append "mirror://apache/commons/collections/source/"
+ (uri (string-append "https://dlcdn.apache.org/dist/commons/collections/source/";
"commons-collections4-" version "-src.tar.gz"))
(sha256
(base32
@@ -5659,7 +5659,7 @@ (define-public java-commons-collections
(version "3.2.2")
(source (origin
(method url-fetch)
- (uri (string-append "mirror://apache/commons/collections/source/"
+ (uri (string-append "https://dlcdn.apache.org/dist/commons/collections/source/";
"commons-collections-" version "-src.tar.gz"))
(sha256
(base32
@@ -5697,7 +5697,7 @@ (define-public java-commons-beanutils
(version "1.9.3")
(source (origin
(method url-fetch)
- (uri (string-append "mirror://apache/commons/beanutils/source/"
+ (uri (string-append "https://dlcdn.apache.org/dist/commons/beanutils/source/";
"commons-beanutils-" version "-src.tar.gz"))
(sha256
(base32
@@ -5736,7 +5736,7 @@ (define-public java-commons-io
(source
(origin
(method url-fetch)
- (uri (string-append "mirror://apache/commons/io/source/"
+ (uri (string-append "https://dlcdn.apache.org/dist/commons/io/source/";
"commons-io-" version "-src.tar.gz"))
(sha256
(base32
@@ -5771,7 +5771,7 @@ (define-public java-commons-exec-1.1
(source
(origin
(method url-fetch)
- (uri (string-append "mirror://apache/commons/exec/source/"
+ (uri (string-append "https://dlcdn.apache.org/dist/commons/exec/source/";
"commons-exec-" version "-src.tar.gz"))
(sha256
(base32
@@ -5808,7 +5808,7 @@ (define-public java-commons-exec
(source
(origin
(method url-fetch)
- (uri (string-append "mirror://apache/commons/exec/source/"
+ (uri (string-append "https://dlcdn.apache.org/dist/commons/exec/source/";
"commons-exec-" version "-src.tar.gz"))
(sha256
(base32
@@ -5849,7 +5849,7 @@ (define-public java-commons-lang
(source
(origin
(method url-fetch)
- (uri (string-append "mirror://apache/commons/lang/source/"
+ (uri (string-append "https://dlcdn.apache.org/dist/commons/lang/source/";
"commons-lang-" version "-src.tar.gz"))
(sha256
(base32 "1mxwagqadzx1b2al7i0z1v0r235aj2njdyijf02szq0vhmqrfiq5"))))
@@ -5905,7 +5905,7 @@ (define-public java-commons-lang3
(source
(origin
(method url-fetch)
- (uri (string-append "mirror://apache/commons/lang/source/"
+ (uri (string-append "https://dlcdn.apache.org/dist/commons/lang/source/";
"commons-lang3-" version "-src.tar.gz"))
(sha256
(base32 "09dcv1pkdx3hpf06py8p9511f1wkin6jpacdll0c8vxpbi3yfwzv"))
@@ -5951,7 +5951,7 @@ (define-public java-commons-bsf
(version "2.4.0")
(source (origin
(method url-fetch)
- (uri (string-append "mirror://apache/commons/bsf/source/bsf-src-"
+ (uri (string-append "https://dlcdn.apache.org/dist/commons/bsf/source/bsf-src-";
version ".tar.gz"))
(sha256
(base32
@@ -6012,7 +6012,7 @@ (define-public java-commons-jxpath
(version "1.3")
(source (origin
(method url-fetch)
- (uri (string-append "mirror://apache/commons/jxpath/source/"
+ (uri (string-append "https://dlcdn.apache.org/dist/commons/jxpath/source/";
"commons-jxpath-" version "-src.tar.gz"))
(sha256
(base32
@@ -6043,7 +6043,7 @@ (define-public java-commons-pool
(version "2.6.2")
(source (origin
(method url-fetch)
- (uri (string-append "mirror://apache/commons/pool/source/"
+ (uri (string-append "https://dlcdn.apache.org/dist/commons/pool/source/";
"commons-pool2-" version "-src.tar.gz"))
(sha256
(base32
@@ -6072,7 +6072,7 @@ (define-public java-commons-dbcp
(version "2.6.0")
(source (origin
(method url-fetch)
- (uri (string-append "mirror://apache/commons/dbcp/source/"
+ (uri (string-append "https://dlcdn.apache.org/dist/commons/dbcp/source/";
"commons-dbcp2-" version "-src.tar.gz"))
(sha256
(base32
@@ -6103,7 +6103,7 @@ (define-public java-commons-jcs
(version "3.1")
(source (origin
(method url-fetch)
- (uri (string-append "mirror://apache/commons/jcs/source/"
+ (uri (string-append "https://dlcdn.apache.org/dist/commons/jcs/source/";
"commons-jcs3-dist-" version "-src.tar.gz"))
(sha256
(base32
@@ -6279,7 +6279,7 @@ (define-public java-commons-logging-minimal
(version "1.2")
(source (origin
(method url-fetch)
- (uri (string-append "mirror://apache/commons/logging/source/"
+ (uri (string-append "https://dlcdn.apache.org/dist/commons/logging/source/";
"commons-logging-" version "-src.tar.gz"))
(sha256
(base32
@@ -6382,7 +6382,7 @@ (define-public java-httpcomponents-httpcore
(version "4.4.6")
(source (origin
(method url-fetch)
- (uri (string-append "mirror://apache//httpcomponents/httpcore/"
+ (uri (string-append "https://dlcdn.apache.org/dist//httpcomponents/httpcore/";
"source/httpcomponents-core-"
version "-src.tar.gz"))
(sha256
@@ -6480,7 +6480,7 @@ (define-public java-httpcomponents-httpclient
(version "4.5.12")
(source (origin
(method url-fetch)
- (uri (string-append "mirror://apache/httpcomponents/httpclient/"
+ (uri (string-append "https://dlcdn.apache.org/dist/httpcomponents/httpclient/";
"source/httpcomponents-client-"
version "-src.tar.gz"))
(sha256
@@ -6574,7 +6574,7 @@ (define-public java-commons-net
(version "3.6")
(source (origin
(method url-fetch)
- (uri (string-append "mirror://apache/commons/net/source/"
+ (uri (string-append "https://dlcdn.apache.org/dist/commons/net/source/";
"commons-net-" version "-src.tar.gz"))
(sha256
(base32
@@ -6629,7 +6629,7 @@ (define-public java-commons-compress
(version "1.21")
(source (origin
(method url-fetch)
- (uri (string-append "mirror://apache/commons/compress/source/"
+ (uri (string-append "https://dlcdn.apache.org/dist/commons/compress/source/";
"commons-compress-" version "-src.tar.gz"))
(sha256
(base32
@@ -6662,7 +6662,7 @@ (define-public java-commons-csv
(version "1.4")
(source (origin
(method url-fetch)
- (uri (string-append "mirror://apache/commons/csv/source/"
+ (uri (string-append "https://dlcdn.apache.org/dist/commons/csv/source/";
"commons-csv-" version "-src.tar.gz"))
(sha256
(base32
@@ -7519,7 +7519,7 @@ (define-public java-log4j-api
(version "2.17.1")
(source (origin
(method url-fetch)
- (uri (string-append "mirror://apache/logging/log4j/" version
+ (uri (string-append "https://dlcdn.apache.org/dist/logging/log4j/"; version
"/apache-log4j-" version "-src.tar.gz"))
(sha256
(base32
@@ -7622,7 +7622,7 @@ (define-public java-commons-cli
(version "1.4")
(source (origin
(method url-fetch)
- (uri (string-append "mirror://apache/commons/cli/source/"
+ (uri (string-append "https://dlcdn.apache.org/dist/commons/cli/source/";
"commons-cli-" version "-src.tar.gz"))
(sha256
(base32
@@ -7662,7 +7662,7 @@ (define-public java-commons-text
(version "1.9")
(source (origin
(method url-fetch)
- (uri (string-append "mirror://apache/commons/text/source/"
+ (uri (string-append "https://dlcdn.apache.org/dist/commons/text/source/";
"commons-text-" version "-src.tar.gz"))
(sha256
(base32
@@ -7696,7 +7696,7 @@ (define-public java-commons-codec
(version "1.15")
(source (origin
(method url-fetch)
- (uri (string-append "mirror://apache/commons/codec/source/"
+ (uri (string-append "https://dlcdn.apache.org/dist/commons/codec/source/";
"commons-codec-" version "-src.tar.gz"))
(sha256
(base32
@@ -7746,7 +7746,7 @@ (define-public java-commons-daemon
(version "1.1.0")
(source (origin
(method url-fetch)
- (uri (string-append "mirror://apache/commons/daemon/source/"
+ (uri (string-append "https://dlcdn.apache.org/dist/commons/daemon/source/";
"commons-daemon-" version "-src.tar.gz"))
(sha256
(base32
@@ -8874,7 +8874,7 @@ (define-public java-commons-cli-1.2
(version "1.2")
(source (origin
(method url-fetch)
- (uri (string-append "mirror://apache/commons/cli/source/"
+ (uri (string-append "https://dlcdn.apache.org/dist/commons/cli/source/";
"commons-cli-" version "-src.tar.gz"))
(sha256
(base32
@@ -10953,7 +10953,7 @@ (define-public java-commons-jexl-2
(version "2.1.1")
(source (origin
(method url-fetch)
- (uri (string-append "mirror://apache/commons/jexl/source/"
+ (uri (string-append "https://dlcdn.apache.org/dist/commons/jexl/source/";
"commons-jexl-" version "-src.tar.gz"))
(sha256
(base32
@@ -11193,7 +11193,7 @@ (define-public java-commons-bcel
(version "6.1")
(source (origin
(method url-fetch)
- (uri (string-append "mirror://apache/commons/bcel/source/bcel-"
+ (uri (string-append "https://dlcdn.apache.org/dist/commons/bcel/source/bcel-";
version "-src.tar.gz"))
(sha256
(base32
@@ -11568,7 +11568,7 @@ (define-public java-kafka-clients
(version "1.1.1")
(source (origin
(method url-fetch)
- (uri (string-append "mirror://apache/kafka/" version "/kafka-"
+ (uri (string-append "https://dlcdn.apache.org/dist/kafka/"; version "/kafka-"
version "-src.tgz"))
(sha256
(base32
@@ -12314,7 +12314,7 @@ (define-public java-xerces
(source
(origin
(method url-fetch)
- (uri (string-append "mirror://apache/xerces/j/source/"
+ (uri (string-append "https://dlcdn.apache.org/dist/xerces/j/source/";
"Xerces-J-src." version ".tar.gz"))
(sha256
(base32 "0494kq36gw3nah19ifb720vwxbpg4ww0k6m3zq6wyanw6a083p6s"))
@@ -12709,7 +12709,7 @@ (define-public java-commons-httpclient
(version "3.1")
(source (origin
(method url-fetch)
- (uri (string-append "mirror://apache/httpcomponents/"
+ (uri (string-append "https://dlcdn.apache.org/dist/httpcomponents/";
"commons-httpclient/source/commons-httpclient-"
version "-src.tar.gz"))
(sha256
@@ -12755,7 +12755,7 @@ (define-public java-commons-vfs
(version "2.2")
(source (origin
(method url-fetch)
- (uri (string-append "mirror://apache/commons/vfs/source/"
+ (uri (string-append "https://dlcdn.apache.org/dist/commons/vfs/source/";
"commons-vfs2-distribution-" version "-src.tar.gz"))
(file-name (string-append name "-" version ".tar.gz"))
(sha256
@@ -12805,7 +12805,7 @@ (define-public java-jakarta-oro
(version "2.0.8")
(source (origin
(method url-fetch)
- (uri (string-append "mirror://apache/jakarta/oro/"
+ (uri (string-append "https://dlcdn.apache.org/dist/jakarta/oro/";
"jakarta-oro-" version ".tar.gz"))
(sha256
(base32
@@ -13055,7 +13055,7 @@ (define-public java-apache-ivy
(version "2.4.0")
(source (origin
(method url-fetch)
- (uri (string-append "mirror://apache//ant/ivy/" version
+ (uri (string-append "https://dlcdn.apache.org/dist//ant/ivy/"; version
"/apache-ivy-" version "-src.tar.gz"))
(sha256
(base32
diff --git a/gnu/packages/maven.scm b/gnu/packages/maven.scm
index fc3a63c263..b5c1730b75 100644
--- a/gnu/packages/maven.scm
+++ b/gnu/packages/maven.scm
@@ -729,7 +729,7 @@ (define-public maven-shared-utils
(version "3.2.1")
(source (origin
(method url-fetch)
- (uri (string-append "mirror://apache/maven/shared/"
+ (uri (string-append "https://dlcdn.apache.org/dist/maven/shared/";
"maven-shared-utils-" version "-source-release.zip"))
(sha256
(base32
@@ -773,7 +773,7 @@ (define-public maven-plugin-annotations
(version "3.5")
(source (origin
(method url-fetch)
- (uri (string-append "mirror://apache/maven/"
+ (uri (string-append "https://dlcdn.apache.org/dist/maven/";
"plugin-tools/maven-plugin-tools-" version
"-source-release.zip"))
(sha256 (base32 "1ryqhs62j5pas93brhf5dsnvp99hxbvssf681yj5rk3r9h24hqm2"))))
@@ -1122,7 +1122,7 @@ (define maven-pom
(version "3.8.6")
(source (origin
(method url-fetch)
- (uri (string-append "mirror://apache/maven/"
+ (uri (string-append "https://dlcdn.apache.org/dist/maven/";
"maven-3/" version "/source/"
"apache-maven-" version "-src.tar.gz"))
(sha256 (base32 "0jszmcaxp597a62ajrc478jxix1qmw4pknhiygsbjdy3kccc7gvj"))
@@ -2672,7 +2672,7 @@ (define-public maven-shared-io
(version "3.0.0")
(source (origin
(method url-fetch)
- (uri (string-append "mirror://apache/maven/shared/"
+ (uri (string-append "https://dlcdn.apache.org/dist/maven/shared/";
"maven-shared-io-" version
"-source-release.zip"))
(sha256
@@ -2714,7 +2714,7 @@ (define-public maven-file-management
(version "3.0.0")
(source (origin
(method url-fetch)
- (uri (string-append "mirror://apache/maven/shared/"
+ (uri (string-append "https://dlcdn.apache.org/dist/maven/shared/";
"file-management-" version
"-source-release.zip"))
(sha256
@@ -2765,7 +2765,7 @@ (define-public maven-archiver
(version "3.5.0")
(source (origin
(method url-fetch)
- (uri (string-append "mirror://apache/maven/shared/"
+ (uri (string-append "https://dlcdn.apache.org/dist/maven/shared/";
"maven-archiver-" version
"-source-release.zip"))
(sha256
@@ -2803,7 +2803,7 @@ (define-public maven-dependency-tree
(version "3.1.0")
(source (origin
(method url-fetch)
- (uri (string-append "mirror://apache/maven/shared/"
+ (uri (string-append "https://dlcdn.apache.org/dist/maven/shared/";
"maven-dependency-tree-" version
"-source-release.zip"))
(sha256
@@ -2838,7 +2838,7 @@ (define-public maven-common-artifact-filters
(version "3.2.0")
(source (origin
(method url-fetch)
- (uri (string-append "mirror://apache/maven/shared/"
+ (uri (string-append "https://dlcdn.apache.org/dist/maven/shared/";
"maven-common-artifact-filters-" version
"-source-release.zip"))
(sha256
@@ -2885,7 +2885,7 @@ (define-public maven-common-artifact-filters-3.1.0
(version "3.1.0")
(source (origin
(method url-fetch)
- (uri (string-append "mirror://apache/maven/shared/"
+ (uri (string-append "https://dlcdn.apache.org/dist/maven/shared/";
"maven-common-artifact-filters-" version
"-source-release.zip"))
(sha256
@@ -2908,7 +2908,7 @@ (define-public maven-enforcer-api
(version "3.0.0")
(source (origin
(method url-fetch)
- (uri (string-append "mirror://apache/maven/enforcer/"
+ (uri (string-append "https://dlcdn.apache.org/dist/maven/enforcer/";
"enforcer-" version "-source-release.zip"))
(sha256
(base32
@@ -3064,7 +3064,7 @@ (define-public maven-artifact-transfer
(version "0.13.1")
(source (origin
(method url-fetch)
- (uri (string-append "mirror://apache/maven/shared/"
+ (uri (string-append "https://dlcdn.apache.org/dist/maven/shared/";
"maven-artifact-transfer-" version
"-source-release.zip"))
(sha256
@@ -3119,7 +3119,7 @@ (define-public maven-install-plugin
(version "3.0.0-M1")
(source (origin
(method url-fetch)
- (uri (string-append "mirror://apache/maven/plugins/"
+ (uri (string-append "https://dlcdn.apache.org/dist/maven/plugins/";
"maven-install-plugin-" version
"-source-release.zip"))
(sha256
@@ -3424,7 +3424,7 @@ (define-public java-surefire-logger-api
(version "3.0.0-M4")
(source (origin
(method url-fetch)
- (uri (string-append "mirror://apache/maven/surefire/"
+ (uri (string-append "https://dlcdn.apache.org/dist/maven/surefire/";
"surefire-" version "-source-release.zip"))
(sha256
(base32
diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm
index cf9a2f7a4c..a20a46c76e 100644
--- a/gnu/packages/version-control.scm
+++ b/gnu/packages/version-control.scm
@@ -2139,7 +2139,7 @@ (define-public subversion
(version "1.14.2")
(source (origin
(method url-fetch)
- (uri (string-append "mirror://apache/subversion/"
+ (uri (string-append "https://dlcdn.apache.org/dist/subversion/";
"subversion-" version ".tar.bz2"))
(sha256
(base32
diff --git a/gnu/packages/web.scm b/gnu/packages/web.scm
index 4a4252138b..0c88091ea4 100644
--- a/gnu/packages/web.scm
+++ b/gnu/packages/web.scm
@@ -283,7 +283,7 @@ (define-public httpd
(version "2.4.58")
(source (origin
(method url-fetch)
- (uri (string-append "mirror://apache/httpd/httpd-"
+ (uri (string-append "https://dlcdn.apache.org/dist/httpd/httpd-";
version ".tar.bz2"))
(sha256
(base32
@@ -321,7 +321,7 @@ (define-public httpd/pinned
(version "2.4.52")
(source (origin
(method url-fetch)
- (uri (string-append "mirror://apache/httpd/httpd-"
+ (uri (string-append "https://archive.apache.org/dist/httpd/httpd-";
version ".tar.bz2"))
(sha256
(base32
@@ -2174,7 +2174,7 @@ (define-public serf
(source
(origin
(method url-fetch)
- (uri (string-append "mirror://apache/serf/serf-"
+ (uri (string-append "https://dlcdn.apache.org/dist/serf/serf-";
version ".tar.bz2"))
(patches (search-patches "serf-python3.patch"))
(sha256
@@ -7040,7 +7040,7 @@ (define-public java-tomcat
(version "8.5.63")
(source (origin
(method url-fetch)
- (uri (string-append "mirror://apache/tomcat/tomcat-8/v"
+ (uri (string-append "https://dlcdn.apache.org/dist/tomcat/tomcat-8/v";
version "/src/apache-tomcat-" version "-src.tar.gz"))
(sha256
(base32
diff --git a/gnu/packages/xml.scm b/gnu/packages/xml.scm
index 01e48fda57..7ff078ffbe 100644
--- a/gnu/packages/xml.scm
+++ b/gnu/packages/xml.scm
@@ -1487,7 +1487,7 @@ (define-public xerces-c
(version "3.2.3")
(source (origin
(method url-fetch)
- (uri (string-append "mirror://apache/xerces/c/3/sources/"
+ (uri (string-append "https://dlcdn.apache.org/dist/xerces/c/3/sources/";
"xerces-c-" version ".tar.xz"))
(sha256
(base32
diff --git a/guix/download.scm b/guix/download.scm
index 38f5141cb9..d9ed8c8f26 100644
--- a/guix/download.scm
+++ b/guix/download.scm
@@ -133,19 +133,6 @@ (define %mirrors
"http://ftp.be.debian.org/pub/";
"https://mirrors.edge.kernel.org/pub/";
"ftp://ftp.funet.fi/pub/mirrors/ftp.kernel.org/pub/";)
- (apache ; from http://www.apache.org/mirrors/dist.html
- "http://www.eu.apache.org/dist/";
- "http://www.us.apache.org/dist/";
- "https://ftp.nluug.nl/internet/apache/";
- "http://apache.mirror.iweb.ca/";
- "http://mirrors.ircam.fr/pub/apache/";
- "http://apache.mirrors.ovh.net/ftp.apache.org/dist/";
- "http://apache-mirror.rbc.ru/pub/apache/";
- "ftp://ftp.osuosl.org/pub/apache/";
- "http://mirrors.ibiblio.org/apache/";
-
- ;; As a last resort, try the archive.
- "http://archive.apache.org/dist/";)
(xorg ; from http://www.x.org/wiki/Releases/Download
"http://www.x.org/releases/"; ; main mirrors
"http://mirror.csclub.uwaterloo.ca/x.org/"; ; North America
