diff --git a/pkgs/development/ocaml-modules/phylogenetics/default.nix b/pkgs/development/ocaml-modules/phylogenetics/default.nix index 76856024c09a..dd99947db1f5 100644 --- a/pkgs/development/ocaml-modules/phylogenetics/default.nix +++ b/pkgs/development/ocaml-modules/phylogenetics/default.nix @@ -1,7 +1,6 @@ { lib , buildDunePackage , fetchurl -, ppx_deriving , bppsuite , alcotest , angstrom-unix @@ -12,16 +11,15 @@ , menhir , menhirLib , printbox-text -, yojson }: buildDunePackage rec { pname = "phylogenetics"; - version = "0.2.0"; + version = "0.3.0"; src = fetchurl { url = "https://github.com/biocaml/phylogenetics/releases/download/v${version}/phylogenetics-${version}.tbz"; - hash = "sha256-JFpYp3pyW7PrBjqCwwDZxkJPA84dp6Qs8rOPvHPY92o="; + hash = "sha256-3oZ9fMAXqOQ02rQ+8W8PZJWXOJLNe2qERrGOeTk3BKg="; }; minimalOCamlVersion = "4.08"; @@ -36,9 +34,7 @@ buildDunePackage rec { gsl lacaml menhirLib - ppx_deriving printbox-text - yojson ]; checkPhase = '' diff --git a/pkgs/top-level/ocaml-packages.nix b/pkgs/top-level/ocaml-packages.nix index f3bf787003c1..d516da1b12e0 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -840,13 +840,6 @@ let cfstream = self.cfstream.override { inherit core_kernel; }; }; - phylogenetics = let - angstrom = self.angstrom.override { inherit ppx_let; }; - in callPackage ../development/ocaml-modules/phylogenetics { - ppx_deriving = self.ppx_deriving.override { inherit (jsDeps) ppxlib; }; - angstrom-unix = self.angstrom-unix.override { inherit angstrom; }; - }; - ppx_bap = callPackage ../development/ocaml-modules/ppx_bap { }; })).overrideScope liftJaneStreet; @@ -1457,7 +1450,7 @@ let pgsolver = callPackage ../development/ocaml-modules/pgsolver { }; - phylogenetics = janeStreet_0_15.phylogenetics; + phylogenetics = callPackage ../development/ocaml-modules/phylogenetics { }; piaf = callPackage ../development/ocaml-modules/piaf { };