public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

calibre: upgrade to 0.9.11 (fixes #777)

This commit is contained in:
Domen Kozar 2013-07-26 13:18:08 +02:00
parent ef16799c9c
commit f6a60d6640
2 changed files with 27 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
pkgs/applications/misc/calibre/default.nix
View File

@ -1,15 +1,15 @@
{ stdenv, fetchurl, python, pyqt4, sip, popplerQt4, pkgconfig, libpng { stdenv, fetchurl, python, pyqt4, sip, popplerQt4, pkgconfig, libpng
, imagemagick, libjpeg, fontconfig, podofo, qt4, icu, sqlite , imagemagick, libjpeg, fontconfig, podofo, qt48, icu, sqlite
, pil, makeWrapper, unrar, chmlib, pythonPackages, xz, udisks, libusb1, libmtp , pil, makeWrapper, unrar, chmlib, pythonPackages, xz, libusb1, libmtp
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
name = "calibre-0.8.70"; name = "calibre-0.9.11";
# 0.9.* versions won't build: https://bugs.launchpad.net/calibre/+bug/1094719 # 0.9.12+ versions won't build due to missing qt4 private headers: https://bugs.launchpad.net/calibre/+bug/1094719
src = fetchurl { src = fetchurl {
url = "mirror://sourceforge/calibre/${name}.tar.xz"; url = "mirror://sourceforge/calibre/${name}.tar.xz";
sha256 = "12avwp8r6cnrw6c32gmd2hksa9rszdb76zs6fcmr3n8r1wkwa71g"; sha256 = "0jjs2cx222pbv4nrivlxag5fxa0v9m63x7arcll6xi173zdn4gg8";
}; };
inherit python; inherit python;
@ -18,10 +18,10 @@ stdenv.mkDerivation rec {
buildInputs = buildInputs =
[ python pyqt4 sip popplerQt4 libpng imagemagick libjpeg [ python pyqt4 sip popplerQt4 libpng imagemagick libjpeg
fontconfig podofo qt4 pil chmlib icu fontconfig podofo qt48 pil chmlib icu
pythonPackages.mechanize pythonPackages.lxml pythonPackages.dateutil pythonPackages.mechanize pythonPackages.lxml pythonPackages.dateutil
pythonPackages.cssutils pythonPackages.beautifulsoup pythonPackages.cssutils pythonPackages.beautifulsoup pythonPackages.pillow
pythonPackages.sqlite3 sqlite udisks libusb1 libmtp pythonPackages.sqlite3 pythonPackages.netifaces sqlite libusb1 libmtp
]; ];
installPhase = '' installPhase = ''
@ -46,11 +46,11 @@ stdenv.mkDerivation rec {
done done
''; '';
meta = { meta = with stdenv.lib; {
description = "Comprehensive e-book software"; description = "Comprehensive e-book software";
homepage = http://calibre-ebook.com; homepage = http://calibre-ebook.com;
license = "GPLv3"; license = licenses.gpl3;
maintainers = with stdenv.lib.maintainers; [viric]; maintainers = with maintainers; [ viric iElectric ];
platforms = with stdenv.lib.platforms; linux; platforms = platforms.linux;
}; };
} }

15
pkgs/top-level/python-packages.nix
View File

@ -2908,6 +2908,21 @@ pythonPackages = python.modules // rec {
}; };
}; };
netifaces = buildPythonPackage rec {
version = "0.8";
name = "netifaces-${version}";
src = fetchurl {
url = "http://alastairs-place.net/projects/netifaces/${name}.tar.gz";
sha256 = "1v5i39kx4yz1pwgjfbzi63w55l2z318zgmi9f77ybmmkil1i39sk";
};
meta = {
homepage = http://alastairs-place.net/projects/netifaces/;
description = "Portable access to network interfaces from Python";
};
};
netlib = buildPythonPackage rec { netlib = buildPythonPackage rec {
baseName = "netlib"; baseName = "netlib";
name = "${baseName}-${meta.version}"; name = "${baseName}-${meta.version}";