diff options
author | Ludovic Courtès <ludo@gnu.org> | 2019-09-17 16:17:20 +0200 |
---|---|---|
committer | Ludovic Courtès <ludo@gnu.org> | 2019-09-17 16:27:15 +0200 |
commit | 9ff87bb99614923fa3336ab4bbf22e3444709b48 (patch) | |
tree | fa169a6cc0fdc8d92bb4c4a4f265afc2ba29a890 /gnu/packages/mes.scm | |
parent | ae71bef532d6b1c9d1481a3ac65827f148b1e45b (diff) | |
parent | 9e8e252026f558933bdd9cfc26a75d13954b3e8e (diff) | |
download | guix-9ff87bb99614923fa3336ab4bbf22e3444709b48.tar.gz guix-9ff87bb99614923fa3336ab4bbf22e3444709b48.zip |
Merge branch 'master' 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 7bdd122f2b..e1cb736b82 100644 --- a/gnu/packages/mes.scm +++ b/gnu/packages/mes.scm @@ -1,5 +1,5 @@ ;;; GNU Guix --- Functional package management for GNU -;;; Copyright © 2017,2018 Jan Nieuwenhuizen <janneke@gnu.org> +;;; Copyright © 2017, 2018, 2019 Jan Nieuwenhuizen <janneke@gnu.org> ;;; Copyright © 2017, 2018 Efraim Flashner <efraim@flashner.co.il> ;;; Copyright © 2018 Tobias Geerinckx-Rice <me@tobias.gr> ;;; @@ -62,14 +62,14 @@ extensive examples, including parsers for the Javascript and C99 languages.") (define-public nyacc (package (inherit nyacc-0.86) - (version "0.94.0") + (version "0.99.0") (source (origin (method url-fetch) (uri (string-append "mirror://savannah/nyacc/nyacc-" version ".tar.gz")) (sha256 (base32 - "12qnzwm1n3j8z7hbr9hy2wka9a1aasm2rvnpnvdxkjcsbdzj8fn4")) + "0hl5qxx19i4x1r0839sxm19ziqq65g4hy97yik81cc2yb9yvgyv3")) (modules '((guix build utils))) (snippet '(begin @@ -93,22 +93,19 @@ extensive examples, including parsers for the Javascript and C99 languages.") (define-public mes (package (name "mes") - (version "0.19") + (version "0.20") (source (origin (method url-fetch) (uri (string-append "mirror://gnu/mes/" "mes-" version ".tar.gz")) (sha256 (base32 - "15h4yhaywdc0djpjlin2jz1kzahpqxfki0r0aav1qm9nxxmnp1l0")))) + "04pajp8v31na34ls4730ig5f6miiplhdvkmsb9ls1b8bbmw2vb4n")))) (build-system gnu-build-system) (supported-systems '("i686-linux" "x86_64-linux")) (propagated-inputs `(("mescc-tools" ,mescc-tools) - - ;; XXX: MesCC appears to enter an infinite loop (?) while building - ;; crt1.o when we switch to nyacc 0.94. - ("nyacc" ,nyacc-0.86))) + ("nyacc" ,nyacc))) (native-inputs `(("guile" ,guile-2.2) ,@(let ((target-system (or (%current-target-system) @@ -168,3 +165,19 @@ linker, the blood-elf symbol table generator, the kaem shell, exec_enable and get_machine.") (home-page "https://savannah.nongnu.org/projects/mescc-tools") (license gpl3+)))) + +(define-public mescc-tools-0.6.1 + (package + (inherit mescc-tools) + (name "mescc-tools") + (version "0.6.1") + (source (origin + (method url-fetch) + (uri (string-append + "http://git.savannah.nongnu.org/cgit/mescc-tools.git/snapshot/" + name "-Release_" version + ".tar.gz")) + (file-name (string-append name "-" version ".tar.gz")) + (sha256 + (base32 + "06jpvq6xfjzn2al6b4rdwd3zv3h4cvilc4n9gqcnjr9cr6wjpw2n")))))) |