diff options
| -rw-r--r-- | gnu/packages/julia-jll.scm | 44 | ||||
| -rw-r--r-- | gnu/packages/julia-xyz.scm | 44 |
2 files changed, 44 insertions, 44 deletions
diff --git a/gnu/packages/julia-jll.scm b/gnu/packages/julia-jll.scm index e8d382afea..7fcc11957a 100644 --- a/gnu/packages/julia-jll.scm +++ b/gnu/packages/julia-jll.scm @@ -28,6 +28,7 @@ #:use-module (gnu packages compression) #:use-module (gnu packages gcc) #:use-module (gnu packages image) + #:use-module (gnu packages imagemagick) #:use-module (gnu packages julia) #:use-module (gnu packages maths) #:use-module (gnu packages tls) @@ -117,6 +118,49 @@ build tree Yggdrasil.") (description "This package provides a wrapper for Gumbo HTML parsing library.") (license license:expat))) +(define-public julia-imagemagick-jll + (package + (name "julia-imagemagick-jll") + (version "6.9.10-12+3") + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/JuliaBinaryWrappers/ImageMagick_jll.jl") + (commit (string-append "ImageMagick-v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "1a0vnnjl52yqi7jgpr0dmx5ah5nlpylv5hc8aw2l89b9f36ff8jg")))) + (build-system julia-build-system) + (arguments + '(#:tests? #f ; no runtests + #:phases + (modify-phases %standard-phases + (add-after 'unpack 'override-binary-path + (lambda* (#:key inputs #:allow-other-keys) + (map + (lambda (wrapper) + (substitute* wrapper + ;; Make sure we match the current library. + (("libMagickWand-6.Q16.so.6") "libMagickWand-6.Q16.so.7") + (("artifact\"ImageMagick\"") + (string-append "\"" (assoc-ref inputs "imagemagick") "\"")))) + ;; There's a Julia file for each platform, override them all + (find-files "src/wrappers/" "\\.jl$"))))))) + (propagated-inputs + `(("julia-jllwrappers" ,julia-jllwrappers) + ("julia-jpegturbo-jll" ,julia-jpegturbo-jll) + ("julia-libpng-jll" ,julia-libpng-jll) + ("julia-libtiff-jll" ,julia-libtiff-jll) + ("julia-zlib-jll" ,julia-zlib-jll))) + (inputs + `(("imagemagick" ,imagemagick))) + (home-page "https://github.com/JuliaBinaryWrappers/ImageMagick_jll.jl") + (synopsis "Imagemagick library wrappers") + (description "This package provides a wrapper for Imagemagick.") + (license license:expat))) + (define-public julia-jllwrappers (package (name "julia-jllwrappers") diff --git a/gnu/packages/julia-xyz.scm b/gnu/packages/julia-xyz.scm index 2fe172b6d3..ff207456c3 100644 --- a/gnu/packages/julia-xyz.scm +++ b/gnu/packages/julia-xyz.scm @@ -23,7 +23,6 @@ #:use-module (guix packages) #:use-module (guix git-download) #:use-module (guix build-system julia) - #:use-module (gnu packages imagemagick) #:use-module (gnu packages julia-jll)) (define-public julia-abstractffts @@ -835,49 +834,6 @@ implementing both a client and a server.") conditional ifelse. It is similar to @code{Core.ifelse} but it is extendable.") (license license:expat))) -(define-public julia-imagemagick-jll - (package - (name "julia-imagemagick-jll") - (version "6.9.10-12+3") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/JuliaBinaryWrappers/ImageMagick_jll.jl") - (commit (string-append "ImageMagick-v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "1a0vnnjl52yqi7jgpr0dmx5ah5nlpylv5hc8aw2l89b9f36ff8jg")))) - (build-system julia-build-system) - (arguments - '(#:tests? #f ; no runtests - #:phases - (modify-phases %standard-phases - (add-after 'unpack 'override-binary-path - (lambda* (#:key inputs #:allow-other-keys) - (map - (lambda (wrapper) - (substitute* wrapper - ;; Make sure we match the current library. - (("libMagickWand-6.Q16.so.6") "libMagickWand-6.Q16.so.7") - (("artifact\"ImageMagick\"") - (string-append "\"" (assoc-ref inputs "imagemagick") "\"")))) - ;; There's a Julia file for each platform, override them all - (find-files "src/wrappers/" "\\.jl$"))))))) - (propagated-inputs - `(("julia-jllwrappers" ,julia-jllwrappers) - ("julia-jpegturbo-jll" ,julia-jpegturbo-jll) - ("julia-libpng-jll" ,julia-libpng-jll) - ("julia-libtiff-jll" ,julia-libtiff-jll) - ("julia-zlib-jll" ,julia-zlib-jll))) - (inputs - `(("imagemagick" ,imagemagick))) - (home-page "https://github.com/JuliaBinaryWrappers/ImageMagick_jll.jl") - (synopsis "Imagemagick library wrappers") - (description "This package provides a wrapper for Imagemagick.") - (license license:expat))) - (define-public julia-indexing (package (name "julia-indexing") |