From b377e019cacb877c7e1f34714a7dc98064e08d04 Mon Sep 17 00:00:00 2001 From: Vincent Laporte Date: Tue, 23 Apr 2024 08:50:17 +0200 Subject: ocamlPackages.phylogenetics: unstable-2022-05-06 → 0.2.0 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ocaml-modules/phylogenetics/default.nix | 22 +++++++++------------- pkgs/top-level/ocaml-packages.nix | 1 - 2 files changed, 9 insertions(+), 14 deletions(-) diff --git a/pkgs/development/ocaml-modules/phylogenetics/default.nix b/pkgs/development/ocaml-modules/phylogenetics/default.nix index 7c4f90b6f976d..76856024c09a6 100644 --- a/pkgs/development/ocaml-modules/phylogenetics/default.nix +++ b/pkgs/development/ocaml-modules/phylogenetics/default.nix @@ -1,32 +1,27 @@ { lib -, ocaml , buildDunePackage -, fetchFromGitHub +, fetchurl , ppx_deriving , bppsuite , alcotest , angstrom-unix -, biocaml +, biotk , core , gsl , lacaml , menhir , menhirLib , printbox-text +, yojson }: -lib.throwIf (lib.versionAtLeast ocaml.version "5.0") - "phylogenetics is not compatible with OCaml ${ocaml.version}" - buildDunePackage rec { pname = "phylogenetics"; - version = "unstable-2022-05-06"; + version = "0.2.0"; - src = fetchFromGitHub { - owner = "biocaml"; - repo = pname; - rev = "cd7c624d0f98e31b02933ca4511b9809b26d35b5"; - sha256 = "sha256:0w0xyah3hj05hxg1rsa40hhma3dm1cyq0zvnjrihhf22laxap7ga"; + src = fetchurl { + url = "https://github.com/biocaml/phylogenetics/releases/download/v${version}/phylogenetics-${version}.tbz"; + hash = "sha256-JFpYp3pyW7PrBjqCwwDZxkJPA84dp6Qs8rOPvHPY92o="; }; minimalOCamlVersion = "4.08"; @@ -36,13 +31,14 @@ buildDunePackage rec { nativeBuildInputs = [ menhir ]; propagatedBuildInputs = [ angstrom-unix - biocaml + biotk core 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 de27e8d83d8bd..932ff6505b782 100644 --- a/pkgs/top-level/ocaml-packages.nix +++ b/pkgs/top-level/ocaml-packages.nix @@ -835,7 +835,6 @@ let phylogenetics = let angstrom = self.angstrom.override { inherit ppx_let; }; in callPackage ../development/ocaml-modules/phylogenetics { - inherit biocaml; ppx_deriving = self.ppx_deriving.override { inherit (jsDeps) ppxlib; }; angstrom-unix = self.angstrom-unix.override { inherit angstrom; }; }; -- cgit 1.4.1