Merge branch 'master' into 'experimental_rel'

create new experimental release

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

packages/hxtorch/package.py

@@ -33,7 +33,7 @@ class Hxtorch(WafPackage):
     depends_on('liblockfile', type=('build', 'link', 'run'))
     depends_on('llvm', type=('build', 'link', 'run'))
     depends_on('log4cxx', type=('build', 'link', 'run'))
-    depends_on('pkg-config', type=('build', 'link', 'run'))
+    depends_on('pkgconfig', type=('build', 'link', 'run'))
     depends_on('python@3.7.0:', type=('build', 'link', 'run')) # BrainScaleS(-2, type=('build', 'link', 'run')) only supports Python >= 3.7
     depends_on('py-h5py', type=('build', 'link', 'run')) # PyNN tests need it
     depends_on('py-matplotlib', type=('build', 'link', 'run'))

packages/pynn-brainscales/package.py

@@ -31,7 +31,7 @@ class PynnBrainscales(WafPackage):
     depends_on('liblockfile', type=('build', 'link', 'run'))
     depends_on('llvm', type=('build', 'link', 'run'))
     depends_on('log4cxx', type=('build', 'link', 'run'))
-    depends_on('pkg-config', type=('build', 'link', 'run'))
+    depends_on('pkgconfig', type=('build', 'link', 'run'))
     depends_on('python@3.7.0:', type=('build', 'link', 'run')) # BrainScaleS(-2, type=('build', 'link', 'run')) only supports Python >= 3.7
     depends_on('py-h5py', type=('build', 'link', 'run')) # PyNN tests need it
     depends_on('py-matplotlib', type=('build', 'link', 'run'))