5 files changed, 24 insertions, 31 deletions
diff --git a/pkgs/development/compilers/ikarus/0.0.3.nix b/pkgs/development/compilers/ikarus/0.0.3.nix
deleted file mode 100644
index 1976df7b742..00000000000
--- a/pkgs/development/compilers/ikarus/0.0.3.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-
-args : with args; 
-rec {
-  src = fetchurl {
-    url = http://www.cs.indiana.edu/~aghuloum/ikarus/ikarus-0.0.3.tar.gz;
-    sha256 = "0d4vqwqfnj39l0gar2di021kcf6bfpkc6g40yapkmxm6sxpdcvjv";
-  };
-
-  buildInputs = [gmp];
-  configureFlags = [];
-
-  /* doConfigure should be specified separately */
-  phaseNames = ["doConfigure" "doMakeInstall"];
-      
-  name = "ikarus-" + version;
-  meta = {
-    description = "Ikarus - a Scheme compiler, aiming at R6RS";
-    homepage = http://www.cs.indiana.edu/~aghuloum/ikarus/;
-    license = "GPL3";
-  };
-}
diff --git a/pkgs/development/compilers/ikarus/default.nix b/pkgs/development/compilers/ikarus/default.nix
new file mode 100644
index 00000000000..7e14d13b7df
--- /dev/null
+++ b/pkgs/development/compilers/ikarus/default.nix
@@ -0,0 +1,18 @@
+{ stdenv, fetchurl, gmp }:
+        
+stdenv.mkDerivation rec {
+  name = "ikarus-0.0.3";
+  
+  src = fetchurl {
+    url = "http://www.cs.indiana.edu/~aghuloum/ikarus/${name}.tar.gz";
+    sha256 = "0d4vqwqfnj39l0gar2di021kcf6bfpkc6g40yapkmxm6sxpdcvjv";
+  };
+
+  buildInputs = [ gmp ];
+      
+  meta = {
+    description = "Ikarus - a Scheme compiler, aiming at R6RS";
+    homepage = http://www.cs.indiana.edu/~aghuloum/ikarus/;
+    license = "GPL3";
+  };
+}
diff --git a/pkgs/development/compilers/qi/9.1.nix b/pkgs/development/compilers/qi/9.1.nix
index 8b218d499c5..8f094f9965a 100644
--- a/pkgs/development/compilers/qi/9.1.nix
+++ b/pkgs/development/compilers/qi/9.1.nix
@@ -27,7 +27,7 @@ let
 	") [ addInputs minInit doUnpack defEnsureDir];
 in
 stdenv.mkDerivation rec {
-	name = "Qi-"+version;
+	name = "Qi-9.1";
 	builder = writeScript (name + "-builder")
 		(textClosure localDefs [allBuild doForceShare doPropagate]);
 	meta = {
diff --git a/pkgs/development/compilers/swi-prolog/5.6.51.nix b/pkgs/development/compilers/swi-prolog/5.6.51.nix
deleted file mode 100644
index cd640e5f26b..00000000000
--- a/pkgs/development/compilers/swi-prolog/5.6.51.nix
+++ /dev/null
@@ -1,4 +0,0 @@
-args: import ./default.nix {
-  args = args;
-  sha256 = "d43862606284e659ec3acba9cddea53b772f9afb67d12aa36391d26fe1a05ad8";
-}
diff --git a/pkgs/development/compilers/swi-prolog/default.nix b/pkgs/development/compilers/swi-prolog/default.nix
index 23682db364f..da61adb2299 100644
--- a/pkgs/development/compilers/swi-prolog/default.nix
+++ b/pkgs/development/compilers/swi-prolog/default.nix
@@ -1,16 +1,16 @@
-{args, sha256}: with args;
+{ stdenv, fetchurl }:
 
 stdenv.mkDerivation {
-  name = "swi-prolog-${version}";
+  name = "swi-prolog-5.6.51";
 
   src = fetchurl {
-    url = "http://gollem.science.uva.nl/cgi-bin/nph-download/SWI-Prolog/pl-${version}.tar.gz";
-    inherit sha256;
+    url = "http://gollem.science.uva.nl/cgi-bin/nph-download/SWI-Prolog/pl-5.6.51.tar.gz";
+    sha256 = "d43862606284e659ec3acba9cddea53b772f9afb67d12aa36391d26fe1a05ad8";
   };
 
   meta = {
     homepage = http://www.swi-prolog.org/;
-    description = "A Prolog compiler and interpreter.";
+    description = "A Prolog compiler and interpreter";
     license = "LGPL";
   };
 }