From c28911e0f99100b588b5392c9a9d86435957c2c6 Mon Sep 17 00:00:00 2001 From: adisbladis Date: Mon, 13 Nov 2017 09:17:07 +0800 Subject: [PATCH] anki: Switch dependency to beautifulsoup-3 The current upstream development version is using 4 but the release version is still using 3. --- pkgs/games/anki/beautifulsoup.nix | 20 ++++++++++++++++++++ pkgs/games/anki/default.nix | 8 +++++++- 2 files changed, 27 insertions(+), 1 deletion(-) create mode 100644 pkgs/games/anki/beautifulsoup.nix diff --git a/pkgs/games/anki/beautifulsoup.nix b/pkgs/games/anki/beautifulsoup.nix new file mode 100644 index 000000000000..571df924e1f8 --- /dev/null +++ b/pkgs/games/anki/beautifulsoup.nix @@ -0,0 +1,20 @@ +{ pythonPackages, isPy3k, pkgs }: + +pythonPackages.buildPythonPackage rec { + name = "beautifulsoup-3.2.1"; + disabled = isPy3k; + + src = pkgs.fetchurl { + url = "http://www.crummy.com/software/BeautifulSoup/download/3.x/BeautifulSoup-3.2.1.tar.gz"; + sha256 = "1nshbcpdn0jpcj51x0spzjp519pkmqz0n0748j7dgpz70zlqbfpm"; + }; + + # error: invalid command 'test' + doCheck = false; + + meta = { + homepage = http://www.crummy.com/software/BeautifulSoup/; + license = "bsd"; + description = "Undemanding HTML/XML parser"; + }; +} diff --git a/pkgs/games/anki/default.nix b/pkgs/games/anki/default.nix index e87e59637edd..22d5adc24475 100644 --- a/pkgs/games/anki/default.nix +++ b/pkgs/games/anki/default.nix @@ -10,6 +10,12 @@ let version = "2.0.47"; inherit (python2Packages) python wrapPython sqlalchemy pyaudio beautifulsoup4 httplib2 matplotlib pyqt4; qt4 = pyqt4.qt; + + # Development version of anki has bumped to beautifulsoup4 + beautifulsoup = python2Packages.callPackage ./beautifulsoup.nix { + pythonPackages = python2Packages; + }; + in stdenv.mkDerivation rec { name = "anki-${version}"; @@ -22,7 +28,7 @@ stdenv.mkDerivation rec { sha256 = "067bsidqzy1zc301i2pk4biwp2kwvgk4kydp5z5s551acinkbdgv"; }; - pythonPath = [ pyqt4 sqlalchemy pyaudio beautifulsoup4 httplib2 ] + pythonPath = [ pyqt4 sqlalchemy pyaudio beautifulsoup httplib2 ] ++ lib.optional plotsSupport matplotlib; buildInputs = [ python wrapPython lame mplayer libpulseaudio ];