diff --git a/pkgs/applications/graphics/gimp/2.8.0.nix b/pkgs/applications/graphics/gimp/2.8.nix
similarity index 100%
rename from pkgs/applications/graphics/gimp/2.8.0.nix
rename to pkgs/applications/graphics/gimp/2.8.nix
diff --git a/pkgs/development/libraries/babl/0.1.10.nix b/pkgs/development/libraries/babl/0.1.10.nix
deleted file mode 100644
index 41280e87253d4..0000000000000
--- a/pkgs/development/libraries/babl/0.1.10.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-{ stdenv, fetchurl }:
-
-stdenv.mkDerivation rec {
-  name = "babl-0.1.10";
-
-  src = fetchurl {
-    url = "ftp://ftp.gtk.org/pub/babl/0.1/${name}.tar.bz2";
-    sha256 = "943fc36ceac7dd25bc928256bc7b535a42989c6b971578146869eee5fe5955f4";
-  };
-
-  meta = { 
-    description = "Image pixel format conversion library";
-    homepage = http://gegl.org/babl/;
-    license = "GPL3";
-  };
-}
diff --git a/pkgs/development/libraries/babl/default.nix b/pkgs/development/libraries/babl/default.nix
index 3449314a3816b..41280e87253d4 100644
--- a/pkgs/development/libraries/babl/default.nix
+++ b/pkgs/development/libraries/babl/default.nix
@@ -1,11 +1,11 @@
 { stdenv, fetchurl }:
 
 stdenv.mkDerivation rec {
-  name = "babl-0.1.4";
+  name = "babl-0.1.10";
 
   src = fetchurl {
-    url = "http://ftp.snt.utwente.nl/pub/software/gimp/babl/0.1/${name}.tar.bz2";
-    sha256 = "0cz7zw206bb87c0n0h54h4wlkaa3hx3wsia30mgq316y50jk2djv";
+    url = "ftp://ftp.gtk.org/pub/babl/0.1/${name}.tar.bz2";
+    sha256 = "943fc36ceac7dd25bc928256bc7b535a42989c6b971578146869eee5fe5955f4";
   };
 
   meta = { 
diff --git a/pkgs/development/libraries/gegl/0.2.0.nix b/pkgs/development/libraries/gegl/0.2.0.nix
deleted file mode 100644
index 5da6e3e40f4cf..0000000000000
--- a/pkgs/development/libraries/gegl/0.2.0.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-{ stdenv, fetchurl, pkgconfig, glib, babl, libpng, cairo, libjpeg
-, librsvg, pango, gtk, bzip2, intltool }:
-        
-stdenv.mkDerivation rec {
-  name = "gegl-0.2.0";
-
-  src = fetchurl {
-    url = "ftp://ftp.gtk.org/pub/gegl/0.2/${name}.tar.bz2";
-    sha256 = "df2e6a0d9499afcbc4f9029c18d9d1e0dd5e8710a75e17c9b1d9a6480dd8d426";
-  };
-
-  # needs fonts otherwise  don't know how to pass them
-  configureFlags = "--disable-docs";
-
-  buildInputs = [ babl libpng cairo libjpeg librsvg pango gtk bzip2 intltool ];
-
-  buildNativeInputs = [ pkgconfig ];
-
-  meta = { 
-    description = "Graph-based image processing framework";
-    homepage = http://www.gegl.org;
-    license = "GPL3";
-  };
-}
diff --git a/pkgs/development/libraries/gegl/default.nix b/pkgs/development/libraries/gegl/default.nix
index 3e7f29ecb6f39..5da6e3e40f4cf 100644
--- a/pkgs/development/libraries/gegl/default.nix
+++ b/pkgs/development/libraries/gegl/default.nix
@@ -1,18 +1,18 @@
 { stdenv, fetchurl, pkgconfig, glib, babl, libpng, cairo, libjpeg
-, librsvg, pango, gtk, bzip2 }:
+, librsvg, pango, gtk, bzip2, intltool }:
         
 stdenv.mkDerivation rec {
-  name = "gegl-0.1.6";
+  name = "gegl-0.2.0";
 
   src = fetchurl {
-    url = "http://ftp.snt.utwente.nl/pub/software/gimp/gegl/0.1/${name}.tar.bz2";
-    sha256 = "1l966ygss2zkksyw62nm139v2abfzbqqrj0psizvbgzf4mb24rm1";
+    url = "ftp://ftp.gtk.org/pub/gegl/0.2/${name}.tar.bz2";
+    sha256 = "df2e6a0d9499afcbc4f9029c18d9d1e0dd5e8710a75e17c9b1d9a6480dd8d426";
   };
 
   # needs fonts otherwise  don't know how to pass them
   configureFlags = "--disable-docs";
 
-  buildInputs = [ babl libpng cairo libjpeg librsvg pango gtk bzip2 ];
+  buildInputs = [ babl libpng cairo libjpeg librsvg pango gtk bzip2 intltool ];
 
   buildNativeInputs = [ pkgconfig ];
 
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index efa94f1d178ed..80b5e0f6cad57 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -3182,8 +3182,6 @@ let
 
   babl = callPackage ../development/libraries/babl { };
 
-  babl_0_1_10 = callPackage ../development/libraries/babl/0.1.10.nix {};
-
   beecrypt = callPackage ../development/libraries/beecrypt { };
 
   boehmgc = callPackage ../development/libraries/boehm-gc { };
@@ -3440,10 +3438,6 @@ let
     #  avocodec avformat librsvg
   };
 
-  gegl_0_2_0 = callPackage ../development/libraries/gegl/0.2.0.nix {
-    babl = babl_0_1_10;
-  };
-
   geoclue = callPackage ../development/libraries/geoclue {};
 
   geoip = builderDefsPackage ../development/libraries/geoip {
@@ -6767,10 +6761,8 @@ let
     inherit (gnome) libart_lgpl;
   };
 
-  gimp_2_8_0 = callPackage ../applications/graphics/gimp/2.8.0.nix {
+  gimp_2_8 = callPackage ../applications/graphics/gimp/2.8.nix {
     inherit (gnome) libart_lgpl;
-    babl = babl_0_1_10;
-    gegl = gegl_0_2_0;
   };
 
   gimpPlugins = recurseIntoAttrs (import ../applications/graphics/gimp/plugins {
diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix
index cfd15c7105f46..ad9d52a81050c 100644
--- a/pkgs/top-level/python-packages.nix
+++ b/pkgs/top-level/python-packages.nix
@@ -33,12 +33,12 @@ let pythonPackages = python.modules // rec {
 
 
   afew = buildPythonPackage rec {
-    rev = "a3ea63d7048faedb6cc58b4abcb6d4ecfddfb5db";
+    rev = "8abd64bfdcd83a486b2a3977c08fe071523b2551";
     name = "afew-1.0pre${rev}";
     src = fetchurl {
       url = "https://github.com/teythoon/afew/tarball/${rev}";
       name = "${name}.tar.bz";
-      sha256 = "4e8850242a3845602331cabb47299b5a3af21993036a715c83e8dd698ab5d716";
+      sha256 = "9b140d0eb0e5013419983604bb09a51f087a4abdf0a390c24a9596f867dc8c05";
     };
 
     propagatedBuildInputs = [ notmuch pkgs.dbacl ];
@@ -60,12 +60,13 @@ let pythonPackages = python.modules // rec {
 
 
   alot = buildPythonPackage rec {
-    name = "alot-0.3";
+    version = "0.3.1";
+    name = "alot-${version}";
 
     src = fetchurl {
-      url = "https://github.com/pazz/alot/tarball/0.3";
+      url = "https://github.com/pazz/alot/tarball/${version}";
       name = "${name}.tar.bz";
-      md5 = "fa4944a1a7e9e380da0ee75ea3571a79";
+      md5 = "6c5986d9192863879e95a3f8f30ccb75";
     };
 
     doCheck = false;