From 0f4bcfe32d3ec7df9e5b23131a2816d6ace0690c Mon Sep 17 00:00:00 2001 From: Nicolas Graves Date: Sat, 6 Sep 2025 18:56:49 +0200 Subject: [PATCH] gnu: sugar-block-party-activity: Switch to pyproject. * gnu/packages/sugar.scm (sugar-block-party-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: Ia48866d7fee34af55b1140deb90dad6163089033 Signed-off-by: Sharlatan Hellseher --- gnu/packages/sugar.scm | 29 +++++++++++++++++------------ 1 file changed, 17 insertions(+), 12 deletions(-) diff --git a/gnu/packages/sugar.scm b/gnu/packages/sugar.scm index c95f645212a220e74c86e72923996dabe10ec563..54e10e0bff1461fbb994d8bd39e400cde1c42f1d 100644 --- a/gnu/packages/sugar.scm +++ b/gnu/packages/sugar.scm @@ -35,6 +35,7 @@ #:use-module (gnu packages networking) #:use-module (gnu packages pkg-config) #:use-module (gnu packages python) + #:use-module (gnu packages python-build) #:use-module (gnu packages python-web) #:use-module (gnu packages python-xyz) #:use-module (gnu packages search) @@ -46,6 +47,7 @@ #:use-module (gnu packages xorg) #:use-module (guix build-system glib-or-gtk) #:use-module (guix build-system gnu) + #:use-module (guix build-system pyproject) #:use-module (guix build-system python) #:use-module (guix download) #:use-module (guix git-download) @@ -414,19 +416,19 @@ the Sugar Toolkit.") (package (name "sugar-block-party-activity") (version (git-version "12" revision commit)) - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/sugarlabs/block-party-activity") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "0zinqhwmvyvk1zvs28dr71p68vb6widn4v3zp35zlzj4ayyn5rvx")))) - (build-system python-build-system) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/sugarlabs/block-party-activity") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0zinqhwmvyvk1zvs28dr71p68vb6widn4v3zp35zlzj4ayyn5rvx")))) + (build-system pyproject-build-system) (arguments (list - #:test-target "check" + #:test-flags #~(list "check") #:phases #~(modify-phases %standard-phases (add-after 'unpack 'patch-launcher @@ -434,11 +436,14 @@ the Sugar Toolkit.") (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 python-setuptools-next)) (propagated-inputs (list gtk+ gstreamer