* More cleanup.

svn path=/nixpkgs/trunk/; revision=22795

pkgs/applications/audio/ardour/default.nix

@@ -1,7 +1,10 @@
-args: with args;
+{ stdenv, fetchurl, scons, boost, pkgconfig, fftw, librdf_raptor
+, librdf_rasqal, jackaudio, flac, libsamplerate, alsaLib, libxml2
+, libxslt, libsndfile, libsigcxx, libusb, cairomm, glib, pango
+, gtk, glibmm, gtkmm, libgnomecanvas, librdf, liblo, aubio
+, fftwSinglePrec, libmad }:
 
 stdenv.mkDerivation {
-
   name = "ardour-2.8.2";
 
   # svn is the source to get official releases from their site?
@@ -13,11 +16,10 @@ stdenv.mkDerivation {
   };
 
   buildInputs = [
-    scons boost
+    scons boost pkgconfig fftw librdf_raptor librdf_rasqal jackaudio
-    pkgconfig fftw librdf_raptor librdf_rasqal jackaudio flac
+    flac libsamplerate alsaLib libxml2 libxslt libsndfile libsigcxx
-    libsamplerate alsaLib libxml2 libxslt libsndfile libsigcxx libusb cairomm
+    libusb cairomm glib pango gtk glibmm gtkmm libgnomecanvas librdf
-    glib pango gtk glibmm gtkmm libgnomecanvas fftw librdf liblo aubio
+    liblo aubio fftwSinglePrec libmad
-    fftw fftwSinglePrec libmad
   ];
 
   buildPhase = ''
@@ -35,7 +37,7 @@ stdenv.mkDerivation {
     '';
     homepage = http://ardour.org/;
     license = "GPLv2";
-    maintainers = [args.lib.maintainers.marcweber];
+    maintainers = [ stdenv.lib.maintainers.marcweber ];
-    platforms = args.lib.platforms.linux;
+    platforms = stdenv.lib.platforms.linux;
   };
 }

pkgs/applications/graphics/inkscape/default.nix

@@ -1,4 +1,7 @@
-args: with args;
+{ stdenv, fetchurl, pkgconfig, perl, perlXMLParser, gtk, libXft
+, libpng, zlib, popt, boehmgc, libxml2, libxslt, glib, gtkmm
+, glibmm, libsigcxx, lcms, boost, gettext, makeWrapper, intltool
+, gsl, python, pyxml, lxml }:
 
 stdenv.mkDerivation rec {
   name = "inkscape-0.47";
@@ -45,6 +48,5 @@ stdenv.mkDerivation rec {
 
       If you want to import .eps files install ps2edit.
     '';
-
   };
 }

pkgs/applications/misc/d4x/default.nix

@@ -1,4 +1,5 @@
-args: with args;
+{ stdenv, fetchurl, gtk, glib, pkgconfig, openssl, boost }:
+
 stdenv.mkDerivation {
   name = "d4x-2.5.7.1";
   
@@ -12,10 +13,11 @@ stdenv.mkDerivation {
   configurePhase = "./configure --prefix=\$out "
     + " --with-boost-libdir=\$boost/lib"
     + " --with-boost-includedir=\$boost/include";
+    
   buildInputs = [ gtk glib pkgconfig openssl boost ];
 
   meta = { 
-      description = "graphical download manager";
+    description = "Graphical download manager";
     homepage = http://www.krasu.ru/soft/chuchelo/;
     license = "Artistic";
   };

pkgs/applications/misc/grip/default.nix

@@ -1,4 +1,5 @@
-args: with args;
+{ stdenv, fetchurl, gtk, glib, pkgconfig, libgnome, libgnomeui, vte
+, curl, cdparanoia, libid3tag }:
 
 stdenv.mkDerivation {
   name = "grip-3.2.0";
@@ -11,10 +12,10 @@ stdenv.mkDerivation {
   buildInputs = [ gtk glib pkgconfig libgnome libgnomeui vte curl cdparanoia libid3tag ];
 
   meta = { 
-    description = "GTK+ based Audio CD Player/Ripper";
+    description = "GTK+-based audio CD player/ripper";
     homepage = http://nostatic.org/grip;
     license = "GPLv2";
-    maintainers = [args.lib.maintainers.marcweber];
+    maintainers = [ stdenv.lib.maintainers.marcweber ];
     #platforms = args.lib.platforms.linux;
   };
 }

pkgs/applications/misc/jigdo/default.nix

@@ -1,4 +1,4 @@
-args: with args;
+{ stdenv, fetchurl, db45, gtk, bzip2 }:
 
 stdenv.mkDerivation {
   name = "jigdo-0.7.3";
@@ -9,18 +9,18 @@ stdenv.mkDerivation {
     sha256 = "1qvqzgzb0dzq82fa1ffs6hyij655rajnfwkljk1y0mnkygnha1xv";
   };
 
+  patches = fetchurl {
+    url = http://ftp.de.debian.org/debian/pool/main/j/jigdo/jigdo_0.7.3-2.diff.gz;
+    sha256 = "0jnlzm9m2hjlnw0zs2fv456ml5r2jj2q1lncqbrgg52lq18f6fa3";
+  };
+  
   buildInputs = [ db45 gtk bzip2 ];
 
   configureFlags = "--without-libdb";
 
   meta = { 
-    description = "tool designed to ease the distribution of very large files over the internet";
+    description = "Download utility that can fetch files from several sources simultaneously";
     homepage = http://atterer.net/jigdo/;
     license = "GPLv2";
   };
-
-  patches = fetchurl {
-    url = http://ftp.de.debian.org/debian/pool/main/j/jigdo/jigdo_0.7.3-2.diff.gz;
-    sha256 = "0jnlzm9m2hjlnw0zs2fv456ml5r2jj2q1lncqbrgg52lq18f6fa3";
-  };
 }

pkgs/applications/misc/mrxvt/default.nix

@@ -1,10 +1,11 @@
-args: with args;
+{ stdenv, fetchurl, libX11, libXft, libXi, inputproto, libSM, libICE
-stdenv.mkDerivation {
+, freetype, pkgconfig, which }:
 
+stdenv.mkDerivation {
   name = "mrxvt-0.5.4";
 
-  buildInputs = [libX11 libXft libXi inputproto libSM libICE
+  buildInputs =
-    freetype pkgconfig which];
+    [ libX11 libXft libXi inputproto libSM libICE freetype pkgconfig which ];
 
   configureFlags = [
     "--with-x"
@@ -27,10 +28,10 @@ stdenv.mkDerivation {
   };
 
   meta = { 
-    description = "lightweight multitabbed feature-rich X11 terminal emulator";
+    description = "Lightweight multitabbed feature-rich X11 terminal emulator";
     longDescription = "
     	Multitabbed lightweight terminal emulator based on rxvt. 
-	Supports transparency, backgroundimages, freetype fonts,..
+	Supports transparency, backgroundimages, freetype fonts, ...
     ";
     homepage = http://sourceforge.net/projects/materm;
     license = "GPL";

pkgs/applications/misc/multisync/default.nix

@@ -1,15 +1,19 @@
-args: with args;
+{ stdenv, fetchurl, gtk, glib, ORBit2, libbonobo, libtool, pkgconfig
-
+, libgnomeui, GConf, automake, autoconf }:
 
 stdenv.mkDerivation {
   name = "multisync-0.82-1";
+  
   src = fetchurl {
     url = mirror://sourceforge/multisync/multisync-0.82-1.tar.bz2;
     sha256 = "1azb6zsn3n1rnla2qc3c440gc4vgmbj593k6xj5g1v0xha2vm2y3";
   };
-  buildInputs = [ gtk glib ORBit2 libbonobo libtool pkgconfig libgnomeui GConf
+  
+  buildInputs =
+    [ gtk glib ORBit2 libbonobo libtool pkgconfig libgnomeui GConf
       automake autoconf
     ];
+    
   preConfigure = "./autogen.sh"; # install.sh is not contained in the tar
 
   meta = {

pkgs/applications/misc/qcad/default.nix

@@ -1,5 +1,7 @@
 # translations still misssing
-args: with args;
+
+{ stdenv, fetchurl, qt3, libpng, libXext, libX11 }:
+
 stdenv.mkDerivation {
   name = "qcad-2.0.5.0-1-community";
 
@@ -35,7 +37,7 @@ stdenv.mkDerivation {
   '';
 
   meta = { 
-      description="A 2D CAD package based upon Qt.";
+    description = "A 2D CAD package based upon Qt";
     homepage = http://www.ribbonsoft.de/qcad.html;
     license = "GPLv2"; # community edition
   };

pkgs/applications/misc/rxvt/default.nix

@@ -1,4 +1,5 @@
-args: with args;
+{ stdenv, fetchurl, libX11, libXt }:
+
 stdenv.mkDerivation {
   name = "rxvt-2.6.4";
 
@@ -10,7 +11,7 @@ stdenv.mkDerivation {
   buildInputs = [ libX11 libXt ];
 
   meta = { 
-      description = "colour vt102 terminal emulator with less features and lower memory consumption";
+    description = "Colour vt102 terminal emulator with less features and lower memory consumption";
     homepage = http://www.rxvt.org/;
     license = "GPL";
   };

pkgs/applications/misc/synergy/default.nix

@@ -1,4 +1,6 @@
-args: with args;
+{ stdenv, fetchurl, x11, xextproto, libXtst, inputproto, libXi
+, automake, autoconf, sourceFromHead }:
+
 stdenv.mkDerivation {
   name = "synergy-cvs";
 
@@ -10,17 +12,19 @@ stdenv.mkDerivation {
                (fetchurl { url = "http://mawercer.de/~nix/repos/synergy-F_23-55-02.tar.gz"; sha256 = "ae16a9b59039a32e383e71397405d7b610de6c6902c03177c2496bac440d3e28"; });
   # END
 
-  buildInputs = [x11 xextproto libXtst inputproto libXi automake autoconf autoconf];
+  buildInputs = [ x11 xextproto libXtst inputproto libXi automake autoconf ];
 
-  preConfigure = "autoreconf; ";
+  preConfigure = "autoreconf";
 
-  patches = [ (fetchurl {
+  patches =
+    [ (fetchurl {
         url = http://mawercer.de/~nix/synergy-gcc43-r2.patch.gz;
         sha256 = "0wnj5k93ybj7jg8ml1i1brwsnszfh41117q2qh7r8xr9m37997b7";
-  }) ];
+      })
+    ];
 
   meta = { 
-      description = "share mouse keyboard and clipboard between computers";
+    description = "Tool to share the mouse keyboard and the clipboard between computers";
     homepage = http://synergy2.sourceforge.net;
     license = "GPL";
   };

pkgs/applications/misc/xterm/default.nix

@@ -1,16 +1,24 @@
-args: with args;
+{ stdenv, fetchurl, xorg, ncurses, freetype, pkgconfig }:
 
 stdenv.mkDerivation rec {
   name = "xterm-231";
+  
   src = fetchurl {
     url = "ftp://invisible-island.net/xterm/${name}.tgz";
     sha256 = "0qlz5nkdqkahdg9kbd1ni96n69srj1pd9yggwrw3z0kghaajb2sr";
   };
-  buildInputs = [libXaw xproto libXt libXext libX11 libSM libICE ncurses
+  
-    freetype pkgconfig libXft luit];
+  buildInputs =
-  configureFlags = "--enable-wide-chars --enable-256-color
+    [ xorg.libXaw xorg.xproto xorg.libXt xorg.libXext xorg.libX11 xorg.libSM xorg.libICE
+      ncurses freetype pkgconfig xorg.libXft xorg.luit
+    ];
+    
+  configureFlags =
+    ''
+      --enable-wide-chars --enable-256-color
       --enable-load-vt-fonts --enable-i18n --enable-doublechars --enable-luit
-    --enable-mini-luit --with-tty-group=tty";
+      --enable-mini-luit --with-tty-group=tty
+    '';
 
   # Hack to get xterm built with the feature of releasing a possible setgid of 'utmp',
   # decided by the sysadmin to allow the xterm reporting to /var/run/utmp

pkgs/applications/office/abiword/default.nix

@@ -1,15 +1,17 @@
-{stdenv, fetchurl, pkgconfig, gtk, libglade, libgnomecanvas, fribidi, libpng, popt, libgsf,
+{ stdenv, fetchurl, pkgconfig, gtk, libglade, libgnomecanvas, fribidi
-enchant, wv, librsvg, bzip2
+, libpng, popt, libgsf, enchant, wv, librsvg, bzip2
 }:
 
 stdenv.mkDerivation {
   name = "abiword-2.8.6";
+  
   src = fetchurl {
     url = http://www.abisource.org/downloads/abiword/2.8.6/source/abiword-2.8.6.tar.gz;
     sha256 = "059sd2apxdmcacc4pll880i7vm18h0kyjsq299m1mz3c7ak8k46r";
   };
 
-  buildInputs = [pkgconfig gtk libglade librsvg bzip2
+  buildInputs =
-                 libgnomecanvas fribidi libpng popt libgsf enchant wv
+    [ pkgconfig gtk libglade librsvg bzip2 libgnomecanvas fribidi libpng popt
+      libgsf enchant wv
     ];
 }

pkgs/applications/window-managers/jwm/default.nix

@@ -1,7 +1,8 @@
-args: with args;
+{ stdenv, fetchurl, libX11, libXext, libXinerama, libXpm, libXft }:
 
 stdenv.mkDerivation {
   name = "jwm-2.0.1";
+  
   src = fetchurl {
      url = http://www.joewing.net/programs/jwm/releases/jwm-2.0.1.tar.bz2;
      sha256 = "1ix5y00cmg3cyazl0adzgv49140zxaf2dpngyg1dyy4ma6ysdmnw";
@@ -9,9 +10,11 @@ stdenv.mkDerivation {
 
   buildInputs = [ libX11 libXext libXinerama libXpm libXft ];
 
-  postInstall = ''
+  postInstall =
+    ''
       sed -i -e s/rxvt/xterm/g $out/etc/system.jwmrc
-    sed -i -e "s/.*Swallow.*\|.*xload.*//" $out/etc/system.jwmrc'';
+      sed -i -e "s/.*Swallow.*\|.*xload.*//" $out/etc/system.jwmrc
+    '';
 
   meta = {
     description = "A window manager for X11 that requires only Xlib";

pkgs/build-support/deb-package/default.nix

@@ -1,54 +0,0 @@
-args : with args;	
-	let 
-       	localDefs = with (builderDefs.passthru.function {src="";});
-	let 
-	  checkFlag = flag : lib.attrByPath [flag] false args;
-	in
-	  builderDefs.passthru.function ({
-		inherit src;
-		inherit checkFlag;
-		buildInputs = [];
-		configureFlags = [];
-		makeFlags = if (checkFlag "omitConfigure") 
-		then [" PREFIX=$out "]
-		else [];
-		patch = null;
-		meta = {};
-		doInstall = if args ? Install then 
-		(fullDepEntry 
-		  args.Install 
-		  (["doMake"] 
-		  ++ (lib.attrByPath ["extraInstallDeps"] [] args))
-		)
-		else fullDepEntry "" ["doMakeInstall"];
-
-		debPatch = fullDepEntry ((if args ? patch then ''
-		  gunzip < ${args.patch} | patch -Np1
-		'' else "")
-		+''
-		  sed -e 's/-o root//' -i Makefile Makefile.in Makefile.new || true;
-		  sed -e 's/-g root//' -i Makefile Makefile.in Makefile.new || true;
-		''
-		+(if (checkFlag "omitFilePatches") then "" else 
-		''
-		  if test -d debian/patches; then 
-		    for i in debian/patches/*; do 
-		      patch -Np0 -i $i; 
-		    done;
-		  fi;
-		'')
-		+ (if args ? extraReplacements then 
-		  args.extraReplacements 
-		else ""))["minInit" "doUnpack"];
-	}  // args);
-	in with localDefs;
-stdenv.mkDerivation rec {
-	name = localDefs.name + "deb";
-	builder = writeScript (name + "-builder")
-		(textClosure localDefs ([debPatch] ++ 
-		(lib.optional (patches != []) "doPatch") ++
-		(lib.optional (! (checkFlag "omitConfigure")) "doConfigure") ++
-    [doInstall doForceShare]));
-	inherit meta;
-	inherit src;
-}

pkgs/data/fonts/unifont/default.nix

@@ -1,28 +1,37 @@
-args: with args; with debPackage;
+{ stdenv, fetchurl, mkfontscale, mkfontdir, bdftopcf, fontutil }:
-debBuild ({
+
-  src = fetchurl {
+let
-    url = mirror://debian/pool/main/u/unifont/unifont_5.1.20080914.orig.tar.gz;
+
-    sha256 = "1p8f3dkg0zy9f5hwn1q728hps258ll84xg9a7xqbhj2csvnsyajd";
+  ttf = fetchurl {
+    url = http://unifoundry.com/unifont-5.1.20080907.ttf.gz;
+    sha256 = "03ssxsfhnayarzx15mn6khry2kgdxhkkc1bqzgr0c85ab5xm9jxw";
   };
-  patch = fetchurl {
+
-    url = mirror://debian/pool/main/u/unifont/unifont_5.1.20080914-1.diff.gz;
+  pcf = fetchurl {
-    sha256 = "0faicwbjlgy78zrc94ffg52f71msll8kxc43bks40z8qb02nr7qx";
+    url = http://unifoundry.com/unifont-5.1.20080820.pcf.gz;
+    sha256 = "0qwsgaplb2a79w14rrvazby3kwx7vyk08x70n0ih5dr91x3rqaqj";
   };
-  name = "unifont-5.1-20080914";
+
-  buildInputs = [mkfontscale mkfontdir bdftopcf fontutil perl];
+in
-  meta = {
+
-    description = "Unicode font for Base Multilingual Plane.";
+stdenv.mkDerivation {
-  };
+  name = "unifont-5.1-20080907";
-  #extraReplacements = ''sed -e s@/usr/bin/perl@${perl}/bin/perl@ -i hex2bdf.unsplit'';
+
-  omitConfigure = true;
+  buildInputs = [ mkfontscale mkfontdir bdftopcf fontutil ];
-  Install = ''
+
+  unpackPhase = "true";
+  
+  installPhase =
+    ''
       ensureDir $out/share/fonts $out/share/fonts/truetype
-    cd font/precompiled
+      cp ${pcf} $out/share/fonts/unifont.pcf.gz
-    cp unifont.pcf.gz $out/share/fonts
+      gunzip < ${ttf} > $out/share/fonts/truetype/unifont.ttf
-    cp unifont.ttf $out/share/fonts/truetype 
       cd $out/share/fonts
       mkfontdir 
       mkfontscale
     '';
-  extraInstallDeps = ["defEnsureDir"];
+    
-} // args)
+  meta = {
+    description = "Unicode font for Base Multilingual Plane.";
+  };
+}

pkgs/development/compilers/neko/default.nix

@@ -1,8 +1,9 @@
-args: with args;
+{ composableDerivation, lib, fetchurl, mysql, apacheHttpd, zlib, sqlite
+, pcre, apr, gtk, boehmgc, pkgconfig, makeWrapper, sourceFromHead }:
 
 let
 
-  inherit (args.composableDerivation) composableDerivation edf wwf;
+  inherit (composableDerivation) edf wwf;
 
   libs = [ mysql apacheHttpd zlib sqlite pcre apr gtk ];
 
@@ -10,7 +11,7 @@ let
   
 in
 
-composableDerivation {} ( fixed : {
+composableDerivation.composableDerivation {} ( fixed : {
 
   name = "neko-cvs";
 
@@ -19,11 +20,6 @@ composableDerivation {} ( fixed : {
                (fetchurl { url = "http://mawercer.de/~nix/repos/neko-F_16-06-48.tar.gz"; sha256 = "e952582a26099b7a5568d0798839a6d349331510ffe6d7936b4537d60b6ccf26"; });
   # END
 
-  # # REGION AUTO UPDATE:           { name="neko_git"; type="git"; url=""; }
-  # src = sourceFromHead "neko_git-3abfb2f6d68cc301f9795e10c75734e293b4cfa9.tar.gz"
-  #              (throw "source not not published yet: neko_git");
-  # # END
-
   # optionally remove apache mysql like gentoo does?
   # they just remove libs/{apache,mod_neko}
   buildInputs = [boehmgc pkgconfig makeWrapper] ++ libs;
@@ -47,8 +43,8 @@ composableDerivation {} ( fixed : {
     description = "Neko is an high-level dynamicly typed programming language";
     homepage = http://nekovm.org;
     license = ["GPLv2" ];  # -> docs/license.txt
-    maintainers = [args.lib.maintainers.marcweber];
+    maintainers = [ lib.maintainers.marcweber ];
-    platforms = args.lib.platforms.linux;
+    platforms = lib.platforms.linux;
   };
 
   # if stripping was done neko and nekoc would be the same. ?!

pkgs/development/interpreters/clisp/default.nix

@@ -1,17 +1,23 @@
-args: with args;
+{ stdenv, fetchurl, libsigsegv, gettext, ncurses, readline, libX11
+, libXau, libXt, pcre, zlib, libXpm, xproto, libXext, xextproto
+, libffi, libffcall, coreutils }:
+
 stdenv.mkDerivation rec {
   v = "2.48";
   name = "clisp-${v}";
-  src =
+  
-	fetchurl {
+  src = fetchurl {
     url = "mirror://gnu/clisp/release/${v}/${name}.tar.bz2";
     sha256 = "1hix1j7zhbn37ld46d6pi6agwxski893l1zwriwkd8jr11b3zf05";
   };
 
   inherit libsigsegv gettext coreutils;
-  buildInputs = [libsigsegv gettext ncurses readline libX11 libXau
+  
+  buildInputs =
+    [ libsigsegv gettext ncurses readline libX11 libXau
       libXt pcre zlib libXpm xproto libXext xextproto libffi
-	libffcall];
+      libffcall
+    ];
  
   # First, replace port 9090 (rather low, can be used)
   # with 64237 (much higher, IANA private area, not
@@ -22,10 +28,13 @@ stdenv.mkDerivation rec {
     find . -type f | xargs sed -e 's/-lICE/-lXau &/' -i
   '';
 
-  configureFlags = "--with-readline builddir --with-dynamic-ffi
+  configureFlags =
+    ''
+      --with-readline builddir --with-dynamic-ffi
       --with-module=clx/new-clx --with-module=i18n --with-module=bindings/glibc
       --with-module=pcre --with-module=rawsock --with-module=readline
-  --with-module=syscalls --with-module=wildcard --with-module=zlib";
+      --with-module=syscalls --with-module=wildcard --with-module=zlib
+    '';
 
   preBuild = ''
     sed -e '/avcall.h/a\#include "config.h"' -i src/foreign.d

pkgs/development/libraries/SDL_image/default.nix

@@ -1,4 +1,4 @@
-args: with args;
+{ stdenv, fetchurl, SDL, libpng, libjpeg, libtiff, libungif, libXpm }:
 
 stdenv.mkDerivation rec {
   pname = "SDL_image";

pkgs/development/libraries/glew/default.nix

@@ -1,4 +1,4 @@
-args: with args;
+{ stdenv, fetchurl, mesa, x11, libXmu, libXi }:
 
 stdenv.mkDerivation {
   name = "glew-1.5.2";
@@ -10,11 +10,11 @@ stdenv.mkDerivation {
 
   buildInputs = [ mesa x11 libXmu libXi ];
 
+  installPhase = "GLEW_DEST=\$out make install";
+  
   meta = { 
-    description = "cross-platform open-source C/C++ extension loading library";
+    description = "Cross-platform open-source C/C++ extension loading library";
     homepage = http://glew.sourceforge.net/;
     license = ["BSD" "GLX" "SGI-B" "GPL2"]; # License description copied from gentoo-1.4.0 
   };
-
-  installPhase="GLEW_DEST=\$out make install";
 }

pkgs/development/libraries/glfw/default.nix

@@ -1,7 +1,7 @@
-args: with args;
+{ stdenv, fetchurl, mesa, libX11, libXext }:
 
 stdenv.mkDerivation {
-  name = "glefw-2.6";
+  name = "glfw-2.6";
 
   src = fetchurl {
     url = mirror://sourceforge/glfw/glfw-2.6.tar.bz2;
@@ -18,10 +18,10 @@ stdenv.mkDerivation {
   installPhase = ":";
 
   meta = { 
-    description = "multi-platform library for creating OpenGL contexts and managing input, including keyboard, mouse, joystick and time";
+    description = "Multi-platform library for creating OpenGL contexts and managing input, including keyboard, mouse, joystick and time";
     homepage = http://glfw.sourceforge.net/;
     license = "zlib/libpng"; # http://www.opensource.org/licenses/zlib-license.php
-    maintainers = [args.lib.maintainers.marcweber];
+    maintainers = [ stdenv.lib.maintainers.marcweber ];
-    platforms = args.lib.platforms.linux;
+    platforms = stdenv.lib.platforms.linux;
   };
 }

pkgs/development/libraries/goocanvas/default.nix

@@ -1,16 +1,17 @@
-args:
+{ stdenv, fetchurl, gtk, cairo, glib, pkgconfig }:
-args.stdenv.mkDerivation {
+
+stdenv.mkDerivation {
   name = "goocanvas-0.10";
 
-  src = args.fetchurl {
+  src = fetchurl {
     url = mirror://sourceforge/goocanvas/goocanvas-0.10.tar.gz;
     sha256 = "0b49szbr3n7vpavly9w17ipa8q3ydicdcd177vxbdvbsnvg7aqp9";
   };
 
-  buildInputs =(with args; [gtk cairo glib pkgconfig]);
+  buildInputs = [ gtk cairo glib pkgconfig ];
 
   meta = { 
-      description = "canvas widget for GTK+ using the cairo 2D library";
+    description = "Canvas widget for GTK+ based on the the Cairo 2D library";
     homepage = http://goocanvas.sourceforge.net/;
     license = ["GPL" "LGPL"];
   };

pkgs/development/libraries/gupnp/default.nix

@@ -1,4 +1,4 @@
-args: with args;
+{ stdenv, fetchurl, pkgconfig, glib, libxml2, gssdp, libsoup, e2fsprogs }:
  
 stdenv.mkDerivation {
   name = "gupnp-0.12";
@@ -8,10 +8,5 @@ stdenv.mkDerivation {
     sha256 = "1sm1rqvx752nb3j1yl7h30kx2ymndkji8m73fxshjssmc6z40ayg";
   };
 
-  buildInputs = [
+  buildInputs = [ pkgconfig glib libxml2 gssdp libsoup e2fsprogs ];
-    pkgconfig glib libxml2 gssdp libsoup e2fsprogs
- #dbus.libs dbus_glib gtk glib
-  ];
-
-  #configureFlags="";
 }

pkgs/development/libraries/lesstif-0.93/default.nix

@@ -1,23 +1,25 @@
-args: with args ;
+{ stdenv, fetchurl, x11, libXp, libXau }:
-
 
 stdenv.mkDerivation {
   name = "lesstif-0.93.94";
+  
   src = fetchurl {
     url = http://prdownloads.sourceforge.net/lesstif/lesstif-0.93.94.tar.bz2;
     sha256 = "0v4l46ill6dhhswsw1hk6rqyng98d85nsr214vhd2k0mfajpig1y";
   };
+  
   buildInputs = [x11];
+  
   propagatedBuildInputs = [libXp libXau];
 
   # This is an older release of lesstif which works with arb.
-  #
+  patches =
-  patches = [
+    [ ./c-bad_integer_cast.patch    
-    ./c-bad_integer_cast.patch    
       ./c-xim_chained_list_crash.patch
       ./c-render_table_crash.patch 
       ./stdint.patch
     ];
+    
   meta = {
     priority = "5";
   };

pkgs/development/libraries/libwpd/default.nix

@@ -1,9 +1,12 @@
-args: with args;
+{ stdenv, fetchurl, pkgconfig, glib, libgsf, libxml2, bzip2 }:
+
 stdenv.mkDerivation {
   name = "libwpd-0.8.14";
+  
   src = fetchurl {
     url = mirror://sourceforge/libwpd/libwpd-0.8.14.tar.gz;
     sha256 = "1syli6i5ma10cwzpa61a18pyjmianjwsf6pvmvzsh5md6yk4yx01";
   };
+  
   buildInputs = [ pkgconfig glib libgsf libxml2 bzip2 ];
 }

pkgs/development/libraries/libxklavier/default.nix

@@ -1,4 +1,5 @@
-args: with args;
+{ stdenv, fetchurl, pkgconfig, libX11, libXi, xkeyboard_config, libxml2
+, libICE, glib, libxkbfile, isocodes }:
 
 stdenv.mkDerivation rec {
   name = "libxklavier-4.0";

pkgs/games/micropolis/default.nix

@@ -1,4 +1,5 @@
-args: with args;
+{ stdenv, fetchurl, libX11, libXpm, libXext, xextproto, byacc }:
+
 stdenv.mkDerivation {
   name = "micropolis";
 
@@ -7,8 +8,8 @@ stdenv.mkDerivation {
     sha256 = "1b3c72dc3680a34b5fc5a740a6fb5cfc0b8775514da8ab7bb3b2965b20d4f8bc";
   };
 
-  patches = [
+  patches =
-    (fetchurl {
+    [ (fetchurl {
         url = http://rmdir.de/~michael/micropolis_git.patch;
         sha256 = "13419a4394242cd11d5cabd8b1b50787282ea16b55fdcfbeadf8505af46b0592";
       })
@@ -16,15 +17,16 @@ stdenv.mkDerivation {
 
   buildInputs = [ libX11 libXpm libXext xextproto byacc ];
 
-  preConfigure = [
+  preConfigure =
-    ''cd src
+    ''
+      cd src
       sed -i "s@^CFLAGS.*\$@&\nCFLAGS += -I${libXpm}/include/X11@" tk/makefile
       sed -i "s@^INCLUDES.*\$@&\n\t-I$PWD/tcl \\\\@" sim/makefile
-    ''
+    '';
-  ];
 
-  postInstall = [ 
+  postInstall =
-    ''mkdir -p $out/bin
+    ''
+      mkdir -p $out/bin
       mkdir -p $out/usr/share/games/micropolis
       cd ..
       for d in activity cities images manual res; do
@@ -37,8 +39,7 @@ cd $out/usr/share/games/micropolis
       ./Micropolis
       EOF
       chmod 755 $out/bin/micropolis
-    ''
+    '';
-  ];
 
   meta = { 
     description = "GPL'ed version of S*m C*ty";

pkgs/games/wesnoth/default.nix

@@ -1,4 +1,5 @@
-args: with args;
+{ stdenv, fetchurl, SDL, SDL_image, SDL_mixer, SDL_net, SDL_ttf, pango
+, gettext, zlib, boost, freetype, libpng, pkgconfig }:
 
 stdenv.mkDerivation rec {
   pname = "wesnoth";

pkgs/misc/xosd/default.nix

@@ -1,5 +1,6 @@
-args: with args;
+{ stdenv, fetchurl, libX11, libXext, libXt, xextproto, xproto }:
-stdenv.mkDerivation (rec {
+
+stdenv.mkDerivation rec {
   pname = "xosd";
   version = "2.2.12";
 
@@ -15,4 +16,4 @@ stdenv.mkDerivation (rec {
   meta = {
     description = "XOSD displays text on your screen";
   };
-})
+}

pkgs/tools/X11/xlaunch/default.nix

@@ -1,4 +1,4 @@
-args: with args;
+{ stdenv, xorgserver }:
 
 # !!! What does this package do, and does it belong in Nixpkgs?
 

pkgs/tools/X11/xmacro/default.nix

@@ -1,4 +1,4 @@
-args: with args;
+{ stdenv, fetchurl, libX11, libXtst, xextproto, libXi, inputproto }:
 
 stdenv.mkDerivation {
   name = "xmacro-0.3pre20000911";

pkgs/tools/graphics/gifscile/default.nix

@@ -1,17 +0,0 @@
-args:
-args.stdenv.mkDerivation {
-  name = "gifsicle-1.52";
-
-  src = args.fetchurl {
-    url = http://www.lcdf.org/gifsicle/gifsicle-1.52.tar.gz;
-    sha256 = "1fp47grvk46bkj22zixrhgpgs3qbkmijicf3wkjk4y8fsx0idbgk";
-  };
-
-  buildInputs =(with args; [xproto libXt libX11]);
-
-  meta = { 
-      description = "command-line tool for creating, editing, and getting information about GIF images and animations";
-      homepage = http://www.lcdf.org/gifsicle/;
-      license = "GPL2";
-  };
-}

pkgs/tools/graphics/gifsicle/default.nix

@@ -0,0 +1,18 @@
+{ stdenv, fetchurl, xproto, libXt, libX11 }:
+
+stdenv.mkDerivation {
+  name = "gifsicle-1.52";
+
+  src = fetchurl {
+    url = http://www.lcdf.org/gifsicle/gifsicle-1.52.tar.gz;
+    sha256 = "1fp47grvk46bkj22zixrhgpgs3qbkmijicf3wkjk4y8fsx0idbgk";
+  };
+
+  buildInputs = [ xproto libXt libX11 ];
+
+  meta = { 
+    description = "Command-line tool for creating, editing, and getting information about GIF images and animations";
+    homepage = http://www.lcdf.org/gifsicle/;
+    license = "GPL2";
+  };
+}

pkgs/tools/graphics/gnuplot/default.nix

@@ -15,15 +15,16 @@
 
 stdenv.mkDerivation {
   name = "gnuplot-4.4.0";
+  
   src = fetchurl {
     url = "mirror://sourceforge/gnuplot/gnuplot-4.4.0.tar.gz";
     sha256 = "0akb2lzxa3b0j4nr6anr0mhsk10b1fcnixk8vk9aa82rl1a2rph0";
   };
 
-  configureFlags = if (libX11 != null) then ["--with-x"] else ["--without-x"];
+  configureFlags = if libX11 != null then ["--with-x"] else ["--without-x"];
 
-  buildInputs = [
+  buildInputs =
-    zlib gd texinfo readline emacs lua texLive libX11 libXt libXpm libXaw
+    [ zlib gd texinfo readline emacs lua texLive libX11 libXt libXpm libXaw
       wxGTK pango cairo pkgconfig
     ];
 }

pkgs/tools/misc/gparted/default.nix

@@ -1,4 +1,6 @@
-args: with args;
+{ stdenv, fetchurl, parted, gtk, glib, intltool, gettext, libuuid
+, pkgconfig, gtkmm, gnomedocutils, libxml2 }:
+
 stdenv.mkDerivation {
   name = "gparted-0.5.1";
 
@@ -9,11 +11,13 @@ stdenv.mkDerivation {
 
   configureFlags = "--disable-doc";
 
-  buildInputs = [parted gtk glib intltool gettext libuuid pkgconfig
+  buildInputs =
-    gtkmm gnomedocutils libxml2];
+    [ parted gtk glib intltool gettext libuuid pkgconfig gtkmm
+      gnomedocutils libxml2
+    ];
 
   meta = { 
-      description = "gui partition tool";
+    description = "Graphical disk partitioning tool";
     homepage = http://gparted.sourceforge.net;
     license = "GPLv2";
   };

pkgs/tools/misc/xclip/default.nix

@@ -1,4 +1,5 @@
-args: with args;
+{ stdenv, fetchurl, x11, libXmu }:
+
 stdenv.mkDerivation {
   name = "xclip-0.11";
 
@@ -10,7 +11,7 @@ stdenv.mkDerivation {
   buildInputs = [ x11 libXmu ];
 
   meta = { 
-      description = "access X clipboard from this console application";
+    description = "Tool to access the X clipboard from a console application";
     homepage = http://people.debian.org/~kims/xclip/;
     license = "GPL-2";
   };

pkgs/tools/networking/gftp/default.nix

@@ -1,4 +1,5 @@
-args: with args;
+{ stdenv, fetchurl, gtk, readline, ncurses, gettext, openssl, pkgconfig }:
+
 stdenv.mkDerivation {
   name = "gftp-2.0.19";
 
@@ -10,7 +11,7 @@ stdenv.mkDerivation {
   buildInputs = [ gtk readline ncurses gettext openssl pkgconfig ];
 
   meta = { 
-      description = "GTK based FTP client";
+    description = "GTK+-based FTP client";
     homepage = http://www.gftp.org;
     license = "GPLv2+";
   };

pkgs/top-level/all-packages.nix

@@ -223,13 +223,6 @@ let
     inherit stdenv perl;
   };
 
-  debPackage = {
-    debBuild = lib.sumTwoArgs(import ../build-support/deb-package) {
-      inherit builderDefs;
-    };
-    inherit fetchurl stdenv;
-  };
-
   dotnetenv = import ../build-support/dotnetenv {
     inherit stdenv;
     dotnetfx = dotnetfx35;
@@ -815,12 +808,12 @@ let
   };
 
   gftp = import ../tools/networking/gftp {
-    inherit lib fetchurl stdenv;
+    inherit fetchurl stdenv;
     inherit readline ncurses gettext openssl pkgconfig;
-    inherit (gtkLibs) glib gtk;
+    inherit (gtkLibs) gtk;
   };
 
-  gifsicle = import ../tools/graphics/gifscile {
+  gifsicle = import ../tools/graphics/gifsicle {
     inherit fetchurl stdenv;
     inherit (xlibs) xproto libXt libX11;
   };
@@ -871,6 +864,8 @@ let
     inherit (xlibs) libX11 libXt libXaw libXpm;
     inherit (gtkLibs) pango;
     inherit cairo pkgconfig;
+    texLive = null;
+    lua = null;
   };
 
   gnused = useFromStdenv "gnused"
@@ -2602,7 +2597,7 @@ let
   };
 
   neko = import ../development/compilers/neko {
-    inherit sourceFromHead fetchurl stdenv lib pkgconfig composableDerivation
+    inherit sourceFromHead fetchurl lib pkgconfig composableDerivation
       boehmgc apacheHttpd mysql zlib sqlite pcre apr makeWrapper;
     inherit (gtkLibs) gtk;
   };
@@ -4000,13 +3995,13 @@ let
   };
 
   glew = import ../development/libraries/glew {
-    inherit fetchurl stdenv mesa x11 libtool;
+    inherit fetchurl stdenv mesa x11;
     inherit (xlibs) libXmu libXi;
   };
 
-  glefw = import ../development/libraries/glefw {
+  glfw = import ../development/libraries/glfw {
-    inherit fetchurl stdenv lib mesa;
+    inherit fetchurl stdenv mesa;
-    inherit (xlibs) libX11 libXext xextproto;
+    inherit (xlibs) libX11 libXext;
   };
 
   glibc = useFromStdenv "glibc" glibc211;
@@ -7330,7 +7325,7 @@ let
   };
 
   unifont = import ../data/fonts/unifont {
-    inherit debPackage perl;
+    inherit fetchurl stdenv;
     inherit (xorg) mkfontdir mkfontscale bdftopcf fontutil;
   };
 
@@ -7403,7 +7398,7 @@ let
   };
 
   ardour = import ../applications/audio/ardour {
-    inherit fetchurl stdenv lib pkgconfig scons boost redland librdf_raptor
+    inherit fetchurl stdenv pkgconfig scons boost librdf_raptor
       librdf_rasqal jackaudio flac libsamplerate alsaLib libxml2 libxslt
       libsndfile libsigcxx libusb cairomm librdf liblo fftw fftwSinglePrec
       aubio libmad;
@@ -7947,7 +7942,7 @@ let
   };
 
   grip = import ../applications/misc/grip {
-    inherit fetchurl stdenv lib grip pkgconfig curl cdparanoia libid3tag;
+    inherit fetchurl stdenv pkgconfig curl cdparanoia libid3tag;
     inherit (gtkLibs) gtk glib;
     inherit (gnome) libgnome libgnomeui vte;
   };
@@ -8281,6 +8276,8 @@ let
     inherit stdenv fetchurl bzip2 freetype graphviz ghostscript
       libjpeg libpng libtiff libxml2 zlib libtool jasper;
     inherit (xlibs) libX11;
+    tetex = null;
+    librsvg = null;
   };
 
   imagemagickBig = import ../applications/graphics/ImageMagick {
@@ -8303,7 +8300,7 @@ let
   inkscape = import ../applications/graphics/inkscape {
     inherit fetchurl stdenv perl perlXMLParser pkgconfig zlib popt
       libxml2 libxslt libpng boehmgc libsigcxx lcms boost gettext
-      cairomm python pyxml makeWrapper intltool gsl;
+      python pyxml makeWrapper intltool gsl;
     inherit (pythonPackages) lxml;
     inherit (gtkLibs) gtk glib glibmm gtkmm;
     inherit (xlibs) libXft;
@@ -8331,7 +8328,7 @@ let
   };
 
   jigdo = import ../applications/misc/jigdo {
-    inherit fetchurl stdenv db45 libwpd bzip2;
+    inherit fetchurl stdenv db45 bzip2;
     inherit (gtkLibs) gtk;
   };
 
@@ -8518,9 +8515,8 @@ let
     };
 
   mrxvt = import ../applications/misc/mrxvt {
-    inherit lib fetchurl stdenv freetype pkgconfig which;
+    inherit fetchurl stdenv freetype pkgconfig which;
-    inherit (xlibs) libXaw xproto libXt libX11 libSM libICE libXft
+    inherit (xlibs) libX11 libSM libICE libXft libXi inputproto;
-      libXi inputproto;
   };
 
   multisync = import ../applications/misc/multisync {
@@ -8753,7 +8749,7 @@ let
   };
 
   rxvt = import ../applications/misc/rxvt {
-    inherit lib fetchurl stdenv;
+    inherit fetchurl stdenv;
     inherit (xlibs) libXt libX11;
   };
 
@@ -9200,8 +9196,7 @@ let
   };
 
   xterm = import ../applications/misc/xterm {
-    inherit fetchurl stdenv ncurses freetype pkgconfig;
+    inherit fetchurl stdenv ncurses freetype pkgconfig xorg;
-    inherit (xlibs) libXaw xproto libXt libX11 libSM libICE libXext libXft luit;
   };
 
   xtrace = import ../tools/X11/xtrace {
@@ -9389,9 +9384,9 @@ let
   };
 
   micropolis = import ../games/micropolis {
-    inherit lib fetchurl stdenv;
+    inherit fetchurl stdenv;
     inherit (xlibs) libX11 libXpm libXext xextproto;
-    inherit byacc bash;
+    inherit byacc;
   };
 
   openttd = import ../games/openttd {