* 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

2 files changed, 26 insertions, 21 deletions

diff --git a/pkgs/development/compilers/fpc/binary.nix b/pkgs/development/compilers/fpc/binary.nix
index 1bda19faf938..eb931b959cb6 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 f13ea373418f..6fa0f1327872 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);}))