[PATCH] gnu: emacs-org-board: Update to 1138-2.500fe02.

  • Open
  • quality assurance status badge
Details
3 participants
  • Cayetano Santos
  • Christopher Baines
  • Nicolas Goaziou
Owner
unassigned
Submitted by
Cayetano Santos
Severity
normal
C
C
Cayetano Santos wrote on 2 Feb 09:45 +0100
(address . guix-patches@gnu.org)(name . Cayetano Santos)(address . csantosb@inventati.org)
c733335e117a7e826d67f2d11130f34ab5e81ab4.1706863516.git.csantosb@inventati.org
* gnu/packages/emacs-xyz.scm (emacs-org-board): Update to 1138-2.500fe02.
---
gnu/packages/emacs-xyz.scm | 12 +++++-------
1 file changed, 5 insertions(+), 7 deletions(-)

Toggle diff (42 lines)
diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
index c7e6852194..3e6d09c509 100644
--- a/gnu/packages/emacs-xyz.scm
+++ b/gnu/packages/emacs-xyz.scm
@@ -27782,8 +27782,8 @@ (define-public emacs-cpreproc-openvdb
(license license:gpl3+)))
(define-public emacs-org-board
- (let ((commit "1393bd46d11a81328ed4fb8471831415a3efe224")
- (revision "1"))
+ (let ((commit "500fe02bc114e5b535a2eb2ab73954d79428168f")
+ (revision "2"))
(package
(name "emacs-org-board")
(version (git-version "1138" revision commit))
@@ -27795,7 +27795,7 @@ (define-public emacs-org-board
(file-name (git-file-name name version))
(sha256
(base32
- "1kryrg988c3sbxyp1sdgc6xdv2iz6kiflpzn2rw4z3l4grzab53b"))))
+ "1mcghw9mmlyqsgxk97hd57495sfx8dp6ig7qgs5xn2b2k0ygv4vf"))))
(build-system emacs-build-system)
(arguments
(list
@@ -27805,11 +27805,9 @@ (define-public emacs-org-board
(lambda* (#:key inputs #:allow-other-keys)
(emacs-substitute-variables "org-board.el"
("org-board-wget-program"
- (search-input-file inputs "/bin/wget"))))))))
- (inputs
- (list wget))
+ (search-input-file inputs "/bin/wget2"))))))))
(propagated-inputs
- (list emacs-org emacs-ztree))
+ (list emacs-ztree wget2))
(home-page "https://github.com/charlesroelli/org-board")
(synopsis "Bookmarking and web archival system for Org mode")
(description

base-commit: c692808a5e1413480162be1406186a63bd92651c
--
2.41.0
C
C
Christopher Baines wrote on 13 Feb 12:21 +0100
(name . Cayetano Santos)(address . csantosb@inventati.org)
87plx0boch.fsf@cbaines.net
Cayetano Santos via Guix-patches via <guix-patches@gnu.org> writes:

Toggle quote (41 lines)
> * gnu/packages/emacs-xyz.scm (emacs-org-board): Update to 1138-2.500fe02.
> ---
> gnu/packages/emacs-xyz.scm | 12 +++++-------
> 1 file changed, 5 insertions(+), 7 deletions(-)
>
> diff --git a/gnu/packages/emacs-xyz.scm b/gnu/packages/emacs-xyz.scm
> index c7e6852194..3e6d09c509 100644
> --- a/gnu/packages/emacs-xyz.scm
> +++ b/gnu/packages/emacs-xyz.scm
> @@ -27782,8 +27782,8 @@ (define-public emacs-cpreproc-openvdb
> (license license:gpl3+)))
>
> (define-public emacs-org-board
> - (let ((commit "1393bd46d11a81328ed4fb8471831415a3efe224")
> - (revision "1"))
> + (let ((commit "500fe02bc114e5b535a2eb2ab73954d79428168f")
> + (revision "2"))
> (package
> (name "emacs-org-board")
> (version (git-version "1138" revision commit))
> @@ -27795,7 +27795,7 @@ (define-public emacs-org-board
> (file-name (git-file-name name version))
> (sha256
> (base32
> - "1kryrg988c3sbxyp1sdgc6xdv2iz6kiflpzn2rw4z3l4grzab53b"))))
> + "1mcghw9mmlyqsgxk97hd57495sfx8dp6ig7qgs5xn2b2k0ygv4vf"))))
> (build-system emacs-build-system)
> (arguments
> (list
> @@ -27805,11 +27805,9 @@ (define-public emacs-org-board
> (lambda* (#:key inputs #:allow-other-keys)
> (emacs-substitute-variables "org-board.el"
> ("org-board-wget-program"
> - (search-input-file inputs "/bin/wget"))))))))
> - (inputs
> - (list wget))
> + (search-input-file inputs "/bin/wget2"))))))))
> (propagated-inputs
> - (list emacs-org emacs-ztree))
> + (list emacs-ztree wget2))

Thanks for the patch, these changes around wget/wget2 look confusing to
me though.

The reason for the emacs-substitute-variables bit is to allow wget to
just be an input rather than a propagated input, but you're making wget2
a propagated input here. This change and the motivation behind it is
also missing from the commit message.

Thanks,

Chris
-----BEGIN PGP SIGNATURE-----

iQKlBAEBCgCPFiEEPonu50WOcg2XVOCyXiijOwuE9XcFAmXLUP5fFIAAAAAALgAo
aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldDNF
ODlFRUU3NDU4RTcyMEQ5NzU0RTBCMjVFMjhBMzNCMEI4NEY1NzcRHG1haWxAY2Jh
aW5lcy5uZXQACgkQXiijOwuE9XcP4RAAuc8E5FnYNJdO4VGtbNEQnYvGqCG8dCFq
ORyWji/8onOnbVNaOOr8J4BQjTGmLY94IEEZOtIY6kBkWe2NIUpG6JO10jGZg5iF
Tr5nh6Lh5Zwu4OzrQEHdU3qA1wjqHxZLINihJG/a0eDZcRHBHFqhKxkAp49QFK3a
goyj55ufBUCjp4BcLNQX3Cvr6QpL1Q2ZckX0PJVT/pe8j5VKWmOV8HgNpjn9mgXN
8kljAYXb4VKLmLw6uGnOalmgjjkopWbu0BNhhA2hAVnVgP5GBi7sz70oSqdKWJeQ
51LfME6uDtXPG5KJWhSQ70jpRKpshvxdBij69kWahS76ufxPo5w8abG6w9PNv7fN
DpR7FgP+e6PKO9OzHokC6RUBHzO2g1d7wBpkWpysWpQeWhG2+OnXh0oS/8CT6Lie
aB81e7mdpfmxs41BbvRIRqThp5QQKh+QokCZoWImmgpUBstoaCSAt+C5xX+JRwf5
tyX6DpWGtBZIQLmB7hm7dXYN/Q7CIylfbuIEl0JHcmuDf8G60hn3xJQN19OB1oEN
ZLn3RU1vOr1M8EyO8VmMoaAHSiSlGM0zWBvInV/tabOGUEFCNVzVu0Qw6WEMAEvX
zatI1zvcsDe8xpWT3lw2sWIZUCPVV7u2kS2M3lra5EF/kOcrbzS3gNdp77E96i9t
zxpBZv+c3wA=
=cqO0
-----END PGP SIGNATURE-----

C
C
Cayetano Santos wrote on 13 Feb 14:18 +0100
(name . Christopher Baines)(address . mail@cbaines.net)
87eddgv6i1.fsf@inventati.org
Toggle quote (10 lines)
>mar. 13 févr. 2024 at 11:21, Christopher Baines <mail@cbaines.net> wrote:

> Thanks for the patch, these changes around wget/wget2 look confusing to
> me though.
>
> The reason for the emacs-substitute-variables bit is to allow wget to
> just be an input rather than a propagated input, but you're making wget2
> a propagated input here. This change and the motivation behind it is
> also missing from the commit message.

When one installs emacs-org-board, wget2-2.1.0 gets installed along with
it as for emacs-substitute-variables, as you say, and the variable
org-board-wget-program is bound to this hardcoded value.

Once one decides to upgrade wget2 to something different (say, in a
different profile), this logic breaks. User needs to manually bind
org-board-wget-program to whatever wget2 is after upgrading. At this
point, wget2 becomes a native-input requirement.

Please, correct me if I’m wrong.

Cayetano
N
N
Nicolas Goaziou wrote on 22 Feb 11:52 +0100
(name . Cayetano Santos via Guix-patches via)(address . guix-patches@gnu.org)
871q94py81.fsf@nicolasgoaziou.fr
Hello,

Cayetano Santos via Guix-patches via <guix-patches@gnu.org> writes:

Toggle quote (4 lines)
> When one installs emacs-org-board, wget2-2.1.0 gets installed along with
> it as for emacs-substitute-variables, as you say, and the variable
> org-board-wget-program is bound to this hardcoded value.

Correct.

Toggle quote (5 lines)
> Once one decides to upgrade wget2 to something different (say, in a
> different profile), this logic breaks. User needs to manually bind
> org-board-wget-program to whatever wget2 is after upgrading. At this
> point, wget2 becomes a native-input requirement.

This is not correct. No action is required from the user.
`org-board-wget-program' still points to the wget program defined as an
input to emacs-org-board, and will still be used at run time.

Of course, the user still can point `org-board-wget-program' to their
new and shiny wget binary, but this is not required.

I also suggest to keep wget (or wget2) as an input and use
`emacs-substitute-variables'.

Regards,
--
Nicolas Goaziou
?