diff options
| author | Marius Bakke <marius@gnu.org> | 2020-12-13 01:10:06 +0100 |
|---|---|---|
| committer | Marius Bakke <marius@gnu.org> | 2020-12-13 01:10:06 +0100 |
| commit | a7737f0ead2293536b9d0ba253de4673378a0ffa (patch) | |
| tree | cf80318b0a9903aa56a69c316659a52f94abbe27 /gnu/packages/ocaml.scm | |
| parent | ba47c83570b6d1824738ef5ff8580e7581990699 (diff) | |
| parent | 1adeb744560af94687eb7c3780c7145c52674070 (diff) | |
| download | guix-a7737f0ead2293536b9d0ba253de4673378a0ffa.tar guix-a7737f0ead2293536b9d0ba253de4673378a0ffa.tar.gz | |
Merge branch 'master' into ungrafting
Diffstat (limited to 'gnu/packages/ocaml.scm')
| -rw-r--r-- | gnu/packages/ocaml.scm | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 369e819573..2bfda7307e 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -739,8 +739,7 @@ Emacs.") (define-public ocaml-menhir (package (name "ocaml-menhir") - ;; More recent versions can be built after we have dune >= 2.0 - (version "20190626") + (version "20200211") (source (origin (method git-fetch) @@ -749,19 +748,12 @@ Emacs.") (commit version))) (file-name (git-file-name name version)) (sha256 - (base32 "0v8av4pw6rykzb7wx54xhbsx0jhh8xyb4x0k4yrxi0w5ylkck6mb")))) - (build-system ocaml-build-system) + (base32 "019izf51kdc7pzkw68zg8a2alc8lxw1gwdp7in970mr90n16b5zj")))) + (build-system dune-build-system) (inputs `(("ocaml" ,ocaml))) - (native-inputs - `(("ocamlbuild" ,ocamlbuild))) (arguments - `(#:make-flags `("USE_OCAMLFIND=true" - ,(string-append "PREFIX=" (assoc-ref %outputs "out"))) - #:tests? #f ; No check target - #:phases - (modify-phases %standard-phases - (delete 'configure)))) + `(#:tests? #f)) ; No check target (home-page "http://gallium.inria.fr/~fpottier/menhir/") (synopsis "Parser generator") (description "Menhir is a parser generator. It turns high-level grammar |