ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-11-19 02:44:17 +03:00
Code Issues Projects Releases Wiki Activity

Merge pull request #229480 from euank/anki-2.1.62

Browse Source 
anki: 2.1.61 -> 2.1.65
This commit is contained in:
Atemu 2023-08-29 16:38:55 +02:00 committed by GitHub
commit c680330b76
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 1013 additions and 714 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1706
pkgs/games/anki/Cargo.lock generated
View File

File diff suppressed because it is too large Load Diff

13
pkgs/games/anki/default.nix
View File

@ -25,14 +25,14 @@
let let
pname = "anki"; pname = "anki";
version = "2.1.61"; version = "2.1.65";
rev = "0c1eaf4ce66c1b90867af9a79b95d9e507262cf8"; rev = "aa9a734f695d0b0981aa3c0aaa2745ce86832f08";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "ankitects"; owner = "ankitects";
repo = "anki"; repo = "anki";
rev = version; rev = version;
hash = "sha256-prTGilOw7SfxWevnMsuGq8Zp5uLfVHzTkoAU57NzqHk="; hash = "sha256-l+RTot8pJFJDDiapmQdKJ9WfwAuwRFiNJMbX+fBETeU=";
fetchSubmodules = true; fetchSubmodules = true;
}; };
@ -41,7 +41,8 @@ let
lockFile = ./Cargo.lock; lockFile = ./Cargo.lock;
outputHashes = { outputHashes = {
"csv-1.1.6" = "sha256-w728ffOVkI+IfK6FbmkGhr0CjuyqgJnPB1kutMJIUYg="; "csv-1.1.6" = "sha256-w728ffOVkI+IfK6FbmkGhr0CjuyqgJnPB1kutMJIUYg=";
"linkcheck-0.4.1-alpha.0" = "sha256-Fiom8oHW9y7vV2RLXW0ClzHOdIlBq3Z9jLP+p6Sk4GI="; "linkcheck-0.4.1" = "sha256-S93J1cDzMlzDjcvz/WABmv8CEC6x78E+f7nzhsN7NkE=";
"percent-encoding-iri-2.2.0" = "sha256-kCBeS1PNExyJd4jWfDfctxq6iTdAq69jtxFQgCCQ8kQ=";
}; };
}; };
@ -88,7 +89,7 @@ let
yarnOfflineCache = fetchYarnDeps { yarnOfflineCache = fetchYarnDeps {
yarnLock = "${src}/yarn.lock"; yarnLock = "${src}/yarn.lock";
hash = "sha256-jP0ltYVB52LolGtN/GGjM4I7ira16rRTXfyJlrdjTX4="; hash = "sha256-66mYsHojQQBfLTHd12+/HEf7FKF5Y2RZRFeYRS2yZco=";
}; };
# https://discourse.nixos.org/t/mkyarnpackage-lockfile-has-incorrect-entry/21586/3 # https://discourse.nixos.org/t/mkyarnpackage-lockfile-has-incorrect-entry/21586/3
@ -277,5 +278,7 @@ python3.pkgs.buildPythonApplication {
license = licenses.agpl3Plus; license = licenses.agpl3Plus;
platforms = platforms.mesaPlatforms; platforms = platforms.mesaPlatforms;
maintainers = with maintainers; [ oxij euank ]; maintainers = with maintainers; [ oxij euank ];
# Reported to crash at launch on darwin (as of 2.1.65)
broken = stdenv.isDarwin;
}; };
} }

8
pkgs/games/anki/patches/0001-Skip-formatting-python-code.patch
View File

@ -1,7 +1,7 @@
From ed5090b237bca768dbf7dfc3b4414b955879f15e Mon Sep 17 00:00:00 2001 From 104572dc7ebb75061b867158ce3d4311d8cf4594 Mon Sep 17 00:00:00 2001
From: Euan Kemp <euank@euank.com> From: Euan Kemp <euank@euank.com>
Date: Fri, 7 Apr 2023 20:22:34 +0900 Date: Thu, 6 Jul 2023 10:05:15 +0900
Subject: [PATCH 3/3] Skip formatting python code Subject: [PATCH] Skip formatting python code
--- ---
pylib/tools/hookslib.py | 4 ++-- pylib/tools/hookslib.py | 4 ++--
@ -27,5 +27,5 @@ index 6361c633e..95ecb64a2 100644
- subprocess.run([sys.executable, "-m", "black", "-q", path], check=True) - subprocess.run([sys.executable, "-m", "black", "-q", path], check=True)
+ # subprocess.run([sys.executable, "-m", "black", "-q", path], check=True) + # subprocess.run([sys.executable, "-m", "black", "-q", path], check=True)
-- --
2.39.2 2.40.1