From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:470:142:3::10]:59133) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hgjeF-0001h1-6p for guix-patches@gnu.org; Fri, 28 Jun 2019 01:42:13 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hgje9-00022A-6p for guix-patches@gnu.org; Fri, 28 Jun 2019 01:42:08 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:54927) by eggs.gnu.org with esmtps (TLS1.0:RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1hgje5-0001zm-Ti for guix-patches@gnu.org; Fri, 28 Jun 2019 01:42:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1hgje5-00025l-Np for guix-patches@gnu.org; Fri, 28 Jun 2019 01:42:01 -0400 Subject: [bug#34412] [PATCH] gnu: ocaml-merlin: Added tests Resent-Message-ID: Received: from eggs.gnu.org ([2001:470:142:3::10]:59105) by lists.gnu.org with esmtp (Exim 4.86_2) (envelope-from ) id 1hgjds-0001H6-9s for guix-patches@gnu.org; Fri, 28 Jun 2019 01:41:49 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1hgjdo-0001os-7m for guix-patches@gnu.org; Fri, 28 Jun 2019 01:41:46 -0400 Received: from mx1.riseup.net ([198.252.153.129]:36968) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1hgjdn-0001nP-WE for guix-patches@gnu.org; Fri, 28 Jun 2019 01:41:44 -0400 Received: from capuchin.riseup.net (capuchin-pn.riseup.net [10.0.1.176]) (using TLSv1 with cipher ECDHE-RSA-AES256-SHA (256/256 bits)) (Client CN "*.riseup.net", Issuer "COMODO RSA Domain Validation Secure Server CA" (verified OK)) by mx1.riseup.net (Postfix) with ESMTPS id 997551A1C82 for ; Thu, 27 Jun 2019 22:41:41 -0700 (PDT) Received: from [127.0.0.1] (localhost [127.0.0.1]) by capuchin.riseup.net (Postfix) with ESMTPSA id CC9D9120320 for ; Thu, 27 Jun 2019 22:41:40 -0700 (PDT) References: <877ee74v93.fsf@gmail.com> From: swedebugia Message-ID: Date: Fri, 28 Jun 2019 07:41:38 +0200 MIME-Version: 1.0 In-Reply-To: <877ee74v93.fsf@gmail.com> Content-Type: text/plain; charset=utf-8; format=flowed Content-Language: en-US Content-Transfer-Encoding: 7bit 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 On 2019-02-10 14:36, Gabriel Hondet wrote: > * gnu/packages/ocaml.scm (ocaml-merlin): Added tests > --- > 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 > --- 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 binary (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 binary (called @code{craml}).") > ("ocaml-yojson" ,ocaml-yojson) > ("ocaml-easy-format" ,ocaml-easy-format))) > (native-inputs > - `(("ocaml-findlib" ,ocaml-findlib))) > + `(("ocaml-findlib" ,ocaml-findlib) > + ("ocaml-craml" ,ocaml-craml) > + ("jq" ,jq))) > (arguments > - '(#: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. > -- 2.20.1 > This has slipped through the cracks. Could you rebase to current master and send an updated patch? -- Cheers Swedebugia