diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2011-03-28 11:50:47 +0000 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2011-03-28 11:50:47 +0000 |
| commit | d449c4db98af36d6881906bab38b3c9163d79add (patch) | |
| tree | 655f521d26e65a427bea9aca3f36a0a58656c04b /pkgs/applications/misc | |
| parent | 8ca5d5d8b641cd0b2afd4e3ebabe8a83b7b7f7ea (diff) | |
| download | nixpkgs-d449c4db98af36d6881906bab38b3c9163d79add.tar nixpkgs-d449c4db98af36d6881906bab38b3c9163d79add.tar.gz nixpkgs-d449c4db98af36d6881906bab38b3c9163d79add.tar.bz2 nixpkgs-d449c4db98af36d6881906bab38b3c9163d79add.tar.lz nixpkgs-d449c4db98af36d6881906bab38b3c9163d79add.tar.xz nixpkgs-d449c4db98af36d6881906bab38b3c9163d79add.tar.zst nixpkgs-d449c4db98af36d6881906bab38b3c9163d79add.zip | |
* Remove Python 2.6, since the only remaining package that used it
(Calibre) also works with 2.7. svn path=/nixpkgs/branches/modular-python/; revision=26561
Diffstat (limited to 'pkgs/applications/misc')
| -rw-r--r-- | pkgs/applications/misc/calibre/default.nix | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix index 3dc6a427f25..f892cf175c1 100644 --- a/pkgs/applications/misc/calibre/default.nix +++ b/pkgs/applications/misc/calibre/default.nix @@ -1,6 +1,6 @@ { stdenv, fetchurl, python, pyqt4, sip, popplerQt4, pkgconfig, libpng -, imagemagick, libjpeg, fontconfig, podofo, qt4, mechanize, lxml, dateutil -, pil, cssutils, beautifulsoap, makeWrapper, unrar, chmlib +, imagemagick, libjpeg, fontconfig, podofo, qt4 +, pil, makeWrapper, unrar, chmlib, pythonPackages }: stdenv.mkDerivation rec { @@ -15,8 +15,9 @@ stdenv.mkDerivation rec { buildInputs = [ python pyqt4 sip popplerQt4 pkgconfig libpng imagemagick libjpeg - fontconfig podofo qt4 mechanize lxml dateutil pil makeWrapper - cssutils beautifulsoap chmlib + fontconfig podofo qt4 pil makeWrapper chmlib + pythonPackages.mechanize pythonPackages.lxml pythonPackages.dateutil + pythonPackages.cssutils pythonPackages.beautifulsoap pythonPackages.sqlite3 ]; installPhase = '' |