From fe7678ca819933bc2ac28dccf0c0e9aef04de21c Mon Sep 17 00:00:00 2001 From: Felix Buehler Date: Tue, 22 Feb 2022 20:18:51 +0100 Subject: [PATCH] raxml-mpi: remove appendToName to have a consistent package name for repology --- pkgs/applications/science/biology/raxml/default.nix | 4 ++-- pkgs/top-level/all-packages.nix | 4 +--- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/pkgs/applications/science/biology/raxml/default.nix b/pkgs/applications/science/biology/raxml/default.nix index 6e747e318f57..d02d47266297 100644 --- a/pkgs/applications/science/biology/raxml/default.nix +++ b/pkgs/applications/science/biology/raxml/default.nix @@ -5,12 +5,12 @@ }: stdenv.mkDerivation rec { - pname = "RAxML"; + pname = "RAxML${lib.optionalString useMpi "-mpi"}"; version = "8.2.12"; src = fetchFromGitHub { owner = "stamatak"; - repo = "standard-${pname}"; + repo = "standard-RAxML"; rev = "v${version}"; sha256 = "1jqjzhch0rips0vp04prvb8vmc20c5pdmsqn8knadcf91yy859fh"; }; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 788874a79658..86775d35489e 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -32020,9 +32020,7 @@ with pkgs; raxml = callPackage ../applications/science/biology/raxml { }; - raxml-mpi = appendToName "mpi" (raxml.override { - useMpi = true; - }); + raxml-mpi = raxml.override { useMpi = true; }; sambamba = callPackage ../applications/science/biology/sambamba { };