From ac99151705fc27eb4833600c603c922dde8ce6ce Mon Sep 17 00:00:00 2001 From: Nicolas Graves Date: Sat, 6 Sep 2025 19:45:48 +0200 Subject: [PATCH] gnu: sugar-terminal-activity: Switch to pyproject. * gnu/packages/sugar.scm (sugar-terminal-activity): Run guix style. [build-system]: Switch to pyproject-build-system. [arguments]: Replace <#:test-target> with <#:test-flags>. <#:phases>: Run guix style. Delete 'build phase. [native-inputs]: Add python-setuptools-next. Change-Id: Icd017bf1f7f420e78f0e304047da427f43c41894 Signed-off-by: Sharlatan Hellseher --- gnu/packages/sugar.scm | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/gnu/packages/sugar.scm b/gnu/packages/sugar.scm index 5fe117d3a174ecd237f7a65558e7f9b9778ed38c..615daeaaea22e397ed1f4fd37cbf2d0df63ef2c1 100644 --- a/gnu/packages/sugar.scm +++ b/gnu/packages/sugar.scm @@ -1185,19 +1185,20 @@ hesitate to feast on the goat.") (package (name "sugar-terminal-activity") (version (git-version "47" revision commit)) - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/sugarlabs/terminal-activity") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "11p7rrnlaw374h3qravhp915vdblvn07i2mnrzn7mhapkwvkg4h5")))) - (build-system python-build-system) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/sugarlabs/terminal-activity") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "11p7rrnlaw374h3qravhp915vdblvn07i2mnrzn7mhapkwvkg4h5")))) + (build-system pyproject-build-system) (arguments (list - #:test-target "check" + #:test-flags + #~(list "check") #:phases #~(modify-phases %standard-phases (add-after 'unpack 'patch-launcher @@ -1205,19 +1206,18 @@ hesitate to feast on the goat.") (substitute* "activity/activity.info" (("exec = sugar-activity3") (string-append "exec = " - (search-input-file inputs "/bin/sugar-activity3")))))) + (search-input-file inputs + "/bin/sugar-activity3")))))) + (delete 'build) (replace 'install (lambda _ (setenv "HOME" "/tmp") (invoke "python" "setup.py" "install" (string-append "--prefix=" #$output))))))) + (native-inputs (list python-setuptools-next)) ;; All these libraries are accessed via gobject introspection. - (propagated-inputs - (list gtk+ - vte/gtk+-3 - sugar-toolkit-gtk3)) - (inputs - (list gettext-minimal)) + (propagated-inputs (list gtk+ vte/gtk+-3 sugar-toolkit-gtk3)) + (inputs (list gettext-minimal)) (home-page "https://help.sugarlabs.org/terminal.html") (synopsis "Terminal activity for the Sugar learning environment") (description "Terminal is a full-screen text mode program that provides