Unverified Commit e7d6e5b7 authored by Weijia Wang's avatar Weijia Wang Committed by GitHub
Browse files

Merge pull request #231129 from vbgl/ocaml-prepare-dune-3 

ocamlPackages: prepare for Dune 3
parents feb15ba6 0da20416

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

+1 −2
Original line number Diff line number Diff line
@@ -13,8 +13,7 @@ buildDunePackage rec { 
    sha256 = "sha256-9XTb0ozQ/DorlVJcS7ld320fZAi7T+EhV/pTeIT5h/0=";

  };



  # dune 3 is required for tests to pass

  duneVersion = if doCheck then "3" else "2";

  duneVersion = "3";



  nativeBuildInputs = [ cppo ];

  buildInputs = [ astring cmdliner fpath result tyxml odoc-parser fmt ];

pkgs/development/tools/ocaml/cppo/default.nix

+1 −1
Original line number Diff line number Diff line
@@ -23,7 +23,7 @@ buildDunePackage rec { 
  inherit pname;

  version = "1.6.9";



  useDune2 = true;

  duneVersion = "3";



  src = fetchFromGitHub {

    owner = "ocaml-community";

pkgs/development/tools/ocaml/cppo/ocamlbuild.nix

+5 −2
Original line number Diff line number Diff line
@@ -4,10 +4,13 @@ if lib.versionOlder (lib.getVersion cppo) "1.6" 
then cppo

else



buildDunePackage rec {

buildDunePackage {

  pname = "cppo_ocamlbuild";



  inherit (cppo) version useDune2 src;

  inherit (cppo) version src;



  minimalOCamlVersion = "4.03";

  duneVersion = "3";



  propagatedBuildInputs = [ ocamlbuild ];

pkgs/development/tools/ocaml/merlin/dot-merlin-reader.nix

+6 −3
Original line number Diff line number Diff line 
{ lib, fetchurl, yojson, csexp, buildDunePackage, merlin-lib, merlin }:

{ lib, fetchurl, yojson, csexp, findlib, buildDunePackage, merlin-lib, merlin }:



buildDunePackage rec {

  pname = "dot-merlin-reader";



  duneVersion = "3";



  inherit (merlin) version src;



  minimalOCamlVersion = "4.06";



  buildInputs = if lib.versionAtLeast version "4.7-414"

  buildInputs = [ findlib ]

  ++ (if lib.versionAtLeast version "4.7-414"

  then [ merlin-lib ]

  else [ yojson csexp ];

  else [ yojson csexp ]);



  meta = with lib; {

    description = "Reads config files for merlin";