From 803e96bf55b9539c9b805b6709cdbfb32b164c27 Mon Sep 17 00:00:00 2001 From: Nicolas Graves Date: Tue, 24 Mar 2026 13:13:39 +0100 Subject: guix: build-system: Set pypi-uri in pyproject, drop python module. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Signed-off-by: Sharlatan Hellseher --- gnu/packages/ssh.scm | 1 - 1 file changed, 1 deletion(-) (limited to 'gnu/packages/ssh.scm') diff --git a/gnu/packages/ssh.scm b/gnu/packages/ssh.scm index 9b6e0eba8d3..4e26f1ee913 100644 --- a/gnu/packages/ssh.scm +++ b/gnu/packages/ssh.scm @@ -84,7 +84,6 @@ #:use-module (guix build-system cmake) #:use-module (guix build-system gnu) #:use-module (guix build-system go) - #:use-module (guix build-system python) #:use-module (guix build-system pyproject) #:use-module (guix download) #:use-module (guix git-download) -- cgit v1.2.3