me
/
guix
Archived
1
0
Fork 0
Code

gnu: julia: Update to 1.5.2. 

* gnu/packages/julia.scm (libuv-julia): No change to libuv.version.
(julia-patch): Update to 1.5.2.
(llvm-julia)[inherit]: Update to use llvm-9.
[source]: Apply patches for llvm-9 from deps/llvm.mk.
(julia): Update to 1.5.2.
[source]: Remove substitutions for precompile.jl and cmdlineargs.jl.
Add a substitution for Dates/io tests.  Set --depwarn=error for tests.
[arguments]: Set LLVM_VER=9.0.1.

Signed-off-by: Ludovic Courtès <ludo@gnu.org>
master
Tim Howes 2020-10-14 20:05:28 -07:00 committed by Ludovic Courtès
parent b601aadaf5
commit 9a4c83bdb6
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
1 changed files with 49 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

113
gnu/packages/julia.scm
View File

@ -2,6 +2,7 @@
;;; Copyright © 2015, 2016, 2017 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2015, 2016, 2017 Ricardo Wurmus <rekado@elephly.net>
;;; Copyright © 2016, 2020 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2016, 2020 Efraim Flashner <efraim@flashner.co.il>
;;; Copyright © 2020 Nicolò Balzarotti <nicolo@nixo.xyz> ;;; Copyright © 2020 Nicolò Balzarotti <nicolo@nixo.xyz>
;;; Copyright © 2020 Tim Howes <timhowes@lavabit.com>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -53,7 +54,7 @@
(let ((commit "35b1504507a7a4168caae3d78db54d1121b121e1") (let ((commit "35b1504507a7a4168caae3d78db54d1121b121e1")
(revision "1")) (revision "1"))
;; When upgrading Julia, also upgrade this. Get the commit from ;; When upgrading Julia, also upgrade this. Get the commit from
;; https://github.com/JuliaLang/julia/blob/v1.4.1/deps/libuv.version ;; https://github.com/JuliaLang/julia/blob/v1.5.2/deps/libuv.version
(package (package
(inherit libuv) (inherit libuv)
(name "libuv-julia") (name "libuv-julia")
@ -103,7 +104,7 @@
"/deps/patches/" name ".patch")) "/deps/patches/" name ".patch"))
(define (julia-patch name sha) (define (julia-patch name sha)
(let ((version "1.4.1")) (let ((version "1.5.2"))
(origin (method url-fetch) (origin (method url-fetch)
(uri (julia-patch-url version name)) (uri (julia-patch-url version name))
(sha256 (base32 sha)) (sha256 (base32 sha))
@ -111,63 +112,52 @@
(define llvm-julia (define llvm-julia
(package (package
(inherit llvm-8) (inherit llvm-9)
(name "llvm-julia") (name "llvm-julia")
(source (origin (source (origin
(inherit (package-source llvm-8)) (inherit (package-source llvm-9))
;; Those patches are inside the Julia source repo. ;; Those patches are inside the Julia source repo.
;; They are _not_ Julia specific (https://github.com/julialang/julia#llvm) ;; They are _not_ Julia specific (https://github.com/julialang/julia#llvm)
;; but they are required to build Julia. ;; but they are required to build Julia.
;; Discussion: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=919628 ;; Discussion: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=919628
(patches (patches
(map (match-lambda (map (match-lambda
((name hash) ((name hash)
(julia-patch name hash))) (julia-patch name hash)))
(list (list
'("llvm-7.0-D44650" '("llvm-D27629-AArch64-large_model_6.0.1"
"1h55kkmkiisfj6sk956if2bcj9s0v6n5czn8dxb870vp5nccj3ir") "1qrshmlqvnasdyc158vfn3hnbigqph3lsq7acb9w8lwkpnnm2j4z")
'("llvm-6.0-DISABLE_ABI_CHECKS" '("llvm8-D34078-vectorize-fdiv"
"014fawd1ba7yckalypfld22zgic87x9nx3cim42zrwygywd36pyg") "19spqc3xsazn1xs9gpcgv9ldadfkv49rmc5khl7sf1dlmhgi4602")
'("llvm-6.0-NVPTX-addrspaces" '("llvm-7.0-D44650"
"1qdi2zmrjsrj0h84zv2vyly2hjcn4f67mfy0s1q353g4v4jkscqc") "1h55kkmkiisfj6sk956if2bcj9s0v6n5czn8dxb870vp5nccj3ir")
'("llvm-D27629-AArch64-large_model_6.0.1" '("llvm9-D50010-VNCoercion-ni"
"1qrshmlqvnasdyc158vfn3hnbigqph3lsq7acb9w8lwkpnnm2j4z") "1s1d3sjsiq4vxg7ncy5cz56zgy5vcq6ls3iqaiqkvr23wyryqmdx")
'("llvm8-D34078-vectorize-fdiv" '("llvm-exegesis-mingw"
"19spqc3xsazn1xs9gpcgv9ldadfkv49rmc5khl7sf1dlmhgi4602") "0ph1cj1j7arvf1xq2xcr7qf9g0cpdl14fincgr67vpi520zvd3vp")
'("llvm7-D50010-VNCoercion-ni" '("llvm-test-plugin-mingw"
"18scg6aa036xa1508s7q93w9dvc5gp69fz6yl6fkh4yffw4gymw6") "12z738cnahbf6n381im7i0hxp1m6k9hrnfjlmq9sac46nxly9gnj")
'("llvm-8.0-D50167-scev-umin" '("llvm7-revert-D44485"
"0g9w2x8yryjdkihnrf18x0yi5bi14c5p8wffda1w732dr5ckzk94") "0f59kq3p3mpwsbmskypbi4zn01l6ig0x7v2rjp08k2r8z8m6fa8n")
'("llvm-D57118-powerpc" '("llvm-8.0-D66657-codegen-degenerate"
"0vxz5s0s9b625v1rv8lg1566yhxh1i91ydzmvy5s7njvzc7p19aw") "1n1ddx19h90bbpimdyd9dh8fsm6gb93xxyqm4ljkxa1k3cx2vm72")
'("llvm8-WASM-addrspaces" '("llvm-8.0-D71495-vectorize-freduce"
"1176agj9hh7csdm2lnklb42zcdsb3q6lx9jiyp2shn4p2678y76q") "1zff08wvji9lnpskk4b3p5zyjsy5hhy23ynxjqlj9dw7jvvfrf0p")
'("llvm-exegesis-mingw" '("llvm-D75072-SCEV-add-type"
"0ph1cj1j7arvf1xq2xcr7qf9g0cpdl14fincgr67vpi520zvd3vp") "029a3fywsm233vf48mscina24idd50dc75wr70lmimrhwnw27p0z")
'("llvm-test-plugin-mingw" '("llvm-9.0-D65174-limit-merge-stores"
"12z738cnahbf6n381im7i0hxp1m6k9hrnfjlmq9sac46nxly9gnj") "04bff1mnblfj9mxfdwr1qdnw3i3szmp60gnhxwas5y68qg33z6j0")
'("llvm-8.0-D66401-mingw-reloc" '("llvm9-D71443-PPC-MC-redef-symbol"
"15v3p5sznn979cfnd7gdn3nd701fd7xd5aks6lnj1mslvljlq3ls") "1c93nv7rgc9jg5mqrnvv08xib1789qvlql94fwggh18mp3b9hbgy")
'("llvm7-revert-D44485" '("llvm-9.0-D78196"
"0f59kq3p3mpwsbmskypbi4zn01l6ig0x7v2rjp08k2r8z8m6fa8n") "08a43hyg7yyqjq2vmfsmppf34xcz60wq6y9zw5fdyhw2h1mcnmns")
'("llvm-8.0-D63688-wasm-isLocal" '("llvm-julia-tsan-custom-as"
"0i9wi5n63ip3802z6m7aj3p07hkqjlmp4vg4wq3xkf9f6w9rksab") "0awh40kf6lm4wn1nsjd1bmhfwq7rqj811szanp2xkpspykw9hg9s")
'("llvm-8.0-D55758-tablegen-cond" '("llvm-9.0-D85499"
"1l08mg7qigravi7plsq3yzya80fljnp95n8faddr29wbr2qr0655") "0vxlr35srvbvihlgrxq15v6dylp90vgi0qahj22j01jgqmdasjkm"))))
'("llvm-8.0-D59389-refactor-wmma" (patch-flags '("-p1"))))
"0rgrwk4xlwpk7yai2j7xadcfws93rmk2hhh44fysa88imvrbp478")
'("llvm-8.0-D59393-mma-ptx63-fix"
"094jcsxbcx9fljj623mgmc0rjpk12s2rs0di0ck0hakzhr8mbv5n")
'("llvm-8.0-D66657-codegen-degenerate"
"1n1ddx19h90bbpimdyd9dh8fsm6gb93xxyqm4ljkxa1k3cx2vm72")
'("llvm-8.0-D71495-vectorize-freduce"
"1zff08wvji9lnpskk4b3p5zyjsy5hhy23ynxjqlj9dw7jvvfrf0p")
'("llvm-8.0-D75072-SCEV-add-type"
"0amlyyndsc90ml2k6prdahf24q0j23nfmlbqf8gcqcxpl5sqq3i6")
'("llvm-8.0-D65174-limit-merge-stores"
"1ls5114fhgip9rbqabqc16mi367ra0k75ngc1vyqqhq1ghm9x7y9"))))))
(arguments (arguments
(substitute-keyword-arguments (package-arguments llvm-8) (substitute-keyword-arguments (package-arguments llvm-9)
((#:configure-flags flags) ((#:configure-flags flags)
`(list ;; Taken from NixOS. Only way I could get libLLVM-6.0.so `(list ;; Taken from NixOS. Only way I could get libLLVM-6.0.so
"-DCMAKE_BUILD_TYPE=Release" "-DCMAKE_BUILD_TYPE=Release"
@ -231,7 +221,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.4.1") (version "1.5.2")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append (uri (string-append
@ -239,7 +229,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
"030aza3qj5zcinxbrbqgi7p64q6klwq2bhwccraarx7l0hg9lw3i")) "08wazf3f1lb2c2c5s700kyak8llfqwki8xlnqyrbwmwxjj801p2n"))
(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)
@ -344,16 +334,6 @@ libraries. It is also a bit like @code{ldd} and @code{otool -L}.")
"tests = filter(e->!in(e,[\"backtrace\",\"exceptions\",\"precompile\", "tests = filter(e->!in(e,[\"backtrace\",\"exceptions\",\"precompile\",
\"client\",\"stacktraces\"]), \"client\",\"stacktraces\"]),
testnames)")) testnames)"))
;; precompile test is broken, fixed in
;; fed29f893544d1dc8f86444c65d632c68168d0f3
(substitute* "test/precompile.jl"
(("@test !isdefined\\(Base.Nothing.name.mt")
"# @test !isdefined(Base.Nothing.name.mt"))
;; When HOME is not set, julia calls uv_os_homedir, which in
;; turns call getpwuid_r. Add the HOME env variable to the
;; external julia call to fix this
(substitute* "test/cmdlineargs.jl"
(("\"JULIA_PROJECT\"") "\"HOME\"=>\"/tmp\", \"JULIA_PROJECT\""))
;; Marking the test as broken as it's a known bug: ;; Marking the test as broken as it's a known bug:
;; https://github.com/JuliaLang/julia/issues/32377 ;; https://github.com/JuliaLang/julia/issues/32377
(substitute* "stdlib/REPL/test/replcompletions.jl" (substitute* "stdlib/REPL/test/replcompletions.jl"
@ -361,11 +341,16 @@ libraries. It is also a bit like @code{ldd} and @code{otool -L}.")
;; Dates has a similar bug: ;; Dates has a similar bug:
;; https://github.com/JuliaLang/julia/issues/34655 ;; https://github.com/JuliaLang/julia/issues/34655
(substitute* "stdlib/Dates/test/io.jl" (substitute* "stdlib/Dates/test/io.jl"
(("\"Dates.Date") "\"Date")
(("\"Dates.Time") "\"Time")) (("\"Dates.Time") "\"Time"))
;; Upstream bug I found when packaging ;; Upstream bug I found when packaging
;; https://github.com/JuliaLang/julia/issues/35785 ;; https://github.com/JuliaLang/julia/issues/35785
(substitute* "test/file.jl" (substitute* "test/file.jl"
(("@test dirname\\(t\\) == d") "@test_broken dirname(t) == d")) (("@test dirname\\(t\\) == d") "@test_broken dirname(t) == d"))
;; Deprecation test fails with --depwarn=no
;; https://github.com/JuliaLang/julia/issues/37673
(substitute* "test/Makefile"
(("./runtests.jl") "--depwarn=error ./runtests.jl"))
#t)) #t))
(add-after 'install 'make-wrapper (add-after 'install 'make-wrapper
(lambda* (#:key inputs outputs #:allow-other-keys) (lambda* (#:key inputs outputs #:allow-other-keys)
@ -416,7 +401,7 @@ libraries. It is also a bit like @code{ldd} and @code{otool -L}.")
(assoc-ref %build-inputs "utf8proc") (assoc-ref %build-inputs "utf8proc")
"/include") "/include")
"USE_SYSTEM_LLVM=1" "USE_SYSTEM_LLVM=1"
"LLVM_VER=8.0.0" "LLVM_VER=9.0.1"
"USE_LLVM_SHLIB=1" "USE_LLVM_SHLIB=1"
"USE_SYSTEM_LIBUNWIND=1" "USE_SYSTEM_LIBUNWIND=1"