From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp1 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id wE7lOK3k6V/QdwAA0tVLHw (envelope-from ) for ; Mon, 28 Dec 2020 13:59:09 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp1 with LMTPS id sEOlNK3k6V/cKAAAbx9fmQ (envelope-from ) for ; Mon, 28 Dec 2020 13:59:09 +0000 Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by aspmx1.migadu.com (Postfix) with ESMTPS id AAE319402B6 for ; Mon, 28 Dec 2020 13:59:09 +0000 (UTC) Received: from localhost ([::1]:47930 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ktt3E-0001SG-Io for larch@yhetil.org; Mon, 28 Dec 2020 08:59:08 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:33954) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ktt38-0001SA-K2 for guix-patches@gnu.org; Mon, 28 Dec 2020 08:59:02 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:51333) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ktt38-0002um-CU for guix-patches@gnu.org; Mon, 28 Dec 2020 08:59:02 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ktt38-0005fk-A4 for guix-patches@gnu.org; Mon, 28 Dec 2020 08:59:02 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#45498] [PATCH 08/12] gnu: ocaml-markup: Update to 1.0.0. Resent-From: Julien Lepiller Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 28 Dec 2020 13:59:02 +0000 Resent-Message-ID: Resent-Sender: help-debbugs@gnu.org X-GNU-PR-Message: followup 45498 X-GNU-PR-Package: guix-patches X-GNU-PR-Keywords: patch To: pukkamustard Received: via spool by 45498-submit@debbugs.gnu.org id=B45498.160916391321758 (code B ref 45498); Mon, 28 Dec 2020 13:59:02 +0000 Received: (at 45498) by debbugs.gnu.org; 28 Dec 2020 13:58:33 +0000 Received: from localhost ([127.0.0.1]:34646 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ktt2e-0005es-OF for submit@debbugs.gnu.org; Mon, 28 Dec 2020 08:58:32 -0500 Received: from lepiller.eu ([89.234.186.109]:58592) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ktt2a-0005eh-BX for 45498@debbugs.gnu.org; Mon, 28 Dec 2020 08:58:31 -0500 Received: from lepiller.eu (localhost [127.0.0.1]) by lepiller.eu (OpenSMTPD) with ESMTP id cd4f7401; Mon, 28 Dec 2020 13:58:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed; d=lepiller.eu; h=date:from :to:cc:subject:message-id:in-reply-to:references:mime-version :content-type:content-transfer-encoding; s=dkim; bh=liTuNtOdgmzC 9GHOBoGr7y4Zk51n4AgDsk5ut77b8uk=; b=XwdKLDpVSqo4FzD1erNCRC/lRoF/ BsxEBfd6I+ORoG5wSn3bCBynI/wbgBged+nCxWE0H1adT7/3NHUVTqbhRF3lio3O 1MdlwepsQlNdN0ng7wIIsOr+38ZnmJCZyCo2EKXWPt/3gOASyL9mC8stWQ2jl9Re pRsDKNqFKJ8fXsV/cBCL013jzTIpRwafN5lKLyqNKu/IZ4cgFIOFOm4ehYN6dqBU BiqQol6CF8423uzkic9O+7t6Z7H5BlP1FzzM/1Ag7PslXuxShuVMt6Ko6J0uzHsh LmhNmrcdcWP985cC7cf7FhqN+vd00DxinrN9oaq4/YeGmMY/KxeFvYAgUQ== Received: by lepiller.eu (OpenSMTPD) with ESMTPSA id f77bb1c5 (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256:NO); Mon, 28 Dec 2020 13:58:25 +0000 (UTC) Date: Mon, 28 Dec 2020 14:58:17 +0100 From: Julien Lepiller Message-ID: <20201228145817.65060ada@tachikoma.lepiller.eu> In-Reply-To: <20201228124718.24736-8-pukkamustard@posteo.net> References: <20201228124718.24736-1-pukkamustard@posteo.net> <20201228124718.24736-8-pukkamustard@posteo.net> X-Mailer: Claws Mail 3.17.8 (GTK+ 2.24.32; x86_64-pc-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable 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: , Cc: 45498@debbugs.gnu.org Errors-To: guix-patches-bounces+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN X-Migadu-Spam-Score: -1.22 Authentication-Results: aspmx1.migadu.com; dkim=fail (headers rsa verify failed) header.d=lepiller.eu header.s=dkim header.b=XwdKLDpV; dmarc=fail reason="SPF not aligned (relaxed)" header.from=lepiller.eu (policy=none); spf=pass (aspmx1.migadu.com: domain of guix-patches-bounces@gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=guix-patches-bounces@gnu.org X-Migadu-Queue-Id: AAE319402B6 X-Spam-Score: -1.22 X-Migadu-Scanner: scn1.migadu.com X-TUID: fOU3RqyrTTtq Le Mon, 28 Dec 2020 13:47:14 +0100, pukkamustard a =C3=A9crit : > [...] > (define-public ocaml-tyxml > (package > (name "ocaml-tyxml") > @@ -5619,6 +5638,17 @@ also create your own representation and use it > to instantiate a new set of combinators.") > (license license:lgpl2.1))) > =20 > +(define-public ocaml4.07-tyxml > + (package-with-ocaml4.07 > + (package > + (inherit ocaml-tyxml) > + (inputs > + `(("ocaml-re" ,ocaml-re) > + ("ocaml-seq" ,ocaml-seq) > + ("ocaml-uutf" ,ocaml-uutf) > + ("ocaml-ppx-tools-versioned" ,ocaml-ppx-tools-versioned) > + ("ocaml-markup" ,ocaml-markup0.8.0)))))) > + Here, I would also add an ocaml4.07-variant property to ocaml-tyxml, so (package-with-ocaml4.07 ocaml-tyxml) returns that variant (also remove the properties from the variant, or there will be a loop). > (define-public ocaml-bisect-ppx > (package > (name "ocaml-bisect-ppx") > @@ -5681,7 +5711,7 @@ then run the Bisect_ppx report tool on the > generated visitation files.") #:dune ,ocaml4.07-dune)) > (inputs > `(("ocaml-alcotest" ,(package-with-ocaml4.07 ocaml-alcotest)) > - ("ocaml-markup" ,(package-with-ocaml4.07 ocaml-markup)) > + ("ocaml-markup" ,(package-with-ocaml4.07 ocaml-markup0.8.0)) > ("ocaml-sexplib" ,ocaml4.07-sexplib) > ("ocaml-re" ,(package-with-ocaml4.07 ocaml-re)) > ("ocaml-uutf" ,(package-with-ocaml4.07 ocaml-uutf)))) > @@ -5691,7 +5721,7 @@ then run the Bisect_ppx report tool on the > generated visitation files.") ("ocaml-cppo" ,(package-with-ocaml4.07 > ocaml-cppo)) ("ocaml-fpath" ,(package-with-ocaml4.07 ocaml-fpath)) > ("ocaml-result" ,(package-with-ocaml4.07 ocaml-result)) > - ("ocaml-tyxml" ,(package-with-ocaml4.07 ocaml-tyxml)) > + ("ocaml-tyxml" ,ocaml4.07-tyxml) Then this would not be needed > ("ocaml-bisect-ppx" ,(package-with-ocaml4.07 > ocaml-bisect-ppx)))) (home-page "https://github.com/ocaml/odoc") > (synopsis "OCaml documentation generator")