anki: 2.0.36 -> 2.0.46

This commit is contained in:
Gabriel Ebner 2017-08-06 15:33:50 +02:00
parent b0a2ea01c5
commit 357b93e1b1
2 changed files with 10 additions and 8 deletions

View file

@ -7,7 +7,7 @@
}:
let
version = "2.0.36";
version = "2.0.46";
inherit (python2Packages) python wrapPython sqlalchemy pyaudio beautifulsoup httplib2 matplotlib pyqt4;
qt4 = pyqt4.qt;
in
@ -15,10 +15,11 @@ stdenv.mkDerivation rec {
name = "anki-${version}";
src = fetchurl {
urls = [
"http://ankisrs.net/download/mirror/${name}.tgz"
"http://ankisrs.net/download/mirror/archive/${name}.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 = "070p0jmx6cy7kp9bfcgpgkzpyqkcj81wy8gmacns03n5rlq8487v";
sha256 = "01h51rbnj0r6lmjnn2vzxzaf7mxkc0azmg1v4mvf4pkpsp50a7hr";
};
pythonPath = [ pyqt4 sqlalchemy pyaudio beautifulsoup httplib2 ]

View file

@ -1,7 +1,6 @@
diff -Nurp anki-2.0.33.orig/anki/lang.py anki-2.0.33/anki/lang.py
--- anki-2.0.33.orig/anki/lang.py 2015-12-27 11:23:02.334908723 +0100
+++ anki-2.0.33/anki/lang.py 2015-12-27 14:06:00.688003103 +0100
@@ -71,13 +71,7 @@ def ngettext(single, plural, n):
--- anki-2.0.46/anki/lang.py.orig 2017-08-06 15:30:10.781419237 +0200
+++ anki-2.0.46/anki/lang.py 2017-08-06 15:31:33.023043036 +0200
@@ -71,15 +71,7 @@
return localTranslation().ungettext(single, plural, n)
def langDir():
@ -11,6 +10,8 @@ diff -Nurp anki-2.0.33.orig/anki/lang.py anki-2.0.33/anki/lang.py
- dir = os.path.join(os.path.dirname(sys.argv[0]), "locale")
- if not os.path.isdir(dir):
- dir = "/usr/share/anki/locale"
- if not os.path.isdir(dir):
- dir = "/usr/local/share/anki/bin/locale"
- return dir
+ return "@anki@/share/locale"