diff options
author | Jan Nieuwenhuizen <janneke@gnu.org> | 2017-05-14 11:35:30 +0200 |
---|---|---|
committer | Jan Nieuwenhuizen <janneke@gnu.org> | 2017-05-17 00:00:05 +0200 |
commit | e0bb0a81ec8a01fdd397b5123dafddfc262f7a02 (patch) | |
tree | 5585549d6018483d6691130680759e5950fe5ba3 /gnu/packages | |
parent | 516bfed7a37b94970526997e562e14c0aa62ba57 (diff) | |
download | guix-e0bb0a81ec8a01fdd397b5123dafddfc262f7a02.tar.gz |
gnu: mes: Update to 0.6.
* gnu/packages/mes.scm (mes): Update to 0.6.
Diffstat (limited to 'gnu/packages')
-rw-r--r-- | gnu/packages/mes.scm | 27 |
1 files changed, 16 insertions, 11 deletions
diff --git a/gnu/packages/mes.scm b/gnu/packages/mes.scm index 84d6f8ff78..66b0654de5 100644 --- a/gnu/packages/mes.scm +++ b/gnu/packages/mes.scm @@ -54,30 +54,35 @@ extensive examples, including parsers for the Javascript and C99 languages.") (license (list gpl3+ lgpl3+)))) (define-public mes - (let ((commit "a437c173b9da1949ad966fd50dd4f26e522a910a") + (let ((commit "d4420bbcc9f994e2cce430cf156f383dc4092bca") (revision "0") - (triplet "i686-unknown-linux-gnu")) + (triplet "i686-unknown-linux-gnu") + (version "0.6")) (package (name "mes") - (version (string-append "0.5-" revision "." (string-take commit 7))) + (version (string-append version "-" revision "." (string-take commit 7))) (source (origin (method git-fetch) (uri (git-reference (url "https://gitlab.com/janneke/mes") (commit commit))) (file-name (string-append name "-" version)) - ;; TODO: Unbundle nyacc. (sha256 - (base32 "1ynr0hc0k15307sgzv09k3y5rvy46h0wbh7zcblx1f9v7y8k90zv")))) + (base32 "0qqywk3siyhf08v7xac08lqldklrqfndlp495wgy6ii9fn93197k")))) (build-system gnu-build-system) - (supported-systems '("x86_64-linux")) + (supported-systems '("i686-linux" "x86_64-linux")) + (propagated-inputs + `(("nyacc" ,nyacc))) (native-inputs `(("guile" ,guile-2.2) - ;; Use cross-compiler rather than #:system "i686-linux" to get - ;; MesCC 64 bit .go files installed ready for use with Guile. - ("i686-linux-binutils" ,(cross-binutils triplet)) - ("i686-linux-gcc" ,(let ((triplet triplet)) (cross-gcc triplet))) - ("perl" ,perl))) ;build-aux/gitlog-to-changelog + ,@(if (or (equal? (%current-system) "x86_64-linux") + (string-prefix? (%current-target-system) "x86_64-linux")) + ;; Use cross-compiler rather than #:system "i686-linux" to get + ;; MesCC 64 bit .go files installed ready for use with Guile. + `(("i686-linux-binutils" ,(cross-binutils triplet)) + ("i686-linux-gcc" ,(cross-gcc triplet))) + '()) + ("perl" ,perl))) ;build-aux/gitlog-to-changelog (arguments `(#:phases (modify-phases %standard-phases |