diff --git a/pkgs/applications/misc/calibre/default.nix b/pkgs/applications/misc/calibre/default.nix index 60505d50056e..8ec1c5cd227a 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, makeWrapper, unrar}: +pil, cssutils, beautifulsoap, makeWrapper, unrar}: stdenv.mkDerivation rec { name = "calibre-0.6.43"; @@ -13,7 +13,8 @@ stdenv.mkDerivation rec { inherit python; buildInputs = [ python pyqt4 sip popplerQt4 pkgconfig libpng imagemagick - libjpeg fontconfig podofo qt4 mechanize lxml dateutil pil makeWrapper cssutils ]; + libjpeg fontconfig podofo qt4 mechanize lxml dateutil pil makeWrapper cssutils + beautifulsoap ]; installPhase = '' export HOME=$TMPDIR/fakehome diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c8103e2a756a..ba1431d28b43 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -6787,7 +6787,7 @@ let sip = sip_python26; pil = pil_python26; popplerQt4 = popplerQt45; - inherit (python26Packages) mechanize lxml dateutil cssutils; + inherit (python26Packages) mechanize lxml dateutil cssutils beautifulsoap; }; carrier = builderDefsPackage (import ../applications/networking/instant-messengers/carrier/2.5.0.nix) { diff --git a/pkgs/top-level/python-packages.nix b/pkgs/top-level/python-packages.nix index 5c6d7d6328c0..4edf92dc644e 100644 --- a/pkgs/top-level/python-packages.nix +++ b/pkgs/top-level/python-packages.nix @@ -34,6 +34,26 @@ rec { }; }); + beautifulsoap = buildPythonPackage (rec { + name = "beautifulsoap-3.0.8"; + + src = fetchurl { + url = "http://www.crummy.com/software/BeautifulSoup/download/3.x/BeautifulSoup-3.0.8.tar.gz"; + sha256 = "1gasiy5lwbhsxw27g36d88n36xbj52434klisvqhljgckd4xqcy7"; + }; + + # No tests implemented + doCheck = false; + + meta = { + homepage = http://www.crummy.com/software/BeautifulSoup/; + + license = "bsd"; + + description = "Undemanding HTML/XML parser"; + }; + }); + boto = buildPythonPackage (rec { name = "boto-1.9b";