diff options
Diffstat (limited to 'pkgs/games/anki/default.nix')
-rw-r--r-- | pkgs/games/anki/default.nix | 43 |
1 files changed, 18 insertions, 25 deletions
diff --git a/pkgs/games/anki/default.nix b/pkgs/games/anki/default.nix index 8ac70fcd6f3ea..fb43640b2b123 100644 --- a/pkgs/games/anki/default.nix +++ b/pkgs/games/anki/default.nix @@ -4,14 +4,16 @@ , lib , python , fetchurl -, substituteAll , lame , mplayer , libpulseaudio -, pyqt4 +, pyqt5 +, decorator +, beautifulsoup4 , sqlalchemy , pyaudio -, httplib2 +, requests +, markdown , matplotlib , pytest , glibcLocales @@ -22,41 +24,35 @@ , plotsSupport ? true }: -let - # Development version of anki has bumped to beautifulsoup4 - beautifulsoup = callPackage ./beautifulsoup.nix { }; - - qt4 = pyqt4.qt; - -in buildPythonApplication rec { - version = "2.0.52"; +buildPythonApplication rec { + version = "2.1.6-beta1"; name = "anki-${version}"; src = fetchurl { urls = [ - "https://apps.ankiweb.net/downloads/current/${name}-source.tgz" + "https://apps.ankiweb.net/downloads/beta/${name}-source.tgz" + # "https://apps.ankiweb.net/downloads/current/${name}-source.tgz" # "http://ankisrs.net/download/mirror/${name}.tgz" # "http://ankisrs.net/download/mirror/archive/${name}.tgz" ]; - sha256 = "0yjyxgpk79rplz9z2r93kmlk09ari6xxfrz1cfm2yl9v8zfw1n6l"; + sha256 = "0yqn8qjx9dyf754jljhyyrk8mahii188nz0yifl1lr3py9sxzbsf"; }; - propagatedBuildInputs = [ pyqt4 sqlalchemy pyaudio beautifulsoup httplib2 send2trash ] + propagatedBuildInputs = [ pyqt5 sqlalchemy + beautifulsoup4 send2trash pyaudio requests decorator markdown ] ++ lib.optional plotsSupport matplotlib; checkInputs = [ pytest glibcLocales nose ]; buildInputs = [ lame mplayer libpulseaudio ]; + makeWrapperArgs = [ + ''--prefix PATH ':' "${lame}/bin:${mplayer}/bin"'' + ]; + patches = [ # Disable updated version check. ./no-version-check.patch - - (substituteAll { - src = ./fix-paths.patch; - inherit lame mplayer qt4; - qt4name = qt4.name; - }) ]; buildPhase = '' @@ -65,12 +61,9 @@ in buildPythonApplication rec { ''; postPatch = '' - substituteInPlace oldanki/lang.py --subst-var-by anki $out - substituteInPlace anki/lang.py --subst-var-by anki $out - # Remove unused starter. We'll create our own, minimalistic, # starter. - rm anki/anki + # rm anki/anki # Remove QT translation files. We'll use the standard QT ones. rm "locale/"*.qm @@ -109,7 +102,7 @@ in buildPythonApplication rec { cp -v anki.xml $out/share/mime/packages/ cp -v anki.{png,xpm} $out/share/pixmaps/ cp -rv locale $out/share/ - cp -rv anki aqt $pp/ + cp -rv anki aqt web $pp/ wrapPythonPrograms ''; |