artemist/mes
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

guix: Update package inputs to new style.

Browse source 
* guix/git/mes.scm (m2-planet)[native-inputs]: Use simple list.
* guix/git/mes.scm (nyacc-0.99): Likewise.
[inputs]: Use simple list.
(nyacc): Likewise.
(mes)[propagated-inputs]: Use simple list.
[native-inputs]: Use list instead of alist.
[native-search-paths]: New field.
This commit is contained in:
Jan (janneke) Nieuwenhuizen 2022-04-30 09:15:24 +02:00
parent c45bd1bdd6
commit 22f24be26a
No known key found for this signature in database
GPG key ID: F3C1A0D9C1D65273
1 changed files with 37 additions and 34 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

71
guix/git/mes.scm
View file

@ -1,5 +1,5 @@
;;; GNU Mes --- Maxwell Equations of Software ;;; GNU Mes --- Maxwell Equations of Software
;;; Copyright © 2016,2017,2018,2019,2020,2021 Jan (janneke) Nieuwenhuizen <janneke@gnu.org> ;;; Copyright © 2016,2017,2018,2019,2020,2021,2022 Jan (janneke) Nieuwenhuizen <janneke@gnu.org>
;;; ;;;
;;; This file is part of GNU Mes. ;;; This file is part of GNU Mes.
;;; ;;;
@ -101,8 +101,7 @@ get_machine.")
(sha256 (sha256
(base32 (base32
"1618fzav21x4vs29iv7g55c6xwnzjjcijw2z7yn5mcizhaxcaqck")))) "1618fzav21x4vs29iv7g55c6xwnzjjcijw2z7yn5mcizhaxcaqck"))))
(native-inputs (native-inputs (list mescc-tools))
`(("mescc-tools" ,mescc-tools)))
(build-system gnu-build-system) (build-system gnu-build-system)
(arguments (arguments
`(#:make-flags (list (string-append "PREFIX=" (assoc-ref %outputs "out")) `(#:make-flags (list (string-append "PREFIX=" (assoc-ref %outputs "out"))
@ -151,10 +150,8 @@ with introspective steps inbetween.")
"DOCDIR = @prefix@/share/doc/$(PACKAGE_TARNAME)\n")) "DOCDIR = @prefix@/share/doc/$(PACKAGE_TARNAME)\n"))
#t)))) #t))))
(build-system gnu-build-system) (build-system gnu-build-system)
(native-inputs (native-inputs (list pkg-config))
`(("pkg-config" ,pkg-config))) (inputs (list guile-2.2))
(inputs
`(("guile" ,guile-2.2)))
(synopsis "LALR(1) Parser Generator in Guile") (synopsis "LALR(1) Parser Generator in Guile")
(description (description
"NYACC is an LALR(1) parser generator implemented in Guile. "NYACC is an LALR(1) parser generator implemented in Guile.
@ -189,8 +186,7 @@ extensive examples, including parsers for the Javascript and C99 languages.")
(sha256 (sha256
(base32 (base32
"065ksalfllbdrzl12dz9d9dcxrv97wqxblslngsc6kajvnvlyvpk")))) "065ksalfllbdrzl12dz9d9dcxrv97wqxblslngsc6kajvnvlyvpk"))))
(inputs (inputs (list guile-3.0))))
`(("guile" ,guile-3.0)))))
(define-public mes (define-public mes
(package (package
@ -204,34 +200,41 @@ extensive examples, including parsers for the Javascript and C99 languages.")
(base32 #!mes!# "0mnryfkl0dwbr5gxp16j5s95gw7z1vm1fqa1pxabp0aiar1hw53s")))) (base32 #!mes!# "0mnryfkl0dwbr5gxp16j5s95gw7z1vm1fqa1pxabp0aiar1hw53s"))))
(build-system gnu-build-system) (build-system gnu-build-system)
(supported-systems '("aarch64-linux" "armhf-linux" "i686-linux" "x86_64-linux")) (supported-systems '("aarch64-linux" "armhf-linux" "i686-linux" "x86_64-linux"))
(propagated-inputs (propagated-inputs (list mescc-tools nyacc))
`(("mescc-tools" ,mescc-tools)
("nyacc" ,nyacc)))
(native-inputs (native-inputs
`(("guile" ,guile-3.0-latest) (append
,@(cond ((string-prefix? "x86_64-linux" (or (%current-target-system) (list guile-3.0)
(%current-system))) (let ((target-system (or (%current-target-system)
;; Use cross-compiler rather than #:system "i686-linux" to get (%current-system))))
;; MesCC 64 bit .go files installed ready for use with Guile. (cond
(let ((triplet "i686-unknown-linux-gnu")) ((string-prefix? "x86_64-linux" target-system)
`(("i686-linux-binutils" ,(cross-binutils triplet)) ;; Use cross-compiler rather than #:system "i686-linux" to get
("i686-linux-gcc" ,(cross-gcc triplet))))) ;; MesCC 64 bit .go files installed ready for use with Guile.
((string-prefix? "aarch64-linux" (or (%current-target-system) (list (cross-binutils "i686-unknown-linux-gnu")
(%current-system))) (cross-gcc "i686-unknown-linux-gnu")))
;; Use cross-compiler rather than #:system "armhf-linux" to get ((string-prefix? "aarch64-linux" target-system)
;; MesCC 64 bit .go files installed ready for use with Guile. ;; Use cross-compiler rather than #:system "armhf-linux" to get
(let ((triplet "arm-linux-gnueabihf")) ;; MesCC 64 bit .go files installed ready for use with Guile.
`(("arm-linux-binutils" ,(cross-binutils triplet)) (let ((triplet "arm-linux-gnueabihf"))
("arm-linux-gcc" ,(cross-gcc triplet))))) (list (cross-binutils triplet) (cross-gcc triplet))))
(else (else
'())) '())))
("graphviz" ,graphviz) (list graphviz help2man m2-planet
("help2man" ,help2man) perl ;build-aux/gitlog-to-changelog
("m2-planet" ,m2-planet) texinfo)))
("perl" ,perl) ; build-aux/gitlog-to-changelog
("texinfo" ,texinfo)))
(arguments (arguments
`(#:strip-binaries? #f)) ; binutil's strip b0rkes MesCC/M1/hex2 binaries `(#:strip-binaries? #f)) ; binutil's strip b0rkes MesCC/M1/hex2 binaries
(native-search-paths
(list (search-path-specification
(variable "C_INCLUDE_PATH")
(files '("include")))
(search-path-specification
(variable "LIBRARY_PATH")
(files '("lib")))
(search-path-specification
(variable "MES_PREFIX")
(separator #f)
(files '("")))))
(synopsis "Scheme interpreter and C compiler for full source bootstrapping") (synopsis "Scheme interpreter and C compiler for full source bootstrapping")
(description (description
"GNU Mes--Maxwell Equations of Software--brings the Reduced Binary Seed "GNU Mes--Maxwell Equations of Software--brings the Reduced Binary Seed