it was merged!

2 files changed, 4 insertions, 86 deletions

diff --git a/sigils/packages/upstream.scm b/sigils/packages/upstream.scm
index 300a5ba..eab75fa 100644
--- a/sigils/packages/upstream.scm
+++ b/sigils/packages/upstream.scm
@@ -1,5 +1,5 @@
-;; These are all the packages that are already sent in the Guix upstream tree and waiting approval.
-;; It should take only the next 300 years to merge them all.
+;; These are all the packages that are already sent in the Guix upstream tree
+;; and waiting approval.
 
 (define-module (sigils packages upstream)
   #:use-module (guix packages)
@@ -28,17 +28,7 @@
   ;; mimeo
   #:use-module (guix build-system python)
   #:use-module (gnu packages file)
-  #:use-module (gnu packages freedesktop)
-  ;; sdbus
-  #:use-module (gnu packages glib)
-  ;; pyopengl
-  #:use-module (gnu packages gl)
-  #:use-module ((gnu packages python-xyz)
-                #:hide (python-pyopengl
-                        python-pyopengl-accelerate))
-  ;; udis86
-  #:use-module (gnu packages pkg-config)
-  #:use-module (gnu packages python))
+  #:use-module (gnu packages freedesktop))
 
 (define-public mimeo
   (package
@@ -124,73 +114,3 @@ information such as the command that it would use, the detected MIME-type, etc."
    (arguments
     '(#:tests? #f)) ;tests fail on the beta
    (license license:bsd-2)))
-
-(define-public python-pyopengl
-  (package
-    (name "python-pyopengl")
-    (version "3.1.7")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (pypi-uri "PyOpenGL" version))
-       (sha256
-        (base32
-         "11kclw0b03m87pz3fkb0hb51762c30drdjg6v3a4z676i0w1mwzf"))))
-    (build-system python-build-system)
-    (inputs
-     (list libglvnd mesa freeglut glu))
-    (arguments
-     `(#:tests? #f
-       #:phases
-       (modify-phases %standard-phases
-         (add-before 'build 'fix-paths
-           (lambda* (#:key inputs outputs #:allow-other-keys)
-             (substitute* '("OpenGL/platform/ctypesloader.py")
-               (("in filenames_to_try") "in [name]")
-               (("base_name,") "name,"))
-             (substitute* '("OpenGL/platform/glx.py"
-                            "OpenGL/platform/egl.py"
-                            "OpenGL/platform/osmesa.py"
-                            "OpenGL/platform/darwin.py"
-                            "tests/check_glut_load.py")
-               (("'OpenGL'")
-                (format #f "'~a/lib/libOpenGL.so'" (assoc-ref inputs "libglvnd")))
-               (("'GLU'")
-                (format #f "'~a/lib/libGLU.so'" (assoc-ref inputs "glu")))
-               (("'glut',")
-                (format #f "'~a/lib/libglut.so'," (assoc-ref inputs "freeglut")))
-               (("'(GL|EGL|GLESv1_CM|GLESv2|OSMesa)'" all gl-library)
-                (format #f "'~a/lib/lib~a.so'" (assoc-ref inputs "mesa") gl-library)))
-               ;; Not providing libgle. It seems to be very old.
-             #t)))))
-    (home-page "https://pyopengl.sourceforge.net")
-    (synopsis "Standard OpenGL bindings for Python")
-    (description
-     "PyOpenGL is the most common cross platform Python binding to OpenGL and
-related APIs.  The binding is created using the standard @code{ctypes}
-library.")
-    (license license:bsd-3)))
-
-(define-public python-pyopengl-accelerate
-  (package
-    (inherit python-pyopengl)
-    (name "python-pyopengl-accelerate")
-    (version "3.1.7")
-    (source
-     (origin
-       (method url-fetch)
-       (uri (pypi-uri "PyOpenGL-accelerate" version))
-       (sha256
-        (base32
-         "101n545cgdmipph9mmhmx3abbycrwd0pa8pcs9zrz4rs4whkc4ib"))))
-    (inputs
-     (list libglvnd mesa python-numpy)) ; for cython module
-                                        ; numpy_formathandler, thus not propagated
-    (arguments
-     `(#:tests? #f
-       #:phases
-       (modify-phases %standard-phases
-         (delete 'fix-paths))))
-    (synopsis "Acceleration code for PyOpenGL")
-    (description
-     "This is the Cython-coded accelerator module for PyOpenGL.")))
diff --git a/sigils/packages/xorg.scm b/sigils/packages/xorg.scm
index a187a4a..b444d6c 100644
--- a/sigils/packages/xorg.scm
+++ b/sigils/packages/xorg.scm
@@ -26,9 +26,7 @@
   #:use-module (gnu packages python-compression)
   #:use-module (gnu packages python-crypto)
   #:use-module (gnu packages python-web)
-  #:use-module ((gnu packages python-xyz)
-                #:hide (python-pyopengl
-                        python-pyopengl-accelerate))
+  #:use-module (gnu packages python-xyz)
   #:use-module (gnu packages video)
   #:use-module (gnu packages xdisorg)
   #:use-module (gnu packages xiph)