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

5 files changed, 12 insertions, 11 deletions

diff --git a/pkgs/applications/science/logic/iprover/default.nix b/pkgs/applications/science/logic/iprover/default.nix
index 2acc0ac8d89a..2fb9678b8329 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 bbc868910f57..a7c1420cb540 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 6b17d7e8f50a..913171827af1 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 55eb269f79e5..653c5dad03f7 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 7ac3831f6a56..93b1657aa14a 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;