diff options
| author | github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com> | 2020-12-07 12:19:52 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-07 12:19:52 +0000 |
| commit | eb09c5dbdb32e3bc46ecd194c92d3f3e47341ae6 (patch) | |
| tree | b987f13ca2106c973517f7ef65758ef21d4fafd0 /pkgs/development/ocaml-modules | |
| parent | cc5dccaa919bff16db697ca7631a49a5daadb513 (diff) | |
| parent | f8b24938bf73dafe78433a69d4d404dafec628ae (diff) | |
| download | nixlib-eb09c5dbdb32e3bc46ecd194c92d3f3e47341ae6.tar nixlib-eb09c5dbdb32e3bc46ecd194c92d3f3e47341ae6.tar.gz nixlib-eb09c5dbdb32e3bc46ecd194c92d3f3e47341ae6.tar.bz2 nixlib-eb09c5dbdb32e3bc46ecd194c92d3f3e47341ae6.tar.lz nixlib-eb09c5dbdb32e3bc46ecd194c92d3f3e47341ae6.tar.xz nixlib-eb09c5dbdb32e3bc46ecd194c92d3f3e47341ae6.tar.zst nixlib-eb09c5dbdb32e3bc46ecd194c92d3f3e47341ae6.zip | |
Merge staging-next into staging
Diffstat (limited to 'pkgs/development/ocaml-modules')
| -rw-r--r-- | pkgs/development/ocaml-modules/odoc/default.nix | 22 |
1 files changed, 14 insertions, 8 deletions
diff --git a/pkgs/development/ocaml-modules/odoc/default.nix b/pkgs/development/ocaml-modules/odoc/default.nix index 8dde7ba56ffb..fad5917a5a4f 100644 --- a/pkgs/development/ocaml-modules/odoc/default.nix +++ b/pkgs/development/ocaml-modules/odoc/default.nix @@ -1,24 +1,30 @@ -{ lib, fetchFromGitHub, buildDunePackage +{ lib, fetchurl, buildDunePackage, ocaml , astring, cmdliner, cppo, fpath, result, tyxml +, markup, alcotest, yojson, sexplib, jq }: buildDunePackage rec { pname = "odoc"; - version = "1.5.1"; + version = "1.5.2"; - src = fetchFromGitHub { - owner = "ocaml"; - repo = pname; - rev = version; - sha256 = "0z2nisg1vb5xlk41hqw8drvj90v52wli7zvnih6a844cg6xsvvj2"; + minimumOCamlVersion = "4.02"; + + src = fetchurl { + url = "https://github.com/ocaml/odoc/releases/download/${version}/odoc-${version}.tbz"; + sha256 = "0wa87h8q6izcc6rkzqn944vrb3hmc21lf0d0rmr8rhhbcvr66i6j"; }; + useDune2 = true; + buildInputs = [ astring cmdliner cppo fpath result tyxml ]; + checkInputs = [ alcotest markup yojson sexplib jq ]; + doCheck = lib.versionAtLeast ocaml.version "4.05"; + meta = { description = "A documentation generator for OCaml"; license = lib.licenses.isc; maintainers = [ lib.maintainers.vbgl ]; - inherit (src.meta) homepage; + homepage = "https://github.com/ocaml/odoc"; }; } |