14 files changed, 21 insertions, 39 deletions
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;
 	};
 }