bug#44646: [PATCH] gnu: Add uuid support (back?) to recutils.

bug#44646: [PATCH] gnu: Add uuid support (back?) to recutils.

[John Soo]

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

Hi Guix,

I've been getting into some recutils recently and I found out ours is
not configured with uuid support.  Perhaps there are other optional
things we could add?

- John


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-gnu-Add-uuid-support-to-recutils.patch --]
[-- Type: text/x-patch, Size: 1237 bytes --]

From ad122b175d798ab3d50e7b41337694538043a218 Mon Sep 17 00:00:00 2001
From: John Soo <jsoo1@asu.edu>
Date: Sat, 14 Nov 2020 12:42:10 -0800
Subject: [PATCH] gnu: Add uuid support to recutils.

* gnu/packages/databases.scm (recutils): [inputs] Add lib output of
util-linux.
---
 gnu/packages/databases.scm | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm
index c3fb9b5c5f..c011bd398e 100644
--- a/gnu/packages/databases.scm
+++ b/gnu/packages/databases.scm
@@ -1144,12 +1144,13 @@ organized in a hash table or B+ tree.")
     (native-inputs `(("bc" ,bc)
                      ("bash:include" ,bash "include")
                      ("check" ,check)
-                     ("libuuid" ,util-linux)
+                     ("libuuid:out" ,util-linux)
                      ("pkg-config" ,pkg-config)))
 
     ;; TODO: Add more optional inputs.
     (inputs `(("curl" ,curl)
-              ("libgcrypt" ,libgcrypt)))
+              ("libgcrypt" ,libgcrypt)
+              ("libuuid:lib" ,util-linux "lib")))
     (synopsis "Manipulate plain text files as databases")
     (description
      "GNU Recutils is a set of tools and libraries for creating and
-- 
2.29.1

bug#44646: [PATCH] gnu: Add uuid support (back?) to recutils.

[Ludovic Courtès]

Hi,

John Soo <jsoo1@asu.edu> skribis:

> From ad122b175d798ab3d50e7b41337694538043a218 Mon Sep 17 00:00:00 2001
> From: John Soo <jsoo1@asu.edu>
> Date: Sat, 14 Nov 2020 12:42:10 -0800
> Subject: [PATCH] gnu: Add uuid support to recutils.
>
> * gnu/packages/databases.scm (recutils): [inputs] Add lib output of
> util-linux.

[...]

>      (native-inputs `(("bc" ,bc)
>                       ("bash:include" ,bash "include")
>                       ("check" ,check)
> -                     ("libuuid" ,util-linux)
> +                     ("libuuid:out" ,util-linux)

Is this one even necessary?  (The label is misleading.)

>                       ("pkg-config" ,pkg-config)))
>  
>      ;; TODO: Add more optional inputs.
>      (inputs `(("curl" ,curl)
> -              ("libgcrypt" ,libgcrypt)))
> +              ("libgcrypt" ,libgcrypt)
> +              ("libuuid:lib" ,util-linux "lib")))

Thanks,
Ludo’.

bug#44646: [PATCH] gnu: Add uuid support (back?) to recutils.

[John Soo]

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

Hi,


Ludovic Courtès <ludo@gnu.org> writes:

>>      (native-inputs `(("bc" ,bc)
>>                       ("bash:include" ,bash "include")
>>                       ("check" ,check)
>> -                     ("libuuid" ,util-linux)
>> +                     ("libuuid:out" ,util-linux)
>
> Is this one even necessary?  (The label is misleading.)
>
>>                       ("pkg-config" ,pkg-config)))
>>
>>      ;; TODO: Add more optional inputs.
>>      (inputs `(("curl" ,curl)
>> -              ("libgcrypt" ,libgcrypt)))
>> +              ("libgcrypt" ,libgcrypt)
>> +              ("libuuid:lib" ,util-linux "lib")))
>
> Thanks,
> Ludo’.

It seems to build OK without the native-input, so I removed it.

Thanks,

John


[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #2: 0001-gnu-Add-uuid-support-to-recutils.patch --]
[-- Type: text/x-patch, Size: 1182 bytes --]

From c7eee6d96ea4ce6516f6a528e3d2110f96fb44ec Mon Sep 17 00:00:00 2001
From: John Soo <jsoo1@asu.edu>
Date: Sat, 14 Nov 2020 12:42:10 -0800
Subject: [PATCH] gnu: Add uuid support to recutils.

* gnu/packages/databases.scm (recutils): [inputs] Add lib output of
util-linux.
---
 gnu/packages/databases.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/databases.scm b/gnu/packages/databases.scm
index c3fb9b5c5f..a36a43e188 100644
--- a/gnu/packages/databases.scm
+++ b/gnu/packages/databases.scm
@@ -1144,12 +1144,12 @@ organized in a hash table or B+ tree.")
     (native-inputs `(("bc" ,bc)
                      ("bash:include" ,bash "include")
                      ("check" ,check)
-                     ("libuuid" ,util-linux)
                      ("pkg-config" ,pkg-config)))
 
     ;; TODO: Add more optional inputs.
     (inputs `(("curl" ,curl)
-              ("libgcrypt" ,libgcrypt)))
+              ("libgcrypt" ,libgcrypt)
+              ("libuuid" ,util-linux "lib")))
     (synopsis "Manipulate plain text files as databases")
     (description
      "GNU Recutils is a set of tools and libraries for creating and
-- 
2.29.1

bug#44646: [PATCH] gnu: Add uuid support (back?) to recutils.

[Ludovic Courtès]

Hi,

John Soo <jsoo1@asu.edu> skribis:

> From c7eee6d96ea4ce6516f6a528e3d2110f96fb44ec Mon Sep 17 00:00:00 2001
> From: John Soo <jsoo1@asu.edu>
> Date: Sat, 14 Nov 2020 12:42:10 -0800
> Subject: [PATCH] gnu: Add uuid support to recutils.
>
> * gnu/packages/databases.scm (recutils): [inputs] Add lib output of
> util-linux.

Perfect.  Applied, thanks!

Ludo’.