From patchwork Wed Apr 14 09:12:30 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: pukkamustard X-Patchwork-Id: 28490 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 71B1427BC75; Wed, 14 Apr 2021 10:14:20 +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,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 78E1327BC76 for ; Wed, 14 Apr 2021 10:14:18 +0100 (BST) Received: from localhost ([::1]:37370 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lWbbF-0005RN-BX for patchwork@mira.cbaines.net; Wed, 14 Apr 2021 05:14:17 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]:35992) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lWbb2-0005QE-IN for guix-patches@gnu.org; Wed, 14 Apr 2021 05:14:04 -0400 Received: from debbugs.gnu.org ([209.51.188.43]:50219) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1lWbb2-000229-Ab for guix-patches@gnu.org; Wed, 14 Apr 2021 05:14:04 -0400 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1lWbb2-0007Dk-6l for guix-patches@gnu.org; Wed, 14 Apr 2021 05:14:04 -0400 X-Loop: help-debbugs@gnu.org Subject: [bug#47768] [PATCH 04/37] gnu: ocaml-lwt: Make libev a propagated input. Resent-From: pukkamustard Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Wed, 14 Apr 2021 09:14:04 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 47768 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: 47768@debbugs.gnu.org Cc: pukkamustard Received: via spool by 47768-submit@debbugs.gnu.org id=B47768.161839160527285 (code B ref 47768); Wed, 14 Apr 2021 09:14:04 +0000 Received: (at 47768) by debbugs.gnu.org; 14 Apr 2021 09:13:25 +0000 Received: from localhost ([127.0.0.1]:33407 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lWbaP-00075y-DB for submit@debbugs.gnu.org; Wed, 14 Apr 2021 05:13:25 -0400 Received: from mout02.posteo.de ([185.67.36.66]:44821) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1lWbaL-00074S-L1 for 47768@debbugs.gnu.org; Wed, 14 Apr 2021 05:13:21 -0400 Received: from submission (posteo.de [89.146.220.130]) by mout02.posteo.de (Postfix) with ESMTPS id B48FF2400FC for <47768@debbugs.gnu.org>; Wed, 14 Apr 2021 11:13:15 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1618391595; bh=0HLjCjWQ1Axh+uMhuVdATBemP+/GOQKBlfymXDjGUBA=; h=From:To:Cc:Subject:Date:From; b=Zg6zUtTIst2Sl3q1ctaiaa7gqoi6etvq5NgRnHR80QpvhmUxOeYAjjI2VlgtCWJ5s HnJqM+5xOXJ2nv4j0o6vUHj+oOpe0NwgdmHGgVyjjVGoVFcLr/h9dvuvEUCoX5rpPf P9hmbbAcqVUNnlYwtrMMZfL0S0ueoPWPBgB7XwW8yJgaNPiA7AnA7CbjTy4QuLqhhs gGyUigoiXFv0uJL1qsxGSCpNSwy0XUeMAaGA4hJOZa61Ghsvsi1g7hD7l7EBkUEtcM kI1EHBJq7YEALeo/BFahO3BVCJEDrnRfZN/dofbnRbeTR1vBrDVsAJ9NtJEzgj7sI6 fCF51xKSG76sw== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4FKxbH0RXxz9rxq; Wed, 14 Apr 2021 11:13:15 +0200 (CEST) From: pukkamustard Date: Wed, 14 Apr 2021 11:12:30 +0200 Message-Id: <20210414091303.6990-4-pukkamustard@posteo.net> X-Mailer: git-send-email 2.31.1 In-Reply-To: <20210414091303.6990-1-pukkamustard@posteo.net> References: <20210414091303.6990-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" X-getmail-retrieved-from-mailbox: Patches * gnu/packages/ocaml.scm (ocaml-lwt) [propagated-inputs]: Add libev. [inputs]: Remove libev. (ocaml-ouint2, ocaml4.07-lambda-term, ocaml-markup) [inputs]: Remove libev. --- gnu/packages/ocaml.scm | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index 0ce74db21c..4fc9a45cb0 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -1342,9 +1342,6 @@ compilers that can directly deal with packages.") (base32 "0gxjw1bhmjcjzri6x6psqrkbbyq678b69bqfl9i1zswp7cj2lryg")))) (build-system dune-build-system) - (inputs - ;; XXX Should libev be a propagated-input of ocaml-lwt? - `(("libev" ,libev))) (propagated-inputs `(("lwt" ,ocaml-lwt) ("ocaml-stdlib-shims" ,ocaml-stdlib-shims))) @@ -2318,13 +2315,13 @@ for mapping files in memory. This function is the same as the ("ocaml-cppo" ,ocaml-cppo) ("pkg-config" ,pkg-config))) (inputs - `(("libev" ,libev) - ("glib" ,glib))) + `(("glib" ,glib))) (propagated-inputs `(("ocaml-mmap" ,ocaml-mmap) ("ocaml-ocplib-endian" ,ocaml-ocplib-endian) ("ocaml-result" ,ocaml-result) - ("ocaml-seq" ,ocaml-seq))) + ("ocaml-seq" ,ocaml-seq) + ("libev" ,libev))) (home-page "https://github.com/ocsigen/lwt") (synopsis "Cooperative threads and I/O in monadic style") (description "Lwt provides typed, composable cooperative threads. These @@ -3761,8 +3758,6 @@ connect an engine to your inputs and rendering functions to get an editor.") ("ocaml-lwt-log" ,(package-with-ocaml4.07 ocaml-lwt-log)) ("ocaml-lwt-react" ,(package-with-ocaml4.07 ocaml-lwt-react)) ("ocaml-zed" ,ocaml4.07-zed))) - (inputs - `(("libev" ,libev))) (home-page "https://github.com/diml/lambda-term") (synopsis "Terminal manipulation library for OCaml") (description "Lambda-Term is a cross-platform library for manipulating the @@ -6011,8 +6006,6 @@ the full Core is not available, such as in Javascript.") (build-system dune-build-system) (arguments `(#:package "markup")) - (inputs - `(("libev" ,libev))) (propagated-inputs `(("ocaml-bisect-ppx" ,ocaml-bisect-ppx) ("ocaml-uchar" ,ocaml-uchar)