From 79f92a9b35ab37c63956ed0958aa196c983111f9 Mon Sep 17 00:00:00 2001
From: Andy Tai <atai@atai.org>
Date: Thu, 12 Jan 2023 22:38:50 -0800
Subject: [PATCH] gnu: terminator: Renamed to "gnome-terminator" and update to
2.1.2
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
* gnu/packages/gnome.scm (gnome-terminator): Rename variable from
(terminator): …this one. Redefine using DEPRECATED-PACKAGE.
Update to 2.1.2
---
gnu/packages/gnome.scm | 123 ++++++++++++++++++++++-------------------
1 file changed, 67 insertions(+), 56 deletions(-)
@@ -11921,41 +11921,45 @@ (define-public gthumb
advanced image management tool")
(license license:gpl2+)))
-(define-public terminator
+(define-public gnome-terminator
(package
- (name "terminator")
- (version "2.1.1")
- (source
- (origin
- (method url-fetch)
- (uri (string-append "https://github.com/gnome-terminator/terminator/"
- "releases/download/v" version "/"
- name "-" version ".tar.gz"))
- (sha256
- (base32 "0xdgmam7ghnxw6g38a4gjw3kk3rhga8c66lns18k928jlr9fmddw"))))
+ (name "gnome-terminator")
+ (version "2.1.2")
+ (source (origin
+ (method url-fetch)
+ (uri (string-append
+ "https://github.com/gnome-terminator/terminator/"
+ "releases/download/v"
+ version
+ "/"
+ "terminator"
+ "-"
+ version
+ ".tar.gz"))
+ (sha256
+ (base32
+ "10shpn8id7z43d4dpx16x76mgxnk4mr976j5cg28icjiiaidyfc2"))))
(build-system python-build-system)
- (native-inputs
- `(("gettext" ,gettext-minimal)
- ("glib:bin" ,glib "bin") ; for glib-compile-resources
- ("gobject-introspection" ,gobject-introspection)
- ("intltool" ,intltool)
- ("pkg-config" ,pkg-config)
- ("python-psutil" ,python-psutil)
- ("python-pytest-runner" ,python-pytest-runner)
- ("python-pytest" ,python-pytest)))
- (inputs
- `(("cairo" ,cairo)
- ("dbus-glib" ,dbus-glib)
- ("gsettings-desktop-schemas" ,gsettings-desktop-schemas)
- ("gtk+" ,gtk+)
- ("python" ,python-wrapper)
- ("python-dbus" ,python-dbus)
- ("python-notify2" ,python-notify2)
- ("python-pycairo" ,python-pycairo)
- ("python-pygobject" ,python-pygobject)
- ("vte" ,vte)))
- (propagated-inputs
- (list python-configobj))
+ (native-inputs (list gettext-minimal
+ `(,glib "bin") ;for glib-compile-resources
+ gobject-introspection
+ intltool
+ pkg-config
+ python-psutil
+ python-pytest-runner
+ python-pytest))
+ (inputs (list bash-minimal
+ cairo
+ dbus-glib
+ gsettings-desktop-schemas
+ gtk+
+ python-wrapper
+ python-dbus
+ python-notify2
+ python-pycairo
+ python-pygobject
+ vte))
+ (propagated-inputs (list python-configobj))
(arguments
;; One test out of 28 fails due to dbus-python and python-notify; skip
;; tests.
@@ -11963,30 +11967,34 @@ (define-public terminator
#:imported-modules ((guix build glib-or-gtk-build-system)
,@%python-build-system-modules)
#: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:)
(guix build utils))
- #:phases
- (modify-phases %standard-phases
- (add-after 'unpack 'handle-dbus-python
- (lambda _
- ;; python-dbus cannot be found but it's really there. See
- ;; https://github.com/SpotlightKid/jack-select/issues/2
- (substitute* "setup.py"
- (("'dbus-python',") ""))))
- (add-after 'install 'wrap-program
- (lambda* (#:key outputs #:allow-other-keys)
- (let ((prog (string-append (assoc-ref outputs "out")
- "/bin/terminator"))
- (pylib (string-append (assoc-ref outputs "out")
- "/lib/python"
- ,(version-major+minor
- (package-version python))
- "/site-packages")))
- (wrap-program prog
- `("GUIX_PYTHONPATH" = (,(getenv "GUIX_PYTHONPATH") ,pylib))
- `("GI_TYPELIB_PATH" = (,(getenv "GI_TYPELIB_PATH")))))))
- (add-after 'wrap-program 'glib-or-gtk-wrap
- (assoc-ref glib-or-gtk:%standard-phases 'glib-or-gtk-wrap)))))
+ #:phases (modify-phases %standard-phases
+ (add-after 'unpack 'handle-dbus-python
+ (lambda _
+ ;; python-dbus cannot be found but it's really there. See
+ ;; https://github.com/SpotlightKid/jack-select/issues/2
+ (substitute* "setup.py"
+ (("'dbus-python',")
+ ""))))
+ (add-after 'install 'wrap-program
+ (lambda* (#:key outputs #:allow-other-keys)
+ (let ((prog (string-append (assoc-ref outputs "out")
+ "/bin/terminator"))
+ (pylib (string-append (assoc-ref outputs "out")
+ "/lib/python"
+ ,(version-major+minor (package-version
+ python))
+ "/site-packages")))
+ (wrap-program prog
+ `("GUIX_PYTHONPATH" =
+ (,(getenv "GUIX_PYTHONPATH") ,pylib))
+ `("GI_TYPELIB_PATH" =
+ (,(getenv "GI_TYPELIB_PATH")))))))
+ (add-after 'wrap-program 'glib-or-gtk-wrap
+ (assoc-ref glib-or-gtk:%standard-phases
+ 'glib-or-gtk-wrap)))))
(home-page "https://gnome-terminator.org/")
(synopsis "Store and run multiple GNOME terminals in one window")
(description
@@ -11994,6 +12002,9 @@ (define-public terminator
tabs, and it supports drag and drop re-ordering of terminals.")
(license license:gpl2)))
+(define-public terminator
+ (deprecated-package "terminator" gnome-terminator))
+
(define-public libhandy
(package
(name "libhandy")
--
2.38.1