From ed95c695f794225351533037e9aa6ceb36acdae1 Mon Sep 17 00:00:00 2001 From: Nicolas Graves Date: Sat, 6 Sep 2025 19:53:22 +0200 Subject: [PATCH] gnu: sugar-typing-turtle-activity: Switch to pyproject. * gnu/packages/sugar.scm (sugar-typing-turtle-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: I56d679a6e4fbf50dc7e8587f090ba97994861401 Signed-off-by: Sharlatan Hellseher --- gnu/packages/sugar.scm | 39 +++++++++++++++++++++------------------ 1 file changed, 21 insertions(+), 18 deletions(-) diff --git a/gnu/packages/sugar.scm b/gnu/packages/sugar.scm index f823f37f55bfd482fd2bd108c09a645a92b1d7d3..b16c2cd7c8142888c5e0581d083e22b3d1632366 100644 --- a/gnu/packages/sugar.scm +++ b/gnu/packages/sugar.scm @@ -1386,19 +1386,20 @@ surround the turtle before it runs off the screen.") (package (name "sugar-typing-turtle-activity") (version "32") - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/sugarlabs/typing-turtle-activity") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "0shadv9wgddjvl97kvsqb8iw1wmmfw5lzcqk78hd70pzvh4c1hmd")))) - (build-system python-build-system) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/sugarlabs/typing-turtle-activity") + (commit (string-append "v" version)))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0shadv9wgddjvl97kvsqb8iw1wmmfw5lzcqk78hd70pzvh4c1hmd")))) + (build-system pyproject-build-system) (arguments (list - #:test-target "check" + #:test-flags + #~(list "check") #:phases #~(modify-phases %standard-phases (add-after 'unpack 'patch-reference-to-executables @@ -1411,20 +1412,22 @@ surround the turtle before it runs off the screen.") (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 _ (invoke "python" "setup.py" "install" (string-append "--prefix=" #$output))))))) (native-inputs - (list gettext-minimal sugar-toolkit-gtk3)) - (inputs - (list setxkbmap)) + (list gettext-minimal sugar-toolkit-gtk3 python-setuptools-next)) + (inputs (list setxkbmap)) (home-page "https://help.sugarlabs.org/en/typing_turtle.html") (synopsis "Learn typing") - (description "Need some help typing? In this activity for the Sugar -environment you will learn the best way to hold your hands in order for you to -become a faster typist.") + (description + "Need some help typing? In this activity for the Sugar environment you +will learn the best way to hold your hands in order for you to become a faster +typist.") (license license:gpl3+))) (define-public sugar-write-activity