From 240df3a3e03540971843c69f3146be0d638f8e96 Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Fri, 9 Mar 2012 06:13:05 +0000
Subject: [PATCH 01/50] glib-2.30, glibmm-2.30

svn path=/nixpkgs/branches/glib-2.30-take2/; revision=32940
---
 pkgs/top-level/all-packages.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a061aa18e3c..5a62e30ab4a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3715,9 +3715,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 {};
 

From dc4833f7733c25ec96e76091400301d386e0f236 Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Fri, 9 Mar 2012 06:13:10 +0000
Subject: [PATCH 02/50] polkit-0.104

cherry-pick ^/nixpkgs/branches/glib-2.30@31425

svn path=/nixpkgs/branches/glib-2.30-take2/; revision=32941
---
 pkgs/development/libraries/polkit/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/polkit/default.nix b/pkgs/development/libraries/polkit/default.nix
index f2301a9621c..dd83d7dfd8f 100644
--- a/pkgs/development/libraries/polkit/default.nix
+++ b/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 =

From 7331031c0c0e7fb14df6067d07f70e3b150d13e8 Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Fri, 9 Mar 2012 06:18:42 +0000
Subject: [PATCH 03/50] glib-networking-2.30.2

* Pass gsettings-desktop-schemas to glib-networking
* Use ca-certificates /etc/ca-bundle.crt

Cherry-pick ^/nixpkgs/branches/glib-2.30@31414, remove xz

svn path=/nixpkgs/branches/glib-2.30-take2/; revision=32942
---
 .../libraries/glib-networking/default.nix     | 21 ++++++++-----------
 1 file changed, 9 insertions(+), 12 deletions(-)

diff --git a/pkgs/development/libraries/glib-networking/default.nix b/pkgs/development/libraries/glib-networking/default.nix
index 53ab1ba0840..107a583d102 100644
--- a/pkgs/development/libraries/glib-networking/default.nix
+++ b/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;
-    sha256 = "959ffeb91fee17c1b0fb2aa82872c3daae0230de93708b2ebabeb92b747d7876";
+    url = mirror://gnome/sources/glib-networking/2.30/glib-networking-2.30.2.tar.xz;
+    sha256 = "1g2ran0rn37009fs3xl38m95i5w8sdf9ax0ady4jbjir15844xcz";
   };
 
-  configureFlags = [
-    "--without-ca-certificates"
-  ];
+  configureFlags = "--with-ca-certificates=/etc/ca-bundle.crt";
   
   preBuild = ''
     sed -e "s@${glib}/lib/gio/modules@$out/lib/gio/modules@g" -i $(find . -name Makefile)
   '';
 
-  buildInputs = [ pkgconfig ];
-  propagatedBuildInputs = [ glib libtool intltool gnutls2 libproxy libgcrypt 
-    libtasn1];
+  buildNativeInputs = [ pkgconfig intltool ];
+  propagatedBuildInputs =
+    [ glib libtool gnutls2 libproxy libgcrypt libtasn1 gsettings_desktop_schemas ];
 }

From 1f84acc1133d93e8dc1ab4fec73f54263da88884 Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Fri, 9 Mar 2012 07:13:03 +0000
Subject: [PATCH 04/50] gamin: glib-2.30.0 FTBFS

Cherry-pick ^/nixpkgs/branches/glib-2.30@31417

svn path=/nixpkgs/branches/glib-2.30-take2/; revision=32943
---
 pkgs/development/libraries/gamin/debian-patches.nix | 10 ++++++++++
 pkgs/development/libraries/gamin/debian-patches.txt |  2 ++
 pkgs/development/libraries/gamin/default.nix        |  6 +++++-
 3 files changed, 17 insertions(+), 1 deletion(-)
 create mode 100644 pkgs/development/libraries/gamin/debian-patches.nix
 create mode 100644 pkgs/development/libraries/gamin/debian-patches.txt

diff --git a/pkgs/development/libraries/gamin/debian-patches.nix b/pkgs/development/libraries/gamin/debian-patches.nix
new file mode 100644
index 00000000000..1da558db141
--- /dev/null
+++ b/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";
+  }
+]
diff --git a/pkgs/development/libraries/gamin/debian-patches.txt b/pkgs/development/libraries/gamin/debian-patches.txt
new file mode 100644
index 00000000000..4faad71d44d
--- /dev/null
+++ b/pkgs/development/libraries/gamin/debian-patches.txt
@@ -0,0 +1,2 @@
+gamin/0.1.10-4
+17_deprecated_const_return.patch
diff --git a/pkgs/development/libraries/gamin/default.nix b/pkgs/development/libraries/gamin/default.nix
index c72a619b66e..a212946c67f 100644
--- a/pkgs/development/libraries/gamin/default.nix
+++ b/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);
 }

From 91fb91d9e03f2082e5008ac85c2fba9ab779aade Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Fri, 9 Mar 2012 07:13:08 +0000
Subject: [PATCH 05/50] libsoup-2.36.1

svn path=/nixpkgs/branches/glib-2.30-take2/; revision=32944
---
 .../gnome-2/desktop/libsoup/default.nix       | 24 ++++++++++++-------
 1 file changed, 16 insertions(+), 8 deletions(-)

diff --git a/pkgs/desktops/gnome-2/desktop/libsoup/default.nix b/pkgs/desktops/gnome-2/desktop/libsoup/default.nix
index a598bd01142..861f41cb7a4 100644
--- a/pkgs/desktops/gnome-2/desktop/libsoup/default.nix
+++ b/pkgs/desktops/gnome-2/desktop/libsoup/default.nix
@@ -1,16 +1,24 @@
-{ stdenv, fetchurl, pkgconfig, libxml2, gnutls, libproxy, sqlite, curl
-, glib, GConf, libgnome_keyring }:
+{ stdenv, fetchurl, glib, libxml2, pkgconfig
+, gnomeSupport ? true, libgnome_keyring, sqlite, glib_networking }:
 
-stdenv.mkDerivation rec {
-  name = "libsoup-2.34.3";
+stdenv.mkDerivation {
+  name = "libsoup-2.36.1";
 
   src = fetchurl {
-    url = mirror://gnome/sources/libsoup/2.34/libsoup-2.34.3.tar.xz;
-    sha256 = "072af1iqcky5vm6akm450qhdjrgav4yyl6s8idhnq0gpm5jqhgy4";
+    url = mirror://gnome/sources/libsoup/2.36/libsoup-2.36.1.tar.xz;
+    sha256 = "0r8zkr0a328jkww4dv9z1q691rw59nh4lf5f5pzzr9szzw3j8wkk";
   };
 
-  buildInputs = [ pkgconfig libxml2 gnutls libproxy sqlite curl 
-    glib GConf libgnome_keyring ];
 
+  buildNativeInputs = [ pkgconfig ];
+  propagatedBuildInputs = [ glib libxml2 ]
+    ++ stdenv.lib.optionals gnomeSupport [ libgnome_keyring sqlite ];
+  passthru.propagatedUserEnvPackages = [ glib_networking ];
+
+  # glib_networking is a runtime dependency, not a compile-time dependency
   configureFlags = "--disable-tls-check";
+
+  meta = {
+    inherit (glib.meta) maintainers platforms;
+  };
 }

From e060892aac37dbfc771eb7a6c94828bfce57929c Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Fri, 9 Mar 2012 07:13:11 +0000
Subject: [PATCH 06/50] gvfs-1.10.1

svn path=/nixpkgs/branches/glib-2.30-take2/; revision=32945
---
 pkgs/desktops/gnome-2/desktop/gvfs/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/desktops/gnome-2/desktop/gvfs/default.nix b/pkgs/desktops/gnome-2/desktop/gvfs/default.nix
index 1f52771d507..5455e95ef3f 100644
--- a/pkgs/desktops/gnome-2/desktop/gvfs/default.nix
+++ b/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;
-    sha256 = "0ickz1g3b16ncnv6vdpx0j5nx70ixdl6nsrv8cainvj1dn7sr588";
+    url = mirror://gnome/sources/gvfs/1.10/gvfs-1.10.1.tar.xz;
+    sha256 = "124jrkph3cqr2pijmzzr6qwzy2vaq3vvndskzkxd0v5dwp7glc6d";
   };
 
   buildInputs =

From 0cea832a1b1f143b2d7d9ee6f386b424551153fb Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Fri, 9 Mar 2012 07:13:14 +0000
Subject: [PATCH 07/50] Remove unused builder

svn path=/nixpkgs/branches/glib-2.30-take2/; revision=32946
---
 pkgs/desktops/gnome-2/desktop/gvfs/builder.sh | 9 ---------
 1 file changed, 9 deletions(-)
 delete mode 100644 pkgs/desktops/gnome-2/desktop/gvfs/builder.sh

diff --git a/pkgs/desktops/gnome-2/desktop/gvfs/builder.sh b/pkgs/desktops/gnome-2/desktop/gvfs/builder.sh
deleted file mode 100644
index 5be453c09a2..00000000000
--- a/pkgs/desktops/gnome-2/desktop/gvfs/builder.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-source $stdenv/setup
-
-myPatchPhase()
-{
-    sed -i -e "/giomodulesdir=/ agiomodulesdir=$out/lib/gio" configure
-}
-
-patchPhase=myPatchPhase
-genericBuild

From ef95c7855d994edb389e5d44844fd551d1bf7609 Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Fri, 16 Mar 2012 21:37:42 +0000
Subject: [PATCH 08/50] pango-1.29.5

svn path=/nixpkgs/branches/glib-2.30-take2/; revision=33178
---
 pkgs/development/libraries/pango/1.29.x.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/pango/1.29.x.nix b/pkgs/development/libraries/pango/1.29.x.nix
index 4d6e5411e24..7672ddb84c7 100644
--- a/pkgs/development/libraries/pango/1.29.x.nix
+++ b/pkgs/development/libraries/pango/1.29.x.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, gettext, x11, glib, cairo, libpng }:
 
 stdenv.mkDerivation rec {
-  name = "pango-1.29.4";
+  name = "pango-1.29.5";
 
   src = fetchurl {
-    url = mirror://gnome/sources/pango/1.29/pango-1.29.4.tar.xz;
-    sha256 = "0zqjq6ccv6mbah74rcvb03ksq1jwan21z37mdmqa56307sax3s3s";
+    url = mirror://gnome/sources/pango/1.29/pango-1.29.5.tar.xz;
+    sha256 = "0nkpxpzblg3phhnzqyn4lfyl5whh4yfh95hyclfsdfjhhkg3i32p";
   };
 
   buildInputs = stdenv.lib.optional stdenv.isDarwin gettext;

From a658884c17bae18e987a328d2387be7bc5c1eef0 Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Fri, 16 Mar 2012 22:53:32 +0000
Subject: [PATCH 09/50] Revert "pango-1.29.5"

This reverts r33178
pango-1.29.5 depends on glib-2.31

svn path=/nixpkgs/branches/glib-2.30-take2/; revision=33182
---
 pkgs/development/libraries/pango/1.29.x.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/pango/1.29.x.nix b/pkgs/development/libraries/pango/1.29.x.nix
index 7672ddb84c7..4d6e5411e24 100644
--- a/pkgs/development/libraries/pango/1.29.x.nix
+++ b/pkgs/development/libraries/pango/1.29.x.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl, pkgconfig, gettext, x11, glib, cairo, libpng }:
 
 stdenv.mkDerivation rec {
-  name = "pango-1.29.5";
+  name = "pango-1.29.4";
 
   src = fetchurl {
-    url = mirror://gnome/sources/pango/1.29/pango-1.29.5.tar.xz;
-    sha256 = "0nkpxpzblg3phhnzqyn4lfyl5whh4yfh95hyclfsdfjhhkg3i32p";
+    url = mirror://gnome/sources/pango/1.29/pango-1.29.4.tar.xz;
+    sha256 = "0zqjq6ccv6mbah74rcvb03ksq1jwan21z37mdmqa56307sax3s3s";
   };
 
   buildInputs = stdenv.lib.optional stdenv.isDarwin gettext;

From 23dbae430f8876a9c02a7f2a0619ea541aa3bc3f Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Sat, 17 Mar 2012 13:30:36 +0000
Subject: [PATCH 10/50] Disable libchamplain support in geeqie

It depends on old libchamplain which fails to build with newer glib.

svn path=/nixpkgs/branches/glib-2.30-take2/; revision=33187
---
 pkgs/applications/graphics/geeqie/default.nix | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/pkgs/applications/graphics/geeqie/default.nix b/pkgs/applications/graphics/geeqie/default.nix
index 3e15eb8f867..3615b5d905c 100644
--- a/pkgs/applications/graphics/geeqie/default.nix
+++ b/pkgs/applications/graphics/geeqie/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, pkgconfig, gtk, libpng, exiv2, lcms
-, intltool, gettext, libchamplain, fbida }:
+, intltool, gettext, fbida }:
 
 stdenv.mkDerivation rec {
   name = "geeqie-1.0";
@@ -9,18 +9,10 @@ stdenv.mkDerivation rec {
     sha256 = "1p8z47cqdqqkn8b0fr5bqsfinz4dgqk4353s8f8d9ha6cik69bfi";
   };
 
-  preConfigure =
-    # XXX: Trick to have Geeqie use the version we have.
-    '' sed -i "configure" \
-           -e 's/champlain-0.4/champlain-0.6/g ;
-               s/champlain-gtk-0.4/champlain-gtk-0.6/g'
-    '';
-
   configureFlags = [ "--enable-gps" ];
 
   buildInputs =
     [ pkgconfig gtk libpng exiv2 lcms intltool gettext
-      libchamplain
     ];
 
   postInstall =

From 5c4e3c77011137f75bc34d16a88b6b5a47d4902b Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Sat, 17 Mar 2012 13:30:39 +0000
Subject: [PATCH 11/50] clutter-1.8.2

svn path=/nixpkgs/branches/glib-2.30-take2/; revision=33188
---
 .../development/libraries/clutter/default.nix | 24 +++++++++----------
 1 file changed, 11 insertions(+), 13 deletions(-)

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

From 8a2b2f333865ab7b2b78903f271e73784cb45fba Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Sat, 17 Mar 2012 13:30:46 +0000
Subject: [PATCH 12/50] clutter-gtk-1.0.4

Depends on gtk3

svn path=/nixpkgs/branches/glib-2.30-take2/; revision=33189
---
 .../development/libraries/clutter-gtk/default.nix | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/libraries/clutter-gtk/default.nix b/pkgs/development/libraries/clutter-gtk/default.nix
index 666c709f7de..a48ff93ce22 100644
--- a/pkgs/development/libraries/clutter-gtk/default.nix
+++ b/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";
-    sha256 = "0508x1jfnlq0zhgscysvfa7i7ljkzm23d2myikvdjwc8ar8zjrvq";
+    url = mirror://gnome/sources/clutter-gtk/1.0/clutter-gtk-1.0.4.tar.xz;
+    sha256 = "0kj6vsvaqxx6vqqk9acc8b0p40klrpwlf2wsjkams1kxxcpzsh87";
   };
 
-  buildInputs = [ pkgconfig clutter gtk ];
-
-  preConfigure = "export V=1";
+  propagatedBuildInputs = [ clutter gtk3 ];
+  buildNativeInputs = [ pkgconfig ];
 
   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
   };
 }

From a47127de3252cda8c316a14b91161cf1de43a271 Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Sat, 17 Mar 2012 13:30:51 +0000
Subject: [PATCH 13/50] libchamplain-0.12.2

svn path=/nixpkgs/branches/glib-2.30-take2/; revision=33190
---
 .../development/libraries/libchamplain/default.nix | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/pkgs/development/libraries/libchamplain/default.nix b/pkgs/development/libraries/libchamplain/default.nix
index 528560d1e02..4df3d00d1f4 100644
--- a/pkgs/development/libraries/libchamplain/default.nix
+++ b/pkgs/development/libraries/libchamplain/default.nix
@@ -1,19 +1,17 @@
-{ fetchurl, stdenv, pkgconfig, glib, gtk, cairo, clutter, sqlite
-, clutter_gtk, libsoup /*, libmenphis */ }:
+{ fetchurl, stdenv, pkgconfig, glib, gtk3, cairo, clutter, sqlite
+, 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";
-    sha256 = "1l1in4khnral157j46aq2d26nviz23icnm353587vcwjhdbw86sg";
+    url = mirror://gnome/sources/libchamplain/0.12/libchamplain-0.12.2.tar.xz;
+    sha256 = "0bkyzm378gh6qs7grr2vgzrl4z1pi99yysy8iwzdqzs0bs3rfgyj";
   };
 
   buildInputs = [ pkgconfig ];
 
-  # These all appear in `champlain{,-gtk}-0.6.pc'.
-  propagatedBuildInputs =
-    [ glib gtk cairo clutter clutter_gtk sqlite libsoup ];
+  propagatedBuildInputs = [ glib gtk3 cairo clutter_gtk sqlite libsoup ];
 
   meta = {
     homepage = http://projects.gnome.org/libchamplain/;

From d96524476d3571c1bd15688a409c7ff836850db1 Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Sat, 17 Mar 2012 16:45:37 +0000
Subject: [PATCH 14/50] Move libsoup to development/libraries

It is used in many packages outside of gnome2 set.

svn path=/nixpkgs/branches/glib-2.30-take2/; revision=33197
---
 pkgs/desktops/gnome-2/default.nix             |  2 --
 pkgs/desktops/gnome-3/default.nix             |  2 --
 pkgs/desktops/gnome-3/platform/libsoup.nix    | 24 -------------------
 .../libraries}/libsoup/default.nix            |  0
 pkgs/top-level/all-packages.nix               |  9 +++++--
 5 files changed, 7 insertions(+), 30 deletions(-)
 delete mode 100644 pkgs/desktops/gnome-3/platform/libsoup.nix
 rename pkgs/{desktops/gnome-2/desktop => development/libraries}/libsoup/default.nix (100%)

diff --git a/pkgs/desktops/gnome-2/default.nix b/pkgs/desktops/gnome-2/default.nix
index ac99c24e308..c907a905849 100644
--- a/pkgs/desktops/gnome-2/default.nix
+++ b/pkgs/desktops/gnome-2/default.nix
@@ -73,8 +73,6 @@
 
   gnome_keyring = callPackage ./desktop/gnome-keyring { };
 
-  libsoup = callPackage ./desktop/libsoup { };
-
   libwnck = callPackage ./desktop/libwnck { };
 
   libgweather = callPackage ./desktop/libgweather { };
diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome-3/default.nix
index fc1d581b022..7cbf4cfa5fc 100644
--- a/pkgs/desktops/gnome-3/default.nix
+++ b/pkgs/desktops/gnome-3/default.nix
@@ -12,8 +12,6 @@
 
   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 { };
diff --git a/pkgs/desktops/gnome-3/platform/libsoup.nix b/pkgs/desktops/gnome-3/platform/libsoup.nix
deleted file mode 100644
index fdf9e5bd9fe..00000000000
--- a/pkgs/desktops/gnome-3/platform/libsoup.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-{ stdenv, fetchurl, glib, libxml2, pkgconfig, xz
-, gnomeSupport ? true, libgnome_keyring, sqlite, glib_networking }:
-
-stdenv.mkDerivation {
-  name = "libsoup-2.36.1";
-
-  src = fetchurl {
-    url = mirror://gnome/sources/libsoup/2.36/libsoup-2.36.1.tar.xz;
-    sha256 = "0r8zkr0a328jkww4dv9z1q691rw59nh4lf5f5pzzr9szzw3j8wkk";
-  };
-
-
-  buildNativeInputs = [ pkgconfig ];
-  propagatedBuildInputs = [ glib libxml2 ]
-    ++ stdenv.lib.optionals gnomeSupport [ libgnome_keyring sqlite ];
-  passthru.propagatedUserEnvPackages = [ glib_networking ];
-
-  # glib_networking is a runtime dependency, not a compile-time dependency
-  configureFlags = "--disable-tls-check";
-
-  meta = {
-    inherit (glib.meta) maintainers platforms;
-  };
-}
diff --git a/pkgs/desktops/gnome-2/desktop/libsoup/default.nix b/pkgs/development/libraries/libsoup/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-2/desktop/libsoup/default.nix
rename to pkgs/development/libraries/libsoup/default.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 6522c66c00f..ba0b02a0124 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4171,6 +4171,8 @@ let
 
   libsndfile = callPackage ../development/libraries/libsndfile { };
 
+  libsoup = callPackage ../development/libraries/libsoup { };
+
   libssh = callPackage ../development/libraries/libssh { };
 
   libssh2 = callPackage ../development/libraries/libssh2 { };
@@ -7877,10 +7879,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;
+    inherit (pkgs) libsoup;
+  };
 
   gnome3 = (import ../desktops/gnome-3 {
     callPackage = pkgs.newScope pkgs.gnome3;

From eee4797659e39a4e085c48ec9a59d6944add37a2 Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Sat, 17 Mar 2012 16:45:43 +0000
Subject: [PATCH 15/50] gnome-3: we use the top-level glib

GNOME-3 uses the top-level glib. If this will change later, one should override
*many* packages in gnome3 set.

svn path=/nixpkgs/branches/glib-2.30-take2/; revision=33198
---
 pkgs/desktops/gnome-3/default.nix | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome-3/default.nix
index 7cbf4cfa5fc..2c274c55a62 100644
--- a/pkgs/desktops/gnome-3/default.nix
+++ b/pkgs/desktops/gnome-3/default.nix
@@ -3,11 +3,6 @@
 {
   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 { };

From 60669aa0fc299ccbf0a09f7e696757767db391dd Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Sat, 17 Mar 2012 16:45:50 +0000
Subject: [PATCH 16/50] Remove gnome3.glib_networking

Use pkgs.glib_networking

svn path=/nixpkgs/branches/glib-2.30-take2/; revision=33199
---
 pkgs/desktops/gnome-3/default.nix             |  2 --
 .../gnome-3/platform/glib-networking.nix      | 23 -------------------
 2 files changed, 25 deletions(-)
 delete mode 100644 pkgs/desktops/gnome-3/platform/glib-networking.nix

diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome-3/default.nix
index 2c274c55a62..d49fca17521 100644
--- a/pkgs/desktops/gnome-3/default.nix
+++ b/pkgs/desktops/gnome-3/default.nix
@@ -3,8 +3,6 @@
 {
   clutter = callPackage ./platform/clutter.nix { };
 
-  glib_networking = callPackage ./platform/glib-networking.nix { };
-
   libgnome_keyring = callPackage ./platform/libgnome-keyring.nix { };
 
   GConf = callPackage ./platform/GConf.nix { };
diff --git a/pkgs/desktops/gnome-3/platform/glib-networking.nix b/pkgs/desktops/gnome-3/platform/glib-networking.nix
deleted file mode 100644
index 37537b274e1..00000000000
--- a/pkgs/desktops/gnome-3/platform/glib-networking.nix
+++ /dev/null
@@ -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;
-  };
-}

From ddb01436a017b045264dcbda63664052b9a1a3dc Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Sat, 17 Mar 2012 16:45:56 +0000
Subject: [PATCH 17/50] Move gnome3.libgnome_keyring to libgnome_keyring3

svn path=/nixpkgs/branches/glib-2.30-take2/; revision=33200
---
 pkgs/desktops/gnome-3/default.nix                               | 2 --
 .../libraries/libgnome-keyring/3.x.nix}                         | 0
 pkgs/top-level/all-packages.nix                                 | 1 +
 3 files changed, 1 insertion(+), 2 deletions(-)
 rename pkgs/{desktops/gnome-3/platform/libgnome-keyring.nix => development/libraries/libgnome-keyring/3.x.nix} (100%)

diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome-3/default.nix
index d49fca17521..b74438100a6 100644
--- a/pkgs/desktops/gnome-3/default.nix
+++ b/pkgs/desktops/gnome-3/default.nix
@@ -3,8 +3,6 @@
 {
   clutter = callPackage ./platform/clutter.nix { };
 
-  libgnome_keyring = callPackage ./platform/libgnome-keyring.nix { };
-
   GConf = callPackage ./platform/GConf.nix { };
 
   gnome_user_docs = callPackage ./platform/gnome-user-docs.nix { };
diff --git a/pkgs/desktops/gnome-3/platform/libgnome-keyring.nix b/pkgs/development/libraries/libgnome-keyring/3.x.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/platform/libgnome-keyring.nix
rename to pkgs/development/libraries/libgnome-keyring/3.x.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index ba0b02a0124..363fb7c6b97 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3966,6 +3966,7 @@ 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 { };
 
   liblo = callPackage ../development/libraries/liblo { };
 

From d1860f6defff970ca2ed6557cf0bd4895c8ed4b2 Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Sat, 17 Mar 2012 16:46:02 +0000
Subject: [PATCH 18/50] Move gnome3.GConf to GConf3

svn path=/nixpkgs/branches/glib-2.30-take2/; revision=33201
---
 pkgs/desktops/gnome-3/default.nix        |  2 --
 pkgs/desktops/gnome-3/platform/GConf.nix | 23 -----------------------
 pkgs/development/libraries/GConf/3.x.nix | 23 +++++++++++++++++++++++
 pkgs/top-level/all-packages.nix          |  2 ++
 4 files changed, 25 insertions(+), 25 deletions(-)
 delete mode 100644 pkgs/desktops/gnome-3/platform/GConf.nix
 create mode 100644 pkgs/development/libraries/GConf/3.x.nix

diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome-3/default.nix
index b74438100a6..6abee3c4097 100644
--- a/pkgs/desktops/gnome-3/default.nix
+++ b/pkgs/desktops/gnome-3/default.nix
@@ -3,7 +3,5 @@
 {
   clutter = callPackage ./platform/clutter.nix { };
 
-  GConf = callPackage ./platform/GConf.nix { };
-
   gnome_user_docs = callPackage ./platform/gnome-user-docs.nix { };
 }
diff --git a/pkgs/desktops/gnome-3/platform/GConf.nix b/pkgs/desktops/gnome-3/platform/GConf.nix
deleted file mode 100644
index 52f3cba7bdb..00000000000
--- a/pkgs/desktops/gnome-3/platform/GConf.nix
+++ /dev/null
@@ -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;
-  };
-}
diff --git a/pkgs/development/libraries/GConf/3.x.nix b/pkgs/development/libraries/GConf/3.x.nix
new file mode 100644
index 00000000000..4f6d5a9a04a
--- /dev/null
+++ b/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;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 363fb7c6b97..81fb90a32e4 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3463,6 +3463,8 @@ let
 
   gav = callPackage ../games/gav { };
 
+  GConf3 = callPackage ../development/libraries/GConf/3.x.nix { };
+
   gdome2 = callPackage ../development/libraries/gdome2 {
     inherit (gnome) gtkdoc;
   };

From ee5b976a93a0e74740eabcbaac87618f49af8969 Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Sat, 17 Mar 2012 16:46:06 +0000
Subject: [PATCH 19/50] Remove gnome3.clutter

svn path=/nixpkgs/branches/glib-2.30-take2/; revision=33202
---
 pkgs/desktops/gnome-3/default.nix          |  2 --
 pkgs/desktops/gnome-3/platform/clutter.nix | 24 ----------------------
 2 files changed, 26 deletions(-)
 delete mode 100644 pkgs/desktops/gnome-3/platform/clutter.nix

diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome-3/default.nix
index 6abee3c4097..fb503d1abb5 100644
--- a/pkgs/desktops/gnome-3/default.nix
+++ b/pkgs/desktops/gnome-3/default.nix
@@ -1,7 +1,5 @@
 { callPackage }:
 
 {
-  clutter = callPackage ./platform/clutter.nix { };
-
   gnome_user_docs = callPackage ./platform/gnome-user-docs.nix { };
 }
diff --git a/pkgs/desktops/gnome-3/platform/clutter.nix b/pkgs/desktops/gnome-3/platform/clutter.nix
deleted file mode 100644
index b2ee5539008..00000000000
--- a/pkgs/desktops/gnome-3/platform/clutter.nix
+++ /dev/null
@@ -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 ];
-  };
-}

From a466941945bc0e55f940853dca3a3343ccc9c559 Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Sat, 17 Mar 2012 16:46:12 +0000
Subject: [PATCH 20/50] Move last piece o gnome3 to top-level

Since there is no common release schedule, I'd prefer to avoid gnome3 set at
all.

svn path=/nixpkgs/branches/glib-2.30-take2/; revision=33203
---
 .../documentation/gnome-user-docs/default.nix}              | 0
 pkgs/desktops/gnome-3/default.nix                           | 5 -----
 pkgs/top-level/all-packages.nix                             | 6 ++----
 3 files changed, 2 insertions(+), 9 deletions(-)
 rename pkgs/{desktops/gnome-3/platform/gnome-user-docs.nix => data/documentation/gnome-user-docs/default.nix} (100%)
 delete mode 100644 pkgs/desktops/gnome-3/default.nix

diff --git a/pkgs/desktops/gnome-3/platform/gnome-user-docs.nix b/pkgs/data/documentation/gnome-user-docs/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-3/platform/gnome-user-docs.nix
rename to pkgs/data/documentation/gnome-user-docs/default.nix
diff --git a/pkgs/desktops/gnome-3/default.nix b/pkgs/desktops/gnome-3/default.nix
deleted file mode 100644
index fb503d1abb5..00000000000
--- a/pkgs/desktops/gnome-3/default.nix
+++ /dev/null
@@ -1,5 +0,0 @@
-{ callPackage }:
-
-{
-  gnome_user_docs = callPackage ./platform/gnome-user-docs.nix { };
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 81fb90a32e4..310b36039fa 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6135,6 +6135,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 { };
@@ -7890,10 +7892,6 @@ let
     inherit (pkgs) libsoup;
   };
 
-  gnome3 = (import ../desktops/gnome-3 {
-    callPackage = pkgs.newScope pkgs.gnome3;
-  });
-
   gnome = recurseIntoAttrs gnome2;
 
   kde3 = recurseIntoAttrs {

From 066896556f183a55de2bce8749fab51d53a2f05b Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Mon, 19 Mar 2012 04:36:35 +0000
Subject: [PATCH 21/50] polkit-gnome-0.105

Depends on gtk-3, install .desktop file.

svn path=/nixpkgs/branches/glib-2.30-take2/; revision=33251
---
 pkgs/tools/security/polkit-gnome/default.nix  | 30 ++++---
 ...olkit-gnome-authentication-agent-1.desktop | 88 +++++++++++++++++++
 2 files changed, 106 insertions(+), 12 deletions(-)
 create mode 100644 pkgs/tools/security/polkit-gnome/polkit-gnome-authentication-agent-1.desktop

diff --git a/pkgs/tools/security/polkit-gnome/default.nix b/pkgs/tools/security/polkit-gnome/default.nix
index 9adab0fb0c2..b70aa427031 100644
--- a/pkgs/tools/security/polkit-gnome/default.nix
+++ b/pkgs/tools/security/polkit-gnome/default.nix
@@ -1,22 +1,28 @@
-{ stdenv, fetchurl, pkgconfig, gtk, polkit, dbus_glib, intltool }:
-stdenv.mkDerivation rec {
+{ stdenv, fetchurl, polkit, gtk3, pkgconfig, intltool }:
 
-  name = "polkit-gnome-${version}";
-  version = "0.96";
+stdenv.mkDerivation {
+  name = "polkit-gnome-0.105";
 
   src = fetchurl {
-    url = http://hal.freedesktop.org/releases/polkit-gnome-0.96.tar.bz2;
-    sha256 = "14la7j3h1k1s88amkcv8rzq9wmhgzypvxpwaxwg2x2k55l1wi5hd";
+    url = mirror://gnome/sources/polkit-gnome/0.105/polkit-gnome-0.105.tar.xz;
+    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;
-    maintainers = [ maintainers.phreedom ];
+    license = stdenv.lib.licenses.gpl2;
+    maintainers = with stdenv.lib.maintainers; [ urkud phreedom ];
   };
-}
\ No newline at end of file
+}
diff --git a/pkgs/tools/security/polkit-gnome/polkit-gnome-authentication-agent-1.desktop b/pkgs/tools/security/polkit-gnome/polkit-gnome-authentication-agent-1.desktop
new file mode 100644
index 00000000000..5ddda50cb01
--- /dev/null
+++ b/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

From 3d0b77884829a48834728b965e62b619a583e634 Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Mon, 19 Mar 2012 04:36:41 +0000
Subject: [PATCH 22/50] Move gnome-doc-utils and gtk-doc to top-level

Add compatibility attrs.

svn path=/nixpkgs/branches/glib-2.30-take2/; revision=33252
---
 pkgs/desktops/gnome-2/default.nix                |  4 ----
 .../documentation}/gnome-doc-utils/default.nix   |  6 +++---
 .../tools/documentation}/gtk-doc/default.nix     | 16 ++++++++--------
 pkgs/top-level/all-packages.nix                  |  6 +++++-
 4 files changed, 16 insertions(+), 16 deletions(-)
 rename pkgs/{desktops/gnome-2/desktop => development/tools/documentation}/gnome-doc-utils/default.nix (65%)
 rename pkgs/{desktops/gnome-2/platform => development/tools/documentation}/gtk-doc/default.nix (66%)

diff --git a/pkgs/desktops/gnome-2/default.nix b/pkgs/desktops/gnome-2/default.nix
index c907a905849..661311b3014 100644
--- a/pkgs/desktops/gnome-2/default.nix
+++ b/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 { };
 
 
@@ -87,8 +85,6 @@
   # scrollkeeper replacement
   rarian = callPackage ./desktop/rarian { };
 
-  gnome_doc_utils = callPackage ./desktop/gnome-doc-utils { };
-
   zenity = callPackage ./desktop/zenity { };
 
   metacity = callPackage ./desktop/metacity { };
diff --git a/pkgs/desktops/gnome-2/desktop/gnome-doc-utils/default.nix b/pkgs/development/tools/documentation/gnome-doc-utils/default.nix
similarity index 65%
rename from pkgs/desktops/gnome-2/desktop/gnome-doc-utils/default.nix
rename to pkgs/development/tools/documentation/gnome-doc-utils/default.nix
index 4953c860818..545cd298f8c 100644
--- a/pkgs/desktops/gnome-2/desktop/gnome-doc-utils/default.nix
+++ b/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;
-    sha256 = "0psl9xnph6qga809dbkakjfp2z9mc32dxrdk8s6zn8whm41gc0gn";
+    url = mirror://gnome/sources/gnome-doc-utils/0.20/gnome-doc-utils-0.20.7.tar.xz;
+    sha256 = "01lcq6gm4q9awvg7lccq43qh8g4ibz49s2mgykin78mgph9h396q";
   };
 
   configureFlags = "--disable-scrollkeeper";
diff --git a/pkgs/desktops/gnome-2/platform/gtk-doc/default.nix b/pkgs/development/tools/documentation/gtk-doc/default.nix
similarity index 66%
rename from pkgs/desktops/gnome-2/platform/gtk-doc/default.nix
rename to pkgs/development/tools/documentation/gtk-doc/default.nix
index c5086accc0d..a5d7d260804 100644
--- a/pkgs/desktops/gnome-2/platform/gtk-doc/default.nix
+++ b/pkgs/development/tools/documentation/gtk-doc/default.nix
@@ -1,12 +1,12 @@
-{ stdenv, fetchurl, pkgconfig, perl, python, libxml2, libxslt
-, docbook_xml_dtd_43, docbook_xsl, gnome_doc_utils, dblatex }:
+{ stdenv, fetchurl, pkgconfig, perl, python, libxml2Python, libxslt, which
+, 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";
-    sha256 = "0ca8wh67nyh574ahlfkx8k9w2bm4ji9yzxvi3afsicqdpyx77k2r";
+    url = mirror://gnome/sources/gtk-doc/1.18/gtk-doc-1.18.tar.xz;
+    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
-     gnome_doc_utils dblatex
+   [ pkgconfig perl python libxml2Python libxslt docbook_xml_dtd_43 docbook_xsl
+     gnome_doc_utils dblatex gettext which
    ];
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 310b36039fa..7db4e25bf8e 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3019,6 +3019,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 { };
@@ -3032,6 +3034,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 { };
@@ -7889,7 +7893,7 @@ let
     self = pkgs.gnome2;
   }  // pkgs.gtkLibs // {
     # Backwards compatibility;
-    inherit (pkgs) libsoup;
+    inherit (pkgs) libsoup gtk_doc gnome_doc_utils;
   };
 
   gnome = recurseIntoAttrs gnome2;

From b113433d51f5b1df076823deb6183c36789b1031 Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Mon, 19 Mar 2012 04:36:47 +0000
Subject: [PATCH 23/50] Move libwnck to top-level

svn path=/nixpkgs/branches/glib-2.30-take2/; revision=33253
---
 pkgs/desktops/gnome-2/default.nix                             | 2 --
 .../desktop => development/libraries}/libwnck/default.nix     | 0
 pkgs/top-level/all-packages.nix                               | 4 +++-
 3 files changed, 3 insertions(+), 3 deletions(-)
 rename pkgs/{desktops/gnome-2/desktop => development/libraries}/libwnck/default.nix (100%)

diff --git a/pkgs/desktops/gnome-2/default.nix b/pkgs/desktops/gnome-2/default.nix
index 661311b3014..4a4e6eaaefb 100644
--- a/pkgs/desktops/gnome-2/default.nix
+++ b/pkgs/desktops/gnome-2/default.nix
@@ -71,8 +71,6 @@
 
   gnome_keyring = callPackage ./desktop/gnome-keyring { };
 
-  libwnck = callPackage ./desktop/libwnck { };
-
   libgweather = callPackage ./desktop/libgweather { };
 
   gvfs = callPackage ./desktop/gvfs { };
diff --git a/pkgs/desktops/gnome-2/desktop/libwnck/default.nix b/pkgs/development/libraries/libwnck/default.nix
similarity index 100%
rename from pkgs/desktops/gnome-2/desktop/libwnck/default.nix
rename to pkgs/development/libraries/libwnck/default.nix
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 7db4e25bf8e..5adbe6efc24 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4243,6 +4243,8 @@ let
 
   libwmf = callPackage ../development/libraries/libwmf { };
 
+  libwnck = callPackage ../development/libraries/libwnck { };
+
   libwpd = callPackage ../development/libraries/libwpd { };
 
   libwpd_08 = callPackage ../development/libraries/libwpd/0.8.nix { };
@@ -7893,7 +7895,7 @@ let
     self = pkgs.gnome2;
   }  // pkgs.gtkLibs // {
     # Backwards compatibility;
-    inherit (pkgs) libsoup gtk_doc gnome_doc_utils;
+    inherit (pkgs) libsoup libwnck gtk_doc gnome_doc_utils;
   };
 
   gnome = recurseIntoAttrs gnome2;

From abec1469244264167e021ff2a50a71e70e3cf9aa Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Mon, 19 Mar 2012 04:36:51 +0000
Subject: [PATCH 24/50] Add libwnck3

svn path=/nixpkgs/branches/glib-2.30-take2/; revision=33254
---
 pkgs/development/libraries/libwnck/3.x.nix | 13 +++++++++++++
 pkgs/top-level/all-packages.nix            |  1 +
 2 files changed, 14 insertions(+)
 create mode 100644 pkgs/development/libraries/libwnck/3.x.nix

diff --git a/pkgs/development/libraries/libwnck/3.x.nix b/pkgs/development/libraries/libwnck/3.x.nix
new file mode 100644
index 00000000000..59355f3c37d
--- /dev/null
+++ b/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 ];
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5adbe6efc24..88b31fb639d 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4244,6 +4244,7 @@ let
   libwmf = callPackage ../development/libraries/libwmf { };
 
   libwnck = callPackage ../development/libraries/libwnck { };
+  libwnck3 = callPackage ../development/libraries/libwnck/3.x.nix { };
 
   libwpd = callPackage ../development/libraries/libwpd { };
 

From f0039537ce4124e85aa55a1ef36054c1b478ce41 Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Tue, 20 Mar 2012 11:16:01 +0000
Subject: [PATCH 25/50] Restore clutter-gtk

svn path=/nixpkgs/branches/glib-2.30-take2/; revision=33290
---
 .../libraries/clutter-gtk/0.10.8.nix          | 26 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  1 +
 2 files changed, 27 insertions(+)
 create mode 100644 pkgs/development/libraries/clutter-gtk/0.10.8.nix

diff --git a/pkgs/development/libraries/clutter-gtk/0.10.8.nix b/pkgs/development/libraries/clutter-gtk/0.10.8.nix
new file mode 100644
index 00000000000..b44801928e9
--- /dev/null
+++ b/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
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 88b31fb639d..64edd9b14a3 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3312,6 +3312,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 { };
 

From aa47fca2f6421130f976fffb9d8934316b5f6836 Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Tue, 20 Mar 2012 11:16:06 +0000
Subject: [PATCH 26/50] Restore libchamplain

svn path=/nixpkgs/branches/glib-2.30-take2/; revision=33291
---
 .../libraries/libchamplain/0.6.nix            | 35 +++++++++++++++++++
 pkgs/top-level/all-packages.nix               |  2 ++
 2 files changed, 37 insertions(+)
 create mode 100644 pkgs/development/libraries/libchamplain/0.6.nix

diff --git a/pkgs/development/libraries/libchamplain/0.6.nix b/pkgs/development/libraries/libchamplain/0.6.nix
new file mode 100644
index 00000000000..86b8dc5d550
--- /dev/null
+++ b/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
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 64edd9b14a3..9eabd236231 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3911,6 +3911,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 { };

From a6ef1ee30a5dfdb772a17449ca88e544427aa3fc Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Tue, 20 Mar 2012 11:16:10 +0000
Subject: [PATCH 27/50] Add champlain support to geeqie

This commit reverts 33187 and changes libchamplain arg to libchamplain_0_6.

svn path=/nixpkgs/branches/glib-2.30-take2/; revision=33292
---
 pkgs/applications/graphics/geeqie/default.nix | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/pkgs/applications/graphics/geeqie/default.nix b/pkgs/applications/graphics/geeqie/default.nix
index 3615b5d905c..a166fc7010e 100644
--- a/pkgs/applications/graphics/geeqie/default.nix
+++ b/pkgs/applications/graphics/geeqie/default.nix
@@ -1,5 +1,5 @@
 { stdenv, fetchurl, pkgconfig, gtk, libpng, exiv2, lcms
-, intltool, gettext, fbida }:
+, intltool, gettext, libchamplain_0_6, fbida }:
 
 stdenv.mkDerivation rec {
   name = "geeqie-1.0";
@@ -9,10 +9,18 @@ stdenv.mkDerivation rec {
     sha256 = "1p8z47cqdqqkn8b0fr5bqsfinz4dgqk4353s8f8d9ha6cik69bfi";
   };
 
+  preConfigure =
+    # XXX: Trick to have Geeqie use the version we have.
+    '' sed -i "configure" \
+           -e 's/champlain-0.4/champlain-0.6/g ;
+               s/champlain-gtk-0.4/champlain-gtk-0.6/g'
+    '';
+
   configureFlags = [ "--enable-gps" ];
 
   buildInputs =
     [ pkgconfig gtk libpng exiv2 lcms intltool gettext
+      libchamplain_0_6
     ];
 
   postInstall =

From bf530f6c03af88b7eb160aa3b39c00e1737bfc88 Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Tue, 20 Mar 2012 11:41:11 +0000
Subject: [PATCH 28/50] cairomm-1.10.0

svn path=/nixpkgs/branches/glib-2.30-take2/; revision=33293
---
 pkgs/development/libraries/cairomm/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/libraries/cairomm/default.nix b/pkgs/development/libraries/cairomm/default.nix
index b760003ef4d..e47645737b1 100644
--- a/pkgs/development/libraries/cairomm/default.nix
+++ b/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 ];

From ba7f02630ad4e02a43993ff0eba4ed5c22fa1119 Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Tue, 20 Mar 2012 11:46:42 +0000
Subject: [PATCH 29/50] Add gtkmm-3.x

svn path=/nixpkgs/branches/glib-2.30-take2/; revision=33294
---
 pkgs/development/libraries/gtkmm/3.2.x.nix | 35 ++++++++++++++++++++++
 pkgs/top-level/all-packages.nix            |  1 +
 2 files changed, 36 insertions(+)
 create mode 100644 pkgs/development/libraries/gtkmm/3.2.x.nix

diff --git a/pkgs/development/libraries/gtkmm/3.2.x.nix b/pkgs/development/libraries/gtkmm/3.2.x.nix
new file mode 100644
index 00000000000..890d4a34519
--- /dev/null
+++ b/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;
+  };
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 9eabd236231..73ad387cd95 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3742,6 +3742,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 { });
 

From 4233eece197f713e981bef3a12369ac229638cc0 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Wed, 21 Mar 2012 10:47:00 +0000
Subject: [PATCH 30/50] Update and fix WebKit

svn path=/nixpkgs/branches/glib-2.30-take2/; revision=33323
---
 pkgs/development/libraries/libxml2/default.nix    |  6 +++---
 pkgs/development/libraries/webkit/default.nix     | 15 +++++++--------
 .../libraries/webkit/src-for-default.nix          | 10 +++++-----
 pkgs/top-level/all-packages.nix                   |  5 +++--
 4 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/pkgs/development/libraries/libxml2/default.nix b/pkgs/development/libraries/libxml2/default.nix
index fe3b6bd6487..defba390cf1 100644
--- a/pkgs/development/libraries/libxml2/default.nix
+++ b/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;
-    sha256 = "03kkknm7xl77qfdig8mzalsi8ljsyblzin18gy3h8zranffrpyzs";
+    url = ftp://xmlsoft.org/libxml2/libxml2-sources-2.7.8.tar.gz;
+    sha256 = "6a33c3a2d18b902cd049e0faa25dd39f9b554a5b09a3bb56ee07dd7938b11c54";
   };
 
   configureFlags = ''                                                  
diff --git a/pkgs/development/libraries/webkit/default.nix b/pkgs/development/libraries/webkit/default.nix
index 7ad894215df..c0fd878e0bb 100644
--- a/pkgs/development/libraries/webkit/default.nix
+++ b/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 */
diff --git a/pkgs/development/libraries/webkit/src-for-default.nix b/pkgs/development/libraries/webkit/src-for-default.nix
index 5f5149fedfe..30e129e2fae 100644
--- a/pkgs/development/libraries/webkit/src-for-default.nix
+++ b/pkgs/development/libraries/webkit/src-for-default.nix
@@ -1,9 +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";
+   version="1.6.3";
+   name="webkit-1.6.3";
+   hash="1hvph13ak7a85qmj1ikanwxf2nn53m5f6a50j627lp49db7dpl0j";
+   url="http://webkitgtk.org/webkit-1.6.3.tar.xz";
+   advertisedUrl="http://webkitgtk.org/webkit-1.6.3.tar.xz";
   
   
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 73ad387cd95..e80c6e576a1 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4734,7 +4734,8 @@ let
   webkit =
     builderDefsPackage ../development/libraries/webkit {
       inherit (gnome) gtkdoc libsoup;
-      inherit gtk atk pango glib;
+      inherit atk pango glib;
+      gtk = gtk3;
       inherit freetype fontconfig gettext gperf curl
         libjpeg libtiff libxml2 libxslt sqlite
         icu cairo perl intltool automake libtool
@@ -4742,7 +4743,7 @@ let
         python ruby which flex geoclue;
       inherit gstreamer gst_plugins_base gst_ffmpeg
         gst_plugins_good;
-      inherit (xlibs) libXt renderproto libXrender;
+      inherit (xlibs) libXt renderproto libXrender kbproto;
       libpng = libpng12;
     };
 

From 8dddfbeea6d3812d2e9051d788ef02e1e783c9d3 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Wed, 21 Mar 2012 19:14:34 +0000
Subject: [PATCH 31/50] Update/fix Uzbl

svn path=/nixpkgs/branches/glib-2.30-take2/; revision=33340
---
 .../networking/browsers/uzbl/default.nix          | 15 +++++++++------
 .../networking/browsers/uzbl/src-for-default.nix  | 10 ----------
 .../browsers/uzbl/src-info-for-default.nix        |  9 ---------
 pkgs/top-level/all-packages.nix                   |  2 +-
 4 files changed, 10 insertions(+), 26 deletions(-)
 delete mode 100644 pkgs/applications/networking/browsers/uzbl/src-for-default.nix
 delete mode 100644 pkgs/applications/networking/browsers/uzbl/src-info-for-default.nix

diff --git a/pkgs/applications/networking/browsers/uzbl/default.nix b/pkgs/applications/networking/browsers/uzbl/default.nix
index b21d1862de5..b85ad0e085e 100644
--- a/pkgs/applications/networking/browsers/uzbl/default.nix
+++ b/pkgs/applications/networking/browsers/uzbl/default.nix
@@ -1,17 +1,20 @@
 a :  
 let 
-  fetchurl = a.fetchurl;
-
-  s = import ./src-for-default.nix;
+  fetchgit = a.fetchgit;
 
   buildInputs = with a; [
-    libsoup pkgconfig webkit gtk makeWrapper
+    libsoup pkgconfig webkit gtk3 makeWrapper
     kbproto
   ];
 in
 rec {
-  src = (a.fetchUrlFromSrcInfo s);
-  inherit (s) name;
+  src = fetchgit {
+    url = "https://github.com/Dieterbe/uzbl.git";
+    rev = "dcb3b4e1fcff682b412cfe5875f7054b97380d08";
+    sha256 = "f7b2b2903c01c9cfbd99bd94783002e1580d8092ff6022bb5aed3f999ff6e468";
+  };
+
+  name = "uzbl-git";
 
   inherit buildInputs;
   configureFlags = [];
diff --git a/pkgs/applications/networking/browsers/uzbl/src-for-default.nix b/pkgs/applications/networking/browsers/uzbl/src-for-default.nix
deleted file mode 100644
index 2ffc1f95380..00000000000
--- a/pkgs/applications/networking/browsers/uzbl/src-for-default.nix
+++ /dev/null
@@ -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";
-  
-}
diff --git a/pkgs/applications/networking/browsers/uzbl/src-info-for-default.nix b/pkgs/applications/networking/browsers/uzbl/src-info-for-default.nix
deleted file mode 100644
index 48650efd146..00000000000
--- a/pkgs/applications/networking/browsers/uzbl/src-info-for-default.nix
+++ /dev/null
@@ -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'';
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index e80c6e576a1..a32f22d14cf 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -7411,7 +7411,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;
   };

From 268146472c31a4ab1fea8e84d66124b8787ef3e1 Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Thu, 22 Mar 2012 07:32:08 +0000
Subject: [PATCH 32/50] Add libgtop

svn path=/nixpkgs/branches/glib-2.30-take2/; revision=33343
---
 pkgs/development/libraries/libgtop/default.nix | 12 ++++++++++++
 pkgs/top-level/all-packages.nix                |  2 ++
 2 files changed, 14 insertions(+)
 create mode 100644 pkgs/development/libraries/libgtop/default.nix

diff --git a/pkgs/development/libraries/libgtop/default.nix b/pkgs/development/libraries/libgtop/default.nix
new file mode 100644
index 00000000000..f214c7acf73
--- /dev/null
+++ b/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 ];
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index a32f22d14cf..384768feef7 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3978,6 +3978,8 @@ let
   libgnome_keyring = callPackage ../development/libraries/libgnome-keyring { };
   libgnome_keyring3 = callPackage ../development/libraries/libgnome-keyring/3.x.nix { };
 
+  libgtop = callPackage ../development/libraries/libgtop {};
+
   liblo = callPackage ../development/libraries/liblo { };
 
   liblrdf = callPackage ../development/libraries/liblrdf {};

From c4b9da59498b9ae639ceb29588db5e8615748d95 Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Thu, 22 Mar 2012 08:39:08 +0000
Subject: [PATCH 33/50] Add libgweather

svn path=/nixpkgs/branches/glib-2.30-take2/; revision=33344
---
 pkgs/development/libraries/libgweather/default.nix | 13 +++++++++++++
 pkgs/top-level/all-packages.nix                    |  2 ++
 2 files changed, 15 insertions(+)
 create mode 100644 pkgs/development/libraries/libgweather/default.nix

diff --git a/pkgs/development/libraries/libgweather/default.nix b/pkgs/development/libraries/libgweather/default.nix
new file mode 100644
index 00000000000..4a4da810ae6
--- /dev/null
+++ b/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 ];
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 384768feef7..212f664e888 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3980,6 +3980,8 @@ let
 
   libgtop = callPackage ../development/libraries/libgtop {};
 
+  libgweather = callPackage ../development/libraries/libgweather {};
+
   liblo = callPackage ../development/libraries/liblo { };
 
   liblrdf = callPackage ../development/libraries/liblrdf {};

From f5cc572d8bdf04ce610711ca6383cb69028ca7ab Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Fri, 23 Mar 2012 05:55:13 +0000
Subject: [PATCH 34/50] Updating FPC and Lazarus - works OK with new glib

svn path=/nixpkgs/branches/glib-2.30-take2/; revision=33367
---
 pkgs/development/compilers/fpc/default.nix | 4 ++--
 pkgs/development/compilers/fpc/lazarus.nix | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/development/compilers/fpc/default.nix b/pkgs/development/compilers/fpc/default.nix
index 171612fe348..e87dd88bf0d 100644
--- a/pkgs/development/compilers/fpc/default.nix
+++ b/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 ];
diff --git a/pkgs/development/compilers/fpc/lazarus.nix b/pkgs/development/compilers/fpc/lazarus.nix
index 1cb4e479e37..4278f2c664f 100644
--- a/pkgs/development/compilers/fpc/lazarus.nix
+++ b/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 

From e4762ec355408984fe55637f69bbc033712f1895 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Fri, 23 Mar 2012 05:58:22 +0000
Subject: [PATCH 35/50] Cherry-picking versionOlder from trunk: seems to be
 non-rebuild-causing, and needed to build NixOS trunk

svn path=/nixpkgs/branches/glib-2.30-take2/; revision=33368
---
 pkgs/lib/strings.nix                       | 13 +++++++++++++
 pkgs/os-specific/linux/microcode/intel.nix |  2 +-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/pkgs/lib/strings.nix b/pkgs/lib/strings.nix
index 73520a949c1..8f918acf7b2 100644
--- a/pkgs/lib/strings.nix
+++ b/pkgs/lib/strings.nix
@@ -82,15 +82,18 @@ rec {
       map f (stringToCharacters s)
     );
 
+    
   # same as vim escape function.
   # Each character contained in list is prefixed by "\"
   escape = list : string :
     stringAsChars (c: if lib.elem c list then "\\${c}" else c) string;
 
+    
   # still ugly slow. But more correct now
   # [] for zsh
   escapeShellArg = lib.escape (stringToCharacters "\\ ';$`()|<>\t*[]");
 
+  
   # replace characters by their substitutes.  This function is equivalent to
   # the `tr' command except that one character can be replace by multiple
   # ones.  e.g.,
@@ -105,10 +108,12 @@ rec {
     in
       stringAsChars subst s;
 
+      
   # Compares strings not requiring context equality
   # Obviously, a workaround but works on all Nix versions
   eqStrings = a: b: (a+(substring 0 0 b)) == ((substring 0 0 a)+b);
 
+  
   # Cut a string with a separator and produces a list of strings which were
   # separated by this separator. e.g.,
   # `splitString "." "foo.bar.baz"' returns ["foo" "bar" "baz"].
@@ -133,6 +138,7 @@ rec {
     in
       recurse 0 0;
 
+      
   # return the suffix of the second argument if the first argument match its
   # prefix. e.g.,
   # `removePrefix "foo." "foo.bar.baz"' returns "bar.baz".
@@ -146,6 +152,13 @@ rec {
       else
         s;
 
+        
+  # Why do we need this if we have baseNameOf?
   basename = s: lib.last (splitString "/" s);
 
+
+  # Return true iff string v1 denotes a version older than v2.
+  versionOlder = v1: v2: builtins.compareVersions v2 v1 == 1;
+
+
 }
diff --git a/pkgs/os-specific/linux/microcode/intel.nix b/pkgs/os-specific/linux/microcode/intel.nix
index 9a57fef67a1..d17663b7a65 100644
--- a/pkgs/os-specific/linux/microcode/intel.nix
+++ b/pkgs/os-specific/linux/microcode/intel.nix
@@ -22,7 +22,7 @@ in stdenv.mkDerivation {
   '';
 
   meta = {
-    homepage = http://www.intel.com;
+    homepage = http://www.intel.com/;
     description = "Microcode for Intel processors";
   };
 }
\ No newline at end of file

From 5087016ee1954e8faa5bae927be033953dbbd032 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Fri, 23 Mar 2012 07:09:48 +0000
Subject: [PATCH 36/50] Updating and fixing sgtpuzzles.

svn path=/nixpkgs/branches/glib-2.30-take2/; revision=33369
---
 pkgs/games/sgt-puzzles/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/games/sgt-puzzles/default.nix b/pkgs/games/sgt-puzzles/default.nix
index ca12baf9c8e..83d012d35f1 100644
--- a/pkgs/games/sgt-puzzles/default.nix
+++ b/pkgs/games/sgt-puzzles/default.nix
@@ -10,15 +10,15 @@ in
 rec {
   src = fetchsvn {
    url = svn://svn.tartarus.org/sgt/puzzles;
-   rev = "8872";
-   sha256 = "16hcrhkl6plzdhw60g7i4vgkxcc4mw4h4bzg2myy5cfhpx7y0m9s";
+   rev = "9437";
+   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 ''

From 318c7475203fa791ba098debe809138e40652b80 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Fri, 23 Mar 2012 09:47:23 +0000
Subject: [PATCH 37/50] Update and fix DejaVu fonts

svn path=/nixpkgs/branches/glib-2.30-take2/; revision=33370
---
 pkgs/data/fonts/dejavu-fonts/default.nix | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

diff --git a/pkgs/data/fonts/dejavu-fonts/default.nix b/pkgs/data/fonts/dejavu-fonts/default.nix
index 505746b3edf..3b02fd39cf6 100644
--- a/pkgs/data/fonts/dejavu-fonts/default.nix
+++ b/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";
   };
   preBuild = ''
     sed -e s@/usr/bin/env@$(type -tP env)@ -i scripts/*
@@ -16,7 +26,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

From 99f198ab9f6523d633dc057a87f48383efdf3f4e Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Sun, 25 Mar 2012 11:22:32 +0000
Subject: [PATCH 38/50] Update/fix Midori

svn path=/nixpkgs/branches/glib-2.30-take2/; revision=33400
---
 .../networking/browsers/midori/default.nix       | 16 ++++++++++------
 pkgs/top-level/all-packages.nix                  |  2 +-
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/pkgs/applications/networking/browsers/midori/default.nix b/pkgs/applications/networking/browsers/midori/default.nix
index 1f4d224e435..b15c05c7b49 100644
--- a/pkgs/applications/networking/browsers/midori/default.nix
+++ b/pkgs/applications/networking/browsers/midori/default.nix
@@ -5,10 +5,10 @@ let
   doPatchShebangs = args.doPatchShebangs;
   makeManyWrappers = args.makeManyWrappers;
 
-  version = "0.2"; 
-  release = "7";
+  version = "0.4"; 
+  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");
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 212f664e888..b9f8790a8a0 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -6991,7 +6991,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;

From 49b7f13128731188bfebdc2cf2a712a7fc5118ce Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Wed, 28 Mar 2012 15:11:50 +0000
Subject: [PATCH 39/50] Upgrading dssi to 1.1.1 (cherry-pick trunk@33360)

svn path=/nixpkgs/branches/glib-2.30-take2/; revision=33454
---
 pkgs/development/libraries/dssi/default.nix | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/libraries/dssi/default.nix b/pkgs/development/libraries/dssi/default.nix
index 9074120d7de..951278b4433 100644
--- a/pkgs/development/libraries/dssi/default.nix
+++ b/pkgs/development/libraries/dssi/default.nix
@@ -1,6 +1,6 @@
 x@{builderDefsPackage
   , ladspaH, jackaudio, liblo, alsaLib, qt4, libX11, libsndfile, libSM
-  , libsamplerate, libtool, autoconf, automake, xproto, libICE
+  , libsamplerate, libtool, autoconf, automake, xproto, libICE, pkgconfig
   , ...}:
 builderDefsPackage
 (a :  
@@ -12,11 +12,11 @@ let
     (builtins.attrNames (builtins.removeAttrs x helperArgNames));
   sourceInfo = rec {
     baseName="dssi";
-    version="1.1.0";
+    version="1.1.1";
     project="${baseName}";
     name="${baseName}-${version}";
     url="mirror://sourceforge/project/${project}/${baseName}/${version}/${name}.tar.gz";
-    hash="0lwvyrsr9dm032rrhxad30k712q3arrbn7g898n3flg26hmw58yf";
+    hash="0kl1hzhb7cykzkrqcqgq1dk4xcgrcxv0jja251aq4z4l783jpj7j";
   };
 in
 rec {

From 3decf956d4008a163258e8d5ddf74bfe2f7aaed3 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Thu, 29 Mar 2012 10:30:47 +0000
Subject: [PATCH 40/50] Porting a fix from nixpkgs trunk - vimprobable2 now
 builds (against obsolete WebKit/GTK2)

svn path=/nixpkgs/branches/glib-2.30-take2/; revision=33467
---
 .../browsers/vimprobable2/default.nix         |  4 +-
 pkgs/development/libraries/webkit/gtk2.nix    | 91 +++++++++++++++++++
 .../libraries/webkit/src-for-gtk2.nix         |  9 ++
 pkgs/top-level/all-packages.nix               | 16 ++++
 4 files changed, 118 insertions(+), 2 deletions(-)
 create mode 100644 pkgs/development/libraries/webkit/gtk2.nix
 create mode 100644 pkgs/development/libraries/webkit/src-for-gtk2.nix

diff --git a/pkgs/applications/networking/browsers/vimprobable2/default.nix b/pkgs/applications/networking/browsers/vimprobable2/default.nix
index dad29a27803..e4494f95656 100644
--- a/pkgs/applications/networking/browsers/vimprobable2/default.nix
+++ b/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 : \
diff --git a/pkgs/development/libraries/webkit/gtk2.nix b/pkgs/development/libraries/webkit/gtk2.nix
new file mode 100644
index 00000000000..76a9b90b411
--- /dev/null
+++ b/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;
+  };
+}
diff --git a/pkgs/development/libraries/webkit/src-for-gtk2.nix b/pkgs/development/libraries/webkit/src-for-gtk2.nix
new file mode 100644
index 00000000000..5f5149fedfe
--- /dev/null
+++ b/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";
+  
+  
+}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 5b08fd6c9ec..02e711a5439 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4783,6 +4783,22 @@ let
       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
+        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;
+      libpng = libpng12;
+      perl = perl510;
+    };
+
   webkitSVN =
     builderDefsPackage ../development/libraries/webkit/svn.nix {
       inherit (gnome) gtkdoc libsoup;

From a0474636d4c447642a86c38ad95228d70510530a Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Thu, 29 Mar 2012 10:34:47 +0000
Subject: [PATCH 41/50] Remove some unused files

svn path=/nixpkgs/branches/glib-2.30-take2/; revision=33468
---
 pkgs/development/libraries/atk/1.32.x.nix    | 37 ----------------
 pkgs/development/libraries/glib/2.28.x.nix   | 45 --------------------
 pkgs/development/libraries/glibmm/2.28.x.nix | 25 -----------
 3 files changed, 107 deletions(-)
 delete mode 100644 pkgs/development/libraries/atk/1.32.x.nix
 delete mode 100644 pkgs/development/libraries/glib/2.28.x.nix
 delete mode 100644 pkgs/development/libraries/glibmm/2.28.x.nix

diff --git a/pkgs/development/libraries/atk/1.32.x.nix b/pkgs/development/libraries/atk/1.32.x.nix
deleted file mode 100644
index 34fef9048f3..00000000000
--- a/pkgs/development/libraries/atk/1.32.x.nix
+++ /dev/null
@@ -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;
-  };
-
-}
diff --git a/pkgs/development/libraries/glib/2.28.x.nix b/pkgs/development/libraries/glib/2.28.x.nix
deleted file mode 100644
index e41917b3fe4..00000000000
--- a/pkgs/development/libraries/glib/2.28.x.nix
+++ /dev/null
@@ -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;
-  };
-}
diff --git a/pkgs/development/libraries/glibmm/2.28.x.nix b/pkgs/development/libraries/glibmm/2.28.x.nix
deleted file mode 100644
index 2c1d9a45c8d..00000000000
--- a/pkgs/development/libraries/glibmm/2.28.x.nix
+++ /dev/null
@@ -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;
-  };
-}

From e5fd55a9548094edfe8577049ccd4657c6d10a11 Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Thu, 29 Mar 2012 14:29:50 +0000
Subject: [PATCH 42/50] glib-2.30.3

Build with system pcre.

svn path=/nixpkgs/branches/glib-2.30-take2/; revision=33472
---
 pkgs/development/libraries/glib/2.30.x.nix | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/libraries/glib/2.30.x.nix b/pkgs/development/libraries/glib/2.30.x.nix
index 0f1812b4ec5..092fa7f27e0 100644
--- a/pkgs/development/libraries/glib/2.30.x.nix
+++ b/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;
-    sha256 = "10lfzxwc45lh5vfnd33l4m9z1mf3arpwdd8jz94dn79j6diixsgh";
+    url = mirror://gnome/sources/glib/2.30/glib-2.30.3.tar.xz;
+    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 = {

From ded7dae81da4d02a8c176b4c7b9bf984fc2908b2 Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Thu, 29 Mar 2012 14:29:54 +0000
Subject: [PATCH 43/50] glibmm-2.30.1

svn path=/nixpkgs/branches/glib-2.30-take2/; revision=33473
---
 pkgs/development/libraries/glibmm/2.30.x.nix | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/pkgs/development/libraries/glibmm/2.30.x.nix b/pkgs/development/libraries/glibmm/2.30.x.nix
index 1ed2d0ede62..4792ae790be 100644
--- a/pkgs/development/libraries/glibmm/2.30.x.nix
+++ b/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 {
-    project = "glibmm";
-    major = "2"; minor = "30"; patchlevel = "0"; extension = "xz";
-    sha256 = "1d0dxq4iamch8igrnbvbfwkfpvcnjfzyr9iq2x8hi89b9k1kzbd7";
+  src = fetchurl {
+    url = mirror://gnome/sources/glibmm/2.30/glibmm-2.30.1.tar.xz;
+    sha256 = "15zqgx6rashyhxk89qjqq05p6m40akpgzyjk8bfb3jk68rc2nn39";
   };
 
   buildNativeInputs = [pkgconfig];

From ce85d430bc75a893bfe218b5323368601473aa12 Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Thu, 29 Mar 2012 16:33:32 +0000
Subject: [PATCH 44/50] Batch update telepathy-related packages

Some of these packages need glib-2.30.x, so I commit it to this branch.

Add sofia-sip and telepathy-rakia.

svn path=/nixpkgs/branches/glib-2.30-take2/; revision=33475
---
 .../telepathy/rakia/default.nix               | 19 +++++++++++++++++++
 .../telepathy/salut/default.nix               |  4 ++--
 .../libraries/farstream/default.nix           |  4 ++--
 .../libraries/sofia-sip/default.nix           | 13 +++++++++++++
 .../libraries/telepathy/farstream/default.nix |  4 ++--
 .../libraries/telepathy/glib/default.nix      |  4 ++--
 .../telepathy/glib/fix-pkgconfig.patch        |  4 ++--
 .../libraries/telepathy/qt/default.nix        |  4 ++--
 pkgs/top-level/all-packages.nix               |  4 ++++
 9 files changed, 48 insertions(+), 12 deletions(-)
 create mode 100644 pkgs/applications/networking/instant-messengers/telepathy/rakia/default.nix
 create mode 100644 pkgs/development/libraries/sofia-sip/default.nix

diff --git a/pkgs/applications/networking/instant-messengers/telepathy/rakia/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/rakia/default.nix
new file mode 100644
index 00000000000..33a935fa7eb
--- /dev/null
+++ b/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;
+  };
+}
diff --git a/pkgs/applications/networking/instant-messengers/telepathy/salut/default.nix b/pkgs/applications/networking/instant-messengers/telepathy/salut/default.nix
index a5ca302d03d..02701f9f1ce 100644
--- a/pkgs/applications/networking/instant-messengers/telepathy/salut/default.nix
+++ b/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
diff --git a/pkgs/development/libraries/farstream/default.nix b/pkgs/development/libraries/farstream/default.nix
index 7d5e7148620..b2b8ca6255b 100644
--- a/pkgs/development/libraries/farstream/default.nix
+++ b/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 ];
diff --git a/pkgs/development/libraries/sofia-sip/default.nix b/pkgs/development/libraries/sofia-sip/default.nix
new file mode 100644
index 00000000000..3ce49e8ffaf
--- /dev/null
+++ b/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 ];
+}
diff --git a/pkgs/development/libraries/telepathy/farstream/default.nix b/pkgs/development/libraries/telepathy/farstream/default.nix
index a9b072d2152..a183737dc9b 100644
--- a/pkgs/development/libraries/telepathy/farstream/default.nix
+++ b/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 ];
diff --git a/pkgs/development/libraries/telepathy/glib/default.nix b/pkgs/development/libraries/telepathy/glib/default.nix
index 31301d44f49..22a6aef5c3a 100644
--- a/pkgs/development/libraries/telepathy/glib/default.nix
+++ b/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];
diff --git a/pkgs/development/libraries/telepathy/glib/fix-pkgconfig.patch b/pkgs/development/libraries/telepathy/glib/fix-pkgconfig.patch
index 78c3e6af041..bba92d408a0 100644
--- a/pkgs/development/libraries/telepathy/glib/fix-pkgconfig.patch
+++ b/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: 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.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-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
diff --git a/pkgs/development/libraries/telepathy/qt/default.nix b/pkgs/development/libraries/telepathy/qt/default.nix
index c23e351b4ff..a620526ff85 100644
--- a/pkgs/development/libraries/telepathy/qt/default.nix
+++ b/pkgs/development/libraries/telepathy/qt/default.nix
@@ -2,11 +2,11 @@
 , telepathy_farsight, 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 ];
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index 02e711a5439..aef1055d287 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4664,6 +4664,8 @@ let
         # optional
   };
 
+  sofia_sip = callPackage ../development/libraries/sofia-sip { };
+
   soprano = callPackage ../development/libraries/soprano { };
 
   soqt = callPackage ../development/libraries/soqt { };
@@ -7435,6 +7437,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 { };

From ba2343ba12db6125421ed923b2149cbebf4058e1 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Fri, 30 Mar 2012 05:21:56 +0000
Subject: [PATCH 45/50] Update Squid-3.2; builds now

svn path=/nixpkgs/branches/glib-2.30-take2/; revision=33483
---
 pkgs/servers/squid/squids.nix | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/pkgs/servers/squid/squids.nix b/pkgs/servers/squid/squids.nix
index 1c64109d5cc..3e5e4ebbe6f 100644
--- a/pkgs/servers/squid/squids.nix
+++ b/pkgs/servers/squid/squids.nix
@@ -30,11 +30,11 @@ rec {
     configureFlags = ["--enable-ipv6"];
   };
 
-  squid32Beta = squid30.merge {
-    name = "squid-3.2.0.11";
+  squid32Beta = squid30.merge rec {
+    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;
-      sha256 = "aa5b9a85e1a90c4adb591c3e796c3fdfb166d8d2c814165d70692636321f69ae";
+      url = "http://www.squid-cache.org/Versions/v3/3.2/${name}.tar.bz2";
+      sha256 = "2431f4f9372e4e1a9c5fca5a4fa0c4bb0761ce3e044642ea9362bb1580a36d25";
     };
     configureFlags = ["--enable-ipv6"];
     buildInputs = [openldap pam db4 cyrus_sasl libcap expat libxml2

From d388527f21eb14f109300497dd519f75d84bc3f4 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Fri, 30 Mar 2012 05:30:09 +0000
Subject: [PATCH 46/50] Update ripmime; builds now

svn path=/nixpkgs/branches/glib-2.30-take2/; revision=33484
---
 pkgs/tools/networking/ripmime/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/tools/networking/ripmime/default.nix b/pkgs/tools/networking/ripmime/default.nix
index 07196b77d0a..d9445b74976 100644
--- a/pkgs/tools/networking/ripmime/default.nix
+++ b/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 {

From 19320cf6cc6cf49cdc71c7b35f579c2a0dff197b Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Fri, 30 Mar 2012 07:32:54 +0000
Subject: [PATCH 47/50] Updating autogen - builds now

svn path=/nixpkgs/branches/glib-2.30-take2/; revision=33485
---
 pkgs/development/tools/misc/autogen/default.nix | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pkgs/development/tools/misc/autogen/default.nix b/pkgs/development/tools/misc/autogen/default.nix
index 00eb6d404ef..b11aba8ade7 100644
--- a/pkgs/development/tools/misc/autogen/default.nix
+++ b/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 ];

From 6eb45d767fecc57cad444c285e05456b939d2294 Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Fri, 30 Mar 2012 09:03:35 +0000
Subject: [PATCH 48/50] telepathy-qt: farsight -> farstream

svn path=/nixpkgs/branches/glib-2.30-take2/; revision=33488
---
 pkgs/development/libraries/telepathy/qt/default.nix   | 11 ++++-------
 .../libraries/telepathy/qt/missing-include.patch      | 11 -----------
 2 files changed, 4 insertions(+), 18 deletions(-)
 delete mode 100644 pkgs/development/libraries/telepathy/qt/missing-include.patch

diff --git a/pkgs/development/libraries/telepathy/qt/default.nix b/pkgs/development/libraries/telepathy/qt/default.nix
index a620526ff85..64067a61e3e 100644
--- a/pkgs/development/libraries/telepathy/qt/default.nix
+++ b/pkgs/development/libraries/telepathy/qt/default.nix
@@ -1,5 +1,5 @@
 { 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.1";
@@ -10,11 +10,8 @@ stdenv.mkDerivation rec {
   };
 
   buildNativeInputs = [ cmake pkgconfig python libxslt ];
-  propagatedBuildInputs = [ qt4 dbus_glib telepathy_farsight telepathy_glib ];
-
-  patches = [ ./missing-include.patch ];
-
+  propagatedBuildInputs = [ qt4 dbus_glib telepathy_farstream telepathy_glib ];
   preBuild = ''
-    NIX_CFLAGS_COMPILE+=" `pkg-config --cflags farsight2-0.10 dbus-glib-1`"
-    '';
+    NIX_CFLAGS_COMPILE+=" `pkg-config --cflags dbus-glib-1`"
+  '';
 }
diff --git a/pkgs/development/libraries/telepathy/qt/missing-include.patch b/pkgs/development/libraries/telepathy/qt/missing-include.patch
deleted file mode 100644
index c5e3e259aa2..00000000000
--- a/pkgs/development/libraries/telepathy/qt/missing-include.patch
+++ /dev/null
@@ -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}

From a6b434974b9ec711ab6f37ac1c3ebfd3b517adb2 Mon Sep 17 00:00:00 2001
From: Michael Raskin <7c6f434c@mail.ru>
Date: Fri, 30 Mar 2012 10:18:25 +0000
Subject: [PATCH 49/50] Fixing how bzip2 is passed to nixCustom

svn path=/nixpkgs/branches/glib-2.30-take2/; revision=33489
---
 pkgs/tools/package-management/nix/custom.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/tools/package-management/nix/custom.nix b/pkgs/tools/package-management/nix/custom.nix
index 5b1569291e1..b760e4b7f4d 100644
--- a/pkgs/tools/package-management/nix/custom.nix
+++ b/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 [])

From 3f44fb8f2f1ab6bb0571eef0fe16748d951b91f1 Mon Sep 17 00:00:00 2001
From: "Yury G. Kudryashov" <urkud.urkud@gmail.com>
Date: Fri, 30 Mar 2012 12:28:50 +0000
Subject: [PATCH 50/50] Drop telepathy-farsight

It is not used, and it is deprecated by telepathy-farstream.

svn path=/nixpkgs/branches/glib-2.30-take2/; revision=33491
---
 .../libraries/telepathy/farsight/default.nix     | 16 ----------------
 pkgs/top-level/all-packages.nix                  |  2 --
 2 files changed, 18 deletions(-)
 delete mode 100644 pkgs/development/libraries/telepathy/farsight/default.nix

diff --git a/pkgs/development/libraries/telepathy/farsight/default.nix b/pkgs/development/libraries/telepathy/farsight/default.nix
deleted file mode 100644
index 0f5b8b5d82c..00000000000
--- a/pkgs/development/libraries/telepathy/farsight/default.nix
+++ /dev/null
@@ -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];
-}
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index aef1055d287..523913142fa 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4722,8 +4722,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 { };