summary refs log tree commit diff
diff options
context:
space:
mode:
authorVincent Laporte <Vincent.Laporte@gmail.com>2018-11-04 06:24:52 +0000
committerVincent Laporte <vbgl@users.noreply.github.com>2018-11-06 18:20:49 +0000
commit15995ea2b29d7253a74f75948ce881f29eeeafa1 (patch)
tree3a8c153398b0c987929e2eafc15e3157efd8c33a
parentfccfc775d11053db6b1197bc2909ca98387e4543 (diff)
downloadnixlib-15995ea2b29d7253a74f75948ce881f29eeeafa1.tar
nixlib-15995ea2b29d7253a74f75948ce881f29eeeafa1.tar.gz
nixlib-15995ea2b29d7253a74f75948ce881f29eeeafa1.tar.bz2
nixlib-15995ea2b29d7253a74f75948ce881f29eeeafa1.tar.lz
nixlib-15995ea2b29d7253a74f75948ce881f29eeeafa1.tar.xz
nixlib-15995ea2b29d7253a74f75948ce881f29eeeafa1.tar.zst
nixlib-15995ea2b29d7253a74f75948ce881f29eeeafa1.zip
ocamlPackages.odoc: 1.2.0 -> 1.3.0
-rw-r--r--pkgs/development/ocaml-modules/odoc/default.nix16
1 files changed, 6 insertions, 10 deletions
diff --git a/pkgs/development/ocaml-modules/odoc/default.nix b/pkgs/development/ocaml-modules/odoc/default.nix
index 3b1005106272..ef91b110c7ce 100644
--- a/pkgs/development/ocaml-modules/odoc/default.nix
+++ b/pkgs/development/ocaml-modules/odoc/default.nix
@@ -1,22 +1,18 @@
-{ stdenv, fetchFromGitHub, ocaml, findlib, dune
-, bos, cmdliner, doc-ock-html, doc-ock-xml
+{ stdenv, fetchFromGitHub, ocaml, findlib, dune, cppo
+, bos, cmdliner, tyxml
 }:
 
 stdenv.mkDerivation rec {
   name = "ocaml${ocaml.version}-odoc-${version}";
-  version = "1.2.0";
+  version = "1.3.0";
   src = fetchFromGitHub {
     owner = "ocaml";
     repo = "odoc";
-    rev = "v${version}";
-    sha256 = "0ixnhfpm1nw4bvjj8qhcyy283pdr5acqpg5wxwq3n1l4mad79cgh";
+    rev = version;
+    sha256 = "0hjan5aj5zk8j8qyagv9r4hqm469mh207cv2m6kxwgnw0c3cz7sy";
   };
 
-  buildInputs = [ ocaml findlib dune cmdliner ];
-
-  propagatedBuildInputs = [ bos doc-ock-html doc-ock-xml ];
-
-  configurePhase = "ocaml bin/set-etc bin/odoc_etc.ml $out/etc/odoc";
+  buildInputs = [ ocaml findlib dune cppo bos cmdliner tyxml ];
 
   inherit (dune) installPhase;