From 93b40d330fc313e398a1aef4d73ade83d47650ad Mon Sep 17 00:00:00 2001 From: Nicolas Graves Date: Sat, 17 Jan 2026 00:30:18 +0100 Subject: build-system/pyproject: Remove uneeded use of pyproject-guile-json. * gnu/packages/bioinformatics.scm (python-bed-reader, python-gseapy) * gnu/packages/chemistry.scm (gemmi, ringdecomposerlib, rdkit) * gnu/packages/cinnamon.scm (libxapp) * gnu/packages/cups.scm (hplip) * gnu/packages/djvu.scm (ocrodjvu) * gnu/packages/finance.scm (electron-cash) * gnu/packages/gnome.scm (terminator) * gnu/packages/image-processing.scm (insight-toolkit) * gnu/packages/machine-learning.scm (onnxruntime, tensorflow-lite, koboldcpp, python-tokenizers) * gnu/packages/maths.scm (gmsh, z3, fp16) * gnu/packages/music.scm (quodlibet) * gnu/packages/photo.scm (lensfun) * gnu/packages/python-science.scm (python-clarabel) * gnu/packages/python-xyz.scm (python-orjson, python-libcst, python-rpds-py, python-streamtracer, python-tiktoken) * gnu/packages/rpm.scm (createrepo-c) * gnu/packages/rust-apps.scm (maturin) * gnu/packages/sugar.scm (sugar, sugar-datastore) * gnu/packages/version-control.scm (mercurial, hg-commitsigs) * gnu/packages/vpn.scm (python-proton-vpn-local-agent) [arguments]<#:phases>: Remove uneeded use of pyproject-guile-json extension. * gnu/packages/python-xyz.scm (python-streamtracer)[arguments] <#:phases>: Also rewrite 'check phase replacement. Change-Id: I779c354120ada3d94f07a127b9ec5011e73254c2 Signed-off-by: Sharlatan Hellseher --- gnu/packages/machine-learning.scm | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) (limited to 'gnu/packages/machine-learning.scm') diff --git a/gnu/packages/machine-learning.scm b/gnu/packages/machine-learning.scm index f9b3778c4f7..d9f4a921804 100644 --- a/gnu/packages/machine-learning.scm +++ b/gnu/packages/machine-learning.scm @@ -2222,7 +2222,6 @@ with a single function call.") ;; XXX: Fixes build with gcc@14. "-DCMAKE_CXX_FLAGS=-Wl,-z,noexecstack") #:phases - (with-extensions (list (pyproject-guile-json)) #~(modify-phases %standard-phases (add-after 'unpack 'chdir (lambda _ @@ -2285,7 +2284,7 @@ with a single function call.") ((assoc-ref py:%standard-phases 'sanity-check) #:inputs `(("sanity-check.py" . ,#$(default-sanity-check.py)) ,@inputs) - #:outputs `(("out" . ,#$output:python))))))))) + #:outputs `(("out" . ,#$output:python)))))))) (outputs (list "out" "python")) (inputs (list abseil-cpp-20250127 @@ -3682,7 +3681,6 @@ Python.") "-DFARMHASH_SOURCE_DIR=/tmp/farmhash" (string-append "-Dgemmlowp_ROOT=" #$(this-package-input "gemmlowp"))) #:phases - (with-extensions (list (pyproject-guile-json)) #~(modify-phases %standard-phases (add-after 'unpack 'chdir (lambda _ @@ -3808,7 +3806,7 @@ find_library(ML_DTYPES_LIBRARIES ((assoc-ref py:%standard-phases 'sanity-check) #:inputs `(("sanity-check.py" . ,#$(default-sanity-check.py)) ,@inputs) - #:outputs `(("out" . ,#$output:python))))))))) + #:outputs `(("out" . ,#$output:python)))))))) (inputs (list abseil-cpp cpuinfo @@ -4714,7 +4712,6 @@ different backends") "LLAMA_PORTABLE=1" "LLAMA_USE_BUNDLED_GLSLC=0") ;; TODO: add CLBLAS #:phases - (with-extensions (list (pyproject-guile-json)) #~(modify-phases %standard-phases (delete 'configure) (replace 'install @@ -4733,7 +4730,7 @@ different backends") (wrap-program (search-input-file outputs "bin/koboldcpp.py") `("GUIX_PYTHONPATH" = (,(getenv "GUIX_PYTHONPATH") - ,(python:site-packages inputs outputs)))))))))) + ,(python:site-packages inputs outputs))))))))) (inputs (list bash-minimal openblas @@ -6033,7 +6030,6 @@ definite approximations of Optimal Transport (Wasserstein) distances. ((guix build pyproject-build-system) #:prefix py:) (guix build utils)) #:phases - (with-extensions (list (pyproject-guile-json)) #~(modify-phases %standard-phases (add-after 'check 'python-check (lambda _ @@ -6057,7 +6053,7 @@ definite approximations of Optimal Transport (Wasserstein) distances. (copy-file "PKG-INFO" (string-append info "/METADATA")) (copy-recursively "py_src/tokenizers" - (string-append lib "tokenizers"))))))))) + (string-append lib "tokenizers")))))))) (native-inputs (list pkg-config python-minimal python-pytest)) (inputs -- cgit v1.3