* Removed selectVersion. There's no good reason to write

  `selectVersion ./foo "bar"' instead of `import ./foo/bar.nix'.
* Replaced `with args' with formal function arguments in several
  packages.
* Renamed several files to `default.nix'.  As a general rule, version
  numbers should only be included in the filename when there is a
  reason to keep multiple versions of a package in Nixpkgs.
  Otherwise, it just makes it harder to update the package.

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

2 files changed, 5 insertions, 9 deletions

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 cd640e5f26bc6..0000000000000
--- 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 23682db364fb5..da61adb229969 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";
   };
 }