svn merge --reintegrate ^/nixpkgs/branches/glib-2.30-take2

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

pkgs/applications/graphics/geeqie/default.nix

@@ -1,5 +1,5 @@
 { stdenv, fetchurl, pkgconfig, gtk, libpng, exiv2, lcms
-, intltool, gettext, libchamplain, fbida }:
+, intltool, gettext, libchamplain_0_6, fbida }:
 
 stdenv.mkDerivation rec {
   name = "geeqie-1.0";
@@ -20,7 +20,7 @@ stdenv.mkDerivation rec {
 
   buildInputs =
     [ pkgconfig gtk libpng exiv2 lcms intltool gettext
-      libchamplain
+      libchamplain_0_6
     ];
 
   postInstall =

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

@@ -5,10 +5,10 @@ let
   doPatchShebangs = args.doPatchShebangs;
   makeManyWrappers = args.makeManyWrappers;
 
-  version = "0.2"; 
+  version = "0.4"; 
-  release = "7";
+  release = "4";
   buildInputs = with args; [
-    intltool python imagemagick gtk glib webkit libxml2 
+    intltool python imagemagick gtk3 glib webkit libxml2 
     gtksourceview pkgconfig which gettext makeWrapper 
     file libidn sqlite docutils libnotify libsoup vala
     kbproto xproto scrnsaverproto libXScrnSaver dbus_glib
@@ -17,16 +17,20 @@ in
 rec {
   src = fetchurl {
     url = "http://archive.xfce.org/src/apps/midori/${version}/midori-${version}.${release}.tar.bz2";
-    sha256 = "b1dcc479ceb938c8d9cdea098c8d72d563bce5010c27fbcaa4c992d10f2d809c";
+    sha256 = "fadd43f76c1c9f6a16483e60a804e58fb6817c6a595b1acdd59bcbdd7b35bca2";
   };
 
   inherit buildInputs;
-  configureFlags = [];
+  configureFlags = ["--enable-gtk3"];
 
   /* doConfigure should be specified separately */
-  phaseNames = ["doUnpack" "shebangsHere" "doConfigure" 
+  phaseNames = ["doUnpack" "setVars" "shebangsHere" "doConfigure" 
     "doMakeInstall" "shebangsInstalled" "wrapWK"
     ];
+
+  setVars = args.fullDepEntry ''
+    export NIX_LDFLAGS="$NIX_LDFLAGS -lnotify"
+  '' [];
       
   shebangsHere = (doPatchShebangs ".");
   shebangsInstalled = (doPatchShebangs "$out/bin");

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

@@ -1,17 +1,20 @@
 a :  
 let 
-  fetchurl = a.fetchurl;
+  fetchgit = a.fetchgit;
-
-  s = import ./src-for-default.nix;
 
   buildInputs = with a; [
-    libsoup pkgconfig webkit gtk makeWrapper
+    libsoup pkgconfig webkit gtk3 makeWrapper
     kbproto
   ];
 in
 rec {
-  src = (a.fetchUrlFromSrcInfo s);
+  src = fetchgit {
-  inherit (s) name;
+    url = "https://github.com/Dieterbe/uzbl.git";
+    rev = "dcb3b4e1fcff682b412cfe5875f7054b97380d08";
+    sha256 = "f7b2b2903c01c9cfbd99bd94783002e1580d8092ff6022bb5aed3f999ff6e468";
+  };
+
+  name = "uzbl-git";
 
   inherit buildInputs;
   configureFlags = [];

pkgs/applications/networking/browsers/uzbl/src-for-default.nix

@@ -1,10 +0,0 @@
-rec {
-   version="2010.04.03";
-   name="uzbl-stable-2010.04.03";
-   hash="1jxs9agk4jd09v73vl69k3mil4jfr5rhfb0v4sq8sfh1p8nl389s";
-   url="http://github.com/Dieterbe/uzbl/tarball/${version}";
-   advertisedUrl="http://github.com/Dieterbe/uzbl/tarball/2010.04.03";
-  
-   downloadName="2010.04.03.tar.gz";
-  
-}

pkgs/applications/networking/browsers/uzbl/src-info-for-default.nix

@@ -1,9 +0,0 @@
-{
-  baseName = "uzbl-stable";
-  downloadPage = "http://github.com/Dieterbe/uzbl/downloads";
-  sourceRegexp = "/tarball/";
-  versionExtractorSedScript = ''s@.*[/]@@'';
-  versionReferenceCreator = ''$(replaceAllVersionOccurences)'';
-  extraVars = "downloadName";
-  eval_downloadName = ''downloadName=$version.tar.gz'';
-}

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

@@ -1,4 +1,4 @@
-{stdenv, fetchurl, makeWrapper, perl, pkgconfig, webkit, gtk, libX11, libsoup,
+{stdenv, fetchurl, makeWrapper, perl, pkgconfig, webkit_gtk2, gtk, libX11, libsoup,
 glib_networking}:
 
 stdenv.mkDerivation {
@@ -7,7 +7,7 @@ stdenv.mkDerivation {
     url = "mirror://sourceforge/vimprobable/vimprobable2_0.9.12.0.tar.bz2";
     sha256 = "1b6xs6rd4rxy9kdsva13bbx7pd2gy159ad8ncd4pplsqr46hw8fb";
   };
-  buildInputs = [ makeWrapper perl pkgconfig libX11 libsoup webkit gtk ];
+  buildInputs = [ makeWrapper perl pkgconfig libX11 libsoup webkit_gtk2 gtk ];
   installPhase = ''
     make PREFIX=/ DESTDIR=$out install
     wrapProgram "$out/bin/vimprobable2" --prefix GIO_EXTRA_MODULES : \

pkgs/applications/networking/instant-messengers/telepathy/rakia/default.nix

@@ -0,0 +1,19 @@
+{ stdenv, fetchurl, pkgconfig, libxslt, telepathy_glib, libxml2, dbus_glib
+, python, sofia_sip }:
+
+stdenv.mkDerivation rec {
+  pname = "telepathy-rakia";
+  name = "${pname}-0.7.3";
+
+  src = fetchurl {
+    url = "${meta.homepage}/releases/${pname}/${name}.tar.gz";
+    sha256 = "1jnxlx135c660vb1n2vpg6ci2ps0rbrp3244jgchik3g6q5vwbb4";
+  };
+
+  buildNativeInputs = [pkgconfig libxslt python];
+  buildInputs = [ libxml2 dbus_glib telepathy_glib sofia_sip];
+
+  meta = {
+    homepage = http://telepathy.freedesktop.org;
+  };
+}

pkgs/applications/networking/instant-messengers/telepathy/salut/default.nix

@@ -3,11 +3,11 @@
 
 stdenv.mkDerivation rec {
   pname = "telepathy-salut";
-  name = "${pname}-0.7.1";
+  name = "${pname}-0.7.2";
 
   src = fetchurl {
     url = "http://telepathy.freedesktop.org/releases/${pname}/${name}.tar.gz";
-    sha256 = "0677c4j11n0symmhy52g2qzrflvxjppysscq3rh7zc3ys6h10kpi";
+    sha256 = "0vahmqi78pbmsn472kijl3d4rshz07pmihxk5xkp99hvbqd4mb1f";
   };
 
   buildInputs = [ glib libxml2 telepathy_glib avahi libsoup libuuid gnutls

pkgs/data/fonts/dejavu-fonts/default.nix

@@ -1,14 +1,24 @@
 {fetchurl, stdenv, fontforge, perl, fontconfig, FontTTF}:
 
-let version = "2.29" ; in
+let version = "2.33" ; in
 
-stdenv.mkDerivation {
+stdenv.mkDerivation rec {
   name = "dejavu-fonts-${version}";
   #fontconfig is needed only for fc-lang (?)
   buildInputs = [fontforge perl FontTTF];
+
+  unicodeData = fetchurl {
+    url = http://www.unicode.org/Public/6.1.0/ucd/UnicodeData.txt ; 
+    sha256 = "1bd6zkzvxfnifrn5nh171ywk7q56sgk8gdvdn43z9i53hljjcrih";
+  };
+  blocks = fetchurl {
+    url = http://www.unicode.org/Public/6.1.0/ucd/Blocks.txt; 
+    sha256 = "0w0vkb09nrlc6mrhqyl9npszdi828afgvhvlb1vs5smjv3h8y3dz";
+  };
+
   src = fetchurl {
     url = "mirror://sourceforge/dejavu/dejavu-fonts-${version}.tar.bz2";
-    sha256 = "1h8x0bnbh9awwsxiwjpp73iczk1y4d5y0as1f4zb4pbk6l2m7v60";
+    sha256 = "10m0rds36yyaznfqaa9msayv6f0v1h50zbikja6qdy5dwwxi8q5w";
   };
   buildFlags = "full-ttf";
   preBuild = ''
@@ -17,7 +27,8 @@ stdenv.mkDerivation {
     mkdir resources
     tar xf ${fontconfig.src} --wildcards '*/fc-lang'
     ln -s $PWD/fontconfig-*/fc-lang -t resources/
-    ln -s ${perl}/lib/*/*/unicore/* -t resources/
+    ln -s ${unicodeData} resources/UnicodeData.txt
+    ln -s ${blocks} resources/Blocks.txt
   '';
   installPhase = '' 
     mkdir -p $out/share/fonts/truetype

pkgs/desktops/gnome-2/default.nix

@@ -56,8 +56,6 @@
 
   at_spi = callPackage ./platform/at-spi { };
 
-  gtk_doc = callPackage ./platform/gtk-doc { };
-
   gtkhtml = callPackage ./platform/gtkhtml { };
 
 
@@ -73,10 +71,6 @@
 
   gnome_keyring = callPackage ./desktop/gnome-keyring { };
 
-  libsoup = callPackage ./desktop/libsoup { };
-
-  libwnck = callPackage ./desktop/libwnck { };
-
   libgweather = callPackage ./desktop/libgweather { };
 
   gvfs = callPackage ./desktop/gvfs { };
@@ -89,8 +83,6 @@
   # scrollkeeper replacement
   rarian = callPackage ./desktop/rarian { };
 
-  gnome_doc_utils = callPackage ./desktop/gnome-doc-utils { };
-
   zenity = callPackage ./desktop/zenity { };
 
   metacity = callPackage ./desktop/metacity { };

pkgs/desktops/gnome-2/desktop/gvfs/builder.sh

@@ -1,9 +0,0 @@
-source $stdenv/setup
-
-myPatchPhase()
-{
-    sed -i -e "/giomodulesdir=/ agiomodulesdir=$out/lib/gio" configure
-}
-
-patchPhase=myPatchPhase
-genericBuild

pkgs/desktops/gnome-2/desktop/gvfs/default.nix

@@ -3,11 +3,11 @@
 , udev, avahi}:
 
 stdenv.mkDerivation {
-  name = "gvfs-1.8.2";
+  name = "gvfs-1.10.1";
 
   src = fetchurl {
-    url = mirror://gnome/sources/gvfs/1.8/gvfs-1.8.2.tar.bz2;
+    url = mirror://gnome/sources/gvfs/1.10/gvfs-1.10.1.tar.xz;
-    sha256 = "0ickz1g3b16ncnv6vdpx0j5nx70ixdl6nsrv8cainvj1dn7sr588";
+    sha256 = "124jrkph3cqr2pijmzzr6qwzy2vaq3vvndskzkxd0v5dwp7glc6d";
   };
 
   buildInputs =

pkgs/desktops/gnome-2/desktop/libsoup/default.nix

@@ -1,16 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, libxml2, gnutls, libproxy, sqlite, curl
-, glib, GConf, libgnome_keyring }:
-
-stdenv.mkDerivation rec {
-  name = "libsoup-2.34.3";
-
-  src = fetchurl {
-    url = mirror://gnome/sources/libsoup/2.34/libsoup-2.34.3.tar.xz;
-    sha256 = "072af1iqcky5vm6akm450qhdjrgav4yyl6s8idhnq0gpm5jqhgy4";
-  };
-
-  buildInputs = [ pkgconfig libxml2 gnutls libproxy sqlite curl 
-    glib GConf libgnome_keyring ];
-
-  configureFlags = "--disable-tls-check";
-}

pkgs/desktops/gnome-3/default.nix

@@ -1,20 +0,0 @@
-{ callPackage }:
-
-{
-  clutter = callPackage ./platform/clutter.nix { };
-
-  cogl = callPackage ../../development/libraries/cogl { };
-
-  # Ensure that we use dbus-glib built with gtkLibs3x.glib
-  dbus_glib = callPackage ../../development/libraries/dbus-glib { };
-
-  glib_networking = callPackage ./platform/glib-networking.nix { };
-
-  libgnome_keyring = callPackage ./platform/libgnome-keyring.nix { };
-
-  libsoup = callPackage ./platform/libsoup.nix { };
-
-  GConf = callPackage ./platform/GConf.nix { };
-
-  gnome_user_docs = callPackage ./platform/gnome-user-docs.nix { };
-}

pkgs/desktops/gnome-3/platform/GConf.nix

@@ -1,23 +0,0 @@
-{ stdenv, fetchurl_gnome, glib, dbus_glib, pkgconfig, libxml2, gtk, intltool }:
-
-stdenv.mkDerivation rec {
-  name = src.pkgname;
-
-  src = fetchurl_gnome {
-    project = "GConf";
-    major = "3"; minor = "2"; patchlevel = "0"; extension = "xz";
-    sha256 = "02vdm6slc2mdw0yfl6lh7qawqcb2k7sk6br21fdj1vfp55ap8wgk";
-  };
-
-  propagatedBuildInputs = [ glib dbus_glib libxml2 gtk ];
-  buildNativeInputs = [ pkgconfig intltool ];
-
-  configureFlags = "--disable-orbit";
-
-  meta = {
-    homepage = http://projects.gnome.org/gconf/;
-    description = "A system for storing application preferences";
-    maintainers = [ stdenv.lib.maintainers.urkud ];
-    inherit (gtk.meta) platforms;
-  };
-}

pkgs/desktops/gnome-3/platform/clutter.nix

@@ -1,24 +0,0 @@
-{ stdenv, fetchurl, glib, pkgconfig, mesa, libX11, libXext, libXfixes
-, libXdamage, libXcomposite, libXi, cogl, pango, atk, json_glib }:
-
-stdenv.mkDerivation {
-  name = "clutter-1.8.2";
-
-  src = fetchurl {
-    url = mirror://gnome/sources/clutter/1.8/clutter-1.8.2.tar.xz;
-    sha256 = "0bzsvnharawfg525lpavrp55mq4aih5nb01dwwqwnccg8hk9z2fw";
-  };
-
-  buildNativeInputs = [ pkgconfig ];
-  buildInputs =
-    [ libX11 mesa libXext libXfixes libXdamage libXcomposite libXi cogl pango
-      atk json_glib
-    ];
-
-  meta = {
-    homepage = http://www.clutter-project.org/;
-    description = "An open source software library for creating fast, compelling, portable, and dynamic graphical user interfaces";
-    platforms = stdenv.lib.platforms.mesaPlatforms;
-    maintainers = [ stdenv.lib.maintainers.urkud ];
-  };
-}

pkgs/desktops/gnome-3/platform/glib-networking.nix

@@ -1,23 +0,0 @@
-{ stdenv, fetchurl, glib, pkgconfig, intltool, gnutls, libgcrypt
-, gsettings_desktop_schemas }:
-
-stdenv.mkDerivation {
-  name = "glib-networking-2.30.2";
-
-  src = fetchurl {
-    url = mirror://gnome/sources/glib-networking/2.30/glib-networking-2.30.2.tar.xz;
-    sha256 = "1g2ran0rn37009fs3xl38m95i5w8sdf9ax0ady4jbjir15844xcz";
-  };
-
-  propagatedBuildInputs = [ glib gnutls libgcrypt ];
-  buildInputs = [ gsettings_desktop_schemas ];
-  buildNativeInputs = [ pkgconfig intltool ];
-
-  configureFlags = "--without-ca-certificates";
-  postConfigure = "export makeFlags=GIO_MODULE_DIR=$out/${glib.gioModuleDir}";
-
-  meta = {
-    TODO = "Look at `--without-ca-certificates` again";
-    inherit (glib.meta) platforms maintainers;
-  };
-}

pkgs/development/compilers/fpc/default.nix

@@ -3,12 +3,12 @@
 let startFPC = import ./binary.nix { inherit stdenv fetchurl; }; in
 
 stdenv.mkDerivation rec {
-  version = "2.4.4";
+  version = "2.6.0";
   name = "fpc-${version}";
 
   src = fetchurl {
     url = "http://downloads.sourceforge.net/sourceforge/freepascal/Source/${version}/fpcbuild-${version}.tar.gz";
-    sha256 = "ecdbc150eecc33f5734e62f1a3507421db8eba6d9074c0c5519a8fc8ffe46924";
+    sha256 = "1vxy2y8pm0ribhpdhqlwwz696ncnz4rk2dafbn1mjgipm97qb26p";
   };
 
   buildInputs = [ startFPC gawk ];

pkgs/development/compilers/fpc/lazarus.nix

@@ -1,9 +1,9 @@
 args : with args; 
 rec {
-  version = "0.9.30";
+  version = "0.9.30.4";
   src = fetchurl {
     url = "mirror://sourceforge/lazarus/Lazarus%20Zip%20_%20GZip/Lazarus%20${version}/lazarus-${version}-src.tar.bz2";
-    sha256 = "ee8ba358e996a6f436f70d15e64976789c2b8f28b2e2dbf1b737de593b4d23e3";
+    sha256 = "0kndg4xf32r6w5hb58d9qvzkyiphhysgnhs2rd9bmlc8sy8c7zmv";
   };
 
   buildInputs = [fpc gtk glib libXi inputproto 

pkgs/development/libraries/GConf/3.x.nix

@@ -0,0 +1,23 @@
+{ stdenv, fetchurl, glib, dbus_glib, pkgconfig, libxml2, gtk3, intltool, polkit }:
+
+stdenv.mkDerivation {
+  name = "GConf-3.2.3";
+
+  src = fetchurl {
+    url = mirror://gnome/sources/GConf/3.2/GConf-3.2.3.tar.xz;
+    sha256 = "0jd1z9gb1b7mv4g07qm554va6idasf3swgrfqflypdh9s38mvdcy";
+  };
+
+  propagatedBuildInputs = [ glib dbus_glib ];
+  buildInputs = [ polkit gtk3 libxml2 ];
+  buildNativeInputs = [ pkgconfig intltool ];
+
+  configureFlags = "--disable-orbit";
+
+  meta = {
+    homepage = http://projects.gnome.org/gconf/;
+    description = "A system for storing application preferences";
+    maintainers = [ stdenv.lib.maintainers.urkud ];
+    inherit (gtk3.meta) platforms;
+  };
+}

pkgs/development/libraries/atk/1.32.x.nix

@@ -1,37 +0,0 @@
-{ stdenv, fetchurl_gnome, pkgconfig, perl, glib }:
-
-stdenv.mkDerivation rec {
-  name = src.pkgname;
-
-  src = fetchurl_gnome {
-    project = "atk";
-    major = "1"; minor = "32"; patchlevel = "0";
-    sha256 = "0vmikhrvh1pb31y1ik4n1a99xs7pv4nhb2sgj6pv2kawyycfb8z9";
-  };
-
-  buildNativeInputs = [ pkgconfig perl ];
-
-  propagatedBuildInputs = [ glib ];
-
-  postInstall = "rm -rf $out/share/gtk-doc";
-  
-  meta = {
-    description = "ATK, the accessibility toolkit";
-
-    longDescription = ''
-      ATK is the Accessibility Toolkit.  It provides a set of generic
-      interfaces allowing accessibility technologies such as screen
-      readers to interact with a graphical user interface.  Using the
-      ATK interfaces, accessibility tools have full access to view and
-      control running applications.
-    '';
-
-    homepage = http://library.gnome.org/devel/atk/;
-
-    license = "LGPLv2+";
-
-    maintainers = [stdenv.lib.maintainers.raskin];
-    platforms = stdenv.lib.platforms.linux;
-  };
-
-}

pkgs/development/libraries/cairomm/default.nix

@@ -1,11 +1,11 @@
 { fetchurl, stdenv, pkgconfig, cairo, x11, fontconfig, freetype, libsigcxx }:
 
 stdenv.mkDerivation rec {
-  name = "cairomm-1.8.4";
+  name = "cairomm-1.10.0";
 
   src = fetchurl {
     url = "http://cairographics.org/releases/${name}.tar.gz";
-    sha256 = "1wf8lvijrk5q5jhxxxfy2yjp97azwdyxfb7kfs8d14wgmzcwd3m2";
+    sha256 = "13rrp96px95m6xnvmsaqb0wcqsnizg3bz334k0yhlyxf7v29d386";
   };
 
   buildInputs = [ pkgconfig ];

pkgs/development/libraries/clutter-gtk/0.10.8.nix

@@ -0,0 +1,26 @@
+{ fetchurl, stdenv, pkgconfig, clutter, gtk }:
+
+stdenv.mkDerivation rec {
+  name = "clutter-gtk-0.10.8";
+
+  src = fetchurl {
+    url = "http://source.clutter-project.org/sources/clutter-gtk/0.10/${name}.tar.bz2";
+    sha256 = "0508x1jfnlq0zhgscysvfa7i7ljkzm23d2myikvdjwc8ar8zjrvq";
+  };
+
+  propagatedBuildInputs = [ clutter gtk ];
+  buildNativeInputs = [ pkgconfig ];
+
+  postBuild = "rm -rf $out/share/gtk-doc";
+
+  meta = {
+    description = "Clutter-GTK";
+
+    homepage = http://www.clutter-project.org/;
+
+    license = "LGPLv2+";
+
+    maintainers = [ stdenv.lib.maintainers.ludo ];
+    platforms = stdenv.lib.platforms.gnu;  # arbitrary choice
+  };
+}

pkgs/development/libraries/clutter-gtk/default.nix

@@ -1,16 +1,15 @@
-{ fetchurl, stdenv, pkgconfig, clutter, gtk }:
+{ fetchurl, stdenv, pkgconfig, clutter, gtk3 }:
 
 stdenv.mkDerivation rec {
-  name = "clutter-gtk-0.10.8";
+  name = "clutter-gtk-1.0.4";
 
   src = fetchurl {
-    url = "http://source.clutter-project.org/sources/clutter-gtk/0.10/${name}.tar.bz2";
+    url = mirror://gnome/sources/clutter-gtk/1.0/clutter-gtk-1.0.4.tar.xz;
-    sha256 = "0508x1jfnlq0zhgscysvfa7i7ljkzm23d2myikvdjwc8ar8zjrvq";
+    sha256 = "0kj6vsvaqxx6vqqk9acc8b0p40klrpwlf2wsjkams1kxxcpzsh87";
   };
 
-  buildInputs = [ pkgconfig clutter gtk ];
+  propagatedBuildInputs = [ clutter gtk3 ];
-
+  buildNativeInputs = [ pkgconfig ];
-  preConfigure = "export V=1";
 
   postBuild = "rm -rf $out/share/gtk-doc";
 
@@ -21,7 +20,7 @@ stdenv.mkDerivation rec {
 
     license = "LGPLv2+";
 
-    maintainers = [ stdenv.lib.maintainers.ludo ];
+    maintainers = with stdenv.lib.maintainers; [ urkud ludo ];
     platforms = stdenv.lib.platforms.gnu;  # arbitrary choice
   };
 }

pkgs/development/libraries/clutter/default.nix

@@ -1,20 +1,18 @@
-{ fetchurl, stdenv, pkgconfig, mesa, libXi, libXfixes, libXdamage
+{ stdenv, fetchurl, glib, pkgconfig, mesa, libX11, libXext, libXfixes
-, libXcomposite, cairo, glib, pango, gtk, json_glib }:
+, libXdamage, libXcomposite, libXi, cogl, pango, atk, json_glib }:
 
-stdenv.mkDerivation rec {
+stdenv.mkDerivation {
-  name = "clutter-1.4.2";
+  name = "clutter-1.8.2";
 
   src = fetchurl {
-    url = "http://source.clutter-project.org/sources/clutter/1.4/${name}.tar.bz2";
+    url = mirror://gnome/sources/clutter/1.8/clutter-1.8.2.tar.xz;
-    sha256 = "14l8wgk5jdwsnjf991qgzl115kjs1xywil2awlrwj1airsn6gzcj";
+    sha256 = "0bzsvnharawfg525lpavrp55mq4aih5nb01dwwqwnccg8hk9z2fw";
   };
 
-  buildInputs = [ pkgconfig ];
+  buildNativeInputs = [ pkgconfig ];
-
-  # There are all listed in the `Requires' field of `clutter-x11-1.0.pc'.
   propagatedBuildInputs =
-    [ mesa cairo glib pango gtk json_glib
+    [ libX11 mesa libXext libXfixes libXdamage libXcomposite libXi cogl pango
-      libXi libXfixes libXdamage libXcomposite
+      atk json_glib
     ];
 
   meta = {
@@ -38,7 +36,7 @@ stdenv.mkDerivation rec {
     license = "LGPLv2+";
     homepage = http://www.clutter-project.org/;
 
-    maintainers = [ stdenv.lib.maintainers.ludo ];
+    maintainers = with stdenv.lib.maintainers; [ urkud ludo ];
-    platforms = stdenv.lib.platforms.gnu;  # arbitrary choice
+    platforms = stdenv.lib.platforms.mesaPlatforms;
   };
 }

pkgs/development/libraries/farstream/default.nix

@@ -2,10 +2,10 @@
 , pygobject, gst_python, gupnp_igd }:
 
 stdenv.mkDerivation rec {
-  name = "farstream-0.1.1";
+  name = "farstream-0.1.2";
   src = fetchurl {
     url = "http://www.freedesktop.org/software/farstream/releases/farstream/${name}.tar.gz";
-    sha256 = "0lmdz7ijpgrc0zbr11jp3msvz44p809scx2m56bk5l5x1xrs123v";
+    sha256 = "1nbkbvq959f70zhr03fwdibhs0sbf1k7zmbz9w99vda7gdcl0nps";
   };
 
   buildInputs = [ libnice python pygobject gst_python gupnp_igd ];

pkgs/development/libraries/gamin/debian-patches.nix

@@ -0,0 +1,10 @@
+# Generated by debian-patches.sh from debian-patches.txt
+let
+  prefix = "http://patch-tracker.debian.org/patch/series/dl/gamin/0.1.10-4";
+in
+[
+  {
+    url = "${prefix}/17_deprecated_const_return.patch";
+    sha256 = "0bssrqcmyivlpk2g0q71d1yavd4wv1lw34l8qipm0ndljjd6rbrk";
+  }
+]

pkgs/development/libraries/gamin/debian-patches.txt

@@ -0,0 +1,2 @@
+gamin/0.1.10-4
+17_deprecated_const_return.patch

pkgs/development/libraries/gamin/default.nix

@@ -8,9 +8,13 @@ stdenv.mkDerivation rec {
     sha256 = "18cr51y5qacvs2fc2p1bqv32rs8bzgs6l67zhasyl45yx055y218";
   };
 
-  buildInputs = [ python pkgconfig glib ];
+  buildNativeInputs = [ pkgconfig ];
+
+  buildInputs = [ python glib ];
 
   # `_GNU_SOURCE' is needed, e.g., to get `struct ucred' from
   # <sys/socket.h> with Glibc 2.9.
   configureFlags = "--disable-debug --with-python=${python} CPPFLAGS=-D_GNU_SOURCE";
+
+  patches = map fetchurl (import ./debian-patches.nix);
 }

pkgs/development/libraries/glib-networking/default.nix

@@ -1,24 +1,21 @@
 {stdenv, fetchurl, pkgconfig, glib, libtool, intltool, gnutls2, libproxy
-  , libgcrypt, libtasn1
+, gsettings_desktop_schemas, libgcrypt, libtasn1 }:
-  }:
 
 stdenv.mkDerivation {
-  name = "glib-networking-2.28.5";
+  name = "glib-networking-2.30.2";
-  
+
   src = fetchurl {
-    url = mirror://gnome/sources/glib-networking/2.28/glib-networking-2.28.5.tar.bz2;
+    url = mirror://gnome/sources/glib-networking/2.30/glib-networking-2.30.2.tar.xz;
-    sha256 = "959ffeb91fee17c1b0fb2aa82872c3daae0230de93708b2ebabeb92b747d7876";
+    sha256 = "1g2ran0rn37009fs3xl38m95i5w8sdf9ax0ady4jbjir15844xcz";
   };
 
-  configureFlags = [
+  configureFlags = "--with-ca-certificates=/etc/ca-bundle.crt";
-    "--without-ca-certificates"
-  ];
   
   preBuild = ''
     sed -e "s@${glib}/lib/gio/modules@$out/lib/gio/modules@g" -i $(find . -name Makefile)
   '';
 
-  buildInputs = [ pkgconfig ];
+  buildNativeInputs = [ pkgconfig intltool ];
-  propagatedBuildInputs = [ glib libtool intltool gnutls2 libproxy libgcrypt 
+  propagatedBuildInputs =
-    libtasn1];
+    [ glib libtool gnutls2 libproxy libgcrypt libtasn1 gsettings_desktop_schemas ];
 }

pkgs/development/libraries/glib/2.28.x.nix

@@ -1,45 +0,0 @@
-{ stdenv, fetchurl_gnome, pkgconfig, gettext, perl, libiconv, zlib }:
-
-# TODO:
-# * Add gio-module-fam
-#     Problem: cyclic dependency on gamin
-#     Possible solution: build as a standalone module, set env. vars
-stdenv.mkDerivation rec {
-  name = src.pkgname;
-
-  src = fetchurl_gnome {
-    project = "glib";
-    major = "2"; minor = "28"; patchlevel = "8"; extension = "xz";
-    sha256 = "0lw3fjsffpnf0cc4j5lkxgllp95qvfq6bir8nh5gds78pmfsjz2d";
-  };
-
-  # configure script looks for d-bus but it is only needed for tests
-  buildInputs = stdenv.lib.optional (!stdenv.isLinux) libiconv;
-  buildNativeInputs = [ perl pkgconfig gettext ];
-
-  propagatedBuildInputs = [ zlib ]
-    ++ stdenv.lib.optional (!stdenv.isLinux) gettext;
-
-  # glib buildsystem fails to find python, thus hardcodes python2.4 in #!
-  postInstall = ''
-    rm -rvf $out/share/gtk-doc
-    sed -e 's@python2\.[0-9]@python@' -i $out/bin/gtester-report'';
-
-  meta = {
-    description = "GLib, a C library of programming buildings blocks";
-
-    longDescription = ''
-      GLib provides the core application building blocks for libraries
-      and applications written in C.  It provides the core object
-      system used in GNOME, the main loop implementation, and a large
-      set of utility functions for strings and common data structures.
-    '';
-
-    homepage = http://www.gtk.org/;
-
-    license = "LGPLv2+";
-
-    maintainers = with stdenv.lib.maintainers; [raskin urkud];
-    platforms = stdenv.lib.platforms.linux;
-  };
-}

pkgs/development/libraries/glib/2.30.x.nix

@@ -1,5 +1,5 @@
 { stdenv, fetchurl, pkgconfig, gettext, perl, libiconv, zlib, libffi
-, python }:
+, python, pcre }:
 
 # TODO:
 # * Add gio-module-fam
@@ -12,22 +12,23 @@
 #       $out/bin/gtester-report' to postInstall if this is solved
 
 stdenv.mkDerivation rec {
-  name = "glib-2.30.2";
+  name = "glib-2.30.3";
 
   src = fetchurl {
-    url = mirror://gnome/sources/glib/2.30/glib-2.30.2.tar.xz;
+    url = mirror://gnome/sources/glib/2.30/glib-2.30.3.tar.xz;
-    sha256 = "10lfzxwc45lh5vfnd33l4m9z1mf3arpwdd8jz94dn79j6diixsgh";
+    sha256 = "09yxfajynbw78kji48z384lylp67kihfi1g78qrrjif4f5yb5jz6";
   };
 
   # configure script looks for d-bus but it is only needed for tests
-  buildInputs = stdenv.lib.optional (!stdenv.isLinux) libiconv;
+  buildInputs = [ pcre ] ++ stdenv.lib.optional (!stdenv.isLinux) libiconv;
   buildNativeInputs = [ perl pkgconfig gettext python ];
 
   propagatedBuildInputs = [ zlib libffi ];
 
+  configureFlags = "--with-pcre=system --disable-fam";
+
   passthru.gioModuleDir = "lib/gio/modules";
 
-  # glib buildsystem fails to find python, thus hardcodes python2.4 in #!
   postInstall = ''rm -rvf $out/share/gtk-doc'';
 
   meta = {

pkgs/development/libraries/glibmm/2.28.x.nix

@@ -1,25 +0,0 @@
-{ stdenv, fetchurl_gnome, pkgconfig, glib, libsigcxx }:
-
-stdenv.mkDerivation rec {
-  name = src.pkgname;
-
-  src = fetchurl_gnome {
-    project = "glibmm";
-    major = "2"; minor = "28"; patchlevel = "2"; extension = "xz";
-    sha256 = "1qyb8jb9avfzcdyhldxx7qljjhf30czwnh7c2r9p0x4nin2rjkpq";
-  };
-
-  buildNativeInputs = [pkgconfig];
-  propagatedBuildInputs = [glib libsigcxx];
-
-  meta = {
-    description = "C++ interface to the GLib library";
-
-    homepage = http://gtkmm.org/;
-
-    license = "LGPLv2+";
-
-    maintainers = with stdenv.lib.maintainers; [urkud raskin];
-    platforms = stdenv.lib.platforms.linux;
-  };
-}

pkgs/development/libraries/glibmm/2.30.x.nix

@@ -1,12 +1,11 @@
-{ stdenv, fetchurl_gnome, pkgconfig, glib, libsigcxx }:
+{ stdenv, fetchurl, pkgconfig, glib, libsigcxx }:
 
 stdenv.mkDerivation rec {
-  name = src.pkgname;
+  name = "glibmm-2.30.1";
 
-  src = fetchurl_gnome {
+  src = fetchurl {
-    project = "glibmm";
+    url = mirror://gnome/sources/glibmm/2.30/glibmm-2.30.1.tar.xz;
-    major = "2"; minor = "30"; patchlevel = "0"; extension = "xz";
+    sha256 = "15zqgx6rashyhxk89qjqq05p6m40akpgzyjk8bfb3jk68rc2nn39";
-    sha256 = "1d0dxq4iamch8igrnbvbfwkfpvcnjfzyr9iq2x8hi89b9k1kzbd7";
   };
 
   buildNativeInputs = [pkgconfig];

pkgs/development/libraries/gtkmm/3.2.x.nix

@@ -0,0 +1,35 @@
+{ stdenv, fetchurl, pkgconfig, gtk3, glibmm, cairomm, pangomm, atkmm }:
+
+stdenv.mkDerivation {
+  name = "gtkmm-3.2.0";
+
+  src = fetchurl {
+    url = mirror://gnome/sources/gtkmm/3.2/gtkmm-3.2.0.tar.xz;
+    sha256 = "1wkljr2vjvjg5mggi4rvk9k4j2kzh8lc106k2yp8gqjlhk2xm5b1";
+  };
+
+  buildNativeInputs = [ pkgconfig ];
+
+  propagatedBuildInputs = [ glibmm gtk3 atkmm cairomm pangomm ];
+
+  meta = {
+    description = "C++ interface to the GTK+ graphical user interface library";
+
+    longDescription = ''
+      gtkmm is the official C++ interface for the popular GUI library
+      GTK+.  Highlights include typesafe callbacks, and a
+      comprehensive set of widgets that are easily extensible via
+      inheritance.  You can create user interfaces either in code or
+      with the Glade User Interface designer, using libglademm.
+      There's extensive documentation, including API reference and a
+      tutorial.
+    '';
+
+    homepage = http://gtkmm.org/;
+
+    license = "LGPLv2+";
+
+    maintainers = with stdenv.lib.maintainers; [ raskin urkud ];
+    platforms = stdenv.lib.platforms.linux;
+  };
+}

pkgs/development/libraries/libchamplain/0.6.nix

@@ -0,0 +1,35 @@
+{ fetchurl, stdenv, pkgconfig, glib, gtk, cairo, clutter, sqlite
+, clutter_gtk_0_10, libsoup /*, libmenphis */ }:
+
+stdenv.mkDerivation rec {
+  name = "libchamplain-0.6.1";
+
+  src = fetchurl {
+    url = "http://download.gnome.org/sources/libchamplain/0.6/${name}.tar.gz";
+    sha256 = "1l1in4khnral157j46aq2d26nviz23icnm353587vcwjhdbw86sg";
+  };
+
+  buildInputs = [ pkgconfig ];
+
+  # These all appear in `champlain{,-gtk}-0.6.pc'.
+  propagatedBuildInputs =
+    [ glib gtk cairo clutter clutter_gtk_0_10 sqlite libsoup ];
+
+  meta = {
+    homepage = http://projects.gnome.org/libchamplain/;
+    license = "LGPLv2+";
+
+    description = "libchamplain, a C library providing a ClutterActor to display maps";
+
+    longDescription =
+      '' libchamplain is a C library providing a ClutterActor to display
+         maps.  It also provides a Gtk+ widget to display maps in Gtk+
+         applications.  Python and Perl bindings are also available.  It
+         supports numerous free map sources such as OpenStreetMap,
+         OpenCycleMap, OpenAerialMap, and Maps for free.
+      '';
+
+     maintainers = [ stdenv.lib.maintainers.ludo ];
+     platforms = stdenv.lib.platforms.gnu;  # arbitrary choice
+  };
+}

pkgs/development/libraries/libchamplain/default.nix

@@ -1,19 +1,17 @@
-{ fetchurl, stdenv, pkgconfig, glib, gtk, cairo, clutter, sqlite
+{ fetchurl, stdenv, pkgconfig, glib, gtk3, cairo, clutter, sqlite
-, clutter_gtk, libsoup /*, libmenphis */ }:
+, clutter_gtk, libsoup /*, libmemphis */ }:
 
 stdenv.mkDerivation rec {
-  name = "libchamplain-0.6.1";
+  name = "libchamplain-0.12.2";
 
   src = fetchurl {
-    url = "http://download.gnome.org/sources/libchamplain/0.6/${name}.tar.gz";
+    url = mirror://gnome/sources/libchamplain/0.12/libchamplain-0.12.2.tar.xz;
-    sha256 = "1l1in4khnral157j46aq2d26nviz23icnm353587vcwjhdbw86sg";
+    sha256 = "0bkyzm378gh6qs7grr2vgzrl4z1pi99yysy8iwzdqzs0bs3rfgyj";
   };
 
   buildInputs = [ pkgconfig ];
 
-  # These all appear in `champlain{,-gtk}-0.6.pc'.
+  propagatedBuildInputs = [ glib gtk3 cairo clutter_gtk sqlite libsoup ];
-  propagatedBuildInputs =
-    [ glib gtk cairo clutter clutter_gtk sqlite libsoup ];
 
   meta = {
     homepage = http://projects.gnome.org/libchamplain/;

pkgs/development/libraries/libgtop/default.nix

@@ -0,0 +1,12 @@
+{ stdenv, fetchurl, glib, pkgconfig, perl, intltool }:
+stdenv.mkDerivation {
+  name = "libgtop-2.28.4";
+
+  src = fetchurl {
+    url = mirror://gnome/sources/libgtop/2.28/libgtop-2.28.4.tar.xz;
+    sha256 = "1n71mg82k8m7p6kh06vgb1hk4y9cqwk1lva53pl7w9j02pyrqqdn";
+  };
+
+  propagatedBuildInputs = [ glib ];
+  buildNativeInputs = [ pkgconfig perl intltool ];
+}

pkgs/development/libraries/libgweather/default.nix

@@ -0,0 +1,13 @@
+{ stdenv, fetchurl, pkgconfig, libxml2, gtk3, intltool, libsoup, GConf3 }:
+
+stdenv.mkDerivation {
+  name = "libgweather-3.4.1";
+
+  src = fetchurl {
+    url = mirror://gnome/sources/libgweather/3.4/libgweather-3.4.1.tar.xz;
+    sha256 = "0q0vkggrbvy2ihwcsfynlv5qk9l3wjinls8yvmkb1qisyc4lv77f";
+  };
+  configureFlags = if stdenv ? glibc then "--with-zoneinfo-dir=${stdenv.glibc}/share/zoneinfo" else "";
+  propagatedBuildInputs = [ libxml2 gtk3 libsoup GConf3 ];
+  buildNativeInputs = [ pkgconfig intltool ];
+}

pkgs/development/libraries/libsoup/default.nix

@@ -1,4 +1,4 @@
-{ stdenv, fetchurl, glib, libxml2, pkgconfig, xz
+{ stdenv, fetchurl, glib, libxml2, pkgconfig
 , gnomeSupport ? true, libgnome_keyring, sqlite, glib_networking }:
 
 stdenv.mkDerivation {

pkgs/development/libraries/libwnck/3.x.nix

@@ -0,0 +1,13 @@
+{stdenv, fetchurl, pkgconfig, libX11, gtk3, intltool}:
+
+stdenv.mkDerivation {
+  name = "libwnck-3.2.1";
+
+  src = fetchurl {
+    url = mirror://gnome/sources/libwnck/3.2/libwnck-3.2.1.tar.xz;
+    sha256 = "1nm34rpr0n559x1ba4kmxbhqclvvnlz0g8xqbbj709q9irnmifpa";
+  };
+
+  buildInputs = [ pkgconfig intltool ];
+  propagatedBuildInputs = [ libX11 gtk3 ];
+}

pkgs/development/libraries/libxml2/default.nix

@@ -3,11 +3,11 @@
 assert pythonSupport -> python != null;
 
 stdenv.mkDerivation {
-  name = "libxml2-2.7.7";
+  name = "libxml2-2.7.8";
 
   src = fetchurl {
-    url = ftp://xmlsoft.org/libxml2/libxml2-sources-2.7.7.tar.gz;
+    url = ftp://xmlsoft.org/libxml2/libxml2-sources-2.7.8.tar.gz;
-    sha256 = "03kkknm7xl77qfdig8mzalsi8ljsyblzin18gy3h8zranffrpyzs";
+    sha256 = "6a33c3a2d18b902cd049e0faa25dd39f9b554a5b09a3bb56ee07dd7938b11c54";
   };
 
   configureFlags = ''                                                  

pkgs/development/libraries/polkit/default.nix

@@ -15,11 +15,11 @@ let
 in
 
 stdenv.mkDerivation rec {
-  name = "polkit-0.102";
+  name = "polkit-0.104";
 
   src = fetchurl {
     url = "http://hal.freedesktop.org/releases/${name}.tar.gz";
-    sha256 = "0hc60nwqnmixavgg0alk4w0llwj5xmm4bw8qh915qvqwhkd76r8a";
+    sha256 = "1yf7307svs8qk76qdlgww1bhgdcia5cm92n16xz7njhy73c162kb";
   };
 
   buildInputs =

pkgs/development/libraries/sofia-sip/default.nix

@@ -0,0 +1,13 @@
+{ stdenv, fetchurl, glib, openssl, pkgconfig }:
+
+stdenv.mkDerivation rec {
+  name = "sofia-sip-1.12.11";
+
+  src = fetchurl {
+    url = "mirror://sourceforge/sofia-sip/${name}.tar.gz";
+    sha256 = "10bwsdfijpbk9ahlfpk94kzdapxiahl9mljpgwghvq1630pbq09b";
+  };
+
+  buildInputs = [ glib openssl ];
+  buildNativeInputs = [ pkgconfig ];
+}

pkgs/development/libraries/telepathy/farsight/default.nix

@@ -1,16 +0,0 @@
-{ stdenv, fetchurl, telepathy_glib, farsight2, gst_plugins_base, dbus_glib
-, pkgconfig, libxslt, python, gstreamer, gst_python, pygobject }:
-
-stdenv.mkDerivation rec {
-  name = "telepathy-farsight-0.0.19";
-
-  src = fetchurl {
-    url = "http://telepathy.freedesktop.org/releases/telepathy-farsight/${name}.tar.gz";
-    sha256 = "0sajy2w109zc6assqby3cfqr7cckwhfsngkhjczz67grb6rbi29c";
-  };
-
-  buildInputs = [ gst_plugins_base gst_python pygobject ];
-
-  propagatedBuildInputs = [ dbus_glib farsight2 telepathy_glib gstreamer ];
-  buildNativeInputs = [ pkgconfig python libxslt];
-}

pkgs/development/libraries/telepathy/farstream/default.nix

@@ -2,12 +2,12 @@
 , pkgconfig, libxslt, python, gstreamer, gst_python, pygobject }:
 
 stdenv.mkDerivation rec {
-  name = "${pname}-0.2.2";
+  name = "${pname}-0.2.3";
   pname = "telepathy-farstream";
 
   src = fetchurl {
     url = "http://telepathy.freedesktop.org/releases/${pname}/${name}.tar.gz";
-    sha256 = "0gdcf50dz1hf22az5jqal2jlzbb1nl2cim579kv3q87b8lq9aplv";
+    sha256 = "1a163gk9y3ckabm4a43lxc5a7j2s42hykbwr6r7b5mlfyqq8myx1";
   };
 
   buildInputs = [ gst_plugins_base gst_python pygobject ];

pkgs/development/libraries/telepathy/glib/default.nix

@@ -1,11 +1,11 @@
 { stdenv, fetchurl, dbus_glib, glib, python, pkgconfig, libxslt }:
 
 stdenv.mkDerivation rec {
-  name = "telepathy-glib-0.17.5";
+  name = "telepathy-glib-0.17.7";
 
   src = fetchurl {
     url = "${meta.homepage}/releases/telepathy-glib/${name}.tar.gz";
-    sha256 = "13gylgwgjp29zakzj5kb4h0j5zh30dsl8ch7hp3dp4nmy4vdj6h1";
+    sha256 = "1brzw0cqawcyh7rffzbmydzbymrrsmzf8rksgamiqpwsdvcnksxz";
   };
 
   propagatedBuildInputs = [dbus_glib glib python];

pkgs/development/libraries/telepathy/glib/fix-pkgconfig.patch

@@ -8,7 +8,7 @@ index e2ddf03..6038011 100644
  Description: GLib utility library for the Telepathy framework
  Version: @VERSION@
 -Requires: pkg-config >= 0.21
--Requires.private: dbus-glib-1 >= 0.82, glib-2.0 >= 2.24, gobject-2.0 >= 2.24, gio-2.0 >= 2.24
+-Requires.private: dbus-1 >= 0.95, dbus-glib-1 >= 0.90, glib-2.0 >= 2.30, gobject-2.0 >= 2.30, gio-2.0 >= 2.30
-+Requires: pkg-config >= 0.21 dbus-glib-1 >= 0.82, glib-2.0 >= 2.24, gobject-2.0 >= 2.24, gio-2.0 >= 2.24
++Requires: pkg-config >= 0.21 dbus-1 >= 0.95, dbus-glib-1 >= 0.90, glib-2.0 >= 2.30, gobject-2.0 >= 2.30, gio-2.0 >= 2.30
  Libs: -L${libdir} -ltelepathy-glib
  Cflags: -I${includedir}/telepathy-1.0

pkgs/development/libraries/telepathy/qt/default.nix

@@ -1,20 +1,17 @@
 { stdenv, fetchurl, cmake, qt4, pkgconfig, python, libxslt, dbus_glib
-, telepathy_farsight, telepathy_glib }:
+, telepathy_farstream, telepathy_glib }:
 
 stdenv.mkDerivation rec {
-  name = "telepathy-qt-0.9.0";
+  name = "telepathy-qt-0.9.1";
 
   src = fetchurl {
     url = "http://telepathy.freedesktop.org/releases/telepathy-qt/${name}.tar.gz";
-    sha256 = "0v3hnvzm3k2z99rc1znxgriqvf1n7wyjdzzsld0czhbmrz9fhang";
+    sha256 = "0rwyxjk6646r43mvsg01q7rfsah0ni05fa8gxzlx1zhj76db95yh";
   };
 
   buildNativeInputs = [ cmake pkgconfig python libxslt ];
-  propagatedBuildInputs = [ qt4 dbus_glib telepathy_farsight telepathy_glib ];
+  propagatedBuildInputs = [ qt4 dbus_glib telepathy_farstream telepathy_glib ];
-
-  patches = [ ./missing-include.patch ];
-
   preBuild = ''
-    NIX_CFLAGS_COMPILE+=" `pkg-config --cflags farsight2-0.10 dbus-glib-1`"
+    NIX_CFLAGS_COMPILE+=" `pkg-config --cflags dbus-glib-1`"
-    '';
+  '';
 }

pkgs/development/libraries/telepathy/qt/missing-include.patch

@@ -1,11 +0,0 @@
-diff --git a/TelepathyQt/Farsight/CMakeLists.txt b/TelepathyQt/Farsight/CMakeLists.txt
-index 89ec354..376f3cc 100644
---- a/TelepathyQt/Farsight/CMakeLists.txt
-+++ b/TelepathyQt/Farsight/CMakeLists.txt
-@@ -1,5 +1,6 @@
- if(FARSIGHT_COMPONENTS_FOUND)
-     include_directories(${TELEPATHY_FARSIGHT_INCLUDE_DIR}
-+                        ${TELEPATHY_GLIB_INCLUDE_DIR}
-                         ${GSTREAMER_INCLUDE_DIR}
-                         ${GLIB2_INCLUDE_DIR}
-                         ${LIBXML2_INCLUDE_DIR}

pkgs/development/libraries/webkit/default.nix

@@ -14,6 +14,7 @@ rec {
     sqlite icu gperf bison flex autoconf automake libtool 
     perl intltool pkgconfig libsoup gtkdoc libXt libproxy
     enchant python ruby which renderproto libXrender geoclue
+    kbproto
     ];
 
   propagatedBuildInputs = [
@@ -25,22 +26,20 @@ rec {
     "--enable-web-sockets"
     "--enable-web-timing"
     
-    # https://bugs.webkit.org/show_bug.cgi?id=55294
-    # "--enable-image-resizer"
-
     "--enable-geolocation"
 
     # Not implemented?
-    # "--enable-web-audio"
+    #"--enable-web-audio"
 
     "--enable-mathml"
 
     #"--enable-wml"
     
     # https://bugs.webkit.org/show_bug.cgi?id=45110
-    # "--enable-indexed-database"
+    #"--enable-indexed-database"
 
-    "--enable-xhtmlmp"
+    # Doesn't work in release...
+    #"--enable-xhtmlmp"
 
     # "--enable-input-speech"
 
@@ -48,10 +47,10 @@ rec {
     "--enable-blob"
 
     # https://bugs.webkit.org/show_bug.cgi?id=59430
-    # "--enable-directory-upload"
+    #"--enable-directory-upload"
 
     # https://bugs.webkit.org/show_bug.cgi?id=58443
-    # "--enable-file-system"
+    #"--enable-file-system"
     ];
 
   /* doConfigure should be specified separately */

pkgs/development/libraries/webkit/gtk2.nix

@@ -0,0 +1,91 @@
+
+args : with args; 
+let 
+  s = import ./src-for-gtk2.nix;
+  version = lib.attrByPath ["version"] s.version args;
+in
+rec {
+  src = fetchurl {
+    url = s.url;
+    sha256 = s.hash;
+  };
+
+  buildInputs = [gtk glib atk cairo curl fontconfig freetype
+    gettext libjpeg libpng libtiff libxml2 libxslt pango
+    sqlite icu gperf bison flex autoconf automake libtool 
+    perl intltool pkgconfig libsoup gtkdoc libXt libproxy
+    enchant python ruby which renderproto libXrender geoclue
+    ];
+
+  propagatedBuildInputs = [
+    gstreamer gst_plugins_base gst_ffmpeg gst_plugins_good
+    ];
+
+  configureFlags = [
+    "--enable-3D-transforms"
+    "--enable-web-sockets"
+    "--enable-web-timing"
+    
+    # https://bugs.webkit.org/show_bug.cgi?id=55294
+    # "--enable-image-resizer"
+
+    "--enable-geolocation"
+
+    # Not implemented?
+    # "--enable-web-audio"
+
+    "--enable-mathml"
+
+    #"--enable-wml"
+    
+    # https://bugs.webkit.org/show_bug.cgi?id=45110
+    # "--enable-indexed-database"
+
+    "--enable-xhtmlmp"
+
+    # "--enable-input-speech"
+
+    "--enable-file-writer"
+    "--enable-blob"
+
+    # https://bugs.webkit.org/show_bug.cgi?id=59430
+    # "--enable-directory-upload"
+
+    # https://bugs.webkit.org/show_bug.cgi?id=58443
+    # "--enable-file-system"
+    ];
+
+  /* doConfigure should be specified separately */
+  phaseNames = ["setVars" /* "paranoidFixComments" */ "doConfigure" (doPatchShebangs ".") 
+    "doReplaceUsrBin" "doMakeInstall" "doAddPrograms"];
+
+  setVars = fullDepEntry (''
+    export NIX_LDFLAGS="$NIX_LDFLAGS -lXt"
+  '') ["minInit"];
+
+  doReplaceUsrBin = fullDepEntry (''
+    for i in $(find . -name '*.pl') $(find . -name '*.pm'); do 
+        sed -e 's@/usr/bin/gcc@gcc@' -i $i
+    done
+  '') ["minInit" "doUnpack"];
+
+  doAddPrograms = fullDepEntry (''
+    mkdir -p $out/bin
+    for i in Programs/.libs/* Programs/*; do 
+        cp $i $out/bin/webkit-program-$(basename $i) || true
+    done
+  '') ["minInit" "doMake" "defEnsureDir"];
+      
+  paranoidFixComments = fullDepEntry (''
+    sed -re 's@( |^)//.*@/* & */@' -i $(find . -name '*.c' -o -name '*.h')
+  '') ["minInit" "doUnpack"];
+
+  name = s.name;
+  meta = {
+    description = "WebKit - a fast and correct HTML renderer";
+    maintainers = [stdenv.lib.maintainers.raskin];
+  };
+  passthru = {
+    inherit gstreamer gst_plugins_base gst_plugins_good gst_ffmpeg;
+  };
+}

pkgs/development/libraries/webkit/src-for-default.nix

@@ -1,9 +1,9 @@
 rec {
-   version="1.4.0";
+   version="1.6.3";
-   name="webkit-1.4.0";
+   name="webkit-1.6.3";
-   hash="123zllzlnkjgw4d2ag73dvrjmkikbapxlz5730ps6y4qm43gxc1y";
+   hash="1hvph13ak7a85qmj1ikanwxf2nn53m5f6a50j627lp49db7dpl0j";
-   url="http://webkitgtk.org/webkit-1.4.0.tar.gz";
+   url="http://webkitgtk.org/webkit-1.6.3.tar.xz";
-   advertisedUrl="http://webkitgtk.org/webkit-1.4.0.tar.gz";
+   advertisedUrl="http://webkitgtk.org/webkit-1.6.3.tar.xz";
   
   
 }

pkgs/development/libraries/webkit/src-for-gtk2.nix

@@ -0,0 +1,9 @@
+rec {
+   version="1.4.0";
+   name="webkit-1.4.0";
+   hash="123zllzlnkjgw4d2ag73dvrjmkikbapxlz5730ps6y4qm43gxc1y";
+   url="http://webkitgtk.org/webkit-1.4.0.tar.gz";
+   advertisedUrl="http://webkitgtk.org/webkit-1.4.0.tar.gz";
+  
+  
+}

pkgs/development/tools/documentation/gnome-doc-utils/default.nix

@@ -2,11 +2,11 @@
 , makeWrapper, pythonPackages }:
 
 stdenv.mkDerivation {
-  name = "gnome-doc-utils-0.18.1";
+  name = "gnome-doc-utils-0.20.7";
 
   src = fetchurl {
-    url = mirror://gnome/sources/gnome-doc-utils/0.18/gnome-doc-utils-0.18.1.tar.bz2;
+    url = mirror://gnome/sources/gnome-doc-utils/0.20/gnome-doc-utils-0.20.7.tar.xz;
-    sha256 = "0psl9xnph6qga809dbkakjfp2z9mc32dxrdk8s6zn8whm41gc0gn";
+    sha256 = "01lcq6gm4q9awvg7lccq43qh8g4ibz49s2mgykin78mgph9h396q";
   };
 
   configureFlags = "--disable-scrollkeeper";

pkgs/development/tools/documentation/gtk-doc/default.nix

@@ -1,12 +1,12 @@
-{ stdenv, fetchurl, pkgconfig, perl, python, libxml2, libxslt
+{ stdenv, fetchurl, pkgconfig, perl, python, libxml2Python, libxslt, which
-, docbook_xml_dtd_43, docbook_xsl, gnome_doc_utils, dblatex }:
+, docbook_xml_dtd_43, docbook_xsl, gnome_doc_utils, dblatex, gettext }:
 
-let version = "1.15"; in
 stdenv.mkDerivation {
-  name = "gtk-doc-${version}";
+  name = "gtk-doc-1.18";
+
   src = fetchurl {
-    url = "mirror://gnome/sources/gtk-doc/${version}/gtk-doc-${version}.tar.bz2";
+    url = mirror://gnome/sources/gtk-doc/1.18/gtk-doc-1.18.tar.xz;
-    sha256 = "0ca8wh67nyh574ahlfkx8k9w2bm4ji9yzxvi3afsicqdpyx77k2r";
+    sha256 = "084scak99ppgqk5lkziskhcsd3jmcgf7a98ddwhciq8vaqf5jnvq";
   };
 
   # maybe there is a better way to pass the needed dtd and xsl files
@@ -26,7 +26,7 @@ stdenv.mkDerivation {
   '';
 
   buildInputs =
-   [ pkgconfig perl python libxml2 libxslt docbook_xml_dtd_43 docbook_xsl
+   [ pkgconfig perl python libxml2Python libxslt docbook_xml_dtd_43 docbook_xsl
-     gnome_doc_utils dblatex
+     gnome_doc_utils dblatex gettext which
    ];
 }

pkgs/development/tools/misc/autogen/default.nix

@@ -1,13 +1,13 @@
 { fetchurl, stdenv, guile, which }:
 
-let version = "5.11.6"; in
+let version = "5.15"; in
 
   stdenv.mkDerivation {
     name = "autogen-${version}";
 
     src = fetchurl {
       url = "mirror://gnu/autogen/rel${version}/autogen-${version}.tar.gz";
-      sha256 = "013xy0f3hv1cw62nwh4r1x46zs9sndydaz31kd6889dp5p0snfkw";
+      sha256 = "8a37effa66d285471851e445d3bdeb60c0940f9efd7852828ebb8116e1c5cc1f";
     };
 
     buildInputs = [ guile which ];

pkgs/games/sgt-puzzles/default.nix

@@ -10,15 +10,15 @@ in
 rec {
   src = fetchsvn {
    url = svn://svn.tartarus.org/sgt/puzzles;
-   rev = "8872";
+   rev = "9437";
-   sha256 = "16hcrhkl6plzdhw60g7i4vgkxcc4mw4h4bzg2myy5cfhpx7y0m9s";
+   sha256 = "4820ce1e54e017a64dd9cb8991c020d0628329605a37af2a99b78bffbde43e85";
   } + "/";
 
   inherit buildInputs;
   configureFlags = [];
   makeFlags = ["prefix=$out" "gamesdir=$out/bin"];
 
-  neededDirs = ["$out/bin" "$out/share" ""];
+  neededDirs = ["$out/bin" "$out/share"];
   extraDoc = ["puzzles.txt"];
 
   mkMakefiles = a.fullDepEntry ''

pkgs/servers/squid/squids.nix

@@ -30,11 +30,11 @@ rec {
     configureFlags = ["--enable-ipv6"];
   };
 
-  squid32Beta = squid30.merge {
+  squid32Beta = squid30.merge rec {
-    name = "squid-3.2.0.11";
+    name = "squid-3.2.0.16";
     src = args.fetchurl {
-      url = http://www.squid-cache.org/Versions/v3/3.2/squid-3.2.0.11.tar.bz2;
+      url = "http://www.squid-cache.org/Versions/v3/3.2/${name}.tar.bz2";
-      sha256 = "aa5b9a85e1a90c4adb591c3e796c3fdfb166d8d2c814165d70692636321f69ae";
+      sha256 = "2431f4f9372e4e1a9c5fca5a4fa0c4bb0761ce3e044642ea9362bb1580a36d25";
     };
     configureFlags = ["--enable-ipv6"];
     buildInputs = [openldap pam db4 cyrus_sasl libcap expat libxml2

pkgs/tools/networking/ripmime/default.nix

@@ -11,10 +11,10 @@ let
     (builtins.attrNames (builtins.removeAttrs x helperArgNames));
   sourceInfo = rec {
     baseName="ripmime";
-    version="1.4.0.9";
+    version="1.4.0.10";
     name="${baseName}-${version}";
     url="http://www.pldaniels.com/${baseName}/${name}.tar.gz";
-    hash="15c48n8n8qavdigw5qycnwp6gys9dv3mgk18ylf5hd4491nnnrhz";
+    hash="0sj06ibmlzy34n8v0mnlq2gwidy7n2aqcwgjh0xssz3vi941aqc9";
   };
 in
 rec {

pkgs/tools/package-management/nix/custom.nix

@@ -24,7 +24,7 @@ stdenv.mkDerivation {
   
   inherit src;
 
-  buildInputs = [perl curl openssl] 
+  buildInputs = [perl curl openssl bzip2 ] 
   	++ (if automake != null then [automake] else [])
   	++ (if autoconf != null then [autoconf] else [])
   	++ (if libtool != null then [libtool] else [])

pkgs/tools/security/polkit-gnome/default.nix

@@ -1,22 +1,28 @@
-{ stdenv, fetchurl, pkgconfig, gtk, polkit, dbus_glib, intltool }:
+{ stdenv, fetchurl, polkit, gtk3, pkgconfig, intltool }:
-stdenv.mkDerivation rec {
 
-  name = "polkit-gnome-${version}";
+stdenv.mkDerivation {
-  version = "0.96";
+  name = "polkit-gnome-0.105";
 
   src = fetchurl {
-    url = http://hal.freedesktop.org/releases/polkit-gnome-0.96.tar.bz2;
+    url = mirror://gnome/sources/polkit-gnome/0.105/polkit-gnome-0.105.tar.xz;
-    sha256 = "14la7j3h1k1s88amkcv8rzq9wmhgzypvxpwaxwg2x2k55l1wi5hd";
+    sha256 = "0sckmcbxyj6sbrnfc5p5lnw27ccghsid6v6wxq09mgxqcd4lk10p";
   };
 
-  buildInputs = [ pkgconfig gtk polkit dbus_glib intltool ];
+  buildInputs = [ polkit gtk3 ];
+  buildNativeInputs = [ pkgconfig intltool ];
 
-  configureFlags = [ "--disable-introspection" ];
+  configureFlags = "--disable-introspection";
 
-  meta = with stdenv.lib; {
+  # Desktop file from Debian
+  postInstall = ''
+    mkdir -p $out/etc/xdg/autostart
+    substituteAll ${./polkit-gnome-authentication-agent-1.desktop} $out/etc/xdg/autostart/polkit-gnome-authentication-agent-1.desktop
+    '';
+
+  meta = {
     homepage = http://hal.freedesktop.org/docs/PolicyKit/;
     description = "A dbus session bus service that is used to bring up authentication dialogs";
-    license = licenses.gpl2;
+    license = stdenv.lib.licenses.gpl2;
-    maintainers = [ maintainers.phreedom ];
+    maintainers = with stdenv.lib.maintainers; [ urkud phreedom ];
   };
-}
+}

pkgs/tools/security/polkit-gnome/polkit-gnome-authentication-agent-1.desktop

@@ -0,0 +1,88 @@
+[Desktop Entry]
+Name=PolicyKit Authentication Agent
+Name[ar]=مدير الاستيثاق PolicyKit
+Name[be]=PolicyKit - аґент аўтэнтыфікацыі
+Name[bn_IN]=PolicyKit অনুমোদনের এজেন্ট
+Name[ca]=Agent d'autenticació del PolicyKit
+Name[cs]=Ověřovací agent PolicyKit
+Name[da]=Godkendelsesprogrammet PolicyKit
+Name[de]=Legitimationsdienst von PolicyKit
+Name[el]=Πράκτορας πιστοποίησης PolicyKit
+Name[en_GB]=PolicyKit Authentication Agent
+Name[es]=Agente de autenticación de PolicyKit
+Name[eu]=PolicyKit autentifikatzeko agentea
+Name[fi]=PolicytKit-tunnistautumisohjelma
+Name[fr]=Agent d'authentification de PolicyKit
+Name[gl]=Axente de autenticación PolicyKit
+Name[gu]=PolicyKit સત્તાધિકરણ એજન્ટ
+Name[hi]=PolicyKit प्रमाणीकरण प्रतिनिधि
+Name[hu]=PolicyKit hitelesítési ügynök
+Name[it]=Agente di autenticazione per PolicyKit
+Name[ja]=PolicyKit 認証エージェント
+Name[kn]=PolicyKit ದೃಢೀಕರಣ ಮಧ್ಯವರ್ತಿ
+Name[lt]=PolicyKit tapatybės nustatymo agentas
+Name[ml]=പോളിസിക്കിറ്റ് ഓഥന്റിക്കേഷന്‍ ഏജന്റ്
+Name[mr]=PolicyKit ऑथेंटीकेशन एजेंट
+Name[or]=PolicyKit ବୈଧିକରଣ ସଦସ୍ୟ
+Name[pa]=ਪਾਲਸੀਕਿੱਟ ਪਰਮਾਣਕਿਤਾ ਏਜੰਟ
+Name[pl]=Agent uwierzytelniania PolicyKit
+Name[pt]=Agente de Autenticação PolicyKit
+Name[pt_BR]=Agente de autenticação PolicyKit
+Name[ro]=Agent de autentificare PolicyKit
+Name[sk]=Agent PolicyKit na overovanie totožnosti
+Name[sl]=PolicyKit program overjanja
+Name[sv]=Autentiseringsagent för PolicyKit
+Name[ta]=PolicyKit அங்கீகார முகவர்
+Name[te]=పాలసీకిట్ ధృవీకరణ ప్రతినిధి
+Name[th]=ตัวกลางสำหรับยืนยันตัวบุคคล PolicyKit
+Name[uk]=Агент автентифікації PolicyKit
+Name[zh_CN]=PolicyKit 认证代理
+Name[zh_HK]=PolicyKit 驗證代理程式
+Name[zh_TW]=PolicyKit 驗證代理程式
+Comment=PolicyKit Authentication Agent
+Comment[ar]=مدير الاستيثاق PolicyKit
+Comment[be]=PolicyKit - аґент аўтэнтыфікацыі
+Comment[bn_IN]=PolicyKit অনুমোদনের এজেন্ট
+Comment[ca]=Agent d'autenticació del PolicyKit
+Comment[cs]=Ověřovací agent PolicyKit
+Comment[da]=Godkendelsesprogrammet PolicyKit
+Comment[de]=Legitimationsdienst von PolicyKit
+Comment[el]=Πράκτορας πιστοποίησης PolicyKit
+Comment[en_GB]=PolicyKit Authentication Agent
+Comment[es]=Agente de autenticación de PolicyKit
+Comment[eu]=PolicyKit autentifikatzeko agentea
+Comment[fi]=PolicytKit-tunnistautumisohjelma
+Comment[fr]=Agent d'authentification de PolicyKit
+Comment[gl]=Axente de autenticación PolicyKit
+Comment[gu]=PolicyKit સત્તાધિકરણ એજન્ટ
+Comment[hi]=PolicyKit प्रमाणीकरण प्रतिनिधि
+Comment[hu]=PolicyKit hitelesítési ügynök
+Comment[it]=Agente di autenticazione per PolicyKit
+Comment[ja]=PolicyKit 認証エージェント
+Comment[kn]=PolicyKit ದೃಢೀಕರಣ ಮಧ್ಯವರ್ತಿ
+Comment[lt]=PolicyKit tapatybės nustatymo agentas
+Comment[ml]=പോളിസിക്കിറ്റ് ഓഥന്റിക്കേഷന്‍ ഏജന്റ്
+Comment[mr]=PolicyKit ऑथेंटीकेशन एजेंट
+Comment[or]=PolicyKit ବୈଧିକରଣ ସଦସ୍ୟ
+Comment[pa]=ਪਾਲਸੀਕਿੱਟ ਪਰਮਾਣਕਿਤਾ ਏਜੰਟ
+Comment[pl]=Agent uwierzytelniania PolicyKit
+Comment[pt]=Agente de Autenticação PolicyKit
+Comment[pt_BR]=Agente de autenticação PolicyKit
+Comment[ro]=Agent de autentificare PolicyKit
+Comment[sk]=Agent PolicyKit na overovanie totožnosti
+Comment[sl]=PolicyKit program overjanja
+Comment[sv]=Autentiseringsagent för PolicyKit
+Comment[ta]=PolicyKit அங்கீகார முகவர்
+Comment[te]=పాలసీకిట్ ధృవీకరణ ప్రతినిధి
+Comment[th]=ตัวกลางสำหรับยืนยันตัวบุคคล PolicyKit
+Comment[uk]=Агент автентифікації PolicyKit
+Comment[zh_CN]=PolicyKit 认证代理
+Comment[zh_HK]=PolicyKit 驗證代理程式
+Comment[zh_TW]=PolicyKit 驗證代理程式
+Exec=@out@/libexec/polkit-gnome-authentication-agent-1
+Terminal=false
+Type=Application
+Categories=
+NoDisplay=true
+OnlyShowIn=GNOME;XFCE;Unity;
+AutostartCondition=GNOME3 unless-session gnome

pkgs/top-level/all-packages.nix

@@ -3038,6 +3038,8 @@ let
 
   global = callPackage ../development/tools/misc/global { };
 
+  gnome_doc_utils = callPackage ../development/tools/documentation/gnome-doc-utils {};
+
   gnum4 = callPackage ../development/tools/misc/gnum4 { };
 
   gnumake = callPackage ../development/tools/build-managers/gnumake { };
@@ -3051,6 +3053,8 @@ let
 
   gperf = callPackage ../development/tools/misc/gperf { };
 
+  gtk_doc = callPackage ../development/tools/documentation/gtk-doc { };
+
   gtkdialog = callPackage ../development/tools/misc/gtkdialog { };
 
   guileLint = callPackage ../development/tools/guile/guile-lint { };
@@ -3329,6 +3333,7 @@ let
   clutter = callPackage ../development/libraries/clutter { };
 
   clutter_gtk = callPackage ../development/libraries/clutter-gtk { };
+  clutter_gtk_0_10 = callPackage ../development/libraries/clutter-gtk/0.10.8.nix { };
 
   cminpack = callPackage ../development/libraries/cminpack { };
 
@@ -3484,6 +3489,8 @@ let
 
   gav = callPackage ../games/gav { };
 
+  GConf3 = callPackage ../development/libraries/GConf/3.x.nix { };
+
   gdome2 = callPackage ../development/libraries/gdome2 {
     inherit (gnome) gtkdoc;
   };
@@ -3733,9 +3740,9 @@ let
       gtkmm;
   };
 
-  glib = callPackage ../development/libraries/glib/2.28.x.nix { };
+  glib = callPackage ../development/libraries/glib/2.30.x.nix { };
 
-  glibmm = callPackage ../development/libraries/glibmm/2.28.x.nix { };
+  glibmm = callPackage ../development/libraries/glibmm/2.30.x.nix { };
 
   glib_networking = callPackage ../development/libraries/glib-networking {};
 
@@ -3756,6 +3763,7 @@ let
   gtk = pkgs.gtk2;
 
   gtkmm = callPackage ../development/libraries/gtkmm/2.24.x.nix { };
+  gtkmm3 = callPackage ../development/libraries/gtkmm/3.2.x.nix { };
 
   gtk3 = lowPrio (callPackage ../development/libraries/gtk+/3.2.x.nix { });
 
@@ -3925,6 +3933,8 @@ let
     inherit (gnome) libsoup;
   };
 
+  libchamplain_0_6 = callPackage ../development/libraries/libchamplain/0.6.nix {};
+
   libchop = callPackage ../development/libraries/libchop { };
 
   libcm = callPackage ../development/libraries/libcm { };
@@ -3987,6 +3997,11 @@ let
   libgdata_0_6 = (newScope gnome) ../development/libraries/libgdata/0.6.nix {};
 
   libgnome_keyring = callPackage ../development/libraries/libgnome-keyring { };
+  libgnome_keyring3 = callPackage ../development/libraries/libgnome-keyring/3.x.nix { };
+
+  libgtop = callPackage ../development/libraries/libgtop {};
+
+  libgweather = callPackage ../development/libraries/libgweather {};
 
   liblo = callPackage ../development/libraries/liblo { };
 
@@ -4194,7 +4209,7 @@ let
 
   libsndfile = callPackage ../development/libraries/libsndfile { };
 
-  libsoup = pkgs.gnome.libsoup;
+  libsoup = callPackage ../development/libraries/libsoup { };
 
   libssh = callPackage ../development/libraries/libssh { };
 
@@ -4259,6 +4274,9 @@ let
 
   libwmf = callPackage ../development/libraries/libwmf { };
 
+  libwnck = callPackage ../development/libraries/libwnck { };
+  libwnck3 = callPackage ../development/libraries/libwnck/3.x.nix { };
+
   libwpd = callPackage ../development/libraries/libwpd { };
 
   libwpd_08 = callPackage ../development/libraries/libwpd/0.8.nix { };
@@ -4651,6 +4669,8 @@ let
         # optional
   };
 
+  sofia_sip = callPackage ../development/libraries/sofia-sip { };
+
   soprano = callPackage ../development/libraries/soprano { };
 
   soqt = callPackage ../development/libraries/soqt { };
@@ -4707,8 +4727,6 @@ let
 
   telepathy_glib = callPackage ../development/libraries/telepathy/glib { };
 
-  telepathy_farsight = callPackage ../development/libraries/telepathy/farsight { };
-
   telepathy_farstream = callPackage ../development/libraries/telepathy/farstream {};
 
   telepathy_qt = callPackage ../development/libraries/telepathy/qt { };
@@ -4755,6 +4773,23 @@ let
 
   webkit =
     builderDefsPackage ../development/libraries/webkit {
+      inherit (gnome) gtkdoc libsoup;
+      inherit atk pango glib;
+      gtk = gtk3;
+      inherit freetype fontconfig gettext gperf curl
+        libjpeg libtiff libxml2 libxslt sqlite
+        icu cairo intltool automake libtool
+        pkgconfig autoconf bison libproxy enchant
+        python ruby which flex geoclue;
+      inherit gstreamer gst_plugins_base gst_ffmpeg
+        gst_plugins_good;
+      inherit (xlibs) libXt renderproto libXrender kbproto;
+      libpng = libpng12;
+      perl = perl510;
+    };
+
+  webkit_gtk2 = 
+    builderDefsPackage ../development/libraries/webkit/gtk2.nix {
       inherit (gnome) gtkdoc libsoup;
       inherit gtk atk pango glib;
       inherit freetype fontconfig gettext gperf curl
@@ -6182,6 +6217,8 @@ let
 
   gentium = callPackage ../data/fonts/gentium {};
 
+  gnome_user_docs = callPackage ../data/documentation/gnome-user-docs { };
+
   gsettings_desktop_schemas = callPackage ../data/misc/gsettings-desktop-schemas {};
 
   hicolor_icon_theme = callPackage ../data/misc/hicolor-icon-theme { };
@@ -7023,7 +7060,7 @@ let
     inherit imagemagick intltool python pkgconfig webkit libxml2
       which gettext makeWrapper file libidn sqlite docutils libnotify
       vala dbus_glib;
-    inherit gtk glib;
+    inherit gtk3 glib;
     inherit (gnome) gtksourceview;
     inherit (webkit.passthru.args) libsoup;
     inherit (xlibs) kbproto xproto libXScrnSaver scrnsaverproto;
@@ -7409,6 +7446,8 @@ let
 
   telepathy_mission_control = callPackage ../applications/networking/instant-messengers/telepathy/mission-control { };
 
+  telepathy_rakia = callPackage ../applications/networking/instant-messengers/telepathy/rakia { };
+
   telepathy_salut = callPackage ../applications/networking/instant-messengers/telepathy/salut {};
 
   tesseract = callPackage ../applications/graphics/tesseract { };
@@ -7454,7 +7493,7 @@ let
 
   uzbl = builderDefsPackage (import ../applications/networking/browsers/uzbl) {
     inherit pkgconfig webkit makeWrapper glib_networking;
-    inherit gtk glib;
+    inherit gtk3 glib;
     inherit (xlibs) libX11 kbproto;
     inherit (gnome) libsoup;
   };
@@ -7939,14 +7978,13 @@ let
   #   import ../desktops/e17 { inherit callPackage pkgs; }
   # );
 
-  gnome2 = (callPackage ../desktops/gnome-2 {
+  gnome2 = callPackage ../desktops/gnome-2 {
     callPackage = pkgs.newScope pkgs.gnome2;
     self = pkgs.gnome2;
-  }  // pkgs.gtkLibs);
+  }  // pkgs.gtkLibs // {
-
+    # Backwards compatibility;
-  gnome3 = (import ../desktops/gnome-3 {
+    inherit (pkgs) libsoup libwnck gtk_doc gnome_doc_utils;
-    callPackage = pkgs.newScope pkgs.gnome3;
+  };
-  });
 
   gnome = recurseIntoAttrs gnome2;