diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2008-05-16 11:26:23 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2008-05-16 11:26:23 +0000 |
| commit | 3042994875183f78ef229266c388075e14885ac3 (patch) | |
| tree | c35c7bcbb4e5e8c800e074e611b75ebd9d73a646 /pkgs/applications/graphics/ImageMagick | |
| parent | 4bbd9bab29b1bdca4aa087bbd541d6629c1515a1 (diff) | |
| download | nixlib-3042994875183f78ef229266c388075e14885ac3.tar nixlib-3042994875183f78ef229266c388075e14885ac3.tar.gz nixlib-3042994875183f78ef229266c388075e14885ac3.tar.bz2 nixlib-3042994875183f78ef229266c388075e14885ac3.tar.lz nixlib-3042994875183f78ef229266c388075e14885ac3.tar.xz nixlib-3042994875183f78ef229266c388075e14885ac3.tar.zst nixlib-3042994875183f78ef229266c388075e14885ac3.zip | |
* ImageMagick: don't need to keep old versions I guess.
* texFunctions.simpleTexToPNG: purity (use our own ImageMagick). svn path=/nixpkgs/trunk/; revision=11836
Diffstat (limited to 'pkgs/applications/graphics/ImageMagick')
| -rw-r--r-- | pkgs/applications/graphics/ImageMagick/6.3.8-5.nix | 26 | ||||
| -rw-r--r-- | pkgs/applications/graphics/ImageMagick/6.4.1-1.nix | 26 | ||||
| -rw-r--r-- | pkgs/applications/graphics/ImageMagick/default.nix (renamed from pkgs/applications/graphics/ImageMagick/6.3.9-0.nix) | 4 |
3 files changed, 3 insertions, 53 deletions
diff --git a/pkgs/applications/graphics/ImageMagick/6.3.8-5.nix b/pkgs/applications/graphics/ImageMagick/6.3.8-5.nix deleted file mode 100644 index 83c7075f8e5b..000000000000 --- a/pkgs/applications/graphics/ImageMagick/6.3.8-5.nix +++ /dev/null @@ -1,26 +0,0 @@ -args: with args; -stdenv.mkDerivation (rec { - name = "ImageMagick-6.3.8-5"; - - src = fetchurl { - url = "ftp://ftp.imagemagick.org/pub/ImageMagick/${name}.tar.bz2"; - sha256 = "0lsvi2z5b5zam6yvjzsyjpa36rg1c0kczifz73k9b4v8zz9a9vfl"; - }; - - configureFlags = " --with-dots --with-gs-font-dir="+ ghostscript + - "/share/ghostscript/fonts --with-gslib " +( - if args ? tetex then " --with-frozenpaths " else "" - ); - - buildInputs = [bzip2 freetype ghostscript graphviz libjpeg libpng - libtiff libX11 libxml2 zlib libtool] ++ (if args ? tetex then [args.tetex] else []) - ++ (if args ? librsvg then [args.librsvg] else []); - - meta = { - homepage = http://www.imagemagick.org; - }; -} // (if args ? tetex then { - preConfigure = " - export DVIDecodeDelegate=${args.tetex}/bin/dvips - "; -} else {})) diff --git a/pkgs/applications/graphics/ImageMagick/6.4.1-1.nix b/pkgs/applications/graphics/ImageMagick/6.4.1-1.nix deleted file mode 100644 index 79c571a92dbc..000000000000 --- a/pkgs/applications/graphics/ImageMagick/6.4.1-1.nix +++ /dev/null @@ -1,26 +0,0 @@ -args: with args; -stdenv.mkDerivation (rec { - name = "ImageMagick-${version}"; - - src = fetchurl { - url = "ftp://ftp.imagemagick.org/pub/ImageMagick/${name}.tar.bz2"; - sha256 = "0a8defbfa867bb5e969f898d9a3b65a8c4f6952cb71411b40f005dd0a183644e"; - }; - - configureFlags = " --with-dots --with-gs-font-dir="+ ghostscript + - "/share/ghostscript/fonts --with-gslib " +( - if args ? tetex then " --with-frozenpaths " else "" - ); - - buildInputs = [bzip2 freetype ghostscript graphviz libjpeg libpng - libtiff libX11 libxml2 zlib libtool] ++ (if args ? tetex then [args.tetex] else []) - ++ (if args ? librsvg then [args.librsvg] else []); - - meta = { - homepage = http://www.imagemagick.org; - }; -} // (if args ? tetex then { - preConfigure = " - export DVIDecodeDelegate=${args.tetex}/bin/dvips - "; -} else {})) diff --git a/pkgs/applications/graphics/ImageMagick/6.3.9-0.nix b/pkgs/applications/graphics/ImageMagick/default.nix index ad7899b33c49..bf89a796c223 100644 --- a/pkgs/applications/graphics/ImageMagick/6.3.9-0.nix +++ b/pkgs/applications/graphics/ImageMagick/default.nix @@ -1,5 +1,7 @@ args: with args; +let version = "6.4.1-1"; in + stdenv.mkDerivation (rec { name = "ImageMagick-${version}"; @@ -8,7 +10,7 @@ stdenv.mkDerivation (rec { "ftp://ftp.imagemagick.org/pub/ImageMagick/${name}.tar.bz2" "http://ftp.surfnet.nl/pub/ImageMagick/${name}.tar.bz2" ]; - sha256 = "0ynn8gxixjb16xhg60hp2sbfymh03y5qxxgffwlchciiylw9dlvd"; + sha256 = "0a8defbfa867bb5e969f898d9a3b65a8c4f6952cb71411b40f005dd0a183644e"; }; configureFlags = '' |