From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([209.51.188.92]:44266) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gspLz-0000ax-Ch for guix-patches@gnu.org; Sun, 10 Feb 2019 08:41:04 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gspLy-0006xc-CC for guix-patches@gnu.org; Sun, 10 Feb 2019 08:41:03 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:42553) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gspLy-0006xW-9C for guix-patches@gnu.org; Sun, 10 Feb 2019 08:41:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1gspLy-00011l-3a for guix-patches@gnu.org; Sun, 10 Feb 2019 08:41:02 -0500 Subject: [bug#34412] [PATCH] gnu: ocaml-merlin: Added tests Resent-Message-ID: Received: from eggs.gnu.org ([209.51.188.92]:44246) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1gspLh-0000YT-3j for guix-patches@gnu.org; Sun, 10 Feb 2019 08:40:46 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1gspLf-0006qw-8q for guix-patches@gnu.org; Sun, 10 Feb 2019 08:40:45 -0500 Received: from mail-wm1-x32e.google.com ([2a00:1450:4864:20::32e]:34651) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1gspLc-0006mN-Jk for guix-patches@gnu.org; Sun, 10 Feb 2019 08:40:41 -0500 Received: by mail-wm1-x32e.google.com with SMTP id y185so11743729wmd.1 for ; Sun, 10 Feb 2019 05:40:33 -0800 (PST) Received: from glht-aurore.gmail.com (2a01cb04062c860082fa5bfffe3823d7.ipv6.abo.wanadoo.fr. [2a01:cb04:62c:8600:82fa:5bff:fe38:23d7]) by smtp.gmail.com with ESMTPSA id m4sm4308820wml.2.2019.02.10.05.40.29 for (version=TLS1_2 cipher=ECDHE-RSA-CHACHA20-POLY1305 bits=256/256); Sun, 10 Feb 2019 05:40:30 -0800 (PST) From: Gabriel Hondet Date: Sun, 10 Feb 2019 14:36:15 +0100 Message-ID: <877ee74v93.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: 34412@debbugs.gnu.org --=-=-= Content-Type: text/plain Content-Transfer-Encoding: quoted-printable * gnu/packages/ocaml.scm (ocaml-merlin): Added tests =2D-- gnu/packages/ocaml.scm | 23 +++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 07fcf92ae..0b33c257a 100644 =2D-- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -66,6 +66,7 @@ #:use-module (gnu packages version-control) #:use-module (gnu packages virtualization) #:use-module (gnu packages web-browsers) + #:use-module (gnu packages web) #:use-module (gnu packages xml) #:use-module (gnu packages xorg) #:use-module (guix build-system dune) @@ -4785,6 +4786,11 @@ format}. @code{craml} is released as a single binar= y (called @code{craml}).") (url "https://github.com/ocaml/merlin.git") (commit (string-append "v" version)))) (file-name (git-file-name name version)) + (modules '((guix build utils))) + (snippet '(begin + ;; fix a dune file calling missing dependencies + (substitute* "tests/locate/partial-cmt/dune" + (("a.ml a.mli") "")))) (sha256 (base32 "15ssgmwdxylbwhld9p1cq8x6kadxyhll5bfyf11dddj6cldna3hb")))) @@ -4794,9 +4800,22 @@ format}. @code{craml} is released as a single binar= y (called @code{craml}).") ("ocaml-yojson" ,ocaml-yojson) ("ocaml-easy-format" ,ocaml-easy-format))) (native-inputs =2D `(("ocaml-findlib" ,ocaml-findlib))) + `(("ocaml-findlib" ,ocaml-findlib) + ("ocaml-craml" ,ocaml-craml) + ("jq" ,jq))) (arguments =2D '(#:tests? #f)) ;; Errors in tests in version 3.2.2 + '(#:phases + (modify-phases %standard-phases + (add-before 'check 'remove-failing + (lambda _ + (delete-file-recursively "tests/warnings/") + (delete-file-recursively ;fail because of shebang patching + "tests/locate/context-detection/") + #t)) + (replace 'check + (lambda _ + (invoke "make" "test") + #t))))) (synopsis "Context sensitive completion for OCaml in Vim and Emacs") (description "Merlin is an editor service that provides modern IDE features for OCaml. Emacs and Vim support is provided out-of-the-box. =2D-=20 2.20.1 --=-=-= Content-Type: application/pgp-signature; name="signature.asc" -----BEGIN PGP SIGNATURE----- iQIzBAEBCAAdFiEE5ercJXBcjd3P1FcAMbyBBfZZ1CUFAlxgKcgACgkQMbyBBfZZ 1CUsOxAAlUJXBUPn8RlU7Y0lgK0FH2JVP2ijGIoZ/dKKVtisCE4o2AXpUvgBfiBI oO2agUvgerKbX2li7+zULVDTjEo8n3QDkvLlfMJQVAAHmiW0dSyX1gHgIIO0oyOp AgKRXTLRutovDG+ClI/CWv8UGeTRMqCaQKgRGUxEPN39eLbn6yLw+dyYMINTWbJD RvufzZlMSoT8xl4aVI6a73+AmgnizWIr+pPjWeY19DzHXvlfFGupymCDtZO6RMRX UgqeHoRI5BUjuHLa9GpJhaBUYtGmQ/1ehusNU8dlGExOSayY/fLsh+DmBkG9EpO8 FWnFVldXI6b9WVfeucCHmvS6o3v56nFL0cNJxCXp21L0kJIoOSADta9o0KGt0L4O c8mTdxLxxvcWxjKhM9GK+h1mUwjgSw4cjagKoclEMrUhToLKlQjXc4RI3Szbr+UM HphQ8yk9gpINdgDqokLtUdLPA5LLAClLRfBE70Y8+GzPmkTBRDoZGM18x8MWJsc7 vGou9UeMuw5Rp7FQDPSkPe2t3fm0PSmhQvJNDCJi2QAaANwSPbb8nmC8gsdodVYD V+GCPcxwbmH/S3sWG34sx7NKkpPh7rNzt8ABVUK75REWMbOsluYT/cTSJidQ1i/1 3guv0hXO2K99INjBIXY4S0cG2XGlz3mict4JoowrFwIkAwQ4x+o= =SbZd -----END PGP SIGNATURE----- --=-=-=--