gnu: dezyne: Update to 2.18.0.

* gnu/packages/dezyne.scm (dezyne): Update to 2.18.0.
[inputs]: Add boost.
[arguments]: Change assoc-ref memes to use gexps.

Change-Id: I1212de52db6c2b07122e756c68597b1f8ddbb313
This commit is contained in:
Janneke Nieuwenhuizen 2023-09-01 20:40:33 +02:00
parent e11b57de73
commit 05c2afc5cb
No known key found for this signature in database
GPG key ID: F3C1A0D9C1D65273

View file

@ -25,28 +25,33 @@ (define-module (gnu packages dezyne)
#:use-module (gnu packages) #:use-module (gnu packages)
#:use-module (gnu packages base) #:use-module (gnu packages base)
#:use-module (gnu packages bash) #:use-module (gnu packages bash)
#:use-module (gnu packages boost)
#:use-module (gnu packages guile) #:use-module (gnu packages guile)
#:use-module (gnu packages maths) #:use-module (gnu packages maths)
#:use-module (gnu packages pkg-config)) #:use-module (gnu packages pkg-config)
#:use-module (gnu packages pth))
(define-public dezyne (define-public dezyne
(package (package
(name "dezyne") (name "dezyne")
(version "2.17.8") (version "2.18.0")
(source (source
(origin (origin
(method url-fetch) (method url-fetch)
(uri (string-append "https://dezyne.org/download/dezyne/" (uri (string-append "https://dezyne.org/download/dezyne/"
name "-" version ".tar.gz")) name "-" version ".tar.gz"))
(sha256 (sha256
(base32 "0m5cnymcyg7k1jhp4xjpvpay7ia72xdzyjnjg0spsr4p7fy7yql4")))) (base32 "1lbrxycpvwmvif3gpjnz8iskvlxp7f8bl71k44j7acwqrp8j2szi"))))
(inputs (list bash-minimal (propagated-inputs (list boost
guile-3.0-latest
guile-json-4 guile-json-4
guile-readline guile-readline
scmackerel))
(inputs (list bash-minimal
guile-3.0
mcrl2-minimal mcrl2-minimal
pth
sed)) sed))
(native-inputs (list guile-3.0-latest pkg-config)) (native-inputs (list guile-3.0 pkg-config))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
(list (list
@ -58,21 +63,20 @@ (define-public dezyne
(lambda _ (lambda _
(setenv "GUILE_AUTO_COMPILE" "0"))) (setenv "GUILE_AUTO_COMPILE" "0")))
(add-after 'install 'install-readmes (add-after 'install 'install-readmes
(lambda* (#:key outputs #:allow-other-keys) (lambda _
(let* ((out (assoc-ref outputs "out")) (let* ((base (string-append #$name "-" #$version))
(base (string-append #$name "-" #$version)) (doc (string-append #$output "/share/doc/" base)))
(doc (string-append out "/share/doc/" base)))
(mkdir-p doc) (mkdir-p doc)
(copy-file "NEWS" (string-append doc "/NEWS"))))) (copy-file "NEWS" (string-append doc "/NEWS")))))
(add-after 'install 'wrap-binaries (add-after 'install 'wrap-binaries
(lambda* (#:key inputs outputs #:allow-other-keys) (lambda _
(let* ((out (assoc-ref outputs "out")) (let* ((bash #$(this-package-input "bash-minimal"))
(bash (assoc-ref %build-inputs "bash-minimal")) (guile #$(this-package-input "guile"))
(guile (assoc-ref %build-inputs "guile")) (json #$(this-package-input "guile-json"))
(json (assoc-ref %build-inputs "guile-json")) (mcrl2 #$(this-package-input "mcrl2-minimal"))
(mcrl2 (assoc-ref %build-inputs "mcrl2-minimal")) (readline #$(this-package-input "guile-readline"))
(readline (assoc-ref %build-inputs "guile-readline")) (scmackerel #$(this-package-input "scmackerel"))
(sed (assoc-ref %build-inputs "sed")) (sed #$(this-package-input "sed"))
(effective (read (effective (read
(open-pipe* OPEN_READ (open-pipe* OPEN_READ
"guile" "-c" "guile" "-c"
@ -83,15 +87,17 @@ (define-public dezyne
(string-append sed "/bin"))) (string-append sed "/bin")))
(scm-dir (string-append "/share/guile/site/" effective)) (scm-dir (string-append "/share/guile/site/" effective))
(scm-path (scm-path
(list (string-append out scm-dir) (list (string-append #$output scm-dir)
(string-append json scm-dir) (string-append json scm-dir)
(string-append readline scm-dir))) (string-append readline scm-dir)
(string-append scmackerel scm-dir)))
(go-dir (string-append "/lib/guile/" effective (go-dir (string-append "/lib/guile/" effective
"/site-ccache/")) "/site-ccache/"))
(go-path (list (string-append out go-dir) (go-path (list (string-append #$output go-dir)
(string-append json go-dir) (string-append json go-dir)
(string-append readline go-dir)))) (string-append readline go-dir)
(wrap-program (string-append out "/bin/dzn") (string-append scmackerel go-dir))))
(wrap-program (string-append #$output "/bin/dzn")
`("PATH" ":" prefix ,path) `("PATH" ":" prefix ,path)
`("GUILE_AUTO_COMPILE" ":" = ("0")) `("GUILE_AUTO_COMPILE" ":" = ("0"))
`("GUILE_LOAD_PATH" ":" prefix ,scm-path) `("GUILE_LOAD_PATH" ":" prefix ,scm-path)