me/guix
Archived
1
0
Fork 0
Code Activity

gnu: julia: Update to 1.6.2.

Browse source 
* gnu/packages/julia.scm (julia): Update to 1.6.2.
[arguments]: Add phase to adjust the expected number of precompile
statements. Adjust custom 'disable-broken-tests phase to remove fixed
test.
[native-inputs]: Remove nss-certs.
This commit is contained in:
Efraim Flashner 2021-08-05 19:41:14 +03:00
parent 1711f52931
commit 8822ee1775
No known key found for this signature in database
GPG key ID: 41AAE7DCCA3D8351
1 changed files with 10 additions and 8 deletions

18
gnu/packages/julia.scm
View file

@ -32,7 +32,6 @@
#:use-module (gnu packages) #:use-module (gnu packages)
#:use-module (gnu packages algebra) #:use-module (gnu packages algebra)
#:use-module (gnu packages base) #:use-module (gnu packages base)
#:use-module (gnu packages certs)
#:use-module (gnu packages compression) #:use-module (gnu packages compression)
#:use-module (gnu packages curl) #:use-module (gnu packages curl)
#:use-module (gnu packages elf) #:use-module (gnu packages elf)
@ -273,7 +272,7 @@ libraries. It is also a bit like @code{ldd} and @code{otool -L}.")
(define-public julia (define-public julia
(package (package
(name "julia") (name "julia")
(version "1.6.1") (version "1.6.2")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append (uri (string-append
@ -281,7 +280,7 @@ libraries. It is also a bit like @code{ldd} and @code{otool -L}.")
version "/julia-" version ".tar.gz")) version "/julia-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"1mfzbjyqcmx7wb1sa7qab5fl78yzd7ap088krqbphbwvpn880srn")) "0plbj4laifzz8ppk889iv3gaxj1mdddzv7yad6ghml6bfnn24r6m"))
(patches (patches
(search-patches "julia-SOURCE_DATE_EPOCH-mtime.patch")))) (search-patches "julia-SOURCE_DATE_EPOCH-mtime.patch"))))
(build-system gnu-build-system) (build-system gnu-build-system)
@ -341,6 +340,13 @@ libraries. It is also a bit like @code{ldd} and @code{otool -L}.")
(("\\$\\$\\(build_depsbindir\\)/libwhich") (("\\$\\$\\(build_depsbindir\\)/libwhich")
(string-append (assoc-ref inputs "libwhich") "/bin/libwhich"))) (string-append (assoc-ref inputs "libwhich") "/bin/libwhich")))
#t)) #t))
(add-after 'unpack 'change-number-of-precompile-statements
(lambda _
;; Remove nss-certs drops the number of statements below 1200,
;; causing the build to fail prematurely.
(substitute* "contrib/generate_precompile.jl"
(("1200") "1100"))
#t))
;; For some reason libquadmath is unavailable on this architecture. ;; For some reason libquadmath is unavailable on this architecture.
;; https://github.com/JuliaLang/julia/issues/41613 ;; https://github.com/JuliaLang/julia/issues/41613
,@(if (target-aarch64?) ,@(if (target-aarch64?)
@ -499,9 +505,6 @@ libraries. It is also a bit like @code{ldd} and @code{otool -L}.")
"@test_broken ispath(ca_roots_path())") "@test_broken ispath(ca_roots_path())")
(("@test ca_roots_path\\(\\) \\!= bundled_ca_roots\\(\\)") (("@test ca_roots_path\\(\\) \\!= bundled_ca_roots\\(\\)")
"@test_broken ca_roots_path() != bundled_ca_roots()")) "@test_broken ca_roots_path() != bundled_ca_roots()"))
;; Some digraphs are too wide for some terminals during testing.
(substitute* "stdlib/Unicode/test/runtests.jl"
(("test collect\\(graphemes") "test_broken collect(grapemes"))
;; WARNING: failed to select UTF-8 encoding, using ASCII ;; WARNING: failed to select UTF-8 encoding, using ASCII
;; Using 'setlocale' doesn't affect the test failures. ;; Using 'setlocale' doesn't affect the test failures.
;(setlocale LC_ALL "en_US.utf8") ;(setlocale LC_ALL "en_US.utf8")
@ -659,8 +662,7 @@ libraries. It is also a bit like @code{ldd} and @code{otool -L}.")
("dsfmt" ,dsfmt) ("dsfmt" ,dsfmt)
("libwhich" ,libwhich))) ("libwhich" ,libwhich)))
(native-inputs (native-inputs
`(("nss-certs" ,nss-certs) `(("openssl" ,openssl)
("openssl" ,openssl)
("perl" ,perl) ("perl" ,perl)
("patchelf" ,patchelf) ("patchelf" ,patchelf)
("pkg-config" ,pkg-config) ("pkg-config" ,pkg-config)