Unverified Commit b44a5519 authored by Vincent Laporte's avatar Vincent Laporte Committed by GitHub
Browse files

ocamlPackages.odoc: 2.4.4 → 3.1.0 (#443077)

parents 85c36c19 2f7398ef

pkgs/development/ocaml-modules/odoc-parser/default.nix

+5 −4
Original line number Diff line number Diff line
@@ -6,12 +6,15 @@ 
  astring,

  result,

  camlp-streams,

  version ? "2.4.4",

  version ? if lib.versionAtLeast ocaml.version "4.08" then "3.1.0" else "2.4.4",

}:



let

  param =

    {

      "3.1.0" = {

        sha256 = "sha256-NVs8//STSQPLrti1HONeMz6GCZMtIwKUIAqfLUL/qRQ=";

      };

      "2.4.4" = {

        sha256 = "sha256-fiU6VbXI9hD54LSJQOza8hwBVTFDr5O0DJmMMEmeUfM=";

      };
@@ -41,8 +44,6 @@ lib.throwIf (param ? max_version && lib.versionAtLeast ocaml.version param.max_v 
    pname = "odoc-parser";

    inherit version;



    minimalOCamlVersion = "4.02";



    src = fetchurl {

      url =

        if lib.versionAtLeast version "2.4" then
@@ -54,8 +55,8 @@ lib.throwIf (param ? max_version && lib.versionAtLeast ocaml.version param.max_v 


    propagatedBuildInputs = [

      astring

      result

    ]

    ++ lib.optional (!lib.versionAtLeast version "3.1.0") result

    ++ lib.optional (lib.versionAtLeast version "1.0.1") camlp-streams;



    meta = {

pkgs/development/ocaml-modules/odoc/default.nix

+3 −5
Original line number Diff line number Diff line 
{

  lib,

  buildDunePackage,

  ocaml,

  ocaml-crunch,

  astring,

  cmdliner,
@@ -19,7 +18,7 @@ 
  fmt,

}:



buildDunePackage rec {

buildDunePackage {

  pname = "odoc";

  inherit (odoc-parser) version src;
@@ -31,7 +30,6 @@ buildDunePackage rec { 
    astring

    cmdliner

    fpath

    result

    tyxml

    odoc-parser

    fmt
@@ -48,7 +46,7 @@ buildDunePackage rec { 
    jq

    ppx_expect

  ];

  doCheck = lib.versionAtLeast ocaml.version "4.08" && lib.versionOlder yojson.version "2.0";

  doCheck = true;



  preCheck = ''

    # some run.t files check the content of patchShebangs-ed scripts, so patch
@@ -63,6 +61,6 @@ buildDunePackage rec { 
    license = lib.licenses.isc;

    maintainers = [ lib.maintainers.vbgl ];

    homepage = "https://github.com/ocaml/odoc";

    changelog = "https://github.com/ocaml/odoc/blob/${version}/CHANGES.md";

    changelog = "https://github.com/ocaml/odoc/blob/${odoc-parser.version}/CHANGES.md";

  };

}