* Gnome 2.14.3.

* GTK updates.
* Removed the bzip2 hack.

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

23 files changed, 609 insertions, 676 deletions

diff --git a/pkgs/development/libraries/cairo/cairo-1.2.0.nix b/pkgs/development/libraries/cairo/cairo-1.2.0.nix
deleted file mode 100644
index d39570431bf..00000000000
--- a/pkgs/development/libraries/cairo/cairo-1.2.0.nix
+++ /dev/null
@@ -1,26 +0,0 @@
-{ postscriptSupport ? true
-, pdfSupport ? true
-, pngSupport ? true
-, stdenv, fetchurl, pkgconfig, x11, fontconfig, freetype
-, zlib, libpng
-}:
-
-assert postscriptSupport -> zlib != null;
-assert pngSupport -> libpng != null;
-
-stdenv.mkDerivation {
-  name = "cairo-1.2.0";
-  src = fetchurl {
-    url = http://cairographics.org/releases/cairo-1.2.0.tar.gz;
-    sha1 = "c5da7f89cdd3782102357f99a47f516d11661e92";
-  };
-  buildInputs = [
-    pkgconfig x11 fontconfig freetype
-    (if pngSupport then libpng else null)
-  ];
-  propagatedBuildInputs = [
-    (if postscriptSupport then zlib else null)
-  ];
-  configureFlags =
-    (if pdfSupport then ["--enable-pdf"] else []);
-}
diff --git a/pkgs/development/libraries/cairo/default.nix b/pkgs/development/libraries/cairo/default.nix
index 9ff86d6d579..5aa4d9a1387 100644
--- a/pkgs/development/libraries/cairo/default.nix
+++ b/pkgs/development/libraries/cairo/default.nix
@@ -9,10 +9,10 @@ assert postscriptSupport -> zlib != null;
 assert pngSupport -> libpng != null;
 
 stdenv.mkDerivation {
-  name = "cairo-1.0.4";
+  name = "cairo-1.2.2";
   src = fetchurl {
-    url = http://cairographics.org/releases/cairo-1.0.4.tar.gz;
-    sha1 = "89e72202e5b51a8914fce60f52f7c51ecdea982a";
+    url = http://cairographics.org/releases/cairo-1.2.2.tar.gz;
+    sha1 = "859b9ed4eaa200a03b9e41ccc45f3799742e6c5c";
   };
   buildInputs = [
     pkgconfig x11 fontconfig freetype
@@ -20,6 +20,7 @@ stdenv.mkDerivation {
   ];
   propagatedBuildInputs = [
     (if postscriptSupport then zlib else null)
+    (if pngSupport then libpng else null)
   ];
   configureFlags =
     (if pdfSupport then ["--enable-pdf"] else []);
diff --git a/pkgs/development/libraries/dclib/builder.sh b/pkgs/development/libraries/dclib/builder.sh
deleted file mode 100644
index 9c6bbf5b1f6..00000000000
--- a/pkgs/development/libraries/dclib/builder.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-addInputsHook=addBzip2
-addBzip2() {
-    bzip2=$(type -tP bzip2)
-    test -n $bzip2 || fail
-    buildInputs="$(dirname $(dirname $bzip2)) $buildInputs"
-}
-
-source $stdenv/setup
-
-genericBuild
diff --git a/pkgs/development/libraries/dclib/default.nix b/pkgs/development/libraries/dclib/default.nix
index a0cd9660d7c..17fa74fa6a5 100644
--- a/pkgs/development/libraries/dclib/default.nix
+++ b/pkgs/development/libraries/dclib/default.nix
@@ -1,13 +1,12 @@
-{stdenv, fetchurl, libxml2, openssl}:
+{stdenv, fetchurl, libxml2, openssl, bzip2}:
 
 stdenv.mkDerivation {
   name = "dclib-0.3.7";
-  builder = ./builder.sh;
 
   src = fetchurl {
     url = http://nix.cs.uu.nl/dist/tarballs/dclib-0.3.7.tar.bz2;
     md5 = "d35833414534bcac8ce2c8a62ce903a4";
   };
 
-  buildInputs = [libxml2 openssl];
+  buildInputs = [libxml2 openssl bzip2];
 }
diff --git a/pkgs/development/libraries/gnome/default.nix b/pkgs/development/libraries/gnome/default.nix
index 7bb2d55aa49..7fd05df73cd 100644
--- a/pkgs/development/libraries/gnome/default.nix
+++ b/pkgs/development/libraries/gnome/default.nix
@@ -3,15 +3,14 @@
 { stdenv, fetchurl, pkgconfig, audiofile
 , flex, bison, popt, perl, zlib, libxml2, libxslt
 , perlXMLParser, docbook_xml_dtd_42, gettext, x11, libtiff, libjpeg
-, libpng, gtkLibs, libXmu
+, libpng, gtkLibs, libXmu, bzip2
 }:
 
 rec {
 
   # Platform
 
-  #platform = (import ./src-gnome-platform-2.14.2.nix) {
-  platform = (import ./src-gnome-platform-2.10.1.nix) {
+  platform = (import ./src-gnome-platform-2.14.3.nix) {
     inherit fetchurl;
   };
 
@@ -52,7 +51,7 @@ rec {
 
   gnomevfs = (import ./gnome-vfs) {
     inherit fetchurl stdenv pkgconfig perl glib libxml2 GConf
-            libbonobo gnomemimedata popt perlXMLParser;
+            libbonobo gnomemimedata popt perlXMLParser gettext bzip2;
     input = platform.gnomevfs;
   };
 
@@ -64,7 +63,7 @@ rec {
 
   libgnome = (import ./libgnome) {
     inherit fetchurl stdenv pkgconfig perl perlXMLParser glib gnomevfs
-            libbonobo GConf popt zlib;
+            libbonobo GConf popt zlib esound;
     input = platform.libgnome;
   };
 
@@ -123,8 +122,7 @@ rec {
 
   # Desktop
 
-  #desktop = (import ./src-gnome-desktop-2.14.2.nix) {
-  desktop = (import ./src-gnome-desktop-2.10.1.nix) {
+  desktop = (import ./src-gnome-desktop-2.14.3.nix) {
     inherit fetchurl;
   };
 
diff --git a/pkgs/development/libraries/gnome/gnome-vfs/builder.sh b/pkgs/development/libraries/gnome/gnome-vfs/builder.sh
deleted file mode 100644
index 3c59b545b40..00000000000
--- a/pkgs/development/libraries/gnome/gnome-vfs/builder.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-addInputsHook=addBzip2
-addBzip2() {
-    bzip2=$(type -tP bzip2)
-    test -n $bzip2 || fail
-    buildInputs="$(dirname $(dirname $bzip2)) $buildInputs"
-}
-
-source $stdenv/setup
-
-genericBuild
\ No newline at end of file
diff --git a/pkgs/development/libraries/gnome/gnome-vfs/default.nix b/pkgs/development/libraries/gnome/gnome-vfs/default.nix
index cb119751f20..75f9ed77a85 100644
--- a/pkgs/development/libraries/gnome/gnome-vfs/default.nix
+++ b/pkgs/development/libraries/gnome/gnome-vfs/default.nix
@@ -1,5 +1,6 @@
-{input, stdenv, fetchurl, pkgconfig, perl, glib, libxml2, GConf
-, libbonobo, gnomemimedata, popt, perlXMLParser }:
+{ input, stdenv, fetchurl, pkgconfig, perl, glib, libxml2, GConf
+, libbonobo, gnomemimedata, popt, perlXMLParser, gettext, bzip2
+}:
 
 assert pkgconfig != null && perl != null && glib != null
   && libxml2 != null && GConf != null && libbonobo != null
@@ -7,10 +8,9 @@ assert pkgconfig != null && perl != null && glib != null
 
 stdenv.mkDerivation {
   inherit (input) name src;
-  builder = ./builder.sh;
   buildInputs = [
     pkgconfig perl glib libxml2 GConf libbonobo
-    gnomemimedata popt perlXMLParser
+    gnomemimedata popt perlXMLParser gettext bzip2
   ];
   patches = [./no-kerberos.patch];
 }
diff --git a/pkgs/development/libraries/gnome/libgnome/default.nix b/pkgs/development/libraries/gnome/libgnome/default.nix
index c49514d7026..dda72143bd3 100644
--- a/pkgs/development/libraries/gnome/libgnome/default.nix
+++ b/pkgs/development/libraries/gnome/libgnome/default.nix
@@ -1,9 +1,6 @@
 { input, stdenv, fetchurl, pkgconfig, perl, perlXMLParser, glib, gnomevfs, libbonobo
-, GConf, popt, zlib }:
-
-assert pkgconfig != null && perl != null && glib != null
-  && gnomevfs != null && libbonobo != null && GConf != null
-  && popt != null && zlib != null;
+, GConf, popt, zlib, esound
+}:
 
 # !!! TODO CHECK:
 # libgnome tries to install stuff into GConf (which fails):
@@ -12,6 +9,6 @@ assert pkgconfig != null && perl != null && glib != null
 
 stdenv.mkDerivation {
   inherit (input) name src;
-  buildInputs = [pkgconfig perl perlXMLParser popt zlib];
+  buildInputs = [pkgconfig perl perlXMLParser popt zlib esound];
   propagatedBuildInputs = [glib gnomevfs libbonobo GConf];
 }
diff --git a/pkgs/development/libraries/gnome/scrollkeeper/builder.sh b/pkgs/development/libraries/gnome/scrollkeeper/builder.sh
deleted file mode 100644
index d1d90a2dfdc..00000000000
--- a/pkgs/development/libraries/gnome/scrollkeeper/builder.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-source $stdenv/setup
-
-configureFlags="--with-xml-catalog=$docbook_xml_dtd_42/xml/dtd/docbook/docbook.cat"
-
-genericBuild
diff --git a/pkgs/development/libraries/gnome/scrollkeeper/default.nix b/pkgs/development/libraries/gnome/scrollkeeper/default.nix
index 49761ad2e11..ffdbe065912 100644
--- a/pkgs/development/libraries/gnome/scrollkeeper/default.nix
+++ b/pkgs/development/libraries/gnome/scrollkeeper/default.nix
@@ -6,6 +6,5 @@ stdenv.mkDerivation {
   inherit (input) name src;
   patches = [./xmlcatalog.patch];
   buildInputs = [pkgconfig perl perlXMLParser libxml2 libxslt];
-  inherit docbook_xml_dtd_42;
-  builder = ./builder.sh;
+  configureFlags = "--with-xml-catalog=${docbook_xml_dtd_42}/xml/dtd/docbook/docbook.cat";
 }
diff --git a/pkgs/development/libraries/gnome/src-gnome-desktop-2.14.2.nix b/pkgs/development/libraries/gnome/src-gnome-desktop-2.14.2.nix
deleted file mode 100644
index aac5eec3dcb..00000000000
--- a/pkgs/development/libraries/gnome/src-gnome-desktop-2.14.2.nix
+++ /dev/null
@@ -1,515 +0,0 @@
-# Note: this file was generated automatically by make-listing.sh!
-
-{fetchurl} : {
-  bugbuddy = {
-    name = "bug-buddy-2.14.0";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.14/2.14.2/sources/bug-buddy-2.14.0.tar.bz2;
-      md5 = "4fb288adc8f67cbfb8886ddf7b400530";
-    };
-  };
-  controlcenter = {
-    name = "control-center-2.14.2";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.14/2.14.2/sources/control-center-2.14.2.tar.bz2;
-      md5 = "08711b0f14584e7eaa9f4c275085ab36";
-    };
-  };
-  dasher = {
-    name = "dasher-4.0.2";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.14/2.14.2/sources/dasher-4.0.2.tar.bz2;
-      md5 = "47cf27594abb51ea97f3a8fdb276736d";
-    };
-  };
-  deskbarapplet = {
-    name = "deskbar-applet-2.14.2";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.14/2.14.2/sources/deskbar-applet-2.14.2.tar.bz2;
-      md5 = "382379d0c4ca4bd73f14b25d3a04b7cc";
-    };
-  };
-  eel = {
-    name = "eel-2.14.1";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.14/2.14.2/sources/eel-2.14.1.tar.bz2;
-      md5 = "7002f4f99317ed11da8b9db15b7e4a2b";
-    };
-  };
-  ekiga = {
-    name = "ekiga-2.0.1";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.14/2.14.2/sources/ekiga-2.0.1.tar.bz2;
-      md5 = "abf6c3351a64a7ed9028929ad5a17729";
-    };
-  };
-  eog = {
-    name = "eog-2.14.2";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.14/2.14.2/sources/eog-2.14.2.tar.bz2;
-      md5 = "7653ae35509bd799bccfa4e6d819882a";
-    };
-  };
-  epiphany = {
-    name = "epiphany-2.14.2.1";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.14/2.14.2/sources/epiphany-2.14.2.1.tar.bz2;
-      md5 = "872ef8d5e95cdc359f93b5ded501d98d";
-    };
-  };
-  evince = {
-    name = "evince-0.5.3";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.14/2.14.2/sources/evince-0.5.3.tar.bz2;
-      md5 = "94be73485eeb8584b4aeaa8ac87699f0";
-    };
-  };
-  evolution = {
-    name = "evolution-2.6.2";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.14/2.14.2/sources/evolution-2.6.2.tar.bz2;
-      md5 = "24b97cf70a3c1e9e34f6e328e6910ab1";
-    };
-  };
-  evolutiondataserver = {
-    name = "evolution-data-server-1.6.2";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.14/2.14.2/sources/evolution-data-server-1.6.2.tar.bz2;
-      md5 = "165f493eec8a2c8fc6eca3fdeb8c4885";
-    };
-  };
-  evolutionexchange = {
-    name = "evolution-exchange-2.6.2";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.14/2.14.2/sources/evolution-exchange-2.6.2.tar.bz2;
-      md5 = "8b36ac9d4d3682a1bb73bf37e2a959b3";
-    };
-  };
-  evolutionwebcal = {
-    name = "evolution-webcal-2.6.0";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.14/2.14.2/sources/evolution-webcal-2.6.0.tar.bz2;
-      md5 = "c779dcfc1db419f019abfcaafd6b8e4d";
-    };
-  };
-  fastuserswitchapplet = {
-    name = "fast-user-switch-applet-2.14.2";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.14/2.14.2/sources/fast-user-switch-applet-2.14.2.tar.bz2;
-      md5 = "590e51fbc9dfa7e33a337d36349cf040";
-    };
-  };
-  fileroller = {
-    name = "file-roller-2.14.3";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.14/2.14.2/sources/file-roller-2.14.3.tar.bz2;
-      md5 = "11a11675a9ec5f8b0164713fc60894af";
-    };
-  };
-  gcalctool = {
-    name = "gcalctool-5.8.13";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.14/2.14.2/sources/gcalctool-5.8.13.tar.bz2;
-      md5 = "6807694b49801413be3aa9a3198f4363";
-    };
-  };
-  gconfeditor = {
-    name = "gconf-editor-2.14.0";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.14/2.14.2/sources/gconf-editor-2.14.0.tar.bz2;
-      md5 = "eb8b979464f6e383e5a27b57ee4e8382";
-    };
-  };
-  gdm = {
-    name = "gdm-2.14.7";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.14/2.14.2/sources/gdm-2.14.7.tar.bz2;
-      md5 = "0ad3cb1eefd6fe216a3e2f0f7cd8944f";
-    };
-  };
-  gedit = {
-    name = "gedit-2.14.3";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.14/2.14.2/sources/gedit-2.14.3.tar.bz2;
-      md5 = "114abc77de4e9720503b9146c48d6133";
-    };
-  };
-  gnomeapplets = {
-    name = "gnome-applets-2.14.2";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.14/2.14.2/sources/gnome-applets-2.14.2.tar.bz2;
-      md5 = "e6da539e78da1256b9a9bee1301fd44f";
-    };
-  };
-  gnomebackgrounds = {
-    name = "gnome-backgrounds-2.14.2.1";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.14/2.14.2/sources/gnome-backgrounds-2.14.2.1.tar.bz2;
-      md5 = "10480df7c2e5a08c920c5b0a2ff4f161";
-    };
-  };
-  gnomedesktop = {
-    name = "gnome-desktop-2.14.2";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.14/2.14.2/sources/gnome-desktop-2.14.2.tar.bz2;
-      md5 = "9c252124a80453d47377664b31159590";
-    };
-  };
-  gnomedocutils = {
-    name = "gnome-doc-utils-0.6.0";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.14/2.14.2/sources/gnome-doc-utils-0.6.0.tar.bz2;
-      md5 = "1e0c26e3e1159f60551aab5187634744";
-    };
-  };
-  gnomegames = {
-    name = "gnome-games-2.14.2";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.14/2.14.2/sources/gnome-games-2.14.2.tar.bz2;
-      md5 = "45916c97dab20631f22291ff9ab05319";
-    };
-  };
-  gnomeicontheme = {
-    name = "gnome-icon-theme-2.14.2";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.14/2.14.2/sources/gnome-icon-theme-2.14.2.tar.bz2;
-      md5 = "6f1d33a297bd27e0e9f4c1a5fa956166";
-    };
-  };
-  gnomekeyring = {
-    name = "gnome-keyring-0.4.9";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.14/2.14.2/sources/gnome-keyring-0.4.9.tar.bz2;
-      md5 = "9a90820acf11a66e4c3dd9e163231071";
-    };
-  };
-  gnomekeyringmanager = {
-    name = "gnome-keyring-manager-2.14.0";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.14/2.14.2/sources/gnome-keyring-manager-2.14.0.tar.bz2;
-      md5 = "d4e38c7b7da99885fa898917e10d8aeb";
-    };
-  };
-  gnomemag = {
-    name = "gnome-mag-0.12.5";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.14/2.14.2/sources/gnome-mag-0.12.5.tar.bz2;
-      md5 = "5872f8f5f985cc476f1ea8adf0e4518d";
-    };
-  };
-  gnomemedia = {
-    name = "gnome-media-2.14.2";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.14/2.14.2/sources/gnome-media-2.14.2.tar.bz2;
-      md5 = "16c35916f429c5ea04fb942b4072643b";
-    };
-  };
-  gnomemenus = {
-    name = "gnome-menus-2.14.0";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.14/2.14.2/sources/gnome-menus-2.14.0.tar.bz2;
-      md5 = "7aa0c08fc8b9caabb4be46e1cfb595fc";
-    };
-  };
-  gnomenetstatus = {
-    name = "gnome-netstatus-2.12.0";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.14/2.14.2/sources/gnome-netstatus-2.12.0.tar.bz2;
-      md5 = "a5f23731a3bf232969e82afef8792a36";
-    };
-  };
-  gnomenettool = {
-    name = "gnome-nettool-2.14.2";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.14/2.14.2/sources/gnome-nettool-2.14.2.tar.bz2;
-      md5 = "0efb13f0145abe46b26a00c75473a00f";
-    };
-  };
-  gnomepanel = {
-    name = "gnome-panel-2.14.2";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.14/2.14.2/sources/gnome-panel-2.14.2.tar.bz2;
-      md5 = "7db1afb3f6cbca12acecc49c68b4a655";
-    };
-  };
-  gnomepythondesktop = {
-    name = "gnome-python-desktop-2.14.0";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.14/2.14.2/sources/gnome-python-desktop-2.14.0.tar.bz2;
-      md5 = "d3f9c2d213b7d486ca7bd87dd106ca69";
-    };
-  };
-  gnomescreensaver = {
-    name = "gnome-screensaver-2.14.2";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.14/2.14.2/sources/gnome-screensaver-2.14.2.tar.bz2;
-      md5 = "f76677180432a89ac46a8507fe34b45a";
-    };
-  };
-  gnomesession = {
-    name = "gnome-session-2.14.2";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.14/2.14.2/sources/gnome-session-2.14.2.tar.bz2;
-      md5 = "191dc3a18eb37aca391914b404cf1cd7";
-    };
-  };
-  gnomespeech = {
-    name = "gnome-speech-0.4.0";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.14/2.14.2/sources/gnome-speech-0.4.0.tar.bz2;
-      md5 = "c27f3eb262b8a66a756872d25c716517";
-    };
-  };
-  gnomesystemmonitor = {
-    name = "gnome-system-monitor-2.14.3";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.14/2.14.2/sources/gnome-system-monitor-2.14.3.tar.bz2;
-      md5 = "8d690176629b8b2b3e4d4f93d98d57f0";
-    };
-  };
-  gnomesystemtools = {
-    name = "gnome-system-tools-2.14.0";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.14/2.14.2/sources/gnome-system-tools-2.14.0.tar.bz2;
-      md5 = "3aded3a37f4f5b4962bf253d25cebea1";
-    };
-  };
-  gnometerminal = {
-    name = "gnome-terminal-2.14.2";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.14/2.14.2/sources/gnome-terminal-2.14.2.tar.bz2;
-      md5 = "da80071cd707e89cedcfb476cab8b39a";
-    };
-  };
-  gnomethemes = {
-    name = "gnome-themes-2.14.2";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.14/2.14.2/sources/gnome-themes-2.14.2.tar.bz2;
-      md5 = "aa369e130f9fc3b8fd0fd4481766a56c";
-    };
-  };
-  gnomeuserdocs = {
-    name = "gnome-user-docs-2.14.2";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.14/2.14.2/sources/gnome-user-docs-2.14.2.tar.bz2;
-      md5 = "4f5a7114ccf9e4e31137da50b7333570";
-    };
-  };
-  gnomeutils = {
-    name = "gnome-utils-2.14.0";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.14/2.14.2/sources/gnome-utils-2.14.0.tar.bz2;
-      md5 = "d1d16ff6bfc1f6ddc110d18ec4dfdbfa";
-    };
-  };
-  gnomevolumemanager = {
-    name = "gnome-volume-manager-1.5.15";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.14/2.14.2/sources/gnome-volume-manager-1.5.15.tar.bz2;
-      md5 = "0bf3ee007c951a5d833a3c17bbe59ec6";
-    };
-  };
-  gnopernicus = {
-    name = "gnopernicus-1.1.0";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.14/2.14.2/sources/gnopernicus-1.1.0.tar.bz2;
-      md5 = "b55b345f765673205a87e251874afba3";
-    };
-  };
-  gok = {
-    name = "gok-1.0.10";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.14/2.14.2/sources/gok-1.0.10.tar.bz2;
-      md5 = "de6cceaca780e7ad0702c4b3c0fd8d1f";
-    };
-  };
-  gstpluginsbase = {
-    name = "gst-plugins-base-0.10.7";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.14/2.14.2/sources/gst-plugins-base-0.10.7.tar.bz2;
-      md5 = "d66b09de993aefd22d8fc341e5f50521";
-    };
-  };
-  gstpluginsgood = {
-    name = "gst-plugins-good-0.10.3";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.14/2.14.2/sources/gst-plugins-good-0.10.3.tar.bz2;
-      md5 = "2b59bce477349628ee549c2ce1d80a3a";
-    };
-  };
-  gstreamer = {
-    name = "gstreamer-0.10.6";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.14/2.14.2/sources/gstreamer-0.10.6.tar.bz2;
-      md5 = "ca7513efcca608a42836fd54b70a5814";
-    };
-  };
-  gtkengines = {
-    name = "gtk-engines-2.6.9";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.14/2.14.2/sources/gtk-engines-2.6.9.tar.bz2;
-      md5 = "77fb084b60efa8dd4fcfc0fc24882cd1";
-    };
-  };
-  gtkhtml = {
-    name = "gtkhtml-3.10.2";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.14/2.14.2/sources/gtkhtml-3.10.2.tar.bz2;
-      md5 = "4fe10da72b4ac578401ceffcce03ceed";
-    };
-  };
-  gtksourceview = {
-    name = "gtksourceview-1.6.1";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.14/2.14.2/sources/gtksourceview-1.6.1.tar.bz2;
-      md5 = "f8ca3a1a746477b2b46de7ebea276db5";
-    };
-  };
-  gucharmap = {
-    name = "gucharmap-1.6.0";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.14/2.14.2/sources/gucharmap-1.6.0.tar.bz2;
-      md5 = "8af03f350c988d1565922b10776bc725";
-    };
-  };
-  libgailgnome = {
-    name = "libgail-gnome-1.1.3";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.14/2.14.2/sources/libgail-gnome-1.1.3.tar.bz2;
-      md5 = "1d12c5375b3404f4f20b214b763e5225";
-    };
-  };
-  libgnomeprint = {
-    name = "libgnomeprint-2.12.1";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.14/2.14.2/sources/libgnomeprint-2.12.1.tar.bz2;
-      md5 = "ea729d4968fe2169c84efb12ace5f6cc";
-    };
-  };
-  libgnomeprintui = {
-    name = "libgnomeprintui-2.12.1";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.14/2.14.2/sources/libgnomeprintui-2.12.1.tar.bz2;
-      md5 = "fa0b0410c3ba8b6899c5ed278f02cbe5";
-    };
-  };
-  libgtop = {
-    name = "libgtop-2.14.1";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.14/2.14.2/sources/libgtop-2.14.1.tar.bz2;
-      md5 = "59cc661ae518fcae158517cc029b2add";
-    };
-  };
-  librsvg = {
-    name = "librsvg-2.14.4";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.14/2.14.2/sources/librsvg-2.14.4.tar.bz2;
-      md5 = "945617bb094975d7353a3852302297c1";
-    };
-  };
-  libsoup = {
-    name = "libsoup-2.2.93";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.14/2.14.2/sources/libsoup-2.2.93.tar.bz2;
-      md5 = "08f9c570a4331778da95c0bc317f6bf4";
-    };
-  };
-  libwnck = {
-    name = "libwnck-2.14.2";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.14/2.14.2/sources/libwnck-2.14.2.tar.bz2;
-      md5 = "df5c7a764e81a7214d493194ee394918";
-    };
-  };
-  libxklavier = {
-    name = "libxklavier-2.2";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.14/2.14.2/sources/libxklavier-2.2.tar.bz2;
-      md5 = "1c53646f35d77564f42d3f4342cd443f";
-    };
-  };
-  metacity = {
-    name = "metacity-2.14.3";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.14/2.14.2/sources/metacity-2.14.3.tar.bz2;
-      md5 = "57c0bc3cf4103097e126df892ecc1d58";
-    };
-  };
-  nautilus = {
-    name = "nautilus-2.14.1";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.14/2.14.2/sources/nautilus-2.14.1.tar.bz2;
-      md5 = "d8bad8b9141bc823c612abb7d460b725";
-    };
-  };
-  nautiluscdburner = {
-    name = "nautilus-cd-burner-2.14.2";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.14/2.14.2/sources/nautilus-cd-burner-2.14.2.tar.bz2;
-      md5 = "5e85fc810f6160916fac26caa805cc65";
-    };
-  };
-  scrollkeeper = {
-    name = "scrollkeeper-0.3.14";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.14/2.14.2/sources/scrollkeeper-0.3.14.tar.bz2;
-      md5 = "b175e582a6cec3e50a9de73a5bb7455a";
-    };
-  };
-  soundjuicer = {
-    name = "sound-juicer-2.14.4";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.14/2.14.2/sources/sound-juicer-2.14.4.tar.bz2;
-      md5 = "677ed6e3e7b4aa1602d35c46a8e0bc31";
-    };
-  };
-  startupnotification = {
-    name = "startup-notification-0.8";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.14/2.14.2/sources/startup-notification-0.8.tar.bz2;
-      md5 = "d9b2e9fba18843314ae42334ceb4336d";
-    };
-  };
-  systemtoolsbackends = {
-    name = "system-tools-backends-1.4.2";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.14/2.14.2/sources/system-tools-backends-1.4.2.tar.bz2;
-      md5 = "a0af1513becdf3b9bfed3535ad8f7dab";
-    };
-  };
-  totem = {
-    name = "totem-1.4.1";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.14/2.14.2/sources/totem-1.4.1.tar.bz2;
-      md5 = "6788b83f7889f61eef5922f4daecd859";
-    };
-  };
-  vino = {
-    name = "vino-2.13.5";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.14/2.14.2/sources/vino-2.13.5.tar.bz2;
-      md5 = "9bc8c3f0e639fdc7b9ed023501308359";
-    };
-  };
-  vte = {
-    name = "vte-0.12.2";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.14/2.14.2/sources/vte-0.12.2.tar.bz2;
-      md5 = "7cb1bd6ca528bc4db5ec685549fd3eb1";
-    };
-  };
-  yelp = {
-    name = "yelp-2.14.2";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.14/2.14.2/sources/yelp-2.14.2.tar.bz2;
-      md5 = "4294fe3b01824675bd8be9d7936dcaa7";
-    };
-  };
-  zenity = {
-    name = "zenity-2.14.2";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.14/2.14.2/sources/zenity-2.14.2.tar.bz2;
-      md5 = "35fe28593effb339e0a6b152eb8050bf";
-    };
-  };
-}
diff --git a/pkgs/development/libraries/gnome/src-gnome-desktop-2.14.3.nix b/pkgs/development/libraries/gnome/src-gnome-desktop-2.14.3.nix
new file mode 100644
index 00000000000..10777092f79
--- /dev/null
+++ b/pkgs/development/libraries/gnome/src-gnome-desktop-2.14.3.nix
@@ -0,0 +1,515 @@
+# Note: this file was generated automatically by make-listing.sh!
+
+{fetchurl} : {
+  bugbuddy = {
+    name = "bug-buddy-2.14.0";
+    src = fetchurl {
+      url = http://ftp.gnome.org/pub/GNOME/desktop/2.14/2.14.3/sources/bug-buddy-2.14.0.tar.bz2;
+      md5 = "4fb288adc8f67cbfb8886ddf7b400530";
+    };
+  };
+  controlcenter = {
+    name = "control-center-2.14.2";
+    src = fetchurl {
+      url = http://ftp.gnome.org/pub/GNOME/desktop/2.14/2.14.3/sources/control-center-2.14.2.tar.bz2;
+      md5 = "08711b0f14584e7eaa9f4c275085ab36";
+    };
+  };
+  dasher = {
+    name = "dasher-4.0.4";
+    src = fetchurl {
+      url = http://ftp.gnome.org/pub/GNOME/desktop/2.14/2.14.3/sources/dasher-4.0.4.tar.bz2;
+      md5 = "6ab865403d29d9d3714e85840ed89dc7";
+    };
+  };
+  deskbarapplet = {
+    name = "deskbar-applet-2.14.2";
+    src = fetchurl {
+      url = http://ftp.gnome.org/pub/GNOME/desktop/2.14/2.14.3/sources/deskbar-applet-2.14.2.tar.bz2;
+      md5 = "382379d0c4ca4bd73f14b25d3a04b7cc";
+    };
+  };
+  eel = {
+    name = "eel-2.14.3";
+    src = fetchurl {
+      url = http://ftp.gnome.org/pub/GNOME/desktop/2.14/2.14.3/sources/eel-2.14.3.tar.bz2;
+      md5 = "cdff898f9a054b35f5e3b7c0142cc2a5";
+    };
+  };
+  ekiga = {
+    name = "ekiga-2.0.2";
+    src = fetchurl {
+      url = http://ftp.gnome.org/pub/GNOME/desktop/2.14/2.14.3/sources/ekiga-2.0.2.tar.bz2;
+      md5 = "d593da6ac49dce495ef4c6ada06b54b6";
+    };
+  };
+  eog = {
+    name = "eog-2.14.3";
+    src = fetchurl {
+      url = http://ftp.gnome.org/pub/GNOME/desktop/2.14/2.14.3/sources/eog-2.14.3.tar.bz2;
+      md5 = "e90e4c1e314cfab04414464088098a16";
+    };
+  };
+  epiphany = {
+    name = "epiphany-2.14.2.1";
+    src = fetchurl {
+      url = http://ftp.gnome.org/pub/GNOME/desktop/2.14/2.14.3/sources/epiphany-2.14.2.1.tar.bz2;
+      md5 = "872ef8d5e95cdc359f93b5ded501d98d";
+    };
+  };
+  evince = {
+    name = "evince-0.5.2";
+    src = fetchurl {
+      url = http://ftp.gnome.org/pub/GNOME/desktop/2.14/2.14.3/sources/evince-0.5.2.tar.bz2;
+      md5 = "732df368435cebddd4cc8132a8a280bd";
+    };
+  };
+  evolution = {
+    name = "evolution-2.6.3";
+    src = fetchurl {
+      url = http://ftp.gnome.org/pub/GNOME/desktop/2.14/2.14.3/sources/evolution-2.6.3.tar.bz2;
+      md5 = "d7db71aaff2764f03083e6ce74c8ebde";
+    };
+  };
+  evolutiondataserver = {
+    name = "evolution-data-server-1.6.3";
+    src = fetchurl {
+      url = http://ftp.gnome.org/pub/GNOME/desktop/2.14/2.14.3/sources/evolution-data-server-1.6.3.tar.bz2;
+      md5 = "e40343fa6a80916da3f4d1ba5d118c89";
+    };
+  };
+  evolutionexchange = {
+    name = "evolution-exchange-2.6.3";
+    src = fetchurl {
+      url = http://ftp.gnome.org/pub/GNOME/desktop/2.14/2.14.3/sources/evolution-exchange-2.6.3.tar.bz2;
+      md5 = "c98c41db650707fb394e3a8b0cef019b";
+    };
+  };
+  evolutionwebcal = {
+    name = "evolution-webcal-2.6.0";
+    src = fetchurl {
+      url = http://ftp.gnome.org/pub/GNOME/desktop/2.14/2.14.3/sources/evolution-webcal-2.6.0.tar.bz2;
+      md5 = "c779dcfc1db419f019abfcaafd6b8e4d";
+    };
+  };
+  fastuserswitchapplet = {
+    name = "fast-user-switch-applet-2.14.2";
+    src = fetchurl {
+      url = http://ftp.gnome.org/pub/GNOME/desktop/2.14/2.14.3/sources/fast-user-switch-applet-2.14.2.tar.bz2;
+      md5 = "590e51fbc9dfa7e33a337d36349cf040";
+    };
+  };
+  fileroller = {
+    name = "file-roller-2.14.4";
+    src = fetchurl {
+      url = http://ftp.gnome.org/pub/GNOME/desktop/2.14/2.14.3/sources/file-roller-2.14.4.tar.bz2;
+      md5 = "e86c78b3ecc90af20cf66511f4622c5c";
+    };
+  };
+  gcalctool = {
+    name = "gcalctool-5.8.19";
+    src = fetchurl {
+      url = http://ftp.gnome.org/pub/GNOME/desktop/2.14/2.14.3/sources/gcalctool-5.8.19.tar.bz2;
+      md5 = "9fbf0f2552f6fd1a0fadf54a2125fef2";
+    };
+  };
+  gconfeditor = {
+    name = "gconf-editor-2.14.0";
+    src = fetchurl {
+      url = http://ftp.gnome.org/pub/GNOME/desktop/2.14/2.14.3/sources/gconf-editor-2.14.0.tar.bz2;
+      md5 = "eb8b979464f6e383e5a27b57ee4e8382";
+    };
+  };
+  gdm = {
+    name = "gdm-2.14.10";
+    src = fetchurl {
+      url = http://ftp.gnome.org/pub/GNOME/desktop/2.14/2.14.3/sources/gdm-2.14.10.tar.bz2;
+      md5 = "e880558dc3574f804f3abca869992a4f";
+    };
+  };
+  gedit = {
+    name = "gedit-2.14.4";
+    src = fetchurl {
+      url = http://ftp.gnome.org/pub/GNOME/desktop/2.14/2.14.3/sources/gedit-2.14.4.tar.bz2;
+      md5 = "189d4d9128eca1162a782744cb324aea";
+    };
+  };
+  gnomeapplets = {
+    name = "gnome-applets-2.14.3";
+    src = fetchurl {
+      url = http://ftp.gnome.org/pub/GNOME/desktop/2.14/2.14.3/sources/gnome-applets-2.14.3.tar.bz2;
+      md5 = "ab96f071db993461533cb740281a7373";
+    };
+  };
+  gnomebackgrounds = {
+    name = "gnome-backgrounds-2.14.2.1";
+    src = fetchurl {
+      url = http://ftp.gnome.org/pub/GNOME/desktop/2.14/2.14.3/sources/gnome-backgrounds-2.14.2.1.tar.bz2;
+      md5 = "10480df7c2e5a08c920c5b0a2ff4f161";
+    };
+  };
+  gnomedesktop = {
+    name = "gnome-desktop-2.14.3";
+    src = fetchurl {
+      url = http://ftp.gnome.org/pub/GNOME/desktop/2.14/2.14.3/sources/gnome-desktop-2.14.3.tar.bz2;
+      md5 = "2a8547ab0dcb10a1ad297874ae95b06b";
+    };
+  };
+  gnomedocutils = {
+    name = "gnome-doc-utils-0.6.1";
+    src = fetchurl {
+      url = http://ftp.gnome.org/pub/GNOME/desktop/2.14/2.14.3/sources/gnome-doc-utils-0.6.1.tar.bz2;
+      md5 = "c706b807b15e07e58561f903c0f20c26";
+    };
+  };
+  gnomegames = {
+    name = "gnome-games-2.14.3";
+    src = fetchurl {
+      url = http://ftp.gnome.org/pub/GNOME/desktop/2.14/2.14.3/sources/gnome-games-2.14.3.tar.bz2;
+      md5 = "20f7c2e0ee4a65d15733332f34ac3cd4";
+    };
+  };
+  gnomeicontheme = {
+    name = "gnome-icon-theme-2.14.2";
+    src = fetchurl {
+      url = http://ftp.gnome.org/pub/GNOME/desktop/2.14/2.14.3/sources/gnome-icon-theme-2.14.2.tar.bz2;
+      md5 = "6f1d33a297bd27e0e9f4c1a5fa956166";
+    };
+  };
+  gnomekeyring = {
+    name = "gnome-keyring-0.4.9";
+    src = fetchurl {
+      url = http://ftp.gnome.org/pub/GNOME/desktop/2.14/2.14.3/sources/gnome-keyring-0.4.9.tar.bz2;
+      md5 = "9a90820acf11a66e4c3dd9e163231071";
+    };
+  };
+  gnomekeyringmanager = {
+    name = "gnome-keyring-manager-2.14.0";
+    src = fetchurl {
+      url = http://ftp.gnome.org/pub/GNOME/desktop/2.14/2.14.3/sources/gnome-keyring-manager-2.14.0.tar.bz2;
+      md5 = "d4e38c7b7da99885fa898917e10d8aeb";
+    };
+  };
+  gnomemag = {
+    name = "gnome-mag-0.12.6";
+    src = fetchurl {
+      url = http://ftp.gnome.org/pub/GNOME/desktop/2.14/2.14.3/sources/gnome-mag-0.12.6.tar.bz2;
+      md5 = "c402b06408d3b40843720ae09ad74234";
+    };
+  };
+  gnomemedia = {
+    name = "gnome-media-2.14.2";
+    src = fetchurl {
+      url = http://ftp.gnome.org/pub/GNOME/desktop/2.14/2.14.3/sources/gnome-media-2.14.2.tar.bz2;
+      md5 = "16c35916f429c5ea04fb942b4072643b";
+    };
+  };
+  gnomemenus = {
+    name = "gnome-menus-2.14.3";
+    src = fetchurl {
+      url = http://ftp.gnome.org/pub/GNOME/desktop/2.14/2.14.3/sources/gnome-menus-2.14.3.tar.bz2;
+      md5 = "9926e7ad14255d1a08c7e774052f8a3a";
+    };
+  };
+  gnomenetstatus = {
+    name = "gnome-netstatus-2.12.0";
+    src = fetchurl {
+      url = http://ftp.gnome.org/pub/GNOME/desktop/2.14/2.14.3/sources/gnome-netstatus-2.12.0.tar.bz2;
+      md5 = "a5f23731a3bf232969e82afef8792a36";
+    };
+  };
+  gnomenettool = {
+    name = "gnome-nettool-2.14.2";
+    src = fetchurl {
+      url = http://ftp.gnome.org/pub/GNOME/desktop/2.14/2.14.3/sources/gnome-nettool-2.14.2.tar.bz2;
+      md5 = "0efb13f0145abe46b26a00c75473a00f";
+    };
+  };
+  gnomepanel = {
+    name = "gnome-panel-2.14.3";
+    src = fetchurl {
+      url = http://ftp.gnome.org/pub/GNOME/desktop/2.14/2.14.3/sources/gnome-panel-2.14.3.tar.bz2;
+      md5 = "14ab4c3d3ff3d0c1be397b6799a8626c";
+    };
+  };
+  gnomepythondesktop = {
+    name = "gnome-python-desktop-2.14.0";
+    src = fetchurl {
+      url = http://ftp.gnome.org/pub/GNOME/desktop/2.14/2.14.3/sources/gnome-python-desktop-2.14.0.tar.bz2;
+      md5 = "d3f9c2d213b7d486ca7bd87dd106ca69";
+    };
+  };
+  gnomescreensaver = {
+    name = "gnome-screensaver-2.14.3";
+    src = fetchurl {
+      url = http://ftp.gnome.org/pub/GNOME/desktop/2.14/2.14.3/sources/gnome-screensaver-2.14.3.tar.bz2;
+      md5 = "2ed0b9322d284bb1739e037165ca94f2";
+    };
+  };
+  gnomesession = {
+    name = "gnome-session-2.14.3";
+    src = fetchurl {
+      url = http://ftp.gnome.org/pub/GNOME/desktop/2.14/2.14.3/sources/gnome-session-2.14.3.tar.bz2;
+      md5 = "34eb4641e2791ae51acf6f1edfcf3d64";
+    };
+  };
+  gnomespeech = {
+    name = "gnome-speech-0.4.2";
+    src = fetchurl {
+      url = http://ftp.gnome.org/pub/GNOME/desktop/2.14/2.14.3/sources/gnome-speech-0.4.2.tar.bz2;
+      md5 = "df06441a5b560830264c0557e3d3c376";
+    };
+  };
+  gnomesystemmonitor = {
+    name = "gnome-system-monitor-2.14.5";
+    src = fetchurl {
+      url = http://ftp.gnome.org/pub/GNOME/desktop/2.14/2.14.3/sources/gnome-system-monitor-2.14.5.tar.bz2;
+      md5 = "1220837542f9c1905ebf3af69a608b07";
+    };
+  };
+  gnomesystemtools = {
+    name = "gnome-system-tools-2.14.0";
+    src = fetchurl {
+      url = http://ftp.gnome.org/pub/GNOME/desktop/2.14/2.14.3/sources/gnome-system-tools-2.14.0.tar.bz2;
+      md5 = "3aded3a37f4f5b4962bf253d25cebea1";
+    };
+  };
+  gnometerminal = {
+    name = "gnome-terminal-2.14.2";
+    src = fetchurl {
+      url = http://ftp.gnome.org/pub/GNOME/desktop/2.14/2.14.3/sources/gnome-terminal-2.14.2.tar.bz2;
+      md5 = "da80071cd707e89cedcfb476cab8b39a";
+    };
+  };
+  gnomethemes = {
+    name = "gnome-themes-2.14.3";
+    src = fetchurl {
+      url = http://ftp.gnome.org/pub/GNOME/desktop/2.14/2.14.3/sources/gnome-themes-2.14.3.tar.bz2;
+      md5 = "7c07c4c01404b447f2624e8e400ee787";
+    };
+  };
+  gnomeuserdocs = {
+    name = "gnome-user-docs-2.14.2";
+    src = fetchurl {
+      url = http://ftp.gnome.org/pub/GNOME/desktop/2.14/2.14.3/sources/gnome-user-docs-2.14.2.tar.bz2;
+      md5 = "4f5a7114ccf9e4e31137da50b7333570";
+    };
+  };
+  gnomeutils = {
+    name = "gnome-utils-2.14.0";
+    src = fetchurl {
+      url = http://ftp.gnome.org/pub/GNOME/desktop/2.14/2.14.3/sources/gnome-utils-2.14.0.tar.bz2;
+      md5 = "d1d16ff6bfc1f6ddc110d18ec4dfdbfa";
+    };
+  };
+  gnomevolumemanager = {
+    name = "gnome-volume-manager-1.5.15";
+    src = fetchurl {
+      url = http://ftp.gnome.org/pub/GNOME/desktop/2.14/2.14.3/sources/gnome-volume-manager-1.5.15.tar.bz2;
+      md5 = "0bf3ee007c951a5d833a3c17bbe59ec6";
+    };
+  };
+  gnopernicus = {
+    name = "gnopernicus-1.1.1";
+    src = fetchurl {
+      url = http://ftp.gnome.org/pub/GNOME/desktop/2.14/2.14.3/sources/gnopernicus-1.1.1.tar.bz2;
+      md5 = "e691c408de4ca885a3589a0b6fa297be";
+    };
+  };
+  gok = {
+    name = "gok-1.0.10";
+    src = fetchurl {
+      url = http://ftp.gnome.org/pub/GNOME/desktop/2.14/2.14.3/sources/gok-1.0.10.tar.bz2;
+      md5 = "de6cceaca780e7ad0702c4b3c0fd8d1f";
+    };
+  };
+  gstpluginsbase = {
+    name = "gst-plugins-base-0.10.7";
+    src = fetchurl {
+      url = http://ftp.gnome.org/pub/GNOME/desktop/2.14/2.14.3/sources/gst-plugins-base-0.10.7.tar.bz2;
+      md5 = "d66b09de993aefd22d8fc341e5f50521";
+    };
+  };
+  gstpluginsgood = {
+    name = "gst-plugins-good-0.10.3";
+    src = fetchurl {
+      url = http://ftp.gnome.org/pub/GNOME/desktop/2.14/2.14.3/sources/gst-plugins-good-0.10.3.tar.bz2;
+      md5 = "2b59bce477349628ee549c2ce1d80a3a";
+    };
+  };
+  gstreamer = {
+    name = "gstreamer-0.10.8";
+    src = fetchurl {
+      url = http://ftp.gnome.org/pub/GNOME/desktop/2.14/2.14.3/sources/gstreamer-0.10.8.tar.bz2;
+      md5 = "a094ea86d4cea4f23ef2eb8c6e7bfc10";
+    };
+  };
+  gtkengines = {
+    name = "gtk-engines-2.6.10";
+    src = fetchurl {
+      url = http://ftp.gnome.org/pub/GNOME/desktop/2.14/2.14.3/sources/gtk-engines-2.6.10.tar.bz2;
+      md5 = "f3e2b14b0cff0988277ccba42e69813d";
+    };
+  };
+  gtkhtml = {
+    name = "gtkhtml-3.10.3";
+    src = fetchurl {
+      url = http://ftp.gnome.org/pub/GNOME/desktop/2.14/2.14.3/sources/gtkhtml-3.10.3.tar.bz2;
+      md5 = "90b1807db0ef0e5d69442e1f85610ec4";
+    };
+  };
+  gtksourceview = {
+    name = "gtksourceview-1.6.2";
+    src = fetchurl {
+      url = http://ftp.gnome.org/pub/GNOME/desktop/2.14/2.14.3/sources/gtksourceview-1.6.2.tar.bz2;
+      md5 = "57f4ee84f0c494fd943c7badb0a68785";
+    };
+  };
+  gucharmap = {
+    name = "gucharmap-1.6.0";
+    src = fetchurl {
+      url = http://ftp.gnome.org/pub/GNOME/desktop/2.14/2.14.3/sources/gucharmap-1.6.0.tar.bz2;
+      md5 = "8af03f350c988d1565922b10776bc725";
+    };
+  };
+  libgailgnome = {
+    name = "libgail-gnome-1.1.3";
+    src = fetchurl {
+      url = http://ftp.gnome.org/pub/GNOME/desktop/2.14/2.14.3/sources/libgail-gnome-1.1.3.tar.bz2;
+      md5 = "1d12c5375b3404f4f20b214b763e5225";
+    };
+  };
+  libgnomeprint = {
+    name = "libgnomeprint-2.12.1";
+    src = fetchurl {
+      url = http://ftp.gnome.org/pub/GNOME/desktop/2.14/2.14.3/sources/libgnomeprint-2.12.1.tar.bz2;
+      md5 = "ea729d4968fe2169c84efb12ace5f6cc";
+    };
+  };
+  libgnomeprintui = {
+    name = "libgnomeprintui-2.12.1";
+    src = fetchurl {
+      url = http://ftp.gnome.org/pub/GNOME/desktop/2.14/2.14.3/sources/libgnomeprintui-2.12.1.tar.bz2;
+      md5 = "fa0b0410c3ba8b6899c5ed278f02cbe5";
+    };
+  };
+  libgtop = {
+    name = "libgtop-2.14.2";
+    src = fetchurl {
+      url = http://ftp.gnome.org/pub/GNOME/desktop/2.14/2.14.3/sources/libgtop-2.14.2.tar.bz2;
+      md5 = "adcc07c6d1c115c6d275a3c9bb1f3b68";
+    };
+  };
+  librsvg = {
+    name = "librsvg-2.14.4";
+    src = fetchurl {
+      url = http://ftp.gnome.org/pub/GNOME/desktop/2.14/2.14.3/sources/librsvg-2.14.4.tar.bz2;
+      md5 = "945617bb094975d7353a3852302297c1";
+    };
+  };
+  libsoup = {
+    name = "libsoup-2.2.96";
+    src = fetchurl {
+      url = http://ftp.gnome.org/pub/GNOME/desktop/2.14/2.14.3/sources/libsoup-2.2.96.tar.bz2;
+      md5 = "2704961ca2b9597819f21b40d4a0e0aa";
+    };
+  };
+  libwnck = {
+    name = "libwnck-2.14.3";
+    src = fetchurl {
+      url = http://ftp.gnome.org/pub/GNOME/desktop/2.14/2.14.3/sources/libwnck-2.14.3.tar.bz2;
+      md5 = "5796c0c26c5dfbad6d4fdf77858feae6";
+    };
+  };
+  libxklavier = {
+    name = "libxklavier-2.2";
+    src = fetchurl {
+      url = http://ftp.gnome.org/pub/GNOME/desktop/2.14/2.14.3/sources/libxklavier-2.2.tar.bz2;
+      md5 = "1c53646f35d77564f42d3f4342cd443f";
+    };
+  };
+  metacity = {
+    name = "metacity-2.14.5";
+    src = fetchurl {
+      url = http://ftp.gnome.org/pub/GNOME/desktop/2.14/2.14.3/sources/metacity-2.14.5.tar.bz2;
+      md5 = "a14c4a07e456a2590452d6c9db2e5153";
+    };
+  };
+  nautilus = {
+    name = "nautilus-2.14.3";
+    src = fetchurl {
+      url = http://ftp.gnome.org/pub/GNOME/desktop/2.14/2.14.3/sources/nautilus-2.14.3.tar.bz2;
+      md5 = "e82df2a1cb11719d054959539b74b3c7";
+    };
+  };
+  nautiluscdburner = {
+    name = "nautilus-cd-burner-2.14.3";
+    src = fetchurl {
+      url = http://ftp.gnome.org/pub/GNOME/desktop/2.14/2.14.3/sources/nautilus-cd-burner-2.14.3.tar.bz2;
+      md5 = "c85642630b3db5ee0a40e2fdbf4fdf94";
+    };
+  };
+  scrollkeeper = {
+    name = "scrollkeeper-0.3.14";
+    src = fetchurl {
+      url = http://ftp.gnome.org/pub/GNOME/desktop/2.14/2.14.3/sources/scrollkeeper-0.3.14.tar.bz2;
+      md5 = "b175e582a6cec3e50a9de73a5bb7455a";
+    };
+  };
+  soundjuicer = {
+    name = "sound-juicer-2.14.5";
+    src = fetchurl {
+      url = http://ftp.gnome.org/pub/GNOME/desktop/2.14/2.14.3/sources/sound-juicer-2.14.5.tar.bz2;
+      md5 = "2bb23f1bd7751eb9f14f2446beed15e0";
+    };
+  };
+  startupnotification = {
+    name = "startup-notification-0.8";
+    src = fetchurl {
+      url = http://ftp.gnome.org/pub/GNOME/desktop/2.14/2.14.3/sources/startup-notification-0.8.tar.bz2;
+      md5 = "d9b2e9fba18843314ae42334ceb4336d";
+    };
+  };
+  systemtoolsbackends = {
+    name = "system-tools-backends-1.4.2";
+    src = fetchurl {
+      url = http://ftp.gnome.org/pub/GNOME/desktop/2.14/2.14.3/sources/system-tools-backends-1.4.2.tar.bz2;
+      md5 = "a0af1513becdf3b9bfed3535ad8f7dab";
+    };
+  };
+  totem = {
+    name = "totem-1.4.3";
+    src = fetchurl {
+      url = http://ftp.gnome.org/pub/GNOME/desktop/2.14/2.14.3/sources/totem-1.4.3.tar.bz2;
+      md5 = "971f99d769cb865f9a6b55284357f415";
+    };
+  };
+  vino = {
+    name = "vino-2.13.5";
+    src = fetchurl {
+      url = http://ftp.gnome.org/pub/GNOME/desktop/2.14/2.14.3/sources/vino-2.13.5.tar.bz2;
+      md5 = "9bc8c3f0e639fdc7b9ed023501308359";
+    };
+  };
+  vte = {
+    name = "vte-0.12.2";
+    src = fetchurl {
+      url = http://ftp.gnome.org/pub/GNOME/desktop/2.14/2.14.3/sources/vte-0.12.2.tar.bz2;
+      md5 = "7cb1bd6ca528bc4db5ec685549fd3eb1";
+    };
+  };
+  yelp = {
+    name = "yelp-2.14.3";
+    src = fetchurl {
+      url = http://ftp.gnome.org/pub/GNOME/desktop/2.14/2.14.3/sources/yelp-2.14.3.tar.bz2;
+      md5 = "d3c4300c9a7d38ff2179b934ca5e2d1a";
+    };
+  };
+  zenity = {
+    name = "zenity-2.14.3";
+    src = fetchurl {
+      url = http://ftp.gnome.org/pub/GNOME/desktop/2.14/2.14.3/sources/zenity-2.14.3.tar.bz2;
+      md5 = "00c0930abb905a5552f67ee764bd6177";
+    };
+  };
+}
diff --git a/pkgs/development/libraries/gnome/src-gnome-platform-2.14.2.nix b/pkgs/development/libraries/gnome/src-gnome-platform-2.14.3.nix
index af0c6429cbf..efdcf19e0ff 100644
--- a/pkgs/development/libraries/gnome/src-gnome-platform-2.14.2.nix
+++ b/pkgs/development/libraries/gnome/src-gnome-platform-2.14.3.nix
@@ -4,168 +4,168 @@
   atk = {
     name = "atk-1.11.4";
     src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/platform/2.14/2.14.2/sources/atk-1.11.4.tar.bz2;
+      url = http://ftp.gnome.org/pub/GNOME/platform/2.14/2.14.3/sources/atk-1.11.4.tar.bz2;
       md5 = "2f7132e46a62a2586545bca40eeeef39";
     };
   };
   atspi = {
     name = "at-spi-1.7.7";
     src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/platform/2.14/2.14.2/sources/at-spi-1.7.7.tar.bz2;
+      url = http://ftp.gnome.org/pub/GNOME/platform/2.14/2.14.3/sources/at-spi-1.7.7.tar.bz2;
       md5 = "2988cd21d9f292fd404a8c532fe2723d";
     };
   };
   audiofile = {
     name = "audiofile-0.2.6";
     src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/platform/2.14/2.14.2/sources/audiofile-0.2.6.tar.bz2;
+      url = http://ftp.gnome.org/pub/GNOME/platform/2.14/2.14.3/sources/audiofile-0.2.6.tar.bz2;
       md5 = "3d01302834660850b6141cac1e6f5501";
     };
   };
   esound = {
     name = "esound-0.2.36";
     src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/platform/2.14/2.14.2/sources/esound-0.2.36.tar.bz2;
+      url = http://ftp.gnome.org/pub/GNOME/platform/2.14/2.14.3/sources/esound-0.2.36.tar.bz2;
       md5 = "3facb5aa0115cc1c31771b9ad454ae76";
     };
   };
   gail = {
     name = "gail-1.8.11";
     src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/platform/2.14/2.14.2/sources/gail-1.8.11.tar.bz2;
+      url = http://ftp.gnome.org/pub/GNOME/platform/2.14/2.14.3/sources/gail-1.8.11.tar.bz2;
       md5 = "ff79df7dd0cf7a5109c089b9b5fbe17f";
     };
   };
   GConf = {
     name = "GConf-2.14.0";
     src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/platform/2.14/2.14.2/sources/GConf-2.14.0.tar.bz2;
+      url = http://ftp.gnome.org/pub/GNOME/platform/2.14/2.14.3/sources/GConf-2.14.0.tar.bz2;
       md5 = "d07c2efcaf477cf34225c604a04b6271";
     };
   };
   glib = {
     name = "glib-2.10.3";
     src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/platform/2.14/2.14.2/sources/glib-2.10.3.tar.bz2;
+      url = http://ftp.gnome.org/pub/GNOME/platform/2.14/2.14.3/sources/glib-2.10.3.tar.bz2;
       md5 = "87206e721c12d185d17dd9ecd7e30369";
     };
   };
   gnomemimedata = {
     name = "gnome-mime-data-2.4.2";
     src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/platform/2.14/2.14.2/sources/gnome-mime-data-2.4.2.tar.bz2;
+      url = http://ftp.gnome.org/pub/GNOME/platform/2.14/2.14.3/sources/gnome-mime-data-2.4.2.tar.bz2;
       md5 = "37242776b08625fa10c73c18b790e552";
     };
   };
   gnomevfs = {
     name = "gnome-vfs-2.14.2";
     src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/platform/2.14/2.14.2/sources/gnome-vfs-2.14.2.tar.bz2;
+      url = http://ftp.gnome.org/pub/GNOME/platform/2.14/2.14.3/sources/gnome-vfs-2.14.2.tar.bz2;
       md5 = "b657e31974d6981adf9b2c4db981f62c";
     };
   };
   gtk = {
-    name = "gtk+-2.8.18";
+    name = "gtk+-2.8.20";
     src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/platform/2.14/2.14.2/sources/gtk+-2.8.18.tar.bz2;
-      md5 = "0d27a026428732337676d47d22e5e23c";
+      url = http://ftp.gnome.org/pub/GNOME/platform/2.14/2.14.3/sources/gtk+-2.8.20.tar.bz2;
+      md5 = "74e7ca98194f1fadfe906e66d763d05d";
     };
   };
   gtkdoc = {
     name = "gtk-doc-1.6";
     src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/platform/2.14/2.14.2/sources/gtk-doc-1.6.tar.bz2;
+      url = http://ftp.gnome.org/pub/GNOME/platform/2.14/2.14.3/sources/gtk-doc-1.6.tar.bz2;
       md5 = "09c7a89efff2e0bbaba02a12bff58dfd";
     };
   };
   intltool = {
-    name = "intltool-0.35.0";
+    name = "intltool-0.34.2";
     src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/platform/2.14/2.14.2/sources/intltool-0.35.0.tar.bz2;
-      md5 = "95c4bd2a91419083ee880a3f53f86edf";
+      url = http://ftp.gnome.org/pub/GNOME/platform/2.14/2.14.3/sources/intltool-0.34.2.tar.bz2;
+      md5 = "83914f744d927579cc47c52f8b08bf60";
     };
   };
   libart_lgpl = {
     name = "libart_lgpl-2.3.17";
     src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/platform/2.14/2.14.2/sources/libart_lgpl-2.3.17.tar.bz2;
+      url = http://ftp.gnome.org/pub/GNOME/platform/2.14/2.14.3/sources/libart_lgpl-2.3.17.tar.bz2;
       md5 = "dfca42529393c8a8f59dc4dc10675a46";
     };
   };
   libbonobo = {
     name = "libbonobo-2.14.0";
     src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/platform/2.14/2.14.2/sources/libbonobo-2.14.0.tar.bz2;
+      url = http://ftp.gnome.org/pub/GNOME/platform/2.14/2.14.3/sources/libbonobo-2.14.0.tar.bz2;
       md5 = "f1f0255f94e3354250d142b688013fad";
     };
   };
   libbonoboui = {
     name = "libbonoboui-2.14.0";
     src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/platform/2.14/2.14.2/sources/libbonoboui-2.14.0.tar.bz2;
+      url = http://ftp.gnome.org/pub/GNOME/platform/2.14/2.14.3/sources/libbonoboui-2.14.0.tar.bz2;
       md5 = "dc26dc17cddc625cac37ecfab263a51a";
     };
   };
   libglade = {
-    name = "libglade-2.5.1";
+    name = "libglade-2.6.0";
     src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/platform/2.14/2.14.2/sources/libglade-2.5.1.tar.bz2;
-      md5 = "e4734a59f1f2308d7714dc0ebf8163f1";
+      url = http://ftp.gnome.org/pub/GNOME/platform/2.14/2.14.3/sources/libglade-2.6.0.tar.bz2;
+      md5 = "81d7b2b64871ce23a5fae1e5da0b1f6e";
     };
   };
   libgnome = {
     name = "libgnome-2.14.1";
     src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/platform/2.14/2.14.2/sources/libgnome-2.14.1.tar.bz2;
+      url = http://ftp.gnome.org/pub/GNOME/platform/2.14/2.14.3/sources/libgnome-2.14.1.tar.bz2;
       md5 = "bf53815df10db62bbf00defd4100b8d8";
     };
   };
   libgnomecanvas = {
     name = "libgnomecanvas-2.14.0";
     src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/platform/2.14/2.14.2/sources/libgnomecanvas-2.14.0.tar.bz2;
+      url = http://ftp.gnome.org/pub/GNOME/platform/2.14/2.14.3/sources/libgnomecanvas-2.14.0.tar.bz2;
       md5 = "516c46fb4a1401b05cfef58c350fbd3d";
     };
   };
   libgnomeui = {
     name = "libgnomeui-2.14.1";
     src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/platform/2.14/2.14.2/sources/libgnomeui-2.14.1.tar.bz2;
+      url = http://ftp.gnome.org/pub/GNOME/platform/2.14/2.14.3/sources/libgnomeui-2.14.1.tar.bz2;
       md5 = "ff6b6c25de0e7e39c79998621cdec048";
     };
   };
   libIDL = {
-    name = "libIDL-0.8.6";
+    name = "libIDL-0.8.7";
     src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/platform/2.14/2.14.2/sources/libIDL-0.8.6.tar.bz2;
-      md5 = "2fde1aed5ea77d532f9e11442f761b81";
+      url = http://ftp.gnome.org/pub/GNOME/platform/2.14/2.14.3/sources/libIDL-0.8.7.tar.bz2;
+      md5 = "53a3874beb42ddfd9a5030047a0db740";
     };
   };
   libxml2 = {
-    name = "libxml2-2.6.24";
+    name = "libxml2-2.6.26";
     src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/platform/2.14/2.14.2/sources/libxml2-2.6.24.tar.bz2;
-      md5 = "258866cdd9204b3ffb75992e00809ebf";
+      url = http://ftp.gnome.org/pub/GNOME/platform/2.14/2.14.3/sources/libxml2-2.6.26.tar.bz2;
+      md5 = "ce342b4d7b6d83e10cfa4d3f82bf75fd";
     };
   };
   libxslt = {
-    name = "libxslt-1.1.16";
+    name = "libxslt-1.1.17";
     src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/platform/2.14/2.14.2/sources/libxslt-1.1.16.tar.bz2;
-      md5 = "35e1c422b4b222c860dd56445fa51a8b";
+      url = http://ftp.gnome.org/pub/GNOME/platform/2.14/2.14.3/sources/libxslt-1.1.17.tar.bz2;
+      md5 = "af99d7b06eba109ab374ccd7015561c4";
     };
   };
   ORBit2 = {
-    name = "ORBit2-2.14.0";
+    name = "ORBit2-2.14.2";
     src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/platform/2.14/2.14.2/sources/ORBit2-2.14.0.tar.bz2;
-      md5 = "bb1b4859522cb6e1a3a3dc4b7397db64";
+      url = http://ftp.gnome.org/pub/GNOME/platform/2.14/2.14.3/sources/ORBit2-2.14.2.tar.bz2;
+      md5 = "88ea9b8e686ab0dd27b4199e0f41ac84";
     };
   };
   pango = {
     name = "pango-1.12.3";
     src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/platform/2.14/2.14.2/sources/pango-1.12.3.tar.bz2;
+      url = http://ftp.gnome.org/pub/GNOME/platform/2.14/2.14.3/sources/pango-1.12.3.tar.bz2;
       md5 = "c8178e11a895166d86990bb2c38d831b";
     };
   };
diff --git a/pkgs/development/libraries/gtk-libs-2.10/glib/default.nix b/pkgs/development/libraries/gtk-libs-2.10/glib/default.nix
index 5a049732228..b34227a4d2f 100644
--- a/pkgs/development/libraries/gtk-libs-2.10/glib/default.nix
+++ b/pkgs/development/libraries/gtk-libs-2.10/glib/default.nix
@@ -3,10 +3,10 @@
 assert pkgconfig != null && gettext != null && perl != null;
 
 stdenv.mkDerivation {
-  name = "glib-2.12.0";
+  name = "glib-2.12.1"; # <- sic! gtk 2.10 needs glib 2.12
   src = fetchurl {
-    url = ftp://ftp.gtk.org/pub/gtk/v2.12/glib-2.12.0.tar.bz2;
-    md5 = "ea8c7733ba443e3db04cf7a84060f408";
+    url = ftp://ftp.gtk.org/pub/gtk/v2.12/glib-2.12.1.tar.bz2;
+    md5 = "97786d2a03f0f190bd782749139dc10c";
   };
   buildInputs = [pkgconfig gettext perl];
 }
diff --git a/pkgs/development/libraries/gtk-libs-2.10/gtk+/default.nix b/pkgs/development/libraries/gtk-libs-2.10/gtk+/default.nix
index 9de96341219..07d9fdd21a8 100644
--- a/pkgs/development/libraries/gtk-libs-2.10/gtk+/default.nix
+++ b/pkgs/development/libraries/gtk-libs-2.10/gtk+/default.nix
@@ -8,10 +8,10 @@ assert xineramaSupport -> libXinerama != null;
 
 
 stdenv.mkDerivation {
-  name = "gtk+-2.10.0";
+  name = "gtk+-2.10.1";
   src = fetchurl {
-    url = ftp://ftp.gtk.org/pub/gtk/v2.10/gtk+-2.10.0.tar.bz2;
-    md5 = "37cdf73719e8b2af6b0d065df6236542";
+    url = ftp://ftp.gtk.org/pub/gtk/v2.10/gtk+-2.10.1.tar.bz2;
+    md5 = "7f1d39031d50de8228211aa3230d4acd";
   };
   buildInputs = [
     pkgconfig perl libtiff libjpeg libpng cairo libXrandr
diff --git a/pkgs/development/libraries/gtk-libs-2.10/pango/default.nix b/pkgs/development/libraries/gtk-libs-2.10/pango/default.nix
index 4f66a3bb073..591eebc3ee8 100644
--- a/pkgs/development/libraries/gtk-libs-2.10/pango/default.nix
+++ b/pkgs/development/libraries/gtk-libs-2.10/pango/default.nix
@@ -3,10 +3,10 @@
 assert x11.buildClientLibs;
 
 stdenv.mkDerivation {
-  name = "pango-1.13.2";
+  name = "pango-1.12.3";
   src = fetchurl {
-    url = ftp://ftp.gtk.org/pub/gtk/v2.11/pango-1.13.2.tar.gz;
-    md5 = "17d78473c05fece044c6a3b44519b61f";
+    url = ftp://ftp.gtk.org/pub/gtk/v2.10/pango-1.12.3.tar.bz2;
+    md5 = "c8178e11a895166d86990bb2c38d831b";
   };
   buildInputs = [pkgconfig libpng];
   propagatedBuildInputs = [x11 glib cairo];
diff --git a/pkgs/development/libraries/gtk-libs-2.8/glib/default.nix b/pkgs/development/libraries/gtk-libs-2.8/glib/default.nix
index d7ea1f0a42a..c0eb432a49b 100644
--- a/pkgs/development/libraries/gtk-libs-2.8/glib/default.nix
+++ b/pkgs/development/libraries/gtk-libs-2.8/glib/default.nix
@@ -3,10 +3,10 @@
 assert pkgconfig != null && gettext != null && perl != null;
 
 stdenv.mkDerivation {
-  name = "glib-2.8.6";
+  name = "glib-2.10.3";
   src = fetchurl {
-    url = ftp://ftp.gtk.org/pub/gtk/v2.8/glib-2.8.6.tar.bz2;
-    md5 = "fce6835fd8c99ab4c3e5213bc5bcd0ed";
+    url = ftp://ftp.gtk.org/pub/gtk/v2.10/glib-2.10.3.tar.bz2;
+    md5 = "87206e721c12d185d17dd9ecd7e30369";
   };
   buildInputs = [pkgconfig perl];
   propagatedBuildInputs = [gettext];
diff --git a/pkgs/development/libraries/gtk-libs-2.8/pango/default.nix b/pkgs/development/libraries/gtk-libs-2.8/pango/default.nix
index 716f41cbaee..58dd88aeb62 100644
--- a/pkgs/development/libraries/gtk-libs-2.8/pango/default.nix
+++ b/pkgs/development/libraries/gtk-libs-2.8/pango/default.nix
@@ -3,10 +3,10 @@
 assert x11.buildClientLibs;
 
 stdenv.mkDerivation {
-  name = "pango-1.10.4";
+  name = "pango-1.12.3";
   src = fetchurl {
-    url = ftp://ftp.gtk.org/pub/gtk/v2.8/pango-1.10.4.tar.bz2;
-    md5 = "d7eeb0f995a93534be8e7c687b465a0c";
+    url = ftp://ftp.gtk.org/pub/gtk/v2.10/pango-1.12.3.tar.bz2;
+    md5 = "c8178e11a895166d86990bb2c38d831b";
   };
   buildInputs = [pkgconfig];
   propagatedBuildInputs = [x11 glib cairo];
diff --git a/pkgs/development/libraries/kde/kdelibs/builder.sh b/pkgs/development/libraries/kde/kdelibs/builder.sh
deleted file mode 100644
index 3122b0a82c2..00000000000
--- a/pkgs/development/libraries/kde/kdelibs/builder.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-# Ugh, this should be factored out.
-addInputsHook=addBzip2
-addBzip2() {
-    bzip2=$(type -tP bzip2)
-    test -n $bzip2 || fail
-    buildInputs="$(dirname $(dirname $bzip2)) $buildInputs"
-}
-
-source $stdenv/setup
-
-configureFlags="\
-  --without-arts \
-  --with-ssl-dir=$openssl \
-  --with-extra-includes=$libjpeg/include \
-  --x-includes=$libX11/include \
-  --x-libraries=$libX11/lib"
-
-genericBuild
diff --git a/pkgs/development/libraries/kde/kdelibs/default.nix b/pkgs/development/libraries/kde/kdelibs/default.nix
index 2ec082a5877..d8f0107007e 100644
--- a/pkgs/development/libraries/kde/kdelibs/default.nix
+++ b/pkgs/development/libraries/kde/kdelibs/default.nix
@@ -1,11 +1,10 @@
 { stdenv, fetchurl, libX11, libXt, libXext, zlib, perl, qt, openssl, pcre
 , pkgconfig, libjpeg, libpng, libtiff, libxml2, libxslt, libtool, expat
-, freetype
+, freetype, bzip2
 }:
 
 stdenv.mkDerivation {
   name = "kdelibs-3.5.0";
-  builder = ./builder.sh;
   src = fetchurl {
     url = http://nix.cs.uu.nl/dist/tarballs/kdelibs-3.5.0.tar.bz2;
     md5 = "2b11d654e2ea1a3cd16dcfdcbb7d1915";
@@ -15,6 +14,14 @@ stdenv.mkDerivation {
   buildInputs = [
     libX11 libXt libXext zlib perl qt openssl pcre 
     pkgconfig libjpeg libpng libtiff libxml2 libxslt expat
-    libtool freetype
+    libtool freetype bzip2
   ];
+
+  configureFlags="
+    --without-arts 
+    --with-ssl-dir=${openssl}
+    --with-extra-includes=${libjpeg}/include
+    --x-includes=${libX11}/include
+    --x-libraries=${libX11}/lib
+  ";
 }
diff --git a/pkgs/development/libraries/libpng/default.nix b/pkgs/development/libraries/libpng/default.nix
index 7756e52e092..26dd7787293 100644
--- a/pkgs/development/libraries/libpng/default.nix
+++ b/pkgs/development/libraries/libpng/default.nix
@@ -3,10 +3,10 @@
 assert zlib != null;
 
 stdenv.mkDerivation {
-  name = "libpng-1.2.10";
+  name = "libpng-1.2.12";
   src = fetchurl {
-    url = ftp://ftp.simplesystems.org/pub/libpng/png/src/history/libpng-1.2.10.tar.bz2;
-    md5 = "4f23eebd59ddd01a8f91ff8c823dd7d6";
+    url = ftp://ftp.simplesystems.org/pub/libpng/png/src/libpng-1.2.12.tar.bz2;
+    md5 = "2287cfaad53a714acdf6eb75a7c1d15f";
   };
   propagatedBuildInputs = [zlib];
   inherit zlib;
diff --git a/pkgs/development/libraries/zvbi/default.nix b/pkgs/development/libraries/zvbi/default.nix
index 5fd83073fd9..566ce7d6bc4 100644
--- a/pkgs/development/libraries/zvbi/default.nix
+++ b/pkgs/development/libraries/zvbi/default.nix
@@ -5,10 +5,10 @@ assert x11 != null;
 assert pngSupport -> libpng != null;
 
 stdenv.mkDerivation {
-  name = "zvbi-0.2.16";
+  name = "zvbi-0.2.12";
   src = fetchurl {
-    url = http://nix.cs.uu.nl/dist/tarballs/zvbi-0.2.16.tar.bz2;
-    md5 = "6ed822ae5d0766129bfa1508394b6ac0";
+    url = http://surfnet.dl.sourceforge.net/sourceforge/zapping/zvbi-0.2.22.tar.bz2;
+    md5 = "a01cbe39a48579ba92582ff75a5e37c2";
   };
   buildInputs = [x11 (if pngSupport then libpng else null)];
   inherit pngSupport;
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 60d4dd2d826..661bdb5e9f6 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -1207,7 +1207,7 @@ rec {
     inherit fetchurl stdenv pkgconfig x11 fontconfig freetype zlib libpng;
   };
 
-  gtkLibs = recurseIntoAttrs gtkLibs28;
+  gtkLibs = recurseIntoAttrs gtkLibs28; # !!! -> gtkLibs10
 
   gtkLibs210 = import ../development/libraries/gtk-libs-2.10 {
     inherit fetchurl stdenv pkgconfig gettext perl x11
@@ -1274,9 +1274,9 @@ rec {
 
   kdelibs = import ../development/libraries/kde/kdelibs {
     inherit
-      fetchurl stdenv zlib perl openssl pcre  pkgconfig
+      fetchurl stdenv zlib perl openssl pcre pkgconfig
       libjpeg libpng libtiff libxml2 libxslt libtool
-      expat freetype;
+      expat freetype bzip2;
     inherit (xlibs) libX11 libXt libXext;
     qt = qt3;
   };
@@ -1315,7 +1315,8 @@ rec {
     inherit fetchurl stdenv pkgconfig audiofile
             flex bison popt zlib libxml2 libxslt
             perl perlXMLParser docbook_xml_dtd_42 gettext x11
-            libtiff libjpeg libpng gtkLibs;
+            libtiff libjpeg libpng bzip2;
+    gtkLibs = gtkLibs28;
     inherit (xlibs) libXmu;
   });
 
@@ -1431,7 +1432,7 @@ rec {
   };
 
   dclib = (import ../development/libraries/dclib) {
-    inherit fetchurl stdenv libxml2 openssl;
+    inherit fetchurl stdenv libxml2 openssl bzip2;
   };
 
   cracklib = (import ../development/libraries/cracklib) {