[bug#29618] [PATCH] gnu: Add uthash.

[bug#29618] [PATCH] gnu: Add uthash.

[Tobias Geerinckx-Rice]

* gnu/packages/datastructures.scm (uthash): New public variable.
---
 gnu/packages/datastructures.scm | 54 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 54 insertions(+)

diff --git a/gnu/packages/datastructures.scm b/gnu/packages/datastructures.scm
index 36318ee04..7db2fc82a 100644
--- a/gnu/packages/datastructures.scm
+++ b/gnu/packages/datastructures.scm
@@ -116,3 +116,57 @@ with the number of cores.  liburcu-cds provides efficient data structures
 based on RCU and lock-free algorithms.  These structures include hash tables,
 queues, stacks, and doubly-linked lists.")
     (license license:lgpl2.1+)))
+
+(define-public uthash
+  (package
+    (name "uthash")
+    (version "2.0.2")
+    (source
+     (origin
+       (method url-fetch)
+       (file-name (string-append name "-" version ".tar.gz"))
+       (uri (string-append "https://github.com/troydhanson/uthash/archive/v"
+                           version ".tar.gz"))
+       (sha256
+        (base32
+         "1la82gdlyl7m8ahdjirigwfh7zjgkc24cvydrqcri0vsvm8iv8rl"))))
+    (build-system gnu-build-system)
+    (native-inputs
+     `(("perl" ,perl)))
+    (arguments
+     `(#:make-flags (list "CC=gcc")
+       #:phases
+       (modify-phases %standard-phases
+         (delete 'configure)            ; nothing to configure
+         (delete 'build)                ; nothing to build
+         (replace 'check
+           (lambda* (#:key make-flags #:allow-other-keys)
+             (with-directory-excursion "tests"
+               (zero? (apply system* "make"
+                             make-flags)))))
+         (replace 'install
+           ;; There is no top-level Makefile to do this for us.
+           (lambda* (#:key outputs #:allow-other-keys)
+             (let* ((out (assoc-ref outputs "out"))
+                    (doc (string-append out "/share/doc/" ,name))
+                    (include (string-append out "/include")))
+               ;; Don't install HTML files: they are generated from these .txt
+               ;; files, could be stale, and updating them requires ‘asciidoc‘.
+               (for-each (λ (file) (install-file file doc))
+                         (append (list "LICENSE")
+                                 (find-files "doc" "\\.txt$")))
+               (for-each (λ (file) (install-file file include))
+                         (find-files "src" "\\.h$"))))))))
+    (home-page "https://troydhanson.github.io/uthash/")
+    (synopsis
+     "Hash tables, lists, and other data structures implemented as C macros")
+    (description
+     "uthash implements a hash table and a few other basic data structures
+as C preprocessor macros.  It aims to be minimalistic and efficient: it's
+around 1,000 lines of code which, being macros, inline automatically.
+
+Unlike function calls with fixed prototypes, macros operate on untyped
+arguments.  Thus, they are able to work with any type of structure or key.
+Any C structure can be stored in a hash table by adding @code{UT_hash_handle}
+to the structure and choosing one or more fields to act as the key.")
+    (license license:bsd-2)))
-- 
2.15.0

[bug#29618] [PATCH] gnu: Add uthash.

[Ludovic Courtès]

Tobias Geerinckx-Rice <me@tobias.gr> skribis:

> * gnu/packages/datastructures.scm (uthash): New public variable.

LGTM, thanks!

Ludo'.

[bug#29618] [PATCH] gnu: Add uthash.

[Marius Bakke]

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

Tobias Geerinckx-Rice <me@tobias.gr> writes:

> * gnu/packages/datastructures.scm (uthash): New public variable.
> ---
>  gnu/packages/datastructures.scm | 54 +++++++++++++++++++++++++++++++++++++++++
>  1 file changed, 54 insertions(+)
>
> diff --git a/gnu/packages/datastructures.scm b/gnu/packages/datastructures.scm
> index 36318ee04..7db2fc82a 100644
> --- a/gnu/packages/datastructures.scm
> +++ b/gnu/packages/datastructures.scm
> @@ -116,3 +116,57 @@ with the number of cores.  liburcu-cds provides efficient data structures
>  based on RCU and lock-free algorithms.  These structures include hash tables,
>  queues, stacks, and doubly-linked lists.")
>      (license license:lgpl2.1+)))
> +
> +(define-public uthash
> +  (package
> +    (name "uthash")
> +    (version "2.0.2")
> +    (source
> +     (origin
> +       (method url-fetch)
> +       (file-name (string-append name "-" version ".tar.gz"))
> +       (uri (string-append "https://github.com/troydhanson/uthash/archive/v"
> +                           version ".tar.gz"))
> +       (sha256
> +        (base32
> +         "1la82gdlyl7m8ahdjirigwfh7zjgkc24cvydrqcri0vsvm8iv8rl"))))
> +    (build-system gnu-build-system)
> +    (native-inputs
> +     `(("perl" ,perl)))
> +    (arguments
> +     `(#:make-flags (list "CC=gcc")
> +       #:phases
> +       (modify-phases %standard-phases
> +         (delete 'configure)            ; nothing to configure
> +         (delete 'build)                ; nothing to build
> +         (replace 'check
> +           (lambda* (#:key make-flags #:allow-other-keys)
> +             (with-directory-excursion "tests"
> +               (zero? (apply system* "make"
> +                             make-flags)))))
> +         (replace 'install
> +           ;; There is no top-level Makefile to do this for us.
> +           (lambda* (#:key outputs #:allow-other-keys)
> +             (let* ((out (assoc-ref outputs "out"))
> +                    (doc (string-append out "/share/doc/" ,name))
> +                    (include (string-append out "/include")))
> +               ;; Don't install HTML files: they are generated from these .txt
> +               ;; files, could be stale, and updating them requires ‘asciidoc‘.
> +               (for-each (λ (file) (install-file file doc))
> +                         (append (list "LICENSE")
> +                                 (find-files "doc" "\\.txt$")))

Just FYI: In 'core-updates', there is now a phase that installs license
files automatically.

> +               (for-each (λ (file) (install-file file include))
> +                         (find-files "src" "\\.h$"))))))))

Return #t here.  LGTM!

> +    (home-page "https://troydhanson.github.io/uthash/")
> +    (synopsis
> +     "Hash tables, lists, and other data structures implemented as C macros")
> +    (description
> +     "uthash implements a hash table and a few other basic data structures
> +as C preprocessor macros.  It aims to be minimalistic and efficient: it's
> +around 1,000 lines of code which, being macros, inline automatically.
> +
> +Unlike function calls with fixed prototypes, macros operate on untyped
> +arguments.  Thus, they are able to work with any type of structure or key.
> +Any C structure can be stored in a hash table by adding @code{UT_hash_handle}
> +to the structure and choosing one or more fields to act as the key.")
> +    (license license:bsd-2)))
> -- 
> 2.15.0

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

bug#29618: [PATCH] gnu: Add uthash.

[Tobias Geerinckx-Rice]

[-- Attachment #1.1: Type: text/plain, Size: 226 bytes --]

Ludo', Marius,

Thanks to both of you for the review.

Pushed as cc3ac162c558a51c90b76b84b081a15e28d0baad. I've removed the
explicit LICENSE file installation, which indeed belongs elsewhere.

Kind regards,

T G-R


[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 248 bytes --]