git.iko.soy/typeable/nixpkgs
on master help sign in
ocamlPackages.odoc: 1.5.1 -> 1.5.2
commita817ce3adac8057216fa27326bf8c36e19a04fa6 authorsternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org> dateSun 6 Dec 2020, 14:07 (6 years ago) parent4462f06
2 files changed+15−9
pkgs/development/ocaml-modules/odoc/default.nix+14−8 pkgs/development/tools/ocaml/ocamlformat/generic.nix+1−1
pkgs/development/ocaml-modules/odoc/default.nix+14−8
@@ -1,24 +1,30 @@
1−{ lib, fetchFromGitHub, buildDunePackage
1+{ lib, fetchurl, buildDunePackage, ocaml
22, astring, cmdliner, cppo, fpath, result, tyxml
3+, markup, alcotest, yojson, sexplib, jq
34}:
45
56buildDunePackage rec {
67 pname = "odoc";
7− version = "1.5.1";
8+ version = "1.5.2";
89
9− src = fetchFromGitHub {
10− owner = "ocaml";
11− repo = pname;
12− rev = version;
13− sha256 = "0z2nisg1vb5xlk41hqw8drvj90v52wli7zvnih6a844cg6xsvvj2";
10+ minimumOCamlVersion = "4.02";
11+
12+ src = fetchurl {
13+ url = "https://github.com/ocaml/odoc/releases/download/${version}/odoc-${version}.tbz";
14+ sha256 = "0wa87h8q6izcc6rkzqn944vrb3hmc21lf0d0rmr8rhhbcvr66i6j";
1415 };
1516
17+ useDune2 = true;
18+
1619 buildInputs = [ astring cmdliner cppo fpath result tyxml ];
1720
21+ checkInputs = [ alcotest markup yojson sexplib jq ];
22+ doCheck = lib.versionAtLeast ocaml.version "4.05";
23+
1824 meta = {
1925 description = "A documentation generator for OCaml";
2026 license = lib.licenses.isc;
2127 maintainers = [ lib.maintainers.vbgl ];
22− inherit (src.meta) homepage;
28+ homepage = "https://github.com/ocaml/odoc";
2329 };
2430}
pkgs/development/tools/ocaml/ocamlformat/generic.nix+1−1
@@ -30,7 +30,7 @@ buildDunePackage rec {
3030
3131 minimumOCamlVersion = "4.06";
3232
33− useDune2 = lib.versionAtLeast version "0.14";
33+ useDune2 = true;
3434
3535 buildInputs =
3636 if lib.versionAtLeast version "0.14"