From 394d782997368c85042f944bd49c8fc6d65500f1 Mon Sep 17 00:00:00 2001 From: Nicolas Graves Date: Sat, 6 Sep 2025 19:51:51 +0200 Subject: [PATCH] gnu: sugar-turtlepond-activity: Switch to pyproject. * gnu/packages/sugar.scm (sugar-turtlepond-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: I0c4ede5e6c0f7935fb92331a2f6f4c711eceaac8 Signed-off-by: Sharlatan Hellseher --- gnu/packages/sugar.scm | 30 ++++++++++++++++-------------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/gnu/packages/sugar.scm b/gnu/packages/sugar.scm index a714218670fe24b33ea52bb041267b92e116dec2..f823f37f55bfd482fd2bd108c09a645a92b1d7d3 100644 --- a/gnu/packages/sugar.scm +++ b/gnu/packages/sugar.scm @@ -1324,19 +1324,20 @@ more adventurous student.") (package (name "sugar-turtlepond-activity") (version (git-version "10" revision commit)) - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/sugarlabs/turtlepond") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "0j7jzbwi2aph312f5dazmwgxqzh458b4yzz8mvrdxpr91ksxd4h4")))) - (build-system python-build-system) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/sugarlabs/turtlepond") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0j7jzbwi2aph312f5dazmwgxqzh458b4yzz8mvrdxpr91ksxd4h4")))) + (build-system pyproject-build-system) (arguments (list - #:test-target "check" + #:test-flags + #~(list "check") #:phases #~(modify-phases %standard-phases (add-after 'unpack 'patch-launcher @@ -1344,7 +1345,8 @@ more adventurous student.") (substitute* "activity/activity.info" (("exec = sugar-activity3") (string-append "exec = " - (search-input-file inputs "/bin/sugar-activity3")))))) + (search-input-file inputs + "/bin/sugar-activity3")))))) #; (add-after 'unpack 'inject-load-path (lambda _ @@ -1359,6 +1361,7 @@ for directory in \"" (getenv "GUIX_PYTHONPATH") "\".split(\":\"): sys.path.insert(1, directory) import logging "))))) + (delete 'build) (replace 'install (lambda _ (setenv "HOME" "/tmp") @@ -1372,8 +1375,7 @@ import logging 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/turtlepond") (synopsis "Turtle-based strategy game") (description "Turtle in a Pond is a strategy game. The goal is to