[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
11/71: gnu: julia-imagemagick-jll: Move to (gnu packages julia-jll).
From: |
guix-commits |
Subject: |
11/71: gnu: julia-imagemagick-jll: Move to (gnu packages julia-jll). |
Date: |
Sun, 30 May 2021 05:57:31 -0400 (EDT) |
efraim pushed a commit to branch master
in repository guix.
commit 191c345d3ea78beae0b4a2ad4e26cd2f51222cb4
Author: Efraim Flashner <efraim@flashner.co.il>
AuthorDate: Sun May 30 10:42:24 2021 +0300
gnu: julia-imagemagick-jll: Move to (gnu packages julia-jll).
* gnu/packages/julia-xyz.scm (julia-imagemagick-jll): Move to ...
* gnu/packages/julia-jll.scm: ... here.
---
gnu/packages/julia-jll.scm | 44 ++++++++++++++++++++++++++++++++++++++++++++
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 e8d382a..7fcc119 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 2fe172b..ff20745 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")
- 01/71: gnu: julia-jllwrappers: Move to (gnu packages julia-jll)., (continued)
- 01/71: gnu: julia-jllwrappers: Move to (gnu packages julia-jll)., guix-commits, 2021/05/30
- 02/71: gnu: julia-compilersupportlibraries-jll: Move to (gnu packages julia-jll)., guix-commits, 2021/05/30
- 03/71: gnu: julia-gumbo-jll: Move to (gnu packages julia-jll)., guix-commits, 2021/05/30
- 04/71: gnu: julia-jpegturbo-jll: Move to (gnu packages julia-jll)., guix-commits, 2021/05/30
- 05/71: gnu: julia-mbedtls-jll: Move to (gnu packages julia-jll)., guix-commits, 2021/05/30
- 06/71: gnu: julia-openspecfun-jll: Move to (gnu packages julia-jll)., guix-commits, 2021/05/30
- 07/71: gnu: julia-zlib-jll: Move to (gnu packages julia-jll)., guix-commits, 2021/05/30
- 09/71: gnu: julia-libpng-jll: Move to (gnu packages julia-jll)., guix-commits, 2021/05/30
- 12/71: gnu: Add julia-x264-jll., guix-commits, 2021/05/30
- 08/71: gnu: julia-zstd-jll: Move to (gnu packages julia-jll)., guix-commits, 2021/05/30
- 11/71: gnu: julia-imagemagick-jll: Move to (gnu packages julia-jll).,
guix-commits <=
- 14/71: gnu: Add julia-fribidi-jll., guix-commits, 2021/05/30
- 17/71: gnu: Add julia-lame-jll., guix-commits, 2021/05/30
- 19/71: gnu: Add julia-libvorbis-jll., guix-commits, 2021/05/30
- 10/71: gnu: julia-libtiff-jll: Move to (gnu packages julia-jll)., guix-commits, 2021/05/30
- 13/71: gnu: Add julia-bzip2-jll., guix-commits, 2021/05/30
- 15/71: gnu: Add julia-freetype2-jll., guix-commits, 2021/05/30
- 16/71: gnu: Add julia-libfdk-aac-jll., guix-commits, 2021/05/30
- 18/71: gnu: Add julia-ogg-jll., guix-commits, 2021/05/30
- 20/71: gnu: Add julia-x265-jll., guix-commits, 2021/05/30
- 21/71: gnu: Add julia-openssl-jll., guix-commits, 2021/05/30