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

Merge pull request #230809 from vbgl/ocaml-ocp-indent-dune3 

ocamlPackages.ocp-indent: fix for Dune 3
parents cb48c358 757ec67f

pkgs/development/tools/ocaml/ocaml-top/default.nix

+2 −0
Original line number Diff line number Diff line
@@ -4,6 +4,8 @@ with ocamlPackages; buildDunePackage rec { 
  pname = "ocaml-top";

  version = "1.2.0";



  duneVersion = "3";



  src = fetchFromGitHub {

    owner = "OCamlPro";

    repo = "ocaml-top";

pkgs/development/tools/ocaml/ocp-indent/default.nix

+4 −3
Original line number Diff line number Diff line 
{ lib, fetchFromGitHub, buildDunePackage, cmdliner }:

{ lib, fetchFromGitHub, buildDunePackage, cmdliner, findlib }:



buildDunePackage rec {

  version = "1.8.2";

  pname = "ocp-indent";



  useDune2 = true;

  duneVersion = "3";



  src = fetchFromGitHub {

    owner = "OCamlPro";
@@ -13,9 +13,10 @@ buildDunePackage rec { 
    sha256 = "sha256-IyvURw/6R0eKrnahV1fqLV0iIeypykrmxDbliECgbLc=";

  };



  minimumOCamlVersion = "4.02";

  minimalOCamlVersion = "4.03";



  buildInputs = [ cmdliner ];

  propagatedBuildInputs = [ findlib ];



  meta = with lib; {

    homepage = "https://www.typerex.org/ocp-indent.html";

pkgs/development/tools/ocaml/ocp-index/default.nix

+2 −0
Original line number Diff line number Diff line
@@ -4,6 +4,8 @@ buildDunePackage rec { 
  pname = "ocp-index";

  version = "1.3.4";



  duneVersion = "3";



  minimalOCamlVersion = "4.08";



  src = fetchFromGitHub {