* Gnome 2.22.1.

* Moved some of the Gnome package Nix expressions into
  pkgs/desktops/gnome/default.nix - no need to have them in separate
  files.  This way the code is much shorter.  Still to be done for all
  the other Gnome packages.
* Glib 2.16.3.

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

13 files changed, 856 insertions, 852 deletions

diff --git a/pkgs/desktops/gnome/GConf.nix b/pkgs/desktops/gnome/GConf.nix
deleted file mode 100644
index 74b646f6cc34..000000000000
--- a/pkgs/desktops/gnome/GConf.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{input, stdenv, fetchurl, pkgconfig, perl, glib, gtk, libxml2, ORBit2, popt}:
-
-assert pkgconfig != null && perl != null
-  && glib != null && gtk != null
-  && libxml2 != null && ORBit2 != null && popt != null;
-
-stdenv.mkDerivation {
-  inherit (input) name src;
-
-  # Perl is not `supposed' to be required, but it is.
-  buildInputs = [pkgconfig perl glib gtk libxml2 popt];
-  propagatedBuildInputs = [ORBit2];
-}
diff --git a/pkgs/desktops/gnome/default.nix b/pkgs/desktops/gnome/default.nix
index 014a99b674ae..4569ea911b62 100644
--- a/pkgs/desktops/gnome/default.nix
+++ b/pkgs/desktops/gnome/default.nix
@@ -1,5 +1,3 @@
-# todo audiofile is also part of the gnome platform. Move it to this collection?
-
 args: with args;
 
 assert dbus_glib.glib == gtkLibs.glib;
@@ -10,7 +8,7 @@ rec {
 
   # Platform
 
-  platform = import ./src-gnome-platform-2.16.3.nix {
+  platform = import ./src-gnome-platform-2.22.1.nix {
     inherit fetchurl;
   };
 
@@ -22,9 +20,13 @@ rec {
 
   gtk = gtkLibs.gtk;
 
-  esound = import ./esound.nix {
-    inherit fetchurl stdenv audiofile;
-    input = platform.esound;
+  audiofile = stdenv.mkDerivation {
+    inherit (platform.audiofile) name src;
+  };
+
+  esound = stdenv.mkDerivation {
+    inherit (platform.esound) name src;
+    propagatedBuildInputs = [pkgconfig audiofile];
   };
 
   libIDL = import ./libIDL.nix {
@@ -39,9 +41,10 @@ rec {
     input = platform.ORBit2;
   };
 
-  GConf = import ./GConf.nix {
-    inherit fetchurl stdenv pkgconfig perl glib gtk libxml2 ORBit2 popt;
-    input = platform.GConf;
+  GConf = stdenv.mkDerivation {
+    inherit (platform.GConf) name src;
+    buildInputs = [pkgconfig perl glib gtk libxml2 popt gettext perlXMLParser];
+    propagatedBuildInputs = [ORBit2];
   };
 
   gnomemimedata = import ./gnome-mime-data.nix {
@@ -49,16 +52,20 @@ rec {
     input = platform.gnomemimedata;
   };
 
-  gnomevfs = import ./gnome-vfs.nix {
-    inherit fetchurl stdenv gnome pkgconfig perl libxml2 popt
-      perlXMLParser gettext bzip2 dbus_glib openssl hal samba fam;
-    input = platform.gnomevfs;
+  gnomevfs = stdenv.mkDerivation {
+    inherit (platform.gnomevfs) name src;
+    buildInputs = [
+      pkgconfig perl glib libxml2 libbonobo
+      gnomemimedata popt perlXMLParser gettext bzip2
+      dbus_glib hal openssl samba fam
+    ];
+    propagatedBuildInputs = [GConf];
+    patches = [./no-kerberos.patch];
   };
 
-  gail = import ./gail.nix {
-    inherit fetchurl stdenv pkgconfig;
-    inherit gtk atk libgnomecanvas;
-    input = platform.gail;
+  gail = stdenv.mkDerivation {
+    inherit (platform.gail) name src;
+    buildInputs = [pkgconfig atk gtk];
   };
 
   libgnome = import ./libgnome.nix {
@@ -77,10 +84,10 @@ rec {
     input = platform.libglade;
   };
 
-  libgnomecanvas = import ./libgnomecanvas.nix {
-    inherit fetchurl stdenv pkgconfig gtk libglade;
-    libart = libart_lgpl;
-    input = platform.libgnomecanvas;
+  libgnomecanvas = stdenv.mkDerivation {
+    inherit (platform.libgnomecanvas) name src;
+    buildInputs = [pkgconfig libglade perl perlXMLParser gail gettext];
+    propagatedBuildInputs = [gtk libart_lgpl];
   };
 
   libbonobo = import ./libbonobo.nix {
@@ -109,16 +116,19 @@ rec {
 
   # Desktop
 
-  desktop = import ./src-gnome-desktop-2.16.3.nix {
+  desktop = import ./src-gnome-desktop-2.22.1.nix {
     inherit fetchurl;
   };
 
-  libgnomeprint = import ./libgnomeprint.nix {
-    inherit fetchurl stdenv libxml2 perl perlXMLParser pkgconfig popt
-         bison flex;
-    inherit glib pango;
-    libart = libart_lgpl;
-    input = desktop.libgnomeprint;
+  libgnomeprint = stdenv.mkDerivation {
+    inherit (desktop.libgnomeprint) name src;
+
+    buildInputs = [
+      perl perlXMLParser pkgconfig popt libxml2
+      glib pango bison flex gettext
+    ];
+
+    propagatedBuildInputs = [libxml2 libart_lgpl];
   };
 
   libgnomeprintui = import ./libgnomeprintui.nix {
@@ -141,9 +151,10 @@ rec {
     input = desktop.gnomeicontheme;
   };
 
-  gnomekeyring = import ./gnome-keyring.nix {
-    inherit fetchurl stdenv pkgconfig glib gtk perl perlXMLParser gettext;
-    input = desktop.gnomekeyring;
+  gnomekeyring = stdenv.mkDerivation {
+    inherit (desktop.gnomekeyring) name src;
+    buildInputs = [pkgconfig gtk glib perl perlXMLParser gettext GConf libgcrypt libtasn1];
+    CFLAGS = "-DENABLE_NLS=0";
   };
 
   gtksourceview = import ./gtksourceview.nix {
@@ -156,7 +167,15 @@ rec {
   scrollkeeper = import ./scrollkeeper.nix {
     inherit fetchurl stdenv pkgconfig perl perlXMLParser
             libxml2 libxslt docbook_xml_dtd_42;
-    input = desktop.scrollkeeper;
+    # Scrollkeeper has disappeared from recent Gnome releases, but
+    # it's still being used.
+    input = {
+      name = "scrollkeeper-0.3.14";
+      src = fetchurl {
+        url = http://ftp.gnome.org/pub/GNOME/desktop/2.16/2.16.3/sources/scrollkeeper-0.3.14.tar.bz2;
+        md5 = "b175e582a6cec3e50a9de73a5bb7455a";
+      };
+    };
   };
 
   gnomedesktop = import ./gnome-desktop.nix {
@@ -176,11 +195,27 @@ rec {
     input = desktop.gnomemenus;
   };
 
-  gnomepanel = import ./gnome-panel.nix {
-    inherit fetchurl stdenv pkgconfig gnome perl perlXMLParser libjpeg
-      libpng dbus_glib gettext libxslt;
-    inherit (xlibs) libXmu libXau;
-    input = desktop.gnomepanel;
+  librsvg = stdenv.mkDerivation {
+    inherit (desktop.librsvg) name src;
+    buildInputs = [libxml2 libart_lgpl pkgconfig glib pkgconfig pango gtk];
+  };
+
+  libgweather = stdenv.mkDerivation {
+    inherit (desktop.libgweather) name src;
+    buildInputs = [gettext perl perlXMLParser pkgconfig gtk libxml2 gnomevfs];
+  };
+
+  gnomepanel = stdenv.mkDerivation {
+    inherit (desktop.gnomepanel) name src;
+
+    buildInputs = [
+      pkgconfig perl perlXMLParser gtk glib ORBit2 libgnome libgnomeui
+      gnomedesktop libglade libwnck libjpeg libpng scrollkeeper
+      xlibs.libXmu xlibs.libXau dbus_glib gnomemenus gnomedocutils
+      gettext libxslt librsvg libgweather which
+    ];
+
+    configureFlags = "--disable-scrollkeeper";
   };
 
   libsoup = import ./libsoup.nix {
@@ -190,7 +225,15 @@ rec {
   
   startupnotification = import ./startup-notification.nix {
     inherit stdenv fetchurl pkgconfig x11;
-    input = desktop.startupnotification;
+    # Strangely, startup-notificatio has disappeared from Gnome
+    # releases, but it's still used. 
+    input = {
+      name = "startup-notification-0.8";
+      src = fetchurl {
+        url = http://ftp.gnome.org/pub/GNOME/desktop/2.16/2.16.3/sources/startup-notification-0.8.tar.bz2;
+        md5 = "d9b2e9fba18843314ae42334ceb4336d";
+      };
+    };
   };
 
   metacity = import ./metacity.nix {
@@ -220,10 +263,17 @@ rec {
     input = desktop.vte;
   };
   
-  gnometerminal = import ./gnome-terminal.nix {
-    inherit stdenv fetchurl pkgconfig gnome perl perlXMLParser
-      gettext which python libxml2Python libxslt;
-    input = desktop.gnometerminal;
+  gnometerminal = stdenv.mkDerivation {
+    inherit (desktop.gnometerminal) name src;
+
+    buildInputs = [
+      pkgconfig perl perlXMLParser gtk GConf libglade
+      libgnomeui startupnotification gnomevfs vte
+      gnomedocutils gettext which scrollkeeper
+      python libxml2Python libxslt
+    ];
+
+    configureFlags = "--disable-scrollkeeper";
   };
 
   libgtop = import ./libgtop.nix {
diff --git a/pkgs/desktops/gnome/esound.nix b/pkgs/desktops/gnome/esound.nix
deleted file mode 100644
index eb3727bc1c2a..000000000000
--- a/pkgs/desktops/gnome/esound.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-{input, stdenv, fetchurl, audiofile}:
-
-assert audiofile != null;
-
-stdenv.mkDerivation {
-  inherit (input) name src;
-  propagatedBuildInputs = [audiofile];
-}
diff --git a/pkgs/desktops/gnome/gail.nix b/pkgs/desktops/gnome/gail.nix
deleted file mode 100644
index 2957aa90de58..000000000000
--- a/pkgs/desktops/gnome/gail.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{input, stdenv, fetchurl, pkgconfig, atk, gtk, libgnomecanvas}:
-
-stdenv.mkDerivation {
-  inherit (input) name src;
-  buildInputs = [pkgconfig atk gtk libgnomecanvas];
-  propagatedBuildInputs = [libgnomecanvas];
-}
diff --git a/pkgs/desktops/gnome/gnome-keyring.nix b/pkgs/desktops/gnome/gnome-keyring.nix
deleted file mode 100644
index 5d544c638519..000000000000
--- a/pkgs/desktops/gnome/gnome-keyring.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-# gnome-keyring
-
-{input, stdenv, fetchurl, pkgconfig, glib, gtk, perl, perlXMLParser, gettext}:
-
-stdenv.mkDerivation {
-  inherit (input) name src;
-  buildInputs = [pkgconfig gtk glib perl perlXMLParser gettext];
-  CFLAGS = "-DENABLE_NLS=0";
-}
diff --git a/pkgs/desktops/gnome/gnome-terminal.nix b/pkgs/desktops/gnome/gnome-terminal.nix
deleted file mode 100644
index 81a8a0f4d145..000000000000
--- a/pkgs/desktops/gnome/gnome-terminal.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-{ input, stdenv, fetchurl, gnome, pkgconfig, perl, perlXMLParser
-, gettext, which, python, libxml2Python, libxslt
-}:
-
-# !!! should get rid of libxml2Python, see gnomedocutils
-
-stdenv.mkDerivation {
-  inherit (input) name src;
-  
-  buildInputs = [
-    pkgconfig perl perlXMLParser gnome.gtk gnome.GConf gnome.libglade
-    gnome.libgnomeui gnome.startupnotification gnome.gnomevfs gnome.vte
-    gnome.gnomedocutils gettext which gnome.scrollkeeper
-    python libxml2Python libxslt
-  ];
-
-  configureFlags = "--disable-scrollkeeper";
-}
diff --git a/pkgs/desktops/gnome/gnome-vfs.nix b/pkgs/desktops/gnome/gnome-vfs.nix
deleted file mode 100644
index 24b99fb3b832..000000000000
--- a/pkgs/desktops/gnome/gnome-vfs.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-args: with args;
-
-stdenv.mkDerivation {
-  inherit (input) name src;
-  buildInputs = [
-    pkgconfig perl gnome.glib libxml2 gnome.GConf gnome.libbonobo
-    gnome.gnomemimedata popt perlXMLParser gettext bzip2
-    dbus_glib hal openssl samba fam
-  ];
-  patches = [./no-kerberos.patch];
-}
diff --git a/pkgs/desktops/gnome/libgnomecanvas.nix b/pkgs/desktops/gnome/libgnomecanvas.nix
deleted file mode 100644
index 6602cf43ebc5..000000000000
--- a/pkgs/desktops/gnome/libgnomecanvas.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{input, stdenv, fetchurl, pkgconfig, gtk, libart, libglade}:
-
-assert pkgconfig != null && gtk != null && libart != null
-  && libglade != null;
-
-stdenv.mkDerivation {
-  inherit (input) name src;
-  buildInputs = [pkgconfig libglade];
-  propagatedBuildInputs = [gtk libart];
-}
diff --git a/pkgs/desktops/gnome/libgnomeprint.nix b/pkgs/desktops/gnome/libgnomeprint.nix
deleted file mode 100644
index 6a44c549f4ca..000000000000
--- a/pkgs/desktops/gnome/libgnomeprint.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-{input, stdenv, fetchurl, perl, perlXMLParser, pkgconfig, glib, pango, libart, libxml2, popt, bison, flex}:
-
-stdenv.mkDerivation {
-  inherit (input) name src;
-
-  buildInputs = [
-    perl perlXMLParser pkgconfig popt libxml2
-    glib pango bison flex
-  ];
-
-  propagatedBuildInputs = [libxml2 libart];
-}
diff --git a/pkgs/desktops/gnome/src-gnome-desktop-2.20.3.nix b/pkgs/desktops/gnome/src-gnome-desktop-2.20.3.nix
deleted file mode 100644
index bf279e3a3a82..000000000000
--- a/pkgs/desktops/gnome/src-gnome-desktop-2.20.3.nix
+++ /dev/null
@@ -1,543 +0,0 @@
-# Note: this file was generated automatically by make-listing.pl!
-
-{fetchurl} : {
-  alacarte = {
-    name = "alacarte-0.11.3";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.20/2.20.3/sources/alacarte-0.11.3.tar.bz2;
-      md5 = "5ca9f07e839f64b7fcefc84cfb05aa17";
-    };
-  };
-  bugbuddy = {
-    name = "bug-buddy-2.20.1";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.20/2.20.3/sources/bug-buddy-2.20.1.tar.bz2;
-      md5 = "6b9ea4c067674120bd93711b3b9a9e63";
-    };
-  };
-  dasher = {
-    name = "dasher-4.6.1";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.20/2.20.3/sources/dasher-4.6.1.tar.bz2;
-      md5 = "1457df5075477d757f7df5693947464d";
-    };
-  };
-  deskbarapplet = {
-    name = "deskbar-applet-2.20.3";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.20/2.20.3/sources/deskbar-applet-2.20.3.tar.bz2;
-      md5 = "f84abfede0bbe5b172b24f581550e4a0";
-    };
-  };
-  eel = {
-    name = "eel-2.20.0";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.20/2.20.3/sources/eel-2.20.0.tar.bz2;
-      md5 = "691734dc1078e05e726b4f5b8646dadf";
-    };
-  };
-  ekiga = {
-    name = "ekiga-2.0.11";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.20/2.20.3/sources/ekiga-2.0.11.tar.bz2;
-      md5 = "c4b18fdd5f392545f4c8498fb8874882";
-    };
-  };
-  eog = {
-    name = "eog-2.20.4";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.20/2.20.3/sources/eog-2.20.4.tar.bz2;
-      md5 = "f9c923e1e09caa8e6f764ae8242f8d61";
-    };
-  };
-  epiphany = {
-    name = "epiphany-2.20.3";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.20/2.20.3/sources/epiphany-2.20.3.tar.bz2;
-      md5 = "df2861b3e91bef6d365f50187b6170cb";
-    };
-  };
-  evince = {
-    name = "evince-2.20.2";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.20/2.20.3/sources/evince-2.20.2.tar.bz2;
-      md5 = "15214f5211d9f98ffa0afd8158b7d021";
-    };
-  };
-  evolution = {
-    name = "evolution-2.12.3";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.20/2.20.3/sources/evolution-2.12.3.tar.bz2;
-      md5 = "554698d7387aee82c5f4d4520760503d";
-    };
-  };
-  evolutiondataserver = {
-    name = "evolution-data-server-1.12.3";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.20/2.20.3/sources/evolution-data-server-1.12.3.tar.bz2;
-      md5 = "9a04e379c34ad538764866dfd4eb2931";
-    };
-  };
-  evolutionexchange = {
-    name = "evolution-exchange-2.12.3";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.20/2.20.3/sources/evolution-exchange-2.12.3.tar.bz2;
-      md5 = "1bdda76724a17fb7606abcdfdb6ec170";
-    };
-  };
-  evolutionwebcal = {
-    name = "evolution-webcal-2.12.0";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.20/2.20.3/sources/evolution-webcal-2.12.0.tar.bz2;
-      md5 = "21e77fa081decb87ce641f3a77245864";
-    };
-  };
-  fastuserswitchapplet = {
-    name = "fast-user-switch-applet-2.18.0";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.20/2.20.3/sources/fast-user-switch-applet-2.18.0.tar.bz2;
-      md5 = "aefe9ea3aecc908336ae909aeee385b5";
-    };
-  };
-  fileroller = {
-    name = "file-roller-2.20.3";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.20/2.20.3/sources/file-roller-2.20.3.tar.bz2;
-      md5 = "7af6bac2e96ad9c728d791ce21dba8f5";
-    };
-  };
-  gcalctool = {
-    name = "gcalctool-5.20.2";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.20/2.20.3/sources/gcalctool-5.20.2.tar.bz2;
-      md5 = "bcde10b8029d3a513183e8aac9506c1f";
-    };
-  };
-  gconfeditor = {
-    name = "gconf-editor-2.20.0";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.20/2.20.3/sources/gconf-editor-2.20.0.tar.bz2;
-      md5 = "b686677878b5754ffa8d0a2cc1129988";
-    };
-  };
-  gdm = {
-    name = "gdm-2.20.3";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.20/2.20.3/sources/gdm-2.20.3.tar.bz2;
-      md5 = "0074b163986cfe48d3998518084c4d00";
-    };
-  };
-  gedit = {
-    name = "gedit-2.20.4";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.20/2.20.3/sources/gedit-2.20.4.tar.bz2;
-      md5 = "6c7d74f9b4339c9ec9e81f6ea3eb19c9";
-    };
-  };
-  gnomeapplets = {
-    name = "gnome-applets-2.20.1";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.20/2.20.3/sources/gnome-applets-2.20.1.tar.bz2;
-      md5 = "e49402e7323bdd9595dc5cbfdba6ba5b";
-    };
-  };
-  gnomebackgrounds = {
-    name = "gnome-backgrounds-2.20.0";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.20/2.20.3/sources/gnome-backgrounds-2.20.0.tar.bz2;
-      md5 = "391c0c64407c5bd2a52207b0298beac4";
-    };
-  };
-  gnomecontrolcenter = {
-    name = "gnome-control-center-2.20.1";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.20/2.20.3/sources/gnome-control-center-2.20.1.tar.bz2;
-      md5 = "d7420f0fc28937573a13bc5c1633b23b";
-    };
-  };
-  gnomedesktop = {
-    name = "gnome-desktop-2.20.3";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.20/2.20.3/sources/gnome-desktop-2.20.3.tar.bz2;
-      md5 = "d59ddca5e9bc4e4d1717538ceae57501";
-    };
-  };
-  gnomedocutils = {
-    name = "gnome-doc-utils-0.12.0";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.20/2.20.3/sources/gnome-doc-utils-0.12.0.tar.bz2;
-      md5 = "5934c08d12407d8233416343cd73df24";
-    };
-  };
-  gnomegames = {
-    name = "gnome-games-2.20.2";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.20/2.20.3/sources/gnome-games-2.20.2.tar.bz2;
-      md5 = "3cfd717e7cf1478ce9cba7b712ede219";
-    };
-  };
-  gnomeicontheme = {
-    name = "gnome-icon-theme-2.20.0";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.20/2.20.3/sources/gnome-icon-theme-2.20.0.tar.bz2;
-      md5 = "56857a6d5f26c236b48fcf6760549d1b";
-    };
-  };
-  gnomekeyring = {
-    name = "gnome-keyring-2.20.3";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.20/2.20.3/sources/gnome-keyring-2.20.3.tar.bz2;
-      md5 = "2205177a168e745fa803c96a4fb62102";
-    };
-  };
-  gnomekeyringmanager = {
-    name = "gnome-keyring-manager-2.20.0";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.20/2.20.3/sources/gnome-keyring-manager-2.20.0.tar.bz2;
-      md5 = "61d701888f00c02490c0cd551bf3fcb1";
-    };
-  };
-  gnomemag = {
-    name = "gnome-mag-0.14.10";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.20/2.20.3/sources/gnome-mag-0.14.10.tar.bz2;
-      md5 = "e3e498c7df873ecc7acabd52a7b4ddc7";
-    };
-  };
-  gnomemedia = {
-    name = "gnome-media-2.20.1";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.20/2.20.3/sources/gnome-media-2.20.1.tar.bz2;
-      md5 = "75036a6990725c4323812afd4cd734f5";
-    };
-  };
-  gnomemenus = {
-    name = "gnome-menus-2.20.3";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.20/2.20.3/sources/gnome-menus-2.20.3.tar.bz2;
-      md5 = "b8ab05f5edfdc3e6a46662a504934657";
-    };
-  };
-  gnomenetstatus = {
-    name = "gnome-netstatus-2.12.1";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.20/2.20.3/sources/gnome-netstatus-2.12.1.tar.bz2;
-      md5 = "8651ca1694a6c222ae5cad6e21814d24";
-    };
-  };
-  gnomenettool = {
-    name = "gnome-nettool-2.20.0";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.20/2.20.3/sources/gnome-nettool-2.20.0.tar.bz2;
-      md5 = "8f16e4207655ccf1e7af679fc0f58bbd";
-    };
-  };
-  gnomepanel = {
-    name = "gnome-panel-2.20.3";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.20/2.20.3/sources/gnome-panel-2.20.3.tar.bz2;
-      md5 = "0ddf04cea0859570216319d6f1f8c4d8";
-    };
-  };
-  gnomepowermanager = {
-    name = "gnome-power-manager-2.20.2";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.20/2.20.3/sources/gnome-power-manager-2.20.2.tar.bz2;
-      md5 = "8a38e3a169b80c44639f4383a64835d0";
-    };
-  };
-  gnomepythondesktop = {
-    name = "gnome-python-desktop-2.20.0";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.20/2.20.3/sources/gnome-python-desktop-2.20.0.tar.bz2;
-      md5 = "02b177f488091d27bf0648ec4660d8f7";
-    };
-  };
-  gnomescreensaver = {
-    name = "gnome-screensaver-2.20.0";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.20/2.20.3/sources/gnome-screensaver-2.20.0.tar.bz2;
-      md5 = "d166a3ebf69289331b2ebcf5c0187fd9";
-    };
-  };
-  gnomesession = {
-    name = "gnome-session-2.20.3";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.20/2.20.3/sources/gnome-session-2.20.3.tar.bz2;
-      md5 = "f9d80e12c8fd79efa9786f617ba18bc7";
-    };
-  };
-  gnomesharp = {
-    name = "gnome-sharp-2.16.0";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.20/2.20.3/sources/gnome-sharp-2.16.0.tar.bz2;
-      md5 = "09034669acec52f9d9818d9a31c032d5";
-    };
-  };
-  gnomespeech = {
-    name = "gnome-speech-0.4.17";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.20/2.20.3/sources/gnome-speech-0.4.17.tar.bz2;
-      md5 = "a202dbc9df89e1c91e66cbf0fd21f26b";
-    };
-  };
-  gnomesystemmonitor = {
-    name = "gnome-system-monitor-2.20.2";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.20/2.20.3/sources/gnome-system-monitor-2.20.2.tar.bz2;
-      md5 = "d5e52f923b0b725b3a49e4bb7a296436";
-    };
-  };
-  gnomesystemtools = {
-    name = "gnome-system-tools-2.20.0";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.20/2.20.3/sources/gnome-system-tools-2.20.0.tar.bz2;
-      md5 = "382ed1f5ad4cb6ce7b88985611e2be18";
-    };
-  };
-  gnometerminal = {
-    name = "gnome-terminal-2.18.4";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.20/2.20.3/sources/gnome-terminal-2.18.4.tar.bz2;
-      md5 = "e4429d66d0d2ede8e14756cfbc15d30a";
-    };
-  };
-  gnomethemes = {
-    name = "gnome-themes-2.20.2";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.20/2.20.3/sources/gnome-themes-2.20.2.tar.bz2;
-      md5 = "52d018251ef8164deaf9343cbfb7af16";
-    };
-  };
-  gnomeuserdocs = {
-    name = "gnome-user-docs-2.20.1";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.20/2.20.3/sources/gnome-user-docs-2.20.1.tar.bz2;
-      md5 = "d6bba44acaed20117769ec8dce378f71";
-    };
-  };
-  gnomeutils = {
-    name = "gnome-utils-2.20.0.1";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.20/2.20.3/sources/gnome-utils-2.20.0.1.tar.bz2;
-      md5 = "2d4385df2fb566b437b283bd2ce70190";
-    };
-  };
-  gnomevolumemanager = {
-    name = "gnome-volume-manager-2.17.0";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.20/2.20.3/sources/gnome-volume-manager-2.17.0.tar.bz2;
-      md5 = "104cec26e721e0bba69debd392367195";
-    };
-  };
-  gok = {
-    name = "gok-1.3.7";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.20/2.20.3/sources/gok-1.3.7.tar.bz2;
-      md5 = "14b2407604ceec0ffcbf4866fef35502";
-    };
-  };
-  gstpluginsbase = {
-    name = "gst-plugins-base-0.10.15";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.20/2.20.3/sources/gst-plugins-base-0.10.15.tar.bz2;
-      md5 = "8449359b465074433fec626778bcf36f";
-    };
-  };
-  gstpluginsgood = {
-    name = "gst-plugins-good-0.10.6";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.20/2.20.3/sources/gst-plugins-good-0.10.6.tar.bz2;
-      md5 = "25f111360c2930705b91b4fcf93ae5c5";
-    };
-  };
-  gstreamer = {
-    name = "gstreamer-0.10.15";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.20/2.20.3/sources/gstreamer-0.10.15.tar.bz2;
-      md5 = "09f1c4ea025faef88b566fa26ec24ae0";
-    };
-  };
-  gtkengines = {
-    name = "gtk-engines-2.12.2";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.20/2.20.3/sources/gtk-engines-2.12.2.tar.bz2;
-      md5 = "a73506d8262eb52e0e4bd8e04517ea4e";
-    };
-  };
-  gtkhtml = {
-    name = "gtkhtml-3.16.3";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.20/2.20.3/sources/gtkhtml-3.16.3.tar.bz2;
-      md5 = "bba94aecc723946e2a4e68e2dcf59722";
-    };
-  };
-  gtksourceview = {
-    name = "gtksourceview-2.0.2";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.20/2.20.3/sources/gtksourceview-2.0.2.tar.bz2;
-      md5 = "8a9daf3fa9ddeed92c18572ee16cd1f5";
-    };
-  };
-  gucharmap = {
-    name = "gucharmap-1.10.2";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.20/2.20.3/sources/gucharmap-1.10.2.tar.bz2;
-      md5 = "0a81695c916b2dbae2392f4bcb8c4e22";
-    };
-  };
-  libgailgnome = {
-    name = "libgail-gnome-1.20.0";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.20/2.20.3/sources/libgail-gnome-1.20.0.tar.bz2;
-      md5 = "5a7662e3d637c86baa95a50adb225e56";
-    };
-  };
-  libgnomekbd = {
-    name = "libgnomekbd-2.20.0";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.20/2.20.3/sources/libgnomekbd-2.20.0.tar.bz2;
-      md5 = "0b495d355e25c3531419cb3996be7e28";
-    };
-  };
-  libgnomeprint = {
-    name = "libgnomeprint-2.18.2";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.20/2.20.3/sources/libgnomeprint-2.18.2.tar.bz2;
-      md5 = "b1f6c95a8dbb8ce17ab00fc2eea2aa91";
-    };
-  };
-  libgnomeprintui = {
-    name = "libgnomeprintui-2.18.1";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.20/2.20.3/sources/libgnomeprintui-2.18.1.tar.bz2;
-      md5 = "4f9a09372a5fa2cd5c35be30dff3fcd6";
-    };
-  };
-  libgtop = {
-    name = "libgtop-2.20.1";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.20/2.20.3/sources/libgtop-2.20.1.tar.bz2;
-      md5 = "b6fa671e8325bd8dbce684527791225a";
-    };
-  };
-  liboobs = {
-    name = "liboobs-2.20.0";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.20/2.20.3/sources/liboobs-2.20.0.tar.bz2;
-      md5 = "c0562e115af4777da471182b9d462b40";
-    };
-  };
-  librsvg = {
-    name = "librsvg-2.18.2";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.20/2.20.3/sources/librsvg-2.18.2.tar.bz2;
-      md5 = "4691ad687281e943260021272c28043e";
-    };
-  };
-  libsoup = {
-    name = "libsoup-2.2.104";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.20/2.20.3/sources/libsoup-2.2.104.tar.bz2;
-      md5 = "ab3b10b1c97de5abe38a748a3656da4c";
-    };
-  };
-  libwnck = {
-    name = "libwnck-2.20.3";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.20/2.20.3/sources/libwnck-2.20.3.tar.bz2;
-      md5 = "0f0f54764993497ed02f34a44056efb2";
-    };
-  };
-  metacity = {
-    name = "metacity-2.20.2";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.20/2.20.3/sources/metacity-2.20.2.tar.bz2;
-      md5 = "3b986030629860674b219fc35c226b1b";
-    };
-  };
-  nautilus = {
-    name = "nautilus-2.20.0";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.20/2.20.3/sources/nautilus-2.20.0.tar.bz2;
-      md5 = "3856ec2ffeba786d12f8f6622e398c33";
-    };
-  };
-  nautiluscdburner = {
-    name = "nautilus-cd-burner-2.20.0";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.20/2.20.3/sources/nautilus-cd-burner-2.20.0.tar.bz2;
-      md5 = "a7ddb02c33be107f6c9c1874b7703e9e";
-    };
-  };
-  orca = {
-    name = "orca-2.20.3";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.20/2.20.3/sources/orca-2.20.3.tar.bz2;
-      md5 = "a270df4640493e0a96dc6d363ae800a6";
-    };
-  };
-  pygtksourceview = {
-    name = "pygtksourceview-2.0.0";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.20/2.20.3/sources/pygtksourceview-2.0.0.tar.bz2;
-      md5 = "a4947108e7a669b67ff0ff157a132728";
-    };
-  };
-  seahorse = {
-    name = "seahorse-2.20.3";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.20/2.20.3/sources/seahorse-2.20.3.tar.bz2;
-      md5 = "6f03b38cb0a52e682c73be49f244f83b";
-    };
-  };
-  soundjuicer = {
-    name = "sound-juicer-2.20.1";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.20/2.20.3/sources/sound-juicer-2.20.1.tar.bz2;
-      md5 = "cea3c67215c99acf513ee7ea4b5eba7b";
-    };
-  };
-  tomboy = {
-    name = "tomboy-0.8.2";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.20/2.20.3/sources/tomboy-0.8.2.tar.bz2;
-      md5 = "cca5b43cd1eb6bc6d277b307944ae884";
-    };
-  };
-  totem = {
-    name = "totem-2.20.3";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.20/2.20.3/sources/totem-2.20.3.tar.bz2;
-      md5 = "7360e0856042615c7c1c3baf03d50bbf";
-    };
-  };
-  vino = {
-    name = "vino-2.20.1";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.20/2.20.3/sources/vino-2.20.1.tar.bz2;
-      md5 = "c45379bd177e0bc9a937a3388fc81650";
-    };
-  };
-  vte = {
-    name = "vte-0.16.12";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.20/2.20.3/sources/vte-0.16.12.tar.bz2;
-      md5 = "9816c35be2ff1b0cf57bd831e1344d1d";
-    };
-  };
-  yelp = {
-    name = "yelp-2.20.0";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.20/2.20.3/sources/yelp-2.20.0.tar.bz2;
-      md5 = "8902618c343093b1c64ee6d647ec41ed";
-    };
-  };
-  zenity = {
-    name = "zenity-2.20.1";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.20/2.20.3/sources/zenity-2.20.1.tar.bz2;
-      md5 = "b9989582ea43f8fd58819d85ef9c9bc5";
-    };
-  };
-}
diff --git a/pkgs/desktops/gnome/src-gnome-desktop-2.22.1.nix b/pkgs/desktops/gnome/src-gnome-desktop-2.22.1.nix
new file mode 100644
index 000000000000..d1308fc1ee5e
--- /dev/null
+++ b/pkgs/desktops/gnome/src-gnome-desktop-2.22.1.nix
@@ -0,0 +1,599 @@
+# Note: this file was generated automatically by make-listing.pl!
+
+{fetchurl} : {
+  alacarte = {
+    name = "alacarte-0.11.5";
+    src = fetchurl {
+      url = http://ftp.gnome.org/pub/GNOME/desktop/2.22/2.22.1/sources/alacarte-0.11.5.tar.bz2;
+      md5 = "e4dc193d36c76b974e66e517e9c7ea33";
+    };
+  };
+  bugbuddy = {
+    name = "bug-buddy-2.22.0";
+    src = fetchurl {
+      url = http://ftp.gnome.org/pub/GNOME/desktop/2.22/2.22.1/sources/bug-buddy-2.22.0.tar.bz2;
+      md5 = "092e1f91d0be4ca133cd0650622a6b06";
+    };
+  };
+  cheese = {
+    name = "cheese-2.22.1";
+    src = fetchurl {
+      url = http://ftp.gnome.org/pub/GNOME/desktop/2.22/2.22.1/sources/cheese-2.22.1.tar.bz2;
+      md5 = "0f3c583081f56263541f9a8644569829";
+    };
+  };
+  dasher = {
+    name = "dasher-4.7.3";
+    src = fetchurl {
+      url = http://ftp.gnome.org/pub/GNOME/desktop/2.22/2.22.1/sources/dasher-4.7.3.tar.bz2;
+      md5 = "f97dfd3c54f6d6c5f2873d4f82cb33c4";
+    };
+  };
+  deskbarapplet = {
+    name = "deskbar-applet-2.22.1";
+    src = fetchurl {
+      url = http://ftp.gnome.org/pub/GNOME/desktop/2.22/2.22.1/sources/deskbar-applet-2.22.1.tar.bz2;
+      md5 = "b506328780abaa6a7e0e59a1f262c22c";
+    };
+  };
+  eel = {
+    name = "eel-2.22.1";
+    src = fetchurl {
+      url = http://ftp.gnome.org/pub/GNOME/desktop/2.22/2.22.1/sources/eel-2.22.1.tar.bz2;
+      md5 = "dd393ad7de2e230a7604af9560140920";
+    };
+  };
+  ekiga = {
+    name = "ekiga-2.0.12";
+    src = fetchurl {
+      url = http://ftp.gnome.org/pub/GNOME/desktop/2.22/2.22.1/sources/ekiga-2.0.12.tar.bz2;
+      md5 = "d86636c2195b4fb95aec427c17570008";
+    };
+  };
+  eog = {
+    name = "eog-2.22.1";
+    src = fetchurl {
+      url = http://ftp.gnome.org/pub/GNOME/desktop/2.22/2.22.1/sources/eog-2.22.1.tar.bz2;
+      md5 = "ca40ada77bda9b396809e08782f5d718";
+    };
+  };
+  epiphany = {
+    name = "epiphany-2.22.1.1";
+    src = fetchurl {
+      url = http://ftp.gnome.org/pub/GNOME/desktop/2.22/2.22.1/sources/epiphany-2.22.1.1.tar.bz2;
+      md5 = "24bb8c430a6165b9c43a2ed0452cc6a5";
+    };
+  };
+  evince = {
+    name = "evince-2.22.1.1";
+    src = fetchurl {
+      url = http://ftp.gnome.org/pub/GNOME/desktop/2.22/2.22.1/sources/evince-2.22.1.1.tar.bz2;
+      md5 = "568ff7211a185d71d0e9de15a07f4987";
+    };
+  };
+  evolution = {
+    name = "evolution-2.22.1";
+    src = fetchurl {
+      url = http://ftp.gnome.org/pub/GNOME/desktop/2.22/2.22.1/sources/evolution-2.22.1.tar.bz2;
+      md5 = "b8eddd6e26b59b1fe6ad0ae849916836";
+    };
+  };
+  evolutiondataserver = {
+    name = "evolution-data-server-2.22.1";
+    src = fetchurl {
+      url = http://ftp.gnome.org/pub/GNOME/desktop/2.22/2.22.1/sources/evolution-data-server-2.22.1.tar.bz2;
+      md5 = "1972fa3dbd46c25216b00c1d35f83eaf";
+    };
+  };
+  evolutionexchange = {
+    name = "evolution-exchange-2.22.1";
+    src = fetchurl {
+      url = http://ftp.gnome.org/pub/GNOME/desktop/2.22/2.22.1/sources/evolution-exchange-2.22.1.tar.bz2;
+      md5 = "213db2462016f18ad3261d3e7fb00004";
+    };
+  };
+  evolutionwebcal = {
+    name = "evolution-webcal-2.21.92";
+    src = fetchurl {
+      url = http://ftp.gnome.org/pub/GNOME/desktop/2.22/2.22.1/sources/evolution-webcal-2.21.92.tar.bz2;
+      md5 = "049ea414f6d82a1e4b1e88f71a4f19cb";
+    };
+  };
+  fastuserswitchapplet = {
+    name = "fast-user-switch-applet-2.22.0";
+    src = fetchurl {
+      url = http://ftp.gnome.org/pub/GNOME/desktop/2.22/2.22.1/sources/fast-user-switch-applet-2.22.0.tar.bz2;
+      md5 = "540f2567582e77cdd673dde3546b61db";
+    };
+  };
+  fileroller = {
+    name = "file-roller-2.22.2";
+    src = fetchurl {
+      url = http://ftp.gnome.org/pub/GNOME/desktop/2.22/2.22.1/sources/file-roller-2.22.2.tar.bz2;
+      md5 = "68f89c4723e4f2d2e58b15f7b2a20d23";
+    };
+  };
+  gcalctool = {
+    name = "gcalctool-5.22.1";
+    src = fetchurl {
+      url = http://ftp.gnome.org/pub/GNOME/desktop/2.22/2.22.1/sources/gcalctool-5.22.1.tar.bz2;
+      md5 = "a4103972f07e85cf242b9a5e4efcfa91";
+    };
+  };
+  gconfeditor = {
+    name = "gconf-editor-2.22.0";
+    src = fetchurl {
+      url = http://ftp.gnome.org/pub/GNOME/desktop/2.22/2.22.1/sources/gconf-editor-2.22.0.tar.bz2;
+      md5 = "7ca99aec214dd855b5de7dacc8937055";
+    };
+  };
+  gdm = {
+    name = "gdm-2.20.5";
+    src = fetchurl {
+      url = http://ftp.gnome.org/pub/GNOME/desktop/2.22/2.22.1/sources/gdm-2.20.5.tar.bz2;
+      md5 = "151d90901abc2088a0825ee1dd8da7f6";
+    };
+  };
+  gedit = {
+    name = "gedit-2.22.1";
+    src = fetchurl {
+      url = http://ftp.gnome.org/pub/GNOME/desktop/2.22/2.22.1/sources/gedit-2.22.1.tar.bz2;
+      md5 = "ee797f4e2eed291dc28ef8ff7082445e";
+    };
+  };
+  gnomeapplets = {
+    name = "gnome-applets-2.22.1";
+    src = fetchurl {
+      url = http://ftp.gnome.org/pub/GNOME/desktop/2.22/2.22.1/sources/gnome-applets-2.22.1.tar.bz2;
+      md5 = "d6df0a48c875b77a4fafe47fc81bde29";
+    };
+  };
+  gnomebackgrounds = {
+    name = "gnome-backgrounds-2.22.0";
+    src = fetchurl {
+      url = http://ftp.gnome.org/pub/GNOME/desktop/2.22/2.22.1/sources/gnome-backgrounds-2.22.0.tar.bz2;
+      md5 = "1997e020288ea6b91ed460c2c6bfc8d4";
+    };
+  };
+  gnomecontrolcenter = {
+    name = "gnome-control-center-2.22.1";
+    src = fetchurl {
+      url = http://ftp.gnome.org/pub/GNOME/desktop/2.22/2.22.1/sources/gnome-control-center-2.22.1.tar.bz2;
+      md5 = "170815bcf2627bf64436283f86c751aa";
+    };
+  };
+  gnomedesktop = {
+    name = "gnome-desktop-2.22.1";
+    src = fetchurl {
+      url = http://ftp.gnome.org/pub/GNOME/desktop/2.22/2.22.1/sources/gnome-desktop-2.22.1.tar.bz2;
+      md5 = "39d1421dbfe54d0838a00b055edcb5cf";
+    };
+  };
+  gnomedesktopsharp = {
+    name = "gnome-desktop-sharp-2.20.1";
+    src = fetchurl {
+      url = http://ftp.gnome.org/pub/GNOME/desktop/2.22/2.22.1/sources/gnome-desktop-sharp-2.20.1.tar.bz2;
+      md5 = "874cfcf8a6547476906b638355a0ed2f";
+    };
+  };
+  gnomedocutils = {
+    name = "gnome-doc-utils-0.12.2";
+    src = fetchurl {
+      url = http://ftp.gnome.org/pub/GNOME/desktop/2.22/2.22.1/sources/gnome-doc-utils-0.12.2.tar.bz2;
+      md5 = "e1a9e9ba923b8950f8803c90ebeaadb8";
+    };
+  };
+  gnomegames = {
+    name = "gnome-games-2.22.1.1";
+    src = fetchurl {
+      url = http://ftp.gnome.org/pub/GNOME/desktop/2.22/2.22.1/sources/gnome-games-2.22.1.1.tar.bz2;
+      md5 = "57500e063a6f26f2fbfd364a68842297";
+    };
+  };
+  gnomeicontheme = {
+    name = "gnome-icon-theme-2.22.0";
+    src = fetchurl {
+      url = http://ftp.gnome.org/pub/GNOME/desktop/2.22/2.22.1/sources/gnome-icon-theme-2.22.0.tar.bz2;
+      md5 = "a4c03092da28ad53ed3867aef83f29d9";
+    };
+  };
+  gnomekeyring = {
+    name = "gnome-keyring-2.22.1";
+    src = fetchurl {
+      url = http://ftp.gnome.org/pub/GNOME/desktop/2.22/2.22.1/sources/gnome-keyring-2.22.1.tar.bz2;
+      md5 = "4ca9c19fa6ada61cdc93ab24214b5c4f";
+    };
+  };
+  gnomemag = {
+    name = "gnome-mag-0.15.0";
+    src = fetchurl {
+      url = http://ftp.gnome.org/pub/GNOME/desktop/2.22/2.22.1/sources/gnome-mag-0.15.0.tar.bz2;
+      md5 = "a297f2b2fae4cd0cde2a30bfacc4c380";
+    };
+  };
+  gnomemedia = {
+    name = "gnome-media-2.22.0";
+    src = fetchurl {
+      url = http://ftp.gnome.org/pub/GNOME/desktop/2.22/2.22.1/sources/gnome-media-2.22.0.tar.bz2;
+      md5 = "e3fabb87abd2731d7f345d724b40333a";
+    };
+  };
+  gnomemenus = {
+    name = "gnome-menus-2.22.1";
+    src = fetchurl {
+      url = http://ftp.gnome.org/pub/GNOME/desktop/2.22/2.22.1/sources/gnome-menus-2.22.1.tar.bz2;
+      md5 = "6e31d10da8c1ef315ca2d7f02e807395";
+    };
+  };
+  gnomenetstatus = {
+    name = "gnome-netstatus-2.12.1";
+    src = fetchurl {
+      url = http://ftp.gnome.org/pub/GNOME/desktop/2.22/2.22.1/sources/gnome-netstatus-2.12.1.tar.bz2;
+      md5 = "8651ca1694a6c222ae5cad6e21814d24";
+    };
+  };
+  gnomenettool = {
+    name = "gnome-nettool-2.22.0";
+    src = fetchurl {
+      url = http://ftp.gnome.org/pub/GNOME/desktop/2.22/2.22.1/sources/gnome-nettool-2.22.0.tar.bz2;
+      md5 = "290dd50a08a3859332afb6daf46dde25";
+    };
+  };
+  gnomepanel = {
+    name = "gnome-panel-2.22.1.1";
+    src = fetchurl {
+      url = http://ftp.gnome.org/pub/GNOME/desktop/2.22/2.22.1/sources/gnome-panel-2.22.1.1.tar.bz2;
+      md5 = "c80f265af2dd009917aece662fd6ab37";
+    };
+  };
+  gnomepowermanager = {
+    name = "gnome-power-manager-2.22.1";
+    src = fetchurl {
+      url = http://ftp.gnome.org/pub/GNOME/desktop/2.22/2.22.1/sources/gnome-power-manager-2.22.1.tar.bz2;
+      md5 = "bfb10f96771dd161ff16171f78a7dc21";
+    };
+  };
+  gnomepythondesktop = {
+    name = "gnome-python-desktop-2.22.0";
+    src = fetchurl {
+      url = http://ftp.gnome.org/pub/GNOME/desktop/2.22/2.22.1/sources/gnome-python-desktop-2.22.0.tar.bz2;
+      md5 = "504877a973f6abc0788283232cd703cb";
+    };
+  };
+  gnomescreensaver = {
+    name = "gnome-screensaver-2.22.2";
+    src = fetchurl {
+      url = http://ftp.gnome.org/pub/GNOME/desktop/2.22/2.22.1/sources/gnome-screensaver-2.22.2.tar.bz2;
+      md5 = "496a2e0cba5c27db57a72ecf2e17f789";
+    };
+  };
+  gnomesession = {
+    name = "gnome-session-2.22.1";
+    src = fetchurl {
+      url = http://ftp.gnome.org/pub/GNOME/desktop/2.22/2.22.1/sources/gnome-session-2.22.1.tar.bz2;
+      md5 = "8cd499f49cecfdcb32fd4f97965e9017";
+    };
+  };
+  gnomesettingsdaemon = {
+    name = "gnome-settings-daemon-2.22.1";
+    src = fetchurl {
+      url = http://ftp.gnome.org/pub/GNOME/desktop/2.22/2.22.1/sources/gnome-settings-daemon-2.22.1.tar.bz2;
+      md5 = "959d0d289ed81f950004fa64dbcff89d";
+    };
+  };
+  gnomesharp = {
+    name = "gnome-sharp-2.20.0";
+    src = fetchurl {
+      url = http://ftp.gnome.org/pub/GNOME/desktop/2.22/2.22.1/sources/gnome-sharp-2.20.0.tar.bz2;
+      md5 = "1cdb85652a6504afe6fad569daa901ee";
+    };
+  };
+  gnomespeech = {
+    name = "gnome-speech-0.4.18";
+    src = fetchurl {
+      url = http://ftp.gnome.org/pub/GNOME/desktop/2.22/2.22.1/sources/gnome-speech-0.4.18.tar.bz2;
+      md5 = "f325037fdc74e19d943f397066454ac3";
+    };
+  };
+  gnomesystemmonitor = {
+    name = "gnome-system-monitor-2.22.0";
+    src = fetchurl {
+      url = http://ftp.gnome.org/pub/GNOME/desktop/2.22/2.22.1/sources/gnome-system-monitor-2.22.0.tar.bz2;
+      md5 = "7b809a4db72902ca5f47a63f62917d14";
+    };
+  };
+  gnomesystemtools = {
+    name = "gnome-system-tools-2.22.0";
+    src = fetchurl {
+      url = http://ftp.gnome.org/pub/GNOME/desktop/2.22/2.22.1/sources/gnome-system-tools-2.22.0.tar.bz2;
+      md5 = "6559bb97fc75bc28b559dc530571d527";
+    };
+  };
+  gnometerminal = {
+    name = "gnome-terminal-2.22.1";
+    src = fetchurl {
+      url = http://ftp.gnome.org/pub/GNOME/desktop/2.22/2.22.1/sources/gnome-terminal-2.22.1.tar.bz2;
+      md5 = "0e6c71def04b2a56e8d6725cef7950b4";
+    };
+  };
+  gnomethemes = {
+    name = "gnome-themes-2.22.0";
+    src = fetchurl {
+      url = http://ftp.gnome.org/pub/GNOME/desktop/2.22/2.22.1/sources/gnome-themes-2.22.0.tar.bz2;
+      md5 = "e902194175c6f7298bd53e5aa7eef56b";
+    };
+  };
+  gnomeuserdocs = {
+    name = "gnome-user-docs-2.22.0";
+    src = fetchurl {
+      url = http://ftp.gnome.org/pub/GNOME/desktop/2.22/2.22.1/sources/gnome-user-docs-2.22.0.tar.bz2;
+      md5 = "f3af808e754701b83105eab2f5ca690c";
+    };
+  };
+  gnomeutils = {
+    name = "gnome-utils-2.20.0.1";
+    src = fetchurl {
+      url = http://ftp.gnome.org/pub/GNOME/desktop/2.22/2.22.1/sources/gnome-utils-2.20.0.1.tar.bz2;
+      md5 = "2d4385df2fb566b437b283bd2ce70190";
+    };
+  };
+  gnomevolumemanager = {
+    name = "gnome-volume-manager-2.22.1";
+    src = fetchurl {
+      url = http://ftp.gnome.org/pub/GNOME/desktop/2.22/2.22.1/sources/gnome-volume-manager-2.22.1.tar.bz2;
+      md5 = "a0cb86f541515f33443c848879d04785";
+    };
+  };
+  gok = {
+    name = "gok-1.3.7";
+    src = fetchurl {
+      url = http://ftp.gnome.org/pub/GNOME/desktop/2.22/2.22.1/sources/gok-1.3.7.tar.bz2;
+      md5 = "14b2407604ceec0ffcbf4866fef35502";
+    };
+  };
+  gstpluginsbase = {
+    name = "gst-plugins-base-0.10.19";
+    src = fetchurl {
+      url = http://ftp.gnome.org/pub/GNOME/desktop/2.22/2.22.1/sources/gst-plugins-base-0.10.19.tar.bz2;
+      md5 = "9c9614cbb6497b7fee1c954b9d5ae3b7";
+    };
+  };
+  gstpluginsgood = {
+    name = "gst-plugins-good-0.10.6";
+    src = fetchurl {
+      url = http://ftp.gnome.org/pub/GNOME/desktop/2.22/2.22.1/sources/gst-plugins-good-0.10.6.tar.bz2;
+      md5 = "25f111360c2930705b91b4fcf93ae5c5";
+    };
+  };
+  gstreamer = {
+    name = "gstreamer-0.10.19";
+    src = fetchurl {
+      url = http://ftp.gnome.org/pub/GNOME/desktop/2.22/2.22.1/sources/gstreamer-0.10.19.tar.bz2;
+      md5 = "12072a3168420350ea450749a3b63be8";
+    };
+  };
+  gtkengines = {
+    name = "gtk-engines-2.14.1";
+    src = fetchurl {
+      url = http://ftp.gnome.org/pub/GNOME/desktop/2.22/2.22.1/sources/gtk-engines-2.14.1.tar.bz2;
+      md5 = "eef8ee067bad0b76b9773aef1994930c";
+    };
+  };
+  gtkhtml = {
+    name = "gtkhtml-3.18.1";
+    src = fetchurl {
+      url = http://ftp.gnome.org/pub/GNOME/desktop/2.22/2.22.1/sources/gtkhtml-3.18.1.tar.bz2;
+      md5 = "e314eba21158afa018d47f63c67000d3";
+    };
+  };
+  gtksourceview = {
+    name = "gtksourceview-2.2.1";
+    src = fetchurl {
+      url = http://ftp.gnome.org/pub/GNOME/desktop/2.22/2.22.1/sources/gtksourceview-2.2.1.tar.bz2;
+      md5 = "1c5bd86f854ead3aedb96463ebbb275f";
+    };
+  };
+  gucharmap = {
+    name = "gucharmap-2.22.1";
+    src = fetchurl {
+      url = http://ftp.gnome.org/pub/GNOME/desktop/2.22/2.22.1/sources/gucharmap-2.22.1.tar.bz2;
+      md5 = "cd5f6ae44d29a7582dc179ebc64b42b4";
+    };
+  };
+  gvfs = {
+    name = "gvfs-0.2.3";
+    src = fetchurl {
+      url = http://ftp.gnome.org/pub/GNOME/desktop/2.22/2.22.1/sources/gvfs-0.2.3.tar.bz2;
+      md5 = "cefc1279b98838f26bc7878029ed13b3";
+    };
+  };
+  libgailgnome = {
+    name = "libgail-gnome-1.20.0";
+    src = fetchurl {
+      url = http://ftp.gnome.org/pub/GNOME/desktop/2.22/2.22.1/sources/libgail-gnome-1.20.0.tar.bz2;
+      md5 = "5a7662e3d637c86baa95a50adb225e56";
+    };
+  };
+  libgnomekbd = {
+    name = "libgnomekbd-2.22.0";
+    src = fetchurl {
+      url = http://ftp.gnome.org/pub/GNOME/desktop/2.22/2.22.1/sources/libgnomekbd-2.22.0.tar.bz2;
+      md5 = "a8b64278ae3471583607d734db9347eb";
+    };
+  };
+  libgnomeprint = {
+    name = "libgnomeprint-2.18.4";
+    src = fetchurl {
+      url = http://ftp.gnome.org/pub/GNOME/desktop/2.22/2.22.1/sources/libgnomeprint-2.18.4.tar.bz2;
+      md5 = "bc460f875425a956176f07440b3fa46e";
+    };
+  };
+  libgnomeprintui = {
+    name = "libgnomeprintui-2.18.2";
+    src = fetchurl {
+      url = http://ftp.gnome.org/pub/GNOME/desktop/2.22/2.22.1/sources/libgnomeprintui-2.18.2.tar.bz2;
+      md5 = "88b404e7b62bb9ad96b25908c1315dcd";
+    };
+  };
+  libgtop = {
+    name = "libgtop-2.22.1";
+    src = fetchurl {
+      url = http://ftp.gnome.org/pub/GNOME/desktop/2.22/2.22.1/sources/libgtop-2.22.1.tar.bz2;
+      md5 = "d157224c951f1284132361e50a8195b5";
+    };
+  };
+  libgweather = {
+    name = "libgweather-2.22.1.1";
+    src = fetchurl {
+      url = http://ftp.gnome.org/pub/GNOME/desktop/2.22/2.22.1/sources/libgweather-2.22.1.1.tar.bz2;
+      md5 = "6b0e12931db8c640992bef75bd3cc24b";
+    };
+  };
+  liboobs = {
+    name = "liboobs-2.22.0";
+    src = fetchurl {
+      url = http://ftp.gnome.org/pub/GNOME/desktop/2.22/2.22.1/sources/liboobs-2.22.0.tar.bz2;
+      md5 = "1b090ecd6c0df58b131795ff9a5c9057";
+    };
+  };
+  librsvg = {
+    name = "librsvg-2.22.2";
+    src = fetchurl {
+      url = http://ftp.gnome.org/pub/GNOME/desktop/2.22/2.22.1/sources/librsvg-2.22.2.tar.bz2;
+      md5 = "aae602677ce201b1a0ed6a0c18c207f2";
+    };
+  };
+  libsoup = {
+    name = "libsoup-2.4.1";
+    src = fetchurl {
+      url = http://ftp.gnome.org/pub/GNOME/desktop/2.22/2.22.1/sources/libsoup-2.4.1.tar.bz2;
+      md5 = "d0fc91ccb9da401e9e40d2f4612bdac9";
+    };
+  };
+  libwnck = {
+    name = "libwnck-2.22.1";
+    src = fetchurl {
+      url = http://ftp.gnome.org/pub/GNOME/desktop/2.22/2.22.1/sources/libwnck-2.22.1.tar.bz2;
+      md5 = "6b16643a107d9fc37136335939ab3f1a";
+    };
+  };
+  metacity = {
+    name = "metacity-2.22.0";
+    src = fetchurl {
+      url = http://ftp.gnome.org/pub/GNOME/desktop/2.22/2.22.1/sources/metacity-2.22.0.tar.bz2;
+      md5 = "8cb6d02cf66a1003532b4f5d2754d696";
+    };
+  };
+  mousetweaks = {
+    name = "mousetweaks-2.22.1";
+    src = fetchurl {
+      url = http://ftp.gnome.org/pub/GNOME/desktop/2.22/2.22.1/sources/mousetweaks-2.22.1.tar.bz2;
+      md5 = "16ef7e51728c27c7ea3378a9f296f352";
+    };
+  };
+  nautilus = {
+    name = "nautilus-2.22.2";
+    src = fetchurl {
+      url = http://ftp.gnome.org/pub/GNOME/desktop/2.22/2.22.1/sources/nautilus-2.22.2.tar.bz2;
+      md5 = "4758815c46f350bd314d9e104f0a1b72";
+    };
+  };
+  nautiluscdburner = {
+    name = "nautilus-cd-burner-2.22.1";
+    src = fetchurl {
+      url = http://ftp.gnome.org/pub/GNOME/desktop/2.22/2.22.1/sources/nautilus-cd-burner-2.22.1.tar.bz2;
+      md5 = "6bf96cb55a11813a26118eabafa69143";
+    };
+  };
+  orca = {
+    name = "orca-2.22.1";
+    src = fetchurl {
+      url = http://ftp.gnome.org/pub/GNOME/desktop/2.22/2.22.1/sources/orca-2.22.1.tar.bz2;
+      md5 = "ef477a5b43846060ccbc636f5b731f21";
+    };
+  };
+  pygtksourceview = {
+    name = "pygtksourceview-2.2.0";
+    src = fetchurl {
+      url = http://ftp.gnome.org/pub/GNOME/desktop/2.22/2.22.1/sources/pygtksourceview-2.2.0.tar.bz2;
+      md5 = "5dd0a9aa99168f989ed04123a65077e4";
+    };
+  };
+  seahorse = {
+    name = "seahorse-2.22.1";
+    src = fetchurl {
+      url = http://ftp.gnome.org/pub/GNOME/desktop/2.22/2.22.1/sources/seahorse-2.22.1.tar.bz2;
+      md5 = "e0e409ab825c954b5937b8b115dd5118";
+    };
+  };
+  soundjuicer = {
+    name = "sound-juicer-2.22.0";
+    src = fetchurl {
+      url = http://ftp.gnome.org/pub/GNOME/desktop/2.22/2.22.1/sources/sound-juicer-2.22.0.tar.bz2;
+      md5 = "20f83a28915b7d7029198396258d1b4f";
+    };
+  };
+  swfdecgnome = {
+    name = "swfdec-gnome-2.22.2";
+    src = fetchurl {
+      url = http://ftp.gnome.org/pub/GNOME/desktop/2.22/2.22.1/sources/swfdec-gnome-2.22.2.tar.bz2;
+      md5 = "7de99aff7978bc870e1eabb4ba8f0fc7";
+    };
+  };
+  tomboy = {
+    name = "tomboy-0.10.1";
+    src = fetchurl {
+      url = http://ftp.gnome.org/pub/GNOME/desktop/2.22/2.22.1/sources/tomboy-0.10.1.tar.bz2;
+      md5 = "c9b2534e2ea58bf0a8cf7c8dc5643fc1";
+    };
+  };
+  totem = {
+    name = "totem-2.22.1";
+    src = fetchurl {
+      url = http://ftp.gnome.org/pub/GNOME/desktop/2.22/2.22.1/sources/totem-2.22.1.tar.bz2;
+      md5 = "f4920ffef2a90f019ff7e9d6a411e532";
+    };
+  };
+  totemplparser = {
+    name = "totem-pl-parser-2.22.2";
+    src = fetchurl {
+      url = http://ftp.gnome.org/pub/GNOME/desktop/2.22/2.22.1/sources/totem-pl-parser-2.22.2.tar.bz2;
+      md5 = "d2f5e023de8d24c21e863dd7257594f0";
+    };
+  };
+  vinagre = {
+    name = "vinagre-0.5.1";
+    src = fetchurl {
+      url = http://ftp.gnome.org/pub/GNOME/desktop/2.22/2.22.1/sources/vinagre-0.5.1.tar.bz2;
+      md5 = "48e0079631952216743720fa1c59f621";
+    };
+  };
+  vino = {
+    name = "vino-2.22.1";
+    src = fetchurl {
+      url = http://ftp.gnome.org/pub/GNOME/desktop/2.22/2.22.1/sources/vino-2.22.1.tar.bz2;
+      md5 = "01c5ffd0b252edb8921bfcca88438339";
+    };
+  };
+  vte = {
+    name = "vte-0.16.13";
+    src = fetchurl {
+      url = http://ftp.gnome.org/pub/GNOME/desktop/2.22/2.22.1/sources/vte-0.16.13.tar.bz2;
+      md5 = "40480f20f6b7664f3d364e4f2ed27889";
+    };
+  };
+  yelp = {
+    name = "yelp-2.22.1";
+    src = fetchurl {
+      url = http://ftp.gnome.org/pub/GNOME/desktop/2.22/2.22.1/sources/yelp-2.22.1.tar.bz2;
+      md5 = "a292c6712bb820e6aa2ade84ebdc9609";
+    };
+  };
+  zenity = {
+    name = "zenity-2.22.1";
+    src = fetchurl {
+      url = http://ftp.gnome.org/pub/GNOME/desktop/2.22/2.22.1/sources/zenity-2.22.1.tar.bz2;
+      md5 = "4e1e1f080e7253ee4f6a5cee3306c78d";
+    };
+  };
+}
diff --git a/pkgs/desktops/gnome/src-gnome-platform-2.20.3.nix b/pkgs/desktops/gnome/src-gnome-platform-2.20.3.nix
deleted file mode 100644
index a3d138ce4b13..000000000000
--- a/pkgs/desktops/gnome/src-gnome-platform-2.20.3.nix
+++ /dev/null
@@ -1,179 +0,0 @@
-# Note: this file was generated automatically by make-listing.pl!
-
-{fetchurl} : {
-  atk = {
-    name = "atk-1.20.0";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/platform/2.20/2.20.3/sources/atk-1.20.0.tar.bz2;
-      md5 = "b1a9e28d9f54ea306bd85a4c84b25fb8";
-    };
-  };
-  atspi = {
-    name = "at-spi-1.20.1";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/platform/2.20/2.20.3/sources/at-spi-1.20.1.tar.bz2;
-      md5 = "9dc4ce96c17452cd285d006d03574e93";
-    };
-  };
-  audiofile = {
-    name = "audiofile-0.2.6";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/platform/2.20/2.20.3/sources/audiofile-0.2.6.tar.bz2;
-      md5 = "3d01302834660850b6141cac1e6f5501";
-    };
-  };
-  esound = {
-    name = "esound-0.2.38";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/platform/2.20/2.20.3/sources/esound-0.2.38.tar.bz2;
-      md5 = "1c48c100b450d617b58dacb59837d34f";
-    };
-  };
-  gail = {
-    name = "gail-1.20.2";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/platform/2.20/2.20.3/sources/gail-1.20.2.tar.bz2;
-      md5 = "e805806f897cf6040e1f3e9c0cd2151b";
-    };
-  };
-  GConf = {
-    name = "GConf-2.20.1";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/platform/2.20/2.20.3/sources/GConf-2.20.1.tar.bz2;
-      md5 = "646fc896c6282a8f103365af0fa2e303";
-    };
-  };
-  glib = {
-    name = "glib-2.14.4";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/platform/2.20/2.20.3/sources/glib-2.14.4.tar.bz2;
-      md5 = "7ee7874108cbe9ea7fff1f4ab3389ce8";
-    };
-  };
-  gnomemimedata = {
-    name = "gnome-mime-data-2.18.0";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/platform/2.20/2.20.3/sources/gnome-mime-data-2.18.0.tar.bz2;
-      md5 = "541858188f80090d12a33b5a7c34d42c";
-    };
-  };
-  gnomevfs = {
-    name = "gnome-vfs-2.20.1";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/platform/2.20/2.20.3/sources/gnome-vfs-2.20.1.tar.bz2;
-      md5 = "a350a5a3e201951d7e7867d0900df423";
-    };
-  };
-  gnomevfsmonikers = {
-    name = "gnome-vfs-monikers-2.15.3";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/platform/2.20/2.20.3/sources/gnome-vfs-monikers-2.15.3.tar.bz2;
-      md5 = "b16f0db0482263be3318e269f52bb5b6";
-    };
-  };
-  gtk = {
-    name = "gtk+-2.12.4";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/platform/2.20/2.20.3/sources/gtk+-2.12.4.tar.bz2;
-      md5 = "72e2a930f65667ab86dc46141bbaf9e2";
-    };
-  };
-  gtkdoc = {
-    name = "gtk-doc-1.9";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/platform/2.20/2.20.3/sources/gtk-doc-1.9.tar.bz2;
-      md5 = "bcd002f381385812737a05538eb8b21e";
-    };
-  };
-  intltool = {
-    name = "intltool-0.36.3";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/platform/2.20/2.20.3/sources/intltool-0.36.3.tar.bz2;
-      md5 = "4a4428eedf69ac2717f2353b742fe42e";
-    };
-  };
-  libart_lgpl = {
-    name = "libart_lgpl-2.3.19";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/platform/2.20/2.20.3/sources/libart_lgpl-2.3.19.tar.bz2;
-      md5 = "ac885805d1918026a18b560f4015bc66";
-    };
-  };
-  libbonobo = {
-    name = "libbonobo-2.20.3";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/platform/2.20/2.20.3/sources/libbonobo-2.20.3.tar.bz2;
-      md5 = "db152a4e97eaf2670b666fef45098413";
-    };
-  };
-  libbonoboui = {
-    name = "libbonoboui-2.20.0";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/platform/2.20/2.20.3/sources/libbonoboui-2.20.0.tar.bz2;
-      md5 = "14427a459f6ca355de5f5e47ce95c1c4";
-    };
-  };
-  libglade = {
-    name = "libglade-2.6.2";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/platform/2.20/2.20.3/sources/libglade-2.6.2.tar.bz2;
-      md5 = "da4f9d1c6cd1337f6ef5e2db768d8557";
-    };
-  };
-  libgnome = {
-    name = "libgnome-2.20.1.1";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/platform/2.20/2.20.3/sources/libgnome-2.20.1.1.tar.bz2;
-      md5 = "cfab025a8b9a19cdae1c64f8b005c513";
-    };
-  };
-  libgnomecanvas = {
-    name = "libgnomecanvas-2.20.1.1";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/platform/2.20/2.20.3/sources/libgnomecanvas-2.20.1.1.tar.bz2;
-      md5 = "948ed771d2957d24a0c9a414e9581055";
-    };
-  };
-  libgnomeui = {
-    name = "libgnomeui-2.20.1.1";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/platform/2.20/2.20.3/sources/libgnomeui-2.20.1.1.tar.bz2;
-      md5 = "d1f500c5d33ce93159b4952bb476fcf3";
-    };
-  };
-  libIDL = {
-    name = "libIDL-0.8.9";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/platform/2.20/2.20.3/sources/libIDL-0.8.9.tar.bz2;
-      md5 = "a4f84903e289bb874ae2fbe92d80e656";
-    };
-  };
-  libxml2 = {
-    name = "libxml2-2.6.30";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/platform/2.20/2.20.3/sources/libxml2-2.6.30.tar.bz2;
-      md5 = "cbc6d381daaa836b90a7ab449c1bc1ae";
-    };
-  };
-  libxslt = {
-    name = "libxslt-1.1.22";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/platform/2.20/2.20.3/sources/libxslt-1.1.22.tar.bz2;
-      md5 = "f2061dddea77257488601e20e2f3b5a7";
-    };
-  };
-  ORBit2 = {
-    name = "ORBit2-2.14.10";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/platform/2.20/2.20.3/sources/ORBit2-2.14.10.tar.bz2;
-      md5 = "180f486f07d6db84aca0f71f68e54618";
-    };
-  };
-  pango = {
-    name = "pango-1.18.4";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/platform/2.20/2.20.3/sources/pango-1.18.4.tar.bz2;
-      md5 = "5f4a24eb03789746a13e41beb7044776";
-    };
-  };
-}
diff --git a/pkgs/desktops/gnome/src-gnome-platform-2.22.1.nix b/pkgs/desktops/gnome/src-gnome-platform-2.22.1.nix
new file mode 100644
index 000000000000..0f83354b1e29
--- /dev/null
+++ b/pkgs/desktops/gnome/src-gnome-platform-2.22.1.nix
@@ -0,0 +1,165 @@
+# Note: this file was generated automatically by make-listing.pl!
+
+{fetchurl} : {
+  atk = {
+    name = "atk-1.22.0";
+    src = fetchurl {
+      url = http://ftp.gnome.org/pub/GNOME/platform/2.22/2.22.1/sources/atk-1.22.0.tar.bz2;
+      md5 = "06a2b39a22d5ca35c47435da6b9643ac";
+    };
+  };
+  atspi = {
+    name = "at-spi-1.22.1";
+    src = fetchurl {
+      url = http://ftp.gnome.org/pub/GNOME/platform/2.22/2.22.1/sources/at-spi-1.22.1.tar.bz2;
+      md5 = "2ee1b35ef25e753e6bac840a418608f5";
+    };
+  };
+  audiofile = {
+    name = "audiofile-0.2.6";
+    src = fetchurl {
+      url = http://ftp.gnome.org/pub/GNOME/platform/2.22/2.22.1/sources/audiofile-0.2.6.tar.bz2;
+      md5 = "3d01302834660850b6141cac1e6f5501";
+    };
+  };
+  esound = {
+    name = "esound-0.2.38";
+    src = fetchurl {
+      url = http://ftp.gnome.org/pub/GNOME/platform/2.22/2.22.1/sources/esound-0.2.38.tar.bz2;
+      md5 = "1c48c100b450d617b58dacb59837d34f";
+    };
+  };
+  gail = {
+    name = "gail-1.22.1";
+    src = fetchurl {
+      url = http://ftp.gnome.org/pub/GNOME/platform/2.22/2.22.1/sources/gail-1.22.1.tar.bz2;
+      md5 = "521e2e1ae1dfe4699c037b1be205b0b3";
+    };
+  };
+  GConf = {
+    name = "GConf-2.22.0";
+    src = fetchurl {
+      url = http://ftp.gnome.org/pub/GNOME/platform/2.22/2.22.1/sources/GConf-2.22.0.tar.bz2;
+      md5 = "a56c043afeb1052abaf45407409b0331";
+    };
+  };
+  glib = {
+    name = "glib-2.16.3";
+    src = fetchurl {
+      url = http://ftp.gnome.org/pub/GNOME/platform/2.22/2.22.1/sources/glib-2.16.3.tar.bz2;
+      md5 = "195f9a803cc5279dbb39afdf985f44cb";
+    };
+  };
+  gnomemimedata = {
+    name = "gnome-mime-data-2.18.0";
+    src = fetchurl {
+      url = http://ftp.gnome.org/pub/GNOME/platform/2.22/2.22.1/sources/gnome-mime-data-2.18.0.tar.bz2;
+      md5 = "541858188f80090d12a33b5a7c34d42c";
+    };
+  };
+  gnomevfs = {
+    name = "gnome-vfs-2.22.0";
+    src = fetchurl {
+      url = http://ftp.gnome.org/pub/GNOME/platform/2.22/2.22.1/sources/gnome-vfs-2.22.0.tar.bz2;
+      md5 = "369105fd82cb99e69e63acab8f3b89b7";
+    };
+  };
+  gnomevfsmonikers = {
+    name = "gnome-vfs-monikers-2.15.3";
+    src = fetchurl {
+      url = http://ftp.gnome.org/pub/GNOME/platform/2.22/2.22.1/sources/gnome-vfs-monikers-2.15.3.tar.bz2;
+      md5 = "b16f0db0482263be3318e269f52bb5b6";
+    };
+  };
+  gtk = {
+    name = "gtk+-2.12.9";
+    src = fetchurl {
+      url = http://ftp.gnome.org/pub/GNOME/platform/2.22/2.22.1/sources/gtk+-2.12.9.tar.bz2;
+      md5 = "33499772fdc3bea569c6d5673e5831b4";
+    };
+  };
+  gtkdoc = {
+    name = "gtk-doc-1.9";
+    src = fetchurl {
+      url = http://ftp.gnome.org/pub/GNOME/platform/2.22/2.22.1/sources/gtk-doc-1.9.tar.bz2;
+      md5 = "bcd002f381385812737a05538eb8b21e";
+    };
+  };
+  intltool = {
+    name = "intltool-0.37.1";
+    src = fetchurl {
+      url = http://ftp.gnome.org/pub/GNOME/platform/2.22/2.22.1/sources/intltool-0.37.1.tar.bz2;
+      md5 = "860d392f04299c2740d0752501639c3b";
+    };
+  };
+  libart_lgpl = {
+    name = "libart_lgpl-2.3.20";
+    src = fetchurl {
+      url = http://ftp.gnome.org/pub/GNOME/platform/2.22/2.22.1/sources/libart_lgpl-2.3.20.tar.bz2;
+      md5 = "d0ce67f2ebcef1e51a83136c69242a73";
+    };
+  };
+  libbonobo = {
+    name = "libbonobo-2.22.0";
+    src = fetchurl {
+      url = http://ftp.gnome.org/pub/GNOME/platform/2.22/2.22.1/sources/libbonobo-2.22.0.tar.bz2;
+      md5 = "998a576ad26784ac87eab99e96013527";
+    };
+  };
+  libbonoboui = {
+    name = "libbonoboui-2.22.0";
+    src = fetchurl {
+      url = http://ftp.gnome.org/pub/GNOME/platform/2.22/2.22.1/sources/libbonoboui-2.22.0.tar.bz2;
+      md5 = "e4e4d74c9387d08c956574f981cf91f2";
+    };
+  };
+  libglade = {
+    name = "libglade-2.6.2";
+    src = fetchurl {
+      url = http://ftp.gnome.org/pub/GNOME/platform/2.22/2.22.1/sources/libglade-2.6.2.tar.bz2;
+      md5 = "da4f9d1c6cd1337f6ef5e2db768d8557";
+    };
+  };
+  libgnome = {
+    name = "libgnome-2.22.0";
+    src = fetchurl {
+      url = http://ftp.gnome.org/pub/GNOME/platform/2.22/2.22.1/sources/libgnome-2.22.0.tar.bz2;
+      md5 = "52db42762589826c66d27def66112807";
+    };
+  };
+  libgnomecanvas = {
+    name = "libgnomecanvas-2.20.1.1";
+    src = fetchurl {
+      url = http://ftp.gnome.org/pub/GNOME/platform/2.22/2.22.1/sources/libgnomecanvas-2.20.1.1.tar.bz2;
+      md5 = "948ed771d2957d24a0c9a414e9581055";
+    };
+  };
+  libgnomeui = {
+    name = "libgnomeui-2.22.1";
+    src = fetchurl {
+      url = http://ftp.gnome.org/pub/GNOME/platform/2.22/2.22.1/sources/libgnomeui-2.22.1.tar.bz2;
+      md5 = "5a60405f006e873ba7bc97ec9c8e4c5d";
+    };
+  };
+  libIDL = {
+    name = "libIDL-0.8.10";
+    src = fetchurl {
+      url = http://ftp.gnome.org/pub/GNOME/platform/2.22/2.22.1/sources/libIDL-0.8.10.tar.bz2;
+      md5 = "9e10a77ff225587e59c0a28c66b4faa7";
+    };
+  };
+  ORBit2 = {
+    name = "ORBit2-2.14.12";
+    src = fetchurl {
+      url = http://ftp.gnome.org/pub/GNOME/platform/2.22/2.22.1/sources/ORBit2-2.14.12.tar.bz2;
+      md5 = "6f4bf7d803d442e9d093a0daa203d506";
+    };
+  };
+  pango = {
+    name = "pango-1.20.1";
+    src = fetchurl {
+      url = http://ftp.gnome.org/pub/GNOME/platform/2.22/2.22.1/sources/pango-1.20.1.tar.bz2;
+      md5 = "376e6d94686b888fb70f24d191b84f82";
+    };
+  };
+}