summaryrefslogtreecommitdiff
path: root/gnu
diff options
context:
space:
mode:
authorMarius Bakke <mbakke@fastmail.com>2020-01-16 09:26:09 +0100
committerMarius Bakke <mbakke@fastmail.com>2020-01-24 20:44:34 +0100
commitcc9c83c55d23cc5fca1f4642258bcf78d4b1f943 (patch)
tree10aeb2bc28e72ea008659b8f5aa281cd4512fdcd /gnu
parent9ba3cf5782f85e8d0528f9e445aad4c5fd0241a1 (diff)
gnu: python-pygobject: Update to 3.34.0.
* gnu/packages/glib.scm (python-pygobject): Update to 3.34.0. [source](modules, snippet): New fields. Delete failing tests identified by commit 622d702f7eba3. [build-system]: Change to MESON-BUILD-SYSTEM. [arguments]: Remove. [native-inputs]: Remove WHICH and DBUS. (python2-pygobject)[build-system]: Change to PYTHON-BUILD-SYSTEM. [arguments]: New field. Copy old phase from python-pygobject. [native-inputs]: Remove WHICH and DBUS. (python-pygobject-3.34.0): Remove variable.
Diffstat (limited to 'gnu')
-rw-r--r--gnu/packages/glib.scm84
-rw-r--r--gnu/packages/gnome.scm2
2 files changed, 34 insertions, 52 deletions
diff --git a/gnu/packages/glib.scm b/gnu/packages/glib.scm
index 08c7811809..e6f1cf819f 100644
--- a/gnu/packages/glib.scm
+++ b/gnu/packages/glib.scm
@@ -11,7 +11,7 @@
;;; Copyright © 2018 Alex Vong <alexvong1995@gmail.com>
;;; Copyright © 2019 Maxim Cournoyer <maxim.cournoyer@gmail.com>
;;; Copyright © 2019 Giacomo Leidi <goodoldpaul@autistici.org>
-;;; Copyright © 2019 Marius Bakke <mbakke@fastmail.com>
+;;; Copyright © 2019, 2020 Marius Bakke <mbakke@fastmail.com>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -692,7 +692,7 @@ useful for C++.")
(define-public python-pygobject
(package
(name "python-pygobject")
- (version "3.28.3")
+ (version "3.34.0")
(source
(origin
(method url-fetch)
@@ -701,24 +701,20 @@ useful for C++.")
"/pygobject-" version ".tar.xz"))
(sha256
(base32
- "1c6h3brzlyvzbpdsammnd957azmp6cbzqrd65r400vnh2l8f5lrx"))))
- (build-system gnu-build-system)
- (arguments
- `(#:phases
- (modify-phases %standard-phases
- (add-after 'unpack 'delete-broken-tests
- (lambda _
- ;; FIXME: this test freezes and times out.
- (delete-file "tests/test_mainloop.py")
- ;; FIXME: this test fails with this kind of error:
- ;; AssertionError: <Handlers.SIG_IGN: 1> != <built-in function default_int_handler
- (delete-file "tests/test_ossig.py")
+ "06i7ynnbvgpz0gw09zsjbvhgcp5qz4yzdifw27qjwdazg2mckql7"))
+ (modules '((guix build utils)))
+ (snippet
+ '(begin
+ ;; We disable these tests in a snippet so that they are inherited
+ ;; by the Python 2 variant which is built differently.
+ (with-directory-excursion "tests"
+ ;; FIXME: These tests require Gdk and/or Gtk 4.
+ (for-each delete-file
+ '("test_atoms.py" "test_overrides_gtk.py"))
#t)))))
+ (build-system meson-build-system)
(native-inputs
- `(("which" ,which)
- ;for tests: dbus-run-session and glib-compile-schemas
- ("dbus" ,dbus)
- ("glib-bin" ,glib "bin")
+ `(("glib-bin" ,glib "bin")
("pkg-config" ,pkg-config)
("python-pytest" ,python-pytest)))
(inputs
@@ -741,45 +737,31 @@ useful for C++.")
(define-public python2-pygobject
(package (inherit (strip-python2-variant python-pygobject))
(name "python2-pygobject")
+
+ ;; Note: We use python-build-system here, because Meson only supports
+ ;; Python 3, and needs PYTHONPATH etc set up correctly, which makes it
+ ;; difficult to use for Python 2 projects.
+ (build-system python-build-system)
+ (arguments
+ `(#:python ,python-2
+ #:phases
+ (modify-phases %standard-phases
+ (add-after 'unpack 'delete-broken-tests
+ (lambda _
+ ;; FIXME: this test freezes and times out.
+ (delete-file "tests/test_mainloop.py")
+ ;; FIXME: this test fails with this kind of error:
+ ;; AssertionError: <Handlers.SIG_IGN: 1> != <built-in function default_int_handler
+ (delete-file "tests/test_ossig.py")
+ #t)))))
(inputs
- `(("python" ,python-2)
- ("python-pycairo" ,python2-pycairo)
+ `(("python-pycairo" ,python2-pycairo)
("gobject-introspection" ,gobject-introspection)))
(native-inputs
- `(("which" ,which)
- ;for tests: dbus-run-session and glib-compile-schemas
- ("dbus" ,dbus)
- ("glib-bin" ,glib "bin")
+ `(("glib-bin" ,glib "bin")
("pkg-config" ,pkg-config)
("python-pytest" ,python2-pytest)))))
-;; Newer version of this core-updates package, for Lollypop.
-(define-public python-pygobject-3.34
- (package/inherit
- python-pygobject
- (version "3.34.0")
- (source
- (origin
- (method url-fetch)
- (uri (string-append "mirror://gnome/sources/pygobject/"
- (version-major+minor version)
- "/pygobject-" version ".tar.xz"))
- (sha256
- (base32 "06i7ynnbvgpz0gw09zsjbvhgcp5qz4yzdifw27qjwdazg2mckql7"))))
- (build-system meson-build-system)
- (arguments
- `(#:phases
- (modify-phases %standard-phases
- (add-after 'unpack 'delete-broken-tests
- (lambda _
- (with-directory-excursion "tests"
- (for-each
- delete-file
- ;; FIXME: these tests require Gdk and/or Gtk 4.
- '("test_atoms.py"
- "test_overrides_gtk.py")))
- #t)))))))
-
(define-public perl-glib
(package
(name "perl-glib")
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 631f048d98..459d64b731 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -9003,7 +9003,7 @@ views can be printed as PDF or PostScript files, or exported to HTML.")
("python-gst" ,python-gst)
("python-pil" ,python-pillow)
("python-pycairo" ,python-pycairo)
- ("python-pygobject" ,python-pygobject-3.34)
+ ("python-pygobject" ,python-pygobject)
("python-pylast" ,python-pylast)
("totem-pl-parser" ,totem-pl-parser)
("webkitgtk" ,webkitgtk)))