From 5e3ebeb8dd7651b0f0650b442202c3814d856d59 Mon Sep 17 00:00:00 2001 From: Germann Elsa Sylvia Date: Tue, 4 Oct 2022 15:44:02 +0200 Subject: [PATCH] FIX: typo --- env/merlin/all/spack.yaml | 2 +- env/merlin/all/sysconfigs/packages.yaml | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/env/merlin/all/spack.yaml b/env/merlin/all/spack.yaml index a55887f..5fff76d 100644 --- a/env/merlin/all/spack.yaml +++ b/env/merlin/all/spack.yaml @@ -571,7 +571,7 @@ spack: - matrix: - [relion +cuda cuda_arch=61] - ['%pgi'] - - [^ctffing%gcc] + - [^ctffind%gcc] - [^openmpi%pgi] - [^openblas] - [^llvm%gcc@8.3.0] diff --git a/env/merlin/all/sysconfigs/packages.yaml b/env/merlin/all/sysconfigs/packages.yaml index 236842c..f92056e 100644 --- a/env/merlin/all/sysconfigs/packages.yaml +++ b/env/merlin/all/sysconfigs/packages.yaml @@ -124,6 +124,11 @@ packages: externals: - prefix: /usr spec: libcroco@0.6.13 + libepoxy: + buildable: false + externals: + - prefix: /usr + spec: libepoxy@0.0.0 libevent: buildable: false externals: @@ -164,6 +169,11 @@ packages: externals: - prefix: /usr spec: libreadline@6.2 + librsvg: + buildable: false + externals: + - prefix: /usr + spec: librsvg@2.40.20 libtiff: buildable: false externals: