* [bug#34412] [PATCH] gnu: ocaml-merlin: Added tests
@ 2019-02-10 13:36 Gabriel Hondet
2019-06-28 5:41 ` swedebugia
` (2 more replies)
0 siblings, 3 replies; 6+ messages in thread
From: Gabriel Hondet @ 2019-02-10 13:36 UTC (permalink / raw)
To: 34412
[-- Attachment #1: Type: text/plain, Size: 2367 bytes --]
* 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
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 832 bytes --]
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [bug#34412] [PATCH] gnu: ocaml-merlin: Added tests
2019-02-10 13:36 [bug#34412] [PATCH] gnu: ocaml-merlin: Added tests Gabriel Hondet
@ 2019-06-28 5:41 ` swedebugia
2019-06-28 6:17 ` Julien Lepiller
2021-10-08 2:57 ` Julien Lepiller
2022-04-07 12:14 ` bug#34412: " zimoun
2 siblings, 1 reply; 6+ messages in thread
From: swedebugia @ 2019-06-28 5:41 UTC (permalink / raw)
To: 34412
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
^ permalink raw reply [flat|nested] 6+ messages in thread
* [bug#34412] [PATCH] gnu: ocaml-merlin: Added tests
2019-06-28 5:41 ` swedebugia
@ 2019-06-28 6:17 ` Julien Lepiller
0 siblings, 0 replies; 6+ messages in thread
From: Julien Lepiller @ 2019-06-28 6:17 UTC (permalink / raw)
To: 34412, swedebugia
Sorry for not having seen that!
Le 28 juin 2019 07:41:38 GMT+02:00, swedebugia <swedebugia@riseup.net> a écrit :
>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/")
Can we try and fix the shebang then?
>> + #t))
>> + (replace 'check
>> + (lambda _
>> + (invoke "make" "test")
>> + #t)))))
I think #:test-target "test" would be enough, no?
>> (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?
^ permalink raw reply [flat|nested] 6+ messages in thread
* [bug#34412] [PATCH] gnu: ocaml-merlin: Added tests
2019-02-10 13:36 [bug#34412] [PATCH] gnu: ocaml-merlin: Added tests Gabriel Hondet
2019-06-28 5:41 ` swedebugia
@ 2021-10-08 2:57 ` Julien Lepiller
2021-10-11 11:35 ` zimoun
2022-04-07 12:14 ` bug#34412: " zimoun
2 siblings, 1 reply; 6+ messages in thread
From: Julien Lepiller @ 2021-10-08 2:57 UTC (permalink / raw)
To: 34412
Hi!
So, since we have ocaml-merlin now, and since ocaml4.07-merlin is not
required by any other package, should we get rid of it? Or do we still
have a use for it?
^ permalink raw reply [flat|nested] 6+ messages in thread
* bug#34412: [PATCH] gnu: ocaml-merlin: Added tests
2019-02-10 13:36 [bug#34412] [PATCH] gnu: ocaml-merlin: Added tests Gabriel Hondet
2019-06-28 5:41 ` swedebugia
2021-10-08 2:57 ` Julien Lepiller
@ 2022-04-07 12:14 ` zimoun
2 siblings, 0 replies; 6+ messages in thread
From: zimoun @ 2022-04-07 12:14 UTC (permalink / raw)
To: Gabriel Hondet; +Cc: 34412-done
Hi,
Thanks for your contribution with patch#34412 [1]. The ’ocaml-merlin’
contains this:
--8<---------------cut here---------------start------------->8---
(modify-phases %standard-phases
(replace 'check
(lambda* (#:key tests? #:allow-other-keys)
(when tests?
(invoke "dune" "runtest" "-p" "merlin,dot-merlin-reader")))))))
--8<---------------cut here---------------end--------------->8---
added by 980c33bd3f16e44a123ef21408a56e59ebb76373. And the package
’ocaml4.07-merlin’ had been removed by
188e3e2e6878346b0bdc8b46084f458abe86826c.
Therefore, closing.
Cheers,
simon
1: <http://issues.guix.gnu.org/issue/34412>
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2022-04-07 12:17 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-02-10 13:36 [bug#34412] [PATCH] gnu: ocaml-merlin: Added tests Gabriel Hondet
2019-06-28 5:41 ` swedebugia
2019-06-28 6:17 ` Julien Lepiller
2021-10-08 2:57 ` Julien Lepiller
2021-10-11 11:35 ` zimoun
2022-04-07 12:14 ` bug#34412: " zimoun
Code repositories for project(s) associated with this external index
https://git.savannah.gnu.org/cgit/guix.git
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.