Add passthru in ompss2 wrapper for icpx compat

This should be a noop

flake.lock

@@ -2,10 +2,10 @@
   "nodes": {
     "nixpkgs": {
       "locked": {
-        "lastModified": 1736867362,
-        "narHash": "sha256-i/UJ5I7HoqmFMwZEH6vAvBxOrjjOJNU739lnZnhUln8=",
-        "path": "/nix/store/2csx2kkb2hxyxhhmg2xs9jfyypikwwk6-source",
-        "rev": "9c6b49aeac36e2ed73a8c472f1546f6d9cf1addc",
+        "lastModified": 1752436162,
+        "narHash": "sha256-Kt1UIPi7kZqkSc5HVj6UY5YLHHEzPBkgpNUByuyxtlw=",
+        "path": "/nix/store/zk8v61cpk1wprp9ld5ayc1g5fq4pdkwv-source",
+        "rev": "dfcd5b901dbab46c9c6e80b265648481aafb01f8",
         "type": "path"
       },
       "original": {

overlay.nix

@@ -18,7 +18,7 @@ let
     clangOmpss2NodesOmpv = callPackage ./pkgs/llvm-ompss2/default.nix { ompss2rt = final.nodes; openmp = final.openmpv; };
     clangOmpss2Unwrapped = callPackage ./pkgs/llvm-ompss2/clang.nix { };
     #extrae = callPackage ./pkgs/extrae/default.nix { }; # Broken and outdated
-    gpi-2 = callPackage ./pkgs/gpi-2/default.nix { };
+    #gpi-2 = callPackage ./pkgs/gpi-2/default.nix { }; # Broken: https://jungle.bsc.es/git/rarias/bscpkgs/issues/7
     intel-apt = callPackage ./pkgs/intel-oneapi/packages.nix { };
     intelPackages_2023 = callPackage ./pkgs/intel-oneapi/2023.nix { };
     intelPackages_2024 = final.intel-apt.hpckit_2024;
@@ -49,7 +49,7 @@ let
     stdenvClangOmpss2Nanos6 = final.stdenv.override { cc = final.clangOmpss2Nanos6; allowedRequisites = null; };
     stdenvClangOmpss2Nodes = final.stdenv.override { cc = final.clangOmpss2Nodes; allowedRequisites = null; };
     stdenvClangOmpss2NodesOmpv = final.stdenv.override { cc = final.clangOmpss2NodesOmpv; allowedRequisites = null; };
-    tagaspi = callPackage ./pkgs/tagaspi/default.nix { };
+    #tagaspi = callPackage ./pkgs/tagaspi/default.nix { }; # Broken due gpi-2
     tampi = callPackage ./pkgs/tampi/default.nix { };
     tasycl = callPackage ./pkgs/tasycl/default.nix { };
     tasycl-acpp = callPackage ./pkgs/tasycl/default.nix { useIntel = false; };

pkgs/bench6/default.nix

@@ -1,14 +1,20 @@
 {
   stdenv
+, bigotes
 , cmake
 , clangOmpss2
+, openmp
+, openmpv
 , nanos6
 , nodes
+, nosv
 , mpi
 , tampi
+, openblas
+, ovni
 , gitBranch ? "master"
 , gitURL ? "ssh://git@bscpm04.bsc.es/rarias/bench6.git"
-, gitCommit ? "1e6ce2aa8ad7b4eef38df1581d7ec48a8815f85d"
+, gitCommit ? "bf29a53113737c3aa74d2fe3d55f59868faea7b4"
 }:
 
 stdenv.mkDerivation rec {
@@ -21,9 +27,28 @@ stdenv.mkDerivation rec {
     rev = gitCommit;
   };
 
-  buildInputs = [ cmake clangOmpss2 nanos6 nodes mpi tampi ];
+  buildInputs = [
+    bigotes
+    cmake
+    clangOmpss2
+    openmp
+    openmpv
+    nanos6
+    nodes
+    nosv
+    mpi
+    tampi
+    openblas
+    openblas.dev
+    ovni
+  ];
+
+  env = {
+    NANOS6_HOME = nanos6;
+    NODES_HOME = nodes;
+    NOSV_HOME = nosv;
+  };
 
-  enableParallelBuilding = false;
   cmakeFlags = [
     "-DCMAKE_C_COMPILER=clang"
     "-DCMAKE_CXX_COMPILER=clang++"

pkgs/intel-oneapi/2023.nix

@@ -1,6 +1,5 @@
 { stdenv
 , fetchurl
-, ncurses
 , lib
 , dpkg
 , rsync
@@ -10,12 +9,9 @@
 , hwloc
 , zlib
 , autoPatchelfHook
-, symlinkJoin
 , libfabric
-, gcc
-, gcc7
+, gcc13
 , wrapCCWith
-, linuxHeaders
 }:
 
 # The distribution of intel packages is a mess. We are doing the installation
@@ -30,6 +26,8 @@
 
 let
 
+  gcc = gcc13;
+
   v = {
     hpckit   = "2023.1.0";
     compiler = "2023.1.0";
@@ -305,6 +303,7 @@ let
       "intel-oneapi-compiler-shared-common-${version}"
       "intel-oneapi-compiler-shared-runtime-${version}"
     ];
+    dontCheckForBrokenSymlinks = true;
     # From https://aur.archlinux.org/packages/intel-oneapi-compiler:
     # - intel-oneapi-compiler-cpp-eclipse-cfg-2023.0.0-25370_all.deb
     # + intel-oneapi-compiler-dpcpp-cpp-2023.0.0-2023.0.0-25370_amd64.deb
@@ -399,7 +398,9 @@ let
         done
 
         # Need the gcc in the path
-        echo 'export "PATH=${mygcc}/bin:$PATH"' >> $out/nix-support/cc-wrapper-hook
+        # FIXME: We should find a better way to modify the PATH instead of using
+        # this ugly hack. See https://jungle.bsc.es/git/rarias/bscpkgs/issues/9
+        echo 'path_backup="${mygcc}/bin:$path_backup"' >> $out/nix-support/cc-wrapper-hook
 
         # Disable hardening by default
         echo "" > $out/nix-support/add-hardening.sh

pkgs/llvm-ompss2/clang.nix

@@ -16,19 +16,19 @@
 , useGit ? false
 , gitUrl ? "ssh://git@bscpm04.bsc.es/llvm-ompss/llvm-mono.git"
 , gitBranch ? "master"
-, gitCommit ? "8c0d267c04d7fc3fb923078f510fcd5f4719a6cc"
+, gitCommit ? "880e2341c56bad1dc14e8c369fb3356bec19018e"
 }:
 
 let
   stdenv = llvmPackages_latest.stdenv;
 
   release = rec {
-    version = "2024.11";
+    version = "2025.06";
     src = fetchFromGitHub {
       owner = "bsc-pm";
       repo = "llvm";
       rev = "refs/tags/github-release-${version}";
-      hash = "sha256-pF0qa987nLkIJPUrXh1srzBkLPfb31skIegD0bl34Kg=";
+      hash = "sha256-ww9PpRmtz/M9IyLiZ8rAehx2UW4VpQt+svf4XfKBzKo=";
     };
   };
 

pkgs/lmbench/default.nix

@@ -17,16 +17,12 @@ stdenv.mkDerivation rec {
     sha256 = "sha256-SzwplRBO3V0R3m3p15n71ivYBMGoLsajFK2TapYxdqk=";
   };
 
-  postUnpack = ''
-    export sourceRoot="$sourceRoot/src"
-  '';
-
   postPatch = ''
     sed -i "s@/bin/rm@rm@g" $(find . -name Makefile)
   '';
 
   buildInputs = [ libtirpc ];
-  patches = [ ./fix-install.patch ];
+  patches = [ ./fix-install.patch ./gcc-14.patch ];
 
   hardeningDisable = [ "all" ];
 
@@ -34,7 +30,9 @@ stdenv.mkDerivation rec {
 
   preBuild = ''
     makeFlagsArray+=(
+      -C src
       BASE=$out
+      CFLAGS=-Wno-implicit-int
       CPPFLAGS=-I${libtirpc.dev}/include/tirpc
       LDFLAGS=-ltirpc
     )

pkgs/lmbench/fix-install.patch

@@ -1,5 +1,5 @@
---- a/Makefile
-+++ b/Makefile
+--- a/src/Makefile
++++ b/src/Makefile
 @@ -144,6 +144,7 @@ install-target:
  	if [ ! -d $(BASE)/include ]; then mkdir $(BASE)/include; fi
  	if [ ! -d $(BASE)/lib ]; then mkdir $(BASE)/lib; fi

pkgs/lmbench/gcc-14.patch

@@ -0,0 +1,77 @@
+From a3c6e7d303cd8368e8d4e35be7cbc1997e801257 Mon Sep 17 00:00:00 2001
+From: Rodrigo Arias Mallo <rodrigo.arias@bsc.es>
+Date: Mon, 21 Jul 2025 17:38:58 +0200
+Subject: [PATCH] Misc fixes to build with gcc 14
+
+---
+ src/bench.h      | 2 ++
+ src/lat_select.c | 2 +-
+ src/lib_debug.c  | 1 +
+ src/lib_sched.c  | 2 +-
+ src/lib_timing.c | 2 +-
+ 5 files changed, 6 insertions(+), 3 deletions(-)
+
+diff --git a/src/bench.h b/src/bench.h
+index 8166408..4da9079 100644
+--- a/src/bench.h
++++ b/src/bench.h
+@@ -320,4 +320,6 @@ extern int handle_scheduler(int childno, int benchproc, int nbenchprocs);
+ extern char *rpc_xact_1();
+ extern char *client_rpc_xact_1();
+ 
++void lmbench_usage(int argc, char *argv[], char* usage);
++
+ #endif /* _BENCH_H */
+diff --git a/src/lat_select.c b/src/lat_select.c
+index 583b505..39df369 100644
+--- a/src/lat_select.c
++++ b/src/lat_select.c
+@@ -164,7 +164,7 @@ doit(iter_t iterations, void * cookie)
+ 	state_t * 	state = (state_t *)cookie;
+ 	fd_set		nosave;
+ 	static struct timeval tv;
+-	static count = 0;
++	static int count = 0;
+ 	
+ 	tv.tv_sec = 0;
+ 	tv.tv_usec = 0;
+diff --git a/src/lib_debug.c b/src/lib_debug.c
+index e8347dd..cf65312 100644
+--- a/src/lib_debug.c
++++ b/src/lib_debug.c
+@@ -1,5 +1,6 @@
+ #include "bench.h"
+ #include "lib_debug.h"
++#include <math.h>
+ 
+ /*
+  * return micro-seconds / iteration at the the fraction point.
+diff --git a/src/lib_sched.c b/src/lib_sched.c
+index aa83ae0..4f16bbf 100644
+--- a/src/lib_sched.c
++++ b/src/lib_sched.c
+@@ -91,7 +91,7 @@ handle_scheduler(int childno, int benchproc, int nbenchprocs)
+ 			     childno * (nbenchprocs + 1) + benchproc);
+ 	} else {
+ 		/* default action: do nothing */
+-		return;
++		return 0;
+ 	}
+ 
+ 	return sched_pin(cpu % sched_ncpus());
+diff --git a/src/lib_timing.c b/src/lib_timing.c
+index af8cf68..7ec9652 100644
+--- a/src/lib_timing.c
++++ b/src/lib_timing.c
+@@ -1623,7 +1623,7 @@ bread(void* buf, long nbytes)
+ void
+ touch(char *buf, int nbytes)
+ {
+-	static	psize;
++	static int psize;
+ 
+ 	if (!psize) {
+ 		psize = getpagesize();
+-- 
+2.49.0
+

pkgs/nanos6/default.nix

@@ -19,7 +19,7 @@
 , useGit ? false
 , gitUrl ? "ssh://git@bscpm04.bsc.es/nanos6/nanos6"
 , gitBranch ? "master"
-, gitCommit ? "9f54c988e0a8b9c011d9d526acdb8d76f18fcae4"
+, gitCommit ? "f82762b66c82b5174a8eaad33f6c2f335ac759b4"
 }:
 
 assert enableJemalloc -> (jemallocNanos6 != null);
@@ -28,12 +28,12 @@ with lib;
 
 let
   release = rec {
-    version = "4.2";
+    version = "4.3";
     src = fetchFromGitHub {
       owner = "bsc-pm";
       repo = "nanos6";
       rev = "version-${version}";
-      hash = "sha256-tBrRGLCjSFYdmVGPAC2DzYY6HJyZGUOMeykujafn7+4=";
+      hash = "sha256-/c6WiKBsAo/01uvMRmjv0PMucbrgvaGmbxlPE6q+dfE=";
     };
   };
 

pkgs/nosv/default.nix

@@ -11,19 +11,19 @@
 , useGit ? false
 , gitUrl ? "git@gitlab-internal.bsc.es:nos-v/nos-v.git"
 , gitBranch ? "master"
-, gitCommit ? "cfd361bd1dd30c96da405e6bbaa7e78f5f93dfda"
+, gitCommit ? "9f47063873c3aa9d6a47482a82c5000a8c813dd8"
 }:
 
 with lib;
 
 let
   release = rec {
-    version = "3.1.0";
+    version = "3.2.0";
     src = fetchFromGitHub {
       owner = "bsc-pm";
       repo = "nos-v";
       rev = "${version}";
-      hash = "sha256-Pkre+ZZsREDxJLCoIoPN1HQDuUa2H1IQyKB3omg6qaU=";
+      hash = "sha256-yaz92426EM8trdkBJlISmAoG9KJCDTvoAW/HKrasvOw=";
     };
   };
 

pkgs/ovni/default.nix

@@ -7,7 +7,7 @@
 , useGit ? false
 , gitBranch ? "master"
 , gitUrl ? "ssh://git@bscpm04.bsc.es/rarias/ovni.git"
-, gitCommit ? "a7103f8510d1ec124c3e01ceb47d1e443e98bbf4"
+, gitCommit ? "e4f62382076f0cf0b1d08175cf57cc0bc51abc61"
 , enableDebug ? false
 # Only enable MPI if the build is native (fails on cross-compilation)
 , useMpi ? (stdenv.buildPlatform.canExecute stdenv.hostPlatform)
@@ -17,13 +17,13 @@ with lib;
 
 let
   release = rec {
-    version = "1.11.0";
+    version = "1.12.0";
     src = fetchFromGitHub {
       owner = "bsc-pm";
       repo = "ovni";
       rev = "${version}";
-      hash = "sha256-DEZUK1dvbPGH5WYkZ2hpP5PShkMxXkHOqMwgYUHHxeM=";
-    } // { shortRev = "a7103f8"; };
+      hash = "sha256-H04JvsVKrdqr3ON7JhU0g17jjlg/jzQ7eTfx9vUNd3E=";
+    } // { shortRev = "a73afcf"; };
   };
 
   git = rec {

pkgs/paraver/default.nix

@@ -1,7 +1,7 @@
 {
   stdenv
 , autoreconfHook
-, boost
+, boost186
 , libxml2
 , xml2
 , wxGTK32
@@ -15,6 +15,7 @@
 
 let
   wx = wxGTK32;
+  boost = boost186;
 in
 stdenv.mkDerivation rec {
   pname = "wxparaver";

pkgs/tampi/default.nix

@@ -15,7 +15,7 @@
 , useGit ? false
 , gitUrl ? "ssh://git@bscpm04.bsc.es/interoperability/tampi.git"
 , gitBranch ? "master"
-, gitCommit ? "a5c93bf8ab045b71ad4a8d5e2c991ce774db5cbc"
+, gitCommit ? "f6455db9d3124ae36e715a4874fd49720e79f20a"
 }:
 
 with lib;
@@ -24,12 +24,12 @@ assert enableOvni -> (ovni != null);
 
 let
   release = rec {
-    version = "4.0";
+    version = "4.1";
     src = fetchFromGitHub {
       owner = "bsc-pm";
       repo = "tampi";
       rev = "v${version}";
-      hash = "sha256-R7ew5tsrxGReTvOeeZe1FD0oThBhOHoDGv6Mo2sbmDg=";
+      hash = "sha256-SwfPSnwcZnRnSgNvCD5sFSUJRpWINqI5I4adj5Hh+XY=";
     };
   };
   git = rec {

pkgs/tasycl/default.nix

@@ -9,7 +9,6 @@
 , gnumake
 , autoreconfHook
 , boost
-, opensycl ? null
 , adaptivecpp ? null
 , useIntel ? true
 
@@ -19,17 +18,9 @@
 , gitCommit ? "78f98dcf60a66e0eaa3b4ebcf55be076bec64825"
 }:
 
-assert (useIntel || opensycl != null || adaptivecpp != null);
+assert (useIntel || adaptivecpp != null);
 
 let
-  # opensycl has migrated to adaptivecpp
-  acpp-flags =
-    if adaptivecpp == null then
-      [ "-L${opensycl}/lib" "-lhipSYCL-rt" "-I${opensycl}/include" ]
-    else
-      [ "-L${adaptivecpp}/lib" "-lacpp-rt" "-I${adaptivecpp}/include" ]
-  ;
-
   variant = if useIntel then "intel" else "acpp";
 
   syclStdenv =
@@ -38,7 +29,7 @@ let
       # intel disables all optimizations
       withCFlags ["-O3"] intelPackages.stdenv
     else
-      withCFlags acpp-flags stdenv
+      withCFlags [ "-L${adaptivecpp}/lib" "-lacpp-rt" "-I${adaptivecpp}/include" ] stdenv
   ;
 
   release = rec {