me
/
guix
Archived
1
0
Fork 0
Code

gnu: skribilo: Update to 0.9.5. 

* gnu/packages/skribilo.scm (skribilo): Update to 0.9.5.
[arguments]: Adjust 'pre-configure' phase to use the right effective
version.
[inputs]: Replace GUILE-2.2 with GUILE-3.0.
[propagated-inputs]: Adjust accordingly.
master
Ludovic Courtès 2020-11-01 23:53:25 +01:00
parent 197c1676d3
commit 3ba0563645
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
1 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
gnu/packages/skribilo.scm
View File

@ -20,6 +20,7 @@
#:use-module (guix packages) #:use-module (guix packages)
#:use-module (guix download) #:use-module (guix download)
#:use-module (guix licenses) #:use-module (guix licenses)
#:use-module ((guix utils) #:select (version-major+minor))
#:use-module (guix build-system gnu) #:use-module (guix build-system gnu)
#:use-module (gnu packages guile) #:use-module (gnu packages guile)
#:use-module (gnu packages guile-xyz) #:use-module (gnu packages guile-xyz)
@ -32,30 +33,35 @@
(define-public skribilo (define-public skribilo
(package (package
(name "skribilo") (name "skribilo")
(version "0.9.4") (version "0.9.5")
(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
"06ywnfjfa9sxrzdszb5sryzg266380g519cm64kq62sskzl7zmnf")))) "02dzy2imqgfmwda4d1r51205si4c0r4fp2gf22sb0kv3qhhnm0h0"))))
(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.
'(#:phases `(#: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)
;; Make sure the 'skribilo' command gets to see ;; Make sure the 'skribilo' command gets to see
;; Guile-Reader, even if Guile-Reader is not in the search ;; Guile-Reader, even if Guile-Reader is not in the search
;; path. ;; path.
(let ((reader (assoc-ref inputs "guile-reader"))) (let ((reader (assoc-ref inputs "guile-reader"))
(effective ,(version-major+minor
(package-version
(car (assoc-ref (package-inputs this-package)
"guile"))))))
(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.2" " -L " reader "/share/guile/site/" effective
" -C " reader "/lib/guile/2.2/site-ccache" " -C " reader
"/lib/guile/" effective "/site-ccache"
" -c")))) " -c"))))
#t))) #t)))
@ -63,7 +69,7 @@
(native-inputs `(("pkg-config" ,pkg-config))) (native-inputs `(("pkg-config" ,pkg-config)))
(inputs `(("guile" ,guile-2.2) (inputs `(("guile" ,guile-3.0)
("imagemagick" ,imagemagick) ("imagemagick" ,imagemagick)
("ghostscript" ,ghostscript) ; for 'convert' ("ghostscript" ,ghostscript) ; for 'convert'
("ploticus" ,ploticus) ("ploticus" ,ploticus)
@ -71,8 +77,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.2-reader) (propagated-inputs `(("guile-reader" ,guile-reader)
("guile-lib" ,guile2.2-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")