summary refs log tree commit diff
path: root/pkgs/games/anki
diff options
context:
space:
mode:
authoradisbladis <adis@blad.is>2017-11-13 09:17:07 +0800
committeradisbladis <adis@blad.is>2017-11-13 09:17:07 +0800
commitc28911e0f99100b588b5392c9a9d86435957c2c6 (patch)
tree9479366c53d97e7bff33aba4c2f31e9e97b5ba01 /pkgs/games/anki
parentf575062f9764b02fb04609e0afb0403e48435d7e (diff)
downloadnixpkgs-c28911e0f99100b588b5392c9a9d86435957c2c6.tar
nixpkgs-c28911e0f99100b588b5392c9a9d86435957c2c6.tar.gz
nixpkgs-c28911e0f99100b588b5392c9a9d86435957c2c6.tar.bz2
nixpkgs-c28911e0f99100b588b5392c9a9d86435957c2c6.tar.lz
nixpkgs-c28911e0f99100b588b5392c9a9d86435957c2c6.tar.xz
nixpkgs-c28911e0f99100b588b5392c9a9d86435957c2c6.tar.zst
nixpkgs-c28911e0f99100b588b5392c9a9d86435957c2c6.zip
anki: Switch dependency to beautifulsoup-3
The current upstream development version is using 4 but the release
version is still using 3.
Diffstat (limited to 'pkgs/games/anki')
-rw-r--r--pkgs/games/anki/beautifulsoup.nix20
-rw-r--r--pkgs/games/anki/default.nix8
2 files changed, 27 insertions, 1 deletions
diff --git a/pkgs/games/anki/beautifulsoup.nix b/pkgs/games/anki/beautifulsoup.nix
new file mode 100644
index 00000000000..571df924e1f
--- /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 e87e59637ed..22d5adc2447 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 ];