From patchwork Fri Dec 16 13:25:25 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: pukkamustard X-Patchwork-Id: 45367 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 CA6C727BBED; Fri, 16 Dec 2022 13:27:40 +0000 (GMT) X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on mira.cbaines.net X-Spam-Level: X-Spam-Status: No, score=-3.7 required=5.0 tests=BAYES_00,DKIM_INVALID, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS, URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.6 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mira.cbaines.net (Postfix) with ESMTPS id 36BD627BBE9 for ; Fri, 16 Dec 2022 13:27:40 +0000 (GMT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1p6Ak0-0006YR-SR; Fri, 16 Dec 2022 08:27:08 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1p6Ajw-0006Rj-SN for guix-patches@gnu.org; Fri, 16 Dec 2022 08:27:04 -0500 Received: from debbugs.gnu.org ([209.51.188.43]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1p6Ajw-0007Vp-HB for guix-patches@gnu.org; Fri, 16 Dec 2022 08:27:04 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1p6Ajw-00039q-C6 for guix-patches@gnu.org; Fri, 16 Dec 2022 08:27:04 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#60120] [PATCH 26/28] gnu: Add ocaml5.0-merlin-lib. Resent-From: pukkamustard Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Fri, 16 Dec 2022 13:27:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 60120 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 60120@debbugs.gnu.org Cc: pukkamustard Received: via spool by 60120-submit@debbugs.gnu.org id=B60120.167119719612049 (code B ref 60120); Fri, 16 Dec 2022 13:27:04 +0000 Received: (at 60120) by debbugs.gnu.org; 16 Dec 2022 13:26:36 +0000 Received: from localhost ([127.0.0.1]:49356 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p6AjT-00038B-Rv for submit@debbugs.gnu.org; Fri, 16 Dec 2022 08:26:36 -0500 Received: from mout02.posteo.de ([185.67.36.66]:54477) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1p6Aj0-000334-CT for 60120@debbugs.gnu.org; Fri, 16 Dec 2022 08:26:07 -0500 Received: from submission (posteo.de [185.67.36.169]) by mout02.posteo.de (Postfix) with ESMTPS id D916D240105 for <60120@debbugs.gnu.org>; Fri, 16 Dec 2022 14:26:00 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1671197160; bh=FRcuykeBeV7g0b10my95kJ6tzpufv2aB9hZyzJDs/lk=; h=From:To:Cc:Subject:Date:From; b=YrV4Jdfp8ULm9Qok6wk5BekXN1YyFVK0mw0vqkTqc4JqWTaqgJL2WbAKVZWscd7uB Q9mT3YfWow69fpv9ZIzBegPL43FlCDLQBesLDnBksPSi3VKVSIk6ey9J+fDBHCRjOn lL8FZzjfR5Sn65v/AUqDm9LPK+m0w9PtCqM+DMptCbpXqV3pb88i07Kc+1nVMLRx6P LfGJuMz5tfUBN/RKKBI3kOFmZX2lRdvwm2TcrgxhbbBdY1jAkxLKC68Fkgr9XAAYgx mP5je0x5VhYKZ3Mo9ivrBErURLk0axZPIFr287PfRcF+B9kJg2NBrhE+YABVMM5qGf MQ9kksmcsOarg== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4NYVGw2Zxlz6tm4; Fri, 16 Dec 2022 14:26:00 +0100 (CET) From: pukkamustard Date: Fri, 16 Dec 2022 13:25:25 +0000 Message-Id: <20221216132527.2539-26-pukkamustard@posteo.net> In-Reply-To: <20221216132527.2539-1-pukkamustard@posteo.net> References: <20221216132224.2229-1-pukkamustard@posteo.net> <20221216132527.2539-1-pukkamustard@posteo.net> 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-bounces+patchwork=mira.cbaines.net@gnu.org X-getmail-retrieved-from-mailbox: Patches * gnu/packages/ocaml.scm (ocaml5.0-merlin-lib): New variable. --- gnu/packages/ocaml.scm | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index f9dc9998c1..1b3e51001f 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -5370,12 +5370,34 @@ (define-public ocaml-merlin-lib (arguments '(#:package "merlin-lib" #:tests? #f)) ; no tests (propagated-inputs (list ocaml-csexp ocaml-menhir)) + (properties `((ocaml5.0-variant . ,(delay ocaml5.0-merlin-lib)))) (home-page "https://ocaml.github.io/merlin/") (synopsis "Merlin libraries") (description "These libraries provides access to low-level compiler interfaces and the standard higher-level merlin protocol.") (license license:expat))) +;; the 500 indicates that this version is for OCaml 5.0 +(define ocaml-merlin-lib-500 + (package + (inherit ocaml-merlin-lib) + (name "ocaml-merlin-lib") + (version "4.7.1-500") + (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 + "05a87i2dkzv800nwb6y7b2j45avg8gs3gzb5a98wrj1i5zjqwh01")))) + (properties '()))) + +(define-public ocaml5.0-merlin-lib + (package-with-ocaml5.0 ocaml-merlin-lib-500)) + (define-public ocaml-dot-merlin-reader (package (inherit ocaml-merlin-lib)