Merge pull request #53468 from asymmetric/anki-2.1.8

anki: 2.1.7 -> 2.1.8
This commit is contained in:
Dmitry Kalinkin 2019-01-05 19:15:12 -05:00 committed by GitHub
commit 0308087b74
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 6 deletions

View File

@ -20,13 +20,14 @@
, glibcLocales , glibcLocales
, nose , nose
, send2trash , send2trash
, CoreAudio
# This little flag adds a huge number of dependencies, but we assume that # This little flag adds a huge number of dependencies, but we assume that
# everyone wants Anki to draw plots with statistics by default. # everyone wants Anki to draw plots with statistics by default.
, plotsSupport ? true , plotsSupport ? true
}: }:
buildPythonApplication rec { buildPythonApplication rec {
version = "2.1.7"; version = "2.1.8";
name = "anki-${version}"; name = "anki-${version}";
src = fetchurl { src = fetchurl {
@ -36,12 +37,16 @@ buildPythonApplication rec {
# "http://ankisrs.net/download/mirror/${name}.tgz" # "http://ankisrs.net/download/mirror/${name}.tgz"
# "http://ankisrs.net/download/mirror/archive/${name}.tgz" # "http://ankisrs.net/download/mirror/archive/${name}.tgz"
]; ];
sha256 = "0cvlimfxb7kficlf20hg7a345pahvr093b7yqvssww15h4y4va9d"; sha256 = "08wb9hwpmbq7636h7sinim33qygdwwlh3frqqh2gfgm49f46di2p";
}; };
propagatedBuildInputs = [ pyqt5 sqlalchemy propagatedBuildInputs = [
beautifulsoup4 send2trash pyaudio requests decorator markdown ] pyqt5 sqlalchemy beautifulsoup4 send2trash pyaudio requests decorator
++ lib.optional plotsSupport matplotlib; markdown
]
++ lib.optional plotsSupport matplotlib
++ lib.optional stdenv.isDarwin [ CoreAudio ]
;
checkInputs = [ pytest glibcLocales nose ]; checkInputs = [ pytest glibcLocales nose ];

View File

@ -20430,7 +20430,9 @@ in
angband = callPackage ../games/angband { }; angband = callPackage ../games/angband { };
anki = python3Packages.callPackage ../games/anki { }; anki = python3Packages.callPackage ../games/anki {
inherit (darwin.apple_sdk.frameworks) CoreAudio;
};
armagetronad = callPackage ../games/armagetronad { }; armagetronad = callPackage ../games/armagetronad { };