diff --git a/pkgs/development/ocaml-modules/magic-trace/default.nix b/pkgs/development/ocaml-modules/magic-trace/default.nix index 39bdca1119a4..8fdd92f81329 100644 --- a/pkgs/development/ocaml-modules/magic-trace/default.nix +++ b/pkgs/development/ocaml-modules/magic-trace/default.nix @@ -1,21 +1,49 @@ -{ lib, fetchFromGitHub, buildDunePackage, async, cohttp_static_handler ? null -, core_unix ? null, owee, ppx_jane, shell ? null }: +{ lib +, fetchFromGitHub +, buildDunePackage +, ocaml-crunch +, angstrom +, async +, cohttp +, cohttp_static_handler ? null +, core +, core_unix ? null +, fzf +, owee +, ppx_jane +, re +, shell ? null +}: buildDunePackage rec { pname = "magic-trace"; - version = "1.1.0"; + version = "1.2.1"; minimalOCamlVersion = "4.12"; - duneVersion = "3"; src = fetchFromGitHub { owner = "janestreet"; repo = "magic-trace"; rev = "v${version}"; - sha256 = "sha256-615AOkrbQI6vRosA5Kz3Epipe9f9+Gs9+g3bVl5gzBY="; + hash = "sha256-/9TDjCG/06mhGyqbjAdUmk6fcaq9fNDqVSw51w5EEy4="; }; - buildInputs = [ async cohttp_static_handler core_unix owee ppx_jane shell ]; + nativeBuildInputs = [ + ocaml-crunch + ]; + buildInputs = [ + angstrom + async + cohttp + cohttp_static_handler + core + core_unix + fzf + owee + ppx_jane + re + shell + ]; meta = with lib; { description = diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index f9f1bc765850..354e3a4e6d64 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -824,8 +824,6 @@ let cfstream = self.cfstream.override { inherit core_kernel; }; }; - magic-trace = callPackage ../development/ocaml-modules/magic-trace { }; - phylogenetics = let angstrom = self.angstrom.override { inherit ppx_let; }; in callPackage ../development/ocaml-modules/phylogenetics { @@ -1022,7 +1020,7 @@ let magic-mime = callPackage ../development/ocaml-modules/magic-mime { }; - magic-trace = janeStreet_0_15.magic-trace; + magic-trace = callPackage ../development/ocaml-modules/magic-trace { }; mariadb = callPackage ../development/ocaml-modules/mariadb { inherit (pkgs) mariadb;