Merge branch 'master' into core-updates

This commit is contained in:
Marius Bakke 2020-03-14 13:13:40 +01:00
commit 961d2ee269
No known key found for this signature in database
GPG key ID: A2A06DF2A33A54FA
123 changed files with 2506 additions and 1195 deletions

View file

@ -9,6 +9,7 @@
;;; Copyright © 2017 Marius Bakke <mbakke@fastmail.com>
;;; Copyright © 2017, 2019 Eric Bavier <bavier@member.fsf.org>
;;; Copyright © 2019 Mathieu Othacehe <m.othacehe@gmail.com>
;;; Copyright © 2020 Björn Höfling <bjoern.hoefling@bjoernhoefling.de>
;;;
;;; This file is part of GNU Guix.
;;;
@ -866,8 +867,8 @@ the la4j library are:
(version "1.6")
(source (origin
(method url-fetch)
(uri (string-append "http://search.maven.org/remotecontent?"
"filepath=pl/edu/icm/JLargeArrays/"
(uri (string-append "https://repo1.maven.org/maven2/"
"pl/edu/icm/JLargeArrays/"
version "/JLargeArrays-" version
"-sources.jar"))
(file-name (string-append name "-" version ".jar"))
@ -893,8 +894,8 @@ that can store up to 263 elements.")
(version "3.1")
(source (origin
(method url-fetch)
(uri (string-append "http://search.maven.org/remotecontent?"
"filepath=com/github/wendykierp/JTransforms/"
(uri (string-append "https://repo1.maven.org/maven2/"
"com/github/wendykierp/JTransforms/"
version "/JTransforms-" version "-sources.jar"))
(sha256
(base32