colin/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #31581 from adisbladis/anki-bs3

Browse Source 
anki: Switch dependency to beautifulsoup-3
This commit is contained in:
Samuel Leathers 2017-11-12 22:17:30 -05:00 committed by GitHub
commit 10d02b7c43
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 27 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
pkgs/games/anki/beautifulsoup.nix Normal file
View File

@ -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";
};
}

8
pkgs/games/anki/default.nix
View File

@ -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 ];