Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: fc02ed8b304c
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 33b9aa4f35fd
Choose a head ref
  • 3 commits
  • 1 file changed
  • 2 contributors

Commits on Nov 30, 2018

  1. 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: ankitects/anki#266
    @binarin
    binarin committed Nov 30, 2018
    Copy the full SHA
    8d61b9d View commit details

Commits on Dec 1, 2018

  1. anki: Use fetchpatch for python compatibilty patch

    @binarin
    binarin committed Dec 1, 2018
    Copy the full SHA
    19bffee View commit details

Commits on Dec 4, 2018

  1. Merge pull request #51272 from binarin/anki-python3.7-fix 

    anki: 2.1.6-beta1 -> 2.1.6-beta2, fix python 3.7
    @rasendubi
    rasendubi authored Dec 4, 2018

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature. The key has expired.
    GPG key ID: 4AEE18F83AFDEB23
    Expired
    Verified
    Learn about vigilant mode
    Copy the full SHA
    33b9aa4 View commit details
Showing with 13 additions and 2 deletions.
  1. +13 −2 pkgs/games/anki/default.nix
15 changes: 13 additions & 2 deletions pkgs/games/anki/default.nix
View file
Original file line number Diff line number Diff line change
@@ -4,6 +4,7 @@
, lib
, python
, fetchurl
, fetchpatch
, lame
, mplayer
, libpulseaudio
@@ -25,7 +26,7 @@
}:

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

src = fetchurl {
@@ -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
@@ -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 = ''