need to use updated easyblock for CUDA, also use merge commit for OSU

Author: truib

easystacks/software.eessi.io/2023.06/grace/accel/nvidia/eessi-2023.06-eb-4.9.4-2023b-CUDA.yml

@@ -2,6 +2,8 @@ easyconfigs:
   - CUDA-12.4.0.eb:
       options:
         accept-eula-for: CUDA
+        # see https://github.com/easybuilders/easybuild-easyblocks/pull/3516
+        include-easyblocks-from-commit: 3469151ce7e4f85415c877dee555aeea7691c757
   - UCX-CUDA-1.15.0-GCCcore-13.2.0-CUDA-12.4.0.eb
   - UCC-CUDA-1.2.0-GCCcore-13.2.0-CUDA-12.4.0.eb:
       options:
@@ -10,4 +12,6 @@ easyconfigs:
   - OSU-Micro-Benchmarks-7.5-gompi-2023b-CUDA-12.4.0.eb:
       options:
         # see https://github.com/easybuilders/easybuild-easyconfigs/pull/21926
-        from-commit: de79ec74eb076e1aceda5e21235a73c05ed6764c
+        # from-commit: de79ec74eb076e1aceda5e21235a73c05ed6764c
+        # use merge commit
+        from-commit: f3bd10b19f7caf4de3302bc7a73749341db9c7d8