Skip to content

Commit

Permalink
Merge pull request #51272 from binarin/anki-python3.7-fix
Browse files Browse the repository at this point in the history
anki: 2.1.6-beta1 -> 2.1.6-beta2, fix python 3.7
  • Loading branch information
rasendubi authored Dec 4, 2018
2 parents fc02ed8 + 19bffee commit 33b9aa4
Showing 1 changed file with 13 additions and 2 deletions.
15 changes: 13 additions & 2 deletions pkgs/games/anki/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
, lib
, python
, fetchurl
, fetchpatch
, lame
, mplayer
, libpulseaudio
Expand All @@ -25,7 +26,7 @@
}:

buildPythonApplication rec {
version = "2.1.6-beta1";
version = "2.1.6-beta2";
name = "anki-${version}";

src = fetchurl {
Expand All @@ -35,7 +36,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
Expand All @@ -53,6 +54,16 @@ buildPythonApplication rec {
patches = [
# Disable updated version check.
./no-version-check.patch

# This is needed to fix python 3.7 compatibilty, where the
# behaviour of `re.escape()` was changed in a way that it no
# longer escapes `%`. This patch detects this difference at
# runtime and makes anki work with any python version.
# Upstream PR: https://github.com/dae/anki/pull/266
(fetchpatch {
url = "https://github.com/dae/anki/commit/3d69aa9ce454a151ba75deafd7de117af2c7307d.patch";
sha256 = "0kf9gajhy0wcajp24xfia71z6gn1mc4vl37svvq4sqbhj3gigd0h";
})
];

buildPhase = ''
Expand Down

0 comments on commit 33b9aa4

Please sign in to comment.