* 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";
+}

pkgs/data/fonts/ucs-fonts/default.nix

@@ -1,38 +1,38 @@
-args: with args;
+{ stdenv, fetchurl, wrapFonts }:
+
 let
 
-srcA=
-	fetchurl {
-		url = http://www.cl.cam.ac.uk/~mgk25/download/ucs-fonts.tar.gz;
-		sha256 = "12hgizg25fzmk10wjl0c88x97h3pg5r9ga122s3y28wixz6x2bvh";
-	};
-srcB=
-	fetchurl {
-		url = http://www.cl.cam.ac.uk/~mgk25/download/ucs-fonts-asian.tar.gz;
-		sha256 = "0ibjy4xpz5j373hsdr8bx99czfpclqmviwwv768j8n7z12z3wa51";
-	};
-srcC=
-	fetchurl {
-		url = http://www.cl.cam.ac.uk/~mgk25/download/ucs-fonts-75dpi100dpi.tar.gz;
-		sha256 = "08vqr8yb636xa1s28vf3pm22dzkia0gisvsi2svqjqh4kk290pzh";
-	};	
+  srcA = fetchurl {
+    url = http://www.cl.cam.ac.uk/~mgk25/download/ucs-fonts.tar.gz;
+    sha256 = "12hgizg25fzmk10wjl0c88x97h3pg5r9ga122s3y28wixz6x2bvh";
+  };
+  
+  srcB = fetchurl {
+    url = http://www.cl.cam.ac.uk/~mgk25/download/ucs-fonts-asian.tar.gz;
+    sha256 = "0ibjy4xpz5j373hsdr8bx99czfpclqmviwwv768j8n7z12z3wa51";
+  };
+  
+  srcC = fetchurl {
+    url = http://www.cl.cam.ac.uk/~mgk25/download/ucs-fonts-75dpi100dpi.tar.gz;
+    sha256 = "08vqr8yb636xa1s28vf3pm22dzkia0gisvsi2svqjqh4kk290pzh";
+  };  
 
 in
+
 wrapFonts (stdenv.mkDerivation {
+  name = "ucs-fonts";
+  
+  phases = ["installPhase"];
+  
+  installPhase = ''
+    tar xf ${srcA}
+    tar xf ${srcB}
+    tar xf ${srcC}
+    mkdir -p $out/share/fonts/ucs-fonts
+    cp *.bdf $out/share/fonts/ucs-fonts
+  '';
 
-	name = "ucs-fonts";
-	phases = ["installPhase"];
-	installPhase = ''
-		tar xf ${srcA}
-		tar xf ${srcB}
-		tar xf ${srcC}
-		mkdir -p $out/share/fonts/ucs-fonts
-		cp *.bdf $out/share/fonts/ucs-fonts
-	'';
-
-	meta = {
-		description = "Unicode bitmap fonts";
-		src = [srcA srcB srcC];
-	};
+  meta = {
+    description = "Unicode bitmap fonts";
+  };
 })
-