From patchwork Mon Oct 25 22:06:42 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Lepiller X-Patchwork-Id: 34050 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 1636327BBE3; Mon, 25 Oct 2021 23:08:32 +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=-1.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, MAILING_LIST_MULTI,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,T_DKIM_INVALID, URIBL_BLOCKED,URIBL_SBL,URIBL_SBL_A 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 C8B1827BBE1 for ; Mon, 25 Oct 2021 23:08:31 +0100 (BST) Received: from localhost ([::1]:35836 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1mf88s-0001Yi-TU for patchwork@mira.cbaines.net; Mon, 25 Oct 2021 18:08:30 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:56358) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1mf87T-0000LY-Ud for guix-patches@gnu.org; Mon, 25 Oct 2021 18:07:03 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:32993) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1mf87T-0004VF-LL for guix-patches@gnu.org; Mon, 25 Oct 2021 18:07:03 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1mf87T-0004Vk-HN for guix-patches@gnu.org; Mon, 25 Oct 2021 18:07:03 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#51358] [PATCH 4/4] gnu: Add ocaml-charinfo-width. Resent-From: Julien Lepiller Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 25 Oct 2021 22:07:03 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 51358 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 51358@debbugs.gnu.org Received: via spool by 51358-submit@debbugs.gnu.org id=B51358.163519961717305 (code B ref 51358); Mon, 25 Oct 2021 22:07:03 +0000 Received: (at 51358) by debbugs.gnu.org; 25 Oct 2021 22:06:57 +0000 Received: from localhost ([127.0.0.1]:44536 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mf87N-0004Uy-7G for submit@debbugs.gnu.org; Mon, 25 Oct 2021 18:06:57 -0400 Received: from lepiller.eu ([89.234.186.109]:36704) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1mf87I-0004UG-Fu for 51358@debbugs.gnu.org; Mon, 25 Oct 2021 18:06:53 -0400 Received: from lepiller.eu (localhost [127.0.0.1]) by lepiller.eu (OpenSMTPD) with ESMTP id a78ae008 for <51358@debbugs.gnu.org>; Mon, 25 Oct 2021 22:06:51 +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=4VTcAQzNRmKVMqIcrj/4a8RBb duggKEHMa/nZRAi3BM=; b=D6g+LtVXV1PYtXdBRK6CeUo+I4JWCRiS2QsS6KiO1 AbnUVlfLgH5A7NqTxNrJAjh1+BctKJ5a4plE3nyI+keHcvQauDDFssjUCuC9Ogfr 2WlFrLAMD6ktHhIYHw8RGPq3RfPENwEMpTLIFY6z9UwOOFJpLiIZmI2UkLfAQVKE +f7PJ2NVAw0XVAVcxJVQ9Shuj9MGKsya4CXJMNEqLf/KwxJSHVKznB2r4JyW1hkE 2WxXb36GeO66uSvHZIcX8UBOei2HF8rJ3OsC52NbA7/vW4npuvbq+OECLSeavhJM WXjkxC1Tz9ubnZMHlzoZ4E2muvLUOQW+pVnyX+jTM0KUQ== Received: by lepiller.eu (OpenSMTPD) with ESMTPSA id 5e3d661e (TLSv1.3:AEAD-AES256-GCM-SHA384:256:NO) for <51358@debbugs.gnu.org>; Mon, 25 Oct 2021 22:06:50 +0000 (UTC) From: Julien Lepiller Date: Tue, 26 Oct 2021 00:06:42 +0200 Message-Id: X-Mailer: git-send-email 2.33.0 In-Reply-To: <20211026000536.1b19cf19@tachikoma.lepiller.eu> References: <20211026000536.1b19cf19@tachikoma.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-charinfo-width): Replace with... (ocaml-charinfo-width): ...this. Use latest ocaml package. --- gnu/packages/ocaml.scm | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index a6e8af8bcf..c0bb1675a2 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -3882,9 +3882,9 @@ (define-public ocaml-camomile ;; with an exception for linked libraries to use a different license (license license:lgpl2.0+))) -(define-public ocaml4.07-charinfo-width +(define-public ocaml-charinfo-width (package - (name "ocaml4.07-charinfo-width") + (name "ocaml-charinfo-width") (version "1.1.0") (source (origin (method url-fetch) @@ -3895,15 +3895,11 @@ (define-public ocaml4.07-charinfo-width (base32 "00bv4p1yqs8y0z4z07wd9w9yyv669dikp9b04dcjbwpiy2wy0086")))) (build-system dune-build-system) - (arguments - `(#:ocaml ,ocaml-4.07 - #:findlib ,ocaml4.07-findlib - #:dune ,ocaml4.07-dune)) (propagated-inputs - `(("ocaml-result" ,(package-with-ocaml4.07 ocaml-result)) - ("ocaml-camomile" ,(package-with-ocaml4.07 ocaml-camomile)))) + `(("ocaml-result" ,ocaml-result) + ("ocaml-camomile" ,ocaml-camomile))) (native-inputs - `(("ocaml-ppx-expect" ,(package-with-ocaml4.07 ocaml-ppx-expect)))) + `(("ocaml-ppx-expect" ,ocaml-ppx-expect))) (properties `((upstream-name . "charInfo_width"))) (home-page "https://bitbucket.org/zandoye/charinfo_width/") @@ -3933,7 +3929,7 @@ (define-public ocaml4.07-zed #:dune ,ocaml4.07-dune)) (propagated-inputs `(("ocaml-camomile" ,(package-with-ocaml4.07 ocaml-camomile)) - ("ocaml-charinfo-width" ,ocaml4.07-charinfo-width) + ("ocaml-charinfo-width" ,(package-with-ocaml4.07 ocaml-charinfo-width)) ("ocaml-react" ,(package-with-ocaml4.07 ocaml-react)))) (home-page "https://github.com/diml/zed") (synopsis "Abstract engine for text editing in OCaml")