[bug#74818] [PATCH] gnu: cl-nodgui: Update to 0.7.2.0-2.9a1b2c6.

[bug#74818] [PATCH] gnu: cl-nodgui: Update to 0.7.2.0-2.9a1b2c6.

[GNU Guix Live]

Change-Id: If230ce77603bfc30686a1036908687d461312b75
---
 gnu/packages/lisp-xyz.scm | 25 ++++++++-----------------
 1 file changed, 8 insertions(+), 17 deletions(-)

diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm
index 16f3fe6b1b..ecbbd125f6 100644
--- a/gnu/packages/lisp-xyz.scm
+++ b/gnu/packages/lisp-xyz.scm
@@ -22844,11 +22844,11 @@ (define-public ecl-nkeymaps
   (sbcl-package->ecl-package sbcl-nkeymaps))
 
 (define-public sbcl-nodgui
-  (let ((commit "dc3efed8f93d4955e59347824f8f6d018e1a22e0")
-        (revision "1"))
+  (let ((commit "9a1b2c6419adce2ba317497328276f8d63843279")
+        (revision "2"))
     (package
       (name "sbcl-nodgui")
-      (version (git-version "0.7.0.3" revision commit))
+      (version (git-version "0.7.2.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -22857,10 +22857,12 @@ (define-public sbcl-nodgui
                (commit commit)))
          (file-name (git-file-name "cl-nodgui" version))
          (sha256
-          (base32 "1kjbimzl9q74dz1fhl03n49607li55q6h0kdygfyr0n8cnf5638j"))))
+          (base32 "1qanhxn46bwq8a10v61n46q4j8avp7n1m2687bi2wdylz1pgakyq"))))
       (build-system asdf-build-system/sbcl)
       (native-inputs
        (list sbcl-clunit2))
+      (propagated-inputs
+       (list tk tklib))
       (inputs
        (list sbcl-alexandria
              sbcl-bordeaux-threads
@@ -22878,19 +22880,8 @@ (define-public sbcl-nodgui
              sbcl-sdl2-ttf
              sbcl-static-vectors
              sbcl-trivial-garbage
-             sbcl-zpng
-             tk
-             tklib))
-      (arguments
-       (list #:phases
-             #~(modify-phases %standard-phases
-                 (add-after 'unpack 'fix-paths
-                   (lambda* (#:key inputs #:allow-other-keys)
-                     (substitute* "src/wish-communication.lisp"
-                       (("#-freebsd \"wish\"")
-                        (string-append "#-freebsd \""
-                                       (search-input-file inputs "/bin/wish")
-                                       "\""))))))))
+             sbcl-zpng))
+      (arguments '())
       (synopsis "Common Lisp bindings for the Tk GUI toolkit")
       (description
        "Nodgui (@emph{No Drama GUI}) is a Common Lisp binding for the Tk GUI

base-commit: 27750bd0cddddab9e900f289a5520314ef66487e
-- 
2.46.0

[bug#74818] [PATCH] gnu: cl-nodgui: Update to 0.7.2.0-2.9a1b2c6.

[Guillaume Le Vaillant]

[-- Attachment #1: Type: text/plain, Size: 1639 bytes --]

GNU Guix Live <cage-dev@twistfold.it> skribis:

> Change-Id: If230ce77603bfc30686a1036908687d461312b75
> ---
>  gnu/packages/lisp-xyz.scm | 25 ++++++++-----------------
>  1 file changed, 8 insertions(+), 17 deletions(-)
>
> diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm
> index 16f3fe6b1b..ecbbd125f6 100644
> --- a/gnu/packages/lisp-xyz.scm
> +++ b/gnu/packages/lisp-xyz.scm
> @@ -22844,11 +22844,11 @@ (define-public ecl-nkeymaps
>    (sbcl-package->ecl-package sbcl-nkeymaps))
>  
>  (define-public sbcl-nodgui
> [...]
> +      (propagated-inputs
> +       (list tk tklib))
>        (inputs
>         (list sbcl-alexandria
>               sbcl-bordeaux-threads
> @@ -22878,19 +22880,8 @@ (define-public sbcl-nodgui
>               sbcl-sdl2-ttf
>               sbcl-static-vectors
>               sbcl-trivial-garbage
> -             sbcl-zpng
> -             tk
> -             tklib))
> -      (arguments
> -       (list #:phases
> -             #~(modify-phases %standard-phases
> -                 (add-after 'unpack 'fix-paths
> -                   (lambda* (#:key inputs #:allow-other-keys)
> -                     (substitute* "src/wish-communication.lisp"
> -                       (("#-freebsd \"wish\"")
> -                        (string-append "#-freebsd \""
> -                                       (search-input-file inputs "/bin/wish")
> -                                       "\""))))))))

Hi.
Why did you replace the 'fix-paths' phase by propagated inputs?
We usually try to avoid propagating inputs if possible as it can create
conflicts in profiles.

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 247 bytes --]

[bug#74818] [PATCH] gnu: cl-nodgui: Update to 0.7.2.0-2.9a1b2c6.

[cage]

On 17/12/24 11:50, Guillaume Le Vaillant wrote:

 > Hi.

Hi, thanks for reviewing this patch!

 > Why did you replace the 'fix-paths' phase by propagated inputs?
 > We usually try to avoid propagating inputs if possible as it can
 > create conflicts in profiles.

I was not aware of this issue, sorry! This version of the library, at 
runtime, tries to guess the path of a valid wish executable and, then, 
starts a process executing said executable, communicating with the 
parent process via a pipe. The `fix-path' is no more applicable as it 
assumes that the path to wish is hardcoded in the source code, which is 
not true, starting from this version of the library. Moreover leaving 
the `tk' dependency to `inputs' makes the library unable to guess a path 
for wish,  leading to a crash at runtime. My changes seems to make the 
library works as intended but I am very open to suggestions if a better 
solution exists.

Bye!
C.

[bug#74818] [PATCH] gnu: cl-nodgui: Update to 0.7.2.0-2.9a1b2c6.

[cage]

Hi!

Please consider checking my last patch, I think I was able to properly 
get rid of the `propagated-inputs', while keeping the package working of 
course! :)

Bye!
C.

[bug#74818] [PATCH] gnu: cl-nodgui: Update to 0.7.2.0-2.9a1b2c6.

[GNU Guix Live]

Change-Id: If230ce77603bfc30686a1036908687d461312b75
---
 gnu/packages/lisp-xyz.scm | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/gnu/packages/lisp-xyz.scm b/gnu/packages/lisp-xyz.scm
index 827febc703..a01e48d93e 100644
--- a/gnu/packages/lisp-xyz.scm
+++ b/gnu/packages/lisp-xyz.scm
@@ -22844,11 +22844,11 @@ (define-public ecl-nkeymaps
   (sbcl-package->ecl-package sbcl-nkeymaps))
 
 (define-public sbcl-nodgui
-  (let ((commit "dc3efed8f93d4955e59347824f8f6d018e1a22e0")
-        (revision "1"))
+  (let ((commit "9a1b2c6419adce2ba317497328276f8d63843279")
+        (revision "2"))
     (package
       (name "sbcl-nodgui")
-      (version (git-version "0.7.0.3" revision commit))
+      (version (git-version "0.7.2.0" revision commit))
       (source
        (origin
          (method git-fetch)
@@ -22857,7 +22857,7 @@ (define-public sbcl-nodgui
                (commit commit)))
          (file-name (git-file-name "cl-nodgui" version))
          (sha256
-          (base32 "1kjbimzl9q74dz1fhl03n49607li55q6h0kdygfyr0n8cnf5638j"))))
+          (base32 "1qanhxn46bwq8a10v61n46q4j8avp7n1m2687bi2wdylz1pgakyq"))))
       (build-system asdf-build-system/sbcl)
       (native-inputs
        (list sbcl-clunit2))
@@ -22880,15 +22880,16 @@ (define-public sbcl-nodgui
              sbcl-trivial-garbage
              sbcl-zpng
              tk
-             tklib))
+             tklib
+             tcllib))
       (arguments
        (list #:phases
              #~(modify-phases %standard-phases
                  (add-after 'unpack 'fix-paths
                    (lambda* (#:key inputs #:allow-other-keys)
                      (substitute* "src/wish-communication.lisp"
-                       (("#-freebsd \"wish\"")
-                        (string-append "#-freebsd \""
+                       (("\\(guess-wish-interpreter-path\\)")
+                        (string-append "\""
                                        (search-input-file inputs "/bin/wish")
                                        "\""))))))))
       (synopsis "Common Lisp bindings for the Tk GUI toolkit")

base-commit: 4a314f880be5c71b59b6d72a9b238b938c348563
-- 
2.46.0