* [bug#69743] [PATCH] update grimshot package definition
@ 2024-03-12 9:56 Ignas Lapėnas
2024-03-12 13:29 ` Jack Hill
2024-03-12 14:26 ` [bug#69743] " Ignas Lapėnas
0 siblings, 2 replies; 7+ messages in thread
From: Ignas Lapėnas @ 2024-03-12 9:56 UTC (permalink / raw)
To: 69743; +Cc: Ignas Lapėnas
Issue: https://issues.guix.gnu.org/69667
Grimshot was dropped from sway.
https://github.com/swaywm/sway/issues/7405
The contrib was moved to:
https://github.com/OctopusET/sway-contrib
Package definition updated accordingly.
Change-Id: I9ed9cdf7ce10fe878b4f2b931791ed22a63ff99a
---
gnu/packages/wm.scm | 60 +++++++++++++++++++++++++--------------------
1 file changed, 33 insertions(+), 27 deletions(-)
diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm
index edbb3096b8..eeaee0cb68 100644
--- a/gnu/packages/wm.scm
+++ b/gnu/packages/wm.scm
@@ -3524,46 +3524,52 @@ (define-public avizo
(define-public grimshot
(package
- (inherit sway)
(name "grimshot")
- (source (origin
- (inherit (package-source sway))
- (snippet #~(delete-file "contrib/grimshot.1"))))
+ (version "1.9-contrib.0")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/OctopusET/sway-contrib")
+ (commit version)))
+ (sha256
+ (base32 "16fa8l81zjy25nsky1i525hb7zjprqz74mbirm9b76pvksschdv5"))))
(build-system copy-build-system)
(arguments
- (list #:install-plan #~`(("grimshot" "bin/")
- ("grimshot.1" "share/man/man1/"))
- #:phases #~(modify-phases %standard-phases
- (add-after 'unpack 'chdir
- (lambda _
- (chdir "contrib")))
- (add-after 'chdir 'patch-script-dependencies
- (lambda* (#:key inputs #:allow-other-keys)
- (substitute* "grimshot"
- (("\\b(date|grim|jq|notify-send|slurp|swaymsg|wl-copy)\\b"
- _ binary)
- (search-input-file
- inputs (string-append "bin/" binary))))))
- (add-after 'patch-script-dependencies 'build-man-page
- (lambda _
- (with-input-from-file "grimshot.1.scd"
- (lambda _
- (with-output-to-file "grimshot.1"
- (lambda _
- (invoke "scdoc"))))))))))
+ (list
+ #:install-plan #~`(("grimshot" "bin/")
+ ("grimshot.1" "share/man/man1/"))
+ #:phases #~(modify-phases %standard-phases
+ (add-after 'chdir 'patch-script-dependencies
+ (lambda* (#:key inputs #:allow-other-keys)
+ (substitute* "grimshot"
+ (("\\b(date|grim|jq|notify-send|slurp|swaymsg|wl-copy)\\b"
+ _ binary)
+ (search-input-file inputs
+ (string-append "bin/" binary))))))
+ (add-after 'patch-script-dependencies 'build-man-page
+ (lambda _
+ (with-input-from-file "grimshot.1.scd"
+ (lambda _
+ (with-output-to-file "grimshot.1"
+ (lambda _
+ (invoke "scdoc"))))))))))
(native-inputs (list scdoc))
(inputs (list coreutils
- grim
jq
libnotify
slurp
sway
wl-clipboard))
+ (propagated-inputs (list grim))
+ (home-page "https://github.com/OctopusET/sway-contrib")
(synopsis "Screenshot utility for the Sway window manager")
- (description "Grimshot is a screenshot utility for @code{sway}. It provides
+ (description
+ "Grimshot is a screenshot utility for @code{sway}. It provides
an interface over @code{grim}, @code{slurp} and @code{jq}, and supports storing
the screenshot either directly to the clipboard using @code{wl-copy} or to a
-file.")))
+file.")
+ (license license:expat)))
(define-public wld
(let ((commit "6586736176ef50a88025abae835e29a7ca980126")
base-commit: 4003c60abf7a6e59e47cc2deb9eef2f104ebb994
--
2.41.0
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [bug#69743] [PATCH] update grimshot package definition
2024-03-12 9:56 [bug#69743] [PATCH] update grimshot package definition Ignas Lapėnas
@ 2024-03-12 13:29 ` Jack Hill
2024-03-12 13:33 ` Ignas Lapėnas
2024-03-12 14:26 ` [bug#69743] " Ignas Lapėnas
1 sibling, 1 reply; 7+ messages in thread
From: Jack Hill @ 2024-03-12 13:29 UTC (permalink / raw)
To: Ignas Lapėnas; +Cc: 69743
[-- Attachment #1: Type: text/plain, Size: 1653 bytes --]
On Tue, 12 Mar 2024, Ignas Lapėnas wrote:
> Issue: https://issues.guix.gnu.org/69667
>
> Grimshot was dropped from sway.
> https://github.com/swaywm/sway/issues/7405
>
> The contrib was moved to:
> https://github.com/OctopusET/sway-contrib
>
> Package definition updated accordingly.
>
> Change-Id: I9ed9cdf7ce10fe878b4f2b931791ed22a63ff99a
> ---
> gnu/packages/wm.scm | 60 +++++++++++++++++++++++++--------------------
> 1 file changed, 33 insertions(+), 27 deletions(-)
>
> diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm
> index edbb3096b8..eeaee0cb68 100644
> --- a/gnu/packages/wm.scm
> +++ b/gnu/packages/wm.scm
> @@ -3524,46 +3524,52 @@ (define-public avizo
I haven't had a chance to test on a system yet, but thanks for preparing
this, reading through it it looks good.
> + (add-after 'patch-script-dependencies 'build-man-page
> + (lambda _
> + (with-input-from-file "grimshot.1.scd"
> + (lambda _
> + (with-output-to-file "grimshot.1"
> + (lambda _
> + (invoke "scdoc"))))))))))
I'm happy to see this improvement of building the manpage from source.
> (native-inputs (list scdoc))
> (inputs (list coreutils
> - grim
> jq
> libnotify
> slurp
> sway
> wl-clipboard))
> + (propagated-inputs (list grim))
For my curiosity, what's the benefit of propagating grim? It looks like
the full bath is also being substituted in the script?
Thanks!
Jack
^ permalink raw reply [flat|nested] 7+ messages in thread
* [bug#69743] [PATCH] update grimshot package definition
2024-03-12 13:29 ` Jack Hill
@ 2024-03-12 13:33 ` Ignas Lapėnas
2024-03-12 14:28 ` Ignas Lapėnas
0 siblings, 1 reply; 7+ messages in thread
From: Ignas Lapėnas @ 2024-03-12 13:33 UTC (permalink / raw)
To: Jack Hill; +Cc: 69743
Hi, this is a first patch for me. Just to be clear, I'm still a newb
with Guix and Guile. All feedback is greatly appreciated. Thank You :)
> I'm happy to see this improvement of building the manpage from source.
This part was not written by me. Last package definition version had a
chdir to the contrib directory step, to correctly copy over required
files. Since now the contrib directory is directly downloaded from
github it was no longer necessary. (that was the part removed)
> For my curiosity, what's the benefit of propagating grim? It looks
> like the full bath is also being substituted in the script?
While running the ./pre-inst-env to check if the package still works
correctly, I had an error that grim was not found. After a quick read on
the manual, noticed that propogated inputs actually copy it over.
It seems that my mistake is probably due to not updating this part.
#+BEGIN_EXAMPLE
(add-after 'chdir 'patch-script-dependencies
#+END_EXAMPLE
since chdir stage was removed it might have possibly skipped other steps
altogether. I'll look into it some more how it works exactly and try to
provide a new patch.
Jack Hill <jackhill@jackhill.us> writes:
> [1. text/plain]
> On Tue, 12 Mar 2024, Ignas Lapėnas wrote:
>
>> Issue: https://issues.guix.gnu.org/69667
>>
>> Grimshot was dropped from sway.
>> https://github.com/swaywm/sway/issues/7405
>>
>> The contrib was moved to:
>> https://github.com/OctopusET/sway-contrib
>>
>> Package definition updated accordingly.
>>
>> Change-Id: I9ed9cdf7ce10fe878b4f2b931791ed22a63ff99a
>> ---
>> gnu/packages/wm.scm | 60 +++++++++++++++++++++++++--------------------
>> 1 file changed, 33 insertions(+), 27 deletions(-)
>>
>> diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm
>> index edbb3096b8..eeaee0cb68 100644
>> --- a/gnu/packages/wm.scm
>> +++ b/gnu/packages/wm.scm
>> @@ -3524,46 +3524,52 @@ (define-public avizo
>
> I haven't had a chance to test on a system yet, but thanks for
> preparing this, reading through it it looks good.
>
>> + (add-after 'patch-script-dependencies 'build-man-page
>> + (lambda _
>> + (with-input-from-file "grimshot.1.scd"
>> + (lambda _
>> + (with-output-to-file "grimshot.1"
>> + (lambda _
>> + (invoke "scdoc"))))))))))
>
> I'm happy to see this improvement of building the manpage from source.
>
>> (native-inputs (list scdoc))
>> (inputs (list coreutils
>> - grim
>> jq
>> libnotify
>> slurp
>> sway
>> wl-clipboard))
>> + (propagated-inputs (list grim))
>
> For my curiosity, what's the benefit of propagating grim? It looks
> like the full bath is also being substituted in the script?
>
> Thanks!
> Jack
--
Pagarbiai,
Ignas Lapėnas
^ permalink raw reply [flat|nested] 7+ messages in thread
* [bug#69743] [PATCH] update grimshot package definition
2024-03-12 9:56 [bug#69743] [PATCH] update grimshot package definition Ignas Lapėnas
2024-03-12 13:29 ` Jack Hill
@ 2024-03-12 14:26 ` Ignas Lapėnas
1 sibling, 0 replies; 7+ messages in thread
From: Ignas Lapėnas @ 2024-03-12 14:26 UTC (permalink / raw)
To: 69743; +Cc: Ignas Lapėnas
Issue: https://issues.guix.gnu.org/69667
Grimshot was dropped from sway.
https://github.com/swaywm/sway/issues/7405
The contrib was moved to:
https://github.com/OctopusET/sway-contrib
Package definition updated accordingly.
Change-Id: I9ed9cdf7ce10fe878b4f2b931791ed22a63ff99a
---
gnu/packages/wm.scm | 58 +++++++++++++++++++++++++--------------------
1 file changed, 32 insertions(+), 26 deletions(-)
diff --git a/gnu/packages/wm.scm b/gnu/packages/wm.scm
index edbb3096b8..bb9926d53a 100644
--- a/gnu/packages/wm.scm
+++ b/gnu/packages/wm.scm
@@ -3524,33 +3524,36 @@ (define-public avizo
(define-public grimshot
(package
- (inherit sway)
(name "grimshot")
- (source (origin
- (inherit (package-source sway))
- (snippet #~(delete-file "contrib/grimshot.1"))))
+ (version "1.9-contrib.0")
+ (source
+ (origin
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://github.com/OctopusET/sway-contrib")
+ (commit version)))
+ (sha256
+ (base32 "16fa8l81zjy25nsky1i525hb7zjprqz74mbirm9b76pvksschdv5"))))
(build-system copy-build-system)
(arguments
- (list #:install-plan #~`(("grimshot" "bin/")
- ("grimshot.1" "share/man/man1/"))
- #:phases #~(modify-phases %standard-phases
- (add-after 'unpack 'chdir
- (lambda _
- (chdir "contrib")))
- (add-after 'chdir 'patch-script-dependencies
- (lambda* (#:key inputs #:allow-other-keys)
- (substitute* "grimshot"
- (("\\b(date|grim|jq|notify-send|slurp|swaymsg|wl-copy)\\b"
- _ binary)
- (search-input-file
- inputs (string-append "bin/" binary))))))
- (add-after 'patch-script-dependencies 'build-man-page
- (lambda _
- (with-input-from-file "grimshot.1.scd"
- (lambda _
- (with-output-to-file "grimshot.1"
- (lambda _
- (invoke "scdoc"))))))))))
+ (list
+ #:install-plan #~`(("grimshot" "bin/")
+ ("grimshot.1" "share/man/man1/"))
+ #:phases #~(modify-phases %standard-phases
+ (add-after 'unpack 'patch-script-dependencies
+ (lambda* (#:key inputs #:allow-other-keys)
+ (substitute* "grimshot"
+ (("\\b(date|grim|jq|notify-send|slurp|swaymsg|wl-copy)\\b"
+ _ binary)
+ (search-input-file inputs
+ (string-append "bin/" binary))))))
+ (add-after 'patch-script-dependencies 'build-man-page
+ (lambda _
+ (with-input-from-file "grimshot.1.scd"
+ (lambda _
+ (with-output-to-file "grimshot.1"
+ (lambda _
+ (invoke "scdoc"))))))))))
(native-inputs (list scdoc))
(inputs (list coreutils
grim
@@ -3559,11 +3562,14 @@ (define-public grimshot
slurp
sway
wl-clipboard))
+ (home-page "https://github.com/OctopusET/sway-contrib")
(synopsis "Screenshot utility for the Sway window manager")
- (description "Grimshot is a screenshot utility for @code{sway}. It provides
+ (description
+ "Grimshot is a screenshot utility for @code{sway}. It provides
an interface over @code{grim}, @code{slurp} and @code{jq}, and supports storing
the screenshot either directly to the clipboard using @code{wl-copy} or to a
-file.")))
+file.")
+ (license license:expat)))
(define-public wld
(let ((commit "6586736176ef50a88025abae835e29a7ca980126")
base-commit: 4003c60abf7a6e59e47cc2deb9eef2f104ebb994
--
2.41.0
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [bug#69743] [PATCH] update grimshot package definition
2024-03-12 13:33 ` Ignas Lapėnas
@ 2024-03-12 14:28 ` Ignas Lapėnas
2024-03-12 18:13 ` Jack Hill
0 siblings, 1 reply; 7+ messages in thread
From: Ignas Lapėnas @ 2024-03-12 14:28 UTC (permalink / raw)
To: Jack Hill; +Cc: 69743
Updated the patch and sent to this issue. Seems like the initial idea
was true about skipping phases, since now it correctly works without
propagated-input. Sorry about the mess-up from my part.
--
Best Regards,
Ignas Lapėnas
^ permalink raw reply [flat|nested] 7+ messages in thread
* [bug#69743] [PATCH] update grimshot package definition
2024-03-12 14:28 ` Ignas Lapėnas
@ 2024-03-12 18:13 ` Jack Hill
2024-03-21 1:38 ` bug#69743: " Jack Hill
0 siblings, 1 reply; 7+ messages in thread
From: Jack Hill @ 2024-03-12 18:13 UTC (permalink / raw)
To: Ignas Lapėnas; +Cc: 69743
[-- Attachment #1: Type: text/plain, Size: 393 bytes --]
On Tue, 12 Mar 2024, Ignas Lapėnas wrote:
> Updated the patch and sent to this issue. Seems like the initial idea
> was true about skipping phases, since now it correctly works without
> propagated-input. Sorry about the mess-up from my part.
No worries, I'm happy we were able to collaborate. And thank you for
proposing the fix, it saves the rest of us from needing to do so.
Best,
Jack
^ permalink raw reply [flat|nested] 7+ messages in thread
* bug#69743: [PATCH] update grimshot package definition
2024-03-12 18:13 ` Jack Hill
@ 2024-03-21 1:38 ` Jack Hill
0 siblings, 0 replies; 7+ messages in thread
From: Jack Hill @ 2024-03-21 1:38 UTC (permalink / raw)
To: Ignas Lapėnas; +Cc: Hilton Chain, 69743-done
Looks like grimshot was updated in a sparate commit in
fcf0fc0f33e6fc4ac96e585db5b048be620c3438
Thanks!
Jack
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2024-03-21 1:39 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2024-03-12 9:56 [bug#69743] [PATCH] update grimshot package definition Ignas Lapėnas
2024-03-12 13:29 ` Jack Hill
2024-03-12 13:33 ` Ignas Lapėnas
2024-03-12 14:28 ` Ignas Lapėnas
2024-03-12 18:13 ` Jack Hill
2024-03-21 1:38 ` bug#69743: " Jack Hill
2024-03-12 14:26 ` [bug#69743] " Ignas Lapėnas
Code repositories for project(s) associated with this public inbox
https://git.savannah.gnu.org/cgit/guix.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).