ryan77627/guix
1
0
Fork 0
mirror of https://git.in.rschanz.org/ryan77627/guix.git synced 2024-11-17 04:07:10 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

gnu: terminator: Update to 1.92.

Browse source 
* gnu/packages/gnome.scm (terminator): Update to 1.92.
[source]: Use new upstream URI.
[inputs]: Remove python2-psutil. Replace python2-pycairo,
python2-pygobject with python- versions. Add dbus-glib, gtk+.
Move gobject-introspection ...
[native-inputs]: ... to here. Add python-psutil,
python-pytest-runner, python-pytest.
[propagated-inputs]: Add pyhton-configobj.
[arguments]: Build with python3. Adjust 'wrap-program phase to also wrap
with package's own python output.
[home-page]: Update to new upstream URI.

Signed-off-by: Efraim Flashner <efraim@flashner.co.il>
This commit is contained in:
Andy Tai 2020-12-14 23:31:39 -08:00 committed by Efraim Flashner
parent effacc281c
commit 957f0c4032
No known key found for this signature in database
GPG key ID: 41AAE7DCCA3D8351
1 changed files with 27 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

43
gnu/packages/gnome.scm
View file

@ -56,6 +56,7 @@
;;; Copyright © 2020 Arun Isaac <arunisaac@systemreboot.net> ;;; Copyright © 2020 Arun Isaac <arunisaac@systemreboot.net>
;;; Copyright © 2020 Michael Rohleder <mike@rohleder.de> ;;; Copyright © 2020 Michael Rohleder <mike@rohleder.de>
;;; Copyright © 2020 Tim Gesthuizen <tim.gesthuizen@yahoo.de> ;;; Copyright © 2020 Tim Gesthuizen <tim.gesthuizen@yahoo.de>
;;; Copyright © 2020 Andy Tai <atai@atai.org>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -10859,32 +10860,37 @@ (define-public gthumb
(define-public terminator (define-public terminator
(package (package
(name "terminator") (name "terminator")
(version "1.91") (version "1.92")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://launchpad.net/" name "/" (uri (string-append "https://github.com/gnome-" name "/" name "/"
"gtk3/" version "/" "+download/" "releases/download/v" version "/"
name "-" version ".tar.gz")) name "-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"0sdyqwydmdnh7j6mn74vrywz35m416kqsbxbrqcnv5ak08y6xxwm")))) "1wbkfp0nk6x9bcwi681zy30qmrp4h754sdz6b7hi9j22mmvdd50z"))))
(build-system python-build-system) (build-system python-build-system)
(native-inputs (native-inputs
`(("intltool" ,intltool) `(("gettext" ,gettext-minimal)
("glib:bin" ,glib "bin") ; for glib-compile-resources ("glib:bin" ,glib "bin") ; for glib-compile-resources
("gettext" ,gettext-minimal) ("gobject-introspection" ,gobject-introspection)
("pkg-config" ,pkg-config))) ("intltool" ,intltool)
("pkg-config" ,pkg-config)
("python-psutil" ,python-psutil)
("python-pytest-runner" ,python-pytest-runner)
("python-pytest" ,python-pytest)))
(inputs (inputs
`(("cairo" ,cairo) `(("cairo" ,cairo)
("gobject-introspection" ,gobject-introspection) ("dbus-glib" ,dbus-glib)
("gsettings-desktop-schemas" ,gsettings-desktop-schemas) ("gsettings-desktop-schemas" ,gsettings-desktop-schemas)
("python2-pycairo" ,python2-pycairo) ("gtk+" ,gtk+)
("python2-pygobject" ,python2-pygobject) ("python-pycairo" ,python-pycairo)
("python2-psutil" ,python2-psutil) ("python-pygobject" ,python-pygobject)
("vte" ,vte))) ("vte" ,vte)))
(propagated-inputs
`(("python-configobj" ,python-configobj)))
(arguments (arguments
`(#:python ,python-2 ; Python 3 isn't supported `(#:imported-modules ((guix build glib-or-gtk-build-system)
#:imported-modules ((guix build glib-or-gtk-build-system)
,@%python-build-system-modules) ,@%python-build-system-modules)
#:modules ((guix build python-build-system) #:modules ((guix build python-build-system)
((guix build glib-or-gtk-build-system) #:prefix glib-or-gtk:) ((guix build glib-or-gtk-build-system) #:prefix glib-or-gtk:)
@ -10895,14 +10901,19 @@ (define-public terminator
'install 'wrap-program 'install 'wrap-program
(lambda* (#:key outputs #:allow-other-keys) (lambda* (#:key outputs #:allow-other-keys)
(let ((prog (string-append (assoc-ref outputs "out") (let ((prog (string-append (assoc-ref outputs "out")
"/bin/terminator"))) "/bin/terminator"))
(pylib (string-append (assoc-ref outputs "out")
"/lib/python"
,(version-major+minor
(package-version python))
"/site-packages")))
(wrap-program prog (wrap-program prog
`("PYTHONPATH" = (,(getenv "PYTHONPATH"))) `("PYTHONPATH" = (,(getenv "PYTHONPATH") ,pylib))
`("GI_TYPELIB_PATH" = (,(getenv "GI_TYPELIB_PATH")))) `("GI_TYPELIB_PATH" = (,(getenv "GI_TYPELIB_PATH"))))
#t))) #t)))
(add-after 'wrap-program 'glib-or-gtk-wrap (add-after 'wrap-program 'glib-or-gtk-wrap
(assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-wrap))))) (assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-wrap)))))
(home-page "https://gnometerminator.blogspot.com/") (home-page "https://gnome-terminator.org/")
(synopsis "Store and run multiple GNOME terminals in one window") (synopsis "Store and run multiple GNOME terminals in one window")
(description (description
"Terminator allows you to run multiple GNOME terminals in a grid and "Terminator allows you to run multiple GNOME terminals in a grid and