From 468dbb51600b7eae629c18701b96626721297b9b Mon Sep 17 00:00:00 2001
From: Pavol Rusnak <pavol@rusnak.io>
Date: Fri, 7 Feb 2025 11:50:43 +0100
Subject: [PATCH 1/2] python3Packages.gguf: add sentencepiece dependency

---
 pkgs/development/python-modules/gguf/default.nix | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/pkgs/development/python-modules/gguf/default.nix b/pkgs/development/python-modules/gguf/default.nix
index fee4e6f1ecb69..5353a2b618f58 100644
--- a/pkgs/development/python-modules/gguf/default.nix
+++ b/pkgs/development/python-modules/gguf/default.nix
@@ -2,11 +2,12 @@
   lib,
   buildPythonPackage,
   fetchPypi,
+  pythonOlder,
   numpy,
   poetry-core,
-  pythonOlder,
-  tqdm,
   pyyaml,
+  sentencepiece,
+  tqdm,
 }:
 buildPythonPackage rec {
   pname = "gguf";
@@ -23,10 +24,13 @@ buildPythonPackage rec {
   dependencies = [
     numpy
     poetry-core
-    tqdm
     pyyaml
+    sentencepiece
+    tqdm
   ];
 
+  pythonImportsCheck = [ "gguf" ];
+
   meta = with lib; {
     description = "Module for writing binary files in the GGUF format";
     homepage = "https://ggml.ai/";

From f21a0ce4e03ea63dddb1fe86cdc425b0991b19ea Mon Sep 17 00:00:00 2001
From: Pavol Rusnak <pavol@rusnak.io>
Date: Fri, 7 Feb 2025 11:50:59 +0100
Subject: [PATCH 2/2] python3Packages.devtools: relax asttokens dependency

---
 pkgs/development/python-modules/devtools/default.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/pkgs/development/python-modules/devtools/default.nix b/pkgs/development/python-modules/devtools/default.nix
index f12e2916ad0fe..f9f97f51325cb 100644
--- a/pkgs/development/python-modules/devtools/default.nix
+++ b/pkgs/development/python-modules/devtools/default.nix
@@ -25,6 +25,11 @@ buildPythonPackage rec {
     hash = "sha256-1HFbNswdKa/9cQX0Gf6lLW1V5Kt/N4X6/5kQDdzp1Wo=";
   };
 
+  postPatch = ''
+    substituteInPlace pyproject.toml \
+      --replace-fail 'asttokens>=2.0.0,<3.0.0' 'asttokens>=2.0.0' \
+  '';
+
   nativeBuildInputs = [ hatchling ];
 
   propagatedBuildInputs = [
@@ -45,6 +50,7 @@ buildPythonPackage rec {
     "test_multiple_not_verbose"
     # Sensitive to interpreter output
     "test_simple"
+    "test_expr_render"
   ];
 
   disabledTestPaths = [