public
/
nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ocamlPackages.odoc: 1.5.1 -> 1.5.2

This commit is contained in:
sternenseemann 2020-12-06 14:07:04 +00:00 committed by Vincent Laporte
parent 4462f06ad8
commit a817ce3ada
No known key found for this signature in database
GPG Key ID: EBD582ADDDB1F81F
2 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
pkgs/development/ocaml-modules/odoc/default.nix
View File

@ -1,24 +1,30 @@
{ lib, fetchFromGitHub, buildDunePackage { lib, fetchurl, buildDunePackage, ocaml
, astring, cmdliner, cppo, fpath, result, tyxml , astring, cmdliner, cppo, fpath, result, tyxml
, markup, alcotest, yojson, sexplib, jq
}: }:
buildDunePackage rec { buildDunePackage rec {
pname = "odoc"; pname = "odoc";
version = "1.5.1"; version = "1.5.2";
src = fetchFromGitHub { minimumOCamlVersion = "4.02";
owner = "ocaml";
repo = pname; src = fetchurl {
rev = version; url = "https://github.com/ocaml/odoc/releases/download/${version}/odoc-${version}.tbz";
sha256 = "0z2nisg1vb5xlk41hqw8drvj90v52wli7zvnih6a844cg6xsvvj2"; sha256 = "0wa87h8q6izcc6rkzqn944vrb3hmc21lf0d0rmr8rhhbcvr66i6j";
}; };
useDune2 = true;
buildInputs = [ astring cmdliner cppo fpath result tyxml ]; buildInputs = [ astring cmdliner cppo fpath result tyxml ];
checkInputs = [ alcotest markup yojson sexplib jq ];
doCheck = lib.versionAtLeast ocaml.version "4.05";
meta = { meta = {
description = "A documentation generator for OCaml"; description = "A documentation generator for OCaml";
license = lib.licenses.isc; license = lib.licenses.isc;
maintainers = [ lib.maintainers.vbgl ]; maintainers = [ lib.maintainers.vbgl ];
inherit (src.meta) homepage; homepage = "https://github.com/ocaml/odoc";
}; };
} }

2
pkgs/development/tools/ocaml/ocamlformat/generic.nix
View File

@ -30,7 +30,7 @@ buildDunePackage rec {
minimumOCamlVersion = "4.06"; minimumOCamlVersion = "4.06";
useDune2 = lib.versionAtLeast version "0.14"; useDune2 = true;
buildInputs = buildInputs =
if lib.versionAtLeast version "0.14" if lib.versionAtLeast version "0.14"