ocamlPackage.odoc: 1.5.3 -> 2.1.1 (#181884)

build tested by:
fnix build -f.  ocaml-ng.ocamlPackages_4_{05,06,07,08,09,10,11,12,13,14}.odoc
fnix build -f.  ocaml-ng.ocamlPackages_4_{08,09,10,11,12,13,14}.{odoc,curly,mdx}

curly and mdx are the only reverse dependencies in ocaml-modules
according to grep
This commit is contained in:
Guillaume Girol 2022-07-19 04:51:30 +00:00 committed by GitHub
parent 3ee8d4c909
commit 23432ed4fc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -1,25 +1,32 @@
{ lib, fetchurl, buildDunePackage, ocaml { lib, fetchurl, buildDunePackage, ocaml
, astring, cmdliner, cppo, fpath, result, tyxml , astring, cmdliner, cppo, fpath, result, tyxml
, markup, alcotest, yojson, sexplib, jq , markup, yojson, sexplib0, jq
, odoc-parser, ppx_expect, bash, fmt
}: }:
buildDunePackage rec { buildDunePackage rec {
pname = "odoc"; pname = "odoc";
version = "1.5.3"; version = "2.1.1";
minimumOCamlVersion = "4.02";
src = fetchurl { src = fetchurl {
url = "https://github.com/ocaml/odoc/releases/download/${version}/odoc-${version}.tbz"; url = "https://github.com/ocaml/odoc/releases/download/${version}/odoc-${version}.tbz";
sha256 = "0idzidmz7y10xkwcf4aih0mdvkipxk1gzi4anhnbbi2q2s0nzdzj"; sha256 = "sha256-9XTb0ozQ/DorlVJcS7ld320fZAi7T+EhV/pTeIT5h/0=";
}; };
useDune2 = true; # dune 3 is required for tests to pass
duneVersion = if doCheck then "3" else "2";
buildInputs = [ astring cmdliner cppo fpath result tyxml ]; buildInputs = [ astring cmdliner cppo fpath result tyxml odoc-parser fmt ];
checkInputs = [ alcotest markup yojson sexplib jq ]; checkInputs = [ markup yojson sexplib0 jq ppx_expect bash ];
doCheck = lib.versionAtLeast ocaml.version "4.05"; doCheck = lib.versionAtLeast ocaml.version "4.08";
preCheck = ''
# some run.t files check the content of patchShebangs-ed scripts, so patch
# them as well
find test \( -name '*.sh' -o -name 'run.t' \) -execdir sed 's@#!/bin/sh@#!${bash}/bin/sh@' -i '{}' \;
patchShebangs test
'';
meta = { meta = {
description = "A documentation generator for OCaml"; description = "A documentation generator for OCaml";