diff options
| author | Nicolas Graves <ngraves@ngraves.fr> | 2026-01-17 00:30:18 +0100 |
|---|---|---|
| committer | Andreas Enge <andreas@enge.fr> | 2026-02-07 12:28:18 +0100 |
| commit | 93b40d330fc313e398a1aef4d73ade83d47650ad (patch) | |
| tree | 90300785f269a9e5bab9e4a3b4cb6b9e85f20b39 /gnu | |
| parent | 29f2f54fe880f0610cbba7a7ca4661e0fd3f3e77 (diff) | |
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 <sharlatanus@gmail.com>
Diffstat (limited to 'gnu')
| -rw-r--r-- | gnu/packages/bioinformatics.scm | 6 | ||||
| -rw-r--r-- | gnu/packages/chemistry.scm | 9 | ||||
| -rw-r--r-- | gnu/packages/cinnamon.scm | 3 | ||||
| -rw-r--r-- | gnu/packages/cups.scm | 3 | ||||
| -rw-r--r-- | gnu/packages/djvu.scm | 3 | ||||
| -rw-r--r-- | gnu/packages/finance.scm | 3 | ||||
| -rw-r--r-- | gnu/packages/gnome.scm | 3 | ||||
| -rw-r--r-- | gnu/packages/image-processing.scm | 3 | ||||
| -rw-r--r-- | gnu/packages/machine-learning.scm | 12 | ||||
| -rw-r--r-- | gnu/packages/maths.scm | 9 | ||||
| -rw-r--r-- | gnu/packages/music.scm | 3 | ||||
| -rw-r--r-- | gnu/packages/photo.scm | 3 | ||||
| -rw-r--r-- | gnu/packages/python-science.scm | 3 | ||||
| -rw-r--r-- | gnu/packages/python-xyz.scm | 18 | ||||
| -rw-r--r-- | gnu/packages/rpm.scm | 3 | ||||
| -rw-r--r-- | gnu/packages/rust-apps.scm | 3 | ||||
| -rw-r--r-- | gnu/packages/sugar.scm | 6 | ||||
| -rw-r--r-- | gnu/packages/version-control.scm | 6 | ||||
| -rw-r--r-- | gnu/packages/vpn.scm | 3 |
19 files changed, 34 insertions, 68 deletions
diff --git a/gnu/packages/bioinformatics.scm b/gnu/packages/bioinformatics.scm index 4e670d1b73b..9c641c94e89 100644 --- a/gnu/packages/bioinformatics.scm +++ b/gnu/packages/bioinformatics.scm | |||
| @@ -2195,7 +2195,6 @@ Format (GFF) with Biopython integration.") | |||
| 2195 | (ice-9 match) | 2195 | (ice-9 match) |
| 2196 | (ice-9 rdelim)) | 2196 | (ice-9 rdelim)) |
| 2197 | #:phases | 2197 | #:phases |
| 2198 | (with-extensions (list (pyproject-guile-json)) | ||
| 2199 | #~(modify-phases %standard-phases | 2198 | #~(modify-phases %standard-phases |
| 2200 | (add-after 'configure 'set-data-path | 2199 | (add-after 'configure 'set-data-path |
| 2201 | (lambda _ | 2200 | (lambda _ |
| @@ -2290,7 +2289,7 @@ version = ~s | |||
| 2290 | (delete-file-recursively | 2289 | (delete-file-recursively |
| 2291 | (string-append site "/bed_reader/tests")) | 2290 | (string-append site "/bed_reader/tests")) |
| 2292 | (delete-file-recursively | 2291 | (delete-file-recursively |
| 2293 | (string-append #$output "/.pytest_cache")))))))))) | 2292 | (string-append #$output "/.pytest_cache"))))))))) |
| 2294 | (native-inputs (list python-pytest | 2293 | (native-inputs (list python-pytest |
| 2295 | python-pytest-cov | 2294 | python-pytest-cov |
| 2296 | python-pytest-datadir | 2295 | python-pytest-datadir |
| @@ -25484,7 +25483,6 @@ CSIv1, CSIv2 and FAI files.") | |||
| 25484 | ((guix build pyproject-build-system) #:prefix py:) | 25483 | ((guix build pyproject-build-system) #:prefix py:) |
| 25485 | (guix build utils)) | 25484 | (guix build utils)) |
| 25486 | #:phases | 25485 | #:phases |
| 25487 | (with-extensions (list (pyproject-guile-json)) | ||
| 25488 | #~(modify-phases %standard-phases | 25486 | #~(modify-phases %standard-phases |
| 25489 | (add-after 'install 'prepare-python-module | 25487 | (add-after 'install 'prepare-python-module |
| 25490 | (lambda _ | 25488 | (lambda _ |
| @@ -25540,7 +25538,7 @@ exclude = | |||
| 25540 | (when tests? | 25538 | (when tests? |
| 25541 | (invoke "pytest" "-vv" "tests" | 25539 | (invoke "pytest" "-vv" "tests" |
| 25542 | ;; These tests need access to the internet | 25540 | ;; These tests need access to the internet |
| 25543 | "-k" "not test_enrichr and not test_prerank")))))))) | 25541 | "-k" "not test_enrichr and not test_prerank"))))))) |
| 25544 | (inputs | 25542 | (inputs |
| 25545 | (cons python-wrapper (cargo-inputs 'python-gseapy))) | 25543 | (cons python-wrapper (cargo-inputs 'python-gseapy))) |
| 25546 | (native-inputs | 25544 | (native-inputs |
diff --git a/gnu/packages/chemistry.scm b/gnu/packages/chemistry.scm index dc2157022a5..280ff2ace12 100644 --- a/gnu/packages/chemistry.scm +++ b/gnu/packages/chemistry.scm | |||
| @@ -1062,7 +1062,6 @@ integrals for Gaussian type functions.") | |||
| 1062 | (string-append "-DPYTHON_INSTALL_DIR=" | 1062 | (string-append "-DPYTHON_INSTALL_DIR=" |
| 1063 | (site-packages %build-inputs %outputs))) | 1063 | (site-packages %build-inputs %outputs))) |
| 1064 | #:phases | 1064 | #:phases |
| 1065 | (with-extensions (list (pyproject-guile-json)) | ||
| 1066 | #~(modify-phases %standard-phases | 1065 | #~(modify-phases %standard-phases |
| 1067 | (add-after 'unpack 'patch-includes | 1066 | (add-after 'unpack 'patch-includes |
| 1068 | (lambda _ | 1067 | (lambda _ |
| @@ -1101,7 +1100,7 @@ integrals for Gaussian type functions.") | |||
| 1101 | (with-directory-excursion "../source" | 1100 | (with-directory-excursion "../source" |
| 1102 | (setenv "PYTHONPATH" "../build/py") | 1101 | (setenv "PYTHONPATH" "../build/py") |
| 1103 | (invoke "python3" "-m" "unittest" "discover" "-v" | 1102 | (invoke "python3" "-m" "unittest" "discover" "-v" |
| 1104 | "-s" "tests"))))))))) | 1103 | "-s" "tests")))))))) |
| 1105 | (inputs (list python zlib)) | 1104 | (inputs (list python zlib)) |
| 1106 | (native-inputs | 1105 | (native-inputs |
| 1107 | (list fast-float | 1106 | (list fast-float |
| @@ -1471,7 +1470,6 @@ and rendering molecules.") | |||
| 1471 | (guix build utils) | 1470 | (guix build utils) |
| 1472 | ((guix build pyproject-build-system) #:prefix py:)) | 1471 | ((guix build pyproject-build-system) #:prefix py:)) |
| 1473 | #:phases | 1472 | #:phases |
| 1474 | (with-extensions (list (pyproject-guile-json)) | ||
| 1475 | #~(modify-phases %standard-phases | 1473 | #~(modify-phases %standard-phases |
| 1476 | (add-before 'configure 'patch-cmake | 1474 | (add-before 'configure 'patch-cmake |
| 1477 | (lambda _ | 1475 | (lambda _ |
| @@ -1514,7 +1512,7 @@ and rendering molecules.") | |||
| 1514 | (add-after 'install 'check | 1512 | (add-after 'install 'check |
| 1515 | (assoc-ref %standard-phases 'check)) | 1513 | (assoc-ref %standard-phases 'check)) |
| 1516 | (add-before 'check 'add-install-to-pythonpath | 1514 | (add-before 'check 'add-install-to-pythonpath |
| 1517 | (assoc-ref py:%standard-phases 'add-install-to-pythonpath)))))) | 1515 | (assoc-ref py:%standard-phases 'add-install-to-pythonpath))))) |
| 1518 | (inputs (list python)) | 1516 | (inputs (list python)) |
| 1519 | (native-inputs (list doxygen python python-cython-0 python-sphinx)) | 1517 | (native-inputs (list doxygen python python-cython-0 python-sphinx)) |
| 1520 | (home-page "https://github.com/rareylab/RingDecomposerLib") | 1518 | (home-page "https://github.com/rareylab/RingDecomposerLib") |
| @@ -1632,7 +1630,6 @@ Tanimoto scoring.") | |||
| 1632 | "-DCMAKE_INCLUDE_PATH=" | 1630 | "-DCMAKE_INCLUDE_PATH=" |
| 1633 | (search-input-directory %build-inputs "/include/avalontoolkit"))) | 1631 | (search-input-directory %build-inputs "/include/avalontoolkit"))) |
| 1634 | #:phases | 1632 | #:phases |
| 1635 | (with-extensions (list (pyproject-guile-json)) | ||
| 1636 | #~(modify-phases %standard-phases | 1633 | #~(modify-phases %standard-phases |
| 1637 | (add-after 'unpack 'copy-external-dependencies | 1634 | (add-after 'unpack 'copy-external-dependencies |
| 1638 | (lambda _ | 1635 | (lambda _ |
| @@ -1692,7 +1689,7 @@ Tanimoto scoring.") | |||
| 1692 | ;; Circular import | 1689 | ;; Circular import |
| 1693 | "pythonSourceTests" | 1690 | "pythonSourceTests" |
| 1694 | ) "|") | 1691 | ) "|") |
| 1695 | ")")))))))))) | 1692 | ")"))))))))) |
| 1696 | (inputs | 1693 | (inputs |
| 1697 | (list avalon-toolkit | 1694 | (list avalon-toolkit |
| 1698 | cairo | 1695 | cairo |
diff --git a/gnu/packages/cinnamon.scm b/gnu/packages/cinnamon.scm index 608ce6be5fd..8a6f8a53c75 100644 --- a/gnu/packages/cinnamon.scm +++ b/gnu/packages/cinnamon.scm | |||
| @@ -82,7 +82,6 @@ | |||
| 82 | "-Dpy-overrides-dir=" | 82 | "-Dpy-overrides-dir=" |
| 83 | (py:site-packages %build-inputs %outputs) "/gi/overrides")) | 83 | (py:site-packages %build-inputs %outputs) "/gi/overrides")) |
| 84 | #:phases | 84 | #:phases |
| 85 | (with-extensions (list (pyproject-guile-json)) | ||
| 86 | #~(modify-phases %standard-phases | 85 | #~(modify-phases %standard-phases |
| 87 | (add-before 'configure 'set-gtk-module-path | 86 | (add-before 'configure 'set-gtk-module-path |
| 88 | (lambda* (#:key inputs outputs #:allow-other-keys) | 87 | (lambda* (#:key inputs outputs #:allow-other-keys) |
| @@ -102,7 +101,7 @@ | |||
| 102 | (string-quote (string-append #$output "/bin/pastebin"))) | 101 | (string-quote (string-append #$output "/bin/pastebin"))) |
| 103 | (("'xdg-open'") | 102 | (("'xdg-open'") |
| 104 | (string-quote (search-input-file inputs | 103 | (string-quote (search-input-file inputs |
| 105 | "/bin/xdg-open")))))))))) | 104 | "/bin/xdg-open"))))))))) |
| 106 | (inputs | 105 | (inputs |
| 107 | (list dbus | 106 | (list dbus |
| 108 | glib ; for gio | 107 | glib ; for gio |
diff --git a/gnu/packages/cups.scm b/gnu/packages/cups.scm index 5a0ec0d1b67..292f61c6de1 100644 --- a/gnu/packages/cups.scm +++ b/gnu/packages/cups.scm | |||
| @@ -647,7 +647,6 @@ should only be used as part of the Guix cups-pk-helper service.") | |||
| 647 | "--enable-qt5" | 647 | "--enable-qt5" |
| 648 | "--disable-qt4") | 648 | "--disable-qt4") |
| 649 | #:phases | 649 | #:phases |
| 650 | (with-extensions (list (pyproject-guile-json)) | ||
| 651 | #~(modify-phases %standard-phases | 650 | #~(modify-phases %standard-phases |
| 652 | (add-after 'unpack 'set-gcc-14-cflags | 651 | (add-after 'unpack 'set-gcc-14-cflags |
| 653 | ;; We set CFLAGS here because adding setting it in | 652 | ;; We set CFLAGS here because adding setting it in |
| @@ -743,7 +742,7 @@ should only be used as part of the Guix cups-pk-helper service.") | |||
| 743 | bin target))) | 742 | bin target))) |
| 744 | (chmod file #o755))) | 743 | (chmod file #o755))) |
| 745 | (find-files "." (lambda (file stat) | 744 | (find-files "." (lambda (file stat) |
| 746 | (eq? 'symlink (stat:type stat))))))))))))) | 745 | (eq? 'symlink (stat:type stat)))))))))))) |
| 747 | ;; Note that the error messages printed by the tools in the case of | 746 | ;; Note that the error messages printed by the tools in the case of |
| 748 | ;; missing dependencies are often downright misleading. | 747 | ;; missing dependencies are often downright misleading. |
| 749 | ;; TODO: hp-toolbox still fails to start with: | 748 | ;; TODO: hp-toolbox still fails to start with: |
diff --git a/gnu/packages/djvu.scm b/gnu/packages/djvu.scm index d5d2760f3fb..b6fdaa501a4 100644 --- a/gnu/packages/djvu.scm +++ b/gnu/packages/djvu.scm | |||
| @@ -386,7 +386,6 @@ and background layers of images, which can then be encoded into a DjVu file.") | |||
| 386 | ,@%pyproject-build-system-modules) | 386 | ,@%pyproject-build-system-modules) |
| 387 | #:test-target "test" | 387 | #:test-target "test" |
| 388 | #:phases | 388 | #:phases |
| 389 | (with-extensions (list (pyproject-guile-json)) | ||
| 390 | #~(modify-phases %standard-phases | 389 | #~(modify-phases %standard-phases |
| 391 | (delete 'configure) | 390 | (delete 'configure) |
| 392 | (add-after 'unpack 'fix-for-python-3.11 | 391 | (add-after 'unpack 'fix-for-python-3.11 |
| @@ -431,7 +430,7 @@ and background layers of images, which can then be encoded into a DjVu file.") | |||
| 431 | "/bin"))))) | 430 | "/bin"))))) |
| 432 | '("bin/djvu2hocr" | 431 | '("bin/djvu2hocr" |
| 433 | "bin/hocr2djvused" | 432 | "bin/hocr2djvused" |
| 434 | "bin/ocrodjvu")))))))) | 433 | "bin/ocrodjvu"))))))) |
| 435 | (native-inputs | 434 | (native-inputs |
| 436 | (list (libc-utf8-locales-for-target) libxml2 python-pynose python-pillow)) | 435 | (list (libc-utf8-locales-for-target) libxml2 python-pynose python-pillow)) |
| 437 | (inputs | 436 | (inputs |
diff --git a/gnu/packages/finance.scm b/gnu/packages/finance.scm index e3b9a7c6809..47389b1beb5 100644 --- a/gnu/packages/finance.scm +++ b/gnu/packages/finance.scm | |||
| @@ -767,7 +767,6 @@ other machines/servers. Electrum does not download the Bitcoin blockchain.") | |||
| 767 | (guix build qt-utils) | 767 | (guix build qt-utils) |
| 768 | (guix build utils)) | 768 | (guix build utils)) |
| 769 | #:phases | 769 | #:phases |
| 770 | (with-extensions (list (pyproject-guile-json)) | ||
| 771 | #~(modify-phases %standard-phases | 770 | #~(modify-phases %standard-phases |
| 772 | (add-after 'unpack 'create-output-directories | 771 | (add-after 'unpack 'create-output-directories |
| 773 | (lambda _ | 772 | (lambda _ |
| @@ -786,7 +785,7 @@ other machines/servers. Electrum does not download the Bitcoin blockchain.") | |||
| 786 | (add-after 'install 'wrap-qt | 785 | (add-after 'install 'wrap-qt |
| 787 | (lambda* (#:key inputs #:allow-other-keys) | 786 | (lambda* (#:key inputs #:allow-other-keys) |
| 788 | (wrap-qt-program "electron-cash" | 787 | (wrap-qt-program "electron-cash" |
| 789 | #:output #$output #:inputs inputs))))))) | 788 | #:output #$output #:inputs inputs)))))) |
| 790 | (native-inputs (list python-setuptools)) | 789 | (native-inputs (list python-setuptools)) |
| 791 | (inputs | 790 | (inputs |
| 792 | (list bash-minimal | 791 | (list bash-minimal |
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm index f0d9f71a4ca..3ee94093dfb 100644 --- a/gnu/packages/gnome.scm +++ b/gnu/packages/gnome.scm | |||
| @@ -12250,7 +12250,6 @@ advanced image management tool") | |||
| 12250 | #:prefix glib-or-gtk:) | 12250 | #:prefix glib-or-gtk:) |
| 12251 | (guix build utils)) | 12251 | (guix build utils)) |
| 12252 | #:phases | 12252 | #:phases |
| 12253 | (with-extensions (list (pyproject-guile-json)) | ||
| 12254 | #~(modify-phases %standard-phases | 12253 | #~(modify-phases %standard-phases |
| 12255 | (add-after 'unpack 'handle-dbus-python | 12254 | (add-after 'unpack 'handle-dbus-python |
| 12256 | (lambda _ | 12255 | (lambda _ |
| @@ -12268,7 +12267,7 @@ advanced image management tool") | |||
| 12268 | `("GI_TYPELIB_PATH" = | 12267 | `("GI_TYPELIB_PATH" = |
| 12269 | (,(getenv "GI_TYPELIB_PATH")))))) | 12268 | (,(getenv "GI_TYPELIB_PATH")))))) |
| 12270 | (add-after 'wrap 'glib-or-gtk-wrap | 12269 | (add-after 'wrap 'glib-or-gtk-wrap |
| 12271 | (assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-wrap)))))) | 12270 | (assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-wrap))))) |
| 12272 | (native-inputs | 12271 | (native-inputs |
| 12273 | (list gettext-minimal | 12272 | (list gettext-minimal |
| 12274 | `(,glib "bin") ;for glib-compile-resources | 12273 | `(,glib "bin") ;for glib-compile-resources |
diff --git a/gnu/packages/image-processing.scm b/gnu/packages/image-processing.scm index cbf5342c9b4..be822e76837 100644 --- a/gnu/packages/image-processing.scm +++ b/gnu/packages/image-processing.scm | |||
| @@ -1388,7 +1388,6 @@ libraries designed for computer vision research and implementation.") | |||
| 1388 | "-DBUILD_TESTING=OFF") | 1388 | "-DBUILD_TESTING=OFF") |
| 1389 | 1389 | ||
| 1390 | #:phases | 1390 | #:phases |
| 1391 | (with-extensions (list (pyproject-guile-json)) | ||
| 1392 | #~(modify-phases %standard-phases | 1391 | #~(modify-phases %standard-phases |
| 1393 | (add-after 'unpack 'do-not-tune | 1392 | (add-after 'unpack 'do-not-tune |
| 1394 | (lambda _ | 1393 | (lambda _ |
| @@ -1448,7 +1447,7 @@ libraries designed for computer vision research and implementation.") | |||
| 1448 | (lambda* (#:key inputs outputs tests? #:allow-other-keys) | 1447 | (lambda* (#:key inputs outputs tests? #:allow-other-keys) |
| 1449 | (when tests? | 1448 | (when tests? |
| 1450 | (py:add-installed-pythonpath inputs outputs) | 1449 | (py:add-installed-pythonpath inputs outputs) |
| 1451 | (invoke "python3" "-c" "import itk")))))))) | 1450 | (invoke "python3" "-c" "import itk"))))))) |
| 1452 | (inputs (list eigen | 1451 | (inputs (list eigen |
| 1453 | expat | 1452 | expat |
| 1454 | fftw | 1453 | fftw |
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.") | |||
| 2222 | ;; XXX: Fixes build with gcc@14. | 2222 | ;; XXX: Fixes build with gcc@14. |
| 2223 | "-DCMAKE_CXX_FLAGS=-Wl,-z,noexecstack") | 2223 | "-DCMAKE_CXX_FLAGS=-Wl,-z,noexecstack") |
| 2224 | #:phases | 2224 | #:phases |
| 2225 | (with-extensions (list (pyproject-guile-json)) | ||
| 2226 | #~(modify-phases %standard-phases | 2225 | #~(modify-phases %standard-phases |
| 2227 | (add-after 'unpack 'chdir | 2226 | (add-after 'unpack 'chdir |
| 2228 | (lambda _ | 2227 | (lambda _ |
| @@ -2285,7 +2284,7 @@ with a single function call.") | |||
| 2285 | ((assoc-ref py:%standard-phases 'sanity-check) | 2284 | ((assoc-ref py:%standard-phases 'sanity-check) |
| 2286 | #:inputs `(("sanity-check.py" . ,#$(default-sanity-check.py)) | 2285 | #:inputs `(("sanity-check.py" . ,#$(default-sanity-check.py)) |
| 2287 | ,@inputs) | 2286 | ,@inputs) |
| 2288 | #:outputs `(("out" . ,#$output:python))))))))) | 2287 | #:outputs `(("out" . ,#$output:python)))))))) |
| 2289 | (outputs (list "out" "python")) | 2288 | (outputs (list "out" "python")) |
| 2290 | (inputs | 2289 | (inputs |
| 2291 | (list abseil-cpp-20250127 | 2290 | (list abseil-cpp-20250127 |
| @@ -3682,7 +3681,6 @@ Python.") | |||
| 3682 | "-DFARMHASH_SOURCE_DIR=/tmp/farmhash" | 3681 | "-DFARMHASH_SOURCE_DIR=/tmp/farmhash" |
| 3683 | (string-append "-Dgemmlowp_ROOT=" #$(this-package-input "gemmlowp"))) | 3682 | (string-append "-Dgemmlowp_ROOT=" #$(this-package-input "gemmlowp"))) |
| 3684 | #:phases | 3683 | #:phases |
| 3685 | (with-extensions (list (pyproject-guile-json)) | ||
| 3686 | #~(modify-phases %standard-phases | 3684 | #~(modify-phases %standard-phases |
| 3687 | (add-after 'unpack 'chdir | 3685 | (add-after 'unpack 'chdir |
| 3688 | (lambda _ | 3686 | (lambda _ |
| @@ -3808,7 +3806,7 @@ find_library(ML_DTYPES_LIBRARIES | |||
| 3808 | ((assoc-ref py:%standard-phases 'sanity-check) | 3806 | ((assoc-ref py:%standard-phases 'sanity-check) |
| 3809 | #:inputs `(("sanity-check.py" . ,#$(default-sanity-check.py)) | 3807 | #:inputs `(("sanity-check.py" . ,#$(default-sanity-check.py)) |
| 3810 | ,@inputs) | 3808 | ,@inputs) |
| 3811 | #:outputs `(("out" . ,#$output:python))))))))) | 3809 | #:outputs `(("out" . ,#$output:python)))))))) |
| 3812 | (inputs | 3810 | (inputs |
| 3813 | (list abseil-cpp | 3811 | (list abseil-cpp |
| 3814 | cpuinfo | 3812 | cpuinfo |
| @@ -4714,7 +4712,6 @@ different backends") | |||
| 4714 | "LLAMA_PORTABLE=1" | 4712 | "LLAMA_PORTABLE=1" |
| 4715 | "LLAMA_USE_BUNDLED_GLSLC=0") ;; TODO: add CLBLAS | 4713 | "LLAMA_USE_BUNDLED_GLSLC=0") ;; TODO: add CLBLAS |
| 4716 | #:phases | 4714 | #:phases |
| 4717 | (with-extensions (list (pyproject-guile-json)) | ||
| 4718 | #~(modify-phases %standard-phases | 4715 | #~(modify-phases %standard-phases |
| 4719 | (delete 'configure) | 4716 | (delete 'configure) |
| 4720 | (replace 'install | 4717 | (replace 'install |
| @@ -4733,7 +4730,7 @@ different backends") | |||
| 4733 | (wrap-program (search-input-file outputs "bin/koboldcpp.py") | 4730 | (wrap-program (search-input-file outputs "bin/koboldcpp.py") |
| 4734 | `("GUIX_PYTHONPATH" = | 4731 | `("GUIX_PYTHONPATH" = |
| 4735 | (,(getenv "GUIX_PYTHONPATH") | 4732 | (,(getenv "GUIX_PYTHONPATH") |
| 4736 | ,(python:site-packages inputs outputs)))))))))) | 4733 | ,(python:site-packages inputs outputs))))))))) |
| 4737 | (inputs | 4734 | (inputs |
| 4738 | (list bash-minimal | 4735 | (list bash-minimal |
| 4739 | openblas | 4736 | openblas |
| @@ -6033,7 +6030,6 @@ definite approximations of Optimal Transport (Wasserstein) distances. | |||
| 6033 | ((guix build pyproject-build-system) #:prefix py:) | 6030 | ((guix build pyproject-build-system) #:prefix py:) |
| 6034 | (guix build utils)) | 6031 | (guix build utils)) |
| 6035 | #:phases | 6032 | #:phases |
| 6036 | (with-extensions (list (pyproject-guile-json)) | ||
| 6037 | #~(modify-phases %standard-phases | 6033 | #~(modify-phases %standard-phases |
| 6038 | (add-after 'check 'python-check | 6034 | (add-after 'check 'python-check |
| 6039 | (lambda _ | 6035 | (lambda _ |
| @@ -6057,7 +6053,7 @@ definite approximations of Optimal Transport (Wasserstein) distances. | |||
| 6057 | (copy-file "PKG-INFO" (string-append info "/METADATA")) | 6053 | (copy-file "PKG-INFO" (string-append info "/METADATA")) |
| 6058 | (copy-recursively | 6054 | (copy-recursively |
| 6059 | "py_src/tokenizers" | 6055 | "py_src/tokenizers" |
| 6060 | (string-append lib "tokenizers"))))))))) | 6056 | (string-append lib "tokenizers")))))))) |
| 6061 | (native-inputs | 6057 | (native-inputs |
| 6062 | (list pkg-config python-minimal python-pytest)) | 6058 | (list pkg-config python-minimal python-pytest)) |
| 6063 | (inputs | 6059 | (inputs |
diff --git a/gnu/packages/maths.scm b/gnu/packages/maths.scm index ca4713dfa7e..c231af8fd47 100644 --- a/gnu/packages/maths.scm +++ b/gnu/packages/maths.scm | |||
| @@ -3777,7 +3777,6 @@ supports the propositional fragment of PDDL2.2.") | |||
| 3777 | (guix build cmake-build-system) | 3777 | (guix build cmake-build-system) |
| 3778 | (guix build utils)) | 3778 | (guix build utils)) |
| 3779 | #:phases | 3779 | #:phases |
| 3780 | (with-extensions (list (pyproject-guile-json)) | ||
| 3781 | #~(modify-phases %standard-phases | 3780 | #~(modify-phases %standard-phases |
| 3782 | (add-after 'unpack 'patch-paths | 3781 | (add-after 'unpack 'patch-paths |
| 3783 | (lambda* (#:key inputs outputs #:allow-other-keys) | 3782 | (lambda* (#:key inputs outputs #:allow-other-keys) |
| @@ -3795,7 +3794,7 @@ supports the propositional fragment of PDDL2.2.") | |||
| 3795 | "/lib/libgmsh.so"))) | 3794 | "/lib/libgmsh.so"))) |
| 3796 | (substitute* "api/gmsh.py" | 3795 | (substitute* "api/gmsh.py" |
| 3797 | (("find_library\\(\"gmsh\"\\)") | 3796 | (("find_library\\(\"gmsh\"\\)") |
| 3798 | (simple-format #f "\"~a\"" libgmsh)))))))))) | 3797 | (simple-format #f "\"~a\"" libgmsh))))))))) |
| 3799 | (inputs | 3798 | (inputs |
| 3800 | (list fltk | 3799 | (list fltk |
| 3801 | fontconfig | 3800 | fontconfig |
| @@ -8670,7 +8669,6 @@ arrays, uninterpreted functions and their combinations.") | |||
| 8670 | #$(version-major+minor (package-version python-wrapper)) | 8669 | #$(version-major+minor (package-version python-wrapper)) |
| 8671 | "/site-packages")) | 8670 | "/site-packages")) |
| 8672 | #:phases | 8671 | #:phases |
| 8673 | (with-extensions (list (pyproject-guile-json)) | ||
| 8674 | #~(modify-phases %standard-phases | 8672 | #~(modify-phases %standard-phases |
| 8675 | (replace 'check | 8673 | (replace 'check |
| 8676 | (lambda* (#:key parallel-build? tests? #:allow-other-keys) | 8674 | (lambda* (#:key parallel-build? tests? #:allow-other-keys) |
| @@ -8690,7 +8688,7 @@ arrays, uninterpreted functions and their combinations.") | |||
| 8690 | "/z3/lib/libz3.so")) | 8688 | "/z3/lib/libz3.so")) |
| 8691 | (z3-lib (string-append #$output "/lib/libz3.so"))) | 8689 | (z3-lib (string-append #$output "/lib/libz3.so"))) |
| 8692 | (mkdir-p (dirname dest)) | 8690 | (mkdir-p (dirname dest)) |
| 8693 | (symlink z3-lib dest)))))))) | 8691 | (symlink z3-lib dest))))))) |
| 8694 | (native-inputs | 8692 | (native-inputs |
| 8695 | (list which python-wrapper)) | 8693 | (list which python-wrapper)) |
| 8696 | (synopsis "Theorem prover") | 8694 | (synopsis "Theorem prover") |
| @@ -10815,7 +10813,6 @@ when an application performs repeated divisions by the same divisor.") | |||
| 10815 | (guix build cmake-build-system) | 10813 | (guix build cmake-build-system) |
| 10816 | (guix build utils)) | 10814 | (guix build utils)) |
| 10817 | #:phases | 10815 | #:phases |
| 10818 | (with-extensions (list (pyproject-guile-json)) | ||
| 10819 | #~(modify-phases %standard-phases | 10816 | #~(modify-phases %standard-phases |
| 10820 | (add-after 'install 'move-python-files | 10817 | (add-after 'install 'move-python-files |
| 10821 | (lambda* (#:key inputs outputs #:allow-other-keys) | 10818 | (lambda* (#:key inputs outputs #:allow-other-keys) |
| @@ -10829,7 +10826,7 @@ when an application performs repeated divisions by the same divisor.") | |||
| 10829 | (rename-file file | 10826 | (rename-file file |
| 10830 | (string-append target "/" | 10827 | (string-append target "/" |
| 10831 | (basename file)))) | 10828 | (basename file)))) |
| 10832 | (find-files include "\\.py$"))))))))) | 10829 | (find-files include "\\.py$")))))))) |
| 10833 | (native-inputs (list python-wrapper)) | 10830 | (native-inputs (list python-wrapper)) |
| 10834 | (inputs (list psimd googletest-1.8 googlebenchmark)) | 10831 | (inputs (list psimd googletest-1.8 googlebenchmark)) |
| 10835 | (synopsis "C++ library for half-precision floating point formats") | 10832 | (synopsis "C++ library for half-precision floating point formats") |
diff --git a/gnu/packages/music.scm b/gnu/packages/music.scm index fa7829a4303..f22bc7c6f3d 100644 --- a/gnu/packages/music.scm +++ b/gnu/packages/music.scm | |||
| @@ -7812,7 +7812,6 @@ streaming audio server.") | |||
| 7812 | ((guix build glib-or-gtk-build-system) #:prefix glib-or-gtk:) | 7812 | ((guix build glib-or-gtk-build-system) #:prefix glib-or-gtk:) |
| 7813 | (guix build utils)) | 7813 | (guix build utils)) |
| 7814 | #:phases | 7814 | #:phases |
| 7815 | (with-extensions (list (pyproject-guile-json)) | ||
| 7816 | #~(modify-phases %standard-phases | 7815 | #~(modify-phases %standard-phases |
| 7817 | (add-before 'check 'pre-check | 7816 | (add-before 'check 'pre-check |
| 7818 | (lambda _ | 7817 | (lambda _ |
| @@ -7837,7 +7836,7 @@ streaming audio server.") | |||
| 7837 | `("GI_TYPELIB_PATH" ":" = (,gi-typelib-path)) | 7836 | `("GI_TYPELIB_PATH" ":" = (,gi-typelib-path)) |
| 7838 | `("GST_PLUGIN_SYSTEM_PATH" ":" suffix | 7837 | `("GST_PLUGIN_SYSTEM_PATH" ":" suffix |
| 7839 | (,gst-plugins-path)))) | 7838 | (,gst-plugins-path)))) |
| 7840 | '("exfalso" "operon" "quodlibet"))))))))) | 7839 | '("exfalso" "operon" "quodlibet")))))))) |
| 7841 | (native-inputs (list xvfb-run gettext-minimal python-pytest | 7840 | (native-inputs (list xvfb-run gettext-minimal python-pytest |
| 7842 | python-setuptools)) | 7841 | python-setuptools)) |
| 7843 | (inputs | 7842 | (inputs |
diff --git a/gnu/packages/photo.scm b/gnu/packages/photo.scm index cd8a256740c..2fb5d955f88 100644 --- a/gnu/packages/photo.scm +++ b/gnu/packages/photo.scm | |||
| @@ -549,7 +549,6 @@ scene to produce an image that looks much like a tone-mapped image.") | |||
| 549 | #~'("-DBUILD_FOR_SSE=OFF" "-DBUILD_FOR_SSE2=OFF")) | 549 | #~'("-DBUILD_FOR_SSE=OFF" "-DBUILD_FOR_SSE2=OFF")) |
| 550 | #:tests? #f ; There are no tests to run. | 550 | #:tests? #f ; There are no tests to run. |
| 551 | #:phases | 551 | #:phases |
| 552 | (with-extensions (list (pyproject-guile-json)) | ||
| 553 | #~(modify-phases %standard-phases | 552 | #~(modify-phases %standard-phases |
| 554 | (add-after 'unpack 'fix-egg | 553 | (add-after 'unpack 'fix-egg |
| 555 | (lambda _ | 554 | (lambda _ |
| @@ -565,7 +564,7 @@ scene to produce an image that looks much like a tone-mapped image.") | |||
| 565 | (,(getenv "GUIX_PYTHONPATH") | 564 | (,(getenv "GUIX_PYTHONPATH") |
| 566 | ,(py:site-packages inputs outputs))))) | 565 | ,(py:site-packages inputs outputs))))) |
| 567 | (list "bin/lensfun-update-data" | 566 | (list "bin/lensfun-update-data" |
| 568 | "bin/lensfun-add-adapter")))))))) | 567 | "bin/lensfun-add-adapter"))))))) |
| 569 | (native-inputs | 568 | (native-inputs |
| 570 | (list pkg-config)) | 569 | (list pkg-config)) |
| 571 | (inputs | 570 | (inputs |
diff --git a/gnu/packages/python-science.scm b/gnu/packages/python-science.scm index 38bfa7e3691..bae9dd1f7ac 100644 --- a/gnu/packages/python-science.scm +++ b/gnu/packages/python-science.scm | |||
| @@ -628,12 +628,11 @@ written in C.") | |||
| 628 | ((guix build pyproject-build-system) #:prefix py:) | 628 | ((guix build pyproject-build-system) #:prefix py:) |
| 629 | (guix build utils)) | 629 | (guix build utils)) |
| 630 | #:phases | 630 | #:phases |
| 631 | (with-extensions (list (pyproject-guile-json)) | ||
| 632 | #~(modify-phases %standard-phases | 631 | #~(modify-phases %standard-phases |
| 633 | (add-after 'build 'build-python-module | 632 | (add-after 'build 'build-python-module |
| 634 | (assoc-ref py:%standard-phases 'build)) | 633 | (assoc-ref py:%standard-phases 'build)) |
| 635 | (add-after 'build-python-module 'install-python-module | 634 | (add-after 'build-python-module 'install-python-module |
| 636 | (assoc-ref py:%standard-phases 'install)))) | 635 | (assoc-ref py:%standard-phases 'install))) |
| 637 | #:features '(list "python") | 636 | #:features '(list "python") |
| 638 | #:install-source? #false)) | 637 | #:install-source? #false)) |
| 639 | (inputs | 638 | (inputs |
diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index d482b9324c5..b6c9da56401 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm | |||
| @@ -6367,12 +6367,11 @@ help formatter.") | |||
| 6367 | ((guix build pyproject-build-system) #:prefix py:) | 6367 | ((guix build pyproject-build-system) #:prefix py:) |
| 6368 | (guix build utils)) | 6368 | (guix build utils)) |
| 6369 | #:phases | 6369 | #:phases |
| 6370 | (with-extensions (list (pyproject-guile-json)) | ||
| 6371 | #~(modify-phases %standard-phases | 6370 | #~(modify-phases %standard-phases |
| 6372 | (add-after 'build 'build-python-module | 6371 | (add-after 'build 'build-python-module |
| 6373 | (assoc-ref py:%standard-phases 'build)) | 6372 | (assoc-ref py:%standard-phases 'build)) |
| 6374 | (add-after 'build-python-module 'install-python-module | 6373 | (add-after 'build-python-module 'install-python-module |
| 6375 | (assoc-ref py:%standard-phases 'install)))) | 6374 | (assoc-ref py:%standard-phases 'install))) |
| 6376 | #:install-source? #false)) | 6375 | #:install-source? #false)) |
| 6377 | (inputs | 6376 | (inputs |
| 6378 | (cons maturin (cargo-inputs 'python-orjson))) | 6377 | (cons maturin (cargo-inputs 'python-orjson))) |
| @@ -22516,7 +22515,6 @@ members = [ | |||
| 22516 | ((guix build pyproject-build-system) #:prefix py:) | 22515 | ((guix build pyproject-build-system) #:prefix py:) |
| 22517 | (guix build utils)) | 22516 | (guix build utils)) |
| 22518 | #:phases | 22517 | #:phases |
| 22519 | (with-extensions (list (pyproject-guile-json)) | ||
| 22520 | #~(modify-phases %standard-phases | 22518 | #~(modify-phases %standard-phases |
| 22521 | (add-after 'unpack 'prepare-source | 22519 | (add-after 'unpack 'prepare-source |
| 22522 | (lambda _ | 22520 | (lambda _ |
| @@ -22541,7 +22539,7 @@ members = [ | |||
| 22541 | ;; #:test-flags '() | 22539 | ;; #:test-flags '() |
| 22542 | ;; args))) | 22540 | ;; args))) |
| 22543 | (replace 'install | 22541 | (replace 'install |
| 22544 | (assoc-ref py:%standard-phases 'install)))))) | 22542 | (assoc-ref py:%standard-phases 'install))))) |
| 22545 | (native-inputs | 22543 | (native-inputs |
| 22546 | (list python-minimal-wrapper | 22544 | (list python-minimal-wrapper |
| 22547 | python-hypothesmith | 22545 | python-hypothesmith |
| @@ -36162,12 +36160,11 @@ line by line or column by column or a combination of both.") | |||
| 36162 | ((guix build pyproject-build-system) #:prefix py:) | 36160 | ((guix build pyproject-build-system) #:prefix py:) |
| 36163 | (guix build utils)) | 36161 | (guix build utils)) |
| 36164 | #:phases | 36162 | #:phases |
| 36165 | (with-extensions (list (pyproject-guile-json)) | ||
| 36166 | #~(modify-phases %standard-phases | 36163 | #~(modify-phases %standard-phases |
| 36167 | (add-after 'build 'build-python-module | 36164 | (add-after 'build 'build-python-module |
| 36168 | (assoc-ref py:%standard-phases 'build)) | 36165 | (assoc-ref py:%standard-phases 'build)) |
| 36169 | (add-after 'build-python-module 'install-python-module | 36166 | (add-after 'build-python-module 'install-python-module |
| 36170 | (assoc-ref py:%standard-phases 'install)))) | 36167 | (assoc-ref py:%standard-phases 'install))) |
| 36171 | #:install-source? #false)) | 36168 | #:install-source? #false)) |
| 36172 | (inputs | 36169 | (inputs |
| 36173 | (cons maturin (cargo-inputs 'python-rpds-py))) | 36170 | (cons maturin (cargo-inputs 'python-rpds-py))) |
| @@ -37023,7 +37020,6 @@ functionality and customization to your projects with their own plugins.") | |||
| 37023 | ((guix build pyproject-build-system) #:prefix py:) | 37020 | ((guix build pyproject-build-system) #:prefix py:) |
| 37024 | (guix build utils)) | 37021 | (guix build utils)) |
| 37025 | #:phases | 37022 | #:phases |
| 37026 | (with-extensions (list (pyproject-guile-json)) | ||
| 37027 | #~(modify-phases %standard-phases | 37023 | #~(modify-phases %standard-phases |
| 37028 | (add-after 'build 'build-python-module | 37024 | (add-after 'build 'build-python-module |
| 37029 | (assoc-ref py:%standard-phases 'build)) | 37025 | (assoc-ref py:%standard-phases 'build)) |
| @@ -37032,10 +37028,9 @@ functionality and customization to your projects with their own plugins.") | |||
| 37032 | (add-after 'install-python-module 'add-install-to-pythonpath | 37028 | (add-after 'install-python-module 'add-install-to-pythonpath |
| 37033 | (assoc-ref py:%standard-phases 'add-install-to-pythonpath)) | 37029 | (assoc-ref py:%standard-phases 'add-install-to-pythonpath)) |
| 37034 | (add-after 'check 'check-python-module | 37030 | (add-after 'check 'check-python-module |
| 37035 | (lambda* (#:key tests? #:allow-other-keys) | 37031 | (lambda args |
| 37036 | (when tests? | ||
| 37037 | (with-directory-excursion #$output | 37032 | (with-directory-excursion #$output |
| 37038 | (invoke "pytest" "-vv"))))))) | 37033 | (apply (assoc-ref py:%standard-phases 'check) args))))) |
| 37039 | #:install-source? #false)) | 37034 | #:install-source? #false)) |
| 37040 | (native-inputs | 37035 | (native-inputs |
| 37041 | (list maturin | 37036 | (list maturin |
| @@ -38148,7 +38143,6 @@ to TIFF, BigTIFF, and ImageJ hyperstack compatible files.") | |||
| 38148 | ((guix build pyproject-build-system) #:prefix py:) | 38143 | ((guix build pyproject-build-system) #:prefix py:) |
| 38149 | (guix build utils)) | 38144 | (guix build utils)) |
| 38150 | #:phases | 38145 | #:phases |
| 38151 | (with-extensions (list (pyproject-guile-json)) | ||
| 38152 | #~(modify-phases %standard-phases | 38146 | #~(modify-phases %standard-phases |
| 38153 | (replace 'build | 38147 | (replace 'build |
| 38154 | (assoc-ref py:%standard-phases 'build)) | 38148 | (assoc-ref py:%standard-phases 'build)) |
| @@ -38162,7 +38156,7 @@ to TIFF, BigTIFF, and ImageJ hyperstack compatible files.") | |||
| 38162 | (assoc-ref py:%standard-phases 'create-entrypoints) | 38156 | (assoc-ref py:%standard-phases 'create-entrypoints) |
| 38163 | (assoc-ref py:%standard-phases 'compile-bytecode))) | 38157 | (assoc-ref py:%standard-phases 'compile-bytecode))) |
| 38164 | (replace 'install | 38158 | (replace 'install |
| 38165 | (assoc-ref py:%standard-phases 'install)))))) | 38159 | (assoc-ref py:%standard-phases 'install))))) |
| 38166 | (propagated-inputs (list python-regex python-requests)) | 38160 | (propagated-inputs (list python-regex python-requests)) |
| 38167 | (inputs (cargo-inputs 'python-tiktoken)) | 38161 | (inputs (cargo-inputs 'python-tiktoken)) |
| 38168 | (native-inputs | 38162 | (native-inputs |
diff --git a/gnu/packages/rpm.scm b/gnu/packages/rpm.scm index 23763726a8b..9f096eb7aeb 100644 --- a/gnu/packages/rpm.scm +++ b/gnu/packages/rpm.scm | |||
| @@ -160,7 +160,6 @@ information on multiple streams, default data and translations).") | |||
| 160 | ((guix build pyproject-build-system) #:prefix py:) | 160 | ((guix build pyproject-build-system) #:prefix py:) |
| 161 | (guix build utils)) | 161 | (guix build utils)) |
| 162 | #:phases | 162 | #:phases |
| 163 | (with-extensions (list (pyproject-guile-json)) | ||
| 164 | #~(modify-phases %standard-phases | 163 | #~(modify-phases %standard-phases |
| 165 | (add-after 'unpack 'fix-python-site-prefix | 164 | (add-after 'unpack 'fix-python-site-prefix |
| 166 | (lambda* (#:key inputs outputs #:allow-other-keys) | 165 | (lambda* (#:key inputs outputs #:allow-other-keys) |
| @@ -173,7 +172,7 @@ information on multiple streams, default data and translations).") | |||
| 173 | (substitute* "CMakeLists.txt" | 172 | (substitute* "CMakeLists.txt" |
| 174 | (("execute_process.*OUTPUT_VARIABLE BASHCOMP_DIR.*") | 173 | (("execute_process.*OUTPUT_VARIABLE BASHCOMP_DIR.*") |
| 175 | (format #f "set (BASHCOMP_DIR ~a\ | 174 | (format #f "set (BASHCOMP_DIR ~a\ |
| 176 | /share/bash-completion/completions)~%" #$output))))))))) | 175 | /share/bash-completion/completions)~%" #$output)))))))) |
| 177 | (native-inputs | 176 | (native-inputs |
| 178 | (list bash-completion pkg-config python)) | 177 | (list bash-completion pkg-config python)) |
| 179 | (inputs | 178 | (inputs |
diff --git a/gnu/packages/rust-apps.scm b/gnu/packages/rust-apps.scm index 9bfb6c979f4..40ad280299b 100644 --- a/gnu/packages/rust-apps.scm +++ b/gnu/packages/rust-apps.scm | |||
| @@ -1902,7 +1902,6 @@ specified image or color, easing the process of theme creation.") | |||
| 1902 | "--skip=metadata::test::test_merge_metadata_from_pyproject_toml_with_customized_python_source_dir" | 1902 | "--skip=metadata::test::test_merge_metadata_from_pyproject_toml_with_customized_python_source_dir" |
| 1903 | "--skip=pyproject_toml::tests::test_warn_missing_maturin_version") | 1903 | "--skip=pyproject_toml::tests::test_warn_missing_maturin_version") |
| 1904 | #:phases | 1904 | #:phases |
| 1905 | (with-extensions (list (pyproject-guile-json)) | ||
| 1906 | #~(modify-phases %standard-phases | 1905 | #~(modify-phases %standard-phases |
| 1907 | (add-after 'build 'build-python-module | 1906 | (add-after 'build 'build-python-module |
| 1908 | (lambda _ | 1907 | (lambda _ |
| @@ -1949,7 +1948,7 @@ specified image or color, easing the process of theme creation.") | |||
| 1949 | (mkdir-p (string-append share "/nushell/vendor/autoload")) | 1948 | (mkdir-p (string-append share "/nushell/vendor/autoload")) |
| 1950 | (with-output-to-file | 1949 | (with-output-to-file |
| 1951 | (string-append share "/nushell/vendor/autoload/maturin") | 1950 | (string-append share "/nushell/vendor/autoload/maturin") |
| 1952 | (lambda _ (invoke maturin "completions" "nushell")))))))))) | 1951 | (lambda _ (invoke maturin "completions" "nushell"))))))))) |
| 1953 | (propagated-inputs | 1952 | (propagated-inputs |
| 1954 | (list python-tomli)) | 1953 | (list python-tomli)) |
| 1955 | (inputs (cons bzip2 (cargo-inputs 'maturin))) | 1954 | (inputs (cons bzip2 (cargo-inputs 'maturin))) |
diff --git a/gnu/packages/sugar.scm b/gnu/packages/sugar.scm index 1cc24c77875..ee71193ca9a 100644 --- a/gnu/packages/sugar.scm +++ b/gnu/packages/sugar.scm | |||
| @@ -79,7 +79,6 @@ | |||
| 79 | `(((guix build pyproject-build-system) #:prefix py:) | 79 | `(((guix build pyproject-build-system) #:prefix py:) |
| 80 | ,@%glib-or-gtk-build-system-default-modules) | 80 | ,@%glib-or-gtk-build-system-default-modules) |
| 81 | #:phases | 81 | #:phases |
| 82 | (with-extensions (list (pyproject-guile-json)) | ||
| 83 | #~(modify-phases %standard-phases | 82 | #~(modify-phases %standard-phases |
| 84 | (add-after 'unpack 'patch-build-system | 83 | (add-after 'unpack 'patch-build-system |
| 85 | (lambda _ | 84 | (lambda _ |
| @@ -142,7 +141,7 @@ | |||
| 142 | ,(py:site-packages inputs outputs))) | 141 | ,(py:site-packages inputs outputs))) |
| 143 | `("GI_TYPELIB_PATH" prefix | 142 | `("GI_TYPELIB_PATH" prefix |
| 144 | (,(getenv "GI_TYPELIB_PATH"))))) | 143 | (,(getenv "GI_TYPELIB_PATH"))))) |
| 145 | (find-files (string-append #$output "/bin") "^sugar.*")))))))) | 144 | (find-files (string-append #$output "/bin") "^sugar.*"))))))) |
| 146 | (inputs | 145 | (inputs |
| 147 | (list bash-minimal | 146 | (list bash-minimal |
| 148 | ethtool | 147 | ethtool |
| @@ -257,7 +256,6 @@ activities and other Sugar components.") | |||
| 257 | `(((guix build pyproject-build-system) #:prefix py:) | 256 | `(((guix build pyproject-build-system) #:prefix py:) |
| 258 | ,@%glib-or-gtk-build-system-default-modules) | 257 | ,@%glib-or-gtk-build-system-default-modules) |
| 259 | #:phases | 258 | #:phases |
| 260 | (with-extensions (list (pyproject-guile-json)) | ||
| 261 | #~(modify-phases %standard-phases | 259 | #~(modify-phases %standard-phases |
| 262 | (add-after 'unpack 'patch-build-system | 260 | (add-after 'unpack 'patch-build-system |
| 263 | (lambda _ | 261 | (lambda _ |
| @@ -284,7 +282,7 @@ activities and other Sugar components.") | |||
| 284 | (list (search-input-file outputs "bin/copy-from-journal") | 282 | (list (search-input-file outputs "bin/copy-from-journal") |
| 285 | (search-input-file outputs "bin/copy-to-journal") | 283 | (search-input-file outputs "bin/copy-to-journal") |
| 286 | (search-input-file outputs | 284 | (search-input-file outputs |
| 287 | "bin/datastore-service"))))))))) | 285 | "bin/datastore-service")))))))) |
| 288 | (inputs | 286 | (inputs |
| 289 | (list bash-minimal | 287 | (list bash-minimal |
| 290 | coreutils | 288 | coreutils |
diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index 430136d535f..976df00ee89 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm | |||
| @@ -2719,7 +2719,6 @@ execution of any hook written in any language before every commit.") | |||
| 2719 | (guix build utils)) | 2719 | (guix build utils)) |
| 2720 | #:make-flags #~(list (string-append "PREFIX=" #$output)) | 2720 | #:make-flags #~(list (string-append "PREFIX=" #$output)) |
| 2721 | #:phases | 2721 | #:phases |
| 2722 | (with-extensions (list (pyproject-guile-json)) | ||
| 2723 | #~(modify-phases %standard-phases | 2722 | #~(modify-phases %standard-phases |
| 2724 | (delete 'configure) | 2723 | (delete 'configure) |
| 2725 | (add-after 'unpack 'patch-tests | 2724 | (add-after 'unpack 'patch-tests |
| @@ -2814,7 +2813,7 @@ execution of any hook written in any language before every commit.") | |||
| 2814 | ((assoc-ref py:%standard-phases 'sanity-check) | 2813 | ((assoc-ref py:%standard-phases 'sanity-check) |
| 2815 | #:inputs `(("sanity-check.py" . ,#$(default-sanity-check.py)) | 2814 | #:inputs `(("sanity-check.py" . ,#$(default-sanity-check.py)) |
| 2816 | ,@inputs) | 2815 | ,@inputs) |
| 2817 | #:outputs outputs))))))) | 2816 | #:outputs outputs)))))) |
| 2818 | (native-inputs | 2817 | (native-inputs |
| 2819 | (list python-docutils | 2818 | (list python-docutils |
| 2820 | ;; The following inputs are only needed to run the tests. | 2819 | ;; The following inputs are only needed to run the tests. |
| @@ -2891,13 +2890,12 @@ history. It implements the changeset evolution concept for Mercurial.") | |||
| 2891 | #$(this-package-native-input "python")) | 2890 | #$(this-package-native-input "python")) |
| 2892 | "/site-packages/hgext3rd/commitsigs.py"))) | 2891 | "/site-packages/hgext3rd/commitsigs.py"))) |
| 2893 | #:phases | 2892 | #:phases |
| 2894 | (with-extensions (list (pyproject-guile-json)) | ||
| 2895 | #~(modify-phases %standard-phases | 2893 | #~(modify-phases %standard-phases |
| 2896 | (add-after 'unpack 'patch-paths | 2894 | (add-after 'unpack 'patch-paths |
| 2897 | (lambda _ | 2895 | (lambda _ |
| 2898 | (substitute* "commitsigs.py" | 2896 | (substitute* "commitsigs.py" |
| 2899 | (("b'(gpg|openssl)'," _ bin) | 2897 | (("b'(gpg|openssl)'," _ bin) |
| 2900 | (format #f "b'~a'," (which bin)))))))))) | 2898 | (format #f "b'~a'," (which bin))))))))) |
| 2901 | (native-inputs | 2899 | (native-inputs |
| 2902 | (list python)) | 2900 | (list python)) |
| 2903 | (inputs | 2901 | (inputs |
diff --git a/gnu/packages/vpn.scm b/gnu/packages/vpn.scm index 6ccb5fbfe8a..3359a1e6656 100644 --- a/gnu/packages/vpn.scm +++ b/gnu/packages/vpn.scm | |||
| @@ -1028,7 +1028,6 @@ packages.") | |||
| 1028 | ((guix build pyproject-build-system) #:prefix py:) | 1028 | ((guix build pyproject-build-system) #:prefix py:) |
| 1029 | (guix build utils)) | 1029 | (guix build utils)) |
| 1030 | #:phases | 1030 | #:phases |
| 1031 | (with-extensions (list (pyproject-guile-json)) | ||
| 1032 | #~(modify-phases %standard-phases | 1031 | #~(modify-phases %standard-phases |
| 1033 | (add-after 'unpack 'chdir | 1032 | (add-after 'unpack 'chdir |
| 1034 | (lambda _ | 1033 | (lambda _ |
| @@ -1088,7 +1087,7 @@ name = ~s~%" | |||
| 1088 | (lambda args | 1087 | (lambda args |
| 1089 | (chdir "..") | 1088 | (chdir "..") |
| 1090 | (apply (assoc-ref py:%standard-phases 'check) | 1089 | (apply (assoc-ref py:%standard-phases 'check) |
| 1091 | (cons* #:test-flags (list) args)))))))) | 1090 | (cons* #:test-flags (list) args))))))) |
| 1092 | (native-inputs | 1091 | (native-inputs |
| 1093 | (list python-flit-core | 1092 | (list python-flit-core |
| 1094 | python-pytest | 1093 | python-pytest |
