diff options
| author | swedebugia <swedebugia@riseup.net> | 2019-01-06 16:47:41 +0100 |
|---|---|---|
| committer | Ricardo Wurmus <rekado@elephly.net> | 2019-01-28 15:19:46 +0100 |
| commit | cd81199cbd1299b7b654960f14c266d97e862138 (patch) | |
| tree | bef2629dae3b5172ade3edbbcffb34aa20b9d937 | |
| parent | 0791437f972caa7e48de91ad5cb150a614f617c2 (diff) | |
| download | guix-cd81199cbd1299b7b654960f14c266d97e862138.tar guix-cd81199cbd1299b7b654960f14c266d97e862138.tar.gz | |
gnu: artanis: Update to 0.3.1.
* gnu/packages/guile-xyz.scm (artanis): Update to 0.3.1.
[snippet]: Remove bundled guile-redis.
[inputs]: Add guile-redis.
Signed-off-by: Ricardo Wurmus <rekado@elephly.net>
| -rw-r--r-- | gnu/packages/guile-xyz.scm | 22 |
1 files changed, 18 insertions, 4 deletions
diff --git a/gnu/packages/guile-xyz.scm b/gnu/packages/guile-xyz.scm index 93fa026778..c01d64b1f5 100644 --- a/gnu/packages/guile-xyz.scm +++ b/gnu/packages/guile-xyz.scm @@ -20,6 +20,7 @@ ;;; Copyright © 2018 Arun Isaac <arunisaac@systemreboot.net> ;;; Copyright © 2018 Pierre-Antoine Rouby <pierre-antoine.rouby@inria.fr> ;;; Copyright © 2018 Eric Bavier <bavier@member.fsf.org> +;;; Copyright © 2019 swedebugia <swedebugia@riseup.net> ;;; ;;; This file is part of GNU Guix. ;;; @@ -82,8 +83,8 @@ #:use-module ((srfi srfi-1) #:select (alist-delete))) (define-public artanis - (let ((release "0.2.1") - (revision 3)) + (let ((release "0.3.1") + (revision 0)) (package (name "artanis") (version (if (zero? revision) @@ -97,17 +98,26 @@ (file-name (string-append name "-" version ".tar.gz")) (sha256 (base32 - "041ajcg2pz918kd9iqcj4inpzddc3impvz3r2nhlpbv8zrz011hn")) + "0hqr5m3mb558bdhkc2sadmd9cbrhp3y525wx7cwirgy6i0zmay68")) (modules '((guix build utils))) (snippet '(begin + ;; Unbundle guile-redis and guile-json (delete-file-recursively "artanis/third-party/json.scm") (delete-file-recursively "artanis/third-party/json") + (delete-file-recursively "artanis/third-party/redis.scm") + (delete-file-recursively "artanis/third-party/redis") (substitute* '("artanis/artanis.scm" + "artanis/lpc.scm" "artanis/oht.scm") (("(#:use-module \\()artanis third-party (json\\))" _ use-module json) (string-append use-module json))) + (substitute* '("artanis/lpc.scm" + "artanis/session.scm") + (("(#:use-module \\()artanis third-party (redis\\))" _ + use-module redis) + (string-append use-module redis))) (substitute* "artanis/oht.scm" (("([[:punct:][:space:]]+)(->json-string)([[:punct:][:space:]]+)" _ pre json-string post) @@ -119,9 +129,13 @@ "")) #t)))) (build-system gnu-build-system) + ;; FIXME the bundled csv contains one more exported procedure + ;; (sxml->csv-string) than guile-csv. The author is maintainer of both + ;; projects. ;; TODO: Add guile-dbi and guile-dbd optional dependencies. (inputs `(("guile" ,guile-2.2) - ("guile-json" ,guile-json))) + ("guile-json" ,guile-json) + ("guile-redis" ,guile-redis))) (native-inputs `(("bash" ,bash) ;for the `source' builtin ("pkgconfig" ,pkg-config) ("util-linux" ,util-linux))) ;for the `script' command |