anki: 25.07.5 -> 25.09.2 (#444594)
This commit is contained in:
@@ -35,12 +35,12 @@ let
|
||||
yarn-berry = yarn-berry_4;
|
||||
|
||||
pname = "anki";
|
||||
version = "25.07.5";
|
||||
rev = "7172b2d26684c7ef9d10e249bd43dc5bf73ae00c";
|
||||
version = "25.09.2";
|
||||
rev = "3890e12c9e48c028c3f12aa58cb64bd9f8895e30";
|
||||
|
||||
srcHash = "sha256-nWxRr55Hm40V3Ijw+WetBKNoreLpcvRscgbOZa0REcY=";
|
||||
cargoHash = "sha256-H/xwPPL6VupSZGLPEThhoeMcg12FvAX3fmNM6zYfqRQ=";
|
||||
yarnHash = "sha256-adHnV345oDm20R8zGdEiEW+8/mTQAz4oxraybRfmwew=";
|
||||
srcHash = "sha256-0hLTQR7f7s58DUgAZbDeREMee6VrqAKHyhS1Hs/Em1A=";
|
||||
cargoHash = "sha256-qcB+r9VzBz6ACZaXPL26MOxxtb/h2OIuxyc54vUgfPM=";
|
||||
yarnHash = "sha256-EmKeHORr/+qsDzAwtearMi7qodcCgjeAQcy+79HL7Vg=";
|
||||
pythonDeps = map (meta: {
|
||||
url = meta.url;
|
||||
path = toString (fetchurl meta);
|
||||
@@ -116,7 +116,6 @@ python3Packages.buildPythonApplication rec {
|
||||
./patches/disable-auto-update.patch
|
||||
./patches/remove-the-gl-library-workaround.patch
|
||||
./patches/skip-formatting-python-code.patch
|
||||
./patches/fix-compilation-under-rust-1.89.patch
|
||||
# Used in with-addons.nix
|
||||
./patches/allow-setting-addons-folder.patch
|
||||
];
|
||||
|
||||
@@ -1,53 +0,0 @@
|
||||
From d8843c5fcaef79d209803849070e1a79ab380903 Mon Sep 17 00:00:00 2001
|
||||
From: Euan Kemp <euank@euank.com>
|
||||
Date: Sun, 24 Aug 2025 20:24:34 +0900
|
||||
Subject: [PATCH] Fix compilation under rust 1.89
|
||||
|
||||
Rust 1.89 produces the following output:
|
||||
|
||||
```
|
||||
error: unicode codepoint changing visible direction of text present in literal
|
||||
...
|
||||
warning: allow(text_direction_codepoint_in_literal) is ignored unless specified at crate level
|
||||
--> rslib/i18n/src/generated.rs:7:10
|
||||
|
|
||||
7 | #![allow(text_direction_codepoint_in_literal)]
|
||||
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
|
||||
```
|
||||
|
||||
This change fixes it.
|
||||
|
||||
This ensures that some third-party crate that pulls in this code as
|
||||
library code (and thus isn't subject to the rust-toolchain file in this
|
||||
repo) doesn't hit this compilation error.
|
||||
---
|
||||
rslib/i18n/src/generated.rs | 1 -
|
||||
rslib/i18n/src/lib.rs | 1 +
|
||||
2 files changed, 1 insertion(+), 1 deletion(-)
|
||||
|
||||
diff --git a/rslib/i18n/src/generated.rs b/rslib/i18n/src/generated.rs
|
||||
index f3526f79f..f3fa71ce8 100644
|
||||
--- a/rslib/i18n/src/generated.rs
|
||||
+++ b/rslib/i18n/src/generated.rs
|
||||
@@ -4,6 +4,5 @@
|
||||
// Include auto-generated content
|
||||
|
||||
#![allow(clippy::all)]
|
||||
-#![allow(text_direction_codepoint_in_literal)]
|
||||
|
||||
include!(concat!(env!("OUT_DIR"), "/strings.rs"));
|
||||
diff --git a/rslib/i18n/src/lib.rs b/rslib/i18n/src/lib.rs
|
||||
index bfd6f5ba2..f9dbb1948 100644
|
||||
--- a/rslib/i18n/src/lib.rs
|
||||
+++ b/rslib/i18n/src/lib.rs
|
||||
@@ -1,6 +1,7 @@
|
||||
// Copyright: Ankitects Pty Ltd and contributors
|
||||
// License: GNU AGPL, version 3 or later; http://www.gnu.org/licenses/agpl.html
|
||||
|
||||
+#![allow(text_direction_codepoint_in_literal)]
|
||||
mod generated;
|
||||
|
||||
use std::borrow::Cow;
|
||||
--
|
||||
2.50.1
|
||||
|
||||
@@ -28,8 +28,8 @@
|
||||
"hash": "sha256-tIslN4eXaeA+n0uH18N++dn6LlRw4hFkcdcJZmthV3M="
|
||||
},
|
||||
{
|
||||
"url": "https://files.pythonhosted.org/packages/b3/9f/c4d3e635ddbd2c6c24ff5454e96900fd2061b9abbb0198b9283446780d08/anki_mac_helper-0.1.0-py3-none-any.whl",
|
||||
"hash": "sha256-7USauifqO8eZkFSvoQ2s8I74Vu169GUm2chZnYF5phg="
|
||||
"url": "https://files.pythonhosted.org/packages/40/82/edb6194704defec181dddce8bc6a53c4afc72fa1f2bb4d68ffe244567767/anki_mac_helper-0.1.1-py3-none-any.whl",
|
||||
"hash": "sha256-d0ppz58P5tS1SUni1liKVKdv9R54y/wmtSfR7TxbNOM="
|
||||
},
|
||||
{
|
||||
"url": "https://files.pythonhosted.org/packages/15/58/5260205b9968c20b6457ed82f48f9e3d6edf2f1f95103161798b73aeccf0/astroid-3.3.10-py3-none-any.whl",
|
||||
|
||||
Reference in New Issue
Block a user