* 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, 11 insertions, 6 deletions

diff --git a/pkgs/applications/networking/instant-messengers/carrier/2.5.0.nix b/pkgs/applications/networking/instant-messengers/carrier/2.5.0.nix
index 257d3d09f71b..0428ccdc7f32 100644
--- a/pkgs/applications/networking/instant-messengers/carrier/2.5.0.nix
+++ b/pkgs/applications/networking/instant-messengers/carrier/2.5.0.nix
@@ -39,7 +39,7 @@ rec {
     ++ (lib.optional externalPurple2 "postInstall")
   ;
       
-  name = "carrier-" + version;
+  name = "carrier-2.5.0";
   meta = {
     description = "Carrier - PidginIM GUI fork with user-friendly development model";
     homepage = http://funpidgin.sf.net; 
diff --git a/pkgs/applications/networking/instant-messengers/psi/0.12.1.nix b/pkgs/applications/networking/instant-messengers/psi/default.nix
index 110189598f6c..0db1af883cb8 100644
--- a/pkgs/applications/networking/instant-messengers/psi/0.12.1.nix
+++ b/pkgs/applications/networking/instant-messengers/psi/default.nix
@@ -1,19 +1,24 @@
-args : with args;
+{ stdenv, fetchurl, aspell, qt4, zlib, sox, libX11, xproto, libSM, libICE, qca2 }:
+
 stdenv.mkDerivation rec {
+  name = "psi-0.12.1";
+  
   src = fetchurl {
-    url = mirror://sourceforge/psi/psi-0.12.1.tar.bz2;
+    url = "mirror://sourceforge/psi/${name}.tar.bz2";
     sha256 = "0zi71fcia9amcasa6zrvfyghdpqa821iv2rkj53bq5dyvfm2y0m8";
   };
 
   buildInputs = [aspell qt4 zlib sox libX11 xproto libSM libICE qca2];
 
   NIX_CFLAGS_COMPILE="-I${qca2}/include/QtCrypto";
+  
   NIX_LDFLAGS="-lqca";
 
-  configureFlags = [ " --with-zlib-inc=${zlib}/include "
-    " --disable-bundled-qca" ];
+  configureFlags =
+    [ " --with-zlib-inc=${zlib}/include "
+      " --disable-bundled-qca"
+    ];
 
-  name = "psi-" + version;
   meta = {
     description = "Psi, an XMPP (Jabber) client";
   };