anki: 2.1.6-beta1 -> 2.1.6-beta2, fix python 3.7

With recent switch to python 3.7 this was no longer building.

Upstream PR with the same patch: https://github.com/dae/anki/pull/266
This commit is contained in:
Alexey Lebedeff 2018-11-30 10:55:09 +01:00
parent 76c7a8bac0
commit 8d61b9d079
2 changed files with 26 additions and 2 deletions

View File

@ -25,7 +25,7 @@
}:
buildPythonApplication rec {
version = "2.1.6-beta1";
version = "2.1.6-beta2";
name = "anki-${version}";
src = fetchurl {
@ -35,7 +35,7 @@ buildPythonApplication rec {
# "http://ankisrs.net/download/mirror/${name}.tgz"
# "http://ankisrs.net/download/mirror/archive/${name}.tgz"
];
sha256 = "0yqn8qjx9dyf754jljhyyrk8mahii188nz0yifl1lr3py9sxzbsf";
sha256 = "0h71s1j1269x0b8481z8xf019caqglcjs32xlpzk72087ps169fa";
};
propagatedBuildInputs = [ pyqt5 sqlalchemy
@ -53,6 +53,7 @@ buildPythonApplication rec {
patches = [
# Disable updated version check.
./no-version-check.patch
./python-3.7-compat.patch
];
buildPhase = ''

View File

@ -0,0 +1,23 @@
commit 3d69aa9ce454a151ba75deafd7de117af2c7307d
Author: Alexey Lebedeff <binarin@binarin.ru>
Date: Fri Nov 30 10:44:39 2018 +0100
Fix searching for python 3.7
3.7 introduced a change to `re.escape()`, which no longer escapes
`%`. By using `re.escape("%")` instead of a literal, we can detect
a proper form at runtime.
diff --git a/anki/find.py b/anki/find.py
index 48d0dd1..213216d 100644
--- a/anki/find.py
+++ b/anki/find.py
@@ -440,7 +440,7 @@ select distinct(n.id) from cards c, notes n where c.nid=n.id and """+preds
# nothing has that field
return
# gather nids
- regex = re.escape(val).replace("_", ".").replace("\\%", ".*")
+ regex = re.escape(val).replace("_", ".").replace(re.escape('%'), ".*")
nids = []
for (id,mid,flds) in self.col.db.execute("""
select id, mid, flds from notes