From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([209.51.188.92]:53804) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1hEGmV-0003p3-KS for guix-patches@gnu.org; Wed, 10 Apr 2019 13:13:04 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hEGmU-0004WQ-GZ for guix-patches@gnu.org; Wed, 10 Apr 2019 13:13:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:39950) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hEGmT-0004WD-WF for guix-patches@gnu.org; Wed, 10 Apr 2019 13:13:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1hEGmT-0005UD-Qo for guix-patches@gnu.org; Wed, 10 Apr 2019 13:13:01 -0400 Subject: [bug#34627] [PATCH] gnu: ocaml-menhir: Update to 20181113. Resent-Message-ID: References: <87d0ni28fk.fsf@gmail.com> <20190226035851.GA8289@jasmine.lan> <87zhp31qu1.fsf@gmail.com> <87ef6cfwv7.fsf@elephly.net> From: Gabriel Hondet In-reply-to: <87ef6cfwv7.fsf@elephly.net> Date: Wed, 10 Apr 2019 19:11:57 +0200 Message-ID: <87y34h23aa.fsf@gmail.com> MIME-Version: 1.0 Content-Type: multipart/signed; boundary="==-=-="; micalg=pgp-sha256; protocol="application/pgp-signature" List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+kyle=kyleam.com@gnu.org Sender: "Guix-patches" To: Ricardo Wurmus Cc: 34627@debbugs.gnu.org --==-=-= Content-Type: multipart/mixed; boundary="=-=-=" --=-=-= Content-Type: text/plain 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. --=-=-= Content-Type: text/x-diff; charset=utf-8 Content-Disposition: inline; filename=0001-gnu-ocaml-menhir-Update-to-20181113.patch Content-Transfer-Encoding: quoted-printable Content-Description: menhir patch From=20f6d25b84679aeb0705e930abad79397d739bf39c Mon Sep 17 00:00:00 2001 From: gabrielhdt 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. =2D-- 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 =2D-- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -639,23 +639,23 @@ Emacs.") (define-public ocaml-menhir (package (name "ocaml-menhir") =2D (version "20161115") + (version "20181113") (source (origin =2D (method url-fetch) =2D (uri (string-append =2D "http://gallium.inria.fr/~fpottier/menhir/" =2D "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 =2D "1j8nmcj2gq6hyyi16z27amiahplgrnk4ppchpm0v4qy80kwkf47k"))= )) =2D (build-system gnu-build-system) =2D (inputs =2D `(("ocaml" ,ocaml))) + "1iqdf64ayq4s3d9jkwhs3s8wqc2s48b292hp0kcjsskfhcvwg0kr")))) + (build-system ocaml-build-system) (native-inputs =2D `(("ocamlbuild" ,ocamlbuild))) + `(("ocamlbuild" ,ocamlbuild) + ("ocaml-findlib" ,ocaml-findlib))) (arguments =2D `(#:parallel-build? #f ; Parallel build causes failure =2D #:tests? #f ; No check target + `(#:tests? #f ; No check target + #:make-flags (list "USE_OCAMLFIND=3Dtrue") #:phases (modify-phases %standard-phases (replace 'configure @@ -665,11 +665,11 @@ Emacs.") #t))))) (properties `((ocaml4.02-variant . ,(delay ocaml4.02-menhir)))) =2D (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 gramm= ar specifications, decorated with semantic actions expressed in the OCaml =2Dprogramming language into parsers, again expressed in OCaml. It is based= on +programming language into parsers, again expressed in OCaml. It is based = on Knuth=E2=80=99s LR(1) parser construction technique.") ;; The file src/standard.mly and all files listed in src/mnehirLib.mlp= ack ;; that have an *.ml or *.mli extension are GPL licensed. All other fi= les =2D-=20 2.21.0 --=-=-= Content-Type: text/plain Gabriel --=-=-=-- --==-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCAAdFiEE5ercJXBcjd3P1FcAMbyBBfZZ1CUFAlyuI90ACgkQMbyBBfZZ 1CV0QA/+Krf9a0b1frzAninrGvPbsDi9SUOf+e3FcYlSvQrylaDpb1aQITjnO42j vWogwEWyVNtIBSS96gVZ1EtUpKE/KLT7zF9JSiz6uGCW/tuIhkWfR7xEv6uaWXNJ PnmR9pYMn992Ks682nXiorHUb26Ju+TsCfbHmCj7h02Rma1wT7cJ0LZWQfySF4Hk VlCtlIyvAaNJ0wqGyH/QF4pLstWfQhCtH/zwHESkaI3LWMp7fsvGWrGaoq90jHas Tqz/rGoULxtOFiqfpI7xvzQO25AYT/dal7TiQF01BHQyAaVEGh3kk295rusNiHxr FwzMW8M3eGjSDw8fp7oc7qeAgycD0uQ1pMC8mb0aja/7Kc70jTCt+hldY2eEi/kK Qy6hb3jFeRqw0LonI+JzQOJHrHED9HomaZFyr+OhrBy9J/oBVeHANs/piiAs/q3w BR+u3dnVNlxIIUJkshpJyeEWr7OOeype3IguvW2EeZwGpobQjQoQbuq+t+34I1wk 6L7EDZN2WA/g5tQ3RU99nRTMmsIgor9L3y8PtENKKL6dDFbJ10/E4/j8VC9Q4Hse j2jsylRTg3qTACi2Gm9ijlXSIMcqfAVEa5+osgDstI6QKLcx69S0F+QF5U+v7Vgb +gDva1h1SAm8Zh6JdxhGeQATVZmn9fA+pD/jmZClp8AcDb9p1Xk= =4A3M -----END PGP SIGNATURE----- --==-=-=--