sharlatan pushed a commit to branch master in repository guix. commit 1ed1b0d618383f229d767587a9bdf6f4c2ca943c Author: Sharlatan Hellseher <sharlata...@gmail.com> AuthorDate: Tue May 6 20:24:31 2025 +0100
gnu: python-kivy: Move to python-graphics. * gnu/packages/python-xyz.scm (python-kivy): Move from here ... * gnu/packages/python-graphics.scm: ... to here. Change-Id: If8fda7d519ad47a7c9a737405bb19454db0cde11 --- gnu/packages/python-graphics.scm | 58 ++++++++++++++++++++++++++++++++++++++++ gnu/packages/python-xyz.scm | 53 ------------------------------------ 2 files changed, 58 insertions(+), 53 deletions(-) diff --git a/gnu/packages/python-graphics.scm b/gnu/packages/python-graphics.scm index 9cbac06fdf..d35beacf12 100644 --- a/gnu/packages/python-graphics.scm +++ b/gnu/packages/python-graphics.scm @@ -1,6 +1,7 @@ ;;; GNU Guix --- Functional package management for GNU ;;; Copyright © 2020, 2023 Lars-Dominik Braun <l...@6xq.net> ;;; Copyright © 2021 Adam Kandur <kefironprem...@gmail.com> +;;; Copyright © 2021 Ludovic Courtès <l...@gnu.org> ;;; Copyright © 2021 Morgan Smith <morgan.j.sm...@outlook.com> ;;; Copyright © 2021, 2023 Daniel Meißner <daniel.meissner-...@ruhr-uni-bochum.de> ;;; Copyright © 2022 Ryan Prior <rpr...@protonmail.com> @@ -40,11 +41,15 @@ #:use-module (gnu packages fontutils) #:use-module (gnu packages game-development) #:use-module (gnu packages gl) + #:use-module (gnu packages gstreamer) #:use-module (gnu packages gtk) #:use-module (gnu packages maths) + #:use-module (gnu packages pkg-config) #:use-module (gnu packages pulseaudio) #:use-module (gnu packages python-build) + #:use-module (gnu packages python-web) #:use-module (gnu packages python-xyz) + #:use-module (gnu packages sdl) #:use-module (gnu packages simulation) #:use-module (gnu packages video) #:use-module (gnu packages xorg)) @@ -213,6 +218,59 @@ ModernGL on multiple platforms.") GLFW} OpenGL application development library.") (license license:expat))) +(define-public python-kivy + (package + (name "python-kivy") + (version "2.3.1") + (source + (origin + (method url-fetch) + (uri (pypi-uri "Kivy" version)) + (sha256 + (base32 "1ngrnkrp6xgfl4x32i2nv3bml13l8qwa87cwrymv9k826ng98cq8")))) + (build-system pyproject-build-system) + (arguments + `(#:tests? #f ; Tests require many optional packages + #:phases + (modify-phases %standard-phases + (add-after 'patch-generated-file-shebangs 'set-sdl-paths + (lambda* (#:key inputs #:allow-other-keys) + (setenv "KIVY_SDL2_PATH" + (search-input-directory inputs "/include/SDL2")))) + (add-before 'build 'set-home + (lambda _ + ;; 'kivy/__init__.py' wants to create $HOME/.kivy. + (setenv "HOME" (getcwd))))))) + (native-inputs + (list pkg-config + python-cython + ;; Not packaged yet, for tests. + ;; python-kivy-deps-glew + ;; python-kivy-deps-glew-dev + ;; python-kivy-deps-gstreamer + ;; python-kivy-deps-gstreamer-dev + ;; python-kivy-deps-sdl2 + ;; python-kivy-deps-sdl2-dev + python-packaging + python-setuptools + python-wheel)) + (inputs + (list gstreamer + mesa + (sdl-union (list sdl2 sdl2-image sdl2-mixer sdl2-ttf)))) + (propagated-inputs + (list python-docutils + python-filetype + python-kivy-garden + python-pygments + python-requests)) + (home-page "https://kivy.org") + (synopsis "Multitouch application framework") + (description + "Kivy is a software library for rapid development of hardware-accelerated +multitouch applications.") + (license license:expat))) + (define-public python-kivymd (package (name "python-kivymd") diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm index 00cd95fffc..fc9295c2d9 100644 --- a/gnu/packages/python-xyz.scm +++ b/gnu/packages/python-xyz.scm @@ -24618,59 +24618,6 @@ UE9 and U12 LabJack data acquisition (DAQ) modules.") for Kivy, the multitouch application platform.") (license license:expat))) -(define-public python-kivy - (package - (name "python-kivy") - (version "2.3.1") - (source - (origin - (method url-fetch) - (uri (pypi-uri "Kivy" version)) - (sha256 - (base32 "1ngrnkrp6xgfl4x32i2nv3bml13l8qwa87cwrymv9k826ng98cq8")))) - (build-system pyproject-build-system) - (arguments - `(#:tests? #f ; Tests require many optional packages - #:phases - (modify-phases %standard-phases - (add-after 'patch-generated-file-shebangs 'set-sdl-paths - (lambda* (#:key inputs #:allow-other-keys) - (setenv "KIVY_SDL2_PATH" - (search-input-directory inputs "/include/SDL2")))) - (add-before 'build 'set-home - (lambda _ - ;; 'kivy/__init__.py' wants to create $HOME/.kivy. - (setenv "HOME" (getcwd))))))) - (native-inputs - (list pkg-config - python-cython - ;; Not packaged yet, for tests. - ;; python-kivy-deps-glew - ;; python-kivy-deps-glew-dev - ;; python-kivy-deps-gstreamer - ;; python-kivy-deps-gstreamer-dev - ;; python-kivy-deps-sdl2 - ;; python-kivy-deps-sdl2-dev - python-packaging - python-setuptools - python-wheel)) - (inputs - (list gstreamer - mesa - (sdl-union (list sdl2 sdl2-image sdl2-mixer sdl2-ttf)))) - (propagated-inputs - (list python-docutils - python-filetype - python-kivy-garden - python-pygments - python-requests)) - (home-page "https://kivy.org") - (synopsis "Multitouch application framework") - (description - "Kivy is a software library for rapid development of hardware-accelerated -multitouch applications.") - (license license:expat))) - (define-public python-async-lru (package (name "python-async-lru")