Merge branch 'develop' into version-update-bluepyemodelnexus

BlueBrain · Nov 27, 2023 · 10bac7e · 10bac7e
2 parents 0586026 + 084a912
commit 10bac7e
Show file tree

Hide file tree

Showing 5 changed files with 4 additions and 7 deletions.
diff --git a/bluebrain/deployment/environments/applications_viz.yaml b/bluebrain/deployment/environments/applications_viz.yaml
@@ -14,6 +14,7 @@ spack:
     - brayns
     - [email protected]
     - py-bcsb
+    - [email protected]
     - py-brayns
     - [email protected]
     - brion +python

diff --git a/bluebrain/documentation/installing_with_environments.md b/bluebrain/documentation/installing_with_environments.md
@@ -15,11 +15,6 @@ and then activating it:
 
     $ spack env activate -d spamhameggs
 
-After the first activation, finish the configuration by explicitly stating that all
-software should be considered together:
-
-    $ spack config add concretizer:unify:true
-
 This will make sure that every package is only built once, in the specified
 version.
 

diff --git a/bluebrain/repo-bluebrain/packages/neurodamus-model/package.py b/bluebrain/repo-bluebrain/packages/neurodamus-model/package.py
@@ -254,8 +254,7 @@ def setup_run_environment(self, env):
     shift
 fi
 NRNIVMODL_EXTRA_INCLUDE_FLAGS="$1"
-shift
-NRNIVMODL_EXTRA_LOAD_FLAGS="$1"
+NRNIVMODL_EXTRA_LOAD_FLAGS="$2"
 
 if [ -n "{nrnivmodlcore_call}" ] && [ "$COMPILE_ONLY_NEURON" -eq "0" ]; then
     rm -rf _core_mods

diff --git a/bluebrain/repo-bluebrain/packages/py-bcsb/package.py b/bluebrain/repo-bluebrain/packages/py-bcsb/package.py
@@ -13,6 +13,7 @@ class PyBcsb(PythonPackage):
     git = "ssh://[email protected]/viz/brayns/braynscircuitstudiobackend.git"
 
     version("develop", branch="develop")
+    version("2.1.2", tag="v2.1.2")
     version("2.1.1", tag="v2.1.1")
 
     depends_on("[email protected]:", type=("build", "run"))

diff --git a/bluebrain/repo-patches/packages/neuron/package.py b/bluebrain/repo-patches/packages/neuron/package.py
@@ -32,6 +32,7 @@ class Neuron(CMakePackage):
     patch("patch-v800-cmake-nvhpc.patch", when="@8.0.0%nvhpc^[email protected]:")
 
     version("develop", branch="master")
+    version("9.0.a14", commit="bd9426d9")
     version("9.0.a13", commit="3bbdd8da")
     version("9.0.a12", commit="6004512f")
     version("9.0.a11", commit="b38dd11b")