* 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

1 files changed, 8 insertions, 7 deletions

diff --git a/pkgs/tools/misc/mysql2pgsql/default.nix b/pkgs/tools/misc/mysql2pgsql/default.nix
index 77ea33dc1e9..5d93ef44b36 100644
--- a/pkgs/tools/misc/mysql2pgsql/default.nix
+++ b/pkgs/tools/misc/mysql2pgsql/default.nix
@@ -1,16 +1,17 @@
-args:
+{ stdenv, fetchurl, perl, shebangfix }:
+
 # The homepage says this script is mature..
-args.stdenv.mkDerivation {
+stdenv.mkDerivation {
   name = "mysql2pgsql-0.0.1a";
 
-  src = args.fetchurl {
+  src = fetchurl {
     url = http://ftp.plusline.de/ftp.postgresql.org/projects/gborg/mysql2psql/devel/mysql2psql-0.0.1a.tgz;
     sha256 = "0dpbxf3kdvpihz9cisx6wi3zzd0cnifaqvjxavrbwm4k4sz1qamp";
   };
 
   phases = "unpackPhase installPhase";
 
-  buildInputs = with args; [ perl shebangfix ];
+  buildInputs = [ perl shebangfix ];
 
   installPhase = ''
     mkdir -p $out/bin;
@@ -20,8 +21,8 @@ args.stdenv.mkDerivation {
   '';
 
   meta = { 
-      description = "converts mysql dump files to psql loadable files ";
-      homepage = http://pgfoundry.org/projects/mysql2pgsql/;
-      license = "GPL";
+    description = "converts mysql dump files to psql loadable files ";
+    homepage = http://pgfoundry.org/projects/mysql2pgsql/;
+    license = "GPL";
   };
 }