From d10651a8b72e3b9c1112a9b1add89d72b9902203 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 7 Mar 2011 17:11:50 +0000 Subject: [PATCH] * zOMG, a new Pan release! * Delete gmime 2.2.x because the old version of Pan was the only package that needed it. svn path=/nixpkgs/trunk/; revision=26200 --- .../networking/newsreaders/pan/default.nix | 22 ++++++++----------- pkgs/development/libraries/gmime/2.2.x.nix | 17 -------------- pkgs/top-level/all-packages.nix | 3 --- 3 files changed, 9 insertions(+), 33 deletions(-) delete mode 100644 pkgs/development/libraries/gmime/2.2.x.nix diff --git a/pkgs/applications/networking/newsreaders/pan/default.nix b/pkgs/applications/networking/newsreaders/pan/default.nix index 299accef4e5..6d03d639e26 100644 --- a/pkgs/applications/networking/newsreaders/pan/default.nix +++ b/pkgs/applications/networking/newsreaders/pan/default.nix @@ -1,29 +1,25 @@ { spellChecking ? true , stdenv, fetchurl, pkgconfig, gtk, gtkspell ? null -, perl, pcre, gmime, gettext +, perl, pcre, gmime, gettext, intltool }: assert spellChecking -> gtkspell != null; +let version = "0.134"; in + stdenv.mkDerivation { - name = "pan-0.133"; + name = "pan-${version}"; src = fetchurl { - url = http://pan.rebelbase.com/download/releases/0.133/source/pan-0.133.tar.bz2; - sha1 = "a0bd98ea1ba174800896611e3305a6b6d8dbde2f"; + url = "http://pan.rebelbase.com/download/releases/${version}/source/pan-${version}.tar.bz2"; + sha1 = "7ef9385e59edf7d511ad3de6c39482297c820685"; }; - patches = - [ # Build on GCC 4.4. - (fetchurl { - url = "http://sources.gentoo.org/viewcvs.py/*checkout*/gentoo-x86/net-nntp/pan/files/pan-0.133-gcc44.patch?rev=1.1"; - sha256 = "05xmgvcpl1gjcfab8xsdy400p55j59hp52fwa4qbwlqy3c35qv1v"; - }) - ]; - - buildInputs = [pkgconfig gtk perl pcre gmime gettext] + buildInputs = [ pkgconfig gtk perl gmime gettext intltool ] ++ stdenv.lib.optional spellChecking gtkspell; + enableParallelBuilding = true; + meta = { description = "A GTK+-based Usenet newsreader good at both text and binaries"; homepage = http://pan.rebelbase.com/; diff --git a/pkgs/development/libraries/gmime/2.2.x.nix b/pkgs/development/libraries/gmime/2.2.x.nix deleted file mode 100644 index dc95dd2019d..00000000000 --- a/pkgs/development/libraries/gmime/2.2.x.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ 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/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 35f0cbf2b00..6873555d2d0 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3155,8 +3155,6 @@ let gmime = callPackage ../development/libraries/gmime { }; - gmime_2_2 = callPackage ../development/libraries/gmime/2.2.x.nix { }; - gmm = callPackage ../development/libraries/gmm { }; gmp = @@ -6504,7 +6502,6 @@ let }; pan = callPackage ../applications/networking/newsreaders/pan { - gmime = gmime_2_2; spellChecking = false; };