* 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/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;
   };

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

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

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

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