[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#45498] [PATCH 08/12] gnu: ocaml-markup: Update to 1.0.0.
From: |
pukkamustard |
Subject: |
[bug#45498] [PATCH 08/12] gnu: ocaml-markup: Update to 1.0.0. |
Date: |
Mon, 28 Dec 2020 13:47:14 +0100 |
* 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
- [bug#45498] [PATCH 00/12] Add ocaml-merlin., pukkamustard, 2020/12/28
- [bug#45498] [PATCH 01/12] gnu: Remove ocaml-js-build-tools., pukkamustard, 2020/12/28
- [bug#45498] [PATCH 03/12] gnu: Add ocaml-base., pukkamustard, 2020/12/28
- [bug#45498] [PATCH 02/12] gnu: Add ocaml-sexplib., pukkamustard, 2020/12/28
- [bug#45498] [PATCH 05/12] gnu: Add ocaml-sexplib., pukkamustard, 2020/12/28
- [bug#45498] [PATCH 04/12] gnu: Add ocaml-parsexp., pukkamustard, 2020/12/28
- [bug#45498] [PATCH 07/12] gnu: ocaml-tyxml: Update to 4.4.0., pukkamustard, 2020/12/28
- [bug#45498] [PATCH 06/12] gnu: Add ocaml-ounit2., pukkamustard, 2020/12/28
- [bug#45498] [PATCH 09/12] gnu: Add ocaml-odoc., pukkamustard, 2020/12/28
- [bug#45498] [PATCH 08/12] gnu: ocaml-markup: Update to 1.0.0.,
pukkamustard <=
- [bug#45498] [PATCH 11/12] gnu: Add ocaml-mdx., pukkamustard, 2020/12/28
- [bug#45498] [PATCH 10/12] gnu: Add ocaml-version., pukkamustard, 2020/12/28
- [bug#45498] [PATCH 12/12] gnu: Add ocaml-merlin., pukkamustard, 2020/12/28
- [bug#34412] [bug#45498] [PATCH 00/12] Add ocaml-merlin., Julien Lepiller, 2020/12/28