Commit Graph

334 Commits

Author SHA1 Message Date
R. Ryantm
980cc45e15 imagemagick: 7.1.0-53 -> 7.1.0-54 2022-12-13 10:04:13 +00:00
Thomas Gerbet
a1f5263a86 imagemagick6: 6.9.12-26 -> 6.9.12-68
Fixes CVE-2022-1114, CVE-2022-1115, CVE-2022-3213, CVE-2022-32545, CVE-2022-32546 and CVE-2022-32547.

91af8aa460/ChangeLog.md
2022-12-07 22:24:09 +01:00
R. Ryantm
faef21d3db imagemagick: 7.1.0-52 -> 7.1.0-53 2022-12-06 04:58:01 +00:00
R. Ryantm
894f2bfdcd imagemagick: 7.1.0-51 -> 7.1.0-52 2022-11-07 21:30:49 -08:00
R. Ryantm
4d9e748454 imagemagick: 7.1.0-49 -> 7.1.0-51 2022-10-18 13:16:11 +00:00
Kerstin
5251f922bb
Merge pull request #192344 from YoshiRulz/im-pango
ImageMagick: Enable Pango when enabling librsvg
2022-09-27 00:57:36 +02:00
R. Ryantm
d76a4f0eba imagemagick: 7.1.0-48 -> 7.1.0-49 2022-09-26 16:51:28 +00:00
YoshiRulz
b4a006448f
ImageMagick: Enable Pango when enabling librsvg
as the latter requires Pango anyway
2022-09-22 10:47:46 +10:00
R. Ryantm
c23686e115 imagemagick: 7.1.0-47 -> 7.1.0-48 2022-09-12 21:37:03 +00:00
R. Ryantm
5ba8f7cc88 imagemagick: 7.1.0-46 -> 7.1.0-47 2022-08-28 18:01:33 +00:00
Robert Schütz
86f9d4bdcd imagemagick: 7.1.0-45 -> 7.1.0-46 2022-08-18 07:30:37 +00:00
R. Ryantm
305eb886a3 imagemagick: 7.1.0-44 -> 7.1.0-45 2022-08-02 16:59:16 +00:00
Kerstin Humm
25a8587508
imagemagick: 7.1.0-43 -> 7.1.0-44 2022-07-25 15:21:27 +02:00
Alyssa Ross
322ed64cf9
imagemagick6: modernize package options
Throughout Nixpkgs, we now tend to avoid packages being null outside
of bootstrapping, in favour of dedicated options that can have
more complex defaults set, e.g. per-platform.  This simplifies and
regularizes the imagemagick package definition.
2022-07-17 07:36:13 +00:00
Alyssa Ross
4a0608f8b2
imagemagick: modernize package options
Throughout Nixpkgs, we now tend to avoid packages being null outside
of bootstrapping, in favour of dedicated options that can have
more complex defaults set, e.g. per-platform.  This simplifies and
regularizes the imagemagick package definition.
2022-07-17 07:36:02 +00:00
Alyssa Ross
c82890e2e2
imagemagick: fix version
imagemagick.passthru.tests tests that the Nixpkgs version for
imagemagick matches the one produced by magick --version, so the
recent upgrade that changed the dash to a dot broke the test.

Fixes: 3a4ea08942 ("imagemagick: 7.1.0-39 -> 7.1.0.43")
2022-07-16 23:44:13 +00:00
Kerstin Humm
3a4ea08942 imagemagick: 7.1.0-39 -> 7.1.0.43 2022-07-16 11:15:55 +00:00
Alyssa Ross
7ac2cf8e83
imagemagick: rename 7.0.nix to default.nix
"7.0.nix" doesn't make any sense, because it contains version
7.1.0-39.  imagemagick6 is barely used and can probably be removed
soon, so I think it makes sense to let 7.x have the default.nix path.
2022-07-14 08:44:03 +00:00
Robert Schütz
7978240546 imagemagick: 7.1.0-37 -> 7.1.0-39 2022-06-20 19:30:57 +00:00
Robert Schütz
2badffbd99 imagemagick: 7.1.0-36 -> 7.1.0-37 2022-06-05 16:19:55 +00:00
Robert Schütz
bd1d3d243a imagemagick: 7.1.0-35 -> 7.1.0-36 2022-05-31 01:00:23 +00:00
Robert Schütz
6501ee65b0 imagemagick: 7.1.0-34 -> 7.1.0-35 2022-05-20 14:48:37 +02:00
Robert Schütz
8896e8d373 imagemagick: 7.1.0-33 -> 7.1.0-34 2022-05-17 15:19:58 +02:00
Robert Schütz
2f677eae73 imagemagick: 7.1.0-32 -> 7.1.0-33 2022-05-08 13:39:30 -07:00
Kerstin Humm
ab3a25bc8c
imagemagick: 7.1.0-31 -> 7.1.0-32 2022-05-01 12:13:18 +02:00
Robert Schütz
95aa9e3550 imagemagick: 7.1.0-30 -> 7.1.0-31 2022-04-24 13:10:01 +02:00
Artturin
f1c7f19e49 treewide: testVersion -> testers.testVersion 2022-04-22 16:24:27 +03:00
Kerstin Humm
1200c1c3e0
imagemagick: 7.1.0-29 -> 7.1.0-30 2022-04-21 17:01:04 +02:00
ajs124
513783a9fa
Merge pull request #166439 from erictapen/imagemagick
imagemagick: 7.1.0-26 -> 7.1.0-29, build with JXL for aarch64-linux
2022-04-10 22:05:20 +01:00
Kerstin Humm
75e301c357 imagemagick6: remove erictapen as maintainer
I haven't looked at this package for a long time, so let's reflect that
fact in the maintainer field.
2022-04-02 12:45:11 +02:00
Kerstin Humm
388d576fd1
imagemagick: 7.1.0-26 -> 7.1.0-29 2022-03-30 18:47:25 +02:00
Kerstin Humm
0cd7358869
imagemagick: use libjxl on aarch64-linux, as it builds now for that target
Works since f24cab5396
2022-03-30 18:47:25 +02:00
Tanish2002
5a6b995479 imagemagick: add curl dependency 2022-02-26 01:19:37 +01:00
Robert Schütz
0074ebd592 imagemagick: 7.1.0-25 -> 7.1.0-26 2022-02-21 21:13:22 +01:00
Robert Schütz
fc4d500e54 imagemagick: 7.1.0-24 -> 7.1.0-25 2022-02-17 13:19:03 +01:00
Robert Schütz
5a07a32f30 imagemagick: 7.1.0-23 -> 7.1.0-24
https://github.com/ImageMagick/ImageMagick/blob/7.1.0-24/ChangeLog
2022-02-13 22:16:17 +01:00
Kerstin Humm
884b8ebc8e
imagemagick: 7.1.0-22 -> 7.1.0-23 2022-02-08 23:39:42 +01:00
Kerstin Humm
42dbc27ed4 imagemagick: 7.1.0-20 -> 7.1.0-22 2022-01-31 03:00:26 +00:00
Johannes Arnold
372468425f imagemagick: build with potrace 2022-01-30 18:42:55 +01:00
Markus S. Wamser
3624f96c70 imagemagick: apply upstream patch to fix perlPackages.ImageMagick 2022-01-27 13:37:01 +01:00
Alvar Penning
0439a474bf imagemagick: 7.1.0-19 -> 7.1.0-20
https://github.com/ImageMagick/ImageMagick/releases/tag/7.1.0-20
2022-01-23 13:01:33 +01:00
Robert Schütz
2c526159cf imagemagick: 7.1.0-17 -> 7.1.0-19 2021-12-27 01:53:34 +01:00
Kerstin Humm
7617df63c2
imagemagick: 7.1.0-16 -> 7.1.0-17 2021-12-06 00:29:25 +01:00
Kerstin Humm
63ea61bcf0
imagemagick: 7.1.0-15 -> 7.1.0-16 2021-11-23 18:31:40 +01:00
Kerstin Humm
d3c7e5801f
imagemagick: 7.1.0-14 -> 7.1.0-15 2021-11-21 18:35:38 +01:00
Kerstin Humm
4d5800ed10
imagemagick: 7.1.0-13 -> 7.1.0-14 2021-11-16 21:07:09 +01:00
Kerstin Humm
b90d3b02a3
imagemagick: 7.1.0-11 -> 7.1.0-13 2021-10-31 13:22:02 +01:00
Sandro
f112b512e1
Merge pull request #142853 from erictapen/imagemagick-7.1.0-11 2021-10-26 13:17:51 +02:00
Kerstin Humm
8705d0826f
imagemagick6: 6.9.12-19 -> 6.9.12-26 2021-10-25 14:14:25 +02:00
Kerstin Humm
e7808cafea
imagemagick: 7.1.0-9 -> 7.1.0-11 2021-10-25 14:10:28 +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
Robert Schütz
d7bb0e5087
Merge pull request #120456 from erictapen/imagemagick-7.0.11-8
imagemagick: 7.0.11-6 -> 7.0.11-8
2021-04-24 00:53:04 +02:00