Add package versions to some of the packages or fix existing ones to conform to nixpkgs conventions.

25 files changed, 39 insertions, 34 deletions

diff --git a/pkgs/applications/audio/ardour/ardour3.nix b/pkgs/applications/audio/ardour/ardour3.nix
index 13990ec49e1..bf2ee04cbce 100644
--- a/pkgs/applications/audio/ardour/ardour3.nix
+++ b/pkgs/applications/audio/ardour/ardour3.nix
@@ -11,7 +11,7 @@ let
 in
 
 stdenv.mkDerivation {
-  name = "ardour3";
+  name = "ardour-3.0";
 
   src = fetchgit {
     url = git://git.ardour.org/ardour/ardour.git;
diff --git a/pkgs/applications/audio/csound/default.nix b/pkgs/applications/audio/csound/default.nix
index 9e4ee01810c..5e3d056f498 100644
--- a/pkgs/applications/audio/csound/default.nix
+++ b/pkgs/applications/audio/csound/default.nix
@@ -12,7 +12,7 @@
 }:
 
 stdenv.mkDerivation {
-  name = "csound5.18.02";
+  name = "csound-5.18.02";
 
   enableParallelBuilding = true;
 
diff --git a/pkgs/applications/misc/redshift/default.nix b/pkgs/applications/misc/redshift/default.nix
index 6d6234b8d3e..feced2f4538 100644
--- a/pkgs/applications/misc/redshift/default.nix
+++ b/pkgs/applications/misc/redshift/default.nix
@@ -3,10 +3,11 @@
   randrproto, xcbutil, xf86vidmodeproto }:
 
 stdenv.mkDerivation rec {
-  name = "redshift";
+  pname = "redshift";
   version = "1.6";
+  name = "${pname}-${version}";
   src = fetchurl {
-    url = "http://launchpad.net/${name}/trunk/${version}/+download/${name}-${version}.tar.bz2";
+    url = "http://launchpad.net/${pname}/trunk/${version}/+download/${pname}-${version}.tar.bz2";
     sha256 = "0g46zhqnx3y2fssmyjgaardzhjw1j29l1dbc2kmccw9wxqfla1wi";
   };
 
@@ -25,4 +26,4 @@ stdenv.mkDerivation rec {
     license = "GPLv3+";
     homepage = "http://jonls.dk/redshift";
   }; 
-}
\ No newline at end of file
+}
diff --git a/pkgs/applications/misc/yate/default.nix b/pkgs/applications/misc/yate/default.nix
index b2f4217afb5..e65faeac6c2 100644
--- a/pkgs/applications/misc/yate/default.nix
+++ b/pkgs/applications/misc/yate/default.nix
@@ -3,7 +3,7 @@
 let inherit (composableDerivation) edf wwf; in
 
 composableDerivation.composableDerivation {} ( fixed : {
-  name = "yate2";
+  name = "yate-2.2.0_1";
 
   src = fetchurl {
     url = http://yate.null.ro/tarballs/yate2/yate2.tar.gz;
diff --git a/pkgs/applications/science/logic/iprover/default.nix b/pkgs/applications/science/logic/iprover/default.nix
index 2acc0ac8d89..2fb9678b832 100644
--- a/pkgs/applications/science/logic/iprover/default.nix
+++ b/pkgs/applications/science/logic/iprover/default.nix
@@ -23,7 +23,7 @@ rec {
     sha256 = sourceInfo.hash;
   };
 
-  inherit (sourceInfo) name version;
+  name = "${sourceInfo.baseName}-${sourceInfo.version}";
   inherit buildInputs;
 
   /* doConfigure should be removed if not needed */
diff --git a/pkgs/applications/science/logic/isabelle/default.nix b/pkgs/applications/science/logic/isabelle/default.nix
index bbc868910f5..a7c1420cb54 100644
--- a/pkgs/applications/science/logic/isabelle/default.nix
+++ b/pkgs/applications/science/logic/isabelle/default.nix
@@ -2,21 +2,22 @@
 # nettools needed for hostname
 
 let
-  name = "Isabelle2012";
+  dirname = "Isabelle2013";
   theories = ["HOL" "FOL" "ZF"];
 in
 
 stdenv.mkDerivation {
-  inherit name theories;
+  name = "isabelle-2013";
+  inherit dirname theories;
 
   src = fetchurl {
-    url = http://www.cl.cam.ac.uk/research/hvg/isabelle/dist/Isabelle2012.tar.gz;
-    sha256 = "1w2k5cg0d9hyigax0hwp6d84jnylb13ysk4x5kwl2412xryravxq";
+    url = http://isabelle.in.tum.de/dist/Isabelle2013_linux.tar.gz;
+    sha256 = "0l17s41hwzma0q2glpxrzic8i6mqd9b7awlpwhz0jkli7fj6ny7b";
   };
 
   buildInputs = [ perl polyml nettools ];
 
-  sourceRoot = name;
+  sourceRoot = dirname;
 
   patches = [ ./settings.patch ];
 
@@ -40,8 +41,8 @@ stdenv.mkDerivation {
 
   installPhase = ''
     mkdir -p $out/bin
-    mv $TMP/$name $out
-    cd $out/$name
+    mv $TMP/$dirname $out
+    cd $out/$dirname
     bin/isabelle install -p $out/bin
   '';
 
diff --git a/pkgs/applications/science/logic/leo2/default.nix b/pkgs/applications/science/logic/leo2/default.nix
index 6b17d7e8f50..913171827af 100644
--- a/pkgs/applications/science/logic/leo2/default.nix
+++ b/pkgs/applications/science/logic/leo2/default.nix
@@ -23,7 +23,7 @@ rec {
     sha256 = sourceInfo.hash;
   };
 
-  inherit (sourceInfo) name version;
+  name = "${sourceInfo.baseName}-${sourceInfo.version}";
   inherit buildInputs;
 
   phaseNames = ["makeInstallationDir" "doUnpack" "doMake" "doFinalize"];
diff --git a/pkgs/applications/science/logic/otter/default.nix b/pkgs/applications/science/logic/otter/default.nix
index 55eb269f79e..653c5dad03f 100644
--- a/pkgs/applications/science/logic/otter/default.nix
+++ b/pkgs/applications/science/logic/otter/default.nix
@@ -12,7 +12,7 @@ let
   ];
 in
 stdenv.mkDerivation {
-  inherit (s) name version;
+  name = "${s.name}-${s.version}";
   inherit buildInputs;
   src = fetchurl {
     inherit (s) url sha256;
diff --git a/pkgs/applications/science/logic/prover9/default.nix b/pkgs/applications/science/logic/prover9/default.nix
index 7ac3831f6a5..93b1657aa14 100644
--- a/pkgs/applications/science/logic/prover9/default.nix
+++ b/pkgs/applications/science/logic/prover9/default.nix
@@ -1,7 +1,7 @@
 {stdenv, fetchurl}:
 
 stdenv.mkDerivation {
-  name = "prover9";
+  name = "prover9-2009-11a";
 
   src = fetchurl {
     url = http://www.cs.unm.edu/~mccune/mace4/download/LADR-2009-11A.tar.gz;
diff --git a/pkgs/applications/version-management/git-and-tools/git2cl/default.nix b/pkgs/applications/version-management/git-and-tools/git2cl/default.nix
index f3fc8c9b6e9..1e372c928f8 100644
--- a/pkgs/applications/version-management/git-and-tools/git2cl/default.nix
+++ b/pkgs/applications/version-management/git-and-tools/git2cl/default.nix
@@ -1,7 +1,7 @@
 { fetchgit, stdenv, perl }:
 
 stdenv.mkDerivation {
-  name = "git2cl";
+  name = "git2cl-20080827";
 
   src = fetchgit {
     url = "git://repo.or.cz/git2cl.git";
diff --git a/pkgs/data/fonts/andagii/default.nix b/pkgs/data/fonts/andagii/default.nix
index 742f0bd0b4a..6e59e97171e 100644
--- a/pkgs/data/fonts/andagii/default.nix
+++ b/pkgs/data/fonts/andagii/default.nix
@@ -12,6 +12,7 @@ let
   sourceInfo = rec {
     url="http://www.i18nguy.com/unicode/andagii.zip";
     name="andagii";
+    version="1.0.2";
     hash="0cknb8vin15akz4ahpyayrpqyaygp9dgrx6qw7zs7d6iv9v59ds1";
   };
 in
@@ -21,7 +22,7 @@ rec {
     sha256 = sourceInfo.hash;
   };
 
-  inherit (sourceInfo) name version;
+  name = "${sourceInfo.name}-${sourceInfo.version}";
   inherit buildInputs;
 
   /* doConfigure should be removed if not needed */
diff --git a/pkgs/data/fonts/anonymous-pro/default.nix b/pkgs/data/fonts/anonymous-pro/default.nix
index 42f32f0ba71..df98d8197f5 100644
--- a/pkgs/data/fonts/anonymous-pro/default.nix
+++ b/pkgs/data/fonts/anonymous-pro/default.nix
@@ -22,7 +22,7 @@ rec {
     sha256 = sourceInfo.hash;
   };
 
-  inherit (sourceInfo) name version;
+  name = "${sourceInfo.name}-${sourceInfo.version}";
   inherit buildInputs;
 
   phaseNames = ["doUnpack" "installFonts"];
diff --git a/pkgs/development/compilers/bigloo/default.nix b/pkgs/development/compilers/bigloo/default.nix
index fac4a99283a..cddca47af3b 100644
--- a/pkgs/development/compilers/bigloo/default.nix
+++ b/pkgs/development/compilers/bigloo/default.nix
@@ -1,10 +1,11 @@
 { fetchurl, stdenv }:
 
 stdenv.mkDerivation rec {
-  name = "bigloo3.7a";
+  name = "bigloo-${version}";
+  version = "3.7a";
 
   src = fetchurl {
-    url = "ftp://ftp-sop.inria.fr/indes/fp/Bigloo/${name}.tar.gz";
+    url = "ftp://ftp-sop.inria.fr/indes/fp/Bigloo/bigloo#{version}.tar.gz";
     sha256 = "0y8i87c2bpqzap8rhzgpyfgdzq21py5xq6mgp0w6xv4rjcj9d0v1";
   };
 
diff --git a/pkgs/development/compilers/hugs/default.nix b/pkgs/development/compilers/hugs/default.nix
index db712b18d3f..c3f14826c8a 100644
--- a/pkgs/development/compilers/hugs/default.nix
+++ b/pkgs/development/compilers/hugs/default.nix
@@ -4,7 +4,7 @@ let edf = composableDerivation.edf;
     wwf = composableDerivation.wwf; in
     
 composableDerivation.composableDerivation {} {
-  name = "hugs98";
+  name = "hugs98-200609";
 
   src = fetchurl {
     url = http://cvs.haskell.org/Hugs/downloads/2006-09/hugs98-Sep2006.tar.gz;
diff --git a/pkgs/development/libraries/despotify/default.nix b/pkgs/development/libraries/despotify/default.nix
index 13732d34e09..8e679221a48 100644
--- a/pkgs/development/libraries/despotify/default.nix
+++ b/pkgs/development/libraries/despotify/default.nix
@@ -5,7 +5,7 @@
 
 stdenv.mkDerivation rec {
 
-  name = "despotify";
+  name = "despotify-svn521";
 
   src = fetchsvn {
     url = "https://despotify.svn.sourceforge.net/svnroot/despotify";
diff --git a/pkgs/development/libraries/libf2c/default.nix b/pkgs/development/libraries/libf2c/default.nix
index 9e6832fc2a3..3f800c2086e 100644
--- a/pkgs/development/libraries/libf2c/default.nix
+++ b/pkgs/development/libraries/libf2c/default.nix
@@ -1,7 +1,7 @@
 {stdenv, fetchurl, unzip}:
 
 stdenv.mkDerivation rec {
-  name = "libf2c";
+  name = "libf2c-20100903";
   
   src = fetchurl {
     url = http://www.netlib.org/f2c/libf2c.zip;
diff --git a/pkgs/development/libraries/libixp_for_wmii/default.nix b/pkgs/development/libraries/libixp_for_wmii/default.nix
index a322c087d89..caeb87ee694 100644
--- a/pkgs/development/libraries/libixp_for_wmii/default.nix
+++ b/pkgs/development/libraries/libixp_for_wmii/default.nix
@@ -1,6 +1,6 @@
 args: with args;
 stdenv.mkDerivation {
-  name = "libixp_for_wmii";
+  name = "libixp_for_wmii-0.4";
   phases = "unpackPhase installPhase";
   installPhase = "
      export LDFLAGS\=$(echo \$NIX_LDFLAGS | sed -e 's/-rpath/-L/g')
diff --git a/pkgs/development/libraries/libyaml/default.nix b/pkgs/development/libraries/libyaml/default.nix
index 5d56b6bcdcd..50bc4019df6 100644
--- a/pkgs/development/libraries/libyaml/default.nix
+++ b/pkgs/development/libraries/libyaml/default.nix
@@ -1,7 +1,7 @@
 {stdenv, fetchurl}:
 
 stdenv.mkDerivation {
-  name = "libyaml";
+  name = "libyaml-0.1.3";
 
   src = fetchurl {
     url = http://pyyaml.org/download/libyaml/yaml-0.1.3.tar.gz;
diff --git a/pkgs/development/libraries/science/biology/biolib/default.nix b/pkgs/development/libraries/science/biology/biolib/default.nix
index f9de62e7cfa..b12366c0142 100644
--- a/pkgs/development/libraries/science/biology/biolib/default.nix
+++ b/pkgs/development/libraries/science/biology/biolib/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, cmake, rLang, zlib }:
 
 stdenv.mkDerivation rec {
-  name = "biolib";
+  name = "biolib-${version}";
   
   version = "0.0.1";
   
diff --git a/pkgs/development/tools/analysis/smatch/default.nix b/pkgs/development/tools/analysis/smatch/default.nix
index 1d1bf7a818a..3bf45900034 100644
--- a/pkgs/development/tools/analysis/smatch/default.nix
+++ b/pkgs/development/tools/analysis/smatch/default.nix
@@ -8,7 +8,7 @@ assert buildllvmsparse -> llvm != null;
 assert buildc2xml -> libxml2 != null;
 
 stdenv.mkDerivation {
-  name = "smatch";
+  name = "smatch-20120924";
 
   src = fetchgit {
     url = git://repo.or.cz/smatch.git;
diff --git a/pkgs/servers/http/apache-modules/mod_evasive/default.nix b/pkgs/servers/http/apache-modules/mod_evasive/default.nix
index 22e0fabf832..d796d0a6dc5 100644
--- a/pkgs/servers/http/apache-modules/mod_evasive/default.nix
+++ b/pkgs/servers/http/apache-modules/mod_evasive/default.nix
@@ -1,7 +1,7 @@
 { stdenv, fetchurl, apacheHttpd }:
 
 stdenv.mkDerivation {
-  name = "mod_evasive_1.10.1";
+  name = "mod_evasive-1.10.1";
 
   src = fetchurl {
     url = http://www.zdziarski.com/blog/wp-content/uploads/2010/02/mod_evasive_1.10.1.tar.gz;
diff --git a/pkgs/servers/xmpp/pyMAILt/default.nix b/pkgs/servers/xmpp/pyMAILt/default.nix
index e763d2dce5b..9e3877735d6 100644
--- a/pkgs/servers/xmpp/pyMAILt/default.nix
+++ b/pkgs/servers/xmpp/pyMAILt/default.nix
@@ -33,7 +33,7 @@ rec {
     chmod a+rx  $out/bin/pyMAILt $out/share/${name}/mail.py
   '') ["minInit" "addInputs" "doUnpack" "defEnsureDir"];
       
-  name = "pyMAILt";
+  name = "pyMAILt-20090101";
   meta = {
     description = "Email transport module for XMPP";
   };
diff --git a/pkgs/tools/misc/gsmartcontrol/default.nix b/pkgs/tools/misc/gsmartcontrol/default.nix
index 60003b3b5d5..abbd8f20fd0 100644
--- a/pkgs/tools/misc/gsmartcontrol/default.nix
+++ b/pkgs/tools/misc/gsmartcontrol/default.nix
@@ -2,7 +2,7 @@
 
 stdenv.mkDerivation rec {
   version="0.8.7";
-  name = "gsmartcontrol";
+  name = "gsmartcontrol-${version}";
 
   src = fetchurl {
     url = "http://artificialtime.com/gsmartcontrol/gsmartcontrol-${version}.tar.bz2";
diff --git a/pkgs/tools/misc/hdf5/default.nix b/pkgs/tools/misc/hdf5/default.nix
index 49320746cab..c8ba478af33 100644
--- a/pkgs/tools/misc/hdf5/default.nix
+++ b/pkgs/tools/misc/hdf5/default.nix
@@ -3,7 +3,7 @@
 , fetchurl
 }:
 stdenv.mkDerivation {
-  name = "hdf5";
+  name = "hdf5-1.8.10";
   src = fetchurl {
     url = http://www.hdfgroup.org/ftp/HDF5/current/src/hdf5-1.8.10-patch1.tar.gz;
     sha256 = "08ad32fhnci6rdfn6mn3w9v1wcaxdcd326n3ljwkcq4dzhkh28qz";  			
diff --git a/pkgs/tools/video/vncrec/default.nix b/pkgs/tools/video/vncrec/default.nix
index 29227318ae0..5732d4c9baf 100644
--- a/pkgs/tools/video/vncrec/default.nix
+++ b/pkgs/tools/video/vncrec/default.nix
@@ -30,9 +30,10 @@ rec {
     xmkmf
   '') ["doUnpack" "minInit" "addInputs"];
       
-  name = "vncrec";
+  name = "vncrec-0.2"; # version taken from Arch AUR
   meta = {
     description = "VNC recorder";
+    homepage = http://ronja.twibright.com/utils/vncrec/;
     maintainers = [
     ];
   };