* Fixed some Gnome packages. Also removed some old Gnome releases.

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

8 files changed, 34 insertions, 1551 deletions

diff --git a/pkgs/desktops/gnome/default.nix b/pkgs/desktops/gnome/default.nix
index de04c24ff02e..393251efc1f2 100644
--- a/pkgs/desktops/gnome/default.nix
+++ b/pkgs/desktops/gnome/default.nix
@@ -239,7 +239,10 @@ rec {
 
   libgweather = stdenv.mkDerivation {
     inherit (desktop.libgweather) name src;
-    buildInputs = [gettext perl perlXMLParser pkgconfig gtk libxml2 gnomevfs intltool];
+    buildInputs = [
+      gettext perl perlXMLParser pkgconfig gtk libxml2 gnomevfs
+      intltool libsoup
+    ];
   };
 
   gnomepanel = stdenv.mkDerivation {
@@ -288,17 +291,22 @@ rec {
     input = desktop.gnomedocutils;
   };
 
-  gconfeditor = import ./gconf-editor.nix {
-    inherit stdenv fetchurl pkgconfig gnome perl perlXMLParser
-      gettext libxslt;
-    input = desktop.gconfeditor;
+  gconfeditor = stdenv.mkDerivation {
+    inherit (desktop.gconfeditor) name src;
+  
+    buildInputs = [
+      pkgconfig perl perlXMLParser GConf gnomedocutils
+      gtk libgnome libgnomeui gettext libxslt intltool
+    ];
+
+    configureFlags = "--disable-scrollkeeper";
   };
 
   vte = stdenv.mkDerivation {
     inherit (desktop.vte) name src;
   
     buildInputs = [
-      pkgconfig perl perlXMLParser gnome.glib gnome.gtk python gettext intltool
+      pkgconfig perl perlXMLParser glib gtk python gettext intltool
     ];
   
     propagatedBuildInputs = [ncurses];
@@ -308,28 +316,34 @@ rec {
     inherit (desktop.gnometerminal) name src;
 
     buildInputs = [
-      pkgconfig perl perlXMLParser gtk GConf libglade
-      libgnomeui startupnotification gnomevfs vte
-      gnomedocutils gettext which scrollkeeper
-      python libxml2Python libxslt
+      pkgconfig perl perlXMLParser gtk GConf libglade libgnomeui
+      startupnotification gnomevfs vte gnomedocutils gettext which
+      scrollkeeper python libxml2Python libxslt intltool
     ];
 
     configureFlags = "--disable-scrollkeeper";
   };
 
-  libgtop = import ./libgtop.nix {
-    inherit stdenv fetchurl pkgconfig gnome perl perlXMLParser
-      popt gettext;
-    input = desktop.libgtop;
-  };
+  libgtop = stdenv.mkDerivation {
+    inherit (desktop.libgtop) name src;
   
-  gnomeutils = import ./gnome-utils.nix {
-    inherit stdenv fetchurl pkgconfig gnome perl perlXMLParser
-      gettext libxslt /*  which python libxml2Python libxslt */;
-    inherit (xlibs) libXmu;
-    input = desktop.gnomeutils;
+    buildInputs = [
+      pkgconfig perl perlXMLParser glib popt gettext intltool
+    ];
   };
+  
+  gnomeutils = stdenv.mkDerivation {
+    inherit (desktop.gnomeutils) name src;
+  
+    buildInputs = [
+      pkgconfig perl perlXMLParser glib gtk libgnome libgnomeui
+      libglade libgnomeprintui gnomedesktop gnomepanel libgtop
+      scrollkeeper gnomedocutils gettext libxslt xlibs.libXmu intltool
+    ]; 
 
+    configureFlags = "--disable-scrollkeeper";
+  };
+  
   gtkdoc = import ./gtkdoc.nix {
     inherit (platform) gtkdoc;
     inherit stdenv pkgconfig gnomedocutils perl python libxml2
diff --git a/pkgs/desktops/gnome/gconf-editor.nix b/pkgs/desktops/gnome/gconf-editor.nix
deleted file mode 100644
index 1da67ae05984..000000000000
--- a/pkgs/desktops/gnome/gconf-editor.nix
+++ /dev/null
@@ -1,14 +0,0 @@
-{ input, stdenv, fetchurl, gnome, pkgconfig, perl, perlXMLParser
-, gettext, libxslt
-}:
-
-stdenv.mkDerivation {
-  inherit (input) name src;
-  
-  buildInputs = [
-    pkgconfig perl perlXMLParser gnome.GConf gnome.gnomedocutils
-    gnome.gtk gnome.libgnome gnome.libgnomeui gettext libxslt
-  ];
-
-  configureFlags = "--disable-scrollkeeper";
-}
diff --git a/pkgs/desktops/gnome/gnome-utils.nix b/pkgs/desktops/gnome/gnome-utils.nix
deleted file mode 100644
index 6714212915a0..000000000000
--- a/pkgs/desktops/gnome/gnome-utils.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-{ input, stdenv, fetchurl, gnome, pkgconfig, perl, perlXMLParser
-, gettext, libxslt, libXmu
-#, which, python, libxml2Python, libxslt
-}:
-
-# !!! should get rid of libxml2Python, see gnomedocutils
-
-stdenv.mkDerivation {
-  inherit (input) name src;
-  
-  buildInputs = [
-    pkgconfig perl perlXMLParser gnome.glib gnome.gtk gnome.libgnome
-    gnome.libgnomeui gnome.libglade gnome.libgnomeprintui
-    gnome.gnomedesktop gnome.gnomepanel gnome.libgtop gnome.scrollkeeper
-    gnome.gnomedocutils gettext libxslt libXmu
-    # 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/libgtop.nix b/pkgs/desktops/gnome/libgtop.nix
deleted file mode 100644
index 2ab1841155e5..000000000000
--- a/pkgs/desktops/gnome/libgtop.nix
+++ /dev/null
@@ -1,11 +0,0 @@
-{ input, stdenv, fetchurl, gnome, pkgconfig, perl, perlXMLParser, popt
-, gettext
-}:
-
-stdenv.mkDerivation {
-  inherit (input) name src;
-  
-  buildInputs = [
-    pkgconfig perl perlXMLParser gnome.glib popt gettext
-  ];
-}
diff --git a/pkgs/desktops/gnome/src-gnome-desktop-2.16.3.nix b/pkgs/desktops/gnome/src-gnome-desktop-2.16.3.nix
deleted file mode 100644
index 18c913465d6c..000000000000
--- a/pkgs/desktops/gnome/src-gnome-desktop-2.16.3.nix
+++ /dev/null
@@ -1,536 +0,0 @@
-# Note: this file was generated automatically by make-listing.sh!
-
-{fetchurl} : {
-  alacarte = {
-    name = "alacarte-0.10.2";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.16/2.16.3/sources/alacarte-0.10.2.tar.bz2;
-      md5 = "abf5d95b968a34d034c47e3bfab95719";
-    };
-  };
-  bugbuddy = {
-    name = "bug-buddy-2.16.1";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.16/2.16.3/sources/bug-buddy-2.16.1.tar.bz2;
-      md5 = "c15641ebfd90a91f185179d67bde88e3";
-    };
-  };
-  controlcenter = {
-    name = "control-center-2.16.2";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.16/2.16.3/sources/control-center-2.16.2.tar.bz2;
-      md5 = "fc6e2f5de89f4482758395d941ec6ae1";
-    };
-  };
-  dasher = {
-    name = "dasher-4.2.2";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.16/2.16.3/sources/dasher-4.2.2.tar.bz2;
-      md5 = "eff0aeda6c02b03263c4712f56bd3b1c";
-    };
-  };
-  deskbarapplet = {
-    name = "deskbar-applet-2.16.2";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.16/2.16.3/sources/deskbar-applet-2.16.2.tar.bz2;
-      md5 = "6a4780813a55e2f464e69cdfac89894d";
-    };
-  };
-  eel = {
-    name = "eel-2.16.3";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.16/2.16.3/sources/eel-2.16.3.tar.bz2;
-      md5 = "8a5fa25a9c1fb7cb58ea9fae9d27f8f7";
-    };
-  };
-  ekiga = {
-    name = "ekiga-2.0.3";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.16/2.16.3/sources/ekiga-2.0.3.tar.bz2;
-      md5 = "37c57468c7c15ff9bcea91e7fc32aea9";
-    };
-  };
-  eog = {
-    name = "eog-2.16.3";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.16/2.16.3/sources/eog-2.16.3.tar.bz2;
-      md5 = "82468185d766b9676d7f06c124939f9d";
-    };
-  };
-  epiphany = {
-    name = "epiphany-2.16.3";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.16/2.16.3/sources/epiphany-2.16.3.tar.bz2;
-      md5 = "3ee93d168eb5720a96f4c7adf2cdf2d4";
-    };
-  };
-  evince = {
-    name = "evince-0.6.1";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.16/2.16.3/sources/evince-0.6.1.tar.bz2;
-      md5 = "55a1d4af3cac209c7cfbe83b7ffcee1d";
-    };
-  };
-  evolution = {
-    name = "evolution-2.8.3";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.16/2.16.3/sources/evolution-2.8.3.tar.bz2;
-      md5 = "099876b347b114ec08ce6998b4a48d8c";
-    };
-  };
-  evolutiondataserver = {
-    name = "evolution-data-server-1.8.3";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.16/2.16.3/sources/evolution-data-server-1.8.3.tar.bz2;
-      md5 = "f6a824f2553fd97555b8785a452fb6ab";
-    };
-  };
-  evolutionexchange = {
-    name = "evolution-exchange-2.8.3";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.16/2.16.3/sources/evolution-exchange-2.8.3.tar.bz2;
-      md5 = "8a6be6640c7824285088f6a2e98f12a4";
-    };
-  };
-  evolutionwebcal = {
-    name = "evolution-webcal-2.8.0";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.16/2.16.3/sources/evolution-webcal-2.8.0.tar.bz2;
-      md5 = "6dd4821ce90e238acbd8a959fee1ee14";
-    };
-  };
-  fastuserswitchapplet = {
-    name = "fast-user-switch-applet-2.16.0";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.16/2.16.3/sources/fast-user-switch-applet-2.16.0.tar.bz2;
-      md5 = "749de0f0279991515ca8d82526f5b329";
-    };
-  };
-  fileroller = {
-    name = "file-roller-2.16.3";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.16/2.16.3/sources/file-roller-2.16.3.tar.bz2;
-      md5 = "3ee134c04b73a584c9ec494d5e542c6d";
-    };
-  };
-  gcalctool = {
-    name = "gcalctool-5.8.25";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.16/2.16.3/sources/gcalctool-5.8.25.tar.bz2;
-      md5 = "28074081a9625b8b3d1f7499bc27bbfb";
-    };
-  };
-  gconfeditor = {
-    name = "gconf-editor-2.16.0";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.16/2.16.3/sources/gconf-editor-2.16.0.tar.bz2;
-      md5 = "e52b3177ef6ebd1fcf2c84acbe90a663";
-    };
-  };
-  gdm = {
-    name = "gdm-2.16.5";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.16/2.16.3/sources/gdm-2.16.5.tar.bz2;
-      md5 = "8f223458b0e957650f6d865a06a271e4";
-    };
-  };
-  gedit = {
-    name = "gedit-2.16.2";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.16/2.16.3/sources/gedit-2.16.2.tar.bz2;
-      md5 = "9ed4fb2891d07c022b487723d1c72161";
-    };
-  };
-  gnomeapplets = {
-    name = "gnome-applets-2.16.2";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.16/2.16.3/sources/gnome-applets-2.16.2.tar.bz2;
-      md5 = "1a46b8557ff05ca75e7db6adb4dd6707";
-    };
-  };
-  gnomebackgrounds = {
-    name = "gnome-backgrounds-2.16.2";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.16/2.16.3/sources/gnome-backgrounds-2.16.2.tar.bz2;
-      md5 = "765c19d28d39483769687691941129c9";
-    };
-  };
-  gnomedesktop = {
-    name = "gnome-desktop-2.16.3";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.16/2.16.3/sources/gnome-desktop-2.16.3.tar.bz2;
-      md5 = "42c21d18589f4955bb0d70c82236d999";
-    };
-  };
-  gnomedocutils = {
-    name = "gnome-doc-utils-0.8.0";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.16/2.16.3/sources/gnome-doc-utils-0.8.0.tar.bz2;
-      md5 = "50726331fef362dc94921f366fcc8ed2";
-    };
-  };
-  gnomegames = {
-    name = "gnome-games-2.16.3";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.16/2.16.3/sources/gnome-games-2.16.3.tar.bz2;
-      md5 = "88baa9ab64b84bfcac2a1ba05f84d2f9";
-    };
-  };
-  gnomeicontheme = {
-    name = "gnome-icon-theme-2.16.1";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.16/2.16.3/sources/gnome-icon-theme-2.16.1.tar.bz2;
-      md5 = "4a5da64a6084fdddf056e553a929c169";
-    };
-  };
-  gnomekeyring = {
-    name = "gnome-keyring-0.6.0";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.16/2.16.3/sources/gnome-keyring-0.6.0.tar.bz2;
-      md5 = "1e3a3a12b19fc5ebe95363658c2256d8";
-    };
-  };
-  gnomekeyringmanager = {
-    name = "gnome-keyring-manager-2.16.0";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.16/2.16.3/sources/gnome-keyring-manager-2.16.0.tar.bz2;
-      md5 = "d63bfa5e9cfe334694438a74c157344c";
-    };
-  };
-  gnomemag = {
-    name = "gnome-mag-0.13.2";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.16/2.16.3/sources/gnome-mag-0.13.2.tar.bz2;
-      md5 = "093c153c0d8bad40d40d4f7c21be8975";
-    };
-  };
-  gnomemedia = {
-    name = "gnome-media-2.16.1";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.16/2.16.3/sources/gnome-media-2.16.1.tar.bz2;
-      md5 = "4fa1e8e8bd31e2db1cb49679170a98a8";
-    };
-  };
-  gnomemenus = {
-    name = "gnome-menus-2.16.1";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.16/2.16.3/sources/gnome-menus-2.16.1.tar.bz2;
-      md5 = "a5c467abe68003d23ec09a795ebfd29f";
-    };
-  };
-  gnomenetstatus = {
-    name = "gnome-netstatus-2.12.0";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.16/2.16.3/sources/gnome-netstatus-2.12.0.tar.bz2;
-      md5 = "a5f23731a3bf232969e82afef8792a36";
-    };
-  };
-  gnomenettool = {
-    name = "gnome-nettool-2.16.0";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.16/2.16.3/sources/gnome-nettool-2.16.0.tar.bz2;
-      md5 = "58d9171efdf368910934fb71194763eb";
-    };
-  };
-  gnomepanel = {
-    name = "gnome-panel-2.16.2";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.16/2.16.3/sources/gnome-panel-2.16.2.tar.bz2;
-      md5 = "82b98a9b2685cca2d381e185cae47596";
-    };
-  };
-  gnomepowermanager = {
-    name = "gnome-power-manager-2.16.3";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.16/2.16.3/sources/gnome-power-manager-2.16.3.tar.bz2;
-      md5 = "48166c6aaf41f2225090517ae655d05d";
-    };
-  };
-  gnomepythondesktop = {
-    name = "gnome-python-desktop-2.16.0";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.16/2.16.3/sources/gnome-python-desktop-2.16.0.tar.bz2;
-      md5 = "ea79fe3e6a65d8380539a9ef6eed963f";
-    };
-  };
-  gnomescreensaver = {
-    name = "gnome-screensaver-2.16.3";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.16/2.16.3/sources/gnome-screensaver-2.16.3.tar.bz2;
-      md5 = "cbd3e3b96b24038c7838b89acae318dd";
-    };
-  };
-  gnomesession = {
-    name = "gnome-session-2.16.3";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.16/2.16.3/sources/gnome-session-2.16.3.tar.bz2;
-      md5 = "d35a7f541adecc112b7c73f95353a183";
-    };
-  };
-  gnomesharp = {
-    name = "gnome-sharp-2.16.0";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.16/2.16.3/sources/gnome-sharp-2.16.0.tar.bz2;
-      md5 = "09034669acec52f9d9818d9a31c032d5";
-    };
-  };
-  gnomespeech = {
-    name = "gnome-speech-0.4.8";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.16/2.16.3/sources/gnome-speech-0.4.8.tar.bz2;
-      md5 = "f1abbdc7b23fd62f98153aff13161a0d";
-    };
-  };
-  gnomesystemmonitor = {
-    name = "gnome-system-monitor-2.16.1";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.16/2.16.3/sources/gnome-system-monitor-2.16.1.tar.bz2;
-      md5 = "37b44e0e84865fc0aba8bfd4bbdf2338";
-    };
-  };
-  gnomesystemtools = {
-    name = "gnome-system-tools-2.14.0";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.16/2.16.3/sources/gnome-system-tools-2.14.0.tar.bz2;
-      md5 = "3aded3a37f4f5b4962bf253d25cebea1";
-    };
-  };
-  gnometerminal = {
-    name = "gnome-terminal-2.16.1";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.16/2.16.3/sources/gnome-terminal-2.16.1.tar.bz2;
-      md5 = "861e1b780819214b4d5a398e7999c093";
-    };
-  };
-  gnomethemes = {
-    name = "gnome-themes-2.16.3";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.16/2.16.3/sources/gnome-themes-2.16.3.tar.bz2;
-      md5 = "ecb4d4b9b90507ba4f3d6e9e63d872d5";
-    };
-  };
-  gnomeuserdocs = {
-    name = "gnome-user-docs-2.16.1";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.16/2.16.3/sources/gnome-user-docs-2.16.1.tar.bz2;
-      md5 = "4b0abfe5e24438414c22083851bae19e";
-    };
-  };
-  gnomeutils = {
-    name = "gnome-utils-2.16.2";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.16/2.16.3/sources/gnome-utils-2.16.2.tar.bz2;
-      md5 = "4e70e667a78fc5bee4a4b8f2f3ae8440";
-    };
-  };
-  gnomevolumemanager = {
-    name = "gnome-volume-manager-2.15.0";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.16/2.16.3/sources/gnome-volume-manager-2.15.0.tar.bz2;
-      md5 = "d723bc2069fd19cf1c31961fbc1cf3c8";
-    };
-  };
-  gok = {
-    name = "gok-1.2.1";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.16/2.16.3/sources/gok-1.2.1.tar.bz2;
-      md5 = "cba5eef61ed1a8f6a83fa18015781721";
-    };
-  };
-  gstpluginsbase = {
-    name = "gst-plugins-base-0.10.7";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.16/2.16.3/sources/gst-plugins-base-0.10.7.tar.bz2;
-      md5 = "d66b09de993aefd22d8fc341e5f50521";
-    };
-  };
-  gstpluginsgood = {
-    name = "gst-plugins-good-0.10.3";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.16/2.16.3/sources/gst-plugins-good-0.10.3.tar.bz2;
-      md5 = "2b59bce477349628ee549c2ce1d80a3a";
-    };
-  };
-  gstreamer = {
-    name = "gstreamer-0.10.8";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.16/2.16.3/sources/gstreamer-0.10.8.tar.bz2;
-      md5 = "a094ea86d4cea4f23ef2eb8c6e7bfc10";
-    };
-  };
-  gtkengines = {
-    name = "gtk-engines-2.8.2";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.16/2.16.3/sources/gtk-engines-2.8.2.tar.bz2;
-      md5 = "0c5b0254b57910b1ebcda47ac6a3b1ba";
-    };
-  };
-  gtkhtml = {
-    name = "gtkhtml-3.12.2";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.16/2.16.3/sources/gtkhtml-3.12.2.tar.bz2;
-      md5 = "8c943647fd26cf4594b2e97055e22584";
-    };
-  };
-  gtksourceview = {
-    name = "gtksourceview-1.8.3";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.16/2.16.3/sources/gtksourceview-1.8.3.tar.bz2;
-      md5 = "1da36ae813b6234dc9d327c3500afef9";
-    };
-  };
-  gucharmap = {
-    name = "gucharmap-1.8.0";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.16/2.16.3/sources/gucharmap-1.8.0.tar.bz2;
-      md5 = "a75cc3dcc9fb3d2edecc4da936e80e3a";
-    };
-  };
-  libgailgnome = {
-    name = "libgail-gnome-1.1.3";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.16/2.16.3/sources/libgail-gnome-1.1.3.tar.bz2;
-      md5 = "1d12c5375b3404f4f20b214b763e5225";
-    };
-  };
-  libgnomeprint = {
-    name = "libgnomeprint-2.12.1";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.16/2.16.3/sources/libgnomeprint-2.12.1.tar.bz2;
-      md5 = "ea729d4968fe2169c84efb12ace5f6cc";
-    };
-  };
-  libgnomeprintui = {
-    name = "libgnomeprintui-2.12.1";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.16/2.16.3/sources/libgnomeprintui-2.12.1.tar.bz2;
-      md5 = "fa0b0410c3ba8b6899c5ed278f02cbe5";
-    };
-  };
-  libgtop = {
-    name = "libgtop-2.14.6";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.16/2.16.3/sources/libgtop-2.14.6.tar.bz2;
-      md5 = "4aa425a6b66b976be6f364904eeda78a";
-    };
-  };
-  librsvg = {
-    name = "librsvg-2.16.1";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.16/2.16.3/sources/librsvg-2.16.1.tar.bz2;
-      md5 = "37e046571097ff7ce77ae6e07f096324";
-    };
-  };
-  libsoup = {
-    name = "libsoup-2.2.99";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.16/2.16.3/sources/libsoup-2.2.99.tar.bz2;
-      md5 = "b2f5df25de4a5c00653d1667eb1b5687";
-    };
-  };
-  libwnck = {
-    name = "libwnck-2.16.3";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.16/2.16.3/sources/libwnck-2.16.3.tar.bz2;
-      md5 = "0a36d269b19f78df7bd861033792f550";
-    };
-  };
-  metacity = {
-    name = "metacity-2.16.5";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.16/2.16.3/sources/metacity-2.16.5.tar.bz2;
-      md5 = "7ac14eb4caffbb15df91b70b0def2f5e";
-    };
-  };
-  nautilus = {
-    name = "nautilus-2.16.3";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.16/2.16.3/sources/nautilus-2.16.3.tar.bz2;
-      md5 = "05a0fe98d524ca5287da21845ab8490c";
-    };
-  };
-  nautiluscdburner = {
-    name = "nautilus-cd-burner-2.16.3";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.16/2.16.3/sources/nautilus-cd-burner-2.16.3.tar.bz2;
-      md5 = "6e3653c849e24aacd7e29b4030327b4e";
-    };
-  };
-  orca = {
-    name = "orca-1.0.1";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.16/2.16.3/sources/orca-1.0.1.tar.bz2;
-      md5 = "860172c6dadf6a655d8e0b2b3df90628";
-    };
-  };
-  scrollkeeper = {
-    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";
-    };
-  };
-  soundjuicer = {
-    name = "sound-juicer-2.16.3";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.16/2.16.3/sources/sound-juicer-2.16.3.tar.bz2;
-      md5 = "cfe4199f4f50c2a8f8178db4097209e4";
-    };
-  };
-  startupnotification = {
-    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";
-    };
-  };
-  systemtoolsbackends = {
-    name = "system-tools-backends-1.4.2";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.16/2.16.3/sources/system-tools-backends-1.4.2.tar.bz2;
-      md5 = "a0af1513becdf3b9bfed3535ad8f7dab";
-    };
-  };
-  tomboy = {
-    name = "tomboy-0.4.1";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.16/2.16.3/sources/tomboy-0.4.1.tar.bz2;
-      md5 = "40e0f51d832d04f762851fc9a88c01ea";
-    };
-  };
-  totem = {
-    name = "totem-2.16.5";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.16/2.16.3/sources/totem-2.16.5.tar.bz2;
-      md5 = "fa8eb90b52d70d876e1d42ec43cf8448";
-    };
-  };
-  vino = {
-    name = "vino-2.13.5";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.16/2.16.3/sources/vino-2.13.5.tar.bz2;
-      md5 = "9bc8c3f0e639fdc7b9ed023501308359";
-    };
-  };
-  vte = {
-    name = "vte-0.14.2";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.16/2.16.3/sources/vte-0.14.2.tar.bz2;
-      md5 = "eceafec1b564cc059fa3407f83631817";
-    };
-  };
-  yelp = {
-    name = "yelp-2.16.2";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.16/2.16.3/sources/yelp-2.16.2.tar.bz2;
-      md5 = "ac55332d62c1871b3de92b5c1f0befaa";
-    };
-  };
-  zenity = {
-    name = "zenity-2.16.3";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/desktop/2.16/2.16.3/sources/zenity-2.16.3.tar.bz2;
-      md5 = "773579408f3237b38fa4d18a182c0ca6";
-    };
-  };
-}
diff --git a/pkgs/desktops/gnome/src-gnome-desktop-2.22.1.nix b/pkgs/desktops/gnome/src-gnome-desktop-2.22.1.nix
deleted file mode 100644
index 866882569c34..000000000000
--- a/pkgs/desktops/gnome/src-gnome-desktop-2.22.1.nix
+++ /dev/null
@@ -1,603 +0,0 @@
-# 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.25/2.25.1/sources/gnome-icon-theme-2.24.0.tar.bz2;
-      sha256 = "1ciid3p21n5m2ixdc7b6sqjvw68pzg1adxljrcy7snnnxbwqj7xp";
-    };
-    #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.16.3.nix b/pkgs/desktops/gnome/src-gnome-platform-2.16.3.nix
deleted file mode 100644
index 28c458ea7dfa..000000000000
--- a/pkgs/desktops/gnome/src-gnome-platform-2.16.3.nix
+++ /dev/null
@@ -1,179 +0,0 @@
-# Note: this file was generated automatically by make-listing.sh!
-
-{fetchurl} : {
-  atk = {
-    name = "atk-1.12.4";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/platform/2.16/2.16.3/sources/atk-1.12.4.tar.bz2;
-      md5 = "0a2c6a7bbc380e3a3d94e9061f76a849";
-    };
-  };
-  atspi = {
-    name = "at-spi-1.7.12";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/platform/2.16/2.16.3/sources/at-spi-1.7.12.tar.bz2;
-      md5 = "ca4e69bb28c409e25bbc10293fa34941";
-    };
-  };
-  audiofile = {
-    name = "audiofile-0.2.6";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/platform/2.16/2.16.3/sources/audiofile-0.2.6.tar.bz2;
-      md5 = "3d01302834660850b6141cac1e6f5501";
-    };
-  };
-  esound = {
-    name = "esound-0.2.36";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/platform/2.16/2.16.3/sources/esound-0.2.36.tar.bz2;
-      md5 = "3facb5aa0115cc1c31771b9ad454ae76";
-    };
-  };
-  gail = {
-    name = "gail-1.9.3";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/platform/2.16/2.16.3/sources/gail-1.9.3.tar.bz2;
-      md5 = "1e8825da60fd19833dfc6b2068f05ec9";
-    };
-  };
-  GConf = {
-    name = "GConf-2.14.0";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/platform/2.16/2.16.3/sources/GConf-2.14.0.tar.bz2;
-      md5 = "d07c2efcaf477cf34225c604a04b6271";
-    };
-  };
-  glib = {
-    name = "glib-2.12.9";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/platform/2.16/2.16.3/sources/glib-2.12.9.tar.bz2;
-      md5 = "b3f6a2a318610af6398b3445f1a2d6c6";
-    };
-  };
-  gnomemimedata = {
-    name = "gnome-mime-data-2.4.3";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/platform/2.16/2.16.3/sources/gnome-mime-data-2.4.3.tar.bz2;
-      md5 = "2abe573a6e84b71c58a661d4bafa9bd6";
-    };
-  };
-  gnomevfs = {
-    name = "gnome-vfs-2.16.3";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/platform/2.16/2.16.3/sources/gnome-vfs-2.16.3.tar.bz2;
-      md5 = "586d6fe3740385c000a864d5e2cf8215";
-    };
-  };
-  gnomevfsmonikers = {
-    name = "gnome-vfs-monikers-2.15.3";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/platform/2.16/2.16.3/sources/gnome-vfs-monikers-2.15.3.tar.bz2;
-      md5 = "b16f0db0482263be3318e269f52bb5b6";
-    };
-  };
-  gtk = {
-    name = "gtk+-2.10.9";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/platform/2.16/2.16.3/sources/gtk+-2.10.9.tar.bz2;
-      md5 = "20d763198efb38263b22dee347f69da6";
-    };
-  };
-  gtkdoc = {
-    name = "gtk-doc-1.7";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/platform/2.16/2.16.3/sources/gtk-doc-1.7.tar.bz2;
-      md5 = "2543a3f5a7b5347fb135855ca55adea1";
-    };
-  };
-  intltool = {
-    name = "intltool-0.35.0";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/platform/2.16/2.16.3/sources/intltool-0.35.0.tar.bz2;
-      md5 = "95c4bd2a91419083ee880a3f53f86edf";
-    };
-  };
-  libart_lgpl = {
-    name = "libart_lgpl-2.3.17";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/platform/2.16/2.16.3/sources/libart_lgpl-2.3.17.tar.bz2;
-      md5 = "dfca42529393c8a8f59dc4dc10675a46";
-    };
-  };
-  libbonobo = {
-    name = "libbonobo-2.16.0";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/platform/2.16/2.16.3/sources/libbonobo-2.16.0.tar.bz2;
-      md5 = "30cdcf2b5316888f10fea6362b38499c";
-    };
-  };
-  libbonoboui = {
-    name = "libbonoboui-2.16.0";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/platform/2.16/2.16.3/sources/libbonoboui-2.16.0.tar.bz2;
-      md5 = "603ffc92491ef27ccfbc2b69abd3906b";
-    };
-  };
-  libglade = {
-    name = "libglade-2.6.2";
-    src = fetchurl {
-      url = http://ftp.acc.umu.se/pub/GNOME/sources/libglade/2.6/libglade-2.6.2.tar.bz2;
-      md5 = "da4f9d1c6cd1337f6ef5e2db768d8557";
-    };
-  };
-  libgnome = {
-    name = "libgnome-2.16.0";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/platform/2.16/2.16.3/sources/libgnome-2.16.0.tar.bz2;
-      md5 = "b3f030f6c677b0e1bcfca7c7e58d6c4a";
-    };
-  };
-  libgnomecanvas = {
-    name = "libgnomecanvas-2.14.0";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/platform/2.16/2.16.3/sources/libgnomecanvas-2.14.0.tar.bz2;
-      md5 = "516c46fb4a1401b05cfef58c350fbd3d";
-    };
-  };
-  libgnomeui = {
-    name = "libgnomeui-2.16.1";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/platform/2.16/2.16.3/sources/libgnomeui-2.16.1.tar.bz2;
-      md5 = "d9b975952bf5feee8818d3fb18cca0b3";
-    };
-  };
-  libIDL = {
-    name = "libIDL-0.8.7";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/platform/2.16/2.16.3/sources/libIDL-0.8.7.tar.bz2;
-      md5 = "53a3874beb42ddfd9a5030047a0db740";
-    };
-  };
-  libxml2 = {
-    name = "libxml2-2.6.27";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/platform/2.16/2.16.3/sources/libxml2-2.6.27.tar.bz2;
-      md5 = "3617f7dc07534025a4898f2b62fb46df";
-    };
-  };
-  libxslt = {
-    name = "libxslt-1.1.20";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/platform/2.16/2.16.3/sources/libxslt-1.1.20.tar.bz2;
-      md5 = "aa0b4817c38104d9a724ee12b81e286e";
-    };
-  };
-  ORBit2 = {
-    name = "ORBit2-2.14.5";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/platform/2.16/2.16.3/sources/ORBit2-2.14.5.tar.bz2;
-      md5 = "5b3ca3d7ed13a76c9e7bb4a890fe68af";
-    };
-  };
-  pango = {
-    name = "pango-1.14.10";
-    src = fetchurl {
-      url = http://ftp.gnome.org/pub/GNOME/platform/2.16/2.16.3/sources/pango-1.14.10.tar.bz2;
-      md5 = "e9fc2f8168e74e2fa0aa8238ee0e9c06";
-    };
-  };
-}
diff --git a/pkgs/desktops/gnome/src-gnome-platform-2.22.1.nix b/pkgs/desktops/gnome/src-gnome-platform-2.22.1.nix
deleted file mode 100644
index 0f83354b1e29..000000000000
--- a/pkgs/desktops/gnome/src-gnome-platform-2.22.1.nix
+++ /dev/null
@@ -1,165 +0,0 @@
-# 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";
-    };
-  };
-}