anki: 24.06.3 -> 24.11

This commit is contained in:
cy
2024-12-04 20:06:00 -05:00
parent 34ac189bed
commit 17090e527e
4 changed files with 1394 additions and 1180 deletions
+1389 -1129
View File
File diff suppressed because it is too large Load Diff
+5 -7
View File
@@ -31,14 +31,14 @@
let
pname = "anki";
version = "24.06.3";
rev = "d678e39350a2d243242a69f4e22f5192b04398f2";
version = "24.11";
rev = "87ccd24efd0ea635558b1679614b6763e4f514eb";
src = fetchFromGitHub {
owner = "ankitects";
repo = "anki";
rev = version;
hash = "sha256-ap8WFDDSGonk5kgXXIsADwAwd7o6Nsy6Wxsa7r1iUIM=";
hash = "sha256-pAQBl5KbTu7LD3gKBaiyn4QiWeGYoGmxD3sDJfCZVdA=";
fetchSubmodules = true;
};
@@ -53,7 +53,7 @@ let
yarnOfflineCache = fetchYarnDeps {
yarnLock = "${src}/yarn.lock";
hash = "sha256-Dbd7RtE0td7li7oqPPfBmAsbXPM8ed9NTAhM5gytpG8=";
hash = "sha256-4KQKWwlr+FuUmomKO3TEoDoSStjnyLutDxCfqGr6jzk=";
};
anki-build-python = python3.withPackages (ps: with ps; [ mypy-protobuf ]);
@@ -135,8 +135,6 @@ python3.pkgs.buildPythonApplication {
./patches/disable-auto-update.patch
./patches/remove-the-gl-library-workaround.patch
./patches/skip-formatting-python-code.patch
# Also remove from anki/sync-server.nix on next update
./patches/Cargo.lock-update-time-for-rust-1.80.patch
];
inherit cargoDeps yarnOfflineCache;
@@ -224,7 +222,7 @@ python3.pkgs.buildPythonApplication {
astroid
];
# tests fail with to many open files
# tests fail with too many open files
# TODO: verify if this is still true (I can't, no mac)
doCheck = !stdenv.hostPlatform.isDarwin;
@@ -1,40 +0,0 @@
From 66d9c405bfe7cb431cc52a7aec038068b364f034 Mon Sep 17 00:00:00 2001
From: Dominique Martinet <asmadeus@codewreck.org>
Date: Sat, 10 Aug 2024 13:05:26 +0900
Subject: [PATCH] Cargo.lock: update time for rust 1.80
---
Cargo.lock | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/Cargo.lock b/Cargo.lock
index 9219317f2cea..17fb6f4a894c 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -5581,9 +5581,9 @@ dependencies = [
[[package]]
name = "time"
-version = "0.3.34"
+version = "0.3.36"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c8248b6521bb14bc45b4067159b9b6ad792e2d6d754d6c41fb50e29fefe38749"
+checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885"
dependencies = [
"deranged",
"itoa",
@@ -5602,9 +5602,9 @@ checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3"
[[package]]
name = "time-macros"
-version = "0.2.17"
+version = "0.2.18"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ba3a3ef41e6672a2f0f001392bb5dcd3ff0a9992d618ca761a11c3121547774"
+checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf"
dependencies = [
"num-conv",
"time-core",
--
2.45.2
-4
View File
@@ -12,10 +12,6 @@ rustPlatform.buildRustPackage {
pname = "anki-sync-server";
inherit (anki) version src cargoLock;
patches = [
./patches/Cargo.lock-update-time-for-rust-1.80.patch
];
# only build sync server
cargoBuildFlags = [
"--bin"