From 7f3ccc5bdbab469351f3ba08903bfe64cece034e Mon Sep 17 00:00:00 2001
From: Efraim Flashner <efraim@flashner.co.il>
Date: Thu, 5 Aug 2021 13:44:23 +0300
Subject: gnu: julia: Fix building on aarch64-linux.

* gnu/packages/julia.scm (julia)[arguments]: Add phase on aarch64-linux
to skip linking to nonexistant libquadmath.
---
 gnu/packages/julia.scm | 13 +++++++++++++
 1 file changed, 13 insertions(+)

(limited to 'gnu/packages/julia.scm')

diff --git a/gnu/packages/julia.scm b/gnu/packages/julia.scm
index 6045c16b8f..4d739c8434 100644
--- a/gnu/packages/julia.scm
+++ b/gnu/packages/julia.scm
@@ -341,6 +341,19 @@ (define-public julia
                (("\\$\\$\\(build_depsbindir\\)/libwhich")
                 (string-append (assoc-ref inputs "libwhich") "/bin/libwhich")))
              #t))
+         ;; For some reason libquadmath is unavailable on this architecture.
+         ;; https://github.com/JuliaLang/julia/issues/41613
+         ,@(if (target-aarch64?)
+             '((add-after 'unpack 'drop-libquadmath-on-aarch64
+                 (lambda _
+                   (substitute* '("contrib/fixup-libgfortran.sh"
+                                  "deps/csl.mk"
+                                  "base/Makefile")
+                     ((".*libquadmath.*") ""))
+                   (substitute* "Makefile"
+                     (("libquadmath ") ""))
+                   #t)))
+             '())
          (add-before 'check 'set-home
            ;; Some tests require a home directory to be set.
            (lambda _ (setenv "HOME" "/tmp") #t))
-- 
cgit v1.2.3


From 8822ee1775e1d0bf0389ccb7f09ba85bb7535222 Mon Sep 17 00:00:00 2001
From: Efraim Flashner <efraim@flashner.co.il>
Date: Thu, 5 Aug 2021 19:41:14 +0300
Subject: gnu: julia: Update to 1.6.2.

* 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.
---
 gnu/packages/julia.scm | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

(limited to 'gnu/packages/julia.scm')

diff --git a/gnu/packages/julia.scm b/gnu/packages/julia.scm
index 4d739c8434..fe31e545c9 100644
--- a/gnu/packages/julia.scm
+++ b/gnu/packages/julia.scm
@@ -32,7 +32,6 @@ (define-module (gnu packages julia)
   #:use-module (gnu packages)
   #:use-module (gnu packages algebra)
   #:use-module (gnu packages base)
-  #:use-module (gnu packages certs)
   #:use-module (gnu packages compression)
   #:use-module (gnu packages curl)
   #:use-module (gnu packages elf)
@@ -273,7 +272,7 @@ (define-public libwhich
 (define-public julia
   (package
     (name "julia")
-    (version "1.6.1")
+    (version "1.6.2")
     (source (origin
               (method url-fetch)
               (uri (string-append
@@ -281,7 +280,7 @@ (define-public julia
                     version "/julia-" version ".tar.gz"))
               (sha256
                (base32
-                "1mfzbjyqcmx7wb1sa7qab5fl78yzd7ap088krqbphbwvpn880srn"))
+                "0plbj4laifzz8ppk889iv3gaxj1mdddzv7yad6ghml6bfnn24r6m"))
               (patches
                (search-patches "julia-SOURCE_DATE_EPOCH-mtime.patch"))))
     (build-system gnu-build-system)
@@ -341,6 +340,13 @@ (define-public julia
                (("\\$\\$\\(build_depsbindir\\)/libwhich")
                 (string-append (assoc-ref inputs "libwhich") "/bin/libwhich")))
              #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.
          ;; https://github.com/JuliaLang/julia/issues/41613
          ,@(if (target-aarch64?)
@@ -499,9 +505,6 @@ (define-public julia
                 "@test_broken ispath(ca_roots_path())")
                (("@test 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
              ;; Using 'setlocale' doesn't affect the test failures.
              ;(setlocale LC_ALL "en_US.utf8")
@@ -659,8 +662,7 @@ (define-public julia
        ("dsfmt" ,dsfmt)
        ("libwhich" ,libwhich)))
     (native-inputs
-     `(("nss-certs" ,nss-certs)
-       ("openssl" ,openssl)
+     `(("openssl" ,openssl)
        ("perl" ,perl)
        ("patchelf" ,patchelf)
        ("pkg-config" ,pkg-config)
-- 
cgit v1.2.3