diff options
| author | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2023-03-23 21:45:21 -0400 |
|---|---|---|
| committer | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2023-03-23 21:45:21 -0400 |
| commit | 839bb4616f13171a23ad7937bf57d0a01d61d42a (patch) | |
| tree | 01de78a5ce973b9fb7ac0f9216d64f736f8e163d /gnu/packages/julia.scm | |
| parent | 0357bbbcd850f9220078a62da3c30358b8983765 (diff) | |
| parent | ef71e3290916583973724316e815cee840c1b6d8 (diff) | |
| download | guix-839bb4616f13171a23ad7937bf57d0a01d61d42a.tar.gz | |
Merge remote-tracking branch 'origin/master' into staging.
With resolved conflicts in: gnu/packages/ibus.scm gnu/packages/image.scm gnu/packages/lisp.scm gnu/packages/virtualization.scm
Diffstat (limited to 'gnu/packages/julia.scm')
| -rw-r--r-- | gnu/packages/julia.scm | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/gnu/packages/julia.scm b/gnu/packages/julia.scm index d35901eadb..906cb4b94c 100644 --- a/gnu/packages/julia.scm +++ b/gnu/packages/julia.scm @@ -31,6 +31,7 @@ #:use-module (guix utils) #:use-module (guix git-download) #:use-module (guix build-system gnu) + #:use-module ((guix search-paths) #:select ($SSL_CERT_FILE)) #:use-module (gnu packages) #:use-module (gnu packages algebra) #:use-module (gnu packages base) @@ -292,6 +293,15 @@ libraries. It is also a bit like @code{ldd} and @code{otool -L}.") (substitute* (jlpath "libblastrampoline") (("libblastrampoline\\.so") (search-input-file inputs "/lib/libblastrampoline.so")))))) + (add-before 'build 'use-ssl-cert-file + (lambda _ + ;; We must adapt MozillaCACerts to use SSL_CERT_FILE. + (substitute* "stdlib/MozillaCACerts_jll/src/MozillaCACerts_jll.jl" + (("global cacert = .*") + (string-append + "global cacert = get(ENV, \"SSL_CERT_FILE\"," + ;; our fallback location. + "\"/etc/ssl/certs/ca-certificates.crt\")\n"))))) (add-after 'unpack 'enable-parallel-tests (lambda* (#:key parallel-tests? #:allow-other-keys) (when parallel-tests? @@ -309,6 +319,8 @@ libraries. It is also a bit like @code{ldd} and @code{otool -L}.") (("4.1.0") ,(package-version (this-package-input "mpfr")))) (substitute* "stdlib/GMP_jll/test/runtests.jl" (("6.2.1") ,(package-version (this-package-input "gmp")))) + (substitute* "stdlib/LibGit2_jll/test/runtests.jl" + (("1.3.0") ,(package-version (this-package-input "libgit2")))) (substitute* "stdlib/nghttp2_jll/test/runtests.jl" (("1.48.0") ,(package-version (this-package-input "libnghttp2")))) (substitute* "stdlib/Zlib_jll/test/runtests.jl" @@ -525,7 +537,8 @@ using Dates: @dateformat_str, Date, DateTime, DateFormat, Time")) (files (list "share/julia/loadpath/"))) (search-path-specification (variable "JULIA_DEPOT_PATH") - (files (list "share/julia/"))))) + (files (list "share/julia/"))) + $SSL_CERT_FILE)) ;; Julia only officially supports some of our platforms: ;; https://julialang.org/downloads/#supported_platforms (supported-systems '("i686-linux" "x86_64-linux" "aarch64-linux")) |