Gabriel Hondet wrote 6 years ago
(address . guix-patches@gnu.org)
* gnu/packages/ocaml.scm (ocaml-menhir): Update to 20181113.
---
gnu/packages/ocaml.scm | 32 +++++++++++++++++++-------------
1 file changed, 19 insertions(+), 13 deletions(-)
Toggle diff (63 lines)
diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm
index 9a807a4cb6..31e9a697a2 100644
--- a/gnu/packages/ocaml.scm
+++ b/gnu/packages/ocaml.scm
@@ -639,37 +639,43 @@ Emacs.")
(define-public ocaml-menhir
(package
(name "ocaml-menhir")
- (version "20161115")
+ (version "20181113")
(source (origin
- (method url-fetch)
- (uri (string-append
- "http://gallium.inria.fr/~fpottier/menhir/"
- "menhir-" version ".tar.gz"))
+ (method git-fetch)
+ (uri (git-reference
+ (url "https://gitlab.inria.fr/fpottier/menhir.git")
+ (commit version)))
+ (file-name (git-file-name name version))
(sha256
(base32
- "1j8nmcj2gq6hyyi16z27amiahplgrnk4ppchpm0v4qy80kwkf47k"))))
- (build-system gnu-build-system)
- (inputs
- `(("ocaml" ,ocaml)))
+ "1iqdf64ayq4s3d9jkwhs3s8wqc2s48b292hp0kcjsskfhcvwg0kr"))))
+ (build-system ocaml-build-system)
(native-inputs
`(("ocamlbuild" ,ocamlbuild)))
(arguments
- `(#:parallel-build? #f ; Parallel build causes failure
- #:tests? #f ; No check target
+ `(#:tests? #f ; No check target
#:phases
(modify-phases %standard-phases
(replace 'configure
(lambda* (#:key outputs #:allow-other-keys)
(let ((out (assoc-ref outputs "out")))
(setenv "PREFIX" out))
+ #t))
+ (replace 'build
+ (lambda _
+ (invoke "make" "-f" "Makefile" "USE_OCAMLFIND=true" "all")
+ #t))
+ (replace 'install
+ (lambda _
+ (invoke "make" "-f" "Makefile" "install")
#t)))))
(properties
`((ocaml4.02-variant . ,(delay ocaml4.02-menhir))))
- (home-page "http://gallium.inria.fr/~fpottier/menhir")
+ (home-page "http://gallium.inria.fr/~fpottier/menhir/")
(synopsis "Parser generator")
(description "Menhir is a parser generator. It turns high-level grammar
specifications, decorated with semantic actions expressed in the OCaml
-programming language into parsers, again expressed in OCaml. It is based on
+programming language into parsers, again expressed in OCaml. It is based on
Knuth’s LR(1) parser construction technique.")
;; The file src/standard.mly and all files listed in src/mnehirLib.mlpack
;; that have an *.ml or *.mli extension are GPL licensed. All other files
--
2.20.1
-----BEGIN PGP SIGNATURE-----
iQIzBAEBCAAdFiEE5ercJXBcjd3P1FcAMbyBBfZZ1CUFAlxxCc8ACgkQMbyBBfZZ
1CXiSw/6AnBEP/lGCdUsZJcHyW4xIaqN/seNJtoQ8KDEhNBQE8j93yFM0yjBCJA7
IeEyR1PHdLoTRBfcndOk8JDjTEAl1J2PCbk/SJNh/1wZWJLXRISb1RU2U6YLwCtA
HZzbIhYshzim8VBiENOx5H+DKjbTSRSidL4ATw/JkvJW94dyMbMFkOJgZiKgdr2/
KIOpzW3GQinNLbkwy14qIAW/c1eA2heFXRVASfUw+AECo8mkm7+ymHH5E9fmOKUU
/lClCJzfWizsp9ZCAKOjXovkkBLVooGhXdRp9iLKiuzc9ihh5rUi1i2LpyrCQlNg
aBJU96aXKk4Fi9Ta4D+/Gw57Cjyd+hPM1vegU2lkxohMVFTZ25To812NZ1ij6hIJ
wbH0oFwiFzWCo4mBbt8gtavSYNNJgPg0+UKMrrgJMJgwI5WD7bT/JxFNaJsMFykR
U71+kKXyj4fqj1Addp1y9dutceohKSywczx2GQehvDskn0ZbrbPp5uEMFbOqM4V0
ggqoL4GYVNW35JAjRZCjcP/G68gLGNrJVnuzmP76Jp2KzZz3ZaQKZXyDkb6bUsyo
d2ivFzvqaeaM0IBLSfMRzASJ17vC4VmYpnMkY8/qVznryvlOwAr92jG9AYlZh7GT
GKzupcOqzMtEu6H+48XHjp4GTr8QhkBmjOdrY5lZDlsaJ6wDWmc=
=yH1k
-----END PGP SIGNATURE-----