From 22c6524f5c36ebc3cad765bf64d04088a2b81824 Mon Sep 17 00:00:00 2001 From: Nicolas Graves Date: Sat, 6 Sep 2025 19:40:26 +0200 Subject: [PATCH] gnu: sugar-physics-activity: Switch to pyproject. * gnu/packages/sugar.scm (sugar-physics-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: I11b9a810fa3ef12f62e8623201315990a912cfcf Signed-off-by: Sharlatan Hellseher --- gnu/packages/sugar.scm | 48 +++++++++++++++++++++--------------------- 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/gnu/packages/sugar.scm b/gnu/packages/sugar.scm index 4caf887617debbc20ee5b7fb287043096732f053..7d0c2e6b8d7a7617c2eb128d65e9e89b760fae22 100644 --- a/gnu/packages/sugar.scm +++ b/gnu/packages/sugar.scm @@ -958,19 +958,20 @@ or you can also play with a friend!") (package (name "sugar-physics-activity") (version (git-version "35" revision commit)) - (source (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/sugarlabs/physics") - (commit commit))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "0yzq4cbgcngf1ayi4bsn04l3mz6pnayd6db9bv0v9xfrpjmffvyk")))) - (build-system python-build-system) + (source + (origin + (method git-fetch) + (uri (git-reference + (url "https://github.com/sugarlabs/physics") + (commit commit))) + (file-name (git-file-name name version)) + (sha256 + (base32 "0yzq4cbgcngf1ayi4bsn04l3mz6pnayd6db9bv0v9xfrpjmffvyk")))) + (build-system pyproject-build-system) (arguments (list - #:test-target "check" + #:test-flags + #~(list "check") #:phases #~(modify-phases %standard-phases (add-after 'unpack 'patch-launcher @@ -978,7 +979,8 @@ or you can also play with a friend!") (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" @@ -991,26 +993,24 @@ for directory in \"" (getenv "GUIX_PYTHONPATH") "\".split(\":\"): except ValueError: sys.path.insert(1, directory) "))))) + (delete 'build) (replace 'install (lambda _ (setenv "HOME" "/tmp") (invoke "python" "setup.py" "install" (string-append "--prefix=" #$output))))))) + (native-inputs (list python-setuptools-next)) ;; All these libraries are accessed via gobject introspection. - (propagated-inputs - (list gtk+ - gdk-pixbuf)) - (inputs - (list python-pybox2d - python-pygame - sugar-toolkit-gtk3 - gettext-minimal)) + (propagated-inputs (list gtk+ gdk-pixbuf)) + (inputs (list python-pybox2d python-pygame sugar-toolkit-gtk3 + gettext-minimal)) (home-page "https://github.com/sugarlabs/physics") (synopsis "Physical world simulator and playground") - (description "Physics is a physical world simulator and playground---you -can add squares, circles, triangles, or draw your own shapes, and see them -come to life with forces (think gravity, Newton!), friction (scrrrrape), and -inertia (ahh, slow down!).") + (description + "Physics is a physical world simulator and playground---you can add +squares, circles, triangles, or draw your own shapes, and see them come to +life with forces (think gravity, Newton!), friction (scrrrrape), and inertia +(ahh, slow down!).") (license license:gpl3+)))) (define-public sugar-portfolio-activity