* [bug#57429] [PATCH 0/3] gnu: piper: Fix runtime and update to 0.7
@ 2022-08-26 8:38 Tobias Kortkamp
2022-08-26 14:37 ` [bug#57429] [PATCH 1/3] gnu: piper: Fix runtime Tobias Kortkamp
` (2 more replies)
0 siblings, 3 replies; 5+ messages in thread
From: Tobias Kortkamp @ 2022-08-26 8:38 UTC (permalink / raw)
To: 57429; +Cc: Tobias Kortkamp
Hi,
this fixes piper which currently has a broken wrapper script and does
not run without setting PYTHONPATH manually first.
While here I also fixed the tests and updated piper to 0.7 (minor
update). Those are unrelated to the runtime fix but simple enough that
I batched them all up together. Hope that is ok.
Best regards,
Tobias Kortkamp (3):
gnu: piper: Fix runtime.
gnu: piper: Unbreak tests.
gnu: piper: Update to 0.7.
gnu/packages/gnome.scm | 49 ++++++++++++++++++++++--------------------
1 file changed, 26 insertions(+), 23 deletions(-)
--
2.37.1
^ permalink raw reply [flat|nested] 5+ messages in thread
* [bug#57429] [PATCH 1/3] gnu: piper: Fix runtime.
2022-08-26 8:38 [bug#57429] [PATCH 0/3] gnu: piper: Fix runtime and update to 0.7 Tobias Kortkamp
@ 2022-08-26 14:37 ` Tobias Kortkamp
2022-08-26 14:37 ` [bug#57429] [PATCH 2/3] gnu: piper: Unbreak tests Tobias Kortkamp
2022-08-26 14:37 ` [bug#57429] [PATCH 3/3] gnu: piper: Update to 0.7 Tobias Kortkamp
2 siblings, 0 replies; 5+ messages in thread
From: Tobias Kortkamp @ 2022-08-26 14:37 UTC (permalink / raw)
To: 57429; +Cc: Tobias Kortkamp
The wrapper script does not add piper's own Python files to
GUIX_PYTHONPATH. Copy the approach from gtg to solve this.
Traceback (most recent call last):
File "/gnu/store/9fq062kva6ffidilg0qn8liqn6a8yf1w-piper-0.6/bin/.piper-real", line 36, in <module>
from piper.application import Application
ModuleNotFoundError: No module named 'piper'
* gnu/packages/gnome.scm (piper): Fix runtime.
---
gnu/packages/gnome.scm | 39 +++++++++++++++++++--------------------
1 file changed, 19 insertions(+), 20 deletions(-)
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index ae46e55c51..fe822eb035 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -12122,26 +12122,25 @@ (define-public piper
python-pycairo
python-pygobject))
(arguments
- `(#:imported-modules ((guix build python-build-system)
- ,@%meson-build-system-modules)
- #:modules (((guix build python-build-system) #:prefix python:)
- (guix build meson-build-system)
- (guix build utils))
- #:tests? #f ;; The flake8 test fails trying to validate piper.in as code.
- #:phases
- (modify-phases %standard-phases
- (add-after 'unpack 'dont-update-gtk-icon-cache
- (lambda _
- (substitute* "meson.build"
- (("meson.add_install_script('meson_install.sh')") ""))))
- ;; TODO: Switch to wrap-script when it is fixed.
- (add-after 'install 'wrap-python
- (assoc-ref python:%standard-phases 'wrap))
- (add-after 'wrap-python 'wrap
- (lambda* (#:key outputs #:allow-other-keys)
- (wrap-program
- (string-append (assoc-ref outputs "out" )"/bin/piper")
- `("GI_TYPELIB_PATH" = (,(getenv "GI_TYPELIB_PATH")))))))))
+ (list #:glib-or-gtk? #t
+ #:tests? #f ;; The flake8 test fails trying to validate piper.in as code.
+ #:phases
+ #~(modify-phases %standard-phases
+ (add-after 'unpack 'dont-update-gtk-icon-cache
+ (lambda _
+ (substitute* "meson.build"
+ (("meson.add_install_script('meson_install.sh')") ""))))
+ (add-after 'glib-or-gtk-wrap 'python-and-gi-wrap
+ (lambda _
+ (let ((pylib (string-append #$output
+ "/lib/python"
+ #$(version-major+minor
+ (package-version python))
+ "/site-packages")))
+ (wrap-program
+ (string-append #$output "/bin/piper")
+ `("GUIX_PYTHONPATH" = (,(getenv "GUIX_PYTHONPATH") ,pylib))
+ `("GI_TYPELIB_PATH" = (,(getenv "GI_TYPELIB_PATH"))))))))))
(home-page "https://github.com/libratbag/piper/")
(synopsis "Configure bindings and LEDs on gaming mice")
(description "Piper is a GTK+ application for configuring gaming mice with
--
2.37.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [bug#57429] [PATCH 2/3] gnu: piper: Unbreak tests.
2022-08-26 8:38 [bug#57429] [PATCH 0/3] gnu: piper: Fix runtime and update to 0.7 Tobias Kortkamp
2022-08-26 14:37 ` [bug#57429] [PATCH 1/3] gnu: piper: Fix runtime Tobias Kortkamp
@ 2022-08-26 14:37 ` Tobias Kortkamp
2022-08-26 14:37 ` [bug#57429] [PATCH 3/3] gnu: piper: Update to 0.7 Tobias Kortkamp
2 siblings, 0 replies; 5+ messages in thread
From: Tobias Kortkamp @ 2022-08-26 14:37 UTC (permalink / raw)
To: 57429; +Cc: Tobias Kortkamp
Make flake8 config available inside the build directory.
https://github.com/libratbag/piper/pull/781
* gnu/packages/gnome.scm (piper): Unbreak tests.
---
gnu/packages/gnome.scm | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index fe822eb035..83d64fbd49 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -12123,7 +12123,6 @@ (define-public piper
python-pygobject))
(arguments
(list #:glib-or-gtk? #t
- #:tests? #f ;; The flake8 test fails trying to validate piper.in as code.
#:phases
#~(modify-phases %standard-phases
(add-after 'unpack 'dont-update-gtk-icon-cache
@@ -12140,7 +12139,11 @@ (define-public piper
(wrap-program
(string-append #$output "/bin/piper")
`("GUIX_PYTHONPATH" = (,(getenv "GUIX_PYTHONPATH") ,pylib))
- `("GI_TYPELIB_PATH" = (,(getenv "GI_TYPELIB_PATH"))))))))))
+ `("GI_TYPELIB_PATH" = (,(getenv "GI_TYPELIB_PATH")))))))
+ (add-before 'check 'flake8-config
+ (lambda _
+ ;; Make sure the tests use the local flake8 config
+ (symlink (string-append #$source "/.flake8") ".flake8"))))))
(home-page "https://github.com/libratbag/piper/")
(synopsis "Configure bindings and LEDs on gaming mice")
(description "Piper is a GTK+ application for configuring gaming mice with
--
2.37.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [bug#57429] [PATCH 3/3] gnu: piper: Update to 0.7.
2022-08-26 8:38 [bug#57429] [PATCH 0/3] gnu: piper: Fix runtime and update to 0.7 Tobias Kortkamp
2022-08-26 14:37 ` [bug#57429] [PATCH 1/3] gnu: piper: Fix runtime Tobias Kortkamp
2022-08-26 14:37 ` [bug#57429] [PATCH 2/3] gnu: piper: Unbreak tests Tobias Kortkamp
@ 2022-08-26 14:37 ` Tobias Kortkamp
2022-09-11 14:49 ` bug#57429: [PATCH 0/3] gnu: piper: Fix runtime and update " Mathieu Othacehe
2 siblings, 1 reply; 5+ messages in thread
From: Tobias Kortkamp @ 2022-08-26 14:37 UTC (permalink / raw)
To: 57429; +Cc: Tobias Kortkamp
* gnu/packages/gnome.scm (piper): Update to 0.7.
[native-inputs]: Add appstream.
---
gnu/packages/gnome.scm | 7 ++++---
1 file changed, 4 insertions(+), 3 deletions(-)
diff --git a/gnu/packages/gnome.scm b/gnu/packages/gnome.scm
index 83d64fbd49..0e155c29a3 100644
--- a/gnu/packages/gnome.scm
+++ b/gnu/packages/gnome.scm
@@ -12094,7 +12094,7 @@ (define-public libratbag
(define-public piper
(package
(name "piper")
- (version "0.6")
+ (version "0.7")
(source
(origin
(method git-fetch)
@@ -12102,11 +12102,12 @@ (define-public piper
(url "https://github.com/libratbag/piper")
(commit version)))
(sha256
- (base32 "02x4d4n0078slj2pl0rvgayrrxvna6y6vj8fxfamvazsh5xyfzwk"))
+ (base32 "0jsvfy0ihdcgnqljfgs41lys1nlz18qvsa0a8ndx3pyr41f8w8wf"))
(file-name (git-file-name name version))))
(build-system meson-build-system)
(native-inputs
- (list gettext-minimal
+ (list appstream
+ gettext-minimal
`(,glib "bin")
gobject-introspection
pkg-config
--
2.37.1
^ permalink raw reply related [flat|nested] 5+ messages in thread
end of thread, other threads:[~2022-09-11 14:51 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-08-26 8:38 [bug#57429] [PATCH 0/3] gnu: piper: Fix runtime and update to 0.7 Tobias Kortkamp
2022-08-26 14:37 ` [bug#57429] [PATCH 1/3] gnu: piper: Fix runtime Tobias Kortkamp
2022-08-26 14:37 ` [bug#57429] [PATCH 2/3] gnu: piper: Unbreak tests Tobias Kortkamp
2022-08-26 14:37 ` [bug#57429] [PATCH 3/3] gnu: piper: Update to 0.7 Tobias Kortkamp
2022-09-11 14:49 ` bug#57429: [PATCH 0/3] gnu: piper: Fix runtime and update " Mathieu Othacehe
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.