diff options
| author | Nicolas Graves <ngraves@ngraves.fr> | 2026-03-24 13:13:39 +0100 |
|---|---|---|
| committer | Sharlatan Hellseher <sharlatanus@gmail.com> | 2026-05-24 10:14:45 +0100 |
| commit | 803e96bf55b9539c9b805b6709cdbfb32b164c27 (patch) | |
| tree | 60fe2f1dbe132e416eb7866384b77f6f0cd77900 /gnu/packages/version-control.scm | |
| parent | 8b91d18c5a1d8da267fee04a3ee15863fa9874a9 (diff) | |
guix: build-system: Set pypi-uri in pyproject, drop python module.
After this commit, when both modules are imported:
- if pyproject is imported before, the warning is 'pypi-uri' is
deprecated, use '(@ (guix build-system pyproject) pypi-uri)' instead
- if python is imported before, the warning is `pypi-uri' imported from
both (guix build-system python) and (guix build-system pyproject)
This seems convenient enough to warn for deprecation in the short term,
while avoiding any breaking changes.
* guix/build-system/pyproject.scm (pypi-uri): Move the procedure from
(guix build-system python) here.
* guix/build-system/python (pypi-uri): Drop definition, import it
from (guix build-system pyproject) and deprecate it.
* gnu/packages/openldap.scm: Reorder modules to get the right warning.
* gnu/packages/pypy.scm: Likewise.
* gnu/packages/*.scm : Drop module (guix build-system python).
* tests/import/pypi.scm: Likewise.
Merges: https://codeberg.org/guix/guix/pulls/7448
Change-Id: Ib42f53bc545052eb7918a25afe9db6d5fc2cb834
Reviewed-by: Nguyễn Gia Phong <cnx@loang.net>
Signed-off-by: Sharlatan Hellseher <sharlatanus@gmail.com>
Diffstat (limited to 'gnu/packages/version-control.scm')
| -rw-r--r-- | gnu/packages/version-control.scm | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/gnu/packages/version-control.scm b/gnu/packages/version-control.scm index 5b8aa5e1b93..314dd9d33de 100644 --- a/gnu/packages/version-control.scm +++ b/gnu/packages/version-control.scm | |||
| @@ -103,7 +103,6 @@ | |||
| 103 | #:use-module (guix build-system go) | 103 | #:use-module (guix build-system go) |
| 104 | #:use-module (guix build-system perl) | 104 | #:use-module (guix build-system perl) |
| 105 | #:use-module (guix build-system pyproject) | 105 | #:use-module (guix build-system pyproject) |
| 106 | #:use-module (guix build-system python) | ||
| 107 | #:use-module (guix build-system qt) | 106 | #:use-module (guix build-system qt) |
| 108 | #:use-module (guix build-system trivial) | 107 | #:use-module (guix build-system trivial) |
| 109 | #:use-module (gnu packages apr) | 108 | #:use-module (gnu packages apr) |