* Revive gmime-2.2.x, because gmime-2.4.x is not backwards

  compatible.  For instance, Pan requires gmime-2.2.

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

4 files changed, 38 insertions, 7 deletions

diff --git a/pkgs/applications/networking/newsreaders/pan/default.nix b/pkgs/applications/networking/newsreaders/pan/default.nix
index 9df7868be1b..299accef4e5 100644
--- a/pkgs/applications/networking/newsreaders/pan/default.nix
+++ b/pkgs/applications/networking/newsreaders/pan/default.nix
@@ -27,5 +27,6 @@ stdenv.mkDerivation {
   meta = {
     description = "A GTK+-based Usenet newsreader good at both text and binaries";
     homepage = http://pan.rebelbase.com/;
+    maintainers = [ stdenv.lib.maintainers.eelco ];
   };
 }
diff --git a/pkgs/development/libraries/gmime/2.2.x.nix b/pkgs/development/libraries/gmime/2.2.x.nix
new file mode 100644
index 00000000000..dc95dd2019d
--- /dev/null
+++ b/pkgs/development/libraries/gmime/2.2.x.nix
@@ -0,0 +1,17 @@
+{ stdenv, fetchurl, pkgconfig, glib, zlib }:
+
+stdenv.mkDerivation rec {
+  name = "gmime-2.2.26";
+  
+  src = fetchurl {
+    url = "mirror://gnome/sources/gmime/2.2/${name}.tar.gz";
+    sha256 = "16inhq6symym9n71kxcndjwrxs2xrz63idvy64yc486wlg54aqfc";
+  };
+  
+  buildInputs = [ pkgconfig glib zlib ];
+
+  meta = {
+    homepage = http://spruce.sourceforge.net/gmime/;
+    description = "A C/C++ library for manipulating MIME messages";
+  };
+}
diff --git a/pkgs/development/libraries/gmime/default.nix b/pkgs/development/libraries/gmime/default.nix
index 078d7e500b8..bd94a2633d4 100644
--- a/pkgs/development/libraries/gmime/default.nix
+++ b/pkgs/development/libraries/gmime/default.nix
@@ -1,10 +1,17 @@
-{stdenv, fetchurl, pkgconfig, glib, zlib}:
+{ stdenv, fetchurl, pkgconfig, glib, zlib }:
 
-stdenv.mkDerivation {
-  name = "gmime-2.4.15";
+stdenv.mkDerivation rec {
+  name = "gmime-2.4.17";
+  
   src = fetchurl {
-    url = http://ftp.acc.umu.se/pub/GNOME/sources/gmime/2.4/gmime-2.4.15.tar.bz2;
-    sha256 = "a0a6c9413b057ab5d8a2a2902cbaa5b3a17871af3f94dc8431978c9e0e5f53e1";
+    url = "mirror://gnome/sources/gmime/2.4/${name}.tar.gz";
+    sha256 = "1l1pbk0yrr7zwl90aabdhw0f9i4m6ragsfyk5qwg0hzk21abz9wd";
+  };
+  
+  buildInputs = [ pkgconfig glib zlib ];
+
+  meta = {
+    homepage = http://spruce.sourceforge.net/gmime/;
+    description = "A C/C++ library for manipulating MIME messages";
   };
-  buildInputs = [pkgconfig glib zlib];
 }
diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
index d846f976022..8f36f300a4a 100644
--- a/pkgs/top-level/all-packages.nix
+++ b/pkgs/top-level/all-packages.nix
@@ -4094,6 +4094,10 @@ let
     inherit fetchurl stdenv pkgconfig zlib glib;
   };
 
+  gmime_2_2 = import ../development/libraries/gmime/2.2.x.nix {
+    inherit fetchurl stdenv pkgconfig zlib glib;
+  };
+
   gmm = import ../development/libraries/gmm {
     inherit fetchurl stdenv;
   };
@@ -5680,6 +5684,7 @@ let
 
   perlcritic = perlPackages.PerlCritic;
 
+  
   ### DEVELOPMENT / PYTHON MODULES
 
   buildPythonPackage =
@@ -8508,8 +8513,9 @@ let
   };
 
   pan = import ../applications/networking/newsreaders/pan {
-    inherit fetchurl stdenv pkgconfig perl pcre gmime gettext;
+    inherit fetchurl stdenv pkgconfig perl pcre gettext;
     inherit (gtkLibs) gtk;
+    gmime = gmime_2_2;
     spellChecking = false;
   };