guix_mirror_bot pushed a commit to branch python-team
in repository guix.

commit a84cbdfd2c78a60091b8cd9b277b5ae6e3e0eeb3
Author: Nicolas Graves <[email protected]>
AuthorDate: Wed Jan 28 10:03:21 2026 +0100

    gnu: confy: Switch to pyproject.
    
    * gnu/packages/gnome.scm (confy):
    [arguments]<#:imported-modules, #:modules, #:phases>: Switch to
    pyproject-build-system.
    <#:phases>: Remove phase 'patch-for-compatibility.
    
    Change-Id: Idd48f3e14702f09070a7340e05a0ea1eec5a6608
    Signed-off-by: Sharlatan Hellseher <[email protected]>
---
 gnu/packages/gnome.scm | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 1807bd1faf..b2e96a38d0 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -14241,10 +14241,10 @@ Protocol} for @acronym{VoIP, Voice over @acronym{IP, 
Internet Protocol}}.")
     (build-system meson-build-system)
     (arguments
      (list #:glib-or-gtk? #t
-           #:imported-modules `(,@%meson-build-system-modules
-                                (guix build python-build-system))
+           #:imported-modules (append %meson-build-system-modules
+                                      %pyproject-build-system-modules)
            #:modules '((guix build meson-build-system)
-                       ((guix build python-build-system) #:prefix python:)
+                       ((guix build pyproject-build-system) #:prefix py:)
                        (guix build utils))
            #:phases
            #~(modify-phases %standard-phases
@@ -14255,17 +14255,12 @@ Protocol} for @acronym{VoIP, Voice over @acronym{IP, 
Internet Protocol}}.")
                       "gtk_update_icon_cache: false")
                      (("update_desktop_database: true")
                       "update_desktop_database: false"))))
-               (add-after 'unpack 'patch-for-compatibility
-                 (lambda _
-                   ;; TODO: Remove when Python is updated to >= 3.11.
-                   (substitute* (find-files "." "\\.py$")
-                     (("import Self") "import Any as Self"))))
                (add-after 'glib-or-gtk-wrap 'python-and-gi-wrap
                  (lambda* (#:key inputs outputs #:allow-other-keys)
                    (wrap-program (search-input-file outputs "bin/confy")
                      `("GUIX_PYTHONPATH" =
                        (,(getenv "GUIX_PYTHONPATH")
-                        ,(python:site-packages inputs outputs)))
+                        ,(py:site-packages inputs outputs)))
                      `("GI_TYPELIB_PATH" = (,(getenv "GI_TYPELIB_PATH")))))))))
     (inputs (list gtk
                   libadwaita

Reply via email to