* Sync with trunk. Back to gtkLibs214.

svn path=/nixpkgs/branches/stdenv-updates/; revision=13960

26 files changed, 344 insertions, 59 deletions

diff --git a/pkgs/applications/editors/ed/default.nix b/pkgs/applications/editors/ed/default.nix
index cfa366b66ad7..b43af4e4e593 100644
--- a/pkgs/applications/editors/ed/default.nix
+++ b/pkgs/applications/editors/ed/default.nix
@@ -1,10 +1,10 @@
 { fetchurl, stdenv }:
 
 stdenv.mkDerivation rec {
-  name = "ed-1.1";
+  name = "ed-1.2";
   src = fetchurl {
-    url = "mirror://gnu/ed/${name}.tar.bz2";
-    sha256 = "0hikn102jywxy86599k0ys4h2r3lshlfihrpjr7dqaxch49pgb56";
+    url = "mirror://gnu/ed/${name}.tar.gz";
+    sha256 = "1jhw050fzaffjf5qdj1ccn7alngam7yhd5zpzyxvrjphwmkd46kx";
   };
 
   doCheck = true;
diff --git a/pkgs/applications/graphics/gimp/default.nix b/pkgs/applications/graphics/gimp/default.nix
index 3bd5202c38ce..2c0e909caeab 100644
--- a/pkgs/applications/graphics/gimp/default.nix
+++ b/pkgs/applications/graphics/gimp/default.nix
@@ -4,10 +4,11 @@
 }:
 
 stdenv.mkDerivation {
-  name = "gimp-2.6.2";
+  name = "gimp-2.6.3";
+  
   src = fetchurl {
-    url = ftp://ftp.gtk.org/pub/gimp/v2.6/gimp-2.6.2.tar.bz2;
-    sha256 = "0bdbqn800i6bbyqww01379zlj687dhcnm4hr9qxmv5wgffcgiari";
+    url = ftp://ftp.gtk.org/pub/gimp/v2.6/gimp-2.6.3.tar.bz2;
+    sha256 = "1vvixi4336pjwjfx1p803jb3c12lk84adinaqvbpqdqx8xrd5r08";
   };
   
   buildInputs = [
diff --git a/pkgs/applications/networking/sniffers/kismet/default.nix b/pkgs/applications/networking/sniffers/kismet/default.nix
new file mode 100644
index 000000000000..37db2dde0ed7
--- /dev/null
+++ b/pkgs/applications/networking/sniffers/kismet/default.nix
@@ -0,0 +1,23 @@
+{stdenv, fetchurl, libpcap, ncurses, expat}:
+
+stdenv.mkDerivation {
+  name = "kismet-2008-05-r1";
+
+  src = fetchurl {
+    url = http://www.kismetwireless.net/code/kismet-2008-05-R1.tar.gz;
+    sha256 = "a298d44f8a6ec977021cd492a720987ded81b5c4baf5f68b36f1282a23c9f7d3";
+  };
+
+  buildInputs = [libpcap ncurses expat];
+  postConfigure =
+    "sed -e 's@-o \$(INSTUSR)@@' \\
+        -e 's@-g \$(INSTGRP)@@' \\
+        -e 's@-g \$(MANGRP)@@' \\
+        -i Makefile";
+
+  meta = {
+    description = "Wireless network sniffer";
+    homepage = http://www.kismetwireless.net/;
+    license = "GPL";
+  };
+}
diff --git a/pkgs/build-support/vm/default.nix b/pkgs/build-support/vm/default.nix
index 33de98042371..b0dcb23c09e5 100644
--- a/pkgs/build-support/vm/default.nix
+++ b/pkgs/build-support/vm/default.nix
@@ -5,7 +5,7 @@ with pkgs;
 rec {
 
 
-  inherit (kernelPackages_2_6_26) kernel klibcShrunk;
+  inherit (kernelPackages_2_6_26) kernel;
 
 
   modulesClosure = makeModulesClosure {
diff --git a/pkgs/desktops/gnome/libglade.nix b/pkgs/desktops/gnome/libglade.nix
index 2719379359c8..0377c07c0f5e 100644
--- a/pkgs/desktops/gnome/libglade.nix
+++ b/pkgs/desktops/gnome/libglade.nix
@@ -6,4 +6,27 @@ stdenv.mkDerivation {
   inherit (input) name src;
   buildInputs = [pkgconfig];
   propagatedBuildInputs = [gtk libxml2];
+
+  meta = {
+    description = "Glade, a User Interface Designer for GTK+ and GNOME";
+
+    longDescription = ''
+      Glade is a RAD tool to enable quick & easy development of user
+      interfaces for the GTK+ toolkit and the GNOME desktop
+      environment, released under the GNU GPL License.
+
+      The user interfaces designed in Glade are saved as XML, and by
+      using the libglade library these can be loaded by applications
+      dynamically as needed.
+
+      By using libglade, Glade XML files can be used in numerous
+      programming languages including C, C++, Java, Perl, Python, C#,
+      Pike, Ruby, Haskell, Objective Caml and Scheme.  Adding support
+      for other languages is easy too.
+    '';
+
+    license = "LGPLv2+";
+
+    homepage = http://glade.gnome.org/;
+  };
 }
diff --git a/pkgs/development/compilers/gcc-apple/builder.sh b/pkgs/development/compilers/gcc-apple/builder.sh
index 4ff75309ea74..8485b6efec0f 100644
--- a/pkgs/development/compilers/gcc-apple/builder.sh
+++ b/pkgs/development/compilers/gcc-apple/builder.sh
@@ -60,7 +60,7 @@ preConfigure() {
         langs="$langs,c++"
     fi
     if test -n "$langF77"; then
-        langs="$langs,f77"
+        langs="$langs,f95"
     fi
 
     # Perform the build in a different directory.
diff --git a/pkgs/development/compilers/gcc-apple/default.nix b/pkgs/development/compilers/gcc-apple/default.nix
index 6044a93a70fa..a5f89455501f 100644
--- a/pkgs/development/compilers/gcc-apple/default.nix
+++ b/pkgs/development/compilers/gcc-apple/default.nix
@@ -1,12 +1,14 @@
 { stdenv, fetchurl, noSysDirs
 , langC ? true, langCC ? true, langF77 ? false
 , profiledCompiler ? false
+, gmp ? null, mpfr ? null, bison ? null, flex ? null
 }:
 
 assert langC;
 assert stdenv.isDarwin;
+assert langF77 -> gmp != null;
 
-stdenv.mkDerivation {
+stdenv.mkDerivation ({
   name = "gcc-4.0.1-apple-5341";
   builder = ./builder.sh;
   src = fetchurl {
@@ -17,4 +19,4 @@ stdenv.mkDerivation {
     [./pass-cxxcpp.patch]
     ++ (if noSysDirs then [./no-sys-dirs.patch] else []);
   inherit noSysDirs langC langCC langF77 profiledCompiler;
-}
+} // (if langF77 then {buildInputs = [gmp mpfr bison flex];} else {}))
diff --git a/pkgs/development/compilers/jdk/jdk6-linux.nix b/pkgs/development/compilers/jdk/jdk6-linux.nix
index 5dadafe6c370..6f737951a888 100644
--- a/pkgs/development/compilers/jdk/jdk6-linux.nix
+++ b/pkgs/development/compilers/jdk/jdk6-linux.nix
@@ -13,18 +13,18 @@ assert swingSupport -> xlibs != null;
 
 stdenv.mkDerivation ({
   name =
-    if installjdk then "jdk-1.6.0_6" else "jre-1.6.0_6";
+    if installjdk then "jdk-1.6.0_11" else "jre-1.6.0_11";
 
   src =
     if stdenv.system == "i686-linux" then
       fetchurl {
-        url = http://download.java.net/dlj/binaries/jdk-6u6-dlj-linux-i586.bin;
-        sha256 = "35ad958d88ed2af892c3879c815988bfae7775dd484e920186d1f8ad02a2c076";
+        url = http://download.java.net/dlj/binaries/jdk-6u11-dlj-linux-i586.bin;
+        md5 = "e5eef98bc477675c66e053fc3635e645";
       }
     else if stdenv.system == "x86_64-linux" then
       fetchurl {
-        url = http://download.java.net/dlj/binaries/jdk-6u6-dlj-linux-amd64.bin;
-        sha256 = "f9e80c53e15d8faf0d3381e2e2540bade4c5f849ff72984a2ed34e3208f0b7ea";
+        url = http://download.java.net/dlj/binaries/jdk-6u11-dlj-linux-amd64.bin;
+        md5 = "0f687b6dbfe54e117bb0d9e090fda20b";
       }
     else
       abort "jdk requires i686-linux or x86_64 linux";
diff --git a/pkgs/development/libraries/gegl/default.nix b/pkgs/development/libraries/gegl/default.nix
index 6e94971b5209..5089316cd58a 100644
--- a/pkgs/development/libraries/gegl/default.nix
+++ b/pkgs/development/libraries/gegl/default.nix
@@ -1,10 +1,10 @@
 args:
 args.stdenv.mkDerivation {
-  name = "gegl-0.0.20";
+  name = "gegl-0.0.22";
 
   src = args.fetchurl {
-    url = ftp://ftp.gimp.org/pub/gegl/0.0/gegl-0.0.20.tar.bz2;
-    sha256 = "1dqdammp2jv6cwycwx5pwn5m9n3xss5j6656xb59dj4xxypvd2vh";
+    url = ftp://ftp.gimp.org/pub/gegl/0.0/gegl-0.0.22.tar.bz2;
+    sha256 = "0nx6r9amzhw5d2ghlw3z8qnry18rwz1ymvl2cm31b8p49z436wl5";
   };
 
   configureFlags = "--disable-docs"; # needs fonts otherwise  don't know how to pass them
diff --git a/pkgs/development/libraries/gtk-libs/2.14/default.nix b/pkgs/development/libraries/gtk-libs/2.14/default.nix
index 884058ab2d1e..3ccc3338d1e4 100644
--- a/pkgs/development/libraries/gtk-libs/2.14/default.nix
+++ b/pkgs/development/libraries/gtk-libs/2.14/default.nix
@@ -15,7 +15,7 @@ rec {
 
   glibmm = (import ./glibmm) (args // { inherit glib; });
 
-  #pangomm = (import ./pangomm) (args // { inherit pango glibmm cairomm; });
+  pangomm = (import ./pangomm) (args // { inherit pango glibmm cairomm; });
 
-  #gtkmm = (import ./gtkmm) (args // { inherit gtk atk glibmm; });
+  gtkmm = (import ./gtkmm) (args // { inherit gtk atk glibmm; });
 }
diff --git a/pkgs/development/libraries/gtk-libs/2.14/pangomm/default.nix b/pkgs/development/libraries/gtk-libs/2.14/pangomm/default.nix
new file mode 100644
index 000000000000..ca43437574e5
--- /dev/null
+++ b/pkgs/development/libraries/gtk-libs/2.14/pangomm/default.nix
@@ -0,0 +1,28 @@
+args: with args;
+
+stdenv.mkDerivation rec {
+  name ="pangomm-2.14.1";
+
+  src = fetchurl {
+    url = "mirror://gnome/sources/pangomm/2.14/${name}.tar.bz2";
+    sha256 = "0mrm5hv8kb84qzb97lqbipzzc8g0b97pfgz2hqq33xs2ha3lswnp";
+  };
+
+  buildInputs = [ pkgconfig ];
+  propagatedBuildInputs = [ pango glibmm cairomm libpng ];
+
+  meta = {
+    description = "C++ interface to the Pango text rendering library";
+
+    longDescription = ''
+      Pango is a library for laying out and rendering of text, with an
+      emphasis on internationalization.  Pango can be used anywhere
+      that text layout is needed, though most of the work on Pango so
+      far has been done in the context of the GTK+ widget toolkit.
+      Pango forms the core of text and font handling for GTK+-2.x.
+    '';
+
+    homepage = http://www.pango.org/;
+    license = "LGPLv2+";
+  };
+}
diff --git a/pkgs/games/fsg/alt-builder.nix b/pkgs/games/fsg/alt-builder.nix
index 70a342e32269..da0c127a6e74 100644
--- a/pkgs/games/fsg/alt-builder.nix
+++ b/pkgs/games/fsg/alt-builder.nix
@@ -1,6 +1,6 @@
 args: with args; 
 	let localDefs = builderDefs.passthru.function {
-  		buildInputs =[(wxGTK null)];
+  		buildInputs =[mesa (wxGTK null) libX11 xproto];
 		  src = 
 			fetchurl {
 				url = http://www.piettes.com/fallingsandgame/fsg-src-4.4.tar.gz;
diff --git a/pkgs/games/fsg/default.nix b/pkgs/games/fsg/default.nix
index 0922bf2e4c13..891ac488bf38 100644
--- a/pkgs/games/fsg/default.nix
+++ b/pkgs/games/fsg/default.nix
@@ -8,7 +8,7 @@ stdenv.mkDerivation {
 		sha256 = "1756y01rkvd3f1pkj88jqh83fqcfl2fy0c48mcq53pjzln9ycv8c";
 	};
 
-  buildInputs =[gtk glib pkgconfig (wxGTK null)];
+  buildInputs =[gtk glib pkgconfig mesa (wxGTK null) libX11 xproto];
 
 /*  
 #	One day Unicode will overcome?
diff --git a/pkgs/games/gnuchess/default.nix b/pkgs/games/gnuchess/default.nix
new file mode 100644
index 000000000000..ff86ad268932
--- /dev/null
+++ b/pkgs/games/gnuchess/default.nix
@@ -0,0 +1,31 @@
+a :  
+let 
+  fetchurl = a.fetchurl;
+
+  version = a.lib.getAttr ["version"] "5.07" a; 
+  buildInputs = with a; [
+    flex
+  ];
+in
+rec {
+  src = fetchurl {
+    url = "mirror://gnu/chess/gnuchess-${version}.tar.gz";
+    sha256 = "0zh15m35fzbsrk1aann9pwlkv54dwb00snx99pk3xbg5bwkf125k";
+  };
+
+  inherit buildInputs;
+  configureFlags = [];
+
+  /* doConfigure should be removed if not needed */
+  phaseNames = ["doConfigure" "preBuild" "doMakeInstall"];
+
+  preBuild = a.FullDepEntry (''
+    sed -i src/input.c -e 's/static pthread_t/pthread_t/'
+    sed -i "s@gnuchess@$out/bin/gnuchess@" -i src/gnuchessx
+  '') ["minInit" "doUnpack"];
+      
+  name = "gnuchess-" + version;
+  meta = {
+    description = "GNU Chess playing program";
+  };
+}
diff --git a/pkgs/games/xboard/default.nix b/pkgs/games/xboard/default.nix
new file mode 100644
index 000000000000..b4258c1c14b5
--- /dev/null
+++ b/pkgs/games/xboard/default.nix
@@ -0,0 +1,32 @@
+a :  
+let 
+  fetchurl = a.fetchurl;
+
+  version = a.lib.getAttr ["version"] "4.2.7" a; 
+  buildInputs = with a; [
+    libX11 xproto libXt libXaw libSM libICE libXmu 
+    libXext gnuchess
+  ];
+in
+rec {
+  src = fetchurl {
+    url = "http://ftp.gnu.org/gnu/xboard/xboard-${version}.tar.gz";
+    sha256 = "0fwdzcav8shvzi7djphrlav29vwxnx63spzsldlhrglr7qpg28av";
+  };
+
+  inherit buildInputs;
+  configureFlags = [];
+
+  /* doConfigure should be removed if not needed */
+  phaseNames = ["doConfigure" "preBuild" "doMakeInstall"];
+
+  preBuild = a.FullDepEntry(''
+    sed -e '/FIRST_CHESS_PROGRAM/s@gnuchessx@${a.gnuchess}/bin/gnuchessx@' -i xboard.h
+    sed -e '/SECOND_CHESS_PROGRAM/s@gnuchessx@${a.gnuchess}/bin/gnuchessx@' -i xboard.h
+  '') ["doUnpack" "minInit"];
+      
+  name = "xboard-" + version;
+  meta = {
+    description = "XBoard - a chess board compatible with GNU Chess";
+  };
+}
diff --git a/pkgs/servers/pulseaudio/default.nix b/pkgs/servers/pulseaudio/default.nix
index 1e2ffd31d944..c99b8d608b63 100644
--- a/pkgs/servers/pulseaudio/default.nix
+++ b/pkgs/servers/pulseaudio/default.nix
@@ -22,6 +22,11 @@ stdenv.mkDerivation rec {
     # on NixOS.
     sed -i "src/daemon/default.pa.in" \
         -e 's/^\( *load-module \+module-console-kit\)/# \1/g'
+
+    # Change the `padsp' script so that it contains the full path to
+    # `libpulsedsp.so'.
+    sed -i "src/utils/padsp" \
+        -e "s|libpulsedsp\.so|$out/lib/libpulsedsp.so|g"
   '';
 
   configureFlags = ''
diff --git a/pkgs/tools/networking/aircrack-ng/add-paths.patch b/pkgs/tools/networking/aircrack-ng/add-paths.patch
new file mode 100644
index 000000000000..6a79484e92ce
--- /dev/null
+++ b/pkgs/tools/networking/aircrack-ng/add-paths.patch
@@ -0,0 +1,17 @@
+diff --git a/src/osdep/linux.c b/src/osdep/linux.c
+index 9f3b1ef..ba7e584 100644
+--- a/src/osdep/linux.c
++++ b/src/osdep/linux.c
+@@ -235,7 +235,11 @@ static char * wiToolsPath(const char * tool)
+                 "/bin",
+                 "/usr/bin",
+                 "/usr/local/bin",
+-                "/tmp"
++                "/tmp",
++                "/var/run/current-system/sw/bin",
++                "/var/run/current-system/sw/sbin",
++                "/root/.nix-profile/bin",
++                "/root/.nix-profile/sbin"
+         };
+ 
+         nbelems = sizeof(paths) / sizeof(char *);
diff --git a/pkgs/tools/networking/aircrack-ng/default.nix b/pkgs/tools/networking/aircrack-ng/default.nix
new file mode 100644
index 000000000000..6bedb6bc75b9
--- /dev/null
+++ b/pkgs/tools/networking/aircrack-ng/default.nix
@@ -0,0 +1,22 @@
+{stdenv, fetchurl, libpcap, openssl, zlib}:
+
+stdenv.mkDerivation {
+  name = "aircrack-ng-1.0-rc2";
+
+  src = fetchurl {
+    url = http://download.aircrack-ng.org/aircrack-ng-1.0-rc2.tar.gz;
+    sha256 = "9d52f15f3fca52775ecb9cfc1f0aeb04c3c3bd3101665d5760d395f7d2a87d8b";
+  };
+
+  buildInputs = [libpcap openssl zlib];
+
+  patches = [ ./add-paths.patch ];
+
+  postPatch = "sed -e 's@^prefix.*@prefix = '$out@ -i common.mak";
+
+  meta = {
+    description = "Wireless encryption crackign tools";
+    homepage = http://www.aircrack-ng.org/;
+    license = "GPL2+";
+  };
+}
diff --git a/pkgs/tools/networking/inetutils/default.nix b/pkgs/tools/networking/inetutils/default.nix
index e276ec10aa41..caa91bdbe4b0 100644
--- a/pkgs/tools/networking/inetutils/default.nix
+++ b/pkgs/tools/networking/inetutils/default.nix
@@ -1,18 +1,13 @@
 {stdenv, fetchurl}:
 
 stdenv.mkDerivation rec {
-  name = "inetutils-1.5";
+  name = "inetutils-1.6";
+
   src = fetchurl {
     url = "mirror://gnu/inetutils/${name}.tar.gz";
-    sha256 = "048my5fgxnjwr1jcka8yq36c7i019p60r0mg4f6zz96pmys76p1l";
+    sha256 = "1pjv2h8mwbyjrw75xn1k1z7ps4z4y0x6ljizwrzkh83n7d3xjaq5";
   };
 
-  # Make sure `configure' honors `$TMPDIR' for chroot builds.
-  patchPhase = ''
-    cat configure | sed -'es|/tmp/,iu|$TMPDIR/,iu|g' > ,,tmp && \
-    mv ,,tmp configure && chmod +x configure
-  '';
-
   postInstall = ''
     # XXX: These programs are normally installed setuid but since it
     # fails, they end up being non-executable, hence this hack.
@@ -20,9 +15,14 @@ stdenv.mkDerivation rec {
   '';
 
   meta = {
-    description = ''GNU Inetutils is a collection of common network
-                    programs, including telnet, FTP, RSH, rlogin and
-		    TFTP clients and servers, among others.'';
+    description = "GNU Inetutils, a collection of common network programs";
+
+    longDescription = ''
+      GNU Inetutils is a collection of common network programs,
+      including telnet, FTP, RSH, rlogin and TFTP clients and servers,
+      among others.
+    '';
+
     homepage = http://www.gnu.org/software/inetutils/;
     license = "GPLv3+";
   };
diff --git a/pkgs/tools/networking/ppp/default.nix b/pkgs/tools/networking/ppp/default.nix
new file mode 100644
index 000000000000..26580d052a1d
--- /dev/null
+++ b/pkgs/tools/networking/ppp/default.nix
@@ -0,0 +1,41 @@
+a :  
+let 
+  fetchurl = a.fetchurl;
+
+  version = a.lib.getAttr ["version"] "2.4.4" a; 
+  buildInputs = with a; [
+    
+  ];
+in
+rec {
+  src = fetchurl {
+    url = "http://ppp.samba.org/ftp/ppp/ppp-${version}.tar.gz";
+    sha256 = "1sli1s478k85vmjdbrqm39nn5r20x9qgg3a0lbp2dwz50zy4bbsq";
+  };
+
+  inherit buildInputs;
+  configureFlags = [];
+
+  phaseNames = ["exportVars" "patchPrivileged" "doConfigure" "doMakeInstall"];
+
+  exportVars = a.noDepEntry(''
+    export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -lcrypt "
+  '');
+
+  /* We want to run it as far as we can with our current permissions
+     For example, dependent builds would prefer to run --version 
+     without ever using setuid pppd. We are not setuid anyway, so.. */
+  patchPrivileged = a.FullDepEntry(''
+    sed -e '/privileged =/aprivileged = 1;' -i pppd/main.c
+    sed -e '/SH DESCRIPTION/a WARNING: Patched version unsuitable to be setuid root' -i pppd/pppd.8
+  '') ["minInit" "doUnpack"];
+
+  passthru = {
+    inherit version;
+  };
+      
+  name = "ppp-" + version;
+  meta = {
+    description = "Point-to-point implementation for Linux and Solaris";
+  };
+}
diff --git a/pkgs/tools/networking/rp-pppoe/default.nix b/pkgs/tools/networking/rp-pppoe/default.nix
new file mode 100644
index 000000000000..c0b51992ca8a
--- /dev/null
+++ b/pkgs/tools/networking/rp-pppoe/default.nix
@@ -0,0 +1,42 @@
+a :  
+let 
+  fetchurl = a.fetchurl;
+
+  version = a.lib.getAttr ["version"] "3.10" a; 
+  buildInputs = with a; [
+    ppp   
+  ];
+in
+rec {
+  src = fetchurl {
+    url = "http://www.roaringpenguin.com/files/download/rp-pppoe-${version}.tar.gz";
+    sha256 = "1xj9rvsblvv2zi4n1bj8mkk00p1b24ch5hlr1gcc3b4l4m0ag73h";
+  };
+
+  inherit buildInputs;
+  configureFlags = [];
+
+  /* doConfigure should be removed if not needed */
+  phaseNames = ["exportVars" "doConfigure" "patchInstall" "makeDirs" "doMakeInstall"];
+
+  goSrcDir = "cd src";
+  exportVars = a.noDepEntry(''
+    export PATH="$PATH:${a.ppp}/sbin"
+    export NIX_CFLAGS_COMPILE="$NIX_CFLAGS_COMPILE -L${a.ppp}/lib/${a.ppp.version}"
+    export PPPD=${a.ppp}/sbin/pppd
+  '');
+
+  patchInstall = a.FullDepEntry(''
+    sed -i Makefile -e 's@DESTDIR)/etc/ppp@out)/share/${name}/etc/ppp@'
+    sed -i Makefile -e 's@PPPOESERVER_PPPD_OPTIONS=@&$(out)/share/${name}@'
+  '') ["minInit" "doUnpack"];
+
+  makeDirs = a.FullDepEntry(''
+    ensureDir $out/share/${name}/etc/ppp
+  '') ["minInit" "defEnsureDir"];
+
+  name = "rp-pppoe-" + version;
+  meta = {
+    description = "Roaring Penguin Point-to-Point over Ethernet tool";
+  };
+}
diff --git a/pkgs/tools/networking/wget/1.10.2.nix b/pkgs/tools/networking/wget/1.10.2.nix
deleted file mode 100644
index 8817466432da..000000000000
--- a/pkgs/tools/networking/wget/1.10.2.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-{stdenv, fetchurl, gettext}:
-
-stdenv.mkDerivation {
-  name = "wget-1.10.2";
-  src = fetchurl {
-    url = mirror://gnu/wget/wget-1.10.2.tar.gz;
-    md5 = "795fefbb7099f93e2d346b026785c4b8";
-  };
-
-  buildInputs = [gettext];
-
-  meta = {
-    description = "A console downloading program. Has some features for mirroring sites.";
-  };
-}
diff --git a/pkgs/tools/networking/wget/1.11.nix b/pkgs/tools/networking/wget/default.nix
index c7295f1df943..9ab6fbb81330 100644
--- a/pkgs/tools/networking/wget/1.11.nix
+++ b/pkgs/tools/networking/wget/default.nix
@@ -1,10 +1,11 @@
-args: with args;
+{stdenv, fetchurl, gettext}:
 
 stdenv.mkDerivation rec {
-  name = "wget-" + version;
+  name = "wget-1.11.4";
+  
   src = fetchurl {
     url = "mirror://gnu/wget/${name}.tar.bz2";
-    sha256 = "0mhd3181zdp1fwirxw0km7502sfvjmm1ncska9w6s2drczf37aix";
+    sha256 = "1yr7w182n7lvkajvq07wnw65sw2vmxjkc3611kpc728vhvi54zwb";
   };
 
   buildInputs = [gettext];
diff --git a/pkgs/tools/system/which/default.nix b/pkgs/tools/system/which/default.nix
index b6c35c4fbf12..7420cce0e543 100644
--- a/pkgs/tools/system/which/default.nix
+++ b/pkgs/tools/system/which/default.nix
@@ -1,8 +1,8 @@
 {stdenv, fetchurl, readline}: stdenv.mkDerivation {
-  name = "which-2.19";
+  name = "which-2.20";
   src = fetchurl {
-    url = mirror://gnu/which/which-2.19.tar.gz;
-    sha256 = "0lnd8mfpc0r1r2ch54vl3vc6r0fnzfl33sqdda2aq62iyrsbhybx";
+    url = mirror://gnu/which/which-2.20.tar.gz;
+    sha256 = "1y2p50zadb36izzh2zw4dm5hvdiydqf3qa88l8kav20dcmfbc5yl";
   };
 
   buildInputs = [readline];
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index b4f0d19878da..7f0aaa687951 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -480,6 +480,14 @@ let
     inherit fetchurl stdenv fuse;
   };
 
+  # It builds, but it has paths pointing to the default profile,
+  # hardcoded to /nix/var/nix/profiles/default/bin. We need to
+  # know its dependencies for the executable paths and stop
+  # using the profiles, pointing directly to the store paths needed.
+  #aircrackng = import ../tools/networking/aircrack-ng {
+  #  inherit fetchurl stdenv libpcap openssl zlib;
+  #};
+
   amule = import ../tools/networking/p2p/amule {
     inherit fetchurl stdenv zlib perl cryptopp gettext libupnp makeWrapper;
     wxGTK = wxGTK28;
@@ -921,6 +929,10 @@ let
     inherit fetchurl stdenv;
   };
 
+  kismet = import ../applications/networking/sniffers/kismet {
+    inherit fetchurl stdenv libpcap ncurses expat;
+  };
+
   ktorrent = import ../tools/networking/p2p/ktorrent {
     inherit fetchurl stdenv pkgconfig kdelibs
       xlibs zlib libpng libjpeg perl gmp;
@@ -1096,6 +1108,10 @@ let
     inherit (xlibs) libX11;
   };
 
+  /* WARNING: this version is unsuitable for using with a setuid wrapper */
+  ppp = builderDefsPackage (import ../tools/networking/ppp) {
+  };
+
   proxychains = import ../tools/networking/proxychains {
     inherit fetchurl stdenv;
   };
@@ -1155,6 +1171,10 @@ let
     inherit builderDefs readline;
   };
 
+  rpPPPoE = builderDefsPackage (import ../tools/networking/rp-pppoe) {
+    inherit ppp;
+  };
+
   rpm = import ../tools/package-management/rpm {
     inherit fetchurl stdenv cpio zlib bzip2 file sqlite beecrypt neon elfutils;
   };
@@ -1312,7 +1332,7 @@ let
     inherit (gtkLibs) glib;
   };
 
-  wget = composedArgsAndFun (selectVersion ../tools/networking/wget "1.11") {
+  wget = import ../tools/networking/wget {
     inherit fetchurl stdenv gettext;
   };
 
@@ -3038,7 +3058,7 @@ let
     inherit fetchurl stdenv;
   };
 
-  gtkLibs = recurseIntoAttrs gtkLibs212;
+  gtkLibs = recurseIntoAttrs gtkLibs214;
 
   gtkLibs1x = import ../development/libraries/gtk-libs/1.x {
     inherit fetchurl stdenv x11 libtiff libjpeg libpng;
@@ -8372,14 +8392,16 @@ let
   });
 
   fsg = import ../games/fsg {
-    inherit stdenv fetchurl pkgconfig;
+    inherit stdenv fetchurl pkgconfig mesa;
     inherit (gtkLibs) glib gtk;
+    inherit (xlibs) libX11 xproto;
     wxGTK = wxGTK28deps {unicode = false;};
   };
 
   fsgAltBuild = import ../games/fsg/alt-builder.nix {
-    inherit stdenv fetchurl;
+    inherit stdenv fetchurl mesa;
     wxGTK = wxGTK28deps {unicode = false;};
+    inherit (xlibs) libX11 xproto;
     stringsWithDeps = import ../lib/strings-with-deps.nix {
       inherit stdenv lib;
     };
@@ -8390,6 +8412,10 @@ let
     inherit fetchurl stdenv SDL openal freealut zlib libpng python;
   };
 
+  gnuchess = builderDefsPackage (import ../games/gnuchess) {
+    flex = flex2535;
+  };
+
   lincity = builderDefsPackage (import ../games/lincity) {
     inherit (xlibs) libX11 libXext xextproto
       libICE libSM xproto;
@@ -8463,6 +8489,12 @@ let
     inherit fetchurl stdenv xlibs mesa;
   };
 
+  xboard = builderDefsPackage (import ../games/xboard) {
+    inherit (xlibs) libX11 xproto libXt libXaw libSM 
+      libICE libXmu libXext;
+    inherit gnuchess;
+  };
+
   xsokoban = builderDefsPackage (import ../games/xsokoban) {
     inherit (xlibs) libX11 xproto libXpm libXt;
   };
diff --git a/pkgs/top-level/build-for-release.nix b/pkgs/top-level/build-for-release.nix
index 7922937bb904..e7cdaa0d8a05 100644
--- a/pkgs/top-level/build-for-release.nix
+++ b/pkgs/top-level/build-for-release.nix
@@ -162,7 +162,6 @@ let
       slim
       spidermonkey
       splashutils_13
-      splashutils_15
       ssmtp
       strace
       su
@@ -294,6 +293,7 @@ let
       pidgin
       postgresql_jdbc
       sdf
+      splashutils_15
       strategoxt
       strategoxtUtils
       syslinux