From 0779d71915e65d10f10b5e220a80d6cedb2cd17c Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Fri, 19 Oct 2018 18:20:35 +0000 Subject: [PATCH 1/2] anki: use send2trash from nixpkgs --- pkgs/games/anki/default.nix | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pkgs/games/anki/default.nix b/pkgs/games/anki/default.nix index e9f239b4df32..b5630cd2a162 100644 --- a/pkgs/games/anki/default.nix +++ b/pkgs/games/anki/default.nix @@ -16,6 +16,7 @@ , pytest , glibcLocales , nose +, send2trash # 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 @@ -40,7 +41,7 @@ in buildPythonApplication rec { sha256 = "0yjyxgpk79rplz9z2r93kmlk09ari6xxfrz1cfm2yl9v8zfw1n6l"; }; - propagatedBuildInputs = [ pyqt4 sqlalchemy pyaudio beautifulsoup httplib2 ] + propagatedBuildInputs = [ pyqt4 sqlalchemy pyaudio beautifulsoup httplib2 send2trash ] ++ lib.optional plotsSupport matplotlib; checkInputs = [ pytest glibcLocales nose ]; @@ -108,7 +109,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 thirdparty/send2trash $pp/ + cp -rv anki aqt $pp/ wrapPythonPrograms ''; From 141eb8b84367ee481065c3c59e3f3cb098504f00 Mon Sep 17 00:00:00 2001 From: Jan Malakhovski Date: Fri, 19 Oct 2018 21:59:47 +0000 Subject: [PATCH 2/2] anki: update meta --- pkgs/games/anki/default.nix | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/pkgs/games/anki/default.nix b/pkgs/games/anki/default.nix index b5630cd2a162..8ac70fcd6f3e 100644 --- a/pkgs/games/anki/default.nix +++ b/pkgs/games/anki/default.nix @@ -115,10 +115,8 @@ in buildPythonApplication rec { ''; meta = with stdenv.lib; { - homepage = http://ankisrs.net/; + homepage = "https://apps.ankiweb.net/"; description = "Spaced repetition flashcard program"; - license = licenses.gpl3; - longDescription = '' Anki is a program which makes remembering things easy. Because it is a lot more efficient than traditional study methods, you can either greatly @@ -131,8 +129,9 @@ in buildPythonApplication rec { people's names and faces, brushing up on geography, mastering long poems, or even practicing guitar chords! ''; - - maintainers = with maintainers; [ the-kenny ]; + license = licenses.agpl3Plus; + broken = stdenv.hostPlatform.isAarch64; platforms = platforms.mesaPlatforms; + maintainers = with maintainers; [ the-kenny ]; }; }