ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-12-25 22:08:16 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: julia-imagemagick-jll: Move to (gnu packages julia-jll).

Browse source 
* gnu/packages/julia-xyz.scm (julia-imagemagick-jll): Move to ...
* gnu/packages/julia-jll.scm: ... here.
This commit is contained in:
Efraim Flashner 2021-05-30 10:42:24 +03:00
parent da12e8f7c7
commit 191c345d3e
No known key found for this signature in database
GPG key ID: 41AAE7DCCA3D8351
2 changed files with 44 additions and 44 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
gnu/packages/julia-jll.scm
View file

@ -28,6 +28,7 @@ (define-module (gnu packages julia-jll)
#: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 @@ (define-public julia-gumbo-jll
(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")

44
gnu/packages/julia-xyz.scm
View file

@ -23,7 +23,6 @@ (define-module (gnu packages julia-xyz)
#: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 @@ (define-public julia-ifelse
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")