* 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/timidity/default.nix

@@ -1,6 +1,8 @@
-args: with args;
-let inherit (args.composableDerivation) composableDerivation edf; in
-composableDerivation {} {
+{ composableDerivation, stdenv, fetchurl, alsaLib, jackaudio, ncurses }:
+
+let inherit (composableDerivation) edf; in
+
+composableDerivation.composableDerivation {} {
 
   name = "timidity-2.13.0";
 
@@ -9,8 +11,6 @@ composableDerivation {} {
     sha256 = "1jbmk0m375fh5nj2awqzns7pdjbi7dxpjdwcix04zipfcilppbmf";
   };
 
-  buildInputs = [];
-
   mergeAttrBy.audioModes = a : b : "${a},${b}";
 
   preConfigure = ''
@@ -57,7 +57,6 @@ composableDerivation {} {
 
   meta = {
     description = "A software MIDI renderer";
-    maintainers = [args.lib.maintainers.marcweber];
+    maintainers = [ stdenv.lib.maintainers.marcweber ];
   };
-
 }