1
0
Fork 1
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-12-05 03:53:41 +00:00
Commit graph

69 commits

Author SHA1 Message Date
Graham Christensen 241cd0e5db
imagemagick: 6.9.5-10 -> 6.9.6-2 for CVE-2016-7799, CVE-2016-7906 2016-10-13 20:33:10 -04:00
Franz Pletz fa6c6dae76
imagemagick: 6.9.5-2 -> 6.9.5-10
Fixes lots of CVEs, including the recent:

  * CVE-2016-4562, CVE-2016-4563, CVE-2016-4564
  * CVE-2016-5687
  * CVE-2016-5010
  * CVE-2016-5688
  * CVE-2016-5689, CVE-2016-5690, CVE-2016-5691
  * CVE-2016-5841 and CVE-2016-5842
  * CVE-2016-6491
  * CVE-2016-6520

cc #18856
2016-09-24 16:57:00 +02:00
Tuomas Tynkkynen a17216af4c treewide: Shuffle outputs
Make either 'bin' or 'out' the first output.
2016-08-29 14:49:51 +03:00
Franz Pletz b1ff7f83ef imagemagick: fix hashes
See #16958.
2016-07-18 06:19:52 +02:00
Ram Kromberg 9ff51cc3c4 imagemagick: 6.9.3-9 -> 6.9.5-2 (#16958) 2016-07-18 06:12:17 +02:00
Vladimír Čunát 73f1f5eb39 imagemagick: split dev output to fix #9604
Also fixup references to imagemagick.
2016-05-22 13:41:15 +02:00
Vladimír Čunát 292fb98d96 imagemagick: fix evaluation on mingw
I made a mistake during conflict resolution in 7a005601d.
2016-05-10 18:22:34 +02:00
Vladimír Čunát 7a005601d4 Merge branch 'master' to resolve conflicts 2016-05-05 08:25:38 +02:00
Michael Raskin 942db2e9ac imagemagick: libwebp just has to be a propagated input 2016-05-04 17:55:09 +02:00
Franz Pletz 69c14985d0 imagemagick: Disable insecure coders (ImageTragick)
See:

  * https://imagetragick.com/
  * https://www.imagemagick.org/discourse-server/viewtopic.php?f=4&t=29588
2016-05-04 01:22:02 +02:00
Franz Pletz 05eae0242d imagemagick: 6.9.3-8 -> 6.9.3-9 2016-05-04 01:22:02 +02:00
Nikolay Amiantov fe0bb1efd1 imagemagick: add webp support 2016-05-03 13:19:41 +03:00
Nikolay Amiantov 929b0d99c1 imagemagick: support JPEG2000 2016-04-23 22:22:46 +03:00
Vladimír Čunát 7aae991fa2 imagemagick: fix on mingw, only static ATM
The output gets rather large (67 MB) as *each* executable gets ~5 MB of
magick stuff statically. It seems we would have to fix or disable
libxml2 first to get around this blowup.
2016-04-23 10:52:05 +02:00
Graham Christensen 43bf20def9 imagemagick: 8.9.2-0 -> 8.9.3-8 2016-04-11 14:47:16 -05:00
Tomas Hlavaty 6c53262480 ImageMagick: build also on armv7l-linux 2016-02-14 23:45:32 +01:00
Vladimír Čunát 535b112038 imagemagick: add a more "reliable" mirror to fix #12493 2016-01-20 09:11:23 +01:00
Luca Bruno 5c014feb0a imagemagick: fix ghostscript reference in .la files 2015-09-03 12:21:33 +02:00
koral f5615752ae imagemagick: 6.9.1-0 -> 6.9.2-0, fixes #9591 2015-09-01 21:55:24 +02:00
Eelco Dolstra 7e8165b277 imagemagick: Move docs to separate output
This reduces the size of out from 21 MB to 8.7 MB.
2015-07-26 23:39:47 +02:00
Eelco Dolstra 7f0a596473 imagemagick: Reduce dependency bloat
The closure size of imagemagick has recently gone up from 530 MB
(already bad) to 846 MB, which is a bit excessive. So revert most of
the recent changes.
2015-07-26 23:33:49 +02:00
Eelco Dolstra 5d8fe045b6 Revert "Refactor mkFlag out of old packages"
This reverts commit 3117e0c897.

Conflicts:
	pkgs/development/libraries/wayland/default.nix
	pkgs/servers/samba/4.x.nix
2015-06-04 14:54:50 +02:00
William A. Kennington III 3117e0c897 Refactor mkFlag out of old packages 2015-05-22 13:54:52 -07:00
Michael Raskin 70a1e3c837 propagate many inputs in imagemagick: otherwise dependent builds fail 2015-03-30 08:46:16 +03:00
William A. Kennington III b058f829d2 ImageMagick: Disable HDRI for now 2015-03-29 19:37:53 -07:00
William A. Kennington III 49e980fa32 imagemagick: More cleanups 2015-03-27 15:46:08 -07:00
William A. Kennington III 1f632813e4 imagemagick: Refactor 2015-03-27 15:36:26 -07:00
William A. Kennington III 5d2fd00457 imagemagick: 6.9.0 -> 6.9.1 2015-03-27 15:36:25 -07:00
Vladimír Čunát b35e0a09a8 imagemagick: fixup URL after #6056 2015-01-29 23:18:19 +01:00
Sibi 8e5cf5889c imagemagick: rename package to lowercase (close #6056)
Change it to lowercase to according to the convention presented here:
http://nixos.org/nixpkgs/manual/#chap-conventions

Thanks to goibhniu from #nixos for pointing me this.
2015-01-29 19:36:26 +01:00
Igor Pashev 53fc3e178f ImageMagick: update (close #5133) 2014-11-26 21:49:11 +01:00
Vladimír Čunát b1803465d9 imagemagick: use a stable URL, reshuffle mirrors
CC: #5133.
2014-11-26 21:42:42 +01:00
Eelco Dolstra 6f53886360 imagemagick: Use --with-gcc-arch
Without this, ImageMagick's configure script will generate code
specific to the machine building the package. This code may then fail
on other CPU types.

http://hydra.nixos.org/build/16564129
Signed-off-by: Domen Kožar <domen@dev.si>
2014-11-06 11:10:32 +01:00
Justin Bedo cd1bacb03d Update ImageMagick version 2014-10-20 17:49:30 +11:00
James Cook ee79d43e40 ImageMagick: update to 6.8.9-0 2014-04-19 11:25:01 +01:00
James Cook 5d14048867 ImageMagick: update to 6.8.8-7
Fixes CVE-2014-{1947,1958,2030}.
2014-03-08 10:35:05 +01:00
Vladimír Čunát 4c5a71f777 Merge master into x-updates
Conflicts:
	pkgs/desktops/gnome-2/desktop/gvfs/default.nix
	pkgs/development/libraries/cogl/default.nix
	pkgs/development/libraries/libsoup/2.44.nix
2013-12-18 23:21:29 +01:00
Sander van der Burg 010273bf1e Fix imagemagick compilation on darwin, because it still includes ghostscript which should not be the case 2013-12-17 11:45:07 +01:00
Vladimír Čunát 85b6d28862 imagemagick: minor update 6.8.7-5 -> .7-6 2013-11-17 15:41:10 +01:00
Shea Levy 6555e31fb4 ImageMagick and asciidoc build on 64-bit darwin
Tested by @zefhemel

Signed-off-by: Shea Levy <shea@shealevy.com>
2013-11-14 10:42:58 -05:00
Moritz Ulrich 844b053cce ImageMagick: 6.8.7-5 & fix ghostscript/freetype errors
ghostscript and freetype were enabled but the configure script
couldn't find them. It turns out it uses pkgconfig to search for them.

Signed-off-by: Moritz Ulrich <moritz@tarn-vedra.de>
2013-11-12 21:53:37 +01:00
Eelco Dolstra fb8a2dafd9 imagemagick: Drop build-time dependency on Graphviz 2013-09-26 21:06:23 +02:00
Vladimír Čunát 6b2379f43f imagemagick: add link for $out/include/ImageMagick
For transition. Fixes calibre build, at least.
2013-09-15 18:27:08 +02:00
James Cook 39bc57f35f ImageMagick: update 6.7.5-3 -> 6.8.6-9 (close #960) 2013-09-14 16:04:34 +02:00
Sander van der Burg 2dd59fc4cf imagemagick: disable ghostscript on darwin, to make it work 2013-01-11 18:32:45 +01:00
Eelco Dolstra 1e9e2cb2bb samba, imagemagick: Add missing meta info 2013-01-06 22:31:16 +01:00
Lluís Batlle i Rossell ab93b3a032 Updating imagemagick; I think it's meant to build with the new zlib 1.2.6.
I'll let hydra try it.

I don't update this in trunk because a lot depends on this.


svn path=/nixpkgs/branches/stdenv-updates/; revision=32166
2012-02-09 19:45:31 +00:00
Eelco Dolstra d4d7931a62 * Cleanup: remove obsolete references to ‘xz’, which is in stdenv now.
svn path=/nixpkgs/branches/stdenv-updates/; revision=31678
2012-01-18 20:53:01 +00:00
Yury G. Kudryashov 0159787b06 ImageMagick: propagate libs in buildInputs, use .tar.xz
svn path=/nixpkgs/trunk/; revision=27372
2011-06-07 21:49:04 +00:00
Peter Simons 77f3a10acb ImageMagick: updated to version 6.6.9-4
svn path=/nixpkgs/trunk/; revision=26801
2011-04-12 09:32:31 +00:00