summary refs log tree commit diff
path: root/pkgs/development/ocaml-modules/odoc
diff options
context:
space:
mode:
authorsternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org>2020-12-06 14:07:04 +0000
committerVincent Laporte <Vincent.Laporte@gmail.com>2020-12-07 13:11:11 +0100
commita817ce3adac8057216fa27326bf8c36e19a04fa6 (patch)
tree4621ea26b439a8922bd253c2d842ba37fef743d6 /pkgs/development/ocaml-modules/odoc
parent4462f06ad8a0f02e89d4338783acda0356a93c08 (diff)
downloadnixpkgs-a817ce3adac8057216fa27326bf8c36e19a04fa6.tar
nixpkgs-a817ce3adac8057216fa27326bf8c36e19a04fa6.tar.gz
nixpkgs-a817ce3adac8057216fa27326bf8c36e19a04fa6.tar.bz2
nixpkgs-a817ce3adac8057216fa27326bf8c36e19a04fa6.tar.lz
nixpkgs-a817ce3adac8057216fa27326bf8c36e19a04fa6.tar.xz
nixpkgs-a817ce3adac8057216fa27326bf8c36e19a04fa6.tar.zst
nixpkgs-a817ce3adac8057216fa27326bf8c36e19a04fa6.zip
ocamlPackages.odoc: 1.5.1 -> 1.5.2
Diffstat (limited to 'pkgs/development/ocaml-modules/odoc')
-rw-r--r--pkgs/development/ocaml-modules/odoc/default.nix22
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 8dde7ba56ff..fad5917a5a4 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";
   };
 }