nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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>
This commit is contained in:
swedebugia 2019-01-06 16:47:41 +01:00 committed by Ricardo Wurmus
parent 0791437f97
commit cd81199cbd
No known key found for this signature in database
GPG Key ID: 197A5888235FACAC
1 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
gnu/packages/guile-xyz.scm
View File

@ -20,6 +20,7 @@
;;; Copyright © 2018 Arun Isaac <arunisaac@systemreboot.net> ;;; Copyright © 2018 Arun Isaac <arunisaac@systemreboot.net>
;;; Copyright © 2018 Pierre-Antoine Rouby <pierre-antoine.rouby@inria.fr> ;;; Copyright © 2018 Pierre-Antoine Rouby <pierre-antoine.rouby@inria.fr>
;;; Copyright © 2018 Eric Bavier <bavier@member.fsf.org> ;;; Copyright © 2018 Eric Bavier <bavier@member.fsf.org>
;;; Copyright © 2019 swedebugia <swedebugia@riseup.net>
;;; ;;;
;;; This file is part of GNU Guix. ;;; This file is part of GNU Guix.
;;; ;;;
@ -82,8 +83,8 @@
#:use-module ((srfi srfi-1) #:select (alist-delete))) #:use-module ((srfi srfi-1) #:select (alist-delete)))
(define-public artanis (define-public artanis
(let ((release "0.2.1") (let ((release "0.3.1")
(revision 3)) (revision 0))
(package (package
(name "artanis") (name "artanis")
(version (if (zero? revision) (version (if (zero? revision)
@ -97,17 +98,26 @@
(file-name (string-append name "-" version ".tar.gz")) (file-name (string-append name "-" version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"041ajcg2pz918kd9iqcj4inpzddc3impvz3r2nhlpbv8zrz011hn")) "0hqr5m3mb558bdhkc2sadmd9cbrhp3y525wx7cwirgy6i0zmay68"))
(modules '((guix build utils))) (modules '((guix build utils)))
(snippet (snippet
'(begin '(begin
;; Unbundle guile-redis and guile-json
(delete-file-recursively "artanis/third-party/json.scm") (delete-file-recursively "artanis/third-party/json.scm")
(delete-file-recursively "artanis/third-party/json") (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" (substitute* '("artanis/artanis.scm"
"artanis/lpc.scm"
"artanis/oht.scm") "artanis/oht.scm")
(("(#:use-module \\()artanis third-party (json\\))" _ (("(#:use-module \\()artanis third-party (json\\))" _
use-module json) use-module json)
(string-append 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" (substitute* "artanis/oht.scm"
(("([[:punct:][:space:]]+)(->json-string)([[:punct:][:space:]]+)" (("([[:punct:][:space:]]+)(->json-string)([[:punct:][:space:]]+)"
_ pre json-string post) _ pre json-string post)
@ -119,9 +129,13 @@
"")) ""))
#t)))) #t))))
(build-system gnu-build-system) (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. ;; TODO: Add guile-dbi and guile-dbd optional dependencies.
(inputs `(("guile" ,guile-2.2) (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 (native-inputs `(("bash" ,bash) ;for the `source' builtin
("pkgconfig" ,pkg-config) ("pkgconfig" ,pkg-config)
("util-linux" ,util-linux))) ;for the `script' command ("util-linux" ,util-linux))) ;for the `script' command