From a817ce3adac8057216fa27326bf8c36e19a04fa6 Mon Sep 17 00:00:00 2001
From: sternenseemann <0rpkxez4ksa01gb3typccl0i@systemli.org>
Date: Sun, 6 Dec 2020 14:07:04 +0000
Subject: [PATCH] ocamlPackages.odoc: 1.5.1 -> 1.5.2

---
 .../ocaml-modules/odoc/default.nix            | 22 ++++++++++++-------
 .../tools/ocaml/ocamlformat/generic.nix       |  2 +-
 2 files changed, 15 insertions(+), 9 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";
   };
 }
diff --git a/pkgs/development/tools/ocaml/ocamlformat/generic.nix b/pkgs/development/tools/ocaml/ocamlformat/generic.nix
index c39ade7c074..59c77f6e142 100644
--- a/pkgs/development/tools/ocaml/ocamlformat/generic.nix
+++ b/pkgs/development/tools/ocaml/ocamlformat/generic.nix
@@ -30,7 +30,7 @@ buildDunePackage rec {
 
   minimumOCamlVersion = "4.06";
 
-  useDune2 = lib.versionAtLeast version "0.14";
+  useDune2 = true;
 
   buildInputs =
     if lib.versionAtLeast version "0.14"