diff --git a/pkgs/development/ocaml-modules/landmarks-ppx/default.nix b/pkgs/development/ocaml-modules/landmarks-ppx/default.nix index dedaee7e9c5c..06923412f2f0 100644 --- a/pkgs/development/ocaml-modules/landmarks-ppx/default.nix +++ b/pkgs/development/ocaml-modules/landmarks-ppx/default.nix @@ -1,8 +1,5 @@ { - lib, buildDunePackage, - fetchpatch, - ocaml, landmarks, ppxlib, }: @@ -10,17 +7,14 @@ buildDunePackage { pname = "landmarks-ppx"; - inherit (landmarks) src version; + minimalOCamlVersion = "5.3"; - patches = lib.optional (lib.versionAtLeast ppxlib.version "0.36") (fetchpatch { - url = "https://github.com/LexiFi/landmarks/commit/367c229e3275a83f81343ba116374bb68abc9d83.patch"; - hash = "sha256-Qxue+++sNV6EHJGX1mbIeY2E2D5NuFpmIIBkTyvGvo8="; - }); + inherit (landmarks) src version; buildInputs = [ ppxlib ]; propagatedBuildInputs = [ landmarks ]; - doCheck = lib.versionAtLeast ocaml.version "5.1"; + doCheck = true; meta = landmarks.meta // { description = "Preprocessor instrumenting code using the landmarks library"; diff --git a/pkgs/development/ocaml-modules/landmarks/default.nix b/pkgs/development/ocaml-modules/landmarks/default.nix index 757417c82f23..09600d6178c7 100644 --- a/pkgs/development/ocaml-modules/landmarks/default.nix +++ b/pkgs/development/ocaml-modules/landmarks/default.nix @@ -2,25 +2,23 @@ lib, fetchFromGitHub, buildDunePackage, - ocaml, }: buildDunePackage (finalAttrs: { pname = "landmarks"; - version = "1.5"; - minimalOCamlVersion = "4.08"; + version = "1.7"; src = fetchFromGitHub { owner = "LexiFi"; repo = "landmarks"; tag = "v${finalAttrs.version}"; - hash = "sha256-eIq02D19OzDOrMDHE1Ecrgk+T6s9vj2X6B2HY+z+K8Q="; + hash = "sha256-9o9jf0M3zKc+Xojs4dqPRctYswSYqIo0jeOvkfdLfZ4="; }; - doCheck = lib.versionAtLeast ocaml.version "4.08" && lib.versionOlder ocaml.version "5.0"; + doCheck = true; meta = { - inherit (finalAttrs.src.meta) homepage; + homepage = "https://github.com/LexiFi/landmarks"; description = "Simple Profiling Library for OCaml"; longDescription = '' Landmarks is a simple profiling library for OCaml. It provides