[PATCH] gnu: guile-dsv: Update 0.7.0.

  • Done
  • quality assurance status badge
Details
2 participants
  • Ludovic Courtès
  • Artyom V. Poptsov
Owner
unassigned
Submitted by
Artyom V. Poptsov
Severity
normal
A
A
Artyom V. Poptsov wrote on 15 Aug 2023 22:43
(address . guix-patches@gnu.org)
87zg2sghog.fsf@gmail.com
Hello Guixers,

this patch updates Guile-DSV[1] to version 0.7.0.
From ed393cba6608f23095717900b0016b814b1f7526 Mon Sep 17 00:00:00 2001
Message-Id: <ed393cba6608f23095717900b0016b814b1f7526.1692132150.git.poptsov.artyom@gmail.com>
From: "Artyom V. Poptsov" <poptsov.artyom@gmail.com>
Date: Tue, 15 Aug 2023 23:39:25 +0300
Subject: [PATCH] gnu: guile-dsv: Update to 0.7.0.

* gnu/packages/guile-xyz.scm (guile-dsv): Update to 0.7.0. Improve the
package style.
[inputs]: Add "bash-minimal".
[native-inputs]: Add "guile-smc".
[description}: Update.
(guile2.2-dsv) [inputs]: Add "bash-minimal".
---
gnu/packages/guile-xyz.scm | 44 ++++++++++++++++++++++----------------
1 file changed, 25 insertions(+), 19 deletions(-)

Toggle diff (86 lines)
diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm
index f5e985d107..b7848e6ead 100644
--- a/gnu/packages/guile-xyz.scm
+++ b/gnu/packages/guile-xyz.scm
@@ -728,7 +728,7 @@ (define-public guile-daemon
(define-public guile-dsv
(package
(name "guile-dsv")
- (version "0.6.0")
+ (version "0.7.0")
(source (origin
(method git-fetch)
(uri (git-reference
@@ -737,12 +737,17 @@ (define-public guile-dsv
(file-name (string-append name "-" version "-checkout"))
(sha256
(base32
- "0llivcgb7idglsapcmvb2qscds7768f2xfgr4lns8mzl2xf5hwvv"))))
+ "0shrzmbh6x3n3xzpcijkxk3f73z6m1i50zgc2dnnccwf4j1c78p2"))))
(build-system gnu-build-system)
- (native-inputs
- (list autoconf automake pkg-config texinfo help2man))
- (inputs (list guile-3.0))
- (propagated-inputs (list guile-lib))
+ (native-inputs (list autoconf
+ automake
+ pkg-config
+ texinfo
+ help2man
+ ;; needed when cross-compiling.
+ guile-smc))
+ (inputs (list bash-minimal guile-3.0))
+ (propagated-inputs (list guile-lib guile-smc))
(arguments
`(#:modules (((guix build guile-build-system)
#:select (target-guile-effective-version))
@@ -756,31 +761,32 @@ (define-public guile-dsv
(bin (string-append out "/bin"))
(guile-lib (assoc-ref inputs "guile-lib"))
(version (target-guile-effective-version))
- (scm (string-append "/share/guile/site/"
- version))
- (go (string-append "/lib/guile/"
- version "/site-ccache")))
+ (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)))
+ (,(string-append out scm) ,(string-append
+ guile-lib scm)))
`("GUILE_LOAD_COMPILED_PATH" prefix
- (,(string-append out go)
- ,(string-append guile-lib go)))))
- #t)))))
+ (,(string-append out go) ,(string-append guile-lib
+ go))))) #t)))))
(home-page "https://github.com/artyom-poptsov/guile-dsv")
(synopsis "DSV module for Guile")
(description
- "Guile-DSV is a GNU Guile module for working with the
-delimiter-separated values (DSV) data format. Guile-DSV supports the
-Unix-style DSV format and RFC 4180 format.")
+ "Guile-DSV is a GNU Guile module for working with the delimiter-separated
+values (DSV) data format. Guile-DSV supports the Unix-style DSV format and RFC 4180
+style format. Also Guile-DSV includes a console program named @code{dsv} that allows
+to view and process DSV data, including such operations as delimiter change,
+conversion from one DSV standard to another and printing the data as pseudographics
+tables.")
(license license:gpl3+)))
(define-public guile2.2-dsv
(package
(inherit guile-dsv)
(name "guile2.2-dsv")
- (inputs (list guile-2.2))
+ (inputs (list bash-minimal guile-2.2))
(propagated-inputs `(("guile-lib" ,guile2.2-lib)))))
(define-public guile-fibers-1.3

base-commit: 6eb0070f088cfdc4edb98fcfbea4b7aa68a2e30a
--
2.34.1
- Artyom

References:

--
Artyom "avp" Poptsov <poptsov.artyom@gmail.com>
CADR Hackerspace co-founder: https://cadrspace.ru/
GPG: D0C2 EAC1 3310 822D 98DE B57C E9C5 A2D9 0898 A02F
-----BEGIN PGP SIGNATURE-----

iQFNBAEBCgA3FiEE0MLqwTMQgi2Y3rV86cWi2QiYoC8FAmTb438ZHHBvcHRzb3Yu
YXJ0eW9tQGdtYWlsLmNvbQAKCRDpxaLZCJigLyuUB/4v97FlJlomy2K49roH7vOc
0lX6+/zlF8YEW/o9wqJ+6bnEQNu9v6Z13LXW6ywflMDn1yKGz+IFnYbFIOyWUqQk
Sjz0xANN//OlQCC7sXFom6w4VpjquIH6jNDEfOKvDX2PD922/dS6evQi+zcadvO7
Sutt/cmEqRAj9GxkqDKJ0G5y+Syk4WxJGs9uuOeyDE2TQzBYqRRCIhrj/W27lK9w
+tEZNyovmqGRPuj67q26fhlCoXiZB03YSjhj2fgH9IiRU4TZOTV8+ULzwT1dZPzL
+YyPr6Xvo/bR75AcZHAQT0884IyiP4ZUqnJ9D9VjjHdXJz0iVo0380DDAHN600PL
=vZCg
-----END PGP SIGNATURE-----

L
L
Ludovic Courtès wrote on 20 Aug 2023 23:16
(name . Artyom V. Poptsov)(address . poptsov.artyom@gmail.com)(address . 65320@debbugs.gnu.org)
87sf8dpg7t.fsf@gnu.org
Hi Artyom,

"Artyom V. Poptsov" <poptsov.artyom@gmail.com> skribis:

Toggle quote (13 lines)
> From ed393cba6608f23095717900b0016b814b1f7526 Mon Sep 17 00:00:00 2001
> Message-Id: <ed393cba6608f23095717900b0016b814b1f7526.1692132150.git.poptsov.artyom@gmail.com>
> From: "Artyom V. Poptsov" <poptsov.artyom@gmail.com>
> Date: Tue, 15 Aug 2023 23:39:25 +0300
> Subject: [PATCH] gnu: guile-dsv: Update to 0.7.0.
>
> * gnu/packages/guile-xyz.scm (guile-dsv): Update to 0.7.0. Improve the
> package style.
> [inputs]: Add "bash-minimal".
> [native-inputs]: Add "guile-smc".
> [description}: Update.
> (guile2.2-dsv) [inputs]: Add "bash-minimal".

‘guile2.2-dsv’ fails to build:

Toggle snippet (6 lines)
checking for Guile site directory... /gnu/store/8pwqca3v76ir3ph3dipj3vwy85xzhag6-guile-2.2.7/share/guile/site/2.2
checking if (string transform) is available... yes
checking if (smc fsm) is available... no
configure: error: required guile module not found: (smc fsm)

We could either fix it or remove it altogether if there’s no use for it.

WDYT?

Thanks,
Ludo’.
A
A
Artyom V. Poptsov wrote on 23 Aug 2023 20:35
(name . Ludovic Courtès)(address . ludo@gnu.org)(address . 65320@debbugs.gnu.org)
87edjt8v4a.fsf@gmail.com
Hello Ludovic,

I've fixed the build, here's the updated patch series.
From d3b75667d3b32e85cc76d0a7cffa3ba614eeaea7 Mon Sep 17 00:00:00 2001
Message-Id: <d3b75667d3b32e85cc76d0a7cffa3ba614eeaea7.1692815567.git.poptsov.artyom@gmail.com>
From: "Artyom V. Poptsov" <poptsov.artyom@gmail.com>
Date: Tue, 15 Aug 2023 23:39:25 +0300
Subject: [PATCH 1/4] gnu: guile-dsv: Update to 0.7.0.

* gnu/packages/guile-xyz.scm (guile-dsv): Update to 0.7.0. Improve the
package style.
[inputs]: Add "bash-minimal".
[native-inputs]: Add "guile-smc".
[description}: Update.
(guile2.2-dsv) [inputs]: Add "bash-minimal".
---
gnu/packages/guile-xyz.scm | 44 ++++++++++++++++++++++----------------
1 file changed, 25 insertions(+), 19 deletions(-)

Toggle diff (86 lines)
diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm
index 4e7c80ac8d..e031c85243 100644
--- a/gnu/packages/guile-xyz.scm
+++ b/gnu/packages/guile-xyz.scm
@@ -728,7 +728,7 @@ (define-public guile-daemon
(define-public guile-dsv
(package
(name "guile-dsv")
- (version "0.6.0")
+ (version "0.7.0")
(source (origin
(method git-fetch)
(uri (git-reference
@@ -737,12 +737,17 @@ (define-public guile-dsv
(file-name (string-append name "-" version "-checkout"))
(sha256
(base32
- "0llivcgb7idglsapcmvb2qscds7768f2xfgr4lns8mzl2xf5hwvv"))))
+ "0shrzmbh6x3n3xzpcijkxk3f73z6m1i50zgc2dnnccwf4j1c78p2"))))
(build-system gnu-build-system)
- (native-inputs
- (list autoconf automake pkg-config texinfo help2man))
- (inputs (list guile-3.0))
- (propagated-inputs (list guile-lib))
+ (native-inputs (list autoconf
+ automake
+ pkg-config
+ texinfo
+ help2man
+ ;; needed when cross-compiling.
+ guile-smc))
+ (inputs (list bash-minimal guile-3.0))
+ (propagated-inputs (list guile-lib guile-smc))
(arguments
`(#:modules (((guix build guile-build-system)
#:select (target-guile-effective-version))
@@ -756,31 +761,32 @@ (define-public guile-dsv
(bin (string-append out "/bin"))
(guile-lib (assoc-ref inputs "guile-lib"))
(version (target-guile-effective-version))
- (scm (string-append "/share/guile/site/"
- version))
- (go (string-append "/lib/guile/"
- version "/site-ccache")))
+ (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)))
+ (,(string-append out scm) ,(string-append
+ guile-lib scm)))
`("GUILE_LOAD_COMPILED_PATH" prefix
- (,(string-append out go)
- ,(string-append guile-lib go)))))
- #t)))))
+ (,(string-append out go) ,(string-append guile-lib
+ go))))) #t)))))
(home-page "https://github.com/artyom-poptsov/guile-dsv")
(synopsis "DSV module for Guile")
(description
- "Guile-DSV is a GNU Guile module for working with the
-delimiter-separated values (DSV) data format. Guile-DSV supports the
-Unix-style DSV format and RFC 4180 format.")
+ "Guile-DSV is a GNU Guile module for working with the delimiter-separated
+values (DSV) data format. Guile-DSV supports the Unix-style DSV format and RFC 4180
+style format. Also Guile-DSV includes a console program named @code{dsv} that allows
+to view and process DSV data, including such operations as delimiter change,
+conversion from one DSV standard to another and printing the data as pseudographics
+tables.")
(license license:gpl3+)))
(define-public guile2.2-dsv
(package
(inherit guile-dsv)
(name "guile2.2-dsv")
- (inputs (list guile-2.2))
+ (inputs (list bash-minimal guile-2.2))
(propagated-inputs `(("guile-lib" ,guile2.2-lib)))))
(define-public guile-fibers-1.3

base-commit: 7cad70566322262f6acdbbb965e867e34010eb55
--
2.34.1
From 14b451c6b4b0687e5eb13a02a6ec0566e65fa686 Mon Sep 17 00:00:00 2001
Message-Id: <14b451c6b4b0687e5eb13a02a6ec0566e65fa686.1692815567.git.poptsov.artyom@gmail.com>
In-Reply-To: <d3b75667d3b32e85cc76d0a7cffa3ba614eeaea7.1692815567.git.poptsov.artyom@gmail.com>
References: <d3b75667d3b32e85cc76d0a7cffa3ba614eeaea7.1692815567.git.poptsov.artyom@gmail.com>
From: "Artyom V. Poptsov" <poptsov.artyom@gmail.com>
Date: Wed, 23 Aug 2023 21:12:55 +0300
Subject: [PATCH 2/4] gnu: guile-smc: Fix build with Guile 2.2.

* gnu/packages/guile-xyz.scm (guile-smc): Fix build with Guile 2.2.
[native-inputs]: Replace "guile" with "guile-2.2" and "guile-lib" with
"guile2.2-lib".
---
gnu/packages/guile-xyz.scm | 3 +++
1 file changed, 3 insertions(+)

Toggle diff (16 lines)
diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm
index e031c85243..53ce4c0f8a 100644
--- a/gnu/packages/guile-xyz.scm
+++ b/gnu/packages/guile-xyz.scm
@@ -5423,6 +5423,9 @@ (define-public guile2.2-smc
(package
(inherit guile-smc)
(name "guile2.2-smc")
+ (native-inputs (modify-inputs (package-native-inputs guile-smc)
+ (replace "guile" guile-2.2)
+ (replace "guile-lib" guile2.2-lib)))
(inputs (modify-inputs (package-inputs guile-smc)
(replace "guile" guile-2.2)
(replace "guile-lib" guile2.2-lib)))))
--
2.34.1
From 01d687fb1d64035e0f97ef5706b5c5257e866ad5 Mon Sep 17 00:00:00 2001
Message-Id: <01d687fb1d64035e0f97ef5706b5c5257e866ad5.1692815567.git.poptsov.artyom@gmail.com>
In-Reply-To: <d3b75667d3b32e85cc76d0a7cffa3ba614eeaea7.1692815567.git.poptsov.artyom@gmail.com>
References: <d3b75667d3b32e85cc76d0a7cffa3ba614eeaea7.1692815567.git.poptsov.artyom@gmail.com>
From: "Artyom V. Poptsov" <poptsov.artyom@gmail.com>
Date: Wed, 23 Aug 2023 21:17:02 +0300
Subject: [PATCH 3/4] gnu: guile2.2-dsv: Fix build.

* gnu/packages/guile-xyz.scm (guile2.2-dsv):
[native-inputs]: Replace "guile-smc" with "guile2.2-smc" and add
"guile2.2-lib".
[inputs]: Replace "guile" with "guile-2.2" and "guile-smc" with
"guile2.2-smc".
[propagated-inputs]: Replace "guile-lib" with "guile2.2-lib" and
"guile-smc" with "guile2.2-smc".
---
gnu/packages/guile-xyz.scm | 11 +++++++++--
1 file changed, 9 insertions(+), 2 deletions(-)

Toggle diff (24 lines)
diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm
index 53ce4c0f8a..eab8677a0c 100644
--- a/gnu/packages/guile-xyz.scm
+++ b/gnu/packages/guile-xyz.scm
@@ -786,8 +786,15 @@ (define-public guile2.2-dsv
(package
(inherit guile-dsv)
(name "guile2.2-dsv")
- (inputs (list bash-minimal guile-2.2))
- (propagated-inputs `(("guile-lib" ,guile2.2-lib)))))
+ (native-inputs (modify-inputs (package-native-inputs guile-dsv)
+ (replace "guile-smc" guile2.2-smc)
+ (append guile2.2-lib)))
+ (inputs (modify-inputs (package-inputs guile-dsv)
+ (replace "guile" guile-2.2)
+ (replace "guile-lib" guile2.2-lib)))
+ (propagated-inputs (modify-inputs (package-propagated-inputs guile-dsv)
+ (replace "guile-lib" guile2.2-lib)
+ (replace "guile-smc" guile2.2-smc)))))
(define-public guile-fibers-1.3
(package
--
2.34.1
From bcbbaa31ba15f3df7c2c09b0a607175ef828dfb7 Mon Sep 17 00:00:00 2001
Message-Id: <bcbbaa31ba15f3df7c2c09b0a607175ef828dfb7.1692815567.git.poptsov.artyom@gmail.com>
In-Reply-To: <d3b75667d3b32e85cc76d0a7cffa3ba614eeaea7.1692815567.git.poptsov.artyom@gmail.com>
References: <d3b75667d3b32e85cc76d0a7cffa3ba614eeaea7.1692815567.git.poptsov.artyom@gmail.com>
From: "Artyom V. Poptsov" <poptsov.artyom@gmail.com>
Date: Wed, 23 Aug 2023 21:28:37 +0300
Subject: [PATCH 4/4] gnu: guile-dsv: Fix cross-compiling.

* gnu/packages/guile-xyz.scm (guile-dsv): Fix cross-compiling.
[native-inputs]: Add "guile-3.0" and "guile-lib".
(guile2.2-dsv) [native-inputs]: Replace "guile" with "guile-2.2"
and "guile-lib" with "guile2.2-lib".
---
gnu/packages/guile-xyz.scm | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)

Toggle diff (25 lines)
diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm
index eab8677a0c..749ae56053 100644
--- a/gnu/packages/guile-xyz.scm
+++ b/gnu/packages/guile-xyz.scm
@@ -745,6 +745,8 @@ (define-public guile-dsv
texinfo
help2man
;; needed when cross-compiling.
+ guile-3.0
+ guile-lib
guile-smc))
(inputs (list bash-minimal guile-3.0))
(propagated-inputs (list guile-lib guile-smc))
@@ -788,7 +790,8 @@ (define-public guile2.2-dsv
(name "guile2.2-dsv")
(native-inputs (modify-inputs (package-native-inputs guile-dsv)
(replace "guile-smc" guile2.2-smc)
- (append guile2.2-lib)))
+ (replace "guile" guile-2.2)
+ (replace "guile-lib" guile2.2-lib)))
(inputs (modify-inputs (package-inputs guile-dsv)
(replace "guile" guile-2.2)
(replace "guile-lib" guile2.2-lib)))
--
2.34.1
Thank you for reporting the problem!

- avp

--
Artyom "avp" Poptsov <poptsov.artyom@gmail.com>
CADR Hackerspace co-founder: https://cadrspace.ru/
GPG: D0C2 EAC1 3310 822D 98DE B57C E9C5 A2D9 0898 A02F
-----BEGIN PGP SIGNATURE-----

iQFNBAEBCgA3FiEE0MLqwTMQgi2Y3rV86cWi2QiYoC8FAmTmUXUZHHBvcHRzb3Yu
YXJ0eW9tQGdtYWlsLmNvbQAKCRDpxaLZCJigL8uRB/9X5bK8+yXHsnnonKlXbT3N
R1TxLYXT9adfmVvmf5fy3rmtfVetF7NMLJMd+3nLF5M92T0Ez3Uq8EC2+YiUHiUR
+xz7V9vAdC1iaG3h98R/Dzz6zH74DtQO7KD6d5kR2sFIzn2Dxbf07biU/dmLoVmI
kguxtILAMpnvQaDefiP2SN2hVMwlRrxM0/Uck2jr2f4ijpy+yGFUFf6YbgF35NId
mIgNs+yAi/EOnD1HbyUIU5PJwHc+MvVdu2g57JWpUJ+CXySYlpBVRrVfpBULv8qZ
/elBCWGJe+3iSS0N9ZVqgzebQsA+XAUXOp7eLVe6lG56z5rgHimUTDZQ83OzlweY
=2/c+
-----END PGP SIGNATURE-----

A
A
Artyom V. Poptsov wrote on 30 Aug 2023 16:56
(name . Ludovic Courtès)(address . ludo@gnu.org)(address . 65320@debbugs.gnu.org)
87sf80efz3.fsf@gmail.com
Hello,

just a gentle ping. ;-)

It would be great to see my patches merged (or to get any feedback for
that matter.)

Thanks!

- avp

--
Artyom "avp" Poptsov <poptsov.artyom@gmail.com>
CADR Hackerspace co-founder: https://cadrspace.ru/
GPG: D0C2 EAC1 3310 822D 98DE B57C E9C5 A2D9 0898 A02F
-----BEGIN PGP SIGNATURE-----

iQFNBAEBCgA3FiEE0MLqwTMQgi2Y3rV86cWi2QiYoC8FAmTvWKAZHHBvcHRzb3Yu
YXJ0eW9tQGdtYWlsLmNvbQAKCRDpxaLZCJigLx7zB/9SJGbz1qi+Yo4A+4KENqMk
yl3rsbpwRvKTgSpMdt8bSoBh1mJaUEGCcodf1AuMMyxFWoWADocni9CKfa7mMBJZ
W8P7E54KKTnv51IATzDrFPO15CTTh2I5Ze+krvSQcAipokZQekMQjJmmAGgf+6yc
kgeLVf+lTJJSlqQ6wZo8c8fnliN9NVQ8pb0B7L5q5F98xZJRB1k9OZCQsUKUrIC7
QfvKwGSN5zmMzhbCkD/p6sNoGS2IpKxl5qzb+CVnbZG/74gyXe8jqqCLb5NWbw/B
zHtVChOQDN1tZxwxHEYH4vdeZPwTpSNfz7MnGSM3ZEUFjv4Gdj5QX/BnqKrAufHy
=l/B0
-----END PGP SIGNATURE-----

L
L
Ludovic Courtès wrote on 8 Sep 2023 18:44
(name . Artyom V. Poptsov)(address . poptsov.artyom@gmail.com)(address . 65320-done@debbugs.gnu.org)
877cp04ntt.fsf@gnu.org
Hi Artyom,

Applied all 4 patches, thanks!

Ludo’.
Closed
?