* 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/development/libraries/librdf/default.nix

@@ -1,4 +1,5 @@
-args: with args;
+{ stdenv, fetchurl, pkgconfig, librdf_raptor, ladspaH, openssl, zlib }:
+
 stdenv.mkDerivation {
   name = "liblrdf-0.4.0";
 
@@ -7,13 +8,13 @@ stdenv.mkDerivation {
     sha256 = "015jv7pp0a0qxgljgdvf7d01nj4fx0zgzg0wayjp7v86pa38xscm";
   };
 
-  buildInputs = [pkgconfig librdf_raptor ladspaH openssl zlib];
+  buildInputs = [ pkgconfig librdf_raptor ladspaH openssl zlib ];
 
   meta = { 
     description = "A lightweight RDF library with special support for LADSPA plugins.";
     homepage = http://sourceforge.net/projects/lrdf/;
     license = "GPLv2";
-    maintainers = [args.lib.maintainers.marcweber];
-    platforms = args.lib.platforms.linux;
+    maintainers = [ stdenv.lib.maintainers.marcweber ];
+    platforms = stdenv.lib.platforms.linux;
   };
 }

pkgs/development/libraries/librdf/raptor.nix

@@ -1,4 +1,5 @@
-args: with args;
+{ stdenv, fetchurl, libxml2, curl }:
+
 stdenv.mkDerivation rec {
   name = "raptor-1.4.21";
 
@@ -7,15 +8,13 @@ stdenv.mkDerivation rec {
     sha256 = "db3172d6f3c432623ed87d7d609161973d2f7098e3d2233d0702fbcc22cfd8ca";
   };
 
-  buildInputs = [
-    #optional
-    libxml2 curl];
+  buildInputs = [ libxml2 curl ];
 
   meta = { 
     description = "The RDF Parser Toolkit";
     homepage = "http://librdf.org/raptor";
     license = "LGPL-2.1 Apache-2.0";
-    maintainers = [args.lib.maintainers.marcweber];
-    platforms = args.lib.platforms.linux;
+    maintainers = [ stdenv.lib.maintainers.marcweber ];
+    platforms = stdenv.lib.platforms.linux;
   };
 }

pkgs/development/libraries/librdf/rasqal.nix

@@ -1,4 +1,5 @@
-args: with args;
+{ stdenv, fetchurl, librdf_raptor, gmp, pkgconfig, pcre, libxml2 }:
+
 stdenv.mkDerivation rec {
   name = "rasqal-0.9.19";
 
@@ -7,23 +8,17 @@ stdenv.mkDerivation rec {
     sha256 = "a042846e8b7af52d9d66fba788c9d579e58c535cfaf80d33dc0bd69bf6ffeb08";
   };
 
-  buildInputs = [
-    librdf_raptor
-    gmp /*or mpfr*/
-    pkgconfig
-    #optional
-    pcre libxml2 
-    ];
+  buildInputs = [ librdf_raptor gmp /*or mpfr*/ pkgconfig pcre libxml2 ];
 
   preConfigure = ''
     export NIX_LDFLAGS="$NIX_LDFLAGS -lraptor"
   '';
 
   meta = { 
-    description = "library that handles Resource Description Framework (RDF)";
+    description = "Library that handles Resource Description Framework (RDF)";
     homepage = "http://librdf.org/rasqal";
     license = "LGPL-2.1 Apache-2.0";
-    maintainers = [args.lib.maintainers.marcweber];
-    platforms = args.lib.platforms.linux;
+    maintainers = [ stdenv.lib.maintainers.marcweber ];
+    platforms = stdenv.lib.platforms.linux;
   };
 }