* Cleaned up a lot of description fields that contained newlines.

  Some of these should be longDescriptions, but most others just
  shouldn't contain newlines.  E.g. write

    description = "Bla";

  and not

    description = ''
      Bla
    '';

  This pollutes "nix-env -qa --description" output.

svn path=/nixpkgs/trunk/; revision=14310

104 files changed, 348 insertions, 452 deletions

diff --git a/pkgs/applications/audio/aumix/default.nix b/pkgs/applications/audio/aumix/default.nix
index 57c690fee9b..9a8a7560088 100644
--- a/pkgs/applications/audio/aumix/default.nix
+++ b/pkgs/applications/audio/aumix/default.nix
@@ -16,8 +16,10 @@ stdenv.mkDerivation {
     ++ (if gtkGUI then [pkgconfig gtk] else []);
 
   meta = {
-    description = ''Aumix adjusts an audio mixer from X, the console,
-    		    a terminal, the command line or a script.'';
+    longDescription = ''
+      Aumix adjusts an audio mixer from X, the console, a terminal,
+      the command line or a script.
+    '';
     homepage = http://www.jpj.net/~trevor/aumix.html;
     license = "GPL";
   };
diff --git a/pkgs/applications/audio/ladspa-plugins/default.nix b/pkgs/applications/audio/ladspa-plugins/default.nix
index 8dd783a2d1a..6a0dfe020d0 100644
--- a/pkgs/applications/audio/ladspa-plugins/default.nix
+++ b/pkgs/applications/audio/ladspa-plugins/default.nix
@@ -21,9 +21,7 @@ stdenv.mkDerivation {
 		(textClosure localDefs [doConfigure doMakeInstall 
 			postInstall doForceShare]);
 	meta = {
-		description = "
-	LADSPA format audio plugins.
-";
+		description = "LADSPA format audio plugins";
 		inherit src;
 	};
 }
diff --git a/pkgs/applications/audio/ladspa-plugins/ladspah.nix b/pkgs/applications/audio/ladspa-plugins/ladspah.nix
index dd328608155..1e29eadcada 100644
--- a/pkgs/applications/audio/ladspa-plugins/ladspah.nix
+++ b/pkgs/applications/audio/ladspa-plugins/ladspah.nix
@@ -22,9 +22,7 @@ stdenv.mkDerivation {
 	builder = writeScript "ladspa.h-builder"
 		(textClosure localDefs [copyFile]);
 	meta = {
-		description = "
-	LADSPA format audio plugins.
-";
+		description = "LADSPA format audio plugins";
 		inherit src;
 	};
 }
diff --git a/pkgs/applications/audio/vorbis-tools/default.nix b/pkgs/applications/audio/vorbis-tools/default.nix
index 626dc1c9d96..91d9ba00a0f 100644
--- a/pkgs/applications/audio/vorbis-tools/default.nix
+++ b/pkgs/applications/audio/vorbis-tools/default.nix
@@ -15,9 +15,10 @@ stdenv.mkDerivation {
   patches = [ ./ogg123-curlopt-mute.patch ];
 
   meta = {
-    description = ''A set of command-line tools to manipulate Ogg Vorbis
-                    audio files, notably the `ogg123' player and the
-		    `oggenc' encoder.'';
+    longDescription = ''
+      A set of command-line tools to manipulate Ogg Vorbis audio
+      files, notably the `ogg123' player and the `oggenc' encoder.
+    '';
     homepage = http://xiph.org/vorbis/;
     license = "GPLv2";
   };
diff --git a/pkgs/applications/editors/emacs-modes/bbdb/default.nix b/pkgs/applications/editors/emacs-modes/bbdb/default.nix
index 3799d0a0f1b..51474a19717 100644
--- a/pkgs/applications/editors/emacs-modes/bbdb/default.nix
+++ b/pkgs/applications/editors/emacs-modes/bbdb/default.nix
@@ -14,8 +14,7 @@ stdenv.mkDerivation {
   builder = ./builder.sh;
 
   meta = {
-    description = ''The Insidious Big Brother Database (BBDB), a
-                    contact management utility for Emacs.'';
+    description = "The Insidious Big Brother Database (BBDB), a contact management utility for Emacs";
     homepage = http://bbdb.sourceforge.net/;
     license = "GPL";
   };
diff --git a/pkgs/applications/editors/emacs-modes/quack/default.nix b/pkgs/applications/editors/emacs-modes/quack/default.nix
index 3dea3f41fd6..943359086e7 100644
--- a/pkgs/applications/editors/emacs-modes/quack/default.nix
+++ b/pkgs/applications/editors/emacs-modes/quack/default.nix
@@ -14,8 +14,7 @@ stdenv.mkDerivation {
   builder = ./builder.sh;
 
   meta = {
-    description = ''Quack: Enhanced Emacs Support for Editing and
-                    Running Scheme Code'';
+    description = "Enhanced Emacs support for editing and running Scheme code";
     homepage = http://www.neilvandyke.org/quack/;
     license = "GPLv2+";
   };
diff --git a/pkgs/applications/graphics/gocr/0.44.nix b/pkgs/applications/graphics/gocr/0.44.nix
index 7273c5d98c3..4d3d33f58f5 100644
--- a/pkgs/applications/graphics/gocr/0.44.nix
+++ b/pkgs/applications/graphics/gocr/0.44.nix
@@ -15,9 +15,7 @@ stdenv.mkDerivation rec {
 	builder = writeScript (name + "-builder")
 		(textClosure localDefs [doConfigure doMakeInstall doForceShare doPropagate]);
 	meta = {
-		description = "
-		GPL Optical Character Recognition
-";
+		description = "GPL Optical Character Recognition";
 		inherit src;
 	};
 }
diff --git a/pkgs/applications/graphics/inkscape/default.nix b/pkgs/applications/graphics/inkscape/default.nix
index 33defc0bea4..f2379220a65 100644
--- a/pkgs/applications/graphics/inkscape/default.nix
+++ b/pkgs/applications/graphics/inkscape/default.nix
@@ -41,8 +41,9 @@ stdenv.mkDerivation rec {
   meta = {
     license = "GPL";
     homepage = http://www.inkscape.org;
-    description = ''Inkscape is a feature-rich vector graphics editor
-                    that edits files in the W3C SVG (Scalable Vector
-		    Graphics) file format.'';
+    longDescription = ''
+      Inkscape is a feature-rich vector graphics editor that edits
+      files in the W3C SVG (Scalable Vector Graphics) file format.
+    '';
   };
 }
diff --git a/pkgs/applications/graphics/xscreensaver/default.nix b/pkgs/applications/graphics/xscreensaver/default.nix
index 5c779e5e1b6..bcef30ddc5a 100644
--- a/pkgs/applications/graphics/xscreensaver/default.nix
+++ b/pkgs/applications/graphics/xscreensaver/default.nix
@@ -29,13 +29,11 @@ let
 	") [minInit doUnpack];
 in
 stdenv.mkDerivation rec {
-	name = "xscreensaver-"+version;
+	name = "xscreensaver-5.07";
 	builder = writeScript (name + "-builder")
 		(textClosure localDefs [preConfigure doConfigure doMakeInstall doForceShare doPropagate]);
 	meta = {
-		description = "
-	The X screensaver daemon. Run xscreensaver-demo to configure.
-";
+		description = "A set of screensavers";
 		inherit src;
 	};
 }
diff --git a/pkgs/applications/misc/djvulibre/default.nix b/pkgs/applications/misc/djvulibre/default.nix
index 81aa12e59f6..2a8d78b0f0e 100644
--- a/pkgs/applications/misc/djvulibre/default.nix
+++ b/pkgs/applications/misc/djvulibre/default.nix
@@ -1,4 +1,5 @@
 args: with args;
+
 stdenv.mkDerivation {
   name = "djvulibre-3.5.19";
 
@@ -7,15 +8,10 @@ stdenv.mkDerivation {
     sha256 = "0y6d9ka42llm7h64fc73s4wqcbxg31kallyfaarhkqsxyiaa3zsp";
   };
 
-  buildInputs = [qt libX11 libjpeg libtiff libpng ghostscript zlib libungif
-	x11 mesa];
+  buildInputs = [qt libX11 libjpeg libtiff libpng ghostscript zlib libungif x11 mesa];
 
   meta = {
-    description = "
-	DjVu libre - a library and a viewer for djvu format - compression for
-	scanned images.
-";
+    description = "A library and viewer for the DJVU file format for scanned images";
     homepage = http://djvu.sourceforge.net;
   };
 }
-
diff --git a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-latex/default.nix b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-latex/default.nix
index 930e2d108be..ba3f041738a 100644
--- a/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-latex/default.nix
+++ b/pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-latex/default.nix
@@ -1,43 +1,46 @@
-{stdenv, fetchurl, pidgin, imagemagick, ghostscript,
-	pkgconfig, glib, gtk, texLive}:
+{ stdenv, fetchurl, pidgin, imagemagick, ghostscript
+, pkgconfig, glib, gtk, texLive
+}:
+        
 stdenv.mkDerivation {
   name = "pidgin-latex";
 
-  src = 
-	fetchurl {
-		url = http://tapas.affenbande.org/pidgin-latex/pidgin-latex-0.9.tgz;
-		sha256 = "1yqd3qgxd3n8hm60qg7yv7j1crr6f3d4yrdpgwdpw2pyf92p8nxp";
-	};
+  src = fetchurl {
+    url = http://tapas.affenbande.org/pidgin-latex/pidgin-latex-0.9.tgz;
+    sha256 = "1yqd3qgxd3n8hm60qg7yv7j1crr6f3d4yrdpgwdpw2pyf92p8nxp";
+  };
 
-  preBuild = "
-  	sed -e '/^PREFIX/d' -i Makefile ; 
-	sed -e 's@/usr/bin/latex@${texLive}/bin/pdflatex@g' -i pidgin-latex.h
-	sed -e 's@/usr/bin/convert@${imagemagick}/bin/convert@g' -i pidgin-latex.h
-	sed -e 's@.*convert_path.*@const gchar *convert = CONVERT_PATH;@'
-	sed -e 's@.*latex_path.*@const gchar *convert = LATEX_PATH;@'
-	sed -e 's/%s.dvi/%s.pdf/' -i pidgin-latex.c
-	sed -e 's/latex_system\(.*\)FALSE/latex_system\1TRUE/' -i pidgin-latex.c
-  ";
+  preBuild = ''
+    sed -e '/^PREFIX/d' -i Makefile ; 
+    sed -e 's@/usr/bin/latex@${texLive}/bin/pdflatex@g' -i pidgin-latex.h
+    sed -e 's@/usr/bin/convert@${imagemagick}/bin/convert@g' -i pidgin-latex.h
+    sed -e 's@.*convert_path.*@const gchar *convert = CONVERT_PATH;@'
+    sed -e 's@.*latex_path.*@const gchar *convert = LATEX_PATH;@'
+    sed -e 's/%s.dvi/%s.pdf/' -i pidgin-latex.c
+    sed -e 's/latex_system\(.*\)FALSE/latex_system\1TRUE/' -i pidgin-latex.c
+  '';
 
-  makeFlags="PREFIX=\$(out)";
+  makeFlags = "PREFIX=\$(out)";
 
-  preInstall="mkdir -p \${out}/lib/pidgin \${out}/bin";
+  preInstall = "mkdir -p $out/lib/pidgin $out/bin";
   
-  postInstall = "mkdir -p \${out}/share/pidgin-latex; 
-	ln -s \${out}/lib/pidgin/pidgin-latex.so \${out}/share/pidgin-latex/";
+  postInstall = ''
+    mkdir -p $out/share/pidgin-latex
+    ln -s $out/lib/pidgin/pidgin-latex.so $out/share/pidgin-latex/
+  '';
 
   buildInputs = [pidgin imagemagick ghostscript pkgconfig glib gtk texLive];
 
   meta = {
-    description = "
-	Pidgin-LaTeX is a pidgin plugin that cuts everything inside \$\$ .. \$\$
-	and feeds to LaTeX. A bit of conversion (automated, of course) - and you
-	see every formula that occurs in conversation in pretty graphical form.
-	There are some glitches - when a formula fails to compile, you can see 
-	just previous formula..
-	Enable it for user by linking to ~/.purple/plugins - from 
-	sw/share/pidgin-latex , not from store of course.
-";
-		homepage = http://tapas.affenbande.org/wordpress/?page_id=70;
+    longDescription = ''
+      Pidgin-LaTeX is a pidgin plugin that cuts everything inside \$\$
+      .. \$\$ and feeds to LaTeX. A bit of conversion (automated, of
+      course) - and you see every formula that occurs in conversation
+      in pretty graphical form.  There are some glitches - when a
+      formula fails to compile, you can see just previous formula..
+      Enable it for user by linking to ~/.purple/plugins - from
+      sw/share/pidgin-latex , not from store of course.
+    '';
+    homepage = http://tapas.affenbande.org/wordpress/?page_id=70;
   };
 }
diff --git a/pkgs/applications/networking/p2p/ldcpp/1.0.1.nix b/pkgs/applications/networking/p2p/ldcpp/1.0.1.nix
index 07e4a305060..e4b1b0a1e17 100644
--- a/pkgs/applications/networking/p2p/ldcpp/1.0.1.nix
+++ b/pkgs/applications/networking/p2p/ldcpp/1.0.1.nix
@@ -23,9 +23,7 @@ stdenv.mkDerivation rec {
 		(textClosure localDefs 
 			[doScons doForceShare doPropagate]);
 	meta = {
-		description = "
-		Linux DC++ - Direct Connect client
-";
+		description = "Linux DC++ - Direct Connect client";
 		inherit src;
 	};
 }
diff --git a/pkgs/applications/version-management/arch/default.nix b/pkgs/applications/version-management/arch/default.nix
index 0a54eabd595..763a84fab9f 100644
--- a/pkgs/applications/version-management/arch/default.nix
+++ b/pkgs/applications/version-management/arch/default.nix
@@ -21,8 +21,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = {
-    description = ''GNU Arch (aka. `tla'), a distributed revision
-    		    control system.'';
+    description = "GNU Arch (aka. `tla'), a distributed revision control system";
     homepage = http://www.gnu.org/software/gnu-arch/;
     license = "GPL";
   };
diff --git a/pkgs/applications/version-management/cvsps/default.nix b/pkgs/applications/version-management/cvsps/default.nix
index bea43f77d06..1be797fea96 100644
--- a/pkgs/applications/version-management/cvsps/default.nix
+++ b/pkgs/applications/version-management/cvsps/default.nix
@@ -17,11 +17,12 @@ stdenv.mkDerivation rec {
   installPhase = "make install prefix=$out";
 
   meta = {
-    description = ''CVSps is a program for generating `patchset' information
-                    from a CVS repository.  A patchset in this case is
-		    defined as a set of changes made to a collection of
-		    files, and all committed at the same time (using a single
-		    "cvs commit" command).'';
+    longDescription = ''
+      CVSps is a program for generating `patchset' information from a
+      CVS repository.  A patchset in this case is defined as a set of
+      changes made to a collection of files, and all committed at the
+      same time (using a single "cvs commit" command).
+    '';
     homepage = http://www.cobite.com/cvsps/;
     license = "GPLv2";
   };
diff --git a/pkgs/applications/video/MPlayer/win32codecs/default.nix b/pkgs/applications/video/MPlayer/win32codecs/default.nix
index 36de4cef857..e4e73f6ede3 100644
--- a/pkgs/applications/video/MPlayer/win32codecs/default.nix
+++ b/pkgs/applications/video/MPlayer/win32codecs/default.nix
@@ -1,8 +1,16 @@
-{stdenv, fetchurl}: stdenv.mkDerivation {
+{stdenv, fetchurl}:
+
+stdenv.mkDerivation {
   name = "MPlayer-codecs-essential-20071007";
+  
   builder = ./builder.sh;
+  
   src = fetchurl {
     url = http://www2.mplayerhq.hu/MPlayer/releases/codecs/essential-20071007.tar.bz2;
     sha256 = "18vls12n12rjw0mzw4pkp9vpcfmd1c21rzha19d7zil4hn7fs2ic";
   };
+
+  meta = {
+    license = "unfree";
+  };
 }
diff --git a/pkgs/applications/window-managers/compiz/0.6.2.nix b/pkgs/applications/window-managers/compiz/0.6.2.nix
index 9531fdc3f6d..0c89087d02a 100644
--- a/pkgs/applications/window-managers/compiz/0.6.2.nix
+++ b/pkgs/applications/window-managers/compiz/0.6.2.nix
@@ -41,9 +41,7 @@ rec {
 			doForceShare postAll]);
 	inherit propagatedBuildInputs;
 	meta = {
-		description = "
-	Compiz window manager
-";
+		description = "Compiz window manager";
 		inherit src;
 	};
 }
diff --git a/pkgs/applications/window-managers/compiz/0.7.8.nix b/pkgs/applications/window-managers/compiz/0.7.8.nix
index e6447b68bdb..0e7cfc2910d 100644
--- a/pkgs/applications/window-managers/compiz/0.7.8.nix
+++ b/pkgs/applications/window-managers/compiz/0.7.8.nix
@@ -42,9 +42,7 @@ rec {
 			doForceShare postAll]);
 	inherit propagatedBuildInputs;
 	meta = {
-		description = "
-	Compiz window manager
-";
+		description = "Compiz window manager";
 		inherit src;
 	};
 }
diff --git a/pkgs/applications/window-managers/compiz/0.8.0.nix b/pkgs/applications/window-managers/compiz/0.8.0.nix
index aca1bfb15cb..d521b2a4fa3 100644
--- a/pkgs/applications/window-managers/compiz/0.8.0.nix
+++ b/pkgs/applications/window-managers/compiz/0.8.0.nix
@@ -41,9 +41,7 @@ rec {
 			doForceShare postAll]);
 	inherit propagatedBuildInputs;
 	meta = {
-		description = "
-	Compiz window manager
-";
+		description = "Compiz window manager";
 		inherit src;
 	};
 }
diff --git a/pkgs/applications/window-managers/fbpanel/4.12.nix b/pkgs/applications/window-managers/fbpanel/4.12.nix
index b4d83d9d1d0..e39aa72e8cf 100644
--- a/pkgs/applications/window-managers/fbpanel/4.12.nix
+++ b/pkgs/applications/window-managers/fbpanel/4.12.nix
@@ -16,9 +16,7 @@ stdenv.mkDerivation rec {
 	builder = writeScript (name + "-builder")
 		(textClosure localDefs [doConfigure doMakeInstall doForceShare doPropagate]);
 	meta = {
-		description = "
-	Just a desktop panel.	
-";
+		description = "Just a desktop panel";
 		inherit src;
 	};
 }
diff --git a/pkgs/applications/window-managers/jwm/default.nix b/pkgs/applications/window-managers/jwm/default.nix
index 932e609feb2..021681e4efd 100644
--- a/pkgs/applications/window-managers/jwm/default.nix
+++ b/pkgs/applications/window-managers/jwm/default.nix
@@ -9,14 +9,11 @@ stdenv.mkDerivation {
 
   buildInputs = [libX11 libXext libXinerama libXpm libXft];
 
-
   postInstall = ''
     sed -i -e s/rxvt/xterm/g $out/etc/system.jwmrc
     sed -i -e "s/.*Swallow.*\|.*xload.*//" $out/etc/system.jwmrc'';
 
-
   meta = {
-  description = "JWM is a window manager for X11 window system. It is written in C and uses only Xlib at a minimum.";
+    description = "A window manager for X11 that requires only Xlib";
   };
-
 }
diff --git a/pkgs/data/documentation/rnrs/common.nix b/pkgs/data/documentation/rnrs/common.nix
index 2775a36f321..8053020a3f2 100644
--- a/pkgs/data/documentation/rnrs/common.nix
+++ b/pkgs/data/documentation/rnrs/common.nix
@@ -15,8 +15,7 @@ stdenv.mkDerivation rec {
   builder = ./builder.sh;
 
   meta = {
-    description = ''Revised^${toString revision} Report on the
-                    Algorithmic Language Scheme'';
+    description = "Revised^${toString revision} Report on the Algorithmic Language Scheme";
 
     longDescription = ''
       This package contains the GNU Info version of the
diff --git a/pkgs/data/fonts/clearlyU/1.9.nix b/pkgs/data/fonts/clearlyU/1.9.nix
index db5709bf035..3ff5db2c60c 100644
--- a/pkgs/data/fonts/clearlyU/1.9.nix
+++ b/pkgs/data/fonts/clearlyU/1.9.nix
@@ -23,9 +23,7 @@ stdenv.mkDerivation rec {
 		(textClosure localDefs 
 			[doInstall doForceShare doPropagate]);
 	meta = {
-		description = "
-		A Unicode font.
-";
+		description = "A Unicode font";
 		inherit src;
 	};
 }
diff --git a/pkgs/data/fonts/junicode/0.6.15.nix b/pkgs/data/fonts/junicode/0.6.15.nix
index 601b6671e95..b31b04c0f5b 100644
--- a/pkgs/data/fonts/junicode/0.6.15.nix
+++ b/pkgs/data/fonts/junicode/0.6.15.nix
@@ -21,9 +21,7 @@ stdenv.mkDerivation rec {
 		(textClosure localDefs 
 			[doInstall doForceShare doPropagate]);
 	meta = {
-		description = "
-		A Unicode font.
-";
+		description = "A Unicode font";
 		inherit src;
 	};
 }
diff --git a/pkgs/data/fonts/ucs-fonts/default.nix b/pkgs/data/fonts/ucs-fonts/default.nix
index aef45dcd96c..13b95326b2f 100644
--- a/pkgs/data/fonts/ucs-fonts/default.nix
+++ b/pkgs/data/fonts/ucs-fonts/default.nix
@@ -31,9 +31,7 @@ wrapFonts (stdenv.mkDerivation {
 	'';
 
 	meta = {
-		description = "
-			UCS-fonts - Unicode bitmap fonts.
-		";
+		description = "Unicode bitmap fonts";
 		src = [srcA srcB srcC];
 	};
 })
diff --git a/pkgs/data/fonts/wqy_zenhei/0.4.23-1.nix b/pkgs/data/fonts/wqy_zenhei/0.4.23-1.nix
index da520e96832..5d4866daf28 100644
--- a/pkgs/data/fonts/wqy_zenhei/0.4.23-1.nix
+++ b/pkgs/data/fonts/wqy_zenhei/0.4.23-1.nix
@@ -20,9 +20,7 @@ stdenv.mkDerivation rec {
 		(textClosure localDefs 
 			[doInstall doForceShare doPropagate]);
 	meta = {
-		description = "
-		A (mainly) Chinese Unicode font.
-";
+		description = "A (mainly) Chinese Unicode font";
 		inherit src;
 	};
 }
diff --git a/pkgs/development/compilers/fpc/binary.nix b/pkgs/development/compilers/fpc/binary.nix
index 1bda19faf93..eb931b959cb 100644
--- a/pkgs/development/compilers/fpc/binary.nix
+++ b/pkgs/development/compilers/fpc/binary.nix
@@ -1,17 +1,16 @@
 args: with args;
+
 stdenv.mkDerivation {
   name = "fpc-2.2.2-binary";
 
   src = fetchurl {
-		url = ftp://ftp.chg.ru/pub/lang/pascal/fpc/dist/i386-linux-2.2.2/fpc-2.2.2.i386-linux.tar;
-		sha256 = "8c18f63b36a76eee673f96ca254c49c5a42bcf3e36279abe8774f961792449a5";
-	};
+    url = ftp://ftp.chg.ru/pub/lang/pascal/fpc/dist/i386-linux-2.2.2/fpc-2.2.2.i386-linux.tar;
+    sha256 = "8c18f63b36a76eee673f96ca254c49c5a42bcf3e36279abe8774f961792449a5";
+  };
 
   builder = ./binary-builder.sh;
 
   meta = {
-    description = "
-	Free Pascal Compiler from a binary distribution.
-";
+    description = "Free Pascal Compiler from a binary distribution";
   };
 } 
diff --git a/pkgs/development/compilers/fpc/default.nix b/pkgs/development/compilers/fpc/default.nix
index f13ea373418..6fa0f132787 100644
--- a/pkgs/development/compilers/fpc/default.nix
+++ b/pkgs/development/compilers/fpc/default.nix
@@ -1,31 +1,37 @@
 args:
-if ((args ? startFPC) && (args.startFPC != null))
-	then 
+
+if args ? startFPC && args.startFPC != null then
+
 with args;
+
 stdenv.mkDerivation {
   name = "fpc-2.2.2";
 
   src = fetchurl {
-		url = ftp://freepascal.stack.nl/pub/fpc/dist/source-2.2.2/fpcbuild-2.2.2.tar.gz;
-		sha256 = "0d73b119e029382052fc6615034c4b5ee3ec66fa6cc45648f1f07cfb2c1058f1";
-	};
+    url = ftp://freepascal.stack.nl/pub/fpc/dist/source-2.2.2/fpcbuild-2.2.2.tar.gz;
+    sha256 = "0d73b119e029382052fc6615034c4b5ee3ec66fa6cc45648f1f07cfb2c1058f1";
+  };
 
   buildInputs = [startFPC gawk];
 
-  preConfigure = (if system == "i686-linux" || system == "x86_64-linux" then ''
-  	sed -e "s@'/lib/ld-linux[^']*'@'''@" -i fpcsrc/compiler/systems/t_linux.pas
-  '' else "");
+  preConfigure =
+    if system == "i686-linux" || system == "x86_64-linux" then ''
+      sed -e "s@'/lib/ld-linux[^']*'@'''@" -i fpcsrc/compiler/systems/t_linux.pas
+    '' else "";
 
   makeFlags = "NOGDB=1";
 
   installFlags = "INSTALL_PREFIX=\${out}";
-  postInstall = "ln -fs $out/lib/fpc/*/ppc386 $out/bin;
-	mkdir -p $out/lib/fpc/etc/ ;
-	$out/lib/fpc/*/samplecfg $out/lib/fpc/2.2.0 $out/lib/fpc/etc/;";
+  
+  postInstall = ''
+    ln -fs $out/lib/fpc/*/ppc386 $out/bin
+    mkdir -p $out/lib/fpc/etc/
+    $out/lib/fpc/*/samplecfg $out/lib/fpc/2.2.0 $out/lib/fpc/etc/
+  '';
 
   meta = {
-    description = "
-	Free Pascal Compiler from a source distribution.
-";
+    description = "Free Pascal Compiler from a source distribution";
   };
-} else (import ./default.nix (args // {startFPC = (import ./binary.nix args);}))
+}
+
+else (import ./default.nix (args // {startFPC = (import ./binary.nix args);}))
diff --git a/pkgs/development/compilers/gcc-upc-4.0/default.nix b/pkgs/development/compilers/gcc-upc-4.0/default.nix
index ec3fe905477..68ae49b152a 100644
--- a/pkgs/development/compilers/gcc-upc-4.0/default.nix
+++ b/pkgs/development/compilers/gcc-upc-4.0/default.nix
@@ -52,8 +52,10 @@ stdenv.mkDerivation {
   meta = {
     homepage = http://www.intrepid.com/upc.html;
     license = "GPL/LGPL";
-    description = ''A GCC-based compiler for the Unified Parallel C (UPC)
-                    language, a distributed shared memory aware variant of
-		    C (see http://upc.gwu.edu/).'';
+    longDscription = ''
+      A GCC-based compiler for the Unified Parallel C (UPC) language,
+      a distributed shared memory aware variant of C (see
+      http://upc.gwu.edu/).
+    '';
   };
 }
diff --git a/pkgs/development/compilers/qi/9.1.nix b/pkgs/development/compilers/qi/9.1.nix
index da21abef29e..a1c9670be84 100644
--- a/pkgs/development/compilers/qi/9.1.nix
+++ b/pkgs/development/compilers/qi/9.1.nix
@@ -31,9 +31,7 @@ stdenv.mkDerivation rec {
 	builder = writeScript (name + "-builder")
 		(textClosure localDefs [allBuild doForceShare doPropagate]);
 	meta = {
-		description = "
-		Qi - next generation on top of Common Lisp.
-";
+		description = "Qi - next generation on top of Common Lisp";
 		inherit src;
 	};
 }
diff --git a/pkgs/development/guile-modules/guile-lib/default.nix b/pkgs/development/guile-modules/guile-lib/default.nix
index c96101ed539..f94bc747811 100644
--- a/pkgs/development/guile-modules/guile-lib/default.nix
+++ b/pkgs/development/guile-modules/guile-lib/default.nix
@@ -24,8 +24,7 @@ stdenv.mkDerivation rec {
   doCheck = true;
 
   meta = {
-    description = ''Guile-Library, a collection of useful Guile
-                    Scheme modules'';
+    description = "Guile-Library, a collection of useful Guile Scheme modules";
     homepage = http://home.gna.org/guile-lib/;
     license = "GPL";
   };
diff --git a/pkgs/development/libraries/SDL_image/default.nix b/pkgs/development/libraries/SDL_image/default.nix
index d26213ef7cd..35154e9f945 100644
--- a/pkgs/development/libraries/SDL_image/default.nix
+++ b/pkgs/development/libraries/SDL_image/default.nix
@@ -1,5 +1,6 @@
 args: with args;
-stdenv.mkDerivation (rec {
+
+stdenv.mkDerivation rec {
   pname = "SDL_image";
   version = "1.2.6";
 
@@ -12,11 +13,9 @@ stdenv.mkDerivation (rec {
 
   buildInputs = [SDL libpng libjpeg libtiff libungif libXpm];
 
-  postInstall = "ln -s \${out}/include/SDL/SDL_image.h \${out}/include/";
+  postInstall = "ln -s $out/include/SDL/SDL_image.h $out/include/";
 
   meta = {
-    description = "
-      SDL image library.
-";
+    description = "SDL image library";
   };
-})
+}
diff --git a/pkgs/development/libraries/SDL_mixer/default.nix b/pkgs/development/libraries/SDL_mixer/default.nix
index 024fd643be6..bd7b66f21a1 100644
--- a/pkgs/development/libraries/SDL_mixer/default.nix
+++ b/pkgs/development/libraries/SDL_mixer/default.nix
@@ -1,5 +1,6 @@
 args: with args;
-stdenv.mkDerivation (rec {
+
+stdenv.mkDerivation rec {
   pname = "SDL_mixer";
   version = "1.2.8";
 
@@ -14,11 +15,9 @@ stdenv.mkDerivation (rec {
 
   configureFlags = "--disable-music-ogg-shared";
 
-  postInstall = "ln -s \${out}/include/SDL/SDL_mixer.h \${out}/include/";
+  postInstall = "ln -s $out/include/SDL/SDL_mixer.h $out/include/";
 
   meta = {
-    description = "
-      SDL multi-channel audio mixer library.
-";
+    description = "SDL multi-channel audio mixer library";
   };
-})
+}
diff --git a/pkgs/development/libraries/SDL_net/default.nix b/pkgs/development/libraries/SDL_net/default.nix
index 7de557322f6..6c8c79d701c 100644
--- a/pkgs/development/libraries/SDL_net/default.nix
+++ b/pkgs/development/libraries/SDL_net/default.nix
@@ -1,5 +1,6 @@
 args: with args;
-stdenv.mkDerivation (rec {
+
+stdenv.mkDerivation rec {
   pname = "SDL_net";
   version = "1.2.7";
 
@@ -12,11 +13,9 @@ stdenv.mkDerivation (rec {
 
   buildInputs = [SDL];
 
-  postInstall = "ln -s \${out}/include/SDL/SDL_net.h \${out}/include/";
+  postInstall = "ln -s $out/include/SDL/SDL_net.h $out/include/";
 
   meta = {
-    description = "
-      SDL networking library.
-";
+    description = "SDL networking library";
   };
-})
+}
diff --git a/pkgs/development/libraries/SDL_ttf/default.nix b/pkgs/development/libraries/SDL_ttf/default.nix
index c7a356adc61..29c1df93a50 100644
--- a/pkgs/development/libraries/SDL_ttf/default.nix
+++ b/pkgs/development/libraries/SDL_ttf/default.nix
@@ -1,19 +1,18 @@
 args: with args;
+
 stdenv.mkDerivation {
-  name = "SDL_image-1.2.6";
+  name = "SDL_ttf-2.0.9";
 
   src = fetchurl {
-		url = http://www.libsdl.org/projects/SDL_ttf/release/SDL_ttf-2.0.9.tar.gz;
-		sha256 = "0ls6anmlmwrmy21p3y9nfyl6fkwz4jpgh74kw7xd0hwbg5v8h95l";
-	};
+    url = http://www.libsdl.org/projects/SDL_ttf/release/SDL_ttf-2.0.9.tar.gz;
+    sha256 = "0ls6anmlmwrmy21p3y9nfyl6fkwz4jpgh74kw7xd0hwbg5v8h95l";
+  };
 
   buildInputs = [SDL freetype];
 
-  postInstall = "ln -s \${out}/include/SDL/SDL_ttf.h \${out}/include/";
+  postInstall = "ln -s $out/include/SDL/SDL_ttf.h $out/include/";
 
   meta = {
-    description = "
-	SDL image library.
-";
+    description = "SDL TrueType library";
   };
 }
diff --git a/pkgs/development/libraries/chmlib/default.nix b/pkgs/development/libraries/chmlib/default.nix
index bd593aaea0a..4f27a133c99 100644
--- a/pkgs/development/libraries/chmlib/default.nix
+++ b/pkgs/development/libraries/chmlib/default.nix
@@ -1,16 +1,16 @@
-args: with args;
+{stdenv, fetchurl}:
 
 stdenv.mkDerivation rec {
   name = "chmlib-0.39";
+  
   src = fetchurl {
     url = "${meta.homepage}/${name}.tar.bz2";
-	sha256 = "0hgzw121ffmk79wbpkd0394y5ah99c3i85z6scp958mmkr25sc6j";
+    sha256 = "0hgzw121ffmk79wbpkd0394y5ah99c3i85z6scp958mmkr25sc6j";
   };
 
   meta = {
-	  homepage = http://www.jedrea.com/chmlib;
-	  license = "LGPL";
-	  description = "CHLIB is a library for dealing with Microsoft ITSS/CHM
-	  format files";
+    homepage = http://www.jedrea.com/chmlib;
+    license = "LGPL";
+    description = "A library for dealing with Microsoft ITSS/CHM format files";
   };
 }
diff --git a/pkgs/development/libraries/fftw/default.nix b/pkgs/development/libraries/fftw/default.nix
index 270d12ac6ab..f3604c7d32f 100644
--- a/pkgs/development/libraries/fftw/default.nix
+++ b/pkgs/development/libraries/fftw/default.nix
@@ -17,9 +17,7 @@ stdenv.mkDerivation {
 	builder = writeScript "fftw-3.1.2-builder"
 		(textClosure localDefs [doConfigure doMakeInstall doForceShare]);
 	meta = {
-		description = "
-	Fastest Fourier Transform in the West library.
-";
+		description = "Fastest Fourier Transform in the West library";
 		inherit src;
 	};
 }
diff --git a/pkgs/development/libraries/libao/default.nix b/pkgs/development/libraries/libao/default.nix
index cb42848585b..6411657c6b6 100644
--- a/pkgs/development/libraries/libao/default.nix
+++ b/pkgs/development/libraries/libao/default.nix
@@ -10,9 +10,11 @@ stdenv.mkDerivation {
   buildInputs = [pkgconfig];
 
   meta = {
-    description = ''Libao is Xiph.org's cross-platform audio
-                    library that allows programs to output audio
-		    using a simple API on a wide variety of platforms.'';
+    longDescription = ''
+      Libao is Xiph.org's cross-platform audio library that allows
+      programs to output audio using a simple API on a wide variety of
+      platforms.
+    '';
     homepage = http://xiph.org/ao/;
     license = "GPL";
   };
diff --git a/pkgs/development/libraries/libcv/default.nix b/pkgs/development/libraries/libcv/default.nix
index 7daa084c8e5..649d0a5728f 100644
--- a/pkgs/development/libraries/libcv/default.nix
+++ b/pkgs/development/libraries/libcv/default.nix
@@ -26,7 +26,7 @@ rec {
     ln -s $out/include/opencv/* $out/include
   '') ["doMakeInstall" "minInit"];
       
-  name = "libcv-" + version;
+  name = "libcv-0.9.7";
   meta = {
     description = "libcv - computer vision library";
   };
diff --git a/pkgs/development/libraries/libdbi-drivers/0.8.2-1.nix b/pkgs/development/libraries/libdbi-drivers/0.8.2-1.nix
index 575d141fcf5..add438d07f1 100644
--- a/pkgs/development/libraries/libdbi-drivers/0.8.2-1.nix
+++ b/pkgs/development/libraries/libdbi-drivers/0.8.2-1.nix
@@ -29,13 +29,11 @@ args : with args;
 	};
 	in with localDefs;
 stdenv.mkDerivation rec {
-	name = "libdbi"+version;
+	name = "libdbi-"+version;
 	builder = writeScript (name + "-builder")
 		(textClosure localDefs [doConfigure doMakeInstall doForceShare doPropagate]);
 	meta = {
-		description = "
-	DB independent interface to DB; DB drivers (mysql only for now).
-";
+		description = "DB independent interface to DB; DB drivers (mysql only for now)";
 		inherit src;
 	};
 }
diff --git a/pkgs/development/libraries/libdbi/0.8.2.nix b/pkgs/development/libraries/libdbi/0.8.2.nix
index fd7b950c3ce..dd0f2ec1c5f 100644
--- a/pkgs/development/libraries/libdbi/0.8.2.nix
+++ b/pkgs/development/libraries/libdbi/0.8.2.nix
@@ -11,13 +11,11 @@ args : with args;
 	};
 	in with localDefs;
 stdenv.mkDerivation rec {
-	name = "libdbi"+version;
+	name = "libdbi-"+version;
 	builder = writeScript (name + "-builder")
 		(textClosure localDefs [doConfigure doMakeInstall doForceShare doPropagate]);
 	meta = {
-		description = "
-	DB independent interface to DB.	
-";
+		description = "DB independent interface to DB";
 		inherit src;
 	};
 }
diff --git a/pkgs/development/libraries/libextractor/0.5.18.nix b/pkgs/development/libraries/libextractor/0.5.18.nix
index da3bafd915b..ed56e5ce4fe 100644
--- a/pkgs/development/libraries/libextractor/0.5.18.nix
+++ b/pkgs/development/libraries/libextractor/0.5.18.nix
@@ -11,13 +11,11 @@ args : with args;
 	};
 	in with localDefs;
 stdenv.mkDerivation rec {
-	name = "libextractor"+version;
+	name = "libextractor-"+version;
 	builder = writeScript (name + "-builder")
 		(textClosure localDefs [doConfigure doMakeInstall doForceShare doPropagate]);
 	meta = {
-		description = "
-	Libextractor - extracts metadata from files.
-";
+		description = "A tool to extract metadata from files";
 		inherit src;
 	};
 }
diff --git a/pkgs/development/libraries/libksba/default.nix b/pkgs/development/libraries/libksba/default.nix
index 573064f2889..5ff99341da1 100644
--- a/pkgs/development/libraries/libksba/default.nix
+++ b/pkgs/development/libraries/libksba/default.nix
@@ -1,19 +1,19 @@
 args: with args;
+
 stdenv.mkDerivation rec {
-	name = "libksba-1.0.2";
+  name = "libksba-1.0.2";
 
-	src = fetchurl {
-		url = "ftp://ftp.gnupg.org/gcrypt/libksba/${name}.tar.bz2";
-		sha256 = "1jkjh1daaykkrfq0s4vv8ddf0w8agdvspg9qm0ghjidlrfnsfiwh";
-	};
+  src = fetchurl {
+    url = "ftp://ftp.gnupg.org/gcrypt/libksba/${name}.tar.bz2";
+    sha256 = "1jkjh1daaykkrfq0s4vv8ddf0w8agdvspg9qm0ghjidlrfnsfiwh";
+  };
 
-	propagatedBuildInputs = [libgpgerror];
+  propagatedBuildInputs = [libgpgerror];
 
-	configureFlags = "--enable-shared --disable-static";
+  configureFlags = "--enable-shared --disable-static";
 
-	meta = {
-		homepage = http://www.gnupg.org;
-		description = "Libksba  is a CMS and X.509 access library under
-		development";
-	};
+  meta = {
+    homepage = http://www.gnupg.org;
+    description = "Libksba is a CMS and X.509 access library under development";
+  };
 }
diff --git a/pkgs/development/libraries/libmad/default.nix b/pkgs/development/libraries/libmad/default.nix
index 458945e102d..41408297527 100644
--- a/pkgs/development/libraries/libmad/default.nix
+++ b/pkgs/development/libraries/libmad/default.nix
@@ -7,10 +7,7 @@ stdenv.mkDerivation {
     sha256 = "bbfac3ed6bfbc2823d3775ebb931087371e142bb0e9bb1bee51a76a6e0078690";
   };
 
-  buildInputs = [];
-
   meta = {
-    description = "MAD, a high-quality, fixed-point, MPEG audio decoder
-                   supporting MPEG-1 and MPEG-2.";
+    description = "A high-quality, fixed-point MPEG audio decoder supporting MPEG-1 and MPEG-2";
   };
 }
diff --git a/pkgs/development/libraries/liboil/0.3.13.nix b/pkgs/development/libraries/liboil/0.3.13.nix
index 3cb6ad6f992..b1425e454fb 100644
--- a/pkgs/development/libraries/liboil/0.3.13.nix
+++ b/pkgs/development/libraries/liboil/0.3.13.nix
@@ -14,7 +14,6 @@ stdenv.mkDerivation rec {
 
   meta = {
     homepage = http://liboil.freedesktop.org;
-    description = "Liboil is a library of simple functions that are optimized
-    for various CPUs.";
+    description = "A library of simple functions that are optimized for various CPUs";
   };
 }
diff --git a/pkgs/development/libraries/liboil/0.3.15.nix b/pkgs/development/libraries/liboil/0.3.15.nix
index db068d2dec3..b777a1195f9 100644
--- a/pkgs/development/libraries/liboil/0.3.15.nix
+++ b/pkgs/development/libraries/liboil/0.3.15.nix
@@ -14,7 +14,6 @@ stdenv.mkDerivation rec {
 
   meta = {
     homepage = http://liboil.freedesktop.org;
-    description = "Liboil is a library of simple functions that are optimized
-    for various CPUs.";
+    description = "A library of simple functions that are optimized for various CPUs";
   };
 }
diff --git a/pkgs/development/libraries/libwmf/default.nix b/pkgs/development/libraries/libwmf/default.nix
index 6f580613b16..7f7d7693182 100644
--- a/pkgs/development/libraries/libwmf/default.nix
+++ b/pkgs/development/libraries/libwmf/default.nix
@@ -1,18 +1,16 @@
 args: with args;
+
 stdenv.mkDerivation {
   name = "libwmf-0.2.8.4";
 
   src = fetchurl {
-		url = mirror://sourceforge/wvware/libwmf-0.2.8.4.tar.gz;
-		sha256 = "1y3wba4q8pl7kr51212jwrsz1x6nslsx1gsjml1x0i8549lmqd2v";
-	};
+    url = mirror://sourceforge/wvware/libwmf-0.2.8.4.tar.gz;
+    sha256 = "1y3wba4q8pl7kr51212jwrsz1x6nslsx1gsjml1x0i8549lmqd2v";
+  };
 
-  buildInputs = [zlib imagemagick libpng
-	pkgconfig glib freetype libjpeg libxml2];
+  buildInputs = [zlib imagemagick libpng pkgconfig glib freetype libjpeg libxml2];
 
   meta = {
-    description = "
-	WMF library from wvWare.
-";
+    description = "WMF library from wvWare";
   };
 }
diff --git a/pkgs/development/libraries/lzo/default.nix b/pkgs/development/libraries/lzo/default.nix
index 64d03c434c2..834b7abf593 100644
--- a/pkgs/development/libraries/lzo/default.nix
+++ b/pkgs/development/libraries/lzo/default.nix
@@ -1,14 +1,17 @@
-args: with args;
+{stdenv, fetchurl}:
+
 stdenv.mkDerivation rec {
-	name = "lzo-2.02";
-	src = fetchurl {
-		url = "${meta.homepage}/download/${name}.tar.gz";
-		sha256 = "1i9g9bdrmyn6546rnck3kkh8nssfaw75m2rxir4sn7bwvnsfryx2";
-	};
-	configureFlags = "--enable-shared --disable-static";
-	meta = {
-		description = "LZO is a data compresion library which is suitable for
-		data de-/compression in real-time";
-		homepage = http://www.oberhumer.com/opensource/lzo;
-	};
+  name = "lzo-2.02";
+  
+  src = fetchurl {
+    url = "${meta.homepage}/download/${name}.tar.gz";
+    sha256 = "1i9g9bdrmyn6546rnck3kkh8nssfaw75m2rxir4sn7bwvnsfryx2";
+  };
+  
+  configureFlags = "--enable-shared --disable-static";
+  
+  meta = {
+    description = "A data compresion library suitable for real-time data de-/compression";
+    homepage = http://www.oberhumer.com/opensource/lzo;
+  };
 }
diff --git a/pkgs/development/libraries/mpich2/default.nix b/pkgs/development/libraries/mpich2/default.nix
index b92eed68bde..7fb0e009f4a 100644
--- a/pkgs/development/libraries/mpich2/default.nix
+++ b/pkgs/development/libraries/mpich2/default.nix
@@ -2,18 +2,20 @@
 
 stdenv.mkDerivation rec {
   name = "mpich2-1.0.6p1";
+  
   src = fetchurl {
-    url = "http://www.mcs.anl.gov/research/projects/mpich2/downloads/tarballs/"
-      + name + ".tar.gz";
+    url = "http://www.mcs.anl.gov/research/projects/mpich2/downloads/tarballs/${name}.tar.gz";
     sha256 = "1k0za8951j5fn89ww6bsy9b4yi989zz7bnd8a6acfr8r0yb8z01q";
   };
 
   buildInputs = [ python ];
 
   meta = {
-    description = ''MPICH2 is a free high-performance and portable
-                    implementation of the Message Passing Interface
-		    (MPI) standard, both version 1 and version 2.'';
+    longDescription = ''
+      MPICH2 is a free high-performance and portable implementation of
+      the Message Passing Interface (MPI) standard, both version 1 and
+      version 2.
+    '';
     homepage = http://www.mcs.anl.gov/mpi/mpich2/;
     license = "free, see http://www.mcs.anl.gov/research/projects/mpich2/downloads/index.php?s=license";
   };
diff --git a/pkgs/development/python-modules/pygame/default.nix b/pkgs/development/python-modules/pygame/default.nix
index e0a09d94d7f..347501f8a5b 100644
--- a/pkgs/development/python-modules/pygame/default.nix
+++ b/pkgs/development/python-modules/pygame/default.nix
@@ -41,8 +41,6 @@ stdenv.mkDerivation {
   installPhase = "yes Y | python setup.py install --prefix=\${out} ";
 
   meta = {
-    description = "
-	Python library for games.
-";
+    description = "Python library for games";
   };
 }
diff --git a/pkgs/development/python-modules/pyxml/default.nix b/pkgs/development/python-modules/pyxml/default.nix
index 7c9aafded73..3c36565b526 100644
--- a/pkgs/development/python-modules/pyxml/default.nix
+++ b/pkgs/development/python-modules/pyxml/default.nix
@@ -22,8 +22,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = {
-    description = ''The PyXML package is a collection of libraries to process
-                    XML with Python.'';
+    description = "A collection of libraries to process XML with Python";
     homepage = http://pyxml.sourceforge.net/;
   };
 }
diff --git a/pkgs/development/tools/guile/guile-lint/default.nix b/pkgs/development/tools/guile/guile-lint/default.nix
index d2e4f7c2510..18625a3ec31 100644
--- a/pkgs/development/tools/guile/guile-lint/default.nix
+++ b/pkgs/development/tools/guile/guile-lint/default.nix
@@ -20,8 +20,7 @@ stdenv.mkDerivation rec {
   doCheck = true;
 
   meta = {
-    description = ''Guile-Lint checks syntax and semantics in a
-                    Guile program or module.'';
+    description = "Guile-Lint checks syntax and semantics in a Guile program or module";
     homepage = http://www.geocities.com/user42_kevin/guile-lint/index.html;
     license = "GPL";
   };
diff --git a/pkgs/development/tools/misc/indent/2.2.9.nix b/pkgs/development/tools/misc/indent/2.2.9.nix
index 3fefc259b39..a3d800c81e9 100644
--- a/pkgs/development/tools/misc/indent/2.2.9.nix
+++ b/pkgs/development/tools/misc/indent/2.2.9.nix
@@ -22,9 +22,7 @@ stdenv.mkDerivation rec {
 	builder = writeScript (name + "-builder")
 		(textClosure localDefs [doConfigure preBuild doMakeInstall doForceShare doPropagate]);
 	meta = {
-		description = "
-	GNU Indent - a source text formatter.
-";
+		description = "GNU Indent - a source text formatter";
 		inherit src;
 	};
 }
diff --git a/pkgs/development/tools/misc/intltool/0.36.2.nix b/pkgs/development/tools/misc/intltool/0.36.2.nix
index 741bc35909f..b203a90bd71 100644
--- a/pkgs/development/tools/misc/intltool/0.36.2.nix
+++ b/pkgs/development/tools/misc/intltool/0.36.2.nix
@@ -18,9 +18,7 @@ stdenv.mkDerivation rec {
 			doPropagate doForceShare]);
 	inherit propagatedBuildInputs;
 	meta = {
-		description = "
-	Internalization tool for XML.
-";
+		description = "Internalization tool for XML";
 		inherit src;
 	};
 }
diff --git a/pkgs/development/tools/misc/intltool/0.40.5.nix b/pkgs/development/tools/misc/intltool/0.40.5.nix
index 397a17d603b..f7e9a4c4561 100644
--- a/pkgs/development/tools/misc/intltool/0.40.5.nix
+++ b/pkgs/development/tools/misc/intltool/0.40.5.nix
@@ -18,9 +18,7 @@ stdenv.mkDerivation rec {
 			doPropagate doForceShare]);
 	inherit propagatedBuildInputs;
 	meta = {
-		description = "
-	Internalization tool for XML.
-";
+		description = "Internalization tool for XML";
 		inherit src;
 	};
 }
diff --git a/pkgs/development/tools/misc/ltrace/0.5-3deb.nix b/pkgs/development/tools/misc/ltrace/0.5-3deb.nix
index 8dde78d516b..d462cc3ab39 100644
--- a/pkgs/development/tools/misc/ltrace/0.5-3deb.nix
+++ b/pkgs/development/tools/misc/ltrace/0.5-3deb.nix
@@ -29,9 +29,7 @@ stdenv.mkDerivation rec {
 	builder = writeScript (name + "-builder")
 		(textClosure localDefs [preBuild preConfigure doConfigure doMakeInstall doForceShare]);
 	meta = {
-		description = "
-	Library call tracer.
-";
+		description = "Library call tracer";
 		inherit src;
 	};
 }
diff --git a/pkgs/games/construo/0.2.2.nix b/pkgs/games/construo/0.2.2.nix
index e0447382e56..bd6e95b9cb2 100644
--- a/pkgs/games/construo/0.2.2.nix
+++ b/pkgs/games/construo/0.2.2.nix
@@ -23,9 +23,7 @@ stdenv.mkDerivation rec {
 	builder = writeScript (name + "-builder")
 		(textClosure localDefs [preConfigure doConfigure doMakeInstall doForceShare doPropagate]);
 	meta = {
-		description = "
-	Construo masses and springs simulation.
-";
+		description = "Construo masses and springs simulation";
 		inherit src;
 	};
 }
diff --git a/pkgs/games/fsg/alt-builder.nix b/pkgs/games/fsg/alt-builder.nix
index da0c127a6e7..dfc7c6c724e 100644
--- a/pkgs/games/fsg/alt-builder.nix
+++ b/pkgs/games/fsg/alt-builder.nix
@@ -28,9 +28,7 @@ stdenv.mkDerivation {
 		(textClosure localDefs [doUnpack addInputs preBuild doMake installPhase doForceShare]);
 
   meta = {
-    description = "
-	Falling Sand Game - a cellular automata engine tuned towards the likes of Falling Sand.
-";
-		inherit src;
+    description = "Falling Sand Game - a cellular automata engine tuned towards the likes of Falling Sand";
+    inherit src;
   };
 }
diff --git a/pkgs/games/fsg/default.nix b/pkgs/games/fsg/default.nix
index 891ac488bf3..b67b1bcfc5f 100644
--- a/pkgs/games/fsg/default.nix
+++ b/pkgs/games/fsg/default.nix
@@ -1,14 +1,14 @@
 args: with args;
+
 stdenv.mkDerivation {
   name = "fsg-4.4";
 
-  src = 
-	fetchurl {
-		url = http://www.piettes.com/fallingsandgame/fsg-src-4.4.tar.gz;
-		sha256 = "1756y01rkvd3f1pkj88jqh83fqcfl2fy0c48mcq53pjzln9ycv8c";
-	};
+  src = fetchurl {
+    url = http://www.piettes.com/fallingsandgame/fsg-src-4.4.tar.gz;
+    sha256 = "1756y01rkvd3f1pkj88jqh83fqcfl2fy0c48mcq53pjzln9ycv8c";
+  };
 
-  buildInputs =[gtk glib pkgconfig mesa (wxGTK null) libX11 xproto];
+  buildInputs = [gtk glib pkgconfig mesa (wxGTK null) libX11 xproto];
 
 /*  
 #	One day Unicode will overcome?
@@ -29,22 +29,20 @@ stdenv.mkDerivation {
 		cp -r . /tmp/fsg
 	";*/
 
-	preBuild = "
-		sed -e '
-		s@currentProbIndex != 100@0@;
-		' -i MainFrame.cpp;
-	";
+  preBuild = ''
+    sed -e '
+      s@currentProbIndex != 100@0@;
+    ' -i MainFrame.cpp
+  '';
 
-  installPhase = "
-		ensureDir \$out/bin \$out/libexec;
-		cp sand \$out/libexec;
-		echo -e '#! /bin/sh\nLC_ALL=C '\$out'/libexec/sand \"$@\"' >\$out/bin/fsg;
-		chmod a+x \$out/bin/fsg;
-	";
+  installPhase = ''
+    ensureDir $out/bin $out/libexec
+    cp sand $out/libexec
+    echo -e '#! /bin/sh\nLC_ALL=C '$out'/libexec/sand "$@"' >$out/bin/fsg
+    chmod a+x $out/bin/fsg
+  '';
 
   meta = {
-    description = "
-	Falling Sand Game - a cellular automata engine tuned towards the likes of Falling Sand.
-";
+    description = "Falling Sand Game - a cellular automata engine tuned towards the likes of Falling Sand";
   };
 }
diff --git a/pkgs/games/gemrb/default.nix b/pkgs/games/gemrb/default.nix
index 46ab9abe746..aaccc8b5171 100644
--- a/pkgs/games/gemrb/default.nix
+++ b/pkgs/games/gemrb/default.nix
@@ -13,8 +13,7 @@ stdenv.mkDerivation {
   configureFlags = "--with-zlib=${zlib}";
 
   meta = {
-    description = "A reimplementation of the Infinity Engine "
-      + " (used by Baldur's Gate, Icewind Dale, Planescape: Torment, etc.)";
+    description = "A reimplementation of the Infinity Engine, used by games such as Baldur's Gate";
     homepage = http://gemrb.sourceforge.net/;
   };
 }
diff --git a/pkgs/games/orbit/1.01.nix b/pkgs/games/orbit/1.01.nix
index f128c7b90c2..1d122643f65 100644
--- a/pkgs/games/orbit/1.01.nix
+++ b/pkgs/games/orbit/1.01.nix
@@ -35,9 +35,7 @@ stdenv.mkDerivation rec {
 		(textClosure localDefs 
 			[ customBuild doForceShare doPropagate]);
 	meta = {
-		description = "
-		Orbit space flight simulator.
-";
+		description = "Orbit space flight simulator";
 		inherit src;
 	};
 }
diff --git a/pkgs/games/wesnoth/default.nix b/pkgs/games/wesnoth/default.nix
index 65c6002091e..d82e29c4f1b 100644
--- a/pkgs/games/wesnoth/default.nix
+++ b/pkgs/games/wesnoth/default.nix
@@ -1,5 +1,6 @@
 args: with args;
-stdenv.mkDerivation (rec {
+
+stdenv.mkDerivation rec {
   pname = "wesnoth";
   version = "1.4.1";
 
@@ -15,8 +16,6 @@ stdenv.mkDerivation (rec {
   configureFlags = "--with-preferences-dir=.${name} --program-suffix=-${version} --with-datadir-name=${name} --with-boost=${boost}/include --disable-python";
 
   meta = {
-    description = "
-      The Battle for Wesnoth  is a free, turn-based strategy game with a fantasy theme.
-";
+    description = "The Battle for Wesnoth, a free, turn-based strategy game with a fantasy theme";
   };
-})
+}
diff --git a/pkgs/os-specific/linux/acpi/default.nix b/pkgs/os-specific/linux/acpi/default.nix
index 9c093511907..d26a0aa7fca 100644
--- a/pkgs/os-specific/linux/acpi/default.nix
+++ b/pkgs/os-specific/linux/acpi/default.nix
@@ -9,10 +9,12 @@ stdenv.mkDerivation rec {
 
 
   meta = {
-    description = ''Linux ACPI client is a small command-line
-                    program that attempts to replicate the functionality of
-		    the "old" `apm' command on ACPI systems.  It includes
-		    battery and thermal information.'';
+    longDescription = ''
+      Linux ACPI client is a small command-line
+      program that attempts to replicate the functionality of
+      the "old" `apm' command on ACPI systems.  It includes
+      battery and thermal information.
+    '';
     homepage = http://grahame.angrygoats.net/acpi.shtml;
     license = "GPLv2+";
   };
diff --git a/pkgs/os-specific/linux/acpitool/default.nix b/pkgs/os-specific/linux/acpitool/default.nix
index e1f8d710500..f400229ecc7 100644
--- a/pkgs/os-specific/linux/acpitool/default.nix
+++ b/pkgs/os-specific/linux/acpitool/default.nix
@@ -1,16 +1,15 @@
-args: with args;
+{stdenv, fetchurl}:
 
 stdenv.mkDerivation rec {
   name = "acpitool-0.4.7";
+  
   src = fetchurl {
     url = "mirror://sourceforge/acpitool/${name}.tar.bz2";
     sha256 = "133bdgcq9ql0l940kp9m2v6wzdvkyv8f1dizwjbx7v96n8g2c239";
   };
 
-
   meta = {
-    description = ''ACPI Tool is a small, convenient command-line
-                    ACPI client with a lot of features for Linux.'';
+    description = "A small, convenient command-line ACPI client with a lot of features";
     homepage = http://freeunix.dyndns.org:8000/site2/acpitool.shtml;
     license = "GPLv2+";
   };
diff --git a/pkgs/os-specific/linux/atheros/0.9.3.3.nix b/pkgs/os-specific/linux/atheros/0.9.3.3.nix
index e28b6e27416..f34ad16c9ce 100644
--- a/pkgs/os-specific/linux/atheros/0.9.3.3.nix
+++ b/pkgs/os-specific/linux/atheros/0.9.3.3.nix
@@ -32,9 +32,7 @@ stdenv.mkDerivation rec {
 		(textClosure localDefs [doPatch doMakeInstall 
 			postInstall doForceShare doPropagate]);
 	meta = {
-		description = "
-		Atheros WiFi driver.
-";
+		description = "Atheros WiFi driver";
 		inherit src;
 	};
 }
diff --git a/pkgs/os-specific/linux/atheros/0.9.4.nix b/pkgs/os-specific/linux/atheros/0.9.4.nix
index 86a2a0eaf4f..b5004110992 100644
--- a/pkgs/os-specific/linux/atheros/0.9.4.nix
+++ b/pkgs/os-specific/linux/atheros/0.9.4.nix
@@ -22,9 +22,7 @@ stdenv.mkDerivation rec {
 		(textClosure localDefs [doMakeInstall 
 			postInstall doForceShare doPropagate]);
 	meta = {
-		description = "
-		Atheros WiFi driver.
-";
+		description = "Atheros WiFi driver";
 		inherit src;
 	};
 }
diff --git a/pkgs/os-specific/linux/atheros/r2756.nix b/pkgs/os-specific/linux/atheros/r2756.nix
index 7cbe5bcf314..e26533738e3 100644
--- a/pkgs/os-specific/linux/atheros/r2756.nix
+++ b/pkgs/os-specific/linux/atheros/r2756.nix
@@ -33,9 +33,7 @@ stdenv.mkDerivation rec {
 		(textClosure localDefs [doPatch doMakeInstall 
 			postInstall doForceShare doPropagate]);
 	meta = {
-		description = "
-		Atheros WiFi driver.
-";
+		description = "Atheros WiFi driver.";
 		inherit src;
 	};
 }
diff --git a/pkgs/os-specific/linux/atheros/r3122.nix b/pkgs/os-specific/linux/atheros/r3122.nix
index 35abd621438..020dce8a9a4 100644
--- a/pkgs/os-specific/linux/atheros/r3122.nix
+++ b/pkgs/os-specific/linux/atheros/r3122.nix
@@ -22,9 +22,7 @@ stdenv.mkDerivation rec {
 		(textClosure localDefs [doMakeInstall postInstall
 			doForceShare doPropagate]);
 	meta = {
-		description = "
-		Atheros WiFi driver.
-";
+		description = "Atheros WiFi driver";
 		inherit src;
 	};
 }
diff --git a/pkgs/os-specific/linux/atheros/r3574.nix b/pkgs/os-specific/linux/atheros/r3574.nix
index 486ae9fe80f..c16fc1285ec 100644
--- a/pkgs/os-specific/linux/atheros/r3574.nix
+++ b/pkgs/os-specific/linux/atheros/r3574.nix
@@ -22,9 +22,7 @@ stdenv.mkDerivation rec {
 		(textClosure localDefs [doMakeInstall postInstall
 			doForceShare doPropagate]);
 	meta = {
-		description = "
-		Atheros WiFi driver.
-";
+		description = "Atheros WiFi driver";
 		inherit src;
 	};
 }
diff --git a/pkgs/os-specific/linux/atheros/r3693.nix b/pkgs/os-specific/linux/atheros/r3693.nix
index 7561e07609a..bf8456787dd 100644
--- a/pkgs/os-specific/linux/atheros/r3693.nix
+++ b/pkgs/os-specific/linux/atheros/r3693.nix
@@ -35,9 +35,7 @@ stdenv.mkDerivation rec {
 			++ [doMakeInstall postInstall
 			doForceShare doPropagate]));
 	meta = {
-		description = "
-		Atheros WiFi driver.
-";
+		description = "Atheros WiFi driver";
 		inherit src;
 	};
 }
diff --git a/pkgs/os-specific/linux/atheros/r3837.nix b/pkgs/os-specific/linux/atheros/r3837.nix
index ca475bfc3e1..d7dbe98893c 100644
--- a/pkgs/os-specific/linux/atheros/r3837.nix
+++ b/pkgs/os-specific/linux/atheros/r3837.nix
@@ -39,9 +39,7 @@ stdenv.mkDerivation rec {
 			++ [doPatch doMakeInstall postInstall
 			doForceShare doPropagate]));
 	meta = {
-		description = "
-		Atheros WiFi driver.
-";
+		description = "Atheros WiFi driver";
 		inherit src;
 	};
 }
diff --git a/pkgs/os-specific/linux/atheros/r3867.nix b/pkgs/os-specific/linux/atheros/r3867.nix
index aaa708c2c5d..62316d38b81 100644
--- a/pkgs/os-specific/linux/atheros/r3867.nix
+++ b/pkgs/os-specific/linux/atheros/r3867.nix
@@ -39,9 +39,7 @@ stdenv.mkDerivation rec {
 			++ [doPatch doMakeInstall postInstall
 			doForceShare doPropagate]));
 	meta = {
-		description = "
-		Atheros WiFi driver.
-";
+		description = "Atheros WiFi driver";
 		inherit src;
 	};
 }
diff --git a/pkgs/os-specific/linux/dmidecode/2.9.nix b/pkgs/os-specific/linux/dmidecode/2.9.nix
index 65081d9f82e..e0b46b35e4e 100644
--- a/pkgs/os-specific/linux/dmidecode/2.9.nix
+++ b/pkgs/os-specific/linux/dmidecode/2.9.nix
@@ -16,9 +16,7 @@ stdenv.mkDerivation rec {
 	builder = writeScript (name + "-builder")
 		(textClosure localDefs [ doMakeInstall doForceShare doPropagate]);
 	meta = {
-		description = "
-		Tool to decode Desktop Management Interface and SBIOS data.
-";
+		description = "Tool to decode Desktop Management Interface and SBIOS data";
 		inherit src;
 	};
 }
diff --git a/pkgs/os-specific/linux/kqemu/1.3.0pre11.nix b/pkgs/os-specific/linux/kqemu/1.3.0pre11.nix
index d703533aabb..d2f26cab8a3 100644
--- a/pkgs/os-specific/linux/kqemu/1.3.0pre11.nix
+++ b/pkgs/os-specific/linux/kqemu/1.3.0pre11.nix
@@ -33,6 +33,6 @@ rec {
   phaseNames = ["fixInc" "fixMemFunc" "preConfigure" "doConfigure" "debugStep" "doMakeInstall"];
 
   meta = {
-    description = " Kernel module for Qemu acceleration ";
+    description = "Kernel module for Qemu acceleration";
   }; 
 }
diff --git a/pkgs/os-specific/linux/nvidia/default.nix b/pkgs/os-specific/linux/nvidia/default.nix
index 4fe6529583a..0b4d8b8988e 100644
--- a/pkgs/os-specific/linux/nvidia/default.nix
+++ b/pkgs/os-specific/linux/nvidia/default.nix
@@ -39,5 +39,6 @@ stdenv.mkDerivation {
   meta = {
     homepage = http://www.nvidia.com/object/unix.html;
     description = "X.org driver and kernel module for NVIDIA graphics cards";
+    license = "unfree";
   };
 }
diff --git a/pkgs/os-specific/linux/sdparm/1.03.nix b/pkgs/os-specific/linux/sdparm/1.03.nix
index e11db22fff0..9bc19954e03 100644
--- a/pkgs/os-specific/linux/sdparm/1.03.nix
+++ b/pkgs/os-specific/linux/sdparm/1.03.nix
@@ -15,9 +15,7 @@ stdenv.mkDerivation rec {
 	builder = writeScript (name + "-builder")
 		(textClosure localDefs [doConfigure doMakeInstall doForceShare doPropagate]);
 	meta = {
-		description = "
-	SCSI parameters utility.
-";
+		description = "Utility for setting parameters of SCSI devices";
 		inherit src;
 	};
 }
diff --git a/pkgs/servers/dict/1.9.15.nix b/pkgs/servers/dict/1.9.15.nix
index 2886bb24ae9..9eb0fe3dff9 100644
--- a/pkgs/servers/dict/1.9.15.nix
+++ b/pkgs/servers/dict/1.9.15.nix
@@ -16,9 +16,7 @@ stdenv.mkDerivation rec {
                 (textClosure localDefs 
                         [doConfigure doMakeInstall doForceShare doPropagate]);
         meta = {
-                description = "
-                Dict protocol server and client.
-";
+                description = "Dict protocol server and client";
                 inherit src;
         };
 }
diff --git a/pkgs/servers/dict/dictd-db.nix b/pkgs/servers/dict/dictd-db.nix
index 9eb89361c35..6b981f0c4de 100644
--- a/pkgs/servers/dict/dictd-db.nix
+++ b/pkgs/servers/dict/dictd-db.nix
@@ -23,9 +23,7 @@ stdenv.mkDerivation rec {
 		(textClosure localDefs 
 			[doInstall doForceShare doPropagate]);
 	meta = {
-		description = "
-		${name} dictionary for dictd.
-";
+		description = "${name} dictionary for dictd";
 		inherit src;
 	};
 };
diff --git a/pkgs/servers/irc/ircd-hybrid/default.nix b/pkgs/servers/irc/ircd-hybrid/default.nix
index 572cc28e55b..e428f4d649f 100644
--- a/pkgs/servers/irc/ircd-hybrid/default.nix
+++ b/pkgs/servers/irc/ircd-hybrid/default.nix
@@ -1,4 +1,5 @@
 args: with args;
+
 stdenv.mkDerivation {
   name = "ircd-hybrid-7.2.2";
 
@@ -9,15 +10,12 @@ stdenv.mkDerivation {
 
   buildInputs = [openssl zlib];
 
-  configureFlags =  ["--with-nicklen=100" 
-	"--with-topiclen=360" 
-	("--enable-openssl=" + openssl)];
+  configureFlags =
+    "--with-nicklen=100 --with-topiclen=360 --enable-openssl=${openssl}";
 
   preInstall = "mkdir -p \${out}/ ; ln -s /home/ircd \${out}/logs;";
 
   meta = {
-    description = "
-	An IPv6-capable IRC server.
-";
+    description = "An IPv6-capable IRC server";
   };
 }
diff --git a/pkgs/servers/xmpp/openfire/3.4.5.nix b/pkgs/servers/xmpp/openfire/3.4.5.nix
index 3bb69b37341..a8d7360d8d6 100644
--- a/pkgs/servers/xmpp/openfire/3.4.5.nix
+++ b/pkgs/servers/xmpp/openfire/3.4.5.nix
@@ -26,9 +26,7 @@ stdenv.mkDerivation rec {
     (textClosure localDefs 
       [ installPhase doForceShare doPropagate]);
   meta = {
-    description = "
-    XMPP server in Java.
-";
-		inherit src;
+    description = "XMPP server in Java";
+    inherit src;
   };
 }
diff --git a/pkgs/servers/xmpp/openfire/3.5.2.nix b/pkgs/servers/xmpp/openfire/3.5.2.nix
index 23f6f348a11..30e44b5771f 100644
--- a/pkgs/servers/xmpp/openfire/3.5.2.nix
+++ b/pkgs/servers/xmpp/openfire/3.5.2.nix
@@ -26,9 +26,7 @@ stdenv.mkDerivation rec {
     (textClosure localDefs 
       [ installPhase doForceShare doPropagate]);
   meta = {
-    description = "
-    XMPP server in Java.
-";
-		inherit src;
+    description = "XMPP server in Java";
+    inherit src;
   };
 }
diff --git a/pkgs/tools/X11/x11vnc/0.9.3.nix b/pkgs/tools/X11/x11vnc/0.9.3.nix
index 3452d3f893b..76b09673451 100644
--- a/pkgs/tools/X11/x11vnc/0.9.3.nix
+++ b/pkgs/tools/X11/x11vnc/0.9.3.nix
@@ -18,11 +18,9 @@ stdenv.mkDerivation rec {
     (textClosure localDefs 
       [doConfigure doMakeInstall doForceShare doPropagate]);
   meta = {
-    description = "
-    X11 VNC - VNC server connected to real X11 screen.
-";
+    description = "A VNC server connected to a real X11 screen";
     homepage = "http://www.karlrunge.com/x11vnc/";
-		inherit src;
+    inherit src;
   };
 }
 
diff --git a/pkgs/tools/X11/x2vnc/1.7.2.nix b/pkgs/tools/X11/x2vnc/1.7.2.nix
index 917995b719d..0d805b44ac2 100644
--- a/pkgs/tools/X11/x2vnc/1.7.2.nix
+++ b/pkgs/tools/X11/x2vnc/1.7.2.nix
@@ -20,9 +20,7 @@ stdenv.mkDerivation rec {
 		(textClosure localDefs 
 			[doConfigure doCreatePrefix doMakeInstall doForceShare doPropagate]);
 	meta = {
-		description = "
-		x2vnc - program to control remote VNC server.
-";
+		description = "A program to control a remote VNC server";
 		inherit src;
 	};
 }
diff --git a/pkgs/tools/backup/rsnapshot/default.nix b/pkgs/tools/backup/rsnapshot/default.nix
index c79be7cffb4..a9cba3f7dee 100644
--- a/pkgs/tools/backup/rsnapshot/default.nix
+++ b/pkgs/tools/backup/rsnapshot/default.nix
@@ -15,8 +15,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = {
-    description = ''rsnapshot is a filesystem snapshot utility for making
-                    backups of local and remote systems.'';
+    description = "A filesystem snapshot utility for making backups of local and remote systems";
     homepage = http://rsnapshot.org/;
     license = "GPLv2+";
   };
diff --git a/pkgs/tools/graphics/ploticus/default.nix b/pkgs/tools/graphics/ploticus/default.nix
index 3efb7eab881..f173f2f1e14 100644
--- a/pkgs/tools/graphics/ploticus/default.nix
+++ b/pkgs/tools/graphics/ploticus/default.nix
@@ -14,8 +14,7 @@ stdenv.mkDerivation {
   patches = [./ploticus-install.patch];
 
   meta = {
-    description = ''Ploticus, a non-interactive software package for
-                    producing plots and charts'';
+    description = "A non-interactive software package for producing plots and charts";
 
     longDescription = ''Ploticus is a free, GPL'd, non-interactive
       software package for producing plots, charts, and graphics from
diff --git a/pkgs/tools/misc/bogofilter/default.nix b/pkgs/tools/misc/bogofilter/default.nix
index 67382191da5..f23bd8993cf 100644
--- a/pkgs/tools/misc/bogofilter/default.nix
+++ b/pkgs/tools/misc/bogofilter/default.nix
@@ -14,11 +14,13 @@ stdenv.mkDerivation rec {
 
   meta = {
     homepage = http://bogofilter.sourceforge.net/;
-    description = ''Bogofilter is a mail filter that classifies mail
-                    as spam or ham (non-spam) by a statistical analysis of
-		    the message's header and content (body).  The program is
-		    able to learn from the user's classifications and
-		    corrections.  It is based on a Bayesian filter.'';
+    longDescription = ''
+      Bogofilter is a mail filter that classifies mail as spam or ham
+      (non-spam) by a statistical analysis of the message's header and
+      content (body).  The program is able to learn from the user's
+      classifications and corrections.  It is based on a Bayesian
+      filter.
+    '';
     license = "GPLv2";
   };
 }
diff --git a/pkgs/tools/misc/relfs/cvs.2007.12.01.nix b/pkgs/tools/misc/relfs/cvs.2007.12.01.nix
index 3f7aae91f34..0638331dbe2 100644
--- a/pkgs/tools/misc/relfs/cvs.2007.12.01.nix
+++ b/pkgs/tools/misc/relfs/cvs.2007.12.01.nix
@@ -44,9 +44,7 @@ stdenv.mkDerivation rec {
 	builder = writeScript (name + "-builder")
 		(textClosure localDefs [build doMakeInstall doForceShare doPropagate]);
 	meta = {
-		description = "
-	Relational FS over FUSE.
-";
+		description = "A relational filesystem on top of FUSE";
 		inherit src;
 	};
 }
diff --git a/pkgs/tools/misc/relfs/cvs.2008.03.05.nix b/pkgs/tools/misc/relfs/cvs.2008.03.05.nix
index 90275c1b32f..4f3627f19e3 100644
--- a/pkgs/tools/misc/relfs/cvs.2008.03.05.nix
+++ b/pkgs/tools/misc/relfs/cvs.2008.03.05.nix
@@ -45,9 +45,7 @@ stdenv.mkDerivation rec {
 	builder = writeScript (name + "-builder")
 		(textClosure localDefs [build doMakeInstall doForceShare doPropagate]);
 	meta = {
-		description = "
-	Relational FS over FUSE.
-";
+		description = "A relational filesystem on top of FUSE";
 		inherit src;
 	};
 }
diff --git a/pkgs/tools/misc/rlwrap/0.28.nix b/pkgs/tools/misc/rlwrap/0.28.nix
index c694109c2e8..1bd45375510 100644
--- a/pkgs/tools/misc/rlwrap/0.28.nix
+++ b/pkgs/tools/misc/rlwrap/0.28.nix
@@ -16,9 +16,7 @@ stdenv.mkDerivation rec {
 		(textClosure localDefs 
 			[doConfigure doMakeInstall doForceShare doPropagate]);
 	meta = {
-		description = "
-		Readline wrapper for console programs.
-";
+		description = "Readline wrapper for console programs";
 		inherit src;
 	};
 }
diff --git a/pkgs/tools/misc/testdisk/default.nix b/pkgs/tools/misc/testdisk/default.nix
index fa3a54f6195..fd9f4578294 100644
--- a/pkgs/tools/misc/testdisk/default.nix
+++ b/pkgs/tools/misc/testdisk/default.nix
@@ -13,10 +13,10 @@ stdenv.mkDerivation {
   meta = {
     homepage = http://www.cgsecurity.org/wiki/TestDisk;
     license = "GPL";
-    description = "
+    longDescription = ''
       TestDisk is a program for data recovery, primarily designed to
       help recover lost partitions and/or make non-booting disks
-      bootable again
-    ";
+      bootable again.
+    '';
   };
 }
diff --git a/pkgs/tools/misc/timidity/default.nix b/pkgs/tools/misc/timidity/default.nix
index d32f25e50b6..3aa9247742b 100644
--- a/pkgs/tools/misc/timidity/default.nix
+++ b/pkgs/tools/misc/timidity/default.nix
@@ -1,4 +1,5 @@
 args: with args;
+
 stdenv.mkDerivation {
   name = "timidity-2.13.0";
 
@@ -7,25 +8,21 @@ stdenv.mkDerivation {
     sha256 = "1jbmk0m375fh5nj2awqzns7pdjbi7dxpjdwcix04zipfcilppbmf";
   };
 
-  instruments = 
-	fetchurl {
-		url = http://www.csee.umbc.edu/pub/midia/instruments.tar.gz;
-		sha256 = "0lsh9l8l5h46z0y8ybsjd4pf6c22n33jsjvapfv3rjlfnasnqw67";
-	};
-
-  buildInputs =[alsaLib];
+  instruments = fetchurl {
+    url = http://www.csee.umbc.edu/pub/midia/instruments.tar.gz;
+    sha256 = "0lsh9l8l5h46z0y8ybsjd4pf6c22n33jsjvapfv3rjlfnasnqw67";
+  };
 
-  config=./timidity.cfg;
+  buildInputs = [alsaLib];
 
-  postInstall = "mkdir -p \$out/share/timidity/; 
-		cp \$config \$out/share/timidity/timidity.cfg; 
-		tar -xf \$instruments -C \$out/share/timidity/; 
-	";
+  postInstall = ''
+    mkdir -p $out/share/timidity/;
+    cp ${./timidity.cfg} $out/share/timidity/timidity.cfg
+    tar -xf $instruments -C $out/share/timidity/
+  '';
 
   meta = {
-    description = "
-	TiMidity - software MIDI renderer.
-";
+    description = "A software MIDI renderer";
   };
 }
 
diff --git a/pkgs/tools/misc/wv/default.nix b/pkgs/tools/misc/wv/default.nix
index 9fe71248e8d..361a7b927b1 100644
--- a/pkgs/tools/misc/wv/default.nix
+++ b/pkgs/tools/misc/wv/default.nix
@@ -1,18 +1,16 @@
 args: with args;
+
 stdenv.mkDerivation {
   name = "wv-1.2.4";
 
   src = fetchurl {
-		url = mirror://sourceforge/wvware/wv-1.2.4.tar.gz;
-		sha256 = "1mn2ax6qjy3pvixlnvbkn6ymy6y4l2wxrr4brjaczm121s8hjcb7";
-	};
+    url = mirror://sourceforge/wvware/wv-1.2.4.tar.gz;
+    sha256 = "1mn2ax6qjy3pvixlnvbkn6ymy6y4l2wxrr4brjaczm121s8hjcb7";
+  };
 
-  buildInputs = [zlib imagemagick libpng glib
-	pkgconfig libgsf libxml2 bzip2];
+  buildInputs = [zlib imagemagick libpng glib pkgconfig libgsf libxml2 bzip2];
 
   meta = {
-    description = "
-	Convertor from Microsoft Word formats to human-editable ones.
-";
+    description = "Converter from Microsoft Word formats to human-editable ones";
   };
 }
diff --git a/pkgs/tools/networking/nc6/1.0.nix b/pkgs/tools/networking/nc6/1.0.nix
index 4ea5578abed..b6155c7a053 100644
--- a/pkgs/tools/networking/nc6/1.0.nix
+++ b/pkgs/tools/networking/nc6/1.0.nix
@@ -16,9 +16,7 @@ stdenv.mkDerivation rec {
     (textClosure localDefs 
      [doConfigure doMakeInstall doForceShare doPropagate]);
   meta = {
-    description = "
-      nc6 - one more netcat, IPv6 support included.
-    ";
+    description = "A netcat implementation with IPv6 support";
     homepage = "http://www.deepspace6.net/projects/netcat6.html";
     inherit src;
   };
diff --git a/pkgs/tools/networking/ncat/default.nix b/pkgs/tools/networking/ncat/default.nix
index cc3ad321de8..8f81e9284b6 100644
--- a/pkgs/tools/networking/ncat/default.nix
+++ b/pkgs/tools/networking/ncat/default.nix
@@ -1,4 +1,5 @@
 {stdenv, fetchurl, openssl}:
+
 stdenv.mkDerivation {
   name = "ncat-0.10rc3";
 
@@ -7,18 +8,18 @@ stdenv.mkDerivation {
     sha256 = "1yb26ipxwhqkfannji90jxi38k35fal4ffx0jm5clr1a1rndjjzb";
   };
 
-  patches = [./ncat-0.10rc3.patch ];
+  patches = [./ncat-0.10rc3.patch];
 
-  buildInputs = [openssl ];
+  buildInputs = [openssl];
 
   CFLAGS = "-g";
 
-  postInstall = "install -D ncat \${out}/bin/ncat ; 
-	install -D docs/man/ncat.1 \${out}/man/ncat.1 ;";
+  postInstall = ''
+    install -D ncat $out/bin/ncat
+    install -D docs/man/ncat.1 $out/man/ncat.1
+  '';
 
   meta = {
-    description = "
-	Ncat - some effort to join features from different `netcat's. Supports IPv6.
-";
+    description = "A netcat implementation with IPv6 support";
   };
 }
diff --git a/pkgs/tools/networking/p2p/libtorrent/default.nix b/pkgs/tools/networking/p2p/libtorrent/default.nix
index d8cdc26fd38..50acf00678f 100644
--- a/pkgs/tools/networking/p2p/libtorrent/default.nix
+++ b/pkgs/tools/networking/p2p/libtorrent/default.nix
@@ -13,8 +13,6 @@ stdenv.mkDerivation ( rec {
   buildInputs = [ pkgconfig openssl libsigcxx ];
   
   meta = {
-    description = "
-      LibTorrent is a BitTorrent library written in C++ for *nix, with a focus on high performance and good code.
-    ";
+    description = "A BitTorrent library written in C++ for *nix, with a focus on high performance and good code";
   };
 })
diff --git a/pkgs/tools/networking/p2p/rtorrent/default.nix b/pkgs/tools/networking/p2p/rtorrent/default.nix
index 04b50f9d5d2..2999da115fb 100644
--- a/pkgs/tools/networking/p2p/rtorrent/default.nix
+++ b/pkgs/tools/networking/p2p/rtorrent/default.nix
@@ -13,8 +13,6 @@ stdenv.mkDerivation ( rec {
   buildInputs = [ libtorrent ncurses pkgconfig libsigcxx curl zlib openssl ];
   
   meta = {
-    description = "
-      rtorrent is a ncurses client for libtorrent and is ideal for use with screen or dtach.
-    ";
+    description = "An ncurses client for libtorrent, ideal for use with screen or dtach";
   };
 })
diff --git a/pkgs/tools/networking/smbfs-fuse/0.8.7.nix b/pkgs/tools/networking/smbfs-fuse/0.8.7.nix
index c5ef3ebeae0..be25331460a 100644
--- a/pkgs/tools/networking/smbfs-fuse/0.8.7.nix
+++ b/pkgs/tools/networking/smbfs-fuse/0.8.7.nix
@@ -21,10 +21,8 @@ stdenv.mkDerivation rec {
 	builder = writeScript (name + "-builder")
 		(textClosure localDefs 
 			[doConfigure doMakeInstall postInstall doForceShare doPropagate]);
-	meta = {
-		description = "
-		Samba mounted via FUSE.
-";
-	  inherit src;
-	};
+  meta = {
+   description = "Samba mounted via FUSE";
+   inherit src;
+  };
 }
diff --git a/pkgs/tools/security/seccure/0.3.nix b/pkgs/tools/security/seccure/0.3.nix
index 1725d7ab903..b9a8d42541e 100644
--- a/pkgs/tools/security/seccure/0.3.nix
+++ b/pkgs/tools/security/seccure/0.3.nix
@@ -20,9 +20,7 @@ stdenv.mkDerivation rec {
 		(textClosure localDefs 
 			["doPatch" doMakeInstall doForceShare doPropagate]);
 	meta = {
-		description = "
-		Elliptic Curve Cryptography. Zero-configuration.
-";
+		description = "Zero-configuration elliptic curve cryptography utility";
 		inherit src;
 	};
 }
diff --git a/pkgs/tools/security/ssss/0.5.nix b/pkgs/tools/security/ssss/0.5.nix
index 28c59185069..a6e8429a9df 100644
--- a/pkgs/tools/security/ssss/0.5.nix
+++ b/pkgs/tools/security/ssss/0.5.nix
@@ -23,9 +23,7 @@ stdenv.mkDerivation rec {
 		(textClosure localDefs 
 			["doPatch" doMakeInstall doForceShare doPropagate]);
 	meta = {
-		description = "
-		Shamir Secret Sharing Scheme
-";
+		description = "Shamir Secret Sharing Scheme";
 		inherit src;
 	};
 }
diff --git a/pkgs/tools/system/filelight/default.nix b/pkgs/tools/system/filelight/default.nix
index 901f41f5ac3..872c56f700e 100644
--- a/pkgs/tools/system/filelight/default.nix
+++ b/pkgs/tools/system/filelight/default.nix
@@ -1,5 +1,5 @@
-{stdenv, fetchurl, kdelibs, qt, x11, zlib, perl,
-	libpng}:
+{stdenv, fetchurl, kdelibs, qt, x11, zlib, perl, libpng}:
+
 stdenv.mkDerivation {
   name = "filelight-1.0";
 
@@ -9,14 +9,15 @@ stdenv.mkDerivation {
   };
 
   buildInputs = [kdelibs qt x11 zlib perl libpng];
-  configureFlags = " --without-debug --without-arts ";
-  preConfigure = "sed -e '/sys_lib_\(dl\)\{0,1\}search_path_spec=/d' -i configure;
-	sed -e '/X_LDFLAGS=/d' -i configure";
+  
+  configureFlags = "--without-debug --without-arts";
+  
+  preConfigure = ''
+    sed -e '/sys_lib_\(dl\)\{0,1\}search_path_spec=/d' -i configure
+    sed -e '/X_LDFLAGS=/d' -i configure
+  '';
 
   meta = {
-    description = "
-	Filelight lets you analyze which directories 
-	and files eat your disk space.
-";
+    description = "A tool for analysing which directories and files eat your disk space";
   };
 }
diff --git a/pkgs/tools/system/gdmap/0.7.5.nix b/pkgs/tools/system/gdmap/0.7.5.nix
index 7f686cb10e6..ef07df5bf8d 100644
--- a/pkgs/tools/system/gdmap/0.7.5.nix
+++ b/pkgs/tools/system/gdmap/0.7.5.nix
@@ -15,9 +15,7 @@ stdenv.mkDerivation rec {
 	builder = writeScript (name + "-builder")
 		(textClosure localDefs [doConfigure doMakeInstall doForceShare doPropagate]);
 	meta = {
-		description = "
-	Recursive rectangle map of disk usage.	
-";
+		description = "Recursive rectangle map of disk usage";
 		inherit src;
 	};
 }
diff --git a/pkgs/tools/system/gdmap/0.8.1.nix b/pkgs/tools/system/gdmap/0.8.1.nix
index ee2bd707fff..982d5651f65 100644
--- a/pkgs/tools/system/gdmap/0.8.1.nix
+++ b/pkgs/tools/system/gdmap/0.8.1.nix
@@ -11,13 +11,11 @@ args : with args;
 	};
 	in with localDefs;
 stdenv.mkDerivation rec {
-	name = "gdmap"+version;
+	name = "gdmap-"+version;
 	builder = writeScript (name + "-builder")
 		(textClosure localDefs [doConfigure doMakeInstall doForceShare doPropagate]);
 	meta = {
-		description = "
-	Recursive rectangle map of disk usage.	
-";
+		description = "Recursive rectangle map of disk usage";
 		inherit src;
 	};
 }
diff --git a/pkgs/tools/typesetting/asciidoc/default.nix b/pkgs/tools/typesetting/asciidoc/default.nix
index ab6c9aef0ae..8ab1ba98e43 100644
--- a/pkgs/tools/typesetting/asciidoc/default.nix
+++ b/pkgs/tools/typesetting/asciidoc/default.nix
@@ -44,9 +44,10 @@ stdenv.mkDerivation rec {
   '';
 
   meta = {
-    description = ''AsciiDoc is a text-based document generation system.
-                    AsciiDoc input files can be translated to HTML and
-		    DocBook markups'';
+    longDescription = ''
+      AsciiDoc is a text-based document generation system.  AsciiDoc
+      input files can be translated to HTML and DocBook markups.
+    '';
     homepage = http://www.methods.co.nz/asciidoc/;
     license = "GPLv2+";
   };
diff --git a/pkgs/tools/typesetting/docbook2x/default.nix b/pkgs/tools/typesetting/docbook2x/default.nix
index a6e56f1c53b..30276fcb6f6 100644
--- a/pkgs/tools/typesetting/docbook2x/default.nix
+++ b/pkgs/tools/typesetting/docbook2x/default.nix
@@ -44,9 +44,11 @@ stdenv.mkDerivation rec {
   '';
 
   meta = {
-    description = ''docbook2X is a software package that converts DocBook
-                    documents into the traditional Unix man page format
-		    and the GNU Texinfo format.'';
+    longDescription = ''
+      docbook2X is a software package that converts DocBook documents
+      into the traditional Unix man page format and the GNU Texinfo
+      format.
+    '';
     license = "MIT-style";
     homepage = http://docbook2x.sourceforge.net/;
   };
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index df36376eee3..43b99a137ae 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -2884,6 +2884,7 @@ let
     inherit fetchurl stdenv builderDefs stringsWithDeps;
     singlePrecision = false;
   };
+  
   fftwSinglePrec = import ../development/libraries/fftw {
     inherit fetchurl stdenv builderDefs stringsWithDeps;
     singlePrecision = true;
@@ -3312,8 +3313,7 @@ let
     inherit fetchurl stdenv gettext;
   };
 
-  libextractor = composedArgsAndFun (selectVersion ../development/libraries/libextractor "0.5.18")
-  {
+  libextractor = composedArgsAndFun (selectVersion ../development/libraries/libextractor "0.5.18") {
     inherit fetchurl stdenv builderDefs zlib;
   };
 
@@ -8422,6 +8422,7 @@ let
     imagemagick = imagemagickBig;
     inherit (gtkLibs) glib gtk;
   };
+  
   pidginlatexSF = builderDefsPackage
     (import ../applications/networking/instant-messengers/pidgin-plugins/pidgin-latex/pidgin-latex-sf.nix)
     {
@@ -8788,14 +8789,14 @@ let
        );
   };
 
-  x11vnc =  composedArgsAndFun (selectVersion ../tools/X11/x11vnc "0.9.3") {
+  x11vnc = composedArgsAndFun (selectVersion ../tools/X11/x11vnc "0.9.3") {
     inherit builderDefs openssl zlib libjpeg ;
     inherit (xlibs) libXfixes fixesproto libXdamage damageproto
       libX11 xproto libXtst libXinerama xineramaproto libXrandr randrproto
       libXext xextproto inputproto recordproto;
   };
 
-  x2vnc =  composedArgsAndFun (selectVersion ../tools/X11/x2vnc "1.7.2") {
+  x2vnc = composedArgsAndFun (selectVersion ../tools/X11/x2vnc "1.7.2") {
     inherit builderDefs;
     inherit (xlibs) libX11 xproto xextproto libXext libXrandr randrproto;
   };
@@ -8892,7 +8893,7 @@ let
     pyrex = pyrex095;
   };
 
-  xscreensaverBase =  composedArgsAndFun (import ../applications/graphics/xscreensaver) {
+  xscreensaverBase = composedArgsAndFun (import ../applications/graphics/xscreensaver) {
     inherit stdenv fetchurl builderDefs lib pkgconfig bc perl intltool;
     inherit (xlibs) libX11 libXmu;
   };
@@ -8977,7 +8978,7 @@ let
     inherit fetchurl stdenv python pygame twisted lib numeric makeWrapper;
   };
 
-  construoBase =  composedArgsAndFun (selectVersion ../games/construo "0.2.2") {
+  construoBase = composedArgsAndFun (selectVersion ../games/construo "0.2.2") {
     inherit stdenv fetchurl builderDefs
       zlib;
     inherit (xlibs) libX11 xproto;
@@ -9069,7 +9070,7 @@ let
   };
 
   # You still can override by passing more arguments.
-  spaceOrbit =  composedArgsAndFun (selectVersion ../games/orbit "1.01") {
+  spaceOrbit = composedArgsAndFun (selectVersion ../games/orbit "1.01") {
     inherit fetchurl stdenv builderDefs mesa freeglut;
     inherit (gnome) esound;
     inherit (xlibs) libXt libX11 libXmu libXi libXext;
@@ -9133,7 +9134,7 @@ let
       gettext x11 libtiff libjpeg libpng gtkLibs xlibs bzip2
       libcm python dbus_glib ncurses which libxml2Python
       iconnamingutils openssl hal samba fam libgcrypt libtasn1
-      xmlto  docbook2x  docbook_xsl intltool;
+      xmlto docbook2x docbook_xsl intltool;
   });
 
   kdelibs = import ../desktops/kde/kdelibs {