9 files changed, 19 insertions, 20 deletions
diff --git a/pkgs/tools/graphics/asymptote/default.nix b/pkgs/tools/graphics/asymptote/default.nix
index 1c5c4983c801..971a7e973cc0 100644
--- a/pkgs/tools/graphics/asymptote/default.nix
+++ b/pkgs/tools/graphics/asymptote/default.nix
@@ -10,11 +10,11 @@ let
   s = # Generated upstream information
   rec {
     baseName="asymptote";
-    version="2.37";
+    version="2.38";
     name="${baseName}-${version}";
-    hash="16nh02m52mk9a53i8wc6l9vg710gnzr3lfbypcbvamghvaj0458i";
-    url="mirror://sourceforge/project/asymptote/2.37/asymptote-2.37.src.tgz";
-    sha256="16nh02m52mk9a53i8wc6l9vg710gnzr3lfbypcbvamghvaj0458i";
+    hash="1dxwvq0xighqckkjkjva8s0igxfgy1j25z81pbwvlz6jzsrxpip9";
+    url="mirror://sourceforge/project/asymptote/2.38/asymptote-2.38.src.tgz";
+    sha256="1dxwvq0xighqckkjkjva8s0igxfgy1j25z81pbwvlz6jzsrxpip9";
   };
   buildInputs = [
    freeglut ghostscriptX imagemagick fftw 
@@ -55,7 +55,7 @@ stdenv.mkDerivation {
     inherit (s) version;
     description =  "A tool for programming graphics intended to replace Metapost";
     license = stdenv.lib.licenses.gpl3Plus;
-    maintainers = [stdenv.lib.maintainers.raskin stdenv.lib.maintainers.simons];
+    maintainers = [stdenv.lib.maintainers.raskin stdenv.lib.maintainers.peti];
     platforms = stdenv.lib.platforms.linux;
   };
 }
diff --git a/pkgs/tools/graphics/editres/default.nix b/pkgs/tools/graphics/editres/default.nix
index cdf38d1218ad..eb86acfc6242 100644
--- a/pkgs/tools/graphics/editres/default.nix
+++ b/pkgs/tools/graphics/editres/default.nix
@@ -19,6 +19,5 @@ stdenv.mkDerivation rec {
     description = "a dynamic resource editor for X Toolkit applications";
 
     platforms = stdenv.lib.platforms.linux;
-    maintainers = [ stdenv.lib.maintainers.simons ];
   };
 }
diff --git a/pkgs/tools/graphics/glxinfo/default.nix b/pkgs/tools/graphics/glxinfo/default.nix
index 35bc1e610de7..d2c2f30d6fc6 100644
--- a/pkgs/tools/graphics/glxinfo/default.nix
+++ b/pkgs/tools/graphics/glxinfo/default.nix
@@ -1,13 +1,13 @@
 {stdenv, fetchurl, xlibsWrapper, mesa}:
 
-let version = "8.1.0"; in
+let version = "8.3.0"; in
 
 stdenv.mkDerivation {
   name = "glxinfo-${version}";
 
   src = fetchurl {
     url = "ftp://ftp.freedesktop.org/pub/mesa/demos/${version}/mesa-demos-${version}.tar.bz2";
-    sha256 = "0a58hw5850731p4smz4zqsbvyxvgjf7n5xdbs9l1wamk8q3gl0wp";
+    sha256 = "1vqb7s5m3fcg2csbiz45mha1pys2xx6rhw94fcyvapqdpm5iawy1";
   };
 
   buildInputs = [xlibsWrapper mesa];
@@ -16,7 +16,7 @@ stdenv.mkDerivation {
 
   buildPhase = "
     cd src/xdemos
-    gcc glxinfo.c -o glxinfo -lGL -lX11
+    gcc glxinfo.c glinfo_common.c -o glxinfo -lGL -lX11
     gcc glxgears.c -o glxgears -lGL -lX11
   ";
 
diff --git a/pkgs/tools/graphics/graphviz/2.32.nix b/pkgs/tools/graphics/graphviz/2.32.nix
index b40672754bcf..4fe963288690 100644
--- a/pkgs/tools/graphics/graphviz/2.32.nix
+++ b/pkgs/tools/graphics/graphviz/2.32.nix
@@ -57,7 +57,7 @@ stdenv.mkDerivation rec {
     '';
 
     hydraPlatforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin;
-    maintainers = with stdenv.lib.maintainers; [ simons bjornfor raskin ];
+    maintainers = with stdenv.lib.maintainers; [ bjornfor raskin ];
     inherit version;
     branch = "2.32";
   };
diff --git a/pkgs/tools/graphics/graphviz/default.nix b/pkgs/tools/graphics/graphviz/default.nix
index 9b49cca8d7b3..273b3e72c647 100644
--- a/pkgs/tools/graphics/graphviz/default.nix
+++ b/pkgs/tools/graphics/graphviz/default.nix
@@ -64,7 +64,7 @@ stdenv.mkDerivation rec {
     '';
 
     hydraPlatforms = stdenv.lib.platforms.linux ++ stdenv.lib.platforms.darwin;
-    maintainers = with stdenv.lib.maintainers; [ simons bjornfor raskin ];
+    maintainers = with stdenv.lib.maintainers; [ bjornfor raskin ];
     downloadPage = "http://www.graphviz.org/pub/graphviz/ARCHIVE/";
     inherit version;
     updateWalker = true;
diff --git a/pkgs/tools/graphics/kst/default.nix b/pkgs/tools/graphics/kst/default.nix
index 9b983450f480..24d678e11422 100644
--- a/pkgs/tools/graphics/kst/default.nix
+++ b/pkgs/tools/graphics/kst/default.nix
@@ -27,5 +27,6 @@ stdenv.mkDerivation rec {
     license = licenses.gpl2;
     platforms = platforms.all;
     maintainers = [ maintainers.vbgl ];
+    broken = true;
   };
 }
diff --git a/pkgs/tools/graphics/mscgen/default.nix b/pkgs/tools/graphics/mscgen/default.nix
index 36a75743ed8a..34daae36ce9c 100644
--- a/pkgs/tools/graphics/mscgen/default.nix
+++ b/pkgs/tools/graphics/mscgen/default.nix
@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, flex, bison, gd, libpng, freetype, zlib }:
+{ stdenv, fetchurl, flex, bison, gd, libpng, libjpeg, freetype, zlib }:
 
 let
   version = "0.20";
@@ -11,7 +11,7 @@ stdenv.mkDerivation {
     sha256 = "3c3481ae0599e1c2d30b7ed54ab45249127533ab2f20e768a0ae58d8551ddc23";
   };
 
-  buildInputs = [ flex bison gd libpng freetype zlib ];
+  buildInputs = [ flex bison gd libjpeg libpng freetype zlib ];
 
   doCheck = true;
   preCheck = ''
@@ -37,6 +37,6 @@ stdenv.mkDerivation {
     '';
 
     platforms = stdenv.lib.platforms.linux;
-    maintainers = [ stdenv.lib.maintainers.simons ];
+    maintainers = [ stdenv.lib.maintainers.peti ];
   };
 }
diff --git a/pkgs/tools/graphics/pstoedit/default.nix b/pkgs/tools/graphics/pstoedit/default.nix
index d4e977128cfe..624f5321c2a6 100644
--- a/pkgs/tools/graphics/pstoedit/default.nix
+++ b/pkgs/tools/graphics/pstoedit/default.nix
@@ -1,17 +1,17 @@
-{ stdenv, fetchurl, pkgconfig, ghostscript, gd, zlib, plotutils }:
+{ stdenv, fetchurl, pkgconfig, ghostscript, gd, libjpeg, zlib, plotutils }:
 
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
   name = "pstoedit-3.62";
 
   src = fetchurl {
-    url = mirror://sourceforge/pstoedit/pstoedit-3.62.tar.gz;
+    url = "mirror://sourceforge/pstoedit/${name}.tar.gz";
     sha256 = "0j410dm9nqwa7n03yiyz0jwvln0jlqc3n9iv4nls33yl6x3c8x40";
   };
 
-  buildInputs = [ pkgconfig ghostscript gd zlib plotutils ];
+  buildInputs = [ pkgconfig ghostscript gd libjpeg zlib plotutils ];
 
   meta = { 
-    description = "translates PostScript and PDF graphics into other vector formats";
+    description = "Translates PostScript and PDF graphics into other vector formats";
     homepage = http://www.helga-glunz.homepage.t-online.de/pstoedit;
     license = stdenv.lib.licenses.gpl2;
     maintainers = [ stdenv.lib.maintainers.marcweber ];
diff --git a/pkgs/tools/graphics/wkhtmltopdf/default.nix b/pkgs/tools/graphics/wkhtmltopdf/default.nix
index bcb7803785b0..8e0217ca839c 100644
--- a/pkgs/tools/graphics/wkhtmltopdf/default.nix
+++ b/pkgs/tools/graphics/wkhtmltopdf/default.nix
@@ -95,7 +95,6 @@ stdenv.mkDerivation rec {
         -no-xshape
         -no-xsync
         -opensource
-        -openssl
         -release
         -static
         -system-libjpeg