6 files changed, 32 insertions, 20 deletions
diff --git a/pkgs/applications/misc/hello/ex-2/default.nix b/pkgs/applications/misc/hello/ex-2/default.nix
index b70103ceef5c3..876e0dfb7c506 100644
--- a/pkgs/applications/misc/hello/ex-2/default.nix
+++ b/pkgs/applications/misc/hello/ex-2/default.nix
@@ -1,10 +1,20 @@
-{stdenv, fetchurl, perl}:
+{stdenv, fetchurl}:
 
 stdenv.mkDerivation {
-  name = "hello-2.1.1";
+  name = "hello-2.3";
+  
   src = fetchurl {
-    url = mirror://gnu/hello/hello-2.1.1.tar.gz;
-    md5 = "70c9ccf9fac07f762c24f2df2290784d";
+    url = mirror://gnu/hello/hello-2.3.tar.bz2;
+    sha256 = "0c7vijq8y68bpr7g6dh1gny0bff8qq81vnp4ch8pjzvg56wb3js1";
+  };
+  
+  meta = {
+    description = "A program that produces a familiar, friendly greeting";
+    longDescription = ''
+      GNU Hello is a program that prints "Hello, world!" when you run it.
+      It is fully customizable.
+    '';
+    homepage = http://www.gnu.org/software/hello/manual/;
+    license = "GPLv3+";
   };
-  buildInputs = [perl];
 }
diff --git a/pkgs/applications/networking/newsreaders/pan/default.nix b/pkgs/applications/networking/newsreaders/pan/default.nix
index a427e3550f8b0..c91d64a2f4fe2 100644
--- a/pkgs/applications/networking/newsreaders/pan/default.nix
+++ b/pkgs/applications/networking/newsreaders/pan/default.nix
@@ -3,8 +3,7 @@
 , perl, pcre, gmime, gettext
 }:
 
-assert spellChecking -> gtkspell != null /* !!! && gtk == gtkspell.gtk */;
-# !!! assert gtk.glib == gnet.glib;
+assert spellChecking -> gtkspell != null;
 
 stdenv.mkDerivation {
   name = "pan-0.132";
@@ -22,14 +21,11 @@ stdenv.mkDerivation {
     })
   ];
 
-  buildInputs = [
-    pkgconfig gtk perl pcre gmime gettext
-    (if spellChecking then gtkspell else null)
-  ];
-
-  inherit spellChecking stdenv;
+  buildInputs = [pkgconfig gtk perl pcre gmime gettext]
+    ++ stdenv.lib.optional spellChecking gtkspell;
 
   meta = {
     description = "A GTK+-based Usenet newsreader good at both text and binaries";
+    homepage = http://pan.rebelbase.com/;
   };
 }
diff --git a/pkgs/tools/misc/jdiskreport/default.nix b/pkgs/tools/misc/jdiskreport/default.nix
index 6229ca60d4c1a..da0bbf0fb8779 100644
--- a/pkgs/tools/misc/jdiskreport/default.nix
+++ b/pkgs/tools/misc/jdiskreport/default.nix
@@ -3,12 +3,16 @@
 #assert jdk.swingSupport;
 
 stdenv.mkDerivation {
-  name = "jdiskreport-1.2.3";
+  name = "jdiskreport-1.3.0";
+  
   builder = ./builder.sh;
+  
   src = fetchurl {
-    url = http://www.jgoodies.com/download/jdiskreport/jdiskreport-1_2_3.zip;
-    md5 = "4a33c5c1344ed9e0fa531e2cb1875cb8";
+    url = http://www.jgoodies.com/download/jdiskreport/jdiskreport-1_3_0.zip;
+    sha256 = "1vgiq797gqc6i89w4kscg57snn74wi8x566bhi9xn8r0fbphihxb";
   };
+  
   buildInputs = [unzip];
+  
   inherit jdk;
 }
diff --git a/pkgs/tools/networking/p2p/bittorrent/builder.sh b/pkgs/tools/networking/p2p/bittorrent/builder.sh
index 8097995dfbda5..c074c1919ac51 100644
--- a/pkgs/tools/networking/p2p/bittorrent/builder.sh
+++ b/pkgs/tools/networking/p2p/bittorrent/builder.sh
@@ -1,19 +1,19 @@
 source $stdenv/setup
 
+
 # Workaround for:
 #  File "...-python-2.4.4/lib/python2.4/posixpath.py", line 62, in join
 #    elif path == '' or path.endswith('/'):
 # AttributeError: 'NoneType' object has no attribute 'endswith'
 export HOME=$TMP
 
-buildPhase=buildPhase
+
 buildPhase() {
     #substituteInPlace BitTorrent/GUI_wx/__init__.py --replace "'2.6'" "'2.8'"
     python setup.py build
 }
 
 
-installPhase=installPhase
 installPhase() {
     python setup.py install --prefix=$out
 
@@ -24,4 +24,5 @@ installPhase() {
     done
 }
 
+
 genericBuild
diff --git a/pkgs/tools/networking/p2p/bittorrent/default.nix b/pkgs/tools/networking/p2p/bittorrent/default.nix
index cfddd48a342e5..980f51d374673 100644
--- a/pkgs/tools/networking/p2p/bittorrent/default.nix
+++ b/pkgs/tools/networking/p2p/bittorrent/default.nix
@@ -7,6 +7,7 @@ assert gui -> wxPython != null;
 
 stdenv.mkDerivation {
   name = "bittorrent-5.2.0";
+  
   builder = ./builder.sh;
   
   src = fetchurl {
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 26e9414680357..cdf2fa1c38363 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -5862,8 +5862,8 @@ let pkgs = rec {
     inherit fetchurl stdenv;
   };
 
-  hello = import ../applications/misc/hello/ex-1 {
-    inherit fetchurl stdenv perl;
+  hello = import ../applications/misc/hello/ex-2 {
+    inherit fetchurl stdenv;
   };
 
   i810switch = import ../applications/misc/i810 {