* Recurse into xorg, gnome, gtkLibs (i.e., they show up in nix-env

operations).

svn path=/nixpkgs/branches/usability/; revision=5085

VERSION

@@ -1 +1 @@
-0.9
+0.10

maintainers/docs/todo.txt

@@ -12,3 +12,5 @@
 * Add gettext to glib propagatedBuildInputs?  Glib's `gi18n.h' doesn't
   seem to like Glibc `libintl.h'; needs the gettext one instead.
   [Move from libbonoboui]
+
+* Fix the bzip2 build generically.

pkgs/applications/audio/bmp-plugins/musepack/builder.sh

@@ -0,0 +1,6 @@
+source $stdenv/setup
+
+ensureDir "$out/lib/bmp/Input"
+installFlags="install libdir=$out/lib/bmp/Input"
+
+genericBuild

pkgs/applications/audio/bmp-plugins/musepack/default.nix

@@ -0,0 +1,11 @@
+{stdenv, fetchurl, pkgconfig, bmp, glib, gtk, libmpcdec, taglib}:
+
+stdenv.mkDerivation {
+  name = "bmp-plugin-musepack-1.2";
+  builder = ./builder.sh;
+  src = fetchurl {
+    url = http://files2.musepack.net/linux/plugins/bmp-musepack-1.2.tar.bz2;
+    md5 = "5fe0c9d341ca37d05c780a478f829a5f";
+  };
+  buildInputs = [pkgconfig bmp glib gtk libmpcdec taglib];
+}

pkgs/applications/audio/bmp/default.nix

@@ -0,0 +1,16 @@
+{ stdenv, fetchurl, pkgconfig, alsaLib, esound, libogg, libvorbis, id3lib
+, glib, gtk, libglade
+}:
+
+stdenv.mkDerivation {
+  name = "bmp-0.9.7.1";
+  src = fetchurl {
+    url = http://surfnet.dl.sourceforge.net/sourceforge/beepmp/bmp-0.9.7.1.tar.gz;
+    md5 = "c25d5a8d49cc5851d13d525a20023c4c";
+  };
+
+  buildInputs = [
+    pkgconfig alsaLib esound libogg libvorbis id3lib
+    glib gtk libglade
+  ];
+}

pkgs/applications/audio/xmms/default.nix

@@ -4,7 +4,7 @@ stdenv.mkDerivation {
   name = "xmms-1.2.10";
   src = fetchurl {
     url = http://nix.cs.uu.nl/dist/tarballs/xmms-1.2.10.tar.bz2;
-    md5 = "03a85cfc5e1877a2e1f7be4fa1d3f63c" ;
+    md5 = "03a85cfc5e1877a2e1f7be4fa1d3f63c";
   };
 
   # Patch borrowed from SuSE 10.0 to fix pause/continue on ALSA.

pkgs/applications/editors/joe/default.nix

@@ -0,0 +1,9 @@
+{stdenv, fetchurl} :
+
+stdenv.mkDerivation {
+name = "joe-3.3";
+src = fetchurl {
+         url = http://surfnet.dl.sourceforge.net/sourceforge/joe-editor/joe-3.3.tar.gz;
+         md5 = "02221716679c039c5da00c275d61dbf4";
+   };
+}

pkgs/applications/editors/joe/test.nix

@@ -0,0 +1 @@
+(import ../../../../pkgs/system/i686-linux.nix).joe

pkgs/applications/networking/browsers/firefox-wrapper/default.nix

@@ -11,4 +11,8 @@ stdenv.mkDerivation {
   # Let each plugin tell us (through its `mozillaPlugin') attribute
   # where to find the plugin in its tree.
   plugins = map (x: x ~ x.mozillaPlugin) plugins;
+
+  meta = {
+    description = firefox.meta.description + " (with various plugins)";
+  };
 }

pkgs/applications/networking/browsers/firefox/default.nix

@@ -3,16 +3,20 @@
 # !!! assert libIDL.glib == gtk.glib;
 
 stdenv.mkDerivation {
-  name = "firefox-1.5";
+  name = "firefox-1.5.0.1";
 
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/firefox-1.5-source.tar.bz2;
-    md5 = "fa915ddcadecda30ed3e13694f26a779";
+    url = http://releases.mozilla.org/pub/mozilla.org/firefox/releases/1.5.0.1/source/firefox-1.5.0.1-source.tar.bz2;
+    md5 = "c76f02956645bc823241379e27f76bb5";
   };
 
   buildInputs = [pkgconfig gtk perl zip libIDL libXi];
   inherit gtk;
 
   patches = [./writable-copies.patch];
+
+  meta = {
+    description = "Mozilla Firefox - the browser, reloaded";
+  };
 }

pkgs/applications/video/RealPlayer/default.nix

@@ -9,8 +9,8 @@ assert stdenv.system == "i686-linux";
 
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://software-dl.real.com/12ae5c4cc79d437fa106/unix/RealPlayer10GOLD.bin;
-    md5 = "70a88bcae0ab3e177e6fadecd6b8be24";
+    url = http://software-dl.real.com/01f1001c4b44265b0020/unix/RealPlayer10GOLD.bin;
+    md5 = "5f04938c28395ace2af822dd1bd57f5a";
   };
 
   makeWrapper = ../../../build-support/make-wrapper/make-wrapper.sh;

pkgs/build-support/gcc-cross-wrapper/default.nix

@@ -27,4 +27,7 @@ stdenv.mkDerivation {
   langCC = if nativeTools then true else gcc.langCC;
   langF77 = if nativeTools then false else gcc.langF77;
   shell = if shell == "" then stdenv.shell else shell;
+  meta = if gcc != null then gcc.meta else
+    { description = "System C compiler wrapper";
+    };
 }

pkgs/build-support/gcc-wrapper/default.nix

@@ -27,4 +27,7 @@ stdenv.mkDerivation {
   langCC = if nativeTools then true else gcc.langCC;
   langF77 = if nativeTools then false else gcc.langF77;
   shell = if shell == "" then stdenv.shell else shell;
+  meta = if gcc != null then gcc.meta else
+    { description = "System C compiler wrapper";
+    };
 }

pkgs/development/compilers/blackdown/default.nix

@@ -6,4 +6,4 @@ if stdenv.system == "i686-linux"
       inherit stdenv fetchurl;
     }
   else
-    false
+    null

pkgs/development/compilers/gcc-4.0-cross/default.nix

@@ -26,4 +26,10 @@ stdenv.mkDerivation {
   buildInputs = [binutilsCross];
   inherit kernelHeadersCross binutilsCross;
   platform = cross;
+
+  meta = {
+    homepage = "http://gcc.gnu.org/";
+    license = "GPL/LGPL";
+    description = "GNU Compiler Collection, 4.0.x (cross-compiler for " + cross + ")";
+  };
 }

pkgs/development/compilers/gcc-4.0/default.nix

@@ -15,4 +15,10 @@ stdenv.mkDerivation {
   # !!! apply only if noSysDirs is set
   patches = [./no-sys-dirs.patch];
   inherit noSysDirs langC langCC langF77 profiledCompiler;
+
+  meta = {
+    homepage = "http://gcc.gnu.org/";
+    license = "GPL/LGPL";
+    description = "GNU Compiler Collection, 4.0.x";
+  };
 }

pkgs/development/compilers/ghc/builder.sh

@@ -0,0 +1,5 @@
+source $stdenv/setup
+
+configureFlags="--with-gcc=$gcc/bin/gcc"
+
+genericBuild

pkgs/development/compilers/ghc/default.nix

@@ -1,4 +1,4 @@
-{stdenv, fetchurl, perl, ghc, m4, readline, ncurses}:
+{stdenv, gcc, fetchurl, perl, ghc, m4, readline, ncurses}:
 
 stdenv.mkDerivation {
   name = "ghc-6.4.1";
@@ -8,4 +8,6 @@ stdenv.mkDerivation {
   };
   buildInputs = [perl ghc m4];
   propagatedBuildInputs = [readline ncurses];
+  builder = ./builder.sh;
+  inherit gcc;
 }

pkgs/development/compilers/qcmm/builder.sh

@@ -0,0 +1,31 @@
+source $stdenv/setup
+
+configureFlags="--with-lua=$lua"
+
+MKFLAGS="-w$lua/include/lauxlib.h,$lua/include/luadebug.h,$lua/include/lua.h,$lua/include/lualib.h"
+
+buildPhase() {
+  mk timestamps
+  mk $MKFLAGS all.opt
+}
+
+installPhase() {
+  mk $MKFLAGS install.opt
+
+  for file in $out/bin/*.opt; do
+    mv $file ${file%.opt}
+  done
+
+  find $out/man -type f -exec gzip -9 {} \;
+
+  find $out -name \*.a -exec echo stripping {} \; \
+            -exec strip -S {} \; || fail
+
+  patchELF $out
+}
+
+buildPhase=buildPhase
+installPhase=installPhase
+checkPhase="mk $MKFLAGS test.opt"
+
+genericBuild

pkgs/development/compilers/qcmm/default.nix

@@ -0,0 +1,12 @@
+{stdenv, fetchurl, mk, ocaml, noweb, lua, groff }: 
+stdenv.mkDerivation {
+  name = "qcmm-2006-01-31";
+  src = fetchurl {
+    url = http://losser.st-lab.cs.uu.nl/~cddouma/dist/qc--20060131.tar.gz;
+    md5 = "9097830775bcf22c9bad54f389f5db23";
+  };
+  buildInputs = [ mk ocaml noweb groff ];
+  patches = [ ./qcmm.patch ];
+  builder = ./builder.sh;
+  inherit lua;
+}

pkgs/development/compilers/qcmm/qcmm.patch

@@ -0,0 +1,121 @@
+diff -ur qc--20060131.orig/configure qc--20060131/configure
+--- qc--20060131.orig/configure	2005-11-05 22:15:24.000000000 +0100
++++ qc--20060131/configure	2006-02-02 14:29:07.000000000 +0100
+@@ -93,7 +93,22 @@
+ # for file in dirs and return, full path, if found, and "" otherwise.
+ #
+ 
+-sub search { search_with( sub($) { return (-f shift) }, @_) }
++sub combine {
++    my $base = shift;
++    my $file = shift;
++    return ("$base/$file")
++};
++
++sub search { search_with( sub($) { return (-f shift) }, \&combine, @_) }
++
++sub search_suffix {
++    my $f = sub($) {
++        my $suffix = shift;
++        my $base   = shift;
++        return ($base . $suffix);
++    };
++    search_with(sub($) { return (-f shift) }, $f, @_)
++}
+ 
+ sub searchx {
+     my $f = sub($) {
+@@ -105,16 +120,17 @@
+         }
+         return (1==2); # how do you write false in perl?
+     };
+-    search_with($f, @_)
++    search_with($f, \&combine, @_)
+ }
+ 
+ sub search_with {
+     my $p    = shift;
++    my $com  = shift;
+     my $file = shift;
+    
+-    printf(LOG "searching for %-20s", $file); 
++    printf(LOG "searching for %-20s ", $file); 
+     while ($f = shift (@_)) {
+-        my $x = "$f/$file";
++        my $x = &$com($f, $file);
+         if (&$p($x)) { 
+             print LOG "found $x\n"; 
+             return $x 
+@@ -124,6 +140,20 @@
+     return "";
+ }
+ 
++#configure lua based on some known installation prefix
++sub config_lua {
++  my $base = shift;
++  @libsuffix    = ( ".so", "40.so", ".a", "40.a" );
++
++  $x{lua_h}       = "$base/include/lua.h";
++  $x{lualib_h}    = "$base/include/lualib.h";
++  $x{liblua}      = search_suffix("$base/lib/liblua", @libsuffix);
++  $x{liblualib}   = search_suffix("$base/lib/liblualib", @libsuffix);
++  $x{lua_inc}     = "-I$base/include";
++  $x{lua_lib}     = "-L$base/lib/";
++  $x{lua_libs}    = "-llua -llualib";
++}
++
+ 
+ #
+ # compile and run a small C program to find out about architecture
+@@ -183,6 +213,8 @@
+     
+     ./configure [options]
+ 
++    --with-lua=/lua/path    lua is installed in /lua/path the default
++                            is to search for standard locations
+     --prefix=/usr/local     install into the /usr/local hierarchy which
+                             is also the default
+     -h, --help              this summary
+@@ -224,15 +256,15 @@
+ # We start from here with reading the command line
+ # ------------------------------------------------------------------ 
+ 
++open (LOG, ">$configure_log") || die "cannot write configure.log: $!";
++
+ foreach (@ARGV) {
+     if       (/^--?prefix=(.*)$/)             { $x{prefix}=$1     }
+     elsif    (/^--?h(elp?)$/)                 { usage(); exit 0   }  
++    elsif    (/^--?with-lua=(.*)$/)           { config_lua($1)    }
+     else     { usage(); exit 1 }
+ }
+ 
+-
+-open (LOG, ">$configure_log") || die "cannot write configure.log: $!";
+-
+ # check for various executables and versions. Only update variable if
+ # it is not already set.
+ #
+diff -ur qc--20060131.orig/doc/mkfile qc--20060131/doc/mkfile
+--- qc--20060131.orig/doc/mkfile	2005-11-07 01:41:21.000000000 +0100
++++ qc--20060131/doc/mkfile	2006-02-02 00:38:00.000000000 +0100
+@@ -92,7 +92,7 @@
+ # and accessible from Lua as This.manual.
+ 
+ qc--.man:D:     qc--.1
+-	GROFF_NO_SGR=1 nroff -man -Tascii qc--.1 | ul -t dump > $target                
++	GROFF_NO_SGR=1 nroff -man -Tascii qc--.1 > $target                
+ 
+ release.tex:D: release.nw
+ 	noweave -delay $prereq > $target
+diff -ur qc--20060131.orig/mkfile qc--20060131/mkfile
+--- qc--20060131.orig/mkfile	2005-07-01 22:29:52.000000000 +0200
++++ qc--20060131/mkfile	2006-02-02 19:15:53.000000000 +0100
+@@ -97,7 +97,7 @@
+ 	cd test2 && NPROC=1 mk $MKFLAGS all
+ 
+ test.opt:V:         all.opt
+-	cd test2 && NPROC=1 mk QC=../bin/qc--.opt $MKFLAGS all
++	cd test2 && NPROC=1 mk $MKFLAGS QC=../bin/qc--.opt all
+ 
+ coverage: test2/ocamlprof.dump	
+ 	rm -f $target

pkgs/development/interpreters/lua-4/builder.sh

@@ -0,0 +1,6 @@
+source $stdenv/setup
+
+makeFlags="all so sobin"
+installFlags="INSTALL_ROOT=$out"
+
+genericBuild

pkgs/development/interpreters/lua-4/default.nix

@@ -0,0 +1,10 @@
+{stdenv, fetchurl}: 
+
+stdenv.mkDerivation {
+  name = "lua-4.0.1";
+  src = fetchurl {
+    url = http://www.lua.org/ftp/lua-4.0.1.tar.gz;
+    md5 = "a31d963dbdf727f9b34eee1e0d29132c";
+  };
+  builder= ./builder.sh;
+}

pkgs/development/interpreters/lua-5/builder.sh

@@ -0,0 +1,6 @@
+source $stdenv/setup
+
+makeFlags="all so sobin"
+installFlags="soinstall INSTALL_ROOT=$out"
+
+genericBuild

pkgs/development/interpreters/lua-5/default.nix

@@ -0,0 +1,10 @@
+{stdenv, fetchurl}: 
+
+stdenv.mkDerivation {
+  name = "lua-5.0.2";
+  src = fetchurl {
+    url = http://www.lua.org/ftp/lua-5.0.2.tar.gz;
+    md5 = "dea74646b7e5c621fef7174df83c34b1";
+  };
+  builder= ./builder.sh;
+}

pkgs/development/interpreters/toolbus/default.nix

@@ -0,0 +1,11 @@
+{stdenv, fetchurl, toolbuslib, atermjava, aterm, yacc, flex} :
+
+stdenv.mkDerivation {
+   name = "toolbus-1.2.2";
+   src = fetchurl {
+            url = http://www.cwi.nl/projects/MetaEnv/toolbus/toolbus-1.2.2.tar.gz;
+            md5 = "887349b097006c0883e1948797349a50";
+         };
+   inherit toolbuslib atermjava aterm yacc flex;
+   buildInputs = [toolbuslib atermjava aterm yacc flex];
+}

pkgs/development/interpreters/toolbus/test.nix

@@ -0,0 +1 @@
+(import ../../../../pkgs/system/i686-linux.nix).toolbus

pkgs/development/libraries/aterm/aterm-2.4.nix

@@ -6,4 +6,9 @@ stdenv.mkDerivation {
     url = http://nix.cs.uu.nl/dist/tarballs/aterm-2.4.2.tar.gz;
     md5 = "18617081dd112d85e6c4b1b552628114";
   };
+  meta = {
+    homepage = http://www.cwi.nl/htbin/sen1/twiki/bin/view/SEN1/ATerm;
+    license = "LGPL";
+    description = "Library for manipulation of term data structures in C";
+  };
 }

pkgs/development/libraries/db4/default.nix

@@ -1,15 +1,14 @@
 {stdenv, fetchurl, cxxSupport ? true, compat185 ? true}:
 
 stdenv.mkDerivation {
-  name = "db4-4.4.16";
+  name = "db4-4.4.20";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/db-4.4.16.NC.tar.gz;
-    md5 = "1466026e67b5c3eb60c8c16b7f472c17";
+    url = http://downloads.sleepycat.com/db-4.4.20.NC.tar.gz;
+    md5 = "bc1f4433cf08c956e5146037ba050581";
   };
   configureFlags = [
     (if cxxSupport then "--enable-cxx" else "--disable-cxx")
     (if cxxSupport then "--enable-compat185" else "--disable-compat185")
   ];
-  patches = [./register.patch]; # <- should be fixed in 4.4.17
 }

pkgs/development/libraries/db4/register.patch

@@ -1,84 +0,0 @@
-diff -rc db-4.4.16.NC-orig/env/env_register.c db-4.4.16.NC/env/env_register.c
-*** db-4.4.16.NC-orig/env/env_register.c	2005-10-07 22:21:27.000000000 +0200
---- db-4.4.16.NC/env/env_register.c	2005-12-08 17:16:44.000000000 +0100
-***************
-*** 217,226 ****
-  		if (nr != PID_LEN)
-  			goto corrupt;
-  
-! 		if (FLD_ISSET(
-! 		    dbenv->verbose, DB_VERB_REGISTER) && PID_ISEMPTY(buf)) {
-  			__db_msg(dbenv, "%02u: EMPTY", lcnt);
-! 			continue;
-  		}
-  
-  		/*
---- 217,226 ----
-  		if (nr != PID_LEN)
-  			goto corrupt;
-  
-!                 if (PID_ISEMPTY(buf)) {
-!                     if (FLD_ISSET(dbenv->verbose, DB_VERB_REGISTER))
-  			__db_msg(dbenv, "%02u: EMPTY", lcnt);
-!                     continue;
-  		}
-  
-  		/*
-diff -rc db-4.4.16.NC-orig/test/env012.tcl db-4.4.16.NC/test/env012.tcl
-*** db-4.4.16.NC-orig/test/env012.tcl	2005-11-02 21:27:45.000000000 +0100
---- db-4.4.16.NC/test/env012.tcl	2005-12-08 17:21:19.000000000 +0100
-***************
-*** 168,173 ****
---- 168,219 ----
-  	logcheckfails $testdir/env$tnum.log.p2 DB_RUNRECOVERY
-  	logcheck $testdir/env$tnum.log.p3
-  
-+         # Regression test: check that recovery doesn't run if there is
-+ 	# a "X   " slot in the registry.
-+ 	puts "\tEnv$tnum.f: Multiple processes can join with -register -recover."
-+ 
-+         # Make sure that we have at least 2 "X   " slots in the registry.
-+ 	puts "\t\tEnv$tnum.f1: Start process 1."
-+ 	set p1 [exec $tclsh_path $test_path/wrap.tcl envscript.tcl \
-+ 	    $testdir/env$tnum.log.p1 \
-+ 	    $testdir $testfile PUT $key $data RECOVER 1 &]
-+ 
-+ 	puts "\t\tEnv$tnum.f2: Start process 2."
-+ 	set p2 [exec $tclsh_path $test_path/wrap.tcl envscript.tcl \
-+ 	    $testdir/env$tnum.log.p2 \
-+ 	    $testdir $testfile PUT $key $data RECOVER 1 &]
-+ 
-+ 	watch_procs $p1 1 120
-+ 	watch_procs $p2 1 120
-+ 
-+ 	logcheck $testdir/env$tnum.log.p1
-+ 	logcheck $testdir/env$tnum.log.p2
-+     
-+         # Start a process.  It should not run recovery.  Under the bug
-+ 	# we're testing for, it would, because it would get an
-+         # exclusive lock on the first "X    " slot.
-+ 	puts "\t\tEnv$tnum.f3: Start process 3."
-+ 	set p3 [exec $tclsh_path $test_path/wrap.tcl envscript.tcl \
-+ 	    $testdir/env$tnum.log.p3 \
-+ 	    $testdir $testfile PUT $key $data RECOVER 10 &]
-+ 
-+         tclsleep 2
-+     
-+         # Start another process.  It should not run recovery either.
-+         # The bug would cause it to run recovery because it would get
-+         # an exclusive lock on the second "X    " slot.  This would
-+         # cause p3 to panic.
-+ 	puts "\t\tEnv$tnum.f4: Start process 4."
-+ 	set p4 [exec $tclsh_path $test_path/wrap.tcl envscript.tcl \
-+ 	    $testdir/env$tnum.log.p4 \
-+ 	    $testdir $testfile PUT $key $data RECOVER 10 &]
-+ 
-+ 	watch_procs $p3 1 120
-+ 	watch_procs $p4 1 120
-+ 
-+ 	# Check log files for failures.
-+ 	logcheck $testdir/env$tnum.log.p3
-+ 	logcheck $testdir/env$tnum.log.p4
-  }
-  
-  # Check log file and report failures with FAIL.  Use this when

pkgs/development/libraries/id3lib/default.nix

@@ -0,0 +1,10 @@
+{stdenv, fetchurl}:
+
+stdenv.mkDerivation {
+  name = "id3lib-3.8.3";
+  src = fetchurl {
+    url = http://surfnet.dl.sourceforge.net/sourceforge/id3lib/id3lib-3.8.3.tar.gz;
+    md5 = "19f27ddd2dda4b2d26a559a4f0f402a7";
+  };
+  configureFlags = "--disable-static";
+}

pkgs/development/libraries/libmpcdec/default.nix

@@ -0,0 +1,9 @@
+{stdenv, fetchurl}:
+
+stdenv.mkDerivation {
+  name = "libmpcdec-1.2.2";
+  src = fetchurl {
+    url = http://files2.musepack.net/source/libmpcdec-1.2.2.tar.bz2;
+    md5 = "f14e07285b9b102a806649074c1d779b";
+  };
+}

pkgs/development/libraries/taglib/default.nix

@@ -0,0 +1,10 @@
+{stdenv, fetchurl, zlib}:
+
+stdenv.mkDerivation {
+  name = "taglib-1.4";
+  src = fetchurl {
+    url = http://developer.kde.org/~wheeler/files/src/taglib-1.4.tar.gz;
+    md5 = "dcd50ddb2544faeae77f194804559404";
+  };
+  buildInputs = [zlib];
+}

pkgs/development/libraries/toolbuslib/default.nix

@@ -0,0 +1,11 @@
+{stdenv, fetchurl, aterm} :
+
+stdenv.mkDerivation {
+name = "toolbuslib-0.7.2";
+src = fetchurl {
+         url = http://www.cwi.nl/projects/MetaEnv/toolbuslib/toolbuslib-0.7.2.tar.gz;
+         md5 = "6619a155c6326d728d53c6901558e350";
+   };
+inherit aterm;
+buildinputs = [aterm];
+}

pkgs/development/libraries/toolbuslib/test.nix

@@ -0,0 +1 @@
+(import ../../../../pkgs/system/i686-linux.nix).toolbuslib

pkgs/development/tools/build-managers/mk/builder.sh

@@ -0,0 +1,4 @@
+source $stdenv/setup
+installFlags="PREFIX=$out"
+preInstall="mkdir -p $out/man/man1 $out/bin"
+genericBuild

pkgs/development/tools/build-managers/mk/default.nix

@@ -0,0 +1,10 @@
+{stdenv, fetchurl}:
+
+stdenv.mkDerivation {
+  name = "mk-2006-01-31";
+  src = fetchurl {
+    url = http://losser.st-lab.cs.uu.nl/~cddouma/dist/mk-20060131.tar.gz;
+    md5 = "167fd4e0eea4f49def01984ec203289b";
+  };
+  builder = ./builder.sh;
+}

pkgs/development/tools/build-managers/scons/builder.sh

@@ -0,0 +1,13 @@
+source $stdenv/setup
+
+buildPhase=myBuildPhase
+myBuildPhase() {
+    true
+}
+
+installPhase=myInstallPhase
+myInstallPhase() {
+    python setup.py install --prefix=$out || fail
+}
+
+genericBuild

pkgs/development/tools/build-managers/scons/default.nix

@@ -0,0 +1,11 @@
+{stdenv, fetchurl, python}:
+
+stdenv.mkDerivation {
+  name = "scons-0.96.1";
+  builder = ./builder.sh;
+  src = fetchurl {
+    url = http://surfnet.dl.sourceforge.net/sourceforge/scons/scons-0.96.1.tar.gz;
+    md5 = "45b1c346edd8a0970210aeb1e82557c9";
+  };
+  buildInputs = [python];
+}

pkgs/development/tools/haskell/uuagc/default.nix

@@ -9,7 +9,7 @@ let {
   };
 
   body = stdenv.mkDerivation {
-    name = "uuagc";
+    name = "uuagc-0.9.1";
     src = fetchurl {
       url = http://nix.cs.uu.nl/dist/tarballs/uuagc-0.9.1-src.tar.gz;
       md5 = "0f29cad75bd759696edc61c24d1a5db9";

pkgs/development/tools/literate-programming/noweb/builder.sh

@@ -0,0 +1,11 @@
+source $stdenv/setup
+export BIN=$out/bin
+export LIB=$out/lib
+export MAN=$out/man
+# What location for texinputs (tex macro's used by noweb)?
+export TEXINPUTS=$out/share/texmf/tex/latex
+export SHELL
+makeFlags="-e"
+installFlags="-e"
+preInstall="mkdir -p $TEXINPUTS"
+genericBuild

pkgs/development/tools/literate-programming/noweb/default.nix

@@ -0,0 +1,10 @@
+{stdenv, fetchurl}:
+
+stdenv.mkDerivation {
+  name = "noweb-2.10c";
+  src = fetchurl {
+    url = http://losser.st-lab.cs.uu.nl/~cddouma/dist/noweb-20060201.tar.gz;
+    md5 = "b4813c6bc0bab9004e57edc1d7e57638";
+  };
+  builder = ./builder.sh;
+}

pkgs/development/tools/parsing/sglr/sglr-3.14.nix

@@ -0,0 +1,12 @@
+{stdenv, fetchurl, aterm, toolbuslib, ptsupport, errorsupport}:
+
+stdenv.mkDerivation {
+  name = "sglr-3.14";
+  builder = ./builder.sh;
+  src = fetchurl {
+    url = http://nix.cs.uu.nl/dist/tarballs/sglr-3.14.tar.gz;
+    md5 = "c63d2ef0015f5cf2c7cf996d33700dfc";
+  };
+  inherit stdenv aterm ptsupport toolbuslib errorsupport;
+  buildInputs = [stdenv aterm ptsupport toolbuslib errorsupport];
+}

pkgs/stdenv/darwin/default.nix

@@ -16,4 +16,9 @@ genericStdenv {
   };
 
   shell = "/bin/sh";
+
+  extraAttrs = {
+    # Curl should be in /usr/bin or so.
+    curl = null;
+  };
 }

pkgs/stdenv/default.nix

@@ -5,14 +5,16 @@
 # Posix utilities, the GNU C compiler, and so on.  On other systems,
 # we use the native C library.
 
-{system, allPackages}: rec {
+{system, allPackages}:
+
+rec {
 
   gccWrapper = import ../build-support/gcc-wrapper;
-  genericStdenv = import ../stdenv/generic;
+  genericStdenv = import ./generic;
 
 
   # Trivial environment used for building other environments.
-  stdenvInitial = (import ../stdenv/initial) {
+  stdenvInitial = (import ./initial) {
     name = "stdenv-initial";
     inherit system;
   };
@@ -23,47 +25,44 @@
   # i.e., the stuff in /bin, /usr/bin, etc.  This environment should
   # be used with care, since many Nix packages will not build properly
   # with it (e.g., because they require GNU Make).
-  stdenvNative = (import ../stdenv/native) {
+  stdenvNative = (import ./native) {
     stdenv = stdenvInitial;
     inherit genericStdenv gccWrapper;
   };
 
   stdenvNativePkgs = allPackages {
-    stdenv = stdenvNative;
-    bootCurl = null;
+    bootStdenv = stdenvNative;
     noSysDirs = false;
   };
 
 
   # The Nix build environment.
-  stdenvNix = (import ../stdenv/nix) {
+  stdenvNix = (import ./nix) {
     stdenv = stdenvNative;
     pkgs = stdenvNativePkgs;
     inherit genericStdenv gccWrapper;
   };
 
   stdenvNixPkgs = allPackages {
-    stdenv = stdenvNix;
-    bootCurl = stdenvNativePkgs.curl;
+    bootStdenv = stdenvNix;
     noSysDirs = false;
   };
 
 
   # Linux standard environment.
-  inherit (import ../stdenv/linux {inherit allPackages;})
+  inherit (import ./linux {inherit allPackages;})
     stdenvLinux stdenvLinuxPkgs;
 
     
   # Darwin (Mac OS X) standard environment.  Very simple for now
   # (essentially it's just the native environment).
-  stdenvDarwin = (import ../stdenv/darwin) {
+  stdenvDarwin = (import ./darwin) {
     stdenv = stdenvInitial;
     inherit genericStdenv gccWrapper;
   };
 
   stdenvDarwinPkgs = allPackages {
-    stdenv = stdenvDarwin;
-    bootCurl = null;
+    bootStdenv = stdenvDarwin;
     noSysDirs = false;
   };
 
@@ -71,21 +70,21 @@
   # FreeBSD standard environment.  Right now this is more or less the
   # same as the native environemnt.  Eventually we'll want a pure
   # environment similar to stdenvLinux.
-  stdenvFreeBSD = (import ../stdenv/freebsd) {
+  stdenvFreeBSD = (import ./freebsd) {
     stdenv = stdenvInitial;
     inherit genericStdenv gccWrapper;
   };
 
   stdenvFreeBSDPkgs = allPackages {
-    stdenv = stdenvFreeBSD;
-    bootCurl = null;
+    bootStdenv = stdenvFreeBSD;
     noSysDirs = false;
   };
 
 
-  stdenvTestPkgs = allPackages {
-    stdenv = (import ../stdenv/nix-linux-static).stdenvInitial;
-    bootCurl = (import ../stdenv/nix-linux-static).curl;
-    noSysDirs = true;
-  };
+  # Select the appropriate stdenv for the platform `system'.
+  stdenv =
+    if system == "i686-linux" then stdenvLinux
+    else if system == "i686-freebsd" then stdenvFreeBSD
+    else if system == "powerpc-darwin" then stdenvDarwin
+    else stdenvNative;
 }

pkgs/stdenv/freebsd/default.nix

@@ -16,4 +16,9 @@ genericStdenv {
   };
 
   shell = "/bin/bash";
+
+  extraAttrs = {
+    # Curl should be in /usr/bin or so.
+    curl = null;
+  };
 }

pkgs/stdenv/generic/default.nix

@@ -1,5 +1,6 @@
 { stdenv, name, preHook ? null, postHook ? null, initialPath, gcc, shell
 , param1 ? "", param2 ? "", param3 ? "", param4 ? "", param5 ? ""
+, extraAttrs ? {}
 }:
 
 let {
@@ -24,13 +25,33 @@ let {
     # Add a utility function to produce derivations that use this
     # stdenv and its shell.
     // {
-      mkDerivation = attrs: derivation (attrs // {
-        builder = if attrs ? realBuilder then attrs.realBuilder else shell;
-        args = if attrs ? args then attrs.args else
-          ["-e" (if attrs ? builder then attrs.builder else ./default-builder.sh)];
-        stdenv = body;
-        system = body.system;
-      });
-    };
+    
+      mkDerivation = attrs:
+        (derivation (
+          (removeAttrs attrs ["meta"])
+          //
+          {
+            builder = if attrs ? realBuilder then attrs.realBuilder else shell;
+            args = if attrs ? args then attrs.args else
+              ["-e" (if attrs ? builder then attrs.builder else ./default-builder.sh)];
+            stdenv = body;
+            system = body.system;
+          })
+        )
+        //
+        # The meta attribute is passed in the resulting attribute set,
+        # but it's not part of the actual derivation, i.e., it's not
+        # passed to the builder and is not a dependency.  But since we
+        # include it in the result, it *is* available to nix-env for
+        # queries.
+        { meta = if attrs ? meta then attrs.meta else {}; };
+
+    }
+
+    # Propagate any extra attributes.  For instance, we use this to
+    # "lift" packages like curl from the final stdenv for Linux to
+    # all-packages.nix for that platform (meaning that it has a line
+    # like curl = if stdenv ? curl then stdenv.curl else ...).
+    // extraAttrs;
 
 }

pkgs/stdenv/linux/default.nix

@@ -114,22 +114,26 @@ rec {
 
   # This function builds the various standard environments used during
   # the bootstrap.
-  stdenvBootFun = {glibc, gcc, binutils, staticGlibc}: (import ../generic) {
-    name = "stdenv-linux-boot";
-    param1 = if staticGlibc then "static" else "dynamic";
-    preHook = ./prehook.sh;
-    stdenv = stdenvInitial;
-    shell = ./tools/bash;
-    gcc = (import ../../build-support/gcc-wrapper) {
+  stdenvBootFun =
+    {glibc, gcc, binutils, staticGlibc, extraAttrs ? {}}:
+    
+    import ../generic {
+      name = "stdenv-linux-boot";
+      param1 = if staticGlibc then "static" else "dynamic";
+      preHook = ./prehook.sh;
       stdenv = stdenvInitial;
-      nativeTools = false;
-      nativeGlibc = false;
-      inherit gcc glibc binutils;
+      shell = ./tools/bash;
+      gcc = (import ../../build-support/gcc-wrapper) {
+        stdenv = stdenvInitial;
+        nativeTools = false;
+        nativeGlibc = false;
+        inherit gcc glibc binutils;
+      };
+      initialPath = [
+        staticTools
+      ];
+      inherit extraAttrs;
     };
-    initialPath = [
-      staticTools
-    ];
-  };
 
 
   # Create the first "real" standard environment.  This one consists
@@ -139,13 +143,13 @@ rec {
     # Use the statically linked, downloaded glibc/gcc/binutils.
     inherit glibc gcc binutils;
     staticGlibc = true;
+    extraAttrs = {inherit curl;};
   };
 
   # 2) These are the packages that we can build with the first
   #    stdenv.  We only need Glibc (in step 3).
   stdenvLinuxBoot1Pkgs = allPackages {
-    stdenv = stdenvLinuxBoot1;
-    bootCurl = curl;
+    bootStdenv = stdenvLinuxBoot1;
   };
 
   # 3) Build Glibc with the statically linked tools.  The result is the
@@ -159,12 +163,12 @@ rec {
     glibc = stdenvLinuxGlibc;
     staticGlibc = false;
     inherit gcc binutils;
+    extraAttrs = {inherit curl;};
   };
 
   # 5) The packages that can be built using the second stdenv.
   stdenvLinuxBoot2Pkgs = allPackages {
-    stdenv = stdenvLinuxBoot2;
-    bootCurl = curl;
+    bootStdenv = stdenvLinuxBoot2;
   };
 
   # 6) Construct a third stdenv identical to the second, except that
@@ -174,12 +178,12 @@ rec {
     glibc = stdenvLinuxGlibc;
     staticGlibc = false;
     inherit (stdenvLinuxBoot2Pkgs) gcc binutils;
+    extraAttrs = {inherit curl;};
   };
 
   # 7) The packages that can be built using the third stdenv.
   stdenvLinuxBoot3Pkgs = allPackages {
-    stdenv = stdenvLinuxBoot3;
-    bootCurl = curl;
+    bootStdenv = stdenvLinuxBoot3;
   };
 
   # 8) Construct the final stdenv.  It uses the Glibc, GCC and
@@ -205,20 +209,14 @@ rec {
     };
 
     shell = stdenvLinuxBoot3Pkgs.bash ~ /bin/sh;
+    
+    extraAttrs = {
+      curl = stdenvLinuxBoot3Pkgs.realCurl;
+      inherit (stdenvLinuxBoot2Pkgs) binutils /* gcc */;
+      inherit (stdenvLinuxBoot3Pkgs)
+        gzip bzip2 bash coreutils diffutils findutils gawk
+        gnumake gnused gnutar gnugrep patch patchelf;
+    };
   };
 
-  # 8) Finally, the set of components built using the Linux stdenv.
-  #    Reuse the tools built in the previous steps.
-  stdenvLinuxPkgs =
-    allPackages {
-      stdenv = stdenvLinux;
-      bootCurl = stdenvLinuxBoot3Pkgs.curl;
-    } //
-    {inherit (stdenvLinuxBoot2Pkgs) binutils gcc;} //
-    {inherit (stdenvLinuxBoot3Pkgs)
-      gzip bzip2 bash coreutils diffutils findutils gawk
-      gnumake gnused gnutar gnugrep curl patch patchelf;
-    } //
-    {glibc = stdenvLinuxGlibc;};
-    
 }

pkgs/system/all-packages.nix

@@ -1,18 +0,0 @@
-# This file evaluates to a function that, when supplied with a system
-# identifier, returns the set of all packages provided by the Nix
-# Package Collection.  It does this by supplying
-# `all-packages-generic.nix' with one of the standard build
-# environments defined in `stdenvs.nix'.
-
-{system ? __currentSystem}: let {
-  allPackages = import ./all-packages-generic.nix;
-
-  stdenvs = import ./stdenvs.nix {inherit system allPackages;};
-
-  # Select the right instantiation.
-  body =
-    if system == "i686-linux" then stdenvs.stdenvLinuxPkgs
-    else if system == "i686-freebsd" then stdenvs.stdenvFreeBSDPkgs
-    else if system == "powerpc-darwin" then stdenvs.stdenvDarwinPkgs
-    else stdenvs.stdenvNativePkgs;
-}

pkgs/system/i686-linux.nix

@@ -1 +0,0 @@
-(import ./all-packages.nix) {system = "i686-linux";}

pkgs/system/powerpc-darwin.nix

@@ -1 +0,0 @@
-(import ./all-packages.nix) {system = "powerpc-darwin";}

pkgs/tools/compression/bzip2/builder-darwin.sh

@@ -0,0 +1,11 @@
+source $stdenv/setup
+installFlags="PREFIX=$out"
+
+postInstall=postInstall
+postInstall() {
+    rm $out/bin/bunzip2 $out/bin/bzcat
+    ln -s bzip2 $out/bin/bunzip2
+    ln -s bzip2 $out/bin/bzcat
+}
+
+genericBuild

pkgs/tools/compression/bzip2/builder-freebsd.sh

@@ -0,0 +1,24 @@
+source $stdenv/setup
+installFlags="PREFIX=$out"
+
+preBuild=preBuild
+preBuild() {
+    make -f Makefile-libbz2_so
+}
+
+preInstall=preInstall
+preInstall() {
+    ensureDir $out/lib
+    cp -p libbz2.so* $out/lib
+    ln -s libbz2.so.*.*.* $out/lib/libbz2.so
+}
+
+postInstall=postInstall
+postInstall() {
+    rm $out/bin/bunzip2 $out/bin/bzcat
+    ln -s bzip2 $out/bin/bunzip2
+    ln -s bzip2 $out/bin/bzcat
+}
+
+genericBuild
+

pkgs/tools/compression/bzip2/default.nix

@@ -2,7 +2,10 @@
 
 stdenv.mkDerivation {
   name = "bzip2-1.0.3";
-  builder = ./builder.sh;
+  builder =
+    if stdenv.system == "powerpc-darwin" then ./builder-darwin.sh
+    else if stdenv.system == "i686-freebsd" then ./builder-freebsd.sh
+    else ./builder.sh;
   src = fetchurl {
     url = http://nix.cs.uu.nl/dist/tarballs/bzip2-1.0.3.tar.gz;
     md5 = "8a716bebecb6e647d2e8a29ea5d8447f";

pkgs/tools/networking/bittorrent/default.nix

@@ -1,11 +1,11 @@
 {stdenv, fetchurl, python, pygtk, makeWrapper}:
 
 stdenv.mkDerivation {
-  name = "bittorrent-4.2.1";
+  name = "bittorrent-4.4.0";
   builder = ./builder.sh;
   src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/BitTorrent-4.2.1.tar.gz;
-    md5 = "0deb2e083e95206a9e601ff6ca35b826";
+    url = http://www.bittorrent.com/dl/BitTorrent-4.4.0.tar.gz;
+    md5 = "74d4b48202c28f0b27e989b6d5f5b214";
   };
   buildInputs = [python pygtk];
   inherit python pygtk makeWrapper;

pkgs/top-level/all-packages.nix

@@ -1,17 +1,27 @@
-# This file evaluates to a function that, when supplied with a system
-# identifier and a standard build environment, returns the set of all
-# packages provided by the Nix Package Collection.
+/* This file composes the Nix Packages collection.  That is, it
+   imports the functions that build the various packages, and calls
+   them with appropriate arguments.  The result is a set of all the
+   packages in the Nix Packages collection for some particular
+   platform. */
+   
 
-{ stdenv, bootCurl, noSysDirs ? true
+{ # The system for which to build the packages.
+  system ? __currentSystem
+
+, # The standard environment to use.  Only used for bootstrapping.  If
+  # null, the default standard environment is used.
+  bootStdenv ? null
+
+  # More flags for the bootstrapping of stdenv.
+, noSysDirs ? true
 , gccWithCC ? true
 , gccWithProfiling ? true
+
 }:
 
+
 rec {
 
-  inherit stdenv;
-
-
   ### Symbolic names.
 
   useOldXLibs = false;
@@ -25,13 +35,31 @@ rec {
   # `xlibs.xlibs' is a wrapper packages that combines libX11 and a bunch
   # of other basic X client libraries.
   x11 = if useOldXLibs then xlibsOld.xlibs else xlibsWrapper;
-  
+
+
+  ### Helper functions.
+  useFromStdenv = hasIt: it: alternative: if hasIt then it else alternative;
+
+  # Applying this to an attribute set will cause nix-env to look
+  # inside the set for derivations.
+  recurseIntoAttrs = attrs: attrs // {recurseForDerivations = true;};
+
+
+  ### STANDARD ENVIRONMENT
+
+  stdenv = if bootStdenv == null then defaultStdenv else bootStdenv;
+
+  defaultStdenv =
+    (import ../stdenv {
+      inherit system;
+      allPackages = import ./all-packages.nix;
+    }).stdenv;
+
 
   ### BUILD SUPPORT
 
   fetchurl = (import ../build-support/fetchurl) {
-    inherit stdenv;
-    curl = bootCurl;
+    inherit stdenv curl;
   };
 
   fetchsvn = (import ../build-support/fetchsvn) {
@@ -53,17 +81,19 @@ rec {
     inherit fetchurl stdenv flex;
   };
 
-  coreutils = (import ../tools/misc/coreutils) {
-    inherit fetchurl stdenv;
-  };
+  coreutils = useFromStdenv (stdenv ? coreutils) stdenv.coreutils
+    (import ../tools/misc/coreutils {
+      inherit fetchurl stdenv;
+    });
 
   coreutilsDiet = (import ../tools/misc/coreutils-diet) {
     inherit fetchurl stdenv dietgcc perl;
   };
 
-  findutils = (import ../tools/misc/findutils) {
-    inherit fetchurl stdenv coreutils;
-  };
+  findutils = useFromStdenv (stdenv ? findutils) stdenv.findutils
+    (import ../tools/misc/findutils {
+      inherit fetchurl stdenv coreutils;
+    });
 
   findutilsWrapper = (import ../tools/misc/findutils-wrapper) {
     inherit stdenv findutils;
@@ -98,27 +128,32 @@ rec {
     inherit fetchurl stdenv unzip jdk;
   };
 
-  diffutils = (import ../tools/text/diffutils) {
-    inherit fetchurl stdenv coreutils;
-  };
+  diffutils = useFromStdenv (stdenv ? diffutils) stdenv.diffutils
+    (import ../tools/text/diffutils {
+      inherit fetchurl stdenv coreutils;
+    });
 
   gnupatch = (import ../tools/text/gnupatch) {
     inherit fetchurl stdenv;
   };
 
-  patch = if stdenv.system == "powerpc-darwin" then null else gnupatch;
+  patch = useFromStdenv (stdenv ? patch) stdenv.patch
+    (if stdenv.system == "powerpc-darwin" then null else gnupatch);
 
-  gnused = (import ../tools/text/gnused) {
-    inherit fetchurl stdenv;
-  };
+  gnused = useFromStdenv (stdenv ? gnused) stdenv.gnused
+    (import ../tools/text/gnused {
+      inherit fetchurl stdenv;
+    });
 
-  gnugrep = (import ../tools/text/gnugrep) {
-    inherit fetchurl stdenv pcre;
-  };
+  gnugrep = useFromStdenv (stdenv ? gnugrep) stdenv.gnugrep
+    (import ../tools/text/gnugrep {
+      inherit fetchurl stdenv pcre;
+    });
 
-  gawk = (import ../tools/text/gawk) {
-    inherit fetchurl stdenv;
-  };
+  gawk = useFromStdenv (stdenv ? gawk) stdenv.gawk
+    (import ../tools/text/gawk {
+      inherit fetchurl stdenv;
+    });
 
   groff = (import ../tools/text/groff) {
     inherit fetchurl stdenv;
@@ -158,9 +193,10 @@ rec {
     inherit fetchurl stdenv;
   };
 
-  gnutar = (import ../tools/archivers/gnutar) {
-    inherit fetchurl stdenv;
-  };
+  gnutar = useFromStdenv (stdenv ? gnutar) stdenv.gnutar
+    (import ../tools/archivers/gnutar {
+      inherit fetchurl stdenv;
+    });
 
   gnutarDiet = (import ../tools/archivers/gnutar-diet) {
     inherit fetchurl stdenv dietgcc;
@@ -174,13 +210,15 @@ rec {
     inherit fetchurl stdenv;
   };
 
-  gzip = (import ../tools/compression/gzip) {
-    inherit fetchurl stdenv;
-  };
+  gzip = useFromStdenv (stdenv ? gzip) stdenv.gzip
+    (import ../tools/compression/gzip {
+      inherit fetchurl stdenv;
+    });
 
-  bzip2 = (import ../tools/compression/bzip2) {
-    inherit fetchurl stdenv;
-  };
+  bzip2 = useFromStdenv (stdenv ? bzip2) stdenv.bzip2
+    (import ../tools/compression/bzip2 {
+      inherit fetchurl stdenv;
+    });
 
   zdelta = (import ../tools/compression/zdelta) {
     inherit fetchurl stdenv;
@@ -198,7 +236,9 @@ rec {
     inherit fetchurl stdenv;
   };
 
-  curl = (import ../tools/networking/curl) {
+  curl = if stdenv ? curl then stdenv.curl else (assert false; null);
+
+  realCurl = (import ../tools/networking/curl) {
     inherit fetchurl stdenv zlib;
   };
 
@@ -308,9 +348,10 @@ rec {
    
   ### SHELLS
 
-  bash = (import ../shells/bash) {
-    inherit fetchurl stdenv;
-  };
+  bash = useFromStdenv (stdenv ? bash) stdenv.bash
+    (import ../shells/bash {
+      inherit fetchurl stdenv;
+    });
 
   tcsh = (import ../shells/tcsh) {
     inherit fetchurl stdenv ncurses;
@@ -323,9 +364,10 @@ rec {
 
   ### DEVELOPMENT
 
-  binutils = (import ../development/tools/misc/binutils) {
-    inherit fetchurl stdenv noSysDirs;
-  };
+  binutils = useFromStdenv (stdenv ? binutils) stdenv.binutils
+    (import ../development/tools/misc/binutils {
+      inherit fetchurl stdenv noSysDirs;
+    });
 
   binutilsMips = (import ../development/tools/misc/binutils-cross) {
     inherit fetchurl stdenv noSysDirs;
@@ -342,9 +384,10 @@ rec {
     cross = "sparc-linux";
   };
 
-  patchelf = (import ../development/tools/misc/patchelf) {
-    inherit fetchurl stdenv;
-  };
+  patchelf = useFromStdenv (stdenv ? patchelf) stdenv.patchelf
+    (import ../development/tools/misc/patchelf {
+      inherit fetchurl stdenv;
+    });
 
   gnum4 = (import ../development/tools/misc/gnum4) {
     inherit fetchurl stdenv;
@@ -435,10 +478,23 @@ rec {
     inherit fetchurl stdenv readline ncurses g77 perl flex;
   };
 
-  gnumake = (import ../development/tools/build-managers/gnumake) {
+  gnumake = useFromStdenv (stdenv ? gnumake) stdenv.gnumake
+    (import ../development/tools/build-managers/gnumake {
+      inherit fetchurl stdenv;
+    });
+
+  mk = (import ../development/tools/build-managers/mk) {
     inherit fetchurl stdenv;
   };
 
+  noweb = (import ../development/tools/literate-programming/noweb) {
+    inherit fetchurl stdenv;
+  };
+
+  scons = (import ../development/tools/build-managers/scons) {
+    inherit fetchurl stdenv python;
+  };
+
   bison = (import ../development/tools/parsing/bison) {
     inherit fetchurl stdenv;
     m4 = gnum4;
@@ -640,6 +696,11 @@ rec {
     inherit fetchurl stdenv x11;
   };
 
+  qcmm = (import ../development/compilers/qcmm) {
+    lua = lua4;
+    inherit fetchurl stdenv mk ocaml noweb groff;
+  };
+
   mono = (import ../development/compilers/mono) {
     inherit fetchurl stdenv bison pkgconfig;
     inherit (gtkLibs) glib;
@@ -686,6 +747,7 @@ rec {
 
   ghc = (import ../development/compilers/ghc) {
     inherit fetchurl stdenv perl ncurses readline;
+    gcc = stdenv.gcc;
     ghc = ghcboot;
     m4 = gnum4;
   };
@@ -742,6 +804,14 @@ rec {
     inherit fetchurl stdenv;
   };
 
+  lua4 = (import ../development/interpreters/lua-4) {
+    inherit fetchurl stdenv;
+  };
+
+  lua5 = (import ../development/interpreters/lua-5) {
+    inherit fetchurl stdenv;
+  };
+
   tcl = (import ../development/interpreters/tcl) {
     inherit fetchurl stdenv;
   };
@@ -970,7 +1040,7 @@ rec {
     inherit fetchurl stdenv pkgconfig x11 fontconfig freetype zlib libpng;
   };
 
-  gtkLibs = gtkLibs28;
+  gtkLibs = recurseIntoAttrs gtkLibs28;
 
   gtkLibs28 = import ../development/libraries/gtk-libs-2.8 {
     inherit fetchurl stdenv pkgconfig gettext perl x11
@@ -1061,13 +1131,13 @@ rec {
     inherit fetchurl stdenv;
   };
 
-  gnome = import ../development/libraries/gnome {
+  gnome = recurseIntoAttrs (import ../development/libraries/gnome {
     inherit fetchurl stdenv pkgconfig audiofile
             flex bison popt zlib libxml2 libxslt
             perl perlXMLParser docbook_xml_dtd_42 gettext x11
             libtiff libjpeg libpng gtkLibs;
     inherit (xlibs) libXmu;
-  };
+  });
 
   wxGTK = wxGTK26;
 
@@ -1468,6 +1538,18 @@ rec {
     inherit (xlibs) libXaw;
   };
 
+  id3lib = import ../development/libraries/id3lib {
+    inherit fetchurl stdenv;
+  };
+
+  taglib = import ../development/libraries/taglib {
+    inherit fetchurl stdenv zlib;
+  };
+
+  libmpcdec = import ../development/libraries/libmpcdec {
+    inherit fetchurl stdenv;
+  };
+
   
   ### SERVERS
 
@@ -1481,10 +1563,10 @@ rec {
     inherit fetchurl stdenv apacheHttpd python;
   };
 
-  xorg = import ../servers/x11/xorg {
+  xorg = recurseIntoAttrs (import ../servers/x11/xorg {
     inherit fetchurl stdenv pkgconfig freetype fontconfig
       expat libdrm libpng zlib perl mesa;
-  };
+  });
 
   postgresql = (import ../servers/sql/postgresql) {
     inherit fetchurl stdenv readline ncurses zlib;
@@ -1809,9 +1891,8 @@ rec {
     plugins = [
       MPlayerPlugin
       flashplayer
-      blackdown
 #      RealPlayer  # disabled by default for legal reasons
-    ];
+    ] ++ (if blackdown != null then [blackdown] else []);
   };
 
   firefoxWrapper = wrapFirefox firefox;
@@ -1882,6 +1963,17 @@ rec {
     inherit (gtkLibs1x) glib gtk;
   };
 
+  bmp = import ../applications/audio/bmp {
+    inherit fetchurl stdenv pkgconfig libogg libvorbis alsaLib id3lib;
+    inherit (gnome) esound libglade;
+    inherit (gtkLibs) glib gtk;
+  };
+
+  bmp_plugin_musepack = import ../applications/audio/bmp-plugins/musepack {
+    inherit fetchurl stdenv pkgconfig bmp libmpcdec taglib;
+    inherit (gtkLibs) glib gtk;
+  };
+
   MPlayer = (import ../applications/video/MPlayer) {
     inherit fetchurl stdenv freetype x11 zlib libtheora libcaca;
     inherit (xlibs) libXv libXinerama;
@@ -2161,14 +2253,12 @@ rec {
   };
 
   #nixStatic = (import ../misc/nix-static) {
-  # inherit fetchurl stdenv aterm perl;
-  #  curl = bootCurl; /* !!! ugly */
+  # inherit fetchurl stdenv aterm perl curl;
   #  bdb = db4;
   #};
 
   nix = (import ../misc/nix) {
-    inherit fetchurl stdenv aterm perl;
-    curl = bootCurl; /* !!! ugly */
+    inherit fetchurl stdenv aterm perl curl;
     bdb = db4;
   };
 
@@ -2189,4 +2279,16 @@ rec {
     inherit fetchurl stdenv x11 mesa;
   };
 
+  toolbuslib = (import ../development/libraries/toolbuslib) {
+    inherit stdenv fetchurl aterm;
+  };
+
+  toolbus = (import ../development/interpreters/toolbus) {
+    inherit stdenv fetchurl atermjava toolbuslib aterm yacc flex;
+  };
+
+  joe = (import ../applications/editors/joe) {
+    inherit stdenv fetchurl;
+  };
+
 }

pkgs/top-level/build-for-release.nix

@@ -16,6 +16,8 @@ let {
     bisonnew
     bittorrent
     blackdown
+    bmp
+    bmp_plugin_musepack
     bsdiff
     bzip2
     callgrind
@@ -65,6 +67,7 @@ let {
     libxml2
     libxslt
     lynx
+    mk
     mktemp
     mono
     mysql
@@ -80,6 +83,7 @@ let {
     postgresql
     postgresql_jdbc
     python
+    qcmm
     qt3
     qtparted
     quake3demo