From d8d2b8ba489b12077b42c8e7543be5ed6c67beec Mon Sep 17 00:00:00 2001 From: Nicolas Graves Date: Sat, 6 Sep 2025 19:18:11 +0200 Subject: [PATCH] gnu: sugar-classify-cats-activity: Switch to pyproject. * gnu/packages/sugar.scm (sugar-classify-cats-activity): [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: I94fae34ebc40c074a13927af5a0fc398c83f41ce Signed-off-by: Sharlatan Hellseher --- gnu/packages/sugar.scm | 29 +++++++++++++++-------------- 1 file changed, 15 insertions(+), 14 deletions(-) diff --git a/gnu/packages/sugar.scm b/gnu/packages/sugar.scm index 388acd001faa46917b90fbb9871ba8356eddcef9..944e662eb56cf25adb1861aa29cba89ab6650940 100644 --- a/gnu/packages/sugar.scm +++ b/gnu/packages/sugar.scm @@ -629,19 +629,19 @@ or classmates.") (package (name "sugar-classify-cats-activity") (version (git-version "2" revision commit)) - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/sugarlabs/classify-cats") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "101drh1dqgr9qsz3r1fzkcn5h6z720zskaqnz2aixzp2ybvh17wk")))) - (build-system python-build-system) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/sugarlabs/classify-cats") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "101drh1dqgr9qsz3r1fzkcn5h6z720zskaqnz2aixzp2ybvh17wk")))) + (build-system pyproject-build-system) (arguments (list - #:test-target "check" + #:test-flags #~(list "check") #:phases #~(modify-phases %standard-phases (add-after 'unpack 'patch-launcher @@ -649,7 +649,9 @@ or classmates.") (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") @@ -662,8 +664,7 @@ or classmates.") gtk+ python-pygobject sugar-toolkit-gtk3)) - (native-inputs - (list gettext-minimal)) + (native-inputs (list gettext-minimal python-setuptools-next)) (home-page "https://github.com/sugarlabs/classify-cats") (synopsis "Classify cats based on various criteria") (description "This is a Sugar activity where players classify cats based