On 2019-01-04 22:38, Ricardo Wurmus wrote:
> Hi,
>
>> From: swedebugia <[email protected]>
>> Date: Fri, 4 Jan 2019 21:20:46 +0100
>> Subject: [PATCH] gnu: artanis: Update to 0.3.1.
>>
>> * gnu/packages/guile.scm (artanis): Update it. Added note about
>> guile-csv.
>
> This should be
>
> --8<---------------cut here---------------start------------->8---
> gnu: artanis: Update to 0.3.1.
>
> * gnu/packages/guile.scm (artanis): Update to 0.3.1.
> [inputs]: Add guile-json and guile-redis.
> [source]: Unbundle guile-redis and guile-json in snippet.
> [arguments]: Delete strip phase.
> --8<---------------cut here---------------end--------------->8---
>
>> + (delete 'strip))))
>
> Why is this needed?
>
>> + ;; native-search-paths are needed but left out because we propagate it
>> + ;; from the installation of guile.
>> + ;; On foreign distributions you have to set this manually no matter if
>> + ;; you installed guile with guix or not. On GuixSD it should be set
>> + ;; correctly automatically (Guile is always installed there)
>
> I don’t know what this is trying to say, and it is pretty verbose.
> Should the guile-* inputs be propagated instead? Please remove this
> comment.
Fixed. Is this OK?
--
Cheers
Swedebugia
From 4ddf3a25bdd98100a1e063c129d70d3182ea46c6 Mon Sep 17 00:00:00 2001
From: swedebugia <[email protected]>
Date: Sun, 6 Jan 2019 16:47:41 +0100
Subject: [PATCH] gnu: artanis: Update to 0.3.1.
* gnu/packages/guile.scm (artanis): Update to 0.3.1.
[snippet] Remove bundled guile-redis and add substitute
for guile-redis.
[inputs] Add guile-redis.
---
gnu/packages/guile.scm | 20 +++++++++++++++++---
1 file changed, 17 insertions(+), 3 deletions(-)
diff --git a/gnu/packages/guile.scm b/gnu/packages/guile.scm
index 07b568ee7..928bb065d 100644
--- a/gnu/packages/guile.scm
+++ b/gnu/packages/guile.scm
@@ -20,6 +20,7 @@
;;; Copyright © 2018 Arun Isaac <[email protected]>
;;; Copyright © 2018 Pierre-Antoine Rouby <[email protected]>
;;; Copyright © 2018 Eric Bavier <[email protected]>
+;;; Copyright © 2018 swedebugia <[email protected]>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -528,7 +529,7 @@ program can be installed in one go.")
;;;
(define-public artanis
- (let ((release "0.2.1")
+ (let ((release "0.3.1")
(revision 3))
(package
(name "artanis")
@@ -543,17 +544,26 @@ program can be installed in one go.")
(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)
@@ -565,9 +575,13 @@ program can be installed in one go.")
""))
#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
--
2.19.2
