* 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

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,
+    longDescription = ''
-    		    a terminal, the command line or a script.'';
+      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";
   };

pkgs/applications/audio/ladspa-plugins/default.nix

@@ -21,9 +21,7 @@ stdenv.mkDerivation {
 		(textClosure localDefs [doConfigure doMakeInstall 
 			postInstall doForceShare]);
 	meta = {
-		description = "
+		description = "LADSPA format audio plugins";
-	LADSPA format audio plugins.
-";
 		inherit src;
 	};
 }

pkgs/applications/audio/ladspa-plugins/ladspah.nix

@@ -22,9 +22,7 @@ stdenv.mkDerivation {
 	builder = writeScript "ladspa.h-builder"
 		(textClosure localDefs [copyFile]);
 	meta = {
-		description = "
+		description = "LADSPA format audio plugins";
-	LADSPA format audio plugins.
-";
 		inherit src;
 	};
 }

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
+    longDescription = ''
-                    audio files, notably the `ogg123' player and the
+      A set of command-line tools to manipulate Ogg Vorbis audio
-		    `oggenc' encoder.'';
+      files, notably the `ogg123' player and the `oggenc' encoder.
+    '';
     homepage = http://xiph.org/vorbis/;
     license = "GPLv2";
   };

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
+    description = "The Insidious Big Brother Database (BBDB), a contact management utility for Emacs";
-                    contact management utility for Emacs.'';
     homepage = http://bbdb.sourceforge.net/;
     license = "GPL";
   };

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
+    description = "Enhanced Emacs support for editing and running Scheme code";
-                    Running Scheme Code'';
     homepage = http://www.neilvandyke.org/quack/;
     license = "GPLv2+";
   };

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 = "
+		description = "GPL Optical Character Recognition";
-		GPL Optical Character Recognition
-";
 		inherit src;
 	};
 }

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
+    longDescription = ''
-                    that edits files in the W3C SVG (Scalable Vector
+      Inkscape is a feature-rich vector graphics editor that edits
-		    Graphics) file format.'';
+      files in the W3C SVG (Scalable Vector Graphics) file format.
+    '';
   };
 }

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 = "
+		description = "A set of screensavers";
-	The X screensaver daemon. Run xscreensaver-demo to configure.
-";
 		inherit src;
 	};
 }

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
+  buildInputs = [qt libX11 libjpeg libtiff libpng ghostscript zlib libungif x11 mesa];
-	x11 mesa];
 
   meta = {
-    description = "
+    description = "A library and viewer for the DJVU file format for scanned images";
-	DjVu libre - a library and a viewer for djvu format - compression for
-	scanned images.
-";
     homepage = http://djvu.sourceforge.net;
   };
 }
-

pkgs/applications/networking/instant-messengers/pidgin-plugins/pidgin-latex/default.nix

@@ -1,15 +1,16 @@
-{stdenv, fetchurl, pidgin, imagemagick, ghostscript,
+{ stdenv, fetchurl, pidgin, imagemagick, ghostscript
-	pkgconfig, glib, gtk, texLive}:
+, pkgconfig, glib, gtk, texLive
+}:
+        
 stdenv.mkDerivation {
   name = "pidgin-latex";
 
-  src = 
+  src = fetchurl {
-	fetchurl {
     url = http://tapas.affenbande.org/pidgin-latex/pidgin-latex-0.9.tgz;
     sha256 = "1yqd3qgxd3n8hm60qg7yv7j1crr6f3d4yrdpgwdpw2pyf92p8nxp";
   };
 
-  preBuild = "
+  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
@@ -17,27 +18,29 @@ stdenv.mkDerivation {
     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; 
+  postInstall = ''
-	ln -s \${out}/lib/pidgin/pidgin-latex.so \${out}/share/pidgin-latex/";
+    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 = "
+    longDescription = ''
-	Pidgin-LaTeX is a pidgin plugin that cuts everything inside \$\$ .. \$\$
+      Pidgin-LaTeX is a pidgin plugin that cuts everything inside \$\$
-	and feeds to LaTeX. A bit of conversion (automated, of course) - and you
+      .. \$\$ and feeds to LaTeX. A bit of conversion (automated, of
-	see every formula that occurs in conversation in pretty graphical form.
+      course) - and you see every formula that occurs in conversation
-	There are some glitches - when a formula fails to compile, you can see 
+      in pretty graphical form.  There are some glitches - when a
-	just previous formula..
+      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;
   };
 }

pkgs/applications/networking/p2p/ldcpp/1.0.1.nix

@@ -23,9 +23,7 @@ stdenv.mkDerivation rec {
 		(textClosure localDefs 
 			[doScons doForceShare doPropagate]);
 	meta = {
-		description = "
+		description = "Linux DC++ - Direct Connect client";
-		Linux DC++ - Direct Connect client
-";
 		inherit src;
 	};
 }

pkgs/applications/version-management/arch/default.nix

@@ -21,8 +21,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = {
-    description = ''GNU Arch (aka. `tla'), a distributed revision
+    description = "GNU Arch (aka. `tla'), a distributed revision control system";
-    		    control system.'';
     homepage = http://www.gnu.org/software/gnu-arch/;
     license = "GPL";
   };

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
+    longDescription = ''
-                    from a CVS repository.  A patchset in this case is
+      CVSps is a program for generating `patchset' information from a
-		    defined as a set of changes made to a collection of
+      CVS repository.  A patchset in this case is defined as a set of
-		    files, and all committed at the same time (using a single
+      changes made to a collection of files, and all committed at the
-		    "cvs commit" command).'';
+      same time (using a single "cvs commit" command).
+    '';
     homepage = http://www.cobite.com/cvsps/;
     license = "GPLv2";
   };

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";
+  };
 }

pkgs/applications/window-managers/compiz/0.6.2.nix

@@ -41,9 +41,7 @@ rec {
 			doForceShare postAll]);
 	inherit propagatedBuildInputs;
 	meta = {
-		description = "
+		description = "Compiz window manager";
-	Compiz window manager
-";
 		inherit src;
 	};
 }

pkgs/applications/window-managers/compiz/0.7.8.nix

@@ -42,9 +42,7 @@ rec {
 			doForceShare postAll]);
 	inherit propagatedBuildInputs;
 	meta = {
-		description = "
+		description = "Compiz window manager";
-	Compiz window manager
-";
 		inherit src;
 	};
 }

pkgs/applications/window-managers/compiz/0.8.0.nix

@@ -41,9 +41,7 @@ rec {
 			doForceShare postAll]);
 	inherit propagatedBuildInputs;
 	meta = {
-		description = "
+		description = "Compiz window manager";
-	Compiz window manager
-";
 		inherit src;
 	};
 }

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 = "
+		description = "Just a desktop panel";
-	Just a desktop panel.	
-";
 		inherit src;
 	};
 }

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";
   };
-
 }

pkgs/data/documentation/rnrs/common.nix

@@ -15,8 +15,7 @@ stdenv.mkDerivation rec {
   builder = ./builder.sh;
 
   meta = {
-    description = ''Revised^${toString revision} Report on the
+    description = "Revised^${toString revision} Report on the Algorithmic Language Scheme";
-                    Algorithmic Language Scheme'';
 
     longDescription = ''
       This package contains the GNU Info version of the

pkgs/data/fonts/clearlyU/1.9.nix

@@ -23,9 +23,7 @@ stdenv.mkDerivation rec {
 		(textClosure localDefs 
 			[doInstall doForceShare doPropagate]);
 	meta = {
-		description = "
+		description = "A Unicode font";
-		A Unicode font.
-";
 		inherit src;
 	};
 }

pkgs/data/fonts/junicode/0.6.15.nix

@@ -21,9 +21,7 @@ stdenv.mkDerivation rec {
 		(textClosure localDefs 
 			[doInstall doForceShare doPropagate]);
 	meta = {
-		description = "
+		description = "A Unicode font";
-		A Unicode font.
-";
 		inherit src;
 	};
 }

pkgs/data/fonts/ucs-fonts/default.nix

@@ -31,9 +31,7 @@ wrapFonts (stdenv.mkDerivation {
 	'';
 
 	meta = {
-		description = "
+		description = "Unicode bitmap fonts";
-			UCS-fonts - Unicode bitmap fonts.
-		";
 		src = [srcA srcB srcC];
 	};
 })

pkgs/data/fonts/wqy_zenhei/0.4.23-1.nix

@@ -20,9 +20,7 @@ stdenv.mkDerivation rec {
 		(textClosure localDefs 
 			[doInstall doForceShare doPropagate]);
 	meta = {
-		description = "
+		description = "A (mainly) Chinese Unicode font";
-		A (mainly) Chinese Unicode font.
-";
 		inherit src;
 	};
 }

pkgs/development/compilers/fpc/binary.nix

@@ -1,4 +1,5 @@
 args: with args;
+
 stdenv.mkDerivation {
   name = "fpc-2.2.2-binary";
 
@@ -10,8 +11,6 @@ stdenv.mkDerivation {
   builder = ./binary-builder.sh;
 
   meta = {
-    description = "
+    description = "Free Pascal Compiler from a binary distribution";
-	Free Pascal Compiler from a binary distribution.
-";
   };
 } 

pkgs/development/compilers/fpc/default.nix

@@ -1,7 +1,9 @@
 args:
-if ((args ? startFPC) && (args.startFPC != null))
+
-	then 
+if args ? startFPC && args.startFPC != null then
+
 with args;
+
 stdenv.mkDerivation {
   name = "fpc-2.2.2";
 
@@ -12,20 +14,24 @@ stdenv.mkDerivation {
 
   buildInputs = [startFPC gawk];
 
-  preConfigure = (if system == "i686-linux" || system == "x86_64-linux" then ''
+  preConfigure =
+    if system == "i686-linux" || system == "x86_64-linux" then ''
       sed -e "s@'/lib/ld-linux[^']*'@'''@" -i fpcsrc/compiler/systems/t_linux.pas
-  '' else "");
+    '' else "";
 
   makeFlags = "NOGDB=1";
 
   installFlags = "INSTALL_PREFIX=\${out}";
-  postInstall = "ln -fs $out/lib/fpc/*/ppc386 $out/bin;
+  
-	mkdir -p $out/lib/fpc/etc/ ;
+  postInstall = ''
-	$out/lib/fpc/*/samplecfg $out/lib/fpc/2.2.0 $out/lib/fpc/etc/;";
+    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 = "
+    description = "Free Pascal Compiler from a source distribution";
-	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);}))

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)
+    longDscription = ''
-                    language, a distributed shared memory aware variant of
+      A GCC-based compiler for the Unified Parallel C (UPC) language,
-		    C (see http://upc.gwu.edu/).'';
+      a distributed shared memory aware variant of C (see
+      http://upc.gwu.edu/).
+    '';
   };
 }

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 = "
+		description = "Qi - next generation on top of Common Lisp";
-		Qi - next generation on top of Common Lisp.
-";
 		inherit src;
 	};
 }

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
+    description = "Guile-Library, a collection of useful Guile Scheme modules";
-                    Scheme modules'';
     homepage = http://home.gna.org/guile-lib/;
     license = "GPL";
   };

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 = "
+    description = "SDL image library";
-      SDL image library.
-";
   };
-})
+}

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 = "
+    description = "SDL multi-channel audio mixer library";
-      SDL multi-channel audio mixer library.
-";
   };
-})
+}

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 = "
+    description = "SDL networking library";
-      SDL networking library.
-";
   };
-})
+}

pkgs/development/libraries/SDL_ttf/default.nix

@@ -1,6 +1,7 @@
 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;
@@ -9,11 +10,9 @@ stdenv.mkDerivation {
 
   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 = "
+    description = "SDL TrueType library";
-	SDL image library.
-";
   };
 }

pkgs/development/libraries/chmlib/default.nix

@@ -1,7 +1,8 @@
-args: with args;
+{stdenv, fetchurl}:
 
 stdenv.mkDerivation rec {
   name = "chmlib-0.39";
+  
   src = fetchurl {
     url = "${meta.homepage}/${name}.tar.bz2";
     sha256 = "0hgzw121ffmk79wbpkd0394y5ah99c3i85z6scp958mmkr25sc6j";
@@ -10,7 +11,6 @@ stdenv.mkDerivation rec {
   meta = {
     homepage = http://www.jedrea.com/chmlib;
     license = "LGPL";
-	  description = "CHLIB is a library for dealing with Microsoft ITSS/CHM
+    description = "A library for dealing with Microsoft ITSS/CHM format files";
-	  format files";
   };
 }

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 = "
+		description = "Fastest Fourier Transform in the West library";
-	Fastest Fourier Transform in the West library.
-";
 		inherit src;
 	};
 }

pkgs/development/libraries/libao/default.nix

@@ -10,9 +10,11 @@ stdenv.mkDerivation {
   buildInputs = [pkgconfig];
 
   meta = {
-    description = ''Libao is Xiph.org's cross-platform audio
+    longDescription = ''
-                    library that allows programs to output audio
+      Libao is Xiph.org's cross-platform audio library that allows
-		    using a simple API on a wide variety of platforms.'';
+      programs to output audio using a simple API on a wide variety of
+      platforms.
+    '';
     homepage = http://xiph.org/ao/;
     license = "GPL";
   };

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";
   };

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 = "
+		description = "DB independent interface to DB; DB drivers (mysql only for now)";
-	DB independent interface to DB; DB drivers (mysql only for now).
-";
 		inherit src;
 	};
 }

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 = "
+		description = "DB independent interface to DB";
-	DB independent interface to DB.	
-";
 		inherit src;
 	};
 }

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 = "
+		description = "A tool to extract metadata from files";
-	Libextractor - extracts metadata from files.
-";
 		inherit src;
 	};
 }

pkgs/development/libraries/libksba/default.nix

@@ -1,4 +1,5 @@
 args: with args;
+
 stdenv.mkDerivation rec {
   name = "libksba-1.0.2";
 
@@ -13,7 +14,6 @@ stdenv.mkDerivation rec {
 
   meta = {
     homepage = http://www.gnupg.org;
-		description = "Libksba  is a CMS and X.509 access library under
+    description = "Libksba is a CMS and X.509 access library under development";
-		development";
   };
 }

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
+    description = "A high-quality, fixed-point MPEG audio decoder supporting MPEG-1 and MPEG-2";
-                   supporting MPEG-1 and MPEG-2.";
   };
 }

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
+    description = "A library of simple functions that are optimized for various CPUs";
-    for various CPUs.";
   };
 }

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
+    description = "A library of simple functions that are optimized for various CPUs";
-    for various CPUs.";
   };
 }

pkgs/development/libraries/libwmf/default.nix

@@ -1,4 +1,5 @@
 args: with args;
+
 stdenv.mkDerivation {
   name = "libwmf-0.2.8.4";
 
@@ -7,12 +8,9 @@ stdenv.mkDerivation {
     sha256 = "1y3wba4q8pl7kr51212jwrsz1x6nslsx1gsjml1x0i8549lmqd2v";
   };
 
-  buildInputs = [zlib imagemagick libpng
+  buildInputs = [zlib imagemagick libpng pkgconfig glib freetype libjpeg libxml2];
-	pkgconfig glib freetype libjpeg libxml2];
 
   meta = {
-    description = "
+    description = "WMF library from wvWare";
-	WMF library from wvWare.
-";
   };
 }

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
+    description = "A data compresion library suitable for real-time data de-/compression";
-		data de-/compression in real-time";
     homepage = http://www.oberhumer.com/opensource/lzo;
   };
 }

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/"
+    url = "http://www.mcs.anl.gov/research/projects/mpich2/downloads/tarballs/${name}.tar.gz";
-      + name + ".tar.gz";
     sha256 = "1k0za8951j5fn89ww6bsy9b4yi989zz7bnd8a6acfr8r0yb8z01q";
   };
 
   buildInputs = [ python ];
 
   meta = {
-    description = ''MPICH2 is a free high-performance and portable
+    longDescription = ''
-                    implementation of the Message Passing Interface
+      MPICH2 is a free high-performance and portable implementation of
-		    (MPI) standard, both version 1 and version 2.'';
+      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";
   };

pkgs/development/python-modules/pygame/default.nix

@@ -41,8 +41,6 @@ stdenv.mkDerivation {
   installPhase = "yes Y | python setup.py install --prefix=\${out} ";
 
   meta = {
-    description = "
+    description = "Python library for games";
-	Python library for games.
-";
   };
 }

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
+    description = "A collection of libraries to process XML with Python";
-                    XML with Python.'';
     homepage = http://pyxml.sourceforge.net/;
   };
 }

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
+    description = "Guile-Lint checks syntax and semantics in a Guile program or module";
-                    Guile program or module.'';
     homepage = http://www.geocities.com/user42_kevin/guile-lint/index.html;
     license = "GPL";
   };

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 = "
+		description = "GNU Indent - a source text formatter";
-	GNU Indent - a source text formatter.
-";
 		inherit src;
 	};
 }

pkgs/development/tools/misc/intltool/0.36.2.nix

@@ -18,9 +18,7 @@ stdenv.mkDerivation rec {
 			doPropagate doForceShare]);
 	inherit propagatedBuildInputs;
 	meta = {
-		description = "
+		description = "Internalization tool for XML";
-	Internalization tool for XML.
-";
 		inherit src;
 	};
 }

pkgs/development/tools/misc/intltool/0.40.5.nix

@@ -18,9 +18,7 @@ stdenv.mkDerivation rec {
 			doPropagate doForceShare]);
 	inherit propagatedBuildInputs;
 	meta = {
-		description = "
+		description = "Internalization tool for XML";
-	Internalization tool for XML.
-";
 		inherit src;
 	};
 }

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 = "
+		description = "Library call tracer";
-	Library call tracer.
-";
 		inherit src;
 	};
 }

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 = "
+		description = "Construo masses and springs simulation";
-	Construo masses and springs simulation.
-";
 		inherit src;
 	};
 }

pkgs/games/fsg/alt-builder.nix

@@ -28,9 +28,7 @@ stdenv.mkDerivation {
 		(textClosure localDefs [doUnpack addInputs preBuild doMake installPhase doForceShare]);
 
   meta = {
-    description = "
+    description = "Falling Sand Game - a cellular automata engine tuned towards the likes of Falling Sand";
-	Falling Sand Game - a cellular automata engine tuned towards the likes of Falling Sand.
-";
     inherit src;
   };
 }

pkgs/games/fsg/default.nix

@@ -1,14 +1,14 @@
 args: with args;
+
 stdenv.mkDerivation {
   name = "fsg-4.4";
 
-  src = 
+  src = fetchurl {
-	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 = "
+  preBuild = ''
     sed -e '
       s@currentProbIndex != 100@0@;
-		' -i MainFrame.cpp;
+    ' -i MainFrame.cpp
-	";
+  '';
 
-  installPhase = "
+  installPhase = ''
-		ensureDir \$out/bin \$out/libexec;
+    ensureDir $out/bin $out/libexec
-		cp sand \$out/libexec;
+    cp sand $out/libexec
-		echo -e '#! /bin/sh\nLC_ALL=C '\$out'/libexec/sand \"$@\"' >\$out/bin/fsg;
+    echo -e '#! /bin/sh\nLC_ALL=C '$out'/libexec/sand "$@"' >$out/bin/fsg
-		chmod a+x \$out/bin/fsg;
+    chmod a+x $out/bin/fsg
-	";
+  '';
 
   meta = {
-    description = "
+    description = "Falling Sand Game - a cellular automata engine tuned towards the likes of Falling Sand";
-	Falling Sand Game - a cellular automata engine tuned towards the likes of Falling Sand.
-";
   };
 }

pkgs/games/gemrb/default.nix

@@ -13,8 +13,7 @@ stdenv.mkDerivation {
   configureFlags = "--with-zlib=${zlib}";
 
   meta = {
-    description = "A reimplementation of the Infinity Engine "
+    description = "A reimplementation of the Infinity Engine, used by games such as Baldur's Gate";
-      + " (used by Baldur's Gate, Icewind Dale, Planescape: Torment, etc.)";
     homepage = http://gemrb.sourceforge.net/;
   };
 }

pkgs/games/orbit/1.01.nix

@@ -35,9 +35,7 @@ stdenv.mkDerivation rec {
 		(textClosure localDefs 
 			[ customBuild doForceShare doPropagate]);
 	meta = {
-		description = "
+		description = "Orbit space flight simulator";
-		Orbit space flight simulator.
-";
 		inherit src;
 	};
 }

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 = "
+    description = "The Battle for Wesnoth, a free, turn-based strategy game with a fantasy theme";
-      The Battle for Wesnoth  is a free, turn-based strategy game with a fantasy theme.
-";
   };
-})
+}

pkgs/os-specific/linux/acpi/default.nix

@@ -9,10 +9,12 @@ stdenv.mkDerivation rec {
 
 
   meta = {
-    description = ''Linux ACPI client is a small command-line
+    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.'';
+      battery and thermal information.
+    '';
     homepage = http://grahame.angrygoats.net/acpi.shtml;
     license = "GPLv2+";
   };

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
+    description = "A small, convenient command-line ACPI client with a lot of features";
-                    ACPI client with a lot of features for Linux.'';
     homepage = http://freeunix.dyndns.org:8000/site2/acpitool.shtml;
     license = "GPLv2+";
   };

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 = "
+		description = "Atheros WiFi driver";
-		Atheros WiFi driver.
-";
 		inherit src;
 	};
 }

pkgs/os-specific/linux/atheros/0.9.4.nix

@@ -22,9 +22,7 @@ stdenv.mkDerivation rec {
 		(textClosure localDefs [doMakeInstall 
 			postInstall doForceShare doPropagate]);
 	meta = {
-		description = "
+		description = "Atheros WiFi driver";
-		Atheros WiFi driver.
-";
 		inherit src;
 	};
 }

pkgs/os-specific/linux/atheros/r2756.nix

@@ -33,9 +33,7 @@ stdenv.mkDerivation rec {
 		(textClosure localDefs [doPatch doMakeInstall 
 			postInstall doForceShare doPropagate]);
 	meta = {
-		description = "
+		description = "Atheros WiFi driver.";
-		Atheros WiFi driver.
-";
 		inherit src;
 	};
 }

pkgs/os-specific/linux/atheros/r3122.nix

@@ -22,9 +22,7 @@ stdenv.mkDerivation rec {
 		(textClosure localDefs [doMakeInstall postInstall
 			doForceShare doPropagate]);
 	meta = {
-		description = "
+		description = "Atheros WiFi driver";
-		Atheros WiFi driver.
-";
 		inherit src;
 	};
 }

pkgs/os-specific/linux/atheros/r3574.nix

@@ -22,9 +22,7 @@ stdenv.mkDerivation rec {
 		(textClosure localDefs [doMakeInstall postInstall
 			doForceShare doPropagate]);
 	meta = {
-		description = "
+		description = "Atheros WiFi driver";
-		Atheros WiFi driver.
-";
 		inherit src;
 	};
 }

pkgs/os-specific/linux/atheros/r3693.nix

@@ -35,9 +35,7 @@ stdenv.mkDerivation rec {
 			++ [doMakeInstall postInstall
 			doForceShare doPropagate]));
 	meta = {
-		description = "
+		description = "Atheros WiFi driver";
-		Atheros WiFi driver.
-";
 		inherit src;
 	};
 }

pkgs/os-specific/linux/atheros/r3837.nix

@@ -39,9 +39,7 @@ stdenv.mkDerivation rec {
 			++ [doPatch doMakeInstall postInstall
 			doForceShare doPropagate]));
 	meta = {
-		description = "
+		description = "Atheros WiFi driver";
-		Atheros WiFi driver.
-";
 		inherit src;
 	};
 }

pkgs/os-specific/linux/atheros/r3867.nix

@@ -39,9 +39,7 @@ stdenv.mkDerivation rec {
 			++ [doPatch doMakeInstall postInstall
 			doForceShare doPropagate]));
 	meta = {
-		description = "
+		description = "Atheros WiFi driver";
-		Atheros WiFi driver.
-";
 		inherit src;
 	};
 }

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 = "
+		description = "Tool to decode Desktop Management Interface and SBIOS data";
-		Tool to decode Desktop Management Interface and SBIOS data.
-";
 		inherit src;
 	};
 }

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";
   }; 
 }

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";
   };
 }

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 = "
+		description = "Utility for setting parameters of SCSI devices";
-	SCSI parameters utility.
-";
 		inherit src;
 	};
 }

pkgs/servers/dict/1.9.15.nix

@@ -16,9 +16,7 @@ stdenv.mkDerivation rec {
                 (textClosure localDefs 
                         [doConfigure doMakeInstall doForceShare doPropagate]);
         meta = {
-                description = "
+                description = "Dict protocol server and client";
-                Dict protocol server and client.
-";
                 inherit src;
         };
 }

pkgs/servers/dict/dictd-db.nix

@@ -23,9 +23,7 @@ stdenv.mkDerivation rec {
 		(textClosure localDefs 
 			[doInstall doForceShare doPropagate]);
 	meta = {
-		description = "
+		description = "${name} dictionary for dictd";
-		${name} dictionary for dictd.
-";
 		inherit src;
 	};
 };

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" 
+  configureFlags =
-	"--with-topiclen=360" 
+    "--with-nicklen=100 --with-topiclen=360 --enable-openssl=${openssl}";
-	("--enable-openssl=" + openssl)];
 
   preInstall = "mkdir -p \${out}/ ; ln -s /home/ircd \${out}/logs;";
 
   meta = {
-    description = "
+    description = "An IPv6-capable IRC server";
-	An IPv6-capable IRC server.
-";
   };
 }

pkgs/servers/xmpp/openfire/3.4.5.nix

@@ -26,9 +26,7 @@ stdenv.mkDerivation rec {
     (textClosure localDefs 
       [ installPhase doForceShare doPropagate]);
   meta = {
-    description = "
+    description = "XMPP server in Java";
-    XMPP server in Java.
-";
     inherit src;
   };
 }

pkgs/servers/xmpp/openfire/3.5.2.nix

@@ -26,9 +26,7 @@ stdenv.mkDerivation rec {
     (textClosure localDefs 
       [ installPhase doForceShare doPropagate]);
   meta = {
-    description = "
+    description = "XMPP server in Java";
-    XMPP server in Java.
-";
     inherit src;
   };
 }

pkgs/tools/X11/x11vnc/0.9.3.nix

@@ -18,9 +18,7 @@ stdenv.mkDerivation rec {
     (textClosure localDefs 
       [doConfigure doMakeInstall doForceShare doPropagate]);
   meta = {
-    description = "
+    description = "A VNC server connected to a real X11 screen";
-    X11 VNC - VNC server connected to real X11 screen.
-";
     homepage = "http://www.karlrunge.com/x11vnc/";
     inherit src;
   };

pkgs/tools/X11/x2vnc/1.7.2.nix

@@ -20,9 +20,7 @@ stdenv.mkDerivation rec {
 		(textClosure localDefs 
 			[doConfigure doCreatePrefix doMakeInstall doForceShare doPropagate]);
 	meta = {
-		description = "
+		description = "A program to control a remote VNC server";
-		x2vnc - program to control remote VNC server.
-";
 		inherit src;
 	};
 }

pkgs/tools/backup/rsnapshot/default.nix

@@ -15,8 +15,7 @@ stdenv.mkDerivation rec {
   '';
 
   meta = {
-    description = ''rsnapshot is a filesystem snapshot utility for making
+    description = "A filesystem snapshot utility for making backups of local and remote systems";
-                    backups of local and remote systems.'';
     homepage = http://rsnapshot.org/;
     license = "GPLv2+";
   };

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
+    description = "A non-interactive software package for producing plots and charts";
-                    producing plots and charts'';
 
     longDescription = ''Ploticus is a free, GPL'd, non-interactive
       software package for producing plots, charts, and graphics from

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
+    longDescription = ''
-                    as spam or ham (non-spam) by a statistical analysis of
+      Bogofilter is a mail filter that classifies mail as spam or ham
-		    the message's header and content (body).  The program is
+      (non-spam) by a statistical analysis of the message's header and
-		    able to learn from the user's classifications and
+      content (body).  The program is able to learn from the user's
-		    corrections.  It is based on a Bayesian filter.'';
+      classifications and corrections.  It is based on a Bayesian
+      filter.
+    '';
     license = "GPLv2";
   };
 }

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 = "
+		description = "A relational filesystem on top of FUSE";
-	Relational FS over FUSE.
-";
 		inherit src;
 	};
 }

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 = "
+		description = "A relational filesystem on top of FUSE";
-	Relational FS over FUSE.
-";
 		inherit src;
 	};
 }

pkgs/tools/misc/rlwrap/0.28.nix

@@ -16,9 +16,7 @@ stdenv.mkDerivation rec {
 		(textClosure localDefs 
 			[doConfigure doMakeInstall doForceShare doPropagate]);
 	meta = {
-		description = "
+		description = "Readline wrapper for console programs";
-		Readline wrapper for console programs.
-";
 		inherit src;
 	};
 }

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.
-    ";
+    '';
   };
 }

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 = 
+  instruments = fetchurl {
-	fetchurl {
     url = http://www.csee.umbc.edu/pub/midia/instruments.tar.gz;
     sha256 = "0lsh9l8l5h46z0y8ybsjd4pf6c22n33jsjvapfv3rjlfnasnqw67";
   };
 
-  buildInputs =[alsaLib];
+  buildInputs = [alsaLib];
 
-  config=./timidity.cfg;
+  postInstall = ''
-
+    mkdir -p $out/share/timidity/;
-  postInstall = "mkdir -p \$out/share/timidity/; 
+    cp ${./timidity.cfg} $out/share/timidity/timidity.cfg
-		cp \$config \$out/share/timidity/timidity.cfg; 
+    tar -xf $instruments -C $out/share/timidity/
-		tar -xf \$instruments -C \$out/share/timidity/; 
+  '';
-	";
 
   meta = {
-    description = "
+    description = "A software MIDI renderer";
-	TiMidity - software MIDI renderer.
-";
   };
 }
 

pkgs/tools/misc/wv/default.nix

@@ -1,4 +1,5 @@
 args: with args;
+
 stdenv.mkDerivation {
   name = "wv-1.2.4";
 
@@ -7,12 +8,9 @@ stdenv.mkDerivation {
     sha256 = "1mn2ax6qjy3pvixlnvbkn6ymy6y4l2wxrr4brjaczm121s8hjcb7";
   };
 
-  buildInputs = [zlib imagemagick libpng glib
+  buildInputs = [zlib imagemagick libpng glib pkgconfig libgsf libxml2 bzip2];
-	pkgconfig libgsf libxml2 bzip2];
 
   meta = {
-    description = "
+    description = "Converter from Microsoft Word formats to human-editable ones";
-	Convertor from Microsoft Word formats to human-editable ones.
-";
   };
 }

pkgs/tools/networking/nc6/1.0.nix

@@ -16,9 +16,7 @@ stdenv.mkDerivation rec {
     (textClosure localDefs 
      [doConfigure doMakeInstall doForceShare doPropagate]);
   meta = {
-    description = "
+    description = "A netcat implementation with IPv6 support";
-      nc6 - one more netcat, IPv6 support included.
-    ";
     homepage = "http://www.deepspace6.net/projects/netcat6.html";
     inherit src;
   };

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 ; 
+  postInstall = ''
-	install -D docs/man/ncat.1 \${out}/man/ncat.1 ;";
+    install -D ncat $out/bin/ncat
+    install -D docs/man/ncat.1 $out/man/ncat.1
+  '';
 
   meta = {
-    description = "
+    description = "A netcat implementation with IPv6 support";
-	Ncat - some effort to join features from different `netcat's. Supports IPv6.
-";
   };
 }

pkgs/tools/networking/p2p/libtorrent/default.nix

@@ -13,8 +13,6 @@ stdenv.mkDerivation ( rec {
   buildInputs = [ pkgconfig openssl libsigcxx ];
   
   meta = {
-    description = "
+    description = "A BitTorrent library written in C++ for *nix, with a focus on high performance and good code";
-      LibTorrent is a BitTorrent library written in C++ for *nix, with a focus on high performance and good code.
-    ";
   };
 })

pkgs/tools/networking/p2p/rtorrent/default.nix

@@ -13,8 +13,6 @@ stdenv.mkDerivation ( rec {
   buildInputs = [ libtorrent ncurses pkgconfig libsigcxx curl zlib openssl ];
   
   meta = {
-    description = "
+    description = "An ncurses client for libtorrent, ideal for use with screen or dtach";
-      rtorrent is a ncurses client for libtorrent and is ideal for use with screen or dtach.
-    ";
   };
 })

pkgs/tools/networking/smbfs-fuse/0.8.7.nix

@@ -22,9 +22,7 @@ stdenv.mkDerivation rec {
 		(textClosure localDefs 
 			[doConfigure doMakeInstall postInstall doForceShare doPropagate]);
   meta = {
-		description = "
+   description = "Samba mounted via FUSE";
-		Samba mounted via FUSE.
-";
    inherit src;
   };
 }

pkgs/tools/security/seccure/0.3.nix

@@ -20,9 +20,7 @@ stdenv.mkDerivation rec {
 		(textClosure localDefs 
 			["doPatch" doMakeInstall doForceShare doPropagate]);
 	meta = {
-		description = "
+		description = "Zero-configuration elliptic curve cryptography utility";
-		Elliptic Curve Cryptography. Zero-configuration.
-";
 		inherit src;
 	};
 }

pkgs/tools/security/ssss/0.5.nix

@@ -23,9 +23,7 @@ stdenv.mkDerivation rec {
 		(textClosure localDefs 
 			["doPatch" doMakeInstall doForceShare doPropagate]);
 	meta = {
-		description = "
+		description = "Shamir Secret Sharing Scheme";
-		Shamir Secret Sharing Scheme
-";
 		inherit src;
 	};
 }

pkgs/tools/system/filelight/default.nix

@@ -1,5 +1,5 @@
-{stdenv, fetchurl, kdelibs, qt, x11, zlib, perl,
+{stdenv, fetchurl, kdelibs, qt, x11, zlib, perl, libpng}:
-	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;
+  configureFlags = "--without-debug --without-arts";
-	sed -e '/X_LDFLAGS=/d' -i configure";
+  
+  preConfigure = ''
+    sed -e '/sys_lib_\(dl\)\{0,1\}search_path_spec=/d' -i configure
+    sed -e '/X_LDFLAGS=/d' -i configure
+  '';
 
   meta = {
-    description = "
+    description = "A tool for analysing which directories and files eat your disk space";
-	Filelight lets you analyze which directories 
-	and files eat your disk space.
-";
   };
 }

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 = "
+		description = "Recursive rectangle map of disk usage";
-	Recursive rectangle map of disk usage.	
-";
 		inherit src;
 	};
 }