Skip to content

Commit

Permalink
anki: 2.1.15 -> 2.1.60
Browse files Browse the repository at this point in the history
This redoes all the packaging for their new build-system.

It feels a bit fragile, but in practice it works.

Basically, we build most of it in nix, write some wrapper scripts to
mock out stuff we just did in nix, and then call thier build system to
make a wheel
  • Loading branch information
euank committed Apr 7, 2023
1 parent 5451b89 commit 8d22773
Show file tree
Hide file tree
Showing 9 changed files with 5,223 additions and 170 deletions.
4,849 changes: 4,849 additions & 0 deletions pkgs/games/anki/Cargo.lock

Large diffs are not rendered by default.

379 changes: 223 additions & 156 deletions pkgs/games/anki/default.nix

Large diffs are not rendered by default.

13 changes: 0 additions & 13 deletions pkgs/games/anki/no-version-check.patch

This file was deleted.

Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
From 53740ca75d167fab5c403a462e21ecd717b1dafa Mon Sep 17 00:00:00 2001
From: Euan Kemp <[email protected]>
Date: Fri, 17 Mar 2023 22:38:04 +0900
Subject: [PATCH 1/2] Don't download nodejs if NODE_BINARY is set

Some build environments, such as nixpkgs, restrict network access and
thus would prefer to not download anything at all. Setting PROTOC_BINARY
and friends makes the build system not download stuff, and the same
should be true for nodejs
---
build/ninja_gen/src/node.rs | 19 +++++++++----------
1 file changed, 9 insertions(+), 10 deletions(-)

diff --git a/build/ninja_gen/src/node.rs b/build/ninja_gen/src/node.rs
index df05e149d..d08c7011e 100644
--- a/build/ninja_gen/src/node.rs
+++ b/build/ninja_gen/src/node.rs
@@ -105,16 +105,6 @@ pub fn setup_node(
binary_exports: &[&'static str],
mut data_exports: HashMap<&str, Vec<Cow<str>>>,
) -> Result<()> {
- download_and_extract(
- build,
- "node",
- archive,
- hashmap! {
- "bin" => vec![if cfg!(windows) { "node.exe" } else { "bin/node" }],
- "npm" => vec![if cfg!(windows) { "npm.cmd " } else { "bin/npm" }]
- },
- )?;
-
let node_binary = match std::env::var("NODE_BINARY") {
Ok(path) => {
assert!(
@@ -124,6 +114,15 @@ pub fn setup_node(
path.into()
}
Err(_) => {
+ download_and_extract(
+ build,
+ "node",
+ archive,
+ hashmap! {
+ "bin" => vec![if cfg!(windows) { "node.exe" } else { "bin/node" }],
+ "npm" => vec![if cfg!(windows) { "npm.cmd " } else { "bin/npm" }]
+ },
+ )?;
inputs![":extract:node:bin"]
}
};
--
2.39.2

Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
From 16af7d4cabcf10797bd110c905a9d7694bde0fb4 Mon Sep 17 00:00:00 2001
From: Euan Kemp <[email protected]>
Date: Fri, 17 Mar 2023 23:07:05 +0900
Subject: [PATCH 2/2] Allow setting YARN_BINARY for the build system

---
build/ninja_gen/src/node.rs | 13 ++++++++++++-
1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/build/ninja_gen/src/node.rs b/build/ninja_gen/src/node.rs
index d08c7011e..c1e2ce1b3 100644
--- a/build/ninja_gen/src/node.rs
+++ b/build/ninja_gen/src/node.rs
@@ -129,7 +129,18 @@ pub fn setup_node(
let node_binary = build.expand_inputs(node_binary);
build.variable("node_binary", &node_binary[0]);

- build.add("yarn", YarnSetup {})?;
+ match std::env::var("YARN_BINARY") {
+ Ok(path) => {
+ assert!(
+ Utf8Path::new(&path).is_absolute(),
+ "YARN_BINARY must be absolute"
+ );
+ build.add_resolved_files_to_group("yarn:bin", &vec![path]);
+ },
+ Err(_) => {
+ build.add("yarn", YarnSetup {})?;
+ },
+ };

for binary in binary_exports {
data_exports.insert(
--
2.39.2

31 changes: 31 additions & 0 deletions pkgs/games/anki/patches/0003-Skip-formatting-python-code.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
From ed5090b237bca768dbf7dfc3b4414b955879f15e Mon Sep 17 00:00:00 2001
From: Euan Kemp <[email protected]>
Date: Fri, 7 Apr 2023 20:22:34 +0900
Subject: [PATCH 3/3] Skip formatting python code

---
pylib/tools/hookslib.py | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/pylib/tools/hookslib.py b/pylib/tools/hookslib.py
index 6361c633e..95ecb64a2 100644
--- a/pylib/tools/hookslib.py
+++ b/pylib/tools/hookslib.py
@@ -82,7 +82,7 @@ class Hook:
code = f"""\
class {self.classname()}:
{classdoc}{self.list_code()}
-
+
def append(self, callback: {self.callable()}) -> None:
'''{appenddoc}'''
self._hooks.append(callback)
@@ -208,4 +208,4 @@ def write_file(path: str, hooks: list[Hook], prefix: str, suffix: str):
os.environ["USERPROFILE"] = os.environ["HOME"]
with open(path, "wb") as file:
file.write(code.encode("utf8"))
- subprocess.run([sys.executable, "-m", "black", "-q", path], check=True)
+ # subprocess.run([sys.executable, "-m", "black", "-q", path], check=True)
--
2.39.2

17 changes: 17 additions & 0 deletions pkgs/games/anki/patches/gl-fixup.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
diff --git a/qt/aqt/__init__.py b/qt/aqt/__init__.py
index 352848cfd..3fd5d0769 100644
--- a/qt/aqt/__init__.py
+++ b/qt/aqt/__init__.py
@@ -402,12 +402,6 @@ def parseArgs(argv: list[str]) -> tuple[argparse.Namespace, list[str]]:
def setupGL(pm: aqt.profiles.ProfileManager) -> None:
driver = pm.video_driver()

- # work around pyqt loading wrong GL library
- if is_lin:
- import ctypes
-
- ctypes.CDLL("libGL.so.1", ctypes.RTLD_GLOBAL)
-
# catch opengl errors
def msgHandler(category: Any, ctx: Any, msg: Any) -> None:
if category == QtMsgType.QtDebugMsg:
13 changes: 13 additions & 0 deletions pkgs/games/anki/patches/no-update-check.patch
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
diff --git a/qt/aqt/main.py b/qt/aqt/main.py
index 0f2764f66..c42a88402 100644
--- a/qt/aqt/main.py
+++ b/qt/aqt/main.py
@@ -1395,6 +1395,8 @@ title="{}" {}>{}</button>""".format(
##########################################################################

def setupAutoUpdate(self) -> None:
+ # nixpkgs patch; updates are managed by nix
+ return
import aqt.update

self.autoUpdate = aqt.update.LatestVersionFinder(self)
2 changes: 1 addition & 1 deletion pkgs/top-level/all-packages.nix
Original file line number Diff line number Diff line change
Expand Up @@ -35572,7 +35572,7 @@ with pkgs;

angband = callPackage ../games/angband { };

anki = python39Packages.callPackage ../games/anki {
anki = callPackage ../games/anki {
inherit (darwin.apple_sdk.frameworks) CoreAudio;
};
anki-bin = callPackage ../games/anki/bin.nix { buildFHSUserEnv = buildFHSUserEnvBubblewrap; };
Expand Down

0 comments on commit 8d22773

Please sign in to comment.