diff options
| author | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2022-03-21 23:39:43 -0400 |
|---|---|---|
| committer | Maxim Cournoyer <maxim.cournoyer@gmail.com> | 2022-03-21 23:39:43 -0400 |
| commit | a9429c8f2207841c649438187d6e19046d323a16 (patch) | |
| tree | a06e4b8a87b6a42742cf6750276746a10b6c2139 /gnu/packages/mes.scm | |
| parent | f0136b36ae8c1e9c174043bd50e0e24413c0f345 (diff) | |
| parent | 49b350fafc2c3ea1db66461b73d4e304cd13ec92 (diff) | |
Merge branch 'staging' into core-updates.
Diffstat (limited to 'gnu/packages/mes.scm')
| -rw-r--r-- | gnu/packages/mes.scm | 31 |
1 files changed, 22 insertions, 9 deletions
diff --git a/gnu/packages/mes.scm b/gnu/packages/mes.scm index 07e63384ff..a862d84fc8 100644 --- a/gnu/packages/mes.scm +++ b/gnu/packages/mes.scm @@ -2,7 +2,7 @@ ;;; Copyright © 2017, 2018, 2019, 2020, 2021 Jan (janneke) Nieuwenhuizen <janneke@gnu.org> ;;; Copyright © 2017, 2018 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr> -;;; Copyright © 2020, 2021 Ricardo Wurmus <rekado@elephly.net> +;;; Copyright © 2020, 2021, 2022 Ricardo Wurmus <rekado@elephly.net> ;;; Copyright © 2021 Xinglu Chen <public@yoctocell.xyz> ;;; Copyright © 2021 Arun Isaac <arunisaac@systemreboot.net> ;;; @@ -98,23 +98,31 @@ extensive examples, including parsers for the Javascript and C99 languages.") (define-public nyacc (package (inherit nyacc-0.99) - (version "1.05.1") + (version "1.06.5") (source (origin (method url-fetch) (uri (string-append "mirror://savannah/nyacc/nyacc-" version ".tar.gz")) (sha256 (base32 - "1ck3gyzln5dhamp317nv3waych12mczj05dm4wdblij6ab0l4863")) + "1fbzz9bm4mkz4j40l2z02zjlbqj82dmv2ayz83zl3j8gj6z3lpdg")) (modules '((guix build utils))) (snippet - '(begin - (substitute* "configure" - (("GUILE_GLOBAL_SITE=\\$prefix.*") - "GUILE_GLOBAL_SITE=\ -$prefix/share/guile/site/$GUILE_EFFECTIVE_VERSION\n")) - #t)))) + '(substitute* "configure" + (("GUILE_GLOBAL_SITE=\\$prefix.*") + "GUILE_GLOBAL_SITE=\ +$prefix/share/guile/site/$GUILE_EFFECTIVE_VERSION\n"))))) + (arguments + '(#:phases + (modify-phases %standard-phases + ;; See https://savannah.nongnu.org/bugs/index.php?60474 + (add-after 'unpack 'fix-60474 + (lambda _ + (substitute* "module/nyacc/lang/c99/parser.scm" + (("\\(memq \\(car stmt\\) '\\(include include-next\\)\\)") + "(memq (car stmt) '(include include-next define))"))))))) (inputs (list guile-3.0)) + (propagated-inputs (list guile-bytestructures)) (description "@acronym{NYACC, Not Yet Another Compiler Compiler} is set of Guile modules for generating parsers and lexical analyzers. It provides sample parsers, @@ -149,6 +157,11 @@ parsers to allow execution with Guile as extension languages."))) (sha256 (base32 "065ksalfllbdrzl12dz9d9dcxrv97wqxblslngsc6kajvnvlyvpk")))) + + ;; XXX: Remove GUILE-BYTESTRUCTURES, an optional dependency needed to + ;; build the FFI helper, because it fails to build. + (propagated-inputs '()) + (inputs (list guile-3.0)))) (define-public mes |