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

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.
This commit is contained in:
Ludovic Courtès 2018-04-30 11:56:14 +02:00
parent 70ab130a49
commit 3edbe53924
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
1 changed files with 9 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
gnu/packages/skribilo.scm
View File

@ -1,5 +1,5 @@
;;; GNU Guix --- Functional package management for GNU ;;; 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. ;;; This file is part of GNU Guix.
;;; ;;;
@ -31,22 +31,18 @@
(define-public skribilo (define-public skribilo
(package (package
(name "skribilo") (name "skribilo")
(version "0.9.3") (version "0.9.4")
(source (origin (source (origin
(method url-fetch) (method url-fetch)
(uri (string-append "mirror://savannah/skribilo/skribilo-" (uri (string-append "mirror://savannah/skribilo/skribilo-"
version ".tar.gz")) version ".tar.gz"))
(sha256 (sha256
(base32 (base32
"04d8xa76jvlz25jnc6p1gzsplwcwcqrmi3f7ixdhddhl1chyz66y")))) "06ywnfjfa9sxrzdszb5sryzg266380g519cm64kq62sskzl7zmnf"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
;; Make the modules available under the usual location. ;; Make the modules available under the usual location.
'(#:configure-flags (list (string-append "--with-guilemoduledir=" '(#:phases
(assoc-ref %outputs "out")
"/share/guile/site/2.0"))
#:phases
(modify-phases %standard-phases (modify-phases %standard-phases
(add-before 'configure 'pre-configure (add-before 'configure 'pre-configure
(lambda* (#:key inputs #:allow-other-keys) (lambda* (#:key inputs #:allow-other-keys)
@ -57,8 +53,8 @@
(substitute* "src/skribilo.in" (substitute* "src/skribilo.in"
(("^exec (.*) -c" _ things) (("^exec (.*) -c" _ things)
(string-append "exec " things (string-append "exec " things
" -L " reader "/share/guile/site/2.0" " -L " reader "/share/guile/site/2.2"
" -C " reader "/share/guile/site/2.0" " -C " reader "/lib/guile/2.2/site-ccache"
" -c")))) " -c"))))
#t))) #t)))
@ -66,7 +62,7 @@
(native-inputs `(("pkg-config" ,pkg-config))) (native-inputs `(("pkg-config" ,pkg-config)))
(inputs `(("guile" ,guile-2.0) (inputs `(("guile" ,guile-2.2)
("imagemagick" ,imagemagick) ("imagemagick" ,imagemagick)
("ghostscript" ,ghostscript) ; for 'convert' ("ghostscript" ,ghostscript) ; for 'convert'
("ploticus" ,ploticus) ("ploticus" ,ploticus)
@ -74,8 +70,8 @@
;; The 'skribilo' command needs them, and for people using Skribilo as a ;; The 'skribilo' command needs them, and for people using Skribilo as a
;; library, these inputs are needed as well. ;; library, these inputs are needed as well.
(propagated-inputs `(("guile-reader" ,guile2.0-reader) (propagated-inputs `(("guile-reader" ,guile-reader)
("guile-lib" ,guile2.0-lib))) ("guile-lib" ,guile-lib)))
(home-page "https://www.nongnu.org/skribilo/") (home-page "https://www.nongnu.org/skribilo/")
(synopsis "Document production tool written in Guile Scheme") (synopsis "Document production tool written in Guile Scheme")