summaryrefslogtreecommitdiff
path: root/gnu/packages/skribilo.scm
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2018-04-30 11:56:14 +0200
committerLudovic Courtès <ludo@gnu.org>2018-04-30 14:22:43 +0200
commit3edbe539240ad508e35ac1add3b44e8d849b2c5a (patch)
tree6c4fd1e81ebd8c60d846f0156b43ed232c4def0c /gnu/packages/skribilo.scm
parent70ab130a49678071c3412f78793a8bd0b677714f (diff)
gnu: skribilo: Update to 0.9.4 and switch to Guile 2.2.
* gnu/packages/skribilo.scm (skribilo): Update to 0.9.4. [arguments]: Remove #:configure-flags. Adjust -C flag added to 'skribilo.in' in 'pre-configure' phase. [inputs]: Switch to GUILE-2.2. [native-inputs]: Switch to GUILE-LIB and GUILE-READER.
Diffstat (limited to 'gnu/packages/skribilo.scm')
-rw-r--r--gnu/packages/skribilo.scm22
1 files changed, 9 insertions, 13 deletions
diff --git a/gnu/packages/skribilo.scm b/gnu/packages/skribilo.scm
index f10acaec70..12bdd1a2fa 100644
--- a/gnu/packages/skribilo.scm
+++ b/gnu/packages/skribilo.scm
@@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU
-;;; Copyright © 2013, 2014, 2015, 2016, 2017 Ludovic Courtès <ludo@gnu.org>
+;;; Copyright © 2013, 2014, 2015, 2016, 2017, 2018 Ludovic Courtès <ludo@gnu.org>
;;;
;;; This file is part of GNU Guix.
;;;
@@ -31,22 +31,18 @@
(define-public skribilo
(package
(name "skribilo")
- (version "0.9.3")
+ (version "0.9.4")
(source (origin
(method url-fetch)
(uri (string-append "mirror://savannah/skribilo/skribilo-"
version ".tar.gz"))
(sha256
(base32
- "04d8xa76jvlz25jnc6p1gzsplwcwcqrmi3f7ixdhddhl1chyz66y"))))
+ "06ywnfjfa9sxrzdszb5sryzg266380g519cm64kq62sskzl7zmnf"))))
(build-system gnu-build-system)
(arguments
;; Make the modules available under the usual location.
- '(#:configure-flags (list (string-append "--with-guilemoduledir="
- (assoc-ref %outputs "out")
- "/share/guile/site/2.0"))
-
- #:phases
+ '(#:phases
(modify-phases %standard-phases
(add-before 'configure 'pre-configure
(lambda* (#:key inputs #:allow-other-keys)
@@ -57,8 +53,8 @@
(substitute* "src/skribilo.in"
(("^exec (.*) -c" _ things)
(string-append "exec " things
- " -L " reader "/share/guile/site/2.0"
- " -C " reader "/share/guile/site/2.0"
+ " -L " reader "/share/guile/site/2.2"
+ " -C " reader "/lib/guile/2.2/site-ccache"
" -c"))))
#t)))
@@ -66,7 +62,7 @@
(native-inputs `(("pkg-config" ,pkg-config)))
- (inputs `(("guile" ,guile-2.0)
+ (inputs `(("guile" ,guile-2.2)
("imagemagick" ,imagemagick)
("ghostscript" ,ghostscript) ; for 'convert'
("ploticus" ,ploticus)
@@ -74,8 +70,8 @@
;; The 'skribilo' command needs them, and for people using Skribilo as a
;; library, these inputs are needed as well.
- (propagated-inputs `(("guile-reader" ,guile2.0-reader)
- ("guile-lib" ,guile2.0-lib)))
+ (propagated-inputs `(("guile-reader" ,guile-reader)
+ ("guile-lib" ,guile-lib)))
(home-page "https://www.nongnu.org/skribilo/")
(synopsis "Document production tool written in Guile Scheme")