[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#34627] [PATCH] gnu: ocaml-menhir: Update to 20181113.
From: |
Gabriel Hondet |
Subject: |
[bug#34627] [PATCH] gnu: ocaml-menhir: Update to 20181113. |
Date: |
Wed, 10 Apr 2019 19:11:57 +0200 |
User-agent: |
mu4e 1.0; emacs 26.1 |
Hi Ricardo,
On Mon 08 Apr 2019 at 15:30 Ricardo Wurmus wrote:
> Hi Gabriel,
>
>
> Is the problem here that GNUmakefile exists? Could we simply remove
> that file instead of replacing the phases? When replacing the phases
> you should also pass the default make-flags and ensure that parallel
> building is enabled.
>
> Removing the other makefile seems to be the better option.
Yes it was, but after inspecting downloaded sources, I realised that
there was no GNUmakefile, so I removed all the -f business, and it
works.
From f6d25b84679aeb0705e930abad79397d739bf39c Mon Sep 17 00:00:00 2001
From: gabrielhdt <address@hidden>
Date: Sat, 23 Feb 2019 09:50:38 +0100
Subject: [PATCH] gnu: ocaml-menhir: Update to 20181113.
* gnu/packages/ocaml.scm (ocaml-menhir): Update to 20181113.
---
gnu/packages/ocaml.scm | 28 ++++++++++++++--------------
1 file changed, 14 insertions(+), 14 deletions(-)
diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm
index 9a807a4cb6..79dbe68066 100644
--- a/gnu/packages/ocaml.scm
+++ b/gnu/packages/ocaml.scm
@@ -639,23 +639,23 @@ 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)))
+ `(("ocamlbuild" ,ocamlbuild)
+ ("ocaml-findlib" ,ocaml-findlib)))
(arguments
- `(#:parallel-build? #f ; Parallel build causes failure
- #:tests? #f ; No check target
+ `(#:tests? #f ; No check target
+ #:make-flags (list "USE_OCAMLFIND=true")
#:phases
(modify-phases %standard-phases
(replace 'configure
@@ -665,11 +665,11 @@ Emacs.")
#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.21.0
Gabriel
signature.asc
Description: PGP signature