* Get rid of many instances of "args: with args;", and other coding

guidelines violations.
* Updated libsamplerate to 0.1.7.

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

pkgs/tools/misc/keychain/default.nix

@@ -1,24 +1,24 @@
-args:
-args.stdenv.mkDerivation {
+{ stdenv, fetchurl }:
+
+stdenv.mkDerivation {
   name = "keychain-2.6.6";
 
-  src = args.fetchurl {
+  src = fetchurl {
     url = http://gentoo.chem.wisc.edu/gentoo/distfiles/keychain-2.6.6.tar.bz2;
     sha256 = "10v0hzkgrb5cazm1gk0g4ncwp8sqvfk7xfyx59cjd69kzhbbn6ic";
   };
 
   phases = "unpackPhase buildPhase";
 
-  buildPhase ="
-    mkdir -p \$out/bin
-    cp keychain \$out/bin
-  ";
-
-  buildInputs =(with args; []);
+  buildPhase =
+    ''
+      mkdir -p $out/bin
+      cp keychain $out/bin
+    '';
 
   meta = { 
-      description = "tool starting ssh and gpg management tool";
-      homepage = "http://www.gentoo.org/proj/en/keychain/";
-      license = "GPL2";
+    description = "Keychain management tool";
+    homepage = "http://www.gentoo.org/proj/en/keychain/";
+    license = "GPL2";
   };
 }