Merge branch 'alisw:master' into master

Author: mbroz84

focal.sh

@@ -1,6 +1,6 @@
 package: FOCAL
 version: "%(commit_hash)s"
-tag: v1.20
+tag: v1.22
 requires:
   - AliRoot
 license: GPL-3.0

geant4.sh

@@ -1,6 +1,6 @@
 package: GEANT4
 version: "%(tag_basename)s"
-tag: "v11.2.0-alice1"
+tag: "v11.2.0-alice2"
 source: https://github.com/alisw/geant4.git
 # source: https://gitlab.cern.ch/geant4/geant4.git
 requires:

geant4_vmc.sh

@@ -1,6 +1,6 @@
 package: GEANT4_VMC
 version: "%(tag_basename)s"
-tag: "v6-6-update1-p3"
+tag: "v6-6-update2-p3"
 source: https://github.com/vmc-project/geant4_vmc
 requires:
   - ROOT

ndmspc.sh

@@ -1,20 +1,21 @@
 package: ndmspc
 version: "%(tag_basename)s"
-tag: "v1.1.1"
+tag: "v1.2.0"
 requires:
   - ROOT
   - JAliEn-ROOT
   - nlohmann_json
   - libwebsockets
   - curl
   - libuv
+  - ZeroMQ
 #  - arrow
-license: GPL-3.0
 build_requires:
   - CMake
   - ninja
   - alibuild-recipe-tools
   - "OpenSSL:(?!osx)"
+license: GPL-3.0
 source: https://gitlab.com/ndmspc/ndmspc.git
 incremental_recipe: |
   [[ $ALIBUILD_NDMSPC_TESTS ]] && CXXFLAGS="${CXXFLAGS} -Werror -Wno-error=deprecated-declarations"
@@ -61,6 +62,11 @@ MODULEFILE="etc/modulefiles/$PKGNAME"
 alibuild-generate-module --bin --lib > "$MODULEFILE"
 cat >> "$MODULEFILE" <<EoF
 # Our environment
+setenv NDMSPC_RELEASE \$version
+setenv NDMSPC_BASEDIR \$::env(BASEDIR)/$PKGNAME
+setenv NDMSPC_DIR \$::env(NDMSPC_BASEDIR)/\$::env(NDMSPC_RELEASE)
+setenv NDMSPC_MACRO_DIR \$::env(NDMSPC_DIR)/macros
+setenv NDMSPC_TUTORIAL_DIR \$::env(NDMSPC_DIR)/tutorial
 prepend-path ROOT_DYN_PATH \$PKG_ROOT/lib
 prepend-path ROOT_INCLUDE_PATH \$PKG_ROOT/include/ndmspc
 EoF

o2.sh

@@ -1,6 +1,6 @@
 package: O2
 version: "%(tag_basename)s"
-tag: "daily-20260511-0000"
+tag: "daily-20260601-0000"
 requires:
   - abseil
   - arrow

o2dpg.sh

@@ -1,6 +1,6 @@
 package: O2DPG
 version: "%(tag_basename)s"
-tag: "daily-20260511-0000"
+tag: "daily-20260601-0000"
 source: https://github.com/AliceO2Group/O2DPG.git
 build_requires:
   - alibuild-recipe-tools

o2pdpsuite.sh

@@ -1,6 +1,6 @@
 package: O2PDPSuite
 version: "%(tag_basename)s"
-tag: "daily-20260511-0000"
+tag: "daily-20260601-0000"
 requires:
   # List important packages separately, even though they're also
   # pulled in by O2sim, so they show up in the dependency list on Monalisa.

o2physics.sh

@@ -1,6 +1,6 @@
 package: O2Physics
 version: "%(tag_basename)s"
-tag: "daily-20260511-0000"
+tag: "daily-20260601-0000"
 requires:
   - O2
   - ONNXRuntime

vmc.sh

@@ -1,6 +1,6 @@
 package: VMC
 version: "%(tag_basename)s"
-tag: "v2-1"
+tag: "v2-2"
 source: https://github.com/vmc-project/vmc
 requires:
   - ROOT