unofficial mirror of guix-patches@gnu.org 
 help / color / mirror / code / Atom feed
* [bug#41389] [PATCH] gnu: guile-dsv: Wrap script.
@ 2020-05-19  4:14 Jack Hill
  2020-05-23 14:28 ` Ludovic Courtès
  0 siblings, 1 reply; 10+ messages in thread
From: Jack Hill @ 2020-05-19  4:14 UTC (permalink / raw)
  To: 41389

* gnu/packages/guile-xyz.scm (guile-dsv)[arguments]: Add "wrap program" phase.
---
 gnu/packages/guile-xyz.scm | 27 ++++++++++++++++++++++++++-
 1 file changed, 26 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm
index 674b1f922b..ee2e44653e 100644
--- a/gnu/packages/guile-xyz.scm
+++ b/gnu/packages/guile-xyz.scm
@@ -25,6 +25,7 @@
 ;;; Copyright © 2019 Timothy Sample <samplet@ngyro.com>
 ;;; Copyright © 2019, 2020 Martin Becze <mjbecze@riseup.net>
 ;;; Copyright © 2020 Evan Straw <evan.straw99@gmail.com>
+;;; Copyright © 2020 Jack Hill <jackhill@jackhill.us>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -467,7 +468,9 @@ you send to a FIFO file.")
     (inputs `(("guile" ,guile-2.2)))
     (propagated-inputs `(("guile2.2-lib" ,guile2.2-lib)))
     (arguments
-     '(#:phases (modify-phases %standard-phases
+     `(#:modules ((ice-9 match) (ice-9 ftw)
+                  ,@%gnu-build-system-modules)
+       #:phases (modify-phases %standard-phases
                   (add-before 'configure 'set-guilesitedir
                     (lambda _
                       (substitute* "Makefile.in"
@@ -482,6 +485,28 @@ $(datadir)/guile/site/$(GUILE_EFFECTIVE_VERSION)\n"))
                         (("^guilesitedir =.*$")
                          "guilesitedir = \
 $(datadir)/guile/site/$(GUILE_EFFECTIVE_VERSION)\n"))
+                      #t))
+                  (add-after 'install 'wrap-program
+                    (lambda* (#:key inputs outputs #:allow-other-keys)
+                      (let* ((out (assoc-ref outputs "out"))
+                             (bin (string-append out "/bin"))
+                             (site (string-append out "/share/guile/site"))
+                             (guile-lib (assoc-ref inputs "guile2.2-lib")))
+                        (match (scandir site)
+                          (("." ".." version)
+                           (let ((modules (string-append site "/" version))
+                                 (compiled-modules (string-append
+                                                    out "/lib/guile/" version
+                                                    "/site-ccache")))
+                             (wrap-program (string-append bin "/dsv")
+                               `("GUILE_LOAD_PATH" prefix
+                                 (,modules
+                                  ,(string-append guile-lib "/share/guile/site")))
+                               `("GUILE_LOAD_COMPILED_PATH" prefix
+                                 (,compiled-modules
+                                  ,(string-append guile-lib "/lib/guile/"
+                                                  version
+                                                  "/site-ccache"))))))))
                       #t)))))
     (home-page "https://github.com/artyom-poptsov/guile-dsv")
     (synopsis "DSV module for Guile")
-- 
2.26.2





^ permalink raw reply related	[flat|nested] 10+ messages in thread

* [bug#41389] [PATCH] gnu: guile-dsv: Wrap script.
  2020-05-19  4:14 [bug#41389] [PATCH] gnu: guile-dsv: Wrap script Jack Hill
@ 2020-05-23 14:28 ` Ludovic Courtès
  2020-05-23 22:48   ` Jack Hill
  0 siblings, 1 reply; 10+ messages in thread
From: Ludovic Courtès @ 2020-05-23 14:28 UTC (permalink / raw)
  To: Jack Hill; +Cc: 41389

Hi,

Jack Hill <jackhill@jackhill.us> skribis:

> * gnu/packages/guile-xyz.scm (guile-dsv)[arguments]: Add "wrap program" phase.

[...]

> +                  (add-after 'install 'wrap-program
> +                    (lambda* (#:key inputs outputs #:allow-other-keys)
> +                      (let* ((out (assoc-ref outputs "out"))
> +                             (bin (string-append out "/bin"))
> +                             (site (string-append out "/share/guile/site"))
> +                             (guile-lib (assoc-ref inputs "guile2.2-lib")))

We should eventually rename it to “guile-lib” and switch to Guile 3.0,
but that’s another story.

> +                        (match (scandir site)
> +                          (("." ".." version)

I recommend ‘target-guile-effective-version’ from (guix build
guile-build-system) instead of this trick.

Could you send an updated patch?

Thanks in advance!

Ludo’.




^ permalink raw reply	[flat|nested] 10+ messages in thread

* [bug#41389] [PATCH] gnu: guile-dsv: Wrap script.
  2020-05-23 14:28 ` Ludovic Courtès
@ 2020-05-23 22:48   ` Jack Hill
  2020-05-23 22:50     ` [bug#41389] [PATCH 1/2] " Jack Hill
  2020-05-24 19:58     ` [bug#41389] [PATCH] " Ludovic Courtès
  0 siblings, 2 replies; 10+ messages in thread
From: Jack Hill @ 2020-05-23 22:48 UTC (permalink / raw)
  To: Ludovic Courtès; +Cc: 41389

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

Ludo’,

Thanks for the review!

On Sat, 23 May 2020, Ludovic Courtès wrote:

> Hi,
>
> Jack Hill <jackhill@jackhill.us> skribis:
>
>> * gnu/packages/guile-xyz.scm (guile-dsv)[arguments]: Add "wrap program" phase.
>
> [...]
>
>> +                  (add-after 'install 'wrap-program
>> +                    (lambda* (#:key inputs outputs #:allow-other-keys)
>> +                      (let* ((out (assoc-ref outputs "out"))
>> +                             (bin (string-append out "/bin"))
>> +                             (site (string-append out "/share/guile/site"))
>> +                             (guile-lib (assoc-ref inputs "guile2.2-lib")))
>
> We should eventually rename it to “guile-lib” and switch to Guile 3.0,
> but that’s another story.

I had some time today, so I've done this in the second patch. This 
required substituting configure.ac as discussed at: 
https://github.com/artyom-poptsov/guile-dsv/pull/8

Could the regular expression I used be improved?

>> +                        (match (scandir site)
>> +                          (("." ".." version)
>
> I recommend ‘target-guile-effective-version’ from (guix build
> guile-build-system) instead of this trick.
>
> Could you send an updated patch?

Thanks for the tip. I did this, and cleaned up the up the let binding and 
wrap-program calls while I was at it. I hope it makes it clearer.

> Thanks in advance!

You're welcome!

Best,
Jack

^ permalink raw reply	[flat|nested] 10+ messages in thread

* [bug#41389] [PATCH 1/2] gnu: guile-dsv: Wrap script.
  2020-05-23 22:48   ` Jack Hill
@ 2020-05-23 22:50     ` Jack Hill
  2020-05-23 22:50       ` [bug#41389] [PATCH 2/2] gnu: guile-dsv: Build with Guile 3.0 Jack Hill
  2020-05-24 19:56       ` bug#41389: [PATCH 1/2] gnu: guile-dsv: Wrap script Ludovic Courtès
  2020-05-24 19:58     ` [bug#41389] [PATCH] " Ludovic Courtès
  1 sibling, 2 replies; 10+ messages in thread
From: Jack Hill @ 2020-05-23 22:50 UTC (permalink / raw)
  To: 41389; +Cc: ludo

* gnu/packages/guile-xyz.scm (guile-dsv)[arguments]: Add "wrap program"
  phase. Import target-guile-effective-version from guile-build-system for use
  in new phase.
---
 gnu/packages/guile-xyz.scm | 26 +++++++++++++++++++++++++-
 1 file changed, 25 insertions(+), 1 deletion(-)

diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm
index a1deee32d1..b1c1fd0f62 100644
--- a/gnu/packages/guile-xyz.scm
+++ b/gnu/packages/guile-xyz.scm
@@ -25,6 +25,7 @@
 ;;; Copyright © 2019 Timothy Sample <samplet@ngyro.com>
 ;;; Copyright © 2019, 2020 Martin Becze <mjbecze@riseup.net>
 ;;; Copyright © 2020 Evan Straw <evan.straw99@gmail.com>
+;;; Copyright © 2020 Jack Hill <jackhill@jackhill.us>
 ;;;
 ;;; This file is part of GNU Guix.
 ;;;
@@ -467,7 +468,12 @@ you send to a FIFO file.")
     (inputs `(("guile" ,guile-2.2)))
     (propagated-inputs `(("guile2.2-lib" ,guile2.2-lib)))
     (arguments
-     '(#:phases (modify-phases %standard-phases
+     `(#:modules (((guix build guile-build-system)
+                   #:select (target-guile-effective-version))
+                  ,@%gnu-build-system-modules)
+       #:imported-modules ((guix build guile-build-system)
+                           ,@%gnu-build-system-modules)
+       #:phases (modify-phases %standard-phases
                   (add-before 'configure 'set-guilesitedir
                     (lambda _
                       (substitute* "Makefile.in"
@@ -482,6 +488,24 @@ $(datadir)/guile/site/$(GUILE_EFFECTIVE_VERSION)\n"))
                         (("^guilesitedir =.*$")
                          "guilesitedir = \
 $(datadir)/guile/site/$(GUILE_EFFECTIVE_VERSION)\n"))
+                      #t))
+                  (add-after 'install 'wrap-program
+                    (lambda* (#:key inputs outputs #:allow-other-keys)
+                      (let* ((out (assoc-ref outputs "out"))
+                             (bin (string-append out "/bin"))
+                             (guile-lib (assoc-ref inputs "guile2.2-lib"))
+                             (version (target-guile-effective-version))
+                             (scm (string-append "/share/guile/site/"
+                                                 version))
+                             (go (string-append  "/lib/guile/"
+                                                 version "/site-ccache")))
+                        (wrap-program (string-append bin "/dsv")
+                          `("GUILE_LOAD_PATH" prefix
+                            (,(string-append out scm)
+                             ,(string-append guile-lib scm)))
+                          `("GUILE_LOAD_COMPILED_PATH" prefix
+                            (,(string-append out go)
+                             ,(string-append guile-lib go)))))
                       #t)))))
     (home-page "https://github.com/artyom-poptsov/guile-dsv")
     (synopsis "DSV module for Guile")
-- 
2.26.2





^ permalink raw reply related	[flat|nested] 10+ messages in thread

* [bug#41389] [PATCH 2/2] gnu: guile-dsv: Build with Guile 3.0.
  2020-05-23 22:50     ` [bug#41389] [PATCH 1/2] " Jack Hill
@ 2020-05-23 22:50       ` Jack Hill
  2020-05-24 19:56       ` bug#41389: [PATCH 1/2] gnu: guile-dsv: Wrap script Ludovic Courtès
  1 sibling, 0 replies; 10+ messages in thread
From: Jack Hill @ 2020-05-23 22:50 UTC (permalink / raw)
  To: 41389; +Cc: ludo

* gnu/packages/guile-xyz.scm (guile-dsv)[inputs]: Replace guile-2.2 with
  guile-3.0.
  [propagated-inputs]: Replace guile2.2-lib with guile-lib.
  [arguments]: Add "configure support guile3.0" phase.
  (guile2.2-dsv): New variable.
---
 gnu/packages/guile-xyz.scm | 21 ++++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm
index b1c1fd0f62..8dfce091ef 100644
--- a/gnu/packages/guile-xyz.scm
+++ b/gnu/packages/guile-xyz.scm
@@ -465,8 +465,8 @@ you send to a FIFO file.")
        ("automake" ,automake)
        ("pkg-config" ,pkg-config)
        ("texinfo" ,texinfo)))
-    (inputs `(("guile" ,guile-2.2)))
-    (propagated-inputs `(("guile2.2-lib" ,guile2.2-lib)))
+    (inputs `(("guile" ,guile-3.0)))
+    (propagated-inputs `(("guile-lib" ,guile-lib)))
     (arguments
      `(#:modules (((guix build guile-build-system)
                    #:select (target-guile-effective-version))
@@ -474,6 +474,14 @@ you send to a FIFO file.")
        #:imported-modules ((guix build guile-build-system)
                            ,@%gnu-build-system-modules)
        #:phases (modify-phases %standard-phases
+                  ;; Support Guile 3.0 in configure from upstream commit
+                  ;; 4c724577ccf19bb88580f72f2f6b166a0447ce3f
+                  (add-before 'bootstrap 'configure-support-guile3.0
+                    (lambda _
+                      (substitute* "configure.ac"
+                                  (("GUILE_PKG.*")
+                                   "GUILE_PKG([3.0 2.0 2.2])"))
+                      #t))
                   (add-before 'configure 'set-guilesitedir
                     (lambda _
                       (substitute* "Makefile.in"
@@ -493,7 +501,7 @@ $(datadir)/guile/site/$(GUILE_EFFECTIVE_VERSION)\n"))
                     (lambda* (#:key inputs outputs #:allow-other-keys)
                       (let* ((out (assoc-ref outputs "out"))
                              (bin (string-append out "/bin"))
-                             (guile-lib (assoc-ref inputs "guile2.2-lib"))
+                             (guile-lib (assoc-ref inputs "guile-lib"))
                              (version (target-guile-effective-version))
                              (scm (string-append "/share/guile/site/"
                                                  version))
@@ -515,6 +523,13 @@ delimiter-separated values (DSV) data format.  Guile-DSV supports the
 Unix-style DSV format and RFC 4180 format.")
     (license license:gpl3+)))
 
+(define-public guile2.2-dsv
+  (package
+    (inherit guile-dsv)
+    (name "guile2.2-dsv")
+    (inputs `(("guile" ,guile-2.2)))
+    (propagated-inputs `(("guile-lib" ,guile2.2-lib)))))
+
 (define-public guile-fibers
   (package
     (name "guile-fibers")
-- 
2.26.2





^ permalink raw reply related	[flat|nested] 10+ messages in thread

* bug#41389: [PATCH 1/2] gnu: guile-dsv: Wrap script.
  2020-05-23 22:50     ` [bug#41389] [PATCH 1/2] " Jack Hill
  2020-05-23 22:50       ` [bug#41389] [PATCH 2/2] gnu: guile-dsv: Build with Guile 3.0 Jack Hill
@ 2020-05-24 19:56       ` Ludovic Courtès
  1 sibling, 0 replies; 10+ messages in thread
From: Ludovic Courtès @ 2020-05-24 19:56 UTC (permalink / raw)
  To: Jack Hill; +Cc: 41389-done

Hello,

Jack Hill <jackhill@jackhill.us> skribis:

> * gnu/packages/guile-xyz.scm (guile-dsv)[arguments]: Add "wrap program"
>   phase. Import target-guile-effective-version from guile-build-system for use
>   in new phase.

[...]

> * gnu/packages/guile-xyz.scm (guile-dsv)[inputs]: Replace guile-2.2 with
>   guile-3.0.
>   [propagated-inputs]: Replace guile2.2-lib with guile-lib.
>   [arguments]: Add "configure support guile3.0" phase.
>   (guile2.2-dsv): New variable.

Applied both, thank you!

Ludo’.




^ permalink raw reply	[flat|nested] 10+ messages in thread

* [bug#41389] [PATCH] gnu: guile-dsv: Wrap script.
  2020-05-23 22:48   ` Jack Hill
  2020-05-23 22:50     ` [bug#41389] [PATCH 1/2] " Jack Hill
@ 2020-05-24 19:58     ` Ludovic Courtès
  2020-05-24 21:30       ` Jack Hill
  1 sibling, 1 reply; 10+ messages in thread
From: Ludovic Courtès @ 2020-05-24 19:58 UTC (permalink / raw)
  To: Jack Hill; +Cc: 41389

Jack Hill <jackhill@jackhill.us> skribis:

> I had some time today, so I've done this in the second patch. This
> required substituting configure.ac as discussed at:
> https://github.com/artyom-poptsov/guile-dsv/pull/8

Great.

> Could the regular expression I used be improved?

I had overlooked this question, what regexp are you referring to?

Ludo’.




^ permalink raw reply	[flat|nested] 10+ messages in thread

* [bug#41389] [PATCH] gnu: guile-dsv: Wrap script.
  2020-05-24 19:58     ` [bug#41389] [PATCH] " Ludovic Courtès
@ 2020-05-24 21:30       ` Jack Hill
  2020-05-25  7:41         ` Ludovic Courtès
  0 siblings, 1 reply; 10+ messages in thread
From: Jack Hill @ 2020-05-24 21:30 UTC (permalink / raw)
  To: Ludovic Courtès; +Cc: 41389

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

On Sun, 24 May 2020, Ludovic Courtès wrote:

> Jack Hill <jackhill@jackhill.us> skribis:
>
>> I had some time today, so I've done this in the second patch. This
>> required substituting configure.ac as discussed at:
>> https://github.com/artyom-poptsov/guile-dsv/pull/8
>
> Great.
>
>> Could the regular expression I used be improved?
>
> I had overlooked this question, what regexp are you referring to?

"GUILE_PKG.*" to match the line in configure.ac to be modified for Guile 
3.0 support. I think it's readable as is, and avoids the need to escape 
special characters, but it's very broad. Perhaps it should be more 
specific.

Best,
Jack

^ permalink raw reply	[flat|nested] 10+ messages in thread

* [bug#41389] [PATCH] gnu: guile-dsv: Wrap script.
  2020-05-24 21:30       ` Jack Hill
@ 2020-05-25  7:41         ` Ludovic Courtès
  2020-05-25 16:00           ` Jack Hill
  0 siblings, 1 reply; 10+ messages in thread
From: Ludovic Courtès @ 2020-05-25  7:41 UTC (permalink / raw)
  To: Jack Hill; +Cc: 41389

Hi,

Jack Hill <jackhill@jackhill.us> skribis:

> On Sun, 24 May 2020, Ludovic Courtès wrote:
>
>> Jack Hill <jackhill@jackhill.us> skribis:
>>
>>> I had some time today, so I've done this in the second patch. This
>>> required substituting configure.ac as discussed at:
>>> https://github.com/artyom-poptsov/guile-dsv/pull/8
>>
>> Great.
>>
>>> Could the regular expression I used be improved?
>>
>> I had overlooked this question, what regexp are you referring to?
>
> "GUILE_PKG.*" to match the line in configure.ac to be modified for
> Guile 3.0 support. I think it's readable as is, and avoids the need to
> escape special characters, but it's very broad. Perhaps it should be
> more specific.

I think it’s fine this way.  It’s unlikely to match anything else.

Ludo’.




^ permalink raw reply	[flat|nested] 10+ messages in thread

* [bug#41389] [PATCH] gnu: guile-dsv: Wrap script.
  2020-05-25  7:41         ` Ludovic Courtès
@ 2020-05-25 16:00           ` Jack Hill
  0 siblings, 0 replies; 10+ messages in thread
From: Jack Hill @ 2020-05-25 16:00 UTC (permalink / raw)
  To: Ludovic Courtès; +Cc: Jack Hill, 41389

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

On Mon, 25 May 2020, Ludovic Courtès wrote:

> Jack Hill <jackhill@jackhill.us> skribis:

[…]

>> "GUILE_PKG.*" to match the line in configure.ac to be modified for
>> Guile 3.0 support. I think it's readable as is, and avoids the need to
>> escape special characters, but it's very broad. Perhaps it should be
>> more specific.
>
> I think it’s fine this way.  It’s unlikely to match anything else.

Ok, makes sense. Thanks again for the review and applying the patches.

Best,
Jack

^ permalink raw reply	[flat|nested] 10+ messages in thread

end of thread, other threads:[~2020-05-25 16:05 UTC | newest]

Thread overview: 10+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-05-19  4:14 [bug#41389] [PATCH] gnu: guile-dsv: Wrap script Jack Hill
2020-05-23 14:28 ` Ludovic Courtès
2020-05-23 22:48   ` Jack Hill
2020-05-23 22:50     ` [bug#41389] [PATCH 1/2] " Jack Hill
2020-05-23 22:50       ` [bug#41389] [PATCH 2/2] gnu: guile-dsv: Build with Guile 3.0 Jack Hill
2020-05-24 19:56       ` bug#41389: [PATCH 1/2] gnu: guile-dsv: Wrap script Ludovic Courtès
2020-05-24 19:58     ` [bug#41389] [PATCH] " Ludovic Courtès
2020-05-24 21:30       ` Jack Hill
2020-05-25  7:41         ` Ludovic Courtès
2020-05-25 16:00           ` Jack Hill

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).