diff options
| author | Sharlatan Hellseher <sharlatanus@gmail.com> | 2026-03-25 23:28:19 +0000 |
|---|---|---|
| committer | Sharlatan Hellseher <sharlatanus@gmail.com> | 2026-05-24 10:14:45 +0100 |
| commit | 8b91d18c5a1d8da267fee04a3ee15863fa9874a9 (patch) | |
| tree | e467a646d8b2dcdd365c37839d64b7bac109d556 | |
| parent | f61830339cd3ec25cc45605dcce668bf9bbee71f (diff) | |
gnu: packages: Remove python-build-system comments.
Rephrase or remove comments completely mentioning python-build-system to
prepare it for depreciation. It helps to search code for the rest
relevant entries of python-build-system.
Change-Id: I98ee81b4b0e0f826fd236fec20e77546e1567f80
| -rw-r--r-- | gnu/packages/build-tools.scm | 5 | ||||
| -rw-r--r-- | gnu/packages/documentation.scm | 5 | ||||
| -rw-r--r-- | gnu/packages/mail.scm | 2 | ||||
| -rw-r--r-- | gnu/packages/mpd.scm | 1 | ||||
| -rw-r--r-- | gnu/packages/python-build.scm | 6 | ||||
| -rw-r--r-- | gnu/packages/python-xyz.scm | 1 | ||||
| -rw-r--r-- | gnu/packages/selinux.scm | 1 | ||||
| -rw-r--r-- | gnu/packages/virtualization.scm | 27 | ||||
| -rw-r--r-- | gnu/packages/xml.scm | 5 |
9 files changed, 21 insertions, 32 deletions
diff --git a/gnu/packages/build-tools.scm b/gnu/packages/build-tools.scm index a4e38e58698..5b924de56a5 100644 --- a/gnu/packages/build-tools.scm +++ b/gnu/packages/build-tools.scm | |||
| @@ -432,9 +432,8 @@ files and generates build instructions for the Ninja build system.") | |||
| 432 | (arguments | 432 | (arguments |
| 433 | (list | 433 | (list |
| 434 | #:tests? #f ;disabled to avoid extra dependencies | 434 | #:tests? #f ;disabled to avoid extra dependencies |
| 435 | ;; Essentially a lighter copy of the former python-build-system. | 435 | ;; Custom build steps to prevent using pyproject-build-system which |
| 436 | ;; Using it rather than pyproject-build-system allows to edit the latter | 436 | ;; allows to edit the latter without a C++ world rebuild. |
| 437 | ;; without a C++ world rebuild. | ||
| 438 | #:phases | 437 | #:phases |
| 439 | #~(modify-phases %standard-phases | 438 | #~(modify-phases %standard-phases |
| 440 | (delete 'bootstrap) | 439 | (delete 'bootstrap) |
diff --git a/gnu/packages/documentation.scm b/gnu/packages/documentation.scm index be0342b61f3..118c98af938 100644 --- a/gnu/packages/documentation.scm +++ b/gnu/packages/documentation.scm | |||
| @@ -490,9 +490,8 @@ inspired by Dash.") | |||
| 490 | (build-system gnu-build-system) | 490 | (build-system gnu-build-system) |
| 491 | (arguments | 491 | (arguments |
| 492 | (list | 492 | (list |
| 493 | ;; Essentially a lighter copy of the former python-build-system. | 493 | ;; Custom build steps to prevent using pyproject-build-system which |
| 494 | ;; Using it rather than pyproject-build-system allows to edit the latter | 494 | ;; allows to edit the latter without a texlive + haskell world rebuild. |
| 495 | ;; without a texlive + haskell world rebuild. | ||
| 496 | #:phases | 495 | #:phases |
| 497 | #~(modify-phases %standard-phases | 496 | #~(modify-phases %standard-phases |
| 498 | (delete 'bootstrap) | 497 | (delete 'bootstrap) |
diff --git a/gnu/packages/mail.scm b/gnu/packages/mail.scm index f9afc6e5d54..1a1369fc3c2 100644 --- a/gnu/packages/mail.scm +++ b/gnu/packages/mail.scm | |||
| @@ -1736,8 +1736,6 @@ and search library.") | |||
| 1736 | ;; tree, so chdir into it before building. | 1736 | ;; tree, so chdir into it before building. |
| 1737 | (add-after 'unpack 'enter-python-dir | 1737 | (add-after 'unpack 'enter-python-dir |
| 1738 | (lambda _ (chdir "bindings/python-cffi"))) | 1738 | (lambda _ (chdir "bindings/python-cffi"))) |
| 1739 | ;; python-build-system does not invoke the configure script | ||
| 1740 | ;; so _notmuch_config.py is missing | ||
| 1741 | (add-after 'enter-python-dir 'create-notmuch-config | 1739 | (add-after 'enter-python-dir 'create-notmuch-config |
| 1742 | (lambda* (#:key inputs #:allow-other-keys) | 1740 | (lambda* (#:key inputs #:allow-other-keys) |
| 1743 | (with-output-to-file "_notmuch_config.py" | 1741 | (with-output-to-file "_notmuch_config.py" |
diff --git a/gnu/packages/mpd.scm b/gnu/packages/mpd.scm index cdae880366d..6c8fc1adbf2 100644 --- a/gnu/packages/mpd.scm +++ b/gnu/packages/mpd.scm | |||
| @@ -503,7 +503,6 @@ other MPD frontends.") | |||
| 503 | (base32 | 503 | (base32 |
| 504 | "17ys8ccr3h6vix0agvhz859slz0phhk7lwqn5bg4az8s7zgqm3nm")))) | 504 | "17ys8ccr3h6vix0agvhz859slz0phhk7lwqn5bg4az8s7zgqm3nm")))) |
| 505 | (build-system gnu-build-system) | 505 | (build-system gnu-build-system) |
| 506 | ;; Manually wrap the binary, because we’re not using python-build-system. | ||
| 507 | (arguments | 506 | (arguments |
| 508 | (list | 507 | (list |
| 509 | #:phases | 508 | #:phases |
diff --git a/gnu/packages/python-build.scm b/gnu/packages/python-build.scm index 8a699b3db00..72e9645e732 100644 --- a/gnu/packages/python-build.scm +++ b/gnu/packages/python-build.scm | |||
| @@ -834,9 +834,9 @@ facilitate packaging Python projects, where packaging includes: | |||
| 834 | (arguments | 834 | (arguments |
| 835 | (list | 835 | (list |
| 836 | #:tests? #f ;disabled to avoid extra dependencies | 836 | #:tests? #f ;disabled to avoid extra dependencies |
| 837 | ;; Essentially a lighter copy of the former python-build-system. | 837 | ;; Custom build steps to prevent using pyproject-build-system which |
| 838 | ;; Using it rather than pyproject-build-system allows to edit the latter | 838 | ;; allows to edit the latter without a world rebuild (for the meson |
| 839 | ;; without a world rebuild (for the meson package in particular). | 839 | ;; package in particular). |
| 840 | #:phases | 840 | #:phases |
| 841 | #~(modify-phases %standard-phases | 841 | #~(modify-phases %standard-phases |
| 842 | (delete 'bootstrap) | 842 | (delete 'bootstrap) |
diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 64a01f98a41..27010f69c33 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm | |||
| @@ -5961,7 +5961,6 @@ Unicode-to-LaTeX conversion.") | |||
| 5961 | (sha256 | 5961 | (sha256 |
| 5962 | (base32 | 5962 | (base32 |
| 5963 | "03gyss1rhj4in7pgysg4q0hxp3230whinlpy1532ljs99lrx0ywx")))) | 5963 | "03gyss1rhj4in7pgysg4q0hxp3230whinlpy1532ljs99lrx0ywx")))) |
| 5964 | ;(build-system python-build-system) | ||
| 5965 | (arguments | 5964 | (arguments |
| 5966 | '(#:phases | 5965 | '(#:phases |
| 5967 | (modify-phases %standard-phases | 5966 | (modify-phases %standard-phases |
diff --git a/gnu/packages/selinux.scm b/gnu/packages/selinux.scm index 071b295e563..c33be69e9e9 100644 --- a/gnu/packages/selinux.scm +++ b/gnu/packages/selinux.scm | |||
| @@ -271,7 +271,6 @@ binary policies.") | |||
| 271 | (add-after 'enter-dir 'fix-target-path | 271 | (add-after 'enter-dir 'fix-target-path |
| 272 | (lambda* (#:key inputs #:allow-other-keys) | 272 | (lambda* (#:key inputs #:allow-other-keys) |
| 273 | (let ((get-python-version | 273 | (let ((get-python-version |
| 274 | ;; FIXME: copied from python-build-system | ||
| 275 | (lambda (python) | 274 | (lambda (python) |
| 276 | (let* ((version (last (string-split python #\-))) | 275 | (let* ((version (last (string-split python #\-))) |
| 277 | (components (string-split version #\.)) | 276 | (components (string-split version #\.)) |
diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm index 49a7b24fa44..90378b1b2e7 100644 --- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm | |||
| @@ -1033,21 +1033,18 @@ firmware blobs. You can | |||
| 1033 | ;; absolute file name, which is why we | 1033 | ;; absolute file name, which is why we |
| 1034 | ;; run everything through 'basename'. | 1034 | ;; run everything through 'basename'. |
| 1035 | (match (string-split line #\ ) | 1035 | (match (string-split line #\ ) |
| 1036 | ((commands ... prog) | 1036 | ((commands ... prog) |
| 1037 | (cons (basename prog) progs)))) | 1037 | (cons (basename prog) progs)))) |
| 1038 | (loop (read-line port) progs))))))))))) | 1038 | (loop (read-line port) progs))))))))))) |
| 1039 | ;; Wrap all executables with GUIX_PYTHONPATH. We can't borrow | 1039 | (add-after 'install 'wrap |
| 1040 | ;; the phase from python-build-system because we also need to wrap | 1040 | (lambda* (#:key inputs outputs #:allow-other-keys) |
| 1041 | ;; the scripts in $out/lib/ganeti such as "node-daemon-setup". | 1041 | (let* ((out (assoc-ref outputs "out")) |
| 1042 | (add-after 'install 'wrap | 1042 | (sbin (string-append out "/sbin")) |
| 1043 | (lambda* (#:key inputs outputs #:allow-other-keys) | 1043 | (lib (string-append out "/lib")) |
| 1044 | (let* ((out (assoc-ref outputs "out")) | 1044 | (PYTHONPATH (string-append (site-packages inputs outputs) |
| 1045 | (sbin (string-append out "/sbin")) | 1045 | ":" (getenv "GUIX_PYTHONPATH")))) |
| 1046 | (lib (string-append out "/lib")) | 1046 | (define (shell-script? file) |
| 1047 | (PYTHONPATH (string-append (site-packages inputs outputs) | 1047 | (call-with-ascii-input-file file |
| 1048 | ":" (getenv "GUIX_PYTHONPATH")))) | ||
| 1049 | (define (shell-script? file) | ||
| 1050 | (call-with-ascii-input-file file | ||
| 1051 | (lambda (port) | 1048 | (lambda (port) |
| 1052 | (let ((shebang (false-if-exception (read-line port)))) | 1049 | (let ((shebang (false-if-exception (read-line port)))) |
| 1053 | (and shebang | 1050 | (and shebang |
diff --git a/gnu/packages/xml.scm b/gnu/packages/xml.scm index 6a9f76fd2c9..c0935f7cea6 100644 --- a/gnu/packages/xml.scm +++ b/gnu/packages/xml.scm | |||
| @@ -1998,9 +1998,8 @@ libxml2 and libxslt.") | |||
| 1998 | (build-system gnu-build-system) | 1998 | (build-system gnu-build-system) |
| 1999 | (arguments | 1999 | (arguments |
| 2000 | (list | 2000 | (list |
| 2001 | ;; Essentially a lighter copy of the former python-build-system. | 2001 | ;; Custom build steps to prevent using pyproject-build-system which |
| 2002 | ;; Using it rather than pyproject-build-system allows to edit the latter | 2002 | ;; allows to edit the latter without a texlive + haskell world rebuild. |
| 2003 | ;; without a texlive + haskell world rebuild. | ||
| 2004 | #:test-target "test" | 2003 | #:test-target "test" |
| 2005 | #:phases | 2004 | #:phases |
| 2006 | #~(modify-phases %standard-phases | 2005 | #~(modify-phases %standard-phases |
