Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: fccfc775d110
Choose a base ref
...
head repository: NixOS/nixpkgs
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 15995ea2b29d
Choose a head ref
  • 1 commit
  • 1 file changed
  • 1 contributor

Commits on Nov 6, 2018

  1. ocamlPackages.odoc: 1.2.0 -> 1.3.0

    @vbgl
    vbgl committed Nov 6, 2018
    Copy the full SHA
    15995ea View commit details
Showing with 6 additions and 10 deletions.
  1. +6 −10 pkgs/development/ocaml-modules/odoc/default.nix
16 changes: 6 additions & 10 deletions pkgs/development/ocaml-modules/odoc/default.nix
View file
Original file line number Diff line number Diff line change
@@ -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;