From 90c68f650d1c7d187c30505b820af2796af75f67 Mon Sep 17 00:00:00 2001 From: Lorenzo Manacorda Date: Sun, 6 Jan 2019 00:09:10 +0100 Subject: [PATCH 1/2] anki: 2.1.7 -> 2.1.8 --- pkgs/games/anki/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/games/anki/default.nix b/pkgs/games/anki/default.nix index b662b5b8e3b..6dd4473a3e7 100644 --- a/pkgs/games/anki/default.nix +++ b/pkgs/games/anki/default.nix @@ -26,7 +26,7 @@ }: buildPythonApplication rec { - version = "2.1.7"; + version = "2.1.8"; name = "anki-${version}"; src = fetchurl { @@ -36,7 +36,7 @@ buildPythonApplication rec { # "http://ankisrs.net/download/mirror/${name}.tgz" # "http://ankisrs.net/download/mirror/archive/${name}.tgz" ]; - sha256 = "0cvlimfxb7kficlf20hg7a345pahvr093b7yqvssww15h4y4va9d"; + sha256 = "08wb9hwpmbq7636h7sinim33qygdwwlh3frqqh2gfgm49f46di2p"; }; propagatedBuildInputs = [ pyqt5 sqlalchemy From d2cfddd3b593922c97650455a67a75454cf2382e Mon Sep 17 00:00:00 2001 From: Dmitry Kalinkin Date: Sat, 5 Jan 2019 18:51:25 -0500 Subject: [PATCH 2/2] anki: fix build on darwin Runtime doesn't work: ModuleNotFoundError: No module named 'PyQt5.QtWebEngineWidgets' This is probably because qtwebengine is broken on darwin, but doesn't fail the build (#40149) --- pkgs/games/anki/default.nix | 11 ++++++++--- pkgs/top-level/all-packages.nix | 4 +++- 2 files changed, 11 insertions(+), 4 deletions(-) diff --git a/pkgs/games/anki/default.nix b/pkgs/games/anki/default.nix index 6dd4473a3e7..ad202c6ad8c 100644 --- a/pkgs/games/anki/default.nix +++ b/pkgs/games/anki/default.nix @@ -20,6 +20,7 @@ , glibcLocales , nose , send2trash +, CoreAudio # This little flag adds a huge number of dependencies, but we assume that # everyone wants Anki to draw plots with statistics by default. , plotsSupport ? true @@ -39,9 +40,13 @@ buildPythonApplication rec { sha256 = "08wb9hwpmbq7636h7sinim33qygdwwlh3frqqh2gfgm49f46di2p"; }; - propagatedBuildInputs = [ pyqt5 sqlalchemy - beautifulsoup4 send2trash pyaudio requests decorator markdown ] - ++ lib.optional plotsSupport matplotlib; + propagatedBuildInputs = [ + pyqt5 sqlalchemy beautifulsoup4 send2trash pyaudio requests decorator + markdown + ] + ++ lib.optional plotsSupport matplotlib + ++ lib.optional stdenv.isDarwin [ CoreAudio ] + ; checkInputs = [ pytest glibcLocales nose ]; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 47e87091d97..dc7f61d4005 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -20430,7 +20430,9 @@ in angband = callPackage ../games/angband { }; - anki = python3Packages.callPackage ../games/anki { }; + anki = python3Packages.callPackage ../games/anki { + inherit (darwin.apple_sdk.frameworks) CoreAudio; + }; armagetronad = callPackage ../games/armagetronad { };