diff options
author | Domen Kozar <domen@dev.si> | 2013-07-26 13:18:08 +0200 |
---|---|---|
committer | Domen Kozar <domen@dev.si> | 2013-07-26 13:18:08 +0200 |
commit | f6a60d664037278a629fdbc8912f037be2a20c8f (patch) | |
tree | 9990cee279d78d4007b96fbde75cfb82be78bef9 | |
parent | ef16799c9c54889d60774d4b811a95cdb6e821e7 (diff) | |
download | nixpkgs-f6a60d664037278a629fdbc8912f037be2a20c8f.tar nixpkgs-f6a60d664037278a629fdbc8912f037be2a20c8f.tar.gz nixpkgs-f6a60d664037278a629fdbc8912f037be2a20c8f.tar.bz2 nixpkgs-f6a60d664037278a629fdbc8912f037be2a20c8f.tar.lz nixpkgs-f6a60d664037278a629fdbc8912f037be2a20c8f.tar.xz nixpkgs-f6a60d664037278a629fdbc8912f037be2a20c8f.tar.zst nixpkgs-f6a60d664037278a629fdbc8912f037be2a20c8f.zip |
calibre: upgrade to 0.9.11 (fixes #777)
-rw-r--r-- | pkgs/applications/misc/calibre/default.nix | 24 | ||||
-rw-r--r-- | pkgs/top-level/python-packages.nix | 15 |
2 files changed, 27 insertions, 12 deletions
diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix index 23b5092cd4d..01060909f3d 100644 --- a/pkgs/applications/misc/calibre/default.nix +++ b/pkgs/applications/misc/calibre/default.nix @@ -1,15 +1,15 @@ { stdenv, fetchurl, python, pyqt4, sip, popplerQt4, pkgconfig, libpng -, imagemagick, libjpeg, fontconfig, podofo, qt4, icu, sqlite -, pil, makeWrapper, unrar, chmlib, pythonPackages, xz, udisks, libusb1, libmtp +, imagemagick, libjpeg, fontconfig, podofo, qt48, icu, sqlite +, pil, makeWrapper, unrar, chmlib, pythonPackages, xz, libusb1, libmtp }: stdenv.mkDerivation rec { - name = "calibre-0.8.70"; - # 0.9.* versions won't build: https://bugs.launchpad.net/calibre/+bug/1094719 + name = "calibre-0.9.11"; + # 0.9.12+ versions won't build due to missing qt4 private headers: https://bugs.launchpad.net/calibre/+bug/1094719 src = fetchurl { url = "mirror://sourceforge/calibre/${name}.tar.xz"; - sha256 = "12avwp8r6cnrw6c32gmd2hksa9rszdb76zs6fcmr3n8r1wkwa71g"; + sha256 = "0jjs2cx222pbv4nrivlxag5fxa0v9m63x7arcll6xi173zdn4gg8"; }; inherit python; @@ -18,10 +18,10 @@ stdenv.mkDerivation rec { buildInputs = [ 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.cssutils pythonPackages.beautifulsoup - pythonPackages.sqlite3 sqlite udisks libusb1 libmtp + pythonPackages.cssutils pythonPackages.beautifulsoup pythonPackages.pillow + pythonPackages.sqlite3 pythonPackages.netifaces sqlite libusb1 libmtp ]; installPhase = '' @@ -46,11 +46,11 @@ stdenv.mkDerivation rec { done ''; - meta = { + meta = with stdenv.lib; { description = "Comprehensive e-book software"; homepage = http://calibre-ebook.com; - license = "GPLv3"; - maintainers = with stdenv.lib.maintainers; [viric]; - platforms = with stdenv.lib.platforms; linux; + license = licenses.gpl3; + maintainers = with maintainers; [ viric iElectric ]; + platforms = platforms.linux; }; } diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index d08eaa23da5..0ca03b1082c 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -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 { baseName = "netlib"; name = "${baseName}-${meta.version}"; |