Merge branch 'fix_BSS2_JUSUF' into 'master'

fix(BSS2): build on JUSUF

See merge request technical-coordination/project-internal/devops/platform/ebrains-spack-builds!481

packages/hxtorch/package.py

@@ -16,11 +16,13 @@ class Hxtorch(WafPackage):
 
     maintainers = ['emuller']
 
+    version('7.0-rc1-fixup2', branch='waf')
     version('7.0-rc1-fixup1', branch='waf')
 
     # compiler for the BrainScaleS-2 embedded processor ("PPU"); needed for
     # building/linking, at runtime and for testing
-    depends_on('oppulance@7.0-rc1-fixup1', type=('build', 'link', 'run', 'test'))
+    depends_on('oppulance@7.0-rc1-fixup2', when='@7.0-rc1-fixup2', type=('build', 'link', 'run', 'test'))
+    depends_on('oppulance@7.0-rc1-fixup1', when='@7.0-rc1-fixup1', type=('build', 'link', 'run', 'test'))
 
     # host software dependencies
     depends_on('bitsery', type=('build', 'link', 'run', 'test'))

packages/oppulance/package.py

@@ -21,6 +21,10 @@ class Oppulance(Package):
     depends_on('gmp')
 
     releases = [
+        {
+            'version': '7.0-rc1-fixup2',
+            'tag': 'ebrains-7.0-rc1-fixup2'
+        },
         {
             'version': '7.0-rc1-fixup1',
             'tag': 'ebrains-7.0-rc1-fixup1'

packages/pynn-brainscales/package.py

@@ -16,11 +16,13 @@ class PynnBrainscales(WafPackage):
 
     maintainers = ['emuller']
     
+    version('7.0-rc1-fixup2', branch='waf')
     version('7.0-rc1-fixup1', branch='waf')
 
     # compiler for the BrainScaleS-2 embedded processor ("PPU"); needed for
     # building/linking, at runtime and for testing
-    depends_on('oppulance@7.0-rc1-fixup1', type=('build', 'link', 'run', 'test'))
+    depends_on('oppulance@7.0-rc1-fixup2', when='@7.0-rc1-fixup2', type=('build', 'link', 'run', 'test'))
+    depends_on('oppulance@7.0-rc1-fixup1', when='@7.0-rc1-fixup1', type=('build', 'link', 'run', 'test'))
 
     # host software dependencies
     depends_on('bitsery', type=('build', 'link', 'run', 'test'))

spack.yaml

@@ -12,7 +12,7 @@ spack:
     - biobb-model@4.0.0
     - biobb-structure-checking@3.12.1
     - biobb-structure-utils@4.0.0
-    - hxtorch@7.0-rc1-fixup1
+    - hxtorch@7.0-rc1-fixup2
     - nest@3.6 +sonata
     - neuron@8.2.3 +mpi
     - py-bluepyefe@2.2.18
@@ -52,7 +52,7 @@ spack:
     - py-tvb-multiscale@2.1.0.ebrains
     - py-tvb-storage@2.8.1
     - py-viziphant@0.4.0
-    - pynn-brainscales@7.0-rc1-fixup1
+    - pynn-brainscales@7.0-rc1-fixup2
     - r-rgsl@0.1.1
     - r-sbtabvfgen@0.1
     - r-uqsa@2.2