From 1330ca311c0f1737e06f0bcbaab68c3fa07b65e4 Mon Sep 17 00:00:00 2001 From: Mario Rodas Date: Sat, 1 Oct 2022 04:20:00 +0000 Subject: [PATCH] ocamlPackages.ocp-index: 1.3.3 -> 1.3.4 --- pkgs/development/tools/ocaml/ocaml-top/default.nix | 7 +++++-- pkgs/development/tools/ocaml/ocp-index/default.nix | 6 +++--- 2 files changed, 8 insertions(+), 5 deletions(-) diff --git a/pkgs/development/tools/ocaml/ocaml-top/default.nix b/pkgs/development/tools/ocaml/ocaml-top/default.nix index 92ad6aa452ea..f5853057d8e0 100644 --- a/pkgs/development/tools/ocaml/ocaml-top/default.nix +++ b/pkgs/development/tools/ocaml/ocaml-top/default.nix @@ -4,8 +4,6 @@ with ocamlPackages; buildDunePackage rec { pname = "ocaml-top"; version = "1.2.0-rc"; - useDune2 = true; - src = fetchFromGitHub { owner = "OCamlPro"; repo = "ocaml-top"; @@ -20,6 +18,11 @@ with ocamlPackages; buildDunePackage rec { ocp-build -init ''; + postPatch = '' + substituteInPlace src/completion.ml \ + --replace 'LibIndex.load ' 'LibIndex.load ~qualify:false ' + ''; + meta = { homepage = "https://www.typerex.org/ocaml-top.html"; license = lib.licenses.gpl3; diff --git a/pkgs/development/tools/ocaml/ocp-index/default.nix b/pkgs/development/tools/ocaml/ocp-index/default.nix index b055ccbde5dc..6c315960f985 100644 --- a/pkgs/development/tools/ocaml/ocp-index/default.nix +++ b/pkgs/development/tools/ocaml/ocp-index/default.nix @@ -2,15 +2,15 @@ buildDunePackage rec { pname = "ocp-index"; - version = "1.3.3"; + version = "1.3.4"; - useDune2 = true; + minimalOCamlVersion = "4.08"; src = fetchFromGitHub { owner = "OCamlPro"; repo = "ocp-index"; rev = version; - sha256 = "sha256-ElCXjUR85tkyBLIpIKefDouE1upzJytQnk4xoQt/cb0="; + sha256 = "sha256-a7SBGHNKUstfrdHx9KI33tYpvzTwIGhs4Hfie5EeKww="; }; strictDeps = true;