* 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

7 files changed, 31 insertions, 40 deletions

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