diff options
| author | Armijn Hemel <armijn@gpl-violations.org> | 2009-12-25 15:45:06 +0000 |
|---|---|---|
| committer | Armijn Hemel <armijn@gpl-violations.org> | 2009-12-25 15:45:06 +0000 |
| commit | 3093cbc10d248909e59fd83471706a1d19d5a7f5 (patch) | |
| tree | c391090ffa9e6d77cf5f1cf537c26de7e34c4556 /pkgs | |
| parent | 08a76cde77b3f9929cf635a81ea67a0df1809a62 (diff) | |
| download | nixpkgs-3093cbc10d248909e59fd83471706a1d19d5a7f5.tar nixpkgs-3093cbc10d248909e59fd83471706a1d19d5a7f5.tar.gz nixpkgs-3093cbc10d248909e59fd83471706a1d19d5a7f5.tar.bz2 nixpkgs-3093cbc10d248909e59fd83471706a1d19d5a7f5.tar.lz nixpkgs-3093cbc10d248909e59fd83471706a1d19d5a7f5.tar.xz nixpkgs-3093cbc10d248909e59fd83471706a1d19d5a7f5.tar.zst nixpkgs-3093cbc10d248909e59fd83471706a1d19d5a7f5.zip | |
update to 2.8.1
svn path=/nixpkgs/trunk/; revision=19113
Diffstat (limited to 'pkgs')
| -rw-r--r-- | pkgs/applications/office/abiword/default.nix | 13 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 4 |
2 files changed, 8 insertions, 9 deletions
diff --git a/pkgs/applications/office/abiword/default.nix b/pkgs/applications/office/abiword/default.nix index a7d53896301..b7aecdfd03d 100644 --- a/pkgs/applications/office/abiword/default.nix +++ b/pkgs/applications/office/abiword/default.nix @@ -1,16 +1,15 @@ -{stdenv, fetchurl, pkgconfig, gtk, libglade, libgnomeprint, -libgnomeprintui, libgnomecanvas, fribidi, libpng, popt, libgsf, -enchant, wv +{stdenv, fetchurl, pkgconfig, gtk, libglade, libgnomecanvas, fribidi, libpng, popt, libgsf, +enchant, wv, librsvg, bzip2 }: stdenv.mkDerivation { - name = "abiword-2.6.8"; + name = "abiword-2.8.1"; src = fetchurl { - url = http://www.abisource.org/downloads/abiword/2.6.8/source/abiword-2.6.8.tar.gz; - sha256 = "14vfp668srjgy6wd22h4a93safp1iyfwhdr6y0sb751xl46nlrdn"; + url = http://www.abisource.org/downloads/abiword/2.8.1/source/abiword-2.8.1.tar.gz; + sha256 = "1v6jkjd5ivaarhv41nkniqycx3k33p9r7q7dyyjn7kq2295n26zm"; }; - buildInputs = [pkgconfig gtk libglade libgnomeprint libgnomeprintui + buildInputs = [pkgconfig gtk libglade librsvg bzip2 libgnomecanvas fribidi libpng popt libgsf enchant wv ]; } diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 186b0b2043d..42bcea77527 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6137,9 +6137,9 @@ let }; abiword = import ../applications/office/abiword { - inherit fetchurl stdenv pkgconfig fribidi libpng popt libgsf enchant wv; + inherit fetchurl stdenv pkgconfig fribidi libpng popt libgsf enchant wv librsvg bzip2; inherit (gtkLibs) gtk; - inherit (gnome) libglade libgnomeprint libgnomeprintui libgnomecanvas; + inherit (gnome) libglade libgnomecanvas; }; adobeReader = import ../applications/misc/adobe-reader { |