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 0EaeGDrU6V9aegAA0tVLHw (envelope-from ) for ; Mon, 28 Dec 2020 12:48:58 +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 cDFUFDrU6V+9HgAAbx9fmQ (envelope-from ) for ; Mon, 28 Dec 2020 12:48:58 +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 F05339402A5 for ; Mon, 28 Dec 2020 12:48:57 +0000 (UTC) Received: from localhost ([::1]:43126 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ktrxI-0008Go-V5 for larch@yhetil.org; Mon, 28 Dec 2020 07:48:56 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:47316) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ktrwT-0007Jm-SV for guix-patches@gnu.org; Mon, 28 Dec 2020 07:48:05 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:51245) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ktrwT-00042q-JJ for guix-patches@gnu.org; Mon, 28 Dec 2020 07:48:05 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ktrwT-0003wv-HS for guix-patches@gnu.org; Mon, 28 Dec 2020 07:48:05 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#45498] [PATCH 08/12] gnu: ocaml-markup: Update to 1.0.0. Resent-From: pukkamustard Original-Sender: "Debbugs-submit" Resent-CC: guix-patches@gnu.org Resent-Date: Mon, 28 Dec 2020 12:48:05 +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: 45498@debbugs.gnu.org Received: via spool by 45498-submit@debbugs.gnu.org id=B45498.160915967415086 (code B ref 45498); Mon, 28 Dec 2020 12:48:05 +0000 Received: (at 45498) by debbugs.gnu.org; 28 Dec 2020 12:47:54 +0000 Received: from localhost ([127.0.0.1]:34543 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ktrwH-0003v9-VW for submit@debbugs.gnu.org; Mon, 28 Dec 2020 07:47:54 -0500 Received: from mout01.posteo.de ([185.67.36.65]:59266) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ktrw6-0003tG-7c for 45498@debbugs.gnu.org; Mon, 28 Dec 2020 07:47:42 -0500 Received: from submission (posteo.de [89.146.220.130]) by mout01.posteo.de (Postfix) with ESMTPS id 5205116005C for <45498@debbugs.gnu.org>; Mon, 28 Dec 2020 13:47:36 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1609159656; bh=zwbo1WuvcAKtFv3vKqy7XAhNJlVwUJJmY3frfRLnmPg=; h=From:To:Cc:Subject:Date:From; b=rMkqTCiXx3XitMms3Pp+lEFn82mcmKnczUUl30O8TLRbwESyFiUzFK0JWUI9sMod2 WtfB4xKqitPq+tZUEqCV1qyVrgOPUcQnz54mUeHUEdq2BfIIiMl79R9zVsO/2caaUQ eDSIu2Ct1zMXJuooHpCRpbGuRGFvSZregBJPGrdy/mA+7PCMe3tFT2x85nxTqXdkQn /cRte016J8oCpqmft29005S7JmvH3dSKpEJgB1L4JrB7J68TmPbLf0GSNy+KzWsckR jHle/qASz7tXc/u1kgpXdDENjuT323x0Uwl3ShjisZr5dVKUtGtyvEW2FH5KTcAP9S 38gJyY02vkv1Q== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4D4HPz6MZcz6tm6; Mon, 28 Dec 2020 13:47:35 +0100 (CET) From: pukkamustard Date: Mon, 28 Dec 2020 13:47:14 +0100 Message-Id: <20201228124718.24736-8-pukkamustard@posteo.net> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201228124718.24736-1-pukkamustard@posteo.net> References: <20201228124718.24736-1-pukkamustard@posteo.net> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 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+larch=yhetil.org@gnu.org Sender: "Guix-patches" X-Migadu-Flow: FLOW_IN X-Migadu-Spam-Score: 3.78 Authentication-Results: aspmx1.migadu.com; dkim=fail (headers rsa verify failed) header.d=posteo.net header.s=2017 header.b=rMkqTCiX; dmarc=fail reason="SPF not aligned (strict)" header.from=posteo.net (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: F05339402A5 X-Spam-Score: 3.78 X-Migadu-Scanner: scn0.migadu.com X-TUID: /sP9c27xkRvP * gnu/packages/ocaml.scm (ocaml-markup): Update to 1.0.0. (ocaml-markup0.8.0): New variable. (ocaml4.07-tyxml): New variable. (ocaml4.07-odoc)[inputs]: Replace ocaml-tyxml with ocaml4.07-tyxml and ocaml-markup with ocaml-markup0.8.0. --- gnu/packages/ocaml.scm | 40 +++++++++++++++++++++++++++++++++++----- 1 file changed, 35 insertions(+), 5 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index bbdf65892e..6714c266d1 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -5538,7 +5538,7 @@ the full Core is not available, such as in Javascript.") (define-public ocaml-markup (package (name "ocaml-markup") - (version "0.8.2") + (version "1.0.0") (home-page "https://github.com/aantron/markup.ml") (source (origin @@ -5549,7 +5549,7 @@ the full Core is not available, such as in Javascript.") (file-name (git-file-name name version)) (sha256 (base32 - "13zcrwzjmifniv3bvjbkd2ah8wwa3ld75bxh1d8hrzdvfxzh9szn")))) + "09hkrf9pw6hpb9j06p5bddklpnjwdjpqza3bx2179l970yl67an9")))) (build-system dune-build-system) (arguments `(#:package "markup")) @@ -5561,7 +5561,7 @@ the full Core is not available, such as in Javascript.") ("ocaml-uutf" ,ocaml-uutf) ("ocaml-lwt" ,ocaml-lwt))) (native-inputs - `(("ocaml-ounit" ,ocaml-ounit) + `(("ocaml-ounit2" ,ocaml-ounit2) ("pkg-config" ,pkg-config))) (synopsis "Error-recovering functional HTML5 and XML parsers and writers") (description "Markup.ml provides an HTML parser and an XML parser. The @@ -5584,6 +5584,25 @@ a single pass. They automatically detect the character encoding of the input stream, and convert everything to UTF-8.") (license license:bsd-3))) +;; ocaml-markup 1.0.0 can not be built with old version of dune used in +;; package-with-ocaml4.07 +(define-public ocaml-markup0.8.0 + (package + (inherit ocaml-markup) + (name "ocaml-markup") + (version "0.8.0") + (home-page "https://github.com/aantron/markup.ml") + (source + (origin + (method git-fetch) + (uri (git-reference + (url (string-append home-page ".git")) + (commit version))) + (file-name (git-file-name name version)) + (sha256 + (base32 + "0aif4abvfmi9xc1pvw5n5rbm6rzkkpsxyvdn0lanr33rjpvkwdlm")))))) + (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))) +(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)))))) + (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) ("ocaml-bisect-ppx" ,(package-with-ocaml4.07 ocaml-bisect-ppx)))) (home-page "https://github.com/ocaml/odoc") (synopsis "OCaml documentation generator") -- 2.29.2