3
0
Fork 0
forked from mirrors/nixpkgs
Commit graph

235 commits

Author SHA1 Message Date
Kerstin Humm 8705d0826f
imagemagick6: 6.9.12-19 -> 6.9.12-26 2021-10-25 14:14:25 +02:00
Johannes Arnold 7662f6dd21 imagemagick: build with libraw 2021-10-12 02:23:01 +02:00
Kerstin Humm 075c492243
imagemagick: 7.1.0-8 -> 7.1.0-9 2021-10-05 18:02:08 +02:00
Rick van Schijndel 224019bd1c imagemagick: unbreak for aarch64
With the newly added libjxl dependency it was broken, since libjxl
doesn't build on aarch64. Remove that dependency if we're building for
aarch64 for now, until the compiler / library is fixed.
2021-10-01 21:50:53 +02:00
Luflosi 241c3e0b3f imagemagick: add build option for JPEG XL image format 2021-09-24 12:08:34 +02:00
Kerstin Humm 279bff87fe imagemagick: 7.1.0-6 -> 7.1.0-8 2021-09-22 19:01:50 -07:00
Kerstin Humm 3e0e70d1d3
imagemagick: 7.1.0-5 -> 7.1.0-6 2021-09-09 20:56:12 +02:00
Kerstin Humm 042229148d
imagemagick: 7.1.0-4 -> 7.1.0-5 2021-08-22 17:05:26 +02:00
Frederik Rietdijk 62370fb59a Merge remote-tracking branch 'upstream/master' into staging-next 2021-07-26 09:19:44 +02:00
Robert Schütz beb353c776 imagemagick6: 6.9.12-17 -> 6.9.12-19 2021-07-25 15:45:36 +02:00
Kerstin Humm 937dae1dad
imagemagick: 7.1.0-2 -> 7.1.0-4 2021-07-18 23:15:39 +02:00
github-actions[bot] 8f71a7f335
Merge staging-next into staging 2021-06-26 18:04:40 +00:00
Robert Schütz 071e8ee2f7 imagemagick7: 7.1.0-1 -> 7.1.0-2 2021-06-26 16:42:21 +02:00
Robert Schütz a93194815b imagemagick6: 6.9.12-16 -> 6.9.12-17 2021-06-26 16:41:14 +02:00
Sandro 6b4b3deaed
Merge pull request #83149 from DieracDelta/fix/imagemagick-default
imagemagick: add liquid rescale build option
2021-06-25 19:17:02 +02:00
Justin Restivo 77c3d60b89
imagemagick: add liquid rescale build option 2021-06-24 21:11:41 -04:00
github-actions[bot] b766664645
Merge staging-next into staging 2021-06-22 12:05:04 +00:00
github-actions[bot] c7bb5a79c8
Merge master into staging-next 2021-06-22 12:05:00 +00:00
Robert Schütz d2b489b24a imagemagick6: 6.9.12-15 -> 6.9.12-16 2021-06-22 12:50:33 +02:00
Robert Schütz f6ca26a309
Merge pull request #127775 from erictapen/imagemagick-7.1.0-1
imagemagick: 7.1.0-0 -> 7.1.0-1
2021-06-22 12:44:21 +02:00
Kerstin Humm 1688ff519b
imagemagick: 7.1.0-0 -> 7.1.0-1 2021-06-22 11:45:57 +02:00
github-actions[bot] 9a860729b2
Merge staging-next into staging 2021-06-14 00:08:51 +00:00
github-actions[bot] 13f31f60bf
Merge master into staging-next 2021-06-14 00:08:48 +00:00
Robert Schütz 162e6eaa34 imagemagick: 7.0.11-14 -> 7.1.0-0 2021-06-13 21:30:00 +02:00
Robert Schütz 547fb093c3 imagemagick6: 6.9.12-14 -> 6.9.12-15 2021-06-13 20:48:11 +02:00
github-actions[bot] 8f3ead7190
Merge staging-next into staging 2021-06-11 18:05:09 +00:00
github-actions[bot] 69f9534853
Merge master into staging-next 2021-06-11 18:05:07 +00:00
Kerstin Humm 99f12af681 imagemagick: 6.9.12-12 -> 6.9.12-14 2021-06-11 16:34:41 +02:00
Sandro 67897e581c
Merge pull request #125119 from erictapen/imagemagick-7.0.11-14
imagemagick: 7.0.11-13 -> 7.0.11-14
2021-06-03 17:11:49 +02:00
github-actions[bot] 15d7e7d545
Merge staging-next into staging 2021-06-01 07:50:24 +00:00
github-actions[bot] 65e3e9dc51
Merge master into staging-next 2021-06-01 07:50:21 +00:00
Zhaofeng Li 990431c1e3 imagemagick: Allow compilation without --with-gcc-arch
The --with-gcc-arch flag is used to specify the value used for
--march and --mtune [1], therefore it does not make sense to fail the
evaluation simply because it's not enumerated by us. However,
it's necessary to specify --without-gcc-arch, otherwise the config
script will guess the values and lead to incompatible / non-determinstic
artifacts.

[1] 850d5a9fc5/m4/ax_gcc_archflag.m4
2021-05-31 18:40:34 -07:00
Kerstin Humm 31a8c0e5c4
imagemagick: 7.0.11-13 -> 7.0.11-14 2021-05-31 21:15:45 +02:00
Luke Granger-Brown 0afc94a9ff
Merge pull request #123582 from erictapen/imagemagick-7.0.11-13
imagemagick: 7.0.11-12 -> 7.0.11-13
2021-05-23 15:17:35 +01:00
Kerstin Humm c2521a6b36
imagemagick: 7.0.11-12 -> 7.0.11.13 2021-05-18 22:40:33 +02:00
Robert Schütz 09a617cdf7
Merge pull request #123225 from erictapen/imagemagick-7.0.11-12
imagemagick: 7.0.11-9 -> 7.0.11-12
2021-05-18 21:15:35 +02:00
Kerstin Humm 1738b9877a
imagemagick: 7.0.11-9 -> 7.0.11-12 2021-05-18 19:47:33 +02:00
Jonathan Ringer d8e62d8e41
Merge remote-tracking branch 'origin/master' into staging-next
Fix cargo-flash build
2021-05-16 18:27:14 -07:00
Robert Schütz 333994ca6a
Merge pull request #123227 from erictapen/imagemagick-6.9.12-12
imagemagick6: 6.9.12.8 -> 6.9.12-12
2021-05-16 22:27:55 +02:00
Jonathan del Strother c022642fec imagemagick: support aarch64-darwin 2021-05-17 00:28:04 +09:00
Kerstin Humm f1d61e1b4b
imagemagick6: 6.9.12.8 -> 6.9.12-12 2021-05-16 13:21:54 +02:00
Jonathan Ringer 0546e68ef7
Merge remote-tracking branch 'origin/master' into staging-next 2021-05-14 21:57:09 -07:00
Stéphan Kochen 006d7f80eb
imagemagick6: fix darwin build (#123023) 2021-05-14 16:21:38 -04:00
github-actions[bot] 12193913a1
Merge staging-next into staging 2021-05-07 12:23:21 +00:00
Jan Tojnar 9468b07326
Merge branch 'gnome-40' 2021-05-07 12:12:40 +02:00
Arnout Engelen b68130fd2c
test-utilities: version test
Extract 'version test' to a reusable test utility as discussed in
https://github.com/NixOS/nixpkgs/pull/119636#issuecomment-826137021 and
2021-05-07 09:53:35 +02:00
Jan Tojnar 26e044b14a
imagemagick: Try to fix Darwin build 2021-05-05 22:43:09 +02:00
github-actions[bot] b4766e97ee
Merge staging-next into staging 2021-04-30 00:52:06 +00:00
Samuel Gräfenstein bbcb63c308
imagemagick7: add meta.mainProgram 2021-04-29 14:59:31 +02:00
R. RyanTM 922271cc19 imagemagick: 7.0.11-8 -> 7.0.11-9 2021-04-29 13:26:44 +02:00