alioth/nixpkgs
3
0
Fork 0
forked from mirrors/nixpkgs
Code Releases Activity

Updating calibre (now, with chm support)

Browse source 
svn path=/nixpkgs/trunk/; revision=20797
This commit is contained in:
Lluís Batlle i Rossell 2010-03-23 21:48:38 +00:00
parent 8929e647c6
commit 54ccfcff2d
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
pkgs/applications/misc/calibre/default.nix
View file

@ -1,14 +1,14 @@
{ stdenv, fetchurl, python, pyqt4, sip, popplerQt4, pkgconfig, libpng { stdenv, fetchurl, python, pyqt4, sip, popplerQt4, pkgconfig, libpng
, imagemagick, libjpeg, fontconfig, podofo, qt4, mechanize, lxml, dateutil , imagemagick, libjpeg, fontconfig, podofo, qt4, mechanize, lxml, dateutil
, pil, cssutils, beautifulsoap, makeWrapper, unrar , pil, cssutils, beautifulsoap, makeWrapper, unrar, chmlib
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "calibre-0.6.43"; name = "calibre-0.6.45";
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/calibre/${name}.tar.gz"; url = "mirror://sourceforge/calibre/${name}.tar.gz";
sha256 = "1fqrishm5na2h0jh46w1gj7gvav335fixwrk6y7l7l4a6argjslr"; sha256 = "167qmhj4cp5z3skmhkip7axajqha13qnmxk0rgc8mwvc7kr5q98h";
}; };
inherit python; inherit python;
@ -16,7 +16,7 @@ stdenv.mkDerivation rec {
buildInputs = buildInputs =
[ python pyqt4 sip popplerQt4 pkgconfig libpng imagemagick libjpeg [ python pyqt4 sip popplerQt4 pkgconfig libpng imagemagick libjpeg
fontconfig podofo qt4 mechanize lxml dateutil pil makeWrapper fontconfig podofo qt4 mechanize lxml dateutil pil makeWrapper
cssutils beautifulsoap cssutils beautifulsoap chmlib
]; ];
installPhase = '' installPhase = ''

2
pkgs/top-level/all-packages.nix
View file

@ -6869,7 +6869,7 @@ let
calibre = import ../applications/misc/calibre { calibre = import ../applications/misc/calibre {
inherit stdenv fetchurl libpng imagemagick pkgconfig libjpeg fontconfig podofo inherit stdenv fetchurl libpng imagemagick pkgconfig libjpeg fontconfig podofo
qt4 makeWrapper unrar sip pyqt4 pil; qt4 makeWrapper unrar sip pyqt4 pil chmlib;
python = python26Full; python = python26Full;
popplerQt4 = popplerQt45; popplerQt4 = popplerQt45;
inherit (python26Packages) mechanize lxml dateutil cssutils beautifulsoap; inherit (python26Packages) mechanize lxml dateutil cssutils beautifulsoap;