hh-suite: switch from openmp to llvmPackages.openmp and modernize derivation

This updates hh-suite to use llvmPackages.openmp instead of requiring
openmp to be passed at the call site. The callPackage override in
all-packages.nix is removed accordingly.

Additional cleanups:
- migrate fetchFromGitHub to `tag` + `hash`
- enable strictDeps and __structuredAttrs
- adopt finalAttrs form for mkDerivation
This commit is contained in:
Guy Chronister
2026-07-09 15:16:46 -05:00
parent 192b1948fb
commit c3038ff45d
2 changed files with 9 additions and 8 deletions
@@ -7,19 +7,22 @@
xxd,
enableMpi ? false,
mpi,
openmp,
llvmPackages,
}:
stdenv.mkDerivation rec {
stdenv.mkDerivation (finalAttrs: {
pname = "hh-suite";
version = "3.3.0";
src = fetchFromGitHub {
owner = "soedinglab";
repo = "hh-suite";
rev = "v${version}";
tag = "v${finalAttrs.version}";
hash = "sha256-kjNqJddioCZoh/cZL3YNplweIGopWIGzCYQOnKDqZmw=";
};
strictDeps = true;
__structuredAttrs = true;
patches = [
# Should be removable as soon as this upstream PR is merged: https://github.com/soedinglab/hh-suite/pull/357
(fetchpatch {
@@ -39,7 +42,7 @@ stdenv.mkDerivation rec {
++ lib.optional stdenv.hostPlatform.avx2Support "-DHAVE_AVX2=1"
++ lib.optional stdenv.hostPlatform.sse4_1Support "-DHAVE_SSE4_1=1";
buildInputs = lib.optional stdenv.cc.isClang openmp ++ lib.optional enableMpi mpi;
buildInputs = lib.optional stdenv.cc.isClang llvmPackages.openmp ++ lib.optional enableMpi mpi;
postPatch = ''
substituteInPlace CMakeLists.txt \
@@ -55,4 +58,4 @@ stdenv.mkDerivation rec {
maintainers = with lib.maintainers; [ natsukium ];
platforms = lib.platforms.unix;
};
}
})
+1 -3
View File
@@ -10322,9 +10322,7 @@ with pkgs;
deep-translator = with python3Packages; toPythonApplication deep-translator;
hh-suite = callPackage ../applications/science/biology/hh-suite {
inherit (llvmPackages) openmp;
};
hh-suite = callPackage ../applications/science/biology/hh-suite { };
nest-mpi = nest.override { withMpi = true; };