mirror of
https://git.in.rschanz.org/ryan77627/guix.git
synced 2025-01-23 02:59:17 -05:00
gnu: chez: Add 'chez-scheme-for-system'.
* gnu/packages/chez.scm (chez-scheme-for-system): New procedure. (chez-srfi, chez-web, chez-sockets, chez-matchable, chez-irregex) (chez-fmt, chez-mit, chez-scmutils): Use 'chez-scheme-for-system'. * gnu/packages/loko.scm (loko-scheme): Likewise. * gnu/packages/emacs-xyz.scm (emacs-geiser-chez): Likewise Signed-off-by: Liliana Marie Prikler <liliana.prikler@gmail.com>
This commit is contained in:
parent
61ca3d9a84
commit
9e9e4686f7
3 changed files with 26 additions and 11 deletions
|
@ -47,7 +47,8 @@ (define-module (gnu packages chez)
|
|||
#:use-module (ice-9 match)
|
||||
#:use-module (srfi srfi-1)
|
||||
#:use-module (srfi srfi-26)
|
||||
#:export (nix-system->chez-machine
|
||||
#:export (chez-scheme-for-system
|
||||
nix-system->chez-machine
|
||||
chez-machine->nonthreaded
|
||||
chez-machine->threaded
|
||||
unpack-nanopass+stex))
|
||||
|
@ -67,6 +68,20 @@ (define-module (gnu packages chez)
|
|||
;;
|
||||
;; Code:
|
||||
|
||||
(define* (chez-scheme-for-system #:optional
|
||||
(system (or (%current-target-system)
|
||||
(%current-system))))
|
||||
"Return 'chez-scheme' unless only 'chez-scheme-for-racket' supports SYSTEM,
|
||||
including support for native threads."
|
||||
(if (or
|
||||
;; full support upstream
|
||||
(and=> (chez-upstream-features-for-system system)
|
||||
(cut memq 'threads <>))
|
||||
;; no support anywhere
|
||||
(not (nix-system->chez-machine system)))
|
||||
chez-scheme
|
||||
chez-scheme-for-racket))
|
||||
|
||||
(define (chez-machine->nonthreaded machine)
|
||||
"Given a string MACHINE naming a Chez Scheme machine type, returns a string
|
||||
naming the nonthreaded machine type for the same architecture and OS as
|
||||
|
@ -751,7 +766,7 @@ (define-public chez-srfi
|
|||
(file-name (git-file-name name version))))
|
||||
(build-system gnu-build-system)
|
||||
(native-inputs
|
||||
(list chez-scheme))
|
||||
(list (chez-scheme-for-system)))
|
||||
(arguments
|
||||
(list #:make-flags (chez-make-flags name version)
|
||||
#:test-target "test"
|
||||
|
@ -782,7 +797,7 @@ (define-public chez-web
|
|||
(base32 "1dq25qygyncbfq4kwwqqgyyakfqjwhp5q23vrf3bff1p66nyfl3b"))))
|
||||
(build-system gnu-build-system)
|
||||
(native-inputs
|
||||
(list chez-scheme
|
||||
(list (chez-scheme-for-system)
|
||||
ghostscript
|
||||
;; FIXME: This package fails to build with the error:
|
||||
;; mktexpk: don't know how to create bitmap font for bchr8r
|
||||
|
@ -847,7 +862,7 @@ (define-public chez-sockets
|
|||
(base32 "1n5fbwwz51fdzvjackgmnsgh363g9inyxv7kmzi0469cwavwcx5m"))))
|
||||
(build-system gnu-build-system)
|
||||
(native-inputs
|
||||
(list chez-scheme
|
||||
(list (chez-scheme-for-system)
|
||||
chez-web
|
||||
(texlive-updmap.cfg (list texlive-pdftex))))
|
||||
(arguments
|
||||
|
@ -933,7 +948,7 @@ (define-public chez-matchable
|
|||
(inputs
|
||||
(list chez-srfi)) ; for tests
|
||||
(native-inputs
|
||||
(list chez-scheme))
|
||||
(list (chez-scheme-for-system)))
|
||||
(arguments
|
||||
(list #:make-flags (chez-make-flags name version)
|
||||
#:test-target "test"
|
||||
|
@ -965,7 +980,7 @@ (define-public chez-irregex
|
|||
(propagated-inputs
|
||||
(list chez-srfi)) ; for irregex-utils
|
||||
(native-inputs
|
||||
(list chez-scheme))
|
||||
(list (chez-scheme-for-system)))
|
||||
(arguments
|
||||
(list #:make-flags (chez-make-flags name version)
|
||||
#:test-target "test"
|
||||
|
@ -996,7 +1011,7 @@ (define-public chez-fmt
|
|||
(propagated-inputs
|
||||
(list chez-srfi)) ; for irregex-utils
|
||||
(native-inputs
|
||||
(list chez-scheme))
|
||||
(list (chez-scheme-for-system)))
|
||||
(arguments
|
||||
(list #:make-flags (chez-make-flags name version)
|
||||
#:test-target "chez-check"
|
||||
|
@ -1059,7 +1074,7 @@ (define string->uninterned-symbol
|
|||
(inputs
|
||||
(list chez-srfi)) ; for tests
|
||||
(native-inputs
|
||||
(list chez-scheme))
|
||||
(list (chez-scheme-for-system)))
|
||||
(arguments
|
||||
(list #:make-flags (chez-make-flags name version)
|
||||
#:test-target "test"
|
||||
|
@ -1090,7 +1105,7 @@ (define-public chez-scmutils
|
|||
(inputs
|
||||
(list chez-srfi)) ; for tests
|
||||
(native-inputs
|
||||
(list chez-scheme))
|
||||
(list (chez-scheme-for-system)))
|
||||
(propagated-inputs
|
||||
(list chez-mit chez-srfi))
|
||||
(arguments
|
||||
|
|
|
@ -451,7 +451,7 @@ (define-public emacs-geiser-chez
|
|||
(string-append
|
||||
"(eval-after-load 'geiser-impl '" all ")"))))))))
|
||||
(inputs
|
||||
(list chez-scheme))
|
||||
(list (chez-scheme-for-system)))
|
||||
(propagated-inputs
|
||||
(list emacs-geiser))
|
||||
(home-page "https://nongnu.org/geiser/")
|
||||
|
|
|
@ -71,7 +71,7 @@ (define-public loko-scheme
|
|||
#t)))))
|
||||
(native-inputs
|
||||
`(("akku" ,akku)
|
||||
("chez-scheme" ,chez-scheme)
|
||||
("chez-scheme" ,(chez-scheme-for-system))
|
||||
("struct" ,guile-struct-pack)
|
||||
("laesare" ,guile-laesare)
|
||||
("pfds" ,guile-pfds)
|
||||
|
|
Loading…
Reference in a new issue