diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2006-05-07 21:58:31 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2006-05-07 21:58:31 +0000 |
| commit | 405d3143959a78dd4ae188630a4385bdb8262877 (patch) | |
| tree | ea283ea008e7e406c33a92473b16fa3bf5f2b6ee /pkgs | |
| parent | c63f4278c777204b5ce65077e133809c9e302916 (diff) | |
| download | nixpkgs-405d3143959a78dd4ae188630a4385bdb8262877.tar nixpkgs-405d3143959a78dd4ae188630a4385bdb8262877.tar.gz nixpkgs-405d3143959a78dd4ae188630a4385bdb8262877.tar.bz2 nixpkgs-405d3143959a78dd4ae188630a4385bdb8262877.tar.lz nixpkgs-405d3143959a78dd4ae188630a4385bdb8262877.tar.xz nixpkgs-405d3143959a78dd4ae188630a4385bdb8262877.tar.zst nixpkgs-405d3143959a78dd4ae188630a4385bdb8262877.zip | |
* Pan 0.96.
svn path=/nixpkgs/trunk/; revision=5280
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/applications/networking/newsreaders/pan/default.nix | 12 | ||||
| -rw-r--r-- | pkgs/development/libraries/clearsilver/default.nix | 14 | ||||
| -rw-r--r-- | pkgs/development/libraries/gmime/default.nix | 10 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 8 |
4 files changed, 30 insertions, 14 deletions
diff --git a/pkgs/applications/networking/newsreaders/pan/default.nix b/pkgs/applications/networking/newsreaders/pan/default.nix index eed44a9573c..5bf61f763fd 100644 --- a/pkgs/applications/networking/newsreaders/pan/default.nix +++ b/pkgs/applications/networking/newsreaders/pan/default.nix @@ -1,23 +1,23 @@ { spellChecking ? true , stdenv, fetchurl, pkgconfig, gtk, gtkspell ? null, gnet -, libxml2, perl, pcre +, perl, pcre, gmime, gettext }: assert pkgconfig != null && gtk != null && gnet != null - && libxml2 != null && perl != null && pcre != null; + && perl != null && pcre != null; assert spellChecking -> gtkspell != null /* !!! && gtk == gtkspell.gtk */; # !!! assert gtk.glib == gnet.glib; stdenv.mkDerivation { - name = "pan-0.14.2.91"; + name = "pan-0.96"; src = fetchurl { - url = http://nix.cs.uu.nl/dist/tarballs/pan-0.14.2.91.tar.bz2; - md5 = "4770d899a1c1ba968ce96bc5aeb07b62"; + url = http://pan.rebelbase.com/download/releases/0.96/SOURCE/pan-0.96.tar.bz2; + md5 = "b4e355553cd502add3e599d1e867da9e"; }; buildInputs = [ - pkgconfig gtk gnet libxml2 perl pcre + pkgconfig gtk gnet perl pcre gmime gettext (if spellChecking then gtkspell else null) ]; diff --git a/pkgs/development/libraries/clearsilver/default.nix b/pkgs/development/libraries/clearsilver/default.nix index a2377466222..c640cb3f297 100644 --- a/pkgs/development/libraries/clearsilver/default.nix +++ b/pkgs/development/libraries/clearsilver/default.nix @@ -1,12 +1,12 @@ {stdenv, fetchurl, python}: stdenv.mkDerivation { - name="clearsilver-0.10.3"; - src = fetchurl { - url = "http://www.clearsilver.net/downloads/clearsilver-0.10.3.tar.gz"; - md5 = "ff4104b0e58bca1b61d528edbd902769"; - }; - builder = ./builder.sh; + name="clearsilver-0.10.3"; + src = fetchurl { + url = "http://www.clearsilver.net/downloads/clearsilver-0.10.3.tar.gz"; + md5 = "ff4104b0e58bca1b61d528edbd902769"; + }; + builder = ./builder.sh; - inherit stdenv python; + inherit stdenv python; } diff --git a/pkgs/development/libraries/gmime/default.nix b/pkgs/development/libraries/gmime/default.nix new file mode 100644 index 00000000000..22facd2ccfc --- /dev/null +++ b/pkgs/development/libraries/gmime/default.nix @@ -0,0 +1,10 @@ +{stdenv, fetchurl, pkgconfig, glib, zlib}: + +stdenv.mkDerivation { + name = "gmime-2.2.1"; + src = fetchurl { + url = http://spruce.sourceforge.net/gmime/sources/v2.2/gmime-2.2.1.tar.gz; + md5 = "b05e4d6344c8465fb74386e5f1fed45c"; + }; + buildInputs = [pkgconfig glib zlib]; +} diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 3610e37fdbe..13c051d3a89 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -1647,6 +1647,11 @@ rec { inherit fetchurl stdenv; }; + gmime = import ../development/libraries/gmime { + inherit fetchurl stdenv pkgconfig zlib; + inherit (gtkLibs) glib; + }; + ### SERVERS @@ -1957,7 +1962,8 @@ rec { }; pan = (import ../applications/networking/newsreaders/pan) { - inherit fetchurl stdenv pkgconfig gnet libxml2 perl pcre; + inherit fetchurl stdenv pkgconfig gnet perl + pcre gmime gettext; inherit (gtkLibs) gtk; spellChecking = false; }; |