From 230847ceb228312768129309c8a4aa561480fd3d Mon Sep 17 00:00:00 2001 From: Nicolas Graves Date: Sat, 6 Sep 2025 19:13:07 +0200 Subject: [PATCH] gnu: sugar-cellgame-activity: Switch to pyproject. * gnu/packages/sugar.scm (sugar-cellgame-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: Iad29e208959fa4c0d04e90e6e631baad3456ed5c Signed-off-by: Sharlatan Hellseher --- gnu/packages/sugar.scm | 33 ++++++++++++++++----------------- 1 file changed, 16 insertions(+), 17 deletions(-) diff --git a/gnu/packages/sugar.scm b/gnu/packages/sugar.scm index 7ec36ccef3f154e6a76fe94e5b70d12379d06d60..a54111c9815ce1eabf97742e87786115495577d1 100644 --- a/gnu/packages/sugar.scm +++ b/gnu/packages/sugar.scm @@ -519,19 +519,19 @@ a Tetris-like game.") (package (name "sugar-cellgame-activity") (version (git-version "5" revision commit)) - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/sugarlabs/cellgame") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "09dxq06dr43i3g8im4j1xffl19rzr1pwbixwgb0kipnmbx8pln5c")))) - (build-system python-build-system) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/sugarlabs/cellgame") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "09dxq06dr43i3g8im4j1xffl19rzr1pwbixwgb0kipnmbx8pln5c")))) + (build-system pyproject-build-system) (arguments (list - #:test-target "check" + #:test-flags #~(list "check") #:phases #~(modify-phases %standard-phases (add-after 'unpack 'patch-launcher @@ -539,7 +539,8 @@ a Tetris-like game.") (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 _ (substitute* "activity.py" @@ -553,18 +554,16 @@ for directory in \"" (getenv "GUIX_PYTHONPATH") "\".split(\":\"): sys.path.insert(1, directory) import pygame "))))) + (delete 'build) (replace 'install (lambda _ (setenv "HOME" "/tmp") (invoke "python" "setup.py" "install" (string-append "--prefix=" #$output))))))) ;; All these libraries are accessed via gobject introspection. - (propagated-inputs - (list gtk+ - sugar-toolkit-gtk3)) + (propagated-inputs (list gtk+ sugar-toolkit-gtk3)) (inputs (list python-pygame)) - (native-inputs - (list gettext-minimal)) + (native-inputs (list gettext-minimal python-setuptools-next)) (home-page "https://github.com/sugarlabs/cellgame") (synopsis "Cell game for Sugar") (description "This game for the Sugar desktop is based on the mechanisms