summary refs log tree commit diff
path: root/pkgs/games/anki
diff options
context:
space:
mode:
authorGabriel Ebner <gebner@gebner.org>2017-08-06 15:33:50 +0200
committerGabriel Ebner <gebner@gebner.org>2017-08-06 15:33:50 +0200
commit357b93e1b1ae9b8a5141042fdd502a98ccc84313 (patch)
tree98337a862dadce66d469b971b4290aa926d39786 /pkgs/games/anki
parentb0a2ea01c52c86c4c07304f79dc9a28f714fc122 (diff)
downloadnixpkgs-357b93e1b1ae9b8a5141042fdd502a98ccc84313.tar
nixpkgs-357b93e1b1ae9b8a5141042fdd502a98ccc84313.tar.gz
nixpkgs-357b93e1b1ae9b8a5141042fdd502a98ccc84313.tar.bz2
nixpkgs-357b93e1b1ae9b8a5141042fdd502a98ccc84313.tar.lz
nixpkgs-357b93e1b1ae9b8a5141042fdd502a98ccc84313.tar.xz
nixpkgs-357b93e1b1ae9b8a5141042fdd502a98ccc84313.tar.zst
nixpkgs-357b93e1b1ae9b8a5141042fdd502a98ccc84313.zip
anki: 2.0.36 -> 2.0.46
Diffstat (limited to 'pkgs/games/anki')
-rw-r--r--pkgs/games/anki/default.nix9
-rw-r--r--pkgs/games/anki/fix-paths.patch9
2 files changed, 10 insertions, 8 deletions
diff --git a/pkgs/games/anki/default.nix b/pkgs/games/anki/default.nix
index 17d80f2e298..c5bac4db8e5 100644
--- a/pkgs/games/anki/default.nix
+++ b/pkgs/games/anki/default.nix
@@ -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 ]
diff --git a/pkgs/games/anki/fix-paths.patch b/pkgs/games/anki/fix-paths.patch
index cfd3424f799..9b2fd53783e 100644
--- a/pkgs/games/anki/fix-paths.patch
+++ b/pkgs/games/anki/fix-paths.patch
@@ -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"