Author: eelco
Date: Fri Jul 9 09:12:42 2010
New Revision: 22543
URL: https://svn.nixos.org/websvn/nix/?rev=22543&sc=1
Log:
* Revive gmime-2.2.x, because gmime-2.4.x is not backwards
compatible. For instance, Pan requires gmime-2.2.
Added:
nixpkgs/trunk/pkgs/development/libraries/gmime/2.2.x.nix
- copied, changed from r21645,
nixpkgs/trunk/pkgs/development/libraries/gmime/default.nix
Modified:
nixpkgs/trunk/pkgs/applications/networking/newsreaders/pan/default.nix
nixpkgs/trunk/pkgs/development/libraries/gmime/default.nix
nixpkgs/trunk/pkgs/top-level/all-packages.nix
Modified: nixpkgs/trunk/pkgs/applications/networking/newsreaders/pan/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/applications/networking/newsreaders/pan/default.nix
Fri Jul 9 04:24:31 2010 (r22542)
+++ nixpkgs/trunk/pkgs/applications/networking/newsreaders/pan/default.nix
Fri Jul 9 09:12:42 2010 (r22543)
@@ -27,5 +27,6 @@
meta = {
description = "A GTK+-based Usenet newsreader good at both text and
binaries";
homepage = http://pan.rebelbase.com/;
+ maintainers = [ stdenv.lib.maintainers.eelco ];
};
}
Copied and modified: nixpkgs/trunk/pkgs/development/libraries/gmime/2.2.x.nix
(from r21645, nixpkgs/trunk/pkgs/development/libraries/gmime/default.nix)
==============================================================================
--- nixpkgs/trunk/pkgs/development/libraries/gmime/default.nix Fri May 7
14:01:39 2010 (r21645, copy source)
+++ nixpkgs/trunk/pkgs/development/libraries/gmime/2.2.x.nix Fri Jul 9
09:12:42 2010 (r22543)
@@ -1,10 +1,17 @@
-{stdenv, fetchurl, pkgconfig, glib, zlib}:
+{ stdenv, fetchurl, pkgconfig, glib, zlib }:
-stdenv.mkDerivation {
- name = "gmime-2.2.1";
+stdenv.mkDerivation rec {
+ name = "gmime-2.2.26";
+
src = fetchurl {
- url = http://spruce.sourceforge.net/gmime/sources/v2.2/gmime-2.2.1.tar.gz;
- md5 = "b05e4d6344c8465fb74386e5f1fed45c";
+ 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";
};
- buildInputs = [pkgconfig glib zlib];
}
Modified: nixpkgs/trunk/pkgs/development/libraries/gmime/default.nix
==============================================================================
--- nixpkgs/trunk/pkgs/development/libraries/gmime/default.nix Fri Jul 9
04:24:31 2010 (r22542)
+++ nixpkgs/trunk/pkgs/development/libraries/gmime/default.nix Fri Jul 9
09:12:42 2010 (r22543)
@@ -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];
}
Modified: nixpkgs/trunk/pkgs/top-level/all-packages.nix
==============================================================================
--- nixpkgs/trunk/pkgs/top-level/all-packages.nix Fri Jul 9 04:24:31
2010 (r22542)
+++ nixpkgs/trunk/pkgs/top-level/all-packages.nix Fri Jul 9 09:12:42
2010 (r22543)
@@ -4094,6 +4094,10 @@
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 @@
perlcritic = perlPackages.PerlCritic;
+
### DEVELOPMENT / PYTHON MODULES
buildPythonPackage =
@@ -8508,8 +8513,9 @@
};
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;
};
_______________________________________________
nix-commits mailing list
[email protected]
http://mail.cs.uu.nl/mailman/listinfo/nix-commits
