* Improved a bunch of "name" attributes (mostly missing version

  numbers).

svn path=/nixpkgs/trunk/; revision=17991

6 files changed, 19 insertions, 17 deletions

diff --git a/pkgs/applications/audio/snd/default.nix b/pkgs/applications/audio/snd/default.nix
index e79038f688ccf..e7957e866f1a0 100644
--- a/pkgs/applications/audio/snd/default.nix
+++ b/pkgs/applications/audio/snd/default.nix
@@ -49,7 +49,7 @@ rec {
 		export NIX_LDFLAGS="$NIX_LDFLAGS -L${args.libX11}/lib -lX11"
             '') ["minInit" "doUnpack" "makeDocsWork"];
 
-  name = "Snd-" + version;
+  name = "snd-" + version;
   meta = {
     description = "Snd sound editor.";
     homepage = http://ccrma.stanford.edu/software/snd;
diff --git a/pkgs/applications/audio/sonic-visualizer/default.nix b/pkgs/applications/audio/sonic-visualizer/default.nix
index c06c73d8a0cfc..08b300b1c1158 100644
--- a/pkgs/applications/audio/sonic-visualizer/default.nix
+++ b/pkgs/applications/audio/sonic-visualizer/default.nix
@@ -1,11 +1,12 @@
 # TODO add plugins having various licenses, see http://www.vamp-plugins.org/download.html
 
 args: with args;
+
 stdenv.mkDerivation {
 
 #TODO add plugins!
 
-  name = "sonic-visualizer";
+  name = "sonic-visualizer-1.6";
 
   src = fetchurl {
     url = http://downloads.sourceforge.net/sv1/sonic-visualiser-1.6.tar.bz2;
@@ -19,7 +20,6 @@ stdenv.mkDerivation {
     # portaudio
     pulseaudio
     libmad
-
     libogg # ?
     # fishsound
     liblo
@@ -36,7 +36,7 @@ stdenv.mkDerivation {
   '';
 
   meta = { 
-    description = "view and analyse contents of music audio files";
+    description = "View and analyse contents of music audio files";
     homepage = http://www.sonicvisualiser.org/;
     license = "GPLv2";
     maintainers = [args.lib.maintainers.marcweber];
diff --git a/pkgs/applications/misc/xneur/0.8.nix b/pkgs/applications/misc/xneur/0.8.nix
index 9010c36a5a8ba..b4279bccbe5c9 100644
--- a/pkgs/applications/misc/xneur/0.8.nix
+++ b/pkgs/applications/misc/xneur/0.8.nix
@@ -1,7 +1,7 @@
 args: with args;
 
 stdenv.mkDerivation {
-  name="xneur";
+  name = "xneur-0.8.0";
   src = fetchurl {
     url = http://dists.xneur.ru/release-0.8.0/tgz/xneur-0.8.0.tar.bz2;
     sha256 = "1f05bm4vqdrlm8rxwgqv89k5lhc236xg841aw4snw514g0hi2sl8";
diff --git a/pkgs/applications/networking/kphone/default.nix b/pkgs/applications/networking/kphone/default.nix
index d26d28797a232..c631fb35c1129 100644
--- a/pkgs/applications/networking/kphone/default.nix
+++ b/pkgs/applications/networking/kphone/default.nix
@@ -1,19 +1,19 @@
 args: with args;
+
 stdenv.mkDerivation {
-  name = "kphone";
+  name = "kphone-1.2";
 
   src = fetchurl {
     url = mirror://sourceforge/kphone/files/KPhone%20SI/KPhoneSIv1.2/kphoneSI_1.2.tar.gz;
     sha256 = "1q309n2gsdsa8d7ff2zwnyc69ngpnnj143dys90dnlmzr9ckhhg3";
   };
 
-  buildInputs = [autoconf automake libtool qt pkgconfig
-    openssl libpng alsaLib
-    libX11 libXext libXt libICE libSM libX11
+  buildInputs =
+    [ autoconf automake libtool qt pkgconfig openssl libpng alsaLib
+      libX11 libXext libXt libICE libSM libX11
     ];
-  preConfigure = ''
-    autoconf
-  '';
+    
+  preConfigure = "autoconf";
 
   meta = {
     description = "KPhone is a SIP UA for Linux";
diff --git a/pkgs/applications/window-managers/fbpanel/4.12.nix b/pkgs/applications/window-managers/fbpanel/4.12.nix
index e39aa72e8cf7e..6aa47a490bd68 100644
--- a/pkgs/applications/window-managers/fbpanel/4.12.nix
+++ b/pkgs/applications/window-managers/fbpanel/4.12.nix
@@ -12,7 +12,7 @@ args : with args;
 	}; /* null is a terminator for sumArgs */
 	in with localDefs;
 stdenv.mkDerivation rec {
-	name = "fbpanel";
+	name = "fbpanel-4.12";
 	builder = writeScript (name + "-builder")
 		(textClosure localDefs [doConfigure doMakeInstall doForceShare doPropagate]);
 	meta = {
diff --git a/pkgs/applications/window-managers/icewm/default.nix b/pkgs/applications/window-managers/icewm/default.nix
index 7acd9f827854e..7a8d12dee5056 100644
--- a/pkgs/applications/window-managers/icewm/default.nix
+++ b/pkgs/applications/window-managers/icewm/default.nix
@@ -1,5 +1,7 @@
-args: with args; stdenv.mkDerivation {
-  name = "icewm";
+args: with args;
+
+stdenv.mkDerivation {
+  name = "icewm-1.2.32";
 
   buildInputs = [ gettext libX11 libXft libXext libXinerama libXrandr libjpeg libtiff libungif libpng imlib ];
 
@@ -9,7 +11,7 @@ args: with args; stdenv.mkDerivation {
   };
 
   meta = {
-    description = "IceWM is a window manager for the X Window System.";
-    homepage = "http://www.icewm.org";
+    description = "A window manager for the X Window System";
+    homepage = http://www.icewm.org/;
   };
 }