From 8bf17d903dfc2386bfba8a2b86c23a350a8af473 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Mon, 8 Jan 2024 15:10:27 +0100 Subject: [PATCH] =?UTF-8?q?ocamlPackages.trace:=200.3=20=E2=86=92=200.5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- pkgs/development/ocaml-modules/trace/default.nix | 6 +++--- pkgs/development/ocaml-modules/trace/tef.nix | 9 +++++++++ 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/pkgs/development/ocaml-modules/trace/default.nix b/pkgs/development/ocaml-modules/trace/default.nix index a27a61d4baf1..2c7356669860 100644 --- a/pkgs/development/ocaml-modules/trace/default.nix +++ b/pkgs/development/ocaml-modules/trace/default.nix @@ -2,13 +2,13 @@ buildDunePackage rec { pname = "trace"; - version = "0.3"; + version = "0.5"; minimalOCamlVersion = "4.07"; src = fetchurl { - url = "https://github.com/c-cube/ocaml-trace/releases/download/${version}/trace-${version}.tbz"; - hash = "sha256-Krq6qYO7tKJktTRjFrdmONPHfjrd81Ighsb9nmG9ZQU="; + url = "https://github.com/c-cube/ocaml-trace/releases/download/v${version}/trace-${version}.tbz"; + hash = "sha256-l0NvWPGBd1WR+b50WXEYfptuCUjda8MlZ/o5YngRNIg="; }; meta = { diff --git a/pkgs/development/ocaml-modules/trace/tef.nix b/pkgs/development/ocaml-modules/trace/tef.nix index c1a6f9251554..eeeda78f580d 100644 --- a/pkgs/development/ocaml-modules/trace/tef.nix +++ b/pkgs/development/ocaml-modules/trace/tef.nix @@ -4,6 +4,15 @@ buildDunePackage { pname = "trace-tef"; inherit (trace) src version; + # This removes the dependency on the “atomic” package + # (not available in nixpkgs) + # Said package for OCaml ≥ 4.12 is empty + postPatch = '' + substituteInPlace src/tef/dune --replace 'atomic ' "" + ''; + + minimalOCamlVersion = "4.12"; + propagatedBuildInputs = [ mtime trace ]; doCheck = true;