sharlatan pushed a commit to branch master
in repository guix.
commit e844f7bdbca95657038b787b8cf18ac88f519ea1
Author: Sharlatan Hellseher <sharlata...@gmail.com>
AuthorDate: Tue May 6 22:49:41 2025 +0100
gnu: python-pivy: Move to python-graphics.
* gnu/packages/python-xyz.scm (python-pivy): Move from here ...
* gnu/packages/python-graphics.scm: ... to here.
* gnu/packages/engineering.scm: Add python-graphics module.
Change-Id: I3fd1d43f8c45229531ea82f294ee4eb8042d4f70
---
gnu/packages/engineering.scm | 1 +
gnu/packages/python-graphics.scm | 52 +++++++++++++++++++++++++++++++++++++++-
gnu/packages/python-xyz.scm | 42 --------------------------------
3 files changed, 52 insertions(+), 43 deletions(-)
diff --git a/gnu/packages/engineering.scm b/gnu/packages/engineering.scm
index a90347749c..6d2aa021bb 100644
--- a/gnu/packages/engineering.scm
+++ b/gnu/packages/engineering.scm
@@ -147,6 +147,7 @@
#:use-module (gnu packages python-check)
#:use-module (gnu packages python-compression)
#:use-module (gnu packages python-crypto)
+ #:use-module (gnu packages python-graphics)
#:use-module (gnu packages python-science)
#:use-module (gnu packages python-web)
#:use-module (gnu packages python-xyz)
diff --git a/gnu/packages/python-graphics.scm b/gnu/packages/python-graphics.scm
index d35beacf12..b3ea58a696 100644
--- a/gnu/packages/python-graphics.scm
+++ b/gnu/packages/python-graphics.scm
@@ -1,12 +1,15 @@
;;; 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 Ekaitz Zarraga <eka...@elenq.tech>
;;; 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 Marius Bakke <mar...@gnu.org>
;;; Copyright © 2022 Ryan Prior <rpr...@protonmail.com>
;;; Copyright © 2023 Adam Faiz <adam.f...@disroot.org>
;;; Copyright © 2023 Simon Tournier <zimon.touto...@gmail.com>
+;;; Copyright © 2024 Artyom V. Poptsov <poptsov.art...@gmail.com>
;;; Copyright © 2024-2025 Sharlatan Hellseher <sharlata...@gmail.com>
;;; Copyright © 2025 Sisiutl <sisi...@egregore.fun>
;;;
@@ -27,8 +30,8 @@
(define-module (gnu packages python-graphics)
#:use-module ((guix licenses) #:prefix license:)
- #:use-module ((guix build-system python) #:select (pypi-uri))
#:use-module (guix build-system pyproject)
+ #:use-module (guix build-system python)
#:use-module (guix download)
#:use-module (guix gexp)
#:use-module (guix git-download)
@@ -37,20 +40,25 @@
#:use-module (gnu packages audio)
#:use-module (gnu packages base)
#:use-module (gnu packages check)
+ #:use-module (gnu packages cmake)
#:use-module (gnu packages compression)
#:use-module (gnu packages fontutils)
#:use-module (gnu packages game-development)
#:use-module (gnu packages gl)
+ #:use-module (gnu packages graphics)
#: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)
#:use-module (gnu packages python-build)
#:use-module (gnu packages python-web)
#:use-module (gnu packages python-xyz)
+ #:use-module (gnu packages qt)
#:use-module (gnu packages sdl)
#:use-module (gnu packages simulation)
+ #:use-module (gnu packages swig)
#:use-module (gnu packages video)
#:use-module (gnu packages xorg))
@@ -339,6 +347,48 @@ multitouch applications.")
Design spec without sacrificing ease of use or application performance.")
(license license:expat)))
+(define-public python-pivy
+ (package
+ (name "python-pivy")
+ (version "0.6.8")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/coin3d/pivy";)
+ (commit version)))
+ (file-name (git-file-name name version))
+ (sha256
+ (base32 "00l4r06dwmgn8h29nrl3g3yv33cfyizyylk28x1j95qyj36sggfb"))))
+ (build-system python-build-system)
+ (arguments
+ (list
+ ;; The test suite fails due to an import cycle between 'pivy' and '_coin'
+ #:tests? #f
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'unpack 'patch-cmake-include-dirs
+ (lambda _
+ ;; Patch buildsystem to respect Coin3D include directory
+ (substitute* "CMakeLists.txt"
+ (("\\$\\{SoQt_INCLUDE_DIRS}")
+ "${Coin_INCLUDE_DIR};${SoQt_INCLUDE_DIRS}")))))))
+ (native-inputs
+ (list cmake swig))
+ (inputs
+ (list python-wrapper
+ qtbase-5
+ libxi
+ libice
+ glew
+ coin3d))
+ (home-page "https://github.com/coin3d/pivy";)
+ (synopsis "Python bindings to Coin3D")
+ (description
+ "Pivy provides python bindings for Coin, a 3D graphics library with an
+Application Programming Interface based on the Open Inventor 2.1 API.")
+ (license license:isc)))
+
(define-public python-pyglet
(package
(name "python-pyglet")
diff --git a/gnu/packages/python-xyz.scm b/gnu/packages/python-xyz.scm
index fc9295c2d9..06ba6ce754 100644
--- a/gnu/packages/python-xyz.scm
+++ b/gnu/packages/python-xyz.scm
@@ -35732,48 +35732,6 @@ implementations.")
used to retry a function a given number of times.")
(license license:asl2.0)))
-(define-public python-pivy
- (package
- (name "python-pivy")
- (version "0.6.8")
- (source
- (origin
- (method git-fetch)
- (uri (git-reference
- (url "https://github.com/coin3d/pivy";)
- (commit version)))
- (file-name (git-file-name name version))
- (sha256
- (base32 "00l4r06dwmgn8h29nrl3g3yv33cfyizyylk28x1j95qyj36sggfb"))))
- (build-system python-build-system)
- (arguments
- (list
- ;; The test suite fails due to an import cycle between 'pivy' and '_coin'
- #:tests? #f
- #:phases
- #~(modify-phases %standard-phases
- (add-after 'unpack 'patch-cmake-include-dirs
- (lambda _
- ;; Patch buildsystem to respect Coin3D include directory
- (substitute* "CMakeLists.txt"
- (("\\$\\{SoQt_INCLUDE_DIRS}")
- "${Coin_INCLUDE_DIR};${SoQt_INCLUDE_DIRS}")))))))
- (native-inputs
- (list cmake swig))
- (inputs
- (list python-wrapper
- qtbase-5
- libxi
- libice
- glew
- coin3d))
- (home-page "https://github.com/coin3d/pivy";)
- (synopsis "Python bindings to Coin3D")
- (description
- "Pivy provides python bindings for Coin, a 3D graphics library with an
-Application Programming Interface based on the Open Inventor 2.1 API.")
- (license license:isc)))
-
(define-public python-crayons
(package
(name "python-crayons")
