From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mp2 ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by ms11 with LMTPS id wG/FMtIg6l/NXwAA0tVLHw (envelope-from ) for ; Mon, 28 Dec 2020 18:15:46 +0000 Received: from aspmx1.migadu.com ([2001:41d0:2:4a6f::]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) by mp2 with LMTPS id MEe+LtIg6l/nIAAAB5/wlQ (envelope-from ) for ; Mon, 28 Dec 2020 18:15:46 +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 4CF599404FC for ; Mon, 28 Dec 2020 18:15:46 +0000 (UTC) Received: from localhost ([::1]:40828 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1ktx3Z-00043h-6T for larch@yhetil.org; Mon, 28 Dec 2020 13:15:45 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:58758) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1ktx2w-0003ct-Fo for guix-patches@gnu.org; Mon, 28 Dec 2020 13:15:06 -0500 Received: from debbugs.gnu.org ([209.51.188.43]:53534) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1ktx2w-0006eJ-5E for guix-patches@gnu.org; Mon, 28 Dec 2020 13:15:06 -0500 Received: from Debian-debbugs by debbugs.gnu.org with local (Exim 4.84_2) (envelope-from ) id 1ktx2w-0000FT-0K for guix-patches@gnu.org; Mon, 28 Dec 2020 13:15:06 -0500 X-Loop: help-debbugs@gnu.org Subject: [bug#45498] [PATCH v2 08/13] 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 18:15: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.1609179291844 (code B ref 45498); Mon, 28 Dec 2020 18:15:05 +0000 Received: (at 45498) by debbugs.gnu.org; 28 Dec 2020 18:14:51 +0000 Received: from localhost ([127.0.0.1]:36832 helo=debbugs.gnu.org) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ktx2h-0000DS-4D for submit@debbugs.gnu.org; Mon, 28 Dec 2020 13:14:51 -0500 Received: from mout01.posteo.de ([185.67.36.65]:52985) by debbugs.gnu.org with esmtp (Exim 4.84_2) (envelope-from ) id 1ktx2X-0000BU-6A for 45498@debbugs.gnu.org; Mon, 28 Dec 2020 13:14:41 -0500 Received: from submission (posteo.de [89.146.220.130]) by mout01.posteo.de (Postfix) with ESMTPS id 9F3F7160060 for <45498@debbugs.gnu.org>; Mon, 28 Dec 2020 19:14:35 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.net; s=2017; t=1609179275; bh=LEd/FiE5tnkarsMHJl5Si/upsVREXI7oEebpHnrhA0M=; h=From:To:Cc:Subject:Date:From; b=X/P1XDOjnkdma/Ck3sFZqACvXJlbFlH0RZHiI0y9U5qAeetussv0OJ+rAc8oSE6QD zeyU1ZODrE34SGjp1SQkjGtAeNitOSDqrefvY/4ht21Dy2U3tosXBOcJxA7hRXSIFM Wom6VdjBRxx+sqZNz4zxUjpOQi7jUulYLTV4M19MGUkMh0Kb130RHeGmrHtIQ9kbPc iaQbUdBqbIhfQw6hXFipgtUwoH6FMhU487hhFlN6M90bR2wiudiytCyuxPSSu4Ovqu ZRJVLzagwOAdq7ZYxbLK536hNoQsIvQHVELCSeRZ0KC47VqZqyjpADh4DKU/bphO6q PgjN/IwXw989w== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4D4QgH1yBtz6tm5; Mon, 28 Dec 2020 19:14:35 +0100 (CET) From: pukkamustard Date: Mon, 28 Dec 2020 19:14:09 +0100 Message-Id: <20201228181414.14196-8-pukkamustard@posteo.net> X-Mailer: git-send-email 2.29.2 In-Reply-To: <20201228181414.14196-1-pukkamustard@posteo.net> References: <86pn2tn6mv.fsf@posteo.net> <20201228181414.14196-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=X/P1XDOj; 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: 4CF599404FC X-Spam-Score: 3.78 X-Migadu-Scanner: scn1.migadu.com X-TUID: y2Ch1bK1O1pn * gnu/packages/ocaml.scm (ocaml-markup): Update to 1.0.0. (ocaml-markup0.8.0): New variable. --- gnu/packages/ocaml.scm | 28 +++++++++++++++++++++++++--- 1 file changed, 25 insertions(+), 3 deletions(-) diff --git a/gnu/packages/ocaml.scm b/gnu/packages/ocaml.scm index c042ebd58b..6f4c0b980e 100644 --- a/gnu/packages/ocaml.scm +++ b/gnu/packages/ocaml.scm @@ -5532,7 +5532,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 @@ -5543,7 +5543,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")) @@ -5555,8 +5555,10 @@ 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))) + (properties + `((ocaml4.07-variant . ,(delay (package-with-ocaml4.07 ocaml-markup0.8.0))))) (synopsis "Error-recovering functional HTML5 and XML parsers and writers") (description "Markup.ml provides an HTML parser and an XML parser. The parsers are wrapped in a simple interface: they are functions that transform @@ -5578,6 +5580,26 @@ 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")))) + (properties '()))) + (define-public ocaml-tyxml (package (name "ocaml-tyxml") -- 2.29.2