python3Packages.{devtools,gguf}: fix build (#380068)

NixOS · Feb 7, 2025 · 100314c · 100314c
2 parents ddd8141 + f21a0ce
commit 100314c
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 3 deletions.
diff --git 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 = [

diff --git 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/";