Unverified Commit ba915ac3 authored by Ulrik Strid's avatar Ulrik Strid Committed by GitHub
Browse files

Merge pull request #325736 from vbgl/ocaml-phylogenetics-0.3.0 

ocamlPackages.phylogenetics: 0.2.0 → 0.3.0
parents aa820833 94366fe3

pkgs/development/ocaml-modules/phylogenetics/default.nix

+2 −6
Original line number Diff line number Diff line 
{ 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 = ''

pkgs/top-level/ocaml-packages.nix

+1 −8
Original line number Diff line number Diff line
@@ -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 { };