8 files changed, 72 insertions, 23 deletions
diff --git a/pkgs/tools/compression/bzip2/default.nix b/pkgs/tools/compression/bzip2/default.nix
index e8ac6c6418cb6..6be18e12a265b 100644
--- a/pkgs/tools/compression/bzip2/default.nix
+++ b/pkgs/tools/compression/bzip2/default.nix
@@ -2,9 +2,9 @@
 
 stdenv.mkDerivation {
   name = "bzip2-1.0.5";
-  
+
   builder = ./builder.sh;
-    
+
   src = fetchurl {
     url = http://www.bzip.org/1.0.5/bzip2-1.0.5.tar.gz;
     sha256 = "08py2s9vw6dgw457lbklh1vsr3b8x8dlv7d8ygdfaxlx61l57gzp";
@@ -26,8 +26,12 @@ stdenv.mkDerivation {
   makeFlags = if linkStatic then "LDFLAGS=-static" else "";
 
   inherit linkStatic;
-    
+
   meta = {
-    homepage = http://www.bzip.org;
+    homepage = "http://www.bzip.org";
+    description = "high-quality data compression program";
+
+    platforms = stdenv.lib.platforms.all;
+    maintainers = [];
   };
 }
diff --git a/pkgs/tools/misc/bc/default.nix b/pkgs/tools/misc/bc/default.nix
index b8c3657bb6458..2d3d70d5ead31 100644
--- a/pkgs/tools/misc/bc/default.nix
+++ b/pkgs/tools/misc/bc/default.nix
@@ -1,20 +1,23 @@
 {stdenv, fetchurl, flex, readline}:
 
-stdenv.mkDerivation {
-  name = "bc-1.0.6";
+stdenv.mkDerivation rec {
+  name = "bc-1.06";
   src = fetchurl {
-    url = mirror://gnu/bc/bc-1.06.tar.gz;
-    md5 = "d44b5dddebd8a7a7309aea6c36fda117";
+    url = "mirror://gnu/bc/${name}.tar.gz";
+    sha256 = "0cqf5jkwx6awgd2xc2a0mkpxilzcfmhncdcfg7c9439wgkqxkxjf";
   };
 
   patches = [ ./readlinefix.patch ];
 
-  configureFlags = "--with-readline";
+  configureFlags = [ "--with-readline" ];
 
   buildInputs = [flex readline];
 
+  doCheck = true;
+
   meta = {
     description = "GNU software calculator";
     homepage = http://www.gnu.org/software/bc/;
+    platforms = stdenv.lib.platforms.all;
   };
 }
diff --git a/pkgs/tools/misc/parallel/default.nix b/pkgs/tools/misc/parallel/default.nix
index 7b60bc3f5834c..05c1ffaa96527 100644
--- a/pkgs/tools/misc/parallel/default.nix
+++ b/pkgs/tools/misc/parallel/default.nix
@@ -1,11 +1,11 @@
 { fetchurl, stdenv, perl }:
 
 stdenv.mkDerivation rec {
-  name = "parallel-20100906";
+  name = "parallel-20100922";
 
   src = fetchurl {
     url = "mirror://gnu/parallel/${name}.tar.bz2";
-    sha256 = "1h27ffq0hk2dlnffsk377lpp65l2zmvija7r831lpvdfssklmxvw";
+    sha256 = "0bn1pka242pgm5dm0wkd4zf63rwv0wxxb0fjdjivlxyid72r7g8d";
   };
 
   patchPhase =
diff --git a/pkgs/tools/misc/screen/default.nix b/pkgs/tools/misc/screen/default.nix
index 39e763c4ca70e..f31a28c221a2c 100644
--- a/pkgs/tools/misc/screen/default.nix
+++ b/pkgs/tools/misc/screen/default.nix
@@ -8,4 +8,12 @@ stdenv.mkDerivation {
   };
 
   buildInputs = [ncurses];
+
+  meta = {
+    homepage = "http://www.gnu.org/software/screen/";
+    description = "Full-screen window manager that multiplexes a physical terminal";
+
+    platforms = stdenv.lib.platforms.unix;
+    maintainers = [];
+  };
 }
diff --git a/pkgs/tools/networking/nss-mdns/default.nix b/pkgs/tools/networking/nss-mdns/default.nix
index 1dd430c74931c..dfade68912490 100644
--- a/pkgs/tools/networking/nss-mdns/default.nix
+++ b/pkgs/tools/networking/nss-mdns/default.nix
@@ -1,25 +1,24 @@
-{ fetchurl, stdenv, avahi }:
+{ fetchurl, stdenv }:
 
 stdenv.mkDerivation rec {
   name = "nss-mdns-0.10";
+
   src = fetchurl {
     url = "http://0pointer.de/lennart/projects/nss-mdns/${name}.tar.gz";
     sha256 = "0vgs6j0qsl0mwzh5a0m0bykr7x6bx79vnbyn0r3q289rghp3qs0y";
   };
 
-  configureFlags = "--enable-avahi";
-
   # Note: Although `nss-mdns' works by talking to `avahi-daemon', it
   # doesn't depend on the Avahi libraries.  Instead, it contains
   # hand-written D-Bus code to talk to the Avahi daemon.
 
-  buildInput = [ avahi ];
+  configureFlags =
+    [ # Try to use the Avahi daemon before resolving on our own.
+      "--enable-avahi"
 
-  patchPhase = ''
-    substituteInPlace "src/Makefile.in"						\
-      --replace 'AVAHI_SOCKET=\"$(localstatedir)/run/avahi-daemon/socket\"'	\
-                'AVAHI_SOCKET=\"${avahi}/var/run/avahi-daemon/socket\"'
-  '';
+      # Connect to the daemon at `/var/run/avahi-daemon/socket'.
+      "--localstatedir=/var"
+    ];
 
   meta = {
     description = "The mDNS Name Service Switch (NSS) plug-in";
@@ -33,5 +32,10 @@ stdenv.mkDerivation rec {
 
     homepage = http://0pointer.de/lennart/projects/nss-mdns/;
     license = "LGPLv2+";
+
+    # Supports both the GNU and FreeBSD NSS.
+    platforms = stdenv.lib.platforms.gnu ++ stdenv.lib.platforms.freebsd;
+
+    maintainers = [ stdenv.lib.maintainers.ludo ];
   };
 }
diff --git a/pkgs/tools/networking/ntp/default.nix b/pkgs/tools/networking/ntp/default.nix
index 1a4076aab6bf0..8b7ca552545d1 100644
--- a/pkgs/tools/networking/ntp/default.nix
+++ b/pkgs/tools/networking/ntp/default.nix
@@ -3,11 +3,11 @@
 assert stdenv.isLinux -> libcap != null;
  
 stdenv.mkDerivation rec {
-  name = "ntp-4.2.6";
+  name = "ntp-4.2.6p2";
   
   src = fetchurl {
     url = "http://www.eecis.udel.edu/~ntp/ntp_spool/ntp4/ntp-4.2/${name}.tar.gz";
-    sha256 = "04cam5l804ws6cs0ihlmx26n39vpap5wb39i1vxfff01mri4q38b";
+    sha256 = "1n79scfvgjk8hn1fr4q2kkk6xm83k68r4p488ai09nm20dwqp2a2";
   };
   
   configureFlags = ''
diff --git a/pkgs/tools/networking/x11-ssh-askpass/default.nix b/pkgs/tools/networking/x11-ssh-askpass/default.nix
index b3244feaf7503..5088d92a8c7f2 100644
--- a/pkgs/tools/networking/x11-ssh-askpass/default.nix
+++ b/pkgs/tools/networking/x11-ssh-askpass/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation {
   name = "x11-ssh-askpass-1.2.4.1";
- 
+
   src = fetchurl {
     url = http://www.jmknoble.net/software/x11-ssh-askpass/x11-ssh-askpass-1.2.4.1.tar.gz;
     sha1 = "78c992951685d4dbffb77536f37b83ae2a6eafc7";
@@ -15,4 +15,12 @@ stdenv.mkDerivation {
   buildPhase = "xmkmf; make includes; make";
 
   buildInputs = [x11 imake];
+
+  meta = {
+    homepage = "http://www.jmknoble.net/software/x11-ssh-askpass/";
+    description = "Lightweight passphrase dialog for OpenSSH or other open variants of SSH";
+
+    platforms = stdenv.lib.platforms.unix;
+    maintainers = [];
+  };
 }
diff --git a/pkgs/tools/text/kdiff3/default.nix b/pkgs/tools/text/kdiff3/default.nix
new file mode 100644
index 0000000000000..1a313ca215bee
--- /dev/null
+++ b/pkgs/tools/text/kdiff3/default.nix
@@ -0,0 +1,22 @@
+{ stdenv, fetchurl, cmake, qt4, perl, kdelibs, kdebase, automoc4, phonon, gettext}:
+
+stdenv.mkDerivation {
+  name = "kdiff3-0.9.95";
+  src = fetchurl {
+    url = http://downloads.sourceforge.net/project/kdiff3/kdiff3/0.9.95/kdiff3-0.9.95.tar.gz;
+    sha256 = "0372cebc8957f256a98501a4ac3c3634c7ecffb486ece7e7819c90d876202f0f";   
+  };
+
+  cmakeFlags = [ "-DGETTEXT_INCLUDE_DIR=${gettext}/include" ];
+
+  # kdebase allows having a konqueror plugin built
+  buildInputs = [ cmake qt4 perl kdelibs automoc4 phonon gettext kdebase ];
+
+  meta = {
+    homepage = http://kdiff3.sourceforge.net/;
+    license = "GPLv2+";
+    description = "Compares and merges 2 or 3 files or directories";
+    maintainers = with stdenv.lib.maintainers; [viric];
+    platforms = with stdenv.lib.platforms; linux;
+  };
+}