diff options
Diffstat (limited to 'gnu/packages/julia.scm')
| -rw-r--r-- | gnu/packages/julia.scm | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/gnu/packages/julia.scm b/gnu/packages/julia.scm index 33242a08a4..e621c8b936 100644 --- a/gnu/packages/julia.scm +++ b/gnu/packages/julia.scm @@ -341,7 +341,7 @@ libraries. It is also a bit like @code{ldd} and @code{otool -L}.") ;; call our version (substitute* "base/Makefile" (("\\$\\$\\(build_depsbindir\\)/libwhich") - (string-append (assoc-ref inputs "libwhich") "/bin/libwhich"))) + (search-input-file inputs "/bin/libwhich"))) #t)) (add-after 'unpack 'change-number-of-precompile-statements (lambda _ @@ -387,9 +387,7 @@ libraries. It is also a bit like @code{ldd} and @code{otool -L}.") (substitute* "base/Makefile" (("\\$\\(build_includedir\\)/uv/errno.h") - (string-append (assoc-ref inputs "libuv") - "/include/uv/errno.h"))) - #t)) + (search-input-file inputs "/include/uv/errno.h"))))) (add-before 'build 'replace-default-shell (lambda _ (substitute* "base/client.jl" @@ -462,17 +460,23 @@ libraries. It is also a bit like @code{ldd} and @code{otool -L}.") #t)) (add-after 'unpack 'adjust-test-suite (lambda* (#:key inputs #:allow-other-keys) - (let (;(pcre2 (assoc-ref inputs "pcre2")) + (let ((pcre2 (assoc-ref inputs "pcre2")) (mbedtls-apache (assoc-ref inputs "mbedtls")) (mpfr (assoc-ref inputs "mpfr")) + (gmp (assoc-ref inputs "gmp")) + (nghttp2 (assoc-ref inputs "libnghttp2")) (suitesparse (assoc-ref inputs "suitesparse"))) ;; Some tests only check to see if the input is the correct version. - ;(substitute* "stdlib/PCRE2_jll/test/runtests.jl" - ; (("10.36.0") ,(package-version pcre2))) + (substitute* "stdlib/PCRE2_jll/test/runtests.jl" + (("10.36.0") ,(package-version pcre2))) (substitute* "stdlib/MbedTLS_jll/test/runtests.jl" (("2.24.0") ,(package-version mbedtls-apache))) (substitute* "stdlib/MPFR_jll/test/runtests.jl" (("4.1.0") ,(package-version mpfr))) + (substitute* "stdlib/GMP_jll/test/runtests.jl" + (("6.2.0") ,(package-version gmp))) + (substitute* "stdlib/nghttp2_jll/test/runtests.jl" + (("1.41.0") ,(package-version nghttp2))) (substitute* "stdlib/SuiteSparse_jll/test/runtests.jl" (("5004") ,(string-replace-substring (version-major+minor @@ -652,9 +656,7 @@ libraries. It is also a bit like @code{ldd} and @code{otool -L}.") ("openblas" ,openblas) ("openlibm" ,openlibm) ("p7zip" ,p7zip) - ;; pcre2-10.35 has a bug with the JIT regex parser: - ;; https://github.com/JuliaLang/julia/issues/40231#issuecomment-812753324 - ("pcre2" ,pcre2-10.36) + ("pcre2" ,pcre2) ("suitesparse" ,suitesparse) ("utf8proc" ,utf8proc-2.6.1) ("wget" ,wget) |