From 65e1d7d935d519a6826da98a57249021a23bab94 Mon Sep 17 00:00:00 2001
From: Lorenz Thielbeer <thielblz@rh04359.villa-bosch.de>
Date: Thu, 5 May 2022 10:50:35 +0200
Subject: [PATCH] updated spack.yaml
---
packages/sda/package.py | 4 ----
spack.yaml | 2 +-
2 files changed, 1 insertion(+), 5 deletions(-)
diff --git a/packages/sda/package.py b/packages/sda/package.py
index f098a4d3..3bb82653 100644
--- a/packages/sda/package.py
+++ b/packages/sda/package.py
@@ -45,10 +45,6 @@ class Sda(MakefilePackage):
@property
def install_targets(self):
-<<<<<<< HEAD
build_directory = 'sda_flex-7.3.3d/src/'
-=======
- build_directory = 'sda_flex-7.3.3c/src/'
->>>>>>> 0297e2477c83d95fca5463162fdda75addf16a62
targets = ['init libsda sda_flex tools auxi clust test_module']
return ['prefix={0}'.format(self.prefix), 'install']
diff --git a/spack.yaml b/spack.yaml
index af23ac79..71705181 100644
--- a/spack.yaml
+++ b/spack.yaml
@@ -21,7 +21,7 @@ spack:
# EBRAINS simulators
- apbs %gcc@10.3.0
- py-pdb2pqr %gcc@10.3.0
- - sda@7.3.3c %gcc@9.4.0
+ - sda %gcc@10.3.0
- nest@3.2 +python +gsl +mpi %gcc@10.3.0
- arbor +python +mpi ^python@3:3.9 %gcc@10.3.0
- neuron +mpi %gcc@10.3.0
--
GitLab