* 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/science/biology/biolib/default.nix

@@ -1,8 +1,10 @@
-args: with args;
+{ stdenv, fetchurl, cmake, rLang, zlib }:
 
 stdenv.mkDerivation rec {
   name = "biolib";
+  
   version = "0.0.1";
+  
   src = fetchurl {
     url = "http://bio3.xparrot.eu/download/nix-biology/biolib-${version}.tar.gz";
     sha256 = "1la639rs0v4f3ayvarqv0yxwlnwn188bb1v71d2ybw1xr6gdy688";
@@ -11,11 +13,14 @@ stdenv.mkDerivation rec {
   buildInputs = [cmake rLang zlib];
 
   meta = {
-    description     = "BioLib";
-    longDescription = ''BioLib brings together a set of opensource libraries
-written in C/C++ and makes them available for major Bio* languages: BioPerl,
-BioRuby, BioPython'';
-    license     = "GPL2";
-    homepage    = http://biolib.open-bio.org/; 
+    description = "BioLib";
+    longDescription =
+      ''
+        BioLib brings together a set of opensource libraries written
+        in C/C++ and makes them available for major Bio* languages:
+        BioPerl, BioRuby, BioPython
+      '';
+    license = "GPL2";
+    homepage = http://biolib.open-bio.org/; 
   };
 }

pkgs/development/libraries/science/math/atlas/default.nix

@@ -1,7 +1,8 @@
-args: with args;
+{ stdenv, fetchurl, gfortran }:
 
 stdenv.mkDerivation {
   name = "atlas-3.9.11";
+  
   src = fetchurl {
     url = mirror://sf/math-atlas/atlas3.9.11.tar.bz2;
     sha256 = "d91e593a772cf540ff693f7d8c43d10c3037eb334c5c77572ea1b6a64a0b9677";
@@ -13,11 +14,11 @@ stdenv.mkDerivation {
   # the manual says you should pass -fPIC as configure arg .. It works
   configureFlags = "-Fa alg -fPIC";
 
-  buildInputs = [gfortran];
+  buildInputs = [ gfortran ];
 
   meta = {
-    description     = "Atlas library";
-    license     = "GPL";
-    homepage    = http://math-atlas.sourceforge.net/;
+    description = "Atlas library";
+    license = "GPL";
+    homepage = http://math-atlas.sourceforge.net/;
   };
 }