From patchwork Thu Oct 1 13:41:18 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Lepiller X-Patchwork-Id: 24404 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 25B7027BBE8; Thu, 1 Oct 2020 14:49:55 +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_H4,RCVD_IN_MSPIKE_WL,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 C71FC27BBE9 for ; Thu, 1 Oct 2020 14:49:54 +0100 (BST) Received: from localhost ([::1]:36978 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1kNyy1-00034H-Vz for patchwork@mira.cbaines.net; Thu, 01 Oct 2020 09:49:54 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:54262) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1kNyxG-0002bT-9U for guix-patches@gnu.org; Thu, 01 Oct 2020 09:49:06 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:51653) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1kNyxF-0002xY-VO for guix-patches@gnu.org; Thu, 01 Oct 2020 09:49:06 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1kNyxF-0001zp-Uu for guix-patches@gnu.org; Thu, 01 Oct 2020 09:49:05 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#43745] [PATCH 12/27] gnu: ocaml4.07-merlin: Do not use deprecated jbuilder. Resent-From: Julien Lepiller Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Thu, 01 Oct 2020 13:49:05 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 43745 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 43745@debbugs.gnu.org Received: via spool by 43745-submit@debbugs.gnu.org id=B43745.16015601087458 (code B ref 43745); Thu, 01 Oct 2020 13:49:05 +0000 Received: (at 43745) by debbugs.gnu.org; 1 Oct 2020 13:48:28 +0000 Received: from localhost ([127.0.0.1]:34929 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kNywe-0001w8-Aq for submit@debbugs.gnu.org; Thu, 01 Oct 2020 09:48:28 -0400 Received: from lepiller.eu ([89.234.186.109]:51938) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1kNywQ-0001t4-Eg for 43745@debbugs.gnu.org; Thu, 01 Oct 2020 09:48:14 -0400 Received: from lepiller.eu (localhost [127.0.0.1]) by lepiller.eu (OpenSMTPD) with ESMTP id 422a41a8 for <43745@debbugs.gnu.org>; Thu, 1 Oct 2020 13:48:08 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=lepiller.eu; h=from:to :subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; s=dkim; bh=WB1IgpV9SBme30YCDBvSnaREW wURBOejbBS8o1LMSO8=; b=E28wNx36A9QHYJpQrZm6CiCx5VH+x6KwYSVqhsgfi QeJERqyg/EPHEZZGJhAOJsWM8SpxYk35lBTP+aGByseTa7EEeNPPjkWODfAjmeNq QyvYjBwYo4stZZduw4pqY5KCum7cNseanSYN9a52R98KHv4W7NwdGKNCLsIVTVlb vFoEY78u7pY4TSfY6lwiEgMoOlicr9dijATNAveG99E5R7Lf3hoS+xSHjsWZ5tVF zbf5hxXqb5jIaSToBIDUjTAVSSqFraGJGksiUHt/ftirPq9ycxRJOIqnGD2JtAjc FaCEcbTPpwgvdGDh1LQdf4FGQ/fs0Y8AcGjeUNOMBgZOg== Received: by lepiller.eu (OpenSMTPD) with ESMTPSA id afc2b549 (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256:NO) for <43745@debbugs.gnu.org>; Thu, 1 Oct 2020 13:48:07 +0000 (UTC) From: Julien Lepiller Date: Thu, 1 Oct 2020 15:41:18 +0200 Message-Id: <20201001134133.32105-12-julien@lepiller.eu> X-Mailer: git-send-email 2.28.0 In-Reply-To: <20201001134133.32105-1-julien@lepiller.eu> References: <20201001153909.296c8d3e@tachikoma.lepiller.eu> <20201001134133.32105-1-julien@lepiller.eu> 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 (ocaml4.07-merlin): Remove #:jbuild argument. --- gnu/packages/ocaml.scm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 50bfc10fc3..0515dc097c 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -3761,7 +3761,7 @@ format}. @code{craml} is released as a single binary (called @code{craml}).") (native-inputs `(("ocaml-findlib" ,ocaml-findlib))) (arguments - `(#:jbuild? #t + `(#:package "merlin" #:tests? #f ;; Errors in tests in version 3.2.2 #:ocaml ,ocaml-4.07 #:findlib ,ocaml4.07-findlib))