From 4e38179977af0c620e62a12b2327e2c1505f6870 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Mon, 1 Dec 2003 16:34:13 +0000 Subject: [PATCH] * Upgrade to Pan 0.14.2.90. svn path=/nixpkgs/trunk/; revision=562 --- .../networking/newsreaders/pan/builder.sh | 2 +- .../networking/newsreaders/pan/default.nix | 12 +++++++----- pkgs/system/all-packages-generic.nix | 1 + 3 files changed, 9 insertions(+), 6 deletions(-) diff --git a/pkgs/applications/networking/newsreaders/pan/builder.sh b/pkgs/applications/networking/newsreaders/pan/builder.sh index b2f160e155dc..5fdd174fcd28 100755 --- a/pkgs/applications/networking/newsreaders/pan/builder.sh +++ b/pkgs/applications/networking/newsreaders/pan/builder.sh @@ -1,6 +1,6 @@ #! /bin/sh -buildinputs="$pkgconfig $gtk $gtkspell $gnet $libxml2 $perl" +buildinputs="$pkgconfig $gtk $gtkspell $gnet $libxml2 $perl $pcre" . $stdenv/setup || exit 1 tar xvfj $src || exit 1 diff --git a/pkgs/applications/networking/newsreaders/pan/default.nix b/pkgs/applications/networking/newsreaders/pan/default.nix index 26b7e6af2b52..af84ca04142d 100644 --- a/pkgs/applications/networking/newsreaders/pan/default.nix +++ b/pkgs/applications/networking/newsreaders/pan/default.nix @@ -1,20 +1,21 @@ { spellChecking ? true -, stdenv, fetchurl, pkgconfig, gtk, gtkspell ? null, gnet, libxml2, perl +, stdenv, fetchurl, pkgconfig, gtk, gtkspell ? null, gnet +, libxml2, perl, pcre }: assert !isNull pkgconfig && !isNull gtk && !isNull gnet - && !isNull libxml2 && !isNull perl; + && !isNull libxml2 && !isNull perl && !isNull pcre; assert spellChecking -> !isNull gtkspell && gtk == gtkspell.gtk; assert gtk.glib == gnet.glib; derivation { - name = "pan-0.14.2"; + name = "pan-0.14.2.90"; system = stdenv.system; builder = ./builder.sh; src = fetchurl { - url = http://pan.rebelbase.com/download/releases/0.14.2/SOURCE/pan-0.14.2.tar.bz2; - md5 = "ed3188e7059bb6d6c209ee5d46ac1852"; + url = http://pan.rebelbase.com/download/releases/0.14.2.90/SOURCE/pan-0.14.2.90.tar.bz2; + md5 = "03e6d936254e775a94995ba261be23eb"; }; spellChecking = spellChecking; @@ -26,4 +27,5 @@ derivation { gnet = gnet; libxml2 = libxml2; perl = perl; + pcre = pcre; } diff --git a/pkgs/system/all-packages-generic.nix b/pkgs/system/all-packages-generic.nix index ca511f04b2fe..63085b15675b 100644 --- a/pkgs/system/all-packages-generic.nix +++ b/pkgs/system/all-packages-generic.nix @@ -401,6 +401,7 @@ gnet = gnet; libxml2 = libxml2; perl = perl; + pcre = pcre; }; sylpheed = (import ../applications/networking/mailreaders/sylpheed) {