From cb16c505719450d51cb347f73e4d273be4380cb0 Mon Sep 17 00:00:00 2001 From: "R. Ryantm" Date: Sun, 2 Jul 2023 15:55:36 +0000 Subject: [PATCH 1/2] veryfasttree: 3.1.1 -> 4.0 --- pkgs/applications/science/biology/veryfasttree/default.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/pkgs/applications/science/biology/veryfasttree/default.nix b/pkgs/applications/science/biology/veryfasttree/default.nix index f85f93055289..821fbde9eb83 100644 --- a/pkgs/applications/science/biology/veryfasttree/default.nix +++ b/pkgs/applications/science/biology/veryfasttree/default.nix @@ -2,13 +2,13 @@ stdenv.mkDerivation rec { pname = "veryfasttree"; - version = "3.1.1"; + version = "4.0"; src = fetchFromGitHub { owner = "citiususc"; repo = pname; rev = "v${version}"; - hash = "sha256-AOzbxUnrn1qgscjdOKf4dordnSKtIg3nSVaYWK1jbuc="; + hash = "sha256-ue3/2UTIQA6av+66xvGApLi9x0kM5vAmGHHTrboOaeQ="; }; nativeBuildInputs = [ cmake ]; From 82d4f6b43ddc9868a6f512d8cf71bf144dd0e11c Mon Sep 17 00:00:00 2001 From: Weijia Wang <9713184+wegank@users.noreply.github.com> Date: Mon, 3 Jul 2023 12:29:44 +0300 Subject: [PATCH 2/2] veryfasttree: fix build on darwin --- pkgs/applications/science/biology/veryfasttree/default.nix | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/pkgs/applications/science/biology/veryfasttree/default.nix b/pkgs/applications/science/biology/veryfasttree/default.nix index 821fbde9eb83..a5d54edce524 100644 --- a/pkgs/applications/science/biology/veryfasttree/default.nix +++ b/pkgs/applications/science/biology/veryfasttree/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, cmake }: +{ lib, stdenv, fetchFromGitHub, cmake, llvmPackages}: stdenv.mkDerivation rec { pname = "veryfasttree"; @@ -12,6 +12,7 @@ stdenv.mkDerivation rec { }; nativeBuildInputs = [ cmake ]; + buildInputs = lib.optional stdenv.cc.isClang llvmPackages.openmp; installPhase = '' install -m755 -D VeryFastTree $out/bin/VeryFastTree @@ -22,5 +23,6 @@ stdenv.mkDerivation rec { license = licenses.gpl3Plus; homepage = "https://github.com/citiususc/veryfasttree"; maintainers = with maintainers; [ thyol ]; + platforms = platforms.all; }; }