Update sonar to 1.0.1

Reviewed-by: Aleix Roca Nonell <aleix.rocanonell@bsc.es>

overlay.nix

@@ -11,6 +11,7 @@ let
 
   bscPkgs = {
     bench6 = callPackage ./pkgs/bench6/default.nix { };
+    bigotes = callPackage ./pkgs/bigotes/default.nix { };
     clangOmpss2 = callPackage ./pkgs/llvm-ompss2/default.nix { };
     clangOmpss2Nanos6 = callPackage ./pkgs/llvm-ompss2/default.nix { ompss2rt = final.nanos6; };
     clangOmpss2Nodes = callPackage ./pkgs/llvm-ompss2/default.nix { ompss2rt = final.nodes; openmp = final.openmp; };

pkgs/bigotes/default.nix

@@ -0,0 +1,17 @@
+{
+  stdenv
+, fetchFromGitHub
+, cmake
+}:
+
+stdenv.mkDerivation rec {
+  pname = "bigotes";
+  version = "9dce13";
+  src = fetchFromGitHub {
+    owner = "rodarima";
+    repo = "bigotes";
+    rev = "9dce13446a8da30bea552d569d260d54e0188518";
+    sha256 = "sha256-ktxM3pXiL8YXSK+/IKWYadijhYXqGoLY6adLk36iigE=";
+  };
+  buildInputs = [ cmake ];
+}

pkgs/llvm-ompss2/clang.nix

@@ -16,19 +16,19 @@
 , useGit ? false
 , gitUrl ? "ssh://git@bscpm03.bsc.es/llvm-ompss/llvm-mono.git"
 , gitBranch ? "master"
-, gitCommit ? "0a6d6c64b04f9bbbe1399f18be426e191fb6b42c"
+, gitCommit ? "8c0d267c04d7fc3fb923078f510fcd5f4719a6cc"
 }:
 
 let
   stdenv = llvmPackages_latest.stdenv;
 
   release = rec {
-    version = "18.0.0-ompss-2";
+    version = "2024.11";
     src = fetchFromGitHub {
       owner = "bsc-pm";
       repo = "llvm";
-      rev = "refs/tags/${version}";
+      rev = "refs/tags/github-release-${version}";
-      hash = "sha256-Z0TVrujOQNHiAuTlyexbIBA2pOk2Tdmv7JuQn3M3foY=";
+      hash = "sha256-pF0qa987nLkIJPUrXh1srzBkLPfb31skIegD0bl34Kg=";
     };
   };
 

pkgs/nanos6/default.nix

@@ -19,7 +19,7 @@
 , useGit ? false
 , gitUrl ? "ssh://git@bscpm03.bsc.es/nanos6/nanos6"
 , gitBranch ? "master"
-, gitCommit ? "4fdddf67b573fbe624bf64b92c0a9b4e344b9dd3"
+, gitCommit ? "9f54c988e0a8b9c011d9d526acdb8d76f18fcae4"
 }:
 
 assert enableJemalloc -> (jemallocNanos6 != null);
@@ -28,17 +28,13 @@ with lib;
 
 let
   release = rec {
-    version = "4.0";
+    version = "4.2";
     src = fetchFromGitHub {
       owner = "bsc-pm";
       repo = "nanos6";
       rev = "version-${version}";
-      hash = "sha256-o2j7xNufdjcWykbwDDHQYxYCs4kpyQvJnuFyeXYZULw=";
+      hash = "sha256-tBrRGLCjSFYdmVGPAC2DzYY6HJyZGUOMeykujafn7+4=";
     };
-    patches = [
-      # https://pm.bsc.es/gitlab/nanos6/nanos6/-/issues/185
-      ./0001-Add-missing-cstdint-include.patch
-    ];
   };
 
   git = rec {

pkgs/nodes/default.nix

@@ -18,19 +18,19 @@
 , useGit ? false
 , gitUrl ? "ssh://git@gitlab-internal.bsc.es/nos-v/nodes.git"
 , gitBranch ? "master"
-, gitCommit ? "813da5976d06f587747dbb07aa911cfd855eff1a"
+, gitCommit ? "6002ec9ae6eb876d962cc34366952a3b26599ba6"
 }:
 
 with lib;
 
 let
   release = rec {
-    version = "1.1";
+    version = "1.3";
     src = fetchFromGitHub {
       owner = "bsc-pm";
       repo = "nodes";
       rev = "version-${version}";
-      hash = "sha256-Cfj3ozVK/sx/eccTjv7wZX8KUMdca0vY0RY0UWSRftg=";
+      hash = "sha256-cFb9pxcjtkMmH0CsGgUO9LTdXDNh7MCqicgGWawLrsU=";
     };
   };
 

pkgs/nosv/default.nix

@@ -10,19 +10,19 @@
 , useGit ? false
 , gitUrl ? "git@gitlab-internal.bsc.es:nos-v/nos-v.git"
 , gitBranch ? "master"
-, gitCommit ? "f696951f62cac018bd9fd15e2fb9f34e96b185b5"
+, gitCommit ? "cfd361bd1dd30c96da405e6bbaa7e78f5f93dfda"
 }:
 
 with lib;
 
 let
   release = rec {
-    version = "2.1.1";
+    version = "3.1.0";
     src = fetchFromGitHub {
       owner = "bsc-pm";
       repo = "nos-v";
       rev = "${version}";
-      hash = "sha256-G80vaHep72iovnlIgqqjaQOYYtn83UJG7XrXnI/WO70=";
+      hash = "sha256-Pkre+ZZsREDxJLCoIoPN1HQDuUa2H1IQyKB3omg6qaU=";
     };
   };
 
@@ -44,9 +44,11 @@ in
     dontStrip = true;
     separateDebugInfo = true;
     configureFlags = [ "--with-ovni=${ovni}" ];
-    buildInputs = [
+    nativeBuildInputs = [
       autoreconfHook
       pkg-config
+    ];
+    buildInputs = [
       numactl
       hwloc
       ovni

pkgs/ovni/default.nix

@@ -7,21 +7,23 @@
 , useGit ? false
 , gitBranch ? "master"
 , gitUrl ? "ssh://git@bscpm03.bsc.es/rarias/ovni.git"
-, gitCommit ? "7a33deffb7aaae70527125d48428f22169c9d39e"
+, gitCommit ? "a7103f8510d1ec124c3e01ceb47d1e443e98bbf4"
 , enableDebug ? false
+# Only enable MPI if the build is native (fails on cross-compilation)
+, useMpi ? (stdenv.buildPlatform.canExecute stdenv.hostPlatform)
 }:
 
 with lib;
 
 let
   release = rec {
-    version = "1.4.1";
+    version = "1.11.0";
     src = fetchFromGitHub {
       owner = "bsc-pm";
       repo = "ovni";
       rev = "${version}";
-      hash = "sha256-/vv7Yy6dzoxuHjMc0h/vFFwWzysPLXFZIN2rbLT/SC8=";
+      hash = "sha256-DEZUK1dvbPGH5WYkZ2hpP5PShkMxXkHOqMwgYUHHxeM=";
-    } // { shortRev = "7a33def"; };
+    } // { shortRev = "a7103f8"; };
   };
 
   git = rec {
@@ -43,9 +45,12 @@ in
     postPatch = ''
       patchShebangs --build test/
     '';
-    buildInputs = [ cmake mpi ];
+    nativeBuildInputs = [ cmake ];
+    buildInputs = lib.optionals (useMpi) [ mpi ];
     cmakeBuildType = if (enableDebug) then "Debug" else "Release";
-    cmakeFlags = [ "-DOVNI_GIT_COMMIT=${src.shortRev}" ];
+    cmakeFlags = [
+      "-DOVNI_GIT_COMMIT=${src.shortRev}"
+    ] ++ lib.optionals (!useMpi) [ "-DUSE_MPI=OFF" ];
     preCheck = ''
       export CTEST_OUTPUT_ON_FAILURE=1
     '';

pkgs/paraver/default.nix

@@ -63,7 +63,6 @@ stdenv.mkDerivation rec {
     automake
     paraverKernel
     openssl.dev
-    paraverKernel
   ];
 
   postInstall = ''
@@ -74,5 +73,9 @@ stdenv.mkDerivation rec {
     # cp -p ${paraverKernel}/include/* $out/include
     cp -a ${paraverKernel}/lib/paraver-kernel $out/lib/paraver-kernel
     cp -p ${paraverKernel}/share/filters-config/* $out/share/filters-config
+
+    # Move man files to proper location
+    mkdir -p $out/share/man
+    mv $out/share/doc/wxparaver_help_contents/man $out/share/man/man1
   '';
 }

pkgs/sonar/default.nix

@@ -8,12 +8,12 @@
 
 stdenv.mkDerivation rec {
   pname = "sonar";
-  version = "0.2.0";
+  version = "1.0.1";
   src = fetchFromGitHub {
     owner = "bsc-pm";
     repo = "sonar";
     rev = "${version}";
-    sha256 = "sha256-iQSw4PbFk0EALXPHpLBPPQ7U8Ed8fkez1uG9MuF6PJo=";
+    sha256 = "sha256-DazOEaiMfJLrZNtmQEEHdBkm/m4hq5e0mPEfMtzYqWk=";
   };
   hardeningDisable = [ "all" ];
   dontStrip = true;

pkgs/tampi/default.nix

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