* 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/data/documentation/rnrs/r3rs.nix

@@ -1,6 +1,7 @@
-args: with args;
+{ fetchurl, stdenv, texinfo }:
 
-((import ./common.nix)
- (args //
-  { revision = 3;
-    sha256 = "0knrpkr74s8yn4xcqxkqpgxmzdmzrvahh1n1csqc1wwd2rb4vnpr"; }))
+import ./common.nix {
+  inherit fetchurl stdenv texinfo;
+  revision = 3;
+  sha256 = "0knrpkr74s8yn4xcqxkqpgxmzdmzrvahh1n1csqc1wwd2rb4vnpr";
+}

pkgs/data/documentation/rnrs/r4rs.nix

@@ -1,6 +1,7 @@
-args: with args;
+{ fetchurl, stdenv, texinfo }:
 
-((import ./common.nix)
- (args //
-  { revision = 4;
-    sha256 = "02jgy0lvi5ymkdxwjasg50zl03zmyj8sgnfxxnjnbmif72c0k4p8"; }))
+import ./common.nix {
+  inherit fetchurl stdenv texinfo;
+  revision = 4;
+  sha256 = "02jgy0lvi5ymkdxwjasg50zl03zmyj8sgnfxxnjnbmif72c0k4p8";
+}

pkgs/data/documentation/rnrs/r5rs.nix

@@ -1,6 +1,7 @@
-args: with args;
+{ fetchurl, stdenv, texinfo }:
 
-((import ./common.nix)
- (args //
-  { revision = 5;
-    sha256 = "1s2wcslwcgb9j89vjn7qs63qlnsv1481jaw1sgg33fgbgk6a8wrk"; }))
+import ./common.nix {
+  inherit fetchurl stdenv texinfo;
+  revision = 5;
+  sha256 = "1s2wcslwcgb9j89vjn7qs63qlnsv1481jaw1sgg33fgbgk6a8wrk";
+}