From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp0 ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms0.migadu.com with LMTPS id WB43FmRWz2BIWAAAgWs5BA (envelope-from ) for ; Sun, 20 Jun 2021 16:53:24 +0200 Received: from aspmx1.migadu.com ([2001:41d0:8:6d80::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp0 with LMTPS id AJz3EWRWz2ACTQAA1q6Kng (envelope-from ) for ; Sun, 20 Jun 2021 14:53:24 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id B34E01A9CB for ; Sun, 20 Jun 2021 16:53:23 +0200 (CEST) Received: from localhost ([::1]:43166 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1luyp8-0002oo-NP for larch@yhetil.org; Sun, 20 Jun 2021 10:53:22 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47498) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1luyoo-0002nh-BN for guix-patches@gnu.org; Sun, 20 Jun 2021 10:53:02 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:51487) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1luyoo-00025t-1l for guix-patches@gnu.org; Sun, 20 Jun 2021 10:53:02 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1luyoo-0006fe-1H for guix-patches@gnu.org; Sun, 20 Jun 2021 10:53:02 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49136] [PATCH 2/2] gnu: ocaml-merlin: Inherit from =?UTF-8?Q?=E2=80=98ocaml-dot-merlin-reader=E2=80=99.?= Resent-From: Xinglu Chen Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Sun, 20 Jun 2021 14:53:01 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 49136 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 49136@debbugs.gnu.org Received: via spool by 49136-submit@debbugs.gnu.org id=B49136.162420074525589 (code B ref 49136); Sun, 20 Jun 2021 14:53:01 +0000 Received: (at 49136) by debbugs.gnu.org; 20 Jun 2021 14:52:25 +0000 Received: from localhost ([127.0.0.1]:34799 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1luyoD-0006ea-I0 for submit@debbugs.gnu.org; Sun, 20 Jun 2021 10:52:25 -0400 Received: from h87-96-130-155.cust.a3fiber.se ([87.96.130.155]:49034 helo=mail.yoctocell.xyz) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1luyoA-0006eE-Me for 49136@debbugs.gnu.org; Sun, 20 Jun 2021 10:52:24 -0400 From: Xinglu Chen DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=yoctocell.xyz; s=mail; t=1624200736; bh=RWDN/WvJeI6uns8JMSi81pAXev6t5cSgKJt1ZSKrOGg=; h=From:To:Subject:In-Reply-To:References:Date; b=tP754l69BwIebhhFzUC2GPMfVDWmsjmxz79Sw+vNPuMCsIrhYe+BlEBhOwQDvtkPm ZMoigqkmank+KWKTtd+Md3OEzChejmeOTv1YnzOke6COJ7Dji66mtdX06S2zoZ1ieG sK21OiHmgsQS29SIYWaA03YtLmu7Xxetu+dylCfU= In-Reply-To: References: Message-Id: Date: Sun, 20 Jun 2021 16:52:16 +0200 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: quoted-printable X-BeenThere: debbugs-submit@debbugs.gnu.org X-Mailman-Version: 2.1.18 Precedence: list X-BeenThere: guix-patches@gnu.org List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=yhetil.org; s=key1; t=1624200803; h=from:from:sender:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:mime-version:mime-version: content-type:content-type: content-transfer-encoding:content-transfer-encoding:resent-cc: resent-from:resent-sender:resent-message-id:in-reply-to:in-reply-to: references:references:list-id:list-help:list-unsubscribe: list-subscribe:list-post:dkim-signature; bh=UQHqQ82hjgoSwjaQW0Th5YGTOrfUREIVIwrdOFxIA08=; b=PIidRv36vkm1snH0Z+JFe3ttuEolWHAh8HNdQc3gZGAkJwncoaHF/7/eDxN/hA2JYd7hDi JBOin6b140eb+mx1tpMQitiM5POwpddJ0dfoMsDs1Mw7ZzwqpTROuzQ59BsE2+PMxJoOai wHesdnytlrWdxO7zw7p0P3HEMpzfbQ4TWYO3eL9nHD9FrkCaQM+tLeGd4S5FvO8FKVxKI/ mZaR9yohWv28mfZ1cZma6yZ3AGQejWcdek5fs3qsMEjqqncrF4hcoPJ2gQ+2cxNBcMVCzq rRvPIXIDnO+AoLiSTwJ923p/uA5JYNqI2hCIJW0uvDDdmpi4xrftRJE18erSpA== ARC-Seal: i=1; s=key1; d=yhetil.org; t=1624200803; a=rsa-sha256; cv=none; b=NlcLvzPXMg4mF5N41o3W/3tXuFKwF3l73FtR0VHNW+7vf2DYEOUPeTqhAU5DMprb0pm7jg vPE8Ienbhp/oHKGdYclI3AciBNXE6joA1uOkNv7C+H+YqSn3P1zn63qXgu+6ad0wF9VMnb 3Le2ZUkkegX8MQyAZwGHsucufrFUq/A+IDzsnoIJxb53/Xi1AgrUeKIAvtcAzHyaPjcfyk pgQV1frUgcNsFTznUlWQL2wzAQFhRs6jE+vZHf+FbTcZpFdm3dHyj88T91QXvkioRNfMya Himzpc7362GMLVUhmjUkmuoY4nZ2lR0di+g810bS5bKFRL9f6zMVF19dAR26qQ== ARC-Authentication-Results: i=1; aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=yoctocell.xyz header.s=mail header.b=tP754l69; spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Spam-Score: -0.33 Authentication-Results: aspmx1.migadu.com; dkim=fail ("headers rsa verify failed") header.d=yoctocell.xyz header.s=mail header.b=tP754l69; dmarc=fail reason="SPF not aligned (relaxed)" header.from=yoctocell.xyz (policy=none); spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Queue-Id: B34E01A9CB X-Spam-Score: -0.33 X-Migadu-Scanner: scn1.migadu.com X-TUID: 6EXfRuEj44yG * gnu/packages/ocaml.scm (ocaml-merlin): Inherit from =E2=80=98ocaml-dot-merlin-reader=E2=80=99, thus also updating it to 4.2-411. [version, source, build-system, home-page]: Remove. [arguments]<#:phases>: Use custom test phase. --- gnu/packages/ocaml.scm | 24 +++++++++--------------- 1 file changed, 9 insertions(+), 15 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 58b34d4293..21d16a46a1 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -4566,21 +4566,16 @@ format}. @code{craml} is released as a single bina= ry (called @code{craml}).") =20 (define-public ocaml-merlin (package + (inherit ocaml-dot-merlin-reader) (name "ocaml-merlin") - (version "3.4.2") - (source - (origin - (method git-fetch) - (uri (git-reference - (url "https://github.com/ocaml/merlin") - (commit (string-append "v" version)))) - (file-name (git-file-name name version)) - (sha256 - (base32 - "0i2nwkdh6cfzmnsdsr8aw86vs8j1k5jkjzrs61b9384wnffdbbmj")))) - (build-system dune-build-system) - (arguments '(#:package "merlin" - #:test-target "tests")) + (arguments + '(#:package "merlin" + #:phases + (modify-phases %standard-phases + (replace 'check + (lambda* (#:key tests? #:allow-other-keys) + (when tests? + (invoke "dune" "runtest" "-p" "merlin,dot-merlin-reader")))= )))) (inputs `(("ocaml-yojson" ,ocaml-yojson) ("ocaml-csexp" ,ocaml-csexp) @@ -4589,7 +4584,6 @@ format}. @code{craml} is released as a single binary= (called @code{craml}).") `(("ocaml-dot-merlin-reader" ,ocaml-dot-merlin-reader) ; required for= tests ("ocaml-mdx" ,ocaml-mdx) ("jq" ,jq))) - (home-page "https://ocaml.github.io/merlin/") (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. --=20 2.32.0