From patchwork Sun Jun 20 14:52:14 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Xinglu Chen X-Patchwork-Id: 30549 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 70F3427BC81; Sun, 20 Jun 2021 15:53:25 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,T_DKIM_INVALID, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 4511A27BC78 for ; Sun, 20 Jun 2021 15:53:25 +0100 (BST) Received: from localhost ([::1]:43144 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1luypA-0002nq-Br for patchwork@mira.cbaines.net; Sun, 20 Jun 2021 10:53:24 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:47496) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1luyon-0002nX-SF for guix-patches@gnu.org; Sun, 20 Jun 2021 10:53:01 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:51486) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1luyon-00025m-Kf for guix-patches@gnu.org; Sun, 20 Jun 2021 10:53:01 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1luyon-0006fX-Jz for guix-patches@gnu.org; Sun, 20 Jun 2021 10:53:01 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#49136] [PATCH 1/2] gnu: ocaml-dot-merlin-reader: Update to 4.2-411. 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.162420074525583 (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]:34797 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1luyoD-0006eY-CB 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]:49028 helo=mail.yoctocell.xyz) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1luyo8-0006eC-Ub for 49136@debbugs.gnu.org; Sun, 20 Jun 2021 10:52:22 -0400 From: Xinglu Chen DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=yoctocell.xyz; s=mail; t=1624200735; bh=uH4sA2JnQKQ+c7p4we+Ru5qSahVdUgog2k0pqmr11wY=; h=From:To:Subject:In-Reply-To:References:Date; b=GAHSSmsLMeF4AD084c8L3W1KfUFx1ZADTh1OMd2NMgDBFjcvix+ZGlHxxzlJUf1w7 dD3prE91fetzNIwmryHyNfwhPTwU1gSZgcvu7JaaVQNArj+7F2CX3G1FX6M6h5Hckb rLr2YNw2e/Y1Um9KQnduFaFqo1WaND3Say/9RJUA= In-Reply-To: References: Message-Id: <8d451f4f17846759b48c15de98c524e3f5f56772.1624200385.git.public@yoctocell.xyz> Date: Sun, 20 Jun 2021 16:52:14 +0200 MIME-Version: 1.0 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+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/ocaml.scm (ocaml-dot-merlin-reader): Update to 4.2-411. --- gnu/packages/ocaml.scm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 047d504a0a..58b34d4293 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -4540,7 +4540,7 @@ format}. @code{craml} is released as a single binary (called @code{craml}).") (define-public ocaml-dot-merlin-reader (package (name "ocaml-dot-merlin-reader") - (version "3.4.2") + (version "4.2-411") (source (origin (method git-fetch) @@ -4550,7 +4550,7 @@ format}. @code{craml} is released as a single binary (called @code{craml}).") (file-name (git-file-name name version)) (sha256 (base32 - "0i2nwkdh6cfzmnsdsr8aw86vs8j1k5jkjzrs61b9384wnffdbbmj")))) + "1vl6p8m2pag5j283h5g2gzxxfm599k6qhyrjkdf3kyc476fc9lw8")))) (build-system dune-build-system) (arguments '(#:package "dot-merlin-reader" #:tests? #f)) ; no tests From patchwork Sun Jun 20 14:52:16 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Xinglu Chen X-Patchwork-Id: 30550 Return-Path: X-Original-To: patchwork@mira.cbaines.net Delivered-To: patchwork@mira.cbaines.net Received: by mira.cbaines.net (Postfix, from userid 113) id 7B3FC27BC81; Sun, 20 Jun 2021 15:53:26 +0100 (BST) X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-2.8 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,T_DKIM_INVALID, URIBL_BLOCKED autolearn=unavailable autolearn_force=no version=3.4.2 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 11D5D27BC78 for ; Sun, 20 Jun 2021 15:53:26 +0100 (BST) Received: from localhost ([::1]:43166 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1luypB-0002oo-4r for patchwork@mira.cbaines.net; Sun, 20 Jun 2021 10:53:25 -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?b?4oCYb2NhbWwtZG90LW1lcmxpbi1yZWFkZXLigJku?= 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 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+patchwork=mira.cbaines.net@gnu.org Sender: "Guix-patches" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/ocaml.scm (ocaml-merlin): Inherit from ‘ocaml-dot-merlin-reader’, 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 binary (called @code{craml}).") (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.