* 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

5 files changed, 74 insertions, 68 deletions

diff --git a/pkgs/servers/fingerd/bsd-fingerd/default.nix b/pkgs/servers/fingerd/bsd-fingerd/default.nix
index eacf2371d360..5e5d91fa8205 100644
--- a/pkgs/servers/fingerd/bsd-fingerd/default.nix
+++ b/pkgs/servers/fingerd/bsd-fingerd/default.nix
@@ -1,17 +1,20 @@
-args: with args;
+{ stdenv, fetchurl }:
+
+# !!! Duplication: this package is almost exactly the same as `bsd-fingerd'.
+
 stdenv.mkDerivation rec {
-	name = "bsd-fingerd-0.17";
+  name = "bsd-fingerd-0.17";
 
-	src = fetchurl {
-		url = "ftp://ftp.metalab.unc.edu/pub/linux/system/network/finger/bsd-finger-0.17.tar.gz";
-		sha256 = "1yhkiv0in588il7f84k2xiy78g9lv12ll0y7047gazhiimk5v244";
-	};
+  src = fetchurl {
+    url = "ftp://ftp.metalab.unc.edu/pub/linux/system/network/finger/bsd-finger-0.17.tar.gz";
+    sha256 = "1yhkiv0in588il7f84k2xiy78g9lv12ll0y7047gazhiimk5v244";
+  };
 
-	NIX_CFLAGS_COMPILE="-D_GNU_SOURCE";
+  NIX_CFLAGS_COMPILE = "-D_GNU_SOURCE";
 
-	patches = [./ubuntu-0.17-9.patch];
+  patches = [ ./ubuntu-0.17-9.patch ];
 
-	preBuild = "cd fingerd";
+  preBuild = "cd fingerd";
 
-	preInstall = '' ensureDir $out/man/man8 $out/sbin '';
+  preInstall = '' ensureDir $out/man/man8 $out/sbin '';
 }
diff --git a/pkgs/servers/ftp/vsftpd/default.nix b/pkgs/servers/ftp/vsftpd/default.nix
index 10e6d6587140..85006a1d1755 100644
--- a/pkgs/servers/ftp/vsftpd/default.nix
+++ b/pkgs/servers/ftp/vsftpd/default.nix
@@ -1,7 +1,8 @@
-args: with args;
+{ stdenv, fetchurl, openssl, libcap, pam }:
 
 stdenv.mkDerivation rec {
   name = "vsftpd-2.0.5";
+  
   src = fetchurl {
     url = "ftp://vsftpd.beasts.org/users/cevans/${name}.tar.gz";
     sha256 = "0nzsxknnaqnfk853yjsmi31sl02jf5ydix9wxbldv4i7vzqfnqjl";
@@ -10,16 +11,18 @@ stdenv.mkDerivation rec {
   NIX_LDFLAGS = "-lcrypt -lssl -lcrypto -lpam -lcap";
 
   preInstall = ''
-  ensureDir $out/{,s}bin
-  ensureDir $out/man/man{5,8}
+    ensureDir $out/{,s}bin
+    ensureDir $out/man/man{5,8}
   '';
 
   patches = [ ./fix.patch ] ;
-  preConfigure = ''sed -i "/VSF_BUILD_SSL/s/^#undef/#define/" builddefs.h;
-                   sed -i "s@/etc/vsftpd.user_list@$out/vsftpd.user_list@" vsftpd.conf.5 tunables.c'';
+  
+  preConfigure = ''
+    sed -i "/VSF_BUILD_SSL/s/^#undef/#define/" builddefs.h
+    sed -i "s@/etc/vsftpd.user_list@$out/vsftpd.user_list@" vsftpd.conf.5 tunables.c
+  '';
 
-  configFile = ./vsftpd.user_list;
   postInstall = "cp ${./vsftpd.user_list} $out/vsftpd.user_list";
 
-  buildInputs = [ openssl libcap pam configFile ];
+  buildInputs = [ openssl libcap pam ];
 }
diff --git a/pkgs/servers/http/lighttpd/default.nix b/pkgs/servers/http/lighttpd/default.nix
index 5cea1e14548f..c0184b875382 100644
--- a/pkgs/servers/http/lighttpd/default.nix
+++ b/pkgs/servers/http/lighttpd/default.nix
@@ -1,17 +1,18 @@
-args:
-args.stdenv.mkDerivation {
+{ stdenv, fetchurl, pcre, libxml2, zlib, attr, bzip2 }:
+
+stdenv.mkDerivation {
   name = "lighttpd-1.4.19";
 
-  src = args.fetchurl {
+  src = fetchurl {
     url = http://www.lighttpd.net/download/lighttpd-1.4.19.tar.bz2;
     sha256 = "1mziqb36ik9z4lf1h5ccm1h4ab7d2hx0cz0g5425lwy374r34fd2";
   };
 
-  buildInputs =(with args; [pcre libxml2 zlib attr bzip2]);
+  buildInputs = [ pcre libxml2 zlib attr bzip2 ];
 
   meta = {
-      description = "Lightweight high-performance web server";
-      homepage = http://www.lighttpd.net/;
-      license = "BSD";
+    description = "Lightweight high-performance web server";
+    homepage = http://www.lighttpd.net/;
+    license = "BSD";
   };
 }
diff --git a/pkgs/servers/irc/ircd-hybrid/default.nix b/pkgs/servers/irc/ircd-hybrid/default.nix
index e428f4d649f7..ddbdc4346ae2 100644
--- a/pkgs/servers/irc/ircd-hybrid/default.nix
+++ b/pkgs/servers/irc/ircd-hybrid/default.nix
@@ -1,4 +1,4 @@
-args: with args;
+{ stdenv, fetchurl, openssl, zlib }:
 
 stdenv.mkDerivation {
   name = "ircd-hybrid-7.2.2";
@@ -8,7 +8,7 @@ stdenv.mkDerivation {
     sha256 = "1xn4dfbgx019mhismfnr2idhslvarlajyahj7c6bqzmarcwwrvck";
   };
 
-  buildInputs = [openssl zlib];
+  buildInputs = [ openssl zlib ];
 
   configureFlags =
     "--with-nicklen=100 --with-topiclen=360 --enable-openssl=${openssl}";
diff --git a/pkgs/servers/sql/monetdb/default.nix b/pkgs/servers/sql/monetdb/default.nix
index 398f7beb541e..2293e2ab3161 100644
--- a/pkgs/servers/sql/monetdb/default.nix
+++ b/pkgs/servers/sql/monetdb/default.nix
@@ -1,42 +1,41 @@
-args: with args;
-
-let inherit (args.composableDerivation) composableDerivation edf; in
-composableDerivation {} {
-
-    name = "monetdb-may-2009";
-
-    src = fetchurl {
-      url = http://monetdb.cwi.nl/downloads/sources/May2009-SP1/MonetDB-May2009-SuperBall-SP1.tar.bz2;
-      sha256 = "0r794snnwa4m0x57nv8cgfdxwb689946c1mi2s44wp4iljka2ryj";
-    };
-
-    flags = edf { name = "geom"; enable = { buildInputs = [geos]; }; }
-            // {
-              java = { buildInputs = [ (apacheAnt.override {jdk = jdk5;}) jdk5 /* must be 1.5 */ ]; };
-              /* perl TODO export these (SWIG only if its present) HAVE_PERL=1 HAVE_PERL_DEVEL=1 HAVE_PERL_SWIG=1 */
-            };
-
-    buildInputs = [ (pcre.override { unicodeSupport = true; })
-                     openssl readline libxml2]; # optional python perl php java ?
-
-    cfg = {
-      geomSupport = true;
-      javaSupport = true;
-    };
-
-    configurePhase = ":";
-    buildPhase = ":";
-    # --enable-template (nightly or cvs sources)
-    # --enable-optimise
-    # --enable-geom (geos-config required ?)
-    installPhase = ''
-      mkdir $TMP/build
-      sh monetdb-install.sh --build=$TMP/build --prefix=$out --enable-sql --enable-xquery
-    '';
-
-    meta = { 
-        description = "MonetDB is a open-source database system for high-performance applications in data mining, OLAP, GIS, XML Query, text and multimedia retrieval";
-        homepage = http://monetdb.cwi.nl/;
-        license = "MonetDB Public License"; # very similar to Mozilla public license (MPL) Version see 1.1 http://monetdb.cwi.nl/Legal/MonetDBLicense-1.1.html 
-    };
-  }
+{ composableDerivation, fetchurl, pcre, openssl, readline, libxml2, geos, apacheAnt, jdk5 }:
+
+let inherit (composableDerivation) edf; in
+
+composableDerivation.composableDerivation {} {
+
+  name = "monetdb-may-2009";
+
+  src = fetchurl {
+    url = http://monetdb.cwi.nl/downloads/sources/May2009-SP1/MonetDB-May2009-SuperBall-SP1.tar.bz2;
+    sha256 = "0r794snnwa4m0x57nv8cgfdxwb689946c1mi2s44wp4iljka2ryj";
+  };
+
+  flags = edf { name = "geom"; enable = { buildInputs = [geos]; }; }
+          // {
+            java = { buildInputs = [ (apacheAnt.override {jdk = jdk5;}) jdk5 /* must be 1.5 */ ]; };
+            /* perl TODO export these (SWIG only if its present) HAVE_PERL=1 HAVE_PERL_DEVEL=1 HAVE_PERL_SWIG=1 */
+          };
+
+  buildInputs = [ (pcre.override { unicodeSupport = true; })
+                   openssl readline libxml2 ]; # optional python perl php java ?
+
+  cfg = {
+    geomSupport = true;
+    javaSupport = true;
+  };
+
+  configurePhase = ":";
+  buildPhase = ":";
+  
+  installPhase = ''
+    mkdir $TMP/build
+    sh monetdb-install.sh --build=$TMP/build --prefix=$out --enable-sql --enable-xquery
+  '';
+
+  meta = { 
+    description = "MonetDB is a open-source database system for high-performance applications in data mining, OLAP, GIS, XML Query, text and multimedia retrieval";
+    homepage = http://monetdb.cwi.nl/;
+    license = "MonetDB Public License"; # very similar to Mozilla public license (MPL) Version see 1.1 http://monetdb.cwi.nl/Legal/MonetDBLicense-1.1.html 
+  };
+}