gn: julia packaging updates, for upstreaming

1 files changed, 21 insertions, 12 deletions

diff --git a/gn/packages/julia.scm b/gn/packages/julia.scm
index dc904ee..8042fac 100644
--- a/gn/packages/julia.scm
+++ b/gn/packages/julia.scm
@@ -152,6 +152,8 @@ times faster than a R/qtl linear model genome scan using 16 threads.")
     (build-system julia-build-system)
     (arguments
      `(#:tests? #f))    ; Test suite needs a copy of the Julia package repository.
+    (native-inputs
+     `(("julia-example" ,julia-example)))
     (home-page "https://github.com/JuliaLang/PackageCompiler.jl")
     (synopsis "Compile your Julia Package")
     (description "PackageCompiler is a Julia package with two main purposes:
@@ -437,9 +439,9 @@ properties
 @end enumerate")
     (license license:expat)))
 
-;; TODO: Unbundle extra assets? assets/html/
-;; see also: js inputs: src/Writers/HTMLWriter.jl
-;;           latex inputs: src/Writers/LaTeXWriter.jl
+;; ready to upstream!
+;; By removing all the javascript and css downloads any HTML documentation
+;; produced by this package will not be very useful.
 (define-public julia-documenter
   (package
     (name "julia-documenter")
@@ -461,19 +463,25 @@ properties
            (lambda* (#:key inputs #:allow-other-keys)
              (substitute* "src/Deps.jl"
                (("pip install")
-                (string-append (assoc-ref inputs "python") "/bin/pip install")))
+                (string-append (assoc-ref inputs "python")
+                               "/bin/pip install")))
              #t))
-         )
-       ))
+         (add-after 'unpack 'remove-javascript-downloads
+           (lambda _
+             (substitute* "src/Writers/HTMLWriter.jl"
+               (("cdnjs.cloudflare.com") "example.com"))
+             ;; Removing the javascript downloads causes these tests fail.
+             (substitute* "test/examples/tests.jl"
+               ((".*Main\\.examples_html_doc.*") "")
+               ((".*Main\\.examples_html_mathjax3_doc.*") ""))
+             #t)))))
     (propagated-inputs
      `(("julia-ansicoloredprinters" ,julia-ansicoloredprinters)
        ("julia-docstringextensions" ,julia-docstringextensions)
        ("julia-iocapture" ,julia-iocapture)
        ("julia-json" ,julia-json)))
     (inputs
-     `(
-       ("python" ,python-wrapper)
-       ))
+     `(("python" ,python-wrapper)))
     (native-inputs
      `(("git" ,(S "git-minimal"))
        ("julia-documentermarkdown" ,julia-documentermarkdown)
@@ -510,11 +518,12 @@ properties
              (substitute* '("assets/html/documenter.js"
                             "assets/html/search.js"
                             "src/Writers/HTMLWriter.jl")
-               (("https.*(min|css|js)$") ""))
+               (("cdnjs.cloudflare.com") "example.com"))
              #t)))))
     (propagated-inputs
      `(("julia-docstringextensions" ,julia-docstringextensions)
        ("julia-json" ,julia-json)))
+    (inputs `())
     (native-inputs `())
     (properties '((hidden? . #t)))))
 
@@ -657,8 +666,8 @@ ANSI escape codes to another format.")
        `(("julia-jllwrappers" ,julia-jllwrappers)))
       (home-page "https://github.com/JuliaBinaryWrappers/libsass_jll.jl")
       (synopsis "Julia wrapper for libsass")
-      (description "This package provides a wrapper for libsass  It is an
-autogenerated source package constructed using @code{BinaryBuilder.jl}. The
+      (description "This package provides a wrapper for libsass.  It is an
+autogenerated source package constructed using @code{BinaryBuilder.jl}.  The
 originating @code{build_tarballs.jl} script can be found on the community
 build tree Yggdrasil.")
       (license license:expat))))